diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a874ad380e..b4dc641daf 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -26,14 +26,14 @@ jobs:
       run: |
         TEMP=${{ runner.temp }}/ python Make.py --csproj Source/CombatExtended/CombatExtended.csproj --output Assemblies/CombatExtended.dll --download-libs --all-libs --publicizer $PWD/AssemblyPublicizer
         
-    - name: build compat
-      run: |
-        TEMP=${{ runner.temp }}/ python BuildCompat.py
+    #- name: build compat
+    #  run: |
+    #    TEMP=${{ runner.temp }}/ python BuildCompat.py
         
     - name: package
       run: |
         mkdir CombatExtended
-        cp -r Source/ Assemblies/ AssembliesCore/ AssembliesCompat/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Sounds/ Textures/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended
+        cp -r Source/ Assemblies/ AssembliesCore/ AssembliesCompat/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Sounds/ Textures/ ModPatches/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended
         zip -9 -r build.zip CombatExtended
     - name: Upload to DO
       run: |
diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml
index 5dd013db7f..dcd253edce 100644
--- a/.github/workflows/pullrequest.yml
+++ b/.github/workflows/pullrequest.yml
@@ -39,14 +39,14 @@ jobs:
       run: |
         TEMP=${{ runner.temp }}/ python Make.py --csproj Source/CombatExtended/CombatExtended.csproj --output Assemblies/CombatExtended.dll --download-libs --all-libs --publicizer $PWD/AssemblyPublicizer
 
-    - name: build compat
-      run: |
-        TEMP=${{ runner.temp }}/ python BuildCompat.py
+    #- name: build compat
+    #  run: |
+    #    TEMP=${{ runner.temp }}/ python BuildCompat.py
         
     - name: package
       run: |
         mkdir CombatExtended
-        cp -r Source/ Assemblies/ AssembliesCompat/ AssembliesCore/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Sounds/ Textures/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended
+        cp -r Source/ Assemblies/ AssembliesCompat/ AssembliesCore/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Sounds/ Textures/ ModPatches/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended
         zip -9 -r build.zip CombatExtended
     - name: Upload to DO
       run: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b7e56d6b75..14538af2c5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -26,13 +26,13 @@ jobs:
     - name: build core
       run: |
         TEMP=${{ runner.temp }}/ python Make.py --csproj Source/CombatExtended/CombatExtended.csproj --output Assemblies/CombatExtended.dll --download-libs --all-libs --publicizer $PWD/AssemblyPublicizer
-    - name: build compat
-      run: |
-        TEMP=${{ runner.temp }}/ python BuildCompat.py
+    #- name: build compat
+    #  run: |
+    #    TEMP=${{ runner.temp }}/ python BuildCompat.py
     - name: package
       run: |
         mkdir CombatExtended
-        cp -r Assemblies/ AssembliesCore/ AssembliesCompat/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Sounds/ Textures/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended
+        cp -r Assemblies/ AssembliesCore/ AssembliesCompat/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Sounds/ Textures/ ModPatches/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended
         zip -9 -r CombatExtended.zip CombatExtended
     - name: Upload Package
       id: upload-package
diff --git a/About/About.xml b/About/About.xml
index 60218cc257..6509ff2d3f 100644
--- a/About/About.xml
+++ b/About/About.xml
@@ -5,10 +5,11 @@
 	<author>CE Team</author>
 	<url>https://github.com/CombatExtended-Continued/CombatExtended</url>
 	<supportedVersions>
-		<li>1.4</li>
+		<li>1.5</li>
 	</supportedVersions>
 	<packageId>CETeam.CombatExtended</packageId>
-	<description>Version: 1.4.5.7\n\nExtends combat mechanics to make them deeper and more tactical.</description>
+	<description>Version: 15.6.0.0\n\nExtends combat mechanics to make them deeper and more tactical.</description>
+	<modIconPath>UI/Icons/CE_ModIcon_JustHat</modIconPath>
 	<modDependencies>
 		<li>
 			<packageId>brrainz.harmony</packageId>
@@ -86,6 +87,7 @@
 		<li>OskarPotocki.VFE.Tribals</li>
 		<li>Sarg.AlphaMemes</li>
 		<li>K4G.Sultanate</li>
+		<li>Argon.VMEu</li>
 	</loadAfter>
 
 </ModMetaData>
diff --git a/About/Manifest.xml b/About/Manifest.xml
deleted file mode 100644
index 707118cf85..0000000000
--- a/About/Manifest.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Manifest>
-	<identifier>CombatExtended</identifier>
-	<version>1.4.5.7</version><!-- Don't add extra digits to this, or it breaks Fluffy's versioning.  -->
-	<dependencies>
-		<li>2009463077</li><!-- Harmony -->
-	</dependencies>
-	<loadAfter>
-		<li>2009463077</li><!-- Harmony -->
-	</loadAfter>
-	<showCrossPromotions>true</showCrossPromotions>
-	<manifestUri>https://raw.githubusercontent.com/CombatExtended-Continued/CombatExtended/master/About/Manifest.xml</manifestUri>
-	<downloadUri>https://github.com/CombatExtended-Continued/CombatExtended/releases/latest</downloadUri>
-</Manifest>
diff --git a/Biotech/Patches/ThingDefs_Misc/Apparel_BiotechHeadgear.xml b/Biotech/Patches/ThingDefs_Misc/Apparel_BiotechHeadgear.xml
index 7177283d94..6e48e4dd01 100644
--- a/Biotech/Patches/ThingDefs_Misc/Apparel_BiotechHeadgear.xml
+++ b/Biotech/Patches/ThingDefs_Misc/Apparel_BiotechHeadgear.xml
@@ -156,13 +156,6 @@
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="Apparel_GasMask"]/apparel/hatRenderedFrontOfFace</xpath>
-		<value>
-			<hatRenderedFrontOfFace>false</hatRenderedFrontOfFace>
-		</value>
-	</Operation>
-
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="Apparel_GasMask"]/apparel/layers</xpath>
 		<value>
diff --git a/Biotech/Patches/ThingDefs_Misc/Apparel_BiotechPacks.xml b/Biotech/Patches/ThingDefs_Misc/Apparel_BiotechPacks.xml
index ec2ad8fa2a..cb9419ad86 100644
--- a/Biotech/Patches/ThingDefs_Misc/Apparel_BiotechPacks.xml
+++ b/Biotech/Patches/ThingDefs_Misc/Apparel_BiotechPacks.xml
@@ -57,14 +57,14 @@
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="Apparel_PackTox"]/comps/li[@Class="CompProperties_Reloadable"]/ammoDef</xpath>
+		<xpath>Defs/ThingDef[defName="Apparel_PackTox"]/comps/li[@Class="CompProperties_ApparelReloadable"]/ammoDef</xpath>
 		<value>
 			<ammoDef>Weapon_GrenadeTox</ammoDef>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="Apparel_PackTox"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountToRefill</xpath>
+		<xpath>Defs/ThingDef[defName="Apparel_PackTox"]/comps/li[@Class="CompProperties_ApparelReloadable"]/ammoCountToRefill</xpath>
 		<value>
 			<ammoCountToRefill>3</ammoCountToRefill>
 		</value>
diff --git a/Defs/Ammo/Advanced/30x64mmFuelCell.xml b/Defs/Ammo/Advanced/30x64mmFuelCell.xml
index ceef30c930..cbdd232a0b 100644
--- a/Defs/Ammo/Advanced/30x64mmFuelCell.xml
+++ b/Defs/Ammo/Advanced/30x64mmFuelCell.xml
@@ -25,7 +25,7 @@
 	<ThingDef Class="CombatExtended.AmmoDef" Name="30x64mmFuelBase" ParentName="SpacerMediumAmmoBase" Abstract="True">
 		<description>Container holding fuel for incendiary shot firearms.</description>
 		<statBases>
-			<Mass>0.08</Mass>
+			<Mass>0.4</Mass>
 			<Bulk>0.14</Bulk>
 		</statBases>
 		<tradeTags>
@@ -46,7 +46,7 @@
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
-			<MarketValue>3.4</MarketValue>
+			<MarketValue>4.66</MarketValue>
 		</statBases>
 		<ammoClass>IncendiaryFuel</ammoClass>
 	</ThingDef>
@@ -59,7 +59,7 @@
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
-			<MarketValue>4.91</MarketValue>
+			<MarketValue>6.18</MarketValue>
 		</statBases>
 		<ammoClass>ThermobaricFuel</ammoClass>
 	</ThingDef>
@@ -72,7 +72,7 @@
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
-			<MarketValue>3.66</MarketValue>
+			<MarketValue>4.93</MarketValue>
 		</statBases>
 		<ammoClass>FoamFuel</ammoClass>
 		<generateAllowChance>0</generateAllowChance>
@@ -149,7 +149,7 @@
 						<li>Steel</li>
 					</thingDefs>
 				</filter>
-				<count>8</count>
+				<count>40</count>
 			</li>
 			<li>
 				<filter>
@@ -178,7 +178,7 @@
 		<products>
 			<Ammo_30x64mmFuel_Incendiary>50</Ammo_30x64mmFuel_Incendiary>
 		</products>
-		<workAmount>7600</workAmount>
+		<workAmount>10800</workAmount>
 	</RecipeDef>
 
 	<RecipeDef ParentName="LauncherAmmoRecipeBase">
@@ -194,7 +194,7 @@
 						<li>Steel</li>
 					</thingDefs>
 				</filter>
-				<count>8</count>
+				<count>40</count>
 			</li>
 			<li>
 				<filter>
@@ -222,7 +222,7 @@
 		<products>
 			<Ammo_30x64mmFuel_Thermobaric>50</Ammo_30x64mmFuel_Thermobaric>
 		</products>
-		<workAmount>10400</workAmount>
+		<workAmount>13600</workAmount>
 	</RecipeDef>
 
 	<RecipeDef ParentName="LauncherAmmoRecipeBase">
@@ -242,7 +242,7 @@
 						<li>Steel</li>
 					</thingDefs>
 				</filter>
-				<count>8</count>
+				<count>40</count>
 			</li>
 			<li>
 				<filter>
@@ -273,7 +273,7 @@
 		<products>
 			<Ammo_30x64mmFuel_Foam>50</Ammo_30x64mmFuel_Foam>
 		</products>
-		<workAmount>11400</workAmount>
+		<workAmount>14600</workAmount>
 	</RecipeDef>
 
 </Defs>
\ No newline at end of file
diff --git a/Defs/DamageDefs/Damages_LocalInjury.xml b/Defs/DamageDefs/Damages_LocalInjury.xml
index f366c3597b..3fa0ebd4e6 100644
--- a/Defs/DamageDefs/Damages_LocalInjury.xml
+++ b/Defs/DamageDefs/Damages_LocalInjury.xml
@@ -150,24 +150,16 @@
 		<hediff>Flashbanged</hediff>
 	</DamageDef>
 	
-  <DamageDef Name="Bullet">
+  <DamageDef ParentName="Bullet">
 		<defName>CE_Laser</defName>
 		<label>laser</label>
-    <workerClass>DamageWorker_AddInjury</workerClass>
-    <externalViolence>true</externalViolence>
 		<deathMessage>{0} has been scorched to death.</deathMessage>
 		<hediff>BurnSecondary</hediff>
-    <harmAllLayersUntilOutside>true</harmAllLayersUntilOutside>
-    <hasForcefulImpact>false</hasForcefulImpact>
-    <impactSoundType>Bullet</impactSoundType>
-    <armorCategory>Sharp</armorCategory>
-    <overkillPctToDestroyPart>0~0.7</overkillPctToDestroyPart>
-    <isRanged>true</isRanged>
-    <makesAnimalsFlee>true</makesAnimalsFlee>
+    	<hasForcefulImpact>false</hasForcefulImpact>
 		<minDamageToFragment>99999</minDamageToFragment>
-    <defaultDamage>1</defaultDamage>
-    <defaultArmorPenetration>0</defaultArmorPenetration>
-		<buildingDamageFactor>0.100</buildingDamageFactor>
+    	<defaultDamage>1</defaultDamage>
+    	<defaultArmorPenetration>0</defaultArmorPenetration>
+		<buildingDamageFactor>0.1</buildingDamageFactor>
 		<plantDamageFactor>2</plantDamageFactor>
   </DamageDef>
 	
diff --git a/Defs/ThingDefs_Buildings/Buildings_Defenses.xml b/Defs/ThingDefs_Buildings/Buildings_Defenses.xml
index 31aae5c3ea..e73ab76189 100644
--- a/Defs/ThingDefs_Buildings/Buildings_Defenses.xml
+++ b/Defs/ThingDefs_Buildings/Buildings_Defenses.xml
@@ -117,6 +117,7 @@
 		<designationCategory>Structure</designationCategory>
 		<staticSunShadowHeight>1</staticSunShadowHeight>
 		<blockLight>false</blockLight>
+    <disableImpassableShotOverConfigError>true</disableImpassableShotOverConfigError>
 		<stuffCategories>
 			<li>Metallic</li>
 			<li>Woody</li>
diff --git a/Defs/ThingDefs_Misc/Apparel_Headgear.xml b/Defs/ThingDefs_Misc/Apparel_Headgear.xml
index 9308364dd9..ec93664e16 100644
--- a/Defs/ThingDefs_Misc/Apparel_Headgear.xml
+++ b/Defs/ThingDefs_Misc/Apparel_Headgear.xml
@@ -132,7 +132,6 @@
 				<li>IndustrialMilitaryBasic</li>
 				<li>GasMask</li>
 			</tags>
-			<hatRenderedFrontOfFace>false</hatRenderedFrontOfFace>
 		</apparel>
 		<modExtensions>
 			<li Class="CombatExtended.ApparelHediffExtension">
@@ -197,7 +196,6 @@
 			<tags>
 				<li>GasMask</li>
 			</tags>
-			<hatRenderedFrontOfFace>false</hatRenderedFrontOfFace>
 		</apparel>
 		<modExtensions>
 			<li Class="CombatExtended.ApparelHediffExtension">
@@ -261,7 +259,6 @@
 			<defaultOutfitTags>
 				<li>Soldier</li>
 			</defaultOutfitTags>
-			<hatRenderedFrontOfFace>false</hatRenderedFrontOfFace>
 		</apparel>
 		<modExtensions>
 			<li Class="CombatExtended.ApperalRenderingExtension">
@@ -325,7 +322,6 @@
 			<defaultOutfitTags>
 				<li>Soldier</li>
 			</defaultOutfitTags>
-			<hatRenderedFrontOfFace>false</hatRenderedFrontOfFace>
 		</apparel>
 		<modExtensions>
 			<li Class="CombatExtended.ApperalRenderingExtension">
diff --git a/LoadFolders.xml b/LoadFolders.xml
index 49d7663330..b053b4c2a4 100644
--- a/LoadFolders.xml
+++ b/LoadFolders.xml
@@ -1,9 +1,592 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <loadFolders>
 	<v1.4>
+		<!-- Core Files -->
 		<li>/</li>
+		<!-- DLC -->
 		<li IfModActive="Ludeon.Rimworld.Royalty">Royalty</li>
 		<li IfModActive="Ludeon.Rimworld.Ideology">Ideology</li>
 		<li IfModActive="Ludeon.Rimworld.Biotech">Biotech</li>
+		<!-- Mod Patches -->
+		<li IfModActive="Torann.ARimworldOfMagic">ModPatches/A Rimworld of Magic</li>
+		<li IfModActive="ADE.AdvancedTurrets.Mod">ModPatches/ADE Advanced Turrets</li>
+		<li IfModActive="ADE.AdvancedTurretsA.copy.Mod">ModPatches/ADE Advanced turrets PLUS</li>
+		<li IfModActive="ADE.pulseTurrets.Mod">ModPatches/ADE Pulse Turrets PLUS</li>
+		<li IfModActive="spoonshortage.ADogSaidAnimalProsthetics">ModPatches/ADogSaid</li>
+		<li IfModActive="Ravvy.AMW">ModPatches/Advanced Mechanoid Warfare</li>
+		<li IfModActive="Mlie.AdvancedMortar">ModPatches/Advanced Mortar</li>
+		<li IfModActive="EV.all.tech.melee">ModPatches/All-Tech Melee</li>
+		<li IfModActive="sarg.alphaanimals">ModPatches/Alpha Animals</li>
+		<li IfModActive="sarg.alphabiomes">ModPatches/Alpha Biomes</li>
+		<li IfModActive="sarg.alphagenes">ModPatches/Alpha Genes</li>
+		<li IfModActive="Sarg.AlphaMemes">ModPatches/Alpha Memes</li>
+		<li IfModActive="sarg.magicalmenagerie">ModPatches/Alpha Mythology</li>
+		<li IfModActive="sarg.alphaships">ModPatches/Alpha Ships</li>
+		<li IfModActive="sarg.alphavehiclesneolithic">ModPatches/Alpha Vehicle</li>
+		<li IfModActive="hlx.UltratechAlteredCarbon">ModPatches/Altered Carbon Ultratech Unleashed</li>
+		<li IfModActive="aa.warcaskets.rw">ModPatches/Ancient Arsenal Warcaskets</li>
+		<li IfModActive="bbbbilly.ancientbladecyborg">ModPatches/Ancient Blade Cyborg</li>
+		<li IfModActive="zal.easternarmory">ModPatches/Ancient Eastern Armory</li>
+		<li IfModActive="Fallout.Armory.Geminingen">ModPatches/Ancient Fallout Armory</li>
+		<li IfModActive="bbbbilly.ancienthuman">ModPatches/Ancient Human</li>
+		<li IfModActive="Mlie.AndroidTiersTXSeries">ModPatches/Android Tiers - TX Series</li>
+		<li IfModActive="Killathon.AndroidTiersReforged">ModPatches/Android Tiers Reforged</li>
+		<li IfModActive="Mlie.AndroidTiersSM7Overhaul">ModPatches/Android Tiers SM7 Overhaul</li>
+		<li IfModActive="ChJees.Androids, ChJees.Androids14">ModPatches/Androids</li>
+		<li IfModActive="peptide.androidsexpanded, rielle.androidsexpanded">ModPatches/Androids Expanded</li>
+		<li IfModActive="hh.xrushha.AnimaAnimalsCombined">ModPatches/Anima Animals - Community Temp</li>
+		<li IfModActive="Seti.AnimaBodies">ModPatches/Anima Bionics</li>
+		<li IfModActive="xrushha.AnimaGear">ModPatches/Anima Gear</li>
+		<li IfModActive="OhGodSpidersNo.AnimalArmor.Vanilla">ModPatches/Animal Armor - Vanilla</li>
+		<li IfModActive="Owlchemist.AnimalGear.Equipment">ModPatches/Animal Equipment</li>
+		<li IfModActive="rmk.anthrorace">ModPatches/Anthro Race</li>
+		<li IfModActive="Mlie.Antinium">ModPatches/Antinium</li>
+		<li IfModActive="Roo.AntyRaceMod">ModPatches/Anty the war Ant</li>
+		<li IfModActive="Millap.AOC">ModPatches/AOC The Cleanup Devil</li>
+		<li IfModActive="Mlie.ApexRimworldLegends">ModPatches/Apex - Rimworld Legends</li>
+		<li IfModActive="Shinzy.Apparello">ModPatches/Apparello</li>
+		<li IfModActive="scpchemfuel.appliances">ModPatches/Appliances Expanded</li>
+		<li IfModActive="AR13S.Arachne1point0, Mlie.ArachneRace">ModPatches/Arachne</li>
+		<li IfModActive="ALIEN.ArasakaCorporation">ModPatches/Arasaka Corporation [1.3]</li>
+		<li IfModActive="JangoDsoul.Archotech.PowerArmor">ModPatches/Archotech PowerArmor</li>
+		<li IfModActive="Edern.ArchotechWeaponry">ModPatches/Archotech Weaponry</li>
+		<li IfModActive="Mlie.ArchotechPlus">ModPatches/Archotech+</li>
+		<li IfModActive="Mlie.ArgoniansofBlackmarsh">ModPatches/Argonians of Blackmarsh</li>
+		<li IfModActive="Mlie.ArrowPlease">ModPatches/Arrow Please</li>
+		<li IfModActive="Greiger.AsperoRace">ModPatches/Aspero Race</li>
+		<li IfModActive="Roskii.Astoriel">ModPatches/Astoriel Legacy</li>
+		<li IfModActive="Odz.40k.ImperialGuard.Cadian">ModPatches/Astra Militarum Regimentum - Cadia</li>
+		<li IfModActive="Odz.40k.ImperialGuard.DKOK">ModPatches/Astra Militarum Regimentum - Krieg</li>
+		<li IfModActive="Knorke.40k.ImperialGuard.DKOK.OfficerHelmet">ModPatches/Astra Militarum Regimentum - Krieg Officer Helmet</li>
+		<li IfModActive="Flyingstar.AutoMortarsUnofficial">ModPatches/Auto-Mortars</li>
+		<li IfModActive="automatic.autocleaner">ModPatches/Autocleaner</li>
+		<li IfModActive="Heymyteamrules.BeastManTribes">ModPatches/Beast Man Tribes</li>
+		<li IfModActive="Mlem.beeralope">ModPatches/Beeralope Squad</li>
+		<li IfModActive="divineDerivative.AutoWool">ModPatches/Better Wool Production</li>
+		<li IfModActive="BiomesTeam.BiomesCore">ModPatches/Biomes Core</li>
+		<li IfModActive="biotexpans.mammalia">ModPatches/Biotech Expansion - Mammalia</li>
+		<li IfModActive="biotexpans.mythic">ModPatches/Biotech Expansion - Mythic</li>
+		<li IfModActive="MrKociak.BiotechMoreMechStuffMechUpgradePod">ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2</li>
+		<li IfModActive="Phonicmas.PrestigeMechlordArmor">ModPatches/Biotech Prestige Mechlord Armor 1.4</li>
+		<li IfModActive="Zeitloser.BirdsBeyond.TF">ModPatches/Birds Beyond - Temperate Forest</li>
+		<li IfModActive="Millap.Bori">ModPatches/Bori Race</li>
+		<li IfModActive="itzal.bws">ModPatches/British Weapons Set</li>
+		<li IfModActive="Rick.HBulgariaUniforms">ModPatches/Bulgarian Imperial Uniforms</li>
+		<li IfModActive="rimofmadness.CallofCthulhuCosmicHorrors">ModPatches/Call of Cthulhu - Cosmic Horrors</li>
+		<li IfModActive="Oblitus.Carbon">ModPatches/Carbon</li>
+		<li IfModActive="ALIEN.CensoredArmory">ModPatches/Censored Armory</li>
+		<li IfModActive="Taranchuk.ClaySoldeirs">ModPatches/Clay Soldier Race</li>
+		<li IfModActive="Mckay.ColonyLeadership.11">ModPatches/Colony Leadership</li>
+		<li IfModActive="CEC.CombatEnthuCore, Mlie.CombatEnthusiastsCollection">ModPatches/Combat Enthusiast&apos;s Collection</li>
+		<li IfModActive="ComigoGames.Water.Turrets">ModPatches/Comigo&apos;s Fancy Floating Turrets</li>
+		<li IfModActive="ONegative.CommunicableDiseases">ModPatches/Communitable Diseases</li>
+		<li IfModActive="Jewsader.Cossacks.Rimworld_copy">ModPatches/Cossacks of the Rim</li>
+		<li IfModActive="CP.British.Military.Kit">ModPatches/CP British Military Kit</li>
+		<li IfModActive="CP.Spec.Ops.The.Line">ModPatches/CP Spec Ops The Line</li>
+		<li IfModActive="Canon.CrownsandRegalia">ModPatches/Crowns and Regalia</li>
+		<li IfModActive="Mlie.CuprosAlloys">ModPatches/CuprosAlloys</li>
+		<li IfModActive="DanDMan.CursedGuns">ModPatches/Cursed Guns</li>
+		<li IfModActive="K.CyberNet">ModPatches/Cybernet</li>
+		<li IfModActive="Mlie.CyberneticWarfare">ModPatches/Cybernetic Warfare and Special Weapons</li>
+		<li IfModActive="Van.DATools">ModPatches/Dark Ages - Medieval Tools</li>
+		<li IfModActive="nilchei.darkestnightsksteam">ModPatches/Darkest Night SK Steam</li>
+		<li IfModActive="DevDesigner.Elves">ModPatches/DD Elves</li>
+		<li IfModActive="DevDesigner.Blood">ModPatches/DD House Sanguin</li>
+		<li IfModActive="DetVisor.EnergyWeapons">ModPatches/Det&apos;s Energy Weapons</li>
+		<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="BotchJob.divineorder">ModPatches/Divine Order</li>
+		<li IfModActive="D4egon.MagicWand">ModPatches/DMWands</li>
+		<li IfModActive="Mlie.DoomFactions">ModPatches/Doom Factions</li>
+		<li IfModActive="onyxae.dragonsdescent">ModPatches/Dragons Descent</li>
+		<li IfModActive="Dubwise.Rimatomics">ModPatches/Dubs Rimatomics</li>
+		<li IfModActive="Dumbs.DumbsDachshunds">ModPatches/Dumbs&apos; Dachshunds</li>
+		<li IfModActive="Harkon.DF.Dusk">ModPatches/Dusk Armory</li>
+		<li IfModActive="Rabbit.EdgeOfDescension">ModPatches/Edge of Descension - Monoblades</li>
+		<li IfModActive="Nazgul.EisenhansPowerArmor">ModPatches/Eisenhans Power Armor</li>
+		<li IfModActive="Macca.eltexsuit">ModPatches/Eltex Bodysuit</li>
+		<li IfModActive="Ykara.EPOE">ModPatches/EPOE</li>
+		<li IfModActive="vat.epoeforked">ModPatches/EPOE Forked</li>
+		<li IfModActive="vat.epoeforkedroyalty">ModPatches/EPOE Forked Royalty DLC expansion</li>
+		<li IfModActive="Outremer.Epona">ModPatches/Epona Race</li>
+		<li IfModActive="Hauvega.EquiumsSeries.Equiums">ModPatches/Equium</li>
+		<li IfModActive="Erin.AuRa">ModPatches/Erin&apos;s Au Ra</li>
+		<li IfModActive="Erin.Koyan">ModPatches/Erin&apos;s Auronya</li>
+		<li IfModActive="Erin.AuronyaBiotech">ModPatches/Erin&apos;s Auronya Biotech</li>
+		<li IfModActive="Erin.Azaphrae">ModPatches/Erin&apos;s Azaphrae</li>
+		<li IfModActive="Erin.Chocobos">ModPatches/Erin&apos;s Chocobos</li>
+		<li IfModActive="Erin.FFRaces">ModPatches/Erin&apos;s Final Fantasy Races</li>
+		<li IfModActive="Erin.Foxsquirrel">ModPatches/Erin&apos;s Fox Squirrel</li>
+		<li IfModActive="Erin.Ferret">ModPatches/Erin&apos;s Friendly Ferrets</li>
+		<li IfModActive="Erin.LizzardDoggo">ModPatches/Erin&apos;s Lizard Doggo</li>
+		<li IfModActive="Erin.Miqote">ModPatches/Erin&apos;s Miqo&apos;te</li>
+		<li IfModActive="Erin.Mountain">ModPatches/Erin&apos;s Mountain Animals</li>
+		<li IfModActive="Erin.Sephyr">ModPatches/Erin&apos;s Sephyr</li>
+		<li IfModActive="Erin.Shisune">ModPatches/Erin&apos;s Shisune</li>
+		<li IfModActive="Erin.Valheim.Creatures">ModPatches/Erin&apos;s Valheim Creatures</li>
+		<li IfModActive="Erin.Viera">ModPatches/Erin&apos;s Viera</li>
+		<li IfModActive="pphhyy.ESCP.Spriggan">ModPatches/ESCP - Spriggans</li>
+		<li IfModActive="SirMashedPotato.ESCP.Trolls">ModPatches/ESCP - Trolls</li>
+		<li IfModActive="StatistNo1.EvolvedOrgansRedux">ModPatches/EvolvedOrgansRedux</li>
+		<li IfModActive="xedos.arsenalexotic">ModPatches/Exotic Arsenal</li>
+		<li IfModActive="Argon.VMEuP">ModPatches/Expanded Materials - Plastics</li>
+		<li IfModActive="Adventurer.ExpandWoodwork">ModPatches/Expanded Woodworking</li>
+		<li IfModActive="Skullywag.ExtendedStorage, Mlie.ExtendedStorage">ModPatches/Extended Storage</li>
+		<li IfModActive="Qux.factionmafia">ModPatches/Faction - Mafia</li>
+		<li IfModActive="zal.fnveliteriotgear">ModPatches/Fallout New Vegas - Elite Riot Gear</li>
+		<li IfModActive="mercurydoll.fantasymetals">ModPatches/Fantasy Metals Reforged</li>
+		<li IfModActive="Mlie.FarmingExpansion">ModPatches/Farming Expansion</li>
+		<li IfModActive="spoonshortage.fashionrimsta">ModPatches/FashionRIMsta</li>
+		<li IfModActive="RicoFox233.FGO.StylesApparelPack">ModPatches/Fate Grand Order Styles Pack</li>
+		<li IfModActive="yanzihko.FFR">ModPatches/Feles - Felines of the Rim [1.3]</li>
+		<li IfModActive="Ottersholdhands.FellTribes">ModPatches/Fell Tribes</li>
+		<li IfModActive="Mlie.FerrexRace">ModPatches/Ferrex</li>
+		<li IfModActive="Freefolk.Bushi">ModPatches/FF Bushi!</li>
+		<li IfModActive="forestfey.GermanShepherd">ModPatches/FFGermanSheperd</li>
+		<li IfModActive="Mlie.FilthyOrcInvasion">ModPatches/Filthy Orc Invasion</li>
+		<li IfModActive="VerriganHolmes.FlakDusters">ModPatches/Flak Dusters</li>
+		<li IfModActive="Venomancer777.Forgelings">ModPatches/Forgelings race</li>
+		<li IfModActive="salmontoastie.lizardfolk_copy_copy">ModPatches/Forgotten Realms - Lizardfolk</li>
+		<li IfModActive="salmontoastie.Minotaur">ModPatches/Forgotten Realms - Minotaur</li>
+		<li IfModActive="Fort.Firefighter">ModPatches/Fort&apos;s Firefighter Gadget</li>
+		<li IfModActive="JangoDsoul.FROG.MGS4">ModPatches/FROG Suit Set</li>
+		<li IfModActive="FrozenSnowFox.MorePsycastPowers">ModPatches/FSF More Psycasts Powers</li>
+		<li IfModActive="TheKingInYellow.Lope">ModPatches/Fuck it Unboomas your Lope</li>
+		<li IfModActive="com.distman.gastrap">ModPatches/Gas Traps and Shells</li>
+		<li IfModActive="hlx.GestaltEngine">ModPatches/Gestalt Engine</li>
+		<li IfModActive="Owlchemist.GiddyUp">ModPatches/Giddy-Up 2</li>
+		<li IfModActive="RicoFox233.GirlsFrontline.404Team">ModPatches/Girls Frontline Styles 404 Team</li>
+		<li IfModActive="RicoFox233.GirlsFrontline.ARTeam">ModPatches/Girls Frontline Styles AR Team</li>
+		<li IfModActive="Nfar.GFWP">ModPatches/Girls Frontline Weapon Pack</li>
+		<li IfModActive="detvisor.glitterweaponry">ModPatches/Glitter Weaponry</li>
+		<li IfModActive="RooAndGloomy.DragonianRaceMod">ModPatches/Gloomy Dragonian Race</li>
+		<li IfModActive="spoonshortage.gourimet">ModPatches/GouRIMet</li>
+		<li IfModActive="Grimworld.Autoguns">ModPatches/Grimworld Autoguns</li>
+		<li IfModActive="Grimworld.Lasguns">ModPatches/Grimworld Lasguns</li>
+		<li IfModActive="Grimworld.Melee">ModPatches/Grimworld Melee</li>
+		<li IfModActive="pphhyy.Gulden">ModPatches/Gulden Mod</li>
+		<li IfModActive="Monti.HalfDragons">ModPatches/Half Dragons</li>
+		<li IfModActive="HLX.RimworldUNSCArmoury">ModPatches/Halo - UNSC Armoury</li>
+		<li IfModActive="TheInfinityIQ.Halo.UNSC_copy">ModPatches/Halo Ammo</li>
+		<li IfModActive="TheInfinityIQ.Halo.UNSC_copy">ModPatches/Halo UNSC Weapon Pack</li>
+		<li IfModActive="PitchStone.HeavyMeleeWeapons, Mlie.HeavyMeleeWeapons">ModPatches/Heavy Melee Weapons</li>
+		<li IfModActive="Bando.Heyrathehorned">ModPatches/Heyra the Horned</li>
+		<li IfModActive="Mlie.HighTechLaboratoryFacilities">ModPatches/High Tech Laboratory Facilities</li>
+		<li IfModActive="Hive.Armory.Geminingen">ModPatches/Hive Armory</li>
+		<li IfModActive="Ayameduki.HARIdhale">ModPatches/Idhale Race</li>
+		<li IfModActive="detvisor.impactweaponry">ModPatches/Impact Weaponry</li>
+		<li IfModActive="ia.royalwarcasket.rw">ModPatches/Imperial Arsenal Royal Warcasket</li>
+		<li IfModActive="syrchalis.individuality">ModPatches/Individuality</li>
+		<li IfModActive="iexist.industrial.melee.weaponry">ModPatches/Industrial Melee Weaponry</li>
+		<li IfModActive="Mlie.InfinityRimAriadna">ModPatches/Infinity Rim Ariadna</li>
+		<li IfModActive="jemlpro.Infusion2Expansion">ModPatches/Infused 2 Expansion</li>
+		<li IfModActive="latta.infusion">ModPatches/Infusion 2</li>
+		<li IfModActive="SirMashedPotato.InsectsHaveChitin">ModPatches/Insects have chitin</li>
+		<li IfModActive="Poetik.JapaneseDogs">ModPatches/Japanese Dogs</li>
+		<li IfModActive="JangoDsoul.CastleWalls">ModPatches/JDS Castle Walls</li>
+		<li IfModActive="JangoDsoul.EFT.Apparel">ModPatches/JDS EFT Apparel</li>
+		<li IfModActive="JangoDsoul.TheForge.NCRArmory">ModPatches/JDS The Forge - NCR Armory</li>
+		<li IfModActive="JPT.OpenTheWindows">ModPatches/JPT Open The Windows</li>
+		<li IfModActive="K4G.Core">ModPatches/K4G Empires of Old - Core</li>
+		<li IfModActive="K4G.RWW2">ModPatches/K4G Rimworld War 2</li>
+		<li IfModActive="ALIEN.KaiserArmory">ModPatches/Kaiser Armory</li>
+		<li IfModActive="psyche.kemomimihouse">ModPatches/Kemomimihouse</li>
+		<li IfModActive="Moo.kemomimihouse.Kz">ModPatches/kemomimihouse Kz</li>
+		<li IfModActive="Kenshi.Armory.Geminingen, biowreck.KenshiArmory">ModPatches/Kenshi Armory</li>
+		<li IfModActive="ssulunge.KijinRace2">ModPatches/Kijin 2.0</li>
+		<li IfModActive="RicoFox233.KLKApparel">ModPatches/Kill la Kill Styles Pack</li>
+		<li IfModActive="JangoDsoul.Bot.Soldier">ModPatches/Killzone Concept Armor Set</li>
+		<li IfModActive="KIT.GunpowderWeapons">ModPatches/Kit&apos;s Gunpowder Weapons</li>
+		<li IfModActive="KIT.IndustrialWeapons">ModPatches/Kit&apos;s Industrial Weapons</li>
+		<li IfModActive="KIT.RomanWeapons">ModPatches/Kit&apos;s Roman Weapons</li>
+		<li IfModActive="KIT.VFEWeapons, KIT.VFEWeapons">ModPatches/Kit&apos;s VFE Weapons</li>
+		<li IfModActive="KF.KoboldFactions">ModPatches/Kobold Factions</li>
+		<li IfModActive="Goob.Kobolds">ModPatches/Kobolds of the Rim</li>
+		<li IfModActive="Inoshishi3.KTTFDE">ModPatches/Kurin Deluxe Patch</li>
+		<li IfModActive="handandfootwear.kv.rw">ModPatches/KV Hand n Footwear</li>
+		<li IfModActive="MikeRobe.LeeaniPlayableRace">ModPatches/Leeani</li>
+		<li IfModActive="SoulessOne.Lemolim">ModPatches/Lemolim Race</li>
+		<li IfModActive="akairo.LetsHaveaCat">ModPatches/Let&apos;s Have a Cat!</li>
+		<li IfModActive="LeFaux.NODbrotherhood">ModPatches/LF Command And Conquer NOD Combat Armor</li>
+		<li IfModActive="LeFaux.RedDawnSovietMultiKit">ModPatches/LF Red Dawn</li>
+		<li IfModActive="Ayameduki.HARLittluna">ModPatches/Littluna Race</li>
+		<li IfModActive="Mlie.LogannRace">ModPatches/Logann</li>
+		<li IfModActive="Pal5k.LogisticsMechanoid">ModPatches/Logistics_Mechanoid</li>
+		<li IfModActive="LimeTreeSnake.Military">ModPatches/LTS Military</li>
+		<li IfModActive="EL.MOW">ModPatches/Machines of War</li>
+		<li IfModActive="Sig.MantodeanRace">ModPatches/Mantodean Insectoid Race</li>
+		<li IfModActive="SutSutMan.MarilyntheMinchoWorshipperWitch">ModPatches/Marilyn the Mincho Worshipper Witch</li>
+		<li IfModActive="RaZim.ZGFMartens">ModPatches/Martens - Nature&apos;s Most Adorable Assassins</li>
+		<li IfModActive="deathwing.gethrace">ModPatches/Mass Effect - Playable Geth</li>
+		<li IfModActive="mod5s.MatterManipulator">ModPatches/Matter Manipulator</li>
+		<li IfModActive="JangoDsoul.Mechanized">ModPatches/Mechanized Armor Set</li>
+		<li IfModActive="JGH.MechanoidBench2">ModPatches/Mechanoid Bench 2 JGH</li>
+		<li IfModActive="JGH.MechanoidBench3">ModPatches/Mechanoid Bench 3 JGH</li>
+		<li IfModActive="Mlie.MechanoidMasterBlaster">ModPatches/Mechanoid Master Blaster</li>
+		<li IfModActive="Spino.MechanoidsExtraordinaire">ModPatches/MechanoidsExtraordinaire</li>
+		<li IfModActive="Abraxas.MSERevived">ModPatches/Medical System Expansion - Revived</li>
+		<li IfModActive="MSE2.Core">ModPatches/Medical System Expansion 2</li>
+		<li IfModActive="Mlie.MedicalSupplements">ModPatches/Medicine Supplements (Continued)</li>
+		<li IfModActive="JoeDaly.MedMeds.MO">ModPatches/Medieval Medicines 1.4 Medieval Overhaul Edition</li>
+		<li IfModActive="DankPyon.Medieval.Overhaul">ModPatches/Medieval Overhaul</li>
+		<li IfModActive="Arisher.Medieval.Tailor">ModPatches/Medieval Tailor</li>
+		<li IfModActive="Spino.Megafauna">ModPatches/Megafauna</li>
+		<li IfModActive="AOBA.Gekko">ModPatches/Metal Gear Rimworld-Gekko</li>
+		<li IfModActive="Killathon.MechHumanlikes.AndroidTiersCore">ModPatches/MH Android Tiers Core</li>
+		<li IfModActive="Killathon.MechHumanlikes.MechanicalBiomimetics">ModPatches/MH Mechanical Biomimetics</li>
+		<li IfModActive="Killathon.MechHumanlikes.MilitaryTiers">ModPatches/MH Military Tiers</li>
+		<li IfModActive="miathea.flakarmorexpansion">ModPatches/Midworld Expanded Flak Armor</li>
+		<li IfModActive="miathea.midworldweaponryexpanded">ModPatches/Midworld Weaponry Expanded</li>
+		<li IfModActive="miho.fortifiedoutremer">ModPatches/Miho Race</li>
+		<li IfModActive="Rikiki.MiningCo.MiningHelmet">ModPatches/MiningCo. MiningHelmet</li>
+		<li IfModActive="Rikiki.MiningCo.Spaceship">ModPatches/MiningCo. Spaceship</li>
+		<li IfModActive="Haplo.Miscellaneous.Core">ModPatches/Misc Core</li>
+		<li IfModActive="Haplo.Miscellaneous.MAI">ModPatches/Misc MAI</li>
+		<li IfModActive="Haplo.Miscellaneous.Robots">ModPatches/MiscRobots</li>
+		<li IfModActive="Haplo.Miscellaneous.TurretBaseAndObjects">ModPatches/MiscTurrets</li>
+		<li IfModActive="dninemfive.moa">ModPatches/Moa</li>
+		<li IfModActive="Moonjelly.Race.Mod, zal.moonjelly">ModPatches/Moonjelly Race</li>
+		<li IfModActive="Taranchuk.MoreArchotechGarbageContinued">ModPatches/More Archotech Garbage Continued</li>
+		<li IfModActive="Meltup.MoreConsumablesAndMutagens.Reworked">ModPatches/More Consumables And Mutagens</li>
+		<li IfModActive="Domi.MoreMedievalHelms">ModPatches/More Medieval Helms and Armor</li>
+		<li IfModActive="Arquebus.MorePersonaTraits">ModPatches/More Persona Traits</li>
+		<li IfModActive="BOXrsxx.MorePracticalTraits">ModPatches/More Practical Traits</li>
+		<li IfModActive="noodlesking.MorePsycasts">ModPatches/More Psycasts</li>
+		<li IfModActive="SGC.moreutilitypacks">ModPatches/More Utility Packs</li>
+		<li IfModActive="paradox.morevanillaturrets">ModPatches/More Vanilla Turrets</li>
+		<li IfModActive="Orion.MoreMechanoids">ModPatches/MoreMechanoids</li>
+		<li IfModActive="Morgante.MorganteMafiaWeaponsPack_copy">ModPatches/Morgante Mafia Weapons Pack</li>
+		<li IfModActive="SirMashedPotato.MorrowRim.AshSwamp">ModPatches/MorrowRim - Ashlands Swamp</li>
+		<li IfModActive="SirMashedPotato.MorrowRim.Bloodmoon">ModPatches/MorrowRim - Bloodmoon</li>
+		<li IfModActive="SirMashedPotato.MorrowRim.ColovianFurHelm">ModPatches/MorrowRim - Colovian Fur Helm</li>
+		<li IfModActive="Nemonian.MYCartel">ModPatches/Moyo Cartel</li>
+		<li IfModActive="Nemonian.MY">ModPatches/Moyo from the depth</li>
+		<li IfModActive="AOBA.RedMoyo">ModPatches/Moyo light in the abyss</li>
+		<li IfModActive="Zayl.NakinRace">ModPatches/Nakin Race</li>
+		<li IfModActive="Remo.Nanosuit">ModPatches/Nanosuit</li>
+		<li IfModActive="Ayameduki.HARNearmare">ModPatches/Nearmare Race</li>
+		<li IfModActive="Ayameduki.HARNeclose">ModPatches/Neclose Race</li>
+		<li IfModActive="Slashandz.MiniMiner">ModPatches/New Mech - Mini-Miner</li>
+		<li IfModActive="Solaris.RatkinRaceMod">ModPatches/NewRatkinPlus</li>
+		<li IfModActive="Aoba.Cannon, Mlie.NotOnlyJustACannon">ModPatches/Not Only Just A Cannon</li>
+		<li IfModActive="PrivateGER.Nukes.Shells">ModPatches/Nukes</li>
+		<li IfModActive="Farmradish.Nyaron">ModPatches/Nyaron</li>
+		<li IfModActive="neronix17.fr.content.dni">ModPatches/O21 Dragons Not Included</li>
+		<li IfModActive="neronix17.fr.compilation">ModPatches/O21 Forgotten Realms</li>
+		<li IfModActive="Neronix17.Outland.Core">ModPatches/O21 Outland - Core</li>
+		<li IfModActive="Neronix17.Outland.EastbornEmpire">ModPatches/O21 Outland - Eastborn</li>
+		<li IfModActive="Neronix17.Outland.MotzCoalition">ModPatches/O21 Outland - Motz Coalition</li>
+		<li IfModActive="Odz.WWII.Stalingrad.Uniforms">ModPatches/ODZ Stalingrad - Uniforms</li>
+		<li IfModActive="1.3.Odz.Suits">ModPatches/ODZ Suits</li>
+		<li IfModActive="oracle.possumfriends">ModPatches/Opossum Friends</li>
+		<li IfModActive="dianawinters.Orassans">ModPatches/Orassans</li>
+		<li IfModActive="Odz.40k.OrdoTempestus.TempestusScions">ModPatches/Ordo Tempestus - Tempestus Scions</li>
+		<li IfModActive="riprusse.rfPalmCats">ModPatches/Palm Cats</li>
+		<li IfModActive="AhnDemi.PanieltheAutomata">ModPatches/Paniel the Automata</li>
+		<li IfModActive="shauaputa.pawnboldrace">ModPatches/Pawnbold Race</li>
+		<li IfModActive="Vanya.Polarisbloc.CoreLab">ModPatches/Polarisbloc Core Lab</li>
+		<li IfModActive="Vanya.Polarisbloc.SecurityForce">ModPatches/Polarisbloc Security Force</li>
+		<li IfModActive="milk.poleepkwaupdate, GHOST.Poleepkwa">ModPatches/Poleepkwa Race</li>
+		<li IfModActive="BotchJob.PossessedWeapons">ModPatches/Possesed Weapons</li>
+		<li IfModActive="JangoDsoul.T45b.PowerArmor">ModPatches/PowerArmour T-45b</li>
+		<li IfModActive="pphhyy.DemigryphsMod">ModPatches/pphhyy Demigryph</li>
+		<li IfModActive="pphhyy.ExpandedMechsScyther">ModPatches/pphhyy Expanded Scythers</li>
+		<li IfModActive="pphhyy.SanguinaryAnimals">ModPatches/pphhyy Sanguinary Animals</li>
+		<li IfModActive="Pratt.RaW.WWIIWeaponsPackVanilla">ModPatches/Pratt WWII Weapons Pack</li>
+		<li IfModActive="PrestigePhoenix.maltum">ModPatches/Prestige Specialist Armor</li>
+		<li IfModActive="PRF.Materials">ModPatches/Project RimFactory - Materials</li>
+		<li IfModActive="DimonSever000.ProsthesesPlus13.Specific">ModPatches/Prostheses+</li>
+		<li IfModActive="bonible.protoswords">ModPatches/Protoswords</li>
+		<li IfModActive="K.PsiTech">ModPatches/PsiTech</li>
+		<li IfModActive="detvisor.pulseweaponry">ModPatches/Pulse Weaponry</li>
+		<li IfModActive="Mlie.PulsefireTurret">ModPatches/Pulsefire Turret</li>
+		<li IfModActive="sargoskar.racetotherim">ModPatches/Race to the Rim</li>
+		<li IfModActive="Declinedkilr.RadWorld_copy">ModPatches/RadWorld</li>
+		<li IfModActive="Rah.RVTE">ModPatches/Rah&apos;s Vanilla Turrets Expansion</li>
+		<li IfModActive="Mlie.RamboWeaponsPack">ModPatches/Rambo Weapons Pack</li>
+		<li IfModActive="Rin.RatkinApparel">ModPatches/Ratkin Apparel+</li>
+		<li IfModActive="JangoDsoul.Ratnik3">ModPatches/Ratnik-3 Prototype Armor</li>
+		<li IfModActive="Bonible.ReconMech">ModPatches/Recon Mechanoid</li>
+		<li IfModActive="Mlie.RedArmy">ModPatches/Red Army</li>
+		<li IfModActive="vonschtirlitz.RCA">ModPatches/Redcoat Apparel</li>
+		<li IfModActive="ReGrowth.BOTR.Core">ModPatches/ReGrowth - Core</li>
+		<li IfModActive="ReGrowth.BOTR.ExtinctAnimalsPack">ModPatches/ReGrowth - Extinct Animals</li>
+		<li IfModActive="tikubonn.RemoteDetonator">ModPatches/Remote Detonator</li>
+		<li IfModActive="FS.ReviaRace">ModPatches/Revia Race</li>
+		<li IfModActive="FS.ReviaRaceBiotech">ModPatches/Revia Race — biotech</li>
+		<li IfModActive="RH.DOOM">ModPatches/RH2 DOOM</li>
+		<li IfModActive="RH2.Faction.Bounty.Hunters">ModPatches/RH2 Faction - Bounty Hunters</li>
+		<li IfModActive="RH2.Faction.Task.Force.141">ModPatches/RH2 Faction - Task Force 141</li>
+		<li IfModActive="RH2.Faction.Rangers">ModPatches/RH2 Faction - The Rangers</li>
+		<li IfModActive="RH2.Faction.Utilitarian">ModPatches/RH2 Faction - Utilitarian</li>
+		<li IfModActive="RH2.Faction.VOID">ModPatches/RH2 Faction - VOID</li>
+		<li IfModActive="RH2.Metal.Gear.Solid">ModPatches/RH2 Metal Gear Solid</li>
+		<li IfModActive="CP.RimmuNation.2.Clothing">ModPatches/RH2 Rimmu-Nation² - Clothing</li>
+		<li IfModActive="CP.RimmuNation.2.Security">ModPatches/RH2 Rimmu-Nation² - Security</li>
+		<li IfModActive="CP.RimmuNation.2.Weapons">ModPatches/RH2 Rimmu-Nation² - Weapons</li>
+		<li IfModActive="Fenn.floodrace">ModPatches/Rim Flood</li>
+		<li IfModActive="VexedTrees980.RimGnoblinsBiotech">ModPatches/Rim Gnoblins</li>
+		<li IfModActive="sihv.rombones">ModPatches/Rim of Madness - Bones</li>
+		<li IfModActive="RimOfMadness.Vampires">ModPatches/Rim of Madness - Vampires</li>
+		<li IfModActive="RimEffect.AsariReapers">ModPatches/Rim-Effect Asari and Reapers</li>
+		<li IfModActive="RimEffect.Core">ModPatches/Rim-Effect Core</li>
+		<li IfModActive="RimEffect.Drell">ModPatches/Rim-Effect Drell</li>
+		<li IfModActive="RimEffect.ExtendedCut">ModPatches/Rim-Effect Extended Cut</li>
+		<li IfModActive="RimEffect.N7">ModPatches/Rim-Effect N7</li>
+		<li IfModActive="VexedTrees980.RimElvesBiotech">ModPatches/Rim-Elves</li>
+		<li IfModActive="VexedTrees980.RimUHiversI">ModPatches/Rim-Hivers!</li>
+		<li IfModActive="VexedTrees980.RimRobots">ModPatches/Rim-Robots!</li>
+		<li IfModActive="VexedTrees980.RimShek">ModPatches/Rim-Sheks!</li>
+		<li IfModActive="VexedTrees980.RimSkeletons">ModPatches/Rim-Skeletons</li>
+		<li IfModActive="Cabbage.RimCities">ModPatches/RimCities</li>
+		<li IfModActive="Ogam.Rimedieval.Royalty">ModPatches/Rimedieval - Medieval Royalty</li>
+		<li IfModActive="Dubwise.Rimefeller">ModPatches/Rimefeller</li>
+		<li IfModActive="Sierra.RF.HouseDoyle">ModPatches/RimFantasy - House Doyle</li>
+		<li IfModActive="Sierra.RF.MedievalOverhaul">ModPatches/RimFantasy - Medieval Overhaul Edition</li>
+		<li IfModActive="Aoba.GeryKnights.Dreadnought">ModPatches/RimHammer40k -Dreadnought</li>
+		<li IfModActive="CP.RimmuNation.Security">ModPatches/Rimmu-Nation - Security</li>
+		<li IfModActive="CP.RimmuNation.Weapons">ModPatches/Rimmu-Nation - Weapons</li>
+		<li IfModActive="sindre0830.rimnauts2">ModPatches/RimNauts 2</li>
+		<li IfModActive="shakesthespeare.RimsecSecurity">ModPatches/RimSec-Security</li>
+		<li IfModActive="Rimsenal.Spacer">ModPatches/Rimsenal - Spacer Faction Pack</li>
+		<li IfModActive="Rimsenal.Askbarn">ModPatches/Rimsenal Xenotype Pack - Askbarn</li>
+		<li IfModActive="Sierra.RT.GeneralTraits">ModPatches/RimTraits - General Traits</li>
+		<li IfModActive="Sierra.RT.MedievalTalents">ModPatches/RimTraits - Medieval Talents</li>
+		<li IfModActive="SirMashedPotato.DarkDescent">ModPatches/Rimworld - The Dark Descent</li>
+		<li IfModActive="sargoskar.witcherhunt">ModPatches/RimWorld - Witcher Monster Hunt</li>
+		<li IfModActive="DanDMan.RSPABSWGASE">ModPatches/RW Pilas and Bows</li>
+		<li IfModActive="Mlie.RRUESContactLightArmory">ModPatches/Risk of Rain UES Contact Light Armory</li>
+		<li IfModActive="goudaquiche.LtfRockmenRace">ModPatches/Rockmen Race</li>
+		<li IfModActive="Bucko.RoyalArsenal.SpecialtyWeapons">ModPatches/Royal Arsenal - Speciality Weapons</li>
+		<li IfModActive="Uveren.RoyalWarcaskets">ModPatches/Royal Warcaskets</li>
+		<li IfModActive="ravvy.DD.Void.Addon">ModPatches/RWY Dragon&apos;s Descent Void Dwellers</li>
+		<li IfModActive="Ayameduki.HARSaclean">ModPatches/Saclean Race</li>
+		<li IfModActive="Argon.SaltedMeatRemake">ModPatches/Salted Meat 2.0</li>
+		<li IfModActive="kentington.saveourship2">ModPatches/Save Our Ship 2</li>
+		<li IfModActive="odysseylotus.seren">ModPatches/Seren from Stardust</li>
+		<li IfModActive="Seventh.Seraph.Weapons">ModPatches/Seventh Seraph</li>
+		<li IfModActive="Ayameduki.HARSilkiera">ModPatches/Silkiera Race</li>
+		<li IfModActive="WGFLASH55.SimpleOgreRace">ModPatches/Simple Ogre Race</li>
+		<li IfModActive="Rottweiler.SimplyMoreMelee, Mlie.SimplyMoreMelee">ModPatches/Simply More Melee</li>
+		<li IfModActive="PunkyRoo.SlimeRancher">ModPatches/Slime Rancher</li>
+		<li IfModActive="Ayameduki.HARSolark">ModPatches/Solark Race</li>
+		<li IfModActive="Mlie.SpaceWorms">ModPatches/Spaceworm</li>
+		<li IfModActive="HALO.RSF, Mlie.RimworldSpartanFoundry">ModPatches/Spartan Foundry</li>
+		<li IfModActive="Mlie.SpidercampsHorses">ModPatches/Spidercamp&apos;s Horses</li>
+		<li IfModActive="BBIS.MaidProject">ModPatches/SS Maid Project</li>
+		<li IfModActive="AKRI.StarcraftersArmory_copy">ModPatches/Star Crafter&apos;s Armory</li>
+		<li IfModActive="walkingproblem.arachnid">ModPatches/Starship Troopers Arachnids</li>
+		<li IfModActive="Koni.Misc.SteamworldUniforms">ModPatches/Steamworld Uniforms</li>
+		<li IfModActive="det.sbdelights">ModPatches/Stoneborn - Delights</li>
+		<li IfModActive="Mlie.Swords">ModPatches/Swords</li>
+		<li IfModActive="syrchalis.harpy">ModPatches/SYR Harpy</li>
+		<li IfModActive="syrchalis.naga">ModPatches/SYR Naga</li>
+		<li IfModActive="Trickity.Conversion.Staff">ModPatches/T&apos;s Conversion Staff</li>
+		<li IfModActive="Trickity.Samurai.Faction">ModPatches/T&apos;s Samurai Faction</li>
+		<li IfModActive="balistafreak.TacticalExtremityProtection">ModPatches/Tactical Extremity Protection [BAL]</li>
+		<li IfModActive="TextilesPlus.velcroboy333">ModPatches/Textiles+</li>
+		<li IfModActive="MortStrudel.CorporationFaction">ModPatches/The Corporation - Mort&apos;s Factions</li>
+		<li IfModActive="HC.GiantRace">ModPatches/The GiantRace</li>
+		<li IfModActive="sarg.jorisexperience">ModPatches/The Joris Experience</li>
+		<li IfModActive="Wilco.Tuffalo">ModPatches/The Tuffalo</li>
+		<li IfModActive="Serek.TheWildFields">ModPatches/The Wild Fields</li>
+		<li IfModActive="Caninmyham.ThogsArmor">ModPatches/Thog&apos;s Armor</li>
+		<li IfModActive="Arquebus.ThrumboPlushie">ModPatches/Thrumbo Plushie</li>
+		<li IfModActive="syrchalis.thrumkin">ModPatches/Thrumkin</li>
+		<li IfModActive="Mlie.ToolmetricsRedux">ModPatches/Toolmetrics Redux</li>
+		<li IfModActive="RicoFox233.TouhouStyle.ScarletDevil">ModPatches/TouhouStyle</li>
+		<li IfModActive="Gunmar.TribalWarriorSet">ModPatches/Tribal Warrior Set</li>
+		<li IfModActive="ALIEN.TsarArmory">ModPatches/Tsar Armory</li>
+		<li IfModActive="eatKenny.leafzxg.TurretCollection">ModPatches/Turret Collection</li>
+		<li IfModActive="Mlie.TwilekRace">ModPatches/Twi&apos;lek Race</li>
+		<li IfModActive="UltraEmailMan.MoreMechanitorMechs">ModPatches/UEM More Mechanitor Mechs</li>
+		<li IfModActive="Bx395.UrbworldWeaponryCaseless">ModPatches/Urbworld Weaponry - Caseless</li>
+		<li IfModActive="Bx395.UrbworldWeaponrySmart">ModPatches/Urbworld Weaponry SDS</li>
+		<li IfModActive="wool.UselessClothes">ModPatches/Useless Clothes</li>
+		<li IfModActive="Ushanka.GlitterworldUprising">ModPatches/Ushankas Glitterworld Uprising</li>
+		<li IfModActive="RedMattis.Undead">ModPatches/Vampire, Demons, and the Undead</li>
+		<li IfModActive="VanillaExpanded.VanillaAnimalsExpanded">ModPatches/Vanilla Animals Expanded</li>
+		<li IfModActive="VanillaExpanded.VAERoy">ModPatches/Vanilla Animals Expanded - Royal Animals</li>
+		<li IfModActive="VanillaExpanded.VAEWaste">ModPatches/Vanilla Animals Expanded - Waste Animals</li>
+		<li IfModActive="VanillaExpanded.VAPPE">ModPatches/Vanilla Apparel Expanded</li>
+		<li IfModActive="VanillaExpanded.VAEAccessories">ModPatches/Vanilla Apparel Expanded - Accessories</li>
+		<li IfModActive="VanillaExpanded.VARME">ModPatches/Vanilla Armour Expanded</li>
+		<li IfModActive="VanillaExpanded.BaseGeneration">ModPatches/Vanilla Base Generation Expanded</li>
+		<li IfModActive="VanillaExpanded.VBrewE">ModPatches/Vanilla Brewing Expanded</li>
+		<li IfModActive="VanillaExpanded.VChemfuelE">ModPatches/Vanilla Chemfuel Expanded</li>
+		<li IfModActive="VanillaExpanded.VFEA">ModPatches/Vanilla Factions Expanded - Ancients</li>
+		<li IfModActive="OskarPotocki.VFE.Classical">ModPatches/Vanilla Factions Expanded - Classical</li>
+		<li IfModActive="OskarPotocki.VFE.Deserters">ModPatches/Vanilla Factions Expanded - Deserters</li>
+		<li IfModActive="OskarPotocki.VFE.Empire">ModPatches/Vanilla Factions Expanded - Empire</li>
+		<li IfModActive="OskarPotocki.VFE.Insectoid">ModPatches/Vanilla Factions Expanded - Insectoids</li>
+		<li IfModActive="OskarPotocki.VFE.Mechanoid">ModPatches/Vanilla Factions Expanded - Mechanoids</li>
+		<li IfModActive="OskarPotocki.VanillaFactionsExpanded.MedievalModule">ModPatches/Vanilla Factions Expanded - Medieval</li>
+		<li IfModActive="OskarPotocki.VFE.Pirates">ModPatches/Vanilla Factions Expanded - Pirates</li>
+		<li IfModActive="OskarPotocki.VanillaFactionsExpanded.SettlersModule">ModPatches/Vanilla Factions Expanded - Settlers</li>
+		<li IfModActive="OskarPotocki.VFE.Tribals">ModPatches/Vanilla Factions Expanded - Tribals</li>
+		<li IfModActive="OskarPotocki.VFE.Vikings">ModPatches/Vanilla Factions Expanded - Vikings</li>
+		<li IfModActive="VanillaExpanded.VFESecurity">ModPatches/Vanilla Furniture Expanded - Security</li>
+		<li IfModActive="VanillaExpanded.VGeneticsE">ModPatches/Vanilla Genetics Expanded</li>
+		<li IfModActive="VanillaExpanded.Ideo.Dryads">ModPatches/Vanilla Ideology Expanded - Dryads</li>
+		<li IfModActive="VanillaExpanded.VIEHAR">ModPatches/Vanilla Ideology Expanded - Hats and Rags</li>
+		<li IfModActive="VanillaExpanded.VMemesE">ModPatches/Vanilla Ideology Expanded - Memes and Structures</li>
+		<li IfModActive="VanillaExpanded.VPersonaWeaponsE">ModPatches/Vanilla Persona Weapons Expanded</li>
+		<li IfModActive="VanillaExpanded.VPlantsEMushrooms">ModPatches/Vanilla Plants Expanded - Mushrooms</li>
+		<li IfModActive="VanillaExpanded.VPsycastsE">ModPatches/Vanilla Psycasts Expanded</li>
+		<li IfModActive="VanillaExpanded.VPE.Hemosage">ModPatches/Vanilla Psycasts Expanded - Hemosage</li>
+		<li IfModActive="vanillaracesexpanded.android">ModPatches/Vanilla Races Expanded - Android</li>
+		<li IfModActive="vanillaracesexpanded.archon">ModPatches/Vanilla Races Expanded - Archon</li>
+		<li IfModActive="vanillaracesexpanded.fungoid">ModPatches/Vanilla Races Expanded - Fungoid</li>
+		<li IfModActive="vanillaracesexpanded.highmate">ModPatches/Vanilla Races Expanded - Highmate</li>
+		<li IfModActive="vanillaracesexpanded.hussar">ModPatches/Vanilla Races Expanded - Hussar</li>
+		<li IfModActive="vanillaracesexpanded.phytokin">ModPatches/Vanilla Races Expanded - Phytokin</li>
+		<li IfModActive="vanillaracesexpanded.sanguophage">ModPatches/Vanilla Races Expanded - Sanguophage</li>
+		<li IfModActive="vanillaracesexpanded.saurid">ModPatches/Vanilla Races Expanded - Saurid</li>
+		<li IfModActive="vanillaracesexpanded.waster">ModPatches/Vanilla Races Expanded - Waster</li>
+		<li IfModActive="vanillaexpanded.skills">ModPatches/Vanilla Skills Expanded</li>
+		<li IfModActive="VSE.PerryPersistent">ModPatches/Vanilla Storytellers Expanded - Perry Persistent</li>
+		<li IfModActive="VanillaStorytellersExpanded.WinstonWave">ModPatches/Vanilla Storytellers Expanded - Winston Waves</li>
+		<li IfModActive="OskarPotocki.VanillaVehiclesExpanded">ModPatches/Vanilla Vehicles Expanded</li>
+		<li IfModActive="OskarPotocki.VanillaVehiclesExpandedTier3">ModPatches/Vanilla Vehicles Expanded - Tier 3</li>
+		<li IfModActive="VanillaExpanded.VWE">ModPatches/Vanilla Weapons Expanded</li>
+		<li IfModActive="VanillaExpanded.VWEC">ModPatches/Vanilla Weapons Expanded - Coilguns</li>
+		<li IfModActive="VanillaExpanded.VWEFT">ModPatches/Vanilla Weapons Expanded - Frontier</li>
+		<li IfModActive="VanillaExpanded.VWEG">ModPatches/Vanilla Weapons Expanded - Grenades</li>
+		<li IfModActive="VanillaExpanded.VWEHW">ModPatches/Vanilla Weapons Expanded - Heavy Weapons</li>
+		<li IfModActive="VanillaExpanded.VWEMS">ModPatches/Vanilla Weapons Expanded - Makeshift</li>
+		<li IfModActive="VanillaExpanded.VWENL">ModPatches/Vanilla Weapons Expanded - Non-Lethal</li>
+		<li IfModActive="VanillaExpanded.VWEQ">ModPatches/Vanilla Weapons Expanded - Quickdraw</li>
+		<li IfModActive="VanillaExpanded.VWETB">ModPatches/Vanilla Weapons Expanded - Tribal</li>
+		<li IfModActive="KavaCaligula.VFClassicMechs">ModPatches/Vehicle Framework Expanded - Classic Mechs</li>
+		<li IfModActive="Mlie.XNDVanillaFriendlyAnimalSurgery">ModPatches/VFAS</li>
+		<li IfModActive="seos.vfe.mechanoids.drones">ModPatches/VFE - Mechanoids Drones</li>
+		<li IfModActive="dismarzero.VGP.VGPGardenFabrics">ModPatches/VGP Garden Fabrics</li>
+		<li IfModActive="rince.VREAfaction.coolmodru">ModPatches/VRE Android Factions</li>
+		<li IfModActive="Mlie.WallMountedTurrets">ModPatches/Wall Mounted Turrets</li>
+		<li IfModActive="Aoba.WarCasket">ModPatches/WarCasket Expanded</li>
+		<li IfModActive="Metalocif.WarcasketPersonaWeapons">ModPatches/Warcasket Persona Weapons</li>
+		<li IfModActive="Buffsboy474.SMWarcaskets.Ideology.Testing">ModPatches/Warcaskets - Adeptus Astartes</li>
+		<li IfModActive="Kompadt.Warhammer.Dryad">ModPatches/Warhammer - Dryad</li>
+		<li IfModActive="flangopink.GF40KMaterials">ModPatches/Warhammer 40.000 - Imperium Materials</li>
+		<li IfModActive="GF40K.IoM.Weaponry">ModPatches/Warhammer 40.000 - Imperium Weaponry</li>
+		<li IfModActive="Phonicmas.BiotechExpansionWarhammer40k">ModPatches/Warhammer 40k - Genes and Psycasts</li>
+		<li IfModActive="Thek.WTB">ModPatches/Waster Toxic Breather</li>
+		<li IfModActive="Kyrrisayo.WeaponsPlus">ModPatches/Weapons+</li>
+		<li IfModActive="Owlchemist.Windows">ModPatches/Windows</li>
+		<li IfModActive="VsEdit.ods.wwiigerman.uniforms">ModPatches/WWII German Uniforms</li>
+		<li IfModActive="TheWingedGuy.WWII.Soviet.Faction">ModPatches/WWII Soviet Faction</li>
+		<li IfModActive="Albion.Xenohumans">ModPatches/Xenohumans</li>
+		<li IfModActive="AveryTheKitty.XenohumansAnthromorphs">ModPatches/Xenohumans - Anthromorphs</li>
+		<li IfModActive="ILuvSilicon.XenohumansExpanded">ModPatches/Xenohumans Expanded</li>
+		<li IfModActive="Ayameduki.HARXenoorca">ModPatches/Xenoorca Race</li>
+		<li IfModActive="MrKociak.YetAnotherProstheticExpansionModCore">ModPatches/YetAnotherProsthetics - Core</li>
+		<li IfModActive="brrainz.zombieland">ModPatches/Zombieland</li>
+		<li IfModActive="sarg.alphamechs">ModPatches/Alpha Mechs</li>
+		<li IfModActive="ACPteam.ACPVanillaStyle">ModPatches/AnimalCollabProj</li>
+		<li IfModActive="Teok25.ArchotechExpanded">ModPatches/Archotech Expanded</li>
+		<li IfModActive="Teok25.ArchotechExpanded.Prosthetics">ModPatches/Archotech Expanded Prosthetics</li>
+		<li IfModActive="RedMattis.BigSmall.MedievalFactions">ModPatches/Big and Small - Medieval Factions</li>
+		<li IfModActive="RedMattis.BigSmall.MedievalOverhaulFactions">ModPatches/Big and Small - MO</li>
+		<li IfModActive="RedMattis.BigSmall.Core">ModPatches/Big and Small Genes</li>
+		<li IfModActive="RedMattis.BigSmall">ModPatches/Big and Small Races</li>
+		<li IfModActive="RedMattis.BigWeapons">ModPatches/Big and Small Weapons</li>
+		<li IfModActive="RedMattis.Heaven">ModPatches/Big and Small - Heaven and Hell</li>
+		<li IfModActive="RedMattis.Undead">ModPatches/Big and Small - Vampires and Undead</li>
+		<li IfModActive="BiomesTeam.BiomesCaverns">ModPatches/Biomes Caverns</li>
+		<li IfModActive="Mlie.BlackWidows">ModPatches/Black Widows</li>
+		<li IfModActive="Robotrowful.CODZombies">ModPatches/Call of Duty - Zombies Pack</li>
+		<li IfModActive="Bonible.Charge.Lee.Enfield">ModPatches/Charge-Loading Lee-Enfield</li>
+		<li IfModActive="JangoDsoul.TierArmor.Civil">ModPatches/Civilization Beyond Earth Armor Sets</li>
+		<li IfModActive="CP.DOOM">ModPatches/CP DOOM</li>
+		<li IfModActive="CP.DOOM.Kit">ModPatches/CP The DOOM Kit - Classic</li>
+		<li IfModActive="kikohi.cybernetic">ModPatches/Cybernetic Organism and Neural Network</li>
+		<li IfModActive="deon.darkestrim">ModPatches/Darkest Rim Core</li>
+		<li IfModActive="BlackMarket420.EccentricMilitors">ModPatches/Eccentric Militor</li>
+		<li IfModActive="Erin.Wildlife">ModPatches/Erin&apos;s Wildlife</li>
+		<li IfModActive="Argon.VMEu">ModPatches/Expanded Materials - Metals</li>
+		<li IfModActive="Mlie.FrontlineAdditionalGunsForBunkers">ModPatches/Frontline - Additional Guns For Bunkers</li>
+		<li IfModActive="Mlie.FrontlineAdditionalGunsForTrenches">ModPatches/Frontline - Additional Guns For Trenches</li>
+		<li IfModActive="Mlie.FrontlineBunkers">ModPatches/Frontline - Bunkers</li>
+		<li IfModActive="Mlie.FrontlineTrenches">ModPatches/Frontline - Trenches</li>
+		<li IfModActive="FrozenSnowFox.AdvancedBionicsExpansion">ModPatches/FSF Advanced Bionics Expansion</li>
+		<li IfModActive="FrozenSnowFox.VanillaBionicsExpansion">ModPatches/FSF Vanilla Bionics Expansion</li>
+		<li IfModActive="TenMoe.GFCL">ModPatches/Girls Frontline Apparel Pack</li>
+		<li IfModActive="GT.Sam.GlitterTech">ModPatches/Glitter Tech</li>
+		<li IfModActive="zal.highcaliber">ModPatches/High Caliber</li>
+		<li IfModActive="JangoDsoul.ExiledDawn">ModPatches/JDS Exiled Dawn</li>
+		<li IfModActive="JangoDsoul.StarWars.BTI">ModPatches/JDS Star Wars - Armory</li>
+		<li IfModActive="zal.skeletallegion">ModPatches/Jernalk&apos;s Skeletal Legion</li>
+		<li IfModActive="K4G.Guild">ModPatches/K4G Empires of Old - Engineers Institute</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>
+		<li IfModActive="k4g.weimarrepublicequipment">ModPatches/K4G Equipment of the Weimar Republic</li>
+		<li IfModActive="Seioch.Kurin.HAR">ModPatches/Kurin</li>
+		<li IfModActive="DetVisor.Makeshiftweapons">ModPatches/Makeshift Melee Weapons</li>
+		<li IfModActive="neronix17.mechadroids">ModPatches/Mechadroids</li>
+		<li IfModActive="Killathon.MechHumanlikes.AndroidTiers">ModPatches/MH Android Tiers</li>
+		<li IfModActive="SutSutMan.MinchoTheMintChocoSlimeHARver">ModPatches/Mincho, The Mint Choco Slime</li>
+		<li IfModActive="Morgante.WW2ItalianWeapons_copy">ModPatches/Morgante WW2 Italian Weapons</li>
+		<li IfModActive="SirMashedPotato.MorrowRim">ModPatches/MorrowRim</li>
+		<li IfModActive="zerithos.NiHal">ModPatches/Nihal</li>
+		<li IfModActive="neronix17.mechadroids">ModPatches/O21 Mechadroids</li>
+		<li IfModActive="ObsidiaExpansion.Xenos.Mothoids">ModPatches/Obsidia Expansion</li>
+		<li IfModActive="Neronix17.OuterRim.Csilla">ModPatches/Outer Rim - Chiss Ascendancy</li>
+		<li IfModActive="Neronix17.OuterRim.Core">ModPatches/Outer Rim - Core</li>
+		<li IfModActive="Mlie.OuterRimFactionTatooine">ModPatches/Outer Rim - Faction - Tatooine</li>
+		<li IfModActive="Neronix17.OuterRim.GalacticEmpire">ModPatches/Outer Rim - Galactic Empire</li>
+		<li IfModActive="Neronix17.OuterRim.GalacticRepublic">ModPatches/Outer Rim - Galactic Republic</li>
+		<li IfModActive="Neronix17.OuterRim.Mandalore">ModPatches/Outer Rim - Mandalore</li>
+		<li IfModActive="Neronix17.OuterRim.OldRepublic">ModPatches/Outer Rim - Old Republic</li>
+		<li IfModActive="Neronix17.OuterRim.RebelAlliance">ModPatches/Outer Rim - Rebel Alliance</li>
+		<li IfModActive="Neronix17.OuterRim.Separatists">ModPatches/Outer Rim - Seperatists</li>
+		<li IfModActive="Mlie.OuterRimTatooine">ModPatches/Outer Rim - Tatooine</li>
+		<li IfModActive="Mlie.OuterRimTatooineSandcrawler">ModPatches/Outer Rim - Tatooine Sandcrawler</li>
+		<li IfModActive="Neronix17.Outland.Core">ModPatches/Outland - Core</li>
+		<li IfModActive="Neronix17.Outland.RedburnPact">ModPatches/Outland - Redburn Pact</li>
+		<li IfModActive="Mlie.CutePenguin">ModPatches/Penguin</li>
+		<li IfModActive="RunneLatki.RabbieRaceMod">ModPatches/Rabbie The Moonrabbit</li>
+		<li IfModActive="Mlie.RaccRace">ModPatches/Racc</li>
+		<li IfModActive="jkviolet.rakkleracemode">ModPatches/Rakkle the Rattlesnake</li>
+		<li IfModActive="Rah.RBSE">ModPatches/RBSE</li>
+		<li IfModActive="ReGrowth.BOTR.Wastelands">ModPatches/ReGrowth - Wastelands</li>
+		<li IfModActive="zerophoenix.contractorsarsenalfaction">ModPatches/Rim Contractors Arsenal</li>
+		<li IfModActive="RimofMadness.Werewolves">ModPatches/Rim of Madness - Werewolves</li>
+		<li IfModActive="Ryflamer.Rimcraft.Core">ModPatches/Rimcraft</li>
+		<li IfModActive="Ryflamer.Rimcraft.AlliedRaces">ModPatches/Rimcraft Allied Races</li>
+		<li IfModActive="Ryflamer.Rimcraft.Animals">ModPatches/Rimcraft Animals</li>
+		<li IfModActive="Ryflamer.Rimcraft.Factions">ModPatches/Rimcraft Factions</li>
+		<li IfModActive="Ryflamer.Rimcraft.Metals">ModPatches/Rimcraft Metals</li>
+		<li IfModActive="Ryflamer.Rimcraft.Scenarios">ModPatches/Rimcraft Scenario</li>
+		<li IfModActive="Ryflamer.Rimcraft.Weaponry">ModPatches/Rimcraft Weaponry</li>
+		<li IfModActive="CP.RimmuNation.Clothing">ModPatches/Rimmu-Nation - Clothing</li>
+		<li IfModActive="Rimsenal.Spacer">ModPatches/Rimsenal - Spacer Faction Pack</li>
+		<li IfModActive="rimsenal.core">ModPatches/Rimsenal Core</li>
+		<li IfModActive="rimsenal.EVP">ModPatches/Rimsenal Enhanced Vanilla</li>
+		<li IfModActive="Bonible.rimsenalfactions">ModPatches/Rimsenal Factions</li>
+		<li IfModActive="rimsenal.federation">ModPatches/Rimsenal Federation</li>
+		<li IfModActive="rimsenal.feral">ModPatches/Rimsenal Feral</li>
+		<li IfModActive="rimsenal.security">ModPatches/Rimsenal Security</li>
+		<li IfModActive="Bucko.RoyalArsenal">ModPatches/Royal Arsenal</li>
+		<li IfModActive="SCP.OnlyClothes">ModPatches/SCP</li>
+		<li IfModActive="jackaufenhand.sergals">ModPatches/Sergal</li>
+		<li IfModActive="projectjedi.factions">ModPatches/Star Wars - Factions</li>
+		<li IfModActive="Scurvyez.Bastyon">ModPatches/Steves Animals</li>
+		<li IfModActive="TheVanityProject.ShibaInu">ModPatches/The Vanity Project - Shiba Inu</li>
+		<li IfModActive="Caninmyham.ThogsGun_sBrukkaReprimed">ModPatches/Thog&apos;s Guns - More Brukka Pack</li>
+		<li IfModActive="VanillaExpanded.VAEEndAndExt">ModPatches/Vanilla Animals Expanded - Endangered</li>
+		<li IfModActive="VanillaExpanded.VWEL">ModPatches/Vanilla Weapons Expanded - Laser</li>
+		<li IfModActive="flangopink.VanillaXCOMLaserWeapons">ModPatches/Vanilla XCOM Laser Weapons</li>
+		<li IfModActive="flangopink.VanillaXCOMMagWeapons">ModPatches/Vanilla XCOM Magnetic Weapons</li>
+		<li IfModActive="flangopink.VanillaXCOMPatches">ModPatches/Vanilla XCOM Patches</li>
+		<li IfModActive="flangopink.VanillaXCOMPlasmaWeapons">ModPatches/Vanilla XCOM Plasma Weapons</li>
+		<li IfModActive="flangopink.VanillaXCOMWeapons">ModPatches/Vanilla XCOM Weapons</li>
+		<li IfModActive="Epicfloor.WarcasketMeleeWeapons">ModPatches/VFE Pirates unofficial add-on - Warcasket Melee Armory Continued</li>
+		<li IfModActive="dismarzero.VGP.VGPGardenDrinks">ModPatches/VGP Drinks</li>
+		<li IfModActive="Mlie.VulpineRacePack">ModPatches/Vulpine Pack</li>
+		<li IfModActive="840.Tach.GWarCasket">ModPatches/WarCasket Barbatos Gundam Addon</li>
+		<li IfModActive="Mlie.XennRace">ModPatches/Xenn</li>
+		<li IfModActive="Neronix17.OuterRim.DroidDepot">ModPatches/Outer Rim - Droid Depot</li>
 	</v1.4>
 </loadFolders>
\ No newline at end of file
diff --git a/Media/CE_ModIcon_JustHat.png b/Media/CE_ModIcon_JustHat.png
new file mode 100644
index 0000000000..5b01d7c203
Binary files /dev/null and b/Media/CE_ModIcon_JustHat.png differ
diff --git a/Media/CE_ModIcon_JustHat.svg b/Media/CE_ModIcon_JustHat.svg
new file mode 100644
index 0000000000..ce5235e6ac
--- /dev/null
+++ b/Media/CE_ModIcon_JustHat.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="svg1578" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #000;
+      }
+
+      .cls-1, .cls-2 {
+        stroke-width: 0px;
+      }
+
+      .cls-2 {
+        fill: #fff;
+      }
+    </style>
+  </defs>
+  <g>
+    <path class="cls-1" d="M170.05,239l-.21.99-.63,2.88c-.02.08-.03.16-.03.24l-1.15,20.34-1.04,18.4-.52-.16c-.13-.04-.26-.06-.39-.06l-11.86-.55-11.82-.55-26.64-2.19-26.61-2.19-21.95-3.73-21.87-3.69-7.81-3.13-7.37-2.95-.84-2.19-.63-1.67,3.69-2.43,4.49-2.93,18.14-3.69,18.37-3.71,28.59-3.01,28.59-2.98,20.68-.55,18.82-.5M170.05,222c-.15,0-.3,0-.45,0l-18.82.5-20.68.55c-.44.01-.87.04-1.31.09l-28.59,2.98-28.61,3.01c-.53.06-1.06.14-1.58.24l-18.37,3.71-18.17,3.7c-2.1.43-4.11,1.25-5.91,2.43l-4.49,2.93s-.03.02-.04.03l-3.69,2.43c-6.65,4.38-9.37,12.78-6.55,20.22l.63,1.67s.02.06.03.09l.84,2.19c1.7,4.41,5.16,7.92,9.55,9.67l7.37,2.95,7.8,3.12c1.12.45,2.29.78,3.49.98l21.87,3.69,21.93,3.72c.48.08.97.14,1.45.18l26.61,2.19,26.65,2.19c.2.02.4.03.6.04l11.82.55,10.28.48c1.08.21,2.18.32,3.27.32,3.42,0,6.8-1.03,9.68-3.03,4.31-2.98,7-7.79,7.29-13.02l1.04-18.4,1.08-19.11.37-1.68s.02-.08.03-.12l.21-.99c1.08-5.09-.24-10.4-3.57-14.4-3.23-3.88-8.02-6.12-13.06-6.12h0Z"/>
+    <path class="cls-1" d="M243.34,158.07l13.53.03,13.54.02,11.24,3.12,11.29,3.16,11,7.01,11.01,9.14,7.32,14.58,7.35,14.63,3.74,14.84,3.73,14.84s.65,25.91.65,25.92l.62,16.16-15.36,1.18-16.73,1.28-52.32-.19-52.33-.19-14.59-.7-13.07-.62,1.12-16.65,1.2-26.51,3.92-15.27,3.92-15.24,7.27-13.85,7.27-13.8,9.52-8.31,9.46-6.12,12.88-4.23,12.83-4.2M243.34,141.07c-1.8,0-3.58.29-5.29.84l-12.83,4.2-12.89,4.24c-1.38.45-2.7,1.09-3.93,1.88l-9.46,6.12c-.68.44-1.33.93-1.95,1.47l-9.52,8.31c-1.58,1.38-2.88,3.03-3.86,4.88l-7.27,13.8-7.28,13.87c-.61,1.16-1.09,2.4-1.41,3.67l-3.92,15.24-3.92,15.28c-.29,1.13-.46,2.29-.52,3.46l-1.19,26.32-1.11,16.47c-.31,4.56,1.23,9.05,4.28,12.45,3.04,3.41,7.32,5.45,11.89,5.67l13.07.62,14.58.7c.25.01.5.02.75.02l52.33.19,52.32.19s.04,0,.06,0c.43,0,.86-.02,1.3-.05l16.73-1.28,15.36-1.18c9.11-.7,16.03-8.47,15.68-17.6l-.62-16.16h0c-.03-1.47-.16-6.62-.64-25.7-.03-1.25-.2-2.5-.51-3.72l-3.73-14.84-3.75-14.85c-.3-1.2-.74-2.37-1.3-3.48l-7.35-14.63-7.32-14.57c-1.05-2.1-2.53-3.95-4.34-5.45l-11.01-9.14c-.55-.45-1.12-.87-1.72-1.25l-11-7.01c-1.41-.9-2.94-1.58-4.55-2.03l-11.29-3.16-11.28-3.13c-1.47-.41-2.99-.62-4.52-.62l-13.54-.02-13.51-.03s-.03,0-.04,0h0Z"/>
+    <path class="cls-1" d="M342.29,237.54l18.48,1.23,20.52,1.36,21.72,1.99,21.69,1.98,18.72,2.9,18.64,2.88,9.12,2.98,8.83,2.9,2.28,2.74,1.59,1.91-3.22,2.62-4.16,3.34-12.97,2.93-13.22,3-23.65,3-23.65,3-22.68,1.15-22.72,1.15s-.1,0-.15.02l-6.12.92-4.52.7-1.23-17.61v-.02l-1.36-19.24c0-.09-.02-.17-.05-.26l-1.2-4.78-.7-2.79M342.29,220.54c-5.02,0-9.8,2.22-13.04,6.1-3.48,4.17-4.77,9.75-3.45,15.03l.7,2.79.88,3.52,1.25,17.66c0,.06,0,.12.01.18l1.23,17.61c.33,4.74,2.63,9.13,6.35,12.1,3.03,2.42,6.78,3.72,10.61,3.72.86,0,1.73-.07,2.59-.2l4.49-.69,5.36-.81,21.94-1.11,22.68-1.15c.43-.02.85-.06,1.28-.11l23.65-3,23.65-3c.54-.07,1.09-.16,1.62-.29l13.22-3,12.96-2.93c2.52-.57,4.87-1.7,6.89-3.32l4.16-3.34s.07-.05.1-.08l3.22-2.62c3.52-2.86,5.75-7.02,6.19-11.53.44-4.52-.94-9.02-3.84-12.51l-1.59-1.91-2.31-2.77c-2.04-2.44-4.72-4.27-7.75-5.26l-8.83-2.9-9.14-2.99c-.88-.29-1.77-.5-2.68-.64l-18.64-2.88-18.72-2.9c-.35-.05-.7-.1-1.06-.13l-21.69-1.98-21.71-1.99c-.14-.01-.29-.02-.43-.03l-20.52-1.36-18.48-1.23c-.38-.03-.76-.04-1.13-.04h0Z"/>
+    <path class="cls-1" d="M24.26,264.85l2.39,1.57,4.75,3.11c.13.09.27.15.42.19l13.54,3.76,13.54,3.77c.06.02.13.03.19.03l20.75,2.98,20.75,2.98s.02,0,.03,0,.02,0,.03,0l22.72,2.28v.02l22.72,2.25s.03,0,.04,0,.03,0,.04,0l36.56,1.6,36.56,1.59s.03,0,.04,0,.03,0,.04,0l61.63-.84,61.63-.83s.03,0,.05,0,.03,0,.05,0l25.32-1.99,25.32-1.98s.04-.01.07-.02l25.69-3.01,25.69-3.05c.05,0,.11,0,.16-.02l16.51-3.87v-.02l16.52-3.89c.15-.03.29-.09.42-.16l5.72-3.39,3.43-2.02-.08,14.64-3.09,6.32-3.11,6.28-9.96,7.53-10.12,7.63-15.63,6.79-15.66,6.79-22.43,5.78-22.48,5.8-27.55,4.15-27.58,4.16-25.62,1.78-25.62,1.8-36.49-.87-36.49-.84-20.7-2.09-20.67-2.09-22.69-3.89-22.66-3.85-18.32-4.86-18.29-4.86-16.08-6.95-16.05-6.93-9.31-6.82-9.22-6.75-3.73-6.09-3.64-5.99-.02-17.62M483.5,270.34s0,0,0,0c-.2,0-.39.04-.57.11l-7.47,3.11-7.48,3.13c-.18.08-.35.2-.49.34l-.92.92-.92.92c-.59.57-.61,1.51-.05,2.11l4.65,4.94,4.62,4.92c.28.3.68.47,1.09.47h1.4c.63,0,1.19-.39,1.41-.97l1.67-4.44v-.02l1.65-4.45s.02-.04.03-.06l1.43-4.54,1.41-4.54c.31-.97-.42-1.96-1.44-1.96,0,0,0,0,0,0h0M33.25,291.31h2.59c.48,0,.93-.23,1.22-.62l4.2-5.67,4.2-5.69c.59-.8.26-1.94-.66-2.3l-7.77-3.05-7.77-3.04c-.17-.07-.35-.11-.53-.11h0s-.01,0-.02,0c-.83,0-1.51.67-1.51,1.51v2.19c0,.15.02.3.07.44l2.28,7.63,2.28,7.65c.19.64.78,1.07,1.44,1.07M447.51,306.99h.02l1.07.11c.06,0,.11,0,.17,0,.67,0,1.27-.45,1.45-1.11l2.25-8.39,2.24-8.33,1.41-3.64,1.44-3.73c.38-.95-.28-1.99-1.3-2.06h0s-.04,0-.06,0c-.08,0-.15,0-.23.02l-11.68,1.43-11.68,1.43c-.33.04-.63.18-.87.4l-1.34,1.31-1.34,1.31c-.58.57-.61,1.49-.07,2.09l8.26,9.26,8.26,9.26c.24.27.58.44.94.49l1.07.13M56.36,280.02s-.01,0-.02,0c-.83,0-1.51.67-1.51,1.51v2.74c0,.14.02.28.07.42l3.17,10.9,3.16,10.88c.2.68.82,1.08,1.45,1.08.37,0,.75-.14,1.05-.43l9.67-9.52,9.67-9.52c.72-.71.56-1.91-.32-2.4l-2.46-1.34-2.46-1.34c-.17-.09-.35-.14-.53-.16l-10.38-1.39-10.37-1.39c-.06,0-.12-.01-.18-.02h0M402.91,325.58c.61,0,1.21-.37,1.43-1.03l.91-2.8.91-2.75,6.4-14.98s.01-.01.02-.02l6.41-15.06c.42-1-.32-2.09-1.38-2.09-.03,0-.06,0-.09,0l-18.09.97-18.09.99c-.22.01-.44.07-.63.18l-2.36,1.26-2.4,1.26c-.85.45-1.07,1.56-.45,2.3l13.14,15.63,13.15,15.61c.31.36.73.53,1.14.53M108.36,325.12c.4,0,.81-.16,1.12-.5l2.3-2.58s0,0,0,0,0,0,0,0l2.28-2.58v-.02l11.37-13.22h.02l11.35-13.22c.78-.9.26-2.31-.92-2.48l-6.56-1.02-6.56-1.02s-.1-.01-.15-.02l-14.45-.83-14.43-.81s-.01,0-.02,0-.01,0-.02,0h0s-.04,0-.06,0c-1.05,0-1.79,1.07-1.4,2.06l.86,2.2.86,2.22s.01.02.02.03l6.49,15.42,6.48,15.42c.25.6.82.92,1.39.92M167.04,334.79h1.43c.51,0,.98-.26,1.26-.68l12.12-18.37,12.12-18.38c.16-.25.24-.53.24-.83v-2.77c0-.83-.67-1.51-1.51-1.51h-45.48s-.03,0-.05,0-.03,0-.05,0c-1.08.07-1.74,1.22-1.25,2.19l9.91,19.76,9.91,19.76c.26.51.78.83,1.34.83M318.82,292.25s0,0,0,0c-1.06,0-1.79,1.07-1.4,2.06l.66,1.7.66,1.7c.04.1.09.19.15.28l11.86,18.03,11.86,18.01c.29.46.78.69,1.27.69.45,0,.89-.2,1.2-.59l2.64-3.42,2.62-3.42c.06-.08.1-.16.15-.24l7.74-15.27,7.74-15.26c.1-.21.16-.44.16-.68v-2.07c0-.83-.67-1.51-1.51-1.51h-45.79M282.6,338.74c.53,0,1.02-.28,1.29-.73l12.37-20.25,12.39-20.26c.6-.99-.09-2.25-1.25-2.28l-23.03-.55-23.02-.57s-.01,0-.02,0-.01,0-.02,0h0s0,0,0,0c-.4,0-.78.16-1.06.44l-.78.78v.02l-.76.78c-.46.47-.56,1.17-.26,1.75l10.41,20,10.43,20.02c.25.49.75.8,1.3.81l.99.02.97.03s.03,0,.04,0M204.63,294.23h0c-1.17,0-1.89,1.28-1.29,2.28l11.05,18.29,11.05,18.27c.04.06.08.12.13.18l2.07,2.54,2.06,2.54c.3.38.74.56,1.17.56.52,0,1.04-.27,1.32-.79l10.5-19.34,10.51-19.36c.11-.2.17-.43.18-.66l.05-1.46.07-1.49c.04-.86-.65-1.57-1.5-1.57h-47.35M24.26,247.85c-2.77,0-5.55.68-8.08,2.04-5.5,2.97-8.93,8.72-8.92,14.97l.02,17.62c0,3.11.86,6.16,2.47,8.82l3.64,5.99,3.75,6.13c1.16,1.89,2.67,3.53,4.45,4.84l9.22,6.75,9.32,6.82c1.03.75,2.13,1.39,3.3,1.89l16.05,6.93,16.08,6.95c.77.33,1.57.61,2.38.82l18.29,4.86,18.33,4.86c.5.13,1,.24,1.51.33l22.66,3.86,22.67,3.88c.38.07.77.12,1.16.16l20.67,2.09,20.7,2.09c.44.04.88.07,1.32.08l36.49.84,36.48.87c.14,0,.27,0,.41,0,.4,0,.79-.01,1.19-.04l25.62-1.8,25.61-1.78c.45-.03.91-.08,1.36-.15l27.58-4.16,27.54-4.15c.58-.09,1.15-.2,1.72-.35l22.48-5.8,22.43-5.78c.86-.22,1.7-.51,2.52-.86l15.66-6.79,15.64-6.79c1.23-.53,2.39-1.21,3.46-2.02l10.12-7.63,9.98-7.55c2.11-1.59,3.81-3.65,4.98-6.02l3.11-6.28s.02-.04.03-.06l3.09-6.32c1.13-2.3,1.72-4.82,1.73-7.38l.08-14.64c.03-6.12-3.22-11.78-8.53-14.83-2.62-1.51-5.55-2.26-8.47-2.26-2.99,0-5.97.79-8.63,2.36l-3.43,2.02-3.68,2.18-14.24,3.35c-.24.06-.47.12-.71.18l-14.83,3.48-24.92,2.95-25.63,3.01-24.76,1.93-24.75,1.95-61.19.82-61.21.84-36.09-1.57-36.23-1.59-21.45-2.13c-.24-.03-.48-.06-.72-.09l-22.59-2.27-20.24-2.91-19.82-2.85-12.52-3.49-11.22-3.11-2.73-1.79-2.38-1.56c-2.82-1.85-6.07-2.79-9.33-2.79h0ZM204.66,311.23h0,0Z"/>
+  </g>
+  <path id="path1487" class="cls-2" d="M243.34,158.08l-12.83,4.2-12.88,4.23-9.46,6.12-9.52,8.31-7.27,13.8-7.27,13.85-3.92,15.24-3.92,15.27-1.2,26.51-1.12,16.65,13.07.62,14.59.7,52.33.19,52.32.19,16.73-1.28,15.36-1.18-.62-16.16s-.65-25.92-.65-25.92l-3.73-14.84-3.74-14.84-7.35-14.63-7.32-14.58-11.01-9.14-11-7.01-11.29-3.16-11.24-3.12-13.54-.02-13.53-.03ZM342.29,237.55l.7,2.79,1.2,4.78c.02.08.04.17.05.26l1.36,19.24v.02l1.23,17.61,4.52-.7,6.12-.92s.1-.01.15-.02l22.72-1.15,22.68-1.15,23.65-3,23.65-3,13.22-3,12.97-2.93,4.16-3.34,3.22-2.62-1.59-1.91-2.28-2.74-8.83-2.9-9.12-2.98-18.64-2.88-18.72-2.9-21.69-1.98-21.72-1.99-20.52-1.36-18.48-1.23ZM170.04,239.01l-18.82.5-20.68.55-28.59,2.98-28.59,3.01-18.37,3.71-18.14,3.69-4.49,2.93-3.69,2.43.63,1.67.84,2.19,7.37,2.95,7.81,3.13,21.87,3.69,21.95,3.73,26.61,2.19,26.64,2.19,11.82.55,11.86.55c.13,0,.26.03.39.06l.52.16,1.04-18.4,1.15-20.34c0-.08.02-.16.03-.24l.63-2.88.21-.99ZM24.25,264.86l.02,17.62,3.64,5.99,3.73,6.09,9.22,6.75,9.31,6.82,16.05,6.93,16.08,6.95,18.29,4.86,18.32,4.86,22.66,3.85,22.69,3.89,20.67,2.09,20.7,2.09,36.49.84,36.49.87,25.62-1.8,25.62-1.78,27.58-4.16,27.55-4.15,22.48-5.8,22.43-5.78,15.66-6.79,15.63-6.79,10.12-7.63,9.96-7.53,3.11-6.28,3.09-6.32.08-14.64-3.43,2.02-5.72,3.39c-.13.07-.27.13-.42.16l-16.52,3.89v.02l-16.51,3.87s-.11.01-.16.02l-25.69,3.05-25.69,3.01s-.04.01-.07.02l-25.32,1.98-25.32,1.99s-.07,0-.1,0l-61.63.83-61.63.84s-.06,0-.08,0l-36.56-1.59-36.56-1.6s-.06,0-.08,0l-22.72-2.25v-.02l-22.72-2.28s-.04,0-.07,0l-20.75-2.98-20.75-2.98c-.07,0-.13-.02-.19-.03l-13.54-3.77-13.54-3.76c-.15-.04-.29-.11-.42-.19l-4.75-3.11-2.39-1.57ZM483.49,270.35c1.02,0,1.75.99,1.44,1.96l-1.41,4.54-1.43,4.54s-.02.04-.03.06l-1.65,4.45v.02l-1.67,4.44c-.22.59-.78.97-1.41.97h-1.39c-.42,0-.82-.17-1.1-.47l-4.62-4.92-4.65-4.94c-.56-.6-.54-1.53.05-2.11l.92-.92.92-.92c.14-.14.3-.26.49-.34l7.48-3.13,7.47-3.11c.18-.08.38-.11.58-.11h0ZM28.69,270.85c.18,0,.36.04.53.11l7.77,3.05,7.77,3.05c.93.36,1.26,1.5.66,2.3l-4.2,5.69-4.2,5.67c-.28.39-.73.62-1.21.62h-2.59c-.66,0-1.25-.43-1.44-1.07l-2.28-7.65-2.28-7.63c-.04-.14-.07-.29-.07-.44v-2.19c0-.84.68-1.52,1.52-1.51h0ZM456.25,279.87c1.02.07,1.67,1.11,1.3,2.06l-1.44,3.73-1.41,3.64-2.24,8.33-2.25,8.39c-.19.72-.88,1.18-1.62,1.1l-1.07-.11s0,0-.02,0l-1.07-.13c-.36-.04-.69-.22-.94-.49l-8.26-9.26-8.26-9.26c-.54-.6-.51-1.52.07-2.09l1.34-1.31,1.34-1.31c.24-.23.55-.37.87-.4l11.68-1.43,11.68-1.43c.1-.01.19-.02.29-.02h0ZM56.36,280.03c.06,0,.12,0,.18.02l10.37,1.39,10.38,1.39c.19.02.37.08.53.16l2.46,1.34,2.46,1.34c.89.49,1.05,1.69.32,2.4l-9.67,9.52-9.67,9.52c-.81.79-2.17.44-2.49-.65l-3.16-10.88-3.17-10.9c-.04-.14-.07-.28-.07-.42v-2.74c0-.84.68-1.52,1.52-1.51h0ZM93.71,286.85s.02,0,.03,0l14.43.81,14.45.83s.1,0,.15.02l6.56,1.02,6.56,1.02c1.18.17,1.71,1.58.92,2.48l-11.35,13.22s0,0-.02,0l-11.37,13.22v.02l-2.28,2.58s0,0-.02,0l-2.3,2.58c-.74.82-2.08.6-2.51-.42l-6.48-15.42-6.5-15.42s0-.02-.02-.03l-.86-2.22-.86-2.2c-.4-1.01.37-2.1,1.46-2.06h0ZM417.51,286.85c1.11-.06,1.91,1.06,1.47,2.09l-6.41,15.06s0,.01-.02.02l-6.4,14.98-.91,2.75-.91,2.8c-.37,1.11-1.81,1.4-2.58.5l-13.15-15.61-13.14-15.63c-.62-.74-.4-1.85.45-2.3l2.4-1.26,2.36-1.26c.19-.11.41-.17.63-.18l18.09-.99,18.09-.97ZM147.11,292.26s.07,0,.1,0h45.48c.83,0,1.51.67,1.51,1.51v2.77c0,.29-.08.58-.24.83l-12.12,18.38-12.12,18.37c-.28.43-.75.68-1.26.68h-1.42c-.57,0-1.09-.32-1.34-.83l-9.91-19.76-9.91-19.76c-.49-.97.17-2.12,1.25-2.19h0ZM318.82,292.26h45.79c.83,0,1.51.67,1.51,1.51v2.07c0,.24-.06.47-.16.68l-7.74,15.26-7.74,15.27c-.04.09-.09.17-.15.24l-2.62,3.42-2.64,3.42c-.63.83-1.9.78-2.46-.1l-11.86-18.01-11.86-18.03c-.06-.09-.11-.18-.15-.28l-.66-1.7-.66-1.7c-.39-.99.34-2.06,1.41-2.06h0ZM261.32,294.11s.02,0,.03,0l23.02.57,23.03.55c1.15.03,1.84,1.3,1.25,2.28l-12.39,20.26-12.37,20.25c-.28.46-.79.74-1.33.73l-.97-.03-.99-.02c-.55-.01-1.04-.32-1.3-.81l-10.43-20.02-10.41-20c-.3-.58-.2-1.28.26-1.75l.76-.78v-.02l.78-.78c.28-.28.67-.44,1.07-.44h0ZM204.63,294.24h47.34c.86,0,1.54.71,1.51,1.57l-.07,1.49-.05,1.46c0,.23-.07.46-.18.66l-10.51,19.36-10.5,19.34c-.51.94-1.82,1.06-2.49.23l-2.06-2.54-2.07-2.54c-.05-.06-.09-.12-.13-.18l-11.05-18.27-11.05-18.29c-.61-1.01.12-2.29,1.3-2.28h0Z"/>
+</svg>
\ No newline at end of file
diff --git a/ModPatches/A Rimworld of Magic/Defs/A Rimworld of Magic/Defs_Projectiles.xml b/ModPatches/A Rimworld of Magic/Defs/A Rimworld of Magic/Defs_Projectiles.xml
new file mode 100644
index 0000000000..bb08f1d889
--- /dev/null
+++ b/ModPatches/A Rimworld of Magic/Defs/A Rimworld of Magic/Defs_Projectiles.xml	
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ==================== Wand Projectiles ==================== -->
+
+	<ThingDef Name="WandBoltProjectile" ParentName="Base6x24mmChargedBullet" Class="AbilityUser.ProjectileDef_Ability">
+		<graphicData>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>65</speed>
+			<dropsCasings>false</dropsCasings>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="WandBoltProjectile" Class="AbilityUser.ProjectileDef_Ability">
+		<defName>Projectile_IceWand</defName>
+		<label>ice shard</label>
+		<graphicData>
+			<texPath>Spells/Icebolt</texPath>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Iceshard</damageDef>
+			<damageAmountBase>18</damageAmountBase>
+			<armorPenetrationBlunt>50</armorPenetrationBlunt>
+			<armorPenetrationSharp>18</armorPenetrationSharp>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="WandBoltProjectile" Class="AbilityUser.ProjectileDef_Ability">
+		<defName>Projectile_FireWand</defName>
+		<label>fire blast</label>
+		<graphicData>
+			<texPath>Spells/seer_ring_fire</texPath>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Flame</damageDef>
+			<damageAmountBase>5</damageAmountBase>
+			<armorPenetrationBlunt>30</armorPenetrationBlunt>
+			<armorPenetrationSharp>9</armorPenetrationSharp>
+			<explosionRadius>1.2</explosionRadius>
+			<suppressionFactor>3.0</suppressionFactor>
+			<dangerFactor>2.0</dangerFactor>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="WandBoltProjectile" Class="AbilityUser.ProjectileDef_Ability">
+		<defName>Projectile_LightningWand</defName>
+		<label>lightning bolt</label>
+		<graphicData>
+			<texPath>Spells/LightningBolt</texPath>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>TM_Lightning</damageDef>
+			<damageAmountBase>6</damageAmountBase>
+			<armorPenetrationBlunt>30</armorPenetrationBlunt>
+			<armorPenetrationSharp>9</armorPenetrationSharp>
+			<explosionRadius>1.2</explosionRadius>
+			<suppressionFactor>3.0</suppressionFactor>
+			<dangerFactor>2.0</dangerFactor>
+			<speed>200</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="WandBoltProjectile" Class="AbilityUser.ProjectileDef_Ability">
+		<defName>Projectile_BlazingPower</defName>
+		<label>blazing power</label>
+		<graphicData>
+			<texPath>Spells/blazingpower</texPath>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>TM_BlazingPower</damageDef>
+			<damageAmountBase>7</damageAmountBase>
+			<armorPenetrationBlunt>30</armorPenetrationBlunt>
+			<armorPenetrationSharp>9</armorPenetrationSharp>
+			<explosionRadius>0.5</explosionRadius>
+			<suppressionFactor>3.0</suppressionFactor>
+			<dangerFactor>2.0</dangerFactor>
+		</projectile>
+	</ThingDef>
+
+
+	<!-- ==================== AmmoSets ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_GreatArrowRoMThrumbo</defName>
+		<label>great arrows</label>
+		<ammoTypes>
+			<Ammo_GreatArrow_Stone>Projectile_GreatArrowRoMThrumbo_Stone</Ammo_GreatArrow_Stone>
+			<Ammo_GreatArrow_Steel>Projectile_GreatArrowRoMThrumbo_Steel</Ammo_GreatArrow_Steel>
+			<Ammo_GreatArrow_Plasteel>Projectile_GreatArrowRoMThrumbo_Plasteel</Ammo_GreatArrow_Plasteel>
+			<Ammo_GreatArrow_Venom>Projectile_GreatArrowRoMThrumbo_Venom</Ammo_GreatArrow_Venom>
+			<Ammo_GreatArrow_Flame>Projectile_GreatArrowRoMThrumbo_Flame</Ammo_GreatArrow_Flame>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGreatArrowProjectile">
+		<defName>Projectile_GreatArrowRoMThrumbo_Stone</defName>
+		<label>great arrow (stone)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Stone</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>29</speed>
+			<damageAmountBase>17</damageAmountBase><!--Artifically reduced from 33-->
+			<armorPenetrationBlunt>14.98</armorPenetrationBlunt>
+			<armorPenetrationSharp>4</armorPenetrationSharp>
+			<preExplosionSpawnChance>0.1</preExplosionSpawnChance><!-- All values are halved from original great arrow -->
+			<preExplosionSpawnThingDef>Ammo_GreatArrow_Stone</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGreatArrowProjectile">
+		<defName>Projectile_GreatArrowRoMThrumbo_Steel</defName>
+		<label>great arrow (steel)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>34</speed>
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationBlunt>21.06</armorPenetrationBlunt>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+			<preExplosionSpawnChance>0.3</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>Ammo_GreatArrow_Steel</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGreatArrowProjectile">
+		<defName>Projectile_GreatArrowRoMThrumbo_Plasteel</defName>
+		<label>great arrow (plasteel)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Plasteel</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>38</speed>
+			<damageAmountBase>18</damageAmountBase>
+			<armorPenetrationBlunt>19.26</armorPenetrationBlunt>
+			<armorPenetrationSharp>12</armorPenetrationSharp>
+			<preExplosionSpawnChance>0.375</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>Ammo_GreatArrow_Plasteel</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGreatArrowProjectile">
+		<defName>Projectile_GreatArrowRoMThrumbo_Venom</defName>
+		<label>great arrow (venom)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Venom</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>34</speed>
+			<damageDef>Arrow</damageDef>
+			<damageAmountBase>16</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>ArrowVenom</def>
+					<amount>4</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationBlunt>21.06</armorPenetrationBlunt>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+			<preExplosionSpawnChance>0.3</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>Ammo_GreatArrow_Steel</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGreatArrowProjectile">
+		<defName>Projectile_GreatArrowRoMThrumbo_Flame</defName>
+		<label>great arrow (flame)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Flame</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>29</speed>
+			<damageDef>Arrow</damageDef>
+			<damageAmountBase>6</damageAmountBase>
+			<armorPenetrationBlunt>10.54</armorPenetrationBlunt>
+			<armorPenetrationSharp>4</armorPenetrationSharp>
+			<secondaryDamage>
+				<li>
+					<def>Flame</def>
+					<amount>1</amount>
+					<chance>0.33</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Apparel.xml b/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Apparel.xml
new file mode 100644
index 0000000000..5b5ca5bd56
--- /dev/null
+++ b/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Apparel.xml	
@@ -0,0 +1,357 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Cloaks : Vanilla cape is 4mm, so we use a general of that as a base and modify based on the original's stat -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="TM_MaestersCloak" or
+			defName="DemonLordCloak"
+			]/statBases </xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_MaestersCloak"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="DemonLordCloak"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Robes : Take up middle so we'll add a little extra protection to compensate. Should still generally be inferior to the armor combo unless we're using super-fabric though-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="DarkRobe" or
+			defName="ArchMageRobe" or
+			defName="TM_DreamcatcherBuckskin"
+			]/statBases </xpath>
+		<value>
+			<Bulk>20</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="DarkRobe"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="DarkRobe"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="DarkRobe"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_DreamcatcherBuckskin"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>7</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_DreamcatcherBuckskin"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_DreamcatcherBuckskin"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_DreamcatcherBuckskin"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>9</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_DreamcatcherBuckskin"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_DreamcatcherBuckskin"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Hats -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="TM_WizardHat" or
+			defName="ArcaneHood"
+			]/statBases </xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_WizardHat"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="ArcaneHood"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HoodOfMadness"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HoodOfMadness"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HoodOfMadness"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HoodOfMadness"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>0.75</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Armors-->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="AncientMail" or
+			defName="RoyalHelm" or
+			defName="ParagonHelm" or
+			defName="RoyalArmor"
+			]/statBases/ArmorRating_Sharp </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="AncientMail" or
+			defName="RoyalHelm" or
+			defName="ParagonHelm" or
+			defName="RoyalArmor"
+			]/statBases/ArmorRating_Blunt </xpath>
+	</Operation>
+
+	<!-- Based on Vanilla Armor Expanded CE patch -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoyalArmor"]/statBases/Mass</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>10</WornBulk>
+			<Mass>15</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoyalArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AncientMail"]/statBases/Mass</xpath>
+		<value>
+			<Bulk>60</Bulk>
+			<WornBulk>7.5</WornBulk>
+			<Mass>7.5</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AncientMail"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!--<li Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="AncientMail"]/stuffCategories</xpath>
+	<value>
+		<stuffCategories>
+			<li>Steeled</li>
+		</stuffCategories>
+	</value>
+</li>-->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="AncientMail"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoyalHelm"]/statBases/Mass</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>0.5</WornBulk>
+			<Mass>3</Mass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoyalHelm"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoyalHelm"]/stuffCategories</xpath>
+		<value>
+			<stuffCategories>
+				<li>Steeled</li>
+			</stuffCategories>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoyalHelm"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>UpperHead</li>
+				<li>Eyes</li>
+				<li>Teeth</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ParagonHelm"]/statBases/Mass</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<Mass>4</Mass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ParagonHelm"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ParagonHelm"]/stuffCategories</xpath>
+		<value>
+			<stuffCategories>
+				<li>Steeled</li>
+			</stuffCategories>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ParagonHelm"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>UpperHead</li>
+				<li>Eyes</li>
+				<li>Teeth</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[@Name="TM_ArtifactBase"]/statBases</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[@Name="TM_ArtifactBase"]</xpath>
+			<value>
+				<statBases/>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[@Name="TM_ArtifactBase"]</xpath>
+			<value>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="TM_ArtifactBase"]/statBases</xpath>
+		<value>
+			<Bulk>0.35</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Demon.xml b/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Demon.xml
new file mode 100644
index 0000000000..514e0f433e
--- /dev/null
+++ b/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Demon.xml	
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[
+			defName="TM_LesserDemonR" or
+			defName="TM_DemonR"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="TM_LesserDemonR" or
+			defName="TM_DemonR"
+			]/statBases </xpath>
+		<value>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.19</MeleeDodgeChance>
+			<MeleeCritChance>0.22</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
+			<MaxHitPoints>200</MaxHitPoints>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_LesserDemonR" or
+			defName="TM_DemonR"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_LesserDemonR" or
+			defName="TM_DemonR"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_LesserDemonR"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left arm</label>
+					<capacities>
+						<li>TM_ClawSweep</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.1</cooldownTime>
+					<armorPenetrationSharp>4</armorPenetrationSharp>
+					<armorPenetrationBlunt>18.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Demon_LeftArm</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right arm</label>
+					<capacities>
+						<li>TM_ClawSweep</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.3</cooldownTime>
+					<armorPenetrationSharp>4</armorPenetrationSharp>
+					<armorPenetrationBlunt>18.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Demon_RightArm</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>11.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Demon_Legs</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_DemonR"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left arm</label>
+					<capacities>
+						<li>TM_ClawSweep</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.1</cooldownTime>
+					<armorPenetrationSharp>6</armorPenetrationSharp>
+					<armorPenetrationBlunt>18.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Demon_LeftArm</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right arm</label>
+					<capacities>
+						<li>TM_ClawSweep</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.3</cooldownTime>
+					<armorPenetrationSharp>6</armorPenetrationSharp>
+					<armorPenetrationBlunt>18.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Demon_RightArm</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>32</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>15.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Demon_Legs</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Direwolf.xml b/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Direwolf.xml
new file mode 100644
index 0000000000..fa323dde60
--- /dev/null
+++ b/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Direwolf.xml	
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="TM_Dire_WolfR"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_Dire_WolfR"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_Dire_WolfR"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_Dire_WolfR"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>6.6</MoveSpeed>
+			<MeleeDodgeChance>0.29</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>0.06</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_Dire_WolfR"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>11.4</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>4.225</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.2</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>12.2</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>4.225</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.3</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<armorPenetrationBlunt>6.55</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>0.6</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Elemental.xml b/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Elemental.xml
new file mode 100644
index 0000000000..3799984a2b
--- /dev/null
+++ b/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Elemental.xml	
@@ -0,0 +1,400 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[
+			defName="TM_LesserEarth_ElementalR" or
+			defName="TM_GreaterEarth_ElementalR" or
+			defName="TM_Earth_ElementalR" or
+			defName="TM_LesserFire_ElementalR" or
+			defName="TM_GreaterFire_ElementalR" or
+			defName="TM_Fire_ElementalR" or
+			defName="TM_LesserWater_ElementalR" or
+			defName="TM_GreaterWater_ElementalR" or
+			defName="TM_Water_ElementalR" or
+			defName="TM_LesserWind_ElementalR" or
+			defName="TM_GreaterWind_ElementalR" or
+			defName="TM_Wind_ElementalR"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="TM_LesserEarth_ElementalR" or
+			defName="TM_GreaterEarth_ElementalR" or
+			defName="TM_Earth_ElementalR" or
+			defName="TM_LesserFire_ElementalR" or
+			defName="TM_GreaterFire_ElementalR" or
+			defName="TM_Fire_ElementalR" or
+			defName="TM_LesserWater_ElementalR" or
+			defName="TM_GreaterWater_ElementalR" or
+			defName="TM_Water_ElementalR" or
+			defName="TM_LesserWind_ElementalR" or
+			defName="TM_GreaterWind_ElementalR" or
+			defName="TM_Wind_ElementalR"
+			]/statBases </xpath>
+		<value>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.19</MeleeDodgeChance>
+			<MeleeCritChance>0.22</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
+			<MaxHitPoints>200</MaxHitPoints>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_LesserEarth_ElementalR" or
+			defName="TM_GreaterEarth_ElementalR" or
+			defName="TM_Earth_ElementalR"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_LesserEarth_ElementalR" or
+			defName="TM_GreaterEarth_ElementalR" or
+			defName="TM_Earth_ElementalR"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_LesserFire_ElementalR" or
+			defName="TM_GreaterFire_ElementalR" or
+			defName="TM_Fire_ElementalR"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_LesserFire_ElementalR" or
+			defName="TM_GreaterFire_ElementalR" or
+			defName="TM_Fire_ElementalR"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_LesserWater_ElementalR" or
+			defName="TM_GreaterWater_ElementalR" or
+			defName="TM_Water_ElementalR"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_LesserWater_ElementalR" or
+			defName="TM_GreaterWater_ElementalR" or
+			defName="TM_Water_ElementalR"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_LesserWind_ElementalR" or
+			defName="TM_GreaterWind_ElementalR" or
+			defName="TM_Wind_ElementalR"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>3.65</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_LesserWind_ElementalR" or
+			defName="TM_GreaterWind_ElementalR" or
+			defName="TM_Wind_ElementalR"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_LesserEarth_ElementalR"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left arm</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Ele_LeftArm</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right arm</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>2.2</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Ele_RightArm</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>2.8</cooldownTime>
+					<armorPenetrationSharp>1.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Ele_Horn</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_Earth_ElementalR"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left arm</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>8.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Ele_LeftArm</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right arm</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>2.2</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>8.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Ele_RightArm</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>34</power>
+					<cooldownTime>2.8</cooldownTime>
+					<armorPenetrationSharp>2.16</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Ele_Horn</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_GreaterEarth_ElementalR"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left arm</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>10.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Ele_LeftArm</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right arm</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>2.2</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>9.93</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Ele_RightArm</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>38</power>
+					<cooldownTime>2.8</cooldownTime>
+					<armorPenetrationSharp>2.41</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.87</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Ele_Horn</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_LesserFire_ElementalR" or
+			defName="TM_LesserWater_ElementalR" or
+			defName="TM_LesserWind_ElementalR"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left arm</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Ele_LeftArm</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right arm</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.4</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Ele_RightArm</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2.2</cooldownTime>
+					<armorPenetrationSharp>1.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Ele_Horn</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_Fire_ElementalR" or
+			defName="TM_Water_ElementalR" or
+			defName="TM_Wind_ElementalR"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left arm</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>.9</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Ele_LeftArm</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right arm</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.3</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Ele_RightArm</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationSharp>1.54</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.74</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Ele_Horn</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_GreaterFire_ElementalR" or
+			defName="TM_GreaterWater_ElementalR" or
+			defName="TM_GreaterWind_ElementalR"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left arm</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>.9</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Ele_LeftArm</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right arm</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.2</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Ele_RightArm</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationSharp>1.7</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Ele_Horn</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Hediff.xml b/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Hediff.xml
new file mode 100644
index 0000000000..665620de79
--- /dev/null
+++ b/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Hediff.xml	
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TM_HediffStrongBack"]/stages/li[1]/statOffsets/CarryingCapacity</xpath>
+		<value>
+			<CarryBulk>15</CarryBulk>
+			<CarryWeight>20</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TM_HediffStrongBack"]/stages/li[2]/statOffsets/CarryingCapacity</xpath>
+		<value>
+			<CarryBulk>18</CarryBulk>
+			<CarryWeight>25</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TM_HediffStrongBack"]/stages/li[3]/statOffsets/CarryingCapacity</xpath>
+		<value>
+			<CarryBulk>20</CarryBulk>
+			<CarryWeight>30</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TM_HediffThickSkin"]/stages/li[1]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TM_HediffThickSkin"]/stages/li[1]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TM_HediffThickSkin"]/stages/li[2]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TM_HediffThickSkin"]/stages/li[2]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TM_HediffThickSkin"]/stages/li[3]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TM_HediffThickSkin"]/stages/li[3]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TM_HediffThickSkin"]/stages/li[4]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TM_HediffThickSkin"]/stages/li[4]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName = "TM_HediffFightersFocus"]/stages/li[1]/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.1</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName = "TM_HediffFightersFocus"]/stages/li[2]/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.2</Suppressability>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Loadouts.xml b/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Loadouts.xml
new file mode 100644
index 0000000000..dccbfcb442
--- /dev/null
+++ b/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Loadouts.xml	
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[
+			defName="SeerBowman"
+			] </xpath>
+		<value>
+			<inventoryOptions>
+				<skipChance>0</skipChance>
+				<subOptionsChooseOne>
+					<li>
+						<choiceChance>50</choiceChance>
+						<thingDef>Ammo_Arrow_Steel</thingDef>
+						<countRange>
+							<min>20</min>
+							<max>60</max>
+						</countRange>
+					</li>
+					<li>
+						<choiceChance>25</choiceChance>
+						<thingDef>Ammo_Arrow_Venom</thingDef>
+						<countRange>
+							<min>20</min>
+							<max>60</max>
+						</countRange>
+					</li>
+					<li>
+						<choiceChance>25</choiceChance>
+						<thingDef>Ammo_Arrow_Flame</thingDef>
+						<countRange>
+							<min>20</min>
+							<max>60</max>
+						</countRange>
+					</li>
+				</subOptionsChooseOne>
+			</inventoryOptions>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Melee.xml b/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Melee.xml
new file mode 100644
index 0000000000..c891052735
--- /dev/null
+++ b/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Melee.xml	
@@ -0,0 +1,416 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "TM_ElephantSpear"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2.24</cooldownTime>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>59</power>
+					<cooldownTime>4.71</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.25</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.87</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.4</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "TM_ElephantSpear"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "TM_ElephantSpear"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.17</MeleeCritChance>
+				<MeleeParryChance>1.45</MeleeParryChance>
+				<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Gladius with better stats (like crit and parry) -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "TM_ElephantTusk"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.32</cooldownTime>
+					<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>0.88</cooldownTime>
+					<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.85</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>0.83</cooldownTime>
+					<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "TM_ElephantTusk"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<MeleeCounterParryBonus>0.75</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "TM_ElephantTusk"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.6</MeleeCritChance>
+				<MeleeParryChance>0.5</MeleeParryChance>
+				<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "TM_ElephantTusk"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "TM_ElephantTusk"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "TM_ElephantTusk"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "TM_ThrumboSaber"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>0.94</cooldownTime>
+					<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>15.06</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>0.83</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
+					<armorPenetrationSharp>9</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "TM_ThrumboSaber"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<MeleeCounterParryBonus>0.75</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "TM_ThrumboSaber"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.6</MeleeCritChance>
+				<MeleeParryChance>0.5</MeleeParryChance>
+				<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "TM_ThrumboSaber"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "TM_ThrumboSaber"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "TM_ThrumboSaber"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- VWE Battleaxe with double the sharp penetration -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "TM_ThrumboAxe"]/statBases</xpath>
+		<value>
+			<Bulk>13</Bulk>
+			<MeleeCounterParryBonus>1.5</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "TM_ThrumboAxe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.3</MeleeCritChance>
+				<MeleeParryChance>1.6</MeleeParryChance>
+				<MeleeDodgeChance>0.56</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "TM_ThrumboAxe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>59</power>
+					<cooldownTime>4.71</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+					<armorPenetrationSharp>16.13</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.87</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>18</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Longsword with much higher crit chance -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "TM_Ruunbled"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.69</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>0.94</cooldownTime>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>2.048</armorPenetrationBlunt>
+					<armorPenetrationSharp>32</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>47</power>
+					<cooldownTime>0.83</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>4.608</armorPenetrationBlunt>
+					<armorPenetrationSharp>24</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "TM_Ruunbled"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "TM_Ruunbled"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.4</MeleeCritChance>
+				<MeleeParryChance>0.75</MeleeParryChance>
+				<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "TM_DemonFang"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.32</cooldownTime>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>stab</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>.88</cooldownTime>
+					<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
+					<armorPenetrationSharp>8.44</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>0.83</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
+					<armorPenetrationSharp>6</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "TM_DemonFang"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "TM_DemonFang"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.5</MeleeCritChance>
+				<MeleeParryChance>0.15</MeleeParryChance>
+				<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Add tags -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "TM_DemonFang"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "TM_DemonFang"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "TM_DemonFang"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Minion.xml b/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Minion.xml
new file mode 100644
index 0000000000..85eca743c4
--- /dev/null
+++ b/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Minion.xml	
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Looks like an alpha animals needle roll so I gave it the same body shape -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[
+			defName="TM_MinionR" or
+			defName="TM_GreaterMinionR"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="TM_MinionR"
+			]/statBases </xpath>
+		<value>
+			<CarryWeight>30</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.19</MeleeDodgeChance>
+			<MeleeCritChance>0.22</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
+			<MaxHitPoints>200</MaxHitPoints>
+			<SmokeSensitivity>0.5</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="TM_GreaterMinionR"
+			]/statBases </xpath>
+		<value>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>30</CarryBulk>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.19</MeleeDodgeChance>
+			<MeleeCritChance>0.22</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
+			<MaxHitPoints>200</MaxHitPoints>
+			<SmokeSensitivity>0.5</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_MinionR"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>1.1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_MinionR"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>0.8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_GreaterMinionR"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_GreaterMinionR"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_MinionR"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horns</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationSharp>4</armorPenetrationSharp>
+					<armorPenetrationBlunt>9.2</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Minion_Horns</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>bite</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2.2</cooldownTime>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<armorPenetrationBlunt>18.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Minion_Teeth</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_GreaterMinionR"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horns</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationSharp>4</armorPenetrationSharp>
+					<armorPenetrationBlunt>9.2</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Minion_Horns</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>bite</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2.2</cooldownTime>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<armorPenetrationBlunt>18.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Minion_Teeth</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Ranged.xml b/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Ranged.xml
new file mode 100644
index 0000000000..163f5a3f3e
--- /dev/null
+++ b/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Ranged.xml	
@@ -0,0 +1,377 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_LightningWand" or
+			defName="TM_IceWand" or
+			defName="TM_DefenderStaff" or
+			defName="TM_BlazingPowerStaff" or
+			defName="TM_FireWand"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>wand</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.2</cooldownTime>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Seer_FireRing" or
+			defName="Seer_IceRing" or
+			defName="Seer_LightningRing"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>ring</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.5</cooldownTime>
+					<armorPenetrationBlunt>.2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Projectile_IceWand"]</xpath>
+	</Operation>
+
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Projectile_FireWand"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Projectile_LightningWand"]</xpath>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>TM_IceWand</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.01</SwayFactor>
+			<Bulk>1</Bulk>
+			<Mass>1</Mass>
+			<RangedWeapon_Cooldown>.6</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_IceWand</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>40</range>
+			<soundCast>TM_Woosh</soundCast>
+			<muzzleFlashScale>5</muzzleFlashScale>
+			<soundCastTail>GunTail_Light</soundCastTail>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Seer_IceRing</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.10</SwayFactor>
+			<Bulk>0.5</Bulk>
+			<Mass>1</Mass>
+			<RangedWeapon_Cooldown>.3</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_IceWand</defaultProjectile>
+			<warmupTime>0.25</warmupTime>
+			<range>40</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<muzzleFlashScale>5</muzzleFlashScale>
+			<soundCastTail>GunTail_Light</soundCastTail>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>TM_LightningWand</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.01</SwayFactor>
+			<Bulk>1</Bulk>
+			<Mass>1</Mass>
+			<RangedWeapon_Cooldown>1.6</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_LightningWand</defaultProjectile>
+			<warmupTime>2.8</warmupTime>
+			<range>32</range>
+			<soundCast>TM_Thunder_OnMap</soundCast>
+			<muzzleFlashScale>5</muzzleFlashScale>
+			<soundCastTail>GunTail_Light</soundCastTail>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Seer_LightningRing</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.10</SwayFactor>
+			<Bulk>0.5</Bulk>
+			<Mass>1</Mass>
+			<RangedWeapon_Cooldown>.8</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_LightningWand</defaultProjectile>
+			<warmupTime>1.4</warmupTime>
+			<range>32</range>
+			<soundCast>TM_Thunder_OnMap</soundCast>
+			<muzzleFlashScale>5</muzzleFlashScale>
+			<soundCastTail>GunTail_Light</soundCastTail>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>TM_FireWand</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.01</SwayFactor>
+			<Bulk>1</Bulk>
+			<Mass>1</Mass>
+			<RangedWeapon_Cooldown>1.9</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_FireWand</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>32</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
+			<soundCast>TM_Woosh</soundCast>
+			<muzzleFlashScale>5</muzzleFlashScale>
+			<soundCastTail>GunTail_Light</soundCastTail>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Seer_FireRing</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.10</SwayFactor>
+			<Bulk>0.5</Bulk>
+			<Mass>1</Mass>
+			<RangedWeapon_Cooldown>.95</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_FireWand</defaultProjectile>
+			<warmupTime>0.75</warmupTime>
+			<range>32</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
+			<soundCast>DropPod_Leaving</soundCast>
+			<muzzleFlashScale>5</muzzleFlashScale>
+			<soundCastTail>GunTail_Light</soundCastTail>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Projectile_BlazingPower"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="TM_DefenderStaff" or defName="TM_BlazingPowerStaff"]/verbs/li[verbClass="TorannMagic.Weapon.Verb_BlazingPower"]</xpath>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>TM_DefenderStaff</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.01</SwayFactor>
+			<Bulk>2</Bulk>
+			<Mass>2</Mass>
+			<RangedWeapon_Cooldown>2.6</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_BlazingPower</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>40</range>
+			<soundCast>TM_Woosh</soundCast>
+			<burstShotCount>5</burstShotCount>
+			<muzzleFlashScale>7</muzzleFlashScale>
+			<soundCastTail>GunTail_Light</soundCastTail>
+		</Properties>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>TM_BlazingPowerStaff</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.01</SwayFactor>
+			<Bulk>2</Bulk>
+			<Mass>2</Mass>
+			<RangedWeapon_Cooldown>3.5</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_BlazingPower</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>40</range>
+			<soundCast>TM_Woosh</soundCast>
+			<burstShotCount>7</burstShotCount>
+			<muzzleFlashScale>8</muzzleFlashScale>
+			<soundCastTail>GunTail_Light</soundCastTail>
+		</Properties>
+		<FireModes>
+			<aimedBurstShotCount>4</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>TM_ElephantBow</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.5</ShotSpread>
+			<SwayFactor>1</SwayFactor>
+			<Bulk>4.00</Bulk>
+			<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_StreamlinedArrow_Stone</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>34</range>
+			<soundCast>TM_ThrumBow</soundCast>
+			<soundCastTail>TM_Woosh</soundCastTail>
+			<muzzleFlashScale>1</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<ammoSet>AmmoSet_StreamlinedArrow</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Bow</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_ElephantBow"]/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>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>TM_ThrumBow</defName>
+		<statBases>
+			<SightsEfficiency>1.4</SightsEfficiency>
+			<ShotSpread>0.3</ShotSpread>
+			<SwayFactor>0.7</SwayFactor>
+			<Bulk>4.00</Bulk>
+			<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_StreamlinedArrow_Stone</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>40</range>
+			<soundCast>TM_ThrumBow</soundCast>
+		</Properties>
+		<AmmoUser>
+			<ammoSet>AmmoSet_GreatArrowRoMThrumbo</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Bow</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_ThrumBow"]/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>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Sentinel.xml b/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Sentinel.xml
new file mode 100644
index 0000000000..76f21edf5a
--- /dev/null
+++ b/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Sentinel.xml	
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[
+			defName="TM_Lesser_SentinelR" or
+			defName="TM_SentinelR" or
+			defName="TM_Greater_SentinelR"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="TM_Lesser_SentinelR" or
+			defName="TM_SentinelR" or
+			defName="TM_Greater_SentinelR"
+			]/statBases </xpath>
+		<value>
+			<CarryBulk>20</CarryBulk>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.19</MeleeDodgeChance>
+			<MeleeCritChance>0.22</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
+			<MaxHitPoints>200</MaxHitPoints>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_Lesser_SentinelR"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_Lesser_SentinelR"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_SentinelR"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>2.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_SentinelR"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>5.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_Greater_SentinelR"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_Greater_SentinelR"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_Lesser_SentinelR"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1</cooldownTime>
+					<armorPenetrationSharp>4</armorPenetrationSharp>
+					<armorPenetrationBlunt>18.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Sentinel_Claws</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<armorPenetrationBlunt>9.2</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Sentinel_Teeth</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_SentinelR"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1</cooldownTime>
+					<armorPenetrationSharp>4</armorPenetrationSharp>
+					<armorPenetrationBlunt>18.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Sentinel_Claws</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<armorPenetrationBlunt>9.2</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Sentinel_Teeth</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_Greater_SentinelR"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1</cooldownTime>
+					<armorPenetrationSharp>4</armorPenetrationSharp>
+					<armorPenetrationBlunt>18.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Sentinel_Claws</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<armorPenetrationBlunt>9.2</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Sentinel_Teeth</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Skeleton.xml b/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Skeleton.xml
new file mode 100644
index 0000000000..86de2ac91c
--- /dev/null
+++ b/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Skeleton.xml	
@@ -0,0 +1,246 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[
+			defName="TM_SkeletonLichR" or
+			defName="TM_GiantSkeletonR" or
+			defName="TM_SkeletonR"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="TM_SkeletonLichR"
+			]/statBases </xpath>
+		<value>
+			<CarryWeight>45</CarryWeight>
+			<CarryBulk>30</CarryBulk>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>5</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.19</MeleeDodgeChance>
+			<MeleeCritChance>0.22</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+			<MaxHitPoints>200</MaxHitPoints>
+			<SmokeSensitivity>0.1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="TM_GiantSkeletonR"
+			]/statBases </xpath>
+		<value>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>50</CarryBulk>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.19</MeleeDodgeChance>
+			<MeleeCritChance>0.22</MeleeCritChance>
+			<MeleeParryChance>0.3</MeleeParryChance>
+			<MaxHitPoints>200</MaxHitPoints>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="TM_SkeletonR"
+			]/statBases </xpath>
+		<value>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>30</CarryBulk>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.09</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
+			<MaxHitPoints>200</MaxHitPoints>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_SkeletonLichR"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_SkeletonLichR"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_GiantSkeletonR"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_GiantSkeletonR"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_SkeletonR"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_SkeletonR"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_SkeletonR"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.44</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.44</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>2.5</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_GiantSkeletonR"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>2.5</cooldownTime>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_SkeletonLichR"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>TM_ShadowBurn</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>1.1</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>TM_ShadowBurn</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>1.1</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>death stare</label>
+					<capacities>
+						<li>TM_DeathGaze</li>
+					</capacities>
+					<power>20</power>
+					<chanceFactor>.1</chanceFactor>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_SpiritAnimal.xml b/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_SpiritAnimal.xml
new file mode 100644
index 0000000000..183c04cbdb
--- /dev/null
+++ b/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_SpiritAnimal.xml	
@@ -0,0 +1,238 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="TM_SpiritBearR"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="TM_SpiritMongooseR"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="TM_SpiritCrowR"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TM_SpiritBearR"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.19</MeleeCritChance>
+			<MeleeParryChance>0.11</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_SpiritBearR"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.875</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_SpiritBearR"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.44</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_SpiritBearR"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.41</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.41</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>31</power>
+					<cooldownTime>2.05</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.85</armorPenetrationSharp>
+					<armorPenetrationBlunt>8.450</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.22</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>4.235</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TM_SpiritMongooseR"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			<MeleeCritChance>0.4</MeleeCritChance>
+			<MeleeParryChance>0</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_SpiritMongooseR"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_SpiritMongooseR"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_SpiritMongooseR"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>.9</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TM_SpiritCrowR"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.8</MeleeDodgeChance>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>0</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="TM_SpiritCrowR"]/statBases/ArmorRating_Blunt</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="TM_SpiritCrowR"]/statBases/ArmorRating_Sharp</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_SpiritCrowR"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.42</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.08</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.89</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>.325</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.78</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Stuff.xml b/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Stuff.xml
new file mode 100644
index 0000000000..fa2aa74df9
--- /dev/null
+++ b/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Stuff.xml	
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Demonscale-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TM_Demonscale"]/stuffProps/categories</xpath>
+		<value>
+			<li>Metallic_Weapon</li>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TM_Demonscale"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>1.5</MeleePenetrationFactor>
+			<Mass>0.75</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_Demonscale"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.75</StuffPower_Armor_Sharp>
+			<StuffPower_Armor_Electric>0.20</StuffPower_Armor_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_Demonscale"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>3.5</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_Demonscale"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.35</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_Demonscale"]/statBases/StuffPower_Armor_Harmony</xpath>
+		<value>
+			<StuffPower_Armor_Harmony>0.15</StuffPower_Armor_Harmony>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TM_Demonscale"]/statBases</xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+
+	<!--Arcalleum-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TM_Arcalleum"]/stuffProps/categories</xpath>
+		<value>
+			<li>Metallic_Weapon</li>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TM_Arcalleum"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>1.3</MeleePenetrationFactor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_Arcalleum"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.1</StuffPower_Armor_Sharp>
+			<StuffPower_Armor_Electric>0.20</StuffPower_Armor_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_Arcalleum"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>3.25</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_Arcalleum"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.20</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_Arcalleum"]/statBases/StuffPower_Armor_Harmony</xpath>
+		<value>
+			<StuffPower_Armor_Harmony>0.12</StuffPower_Armor_Harmony>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_Arcalleum"]/statBases/SharpDamageMultiplier</xpath>
+		<value>
+			<SharpDamageMultiplier>0.75</SharpDamageMultiplier>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TM_Arcalleum"]/statBases</xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+
+	<!--Manaweave-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_Manaweave"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.5</StuffPower_Armor_Sharp>
+			<StuffPower_Armor_Electric>0.08</StuffPower_Armor_Electric>
+			<Bulk>0.3</Bulk>
+			<WornBulk>0.3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_Manaweave"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_Manaweave"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.08</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_Manaweave"]/statBases/StuffPower_Armor_Harmony</xpath>
+		<value>
+			<StuffPower_Armor_Harmony>0.025</StuffPower_Armor_Harmony>
+		</value>
+	</Operation>
+
+	<!--Demonhide-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_Demonhide"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.95</StuffPower_Armor_Sharp>
+			<StuffPower_Armor_Electric>0.08</StuffPower_Armor_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_Demonhide"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.3</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_Demonhide"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.08</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TM_Demonhide"]/statBases/StuffPower_Armor_Harmony</xpath>
+		<value>
+			<StuffPower_Armor_Harmony>0.06</StuffPower_Armor_Harmony>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Traits.xml b/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Traits.xml
new file mode 100644
index 0000000000..360d6106a7
--- /dev/null
+++ b/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Traits.xml	
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraitDef[defName="Undead"]/degreeDatas/li/statOffsets</xpath>
+		<value>
+			<Suppressability>-1</Suppressability>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[
+			defName="InnerFire" or
+			defName="TM_TheShadow"
+			]/degreeDatas/li/statOffsets/ShootingAccuracyPawn </xpath>
+		<value>
+			<ShootingAccuracyPawn>-1</ShootingAccuracyPawn><!-- -5 -->
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[
+			defName="Technomancer"
+			]/degreeDatas/li/statOffsets/ShootingAccuracyPawn </xpath>
+		<value>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn><!-- +5 -->
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="TM_Brightmage"]/degreeDatas/li/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>-3</ShootingAccuracyPawn><!-- -35 -->
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[
+			defName="TM_Sniper"
+			]/degreeDatas/li[1]/statOffsets/ShootingAccuracyPawn </xpath>
+		<value>
+			<ShootingAccuracyPawn>0.4</ShootingAccuracyPawn><!-- +2 -->
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[
+			defName="TM_Sniper"
+			]/degreeDatas/li[2]/statOffsets/ShootingAccuracyPawn </xpath>
+		<value>
+			<ShootingAccuracyPawn>0.8</ShootingAccuracyPawn><!-- +4 -->
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[
+			defName="TM_Sniper"
+			]/degreeDatas/li[3]/statOffsets/ShootingAccuracyPawn </xpath>
+		<value>
+			<ShootingAccuracyPawn>1.2</ShootingAccuracyPawn><!-- +6 -->
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[
+			defName="TM_Sniper"
+			]/degreeDatas/li[4]/statOffsets/ShootingAccuracyPawn </xpath>
+		<value>
+			<ShootingAccuracyPawn>1.6</ShootingAccuracyPawn><!-- +8 -->
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[
+			defName="Bladedancer"
+			]/degreeDatas/li[1]/statOffsets/ShootingAccuracyPawn </xpath>
+		<value>
+			<ShootingAccuracyPawn>-2</ShootingAccuracyPawn><!-- -20 -->
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[
+			defName="Bladedancer"
+			]/degreeDatas/li[2]/statOffsets/ShootingAccuracyPawn </xpath>
+		<value>
+			<ShootingAccuracyPawn>-2.5</ShootingAccuracyPawn><!-- -25 -->
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[
+			defName="Bladedancer"
+			]/degreeDatas/li[3]/statOffsets/ShootingAccuracyPawn </xpath>
+		<value>
+			<ShootingAccuracyPawn>-2.8</ShootingAccuracyPawn><!-- -28 -->
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[
+			defName="Bladedancer"
+			]/degreeDatas/li[4]/statOffsets/ShootingAccuracyPawn </xpath>
+		<value>
+			<ShootingAccuracyPawn>-30</ShootingAccuracyPawn><!-- -30 -->
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Turrets.xml b/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Turrets.xml
new file mode 100644
index 0000000000..d7257ae1b6
--- /dev/null
+++ b/ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Turrets.xml	
@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Pylon -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="DefensePylon" or
+			defName="DefensePylon_I" or
+			defName="DefensePylon_II" or
+			defName="DefensePylon_III" or
+			defName="TM_TechnoTurret_Base" or
+			defName="TM_60mmMortar_Base"
+			]/fillPercent </xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TM_LightningTotem" or
+			defName="TM_HealingTotem" or
+			defName="TM_EarthTotem"
+			]/fillPercent </xpath>
+		<value>
+			<fillPercent>0.50</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_DefensePylon"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<armorPenetrationBlunt>20</armorPenetrationBlunt>
+				<armorPenetrationSharp>5</armorPenetrationSharp>
+				<dropsCasings>false</dropsCasings>
+				<damageDef>TM_MagicMissile_Weak</damageDef>
+				<damageAmountBase>8</damageAmountBase>
+				<speed>70</speed>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Bullet_DefensePylon"]</xpath>
+		<value>
+			<thingClass>CombatExtended.BulletCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Launcher_DefensePylon</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>.6</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.10</ShotSpread>
+			<SwayFactor>1.00</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.19</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_DefensePylon</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>32</range>
+			<soundCast>GunShotA</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>3</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Launcher_DefensePylon_I</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>.6</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.10</ShotSpread>
+			<SwayFactor>1.00</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.19</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_DefensePylon</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>36</range>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<burstShotCount>3</burstShotCount>
+			<soundCast>GunShotA</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>4</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Launcher_DefensePylon_II</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>.6</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.10</ShotSpread>
+			<SwayFactor>1.00</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.19</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_DefensePylon</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>40</range>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<burstShotCount>4</burstShotCount>
+			<soundCast>GunShotA</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>5</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Launcher_DefensePylon_III</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>.6</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.10</ShotSpread>
+			<SwayFactor>1.00</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.19</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_DefensePylon</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>44</range>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<burstShotCount>5</burstShotCount>
+			<soundCast>GunShotA</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>6</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Mark IV -->
+
+	<!--
+	<li Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_Mark-IV"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<damageAmountBase>7</damageAmountBase>
+				<armorPenetrationSharp>6</armorPenetrationSharp>
+				<armorPenetrationBlunt>10.860</armorPenetrationBlunt>
+				<dropsCasings>true</dropsCasings>
+				<speed>90</speed>
+			</projectile>
+		</value>
+	</li>
+	
+	<li Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Bullet_Mark-IV"]</xpath>
+		<value>
+			<thingClass>CombatExtended.BulletCE</thingClass>
+		</value>
+	</li>-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Mark-IV</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>.6</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.10</ShotSpread>
+			<SwayFactor>1.00</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.19</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_AP</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>45</range>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<burstShotCount>6</burstShotCount>
+			<soundCast>Shot_Revolver</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!--
+	<li Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_Shell_TechnoTurretExplosive"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<damageDef>Bomb</damageDef>
+				<damageAmountBase>15</damageAmountBase>
+				<explosionRadius>1.5</explosionRadius>
+<suppressionFactor>3.0</suppressionFactor>
+<dangerFactor>2.0</dangerFactor>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+				<soundExplode>MortarBomb_Explode</soundExplode>
+				<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+				<soundAmbient>MortarRound_Ambient</soundAmbient>
+				<speed>45</speed>
+			</projectile>
+		</value>
+	</li>
+	
+	<li Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_Shell_TechnoTurretExplosive"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</li>
+
+	<li Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Bullet_Shell_TechnoTurretExplosive"]</xpath>
+		<value>
+			<comps>
+			  <li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+				  <Fragment_Small>11</Fragment_Small>
+				</fragments>
+			  </li>
+			</comps>
+		</value>
+	</li>
+	-->
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ADE Advanced Turrets/Patches/ADE Advanced Turrets/Buildings_Security.xml b/ModPatches/ADE Advanced Turrets/Patches/ADE Advanced Turrets/Buildings_Security.xml
new file mode 100644
index 0000000000..93c5446679
--- /dev/null
+++ b/ModPatches/ADE Advanced Turrets/Patches/ADE Advanced Turrets/Buildings_Security.xml	
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="ADE_Turret_HMGT" or
+			defName="ADE_Turret_HST" or
+			defName="ADE_Turret_GLT"
+			]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="ADE_Turret_HMGT" or
+			defName="ADE_Turret_HST" or
+			defName="ADE_Turret_GLT"
+			]/thingClass </xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="ADE_Turret_HMGT" or
+			defName="ADE_Turret_HST" or
+			defName="ADE_Turret_GLT"
+			]/fillPercent </xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+	<!-- adding power requirement -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="ADE_Turret_HMGT" or
+			defName="ADE_Turret_HST" or
+			defName="ADE_Turret_GLT"
+			]/comps </xpath>
+		<value>
+			<li Class="CompProperties_Power">
+				<compClass>CompPowerTrader</compClass>
+				<basePowerConsumption>350</basePowerConsumption>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="ADE_Turret_HMGT" or
+			defName="ADE_Turret_HST" or
+			defName="ADE_Turret_GLT"
+			]/statBases/ShootingAccuracyTurret </xpath>
+		<value>
+			<AimingAccuracy>1</AimingAccuracy>
+			<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+	<!-- ========== HMG  Turret ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ADE_Gun_HMGT</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.18</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.13</SwayFactor>
+			<Bulk>37.08</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.09</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>54</range>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<burstShotCount>20</burstShotCount>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>500</magazineSize>
+			<reloadTime>15.6</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Grenade Launcher Turret ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ADE_Gun_GLT</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>2.02</SwayFactor>
+			<Bulk>10.66</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.34</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_40x53mmGrenade_HE</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>55</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>5</burstShotCount>
+			<soundCast>AGS</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>18</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<requireLineOfSight>false</requireLineOfSight>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>10.9</reloadTime>
+			<ammoSet>AmmoSet_40x53mmGrenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Anti Aircraft Precision ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ADE_Gun_HST</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.2</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.32</SwayFactor>
+			<Bulk>28.72</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.80</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_20x128mmOerlikon_AP</defaultProjectile>
+			<warmupTime>1.4</warmupTime>
+			<range>65</range>
+			<soundCast>autocannon_slow</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<muzzleFlashScale>45</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>150</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_20x128mmOerlikon</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+		</FireModes>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ADE Advanced Turrets/Patches/ADE Advanced Turrets/Remove_Mod_Ammo.xml b/ModPatches/ADE Advanced Turrets/Patches/ADE Advanced Turrets/Remove_Mod_Ammo.xml
new file mode 100644
index 0000000000..7785598c9e
--- /dev/null
+++ b/ModPatches/ADE Advanced Turrets/Patches/ADE Advanced Turrets/Remove_Mod_Ammo.xml	
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/RecipeDef[
+			defName="Make_Ammo_x_HMGT_CannonShell" or
+			defName="Make_Ammo_xxx_HMGT_CannonShell" or
+			defName="Make_Ammo_x_HST_CannonShell" or
+			defName="Make_Ammo_xx_HST_CannonShell" or
+			defName="Make_Ammo_x_Grenade_CannonShell" or
+			defName="Make_Ammo_xx_Grenade_CannonShell"
+			] </xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="HMGT_Ammo" or
+			defName="HST_Ammo" or
+			defName="HST_Grenade_Ammo"
+			] </xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ADE Advanced turrets PLUS/Patches/ADE Advanced turrets PLUS/Buildings_Security.xml b/ModPatches/ADE Advanced turrets PLUS/Patches/ADE Advanced turrets PLUS/Buildings_Security.xml
new file mode 100644
index 0000000000..5a5cd681b9
--- /dev/null
+++ b/ModPatches/ADE Advanced turrets PLUS/Patches/ADE Advanced turrets PLUS/Buildings_Security.xml	
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="ADE_Turret_AHMGT" or
+			defName="ADE_Turret_AMBMGT" or
+			defName="ADE_Turret_AHST"
+			]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="ADE_Turret_AHMGT" or
+			defName="ADE_Turret_AMBMGT" or
+			defName="ADE_Turret_AHST"
+			]/thingClass </xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="ADE_Turret_AHMGT" or
+			defName="ADE_Turret_AMBMGT" or
+			defName="ADE_Turret_AHST"
+			]/fillPercent </xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+	<!-- adding power requirement -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="ADE_Turret_AHMGT" or
+			defName="ADE_Turret_AMBMGT" or
+			defName="ADE_Turret_AHST"
+			]/comps </xpath>
+		<value>
+			<li Class="CompProperties_Power">
+				<compClass>CompPowerTrader</compClass>
+				<basePowerConsumption>950</basePowerConsumption>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="ADE_Turret_AHMGT" or
+			defName="ADE_Turret_AMBMGT" or
+			defName="ADE_Turret_AHST"
+			]/statBases/ShootingAccuracyTurret </xpath>
+		<value>
+			<AimingAccuracy>1</AimingAccuracy>
+			<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+	<!-- ========== HMG+  Turret ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ADE_Gun_AHMGT</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.18</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.13</SwayFactor>
+			<Bulk>37.08</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.59</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_145x114mm_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>68</range>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<burstShotCount>20</burstShotCount>
+			<soundCast>Shot_Autocannon</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>300</magazineSize>
+			<reloadTime>17.8</reloadTime>
+			<ammoSet>AmmoSet_145x114mm</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== gatling autocannon Turret ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ADE_Gun_AMBMGT</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>2.02</SwayFactor>
+			<Bulk>10.66</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.61</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_20x102mmNATO_AP</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>62</range>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<burstShotCount>20</burstShotCount>
+			<soundCast>Shot_Autocannon</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>45</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<requireLineOfSight>false</requireLineOfSight>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>18.9</reloadTime>
+			<ammoSet>AmmoSet_20x102mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Anti Aircraft autocannon PLUS========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ADE_Gun_AHST</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>1.27</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.5</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.02</SwayFactor>
+			<Bulk>28.72</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>3.74</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_57x483mmBofors_HE</defaultProjectile>
+			<warmupTime>2.5</warmupTime>
+			<range>80</range>
+			<soundCast>autocannon_slow</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<muzzleFlashScale>55</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>10.8</reloadTime>
+			<ammoSet>AmmoSet_57x483mmBofors</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+		</FireModes>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ADE Advanced turrets PLUS/Patches/ADE Advanced turrets PLUS/Remove_Mod_Ammo.xml b/ModPatches/ADE Advanced turrets PLUS/Patches/ADE Advanced turrets PLUS/Remove_Mod_Ammo.xml
new file mode 100644
index 0000000000..489d557944
--- /dev/null
+++ b/ModPatches/ADE Advanced turrets PLUS/Patches/ADE Advanced turrets PLUS/Remove_Mod_Ammo.xml	
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/RecipeDef[
+			defName="Make_Ammo_x_AHST_CannonShell" or
+			defName="Make_Ammo_xx_AHST_CannonShell"
+			] </xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="AHST_Ammo"
+			] </xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ADE Pulse Turrets PLUS/Patches/ADE Pulse Turrets PLUS/Buildings_Security.xml b/ModPatches/ADE Pulse Turrets PLUS/Patches/ADE Pulse Turrets PLUS/Buildings_Security.xml
new file mode 100644
index 0000000000..481613d7fe
--- /dev/null
+++ b/ModPatches/ADE Pulse Turrets PLUS/Patches/ADE Pulse Turrets PLUS/Buildings_Security.xml	
@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="ZXT_Turret_Pulsemachinegunturret" or
+			defName="ZXT_Turret_Sniperpulseturret" or
+			defName="ZXT_Turret_Armoredpowerpulseturret" or
+			defName="ZXT_Turret_Advancedrotarypulsemachinegunturret"
+			]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="ZXT_Turret_Pulsemachinegunturret" or
+			defName="ZXT_Turret_Sniperpulseturret" or
+			defName="ZXT_Turret_Armoredpowerpulseturret" or
+			defName="ZXT_Turret_Advancedrotarypulsemachinegunturret"
+			]/thingClass </xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+	<!-- Same label??? wth? -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="ZXT_Turret_Sniperpulseturret"
+			]/label </xpath>
+		<value>
+			<label>Armored Gauss Lance</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="ZXT_Turret_Pulsemachinegunturret" or
+			defName="ZXT_Turret_Sniperpulseturret" or
+			defName="ZXT_Turret_Armoredpowerpulseturret" or
+			defName="ZXT_Turret_Advancedrotarypulsemachinegunturret"
+			]/fillPercent </xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<!-- Increasing power requirement -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="ZXT_Turret_Pulsemachinegunturret" or
+			defName="ZXT_Turret_Sniperpulseturret" or
+			defName="ZXT_Turret_Armoredpowerpulseturret"
+			]/comps/li[@Class = "CompProperties_Power"]/basePowerConsumption </xpath>
+		<value>
+			<basePowerConsumption>1050</basePowerConsumption>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="ZXT_Turret_Advancedrotarypulsemachinegunturret"
+			]/comps/li[@Class = "CompProperties_Power"]/basePowerConsumption </xpath>
+		<value>
+			<basePowerConsumption>1450</basePowerConsumption>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="ZXT_Turret_Pulsemachinegunturret" or
+			defName="ZXT_Turret_Sniperpulseturret" or
+			defName="ZXT_Turret_Armoredpowerpulseturret" or
+			defName="ZXT_Turret_Advancedrotarypulsemachinegunturret"
+			]/statBases/ShootingAccuracyTurret </xpath>
+		<value>
+			<AimingAccuracy>1</AimingAccuracy>
+			<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+	<!-- ========== Pulse HMG Turret ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ZXT_Gun_Pulsemachinegunturret</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.18</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.03</SwayFactor>
+			<Bulk>37.08</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.55</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
+			<warmupTime>1.4</warmupTime>
+			<range>72</range>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<burstShotCount>20</burstShotCount>
+			<soundCast>Shot_ChargeBlaster</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>15.8</reloadTime>
+			<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Charged SNiper Pulse Turret ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ZXT_Gun_Sniperpulseturret</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.02</SwayFactor>
+			<Bulk>10.66</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.51</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12mmRailgun_Sabot</defaultProjectile>
+			<warmupTime>1.6</warmupTime>
+			<range>102</range>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<burstShotCount>1</burstShotCount>
+			<soundCast>ChargeLance_Fire</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>45</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<requireLineOfSight>false</requireLineOfSight>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>15.8</reloadTime>
+			<ammoSet>AmmoSet_12mmRailgun</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Armored Pulse Turrets, one caliber higher PLUS========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ZXT_Gun_Armoredpowerpulseturret</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.25</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.22</SwayFactor>
+			<Bulk>37.08</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.75</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x50mmCharged</defaultProjectile>
+			<warmupTime>1.4</warmupTime>
+			<range>78</range>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<burstShotCount>20</burstShotCount>
+			<soundCast>Shot_ChargeBlaster</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>22</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>250</magazineSize>
+			<reloadTime>16.5</reloadTime>
+			<ammoSet>AmmoSet_8x50mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+	<!-- ========== Armored Gatling Gun, ========= -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ZXT_Gun_Advancedrotarypulsemachinegunturret</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.25</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.25</SwayFactor>
+			<Bulk>37.08</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.725</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12x64mmCharged</defaultProjectile>
+			<warmupTime>1.25</warmupTime>
+			<range>77</range>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<burstShotCount>30</burstShotCount>
+			<soundCast>Shot_ChargeBlaster</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>22</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>300</magazineSize>
+			<reloadTime>18.5</reloadTime>
+			<ammoSet>AmmoSet_MechCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ADE Pulse Turrets PLUS/Patches/ADE Pulse Turrets PLUS/Remove_Mod_Ammo.xml b/ModPatches/ADE Pulse Turrets PLUS/Patches/ADE Pulse Turrets PLUS/Remove_Mod_Ammo.xml
new file mode 100644
index 0000000000..81c7be3675
--- /dev/null
+++ b/ModPatches/ADE Pulse Turrets PLUS/Patches/ADE Pulse Turrets PLUS/Remove_Mod_Ammo.xml	
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/RecipeDef[
+			defName="ZXT_Make_Ammo_Mediumpulsebattery" or
+			defName="ZXT_Make_x_Ammo_Mediumpulsebattery"
+			] </xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="ZXT_Ammo_Mediumpulsebattery"
+			] </xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ADogSaid/Patches/ADogSaid/Bionics.xml b/ModPatches/ADogSaid/Patches/ADogSaid/Bionics.xml
new file mode 100644
index 0000000000..dfcd2dcbf1
--- /dev/null
+++ b/ModPatches/ADogSaid/Patches/ADogSaid/Bionics.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Simple prosthetics ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="SimpleProstheticLegAnimal"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>prosthetic animal leg</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<cooldownTime>1.8</cooldownTime>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="SimpleProstheticArmAnimal"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>prosthetic animal arm</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<cooldownTime>1.8</cooldownTime>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="JawAnimalSimple"]</xpath>
+		<value>
+			<comps>
+				<li Class="HediffCompProperties_VerbGiver">
+					<tools>
+						<li Class="CombatExtended.ToolCE">
+							<label>simple animal jaw</label>
+							<capacities>
+								<li>Bite</li>
+							</capacities>
+							<power>6</power>
+							<armorPenetrationBlunt>2.0</armorPenetrationBlunt>
+							<armorPenetrationSharp>0.1</armorPenetrationSharp>
+							<cooldownTime>1.8</cooldownTime>
+						</li>
+					</tools>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ========== Bionics ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BionicLegAnimal"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>bionic animal leg</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>20</power>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<cooldownTime>1.4</cooldownTime>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BionicArmAnimal"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>bionic animal arm</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>15</power>
+					<armorPenetrationBlunt>2.0</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<cooldownTime>1.4</cooldownTime>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="JawAnimalBionic"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>bionic animal jaw</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>15</power>
+					<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<cooldownTime>1.6</cooldownTime>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AOC The Cleanup Devil/Defs/AOC The Cleanup Devil/Ammo_PowerCell.xml b/ModPatches/AOC The Cleanup Devil/Defs/AOC The Cleanup Devil/Ammo_PowerCell.xml
new file mode 100644
index 0000000000..aedd1f2718
--- /dev/null
+++ b/ModPatches/AOC The Cleanup Devil/Defs/AOC The Cleanup Devil/Ammo_PowerCell.xml	
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- AOCPOWERCELL -->
+
+	<ThingCategoryDef>
+		<defName>AmmoAOCPowerCell</defName>
+		<label>AOCPOWERCELL</label>
+		<parent>AmmoRifles</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== Ammo AOCPOWERCELL ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="AOCPowerCellBase" ParentName="SmallAmmoBase" Abstract="True">
+		<description>A power cell.</description>
+		<statBases>
+			<Mass>0.5</Mass>
+			<Bulk>0.1</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoAOCPowerCell</li>
+		</thingCategories>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AOCPowerCellBase">
+		<defName>Ammo_AOCPowerCell</defName>
+		<label>(AOC) Power cell</label>
+		<graphicData>
+			<texPath>Things/Ammo/Charged/MediumMech</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>1.5</MarketValue>
+		</statBases>
+		<ammoClass>Charged</ammoClass>
+	</ThingDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_AOCPowerCell</defName>
+		<label>AOC POWER CELL</label>
+		<ammoTypes>
+			<Ammo_AOCPowerCell>Bullet_SuviBusterProjectile</Ammo_AOCPowerCell>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Recipe: AOCELL===================== -->
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_AOCPowerCell</defName>
+		<label>make AOC PowerCell Power Cell x500</label>
+		<description>Craft 500 AOC PowerCell Power Cell.</description>
+		<jobString>Making TE Universal Power Cell.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Chemfuel</li>
+					</thingDefs>
+				</filter>
+				<count>15</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Chemfuel</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_AOCPowerCell>500</Ammo_AOCPowerCell>
+		</products>
+		<workAmount>19000</workAmount>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/AOC The Cleanup Devil/Defs/AOC The Cleanup Devil/Projectiles_Devil.xml b/ModPatches/AOC The Cleanup Devil/Defs/AOC The Cleanup Devil/Projectiles_Devil.xml
new file mode 100644
index 0000000000..1a818adf49
--- /dev/null
+++ b/ModPatches/AOC The Cleanup Devil/Defs/AOC The Cleanup Devil/Projectiles_Devil.xml	
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- Projectiles -->
+
+	<ThingDef ParentName="Base40x365mmBoforsBullet">
+		<defName>Bullet_SuviBusterProjectile</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>energy bolt</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_SuviBuster</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Flame</damageDef>
+			<speed>90</speed>
+			<dropsCasings>false</dropsCasings>
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationBlunt>5</armorPenetrationBlunt>
+			<armorPenetrationSharp>20</armorPenetrationSharp>
+			<explosionRadius>1</explosionRadius>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BasePilumProjectile">
+		<defName>Monojavelin_Thrown</defName>
+		<label>Monojavelin (thrown)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>28</damageAmountBase>
+			<speed>52</speed>
+			<armorPenetrationBlunt>10</armorPenetrationBlunt>
+			<armorPenetrationSharp>22</armorPenetrationSharp>
+			<preExplosionSpawnChance>1</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>AOC_Monojavelin</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/Animals.xml b/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/Animals.xml
new file mode 100644
index 0000000000..e2191ba1ff
--- /dev/null
+++ b/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/Animals.xml	
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--PooPoo-->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="PooPoo"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PooPoo"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency>0.75</NightVisionEfficiency>
+			<MeleeDodgeChance>0.69</MeleeDodgeChance>
+			<MeleeCritChance>0.33</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PooPoo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>razorfangs</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.46</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<chanceFactor>2</chanceFactor>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>3.2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.225</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Fckrat-->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="FCKrat"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="FCKrat"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency>0.75</NightVisionEfficiency>
+			<MeleeDodgeChance>0.69</MeleeDodgeChance>
+			<MeleeCritChance>0.33</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FCKrat"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>razorfangs</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.46</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<chanceFactor>2</chanceFactor>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>3.2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.225</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/Apparel/Apparel - Armor.xml b/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/Apparel/Apparel - Armor.xml
new file mode 100644
index 0000000000..6574430cd2
--- /dev/null
+++ b/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/Apparel/Apparel - Armor.xml	
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--========= Doom Armor =========-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_Doomarmor"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_Doomarmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>500</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_Doomarmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>50</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_Doomarmor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_Doomarmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_Doomarmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_Doomarmor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>80</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+			<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_Doomarmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AOC_Doomarmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!--========= Doom Helmet =========-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_DoomHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_DoomHelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_DoomHelmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>4.8</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_DoomHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>300</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_DoomHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_DoomHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_DoomHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingAccuracy>0.15</AimingAccuracy>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_DoomHelmet"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>60</Plasteel>
+			<DevilstrandCloth>20</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_DoomHelmet"]/apparel</xpath>
+		<value>
+			<immuneToToxGasExposure>true</immuneToToxGasExposure>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_DoomHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AOC_DoomHelmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/Apparel/Apparel - Biotech.xml b/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/Apparel/Apparel - Biotech.xml
new file mode 100644
index 0000000000..43f762c600
--- /dev/null
+++ b/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/Apparel/Apparel - Biotech.xml	
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!-- ========== Child Apparel ========== -->
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[
+						defName="AOCC_Kid_Apparel_Bori" or
+						defName="AOCC_Kid_Apparel_Miho" or
+						defName="AOCC_Kid_Apparel_AOC" or
+						defName="AOCC_Kid_Apparel_sheepawn"
+						]/statBases/StuffEffectMultiplierArmor </xpath>
+					<value>
+						<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[
+						defName="AOCC_Kid_Apparel_Bori" or
+						defName="AOCC_Kid_Apparel_Miho" or
+						defName="AOCC_Kid_Apparel_AOC" or
+						defName="AOCC_Kid_Apparel_sheepawn"
+						]/statBases </xpath>
+					<value>
+						<Bulk>1.5</Bulk>
+						<WornBulk>0.5</WornBulk>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/Apparel/Apparel - Flex.xml b/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/Apparel/Apparel - Flex.xml
new file mode 100644
index 0000000000..425ae6aa0c
--- /dev/null
+++ b/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/Apparel/Apparel - Flex.xml	
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== FLEX Apparel ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_FLEX_clothes"]/statBases</xpath>
+		<value>
+			<Bulk>1.5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_FLEX_clothes"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>20</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- FLEX Suit -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_FLEX_Suit"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_FLEX_Suit"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>7</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_FLEX_Suit"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- FLEX Dress -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_FLEX_Dress"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_FLEX_Dress"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- FLEX Coat -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_FLEX_Coat"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_FLEX_Coat"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/Apparel/Apparel - Kellion.xml b/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/Apparel/Apparel - Kellion.xml
new file mode 100644
index 0000000000..bfb4d7a0fb
--- /dev/null
+++ b/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/Apparel/Apparel - Kellion.xml	
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--========= Kellion Armor =========-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_Kellionarmor"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_Kellionarmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>700</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_Kellionarmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>50</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_Kellionarmor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_Kellionarmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>30</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_Kellionarmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_Kellionarmor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>90</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+			<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_Kellionarmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AOC_Kellionarmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!--========= Kellion Helmet	 =========-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_KellionHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_KellionHelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_KellionHelmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>4.8</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_KellionHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>300</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_KellionHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_KellionHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_KellionHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingAccuracy>0.15</AimingAccuracy>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_KellionHelmet"]/apparel</xpath>
+		<value>
+			<immuneToToxGasExposure>true</immuneToToxGasExposure>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_KellionHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AOC_KellionHelmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Nose</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Nose</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/Apparel/Apparel - Space.xml b/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/Apparel/Apparel - Space.xml
new file mode 100644
index 0000000000..f44c8a2428
--- /dev/null
+++ b/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/Apparel/Apparel - Space.xml	
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--========= SpaceSuit and Royal =========-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="AOC_SpaceApparelBase"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="AOC_SpaceApparelBase"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>700</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="AOC_SpaceApparelBase"]/statBases/Mass</xpath>
+		<value>
+			<Mass>50</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="AOC_SpaceApparelBase"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="AOC_SpaceApparelBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="AOC_SpaceApparelBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>30</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="AOC_SpaceApparelBase"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>100</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+			<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="AOC_SpaceApparelBase"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="AOC_SpaceApparelBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!--========= Space Suit Helmet and Royal Helmet=========-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="AOC_SpaceApparelHelmetBase"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="AOC_SpaceApparelHelmetBase"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="AOC_SpaceApparelHelmetBase"]/statBases/Mass</xpath>
+		<value>
+			<Mass>4.8</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="AOC_SpaceApparelHelmetBase"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>300</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="AOC_SpaceApparelHelmetBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>13</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="AOC_SpaceApparelHelmetBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>30</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="AOC_SpaceApparelHelmetBase"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingAccuracy>0.2</AimingAccuracy>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="AOC_SpaceApparelHelmetBase"]/apparel</xpath>
+		<value>
+			<immuneToToxGasExposure>true</immuneToToxGasExposure>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="AOC_SpaceApparelHelmetBase"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="AOC_SpaceApparelHelmetBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Nose</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Nose</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/Apparel/Apparel.xml b/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/Apparel/Apparel.xml
new file mode 100644
index 0000000000..5d53fadc25
--- /dev/null
+++ b/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/Apparel/Apparel.xml	
@@ -0,0 +1,896 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--========= MonerArmor =========-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_Monerarmor"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_Monerarmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>700</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_Monerarmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>50</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_Monerarmor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_Monerarmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_Monerarmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>30</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_Monerarmor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>100</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+			<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_Monerarmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AOC_Monerarmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!--========= Moner Helmet =========-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_MonerHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_MonerHelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_MonerHelmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>4.8</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_MonerHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>240</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_MonerHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_MonerHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_MonerHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingAccuracy>0.15</AimingAccuracy>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_MonerHelmet"]/apparel</xpath>
+		<value>
+			<immuneToToxGasExposure>true</immuneToToxGasExposure>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_MonerHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AOC_MonerHelmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Nose</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Nose</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!--========= Bone Armor =========-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_bone_armor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_bone_armor"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<!--========= SAE Helmet =========-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="AOC_SAEHelmetPowerBase"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="AOC_SAEHelmetPowerBase"]/statBases/Mass</xpath>
+		<value>
+			<Mass>4.8</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="AOC_SAEHelmetPowerBase"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>240</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="AOC_SAEHelmetPowerBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="AOC_SAEHelmetPowerBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="AOC_SAEHelmetPowerBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Nose</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Nose</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== warsuits ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_war_suits"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_war_suits"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>30</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="AOC_war_suits"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_war_suits"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AOC_war_suits"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Apparel ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_work_clothes"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_work_clothes"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_winter_hat"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_winter_hat"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_Cdress"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_Cdress"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_winter_clothes"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_winter_clothes"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_Jump_Suit"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_Jump_Suit"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_Aloha"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.8</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_Aloha"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_overalls"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_overalls"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_audit_clothes"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_audit_clothes"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_audit_coat"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_audit_coat"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_coat"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_coat"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_work_cap"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_work_cap"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOCHealHat"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOCHealHat"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_war_cap"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>15</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_war_cap"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOCStraw"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_arm_band"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_arm_band"]/statBases</xpath>
+		<value>
+			<Bulk>0.25</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_card"]/statBases</xpath>
+		<value>
+			<Bulk>0.25</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="AOC_card"]/statBases/StuffEffectMultiplierArmor</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_AlohaF"]/statBases</xpath>
+		<value>
+			<Bulk>0.25</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_Doll_Whale"]/statBases</xpath>
+		<value>
+			<Bulk>0.25</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="AOC_AlohaF"]/statBases/StuffEffectMultiplierArmor</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_arm_band"]/statBases/EnergyShieldRechargeRate</xpath>
+		<value>
+			<EnergyShieldRechargeRate>0.300</EnergyShieldRechargeRate>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_arm_band"]/statBases/EnergyShieldEnergyMax</xpath>
+		<value>
+			<EnergyShieldEnergyMax>0.55</EnergyShieldEnergyMax>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_coat"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_coat"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>7</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AOC_coat"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_coat"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>2.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_NanoSuit"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_NanoSuit"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_NanoSuit"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AOC_NanoSuit"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_GasVeil"]/statBases</xpath>
+		<value>
+			<Bulk>1.5</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_GasVeil"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_GasVeil"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_GasMask"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_GasMask"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_GasMask"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_GasMask"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ========== Trash Apparel ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_Trash_clothes"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_Trash_clothes"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_Trash_clothes"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_Trash_clothes"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_Wintercoat"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_Wintercoat"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_Wintercoat"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/Apparel/Backpacks.xml b/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/Apparel/Backpacks.xml
new file mode 100644
index 0000000000..39d0b005be
--- /dev/null
+++ b/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/Apparel/Backpacks.xml	
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Battle Backpacks-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_Battle_Backpacks"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_Battle_Backpacks"]/equippedStatOffsets/CarryingCapacity</xpath>
+		<value>
+			<CarryBulk>70</CarryBulk>
+		</value>
+	</Operation>
+
+	<!--Cleaner Backpacks-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_Cleaner_Backpacks"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_Cleaner_Backpacks"]/equippedStatOffsets/CarryingCapacity</xpath>
+		<value>
+			<CarryBulk>100</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_Cleaner_Backpacks"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<label>cleaner</label>
+					<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<onlyManualCast>True</onlyManualCast>
+					<warmupTime>1</warmupTime>
+					<range>12</range>
+					<minRange>2</minRange>
+					<soundCast>Shot_IncendiaryLauncher</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>14</muzzleFlashScale>
+					<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+					<defaultProjectile>Proj_FilthEraser</defaultProjectile>
+					<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!--Recycle Backpacks-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_Recyle_Backpacks"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_Recyle_Backpacks"]/equippedStatOffsets/CarryingCapacity</xpath>
+		<value>
+			<CarryBulk>100</CarryBulk>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/BodyDef.xml b/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/BodyDef.xml
new file mode 100644
index 0000000000..2a4751f8f8
--- /dev/null
+++ b/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/BodyDef.xml	
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Melee-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="AOC"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Gizmo-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="AOC"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<!--Arm Groups-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="AOC"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="AOC"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="AOC"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="AOC"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<!--Natural Armor-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="AOC"]//*[
+			def="Torso" or
+			def="Neck" or
+			def="Head" or
+			def="AOCTail" or
+			def="Nose" or
+			def="Jaw" or
+			def="Ear" or
+			def="Shoulder" or
+			def="Arm" or
+			def="Hand" or
+			def="Finger" or
+			def="Leg" or
+			def="Foot" or
+			def="Toe"]/groups
+		</xpath>
+
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/Grenades.xml b/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/Grenades.xml
new file mode 100644
index 0000000000..3c03215935
--- /dev/null
+++ b/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/Grenades.xml	
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="AOC_B2H" or
+			defName="AOC_Trash_Grenade"
+			] </xpath>
+		<value>
+			<thingClass>CombatExtended.AmmoThing</thingClass>
+			<stackLimit>25</stackLimit>
+			<resourceReadoutPriority>First</resourceReadoutPriority>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[
+			defName="AOC_B2H" or
+			defName="AOC_Trash_Grenade"
+			] </xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AOC_B2H"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AOC_B2H"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AOC_Trash_Grenade"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AOC_Trash_Grenade"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Proj_GrenadeDevEraser" or
+			defName="Proj_AOC_Trash_Bag"
+			]/thingClass </xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Proj_GrenadeDevEraser"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Proj_GrenadeDevEraser"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Proj_AOC_Trash_Bag"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Proj_AOC_Trash_Bag"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<!-- ========== B2H ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AOC_B2H</defName>
+		<statBases>
+			<Mass>1</Mass>
+			<Bulk>1</Bulk>
+			<MarketValue>10.95</MarketValue>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<label>throw EMP grenade</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<range>12.0</range>
+			<minRange>2</minRange>
+			<warmupTime>0.8</warmupTime>
+			<noiseRadius>4</noiseRadius>
+			<soundCast>ThrowGrenade</soundCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<defaultProjectile>Proj_GrenadeDevEraser</defaultProjectile>
+			<onlyManualCast>true</onlyManualCast>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Proj_GrenadeDevEraser"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<explosionRadius>3.55</explosionRadius>
+				<damageDef>DevModeEraser</damageDef>
+				<explosionDelay>100</explosionDelay>
+				<speed>14</speed>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+				<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
+			</projectile>
+		</value>
+	</Operation>
+
+	<!-- ========== Trash Grenade ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AOC_Trash_Grenade</defName>
+		<statBases>
+			<Mass>1</Mass>
+			<Bulk>4</Bulk>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<label>throw trash bag</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<range>10.0</range>
+			<minRange>2</minRange>
+			<warmupTime>0.8</warmupTime>
+			<noiseRadius>4</noiseRadius>
+			<soundCast>ThrowGrenade</soundCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<defaultProjectile>Proj_AOC_Trash_Bag</defaultProjectile>
+			<onlyManualCast>true</onlyManualCast>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Proj_AOC_Trash_Bag"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<explosionRadius>3.5</explosionRadius>
+				<damageAmountBase>5</damageAmountBase>
+				<soundExplode>MortarBomb_Explode</soundExplode>
+				<damageDef>AOC_Trash_Boom</damageDef>
+				<preExplosionSpawnThingDef>Filth_DDong</preExplosionSpawnThingDef>
+				<speed>12</speed>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+				<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
+			</projectile>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/MeleeWeapons.xml b/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/MeleeWeapons.xml
new file mode 100644
index 0000000000..4c6ec9885f
--- /dev/null
+++ b/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/MeleeWeapons.xml	
@@ -0,0 +1,258 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Fire Axe -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_F4T"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.3</cooldownTime>
+					<armorPenetrationBlunt>3.263</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Demolish</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>2.43</cooldownTime>
+					<armorPenetrationBlunt>10.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>41</power>
+					<cooldownTime>2.41</cooldownTime>
+					<armorPenetrationBlunt>13.05</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.16</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_F4T"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.28</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_F4T"]/statBases/Mass</xpath>
+		<value>
+			<Mass>2.9</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_F4T"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.11</MeleeCritChance>
+				<MeleeParryChance>0.28</MeleeParryChance>
+				<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Niddle -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_ND"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.35</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.78</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.19</cooldownTime>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.25</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_ND"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_ND"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.17</MeleeCritChance>
+				<MeleeParryChance>1.45</MeleeParryChance>
+				<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Monospear -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_MonoSpear"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.15</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.48</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.09</cooldownTime>
+					<armorPenetrationBlunt>5.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>18.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_MonoSpear"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>8</Bulk>
+				<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_MonoSpear"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.23</MeleeCritChance>
+				<MeleeParryChance>1.5</MeleeParryChance>
+				<MeleeDodgeChance>0.92</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Long Monospear -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_LongMonoSpear"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.45</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.68</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>1.39</cooldownTime>
+					<armorPenetrationBlunt>5.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>22.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_LongMonoSpear"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>8</Bulk>
+				<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_LongMonoSpear"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.23</MeleeCritChance>
+				<MeleeParryChance>1.5</MeleeParryChance>
+				<MeleeDodgeChance>0.92</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/PawnKinds_AOC.xml b/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/PawnKinds_AOC.xml
new file mode 100644
index 0000000000..107fc45cf0
--- /dev/null
+++ b/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/PawnKinds_AOC.xml	
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Give ammo to pawns ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="AOC_Freeter" or
+			defName="AOC_Audit_Team_Leader" or
+			defName="AOC_Hunter" or
+			defName="AOC_Trash_Girl"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="AOC_Hammer" or
+			defName="AOC_Firefighter" or
+			defName="AOC_Doom_Guard" or
+			defName="AOC_Audit_Team" or
+			defName="AOC_Commander" or
+			defName="AOC_Anvil" or
+			defName="AOC_assult"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>7</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="AOC_Doom_Punisher"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/RangedWeapons.xml b/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/RangedWeapons.xml
new file mode 100644
index 0000000000..8fb8234974
--- /dev/null
+++ b/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/RangedWeapons.xml	
@@ -0,0 +1,517 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Monojavelin -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_Monojavelin"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.15</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.48</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.09</cooldownTime>
+					<armorPenetrationBlunt>5.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>18.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_Monojavelin"]</xpath>
+		<value>
+			<thingCategories>
+				<li>WeaponsRanged</li>
+			</thingCategories>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AOC_Monojavelin"]</xpath>
+		<value>
+			<weaponTags>
+				<li>CE_OneHandedWeapon</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_Monojavelin"]/statBases</xpath>
+		<value>
+			<statBases>
+				<SightsEfficiency>1.0</SightsEfficiency>
+				<ShotSpread>1.5</ShotSpread>
+				<SwayFactor>2.5</SwayFactor>
+				<Bulk>2.5</Bulk>
+				<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			</statBases>
+			<stackLimit>25</stackLimit>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_Monojavelin"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Monojavelin_Thrown</defaultProjectile>
+					<warmupTime>0.8</warmupTime>
+					<range>32</range>
+					<soundCast>Interact_BeatFire</soundCast>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Melee Tools -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="QKB_18K" or
+			defName="TCB_26K"
+			]/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>
+
+	<!-- TCB 26K -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="TCB_26K_AP"]</xpath>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>TCB_26K</defName>
+		<statBases>
+			<Mass>3.50</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.26</SwayFactor>
+			<Bulk>6.2</Bulk>
+			<SightsEfficiency>1</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.54</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>19</range>
+			<soundCast>Shot_Shotgun_NoRack</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="QKB_18K"]/costList/Chemfuel</xpath>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>QKB_18K</defName>
+		<statBases>
+			<Mass>8</Mass>
+			<RangedWeapon_Cooldown>0.43</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.8</SwayFactor>
+			<Bulk>8</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_30x64mmFuel_Incendiary</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>40</range>
+			<burstShotCount>2</burstShotCount>
+			<soundCast>Shot_IncendiaryLauncher</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>5.5</reloadTime>
+			<ammoSet>AmmoSet_30x64mmFuel</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- SC SK -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AOC_SCP_SK</defName>
+		<statBases>
+			<Mass>3.50</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.26</SwayFactor>
+			<Bulk>6.2</Bulk>
+			<SightsEfficiency>1</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.54</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>19</range>
+			<soundCast>Shot_Shotgun_NoRack</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_SCP_SK" ]/tools
+		</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>pickaxe</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>grip</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>shovel</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.55</cooldownTime>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- A2E -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AOC_A2E</defName>
+		<statBases>
+			<Mass>5</Mass>
+			<RangedWeapon_Cooldown>2.53</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.35</ShotSpread>
+			<SwayFactor>1.02</SwayFactor>
+			<Bulk>4.00</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Proj_FilthEraser</defaultProjectile>
+			<warmupTime>4.5</warmupTime>
+			<range>14</range>
+			<ticksBetweenBurstShots>25</ticksBetweenBurstShots>
+			<burstShotCount>4</burstShotCount>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<ai_AvoidFriendlyFireRadius>2</ai_AvoidFriendlyFireRadius>
+			<minRange>2</minRange>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>4</magazineSize>
+			<reloadTime>8</reloadTime>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Proj_FilthEraser"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Proj_FilthEraser"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>20</speed>
+				<explosionRadius>4.5</explosionRadius>
+				<damageDef>FilthEraser</damageDef>
+				<!-- Use default damage from explosion def -->
+				<explosionDelay>50</explosionDelay>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+				<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
+			</projectile>
+		</value>
+	</Operation>
+
+	<!--Killakill/Launcher-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AOC_KILLAKILL</defName>
+		<statBases>
+			<Mass>8</Mass>
+			<RangedWeapon_Cooldown>0.43</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.8</SwayFactor>
+			<Bulk>10</Bulk>
+			<WorkToMake>39500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>65</Steel>
+			<Plasteel>30</Plasteel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>1.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_25x59mmGrenade_HE</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>40</range>
+			<burstShotCount>0</burstShotCount>
+			<soundCast>ThrowGrenade</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_25x59mmGrenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AOE</li>
+			<li>EliteGun</li>
+		</weaponTags>
+		<researchPrerequisite>AOC_Toy2_Access</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!--KJW-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AOC_KJW</defName>
+		<statBases>
+			<Mass>7.60</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>3.22</SwayFactor>
+			<Bulk>10</Bulk>
+			<WorkToMake>15000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>110</Steel>
+			<ComponentIndustrial>11</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>0.97</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>2.1</warmupTime>
+			<range>62</range>
+			<burstShotCount>50</burstShotCount>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>150</magazineSize>
+			<reloadTime>4.0</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>25</aimedBurstShotCount>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Suppressive</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_KJW"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrels</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2.44</cooldownTime>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrels</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="AOC_KJW"]/equippedStatOffsets</xpath>
+	</Operation>
+
+	<!--SuviSniper-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AOC_Suvi_Sniper</defName>
+		<statBases>
+			<SightsEfficiency>2.60</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.46</SwayFactor>
+			<Bulk>12.40</Bulk>
+			<Mass>5.20</Mass>
+			<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.06</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_SuviBusterProjectile</defaultProjectile>
+			<warmupTime>5</warmupTime>
+			<range>50</range>
+			<soundCast>ChargeLance_Fire</soundCast>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>2</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_AOCPowerCell</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AOC_Suvi_Sniper"]/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>Barrels</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/Scenario - Biotech.xml b/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/Scenario - Biotech.xml
new file mode 100644
index 0000000000..ff3c591052
--- /dev/null
+++ b/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/Scenario - Biotech.xml	
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ScenarioDef[defName="AOC_Scenario_BioTech"]/scenario/parts</xpath>
+					<value>
+						<li Class="ScenPart_StartingThing_Defined">
+							<def>StartingThing_Defined</def>
+							<thingDef>Ammo_303British_FMJ</thingDef>
+							<count>100</count>
+						</li>
+						<li Class="ScenPart_StartingThing_Defined">
+							<def>StartingThing_Defined</def>
+							<thingDef>Ammo_44Magnum_FMJ</thingDef>
+							<count>60</count>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ScenarioDef[defName="AOC_Scenario_BioTech"]/scenario/parts/li[thingDef="Apparel_FlakVest"]</xpath>
+					<value>
+						<li Class="ScenPart_StartingThing_Defined">
+							<def>StartingThing_Defined</def>
+							<thingDef>Apparel_FlakVest</thingDef>
+							<stuff>Steel</stuff>
+							<count>1</count>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/Scenario.xml b/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/Scenario.xml
new file mode 100644
index 0000000000..67bb6e62c1
--- /dev/null
+++ b/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/Scenario.xml	
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="AOC_Scenario"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_303British_FMJ</thingDef>
+				<count>100</count>
+			</li>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_44Magnum_FMJ</thingDef>
+				<count>60</count>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ScenarioDef[defName="AOC_Scenario"]/scenario/parts/li[thingDef="Apparel_FlakVest"]</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Apparel_FlakVest</thingDef>
+				<stuff>Steel</stuff>
+				<count>1</count>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/Traders_AOC.xml b/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/Traders_AOC.xml
new file mode 100644
index 0000000000..8b2e4dc7d8
--- /dev/null
+++ b/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/Traders_AOC.xml	
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Traders ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="Base_Neolithic_Standard_AOC"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>FSX</thingDef>
+				<countRange>
+					<min>15</min>
+					<max>50</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>Prometheum</thingDef>
+				<countRange>
+					<min>15</min>
+					<max>50</max>
+				</countRange>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="AOC_Trash_Trader"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>FSX</thingDef>
+				<countRange>
+					<min>0</min>
+					<max>25</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>Prometheum</thingDef>
+				<countRange>
+					<min>0</min>
+					<max>25</max>
+				</countRange>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="Orbital_AOC"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Ammo</tradeTag>
+				<countRange>
+					<min>400</min>
+					<max>1000</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>2</min>
+					<max>4</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_MediumAmmo</tradeTag>
+				<countRange>
+					<min>60</min>
+					<max>120</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>4</min>
+					<max>7</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_HeavyAmmo</tradeTag>
+				<countRange>
+					<min>15</min>
+					<max>50</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>2</min>
+					<max>4</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>FSX</thingDef>
+				<countRange>
+					<min>50</min>
+					<max>100</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>Prometheum</thingDef>
+				<countRange>
+					<min>50</min>
+					<max>100</max>
+				</countRange>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Advanced Mechanoid Warfare/Defs/Advanced Mechanoid Warfare/Defs_Ammo.xml b/ModPatches/Advanced Mechanoid Warfare/Defs/Advanced Mechanoid Warfare/Defs_Ammo.xml
new file mode 100644
index 0000000000..b0fae754cc
--- /dev/null
+++ b/ModPatches/Advanced Mechanoid Warfare/Defs/Advanced Mechanoid Warfare/Defs_Ammo.xml	
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_UMW</defName>
+		<label>Universal Weapon Module</label>
+		<ammoTypes>
+			<Ammo_8x35mmCharged>Bullet_UWMChargeShot</Ammo_8x35mmCharged>
+			<Ammo_PlasmaCellRifle>Bullet_UWMFireShot</Ammo_PlasmaCellRifle>
+			<Ammo_8x35mmCharged_Ion>Bullet_UWMEmpShot</Ammo_8x35mmCharged_Ion>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Nomad</defName>
+		<label>Unstable Shot</label>
+		<ammoTypes>
+			<Ammo_5x35mmCharged>Bullet_NomadShot</Ammo_5x35mmCharged>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Stalker</defName>
+		<label>Unstable Shot</label>
+		<ammoTypes>
+			<Ammo_5x35mmCharged>Bullet_StalkersShot</Ammo_5x35mmCharged>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Lens</defName>
+		<label>Unstable Shot</label>
+		<ammoTypes>
+			<Ammo_5x35mmCharged>Bullet_IonLenseShot</Ammo_5x35mmCharged>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Vapor</defName>
+		<label>Unstable Shot</label>
+		<ammoTypes>
+			<Ammo_5x35mmCharged>Bullet_VaporizerShot</Ammo_5x35mmCharged>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Headhunter</defName>
+		<label>Unstable Shot</label>
+		<ammoTypes>
+			<Ammo_5x35mmCharged>Bullet_HeadhunterShot</Ammo_5x35mmCharged>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_UWMChargeShot</defName>
+		<label>Unstable bullet</label>
+		<graphicData>
+			<texPath>Things/Equipment/WeaponRanged/Projectiles/NomadShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>6</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>14</armorPenetrationSharp>
+			<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
+			<speed>120</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_UWMFireShot</defName>
+		<label>Unstable bullet</label>
+		<graphicData>
+			<texPath>Things/Equipment/WeaponRanged/Projectiles/FireBlob</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>7</damageAmountBase>
+			<armorPenetrationSharp>14</armorPenetrationSharp>
+			<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
+			<damageDef>Flame</damageDef>
+			<speed>65</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_UWMEmpShot</defName>
+		<label>Unstable bullet</label>
+		<graphicData>
+			<texPath>Things/Equipment/WeaponRanged/Projectiles/UnstableEmp</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>7</damageAmountBase>
+			<armorPenetrationSharp>14</armorPenetrationSharp>
+			<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
+			<damageDef>EMP</damageDef>
+			<speed>65</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_NomadShot</defName>
+		<label>Unstable bullet</label>
+		<graphicData>
+			<texPath>Things/Equipment/WeaponRanged/Projectiles/NomadShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>7</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>10</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>22</armorPenetrationSharp>
+			<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
+			<damageDef>Bullet</damageDef>
+			<speed>120</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_StalkersShot</defName>
+		<label>Unstable bullet</label>
+		<graphicData>
+			<texPath>Things/Equipment/WeaponRanged/Projectiles/StalkersShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>7</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>10</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>26</armorPenetrationSharp>
+			<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
+			<damageDef>Bullet</damageDef>
+			<speed>150</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_IonLenseShot</defName>
+		<label>Unstable bullet</label>
+		<graphicData>
+			<texPath>Things/Equipment/WeaponRanged/Projectiles/IonLenseShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>9</damageAmountBase>
+			<armorPenetrationSharp>26</armorPenetrationSharp>
+			<armorPenetrationBlunt>3</armorPenetrationBlunt>
+			<damageDef>Bullet</damageDef>
+			<speed>150</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_VaporizerShot</defName>
+		<label>Unstable bullet</label>
+		<graphicData>
+			<texPath>Things/Equipment/WeaponRanged/Projectiles/VaporizerShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>3.1</drawSize>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>27</damageAmountBase>
+			<armorPenetrationSharp>14</armorPenetrationSharp>
+			<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
+			<damageDef>Bullet</damageDef>
+			<speed>85</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_HeadhunterShot</defName>
+		<label>Unstable bullet</label>
+		<graphicData>
+			<texPath>Things/Equipment/WeaponRanged/Projectiles/HeadhunterShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>3.1</drawSize>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>31</damageAmountBase>
+			<armorPenetrationSharp>12</armorPenetrationSharp>
+			<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
+			<damageDef>Bullet</damageDef>
+			<speed>120</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_EBlade</defName>
+		<label>Unstable bullet</label>
+		<graphicData>
+			<texPath>Things/Equipment/WeaponRanged/Projectiles/EBlade</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>1.2</drawSize>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>24</damageAmountBase>
+			<armorPenetrationSharp>14</armorPenetrationSharp>
+			<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
+			<damageDef>Bullet</damageDef>
+			<speed>85</speed>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Advanced Mechanoid Warfare/Defs/Advanced Mechanoid Warfare/Defs_Turrets.xml b/ModPatches/Advanced Mechanoid Warfare/Defs/Advanced Mechanoid Warfare/Defs_Turrets.xml
new file mode 100644
index 0000000000..d58503f027
--- /dev/null
+++ b/ModPatches/Advanced Mechanoid Warfare/Defs/Advanced Mechanoid Warfare/Defs_Turrets.xml	
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingDef ParentName="AMW_Turret_AutoMortarBase">
+		<defName>AMW_Turret_AutoMortar</defName>
+		<label>automated mortar complex</label>
+		<description>A fully automated mortar complex. Fires a volley of 3 explosive shells and does not require to be reloaded or manned in order to operate. However it requires a lot of power to manufacture shells quickly and it can only fire explosive shells.</description>
+		<terrainAffordanceNeeded>Heavy</terrainAffordanceNeeded>
+		<building>
+			<turretGunDef>AMW_Gun_AAComplex</turretGunDef>
+		</building>
+		<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		<uiIconPath>Things/Buildings/Turrets/AMW_AutoArtillery</uiIconPath>
+		<uiIconScale>0.9</uiIconScale>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Advanced Mechanoid Warfare/Patches/Advanced Mechanoid Warfare/Patches/Patch_Ammo.xml b/ModPatches/Advanced Mechanoid Warfare/Patches/Advanced Mechanoid Warfare/Patches/Patch_Ammo.xml
new file mode 100644
index 0000000000..e0ae647a33
--- /dev/null
+++ b/ModPatches/Advanced Mechanoid Warfare/Patches/Advanced Mechanoid Warfare/Patches/Patch_Ammo.xml	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Bullet_NomadShot"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Bullet_StalkersShot"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Bullet_UWMChargeShot"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Bullet_UWMFireShot"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Bullet_UWMEmpShot"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Bullet_IonLenseShot"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Bullet_VaporizerShot"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Bullet_EBlade"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Bullet_HeadhunterShot"]</xpath>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Advanced Mechanoid Warfare/Patches/Advanced Mechanoid Warfare/Patches/Patch_Armor.xml b/ModPatches/Advanced Mechanoid Warfare/Patches/Advanced Mechanoid Warfare/Patches/Patch_Armor.xml
new file mode 100644
index 0000000000..e93584cd66
--- /dev/null
+++ b/ModPatches/Advanced Mechanoid Warfare/Patches/Advanced Mechanoid Warfare/Patches/Patch_Armor.xml	
@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="NovaBlossomAMW"]//*[def="MechanicalLeg" or def="MechanicalHead"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="NovaBlossomAMW"]//*[def="MechanicalThorax"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MechaDergAMW"]//*[def="MechanicalLeg" or def="MechanicalTailAMW" or def="MechanicalClawsAMW" or def="MechanicalHead"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MechaDergAMW"]//*[def="MechanicalWingsAMW" or (def="MechanicalLeg" and not(groups)) or def="MechanicalThorax"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ChargerAMW"]//*[def="MechanicalThoraxAMW" or def="MechanicalHead" or def="MechanicalLegsAMW" or def="MechanicalJawAMW"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ChargerAMW"]//*[def="MechanicalWolfBodyAMW"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="AnarchistAMW"]//*[def="MechanicalThoraxAMW" or def="MechanicalHead" or def="MechanicalPincerAMW" or def="MechanicalTailAMW"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="AnarchistAMW"]//*[def="MechanicalInsectBodyAMW" or def="MechanicalLeg"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HeadhunterAMW"]//*[def="MechanicalThoraxAMW" or def="MechanicalHead" or def="MechanicalPincerAMW"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HeadhunterAMW"]//*[def="MechanicalInsectBodyAMW" or def="MechanicalLeg"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="PurgerAMW"]//*[def="MechanicalThoraxAMW" or def="MechanicalHead" or def="MechanicalLegsAMW"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="PurgerAMW"]//*[def="MechanicalInsectBodyAMW" or (def="MechanicalLegsAMW" and not(groups))]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ReaperAMW"]//*[def="MechanicalThoraxAMW" or def="MechanicalHead" or def="MechanicalLegsAMW"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ReaperAMW"]//*[def="MechanicalInsectBodyAMW" or (def="MechanicalLegsAMW" and not(groups))]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ImpulseAMW"]//*[def="MechanicalThoraxAMW" or def="MechanicalHead" or def="MechanicalLegsAMW" or def="MechanicalJawAMW"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ImpulseAMW"]//*[def="MechanicalWolfBodyAMW" or (def="MechanicalLegsAMW" and not(groups))]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ScourgeAMW"]//*[def="MechanicalThoraxAMW" or def="MechanicalHead" or def="MechanicalLegsAMW" or def="MechanicalJawAMW"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ScourgeAMW"]//*[def="MechanicalSmallBodyAMW" or (def="MechanicalLegsAMW" and not(groups))]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="SawbladeAMW"]//*[def="MechanicalThoraxAMW" or def="MechanicalHead" or def="MechanicalLegsAMW" or def="MechanicalJawAMW"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="SawbladeAMW"]//*[def="MechanicalWolfBodyAMW" or (def="MechanicalLegsAMW" and not(groups))]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MechSpikeAMW"]//*[def="MechanicalThoraxAMW" or def="MechanicalHead" or def="MechanicalLegsAMW" or def="MechanicalJawAMW"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MechSpikeAMW"]//*[def="MechanicalWolfBodyAMW" or (def="MechanicalLegsAMW" and not(groups))]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MechThrumboAMW"]//*[def="MechanicalThoraxAMW" or def="MechanicalHead" or def="MechanicalLegsAMW" or def="PlasmaHornAMW"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MechThrumboAMW"]//*[def="MechanicalWolfBodyAMW" or (def="MechanicalLegsAMW" and not(groups))]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RenegadeAMW"]//*[def="MechanicalThoraxAMW" or def="MechanicalHead" or def="MechanicalLegsAMW" or def="MechanicalJawAMW"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RenegadeAMW"]//*[def="MechanicalWolfBodyAMW" or (def="MechanicalLegsAMW" and not(groups))]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="SupressorAMW"]//*[def="MechanicalThoraxAMW" or def="MechanicalHead" or def="MechanicalTailAMW"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="SupressorAMW"]//*[def="MechanicalSmallBodyAMW" or def="MechanicalSegmentAMW"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="FlayerAMW"]//*[def="MechanicalThoraxAMW" or def="MechanicalHead" or def="MechanicalSmallScytheAMW" or def="MechanicalTailAMW"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="FlayerAMW"]//*[def="MechanicalSmallBodyAMW" or def="MechanicalLegsAMW"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="VortexAMW"]//*[def="MechanicalThoraxAMW" or def="MechanicalHead" or def="MechanicalTailAMW"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="VortexAMW"]//*[def="MechanicalSmallBodyAMW" or def="MechanicalLegsAMW"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="WraithAMW"]//*[def="MechanicalThoraxAMW" or def="MechanicalHead" or def="MechanicalLargeScytheAMW" or def="MechanicalTailAMW"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="WraithAMW"]//*[def="WraithBodyAMW"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="NomadAMW" or defName="SeekerAMW" or defName="SpectreAMW" or defName="StalkerAMW"]//*[def="MechanicalThoraxAMW" or def="MechanicalHead" or def="MechanicalFinger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="NomadAMW" or defName="SeekerAMW" or defName="SpectreAMW" or defName="StalkerAMW"]//*[def="HumanoidBodyAMW" or def="MechanicalShoulder" or def="MechanicalArm" or def="MechanicalLeg" or def="MechanicalFoot"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Advanced Mechanoid Warfare/Patches/Advanced Mechanoid Warfare/Patches/Patch_DamageDef.xml b/ModPatches/Advanced Mechanoid Warfare/Patches/Advanced Mechanoid Warfare/Patches/Patch_DamageDef.xml
new file mode 100644
index 0000000000..fa702114ae
--- /dev/null
+++ b/ModPatches/Advanced Mechanoid Warfare/Patches/Advanced Mechanoid Warfare/Patches/Patch_DamageDef.xml	
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="NovaBomb"]/defaultDamage</xpath>
+		<value>
+			<defaultDamage>80</defaultDamage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="NovaBomb"]/defaultArmorPenetration</xpath>
+		<value>
+			<defaultArmorPenetration>130</defaultArmorPenetration>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="NovaBomb"]/armorCategory</xpath>
+		<value>
+			<armorCategory>Blunt</armorCategory>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Advanced Mechanoid Warfare/Patches/Advanced Mechanoid Warfare/Patches/Patch_Loadouts.xml b/ModPatches/Advanced Mechanoid Warfare/Patches/Advanced Mechanoid Warfare/Patches/Patch_Loadouts.xml
new file mode 100644
index 0000000000..4536800c41
--- /dev/null
+++ b/ModPatches/Advanced Mechanoid Warfare/Patches/Advanced Mechanoid Warfare/Patches/Patch_Loadouts.xml	
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="Mech_NovaBlossom" or
+			defName="AMW_Mech_Blacklight" or
+			defName="AMW_Mech_Frosthound" or
+			defName="Mech_Charger" or
+			defName="Mech_Anarchist" or
+			defName="Mech_Headhunter" or
+			defName="Mech_Impulse" or
+			defName="Mech_Scourge" or
+			defName="Mech_Sawblade" or
+			defName="Mech_Spike" or
+			defName="Mech_Renegade" or
+			defName="Mech_Supressor" or
+			defName="Mech_Flayer" or
+			defName="Mech_Nomad" or
+			defName="Mech_AMWSeeker" or
+			defName="Mech_Spectre" or
+			defName="Mech_Stalker" or
+			defName="Mech_Vortex" or
+			defName="Mech_Derg" or
+			defName="AMW_Mech_Supernova" or
+			defName="Mech_Purger" or
+			defName="Mech_Reaper" or
+			defName="Mech_Thrumbo" or
+			defName="Mech_Wraith"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>10</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Advanced Mechanoid Warfare/Patches/Advanced Mechanoid Warfare/Patches/Patch_Melee.xml b/ModPatches/Advanced Mechanoid Warfare/Patches/Advanced Mechanoid Warfare/Patches/Patch_Melee.xml
new file mode 100644
index 0000000000..2143fe8472
--- /dev/null
+++ b/ModPatches/Advanced Mechanoid Warfare/Patches/Advanced Mechanoid Warfare/Patches/Patch_Melee.xml	
@@ -0,0 +1,700 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_NovaBlossom"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>front legs</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.85</cooldownTime>
+					<armorPenetrationSharp>4</armorPenetrationSharp>
+					<armorPenetrationBlunt>18.4</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<linkedBodyPartsGroup>MechanicalLegsAMW</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="AMW_Mech_Frosthound" or
+			defName="AMW_Mech_Supernova"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>front legs</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>0.85</cooldownTime>
+					<armorPenetrationSharp>12</armorPenetrationSharp>
+					<armorPenetrationBlunt>24</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<linkedBodyPartsGroup>MechanicalLegsAMW</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AMW_Mech_Blacklight"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2.6</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.84</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Derg"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>47</power>
+					<cooldownTime>2.15</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>33</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>derg claws</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>86</power>
+					<cooldownTime>2.8</cooldownTime>
+					<armorPenetrationBlunt>33.750</armorPenetrationBlunt>
+					<armorPenetrationSharp>67.5</armorPenetrationSharp>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<linkedBodyPartsGroup>DergClawsAMW</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>tail</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>56</power>
+					<cooldownTime>2.15</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<linkedBodyPartsGroup>MechanicalTailAMW</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Thrumbo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>2.15</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>33</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>plasma horn</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>87</power>
+					<cooldownTime>1.79</cooldownTime>
+					<armorPenetrationBlunt>33.750</armorPenetrationBlunt>
+					<armorPenetrationSharp>45</armorPenetrationSharp>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<linkedBodyPartsGroup>PlasmaHornAMW</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Supressor"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2.6</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.84</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>derg claws</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.79</cooldownTime>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<chanceFactor>0.8</chanceFactor>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<linkedBodyPartsGroup>MechanicalTailAMW</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Mech_Charger" or
+			defName="Mech_Sawblade" or
+			defName="Mech_Impulse"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mechanical paws</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.33</cooldownTime>
+					<armorPenetrationBlunt>23</armorPenetrationBlunt>
+					<armorPenetrationSharp>17</armorPenetrationSharp>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<linkedBodyPartsGroup>MechanicalPawsAMW</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>2.15</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.83</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>mechanical jaw</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>32</power>
+					<cooldownTime>1.3</cooldownTime>
+					<armorPenetrationSharp>9</armorPenetrationSharp>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+					<chanceFactor>0.8</chanceFactor>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<linkedBodyPartsGroup>MechanicalJawAMW</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Mech_Flayer"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.15</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.83</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>mechanical tail</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.19</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.83</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<linkedBodyPartsGroup>MechanicalTailAMW</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>scythe</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>0.55</cooldownTime>
+					<armorPenetrationSharp>20</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+					<chanceFactor>0.8</chanceFactor>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<linkedBodyPartsGroup>MechanicalSmallScytheAMW</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Mech_Vortex"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.15</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.83</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>mechanical tail</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.19</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+					<chanceFactor>0.3</chanceFactor>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<linkedBodyPartsGroup>MechanicalTailAMW</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Mech_Spike" or
+			defName="Mech_Renegade"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mechanical paws</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>37</power>
+					<cooldownTime>.97</cooldownTime>
+					<armorPenetrationBlunt>23</armorPenetrationBlunt>
+					<armorPenetrationSharp>17</armorPenetrationSharp>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<linkedBodyPartsGroup>MechanicalPawsAMW</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>2.15</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>mechanical jaw</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>31</power>
+					<cooldownTime>1.79</cooldownTime>
+					<armorPenetrationSharp>9</armorPenetrationSharp>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+					<chanceFactor>0.8</chanceFactor>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<linkedBodyPartsGroup>MechanicalJawAMW</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Mech_Wraith"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>scythe</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>221</power>
+					<cooldownTime>2.85</cooldownTime>
+					<armorPenetrationBlunt>100</armorPenetrationBlunt>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+					<chanceFactor>0.8</chanceFactor>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<linkedBodyPartsGroup>MechanicalLargeScytheAMW</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>mechanical tail</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>77</power>
+					<cooldownTime>3.11</cooldownTime>
+					<armorPenetrationBlunt>50</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<chanceFactor>0.2</chanceFactor>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<linkedBodyPartsGroup>MechanicalTailAMW</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Mech_Scourge"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mechanical paws</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.33</cooldownTime>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<armorPenetrationSharp>4</armorPenetrationSharp>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<linkedBodyPartsGroup>MechanicalPawsAMW</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.15</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.83</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>mechanical jaw</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.3</cooldownTime>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<chanceFactor>0.8</chanceFactor>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<linkedBodyPartsGroup>MechanicalJawAMW</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Anarchist"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mechanical pincer</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>1.03</cooldownTime>
+					<armorPenetrationBlunt>45</armorPenetrationBlunt>
+					<armorPenetrationSharp>9</armorPenetrationSharp>
+					<chanceFactor>0.63</chanceFactor>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<linkedBodyPartsGroup>MechanicalPincerAMW</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>2.15</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.83</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>mechanical tail</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>2.15</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+					<chanceFactor>0.33</chanceFactor>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<linkedBodyPartsGroup>MechanicalTailAMW</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Headhunter"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mechanical pincer</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.03</cooldownTime>
+					<armorPenetrationBlunt>28</armorPenetrationBlunt>
+					<armorPenetrationSharp>9</armorPenetrationSharp>
+					<chanceFactor>0.63</chanceFactor>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<linkedBodyPartsGroup>MechanicalPincerAMW</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2.15</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.83</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Mech_Purger" or
+			defName="Mech_Reaper"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>front legs</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>0.85</cooldownTime>
+					<armorPenetrationSharp>7</armorPenetrationSharp>
+					<armorPenetrationBlunt>23</armorPenetrationBlunt>
+					<chanceFactor>0.63</chanceFactor>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<linkedBodyPartsGroup>MechanicalLegsAMW</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.15</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Mech_Nomad" or
+			defName="Mech_AMWSeeker" or
+			defName="Mech_Spectre" or
+			defName="Mech_Stalker"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.35</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.35</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="MechaWeapon_SeekerKatana"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2.2</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>72</power>
+					<cooldownTime>1.35</cooldownTime>
+					<armorPenetrationSharp>23</armorPenetrationSharp>
+					<armorPenetrationBlunt>46</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>53</power>
+					<cooldownTime>1.73</cooldownTime>
+					<armorPenetrationSharp>35</armorPenetrationSharp>
+					<armorPenetrationBlunt>40</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="AMW_MechaWeapon_SSeekerKatana"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>2.2</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>53</power>
+					<cooldownTime>1.35</cooldownTime>
+					<armorPenetrationSharp>18</armorPenetrationSharp>
+					<armorPenetrationBlunt>35</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>37</power>
+					<cooldownTime>1.73</cooldownTime>
+					<armorPenetrationSharp>28</armorPenetrationSharp>
+					<armorPenetrationBlunt>35</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="AMW_MechaWeapon_PowerClaw"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>42</power>
+					<cooldownTime>0.7</cooldownTime>
+					<armorPenetrationSharp>15</armorPenetrationSharp>
+					<armorPenetrationBlunt>30</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Advanced Mechanoid Warfare/Patches/Advanced Mechanoid Warfare/Patches/Patch_Races.xml b/ModPatches/Advanced Mechanoid Warfare/Patches/Advanced Mechanoid Warfare/Patches/Patch_Races.xml
new file mode 100644
index 0000000000..51e3ac3d20
--- /dev/null
+++ b/ModPatches/Advanced Mechanoid Warfare/Patches/Advanced Mechanoid Warfare/Patches/Patch_Races.xml	
@@ -0,0 +1,356 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[
+			defName="Mech_NovaBlossom" or
+			defName="AMW_Mech_Blacklight" or
+			defName="AMW_Mech_Frosthound" or
+			defName="AMW_Mech_Supernova" or
+			defName="Mech_Charger" or
+			defName="Mech_Anarchist" or
+			defName="Mech_Headhunter" or
+			defName="Mech_Purger" or
+			defName="Mech_Reaper" or
+			defName="Mech_Impulse" or
+			defName="Mech_Scourge" or
+			defName="Mech_Sawblade" or
+			defName="Mech_Spike" or
+			defName="Mech_Renegade"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[
+			defName="Mech_Derg" or
+			defName="Mech_Flayer" or
+			defName="Mech_Vortex" or
+			defName="Mech_Thrumbo"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[
+			defName="Mech_Supressor" or
+			defName="Mech_Wraith"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Serpentine</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[
+			defName="Mech_Nomad" or
+			defName="Mech_Spectre" or
+			defName="Mech_Stalker" or
+			defName="Mech_AMWSeeker"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!--
+<li Class="PatchOperationRemove">
+	<xpath>Defs/ThingDef[
+	defName="Mech_NovaBlossom" or
+	defName="AMW_Mech_Blacklight" or
+	defName="AMW_Mech_Frosthound" or
+	defName="Mech_Derg" or
+	defName="Mech_Charger" or
+	defName="Mech_Anarchist" or
+	defName="Mech_Headhunter" or
+	defName="Mech_Impulse" or
+	defName="Mech_Scourge" or
+	defName="Mech_Sawblade" or
+	defName="Mech_Spike" or
+	defName="Mech_Renegade" or
+	defName="Mech_Supressor" or
+	defName="Mech_Flayer" or
+	defName="Mech_Nomad" or
+	defName="Mech_AMWSeeker" or
+	defName="Mech_Spectre" or
+	defName="Mech_Stalker" or
+	defName="Mech_Vortex" or
+	defName="Mech_Derg" or
+	defName="AMW_Mech_Supernova" or
+	defName="Mech_Purger" or
+	defName="Mech_Reaper" or
+	defName="Mech_Thrumbo" or
+	defName="Mech_Wraith"
+	]/statBases</xpath>
+</li>
+-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="Mech_NovaBlossom" or
+			defName="AMW_Mech_Blacklight" or
+			defName="AMW_Mech_Frosthound" or
+			defName="Mech_Charger" or
+			defName="Mech_Anarchist" or
+			defName="Mech_Headhunter" or
+			defName="Mech_Impulse" or
+			defName="Mech_Scourge" or
+			defName="Mech_Sawblade" or
+			defName="Mech_Spike" or
+			defName="Mech_Renegade" or
+			defName="Mech_Supressor" or
+			defName="Mech_Flayer" or
+			defName="Mech_Nomad" or
+			defName="Mech_AMWSeeker" or
+			defName="Mech_Spectre" or
+			defName="Mech_Stalker" or
+			defName="Mech_Vortex"
+			]/statBases </xpath>
+		<value>
+			<CarryWeight>40</CarryWeight>
+			<CarryBulk>30</CarryBulk>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1.8</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.09</MeleeDodgeChance>
+			<MeleeCritChance>0.22</MeleeCritChance>
+			<MeleeParryChance>0.19</MeleeParryChance>
+			<MaxHitPoints>200</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Mech_Spectre"
+			]/statBases/ShootingAccuracyPawn </xpath>
+		<value>
+			<ShootingAccuracyPawn>2.6</ShootingAccuracyPawn>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="Mech_Derg" or
+			defName="AMW_Mech_Supernova" or
+			defName="Mech_Purger" or
+			defName="Mech_Reaper" or
+			defName="Mech_Thrumbo" or
+			defName="Mech_Wraith"
+			]/statBases </xpath>
+		<value>
+			<CarryWeight>200</CarryWeight>
+			<CarryBulk>80</CarryBulk>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.02</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.41</MeleeParryChance>
+			<AimingDelayFactor>1.25</AimingDelayFactor>
+			<MaxHitPoints>500</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="AMW_Mech_Blacklight"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="AMW_Mech_Blacklight"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Mech_NovaBlossom" or
+			defName="Mech_Headhunter" or
+			defName="Mech_Flayer"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Mech_NovaBlossom" or
+			defName="Mech_Headhunter" or
+			defName="Mech_Flayer"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>3</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="AMW_Mech_Frosthound"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="AMW_Mech_Frosthound"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Mech_Scourge" or
+			defName="Mech_Supressor"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>27</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Mech_Scourge" or
+			defName="Mech_Supressor"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Mech_Impulse" or
+			defName="Mech_Vortex"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>22.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Mech_Impulse" or
+			defName="Mech_Vortex"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="AMW_Mech_Supernova" or
+			defName="Mech_Sawblade" or
+			defName="Mech_Renegade" or
+			defName="Mech_Charger"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>54</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="AMW_Mech_Supernova" or
+			defName="Mech_Sawblade" or
+			defName="Mech_Renegade" or
+			defName="Mech_Charger"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>22</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Mech_Anarchist" or
+			defName="Mech_Purger" or
+			defName="Mech_Reaper" or
+			defName="Mech_Spike" or
+			defName="Mech_Nomad" or
+			defName="Mech_Spectre"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>58</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Mech_Anarchist" or
+			defName="Mech_Purger" or
+			defName="Mech_Reaper" or
+			defName="Mech_Spike" or
+			defName="Mech_Nomad" or
+			defName="Mech_Spectre"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>24</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Mech_Derg" or
+			defName="Mech_Thrumbo" or
+			defName="Mech_AMWSeeker" or
+			defName="Mech_Stalker"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>67.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Mech_Derg" or
+			defName="Mech_Thrumbo" or
+			defName="Mech_AMWSeeker" or
+			defName="Mech_Stalker"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>30</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Mech_Wraith"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>33</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Mech_Wraith"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>74</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Advanced Mechanoid Warfare/Patches/Advanced Mechanoid Warfare/Patches/Patch_Ranged.xml b/ModPatches/Advanced Mechanoid Warfare/Patches/Advanced Mechanoid Warfare/Patches/Patch_Ranged.xml
new file mode 100644
index 0000000000..0d2ee04e0a
--- /dev/null
+++ b/ModPatches/Advanced Mechanoid Warfare/Patches/Advanced Mechanoid Warfare/Patches/Patch_Ranged.xml	
@@ -0,0 +1,1115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BreacherGrenade"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BreacherGrenade"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<explosionRadius>2.5</explosionRadius>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+				<damageDef>Bomb</damageDef>
+				<damageAmountBase>33</damageAmountBase><!-- 70mm Mech Grenade damage / 4 -->
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<speed>20</speed>
+				<dropsCasings>false</dropsCasings>
+			</projectile>
+			<comps>
+				<li Class="CombatExtended.CompProperties_Fragments">
+					<fragments>
+						<Fragment_Small>10</Fragment_Small>
+					</fragments>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Weapon_BreacherAMW</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.01</SwayFactor>
+			<Bulk>3.5</Bulk>
+			<Mass>6</Mass>
+			<RangedWeapon_Cooldown>3.55</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<range>32</range>
+			<burstShotCount>4</burstShotCount>
+			<warmupTime>2.3</warmupTime>
+			<noiseRadius>7</noiseRadius>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<soundCast>DiskLaunch</soundCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<defaultProjectile>BreacherGrenade</defaultProjectile>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Launcher</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_PlasmaSpit"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_PlasmaSpit"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<damageDef>Bomb</damageDef>
+				<damageAmountBase>309</damageAmountBase>
+				<explosionRadius>3.2</explosionRadius>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+				<speed>75</speed>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<dropsCasings>false</dropsCasings>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PlasmaSpitInternal</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.01</SwayFactor>
+			<Bulk>3.5</Bulk>
+			<Mass>6</Mass>
+			<RangedWeapon_Cooldown>4</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_PlasmaSpit</defaultProjectile>
+			<warmupTime>4.3</warmupTime>
+			<range>54</range>
+			<!--<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>-->
+			<soundCast>HeavyLaunch</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Launcher</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_KineticWing"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_KineticWing"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<damageDef>Bullet</damageDef>
+				<damageAmountBase>50</damageAmountBase>
+				<!--<soundExplode>MortarBomb_Explode</soundExplode>-->
+				<armorPenetrationSharp>30</armorPenetrationSharp>
+				<armorPenetrationBlunt>38.005</armorPenetrationBlunt>
+				<flyOverhead>true</flyOverhead>
+				<gravityFactor>20</gravityFactor>
+				<speed>105</speed>
+				<dropsCasings>false</dropsCasings>
+			</projectile>
+			<comps>
+				<li Class="CombatExtended.CompProperties_ExplosiveCE">
+					<damageAmountBase>64</damageAmountBase>
+					<explosiveDamageType>Bomb</explosiveDamageType>
+					<explosiveRadius>1.5</explosiveRadius>
+					<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				</li>
+				<li Class="CombatExtended.CompProperties_Fragments">
+					<fragments>
+						<Fragment_Small>10</Fragment_Small>
+					</fragments>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_KineticWingInternal</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.01</SwayFactor>
+			<Bulk>3.5</Bulk>
+			<Mass>6</Mass>
+			<RangedWeapon_Cooldown>4</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_KineticWing</defaultProjectile>
+			<warmupTime>5.3</warmupTime>
+			<range>66</range>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<burstShotCount>5</burstShotCount>
+			<!--<ai_AvoidFriendlyFireRadius>4</ai_AvoidFriendlyFireRadius>-->
+			<soundCast>Mortar_LaunchA</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Launcher</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_PlasmaRocket"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_PlasmaRocket"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<damageDef>NovaBomb</damageDef>
+				<damageAmountBase>45</damageAmountBase>
+				<armorPenetrationSharp>0</armorPenetrationSharp>
+				<armorPenetrationBlunt>30</armorPenetrationBlunt>
+				<explosionRadius>1.5</explosionRadius>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<flyOverhead>false</flyOverhead>
+				<speed>50</speed>
+			</projectile>
+			<comps>
+				<li Class="CombatExtended.CompProperties_Fragments">
+					<fragments>
+						<Fragment_Small>10</Fragment_Small>
+					</fragments>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PRInternal</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.01</SwayFactor>
+			<Bulk>5</Bulk>
+			<Mass>10</Mass>
+			<RangedWeapon_Cooldown>5.6</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_PlasmaRocket</defaultProjectile>
+			<warmupTime>3.13</warmupTime>
+			<range>38</range>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<burstShotCount>4</burstShotCount>
+			<soundCast>HeavyLaunch</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Launcher</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_NomadRifle</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.45</SwayFactor>
+			<Bulk>7.5</Bulk>
+			<Mass>8</Mass>
+			<RangedWeapon_Cooldown>1.6</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_NomadShot</defaultProjectile>
+			<warmupTime>1.11</warmupTime>
+			<range>45</range>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<burstShotCount>5</burstShotCount>
+			<soundCast>NomadRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>8</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>24</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_Nomad</ammoSet>
+		</AmmoUser>
+		<weaponTags>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_CryoLiquid"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_CryoLiquid"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<damageDef>CryoFlame</damageDef>
+				<damageAmountBase>4</damageAmountBase>
+				<armorPenetrationSharp>0</armorPenetrationSharp>
+				<armorPenetrationBlunt>20</armorPenetrationBlunt>
+				<explosionRadius>1.2</explosionRadius>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+				<speed>40</speed>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_CryoInternal</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.01</SwayFactor>
+			<Bulk>5</Bulk>
+			<Mass>10</Mass>
+			<RangedWeapon_Cooldown>5.6</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_CryoLiquid</defaultProjectile>
+			<warmupTime>1.83</warmupTime>
+			<range>22</range>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<burstShotCount>14</burstShotCount>
+			<soundCast>Shot_ChargeBlaster</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>3</muzzleFlashScale>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Launcher</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Shreder</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.53</SwayFactor>
+			<Bulk>5</Bulk>
+			<Mass>10</Mass>
+			<RangedWeapon_Cooldown>2.9</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_NomadShot</defaultProjectile>
+			<warmupTime>2.01</warmupTime>
+			<range>58</range>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<burstShotCount>55</burstShotCount>
+			<soundCast>Shreder</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>8</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>220</magazineSize>
+			<reloadTime>7</reloadTime>
+			<ammoSet>AmmoSet_Nomad</ammoSet>
+		</AmmoUser>
+		<weaponTags>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_StalkerRifle</defName>
+		<statBases>
+			<SightsEfficiency>2.0</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.53</SwayFactor>
+			<Bulk>5</Bulk>
+			<Mass>10</Mass>
+			<RangedWeapon_Cooldown>2.9</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_StalkersShot</defaultProjectile>
+			<warmupTime>1.01</warmupTime>
+			<range>64</range>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<burstShotCount>1</burstShotCount>
+			<soundCast>StalkerRail</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>15</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_Stalker</ammoSet>
+		</AmmoUser>
+		<weaponTags>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Gun_UWMEmp"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Gun_UWMFire"]</xpath>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_UWMCharge</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.53</SwayFactor>
+			<Bulk>5</Bulk>
+			<Mass>10</Mass>
+			<RangedWeapon_Cooldown>2.9</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_UWMChargeShot</defaultProjectile>
+			<warmupTime>1.31</warmupTime>
+			<range>22</range>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<burstShotCount>7</burstShotCount>
+			<soundCast>SmallLaser</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>2</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>42</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_UMW</ammoSet>
+		</AmmoUser>
+		<weaponTags>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_ChargeCannon"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_ChargeCannon"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<explosionRadius>3.4</explosionRadius>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+				<damageDef>Bomb</damageDef>
+				<damageAmountBase>60</damageAmountBase>
+				<armorPenetrationBlunt>48</armorPenetrationBlunt>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<speed>75</speed>
+			</projectile>
+			<comps>
+				<li Class="CombatExtended.CompProperties_Fragments">
+					<fragments>
+						<Fragment_Small>26</Fragment_Small>
+					</fragments>
+				</li>
+			</comps>
+
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_ChargeCannonAWM</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.01</SwayFactor>
+			<Bulk>40</Bulk>
+			<Mass>25</Mass>
+			<RangedWeapon_Cooldown>7</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_ChargeCannon</defaultProjectile>
+			<warmupTime>3.5</warmupTime>
+			<range>57</range>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<burstShotCount>1</burstShotCount>
+			<soundCast>HeavyLaunch</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>27</muzzleFlashScale>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Launcher</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_IonLense</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.53</SwayFactor>
+			<Bulk>5</Bulk>
+			<Mass>10</Mass>
+			<RangedWeapon_Cooldown>7</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_IonLenseShot</defaultProjectile>
+			<warmupTime>2.7</warmupTime>
+			<range>40</range>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<burstShotCount>15</burstShotCount>
+			<soundCast>SmallLaser</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>6</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>60</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_Lens</ammoSet>
+		</AmmoUser>
+		<weaponTags>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Vaporizer</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.53</SwayFactor>
+			<Bulk>5</Bulk>
+			<Mass>10</Mass>
+			<RangedWeapon_Cooldown>3.3</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_VaporizerShot</defaultProjectile>
+			<warmupTime>2.33</warmupTime>
+			<range>36</range>
+			<soundCast>HeavyLaunch</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_Vapor</ammoSet>
+		</AmmoUser>
+		<weaponTags>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_BladeCannon</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.53</SwayFactor>
+			<Bulk>5</Bulk>
+			<Mass>10</Mass>
+			<RangedWeapon_Cooldown>3.3</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_EBlade</defaultProjectile>
+			<warmupTime>2.63</warmupTime>
+			<range>38</range>
+			<soundCast>DiskLaunch</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>22</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_SupShard"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<damageDef>Bullet</damageDef>
+				<damageAmountBase>5</damageAmountBase>
+				<armorPenetrationSharp>12</armorPenetrationSharp>
+				<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				<speed>40</speed>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_VortexLaser</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.53</SwayFactor>
+			<Bulk>5</Bulk>
+			<Mass>10</Mass>
+			<RangedWeapon_Cooldown>2.93</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_IonLenseShot</defaultProjectile>
+			<warmupTime>3.31</warmupTime>
+			<range>64</range>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<burstShotCount>15</burstShotCount>
+			<soundCast>MediumLaser</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>5</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>60</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_Lens</ammoSet>
+		</AmmoUser>
+		<weaponTags>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AnarGattling</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.53</SwayFactor>
+			<Bulk>5</Bulk>
+			<Mass>10</Mass>
+			<RangedWeapon_Cooldown>4.93</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_NomadShot</defaultProjectile>
+			<warmupTime>3.11</warmupTime>
+			<range>41</range>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<burstShotCount>23</burstShotCount>
+			<soundCast>MediumLaser</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>5</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>92</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_Nomad</ammoSet>
+		</AmmoUser>
+		<weaponTags>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Headhunter</defName>
+		<statBases>
+			<SightsEfficiency>2.0</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.53</SwayFactor>
+			<Bulk>5</Bulk>
+			<Mass>10</Mass>
+			<RangedWeapon_Cooldown>2.9</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_HeadhunterShot</defaultProjectile>
+			<warmupTime>2.41</warmupTime>
+			<range>61</range>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<burstShotCount>1</burstShotCount>
+			<soundCast>StalkerRail</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>18</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>3</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_Headhunter</ammoSet>
+		</AmmoUser>
+		<weaponTags>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AMW_Gun_SNomadRifle</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.56</SwayFactor>
+			<Bulk>7.5</Bulk>
+			<Mass>8</Mass>
+			<RangedWeapon_Cooldown>1.97</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_NomadShot</defaultProjectile>
+			<warmupTime>1.61</warmupTime>
+			<range>42</range>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<burstShotCount>5</burstShotCount>
+			<soundCast>NomadRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>8</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>24</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_Nomad</ammoSet>
+		</AmmoUser>
+		<weaponTags>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AMW_Gun_IonPistol</defName>
+		<statBases>
+			<SightsEfficiency>0.9</SightsEfficiency>
+			<ShotSpread>0.21</ShotSpread>
+			<SwayFactor>0.9</SwayFactor>
+			<Bulk>2.5</Bulk>
+			<Mass>1</Mass>
+			<RangedWeapon_Cooldown>1.97</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.21</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_NomadShot</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<burstShotCount>2</burstShotCount>
+			<soundCast>NomadRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>8</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_Nomad</ammoSet>
+		</AmmoUser>
+		<weaponTags>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AMW_Gun_SShreder</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.53</SwayFactor>
+			<Bulk>5</Bulk>
+			<Mass>10</Mass>
+			<RangedWeapon_Cooldown>2.9</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.63</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_ShrederShot</defaultProjectile>
+			<warmupTime>2.37</warmupTime>
+			<range>43</range>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<burstShotCount>55</burstShotCount>
+			<soundCast>Shreder</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>8</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>220</magazineSize>
+			<reloadTime>7</reloadTime>
+			<ammoSet>AmmoSet_Nomad</ammoSet>
+		</AmmoUser>
+		<weaponTags>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AMW_Gun_SMG</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>0.76</SwayFactor>
+			<Bulk>5</Bulk>
+			<Mass>3</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.03</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_ShrederShot</defaultProjectile>
+			<warmupTime>0.77</warmupTime>
+			<range>31</range>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<burstShotCount>8</burstShotCount>
+			<soundCast>Shreder</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>8</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_Nomad</ammoSet>
+		</AmmoUser>
+		<weaponTags>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AMW_Gun_SlugRifle</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.34</SwayFactor>
+			<Bulk>8</Bulk>
+			<Mass>6</Mass>
+			<RangedWeapon_Cooldown>0.58</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.67</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_ShrederShot</defaultProjectile>
+			<warmupTime>1.57</warmupTime>
+			<range>45</range>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<burstShotCount>5</burstShotCount>
+			<soundCast>Shreder</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>8</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_Nomad</ammoSet>
+		</AmmoUser>
+		<weaponTags>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AMW_Gun_SStalkerRifle</defName>
+		<statBases>
+			<SightsEfficiency>1.5</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.53</SwayFactor>
+			<Bulk>5</Bulk>
+			<Mass>10</Mass>
+			<RangedWeapon_Cooldown>2.9</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_StalkersShot</defaultProjectile>
+			<warmupTime>2.17</warmupTime>
+			<range>72</range>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<burstShotCount>1</burstShotCount>
+			<soundCast>StalkerRail</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>15</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_Stalker</ammoSet>
+		</AmmoUser>
+		<weaponTags>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AMW_Gun_SChargeCannonAWM</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.01</SwayFactor>
+			<Bulk>40</Bulk>
+			<Mass>25</Mass>
+			<RangedWeapon_Cooldown>7</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_ChargeCannon</defaultProjectile>
+			<warmupTime>4.5</warmupTime>
+			<range>64</range>
+			<soundCast>HeavyLaunch</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>27</muzzleFlashScale>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Launcher</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AMW_Gun_GaussCannon</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.75</SwayFactor>
+			<Bulk>15</Bulk>
+			<Mass>5.5</Mass>
+			<RangedWeapon_Cooldown>3</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_StalkersShot</defaultProjectile>
+			<warmupTime>3.0</warmupTime>
+			<range>75</range>
+			<soundCast>StalkerRail</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_Stalker</ammoSet>
+		</AmmoUser>
+		<weaponTags>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AMW_Gun_HeavyRifle</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.45</SwayFactor>
+			<Bulk>12</Bulk>
+			<Mass>5.0</Mass>
+			<RangedWeapon_Cooldown>2.1</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_StalkersShot</defaultProjectile>
+			<warmupTime>1.67</warmupTime>
+			<range>62</range>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<burstShotCount>3</burstShotCount>
+			<soundCast>StalkerRail</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_Stalker</ammoSet>
+		</AmmoUser>
+		<weaponTags>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AMW_Gun_GrenadeShotgun</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.17</SwayFactor>
+			<Bulk>8</Bulk>
+			<Mass>10</Mass>
+			<RangedWeapon_Cooldown>6</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>BreacherGrenade</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>18</range>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<burstShotCount>3</burstShotCount>
+			<soundCast>HeavyLaunch</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Launcher</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Advanced Mechanoid Warfare/Patches/Advanced Mechanoid Warfare/Patches/Patch_Turret.xml b/ModPatches/Advanced Mechanoid Warfare/Patches/Advanced Mechanoid Warfare/Patches/Patch_Turret.xml
new file mode 100644
index 0000000000..a4e6381266
--- /dev/null
+++ b/ModPatches/Advanced Mechanoid Warfare/Patches/Advanced Mechanoid Warfare/Patches/Patch_Turret.xml	
@@ -0,0 +1,310 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AMW_Gun_AAComplex</defName>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+			<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_81mmMortarShell_HE</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<minRange>20</minRange>
+			<range>500</range>
+			<burstShotCount>3</burstShotCount>
+			<soundCast>Mortar_LaunchA</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>55</muzzleFlashScale>
+			<circularError>1.2</circularError>
+			<requireLineOfSight>false</requireLineOfSight>
+			<indirectFirePenalty>0.3</indirectFirePenalty>
+			<targetParams>
+				<canTargetLocations>false</canTargetLocations>
+			</targetParams>
+		</Properties>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "AMW_Gun_AAComplex"]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_Charges">
+					<chargeSpeeds>
+						<li>30</li>
+						<li>50</li>
+						<li>70</li>
+						<li>90</li>
+					</chargeSpeeds>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="AMW_Turret_AutoCannon" or
+			defName="AMW_Turret_HeavyTurret" or
+			defName="AMW_Turret_CryoTurret" or
+			defName="AMW_Turret_RocketTurret" or
+			defName="AMW_Turret_LotusTurret"
+			]/fillPercent </xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<!-- ========== cannon turret ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "AMW_Turret_AutoCannon"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "AMW_Turret_AutoCannon"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.25</AimingAccuracy>
+			<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AMW_Gun_AutoCannon</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.62</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.43</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12x72mmCharged</defaultProjectile>
+			<warmupTime>3.3</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<burstShotCount>5</burstShotCount>
+			<soundCast>MediumLaser</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_12x72mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== heavy turret ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "AMW_Turret_HeavyTurret"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "AMW_Turret_HeavyTurret"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.25</AimingAccuracy>
+			<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AMW_Gun_HeavyTurret</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.12</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.25</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x50mmCharged</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>55</range>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<burstShotCount>14</burstShotCount>
+			<soundCast>SmallLaser</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_8x50mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== cryo turret ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "AMW_Turret_CryoTurret"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "AMW_Turret_CryoTurret"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.25</AimingAccuracy>
+			<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AMW_Gun_CryoTurret</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>2.6</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.5</ShotSpread>
+			<SwayFactor>1.12</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.67</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_CryoLiquid</defaultProjectile>
+			<warmupTime>2.3</warmupTime>
+			<range>62</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>9</burstShotCount>
+			<soundCast>SmallLaser</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== rocket turret ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "AMW_Turret_RocketTurret"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "AMW_Turret_RocketTurret"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.25</AimingAccuracy>
+			<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AMW_Gun_RocketTurret</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>2.6</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.12</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.67</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x385mmRCannonShell_HEAT</defaultProjectile>
+			<warmupTime>4.3</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>14</ticksBetweenBurstShots>
+			<burstShotCount>5</burstShotCount>
+			<soundCast>HeavyLaunch</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>9.8</reloadTime>
+			<ammoSet>AmmoSet_762x385mmRCannonShell</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== lotus turret ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "AMW_Turret_LotusTurret"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "AMW_Turret_LotusTurret"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.25</AimingAccuracy>
+			<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AMW_Gun_LotusTurret</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>2.6</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>0.23</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.67</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12mmRailgun_Sabot</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>86</range>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<soundCast>HeavyLaunch</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>9.8</reloadTime>
+			<ammoSet>AmmoSet_12mmRailgun</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Advanced Mortar/Patches/Advanced Mortar/AdvancedMortar_Compatbility.xml b/ModPatches/Advanced Mortar/Patches/Advanced Mortar/AdvancedMortar_Compatbility.xml
new file mode 100644
index 0000000000..55ad95dea8
--- /dev/null
+++ b/ModPatches/Advanced Mortar/Patches/Advanced Mortar/AdvancedMortar_Compatbility.xml	
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Mod Support for Combat Extended -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Ad_Artillery_Mortar"]</xpath>
+		<value>
+			<statBases>
+				<SightsEfficiency>0.7</SightsEfficiency>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Ad_Artillery_Mortar"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>30</li>
+					<li>50</li>
+					<li>70</li>
+					<li>90</li>
+				</chargeSpeeds>
+			</li>
+			<li Class="CombatExtended.CompProperties_AmmoUser">
+				<magazineSize>3</magazineSize>
+				<reloadTime>5</reloadTime>
+				<ammoSet>AmmoSet_81mmMortarShell</ammoSet>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Ad_Artillery_Mortar"]/weaponTags</xpath>
+		<value>
+			<li>TurretGun</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Ad_Artillery_Mortar"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+					<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_81mmMortarShell_HE</defaultProjectile>
+					<warmupTime>4.0</warmupTime>
+					<minRange>32</minRange>
+					<range>800</range>
+					<burstShotCount>3</burstShotCount>
+					<soundCast>Mortar_LaunchA</soundCast>
+					<muzzleFlashScale>16</muzzleFlashScale>
+					<circularError>1</circularError>
+					<indirectFirePenalty>0.2</indirectFirePenalty>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Ad_Artillery_Mortar"]/label</xpath>
+		<value>
+			<label>81mm improved mortar</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Ad_Turret_Mortar"]/comps</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Ad_Turret_Mortar"]/tradeTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Ad_Turret_Mortar"]</xpath>
+			<value>
+				<tradeTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Ad_Turret_Mortar"]/tradeTags</xpath>
+		<value>
+			<li>CE_Turret</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/All-Tech Melee/Patches/All-Tech Melee/Weapons_ATM_Industrial.xml b/ModPatches/All-Tech Melee/Patches/All-Tech Melee/Weapons_ATM_Industrial.xml
new file mode 100644
index 0000000000..f73b9b8fe0
--- /dev/null
+++ b/ModPatches/All-Tech Melee/Patches/All-Tech Melee/Weapons_ATM_Industrial.xml	
@@ -0,0 +1,345 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Gladius ========== -->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[contains(defName,
+		"ATM_MeleeWeapon_Industrial")]/costStuffCount</xpath>
+	<value>
+		<costStuffCount>100</costStuffCount>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialGladius"]/tools</xpath>
+	<value>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>handle</label>
+				<capacities>
+					<li>Poke</li>
+				</capacities>
+				<power>3</power>
+				<chanceFactor>0.33</chanceFactor>
+				<cooldownTime>1.22</cooldownTime>
+				<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>point</label>
+				<capacities>
+					<li>Stab</li>
+				</capacities>
+				<power>35</power>
+				<cooldownTime>1.22</cooldownTime>
+				<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+				<armorPenetrationSharp>0.6</armorPenetrationSharp>
+				<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>edge</label>
+				<capacities>
+					<li>Cut</li>
+				</capacities>
+				<power>25</power>
+				<cooldownTime>1.15</cooldownTime>
+				<armorPenetrationBlunt>1.1</armorPenetrationBlunt>
+				<armorPenetrationSharp>0.6</armorPenetrationSharp>
+				<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+			</li>
+		</tools>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialGladius"]/statBases</xpath>
+	<value>
+		<Bulk>3</Bulk>
+		<MeleeCounterParryBonus>0.45</MeleeCounterParryBonus>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialGladius"]</xpath>
+	<value>
+		<equippedStatOffsets>
+			<MeleeCritChance>0.3</MeleeCritChance>
+			<MeleeParryChance>0.55</MeleeParryChance>
+			<MeleeDodgeChance>0.3</MeleeDodgeChance>
+		</equippedStatOffsets>
+	</value>
+</Operation>
+
+<!-- Add tags -->
+
+<Operation Class="PatchOperationConditional">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialGladius"]/weaponTags</xpath>
+	<nomatch Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialGladius"]</xpath>
+		<value>
+			<weaponTags/>
+		</value>
+	</nomatch>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialGladius"]/weaponTags</xpath>
+	<value>
+		<li>CE_Sidearm_Melee</li>
+		<li>CE_OneHandedWeapon</li>
+	</value>
+</Operation>
+
+<!-- ========== Hammer ========== -->
+
+<!-- Patch stats -->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialHammer"]/tools</xpath>
+	<value>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>handle</label>
+				<capacities>
+					<li>Poke</li>
+				</capacities>
+				<power>5</power>
+				<chanceFactor>0.33</chanceFactor>
+				<cooldownTime>1.78</cooldownTime>
+				<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>head</label>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<power>15</power>
+				<cooldownTime>3.48</cooldownTime>
+				<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+			</li>
+		</tools>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialHammer"]/statBases</xpath>
+	<value>
+		<Bulk>3</Bulk>
+		<MeleeCounterParryBonus>0.25</MeleeCounterParryBonus>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialHammer"]</xpath>
+	<value>
+		<equippedStatOffsets>
+			<MeleeCritChance>0.75</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+			<MeleeDodgeChance>0.3</MeleeDodgeChance>
+		</equippedStatOffsets>
+	</value>
+</Operation>
+
+<!-- Add tags -->
+
+<Operation Class="PatchOperationConditional">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialHammer"]/weaponTags</xpath>
+	<nomatch Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialHammer"]</xpath>
+		<value>
+			<weaponTags/>
+		</value>
+	</nomatch>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialHammer"]/weaponTags</xpath>
+	<value>
+		<li>CE_Sidearm_Tribal</li>
+		<li>CE_OneHandedWeapon</li>
+	</value>
+</Operation>
+
+<!-- ========== SledgeHammer ========== -->
+
+<!-- Patch stats -->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialSledgehammer"]/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>1.5</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>head</label>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<power>20</power>
+				<cooldownTime>1.9</cooldownTime>
+				<armorPenetrationBlunt>7.0</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+			</li>
+		</tools>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialSledgehammer"]/statBases</xpath>
+	<value>
+		<Bulk>3.0</Bulk>
+		<MeleeCounterParryBonus>0.3</MeleeCounterParryBonus>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialSledgehammer"]</xpath>
+	<value>
+		<equippedStatOffsets>
+			<MeleeCritChance>0.52</MeleeCritChance>
+			<MeleeParryChance>0.32</MeleeParryChance>
+			<MeleeDodgeChance>0.3</MeleeDodgeChance>
+		</equippedStatOffsets>
+	</value>
+</Operation>
+
+<!-- ========== Spear ========== -->
+
+<!-- Patch stats -->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialSpear"]/tools</xpath>
+	<value>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>shaft</label>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<power>9</power>
+				<cooldownTime>1.35</cooldownTime>
+				<chanceFactor>0.15</chanceFactor>
+				<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>shaft</label>
+				<capacities>
+					<li>Poke</li>
+				</capacities>
+				<power>5</power>
+				<cooldownTime>1.78</cooldownTime>
+				<chanceFactor>0.05</chanceFactor>
+				<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>head</label>
+				<capacities>
+					<li>Stab</li>
+				</capacities>
+				<power>25</power>
+				<cooldownTime>1.19</cooldownTime>
+				<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+				<armorPenetrationSharp>4.5</armorPenetrationSharp>
+				<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+			</li>
+		</tools>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialSpear"]/statBases</xpath>
+	<value>
+		<Bulk>8</Bulk>
+		<MeleeCounterParryBonus>1.88</MeleeCounterParryBonus>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialSpear"]</xpath>
+	<value>
+		<equippedStatOffsets>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>1.66</MeleeParryChance>
+			<MeleeDodgeChance>1.2</MeleeDodgeChance>
+		</equippedStatOffsets>
+	</value>
+</Operation>
+
+<!-- ========== Longsword ========== -->
+
+<!-- Patch stats -->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialLongsword"]/tools</xpath>
+	<value>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>handle</label>
+				<capacities>
+					<li>Poke</li>
+				</capacities>
+				<power>6</power>
+				<cooldownTime>1.78</cooldownTime>
+				<chanceFactor>0.10</chanceFactor>
+				<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>point</label>
+				<capacities>
+					<li>Stab</li>
+				</capacities>
+				<power>24</power>
+				<cooldownTime>1.78</cooldownTime>
+				<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				<armorPenetrationSharp>4.0</armorPenetrationSharp>
+				<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>edge</label>
+				<capacities>
+					<li>Cut</li>
+				</capacities>
+				<power>50</power>
+				<cooldownTime>1.64</cooldownTime>
+				<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				<armorPenetrationSharp>2</armorPenetrationSharp>
+				<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+			</li>
+		</tools>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialLongsword"]/statBases</xpath>
+	<value>
+		<Bulk>6</Bulk>
+		<MeleeCounterParryBonus>1.0</MeleeCounterParryBonus>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialLongsword"]</xpath>
+	<value>
+		<equippedStatOffsets>
+			<MeleeCritChance>0.65</MeleeCritChance>
+			<MeleeParryChance>0.7</MeleeParryChance>
+			<MeleeDodgeChance>0.5</MeleeDodgeChance>
+		</equippedStatOffsets>
+	</value>
+</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/All-Tech Melee/Patches/All-Tech Melee/Weapons_ATM_Spacer.xml b/ModPatches/All-Tech Melee/Patches/All-Tech Melee/Weapons_ATM_Spacer.xml
new file mode 100644
index 0000000000..a80e10a2f9
--- /dev/null
+++ b/ModPatches/All-Tech Melee/Patches/All-Tech Melee/Weapons_ATM_Spacer.xml	
@@ -0,0 +1,345 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Gladius ========== -->
+
+<!-- Patch stats -->
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[contains(defName, "ATM_MeleeWeapon_Spacer")]/costStuffCount</xpath>
+	<value>
+		<costStuffCount>200</costStuffCount>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerGladius"]/tools</xpath>
+	<value>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>handle</label>
+				<capacities>
+					<li>Poke</li>
+				</capacities>
+				<power>6</power>
+				<chanceFactor>0.33</chanceFactor>
+				<cooldownTime>1.0</cooldownTime>
+				<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>point</label>
+				<capacities>
+					<li>Stab</li>
+				</capacities>
+				<power>70</power>
+				<cooldownTime>1.0</cooldownTime>
+				<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
+				<armorPenetrationSharp>1.2</armorPenetrationSharp>
+				<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>edge</label>
+				<capacities>
+					<li>Cut</li>
+				</capacities>
+				<power>50</power>
+				<cooldownTime>0.95</cooldownTime>
+				<armorPenetrationBlunt>2.2</armorPenetrationBlunt>
+				<armorPenetrationSharp>1.2</armorPenetrationSharp>
+				<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+			</li>
+		</tools>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerGladius"]/statBases</xpath>
+	<value>
+		<Bulk>2</Bulk>
+		<MeleeCounterParryBonus>0.9</MeleeCounterParryBonus>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerGladius"]</xpath>
+	<value>
+		<equippedStatOffsets>
+			<MeleeCritChance>0.6</MeleeCritChance>
+			<MeleeParryChance>1.1</MeleeParryChance>
+			<MeleeDodgeChance>0.6</MeleeDodgeChance>
+		</equippedStatOffsets>
+	</value>
+</Operation>
+
+<!-- Add tags -->
+
+<Operation Class="PatchOperationConditional">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerGladius"]/weaponTags</xpath>
+	<nomatch Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerGladius"]</xpath>
+		<value>
+			<weaponTags/>
+		</value>
+	</nomatch>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerGladius"]/weaponTags</xpath>
+	<value>
+		<li>CE_Sidearm_Melee</li>
+		<li>CE_OneHandedWeapon</li>
+	</value>
+</Operation>
+
+<!-- ========== Hammer ========== -->
+
+<!-- Patch stats -->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerHammer"]/tools</xpath>
+	<value>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>handle</label>
+				<capacities>
+					<li>Poke</li>
+				</capacities>
+				<power>10</power>
+				<chanceFactor>0.33</chanceFactor>
+				<cooldownTime>1.0</cooldownTime>
+				<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>head</label>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<power>30</power>
+				<cooldownTime>3.0</cooldownTime>
+				<armorPenetrationBlunt>12</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+			</li>
+		</tools>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerHammer"]/statBases</xpath>
+	<value>
+		<Bulk>3</Bulk>
+		<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerHammer"]</xpath>
+	<value>
+		<equippedStatOffsets>
+			<MeleeCritChance>1.5</MeleeCritChance>
+			<MeleeParryChance>0.5</MeleeParryChance>
+			<MeleeDodgeChance>0.6</MeleeDodgeChance>
+		</equippedStatOffsets>
+	</value>
+</Operation>
+
+<!-- Add tags -->
+
+<Operation Class="PatchOperationConditional">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerHammer"]/weaponTags</xpath>
+	<nomatch Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerHammer"]</xpath>
+		<value>
+			<weaponTags/>
+		</value>
+	</nomatch>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerHammer"]/weaponTags</xpath>
+	<value>
+		<li>CE_Sidearm_Tribal</li>
+		<li>CE_OneHandedWeapon</li>
+	</value>
+</Operation>
+
+<!-- ========== SledgeHammer ========== -->
+
+<!-- Patch stats -->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerSledgehammer"]/tools</xpath>
+	<value>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>handle</label>
+				<capacities>
+					<li>Poke</li>
+				</capacities>
+				<power>4</power>
+				<chanceFactor>0.33</chanceFactor>
+				<cooldownTime>1.33</cooldownTime>
+				<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>head</label>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<power>40</power>
+				<cooldownTime>1.5</cooldownTime>
+				<armorPenetrationBlunt>18</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+			</li>
+		</tools>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerSledgehammer"]/statBases</xpath>
+	<value>
+		<Bulk>3.0</Bulk>
+		<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerSledgehammer"]</xpath>
+	<value>
+		<equippedStatOffsets>
+			<MeleeCritChance>1.04</MeleeCritChance>
+			<MeleeParryChance>0.64</MeleeParryChance>
+			<MeleeDodgeChance>0.6</MeleeDodgeChance>
+		</equippedStatOffsets>
+	</value>
+</Operation>
+
+<!-- ========== Spear ========== -->
+
+<!-- Patch stats -->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerSpear"]/tools</xpath>
+	<value>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>shaft</label>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<power>18</power>
+				<cooldownTime>1.15</cooldownTime>
+				<chanceFactor>0.15</chanceFactor>
+				<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>shaft</label>
+				<capacities>
+					<li>Poke</li>
+				</capacities>
+				<power>10</power>
+				<cooldownTime>3.6</cooldownTime>
+				<chanceFactor>0.05</chanceFactor>
+				<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>head</label>
+				<capacities>
+					<li>Stab</li>
+				</capacities>
+				<power>50</power>
+				<cooldownTime>1.19</cooldownTime>
+				<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				<armorPenetrationSharp>10</armorPenetrationSharp>
+				<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+			</li>
+		</tools>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerSpear"]/statBases</xpath>
+	<value>
+		<Bulk>6</Bulk>
+		<MeleeCounterParryBonus>3.76</MeleeCounterParryBonus>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerSpear"]</xpath>
+	<value>
+		<equippedStatOffsets>
+			<MeleeCritChance>0.5</MeleeCritChance>
+			<MeleeParryChance>3.32</MeleeParryChance>
+			<MeleeDodgeChance>2.4</MeleeDodgeChance>
+		</equippedStatOffsets>
+	</value>
+</Operation>
+
+<!-- ========== Longsword ========== -->
+
+<!-- Patch stats -->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerLongsword"]/tools</xpath>
+	<value>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>handle</label>
+				<capacities>
+					<li>Poke</li>
+				</capacities>
+				<power>12</power>
+				<cooldownTime>3.56</cooldownTime>
+				<chanceFactor>0.10</chanceFactor>
+				<armorPenetrationBlunt>5.0</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>point</label>
+				<capacities>
+					<li>Stab</li>
+				</capacities>
+				<power>48</power>
+				<cooldownTime>3.76</cooldownTime>
+				<armorPenetrationBlunt>5.0</armorPenetrationBlunt>
+				<armorPenetrationSharp>9.0</armorPenetrationSharp>
+				<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>edge</label>
+				<capacities>
+					<li>Cut</li>
+				</capacities>
+				<power>100</power>
+				<cooldownTime>3.28</cooldownTime>
+				<armorPenetrationBlunt>11</armorPenetrationBlunt>
+				<armorPenetrationSharp>4</armorPenetrationSharp>
+				<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+			</li>
+		</tools>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerLongsword"]/statBases</xpath>
+	<value>
+		<Bulk>6</Bulk>
+		<MeleeCounterParryBonus>2.0</MeleeCounterParryBonus>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerLongsword"]</xpath>
+	<value>
+		<equippedStatOffsets>
+			<MeleeCritChance>1.3</MeleeCritChance>
+			<MeleeParryChance>1.4</MeleeParryChance>
+			<MeleeDodgeChance>1.0</MeleeDodgeChance>
+		</equippedStatOffsets>
+	</value>
+</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/All-Tech Melee/Patches/All-Tech Melee/Weapons_ATM_Tribal.xml b/ModPatches/All-Tech Melee/Patches/All-Tech Melee/Weapons_ATM_Tribal.xml
new file mode 100644
index 0000000000..4c8eccd89c
--- /dev/null
+++ b/ModPatches/All-Tech Melee/Patches/All-Tech Melee/Weapons_ATM_Tribal.xml	
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SharpStick"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3.5</power>
+					<cooldownTime>0.66</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.9</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>0.59</cooldownTime>
+					<armorPenetrationBlunt>1.175</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.175</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SharpStick"]/statBases</xpath>
+		<value>
+			<Bulk>14</Bulk>
+			<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SharpStick"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.09</MeleeCritChance>
+				<MeleeParryChance>0.75</MeleeParryChance>
+				<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/All-Tech Melee/Patches/All-Tech Melee/Weapons_ATM_Ultratech.xml b/ModPatches/All-Tech Melee/Patches/All-Tech Melee/Weapons_ATM_Ultratech.xml
new file mode 100644
index 0000000000..d7c8bbf2a8
--- /dev/null
+++ b/ModPatches/All-Tech Melee/Patches/All-Tech Melee/Weapons_ATM_Ultratech.xml	
@@ -0,0 +1,346 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Gladius ========== -->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[contains(defName, "ATM_MeleeWeapon_Spacer")]/costStuffCount</xpath>
+	<value>
+		<costStuffCount>200</costStuffCount>
+	</value>
+</Operation>
+
+<!-- Patch stats -->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechGladius"]/tools</xpath>
+	<value>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>handle</label>
+				<capacities>
+					<li>Poke</li>
+				</capacities>
+				<power>12</power>
+				<chanceFactor>0.33</chanceFactor>
+				<cooldownTime>0.8</cooldownTime>
+				<armorPenetrationBlunt>2.4</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>point</label>
+				<capacities>
+					<li>Stab</li>
+				</capacities>
+				<power>140</power>
+				<cooldownTime>0.75</cooldownTime>
+				<armorPenetrationBlunt>2.4</armorPenetrationBlunt>
+				<armorPenetrationSharp>2.4</armorPenetrationSharp>
+				<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>edge</label>
+				<capacities>
+					<li>Cut</li>
+				</capacities>
+				<power>100</power>
+				<cooldownTime>0.7</cooldownTime>
+				<armorPenetrationBlunt>4.4</armorPenetrationBlunt>
+				<armorPenetrationSharp>2.4</armorPenetrationSharp>
+				<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+			</li>
+		</tools>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechGladius"]/statBases</xpath>
+	<value>
+		<Bulk>1.5</Bulk>
+		<MeleeCounterParryBonus>1.8</MeleeCounterParryBonus>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechGladius"]</xpath>
+	<value>
+		<equippedStatOffsets>
+			<MeleeCritChance>1.2</MeleeCritChance>
+			<MeleeParryChance>2.2</MeleeParryChance>
+			<MeleeDodgeChance>1.2</MeleeDodgeChance>
+		</equippedStatOffsets>
+	</value>
+</Operation>
+
+<!-- Add tags -->
+
+<Operation Class="PatchOperationConditional">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechGladius"]/weaponTags</xpath>
+	<nomatch Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechGladius"]</xpath>
+		<value>
+			<weaponTags/>
+		</value>
+	</nomatch>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechGladius"]/weaponTags</xpath>
+	<value>
+		<li>CE_Sidearm_Melee</li>
+		<li>CE_OneHandedWeapon</li>
+	</value>
+</Operation>
+
+<!-- ========== Hammer ========== -->
+
+<!-- Patch stats -->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechHammer"]/tools</xpath>
+	<value>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>handle</label>
+				<capacities>
+					<li>Poke</li>
+				</capacities>
+				<power>20</power>
+				<chanceFactor>0.33</chanceFactor>
+				<cooldownTime>0.5</cooldownTime>
+				<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>head</label>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<power>60</power>
+				<cooldownTime>1.5</cooldownTime>
+				<armorPenetrationBlunt>40</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+			</li>
+		</tools>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechHammer"]/statBases</xpath>
+	<value>
+		<Bulk>2</Bulk>
+		<MeleeCounterParryBonus>1.0</MeleeCounterParryBonus>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechHammer"]</xpath>
+	<value>
+		<equippedStatOffsets>
+			<MeleeCritChance>3.0</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<MeleeDodgeChance>1.2</MeleeDodgeChance>
+		</equippedStatOffsets>
+	</value>
+</Operation>
+
+<!-- Add tags -->
+
+<Operation Class="PatchOperationConditional">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechHammer"]/weaponTags</xpath>
+	<nomatch Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechHammer"]</xpath>
+		<value>
+			<weaponTags/>
+		</value>
+	</nomatch>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechHammer"]/weaponTags</xpath>
+	<value>
+		<li>CE_Sidearm_Tribal</li>
+		<li>CE_OneHandedWeapon</li>
+	</value>
+</Operation>
+
+<!-- ========== SledgeHammer ========== -->
+
+<!-- Patch stats -->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechSledgehammer"]/tools</xpath>
+	<value>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>handle</label>
+				<capacities>
+					<li>Poke</li>
+				</capacities>
+				<power>8</power>
+				<chanceFactor>0.33</chanceFactor>
+				<cooldownTime>0.66</cooldownTime>
+				<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>head</label>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<power>80</power>
+				<cooldownTime>0.75</cooldownTime>
+				<armorPenetrationBlunt>60</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+			</li>
+		</tools>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechSledgehammer"]/statBases</xpath>
+	<value>
+		<Bulk>2.0</Bulk>
+		<MeleeCounterParryBonus>1.2</MeleeCounterParryBonus>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechSledgehammer"]</xpath>
+	<value>
+		<equippedStatOffsets>
+			<MeleeCritChance>2.08</MeleeCritChance>
+			<MeleeParryChance>1.28</MeleeParryChance>
+			<MeleeDodgeChance>1.2</MeleeDodgeChance>
+		</equippedStatOffsets>
+	</value>
+</Operation>
+
+<!-- ========== Spear ========== -->
+
+<!-- Patch stats -->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechSpear"]/tools</xpath>
+	<value>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>shaft</label>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<power>36</power>
+				<cooldownTime>0.57</cooldownTime>
+				<chanceFactor>0.15</chanceFactor>
+				<armorPenetrationBlunt>28</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>shaft</label>
+				<capacities>
+					<li>Poke</li>
+				</capacities>
+				<power>20</power>
+				<cooldownTime>1.8</cooldownTime>
+				<chanceFactor>0.05</chanceFactor>
+				<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>head</label>
+				<capacities>
+					<li>Stab</li>
+				</capacities>
+				<power>100</power>
+				<cooldownTime>0.55</cooldownTime>
+				<armorPenetrationBlunt>33</armorPenetrationBlunt>
+				<armorPenetrationSharp>33</armorPenetrationSharp>
+				<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+			</li>
+		</tools>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechSpear"]/statBases</xpath>
+	<value>
+		<Bulk>5</Bulk>
+		<MeleeCounterParryBonus>7.52</MeleeCounterParryBonus>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechSpear"]</xpath>
+	<value>
+		<equippedStatOffsets>
+			<MeleeCritChance>1.0</MeleeCritChance>
+			<MeleeParryChance>6.64</MeleeParryChance>
+			<MeleeDodgeChance>4.8</MeleeDodgeChance>
+		</equippedStatOffsets>
+	</value>
+</Operation>
+
+<!-- ========== Longsword ========== -->
+
+<!-- Patch stats -->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechLongsword"]/tools</xpath>
+	<value>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>handle</label>
+				<capacities>
+					<li>Poke</li>
+				</capacities>
+				<power>24</power>
+				<cooldownTime>1.753</cooldownTime>
+				<chanceFactor>0.10</chanceFactor>
+				<armorPenetrationBlunt>12</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>point</label>
+				<capacities>
+					<li>Stab</li>
+				</capacities>
+				<power>96</power>
+				<cooldownTime>1.753</cooldownTime>
+				<armorPenetrationBlunt>12</armorPenetrationBlunt>
+				<armorPenetrationSharp>18</armorPenetrationSharp>
+				<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>edge</label>
+				<capacities>
+					<li>Cut</li>
+				</capacities>
+				<power>200</power>
+				<cooldownTime>3.28</cooldownTime>
+				<armorPenetrationBlunt>30</armorPenetrationBlunt>
+				<armorPenetrationSharp>12</armorPenetrationSharp>
+				<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+			</li>
+		</tools>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechLongsword"]/statBases</xpath>
+	<value>
+		<Bulk>5</Bulk>
+		<MeleeCounterParryBonus>4.0</MeleeCounterParryBonus>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechLongsword"]</xpath>
+	<value>
+		<equippedStatOffsets>
+			<MeleeCritChance>2.6</MeleeCritChance>
+			<MeleeParryChance>2.8</MeleeParryChance>
+			<MeleeDodgeChance>2.0</MeleeDodgeChance>
+		</equippedStatOffsets>
+	</value>
+</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Defs/Alpha Animals/Defs_Ammo.xml b/ModPatches/Alpha Animals/Defs/Alpha Animals/Defs_Ammo.xml
new file mode 100644
index 0000000000..b9186b46db
--- /dev/null
+++ b/ModPatches/Alpha Animals/Defs/Alpha Animals/Defs_Ammo.xml	
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ======== Projectiles ======== -->
+
+	<ThingDef ParentName="BaseBullet">
+		<defName>AA_PoisonBolt_V</defName>
+		<label>venomous spit</label>
+		<graphicData>
+			<texPath>Things/Projectiles/AA_PoisonBolt</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile>
+			<flyOverhead>false</flyOverhead>
+			<damageDef>AA_ToxicBolt</damageDef>
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationBase>2.5</armorPenetrationBase>
+			<speed>50</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBulletCE">
+		<defName>AA_BurnWeb</defName>
+		<label>burning web</label>
+		<thingClass>CombatExtended.BulletCE</thingClass>
+		<graphicData>
+			<texPath>Things/Projectiles/AA_Web</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>2</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<flyOverhead>false</flyOverhead>
+			<damageDef>Burn</damageDef>
+			<damageAmountBase>5</damageAmountBase>
+			<speed>15</speed>
+			<armorPenetrationBlunt>3</armorPenetrationBlunt>
+			<!-- Adding secondary damage with CE's Procedure instead of AA's AnimalProjectile -->
+			<secondaryDamage>
+				<li>
+					<def>Stun</def>
+					<amount>8</amount>
+					<chance>0.5</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBulletCE">
+		<defName>AA_AcidicVomit_CE</defName>
+		<label>acidic vomit</label>
+		<thingClass>CombatExtended.BulletCE</thingClass>
+		<graphicData>
+			<texPath>Things/Projectiles/Proj_LiquidStream</texPath>
+			<graphicClass>Graphic_Flicker</graphicClass>
+			<shaderType>MoteGlow</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>AA_AcidSpit</damageDef>
+			<flyOverhead>false</flyOverhead>
+			<damageAmountBase>15</damageAmountBase>
+			<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+			<speed>18</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBulletCE">
+		<defName>AA_FlameBreathAnimated_CE</defName>
+		<label>flame breath</label>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<graphicData>
+			<texPath>Things/Projectiles/AA_FieryProjectile</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>MoteGlow</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<flyOverhead>false</flyOverhead>
+			<damageDef>Flame</damageDef>
+			<damageAmountBase>15</damageAmountBase>
+			<explosionRadius>2.5</explosionRadius>
+			<suppressionFactor>3.0</suppressionFactor>
+			<dangerFactor>2.0</dangerFactor>
+			<speed>40</speed>
+			<ai_IsIncendiary>true</ai_IsIncendiary>
+			<soundExplode>Interact_Ignite</soundExplode>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Defs/Alpha Animals/Defs_Hediffs.xml b/ModPatches/Alpha Animals/Defs/Alpha Animals/Defs_Hediffs.xml
new file mode 100644
index 0000000000..6ef89c0efb
--- /dev/null
+++ b/ModPatches/Alpha Animals/Defs/Alpha Animals/Defs_Hediffs.xml	
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<HediffDef>
+		<defName>AA_LowBleed</defName>
+		<description>This creature bleeds very little.</description>
+		<label>Regen factor</label>
+		<defaultLabelColor>(.8,0,0)</defaultLabelColor>
+		<scenarioCanAdd>false</scenarioCanAdd>
+		<maxSeverity>1.0</maxSeverity>
+		<stages>
+			<li>
+				<totalBleedFactor>0.25</totalBleedFactor>
+			</li>
+		</stages>
+	</HediffDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VPE/AbilityDefs/AbilityDefs_Patch.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VPE/AbilityDefs/AbilityDefs_Patch.xml
new file mode 100644
index 0000000000..fcdce71d6f
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VPE/AbilityDefs/AbilityDefs_Patch.xml	
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Psycasts Expanded</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!-- ======= Ability Range Adjustment ======= -->
+
+				<!-- ===== Herald Path ===== -->
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_VenomSpit"]/range</xpath>
+					<value>
+						<range>19.9</range>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_VenomSpit"]/modExtensions/li[@Class="VFECore.Abilities.AbilityExtension_Projectile"]/projectile</xpath>
+					<value>
+						<projectile>AA_PoisonBolt_V</projectile>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_SummonBlackScarab" or defName="AAVPE_SummonBlackSpelopede" or defName="AAVPE_SummonBlackSpider" or defName="AAVPE_SummonMammothWorm" or defName="AAVPE_SummonBlackQueen"]/range</xpath>
+					<value>
+						<range>24</range>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_StrengthenInsect"]/range</xpath>
+					<value>
+						<range>11.9</range>
+					</value>
+				</li>
+
+				<!-- ===== Ocultist Path ===== -->
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_SummonEyeling" or defName="AAVPE_SummonOcularOriginator" or AAVPE_SummonEyelingHorde]/range</xpath>
+					<value>
+						<range>24</range>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_StrikeEyes" or defName="AAVPE_EyeEruption"]/range</xpath>
+					<value>
+						<range>11.9</range>
+					</value>
+				</li>
+
+				<!-- ===== Ravager Path ===== -->
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_Slice"]/range</xpath>
+					<value>
+						<range>6</range>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_Slice"]/modExtensions/li[@Class="AlphaBehavioursAndEvents.Ability_Damage_Extension"]/armourPen</xpath>
+					<value>
+						<armourPen>6.0</armourPen>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_ClawFrenzy"]/modExtensions/li[@Class="AlphaBehavioursAndEvents.Ability_Damage_Extension"]/armourPen</xpath>
+					<value>
+						<armourPen>3.0</armourPen>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_DisablingStrike"]/modExtensions/li[@Class="AlphaBehavioursAndEvents.Ability_Damage_Extension"]/armourPen</xpath>
+					<value>
+						<armourPen>1.0</armourPen>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_Skewer"]/modExtensions/li[@Class="AlphaBehavioursAndEvents.Ability_Damage_Extension"]/armourPen</xpath>
+					<value>
+						<armourPen>9.0</armourPen>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_Charge"]/range</xpath>
+					<value>
+						<range>12</range>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_Charge"]/modExtensions/li[@Class="AlphaBehavioursAndEvents.Ability_Damage_Extension"]/armourPen</xpath>
+					<value>
+						<armourPen>1.0</armourPen>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_ChargeAndSkewer"]/range</xpath>
+					<value>
+						<range>19</range>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_ChargeAndSkewer"]/modExtensions/li[@Class="AlphaBehavioursAndEvents.Ability_Damage_Extension"]/armourPen</xpath>
+					<value>
+						<armourPen>9.0</armourPen>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_EmpBlow"]/modExtensions/li[@Class="AlphaBehavioursAndEvents.Ability_Damage_Extension"]/armourPen</xpath>
+					<value>
+						<armourPen>10.0</armourPen>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_SpinCut"]/range</xpath>
+					<value>
+						<range>10</range>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_SpinCut"]/modExtensions/li[@Class="AlphaBehavioursAndEvents.Ability_Damage_Extension"]/armourPen</xpath>
+					<value>
+						<armourPen>4.0</armourPen>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_LegSkip"]/range</xpath>
+					<value>
+						<range>6</range>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_LegSkip"]/modExtensions/li[@Class="AlphaBehavioursAndEvents.Ability_Damage_Extension"]/armourPen</xpath>
+					<value>
+						<armourPen>10000</armourPen>
+					</value>
+				</li>
+
+				<!-- ===== Xenoseer Path ===== -->
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_ChemfuelNodules"]/range</xpath>
+					<value>
+						<range>29</range>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_Hover" or defName="AAVPE_FungalSkin"]/range</xpath>
+					<value>
+						<range>24</range>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_WebSlinging"]/range</xpath>
+					<value>
+						<range>19.9</range>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_AcidSpit"]/range</xpath>
+					<value>
+						<range>12</range>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_Laser"]/range</xpath>
+					<value>
+						<range>18</range>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_Electrify"]/range</xpath>
+					<value>
+						<range>29</range>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_Regeneration"]/range</xpath>
+					<value>
+						<range>12</range>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VPE/HediffDefs/Hediffs_Patch.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VPE/HediffDefs/Hediffs_Patch.xml
new file mode 100644
index 0000000000..ab6f31e8ea
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VPE/HediffDefs/Hediffs_Patch.xml	
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Psycasts Expanded</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!-- ======= Ability Range Adjustment ======= -->
+
+				<!-- ===== Herald Path ===== -->
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[defName="AAVPE_StrengthenBlackHive"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[defName="AAVPE_StrengthenBlackHive"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>1.0</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<!-- ===== Xenoseer Path ===== -->
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[defName="AAVPE_FungalSkin"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>3.75</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[defName="AAVPE_FungalSkin"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_BlackHive_Psycasts.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_BlackHive_Psycasts.xml
new file mode 100644
index 0000000000..4a552955d6
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_BlackHive_Psycasts.xml	
@@ -0,0 +1,500 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Psycasts Expanded</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AA_BlackScarab_Temporary"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>QuadrupedLow</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/PawnKindDef[defName="AA_BlackScarab_Temporary"]/combatPower</xpath>
+					<value>
+						<combatPower>60</combatPower>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_BlackScarab_Temporary"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>2.55</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_BlackScarab_Temporary"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_BlackScarab_Temporary"]/statBases/MoveSpeed</xpath>
+					<value>
+						<MoveSpeed>4.9</MoveSpeed>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AA_BlackScarab_Temporary"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.15</MeleeDodgeChance>
+						<MeleeCritChance>0.01</MeleeCritChance>
+						<MeleeParryChance>0</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_BlackScarab_Temporary"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>mandibles</label>
+								<capacities>
+									<li>Bite</li>
+								</capacities>
+								<power>9</power>
+								<cooldownTime>1.33</cooldownTime>
+								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+								<armorPenetrationSharp>0.5</armorPenetrationSharp>
+								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>1</power>
+								<cooldownTime>1.26</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+								<chanceFactor>0.1</chanceFactor>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="AA_BlackScarab_Temporary"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AA_BlackScarab_Temporary"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AA_BlackScarab_Temporary"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>187</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>600</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<MinArmorPct>0.5</MinArmorPct>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AA_BlackSpelopede_Temporary"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>QuadrupedLow</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_BlackSpelopede_Temporary"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>6</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_BlackSpelopede_Temporary"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>3</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_BlackSpelopede_Temporary"]/statBases/MoveSpeed</xpath>
+					<value>
+						<MoveSpeed>4.7</MoveSpeed>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AA_BlackSpelopede_Temporary"]/statBases</xpath>
+					<value>
+						<AimingAccuracy>0.75</AimingAccuracy>
+						<ShootingAccuracyPawn>0.75</ShootingAccuracyPawn>
+						<MeleeDodgeChance>0.08</MeleeDodgeChance>
+						<MeleeCritChance>0.18</MeleeCritChance>
+						<MeleeParryChance>0.15</MeleeParryChance>
+						<Suppressability>0.25</Suppressability>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/PawnKindDef[defName="AA_BlackSpelopede_Temporary"]/combatPower</xpath>
+					<value>
+						<combatPower>100</combatPower>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_BlackSpelopede_Temporary"]/race/baseHealthScale</xpath>
+					<value>
+						<baseHealthScale>1.4</baseHealthScale>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_BlackSpelopede_Temporary"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>head claw</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>22</power>
+								<cooldownTime>1.68</cooldownTime>
+								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+								<armorPenetrationSharp>0.75</armorPenetrationSharp>
+								<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head claw</label>
+								<capacities>
+									<li>Stab</li>
+								</capacities>
+								<power>15</power>
+								<cooldownTime>1.48</cooldownTime>
+								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+								<armorPenetrationSharp>6</armorPenetrationSharp>
+								<armorPenetrationBlunt>3</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>2</power>
+								<cooldownTime>1.5</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+								<chanceFactor>0.2</chanceFactor>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_BlackSpelopede_Temporary"]/verbs</xpath>
+					<value>
+						<verbs>
+							<li Class="CombatExtended.VerbPropertiesCE">
+								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+								<hasStandardCommand>true</hasStandardCommand>
+								<defaultProjectile>AA_PoisonBolt</defaultProjectile>
+								<warmupTime>2.4</warmupTime>
+								<burstShotCount>1</burstShotCount>
+								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+								<minRange>2</minRange>
+								<range>20</range>
+								<soundCast>AA_PoisonBolt</soundCast>
+								<muzzleFlashScale>0</muzzleFlashScale>
+								<label>venomous spit</label>
+								<commonality>0.8</commonality>
+							</li>
+						</verbs>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="AA_BlackSpelopede_Temporary"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AA_BlackSpelopede_Temporary"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AA_BlackSpelopede_Temporary"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>600</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>600</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<MinArmorPct>0.5</MinArmorPct>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AA_BlackSpider_Temporary"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Quadruped</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_BlackSpider_Temporary"]/race/baseHealthScale</xpath>
+					<value>
+						<baseHealthScale>2.1</baseHealthScale>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_BlackSpider_Temporary"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>12</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_BlackSpider_Temporary"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>5</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_BlackSpider_Temporary"]/statBases/MoveSpeed</xpath>
+					<value>
+						<MoveSpeed>4.6</MoveSpeed>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AA_BlackSpider_Temporary"]/statBases</xpath>
+					<value>
+						<AimingAccuracy>0.65</AimingAccuracy>
+						<ShootingAccuracyPawn>0.65</ShootingAccuracyPawn>
+						<MeleeDodgeChance>0.09</MeleeDodgeChance>
+						<MeleeCritChance>0.45</MeleeCritChance>
+						<MeleeParryChance>0.25</MeleeParryChance>
+						<Suppressability>0.2</Suppressability>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/PawnKindDef[defName="AA_BlackSpider_Temporary"]/combatPower</xpath>
+					<value>
+						<combatPower>200</combatPower>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_BlackSpider_Temporary"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>head claw</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>44</power>
+								<cooldownTime>2.0</cooldownTime>
+								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+								<armorPenetrationSharp>2.0</armorPenetrationSharp>
+								<armorPenetrationBlunt>10</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head claw</label>
+								<capacities>
+									<li>Stab</li>
+								</capacities>
+								<power>26</power>
+								<cooldownTime>1.33</cooldownTime>
+								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+								<armorPenetrationSharp>44</armorPenetrationSharp>
+								<armorPenetrationBlunt>22</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>25</power>
+								<cooldownTime>1.33</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+								<armorPenetrationBlunt>8.5</armorPenetrationBlunt>
+								<chanceFactor>0.2</chanceFactor>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_BlackSpider_Temporary"]/verbs</xpath>
+					<value>
+						<verbs>
+							<li Class="CombatExtended.VerbPropertiesCE">
+								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+								<hasStandardCommand>true</hasStandardCommand>
+								<defaultProjectile>AA_PoisonBolt</defaultProjectile>
+								<warmupTime>1.6</warmupTime>
+								<burstShotCount>1</burstShotCount>
+								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+								<minRange>1.9</minRange>
+								<range>32</range>
+								<soundCast>AA_PoisonBolt</soundCast>
+								<muzzleFlashScale>0</muzzleFlashScale>
+								<label>venomous spit</label>
+								<commonality>0.8</commonality>
+							</li>
+						</verbs>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="AA_BlackSpider_Temporary"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AA_BlackSpider_Temporary"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AA_BlackSpider_Temporary"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>900</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>600</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<MinArmorPct>0.5</MinArmorPct>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AA_MammothWorm_Temporary"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Quadruped</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/PawnKindDef[defName="AA_MammothWorm_Temporary"]/combatPower</xpath>
+					<value>
+						<combatPower>250</combatPower>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_MammothWorm_Temporary"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>24</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_MammothWorm_Temporary"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>10</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_MammothWorm_Temporary"]/statBases/MoveSpeed</xpath>
+					<value>
+						<MoveSpeed>2.7</MoveSpeed>
+						<MeleeDodgeChance>0.08</MeleeDodgeChance>
+						<MeleeCritChance>0.8</MeleeCritChance>
+						<MeleeParryChance>0.23</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_MammothWorm_Temporary"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>body</label>
+								<capacities>
+									<li>AA_SiegeBlunt</li>
+								</capacities>
+								<power>43</power>
+								<cooldownTime>2.48</cooldownTime>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>21</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationBlunt>50</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<capacities>
+									<li>Stab</li>
+								</capacities>
+								<power>48</power>
+								<cooldownTime>2.68</cooldownTime>
+								<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationSharp>20</armorPenetrationSharp>
+								<armorPenetrationBlunt>50</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="AA_MammothWorm_Temporary"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AA_MammothWorm_Temporary"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AA_MammothWorm_Temporary"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>1500</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>600</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<MinArmorPct>0.5</MinArmorPct>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_BlackLarva.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_BlackLarva.xml
new file mode 100644
index 0000000000..2b2b3f1c40
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_BlackLarva.xml	
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Psycasts Expanded</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AA_BlackLarvae"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.06</MeleeDodgeChance>
+						<MeleeCritChance>0.02</MeleeCritChance>
+						<MeleeParryChance>0.04</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_BlackLarvae"]/race/baseHealthScale</xpath>
+					<value>
+						<baseHealthScale>0.2</baseHealthScale>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_BlackLarvae"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>mandibles</label>
+								<capacities>
+									<li>Bite</li>
+								</capacities>
+								<power>3</power>
+								<cooldownTime>2.12</cooldownTime>
+								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+								<armorPenetrationSharp>0.01</armorPenetrationSharp>
+								<armorPenetrationBlunt>0.031</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>1</power>
+								<cooldownTime>2.12</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<chanceFactor>0.2</chanceFactor>
+								<armorPenetrationBlunt>0.031</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_BlackQueen.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_BlackQueen.xml
new file mode 100644
index 0000000000..616c4a14e0
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_BlackQueen.xml	
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Psycasts Expanded</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AAVPE_BlackQueen"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.03</MeleeDodgeChance>
+						<MeleeCritChance>0.30</MeleeCritChance>
+						<MeleeParryChance>0.57</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AAVPE_BlackQueen"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>30</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AAVPE_BlackQueen"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>12</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AAVPE_BlackQueen"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>head claw</label>
+								<capacities>
+									<li>Stab</li>
+								</capacities>
+								<power>37</power>
+								<cooldownTime>1.48</cooldownTime>
+								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+								<armorPenetrationSharp>50</armorPenetrationSharp>
+								<armorPenetrationBlunt>30</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>AAVPE_InfectedMandibles</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>65</power>
+								<cooldownTime>1.65</cooldownTime>
+								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+								<armorPenetrationSharp>3.38</armorPenetrationSharp>
+								<armorPenetrationBlunt>8.438</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>34</power>
+								<cooldownTime>2.64</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<chanceFactor>0.2</chanceFactor>
+								<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="AAVPE_BlackQueen"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AAVPE_BlackQueen"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AAVPE_BlackQueen"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>3000</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>400</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<MinArmorPct>0.5</MinArmorPct>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_OcularOriginator.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_OcularOriginator.xml
new file mode 100644
index 0000000000..55a97eca57
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_OcularOriginator.xml	
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Psycasts Expanded</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AA_OcularOriginator"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Birdlike</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AA_OcularOriginator"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.3</MeleeDodgeChance>
+						<MeleeCritChance>0.04</MeleeCritChance>
+						<MeleeParryChance>0.3</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_OcularOriginator"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>tentacles</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>5</power>
+								<cooldownTime>0.35</cooldownTime>
+								<linkedBodyPartsGroup>Arms</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>0.7</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_Summoned_Eyeling.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_Summoned_Eyeling.xml
new file mode 100644
index 0000000000..681d40949f
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_Summoned_Eyeling.xml	
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Psycasts Expanded</li>
+		</mods>
+		<match Class="PatchOperationFindMod">
+			<mods>
+				<li>Ideology</li>
+			</mods>
+
+			<match Class="PatchOperationSequence">
+				<operations>
+
+					<li Class="PatchOperationAddModExtension">
+						<xpath>Defs/ThingDef[defName="AA_Summoned_Eyeling"]</xpath>
+						<value>
+							<li Class="CombatExtended.RacePropertiesExtensionCE">
+								<bodyShape>Quadruped</bodyShape>
+							</li>
+						</value>
+					</li>
+
+					<li Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AA_Summoned_Eyeling"]/statBases</xpath>
+						<value>
+							<MeleeDodgeChance>0.1</MeleeDodgeChance>
+							<MeleeCritChance>0.1</MeleeCritChance>
+							<MeleeParryChance>0.1</MeleeParryChance>
+						</value>
+					</li>
+
+					<li Class="PatchOperationReplace">
+						<xpath>Defs/ThingDef[defName="AA_Summoned_Eyeling"]/tools</xpath>
+						<value>
+							<tools>
+								<li Class="CombatExtended.ToolCE">
+									<capacities>
+										<li>AA_ToxicBite</li>
+									</capacities>
+									<power>12</power>
+									<cooldownTime>1.65</cooldownTime>
+									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+									<surpriseAttack>
+										<extraMeleeDamages>
+											<li>
+												<def>Stun</def>
+												<amount>10</amount>
+											</li>
+										</extraMeleeDamages>
+									</surpriseAttack>
+									<armorPenetrationSharp>1.0</armorPenetrationSharp>
+									<armorPenetrationBlunt>0.544</armorPenetrationBlunt>
+								</li>
+							</tools>
+						</value>
+					</li>
+
+				</operations>
+			</match>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Arachnid.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Arachnid.xml
new file mode 100644
index 0000000000..1f10035526
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Arachnid.xml	
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ====== Arachnid ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Arachnid"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Arachnid"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Arachnid"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[def="AA_Thorax"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[def="AA_Thorax"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[def="AA_Thorax"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[def="Pronotum"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[def="Pronotum"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[def="Pronotum"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/parts/li[def="AA_InsectMouth"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/parts/li[def="AA_InsectMouth"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/parts/li[def="AA_InsectMouth"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_ArmouredSlug.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_ArmouredSlug.xml
new file mode 100644
index 0000000000..d3df04863a
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_ArmouredSlug.xml	
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ====== ArmouredSlug ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_ArmouredSlug"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ArmouredSlug"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ArmouredSlug"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_ArmouredSlug"]/corePart/parts/li[def="AA_Carapace"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ArmouredSlug"]/corePart/parts/li[def="AA_Carapace"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ArmouredSlug"]/corePart/parts/li[def="AA_Carapace"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_ArmouredSlug"]/corePart/parts/li[def="Head"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ArmouredSlug"]/corePart/parts/li[def="Head"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ArmouredSlug"]/corePart/parts/li[def="Head"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Atispec.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Atispec.xml
new file mode 100644
index 0000000000..6aa8aba1d4
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Atispec.xml	
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ====== Atispec ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="Tail"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="Tail"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="Tail"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="AA_Thorax"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="AA_Thorax"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="AA_Thorax"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="Pronotum"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="Pronotum"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="Pronotum"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/parts/li[def="AA_InsectMouth"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/parts/li[def="AA_InsectMouth"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/parts/li[def="AA_InsectMouth"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="AA_Abdomen"]/parts/li[def="AA_InsectSting"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="AA_Abdomen"]/parts/li[def="AA_InsectSting"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="AA_Abdomen"]/parts/li[def="AA_InsectSting"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="AA_FrontClaw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="AA_FrontClaw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="AA_FrontClaw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Boats.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Boats.xml
new file mode 100644
index 0000000000..47b8e09fa9
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Boats.xml	
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ====== Boat_JellyFish and Boat_Nautiloid ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_JellyfishBoatBody"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_JellyfishBoatBody"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_JellyfishBoatBody"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_JellyfishBoatBody"]/corePart/parts/li[def="AA_BoatHead"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_JellyfishBoatBody"]/corePart/parts/li[def="AA_BoatHead"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_JellyfishBoatBody"]/corePart/parts/li[def="AA_BoatHead"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_JellyfishBoatBody"]/corePart/parts/li[def="AA_Mast"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_JellyfishBoatBody"]/corePart/parts/li[def="AA_Mast"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_JellyfishBoatBody"]/corePart/parts/li[def="AA_Mast"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_NautiloidBody"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_NautiloidBody"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_NautiloidBody"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_NautiloidBody"]/corePart/parts/li[def="AA_BoatHead"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_NautiloidBody"]/corePart/parts/li[def="AA_BoatHead"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_NautiloidBody"]/corePart/parts/li[def="AA_BoatHead"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_NautiloidBody"]/corePart/parts/li[def="AA_Mast"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_NautiloidBody"]/corePart/parts/li[def="AA_Mast"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_NautiloidBody"]/corePart/parts/li[def="AA_Mast"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_NautiloidBody"]/corePart/parts/li[def="AA_NautilusShell"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_NautiloidBody"]/corePart/parts/li[def="AA_NautilusShell"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_NautiloidBody"]/corePart/parts/li[def="AA_NautilusShell"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Butterfly.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Butterfly.xml
new file mode 100644
index 0000000000..0e414cb5f3
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Butterfly.xml	
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ====== Butterfly ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Butterfly"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Butterfly"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Butterfly"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Butterfly"]/corePart/parts/li[def="AA_Thorax"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Butterfly"]/corePart/parts/li[def="AA_Thorax"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Butterfly"]/corePart/parts/li[def="AA_Thorax"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Butterfly"]/corePart/parts/li[def="Pronotum"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Butterfly"]/corePart/parts/li[def="Pronotum"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Butterfly"]/corePart/parts/li[def="Pronotum"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Butterfly"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Butterfly"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Butterfly"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Butterfly"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/parts/li[def="AA_InsectMouth"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Butterfly"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/parts/li[def="AA_InsectMouth"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Butterfly"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/parts/li[def="AA_InsectMouth"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_ClawedSlug.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_ClawedSlug.xml
new file mode 100644
index 0000000000..5a9373c699
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_ClawedSlug.xml	
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ====== ClawedSlug ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_ClawedSlug"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ClawedSlug"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ClawedSlug"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_ClawedSlug"]/corePart/parts/li[def="AA_Carapace"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ClawedSlug"]/corePart/parts/li[def="AA_Carapace"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ClawedSlug"]/corePart/parts/li[def="AA_Carapace"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_ClawedSlug"]/corePart/parts/li[def="AA_FrontClaw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ClawedSlug"]/corePart/parts/li[def="AA_FrontClaw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ClawedSlug"]/corePart/parts/li[def="AA_FrontClaw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_ClawedSlug"]/corePart/parts/li[def="Head"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ClawedSlug"]/corePart/parts/li[def="Head"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ClawedSlug"]/corePart/parts/li[def="Head"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_ClawedSlug"]/corePart/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ClawedSlug"]/corePart/parts/li[def="Head"]/parts/li[def="AnimalJaw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ClawedSlug"]/corePart/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Crocodile.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Crocodile.xml
new file mode 100644
index 0000000000..6008ae78e9
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Crocodile.xml	
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ====== Crocodile ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Tail"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Tail"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Tail"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Neck"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Neck"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AA_CrocodileJaw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AA_CrocodileJaw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AA_CrocodileJaw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Leg"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Leg"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Leg"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_DualJawedQuadruped.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_DualJawedQuadruped.xml
new file mode 100644
index 0000000000..bb9a2dc2a3
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_DualJawedQuadruped.xml	
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ====== DualJawedQuadruped ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Neck"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Neck"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Leg"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Leg"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Leg"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_DualTentacledQuadrupedWithJowl.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_DualTentacledQuadrupedWithJowl.xml
new file mode 100644
index 0000000000..bf341fd10a
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_DualTentacledQuadrupedWithJowl.xml	
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ====== DualTentacledQuadrupedWithJowl ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Neck"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Neck"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Leg"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Leg"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Leg"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_ExtraClawedQuadruped.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_ExtraClawedQuadruped.xml
new file mode 100644
index 0000000000..f3f7d74f6a
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_ExtraClawedQuadruped.xml	
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ====== ExtraClawedQuadruped ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Neck"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Neck"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="AA_FrontClaw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="AA_FrontClaw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="AA_FrontClaw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Leg"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Leg"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Leg"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Eye.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Eye.xml
new file mode 100644
index 0000000000..c3e92bddb0
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Eye.xml	
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ====== Eye ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_EyeBody"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_EyeBody"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_EyeBody"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_EyeBody"]/corePart/parts/li[def="Head"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_EyeBody"]/corePart/parts/li[def="Head"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_EyeBody"]/corePart/parts/li[def="Head"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_EyeBody"]/corePart/parts/li[def="AA_JellyfishTentacle"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_EyeBody]/corePart/parts/li[def="AA_JellyfishTentacle"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_EyeBody"]/corePart/parts/li[def="AA_JellyfishTentacle"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_EyelessQuadruped.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_EyelessQuadruped.xml
new file mode 100644
index 0000000000..6adac8a9e0
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_EyelessQuadruped.xml	
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ====== EyelessQuadruped ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/parts/li[def="Neck"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/parts/li[def="Neck"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Hexapod.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Hexapod.xml
new file mode 100644
index 0000000000..4bdbe27613
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Hexapod.xml	
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ====== Hexapod ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Neck"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Neck"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Leg"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Leg"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Leg"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="middle left paw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="middle left paw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="middle left paw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="middle right paw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="middle right paw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="middle right paw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Jellyfish.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Jellyfish.xml
new file mode 100644
index 0000000000..de0fd10040
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Jellyfish.xml	
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ====== Jellyfish ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_JellyfishBody"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_JellyfishBody"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_JellyfishBody"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_JellyfishBody"]/corePart/parts/li[def="Head"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_JellyfishBody"]/corePart/parts/li[def="Head"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_JellyfishBody"]/corePart/parts/li[def="Head"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_JellyfishBody"]/corePart/parts/li[def="AA_JellyfishTentacle"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_JellyfishBody]/corePart/parts/li[def="AA_JellyfishTentacle"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_JellyfishBody"]/corePart/parts/li[def="AA_JellyfishTentacle"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_NightCaller.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_NightCaller.xml
new file mode 100644
index 0000000000..395fde208a
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_NightCaller.xml	
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ====== NightCaller ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/parts/li[def="Neck"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/parts/li[def="Neck"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/parts/li[def="Tusk"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/parts/li[def="Tusk"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/parts/li[def="Tusk"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/parts/li[def="Leg"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/parts/li[def="Leg"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/parts/li[def="Leg"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/parts/li[def="Leg"]/parts/li[def="Hoof"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/parts/li[def="Leg"]/parts/li[def="Hoof"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/parts/li[def="Leg"]/parts/li[def="Hoof"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_NightMule.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_NightMule.xml
new file mode 100644
index 0000000000..286e059818
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_NightMule.xml	
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ====== NightMule ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/parts/li[def="Neck"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/parts/li[def="Neck"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Horn"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Horn"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Horn"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/parts/li[def="Leg"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/parts/li[def="Leg"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/parts/li[def="Leg"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Hoof"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Hoof"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Hoof"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_NightRam.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_NightRam.xml
new file mode 100644
index 0000000000..f65ac90d56
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_NightRam.xml	
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ====== NightRam ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/parts/li[def="Neck"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/parts/li[def="Neck"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Horn"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Horn"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Horn"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/parts/li[def="Leg"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/parts/li[def="Leg"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/parts/li[def="Leg"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Hoof"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Hoof"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Hoof"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Plants.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Plants.xml
new file mode 100644
index 0000000000..f486e77c06
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Plants.xml	
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ====== ManTrap or FlyTrap or Sentientplant ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_FlyTrap" or defName="AA_SentientPlant"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_FlyTrap" or defName="AA_SentientPlant"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_FlyTrap" or defName="AA_SentientPlant"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_FlyTrap" or defName="AA_SentientPlant"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_FlyTrap" or defName="AA_SentientPlant"]/corePart/parts/li[def="Neck"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_FlyTrap" or defName="AA_SentientPlant"]/corePart/parts/li[def="Neck"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_FlyTrap" or defName="AA_SentientPlant"]/corePart/parts/li[def="Neck"]/parts/li[def="AA_SentientPlantHead"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_FlyTrap" or defName="AA_SentientPlant"]/corePart/parts/li[def="Neck"]/parts/li[def="AA_SentientPlantHead"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_FlyTrap" or defName="AA_SentientPlant"]/corePart/parts/li[def="Neck"]/parts/li[def="AA_SentientPlantHead"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_FlyTrap" or defName="AA_SentientPlant"]/corePart/parts/li[def="Neck"]/parts/li[def="AA_SentientPlantHead"]/parts/li[def="AA_SentientPlantMouth"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_FlyTrap" or defName="AA_SentientPlant"]/corePart/parts/li[def="Neck"]/parts/li[def="AA_SentientPlantHead"]/parts/li[def="AA_SentientPlantMouth"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_FlyTrap" or defName="AA_SentientPlant"]/corePart/parts/li[def="Neck"]/parts/li[def="AA_SentientPlantHead"]/parts/li[def="AA_SentientPlantMouth"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Raptor.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Raptor.xml
new file mode 100644
index 0000000000..905eca0dc1
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Raptor.xml	
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ====== Raptor ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/parts/li[def="Tail"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/parts/li[def="Tail"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/parts/li[def="Tail"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/parts/li[def="Neck"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/parts/li[def="Neck"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/parts/li[def="Leg"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/parts/li[def="Leg"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/parts/li[def="Leg"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_ScorpionLike.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_ScorpionLike.xml
new file mode 100644
index 0000000000..8ca2debbb4
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_ScorpionLike.xml	
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ====== ScorpionLike ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/parts/li[def="AA_Thorax"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/parts/li[def="AA_Thorax"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/parts/li[def="AA_Thorax"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/parts/li[def="Pronotum"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/parts/li[def="Pronotum"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/parts/li[def="Pronotum"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/parts/li[def="AA_InsectMouth"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/parts/li[def="AA_InsectMouth"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/parts/li[def="AA_InsectMouth"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/parts/li[def="AA_InsectTail"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/parts/li[def="AA_InsectTail"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/parts/li[def="AA_InsectTail"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/parts/li[def="AA_InsectTail"]/parts/li[def="AA_InsectSting"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/parts/li[def="AA_InsectTail"]/parts/li[def="AA_InsectSting"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/parts/li[def="AA_InsectTail"]/parts/li[def="AA_InsectSting"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_ShadowCharger.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_ShadowCharger.xml
new file mode 100644
index 0000000000..420f6f8ea3
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_ShadowCharger.xml	
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ====== ShadowCharger ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/parts/li[def="Neck"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/parts/li[def="Neck"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Horn"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Horn"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Horn"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/parts/li[def="Leg"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/parts/li[def="Leg"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/parts/li[def="Leg"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Hoof"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Hoof"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Hoof"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_SixEyedGoat.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_SixEyedGoat.xml
new file mode 100644
index 0000000000..b0e3939f77
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_SixEyedGoat.xml	
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ====== SixEyedGoat ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_SixEyedGoat"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_SixEyedGoat"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_SixEyedGoat"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_SixEyedGoat"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_SixEyedGoat"]/corePart/parts/li[def="Neck"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_SixEyedGoat"]/corePart/parts/li[def="Neck"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_SixEyedGoat"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_SixEyedGoat"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_SixEyedGoat"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_SixEyedGoat"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_SixEyedGoat"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_SixEyedGoat"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_SixEyedGoat"]/corePart/parts/li[def="Leg"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_SixEyedGoat"]/corePart/parts/li[def="Leg"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_SixEyedGoat"]/corePart/parts/li[def="Leg"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_SixEyedGoat"]/corePart/parts/li[def="Leg"]/parts/li[def="Hoof"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_SixEyedGoat"]/corePart/parts/li[def="Leg"]/parts/li[def="Hoof"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_SixEyedGoat"]/corePart/parts/li[def="Leg"]/parts/li[def="Hoof"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Slug.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Slug.xml
new file mode 100644
index 0000000000..bf8be8f84a
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Slug.xml	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ====== Slug ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Slug"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Slug"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Slug"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Slug"]/corePart/parts/li[def="Head"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Slug"]/corePart/parts/li[def="Head"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Slug"]/corePart/parts/li[def="Head"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Slurrypede.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Slurrypede.xml
new file mode 100644
index 0000000000..99ddf9c9cf
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Slurrypede.xml	
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ====== Slurrypede ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/parts/li[def="MechanicalCentipedeBodyFourthRing"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/parts/li[def="MechanicalCentipedeBodyFourthRing"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/parts/li[def="MechanicalCentipedeBodyFourthRing"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/parts/li[def="MechanicalCentipedeBodyFourthRing"]/parts/li[def="MechanicalCentipedeBodyFifthRing"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/parts/li[def="MechanicalCentipedeBodyFourthRing"]/parts/li[def="MechanicalCentipedeBodyFifthRing"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/parts/li[def="MechanicalCentipedeBodyFourthRing"]/parts/li[def="MechanicalCentipedeBodyFifthRing"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/parts/li[def="MechanicalCentipedeBodyFourthRing"]/parts/li[def="MechanicalCentipedeBodyFifthRing"]/parts/li[def="MechanicalCentipedeBodySixthRing"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/parts/li[def="MechanicalCentipedeBodyFourthRing"]/parts/li[def="MechanicalCentipedeBodyFifthRing"]/parts/li[def="MechanicalCentipedeBodySixthRing"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/parts/li[def="MechanicalCentipedeBodyFourthRing"]/parts/li[def="MechanicalCentipedeBodyFifthRing"]/parts/li[def="MechanicalCentipedeBodySixthRing"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Snail.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Snail.xml
new file mode 100644
index 0000000000..c63532962c
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Snail.xml	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ====== Snail ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Snail"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Snail"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Snail"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Snail"]/corePart/parts/li[def="AA_Carapace"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Snail"]/corePart/parts/li[def="AA_Carapace"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Snail"]/corePart/parts/li[def="AA_Carapace"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_SnakeWithTwoLimbs.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_SnakeWithTwoLimbs.xml
new file mode 100644
index 0000000000..5d9cfa5b01
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_SnakeWithTwoLimbs.xml	
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ====== SnakeWithTwoLimbs ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_SnakeWithTwoLimbs"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_SnakeWithTwoLimbs"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_SnakeWithTwoLimbs"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_SnakeWithTwoLimbs"]/corePart/parts/li[def="AA_LeftCreatureLimb" or def="AA_RightCreatureLimb"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_SnakeWithTwoLimbs"]/corePart/parts/li[def="AA_LeftCreatureLimb" or def="AA_RightCreatureLimb"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_SnakeWithTwoLimbs"]/corePart/parts/li[def="AA_LeftCreatureLimb" or def="AA_RightCreatureLimb"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_SnakeWithTwoLimbs"]/corePart/parts/li[def="AA_LeftCreatureLimb" or def="AA_RightCreatureLimb"]/parts/li[def="AA_LeftCreatureBlade" or def="AA_RightCreatureBlade"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_SnakeWithTwoLimbs"]/corePart/parts/li[def="AA_LeftCreatureLimb" or def="AA_RightCreatureLimb"]/parts/li[def="AA_LeftCreatureBlade" or def="AA_RightCreatureBlade"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_SnakeWithTwoLimbs"]/corePart/parts/li[def="AA_LeftCreatureLimb" or def="AA_RightCreatureLimb"]/parts/li[def="AA_LeftCreatureBlade" or def="AA_RightCreatureBlade"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_SnakeWithTwoLimbs"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_SnakeWithTwoLimbs"]/corePart/parts/li[def="Neck"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_SnakeWithTwoLimbs"]/corePart/parts/li[def="Neck"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_SnakeWithTwoLimbs"]/corePart/parts/li[def="Neck"]/parts/li[def="SnakeHead"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_SnakeWithTwoLimbs"]/corePart/parts/li[def="Neck"]/parts/li[def="SnakeHead"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_SnakeWithTwoLimbs"]/corePart/parts/li[def="Neck"]/parts/li[def="SnakeHead"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_SnakeWithTwoLimbs"]/corePart/parts/li[def="Neck"]/parts/li[def="SnakeHead"]/parts/li[def="SnakeMouth"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_SnakeWithTwoLimbs"]/corePart/parts/li[def="Neck"]/parts/li[def="SnakeHead"]/parts/li[def="SnakeMouth"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_SnakeWithTwoLimbs"]/corePart/parts/li[def="Neck"]/parts/li[def="SnakeHead"]/parts/li[def="SnakeMouth"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Squid.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Squid.xml
new file mode 100644
index 0000000000..6927388584
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Squid.xml	
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ====== Squid ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Squid"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Squid"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Squid"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Squid"]/corePart/parts/li[def="AA_ConicalShell"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Squid"]/corePart/parts/li[def="AA_ConicalShell"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Squid"]/corePart/parts/li[def="AA_ConicalShell"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<!-- ====== No-Shell Squid ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Squid_NoShell"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Squid_NoShell"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Squid_NoShell"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_TentacledEyelessQuadruped.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_TentacledEyelessQuadruped.xml
new file mode 100644
index 0000000000..76207f0361
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_TentacledEyelessQuadruped.xml	
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ====== TentacledEyelessQuadruped ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/parts/li[def="Neck"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/parts/li[def="Neck"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/parts/li[def="Leg"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/parts/li[def="Leg"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/parts/li[def="Leg"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_TentacledSlug.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_TentacledSlug.xml
new file mode 100644
index 0000000000..a611e67d9a
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_TentacledSlug.xml	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ====== TentacledSlug ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_TentacledSlug"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_TentacledSlug"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_TentacledSlug"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_TentacledSlug"]/corePart/parts/li[def="AA_Carapace"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_TentacledSlug"]/corePart/parts/li[def="AA_Carapace"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_TentacledSlug"]/corePart/parts/li[def="AA_Carapace"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Wasp.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Wasp.xml
new file mode 100644
index 0000000000..8f86ac750d
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Wasp.xml	
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ====== Wasp ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[def="AA_Thorax"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[def="AA_Thorax"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[def="AA_Thorax"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[def="Pronotum"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[def="Pronotum"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[def="Pronotum"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/parts/li[def="AA_InsectMouth"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/parts/li[def="AA_InsectMouth"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/parts/li[def="AA_InsectMouth"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[def="AA_Abdomen"]/parts/li[def="AA_InsectSting"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[def="AA_Abdomen"]/parts/li[def="AA_InsectSting"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[def="AA_Abdomen"]/parts/li[def="AA_InsectSting"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[def="AA_SmallInsectLeg"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[def="AA_SmallInsectLeg"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[def="AA_SmallInsectLeg"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[customLabel="left second leg"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[customLabel="left second leg"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[customLabel="left second leg"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[customLabel="right second leg"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[customLabel="right second leg"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[customLabel="right second leg"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_WingedQuadrupedAnimalWithPawsAndTail.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_WingedQuadrupedAnimalWithPawsAndTail.xml
new file mode 100644
index 0000000000..3988d9c110
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_WingedQuadrupedAnimalWithPawsAndTail.xml	
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ====== WingedQuadrupedAnimalWithPawsAndTail ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Tail"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Tail"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Tail"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Neck"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Neck"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Leg"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Leg"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Leg"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="AA_ReptileWing"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="AA_ReptileWing"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="AA_ReptileWing"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_WormWithArmor.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_WormWithArmor.xml
new file mode 100644
index 0000000000..2c1587981a
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_WormWithArmor.xml	
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ====== WormWithArmor ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_WormWithArmor"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_WormWithArmor"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_WormWithArmor"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_WormWithArmor"]/corePart/parts/li[def="AA_FirstWormSegment" or def="AA_SecondWormSegment" or def="AA_ThirdWormSegment" or def="AA_FourthWormSegment"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_WormWithArmor"]/corePart/parts/li[def="AA_FirstWormSegment" or def="AA_SecondWormSegment" or def="AA_ThirdWormSegment" or def="AA_FourthWormSegment"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_WormWithArmor"]/corePart/parts/li[def="AA_FirstWormSegment" or def="AA_SecondWormSegment" or def="AA_ThirdWormSegment" or def="AA_FourthWormSegment"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_WormWithArmor"]/corePart/parts/li[def="SnakeHead"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_WormWithArmor"]/corePart/parts/li[def="SnakeHead"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_WormWithArmor"]/corePart/parts/li[def="SnakeHead"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_WormWithArmor"]/corePart/parts/li[def="SnakeHead"]/parts/li[def="Jaw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_WormWithArmor"]/corePart/parts/li[def="SnakeHead"]/parts/li[def="Jaw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_WormWithArmor"]/corePart/parts/li[def="SnakeHead"]/parts/li[def="Jaw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_WormWithArmorAndTusks.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_WormWithArmorAndTusks.xml
new file mode 100644
index 0000000000..f6ab287b19
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_WormWithArmorAndTusks.xml	
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ====== WormWithArmorAndTusks ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_WormWithArmorAndTusks"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_WormWithArmorAndTusks"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_WormWithArmorAndTusks"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_WormWithArmorAndTusks"]/corePart/parts/li[def="AA_FirstWormSegment" or def="AA_SecondWormSegment" or def="AA_ThirdWormSegment" or def="AA_FourthWormSegment"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_WormWithArmorAndTusks"]/corePart/parts/li[def="AA_FirstWormSegment" or def="AA_SecondWormSegment" or def="AA_ThirdWormSegment" or def="AA_FourthWormSegment"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_WormWithArmorAndTusks"]/corePart/parts/li[def="AA_FirstWormSegment" or def="AA_SecondWormSegment" or def="AA_ThirdWormSegment" or def="AA_FourthWormSegment"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_WormWithArmorAndTusks"]/corePart/parts/li[def="SnakeHead"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_WormWithArmorAndTusks"]/corePart/parts/li[def="SnakeHead"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_WormWithArmorAndTusks"]/corePart/parts/li[def="SnakeHead"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_WormWithArmorAndTusks"]/corePart/parts/li[def="SnakeHead"]/parts/li[def="Jaw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_WormWithArmorAndTusks"]/corePart/parts/li[def="SnakeHead"]/parts/li[def="Jaw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_WormWithArmorAndTusks"]/corePart/parts/li[def="SnakeHead"]/parts/li[def="Jaw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AA_WormWithArmorAndTusks"]/corePart/parts/li[def="SnakeHead"]/parts/li[def="Jaw"]/parts/li[def="Tusk"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_WormWithArmorAndTusks"]/corePart/parts/li[def="SnakeHead"]/parts/li[def="Jaw"]/parts/li[def="Tusk"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AA_WormWithArmorAndTusks"]/corePart/parts/li[def="SnakeHead"]/parts/li[def="Jaw"]/parts/li[def="Tusk"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/DamageDef/AlphaAnimals_CE_Patch_DamageDef.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/DamageDef/AlphaAnimals_CE_Patch_DamageDef.xml
new file mode 100644
index 0000000000..8569c0e7d9
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/DamageDef/AlphaAnimals_CE_Patch_DamageDef.xml	
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/DamageDef[defName="AA_AcidSpit" or defName="AA_SecondaryAcidBurn" or defName="AA_PermanentBurn"]</xpath>
+		<value>
+			<li Class="CombatExtended.DamageDefExtensionCE">
+				<harmOnlyOutsideLayers>true</harmOnlyOutsideLayers>
+				<isAmbientDamage>true</isAmbientDamage>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Buffing some Hediffs -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="AA_ToxicSting" or
+			defName="AA_InfectedClaws" or
+			defName="AA_ToxicBite" or
+			defName="AA_ToxicBolt"]/additionalHediffs/li[hediff="AA_ToxicBuildup"]/severityPerDamageDealt </xpath>
+		<value>
+			<severityPerDamageDealt>0.01</severityPerDamageDealt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="AA_VeryToxicSting"]/additionalHediffs/li[hediff="AA_ToxicBuildup"]/severityPerDamageDealt</xpath>
+		<value>
+			<severityPerDamageDealt>0.03</severityPerDamageDealt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="AA_ParalysingBite"]/additionalHediffs/li[hediff="AA_Paralysis"]/severityPerDamageDealt</xpath>
+		<value>
+			<severityPerDamageDealt>0.02</severityPerDamageDealt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="AA_Electric"]/additionalHediffs/li[hediff="AA_Electric"]/severityPerDamageDealt</xpath>
+		<value>
+			<severityPerDamageDealt>0.025</severityPerDamageDealt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="AA_SwarmlingClaws"]/additionalHediffs/li[hediff="AA_SwarmlingImplantation"]/severityPerDamageDealt</xpath>
+		<value>
+			<severityPerDamageDealt>0.0003</severityPerDamageDealt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Misc/AA_Resource_CEStuff.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Misc/AA_Resource_CEStuff.xml
new file mode 100644
index 0000000000..d6c29225a4
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Misc/AA_Resource_CEStuff.xml	
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="AA_MeatMealBase"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_CactipineQuill"]/statBases</xpath>
+		<value>
+			<Bulk>0.1</Bulk>
+		</value>
+	</Operation>
+
+	<!-- ======== Red Wood ======== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GU_RedWood"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.99</cooldownTime>
+					<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="GU_RedWood"]/equippedStatOffsets</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="GU_RedWood"]</xpath>
+			<value>
+				<equippedStatOffsets>
+					<MeleeCritChance>0.2</MeleeCritChance>
+					<MeleeParryChance>1</MeleeParryChance>
+					<MeleeDodgeChance>0.13</MeleeDodgeChance>
+				</equippedStatOffsets>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationReplace">
+			<xpath>Defs/ThingDef[defName="GU_RedWood"]/equippedStatOffsets</xpath>
+			<value>
+				<equippedStatOffsets>
+					<MeleeCritChance>0.2</MeleeCritChance>
+					<MeleeParryChance>1</MeleeParryChance>
+					<MeleeDodgeChance>0.13</MeleeDodgeChance>
+				</equippedStatOffsets>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="GU_RedWood"]/statBases/Bulk</xpath>
+		<nomatch Class="PatchOperationReplace">
+			<xpath>Defs/ThingDef[defName="GU_RedWood"]/statBases</xpath>
+			<value>
+				<statBases>
+					<Bulk>0.07</Bulk>
+					<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
+					<StuffPower_Armor_Sharp>0.1</StuffPower_Armor_Sharp>
+					<StuffPower_Armor_Blunt>0.2</StuffPower_Armor_Blunt>
+					<StuffPower_Armor_Heat>0.025</StuffPower_Armor_Heat>
+					<MarketValue>1.2</MarketValue>
+					<MaxHitPoints>150</MaxHitPoints>
+					<Mass>0.4</Mass>
+					<Flammability>0.6</Flammability>
+					<DeteriorationRate>1</DeteriorationRate>
+					<SharpDamageMultiplier>0.7</SharpDamageMultiplier>
+					<BluntDamageMultiplier>0.5</BluntDamageMultiplier>
+				</statBases>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationReplace">
+			<xpath>Defs/ThingDef[defName="GU_RedWood"]/statBases</xpath>
+			<value>
+				<statBases>
+					<Bulk>0.07</Bulk>
+					<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
+					<StuffPower_Armor_Sharp>0.1</StuffPower_Armor_Sharp>
+					<StuffPower_Armor_Blunt>0.2</StuffPower_Armor_Blunt>
+					<StuffPower_Armor_Heat>0.025</StuffPower_Armor_Heat>
+					<MarketValue>1.2</MarketValue>
+					<MaxHitPoints>150</MaxHitPoints>
+					<Mass>0.4</Mass>
+					<Flammability>0.6</Flammability>
+					<DeteriorationRate>1</DeteriorationRate>
+					<SharpDamageMultiplier>0.7</SharpDamageMultiplier>
+					<BluntDamageMultiplier>0.5</BluntDamageMultiplier>
+				</statBases>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="GU_RedWood"]/stuffProps/statFactors/Mass</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="GU_RedWood"]/stuffProps/statFactors</xpath>
+			<value>
+				<Mass>0.3</Mass>
+				<MeleePenetrationFactor>0.3</MeleePenetrationFactor>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationReplace">
+			<xpath>Defs/ThingDef[defName="GU_RedWood"]/stuffProps/Mass</xpath>
+			<value>
+				<Mass>0.3</Mass>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GU_RedWood"]</xpath>
+		<value>
+			<li Class="CombatExtended.StuffToughnessMultiplierExtensionCE">
+				<toughnessMultiplier>5</toughnessMultiplier>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Gas.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Gas.xml
new file mode 100644
index 0000000000..2139c8719b
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Gas.xml	
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Adding CE's gas attributes to certain creatures, except OcularGas since it has a particular AA effect -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_RedGas" or
+			defName="AA_SandPuff" or
+			defName="AA_Filth_Slime" or
+			defName="AA_Filth_RedSlime" or
+			defName="AA_SmokeInk"
+			] </xpath>
+		<value>
+			<thingClass>CombatExtended.Smoke</thingClass>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_Projectiles.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_Projectiles.xml
new file mode 100644
index 0000000000..1b5167e392
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_Projectiles.xml	
@@ -0,0 +1,427 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ============== Changing Projectile's thingClass to CE ones ================ -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="AA_FrostWeb" or
+			defName="AA_FireWeb" or
+			defName="AA_AcidicWeb" or
+			defName="AA_ElectricBolt" or
+			defName="AA_FrostBolt"
+			]/thingClass </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="AA_AcidicWeb" or
+			defName="AA_Bullet_Barb" or
+			defName="AA_Bullet_VenomBarb" or
+			defName="AA_FireWeb" or
+			defName="AA_FrostWeb" or
+			defName="AA_Plasma" or
+			defName="AA_PoisonBolt" or
+			defName="AA_Quill" or
+			defName="AA_RedPoisonBolt" or
+			defName="AA_Web" or
+			defName="AA_FireSpit" or
+			defName="AA_DarkBolt" or
+			defName="AA_AcidBolt" or
+			defName="AA_ElectricBolt" or
+			defName="AA_WindBolt" or
+			defName="AA_FrostBolt"
+			] </xpath>
+		<value>
+			<thingClass>CombatExtended.BulletCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="AA_Bullet_Rock" or
+			defName="AA_ToxicInk" or
+			defName="AA_IncendiaryMote" or
+			defName="AA_FrostBolt"
+			]/thingClass </xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+
+	<!-- ============== Adding 'Standard' AimingAccuracy node to creatures' that use ranged attack statBases. =============== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="AA_Barbslinger" or
+			defName="AA_Blizzarisk" or
+			defName="AA_BlizzariskClutchMother" or
+			defName="AA_Cinderlisk" or
+			defName="AA_CrystallineCaracal" or
+			defName="AA_Dunealisk" or
+			defName="AA_DunealiskClutchMother" or
+			defName="AA_Darkbeast" or
+			defName="AA_Feralisk" or
+			defName="AA_FeraliskClutchMother" or
+			defName="AA_GreenGoo" or
+			defName="AA_InfectedAerofleet" or
+			defName="AA_Junglelisk" or
+			defName="AA_Mantrap" or
+			defName="AA_NightAve" or
+			defName="AA_Nightling" or
+			defName="AA_OcularJelly" or
+			defName="AA_Plasmorph" or
+			defName="AA_RedGoo" or
+			defName="AA_RedSpore" or
+			defName="AA_TetraSlug" or
+			defName="AA_Thermadon" or
+			defName="AA_Erin" or
+			defName="AA_Thunderbeast" or
+			defName="AA_WindBeast" or
+			defName="AA_FrostLynx"
+			]/statBases </xpath>
+		<value>
+			<AimingAccuracy>0.7</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!-- Different accuracy for spammy stuff -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Needlepost" or defName="AA_Needleroll"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.3</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!-- Different accuracy for Gallatross since his Projectile isn't directly under his control (it's just a random boulder he picks off the ground with his psionic abilities) -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Gallatross"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.6</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!-- =============== Now defining Projectiles in CE Procedure ============= -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Bullet_Barb"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>AA_ToxicBolt</damageDef>
+				<damageAmountBase>7</damageAmountBase>
+				<speed>31</speed>
+				<armorPenetrationSharp>1.5</armorPenetrationSharp>
+				<armorPenetrationBlunt>1.440</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_PoisonBolt"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>AA_ToxicBolt</damageDef>
+				<damageAmountBase>10</damageAmountBase>
+				<speed>27</speed>
+				<armorPenetrationSharp>2.5</armorPenetrationSharp>
+				<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_RedPoisonBolt"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>AA_ToxicBolt</damageDef>
+				<damageAmountBase>6</damageAmountBase>
+				<speed>27</speed>
+				<armorPenetrationSharp>1.5</armorPenetrationSharp>
+				<armorPenetrationBlunt>1.660</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Plasma"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>Flame</damageDef>
+				<damageAmountBase>25</damageAmountBase>
+				<speed>30</speed>
+				<armorPenetrationSharp>16</armorPenetrationSharp>
+				<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Quill"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>AA_ToxicBolt</damageDef>
+				<damageAmountBase>15</damageAmountBase>
+				<speed>19</speed>
+				<armorPenetrationSharp>1.5</armorPenetrationSharp>
+				<armorPenetrationBlunt>3</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Bullet_VenomBarb"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>AA_ToxicBolt</damageDef>
+				<damageAmountBase>7</damageAmountBase>
+				<speed>27</speed>
+				<armorPenetrationSharp>1.5</armorPenetrationSharp>
+				<armorPenetrationBlunt>1.440</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Bullet_Rock"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<explosionRadius>1.5</explosionRadius>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+				<damageDef>Bomb</damageDef>
+				<damageAmountBase>40</damageAmountBase>
+				<soundExplode>MortarBomb_Explode</soundExplode>
+				<speed>14</speed>
+				<armorPenetrationSharp>5</armorPenetrationSharp>
+				<armorPenetrationBlunt>25</armorPenetrationBlunt>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Bullet_Rock"]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_Fragments">
+					<fragments>
+						<Fragment_Small>16</Fragment_Small>
+						<Fragment_Large>3</Fragment_Large>
+					</fragments>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_FrostWeb"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>Frostbite</damageDef>
+				<damageAmountBase>5</damageAmountBase>
+				<speed>15</speed>
+				<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				<!-- Adding secondary damage with CE's Procedure instead of AA's AnimalProjectile -->
+				<secondaryDamage>
+					<li>
+						<def>Stun</def>
+						<amount>8</amount>
+						<chance>0.5</chance>
+					</li>
+				</secondaryDamage>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_FireWeb"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>Flame</damageDef>
+				<damageAmountBase>3</damageAmountBase>
+				<speed>15</speed>
+				<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				<!-- Adding secondary damage with CE's Procedure instead of AA's AnimalProjectile -->
+				<secondaryDamage>
+					<li>
+						<def>Stun</def>
+						<amount>8</amount>
+						<chance>0.5</chance>
+					</li>
+				</secondaryDamage>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_AcidicWeb"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>AA_AcidSpit</damageDef>
+				<damageAmountBase>5</damageAmountBase>
+				<speed>15</speed>
+				<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				<!-- Adding secondary damage with CE's Procedure instead of AA's AnimalProjectile -->
+				<secondaryDamage>
+					<li>
+						<def>Stun</def>
+						<amount>8</amount>
+						<chance>0.5</chance>
+					</li>
+				</secondaryDamage>
+			</projectile>
+		</value>
+	</Operation>
+
+	<!-- ======== Note: AA_ExplodingWeb wasn't used in any Race, so it wasn't included. If it gets added, just add a secondaryDamage to the corresponding projectile, with the Bomb damageDef ======== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Web"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>Stun</damageDef>
+				<damageAmountBase>15</damageAmountBase>
+				<speed>15</speed>
+				<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_IncendiaryMote"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>20</speed>
+				<damageDef>Flame</damageDef>
+				<damageAmountBase>8</damageAmountBase>
+				<explosionRadius>1.1</explosionRadius>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+				<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
+				<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
+				<ai_IsIncendiary>true</ai_IsIncendiary>
+				<soundExplode>Interact_Ignite</soundExplode>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_ToxicInk"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>25</speed>
+				<damageDef>AA_ToxicBolt</damageDef>
+				<damageAmountBase>40</damageAmountBase>
+				<explosionRadius>3</explosionRadius>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+				<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+				<soundExplode>MortarBomb_Explode</soundExplode>
+				<soundAmbient>MortarRound_Ambient</soundAmbient>
+				<postExplosionSpawnThingDef>AA_SmokeInk</postExplosionSpawnThingDef>
+				<postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
+				<postExplosionSpawnChance>1</postExplosionSpawnChance>
+				<armorPenetrationSharp>12</armorPenetrationSharp>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_FireSpit"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>Flame</damageDef>
+				<damageAmountBase>4</damageAmountBase>
+				<speed>15</speed>
+				<ai_IsIncendiary>true</ai_IsIncendiary>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_AcidBolt"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>AA_AcidSpit</damageDef>
+				<damageAmountBase>5</damageAmountBase>
+				<speed>36</speed>
+				<armorPenetrationSharp>7</armorPenetrationSharp>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_DarkBolt"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>Flame</damageDef>
+				<damageAmountBase>10</damageAmountBase>
+				<speed>36</speed>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_ElectricBolt"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>AA_Electric</damageDef>
+				<damageAmountBase>12</damageAmountBase>
+				<speed>50</speed>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_WindBolt"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>Blunt</damageDef>
+				<damageAmountBase>18</damageAmountBase>
+				<speed>35</speed>
+			</projectile>
+		</value>
+	</Operation>
+
+	<!-- Windbolt uses an unsupported graphics class. -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_WindBolt"]/graphicData</xpath>
+		<value>
+			<graphicData>
+				<texPath>Things/Pawn/Animal/AA_ArcticLion/AA_ArcticLion_Invisible</texPath>
+				<graphicClass>Graphic_Single</graphicClass>
+			</graphicData>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_FrostBolt"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<explosionDelay>1</explosionDelay>
+				<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
+				<explosionRadius>2.9</explosionRadius>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+				<damageDef>AA_FrostBomb</damageDef>
+				<damageAmountBase>14</damageAmountBase>
+				<postExplosionSpawnThingDef>AA_FrostPuff</postExplosionSpawnThingDef>
+				<postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
+				<postExplosionSpawnChance>1</postExplosionSpawnChance>
+				<speed>28</speed>
+			</projectile>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_Resources_Leathers.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_Resources_Leathers.xml
new file mode 100644
index 0000000000..2a616caf21
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_Resources_Leathers.xml	
@@ -0,0 +1,327 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Remove GallatrossHorn as a weapon -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="AA_GallatrossHorn"]/tools</xpath>
+	</Operation>
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="AA_GallatrossHorn"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>ResourceBase</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_GallatrossHorn"]/description</xpath>
+		<value>
+			<description>A single horn of the mighty Gallatross. Proof that you're a warrior worthy of the title of Aberration Killer. Traders and collectors might pay a high price for this.</description>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_GallatrossHorn"]/statBases/MarketValue</xpath>
+		<value>
+			<MarketValue>1800</MarketValue>
+		</value>
+	</Operation>
+
+	<!-- SkySteel -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_SkySteel"]/statBases</xpath>
+		<value>
+			<Bulk>0.025</Bulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_SkySteel"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>0.9</Mass>
+			<MeleePenetrationFactor>1.10</MeleePenetrationFactor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="AA_SkySteel"]/statBases/SharpDamageMultiplier</xpath>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_SkySteel"]/stuffProps/categories</xpath>
+		<value>
+			<li>Metallic_Weapon</li>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_SkySteel"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.35</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_SkySteel"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>2.0</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_SkySteel"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>-0.05</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<!-- Nehemoth leather -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Leather_Behemoth"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.5</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Leather_Behemoth"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.3</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!--aerofleet stuff and plant leather -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Leather_Aerofleet"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.03</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Leather_Aerofleet"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.032</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Cactus"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.05</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Leather_Cactus"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.04</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Lion Leather -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_ArcticLion_Leather" or defName="AA_SandLion_Leather"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.1</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_ArcticLion_Leather" or defName="AA_SandLion_Leather"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.08</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Night Leather -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Night"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.01</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Leather_Night"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.08</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Chitin stuff-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Chitin"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.15</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_BlackChitin"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.5</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_BlackChitin"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.16</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Leather_Chitin"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.08</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_RaptorPlates" or defName="Leather_IronChitin"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.36</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Leather_RaptorPlates" or defName="Leather_IronChitin"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.09</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Gallatross Leather-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Gallatross"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.9</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Gallatross"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.125</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!--Chameleon Yak -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_ChameleonYakWoolDesert" or defName="AA_ChameleonYakWoolTemperate"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.06</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_ChameleonYakWoolDesert" or defName="AA_ChameleonYakWoolTemperate"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.05</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_ChameleonYakWoolJungle"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.12</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_ChameleonYakWoolJungle"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.08</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_ChameleonYakWoolWinter"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.04</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_ChameleonYakWoolWinter"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.05</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- CinderSilk -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_CinderSilk"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.2</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_CinderSilk"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.05</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_CinderSilk"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.02</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_CinderSilk"]/stuffProps/categories</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_CinderSilk"]/stuffProps</xpath>
+			<value>
+				<categories>
+					<li>SoftArmor</li>
+				</categories>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_CinderSilk"]/stuffProps/categories</xpath>
+			<value>
+				<li>SoftArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<!-- MothSilk -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_MothSilk"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.32</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_MothSilk"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.09</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_MothSilk"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.015</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_MothSilk"]/stuffProps/categories</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_MothSilk"]/stuffProps</xpath>
+			<value>
+				<categories>
+					<li>SoftArmor</li>
+				</categories>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_MothSilk"]/stuffProps/categories</xpath>
+			<value>
+				<li>SoftArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<!-- Wools -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_GreyCoatedMouflonWool" or defName="AA_GiantCrownedSilkieSilk"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.01</StuffPower_Armor_Sharp>
+			<StuffPower_Armor_Blunt>0.045</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_NightWool"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.04</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_NightWool"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.05</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_NightWool"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.06</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_VerbShootCE.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_VerbShootCE.xml
new file mode 100644
index 0000000000..c4bee251e0
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_VerbShootCE.xml	
@@ -0,0 +1,811 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Syntax
+		<li Class="PatchOperationReplace">
+			<xpath>Defs/ThingDef[defName=""]/verbs</xpath>
+				<value>
+					<verbs>
+						<li Class="CombatExtended.VerbPropertiesCE">
+							<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+							...
+						</li>
+					</verbs>
+				</value>
+		</li>
+	-->
+
+	<!-- Black Hive Insects -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_BlackSpelopede"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AA_PoisonBolt</defaultProjectile>
+					<warmupTime>2.4</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>2</minRange>
+					<range>20</range>
+					<soundCast>AA_PoisonBolt</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>venomous spit</label>
+					<commonality>0.8</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_BlackSpider"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AA_PoisonBolt</defaultProjectile>
+					<warmupTime>1.6</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>1.9</minRange>
+					<range>32</range>
+					<soundCast>AA_PoisonBolt</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>venomous spit</label>
+					<commonality>0.8</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Barbslinger -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Barbslinger"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AA_Bullet_Barb</defaultProjectile>
+					<warmupTime>2</warmupTime>
+					<burstShotCount>3</burstShotCount>
+					<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+					<minRange>2</minRange>
+					<range>18</range>
+					<soundCast>AA_DartSound</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>barbed quills</label>
+					<commonality>0.8</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Animalisk -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Animalisk"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AA_Web</defaultProjectile>
+					<warmupTime>2</warmupTime>
+					<burstShotCount>3</burstShotCount>
+					<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+					<minRange>1</minRange>
+					<range>16</range>
+					<soundCast>AA_Throw</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>web</label>
+					<commonality>0.8</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Blizzarisk and Blizzarisk mom -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Blizzarisk"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AA_FrostWeb</defaultProjectile>
+					<warmupTime>2</warmupTime>
+					<burstShotCount>3</burstShotCount>
+					<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+					<minRange>1</minRange>
+					<range>15</range>
+					<soundCast>AA_Throw</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>frost web</label>
+					<commonality>0.8</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_BlizzariskClutchMother"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AA_FrostWeb</defaultProjectile>
+					<warmupTime>2</warmupTime>
+					<burstShotCount>3</burstShotCount>
+					<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+					<minRange>1</minRange>
+					<range>20</range>
+					<soundCast>AA_Throw</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>frost web</label>
+					<commonality>0.8</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Cinderlisk"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AA_FireWeb</defaultProjectile>
+					<warmupTime>2</warmupTime>
+					<burstShotCount>2</burstShotCount>
+					<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+					<minRange>2</minRange>
+					<range>16</range>
+					<soundCast>AA_Throw</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>fire web</label>
+					<commonality>0.8</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Dunealisk and Dunemom -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Dunealisk"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AA_BurnWeb</defaultProjectile>
+					<warmupTime>2</warmupTime>
+					<burstShotCount>3</burstShotCount>
+					<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+					<minRange>2</minRange>
+					<range>15</range>
+					<soundCast>AA_Throw</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>fire web</label>
+					<commonality>0.8</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_DunealiskClutchMother"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AA_BurnWeb</defaultProjectile>
+					<warmupTime>2</warmupTime>
+					<burstShotCount>3</burstShotCount>
+					<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+					<minRange>2</minRange>
+					<range>20</range>
+					<soundCast>AA_Throw</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>fire web</label>
+					<commonality>0.8</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Feralisk and Fera-san -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Feralisk"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AA_Web</defaultProjectile>
+					<warmupTime>2</warmupTime>
+					<burstShotCount>3</burstShotCount>
+					<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+					<minRange>1</minRange>
+					<range>15</range>
+					<soundCast>AA_Throw</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>web</label>
+					<commonality>0.8</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_FeraliskClutchMother"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AA_Web</defaultProjectile>
+					<warmupTime>2</warmupTime>
+					<burstShotCount>3</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>1</minRange>
+					<range>20</range>
+					<soundCast>AA_Throw</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>web</label>
+					<commonality>0.8</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Gallatross -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Gallatross"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AA_Bullet_Rock</defaultProjectile>
+					<warmupTime>2.5</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>1</minRange>
+					<range>30</range>
+					<soundCast>AA_RockThrow</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+					<commonality>1</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Gallatross Mounribound-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_GallatrossMoribund"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AA_Bullet_Rock</defaultProjectile>
+					<warmupTime>2.5</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>1</minRange>
+					<range>30</range>
+					<soundCast>AA_RockThrow</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+					<commonality>1</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Green Goo -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_GreenGoo"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AA_PoisonBolt</defaultProjectile>
+					<warmupTime>1.5</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>2</minRange>
+					<range>20</range>
+					<soundCast>AA_PoisonBolt</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>venomous spit</label>
+					<commonality>0.6</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Infected Aerofleet -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_InfectedAerofleet"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AA_RedPoisonBolt</defaultProjectile>
+					<warmupTime>1.5</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>2</minRange>
+					<range>15</range>
+					<soundCast>AA_PoisonBolt</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>venomous spit</label>
+					<commonality>0.6</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Junglelisk -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Junglelisk"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AA_AcidicWeb</defaultProjectile>
+					<warmupTime>2</warmupTime>
+					<burstShotCount>2</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>1</minRange>
+					<range>16</range>
+					<soundCast>AA_Throw</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>acidic web</label>
+					<commonality>0.8</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Mantrap -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Mantrap"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AA_AcidBolt</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>2</minRange>
+					<range>14</range>
+					<soundCast>AA_PoisonBolt</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>acidic spit</label>
+					<commonality>0.8</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- NeedlePost -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Needlepost"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AA_Bullet_VenomBarb</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<burstShotCount>6</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>2</minRange>
+					<range>18</range>
+					<soundCast>AA_DartSound</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>venomous barb</label>
+					<commonality>0.99</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Needleroll -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Needleroll"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AA_Bullet_VenomBarb</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<burstShotCount>3</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>2</minRange>
+					<range>14</range>
+					<soundCast>AA_DartSound</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>venomous barb</label>
+					<commonality>0.99</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- NightAve -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_NightAve"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AA_Quill</defaultProjectile>
+					<warmupTime>1</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>2</minRange>
+					<range>12</range>
+					<soundCast>AA_DartSound</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>barbed quills</label>
+					<commonality>0.6</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Nightling -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Nightling"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AA_Quill</defaultProjectile>
+					<warmupTime>2</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>2</minRange>
+					<range>18</range>
+					<soundCast>AA_DartSound</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>barbed quills</label>
+					<commonality>0.8</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Glassy Cat -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_CrystallineCaracal"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AA_FireSpit</defaultProjectile>
+					<warmupTime>3</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<minRange>1.0</minRange>
+					<range>15</range>
+					<soundCast>AA_LaserBullet</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>laser</label>
+					<commonality>0.8</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- OcularJelly -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_OcularJelly"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AA_RedPoisonBolt</defaultProjectile>
+					<warmupTime>1.5</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>2</minRange>
+					<range>20</range>
+					<soundCast>AA_PoisonBolt</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>venomous spit</label>
+					<commonality>0.6</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- RedGoo -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_RedGoo"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AA_RedPoisonBolt</defaultProjectile>
+					<warmupTime>1.5</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>2</minRange>
+					<range>20</range>
+					<soundCast>AA_PoisonBolt</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>venomous spit</label>
+					<commonality>0.6</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Plasmorph -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Plasmorph"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AA_FireSpit</defaultProjectile>
+					<warmupTime>2.5</warmupTime>
+					<burstShotCount>4</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>2</minRange>
+					<range>11</range>
+					<soundCast>AA_FireSpit</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>fire spit</label>
+					<commonality>0.9</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- RedSpore -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_RedSpore"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AA_RedPoisonBolt</defaultProjectile>
+					<warmupTime>1.5</warmupTime>
+					<burstShotCount>4</burstShotCount>
+					<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+					<minRange>2</minRange>
+					<range>30</range>
+					<soundCast>AA_PoisonBolt</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>venomous spit</label>
+					<commonality>0.9</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- TetraSlug -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_TetraSlug"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AA_Plasma</defaultProjectile>
+					<warmupTime>3.6</warmupTime>
+					<burstShotCount>4</burstShotCount>
+					<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+					<minRange>2</minRange>
+					<range>20</range>
+					<soundCast>AA_Plasma</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>quad tesla cannon</label>
+					<commonality>1</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Thermadon -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Thermadon"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AA_IncendiaryMote</defaultProjectile>
+					<warmupTime>2</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>2</minRange>
+					<range>25</range>
+					<soundCast>AA_PoisonBolt</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>thermal detonating spit</label>
+					<commonality>0.9</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Dark Beast -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Darkbeast"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AA_DarkBolt</defaultProjectile>
+					<warmupTime>2.5</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<minRange>3</minRange>
+					<range>20</range>
+					<soundCast>AA_ElectricBolt</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>dark bolt</label>
+					<commonality>0.8</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Erin -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Erin"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AA_AcidicVomit_CE</defaultProjectile>
+					<warmupTime>2.6</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<minRange>1</minRange>
+					<range>8</range>
+					<soundCast>AA_PoisonBolt</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>acidic vomit</label>
+					<commonality>0.8</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Thunderbeast -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Thunderbeast"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AA_ElectricBolt</defaultProjectile>
+					<warmupTime>2.6</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<range>18</range>
+					<soundCast>AA_ElectricBolt</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>electric bolt</label>
+					<commonality>0.8</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Windbeast -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_WindBeast"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AA_WindBolt</defaultProjectile>
+					<warmupTime>2.6</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<range>26</range>
+					<soundCast>AA_WindBolt</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>wind blast</label>
+					<commonality>0.8</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- FrostLynx -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_FrostLynx"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AA_FrostBolt</defaultProjectile>
+					<warmupTime>2.6</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<range>26</range>
+					<soundCast>AA_FrostBolt</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>frost bolt</label>
+					<commonality>0.8</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Behemoth -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Behemoth"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AA_FlameBreathAnimated_CE</defaultProjectile>
+					<warmupTime>2</warmupTime>
+					<range>31</range>
+					<minRange>2</minRange>
+					<soundCast>FO_FlameBreathSound</soundCast>
+					<muzzleFlashScale>2</muzzleFlashScale>
+					<label>flame breath</label>
+					<commonality>1</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_VerbShootCE_Ideology.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_VerbShootCE_Ideology.xml
new file mode 100644
index 0000000000..62b493d68d
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_VerbShootCE_Ideology.xml	
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Ideology</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!-- Unblinking Eye -->
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_UnblinkingEye"]/verbs</xpath>
+					<value>
+						<verbs>
+							<li Class="CombatExtended.VerbPropertiesCE">
+								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+								<hasStandardCommand>true</hasStandardCommand>
+								<defaultProjectile>AA_AcidicVomit_CE</defaultProjectile>
+								<warmupTime>1.6</warmupTime>
+								<burstShotCount>1</burstShotCount>
+								<minRange>2</minRange>
+								<range>40</range>
+								<label>melting gaze</label>
+								<muzzleFlashScale>0</muzzleFlashScale>
+								<commonality>1</commonality>
+							</li>
+						</verbs>
+					</value>
+				</li>
+
+				<!-- Spitter Dryad -->
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_Dryad_Spitter"]/verbs</xpath>
+					<value>
+						<verbs>
+							<li Class="CombatExtended.VerbPropertiesCE">
+								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+								<hasStandardCommand>true</hasStandardCommand>
+								<defaultProjectile>AA_PoisonBolt</defaultProjectile>
+								<warmupTime>1.5</warmupTime>
+								<burstShotCount>1</burstShotCount>
+								<minRange>2</minRange>
+								<range>44</range>
+								<soundCast>AA_PoisonBolt</soundCast>
+								<muzzleFlashScale>0</muzzleFlashScale>
+								<label>venomous spit</label>
+								<commonality>.8</commonality>
+							</li>
+						</verbs>
+					</value>
+				</li>
+
+				<!-- Ocular Nightling -->
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_OcularNightling"]/verbs</xpath>
+					<value>
+						<verbs>
+							<li Class="CombatExtended.VerbPropertiesCE">
+								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+								<hasStandardCommand>true</hasStandardCommand>
+								<defaultProjectile>AA_Quill</defaultProjectile>
+								<warmupTime>2</warmupTime>
+								<burstShotCount>1</burstShotCount>
+								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+								<minRange>2</minRange>
+								<range>18</range>
+								<soundCast>AA_DartSound</soundCast>
+								<muzzleFlashScale>0</muzzleFlashScale>
+								<commonality>0.8</commonality>
+							</li>
+						</verbs>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Misc/Alpha_Hediffs.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Misc/Alpha_Hediffs.xml
new file mode 100644
index 0000000000..f7b887a9d9
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Misc/Alpha_Hediffs.xml	
@@ -0,0 +1,423 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AA_BurrowingUnderSand"]/stages/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ArmorRating_Sharp>3</ArmorRating_Sharp>
+				<ArmorRating_Blunt>4.5</ArmorRating_Blunt>
+			</statOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AA_AnoleGrown"]/stages/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
+				<ArmorRating_Blunt>1.0</ArmorRating_Blunt>
+			</statOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AA_AnoleGrown"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools/li</xpath>
+		<value>
+			<li Class="CombatExtended.ToolCE">
+				<label>claws</label>
+				<capacities>
+					<li>Scratch</li>
+				</capacities>
+				<power>22</power>
+				<cooldownTime>1.33</cooldownTime>
+				<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
+				<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
+				<armorPenetrationSharp>0.75</armorPenetrationSharp>
+				<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AA_EatenACorpse"]/stages/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
+				<ArmorRating_Blunt>1.25</ArmorRating_Blunt>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<!-- ==== AA_Gigantelope Weights ==== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="AA_CarryWeight1"]/stages/li/statOffsets</xpath>
+		<value>
+			<CarryWeight>1</CarryWeight>
+			<CarryBulk>1</CarryBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="AA_CarryWeight2"]/stages/li/statOffsets</xpath>
+		<value>
+			<CarryWeight>5</CarryWeight>
+			<CarryBulk>5</CarryBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="AA_CarryWeight3"]/stages/li/statOffsets</xpath>
+		<value>
+			<CarryWeight>7</CarryWeight>
+			<CarryBulk>7</CarryBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="AA_CarryWeight4"]/stages/li/statOffsets</xpath>
+		<value>
+			<CarryWeight>10</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="AA_CarryWeight5"]/stages/li/statOffsets</xpath>
+		<value>
+			<CarryWeight>15</CarryWeight>
+			<CarryBulk>15</CarryBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="AA_CarryWeight6"]/stages/li/statOffsets</xpath>
+		<value>
+			<CarryWeight>20</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="AA_CarryWeight7"]/stages/li/statOffsets</xpath>
+		<value>
+			<CarryWeight>30</CarryWeight>
+			<CarryBulk>30</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>A Dog Said... Animal Prosthetics</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!--=============== Non-ranged implants ====================-->
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[defName="AA_ProstheticTentacle"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>prosthetic tentacle</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>8</power>
+								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+								<cooldownTime>1.8</cooldownTime>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[defName="AA_BionicTentacle"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>bionic tentacle</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>20</power>
+								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+								<cooldownTime>1.4</cooldownTime>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[defName="AA_ProstheticBeak"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>prosthetic beak</label>
+								<capacities>
+									<li>Bite</li>
+								</capacities>
+								<power>8</power>
+								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+								<armorPenetrationSharp>0.5</armorPenetrationSharp>
+								<cooldownTime>1.8</cooldownTime>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[defName="AA_BionicBeak"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>bionic beak</label>
+								<capacities>
+									<li>Bite</li>
+								</capacities>
+								<power>20</power>
+								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+								<armorPenetrationSharp>1.0</armorPenetrationSharp>
+								<cooldownTime>1.4</cooldownTime>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[defName="AA_ProstheticShell"]/stages</xpath>
+					<value>
+						<stages>
+							<li>
+								<statOffsets>
+									<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+									<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
+									<ArmorRating_Heat>0.025</ArmorRating_Heat>
+								</statOffsets>
+							</li>
+						</stages>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[defName="AA_BionicShell"]/stages</xpath>
+					<value>
+						<stages>
+							<li>
+								<statOffsets>
+									<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+									<ArmorRating_Blunt>1.0</ArmorRating_Blunt>
+									<ArmorRating_Heat>0.05</ArmorRating_Heat>
+								</statOffsets>
+							</li>
+						</stages>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[defName="AB_SimpleProstheticClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>simple prosthetic claw</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>6</power>
+								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+								<armorPenetrationSharp>0.3</armorPenetrationSharp>
+								<cooldownTime>1.8</cooldownTime>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[defName="AB_BionicClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>bionic claw</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>15</power>
+								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+								<armorPenetrationSharp>0.7</armorPenetrationSharp>
+								<cooldownTime>1.4</cooldownTime>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<!--=============== Ranged implants ====================-->
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[defName="AA_RangedSpinneretImplant"]/comps/li[@Class="MVCF.Comps.HediffCompProperties_ExtendedVerbGiver"]/verbs</xpath>
+					<value>
+						<verbs>
+							<li Class="CombatExtended.VerbPropertiesCE">
+								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+								<hasStandardCommand>true</hasStandardCommand>
+								<defaultProjectile>AA_Web</defaultProjectile>
+								<warmupTime>2</warmupTime>
+								<burstShotCount>3</burstShotCount>
+								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+								<minRange>1</minRange>
+								<range>20</range>
+								<soundCast>AA_Throw</soundCast>
+								<muzzleFlashScale>0</muzzleFlashScale>
+								<label>web</label>
+								<commonality>0.8</commonality>
+							</li>
+						</verbs>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[defName="AA_VenomousSpitterImplant"]/comps/li[@Class="MVCF.Comps.HediffCompProperties_ExtendedVerbGiver"]/verbs</xpath>
+					<value>
+						<verbs>
+							<li Class="CombatExtended.VerbPropertiesCE">
+								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+								<hasStandardCommand>true</hasStandardCommand>
+								<defaultProjectile>AA_PoisonBolt</defaultProjectile>
+								<warmupTime>1.6</warmupTime>
+								<burstShotCount>1</burstShotCount>
+								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+								<minRange>2.0</minRange>
+								<range>30</range>
+								<soundCast>AA_PoisonBolt</soundCast>
+								<muzzleFlashScale>0</muzzleFlashScale>
+								<label>venomous spit</label>
+								<commonality>0.8</commonality>
+							</li>
+						</verbs>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[defName="AA_AcidicSpitterImplant"]/comps/li[@Class="MVCF.Comps.HediffCompProperties_ExtendedVerbGiver"]/verbs</xpath>
+					<value>
+						<verbs>
+							<li Class="CombatExtended.VerbPropertiesCE">
+								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+								<hasStandardCommand>true</hasStandardCommand>
+								<defaultProjectile>AA_AcidBolt</defaultProjectile>
+								<warmupTime>1.6</warmupTime>
+								<burstShotCount>1</burstShotCount>
+								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+								<minRange>2</minRange>
+								<range>20</range>
+								<soundCast>AA_PoisonBolt</soundCast>
+								<muzzleFlashScale>0</muzzleFlashScale>
+								<label>acidic spit</label>
+								<commonality>0.8</commonality>
+							</li>
+						</verbs>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[defName="AA_BarbedQuillThrowerImplant"]/comps/li[@Class="MVCF.Comps.HediffCompProperties_ExtendedVerbGiver"]/verbs</xpath>
+					<value>
+						<verbs>
+							<li Class="CombatExtended.VerbPropertiesCE">
+								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+								<hasStandardCommand>true</hasStandardCommand>
+								<defaultProjectile>AA_Quill</defaultProjectile>
+								<warmupTime>2</warmupTime>
+								<burstShotCount>1</burstShotCount>
+								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+								<minRange>2</minRange>
+								<range>20</range>
+								<soundCast>AA_DartSound</soundCast>
+								<muzzleFlashScale>0</muzzleFlashScale>
+								<label>barbed quills</label>
+								<commonality>0.8</commonality>
+							</li>
+						</verbs>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[defName="AA_QuadTeslaCannonImplant"]/comps/li[@Class="MVCF.Comps.HediffCompProperties_ExtendedVerbGiver"]/verbs</xpath>
+					<value>
+						<verbs>
+							<li Class="CombatExtended.VerbPropertiesCE">
+								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+								<hasStandardCommand>true</hasStandardCommand>
+								<defaultProjectile>AA_Plasma</defaultProjectile>
+								<warmupTime>4.0</warmupTime>
+								<burstShotCount>4</burstShotCount>
+								<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+								<minRange>2</minRange>
+								<range>20</range>
+								<soundCast>AA_Plasma</soundCast>
+								<muzzleFlashScale>0</muzzleFlashScale>
+								<label>quad tesla cannon</label>
+								<commonality>1</commonality>
+							</li>
+						</verbs>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[defName="AA_BioelectricOrganImplant"]/comps/li[@Class="MVCF.Comps.HediffCompProperties_ExtendedVerbGiver"]/verbs</xpath>
+					<value>
+						<verbs>
+							<li Class="CombatExtended.VerbPropertiesCE">
+								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+								<hasStandardCommand>true</hasStandardCommand>
+								<defaultProjectile>AA_ElectricBolt</defaultProjectile>
+								<warmupTime>2.6</warmupTime>
+								<burstShotCount>1</burstShotCount>
+								<range>15</range>
+								<soundCast>AA_ElectricBolt</soundCast>
+								<muzzleFlashScale>0</muzzleFlashScale>
+								<label>electric bolt</label>
+								<commonality>0.8</commonality>
+							</li>
+						</verbs>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[defName="AA_LightFocusingLensImplant"]/comps/li[@Class="MVCF.Comps.HediffCompProperties_ExtendedVerbGiver"]/verbs</xpath>
+					<value>
+						<verbs>
+							<li Class="CombatExtended.VerbPropertiesCE">
+								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+								<hasStandardCommand>true</hasStandardCommand>
+								<defaultProjectile>AA_LaserBullet</defaultProjectile>
+								<warmupTime>3</warmupTime>
+								<burstShotCount>1</burstShotCount>
+								<minRange>1.0</minRange>
+								<range>10</range>
+								<soundCast>AA_LaserBullet</soundCast>
+								<muzzleFlashScale>0</muzzleFlashScale>
+								<label>laser</label>
+								<commonality>0.8</commonality>
+							</li>
+						</verbs>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[defName="AA_HyperAcidicStomachImplant"]/comps/li[@Class="MVCF.Comps.HediffCompProperties_ExtendedVerbGiver"]/verbs</xpath>
+					<value>
+						<verbs>
+							<li Class="CombatExtended.VerbPropertiesCE">
+								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+								<hasStandardCommand>true</hasStandardCommand>
+								<defaultProjectile>AA_AcidicVomit_CE</defaultProjectile>
+								<warmupTime>3.0</warmupTime>
+								<burstShotCount>1</burstShotCount>
+								<minRange>1</minRange>
+								<range>7</range>
+								<soundCast>AA_PoisonBolt</soundCast>
+								<muzzleFlashScale>0</muzzleFlashScale>
+								<label>acidic vomit</label>
+								<commonality>0.8</commonality>
+							</li>
+						</verbs>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Aerofleet.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Aerofleet.xml
new file mode 100644
index 0000000000..c52ba7c684
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Aerofleet.xml	
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Aerofleet"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Aerofleet"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.36</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>0</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Aerofleet"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2.5</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.035</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.01</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>tentacles</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Arms</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_ColossalAerofleet"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_ColossalAerofleet"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.16</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0.11</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_ColossalAerofleet"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>2.5</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.0</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>tentacles</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Arms</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.015</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Agaripawn.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Agaripawn.xml
new file mode 100644
index 0000000000..26078e3761
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Agaripawn.xml	
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Agaripawn"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Agaripawn"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Agaripawn"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Agaripawn"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.07</MeleeDodgeChance>
+			<MeleeCritChance>0.04</MeleeCritChance>
+			<MeleeParryChance>0.11</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Agaripawn"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left paw</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>13</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right paw</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>13</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Agaripod.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Agaripod.xml
new file mode 100644
index 0000000000..4cde3137fb
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Agaripod.xml	
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Agaripod"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Agaripod"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>50</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Agaripod"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Agaripod"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.06</MeleeDodgeChance>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.28</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Agaripod"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left paw</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right paw</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.21</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_AmoebaHuge.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_AmoebaHuge.xml
new file mode 100644
index 0000000000..6df85b0d11
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_AmoebaHuge.xml	
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_AcanthamoebaGiganteaHuge"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_AcanthamoebaGiganteaHuge"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.3</MeleeCritChance>
+			<MeleeParryChance>0.00</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_AcanthamoebaGiganteaHuge"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>pseudopods</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Arms</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Amoebachungus.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Amoebachungus.xml
new file mode 100644
index 0000000000..ff74c8b81a
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Amoebachungus.xml	
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_AcanthamoebaGiganteaLarge"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_AcanthamoebaGiganteaLarge"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.00</MeleeCritChance>
+			<MeleeParryChance>0.00</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_AcanthamoebaGiganteaLarge"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>pseudopods</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Arms</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Amoebasmol.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Amoebasmol.xml
new file mode 100644
index 0000000000..a1fe71cafd
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Amoebasmol.xml	
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_AcanthamoebaGiganteaSmall"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_AcanthamoebaGiganteaSmall"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.00</MeleeCritChance>
+			<MeleeParryChance>0.00</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_AcanthamoebaGiganteaSmall"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>pseudopods</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Arms</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_AngelaMorthal.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_AngelaMorthal.xml
new file mode 100644
index 0000000000..30c77e4bd1
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_AngelaMorthal.xml	
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Larval Angle Moth -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_AngelMothLarva"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_AngelMothLarva"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.00</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_AngelMothLarva"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_AngelMoth"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_AngelMoth"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<!-- Atispec -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_AngelMoth"]/tools</xpath>
+		<value>
+			<tools>
+
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Animalisk.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Animalisk.xml
new file mode 100644
index 0000000000..760c57e05a
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Animalisk.xml	
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Animalisk"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Animalisk"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Animalisk"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Animalisk"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.28</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Animalisk"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left first leg</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.68</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right first leg</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.68</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>AA_ToxicSting</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.55</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_Animalisk"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_Animalisk"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Animalisk"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>550</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Animus_Vox.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Animus_Vox.xml
new file mode 100644
index 0000000000..26b7acfc0c
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Animus_Vox.xml	
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_AnimusVox"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_AnimusVox"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.36</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_AnimusVox"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.9</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.18</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.9</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.18</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Arctic_Lion.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Arctic_Lion.xml
new file mode 100644
index 0000000000..a7e7539fd6
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Arctic_Lion.xml	
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_ArcticLion"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_ArcticLion"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			<MeleeCritChance>0.34</MeleeCritChance>
+			<MeleeParryChance>0.14</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_ArcticLion"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Cut</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>25</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.95</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Cut</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>25</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.95</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+						<li>Stab</li>
+					</capacities>
+					<power>34</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>4.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.75</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Atispec.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Atispec.xml
new file mode 100644
index 0000000000..61d25e6dbb
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Atispec.xml	
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Larval Atispec -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_LarvalAtispec"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_LarvalAtispec"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.00</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_LarvalAtispec"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Atispec"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Atispec"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>9</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Atispec"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Atispec"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>5</MoveSpeed>
+			<MeleeDodgeChance>0.35</MeleeDodgeChance>
+			<MeleeCritChance>0.24</MeleeCritChance>
+			<MeleeParryChance>0.40</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Atispec"]/comps</xpath>
+		<value>
+			<li Class="AnimalBehaviours.CompProperties_InitialHediff">
+				<hediffname>AA_LowBleed</hediffname>
+				<hediffseverity>1</hediffseverity>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Atispec -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Atispec"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>1.88</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>1.88</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>AA_VeryToxicSting</li>
+					</capacities>
+					<cooldownTime>2.45</cooldownTime>
+					<power>40</power>
+					<linkedBodyPartsGroup>AA_Sting</linkedBodyPartsGroup>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationSharp>12</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<chanceFactor>0.1</chanceFactor>
+					<armorPenetrationSharp>4</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_Atispec"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_Atispec"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Atispec"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>6750</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_AuroraSylph.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_AuroraSylph.xml
new file mode 100644
index 0000000000..9265c12325
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_AuroraSylph.xml	
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_AuroraSylph"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_AuroraSylph"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.33</MeleeDodgeChance>
+			<MeleeCritChance>0</MeleeCritChance>
+			<MeleeParryChance>0</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_AuroraSylph"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.23</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Barb_Slinger.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Barb_Slinger.xml
new file mode 100644
index 0000000000..07c672f5ec
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Barb_Slinger.xml	
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Barbslinger"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Barbslinger"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.4</MeleeCritChance>
+			<MeleeParryChance>0.4</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Barbslinger"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Barbslinger"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Barbslinger"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left pincer</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.68</cooldownTime>
+					<linkedBodyPartsGroup>AA_PincerAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right pincer</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.68</cooldownTime>
+					<linkedBodyPartsGroup>AA_PincerAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>AA_ToxicSting</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>AA_Sting</linkedBodyPartsGroup>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Barbslinger"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<useStatic>false</useStatic>
+						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+						<parts>
+							<li>AA_LeftPincer</li>
+							<li>AA_RightPincer</li>
+						</parts>
+					</li>
+					<li>
+						<useStatic>false</useStatic>
+						<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
+						<parts>
+							<li>AA_LeftPincer</li>
+							<li>AA_RightPincer</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_Barbslinger"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_Barbslinger"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Barbslinger"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1125</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Base.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Base.xml
new file mode 100644
index 0000000000..d7c9873b61
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Base.xml	
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="BaseInsect2"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency>0.5</NightVisionEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="AA_AlphaBaseInsect" or @Name="BaseInsect2"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<useStatic>false</useStatic>
+						<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+						<parts>
+							<li>InsectLeg</li>
+						</parts>
+					</li>
+					<li>
+						<useStatic>false</useStatic>
+						<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
+						<parts>
+							<li>InsectLeg</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="AA_AlphaBaseInsect" or @Name="BaseInsect2"]/statBases</xpath>
+		<value>
+			<PartialArmorBody>0</PartialArmorBody>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Bed_Bug.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Bed_Bug.xml
new file mode 100644
index 0000000000..3e1c1c4c4e
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Bed_Bug.xml	
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_BedBug"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_BedBug"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_BedBug"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.65</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_BedBug"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.02</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_BedBug"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>AA_ParalysingBite</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_BedBug"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_BedBug"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_BedBug"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>375</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Behemoth.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Behemoth.xml
new file mode 100644
index 0000000000..490930221f
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Behemoth.xml	
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Behemoth"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Behemoth"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>1.5</MeleeCritChance>
+			<MeleeParryChance>0.4</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Behemoth"]</xpath>
+		<value>
+			<butcherProducts>
+				<Prometheum>25</Prometheum>
+				<FSX>15</FSX>
+			</butcherProducts>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Behemoth"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>21</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Behemoth"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Behemoth"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.6</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Behemoth"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left dragonclaw</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Stab</li>
+					</capacities>
+					<power>55</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>22</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>2.4</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>16</armorPenetrationSharp>
+					<armorPenetrationBlunt>48</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Right dragonclaw</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Stab</li>
+					</capacities>
+					<power>55</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>22</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>2.4</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>16</armorPenetrationSharp>
+					<armorPenetrationBlunt>48</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>razorfangs</label>
+					<capacities>
+						<li>Bite</li>
+						<li>Stab</li>
+					</capacities>
+					<power>80</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>22</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>4</cooldownTime>
+					<armorPenetrationSharp>30</armorPenetrationSharp>
+					<armorPenetrationBlunt>90</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.6</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>devour</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>43</power>
+					<cooldownTime>3</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>40.55</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_Behemoth"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_Behemoth"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Behemoth"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>4500</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>400</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Black_Hive.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Black_Hive.xml
new file mode 100644
index 0000000000..9f6125c8fd
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Black_Hive.xml	
@@ -0,0 +1,346 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_BlackScarab"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="AA_BlackScarab"]/combatPower</xpath>
+		<value>
+			<combatPower>60</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_BlackScarab"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2.55</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_BlackScarab"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_BlackScarab"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4.9</MoveSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_BlackScarab"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_BlackScarab"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_BlackScarab"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_BlackScarab"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_BlackScarab"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>187</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_BlackSpelopede"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_BlackSpelopede"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_BlackSpelopede"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_BlackSpelopede"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4.7</MoveSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_BlackSpelopede"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.75</AimingAccuracy>
+			<ShootingAccuracyPawn>0.75</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.08</MeleeDodgeChance>
+			<MeleeCritChance>0.18</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+			<Suppressability>0.25</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="AA_BlackSpelopede"]/combatPower</xpath>
+		<value>
+			<combatPower>100</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_BlackSpelopede"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>1.4</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_BlackSpelopede"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head claw</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.68</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head claw</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.48</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>6</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_BlackSpelopede"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_BlackSpelopede"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_BlackSpelopede"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>600</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_BlackSpider"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_BlackSpider"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>2.1</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_BlackSpider"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_BlackSpider"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_BlackSpider"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4.6</MoveSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_BlackSpider"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.65</AimingAccuracy>
+			<ShootingAccuracyPawn>0.65</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.09</MeleeDodgeChance>
+			<MeleeCritChance>0.45</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+			<Suppressability>0.2</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="AA_BlackSpider"]/combatPower</xpath>
+		<value>
+			<combatPower>200</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_BlackSpider"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head claw</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>44</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>2.0</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head claw</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>44</armorPenetrationSharp>
+					<armorPenetrationBlunt>22</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>8.5</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_BlackSpider"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_BlackSpider"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_BlackSpider"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>900</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Blizzarisk.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Blizzarisk.xml
new file mode 100644
index 0000000000..ab7bacc5d2
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Blizzarisk.xml	
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Blizzarisk"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Blizzarisk"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Blizzarisk"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Blizzarisk"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Blizzarisk"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left first leg</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right first leg</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>AA_ToxicSting</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_Blizzarisk"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_Blizzarisk"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Blizzarisk"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>975</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_BlizzariskClutchMother"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_BlizzariskClutchMother"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_BlizzariskClutchMother"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_BlizzariskClutchMother"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_BlizzariskClutchMother"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.11</MeleeDodgeChance>
+			<MeleeCritChance>0.5</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_BlizzariskClutchMother"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left first leg</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right first leg</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>AA_ToxicSting</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>6</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_BlizzariskClutchMother"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_BlizzariskClutchMother"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_BlizzariskClutchMother"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1500</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Bloodshrimp.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Bloodshrimp.xml
new file mode 100644
index 0000000000..cd409c63e5
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Bloodshrimp.xml	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_BloodShrimp"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_BloodShrimp"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_BloodShrimp"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>0.75</ArmorRating_Blunt>
+			<MeleeDodgeChance>0.01</MeleeDodgeChance>
+			<MeleeCritChance>0.20</MeleeCritChance>
+			<MeleeParryChance>0.28</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_BloodShrimp"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.1</chanceFactor>
+					<armorPenetrationBlunt>2.50</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>AA_RegenerativePierce</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>AA_Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left blade</label>
+					<capacities>
+						<li>AA_RegenerativePierce</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.55</cooldownTime>
+					<linkedBodyPartsGroup>AA_BladeAttackTool</linkedBodyPartsGroup>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>7.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right blade</label>
+					<capacities>
+						<li>AA_RegenerativePierce</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.55</cooldownTime>
+					<linkedBodyPartsGroup>AA_BladeAttackTool</linkedBodyPartsGroup>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>7.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_BloodShrimp"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_BloodShrimp"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_BloodShrimp"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1000</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>300</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Bobeene.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Bobeene.xml
new file mode 100644
index 0000000000..59911013c2
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Bobeene.xml	
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Bobeene"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Bobeene"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.24</MeleeCritChance>
+			<MeleeParryChance>0.13</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Bobeene"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<chanceFactor>0.7</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>2.9</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Boulder_Mit.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Boulder_Mit.xml
new file mode 100644
index 0000000000..0007e624b0
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Boulder_Mit.xml	
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_BoulderMit"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_BoulderMit"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>30</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_BoulderMit"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_BoulderMit"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.00</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>0.34</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_BoulderMit"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>32</power>
+					<cooldownTime>3.1</cooldownTime>
+					<linkedBodyPartsGroup>TurtleBeakAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>6.55</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_BoulderMit"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_BoulderMit"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_BoulderMit"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>3250</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_SummitCrab"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_SummitCrab"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_SummitCrab"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>60</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_SummitCrab"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>40</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_SummitCrab"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.00</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>1.21</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_SummitCrab"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>3.6</cooldownTime>
+					<linkedBodyPartsGroup>TurtleBeakAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>4</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>12.05</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_SummitCrab"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_SummitCrab"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_SummitCrab"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>4750</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Bumbledrone.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Bumbledrone.xml
new file mode 100644
index 0000000000..869c6027d7
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Bumbledrone.xml	
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Bumbledrone"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Bumbledrone"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0.04</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Bumbledrone"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>AA_VeryToxicSting</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.55</cooldownTime>
+					<linkedBodyPartsGroup>AA_Sting</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+					<chanceFactor>0.8</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.1</chanceFactor>
+					<armorPenetrationSharp>0.18</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_BumbledroneHierophant"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_BumbledroneHierophant"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.3</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_BumbledroneHierophant"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>AA_VeryToxicSting</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.55</cooldownTime>
+					<linkedBodyPartsGroup>AA_Sting</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_BumbledroneQueen"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_BumbledroneQueen"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.11</MeleeDodgeChance>
+			<MeleeCritChance>0.17</MeleeCritChance>
+			<MeleeParryChance>0.04</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_BumbledroneQueen"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>AA_VeryToxicSting</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.55</cooldownTime>
+					<linkedBodyPartsGroup>AA_Sting</linkedBodyPartsGroup>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.8</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.1</chanceFactor>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.12</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Cactipine.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Cactipine.xml
new file mode 100644
index 0000000000..9da7366bdf
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Cactipine.xml	
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Cactipine"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Cactipine"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Cactipine"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>7</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.14</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>7</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.14</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.85</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Chameleon Yak.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Chameleon Yak.xml
new file mode 100644
index 0000000000..e6ff1a3abe
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Chameleon Yak.xml	
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_ChameleonYak"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_ChameleonYak"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.35</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_ChameleonYak"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>2.4</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_ChemfuelMyrmidon.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_ChemfuelMyrmidon.xml
new file mode 100644
index 0000000000..001b6c9391
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_ChemfuelMyrmidon.xml	
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_ChemfuelMyrmidon"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_ChemfuelMyrmidon"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_ChemfuelMyrmidon"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_ChemfuelMyrmidon"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.01</MeleeDodgeChance>
+			<MeleeCritChance>0.24</MeleeCritChance>
+			<MeleeParryChance>0.35</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_ChemfuelMyrmidon"]</xpath>
+		<value>
+			<butcherProducts>
+				<FSX>13</FSX>
+			</butcherProducts>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_ChemfuelMyrmidon"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>triple maw</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2.72</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>3</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_ChemfuelMyrmidon"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_ChemfuelMyrmidon"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_ChemfuelMyrmidon"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>750</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Cinderlisk.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Cinderlisk.xml
new file mode 100644
index 0000000000..09ad7b2e40
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Cinderlisk.xml	
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Cinderlisk"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Cinderlisk"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Cinderlisk"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Cinderlisk"]</xpath>
+		<value>
+			<butcherProducts>
+				<Prometheum>12</Prometheum>
+			</butcherProducts>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Cinderlisk"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.20</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Cinderlisk"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left first leg</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right first leg</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>AA_BurningBite</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_Cinderlisk"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_Cinderlisk"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Cinderlisk"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1100</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_CrepuscularBeetle.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_CrepuscularBeetle.xml
new file mode 100644
index 0000000000..cfdf1d25dc
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_CrepuscularBeetle.xml	
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_CrepuscularBeetle"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_CrepuscularBeetle"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_CrepuscularBeetle"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_CrepuscularBeetle"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency>0.8</NightVisionEfficiency>
+			<MeleeDodgeChance>0.01</MeleeDodgeChance>
+			<MeleeCritChance>0.35</MeleeCritChance>
+			<MeleeParryChance>0.35</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_CrepuscularBeetle"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head claw</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>2.8</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>8</armorPenetrationSharp>
+					<armorPenetrationBlunt>16</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>17</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_CrepuscularBeetle"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_CrepuscularBeetle"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_CrepuscularBeetle"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1075</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_CrescendoAnole.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_CrescendoAnole.xml
new file mode 100644
index 0000000000..edf8dd0369
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_CrescendoAnole.xml	
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_CrescendoAnole"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_CrescendoAnole"]/statBases</xpath>
+		<!-- Used CE's formula to calculate these values -->
+		<!-- (Note this is a lizard that grows strong when angered) -->
+		<value>
+			<MeleeDodgeChance>0.19</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+			<MeleeParryChance>0</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_CrescendoAnole"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.6</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_CrystalMit.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_CrystalMit.xml
new file mode 100644
index 0000000000..0db2cdaa5c
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_CrystalMit.xml	
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_CrystalMit"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_CrystalMit"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_CrystalMit"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_CrystalMit"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.02</MeleeDodgeChance>
+			<MeleeCritChance>0.07</MeleeCritChance>
+			<MeleeParryChance>0.04</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_CrystalMit"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2.6</cooldownTime>
+					<linkedBodyPartsGroup>TurtleBeakAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.43</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.65</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.750</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_CrystalMit"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_CrystalMit"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_CrystalMit"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>750</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_CrystallineCaracal.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_CrystallineCaracal.xml
new file mode 100644
index 0000000000..43195ae602
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_CrystallineCaracal.xml	
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_CrystallineCaracal"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<!-- Used weight of a cougar to generate these -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_CrystallineCaracal"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.08</MeleeCritChance>
+			<MeleeParryChance>0.06</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_CrystallineCaracal"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.42</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.42</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.55</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.94</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.75</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_DarkBeast.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_DarkBeast.xml
new file mode 100644
index 0000000000..f585247d3d
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_DarkBeast.xml	
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Darkbeast"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Darkbeast"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Darkbeast"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Darkbeast"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency>0.8</NightVisionEfficiency>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.21</MeleeCritChance>
+			<MeleeParryChance>0.24</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Darkbeast"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.4</chanceFactor>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.4</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_Darkbeast"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_Darkbeast"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Darkbeast"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>875</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_DarkVandal.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_DarkVandal.xml
new file mode 100644
index 0000000000..4c819a6b99
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_DarkVandal.xml	
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_DarkVandal"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_DarkVandal"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.12</MeleeDodgeChance>
+			<MeleeCritChance>0.3</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_DarkVandal"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tusk</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Stab</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.35</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.66</cooldownTime>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.6</chanceFactor>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_DecayDrake.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_DecayDrake.xml
new file mode 100644
index 0000000000..9e7a427050
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_DecayDrake.xml	
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_DecayDrake"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_DecayDrake"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+			<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_DecayDrake"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>razorfangs</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>1.9</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.9</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.723</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Desert Aves.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Desert Aves.xml
new file mode 100644
index 0000000000..7c105940d3
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Desert Aves.xml	
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_DesertAve"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_DesertAve"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.35</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.06</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_DesertAve"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>30</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.78</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Devil_Sheep.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Devil_Sheep.xml
new file mode 100644
index 0000000000..e39dd09e96
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Devil_Sheep.xml	
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_DevilSheep"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_DevilSheep"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.11</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>0.03</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_DevilSheep"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.60</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Drainer.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Drainer.xml
new file mode 100644
index 0000000000..31c3d6aea6
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Drainer.xml	
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Larval Drainer -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_DrainerLarva"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_DrainerLarva"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.00</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_DrainerLarva"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Drainer"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Drainer"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<!-- Atispec -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Drainer"]/tools</xpath>
+		<value>
+			<tools>
+
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Dunealisk.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Dunealisk.xml
new file mode 100644
index 0000000000..42a0ace228
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Dunealisk.xml	
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Dunealisk"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Dunealisk"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Dunealisk"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Dunealisk"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Dunealisk"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left first leg</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right first leg</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>AA_ToxicSting</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_Dunealisk"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_Dunealisk"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Dunealisk"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>975</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_DunealiskClutchMother"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_DunealiskClutchMother"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_DunealiskClutchMother"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_DunealiskClutchMother"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.5</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_DunealiskClutchMother"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left first leg</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right first leg</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>AA_ToxicSting</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>6</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_DunealiskClutchMother"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_DunealiskClutchMother"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_DunealiskClutchMother"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1500</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_DuskProwler.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_DuskProwler.xml
new file mode 100644
index 0000000000..2f3edd22d4
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_DuskProwler.xml	
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_DuskProwler"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_DuskProwler"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			<MeleeCritChance>0.27</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_DuskProwler"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_DuskProwler"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.35</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_DuskProwler"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>ninetails</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>0.35</cooldownTime>
+					<linkedBodyPartsGroup>AA_Tail</linkedBodyPartsGroup>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.0</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.523</armorPenetrationBlunt>
+					<chanceFactor>0.25</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.0</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.523</armorPenetrationBlunt>
+					<chanceFactor>0.25</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<chanceFactor>0.4</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_DuskProwler"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_DuskProwler"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_DuskProwler"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>875</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_DuskRat.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_DuskRat.xml
new file mode 100644
index 0000000000..26e78fe45c
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_DuskRat.xml	
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_DuskRat"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_DuskRat"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.52</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.00</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_DuskRat"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.02</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.02</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_EmpressButterfly.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_EmpressButterfly.xml
new file mode 100644
index 0000000000..ea45e0b887
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_EmpressButterfly.xml	
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_EmpressButterflyLarva"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_EmpressButterflyLarva"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.00</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_EmpressButterflyLarva"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_EmpressButterfly"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_EmpressButterfly"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_EmpressButterfly"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_EngorgedTentacularAberration.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_EngorgedTentacularAberration.xml
new file mode 100644
index 0000000000..9d8f7690ff
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_EngorgedTentacularAberration.xml	
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Ideology</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AA_EngorgedTentacularAberration"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Quadruped</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AA_EngorgedTentacularAberration"]/statBases/MoveSpeed</xpath>
+					<value>
+						<MoveSpeed>3.0</MoveSpeed>
+						<MeleeDodgeChance>0.15</MeleeDodgeChance>
+						<MeleeCritChance>0.75</MeleeCritChance>
+						<MeleeParryChance>0.35</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_EngorgedTentacularAberration"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<capacities>
+									<li>Blunt</li>
+									<li>Stab</li>
+								</capacities>
+								<power>48</power>
+								<cooldownTime>2.48</cooldownTime>
+								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+								<chanceFactor>0.6</chanceFactor>
+								<armorPenetrationSharp>24</armorPenetrationSharp>
+								<armorPenetrationBlunt>48</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>tentacles</label>
+								<capacities>
+									<li>Blunt</li>
+									<li>Poke</li>
+								</capacities>
+								<power>23</power>
+								<cooldownTime>0.8</cooldownTime>
+								<linkedBodyPartsGroup>AA_TentacleAttackTool</linkedBodyPartsGroup>
+								<chanceFactor>0.4</chanceFactor>
+								<armorPenetrationBlunt>25</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AA_EngorgedTentacularAberration"]/comps</xpath>
+					<value>
+						<li Class="AnimalBehaviours.CompProperties_InitialHediff">
+							<hediffname>AA_LowBleed</hediffname>
+							<hediffseverity>1</hediffseverity>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Erin.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Erin.xml
new file mode 100644
index 0000000000..1c672da867
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Erin.xml	
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Erin"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<!-- Don't know about balancing -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Erin"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+			<ArmorRating_Sharp>0.12</ArmorRating_Sharp>
+			<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			<MeleeCritChance>0.12</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Erin"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>fangs</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.55</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.9</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>32</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>3.2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Eyeling.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Eyeling.xml
new file mode 100644
index 0000000000..74d03490af
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Eyeling.xml	
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Ideology</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AA_Eyeling"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Quadruped</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AA_Eyeling"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.1</MeleeDodgeChance>
+						<MeleeCritChance>0.1</MeleeCritChance>
+						<MeleeParryChance>0.1</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_Eyeling"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<capacities>
+									<li>AA_ToxicBite</li>
+								</capacities>
+								<power>12</power>
+								<cooldownTime>1.65</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>10</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>1.0</armorPenetrationSharp>
+								<armorPenetrationBlunt>0.544</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Fangsquid.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Fangsquid.xml
new file mode 100644
index 0000000000..4a2cdc6daa
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Fangsquid.xml	
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biomes! Islands</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AA_Fangsquid"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Serpentine</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AA_Fangsquid"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.1</MeleeDodgeChance>
+						<MeleeCritChance>0.08</MeleeCritChance>
+						<MeleeParryChance>0.4</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_Fangsquid"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<capacities>
+									<li>Bite</li>
+								</capacities>
+								<power>12</power>
+								<cooldownTime>1.68</cooldownTime>
+								<linkedBodyPartsGroup>AA_Mouth</linkedBodyPartsGroup>
+								<armorPenetrationSharp>0.14</armorPenetrationSharp>
+								<armorPenetrationBlunt>1.1</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>tentacle</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>8</power>
+								<cooldownTime>1</cooldownTime>
+								<linkedBodyPartsGroup>AA_TentacleAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Feralisk.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Feralisk.xml
new file mode 100644
index 0000000000..4e1942992d
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Feralisk.xml	
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Feralisk"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Feralisk"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Feralisk"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Feralisk"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Feralisk"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left first leg</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right first leg</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>AA_ToxicSting</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_Feralisk"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_Feralisk"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Feralisk"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>550</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_FeraliskClutchMother"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_FeraliskClutchMother"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_FeraliskClutchMother"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_FeraliskClutchMother"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.11</MeleeDodgeChance>
+			<MeleeCritChance>0.5</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_FeraliskClutchMother"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left first leg</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right first leg</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>AA_ToxicSting</li>
+					</capacities>
+					<power>38</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>30</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>6</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_FeraliskClutchMother"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_FeraliskClutchMother"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_FeraliskClutchMother"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1500</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Firewasp.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Firewasp.xml
new file mode 100644
index 0000000000..2d9e0c0b2c
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Firewasp.xml	
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_FireWasp"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_FireWasp"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0.04</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_FireWasp"]</xpath>
+		<value>
+			<butcherProducts>
+				<Prometheum>8</Prometheum>
+			</butcherProducts>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_FireWasp"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>AA_BurningAndFeedingBite</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.55</cooldownTime>
+					<linkedBodyPartsGroup>AA_Sting</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<chanceFactor>0.8</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>AA_BurningAndFeedingBite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.1</chanceFactor>
+					<armorPenetrationSharp>0.18</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_FissionMouse.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_FissionMouse.xml
new file mode 100644
index 0000000000..c28cda6f20
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_FissionMouse.xml	
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_FissionMouse"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_FissionMouse"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.03</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_FissionMouse"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+					<chanceFactor>0.7</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_FissionMouseSecond"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_FissionMouseSecond"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.17</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_FissionMouseSecond"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+					<chanceFactor>0.7</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_FissionMouseThird"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_FissionMouseThird"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0.02</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_FissionMouseThird"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+					<chanceFactor>0.7</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_FlamigoPheonix.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_FlamigoPheonix.xml
new file mode 100644
index 0000000000..d5c6e278fd
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_FlamigoPheonix.xml	
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_FlamingoPhoenix"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_FlamingoPhoenix"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.24</MeleeDodgeChance>
+			<MeleeCritChance>0.03</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_FlamingoPhoenix"]</xpath>
+		<value>
+			<butcherProducts>
+				<Prometheum>1</Prometheum>
+			</butcherProducts>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_FlamingoPhoenix"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>12</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>4</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.68</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_FrostLynx.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_FrostLynx.xml
new file mode 100644
index 0000000000..7836930f55
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_FrostLynx.xml	
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_FrostLynx"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_FrostLynx"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.26</MeleeDodgeChance>
+			<MeleeCritChance>0.20</MeleeCritChance>
+			<MeleeParryChance>0.07</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_FrostLynx"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>AA_FrostClaws</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>0.9</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.21</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.623</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>AA_FrostClaws</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>0.84</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.21</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.623</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>AA_FrostBite</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.523</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Frost_Ave.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Frost_Ave.xml
new file mode 100644
index 0000000000..4163e75eaa
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Frost_Ave.xml	
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_FrostAve"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_FrostAve"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.32</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.07</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_FrostAve"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.9</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>13</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.75</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_FrostboundBehemoth.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_FrostboundBehemoth.xml
new file mode 100644
index 0000000000..7c8a3ab8b5
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_FrostboundBehemoth.xml	
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_FrostboundBehemoth"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_FrostboundBehemoth"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_FrostboundBehemoth"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_FrostboundBehemoth"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.02</MeleeDodgeChance>
+			<MeleeCritChance>0.22</MeleeCritChance>
+			<MeleeParryChance>0.20</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_FrostboundBehemoth"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>body</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>32</power>
+					<cooldownTime>3.6</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>28</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_FrostboundBehemoth"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_FrostboundBehemoth"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_FrostboundBehemoth"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1500</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Frostling.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Frostling.xml
new file mode 100644
index 0000000000..577a6aea3c
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Frostling.xml	
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Frostling"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Frostling"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Frostling"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.35</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Frostling"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			<MeleeCritChance>0.3</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Frostling"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.28</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.823</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.28</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.823</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>32</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>3.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>6.144</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.523</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_Frostling"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_Frostling"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Frostling"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>875</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Frostmite.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Frostmite.xml
new file mode 100644
index 0000000000..c5c1b597b1
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Frostmite.xml	
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Frostmite"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Frostmite"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Frostmite"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Frostmite"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.02</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Frostmite"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head-claw</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.34</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_Frostmite"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_Frostmite"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Frostmite"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>325</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_FungalHusk.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_FungalHusk.xml
new file mode 100644
index 0000000000..c51158de9f
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_FungalHusk.xml	
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_FungalHusk"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_FungalHusk"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.17</MeleeDodgeChance>
+			<MeleeCritChance>0.33</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_FungalHusk"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>AA_FungalClaws</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>4</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>AA_FungalClaws</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>25</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>4</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Gallatross.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Gallatross.xml
new file mode 100644
index 0000000000..a1b5d6183c
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Gallatross.xml	
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Gallatross"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Gallatross"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>26</ArmorRating_Blunt>
+			<ArmorRating_Sharp>13</ArmorRating_Sharp>
+			<MeleeDodgeChance>0.02</MeleeDodgeChance>
+			<MeleeCritChance>1.75</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Gallatross"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>81</power>
+					<cooldownTime>2.48</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>120.226</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>56</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>12</armorPenetrationSharp>
+					<armorPenetrationBlunt>40</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>47</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>45</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_Gallatross"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_Gallatross"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Gallatross"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>11500</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Add Low Bleed Hediff -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_Gallatross"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_Gallatross"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Gallatross"]/comps</xpath>
+		<value>
+			<li Class="AnimalBehaviours.CompProperties_InitialHediff">
+				<hediffname>AA_LowBleed</hediffname>
+				<hediffseverity>1</hediffseverity>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Genix.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Genix.xml
new file mode 100644
index 0000000000..d84bfbf82f
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Genix.xml	
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Genix"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Genix"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.26</MeleeDodgeChance>
+			<MeleeCritChance>0.20</MeleeCritChance>
+			<MeleeParryChance>0.07</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Genix"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>0.9</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.21</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.623</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>0.84</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.21</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.623</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.523</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_GiantCrownedSilkie.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_GiantCrownedSilkie.xml
new file mode 100644
index 0000000000..f6739ecbb3
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_GiantCrownedSilkie.xml	
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_GiantCrownedSilkie"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_GiantCrownedSilkie"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>5</MoveSpeed>
+			<MeleeDodgeChance>0.17</MeleeDodgeChance>
+			<MeleeCritChance>0.10</MeleeCritChance>
+			<MeleeParryChance>0.08</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_GiantCrownedSilkie"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.97</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.97</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Gigantelope.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Gigantelope.xml
new file mode 100644
index 0000000000..111afbdfa3
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Gigantelope.xml	
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Gigantelope"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Gigantelope"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.22</MeleeCritChance>
+			<MeleeParryChance>0.13</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Gigantelope"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.750</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.3</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.750</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Great_Devourer.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Great_Devourer.xml
new file mode 100644
index 0000000000..8beaf0f258
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Great_Devourer.xml	
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_GreatDevourer"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_GreatDevourer"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_GreatDevourer"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_GreatDevourer"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.45</MeleeCritChance>
+			<MeleeParryChance>0.08</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_GreatDevourer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>2.6</cooldownTime>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>16</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+					<chanceFactor>0.3</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_GreatDevourer"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_GreatDevourer"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_GreatDevourer"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1125</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>400</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_GreenGoo.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_GreenGoo.xml
new file mode 100644
index 0000000000..0e8e672b41
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_GreenGoo.xml	
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_GreenGoo"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_GreenGoo"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			<MeleeCritChance>0.04</MeleeCritChance>
+			<MeleeParryChance>0.04</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_GreenGoo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tentacles</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.75</cooldownTime>
+					<linkedBodyPartsGroup>Arms</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_GreyCoatedMouflon.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_GreyCoatedMouflon.xml
new file mode 100644
index 0000000000..989dbf89d3
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_GreyCoatedMouflon.xml	
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_GreyCoatedMouflon"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<!-- Don't know about balancing -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_GreyCoatedMouflon"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			<MeleeCritChance>0.07</MeleeCritChance>
+			<MeleeParryChance>0.08</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_GreyCoatedMouflon"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2.3</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>horns</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.85</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Groundrunner.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Groundrunner.xml
new file mode 100644
index 0000000000..1bc8c5fa98
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Groundrunner.xml	
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Groundrunner"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Groundrunner"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Groundrunner"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Groundrunner"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>2.35</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>7</armorPenetrationSharp>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>2.35</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>7</armorPenetrationSharp>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>13</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.54</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_Groundrunner"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_Groundrunner"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Groundrunner"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1250</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Helixien.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Helixien.xml
new file mode 100644
index 0000000000..031e230f8c
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Helixien.xml	
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Helixien"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Serpentine</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Helixien"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.00</MeleeDodgeChance>
+			<MeleeCritChance>0.5</MeleeCritChance>
+			<MeleeParryChance>0.16</MeleeParryChance>
+			<ArmorRating_Blunt>4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Helixien"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>slimy body</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>3.5</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>28</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_InfectedAerofleet.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_InfectedAerofleet.xml
new file mode 100644
index 0000000000..71bfb1920a
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_InfectedAerofleet.xml	
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_InfectedAerofleet"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_InfectedAerofleet"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.00</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_InfectedAerofleet"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2.5</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.035</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.01</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>tentacles</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Arms</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Ironhusk_Beetle.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Ironhusk_Beetle.xml
new file mode 100644
index 0000000000..5851758f6e
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Ironhusk_Beetle.xml	
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_IronhuskBeetle"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_IronhuskBeetle"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_IronhuskBeetle"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_IronhuskBeetle"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.02</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.4</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_IronhuskBeetle"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>3.6</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.75</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_IronhuskBeetle"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_IronhuskBeetle"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_IronhuskBeetle"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1000</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Junglelisk.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Junglelisk.xml
new file mode 100644
index 0000000000..41c4287132
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Junglelisk.xml	
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Junglelisk"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Junglelisk"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Junglelisk"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Junglelisk"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Junglelisk"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left first leg</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right first leg</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>AA_ToxicSting</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_Junglelisk"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_Junglelisk"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Junglelisk"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>600</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Lockjaw.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Lockjaw.xml
new file mode 100644
index 0000000000..c3f42ff490
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Lockjaw.xml	
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Lockjaw"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Lockjaw"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.65</MeleeCritChance>
+			<MeleeParryChance>0.14</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Lockjaw"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>AA_LockJawDamage</li>
+					</capacities>
+					<power>45</power>
+					<cooldownTime>3.8</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>11.0</armorPenetrationSharp>
+					<armorPenetrationBlunt>20.0</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Luciferbug.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Luciferbug.xml
new file mode 100644
index 0000000000..30a4ddd8a5
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Luciferbug.xml	
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_LuciferBug"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_LuciferBug"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_LuciferBug"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.65</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_LuciferBug"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.03</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_LuciferBug"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.65</cooldownTime>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_LuciferBug"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_LuciferBug"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_LuciferBug"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>250</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Mammoth_Worm.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Mammoth_Worm.xml
new file mode 100644
index 0000000000..7b30f7b79f
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Mammoth_Worm.xml	
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_MammothWorm"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="AA_MammothWorm"]/combatPower</xpath>
+		<value>
+			<combatPower>250</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_MammothWorm"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>24</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_MammothWorm"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_MammothWorm"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>2.7</MoveSpeed>
+			<MeleeDodgeChance>0.08</MeleeDodgeChance>
+			<MeleeCritChance>0.8</MeleeCritChance>
+			<MeleeParryChance>0.23</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_MammothWorm"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>body</label>
+					<capacities>
+						<li>AA_SiegeBlunt</li>
+					</capacities>
+					<power>43</power>
+					<cooldownTime>2.48</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>50</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>48</power>
+					<cooldownTime>2.68</cooldownTime>
+					<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>20</armorPenetrationSharp>
+					<armorPenetrationBlunt>50</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_MammothWorm"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_MammothWorm"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_MammothWorm"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1500</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Mantrap.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Mantrap.xml
new file mode 100644
index 0000000000..e650e9a78a
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Mantrap.xml	
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Mantrap"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Mantrap"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Mantrap"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>0.2</ArmorRating_Sharp>
+			<MeleeDodgeChance>0.14</MeleeDodgeChance>
+			<MeleeCritChance>0.04</MeleeCritChance>
+			<MeleeParryChance>0.11</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Mantrap"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>razor barbs</label>
+					<capacities>
+						<li>AA_Acid</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>AA_Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_Mantrap"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_Mantrap"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Mantrap"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>875</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_MatureFleshbeast.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_MatureFleshbeast.xml
new file mode 100644
index 0000000000..3dab5a6a92
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_MatureFleshbeast.xml	
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_MatureFleshbeast"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Remove the 'Swallow Whole' attack, since it doesn't work in CE and insta-kills instead. -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="AA_MatureFleshbeast"]/thingClass</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_MatureFleshbeast"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.01</MeleeDodgeChance>
+			<MeleeCritChance>0.23</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_MatureFleshbeast"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>2.56</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>6</armorPenetrationSharp>
+					<armorPenetrationBlunt>9</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>3.51</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Meadow_Ave.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Meadow_Ave.xml
new file mode 100644
index 0000000000..bcfc597532
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Meadow_Ave.xml	
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_MeadowAve"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_MeadowAve"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.35</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_MeadowAve"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>13</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.78</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_MegaLouse.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_MegaLouse.xml
new file mode 100644
index 0000000000..2246f82db3
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_MegaLouse.xml	
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_MegaLouse"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_MegaLouse"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_MegaLouse"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="AA_MegaLouse"]/combatPower</xpath>
+		<value>
+			<combatPower>50</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_MegaLouse"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>3.8</MoveSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_MegaLouse"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.03</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_MegaLouse"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tusk</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.65</cooldownTime>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_MegaLouse"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_MegaLouse"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_MegaLouse"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>337</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Metallovore.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Metallovore.xml
new file mode 100644
index 0000000000..b06b26376f
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Metallovore.xml	
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Metallovore"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Metallovore"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.02</MeleeDodgeChance>
+			<MeleeCritChance>0.18</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Metallovore"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>body</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>5</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>tentacles</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>0.75</cooldownTime>
+					<linkedBodyPartsGroup>AA_TentacleAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Mimes.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Mimes.xml
new file mode 100644
index 0000000000..30504c12fa
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Mimes.xml	
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Mime"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Mime"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Mime"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>25</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_MoribundGallatross.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_MoribundGallatross.xml
new file mode 100644
index 0000000000..a50d0979d0
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_MoribundGallatross.xml	
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_GallatrossMoribund"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_GallatrossMoribund"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>26</ArmorRating_Blunt>
+			<ArmorRating_Sharp>13</ArmorRating_Sharp>
+			<MeleeDodgeChance>0.02</MeleeDodgeChance>
+			<MeleeCritChance>1.75</MeleeCritChance>
+			<MeleeParryChance>0.3</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_GallatrossMoribund"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>80</power>
+					<cooldownTime>2.48</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>80.226</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>56</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>12</armorPenetrationSharp>
+					<armorPenetrationBlunt>36</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>47</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>40</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_GallatrossMoribund"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_GallatrossMoribund"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_GallatrossMoribund"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>11500</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Add Low Bleed Hediff -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_GallatrossMoribund"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_GallatrossMoribund"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_GallatrossMoribund"]/comps</xpath>
+		<value>
+			<li Class="AnimalBehaviours.CompProperties_InitialHediff">
+				<hediffname>AA_LowBleed</hediffname>
+				<hediffseverity>1</hediffseverity>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Murkling.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Murkling.xml
new file mode 100644
index 0000000000..c6065dc2f8
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Murkling.xml	
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Murkling"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Murkling"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.6</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Murkling"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.06</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.06</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>plague carrier</label>
+					<capacities>
+						<li>FO_PlaguedBite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.4</cooldownTime>
+					<armorPenetrationSharp>0.33</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>poisonous bite</label>
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.4</cooldownTime>
+					<armorPenetrationSharp>0.33</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_MycoidColossus.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_MycoidColossus.xml
new file mode 100644
index 0000000000..3fd1973f08
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_MycoidColossus.xml	
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_MycoidColossus"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_MycoidColossus"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.01</MeleeDodgeChance>
+			<MeleeCritChance>0.14</MeleeCritChance>
+			<MeleeParryChance>0.39</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_MycoidColossus"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>2.4</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>3.3</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Needlepost.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Needlepost.xml
new file mode 100644
index 0000000000..05a8161481
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Needlepost.xml	
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Needlepost"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Needlepost"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Needlepost"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>0.45</ArmorRating_Sharp>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Needlepost"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stings</label>
+					<capacities>
+						<li>AA_ToxicSting</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.3</cooldownTime>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>AA_Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_Needlepost"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_Needlepost"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Needlepost"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>750</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Needleroll.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Needleroll.xml
new file mode 100644
index 0000000000..9f4d229230
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Needleroll.xml	
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Needleroll"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Needleroll"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Needleroll"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>0.2</ArmorRating_Sharp>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.04</MeleeCritChance>
+			<MeleeParryChance>0</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Needleroll"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stings</label>
+					<capacities>
+						<li>AA_ToxicSting</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.35</cooldownTime>
+					<armorPenetrationSharp>0.14</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.55</cooldownTime>
+					<linkedBodyPartsGroup>AA_Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.14</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_Needleroll"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_Needleroll"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Needleroll"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>100</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_NightMule.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_NightMule.xml
new file mode 100644
index 0000000000..ef3c20aedc
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_NightMule.xml	
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_NightMule"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_NightMule"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.04</MeleeDodgeChance>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>0.18</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_NightMule"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horns</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2.6</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_NightRam.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_NightRam.xml
new file mode 100644
index 0000000000..ddd4263aea
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_NightRam.xml	
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_NightRam"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_NightRam"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.02</MeleeDodgeChance>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_NightRam"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+					<armorPenetrationSharp>4</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2.6</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Night_Aves.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Night_Aves.xml
new file mode 100644
index 0000000000..b0a3b463a8
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Night_Aves.xml	
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_NightAve"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_NightAve"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency>0.8</NightVisionEfficiency>
+			<MeleeDodgeChance>0.45</MeleeDodgeChance>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_NightAve"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>13</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Nightling.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Nightling.xml
new file mode 100644
index 0000000000..88e1ff54e7
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Nightling.xml	
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Nightling"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Nightling"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>7.2</MoveSpeed>
+			<NightVisionEfficiency>0.8</NightVisionEfficiency>
+			<MeleeDodgeChance>0.37</MeleeDodgeChance>
+			<MeleeCritChance>0.18</MeleeCritChance>
+			<MeleeParryChance>0.08</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Nightling"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>AA_ToxicBite</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.144</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_OcularJelly.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_OcularJelly.xml
new file mode 100644
index 0000000000..cd0420f489
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_OcularJelly.xml	
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_OcularJelly"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_OcularJelly"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>0.02</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_OcularJelly"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>tentacles</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.7</cooldownTime>
+					<linkedBodyPartsGroup>Arms</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_OcularNightling.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_OcularNightling.xml
new file mode 100644
index 0000000000..0012d0e069
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_OcularNightling.xml	
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Ideology</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AA_OcularNightling"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Quadruped</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_OcularNightling"]/statBases/MoveSpeed</xpath>
+					<value>
+						<MoveSpeed>6.8</MoveSpeed>
+						<NightVisionEfficiency>0.8</NightVisionEfficiency>
+						<AimingAccuracy>0.8</AimingAccuracy>
+						<MeleeDodgeChance>0.37</MeleeDodgeChance>
+						<MeleeCritChance>0.21</MeleeCritChance>
+						<MeleeParryChance>0.12</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_OcularNightling"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>left claw</label>
+								<capacities>
+									<li>Scratch</li>
+								</capacities>
+								<power>10</power>
+								<cooldownTime>1</cooldownTime>
+								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>20</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>0.25</armorPenetrationSharp>
+								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>right claw</label>
+								<capacities>
+									<li>Scratch</li>
+								</capacities>
+								<power>10</power>
+								<cooldownTime>1</cooldownTime>
+								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>20</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>0.25</armorPenetrationSharp>
+								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<capacities>
+									<li>AA_ToxicBite</li>
+								</capacities>
+								<power>24</power>
+								<cooldownTime>1.5</cooldownTime>
+								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>20</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>2.4</armorPenetrationSharp>
+								<armorPenetrationBlunt>6.544</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>4</power>
+								<cooldownTime>2</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>0.523</armorPenetrationBlunt>
+								<chanceFactor>0.2</chanceFactor>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Overgrown_Colossus.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Overgrown_Colossus.xml
new file mode 100644
index 0000000000..da86d68c7f
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Overgrown_Colossus.xml	
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_OvergrownColossus" or
+			defName="AA_AnimaColossus"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_OvergrownColossus" or
+			defName="AA_AnimaColossus"
+			]/statBases </xpath>
+		<value>
+			<MeleeDodgeChance>0.00</MeleeDodgeChance>
+			<MeleeCritChance>0.45</MeleeCritChance>
+			<MeleeParryChance>0.40</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_OvergrownColossus" or
+			defName="AA_AnimaColossus"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>2.4</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>3.3</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>25</armorPenetrationBlunt>
+					<chanceFactor>1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Pebble_Mit.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Pebble_Mit.xml
new file mode 100644
index 0000000000..70e8b5fd8c
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Pebble_Mit.xml	
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_PebbleMit"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_PebbleMit"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_PebbleMit"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_PebbleMit"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>0.04</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_PebbleMit"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.2</cooldownTime>
+					<linkedBodyPartsGroup>TurtleBeakAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.33</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.750</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.750</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_PebbleMit"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_PebbleMit"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_PebbleMit"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>275</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_PedigreedRaptor.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_PedigreedRaptor.xml
new file mode 100644
index 0000000000..aeb581963f
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_PedigreedRaptor.xml	
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_PedigreedRaptor"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_PedigreedRaptor"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.27</MeleeDodgeChance>
+			<MeleeCritChance>0.13</MeleeCritChance>
+			<MeleeParryChance>0.08</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_PedigreedRaptor"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.96</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_PheonixOwlcat.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_PheonixOwlcat.xml
new file mode 100644
index 0000000000..a9f1967e1a
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_PheonixOwlcat.xml	
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_PhoenixOwlcat"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_PhoenixOwlcat"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.36</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_PhoenixOwlcat"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>0.9</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.06</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>0.9</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.06</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Plasmorph.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Plasmorph.xml
new file mode 100644
index 0000000000..c140836bbb
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Plasmorph.xml	
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Plasmorph"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Serpentine</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Plasmorph"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Plasmorph"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Plasmorph"]</xpath>
+		<value>
+			<butcherProducts>
+				<Prometheum>12</Prometheum>
+			</butcherProducts>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Plasmorph"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.01</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Plasmorph"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>eyestalk</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>AA_EyestalkAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_Plasmorph"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_Plasmorph"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Plasmorph"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>500</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Radyak.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Radyak.xml
new file mode 100644
index 0000000000..e270c303bb
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Radyak.xml	
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Radyak"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Radyak"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.04</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>0.4</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Radyak"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.700</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>2.2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.125</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Raptor_Shrimp.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Raptor_Shrimp.xml
new file mode 100644
index 0000000000..b7e96378ed
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Raptor_Shrimp.xml	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_RaptorShrimp"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_RaptorShrimp"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_RaptorShrimp"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>4</ArmorRating_Blunt>
+			<MeleeDodgeChance>0.12</MeleeDodgeChance>
+			<MeleeCritChance>0.34</MeleeCritChance>
+			<MeleeParryChance>0.4</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_RaptorShrimp"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left blade</label>
+					<capacities>
+						<li>AA_Pierce</li>
+					</capacities>
+					<power>48</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>AA_BladeAttackTool</linkedBodyPartsGroup>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right blade</label>
+					<capacities>
+						<li>AA_Pierce</li>
+					</capacities>
+					<power>48</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>AA_BladeAttackTool</linkedBodyPartsGroup>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>AA_Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.750</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.750</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_RaptorShrimp"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_RaptorShrimp"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_RaptorShrimp"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1100</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>200</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Ravager.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Ravager.xml
new file mode 100644
index 0000000000..956efbf5d5
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Ravager.xml	
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Ravager"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Ravager"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Ravager"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Ravager"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>3.1</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Ravager"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.01</MeleeDodgeChance>
+			<MeleeCritChance>0.36</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Ravager"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>triple maw</label>
+					<capacities>
+						<li>AA_ExtraDamageMechanoidsClaws</li>
+					</capacities>
+					<power>43</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_Ravager"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_Ravager"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Ravager"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1400</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Rayhound.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Rayhound.xml
new file mode 100644
index 0000000000..55ee3bbc75
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Rayhound.xml	
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_RayHound"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_RayHound"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_RayHound"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_RayHound"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.33</MeleeDodgeChance>
+			<MeleeCritChance>0.18</MeleeCritChance>
+			<MeleeParryChance>0.08</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_RayHound"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left tentacle</label>
+					<capacities>
+						<li>AA_EMPBlunt</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>AA_TentacleAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.523</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right tentacle</label>
+					<capacities>
+						<li>AA_EMPBlunt</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>AA_TentacleAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.523</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.66</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.78</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.644</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_RayHound"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_RayHound"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_RayHound"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>875</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Razorjack.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Razorjack.xml
new file mode 100644
index 0000000000..6c0c1c0bfa
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Razorjack.xml	
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Razorjack"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Razorjack"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+			<MeleeParryChance>0.08</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Razorjack"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>AA_InfectedClaws</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.2</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>AA_InfectedClaws</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.2</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>razorfangs</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.9</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.225</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.350</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_RedGoo.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_RedGoo.xml
new file mode 100644
index 0000000000..bffcf3166e
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_RedGoo.xml	
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_RedGoo"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_RedGoo"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.02</MeleeDodgeChance>
+			<MeleeCritChance>0.06</MeleeCritChance>
+			<MeleeParryChance>0.04</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_RedGoo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tentacles</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>Arms</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_RedSpore.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_RedSpore.xml
new file mode 100644
index 0000000000..d0ba4919ae
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_RedSpore.xml	
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_RedSpore"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_RedSpore"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.08</MeleeDodgeChance>
+			<MeleeCritChance>0.06</MeleeCritChance>
+			<MeleeParryChance>0.10</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_RedSpore"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tentacles</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>Arms</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_RipperHound.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_RipperHound.xml
new file mode 100644
index 0000000000..b68a8bf450
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_RipperHound.xml	
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_RipperHound"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_RipperHound"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>0.11</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_RipperHound"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_RipperHound"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_RipperHound"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>AA_ExtraDamageInsectoidsClaws</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<armorPenetrationSharp>15</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>AA_ExtraDamageInsectoidsClaws</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<armorPenetrationSharp>15</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.4</chanceFactor>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<armorPenetrationSharp>12</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.350</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_RipperHound"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_RipperHound"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_RipperHound"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>875</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_RoughPlatedMonitor.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_RoughPlatedMonitor.xml
new file mode 100644
index 0000000000..f5d207fa00
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_RoughPlatedMonitor.xml	
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_RoughPlatedMonitor"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Serpentine</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_RoughPlatedMonitor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3.4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_RoughPlatedMonitor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_RoughPlatedMonitor"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.24</MeleeCritChance>
+			<MeleeParryChance>0.14</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_RoughPlatedMonitor"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>fangs</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>2.2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.9</chanceFactor>
+					<armorPenetrationSharp>0.7</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_RoughPlatedMonitor"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_RoughPlatedMonitor"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_RoughPlatedMonitor"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1000</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Royal_Aves.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Royal_Aves.xml
new file mode 100644
index 0000000000..e0daeec9c3
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Royal_Aves.xml	
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_RoyalAve"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_RoyalAve"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_RoyalAve"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.55</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>13</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.6</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_SandLion.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_SandLion.xml
new file mode 100644
index 0000000000..f70da0bc30
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_SandLion.xml	
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_SandLion"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_SandLion"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.56</MeleeDodgeChance>
+			<MeleeCritChance>0.24</MeleeCritChance>
+			<MeleeParryChance>0.14</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_SandLion"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Cut</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>0.72</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>25</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Cut</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>0.72</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>25</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+						<li>Stab</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>1.38</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>4.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.55</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_SandProwler.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_SandProwler.xml
new file mode 100644
index 0000000000..8380360427
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_SandProwler.xml	
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_SandProwler"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_SandProwler"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.66</MeleeDodgeChance>
+			<MeleeCritChance>0.27</MeleeCritChance>
+			<MeleeParryChance>0.17</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_SandProwler"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.6</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.6</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>32</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>4</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.55</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Sand_Squid.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Sand_Squid.xml
new file mode 100644
index 0000000000..d17d23d0ab
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Sand_Squid.xml	
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_SandSquid"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Serpentine</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_SandSquid"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>18</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_SandSquid"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_SandSquid"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.08</MeleeCritChance>
+			<MeleeParryChance>0.4</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_SandSquid"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.68</cooldownTime>
+					<linkedBodyPartsGroup>AA_Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.14</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>tentacle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>AA_TentacleAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_SandSquid"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_SandSquid"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_SandSquid"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>750</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_ShadowCharger.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_ShadowCharger.xml
new file mode 100644
index 0000000000..d760aa7b35
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_ShadowCharger.xml	
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_ShadowCharger"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_ShadowCharger"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.4</MeleeCritChance>
+			<MeleeParryChance>0.35</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_ShadowCharger"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2.6</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_ShockGoat.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_ShockGoat.xml
new file mode 100644
index 0000000000..656e25bc76
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_ShockGoat.xml	
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_ShockGoat"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_ShockGoat"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.07</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_ShockGoat"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>AA_Electric</li>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>AA_Electric</li>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.60</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>horns</label>
+					<capacities>
+						<li>AA_Electric</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.750</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Skiphound.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Skiphound.xml
new file mode 100644
index 0000000000..c9184787fa
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Skiphound.xml	
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Skiphound"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Skiphound"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>0.18</MeleeCritChance>
+			<MeleeParryChance>0.08</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Skiphound"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.144</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Skyeel.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Skyeel.xml
new file mode 100644
index 0000000000..8534fad12f
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Skyeel.xml	
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Skyeel"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Skyeel"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Skyeel"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.3</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Skyeel"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			<MeleeCritChance>0.03</MeleeCritChance>
+			<MeleeParryChance>0</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Skyeel"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>AA_Electric</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>0.32</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_Skyeel"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_Skyeel"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Skyeel"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>812</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>450</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Slurrypede.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Slurrypede.xml
new file mode 100644
index 0000000000..58d7fc64bb
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Slurrypede.xml	
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Slurrypede"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Slurrypede"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.12</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>0.17</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Slurrypede"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Slurrypede"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>9</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Slurrypede"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>2.7</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_Slurrypede"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_Slurrypede"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Slurrypede"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>3500</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>350</MaxOverHeal>
+				<MinArmorPct>0.5</MinArmorPct>
+				<MinArmorValueSharp>6</MinArmorValueSharp>
+				<MinArmorValueBlunt>12</MinArmorValueBlunt>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_SpinedGow.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_SpinedGow.xml
new file mode 100644
index 0000000000..b7ed75d8f6
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_SpinedGow.xml	
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_SpinedGow"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_SpinedGow"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.04</MeleeDodgeChance>
+			<MeleeCritChance>0.32</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_SpinedGow"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>2.64</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_SpitterDryad.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_SpitterDryad.xml
new file mode 100644
index 0000000000..4366b065d0
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_SpitterDryad.xml	
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Ideology</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AA_Dryad_Spitter"]/statBases</xpath>
+					<value>
+						<AimingAccuracy>0.6</AimingAccuracy>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_Dryad_Spitter"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
+					</value>
+				</li>
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_Dryad_Spitter"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>5</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="AA_Dryad_Spitter"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AA_Dryad_Spitter"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AA_Dryad_Spitter"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>487</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>600</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<MinArmorPct>0.75</MinArmorPct>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Swarmling.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Swarmling.xml
new file mode 100644
index 0000000000..984230ab29
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Swarmling.xml	
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Swarmling"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Swarmling"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.33</MeleeDodgeChance>
+			<MeleeCritChance>0</MeleeCritChance>
+			<MeleeParryChance>0</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Swarmling"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>AA_SwarmlingClaws</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>0.75</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.316</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>AA_SwarmlingClaws</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>0.75</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.316</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.63</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.844</armorPenetrationBlunt>
+					<chanceFactor>0.7</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>0.323</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_TarGuzzler.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_TarGuzzler.xml
new file mode 100644
index 0000000000..03b35b519f
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_TarGuzzler.xml	
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_TarGuzzler"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_TarGuzzler"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>4</ArmorRating_Blunt>
+			<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+			<MeleeDodgeChance>0.02</MeleeDodgeChance>
+			<MeleeCritChance>0.35</MeleeCritChance>
+			<MeleeParryChance>0.23</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_TarGuzzler"]/tools</xpath>
+		<value>
+			<tools>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>gaping maw</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.9</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+					<armorPenetrationSharp>7.5</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_TeratogenicOriginator.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_TeratogenicOriginator.xml
new file mode 100644
index 0000000000..597a3fdf32
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_TeratogenicOriginator.xml	
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_TeratogenicOriginator"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_TeratogenicOriginator"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			<MeleeCritChance>0.04</MeleeCritChance>
+			<MeleeParryChance>0.3</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_TeratogenicOriginator"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tentacles</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.35</cooldownTime>
+					<linkedBodyPartsGroup>Arms</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.7</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Terramorph.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Terramorph.xml
new file mode 100644
index 0000000000..60c1c132f1
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Terramorph.xml	
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Terramorph"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Terramorph"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Terramorph"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>9</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Terramorph"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.02</MeleeDodgeChance>
+			<MeleeCritChance>0.27</MeleeCritChance>
+			<MeleeParryChance>0.4</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Terramorph"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fangs</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>3.8</cooldownTime>
+					<linkedBodyPartsGroup>TurtleBeakAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>20</armorPenetrationSharp>
+					<armorPenetrationBlunt>40</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.75</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_Terramorph"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_Terramorph"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Terramorph"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>625</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Tetra_Slug.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Tetra_Slug.xml
new file mode 100644
index 0000000000..2aef9d24c9
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Tetra_Slug.xml	
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_TetraSlug"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Serpentine</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_TetraSlug"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.06</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>0.38</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_TetraSlug"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>body</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.88</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>41</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>13</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Thermadon.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Thermadon.xml
new file mode 100644
index 0000000000..d0d6cde21d
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Thermadon.xml	
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Thermadon"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Thermadon"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Thermadon"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>7.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Thermadon"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency>0.5</NightVisionEfficiency>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Thermadon"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>2</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Thermadon"]</xpath>
+		<value>
+			<butcherProducts>
+				<FSX>4</FSX>
+				<Prometheum>8</Prometheum>
+			</butcherProducts>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Thermadon"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head claw</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>3</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>5</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head claw</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>2.8</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_Thermadon"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_Thermadon"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Thermadon"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1125</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Thunderbeast.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Thunderbeast.xml
new file mode 100644
index 0000000000..5699280101
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Thunderbeast.xml	
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Thunderbeast"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Thunderbeast"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2.8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Thunderbeast"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.65</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Don't know about balancing -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Thunderbeast"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.16</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Thunderbeast"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>AA_Electric</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>2.6</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2.4</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.4</chanceFactor>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>AA_Electric</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>3</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_Thunderbeast"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_Thunderbeast"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Thunderbeast"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>875</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Thunderox.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Thunderox.xml
new file mode 100644
index 0000000000..45c847fc73
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Thunderox.xml	
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Thunderox"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Thunderox"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.45</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Thunderox"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>battleram</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>3</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>runehorn</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>2.6</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_UnblinkingEye.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_UnblinkingEye.xml
new file mode 100644
index 0000000000..764a84ac87
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_UnblinkingEye.xml	
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Ideology</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AA_UnblinkingEye"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Birdlike</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_UnblinkingEye"]/statBases/MoveSpeed</xpath>
+					<value>
+						<MoveSpeed>4</MoveSpeed>
+						<NightVisionEfficiency>0.8</NightVisionEfficiency>
+						<AimingAccuracy>1</AimingAccuracy>
+						<MeleeDodgeChance>0.70</MeleeDodgeChance>
+						<MeleeCritChance>0.80</MeleeCritChance>
+						<MeleeParryChance>0.1</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_UnblinkingEye"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>9.85</ArmorRating_Blunt>
+					</value>
+				</li>
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_UnblinkingEye"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>4.25</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_UnblinkingEye"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<capacities>
+									<li>Bite</li>
+								</capacities>
+								<power>48</power>
+								<cooldownTime>2.0</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationSharp>12</armorPenetrationSharp>
+								<armorPenetrationBlunt>44</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>36</power>
+								<cooldownTime>3</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>64</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AA_UnblinkingEye"]/comps</xpath>
+					<value>
+						<li Class="AnimalBehaviours.CompProperties_InitialHediff">
+							<hediffname>AA_LowBleed</hediffname>
+							<hediffseverity>1</hediffseverity>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="AA_UnblinkingEye"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AA_UnblinkingEye"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AA_UnblinkingEye"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>6750</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>450</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<MinArmorPct>0.5</MinArmorPct>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Wildpawn.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Wildpawn.xml
new file mode 100644
index 0000000000..7bdd365674
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Wildpawn.xml	
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Wildpawn"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Wildpawn"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Wildpawn"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Wildpawn"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.07</MeleeDodgeChance>
+			<MeleeCritChance>0.04</MeleeCritChance>
+			<MeleeParryChance>0.11</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Wildpawn"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left paw</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>13</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right paw</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>13</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Wildpod.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Wildpod.xml
new file mode 100644
index 0000000000..51e0119d09
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Wildpod.xml	
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Wildpod"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Wildpod"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>48</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Wildpod"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>23</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_Wildpod"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.06</MeleeDodgeChance>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.28</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_Wildpod"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left paw</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right paw</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.21</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Windbeast.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Windbeast.xml
new file mode 100644
index 0000000000..0143bdff60
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Windbeast.xml	
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_WindBeast"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_WindBeast"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2.8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_WindBeast"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.65</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_WindBeast"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.16</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_WindBeast"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>2.6</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2.4</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.4</chanceFactor>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>3</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AA_WindBeast"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AA_WindBeast"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AA_WindBeast"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>875</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/VFE_Mechs/VFESlurrymaster.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/VFE_Mechs/VFESlurrymaster.xml
new file mode 100644
index 0000000000..eafbaec4cb
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/VFE_Mechs/VFESlurrymaster.xml	
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Factions Expanded - Mechanoids</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Slurrymaster"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>QuadrupedLow</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Slurrymaster"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.12</MeleeDodgeChance>
+						<MeleeCritChance>0.1</MeleeCritChance>
+						<MeleeParryChance>0.17</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Slurrymaster"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>22</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Slurrymaster"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>10</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Slurrymaster"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>16</power>
+								<cooldownTime>2.7</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>12</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Slurrymaster"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Slurrymaster"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Slurrymaster"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>4500</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>450</MaxOverHeal>
+							<MinArmorPct>0.5</MinArmorPct>
+							<MinArmorValueSharp>6</MinArmorValueSharp>
+							<MinArmorValueBlunt>12</MinArmorValueBlunt>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Biomes/Defs/Alpha Biomes/Defs_Ammo.xml b/ModPatches/Alpha Biomes/Defs/Alpha Biomes/Defs_Ammo.xml
new file mode 100644
index 0000000000..72b6ee80c3
--- /dev/null
+++ b/ModPatches/Alpha Biomes/Defs/Alpha Biomes/Defs_Ammo.xml	
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+    <CombatExtended.AmmoCategoryDef>
+        <defName>Tar</defName>
+        <label>Tar</label>
+        <description>Releases a splattering of thick, black substance.</description>
+    </CombatExtended.AmmoCategoryDef>
+
+    <!-- ======== Projectiles ======== -->
+
+    <ThingDef ParentName="Base81mmMortarShell">
+        <defName>Bullet_81mmMortarShell_Tar</defName>
+        <label>81mm mortar shell (Tar)</label>
+        <graphicData>
+            <texPath>Things/Projectile/ShellHighExplosive</texPath>
+            <graphicClass>Graphic_Single</graphicClass>
+        </graphicData>
+        <projectile Class="CombatExtended.ProjectilePropertiesCE">
+            <damageDef>AB_Tar</damageDef>
+            <damageAmountBase>40</damageAmountBase>
+            <explosionRadius>3.5</explosionRadius>
+            <flyOverhead>true</flyOverhead>
+            <soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+            <soundExplode>Explosion_Smoke</soundExplode>
+            <soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+            <soundAmbient>MortarRound_Ambient</soundAmbient>
+            <postExplosionSpawnThingDef>AB_Filth_Tar</postExplosionSpawnThingDef>
+            <postExplosionSpawnChance>0.8</postExplosionSpawnChance>
+            <applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+        </projectile>
+    </ThingDef>            
+
+    <!-- ======== Recipes ======== -->
+
+    <RecipeDef ParentName="AmmoRecipeBase">
+        <defName>MakeAB_Shell_Tar</defName>
+        <label>make 81mm tar mortar shell x2</label>
+        <description>Craft 2 tar shells.</description>
+        <jobString>Making 81mm tar shells.</jobString>
+        <ingredients>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>Steel</li>
+                    </thingDefs>
+                </filter>
+                <count>25</count>
+            </li>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>ComponentIndustrial</li>
+                    </thingDefs>
+                </filter>
+                <count>2</count>
+            </li>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>AB_AsphaltBucket</li>
+                    </thingDefs>
+                </filter>
+                <count>10</count>
+            </li>
+        </ingredients>
+        <fixedIngredientFilter>
+            <thingDefs>
+                <li>Steel</li>
+                <li>ComponentIndustrial</li>
+                <li>AB_AsphaltBucket</li>
+            </thingDefs>
+        </fixedIngredientFilter>
+        <products>
+            <AB_Shell_Tar>2</AB_Shell_Tar>
+        </products>
+        <workAmount>3000</workAmount>
+        <researchPrerequisite>Mortars</researchPrerequisite>
+    </RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Alpha Biomes/Patches/Alpha Biomes/Items_Resource_Stuff.xml b/ModPatches/Alpha Biomes/Patches/Alpha Biomes/Items_Resource_Stuff.xml
new file mode 100644
index 0000000000..f8cd629862
--- /dev/null
+++ b/ModPatches/Alpha Biomes/Patches/Alpha Biomes/Items_Resource_Stuff.xml	
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ======== Psychotropic Fungus ======== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AB_PsychotropicFungus"]/statBases</xpath>
+		<value>
+			<Bulk>0.05</Bulk>
+		</value>
+	</Operation>
+
+	<!-- ======== Alcyonite Chunk ======== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AB_AlcyoniteChunk"]/statBases</xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AB_AlcyoniteChunk"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.1</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AB_AlcyoniteChunk"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>1.7</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AB_AlcyoniteChunk"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<!-- ======== Red, Crystal and Mushroom Wood ======== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GU_RedWood" or defName="AB_MushroomWoodLog" or defName="AB_CrystalWood"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.99</cooldownTime>
+					<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AB_MushroomWoodLog" or defName="AB_CrystalWood"]</xpath>
+		<value>
+			<li Class="CombatExtended.StuffToughnessMultiplierExtensionCE">
+				<toughnessMultiplier>4</toughnessMultiplier>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Alpha Animals</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GU_RedWood" or defName="AB_MushroomWoodLog" or defName="AB_CrystalWood"]/equippedStatOffsets</xpath>
+					<value>
+						<equippedStatOffsets>
+							<MeleeCritChance>0.2</MeleeCritChance>
+							<MeleeParryChance>1</MeleeParryChance>
+							<MeleeDodgeChance>0.13</MeleeDodgeChance>
+						</equippedStatOffsets>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AB_MushroomWoodLog" or defName="AB_CrystalWood"]/statBases/StuffPower_Armor_Sharp</xpath>
+					<value>
+						<Bulk>0.07</Bulk>
+						<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
+						<StuffPower_Armor_Sharp>0.1</StuffPower_Armor_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GU_RedWood" or defName="AB_MushroomWoodLog" or defName="AB_CrystalWood"]/statBases/StuffPower_Armor_Blunt</xpath>
+					<value>
+						<StuffPower_Armor_Blunt>0.2</StuffPower_Armor_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GU_RedWood" or defName="AB_MushroomWoodLog" or defName="AB_CrystalWood"]/statBases/StuffPower_Armor_Heat</xpath>
+					<value>
+						<StuffPower_Armor_Heat>0.025</StuffPower_Armor_Heat>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+
+		<nomatch Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GU_RedWood" or defName="AB_MushroomWoodLog" or defName="AB_CrystalWood"]/statBases/StuffPower_Armor_Sharp</xpath>
+					<value>
+						<Bulk>0.07</Bulk>
+						<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
+						<StuffPower_Armor_Sharp>0.1</StuffPower_Armor_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GU_RedWood" or defName="AB_MushroomWoodLog" or defName="AB_CrystalWood"]/statBases/StuffPower_Armor_Blunt</xpath>
+					<value>
+						<StuffPower_Armor_Blunt>0.2</StuffPower_Armor_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GU_RedWood" or defName="AB_MushroomWoodLog" or defName="AB_CrystalWood"]/statBases/StuffPower_Armor_Heat</xpath>
+					<value>
+						<StuffPower_Armor_Heat>0.025</StuffPower_Armor_Heat>
+					</value>
+				</li>
+
+			</operations>
+		</nomatch>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Biomes/Patches/Alpha Biomes/RangedIndustrialGrenades.xml b/ModPatches/Alpha Biomes/Patches/Alpha Biomes/RangedIndustrialGrenades.xml
new file mode 100644
index 0000000000..8378bb8c0d
--- /dev/null
+++ b/ModPatches/Alpha Biomes/Patches/Alpha Biomes/RangedIndustrialGrenades.xml	
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Poison Dart ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AB_WeaponPoisonDart</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1</SwayFactor>
+			<Bulk>1</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>AB_WeaponPoisonDartProjectile</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>14</range>
+			<soundCast>ThrowGrenade</soundCast>
+			<muzzleFlashScale>0</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AB_WeaponPoisonDart"]</xpath>
+		<value>
+			<equippedAngleOffset>60</equippedAngleOffset>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="AB_WeaponPoisonDartProjectile"]/projectile</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.ProjectilePropertiesCE</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AB_WeaponPoisonDartProjectile"]</xpath>
+		<value>
+			<thingClass>CombatExtended.BulletCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AB_WeaponPoisonDartProjectile"]/projectile</xpath>
+		<value>
+			<armorPenetrationSharp>1.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AB_WeaponPoisonDartProjectile"]/projectile/speed</xpath>
+		<value>
+			<speed>12</speed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AB_WeaponPoisonDartProjectile"]/projectile/damageAmountBase</xpath>
+		<value>
+			<damageAmountBase>5</damageAmountBase>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Biomes/Patches/Alpha Biomes/TarShell.xml b/ModPatches/Alpha Biomes/Patches/Alpha Biomes/TarShell.xml
new file mode 100644
index 0000000000..8a84805a85
--- /dev/null
+++ b/ModPatches/Alpha Biomes/Patches/Alpha Biomes/TarShell.xml	
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AB_Shell_Tar"]</xpath>
+		<value>
+			<ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBaseCraftableBase">
+				<defName>AB_Shell_Tar</defName>
+				<label>81mm mortar shell (Tar)</label>
+				<graphicData>
+					<texPath>Things/Item/Resource/AB_Shell_Tar</texPath>
+					<graphicClass>Graphic_StackCount</graphicClass>
+				</graphicData>
+				<statBases>
+					<MarketValue>30.03</MarketValue>
+					<Mass>5</Mass>
+					<Bulk>8.34</Bulk>
+				</statBases>
+				<ammoClass>Tar</ammoClass>
+				<detonateProjectile>Bullet_81mmMortarShell_Tar</detonateProjectile>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_81mmMortarShell"]/ammoTypes</xpath>
+		<value>
+			<AB_Shell_Tar>Bullet_81mmMortarShell_Tar</AB_Shell_Tar>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Biomes/Patches/Alpha Biomes/Tar_IED.xml b/ModPatches/Alpha Biomes/Patches/Alpha Biomes/Tar_IED.xml
new file mode 100644
index 0000000000..31b5f0d57d
--- /dev/null
+++ b/ModPatches/Alpha Biomes/Patches/Alpha Biomes/Tar_IED.xml	
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === IED === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AB_TrapIED_Tar"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>10</Steel>
+				<ComponentIndustrial>1</ComponentIndustrial>
+				<AB_ProcessedResin>1</AB_ProcessedResin>
+			</costList>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Genes/Patches/Alpha Genes/AG_Royalty/HediffDefs/HediffDefs_Patch.xml b/ModPatches/Alpha Genes/Patches/Alpha Genes/AG_Royalty/HediffDefs/HediffDefs_Patch.xml
new file mode 100644
index 0000000000..9018ae75c2
--- /dev/null
+++ b/ModPatches/Alpha Genes/Patches/Alpha Genes/AG_Royalty/HediffDefs/HediffDefs_Patch.xml	
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Royalty</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!-- ======= Psychic Sight NV ======= -->
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/HediffDef[defName="AG_PsychicSight"]/stages/li[4]</xpath>
+					<value>
+						<statOffsets>
+							<NightVisionEfficiency>0.2</NightVisionEfficiency>
+						</statOffsets>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/HediffDef[defName="AG_PsychicSight"]/stages/li[5]</xpath>
+					<value>
+						<statOffsets>
+							<NightVisionEfficiency>0.4</NightVisionEfficiency>
+						</statOffsets>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/HediffDef[defName="AG_PsychicSight"]/stages/li[6]</xpath>
+					<value>
+						<statOffsets>
+							<NightVisionEfficiency>0.6</NightVisionEfficiency>
+						</statOffsets>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/HediffDef[defName="AG_PsychicSight"]/stages/li[7]</xpath>
+					<value>
+						<statOffsets>
+							<NightVisionEfficiency>0.8</NightVisionEfficiency>
+						</statOffsets>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Genes/Patches/Alpha Genes/AbilityDefs/AbilityDefs_Patch.xml b/ModPatches/Alpha Genes/Patches/Alpha Genes/AbilityDefs/AbilityDefs_Patch.xml
new file mode 100644
index 0000000000..93f4f88d84
--- /dev/null
+++ b/ModPatches/Alpha Genes/Patches/Alpha Genes/AbilityDefs/AbilityDefs_Patch.xml	
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ======= Wing-Powered Jump ======= -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AbilityDef[defName="AG_WingPoweredJump"]/verbProperties/range</xpath>
+		<value>
+			<range>8.9</range>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Genes/Patches/Alpha Genes/DamageDefs/DamageDefs_Patch.xml b/ModPatches/Alpha Genes/Patches/Alpha Genes/DamageDefs/DamageDefs_Patch.xml
new file mode 100644
index 0000000000..699648fba6
--- /dev/null
+++ b/ModPatches/Alpha Genes/Patches/Alpha Genes/DamageDefs/DamageDefs_Patch.xml	
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ======= Patch-out melee stun mechanic from ranged blunt damage ======= -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/DamageDef[defName="AG_RangedBlunt"]/*[self::bluntStunDuration or self::bluntStunChancePerDamagePctOfCorePartToHeadCurve or self::bluntStunChancePerDamagePctOfCorePartToBodyCurve]</xpath>
+	</Operation>
+
+	<!-- ======= Electric Shock ======= -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/DamageDef[defName="AG_Electric"]</xpath>
+		<value>
+			<li Class="CombatExtended.DamageDefExtensionCE">
+				<isAmbientDamage>true</isAmbientDamage>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="AG_Electric"]/armorCategory</xpath>
+		<value>
+			<armorCategory>Electric</armorCategory>
+		</value>
+	</Operation>
+
+	<!-- ======= Acid Spit ======= -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/DamageDef[defName="AG_AcidSpit"]</xpath>
+		<value>
+			<li Class="CombatExtended.DamageDefExtensionCE">
+				<isAmbientDamage>true</isAmbientDamage>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Genes/Patches/Alpha Genes/GeneDefs/GeneDefs_Archite.xml b/ModPatches/Alpha Genes/Patches/Alpha Genes/GeneDefs/GeneDefs_Archite.xml
new file mode 100644
index 0000000000..0b5ed404e9
--- /dev/null
+++ b/ModPatches/Alpha Genes/Patches/Alpha Genes/GeneDefs/GeneDefs_Archite.xml	
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/GeneDef[defName="AG_HeatImmunity"]/damageFactors</xpath>
+		<value>
+			<PrometheumFlame>0.0</PrometheumFlame>
+			<Flame_Secondary>0.0</Flame_Secondary>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Genes/Patches/Alpha Genes/GeneDefs/GeneDefs_Armour.xml b/ModPatches/Alpha Genes/Patches/Alpha Genes/GeneDefs/GeneDefs_Armour.xml
new file mode 100644
index 0000000000..b17dfb14d6
--- /dev/null
+++ b/ModPatches/Alpha Genes/Patches/Alpha Genes/GeneDefs/GeneDefs_Armour.xml	
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/GeneDef[defName="AG_FungalSkin"]/customEffectDescriptions</xpath>
+		<value>
+			<customEffectDescriptions>
+				<li>+3/4.5 blunt/sharp natural armour. +25% injury healing factor.</li>
+				<li>Fires will cause permanent wounds.</li>
+			</customEffectDescriptions>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/GeneDef[defName="AG_ArmourMinor"]/customEffectDescriptions</xpath>
+		<value>
+			<customEffectDescriptions>
+				<li>+1/1.5 blunt/sharp natural armour.</li>
+			</customEffectDescriptions>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/GeneDef[defName="AG_ArmourMedium"]/customEffectDescriptions</xpath>
+		<value>
+			<customEffectDescriptions>
+				<li>+2/3 blunt/sharp natural armour.</li>
+			</customEffectDescriptions>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/GeneDef[defName="AG_ArmourMajor"]/customEffectDescriptions</xpath>
+		<value>
+			<customEffectDescriptions>
+				<li>+2.5/3.75 blunt/sharp natural armour.</li>
+			</customEffectDescriptions>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Genes/Patches/Alpha Genes/GeneDefs/GeneDefs_BodySize.xml b/ModPatches/Alpha Genes/Patches/Alpha Genes/GeneDefs/GeneDefs_BodySize.xml
new file mode 100644
index 0000000000..294312252e
--- /dev/null
+++ b/ModPatches/Alpha Genes/Patches/Alpha Genes/GeneDefs/GeneDefs_BodySize.xml	
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/GeneDef[defName="AG_LargerBodySize"]/statFactors</xpath>
+		<value>
+			<CarryWeight>1.25</CarryWeight>
+			<CarryBulk>1.25</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/GeneDef[defName="AG_LargerBodySize"]/statFactors/IncomingDamageFactor</xpath>
+		<value>
+			<IncomingDamageFactor>0.9</IncomingDamageFactor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/GeneDef[defName="AG_SmallerBodySize"]/statFactors</xpath>
+		<value>
+			<CarryWeight>0.75</CarryWeight>
+			<CarryBulk>0.75</CarryBulk>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Genes/Patches/Alpha Genes/GeneDefs/GeneDefs_Health.xml b/ModPatches/Alpha Genes/Patches/Alpha Genes/GeneDefs/GeneDefs_Health.xml
new file mode 100644
index 0000000000..473caf51de
--- /dev/null
+++ b/ModPatches/Alpha Genes/Patches/Alpha Genes/GeneDefs/GeneDefs_Health.xml	
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/GeneDef[defName="AG_PackMule"]/statFactors</xpath>
+		<value>
+			<CarryWeight>1.5</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/GeneDef[defName="AG_FrailBack"]/statFactors</xpath>
+		<value>
+			<CarryWeight>0.5</CarryWeight>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Genes/Patches/Alpha Genes/HediffDefs/Hediffs_Ability.xml b/ModPatches/Alpha Genes/Patches/Alpha Genes/HediffDefs/Hediffs_Ability.xml
new file mode 100644
index 0000000000..680d261510
--- /dev/null
+++ b/ModPatches/Alpha Genes/Patches/Alpha Genes/HediffDefs/Hediffs_Ability.xml	
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AG_LungRotStrengthHediff"]/stages/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ArmorRating_Blunt>1.0</ArmorRating_Blunt>
+				<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+				<InjuryHealingFactor>0.15</InjuryHealingFactor>
+			</statOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Genes/Patches/Alpha Genes/HediffDefs/Hediffs_Armour.xml b/ModPatches/Alpha Genes/Patches/Alpha Genes/HediffDefs/Hediffs_Armour.xml
new file mode 100644
index 0000000000..ce0b952016
--- /dev/null
+++ b/ModPatches/Alpha Genes/Patches/Alpha Genes/HediffDefs/Hediffs_Armour.xml	
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AG_FungalSkin"]/stages/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ArmorRating_Blunt>3.0</ArmorRating_Blunt>
+				<ArmorRating_Sharp>4.5</ArmorRating_Sharp>
+				<InjuryHealingFactor>0.25</InjuryHealingFactor>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AG_ArmourMinor"]/stages/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ArmorRating_Blunt>1.0</ArmorRating_Blunt>
+				<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AG_ArmourMedium"]/stages/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ArmorRating_Blunt>2.0</ArmorRating_Blunt>
+				<ArmorRating_Sharp>3.0</ArmorRating_Sharp>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AG_ArmourMajor"]/stages/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ArmorRating_Blunt>2.5</ArmorRating_Blunt>
+				<ArmorRating_Sharp>3.75</ArmorRating_Sharp>
+			</statOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Genes/Patches/Alpha Genes/HediffDefs/Hediffs_Attacks.xml b/ModPatches/Alpha Genes/Patches/Alpha Genes/HediffDefs/Hediffs_Attacks.xml
new file mode 100644
index 0000000000..9f41aff897
--- /dev/null
+++ b/ModPatches/Alpha Genes/Patches/Alpha Genes/HediffDefs/Hediffs_Attacks.xml	
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AG_HornAttack"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationSharp>1.0</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AG_ChainsawHands"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>chainsaw</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.0</cooldownTime>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AG_ScytherHands"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>scyther blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.3</cooldownTime>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.0</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AG_ClawedHands"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>clawed hand</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.3</cooldownTime>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AG_CrabClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claw</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>2.0</cooldownTime>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AG_VenomFangs"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>venom fangs</label>
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>2.0</cooldownTime>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.0</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AG_AcidFangs"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>acid fangs</label>
+					<capacities>
+						<li>AG_Acid</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>2.0</cooldownTime>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AG_VFEI_VenomGland"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>venom gland</label>
+					<capacities>
+						<li>AG_SpittingOnPawn</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4</cooldownTime>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AG_VFEI_PneumaticClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claw</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>3.6</cooldownTime>
+					<armorPenetrationBlunt>22.05</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Genes/Patches/Alpha Genes/HediffDefs/Hediffs_Mechanitor.xml b/ModPatches/Alpha Genes/Patches/Alpha Genes/HediffDefs/Hediffs_Mechanitor.xml
new file mode 100644
index 0000000000..89663e97a3
--- /dev/null
+++ b/ModPatches/Alpha Genes/Patches/Alpha Genes/HediffDefs/Hediffs_Mechanitor.xml	
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ======= Reactive Armour ======= -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AG_MechRepairBoost"]/stages/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ArmorRating_Blunt>2</ArmorRating_Blunt>
+				<ArmorRating_Sharp>1</ArmorRating_Sharp>
+			</statOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Genes/Patches/Alpha Genes/HediffDefs/Hediffs_MetalResource.xml b/ModPatches/Alpha Genes/Patches/Alpha Genes/HediffDefs/Hediffs_MetalResource.xml
new file mode 100644
index 0000000000..0132895627
--- /dev/null
+++ b/ModPatches/Alpha Genes/Patches/Alpha Genes/HediffDefs/Hediffs_MetalResource.xml	
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ======= Reactive Armour ======= -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AG_ReactiveArmourHediff"]/stages/li[1]/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
+				<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AG_ReactiveArmourHediff"]/stages/li[2]/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ArmorRating_Blunt>2.0</ArmorRating_Blunt>
+				<ArmorRating_Sharp>3.0</ArmorRating_Sharp>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AG_ReactiveArmourHediff"]/stages/li[3]/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ArmorRating_Blunt>4.0</ArmorRating_Blunt>
+				<ArmorRating_Sharp>6.0</ArmorRating_Sharp>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AG_ReactiveArmourHediff"]/stages/li[4]/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ArmorRating_Blunt>8.0</ArmorRating_Blunt>
+				<ArmorRating_Sharp>12.0</ArmorRating_Sharp>
+			</statOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Misc/Projectiles_Patch.xml b/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Misc/Projectiles_Patch.xml
new file mode 100644
index 0000000000..f225387411
--- /dev/null
+++ b/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Misc/Projectiles_Patch.xml	
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ======= Mineral Clump ======= -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AG_Rocks"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<damageDef>AG_RangedBlunt</damageDef>
+				<speed>55</speed>
+				<damageAmountBase>20</damageAmountBase>
+				<armorPenetrationBlunt>20</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+
+	<!-- ======= Web ======= -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AG_Web"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>Stun</damageDef>
+				<speed>15</speed>
+				<damageAmountBase>15</damageAmountBase>
+			</projectile>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Races/Races_OcularSlinger.xml b/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Races/Races_OcularSlinger.xml
new file mode 100644
index 0000000000..43da453774
--- /dev/null
+++ b/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Races/Races_OcularSlinger.xml	
@@ -0,0 +1,354 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Races Expanded - Phytokin</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[@Name="AG_BaseInsect"]</xpath>
+					<value>
+						<li Class="CombatExtended.PartialArmorExt">
+							<stats>
+								<li>
+									<useStatic>false</useStatic>
+									<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+									<parts>
+										<li>InsectLeg</li>
+									</parts>
+								</li>
+								<li>
+									<useStatic>false</useStatic>
+									<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
+									<parts>
+										<li>InsectLeg</li>
+									</parts>
+								</li>
+							</stats>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[@Name="AG_BaseInsect"]</xpath>
+					<value>
+						<li Class="CombatExtended.PartialArmorExt">
+							<stats>
+								<li>
+									<useStatic>false</useStatic>
+									<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+									<parts>
+										<li>AG_LeftPincer</li>
+										<li>AG_RightPincer</li>
+									</parts>
+								</li>
+								<li>
+									<useStatic>false</useStatic>
+									<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
+									<parts>
+										<li>AG_LeftPincer</li>
+										<li>AG_RightPincer</li>
+									</parts>
+								</li>
+							</stats>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[@Name="AG_BaseInsect"]/statBases</xpath>
+					<value>
+						<PartialArmorBody>0</PartialArmorBody>
+					</value>
+				</li>
+
+				<!-- ======= Eye Projectile ======= -->
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AG_EyeProjectile"]</xpath>
+					<value>
+						<thingClass>CombatExtended.BulletCE</thingClass>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AG_EyeProjectile"]/projectile</xpath>
+					<value>
+						<projectile Class="CombatExtended.ProjectilePropertiesCE">
+							<damageDef>AG_RangedBlunt</damageDef>
+							<speed>55</speed>
+							<damageAmountBase>10</damageAmountBase>
+							<armorPenetrationBlunt>8</armorPenetrationBlunt>
+						</projectile>
+					</value>
+				</li>
+
+				<!-- ======= Ocular Slinger ======= -->
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AG_OcularSlinger"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>QuadrupedLow</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AG_OcularSlinger"]/statBases</xpath>
+					<value>
+						<AimingAccuracy>0.7</AimingAccuracy>
+						<MeleeDodgeChance>0.1</MeleeDodgeChance>
+						<MeleeCritChance>0.4</MeleeCritChance>
+						<MeleeParryChance>0.4</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AG_OcularSlinger"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>4</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AG_OcularSlinger"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>2</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AG_OcularSlinger"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>left pincer</label>
+								<capacities>
+									<li>Scratch</li>
+								</capacities>
+								<power>26</power>
+								<cooldownTime>1.68</cooldownTime>
+								<linkedBodyPartsGroup>AG_PincerAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationSharp>3</armorPenetrationSharp>
+								<armorPenetrationBlunt>6</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>right pincer</label>
+								<capacities>
+									<li>Scratch</li>
+								</capacities>
+								<power>26</power>
+								<cooldownTime>1.68</cooldownTime>
+								<linkedBodyPartsGroup>AG_PincerAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationSharp>3</armorPenetrationSharp>
+								<armorPenetrationBlunt>6</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<capacities>
+									<li>AG_ToxicSting</li>
+								</capacities>
+								<power>24</power>
+								<cooldownTime>1.8</cooldownTime>
+								<linkedBodyPartsGroup>AG_Sting</linkedBodyPartsGroup>
+								<armorPenetrationSharp>10</armorPenetrationSharp>
+								<armorPenetrationBlunt>3</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>4</power>
+								<cooldownTime>2</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+								<chanceFactor>0.1</chanceFactor>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AG_OcularSlinger"]/verbs</xpath>
+					<value>
+						<verbs>
+							<li Class="CombatExtended.VerbPropertiesCE">
+								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+								<hasStandardCommand>true</hasStandardCommand>
+								<defaultProjectile>AG_EyeProjectile</defaultProjectile>
+								<warmupTime>2</warmupTime>
+								<burstShotCount>3</burstShotCount>
+								<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+								<minRange>2</minRange>
+								<range>18</range>
+								<soundCast>AG_Throw</soundCast>
+								<muzzleFlashScale>0</muzzleFlashScale>
+								<label>eye</label>
+								<commonality>0.8</commonality>
+							</li>
+						</verbs>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="AG_OcularSlinger"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AG_OcularSlinger"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AG_OcularSlinger"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>1125</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>600</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<MinArmorPct>0.5</MinArmorPct>
+						</li>
+					</value>
+				</li>
+
+				<!-- ======= AG_ScorpionLike Body ======= -->
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/groups</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart</xpath>
+						<value>
+							<groups>
+								<li>CoveredByNaturalArmor</li>
+							</groups>
+						</value>
+					</nomatch>
+					<match Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/groups</xpath>
+						<value>
+							<li>CoveredByNaturalArmor</li>
+						</value>
+					</match>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/parts/li[def="AG_Thorax"]/groups</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/parts/li[def="AG_Thorax"]</xpath>
+						<value>
+							<groups>
+								<li>CoveredByNaturalArmor</li>
+							</groups>
+						</value>
+					</nomatch>
+					<match Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/parts/li[def="AG_Thorax"]/groups</xpath>
+						<value>
+							<li>CoveredByNaturalArmor</li>
+						</value>
+					</match>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/parts/li[def="Pronotum"]/groups</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/parts/li[def="Pronotum"]</xpath>
+						<value>
+							<groups>
+								<li>CoveredByNaturalArmor</li>
+							</groups>
+						</value>
+					</nomatch>
+					<match Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/parts/li[def="Pronotum"]/groups</xpath>
+						<value>
+							<li>CoveredByNaturalArmor</li>
+						</value>
+					</match>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/groups</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]</xpath>
+						<value>
+							<groups>
+								<li>CoveredByNaturalArmor</li>
+							</groups>
+						</value>
+					</nomatch>
+					<match Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/groups</xpath>
+						<value>
+							<li>CoveredByNaturalArmor</li>
+						</value>
+					</match>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/parts/li[def="AG_InsectMouth"]/groups</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/parts/li[def="AG_InsectMouth"]</xpath>
+						<value>
+							<groups>
+								<li>CoveredByNaturalArmor</li>
+							</groups>
+						</value>
+					</nomatch>
+					<match Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/parts/li[def="AG_InsectMouth"]/groups</xpath>
+						<value>
+							<li>CoveredByNaturalArmor</li>
+						</value>
+					</match>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/parts/li[def="AG_InsectTail"]/groups</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/parts/li[def="AG_InsectTail"]</xpath>
+						<value>
+							<groups>
+								<li>CoveredByNaturalArmor</li>
+							</groups>
+						</value>
+					</nomatch>
+					<match Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/parts/li[def="AG_InsectTail"]/groups</xpath>
+						<value>
+							<li>CoveredByNaturalArmor</li>
+						</value>
+					</match>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/parts/li[def="AG_InsectTail"]/parts/li[def="AG_InsectSting"]/groups</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/parts/li[def="AG_InsectTail"]/parts/li[def="AG_InsectSting"]</xpath>
+						<value>
+							<groups>
+								<li>CoveredByNaturalArmor</li>
+							</groups>
+						</value>
+					</nomatch>
+					<match Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/parts/li[def="AG_InsectTail"]/parts/li[def="AG_InsectSting"]/groups</xpath>
+						<value>
+							<li>CoveredByNaturalArmor</li>
+						</value>
+					</match>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Defs/Alpha Mechs/Ammo_Alpha.xml b/ModPatches/Alpha Mechs/Defs/Alpha Mechs/Ammo_Alpha.xml
new file mode 100644
index 0000000000..34213a09f9
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Defs/Alpha Mechs/Ammo_Alpha.xml	
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- Coil Lance -->
+
+	<CombatExtended.AmmoSetDef  MayRequire="Ludeon.RimWorld.Biotech">
+		<defName>AmmoSet_CoilLance</defName>
+		<label>8mm Railgun</label>
+		<ammoTypes>
+			<Ammo_8mmRailgun_Sabot>Bullet_CoilLance</Ammo_8mmRailgun_Sabot>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="BaseLaserBullet"  MayRequire="Ludeon.RimWorld.Biotech">
+		<defName>Bullet_CoilLance</defName>
+		<label>coil lance shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<isInstant>true</isInstant>
+			<damageFalloff>False</damageFalloff>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>21</damageAmountBase>
+			<armorPenetrationSharp>46.4</armorPenetrationSharp>
+			<armorPenetrationBlunt>312</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<!-- Super HCB -->
+
+	<CombatExtended.AmmoSetDef MayRequire="Ludeon.RimWorld.Biotech">
+		<defName>AmmoSet_12x64mmHyper</defName>
+		<label>12x64mm Charged</label>
+		<ammoTypes>
+			<Ammo_12x64mmCharged>Bullet_12x64mmHyper</Ammo_12x64mmCharged>
+		</ammoTypes>
+		<similarTo>AmmoSet_MechCharged</similarTo>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef ParentName="Base12x64mmChargedBullet" MayRequire="Ludeon.RimWorld.Biotech">
+		<defName>Bullet_12x64mmHyper</defName>
+		<label>12x64mm Hyper bullet</label>
+		<graphicData>
+			<texPath>Things/Projectiles/AM_RedPlasma_Bullet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>52</damageAmountBase>
+			<speed>178</speed>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>13</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>33</armorPenetrationSharp>
+			<armorPenetrationBlunt>400</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<!-- Acid Spewer -->
+
+	<CombatExtended.AmmoSetDef MayRequire="Ludeon.RimWorld.Biotech">
+		<defName>AmmoSet_5x100mmCaselessAcidic</defName>
+		<label>5x100mm Caseless (Acidic)</label>
+		<ammoTypes>
+			<Ammo_5x100mmCaseless_Sabot>Bullet_5x100mmCaseless_Acidic</Ammo_5x100mmCaseless_Sabot>
+		</ammoTypes>
+		<similarTo>AmmoSet_Rifle</similarTo>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef ParentName="Base5x100mmCaselessBullet" MayRequire="Ludeon.RimWorld.Biotech">
+		<defName>Bullet_5x100mmCaseless_Acidic</defName>
+		<label>5x100 Caseless bullet (Acidic)</label>
+		<graphicData>
+			<texPath>Things/Projectile/ToxicNeedleShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>11</damageAmountBase>
+			<armorPenetrationSharp>20</armorPenetrationSharp>
+			<armorPenetrationBlunt>108</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>AM_AcidSpit</def>
+					<amount>15</amount>
+				</li>
+			</secondaryDamage>
+			<speed>204</speed>
+		</projectile>
+	</ThingDef>
+
+	<!-- Rotary Needle launcher -->
+
+	<CombatExtended.AmmoSetDef MayRequire="Ludeon.RimWorld.Biotech">
+		<defName>AmmoSet_5x100mmS</defName>
+		<label>5x100mm Special</label>
+		<ammoTypes>
+			<Ammo_5x100mmCaseless_Sabot>Bullet_5x100mmS_Sabot</Ammo_5x100mmCaseless_Sabot>
+		</ammoTypes>
+		<similarTo>AmmoSet_Rifle</similarTo>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef ParentName="Base5x100mmCaselessBullet" MayRequire="Ludeon.RimWorld.Biotech">
+		<defName>Bullet_5x100mmS_Sabot</defName>
+		<label>5x100 Special bullet (Sabot)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>8</damageAmountBase>
+			<armorPenetrationSharp>12</armorPenetrationSharp>
+			<armorPenetrationBlunt>48</armorPenetrationBlunt>
+			<speed>150</speed>
+		</projectile>
+	</ThingDef>
+
+	<!-- Heavy Laser -->
+
+	<CombatExtended.AmmoSetDef MayRequire="Ludeon.RimWorld.Biotech">
+		<defName>AmmoSet_HeavyLaser</defName>
+		<label>heavy laser charge</label>
+		<ammoTypes>
+			<Ammo_LaserChargePack>Bullet_HeavyLaser</Ammo_LaserChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletRed" MayRequire="Ludeon.RimWorld.Biotech">
+		<defName>Bullet_HeavyLaser</defName>
+		<label>laser shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>17</damageAmountBase>
+			<armorPenetrationSharp>20</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Defs/Alpha Mechs/Defs_Projectiles.xml b/ModPatches/Alpha Mechs/Defs/Alpha Mechs/Defs_Projectiles.xml
new file mode 100644
index 0000000000..e159e0e883
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Defs/Alpha Mechs/Defs_Projectiles.xml	
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="AM_BaseMechProjectile">
+		<defName>AM_CryoBulletCE</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>cryogenic pellet</label>
+		<graphicData>
+			<texPath>Things/Projectiles/AM_Cryo</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<flyOverhead>false</flyOverhead>
+			<speed>40</speed>
+			<damageDef>Frostbite</damageDef>
+			<damageAmountBase>3</damageAmountBase>
+			<explosionRadius>2.9</explosionRadius>
+			<soundExplode>AM_Cryogun</soundExplode>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBulletCE" MayRequire="Ludeon.RimWorld.Biotech">
+		<defName>AM_Bullet_SoulDrain_CE</defName>
+		<label>soul drain</label>
+		<thingClass>CombatExtended.BulletCE</thingClass>
+		<graphicData>
+			<texPath>Things/Projectiles/AM_SoulDrain</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>(3,3)</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>AM_SoulDrain</damageDef>
+			<damageAmountBase>15</damageAmountBase>
+			<armorPenetrationBlunt>20</armorPenetrationBlunt>
+			<speed>90</speed>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Apiarist.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Apiarist.xml
new file mode 100644
index 0000000000..b0259480f0
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Apiarist.xml	
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ====== Winged Mech ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_Mech_Winged_Body"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_Mech_Winged_Body"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_Mech_Winged_Body"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_Mech_Winged_Body"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_Mech_Winged_Body"]/corePart/parts/li[def="MechanicalNeck"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_Mech_Winged_Body"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_Mech_Winged_Body"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_Mech_Winged_Body"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_Mech_Winged_Body"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_Mech_Winged_Body"]/corePart/parts/li[def="AM_MechanoidBeeWing"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_Mech_Winged_Body"]/corePart/parts/li[def="AM_MechanoidBeeWing"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_Mech_Winged_Body"]/corePart/parts/li[def="AM_MechanoidBeeWing"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Apocriton.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Apocriton.xml
new file mode 100644
index 0000000000..e18bf8469b
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Apocriton.xml	
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ====== Winged Apocriton ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalNeck"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalLeg"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="AM_MechanoidWing"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="AM_MechanoidWing"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="AM_MechanoidWing"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Aura.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Aura.xml
new file mode 100644
index 0000000000..fcc3cc8231
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Aura.xml	
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ====== Aura ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalNeck"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalShoulder"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/parts/li[def="MechanicalFinger"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/parts/li[def="MechanicalFinger"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/parts/li[def="MechanicalFinger"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalLeg"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="AM_MechanoidWing"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="AM_MechanoidWing"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="AM_MechanoidWing"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Daggersnout.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Daggersnout.xml
new file mode 100644
index 0000000000..51edf670a0
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Daggersnout.xml	
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ====== DaggerSnout ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="MechanicalHead"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="MechanicalHead"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="MechanicalHead"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="Blade"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="Blade"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="Blade"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="AM_TankPlateThird"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="AM_TankPlateThird"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="AM_TankPlateThird"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="AM_TankPlateThird"]/parts/li[def="AM_TankPlateFifth"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="AM_TankPlateThird"]/parts/li[def="AM_TankPlateFifth"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="AM_TankPlateThird"]/parts/li[def="AM_TankPlateFifth"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="MechanicalLeg"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Demolisher.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Demolisher.xml
new file mode 100644
index 0000000000..b7d2bea835
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Demolisher.xml	
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ====== Demolisher ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="MechanicalHead"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="MechanicalHead"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="MechanicalHead"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="AM_TankPlateThird"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="AM_TankPlateThird"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="AM_TankPlateThird"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="AM_TankPlateThird"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="AM_TankPlateThird"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="AM_TankPlateThird"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="AM_TankPlateThird"]/parts/li[def="AM_TankPlateFifth"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="AM_TankPlateThird"]/parts/li[def="AM_TankPlateFifth"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/parts/li[def="AM_TankPlateThird"]/parts/li[def="AM_TankPlateFifth"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="AM_MechanicalClaw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="AM_MechanicalClaw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="AM_MechanicalClaw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="MechanicalLeg"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Siegebreaker.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Siegebreaker.xml
new file mode 100644
index 0000000000..6bc200e517
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Siegebreaker.xml	
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ====== Siegebreaker ====== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankTurret"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankTurret"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankTurret"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankPlateSecond"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankPlateSecond"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankPlateSecond"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankPlateSecond"]/parts/li[def="AM_TankPlateThird"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankPlateSecond"]/parts/li[def="AM_TankPlateThird"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankPlateSecond"]/parts/li[def="AM_TankPlateThird"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankPlateSecond"]/parts/li[def="AM_TankPlateThird"]/parts/li[def="AM_TankPlateFourth"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankPlateSecond"]/parts/li[def="AM_TankPlateThird"]/parts/li[def="AM_TankPlateFourth"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankPlateSecond"]/parts/li[def="AM_TankPlateThird"]/parts/li[def="AM_TankPlateFourth"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankPlateSecond"]/parts/li[def="AM_TankPlateThird"]/parts/li[def="AM_TankPlateFourth"]/parts/li[def="AM_TankPlateFifth"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankPlateSecond"]/parts/li[def="AM_TankPlateThird"]/parts/li[def="AM_TankPlateFourth"]/parts/li[def="AM_TankPlateFifth"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankPlateSecond"]/parts/li[def="AM_TankPlateThird"]/parts/li[def="AM_TankPlateFourth"]/parts/li[def="AM_TankPlateFifth"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankPlateSecond"]/parts/li[def="AM_TankPlateThird"]/parts/li[def="AM_TankPlateFourth"]/parts/li[def="AM_TankPlateFifth"]/parts/li[def="AM_TankPlateSixth"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankPlateSecond"]/parts/li[def="AM_TankPlateThird"]/parts/li[def="AM_TankPlateFourth"]/parts/li[def="AM_TankPlateFifth"]/parts/li[def="AM_TankPlateSixth"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankPlateSecond"]/parts/li[def="AM_TankPlateThird"]/parts/li[def="AM_TankPlateFourth"]/parts/li[def="AM_TankPlateFifth"]/parts/li[def="AM_TankPlateSixth"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/DamageDef/DamageDefs.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/DamageDef/DamageDefs.xml
new file mode 100644
index 0000000000..6e9e9a9cd4
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/DamageDef/DamageDefs.xml	
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Acid Spit ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/DamageDef[defName="AM_AcidSpit"]</xpath>
+		<value>
+			<li Class="CombatExtended.DamageDefExtensionCE">
+				<isAmbientDamage>true</isAmbientDamage>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/AlphaBees/Apiarist.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/AlphaBees/Apiarist.xml
new file mode 100644
index 0000000000..e79c6cc65e
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/AlphaBees/Apiarist.xml	
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Alpha Bees</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Apiarist"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Birdlike</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Apiarist"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>4</power>
+								<cooldownTime>2</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Apiarist"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AM_Mech_Apiarist"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Apiarist"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>700</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>70</MaxOverHeal>
+							<MinArmorPct>0.75</MinArmorPct>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/AbilityDefs/Abilities_Biotech.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/AbilityDefs/Abilities_Biotech.xml
new file mode 100644
index 0000000000..7e8d2d337d
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/AbilityDefs/Abilities_Biotech.xml	
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/AbilityDef[defName="AM_Detonate"]/comps/li[@Class="AlphaMechs.CompProperties_Detonate"]/damageAmount</xpath>
+					<value>
+						<damageAmount>94</damageAmount>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/AbilityDef[defName="AM_LongjumpMech"]/verbProperties/range</xpath>
+					<value>
+						<range>22.9</range>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Assembler.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Assembler.xml
new file mode 100644
index 0000000000..535821497d
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Assembler.xml	
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/BodyDef[defName="AM_Assembler"]/corePart/groups</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_Assembler"]/corePart</xpath>
+						<value>
+							<groups>
+								<li>CoveredByNaturalArmor</li>
+							</groups>
+						</value>
+					</nomatch>
+					<match Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_Assembler"]/corePart/groups</xpath>
+						<value>
+							<li>CoveredByNaturalArmor</li>
+						</value>
+					</match>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/BodyDef[defName="AM_Assembler"]/corePart/parts/li[def="MechanicalHead"]/groups</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_Assembler"]/corePart/parts/li[def="MechanicalHead"]</xpath>
+						<value>
+							<groups>
+								<li>CoveredByNaturalArmor</li>
+							</groups>
+						</value>
+					</nomatch>
+					<match Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_Assembler"]/corePart/parts/li[def="MechanicalHead"]/groups</xpath>
+						<value>
+							<li>CoveredByNaturalArmor</li>
+						</value>
+					</match>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/BodyDef[defName="AM_Assembler"]/corePart/parts/li[def="AM_MechanicalBodyCarapace"]/groups</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_Assembler"]/corePart/parts/li[def="AM_MechanicalBodyCarapace"]</xpath>
+						<value>
+							<groups>
+								<li>CoveredByNaturalArmor</li>
+							</groups>
+						</value>
+					</nomatch>
+					<match Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_Assembler"]/corePart/parts/li[def="AM_MechanicalBodyCarapace"]/groups</xpath>
+						<value>
+							<li>CoveredByNaturalArmor</li>
+						</value>
+					</match>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Guttersnipe.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Guttersnipe.xml
new file mode 100644
index 0000000000..973131eea4
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Guttersnipe.xml	
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/groups</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart</xpath>
+						<value>
+							<groups>
+								<li>CoveredByNaturalArmor</li>
+							</groups>
+						</value>
+					</nomatch>
+					<match Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/groups</xpath>
+						<value>
+							<li>CoveredByNaturalArmor</li>
+						</value>
+					</match>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/parts/li[def="MechanicalNeck"]</xpath>
+						<value>
+							<groups>
+								<li>CoveredByNaturalArmor</li>
+							</groups>
+						</value>
+					</nomatch>
+					<match Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
+						<value>
+							<li>CoveredByNaturalArmor</li>
+						</value>
+					</match>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]</xpath>
+						<value>
+							<groups>
+								<li>CoveredByNaturalArmor</li>
+							</groups>
+						</value>
+					</nomatch>
+					<match Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
+						<value>
+							<li>CoveredByNaturalArmor</li>
+						</value>
+					</match>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/parts/li[def="AM_CircularSaw"]/groups</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/parts/li[def="AM_CircularSaw"]</xpath>
+						<value>
+							<groups>
+								<li>CoveredByNaturalArmor</li>
+							</groups>
+						</value>
+					</nomatch>
+					<match Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/parts/li[def="AM_CircularSaw"]/groups</xpath>
+						<value>
+							<li>CoveredByNaturalArmor</li>
+						</value>
+					</match>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Slurrypede.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Slurrypede.xml
new file mode 100644
index 0000000000..78ab537b57
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Slurrypede.xml	
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/groups</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart</xpath>
+						<value>
+							<groups>
+								<li>CoveredByNaturalArmor</li>
+							</groups>
+						</value>
+					</nomatch>
+					<match Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/groups</xpath>
+						<value>
+							<li>CoveredByNaturalArmor</li>
+						</value>
+					</match>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/groups</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]</xpath>
+						<value>
+							<groups>
+								<li>CoveredByNaturalArmor</li>
+							</groups>
+						</value>
+					</nomatch>
+					<match Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/groups</xpath>
+						<value>
+							<li>CoveredByNaturalArmor</li>
+						</value>
+					</match>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/groups</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]</xpath>
+						<value>
+							<groups>
+								<li>CoveredByNaturalArmor</li>
+							</groups>
+						</value>
+					</nomatch>
+					<match Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/groups</xpath>
+						<value>
+							<li>CoveredByNaturalArmor</li>
+						</value>
+					</match>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/groups</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]</xpath>
+						<value>
+							<groups>
+								<li>CoveredByNaturalArmor</li>
+							</groups>
+						</value>
+					</nomatch>
+					<match Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/groups</xpath>
+						<value>
+							<li>CoveredByNaturalArmor</li>
+						</value>
+					</match>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/parts/li[def="MechanicalCentipedeBodyFourthRing"]/groups</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/parts/li[def="MechanicalCentipedeBodyFourthRing"]</xpath>
+						<value>
+							<groups>
+								<li>CoveredByNaturalArmor</li>
+							</groups>
+						</value>
+					</nomatch>
+					<match Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/parts/li[def="MechanicalCentipedeBodyFourthRing"]/groups</xpath>
+						<value>
+							<li>CoveredByNaturalArmor</li>
+						</value>
+					</match>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/parts/li[def="MechanicalCentipedeBodyFourthRing"]/parts/li[def="MechanicalCentipedeBodyFifthRing"]/groups</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/parts/li[def="MechanicalCentipedeBodyFourthRing"]/parts/li[def="MechanicalCentipedeBodyFifthRing"]</xpath>
+						<value>
+							<groups>
+								<li>CoveredByNaturalArmor</li>
+							</groups>
+						</value>
+					</nomatch>
+					<match Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/parts/li[def="MechanicalCentipedeBodyFourthRing"]/parts/li[def="MechanicalCentipedeBodyFifthRing"]/groups</xpath>
+						<value>
+							<li>CoveredByNaturalArmor</li>
+						</value>
+					</match>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/parts/li[def="MechanicalCentipedeBodyFourthRing"]/parts/li[def="MechanicalCentipedeBodyFifthRing"]/parts/li[def="MechanicalCentipedeBodySixthRing"]/groups</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/parts/li[def="MechanicalCentipedeBodyFourthRing"]/parts/li[def="MechanicalCentipedeBodyFifthRing"]/parts/li[def="MechanicalCentipedeBodySixthRing"]</xpath>
+						<value>
+							<groups>
+								<li>CoveredByNaturalArmor</li>
+							</groups>
+						</value>
+					</nomatch>
+					<match Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/parts/li[def="MechanicalCentipedeBodyFourthRing"]/parts/li[def="MechanicalCentipedeBodyFifthRing"]/parts/li[def="MechanicalCentipedeBodySixthRing"]/groups</xpath>
+						<value>
+							<li>CoveredByNaturalArmor</li>
+						</value>
+					</match>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_WarEmpress.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_WarEmpress.xml
new file mode 100644
index 0000000000..93a3f6ab7a
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_WarEmpress.xml	
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/groups</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart</xpath>
+						<value>
+							<groups>
+								<li>CoveredByNaturalArmor</li>
+							</groups>
+						</value>
+					</nomatch>
+					<match Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/groups</xpath>
+						<value>
+							<li>CoveredByNaturalArmor</li>
+						</value>
+					</match>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalHead"]/groups</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalHead"]</xpath>
+						<value>
+							<groups>
+								<li>CoveredByNaturalArmor</li>
+							</groups>
+						</value>
+					</nomatch>
+					<match Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalHead"]/groups</xpath>
+						<value>
+							<li>CoveredByNaturalArmor</li>
+						</value>
+					</match>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalWarqueenBodySecondRing"]/groups</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalWarqueenBodySecondRing"]</xpath>
+						<value>
+							<groups>
+								<li>CoveredByNaturalArmor</li>
+							</groups>
+						</value>
+					</nomatch>
+					<match Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalWarqueenBodySecondRing"]/groups</xpath>
+						<value>
+							<li>CoveredByNaturalArmor</li>
+						</value>
+					</match>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalWarqueenBodySecondRing"]/parts/li[def="MechanicalWarqueenBodyThirdRing"]/groups</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalWarqueenBodySecondRing"]/parts/li[def="MechanicalWarqueenBodyThirdRing"]</xpath>
+						<value>
+							<groups>
+								<li>CoveredByNaturalArmor</li>
+							</groups>
+						</value>
+					</nomatch>
+					<match Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalWarqueenBodySecondRing"]/parts/li[def="MechanicalWarqueenBodyThirdRing"]/groups</xpath>
+						<value>
+							<li>CoveredByNaturalArmor</li>
+						</value>
+					</match>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalWarqueenBodySecondRing"]/parts/li[def="MechanicalWarqueenBodyThirdRing"]/parts/li[def="MechanicalWarqueenBodyFourthRing"]/groups</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalWarqueenBodySecondRing"]/parts/li[def="MechanicalWarqueenBodyThirdRing"]/parts/li[def="MechanicalWarqueenBodyFourthRing"]</xpath>
+						<value>
+							<groups>
+								<li>CoveredByNaturalArmor</li>
+							</groups>
+						</value>
+					</nomatch>
+					<match Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalWarqueenBodySecondRing"]/parts/li[def="MechanicalWarqueenBodyThirdRing"]/parts/li[def="MechanicalWarqueenBodyFourthRing"]/groups</xpath>
+						<value>
+							<li>CoveredByNaturalArmor</li>
+						</value>
+					</match>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalWarqueenBodySecondRing"]/parts/li[def="MechanicalWarqueenBodyThirdRing"]/parts/li[def="MechanicalWarqueenBodyFourthRing"]/parts/li[def="MechanicalWarqueenBodyFifthRing"]/groups</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalWarqueenBodySecondRing"]/parts/li[def="MechanicalWarqueenBodyThirdRing"]/parts/li[def="MechanicalWarqueenBodyFourthRing"]/parts/li[def="MechanicalWarqueenBodyFifthRing"]</xpath>
+						<value>
+							<groups>
+								<li>CoveredByNaturalArmor</li>
+							</groups>
+						</value>
+					</nomatch>
+					<match Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalWarqueenBodySecondRing"]/parts/li[def="MechanicalWarqueenBodyThirdRing"]/parts/li[def="MechanicalWarqueenBodyFourthRing"]/parts/li[def="MechanicalWarqueenBodyFifthRing"]/groups</xpath>
+						<value>
+							<li>CoveredByNaturalArmor</li>
+						</value>
+					</match>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalShoulder"]</xpath>
+						<value>
+							<groups>
+								<li>CoveredByNaturalArmor</li>
+							</groups>
+						</value>
+					</nomatch>
+					<match Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
+						<value>
+							<li>CoveredByNaturalArmor</li>
+						</value>
+					</match>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]</xpath>
+						<value>
+							<groups>
+								<li>CoveredByNaturalArmor</li>
+							</groups>
+						</value>
+					</nomatch>
+					<match Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups</xpath>
+						<value>
+							<li>CoveredByNaturalArmor</li>
+						</value>
+					</match>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="PowerClaw"]/groups</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="PowerClaw"]</xpath>
+						<value>
+							<groups>
+								<li>CoveredByNaturalArmor</li>
+							</groups>
+						</value>
+					</nomatch>
+					<match Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="PowerClaw"]/groups</xpath>
+						<value>
+							<li>CoveredByNaturalArmor</li>
+						</value>
+					</match>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="BulbTurret"]/groups</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="BulbTurret"]</xpath>
+						<value>
+							<groups>
+								<li>CoveredByNaturalArmor</li>
+							</groups>
+						</value>
+					</nomatch>
+					<match Class="PatchOperationAdd">
+						<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="BulbTurret"]/groups</xpath>
+						<value>
+							<li>CoveredByNaturalArmor</li>
+						</value>
+					</match>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/HediffDefs/Hediffs.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/HediffDefs/Hediffs.xml
new file mode 100644
index 0000000000..b5d10bc7ec
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/HediffDefs/Hediffs.xml	
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[defName="AM_ArmorMechBoost"]/stages/li/statOffsets</xpath>
+					<value>
+						<statOffsets>
+							<ArmorRating_Sharp>1</ArmorRating_Sharp>
+							<ArmorRating_Blunt>2</ArmorRating_Blunt>
+						</statOffsets>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Misc/Apparel.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Misc/Apparel.xml
new file mode 100644
index 0000000000..a0b0625498
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Misc/Apparel.xml	
@@ -0,0 +1,726 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!-- Mech Master Helmet -->
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_MechCommanderHelm"]/statBases</xpath>
+					<value>
+						<Bulk>5</Bulk>
+						<WornBulk>1</WornBulk>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_MechCommanderHelm"]/statBases/Flammability</xpath>
+					<value>
+						<Flammability>0</Flammability>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_MechCommanderHelm"]/statBases/Mass</xpath>
+					<value>
+						<Mass>4.8</Mass>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_MechCommanderHelm"]/statBases/MaxHitPoints</xpath>
+					<value>
+						<MaxHitPoints>350</MaxHitPoints>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_MechCommanderHelm"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>16</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_MechCommanderHelm"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>36</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_MechCommanderHelm"]/costList/Plasteel</xpath>
+					<value>
+						<Plasteel>200</Plasteel>
+						<DevilstrandCloth>20</DevilstrandCloth>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_MechCommanderHelm"]/equippedStatOffsets</xpath>
+					<value>
+						<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+						<SmokeSensitivity>-1</SmokeSensitivity>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AM_MechCommanderHelm"]</xpath>
+					<value>
+						<li Class="CombatExtended.ApparelDefExtension">
+							<isRadioPack>true</isRadioPack>
+						</li>
+					</value>
+				</li>
+
+				<!-- Mech Breaker Helmet -->
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_MechBreakerHelm"]/statBases</xpath>
+					<value>
+						<Bulk>6</Bulk>
+						<WornBulk>2</WornBulk>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_MechBreakerHelm"]/statBases/Flammability</xpath>
+					<value>
+						<Flammability>0</Flammability>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_MechBreakerHelm"]/statBases/Mass</xpath>
+					<value>
+						<Mass>6</Mass>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_MechBreakerHelm"]/statBases/MaxHitPoints</xpath>
+					<value>
+						<MaxHitPoints>350</MaxHitPoints>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_MechBreakerHelm"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>20</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_MechBreakerHelm"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>50</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_MechBreakerHelm"]/costList/Plasteel</xpath>
+					<value>
+						<Plasteel>60</Plasteel>
+						<DevilstrandCloth>25</DevilstrandCloth>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_MechBreakerHelm"]/equippedStatOffsets</xpath>
+					<value>
+						<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+						<SmokeSensitivity>-1</SmokeSensitivity>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AM_MechBreakerHelm"]</xpath>
+					<value>
+						<li Class="CombatExtended.ApparelDefExtension">
+							<isRadioPack>true</isRadioPack>
+						</li>
+					</value>
+				</li>
+
+				<!-- Mech Master Armor -->
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_MechCommanderSuit"]/statBases</xpath>
+					<value>
+						<Bulk>100</Bulk>
+						<WornBulk>15</WornBulk>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_MechCommanderSuit"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>20.5</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_MechCommanderSuit"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>46</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationRemove">
+					<xpath>Defs/ThingDef[defName="AM_MechCommanderSuit"]/equippedStatOffsets/MoveSpeed</xpath>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_MechCommanderSuit"]/costList/Plasteel</xpath>
+					<value>
+						<Plasteel>200</Plasteel>
+						<DevilstrandCloth>40</DevilstrandCloth>
+					</value>
+				</li>
+
+				<!-- Mech Breaker Armor -->
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_MechBreakerArmor"]/statBases</xpath>
+					<value>
+						<Bulk>100</Bulk>
+						<WornBulk>20</WornBulk>
+						<Mass>80</Mass>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_MechBreakerArmor"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>26</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_MechBreakerArmor"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>60</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_MechBreakerArmor"]/statBases/EnergyShieldRechargeRate</xpath>
+					<value>
+						<EnergyShieldRechargeRate>0.03</EnergyShieldRechargeRate>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_MechBreakerArmor"]/statBases/EnergyShieldEnergyMax</xpath>
+					<value>
+						<EnergyShieldEnergyMax>0.6</EnergyShieldEnergyMax>
+					</value>
+				</li>
+
+				<li Class="PatchOperationRemove">
+					<xpath>Defs/ThingDef[defName="AM_MechBreakerArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_MechBreakerArmor"]/equippedStatOffsets</xpath>
+					<value>
+						<CarryWeight>100</CarryWeight>
+						<CarryBulk>20</CarryBulk>
+						<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+						<MeleeDodgeChance>-0.15</MeleeDodgeChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_MechBreakerArmor"]/costList/Plasteel</xpath>
+					<value>
+						<Plasteel>270</Plasteel>
+						<DevilstrandCloth>40</DevilstrandCloth>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_MechBreakerArmor"]/costList/Uranium</xpath>
+					<value>
+						<Uranium>80</Uranium>
+					</value>
+				</li>
+
+				<!-- Prestige Gear -->
+
+				<li Class="PatchOperationFindMod">
+					<mods>
+						<li>Royalty</li>
+					</mods>
+
+					<match Class="PatchOperationSequence">
+						<operations>
+
+							<!-- Prestige Mechlord -->
+
+							<li Class="PatchOperationReplace">
+								<xpath>Defs/ThingDef[defName="AM_Apparel_ArmorHelmetMechlordHelmet_Prestige"]/statBases/MaxHitPoints</xpath>
+								<value>
+									<MaxHitPoints>270</MaxHitPoints>
+									<Mass>3.0</Mass>
+									<ArmorRating_Sharp>12</ArmorRating_Sharp>
+									<ArmorRating_Blunt>26</ArmorRating_Blunt>
+									<Flammability>0.25</Flammability>
+								</value>
+							</li>
+
+							<li Class="PatchOperationReplace">
+								<xpath>Defs/ThingDef[defName="AM_Apparel_ArmorHelmetMechlordHelmet_Prestige"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+								<value>
+									<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+									<SmokeSensitivity>-1</SmokeSensitivity>
+								</value>
+							</li>
+
+							<li Class="PatchOperationRemove">
+								<xpath>Defs/ThingDef[defName="AM_Apparel_ArmorHelmetMechlordHelmet_Prestige"]/equippedStatOffsets/MeleeHitChance</xpath>
+							</li>
+
+							<li Class="PatchOperationReplace">
+								<xpath>Defs/ThingDef[defName="AM_Apparel_ArmorHelmetMechlordHelmet_Prestige"]/costList/Plasteel</xpath>
+								<value>
+									<Plasteel>170</Plasteel>
+									<DevilstrandCloth>15</DevilstrandCloth>
+								</value>
+							</li>
+
+							<li Class="PatchOperationAddModExtension">
+								<xpath>Defs/ThingDef[defName="AM_Apparel_ArmorHelmetMechlordHelmet_Prestige"]</xpath>
+								<value>
+									<li Class="CombatExtended.ApparelDefExtension">
+										<isRadioPack>true</isRadioPack>
+									</li>
+								</value>
+							</li>
+
+							<li Class="PatchOperationAdd">
+								<xpath>Defs/ThingDef[defName="AM_Apparel_MechlordSuit_Prestige"]/statBases</xpath>
+								<value>
+									<Bulk>90</Bulk>
+									<WornBulk>13</WornBulk>
+									<Mass>40</Mass>
+									<MaxHitPoints>450</MaxHitPoints>
+								</value>
+							</li>
+
+							<li Class="PatchOperationReplace">
+								<xpath>Defs/ThingDef[defName="AM_Apparel_MechlordSuit_Prestige"]/statBases/ArmorRating_Sharp</xpath>
+								<value>
+									<ArmorRating_Sharp>16</ArmorRating_Sharp>
+								</value>
+							</li>
+
+							<li Class="PatchOperationReplace">
+								<xpath>Defs/ThingDef[defName="AM_Apparel_MechlordSuit_Prestige"]/statBases/ArmorRating_Blunt</xpath>
+								<value>
+									<ArmorRating_Blunt>34</ArmorRating_Blunt>
+								</value>
+							</li>
+
+							<li Class="PatchOperationReplace">
+								<xpath>Defs/ThingDef[defName="AM_Apparel_MechlordSuit_Prestige"]/costList/Plasteel</xpath>
+								<value>
+									<Plasteel>170</Plasteel>
+									<DevilstrandCloth>40</DevilstrandCloth>
+								</value>
+							</li>
+
+							<li Class="PatchOperationReplace">
+								<xpath>Defs/ThingDef[defName="AM_Apparel_MechlordSuit_Prestige"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+								<value>
+									<CarryWeight>65</CarryWeight>
+									<CarryBulk>10</CarryBulk>
+								</value>
+							</li>
+
+							<li Class="PatchOperationRemove">
+								<xpath>Defs/ThingDef[defName="AM_Apparel_MechlordSuit_Prestige"]/equippedStatOffsets/MeleeHitChance</xpath>
+							</li>
+
+							<li Class="PatchOperationAdd">
+								<xpath>Defs/ThingDef[defName="AM_Apparel_MechlordSuit_Prestige"]</xpath>
+								<value>
+									<modExtensions Inherit="False">
+										<li Class="CombatExtended.PartialArmorExt">
+											<stats>
+												<li>
+													<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+													<parts>
+														<li>Neck</li>
+														<li>Hand</li>
+													</parts>
+												</li>
+												<li>
+													<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+													<parts>
+														<li>Neck</li>
+														<li>Hand</li>
+													</parts>
+												</li>
+												<li>
+													<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+													<parts>
+														<li>Leg</li>
+													</parts>
+												</li>
+												<li>
+													<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+													<parts>
+														<li>Leg</li>
+													</parts>
+												</li>
+												<li>
+													<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+													<parts>
+														<li>Arm</li>
+													</parts>
+												</li>
+												<li>
+													<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+													<parts>
+														<li>Arm</li>
+													</parts>
+												</li>
+											</stats>
+										</li>
+									</modExtensions>
+								</value>
+							</li>
+
+							<!-- Prestige Mech Master -->
+
+							<li Class="PatchOperationAdd">
+								<xpath>Defs/ThingDef[defName="AM_MechCommanderHelm_Prestige"]/statBases</xpath>
+								<value>
+									<Bulk>5</Bulk>
+									<WornBulk>1</WornBulk>
+								</value>
+							</li>
+
+							<li Class="PatchOperationReplace">
+								<xpath>Defs/ThingDef[defName="AM_MechCommanderHelm_Prestige"]/statBases/Flammability</xpath>
+								<value>
+									<Flammability>0</Flammability>
+								</value>
+							</li>
+
+							<li Class="PatchOperationReplace">
+								<xpath>Defs/ThingDef[defName="AM_MechCommanderHelm_Prestige"]/statBases/Mass</xpath>
+								<value>
+									<Mass>4.8</Mass>
+								</value>
+							</li>
+
+							<li Class="PatchOperationReplace">
+								<xpath>Defs/ThingDef[defName="AM_MechCommanderHelm_Prestige"]/statBases/MaxHitPoints</xpath>
+								<value>
+									<MaxHitPoints>350</MaxHitPoints>
+								</value>
+							</li>
+
+							<li Class="PatchOperationReplace">
+								<xpath>Defs/ThingDef[defName="AM_MechCommanderHelm_Prestige"]/statBases/ArmorRating_Sharp</xpath>
+								<value>
+									<ArmorRating_Sharp>16</ArmorRating_Sharp>
+								</value>
+							</li>
+
+							<li Class="PatchOperationReplace">
+								<xpath>Defs/ThingDef[defName="AM_MechCommanderHelm_Prestige"]/statBases/ArmorRating_Blunt</xpath>
+								<value>
+									<ArmorRating_Blunt>36</ArmorRating_Blunt>
+								</value>
+							</li>
+
+							<li Class="PatchOperationReplace">
+								<xpath>Defs/ThingDef[defName="AM_MechCommanderHelm_Prestige"]/costList/Plasteel</xpath>
+								<value>
+									<Plasteel>220</Plasteel>
+									<DevilstrandCloth>20</DevilstrandCloth>
+								</value>
+							</li>
+
+							<li Class="PatchOperationAdd">
+								<xpath>Defs/ThingDef[defName="AM_MechCommanderHelm_Prestige"]/equippedStatOffsets</xpath>
+								<value>
+									<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+									<SmokeSensitivity>-1</SmokeSensitivity>
+								</value>
+							</li>
+
+							<li Class="PatchOperationAddModExtension">
+								<xpath>Defs/ThingDef[defName="AM_MechCommanderHelm_Prestige"]</xpath>
+								<value>
+									<li Class="CombatExtended.ApparelDefExtension">
+										<isRadioPack>true</isRadioPack>
+									</li>
+								</value>
+							</li>
+
+							<li Class="PatchOperationAdd">
+								<xpath>Defs/ThingDef[defName="AM_PrestigeMechCommanderSuit"]/statBases</xpath>
+								<value>
+									<Bulk>100</Bulk>
+									<WornBulk>15</WornBulk>
+								</value>
+							</li>
+
+							<li Class="PatchOperationReplace">
+								<xpath>Defs/ThingDef[defName="AM_PrestigeMechCommanderSuit"]/statBases/ArmorRating_Sharp</xpath>
+								<value>
+									<ArmorRating_Sharp>20.5</ArmorRating_Sharp>
+								</value>
+							</li>
+
+							<li Class="PatchOperationReplace">
+								<xpath>Defs/ThingDef[defName="AM_PrestigeMechCommanderSuit"]/statBases/ArmorRating_Blunt</xpath>
+								<value>
+									<ArmorRating_Blunt>46</ArmorRating_Blunt>
+								</value>
+							</li>
+
+							<li Class="PatchOperationRemove">
+								<xpath>Defs/ThingDef[defName="AM_PrestigeMechCommanderSuit"]/equippedStatOffsets/MoveSpeed</xpath>
+							</li>
+
+							<li Class="PatchOperationReplace">
+								<xpath>Defs/ThingDef[defName="AM_PrestigeMechCommanderSuit"]/costList/Plasteel</xpath>
+								<value>
+									<Plasteel>220</Plasteel>
+									<DevilstrandCloth>40</DevilstrandCloth>
+								</value>
+							</li>
+
+							<!-- Prestige Mech Breaker -->
+
+							<li Class="PatchOperationAdd">
+								<xpath>Defs/ThingDef[defName="AM_PrestigeMechBreakerHelm"]/statBases</xpath>
+								<value>
+									<Bulk>6</Bulk>
+									<WornBulk>2</WornBulk>
+								</value>
+							</li>
+
+							<li Class="PatchOperationReplace">
+								<xpath>Defs/ThingDef[defName="AM_PrestigeMechBreakerHelm"]/statBases/Flammability</xpath>
+								<value>
+									<Flammability>0</Flammability>
+								</value>
+							</li>
+
+							<li Class="PatchOperationReplace">
+								<xpath>Defs/ThingDef[defName="AM_PrestigeMechBreakerHelm"]/statBases/Mass</xpath>
+								<value>
+									<Mass>6</Mass>
+								</value>
+							</li>
+
+							<li Class="PatchOperationReplace">
+								<xpath>Defs/ThingDef[defName="AM_PrestigeMechBreakerHelm"]/statBases/MaxHitPoints</xpath>
+								<value>
+									<MaxHitPoints>350</MaxHitPoints>
+								</value>
+							</li>
+
+							<li Class="PatchOperationReplace">
+								<xpath>Defs/ThingDef[defName="AM_PrestigeMechBreakerHelm"]/statBases/ArmorRating_Sharp</xpath>
+								<value>
+									<ArmorRating_Sharp>20</ArmorRating_Sharp>
+								</value>
+							</li>
+
+							<li Class="PatchOperationReplace">
+								<xpath>Defs/ThingDef[defName="AM_PrestigeMechBreakerHelm"]/statBases/ArmorRating_Blunt</xpath>
+								<value>
+									<ArmorRating_Blunt>50</ArmorRating_Blunt>
+								</value>
+							</li>
+
+							<li Class="PatchOperationReplace">
+								<xpath>Defs/ThingDef[defName="AM_PrestigeMechBreakerHelm"]/costList/Plasteel</xpath>
+								<value>
+									<Plasteel>80</Plasteel>
+									<DevilstrandCloth>25</DevilstrandCloth>
+								</value>
+							</li>
+
+							<li Class="PatchOperationAdd">
+								<xpath>Defs/ThingDef[defName="AM_PrestigeMechBreakerHelm"]/equippedStatOffsets</xpath>
+								<value>
+									<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+									<SmokeSensitivity>-1</SmokeSensitivity>
+								</value>
+							</li>
+
+							<li Class="PatchOperationAddModExtension">
+								<xpath>Defs/ThingDef[defName="AM_PrestigeMechBreakerHelm"]</xpath>
+								<value>
+									<li Class="CombatExtended.ApparelDefExtension">
+										<isRadioPack>true</isRadioPack>
+									</li>
+								</value>
+							</li>
+
+							<li Class="PatchOperationAdd">
+								<xpath>Defs/ThingDef[defName="AM_PrestigeMechBreakerArmor"]/statBases</xpath>
+								<value>
+									<Bulk>100</Bulk>
+									<WornBulk>20</WornBulk>
+									<Mass>80</Mass>
+								</value>
+							</li>
+
+							<li Class="PatchOperationReplace">
+								<xpath>Defs/ThingDef[defName="AM_PrestigeMechBreakerArmor"]/statBases/ArmorRating_Sharp</xpath>
+								<value>
+									<ArmorRating_Sharp>26</ArmorRating_Sharp>
+								</value>
+							</li>
+
+							<li Class="PatchOperationReplace">
+								<xpath>Defs/ThingDef[defName="AM_PrestigeMechBreakerArmor"]/statBases/ArmorRating_Blunt</xpath>
+								<value>
+									<ArmorRating_Blunt>60</ArmorRating_Blunt>
+								</value>
+							</li>
+
+							<li Class="PatchOperationReplace">
+								<xpath>Defs/ThingDef[defName="AM_PrestigeMechBreakerArmor"]/statBases/EnergyShieldRechargeRate</xpath>
+								<value>
+									<EnergyShieldRechargeRate>0.03</EnergyShieldRechargeRate>
+								</value>
+							</li>
+
+							<li Class="PatchOperationReplace">
+								<xpath>Defs/ThingDef[defName="AM_PrestigeMechBreakerArmor"]/statBases/EnergyShieldEnergyMax</xpath>
+								<value>
+									<EnergyShieldEnergyMax>0.6</EnergyShieldEnergyMax>
+								</value>
+							</li>
+
+							<li Class="PatchOperationRemove">
+								<xpath>Defs/ThingDef[defName="AM_PrestigeMechBreakerArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+							</li>
+
+							<li Class="PatchOperationAdd">
+								<xpath>Defs/ThingDef[defName="AM_PrestigeMechBreakerArmor"]/equippedStatOffsets</xpath>
+								<value>
+									<CarryWeight>100</CarryWeight>
+									<CarryBulk>20</CarryBulk>
+									<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+									<MeleeDodgeChance>-0.15</MeleeDodgeChance>
+								</value>
+							</li>
+
+							<li Class="PatchOperationReplace">
+								<xpath>Defs/ThingDef[defName="AM_PrestigeMechBreakerArmor"]/costList/Plasteel</xpath>
+								<value>
+									<Plasteel>290</Plasteel>
+									<DevilstrandCloth>40</DevilstrandCloth>
+								</value>
+							</li>
+
+							<li Class="PatchOperationReplace">
+								<xpath>Defs/ThingDef[defName="AM_PrestigeMechBreakerArmor"]/costList/Uranium</xpath>
+								<value>
+									<Uranium>80</Uranium>
+								</value>
+							</li>
+
+						</operations>
+					</match>
+				</li>
+
+				<!-- Packs -->
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[
+						defName="AM_BeamcasterPack" or
+						defName="AM_VoidlinkPack" or
+						defName="AM_CryptoPack"
+						]/apparel/bodyPartGroups </xpath>
+					<value>
+						<li>Shoulders</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[
+						defName="AM_BeamcasterPack" or
+						defName="AM_VoidlinkPack" or
+						defName="AM_CryptoPack"
+						]/apparel/layers </xpath>
+					<value>
+						<li>Backpack</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>
+						Defs/ThingDef[
+						defName="AM_BeamcasterPack" or
+						defName="AM_VoidlinkPack" or
+						defName="AM_CryptoPack"
+						]/statBases
+					</xpath>
+					<value>
+						<Bulk>10</Bulk>
+						<WornBulk>2</WornBulk>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>
+						Defs/ThingDef[
+						defName="AM_BeamcasterPack" or
+						defName="AM_VoidlinkPack" or
+						defName="AM_CryptoPack"]
+					</xpath>
+					<value>
+						<li Class="CombatExtended.ApparelDefExtension">
+							<isRadioPack>true</isRadioPack>
+						</li>
+					</value>
+				</li>
+
+				<!-- Mech Shield -->
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_Apparel_ExpandedHeavyShield"]/statBases</xpath>
+					<value>
+						<Bulk>5</Bulk>
+						<WornBulk>2.5</WornBulk>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Apparel_ExpandedHeavyShield"]/statBases/EnergyShieldRechargeRate</xpath>
+					<value>
+						<EnergyShieldRechargeRate>0.0195</EnergyShieldRechargeRate>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Apparel_ExpandedHeavyShield"]/statBases/EnergyShieldEnergyMax</xpath>
+					<value>
+						<EnergyShieldEnergyMax>6</EnergyShieldEnergyMax>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Misc/Weapons.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Misc/Weapons.xml
new file mode 100644
index 0000000000..dcf6ee178c
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Misc/Weapons.xml	
@@ -0,0 +1,783 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!-- Orbital Hellsphere -->
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Gun_HellsphereOrbital"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>barrel</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>10</power>
+								<cooldownTime>3.0</cooldownTime>
+								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Gun_CoilLance"]/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>
+				</li>
+
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>AM_Gun_CoilLance</defName>
+					<statBases>
+						<Mass>10.0</Mass>
+						<Bulk>10.0</Bulk>
+						<SwayFactor>2.0</SwayFactor>
+						<ShotSpread>0.1</ShotSpread>
+						<SightsEfficiency>1</SightsEfficiency>
+						<RangedWeapon_Cooldown>0.86</RangedWeapon_Cooldown>
+					</statBases>
+					<Properties>
+						<recoilAmount>2.0</recoilAmount>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>True</hasStandardCommand>
+						<defaultProjectile>Bullet_CoilLance</defaultProjectile>
+						<warmupTime>2.4</warmupTime>
+						<range>62</range>
+						<soundCast>AM_Gauss</soundCast>
+						<soundCastTail>GunTail_Medium</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+						<targetParams>
+							<canTargetLocations>true</canTargetLocations>
+							<canTargetPawns>true</canTargetPawns>
+							<canTargetBuildings>true</canTargetBuildings>
+						</targetParams>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>10</magazineSize>
+						<reloadTime>5.2</reloadTime>
+						<ammoSet>AmmoSet_CoilLance</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aiAimMode>AimedShot</aiAimMode>
+					</FireModes>
+					<weaponTags>
+						<li>NoSwitch</li>
+					</weaponTags>
+				</li>
+
+
+
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>AM_Gun_SuperHeavyChargeBlaster</defName>
+					<statBases>
+						<Mass>40.00</Mass>
+						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+						<SightsEfficiency>1</SightsEfficiency>
+						<ShotSpread>0.01</ShotSpread>
+						<SwayFactor>1.5</SwayFactor>
+						<Bulk>15.00</Bulk>
+					</statBases>
+					<Properties>
+						<recoilAmount>1.2</recoilAmount>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_12x64mmHyper</defaultProjectile>
+						<warmupTime>2.3</warmupTime>
+						<range>75</range>
+						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+						<burstShotCount>25</burstShotCount>
+						<soundCast>AM_Shot_ChargeBlaster_Red</soundCast>
+						<soundCastTail>GunTail_Heavy</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>150</magazineSize>
+						<reloadTime>9.2</reloadTime>
+						<ammoSet>AmmoSet_12x64mmHyper</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aimedBurstShotCount>10</aimedBurstShotCount>
+						<aiAimMode>Snapshot</aiAimMode>
+					</FireModes>
+					<weaponTags>
+						<li>CE_AI_Suppressive</li>
+						<li>NoSwitch</li>
+					</weaponTags>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Gun_SuperHeavyChargeBlaster"]/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>
+				</li>
+
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>AM_Gun_AcidSpewer</defName>
+					<statBases>
+						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+						<SightsEfficiency>1</SightsEfficiency>
+						<ShotSpread>0.01</ShotSpread>
+						<SwayFactor>0.81</SwayFactor>
+						<Bulk>15.00</Bulk>
+					</statBases>
+					<Properties>
+						<recoilAmount>1.80</recoilAmount>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_5x100mmCaseless_Acidic</defaultProjectile>
+						<warmupTime>1.3</warmupTime>
+						<range>55</range>
+						<burstShotCount>1</burstShotCount>
+						<soundCast>Shot_ToxicNeedleGun</soundCast>
+						<soundCastTail>GunTail_Heavy</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>10</magazineSize>
+						<reloadTime>4</reloadTime>
+						<ammoSet>AmmoSet_5x100mmCaselessAcidic</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aiAimMode>AimedShot</aiAimMode>
+					</FireModes>
+					<weaponTags>
+						<li>CE_AI_Rifle</li>
+						<li>NoSwitch</li>
+					</weaponTags>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Gun_AcidSpewer"]/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>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Gun_HeavyLaser"]/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>
+				</li>
+
+				<li Class="PatchOperationRemove">
+					<xpath>Defs/ThingDef[defName="AM_Gun_HeavyLaser"]/comps/li[@Class="VanillaWeaponsExpandedLaser.CompProperties_LaserCapacitor"]</xpath>
+				</li>
+
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>AM_Gun_HeavyLaser</defName>
+					<statBases>
+						<Mass>3.50</Mass>
+						<Bulk>10.00</Bulk>
+						<SwayFactor>1.35</SwayFactor>
+						<ShotSpread>0.05</ShotSpread>
+						<SightsEfficiency>1.10</SightsEfficiency>
+						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+					</statBases>
+					<Properties>
+						<recoilAmount>0.01</recoilAmount>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>True</hasStandardCommand>
+						<defaultProjectile>Bullet_HeavyLaser</defaultProjectile>
+						<warmupTime>1</warmupTime>
+						<range>62</range>
+						<burstShotCount>3</burstShotCount>
+						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+						<soundCast>AM_HeavyLaser</soundCast>
+						<soundCastTail>GunTail_Heavy</soundCastTail>
+						<muzzleFlashScale>14</muzzleFlashScale>
+						<targetParams>
+							<canTargetLocations>true</canTargetLocations>
+						</targetParams>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>60</magazineSize>
+						<reloadTime>4</reloadTime>
+						<ammoSet>AmmoSet_HeavyLaser</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aiAimMode>AimedShot</aiAimMode>
+						<aiUseBurstMode>True</aiUseBurstMode>
+						<aimedBurstShotCount>2</aimedBurstShotCount>
+					</FireModes>
+					<weaponTags>
+						<li>NoSwitch</li>
+					</weaponTags>
+				</li>
+
+				<!-- Siegemelter Flamethrower -->
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_SiegemelterTurret"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>barrel</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>11.7</power>
+								<cooldownTime>2.6</cooldownTime>
+								<armorPenetrationBlunt>2.4</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>AM_SiegemelterTurret</defName>
+					<statBases>
+						<Mass>20</Mass>
+						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+						<SightsEfficiency>1.0</SightsEfficiency>
+						<ShotSpread>4.0</ShotSpread>
+						<SwayFactor>1.33</SwayFactor>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_Flamethrower_Prometheum</defaultProjectile>
+						<warmupTime>1.3</warmupTime>
+						<range>25</range>
+						<minRange>3.9</minRange>
+						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+						<burstShotCount>10</burstShotCount>
+						<soundCast>AM_PoisonBreath</soundCast>
+						<muzzleFlashScale>2</muzzleFlashScale>
+						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>100</magazineSize>
+						<reloadTime>8</reloadTime>
+						<ammoSet>AmmoSet_Flamethrower</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aiAimMode>AimedShot</aiAimMode>
+					</FireModes>
+					<weaponTags>
+						<li>NoSwitch</li>
+					</weaponTags>
+				</li>
+
+				<!-- Tesla Gun -->
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_TeslaGun"]/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>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_TeslaGun"]/verbs/li/range</xpath>
+					<value>
+						<range>31</range>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Bullet_Tesla"]/projectile/damageAmountBase</xpath>
+					<value>
+						<damageAmountBase>10</damageAmountBase>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Bullet_Tesla"]/modExtensions/li[@Class="VFEMech.TeslaChainingProps"]/damageDef</xpath>
+					<value>
+						<damageDef>EMP</damageDef>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Bullet_Tesla"]/modExtensions/li[@Class="VFEMech.TeslaChainingProps"]/maxLifetime</xpath>
+					<value>
+						<maxLifetime>6</maxLifetime>
+					</value>
+				</li>
+
+				<!-- Starfire Cannon -->
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_StarfireTurret"]/verbs/li/range</xpath>
+					<value>
+						<range>75</range>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_StarfireTurret"]/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>
+				</li>
+
+				<!-- Tactical Shotgun -->
+
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>AM_Gun_TacticalShotgun</defName>
+					<statBases>
+						<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
+						<SightsEfficiency>1</SightsEfficiency>
+						<ShotSpread>0.15</ShotSpread>
+						<SwayFactor>0.65</SwayFactor>
+						<Bulk>8.00</Bulk>
+					</statBases>
+					<Properties>
+						<recoilAmount>2.42</recoilAmount>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_410Bore_Buck</defaultProjectile>
+						<warmupTime>0.8</warmupTime>
+						<range>16</range>
+						<burstShotCount>3</burstShotCount>
+						<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
+						<soundCast>Shot_Shotgun_NoRack</soundCast>
+						<soundCastTail>GunTail_Medium</soundCastTail>
+						<muzzleFlashScale>6</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>15</magazineSize>
+						<reloadTime>4.9</reloadTime>
+						<ammoSet>AmmoSet_410Bore</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aiAimMode>Snapshot</aiAimMode>
+					</FireModes>
+					<weaponTags>
+						<li>NoSwitch</li>
+					</weaponTags>
+				</li>
+
+				<!-- Beam Graser Cannon -->
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_BeamGraserCannon"]/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>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_BeamGraserCannon"]/statBases/RangedWeapon_Cooldown</xpath>
+					<value>
+						<RangedWeapon_Cooldown>1.0</RangedWeapon_Cooldown>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_BeamGraserCannon"]/verbs/li/warmupTime</xpath>
+					<value>
+						<warmupTime>2.0</warmupTime>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_BeamGraserCannon"]/verbs/li/range</xpath>
+					<value>
+						<range>68</range>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_BeamGraserCannon"]/verbs/li/burstShotCount</xpath>
+					<value>
+						<burstShotCount>20</burstShotCount>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_BeamGraserCannon"]/verbs/li/ticksBetweenBurstShots</xpath>
+					<value>
+						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+					</value>
+				</li>
+
+
+
+				<!-- Change the base away from the needle gun to prevent it inheriting incorrect mag size. -->
+				<li Class="PatchOperationAttributeSet">
+					<xpath>Defs/ThingDef[defName="AM_MechanoidGunRotaryNeedle"]</xpath>
+					<attribute>ParentName</attribute>
+					<value>BaseWeapon</value>
+				</li>
+
+				<!-- Add back the important stuff it still needed. Clunky, but it works. -->
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_MechanoidGunRotaryNeedle"]</xpath>
+					<value>
+						<techLevel>Spacer</techLevel>
+						<tradeability>None</tradeability>
+						<destroyOnDrop>true</destroyOnDrop>
+						<relicChance>0</relicChance>
+						<weaponClasses>
+							<li>RangedHeavy</li>
+							<li>LongShots</li>
+						</weaponClasses>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_MechanoidGunRotaryNeedle"]/graphicData</xpath>
+					<value>
+						<graphicClass>Graphic_Single</graphicClass>
+					</value>
+				</li>
+
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>AM_MechanoidGunRotaryNeedle</defName>
+					<statBases>
+						<Mass>5.00</Mass>
+						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+						<SightsEfficiency>1</SightsEfficiency>
+						<ShotSpread>0.05</ShotSpread>
+						<SwayFactor>1.0</SwayFactor>
+						<Bulk>10</Bulk>
+						<MarketValue>1400</MarketValue>
+					</statBases>
+					<Properties>
+						<recoilAmount>1.5</recoilAmount>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_5x100mmS_Sabot</defaultProjectile>
+						<warmupTime>2.1</warmupTime>
+						<range>55</range>
+						<burstShotCount>20</burstShotCount>
+						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+						<soundCast>AM_NeedleShot</soundCast>
+						<soundCastTail>GunTail_Heavy</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<weaponTags>
+						<li>NoSwitch</li>
+						<li>MechanoidGunLongRange</li>
+					</weaponTags>
+					<AmmoUser>
+						<magazineSize>100</magazineSize>
+						<reloadTime>9.2</reloadTime>
+						<ammoSet>AmmoSet_5x100mmS</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aiAimMode>AimedShot</aiAimMode>
+						<noSnapshot>true</noSnapshot>
+					</FireModes>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_MechanoidGunRotaryNeedle"]</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>
+				</li>
+
+				<!-- Mini Needle Gun -->
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Gun_MiniNeedle"]/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>
+				</li>
+
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>AM_Gun_MiniNeedle</defName>
+					<statBases>
+						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+						<SightsEfficiency>2.06</SightsEfficiency>
+						<ShotSpread>0.05</ShotSpread>
+						<SwayFactor>0.6</SwayFactor>
+						<Bulk>7.00</Bulk>
+					</statBases>
+					<Properties>
+						<recoilAmount>1.2</recoilAmount>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_5x100mmS_Sabot</defaultProjectile>
+						<warmupTime>1.35</warmupTime>
+						<range>75</range>
+						<burstShotCount>1</burstShotCount>
+						<soundCast>Shot_NeedleGun</soundCast>
+						<soundCastTail>GunTail_Heavy</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>10</magazineSize>
+						<reloadTime>4</reloadTime>
+						<ammoSet>AmmoSet_5x100mmS</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aiAimMode>AimedShot</aiAimMode>
+					</FireModes>
+					<weaponTags>
+						<li>NoSwitch</li>
+					</weaponTags>
+				</li>
+
+				<!-- Mortar -->
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_MechanoidMortar"]/tools</xpath>
+					<value>
+						<tools>
+							<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>
+				</li>
+
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>AM_MechanoidMortar</defName>
+					<statBases>
+						<Mass>3.0</Mass>
+						<Bulk>6.0</Bulk>
+						<SwayFactor>1.0</SwayFactor>
+						<ShotSpread>0.1</ShotSpread>
+						<SightsEfficiency>1.0</SightsEfficiency>
+						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+					</statBases>
+					<Properties>
+						<recoilAmount>3.5</recoilAmount>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
+						<warmupTime>1</warmupTime>
+						<range>40</range>
+						<minRange>5</minRange>
+						<soundCast>InfernoCannon_Fire</soundCast>
+						<muzzleFlashScale>9</muzzleFlashScale>
+						<ai_IsBuildingDestroyer>True</ai_IsBuildingDestroyer>
+						<ignorePartialLoSBlocker>True</ignorePartialLoSBlocker>
+						<targetParams>
+							<canTargetLocations>True</canTargetLocations>
+						</targetParams>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>10</magazineSize>
+						<reloadTime>5.1</reloadTime>
+						<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aiAimMode>SuppressFire</aiAimMode>
+					</FireModes>
+					<weaponTags>
+						<li>NoSwitch</li>
+					</weaponTags>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Base.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Base.xml
new file mode 100644
index 0000000000..9395b863e5
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Base.xml	
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[@Name="AM_MediumMechanoid"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>5</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[@Name="AM_MediumMechanoid"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>3</ArmorRating_Sharp>
+						<MaxHitPoints>300</MaxHitPoints>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Apoptosis.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Apoptosis.xml
new file mode 100644
index 0000000000..48dc228434
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Apoptosis.xml	
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AM_Apoptosis"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Humanoid</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_Apoptosis"]/statBases</xpath>
+					<value>
+						<ArmorRating_Heat>0.75</ArmorRating_Heat>
+						<CarryWeight>75</CarryWeight>
+						<CarryBulk>30</CarryBulk>
+						<MeleeDodgeChance>0.1</MeleeDodgeChance>
+						<MeleeCritChance>0.13</MeleeCritChance>
+						<MeleeParryChance>0.13</MeleeParryChance>
+						<MaxHitPoints>600</MaxHitPoints>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Apoptosis"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>64</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Apoptosis"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>26</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Apoptosis"]/statBases/EnergyShieldRechargeRate</xpath>
+					<value>
+						<EnergyShieldRechargeRate>0.525</EnergyShieldRechargeRate>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Apoptosis"]/statBases/EnergyShieldEnergyMax</xpath>
+					<value>
+						<EnergyShieldEnergyMax>3.75</EnergyShieldEnergyMax>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Apoptosis"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>wing blade</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>37</power>
+								<cooldownTime>1.5</cooldownTime>
+								<linkedBodyPartsGroup>AM_WingBlades</linkedBodyPartsGroup>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+								<armorPenetrationBlunt>6</armorPenetrationBlunt>
+								<armorPenetrationSharp>2.5</armorPenetrationSharp>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>wing blade</label>
+								<capacities>
+									<li>Stab</li>
+								</capacities>
+								<power>18</power>
+								<cooldownTime>1.25</cooldownTime>
+								<linkedBodyPartsGroup>AM_WingBlades</linkedBodyPartsGroup>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+								<armorPenetrationBlunt>15</armorPenetrationBlunt>
+								<armorPenetrationSharp>30</armorPenetrationSharp>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>10</power>
+								<cooldownTime>2.0</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="AM_Apoptosis"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AM_Apoptosis"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_Apoptosis"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>5250</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>525</MaxOverHeal>
+							<MinArmorPct>0.5</MinArmorPct>
+							<MinArmorValueSharp>14</MinArmorValueSharp>
+							<MinArmorValueBlunt>35</MinArmorValueBlunt>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/PawnKindDef[defName="AM_Apoptosis"]/combatPower</xpath>
+					<value>
+						<combatPower>1000</combatPower>
+					</value>
+				</li>
+
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>AM_Gun_SoulDrainTurret</defName>
+					<statBases>
+						<SightsEfficiency>1</SightsEfficiency>
+						<ShotSpread>0.2</ShotSpread><!-- Manually adjusted from 0.08 due to accuracy concerns. -->
+						<SwayFactor>0.56</SwayFactor>
+						<Bulk>6.00</Bulk>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>AM_Bullet_SoulDrain_CE</defaultProjectile>
+						<range>55</range>
+						<burstShotCount>1</burstShotCount>
+						<soundCast>AM_SoulDrain</soundCast>
+						<muzzleFlashScale>9</muzzleFlashScale>
+						<defaultCooldownTime>2.5</defaultCooldownTime>
+						<ticksBetweenBurstShots>150</ticksBetweenBurstShots>
+					</Properties>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Bellicor.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Bellicor.xml
new file mode 100644
index 0000000000..8691903efd
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Bellicor.xml	
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Bellicor"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Humanoid</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Bellicor"]/statBases</xpath>
+					<value>
+						<CarryWeight>50</CarryWeight>
+						<CarryBulk>20</CarryBulk>
+						<AimingAccuracy>1.0</AimingAccuracy>
+						<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
+						<MeleeDodgeChance>0.13</MeleeDodgeChance>
+						<MeleeCritChance>0.12</MeleeCritChance>
+						<MeleeParryChance>0.09</MeleeParryChance>
+						<MaxHitPoints>150</MaxHitPoints>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Bellicor"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>9</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Bellicor"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>6</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Bellicor"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>5</power>
+								<cooldownTime>1.85</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Bellicor"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AM_Mech_Bellicor"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Bellicor"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>1000</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>100</MaxOverHeal>
+							<MinArmorPct>0.75</MinArmorPct>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/PawnKindDef[defName="AM_Mech_Bellicor"]/combatPower</xpath>
+					<value>
+						<combatPower>170</combatPower>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/PawnKindDef[defName="AM_Mech_Bellicor"]</xpath>
+					<value>
+						<li Class="CombatExtended.LoadoutPropertiesExtension">
+							<primaryMagazineCount>
+								<min>3</min>
+								<max>5</max>
+							</primaryMagazineCount>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Bellicor_Mortar.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Bellicor_Mortar.xml
new file mode 100644
index 0000000000..28bf1620ec
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Bellicor_Mortar.xml	
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Artilleron"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Humanoid</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Artilleron"]/statBases</xpath>
+					<value>
+						<CarryWeight>50</CarryWeight>
+						<CarryBulk>20</CarryBulk>
+						<AimingAccuracy>1.0</AimingAccuracy>
+						<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
+						<MeleeDodgeChance>0.09</MeleeDodgeChance>
+						<MeleeCritChance>0.12</MeleeCritChance>
+						<MeleeParryChance>0.09</MeleeParryChance>
+						<MaxHitPoints>150</MaxHitPoints>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Artilleron"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>6</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Artilleron"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>4</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Artilleron"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>5</power>
+								<cooldownTime>1.85</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Artilleron"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AM_Mech_Artilleron"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Artilleron"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>850</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>525</MaxOverHeal>
+							<MinArmorPct>0.75</MinArmorPct>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/PawnKindDef[defName="AM_Mech_Artilleron"]/combatPower</xpath>
+					<value>
+						<combatPower>150</combatPower>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/PawnKindDef[defName="AM_Mech_Artilleron"]</xpath>
+					<value>
+						<li Class="CombatExtended.LoadoutPropertiesExtension">
+							<primaryMagazineCount>
+								<min>3</min>
+								<max>5</max>
+							</primaryMagazineCount>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Blitzkrieg.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Blitzkrieg.xml
new file mode 100644
index 0000000000..12cd1fa5df
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Blitzkrieg.xml	
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AM_Blitzkrieg"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Vehicle</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Blitzkrieg"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>2</power>
+								<cooldownTime>1.85</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="AM_Blitzkrieg"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AM_Blitzkrieg"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_Blitzkrieg"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>700</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>70</MaxOverHeal>
+							<MinArmorPct>0.75</MinArmorPct>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/PawnKindDef[defName="AM_Blitzkrieg"]/combatPower</xpath>
+					<value>
+						<combatPower>120</combatPower>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Guttersnipe.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Guttersnipe.xml
new file mode 100644
index 0000000000..7b291eb4a1
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Guttersnipe.xml	
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Guttersnipe"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Vehicle</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Guttersnipe"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.1</MeleeDodgeChance>
+						<MeleeCritChance>0.05</MeleeCritChance>
+						<MeleeParryChance>0.05</MeleeParryChance>
+						<MaxHitPoints>200</MaxHitPoints>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Guttersnipe"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>8</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Guttersnipe"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>4</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Guttersnipe"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>20</power>
+								<cooldownTime>2.07</cooldownTime>
+								<linkedBodyPartsGroup>AM_CircularSaw</linkedBodyPartsGroup>
+								<armorPenetrationSharp>1.16</armorPenetrationSharp>
+								<armorPenetrationBlunt>2.4</armorPenetrationBlunt>
+								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Stab</li>
+								</capacities>
+								<power>12</power>
+								<cooldownTime>1.33</cooldownTime>
+								<linkedBodyPartsGroup>AM_CircularSaw</linkedBodyPartsGroup>
+								<armorPenetrationSharp>10</armorPenetrationSharp>
+								<armorPenetrationBlunt>5</armorPenetrationBlunt>
+								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Guttersnipe"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AM_Mech_Guttersnipe"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Guttersnipe"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>1600</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>160</MaxOverHeal>
+							<MinArmorPct>0.75</MinArmorPct>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Infernus.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Infernus.xml
new file mode 100644
index 0000000000..6a23595e23
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Infernus.xml	
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AM_Infernus"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Vehicle</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_Infernus"]/statBases</xpath>
+					<value>
+						<ArmorRating_Heat>0.75</ArmorRating_Heat>
+						<CarryWeight>75</CarryWeight>
+						<CarryBulk>60</CarryBulk>
+						<AimingAccuracy>1.0</AimingAccuracy>
+						<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
+						<MeleeDodgeChance>0.1</MeleeDodgeChance>
+						<MeleeCritChance>0.42</MeleeCritChance>
+						<MeleeParryChance>0.64</MeleeParryChance>
+						<AimingDelayFactor>1.25</AimingDelayFactor>
+						<MaxHitPoints>600</MaxHitPoints>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Infernus"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>36</power>
+								<cooldownTime>3.6</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+								<armorPenetrationBlunt>16</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="AM_Infernus"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AM_Infernus"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_Infernus"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>4250</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>425</MaxOverHeal>
+							<MinArmorPct>0.5</MinArmorPct>
+							<MinArmorValueSharp>14</MinArmorValueSharp>
+							<MinArmorValueBlunt>35</MinArmorValueBlunt>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/PawnKindDef[defName="AM_Infernus"]/combatPower</xpath>
+					<value>
+						<combatPower>1000</combatPower>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Legate.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Legate.xml
new file mode 100644
index 0000000000..2ef960392c
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Legate.xml	
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Legate"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Humanoid</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Legate"]/statBases/EnergyShieldRechargeRate</xpath>
+					<value>
+						<EnergyShieldRechargeRate>1.5</EnergyShieldRechargeRate>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Legate"]/statBases/EnergyShieldEnergyMax</xpath>
+					<value>
+						<EnergyShieldEnergyMax>10.0</EnergyShieldEnergyMax>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Legate"]/statBases</xpath>
+					<value>
+						<ArmorRating_Heat>0.5</ArmorRating_Heat>
+						<CarryWeight>100</CarryWeight>
+						<CarryBulk>75</CarryBulk>
+						<AimingAccuracy>1.0</AimingAccuracy>
+						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+						<MeleeDodgeChance>0.02</MeleeDodgeChance>
+						<MeleeCritChance>0.20</MeleeCritChance>
+						<MeleeParryChance>0.57</MeleeParryChance>
+						<MaxHitPoints>550</MaxHitPoints>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Legate"]/comps/li[@Class="CompProperties_ProjectileInterceptor"]/hitPoints</xpath>
+					<value>
+						<hitPoints>1000</hitPoints>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Legate"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Demolish</li>
+								</capacities>
+								<power>27</power>
+								<cooldownTime>3.0</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>10</armorPenetrationBlunt>
+								<chanceFactor>0.2</chanceFactor>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Legate"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AM_Mech_Legate"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Legate"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>3800</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>380</MaxOverHeal>
+							<MinArmorPct>0.5</MinArmorPct>
+							<MinArmorValueSharp>14</MinArmorValueSharp>
+							<MinArmorValueBlunt>35</MinArmorValueBlunt>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/PawnKindDef[defName="AM_Mech_Legate"]/combatPower</xpath>
+					<value>
+						<combatPower>600</combatPower>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/PawnKindDef[defName="AM_Mech_Legate"]</xpath>
+					<value>
+						<li Class="CombatExtended.LoadoutPropertiesExtension">
+							<primaryMagazineCount>
+								<min>3</min>
+								<max>5</max>
+							</primaryMagazineCount>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Lux.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Lux.xml
new file mode 100644
index 0000000000..3894609bf0
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Lux.xml	
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Lux"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Humanoid</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Lux"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>left fist</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>5</power>
+								<cooldownTime>1.11</cooldownTime>
+								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>right fist</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>5</power>
+								<cooldownTime>1.11</cooldownTime>
+								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>5</power>
+								<cooldownTime>1.85</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<chanceFactor>0.2</chanceFactor>
+								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Lux"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AM_Mech_Lux"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Lux"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>1000</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>100</MaxOverHeal>
+							<MinArmorPct>0.75</MinArmorPct>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/PawnKindDef[defName="AM_Mech_Lux"]/combatPower</xpath>
+					<value>
+						<combatPower>300</combatPower>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/PawnKindDef[defName="AM_Mech_Lux"]</xpath>
+					<value>
+						<li Class="CombatExtended.LoadoutPropertiesExtension">
+							<primaryMagazineCount>
+								<min>3</min>
+								<max>4</max>
+							</primaryMagazineCount>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_MasterChef.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_MasterChef.xml
new file mode 100644
index 0000000000..63bd5b526c
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_MasterChef.xml	
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AM_Mech_MasterChef"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Humanoid</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="AM_Mech_MasterChef"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AM_Mech_MasterChef"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_Mech_MasterChef"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>700</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>70</MaxOverHeal>
+							<MinArmorPct>0.75</MinArmorPct>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Munifex.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Munifex.xml
new file mode 100644
index 0000000000..6517d6107e
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Munifex.xml	
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Munifex"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Humanoid</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Munifex"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>left fist</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>5</power>
+								<cooldownTime>1.11</cooldownTime>
+								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>right fist</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>5</power>
+								<cooldownTime>1.11</cooldownTime>
+								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>5</power>
+								<cooldownTime>1.85</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<chanceFactor>0.2</chanceFactor>
+								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Munifex"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AM_Mech_Munifex"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Munifex"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>1000</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>100</MaxOverHeal>
+							<MinArmorPct>0.75</MinArmorPct>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/PawnKindDef[defName="AM_Mech_Munifex"]/combatPower</xpath>
+					<value>
+						<combatPower>300</combatPower>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/PawnKindDef[defName="AM_Mech_Munifex"]</xpath>
+					<value>
+						<li Class="CombatExtended.LoadoutPropertiesExtension">
+							<primaryMagazineCount>
+								<min>4</min>
+								<max>5</max>
+							</primaryMagazineCount>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Optio.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Optio.xml
new file mode 100644
index 0000000000..23ee4f8e74
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Optio.xml	
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Optio"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Humanoid</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Optio"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Optio"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>5</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Optio"]/statBases/EnergyShieldRechargeRate</xpath>
+					<value>
+						<EnergyShieldRechargeRate>1.125</EnergyShieldRechargeRate>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Optio"]/statBases/EnergyShieldEnergyMax</xpath>
+					<value>
+						<EnergyShieldEnergyMax>7.5</EnergyShieldEnergyMax>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Optio"]/comps/li[@Class="CompProperties_ProjectileInterceptor"]/hitPoints</xpath>
+					<value>
+						<hitPoints>375</hitPoints>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Optio"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AM_Mech_Optio"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Optio"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>860</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>86</MaxOverHeal>
+							<MinArmorPct>0.75</MinArmorPct>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/PawnKindDef[defName="AM_Mech_Optio"]/combatPower</xpath>
+					<value>
+						<combatPower>220</combatPower>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/PawnKindDef[defName="AM_Mech_Optio"]</xpath>
+					<value>
+						<li Class="CombatExtended.LoadoutPropertiesExtension">
+							<primaryMagazineCount>
+								<min>2</min>
+								<max>3</max>
+							</primaryMagazineCount>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Polychoron.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Polychoron.xml
new file mode 100644
index 0000000000..6e3bb0dcd6
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Polychoron.xml	
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Polychoron"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Humanoid</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Polychoron"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Polychoron"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>5</ArmorRating_Sharp>
+						<ArmorRating_Heat>0.5</ArmorRating_Heat>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Polychoron"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AM_Mech_Polychoron"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Polychoron"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>1350</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>135</MaxOverHeal>
+							<MinArmorPct>0.75</MinArmorPct>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/PawnKindDef[defName="AM_Mech_Polychoron"]/combatPower</xpath>
+					<value>
+						<combatPower>300</combatPower>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_PristineAssembler.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_PristineAssembler.xml
new file mode 100644
index 0000000000..ce1cb00f33
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_PristineAssembler.xml	
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AM_Mech_PristineAssembler"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Quadruped</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_Mech_PristineAssembler"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.12</MeleeDodgeChance>
+						<MeleeCritChance>0.1</MeleeCritChance>
+						<MeleeParryChance>0.17</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Mech_PristineAssembler"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>16</ArmorRating_Blunt>
+					</value>
+				</li>
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Mech_PristineAssembler"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>7</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_Mech_PristineAssembler"]/comps/li[@Class ="AnimalBehaviours.CompProperties_AnimalProduct"]/randomItems</xpath>
+					<value>
+						<li>FSX</li>
+						<li>Prometheum</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Mech_PristineAssembler"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>16</power>
+								<cooldownTime>2.4</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>10</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="AM_Mech_PristineAssembler"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AM_Mech_PristineAssembler"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_Mech_PristineAssembler"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>3500</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>350</MaxOverHeal>
+							<MinArmorPct>0.5</MinArmorPct>
+							<MinArmorValueSharp>4</MinArmorValueSharp>
+							<MinArmorValueBlunt>10</MinArmorValueBlunt>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_PristineSlurrypede.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_PristineSlurrypede.xml
new file mode 100644
index 0000000000..80749d3a6d
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_PristineSlurrypede.xml	
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AM_Mech_PristineSlurrypede"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>QuadrupedLow</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_Mech_PristineSlurrypede"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.12</MeleeDodgeChance>
+						<MeleeCritChance>0.1</MeleeCritChance>
+						<MeleeParryChance>0.17</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Mech_PristineSlurrypede"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>20</ArmorRating_Blunt>
+					</value>
+				</li>
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Mech_PristineSlurrypede"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>9</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Mech_PristineSlurrypede"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>16</power>
+								<cooldownTime>2.7</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>12</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="AM_Mech_PristineSlurrypede"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AM_Mech_PristineSlurrypede"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_Mech_PristineSlurrypede"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>3500</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>350</MaxOverHeal>
+							<MinArmorPct>0.5</MinArmorPct>
+							<MinArmorValueSharp>6</MinArmorValueSharp>
+							<MinArmorValueBlunt>12</MinArmorValueBlunt>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_PristineStrider.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_PristineStrider.xml
new file mode 100644
index 0000000000..630c8910d2
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_PristineStrider.xml	
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AM_PristineStrider"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>QuadrupedLow</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_PristineStrider"]/statBases</xpath>
+					<value>
+						<CarryWeight>300</CarryWeight>
+						<CarryBulk>100</CarryBulk>
+						<ArmorRating_Blunt>10</ArmorRating_Blunt>
+						<ArmorRating_Sharp>6</ArmorRating_Sharp>
+						<MeleeDodgeChance>0.03</MeleeDodgeChance>
+						<MeleeCritChance>0.26</MeleeCritChance>
+						<MeleeParryChance>0.52</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_PristineStrider"]</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>10</power>
+								<cooldownTime>3.01</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>5</armorPenetrationBlunt>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="AM_PristineStrider"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AM_PristineStrider"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_PristineStrider"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>1000</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>100</MaxOverHeal>
+							<MinArmorPct>0.75</MinArmorPct>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Sagittarius.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Sagittarius.xml
new file mode 100644
index 0000000000..469dab009f
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Sagittarius.xml	
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Sagittarius"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Humanoid</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Sagittarius"]/statBases</xpath>
+					<value>
+						<ArmorRating_Electric>0.25</ArmorRating_Electric>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Sagittarius"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>left fist</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>5</power>
+								<cooldownTime>1.11</cooldownTime>
+								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>right fist</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>5</power>
+								<cooldownTime>1.11</cooldownTime>
+								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>5</power>
+								<cooldownTime>1.85</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<chanceFactor>0.2</chanceFactor>
+								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Sagittarius"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AM_Mech_Sagittarius"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Sagittarius"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>1000</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>100</MaxOverHeal>
+							<MinArmorPct>0.75</MinArmorPct>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/PawnKindDef[defName="AM_Mech_Sagittarius"]/combatPower</xpath>
+					<value>
+						<combatPower>300</combatPower>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Siegemelter.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Siegemelter.xml
new file mode 100644
index 0000000000..d4e39fedc3
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Siegemelter.xml	
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AM_Siegemelter"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Vehicle</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Siegemelter"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>64</ArmorRating_Blunt>
+					</value>
+				</li>
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Siegemelter"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>26</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_Siegemelter"]/statBases</xpath>
+					<value>
+						<ArmorRating_Heat>0.5</ArmorRating_Heat>
+						<CarryWeight>200</CarryWeight>
+						<CarryBulk>150</CarryBulk>
+						<AimingAccuracy>1.0</AimingAccuracy>
+						<ShootingAccuracyPawn>1.0</ShootingAccuracyPawn>
+						<MeleeDodgeChance>0.01</MeleeDodgeChance>
+						<MeleeCritChance>0.07</MeleeCritChance>
+						<MeleeParryChance>0.24</MeleeParryChance>
+						<MaxHitPoints>600</MaxHitPoints>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Siegemelter"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>30</power>
+								<cooldownTime>3.4</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+								<armorPenetrationBlunt>20</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="AM_Siegemelter"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AM_Siegemelter"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_Siegemelter"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>4250</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>425</MaxOverHeal>
+							<MinArmorPct>0.5</MinArmorPct>
+							<MinArmorValueSharp>14</MinArmorValueSharp>
+							<MinArmorValueBlunt>35</MinArmorValueBlunt>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/PawnKindDef[defName="AM_Siegemelter"]/combatPower</xpath>
+					<value>
+						<combatPower>550</combatPower>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/PawnKindDef[defName="AM_Siegemelter"]</xpath>
+					<value>
+						<li Class="CombatExtended.LoadoutPropertiesExtension">
+							<primaryMagazineCount>
+								<min>4</min>
+								<max>5</max>
+							</primaryMagazineCount>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Starfire.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Starfire.xml
new file mode 100644
index 0000000000..7a648246fe
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Starfire.xml	
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AM_Starfire"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Vehicle</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Starfire"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>68</ArmorRating_Blunt>
+					</value>
+				</li>
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Starfire"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>28</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_Starfire"]/statBases</xpath>
+					<value>
+						<ArmorRating_Heat>0.5</ArmorRating_Heat>
+						<CarryWeight>200</CarryWeight>
+						<CarryBulk>150</CarryBulk>
+						<AimingAccuracy>1.0</AimingAccuracy>
+						<ShootingAccuracyPawn>1.0</ShootingAccuracyPawn>
+						<MeleeDodgeChance>0.01</MeleeDodgeChance>
+						<MeleeCritChance>0.07</MeleeCritChance>
+						<MeleeParryChance>0.24</MeleeParryChance>
+						<MaxHitPoints>600</MaxHitPoints>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Starfire"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>30</power>
+								<cooldownTime>3.4</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+								<armorPenetrationBlunt>20</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="AM_Starfire"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AM_Starfire"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_Starfire"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>4500</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>450</MaxOverHeal>
+							<MinArmorPct>0.5</MinArmorPct>
+							<MinArmorValueSharp>16</MinArmorValueSharp>
+							<MinArmorValueBlunt>40</MinArmorValueBlunt>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/PawnKindDef[defName="AM_Starfire"]/combatPower</xpath>
+					<value>
+						<combatPower>750</combatPower>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_TurboCleaner.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_TurboCleaner.xml
new file mode 100644
index 0000000000..a64c6cefaa
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_TurboCleaner.xml	
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AM_Mech_TurboCleaner"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Vehicle</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Mech_TurboCleaner"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>2</power>
+								<cooldownTime>1.85</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="AM_Mech_TurboCleaner"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AM_Mech_TurboCleaner"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_Mech_TurboCleaner"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>600</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>60</MaxOverHeal>
+							<MinArmorPct>0.75</MinArmorPct>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_WarEmpress.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_WarEmpress.xml
new file mode 100644
index 0000000000..b02080947a
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_WarEmpress.xml	
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AM_WarEmpress"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>QuadrupedLow</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_WarEmpress"]/statBases/EnergyShieldRechargeRate</xpath>
+					<value>
+						<EnergyShieldRechargeRate>0.9</EnergyShieldRechargeRate>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_WarEmpress"]/statBases/EnergyShieldEnergyMax</xpath>
+					<value>
+						<EnergyShieldEnergyMax>6.0</EnergyShieldEnergyMax>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_WarEmpress"]/statBases</xpath>
+					<value>
+						<ArmorRating_Heat>0.75</ArmorRating_Heat>
+						<CarryWeight>75</CarryWeight>
+						<CarryBulk>50</CarryBulk>
+						<AimingAccuracy>1.0</AimingAccuracy>
+						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+						<MeleeDodgeChance>0.02</MeleeDodgeChance>
+						<MeleeCritChance>0.22</MeleeCritChance>
+						<MeleeParryChance>0.64</MeleeParryChance>
+						<MaxHitPoints>600</MaxHitPoints>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_WarEmpress"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>left rending claws</label>
+								<capacities>
+									<li>Scratch</li>
+								</capacities>
+								<power>35</power>
+								<cooldownTime>1.5</cooldownTime>
+								<linkedBodyPartsGroup>LeftPowerClaw</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>5</armorPenetrationBlunt>
+								<armorPenetrationSharp>10</armorPenetrationSharp>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>right rending claws</label>
+								<capacities>
+									<li>Scratch</li>
+								</capacities>
+								<power>35</power>
+								<cooldownTime>1.5</cooldownTime>
+								<linkedBodyPartsGroup>RightPowerClaw</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>5</armorPenetrationBlunt>
+								<armorPenetrationSharp>10</armorPenetrationSharp>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>36</power>
+								<cooldownTime>3.6</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+								<armorPenetrationBlunt>16</armorPenetrationBlunt>
+								<chanceFactor>0.2</chanceFactor>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="AM_WarEmpress"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AM_WarEmpress"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_WarEmpress"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>5750</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>575</MaxOverHeal>
+							<MinArmorPct>0.5</MinArmorPct>
+							<MinArmorValueSharp>14</MinArmorValueSharp>
+							<MinArmorValueBlunt>35</MinArmorValueBlunt>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/PawnKindDef[defName="AM_WarEmpress"]/combatPower</xpath>
+					<value>
+						<combatPower>1100</combatPower>
+					</value>
+				</li>
+
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>AM_Gun_SniperTurret</defName>
+					<statBases>
+						<SightsEfficiency>1</SightsEfficiency>
+						<ShotSpread>0.2</ShotSpread><!-- Manually adjusted from 0.08 due to accuracy concerns. -->
+						<SwayFactor>1.89</SwayFactor>
+						<Bulk>20.00</Bulk>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_40x311mmR_AP</defaultProjectile>
+						<range>75</range>
+						<minRange>5.9</minRange>
+						<burstShotCount>1</burstShotCount>
+						<soundCast>AM_Shot</soundCast>
+						<muzzleFlashScale>18</muzzleFlashScale>
+						<defaultCooldownTime>4.5</defaultCooldownTime>
+						<ticksBetweenBurstShots>150</ticksBetweenBurstShots>
+					</Properties>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Rimatomics/Nucleotron.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Rimatomics/Nucleotron.xml
new file mode 100644
index 0000000000..f3d72b0625
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Rimatomics/Nucleotron.xml	
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Dubs Rimatomics</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Nucleotron"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Vehicle</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Nucleotron"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AM_Mech_Nucleotron"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Nucleotron"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>700</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>70</MaxOverHeal>
+							<MinArmorPct>0.75</MinArmorPct>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VE_Books/Librarian.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VE_Books/Librarian.xml
new file mode 100644
index 0000000000..d57135de35
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VE_Books/Librarian.xml	
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Books Expanded</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Librarian"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Humanoid</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Librarian"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AM_Mech_Librarian"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Librarian"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>700</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>70</MaxOverHeal>
+							<MinArmorPct>0.75</MinArmorPct>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VE_Fishing/Angler.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VE_Fishing/Angler.xml
new file mode 100644
index 0000000000..b79fb8369f
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VE_Fishing/Angler.xml	
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Fishing Expanded</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Angler"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Quadruped</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Angler"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>prow</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>2</power>
+								<cooldownTime>2</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Angler"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AM_Mech_Angler"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Angler"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>700</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>70</MaxOverHeal>
+							<MinArmorPct>0.75</MinArmorPct>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VE_Genetics/Geneticor.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VE_Genetics/Geneticor.xml
new file mode 100644
index 0000000000..b8c84ddc8e
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VE_Genetics/Geneticor.xml	
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Genetics Expanded</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Geneticor"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Humanoid</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Geneticor"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AM_Mech_Geneticor"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Geneticor"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>700</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>70</MaxOverHeal>
+							<MinArmorPct>0.75</MinArmorPct>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/VE_Psycasts/Projectile_Tweaks.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VE_Psycasts/Projectile_Tweaks.xml
similarity index 100%
rename from Patches/Alpha Mechs/Mods/VE_Psycasts/Projectile_Tweaks.xml
rename to ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VE_Psycasts/Projectile_Tweaks.xml
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvAura.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvAura.xml
new file mode 100644
index 0000000000..8ba98363cd
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvAura.xml	
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Factions Expanded - Mechanoids</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Aura"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Humanoid</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Aura"]</xpath>
+					<value>
+						<statBases>
+							<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
+							<ArmorRating_Sharp>5</ArmorRating_Sharp>
+							<MeleeDodgeChance>0.66</MeleeDodgeChance>
+							<MeleeCritChance>0.3</MeleeCritChance>
+							<MeleeParryChance>0.33</MeleeParryChance>
+							<MaxHitPoints>200</MaxHitPoints>
+						</statBases>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Aura"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>wing blade</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>37</power>
+								<cooldownTime>1.5</cooldownTime>
+								<linkedBodyPartsGroup>AM_WingBlades</linkedBodyPartsGroup>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+								<armorPenetrationBlunt>6</armorPenetrationBlunt>
+								<armorPenetrationSharp>2.5</armorPenetrationSharp>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>wing blade</label>
+								<capacities>
+									<li>Stab</li>
+								</capacities>
+								<power>18</power>
+								<cooldownTime>1.25</cooldownTime>
+								<linkedBodyPartsGroup>AM_WingBlades</linkedBodyPartsGroup>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+								<armorPenetrationBlunt>15</armorPenetrationBlunt>
+								<armorPenetrationSharp>30</armorPenetrationSharp>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>6</power>
+								<cooldownTime>4</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+								<chanceFactor>0.2</chanceFactor>
+								<armorPenetrationBlunt>2</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Aura"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Aura"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Aura"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>1425</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>500</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>142</MaxOverHeal>
+							<MinArmorPct>0.75</MinArmorPct>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvDaggersnout.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvDaggersnout.xml
new file mode 100644
index 0000000000..86a8cbba7a
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvDaggersnout.xml	
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Factions Expanded - Mechanoids</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Daggersnout"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>QuadrupedLow</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Daggersnout"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.08</MeleeDodgeChance>
+						<MeleeCritChance>0.27</MeleeCritChance>
+						<MeleeParryChance>0.18</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Daggersnout"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>4.5</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Daggersnout"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>3</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Daggersnout"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>snout blade</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>19</power>
+								<cooldownTime>1.4</cooldownTime>
+								<linkedBodyPartsGroup>AM_NoseBlade</linkedBodyPartsGroup>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+								<armorPenetrationBlunt>8</armorPenetrationBlunt>
+								<armorPenetrationSharp>3</armorPenetrationSharp>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>snout blade</label>
+								<capacities>
+									<li>Stab</li>
+								</capacities>
+								<power>14</power>
+								<cooldownTime>1.2</cooldownTime>
+								<linkedBodyPartsGroup>AM_NoseBlade</linkedBodyPartsGroup>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+								<armorPenetrationBlunt>12</armorPenetrationBlunt>
+								<armorPenetrationSharp>16</armorPenetrationSharp>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>3</power>
+								<cooldownTime>2</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+								<chanceFactor>0.2</chanceFactor>
+								<armorPenetrationBlunt>5</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Daggersnout"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Daggersnout"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Daggersnout"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>1000</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>100</MaxOverHeal>
+							<MinArmorPct>0.75</MinArmorPct>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvFireworm.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvFireworm.xml
new file mode 100644
index 0000000000..b56ef485bd
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvFireworm.xml	
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Factions Expanded - Mechanoids</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Fireworm"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>QuadrupedLow</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Fireworm"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>30</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Fireworm"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>15</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Fireworm"]/statBases</xpath>
+					<value>
+						<ArmorRating_Heat>1.0</ArmorRating_Heat>
+						<AimingAccuracy>1.0</AimingAccuracy>
+						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+						<MeleeDodgeChance>0.01</MeleeDodgeChance>
+						<MeleeCritChance>0.19</MeleeCritChance>
+						<MeleeParryChance>0.19</MeleeParryChance>
+						<MaxHitPoints>350</MaxHitPoints>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Fireworm"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>24</power>
+								<cooldownTime>2.6</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+								<armorPenetrationBlunt>12</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Fireworm"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Fireworm"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Fireworm"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>3400</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>340</MaxOverHeal>
+							<MinArmorPct>0.5</MinArmorPct>
+							<MinArmorValueSharp>8</MinArmorValueSharp>
+							<MinArmorValueBlunt>16</MinArmorValueBlunt>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvGoliath.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvGoliath.xml
new file mode 100644
index 0000000000..ddd3b6212c
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvGoliath.xml	
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Factions Expanded - Mechanoids</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Goliath"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Humanoid</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Goliath"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>42</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Goliath"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>19</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Goliath"]/statBases</xpath>
+					<value>
+						<ArmorRating_Heat>0.75</ArmorRating_Heat>
+						<CarryWeight>200</CarryWeight>
+						<CarryBulk>100</CarryBulk>
+						<AimingAccuracy>1.0</AimingAccuracy>
+						<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
+						<MeleeDodgeChance>0.05</MeleeDodgeChance>
+						<MeleeCritChance>0.75</MeleeCritChance>
+						<MeleeParryChance>0.2</MeleeParryChance>
+						<MaxHitPoints>500</MaxHitPoints>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Goliath"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>35</power>
+								<cooldownTime>3.0</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+								<armorPenetrationBlunt>15</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Goliath"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Goliath"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Goliath"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>3650</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>365</MaxOverHeal>
+							<MinArmorPct>0.5</MinArmorPct>
+							<MinArmorValueSharp>12</MinArmorValueSharp>
+							<MinArmorValueBlunt>27</MinArmorValueBlunt>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvPhalanx.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvPhalanx.xml
new file mode 100644
index 0000000000..344e9009e6
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvPhalanx.xml	
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Factions Expanded - Mechanoids</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Phalanx"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Quadruped</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Phalanx"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>30</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Phalanx"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>13</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Phalanx"]/statBases</xpath>
+					<value>
+						<ArmorRating_Heat>1.0</ArmorRating_Heat>
+						<AimingAccuracy>1.0</AimingAccuracy>
+						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+						<MeleeDodgeChance>0.01</MeleeDodgeChance>
+						<MeleeCritChance>0.56</MeleeCritChance>
+						<MeleeParryChance>0.44</MeleeParryChance>
+						<MaxHitPoints>350</MaxHitPoints>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Phalanx"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>36</power>
+								<cooldownTime>2</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+								<armorPenetrationBlunt>30</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Phalanx"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Phalanx"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Phalanx"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>3100</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>310</MaxOverHeal>
+							<MinArmorPct>0.5</MinArmorPct>
+							<MinArmorValueSharp>7</MinArmorValueSharp>
+							<MinArmorValueBlunt>16</MinArmorValueBlunt>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvSiegebreaker.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvSiegebreaker.xml
new file mode 100644
index 0000000000..7cf159d66c
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvSiegebreaker.xml	
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Factions Expanded - Mechanoids</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Siegebreaker"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Vehicle</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Siegebreaker"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>62</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Siegebreaker"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>25</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Siegebreaker"]/statBases</xpath>
+					<value>
+						<ArmorRating_Heat>0.75</ArmorRating_Heat>
+						<CarryWeight>200</CarryWeight>
+						<CarryBulk>200</CarryBulk>
+						<AimingAccuracy>1.0</AimingAccuracy>
+						<ShootingAccuracyPawn>1.0</ShootingAccuracyPawn>
+						<MeleeDodgeChance>0.01</MeleeDodgeChance>
+						<MeleeCritChance>0.07</MeleeCritChance>
+						<MeleeParryChance>0.24</MeleeParryChance>
+						<MaxHitPoints>600</MaxHitPoints>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Siegebreaker"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>30</power>
+								<cooldownTime>3.4</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+								<armorPenetrationBlunt>20</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Siegebreaker"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Siegebreaker"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Siegebreaker"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>4250</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>425</MaxOverHeal>
+							<MinArmorPct>0.5</MinArmorPct>
+							<MinArmorValueSharp>14</MinArmorValueSharp>
+							<MinArmorValueBlunt>35</MinArmorValueBlunt>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEAura.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEAura.xml
new file mode 100644
index 0000000000..48a930af32
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEAura.xml	
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Factions Expanded - Mechanoids</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Aura"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Humanoid</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Aura"]</xpath>
+					<value>
+						<statBases>
+							<MeleeDodgeChance>0.5</MeleeDodgeChance>
+							<MeleeCritChance>0.24</MeleeCritChance>
+							<MeleeParryChance>0.33</MeleeParryChance>
+							<MaxHitPoints>200</MaxHitPoints>
+						</statBases>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Aura"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>wing blade</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>37</power>
+								<cooldownTime>1.5</cooldownTime>
+								<linkedBodyPartsGroup>AM_WingBlades</linkedBodyPartsGroup>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+								<armorPenetrationBlunt>6</armorPenetrationBlunt>
+								<armorPenetrationSharp>2.5</armorPenetrationSharp>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>wing blade</label>
+								<capacities>
+									<li>Stab</li>
+								</capacities>
+								<power>18</power>
+								<cooldownTime>1.25</cooldownTime>
+								<linkedBodyPartsGroup>AM_WingBlades</linkedBodyPartsGroup>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+								<armorPenetrationBlunt>15</armorPenetrationBlunt>
+								<armorPenetrationSharp>30</armorPenetrationSharp>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>6</power>
+								<cooldownTime>4</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+								<chanceFactor>0.2</chanceFactor>
+								<armorPenetrationBlunt>2</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Aura"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Aura"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Aura"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>1425</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>500</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>142</MaxOverHeal>
+							<MinArmorPct>0.75</MinArmorPct>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEDaggersnout.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEDaggersnout.xml
new file mode 100644
index 0000000000..13d02c411a
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEDaggersnout.xml	
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Factions Expanded - Mechanoids</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Daggersnout"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>QuadrupedLow</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Daggersnout"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.08</MeleeDodgeChance>
+						<MeleeCritChance>0.24</MeleeCritChance>
+						<MeleeParryChance>0.18</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Daggersnout"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>3</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Daggersnout"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>2</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Daggersnout"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>snout blade</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>19</power>
+								<cooldownTime>1.4</cooldownTime>
+								<linkedBodyPartsGroup>AM_NoseBlade</linkedBodyPartsGroup>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+								<armorPenetrationBlunt>8</armorPenetrationBlunt>
+								<armorPenetrationSharp>3</armorPenetrationSharp>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>snout blade</label>
+								<capacities>
+									<li>Stab</li>
+								</capacities>
+								<power>14</power>
+								<cooldownTime>1.2</cooldownTime>
+								<linkedBodyPartsGroup>AM_NoseBlade</linkedBodyPartsGroup>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+								<armorPenetrationBlunt>12</armorPenetrationBlunt>
+								<armorPenetrationSharp>16</armorPenetrationSharp>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>3</power>
+								<cooldownTime>2</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+								<chanceFactor>0.2</chanceFactor>
+								<armorPenetrationBlunt>5</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Daggersnout"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Daggersnout"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Daggersnout"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>900</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>90</MaxOverHeal>
+							<MinArmorPct>0.75</MinArmorPct>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEFireworm.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEFireworm.xml
new file mode 100644
index 0000000000..134b7f879e
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEFireworm.xml	
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Factions Expanded - Mechanoids</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Fireworm"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>QuadrupedLow</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Fireworm"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>28</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Fireworm"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>14</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Fireworm"]/statBases</xpath>
+					<value>
+						<ArmorRating_Heat>0.5</ArmorRating_Heat>
+						<AimingAccuracy>1.0</AimingAccuracy>
+						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+						<MeleeDodgeChance>0.01</MeleeDodgeChance>
+						<MeleeCritChance>0.19</MeleeCritChance>
+						<MeleeParryChance>0.19</MeleeParryChance>
+						<MaxHitPoints>350</MaxHitPoints>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Fireworm"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>24</power>
+								<cooldownTime>2.6</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+								<armorPenetrationBlunt>12</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Fireworm"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Fireworm"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Fireworm"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>2900</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>290</MaxOverHeal>
+							<MinArmorPct>0.5</MinArmorPct>
+							<MinArmorValueSharp>8</MinArmorValueSharp>
+							<MinArmorValueBlunt>16</MinArmorValueBlunt>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEGoliath.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEGoliath.xml
new file mode 100644
index 0000000000..e6cfd66ae6
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEGoliath.xml	
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Factions Expanded - Mechanoids</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Goliath"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Humanoid</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Goliath"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>40</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Goliath"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>18</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Goliath"]/statBases</xpath>
+					<value>
+						<ArmorRating_Heat>0.25</ArmorRating_Heat>
+						<CarryWeight>200</CarryWeight>
+						<CarryBulk>100</CarryBulk>
+						<AimingAccuracy>1.0</AimingAccuracy>
+						<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
+						<MeleeDodgeChance>0.05</MeleeDodgeChance>
+						<MeleeCritChance>0.75</MeleeCritChance>
+						<MeleeParryChance>0.2</MeleeParryChance>
+						<MaxHitPoints>500</MaxHitPoints>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Goliath"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>35</power>
+								<cooldownTime>3.0</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+								<armorPenetrationBlunt>15</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Goliath"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Goliath"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Goliath"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>3200</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>320</MaxOverHeal>
+							<MinArmorPct>0.5</MinArmorPct>
+							<MinArmorValueSharp>12</MinArmorValueSharp>
+							<MinArmorValueBlunt>27</MinArmorValueBlunt>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEPhalanx.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEPhalanx.xml
new file mode 100644
index 0000000000..77465d2299
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEPhalanx.xml	
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Factions Expanded - Mechanoids</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Phalanx"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Quadruped</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Phalanx"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>27</ArmorRating_Blunt>
+					</value>
+				</li>
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Phalanx"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>12</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Phalanx"]/statBases</xpath>
+					<value>
+						<ArmorRating_Heat>0.5</ArmorRating_Heat>
+						<AimingAccuracy>1.0</AimingAccuracy>
+						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+						<MeleeDodgeChance>0.01</MeleeDodgeChance>
+						<MeleeCritChance>0.56</MeleeCritChance>
+						<MeleeParryChance>0.44</MeleeParryChance>
+						<MaxHitPoints>350</MaxHitPoints>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Phalanx"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>36</power>
+								<cooldownTime>2</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+								<armorPenetrationBlunt>30</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Phalanx"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Phalanx"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Phalanx"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>2725</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>272</MaxOverHeal>
+							<MinArmorPct>0.5</MinArmorPct>
+							<MinArmorValueSharp>7</MinArmorValueSharp>
+							<MinArmorValueBlunt>16</MinArmorValueBlunt>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFESiegebreaker.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFESiegebreaker.xml
new file mode 100644
index 0000000000..73eb154306
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFESiegebreaker.xml	
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Factions Expanded - Mechanoids</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Siegebreaker"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Vehicle</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Siegebreaker"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>60</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Siegebreaker"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>24</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Siegebreaker"]/statBases</xpath>
+					<value>
+						<ArmorRating_Heat>0.25</ArmorRating_Heat>
+						<CarryWeight>200</CarryWeight>
+						<CarryBulk>150</CarryBulk>
+						<AimingAccuracy>1.0</AimingAccuracy>
+						<ShootingAccuracyPawn>1.0</ShootingAccuracyPawn>
+						<MeleeDodgeChance>0.01</MeleeDodgeChance>
+						<MeleeCritChance>0.07</MeleeCritChance>
+						<MeleeParryChance>0.24</MeleeParryChance>
+						<MaxHitPoints>600</MaxHitPoints>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Siegebreaker"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>30</power>
+								<cooldownTime>3.4</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+								<armorPenetrationBlunt>20</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Siegebreaker"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Siegebreaker"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Siegebreaker"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>3500</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>350</MaxOverHeal>
+							<MinArmorPct>0.5</MinArmorPct>
+							<MinArmorValueSharp>14</MinArmorValueSharp>
+							<MinArmorValueBlunt>35</MinArmorValueBlunt>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Aura.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Aura.xml
new file mode 100644
index 0000000000..3424ba8709
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Aura.xml	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>				
+		</mods>
+
+		<match Class="PatchOperationFindMod">
+			<mods>
+				<li>Vanilla Factions Expanded - Mechanoids</li>
+			</mods>
+
+			<match Class="PatchOperationSequence">
+				<operations>
+
+					<li Class="PatchOperationAddModExtension">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Aura_PlayerControlled"]</xpath>
+						<value>
+							<li Class="CombatExtended.RacePropertiesExtensionCE">
+								<bodyShape>Humanoid</bodyShape>
+							</li>
+						</value>
+					</li>
+
+					<li Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Aura_PlayerControlled"]/statBases</xpath>
+						<value>
+							<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
+							<ArmorRating_Sharp>5</ArmorRating_Sharp>
+							<ArmorRating_Heat>0.5</ArmorRating_Heat>
+							<MeleeDodgeChance>0.66</MeleeDodgeChance>
+							<MeleeCritChance>0.3</MeleeCritChance>
+							<MeleeParryChance>0.33</MeleeParryChance>
+							<MaxHitPoints>200</MaxHitPoints>
+						</value>
+					</li>
+
+					<li Class="PatchOperationReplace">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Aura_PlayerControlled"]/tools</xpath>
+						<value>
+							<tools>
+								<li Class="CombatExtended.ToolCE">
+									<label>wing blade</label>
+									<capacities>
+										<li>Cut</li>
+									</capacities>
+									<power>37</power>
+									<cooldownTime>1.5</cooldownTime>
+									<linkedBodyPartsGroup>AM_WingBlades</linkedBodyPartsGroup>
+									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+									<armorPenetrationBlunt>6</armorPenetrationBlunt>
+									<armorPenetrationSharp>2.5</armorPenetrationSharp>
+								</li>
+								<li Class="CombatExtended.ToolCE">
+									<label>wing blade</label>
+									<capacities>
+										<li>Stab</li>
+									</capacities>
+									<power>18</power>
+									<cooldownTime>1.25</cooldownTime>
+									<linkedBodyPartsGroup>AM_WingBlades</linkedBodyPartsGroup>
+									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+									<armorPenetrationBlunt>15</armorPenetrationBlunt>
+									<armorPenetrationSharp>30</armorPenetrationSharp>
+								</li>
+								<li Class="CombatExtended.ToolCE">
+									<label>head</label>
+									<capacities>
+										<li>Blunt</li>
+									</capacities>
+									<power>6</power>
+									<cooldownTime>4</cooldownTime>
+									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+									<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+									<chanceFactor>0.2</chanceFactor>
+									<armorPenetrationBlunt>2</armorPenetrationBlunt>
+								</li>
+							</tools>
+						</value>
+					</li>
+
+					<li Class="PatchOperationConditional">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Aura_PlayerControlled"]/comps</xpath>
+						<nomatch Class="PatchOperationAdd">
+							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Aura_PlayerControlled"]</xpath>
+							<value>
+								<comps/>
+							</value>
+						</nomatch>
+					</li>
+
+					<li Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Aura_PlayerControlled"]/comps</xpath>
+						<value>
+							<li Class="CombatExtended.CompProperties_ArmorDurability">
+								<Durability>1425</Durability>
+								<Regenerates>true</Regenerates>
+								<RegenInterval>500</RegenInterval>
+								<RegenValue>5</RegenValue>
+								<Repairable>true</Repairable>
+								<RepairIngredients>
+									<Steel>5</Steel>
+									<Plasteel>5</Plasteel>
+								</RepairIngredients>
+								<RepairTime>300</RepairTime>
+								<RepairValue>200</RepairValue>
+								<CanOverHeal>true</CanOverHeal>
+								<MaxOverHeal>142</MaxOverHeal>
+								<MinArmorPct>0.75</MinArmorPct>
+							</li>
+						</value>
+					</li>
+
+				</operations>
+			</match>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Daggersnout.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Daggersnout.xml
new file mode 100644
index 0000000000..6b9453d52a
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Daggersnout.xml	
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>				
+		</mods>
+
+		<match Class="PatchOperationFindMod">
+			<mods>
+				<li>Vanilla Factions Expanded - Mechanoids</li>
+			</mods>
+
+			<match Class="PatchOperationSequence">
+				<operations>
+
+					<li Class="PatchOperationAddModExtension">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Daggersnout_PlayerControlled"]</xpath>
+						<value>
+							<li Class="CombatExtended.RacePropertiesExtensionCE">
+								<bodyShape>QuadrupedLow</bodyShape>
+							</li>
+						</value>
+					</li>
+
+					<li Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Daggersnout_PlayerControlled"]/statBases</xpath>
+						<value>
+							<ArmorRating_Heat>0.5</ArmorRating_Heat>
+							<MeleeDodgeChance>0.08</MeleeDodgeChance>
+							<MeleeCritChance>0.27</MeleeCritChance>
+							<MeleeParryChance>0.18</MeleeParryChance>
+						</value>
+					</li>
+
+					<li Class="PatchOperationReplace">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Daggersnout_PlayerControlled"]/statBases/ArmorRating_Blunt</xpath>
+						<value>
+							<ArmorRating_Blunt>4.5</ArmorRating_Blunt>
+						</value>
+					</li>
+
+					<li Class="PatchOperationReplace">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Daggersnout_PlayerControlled"]/statBases/ArmorRating_Sharp</xpath>
+						<value>
+							<ArmorRating_Sharp>3</ArmorRating_Sharp>
+						</value>
+					</li>
+
+					<li Class="PatchOperationReplace">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Daggersnout_PlayerControlled"]/tools</xpath>
+						<value>
+							<tools>
+								<li Class="CombatExtended.ToolCE">
+									<label>snout blade</label>
+									<capacities>
+										<li>Cut</li>
+									</capacities>
+									<power>19</power>
+									<cooldownTime>1.4</cooldownTime>
+									<linkedBodyPartsGroup>AM_NoseBlade</linkedBodyPartsGroup>
+									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+									<armorPenetrationBlunt>8</armorPenetrationBlunt>
+									<armorPenetrationSharp>3</armorPenetrationSharp>
+								</li>
+								<li Class="CombatExtended.ToolCE">
+									<label>snout blade</label>
+									<capacities>
+										<li>Stab</li>
+									</capacities>
+									<power>14</power>
+									<cooldownTime>1.2</cooldownTime>
+									<linkedBodyPartsGroup>AM_NoseBlade</linkedBodyPartsGroup>
+									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+									<armorPenetrationBlunt>12</armorPenetrationBlunt>
+									<armorPenetrationSharp>16</armorPenetrationSharp>
+								</li>
+								<li Class="CombatExtended.ToolCE">
+									<label>head</label>
+									<capacities>
+										<li>Blunt</li>
+									</capacities>
+									<power>3</power>
+									<cooldownTime>2</cooldownTime>
+									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+									<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+									<chanceFactor>0.2</chanceFactor>
+									<armorPenetrationBlunt>5</armorPenetrationBlunt>
+								</li>
+							</tools>
+						</value>
+					</li>
+
+					<li Class="PatchOperationConditional">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Daggersnout_PlayerControlled"]/comps</xpath>
+						<nomatch Class="PatchOperationAdd">
+							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Daggersnout_PlayerControlled"]</xpath>
+							<value>
+								<comps/>
+							</value>
+						</nomatch>
+					</li>
+
+					<li Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Daggersnout_PlayerControlled"]/comps</xpath>
+						<value>
+							<li Class="CombatExtended.CompProperties_ArmorDurability">
+								<Durability>1000</Durability>
+								<Regenerates>true</Regenerates>
+								<RegenInterval>1250</RegenInterval>
+								<RegenValue>5</RegenValue>
+								<Repairable>true</Repairable>
+								<RepairIngredients>
+									<Steel>5</Steel>
+									<Plasteel>5</Plasteel>
+								</RepairIngredients>
+								<RepairTime>300</RepairTime>
+								<RepairValue>200</RepairValue>
+								<CanOverHeal>true</CanOverHeal>
+								<MaxOverHeal>100</MaxOverHeal>
+								<MinArmorPct>0.75</MinArmorPct>
+							</li>
+						</value>
+					</li>
+
+				</operations>
+			</match>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Fireworm.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Fireworm.xml
new file mode 100644
index 0000000000..3eef1fb808
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Fireworm.xml	
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>				
+		</mods>
+
+		<match Class="PatchOperationFindMod">
+			<mods>
+				<li>Vanilla Factions Expanded - Mechanoids</li>
+			</mods>
+
+			<match Class="PatchOperationSequence">
+				<operations>
+
+					<li Class="PatchOperationAddModExtension">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Fireworm_PlayerControlled"]</xpath>
+						<value>
+							<li Class="CombatExtended.RacePropertiesExtensionCE">
+								<bodyShape>QuadrupedLow</bodyShape>
+							</li>
+						</value>
+					</li>
+
+					<li Class="PatchOperationReplace">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Fireworm_PlayerControlled"]/statBases/ArmorRating_Blunt</xpath>
+						<value>
+							<ArmorRating_Blunt>30</ArmorRating_Blunt>
+						</value>
+					</li>
+
+					<li Class="PatchOperationReplace">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Fireworm_PlayerControlled"]/statBases/ArmorRating_Sharp</xpath>
+						<value>
+							<ArmorRating_Sharp>15</ArmorRating_Sharp>
+						</value>
+					</li>
+
+					<li Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Fireworm_PlayerControlled"]/statBases</xpath>
+						<value>
+							<ArmorRating_Heat>1.0</ArmorRating_Heat>
+							<AimingAccuracy>1.0</AimingAccuracy>
+							<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+							<MeleeDodgeChance>0.01</MeleeDodgeChance>
+							<MeleeCritChance>0.19</MeleeCritChance>
+							<MeleeParryChance>0.19</MeleeParryChance>
+							<MaxHitPoints>350</MaxHitPoints>
+						</value>
+					</li>
+
+					<li Class="PatchOperationReplace">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Fireworm_PlayerControlled"]/tools</xpath>
+						<value>
+							<tools>
+								<li Class="CombatExtended.ToolCE">
+									<label>head</label>
+									<capacities>
+										<li>Blunt</li>
+									</capacities>
+									<power>24</power>
+									<cooldownTime>2.6</cooldownTime>
+									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+									<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+									<armorPenetrationBlunt>12</armorPenetrationBlunt>
+								</li>
+							</tools>
+						</value>
+					</li>
+
+					<li Class="PatchOperationConditional">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Fireworm_PlayerControlled"]/comps</xpath>
+						<nomatch Class="PatchOperationAdd">
+							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Fireworm_PlayerControlled"]</xpath>
+							<value>
+								<comps/>
+							</value>
+						</nomatch>
+					</li>
+
+					<li Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Fireworm_PlayerControlled"]/comps</xpath>
+						<value>
+							<li Class="CombatExtended.CompProperties_ArmorDurability">
+								<Durability>3400</Durability>
+								<Regenerates>true</Regenerates>
+								<RegenInterval>1250</RegenInterval>
+								<RegenValue>5</RegenValue>
+								<Repairable>true</Repairable>
+								<RepairIngredients>
+									<Steel>5</Steel>
+									<Plasteel>5</Plasteel>
+								</RepairIngredients>
+								<RepairTime>300</RepairTime>
+								<RepairValue>200</RepairValue>
+								<CanOverHeal>true</CanOverHeal>
+								<MaxOverHeal>340</MaxOverHeal>
+								<MinArmorPct>0.5</MinArmorPct>
+								<MinArmorValueSharp>8</MinArmorValueSharp>
+								<MinArmorValueBlunt>16</MinArmorValueBlunt>
+							</li>
+						</value>
+					</li>
+
+				</operations>
+			</match>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Goliath.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Goliath.xml
new file mode 100644
index 0000000000..328dcd454f
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Goliath.xml	
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>				
+		</mods>
+
+		<match Class="PatchOperationFindMod">
+			<mods>
+				<li>Vanilla Factions Expanded - Mechanoids</li>
+			</mods>
+
+			<match Class="PatchOperationSequence">
+				<operations>
+
+					<li Class="PatchOperationAddModExtension">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Goliath_PlayerControlled"]</xpath>
+						<value>
+							<li Class="CombatExtended.RacePropertiesExtensionCE">
+								<bodyShape>Humanoid</bodyShape>
+							</li>
+						</value>
+					</li>
+
+					<li Class="PatchOperationReplace">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Goliath_PlayerControlled"]/statBases/ArmorRating_Blunt</xpath>
+						<value>
+							<ArmorRating_Blunt>42</ArmorRating_Blunt>
+						</value>
+					</li>
+
+					<li Class="PatchOperationReplace">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Goliath_PlayerControlled"]/statBases/ArmorRating_Sharp</xpath>
+						<value>
+							<ArmorRating_Sharp>19</ArmorRating_Sharp>
+						</value>
+					</li>
+
+					<li Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Goliath_PlayerControlled"]/statBases</xpath>
+						<value>
+							<ArmorRating_Heat>0.75</ArmorRating_Heat>
+							<CarryWeight>400</CarryWeight>
+							<CarryBulk>200</CarryBulk>
+							<AimingAccuracy>1.0</AimingAccuracy>
+							<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
+							<MeleeDodgeChance>0.05</MeleeDodgeChance>
+							<MeleeCritChance>0.75</MeleeCritChance>
+							<MeleeParryChance>0.2</MeleeParryChance>
+							<MaxHitPoints>500</MaxHitPoints>
+						</value>
+					</li>
+
+					<li Class="PatchOperationReplace">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Goliath_PlayerControlled"]/tools</xpath>
+						<value>
+							<tools>
+								<li Class="CombatExtended.ToolCE">
+									<label>head</label>
+									<capacities>
+										<li>Blunt</li>
+									</capacities>
+									<power>35</power>
+									<cooldownTime>3.0</cooldownTime>
+									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+									<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+									<armorPenetrationBlunt>15</armorPenetrationBlunt>
+								</li>
+							</tools>
+						</value>
+					</li>
+
+					<li Class="PatchOperationConditional">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Goliath_PlayerControlled"]/comps</xpath>
+						<nomatch Class="PatchOperationAdd">
+							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Goliath_PlayerControlled"]</xpath>
+							<value>
+								<comps/>
+							</value>
+						</nomatch>
+					</li>
+
+					<li Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Goliath_PlayerControlled"]/comps</xpath>
+						<value>
+							<li Class="CombatExtended.CompProperties_ArmorDurability">
+								<Durability>3650</Durability>
+								<Regenerates>true</Regenerates>
+								<RegenInterval>1250</RegenInterval>
+								<RegenValue>5</RegenValue>
+								<Repairable>true</Repairable>
+								<RepairIngredients>
+									<Steel>5</Steel>
+									<Plasteel>5</Plasteel>
+								</RepairIngredients>
+								<RepairTime>300</RepairTime>
+								<RepairValue>200</RepairValue>
+								<CanOverHeal>true</CanOverHeal>
+								<MaxOverHeal>365</MaxOverHeal>
+								<MinArmorPct>0.5</MinArmorPct>
+								<MinArmorValueSharp>12</MinArmorValueSharp>
+								<MinArmorValueBlunt>27</MinArmorValueBlunt>
+							</li>
+						</value>
+					</li>
+
+				</operations>
+			</match>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Phalanx.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Phalanx.xml
new file mode 100644
index 0000000000..c527be222a
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Phalanx.xml	
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>				
+		</mods>
+
+		<match Class="PatchOperationFindMod">
+			<mods>
+				<li>Vanilla Factions Expanded - Mechanoids</li>
+			</mods>
+
+			<match Class="PatchOperationSequence">
+				<operations>
+
+					<li Class="PatchOperationAddModExtension">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Phalanx_PlayerControlled"]</xpath>
+						<value>
+							<li Class="CombatExtended.RacePropertiesExtensionCE">
+								<bodyShape>Quadruped</bodyShape>
+							</li>
+						</value>
+					</li>
+
+					<li Class="PatchOperationReplace">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Phalanx_PlayerControlled"]/statBases/ArmorRating_Blunt</xpath>
+						<value>
+							<ArmorRating_Blunt>30</ArmorRating_Blunt>
+						</value>
+					</li>
+					<li Class="PatchOperationReplace">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Phalanx_PlayerControlled"]/statBases/ArmorRating_Sharp</xpath>
+						<value>
+							<ArmorRating_Sharp>13</ArmorRating_Sharp>
+						</value>
+					</li>
+
+					<li Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Phalanx_PlayerControlled"]/statBases</xpath>
+						<value>
+							<ArmorRating_Heat>1.0</ArmorRating_Heat>
+							<AimingAccuracy>1.0</AimingAccuracy>
+							<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+							<MeleeDodgeChance>0.01</MeleeDodgeChance>
+							<MeleeCritChance>0.56</MeleeCritChance>
+							<MeleeParryChance>0.44</MeleeParryChance>
+							<MaxHitPoints>350</MaxHitPoints>
+						</value>
+					</li>
+
+					<li Class="PatchOperationReplace">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Phalanx_PlayerControlled"]/tools</xpath>
+						<value>
+							<tools>
+								<li Class="CombatExtended.ToolCE">
+									<label>head</label>
+									<capacities>
+										<li>Blunt</li>
+									</capacities>
+									<power>36</power>
+									<cooldownTime>2</cooldownTime>
+									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+									<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+									<armorPenetrationBlunt>30</armorPenetrationBlunt>
+								</li>
+							</tools>
+						</value>
+					</li>
+
+					<li Class="PatchOperationConditional">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Phalanx_PlayerControlled"]/comps</xpath>
+						<nomatch Class="PatchOperationAdd">
+							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Phalanx_PlayerControlled"]</xpath>
+							<value>
+								<comps/>
+							</value>
+						</nomatch>
+					</li>
+
+					<li Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Phalanx_PlayerControlled"]/comps</xpath>
+						<value>
+							<li Class="CombatExtended.CompProperties_ArmorDurability">
+								<Durability>3100</Durability>
+								<Regenerates>true</Regenerates>
+								<RegenInterval>1250</RegenInterval>
+								<RegenValue>5</RegenValue>
+								<Repairable>true</Repairable>
+								<RepairIngredients>
+									<Steel>5</Steel>
+									<Plasteel>5</Plasteel>
+								</RepairIngredients>
+								<RepairTime>300</RepairTime>
+								<RepairValue>200</RepairValue>
+								<CanOverHeal>true</CanOverHeal>
+								<MaxOverHeal>310</MaxOverHeal>
+								<MinArmorPct>0.5</MinArmorPct>
+								<MinArmorValueSharp>7</MinArmorValueSharp>
+								<MinArmorValueBlunt>16</MinArmorValueBlunt>
+							</li>
+						</value>
+					</li>
+
+				</operations>
+			</match>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Siegebreaker.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Siegebreaker.xml
new file mode 100644
index 0000000000..8612c9f221
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Siegebreaker.xml	
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>				
+		</mods>
+
+		<match Class="PatchOperationFindMod">
+			<mods>
+				<li>Vanilla Factions Expanded - Mechanoids</li>
+			</mods>
+
+			<match Class="PatchOperationSequence">
+				<operations>
+
+					<li Class="PatchOperationAddModExtension">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Siegebreaker_PlayerControlled"]</xpath>
+						<value>
+							<li Class="CombatExtended.RacePropertiesExtensionCE">
+								<bodyShape>Vehicle</bodyShape>
+							</li>
+						</value>
+					</li>
+
+					<li Class="PatchOperationReplace">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Siegebreaker_PlayerControlled"]/statBases/ArmorRating_Blunt</xpath>
+						<value>
+							<ArmorRating_Blunt>62</ArmorRating_Blunt>
+						</value>
+					</li>
+
+					<li Class="PatchOperationReplace">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Siegebreaker_PlayerControlled"]/statBases/ArmorRating_Sharp</xpath>
+						<value>
+							<ArmorRating_Sharp>25</ArmorRating_Sharp>
+						</value>
+					</li>
+
+					<li Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Siegebreaker_PlayerControlled"]/statBases</xpath>
+						<value>
+							<ArmorRating_Heat>0.75</ArmorRating_Heat>
+							<CarryWeight>200</CarryWeight>
+							<CarryBulk>300</CarryBulk>
+							<AimingAccuracy>1.0</AimingAccuracy>
+							<ShootingAccuracyPawn>1.0</ShootingAccuracyPawn>
+							<MeleeDodgeChance>0.01</MeleeDodgeChance>
+							<MeleeCritChance>0.07</MeleeCritChance>
+							<MeleeParryChance>0.24</MeleeParryChance>
+							<MaxHitPoints>600</MaxHitPoints>
+						</value>
+					</li>
+
+					<li Class="PatchOperationReplace">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Siegebreaker_PlayerControlled"]/tools</xpath>
+						<value>
+							<tools>
+								<li Class="CombatExtended.ToolCE">
+									<label>head</label>
+									<capacities>
+										<li>Blunt</li>
+									</capacities>
+									<power>30</power>
+									<cooldownTime>3.4</cooldownTime>
+									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+									<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+									<armorPenetrationBlunt>20</armorPenetrationBlunt>
+								</li>
+							</tools>
+						</value>
+					</li>
+
+					<li Class="PatchOperationConditional">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Siegebreaker_PlayerControlled"]/comps</xpath>
+						<nomatch Class="PatchOperationAdd">
+							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Siegebreaker_PlayerControlled"]</xpath>
+							<value>
+								<comps/>
+							</value>
+						</nomatch>
+					</li>
+
+					<li Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Siegebreaker_PlayerControlled"]/comps</xpath>
+						<value>
+							<li Class="CombatExtended.CompProperties_ArmorDurability">
+								<Durability>4250</Durability>
+								<Regenerates>true</Regenerates>
+								<RegenInterval>1250</RegenInterval>
+								<RegenValue>5</RegenValue>
+								<Repairable>true</Repairable>
+								<RepairIngredients>
+									<Steel>5</Steel>
+									<Plasteel>5</Plasteel>
+								</RepairIngredients>
+								<RepairTime>300</RepairTime>
+								<RepairValue>200</RepairValue>
+								<CanOverHeal>true</CanOverHeal>
+								<MaxOverHeal>425</MaxOverHeal>
+								<MinArmorPct>0.5</MinArmorPct>
+								<MinArmorValueSharp>14</MinArmorValueSharp>
+								<MinArmorValueBlunt>35</MinArmorValueBlunt>
+							</li>
+						</value>
+					</li>
+
+				</operations>
+			</match>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Slurrymaster.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Slurrymaster.xml
new file mode 100644
index 0000000000..6c9eaa982b
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Slurrymaster.xml	
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>				
+		</mods>
+
+		<match Class="PatchOperationFindMod">
+			<mods>
+				<li>Vanilla Factions Expanded - Mechanoids</li>
+			</mods>
+
+			<match Class="PatchOperationSequence">
+				<operations>
+
+					<li Class="PatchOperationAddModExtension">
+						<xpath>Defs/ThingDef[defName="AM_Mech_Advanced_PristineSlurrypede_PlayerControlled"]</xpath>
+						<value>
+							<li Class="CombatExtended.RacePropertiesExtensionCE">
+								<bodyShape>QuadrupedLow</bodyShape>
+							</li>
+						</value>
+					</li>
+
+					<li Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AM_Mech_Advanced_PristineSlurrypede_PlayerControlled"]/statBases</xpath>
+						<value>
+							<ArmorRating_Heat>0.5</ArmorRating_Heat>
+							<MeleeDodgeChance>0.12</MeleeDodgeChance>
+							<MeleeCritChance>0.1</MeleeCritChance>
+							<MeleeParryChance>0.17</MeleeParryChance>
+						</value>
+					</li>
+
+					<li Class="PatchOperationReplace">
+						<xpath>Defs/ThingDef[defName="AM_Mech_Advanced_PristineSlurrypede_PlayerControlled"]/statBases/ArmorRating_Blunt</xpath>
+						<value>
+							<ArmorRating_Blunt>22</ArmorRating_Blunt>
+						</value>
+					</li>
+					<li Class="PatchOperationReplace">
+						<xpath>Defs/ThingDef[defName="AM_Mech_Advanced_PristineSlurrypede_PlayerControlled"]/statBases/ArmorRating_Sharp</xpath>
+						<value>
+							<ArmorRating_Sharp>10</ArmorRating_Sharp>
+						</value>
+					</li>
+
+					<li Class="PatchOperationReplace">
+						<xpath>Defs/ThingDef[defName="AM_Mech_Advanced_PristineSlurrypede_PlayerControlled"]/tools</xpath>
+						<value>
+							<tools>
+								<li Class="CombatExtended.ToolCE">
+									<label>head</label>
+									<capacities>
+										<li>Blunt</li>
+									</capacities>
+									<power>16</power>
+									<cooldownTime>2.7</cooldownTime>
+									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+									<armorPenetrationBlunt>12</armorPenetrationBlunt>
+								</li>
+							</tools>
+						</value>
+					</li>
+
+					<li Class="PatchOperationConditional">
+						<xpath>Defs/ThingDef[defName="AM_Mech_Advanced_PristineSlurrypede_PlayerControlled"]/comps</xpath>
+						<nomatch Class="PatchOperationAdd">
+							<xpath>Defs/ThingDef[defName="AM_Mech_Advanced_PristineSlurrypede_PlayerControlled"]</xpath>
+							<value>
+								<comps/>
+							</value>
+						</nomatch>
+					</li>
+
+					<li Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AM_Mech_Advanced_PristineSlurrypede_PlayerControlled"]/comps</xpath>
+						<value>
+							<li Class="CombatExtended.CompProperties_ArmorDurability">
+								<Durability>4000</Durability>
+								<Regenerates>true</Regenerates>
+								<RegenInterval>1250</RegenInterval>
+								<RegenValue>5</RegenValue>
+								<Repairable>true</Repairable>
+								<RepairIngredients>
+									<Steel>5</Steel>
+									<Plasteel>5</Plasteel>
+								</RepairIngredients>
+								<RepairTime>300</RepairTime>
+								<RepairValue>200</RepairValue>
+								<CanOverHeal>true</CanOverHeal>
+								<MaxOverHeal>400</MaxOverHeal>
+								<MinArmorPct>0.5</MinArmorPct>
+								<MinArmorValueSharp>6</MinArmorValueSharp>
+								<MinArmorValueBlunt>12</MinArmorValueBlunt>
+							</li>
+						</value>
+					</li>
+
+				</operations>
+			</match>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/VFE_Pawnkinds.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/VFE_Pawnkinds.xml
new file mode 100644
index 0000000000..f2e5500a31
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/VFE_Pawnkinds.xml	
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Factions Expanded - Mechanoids</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!-- Siegebreaker -->
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/PawnKindDef[defName="VFE_Mech_Siegebreaker" or defName="VFE_Mech_Advanced_Siegebreaker" or defName="VFE_Mech_Advanced_Siegebreaker_PlayerControlled"]</xpath>
+					<value>
+						<modExtensions>
+							<li Class="CombatExtended.LoadoutPropertiesExtension">
+								<primaryMagazineCount>
+									<min>4</min>
+									<max>7</max>
+								</primaryMagazineCount>
+							</li>
+						</modExtensions>
+					</value>
+				</li>
+
+				<!-- Fireworm -->
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/PawnKindDef[defName="VFE_Mech_Fireworm" or defName="VFE_Mech_Advanced_Fireworm" or defName="VFE_Mech_Advanced_Fireworm_PlayerControlled"]</xpath>
+					<value>
+						<li Class="CombatExtended.LoadoutPropertiesExtension">
+							<primaryMagazineCount>
+								<min>2</min>
+								<max>3</max>
+							</primaryMagazineCount>
+						</li>
+					</value>
+				</li>
+
+				<!-- Goliath -->
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/PawnKindDef[defName="VFE_Mech_Goliath" or defName="VFE_Mech_Advanced_Goliath" or defName="VFE_Mech_Advanced_Goliath_PlayerControlled"]</xpath>
+					<value>
+						<li Class="CombatExtended.LoadoutPropertiesExtension">
+							<primaryMagazineCount>
+								<min>4</min>
+								<max>6</max>
+							</primaryMagazineCount>
+						</li>
+					</value>
+				</li>
+
+				<!-- === combatPower Patches === -->
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/PawnKindDef[defName="VFE_Mech_Goliath" or defName="VFE_Mech_Advanced_Goliath" or defName="VFE_Mech_Advanced_Goliath_PlayerControlled"]/combatPower</xpath>
+					<value>
+						<combatPower>550</combatPower>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/PawnKindDef[defName="VFE_Mech_Siegebreaker" or defName="VFE_Mech_Advanced_Siegebreaker" or defName="VFE_Mech_Advanced_Siegebreaker_PlayerControlled"]/combatPower</xpath>
+					<value>
+						<combatPower>500</combatPower>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Pirates/Mech_Warcasket.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Pirates/Mech_Warcasket.xml
new file mode 100644
index 0000000000..39290537c5
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Pirates/Mech_Warcasket.xml	
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Factions Expanded - Pirates</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!-- ========== Mech Controller Warcasket ========== -->
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_MechController"]/statBases</xpath>
+					<value>
+						<Bulk>275</Bulk>
+						<WornBulk>35</WornBulk>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_MechController"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>34</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_MechController"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>85</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_MechController"]/equippedStatOffsets</xpath>
+					<value>
+						<CarryWeight>250</CarryWeight>
+						<CarryBulk>225</CarryBulk>
+						<Suppressability>-100</Suppressability>
+					</value>
+				</li>
+
+				<!-- Increase Cost -->
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_MechController"]/costList/Plasteel</xpath>
+					<value>
+						<Plasteel>240</Plasteel>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_MechController"]/costList/ComponentSpacer</xpath>
+					<value>
+						<ComponentSpacer>4</ComponentSpacer>
+					</value>
+				</li>
+
+				<!-- === Energy Shield === -->
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_MechController"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldEnergyMax</xpath>
+					<value>
+						<EnergyShieldEnergyMax>375</EnergyShieldEnergyMax>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_MechController"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldRechargeRate</xpath>
+					<value>
+						<EnergyShieldRechargeRate>1.0</EnergyShieldRechargeRate>
+					</value>
+				</li>
+
+				<!-- ========== Siegebreaker Warcasket - Shoulders ========== -->
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Shoulders_MechController"]/statBases</xpath>
+					<value>
+						<Bulk>15</Bulk>
+						<WornBulk>5</WornBulk>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Shoulders_MechController"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>34</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Shoulders_MechController"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>85</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<!-- Increase Cost -->
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Shoulders_MechController"]/costList/Plasteel</xpath>
+					<value>
+						<Plasteel>90</Plasteel>
+					</value>
+				</li>
+
+				<!-- === Siegebreaker Warcasket Helmet === -->
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Helmet_MechController"]/statBases</xpath>
+					<value>
+						<Bulk>20</Bulk>
+						<WornBulk>10</WornBulk>
+						<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Helmet_MechController"]/apparel/immuneToToxGasExposure</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Helmet_MechController"]/apparel</xpath>
+						<value>
+							<immuneToToxGasExposure>true</immuneToToxGasExposure>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Helmet_MechController"]/equippedStatOffsets</xpath>
+					<value>
+						<SmokeSensitivity>-1</SmokeSensitivity>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Helmet_MechController"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>30</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Helmet_MechController"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>68</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<!-- Increase Cost -->
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Helmet_MechController"]/costList/Plasteel</xpath>
+					<value>
+						<Plasteel>90</Plasteel>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Helmet_MechController"]/costList/ComponentSpacer</xpath>
+					<value>
+						<ComponentSpacer>6</ComponentSpacer>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VRE_Sanguophage/Sanguinarius.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VRE_Sanguophage/Sanguinarius.xml
new file mode 100644
index 0000000000..814f3da4de
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VRE_Sanguophage/Sanguinarius.xml	
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Races Expanded - Sanguophage</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Sanguinarius"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Quadruped</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Sanguinarius"]/statBases</xpath>
+					<value>
+						<ArmorRating_Sharp>7</ArmorRating_Sharp>
+						<ArmorRating_Blunt>15</ArmorRating_Blunt>
+						<CarryWeight>80</CarryWeight>
+						<CarryBulk>40</CarryBulk>
+						<MeleeDodgeChance>0.04</MeleeDodgeChance>
+						<MeleeCritChance>0.13</MeleeCritChance>
+						<MeleeParryChance>0.15</MeleeParryChance>
+						<MaxHitPoints>200</MaxHitPoints>
+					</value>
+				</li>
+
+				<li Class="PatchOperationRemove">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Sanguinarius"]/race/baseHealthScale</xpath>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Sanguinarius"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>front left leg</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>13</power>
+								<cooldownTime>2.67</cooldownTime>
+								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>5</armorPenetrationBlunt>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>front right leg</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>13</power>
+								<cooldownTime>2.67</cooldownTime>
+								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>5</armorPenetrationBlunt>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>15</power>
+								<cooldownTime>3.51</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>12</armorPenetrationBlunt>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+								<chanceFactor>0.2</chanceFactor>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Sanguinarius"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AM_Mech_Sanguinarius"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AM_Mech_Sanguinarius"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>1000</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>100</MaxOverHeal>
+							<MinArmorPct>0.75</MinArmorPct>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AM_Gun_BloodBelcher"]/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>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/PawnKindDefs_Mechanoids/AlphaMechs_PawnKinds.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/PawnKindDefs_Mechanoids/AlphaMechs_PawnKinds.xml
new file mode 100644
index 0000000000..a6c2ae81b7
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/PawnKindDefs_Mechanoids/AlphaMechs_PawnKinds.xml	
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Siegebreaker and Demolisher -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="AM_Siegebreaker" or defName="AM_Demolisher"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>7</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Fireworm-->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="AM_Fireworm"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>3</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Goliath-->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="AM_Goliath"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === combatPower Patches === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="AM_Goliath"]/combatPower</xpath>
+		<value>
+			<combatPower>550</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="AM_Siegebreaker"]/combatPower</xpath>
+		<value>
+			<combatPower>500</combatPower>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Misc/AlphaMechs_RangedMechanoid.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Misc/AlphaMechs_RangedMechanoid.xml
new file mode 100644
index 0000000000..48c37c541a
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Misc/AlphaMechs_RangedMechanoid.xml	
@@ -0,0 +1,276 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Melee Attacks -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			@Name="AM_FlamethrowerBase" or
+			defName="AM_Gun_GoliathChargeBlaster" or
+			defName="AM_Gun_GoliathNeedle" or
+			@Name="AM_SiegeTurretBase" or
+			@Name="AM_CryogenicGunBase"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11.7</power>
+					<cooldownTime>2.6</cooldownTime>
+					<armorPenetrationBlunt>2.4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="AM_DemolisherChargeBase"]</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11.7</power>
+					<cooldownTime>2.6</cooldownTime>
+					<armorPenetrationBlunt>2.4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Flamethrower -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="AM_FlamethrowerBase"]/description</xpath>
+		<value>
+			<description>A prometheum jelly flamethrower. Short range, but it will cause uncontrollable fires if you let the fireworms come near.</description>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AM_Flamethrower</defName>
+		<statBases>
+			<Mass>20</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>4.0</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Flamethrower_Prometheum</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>12</range>
+			<minRange>2.9</minRange>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<burstShotCount>5</burstShotCount>
+			<soundCast>HissFlamethrower</soundCast>
+			<muzzleFlashScale>2</muzzleFlashScale>
+			<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>8</reloadTime>
+			<ammoSet>AmmoSet_Flamethrower</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Goliath HCB ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AM_Gun_GoliathChargeBlaster</defName>
+		<statBases>
+			<Mass>35.00</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>13.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.08</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12x64mmCharged</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>Shot_ChargeBlaster</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>9.2</reloadTime>
+			<ammoSet>AmmoSet_12x64mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Suppressive</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Goliath Needle Gun ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AM_Gun_GoliathNeedle</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>0.81</SwayFactor>
+			<Bulk>15.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.80</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_5x100mmCaseless_Sabot</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>4</burstShotCount>
+			<soundCast>Shot_NeedleGun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_5x100mmCaseless</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Cryogenic Gun -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AM_CryogenicGun</defName>
+		<statBases>
+			<Mass>20</Mass>
+			<RangedWeapon_Cooldown>1.0</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>1.0</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>1.00</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>AM_CryoBulletCE</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>15</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>3</burstShotCount>
+			<soundCast>AM_Cryogun</soundCast>
+			<muzzleFlashScale>2</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>80</magazineSize>
+			<reloadTime>4</reloadTime>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Siege Turret -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AM_SiegebreakerTurret</defName>
+		<statBases>
+			<Mass>50.00</Mass>
+			<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.5</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>1.00</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_90mmCannonShell_HE</defaultProjectile>
+			<warmupTime>4.5</warmupTime>
+			<range>92</range>
+			<minRange>8</minRange>
+			<soundCast>120mm</soundCast>
+			<muzzleFlashScale>2</muzzleFlashScale>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>2</AmmoGenPerMagOverride>
+			<reloadTime>8</reloadTime>
+			<ammoSet>AmmoSet_90mmCannonShell</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Demolisher Charge Gun -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AM_DemolisherChargeBase</defName>
+		<statBases>
+			<Mass>20</Mass>
+			<RangedWeapon_Cooldown>2.13</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.0</SwayFactor>
+			<Bulk>1.00</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_164x284mmDemo</defaultProjectile>
+			<warmupTime>2.0</warmupTime>
+			<range>8</range>
+			<minRange>4</minRange>
+			<soundCast>AM_DemolisherCharge</soundCast>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>2</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_164x284mmDemo</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Aura.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Aura.xml
new file mode 100644
index 0000000000..bc33b50a25
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Aura.xml	
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AM_Aura"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AM_Aura"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			<MeleeCritChance>0.24</MeleeCritChance>
+			<MeleeParryChance>0.33</MeleeParryChance>
+			<MaxHitPoints>200</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AM_Aura"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>wing blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>37</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>AM_WingBlades</linkedBodyPartsGroup>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>wing blade</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>AM_WingBlades</linkedBodyPartsGroup>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<armorPenetrationSharp>30</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>4</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AM_Aura"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AM_Aura"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AM_Aura"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1000</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>500</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>100</MaxOverHeal>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Daggersnout.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Daggersnout.xml
new file mode 100644
index 0000000000..c0cbc521c0
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Daggersnout.xml	
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AM_Daggersnout"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AM_Daggersnout"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.08</MeleeDodgeChance>
+			<MeleeCritChance>0.24</MeleeCritChance>
+			<MeleeParryChance>0.18</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AM_Daggersnout"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AM_Daggersnout"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AM_Daggersnout"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>snout blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>AM_NoseBlade</linkedBodyPartsGroup>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>snout blade</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>AM_NoseBlade</linkedBodyPartsGroup>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+					<armorPenetrationSharp>16</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AM_Daggersnout"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AM_Daggersnout"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AM_Daggersnout"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>900</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>90</MaxOverHeal>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Demolisher.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Demolisher.xml
new file mode 100644
index 0000000000..73bb0b4399
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Demolisher.xml	
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AM_Demolisher"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AM_Demolisher"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>30</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AM_Demolisher"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AM_Demolisher"]/statBases</xpath>
+		<value>
+			<ArmorRating_Heat>0.25</ArmorRating_Heat>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>100</CarryBulk>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.01</MeleeDodgeChance>
+			<MeleeCritChance>0.72</MeleeCritChance>
+			<MeleeParryChance>0.33</MeleeParryChance>
+			<MaxHitPoints>400</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AM_Demolisher"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mechanoid claws</label>
+					<capacities>
+						<li>Cut</li>
+						<li>AM_SiegeBlunt</li>
+					</capacities>
+					<power>46</power>
+					<cooldownTime>2.3</cooldownTime>
+					<linkedBodyPartsGroup>AM_MechaClaws</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationSharp>20</armorPenetrationSharp>
+					<armorPenetrationBlunt>80</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AM_Demolisher"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AM_Demolisher"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AM_Demolisher"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>3500</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>350</MaxOverHeal>
+				<MinArmorPct>0.5</MinArmorPct>
+				<MinArmorValueSharp>8</MinArmorValueSharp>
+				<MinArmorValueBlunt>16</MinArmorValueBlunt>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Fireworm.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Fireworm.xml
new file mode 100644
index 0000000000..38e4405bb3
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Fireworm.xml	
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AM_Fireworm"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AM_Fireworm"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>28</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AM_Fireworm"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AM_Fireworm"]/statBases</xpath>
+		<value>
+			<ArmorRating_Heat>0.5</ArmorRating_Heat>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.01</MeleeDodgeChance>
+			<MeleeCritChance>0.19</MeleeCritChance>
+			<MeleeParryChance>0.19</MeleeParryChance>
+			<MaxHitPoints>350</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AM_Fireworm"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>2.6</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AM_Fireworm"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AM_Fireworm"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AM_Fireworm"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>2900</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>290</MaxOverHeal>
+				<MinArmorPct>0.5</MinArmorPct>
+				<MinArmorValueSharp>8</MinArmorValueSharp>
+				<MinArmorValueBlunt>16</MinArmorValueBlunt>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Goliath.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Goliath.xml
new file mode 100644
index 0000000000..ddeed9118d
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Goliath.xml	
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AM_Goliath"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AM_Goliath"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>40</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AM_Goliath"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AM_Goliath"]/statBases</xpath>
+		<value>
+			<ArmorRating_Heat>0.25</ArmorRating_Heat>
+			<CarryWeight>200</CarryWeight>
+			<CarryBulk>100</CarryBulk>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			<MeleeCritChance>0.75</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+			<MaxHitPoints>500</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AM_Goliath"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>3.0</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AM_Goliath"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AM_Goliath"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AM_Goliath"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>3200</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>320</MaxOverHeal>
+				<MinArmorPct>0.5</MinArmorPct>
+				<MinArmorValueSharp>12</MinArmorValueSharp>
+				<MinArmorValueBlunt>27</MinArmorValueBlunt>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Phalanx.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Phalanx.xml
new file mode 100644
index 0000000000..e41d30c673
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Phalanx.xml	
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AM_Phalanx"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AM_Phalanx"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>27</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AM_Phalanx"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AM_Phalanx"]/statBases</xpath>
+		<value>
+			<ArmorRating_Heat>0.5</ArmorRating_Heat>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.01</MeleeDodgeChance>
+			<MeleeCritChance>0.56</MeleeCritChance>
+			<MeleeParryChance>0.44</MeleeParryChance>
+			<MaxHitPoints>350</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AM_Phalanx"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>30</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AM_Phalanx"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AM_Phalanx"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AM_Phalanx"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>2725</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>272</MaxOverHeal>
+				<MinArmorPct>0.5</MinArmorPct>
+				<MinArmorValueSharp>7</MinArmorValueSharp>
+				<MinArmorValueBlunt>16</MinArmorValueBlunt>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Siegebreaker.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Siegebreaker.xml
new file mode 100644
index 0000000000..25462ec427
--- /dev/null
+++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Siegebreaker.xml	
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AM_Siegebreaker"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Vehicle</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AM_Siegebreaker"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>60</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AM_Siegebreaker"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>24</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AM_Siegebreaker"]/statBases</xpath>
+		<value>
+			<ArmorRating_Heat>0.25</ArmorRating_Heat>
+			<CarryWeight>200</CarryWeight>
+			<CarryBulk>150</CarryBulk>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1.0</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.01</MeleeDodgeChance>
+			<MeleeCritChance>0.07</MeleeCritChance>
+			<MeleeParryChance>0.24</MeleeParryChance>
+			<MaxHitPoints>600</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AM_Siegebreaker"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>3.4</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AM_Siegebreaker"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AM_Siegebreaker"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AM_Siegebreaker"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>3500</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>350</MaxOverHeal>
+				<MinArmorPct>0.5</MinArmorPct>
+				<MinArmorValueSharp>14</MinArmorValueSharp>
+				<MinArmorValueBlunt>35</MinArmorValueBlunt>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Memes/Patches/Alpha Memes/HediffDefs/Hediffs_Global_Misc.xml b/ModPatches/Alpha Memes/Patches/Alpha Memes/HediffDefs/Hediffs_Global_Misc.xml
new file mode 100644
index 0000000000..09d0dc3799
--- /dev/null
+++ b/ModPatches/Alpha Memes/Patches/Alpha Memes/HediffDefs/Hediffs_Global_Misc.xml	
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AM_CatharsisHediff"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AM_UtilityDryadHediff"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AM_UtilityDryadHediff"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.75</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AM_CombatDryadHediff"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AM_CombatDryadHediff"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2.0</ArmorRating_Blunt>
+			<AimingAccuracy>0.1</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AM_GenericDryadHediff"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AM_GenericDryadHediff"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Memes/Patches/Alpha Memes/StyleCategoryDefs/StyleCategoryDefs.xml b/ModPatches/Alpha Memes/Patches/Alpha Memes/StyleCategoryDefs/StyleCategoryDefs.xml
new file mode 100644
index 0000000000..4b016d4eff
--- /dev/null
+++ b/ModPatches/Alpha Memes/Patches/Alpha Memes/StyleCategoryDefs/StyleCategoryDefs.xml	
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Remove styles for weapons that no longer exist. -->
+<Operation Class="PatchOperationRemove">
+	<xpath>Defs/StyleCategoryDef/thingDefStyles/li[thingDef="Flamebow"]</xpath>
+</Operation>
+
+<Operation Class="PatchOperationRemove">
+	<xpath>Defs/StyleCategoryDef/thingDefStyles/li[thingDef="Gun_EmpLauncher"]</xpath>
+</Operation>
+
+<Operation Class="PatchOperationRemove">
+	<xpath>Defs/StyleCategoryDef/thingDefStyles/li[thingDef="Gun_ToxbombLauncher"]</xpath>
+</Operation>
+
+<Operation Class="PatchOperationRemove">
+	<xpath>Defs/StyleCategoryDef/thingDefStyles/li[thingDef="Gun_SmokeLauncher"]</xpath>
+</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Memes/Patches/Alpha Memes/ThingDefs_Races/Races_UnshackledDryad.xml b/ModPatches/Alpha Memes/Patches/Alpha Memes/ThingDefs_Races/Races_UnshackledDryad.xml
new file mode 100644
index 0000000000..1c5c22c9b9
--- /dev/null
+++ b/ModPatches/Alpha Memes/Patches/Alpha Memes/ThingDefs_Races/Races_UnshackledDryad.xml	
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AM_UnshackledDryad"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AM_UnshackledDryad"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.06</MeleeCritChance>
+			<MeleeParryChance>0.04</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AM_UnshackledDryad"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.99</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.99</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.77</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.880</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<chanceFactor>0.9</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.19</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mythology/Defs/Alpha Mythology/Defs_Projectiles.xml b/ModPatches/Alpha Mythology/Defs/Alpha Mythology/Defs_Projectiles.xml
new file mode 100644
index 0000000000..d02f9b9a52
--- /dev/null
+++ b/ModPatches/Alpha Mythology/Defs/Alpha Mythology/Defs_Projectiles.xml	
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="BaseBulletCE">
+		<defName>MM_GazeAttack_CE</defName>
+		<label>petrifying gaze</label>
+		<thingClass>CombatExtended.BulletCE</thingClass>
+		<graphicData>
+			<texPath>Things/Projectiles/MM_GazeAttack</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>MoteGlow</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<flyOverhead>false</flyOverhead>
+			<damageDef>MM_PetrifyingGaze</damageDef>
+			<damageAmountBase>5</damageAmountBase>
+			<speed>20</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBulletCE">
+		<defName>MM_GreenStreamBreath_CE</defName>
+		<label>poison breath</label>
+		<thingClass>CombatExtended.BulletCE</thingClass>
+		<graphicData>
+			<texPath>Things/Projectiles/MM_PoisonBreath</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>MoteGlow</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<flyOverhead>false</flyOverhead>
+			<damageDef>ToxicBite</damageDef>
+			<damageAmountBase>15</damageAmountBase>
+			<speed>20</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseExplosiveBullet">
+		<defName>MM_FlameBreathAnimated_CE</defName>
+		<label>flame breath</label>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<graphicData>
+			<texPath>Things/Projectiles/MM_Firebreath</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>MoteGlow</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<flyOverhead>false</flyOverhead>
+			<damageDef>Flame</damageDef>
+			<damageAmountBase>5</damageAmountBase>
+			<explosionRadius>0.9</explosionRadius>
+			<speed>25</speed>
+			<ai_IsIncendiary>true</ai_IsIncendiary>
+			<soundExplode>Interact_Ignite</soundExplode>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mythology/Patches/Alpha Mythology/AM_CE_Patch_Bodies.xml b/ModPatches/Alpha Mythology/Patches/Alpha Mythology/AM_CE_Patch_Bodies.xml
new file mode 100644
index 0000000000..06e05c548b
--- /dev/null
+++ b/ModPatches/Alpha Mythology/Patches/Alpha Mythology/AM_CE_Patch_Bodies.xml	
@@ -0,0 +1,347 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Ahuizotl -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MM_AhuizotlBody"]//*[
+			def="Body" or
+			def="Tail" or
+			def="Neck" or
+			def="Leg" or
+			customLabel="rear left paw" or
+			customLabel="rear right paw"
+			] </xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MM_AhuizotlBody"]//*[
+			def="Body" or
+			def="Hand" or
+			def="Finger" or
+			def="Neck" or
+			def="Head" or
+			def="AnimalJaw" or
+			def="Leg" or
+			def="Paw"
+			]/groups </xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- Cerberus -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MM_ThreeHeadedDog"]//*[
+			def="Body" or
+			def="Tail" or
+			def="Neck" or
+			def="Leg" or
+			customLabel="rear left paw" or
+			customLabel="rear right paw"
+			] </xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MM_ThreeHeadedDog"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Head" or
+			def="AnimalJaw" or
+			def="Leg" or
+			def="Paw"
+			]/groups </xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- Chimera -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MM_Chimera_Body"]//*[
+			def="Body" or
+			def="MM_Goathead" or
+			def="Neck" or
+			def="Leg" or
+			customLabel="rear left paw" or
+			customLabel="rear right paw"
+			] </xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="MM_Chimera_Body"]/corePart/parts/li[def="MM_ChimeraTail"]/parts/li[def="Head"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="MM_Chimera_Body"]/corePart/parts/li[def="MM_ChimeraTail"]/parts/li[def="Head"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="MM_Chimera_Body"]/corePart/parts/li[def="MM_ChimeraTail"]/parts/li[def="Head"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MM_Chimera_Body"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Head" or
+			def="MM_Goathead" or
+			def="AnimalJaw" or
+			def="Leg" or
+			def="Paw"
+			]/groups </xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- Hydra -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MM_Hydra"]//*[
+			def="SnakeBody" or
+			customLabel="rear left leg" or
+			customLabel="rear right leg" or
+			def="Hoof"
+			] </xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MM_Hydra"]//*[
+			def="SnakeBody" or
+			def="SnakeHead" or
+			def="SnakeMouth" or
+			def="Leg" or
+			def="Hoof"
+			]/groups </xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- Maticore -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MM_ManticoreBody"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Leg" or
+			customLabel="rear left paw" or
+			customLabel="rear right paw"
+			] </xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MM_ManticoreBody"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Head" or
+			def="AnimalJaw" or
+			def="Leg" or
+			def="Paw"
+			]/groups </xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- Pegasus -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MM_PegasusBody"]//*[
+			def="Body" or
+			def="Neck" or
+			customLabel="rear left leg" or
+			customLabel="rear right leg" or
+			def="Hoof"
+			] </xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MM_PegasusBody"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Head" or
+			def="AnimalJaw" or
+			def="Leg" or
+			def="Hoof"
+			]/groups </xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- Qilin -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MM_QilinBody"]//*[
+			def="Body" or
+			def="Neck" or
+			customLabel="rear left leg" or
+			customLabel="rear right leg" or
+			def="Hoof"
+			] </xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MM_QilinBody"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Head" or
+			def="MM_Antlers" or
+			def="AnimalJaw" or
+			def="Leg" or
+			def="Hoof"
+			]/groups </xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- QuadrupedAnimalWithBeakAndWings -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MM_QuadrupedAnimalWithBeakAndWings"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Leg" or
+			customLabel="rear left paw" or
+			customLabel="rear right paw"
+			] </xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MM_QuadrupedAnimalWithBeakAndWings"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Head" or
+			def="Beak" or
+			def="Leg" or
+			def="Paw"
+			]/groups </xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- Wyvern -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MM_WyvernBody"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Leg"
+			] </xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MM_WyvernBody"]//*[
+			def="Body" or
+			def="MM_ScorpionTail" or
+			def="MM_Wing" or
+			def="Neck" or
+			def="Head" or
+			def="AnimalJaw" or
+			def="Leg" or
+			def="Paw"
+			]/groups </xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- HornedHumanlike -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MM_MinotaurBody"]//*[
+			def="Torso" or
+			def="Neck" or
+			def="Head" or
+			def="MM_Horns" or
+			def="Ear" or
+			def="Nose" or
+			def="Jaw" or
+			def="Shoulder" or
+			def="Arm" or
+			def="Hand" or
+			def="Finger" or
+			def="Leg" or
+			def="Foot" or
+			def="Toe"
+			]/groups </xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- HornedMechanoid -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MM_HornedMechanoid"]//*[
+			def="MechanicalThorax" or
+			def="MechanicalNeck" or
+			def="MechanicalShoulder" or
+			def="MechanicalArm" or
+			def="MechanicalHand" or
+			def="MechanicalLeg" or
+			def="MechanicalFoot"
+			] </xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MM_HornedMechanoid"]//*[
+			def="MechanicalThorax" or
+			def="MechanicalNeck" or
+			def="MechanicalHead" or
+			def="MM_Horns" or
+			def="MechanicalShoulder" or
+			def="MechanicalArm" or
+			def="MechanicalHand" or
+			def="MechanicalFinger" or
+			def="MechanicalLeg" or
+			def="MechanicalFoot"
+			]/groups </xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mythology/Patches/Alpha Mythology/AM_CE_Patch_Hediffs.xml b/ModPatches/Alpha Mythology/Patches/Alpha Mythology/AM_CE_Patch_Hediffs.xml
new file mode 100644
index 0000000000..0bf51057ab
--- /dev/null
+++ b/ModPatches/Alpha Mythology/Patches/Alpha Mythology/AM_CE_Patch_Hediffs.xml	
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>A Dog Said... Animal Prosthetics</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!--=============== Non-ranged implants ====================-->
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[defName="MM_ProstheticHorns"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>prosthetic horns</label>
+								<capacities>
+									<li>Scratch</li>
+								</capacities>
+								<power>8</power>
+								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+								<armorPenetrationSharp>0.15</armorPenetrationSharp>
+								<cooldownTime>1.8</cooldownTime>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[defName="MM_BionicHorns"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>bionic horns</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>20</power>
+								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+								<armorPenetrationSharp>0.1</armorPenetrationSharp>
+								<cooldownTime>1.4</cooldownTime>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<!--=============== Ranged implants ====================-->
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[defName="MM_PetrifyingGazeImplant"]/comps/li[@Class="MVCF.Comps.HediffCompProperties_ExtendedVerbGiver"]/verbs</xpath>
+					<value>
+						<verbs>
+							<li Class="CombatExtended.VerbPropertiesCE">
+								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+								<hasStandardCommand>true</hasStandardCommand>
+								<defaultProjectile>MM_GazeAttack_CE</defaultProjectile>
+								<burstShotCount>1</burstShotCount>
+								<warmupTime>1</warmupTime>
+								<range>20</range>
+								<minRange>1</minRange>
+								<muzzleFlashScale>1</muzzleFlashScale>
+								<label>petrifying gaze</label>
+								<commonality>1</commonality>
+								<recoilAmount>0</recoilAmount>
+							</li>
+						</verbs>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[defName="MM_VenomousQuillImplant"]/comps/li[@Class="MVCF.Comps.HediffCompProperties_ExtendedVerbGiver"]/verbs</xpath>
+					<value>
+						<verbs>
+							<li Class="CombatExtended.VerbPropertiesCE">
+								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+								<hasStandardCommand>true</hasStandardCommand>
+								<defaultProjectile>MM_Quill</defaultProjectile>
+								<burstShotCount>1</burstShotCount>
+								<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+								<warmupTime>1.5</warmupTime>
+								<range>18</range>
+								<minRange>2</minRange>
+								<soundCast>MM_QuillSound</soundCast>
+								<muzzleFlashScale>1</muzzleFlashScale>
+								<label>venomous quills</label>
+								<commonality>1</commonality>
+								<recoilAmount>0.4</recoilAmount>
+							</li>
+						</verbs>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[defName="MM_WispFireImplant"]/comps/li[@Class="MVCF.Comps.HediffCompProperties_ExtendedVerbGiver"]/verbs</xpath>
+					<value>
+						<verbs>
+							<li Class="CombatExtended.VerbPropertiesCE">
+								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+								<hasStandardCommand>true</hasStandardCommand>
+								<defaultProjectile>MM_WispProjectile</defaultProjectile>
+								<burstShotCount>10</burstShotCount>
+								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+								<warmupTime>2</warmupTime>
+								<range>15</range>
+								<minRange>1</minRange>
+								<soundCast>MM_PoisonBreathSound</soundCast>
+								<muzzleFlashScale>1</muzzleFlashScale>
+								<label>wisp breath</label>
+								<commonality>1</commonality>
+								<recoilAmount>0.3</recoilAmount>
+							</li>
+						</verbs>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[defName="MM_AcidicBreathImplant"]/comps/li[@Class="MVCF.Comps.HediffCompProperties_ExtendedVerbGiver"]/verbs</xpath>
+					<value>
+						<verbs>
+							<li Class="CombatExtended.VerbPropertiesCE">
+								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+								<hasStandardCommand>true</hasStandardCommand>
+								<defaultProjectile>MM_AcidicBreath</defaultProjectile>
+								<burstShotCount>6</burstShotCount>
+								<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+								<warmupTime>2.0</warmupTime>
+								<range>18</range>
+								<minRange>2</minRange>
+								<soundCast>MM_PoisonBreathSound</soundCast>
+								<muzzleFlashScale>0</muzzleFlashScale>
+								<label>acidic breath</label>
+								<commonality>1</commonality>
+								<recoilAmount>0.4</recoilAmount>
+							</li>
+						</verbs>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[defName="MM_FireBreathImplant"]/comps/li[@Class="MVCF.Comps.HediffCompProperties_ExtendedVerbGiver"]/verbs</xpath>
+					<value>
+						<verbs>
+							<li Class="CombatExtended.VerbPropertiesCE">
+								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+								<hasStandardCommand>true</hasStandardCommand>
+								<defaultProjectile>MM_FlameBreathAnimated_CE</defaultProjectile>
+								<burstShotCount>2</burstShotCount>
+								<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+								<warmupTime>2.5</warmupTime>
+								<range>18</range>
+								<minRange>2</minRange>
+								<soundCast>MM_FireBreathSound</soundCast>
+								<muzzleFlashScale>2</muzzleFlashScale>
+								<label>fire breath</label>
+								<commonality>0.8</commonality>
+							</li>
+						</verbs>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[defName="MM_ToxicBreathImplant"]/comps/li[@Class="MVCF.Comps.HediffCompProperties_ExtendedVerbGiver"]/verbs</xpath>
+					<value>
+						<verbs>
+							<li Class="CombatExtended.VerbPropertiesCE">
+								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+								<hasStandardCommand>true</hasStandardCommand>
+								<defaultProjectile>MM_GreenStreamBreath_CE</defaultProjectile>
+								<burstShotCount>1</burstShotCount>
+								<warmupTime>1.5</warmupTime>
+								<range>14</range>
+								<minRange>1</minRange>
+								<soundCast>MM_PoisonBreathSound</soundCast>
+								<muzzleFlashScale>1</muzzleFlashScale>
+								<label>toxic breath</label>
+								<commonality>1.0</commonality>
+							</li>
+						</verbs>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mythology/Patches/Alpha Mythology/AM_CE_Patch_Projectiles.xml b/ModPatches/Alpha Mythology/Patches/Alpha Mythology/AM_CE_Patch_Projectiles.xml
new file mode 100644
index 0000000000..fb1c661067
--- /dev/null
+++ b/ModPatches/Alpha Mythology/Patches/Alpha Mythology/AM_CE_Patch_Projectiles.xml	
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="MM_Quill" or
+			defName="MM_Tremor" or
+			defName="MM_WispProjectile" or
+			defName="MM_AcidicBreath" or
+			defName="MM_RazorSharpFeathers"
+			]</xpath>
+		<value>
+			<thingClass>CombatExtended.BulletCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_Quill"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>MM_ToxicSting</damageDef>
+				<damageAmountBase>20</damageAmountBase>
+				<speed>20</speed>
+				<!-- Roughly equal to steel neolithic arrows -->
+				<armorPenetrationSharp>0.5</armorPenetrationSharp>
+				<armorPenetrationBlunt>3.02</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_Tremor"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>Blunt</damageDef>
+				<damageAmountBase>20</damageAmountBase>
+				<speed>12</speed>
+				<armorPenetrationBlunt>100</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_WispProjectile"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>Burn</damageDef>
+				<damageAmountBase>2</damageAmountBase>
+				<speed>10</speed>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_AcidicBreath"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>20</speed>
+				<damageDef>MM_AcidicBreath</damageDef>
+				<damageAmountBase>2</damageAmountBase>
+				<flyOverhead>false</flyOverhead>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_RazorSharpFeathers"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>24</speed>
+				<damageDef>Cut</damageDef>
+				<damageAmountBase>12</damageAmountBase>
+				<flyOverhead>false</flyOverhead>
+				<!-- Roughly equal to plasteel neolithic arrows -->
+				<armorPenetrationSharp>1.0</armorPenetrationSharp>
+				<armorPenetrationBlunt>1.66</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="MM_PetrifyingGaze"]/additionalHediffs/li[hediff="MM_Petrification"]/severityPerDamageDealt</xpath>
+		<value>
+			<severityPerDamageDealt>0.035</severityPerDamageDealt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mythology/Patches/Alpha Mythology/AM_CE_Patch_Races.xml b/ModPatches/Alpha Mythology/Patches/Alpha Mythology/AM_CE_Patch_Races.xml
new file mode 100644
index 0000000000..20a8a7d12b
--- /dev/null
+++ b/ModPatches/Alpha Mythology/Patches/Alpha Mythology/AM_CE_Patch_Races.xml	
@@ -0,0 +1,2239 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Shared bodyShape patches -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[
+			defName="MM_Ahuizotl" or
+			defName="MM_Catoblepas" or
+			defName="MM_Cerberus" or
+			defName="MM_CeryneianHind" or
+			defName="MM_Chimera" or
+			defName="MM_ErymanthianBoar" or
+			defName="MM_Griffin" or
+			defName="MM_Kitsune" or
+			defName="MM_LernaeanHydra" or
+			defName="MM_Manticore" or
+			defName="MM_Pegasus" or
+			defName="MM_Qilin" or
+			defName="MM_Unicorn" or
+			defName="MM_Xiezhi"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="MM_WillOWisp"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="MM_Basilisk" or defName="MM_Tlilcoatl" or defName="MM_Salamander"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Serpentine</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="MM_WildMinotaur" or defName="MM_Kappa"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[
+			defName="MM_Phoenix" or
+			defName="MM_Fenghuang" or
+			defName="MM_Ieltxu" or
+			defName="MM_LesserWyvern" or
+			defName="MM_StymphalianBird"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Ahuizotl ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MM_Ahuizotl"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.10</MeleeDodgeChance>
+			<MeleeCritChance>0.26</MeleeCritChance>
+			<MeleeParryChance>0.13</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_Ahuizotl"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grabbing hand</label>
+					<capacities>
+						<li>MM_Grapple</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
+					<!-- armor penetration stats not applicable here-->
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.19</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.19</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.46</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<chanceFactor>2</chanceFactor>
+					<armorPenetrationSharp>0.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.063</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>3.2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.225</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Basilisk ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MM_Basilisk"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.19</MeleeDodgeChance>
+			<MeleeCritChance>0.18</MeleeCritChance>
+			<MeleeParryChance>0.17</MeleeParryChance>
+			<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
+			<AimingAccuracy>1.0</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_Basilisk"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fangs</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationSharp>0.38</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.24</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>18</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_Basilisk"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>MM_GazeAttack_CE</defaultProjectile>
+					<burstShotCount>1</burstShotCount>
+					<warmupTime>1</warmupTime>
+					<range>12</range>
+					<minRange>1</minRange>
+					<muzzleFlashScale>1</muzzleFlashScale>
+					<label>petrifying gaze</label>
+					<commonality>1</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- ========== Catoblepas ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MM_Catoblepas"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.10</MeleeDodgeChance>
+			<MeleeCritChance>0.35</MeleeCritChance>
+			<MeleeParryChance>0.19</MeleeParryChance>
+			<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
+			<AimingAccuracy>1.0</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_Catoblepas"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>3.8</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationBlunt>4.1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationBlunt>4.1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationSharp>0.47</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.92</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_Catoblepas"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>MM_GazeAttack_CE</defaultProjectile>
+					<burstShotCount>1</burstShotCount>
+					<warmupTime>1</warmupTime>
+					<range>20</range>
+					<minRange>1</minRange>
+					<muzzleFlashScale>1</muzzleFlashScale>
+					<label>petrifying gaze</label>
+					<commonality>1</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- ========== Cerberus ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MM_Cerberus"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			<MeleeCritChance>0.28</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_Cerberus"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7.4</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.213</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7.4</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.213</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.85</chanceFactor>
+					<armorPenetrationSharp>0.85</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.36</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.825</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Ceryneian Hind ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MM_CeryneianHind"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.14</MeleeDodgeChance>
+			<MeleeCritChance>0.27</MeleeCritChance>
+			<MeleeParryChance>0.3</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_CeryneianHind"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>antlers</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>15.8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>antlers</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.35</armorPenetrationSharp>
+					<armorPenetrationBlunt>16.8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>6.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>6.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationSharp>0.65</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.52</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Chimera ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MM_Chimera"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.09</MeleeDodgeChance>
+			<MeleeCritChance>0.48</MeleeCritChance>
+			<MeleeParryChance>0.27</MeleeParryChance>
+			<ShootingAccuracyPawn>1.4</ShootingAccuracyPawn>
+			<AimingAccuracy>0.9</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_Chimera"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<!-- Bite from Lion head-->
+					<label>toxic bite</label>
+					<capacities>
+						<li>MM_ToxicBite</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<!-- Bite from Snake head (tail) -->
+					<capacities>
+						<li>MM_ToxicBite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.67</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.225</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_Chimera"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>MM_FlameBreathAnimated_CE</defaultProjectile>
+					<burstShotCount>2</burstShotCount>
+					<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+					<warmupTime>2.5</warmupTime>
+					<range>18</range>
+					<minRange>2</minRange>
+					<soundCast>MM_FireBreathSound</soundCast>
+					<muzzleFlashScale>2</muzzleFlashScale>
+					<label>fire breath</label>
+					<commonality>0.8</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- ========== Erymanthian Boar ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MM_ErymanthianBoar"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.12</MeleeDodgeChance>
+			<MeleeCritChance>0.33</MeleeCritChance>
+			<MeleeParryChance>0.34</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_ErymanthianBoar"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tusk</label>
+					<capacities>
+						<li>Cut</li>
+						<li>MM_BleedingWound</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.89</cooldownTime>
+					<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>tusk</label>
+					<capacities>
+						<li>Stab</li>
+						<li>MM_BleedingWound</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.41</cooldownTime>
+					<chanceFactor>0.65</chanceFactor>
+					<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.940</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.57</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Fenghuang ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MM_Fenghuang"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.17</MeleeDodgeChance>
+			<MeleeCritChance>0.12</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_Fenghuang"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.26</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.18</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>beak</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>5</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.65</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.08</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Griffin ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MM_Griffin"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.17</MeleeDodgeChance>
+			<MeleeCritChance>0.17</MeleeCritChance>
+			<MeleeParryChance>0.20</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_Griffin"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>beak</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Ieltxu ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MM_Ieltxu"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.22</MeleeDodgeChance>
+			<MeleeCritChance>0.06</MeleeCritChance>
+			<MeleeParryChance>0.08</MeleeParryChance>
+			<ShootingAccuracyPawn>1.4</ShootingAccuracyPawn>
+			<AimingAccuracy>0.9</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_Ieltxu"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.18</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.560</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>beak</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.680</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.280</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_Ieltxu"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>MM_FlameBreathAnimated_CE</defaultProjectile>
+					<burstShotCount>1</burstShotCount>
+					<warmupTime>1.5</warmupTime>
+					<range>10</range>
+					<minRange>2</minRange>
+					<soundCast>MM_FireBreathSound</soundCast>
+					<muzzleFlashScale>1</muzzleFlashScale>
+					<label>fire breath</label>
+					<commonality>1.0</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- ========== Kappa ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MM_Kappa"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.12</MeleeDodgeChance>
+			<MeleeCritChance>0.14</MeleeCritChance>
+			<MeleeParryChance>0.20</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_Kappa"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.185</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.185</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.07</chanceFactor>
+					<soundMeleeHit>Pawn_Melee_HumanBite_Hit</soundMeleeHit>
+					<soundMeleeMiss>Pawn_Melee_HumanBite_Miss</soundMeleeMiss>
+					<armorPenetrationSharp>0.21</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.280</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.535</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Kitsune ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MM_Kitsune"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.16</MeleeDodgeChance>
+			<MeleeCritChance>0.07</MeleeCritChance>
+			<MeleeParryChance>0.04</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_Kitsune"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>0.91</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.198</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>0.91</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.198</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.49</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>1.440</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Lernaean Hydra ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MM_LernaeanHydra"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.08</MeleeDodgeChance>
+			<MeleeCritChance>0.22</MeleeCritChance>
+			<MeleeParryChance>0.57</MeleeParryChance>
+			<ShootingAccuracyPawn>1.3</ShootingAccuracyPawn>
+			<AimingAccuracy>0.8</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_LernaeanHydra"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>MM_ToxicBite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.67</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.225</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.3</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.225</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_LernaeanHydra"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>MM_AcidicBreath</defaultProjectile>
+					<burstShotCount>6</burstShotCount>
+					<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+					<warmupTime>2.0</warmupTime>
+					<range>18</range>
+					<minRange>2</minRange>
+					<soundCast>MM_PoisonBreathSound</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>acidic breath</label>
+					<commonality>1</commonality>
+					<recoilAmount>0.4</recoilAmount>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- ========== Lesser Wyvern ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MM_LesserWyvern"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.33</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_LesserWyvern"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.7</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.7</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>razor beak</label>
+					<capacities>
+						<li>MM_VeryToxicBite</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.9</chanceFactor>
+					<armorPenetrationSharp>4.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>8.9</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>tail</label>
+					<capacities>
+						<li>MM_ToxicSting</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>MM_AttackTail</linkedBodyPartsGroup>
+					<chanceFactor>0.75</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>25</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>8.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>8.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_LesserWyvern"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_LesserWyvern"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>7</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="MM_LesserWyvern"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="MM_LesserWyvern"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MM_LesserWyvern"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>4500</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Manticore ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MM_Manticore"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.16</MeleeDodgeChance>
+			<MeleeCritChance>0.31</MeleeCritChance>
+			<MeleeParryChance>0.22</MeleeParryChance>
+			<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
+			<AimingAccuracy>1.0</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_Manticore"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>MM_ToxicSting</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>MM_AttackTail</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>18</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.535</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_Manticore"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>MM_Quill</defaultProjectile>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+					<warmupTime>1.5</warmupTime>
+					<range>18</range>
+					<minRange>2</minRange>
+					<soundCast>MM_QuillSound</soundCast>
+					<muzzleFlashScale>1</muzzleFlashScale>
+					<label>venomous quills</label>
+					<commonality>1</commonality>
+					<recoilAmount>0.4</recoilAmount>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- ========== Pegasus ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MM_Pegasus"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.16</MeleeDodgeChance>
+			<MeleeCritChance>0.48</MeleeCritChance>
+			<MeleeParryChance>0.21</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_Pegasus"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.97</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Phoenix ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MM_Phoenix"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.36</MeleeDodgeChance>
+			<MeleeCritChance>0.17</MeleeCritChance>
+			<MeleeParryChance>0.21</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_Phoenix"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.48</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>beak</label>
+					<capacities>
+						<li>MM_FlamingBite</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.82</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.65</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_Phoenix"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4.7</MoveSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MM_Phoenix"]</xpath>
+		<value>
+			<butcherProducts>
+				<Prometheum>10</Prometheum>
+			</butcherProducts>
+		</value>
+	</Operation>
+
+	<!-- ========== Qilin ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MM_Qilin"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			<MeleeCritChance>0.23</MeleeCritChance>
+			<MeleeParryChance>0.10</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_Qilin"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>antlers</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.66</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.750</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>MM_FlamingBite</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.66</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationBlunt>0.750</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.97</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetration>0.2</armorPenetration>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Salamander ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MM_Salamander"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.16</MeleeDodgeChance>
+			<MeleeCritChance>0.29</MeleeCritChance>
+			<MeleeParryChance>0.10</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_Salamander"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fire-fangs</label>
+					<capacities>
+						<li>MM_FlamingBite</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>18</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2.84</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.96</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.85</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Stymphalian bird ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MM_StymphalianBird"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.32</MeleeDodgeChance>
+			<MeleeCritChance>0.20</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+			<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
+			<AimingAccuracy>1.0</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_StymphalianBird"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.0</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>beak</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.0</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>5</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.0</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.85</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_StymphalianBird"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>MM_RazorSharpFeathers</defaultProjectile>
+					<burstShotCount>3</burstShotCount>
+					<warmupTime>2</warmupTime>
+					<range>18</range>
+					<minRange>2</minRange>
+					<soundCast>MM_Feathers</soundCast>
+					<muzzleFlashScale>1</muzzleFlashScale>
+					<label>razor sharp feathers</label>
+					<commonality>0.8</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_StymphalianBird"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4.5</MoveSpeed>
+		</value>
+	</Operation>
+
+	<!-- ========== Tlilcoatl ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MM_Tlilcoatl"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			<MeleeCritChance>0.12</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+			<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
+			<AimingAccuracy>1.0</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_Tlilcoatl"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fangs</label>
+					<capacities>
+						<li>MM_ToxicBite</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>18</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2.26</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.49</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_Tlilcoatl"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>MM_GreenStreamBreath_CE</defaultProjectile>
+					<burstShotCount>1</burstShotCount>
+					<warmupTime>1.5</warmupTime>
+					<range>14</range>
+					<minRange>1</minRange>
+					<soundCast>MM_PoisonBreathSound</soundCast>
+					<muzzleFlashScale>1</muzzleFlashScale>
+					<label>toxic breath</label>
+					<commonality>1.0</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- ========== Unicorn ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MM_Unicorn"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.16</MeleeDodgeChance>
+			<MeleeCritChance>0.41</MeleeCritChance>
+			<MeleeParryChance>0.19</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_Unicorn"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.54</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>8</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.97</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Wild Minotaur ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MM_WildMinotaur"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.12</MeleeDodgeChance>
+			<MeleeCritChance>0.14</MeleeCritChance>
+			<MeleeParryChance>0.22</MeleeParryChance>
+			<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
+			<AimingAccuracy>1.0</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_WildMinotaur"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horns</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.54</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8.2</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8.2</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>8.2</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.07</chanceFactor>
+					<armorPenetrationBlunt>0.253</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_WildMinotaur"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>MM_Tremor</defaultProjectile>
+					<burstShotCount>1</burstShotCount>
+					<warmupTime>1</warmupTime>
+					<range>15</range>
+					<minRange>5</minRange>
+					<soundCast>MM_Tremor</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>tremors</label>
+					<commonality>1</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- ========== Will-O'-Wisp ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MM_WillOWisp"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.22</MeleeDodgeChance>
+			<MeleeCritChance>0.00</MeleeCritChance>
+			<MeleeParryChance>0.02</MeleeParryChance>
+			<ShootingAccuracyPawn>1.3</ShootingAccuracyPawn>
+			<AimingAccuracy>0.8</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_WillOWisp"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>pseudopod</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8.2</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>MM_Pseudopods</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_WillOWisp"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>MM_WispProjectile</defaultProjectile>
+					<burstShotCount>10</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<warmupTime>2</warmupTime>
+					<range>15</range>
+					<minRange>1</minRange>
+					<soundCast>MM_PoisonBreathSound</soundCast>
+					<muzzleFlashScale>1</muzzleFlashScale>
+					<label>wisp breath</label>
+					<commonality>1</commonality>
+					<recoilAmount>0.3</recoilAmount>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- ========== Xiezhi ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MM_Xiezhi"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.18</MeleeCritChance>
+			<MeleeParryChance>0.10</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_Xiezhi"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>MM_ExtraDamageToPiratesHorn</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.9</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>bite</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<chanceFactor>0.6</chanceFactor>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<chanceFactor>0.3</chanceFactor>
+					<armorPenetrationSharp>0.28</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.71</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<chanceFactor>0.3</chanceFactor>
+					<armorPenetrationSharp>0.28</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.71</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.85</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Mythology/Patches/Alpha Mythology/AM_CE_Patch_Resources.xml b/ModPatches/Alpha Mythology/Patches/Alpha Mythology/AM_CE_Patch_Resources.xml
new file mode 100644
index 0000000000..ded95f7705
--- /dev/null
+++ b/ModPatches/Alpha Mythology/Patches/Alpha Mythology/AM_CE_Patch_Resources.xml	
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ===== Light Magical Leather ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_LightMagicalLeather"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.45</StuffPower_Armor_Sharp>
+			<StuffPower_Armor_Blunt>0.05</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ===== Heavy Magical Leather ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_HeavyMagicalLeather"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.65</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MM_HeavyMagicalLeather"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.08</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="MM_LightMagicalLeather" or defName="MM_HeavyMagicalLeather"]/stuffProps/categories</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="MM_LightMagicalLeather" or defName="MM_HeavyMagicalLeather"]/stuffProps</xpath>
+			<value>
+				<categories>
+					<li>SoftArmor</li>
+				</categories>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="MM_LightMagicalLeather" or defName="MM_HeavyMagicalLeather"]/stuffProps/categories</xpath>
+			<value>
+				<li>SoftArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Ships/Patches/Alpha Ships/Patch_AlphaShips_DamageDefs.xml b/ModPatches/Alpha Ships/Patches/Alpha Ships/Patch_AlphaShips_DamageDefs.xml
new file mode 100644
index 0000000000..ffbbf36823
--- /dev/null
+++ b/ModPatches/Alpha Ships/Patches/Alpha Ships/Patch_AlphaShips_DamageDefs.xml	
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[
+			defName="AS_ShipBioSmall"
+			]/defaultArmorPenetration </xpath>
+		<value>
+			<defaultArmorPenetration>200</defaultArmorPenetration>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Vehicle/Defs/Alpha Vehicles/Ammo_Hwacha.xml b/ModPatches/Alpha Vehicle/Defs/Alpha Vehicles/Ammo_Hwacha.xml
new file mode 100644
index 0000000000..ab0f777b71
--- /dev/null
+++ b/ModPatches/Alpha Vehicle/Defs/Alpha Vehicles/Ammo_Hwacha.xml	
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>RocketArrow</defName>
+		<label>hwacha rocket arrow</label>
+		<labelShort>hwacha</labelShort>
+		<description>Steel arrowhead with an underslung tube of gunpowder for explosive results.</description>
+		<advanced>true</advanced>
+	</CombatExtended.AmmoCategoryDef>
+
+	<!-- ==================== Ammoset ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Hwacha</defName>
+		<label>hwacha arrows</label>
+		<ammoTypes>
+			<Ammo_GreatArrow_ExplosiveArrow>Projectile_GreatArrow_ExplosiveArrow</Ammo_GreatArrow_ExplosiveArrow>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoGreatArrowBase">
+		<defName>Ammo_GreatArrow_ExplosiveArrow</defName>
+		<label>hwacha rocket arrow</label>
+		<graphicData>
+			<texPath>Things/Ammo/Neolithic/Arrow/Flame</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<Mass>0.05</Mass>
+			<MarketValue>1.16</MarketValue>
+		</statBases>
+		<ammoClass>RocketArrow</ammoClass>
+	</ThingDef>
+
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="BaseGreatArrowProjectile">
+		<defName>Projectile_GreatArrow_ExplosiveArrow</defName>
+		<label>hwacha rocket arrow</label>
+		<graphicData>
+			<texPath>Things/Projectiles/AV_ArrowProjectile</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>30</speed>
+			<damageDef>Arrow</damageDef>
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationBlunt>3.18</armorPenetrationBlunt>
+			<armorPenetrationSharp>2</armorPenetrationSharp>
+			<suppressionFactor>3.0</suppressionFactor>
+			<airborneSuppressionFactor>0.42</airborneSuppressionFactor>
+			<dangerFactor>2.0</dangerFactor>
+			<soundExplode>Explosion_Rocket</soundExplode>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>20</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>MakeAmmo_GreatArrow_ExplosiveArrow</defName>
+		<label>make hwacha explosive arrows x10</label>
+		<description>Craft 10 hwacha explosive arrows.</description>
+		<jobString>Making hwacha rocket arrows.</jobString>
+		<workAmount>800</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Cloth</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>Cloth</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_GreatArrow_ExplosiveArrow>10</Ammo_GreatArrow_ExplosiveArrow>
+		</products>
+		<researchPrerequisites>
+			<li>CE_Gunpowder</li>
+		</researchPrerequisites>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Alpha Vehicle/Patches/Alpha Vehicle/Alpha_Vehicle.xml b/ModPatches/Alpha Vehicle/Patches/Alpha Vehicle/Alpha_Vehicle.xml
new file mode 100644
index 0000000000..ef960e984e
--- /dev/null
+++ b/ModPatches/Alpha Vehicle/Patches/Alpha Vehicle/Alpha_Vehicle.xml	
@@ -0,0 +1,420 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Chariot -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_Chariot"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_Chariot"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_Chariot"]/components/li[key="LeftWheel"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_Chariot"]/components/li[key="LeftWheel"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_Chariot"]/components/li[key="RightWheel"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_Chariot"]/components/li[key="RightWheel"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_Chariot"]/components/li[key="WoodenStructure"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_Chariot"]/components/li[key="WoodenStructure"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Covered Carriage -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_CoveredCarriage"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_CoveredCarriage"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.65</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_CoveredCarriage"]/components/li[key="FrontLeftWheel"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_CoveredCarriage"]/components/li[key="FrontLeftWheel"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_CoveredCarriage"]/components/li[key="BackLeftWheel"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_CoveredCarriage"]/components/li[key="BackLeftWheel"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_CoveredCarriage"]/components/li[key="FrontRightWheel"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_CoveredCarriage"]/components/li[key="FrontRightWheel"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_CoveredCarriage"]/components/li[key="BackRightWheel"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_CoveredCarriage"]/components/li[key="BackRightWheel"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_CoveredCarriage"]/components/li[key="WoodenStructure"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_CoveredCarriage"]/components/li[key="WoodenStructure"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Dog Sled -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_DogSled"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_DogSled"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_DogSled"]/components/li[key="WoodenStructure"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_DogSled"]/components/li[key="WoodenStructure"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Outrigger Canoe -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_OutriggerCanoe"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_OutriggerCanoe"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_OutriggerCanoe"]/components/li[key="WoodenHull"]</xpath>
+		<value>
+			<armor>
+				<ArmorRating_Blunt>1</ArmorRating_Blunt>
+				<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+			</armor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_OutriggerCanoe"]/components/li[key="Outrigger"]</xpath>
+		<value>
+			<armor>
+				<ArmorRating_Blunt>1</ArmorRating_Blunt>
+				<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+			</armor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_OutriggerCanoe"]/components/li[key="Sail"]</xpath>
+		<value>
+			<armor>
+				<ArmorRating_Blunt>0.015</ArmorRating_Blunt>
+				<ArmorRating_Sharp>0.01</ArmorRating_Sharp>
+			</armor>
+		</value>
+	</Operation>
+
+	<!-- Ox Cart -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_OxCart"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_OxCart"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_OxCart"]/components/li[key="LeftWheel"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_OxCart"]/components/li[key="LeftWheel"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_OxCart"]/components/li[key="RightWheel"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_OxCart"]/components/li[key="RightWheel"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_OxCart"]/components/li[key="WoodenStructure"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_OxCart"]/components/li[key="WoodenStructure"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Palanquin -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_Palanquin"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_Palanquin"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_Palanquin"]/components/li[key="WoodenStructure"]</xpath>
+		<value>
+			<armor>
+				<ArmorRating_Blunt>2</ArmorRating_Blunt>
+				<ArmorRating_Sharp>1</ArmorRating_Sharp>
+			</armor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_Palanquin"]/components/li[key="Handles"]</xpath>
+		<value>
+			<armor>
+				<ArmorRating_Blunt>8</ArmorRating_Blunt>
+				<ArmorRating_Sharp>4</ArmorRating_Sharp>
+			</armor>
+		</value>
+	</Operation>
+
+	<!-- Rickshaw -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_Rickshaw"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_Rickshaw"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_Rickshaw"]/components/li[key="WoodenStructure"]</xpath>
+		<value>
+			<armor>
+				<ArmorRating_Blunt>1</ArmorRating_Blunt>
+				<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+			</armor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_Rickshaw"]/components/li[key="LeftWheel"]</xpath>
+		<value>
+			<armor>
+				<ArmorRating_Blunt>4</ArmorRating_Blunt>
+				<ArmorRating_Sharp>2</ArmorRating_Sharp>
+			</armor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_Rickshaw"]/components/li[key="RightWheel"]</xpath>
+		<value>
+			<armor>
+				<ArmorRating_Blunt>4</ArmorRating_Blunt>
+				<ArmorRating_Sharp>2</ArmorRating_Sharp>
+			</armor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_Rickshaw"]/components/li[key="Handles"]</xpath>
+		<value>
+			<armor>
+				<ArmorRating_Blunt>8</ArmorRating_Blunt>
+				<ArmorRating_Sharp>4</ArmorRating_Sharp>
+			</armor>
+		</value>
+	</Operation>
+
+	<!-- Wheel Barrow -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_Wheelbarrow"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_Wheelbarrow"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_Wheelbarrow"]/components/li[key="WoodenStructure"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_Wheelbarrow"]/components/li[key="WoodenStructure"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_Wheelbarrow"]/components/li[key="FrontWheel"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_Wheelbarrow"]/components/li[key="FrontWheel"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_Wheelbarrow"]/components/li[key="Handles"]</xpath>
+		<value>
+			<armor>
+				<ArmorRating_Blunt>8</ArmorRating_Blunt>
+				<ArmorRating_Sharp>4</ArmorRating_Sharp>
+			</armor>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Vehicle/Patches/Alpha Vehicle/Alpha_Vehicle_Hwacha.xml b/ModPatches/Alpha Vehicle/Patches/Alpha Vehicle/Alpha_Vehicle_Hwacha.xml
new file mode 100644
index 0000000000..f31e7bfd7f
--- /dev/null
+++ b/ModPatches/Alpha Vehicle/Patches/Alpha Vehicle/Alpha_Vehicle_Hwacha.xml	
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Turret -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="AV_Hwacha_Turret"]/projectile</xpath>
+		<value>
+			<projectile>Projectile_GreatArrow_ExplosiveArrow</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="AV_Hwacha_Turret"]/reloadTimer</xpath>
+		<value>
+			<reloadTimer>12.0</reloadTimer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="AV_Hwacha_Turret"]/warmUpTimer</xpath>
+		<value>
+			<warmUpTimer>3.0</warmUpTimer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="AV_Hwacha_Turret"]/magazineCapacity</xpath>
+		<value>
+			<magazineCapacity>64</magazineCapacity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="AV_Hwacha_Turret"]/maxRange</xpath>
+		<value>
+			<maxRange>20</maxRange>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="AV_Hwacha_Turret"]/fireModes</xpath>
+		<value>
+			<fireModes>
+				<li>
+					<shotsPerBurst>64</shotsPerBurst>
+					<ticksBetweenShots>6</ticksBetweenShots>
+					<ticksBetweenBursts>15</ticksBetweenBursts>
+					<label>Full Barrage</label>
+					<texPath>UI/Gizmos/AV_ArrowBarrage</texPath>
+				</li>
+				<li>
+					<shotsPerBurst>32</shotsPerBurst>
+					<ticksBetweenShots>6</ticksBetweenShots>
+					<ticksBetweenBursts>15</ticksBetweenBursts>
+					<label>Half Barrage</label>
+					<texPath>UI/Gizmos/FireRate_Auto</texPath>
+				</li>
+				<li>
+					<shotsPerBurst>8</shotsPerBurst>
+					<ticksBetweenShots>6</ticksBetweenShots>
+					<ticksBetweenBursts>15</ticksBetweenBursts>
+					<label>Burst</label>
+					<texPath>UI/Gizmos/FireRate_Burst</texPath>
+				</li>
+			</fireModes>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="AV_Hwacha_Turret"]</xpath>
+		<value>
+			<li Class="Vehicles.CETurretDataDefModExtension">
+				<ammoSet>AmmoSet_Hwacha</ammoSet>
+				<shotHeight>2.1</shotHeight>
+				<speed>30</speed>
+				<sway>10</sway>
+				<spread>0.1</spread>
+				<recoil>30</recoil>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Hwacha -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_Hwacha"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_Hwacha"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_Hwacha"]/components/li[key="LeftWheel"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_Hwacha"]/components/li[key="LeftWheel"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_Hwacha"]/components/li[key="RightWheel"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_Hwacha"]/components/li[key="RightWheel"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_Hwacha"]/components/li[key="WoodenStructure"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_Hwacha"]/components/li[key="WoodenStructure"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Vehicle/Patches/Alpha Vehicle/Alpha_Vehicle_WarChariot.xml b/ModPatches/Alpha Vehicle/Patches/Alpha Vehicle/Alpha_Vehicle_WarChariot.xml
new file mode 100644
index 0000000000..d15a674915
--- /dev/null
+++ b/ModPatches/Alpha Vehicle/Patches/Alpha Vehicle/Alpha_Vehicle_WarChariot.xml	
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Turret -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="AV_WarChariot_Turret"]/projectile</xpath>
+		<value>
+			<projectile>Projectile_GreatArrow_Stone</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="AV_WarChariot_Turret"]/reloadTimer</xpath>
+		<value>
+			<reloadTimer>1.6</reloadTimer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="AV_WarChariot_Turret"]/warmUpTimer</xpath>
+		<value>
+			<warmUpTimer>1.3</warmUpTimer>
+		</value>
+	</Operation>
+
+	<!--li Class="PatchOperationReplace">
+			<xpath>Defs/Vehicles.VehicleTurretDef[defName="AV_WarChariot"]/magazineCapacity</xpath>
+			<value>
+				<magazineCapacity>35</magazineCapacity>
+			</value>
+		</li-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="AV_WarChariot_Turret"]/maxRange</xpath>
+		<value>
+			<maxRange>30</maxRange>
+		</value>
+	</Operation>
+
+	<!--li Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="AV_WarChariot"]/fireModes</xpath>
+		<value>
+			<fireModes>
+				<li>
+					<shotsPerBurst>1</shotsPerBurst>
+					<ticksBetweenBursts>1</ticksBetweenBursts>
+					<spreadRadius>0</spreadRadius>
+					<label>Single Shot</label>
+					<texPath>UI/Gizmos/FireRate_Single</texPath>
+				</li>
+			</fireModes>
+		</value>
+	</li-->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="AV_WarChariot_Turret"]</xpath>
+		<value>
+			<li Class="Vehicles.CETurretDataDefModExtension">
+				<ammoSet>AmmoSet_GreatArrow</ammoSet>
+				<shotHeight>2</shotHeight>
+				<speed>30</speed>
+				<sway>2</sway>
+				<spread>1</spread>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- WarChariot -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_WarChariot"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_WarChariot"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_WarChariot"]/components/li[key="WoodenStructure"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_WarChariot"]/components/li[key="WoodenStructure"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_WarChariot"]/components/li[key="LeftWheel"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_WarChariot"]/components/li[key="LeftWheel"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_WarChariot"]/components/li[key="RightWheel"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="AV_WarChariot"]/components/li[key="RightWheel"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Patches.xml b/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Patches.xml
new file mode 100644
index 0000000000..85e39ac4fc
--- /dev/null
+++ b/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Patches.xml	
@@ -0,0 +1,815 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Common armor properties -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="AC_HuntersHelmet"]/apparel</xpath>
+		<value>
+			<immuneToToxGasExposure>true</immuneToToxGasExposure>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="AC_HuntersHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="AC_HuntersArmourBase"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<!-- Protector Helmet -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.7</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>275</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>3.0</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/costList/ComponentSpacer</xpath>
+		<value>
+			<ComponentSpacer>2</ComponentSpacer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>75</Plasteel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>30</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<!-- Protector Armor -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>600</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>50</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>24</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>56</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>80</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/costList/ComponentSpacer</xpath>
+		<value>
+			<ComponentSpacer>5</ComponentSpacer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>200</Plasteel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/costList/Uranium</xpath>
+		<value>
+			<Uranium>50</Uranium>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>60</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<!-- Fusilier Helmet -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>300</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>6.6</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>56</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingAccuracy>0.20</AimingAccuracy>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/costList/ComponentSpacer</xpath>
+		<value>
+			<ComponentSpacer>3</ComponentSpacer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>115</Plasteel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>35</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<!-- Fusilier Armor -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>700</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>80</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>30</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>68</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>100</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/costList/ComponentSpacer</xpath>
+		<value>
+			<ComponentSpacer>8</ComponentSpacer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>270</Plasteel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/costList/Uranium</xpath>
+		<value>
+			<Uranium>95</Uranium>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>75</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<!-- Dragoon Helmet -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>300</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>6.6</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>28</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>62</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/costList/ComponentSpacer</xpath>
+		<value>
+			<ComponentSpacer>2</ComponentSpacer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>125</Plasteel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>35</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<!-- Dragoon armor and jump wings require Royalty -->
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Royalty</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!-- Dragoon Armor -->
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/statBases</xpath>
+					<value>
+						<Bulk>100</Bulk>
+						<WornBulk>15</WornBulk>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/statBases/Flammability</xpath>
+					<value>
+						<Flammability>0</Flammability>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/statBases/MaxHitPoints</xpath>
+					<value>
+						<MaxHitPoints>700</MaxHitPoints>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/statBases/Mass</xpath>
+					<value>
+						<Mass>80</Mass>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>32</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>75</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]</xpath>
+					<value>
+						<li Class="CombatExtended.PartialArmorExt">
+							<stats>
+								<li>
+									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+									<parts>
+										<li>Neck</li>
+									</parts>
+								</li>
+								<li>
+									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+									<parts>
+										<li>Neck</li>
+									</parts>
+								</li>
+								<li>
+									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+									<parts>
+										<li>Arm</li>
+									</parts>
+								</li>
+								<li>
+									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+									<parts>
+										<li>Arm</li>
+									</parts>
+								</li>
+								<li>
+									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+									<parts>
+										<li>Hand</li>
+									</parts>
+								</li>
+								<li>
+									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+									<parts>
+										<li>Hand</li>
+									</parts>
+								</li>
+							</stats>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/equippedStatOffsets</xpath>
+					<value>
+						<CarryWeight>100</CarryWeight>
+						<CarryBulk>20</CarryBulk>
+						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/costList/ComponentSpacer</xpath>
+					<value>
+						<ComponentSpacer>8</ComponentSpacer>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/costList/Plasteel</xpath>
+					<value>
+						<Plasteel>275</Plasteel>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/costList/Uranium</xpath>
+					<value>
+						<Uranium>90</Uranium>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/costList</xpath>
+					<value>
+						<DevilstrandCloth>75</DevilstrandCloth>
+					</value>
+				</li>
+
+				<!-- Jump Wings -->
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AC_Apparel_WingJump"]/statBases</xpath>
+					<value>
+						<Bulk>10</Bulk>
+						<WornBulk>3</WornBulk>
+					</value>
+				</li>
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AC_Apparel_WingJump"]/statBases/JumpRange</xpath>
+					<value>
+						<JumpRange>20</JumpRange>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+	<!-- Cuirassier Belt -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AC_CuirassierBelt"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>2</Mass>
+		</value>
+	</Operation>
+
+	<!-- Autorevolver -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AC_Gun_Autorevolver</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.49</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>2.5</Bulk>
+			<WorkToMake>7000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.9</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_44Magnum_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Revolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_44Magnum</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_BROOM</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Gun_Autorevolver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Ancient Arsenal Warcaskets/Patches/Ancient Arsenal Warcaskets/AncientWarcaskets.xml b/ModPatches/Ancient Arsenal Warcaskets/Patches/Ancient Arsenal Warcaskets/AncientWarcaskets.xml
new file mode 100644
index 0000000000..9007654c1a
--- /dev/null
+++ b/ModPatches/Ancient Arsenal Warcaskets/Patches/Ancient Arsenal Warcaskets/AncientWarcaskets.xml	
@@ -0,0 +1,350 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== ancient warcasket helmet ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>36</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>80</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient"]/statBases</xpath>
+		<value>
+			<Bulk>20</Bulk>
+			<WornBulk>10</WornBulk>
+			<NightVisionEfficiency_Apparel>0.95</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient"]/verbs</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient"]/comps/li[@Class="MVCF.Comps.CompProperties_VerbGiver"]</xpath>
+	</Operation>
+
+	<!-- ========== ancient warcasket shoulders ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Ancient"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Ancient"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>40</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Ancient"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>100</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ========== ancient warcasket body ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Ancient"]/statBases</xpath>
+		<value>
+			<Bulk>275</Bulk>
+			<WornBulk>35</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Ancient"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>40</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Ancient"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>100</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Ancient"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>350</CarryWeight>
+			<CarryBulk>425</CarryBulk>
+			<Suppressability>-100</Suppressability>
+		</value>
+	</Operation>
+
+	<!-- ========== advanced ancient warcasket helmet ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Cloak"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>45</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Cloak"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>100</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Cloak"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Cloak"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Cloak"]/statBases</xpath>
+		<value>
+			<Bulk>20</Bulk>
+			<WornBulk>10</WornBulk>
+			<NightVisionEfficiency_Apparel>0.99</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Cloak"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Cloak"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Cloak"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Cloak"]/verbs</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Cloak"]/comps/li[@Class="MVCF.Comps.CompProperties_VerbGiver"]</xpath>
+	</Operation>
+
+	<!-- ========== advanced ancient warcasket shoulders ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_Ancient_Cloak"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_Ancient_Cloak"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>50</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_Ancient_Cloak"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>120</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ========== advanced ancient warcasket body ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Ancient_Cloak"]/statBases</xpath>
+		<value>
+			<Bulk>275</Bulk>
+			<WornBulk>35</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Ancient_Cloak"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>50</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Ancient_Cloak"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>120</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Ancient_Cloak"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>450</CarryWeight>
+			<CarryBulk>525</CarryBulk>
+			<Suppressability>-100</Suppressability>
+		</value>
+	</Operation>
+
+	<!-- ========== advanced ancient warcasket helmet pertinent ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Penitent"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>50</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Penitent"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>120</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Penitent"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Penitent"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Penitent"]/statBases</xpath>
+		<value>
+			<Bulk>20</Bulk>
+			<WornBulk>10</WornBulk>
+			<NightVisionEfficiency_Apparel>0.99</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Penitent"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Penitent"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Penitent"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Penitent"]/verbs</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Penitent"]/comps/li[@Class="MVCF.Comps.CompProperties_VerbGiver"]</xpath>
+	</Operation>
+
+	<!-- ========== advanced ancient warcasket helmet Mech ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Mechnomancer"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>45</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Mechnomancer"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>110</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Mechnomancer"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Mechnomancer"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Mechnomancer"]/statBases</xpath>
+		<value>
+			<Bulk>20</Bulk>
+			<WornBulk>10</WornBulk>
+			<NightVisionEfficiency_Apparel>0.99</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Mechnomancer"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Mechnomancer"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Mechnomancer"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Mechnomancer"]/verbs</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Mechnomancer"]/comps/li[@Class="MVCF.Comps.CompProperties_VerbGiver"]</xpath>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Ancient Arsenal Warcaskets/Patches/Ancient Arsenal Warcaskets/MeleeAncientWC.xml b/ModPatches/Ancient Arsenal Warcaskets/Patches/Ancient Arsenal Warcaskets/MeleeAncientWC.xml
new file mode 100644
index 0000000000..1d9a1c793c
--- /dev/null
+++ b/ModPatches/Ancient Arsenal Warcaskets/Patches/Ancient Arsenal Warcaskets/MeleeAncientWC.xml	
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Melee Weapon Draw Size -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AAWarcasketMelee_Cleaver" or defName="AAWarcasketMelee_BrokenBlade"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.7,1.7</DrawSize>
+				<DrawOffset>0.0,0.0</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AAWarcasketMelee_Intruder"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.3,1.3</DrawSize>
+				<DrawOffset>0.0,0.0</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- WarcasketCleaver -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AAWarcasketMelee_Cleaver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>34</power>
+					<cooldownTime>2.6</cooldownTime>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<armorPenetrationSharp>24</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>44</power>
+					<cooldownTime>2.8</cooldownTime>
+					<armorPenetrationBlunt>30</armorPenetrationBlunt>
+					<armorPenetrationSharp>16.15</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>30</amount>
+							<chance>1</chance>
+						</li>
+					</extraMeleeDamages>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AAWarcasketMelee_Cleaver"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.93</MeleeCritChance>
+				<MeleeParryChance>0.95</MeleeParryChance>
+				<MeleeDodgeChance>0.6</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AAWarcasketMelee_Cleaver"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<MeleeCounterParryBonus>0.53</MeleeCounterParryBonus>
+			<ToughnessRating>20</ToughnessRating>
+		</value>
+	</Operation>
+
+	<!-- BrokenBlade -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AAWarcasketMelee_BrokenBlade"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>76</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>11</armorPenetrationBlunt>
+					<armorPenetrationSharp>45</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+					<extraMeleeDamages>
+						<li>
+							<def>EMP</def>
+							<amount>45</amount>
+							<chance>1</chance>
+						</li>
+					</extraMeleeDamages>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>100</power>
+					<cooldownTime>2.35</cooldownTime>
+					<armorPenetrationBlunt>47</armorPenetrationBlunt>
+					<armorPenetrationSharp>34.8</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>50</amount>
+							<chance>1</chance>
+						</li>
+					</extraMeleeDamages>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AAWarcasketMelee_BrokenBlade"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.99</MeleeCritChance>
+				<MeleeParryChance>0.97</MeleeParryChance>
+				<MeleeDodgeChance>0.88</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AAWarcasketMelee_BrokenBlade"]/statBases</xpath>
+		<value>
+			<Bulk>25</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+			<ToughnessRating>30</ToughnessRating>
+		</value>
+	</Operation>
+
+	<!-- Intruder -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AAWarcasketMelee_Intruder"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>11</armorPenetrationBlunt>
+					<armorPenetrationSharp>21</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>20</amount>
+							<chance>1</chance>
+						</li>
+					</extraMeleeDamages>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>50</power>
+					<cooldownTime>1.35</cooldownTime>
+					<armorPenetrationBlunt>27</armorPenetrationBlunt>
+					<armorPenetrationSharp>15.8</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+					<extraMeleeDamages>
+						<li>
+							<def>IntruderToxic</def>
+							<amount>50</amount>
+							<chance>1</chance>
+						</li>
+					</extraMeleeDamages>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AAWarcasketMelee_Intruder"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.79</MeleeCritChance>
+				<MeleeParryChance>0.67</MeleeParryChance>
+				<MeleeDodgeChance>0.48</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AAWarcasketMelee_Intruder"]/statBases</xpath>
+		<value>
+			<Bulk>25</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+			<ToughnessRating>20</ToughnessRating>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Ancient Arsenal Warcaskets/Patches/Ancient Arsenal Warcaskets/RangedWeapons.xml b/ModPatches/Ancient Arsenal Warcaskets/Patches/Ancient Arsenal Warcaskets/RangedWeapons.xml
new file mode 100644
index 0000000000..743a45ff03
--- /dev/null
+++ b/ModPatches/Ancient Arsenal Warcaskets/Patches/Ancient Arsenal Warcaskets/RangedWeapons.xml	
@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "AA_CAS" or
+			defName = "AA_Ripper" or
+			defName = "AA_Brigador" or
+			defName = "WarcasketGun_Confessor"
+			]/tools
+		</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>2.44</cooldownTime>
+					<armorPenetrationBlunt>16</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ===  CAS === -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>/Defs/ThingDef[defName="AA_CAS"]/verbs</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>/Defs/ThingDef[defName="AA_CAS"]/comps/li[@Class="CompToggleFireMode.CompProperties_ToggleFireMode"]</xpath>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AA_CAS</defName>
+		<statBases>
+			<Bulk>25</Bulk>
+			<SwayFactor>1.2</SwayFactor>
+			<ShotSpread>0.08</ShotSpread>
+			<SightsEfficiency>2.20</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.60</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.19</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_SPG9Rocket_HEAT</defaultProjectile>
+			<warmupTime>1.6</warmupTime>
+			<range>68</range>
+			<soundCast>Brigador_ShotHeavy</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>16</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>6.0</reloadTime>
+			<ammoSet>AmmoSet_SPG9Rocket</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>/Defs/ThingDef[defName="AA_CAS"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.4,1.4</DrawSize>
+				<DrawOffset>0.0,0.0</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ===  Ripper === -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>/Defs/ThingDef[defName="AA_Ripper"]/verbs</xpath>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AA_Ripper</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.9</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>2.32</SwayFactor>
+			<Bulk>8</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.22</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50AE_FMJ</defaultProjectile>
+			<warmupTime>2.1</warmupTime>
+			<range>28</range>
+			<burstShotCount>20</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>Ripper_Shots</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>4.2</reloadTime>
+			<ammoSet>AmmoSet_50AE</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>true</aiUseBurstMode>
+			<aimedBurstShotCount>12</aimedBurstShotCount>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>/Defs/ThingDef[defName="AA_Ripper"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>0.8,0.8</DrawSize>
+				<DrawOffset>0.0,0.0</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ===  Brigador === -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>/Defs/ThingDef[defName="AA_Brigador"]/verbs</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>/Defs/ThingDef[defName="AA_Brigador"]/comps/li[@Class="CompToggleFireMode.CompProperties_ToggleFireMode"]</xpath>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AA_Brigador</defName>
+		<statBases>
+			<Mass>12.5</Mass>
+			<Bulk>12.5</Bulk>
+			<SwayFactor>1.00</SwayFactor>
+			<ShotSpread>0.05</ShotSpread>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.22</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Bolter75_Standard</defaultProjectile>
+			<warmupTime>0.8</warmupTime>
+			<range>45</range>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>Brigador_ShotHeavy</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>2.2</reloadTime>
+			<ammoSet>AmmoSet_Bolter75</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>/Defs/ThingDef[defName="AA_Brigador"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>0.9,0.9</DrawSize>
+				<DrawOffset>0.0,0.0</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ===  Confessor === -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>/Defs/ThingDef[defName="WarcasketGun_Confessor"]/verbs</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>/Defs/ThingDef[defName="WarcasketGun_Confessor"]/comps/li[@Class="CompToggleFireMode.CompProperties_ToggleFireMode"]</xpath>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>WarcasketGun_Confessor</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.9</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.12</SwayFactor>
+			<Bulk>35</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.52</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_600NitroExpress_FMJ</defaultProjectile>
+			<warmupTime>1.6</warmupTime>
+			<range>57</range>
+			<burstShotCount>50</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>VFEP_Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>500</magazineSize>
+			<reloadTime>6.2</reloadTime>
+			<ammoSet>AmmoSet_600NitroExpress</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>true</aiUseBurstMode>
+			<aimedBurstShotCount>25</aimedBurstShotCount>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WarcasketGun_Confessor"]/comps</xpath>
+		<value>
+
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<propsUnderBarrel>
+					<magazineSize>200</magazineSize>
+					<reloadTime>3.5</reloadTime>
+					<ammoSet>AmmoSet_Flamethrower</ammoSet>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_Flamethrower_Napalm</defaultProjectile>
+					<warmupTime>0.5</warmupTime>
+					<range>32</range>
+					<burstShotCount>20</burstShotCount>
+					<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+					<soundCast>HissFlamethrower</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>12</muzzleFlashScale>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aiUseBurstMode>true</aiUseBurstMode>
+					<aiAimMode>SuppressFire</aiAimMode>
+					<aimedBurstShotCount>10</aimedBurstShotCount>
+				</propsFireModesUnderBarrel>
+			</li>
+
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>/Defs/ThingDef[defName="WarcasketGun_Confessor"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.4,1.4</DrawSize>
+				<DrawOffset>0.0,0.0</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Ancient Blade Cyborg/Patches/Ancient Blade Cyborg/CE_Cyborg_Race.xml b/ModPatches/Ancient Blade Cyborg/Patches/Ancient Blade Cyborg/CE_Cyborg_Race.xml
new file mode 100644
index 0000000000..f03fc82e97
--- /dev/null
+++ b/ModPatches/Ancient Blade Cyborg/Patches/Ancient Blade Cyborg/CE_Cyborg_Race.xml	
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Crborg_Hero"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Crborg_Hero"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Crborg_Hero"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Crborg_Hero"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Crborg_Hero"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency>0.3</NightVisionEfficiency>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1.33</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>0.66</Suppressability>
+			<CarryWeight>80</CarryWeight>
+			<CarryBulk>40</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Crborg_Hero"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Crborg_Hero"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3.75</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Crborg_Hero"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>3.0</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Crborg_Hero"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left blade fist</label>
+					<capacities>
+						<li>Cut</li>
+						<li>Stab</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.36</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>4</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>4.0</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Ancient Blade Cyborg/Patches/Ancient Blade Cyborg/CE_Scenario.xml b/ModPatches/Ancient Blade Cyborg/Patches/Ancient Blade Cyborg/CE_Scenario.xml
new file mode 100644
index 0000000000..b4002ce2e2
--- /dev/null
+++ b/ModPatches/Ancient Blade Cyborg/Patches/Ancient Blade Cyborg/CE_Scenario.xml	
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="DangerousExperiment"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_ScatterThingsNearPlayerStart">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_45ACP_FMJ</thingDef>
+				<count>600</count>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Ancient Blade Cyborg/Patches/Ancient Blade Cyborg/CE_Weapons_Guns.xml b/ModPatches/Ancient Blade Cyborg/Patches/Ancient Blade Cyborg/CE_Weapons_Guns.xml
new file mode 100644
index 0000000000..856ae1905f
--- /dev/null
+++ b/ModPatches/Ancient Blade Cyborg/Patches/Ancient Blade Cyborg/CE_Weapons_Guns.xml	
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_BarracudaHMG" or defName="Gun_ShrimpAutomaticRifle"]/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="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_BarracudaHMG</defName>
+		<statBases>
+			<Mass>20.12</Mass>
+			<RangedWeapon_Cooldown>0.96</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.54</SwayFactor>
+			<Bulk>22.7</Bulk>
+			<WorkToMake>70000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>200</Steel>
+			<WoodLog>10</WoodLog>
+			<ComponentIndustrial>10</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.33</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>1.4</warmupTime>
+			<range>68</range>
+			<minRange>1.9</minRange>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>Shot_BarracudaHMG</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>75</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<researchPrerequisite>GasOperation</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Gun_BarracudaHMG"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.35,1.18</DrawSize>
+				<DrawOffset>0.13,-0.03</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_ShrimpAutomaticRifle</defName>
+		<statBases>
+			<Mass>2.86</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.29</SwayFactor>
+			<Bulk>8.03</Bulk>
+			<WorkToMake>30000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>1.28</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.75</warmupTime>
+			<range>30</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Gun_ShrimpAutomaticRifle"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.16,1.25</DrawSize>
+				<DrawOffset>0.05,-0.07</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Ancient Blade Cyborg/Patches/Ancient Blade Cyborg/Cyborg_CoveredByNaturalArmor.xml b/ModPatches/Ancient Blade Cyborg/Patches/Ancient Blade Cyborg/Cyborg_CoveredByNaturalArmor.xml
new file mode 100644
index 0000000000..dbb71f552f
--- /dev/null
+++ b/ModPatches/Ancient Blade Cyborg/Patches/Ancient Blade Cyborg/Cyborg_CoveredByNaturalArmor.xml	
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Modify coverage ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Cyborg"]/corePart/parts/li[def="Ribcage"]/coverage</xpath>
+		<value>
+			<coverage>0.07</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Cyborg"]/corePart/parts/li[def="Pelvis"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Cyborg"]/corePart/parts/li[def="Stomach"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Cyborg"]/corePart/parts/li[def="Heart"]/coverage</xpath>
+		<value>
+			<coverage>0.04</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Cyborg"]/corePart/parts/li[def="Lung"]/coverage</xpath>
+		<value>
+			<coverage>0.055</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Cyborg"]/corePart/parts/li[def="Kidney"]/coverage</xpath>
+		<value>
+			<coverage>0.03</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Cyborg"]/corePart/parts/li[def="Liver"]/coverage</xpath>
+		<value>
+			<coverage>0.06</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Cyborg"]/corePart/parts/li[def = "CyborgNeck"]/coverage</xpath>
+		<value>
+			<coverage>0.055</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Cyborg"]/corePart/parts/li[def="CyborgNeck"]/parts/li[def="Head"]/parts/li[def="CyborgSkull"]/parts/li[def="ArtificialBrain"]/coverage</xpath>
+		<value>
+			<coverage>0.9</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Cyborg"]/corePart/parts/li[def = "CyborgNeck"]/parts/li[def="Head"]/parts/li[def = "CyborgNose"]/coverage</xpath>
+		<value>
+			<coverage>0.08</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Cyborg"]/corePart/parts/li[def = "CyborgNeck"]/parts/li[def="Head"]/parts/li[def = "CyborgSightSensor"]/coverage</xpath>
+		<value>
+			<coverage>0.06</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Cyborg"]/corePart/parts/li[def = "CyborgNeck"]/parts/li[def="Head"]/parts/li[def = "CyborgEye"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Cyborg"]/corePart/parts/li[def = "CyborgShoulder"]/coverage</xpath>
+		<value>
+			<coverage>0.085</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Cyborg"]/corePart/parts/li[def = "Shoulder"]/coverage</xpath>
+		<value>
+			<coverage>0.085</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Cyborg"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Clavicle"]/coverage</xpath>
+		<value>
+			<coverage>0.06</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Cyborg"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Humerus"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Cyborg"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Radius"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+
+	<!-- ========== Add armor coverage ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Cyborg"]//*[
+			def="CyborgTorso" or
+			def="CyborgNeck" or
+			def="Head" or
+			def="Jaw" or
+			def="CyborgEar" or
+			def="CyborgNose" or
+			def="CyborgShoulder" or
+			def="Shoulder" or
+			def="CyborgArm" or
+			def="Arm" or
+			def="CyborgBladeFist" or
+			def="CyborgHand" or
+			def="Hand" or
+			def="CyborgFoot" or
+			def="CyborgLeg"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Cyborg"]//*[
+			def="CyborgJaw" or
+			def="CyborgNose" or
+			def="CyborgSightSensor" or
+			def="CyborgEye"]/groups
+		</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Ancient Blade Cyborg/Patches/Ancient Blade Cyborg/Pawn_CE.xml b/ModPatches/Ancient Blade Cyborg/Patches/Ancient Blade Cyborg/Pawn_CE.xml
new file mode 100644
index 0000000000..a53298dc8b
--- /dev/null
+++ b/ModPatches/Ancient Blade Cyborg/Patches/Ancient Blade Cyborg/Pawn_CE.xml	
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="HeroAncientBladeCyborg"]</xpath>
+		<value>
+			<apparelRequired>
+				<li>CE_Apparel_Backpack</li>
+			</apparelRequired>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Ancient Eastern Armory/Patches/Ancient Eastern Armory/AsianArmory_Apparel.xml b/ModPatches/Ancient Eastern Armory/Patches/Ancient Eastern Armory/AsianArmory_Apparel.xml
new file mode 100644
index 0000000000..b11dcda410
--- /dev/null
+++ b/ModPatches/Ancient Eastern Armory/Patches/Ancient Eastern Armory/AsianArmory_Apparel.xml	
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Noble Robe -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Ancient_AsianNobleCloth"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Ancient_AsianNobleCloth"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.08</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Ancient_AsianNobleCloth"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Noble Hat -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Ancient_AsianNobleHat"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Ancient_AsianNobleHat"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.04</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Ancient_AsianNobleHat"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.06</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Ninja Gi -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Ancient_NinjaGi"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Ancient_NinjaGi"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Ancient_NinjaGi"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.18</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Ninja Mask -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Ancient_NinjaMask"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Ancient_NinjaMask"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.3</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Ancient_NinjaMask"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Ancient Eastern Armory/Patches/Ancient Eastern Armory/AsianArmory_Armour.xml b/ModPatches/Ancient Eastern Armory/Patches/Ancient Eastern Armory/AsianArmory_Armour.xml
new file mode 100644
index 0000000000..a6b080943b
--- /dev/null
+++ b/ModPatches/Ancient Eastern Armory/Patches/Ancient Eastern Armory/AsianArmory_Armour.xml	
@@ -0,0 +1,344 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Yoroi -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Ancient_SamuraiYoroi"]/statBases</xpath>
+		<value>
+			<Bulk>80</Bulk>
+			<WornBulk>12</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Ancient_SamuraiYoroi"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Ancient_SamuraiYoroi"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeDodgeChance>-0.05</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Yoroi Helmet -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Ancient_SamuraiHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Ancient_SamuraiHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Ancient_SamuraiHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>-0.2</AimingAccuracy>
+				<MeleeHitChance>-1</MeleeHitChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Yoroi - Captain's Helmet -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Ancient_SamuraiCaptainHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>7</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Ancient_SamuraiCaptainHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Ancient_SamuraiCaptainHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>-0.25</AimingAccuracy>
+				<MeleeHitChance>-1.5</MeleeHitChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Ashigaru Armor -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Ancient_AshigaruArmor"]/statBases</xpath>
+		<value>
+			<Bulk>80</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Ancient_AshigaruArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.65</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Ashigaru Helmet -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Ancient_AshigaruHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Ancient_AshigaruHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Qing Light Armor -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Ancient_QingLightArmor"]/statBases</xpath>
+		<value>
+			<Bulk>80</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Ancient_QingLightArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Ancient_QingLightArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Qing Light Helmet -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Ancient_QingLightHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Ancient_QingLightHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Ancient_QingLightHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Qing Heavy Helmet -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Ancient_QingHeavyHelm"]/statBases</xpath>
+		<value>
+			<Bulk>7</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Ancient_QingHeavyHelm"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.8</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Ancient_QingHeavyHelm"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>-0.20</AimingAccuracy>
+				<MeleeHitChance>-1.25</MeleeHitChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Joseon Brigandine -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Ancient_Brigandine"]/statBases</xpath>
+		<value>
+			<Bulk>80</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Ancient_Brigandine"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Ancient_Brigandine"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeDodgeChance>-0.075</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Joseon Brigandine - Leather -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Ancient_LeatherBrigandine"]/statBases</xpath>
+		<value>
+			<Bulk>80</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Ancient_LeatherBrigandine"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Ancient_LeatherBrigandine"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Ancient_LeatherBrigandine"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Ancient_LeatherBrigandine"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeDodgeChance>-0.075</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Joseon Brigandine Helmet -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Ancient_BrigandineHelm"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Ancient_BrigandineHelm"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Ancient_BrigandineHelm"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>-0.2</AimingAccuracy>
+				<MeleeHitChance>-1</MeleeHitChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Joseon Brigandine Helmet - Leather -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Ancient_LeatherBrigandineHelm"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Ancient_LeatherBrigandineHelm"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Ancient_LeatherBrigandineHelm"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Ancient_LeatherBrigandineHelm"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Ancient_LeatherBrigandineHelm"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>-0.2</AimingAccuracy>
+				<MeleeHitChance>-1</MeleeHitChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Gunner's Hat -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Ancient_GunnersHat"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Ancient_GunnersHat"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Ancient Eastern Armory/Patches/Ancient Eastern Armory/AsianArmory_Weapons.xml b/ModPatches/Ancient Eastern Armory/Patches/Ancient Eastern Armory/AsianArmory_Weapons.xml
new file mode 100644
index 0000000000..b07d202ffd
--- /dev/null
+++ b/ModPatches/Ancient Eastern Armory/Patches/Ancient Eastern Armory/AsianArmory_Weapons.xml	
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Two-Handed Flail -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Ancient_TwoHandedFlail"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.49</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>3.375</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>2.67</cooldownTime>
+					<armorPenetrationBlunt>15.75</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Ancient_TwoHandedFlail"]/statBases</xpath>
+		<value>
+			<Bulk>14</Bulk>
+			<MeleeCounterParryBonus>0.28</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Ancient_TwoHandedFlail"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>1.6</MeleeCritChance>
+			<MeleeParryChance>0.38</MeleeParryChance>
+			<MeleeDodgeChance>0.3</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- Yari -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Ancient_SamuraiYari"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.29</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>1.913</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.71</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.85</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.14</cooldownTime>
+					<chanceFactor>1.00</chanceFactor>
+					<armorPenetrationBlunt>1.913</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.4</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>3.2</cooldownTime>
+					<chanceFactor>0.33</chanceFactor>
+					<armorPenetrationBlunt>1.913</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.28</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Ancient_SamuraiYari"]/statBases</xpath>
+		<value>
+			<Bulk>11</Bulk>
+			<MeleeCounterParryBonus>2.12</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Ancient_SamuraiYari"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeCritChance>0.39</MeleeCritChance>
+			<MeleeParryChance>1.59</MeleeParryChance>
+			<MeleeDodgeChance>0.90</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- Guan Dao -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Ancient_GuanDao"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.49</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>3.375</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.97</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>1.50</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>39</power>
+					<cooldownTime>2.44</cooldownTime>
+					<chanceFactor>0.33</chanceFactor>
+					<armorPenetrationBlunt>4.86</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.95</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Ancient_GuanDao"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<MeleeCounterParryBonus>0.98</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Ancient_GuanDao"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.11</MeleeCritChance>
+				<MeleeParryChance>0.73</MeleeParryChance>
+				<MeleeDodgeChance>0.73</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Ancient Fallout Armory/Patches/Ancient Fallout Armory/Apparel_Armor.xml b/ModPatches/Ancient Fallout Armory/Patches/Ancient Fallout Armory/Apparel_Armor.xml
new file mode 100644
index 0000000000..38e87e3cde
--- /dev/null
+++ b/ModPatches/Ancient Fallout Armory/Patches/Ancient Fallout Armory/Apparel_Armor.xml	
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Materials === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="FallArmory_HeavyMetalArmor" or
+			defName="Fallarmory_MediumMetalArmor" or
+			defName="Fallarmory_MetalArmorHelmetB" or
+			defName="FallArmory_HeavyCombatArmor" or
+			defName="Fallarmory_MediumCombatArmor"
+			]/stuffCategories </xpath>
+		<value>
+			<stuffCategories>
+				<li>Steeled</li>
+			</stuffCategories>
+		</value>
+	</Operation>
+
+	<!-- === Metal Armor === -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="FallArmory_HeavyMetalArmor" or defName="Fallarmory_MediumMetalArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="FallArmory_HeavyMetalArmor"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FallArmory_HeavyMetalArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="FallArmory_HeavyMetalArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeDodgeChance>-0.15</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Fallarmory_MediumMetalArmor"]/statBases</xpath>
+		<value>
+			<Bulk>80</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Fallarmory_MediumMetalArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- === Combat Armor === -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="FallArmory_HeavyCombatArmor" or defName="Fallarmory_MediumCombatArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FallArmory_HeavyCombatArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>25</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="FallArmory_HeavyCombatArmor"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FallArmory_HeavyCombatArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>11</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="FallArmory_HeavyCombatArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeDodgeChance>-0.15</MeleeDodgeChance>
+			<CarryBulk>8</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Fallarmory_MediumCombatArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>18</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Fallarmory_MediumCombatArmor"]/statBases</xpath>
+		<value>
+			<Bulk>80</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Fallarmory_MediumCombatArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>5</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Fallarmory_MediumCombatArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>7</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- === Pre-War Armor === -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="FallArmory_HeavyCombatArmorUS"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="FallArmory_HeavyCombatArmorUS"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FallArmory_HeavyCombatArmorUS"]/statBases/Mass</xpath>
+		<value>
+			<Mass>25</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FallArmory_HeavyCombatArmorUS"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FallArmory_HeavyCombatArmorUS"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="FallArmory_HeavyCombatArmorUS"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeDodgeChance>-0.15</MeleeDodgeChance>
+			<CarryBulk>8</CarryBulk>
+		</value>
+	</Operation>
+
+	<!-- === Secret Service Armor === -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="FallArmory_SecretServiceArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="FallArmory_SecretServiceArmor"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FallArmory_SecretServiceArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>20</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FallArmory_SecretServiceArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FallArmory_SecretServiceArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>14</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="FallArmory_SecretServiceArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>8</CarryBulk>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Ancient Fallout Armory/Patches/Ancient Fallout Armory/Headgears_Fallout.xml b/ModPatches/Ancient Fallout Armory/Patches/Ancient Fallout Armory/Headgears_Fallout.xml
new file mode 100644
index 0000000000..648bae2a18
--- /dev/null
+++ b/ModPatches/Ancient Fallout Armory/Patches/Ancient Fallout Armory/Headgears_Fallout.xml	
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Materials === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Fallarmory_FlightHelmet" or
+			defName="Fallarmory_MetalArmorHelmetA" or
+			defName="Fallarmory_MetalArmorHelmetB" or
+			defName="Fallarmory_CombatarmorHelmet"
+			]/stuffCategories </xpath>
+		<value>
+			<stuffCategories>
+				<li>Steeled</li>
+			</stuffCategories>
+		</value>
+	</Operation>
+
+	<!-- === Flight Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Fallarmory_FlightHelmet" or defName="Fallarmory_USFlightHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Fallarmory_FlightHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Fallarmory_USFlightHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Fallarmory_USFlightHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Fallarmory_FlightHelmet" or defName="Fallarmory_USFlightHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Fallarmory_FlightHelmet" or defName="Fallarmory_USFlightHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Fallarmory_FlightHelmet" or defName="Fallarmory_USFlightHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!-- === Metal Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Fallarmory_MetalArmorHelmetA" or defName="Fallarmory_MetalArmorHelmetB"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Fallarmory_MetalArmorHelmetA" or defName="Fallarmory_MetalArmorHelmetB"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- === Combat Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Fallarmory_CombatarmorHelmet" or defName="FallArmory_CombatarmorHelmetUS"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Fallarmory_CombatarmorHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>7.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FallArmory_CombatarmorHelmetUS"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>9</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FallArmory_CombatarmorHelmetUS"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>14</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Secret Service Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="FallArmory_SecretServiceHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FallArmory_SecretServiceHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FallArmory_SecretServiceHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="FallArmory_SecretServiceHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="FallArmory_SecretServiceHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="FallArmory_SecretServiceHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Ancient Human/Patches/Ancient Human/Pawnkinds_AncientHuman.xml b/ModPatches/Ancient Human/Patches/Ancient Human/Pawnkinds_AncientHuman.xml
new file mode 100644
index 0000000000..322e2039b0
--- /dev/null
+++ b/ModPatches/Ancient Human/Patches/Ancient Human/Pawnkinds_AncientHuman.xml	
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="SpaceRefugee_Ancient"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>7</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Ancient Human/Patches/Ancient Human/Race_AncientHuman.xml b/ModPatches/Ancient Human/Patches/Ancient Human/Race_AncientHuman.xml
new file mode 100644
index 0000000000..b6ae7c7055
--- /dev/null
+++ b/ModPatches/Ancient Human/Patches/Ancient Human/Race_AncientHuman.xml	
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Human_Hero"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Human_Hero"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Human_Hero"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Human_Hero"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Human_Hero"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency>0.1</NightVisionEfficiency>
+			<MeleeDodgeChance>1.1</MeleeDodgeChance>
+			<MeleeCritChance>1.1</MeleeCritChance>
+			<MeleeParryChance>1.1</MeleeParryChance>
+			<Suppressability>0.90</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Human_Hero"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Ancient Human/Patches/Ancient Human/Scenario_AncientHuman.xml b/ModPatches/Ancient Human/Patches/Ancient Human/Scenario_AncientHuman.xml
new file mode 100644
index 0000000000..4fc576cc78
--- /dev/null
+++ b/ModPatches/Ancient Human/Patches/Ancient Human/Scenario_AncientHuman.xml	
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="IAmAlive"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_ScatterThingsNearPlayerStart">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_556x45mmNATO_FMJ</thingDef>
+				<count>300</count>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Android Tiers - TX Series/Patches/Android Tiers - TX Series/PawnkindDefs/PawnKinds_Android.xml b/ModPatches/Android Tiers - TX Series/Patches/Android Tiers - TX Series/PawnkindDefs/PawnKinds_Android.xml
new file mode 100644
index 0000000000..301c679ea9
--- /dev/null
+++ b/ModPatches/Android Tiers - TX Series/Patches/Android Tiers - TX Series/PawnkindDefs/PawnKinds_Android.xml	
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			@Name="ATPP_AndroidTX2RaiderBase" or
+			@Name="ATPP_AndroidTX2KRaiderBase" or
+			@Name="ATPP_AndroidTX3RaiderBase" or
+			@Name="ATPP_AndroidTX4RaiderBase" or
+			@Name="ATPP_AndroidTX2CollectiveBase" or
+			@Name="ATPP_AndroidTX2KCollectiveBase" or
+			@Name="ATPP_AndroidTX3CollectiveBase" or
+			@Name="ATPP_AndroidTX4CollectiveBase"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>20</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Android Tiers - TX Series/Patches/Android Tiers - TX Series/ThingDef_Races/AlienRace_Androids.xml b/ModPatches/Android Tiers - TX Series/Patches/Android Tiers - TX Series/ThingDef_Races/AlienRace_Androids.xml
new file mode 100644
index 0000000000..9b89a71d15
--- /dev/null
+++ b/ModPatches/Android Tiers - TX Series/Patches/Android Tiers - TX Series/ThingDef_Races/AlienRace_Androids.xml	
@@ -0,0 +1,406 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Test for comps-->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2TX"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2TX"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2ITX"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2ITX"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android3TX"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android3TX"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android3ITX"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android3ITX"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android4TX"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android4TX"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android4ITX"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android4ITX"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2KTX"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2KTX"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2KITX"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2KITX"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<!--Multiple-->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[
+			defName="ATPP_Android2TX" or
+			defName="ATPP_Android3TX" or
+			defName="ATPP_Android4TX" or
+			defName="ATPP_Android2ITX" or
+			defName="ATPP_Android3ITX" or
+			defName="ATPP_Android4ITX" or
+			defName="ATPP_Android2KTX" or
+			defName="ATPP_Android2KITX"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[
+			defName="ATPP_Android2TX" or
+			defName="ATPP_Android3TX" or
+			defName="ATPP_Android4TX" or
+			defName="ATPP_Android2ITX" or
+			defName="ATPP_Android3ITX" or
+			defName="ATPP_Android4ITX" or
+			defName="ATPP_Android2KTX" or
+			defName="ATPP_Android2KITX"
+			]/comps </xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+		</value>
+	</Operation>
+
+	<!--2/3/4 are all complex enough to have at least some intrinsic self presevation. 
+2KXT Are purpose built combat units and as such do not.-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[
+			defName="ATPP_Android2TX" or
+			defName="ATPP_Android3TX" or
+			defName="ATPP_Android4TX" or
+			defName="ATPP_Android2ITX" or
+			defName="ATPP_Android3ITX" or
+			defName="ATPP_Android4ITX"
+			]/comps </xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<!--T2-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2TX" or defName="ATPP_Android2ITX"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.95</MeleeDodgeChance>
+			<MeleeCritChance>0.95</MeleeCritChance>
+			<MeleeParryChance>0.95</MeleeParryChance>
+			<Suppressability>0.10</Suppressability>
+			<SmokeSensitivity>0.05</SmokeSensitivity>
+		</value>
+	</Operation>
+	<!--1mm Steel-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2TX" or defName="ATPP_Android2ITX"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2TX" or defName="ATPP_Android2ITX"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2TX" or defName="ATPP_Android2ITX"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.67</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.405</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.67</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.405</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--T3-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android3TX" or defName="ATPP_Android3ITX"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1.1</MeleeCritChance>
+			<MeleeParryChance>1.1</MeleeParryChance>
+			<Suppressability>0.10</Suppressability>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+	<!--1mm plasteel/1.5mm steel-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android3TX" or defName="ATPP_Android3ITX"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android3TX" or defName="ATPP_Android3ITX"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4.75</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android3TX" or defName="ATPP_Android3ITX"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.67</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.44</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.67</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.44</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.8</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--T4-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android4TX" or defName="ATPP_Android4ITX"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1.2</MeleeDodgeChance>
+			<MeleeCritChance>1.2</MeleeCritChance>
+			<MeleeParryChance>1.2</MeleeParryChance>
+			<Suppressability>0.25</Suppressability>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+	<!--2mm plasteel-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android4TX" or defName="ATPP_Android4ITX"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android4TX" or defName="ATPP_Android4ITX"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android4TX" or defName="ATPP_Android4ITX"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.11</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.68</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.11</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.68</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--T2K-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2KTX" or defName="ATPP_Android2KITX"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.75</MeleeDodgeChance>
+			<MeleeCritChance>1.0</MeleeCritChance>
+			<MeleeParryChance>1.2</MeleeParryChance>
+			<Suppressability>0</Suppressability>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+	<!--4mm Steel-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2KTX" or defName="ATPP_Android2KITX"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2KTX" or defName="ATPP_Android2KITX"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2KTX" or defName="ATPP_Android2KITX"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.05</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.05</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>5.29</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Android Tiers Reforged/Defs/Android Tiers Reforged/81mmMortar_SwarmShell.xml b/ModPatches/Android Tiers Reforged/Defs/Android Tiers Reforged/81mmMortar_SwarmShell.xml
new file mode 100644
index 0000000000..3a0bc37251
--- /dev/null
+++ b/ModPatches/Android Tiers Reforged/Defs/Android Tiers Reforged/81mmMortar_SwarmShell.xml	
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- Ammo Category -->
+	<CombatExtended.AmmoCategoryDef>
+		<defName>SwarmShell</defName>
+		<label>swarm shell</label>
+		<description>Releases several pre-programmed microscythers on impact.</description>
+		<advanced>true</advanced>
+	</CombatExtended.AmmoCategoryDef>
+
+	<!-- Ammo -->
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBaseCraftableBase">
+		<defName>Swarm_shell_81mm</defName>
+		<label>81mm mortar shell (Swarm)</label>
+		<graphicData>
+			<texPath>Things/Items/Shells/Microscyther_shell</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>60</MarketValue>
+			<Mass>4.1</Mass>
+			<Bulk>11.34</Bulk>
+		</statBases>
+		<ammoClass>SwarmShell</ammoClass>
+		<comps>
+			<li Class="CompProperties_Explosive">
+				<explosiveRadius>2</explosiveRadius>
+				<explosiveDamageType>Smoke</explosiveDamageType>
+				<explosiveExpandPerStackcount>0.4</explosiveExpandPerStackcount>
+				<startWickHitPointsPercent>0.333</startWickHitPointsPercent>
+				<postExplosionSpawnThingDef>Filth_FireFoam</postExplosionSpawnThingDef>
+				<postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<explosionEffect>ExtinguisherExplosion</explosionEffect>
+				<wickTicks>
+					<min>10</min>
+					<max>30</max>
+				</wickTicks>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- Projectile -->
+	<ThingDef ParentName="Base81mmMortarShell">
+		<defName>Bullet_81mmMortarShell_Swarm</defName>
+		<label>81mm mortar shell (Swarm)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Mortar/EMP</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Smoke</damageDef>
+			<suppressionFactor>0.0</suppressionFactor>
+			<dangerFactor>0.0</dangerFactor>
+			<damageAmountBase>0</damageAmountBase>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>39.493</armorPenetrationBlunt>
+			<explosionRadius>1.9</explosionRadius>
+			<soundExplode>Explosion_EMP</soundExplode>
+			<postExplosionSpawnThingDef>ATR_MicroScytherGenerator</postExplosionSpawnThingDef>
+			<postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<explosionEffect>ExtinguisherExplosion</explosionEffect>
+		</projectile>
+	</ThingDef>
+
+	<!-- Recipe -->
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeSwarm_shell_81mm</defName>
+		<label>make 81mm Swarm mortar shell x1</label>
+		<description>Craft 1 81mm Swarm shell.</description>
+		<jobString>Making 81mm Swarm shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>50</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Swarm_shell_81mm>1</Swarm_shell_81mm>
+		</products>
+		<workAmount>3000</workAmount>
+		<recipeUsers Inherit="False">
+			<li>ATR_MechanicalAssemblyPod</li>
+		</recipeUsers>
+		<researchPrerequisite>ATR_MilitaryBiomimetics</researchPrerequisite>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Android Tiers Reforged/Patches/Android Tiers Reforged/Ammo/81mmMortar_SwarmShell.xml b/ModPatches/Android Tiers Reforged/Patches/Android Tiers Reforged/Ammo/81mmMortar_SwarmShell.xml
new file mode 100644
index 0000000000..5cc40a2570
--- /dev/null
+++ b/ModPatches/Android Tiers Reforged/Patches/Android Tiers Reforged/Ammo/81mmMortar_SwarmShell.xml	
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_81mmMortarShell"]/ammoTypes</xpath>
+		<value>
+			<Swarm_shell_81mm>Bullet_81mmMortarShell_Swarm</Swarm_shell_81mm>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="ATR_MicroscytherShell"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATR_TrapIED_Microscyther"]/costList</xpath>
+		<value>
+			<costList>
+				<Swarm_shell_81mm>2</Swarm_shell_81mm>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/TraderKindDef[defName="ATR_Orbital_Mechanized"]/stockGenerators/li[thingDef="ATR_MicroscytherShell"]</xpath>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Android Tiers Reforged/Patches/Android Tiers Reforged/Bodies/Bodies_Android.xml b/ModPatches/Android Tiers Reforged/Patches/Android Tiers Reforged/Bodies/Bodies_Android.xml
new file mode 100644
index 0000000000..21c23bc400
--- /dev/null
+++ b/ModPatches/Android Tiers Reforged/Patches/Android Tiers Reforged/Bodies/Bodies_Android.xml	
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalShoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalShoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_Framework"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalNeck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_VoiceSynthesizer"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_MechanicalAudioSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_SmellSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalShoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalShoulder"]/parts/li[def="ATR_MechanicalArm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalShoulder"]/parts/li[def="ATR_MechanicalArm"]/parts/li[def="ATR_MechanicalHand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalShoulder"]/parts/li[def="ATR_MechanicalArm"]/parts/li[def="ATR_MechanicalHand"]/parts/li[def="ATR_MechanicalFinger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalLeg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalLeg"]/parts/li[def="ATR_MechanicalFoot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="ATR_AndroidBody"]//*[
+			def="ATR_VoiceSynthesizer" or
+			def="ATR_SmellSensor" or
+			def="ATR_MechanicalVisualSensor"]/groups
+		</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Android Tiers Reforged/Patches/Android Tiers Reforged/Bodies/Bodies_Animal_Airborne.xml b/ModPatches/Android Tiers Reforged/Patches/Android Tiers Reforged/Bodies/Bodies_Animal_Airborne.xml
new file mode 100644
index 0000000000..d121af6280
--- /dev/null
+++ b/ModPatches/Android Tiers Reforged/Patches/Android Tiers Reforged/Bodies/Bodies_Animal_Airborne.xml	
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_MechAirborne"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_MechAirborne"]/corePart/parts/li[def="ATR_Framework"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_MechAirborne"]/corePart/parts/li[def="ATR_MechanicalNeck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_MechAirborne"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_MechAirborne"]/corePart/parts/li[def="ATR_MechanicalWing"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_MechAirborne"]/corePart/parts/li[def="ATR_MechanicalPropeller"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_MechAirborne"]/corePart/parts/li[def="ATR_MechanicalPropeller"]/parts/li[def="ATR_CounterWeightTop"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Android Tiers Reforged/Patches/Android Tiers Reforged/Bodies/Bodies_Animal_Bipedal.xml b/ModPatches/Android Tiers Reforged/Patches/Android Tiers Reforged/Bodies/Bodies_Animal_Bipedal.xml
new file mode 100644
index 0000000000..b3a9330b31
--- /dev/null
+++ b/ModPatches/Android Tiers Reforged/Patches/Android Tiers Reforged/Bodies/Bodies_Animal_Bipedal.xml	
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_MechBipedal"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_MechBipedal"]/corePart/parts/li[def="ATR_Framework"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_MechBipedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_MechBipedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_MechBipedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_MechanicalAudioSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_MechBipedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_SmellSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_MechBipedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_MechanicalJaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_MechBipedal"]/corePart/parts/li[def="ATR_MechanicalLeg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_MechBipedal"]/corePart/parts/li[def="ATR_MechanicalLeg"]/parts/li[def="ATR_MechanicalFoot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="ATR_MechBipedal"]//*[
+			def="ATR_MechanicalJaw" or
+			def="ATR_SmellSensor" or
+			def="ATR_MechanicalVisualSensor"]/groups
+		</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Android Tiers Reforged/Patches/Android Tiers Reforged/Bodies/Bodies_Animal_Quadrupedal.xml b/ModPatches/Android Tiers Reforged/Patches/Android Tiers Reforged/Bodies/Bodies_Animal_Quadrupedal.xml
new file mode 100644
index 0000000000..1aef5d8d74
--- /dev/null
+++ b/ModPatches/Android Tiers Reforged/Patches/Android Tiers Reforged/Bodies/Bodies_Animal_Quadrupedal.xml	
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="ATR_MechQuadrupedal"]/corePart/parts/li[12]/parts/li[def="ATR_MechanicalFoot"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="ATR_MechQuadrupedal"]/corePart/parts/li[12]/parts/li[def="ATR_MechanicalFoot"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="ATR_MechQuadrupedal"]/corePart/parts/li[13]/parts/li[def="ATR_MechanicalFoot"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="ATR_MechQuadrupedal"]/corePart/parts/li[13]/parts/li[def="ATR_MechanicalFoot"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_MechQuadrupedal"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_MechQuadrupedal"]/corePart/parts/li[def="ATR_Framework"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_MechQuadrupedal"]/corePart/parts/li[def="ATR_CounterWeightTail"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_MechQuadrupedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_MechQuadrupedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_MechQuadrupedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_MechanicalAudioSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_MechQuadrupedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_SmellSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_MechQuadrupedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_MechanicalJaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_MechQuadrupedal"]/corePart/parts/li[def="ATR_MechanicalLeg"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATR_MechQuadrupedal"]/corePart/parts/li[def="ATR_MechanicalLeg"]/parts/li[def="ATR_MechanicalFoot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="ATR_MechQuadrupedal"]//*[
+			def="ATR_MechanicalJaw" or
+			def="ATR_SmellSensor" or
+			def="ATR_MechanicalVisualSensor"]/groups
+		</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Android Tiers Reforged/Patches/Android Tiers Reforged/Hediffs/Hediffs_Android.xml b/ModPatches/Android Tiers Reforged/Patches/Android Tiers Reforged/Hediffs/Hediffs_Android.xml
new file mode 100644
index 0000000000..465c766f8c
--- /dev/null
+++ b/ModPatches/Android Tiers Reforged/Patches/Android Tiers Reforged/Hediffs/Hediffs_Android.xml	
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ATR_CombatAssistant"]/stages/li/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.25</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ATR_CombatAssistant"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>1.0</ShootingAccuracyPawn>
+			<AimingAccuracy>0.4</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ATR_CombatAssistant"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ATR_PlatingPlasteel"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ATR_PlatingPlasteel"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ATR_CompositePlating"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+			<ArmorRating_Heat>0.1</ArmorRating_Heat>
+			<ArmorRating_Electric>0.1</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ATR_CompositePlating"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ATR_HydraulicFrame"]/stages/li/statOffsets</xpath>
+		<value>
+			<CarryWeight>10</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ATR_MobilityFrame"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.5</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ATR_SuppressorFrame"]/stages/li/statOffsets</xpath>
+		<value>
+			<Suppressability>1</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ATR_MiningArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>drill</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.25</cooldownTime>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ATR_AgriArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>scythe</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.25</cooldownTime>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ATR_PacificationArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>charged fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.0</cooldownTime>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>10</amount>
+						</li>
+						<li>
+							<def>EMP</def>
+							<amount>5</amount>
+						</li>
+					</extraMeleeDamages>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ATR_ScalpelArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>scalpel</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationSharp>1.0</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>scalpel</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.0</cooldownTime>
+					<armorPenetrationSharp>8</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ATR_RendingArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>carver</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>1.25</cooldownTime>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>carver</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>0.75</cooldownTime>
+					<armorPenetrationSharp>20</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>carver</label>
+					<capacities>
+						<li>Demolish</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2.0</cooldownTime>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ATR_MakeshiftMechArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ATR_AdvancedArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.25</cooldownTime>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Android Tiers Reforged/Patches/Android Tiers Reforged/PawnkindDefs/PawnKinds_Android.xml b/ModPatches/Android Tiers Reforged/Patches/Android Tiers Reforged/PawnkindDefs/PawnKinds_Android.xml
new file mode 100644
index 0000000000..993f35fc5b
--- /dev/null
+++ b/ModPatches/Android Tiers Reforged/Patches/Android Tiers Reforged/PawnkindDefs/PawnKinds_Android.xml	
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="ATR_RaiderSoldierT1" or
+			defName="ATR_RaiderSoldierT2" or
+			defName="ATR_AndroidT2Surrogate" or
+			defName="ATR_AndroidT2CollectiveTrader" or
+			defName="ATR_AndroidT1CollectiveSoldier" or
+			defName="ATR_AndroidT2CollectiveSoldier"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>3</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>20</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="ATR_RaiderSoldierT3" or
+			defName="ATR_RaiderSoldierT4" or
+			defName="ATR_AndroidT3Surrogate" or
+			defName="ATR_AndroidT4Surrogate" or
+			defName="ATR_AndroidT3CollectiveSoldier" or
+			defName="ATR_AndroidT4CollectiveSoldier" or
+			defName="ATR_AndroidT4CollectiveLeader"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.25</generateChance>
+						<sidearmMoney>
+							<min>20</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+					<li>
+						<generateChance>0.075</generateChance>
+						<sidearmMoney>
+							<min>80</min>
+							<max>160</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_FlareLauncher</li>
+						</weaponTags>
+						<magazineCount>
+							<min>1</min>
+							<max>1</max>
+						</magazineCount>
+					</li>
+					<li>
+						<generateChance>0.125</generateChance>
+						<sidearmMoney>
+							<min>10</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>GrenadeDestructive</li>
+						</weaponTags>
+						<magazineCount>
+							<min>1</min>
+							<max>1</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Android Tiers Reforged/Patches/Android Tiers Reforged/ScenarioDefs/Scenarios_Androids.xml b/ModPatches/Android Tiers Reforged/Patches/Android Tiers Reforged/ScenarioDefs/Scenarios_Androids.xml
new file mode 100644
index 0000000000..22c16a0b53
--- /dev/null
+++ b/ModPatches/Android Tiers Reforged/Patches/Android Tiers Reforged/ScenarioDefs/Scenarios_Androids.xml	
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Add ammo to scenario === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="ATR_CrashlandedAndroids"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_303British_FMJ</thingDef>
+				<count>100</count>
+			</li>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_44Magnum_FMJ</thingDef>
+				<count>60</count>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Android Tiers Reforged/Patches/Android Tiers Reforged/ThingDef_Misc/Apparel_Packs.xml b/ModPatches/Android Tiers Reforged/Patches/Android Tiers Reforged/ThingDef_Misc/Apparel_Packs.xml
new file mode 100644
index 0000000000..581d042cf7
--- /dev/null
+++ b/ModPatches/Android Tiers Reforged/Patches/Android Tiers Reforged/ThingDef_Misc/Apparel_Packs.xml	
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ATR_Apparel_ScorchPack"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Shoulders</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ATR_Apparel_ScorchPack"]/apparel/layers</xpath>
+		<value>
+			<li>Backpack</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ATR_Apparel_ScorchPack"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Android Tiers Reforged/Patches/Android Tiers Reforged/ThingDef_Races/AlienRace_Androids.xml b/ModPatches/Android Tiers Reforged/Patches/Android Tiers Reforged/ThingDef_Races/AlienRace_Androids.xml
new file mode 100644
index 0000000000..ec569c4b58
--- /dev/null
+++ b/ModPatches/Android Tiers Reforged/Patches/Android Tiers Reforged/ThingDef_Races/AlienRace_Androids.xml	
@@ -0,0 +1,366 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Test for comps-->
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier1Android"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier1Android"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier2Android"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier2Android"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier3Android"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier3Android"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier4Android"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier4Android"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier1Android" or
+			defName="ATR_Tier2Android" or
+			defName="ATR_Tier3Android" or
+			defName="ATR_Tier4Android"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier1Android" or
+			defName="ATR_Tier2Android" or
+			defName="ATR_Tier3Android" or
+			defName="ATR_Tier4Android"
+			]/comps </xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li>
+				<compClass>CombatExtended.CompAmmoGiver</compClass>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier2Android" or
+			defName="ATR_Tier3Android" or
+			defName="ATR_Tier4Android"
+			]/comps </xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<!--T1-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier1Android"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			<MeleeCritChance>0.5</MeleeCritChance>
+			<MeleeParryChance>0.5</MeleeParryChance>
+			<SmokeSensitivity>0.5</SmokeSensitivity>
+			<AimingAccuracy>0.75</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier1Android"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.0</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier1Android"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier1Android"]/race/baseBodySize</xpath>
+		<value>
+			<baseBodySize>0.8</baseBodySize>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier1Android"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>2.14</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.245</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>2.14</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.245</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>5.61</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.40</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--T2-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier2Android"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.8</MeleeDodgeChance>
+			<MeleeCritChance>0.8</MeleeCritChance>
+			<MeleeParryChance>0.8</MeleeParryChance>
+			<Suppressability>0.15</Suppressability>
+			<AimingAccuracy>0.9</AimingAccuracy>
+			<SmokeSensitivity>0.25</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier2Android"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier2Android"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier2Android"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.67</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.67</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier2Android"]/race/baseBodySize</xpath>
+		<value>
+			<baseBodySize>1</baseBodySize>
+		</value>
+	</Operation>
+
+	<!--T3-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier3Android"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency>0.25</NightVisionEfficiency>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1.1</MeleeCritChance>
+			<MeleeParryChance>1.1</MeleeParryChance>
+			<Suppressability>0.2</Suppressability>
+			<SmokeSensitivity>0</SmokeSensitivity>
+			<CarryWeight>45</CarryWeight>
+			<CarryBulk>22.5</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier3Android"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier3Android"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier3Android"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.44</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.44</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.8</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--T4-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier4Android"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency>0.4</NightVisionEfficiency>
+			<AimingAccuracy>1.1</AimingAccuracy>
+			<MeleeDodgeChance>1.2</MeleeDodgeChance>
+			<MeleeCritChance>1.2</MeleeCritChance>
+			<MeleeParryChance>1.2</MeleeParryChance>
+			<Suppressability>0.33</Suppressability>
+			<SmokeSensitivity>0</SmokeSensitivity>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>25</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier4Android"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier4Android"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier4Android"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.11</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.68</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.11</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.68</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Android Tiers Reforged/Patches/Android Tiers Reforged/ThingDef_Races/Races_Animals.xml b/ModPatches/Android Tiers Reforged/Patches/Android Tiers Reforged/ThingDef_Races/Races_Animals.xml
new file mode 100644
index 0000000000..ef05eb0881
--- /dev/null
+++ b/ModPatches/Android Tiers Reforged/Patches/Android Tiers Reforged/ThingDef_Races/Races_Animals.xml	
@@ -0,0 +1,437 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Bodytype-->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ATR_MicroScyther"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ATR_FractalAbomination"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ATR_DroneTORT" or
+			defName="ATR_DroneMineralUnit" or
+			defName="ATR_DroneNutritionUnit" or
+			defName="ATR_DroneWatchdog"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ATR_DroneChemUnit"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Micro Scyther-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ATR_MicroScyther"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.26</MeleeDodgeChance>
+			<MeleeCritChance>0.03</MeleeCritChance>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATR_MicroScyther"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left wing</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.54</cooldownTime>
+					<linkedBodyPartsGroup>ATR_MechanicalLeftWing</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.303</armorPenetrationBlunt>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>right wing</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.54</cooldownTime>
+					<linkedBodyPartsGroup>ATR_MechanicalRightWing</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.303</armorPenetrationBlunt>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.05</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Chemical Processing Unit-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ATR_DroneChemUnit"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.0</MeleeCritChance>
+			<SmokeSensitivity>0.05</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATR_DroneChemUnit"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Abomination -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ATR_FractalAbomination"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.24</MeleeDodgeChance>
+			<MeleeCritChance>0.36</MeleeCritChance>
+			<MeleeParryChance>0.36</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATR_FractalAbomination"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATR_FractalAbomination"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Base melee is exceptionally strong. -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATR_FractalAbomination"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Demolish</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5.625</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Demolish</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5.625</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>2.95</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>fractal lance</label>
+					<capacities>
+						<li>ATR_FractalLance</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.5</cooldownTime>
+					<linkedBodyPartsGroup>Torso</linkedBodyPartsGroup>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+					<chanceFactor>0.025</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Mineral unit -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ATR_DroneMineralUnit"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.08</MeleeDodgeChance>
+			<MeleeCritChance>0.13</MeleeCritChance>
+			<MeleeParryChance>0.18</MeleeParryChance>
+			<SmokeSensitivity>0.05</SmokeSensitivity>
+			<CarryWeight>60</CarryWeight>
+			<CarryBulk>30</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATR_DroneMineralUnit"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Nutrition unit -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ATR_DroneNutritionUnit"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			<MeleeCritChance>0.28</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
+			<SmokeSensitivity>0.05</SmokeSensitivity>
+			<CarryWeight>60</CarryWeight>
+			<CarryBulk>30</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATR_DroneNutritionUnit"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- TORT unit -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ATR_DroneTORT"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.17</MeleeDodgeChance>
+			<MeleeCritChance>0.23</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+			<SmokeSensitivity>0.05</SmokeSensitivity>
+			<CarryWeight>100</CarryWeight>
+			<CarryBulk>50</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATR_DroneTORT"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATR_DroneTORT"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATR_DroneTORT"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATR_DroneTORT"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!-- Watchdog unit -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ATR_DroneWatchdog"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.16</MeleeDodgeChance>
+			<MeleeCritChance>0.21</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+			<SmokeSensitivity>0</SmokeSensitivity>
+			<CarryWeight>60</CarryWeight>
+			<CarryBulk>30</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATR_DroneWatchdog"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATR_DroneWatchdog"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATR_DroneWatchdog"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>26</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.475</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>26</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.475</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.5</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>32</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>12.8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2.5</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Android Tiers Reforged/Patches/Android Tiers Reforged/TraderKindDefs/Android_TraderKinds.xml b/ModPatches/Android Tiers Reforged/Patches/Android Tiers Reforged/TraderKindDefs/Android_TraderKinds.xml
new file mode 100644
index 0000000000..7499a778d4
--- /dev/null
+++ b/ModPatches/Android Tiers Reforged/Patches/Android Tiers Reforged/TraderKindDefs/Android_TraderKinds.xml	
@@ -0,0 +1,320 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Android Base ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="ATR_Base_AndroidCollective_Standard"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>FSX</thingDef>
+				<countRange>
+					<min>25</min>
+					<max>100</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>Prometheum</thingDef>
+				<countRange>
+					<min>25</min>
+					<max>100</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Ammo</tradeTag>
+				<countRange>
+					<min>500</min>
+					<max>2000</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>5</min>
+					<max>9</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_MediumAmmo</tradeTag>
+				<countRange>
+					<min>30</min>
+					<max>100</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>5</min>
+					<max>8</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_HeavyAmmo</tradeTag>
+				<countRange>
+					<min>10</min>
+					<max>50</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>4</min>
+					<max>6</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Category">
+				<categoryDef>Ammo</categoryDef>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>0</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Turret</tradeTag>
+				<thingDefCountRange>
+					<min>-2</min>
+					<max>4</max>
+				</thingDefCountRange>
+				<countRange>
+					<min>1</min>
+					<max>2</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_Category">
+				<categoryDef>WeaponsTurrets</categoryDef>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>0</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Animals">
+				<tradeTagsSell>
+					<li>CE_AnimalBoom</li>
+				</tradeTagsSell>
+				<tradeTagsBuy>
+					<li>CE_AnimalBoom</li>
+				</tradeTagsBuy>
+				<kindCountRange>
+					<min>1</min>
+					<max>2</max>
+				</kindCountRange>
+				<countRange>
+					<min>-2</min>
+					<max>4</max>
+				</countRange>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Andro Caravan ========== -->
+
+	<!-- Pirate Merchant and Bulk Goods ammo -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="ATR_Caravan_AndroidCollective_BulkGoods" or defName="Caravan_AndroidCollective_AndroidMerchant" or defName="Caravan_AndroidCollective_HighTech"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Ammo</tradeTag>
+				<countRange>
+					<min>200</min>
+					<max>400</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>1</min>
+					<max>4</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_MediumAmmo</tradeTag>
+				<countRange>
+					<min>20</min>
+					<max>40</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>2</min>
+					<max>6</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_HeavyAmmo</tradeTag>
+				<countRange>
+					<min>5</min>
+					<max>10</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>2</min>
+					<max>4</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Category">
+				<categoryDef>Ammo</categoryDef>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>0</max>
+				</thingDefCountRange>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="ATR_Caravan_AndroidCollective_BulkGoods"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>FSX</thingDef>
+				<countRange>
+					<min>25</min>
+					<max>65</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>Prometheum</thingDef>
+				<countRange>
+					<min>25</min>
+					<max>65</max>
+				</countRange>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Combat Supplier -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="Caravan_AndroidCollective_CombatSupplier"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>FSX</thingDef>
+				<countRange>
+					<min>15</min>
+					<max>40</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>Prometheum</thingDef>
+				<countRange>
+					<min>15</min>
+					<max>40</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Ammo</tradeTag>
+				<countRange>
+					<min>400</min>
+					<max>1000</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>3</min>
+					<max>8</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_MediumAmmo</tradeTag>
+				<countRange>
+					<min>30</min>
+					<max>60</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>3</min>
+					<max>6</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_HeavyAmmo</tradeTag>
+				<countRange>
+					<min>10</min>
+					<max>15</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>4</min>
+					<max>6</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Category">
+				<categoryDef>Ammo</categoryDef>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>0</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Turret</tradeTag>
+				<thingDefCountRange>
+					<min>-4</min>
+					<max>2</max>
+				</thingDefCountRange>
+				<countRange>
+					<min>1</min>
+					<max>1</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_Category">
+				<categoryDef>WeaponsTurrets</categoryDef>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>0</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Animals">
+				<tradeTagsSell>
+					<li>CE_AnimalBoom</li>
+				</tradeTagsSell>
+				<tradeTagsBuy>
+					<li>CE_AnimalBoom</li>
+				</tradeTagsBuy>
+				<kindCountRange>
+					<min>1</min>
+					<max>1</max>
+				</kindCountRange>
+				<countRange>
+					<min>-1</min>
+					<max>2</max>
+				</countRange>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Orbital Mechanized Trader -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="ATR_Orbital_Mechanized"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Ammo</tradeTag>
+				<countRange>
+					<min>400</min>
+					<max>1000</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>2</min>
+					<max>4</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_MediumAmmo</tradeTag>
+				<countRange>
+					<min>60</min>
+					<max>120</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>4</min>
+					<max>7</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_HeavyAmmo</tradeTag>
+				<countRange>
+					<min>15</min>
+					<max>50</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>2</min>
+					<max>4</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Category">
+				<categoryDef>Ammo</categoryDef>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>0</max>
+				</thingDefCountRange>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Android Tiers SM7 Overhaul/Patches/Android Tiers SM7 Overhaul/AndroidTiersSM7Overhaul_CEPatch.xml b/ModPatches/Android Tiers SM7 Overhaul/Patches/Android Tiers SM7 Overhaul/AndroidTiersSM7Overhaul_CEPatch.xml
new file mode 100644
index 0000000000..90e58c6535
--- /dev/null
+++ b/ModPatches/Android Tiers SM7 Overhaul/Patches/Android Tiers SM7 Overhaul/AndroidTiersSM7Overhaul_CEPatch.xml	
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==========  20mm Rotary Cannon  =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>MechRotaryCannon</defName>
+		<statBases>
+			<SightsEfficiency>1.5</SightsEfficiency>
+			<ShotSpread>0.25</ShotSpread>
+			<SwayFactor>1.32</SwayFactor>
+			<Bulk>35</Bulk>
+			<Mass>42</Mass>
+			<RangedWeapon_Cooldown>0</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_20x102mmNATO_AP</defaultProjectile>
+			<warmupTime>3</warmupTime>
+			<burstShotCount>250</burstShotCount>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<range>64</range>
+			<soundCast>RotaryCannon</soundCast>
+			<soundCastTail>RotaryCannonSpin</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1000</magazineSize>
+			<reloadTime>8</reloadTime>
+			<ammoSet>AmmoSet_20x102mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MechRotaryCannon"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>2.1</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>21</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>45</power>
+					<cooldownTime>2.2</cooldownTime>
+					<armorPenetrationBlunt>21</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>2.5</cooldownTime>
+					<armorPenetrationBlunt>30.24</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Androids Expanded/Patches/Androids Expanded/AlienRace/AlienRace_Droids.xml b/ModPatches/Androids Expanded/Patches/Androids Expanded/AlienRace/AlienRace_Droids.xml
new file mode 100644
index 0000000000..32be5631ea
--- /dev/null
+++ b/ModPatches/Androids Expanded/Patches/Androids Expanded/AlienRace/AlienRace_Droids.xml	
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Comps === -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjSpacerDroid"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjSpacerDroid"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjSpacerBattleDroid"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjSpacerBattleDroid"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjSpacerDroid" or defName="ChjSpacerBattleDroid"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjSpacerDroid" or defName="ChjSpacerBattleDroid"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Worker Droid === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjSpacerDroid"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjSpacerDroid"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjSpacerDroid"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjSpacerDroid"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.11</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.11</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Battle Droid === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjSpacerBattleDroid"]/statBases</xpath>
+		<value>
+			<MeleeCritChance>1.4</MeleeCritChance>
+			<MeleeParryChance>1.5</MeleeParryChance>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjSpacerBattleDroid"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjSpacerBattleDroid"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjSpacerBattleDroid"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left razor-fist</label>
+					<capacities>
+						<li>Cut</li>
+						<li>Stab</li>
+						<li>Blunt</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>1.76</cooldownTime>
+					<linkedBodyPartsGroup>LeftDroidHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>60</armorPenetrationBlunt>
+					<armorPenetrationSharp>24</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right razor-fist</label>
+					<capacities>
+						<li>Cut</li>
+						<li>Stab</li>
+						<li>Blunt</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>1.76</cooldownTime>
+					<linkedBodyPartsGroup>RightDroidHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>60</armorPenetrationBlunt>
+					<armorPenetrationSharp>24</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>lower left razor-fist</label>
+					<capacities>
+						<li>Cut</li>
+						<li>Stab</li>
+						<li>Blunt</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>1.76</cooldownTime>
+					<linkedBodyPartsGroup>LeftDroidHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>60</armorPenetrationBlunt>
+					<armorPenetrationSharp>24</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>lower right razor-fist</label>
+					<capacities>
+						<li>Cut</li>
+						<li>Stab</li>
+						<li>Blunt</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>1.76</cooldownTime>
+					<linkedBodyPartsGroup>LowerRightDroidHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>60</armorPenetrationBlunt>
+					<armorPenetrationSharp>24</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<chanceFactor>0.33</chanceFactor>
+					<cooldownTime>2.52</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Androids Expanded/Patches/Androids Expanded/AlienRace/AlienRace_Drones.xml b/ModPatches/Androids Expanded/Patches/Androids Expanded/AlienRace/AlienRace_Drones.xml
new file mode 100644
index 0000000000..973eef5477
--- /dev/null
+++ b/ModPatches/Androids Expanded/Patches/Androids Expanded/AlienRace/AlienRace_Drones.xml	
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Comps === -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NChefDrone"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NChefDrone"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NEngiDrone"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NEngiDrone"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NMedicDrone"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NMedicDrone"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NChefDrone" or defName="NEngiDrone" or defName="NMedicDrone"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NChefDrone" or defName="NEngiDrone" or defName="NMedicDrone"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Drones === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NChefDrone" or defName="NEngiDrone" or defName="NMedicDrone"
+			]/statBases </xpath>
+		<value>
+			<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			<MeleeCritChance>0.5</MeleeCritChance>
+			<MeleeParryChance>0.5</MeleeParryChance>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+	<!--0.5mm Steel-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NChefDrone" or defName="NEngiDrone" or defName="NMedicDrone"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NChefDrone" or defName="NEngiDrone" or defName="NMedicDrone"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.75</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NChefDrone" or defName="NEngiDrone" or defName="NMedicDrone"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tool strike</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.688</cooldownTime>
+					<linkedBodyPartsGroup>DroneHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.525</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Androids Expanded/Patches/Androids Expanded/Bodies/Bodies_DroidsExpanded.xml b/ModPatches/Androids Expanded/Patches/Androids Expanded/Bodies/Bodies_DroidsExpanded.xml
new file mode 100644
index 0000000000..9eb2cdc6ae
--- /dev/null
+++ b/ModPatches/Androids Expanded/Patches/Androids Expanded/Bodies/Bodies_DroidsExpanded.xml	
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Droid === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="DroidBody"]//*[def="DroidNeck"]</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="DroidBody"]//*[
+			def="Chasis" or
+			def="Head" or
+			def="DroidNeck" or
+			def="Jaw" or
+			def="Frame" or
+			def="LeftDroidShoulder" or
+			def="LeftDroidArm" or
+			def="LeftDroidHand" or
+			def="LeftHandDroidPinky" or
+			def="LeftHandDroidMiddleFinger" or
+			def="LeftHandDroidIndexFinger" or
+			def="LeftHandDroidThumb" or
+			def="RightDroidShoulder" or
+			def="RightDroidArm" or
+			def="RightDroidHand" or
+			def="RightHandDroidPinky" or
+			def="RightHandDroidMiddleFinger" or
+			def="RightHandDroidIndexFinger" or
+			def="RightHandDroidThumb" or
+			def="LeftDroidLeg" or
+			def="LeftDroidFoot" or
+			def="RightDroidLeg" or
+			def="RightDroidFoot"
+			]/groups
+		</xpath>
+
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="DroidBody"]//*[def="LeftDroidShoulder"]/groups
+		</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="DroidBody"]//*[def="LeftDroidArm"]/groups
+		</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="DroidBody"]//*[def="RightDroidShoulder"]/groups
+		</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="DroidBody"]//*[def="RightDroidArm"]/groups
+		</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+
+	<!-- === Wardroid === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="WardroidBody"]//*[def="DroidNeck"]</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[
+			defName="WardroidBody"]//*[
+			def="Chasis" or
+			def="Head" or
+			def="DroidNeck" or
+			def="Jaw" or
+			def="Frame" or
+			def="LeftDroidShoulder" or
+			def="LeftDroidArm" or
+			def="LeftDroidHand" or
+			def="LeftHandDroidPinky" or
+			def="LeftHandDroidMiddleFinger" or
+			def="LeftHandDroidIndexFinger" or
+			def="LeftHandDroidThumb" or
+			def="RightDroidShoulder" or
+			def="RightDroidArm" or
+			def="RightDroidHand" or
+			def="RightHandDroidPinky" or
+			def="RightHandDroidMiddleFinger" or
+			def="RightHandDroidIndexFinger" or
+			def="RightHandDroidThumb" or
+			def="LowerLeftDroidShoulder" or
+			def="LowerLeftDroidArm" or
+			def="LowerLeftDroidHand" or
+			def="LowerLeftHandDroidPinky" or
+			def="LowerLeftHandDroidMiddleFinger" or
+			def="LowerLeftHandDroidIndexFinger" or
+			def="LowerLeftHandDroidThumb" or
+			def="LowerRightDroidShoulder" or
+			def="LowerRightDroidArm" or
+			def="LowerRightDroidHand" or
+			def="LowerRightHandDroidPinky" or
+			def="LowerRightHandDroidMiddleFinger" or
+			def="LowerRightHandDroidIndexFinger" or
+			def="LowerRightHandDroidThumb" or
+			def="LeftDroidLeg" or
+			def="LeftDroidFoot" or
+			def="RightDroidLeg" or
+			def="RightDroidFoot"
+			]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="WardroidBody"]//*[def="LeftDroidShoulder"]/groups</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="WardroidBody"]//*[def="LeftDroidArm"]/groups</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="WardroidBody"]//*[def="RightDroidShoulder"]/groups</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="DroidBody"]//*[def="RightDroidArm"]/groups</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+
+	<!-- === Drone Body === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="DroneBody"]//*[def="DroneNeck"]</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[
+			defName="DroneBody"]//*[
+			def="DroneShell" or
+			def="DroneNeck" or
+			def="DroneHead" or
+			def="DroneShoulder" or
+			def="DroneArm" or
+			def="DroneHand" or
+			def="LeftDroneLeg" or
+			def="LeftDroneFoot" or
+			def="RightDroneLeg" or
+			def="RightDroneFoot"
+			]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Androids/Patches/Androids/AlienRace/AlienRace_Chj.xml b/ModPatches/Androids/Patches/Androids/AlienRace/AlienRace_Chj.xml
new file mode 100644
index 0000000000..194bcadc10
--- /dev/null
+++ b/ModPatches/Androids/Patches/Androids/AlienRace/AlienRace_Chj.xml
@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Test for comps-->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjAndroid"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjAndroid"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjDroid"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjDroid"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjBattleDroid"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjBattleDroid"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjAndroid" or
+			defName="ChjDroid" or
+			defName="ChjBattleDroid"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjAndroid" or
+			defName="ChjDroid" or
+			defName="ChjBattleDroid"
+			]/comps </xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+		</value>
+	</Operation>
+
+	<!--These androids are pretty much printed humans functionally-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjAndroid"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<!--Android-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjAndroid"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>1</Suppressability>
+			<SmokeSensitivity>0.5</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!--Slighly lighter weight attacks-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjAndroid"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.19</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.19</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.24</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_ChJAndroid"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.02</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<!--Worker Droid-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjDroid"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.95</MeleeDodgeChance>
+			<MeleeCritChance>0.95</MeleeCritChance>
+			<MeleeParryChance>0.95</MeleeParryChance>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+	<!--2mm Steel-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjDroid"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjDroid"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjDroid"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.58</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.16</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.58</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.16</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Battledroid-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjBattleDroid"]/statBases</xpath>
+		<value>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+	<!--8mm Steel-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjBattleDroid"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjBattleDroid"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjBattleDroid"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left bladed fist</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.49</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.44</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.32</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>right bladed fist</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.49</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.44</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.32</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>5.05</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjBattleDroid"]/alienRace/raceRestriction/whiteApparelList</xpath>
+		<value>
+			<li>CE_Apparel_TacVest</li>
+			<li>CE_Apparel_Backpack</li>
+			<li>CE_Apparel_TribalBackpack</li>
+			<li>CE_Apparel_BallisticShield</li>
+			<li>CE_Apparel_MeleeShield</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Androids/Patches/Androids/Bodies/Mod_Bodies_Droid.xml b/ModPatches/Androids/Patches/Androids/Bodies/Mod_Bodies_Droid.xml
new file mode 100644
index 0000000000..7903a69748
--- /dev/null
+++ b/ModPatches/Androids/Patches/Androids/Bodies/Mod_Bodies_Droid.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Patch ChJDroid Bodytype-->
+
+	<!--Arm Groups-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ChJDroid"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ChJDroid"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ChJDroid"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ChJDroid"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<!--Natural Armor-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ChJDroid"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ChJDroid"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ChJDroid"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ChJDroid"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ChJDroid"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ChJDroid"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ChJDroid"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ChJDroid"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ChJDroid"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ChJDroid"]/corePart/parts/li[def="Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ChJDroid"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ChJDroid"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Androids/Patches/Androids/HediffDefs/Hediffs_Upgrades.xml b/ModPatches/Androids/Patches/Androids/HediffDefs/Hediffs_Upgrades.xml
new file mode 100644
index 0000000000..befb661717
--- /dev/null
+++ b/ModPatches/Androids/Patches/Androids/HediffDefs/Hediffs_Upgrades.xml
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Core Modules-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_DroneCore"]/stages/li/statOffsets</xpath>
+		<value>
+			<Suppressability>-5</Suppressability>
+		</value>
+	</Operation>
+
+	<!--==========Physique Upgrades==========-->
+
+	<!--Hulking-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_Hulking"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_Hulking"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_Hulking"]/stages/li/statOffsets</xpath>
+		<value>
+			<CarryWeight>40</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_Hulking"]/stages/li/statOffsets</xpath>
+		<value>
+			<CarryBulk>20</CarryBulk>
+		</value>
+	</Operation>
+
+	<!--Agile-->
+
+	<!--Provides same melee dodge as combat upgrade below-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_Agile"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.2625</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!--Perfect-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_Super"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_Super"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Provides half melee dodge of combat upgrade-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_Super"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.13125</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_Super"]/stages/li/statOffsets</xpath>
+		<value>
+			<CarryWeight>25</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_Super"]/stages/li/statOffsets</xpath>
+		<value>
+			<CarryBulk>10</CarryBulk>
+		</value>
+	</Operation>
+
+	<!--==========Skin Modules==========-->
+
+	<!--Hyperweave, 1.5mm;Heat resistance unadjusted-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_HyperweaveSkin"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_HyperweaveSkin"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2.25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Plasteel, 1.5mm;Heat resistance unadjusted-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_PlasteelSkin"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_PlasteelSkin"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Dragonscale-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_DragonScales"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_DragonScales"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_DragonScales"]/stages/li/statOffsets</xpath>
+		<value>
+			<Flammability>-1</Flammability>
+		</value>
+	</Operation>
+
+	<!--==========Upgrade Modules==========-->
+
+	<!--Fighter-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_FighterModule"]/stages/li/statOffsets</xpath>
+		<value>
+			<Suppressability>-5</Suppressability>
+		</value>
+	</Operation>
+
+	<!--Splitting up the bonuses to melee/ranged into CE subcatergories. 15 levels of skill worth of bonus-->
+
+	<!--Shooting-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_FighterModule"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>3</ShootingAccuracyPawn>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_FighterModule"]/stages/li/statOffsets</xpath>
+		<value>
+			<AimingAccuracy>1.5</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_FighterModule"]/stages/li/statOffsets</xpath>
+		<value>
+			<ReloadSpeed>0.35</ReloadSpeed>
+		</value>
+	</Operation>
+
+	<!--Melee-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_FighterModule"]/stages/li/statOffsets/MeleeHitChance</xpath>
+		<value>
+			<MeleeHitChance>15</MeleeHitChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_FighterModule"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.2625</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_FighterModule"]/stages/li/statOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.15</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_FighterModule"]/stages/li/statOffsets</xpath>
+		<value>
+			<MeleeParryChance>0.1875</MeleeParryChance>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Androids/Patches/Androids/PawnkindDefs/PawnKinds.xml b/ModPatches/Androids/Patches/Androids/PawnkindDefs/PawnKinds.xml
new file mode 100644
index 0000000000..be734bc95a
--- /dev/null
+++ b/ModPatches/Androids/Patches/Androids/PawnkindDefs/PawnKinds.xml
@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="ChjAndroidVillager"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>1</min>
+					<max>2</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>20</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="ChjAndroidTownGuard"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>20</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="ChjAndroidGrenadierDestructive"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>10</min>
+					<max>30</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>200</min>
+					<max>600</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>150</min>
+						<max>350</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Melee</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="ChjAndroidGrenadierEMP"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>10</min>
+					<max>30</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>200</min>
+					<max>600</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>150</min>
+						<max>350</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Melee</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="ChjAndroidMercenaryGunner"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>200</min>
+					<max>600</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.8</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>60</min>
+							<max>150</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="ChjAndroidMercenarySniper"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>1</generateChance>
+						<sidearmMoney>
+							<min>60</min>
+							<max>150</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>60</min>
+							<max>150</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="ChjAndroidMercenaryHeavy"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>1</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>150</min>
+						<max>350</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_SMG</li>
+					</weaponTags>
+					<magazineCount>
+						<min>0</min>
+						<max>1</max>
+					</magazineCount>
+				</forcedSidearm>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>60</min>
+							<max>150</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="ChjAndroidMercenarySlasher"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.9</shieldChance>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Androids/Patches/Androids/ScenarioDefs/ScenarioDefs.xml b/ModPatches/Androids/Patches/Androids/ScenarioDefs/ScenarioDefs.xml
new file mode 100644
index 0000000000..8b67f71c71
--- /dev/null
+++ b/ModPatches/Androids/Patches/Androids/ScenarioDefs/ScenarioDefs.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Add ammo to scenarioes-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="ChJAndroidResistance"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_6x24mmCharged</thingDef>
+				<count>150</count>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="ChjAndroidRunner"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_6x24mmCharged</thingDef>
+				<count>100</count>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="ChjAndroidTheMechanist"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_762x54mmR_FMJ</thingDef>
+				<count>141</count>
+			</li>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_12Gauge_Buck</thingDef>
+				<count>48</count>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Replace minigun-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ScenarioDef[defName="ChjAndroidTheMechanist"]/scenario/parts/li[thingDef="Gun_Minigun"]</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Gun_LMG</thingDef>
+				<count>1</count>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Androids/Patches/Androids/ThingDefs_Misc/Apparel.xml b/ModPatches/Androids/Patches/Androids/ThingDefs_Misc/Apparel.xml
new file mode 100644
index 0000000000..2c3220b16d
--- /dev/null
+++ b/ModPatches/Androids/Patches/Androids/ThingDefs_Misc/Apparel.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ===================== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ChjAndroidMaidOutfit"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ChjAndroidMaidOutfit"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ChjAndroid_SolarDuster"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ChjAndroid_SolarDuster"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<!--1mm Plasteel, 2mm Devilstrand-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ChjAndroidMaidBattleDress"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ChjAndroidMaidBattleDress"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3.2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ChjAndroidMaidBattleDress"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ChjAndroidMaidBattleDress"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>7</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ChjAndroidBattleMaidHat"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ChjAndroidBattleMaidHat"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3.2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ChjAndroidBattleMaidHat"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ChjAndroidBattleMaidHat"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Androids/Patches/Androids/ThingDefs_Misc/Weapons_Guns.xml b/ModPatches/Androids/Patches/Androids/ThingDefs_Misc/Weapons_Guns.xml
new file mode 100644
index 0000000000..a5687a56cd
--- /dev/null
+++ b/ModPatches/Androids/Patches/Androids/ThingDefs_Misc/Weapons_Guns.xml
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==========  Core Blaster =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_ChjCoreLauncher</defName>
+		<statBases>
+			<SightsEfficiency>2.18</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.72</SwayFactor>
+			<Bulk>12</Bulk>
+			<Mass>22.5</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>2.31</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_30x64mmFuel_Incendiary</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<minRange>2.5</minRange>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>30</ticksBetweenBurstShots>
+			<range>44</range>
+			<soundCast>Shot_IncendiaryLauncher</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>28</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>18</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_30x64mmFuel</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_ChjCoreLauncher"]/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>
+
+	<!-- ==========  Rebel Guns  =========== -->
+	<!--Early access to charge guns, but low spec-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ChjAndroidGun_RebelRifle</defName>
+		<statBases>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.51</SwayFactor>
+			<Bulk>10.50</Bulk>
+			<Mass>4.60</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>40</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>18</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ChjAndroidGun_RebelRifle"]/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="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ChjAndroidGun_Rebelpistol</defName>
+		<statBases>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.40</SwayFactor>
+			<Bulk>3.00</Bulk>
+			<Mass>1.20</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>9</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ChjAndroidGun_Rebelpistol"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Anima Animals - Community Temp/Patches/Anima Animals - Community Temp/AnimaAnimalsResources_Leathers.xml b/ModPatches/Anima Animals - Community Temp/Patches/Anima Animals - Community Temp/AnimaAnimalsResources_Leathers.xml
new file mode 100644
index 0000000000..60cbf97a33
--- /dev/null
+++ b/ModPatches/Anima Animals - Community Temp/Patches/Anima Animals - Community Temp/AnimaAnimalsResources_Leathers.xml	
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Anima Thrumbofur -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_AnimaThrumbo"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.95</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_AnimaThrumbo"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.15</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Anima Warg -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_OPAnimaWarg"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.075</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Leather_OPAnimaWarg"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.06</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Anima Bear -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_AnimaBear"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.09</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_AnimaBear"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.076</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Anima Wool -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoolAnimaYak"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.02</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoolAnimaYak"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.064</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Anima Animals - Community Temp/Patches/Anima Animals - Community Temp/AnimaWeapons.xml b/ModPatches/Anima Animals - Community Temp/Patches/Anima Animals - Community Temp/AnimaWeapons.xml
new file mode 100644
index 0000000000..87150a3203
--- /dev/null
+++ b/ModPatches/Anima Animals - Community Temp/Patches/Anima Animals - Community Temp/AnimaWeapons.xml	
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Anima Thrumbo Horn -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="AnimaThrumboHorn"]/tools</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="AnimaThrumboHorn"]/equippedStatOffsets</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="AnimaThrumboHorn"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>ResourceBase</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AnimaThrumboHorn"]/statBases/Mass</xpath>
+		<value>
+			<Mass>50</Mass>
+			<Bulk>25</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AnimaThrumboHorn"]/description</xpath>
+		<value>
+			<description>An anima thrumbo's horn. It's razor-sharp, rock-hard. This is a true trophy.</description>
+		</value>
+	</Operation>
+
+	<!-- ========== Anima Warg Fang / Razorfang Knife ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AnimaWargFang"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.18</cooldownTime>
+					<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.28</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.26</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.38</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_RazorfangKnife"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.18</cooldownTime>
+					<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.36</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.26</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.48</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AnimaWargFang" or defName="MeleeWeapon_RazorfangKnife"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AnimaWargFang" or defName="MeleeWeapon_RazorfangKnife"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.5</MeleeCritChance>
+				<MeleeParryChance>0.15</MeleeParryChance>
+				<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AnimaWargFang" or defName="MeleeWeapon_RazorfangKnife"]</xpath>
+		<value>
+			<weaponTags>
+				<li>CE_Sidearm_Melee</li>
+				<li>CE_OneHandedWeapon</li>
+			</weaponTags>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Anima Animals - Community Temp/Patches/Anima Animals - Community Temp/ThingDefs_AnimaCreatures.xml b/ModPatches/Anima Animals - Community Temp/Patches/Anima Animals - Community Temp/ThingDefs_AnimaCreatures.xml
new file mode 100644
index 0000000000..b386576d3c
--- /dev/null
+++ b/ModPatches/Anima Animals - Community Temp/Patches/Anima Animals - Community Temp/ThingDefs_AnimaCreatures.xml	
@@ -0,0 +1,653 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== AnimaThrumbo ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AnimaThrumbo"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.09</MeleeDodgeChance>
+			<MeleeCritChance>0.76</MeleeCritChance>
+			<MeleeParryChance>0.45</MeleeParryChance>
+			<Flammability>0.6</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AnimaThrumbo"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>24</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AnimaThrumbo"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AnimaThrumbo"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.7</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AnimaThrumbo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>anima horn</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>49</power>
+					<cooldownTime>2.52</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.85</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>46</power>
+					<cooldownTime>2.52</cooldownTime>
+					<chanceFactor>0.65</chanceFactor>
+					<linkedBodyPartsGroup>HornAttackTool_2</linkedBodyPartsGroup>
+					<armorPenetrationSharp>11</armorPenetrationSharp>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>2.33</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8.840</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>2.33</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8.840</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.62</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.216</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>2.52</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AnimaThrumbo"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="AnimaThrumbo"]/combatPower</xpath>
+		<value>
+			<combatPower>500</combatPower>
+		</value>
+	</Operation>
+
+	<!-- ========== AnimaWarg ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AnimaWarg"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AnimaWarg"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>7</MoveSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AnimaWarg"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>0.085</ArmorRating_Blunt>
+			<ArmorRating_Sharp>0.065</ArmorRating_Sharp>
+			<MeleeDodgeChance>0.21</MeleeDodgeChance>
+			<MeleeCritChance>0.20</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AnimaWarg"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.19</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>24</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>2.450</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.95</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.19</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>24</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>2.450</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.95</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>1.46</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>24</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<chanceFactor>2</chanceFactor>
+					<armorPenetrationSharp>1.05</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.263</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>3.2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.425</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AnimaWarg"]/race/wildness</xpath>
+		<value>
+			<wildness>0.3</wildness>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="AnimaWarg"]/combatPower</xpath>
+		<value>
+			<combatPower>160</combatPower>
+		</value>
+	</Operation>
+
+	<!-- ========== Anima Bear ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AnimaBear"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AnimaBear"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>5.7</MoveSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AnimaBear"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.17</MeleeDodgeChance>
+			<MeleeCritChance>0.19</MeleeCritChance>
+			<MeleeParryChance>0.17</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="AnimaBear"]/tools</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AnimaBear"]/race/wildness</xpath>
+		<value>
+			<wildness>0.6</wildness>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="AnimaBear"]/combatPower</xpath>
+		<value>
+			<combatPower>170</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AnimaBear"]</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.41</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>24</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.35</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.85</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.41</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>24</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.35</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.85</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>34</power>
+					<cooldownTime>2.05</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>26</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.05</armorPenetrationSharp>
+					<armorPenetrationBlunt>8.850</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>2.22</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>4.435</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== AnimaYak ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AnimaYak"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>5</MoveSpeed>
+			<MeleeDodgeChance>0.11</MeleeDodgeChance>
+			<MeleeCritChance>0.21</MeleeCritChance>
+			<MeleeParryChance>0.20</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AnimaYak"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.66</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.85</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>horns</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.05</cooldownTime>
+					<restrictedGender>Female</restrictedGender>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.95</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>horns</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>2.05</cooldownTime>
+					<restrictedGender>Male</restrictedGender>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.85</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AnimaYak"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="AnimaYak"]/combatPower</xpath>
+		<value>
+			<combatPower>75</combatPower>
+		</value>
+	</Operation>
+
+	<!-- ========== Anima Muffalo ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AnimaMuffalo"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>5</MoveSpeed>
+			<MeleeDodgeChance>0.14</MeleeDodgeChance>
+			<MeleeCritChance>0.32</MeleeCritChance>
+			<MeleeParryChance>0.24</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AnimaMuffalo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>3.17</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AnimaMuffalo"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Anima Fox ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AnimaFox"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AnimaFox"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.28</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+			<MeleeParryChance>0.02</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AnimaFox"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.91</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.20</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.91</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.20</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.49</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>1.640</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Anima Megaspider ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AnimaMegaspider"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4.5</MoveSpeed>
+			<MeleeDodgeChance>0.07</MeleeDodgeChance>
+			<MeleeCritChance>0.31</MeleeCritChance>
+			<MeleeParryChance>0.17</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AnimaMegaspider"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>42</armorPenetrationSharp>
+					<armorPenetrationBlunt>23</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>45</power>
+					<cooldownTime>2.48</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>7.85</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationSharp>42</armorPenetrationSharp>
+					<armorPenetrationBlunt>24</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AnimaMegaspider"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AnimaMegaspider"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AnimaMegaspider"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>1.8</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AnimaMegaspider"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>750</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Anima Bionics/Patches/Anima Bionics/Hediffs_Anima_Bionics.xml b/ModPatches/Anima Bionics/Patches/Anima Bionics/Hediffs_Anima_Bionics.xml
new file mode 100644
index 0000000000..085296a7ea
--- /dev/null
+++ b/ModPatches/Anima Bionics/Patches/Anima Bionics/Hediffs_Anima_Bionics.xml	
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ===== V1 ===== -->
+
+	<!-- Anima War Arm -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AnimaWarArmHeddiff"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Scythe</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.29</cooldownTime>
+					<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.76</armorPenetrationSharp>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ===== V2 ===== -->
+
+	<!-- ===== V3 ===== -->
+
+	<!-- Anima Plate -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AnimaPlateHediff"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AnimaPlateHediff"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Anima Spine -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="AnimaspineHediff"]/stages/li/statOffsets</xpath>
+		<value>
+			<CarryWeight>10</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AnimaspineHediff"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AnimaspineHediff"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Anima Gear/Patches/Anima Gear/AnimaGear_Apparel.xml b/ModPatches/Anima Gear/Patches/Anima Gear/AnimaGear_Apparel.xml
new file mode 100644
index 0000000000..b7df601566
--- /dev/null
+++ b/ModPatches/Anima Gear/Patches/Anima Gear/AnimaGear_Apparel.xml	
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Anima Tribalwear -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_AnimaTribal"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_AnimaTribal"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>0.03</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_AnimaTribal"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>0.045</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Anima Crown -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_AnimaCrown"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_AnimaCrown"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_AnimaCrown"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Anima War Mask & Veil -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_AnimaWarMask" or defName="Apparel_AnimaWarVeil"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_AnimaWarMask" or defName="Apparel_AnimaWarVeil"]/equippedStatOffsets</xpath>
+		<value>
+			<Suppressability>-0.25</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_AnimaWarMask"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_AnimaWarMask"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_AnimaWarVeil"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.01</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_AnimaWarVeil"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>0.015</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Anima Gear/Patches/Anima Gear/AnimaGear_Resources.xml b/ModPatches/Anima Gear/Patches/Anima Gear/AnimaGear_Resources.xml
new file mode 100644
index 0000000000..34b66864c7
--- /dev/null
+++ b/ModPatches/Anima Gear/Patches/Anima Gear/AnimaGear_Resources.xml	
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Anima Fiber, has the same base stats as cloth. -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AnimaFiber"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.01</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AnimaFiber"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.015</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AnimaFiber"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.044</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Anima Gear/Patches/Anima Gear/PsychicWeapons.xml b/ModPatches/Anima Gear/Patches/Anima Gear/PsychicWeapons.xml
new file mode 100644
index 0000000000..75920dfda4
--- /dev/null
+++ b/ModPatches/Anima Gear/Patches/Anima Gear/PsychicWeapons.xml	
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Anima Staff ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_AnimaStaff"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.85</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>1.69</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_AnimaStaff"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>0.93</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_AnimaStaff"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>1.00</MeleeCritChance>
+			<MeleeParryChance>0.70</MeleeParryChance>
+			<MeleeDodgeChance>0.47</MeleeDodgeChance>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Animal Armor - Vanilla/Patches/Animal Armor - Vanilla/ThingDefs_Apparel.xml b/ModPatches/Animal Armor - Vanilla/Patches/Animal Armor - Vanilla/ThingDefs_Apparel.xml
new file mode 100644
index 0000000000..93c9ab9646
--- /dev/null
+++ b/ModPatches/Animal Armor - Vanilla/Patches/Animal Armor - Vanilla/ThingDefs_Apparel.xml	
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Scarf === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_AnimalScarf"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Apparel_AnimalScarf"]/statBases/ArmorRating_Sharp</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_AnimalScarf"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- === Animal Clothing === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_AnimalClothes"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>4</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_AnimalClothes"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>12</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- === Bridle and Howdah === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_bridle" or defName="Apparel_Howdah"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>25</CarryWeight>
+				<CarryBulk>15</CarryBulk>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_bridle" or defName="Apparel_Howdah"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>4</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_bridle" or defName="Apparel_Howdah"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>15</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- === Plate Armor === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_AnimalPlateArmor"]/statBases</xpath>
+		<value>
+			<Bulk>35</Bulk>
+			<WornBulk>7</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_AnimalPlateArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- === Simple Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_AnimalPlateHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_AnimalPlateHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- === Flak Armor === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_AnimalFlakArmor"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_AnimalFlakArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_AnimalFlakArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Advanced Helmet === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_AnimalAdvancedHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_AnimalAdvancedHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- === Power Armor === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_AnimalPowerArmor"]/statBases</xpath>
+		<value>
+			<Bulk>50</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_AnimalPowerArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_AnimalPowerArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_AnimalPowerArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<CarryWeight>60</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<!-- === Power Armor Helmet === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_AnimalPowerArmorHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_AnimalPowerArmorHelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_AnimalPowerArmorHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>240</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_AnimalPowerArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_AnimalPowerArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Apparel_AnimalPowerArmorHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Apparel_AnimalPowerArmorHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_AnimalPowerArmorHelmet"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Animal Equipment/Patches/Animal Equipment/Apparel_Accessories.xml b/ModPatches/Animal Equipment/Patches/Animal Equipment/Apparel_Accessories.xml
new file mode 100644
index 0000000000..6f5c059514
--- /dev/null
+++ b/ModPatches/Animal Equipment/Patches/Animal Equipment/Apparel_Accessories.xml	
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Scarf -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="AnimalScarfBase"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="AnimalScarfBase"]/statBases/ArmorRating_Sharp</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="AnimalScarfBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Animal Equipment/Patches/Animal Equipment/Apparel_Clothing.xml b/ModPatches/Animal Equipment/Patches/Animal Equipment/Apparel_Clothing.xml
new file mode 100644
index 0000000000..0c7423d4e5
--- /dev/null
+++ b/ModPatches/Animal Equipment/Patches/Animal Equipment/Apparel_Clothing.xml	
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Clothes -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="AnimalClothesBase"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="AnimalClothesBase"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Animal Equipment/Patches/Animal Equipment/Apparel_Flak.xml b/ModPatches/Animal Equipment/Patches/Animal Equipment/Apparel_Flak.xml
new file mode 100644
index 0000000000..50a0b3c100
--- /dev/null
+++ b/ModPatches/Animal Equipment/Patches/Animal Equipment/Apparel_Flak.xml	
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Flak Armor -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="AnimalFlakArmorBase"]/equippedStatOffsets</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="AnimalFlakArmorBase"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="AnimalFlakArmorBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="AnimalFlakArmorBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>18</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SmallAnimalFlakArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>100</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_LargeAnimalFlakArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>150</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SmallAnimalFlakArmor"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>60</Steel>
+				<DevilstrandCloth>20</DevilstrandCloth>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_LargeAnimalFlakArmor"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>75</Steel>
+				<DevilstrandCloth>30</DevilstrandCloth>
+			</costList>
+		</value>
+	</Operation>
+
+	<!-- Flak Helmet -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="AnimalFlakHelmBase"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="AnimalFlakHelmBase"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+			<ArmorRating_Blunt>15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Apparel_SmallAnimalAdvancedHelmet" or defName="Apparel_LargeAnimalAdvancedHelmet"]/costStuffCount</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="AnimalFlakHelmBase"]/stuffCategories</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SmallAnimalAdvancedHelmet"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>25</Steel>
+				<DevilstrandCloth>10</DevilstrandCloth>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_LargeAnimalAdvancedHelmet"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>40</Steel>
+				<DevilstrandCloth>20</DevilstrandCloth>
+			</costList>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Animal Equipment/Patches/Animal Equipment/Apparel_Plate.xml b/ModPatches/Animal Equipment/Patches/Animal Equipment/Apparel_Plate.xml
new file mode 100644
index 0000000000..c106197cc3
--- /dev/null
+++ b/ModPatches/Animal Equipment/Patches/Animal Equipment/Apparel_Plate.xml	
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Plate Armor -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="AnimalPlateArmorBase"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeDodgeChance>-0.1</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="AnimalPlateArmorBase"]/statBases</xpath>
+		<value>
+			<Bulk>35</Bulk>
+			<WornBulk>7</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="AnimalPlateArmorBase"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Plate Helmet -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="AnimalPlateHelmBase"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeHitChance>-1.0</MeleeHitChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="AnimalPlateHelmBase"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="AnimalPlateHelmBase"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Animal Equipment/Patches/Animal Equipment/Apparel_Riding.xml b/ModPatches/Animal Equipment/Patches/Animal Equipment/Apparel_Riding.xml
new file mode 100644
index 0000000000..647243696e
--- /dev/null
+++ b/ModPatches/Animal Equipment/Patches/Animal Equipment/Apparel_Riding.xml	
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Riding Gear -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_bridle"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>25</CarryWeight>
+				<CarryBulk>15</CarryBulk>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_bridle"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_bridle"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Animal Equipment/Patches/Animal Equipment/Apparel_Spacer.xml b/ModPatches/Animal Equipment/Patches/Animal Equipment/Apparel_Spacer.xml
new file mode 100644
index 0000000000..c5a6717428
--- /dev/null
+++ b/ModPatches/Animal Equipment/Patches/Animal Equipment/Apparel_Spacer.xml	
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Power Armor -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="AnimalSpacerArmorBase"]/statBases</xpath>
+		<value>
+			<Bulk>50</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="AnimalSpacerArmorBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="AnimalSpacerArmorBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="AnimalSpacerArmorBase"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<CarryWeight>60</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SmallAnimalPowerArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>450</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_LargeAnimalPowerArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>550</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_SmallAnimalPowerArmor"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>30</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_LargeAnimalPowerArmor"]/costList/Plasteel</xpath>
+		<value>
+			<DevilstrandCloth>60</DevilstrandCloth>
+			<Plasteel>150</Plasteel>
+		</value>
+	</Operation>
+
+	<!-- Power Helm -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="AnimalSpacerHelmBase"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="AnimalSpacerHelmBase"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="AnimalSpacerHelmBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="AnimalSpacerHelmBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[@Name="AnimalSpacerHelmBase"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[@Name="AnimalSpacerHelmBase"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="AnimalSpacerHelmBase"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SmallAnimalPowerArmorHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>220</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_LargeAnimalPowerArmorHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>260</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SmallAnimalPowerArmorHelmet"]/costList/Plasteel</xpath>
+		<value>
+			<DevilstrandCloth>10</DevilstrandCloth>
+			<Plasteel>50</Plasteel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_LargeAnimalPowerArmorHelmet"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>30</DevilstrandCloth>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Animal Equipment/Patches/Animal Equipment/Apparel_VEF.xml b/ModPatches/Animal Equipment/Patches/Animal Equipment/Apparel_VEF.xml
new file mode 100644
index 0000000000..15d56f8559
--- /dev/null
+++ b/ModPatches/Animal Equipment/Patches/Animal Equipment/Apparel_VEF.xml	
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Expanded Framework</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="Apparel_AnimalReins"]</xpath>
+					<value>
+						<equippedStatOffsets>
+							<CarryWeight>25</CarryWeight>
+							<CarryBulk>15</CarryBulk>
+						</equippedStatOffsets>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="Apparel_AnimalReins"]/statBases</xpath>
+					<value>
+						<Bulk>6</Bulk>
+						<WornBulk>2</WornBulk>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Apparel_AnimalReins"]/statBases/StuffEffectMultiplierArmor</xpath>
+					<value>
+						<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Apparel_AnimalFlakArmor"]/statBases/MaxHitPoints</xpath>
+					<value>
+						<MaxHitPoints>110</MaxHitPoints>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Apparel_AnimalFlakArmor"]/costList</xpath>
+					<value>
+						<costList>
+							<Steel>65</Steel>
+							<DevilstrandCloth>25</DevilstrandCloth>
+						</costList>
+					</value>
+				</li>
+
+				<li Class="PatchOperationRemove">
+					<xpath>Defs/ThingDef[defName="Apparel_AnimalAdvancedHelmet"]/costStuffCount</xpath>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Apparel_AnimalAdvancedHelmet"]/costList</xpath>
+					<value>
+						<costList>
+							<Steel>30</Steel>
+							<DevilstrandCloth>15</DevilstrandCloth>
+						</costList>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Apparel_AnimalPowerArmor"]/statBases/MaxHitPoints</xpath>
+					<value>
+						<MaxHitPoints>500</MaxHitPoints>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="Apparel_AnimalPowerArmor"]/costList</xpath>
+					<value>
+						<DevilstrandCloth>40</DevilstrandCloth>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Apparel_AnimalPowerArmorHelmet"]/statBases/MaxHitPoints</xpath>
+					<value>
+						<MaxHitPoints>240</MaxHitPoints>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Apparel_AnimalPowerArmorHelmet"]/costList/Plasteel</xpath>
+					<value>
+						<DevilstrandCloth>15</DevilstrandCloth>
+						<Plasteel>60</Plasteel>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj-VanillaStyle_CE_Patch_StuffRebalance.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj-VanillaStyle_CE_Patch_StuffRebalance.xml
new file mode 100644
index 0000000000..860c9f8261
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj-VanillaStyle_CE_Patch_StuffRebalance.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Clear these out all at once so we can just replace them easily -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="Leather_ACP" or
+			defName="ACPFerretSilk" or
+			defName="ACPBDireWolfWool" or
+			defName="ACPSpidersilk" or
+			defName="ACPLlamaWool" or
+			@Name="WoolBaseACP"
+			]/statBases/StuffPower_Armor_Sharp |
+			Defs/ThingDef[
+			defName="Leather_ACP" or
+			defName="ACPFerretSilk" or
+			defName="ACPBDireWolfWool" or
+			defName="ACPSpidersilk" or
+			defName="ACPLlamaWool" or
+			@Name="WoolBaseACP"
+			]/statBases/StuffPower_Armor_Blunt </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Leather_ACP"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.33</StuffPower_Armor_Sharp>
+			<StuffPower_Armor_Blunt>0.165</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPFerretSilk"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.25</StuffPower_Armor_Sharp>
+			<StuffPower_Armor_Blunt>0.12</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPBDireWolfWool"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.35</StuffPower_Armor_Sharp>
+			<StuffPower_Armor_Blunt>0.17</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPSpidersilk"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.30</StuffPower_Armor_Sharp>
+			<StuffPower_Armor_Blunt>0.14</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPLlamaWool"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.20</StuffPower_Armor_Sharp>
+			<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="WoolBaseACP"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.044</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_AddClass.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_AddClass.xml
new file mode 100644
index 0000000000..24b9b076db
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_AddClass.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/ThingDef[
+			defName="ACPBlackRhinoceros" or
+			defName="ACPBlackwolf" or
+			defName="ACPDirewolf" or
+			defName="ACPHippopotamus" or
+			defName="ACPHorse" or
+			defName="ACPLlama" or
+			defName="ACPMajoreraGoat" or
+			defName="ACPPeccary" or
+			defName="ACPSpiritwolf" or
+			defName="ACPSpiritwolfFF" or
+			defName="ACPTapir" or
+			defName="ACPWildDog" or
+			defName="ACPWoolyHorse" or
+			defName="ACPWoolyRhino"
+			]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/ThingDef[
+			defName="ACPAcidAnt" or
+			defName="ACPAngoraRabbit" or
+			defName="ACPChipmunk" or
+			defName="ACPDuckBilledPlatypus" or
+			defName="ACPDomesticRabbit" or
+			defName="ACPErmine" or
+			defName="ACPFerret" or
+			defName="ACPFishercat" or
+			defName="ACPHaulerAnt" or
+			defName="ACPHedgehog" or
+			defName="ACPHoneyBadger" or
+			defName="ACPJackalope" or
+			defName="ACPKomodo" or
+			defName="ACPMegabadger" or
+			defName="ACPMegaFerret" or
+			defName="ACPMegascorpion" or
+			defName="ACPMunchkinCat" or
+			defName="ACPOtter" or
+			defName="ACPPorcupine" or
+			defName="ACPRedPanda" or
+			defName="ACPSilkspider" or
+			defName="ACPSpottedSeal" or
+			defName="ACPThornyDevil" or
+			defName="ACPWalrus" or
+			defName="ACPXenguana" or
+			defName="ACPXGecko"
+			]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/ThingDef[
+			defName="ACPGiraffe" or
+			defName="ACPFlamingo" or
+			defName="ACPGreatBustard" or
+			defName="ACPKiwi" or
+			defName="ACPPenguin" or
+			defName="ACPPtarmigan" or
+			defName="ACPSilkieChicken" or
+			defName="ACPValleyQuail"
+			]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Damages.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Damages.xml
new file mode 100644
index 0000000000..9da693b6d5
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Damages.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/DamageDef[defName="PlatypusSting"]</xpath>
+		<value>
+			<hediff>PlatypusVenom</hediff>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/DamageDef[defName="PlatypusSting"]/additionalHediffs/li[hediff="PlatypusVenom"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/DamageDef[defName="ScorpionSting"]</xpath>
+		<value>
+			<hediff>ScorpionVenom</hediff>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/DamageDef[defName="ScorpionSting"]/additionalHediffs/li[hediff="ScorpionVenom"]</xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Hediffs.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Hediffs.xml
new file mode 100644
index 0000000000..540a180623
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Hediffs.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="PlatypusVenom"]</xpath>
+		<value>
+			<HediffDef ParentName="HediffBite">
+				<defName>PlatypusVenom</defName>
+				<label>platypus venom sting</label>
+				<labelNoun>the venom from a platypus' spur</labelNoun>
+				<comps>
+					<li Class="CombatExtended.HediffCompProperties_Venom">
+						<!-- 0.25x as potent as vanilla CE venom hediffs -->
+						<VenomPerSeverity>0.00000335</VenomPerSeverity>
+						<MinTicks>10000</MinTicks>
+						<MaxTicks>15000</MaxTicks>
+					</li>
+				</comps>
+			</HediffDef>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ScorpionVenom"]</xpath>
+		<value>
+			<HediffDef ParentName="HediffBite">
+				<defName>ScorpionVenom</defName>
+				<label>scorpion venom sting</label>
+				<labelNoun>scorpion venom</labelNoun>
+				<comps>
+					<li Class="CombatExtended.HediffCompProperties_Venom">
+						<!-- 0.25x as potent as vanilla CE venom hediffs -->
+						<VenomPerSeverity>0.00000335</VenomPerSeverity>
+						<MinTicks>10000</MinTicks>
+						<MaxTicks>45000</MaxTicks>
+					</li>
+				</comps>
+			</HediffDef>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Misc.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Misc.xml
new file mode 100644
index 0000000000..96bef4c695
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Misc.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Walrus Tusk -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="ACPWalrusTusk"]/tools</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="ACPWalrusTusk"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>ResourceBase</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPWalrusTusk"]/statBases/Mass</xpath>
+		<value>
+			<Mass>5</Mass>
+			<Bulk>13</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPWalrusTusk"]/description</xpath>
+		<value>
+			<description>A walrus' tusk. Very durable and valuable.</description>
+		</value>
+	</Operation>
+
+	<!-- Carapace Helmet -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_ACPCarapaceHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ACPCarapaceHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ACPCarapaceHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4.75</ArmorRating_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Angora.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Angora.xml
new file mode 100644
index 0000000000..2787a02fbc
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Angora.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPAngoraRabbit"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.24</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+			<MeleeParryChance>0</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPAngoraRabbit"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_BRhino.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_BRhino.xml
new file mode 100644
index 0000000000..9714a512f4
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_BRhino.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPBlackRhinoceros"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.52</MeleeCritChance>
+			<MeleeParryChance>0.27</MeleeParryChance>
+			<ArmorRating_Blunt>8</ArmorRating_Blunt>
+			<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPBlackRhinoceros"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>3.17</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>3.17</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool_2</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2.44</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>2.95</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Blackbear.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Blackbear.xml
new file mode 100644
index 0000000000..d4a2262e53
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Blackbear.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPBlackbear"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.19</MeleeCritChance>
+			<MeleeParryChance>0.11</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPBlackbear"]</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.41</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.41</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>31</power>
+					<cooldownTime>2.05</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.85</armorPenetrationSharp>
+					<armorPenetrationBlunt>8.450</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.22</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>4.235</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Cats.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Cats.xml
new file mode 100644
index 0000000000..e059778f4c
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Cats.xml
@@ -0,0 +1,313 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Lion ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPLion"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.135</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.6345</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.135</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.6345</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.375</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.530</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Tiger ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPTiger"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.135</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.6345</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.135</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.6345</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.375</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.530</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Cheetah ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPCheetah"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>0.92</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>0.92</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.690</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Amur and Snow Leopards ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="ACPAmurLeopard" or
+			defName="ACPSnowLeopard"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>0.92</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>0.92</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.690</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Chipmunk.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Chipmunk.xml
new file mode 100644
index 0000000000..d14d92c92a
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Chipmunk.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPChipmunk"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.0</MeleeCritChance>
+			<MeleeParryChance>0</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPChipmunk"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.67</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.67</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.88</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>3.00</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_DomesticCats.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_DomesticCats.xml
new file mode 100644
index 0000000000..79e6f35a61
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_DomesticCats.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPMunchkinCat"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+			<MeleeParryChance>0.06</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPMunchkinCat"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.55</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.55</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.85</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.254</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>0.55</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_DomesticRabbit.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_DomesticRabbit.xml
new file mode 100644
index 0000000000..d976dc73bb
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_DomesticRabbit.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPDomesticRabbit"]</xpath>
+		<value>
+			<statBases>
+				<MeleeDodgeChance>0.24</MeleeDodgeChance>
+				<MeleeCritChance>0.02</MeleeCritChance>
+				<MeleeParryChance>0.06</MeleeParryChance>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPDomesticRabbit"]</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_DuckBilledPlatypus.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_DuckBilledPlatypus.xml
new file mode 100644
index 0000000000..4e78745a5f
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_DuckBilledPlatypus.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPDuckBilledPlatypus"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.07</MeleeDodgeChance>
+			<MeleeCritChance>0.11</MeleeCritChance>
+			<MeleeParryChance>0.02</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPDuckBilledPlatypus"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>spurs</label>
+					<capacities>
+						<li>PlatypusSting</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.9</cooldownTime>
+					<linkedBodyPartsGroup>Spurs</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.06</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.33</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.162</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.162</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Ferret.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Ferret.xml
new file mode 100644
index 0000000000..01361aeefc
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Ferret.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPFerret"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.27</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.02</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPFerret"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.67</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.67</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.88</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>3.00</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Flamingo.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Flamingo.xml
new file mode 100644
index 0000000000..8d0caf2e72
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Flamingo.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPFlamingo"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.22</MeleeDodgeChance>
+			<MeleeCritChance>0.11</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPFlamingo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.480</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2.08</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.480</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2.08</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.480</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Giraffe.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Giraffe.xml
new file mode 100644
index 0000000000..7485b4dec5
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Giraffe.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPGiraffe"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.08</MeleeDodgeChance>
+			<MeleeCritChance>0.61</MeleeCritChance>
+			<MeleeParryChance>0.37</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPGiraffe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.66</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.750</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.97</cooldownTime>
+					<restrictedGender>Female</restrictedGender>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Goat.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Goat.xml
new file mode 100644
index 0000000000..36ccf507cc
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Goat.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPMajoreraGoat"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.17</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPMajoreraGoat"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_GreatBustard.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_GreatBustard.xml
new file mode 100644
index 0000000000..5fde8bdccb
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_GreatBustard.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPGreatBustard"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.22</MeleeDodgeChance>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.13</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPGreatBustard"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.480</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2.08</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.480</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2.08</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.480</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Hedgehog.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Hedgehog.xml
new file mode 100644
index 0000000000..ed82012852
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Hedgehog.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPHedgehog"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.17</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPHedgehog"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>quills</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>Quills</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>0.95</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Hippo.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Hippo.xml
new file mode 100644
index 0000000000..f65d3aebc8
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Hippo.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPHippopotamus"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.08</MeleeDodgeChance>
+			<MeleeCritChance>0.64</MeleeCritChance>
+			<MeleeParryChance>0.45</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPHippopotamus"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>6.75</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>6.75</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_HoneyBadger.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_HoneyBadger.xml
new file mode 100644
index 0000000000..bad78ade2b
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_HoneyBadger.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPHoneyBadger"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.21</MeleeDodgeChance>
+			<MeleeCritChance>0.31</MeleeCritChance>
+			<MeleeParryChance>0.08</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPHoneyBadger"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Horse.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Horse.xml
new file mode 100644
index 0000000000..c94a59fac2
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Horse.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="ACPHorse" or
+			defName="ACPWoolyHorse"
+			]/statBases </xpath>
+		<value>
+			<MeleeDodgeChance>0.11</MeleeDodgeChance>
+			<MeleeCritChance>0.30</MeleeCritChance>
+			<MeleeParryChance>0.19</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="ACPHorse" or
+			defName="ACPWoolyHorse"
+			]/statBases/MoveSpeed </xpath>
+		<value>
+			<MoveSpeed>5</MoveSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="ACPHorse" or
+			defName="ACPWoolyHorse"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.97</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Insects.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Insects.xml
new file mode 100644
index 0000000000..8e4d6d0fd1
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Insects.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Silk Spider ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPSilkspider"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPSilkspider"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.02</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>2.5</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.01</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Hauler Ant ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPHaulerAnt"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.08</MeleeDodgeChance>
+			<MeleeCritChance>0.34</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPHaulerAnt"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.5</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.02</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Acid Ant ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPAcidAnt"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.24</MeleeDodgeChance>
+			<MeleeCritChance>0.08</MeleeCritChance>
+			<MeleeParryChance>0</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPAcidAnt"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.02</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>AcidBite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.01</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Jackalope.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Jackalope.xml
new file mode 100644
index 0000000000..4e4ca25422
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Jackalope.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPJackalope"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPJackalope"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>antlers</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Antlers</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.750</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Kiwi.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Kiwi.xml
new file mode 100644
index 0000000000..02eae912f9
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Kiwi.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPKiwi"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.28</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+			<MeleeParryChance>0</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPKiwi"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.39</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.096</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.39</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.096</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Komodo.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Komodo.xml
new file mode 100644
index 0000000000..a20a96b157
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Komodo.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPKomodo"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.08</MeleeDodgeChance>
+			<MeleeCritChance>0.4</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPKomodo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.19</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.19</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.375</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Lizard.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Lizard.xml
new file mode 100644
index 0000000000..cb2a07b469
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Lizard.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPXenguana"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.16</MeleeDodgeChance>
+			<MeleeCritChance>0.18</MeleeCritChance>
+			<MeleeParryChance>0.03</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPXenguana"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.06</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.06</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.89</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.50</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>4.24</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPXGecko"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.22</MeleeDodgeChance>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>0.04</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPXGecko"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.89</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.250</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Llama.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Llama.xml
new file mode 100644
index 0000000000..23ce9c0d45
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Llama.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPLlama"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.14</MeleeDodgeChance>
+			<MeleeCritChance>0.06</MeleeCritChance>
+			<MeleeParryChance>0.07</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPLlama"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.19</cooldownTime>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.19</cooldownTime>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.19</cooldownTime>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.19</cooldownTime>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>0.84</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.05</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.97</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Martens.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Martens.xml
new file mode 100644
index 0000000000..b3851a4e87
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Martens.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="ACPFishercat" or
+			defName="ACPErmine"
+			]/statBases </xpath>
+		<value>
+			<MeleeDodgeChance>0.24</MeleeDodgeChance>
+			<MeleeCritChance>0.11</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="ACPFishercat" or
+			defName="ACPErmine"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.67</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.67</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.88</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>3.00</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_MegaBadger.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_MegaBadger.xml
new file mode 100644
index 0000000000..340f9b6f28
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_MegaBadger.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPMegabadger"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.11</MeleeDodgeChance>
+			<MeleeCritChance>0.43</MeleeCritChance>
+			<MeleeParryChance>0.27</MeleeParryChance>
+			<ArmorRating_Blunt>8</ArmorRating_Blunt>
+			<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPMegabadger"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.18</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.18</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>3.375</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.35</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_MegaFerret.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_MegaFerret.xml
new file mode 100644
index 0000000000..576c3f4168
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_MegaFerret.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPMegaFerret"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.41</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPMegaFerret"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.67</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.67</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>0.88</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>3.00</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Otter.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Otter.xml
new file mode 100644
index 0000000000..77caf70446
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Otter.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPOtter"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.20</MeleeCritChance>
+			<MeleeParryChance>0.08</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPOtter"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.67</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.67</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>0.88</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>3.00</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Panda.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Panda.xml
new file mode 100644
index 0000000000..e52d076222
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Panda.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPPanda"]</xpath>
+		<value>
+			<statBases>
+				<MeleeDodgeChance>0.18</MeleeDodgeChance>
+				<MeleeCritChance>0.17</MeleeCritChance>
+				<MeleeParryChance>0.11</MeleeParryChance>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPPanda"]</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.41</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.41</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2.05</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.85</armorPenetrationSharp>
+					<armorPenetrationBlunt>8.450</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.22</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>4.235</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Peccary.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Peccary.xml
new file mode 100644
index 0000000000..c0e309d6e0
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Peccary.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPPeccary"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.12</MeleeDodgeChance>
+			<MeleeCritChance>0.08</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPPeccary"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Penguin.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Penguin.xml
new file mode 100644
index 0000000000..f5d20f8d91
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Penguin.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPPenguin"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.08</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPPenguin"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>4</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.162</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>6</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.162</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.284</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Porcupine.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Porcupine.xml
new file mode 100644
index 0000000000..a794397c48
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Porcupine.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPPorcupine"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.12</MeleeDodgeChance>
+			<MeleeCritChance>0.55</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPPorcupine"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>quills</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Quills</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Ptarmigan.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Ptarmigan.xml
new file mode 100644
index 0000000000..d32de4183b
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Ptarmigan.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPPtarmigan"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.22</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPPtarmigan"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.096</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.480</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Quail.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Quail.xml
new file mode 100644
index 0000000000..817782cdb1
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Quail.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPValleyQuail"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.24</MeleeDodgeChance>
+			<MeleeCritChance>0.03</MeleeCritChance>
+			<MeleeParryChance>0</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPValleyQuail"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.096</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.096</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.480</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_RedPanda.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_RedPanda.xml
new file mode 100644
index 0000000000..6ef1391d68
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_RedPanda.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPRedPanda"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.16</MeleeDodgeChance>
+			<MeleeCritChance>0.03</MeleeCritChance>
+			<MeleeParryChance>0.02</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPRedPanda"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.55</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>7</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.55</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>7</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.85</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>8</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.254</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.55</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Scorpions.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Scorpions.xml
new file mode 100644
index 0000000000..dfffc1fb9f
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Scorpions.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPMegascorpion"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.12</MeleeDodgeChance>
+			<MeleeCritChance>0.33</MeleeCritChance>
+			<MeleeParryChance>0.17</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPMegascorpion"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stinger</label>
+					<capacities>
+						<li>ScorpionSting</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.55</cooldownTime>
+					<linkedBodyPartsGroup>StingerAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.535</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>pincer</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.9</cooldownTime>
+					<linkedBodyPartsGroup>PincerAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Seal.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Seal.xml
new file mode 100644
index 0000000000..6ac2327438
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Seal.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPSpottedSeal"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.09</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0.03</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPSpottedSeal"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Silkie.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Silkie.xml
new file mode 100644
index 0000000000..33ca580e49
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Silkie.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPSilkieChicken"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0</MeleeCritChance>
+			<MeleeParryChance>0</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPSilkieChicken"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.39</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.096</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.39</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.096</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.192</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Tapir.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Tapir.xml
new file mode 100644
index 0000000000..6036c81c8f
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Tapir.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPTapir"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			<MeleeCritChance>0.07</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPTapir"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_ThornyDevil.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_ThornyDevil.xml
new file mode 100644
index 0000000000..98dd5e0b6e
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_ThornyDevil.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPThornyDevil"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			<MeleeCritChance>0.18</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPThornyDevil"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.89</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.250</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Walrus.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Walrus.xml
new file mode 100644
index 0000000000..3ebc47d2bd
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Walrus.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPWalrus"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.06</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>0.08</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPWalrus"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tusk</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.89</cooldownTime>
+					<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>tusk</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.41</cooldownTime>
+					<chanceFactor>0.65</chanceFactor>
+					<linkedBodyPartsGroup>TuskAttackTool_2</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.940</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_WildDog.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_WildDog.xml
new file mode 100644
index 0000000000..b923bb8261
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_WildDog.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPWildDog"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.26</MeleeDodgeChance>
+			<MeleeCritChance>0.09</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPWildDog"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>17</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.380</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Wolves.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Wolves.xml
new file mode 100644
index 0000000000..df06957056
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Wolves.xml
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Dire wolf ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPDirewolf"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			<MeleeCritChance>0.30</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
+			<ArmorRating_Sharp>3.5</ArmorRating_Sharp>
+			<ArmorRating_Blunt>5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPDirewolf"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.900</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.075</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.900</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.075</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.65</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.225</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Black dire wolf ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPBlackwolf"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.26</MeleeDodgeChance>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+			<ArmorRating_Sharp>3.5</ArmorRating_Sharp>
+			<ArmorRating_Blunt>5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPBlackwolf"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.900</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.075</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.900</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.075</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.65</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.225</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Spirit wolf ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="ACPSpiritwolf" or
+			defName="ACPSpiritwolfFF"
+			]/statBases </xpath>
+		<value>
+			<MeleeDodgeChance>0.24</MeleeDodgeChance>
+			<MeleeCritChance>0.30</MeleeCritChance>
+			<MeleeParryChance>0.06</MeleeParryChance>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+			<ArmorRating_Blunt>21</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="ACPSpiritwolf" or
+			defName="ACPSpiritwolfFF"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>1.80</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>1.80</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>24</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.86</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.225</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Woolyrhino.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Woolyrhino.xml
new file mode 100644
index 0000000000..b7663cd78a
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Woolyrhino.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPWoolyRhino"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.10</MeleeDodgeChance>
+			<MeleeCritChance>0.50</MeleeCritChance>
+			<MeleeParryChance>0.30</MeleeParryChance>
+			<ArmorRating_Blunt>8</ArmorRating_Blunt>
+			<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ACPWoolyRhino"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_StuffRebalance.xml b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_StuffRebalance.xml
new file mode 100644
index 0000000000..49235a7ae3
--- /dev/null
+++ b/ModPatches/AnimalCollabProj/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_StuffRebalance.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Clear these out all at once so we can just replace them easily -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="Leather_ACP" or
+			defName="ACPFerretSilk" or
+			defName="ACPBDireWolfWool" or
+			defName="ACPSpidersilk" or
+			defName="ACPLlamaWool" or
+			@Name="ACPWoolBase"
+			]/statBases/StuffPower_Armor_Sharp |
+			Defs/ThingDef[
+			defName="Leather_ACP" or
+			defName="ACPFerretSilk" or
+			defName="ACPBDireWolfWool" or
+			defName="ACPSpidersilk" or
+			defName="ACPLlamaWool" or
+			@Name="ACPWoolBase"
+			]/statBases/StuffPower_Armor_Blunt </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Leather_ACP"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.33</StuffPower_Armor_Sharp>
+			<StuffPower_Armor_Blunt>0.165</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPFerretSilk"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.25</StuffPower_Armor_Sharp>
+			<StuffPower_Armor_Blunt>0.12</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPBDireWolfWool"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.35</StuffPower_Armor_Sharp>
+			<StuffPower_Armor_Blunt>0.17</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPSpidersilk"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.30</StuffPower_Armor_Sharp>
+			<StuffPower_Armor_Blunt>0.14</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ACPLlamaWool"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.20</StuffPower_Armor_Sharp>
+			<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="ACPWoolBase"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.2</StuffPower_Armor_Sharp>
+			<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Anthro Race/Patches/Anthro Race/Anthro_Bodytype.xml b/ModPatches/Anthro Race/Patches/Anthro Race/Anthro_Bodytype.xml
new file mode 100644
index 0000000000..4d94d6e6a1
--- /dev/null
+++ b/ModPatches/Anthro Race/Patches/Anthro Race/Anthro_Bodytype.xml	
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Outside Squishy-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Anthro"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "right eye"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Anthro"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "left eye"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Anthro"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Anthro"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<!--Arm Groups-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Anthro"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Anthro"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Anthro"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Anthro"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<!--Natural Armor-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Anthro"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Anthro"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Anthro"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Anthro"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Anthro"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Anthro"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Anthro"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Anthro"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Anthro"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Anthro"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Anthro"]/corePart/parts/li[def="Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Anthro"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Anthro"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Anthro Race/Patches/Anthro Race/PawnKinds_Anthro.xml b/ModPatches/Anthro Race/Patches/Anthro Race/PawnKinds_Anthro.xml
new file mode 100644
index 0000000000..54ccd568d5
--- /dev/null
+++ b/ModPatches/Anthro Race/Patches/Anthro Race/PawnKinds_Anthro.xml	
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Give ammo to pawns ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/PawnKindDef[@Name="AnthroOutlanderBase"]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>7</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Anthro Race/Patches/Anthro Race/Race_Anthro.xml b/ModPatches/Anthro Race/Patches/Anthro Race/Race_Anthro.xml
new file mode 100644
index 0000000000..fb901ad31d
--- /dev/null
+++ b/ModPatches/Anthro Race/Patches/Anthro Race/Race_Anthro.xml	
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Anthro"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Anthro"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Anthro"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Anthro"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Anthro"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Anthro"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Anthro Race/Patches/Anthro Race/Scenarios_Anthro.xml b/ModPatches/Anthro Race/Patches/Anthro Race/Scenarios_Anthro.xml
new file mode 100644
index 0000000000..b79316c21a
--- /dev/null
+++ b/ModPatches/Anthro Race/Patches/Anthro Race/Scenarios_Anthro.xml	
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="AnthroScenarioClassic"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_44Magnum_FMJ</thingDef>
+				<count>180</count>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ScenarioDef[defName="AnthroScenarioClassic"]/scenario/parts/li[thingDef="Apparel_FlakVest"]</xpath>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Antinium/Patches/Antinium/Bodies/Ant_Bodies.xml b/ModPatches/Antinium/Patches/Antinium/Bodies/Ant_Bodies.xml
new file mode 100644
index 0000000000..ef833a6f62
--- /dev/null
+++ b/ModPatches/Antinium/Patches/Antinium/Bodies/Ant_Bodies.xml
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Natural armor coverage -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Antinium"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Waist"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- Part squishy-ness -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Eye"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<!-- Arm and shoulder tags-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def = "Shoulder"]/parts/li[contains(./customLabel, "left arm")]/groups</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[contains(./customLabel, "left shoulder")]/groups</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def = "Shoulder"]/parts/li[contains(./customLabel, "right arm")]/groups</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[contains(./customLabel, "right shoulder")]/groups</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<!-- Coverage -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Stomach"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Heart"]/coverage</xpath>
+		<value>
+			<coverage>0.04</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Lung"]/coverage</xpath>
+		<value>
+			<coverage>0.055</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Kidney"]/coverage</xpath>
+		<value>
+			<coverage>0.03</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Liver"]/coverage</xpath>
+		<value>
+			<coverage>0.06</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Neck"]/coverage</xpath>
+		<value>
+			<coverage>0.055</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Skull"]/parts/li[def="Brain"]/coverage</xpath>
+		<value>
+			<coverage>0.9</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Eye"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ant_Antenna"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/coverage</xpath>
+		<value>
+			<coverage>0.08</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Shoulder"]/coverage</xpath>
+		<value>
+			<coverage>0.085</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Clavicle"]/coverage</xpath>
+		<value>
+			<coverage>0.06</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Humerus"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Radius"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Leg"]/parts/li[def="Femur"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Leg"]/parts/li[def="Tibia"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Antinium/Patches/Antinium/PawnKindDefs_Ants/Ant_PawnKindsRaider.xml b/ModPatches/Antinium/Patches/Antinium/PawnKindDefs_Ants/Ant_PawnKindsRaider.xml
new file mode 100644
index 0000000000..ede6544830
--- /dev/null
+++ b/ModPatches/Antinium/Patches/Antinium/PawnKindDefs_Ants/Ant_PawnKindsRaider.xml
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Ant_CannonFodder -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Ant_CannonFodder"]/combatPower</xpath>
+		<value>
+			<combatPower>20</combatPower>
+		</value>
+	</Operation>
+
+	<!-- Ant_Combatant -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Ant_Combatant"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>40</min>
+					<max>100</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.6</shieldChance>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Ant_Combatant"]/combatPower</xpath>
+		<value>
+			<combatPower>25</combatPower>
+		</value>
+	</Operation>
+
+	<!-- Ant_Soldier -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Ant_Soldier"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>100</min>
+					<max>200</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.9</shieldChance>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Ant_Soldier"]/combatPower</xpath>
+		<value>
+			<combatPower>35</combatPower>
+		</value>
+	</Operation>
+
+	<!-- Ant_Bowman -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Ant_Bowman"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>15</min>
+					<max>30</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>80</min>
+					<max>120</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.6</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>60</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Ant_Bowman"]/combatPower</xpath>
+		<value>
+			<combatPower>35</combatPower>
+		</value>
+	</Operation>
+
+	<!-- Ant_Archer -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Ant_Archer"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>20</min>
+					<max>40</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>100</min>
+					<max>175</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.6</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>80</min>
+							<max>160</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Ant_Archer"]/combatPower</xpath>
+		<value>
+			<combatPower>45</combatPower>
+		</value>
+	</Operation>
+
+	<!-- Ant_SpecialArcher -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Ant_SpecialArcher"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>10</min>
+					<max>40</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>100</min>
+					<max>180</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.6</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>120</min>
+							<max>360</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<!-- Removing the smokepop belt requirement -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/PawnKindDef[defName="Ant_SpecialArcher"]/apparelRequired</xpath>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Ant_SpecialArcher"]/combatPower</xpath>
+		<value>
+			<combatPower>65</combatPower>
+		</value>
+	</Operation>
+
+	<!-- Ant_Warrior -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Ant_Warrior"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>180</min>
+					<max>300</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.9</shieldChance>
+			</li>
+		</value>
+	</Operation>
+	<!-- Removing the shield belt requirement -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/PawnKindDef[defName="Ant_Warrior"]/apparelRequired</xpath>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Ant_Warrior"]/combatPower</xpath>
+		<value>
+			<combatPower>65</combatPower>
+		</value>
+	</Operation>
+
+	<!-- Ant_ArmoredAntinium -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Ant_ArmoredAntinium"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>120</min>
+					<max>240</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.9</shieldChance>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Antinium/Patches/Antinium/Scenarios/Ant_Scenario.xml b/ModPatches/Antinium/Patches/Antinium/Scenarios/Ant_Scenario.xml
new file mode 100644
index 0000000000..8f42334a9e
--- /dev/null
+++ b/ModPatches/Antinium/Patches/Antinium/Scenarios/Ant_Scenario.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="Ant_NewHive"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_Arrow_Stone</thingDef>
+				<count>100</count>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Antinium/Patches/Antinium/ThingDefs_Misc/Ant_DrugDefs.xml b/ModPatches/Antinium/Patches/Antinium/ThingDefs_Misc/Ant_DrugDefs.xml
new file mode 100644
index 0000000000..5774362ab8
--- /dev/null
+++ b/ModPatches/Antinium/Patches/Antinium/ThingDefs_Misc/Ant_DrugDefs.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Rxlvn (antinium beer) -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Ant_Rxlvn"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2.22</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>neck</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>3.33</cooldownTime>
+					<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Neck</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Antinium/Patches/Antinium/ThingDefs_Misc/Ant_ThingDefs.xml b/ModPatches/Antinium/Patches/Antinium/ThingDefs_Misc/Ant_ThingDefs.xml
new file mode 100644
index 0000000000..70c10255ed
--- /dev/null
+++ b/ModPatches/Antinium/Patches/Antinium/ThingDefs_Misc/Ant_ThingDefs.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Antinium chitin -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Ant_AntiniumChitin"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.09</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Ant_AntiniumChitin"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.035</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Antinium/Patches/Antinium/ThingDefs_Races/Ant_AntiniumRace.xml b/ModPatches/Antinium/Patches/Antinium/ThingDefs_Races/Ant_AntiniumRace.xml
new file mode 100644
index 0000000000..af8d8acd1f
--- /dev/null
+++ b/ModPatches/Antinium/Patches/Antinium/ThingDefs_Races/Ant_AntiniumRace.xml
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Antinium alien race (Ant_AntiniumRace) -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Ant_AntiniumRace"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Ant_AntiniumRace"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+	<!-- Stat bases  -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Ant_AntiniumRace"]/statBases/ShootingAccuracyPawn</xpath>
+		<value>
+			<AimingAccuracy>0.8</AimingAccuracy>
+			<MeleeCritChance>1.17</MeleeCritChance>
+			<MeleeParryChance>1.05</MeleeParryChance>
+			<ReloadSpeed>1.5</ReloadSpeed><!-- Extra hands means extra speed when reloading -->
+			<CarryWeight>60</CarryWeight><!-- Ants can lift more than they weight irl -->
+			<Mass>72</Mass><!-- A human weighs 60 kg, but ants have chitin so mass is increased -->
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Ant_AntiniumRace"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.9</MeleeDodgeChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Ant_AntiniumRace"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.33</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Ant_AntiniumRace"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<!-- Unarmed attacks -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Ant_AntiniumRace"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.09</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.441</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.09</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.441</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>lower left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.09</cooldownTime>
+					<linkedBodyPartsGroup>LowerLeftHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.441</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>lower right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.09</cooldownTime>
+					<linkedBodyPartsGroup>LowerRightHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.441</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.95</cooldownTime>
+					<linkedBodyPartsGroup>Ant_Mandibles</linkedBodyPartsGroup>
+					<chanceFactor>0.1</chanceFactor>
+					<armorPenetrationBlunt>1.533</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>4.64</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.766</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- Race stats -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Ant_AntiniumRace"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>1.2</baseHealthScale>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Antinium/Patches/Antinium/TraderKindDefs/Ant_TraderKinds.xml b/ModPatches/Antinium/Patches/Antinium/TraderKindDefs/Ant_TraderKinds.xml
new file mode 100644
index 0000000000..372f71f0eb
--- /dev/null
+++ b/ModPatches/Antinium/Patches/Antinium/TraderKindDefs/Ant_TraderKinds.xml
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Antinium base trader -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="Ant_Base_Standard"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_Category">
+				<categoryDef>Ammo</categoryDef>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>0</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Category">
+				<categoryDef>WeaponsTurrets</categoryDef>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>0</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Animals">
+				<tradeTagsSell>
+					<li>CE_AnimalBoom</li>
+				</tradeTagsSell>
+				<tradeTagsBuy>
+					<li>CE_AnimalBoom</li>
+				</tradeTagsBuy>
+				<kindCountRange>
+					<min>1</min>
+					<max>2</max>
+				</kindCountRange>
+				<countRange>
+					<min>-2</min>
+					<max>4</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>FSX</thingDef>
+				<countRange>
+					<min>10</min>
+					<max>50</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>Prometheum</thingDef>
+				<countRange>
+					<min>10</min>
+					<max>50</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_PreIndustrialAmmo</tradeTag>
+				<countRange>
+					<min>60</min>
+					<max>300</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>1</min>
+					<max>4</max>
+				</thingDefCountRange>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Antinium bulk goods trader -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="Ant_Caravan_BulkGoods"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_Category">
+				<categoryDef>Ammo</categoryDef>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>0</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Category">
+				<categoryDef>WeaponsTurrets</categoryDef>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>0</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>FSX</thingDef>
+				<countRange>
+					<min>15</min>
+					<max>40</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>Prometheum</thingDef>
+				<countRange>
+					<min>15</min>
+					<max>40</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_PreIndustrialAmmo</tradeTag>
+				<countRange>
+					<min>30</min>
+					<max>100</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>3</max>
+				</thingDefCountRange>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Antinium war merchant -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="Ant_Caravan_WarMerchant"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>FSX</thingDef>
+				<countRange>
+					<min>5</min>
+					<max>20</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>Prometheum</thingDef>
+				<countRange>
+					<min>5</min>
+					<max>20</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_Category">
+				<categoryDef>Ammo</categoryDef>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>0</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Category">
+				<categoryDef>WeaponsTurrets</categoryDef>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>0</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Animals">
+				<tradeTagsSell>
+					<li>CE_AnimalBoom</li>
+				</tradeTagsSell>
+				<tradeTagsBuy>
+					<li>CE_AnimalBoom</li>
+				</tradeTagsBuy>
+				<kindCountRange>
+					<min>1</min>
+					<max>2</max>
+				</kindCountRange>
+				<countRange>
+					<min>1</min>
+					<max>4</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_PreIndustrialAmmo</tradeTag>
+				<countRange>
+					<min>50</min>
+					<max>300</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>1</min>
+					<max>4</max>
+				</thingDefCountRange>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Miscellaneous antinium traders -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="Ant_Caravan_Slaver" or defName="Ant_Caravan_ShamanMerchant"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_Category">
+				<categoryDef>Ammo</categoryDef>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>0</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Category">
+				<categoryDef>WeaponsTurrets</categoryDef>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>0</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_PreIndustrialAmmo</tradeTag>
+				<countRange>
+					<min>30</min>
+					<max>100</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>3</max>
+				</thingDefCountRange>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Antinium/Patches/Antinium/TraitDefs/Ant_Traits_Special.xml b/ModPatches/Antinium/Patches/Antinium/TraitDefs/Ant_Traits_Special.xml
new file mode 100644
index 0000000000..5d03f06cd9
--- /dev/null
+++ b/ModPatches/Antinium/Patches/Antinium/TraitDefs/Ant_Traits_Special.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Antinium ranger -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="Ant_Ranger"]/degreeDatas/li/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>0.6</ShootingAccuracyPawn>
+			<AimingAccuracy>0.3</AimingAccuracy>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Anty the war Ant/Defs/Anty the war Ant/Ammo_Anty.xml b/ModPatches/Anty the war Ant/Defs/Anty the war Ant/Ammo_Anty.xml
new file mode 100644
index 0000000000..5a6100d016
--- /dev/null
+++ b/ModPatches/Anty the war Ant/Defs/Anty the war Ant/Ammo_Anty.xml	
@@ -0,0 +1,515 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- ==================== Boltcaster ========================== -->
+
+	<!-- ==================== AmmoSets ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_AntyAcidRifle</defName>
+		<label>Acid Shot</label>
+		<ammoTypes>
+			<Ammo_AntyAcidRifle>Bullet_AntyAcidRifle</Ammo_AntyAcidRifle>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_AntyAcidLauncher</defName>
+		<label>Acid Launcher</label>
+		<ammoTypes>
+			<Ammo_AntyAcidRifle>Bullet_AntyAcidLauncher</Ammo_AntyAcidRifle>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_AntyGlueLauncher</defName>
+		<label>Glue Launcher</label>
+		<ammoTypes>
+			<Ammo_AntyGlueLauncher>Bullet_AntyGlueLauncher</Ammo_AntyGlueLauncher>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_AntyAcidCrossbow</defName>
+		<label>Acid Bolt</label>
+		<ammoTypes>
+			<Ammo_CrossbowBolt_AntyAcid>Projectile_CrossbowBolt_AntyAcid</Ammo_CrossbowBolt_AntyAcid>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_AntyRedAcidLauncher</defName>
+		<label>Acid Launcher</label>
+		<ammoTypes>
+			<Ammo_AntyAcidRed>Bullet_AntyRedAcidLauncher</Ammo_AntyAcidRed>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_AntyRedAcidLine</defName>
+		<label>Acid Line Blaster</label>
+		<ammoTypes>
+			<Ammo_AntyAcidRed>Bullet_AntyRedAcidLine</Ammo_AntyAcidRed>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_AntyRedAcidCluster</defName>
+		<label>Acid Launcher</label>
+		<ammoTypes>
+			<Ammo_AntyAcidRed>Bullet_AntyRedAcidCluster</Ammo_AntyAcidRed>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_AntyAcidGlue</defName>
+		<label>Acid Shot</label>
+		<ammoTypes>
+			<Ammo_AntyAcidRifle>Bullet_AntyAcidGlue</Ammo_AntyAcidRifle>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>AntyAcid</defName>
+		<label>Acid</label>
+		<description>Anty Bioacid.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>AntyGlue</defName>
+		<label>Glue</label>
+		<description>Anty Glue.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>AntyBolt</defName>
+		<label>Acid</label>
+		<description>Acid Bolt.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>AntyRedAcid</defName>
+		<label>Acid</label>
+		<description>Red Acid.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_AntyAcidRifle</defName>
+		<label>Anty Acid Cartridge</label>
+		<description>Specialised munitions filled with acid produced by anty, used in a number of their weapons.</description>
+		<statBases>
+			<Mass>0.02</Mass>
+			<Bulk>0.02</Bulk>
+			<MarketValue>0.1</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoAdvanced</li>
+		</thingCategories>
+		<stackLimit>1000</stackLimit>
+		<graphicData>
+			<texPath>Things/Ammo/Railgun/HighCaliber</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>AntyAcid</ammoClass>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_AntyGlueLauncher</defName>
+		<label>anty glue canister</label>
+		<description>Container holding glue for use in anty support weapons.</description>
+		<statBases>
+			<Mass>0.08</Mass>
+			<Bulk>0.14</Bulk>
+			<MarketValue>3.5</MarketValue>
+		</statBases>
+		<graphicData>
+			<texPath>Things/Ammo/FuelCell/Foam</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoAdvanced</li>
+		</thingCategories>
+		<stackLimit>200</stackLimit>
+		<ammoClass>AntyGlue</ammoClass>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_AntyAcidRed</defName>
+		<label>Anty Hydroheliumion Cartridge</label>
+		<description>High strength mixture made of Anty-acid combined with Refleum.</description>
+		<statBases>
+			<Mass>0.02</Mass>
+			<Bulk>0.02</Bulk>
+			<MarketValue>0.4</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoAdvanced</li>
+		</thingCategories>
+		<stackLimit>1000</stackLimit>
+		<graphicData>
+			<texPath>Things/Ammo/Railgun/HighCaliber</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>AntyRedAcid</ammoClass>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoCrossbowBoltBase">
+		<defName>Ammo_CrossbowBolt_AntyAcid</defName>
+		<label>crossbow bolt (Acid)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Medieval/Bolt/Steel</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.66</MarketValue>
+		</statBases>
+		<ammoClass>AntyBolt</ammoClass>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base762x39mmSovietBullet">
+		<defName>Bullet_AntyAcidRifle</defName>
+		<label>Acid Bullet</label>
+		<graphicData>
+			<texPath>Things/Weapons/jan</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>AT_AcidBullet</damageDef>
+			<damageAmountBase>9</damageAmountBase>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>25</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base762x39mmSovietBullet">
+		<defName>Bullet_AntyRedAcidLine</defName>
+		<label>Red Burst Bullet</label>
+		<graphicData>
+			<texPath>Things/Weapons/kan</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>AT_AcidBullet</damageDef>
+			<damageAmountBase>1</damageAmountBase>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>1000</armorPenetrationBlunt>
+			<pelletCount>5</pelletCount>
+			<spreadMult>15</spreadMult>
+			<secondaryDamage>
+				<li>
+					<def>Stun</def>
+					<amount>3</amount>
+					<chance>0.05</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base25x40mmGrenadeBullet">
+		<defName>Bullet_AntyAcidLauncher</defName>
+		<label>Acid Grenade</label>
+		<graphicData>
+			<texPath>Things/Weapons/lan</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>0</explosionRadius>
+			<damageDef>AT_AcidBomb</damageDef>
+			<preExplosionSpawnThingDef>Filth_AntyAcid</preExplosionSpawnThingDef>
+			<preExplosionSpawnChance>0.2</preExplosionSpawnChance>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<explosiveDamageType>AT_AcidBomb</explosiveDamageType>
+				<explosiveRadius>2.1</explosiveRadius>
+				<preExplosionSpawnThingDef>Filth_AntyAcid</preExplosionSpawnThingDef>
+				<preExplosionSpawnChance>0.2</preExplosionSpawnChance>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="Base25x40mmGrenadeBullet">
+		<defName>Bullet_AntyRedAcidLauncher</defName>
+		<label>Red Burst Bullet</label>
+		<graphicData>
+			<texPath>Things/Weapons/kan</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>AT_AcidBomb_B</damageDef>
+			<preExplosionSpawnThingDef>Filth_ApproachSmoke_B</preExplosionSpawnThingDef>
+			<preExplosionSpawnChance>0.2</preExplosionSpawnChance>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<explosiveDamageType>AT_AcidBomb_B</explosiveDamageType>
+				<explosiveRadius>2.1</explosiveRadius>
+				<preExplosionSpawnThingDef>Filth_ApproachSmoke_B</preExplosionSpawnThingDef>
+				<preExplosionSpawnChance>0.2</preExplosionSpawnChance>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="Base25x40mmGrenadeBullet">
+		<defName>Bullet_AntyRedAcidCluster</defName>
+		<label>Red Burst Cluster</label>
+		<graphicData>
+			<texPath>Things/Weapons/kan</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>AT_AcidBomb_B</damageDef>
+			<preExplosionSpawnThingDef>Filth_ApproachSmoke_B</preExplosionSpawnThingDef>
+			<preExplosionSpawnChance>0.2</preExplosionSpawnChance>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Bullet_AntyRedAcidCluster_Frag>50</Bullet_AntyRedAcidCluster_Frag>
+				</fragments>
+			</li>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<explosiveDamageType>AT_AcidBomb_B</explosiveDamageType>
+				<explosiveRadius>2.1</explosiveRadius>
+				<preExplosionSpawnThingDef>Filth_ApproachSmoke_B</preExplosionSpawnThingDef>
+				<preExplosionSpawnChance>0.2</preExplosionSpawnChance>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="Base25x40mmGrenadeBullet">
+		<defName>Bullet_AntyRedAcidCluster_Frag</defName>
+		<label>Red Burst Cluster</label>
+		<graphicData>
+			<texPath>Things/Weapons/Han</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>AT_AcidBomb_B</damageDef>
+			<speed>12</speed>
+			<preExplosionSpawnThingDef>Filth_ApproachSmoke_B</preExplosionSpawnThingDef>
+			<preExplosionSpawnChance>0.2</preExplosionSpawnChance>
+			<explosionDelay>20</explosionDelay>
+			<gravityFactor>15</gravityFactor>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<explosiveDamageType>AT_AcidBomb_B</explosiveDamageType>
+				<explosiveRadius>2.1</explosiveRadius>
+				<preExplosionSpawnThingDef>Filth_ApproachSmoke_B</preExplosionSpawnThingDef>
+				<preExplosionSpawnChance>0.2</preExplosionSpawnChance>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="Base40x46mmGrenadeBullet">
+		<defName>Bullet_AntyGlueLauncher</defName>
+		<label>glue grenade</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>4.1</explosionRadius>
+			<damageDef>AT_glueBomb</damageDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseCrossbowBoltProjectile">
+		<defName>Projectile_CrossbowBolt_AntyAcid</defName>
+		<label>crossbow bolt (acid)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>AT_AcidArrow</damageDef>
+			<damageAmountBase>8</damageAmountBase>
+			<armorPenetrationBlunt>6.5</armorPenetrationBlunt>
+			<armorPenetrationSharp>2.5</armorPenetrationSharp>
+			<speed>17</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base762x39mmSovietBullet">
+		<defName>Bullet_AntyAcidGlue</defName>
+		<label>Acid Bullet</label>
+		<graphicData>
+			<texPath>Things/Weapons/jan</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>AT_glueBullet</damageDef>
+			<damageAmountBase>1</damageAmountBase>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>70</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>AT_AcidBullet</def>
+					<amount>5</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_AntyAcidRifle</defName>
+		<label>make anty acid cartridge x500</label>
+		<description>Craft 500 anty acid cartridges.</description>
+		<jobString>Making anty acid cartridges.</jobString>
+		<researchPrerequisite>AntyAcidweapon_B</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>AntyExoskeleton</li>
+					</thingDefs>
+				</filter>
+				<count>18</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>AntyExoskeleton</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_AntyAcidRifle>500</Ammo_AntyAcidRifle>
+		</products>
+		<workAmount>1800</workAmount>
+		<recipeUsers>
+			<li>AntyCopyTableMachining</li>
+		</recipeUsers>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_AntyAcidRed</defName>
+		<label>make anty Hydroheliumion cartridge x500</label>
+		<description>Craft 500 anty Hydroheliumion cartridges.</description>
+		<jobString>Making anty Hydroheliumion cartridges.</jobString>
+		<researchPrerequisite>hydroheliumion</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>AntyExoskeleton</li>
+					</thingDefs>
+				</filter>
+				<count>18</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Refleum</li>
+					</thingDefs>
+				</filter>
+				<count>18</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Refleum</li>
+				<li>AntyExoskeleton</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_AntyAcidRed>500</Ammo_AntyAcidRed>
+		</products>
+		<workAmount>1800</workAmount>
+		<recipeUsers>
+			<li>AntyCopyTableMachining</li>
+		</recipeUsers>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_AntyGlueLauncher</defName>
+		<label>make anty glue grenade x50</label>
+		<description>Craft 50 anty glue grenades.</description>
+		<jobString>Making anty glue grenades.</jobString>
+		<researchPrerequisite>Combatglue</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>AntyExoskeleton</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>AntyExoskeleton</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_AntyGlueLauncher>50</Ammo_AntyGlueLauncher>
+		</products>
+		<workAmount>11400</workAmount>
+		<recipeUsers>
+			<li>AntyCopyTableMachining</li>
+		</recipeUsers>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>MakeAmmo_CrossbowBolt_AntyAcid</defName>
+		<label>make acid crossbow bolts x10</label>
+		<description>Craft 10 acid crossbow bolts.</description>
+		<jobString>Making acid crossbow bolts.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>AntyExoskeleton</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+				<li>AntyExoskeleton</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_CrossbowBolt_AntyAcid>10</Ammo_CrossbowBolt_AntyAcid>
+		</products>
+		<workAmount>400</workAmount>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Anty the war Ant/Patches/Anty the war Ant/Ammo/Ammo_Anty.xml b/ModPatches/Anty the war Ant/Patches/Anty the war Ant/Ammo/Ammo_Anty.xml
new file mode 100644
index 0000000000..71a3ae8c39
--- /dev/null
+++ b/ModPatches/Anty the war Ant/Patches/Anty the war Ant/Ammo/Ammo_Anty.xml	
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="AT_AcidBomb"]/defaultArmorPenetration</xpath>
+		<value>
+			<defaultArmorPenetration>20</defaultArmorPenetration>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="AT_AcidBomb"]/defaultDamage</xpath>
+		<value>
+			<defaultDamage>16</defaultDamage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="AT_AcidBomb_B"]/defaultArmorPenetration</xpath>
+		<value>
+			<defaultArmorPenetration>1000</defaultArmorPenetration>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="AT_AcidBomb_B"]/defaultDamage</xpath>
+		<value>
+			<defaultDamage>16</defaultDamage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BulletCombatSmokeLauncher"]</xpath>
+		<value>
+			<ThingDef ParentName="Base25x40mmGrenadeBullet">
+				<defName>BulletCombatSmokeLauncher</defName>
+				<label>Refleum gas Grenade</label>
+				<graphicData>
+					<texPath>Things/Weapons/lan</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+					<shaderType>TransparentPostLight</shaderType>
+					<color>(0.6, 0.2, 0.2)</color>
+				</graphicData>
+				<projectile Class="CombatExtended.ProjectilePropertiesCE">
+					<speed>50</speed>
+					<damageDef>AT_AcidBomb_B</damageDef>
+					<preExplosionSpawnThingDef>Filth_ApproachSmoke_B</preExplosionSpawnThingDef>
+					<preExplosionSpawnChance>1</preExplosionSpawnChance>
+					<explosionRadius>0</explosionRadius>
+					<explosionDelay>30</explosionDelay>
+				</projectile>
+				<comps>
+					<li Class="CombatExtended.CompProperties_ExplosiveCE">
+						<explosiveDamageType>AT_AcidBomb_B</explosiveDamageType>
+						<explosiveRadius>6.9</explosiveRadius>
+						<preExplosionSpawnThingDef>Filth_ApproachSmoke_B</preExplosionSpawnThingDef>
+						<preExplosionSpawnChance>1</preExplosionSpawnChance>
+						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+					</li>
+				</comps>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_BulletTargetingLauncher"]</xpath>
+		<value>
+			<ThingDef ParentName="Base25x40mmGrenadeBullet">
+				<defName>AT_BulletTargetingLauncher</defName>
+				<label>Targeting Grenade</label>
+				<graphicData>
+					<texPath>Things/Weapons/lan</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+					<shaderType>TransparentPostLight</shaderType>
+					<color>(0.6, 0.2, 0.2)</color>
+				</graphicData>
+				<projectile Class="CombatExtended.ProjectilePropertiesCE">
+					<speed>50</speed>
+					<damageDef>AT_TargetBomb</damageDef>
+					<explosionRadius>1.9</explosionRadius>
+					<explosionDelay>30</explosionDelay>
+				</projectile>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_Apparel_CombatSmoke"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<label>launch Refleum gas Grenade</label>
+					<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<onlyManualCast>True</onlyManualCast>
+					<warmupTime>1.1</warmupTime>
+					<range>40</range>
+					<minRange>5</minRange>
+					<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+					<soundCast>Shot_IncendiaryLauncher</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>14</muzzleFlashScale>
+					<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+					<defaultProjectile>BulletCombatSmokeLauncher</defaultProjectile>
+					<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_Apparel_pheromone_TP"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<label>launch Targeting pheromone</label>
+					<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<onlyManualCast>True</onlyManualCast>
+					<warmupTime>1.1</warmupTime>
+					<range>40</range>
+					<minRange>5</minRange>
+					<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+					<soundCast>Shot_IncendiaryLauncher</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>14</muzzleFlashScale>
+					<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+					<defaultProjectile>AT_BulletTargetingLauncher</defaultProjectile>
+					<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Anty the war Ant/Patches/Anty the war Ant/Bodies/Anty_Bodytype.xml b/ModPatches/Anty the war Ant/Patches/Anty the war Ant/Bodies/Anty_Bodytype.xml
new file mode 100644
index 0000000000..18894f083c
--- /dev/null
+++ b/ModPatches/Anty the war Ant/Patches/Anty the war Ant/Bodies/Anty_Bodytype.xml	
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Arm Groups-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Anty"]//*[
+			customLabel="Left shoulder"
+			]/groups
+		</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Anty"]//*[
+			customLabel="Right shoulder"
+			]/groups
+		</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Anty"]//*[
+			customLabel="Left arm"
+			]/groups
+		</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Anty"]//*[
+			customLabel="Right arm"
+			]/groups
+		</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+
+	<!--Natural Armor-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Anty"]//*[
+			def="ExoThorax" or
+			def="AntyThorax" or
+			def="Neck" or
+			def="ExoHead" or
+			def="Head" or
+			def="Nose" or
+			def="Jaw" or
+			def="Shoulder" or
+			def="ExoArm" or
+			def="Arm" or
+			def="Hand" or
+			def="Finger" or
+			def="ExoLeg" or
+			def="Leg" or
+			def="Foot" or
+			def="Toe"
+			]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Anty the war Ant/Patches/Anty the war Ant/Drugs/Jelly.xml b/ModPatches/Anty the war Ant/Patches/Anty the war Ant/Drugs/Jelly.xml
new file mode 100644
index 0000000000..3500cd3921
--- /dev/null
+++ b/ModPatches/Anty the war Ant/Patches/Anty the war Ant/Drugs/Jelly.xml	
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="AntySoldierbirth"]/stages/li[1]</xpath>
+		<value>
+			<statOffsets>
+				<Suppressability>-0.5</Suppressability>
+			</statOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Anty the war Ant/Patches/Anty the war Ant/PawnKindDefs/Anty_PawnKind.xml b/ModPatches/Anty the war Ant/Patches/Anty the war Ant/PawnKindDefs/Anty_PawnKind.xml
new file mode 100644
index 0000000000..3955323a03
--- /dev/null
+++ b/ModPatches/Anty the war Ant/Patches/Anty the war Ant/PawnKindDefs/Anty_PawnKind.xml	
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="AT_Raid_A"]</xpath>
+		<value>
+			<li Inherit="False" Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>12</min>
+					<max>32</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="AT_Sapper_A"]</xpath>
+		<value>
+			<li Inherit="False" Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>8</min>
+					<max>20</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>500</min>
+						<max>1200</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>ATCharge</li>
+					</weaponTags>
+					<magazineCount>
+						<min>0</min>
+						<max>2</max>
+					</magazineCount>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="AT_Sapper_B"]</xpath>
+		<value>
+			<li Inherit="False" Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>8</min>
+					<max>20</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>500</min>
+						<max>1200</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>ATCharge</li>
+					</weaponTags>
+					<magazineCount>
+						<min>0</min>
+						<max>2</max>
+					</magazineCount>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="AT_SingleUse"]</xpath>
+		<value>
+			<li Inherit="False" Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>1</min>
+					<max>3</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>500</min>
+						<max>1200</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>ATCharge</li>
+					</weaponTags>
+					<magazineCount>
+						<min>0</min>
+						<max>2</max>
+					</magazineCount>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Backpack-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[
+			defName="Anty_Commander" or
+			defName="AT_Sapper_A" or
+			defName="AT_Sapper_B" or
+			defName="AT_Rifle_B" or
+			defName="AT_Charge_B" or
+			defName="AT_Launcher_A" or
+			defName="AT_SingleUse" or
+			defName="AT_Power"
+			]/apparelRequired </xpath>
+		<value>
+			<li>CE_Apparel_Backpack</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="Anty_Commander" or
+			defName="AT_Rifle_A" or
+			defName="AT_Rifle_B" or
+			defName="AT_Charge_B" or
+			defName="AT_Launcher_A" or
+			defName="AT_Power"
+			] </xpath>
+		<value>
+			<li Inherit="False" Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CE_Apparel_Backpack"]/apparel/tags</xpath>
+		<value>
+			<li>AntyALL</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CE_Apparel_TribalBackpack"]/apparel/tags</xpath>
+		<value>
+			<li>AntyME</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Anty the war Ant/Patches/Anty the war Ant/Scenario/Anty_Scenario.xml b/ModPatches/Anty the war Ant/Patches/Anty the war Ant/Scenario/Anty_Scenario.xml
new file mode 100644
index 0000000000..6c4cf6e3a7
--- /dev/null
+++ b/ModPatches/Anty the war Ant/Patches/Anty the war Ant/Scenario/Anty_Scenario.xml	
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="AT_Scenario"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_CrossbowBolt_AntyAcid</thingDef>
+				<count>60</count>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="AT_Scenario_B"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_AntyAcidRifle</thingDef>
+				<count>900</count>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Buildings/Buildings_Turrets.xml b/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Buildings/Buildings_Turrets.xml
new file mode 100644
index 0000000000..7e50263378
--- /dev/null
+++ b/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Buildings/Buildings_Turrets.xml	
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Anty_RecycleTurret" or defName="Anty_RecycleTurretB"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Anty_RecycleTurret" or defName="Anty_RecycleTurretB"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.25</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Anty_RecycleTurret" or defName="Anty_RecycleTurretB"]/statBases</xpath>
+		<value>
+			<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Anty_RecycleTurret" or defName="Anty_RecycleTurretB"]/statBases/Mass</xpath>
+		<value>
+			<Mass>25</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Anty_RecycleTurret" or defName="Anty_RecycleTurretB"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Anty_RecycleTurret" or defName="Anty_RecycleTurretB"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Anty_RecycleTurret" or defName="Anty_RecycleTurretB"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>1.1</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_RecycleTurret</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>1.8</SwayFactor>
+			<Bulk>10.03</Bulk>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>1.14</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_AntyAcidLauncher</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>51</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>18</ticksBetweenBurstShots>
+			<ammoConsumedPerShotCount>20</ammoConsumedPerShotCount>
+			<soundCast>Shot_IncendiaryLauncher</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>240</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_AntyAcidLauncher</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_RecycleTurretB</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>1.5</SwayFactor>
+			<Bulk>10.03</Bulk>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>1.14</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_AntyAcidLauncher</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>31</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<soundCast>ShotAnty_E</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_AntyAcidGlue</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Items/Items_Resources.xml b/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Items/Items_Resources.xml
new file mode 100644
index 0000000000..c04f955bfe
--- /dev/null
+++ b/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Items/Items_Resources.xml	
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==========  Anty Exoskeleton  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AntyExoskeleton"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.1</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AntyExoskeleton"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.8</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AntyExoskeleton"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
+			<StuffPower_Armor_Electric>0.025</StuffPower_Armor_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AntyExoskeleton"]/stuffProps/categories</xpath>
+		<value>
+			<li>Metallic_Weapon</li>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<!-- ==========  Anty Exoskeleton  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Refleum"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>2.3</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Refleum"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>3.45</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Refleum"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Refleum"]/stuffProps/categories</xpath>
+		<value>
+			<li>Metallic_Weapon</li>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Misc/Anty_Apparel.xml b/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Misc/Anty_Apparel.xml
new file mode 100644
index 0000000000..c97d330f2e
--- /dev/null
+++ b/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Misc/Anty_Apparel.xml	
@@ -0,0 +1,578 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--========= Stuffable =========-->
+
+	<!--Shirt-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="AT_AP_St_A" or
+			defName="AT_AP_St_B" or
+			defName="AT_AP_St_F"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Jacket/Coat-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AT_AP_St_C" or
+			defName="AT_AP_St_D"]/statBases </xpath>
+		<value>
+			<Bulk>7.5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_St_C" or
+			defName="AT_AP_St_D"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!--Chain-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AT_AP_Chain_A"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_Chain_A"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.25</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!--Simple Helmet-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AT_AP_Helm_A"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_Helm_A"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!--Composite-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AT_AP_Shooter_A"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_Shooter_A"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_Shooter_A"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_Shooter_A"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.75</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Composite Helmet-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AT_AP_Head_A"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_Head_A"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_Head_A"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_Head_A"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--========= Fixed Armor Value =========-->
+
+	<!--Engineering Suit-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AT_AP_Additionalchain_A"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_Additionalchain_A"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_Additionalchain_A"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3.75</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_Additionalchain_A"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!--Flak Vest-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AT_AP_Flakvest"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_Flakvest"]/statBases/Mass</xpath>
+		<value>
+			<Mass>12</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_Flakvest"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>175</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_Flakvest"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>13</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_Flakvest"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>20.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Flak Plate-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AT_AP_Additionalarmorplate_A"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_Additionalarmorplate_A"]/statBases/Mass</xpath>
+		<value>
+			<Mass>4</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_Additionalarmorplate_A"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>75</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_Additionalarmorplate_A"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>13</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_Additionalarmorplate_A"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>20.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Cloaks-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AT_AP_SH_A" or
+			defName="AT_AP_CO_A"]/statBases </xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_SH_A" or
+			defName="AT_AP_CO_A"]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_SH_A" or
+			defName="AT_AP_CO_A"]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Power Armor-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_Power_A"]/statBases/Mass</xpath>
+		<value>
+			<Mass>40</Mass>
+			<Bulk>40</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_Power_A"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_Power_A"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_Power_A"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<CarryBulk>10</CarryBulk>
+			<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+			<CarryWeight>60</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_Power_Head_A"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_Power_Head_A"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>40.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AT_AP_Power_Head_A"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AT_AP_Power_Head_A"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AT_AP_Power_Head_A"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingAccuracy>0.15</AimingAccuracy>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_AdditionalPower_A"]/statBases/Mass</xpath>
+		<value>
+			<Mass>10</Mass>
+			<Bulk>25</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_AdditionalPower_A"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_AdditionalPower_A"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_AdditionalPower_A"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<CarryBulk>5</CarryBulk>
+		</value>
+	</Operation>
+
+	<!--Heavy Power Armor-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_Power_C"]/statBases/Mass</xpath>
+		<value>
+			<Mass>60</Mass>
+			<Bulk>40</Bulk>
+			<WornBulk>20</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_Power_C"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>30</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_Power_C"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>75</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_Power_C"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<CarryBulk>20</CarryBulk>
+			<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+			<CarryWeight>65</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_Power_Head_C"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>25</ArmorRating_Sharp>
+			<Bulk>5</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_Power_Head_C"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>62.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AT_AP_Power_Head_C"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AT_AP_Power_Head_C"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AT_AP_Power_Head_C"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingAccuracy>0.15</AimingAccuracy>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_AdditionalPower_C"]/statBases/Mass</xpath>
+		<value>
+			<Mass>15</Mass>
+			<Bulk>25</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_AdditionalPower_C"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>30</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_AdditionalPower_C"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>75</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_AdditionalPower_C"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<CarryBulk>5</CarryBulk>
+		</value>
+	</Operation>
+
+	<!--Light Power Armor-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_Power_D"]/statBases/Mass</xpath>
+		<value>
+			<Mass>30</Mass>
+			<Bulk>35</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_Power_D"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_Power_D"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>40</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_Power_D"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<CarryBulk>5</CarryBulk>
+			<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+			<CarryWeight>50</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_Power_Head_D"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_Power_Head_D"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>40.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AT_AP_Power_Head_D"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AT_AP_Power_Head_D"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AT_AP_Power_Head_D"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingAccuracy>0.15</AimingAccuracy>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_AdditionalPower_D"]/statBases/Mass</xpath>
+		<value>
+			<Mass>10</Mass>
+			<Bulk>25</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_AdditionalPower_D"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_AdditionalPower_D"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AP_AdditionalPower_D"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<CarryBulk>5</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="AT_Apparel_CombatSmoke" or
+			defName="AT_Apparel_pheromone_TP" or
+			defName="AT_Apparel_chunk" or
+			defName="AT_Apparel_barricade" or
+			defName="AT_Apparel_bunker"
+			]/statBases </xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Misc/Weapons.xml b/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Misc/Weapons.xml
new file mode 100644
index 0000000000..4cb21c029e
--- /dev/null
+++ b/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Misc/Weapons.xml	
@@ -0,0 +1,518 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==========  Halberd  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_Halberd"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Axe</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>47</power>
+					<cooldownTime>2.9</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>
+				<li Class="CombatExtended.ToolCE">
+					<label>Hook</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.31</cooldownTime>
+					<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AT_Halberd"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>1.08</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AT_Halberd"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.22</MeleeCritChance>
+				<MeleeParryChance>1.53</MeleeParryChance>
+				<MeleeDodgeChance>0.67</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- ==========  Hammer  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_Hammer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>2.67</cooldownTime>
+					<armorPenetrationBlunt>15.75</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AT_Hammer"]/statBases</xpath>
+		<value>
+			<Bulk>16</Bulk>
+			<MeleeCounterParryBonus>0.28</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AT_Hammer"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.6</MeleeCritChance>
+				<MeleeParryChance>0.38</MeleeParryChance>
+				<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- ==========  Sickle  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_Sickle"]/tools</xpath>
+		<value>
+			<tools>
+				<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>
+				<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>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AT_Sickle"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
+			<Bulk>3.5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AT_Sickle"]</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="AT_Sickle"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Base Rifle =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AT_AcidRifle</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>10.03</Bulk>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>1.14</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_AntyAcidRifle</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>18</ticksBetweenBurstShots>
+			<range>51</range>
+			<soundCast>ShotAnty_C</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>18</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_AntyAcidRifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Assault Rifle =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AT_AcidAssaultRifle</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.69</SwayFactor>
+			<Bulk>10.03</Bulk>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>0.96</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_AntyAcidRifle</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
+			<range>55</range>
+			<soundCast>ShotAnty_B</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_AntyAcidRifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Line Rifle =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AT_AcidLineRifle</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.69</SwayFactor>
+			<Bulk>9.73</Bulk>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>0.96</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_AntyAcidRifle</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<range>31</range>
+			<soundCast>ShotAnty_B</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_AntyAcidRifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AT_AcidLineRifle"]/weaponTags</xpath>
+		<value>
+			<li>NoSwitch</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Launcher =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AT_AcidLauncher</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.79</SwayFactor>
+			<Bulk>10.03</Bulk>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_AntyAcidLauncher</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>51</range>
+			<ammoConsumedPerShotCount>20</ammoConsumedPerShotCount>
+			<soundCast>ShotAnty_D</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>120</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_AntyAcidLauncher</ammoSet>
+		</AmmoUser>
+		<FireModes>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Glue Launcher =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AT_Combatglue</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>1.31</SwayFactor>
+			<Bulk>5.65</Bulk>
+			<Mass>5.3</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>2.93</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_AntyGlueLauncher</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>62</range>
+			<soundCast>Shot_IncendiaryLauncher</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_AntyGlueLauncher</ammoSet>
+		</AmmoUser>
+		<FireModes>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== LMG =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AT_LMG</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.24</SwayFactor>
+			<Bulk>13.37</Bulk>
+			<Mass>7.40</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>1.22</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_AntyAcidRifle</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
+			<range>48</range>
+			<soundCast>ShotAnty_E</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_AntyAcidRifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Crossbow =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AT_AcidCross</defName>
+		<statBases>
+			<Bulk>6</Bulk>
+			<SwayFactor>1.0</SwayFactor>
+			<ShotSpread>0.5</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Projectile_CrossbowBolt_AntyAcid</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>20</range>
+			<soundCast>Bow_Large</soundCast>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>8</reloadTime>
+			<ammoSet>AmmoSet_AntyAcidCrossbow</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Melee Attacks =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_AcidRifle" or
+			defName="AT_AcidAssaultRifle" or
+			defName="AT_AcidLauncher" or
+			defName="AT_LMG" or
+			defName="AT_Combatglue" or
+			defName="AT_AcidCross"
+			]/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="AT_AcidLineRifle"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.55</cooldownTime>
+					<chanceFactor>0.2</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>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>bayonet</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.55</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Misc/WeaponsP.xml b/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Misc/WeaponsP.xml
new file mode 100644
index 0000000000..df5c4a2850
--- /dev/null
+++ b/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Misc/WeaponsP.xml	
@@ -0,0 +1,322 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Launcher =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AT_hydroheliumion_A</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.79</SwayFactor>
+			<Bulk>10.03</Bulk>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_AntyRedAcidLauncher</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>51</range>
+			<ammoConsumedPerShotCount>20</ammoConsumedPerShotCount>
+			<soundCast>ShotAnty_G</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>8</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>120</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_AntyRedAcidLauncher</ammoSet>
+		</AmmoUser>
+		<FireModes>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Line Rifle =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_hydroheliumion_B"]</xpath>
+		<value>
+			<ThingDef ParentName="BaseMakeableGun_Anty">
+				<defName>AT_hydroheliumion_B</defName>
+				<label>Red Burst Line Rifle</label>
+				<description>It is a weapon developed by Anties to deal with targets with thick armor or strong body itself, such as mechanoids.\n\n Unlike conventional acid weapons, it fires Red Burst, a compound of Anty-acid and Refleum, rather than Anty-acid. Exhibits powerful power.</description>
+				<graphicData>
+					<texPath>Things/Weapons/AT_hydroheliumion_B</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+					<shaderType>TransparentPostLight</shaderType>
+				</graphicData>
+				<soundInteract>hydroheliumion_A</soundInteract>
+				<statBases>
+					<WorkToMake>90000</WorkToMake>
+					<SightsEfficiency>1</SightsEfficiency>
+					<ShotSpread>0.14</ShotSpread>
+					<SwayFactor>1.51</SwayFactor>
+					<Bulk>9.60</Bulk>
+					<Mass>5.45</Mass>
+					<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+				</statBases>
+				<equippedAngleOffset>45</equippedAngleOffset>
+				<weaponTags>
+					<li>hydroheliumion_B</li>
+				</weaponTags>
+				<costList>
+					<AntyExoskeleton>80</AntyExoskeleton>
+					<Refleum>15</Refleum>
+					<Uranium>20</Uranium>
+					<ComponentSpacer>4</ComponentSpacer>
+					<Anty_Recyclecore>1</Anty_Recyclecore>
+				</costList>
+				<verbs>
+					<li Class="CombatExtended.VerbPropertiesCE">
+						<recoilAmount>2.36</recoilAmount>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_AntyRedAcidLine</defaultProjectile>
+						<burstShotCount>3</burstShotCount>
+						<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
+						<warmupTime>0.6</warmupTime>
+						<range>16</range>
+						<soundCast>ShotAnty_G</soundCast>
+						<soundCastTail>GunTail_Light</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</li>
+				</verbs>
+				<comps>
+					<li Class="CombatExtended.CompProperties_AmmoUser">
+						<magazineSize>10</magazineSize>
+						<reloadTime>4</reloadTime>
+						<ammoSet>AmmoSet_AntyRedAcidLine</ammoSet>
+					</li>
+					<li Class="CombatExtended.CompProperties_FireModes">
+						<aimedBurstShotCount>2</aimedBurstShotCount>
+					</li>
+				</comps>
+				<recipeMaker>
+					<skillRequirements>
+						<Crafting>10</Crafting>
+						<Intellectual>10</Intellectual>
+					</skillRequirements>
+					<researchPrerequisite>hydroheliumion_B</researchPrerequisite>
+				</recipeMaker>
+				<tools>
+					<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>
+						<extraMeleeDamages>
+							<li>
+								<def>Anty_Poke</def>
+								<amount>10</amount>
+								<chance>0.35</chance>
+							</li>
+							<li>
+								<def>EMP</def>
+								<amount>12</amount>
+								<chance>0.25</chance>
+							</li>
+							<li>
+								<def>Stun</def>
+								<amount>3</amount>
+								<chance>0.15</chance>
+							</li>
+						</extraMeleeDamages>
+					</li>
+				</tools>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<!-- ========== Cluster =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AT_hydroheliumion_C</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.85</SwayFactor>
+			<Bulk>11.03</Bulk>
+			<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_AntyRedAcidCluster</defaultProjectile>
+			<warmupTime>3</warmupTime>
+			<range>62</range>
+			<ammoConsumedPerShotCount>200</ammoConsumedPerShotCount>
+			<soundCast>ShotAnty_G</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>8</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>5.1</reloadTime>
+			<ammoSet>AmmoSet_AntyRedAcidCluster</ammoSet>
+		</AmmoUser>
+		<FireModes>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Melee Attacks =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_hydroheliumion_A" or
+			defName="AT_hydroheliumion_C"
+			]/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>
+
+	<!-- ========== Melee Attacks =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AT_RedHalberd"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>1.08</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AT_RedHalberd"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.22</MeleeCritChance>
+				<MeleeParryChance>1.53</MeleeParryChance>
+				<MeleeDodgeChance>0.67</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AT_RedHalberd"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>12</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Anty_Poke</def>
+							<amount>15</amount>
+							<chance>1</chance>
+						</li>
+						<li>
+							<def>Anty_Cut</def>
+							<amount>15</amount>
+							<chance>1</chance>
+						</li>
+						<li>
+							<def>EMP</def>
+							<amount>12</amount>
+						</li>
+						<li>
+							<def>Stun</def>
+							<amount>10</amount>
+							<chance>1</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>1.72</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>2.59</armorPenetrationBlunt>
+					<armorPenetrationSharp>20.74</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Axe</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>27</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Anty_Cut</def>
+							<amount>10</amount>
+							<chance>1</chance>
+						</li>
+						<li>
+							<def>EMP</def>
+							<amount>2</amount>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>1.72</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>2.59</armorPenetrationBlunt>
+					<armorPenetrationSharp>9.72</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Hook</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>12</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Anty_Poke</def>
+							<amount>10</amount>
+							<chance>1</chance>
+						</li>
+						<li>
+							<def>Stun</def>
+							<amount>2</amount>
+							<chance>0.8</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>1.72</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>2.59</armorPenetrationBlunt>
+					<armorPenetrationSharp>12.96</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Races/AlienRace_Anty.xml b/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Races/AlienRace_Anty.xml
new file mode 100644
index 0000000000..deb62aac29
--- /dev/null
+++ b/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Races/AlienRace_Anty.xml	
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="AT_PawnBase"]</xpath>
+		<value>
+			<comps>
+			</comps>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="AT_PawnBase"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="AT_PawnBase"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Inventory"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Anty"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Anty"]/statBases</xpath>
+		<value>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>0.5</Suppressability>
+			<SmokeSensitivity>0.9</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!--Only bite-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Anty"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Races/Race_Proty.xml b/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Races/Race_Proty.xml
new file mode 100644
index 0000000000..0a2c5ad0ad
--- /dev/null
+++ b/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Races/Race_Proty.xml	
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Anty_prototype"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Anty_prototype"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Anty_prototype"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Anty_prototype"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>BigJaw</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.78</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.14</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Apex - Rimworld Legends/Defs/Apex - Rimworld Legends/ApexRimworldLegends_AmmoPatch.xml b/ModPatches/Apex - Rimworld Legends/Defs/Apex - Rimworld Legends/ApexRimworldLegends_AmmoPatch.xml
new file mode 100644
index 0000000000..a6c1ec24c3
--- /dev/null
+++ b/ModPatches/Apex - Rimworld Legends/Defs/Apex - Rimworld Legends/ApexRimworldLegends_AmmoPatch.xml	
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoARL127x39mmCharged</defName>
+		<label>127x39mm HE Charged Cartridge</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberChargeLarge</iconPath>
+	</ThingCategoryDef>
+
+	<!-- Ammo Set -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_ARL_127x39mmCharged</defName>
+		<label>127x39mm HE Charged Cartridge</label>
+		<ammoTypes>
+			<Ammo_ARL_127x39mmCharged_HE>Bullet_ARL_127x39mmCharged_HE</Ammo_ARL_127x39mmCharged_HE>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- Ammo -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="40mmChargeMinigunBase" ParentName="AmmoBase" Abstract="True">
+		<description>Specialized 127x39mm HE charged cartridge</description>
+		<statBases>
+			<Mass>0.172</Mass>
+			<Bulk>0.16</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoARL127x39mmCharged</li>
+		</thingCategories>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDEf" ParentName="40mmChargeMinigunBase">
+		<defName>Ammo_ARL_127x39mmCharged_HE</defName>
+		<label>127x39mm HE Charged Cartridge</label>
+		<graphicData>
+			<texPath>Things/Ammo/Charged/LargeIon</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<ammoClass>GrenadeHE</ammoClass>
+		<cookOffProjectile>Bullet_ARL_127x39mmCharged_HE</cookOffProjectile>
+		<comps/>
+	</ThingDef>
+
+	<!-- Projectile -->
+	<ThingDef ParentName="BaseExplosiveBullet">
+		<defName>Bullet_ARL_127x39mmCharged_HE</defName>
+		<graphicData>
+			<texPath>Things/Projectile/Charge_Explosive</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>ARL_Bomb_ChargeMinigun</damageDef>
+			<damageAmountBase>10</damageAmountBase>
+			<explosionRadius>1.4</explosionRadius>
+			<speed>81</speed>
+			<flyOverhead>false</flyOverhead>
+			<dropsCasings>true</dropsCasings>
+		</projectile>
+	</ThingDef>
+
+	<!-- Recipes -->
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_ARL_127x39mmCharged_HE</defName>
+		<label>make 127x39mm HE charged cartridge x100</label>
+		<description>Craft 100 127x39mm HE charged cartridges.</description>
+		<jobString>Making 127x39mm HE charged cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Chemfuel</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Plasteel</li>
+				<li>ComponentIndustrial</li>
+				<li>Chemfuel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_ARL_127x39mmCharged_HE>100</Ammo_ARL_127x39mmCharged_HE>
+		</products>
+	</RecipeDef>
+
+	<ThingDef ParentName="BaseGrenadeProjectile">
+		<defName>Proj_ARL_ChargeGrenade</defName>
+		<graphicData>
+			<texPath>Things/Projectile/arcstar</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>ARL_Bomb_ChargeGrenade</damageDef>
+			<damageAmountBase>40</damageAmountBase>
+			<explosionRadius>1.6</explosionRadius>
+			<explosionDelay>30</explosionDelay>
+			<speed>54</speed>
+			<ai_IsIncendiary>false</ai_IsIncendiary>
+			<flyOverhead>false</flyOverhead>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+		</projectile>
+	</ThingDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeARLArcStar</defName>
+		<label>make arc stars</label>
+		<description>Craft 50 Arc Stars.</description>
+		<jobString>Making Arc Stars.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>13</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Chemfuel</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Plasteel</li>
+				<li>Chemfuel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Proj_ARL_ChargeGrenade>50</Proj_ARL_ChargeGrenade>
+		</products>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Apex - Rimworld Legends/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_AssaultRifles.xml b/ModPatches/Apex - Rimworld Legends/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_AssaultRifles.xml
new file mode 100644
index 0000000000..06c8b36e84
--- /dev/null
+++ b/ModPatches/Apex - Rimworld Legends/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_AssaultRifles.xml	
@@ -0,0 +1,332 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- VK-47 Flatline -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ARL_BullpupRifle</defName>
+		<statBases>
+			<WorkToMake>30000</WorkToMake>
+			<Bulk>8.8</Bulk>
+			<Mass>3.50</Mass>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.82</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>52</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_BullpupRifle"]/label</xpath>
+		<value>
+			<label>VK-47 Flatline</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_BullpupRifle"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.075</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.102</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.075</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- M1A3 Hemlok BF-R -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ARL_BattleRifle</defName>
+		<statBases>
+			<WorkToMake>45000</WorkToMake>
+			<Bulk>4.5</Bulk>
+			<Mass>4.5</Mass>
+			<SightsEfficiency>1.2</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.2</SwayFactor>
+			<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.65</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>5.66</ticksBetweenBurstShots>
+			<warmupTime>1.0</warmupTime>
+			<range>50</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>2.4</reloadTime>
+			<ammoSet>AmmoSet_303British</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_BattleRifle"]/label</xpath>
+		<value>
+			<label>M1A3 Hemlok BF-R</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_BattleRifle"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.075</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.102</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.075</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- R-301 Carbine -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ARL_AssaultCarbine</defName>
+		<statBases>
+			<WorkToMake>35000</WorkToMake>
+			<Bulk>3.5</Bulk>
+			<Mass>2.5</Mass>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>1.16</ShotSpread>
+			<SwayFactor>0.85</SwayFactor>
+			<RangedWeapon_Cooldown>1.7</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.40</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
+			<burstShotCount>14</burstShotCount>
+			<ticksBetweenBurstShots>4.2</ticksBetweenBurstShots>
+			<warmupTime>1</warmupTime>
+			<range>46</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>28</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_FN57x28mm</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_AssaultCarbine"]/label</xpath>
+		<value>
+			<label>R-301 Carbine</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_AssaultCarbine"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.102</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Havoc -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ARL_MechanoidRifle</defName>
+		<statBases>
+			<WorkToMake>75000</WorkToMake>
+			<Bulk>12</Bulk>
+			<Mass>4.2</Mass>
+			<SightsEfficiency>2.1</SightsEfficiency>
+			<ShotSpread>0.5</ShotSpread>
+			<SwayFactor>1.7</SwayFactor>
+			<RangedWeapon_Cooldown>3</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.96</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x40mmCharged</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5.2</ticksBetweenBurstShots>
+			<warmupTime>1</warmupTime>
+			<range>58</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>36</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_8x40mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_MechanoidRifle"]/label</xpath>
+		<value>
+			<label>Havoc</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_MechanoidRifle"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.86</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.118</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.86</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Apex - Rimworld Legends/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_Grenades.xml b/ModPatches/Apex - Rimworld Legends/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_Grenades.xml
new file mode 100644
index 0000000000..9964f8a4a0
--- /dev/null
+++ b/ModPatches/Apex - Rimworld Legends/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_Grenades.xml	
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Arc Star -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ARL_ChargeGrenade</defName>
+		<statBases>
+			<WorkToMake>16000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>3.66</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Proj_ARL_ChargeGrenade</defaultProjectile>
+			<warmupTime>0.85</warmupTime>
+			<range>16</range>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<onlyManualCast>true</onlyManualCast>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+			<noiseRadius>4</noiseRadius>
+			<soundCast>ARL_Throw_ChargeGrenade</soundCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<weaponTags>
+			<li>CE_AI_Grenade</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_ChargeGrenade"]/label</xpath>
+		<value>
+			<label>Arc Star</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_ChargeGrenade"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1</cooldownTime>
+					<armorPenetrationSharp>1.20</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.96</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Smoke Grenade -->
+	<!-- Projectile -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_Projectile_SmokeGrenade"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_Projectile_SmokeGrenade"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<damageDef>Smoke</damageDef>
+				<suppressionFactor>0.0</suppressionFactor>
+				<dangerFactor>0.0</dangerFactor>
+				<explosionRadius>4.3</explosionRadius>
+				<damageAmountBase>10</damageAmountBase>
+				<explosionDelay>60</explosionDelay>
+				<dropsCasings>true</dropsCasings>
+				<postExplosionGasType>BlindSmoke</postExplosionGasType>
+				<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+				<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+			</projectile>
+		</value>
+	</Operation>
+
+	<!-- Grenade -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_SmokeGrenade"]/label</xpath>
+		<value>
+			<label>Bangalore Smoke Grenade</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ARL_SmokeGrenade"]</xpath>
+		<value>
+			<thingClass>CombatExtended.AmmoThing</thingClass>
+			<stackLimit>75</stackLimit>
+			<resourceReadoutPriority>First</resourceReadoutPriority>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="ARL_SmokeGrenade"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="ARL_SmokeGrenade"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="ARL_SmokeGrenade"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ARL_SmokeGrenade</defName>
+		<statBases>
+			<Mass>0.4</Mass>
+			<MarketValue>2.25</MarketValue>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<label>throw Smoke grenade</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>ARL_Projectile_SmokeGrenade</defaultProjectile>
+			<range>16</range>
+			<minRange>4</minRange>
+			<warmupTime>1.8</warmupTime>
+			<soundCast>ThrowGrenade</soundCast>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+			<onlyManualCast>true</onlyManualCast>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<weaponTags>
+			<li>CE_AI_Grenade</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Toxic Grenade -->
+	<!-- Projectile -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_Projectile_ToxicGrenade"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_Projectile_ToxicGrenade"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<damageDef>ARL_ToxicGas</damageDef>
+				<explosionRadius>3.9</explosionRadius>
+				<damageAmountBase>10</damageAmountBase>
+				<explosionDelay>60</explosionDelay>
+				<dropsCasings>true</dropsCasings>
+				<soundExplode>DispensePaste</soundExplode>
+				<postExplosionSpawnThingDef>ARL_ToxicGasCloud</postExplosionSpawnThingDef>
+				<postExplosionSpawnChance>1</postExplosionSpawnChance>
+				<postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+				<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+			</projectile>
+		</value>
+	</Operation>
+
+	<!-- Grenade -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_ToxicGrenade"]/label</xpath>
+		<value>
+			<label>Caustic Nox Grenade</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ARL_ToxicGrenade"]</xpath>
+		<value>
+			<thingClass>CombatExtended.AmmoThing</thingClass>
+			<stackLimit>75</stackLimit>
+			<resourceReadoutPriority>First</resourceReadoutPriority>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="ARL_ToxicGrenade"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="ARL_ToxicGrenade"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="ARL_ToxicGrenade"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ARL_ToxicGrenade</defName>
+		<statBases>
+			<Mass>0.4</Mass>
+			<MarketValue>2.25</MarketValue>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<label>throw toxic grenade</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>ARL_Projectile_ToxicGrenade</defaultProjectile>
+			<range>16</range>
+			<minRange>4</minRange>
+			<warmupTime>3.5</warmupTime>
+			<soundCast>ThrowGrenade</soundCast>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+			<onlyManualCast>true</onlyManualCast>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<weaponTags>
+			<li>CE_AI_Grenade</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Apex - Rimworld Legends/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_Launchers.xml b/ModPatches/Apex - Rimworld Legends/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_Launchers.xml
new file mode 100644
index 0000000000..ab06ea53db
--- /dev/null
+++ b/ModPatches/Apex - Rimworld Legends/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_Launchers.xml	
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Quad Rocket Launcher -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ARL_MechanoidRocketLauncher</defName>
+		<statBases>
+			<WorkToMake>75000</WorkToMake>
+			<Bulk>18</Bulk>
+			<Mass>8</Mass>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.8</SwayFactor>
+			<RangedWeapon_Cooldown>10</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>3.45</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_M74_Incendiary</defaultProjectile>
+			<burstShotCount>8</burstShotCount>
+			<ticksBetweenBurstShots>16</ticksBetweenBurstShots>
+			<warmupTime>3.33</warmupTime>
+			<range>48</range>
+			<minRange>5</minRange>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>15</reloadTime>
+			<ammoSet>AmmoSet_M74</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_AI_Launcher</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_MechanoidRocketLauncher"]/label</xpath>
+		<value>
+			<label>Rocket Launcher</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_MechanoidRocketLauncher"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.86</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.118</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.86</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- R-6P Softball -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ARL_GrenadeLauncher</defName>
+		<statBases>
+			<WorkToMake>16000</WorkToMake>
+			<Bulk>5.65</Bulk>
+			<Mass>5.3</Mass>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>1.31</SwayFactor>
+			<RangedWeapon_Cooldown>2.67</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.93</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
+			<burstShotCount>1</burstShotCount>
+			<warmupTime>2.5</warmupTime>
+			<range>44</range>
+			<minRange>4</minRange>
+			<soundCast>Shot_IncendiaryLauncher</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>5.1</reloadTime>
+			<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_AI_Launcher</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_GrenadeLauncher"]/label</xpath>
+		<value>
+			<label>R-6P Softball</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_GrenadeLauncher"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.86</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.118</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.86</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Apex - Rimworld Legends/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_MachineGuns.xml b/ModPatches/Apex - Rimworld Legends/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_MachineGuns.xml
new file mode 100644
index 0000000000..f18671c28b
--- /dev/null
+++ b/ModPatches/Apex - Rimworld Legends/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_MachineGuns.xml	
@@ -0,0 +1,345 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- M600 Spitfire -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ARL_HMG</defName>
+		<statBases>
+			<WorkToMake>50000</WorkToMake>
+			<Bulk>14.05</Bulk>
+			<Mass>10.5</Mass>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.51</SwayFactor>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.33</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<burstShotCount>21</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>1.25</warmupTime>
+			<range>60</range>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>63</magazineSize>
+			<reloadTime>3.33</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_Machinegun</li>
+		</weaponTags>
+		<researchPrerequisite>GasOperation</researchPrerequisite>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_HMG"]/label</xpath>
+		<value>
+			<label>M600 Spitfire</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_HMG"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.6</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.102</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetrationBlunt>0.102</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetrationBlunt>0.075</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- L-Star -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ARL_MechanoidLMG</defName>
+		<statBases>
+			<WorkToMake>100000</WorkToMake>
+			<Bulk>14.7</Bulk>
+			<Mass>11.3</Mass>
+			<SightsEfficiency>1.2</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.16</SwayFactor>
+			<RangedWeapon_Cooldown>5.5</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.23</recoilAmount>
+			<recoilPattern>Mounted</recoilPattern>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
+			<burstShotCount>20</burstShotCount>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<warmupTime>1.25</warmupTime>
+			<range>64</range>
+			<soundCast>Shot_ChargeBlaster</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>80</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+		<researchPrerequisite>GasOperation</researchPrerequisite>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_MechanoidLMG"]/label</xpath>
+		<value>
+			<label>L-Star</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_MechanoidLMG"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.086</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Poke</li>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.118</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.086</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>
+					</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Devotion -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ARL_ChargeLMG</defName>
+		<statBases>
+			<WorkToMake>55000</WorkToMake>
+			<Bulk>12.5</Bulk>
+			<Mass>12.5</Mass>
+			<SightsEfficiency>1.5</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.1</SwayFactor>
+			<RangedWeapon_Cooldown>1.80</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.23</recoilAmount>
+			<recoilPattern>Mounted</recoilPattern>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
+			<burstShotCount>15</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>1.8</warmupTime>
+			<range>58</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>60</magazineSize>
+			<reloadTime>2.8</reloadTime>
+			<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>10</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+		</weaponTags>
+		<researchPrerequisite>GasOperation</researchPrerequisite>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_ChargeLMG"]/label</xpath>
+		<value>
+			<label>Devotion</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_ChargeLMG"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.6</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.102</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetrationBlunt>0.102</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetrationBlunt>0.075</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- 40mm Charge Minigun -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ARL_ChargeMinigun</defName>
+		<statBases>
+			<WorkToMake>105000</WorkToMake>
+			<Bulk>14.7</Bulk>
+			<Mass>9.12</Mass>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.53</SwayFactor>
+			<RangedWeapon_Cooldown>0.90</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.98</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_ARL_127x39mmCharged_HE</defaultProjectile>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>18</ticksBetweenBurstShots>
+			<warmupTime>1.75</warmupTime>
+			<range>52</range>
+			<minRange>2</minRange>
+			<soundCast>ARL_Shot_ChargeMinigun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>60</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_ARL_127x39mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_Machinegun</li>
+		</weaponTags>
+		<researchPrerequisite>GasOperation</researchPrerequisite>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_ChargeMinigun"]/label</xpath>
+		<value>
+			<label>Charge Minigun</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_ChargeMinigun"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.86</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.118</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.86</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Apex - Rimworld Legends/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_Pistols.xml b/ModPatches/Apex - Rimworld Legends/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_Pistols.xml
new file mode 100644
index 0000000000..1e91c0bdd0
--- /dev/null
+++ b/ModPatches/Apex - Rimworld Legends/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_Pistols.xml	
@@ -0,0 +1,330 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Hammond P2020 -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ARL_CombatHandgun</defName>
+		<statBases>
+			<WorkToMake>5000</WorkToMake>
+			<Bulk>1.2</Bulk>
+			<Mass>1.2</Mass>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1</SwayFactor>
+			<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_38ACP_FMJ</defaultProjectile>
+			<warmupTime>0.3</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>1.25</reloadTime>
+			<ammoSet>AmmoSet_38ACP</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_CombatHandgun"]/label</xpath>
+		<value>
+			<label>Hammond P2020</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_CombatHandgun"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.075</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.102</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.075</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Re-45 -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ARL_ChargePistol</defName>
+		<statBases>
+			<WorkToMake>10000</WorkToMake>
+			<Bulk>1.75</Bulk>
+			<Mass>0.85</Mass>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>0.87</SwayFactor>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.60</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
+			<burstShotCount>15</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>14</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>1.74</reloadTime>
+			<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_ChargePistol"]/label</xpath>
+		<value>
+			<label>Re-45 Autopistol</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_ChargePistol"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.102</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.102</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Wingman -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ARL_HandCannon</defName>
+		<statBases>
+			<WorkToMake>4500</WorkToMake>
+			<Bulk>2.1</Bulk>
+			<Mass>0.82</Mass>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.19</ShotSpread>
+			<SwayFactor>0.91</SwayFactor>
+			<RangedWeapon_Cooldown>1.4</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.42</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>0.46</warmupTime>
+			<range>16</range>
+			<soundCast>Shot_Revolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>3.66</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_HandCannon"]/label</xpath>
+		<value>
+			<label>B3 Wingman</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_HandCannon"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.075</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.102</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.075</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Mozambique -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ARL_ShotgunHandgun</defName>
+		<statBases>
+			<WorkToMake>6000</WorkToMake>
+			<Bulk>1.6</Bulk>
+			<Mass>0.82</Mass>
+			<SightsEfficiency>0.9</SightsEfficiency>
+			<ShotSpread>0.19</ShotSpread>
+			<SwayFactor>0.91</SwayFactor>
+			<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>3.76</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_38ACP_FMJ</defaultProjectile>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<warmupTime>1.8</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Revolver</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>3.66</reloadTime>
+			<ammoSet>AmmoSet_38ACP</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_ShotgunHandgun"]/label</xpath>
+		<value>
+			<label>SA-3 Mozambique</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_ShotgunHandgun"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.102</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Apex - Rimworld Legends/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_SMG.xml b/ModPatches/Apex - Rimworld Legends/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_SMG.xml
new file mode 100644
index 0000000000..9a9051108c
--- /dev/null
+++ b/ModPatches/Apex - Rimworld Legends/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_SMG.xml	
@@ -0,0 +1,255 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Alternator -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ARL_LightSMG</defName>
+		<statBases>
+			<WorkToMake>11500</WorkToMake>
+			<Bulk>2.5</Bulk>
+			<Mass>0.85</Mass>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>0.85</SwayFactor>
+			<RangedWeapon_Cooldown>1.4</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.22</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_41Rimfire_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>0.5</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>18</magazineSize>
+			<reloadTime>3.2</reloadTime>
+			<ammoSet>AmmoSet_41Rimfire</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_SMG</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_LightSMG"]/label</xpath>
+		<value>
+			<label>Alternator SMG</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_LightSMG"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.075</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.102</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- R-99 SMG -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ARL_CompactSMG</defName>
+		<statBases>
+			<WorkToMake>24000</WorkToMake>
+			<Bulk>3.5</Bulk>
+			<Mass>3.5</Mass>
+			<SightsEfficiency>1.2</SightsEfficiency>
+			<ShotSpread>1.03</ShotSpread>
+			<SwayFactor>1.5</SwayFactor>
+			<RangedWeapon_Cooldown>1.33</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.55</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<burstShotCount>4</burstShotCount>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<warmupTime>1</warmupTime>
+			<range>26</range>
+			<soundCast>Shot_HeavySMG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>18</magazineSize>
+			<reloadTime>1.80</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_SMG</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_CompactSMG"]/label</xpath>
+		<value>
+			<label>R-99 SMG</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_CompactSMG"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.075</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.102</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Prowler Burst PDW -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ARL_ChargeSMG</defName>
+		<statBases>
+			<WorkToMake>29000</WorkToMake>
+			<Bulk>3.68</Bulk>
+			<Mass>2.5</Mass>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>0.85</SwayFactor>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.41</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>0.9</warmupTime>
+			<range>28</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>21</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_SMG</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_ChargeSMG"]/label</xpath>
+		<value>
+			<label>Prowler Burst PDW</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_ChargeSMG"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.075</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.102</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.075</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Apex - Rimworld Legends/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_Shotguns.xml b/ModPatches/Apex - Rimworld Legends/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_Shotguns.xml
new file mode 100644
index 0000000000..7032d45614
--- /dev/null
+++ b/ModPatches/Apex - Rimworld Legends/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_Shotguns.xml	
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Mastiff -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ARL_ChargeShotgun</defName>
+		<statBases>
+			<WorkToMake>48000</WorkToMake>
+			<Bulk>9</Bulk>
+			<Mass>3.5</Mass>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.25</SwayFactor>
+			<RangedWeapon_Cooldown>1.58</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.39</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12GaugeCharged_Slug</defaultProjectile>
+			<warmupTime>1.36</warmupTime>
+			<range>16</range>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>4</magazineSize>
+			<reloadTime>6</reloadTime>
+			<ammoSet>AmmoSet_12GaugeCharged</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_ChargeShotgun"]/label</xpath>
+		<value>
+			<label>M1901 Mastiff</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_ChargeShotgun"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.102</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Peacekeeper -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ARL_LeverActionShotgun</defName>
+		<statBases>
+			<WorkToMake>13000</WorkToMake>
+			<Bulk>4.2</Bulk>
+			<Mass>2.3</Mass>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.20</SwayFactor>
+			<RangedWeapon_Cooldown>0.91</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.56</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.9</warmupTime>
+			<range>18</range>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>10</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_LeverActionShotgun"]/label</xpath>
+		<value>
+			<label>Peacepeeker</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "ARL_LeverActionShotgun"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.118</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- EVA-8 Auto -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ARL_SemiAutomaticShotgun</defName>
+		<statBases>
+			<WorkToMake>33000</WorkToMake>
+			<Bulk>4.6</Bulk>
+			<Mass>4.6</Mass>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.26</SwayFactor>
+			<RangedWeapon_Cooldown>1.35</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.12</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>16</range>
+			<soundCast>Shot_Shotgun_NoRack</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>2.75</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_SemiAutomaticShotgun"]/label</xpath>
+		<value>
+			<label>Eva-8 Auto</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_SemiAutomaticShotgun"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.118</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.118</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.086</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Apex - Rimworld Legends/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_SniperRifles.xml b/ModPatches/Apex - Rimworld Legends/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_SniperRifles.xml
new file mode 100644
index 0000000000..0783ef9cf3
--- /dev/null
+++ b/ModPatches/Apex - Rimworld Legends/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_SniperRifles.xml	
@@ -0,0 +1,328 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Longbow DMR -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ARL_MarksmanRifle</defName>
+		<statBases>
+			<WorkToMake>55000</WorkToMake>
+			<Bulk>12.25</Bulk>
+			<Mass>4.3</Mass>
+			<SightsEfficiency>3.5</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.70</SwayFactor>
+			<RangedWeapon_Cooldown>2.3</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.36</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>3</warmupTime>
+			<range>86</range>
+			<soundCast>Shot_SniperRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>2.82</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SniperRifle</li>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_MarksmanRifle"]/label</xpath>
+		<value>
+			<label>D-101 Longbow DMR</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_MarksmanRifle"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.086</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Barrel</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.118</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.086</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Triple Take -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ARL_ChargeSniperRifle</defName>
+		<statBases>
+			<WorkToMake>48000</WorkToMake>
+			<Bulk>12.24</Bulk>
+			<Mass>4.3</Mass>
+			<SightsEfficiency>2</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.92</SwayFactor>
+			<RangedWeapon_Cooldown>2.3</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.11</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_5656Spencer_FMJ</defaultProjectile>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<warmupTime>3.5</warmupTime>
+			<range>68</range>
+			<soundCast>Shot_SniperRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>3.2</reloadTime>
+			<ammoSet>AmmoSet_5656Spencer</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>SniperRifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_ChargeSniperRifle"]/label</xpath>
+		<value>
+			<label>Triple Take</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_ChargeSniperRifle"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.086</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.118</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.86</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- G7 Scout -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ARL_SemiautomaticRifle</defName>
+		<statBases>
+			<WorkToMake>23500</WorkToMake>
+			<Bulk>9.8</Bulk>
+			<Mass>3.0</Mass>
+			<SightsEfficiency>1.66</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.31</SwayFactor>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.96</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
+			<warmupTime>0.90</warmupTime>
+			<range>64</range>
+			<soundCast>Shot_SniperRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4.0</reloadTime>
+			<ammoSet>AmmoSet_338Lapua</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>SniperRifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_SemiautomaticRifle"]/label</xpath>
+		<value>
+			<label>G7 Scout</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_SemiautomaticRifle"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.86</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.118</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.086</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Kraber -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ARL_MechanoidSniperRifle</defName>
+		<statBases>
+			<WorkToMake>100000</WorkToMake>
+			<Bulk>14.6</Bulk>
+			<Mass>13.53</Mass>
+			<SightsEfficiency>3</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>2.23</SwayFactor>
+			<RangedWeapon_Cooldown>3.13</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>3.21</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>3.5</warmupTime>
+			<range>106</range>
+			<soundCast>ARL_Shot_MechanoidSniperRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>4</magazineSize>
+			<reloadTime>3.6</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>SniperRifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_MechanoidSniperRifle"]/label</xpath>
+		<value>
+			<label>.50 Kraber AM-R</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ARL_MechanoidSniperRifle"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.86</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.116</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.86</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Apparello/Patches/Apparello/ThingDefs/ApparelHats_Famous.xml b/ModPatches/Apparello/Patches/Apparello/ThingDefs/ApparelHats_Famous.xml
new file mode 100644
index 0000000000..038d6c37ad
--- /dev/null
+++ b/ModPatches/Apparello/Patches/Apparello/ThingDefs/ApparelHats_Famous.xml
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Doom helmet ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparello_Doom"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Doom"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Doom"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName = "Apparello_Doom"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+	<!-- ========== Quote hat ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Quotee"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.02</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Quotee"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.03</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<!-- ========== PsyCo mask ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparel_Psymask"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparel_Psymask"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "Apparel_Psymask"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "Apparel_Psymask"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparel_Psymask"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName = "Apparel_Psymask"]</xpath>
+		<value>
+			<li Class="CombatExtended.ApparelHediffExtension">
+				<hediff>WearingGasMask</hediff>
+			</li>
+		</value>
+	</Operation>
+	<!-- ========== Zorro, foot clan ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Zorro" or defName="Apparello_Footy"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.02</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Zorro" or defName="Apparello_Footy"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.03</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<!-- ========== Tali ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparello_Meffect" or defName = "Apparello_Meffectwo"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Meffect" or defName = "Apparello_Meffectwo"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>18</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Meffect" or defName = "Apparello_Meffectwo"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>9</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName = "Apparello_Meffect" or defName = "Apparello_Meffectwo"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+	<!-- ========== Aerocowl ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Kurt" or defName="Apparello_Kurtlite"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Kurt" or defName="Apparello_Kurtlite"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<!-- ========== Scrap mask ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparello_Raideroos"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Raideroos"]/stuffCategories/li[.="Metallic"]</xpath>
+		<value>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+	<!-- ========== Infiltrator headgear ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparello_Yi"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Yi"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<AimingAccuracy>0.05</AimingAccuracy>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName = "Apparello_Yi"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+	<!-- ========== Raz ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Raz"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.08</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Raz"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Apparello/Patches/Apparello/ThingDefs/ApparelHats_FurEyes.xml b/ModPatches/Apparello/Patches/Apparello/ThingDefs/ApparelHats_FurEyes.xml
new file mode 100644
index 0000000000..b2a0022858
--- /dev/null
+++ b/ModPatches/Apparello/Patches/Apparello/ThingDefs/ApparelHats_FurEyes.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Science goggles, shades, aviators, visors ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparello_Goggles" or defName="Apparello_Shadess" or defName="Apparello_Piloggle"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>0.02</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Visoor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.02</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Goggles" or defName="Apparello_Visoor" or defName="Apparello_Shadess" or defName="Apparello_Piloggle"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.03</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<!-- ========== Ski mask ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Brimsk"]/statBases/Mass</xpath>
+		<value>
+			<Mass>1</Mass>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Brimsk"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Brimsk"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Apparello/Patches/Apparello/ThingDefs/ApparelHats_Various.xml b/ModPatches/Apparello/Patches/Apparello/ThingDefs/ApparelHats_Various.xml
new file mode 100644
index 0000000000..cad7398d2a
--- /dev/null
+++ b/ModPatches/Apparello/Patches/Apparello/ThingDefs/ApparelHats_Various.xml
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Welding mask ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Wendywelder"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<!-- ========== Hardhat ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Hardhat"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Hardhat"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<!-- ========== Chef hats, surgeon ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparello_Chefhat" or defName="Apparello_Docteur"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<ArmorRating_Sharp>0.02</ArmorRating_Sharp>
+			<ArmorRating_Blunt>0.03</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparello_Chefhatplus"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.02</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparello_Chefhatplus"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.03</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<!-- ========== Tac-team headcover ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Cyninja" or defName = "Apparello_Cybissar"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<AimingAccuracy>0.05</AimingAccuracy>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Cyninja" or defName = "Apparello_Cybissar"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Cyninja" or defName = "Apparello_Cybissar"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<!-- ========== Medic helmet ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparello_Medihelmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Medihelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Medihelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName = "Apparello_Medihelmet"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+	<!-- ========== Medic bandana ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Medband"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.015</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Medband"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.01</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<!-- ========== Nerve enhancer ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparello_Proto" or defName = "Apparello_ProtoFin"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Proto" or defName = "Apparello_ProtoFin"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Proto" or defName = "Apparello_ProtoFin"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<!-- ========== Misc ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparello_Wendywelder" or defName = "Apparello_Hardhat" or defName = "Apparello_Moron"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Moron"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Moron"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparello_Sandtrader"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>0.03</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparello_Sandtrader"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>0.02</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "Apparello_Gassy" or defName = "Apparello_Sandtrader"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "Apparello_Gassy" or defName = "Apparello_Sandtrader"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparello_Gassy" or defName="Apparello_Sandtrader"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName = "Apparello_Gassy"]</xpath>
+		<value>
+			<li Class="CombatExtended.ApparelHediffExtension">
+				<hediff>WearingGasMask</hediff>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparello_Bandit" or defName="Apparello_Vandal"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-0.15</SmokeSensitivity>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Apparello/Patches/Apparello/ThingDefs/ApparelLayers.xml b/ModPatches/Apparello/Patches/Apparello/ThingDefs/ApparelLayers.xml
new file mode 100644
index 0000000000..dc10ab36b4
--- /dev/null
+++ b/ModPatches/Apparello/Patches/Apparello/ThingDefs/ApparelLayers.xml
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Apparello_Bandit" or defName="Apparello_Bandal" or defName="Apparello_Beret" or defName="Apparello_Brimsk" or defName="Apparello_Cyninja" or defName="Apparello_Footy" or defName="Apparello_Gassy" or defName="Apparello_Goggles" or defName="Apparello_Headset" or defName="Apparello_Hoood" or defName="Apparello_Medband" or defName="Apparel_Psymask" or defName="Apparello_Raz" or defName="Apparello_Vandal" or defName="Apparello_Shadess" or defName="Apparello_Docteur" or defName="Apparello_Visoor"]/apparel/layers/li[.="Overhead"]</xpath>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparello_Cyninja" or defName="Apparello_Cybissar" or defName="Apparello_Doom" or defName="Apparello_Meffect" or defName="Apparello_Meffectwo" or defName="Apparello_Kurt" or defName="Apparello_Kurtlite" or defName="Apparello_ProtoFin" or defName="Apparello_Proto" or defName="Apparello_Rockman" or defName="Apparello_Wendywelder" or defName="Apparello_Yi" or defName="Apparello_Brimsk" or defName="Apparello_Gassy" or defName="Apparello_Goggles" or defName="Apparello_Headset" or defName="Apparel_Psymask" or defName="Apparello_Shadess" or defName="Apparello_Docteur" or defName="Apparello_Visoor" or defName="Apparello_Sandtrader" or defName="Apparello_Zorro"]/apparel/layers</xpath>
+		<value>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparello_Cyninja" or defName="Apparello_Cybissar" or defName="Apparello_ProtoFin" or defName="Apparello_Proto" or defName="Apparello_Headset" or defName="Apparello_Docteur" or defName="Apparello_Footy" or defName="Apparello_Medband" or defName="Apparello_Vandal"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Tribalshield"]/apparel/layers/li[.="Shell"]</xpath>
+		<value>
+			<li>Shield</li>
+		</value>
+	</Operation>
+	<!-- ====================== Bandit ===================== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparello_Bandit"]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>Overhead</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparello_Bandit"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>Neck</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<!-- ====================== Beret ===================== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparello_Beret"]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>Overhead</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparello_Beret"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>UpperHead</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<!-- ====================== Bandal ===================== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparello_Bandal"]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>Overhead</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparello_Bandal"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>UpperHead</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<!-- ====================== Hood ===================== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparello_Hoood"]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>Overhead</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparello_Hoood"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>UpperHead</li>
+				<li>Neck</li>
+				<li>Ears</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<!-- ====================== Raz ===================== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparello_Raz"]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>Overhead</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparello_Raz"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>UpperHead</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<!-- ====================== Shades ===================== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparello_Shadess"]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>StrappedHead</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparello_Shadess"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>Eyes</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<!-- ====================== Aviator Sunglasses ===================== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparello_Piloggle"]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>StrappedHead</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparello_Piloggle"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>Eyes</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Apparello/Patches/Apparello/ThingDefs/Apparel_Pantaloons.xml b/ModPatches/Apparello/Patches/Apparello/ThingDefs/Apparel_Pantaloons.xml
new file mode 100644
index 0000000000..665f67fbc7
--- /dev/null
+++ b/ModPatches/Apparello/Patches/Apparello/ThingDefs/Apparel_Pantaloons.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparello_Spacemarinepants"]/statBases</xpath>
+		<value>
+			<Bulk>20</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Pollypocket"]/equippedStatOffsets/CarryingCapacity</xpath>
+		<value>
+			<CarryBulk>5</CarryBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName = "Apparello_Pollypocket"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Apparello/Patches/Apparello/ThingDefs/Apparel_RareTheHippogryff.xml b/ModPatches/Apparello/Patches/Apparello/ThingDefs/Apparel_RareTheHippogryff.xml
new file mode 100644
index 0000000000..3f70b87e67
--- /dev/null
+++ b/ModPatches/Apparello/Patches/Apparello/ThingDefs/Apparel_RareTheHippogryff.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Prototype armors ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparello_Scytherframe"]/equippedStatOffsets</xpath>
+		<value>
+			<ReloadSpeed>0.2</ReloadSpeed>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Scytherframe"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Scytherframe"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_HiveArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_HiveArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Steamhull"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Steamhull"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>40.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName = "Apparello_HiveArmor" or defName = "Apparello_Steamhull"]/equippedStatOffsets</xpath>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparello_HiveArmor" or defName = "Apparello_Steamhull"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>25</WornBulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Apparello/Patches/Apparello/ThingDefs/Apparel_Stuffed.xml b/ModPatches/Apparello/Patches/Apparello/ThingDefs/Apparel_Stuffed.xml
new file mode 100644
index 0000000000..6559946e39
--- /dev/null
+++ b/ModPatches/Apparello/Patches/Apparello/ThingDefs/Apparel_Stuffed.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== XCOM ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparello_XcomOne"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>5</CarryBulk>
+		</value>
+	</Operation>
+
+	<!-- ========== Padded vest ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparello_Sheet"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- ========== Ammo belt ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Ammobelt"]/equippedStatOffsets/AimingDelayFactor</xpath>
+		<value>
+			<CarryBulk>5</CarryBulk>
+			<ReloadSpeed>0.05</ReloadSpeed>
+		</value>
+	</Operation>
+
+	<!-- ========== Trader coat ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparello_Trypophobiaa"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparello_Trypophobiaa"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>50</CarryBulk>
+			<ReloadSpeed>0.05</ReloadSpeed>
+		</value>
+	</Operation>
+	<!--
+<li Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName = "Apparello_Trypophobiaa"]/apparel/layers</xpath>
+	<value>
+		<li>Belt</li>
+	</value>
+</li>
+-->
+	<!-- ========== Tribal shield ========== -->
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName = "Apparello_Tribalshield"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>ShieldBase</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Tribalshield"]/apparel</xpath>
+		<value>
+			<apparel>
+				<tags>
+					<li>TribalShield</li>
+				</tags>
+			</apparel>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparello_Tribalshield"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparello_Tribalshield"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<ReloadSpeed>-0.05</ReloadSpeed>
+				<MeleeHitChance>-0.05</MeleeHitChance>
+				<ShootingAccuracyPawn>-0.05</ShootingAccuracyPawn>
+				<AimingAccuracy>-0.05</AimingAccuracy>
+				<Suppressability>-0.25</Suppressability>
+				<MeleeCritChance>-0.05</MeleeCritChance>
+				<MeleeParryChance>1.0</MeleeParryChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName = "Apparello_Tribalshield"]/generateCommonality</xpath>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName = "Apparello_Tribalshield"]</xpath>
+		<value>
+			<li Class="CombatExtended.ShieldDefExtension">
+				<shieldCoverage>
+					<li>Hands</li>
+					<li>Arms</li>
+					<li>Shoulders</li>
+					<li>Torso</li>
+					<li>Neck</li>
+				</shieldCoverage>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Apparello/Patches/Apparello/ThingDefs/Apparel_Stuffless_And_Bases.xml b/ModPatches/Apparello/Patches/Apparello/ThingDefs/Apparel_Stuffless_And_Bases.xml
new file mode 100644
index 0000000000..97f5b08b15
--- /dev/null
+++ b/ModPatches/Apparello/Patches/Apparello/ThingDefs/Apparel_Stuffless_And_Bases.xml
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Alloy vest ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Gspot"]/statBases/Mass</xpath>
+		<value>
+			<Mass>9</Mass>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Gspot"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Gspot"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ========== Medium power armor ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparello_Gshell" or defName="Apparello_GShellII"]/statBases</xpath>
+		<value>
+			<Bulk>20</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Gshell" or defName="Apparello_GShellII"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<CarryWeight>10</CarryWeight>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Gshell" or defName="Apparello_GShellII"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Gshell" or defName="Apparello_GShellII"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>30</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ========== Surgeon's apron ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparello_MedicalApron"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>0.02</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparello_MedicalApron"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>0.03</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ========== Tunica el mogo ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparello_Mogo"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>0.02</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparello_Mogo"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>0.03</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ========== XCOM ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparello_Standissue"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>5</CarryBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Standissue"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.02</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Standissue"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.03</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ========== Chestplate ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparello_Syndicatetello" or defName="Apparello_Syndicatellorare"]/statBases</xpath>
+		<value>
+			<Bulk>20</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName = "Apparello_Syndicatetello"]/equippedStatOffsets</xpath>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Syndicatetello"]/statBases/EnergyShieldRechargeRate</xpath>
+		<value>
+			<EnergyShieldRechargeRate>0.235</EnergyShieldRechargeRate>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Syndicatetello"]/statBases/EnergyShieldEnergyMax</xpath>
+		<value>
+			<EnergyShieldEnergyMax>2</EnergyShieldEnergyMax>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Syndicatetello" or defName="Apparello_Syndicatellorare"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Syndicatetello" or defName="Apparello_Syndicatellorare"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ========== Orkpads ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Orkpad"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Orkpad"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ========== Spacemarine leggings ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Spacemarinepants"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Spacemarinepants"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ========== Joywirer's brocade ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparello_Medicade"]/apparel/layers</xpath>
+		<value>
+			<li>Belt</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Medicade"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<ArmorRating_Sharp>0.01</ArmorRating_Sharp>
+			<ArmorRating_Blunt>0.015</ArmorRating_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Apparello/Patches/Apparello/ThingDefs/StuffPowers.xml b/ModPatches/Apparello/Patches/Apparello/ThingDefs/StuffPowers.xml
new file mode 100644
index 0000000000..803f9b31d6
--- /dev/null
+++ b/ModPatches/Apparello/Patches/Apparello/ThingDefs/StuffPowers.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparello_Bandit"]/statBases</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Brocade" or defName="Apparello_Urbulence" or defName="Apparello_Headset" or defName="Apparello_Vandal"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_GSkin" or defName = "Apparello_XcomOne" or defName="Apparello_SFSurge" or defName="Apparello_Cookaprontosaurus" or defName="Apparello_PonPon" or defName="Apparello_Preston" or defName="Apparello_Urbskin" or defName="Apparello_Suspender" or defName="Apparello_Spacerpants" or defName="Apparello_Holdem" or defName="Apparello_Scrapants" or defName="Apparello_Pollypocket" or defName="Apparello_Jodhpurs" or defName="Apparello_Skirtwirly" or defName="Apparello_square" or defName="Apparello_Commissar" or defName="Apparello_Gassy" or defName="Apparello_Plainhat" or defName="Apparello_Cardshark" or defName="Apparello_Fedora" or defName="Apparello_Beret" or defName="Apparello_Tophat" or defName="Apparello_Bandal" or defName="Apparello_Lecap" or defName="Apparello_Sombrero"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparello_Chapel" or defName="Apparello_TribalPants"]/statBases</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Smithaprontosaurus" or defName="Apparel_UniPjays" or defName="Apparello_Jeans" or defName="Apparello_Lederhose" or defName="Apparello_Tunic" or defName="Apparello_Tradecone"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName = "Apparello_Urpad" or defName="Apparello_Rockman" or defName = "Apparello_Raideroos" or defName = "Apparello_Yi"]/statBases/ArmorRating_Sharp
+			| Defs/ThingDef[defName = "Apparello_Urpad" or defName="Apparello_Rockman" or defName = "Apparello_Raideroos" or defName = "Apparello_Yi"]/statBases/ArmorRating_Blunt </xpath>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparello_Urpad" or defName="Apparello_Ammobelt" or defName="Apparello_Tribalpad" or defName="Apparello_Rockman" or defName = "Apparello_Raideroos" or defName = "Apparello_Yi"]/statBases</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparello_Trypophobiaa" or defName="Apparello_Longlylonglong" or defName="Apparello_Skull" or defName="Apparello_Armorpants" or defName="Apparello_Hoood"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName = "Apparello_Sheet"]/statBases/ArmorRating_Sharp
+			| Defs/ThingDef[defName = "Apparello_Sheet"]/statBases/ArmorRating_Blunt </xpath>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparello_Sheet" or defName="Apparello_Furhat"]/statBases</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparello_Tribalshield" or defName="Apparello_Mojo" or defName="Apparello_Mojotwo" or defName="Apparello_MojoFeather"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>10</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Appliances Expanded/Patches/Appliances Expanded/CA_ChemfuelSmithy.xml b/ModPatches/Appliances Expanded/Patches/Appliances Expanded/CA_ChemfuelSmithy.xml
new file mode 100644
index 0000000000..333d1f31e2
--- /dev/null
+++ b/ModPatches/Appliances Expanded/Patches/Appliances Expanded/CA_ChemfuelSmithy.xml	
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[contains(tradeTags, "CE_AutoEnableCrafting_FueledSmithy")]/tradeTags</xpath>
+		<value>
+			<li>CE_AutoEnableCrafting_CA_ChemfuelSmithy</li>
+			<!-- Reduces patch complexity since MayRequire is allowed on li items -->
+			<li MayRequire="vanillaexpanded.vfeproduction">CE_AutoEnableCrafting_CE_FueledSmithyLarge</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Arachne/Patches/Arachne/AlienRace_Arachne.xml b/ModPatches/Arachne/Patches/Arachne/AlienRace_Arachne.xml
new file mode 100644
index 0000000000..140d108fd7
--- /dev/null
+++ b/ModPatches/Arachne/Patches/Arachne/AlienRace_Arachne.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Arachne"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Arachne"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1</AimingAccuracy>
+			<MeleeCritChance>1.1</MeleeCritChance>
+			<MeleeParryChance>1.1</MeleeParryChance>
+			<ReloadSpeed>1</ReloadSpeed>
+			<Suppressability>1.2</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Arachne"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.90</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>22</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.90</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>22</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>ArachneClawLeft</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.60</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.90</armorPenetrationSharp>
+					<chanceFactor>0.2</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>30</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>ArachneClawRight</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.60</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.90</armorPenetrationSharp>
+					<chanceFactor>0.2</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>30</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Arachne"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Arachne"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Arachne"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Arachne/Patches/Arachne/ApparelNew_Arachne.xml b/ModPatches/Arachne/Patches/Arachne/ApparelNew_Arachne.xml
new file mode 100644
index 0000000000..2a785dce2e
--- /dev/null
+++ b/ModPatches/Arachne/Patches/Arachne/ApparelNew_Arachne.xml
@@ -0,0 +1,401 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Arachne Shirt -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Arachne_Shirt"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachne_Shirt"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Arachne Valkyrie Armor -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Arachne_Valkyrie"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>18</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachne_Valkyrie"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.15</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Arachne_Valkyrie"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachne_Valkyrie"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>-0.15</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Arachne_Valkyrie"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Arachne_Valkyrie"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Arachne Valkyrie Helmet -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Arachne_Valkyrie_Helmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachne_Valkyrie_Helmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.45</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Arachne_Valkyrie_Helmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Arachne Scout Armor -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Arachne_Scout_Armor"]/statBases</xpath>
+		<value>
+			<Bulk>90</Bulk>
+			<WornBulk>13</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachne_Scout_Armor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>450</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachne_Scout_Armor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>40</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachne_Scout_Armor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0.2</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachne_Scout_Armor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachne_Scout_Armor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>40</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachne_Scout_Armor"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>140</Plasteel>
+			<DevilstrandCloth>40</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Arachne_Scout_Armor"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Arachne_Scout_Armor"]/equippedStatOffsets/WorkSpeedGlobal</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Arachne_Scout_Armor"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Arachne_Scout_Armor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>8</CarryBulk>
+			<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			<MoveSpeed>0.3</MoveSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Arachne_Scout_Armor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Arachne_Scout_Armor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Arachne Scout Helmet -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Arachne_Scout_Helmet"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.7</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachne_Scout_Helmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>190</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachne_Scout_Helmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>3.0</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachne_Scout_Helmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0.25</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachne_Scout_Helmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachne_Scout_Helmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>30</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachne_Scout_Helmet"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>50</Plasteel>
+			<DevilstrandCloth>15</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Arachne_Scout_Helmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Arachne_Scout_Helmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Arachne_Scout_Helmet"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingAccuracy>0.15</AimingAccuracy>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Arachne_Scout_Helmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Arachne_Scout_Helmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.50</ArmorRating_Sharp>
+						<parts>
+							<li>Nose</li>
+							<li>Jaw</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.50</ArmorRating_Blunt>
+						<parts>
+							<li>Nose</li>
+							<li>Jaw</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Arachne/Patches/Arachne/Apparel_Arachne.xml b/ModPatches/Arachne/Patches/Arachne/Apparel_Arachne.xml
new file mode 100644
index 0000000000..c50471c153
--- /dev/null
+++ b/ModPatches/Arachne/Patches/Arachne/Apparel_Arachne.xml
@@ -0,0 +1,369 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Arachne Battle Armor -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Arachne_Armor"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachne_Armor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Arachne_Armor"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachne_Armor"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>-0.15</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Arachne_Armor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Arachne_Armor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Arachne Battle Helmet -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Arachne_Armor_Helmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachne_Armor_Helmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.35</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Arachne_Armor_Helmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Arachne Assassin Armor -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Arachne_Power_Armor"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachne_Power_Armor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>500</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachne_Power_Armor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>47</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachne_Power_Armor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachne_Power_Armor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachne_Power_Armor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachne_Power_Armor"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>160</Plasteel>
+			<DevilstrandCloth>50</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Arachne_Power_Armor"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Arachne_Power_Armor"]/equippedStatOffsets/WorkSpeedGlobal</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Arachne_Power_Armor"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Arachne_Power_Armor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>80</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+			<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Arachne_Power_Armor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Arachne_Power_Armor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Arachne Assassin Helmet -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Arachne_Power_Helmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachne_Power_Helmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>240</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachne_Power_Helmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>4.8</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachne_Power_Helmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachne_Power_Helmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachne_Power_Helmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachne_Power_Helmet"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>60</Plasteel>
+			<DevilstrandCloth>20</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Arachne_Power_Helmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Arachne_Power_Helmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Arachne_Power_Helmet"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingAccuracy>0.15</AimingAccuracy>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Arachne_Power_Helmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Arachne_Power_Helmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Arachne/Patches/Arachne/Leather_Arachne.xml b/ModPatches/Arachne/Patches/Arachne/Leather_Arachne.xml
new file mode 100644
index 0000000000..e3c721b8ed
--- /dev/null
+++ b/ModPatches/Arachne/Patches/Arachne/Leather_Arachne.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Leather_Arachne"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.30</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Arachne"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.20</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Leather_Arachne"]/stuffProps</xpath>
+		<value>
+			<categories>
+				<li>SoftArmor</li>
+			</categories>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Arachne/Patches/Arachne/MeleeWeapons_Arachne.xml b/ModPatches/Arachne/Patches/Arachne/MeleeWeapons_Arachne.xml
new file mode 100644
index 0000000000..0e74e1b3e7
--- /dev/null
+++ b/ModPatches/Arachne/Patches/Arachne/MeleeWeapons_Arachne.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Arachne Sword -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachne_Sword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.1</cooldownTime>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>38</power>
+					<cooldownTime>3</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationSharp>4</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Arachne_Sword"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>3</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Arachne_Sword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.60</MeleeCritChance>
+				<MeleeParryChance>0.375</MeleeParryChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Arachne Scythe -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachne_Scythe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2.46</cooldownTime>
+					<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>2.83</cooldownTime>
+					<chanceFactor>1.122</chanceFactor>
+					<armorPenetrationSharp>5.065</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Arachne_Scythe"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>0.69</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Arachne_Scythe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.1</MeleeCritChance>
+				<MeleeParryChance>0.63</MeleeParryChance>
+				<MeleeDodgeChance>0.67</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Arachne/Patches/Arachne/PawnKind_Arachne.xml b/ModPatches/Arachne/Patches/Arachne/PawnKind_Arachne.xml
new file mode 100644
index 0000000000..b45ed9036c
--- /dev/null
+++ b/ModPatches/Arachne/Patches/Arachne/PawnKind_Arachne.xml
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Arachne_Colonist"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>1</min>
+					<max>3</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>50</min>
+							<max>1000</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Arachne_Settler"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>1</min>
+					<max>3</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>50</min>
+							<max>1000</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Arachne_Trader"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>1</min>
+					<max>1</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>500</min>
+							<max>2000</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Arachne_Soldier"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>1000</min>
+							<max>3000</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+							<li>ArachneSword</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Arachne_Valkyrie"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>1000</min>
+							<max>3000</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+							<li>ArachneSword</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Arachne_Scout"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>1000</min>
+							<max>3000</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+							<li>ArachneSword</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="ArachneGrenadierBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>2000</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+							<li>ArachneSword</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="ArachneMidTierBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>2000</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+							<li>ArachneSword</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="ArachneEliteTierBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>2000</min>
+							<max>5000</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+							<li>ArachneSword</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Arachne/Patches/Arachne/Weapons_Arachne.xml b/ModPatches/Arachne/Patches/Arachne/Weapons_Arachne.xml
new file mode 100644
index 0000000000..a3dccb9a7e
--- /dev/null
+++ b/ModPatches/Arachne/Patches/Arachne/Weapons_Arachne.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ArachnePninety</defName>
+		<statBases>
+			<Mass>3.5</Mass>
+			<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.2</SightsEfficiency>
+			<ShotSpread>0.3</ShotSpread>
+			<SwayFactor>0.5</SwayFactor>
+			<Bulk>4.5</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.1</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>30</range>
+			<burstShotCount>9</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>Shot_SMG</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>6</reloadTime>
+			<ammoSet>AmmoSet_FN57x28mm</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>ArachneWeapon</li>
+		</weaponTags>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ArachnePninety"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.999</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.9</cooldownTime>
+					<armorPenetrationBlunt>0.777</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.9</cooldownTime>
+					<armorPenetrationBlunt>0.888</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Arasaka Corporation [1.3]/Defs/Arasaka Corporation [1.3]/7mmMiniRailgun.xml b/ModPatches/Arasaka Corporation [1.3]/Defs/Arasaka Corporation [1.3]/7mmMiniRailgun.xml
new file mode 100644
index 0000000000..8c462579ec
--- /dev/null
+++ b/ModPatches/Arasaka Corporation [1.3]/Defs/Arasaka Corporation [1.3]/7mmMiniRailgun.xml	
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>Ammo7mmMiniRailgun</defName>
+		<label>7mm Railgun</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRailgunPistol</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_7mmMiniRailgun</defName>
+		<label>7mm Railgun</label>
+		<ammoTypes>
+			<Ammo_7mmMiniRailgun_Sabot>Bullet_7mmMiniRailgun_Sabot</Ammo_7mmMiniRailgun_Sabot>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_7mmMiniRailgun_Sabot</defName>
+		<label>7mm Railgun cartridge (Sabot)</label>
+		<description>Powerful tungsten carbide penetrator with discarding sabot, designed for railgun pistols.</description>
+		<statBases>
+			<Mass>0.01</Mass>
+			<Bulk>0.012</Bulk>
+			<MarketValue>0.06</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+			<!-- Railgun ammo isn't handloaded because it contains no propellant, and the sabots must be precision-machined anyway -->
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo7mmMiniRailgun</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>Things/Ammo/Railgun/Pistol</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>RailgunSabot</ammoClass>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base45ACPBullet">
+		<defName>Bullet_7mmMiniRailgun_Sabot</defName>
+		<label>7mm Railgun bullet (Sabot)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>14</damageAmountBase>
+			<armorPenetrationSharp>20</armorPenetrationSharp>
+			<armorPenetrationBlunt>76.720</armorPenetrationBlunt>
+			<speed>202</speed>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_7mmMiniRailgun_Sabot</defName>
+		<label>make 7mm Railgun cartridge (Sabot) x500</label>
+		<description>Craft 500 7mm Railgun (Sabot) cartridges.</description>
+		<jobString>Making 7mm Railgun (Sabot) cartridges.</jobString>
+		<workAmount>5000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>9</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Uranium</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_7mmMiniRailgun_Sabot>500</Ammo_7mmMiniRailgun_Sabot>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Arasaka Corporation [1.3]/Defs/Arasaka Corporation [1.3]/BigBrainGyrojet.xml b/ModPatches/Arasaka Corporation [1.3]/Defs/Arasaka Corporation [1.3]/BigBrainGyrojet.xml
new file mode 100644
index 0000000000..763f9be429
--- /dev/null
+++ b/ModPatches/Arasaka Corporation [1.3]/Defs/Arasaka Corporation [1.3]/BigBrainGyrojet.xml	
@@ -0,0 +1,232 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>Ammo6mmSmartGyrojet</defName>
+		<label>6mm Smart</label>
+		<parent>AmmoPistols</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_6mmSmartGyrojet</defName>
+		<label>6mm Smart</label>
+		<ammoTypes>
+			<Ammo_6mmSmartGyrojet_FMJ>Bullet_6mmSmartGyrojet_FMJ</Ammo_6mmSmartGyrojet_FMJ>
+			<Ammo_6mmSmartGyrojet_AP>Bullet_6mmSmartGyrojet_AP</Ammo_6mmSmartGyrojet_AP>
+			<Ammo_6mmSmartGyrojet_HP>Bullet_6mmSmartGyrojet_HP</Ammo_6mmSmartGyrojet_HP>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="6mmSmartGyrojetBase" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Overengineered pistol rounds that utilizes miniature rockets for propulsion instead of gunpowder. It features limited self guidance.</description>
+		<statBases>
+			<Mass>0.011</Mass>
+			<Bulk>0.014</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo6mmSmartGyrojet</li>
+		</thingCategories>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="6mmSmartGyrojetBase">
+		<defName>Ammo_6mmSmartGyrojet_FMJ</defName>
+		<label>6mm Smart rocket (FMJ)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Pistol/FMJ</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.14</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_6mmSmartGyrojet_FMJ</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="6mmSmartGyrojetBase">
+		<defName>Ammo_6mmSmartGyrojet_AP</defName>
+		<label>6mm Smart rocket (AP)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Pistol/AP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.14</MarketValue>
+		</statBases>
+		<ammoClass>ArmorPiercing</ammoClass>
+		<cookOffProjectile>Bullet_6mmSmartGyrojet_AP</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="6mmSmartGyrojetBase">
+		<defName>Ammo_6mmSmartGyrojet_HP</defName>
+		<label>6mm Smart rocket (HP)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Pistol/HP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.14</MarketValue>
+		</statBases>
+		<ammoClass>HollowPoint</ammoClass>
+		<cookOffProjectile>Bullet_6mmSmartGyrojet_HP</cookOffProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="Base6mmSmartGyrojetBullet" ParentName="Base45ACPBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>85</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6mmSmartGyrojetBullet">
+		<defName>Bullet_6mmSmartGyrojet_FMJ</defName>
+		<label>6mm Smart bullet (FMJ)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationSharp>5</armorPenetrationSharp>
+			<armorPenetrationBlunt>18.4</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6mmSmartGyrojetBullet">
+		<defName>Bullet_6mmSmartGyrojet_AP</defName>
+		<label>6mm Smart bullet (AP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>7</damageAmountBase>
+			<armorPenetrationSharp>10</armorPenetrationSharp>
+			<armorPenetrationBlunt>18.4</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6mmSmartGyrojetBullet">
+		<defName>Bullet_6mmSmartGyrojet_HP</defName>
+		<label>6mm Smart bullet (HP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>13</damageAmountBase>
+			<armorPenetrationSharp>2.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>18.4</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_6mmSmartGyrojet_FMJ</defName>
+		<label>make 6mm Smart (FMJ) rocket x200</label>
+		<description>Craft 200 6mm Smart (FMJ) rockets.</description>
+		<jobString>Making 6mm Smart (FMJ) rockets.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_6mmSmartGyrojet_FMJ>200</Ammo_6mmSmartGyrojet_FMJ>
+		</products>
+		<workAmount>2400</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_6mmSmartGyrojet_AP</defName>
+		<label>make 6mm Smart (AP) rocket x200</label>
+		<description>Craft 200 6mm Smart (AP) rockets.</description>
+		<jobString>Making 6mm Smart (AP) rockets.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_6mmSmartGyrojet_AP>200</Ammo_6mmSmartGyrojet_AP>
+		</products>
+		<workAmount>2400</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_6mmSmartGyrojet_HP</defName>
+		<label>make 6mm Smart (HP) rocket x200</label>
+		<description>Craft 200 6mm Smart (HP) rockets.</description>
+		<jobString>Making 6mm Smart (HP) rockets.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_6mmSmartGyrojet_HP>200</Ammo_6mmSmartGyrojet_HP>
+		</products>
+		<workAmount>2400</workAmount>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Arasaka Corporation [1.3]/Patches/Arasaka Corporation [1.3]/Cyberweeb_Apperal.xml b/ModPatches/Arasaka Corporation [1.3]/Patches/Arasaka Corporation [1.3]/Cyberweeb_Apperal.xml
new file mode 100644
index 0000000000..a3fcaff6b3
--- /dev/null
+++ b/ModPatches/Arasaka Corporation [1.3]/Patches/Arasaka Corporation [1.3]/Cyberweeb_Apperal.xml	
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Apparel_Turtleneck_AC === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_Turtleneck_AC" or defName="Apparel_Workwear_AC" or defName="Apparel_Workwear_W_AC"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- === Arasaka Aramid Vest === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Aramid_Vest_AC"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Aramid_Vest_AC"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>21</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Aramid_Vest_AC"]/costList/Cloth</xpath>
+		<value>
+			<Cloth>30</Cloth>
+			<DevilstrandCloth>15</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Apparel_Aramid_Vest_AC"]/equippedStatOffsets</xpath>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Arasaka Corporation [1.3]/Patches/Arasaka Corporation [1.3]/Cyberweeb_Guns.xml b/ModPatches/Arasaka Corporation [1.3]/Patches/Arasaka Corporation [1.3]/Cyberweeb_Guns.xml
new file mode 100644
index 0000000000..296557c435
--- /dev/null
+++ b/ModPatches/Arasaka Corporation [1.3]/Patches/Arasaka Corporation [1.3]/Cyberweeb_Guns.xml	
@@ -0,0 +1,355 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--  ==========Guns==========  -->
+
+	<!-- Masamune Conventional-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_HJSH_18_Masamune_AC</defName>
+		<statBases>
+			<Mass>3.5</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.3</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.29</SwayFactor>
+			<Bulk>7.78</Bulk>
+			<WorkToMake>40000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>45</Steel>
+			<ComponentIndustrial>8</ComponentIndustrial>
+			<Chemfuel>20</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>1.31</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_300AACBlackout_FMJ</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>58</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>Shot_Masamune</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_300AACBlackout</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Nowaki Conventional-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Nowaki_AC</defName>
+		<statBases>
+			<Bulk>7.36</Bulk>
+			<Mass>3.2</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<SwayFactor>1.35</SwayFactor>
+			<ShotSpread>0.07</ShotSpread>
+			<WorkToMake>32000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>45</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+			<Chemfuel>15</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>1.58</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_300AACBlackout_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>Shot_Masamune</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_300AACBlackout</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<researchPrerequisite>Fabrication</researchPrerequisite>
+	</Operation>
+
+	<!-- Shigure Conventional SMG-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Shigure_AC</defName>
+		<statBases>
+			<Mass>2.3</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>0.96</SwayFactor>
+			<Bulk>4.50</Bulk>
+			<WorkToMake>25500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<Chemfuel>15</Chemfuel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<recoilAmount>1.33</recoilAmount>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>28</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>Shot_Kenshin</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_FN57x28mm</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Kenshin Railgun Pistol-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_JKE-X2_Kenshin_AC</defName>
+		<statBases>
+			<WorkToMake>30000</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.24</SwayFactor>
+			<Bulk>2.47</Bulk>
+			<Mass>1.45</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>10</Steel>
+			<Plasteel>20</Plasteel>
+			<Chemfuel>5</Chemfuel>
+			<ComponentSpacer>1</ComponentSpacer>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_7mmMiniRailgun_Sabot</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>25</range>
+			<burstShotCount>4</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>Shot_Kenshin</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+			<recoilAmount>1.88</recoilAmount>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_7mmMiniRailgun</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- TKI-20 Shingen Smart SMG-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_TKI-20_Shingen_AC</defName>
+		<statBases>
+			<Mass>2.20</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>0.25</SwayFactor>
+			<Bulk>4.00</Bulk>
+			<WorkToMake>42000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<Chemfuel>10</Chemfuel>
+			<ComponentSpacer>1</ComponentSpacer>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<recoilAmount>0.8</recoilAmount>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6mmSmartGyrojet_FMJ</defaultProjectile>
+			<warmupTime>0.55</warmupTime>
+			<range>30</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>Shot_Shingen</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>60</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_6mmSmartGyrojet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- HJKE-11 Yukimura Smart pistol-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_HJKE-11_Yukimura_AC</defName>
+		<statBases>
+			<Mass>1.12</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.75</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>0.25</SwayFactor>
+			<Bulk>2.00</Bulk>
+			<WorkToMake>29000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>15</Steel>
+			<Chemfuel>5</Chemfuel>
+			<ComponentSpacer>1</ComponentSpacer>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<recoilAmount>0.9</recoilAmount>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6mmSmartGyrojet_FMJ</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>22</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<soundCast>Shot_Yukimura</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>3.0</reloadTime>
+			<ammoSet>AmmoSet_6mmSmartGyrojet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Tools ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Gun_JKE-X2_Kenshin_AC" or
+			defName="Gun_HJKE-11_Yukimura_AC"]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Gun_HJSH_18_Masamune_AC" or
+			defName="Gun_Nowaki_AC" or
+			defName="Gun_Shigure_AC" or
+			defName="Gun_TKI-20_Shingen_AC"]/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>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Arasaka Corporation [1.3]/Patches/Arasaka Corporation [1.3]/Cyberweeb_Hats.xml b/ModPatches/Arasaka Corporation [1.3]/Patches/Arasaka Corporation [1.3]/Cyberweeb_Hats.xml
new file mode 100644
index 0000000000..79501d14c8
--- /dev/null
+++ b/ModPatches/Arasaka Corporation [1.3]/Patches/Arasaka Corporation [1.3]/Cyberweeb_Hats.xml	
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- == Cap ac == -->
+	<!-- statBases -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_Cap_AC" or defName="Apparel_Cap_W_AC"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>0.024</ArmorRating_Blunt>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+			<Bulk>2</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- == GasMask == -->
+	<!-- statBases -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Hazmat_Mask_AC"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Apparel_Hazmat_Mask_AC"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Apparel_Hazmat_Mask_AC"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_Hazmat_Mask_AC"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Hazmat_Mask_AC"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_Hazmat_Mask_AC"]/apparel/layers</xpath>
+		<value>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName = "Apparel_Hazmat_Mask_AC"]</xpath>
+		<value>
+			<li Class="CombatExtended.ApparelHediffExtension">
+				<hediff>WearingGasMask</hediff>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Helmet === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Helmet_AC"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Helmet_AC"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.42</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Helmet_AC"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>30</Steel>
+				<DevilstrandCloth>10</DevilstrandCloth>
+				<Plasteel>10</Plasteel>
+			</costList>
+		</value>
+	</Operation>
+	<!-- === Goggles === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Helmet_With_Techgogs_AC"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+			<Bulk>6</Bulk>
+			<WornBulk>1.5</WornBulk>
+			<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Helmet_With_Techgogs_AC"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.42</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Helmet_With_Techgogs_AC"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>25</Steel>
+				<DevilstrandCloth>15</DevilstrandCloth>
+				<ComponentIndustrial>6</ComponentIndustrial>
+				<Plasteel>20</Plasteel>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Helmet_With_Techgogs_AC"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>0.1</ShootingAccuracyPawn>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_Helmet_With_Techgogs_AC"]/apparel/layers</xpath>
+		<value>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Arasaka Corporation [1.3]/Patches/Arasaka Corporation [1.3]/Cyberweeb_Melee.xml b/ModPatches/Arasaka Corporation [1.3]/Patches/Arasaka Corporation [1.3]/Cyberweeb_Melee.xml
new file mode 100644
index 0000000000..a6a825b5a9
--- /dev/null
+++ b/ModPatches/Arasaka Corporation [1.3]/Patches/Arasaka Corporation [1.3]/Cyberweeb_Melee.xml	
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === Weeb sword === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "MeleeWeapon_Thermal_Katana_AC"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.27</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.7</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>16</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Burn</def>
+							<amount>5</amount>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>1.3</cooldownTime>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>0.536</armorPenetrationBlunt>
+					<armorPenetrationSharp>12</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>30</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Burn</def>
+							<amount>8</amount>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>1.4</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<armorPenetrationSharp>6</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "MeleeWeapon_Thermal_Katana_AC"]/statBases</xpath>
+		<value>
+			<statBases>
+				<WorkToMake>50000</WorkToMake>
+				<Mass>1</Mass>
+				<Bulk>7.5</Bulk>
+				<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "MeleeWeapon_Thermal_Katana_AC"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.9</MeleeCritChance>
+				<MeleeParryChance>0.69</MeleeParryChance>
+				<MeleeDodgeChance>0.33</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- === katana === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Millitary_Katana_AC"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.27</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.7</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.3</cooldownTime>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>0.559</armorPenetrationBlunt>
+					<armorPenetrationSharp>6</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>34</power>
+					<cooldownTime>1.4</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>0.674</armorPenetrationBlunt>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Millitary_Katana_AC"]/statBases</xpath>
+		<value>
+			<statBases>
+				<WorkToMake>25000</WorkToMake>
+				<Mass>0.9</Mass>
+				<Bulk>7.5</Bulk>
+				<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Millitary_Katana_AC"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.9</MeleeCritChance>
+				<MeleeParryChance>0.69</MeleeParryChance>
+				<MeleeDodgeChance>0.33</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Millitary_Katana_AC"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>40</Steel>
+				<Plasteel>60</Plasteel>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Thermal_Katana_AC"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>25</Steel>
+				<Plasteel>75</Plasteel>
+				<ComponentSpacer>2</ComponentSpacer>
+			</costList>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Arasaka Corporation [1.3]/Patches/Arasaka Corporation [1.3]/Cyberweeb_Turrets_Cyberware.xml b/ModPatches/Arasaka Corporation [1.3]/Patches/Arasaka Corporation [1.3]/Cyberweeb_Turrets_Cyberware.xml
new file mode 100644
index 0000000000..5446ad9b0c
--- /dev/null
+++ b/ModPatches/Arasaka Corporation [1.3]/Patches/Arasaka Corporation [1.3]/Cyberweeb_Turrets_Cyberware.xml	
@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Remove refuelable property -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName = "Security_Turret_AC"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
+	</Operation>
+
+	<!-- Replace vanilla thingClass -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Security_Turret_AC"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Security_Turret_AC"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>440</Steel>
+				<Plasteel>40</Plasteel>
+				<ComponentIndustrial>15</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<!-- Make turrets taller -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Security_Turret_AC"]/fillPercent</xpath>
+		<value>
+			<fillPercent>1</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Security_Turret_AC"]/statBases/ShootingAccuracyTurret</xpath>
+		<value>
+			<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Security_Turret_AC"]/statBases/WorkToBuild</xpath>
+		<value>
+			<WorkToBuild>60000</WorkToBuild>
+			<AimingAccuracy>0.33</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Security_Turret_AC"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>1.1</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Security_Turret_AC"]/comps/li[@Class="CompProperties_Power"]</xpath>
+		<value>
+			<li Class="CompProperties_Power">
+				<compClass>CompPowerTrader</compClass>
+				<basePowerConsumption>1350</basePowerConsumption>
+			</li>
+		</value>
+	</Operation>
+	<!-- Make the Turret usable -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Security_Turret_AC</defName>
+		<statBases>
+			<Mass>10.00</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>1.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.33</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_25x137mmNATO_AP</defaultProjectile>
+			<warmupTime>1.35</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>18</ticksBetweenBurstShots>
+			<burstShotCount>6</burstShotCount>
+			<minRange>2.0</minRange>
+			<soundCast>Shot_Turret</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_25x137mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<noSnapshot>true</noSnapshot>
+		</FireModes>
+	</Operation>
+
+	<!-- Implant Hediffs -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Arasaka_Mantis_AC"]/stages/li[1]/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<MeleeDPS>0.20</MeleeDPS>
+				<MeleeHitChance>0.20</MeleeHitChance>
+				<MeleeDodgeChance>0.15</MeleeDodgeChance>
+				<IncomingDamageFactor>-0.05</IncomingDamageFactor>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Arasaka_Leg_AC" or defName="Arasaka_Arm_AC" or defName="Arasaka_Spine_AC" or defName="Arasaka_Ribcage_AC"]/stages/li[1]/statOffsets/IncomingDamageFactor</xpath>
+		<value>
+			<IncomingDamageFactor>-0.05</IncomingDamageFactor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Arasaka_Mantis_AC"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mantis blade</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.0</cooldownTime>
+					<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
+					<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
+					<armorPenetrationSharp>6</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>mantis blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>34</power>
+					<cooldownTime>1.29</cooldownTime>
+					<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
+					<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Arasaka_Arm_AC"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.11</cooldownTime>
+					<armorPenetrationBlunt>2.75</armorPenetrationBlunt>
+					<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
+					<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- Add night vision to eyes when it comes out-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Arasaka_Eye_AC"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency_Implant>0.3</NightVisionEfficiency_Implant>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Arasaka_Eye_AC"]/stages/li[1]/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+				<NightVisionEfficiency_Implant>0.3</NightVisionEfficiency_Implant>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<!-- Reduce surpression for cyberdeck Does increased consciousness increase Suppressability?-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="Arasaka_MKI_AC"]/stages/li[1]/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.075</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="Arasaka_MKII_AC"]/stages/li[1]/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.15</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="Arasaka_MKIII_AC"]/stages/li[1]/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.25</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="Arasaka_MKIV_AC"]/stages/li[1]/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.5</Suppressability>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Archotech Expanded Prosthetics/Patches/Archotech Expanded Prosthetics/AE_Hediffs_BodyParts_Prosthetics copy.xml b/ModPatches/Archotech Expanded Prosthetics/Patches/Archotech Expanded Prosthetics/AE_Hediffs_BodyParts_Prosthetics copy.xml
new file mode 100644
index 0000000000..380cb225a3
--- /dev/null
+++ b/ModPatches/Archotech Expanded Prosthetics/Patches/Archotech Expanded Prosthetics/AE_Hediffs_BodyParts_Prosthetics copy.xml	
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AdvancedArchotechArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ArchotechObliterator"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>0.01</cooldownTime>
+					<armorPenetrationBlunt>21.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ArchotechMembrane"]/stages/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<MeleeDodgeChance>10</MeleeDodgeChance>
+				<ArmorRating_Sharp>14</ArmorRating_Sharp>
+				<ArmorRating_Blunt>21</ArmorRating_Blunt>
+				<ArmorRating_Heat>1.5</ArmorRating_Heat>
+				<GeneralLaborSpeed>10</GeneralLaborSpeed>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ArchotechDeathClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>0.89</cooldownTime>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Archotech Expanded/Patches/Archotech Expanded/AE_Hediffs_BodyParts_Prosthetics.xml b/ModPatches/Archotech Expanded/Patches/Archotech Expanded/AE_Hediffs_BodyParts_Prosthetics.xml
new file mode 100644
index 0000000000..380cb225a3
--- /dev/null
+++ b/ModPatches/Archotech Expanded/Patches/Archotech Expanded/AE_Hediffs_BodyParts_Prosthetics.xml	
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AdvancedArchotechArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ArchotechObliterator"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>0.01</cooldownTime>
+					<armorPenetrationBlunt>21.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ArchotechMembrane"]/stages/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<MeleeDodgeChance>10</MeleeDodgeChance>
+				<ArmorRating_Sharp>14</ArmorRating_Sharp>
+				<ArmorRating_Blunt>21</ArmorRating_Blunt>
+				<ArmorRating_Heat>1.5</ArmorRating_Heat>
+				<GeneralLaborSpeed>10</GeneralLaborSpeed>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ArchotechDeathClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>0.89</cooldownTime>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Archotech Expanded/Patches/Archotech Expanded/AE_Items_Resource_Stuff.xml b/ModPatches/Archotech Expanded/Patches/Archotech Expanded/AE_Items_Resource_Stuff.xml
new file mode 100644
index 0000000000..1e48915d60
--- /dev/null
+++ b/ModPatches/Archotech Expanded/Patches/Archotech Expanded/AE_Items_Resource_Stuff.xml	
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Atto -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Attomachinery"]/statBases</xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Attomachinery"]/stuffProps/categories</xpath>
+		<value>
+			<li>Metallic_Weapon</li>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Attomachinery"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>50</MeleePenetrationFactor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Attomachinery"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>50</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Attomachinery"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>50</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Pico -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Picomachinery"]/statBases</xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Picomachinery"]/stuffProps/categories</xpath>
+		<value>
+			<li>Metallic_Weapon</li>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Picomachinery"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>25</MeleePenetrationFactor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Picomachinery"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>25</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Picomachinery"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>25</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Nano -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Nanomachinery"]/statBases</xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Nanomachinery"]/stuffProps/categories</xpath>
+		<value>
+			<li>Metallic_Weapon</li>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Nanomachinery"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>2.5</MeleePenetrationFactor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Nanomachinery"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>2.5</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Nanomachinery"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>2.5</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Archotech PowerArmor/Patches/Archotech PowerArmor/Apparel_JDS.xml b/ModPatches/Archotech PowerArmor/Patches/Archotech PowerArmor/Apparel_JDS.xml
new file mode 100644
index 0000000000..0cada9d57a
--- /dev/null
+++ b/ModPatches/Archotech PowerArmor/Patches/Archotech PowerArmor/Apparel_JDS.xml	
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ===== Add Bodypart Groups and Layers ===== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="APA_HelmetBase"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="APA_ArmorBase"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<!-- ===== Add Costlist ===== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="APA_HelmetBase"]/costList</xpath>
+		<value>
+			<Uranium>20</Uranium>
+			<Hyperweave>30</Hyperweave>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="APA_ArmorBase"]/costList</xpath>
+		<value>
+			<Uranium>45</Uranium>
+			<Hyperweave>90</Hyperweave>
+		</value>
+	</Operation>
+
+	<!-- ===== Stats Adjustment ===== -->
+
+	<!-- === Archotech Power Helmet === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="APA_HelmetBase"]/statBases/WorkToMake</xpath>
+		<value>
+			<WorkToMake>26250</WorkToMake>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="APA_HelmetBase"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>360</MaxHitPoints>
+			<Bulk>5.5</Bulk>
+			<WornBulk>1.25</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="APA_HelmetBase"]/statBases/Mass</xpath>
+		<value>
+			<Mass>5</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[@Name="APA_HelmetBase"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[@Name="APA_HelmetBase"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="APA_HelmetBase"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingAccuracy>0.20</AimingAccuracy>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+			<NightVisionEfficiency_Apparel>1.0</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="APA_HelmetBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>24</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="APA_HelmetBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>52</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="APA_HelmetBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>1.05</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>1.05</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Archotech Power Armor === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="APA_ArmorBase"]/statBases/WorkToMake</xpath>
+		<value>
+			<WorkToMake>80000</WorkToMake>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="APA_ArmorBase"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>650</MaxHitPoints>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="APA_ArmorBase"]/statBases/Mass</xpath>
+		<value>
+			<Mass>60</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="APA_ArmorBase"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>90</CarryWeight>
+			<CarryBulk>12.5</CarryBulk>
+			<ShootingAccuracyPawn>0.20</ShootingAccuracyPawn>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="APA_ArmorBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>30</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="APA_ArmorBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>62</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="APA_ArmorBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.95</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.95</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Archotech Weaponry/Defs/Archotech Weaponry/ArchoDamageDefs.xml b/ModPatches/Archotech Weaponry/Defs/Archotech Weaponry/ArchoDamageDefs.xml
new file mode 100644
index 0000000000..487348c2e8
--- /dev/null
+++ b/ModPatches/Archotech Weaponry/Defs/Archotech Weaponry/ArchoDamageDefs.xml	
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<DamageDef ParentName="Bullet">
+		<defName>CE_ArchoNL</defName>
+		<label>archonanites (non-lethal)</label>
+		<additionalHediffs>
+			<li>
+				<hediff>VoidToxin</hediff>
+				<severityPerDamageDealt>0.29</severityPerDamageDealt>
+			</li>
+		</additionalHediffs>
+		<modExtensions>
+			<li Class="CombatExtended.DamageDefExtensionCE">
+				<harmOnlyOutsideLayers>true</harmOnlyOutsideLayers>
+			</li>
+		</modExtensions>
+	</DamageDef>
+
+	<DamageDef ParentName="Bullet">
+		<defName>CE_ArchoL</defName>
+		<label>archonanites (lethal)</label>
+		<additionalHediffs>
+			<li>
+				<hediff>VoidNecrosisTemp</hediff>
+				<severityPerDamageDealt>0.05</severityPerDamageDealt>
+			</li>
+		</additionalHediffs>
+	</DamageDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Archotech Weaponry/Defs/Archotech Weaponry/ArchoNotAmmo.xml b/ModPatches/Archotech Weaponry/Defs/Archotech Weaponry/ArchoNotAmmo.xml
new file mode 100644
index 0000000000..3fd058578d
--- /dev/null
+++ b/ModPatches/Archotech Weaponry/Defs/Archotech Weaponry/ArchoNotAmmo.xml	
@@ -0,0 +1,469 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>AmmoArchoChargePack</defName>
+		<label>Archo charge pack</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="ArchoChargePackBase" ParentName="SpacerSmallAmmoBase" Abstract="True">
+		<description>A universal charge pack for various Archo weapons.</description>
+		<statBases>
+			<Mass>0.008</Mass>
+			<Bulk>0.01</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>Artifact</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoArchoChargePack</li>
+		</thingCategories>
+		<stackLimit>5000</stackLimit>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="ArchoChargePackBase">
+		<defName>Ammo_ArchoChargePack</defName>
+		<label>Archo charge pack</label>
+		<graphicData>
+			<texPath>ThirdParty/ArchotechWeaponry/Ammo/Archotech</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.29</MarketValue>
+		</statBases>
+		<ammoClass>Charged</ammoClass>
+		<thingSetMakerTags>
+			<li>RewardStandardHighFreq</li>
+		</thingSetMakerTags>
+	</ThingDef>
+
+	<!-- ==================== AmmoSet-NL ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_ArchoPistol_CE_NL</defName>
+		<label>Archo charge(Non Lethal)</label>
+		<ammoTypes>
+			<Ammo_ArchoChargePack>AW_Bullet_ArchotechPistol_CE_NL</Ammo_ArchoChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_ArchoSniper_CE_NL</defName>
+		<label>Archo charge(Non Lethal)</label>
+		<ammoTypes>
+			<Ammo_ArchoChargePack>AW_Bullet_ArchotechSniper_CE_NL</Ammo_ArchoChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_ArchoRifle_CE_NL</defName>
+		<label>Archo charge(Non Lethal)</label>
+		<ammoTypes>
+			<Ammo_ArchoChargePack>AW_Bullet_ArchotechRifle_CE_NL</Ammo_ArchoChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_ArchoMG_CE_NL</defName>
+		<label>Archo charge(Non Lethal)</label>
+		<ammoTypes>
+			<Ammo_ArchoChargePack>AW_Bullet_ArchotechMG_CE_NL</Ammo_ArchoChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_ArchoShotgun_CE_NL</defName>
+		<label>Archo charge(Non Lethal)</label>
+		<ammoTypes>
+			<Ammo_ArchoChargePack>AW_Bullet_ArchotechShotgun_CE_NL</Ammo_ArchoChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_ArchoBow_CE_NL</defName>
+		<label>Archo charge(Non Lethal)</label>
+		<ammoTypes>
+			<Ammo_ArchoChargePack>AW_Bullet_ArchotechBow_CE_NL</Ammo_ArchoChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_ArchoCrossbow_CE_NL</defName>
+		<label>Archo charge(Non Lethal)</label>
+		<ammoTypes>
+			<Ammo_ArchoChargePack>AW_Bullet_ArchotechCrossbow_CE_NL</Ammo_ArchoChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== AmmoSet-L ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_ArchoPistol_CE_L</defName>
+		<label>Archo charge(Lethal)</label>
+		<ammoTypes>
+			<Ammo_ArchoChargePack>AW_Bullet_ArchotechPistol_CE_L</Ammo_ArchoChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_ArchoSniper_CE_L</defName>
+		<label>Archo charge(Lethal)</label>
+		<ammoTypes>
+			<Ammo_ArchoChargePack>AW_Bullet_ArchotechSniper_CE_L</Ammo_ArchoChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_ArchoRifle_CE_L</defName>
+		<label>Archo charge(Lethal)</label>
+		<ammoTypes>
+			<Ammo_ArchoChargePack>AW_Bullet_ArchotechRifle_CE_L</Ammo_ArchoChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_ArchoMG_CE_L</defName>
+		<label>Archo charge(Lethal)</label>
+		<ammoTypes>
+			<Ammo_ArchoChargePack>AW_Bullet_ArchotechMG_CE_L</Ammo_ArchoChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_ArchoShotgun_CE_L</defName>
+		<label>Archo charge(Lethal)</label>
+		<ammoTypes>
+			<Ammo_ArchoChargePack>AW_Bullet_ArchotechShotgun_CE_L</Ammo_ArchoChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_ArchoBow_CE_L</defName>
+		<label>Archo charge(Lethal)</label>
+		<ammoTypes>
+			<Ammo_ArchoChargePack>AW_Bullet_ArchotechBow_CE_L</Ammo_ArchoChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_ArchoCrossbow_CE_L</defName>
+		<label>Archo charge(Lethal)</label>
+		<ammoTypes>
+			<Ammo_ArchoChargePack>AW_Bullet_ArchotechCrossbow_CE_L</Ammo_ArchoChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ================== Projectiles ================== -->
+	<ThingDef ParentName="Base10x18mmChargedBullet">
+		<defName>AW_Bullet_ArchotechPistol_CE_NL</defName>
+		<label>archotech pistol bullet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shot_Archotech</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_ArchoNL</damageDef>
+			<damageAmountBase>3</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>7</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>19.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>22.56</armorPenetrationBlunt>
+			<empShieldBreakChance>1</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base10x18mmChargedBullet">
+		<defName>AW_Bullet_ArchotechPistol_CE_L</defName>
+		<label>archotech pistol bullet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shot_Archotech</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_ArchoL</damageDef>
+			<damageAmountBase>11</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>7</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>19.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>22.56</armorPenetrationBlunt>
+			<empShieldBreakChance>1</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base12x72mmChargedBullet">
+		<defName>AW_Bullet_ArchotechSniper_CE_NL</defName>
+		<label>archotech sniper bullet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shot_Archotech</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_ArchoNL</damageDef>
+			<damageAmountBase>5</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>18</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>45</armorPenetrationSharp>
+			<armorPenetrationBlunt>324</armorPenetrationBlunt>
+			<empShieldBreakChance>1</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base12x72mmChargedBullet">
+		<defName>AW_Bullet_ArchotechSniper_CE_L</defName>
+		<label>archotech sniper bullet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shot_Archotech</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_ArchoL</damageDef>
+			<damageAmountBase>31</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>18</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>45</armorPenetrationSharp>
+			<armorPenetrationBlunt>324</armorPenetrationBlunt>
+			<empShieldBreakChance>1</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base8x35mmChargedBullet">
+		<defName>AW_Bullet_ArchotechRifle_CE_NL</defName>
+		<label>archotech rifle bullet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shot_Archotech</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_ArchoNL</damageDef>
+			<damageAmountBase>4</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>9</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>24</armorPenetrationSharp>
+			<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
+			<empShieldBreakChance>0.33</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base8x35mmChargedBullet">
+		<defName>AW_Bullet_ArchotechRifle_CE_L</defName>
+		<label>archotech rifle bullet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shot_Archotech</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_ArchoL</damageDef>
+			<damageAmountBase>15</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>9</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>24</armorPenetrationSharp>
+			<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
+			<empShieldBreakChance>0.33</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base8x50mmChargedBullet">
+		<defName>AW_Bullet_ArchotechMG_CE_NL</defName>
+		<label>archotech MG bullet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shot_Archotech</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_ArchoNL</damageDef>
+			<damageAmountBase>4</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>11</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>27</armorPenetrationSharp>
+			<armorPenetrationBlunt>120</armorPenetrationBlunt>
+			<empShieldBreakChance>1</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base8x50mmChargedBullet">
+		<defName>AW_Bullet_ArchotechMG_CE_L</defName>
+		<label>archotech MG bullet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shot_Archotech</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_ArchoL</damageDef>
+			<damageAmountBase>19</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>11</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>27</armorPenetrationSharp>
+			<armorPenetrationBlunt>120</armorPenetrationBlunt>
+			<empShieldBreakChance>1</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base15x65mmDiffusingChargedBullet">
+		<defName>AW_Bullet_ArchotechShotgun_CE_NL</defName>
+		<label>archotech bullet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shot_Archotech</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_ArchoNL</damageDef>
+			<damageAmountBase>2</damageAmountBase>
+			<pelletCount>5</pelletCount>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>7</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+			<armorPenetrationBlunt>50.46</armorPenetrationBlunt>
+			<spreadMult>8.9</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base15x65mmDiffusingChargedBullet">
+		<defName>AW_Bullet_ArchotechShotgun_CE_L</defName>
+		<label>archotech bullet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shot_Archotech</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_ArchoL</damageDef>
+			<damageAmountBase>22</damageAmountBase>
+			<pelletCount>5</pelletCount>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>7</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+			<armorPenetrationBlunt>50.46</armorPenetrationBlunt>
+			<spreadMult>8.9</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base8x35mmChargedBullet">
+		<defName>AW_Bullet_ArchotechBow_CE_NL</defName>
+		<label>archotech bow arrow</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shot_Archotech_Voidarrow</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_ArchoNL</damageDef>
+			<damageAmountBase>5</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>9</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>24</armorPenetrationSharp>
+			<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
+			<empShieldBreakChance>0.33</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base8x35mmChargedBullet">
+		<defName>AW_Bullet_ArchotechBow_CE_L</defName>
+		<label>archotech bow arrow</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shot_Archotech_Voidarrow</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_ArchoL</damageDef>
+			<damageAmountBase>20</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>9</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>24</armorPenetrationSharp>
+			<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
+			<empShieldBreakChance>0.33</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base8x35mmChargedBullet">
+		<defName>AW_Bullet_ArchotechCrossbow_CE_NL</defName>
+		<label>archotech crossbow bolt</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shot_Archotech_voidbolt</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_ArchoNL</damageDef>
+			<damageAmountBase>5</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>9</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>24</armorPenetrationSharp>
+			<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
+			<empShieldBreakChance>0.33</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base8x35mmChargedBullet">
+		<defName>AW_Bullet_ArchotechCrossbow_CE_L</defName>
+		<label>archotech crossbow bolt</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shot_Archotech_voidbolt</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_ArchoL</damageDef>
+			<damageAmountBase>25</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>9</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>24</armorPenetrationSharp>
+			<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
+			<empShieldBreakChance>0.33</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Archotech Weaponry/Patches/Archotech Weaponry/MeleeArchotech.xml b/ModPatches/Archotech Weaponry/Patches/Archotech Weaponry/MeleeArchotech.xml
new file mode 100644
index 0000000000..f67223813a
--- /dev/null
+++ b/ModPatches/Archotech Weaponry/Patches/Archotech Weaponry/MeleeArchotech.xml	
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="AW_ArchotechSword"]/statBases/MeleeWeapon_AverageArmorPenetration</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AW_ArchotechSword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<chanceFactor>0.33</chanceFactor>
+					<cooldownTime>1.52</cooldownTime>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>1.24</cooldownTime>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<armorPenetrationSharp>22</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>1.14</cooldownTime>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AW_ArchotechSword"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AW_ArchotechSword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.73</MeleeCritChance>
+				<MeleeParryChance>0.45</MeleeParryChance>
+				<MeleeDodgeChance>0.6</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AW_ArchotechSword"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="AW_ArchotechHeavySword"]/statBases/MeleeWeapon_AverageArmorPenetration</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AW_ArchotechHeavySword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<chanceFactor>0.33</chanceFactor>
+					<cooldownTime>1.52</cooldownTime>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>1.55</cooldownTime>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+					<armorPenetrationSharp>35</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>1.75</cooldownTime>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+					<armorPenetrationSharp>25</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AW_ArchotechHeavySword"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<MeleeCounterParryBonus>0.75</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AW_ArchotechHeavySword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1</MeleeCritChance>
+				<MeleeParryChance>0.65</MeleeParryChance>
+				<MeleeDodgeChance>0.45</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Archotech Weaponry/Patches/Archotech Weaponry/RangedArchotech.xml b/ModPatches/Archotech Weaponry/Patches/Archotech Weaponry/RangedArchotech.xml
new file mode 100644
index 0000000000..61e30cd927
--- /dev/null
+++ b/ModPatches/Archotech Weaponry/Patches/Archotech Weaponry/RangedArchotech.xml	
@@ -0,0 +1,715 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[
+			defName = "AW_ArchotechPistol" or
+			defName = "AW_ArchotechSMG"]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "AW_ArchotechRifle" or
+			defName = "AW_ArchotechSniper"
+			]/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 = "AW_ArchotechMinigun" or
+			defName = "AW_ArchotechShotgun" or
+			defName = "AW_ArchotechLMG" or
+			defName = "AW_ArchotechCrossbow" or
+			defName = "AW_ArchotechBow" or
+			defName = "AW_ArchotechVoidlauncher"]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</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>10</power>
+					<cooldownTime>1.55</cooldownTime>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Misc === -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>/Defs/ThingDef[
+			defName = "AW_ArchotechMinigun" or
+			defName = "AW_ArchotechShotgun" or
+			defName = "AW_ArchotechLMG" or
+			defName = "AW_ArchotechCrossbow" or
+			defName = "AW_ArchotechBow" or
+			defName = "AW_ArchotechPistol" or
+			defName = "AW_ArchotechSMG" or
+			defName = "AW_ArchotechRifle" or
+			defName = "AW_ArchotechSniper"
+			]/modExtensions/li[@Class="ArchotechWeaponry.Defs.ArchotechDamageExtension"] </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName = "AW_ArchotechVoidlauncher"]/weaponTags</xpath>
+		<value>
+			<li>Patched</li>
+		</value>
+	</Operation>
+
+	<!-- ==== Archotech Minigun ==== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AW_ArchotechMinigun</defName>
+		<statBases>
+			<Mass>9</Mass>
+			<Bulk>12.50</Bulk>
+			<SwayFactor>2.45</SwayFactor>
+			<ShotSpread>0.16</ShotSpread>
+			<SightsEfficiency>1.25</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>AW_Bullet_ArchotechMG_CE_NL</defaultProjectile>
+			<burstShotCount>50</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<warmupTime>1.5</warmupTime>
+			<range>69</range>
+			<recoilAmount>0.01</recoilAmount>
+			<soundCast>AW_GunLightShoot</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1000</magazineSize>
+			<reloadTime>6.5</reloadTime>
+			<ammoSet>AmmoSet_ArchoMG_CE_NL</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>25</aimedBurstShotCount>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AW_ArchotechMinigun"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<propsUnderBarrel>
+					<magazineSize>1000</magazineSize>
+					<reloadTime>6.5</reloadTime>
+					<ammoSet>AmmoSet_ArchoMG_CE_L</ammoSet>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AW_Bullet_ArchotechMG_CE_L</defaultProjectile>
+					<warmupTime>1.5</warmupTime>
+					<burstShotCount>50</burstShotCount>
+					<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+					<range>69</range>
+					<recoilAmount>0.01</recoilAmount>
+					<soundCast>AW_GunLightShoot</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>12</muzzleFlashScale>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aimedBurstShotCount>25</aimedBurstShotCount>
+					<aiAimMode>Snapshot</aiAimMode>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ==== Archotech Shotgun ==== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AW_ArchotechShotgun</defName>
+		<statBases>
+			<Mass>3.8</Mass>
+			<Bulk>7.6</Bulk>
+			<SwayFactor>1.45</SwayFactor>
+			<ShotSpread>0.8</ShotSpread>
+			<SightsEfficiency>1.35</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>AW_Bullet_ArchotechShotgun_CE_NL</defaultProjectile>
+			<burstShotCount>2</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<warmupTime>0.5</warmupTime>
+			<range>23</range>
+			<recoilAmount>0.01</recoilAmount>
+			<soundCast>AW_ShotgunShoot</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>5.5</reloadTime>
+			<ammoSet>AmmoSet_ArchoShotgun_CE_NL</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AW_ArchotechShotgun"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<propsUnderBarrel>
+					<magazineSize>40</magazineSize>
+					<reloadTime>5.5</reloadTime>
+					<ammoSet>AmmoSet_ArchoShotgun_CE_L</ammoSet>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AW_Bullet_ArchotechShotgun_CE_L</defaultProjectile>
+					<warmupTime>0.5</warmupTime>
+					<burstShotCount>2</burstShotCount>
+					<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+					<range>23</range>
+					<recoilAmount>0.01</recoilAmount>
+					<soundCast>AW_ShotgunShoot</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>12</muzzleFlashScale>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aiAimMode>Snapshot</aiAimMode>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ==== Archotech LMG ==== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AW_ArchotechLMG</defName>
+		<statBases>
+			<Mass>2.6</Mass>
+			<Bulk>5.20</Bulk>
+			<SwayFactor>2.25</SwayFactor>
+			<ShotSpread>0.10</ShotSpread>
+			<SightsEfficiency>1.45</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>AW_Bullet_ArchotechMG_CE_NL</defaultProjectile>
+			<burstShotCount>20</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<warmupTime>1.5</warmupTime>
+			<range>69</range>
+			<recoilAmount>0.01</recoilAmount>
+			<soundCast>AW_GunLightShoot</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>400</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_ArchoMG_CE_NL</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>10</aimedBurstShotCount>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AW_ArchotechLMG"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<propsUnderBarrel>
+					<magazineSize>400</magazineSize>
+					<reloadTime>4.5</reloadTime>
+					<ammoSet>AmmoSet_ArchoMG_CE_L</ammoSet>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AW_Bullet_ArchotechMG_CE_L</defaultProjectile>
+					<warmupTime>1.5</warmupTime>
+					<burstShotCount>20</burstShotCount>
+					<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+					<range>69</range>
+					<recoilAmount>0.01</recoilAmount>
+					<soundCast>AW_GunLightShoot</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>12</muzzleFlashScale>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aimedBurstShotCount>10</aimedBurstShotCount>
+					<aiAimMode>Snapshot</aiAimMode>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ==== Archotech Crossbow ==== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AW_ArchotechCrossbow</defName>
+		<statBases>
+			<Mass>2.6</Mass>
+			<Bulk>5.20</Bulk>
+			<SwayFactor>1.25</SwayFactor>
+			<ShotSpread>0.6</ShotSpread>
+			<SightsEfficiency>2.05</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.75</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>AW_Bullet_ArchotechCrossbow_CE_NL</defaultProjectile>
+			<burstShotCount>1</burstShotCount>
+			<warmupTime>1.5</warmupTime>
+			<range>55</range>
+			<recoilAmount>0.01</recoilAmount>
+			<soundCast>AW_BowShoot</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>1.5</reloadTime>
+			<ammoSet>AmmoSet_ArchoCrossbow_CE_NL</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AW_ArchotechCrossbow"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<propsUnderBarrel>
+					<magazineSize>1</magazineSize>
+					<reloadTime>1.5</reloadTime>
+					<ammoSet>AmmoSet_ArchoCrossbow_CE_L</ammoSet>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AW_Bullet_ArchotechCrossbow_CE_L</defaultProjectile>
+					<warmupTime>1.5</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<range>55</range>
+					<recoilAmount>0.01</recoilAmount>
+					<soundCast>AW_BowShoot</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>12</muzzleFlashScale>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aiAimMode>AimedShot</aiAimMode>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ==== Archotech Bow ==== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AW_ArchotechBow</defName>
+		<statBases>
+			<Mass>1.3</Mass>
+			<Bulk>2.6</Bulk>
+			<SwayFactor>1.25</SwayFactor>
+			<ShotSpread>0.6</ShotSpread>
+			<SightsEfficiency>2.15</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.75</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>AW_Bullet_ArchotechBow_CE_NL</defaultProjectile>
+			<burstShotCount>1</burstShotCount>
+			<warmupTime>1.5</warmupTime>
+			<range>49</range>
+			<recoilAmount>0.01</recoilAmount>
+			<soundCast>AW_BowShoot</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>1.5</reloadTime>
+			<ammoSet>AmmoSet_ArchoBow_CE_NL</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AW_ArchotechBow"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<propsUnderBarrel>
+					<magazineSize>1</magazineSize>
+					<reloadTime>1.5</reloadTime>
+					<ammoSet>AmmoSet_ArchoBow_CE_L</ammoSet>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AW_Bullet_ArchotechBow_CE_L</defaultProjectile>
+					<warmupTime>1.5</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<range>49</range>
+					<recoilAmount>0.01</recoilAmount>
+					<soundCast>AW_BowShoot</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>12</muzzleFlashScale>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aiAimMode>AimedShot</aiAimMode>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ==== Archotech SMG ==== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AW_ArchotechSMG</defName>
+		<statBases>
+			<Mass>2.6</Mass>
+			<Bulk>5.20</Bulk>
+			<SwayFactor>2.25</SwayFactor>
+			<ShotSpread>0.10</ShotSpread>
+			<SightsEfficiency>1.45</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>AW_Bullet_ArchotechPistol_CE_NL</defaultProjectile>
+			<burstShotCount>20</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<warmupTime>1.5</warmupTime>
+			<range>30</range>
+			<recoilAmount>0.01</recoilAmount>
+			<soundCast>AW_GunLightShoot</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>120</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_ArchoPistol_CE_NL</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>10</aimedBurstShotCount>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AW_ArchotechSMG"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<propsUnderBarrel>
+					<magazineSize>120</magazineSize>
+					<reloadTime>4.5</reloadTime>
+					<ammoSet>AmmoSet_ArchoPistol_CE_L</ammoSet>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AW_Bullet_ArchotechPistol_CE_L</defaultProjectile>
+					<warmupTime>1.5</warmupTime>
+					<burstShotCount>20</burstShotCount>
+					<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+					<range>30</range>
+					<recoilAmount>0.01</recoilAmount>
+					<soundCast>AW_GunLightShoot</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>12</muzzleFlashScale>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aimedBurstShotCount>10</aimedBurstShotCount>
+					<aiAimMode>Snapshot</aiAimMode>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ==== Archotech Sniper ==== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AW_ArchotechSniper</defName>
+		<statBases>
+			<Mass>2.6</Mass>
+			<Bulk>5.2</Bulk>
+			<SwayFactor>1.25</SwayFactor>
+			<ShotSpread>0.6</ShotSpread>
+			<SightsEfficiency>2.15</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.75</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>AW_Bullet_ArchotechPistol_CE_NL</defaultProjectile>
+			<burstShotCount>1</burstShotCount>
+			<warmupTime>1.5</warmupTime>
+			<range>86</range>
+			<recoilAmount>0.01</recoilAmount>
+			<soundCast>AW_SniperShoot</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>6.5</reloadTime>
+			<ammoSet>AmmoSet_ArchoSniper_CE_NL</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AW_ArchotechSniper"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<propsUnderBarrel>
+					<magazineSize>10</magazineSize>
+					<reloadTime>6.5</reloadTime>
+					<ammoSet>AmmoSet_ArchoSniper_CE_L</ammoSet>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AW_Bullet_ArchotechSniper_CE_L</defaultProjectile>
+					<warmupTime>1.5</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<range>86</range>
+					<recoilAmount>0.01</recoilAmount>
+					<soundCast>AW_SniperShoot</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>12</muzzleFlashScale>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aiAimMode>AimedShot</aiAimMode>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ==== Archotech Rifle ==== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AW_ArchotechRifle</defName>
+		<statBases>
+			<Mass>2.6</Mass>
+			<Bulk>5.20</Bulk>
+			<SwayFactor>2.25</SwayFactor>
+			<ShotSpread>0.10</ShotSpread>
+			<SightsEfficiency>1.65</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>AW_Bullet_ArchotechRifle_CE_NL</defaultProjectile>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<warmupTime>1.5</warmupTime>
+			<range>56</range>
+			<recoilAmount>0.01</recoilAmount>
+			<soundCast>AW_GunLightShoot</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>80</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_ArchoRifle_CE_NL</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AW_ArchotechRifle"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<propsUnderBarrel>
+					<magazineSize>80</magazineSize>
+					<reloadTime>4.5</reloadTime>
+					<ammoSet>AmmoSet_ArchoRifle_CE_L</ammoSet>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AW_Bullet_ArchotechRifle_CE_L</defaultProjectile>
+					<warmupTime>1.5</warmupTime>
+					<burstShotCount>10</burstShotCount>
+					<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+					<range>56</range>
+					<recoilAmount>0.01</recoilAmount>
+					<soundCast>AW_GunLightShoot</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>12</muzzleFlashScale>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aimedBurstShotCount>5</aimedBurstShotCount>
+					<aiAimMode>Snapshot</aiAimMode>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ==== Archotech Pistol ==== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AW_ArchotechPistol</defName>
+		<statBases>
+			<WorkToMake>27500</WorkToMake>
+			<Mass>0.7</Mass>
+			<Bulk>1.50</Bulk>
+			<SwayFactor>0.45</SwayFactor>
+			<ShotSpread>0.16</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>AW_Bullet_ArchotechPistol_CE_NL</defaultProjectile>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<warmupTime>0.5</warmupTime>
+			<range>35</range>
+			<soundCast>AW_GunShoot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>2.5</reloadTime>
+			<ammoSet>AmmoSet_ArchoPistol_CE_NL</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AW_ArchotechPistol"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<propsUnderBarrel>
+					<magazineSize>40</magazineSize>
+					<reloadTime>2.5</reloadTime>
+					<ammoSet>AmmoSet_ArchoPistol_CE_L</ammoSet>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>AW_Bullet_ArchotechPistol_CE_L</defaultProjectile>
+					<warmupTime>0.5</warmupTime>
+					<burstShotCount>10</burstShotCount>
+					<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+					<range>35</range>
+					<soundCast>AW_GunShoot</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>12</muzzleFlashScale>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aimedBurstShotCount>5</aimedBurstShotCount>
+					<aiAimMode>Snapshot</aiAimMode>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Archotech+/Patches/Archotech+/ArchotechPlus_Hediffs_BodyParts_Archotech.xml b/ModPatches/Archotech+/Patches/Archotech+/ArchotechPlus_Hediffs_BodyParts_Archotech.xml
new file mode 100644
index 0000000000..e65ec5b944
--- /dev/null
+++ b/ModPatches/Archotech+/Patches/Archotech+/ArchotechPlus_Hediffs_BodyParts_Archotech.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ArchotechSubdermalArmor"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>1</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>2</ArmorRating_Sharp>
+						<ArmorRating_Blunt>2</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.2</ArmorRating_Heat>
+					</statOffsets>
+					<totalBleedFactor>0.8</totalBleedFactor>
+				</li>
+				<li>
+					<minSeverity>2</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>3</ArmorRating_Sharp>
+						<ArmorRating_Blunt>3</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.30</ArmorRating_Heat>
+					</statOffsets>
+					<totalBleedFactor>0.6</totalBleedFactor>
+					<statFactors>
+						<IncomingDamageFactor>0.9</IncomingDamageFactor>
+					</statFactors>
+				</li>
+				<li>
+					<minSeverity>3</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>4</ArmorRating_Sharp>
+						<ArmorRating_Blunt>4</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.4</ArmorRating_Heat>
+					</statOffsets>
+					<totalBleedFactor>0.4</totalBleedFactor>
+					<statFactors>
+						<IncomingDamageFactor>0.75</IncomingDamageFactor>
+					</statFactors>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ArchotechCortex"]/stages/li[minSeverity=1]/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.05</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ArchotechCortex"]/stages/li[minSeverity=2]/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.1</Suppressability>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Argonians of Blackmarsh/Patches/Argonians of Blackmarsh/Argonian_Bodytype.xml b/ModPatches/Argonians of Blackmarsh/Patches/Argonians of Blackmarsh/Argonian_Bodytype.xml
new file mode 100644
index 0000000000..e1386bbb85
--- /dev/null
+++ b/ModPatches/Argonians of Blackmarsh/Patches/Argonians of Blackmarsh/Argonian_Bodytype.xml	
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Outside Squishy-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Argonian"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "right eye"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Argonian"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "left eye"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Argonian"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Argonian"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<!--Arm Groups-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Argonian"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Argonian"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Argonian"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Argonian"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<!--Natural Armor-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Argonian"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Argonian"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Argonian"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Argonian"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Argonian"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Argonian"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Argonian"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Argonian"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Argonian"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Argonian"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Argonian"]/corePart/parts/li[def="Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Argonian"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Argonian"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Argonians of Blackmarsh/Patches/Argonians of Blackmarsh/PawnKinds_Argonian.xml b/ModPatches/Argonians of Blackmarsh/Patches/Argonians of Blackmarsh/PawnKinds_Argonian.xml
new file mode 100644
index 0000000000..007262c543
--- /dev/null
+++ b/ModPatches/Argonians of Blackmarsh/Patches/Argonians of Blackmarsh/PawnKinds_Argonian.xml	
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="ArgoColonist"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>12</min>
+					<max>20</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="ArgoHistSpeaker"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>12</min>
+					<max>20</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="ArgoTrader"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>12</min>
+					<max>20</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="ArgoSlave"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>12</min>
+					<max>20</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="ArgoRefugee"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>12</min>
+					<max>20</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="ArgoGuard"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>12</min>
+					<max>20</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="ArgoFighter"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>12</min>
+					<max>20</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="ArgoHunter"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>12</min>
+					<max>20</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="ArgoHistGuard"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>12</min>
+					<max>20</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="ArgoShadowscale"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Argonians of Blackmarsh/Patches/Argonians of Blackmarsh/Race_XArgonian.xml b/ModPatches/Argonians of Blackmarsh/Patches/Argonians of Blackmarsh/Race_XArgonian.xml
new file mode 100644
index 0000000000..e3b5eec482
--- /dev/null
+++ b/ModPatches/Argonians of Blackmarsh/Patches/Argonians of Blackmarsh/Race_XArgonian.xml	
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Argonian"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Argonian"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>22</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>22</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.9</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Argonian"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Argonian"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Argonian"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Arrow Please/Defs/Arrow Please/Recipes_Throwable.xml b/ModPatches/Arrow Please/Defs/Arrow Please/Recipes_Throwable.xml
new file mode 100644
index 0000000000..b15a4842a2
--- /dev/null
+++ b/ModPatches/Arrow Please/Defs/Arrow Please/Recipes_Throwable.xml	
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- == Recipes == -->
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>Make_Ranged_Tomahawk_CE</defName>
+		<label>make tomahawk x10</label>
+		<description>Craft 10 tomahawks.</description>
+		<jobString>Making tomahawk.</jobString>
+		<workAmount>8500</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<stuffCategoriesToAllow>
+						<li>Metallic</li>
+						<li>Stony</li>
+					</stuffCategoriesToAllow>
+				</filter>
+				<count>50</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+			</thingDefs>
+			<stuffCategoriesToAllow>
+				<li>Metallic</li>
+				<li>Stony</li>
+			</stuffCategoriesToAllow>
+		</fixedIngredientFilter>
+		<products>
+			<Ranged_Tomahawk>10</Ranged_Tomahawk>
+		</products>
+		<recipeUsers>
+			<li>FueledSmithy</li>
+			<li>ElectricSmithy</li>
+			<li>CraftingSpot</li>
+		</recipeUsers>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>Make_Torch_Torch</defName>
+		<label>make torch x10</label>
+		<description>Craft 10 torches.</description>
+		<jobString>Making torch.</jobString>
+		<workAmount>400</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>40</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Torch_Torch>10</Torch_Torch>
+		</products>
+		<recipeUsers>
+			<li>FueledSmithy</li>
+			<li>ElectricSmithy</li>
+			<li>CraftingSpot</li>
+		</recipeUsers>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Arrow Please/Patches/Arrow Please/ArrowPlease_Ranged.xml b/ModPatches/Arrow Please/Patches/Arrow Please/ArrowPlease_Ranged.xml
new file mode 100644
index 0000000000..1fa4b9b6bd
--- /dev/null
+++ b/ModPatches/Arrow Please/Patches/Arrow Please/ArrowPlease_Ranged.xml	
@@ -0,0 +1,304 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === Melee Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Ranged_Crossbow" or
+			defName="Ranged_Arbalest" or
+			defName="Ranged_Waistcrossbow" or
+			defName="Ranged_Repeatingcrossbow"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.65</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Ranged_Crossbow === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Ranged_Crossbow</defName>
+		<statBases>
+			<Bulk>4</Bulk>
+			<SwayFactor>1.0</SwayFactor>
+			<ShotSpread>0.5</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>2.05</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Projectile_CrossbowBolt_Steel</defaultProjectile>
+			<warmupTime>0.90</warmupTime>
+			<range>20</range>
+			<soundCast>Bow_Small</soundCast>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>MedievalRanged</li>
+			<li>CE_Bow</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Ranged_Arbalest === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Ranged_Arbalest</defName>
+		<statBases>
+			<Bulk>6</Bulk>
+			<SwayFactor>1.0</SwayFactor>
+			<ShotSpread>0.5</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>2.55</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Projectile_CrossbowBolt_Steel</defaultProjectile>
+			<warmupTime>1.05</warmupTime>
+			<range>24</range>
+			<soundCast>Bow_Large</soundCast>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>MedievalRanged</li>
+			<li>CE_Bow</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Ranged_Waistcrossbow === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Ranged_Waistcrossbow</defName>
+		<statBases>
+			<Bulk>12</Bulk>
+			<SwayFactor>1.0</SwayFactor>
+			<ShotSpread>0.5</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>4.15</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Projectile_CrossbowBolt_Steel</defaultProjectile>
+			<warmupTime>1.15</warmupTime>
+			<range>20</range>
+			<soundCast>Bow_Large</soundCast>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>9</reloadTime>
+			<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>MedievalRanged</li>
+			<li>CE_Bow</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Ranged_Repeatingcrossbow === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Ranged_Repeatingcrossbow</defName>
+		<statBases>
+			<Bulk>7</Bulk>
+			<SwayFactor>1.0</SwayFactor>
+			<ShotSpread>0.5</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>4.15</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Projectile_CrossbowBolt_Steel</defaultProjectile>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<warmupTime>0.95</warmupTime>
+			<range>18</range>
+			<soundCast>Bow_Small</soundCast>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>7</reloadTime>
+			<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>MedievalRanged</li>
+			<li>CE_Bow</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Ranged_Slinger === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Ranged_Slinger"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stone</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.65</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Ranged_Slinger</defName>
+		<statBases>
+			<Bulk>2</Bulk>
+			<SwayFactor>1.0</SwayFactor>
+			<ShotSpread>0.5</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Ammo_SlingBullet_Stone</defaultProjectile>
+			<warmupTime>2.25</warmupTime>
+			<range>16</range>
+			<soundCast>ThrowGrenade</soundCast>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>1.5</reloadTime>
+			<ammoSet>AmmoSet_SlingBullet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>NeolithicRangedBasic</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Ranged_Blowgun === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Ranged_Blowgun"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>0.65</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Ranged_Blowgun</defName>
+		<statBases>
+			<Bulk>2</Bulk>
+			<SwayFactor>1.0</SwayFactor>
+			<ShotSpread>0.5</ShotSpread>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Projectile_Dart_Venom</defaultProjectile>
+			<warmupTime>1.65</warmupTime>
+			<range>12</range>
+			<soundCast>Bow_Small</soundCast>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>2</reloadTime>
+			<ammoSet>AmmoSet_Blowdart</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>NeolithicRangedBasic</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Remove Unneeded === -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Flame_Crossbow"]</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Arrow_Crossbow"]</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="FlameArrow_Crossbow"]</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Arrow_Arbalest"]</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Flame_Arbalest"]</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="FlameArrow_Arbalest"]</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Arrow_Waistcrossbow"]</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Arrow_Repeatingcrossbow"]</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Stone_Slinger"]</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Dart_Blowgun"]</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Bowshort_Flame"]</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Arrowshort_Flame"]</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Bowrecurve_Flame"]</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Arrowrecurve_Flame"]</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Bowgreat_Flame"]</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Arrowgreat_Flame"]</xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Arrow Please/Patches/Arrow Please/ArrowPlease_Throwable.xml b/ModPatches/Arrow Please/Patches/Arrow Please/ArrowPlease_Throwable.xml
new file mode 100644
index 0000000000..79a54ae1b6
--- /dev/null
+++ b/ModPatches/Arrow Please/Patches/Arrow Please/ArrowPlease_Throwable.xml	
@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Tomahawk -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Ranged_Tomahawk"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationSharp>0.6</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Ranged_Tomahawk"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<MeleeCounterParryBonus>0.2</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Ranged_Tomahawk"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.40</MeleeCritChance>
+				<MeleeParryChance>0.20</MeleeParryChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Ranged_Tomahawk</defName>
+		<statBases>
+			<Mass>1.2</Mass>
+			<Bulk>3.3</Bulk>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>1.5</ShotSpread>
+			<SwayFactor>2.5</SwayFactor>
+			<RangedWeapon_Cooldown>0.75</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<label>throw tomahawk</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Axe_Tomahawk</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>10</range>
+			<soundCast>Interact_BeatFire</soundCast>
+		</Properties>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Axe_Tomahawk"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<damageDef>Stab</damageDef>
+				<damageAmountBase>10</damageAmountBase>
+				<speed>12</speed>
+				<armorPenetrationSharp>0.5</armorPenetrationSharp>
+				<armorPenetrationBlunt>2</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="Ranged_Tomahawk"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>BaseWeapon</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Ranged_Tomahawk"]/costStuffCount</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Ranged_Tomahawk"]/costList</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Ranged_Tomahawk"]/recipeMaker</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Ranged_Tomahawk"]</xpath>
+		<value>
+			<stackLimit>25</stackLimit>
+			<resourceReadoutPriority>First</resourceReadoutPriority>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="Ranged_Tomahawk"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<!-- Torch -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Ranged_Torch"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stick</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.8</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>fire</label>
+					<capacities>
+						<li>TorchBurn</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2.2</cooldownTime>
+					<chanceFactor>2.2</chanceFactor>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>fire</label>
+					<capacities>
+						<li>TorchFlame</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2.2</cooldownTime>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationBlunt>0.0</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="Ranged_Torch"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>BaseWeapon</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Ranged_Torch</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>1.5</ShotSpread>
+			<SwayFactor>2.5</SwayFactor>
+			<RangedWeapon_Cooldown>0.75</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<label>throw torch</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Torch_Torch</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>10</range>
+			<soundCast>Interact_BeatFire</soundCast>
+		</Properties>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Ranged_Torch"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<MeleeCounterParryBonus>0.2</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Ranged_Torch"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.10</MeleeCritChance>
+			<MeleeParryChance>0.30</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Ranged_Torch"]</xpath>
+		<value>
+			<thingClass>CombatExtended.AmmoThing</thingClass>
+			<stackLimit>25</stackLimit>
+			<resourceReadoutPriority>First</resourceReadoutPriority>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Torch_Torch"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<damageDef>Flame</damageDef>
+				<damageAmountBase>1</damageAmountBase>
+				<speed>12</speed>
+				<armorPenetrationSharp>0.0</armorPenetrationSharp>
+				<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				<ai_IsIncendiary>true</ai_IsIncendiary>
+				<!--
+		<explosionRadius>0.5</explosionRadius>
+		<postExplosionSpawnChance>1</postExplosionSpawnChance>
+		<postExplosionSpawnThingDef>Fire</postExplosionSpawnThingDef>
+		<postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
+		-->
+			</projectile>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Arrow Please/Patches/Arrow Please/ArrowPlease_Turret.xml b/ModPatches/Arrow Please/Patches/Arrow Please/ArrowPlease_Turret.xml
new file mode 100644
index 0000000000..1b7c7b839d
--- /dev/null
+++ b/ModPatches/Arrow Please/Patches/Arrow Please/ArrowPlease_Turret.xml	
@@ -0,0 +1,295 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--=============== Base turrets ===============-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Turret_Ballista" or
+			defName="Turret_Triplecrossbow" or
+			@Name="Turret_CatapultBase" or
+			@Name="Turret_TrebuchetBase"
+			]/thingClass </xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="Turret_Ballista" or
+			defName="Turret_Triplecrossbow"
+			]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
+	</Operation>
+
+	<!-- Remove duplicate mannable comp. -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			@Name="Turret_CatapultBase" or
+			@Name="Turret_TrebuchetBase"
+			]/comps/li[@Class = "CompProperties_Mannable"] </xpath>
+	</Operation>
+
+	<!--=============== Ballista ===============-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Turret_BallistaGun</defName>
+		<statBases>
+			<Mass>25.0</Mass>
+			<RangedWeapon_Cooldown>8.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.002</ShotSpread>
+			<SwayFactor>0.0</SwayFactor>
+			<Bulk>18.87</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.1</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Pilum_Fired</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>42</range>
+			<soundCast>Ballista_Launch</soundCast>
+			<muzzleFlashScale>0</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_Javelins</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!--=============== Triple Crossbow ===============-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Turret_TriplecrossbowGun</defName>
+		<statBases>
+			<Mass>25.0</Mass>
+			<RangedWeapon_Cooldown>8.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.005</ShotSpread>
+			<SwayFactor>0.0</SwayFactor>
+			<Bulk>22.87</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.1</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Pilum_Fired</defaultProjectile>
+			<warmupTime>0.85</warmupTime>
+			<range>40</range>
+			<soundCast>Ballista_Launch</soundCast>
+			<muzzleFlashScale>0</muzzleFlashScale>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<burstShotCount>3</burstShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>3</magazineSize>
+			<reloadTime>4.95</reloadTime>
+			<ammoSet>AmmoSet_Javelins</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>true</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!--========== Catapult - Weapon ==========-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="BaseCatapultWeapon"]</xpath>
+		<value>
+			<statBases>
+				<SightsEfficiency>0.5</SightsEfficiency>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name = "BaseCatapultWeapon"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>10</li>
+					<li>20</li>
+					<li>30</li>
+					<li>50</li>
+					<li>70</li>
+				</chargeSpeeds>
+			</li>
+			<li Class="CombatExtended.CompProperties_AmmoUser">
+				<magazineSize>1</magazineSize>
+				<reloadTime>12</reloadTime>
+				<ammoSet>AmmoSet_Catapult</ammoSet>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Turret_CatapultGun"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+					<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Projectile_CatapultBullet_Boulder</defaultProjectile>
+					<warmupTime>4</warmupTime>
+					<minRange>20</minRange>
+					<range>500</range>
+					<burstShotCount>1</burstShotCount>
+					<soundCast>Bow_Recurve</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<indirectFirePenalty>0.2</indirectFirePenalty>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Turret_CatapultGun"]/weaponTags</xpath>
+		<value>
+			<li>TurretGun</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Catapult - Base ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Turret_CatapultBase"]/building/turretBurstWarmupTime</xpath>
+		<value>
+			<turretBurstWarmupTime>1</turretBurstWarmupTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Turret_CatapultBase"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>1</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="Turret_CatapultBase"]/inspectorTabs</xpath>
+	</Operation>
+
+	<!--========== Trebuchet - Weapon ==========-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="BaseTrebuchetWeapon"]</xpath>
+		<value>
+			<statBases>
+				<SightsEfficiency>0.5</SightsEfficiency>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name = "BaseTrebuchetWeapon"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>30</li>
+					<li>50</li>
+					<li>70</li>
+					<li>90</li>
+				</chargeSpeeds>
+			</li>
+			<li Class="CombatExtended.CompProperties_AmmoUser">
+				<magazineSize>1</magazineSize>
+				<reloadTime>14</reloadTime>
+				<ammoSet>AmmoSet_Catapult</ammoSet>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Turret_TrebuchetGun"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+					<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Projectile_CatapultBullet_Boulder</defaultProjectile>
+					<warmupTime>4</warmupTime>
+					<minRange>30</minRange>
+					<range>500</range>
+					<burstShotCount>1</burstShotCount>
+					<soundCast>Bow_Recurve</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<indirectFirePenalty>0.2</indirectFirePenalty>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Turret_TrebuchetGun"]/weaponTags</xpath>
+		<value>
+			<li>TurretGun</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="Turret_TrebuchetBase"]/inspectorTabs</xpath>
+	</Operation>
+
+	<!-- === Remove Unneeded === -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Trebuchet_ShellsN"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/RecipeDef[defName="Make_TrebuchetShells"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/RecipeDef[defName="Make_TrebuchetShellsA"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Trebuchet_ShellsF"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Trebuchet_ShellsH"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/RecipeDef[defName="MakeHumanRound"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Catapult_ShellsN"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Catapult_ShellsF"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/RecipeDef[defName="Make_CatapultShells"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/RecipeDef[defName="Make_CatapultShellsA"]</xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Aspero Race/Patches/Aspero Race/CE_Patch_Animal_Meatdrake.xml b/ModPatches/Aspero Race/Patches/Aspero Race/CE_Patch_Animal_Meatdrake.xml
new file mode 100644
index 0000000000..4a05ddedde
--- /dev/null
+++ b/ModPatches/Aspero Race/Patches/Aspero Race/CE_Patch_Animal_Meatdrake.xml	
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd"><!-- This thing is basically a big slower, stupider, iguana so using the CE Iguana as a base -->
+		<xpath>Defs/ThingDef[defName="Grei_MeatDrake"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.04</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Grei_MeatDrake"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2.2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.250</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>5</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Grei_MeatDrake"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Serpentine</bodyShape>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Aspero Race/Patches/Aspero Race/CE_Patch_Bodies.xml b/ModPatches/Aspero Race/Patches/Aspero Race/CE_Patch_Bodies.xml
new file mode 100644
index 0000000000..629709f71f
--- /dev/null
+++ b/ModPatches/Aspero Race/Patches/Aspero Race/CE_Patch_Bodies.xml	
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd"><!-- Horns should be armored very well -->
+		<xpath>Defs/BodyDef[defName = "Aspero_Body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Horn"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd"><!-- Tail should be armored the same as the rest of the body-->
+		<xpath>Defs/BodyDef[defName = "Aspero_Body"]/corePart/parts/li[def = "Tail"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<!-- The rest is identical to default humanoid, but since Aspero use a custom body the armor tags needs to be set seperately -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Aspero_Body"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Aspero_Body"]/corePart/parts/li[def = "Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Aspero_Body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Aspero_Body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Aspero_Body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Aspero_Body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Ear"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Aspero_Body"]/corePart/parts/li[def = "Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Aspero_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Aspero_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Aspero_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/parts/li[def = "Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Aspero_Body"]/corePart/parts/li[def = "Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Aspero_Body"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Aspero_Body"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/parts/li[def = "Toe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- Squishy bits -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Aspero_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "right eye"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Aspero_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "left eye"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Aspero_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Aspero_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Aspero Race/Patches/Aspero Race/CE_Patch_HediffParts.xml b/ModPatches/Aspero Race/Patches/Aspero Race/CE_Patch_HediffParts.xml
new file mode 100644
index 0000000000..5e9b264d06
--- /dev/null
+++ b/ModPatches/Aspero Race/Patches/Aspero Race/CE_Patch_HediffParts.xml	
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="SimpleAsperoTail"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tail</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>0.5</power>
+					<cooldownTime>2</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.01</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="CombatAsperoTail"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>spiked tail</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2</cooldownTime>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.42</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BionicAsperoTail"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>transforming tail</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1</cooldownTime>
+					<chanceFactor>0.3</chanceFactor>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>transforming tail</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>4</cooldownTime>
+					<chanceFactor>0.3</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Aspero Race/Patches/Aspero Race/CE_Patch_Leather.xml b/ModPatches/Aspero Race/Patches/Aspero Race/CE_Patch_Leather.xml
new file mode 100644
index 0000000000..f4cb6013b7
--- /dev/null
+++ b/ModPatches/Aspero Race/Patches/Aspero Race/CE_Patch_Leather.xml	
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Aspero"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.10</StuffPower_Armor_Sharp><!-- Vanilla lizard is 0.81 aspero is 1 CE lizard is 0.08, so 0.1 seems to make sense. -->
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationadd"><!-- add instead of replace since aspero used leather base for blunt and didn't define a value itself -->
+		<xpath>Defs/ThingDef[defName="Leather_Aspero"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.04</StuffPower_Armor_Blunt><!-- If I understand the CE xmls right this should be the same as human leather -->
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Aspero"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.050</StuffPower_Armor_Heat><!-- I don't see a lot comparable CE examples for this value. Compared to other materials ingame instead and decided to go with with 5% -->
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Aspero Race/Patches/Aspero Race/CE_Patch_Pawnkinds.xml b/ModPatches/Aspero Race/Patches/Aspero Race/CE_Patch_Pawnkinds.xml
new file mode 100644
index 0000000000..8aff5426a3
--- /dev/null
+++ b/ModPatches/Aspero Race/Patches/Aspero Race/CE_Patch_Pawnkinds.xml	
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension"><!-- tried to do off the pawnkind base but that didn't work soooo.....-->
+		<xpath>Defs/PawnKindDef[@Name="AsperoPawnkindBase" or DefName="AsperoCivilian" or DefName="AsperoMilitia" or DefName="AsperoTrader" or DefName="AsperoOverseer" or DefName="AsperoSoldier" or DefName="AsperoESoldier" or DefName="AsperoSniper" or DefName="AsperoMeleeSoldier" or DefName="AsperoEMeleeSoldier"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>1</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.3</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>60</min>
+							<max>150</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Aspero Race/Patches/Aspero Race/CE_Patch_Race_Aspero.xml b/ModPatches/Aspero Race/Patches/Aspero Race/CE_Patch_Race_Aspero.xml
new file mode 100644
index 0000000000..ff6b2cc564
--- /dev/null
+++ b/ModPatches/Aspero Race/Patches/Aspero Race/CE_Patch_Race_Aspero.xml	
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Grei_Aspero"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Grei_Aspero"]/statBases</xpath>
+		<value>
+			<MeleeCritChance>0.9</MeleeCritChance>
+			<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			<MeleeParryChance>1.1</MeleeParryChance>
+			<Suppressability>0.9</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Grei_Aspero"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Grei_Aspero"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Grei_Aspero"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Grei_Aspero"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>1.5</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>Aspero_LeftClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>1.5</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>Aspero_RightClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Aspero_hornGroup</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationSharp>0.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>tail</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Aspero_TailGroup</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Aspero Race/Patches/Aspero Race/CE_Patch_Scenario.xml b/ModPatches/Aspero Race/Patches/Aspero Race/CE_Patch_Scenario.xml
new file mode 100644
index 0000000000..7ce751c437
--- /dev/null
+++ b/ModPatches/Aspero Race/Patches/Aspero Race/CE_Patch_Scenario.xml	
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd"><!-- Same as crashlanded -->
+		<xpath>Defs/ScenarioDef[@Name="AsperoStart"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_303British_FMJ</thingDef>
+				<count>100</count>
+			</li>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_44Magnum_FMJ</thingDef>
+				<count>60</count>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Astoriel Legacy/Patches/Astoriel Legacy/Astoriel_Bodytype.xml b/ModPatches/Astoriel Legacy/Patches/Astoriel Legacy/Astoriel_Bodytype.xml
new file mode 100644
index 0000000000..1cd67a1d7f
--- /dev/null
+++ b/ModPatches/Astoriel Legacy/Patches/Astoriel Legacy/Astoriel_Bodytype.xml	
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Outside Squishy-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Astoriel"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "right eye"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Astoriel"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "left eye"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Astoriel"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Astoriel"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<!--Arm Groups-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Astoriel"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Astoriel"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Astoriel"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Astoriel"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<!--Natural Armor-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Astoriel"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Astoriel"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Astoriel"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Astoriel"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Astoriel"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Astoriel"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Astoriel"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Astoriel"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Astoriel"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Astoriel"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Astoriel"]/corePart/parts/li[def="Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Astoriel"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Astoriel"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Astoriel Legacy/Patches/Astoriel Legacy/PawnKinds_Astoriel.xml b/ModPatches/Astoriel Legacy/Patches/Astoriel Legacy/PawnKinds_Astoriel.xml
new file mode 100644
index 0000000000..bd060d46f4
--- /dev/null
+++ b/ModPatches/Astoriel Legacy/Patches/Astoriel Legacy/PawnKinds_Astoriel.xml	
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Give ammo to pawns ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/PawnKindDef[@Name="AstorielCivBase"]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/PawnKindDef[@Name="AstorielMilBase"]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>7</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Give packs to pawns ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[@Name="AstorielMilBase" or @Name="AstorielCivBase"]</xpath>
+		<value>
+			<apparelRequired>
+				<li>CE_Apparel_Backpack</li>
+			</apparelRequired>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Astoriel Legacy/Patches/Astoriel Legacy/Race_Astoriel.xml b/ModPatches/Astoriel Legacy/Patches/Astoriel Legacy/Race_Astoriel.xml
new file mode 100644
index 0000000000..e5329de693
--- /dev/null
+++ b/ModPatches/Astoriel Legacy/Patches/Astoriel Legacy/Race_Astoriel.xml	
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Astoriel"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Astoriel"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Astoriel"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Astoriel"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency>0.4</NightVisionEfficiency>
+			<MeleeDodgeChance>1.1</MeleeDodgeChance>
+			<MeleeCritChance>0.8</MeleeCritChance>
+			<MeleeParryChance>0.85</MeleeParryChance>
+			<CarryWeight>35</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Astoriel"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Astoriel"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Astoriel Legacy/Patches/Astoriel Legacy/Scenarios_Astoriel.xml b/ModPatches/Astoriel Legacy/Patches/Astoriel Legacy/Scenarios_Astoriel.xml
new file mode 100644
index 0000000000..468544350b
--- /dev/null
+++ b/ModPatches/Astoriel Legacy/Patches/Astoriel Legacy/Scenarios_Astoriel.xml	
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Add ammo to scenario === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="AstorielScenario"]/scenario/parts</xpath>
+
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_6x24mmCharged</thingDef>
+				<count>600</count>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Astoriel Legacy/Patches/Astoriel Legacy/Traders_Astoriel.xml b/ModPatches/Astoriel Legacy/Patches/Astoriel Legacy/Traders_Astoriel.xml
new file mode 100644
index 0000000000..9bd4bf4fe9
--- /dev/null
+++ b/ModPatches/Astoriel Legacy/Patches/Astoriel Legacy/Traders_Astoriel.xml	
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==========  ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[
+			defName="Caravan_Astoriel_BulkGoods" or defName="Caravan_Astoriel_PirateMerchant"
+			]/stockGenerators </xpath>
+		<value>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>FSX</thingDef>
+				<countRange>
+					<min>15</min>
+					<max>45</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>Prometheum</thingDef>
+				<countRange>
+					<min>15</min>
+					<max>45</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_HeavyAmmo</tradeTag>
+				<countRange>
+					<min>1</min>
+					<max>5</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>-1</min>
+					<max>3</max>
+				</thingDefCountRange>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="Caravan_Astoriel_CombatSupplier"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>FSX</thingDef>
+				<countRange>
+					<min>12</min>
+					<max>36</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>Prometheum</thingDef>
+				<countRange>
+					<min>12</min>
+					<max>36</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Ammo</tradeTag>
+				<countRange>
+					<min>300</min>
+					<max>1200</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>1</min>
+					<max>3</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_MediumAmmo</tradeTag>
+				<countRange>
+					<min>20</min>
+					<max>30</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>2</min>
+					<max>4</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_HeavyAmmo</tradeTag>
+				<countRange>
+					<min>10</min>
+					<max>15</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>3</max>
+				</thingDefCountRange>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="Visitor_Astoriel_Standard"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Ammo</tradeTag>
+				<countRange>
+					<min>10</min>
+					<max>60</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>-1</min>
+					<max>1</max>
+				</thingDefCountRange>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Astra Militarum Regimentum - Cadia/Patches/Astra Militarum Regimentum - Cadia/Armor_Industrial.xml b/ModPatches/Astra Militarum Regimentum - Cadia/Patches/Astra Militarum Regimentum - Cadia/Armor_Industrial.xml
new file mode 100644
index 0000000000..38d74af7a8
--- /dev/null
+++ b/ModPatches/Astra Militarum Regimentum - Cadia/Patches/Astra Militarum Regimentum - Cadia/Armor_Industrial.xml	
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Fatigues === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_Cadian_Fatigues"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_Cadian_Fatigues"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- === Flak Armor === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_Cadian_FlakArmor"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_Cadian_FlakArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_Cadian_FlakArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>18</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_Cadian_FlakArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>30</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_Cadian_FlakArmor"]/apparel/layers</xpath>
+		<value>
+			<li>Webbing</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_Cadian_FlakArmor"]/stuffCategories</xpath>
+		<value>
+			<stuffCategories>
+				<li>Steeled</li>
+			</stuffCategories>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_Cadian_FlakArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
+						<parts>
+							<li>Shoulder</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.85</ArmorRating_Blunt>
+						<parts>
+							<li>Shoulder</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Heavy Flak Armor === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_CadianKasrkin_FlakArmor"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_CadianKasrkin_FlakArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_CadianKasrkin_FlakArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>22</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_CadianKasrkin_FlakArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>30</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_CadianKasrkin_FlakArmor"]/apparel/layers</xpath>
+		<value>
+			<li>Webbing</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_CadianKasrkin_FlakArmor"]/stuffCategories</xpath>
+		<value>
+			<stuffCategories>
+				<li>Steeled</li>
+			</stuffCategories>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_CadianKasrkin_FlakArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Astra Militarum Regimentum - Cadia/Patches/Astra Militarum Regimentum - Cadia/Headgear_Industrial.xml b/ModPatches/Astra Militarum Regimentum - Cadia/Patches/Astra Militarum Regimentum - Cadia/Headgear_Industrial.xml
new file mode 100644
index 0000000000..2130bd0191
--- /dev/null
+++ b/ModPatches/Astra Militarum Regimentum - Cadia/Patches/Astra Militarum Regimentum - Cadia/Headgear_Industrial.xml	
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Officer Gorget === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_Cadian_OfficerGorget"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>0.5</Bulk>
+			<StuffEffectMultiplierArmor>1.25</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- === Field Cap === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_Cadian_Fieldcap"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- === Officer's Cap === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_Cadian_CrusherCap"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- === Helmet === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_Cadian_Helmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+			<StuffEffectMultiplierArmor>6.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_Cadian_Helmet"]</xpath>
+		<value>
+			<costList>
+				<Hyperweave>15</Hyperweave><!-- Hyperweave instead of Devilstrand, since the torso armor already uses it.-->
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_Cadian_Helmet"]/stuffCategories/li[.="Metallic"]</xpath>
+		<value>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<!-- === Kasrkin Helmet === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_CadianKasrkin_Helmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<StuffEffectMultiplierArmor>9</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_CadianKasrkin_Helmet"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_CadianKasrkin_Helmet"]/costList</xpath>
+		<value>
+			<Hyperweave>20</Hyperweave>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_CadianKasrkin_Helmet"]/stuffCategories/li[.="Metallic"]</xpath>
+		<value>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Astra Militarum Regimentum - Krieg Officer Helmet/Patches/Astra Militarum Regimentum - Krieg Officer Helmet/Headgear_Industrial.xml b/ModPatches/Astra Militarum Regimentum - Krieg Officer Helmet/Patches/Astra Militarum Regimentum - Krieg Officer Helmet/Headgear_Industrial.xml
new file mode 100644
index 0000000000..536a6a0e08
--- /dev/null
+++ b/ModPatches/Astra Militarum Regimentum - Krieg Officer Helmet/Patches/Astra Militarum Regimentum - Krieg Officer Helmet/Headgear_Industrial.xml	
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Grenadier Helmet === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_40K_IG_DKOK_OFFICER" or defName="ODZ_40K_IG_DKOK_NCO"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<StuffEffectMultiplierArmor>10</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ODZ_40K_IG_DKOK_OFFICER" or defName="ODZ_40K_IG_DKOK_NCO"]</xpath>
+		<value>
+			<costList>
+				<Hyperweave>20</Hyperweave>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_40K_IG_DKOK_OFFICER" or defName="ODZ_40K_IG_DKOK_NCO"]/stuffCategories/li[.="Metallic"]</xpath>
+		<value>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Astra Militarum Regimentum - Krieg/Patches/Astra Militarum Regimentum - Krieg/Armor_Industrial.xml b/ModPatches/Astra Militarum Regimentum - Krieg/Patches/Astra Militarum Regimentum - Krieg/Armor_Industrial.xml
new file mode 100644
index 0000000000..f83cf54203
--- /dev/null
+++ b/ModPatches/Astra Militarum Regimentum - Krieg/Patches/Astra Militarum Regimentum - Krieg/Armor_Industrial.xml	
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Krieg Uniform === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_KriegUniform"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_KriegUniform"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- === Combat Webbing === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_CombatWebbing"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_CombatWebbing"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- === Flak Armor === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_GrenadierArmor"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_GrenadierArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_GrenadierArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>18</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_GrenadierArmor"]/stuffCategories</xpath>
+		<value>
+			<stuffCategories>
+				<li>Steeled</li>
+			</stuffCategories>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_GrenadierArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
+						<parts>
+							<li>Shoulder</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.85</ArmorRating_Blunt>
+						<parts>
+							<li>Shoulder</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Astra Militarum Regimentum - Krieg/Patches/Astra Militarum Regimentum - Krieg/Headgear_Industrial.xml b/ModPatches/Astra Militarum Regimentum - Krieg/Patches/Astra Militarum Regimentum - Krieg/Headgear_Industrial.xml
new file mode 100644
index 0000000000..a37e054f7b
--- /dev/null
+++ b/ModPatches/Astra Militarum Regimentum - Krieg/Patches/Astra Militarum Regimentum - Krieg/Headgear_Industrial.xml	
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Helmet === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_Helmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+			<StuffEffectMultiplierArmor>6.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_Helmet"]</xpath>
+		<value>
+			<costList>
+				<Hyperweave>15</Hyperweave><!-- Hyperweave instead of Devilstrand.-->
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_Helmet"]/stuffCategories/li[.="Metallic"]</xpath>
+		<value>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<!-- === Grenadier Helmet === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_GrenadierHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_GrenadierHelmet"]</xpath>
+		<value>
+			<costList>
+				<Hyperweave>20</Hyperweave>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_GrenadierHelmet"]/stuffCategories/li[.="Metallic"]</xpath>
+		<value>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<!-- === Gas Mask === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_Gasmask"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_Gasmask"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!-- === Grenadier Gas Mask === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_GrenadierGasmask"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+			<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_GrenadierGasmask"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Auto-Mortars/Patches/Auto-Mortars/Buildings_Security.xml b/ModPatches/Auto-Mortars/Patches/Auto-Mortars/Buildings_Security.xml
new file mode 100644
index 0000000000..b07effebdc
--- /dev/null
+++ b/ModPatches/Auto-Mortars/Patches/Auto-Mortars/Buildings_Security.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Auto Mortars ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_Auto_Mortar"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_Auto_Mortar"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>10</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Turret_Auto_Mortar"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AutoMortarTurret</defName>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+			<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_60mmMortarShell_HE</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<minRange>20</minRange>
+			<range>500</range>
+			<burstShotCount>1</burstShotCount>
+			<soundCast>Mortar_LaunchA</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>55</muzzleFlashScale>
+			<circularError>1.2</circularError>
+			<requireLineOfSight>false</requireLineOfSight>
+			<indirectFirePenalty>0.3</indirectFirePenalty>
+			<targetParams>
+				<canTargetLocations>false</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_60mmMortarShell</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Gun_AutoMortarTurret"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>30</li>
+					<li>50</li>
+					<li>70</li>
+					<li>90</li>
+				</chargeSpeeds>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Autocleaner/Patches/Autocleaner/Autocleaner.xml b/ModPatches/Autocleaner/Patches/Autocleaner/Autocleaner.xml
new file mode 100644
index 0000000000..311d51b3a4
--- /dev/null
+++ b/ModPatches/Autocleaner/Patches/Autocleaner/Autocleaner.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Autocleaner === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Autocleaner"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.3</ArmorRating_Heat>
+			<MeleeDodgeChance>0</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Autocleaner"]/race/baseBodySize</xpath>
+		<value>
+			<baseBodySize>0.20</baseBodySize>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Autocleaner"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Autocleaner"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>body</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.05</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Based upon the dimensions of an actual Roomba. === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AutocleanerItem"]/statBases</xpath>
+		<value>
+			<Bulk>9</Bulk>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Beast Man Tribes/Defs/Beast Man Tribes/Pawnkinds_Beasts.xml b/ModPatches/Beast Man Tribes/Defs/Beast Man Tribes/Pawnkinds_Beasts.xml
new file mode 100644
index 0000000000..cd9cd5226d
--- /dev/null
+++ b/ModPatches/Beast Man Tribes/Defs/Beast Man Tribes/Pawnkinds_Beasts.xml	
@@ -0,0 +1,1406 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ========== Tribals ========== -->
+
+	<PawnKindDef>
+		<defName>BearManGrenadier</defName>
+		<race>BearMan</race>
+		<label>boomer</label>
+		<initialWillRange>1~3</initialWillRange>
+		<initialResistanceRange>12~19</initialResistanceRange>
+		<combatPower>60</combatPower>
+		<defaultFactionType>BearManTribe</defaultFactionType>
+		<backstoryCategories>
+			<li>Tribal</li>
+		</backstoryCategories>
+		<maxGenerationAge>60</maxGenerationAge>
+		<chemicalAddictionChance>0.05</chemicalAddictionChance>
+		<invNutrition>2.55</invNutrition>
+		<invFoodDef>Pemmican</invFoodDef>
+		<canBeSapper>true</canBeSapper>
+		<gearHealthRange>
+			<min>0.5</min>
+			<max>1.8</max>
+		</gearHealthRange>
+		<apparelMoney>
+			<min>180</min>
+			<max>350</max>
+		</apparelMoney>
+		<apparelRequired>
+			<li>Apparel_WarVeil</li>
+			<li>CE_Apparel_TribalBackpack</li>
+		</apparelRequired>
+		<apparelTags>
+			<li>Tribal</li>
+		</apparelTags>
+		<weaponMoney>
+			<min>60</min>
+			<max>400</max>
+		</weaponMoney>
+		<weaponTags>
+			<li>CE_GrenadeNeolithic</li>
+		</weaponTags>
+		<techHediffsMoney>
+			<min>50</min>
+			<max>800</max>
+		</techHediffsMoney>
+		<techHediffsTags>
+			<li>Poor</li>
+			<li>Simple</li>
+		</techHediffsTags>
+		<techHediffsChance>0.33</techHediffsChance>
+		<modExtensions>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>20</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>80</min>
+						<max>160</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Tribal</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</modExtensions>
+	</PawnKindDef>
+
+	<PawnKindDef>
+		<defName>BearManGunner</defName>
+		<race>BearMan</race>
+		<label>thunderer</label>
+		<initialWillRange>3~5</initialWillRange>
+		<initialResistanceRange>20~34</initialResistanceRange>
+		<combatPower>60</combatPower>
+		<defaultFactionType>BearManTribe</defaultFactionType>
+		<backstoryCategories>
+			<li>Tribal</li>
+		</backstoryCategories>
+		<maxGenerationAge>60</maxGenerationAge>
+		<chemicalAddictionChance>0.05</chemicalAddictionChance>
+		<invNutrition>2.55</invNutrition>
+		<invFoodDef>Pemmican</invFoodDef>
+		<gearHealthRange>
+			<min>0.5</min>
+			<max>1.8</max>
+		</gearHealthRange>
+		<apparelMoney>
+			<min>180</min>
+			<max>350</max>
+		</apparelMoney>
+		<apparelTags>
+			<li>Tribal</li>
+		</apparelTags>
+		<apparelRequired>
+			<li>Apparel_WarMask</li>
+		</apparelRequired>
+		<weaponMoney>
+			<min>180</min>
+			<max>290</max>
+		</weaponMoney>
+		<weaponTags>
+			<li>Gun</li>
+		</weaponTags>
+		<techHediffsMoney>
+			<min>50</min>
+			<max>800</max>
+		</techHediffsMoney>
+		<techHediffsTags>
+			<li>Poor</li>
+			<li>Simple</li>
+		</techHediffsTags>
+		<techHediffsChance>0.20</techHediffsChance>
+		<modExtensions>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>120</min>
+					<max>160</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.9</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</modExtensions>
+	</PawnKindDef>
+
+	<PawnKindDef>
+		<defName>CamelManGrenadier</defName>
+		<race>CamelMan</race>
+		<label>boomer</label>
+		<initialWillRange>1~3</initialWillRange>
+		<initialResistanceRange>12~19</initialResistanceRange>
+		<combatPower>60</combatPower>
+		<defaultFactionType>CamelManTribe</defaultFactionType>
+		<backstoryCategories>
+			<li>Tribal</li>
+		</backstoryCategories>
+		<maxGenerationAge>60</maxGenerationAge>
+		<chemicalAddictionChance>0.05</chemicalAddictionChance>
+		<invNutrition>2.55</invNutrition>
+		<invFoodDef>Pemmican</invFoodDef>
+		<canBeSapper>true</canBeSapper>
+		<gearHealthRange>
+			<min>0.5</min>
+			<max>1.8</max>
+		</gearHealthRange>
+		<apparelMoney>
+			<min>180</min>
+			<max>350</max>
+		</apparelMoney>
+		<apparelRequired>
+			<li>Apparel_WarVeil</li>
+			<li>CE_Apparel_TribalBackpack</li>
+		</apparelRequired>
+		<apparelTags>
+			<li>Tribal</li>
+		</apparelTags>
+		<weaponMoney>
+			<min>60</min>
+			<max>400</max>
+		</weaponMoney>
+		<weaponTags>
+			<li>CE_GrenadeNeolithic</li>
+		</weaponTags>
+		<techHediffsMoney>
+			<min>50</min>
+			<max>800</max>
+		</techHediffsMoney>
+		<techHediffsTags>
+			<li>Poor</li>
+			<li>Simple</li>
+		</techHediffsTags>
+		<techHediffsChance>0.33</techHediffsChance>
+		<modExtensions>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>20</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>80</min>
+						<max>160</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Tribal</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</modExtensions>
+	</PawnKindDef>
+
+	<PawnKindDef>
+		<defName>CamelManGunner</defName>
+		<race>CamelMan</race>
+		<label>thunderer</label>
+		<initialWillRange>3~5</initialWillRange>
+		<initialResistanceRange>20~34</initialResistanceRange>
+		<combatPower>60</combatPower>
+		<defaultFactionType>CamelManTribe</defaultFactionType>
+		<backstoryCategories>
+			<li>Tribal</li>
+		</backstoryCategories>
+		<maxGenerationAge>60</maxGenerationAge>
+		<chemicalAddictionChance>0.05</chemicalAddictionChance>
+		<invNutrition>2.55</invNutrition>
+		<invFoodDef>Pemmican</invFoodDef>
+		<gearHealthRange>
+			<min>0.5</min>
+			<max>1.8</max>
+		</gearHealthRange>
+		<apparelMoney>
+			<min>180</min>
+			<max>350</max>
+		</apparelMoney>
+		<apparelTags>
+			<li>Tribal</li>
+		</apparelTags>
+		<apparelRequired>
+			<li>Apparel_WarMask</li>
+		</apparelRequired>
+		<weaponMoney>
+			<min>180</min>
+			<max>290</max>
+		</weaponMoney>
+		<weaponTags>
+			<li>Gun</li>
+		</weaponTags>
+		<techHediffsMoney>
+			<min>50</min>
+			<max>800</max>
+		</techHediffsMoney>
+		<techHediffsTags>
+			<li>Poor</li>
+			<li>Simple</li>
+		</techHediffsTags>
+		<techHediffsChance>0.20</techHediffsChance>
+		<modExtensions>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>120</min>
+					<max>160</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.9</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</modExtensions>
+	</PawnKindDef>
+
+	<PawnKindDef>
+		<defName>ElephantManGrenadier</defName>
+		<race>ElephantMan</race>
+		<label>boomer</label>
+		<initialWillRange>1~3</initialWillRange>
+		<initialResistanceRange>12~19</initialResistanceRange>
+		<combatPower>60</combatPower>
+		<defaultFactionType>ElephantManTribe</defaultFactionType>
+		<backstoryCategories>
+			<li>Tribal</li>
+		</backstoryCategories>
+		<maxGenerationAge>60</maxGenerationAge>
+		<chemicalAddictionChance>0.05</chemicalAddictionChance>
+		<invNutrition>2.55</invNutrition>
+		<invFoodDef>Pemmican</invFoodDef>
+		<canBeSapper>true</canBeSapper>
+		<gearHealthRange>
+			<min>0.5</min>
+			<max>1.8</max>
+		</gearHealthRange>
+		<apparelMoney>
+			<min>180</min>
+			<max>350</max>
+		</apparelMoney>
+		<apparelRequired>
+			<li>Apparel_WarVeil</li>
+			<li>CE_Apparel_TribalBackpack</li>
+		</apparelRequired>
+		<apparelTags>
+			<li>Tribal</li>
+		</apparelTags>
+		<weaponMoney>
+			<min>60</min>
+			<max>400</max>
+		</weaponMoney>
+		<weaponTags>
+			<li>CE_GrenadeNeolithic</li>
+		</weaponTags>
+		<techHediffsMoney>
+			<min>50</min>
+			<max>800</max>
+		</techHediffsMoney>
+		<techHediffsTags>
+			<li>Poor</li>
+			<li>Simple</li>
+		</techHediffsTags>
+		<techHediffsChance>0.33</techHediffsChance>
+		<modExtensions>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>20</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>80</min>
+						<max>160</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Tribal</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</modExtensions>
+	</PawnKindDef>
+
+	<PawnKindDef>
+		<defName>ElephantManGunner</defName>
+		<race>ElephantMan</race>
+		<label>thunderer</label>
+		<initialWillRange>3~5</initialWillRange>
+		<initialResistanceRange>20~34</initialResistanceRange>
+		<combatPower>60</combatPower>
+		<defaultFactionType>ElephantManTribe</defaultFactionType>
+		<backstoryCategories>
+			<li>Tribal</li>
+		</backstoryCategories>
+		<maxGenerationAge>60</maxGenerationAge>
+		<chemicalAddictionChance>0.05</chemicalAddictionChance>
+		<invNutrition>2.55</invNutrition>
+		<invFoodDef>Pemmican</invFoodDef>
+		<gearHealthRange>
+			<min>0.5</min>
+			<max>1.8</max>
+		</gearHealthRange>
+		<apparelMoney>
+			<min>180</min>
+			<max>350</max>
+		</apparelMoney>
+		<apparelTags>
+			<li>Tribal</li>
+		</apparelTags>
+		<apparelRequired>
+			<li>Apparel_WarMask</li>
+		</apparelRequired>
+		<weaponMoney>
+			<min>180</min>
+			<max>290</max>
+		</weaponMoney>
+		<weaponTags>
+			<li>Gun</li>
+		</weaponTags>
+		<techHediffsMoney>
+			<min>50</min>
+			<max>800</max>
+		</techHediffsMoney>
+		<techHediffsTags>
+			<li>Poor</li>
+			<li>Simple</li>
+		</techHediffsTags>
+		<techHediffsChance>0.20</techHediffsChance>
+		<modExtensions>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>120</min>
+					<max>160</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.9</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</modExtensions>
+	</PawnKindDef>
+
+	<PawnKindDef>
+		<defName>ElkManGrenadier</defName>
+		<race>ElkMan</race>
+		<label>boomer</label>
+		<initialWillRange>1~3</initialWillRange>
+		<initialResistanceRange>12~19</initialResistanceRange>
+		<combatPower>60</combatPower>
+		<defaultFactionType>ElkManTribe</defaultFactionType>
+		<backstoryCategories>
+			<li>Tribal</li>
+		</backstoryCategories>
+		<maxGenerationAge>60</maxGenerationAge>
+		<chemicalAddictionChance>0.05</chemicalAddictionChance>
+		<invNutrition>2.55</invNutrition>
+		<invFoodDef>Pemmican</invFoodDef>
+		<canBeSapper>true</canBeSapper>
+		<gearHealthRange>
+			<min>0.5</min>
+			<max>1.8</max>
+		</gearHealthRange>
+		<apparelMoney>
+			<min>180</min>
+			<max>350</max>
+		</apparelMoney>
+		<apparelRequired>
+			<li>Apparel_WarVeil</li>
+			<li>CE_Apparel_TribalBackpack</li>
+		</apparelRequired>
+		<apparelTags>
+			<li>Tribal</li>
+		</apparelTags>
+		<weaponMoney>
+			<min>60</min>
+			<max>400</max>
+		</weaponMoney>
+		<weaponTags>
+			<li>CE_GrenadeNeolithic</li>
+		</weaponTags>
+		<techHediffsMoney>
+			<min>50</min>
+			<max>800</max>
+		</techHediffsMoney>
+		<techHediffsTags>
+			<li>Poor</li>
+			<li>Simple</li>
+		</techHediffsTags>
+		<techHediffsChance>0.33</techHediffsChance>
+		<modExtensions>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>20</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>80</min>
+						<max>160</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Tribal</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</modExtensions>
+	</PawnKindDef>
+
+	<PawnKindDef>
+		<defName>ElkManGunner</defName>
+		<race>ElkMan</race>
+		<label>thunderer</label>
+		<initialWillRange>3~5</initialWillRange>
+		<initialResistanceRange>20~34</initialResistanceRange>
+		<combatPower>60</combatPower>
+		<defaultFactionType>ElkManTribe</defaultFactionType>
+		<backstoryCategories>
+			<li>Tribal</li>
+		</backstoryCategories>
+		<maxGenerationAge>60</maxGenerationAge>
+		<chemicalAddictionChance>0.05</chemicalAddictionChance>
+		<invNutrition>2.55</invNutrition>
+		<invFoodDef>Pemmican</invFoodDef>
+		<gearHealthRange>
+			<min>0.5</min>
+			<max>1.8</max>
+		</gearHealthRange>
+		<apparelMoney>
+			<min>180</min>
+			<max>350</max>
+		</apparelMoney>
+		<apparelTags>
+			<li>Tribal</li>
+		</apparelTags>
+		<apparelRequired>
+			<li>Apparel_WarMask</li>
+		</apparelRequired>
+		<weaponMoney>
+			<min>180</min>
+			<max>290</max>
+		</weaponMoney>
+		<weaponTags>
+			<li>Gun</li>
+		</weaponTags>
+		<techHediffsMoney>
+			<min>50</min>
+			<max>800</max>
+		</techHediffsMoney>
+		<techHediffsTags>
+			<li>Poor</li>
+			<li>Simple</li>
+		</techHediffsTags>
+		<techHediffsChance>0.20</techHediffsChance>
+		<modExtensions>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>120</min>
+					<max>160</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.9</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</modExtensions>
+	</PawnKindDef>
+
+	<PawnKindDef>
+		<defName>FoxManGrenadier</defName>
+		<race>FoxMan</race>
+		<label>yeefers</label>
+		<initialWillRange>1~3</initialWillRange>
+		<initialResistanceRange>12~19</initialResistanceRange>
+		<combatPower>60</combatPower>
+		<defaultFactionType>FoxManTribe</defaultFactionType>
+		<backstoryCategories>
+			<li>Tribal</li>
+		</backstoryCategories>
+		<maxGenerationAge>60</maxGenerationAge>
+		<chemicalAddictionChance>0.05</chemicalAddictionChance>
+		<invNutrition>2.55</invNutrition>
+		<invFoodDef>Pemmican</invFoodDef>
+		<canBeSapper>true</canBeSapper>
+		<gearHealthRange>
+			<min>0.5</min>
+			<max>1.8</max>
+		</gearHealthRange>
+		<apparelMoney>
+			<min>180</min>
+			<max>350</max>
+		</apparelMoney>
+		<apparelRequired>
+			<li>Apparel_WarVeil</li>
+			<li>CE_Apparel_TribalBackpack</li>
+		</apparelRequired>
+		<apparelTags>
+			<li>Tribal</li>
+		</apparelTags>
+		<weaponMoney>
+			<min>60</min>
+			<max>400</max>
+		</weaponMoney>
+		<weaponTags>
+			<li>CE_GrenadeNeolithic</li>
+		</weaponTags>
+		<techHediffsMoney>
+			<min>50</min>
+			<max>800</max>
+		</techHediffsMoney>
+		<techHediffsTags>
+			<li>Poor</li>
+			<li>Simple</li>
+		</techHediffsTags>
+		<techHediffsChance>0.33</techHediffsChance>
+		<modExtensions>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>20</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>80</min>
+						<max>160</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Tribal</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</modExtensions>
+	</PawnKindDef>
+
+	<PawnKindDef>
+		<defName>FoxManGunner</defName>
+		<race>FoxMan</race>
+		<label>yiffers</label>
+		<initialWillRange>3~5</initialWillRange>
+		<initialResistanceRange>20~34</initialResistanceRange>
+		<combatPower>60</combatPower>
+		<defaultFactionType>FoxManTribe</defaultFactionType>
+		<backstoryCategories>
+			<li>Tribal</li>
+		</backstoryCategories>
+		<maxGenerationAge>60</maxGenerationAge>
+		<chemicalAddictionChance>0.05</chemicalAddictionChance>
+		<invNutrition>2.55</invNutrition>
+		<invFoodDef>Pemmican</invFoodDef>
+		<gearHealthRange>
+			<min>0.5</min>
+			<max>1.8</max>
+		</gearHealthRange>
+		<apparelMoney>
+			<min>180</min>
+			<max>350</max>
+		</apparelMoney>
+		<apparelTags>
+			<li>Tribal</li>
+		</apparelTags>
+		<apparelRequired>
+			<li>Apparel_WarMask</li>
+		</apparelRequired>
+		<weaponMoney>
+			<min>180</min>
+			<max>290</max>
+		</weaponMoney>
+		<weaponTags>
+			<li>Gun</li>
+		</weaponTags>
+		<techHediffsMoney>
+			<min>50</min>
+			<max>800</max>
+		</techHediffsMoney>
+		<techHediffsTags>
+			<li>Poor</li>
+			<li>Simple</li>
+		</techHediffsTags>
+		<techHediffsChance>0.20</techHediffsChance>
+		<modExtensions>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>120</min>
+					<max>160</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.9</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</modExtensions>
+	</PawnKindDef>
+
+	<PawnKindDef>
+		<defName>GazelleManGrenadier</defName>
+		<race>GazelleMan</race>
+		<label>boomer</label>
+		<initialWillRange>1~3</initialWillRange>
+		<initialResistanceRange>12~19</initialResistanceRange>
+		<combatPower>60</combatPower>
+		<defaultFactionType>GazelleManTribe</defaultFactionType>
+		<backstoryCategories>
+			<li>Tribal</li>
+		</backstoryCategories>
+		<maxGenerationAge>60</maxGenerationAge>
+		<chemicalAddictionChance>0.05</chemicalAddictionChance>
+		<invNutrition>2.55</invNutrition>
+		<invFoodDef>Pemmican</invFoodDef>
+		<canBeSapper>true</canBeSapper>
+		<gearHealthRange>
+			<min>0.5</min>
+			<max>1.8</max>
+		</gearHealthRange>
+		<apparelMoney>
+			<min>180</min>
+			<max>350</max>
+		</apparelMoney>
+		<apparelRequired>
+			<li>Apparel_WarVeil</li>
+			<li>CE_Apparel_TribalBackpack</li>
+		</apparelRequired>
+		<apparelTags>
+			<li>Tribal</li>
+		</apparelTags>
+		<weaponMoney>
+			<min>60</min>
+			<max>400</max>
+		</weaponMoney>
+		<weaponTags>
+			<li>CE_GrenadeNeolithic</li>
+		</weaponTags>
+		<techHediffsMoney>
+			<min>50</min>
+			<max>800</max>
+		</techHediffsMoney>
+		<techHediffsTags>
+			<li>Poor</li>
+			<li>Simple</li>
+		</techHediffsTags>
+		<techHediffsChance>0.33</techHediffsChance>
+		<modExtensions>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>20</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>80</min>
+						<max>160</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Tribal</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</modExtensions>
+	</PawnKindDef>
+
+	<PawnKindDef>
+		<defName>GazelleManGunner</defName>
+		<race>GazelleMan</race>
+		<label>thunderer</label>
+		<initialWillRange>3~5</initialWillRange>
+		<initialResistanceRange>20~34</initialResistanceRange>
+		<combatPower>60</combatPower>
+		<defaultFactionType>GazelleManTribe</defaultFactionType>
+		<backstoryCategories>
+			<li>Tribal</li>
+		</backstoryCategories>
+		<maxGenerationAge>60</maxGenerationAge>
+		<chemicalAddictionChance>0.05</chemicalAddictionChance>
+		<invNutrition>2.55</invNutrition>
+		<invFoodDef>Pemmican</invFoodDef>
+		<gearHealthRange>
+			<min>0.5</min>
+			<max>1.8</max>
+		</gearHealthRange>
+		<apparelMoney>
+			<min>180</min>
+			<max>350</max>
+		</apparelMoney>
+		<apparelTags>
+			<li>Tribal</li>
+		</apparelTags>
+		<apparelRequired>
+			<li>Apparel_WarMask</li>
+		</apparelRequired>
+		<weaponMoney>
+			<min>180</min>
+			<max>290</max>
+		</weaponMoney>
+		<weaponTags>
+			<li>Gun</li>
+		</weaponTags>
+		<techHediffsMoney>
+			<min>50</min>
+			<max>800</max>
+		</techHediffsMoney>
+		<techHediffsTags>
+			<li>Poor</li>
+			<li>Simple</li>
+		</techHediffsTags>
+		<techHediffsChance>0.20</techHediffsChance>
+		<modExtensions>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>120</min>
+					<max>160</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.9</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</modExtensions>
+	</PawnKindDef>
+
+	<PawnKindDef>
+		<defName>LynxManGrenadier</defName>
+		<race>LynxMan</race>
+		<label>boomer</label>
+		<initialWillRange>1~3</initialWillRange>
+		<initialResistanceRange>12~19</initialResistanceRange>
+		<combatPower>60</combatPower>
+		<defaultFactionType>LynxManTribe</defaultFactionType>
+		<backstoryCategories>
+			<li>Tribal</li>
+		</backstoryCategories>
+		<maxGenerationAge>60</maxGenerationAge>
+		<chemicalAddictionChance>0.05</chemicalAddictionChance>
+		<invNutrition>2.55</invNutrition>
+		<invFoodDef>Pemmican</invFoodDef>
+		<canBeSapper>true</canBeSapper>
+		<gearHealthRange>
+			<min>0.5</min>
+			<max>1.8</max>
+		</gearHealthRange>
+		<apparelMoney>
+			<min>180</min>
+			<max>350</max>
+		</apparelMoney>
+		<apparelRequired>
+			<li>Apparel_WarVeil</li>
+			<li>CE_Apparel_TribalBackpack</li>
+		</apparelRequired>
+		<apparelTags>
+			<li>Tribal</li>
+		</apparelTags>
+		<weaponMoney>
+			<min>60</min>
+			<max>400</max>
+		</weaponMoney>
+		<weaponTags>
+			<li>CE_GrenadeNeolithic</li>
+		</weaponTags>
+		<techHediffsMoney>
+			<min>50</min>
+			<max>800</max>
+		</techHediffsMoney>
+		<techHediffsTags>
+			<li>Poor</li>
+			<li>Simple</li>
+		</techHediffsTags>
+		<techHediffsChance>0.33</techHediffsChance>
+		<modExtensions>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>20</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>80</min>
+						<max>160</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Tribal</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</modExtensions>
+	</PawnKindDef>
+
+	<PawnKindDef>
+		<defName>LynxManGunner</defName>
+		<race>LynxMan</race>
+		<label>thunderer</label>
+		<initialWillRange>3~5</initialWillRange>
+		<initialResistanceRange>20~34</initialResistanceRange>
+		<combatPower>60</combatPower>
+		<defaultFactionType>LynxManTribe</defaultFactionType>
+		<backstoryCategories>
+			<li>Tribal</li>
+		</backstoryCategories>
+		<maxGenerationAge>60</maxGenerationAge>
+		<chemicalAddictionChance>0.05</chemicalAddictionChance>
+		<invNutrition>2.55</invNutrition>
+		<invFoodDef>Pemmican</invFoodDef>
+		<gearHealthRange>
+			<min>0.5</min>
+			<max>1.8</max>
+		</gearHealthRange>
+		<apparelMoney>
+			<min>180</min>
+			<max>350</max>
+		</apparelMoney>
+		<apparelTags>
+			<li>Tribal</li>
+		</apparelTags>
+		<apparelRequired>
+			<li>Apparel_WarMask</li>
+		</apparelRequired>
+		<weaponMoney>
+			<min>180</min>
+			<max>290</max>
+		</weaponMoney>
+		<weaponTags>
+			<li>Gun</li>
+		</weaponTags>
+		<techHediffsMoney>
+			<min>50</min>
+			<max>800</max>
+		</techHediffsMoney>
+		<techHediffsTags>
+			<li>Poor</li>
+			<li>Simple</li>
+		</techHediffsTags>
+		<techHediffsChance>0.20</techHediffsChance>
+		<modExtensions>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>120</min>
+					<max>160</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.9</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</modExtensions>
+	</PawnKindDef>
+
+	<PawnKindDef>
+		<defName>PigManGrenadier</defName>
+		<race>PigMan</race>
+		<label>boomer</label>
+		<initialWillRange>1~3</initialWillRange>
+		<initialResistanceRange>12~19</initialResistanceRange>
+		<combatPower>60</combatPower>
+		<defaultFactionType>PigManTribe</defaultFactionType>
+		<backstoryCategories>
+			<li>Tribal</li>
+		</backstoryCategories>
+		<maxGenerationAge>60</maxGenerationAge>
+		<chemicalAddictionChance>0.05</chemicalAddictionChance>
+		<invNutrition>2.55</invNutrition>
+		<invFoodDef>Pemmican</invFoodDef>
+		<canBeSapper>true</canBeSapper>
+		<gearHealthRange>
+			<min>0.5</min>
+			<max>1.8</max>
+		</gearHealthRange>
+		<apparelMoney>
+			<min>180</min>
+			<max>350</max>
+		</apparelMoney>
+		<apparelRequired>
+			<li>Apparel_WarVeil</li>
+			<li>CE_Apparel_TribalBackpack</li>
+		</apparelRequired>
+		<apparelTags>
+			<li>Tribal</li>
+		</apparelTags>
+		<weaponMoney>
+			<min>60</min>
+			<max>400</max>
+		</weaponMoney>
+		<weaponTags>
+			<li>CE_GrenadeNeolithic</li>
+		</weaponTags>
+		<techHediffsMoney>
+			<min>50</min>
+			<max>800</max>
+		</techHediffsMoney>
+		<techHediffsTags>
+			<li>Poor</li>
+			<li>Simple</li>
+		</techHediffsTags>
+		<techHediffsChance>0.33</techHediffsChance>
+		<modExtensions>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>20</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>80</min>
+						<max>160</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Tribal</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</modExtensions>
+	</PawnKindDef>
+
+	<PawnKindDef>
+		<defName>PigManGunner</defName>
+		<race>PigMan</race>
+		<label>thunderer</label>
+		<initialWillRange>3~5</initialWillRange>
+		<initialResistanceRange>20~34</initialResistanceRange>
+		<combatPower>60</combatPower>
+		<defaultFactionType>PigManTribe</defaultFactionType>
+		<backstoryCategories>
+			<li>Tribal</li>
+		</backstoryCategories>
+		<maxGenerationAge>60</maxGenerationAge>
+		<chemicalAddictionChance>0.05</chemicalAddictionChance>
+		<invNutrition>2.55</invNutrition>
+		<invFoodDef>Pemmican</invFoodDef>
+		<gearHealthRange>
+			<min>0.5</min>
+			<max>1.8</max>
+		</gearHealthRange>
+		<apparelMoney>
+			<min>180</min>
+			<max>350</max>
+		</apparelMoney>
+		<apparelTags>
+			<li>Tribal</li>
+		</apparelTags>
+		<apparelRequired>
+			<li>Apparel_WarMask</li>
+		</apparelRequired>
+		<weaponMoney>
+			<min>180</min>
+			<max>290</max>
+		</weaponMoney>
+		<weaponTags>
+			<li>Gun</li>
+		</weaponTags>
+		<techHediffsMoney>
+			<min>50</min>
+			<max>800</max>
+		</techHediffsMoney>
+		<techHediffsTags>
+			<li>Poor</li>
+			<li>Simple</li>
+		</techHediffsTags>
+		<techHediffsChance>0.20</techHediffsChance>
+		<modExtensions>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>120</min>
+					<max>160</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.9</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</modExtensions>
+	</PawnKindDef>
+
+	<PawnKindDef>
+		<defName>RaccoonManGrenadier</defName>
+		<race>RaccoonMan</race>
+		<label>boomer</label>
+		<initialWillRange>1~3</initialWillRange>
+		<initialResistanceRange>12~19</initialResistanceRange>
+		<combatPower>60</combatPower>
+		<defaultFactionType>RaccoonManTribe</defaultFactionType>
+		<backstoryCategories>
+			<li>Tribal</li>
+		</backstoryCategories>
+		<maxGenerationAge>60</maxGenerationAge>
+		<chemicalAddictionChance>0.05</chemicalAddictionChance>
+		<invNutrition>2.55</invNutrition>
+		<invFoodDef>Pemmican</invFoodDef>
+		<canBeSapper>true</canBeSapper>
+		<gearHealthRange>
+			<min>0.5</min>
+			<max>1.8</max>
+		</gearHealthRange>
+		<apparelMoney>
+			<min>180</min>
+			<max>350</max>
+		</apparelMoney>
+		<apparelRequired>
+			<li>Apparel_WarVeil</li>
+			<li>CE_Apparel_TribalBackpack</li>
+		</apparelRequired>
+		<apparelTags>
+			<li>Tribal</li>
+		</apparelTags>
+		<weaponMoney>
+			<min>60</min>
+			<max>400</max>
+		</weaponMoney>
+		<weaponTags>
+			<li>CE_GrenadeNeolithic</li>
+		</weaponTags>
+		<techHediffsMoney>
+			<min>50</min>
+			<max>800</max>
+		</techHediffsMoney>
+		<techHediffsTags>
+			<li>Poor</li>
+			<li>Simple</li>
+		</techHediffsTags>
+		<techHediffsChance>0.33</techHediffsChance>
+		<modExtensions>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>20</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>80</min>
+						<max>160</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Tribal</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</modExtensions>
+	</PawnKindDef>
+
+	<PawnKindDef>
+		<defName>RaccoonManGunner</defName>
+		<race>RaccoonMan</race>
+		<label>thunderer</label>
+		<initialWillRange>3~5</initialWillRange>
+		<initialResistanceRange>20~34</initialResistanceRange>
+		<combatPower>60</combatPower>
+		<defaultFactionType>RaccoonManTribe</defaultFactionType>
+		<backstoryCategories>
+			<li>Tribal</li>
+		</backstoryCategories>
+		<maxGenerationAge>60</maxGenerationAge>
+		<chemicalAddictionChance>0.05</chemicalAddictionChance>
+		<invNutrition>2.55</invNutrition>
+		<invFoodDef>Pemmican</invFoodDef>
+		<gearHealthRange>
+			<min>0.5</min>
+			<max>1.8</max>
+		</gearHealthRange>
+		<apparelMoney>
+			<min>180</min>
+			<max>350</max>
+		</apparelMoney>
+		<apparelTags>
+			<li>Tribal</li>
+		</apparelTags>
+		<apparelRequired>
+			<li>Apparel_WarMask</li>
+		</apparelRequired>
+		<weaponMoney>
+			<min>180</min>
+			<max>290</max>
+		</weaponMoney>
+		<weaponTags>
+			<li>Gun</li>
+		</weaponTags>
+		<techHediffsMoney>
+			<min>50</min>
+			<max>800</max>
+		</techHediffsMoney>
+		<techHediffsTags>
+			<li>Poor</li>
+			<li>Simple</li>
+		</techHediffsTags>
+		<techHediffsChance>0.20</techHediffsChance>
+		<modExtensions>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>120</min>
+					<max>160</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.9</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</modExtensions>
+	</PawnKindDef>
+
+	<PawnKindDef>
+		<defName>WolfManGrenadier</defName>
+		<race>WolfMan</race>
+		<label>woofers</label>
+		<initialWillRange>1~3</initialWillRange>
+		<initialResistanceRange>12~19</initialResistanceRange>
+		<combatPower>60</combatPower>
+		<defaultFactionType>WolfManTribe</defaultFactionType>
+		<backstoryCategories>
+			<li>Tribal</li>
+		</backstoryCategories>
+		<maxGenerationAge>60</maxGenerationAge>
+		<chemicalAddictionChance>0.05</chemicalAddictionChance>
+		<invNutrition>2.55</invNutrition>
+		<invFoodDef>Pemmican</invFoodDef>
+		<canBeSapper>true</canBeSapper>
+		<gearHealthRange>
+			<min>0.5</min>
+			<max>1.8</max>
+		</gearHealthRange>
+		<apparelMoney>
+			<min>180</min>
+			<max>350</max>
+		</apparelMoney>
+		<apparelRequired>
+			<li>Apparel_WarVeil</li>
+			<li>CE_Apparel_TribalBackpack</li>
+		</apparelRequired>
+		<apparelTags>
+			<li>Tribal</li>
+		</apparelTags>
+		<weaponMoney>
+			<min>60</min>
+			<max>400</max>
+		</weaponMoney>
+		<weaponTags>
+			<li>CE_GrenadeNeolithic</li>
+		</weaponTags>
+		<techHediffsMoney>
+			<min>50</min>
+			<max>800</max>
+		</techHediffsMoney>
+		<techHediffsTags>
+			<li>Poor</li>
+			<li>Simple</li>
+		</techHediffsTags>
+		<techHediffsChance>0.33</techHediffsChance>
+		<modExtensions>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>20</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>80</min>
+						<max>160</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Tribal</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</modExtensions>
+	</PawnKindDef>
+
+	<PawnKindDef>
+		<defName>WolfManGunner</defName>
+		<race>WolfMan</race>
+		<label>yiffers</label>
+		<initialWillRange>3~5</initialWillRange>
+		<initialResistanceRange>20~34</initialResistanceRange>
+		<combatPower>60</combatPower>
+		<defaultFactionType>WolfManTribe</defaultFactionType>
+		<backstoryCategories>
+			<li>Tribal</li>
+		</backstoryCategories>
+		<maxGenerationAge>60</maxGenerationAge>
+		<chemicalAddictionChance>0.05</chemicalAddictionChance>
+		<invNutrition>2.55</invNutrition>
+		<invFoodDef>Pemmican</invFoodDef>
+		<gearHealthRange>
+			<min>0.5</min>
+			<max>1.8</max>
+		</gearHealthRange>
+		<apparelMoney>
+			<min>180</min>
+			<max>350</max>
+		</apparelMoney>
+		<apparelTags>
+			<li>Tribal</li>
+		</apparelTags>
+		<apparelRequired>
+			<li>Apparel_WarMask</li>
+		</apparelRequired>
+		<weaponMoney>
+			<min>180</min>
+			<max>290</max>
+		</weaponMoney>
+		<weaponTags>
+			<li>Gun</li>
+		</weaponTags>
+		<techHediffsMoney>
+			<min>50</min>
+			<max>800</max>
+		</techHediffsMoney>
+		<techHediffsTags>
+			<li>Poor</li>
+			<li>Simple</li>
+		</techHediffsTags>
+		<techHediffsChance>0.20</techHediffsChance>
+		<modExtensions>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>120</min>
+					<max>160</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.9</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</modExtensions>
+	</PawnKindDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Beast Man Tribes/Patches/Beast Man Tribes/CE_Beast_Race.xml b/ModPatches/Beast Man Tribes/Patches/Beast Man Tribes/CE_Beast_Race.xml
new file mode 100644
index 0000000000..075d41295a
--- /dev/null
+++ b/ModPatches/Beast Man Tribes/Patches/Beast Man Tribes/CE_Beast_Race.xml	
@@ -0,0 +1,553 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[
+			defName="BearMan" or
+			defName="CamelMan" or
+			defName="ElephantMan" or
+			defName="ElkMan" or
+			defName="FoxMan" or
+			defName="GazelleMan" or
+			defName="LynxMan" or
+			defName="PigMan" or
+			defName="RaccoonMan" or
+			defName="WolfMan"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[
+			defName="BearMan" or
+			defName="CamelMan" or
+			defName="ElephantMan" or
+			defName="ElkMan" or
+			defName="FoxMan" or
+			defName="GazelleMan" or
+			defName="LynxMan" or
+			defName="PigMan" or
+			defName="RaccoonMan" or
+			defName="WolfMan"
+			] </xpath>
+		<value>
+			<comps>
+				<li>
+					<compClass>CombatExtended.CompPawnGizmo</compClass>
+				</li>
+				<li Class="CombatExtended.CompProperties_Suppressable"/>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- Bears -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="BearMan"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>1</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="BearMan"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.08</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="BearMan"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.05</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="BearMan"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2.4</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.0</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Camels -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="CamelMan"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>1</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="CamelMan"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="CamelMan"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.07</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="CamelMan"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Elephant -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ElephantMan"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>1</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ElephantMan"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ElephantMan"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ElephantMan"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Elks -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ElkMan"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>1</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ElkMan"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.04</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ElkMan"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.04</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ElkMan"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.25</chanceFactor>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Gazelle -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="GazelleMan"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1.25</MeleeDodgeChance>
+			<MeleeCritChance>0.85</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>1</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="GazelleMan"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.01</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="GazelleMan"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.01</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="GazelleMan"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.25</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Fox and Lynxes, Pigs and Raccoon -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[
+			defName="FoxMan" or
+			defName="LynxMan" or
+			defName="PigMan" or
+			defName="RaccoonMan"
+			]/statBases </xpath>
+		<value>
+			<MeleeDodgeChance>1.2</MeleeDodgeChance>
+			<MeleeCritChance>0.9</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>1</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[
+			defName="FoxMan" or
+			defName="LynxMan" or
+			defName="PigMan" or
+			defName="RaccoonMan"]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>0.01</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[
+			defName="FoxMan" or
+			defName="LynxMan" or
+			defName="PigMan" or
+			defName="RaccoonMan"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>0.01</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[
+			defName="FoxMan" or
+			defName="LynxMan" or
+			defName="PigMan" or
+			defName="RaccoonMan"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.24</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Wolf -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WolfMan"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>1</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WolfMan"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.01</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WolfMan"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.01</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WolfMan"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.27</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.25</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Beast Man Tribes/Patches/Beast Man Tribes/New_Beasts.xml b/ModPatches/Beast Man Tribes/Patches/Beast Man Tribes/New_Beasts.xml
new file mode 100644
index 0000000000..dadcc415a3
--- /dev/null
+++ b/ModPatches/Beast Man Tribes/Patches/Beast Man Tribes/New_Beasts.xml	
@@ -0,0 +1,405 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Add tribal grenadies ========== -->
+
+	<Operation Class="PatchOperationAdd"><!-- Combat -->
+		<xpath>Defs/FactionDef[defName="BearManTribe"]/pawnGroupMakers/li[1]/options</xpath>
+		<value>
+			<BearManGrenadier>10</BearManGrenadier>
+			<BearManGunner>5</BearManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Normal fights, ranged only -->
+		<xpath>Defs/FactionDef[defName="BearManTribe"]/pawnGroupMakers/li[2]/options</xpath>
+		<value>
+			<BearManGrenadier>5</BearManGrenadier>
+			<BearManGunner>10</BearManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!--Peaceful-->
+		<xpath>Defs/FactionDef[defName="BearManTribe"]/pawnGroupMakers/li[4]/options</xpath>
+		<value>
+			<BearManGrenadier>10</BearManGrenadier>
+			<BearManGunner>5</BearManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!--Trader-->
+		<xpath>Defs/FactionDef[defName="BearManTribe"]/pawnGroupMakers/li[5]/guards</xpath>
+		<value>
+			<BearManGrenadier>5</BearManGrenadier>
+			<BearManGunner>15</BearManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Settlement -->
+		<xpath>Defs/FactionDef[defName="BearManTribe"]/pawnGroupMakers/li[6]/options</xpath>
+		<value>
+			<BearManGrenadier>10</BearManGrenadier>
+			<BearManGunner>10</BearManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Combat -->
+		<xpath>Defs/FactionDef[defName="CamelManTribe"]/pawnGroupMakers/li[1]/options</xpath>
+		<value>
+			<CamelManGrenadier>10</CamelManGrenadier>
+			<CamelManGunner>5</CamelManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Normal fights, ranged only -->
+		<xpath>Defs/FactionDef[defName="CamelManTribe"]/pawnGroupMakers/li[2]/options</xpath>
+		<value>
+			<CamelManGrenadier>5</CamelManGrenadier>
+			<CamelManGunner>10</CamelManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!--Peaceful-->
+		<xpath>Defs/FactionDef[defName="CamelManTribe"]/pawnGroupMakers/li[4]/options</xpath>
+		<value>
+			<CamelManGrenadier>10</CamelManGrenadier>
+			<CamelManGunner>5</CamelManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!--Trader-->
+		<xpath>Defs/FactionDef[defName="CamelManTribe"]/pawnGroupMakers/li[5]/guards</xpath>
+		<value>
+			<CamelManGrenadier>5</CamelManGrenadier>
+			<CamelManGunner>15</CamelManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Settlement -->
+		<xpath>Defs/FactionDef[defName="CamelManTribe"]/pawnGroupMakers/li[6]/options</xpath>
+		<value>
+			<CamelManGrenadier>10</CamelManGrenadier>
+			<CamelManGunner>10</CamelManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Combat -->
+		<xpath>Defs/FactionDef[defName="ElephantManTribe"]/pawnGroupMakers/li[1]/options</xpath>
+		<value>
+			<ElephantManGrenadier>10</ElephantManGrenadier>
+			<ElephantManGunner>5</ElephantManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Normal fights, ranged only -->
+		<xpath>Defs/FactionDef[defName="ElephantManTribe"]/pawnGroupMakers/li[2]/options</xpath>
+		<value>
+			<ElephantManGrenadier>5</ElephantManGrenadier>
+			<ElephantManGunner>10</ElephantManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!--Peaceful-->
+		<xpath>Defs/FactionDef[defName="ElephantManTribe"]/pawnGroupMakers/li[4]/options</xpath>
+		<value>
+			<ElephantManGrenadier>10</ElephantManGrenadier>
+			<ElephantManGunner>5</ElephantManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!--Trader-->
+		<xpath>Defs/FactionDef[defName="ElephantManTribe"]/pawnGroupMakers/li[5]/guards</xpath>
+		<value>
+			<ElephantManGrenadier>5</ElephantManGrenadier>
+			<ElephantManGunner>15</ElephantManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Settlement -->
+		<xpath>Defs/FactionDef[defName="ElephantManTribe"]/pawnGroupMakers/li[6]/options</xpath>
+		<value>
+			<ElephantManGrenadier>10</ElephantManGrenadier>
+			<ElephantManGunner>10</ElephantManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Combat -->
+		<xpath>Defs/FactionDef[defName="ElkManTribe"]/pawnGroupMakers/li[1]/options</xpath>
+		<value>
+			<ElkManGrenadier>10</ElkManGrenadier>
+			<ElkManGunner>5</ElkManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Normal fights, ranged only -->
+		<xpath>Defs/FactionDef[defName="ElkManTribe"]/pawnGroupMakers/li[2]/options</xpath>
+		<value>
+			<ElkManGrenadier>5</ElkManGrenadier>
+			<ElkManGunner>10</ElkManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!--Peaceful-->
+		<xpath>Defs/FactionDef[defName="ElkManTribe"]/pawnGroupMakers/li[4]/options</xpath>
+		<value>
+			<ElkManGrenadier>10</ElkManGrenadier>
+			<ElkManGunner>5</ElkManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!--Trader-->
+		<xpath>Defs/FactionDef[defName="ElkManTribe"]/pawnGroupMakers/li[5]/guards</xpath>
+		<value>
+			<ElkManGrenadier>5</ElkManGrenadier>
+			<ElkManGunner>15</ElkManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Settlement -->
+		<xpath>Defs/FactionDef[defName="ElkManTribe"]/pawnGroupMakers/li[6]/options</xpath>
+		<value>
+			<ElkManGrenadier>10</ElkManGrenadier>
+			<ElkManGunner>10</ElkManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Combat -->
+		<xpath>Defs/FactionDef[defName="FoxManTribe"]/pawnGroupMakers/li[1]/options</xpath>
+		<value>
+			<FoxManGrenadier>10</FoxManGrenadier>
+			<FoxManGunner>5</FoxManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Normal fights, ranged only -->
+		<xpath>Defs/FactionDef[defName="FoxManTribe"]/pawnGroupMakers/li[2]/options</xpath>
+		<value>
+			<FoxManGrenadier>5</FoxManGrenadier>
+			<FoxManGunner>10</FoxManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!--Peaceful-->
+		<xpath>Defs/FactionDef[defName="FoxManTribe"]/pawnGroupMakers/li[4]/options</xpath>
+		<value>
+			<FoxManGrenadier>10</FoxManGrenadier>
+			<FoxManGunner>5</FoxManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!--Trader-->
+		<xpath>Defs/FactionDef[defName="FoxManTribe"]/pawnGroupMakers/li[5]/guards</xpath>
+		<value>
+			<FoxManGrenadier>5</FoxManGrenadier>
+			<FoxManGunner>15</FoxManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Settlement -->
+		<xpath>Defs/FactionDef[defName="FoxManTribe"]/pawnGroupMakers/li[6]/options</xpath>
+		<value>
+			<FoxManGrenadier>10</FoxManGrenadier>
+			<FoxManGunner>10</FoxManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Combat -->
+		<xpath>Defs/FactionDef[defName="GazelleManTribe"]/pawnGroupMakers/li[1]/options</xpath>
+		<value>
+			<GazelleManGrenadier>10</GazelleManGrenadier>
+			<GazelleManGunner>5</GazelleManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Normal fights, ranged only -->
+		<xpath>Defs/FactionDef[defName="GazelleManTribe"]/pawnGroupMakers/li[2]/options</xpath>
+		<value>
+			<GazelleManGrenadier>5</GazelleManGrenadier>
+			<GazelleManGunner>10</GazelleManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!--Peaceful-->
+		<xpath>Defs/FactionDef[defName="GazelleManTribe"]/pawnGroupMakers/li[4]/options</xpath>
+		<value>
+			<GazelleManGrenadier>10</GazelleManGrenadier>
+			<GazelleManGunner>5</GazelleManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!--Trader-->
+		<xpath>Defs/FactionDef[defName="GazelleManTribe"]/pawnGroupMakers/li[5]/guards</xpath>
+		<value>
+			<GazelleManGrenadier>5</GazelleManGrenadier>
+			<GazelleManGunner>15</GazelleManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Settlement -->
+		<xpath>Defs/FactionDef[defName="GazelleManTribe"]/pawnGroupMakers/li[6]/options</xpath>
+		<value>
+			<GazelleManGrenadier>10</GazelleManGrenadier>
+			<GazelleManGunner>10</GazelleManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Combat -->
+		<xpath>Defs/FactionDef[defName="LynxManTribe"]/pawnGroupMakers/li[1]/options</xpath>
+		<value>
+			<LynxManGrenadier>10</LynxManGrenadier>
+			<LynxManGunner>5</LynxManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Normal fights, ranged only -->
+		<xpath>Defs/FactionDef[defName="LynxManTribe"]/pawnGroupMakers/li[2]/options</xpath>
+		<value>
+			<LynxManGrenadier>5</LynxManGrenadier>
+			<LynxManGunner>10</LynxManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!--Peaceful-->
+		<xpath>Defs/FactionDef[defName="LynxManTribe"]/pawnGroupMakers/li[4]/options</xpath>
+		<value>
+			<LynxManGrenadier>10</LynxManGrenadier>
+			<LynxManGunner>5</LynxManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!--Trader-->
+		<xpath>Defs/FactionDef[defName="LynxManTribe"]/pawnGroupMakers/li[5]/guards</xpath>
+		<value>
+			<LynxManGrenadier>5</LynxManGrenadier>
+			<LynxManGunner>15</LynxManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Settlement -->
+		<xpath>Defs/FactionDef[defName="LynxManTribe"]/pawnGroupMakers/li[6]/options</xpath>
+		<value>
+			<LynxManGrenadier>10</LynxManGrenadier>
+			<LynxManGunner>10</LynxManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Combat -->
+		<xpath>Defs/FactionDef[defName="PigManTribe"]/pawnGroupMakers/li[1]/options</xpath>
+		<value>
+			<PigManGrenadier>10</PigManGrenadier>
+			<PigManGunner>5</PigManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Normal fights, ranged only -->
+		<xpath>Defs/FactionDef[defName="PigManTribe"]/pawnGroupMakers/li[2]/options</xpath>
+		<value>
+			<PigManGrenadier>5</PigManGrenadier>
+			<PigManGunner>10</PigManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!--Peaceful-->
+		<xpath>Defs/FactionDef[defName="PigManTribe"]/pawnGroupMakers/li[4]/options</xpath>
+		<value>
+			<PigManGrenadier>10</PigManGrenadier>
+			<PigManGunner>5</PigManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!--Trader-->
+		<xpath>Defs/FactionDef[defName="PigManTribe"]/pawnGroupMakers/li[5]/guards</xpath>
+		<value>
+			<PigManGrenadier>5</PigManGrenadier>
+			<PigManGunner>15</PigManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Settlement -->
+		<xpath>Defs/FactionDef[defName="PigManTribe"]/pawnGroupMakers/li[6]/options</xpath>
+		<value>
+			<PigManGrenadier>10</PigManGrenadier>
+			<PigManGunner>10</PigManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Combat -->
+		<xpath>Defs/FactionDef[defName="RaccoonManTribe"]/pawnGroupMakers/li[1]/options</xpath>
+		<value>
+			<RaccoonManGrenadier>10</RaccoonManGrenadier>
+			<RaccoonManGunner>5</RaccoonManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Normal fights, ranged only -->
+		<xpath>Defs/FactionDef[defName="RaccoonManTribe"]/pawnGroupMakers/li[2]/options</xpath>
+		<value>
+			<RaccoonManGrenadier>5</RaccoonManGrenadier>
+			<RaccoonManGunner>10</RaccoonManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!--Peaceful-->
+		<xpath>Defs/FactionDef[defName="RaccoonManTribe"]/pawnGroupMakers/li[4]/options</xpath>
+		<value>
+			<RaccoonManGrenadier>10</RaccoonManGrenadier>
+			<RaccoonManGunner>5</RaccoonManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!--Trader-->
+		<xpath>Defs/FactionDef[defName="RaccoonManTribe"]/pawnGroupMakers/li[5]/guards</xpath>
+		<value>
+			<RaccoonManGrenadier>5</RaccoonManGrenadier>
+			<RaccoonManGunner>15</RaccoonManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Settlement -->
+		<xpath>Defs/FactionDef[defName="RaccoonManTribe"]/pawnGroupMakers/li[6]/options</xpath>
+		<value>
+			<RaccoonManGrenadier>10</RaccoonManGrenadier>
+			<RaccoonManGunner>10</RaccoonManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Combat -->
+		<xpath>Defs/FactionDef[defName="WolfManTribe"]/pawnGroupMakers/li[1]/options</xpath>
+		<value>
+			<WolfManGrenadier>10</WolfManGrenadier>
+			<WolfManGunner>5</WolfManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Normal fights, ranged only -->
+		<xpath>Defs/FactionDef[defName="WolfManTribe"]/pawnGroupMakers/li[2]/options</xpath>
+		<value>
+			<WolfManGrenadier>5</WolfManGrenadier>
+			<WolfManGunner>10</WolfManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!--Peaceful-->
+		<xpath>Defs/FactionDef[defName="WolfManTribe"]/pawnGroupMakers/li[4]/options</xpath>
+		<value>
+			<WolfManGrenadier>10</WolfManGrenadier>
+			<WolfManGunner>5</WolfManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!--Trader-->
+		<xpath>Defs/FactionDef[defName="WolfManTribe"]/pawnGroupMakers/li[5]/guards</xpath>
+		<value>
+			<WolfManGrenadier>5</WolfManGrenadier>
+			<WolfManGunner>15</WolfManGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Settlement -->
+		<xpath>Defs/FactionDef[defName="WolfManTribe"]/pawnGroupMakers/li[6]/options</xpath>
+		<value>
+			<WolfManGrenadier>10</WolfManGrenadier>
+			<WolfManGunner>10</WolfManGunner>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Beast Man Tribes/Patches/Beast Man Tribes/Patch_PawnKinds_Beasts.xml b/ModPatches/Beast Man Tribes/Patches/Beast Man Tribes/Patch_PawnKinds_Beasts.xml
new file mode 100644
index 0000000000..2cdd194f7d
--- /dev/null
+++ b/ModPatches/Beast Man Tribes/Patches/Beast Man Tribes/Patch_PawnKinds_Beasts.xml	
@@ -0,0 +1,416 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Tribal raid points-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="BearMan_Penitent"
+			or defName="CamelMan_Penitent"
+			or defName="ElephantMan_Penitent"
+			or defName="ElkMan_Penitent"
+			or defName="FoxMan_Penitent"
+			or defName="GazelleMan_Penitent"
+			or defName="LynxMan_Penitent"
+			or defName="PigMan_Penitent"
+			or defName="RaccoonMan_Penitent"
+			or defName="WolfMan_Penitent"]/weaponMoney </xpath>
+		<value>
+			<weaponMoney>50~150</weaponMoney>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="BearMan_Penitent"
+			or defName="CamelMan_Penitent"
+			or defName="ElephantMan_Penitent"
+			or defName="ElkMan_Penitent"
+			or defName="FoxMan_Penitent"
+			or defName="GazelleMan_Penitent"
+			or defName="LynxMan_Penitent"
+			or defName="PigMan_Penitent"
+			or defName="RaccoonMan_Penitent"
+			or defName="WolfMan_Penitent"]/combatPower </xpath>
+		<value>
+			<combatPower>16</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="BearMan_Warrior"
+			or defName="CamelMan_Warrior"
+			or defName="ElephantMan_Warrior"
+			or defName="ElkMan_Warrior"
+			or defName="FoxMan_Warrior"
+			or defName="GazelleMan_Warrior"
+			or defName="LynxMan_Warrior"
+			or defName="PigMan_Warrior"
+			or defName="RaccoonMan_Warrior"
+			or defName="WolfMan_Warrior"]/weaponMoney </xpath>
+		<value>
+			<weaponMoney>80~150</weaponMoney>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="BearMan_Warrior"
+			or defName="CamelMan_Warrior"
+			or defName="ElephantMan_Warrior"
+			or defName="ElkMan_Warrior"
+			or defName="FoxMan_Warrior"
+			or defName="GazelleMan_Warrior"
+			or defName="LynxMan_Warrior"
+			or defName="PigMan_Warrior"
+			or defName="RaccoonMan_Warrior"
+			or defName="WolfMan_Warrior"] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>100</min>
+					<max>150</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.9</shieldChance>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="BearMan_Warrior"
+			or defName="CamelMan_Warrior"
+			or defName="ElephantMan_Warrior"
+			or defName="ElkMan_Warrior"
+			or defName="FoxMan_Warrior"
+			or defName="GazelleMan_Warrior"
+			or defName="LynxMan_Warrior"
+			or defName="PigMan_Warrior"
+			or defName="RaccoonMan_Warrior"
+			or defName="WolfMan_Warrior"]/combatPower </xpath>
+		<value>
+			<combatPower>24</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="BearMan_Archer"
+			or defName="CamelMan_Archer"
+			or defName="ElephantMan_Archer"
+			or defName="ElkMan_Archer"
+			or defName="FoxMan_Archer"
+			or defName="GazelleMan_Archer"
+			or defName="LynxMan_Archer"
+			or defName="PigMan_Archer"
+			or defName="RaccoonMan_Archer"
+			or defName="WolfMan_Archer"] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>20</min>
+					<max>40</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>100</min>
+					<max>130</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.6</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>80</min>
+							<max>160</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="BearMan_Archer"
+			or defName="CamelMan_Archer"
+			or defName="ElephantMan_Archer"
+			or defName="ElkMan_Archer"
+			or defName="FoxMan_Archer"
+			or defName="GazelleMan_Archer"
+			or defName="LynxMan_Archer"
+			or defName="PigMan_Archer"
+			or defName="RaccoonMan_Archer"
+			or defName="WolfMan_Archer"]/combatPower </xpath>
+		<value>
+			<combatPower>30</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="BearMan_Hunter"
+			or defName="CamelMan_Hunter"
+			or defName="ElephantMan_Hunter"
+			or defName="ElkMan_Hunter"
+			or defName="FoxMan_Hunter"
+			or defName="GazelleMan_Hunter"
+			or defName="LynxMan_Hunter"
+			or defName="PigMan_Hunter"
+			or defName="RaccoonMan_Hunter"
+			or defName="WolfMan_Hunter"] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>25</min>
+					<max>50</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>100</min>
+					<max>140</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.6</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>80</min>
+							<max>240</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="BearMan_Hunter"
+			or defName="CamelMan_Hunter"
+			or defName="ElephantMan_Hunter"
+			or defName="ElkMan_Hunter"
+			or defName="FoxMan_Hunter"
+			or defName="GazelleMan_Hunter"
+			or defName="LynxMan_Hunter"
+			or defName="PigMan_Hunter"
+			or defName="RaccoonMan_Hunter"
+			or defName="WolfMan_Hunter"]/combatPower </xpath>
+		<value>
+			<combatPower>45</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="BearMan_HeavyArcher"
+			or defName="CamelMan_HeavyArcher"
+			or defName="ElephantMan_HeavyArcher"
+			or defName="ElkMan_HeavyArcher"
+			or defName="FoxMan_HeavyArcher"
+			or defName="GazelleMan_HeavyArcher"
+			or defName="LynxMan_HeavyArcher"
+			or defName="PigMan_HeavyArcher"
+			or defName="RaccoonMan_HeavyArcher"
+			or defName="WolfMan_HeavyArcher"] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>20</min>
+					<max>40</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>100</min>
+					<max>160</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.6</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>80</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="BearMan_HeavyArcher"
+			or defName="CamelMan_HeavyArcher"
+			or defName="ElephantMan_HeavyArcher"
+			or defName="ElkMan_HeavyArcher"
+			or defName="FoxMan_HeavyArcher"
+			or defName="GazelleMan_HeavyArcher"
+			or defName="LynxMan_HeavyArcher"
+			or defName="PigMan_HeavyArcher"
+			or defName="RaccoonMan_HeavyArcher"
+			or defName="WolfMan_HeavyArcher"]/combatPower </xpath>
+		<value>
+			<combatPower>60</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="BearMan_Berserker"
+			or defName="CamelMan_Berserker"
+			or defName="ElephantMan_Berserker"
+			or defName="ElkMan_Berserker"
+			or defName="FoxMan_Berserker"
+			or defName="GazelleMan_Berserker"
+			or defName="LynxMan_Berserker"
+			or defName="PigMan_Berserker"
+			or defName="RaccoonMan_Berserker"
+			or defName="WolfMan_Berserker"] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>120</min>
+					<max>160</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.9</shieldChance>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="BearMan_Berserker"
+			or defName="CamelMan_Berserker"
+			or defName="ElephantMan_Berserker"
+			or defName="ElkMan_Berserker"
+			or defName="FoxMan_Berserker"
+			or defName="GazelleMan_Berserker"
+			or defName="LynxMan_Berserker"
+			or defName="PigMan_Berserker"
+			or defName="RaccoonMan_Berserker"
+			or defName="WolfMan_Berserker"]/combatPower </xpath>
+		<value>
+			<combatPower>60</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="BearMan_ChiefMelee"
+			or defName="CamelMan_ChiefMelee"
+			or defName="ElephantMan_ChiefMelee"
+			or defName="ElkMan_ChiefMelee"
+			or defName="FoxMan_ChiefMelee"
+			or defName="GazelleMan_ChiefMelee"
+			or defName="LynxMan_ChiefMelee"
+			or defName="PigMan_ChiefMelee"
+			or defName="RaccoonMan_ChiefMelee"
+			or defName="WolfMan_ChiefMelee"] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>120</min>
+					<max>160</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.9</shieldChance>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="BearMan_ChiefRanged"
+			or defName="CamelMan_ChiefRanged"
+			or defName="ElephantMan_ChiefRanged"
+			or defName="ElkMan_ChiefRanged"
+			or defName="FoxMan_ChiefRanged"
+			or defName="GazelleMan_ChiefRanged"
+			or defName="LynxMan_ChiefRanged"
+			or defName="PigMan_ChiefRanged"
+			or defName="RaccoonMan_ChiefRanged"
+			or defName="WolfMan_ChiefRanged"] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>30</min>
+					<max>60</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>120</min>
+					<max>160</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.9</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="BearMan_ChiefRanged"
+			or defName="CamelMan_ChiefRanged"
+			or defName="ElephantMan_ChiefRanged"
+			or defName="ElkMan_ChiefRanged"
+			or defName="FoxMan_ChiefRanged"
+			or defName="GazelleMan_ChiefRanged"
+			or defName="LynxMan_ChiefRanged"
+			or defName="PigMan_ChiefRanged"
+			or defName="RaccoonMan_ChiefRanged"
+			or defName="WolfMan_ChiefRanged"]/weaponTags/li[.="NeolithicRangedChief"] </xpath>
+		<value>
+			<li>Gun</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="BearMan_ChiefRanged"
+			or defName="CamelMan_ChiefRanged"
+			or defName="ElephantMan_ChiefRanged"
+			or defName="ElkMan_ChiefRanged"
+			or defName="FoxMan_ChiefRanged"
+			or defName="GazelleMan_ChiefRanged"
+			or defName="LynxMan_ChiefRanged"
+			or defName="PigMan_ChiefRanged"
+			or defName="RaccoonMan_ChiefRanged"
+			or defName="WolfMan_ChiefRanged"
+			or defName="BearMan_ChiefMelee"
+			or defName="CamelMan_ChiefMelee"
+			or defName="ElephantMan_ChiefMelee"
+			or defName="ElkMan_ChiefMelee"
+			or defName="FoxMan_ChiefMelee"
+			or defName="GazelleMan_ChiefMelee"
+			or defName="LynxMan_ChiefMelee"
+			or defName="PigMan_ChiefMelee"
+			or defName="RaccoonMan_ChiefMelee"
+			or defName="WolfMan_ChiefMelee"]/weaponMoney </xpath>
+		<value>
+			<weaponMoney>
+				<min>230</min>
+				<max>300</max>
+			</weaponMoney>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Beeralope Squad/Patches/Beeralope Squad/Drugs/Natural_Beer.xml b/ModPatches/Beeralope Squad/Patches/Beeralope Squad/Drugs/Natural_Beer.xml
new file mode 100644
index 0000000000..5a0f43a9e5
--- /dev/null
+++ b/ModPatches/Beeralope Squad/Patches/Beeralope Squad/Drugs/Natural_Beer.xml	
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NaturalBeer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2.22</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>neck</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>3.33</cooldownTime>
+					<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Neck</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Add weapon tags for 1-handing-->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="NaturalBeer"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="NaturalBeer"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="NaturalBeer"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Beeralope Squad/Patches/Beeralope Squad/ThingDefs_Races/Races_Beerhybrids.xml b/ModPatches/Beeralope Squad/Patches/Beeralope Squad/ThingDefs_Races/Races_Beerhybrids.xml
new file mode 100644
index 0000000000..d315bc5144
--- /dev/null
+++ b/ModPatches/Beeralope Squad/Patches/Beeralope Squad/ThingDefs_Races/Races_Beerhybrids.xml	
@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Bodytype-->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Beeralope"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Beerat"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Beerbro"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Beeralope-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Beeralope"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.97</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Beerat-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Beerat"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.69</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.013</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.69</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.013</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.95</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>3.00</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Beerat"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>0.2</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Beerat"]/combatPower</xpath>
+		<value>
+			<combatPower>40</combatPower>
+		</value>
+	</Operation>
+
+	<!--Beerbro-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Beerbro"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Beerbro"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Beerbro"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.8</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Beerbro"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>5</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Beerbro"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>46</power>
+					<cooldownTime>2.52</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.54</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>42</power>
+					<cooldownTime>2.52</cooldownTime>
+					<chanceFactor>0.65</chanceFactor>
+					<linkedBodyPartsGroup>HornAttackTool_2</linkedBodyPartsGroup>
+					<armorPenetrationSharp>8</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>2.33</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8.640</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>2.33</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8.640</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>1.62</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.016</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2.52</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Beerbro"]/combatPower</xpath>
+		<value>
+			<combatPower>450</combatPower>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Better Wool Production/Patches/Better Wool Production/Blended_Wool_Patch.xml b/ModPatches/Better Wool Production/Patches/Better Wool Production/Blended_Wool_Patch.xml
new file mode 100644
index 0000000000..2e61de083a
--- /dev/null
+++ b/ModPatches/Better Wool Production/Patches/Better Wool Production/Blended_Wool_Patch.xml	
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoolBlended"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.01</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoolBlended"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Big and Small - Heaven and Hell/Patches/Big and Small - Heaven and Hell/BS_Genes_Pawnkind.xml b/ModPatches/Big and Small - Heaven and Hell/Patches/Big and Small - Heaven and Hell/BS_Genes_Pawnkind.xml
new file mode 100644
index 0000000000..a9a61d55c9
--- /dev/null
+++ b/ModPatches/Big and Small - Heaven and Hell/Patches/Big and Small - Heaven and Hell/BS_Genes_Pawnkind.xml	
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Servitor Ranged Ammo -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="BS_ServitorRanged"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>7</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>400</min>
+							<max>800</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>MedievalMeleeAdvanced</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="BS_ServitorRanged"]/apparelRequired</xpath>
+		<value>
+			<li>CE_Apparel_Backpack</li>
+		</value>
+	</Operation>
+	
+	<!-- Add Weapons to PawnKinds. Natural weapons do not cut it in CE -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="BS_Satan"]/weaponTags</xpath>
+		<value>
+			<li>MedievalMeleeAdvanced</li>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/PawnKindDef[defName="BS_SatanGreat"]/weaponTags</xpath>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/PawnKindDef[defName="BS_SatanGreat"]/weaponTags</xpath>
+			<value>
+				<li>MedievalMeleeAdvanced</li>
+				<li>UltratechMelee</li>
+			</value>
+		</match>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/PawnKindDef[defName="BS_SatanGreat"]</xpath>
+			<value>
+				<weaponTags Inherit="false">
+					<li>MedievalMeleeAdvanced</li>
+					<li>UltratechMelee</li>
+				</weaponTags>
+			</value>
+		</nomatch>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Big and Small - MO/Patches/Big and Small - MO/BS_MO_Pawnkind.xml b/ModPatches/Big and Small - MO/Patches/Big and Small - MO/BS_MO_Pawnkind.xml
new file mode 100644
index 0000000000..cf092ebe5b
--- /dev/null
+++ b/ModPatches/Big and Small - MO/Patches/Big and Small - MO/BS_MO_Pawnkind.xml	
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Give ammo to crosbowman-->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="BS_Crossbowman"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>12</min>
+					<max>20</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>100</min>
+						<max>200</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>NeolithicMeleeBasic</li>
+						<li>MedievalMeleeDecent</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Tribal Backpacks -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[
+			defName="BS_Crossbowman"]
+		</xpath>
+		<value>
+			<apparelRequired>
+				<li>CE_Apparel_TribalBackpack</li>
+				<li>DankPyon_Apparel_Quiver</li>
+			</apparelRequired>
+		</value>
+	</Operation>
+
+	<!-- Weapon Tags -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="BS_Crossbowman"]/weaponTags</xpath>
+		<value>
+			<li>CE_XBow</li>
+		</value>
+	</Operation>
+
+	<!-- Force no Shield -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="BS_Jotun_Knight"]</xpath>
+		<value>
+			<modExtensions Inherit="False">
+				<li Class="CombatExtended.LoadoutPropertiesExtension">
+					<shieldMoney>
+						<min>1</min>
+						<max>1</max>
+					</shieldMoney>
+					<shieldTags>
+						<li>HeaterShield</li>
+						<li>KiteShield</li>
+					</shieldTags>
+					<shieldChance>0.01</shieldChance>
+				</li>
+			</modExtensions>
+		</value>
+	</Operation>
+
+	<!-- More Javelins for Giant-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="BS_Jotun_Raider_Ranged" or defName="BS_Heavy_Jotun_Spearman"]</xpath>
+		<value>
+			<modExtensions Inherit="False">
+				<li Class="CombatExtended.LoadoutPropertiesExtension">
+					<primaryMagazineCount>
+						<min>4</min>
+						<max>10</max>
+					</primaryMagazineCount>
+					<forcedSidearm>
+						<sidearmMoney>
+							<min>100</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>NeolithicMeleeGiant</li>
+						</weaponTags>
+					</forcedSidearm>
+				</li>
+			</modExtensions>
+		</value>
+	</Operation>
+
+	<!-- Tribal Backpacks -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[
+			defName="BS_Jotun_Raider_Ranged" or defName="BS_Heavy_Jotun_Spearman"] </xpath>
+		<value>
+			<apparelRequired>
+				<li>CE_Apparel_TribalBackpack</li>
+			</apparelRequired>
+		</value>
+	</Operation>
+
+	<!-- Balancing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[
+			defName="BS_Jotun_Raider" or
+			defName="BS_Jotun_Raider_Ranged" or
+			defName="BS_Medium_Jotun_Raider"]/combatPower</xpath>
+		<value>
+			<combatPower>80</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[
+			defName="BS_Heavy_Jotun" or
+			defName="BS_Heavy_Jotun_Spearman"]/combatPower</xpath>
+		<value>
+			<combatPower>120</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="BS_Jotun_Knight"]/combatPower</xpath>
+		<value>
+			<combatPower>150</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="BS_Jotun_Lord"]/combatPower</xpath>
+		<value>
+			<combatPower>200</combatPower>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Big and Small - Medieval Factions/Patches/Big and Small - Medieval Factions/BS_Medieval_Pawnkind.xml b/ModPatches/Big and Small - Medieval Factions/Patches/Big and Small - Medieval Factions/BS_Medieval_Pawnkind.xml
new file mode 100644
index 0000000000..b8b5b1cac8
--- /dev/null
+++ b/ModPatches/Big and Small - Medieval Factions/Patches/Big and Small - Medieval Factions/BS_Medieval_Pawnkind.xml	
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Red Bandana-->
+
+	<!--Give ammo to crosbowman-->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="BS_Crossbowman"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>12</min>
+					<max>20</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>100</min>
+						<max>200</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>NeolithicMeleeBasic</li>
+						<li>MedievalMeleeDecent</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Tribal Backpacks -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[
+			defName="BS_Crossbowman"] </xpath>
+		<value>
+			<apparelRequired>
+				<li>CE_Apparel_TribalBackpack</li>
+				<li>DankPyon_Apparel_Quiver</li>
+			</apparelRequired>
+		</value>
+	</Operation>
+
+	<!-- Weapon Tags -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="BS_Crossbowman"]/weaponTags</xpath>
+		<value>
+			<li>CE_XBow</li>
+		</value>
+	</Operation>
+
+	<!-- More Javelins for Giant-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="BS_Jotun_Javelin" or defName="BS_Jotun_NiflJavelin"]</xpath>
+		<value>
+			<modExtensions Inherit="False">
+				<li Class="CombatExtended.LoadoutPropertiesExtension">
+					<primaryMagazineCount>
+						<min>2</min>
+						<max>4</max>
+					</primaryMagazineCount>
+					<shieldMoney>
+						<min>100</min>
+						<max>350</max>
+					</shieldMoney>
+					<shieldTags>
+						<li>KiteShield</li>
+						<li>HeaterShield</li>
+					</shieldTags>
+					<shieldChance>0.6</shieldChance>
+					<forcedSidearm>
+						<sidearmMoney>
+							<min>100</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>NeolithicMeleeGiant</li>
+						</weaponTags>
+					</forcedSidearm>
+				</li>
+			</modExtensions>
+		</value>
+	</Operation>
+
+	<!-- More Javelins for Giant-->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="BS_Jotun_Hunter"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>50</min>
+						<max>150</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>RangedNeolithicGiant</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Big and Small - Vampires and Undead/Patches/Big and Small - Vampires and Undead/BS_VU_Hediff.xml b/ModPatches/Big and Small - Vampires and Undead/Patches/Big and Small - Vampires and Undead/BS_VU_Hediff.xml
new file mode 100644
index 0000000000..eb470281dc
--- /dev/null
+++ b/ModPatches/Big and Small - Vampires and Undead/Patches/Big and Small - Vampires and Undead/BS_VU_Hediff.xml	
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="VU_DraculTeeth"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>vampire bite</label>
+					<capacities>
+						<li>VU_DraculBiteCap</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2.0</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>12</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.0</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="VU_WerewolfFangs"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>werewolf bite</label>
+					<capacities>
+						<li>VU_WerewolfBiteCap</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2.0</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>12</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.0</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Big and Small - Vampires and Undead/Patches/Big and Small - Vampires and Undead/BS_VU_Pawnkind.xml b/ModPatches/Big and Small - Vampires and Undead/Patches/Big and Small - Vampires and Undead/BS_VU_Pawnkind.xml
new file mode 100644
index 0000000000..d5e279e6cf
--- /dev/null
+++ b/ModPatches/Big and Small - Vampires and Undead/Patches/Big and Small - Vampires and Undead/BS_VU_Pawnkind.xml	
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Increase weaponMoney to prevent spawning without one. -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="VU_RoamingUndeadLeader"]/weaponMoney </xpath>
+		<value>
+			<weaponMoney>120~2700</weaponMoney>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="VU_RoamingUndeadLeader_Medieval"]/weaponMoney </xpath>
+		<value>
+			<weaponMoney>120~3700</weaponMoney>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Big and Small Genes/Defs/Big and Small Genes/Weapons/ThingDef_Ammo.xml b/ModPatches/Big and Small Genes/Defs/Big and Small Genes/Weapons/ThingDef_Ammo.xml
new file mode 100644
index 0000000000..e1689cf0ac
--- /dev/null
+++ b/ModPatches/Big and Small Genes/Defs/Big and Small Genes/Weapons/ThingDef_Ammo.xml	
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- === Tools === -->
+	<ThingDef ParentName="BasePilumProjectile">
+		<defName>Projectile_GiantThrown</defName>
+		<label>giant javelin (thrown)</label>
+		<graphicData>
+			<texPath>Item/GiantJavelin_Projectile</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>37</damageAmountBase>
+			<speed>30</speed>
+			<armorPenetrationBlunt>486</armorPenetrationBlunt>
+			<armorPenetrationSharp>9</armorPenetrationSharp>
+			<preExplosionSpawnChance>0.9</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>BS_JotunJavelin</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>MakeAmmo_BS_JotunJavelin</defName>
+		<label>make giant javeln</label>
+		<description>Craft a giant javelin.</description>
+		<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+		<workSkill>Crafting</workSkill>
+		<skillRequirements>
+			<Crafting>3</Crafting>
+		</skillRequirements>
+		<recipeUsers>
+			<li>ElectricSmithy</li>
+			<li>FueledSmithy</li>
+			<li>CraftingSpot</li>
+		</recipeUsers>
+		<effectWorking>Smelt</effectWorking>
+		<unfinishedThingDef>UnfinishedAmmo</unfinishedThingDef>
+		<workAmount>18000</workAmount>
+		<jobString>Making pila.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>140</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>80</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<BS_JotunJavelin>1</BS_JotunJavelin>
+		</products>
+		<displayPriority>500</displayPriority>
+	</RecipeDef>
+
+	<!-- === Shrink Ray Ammo === -->
+	<!-- === Ammo Set === -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_ShrinkRay</defName>
+		<label>Shrink Ray Power Cell</label>
+		<ammoTypes>
+			<Ammo_LaserChargePack>Projectile_ShrinkRay</Ammo_LaserChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- === Projectile === -->
+	<ThingDef ParentName="BaseBulletCE">
+		<defName>Projectile_ShrinkRay</defName>
+		<label>shrink ray</label>
+		<graphicData>
+			<texPath>Things/Projectile/ChargeLanceShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>1.5</drawSize>
+			<color>(180, 180, 255)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>ShrinkRay</damageDef>
+			<damageAmountBase>1</damageAmountBase><!-- -2 -->
+			<armorPenetrationBlunt>0.5</armorPenetrationBlunt><!-- -0.5 -->
+			<armorPenetrationSharp>0.5</armorPenetrationSharp><!-- -0.2 -->
+			<speed>70</speed>
+		</projectile>
+	</ThingDef>
+
+	<!-- === Damage Def === -->
+	<DamageDef>
+		<defName>ShrinkRay</defName>
+		<label>vaporize</label>
+		<workerClass>DamageWorker_Vaporize</workerClass>
+		<externalViolence>true</externalViolence>
+		<deathMessage>{0} has been vaporized by extreme heat.</deathMessage>
+		<hediff>Burn</hediff>
+		<additionalHediffs>
+			<li>
+				<hediff>BS_Affliction_ShrinkRay</hediff>
+				<severityPerDamageDealt>0.12</severityPerDamageDealt>
+			</li>
+		</additionalHediffs>
+		<harmAllLayersUntilOutside>true</harmAllLayersUntilOutside>
+		<defaultDamage>800</defaultDamage>
+		<defaultStoppingPower>1.5</defaultStoppingPower>
+		<defaultArmorPenetration>1</defaultArmorPenetration>
+		<buildingDamageFactorImpassable>4</buildingDamageFactorImpassable>
+		<buildingDamageFactorPassable>2</buildingDamageFactorPassable>
+		<plantDamageFactor>2</plantDamageFactor>
+		<explosionHeatEnergyPerCell>20</explosionHeatEnergyPerCell>
+		<explosionCellFleck>Fleck_Vaporize</explosionCellFleck>
+		<armorCategory>Sharp</armorCategory>
+		<minDamageToFragment>15</minDamageToFragment>
+		<makesAnimalsFlee>true</makesAnimalsFlee>
+		<explosionColorCenter>(1, 1, 1)</explosionColorCenter>
+		<explosionColorEdge>(0.6, 0.5, 0.4)</explosionColorEdge>
+		<soundExplosion>Explosion_Vaporize</soundExplosion>
+		<expolosionPropagationSpeed>0.3</expolosionPropagationSpeed>
+		<hasForcefulImpact>true</hasForcefulImpact>
+		<corpseDamageFactor>0.1</corpseDamageFactor>
+	</DamageDef>
+
+	<!-- === Growth Ray Ammo === -->
+	<!-- === Ammo Set === -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_GrowthRay</defName>
+		<label>Growth Ray Power Cell</label>
+		<ammoTypes>
+			<Ammo_LaserChargePack>Projectile_GrowthRay</Ammo_LaserChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- === Projectile === -->
+	<ThingDef ParentName="BaseBulletCE">
+		<defName>Projectile_GrowthRay</defName>
+		<label>growth ray</label>
+		<graphicData>
+			<texPath>Things/Projectile/ChargeLanceShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>1.5</drawSize>
+			<color>(255, 180, 255)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>GrowthRay</damageDef>
+			<damageAmountBase>1</damageAmountBase><!-- -2 -->
+			<armorPenetrationBlunt>0.5</armorPenetrationBlunt><!-- -0.5 -->
+			<armorPenetrationSharp>0.5</armorPenetrationSharp><!-- -0.2 -->
+			<speed>70</speed>
+		</projectile>
+	</ThingDef>
+
+	<!-- === Damage Def === -->
+	<DamageDef>
+		<defName>GrowthRay</defName>
+		<label>vaporize</label>
+		<workerClass>DamageWorker_Vaporize</workerClass>
+		<externalViolence>true</externalViolence>
+		<deathMessage>{0} has been vaporized by extreme heat.</deathMessage>
+		<hediff>Burn</hediff>
+		<additionalHediffs>
+			<li>
+				<hediff>BS_Affliction_GrowthRay</hediff>
+				<severityPerDamageDealt>0.12</severityPerDamageDealt>
+			</li>
+		</additionalHediffs>
+		<harmAllLayersUntilOutside>true</harmAllLayersUntilOutside>
+		<defaultDamage>800</defaultDamage>
+		<defaultStoppingPower>1.5</defaultStoppingPower>
+		<defaultArmorPenetration>1</defaultArmorPenetration>
+		<buildingDamageFactorImpassable>4</buildingDamageFactorImpassable>
+		<buildingDamageFactorPassable>2</buildingDamageFactorPassable>
+		<plantDamageFactor>2</plantDamageFactor>
+		<explosionHeatEnergyPerCell>20</explosionHeatEnergyPerCell>
+		<explosionCellFleck>Fleck_Vaporize</explosionCellFleck>
+		<armorCategory>Sharp</armorCategory>
+		<minDamageToFragment>15</minDamageToFragment>
+		<makesAnimalsFlee>true</makesAnimalsFlee>
+		<explosionColorCenter>(1, 1, 1)</explosionColorCenter>
+		<explosionColorEdge>(0.6, 0.5, 0.4)</explosionColorEdge>
+		<soundExplosion>Explosion_Vaporize</soundExplosion>
+		<expolosionPropagationSpeed>0.3</expolosionPropagationSpeed>
+		<hasForcefulImpact>true</hasForcefulImpact>
+		<corpseDamageFactor>0.1</corpseDamageFactor>
+	</DamageDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Genes/GeneDefs_Armor.xml b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Genes/GeneDefs_Armor.xml
new file mode 100644
index 0000000000..3f15f9943e
--- /dev/null
+++ b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Genes/GeneDefs_Armor.xml	
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Fix Descriptions -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/GeneDef[defName="BS_ToughSkin"]/customEffectDescriptions</xpath>
+		<value>
+			<customEffectDescriptions>
+				<li>+0.5 mm natural sharp armor</li>
+				<li>+1.0 mPA natural blunt armor</li>
+			</customEffectDescriptions>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/GeneDef[defName="BS_NaturalArmor"]/customEffectDescriptions</xpath>
+		<value>
+			<customEffectDescriptions>
+				<li>+1 mm natural sharp armor</li>
+				<li>+1.5 mPA natural blunt armor</li>
+			</customEffectDescriptions>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/GeneDef[defName="BS_NaturalArmor_Great"]/customEffectDescriptions</xpath>
+		<value>
+			<customEffectDescriptions>
+				<li>+1.5 mm natural sharp armor</li>
+				<li>+2 mPA natural blunt armor</li>
+			</customEffectDescriptions>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Genes/GeneDefs_Small.xml b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Genes/GeneDefs_Small.xml
new file mode 100644
index 0000000000..56df7c64cf
--- /dev/null
+++ b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Genes/GeneDefs_Small.xml	
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Adds Dwarf Bulk -->
+	<!-- Adds Gnome Bulk -->
+	<!-- Adds Rabbit Bulk -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/GeneDef[defName="DwarfFrame" or defName="GnomeFrame" or defName="BS_RabbitFrame"]/statOffsets</xpath>
+		<value>
+			<CarryBulk>10</CarryBulk>
+		</value>
+	</Operation>
+
+	<!-- Add Small Frame Bulk -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/GeneDef[defName="BS_SmallFrame"]/statOffsets</xpath>
+		<value>
+			<CarryBulk>8</CarryBulk>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Genes/GeneDefs_Temperature.xml b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Genes/GeneDefs_Temperature.xml
new file mode 100644
index 0000000000..67378b3372
--- /dev/null
+++ b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Genes/GeneDefs_Temperature.xml	
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/GeneDef[defName="FireImmunity"]/damageFactors</xpath>
+		<value>
+			<PrometheumFlame>0.0</PrometheumFlame>
+			<Flame_Secondary>0.0</Flame_Secondary>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Big and Small Genes/Patches/Big and Small Genes/HediffDefs/Hediffs_Armor.xml b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/HediffDefs/Hediffs_Armor.xml
new file mode 100644
index 0000000000..bc4691324a
--- /dev/null
+++ b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/HediffDefs/Hediffs_Armor.xml	
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BS_ToughSkin"]/stages/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ArmorRating_Blunt>1</ArmorRating_Blunt>
+				<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BS_NaturalArmor_Padded"]/stages/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+				<ArmorRating_Sharp>1</ArmorRating_Sharp>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BS_NaturalArmor_Riot"]/stages/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ArmorRating_Blunt>2</ArmorRating_Blunt>
+				<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BS_PsychicArmor_Stage1"]/stages/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ArmorRating_Blunt>1</ArmorRating_Blunt>
+				<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BS_PsychicArmor_Stage2"]/stages/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ArmorRating_Blunt>2</ArmorRating_Blunt>
+				<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+			</statOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Big and Small Genes/Patches/Big and Small Genes/HediffDefs/Hediffs_Weapons..xml b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/HediffDefs/Hediffs_Weapons..xml
new file mode 100644
index 0000000000..af4cb3fee8
--- /dev/null
+++ b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/HediffDefs/Hediffs_Weapons..xml	
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Acid Attack -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BS_AcidAttack"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>BS_AcidBuiltupCap</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Venomous Talons -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="LoS_VenomClaws"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>venomous talons</label>
+					<capacities>
+						<li>BS_AcidBuiltupCap</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationSharp>1.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.8</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Talons -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BS_Talons"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>talons</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationSharp>1.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.8</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Feeding Frenzy -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BS_FeedingFrenzy"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.50</cooldownTime>
+					<chanceFactor>5</chanceFactor>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<soundMeleeHit>Pawn_Melee_HumanBite_Hit</soundMeleeHit>
+					<soundMeleeMiss>Pawn_Melee_HumanBite_Miss</soundMeleeMiss>
+					<armorPenetrationSharp>0.35</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Snake Tail -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="LS_SnakeTail"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tail</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>3.17</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>6</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Pawnkind/BS_Genes_Pawnkind.xml b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Pawnkind/BS_Genes_Pawnkind.xml
new file mode 100644
index 0000000000..f2cf0ca902
--- /dev/null
+++ b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Pawnkind/BS_Genes_Pawnkind.xml	
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- More Javelins for Giant-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="BS_Ogre_Hunter"]</xpath>
+		<value>
+			<modExtensions Inherit="False">
+				<li Class="CombatExtended.LoadoutPropertiesExtension">
+					<primaryMagazineCount>
+						<min>3</min>
+						<max>4</max>
+					</primaryMagazineCount>
+					<forcedSidearm>
+						<sidearmMoney>
+							<min>100</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>NeolithicMeleeGiant</li>
+						</weaponTags>
+					</forcedSidearm>
+				</li>
+			</modExtensions>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/PawnKindDef[defName="BS_Ogre_Warrior"]/weaponTags/li[.="NeolithicMeleeBasic"]</xpath>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Weapons/ThingDef_Building_Security.xml b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Weapons/ThingDef_Building_Security.xml
new file mode 100644
index 0000000000..f9e9a79253
--- /dev/null
+++ b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Weapons/ThingDef_Building_Security.xml	
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Shrink Turret === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMAD_ShrinkTurret"]/description</xpath>
+		<value>
+			<description>A portable automatic turret with shrink ray attached. Its dumb AI brain can't be directly controlled, so beware of friendly fire.</description>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMAD_ShrinkTurret"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMAD_ShrinkTurret"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.25</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMAD_ShrinkTurret"]/statBases/ShootingAccuracyTurret</xpath>
+		<value>
+			<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMAD_ShrinkTurret"]/statBases/Mass</xpath>
+		<value>
+			<Mass>25</Mass>
+			<Bulk>15</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMAD_ShrinkTurret"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>150</Steel>
+				<Plasteel>30</Plasteel>
+				<ComponentIndustrial>7</ComponentIndustrial>
+				<ComponentSpacer>4</ComponentSpacer>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="BMAD_ShrinkTurret"]/comps/li[@Class="CompProperties_Refuelable"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMAD_ShrinkTurret"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMAD_ShrinkTurret"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>1.0</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BMAD_Gun_ShrinkTurret</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>0.69</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.91</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_ShrinkRay</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>19</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>3</burstShotCount>
+			<soundCast>Resurrect_Resolve</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_ShrinkRay</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- === Growth Turret === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMAD_GrowthTurret"]/description</xpath>
+		<value>
+			<description>A portable automatic turret with growth ray attached. Its dumb AI brain can't be directly controlled, so beware of friendly fire.</description>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMAD_Gun_GrowthTurret"]/verbs</xpath>
+		<value>
+			<verbs Inherit="False">
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>0.91</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Projectile_GrowthRay</defaultProjectile>
+					<warmupTime>1.3</warmupTime>
+					<range>19</range>
+					<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+					<burstShotCount>3</burstShotCount>
+					<soundCast>Resurrect_Resolve</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+					<recoilPattern>Mounted</recoilPattern>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMAD_Gun_GrowthTurret"]</xpath>
+		<value>
+			<comps Inherit="False">
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>50</magazineSize>
+					<reloadTime>7.8</reloadTime>
+					<ammoSet>AmmoSet_GrowthRay</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+					<noSnapshot>true</noSnapshot>
+					<noSingleShot>true</noSingleShot>
+				</li>
+				<li Class="CompProperties_Forbiddable"/>
+				<li>
+					<compClass>CompEquippable</compClass>
+				</li>
+				<li Class="CompProperties_Styleable"/>
+
+			</comps>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Weapons/ThingDef_MeleeWeapons.xml b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Weapons/ThingDef_MeleeWeapons.xml
new file mode 100644
index 0000000000..1344c744f8
--- /dev/null
+++ b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Weapons/ThingDef_MeleeWeapons.xml	
@@ -0,0 +1,414 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ====== Ogre Club ====== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BS_OgreClub"]/statBases</xpath>
+		<value>
+			<Bulk>35</Bulk>
+			<MeleeCounterParryBonus>0.04</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BS_OgreClub"]/statBases/WorkToMake</xpath>
+		<value>
+			<WorkToMake>2700</WorkToMake>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BS_OgreClub"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.5</MeleeCritChance>
+				<MeleeParryChance>0.04</MeleeParryChance>
+				<MeleeDodgeChance>0.6</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BS_OgreClub"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BS_OgreClub"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>2.95</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Demolish</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>3.06</cooldownTime>
+					<chanceFactor>0.90</chanceFactor>
+					<armorPenetrationBlunt>30</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ====== Giant Hammer ====== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BS_GiantHammer"]/statBases</xpath>
+		<value>
+			<Bulk>35</Bulk>
+			<MeleeCounterParryBonus>0.04</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BS_GiantHammer"]/statBases/WorkToMake</xpath>
+		<value>
+			<WorkToMake>3600</WorkToMake>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BS_GiantHammer"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>2</MeleeCritChance>
+			<MeleeParryChance>0.04</MeleeParryChance>
+			<MeleeDodgeChance>0.4</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BS_GiantHammer"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BS_GiantHammer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>2.95</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Demolish</li>
+					</capacities>
+					<power>34</power>
+					<cooldownTime>3.23</cooldownTime>
+					<chanceFactor>0.90</chanceFactor>
+					<armorPenetrationBlunt>30</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BS_GiantHammer"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>140</costStuffCount>
+		</value>
+	</Operation>
+
+	<!-- ====== Jotun War Hammer ====== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BS_JotunHammer"]/statBases</xpath>
+		<value>
+			<Bulk>50</Bulk>
+			<MeleeCounterParryBonus>0.18</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BS_JotunHammer"]/statBases/WorkToMake</xpath>
+		<value>
+			<WorkToMake>27000</WorkToMake>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BS_JotunHammer"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>3</MeleeCritChance>
+				<MeleeParryChance>0.13</MeleeParryChance>
+				<MeleeDodgeChance>0.8</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BS_JotunHammer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>2.95</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Demolish</li>
+					</capacities>
+					<power>51</power>
+					<cooldownTime>3.92</cooldownTime>
+					<chanceFactor>0.90</chanceFactor>
+					<armorPenetrationBlunt>81</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ====== Jotun Sword ====== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BS_JotunSword"]/statBases</xpath>
+		<value>
+			<Bulk>30</Bulk>
+			<MeleeCounterParryBonus>0.08</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BS_JotunSword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.02</MeleeCritChance>
+				<MeleeParryChance>0.08</MeleeParryChance>
+				<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BS_JotunSword"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BS_JotunSword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2.52</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>44</power>
+					<cooldownTime>2.52</cooldownTime>
+					<chanceFactor>0.50</chanceFactor>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<armorPenetrationSharp>3.34</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>3.03</cooldownTime>
+					<chanceFactor>0.45</chanceFactor>
+					<armorPenetrationBlunt>9</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.38</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ====== Surtr Sword ====== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BS_SurtrSword"]/statBases</xpath>
+		<value>
+			<Bulk>30</Bulk>
+			<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BS_SurtrSword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1</MeleeCritChance>
+				<MeleeParryChance>0.4</MeleeParryChance>
+				<MeleeDodgeChance>0.27</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BS_SurtrSword"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BS_SurtrSword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>2.79</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>76</power>
+					<cooldownTime>2.33</cooldownTime>
+					<chanceFactor>0.50</chanceFactor>
+					<armorPenetrationBlunt>8.64</armorPenetrationBlunt>
+					<armorPenetrationSharp>168.69</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>20</amount>
+							<chance>0.75</chance>
+						</li>
+					</extraMeleeDamages>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>87</power>
+					<cooldownTime>2.07</cooldownTime>
+					<chanceFactor>0.45</chanceFactor>
+					<armorPenetrationBlunt>19.44</armorPenetrationBlunt>
+					<armorPenetrationSharp>121.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>20</amount>
+							<chance>0.75</chance>
+						</li>
+					</extraMeleeDamages>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ====== Skrymir Hammer ====== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BS_SkrymirHammer"]/statBases</xpath>
+		<value>
+			<Bulk>60</Bulk>
+			<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BS_SkrymirHammer"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1</MeleeCritChance>
+				<MeleeParryChance>0.45</MeleeParryChance>
+				<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BS_SkrymirHammer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>3.09</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Demolish</li>
+					</capacities>
+					<power>70</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Frostbite</def>
+							<amount>9</amount>
+							<chance>0.75</chance>
+						</li>
+						<li>
+							<def>EMP</def>
+							<amount>9</amount>
+						</li>
+						<li>
+							<def>Stun</def>
+							<amount>9</amount>
+							<chance>0.25</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>3.21</cooldownTime>
+					<chanceFactor>0.90</chanceFactor>
+					<armorPenetrationBlunt>200</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Weapons/ThingDef_Ranged.xml b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Weapons/ThingDef_Ranged.xml
new file mode 100644
index 0000000000..1d1a3adbdd
--- /dev/null
+++ b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Weapons/ThingDef_Ranged.xml	
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BS_JotunRifle"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.70</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>4.03</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>2.44</cooldownTime>
+					<armorPenetrationBlunt>16</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BS_GiantMinigun" or defName="BS_JotunRocketLauncher"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>2.44</cooldownTime>
+					<armorPenetrationBlunt>16</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Jotun WarMech Rifle -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BS_JotunRifle</defName>
+		<statBases>
+			<Bulk>45</Bulk>
+			<Mass>35</Mass>
+			<SwayFactor>2</SwayFactor>
+			<ShotSpread>0.05</ShotSpread>
+			<SightsEfficiency>2</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>200</Steel>
+			<ComponentIndustrial>10</ComponentIndustrial>
+			<Chemfuel>30</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_25x137mmNATO_AP</defaultProjectile>
+			<warmupTime>3.2</warmupTime>
+			<range>100</range>
+			<soundCast>Shot_TurretSniper</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>20</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>2</reloadTime>
+			<ammoSet>AmmoSet_25x137mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>RangedHeavyGiant</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BS_JotunRifle"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.00,1.00</DrawSize>
+				<DrawOffset>0.0,-0.4</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Jotun Minigun -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BS_GiantMinigun</defName>
+		<statBases>
+			<Bulk>60</Bulk>
+			<Mass>40</Mass>
+			<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.9</SightsEfficiency>
+			<ShotSpread>0.3</ShotSpread>
+			<SwayFactor>2.32</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_470NitroExpress_FMJ</defaultProjectile>
+			<warmupTime>2</warmupTime>
+			<burstShotCount>60</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<range>57</range>
+			<soundCast>BS_GiantMinigunShot</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>20</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>300</magazineSize>
+			<reloadTime>10</reloadTime>
+			<ammoSet>AmmoSet_470NitroExpress</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>true</aiUseBurstMode>
+			<aimedBurstShotCount>30</aimedBurstShotCount>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>RangedHeavyGiant</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BS_GiantMinigun"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.00,1.00</DrawSize>
+				<DrawOffset>0.0,-0.4</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Jotun Minigun -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BS_JotunRocketLauncher</defName>
+		<statBases>
+			<Bulk>30</Bulk>
+			<Mass>40</Mass>
+			<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.9</SightsEfficiency>
+			<ShotSpread>2</ShotSpread>
+			<SwayFactor>2.32</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_RPG7Grenade_HEAT</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<burstShotCount>4</burstShotCount>
+			<ticksBetweenBurstShots>20</ticksBetweenBurstShots>
+			<range>30</range>
+			<minRange>8</minRange>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<soundCast>BS_JotunRocketLauncher_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>20</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>4</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>2</reloadTime>
+			<ammoSet>AmmoSet_RPG7Grenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>true</aiUseBurstMode>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>RangedHeavyGiant</li>
+			<li>CE_AI_AOE</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BS_JotunRocketLauncher"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.00,1.00</DrawSize>
+				<DrawOffset>0.0,-0.4</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BS_JotunRocketLauncher"]/recipeMaker/researchPrerequisite</xpath>
+		<value>
+			<researchPrerequisite>CE_AdvancedLaunchers</researchPrerequisite>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Weapons/ThingDef_RangedNeolithic.xml b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Weapons/ThingDef_RangedNeolithic.xml
new file mode 100644
index 0000000000..3922754944
--- /dev/null
+++ b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Weapons/ThingDef_RangedNeolithic.xml	
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ====== Giant Javelin ====== -->
+
+	<!-- == Weapon == -->
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="BS_JotunJavelin"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>BaseWeapon</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="BS_JotunJavelin"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BS_JotunJavelin"]</xpath>
+		<value>
+			<stackLimit>5</stackLimit>
+			<resourceReadoutPriority>First</resourceReadoutPriority>
+			<techLevel>Medieval</techLevel>
+			<tradeNeverStack>true</tradeNeverStack>
+			<burnableByRecipe>true</burnableByRecipe>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="BS_JotunJavelin"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BS_JotunJavelin</defName>
+		<statBases>
+			<MarketValue>50</MarketValue>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<Bulk>5</Bulk>
+			<Mass>5</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<MeleeCounterParryBonus>0.36</MeleeCounterParryBonus>
+		</statBases>
+		<Properties>
+			<label>Throw huge javelin</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Projectile_GiantThrown</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>20</range>
+			<soundCast>BS_JotunJavelinThrow_Sound</soundCast>
+			<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+		</Properties>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BS_JotunJavelin"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.17</MeleeCritChance>
+				<MeleeDodgeChance>0.6</MeleeDodgeChance>
+				<MeleeParryChance>0.5</MeleeParryChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BS_JotunJavelin"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>2.95</cooldownTime>
+					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>37</power>
+					<cooldownTime>3.4</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>9</armorPenetrationBlunt>
+					<armorPenetrationSharp>4</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Big Rock Chuck -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs</xpath>
+		<value>
+
+			<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseWeaponAndAmmoNeolithic">
+				<defName>BS_OgreThrowinRock</defName>
+				<label>Throwing Chunks</label>
+				<description>These large rocks have been crudely chiseled for throwing at enemies.\n\nCan be wielded by giant, herculean, or warcasket pawns.</description>
+				<graphicData>
+					<texPath>Item/BS_ThrowableChunk_projectile</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+					<drawSize>1.4</drawSize>
+				</graphicData>
+				<soundInteract>Interact_BeatFire</soundInteract>
+				<relicChance>0</relicChance>
+				<statBases>
+					<MarketValue>50</MarketValue>
+					<SightsEfficiency>1.0</SightsEfficiency>
+					<ShotSpread>1.5</ShotSpread>
+					<SwayFactor>2.5</SwayFactor>
+					<Bulk>5</Bulk>
+					<Mass>20</Mass>
+					<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
+				</statBases>
+				<equippedAngleOffset>30</equippedAngleOffset>
+				<stackLimit>25</stackLimit>
+				<weaponClasses Inherit="False">
+					<li>BS_GiantWeapon</li>
+				</weaponClasses>
+				<weaponTags Inherit="False">
+					<li>RangedMedievalGiant</li>
+				</weaponTags>
+				<tradeability>All</tradeability>
+				<verbs>
+					<li Class="CombatExtended.VerbPropertiesCE">
+						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Rock_GiantThrown</defaultProjectile>
+						<soundCast>BS_JotunJavelinThrow_Sound</soundCast>
+						<warmupTime>3</warmupTime>
+						<range>12</range>
+						<!--<soundCast>Interact_BeatFire</soundCast>-->
+					</li>
+				</verbs>
+				<tools>
+					<li Class="CombatExtended.ToolCE">
+						<label>rock</label>
+						<capacities>
+							<li>Demolish</li>
+						</capacities>
+						<power>13.4</power>
+						<cooldownTime>2.95</cooldownTime>
+						<armorPenetrationBlunt>10</armorPenetrationBlunt>
+					</li>
+				</tools>
+				<ammoClass>Javelin</ammoClass>
+			</ThingDef>
+
+			<ThingDef ParentName="BasePilumProjectile">
+				<defName>Rock_GiantThrown</defName>
+				<label>rock (thrown)</label>
+				<graphicData>
+					<texPath>Item/BS_ThrowableChunk_projectile</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+					<drawSize>1.4</drawSize>
+				</graphicData>
+				<projectile Class="CombatExtended.ProjectilePropertiesCE">
+					<damageDef>Demolish</damageDef>
+					<damageAmountBase>30</damageAmountBase>
+					<speed>25</speed>
+					<armorPenetrationBlunt>60</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<arcHeightFactor>1.5</arcHeightFactor>
+					<explosionRadius>0.9</explosionRadius>
+					<soundExplode>BuildingDestroyed_Stone_Medium</soundExplode>
+					<preExplosionSpawnThingDef>Filth_RubbleRock</preExplosionSpawnThingDef>
+				</projectile>
+			</ThingDef>
+
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="BS_OgreThrowinRockRecipe"]/workAmount</xpath>
+		<value>
+			<workAmount>1600</workAmount>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Weapons/ThingDef_Royalty_Weapons.xml b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Weapons/ThingDef_Royalty_Weapons.xml
new file mode 100644
index 0000000000..7dc8c643bf
--- /dev/null
+++ b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Weapons/ThingDef_Royalty_Weapons.xml	
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Royalty</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!-- ====== Persona Surtr Sword ====== -->
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="BS_SurtrSword_Persona"]/statBases</xpath>
+					<value>
+						<Bulk>30</Bulk>
+						<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="BS_SurtrSword_Persona"]/weaponTags</xpath>
+					<value>
+						<li>CE_OneHandedWeapon</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="BS_SurtrSword_Persona"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>handle</label>
+								<capacities>
+									<li>Poke</li>
+								</capacities>
+								<power>16</power>
+								<cooldownTime>2.51</cooldownTime>
+								<chanceFactor>0.05</chanceFactor>
+								<armorPenetrationBlunt>7.26</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>point</label>
+								<capacities>
+									<li>Stab</li>
+								</capacities>
+								<power>76</power>
+								<cooldownTime>2.10</cooldownTime>
+								<chanceFactor>0.50</chanceFactor>
+								<armorPenetrationBlunt>10.45</armorPenetrationBlunt>
+								<armorPenetrationSharp>203.28</armorPenetrationSharp>
+								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+								<extraMeleeDamages>
+									<li>
+										<def>Flame</def>
+										<amount>20</amount>
+										<chance>0.75</chance>
+									</li>
+								</extraMeleeDamages>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>edge</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>87</power>
+								<cooldownTime>1.86</cooldownTime>
+								<chanceFactor>0.45</chanceFactor>
+								<armorPenetrationBlunt>23.52</armorPenetrationBlunt>
+								<armorPenetrationSharp>147.01</armorPenetrationSharp>
+								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+								<extraMeleeDamages>
+									<li>
+										<def>Flame</def>
+										<amount>20</amount>
+										<chance>0.75</chance>
+									</li>
+								</extraMeleeDamages>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<!-- ====== Persona Skrymir Hammer ====== -->
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="BS_SkrymirHammer_Persona"]/statBases</xpath>
+					<value>
+						<Bulk>60</Bulk>
+						<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="BS_SkrymirHammer_Persona"]</xpath>
+					<value>
+						<equippedStatOffsets>
+							<MeleeCritChance>1</MeleeCritChance>
+							<MeleeParryChance>0.45</MeleeParryChance>
+							<MeleeDodgeChance>0.3</MeleeDodgeChance>
+						</equippedStatOffsets>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="BS_SkrymirHammer_Persona"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>handle</label>
+								<capacities>
+									<li>Poke</li>
+								</capacities>
+								<power>22</power>
+								<cooldownTime>2.78</cooldownTime>
+								<chanceFactor>0.10</chanceFactor>
+								<armorPenetrationBlunt>18.15</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Demolish</li>
+								</capacities>
+								<power>77</power>
+								<extraMeleeDamages>
+									<li>
+										<def>Frostbite</def>
+										<amount>9</amount>
+										<chance>0.75</chance>
+									</li>
+									<li>
+										<def>EMP</def>
+										<amount>9</amount>
+									</li>
+									<li>
+										<def>Stun</def>
+										<amount>9</amount>
+										<chance>0.25</chance>
+									</li>
+								</extraMeleeDamages>
+								<cooldownTime>2.59</cooldownTime>
+								<chanceFactor>0.90</chanceFactor>
+								<armorPenetrationBlunt>242</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Weapons/ThingDef_Shrink.xml b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Weapons/ThingDef_Shrink.xml
new file mode 100644
index 0000000000..7ee276fbb7
--- /dev/null
+++ b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Weapons/ThingDef_Shrink.xml	
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMad_ShrinkRay" or defName="BMad_GrowthRay"]/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>
+
+	<!-- Mod Extensions -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMad_ShrinkRay" or defName="BMad_GrowthRay"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.16,1.16</DrawSize>
+				<DrawOffset>0.08,0.0</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Shrink Ray === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BMad_ShrinkRay</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>10</Bulk>
+			<Mass>8</Mass>
+			<WorkToMake>45000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<Plasteel>30</Plasteel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+			<ComponentSpacer>3</ComponentSpacer>
+		</costList>
+		<Properties>
+			<recoilAmount>1.50</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_ShrinkRay</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>19</range>
+			<soundCast>Resurrect_Resolve</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_ShrinkRay</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- === Growth Ray === -->
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="BMad_GrowthRay"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>BaseHumanMakeableGun</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMad_GrowthRay"]</xpath>
+		<value>
+			<recipeMaker>
+				<skillRequirements>
+					<Crafting>7</Crafting>
+				</skillRequirements>
+				<displayPriority>400</displayPriority>
+				<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+				<researchPrerequisites>
+					<li>GunTurrets</li>
+					<li>BS_MadScienceField</li>
+				</researchPrerequisites>
+			</recipeMaker>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BMad_GrowthRay</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>10</Bulk>
+			<Mass>8</Mass>
+			<WorkToMake>45000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<Plasteel>30</Plasteel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+			<ComponentSpacer>3</ComponentSpacer>
+		</costList>
+		<Properties>
+			<recoilAmount>1.50</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_GrowthRay</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>19</range>
+			<soundCast>Resurrect_Resolve</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_GrowthRay</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Big and Small Races/Patches/Big and Small Races/ThingDef_Armor.xml b/ModPatches/Big and Small Races/Patches/Big and Small Races/ThingDef_Armor.xml
new file mode 100644
index 0000000000..822242882c
--- /dev/null
+++ b/ModPatches/Big and Small Races/Patches/Big and Small Races/ThingDef_Armor.xml	
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Red Bandana-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BS_Nisse_Cap"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BS_Nisse_Cap"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Big and Small Weapons/Patches/Big and Small Weapons/BS_Medieval_Weapons.xml b/ModPatches/Big and Small Weapons/Patches/Big and Small Weapons/BS_Medieval_Weapons.xml
new file mode 100644
index 0000000000..0003c1d3cb
--- /dev/null
+++ b/ModPatches/Big and Small Weapons/Patches/Big and Small Weapons/BS_Medieval_Weapons.xml	
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ====== Giant Medieval Hammer ====== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BS_GiantMedievalHammer"]/statBases</xpath>
+		<value>
+			<Bulk>35</Bulk>
+			<MeleeCounterParryBonus>0.04</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BS_GiantMedievalHammer"]/statBases/WorkToMake</xpath>
+		<value>
+			<WorkToMake>2700</WorkToMake>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BS_GiantMedievalHammer"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>2</MeleeCritChance>
+			<MeleeParryChance>0.04</MeleeParryChance>
+			<MeleeDodgeChance>0.4</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BS_GiantMedievalHammer"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BS_GiantMedievalHammer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>2.95</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Demolish</li>
+					</capacities>
+					<power>34</power>
+					<cooldownTime>3.23</cooldownTime>
+					<chanceFactor>0.90</chanceFactor>
+					<armorPenetrationBlunt>30</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BS_GiantScythe"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>160</costStuffCount>
+		</value>
+	</Operation>
+
+	<!-- ====== Giant Scythe ====== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BS_GiantScythe"]/statBases</xpath>
+		<value>
+			<Bulk>50</Bulk>
+			<MeleeCounterParryBonus>1.85</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BS_GiantScythe"]/statBases/WorkToMake</xpath>
+		<value>
+			<WorkToMake>3600</WorkToMake>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BS_GiantScythe"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.02</MeleeCritChance>
+			<MeleeParryChance>0.18</MeleeParryChance>
+			<MeleeDodgeChance>2.5</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BS_GiantScythe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2.95</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>5.65</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>37</power>
+					<cooldownTime>4.2</cooldownTime>
+					<armorPenetrationBlunt>12.96</armorPenetrationBlunt>
+					<armorPenetrationSharp>25.92</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>45</power>
+					<cooldownTime>10.1</cooldownTime>
+					<armorPenetrationBlunt>12.1</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.69</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ====== Oni Club ====== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BS_OniClub"]/statBases</xpath>
+		<value>
+			<Bulk>40</Bulk>
+			<MeleeCounterParryBonus>0.13</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BS_OniClub"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>2</MeleeCritChance>
+				<MeleeParryChance>0.1</MeleeParryChance>
+				<MeleeDodgeChance>0.6</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BS_OniClub"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>3.09</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>9</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Demolish</li>
+					</capacities>
+					<power>60</power>
+					<cooldownTime>4.94</cooldownTime>
+					<chanceFactor>0.90</chanceFactor>
+					<armorPenetrationBlunt>45</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Big and Small Weapons/Patches/Big and Small Weapons/BS_Modern.xml b/ModPatches/Big and Small Weapons/Patches/Big and Small Weapons/BS_Modern.xml
new file mode 100644
index 0000000000..c65ca6e110
--- /dev/null
+++ b/ModPatches/Big and Small Weapons/Patches/Big and Small Weapons/BS_Modern.xml	
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BS_GiantMusket"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>2.02</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>11.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>2.20</cooldownTime>
+					<armorPenetrationBlunt>9</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>2.02</cooldownTime>
+					<armorPenetrationBlunt>11.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BS_GiantMusket</defName>
+		<statBases>
+			<Mass>10</Mass>
+			<RangedWeapon_Cooldown>0.93</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.9</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.68</SwayFactor>
+			<Bulk>30</Bulk>
+			<WorkToMake>36000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>150</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_MiniCannonBall_Round</defaultProjectile>
+			<warmupTime>1.26</warmupTime>
+			<range>55</range>
+			<soundCast>BS_GiantMusketShot</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>13</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>7.11</reloadTime>
+			<ammoSet>AmmoSet_MiniCannonBall</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_AI_SR</li>
+		</weaponTags>
+		<researchPrerequisite>CE_Gunpowder</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BS_GiantMusket"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>2,2</DrawSize>
+				<DrawOffset>0.25,0.0</DrawOffset>
+				<CasingOffset>-0.1,0.1</CasingOffset>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Big and Small Weapons/Patches/Big and Small Weapons/BS_Neolithic.xml b/ModPatches/Big and Small Weapons/Patches/Big and Small Weapons/BS_Neolithic.xml
new file mode 100644
index 0000000000..501dd57dc9
--- /dev/null
+++ b/ModPatches/Big and Small Weapons/Patches/Big and Small Weapons/BS_Neolithic.xml	
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ====== Giant Salvage Club ====== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BS_GiantSalvageClub"]/statBases</xpath>
+		<value>
+			<Bulk>35</Bulk>
+			<MeleeCounterParryBonus>0.04</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BS_GiantSalvageClub"]/statBases/WorkToMake</xpath>
+		<value>
+			<WorkToMake>2700</WorkToMake>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BS_GiantSalvageClub"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.5</MeleeCritChance>
+				<MeleeParryChance>0.04</MeleeParryChance>
+				<MeleeDodgeChance>0.6</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BS_GiantSalvageClub"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BS_GiantSalvageClub"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>2.95</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Demolish</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>3.23</cooldownTime>
+					<chanceFactor>0.90</chanceFactor>
+					<armorPenetrationBlunt>30</armorPenetrationBlunt>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ====== Giant Shard Knife ====== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BS_GiantShard"]/statBases</xpath>
+		<value>
+			<Bulk>50</Bulk>
+			<MeleeCounterParryBonus>1.85</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BS_GiantShard"]/statBases/WorkToMake</xpath>
+		<value>
+			<WorkToMake>3600</WorkToMake>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BS_GiantShard"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.02</MeleeCritChance>
+				<MeleeParryChance>0.18</MeleeParryChance>
+				<MeleeDodgeChance>2.5</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BS_GiantShard"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BS_GiantShard"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2.52</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>41</power>
+					<cooldownTime>2.89</cooldownTime>
+					<armorPenetrationBlunt>5.76</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.66</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>2.52</cooldownTime>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<armorPenetrationSharp>3.34</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Big and Small Weapons/Patches/Big and Small Weapons/BS_Royalty_Weapons.xml b/ModPatches/Big and Small Weapons/Patches/Big and Small Weapons/BS_Royalty_Weapons.xml
new file mode 100644
index 0000000000..5183e67feb
--- /dev/null
+++ b/ModPatches/Big and Small Weapons/Patches/Big and Small Weapons/BS_Royalty_Weapons.xml	
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Royalty</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!-- ====== Persona Giant Plasma Spear ====== -->
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="BS_VaeSuis_Persona"]/statBases</xpath>
+					<value>
+						<Bulk>45</Bulk>
+						<MeleeCounterParryBonus>0.28</MeleeCounterParryBonus>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="BS_VaeSuis_Persona"]</xpath>
+					<value>
+						<equippedStatOffsets>
+							<MeleeCritChance>0.03</MeleeCritChance>
+							<MeleeParryChance>0.24</MeleeParryChance>
+							<MeleeDodgeChance>0.9</MeleeDodgeChance>
+						</equippedStatOffsets>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="BS_VaeSuis_Persona"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>handle</label>
+								<capacities>
+									<li>Poke</li>
+								</capacities>
+								<power>18</power>
+								<cooldownTime>2.28</cooldownTime>
+								<chanceFactor>0.10</chanceFactor>
+								<armorPenetrationBlunt>7.97</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>74</power>
+								<cooldownTime>1.926</cooldownTime>
+								<armorPenetrationBlunt>46</armorPenetrationBlunt>
+								<armorPenetrationSharp>239.5</armorPenetrationSharp>
+								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Stab</li>
+								</capacities>
+								<power>14</power>
+								<cooldownTime>1.43</cooldownTime>
+								<armorPenetrationBlunt>20.43</armorPenetrationBlunt>
+								<armorPenetrationSharp>319</armorPenetrationSharp>
+								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<!-- ====== Persona Skarstind ====== -->
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="BS_Skarstind_Persona"]/statBases</xpath>
+					<value>
+						<Bulk>50</Bulk>
+						<MeleeCounterParryBonus>0.13</MeleeCounterParryBonus>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="BS_Skarstind_Persona"]</xpath>
+					<value>
+						<equippedStatOffsets>
+							<MeleeCritChance>0.03</MeleeCritChance>
+							<MeleeParryChance>0.01</MeleeParryChance>
+							<MeleeDodgeChance>0.83</MeleeDodgeChance>
+						</equippedStatOffsets>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="BS_Skarstind_Persona"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>handle</label>
+								<capacities>
+									<li>Poke</li>
+								</capacities>
+								<power>16</power>
+								<cooldownTime>2.51</cooldownTime>
+								<chanceFactor>0.15</chanceFactor>
+								<armorPenetrationBlunt>6.6</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>32</power>
+								<cooldownTime>1.97</cooldownTime>
+								<armorPenetrationBlunt>42.24</armorPenetrationBlunt>
+								<armorPenetrationSharp>824.68</armorPenetrationSharp>
+								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Big and Small Weapons/Patches/Big and Small Weapons/BS_Ultratech.xml b/ModPatches/Big and Small Weapons/Patches/Big and Small Weapons/BS_Ultratech.xml
new file mode 100644
index 0000000000..fd5e07ad27
--- /dev/null
+++ b/ModPatches/Big and Small Weapons/Patches/Big and Small Weapons/BS_Ultratech.xml	
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ====== Giant Plasma Spear ====== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BS_VaeSuis"]/statBases</xpath>
+		<value>
+			<Bulk>45</Bulk>
+			<MeleeCounterParryBonus>0.28</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BS_VaeSuis"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.03</MeleeCritChance>
+				<MeleeParryChance>0.24</MeleeParryChance>
+				<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BS_VaeSuis"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.54</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>7.26</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>74</power>
+					<cooldownTime>2.14</cooldownTime>
+					<armorPenetrationBlunt>41.82</armorPenetrationBlunt>
+					<armorPenetrationSharp>217.8</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.59</cooldownTime>
+					<armorPenetrationBlunt>18.58</armorPenetrationBlunt>
+					<armorPenetrationSharp>290</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ====== Skarstind ====== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BS_Skarstind"]/statBases</xpath>
+		<value>
+			<Bulk>50</Bulk>
+			<MeleeCounterParryBonus>0.13</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BS_Skarstind"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.03</MeleeCritChance>
+				<MeleeParryChance>0.01</MeleeParryChance>
+				<MeleeDodgeChance>0.83</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BS_Skarstind"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>2.79</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>32</power>
+					<cooldownTime>2.19</cooldownTime>
+					<armorPenetrationBlunt>38.4</armorPenetrationBlunt>
+					<armorPenetrationSharp>749.71</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/BodyDefs/Bodies_CE.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/BodyDefs/Bodies_CE.xml
new file mode 100644
index 0000000000..0f2a882ae3
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/BodyDefs/Bodies_CE.xml	
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ====== Moff ====== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="BMT_MothLike"]//*[
+			def="Shell" or
+			def="Pronotum" or
+			def="InsectHead" or
+			def="InsectMouth" or
+			def="InsectLeg"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- ====== beetle ====== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="BeetleLikeWithHorn"]//*[
+			def="Shell" or
+			def="Elytra" or
+			def="Pronotum" or
+			def="InsectNostril" or
+			def="Antenna" or
+			def="Eye" or
+			def="InsectLeg"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="BeetleLikeWithHorn"]//*[
+			def="InsectMouth" or
+			def="Eye"]/groups
+		</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="BeetleLikeWithHorn"]//*[
+			def="Body" or
+			def="Elytra" or
+			def="Pronotum" or
+			def="InsectHead" or
+			def="InsectNostril" or
+			def="Horn" or
+			def="InsectMouth" or
+			def="InsectLeg"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<!-- ====== freaky bipeds ====== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="HunchedBipedWithTail"]//*[
+			def="Body" or
+			def="Tail" or
+			def="Neck" or
+			def="Leg"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="HunchedBipedWithTail"]//*[
+			def="Body" or
+			def="Tail" or
+			def="Neck" or
+			def="Head" or
+			def="Leg" or
+			def="Foot"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- ====== baffling bats ====== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="BMT_BatBird"]//*[
+			def="Body" or
+			def="Shoulder" or
+			def="Neck" or
+			def="Nose" or
+			def="Ear" or
+			def="Eye" or
+			def="Leg"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="BMT_BatBird"]//*[
+			def="AnimalJaw" or
+			def="Nose" or
+			def="Eye"]/groups
+		</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="BMT_BatBird"]//*[
+			def="Body" or
+			def="Shoulder" or
+			def="Neck" or
+			def="Head" or
+			def="Ear" or
+			def="Nose" or
+			def="Paw" or
+			def="AnimalJaw" or
+			def="Leg"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/Plants/CE_ExplodingAngel.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/Plants/CE_ExplodingAngel.xml
new file mode 100644
index 0000000000..7c6d187ca1
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/Plants/CE_ExplodingAngel.xml	
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_ExplodingAngel"]/comps</xpath>
+		<value>
+			<comps>
+				<li Class="BiomesCore.CompProperties_PlantProximityExplosive">
+					<explosiveRadius>3.9</explosiveRadius>
+					<explosiveDamageType>Bomb</explosiveDamageType>
+					<proxiGroup>Pawn</proxiGroup>
+					<minBodySize>0.9</minBodySize>
+					<proxiRadius>3.9</proxiRadius>
+					<growthProgress>0.6</growthProgress>
+					<growthAfterExplosion>0.4</growthAfterExplosion>
+					<explodeOnKilled>true</explodeOnKilled>
+					<chanceToStartFire>0.5</chanceToStartFire>
+					<detonateOnDamageTaken>
+						<li>Bullet</li>
+						<li>Arrow</li>
+						<li>ArrowHighVelocity</li>
+					</detonateOnDamageTaken>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Misc/Biomes_Cavern_CE_Patch_Resources_Leathers.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Misc/Biomes_Cavern_CE_Patch_Resources_Leathers.xml
new file mode 100644
index 0000000000..94389a1168
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Misc/Biomes_Cavern_CE_Patch_Resources_Leathers.xml	
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Remove RoyalRhinohorn and Spiderhead as a weapon -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="BMT_RoyalRhinoHorn" or defName="BMT_CaveSpiderHead"]/tools</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="BMT_RoyalRhinoHorn" or defName="BMT_CaveSpiderHead"]/weaponClasses</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="BMT_RoyalRhinoHorn" or defName="BMT_CaveSpiderHead"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>ResourceBase</value>
+	</Operation>
+
+	<!-- MothSilk -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_CrimsonSilk"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.09</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_CrimsonSilk"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.015</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_CrimsonSilk"]/statBases</xpath>
+		<value>
+			<Bulk>0.025</Bulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="BMT_CrimsonSilk"]/stuffProps/categories</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="BMT_CrimsonSilk"]/stuffProps</xpath>
+			<value>
+				<categories>
+					<li>SoftArmor</li>
+				</categories>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="BMT_CrimsonSilk"]/stuffProps/categories</xpath>
+			<value>
+				<li>SoftArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_BatWool"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.04</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_BatWool"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.05</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_BatWool"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.06</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_SpiderSilk"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.5</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_SpiderSilk"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.12</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_SpiderSilk"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.06</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="BMT_SpiderSilk"]/stuffProps/categories</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="BMT_SpiderSilk"]/stuffProps</xpath>
+			<value>
+				<categories>
+					<li>SoftArmor</li>
+				</categories>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="BMT_SpiderSilk"]/stuffProps/categories</xpath>
+			<value>
+				<li>SoftArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_SpiderSilk"]/statBases</xpath>
+		<value>
+			<Bulk>0.025</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_WeakChitin"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.21</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_MediumChitin"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.1</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_MediumChitin"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.5</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_WeakChitin"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.09</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_CrystalChitin"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.7</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_CrystalChitin"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.9</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_RoyalChitin"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>2.2</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_RoyalChitin"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>1.1</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_DeepChitin"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>2.0</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_DeepChitin"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.95</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Leather_Mushroom"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.03</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Leather_Mushroom"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.032</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_MoonlessSilk"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.25</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_MoonlessSilk"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.4</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Misc/CE_Chitin_armor.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Misc/CE_Chitin_armor.xml
new file mode 100644
index 0000000000..cff2378a83
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Misc/CE_Chitin_armor.xml	
@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Plate Shoulderpads === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinLightArmor"]/statBases/Mass</xpath>
+		<value>
+			<Bulk>6.0</Bulk>
+			<WornBulk>3.0</WornBulk>
+			<Mass>3.0</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinLightArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="BMT_Apparel_ChitinMediumArmor" or
+			defName="BMT_Apparel_ChitinHeavyArmor" or
+			defName="BMT_Apparel_ChitinFullArmor"]/apparel/layers </xpath>
+		<value>
+			<layers>
+				<li>Shell</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinMediumArmor"]/statBases</xpath>
+		<value>
+			<Bulk>40</Bulk>
+			<WornBulk>8</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinMediumArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.0</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinHeavyArmor"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinHeavyArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.0</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinHeavyArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinHeavyArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeDodgeChance>-0.15</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinHeavyArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinHeavyArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinFullArmor"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>14</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinFullArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinFullArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinFullArmor"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>-0.2</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinFullArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinFullArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinFullHelmet"
+			or defName="BMT_Apparel_ChitinBeetleHelmet"
+			or defName="BMT_Apparel_ChitinSpiderHelmet"]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinFullHelmet"
+			or defName="BMT_Apparel_ChitinBeetleHelmet"
+			or defName="BMT_Apparel_ChitinSpiderHelmet"] </xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Misc/CE_DamageDef.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Misc/CE_DamageDef.xml
new file mode 100644
index 0000000000..1c8d5bf7f1
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Misc/CE_DamageDef.xml	
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Buffing -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="BMT_BloodSuck"]/additionalHediffs/li[hediff="BloodLoss"]/severityPerDamageDealt</xpath>
+		<value>
+			<severityPerDamageDealt>0.03</severityPerDamageDealt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Misc/Items_Resource_Stuff.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Misc/Items_Resource_Stuff.xml
new file mode 100644
index 0000000000..3feed2f8f3
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Misc/Items_Resource_Stuff.xml	
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ======== bulk  ======== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_AmbrosyxShroom"]/statBases</xpath>
+		<value>
+			<Bulk>0.05</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_GlowGoo"]/statBases</xpath>
+		<value>
+			<Bulk>0.05</Bulk>
+		</value>
+	</Operation>
+
+	<!-- ======== Red, Crystal and Mushroom Wood ======== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_MushroomLog"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.99</cooldownTime>
+					<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_MushroomLog"]</xpath>
+		<value>
+			<li Class="CombatExtended.StuffToughnessMultiplierExtensionCE">
+				<toughnessMultiplier>4</toughnessMultiplier>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_MushroomLog"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.2</MeleeCritChance>
+				<MeleeParryChance>1</MeleeParryChance>
+				<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_MushroomLog"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<Bulk>0.07</Bulk>
+			<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
+			<StuffPower_Armor_Sharp>0.1</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_MushroomLog"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.2</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_MushroomLog"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.025</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_AaroxisDendoria.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_AaroxisDendoria.xml
new file mode 100644
index 0000000000..62d5da0233
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_AaroxisDendoria.xml	
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Larvae -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_AaroxisDendoriaLarvae"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_AaroxisDendoriaLarvae"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.00</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_AaroxisDendoriaLarvae"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_AaroxisDendoriaPupa"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_AaroxisDendoriaPupa"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.00</MeleeDodgeChance>
+			<MeleeCritChance>0.00</MeleeCritChance>
+			<MeleeParryChance>0.00</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_AaroxisDendoriaPupa"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_AaroxisDendoria"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_AaroxisDendoria"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<!-- Atispec -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_AaroxisDendoria"]/tools</xpath>
+		<value>
+			<tools>
+
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_AcidSlug.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_AcidSlug.xml
new file mode 100644
index 0000000000..de1e21c46a
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_AcidSlug.xml	
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_AcidSlug"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Serpentine</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_AcidSlug"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_AcidSlug"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_AcidSlug"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_AcidSlug"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>acidic bite</label>
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>38</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>30</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
+					<armorPenetrationBlunt>40</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Basilisk.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Basilisk.xml
new file mode 100644
index 0000000000..dc53a8b0a8
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Basilisk.xml	
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_Basilisk"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_Basilisk"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+			<ArmorRating_Blunt>0.75</ArmorRating_Blunt>
+			<MeleeDodgeChance>0.01</MeleeDodgeChance>
+			<MeleeCritChance>0.20</MeleeCritChance>
+			<MeleeParryChance>0.28</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Basilisk"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<extraMeleeDamages>
+						<li>
+							<def>Stun</def>
+							<amount>6</amount>
+						</li>
+					</extraMeleeDamages>
+					<armorPenetrationSharp>5.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>6</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>5.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.1</chanceFactor>
+					<armorPenetrationBlunt>2.50</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>bite</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2.6</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+
+					<extraMeleeDamages>
+						<li>
+							<def>Stun</def>
+							<amount>6</amount>
+						</li>
+					</extraMeleeDamages>
+					<armorPenetrationSharp>7.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_BlooddropMoth.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_BlooddropMoth.xml
new file mode 100644
index 0000000000..c780ad2983
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_BlooddropMoth.xml	
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Larvae -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_BloodropLarvae"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_BloodropLarvae"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.00</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_BloodropLarvae"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandible</label>
+					<capacities>
+						<li>BMT_BloodSuck</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationSharp>1.0</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>3.5</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_BloodropPupa"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_BloodropPupa"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.00</MeleeDodgeChance>
+			<MeleeCritChance>0.00</MeleeCritChance>
+			<MeleeParryChance>0.00</MeleeParryChance>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_BloodropMoth"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_BloodropMoth"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+			<ArmorRating_Blunt>0.2</ArmorRating_Blunt>
+			<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Atispec -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_BloodropMoth"]/tools</xpath>
+		<value>
+			<tools>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>proboscis</label>
+					<capacities>
+						<li>BMT_BloodSuck</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>6.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Boommoth.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Boommoth.xml
new file mode 100644
index 0000000000..1aca3775dc
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Boommoth.xml	
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Larvae -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_Boomapillar"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_Boomapillar"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ShearableRenameable">
+				<compClass>CombatExtended.CompShearableRenameable</compClass>
+				<growthLabel>Secretion level</growthLabel>
+				<shearIntervalDays>3</shearIntervalDays>
+				<woolAmount>2</woolAmount>
+				<woolDef>FSX</woolDef>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_Boomapillar"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.00</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Boomapillar"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_BoomPupa"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_BoomPupa"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.00</MeleeDodgeChance>
+			<MeleeCritChance>0.00</MeleeCritChance>
+			<MeleeParryChance>0.00</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_BoomMoth"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_BoomMoth"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_BoomMoth"]/tools</xpath>
+		<value>
+			<tools>
+
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_BovineBeetle.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_BovineBeetle.xml
new file mode 100644
index 0000000000..d21d6d077c
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_BovineBeetle.xml	
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Larvae -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_BovineBeetleLarvae"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_BovineBeetleLarvae"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.00</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_BovineBeetleLarvae"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_BovineBeetlePupa"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_BovineBeetlePupa"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.00</MeleeDodgeChance>
+			<MeleeCritChance>0.00</MeleeCritChance>
+			<MeleeParryChance>0.00</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_BovineBeetlePupa"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_BovineBeetle"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_BovineBeetle"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.24</MeleeCritChance>
+			<MeleeParryChance>0.13</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_BovineBeetle"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Mandibles</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<chanceFactor>0.7</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>2.9</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_CaveCricket.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_CaveCricket.xml
new file mode 100644
index 0000000000..71f7a6d285
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_CaveCricket.xml	
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_CaveCricket"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_CaveCricket"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.12</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_CaveCricket"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_CaveCricket"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_CaveCricket"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.34</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_CaveSpider.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_CaveSpider.xml
new file mode 100644
index 0000000000..20e6a213e8
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_CaveSpider.xml	
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_CaveSpider"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_CaveSpider"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_CaveSpider"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12.0</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_CaveSpider"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>7.0</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_CaveSpider"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>venom-fangs</label>
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>45</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_ChemSnail.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_ChemSnail.xml
new file mode 100644
index 0000000000..eaffa99a5c
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_ChemSnail.xml	
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_ChemSnail"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Serpentine</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_ChemSnail"]/tradeTags</xpath>
+		<value>
+			<li>CE_AnimalBoom</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_ChemSnail"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ShearableRenameable">
+				<compClass>CombatExtended.CompShearableRenameable</compClass>
+				<growthLabel>Secretion level</growthLabel>
+				<shearIntervalDays>10</shearIntervalDays>
+				<woolAmount>6</woolAmount>
+				<woolDef>FSX</woolDef>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_ChemSnail"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+			<ArmorRating_Blunt>4</ArmorRating_Blunt>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_ChemSnail"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.97</cooldownTime>
+					<chanceFactor>0.2</chanceFactor>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_CrystalCrab.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_CrystalCrab.xml
new file mode 100644
index 0000000000..ccf38d620e
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_CrystalCrab.xml	
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="BMT_CrystalCrab_Base"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="BMT_CrystalCrab_Base"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.00</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>0.34</MeleeParryChance>
+			<ArmorRating_Blunt>30</ArmorRating_Blunt>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="BMT_CrystalCrab_Base"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claw</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>32</power>
+					<cooldownTime>3.1</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>6.55</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_CrystalFairyMole.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_CrystalFairyMole.xml
new file mode 100644
index 0000000000..faf64f25a9
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_CrystalFairyMole.xml	
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_CrystalFairyMole"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_CrystalFairyMole"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>8.15</ArmorRating_Sharp>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_CrystalFairyMole"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2.35</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>5</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2.35</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>5</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>13</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.54</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_CrystalMantis.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_CrystalMantis.xml
new file mode 100644
index 0000000000..dcf9d66aa2
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_CrystalMantis.xml	
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_CrystalMantis"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_CrystalMantis"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_CrystalMantis"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_CrystalMantis"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.12</MeleeDodgeChance>
+			<MeleeCritChance>0.34</MeleeCritChance>
+			<MeleeParryChance>0.4</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_CrystalMantis"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>48</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>BMT_FrontLeftScythe</linkedBodyPartsGroup>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>48</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>BMT_FrontRightScythe</linkedBodyPartsGroup>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.750</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.750</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_CrystalbackBeetle.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_CrystalbackBeetle.xml
new file mode 100644
index 0000000000..166fa9ef50
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_CrystalbackBeetle.xml	
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Larvae -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_CrystalBeetleLarvae"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_CrystalBeetleLarvae"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.00</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_CrystalBeetleLarvae"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>mandible</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationSharp>1.0</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_CrystalBeetlePupa"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_CrystalBeetlePupa"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.00</MeleeDodgeChance>
+			<MeleeCritChance>0.00</MeleeCritChance>
+			<MeleeParryChance>0.00</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_CrystalBeetlePupa"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_CrystalBeetle"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_CrystalBeetle"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.24</MeleeCritChance>
+			<MeleeParryChance>0.13</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_CrystalBeetle"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_CrystalBeetle"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_CrystalBeetle"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Mandibles</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<armorPenetrationSharp>8</armorPenetrationSharp>
+					<chanceFactor>0.7</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2.9</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Crystalope.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Crystalope.xml
new file mode 100644
index 0000000000..ba21ea828e
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Crystalope.xml	
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_Crystalope"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_Crystalope"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			<MeleeCritChance>0.07</MeleeCritChance>
+			<MeleeParryChance>0.16</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Crystalope"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5.0</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.2</cooldownTime>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.2</cooldownTime>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.2</cooldownTime>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.2</cooldownTime>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.8</cooldownTime>
+					<chanceFactor>0.5</chanceFactor>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_DarkAxolotl.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_DarkAxolotl.xml
new file mode 100644
index 0000000000..70ca842085
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_DarkAxolotl.xml	
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Lizard Doggo ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_DarkAxolotl"]</xpath>
+
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_DarkAxolotl"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.12</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0.04</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_DarkAxolotl"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.8</cooldownTime>
+					<armorPenetrationBlunt>0.400</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.55</armorPenetrationSharp>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.8</cooldownTime>
+					<armorPenetrationBlunt>0.400</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.55</armorPenetrationSharp>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.63</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.10</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.20</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.230</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_FacetMoth.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_FacetMoth.xml
new file mode 100644
index 0000000000..25dcd51bad
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_FacetMoth.xml	
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Larvae -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_FacetMothLarvae"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_FacetMothLarvae"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.00</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+			<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
+			<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_FacetMothLarvae"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_FacetMothLarvae"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_FacetMothLarvae"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>proboscis</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationSharp>1.0</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>3.5</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_FacetMothPupa"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_FacetMothPupa"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.00</MeleeDodgeChance>
+			<MeleeCritChance>0.00</MeleeCritChance>
+			<MeleeParryChance>0.00</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_FacetMothPupa"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_FacetMothPupa"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_FacetMoth"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_FacetMoth"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+			<ArmorRating_Blunt>0.3</ArmorRating_Blunt>
+			<ArmorRating_Sharp>2.2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_FacetMoth"]/tools</xpath>
+		<value>
+			<tools>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>proboscis</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>6.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_FireSalamander.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_FireSalamander.xml
new file mode 100644
index 0000000000..a75baad986
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_FireSalamander.xml	
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_FireSalamander"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_FireSalamander"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>3.00</ArmorRating_Sharp>
+			<ArmorRating_Blunt>3.00</ArmorRating_Blunt>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_FireSalamander"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.35</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>11</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>5</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.35</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>11</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>5</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>13</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.54</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_FoundryBeetle.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_FoundryBeetle.xml
new file mode 100644
index 0000000000..dcad4cd75d
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_FoundryBeetle.xml	
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Larvae -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_FoundryBeetleLarvae"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_FoundryBeetleLarvae"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.00</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_FoundryBeetleLarvae"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_FoundryBeetlePupa"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_FoundryBeetlePupa"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.00</MeleeDodgeChance>
+			<MeleeCritChance>0.00</MeleeCritChance>
+			<MeleeParryChance>0.00</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_FoundryBeetlePupa"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_FoundryBeetle"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_FoundryBeetle"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.24</MeleeCritChance>
+			<MeleeParryChance>0.13</MeleeParryChance>
+			<ArmorRating_Sharp>3.5</ArmorRating_Sharp>
+			<ArmorRating_Blunt>1.0</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_FoundryBeetle"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Head Claw</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<armorPenetrationSharp>9</armorPenetrationSharp>
+					<chanceFactor>0.7</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>2.9</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_FungalFerret.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_FungalFerret.xml
new file mode 100644
index 0000000000..7b640f4752
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_FungalFerret.xml	
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_FungalFerret"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_FungalFerret"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.36</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_FungalFerret"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.9</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.18</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.9</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.18</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_FungalWeevil.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_FungalWeevil.xml
new file mode 100644
index 0000000000..f66a85e524
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_FungalWeevil.xml	
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_FungalWeevil"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_FungalWeevil"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_FungalWeevil"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.65</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_FungalWeevil"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.03</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_FungalWeevil"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.65</cooldownTime>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_GiantSlug.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_GiantSlug.xml
new file mode 100644
index 0000000000..b2ef35a68f
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_GiantSlug.xml	
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_GiantSlug"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Serpentine</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_GiantSlug"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.00</MeleeDodgeChance>
+			<MeleeCritChance>0.5</MeleeCritChance>
+			<MeleeParryChance>0.16</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_GiantSlug"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>3.5</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>12</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_GiantSnail.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_GiantSnail.xml
new file mode 100644
index 0000000000..d6415cf5c7
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_GiantSnail.xml	
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_GiantSnail"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Serpentine</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_GiantSnail"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_GiantSnail"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4.0</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_GiantSnail"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12.0</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_GiantSnail"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.97</cooldownTime>
+					<chanceFactor>0.2</chanceFactor>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_GlowSlug.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_GlowSlug.xml
new file mode 100644
index 0000000000..89b0a83567
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_GlowSlug.xml	
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_GlowSlug"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Serpentine</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_GlowSlug"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.00</MeleeDodgeChance>
+			<MeleeCritChance>0.5</MeleeCritChance>
+			<MeleeParryChance>0.16</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_GlowSlug"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>3.5</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>12</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_GlowSnail.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_GlowSnail.xml
new file mode 100644
index 0000000000..c13611a69b
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_GlowSnail.xml	
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_GlowSnail"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Serpentine</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_GlowSnail"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_GlowSnail"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2.0</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_GlowSnail"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8.0</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_GlowSnail"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.97</cooldownTime>
+					<chanceFactor>0.2</chanceFactor>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_GoetoToad.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_GoetoToad.xml
new file mode 100644
index 0000000000..3215b65c12
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_GoetoToad.xml	
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_Goeto"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_Goeto"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.24</MeleeCritChance>
+			<MeleeParryChance>0.13</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Goeto"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<chanceFactor>0.7</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.9</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Jellypot.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Jellypot.xml
new file mode 100644
index 0000000000..d28a6679bb
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Jellypot.xml	
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Jellypot"]/statBases/MoveSpeed</xpath>
+
+		<value>
+			<MoveSpeed>2.0</MoveSpeed>
+			<MeleeDodgeChance>0.04</MeleeDodgeChance>
+			<MeleeCritChance>0.10</MeleeCritChance>
+			<MeleeParryChance>0.24</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Jellypot"]/statBases/ArmorRating_Blunt</xpath>
+
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Jellypot"]/statBases/ArmorRating_Sharp</xpath>
+
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Jellypot"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.97</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>4.79</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.32</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Jewelbug.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Jewelbug.xml
new file mode 100644
index 0000000000..910052f734
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Jewelbug.xml	
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_Jewelbug"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Jewelbug"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Jewelbug"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_Jewelbug"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.02</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Jewelbug"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_MagmaLizard.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_MagmaLizard.xml
new file mode 100644
index 0000000000..032bf9c489
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_MagmaLizard.xml	
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_MagmaLizard"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_MagmaLizard"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>0.11</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_MagmaLizard"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_MagmaLizard"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>1.85</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_MagmaLizard"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<armorPenetrationSharp>5</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<armorPenetrationSharp>5</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.4</chanceFactor>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<armorPenetrationSharp>12</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.350</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Maxolotl.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Maxolotl.xml
new file mode 100644
index 0000000000..2bbb2034f8
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Maxolotl.xml	
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_Maxolotl"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_Maxolotl"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>0.11</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_Maxolotl"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_Maxolotl"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>1.85</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Maxolotl"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.4</chanceFactor>
+					<armorPenetrationBlunt>16</armorPenetrationBlunt>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.350</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Megabat.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Megabat.xml
new file mode 100644
index 0000000000..51e96ea962
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Megabat.xml	
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_Megabat"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_Megabat"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			<MeleeCritChance>0.33</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Megabat"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left wing</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.24</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.7</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right wing</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.24</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.7</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>2.1</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.75</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<armorPenetrationBlunt>9</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Megapleura.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Megapleura.xml
new file mode 100644
index 0000000000..7c1e1838a8
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Megapleura.xml	
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Megapleura"]/statBases/MoveSpeed</xpath>
+
+		<value>
+			<MoveSpeed>7.5</MoveSpeed>
+			<MeleeDodgeChance>0.06</MeleeDodgeChance>
+			<MeleeCritChance>0.20</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Megapleura"]/statBases/ArmorRating_Blunt</xpath>
+
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Megapleura"]/statBases/ArmorRating_Sharp</xpath>
+
+		<value>
+			<ArmorRating_Sharp>3</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Megapleura"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>32</power>
+					<cooldownTime>2.52</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.6</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2.35</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_MetalloSnail.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_MetalloSnail.xml
new file mode 100644
index 0000000000..38410c3922
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_MetalloSnail.xml	
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_MetalloSnail"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Serpentine</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_MetalloSnail"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_MetalloSnail"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12.0</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_MetalloSnail"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>15.0</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_MetalloSnail"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.97</cooldownTime>
+					<chanceFactor>0.2</chanceFactor>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Mole.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Mole.xml
new file mode 100644
index 0000000000..e9f7135790
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Mole.xml	
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === bodyShape === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_Mole"]</xpath>
+
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_Mole"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.22</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="BMT_Mole"]/combatPower</xpath>
+		<value>
+			<combatPower>20</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Mole"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.91</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.198</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.91</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.198</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.49</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>1.440</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_MossBeetle.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_MossBeetle.xml
new file mode 100644
index 0000000000..f94ab2b782
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_MossBeetle.xml	
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Larvae -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_MossBeetleLarvae"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_MossBeetleLarvae"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.00</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_MossBeetleLarvae"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_MossBeetlePupa"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_MossBeetlePupa"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.00</MeleeDodgeChance>
+			<MeleeCritChance>0.00</MeleeCritChance>
+			<MeleeParryChance>0.00</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_MossBeetlePupa"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_MossBeetle"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_MossBeetle"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.24</MeleeCritChance>
+			<MeleeParryChance>0.13</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_MossBeetle"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Mandibles</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<chanceFactor>0.7</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2.9</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_MossFenec.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_MossFenec.xml
new file mode 100644
index 0000000000..b48b7ff797
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_MossFenec.xml	
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_MossyFennec"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_MossyFennec"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.36</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_MossyFennec"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.9</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.18</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.9</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.18</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Owlbear.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Owlbear.xml
new file mode 100644
index 0000000000..aecaae7876
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Owlbear.xml	
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_Owlbear"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_Owlbear"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.11</MeleeDodgeChance>
+			<MeleeCritChance>0.35</MeleeCritChance>
+			<MeleeParryChance>0.21</MeleeParryChance>
+			<ArmorRating_Blunt>1.65</ArmorRating_Blunt>
+			<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Owlbear"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>1.48</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>1.48</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>39</power>
+					<cooldownTime>1.95</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2.44</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Pillbug.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Pillbug.xml
new file mode 100644
index 0000000000..f7ff6b7b1c
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Pillbug.xml	
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Pillbug"]/statBases/MoveSpeed</xpath>
+
+		<value>
+			<MoveSpeed>2.3</MoveSpeed>
+			<MeleeDodgeChance>0.11</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.0</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Pillbug"]/race/baseHealthScale</xpath>
+
+		<value>
+			<baseHealthScale>0.3</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Pillbug"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.51</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.7</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Podworm.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Podworm.xml
new file mode 100644
index 0000000000..73e7640501
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Podworm.xml	
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_PodWorm"]/statBases/MoveSpeed</xpath>
+
+		<value>
+			<MoveSpeed>2.5</MoveSpeed>
+			<MeleeDodgeChance>0.04</MeleeDodgeChance>
+			<MeleeCritChance>0.10</MeleeCritChance>
+			<MeleeParryChance>0.24</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_PodWorm"]/statBases/ArmorRating_Blunt</xpath>
+
+		<value>
+			<ArmorRating_Blunt>4.65</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_PodWorm"]/statBases/ArmorRating_Sharp</xpath>
+
+		<value>
+			<ArmorRating_Sharp>2.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_PodWorm"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.97</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>4.79</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.32</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_RoyalRhino.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_RoyalRhino.xml
new file mode 100644
index 0000000000..869535914d
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_RoyalRhino.xml	
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Larvae -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_RoyalRhinoLarvae"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_RoyalRhinoLarvae"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.00</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_RoyalRhinoLarvae"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5.0</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_RoyalRhinoLarvae"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>5.0</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_RoyalRhinoLarvae"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>2.9</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_RoyalRhinoPupa"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_RoyalRhinoPupa"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.00</MeleeDodgeChance>
+			<MeleeCritChance>0.00</MeleeCritChance>
+			<MeleeParryChance>0.00</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_RoyalRhinoPupa"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>30.0</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_RoyalRhinoPupa"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>30.0</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_RoyalRhino"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_RoyalRhino"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.24</MeleeCritChance>
+			<MeleeParryChance>0.13</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_RoyalRhino"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>25.0</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_RoyalRhino"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>5.0</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_RoyalRhino"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Horn</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Stab</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<armorPenetrationSharp>16</armorPenetrationSharp>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<chanceFactor>0.7</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>2.9</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>9</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Mandibles</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<armorPenetrationSharp>12</armorPenetrationSharp>
+					<chanceFactor>0.7</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_ShatterjawBeetle.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_ShatterjawBeetle.xml
new file mode 100644
index 0000000000..d75c762865
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_ShatterjawBeetle.xml	
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Larvae -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_ShatterjawBeetleLarvae"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_ShatterjawBeetleLarvae"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.00</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_ShatterjawBeetleLarvae"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2.9</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_ShatterjawBeetlePupa"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_ShatterjawBeetlePupa"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.00</MeleeDodgeChance>
+			<MeleeCritChance>0.00</MeleeCritChance>
+			<MeleeParryChance>0.00</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_ShatterjawBeetlePupa"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_ShatterjawBeetlePupa"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_ShatterjawBeetle"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_ShatterjawBeetle"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.24</MeleeCritChance>
+			<MeleeParryChance>0.13</MeleeParryChance>
+			<ArmorRating_Sharp>12.5</ArmorRating_Sharp>
+			<ArmorRating_Blunt>2.0</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_ShatterjawBeetle"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>45</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+					<chanceFactor>0.7</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>2.9</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_SonarRabbit.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_SonarRabbit.xml
new file mode 100644
index 0000000000..b49b05b1c5
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_SonarRabbit.xml	
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_SonarRabbit"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_SonarRabbit"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.24</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_SonarRabbit"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Thrumbungus.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Thrumbungus.xml
new file mode 100644
index 0000000000..7e28fa39e9
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Thrumbungus.xml	
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_Thrumbungus"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_Thrumbungus"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.75</MeleeCritChance>
+			<MeleeParryChance>0.5</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Thrumbungus"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>21</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Thrumbungus"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Thrumbungus"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mushrooms</label>
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>46</power>
+					<cooldownTime>0.9</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>16</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>bite</label>
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>41</power>
+					<cooldownTime>0.9</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left paw</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>14</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right paw</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>14</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_TruffleMole.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_TruffleMole.xml
new file mode 100644
index 0000000000..07b695ca26
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_TruffleMole.xml	
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_TruffleMole"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_TruffleMole"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.07</MeleeDodgeChance>
+			<MeleeCritChance>0.06</MeleeCritChance>
+			<MeleeParryChance>0.08</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_TruffleMole"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.35</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>5</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.35</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>5</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.5</cooldownTime>
+					<chanceFactor>0.7</chanceFactor>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_WoollySpider.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_WoollySpider.xml
new file mode 100644
index 0000000000..b7540d29a1
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_WoollySpider.xml	
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_WoollySpider"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_WoollySpider"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.26</MeleeDodgeChance>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_WoollySpider"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.02</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_WoolyBat.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_WoolyBat.xml
new file mode 100644
index 0000000000..bf0529f276
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_WoolyBat.xml	
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_Woolybat"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_Woolybat"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.14</MeleeDodgeChance>
+			<MeleeCritChance>0.32</MeleeCritChance>
+			<MeleeParryChance>0.24</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Woolybat"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left wing</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.24</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right wing</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.24</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2.1</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.75</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Xyrion.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Xyrion.xml
new file mode 100644
index 0000000000..2dd09ade2b
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Xyrion.xml	
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BMT_Xyrion"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_Xyrion"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.07</MeleeDodgeChance>
+			<MeleeCritChance>0.06</MeleeCritChance>
+			<MeleeParryChance>0.08</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Xyrion"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.35</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>5</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.35</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>5</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.5</cooldownTime>
+					<chanceFactor>0.7</chanceFactor>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Yooka.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Yooka.xml
new file mode 100644
index 0000000000..f307af679d
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Yooka.xml	
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_Yooka"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.38</MeleeCritChance>
+			<MeleeParryChance>0.18</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Yooka"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/Weapons/CE_Boomshroom.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/Weapons/CE_Boomshroom.xml
new file mode 100644
index 0000000000..5697ce7e05
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/Weapons/CE_Boomshroom.xml	
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Proj_BMT_BoomSporeSac"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<explosionRadius>0.5</explosionRadius>
+				<damageDef>Flame</damageDef>
+				<damageAmountBase>10</damageAmountBase>
+				<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
+				<preExplosionSpawnChance>1</preExplosionSpawnChance>
+				<speed>10</speed>
+				<ai_IsIncendiary>true</ai_IsIncendiary>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Proj_BMT_BoomSporeSac"]</xpath>
+		<value>
+			<thingClass>CombatExtended.Projectile_FireTrail</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="BMT_BoomSpore"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_BoomSpore"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>1</damageAmountBase>
+				<explosiveDamageType>Flame</explosiveDamageType>
+				<explosiveRadius>0.5</explosiveRadius>
+				<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
+				<preExplosionSpawnChance>1</preExplosionSpawnChance>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BMT_BoomSpore</defName>
+		<statBases>
+			<Mass>0.6</Mass>
+			<Bulk>1.8</Bulk>
+			<MarketValue>3</MarketValue>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<label>throw firebomb</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<range>10</range>
+			<minRange>3</minRange>
+			<warmupTime>1.8</warmupTime>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<soundCast>ThrowMolotovCocktail</soundCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<defaultProjectile>Proj_BMT_BoomSporeSac</defaultProjectile>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_BoomSpore"]</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Body</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.75</cooldownTime>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/Weapons/CE_MushroomWine.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/Weapons/CE_MushroomWine.xml
new file mode 100644
index 0000000000..4d3b0d14d1
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/Weapons/CE_MushroomWine.xml	
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Give Wine Bulk and Melee tools. -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "BMT_MushroomWine"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_MushroomWine"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2.22</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>neck</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>3.33</cooldownTime>
+					<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Neck</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_MushroomWine"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.1</MeleeCritChance>
+				<MeleeParryChance>0.33</MeleeParryChance>
+				<MeleeDodgeChance>0.07</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/Weapons/CE_Thrumbungushroom.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/Weapons/CE_Thrumbungushroom.xml
new file mode 100644
index 0000000000..8be3e8e4cb
--- /dev/null
+++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/Weapons/CE_Thrumbungushroom.xml	
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Proj_BMT_ThrumbungusShroom"]</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Proj_BMT_ThrumbungusShroom"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<damageDef>ToxGas</damageDef>
+				<explosionRadius>1.1</explosionRadius>
+				<damageAmountBase>1</damageAmountBase>
+				<explosionDelay>100</explosionDelay>
+				<flyOverhead>false</flyOverhead>
+				<soundExplode>Explosion_Smoke</soundExplode>
+				<postExplosionGasType>RotStink</postExplosionGasType>
+				<postExplosionSpawnChance>1</postExplosionSpawnChance>
+				<postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
+			</projectile>
+		</value>
+	</Operation>
+
+	<!-- == Grenade == -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_ThrumbungusShroom"]</xpath>
+		<value>
+			<thingClass>CombatExtended.AmmoThing</thingClass>
+			<resourceReadoutPriority>First</resourceReadoutPriority>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="BMT_ThrumbungusShroom"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BMT_ThrumbungusShroom</defName>
+		<statBases>
+			<Mass>1</Mass>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<label>throw toxic shroom</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Proj_BMT_ThrumbungusShroom</defaultProjectile>
+			<range>12</range>
+			<warmupTime>1.8</warmupTime>
+			<soundCast>ThrowGrenade</soundCast>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+			<onlyManualCast>true</onlyManualCast>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_ThrumbungusShroom"]</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Body</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.75</cooldownTime>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Core/Patches/Biomes Core/Bodies_Core_CE.xml b/ModPatches/Biomes Core/Patches/Biomes Core/Bodies_Core_CE.xml
new file mode 100644
index 0000000000..6de9b9c28d
--- /dev/null
+++ b/ModPatches/Biomes Core/Patches/Biomes Core/Bodies_Core_CE.xml	
@@ -0,0 +1,308 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- beetle -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="BMT_BeetleLike"]//*[
+			def="Shell" or
+			def="Pronotum" or
+			def="InsectLeg"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="BMT_BeetleLike"]//*[
+			def="Shell" or
+			def="Pronotum" or
+			def="InsectHead" or
+			def="InsectMouth" or
+			def="InsectLeg"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="BMT_BeetleLikeWithStinger"]//*[
+			def="Shell" or
+			def="Pronotum" or
+			def="InsectLeg"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="BMT_BeetleLikeWithStinger"]//*[
+			def="Shell" or
+			def="Pronotum" or
+			def="InsectHead" or
+			def="InsectMouth" or
+			def="InsectLeg" or
+			def="BMT_Stinger"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<!-- spidew -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="BMT_GiantSpider"]//*[
+			def="Body" or
+			def="BMT_Cephalothorax" or
+			def="Pronotum" or
+			def="InsectNostril" or
+			def="Eye" or
+			def="BMT_SpiderAbdomen"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="BMT_GiantSpider"]//*[
+			def="InsectMouth" or
+			def="InsectNostril" or
+			def="Eye"]/groups
+		</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="BMT_GiantSpider"]//*[
+			def="Body" or
+			def="BMT_Cephalothorax" or
+			def="Pronotum" or
+			def="InsectHead" or
+			def="BMT_SpiderAbdomen" or
+			def="BMT_Spinneret"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- disgusting larvae -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="BMT_LarvaLike"]//*[
+			def="SnakeBody" or
+			def="Pronotum"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="BMT_LarvaLike"]//*[
+			def="SnakeBody" or
+			def="Pronotum" or
+			def="InsectHead" or
+			def="InsectMouth"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- cruel mantid -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="BMT_MantisLike"]/corePart/parts/li[def="InsectLeg"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="BMT_MantisLike"]/corePart/parts/li[def="InsectLeg"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="BMT_MantisLike"]/corePart/parts/li[def="InsectLeg"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="BMT_MantisLike"]//*[
+			def="Shell" or
+			def="Pronotum"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="BMT_MantisLike"]//*[
+			def="Shell" or
+			def="Pronotum" or
+			def="InsectHead" or
+			def="InsectMouth"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- some weird dinobird -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="BMT_QuadrupedWithWingsBeakAndTailWeapon"]//*[
+			def="Body" or
+			def="BMT_Osteoderm" or
+			def="Neck" or
+			def="Nose" or
+			def="Ear" or
+			def="Eye" or
+			def="Leg" or
+			def="BMT_Tail"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="BMT_QuadrupedWithWingsBeakAndTailWeapon"]//*[
+			def="Nose" or
+			def="Eye"]/groups
+		</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="BMT_QuadrupedWithWingsBeakAndTailWeapon"]//*[
+			def="Body" or
+			def="BMT_Osteoderm" or
+			def="Neck" or
+			def="Head" or
+			def="Ear" or
+			def="Paw" or
+			def="BMT_DinoBeak" or
+			def="Leg" or
+			def="BMT_Tail" or
+			def="BMT_TailWeapon"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- scorpion -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="BMT_Scorpion"]//*[
+			def="Shell" or
+			def="BMT_Cephalothorax" or
+			def="BMT_SpiderAbdomen"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="BMT_Scorpion"]//*[
+			def="Shell" or
+			def="BMT_Stinger" or
+			def="InsectHead" or
+			def="InsectMouth" or
+			def="BMT_Cephalothorax" or
+			def="BMT_SpiderAbdomen" or
+			def="FrontClaw"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="BiomesCore_Slug"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="BiomesCore_Slug"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="BiomesCore_Slug"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="BiomesCore_Slug"]/corePart/parts/li[def="SnakeHead"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="BiomesCore_Slug"]/corePart/parts/li[def="SnakeHead"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="BiomesCore_Slug"]/corePart/parts/li[def="SnakeHead"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="BiomesCore_Snail"]//*[
+			def="RWBLeftEyeStalk" or
+			def="RWBRightEyeStalk" or
+			def="Eye"]/groups
+		</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="BiomesCore_Snail"]//*[
+			def="Shell" or
+			def="RWBSnailFoot" or
+			def="RWBSnailMouth" or
+			def="Head"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Core/Patches/Biomes Core/CE_Biomes_Core_Leathers.xml b/ModPatches/Biomes Core/Patches/Biomes Core/CE_Biomes_Core_Leathers.xml
new file mode 100644
index 0000000000..9c8388a5d1
--- /dev/null
+++ b/ModPatches/Biomes Core/Patches/Biomes Core/CE_Biomes_Core_Leathers.xml	
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Crab leather -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BiomesCore_CrabShell"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.0</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BiomesCore_CrabShell"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.2</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!--greenchitin -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BiomesCore_GreenChitin"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.6</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BiomesCore_GreenChitin"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.6</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<!-- gray chitin -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_GrayChitin"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.4</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_GrayChitin"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.7</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- mollusk Leather -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Molluskshell"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.3</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Molluskshell"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.4</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- gastropoda stuff-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Leather_Gastropoda"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.03</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Leather_Gastropoda"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.032</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Leather_Amphibian"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.16</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Leather_Amphibian"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.09</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Leather_Magma"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.5</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_Leather_Magma"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.2</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- tough Leather-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BMT_ToughLeather"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.70</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BMT_ToughLeather"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.125</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- flamingo Leather-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BiomesIslands_Leather_Flamingo"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.04</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BiomesIslands_Leather_Flamingo"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.03</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biomes Core/Patches/Biomes Core/CE_Flamingo.xml b/ModPatches/Biomes Core/Patches/Biomes Core/CE_Flamingo.xml
new file mode 100644
index 0000000000..933563e788
--- /dev/null
+++ b/ModPatches/Biomes Core/Patches/Biomes Core/CE_Flamingo.xml	
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BiomesIslands_Flamingo"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BiomesIslands_Flamingo"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.24</MeleeDodgeChance>
+			<MeleeCritChance>0.03</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BiomesIslands_Flamingo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>12</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>4</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.68</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biotech Expansion - Mammalia/Patches/Biotech Expansion - Mammalia/BEMam_Hediffs_BodyParts.xml b/ModPatches/Biotech Expansion - Mammalia/Patches/Biotech Expansion - Mammalia/BEMam_Hediffs_BodyParts.xml
new file mode 100644
index 0000000000..e73ee3e058
--- /dev/null
+++ b/ModPatches/Biotech Expansion - Mammalia/Patches/Biotech Expansion - Mammalia/BEMam_Hediffs_BodyParts.xml	
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BTEMa_SharpClaws"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>8</power>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.18</armorPenetrationSharp>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<cooldownTime>1.4</cooldownTime>
+					<soundMeleeHit>MeleeHit_BionicSlash</soundMeleeHit>
+					<soundMeleeMiss>MeleeMiss_BionicSlash</soundMeleeMiss>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BTEMa_HeavyHooves"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<cooldownTime>2</cooldownTime>
+					<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
+					<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BTEMa_ElongatedFangs"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>bite</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<soundMeleeHit>MeleeHit_BionicSlash</soundMeleeHit>
+					<soundMeleeMiss>MeleeMiss_BionicSlash</soundMeleeMiss>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BTEMa_FerociousRazorTeeth"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>razor tooth</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>15</power>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<cooldownTime>2</cooldownTime>
+					<soundMeleeHit>MeleeHit_BionicSlash</soundMeleeHit>
+					<soundMeleeMiss>MeleeMiss_BionicSlash</soundMeleeMiss>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biotech Expansion - Mythic/Patches/Biotech Expansion - Mythic/BEM_AbilityDefs_Patch.xml b/ModPatches/Biotech Expansion - Mythic/Patches/Biotech Expansion - Mythic/BEM_AbilityDefs_Patch.xml
new file mode 100644
index 0000000000..7063fa3c9d
--- /dev/null
+++ b/ModPatches/Biotech Expansion - Mythic/Patches/Biotech Expansion - Mythic/BEM_AbilityDefs_Patch.xml	
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BTEMy_BrilliantBlast"]</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BTEMy_BrilliantBlast"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<explosionRadius>3</explosionRadius>
+				<damageDef>Bomb</damageDef>
+				<damageAmountBase>56</damageAmountBase>
+				<explosionDelay>0</explosionDelay>
+				<dropsCasings>false</dropsCasings>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<speed>80</speed>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BTEMy_Punish"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<damageDef>RangedStab</damageDef>
+				<speed>120</speed>
+				<damageAmountBase>20</damageAmountBase>
+				<armorPenetrationSharp>6</armorPenetrationSharp>
+				<armorPenetrationBlunt>6</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AbilityDef[defName="BTEMy_Punish"]/verbProperties/range</xpath>
+		<value>
+			<range>21</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AbilityDef[defName="BTEMy_BrilliantBlast"]/verbProperties/range</xpath>
+		<value>
+			<range>36</range>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biotech Expansion - Mythic/Patches/Biotech Expansion - Mythic/BEM_Hediffs_BodyParts.xml b/ModPatches/Biotech Expansion - Mythic/Patches/Biotech Expansion - Mythic/BEM_Hediffs_BodyParts.xml
new file mode 100644
index 0000000000..d1a0622d80
--- /dev/null
+++ b/ModPatches/Biotech Expansion - Mythic/Patches/Biotech Expansion - Mythic/BEM_Hediffs_BodyParts.xml	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BTEMy_BlazingClaws"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>15</power>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.22</armorPenetrationSharp>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<cooldownTime>1.4</cooldownTime>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>10</amount>
+							<chance>0.25</chance>
+						</li>
+					</extraMeleeDamages>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BTEMy_AdamantScales"]/stages/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ArmorRating_Sharp>6</ArmorRating_Sharp>
+				<ArmorRating_Blunt>9</ArmorRating_Blunt>
+				<ArmorRating_Heat>0.8</ArmorRating_Heat>
+				<PawnBeauty>1</PawnBeauty>
+			</statOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/LightMedium/LightMedium_ArmorBlunt.xml b/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/LightMedium/LightMedium_ArmorBlunt.xml
new file mode 100644
index 0000000000..ec06d0ca65
--- /dev/null
+++ b/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/LightMedium/LightMedium_ArmorBlunt.xml	
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BMU_MechBoost_Armor_LightMedium_Blunt"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<label>level 1</label>
+					<minSeverity>1</minSeverity>
+					<statOffsets>
+						<ArmorRating_Blunt>0.375</ArmorRating_Blunt>
+						<MoveSpeed>-0.0625</MoveSpeed>
+					</statOffsets>
+				</li>
+				<li>
+					<label>level 2</label>
+					<minSeverity>2</minSeverity>
+					<statOffsets>
+						<ArmorRating_Blunt>0.75</ArmorRating_Blunt>
+						<MoveSpeed>-0.125</MoveSpeed>
+					</statOffsets>
+				</li>
+				<li>
+					<label>level 3</label>
+					<minSeverity>3</minSeverity>
+					<statOffsets>
+						<ArmorRating_Blunt>1.125</ArmorRating_Blunt>
+						<MoveSpeed>-0.1875</MoveSpeed>
+					</statOffsets>
+				</li>
+				<li>
+					<label>level 4</label>
+					<minSeverity>4</minSeverity>
+					<statOffsets>
+						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+						<MoveSpeed>-0.250</MoveSpeed>
+					</statOffsets>
+				</li>
+				<li>
+					<label>level 5</label>
+					<minSeverity>5</minSeverity>
+					<statOffsets>
+						<ArmorRating_Blunt>1.875</ArmorRating_Blunt>
+						<MoveSpeed>-0.3125</MoveSpeed>
+					</statOffsets>
+				</li>
+				<li>
+					<label>level 6</label>
+					<minSeverity>6</minSeverity>
+					<statOffsets>
+						<ArmorRating_Blunt>2.25</ArmorRating_Blunt>
+						<MoveSpeed>-0.375</MoveSpeed>
+					</statOffsets>
+				</li>
+				<li>
+					<label>level 7</label>
+					<minSeverity>7</minSeverity>
+					<statOffsets>
+						<ArmorRating_Blunt>2.625</ArmorRating_Blunt>
+						<MoveSpeed>-0.4375</MoveSpeed>
+					</statOffsets>
+				</li>
+				<li>
+					<label>level 8</label>
+					<minSeverity>8</minSeverity>
+					<statOffsets>
+						<ArmorRating_Blunt>3.0</ArmorRating_Blunt>
+						<MoveSpeed>-0.5</MoveSpeed>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/LightMedium/LightMedium_ArmorSharp.xml b/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/LightMedium/LightMedium_ArmorSharp.xml
new file mode 100644
index 0000000000..94ba96b1b4
--- /dev/null
+++ b/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/LightMedium/LightMedium_ArmorSharp.xml	
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BMU_MechBoost_Armor_LightMedium_Sharp"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<label>level 1</label>
+					<minSeverity>1</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+						<MoveSpeed>-0.0625</MoveSpeed>
+					</statOffsets>
+				</li>
+				<li>
+					<label>level 2</label>
+					<minSeverity>2</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+						<MoveSpeed>-0.125</MoveSpeed>
+					</statOffsets>
+				</li>
+				<li>
+					<label>level 3</label>
+					<minSeverity>3</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
+						<MoveSpeed>-0.1875</MoveSpeed>
+					</statOffsets>
+				</li>
+				<li>
+					<label>level 4</label>
+					<minSeverity>4</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>1.0</ArmorRating_Sharp>
+						<MoveSpeed>-0.250</MoveSpeed>
+					</statOffsets>
+				</li>
+				<li>
+					<label>level 5</label>
+					<minSeverity>5</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>1.25</ArmorRating_Sharp>
+						<MoveSpeed>-0.3125</MoveSpeed>
+					</statOffsets>
+				</li>
+				<li>
+					<label>level 6</label>
+					<minSeverity>6</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+						<MoveSpeed>-0.375</MoveSpeed>
+					</statOffsets>
+				</li>
+				<li>
+					<label>level 7</label>
+					<minSeverity>7</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>1.75</ArmorRating_Sharp>
+						<MoveSpeed>-0.4375</MoveSpeed>
+					</statOffsets>
+				</li>
+				<li>
+					<label>level 8</label>
+					<minSeverity>8</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>2.0</ArmorRating_Sharp>
+						<MoveSpeed>-0.5</MoveSpeed>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/LightMedium/LightMedium_CombatMelee.xml b/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/LightMedium/LightMedium_CombatMelee.xml
new file mode 100644
index 0000000000..ab0917175d
--- /dev/null
+++ b/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/LightMedium/LightMedium_CombatMelee.xml	
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BMU_MechBoost_Armor_LightMedium_CombatMelee"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<label>level 1</label>
+					<minSeverity>1</minSeverity>
+					<statFactors>
+						<MeleeDamageFactor>1.05</MeleeDamageFactor>
+						<MeleeDodgeChance>1.025</MeleeDodgeChance>
+						<MeleeHitChance>1.025</MeleeHitChance>
+						<MeleeCritChance>1.025</MeleeCritChance>
+						<MeleeParryChance>1.025</MeleeParryChance>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 2</label>
+					<minSeverity>2</minSeverity>
+					<statFactors>
+						<MeleeDamageFactor>1.1</MeleeDamageFactor>
+						<MeleeDodgeChance>1.05</MeleeDodgeChance>
+						<MeleeHitChance>1.05</MeleeHitChance>
+						<MeleeCritChance>1.05</MeleeCritChance>
+						<MeleeParryChance>1.05</MeleeParryChance>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 3</label>
+					<minSeverity>3</minSeverity>
+					<statFactors>
+						<MeleeDamageFactor>1.15</MeleeDamageFactor>
+						<MeleeDodgeChance>1.075</MeleeDodgeChance>
+						<MeleeHitChance>1.075</MeleeHitChance>
+						<MeleeCritChance>1.075</MeleeCritChance>
+						<MeleeParryChance>1.075</MeleeParryChance>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 4</label>
+					<minSeverity>4</minSeverity>
+					<statFactors>
+						<MeleeDamageFactor>1.2</MeleeDamageFactor>
+						<MeleeDodgeChance>1.1</MeleeDodgeChance>
+						<MeleeHitChance>1.1</MeleeHitChance>
+						<MeleeCritChance>1.1</MeleeCritChance>
+						<MeleeParryChance>1.1</MeleeParryChance>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 5</label>
+					<minSeverity>5</minSeverity>
+					<statFactors>
+						<MeleeDamageFactor>1.25</MeleeDamageFactor>
+						<MeleeDodgeChance>1.125</MeleeDodgeChance>
+						<MeleeHitChance>1.125</MeleeHitChance>
+						<MeleeCritChance>1.125</MeleeCritChance>
+						<MeleeParryChance>1.125</MeleeParryChance>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 6</label>
+					<minSeverity>6</minSeverity>
+					<statFactors>
+						<MeleeDamageFactor>1.3</MeleeDamageFactor>
+						<MeleeDodgeChance>1.15</MeleeDodgeChance>
+						<MeleeHitChance>1.15</MeleeHitChance>
+						<MeleeCritChance>1.15</MeleeCritChance>
+						<MeleeParryChance>1.15</MeleeParryChance>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 7</label>
+					<minSeverity>7</minSeverity>
+					<statFactors>
+						<MeleeDamageFactor>1.35</MeleeDamageFactor>
+						<MeleeDodgeChance>1.175</MeleeDodgeChance>
+						<MeleeHitChance>1.175</MeleeHitChance>
+						<MeleeCritChance>1.175</MeleeCritChance>
+						<MeleeParryChance>1.175</MeleeParryChance>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 8</label>
+					<minSeverity>8</minSeverity>
+					<statFactors>
+						<MeleeDamageFactor>1.4</MeleeDamageFactor>
+						<MeleeDodgeChance>1.2</MeleeDodgeChance>
+						<MeleeHitChance>1.2</MeleeHitChance>
+						<MeleeCritChance>1.2</MeleeCritChance>
+						<MeleeParryChance>1.2</MeleeParryChance>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 9</label>
+					<minSeverity>9</minSeverity>
+					<statFactors>
+						<MeleeDamageFactor>1.45</MeleeDamageFactor>
+						<MeleeDodgeChance>1.225</MeleeDodgeChance>
+						<MeleeHitChance>1.225</MeleeHitChance>
+						<MeleeCritChance>1.225</MeleeCritChance>
+						<MeleeParryChance>1.225</MeleeParryChance>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 10</label>
+					<minSeverity>10</minSeverity>
+					<statFactors>
+						<MeleeDamageFactor>1.5</MeleeDamageFactor>
+						<MeleeDodgeChance>1.25</MeleeDodgeChance>
+						<MeleeHitChance>1.25</MeleeHitChance>
+						<MeleeCritChance>1.25</MeleeCritChance>
+						<MeleeParryChance>1.25</MeleeParryChance>
+					</statFactors>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/LightMedium/LightMedium_CombatRanged.xml b/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/LightMedium/LightMedium_CombatRanged.xml
new file mode 100644
index 0000000000..ac30b4eaf8
--- /dev/null
+++ b/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/LightMedium/LightMedium_CombatRanged.xml	
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BMU_MechBoost_Armor_LightMedium_CombatRanged"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<label>level 1</label>
+					<minSeverity>1</minSeverity>
+					<statFactors>
+						<ShootingAccuracyPawn>1.025</ShootingAccuracyPawn>
+						<AimingAccuracy>1.025</AimingAccuracy>
+						<AimingDelayFactor>0.975</AimingDelayFactor>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 2</label>
+					<minSeverity>2</minSeverity>
+					<statFactors>
+						<ShootingAccuracyPawn>1.05</ShootingAccuracyPawn>
+						<AimingAccuracy>1.05</AimingAccuracy>
+						<AimingDelayFactor>0.95</AimingDelayFactor>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 3</label>
+					<minSeverity>3</minSeverity>
+					<statFactors>
+						<ShootingAccuracyPawn>1.075</ShootingAccuracyPawn>
+						<AimingAccuracy>1.075</AimingAccuracy>
+						<AimingDelayFactor>0.925</AimingDelayFactor>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 4</label>
+					<minSeverity>4</minSeverity>
+					<statFactors>
+						<ShootingAccuracyPawn>1.1</ShootingAccuracyPawn>
+						<AimingAccuracy>1.1</AimingAccuracy>
+						<AimingDelayFactor>0.9</AimingDelayFactor>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 5</label>
+					<minSeverity>5</minSeverity>
+					<statFactors>
+						<ShootingAccuracyPawn>1.125</ShootingAccuracyPawn>
+						<AimingAccuracy>1.125</AimingAccuracy>
+						<AimingDelayFactor>0.875</AimingDelayFactor>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 6</label>
+					<minSeverity>6</minSeverity>
+					<statFactors>
+						<ShootingAccuracyPawn>1.15</ShootingAccuracyPawn>
+						<AimingAccuracy>1.15</AimingAccuracy>
+						<AimingDelayFactor>0.85</AimingDelayFactor>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 7</label>
+					<minSeverity>7</minSeverity>
+					<statFactors>
+						<ShootingAccuracyPawn>1.175</ShootingAccuracyPawn>
+						<AimingAccuracy>1.175</AimingAccuracy>
+						<AimingDelayFactor>0.825</AimingDelayFactor>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 8</label>
+					<minSeverity>8</minSeverity>
+					<statFactors>
+						<ShootingAccuracyPawn>1.2</ShootingAccuracyPawn>
+						<AimingAccuracy>1.2</AimingAccuracy>
+						<AimingDelayFactor>0.8</AimingDelayFactor>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 9</label>
+					<minSeverity>9</minSeverity>
+					<statFactors>
+						<ShootingAccuracyPawn>1.225</ShootingAccuracyPawn>
+						<AimingAccuracy>1.225</AimingAccuracy>
+						<AimingDelayFactor>0.775</AimingDelayFactor>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 10</label>
+					<minSeverity>10</minSeverity>
+					<statFactors>
+						<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
+						<AimingAccuracy>1.25</AimingAccuracy>
+						<AimingDelayFactor>0.75</AimingDelayFactor>
+					</statFactors>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/LightMedium/LightMedium_Default.xml b/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/LightMedium/LightMedium_Default.xml
new file mode 100644
index 0000000000..599469119c
--- /dev/null
+++ b/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/LightMedium/LightMedium_Default.xml	
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BMU_MechBoost_Armor_LightMedium_Default"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<label>level 1</label>
+					<minSeverity>1</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.2</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.3</ArmorRating_Blunt>
+					</statOffsets>
+					<capMods>
+						<li>
+							<capacity>Manipulation</capacity>
+							<offset>0.05</offset>
+						</li>
+						<li>
+							<capacity>Moving</capacity>
+							<offset>0.05</offset>
+						</li>
+					</capMods>
+				</li>
+				<li>
+					<label>level 2</label>
+					<minSeverity>2</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.4</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.6</ArmorRating_Blunt>
+					</statOffsets>
+					<capMods>
+						<li>
+							<capacity>Manipulation</capacity>
+							<offset>0.1</offset>
+						</li>
+						<li>
+							<capacity>Moving</capacity>
+							<offset>0.1</offset>
+						</li>
+					</capMods>
+				</li>
+				<li>
+					<label>level 3</label>
+					<minSeverity>3</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.6</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.9</ArmorRating_Blunt>
+					</statOffsets>
+					<capMods>
+						<li>
+							<capacity>Manipulation</capacity>
+							<offset>0.15</offset>
+						</li>
+						<li>
+							<capacity>Moving</capacity>
+							<offset>0.15</offset>
+						</li>
+					</capMods>
+				</li>
+				<li>
+					<label>level 4</label>
+					<minSeverity>4</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.8</ArmorRating_Sharp>
+						<ArmorRating_Blunt>1.2</ArmorRating_Blunt>
+					</statOffsets>
+					<capMods>
+						<li>
+							<capacity>Manipulation</capacity>
+							<offset>0.2</offset>
+						</li>
+						<li>
+							<capacity>Moving</capacity>
+							<offset>0.2</offset>
+						</li>
+					</capMods>
+				</li>
+				<li>
+					<label>level 5</label>
+					<minSeverity>5</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>1.0</ArmorRating_Sharp>
+						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+					</statOffsets>
+					<capMods>
+						<li>
+							<capacity>Manipulation</capacity>
+							<offset>0.25</offset>
+						</li>
+						<li>
+							<capacity>Moving</capacity>
+							<offset>0.25</offset>
+						</li>
+					</capMods>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/LightMedium/LightMedium_Defense.xml b/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/LightMedium/LightMedium_Defense.xml
new file mode 100644
index 0000000000..334112d374
--- /dev/null
+++ b/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/LightMedium/LightMedium_Defense.xml	
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BMU_MechBoost_Armor_LightMedium_ImpactDampener"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<label>level 1</label>
+					<minSeverity>1</minSeverity>
+					<statFactors>
+						<IncomingDamageFactor>0.95</IncomingDamageFactor>
+						<StaggerDurationFactor>0.9</StaggerDurationFactor>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 2</label>
+					<minSeverity>2</minSeverity>
+					<statFactors>
+						<IncomingDamageFactor>0.9</IncomingDamageFactor>
+						<StaggerDurationFactor>0.8</StaggerDurationFactor>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 3</label>
+					<minSeverity>3</minSeverity>
+					<statFactors>
+						<IncomingDamageFactor>0.85</IncomingDamageFactor>
+						<StaggerDurationFactor>0.7</StaggerDurationFactor>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 4</label>
+					<minSeverity>4</minSeverity>
+					<statFactors>
+						<IncomingDamageFactor>0.8</IncomingDamageFactor>
+						<StaggerDurationFactor>0.6</StaggerDurationFactor>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 5</label>
+					<minSeverity>5</minSeverity>
+					<statFactors>
+						<IncomingDamageFactor>0.75</IncomingDamageFactor>
+						<StaggerDurationFactor>0.5</StaggerDurationFactor>
+					</statFactors>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/LightMedium/LightMedium_EMPResistance.xml b/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/LightMedium/LightMedium_EMPResistance.xml
new file mode 100644
index 0000000000..060475a8e4
--- /dev/null
+++ b/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/LightMedium/LightMedium_EMPResistance.xml	
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BMU_MechBoost_Armor_LightMedium_EMPResistance"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<label>level 1</label>
+					<minSeverity>1</minSeverity>
+					<statOffsets>
+						<EMPResistance>0.125</EMPResistance>
+						<ArmorRating_Electric>0.125</ArmorRating_Electric>
+					</statOffsets>
+				</li>
+				<li>
+					<label>level 2</label>
+					<minSeverity>2</minSeverity>
+					<statOffsets>
+						<EMPResistance>0.25</EMPResistance>
+						<ArmorRating_Electric>0.25</ArmorRating_Electric>
+					</statOffsets>
+				</li>
+				<li>
+					<label>level 3</label>
+					<minSeverity>3</minSeverity>
+					<statOffsets>
+						<EMPResistance>0.375</EMPResistance>
+						<ArmorRating_Electric>0.375</ArmorRating_Electric>
+					</statOffsets>
+				</li>
+				<li>
+					<label>level 4</label>
+					<minSeverity>4</minSeverity>
+					<statOffsets>
+						<EMPResistance>0.5</EMPResistance>
+						<ArmorRating_Electric>0.5</ArmorRating_Electric>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/UltraHeavy/UltraHeavy_ArmorBlunt.xml b/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/UltraHeavy/UltraHeavy_ArmorBlunt.xml
new file mode 100644
index 0000000000..39d32b3c6e
--- /dev/null
+++ b/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/UltraHeavy/UltraHeavy_ArmorBlunt.xml	
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BMU_MechBoost_Armor_HeavyUltraHeavy_Blunt"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<label>level 1</label>
+					<minSeverity>1</minSeverity>
+					<statOffsets>
+						<ArmorRating_Blunt>1.0</ArmorRating_Blunt>
+						<MoveSpeed>-0.0625</MoveSpeed>
+					</statOffsets>
+				</li>
+				<li>
+					<label>level 2</label>
+					<minSeverity>2</minSeverity>
+					<statOffsets>
+						<ArmorRating_Blunt>2.0</ArmorRating_Blunt>
+						<MoveSpeed>-0.125</MoveSpeed>
+					</statOffsets>
+				</li>
+				<li>
+					<label>level 3</label>
+					<minSeverity>3</minSeverity>
+					<statOffsets>
+						<ArmorRating_Blunt>3.0</ArmorRating_Blunt>
+						<MoveSpeed>-0.1875</MoveSpeed>
+					</statOffsets>
+				</li>
+				<li>
+					<label>level 4</label>
+					<minSeverity>4</minSeverity>
+					<statOffsets>
+						<ArmorRating_Blunt>4.0</ArmorRating_Blunt>
+						<MoveSpeed>-0.250</MoveSpeed>
+					</statOffsets>
+				</li>
+				<li>
+					<label>level 5</label>
+					<minSeverity>5</minSeverity>
+					<statOffsets>
+						<ArmorRating_Blunt>5.0</ArmorRating_Blunt>
+						<MoveSpeed>-0.3125</MoveSpeed>
+					</statOffsets>
+				</li>
+				<li>
+					<label>level 6</label>
+					<minSeverity>6</minSeverity>
+					<statOffsets>
+						<ArmorRating_Blunt>6.0</ArmorRating_Blunt>
+						<MoveSpeed>-0.375</MoveSpeed>
+					</statOffsets>
+				</li>
+				<li>
+					<label>level 7</label>
+					<minSeverity>7</minSeverity>
+					<statOffsets>
+						<ArmorRating_Blunt>7.0</ArmorRating_Blunt>
+						<MoveSpeed>-0.4375</MoveSpeed>
+					</statOffsets>
+				</li>
+				<li>
+					<label>level 8</label>
+					<minSeverity>8</minSeverity>
+					<statOffsets>
+						<ArmorRating_Blunt>8.0</ArmorRating_Blunt>
+						<MoveSpeed>-0.5</MoveSpeed>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/UltraHeavy/UltraHeavy_ArmorSharp.xml b/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/UltraHeavy/UltraHeavy_ArmorSharp.xml
new file mode 100644
index 0000000000..f6a2df9c0b
--- /dev/null
+++ b/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/UltraHeavy/UltraHeavy_ArmorSharp.xml	
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BMU_MechBoost_Armor_HeavyUltraHeavy_Sharp"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<label>level 1</label>
+					<minSeverity>1</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+						<MoveSpeed>-0.0625</MoveSpeed>
+					</statOffsets>
+				</li>
+				<li>
+					<label>level 2</label>
+					<minSeverity>2</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>1.0</ArmorRating_Sharp>
+						<MoveSpeed>-0.125</MoveSpeed>
+					</statOffsets>
+				</li>
+				<li>
+					<label>level 3</label>
+					<minSeverity>3</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+						<MoveSpeed>-0.1875</MoveSpeed>
+					</statOffsets>
+				</li>
+				<li>
+					<label>level 4</label>
+					<minSeverity>4</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>2.0</ArmorRating_Sharp>
+						<MoveSpeed>-0.250</MoveSpeed>
+					</statOffsets>
+				</li>
+				<li>
+					<label>level 5</label>
+					<minSeverity>5</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
+						<MoveSpeed>-0.3125</MoveSpeed>
+					</statOffsets>
+				</li>
+				<li>
+					<label>level 6</label>
+					<minSeverity>6</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>3.0</ArmorRating_Sharp>
+						<MoveSpeed>-0.375</MoveSpeed>
+					</statOffsets>
+				</li>
+				<li>
+					<label>level 7</label>
+					<minSeverity>7</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>3.5</ArmorRating_Sharp>
+						<MoveSpeed>-0.4375</MoveSpeed>
+					</statOffsets>
+				</li>
+				<li>
+					<label>level 8</label>
+					<minSeverity>8</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>4.0</ArmorRating_Sharp>
+						<MoveSpeed>-0.5</MoveSpeed>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/UltraHeavy/UltraHeavy_CombatMelee.xml b/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/UltraHeavy/UltraHeavy_CombatMelee.xml
new file mode 100644
index 0000000000..767eb53b7d
--- /dev/null
+++ b/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/UltraHeavy/UltraHeavy_CombatMelee.xml	
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BMU_MechBoost_Armor_HeavyUltraHeavy_CombatMelee"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<label>level 1</label>
+					<minSeverity>1</minSeverity>
+					<statFactors>
+						<MeleeDamageFactor>1.05</MeleeDamageFactor>
+						<MeleeDodgeChance>1.025</MeleeDodgeChance>
+						<MeleeHitChance>1.025</MeleeHitChance>
+						<MeleeCritChance>1.025</MeleeCritChance>
+						<MeleeParryChance>1.025</MeleeParryChance>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 2</label>
+					<minSeverity>2</minSeverity>
+					<statFactors>
+						<MeleeDamageFactor>1.1</MeleeDamageFactor>
+						<MeleeDodgeChance>1.05</MeleeDodgeChance>
+						<MeleeHitChance>1.05</MeleeHitChance>
+						<MeleeCritChance>1.05</MeleeCritChance>
+						<MeleeParryChance>1.05</MeleeParryChance>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 3</label>
+					<minSeverity>3</minSeverity>
+					<statFactors>
+						<MeleeDamageFactor>1.15</MeleeDamageFactor>
+						<MeleeDodgeChance>1.075</MeleeDodgeChance>
+						<MeleeHitChance>1.075</MeleeHitChance>
+						<MeleeCritChance>1.075</MeleeCritChance>
+						<MeleeParryChance>1.075</MeleeParryChance>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 4</label>
+					<minSeverity>4</minSeverity>
+					<statFactors>
+						<MeleeDamageFactor>1.2</MeleeDamageFactor>
+						<MeleeDodgeChance>1.1</MeleeDodgeChance>
+						<MeleeHitChance>1.1</MeleeHitChance>
+						<MeleeCritChance>1.1</MeleeCritChance>
+						<MeleeParryChance>1.1</MeleeParryChance>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 5</label>
+					<minSeverity>5</minSeverity>
+					<statFactors>
+						<MeleeDamageFactor>1.25</MeleeDamageFactor>
+						<MeleeDodgeChance>1.125</MeleeDodgeChance>
+						<MeleeHitChance>1.125</MeleeHitChance>
+						<MeleeCritChance>1.125</MeleeCritChance>
+						<MeleeParryChance>1.125</MeleeParryChance>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 6</label>
+					<minSeverity>6</minSeverity>
+					<statFactors>
+						<MeleeDamageFactor>1.3</MeleeDamageFactor>
+						<MeleeDodgeChance>1.15</MeleeDodgeChance>
+						<MeleeHitChance>1.15</MeleeHitChance>
+						<MeleeCritChance>1.15</MeleeCritChance>
+						<MeleeParryChance>1.15</MeleeParryChance>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 7</label>
+					<minSeverity>7</minSeverity>
+					<statFactors>
+						<MeleeDamageFactor>1.35</MeleeDamageFactor>
+						<MeleeDodgeChance>1.175</MeleeDodgeChance>
+						<MeleeHitChance>1.175</MeleeHitChance>
+						<MeleeCritChance>1.175</MeleeCritChance>
+						<MeleeParryChance>1.175</MeleeParryChance>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 8</label>
+					<minSeverity>8</minSeverity>
+					<statFactors>
+						<MeleeDamageFactor>1.4</MeleeDamageFactor>
+						<MeleeDodgeChance>1.2</MeleeDodgeChance>
+						<MeleeHitChance>1.2</MeleeHitChance>
+						<MeleeCritChance>1.2</MeleeCritChance>
+						<MeleeParryChance>1.2</MeleeParryChance>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 9</label>
+					<minSeverity>9</minSeverity>
+					<statFactors>
+						<MeleeDamageFactor>1.45</MeleeDamageFactor>
+						<MeleeDodgeChance>1.225</MeleeDodgeChance>
+						<MeleeHitChance>1.225</MeleeHitChance>
+						<MeleeCritChance>1.225</MeleeCritChance>
+						<MeleeParryChance>1.225</MeleeParryChance>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 10</label>
+					<minSeverity>10</minSeverity>
+					<statFactors>
+						<MeleeDamageFactor>1.5</MeleeDamageFactor>
+						<MeleeDodgeChance>1.25</MeleeDodgeChance>
+						<MeleeHitChance>1.25</MeleeHitChance>
+						<MeleeCritChance>1.25</MeleeCritChance>
+						<MeleeParryChance>1.25</MeleeParryChance>
+					</statFactors>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/UltraHeavy/UltraHeavy_CombatRanged.xml b/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/UltraHeavy/UltraHeavy_CombatRanged.xml
new file mode 100644
index 0000000000..dc9a8c4f08
--- /dev/null
+++ b/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/UltraHeavy/UltraHeavy_CombatRanged.xml	
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BMU_MechBoost_Armor_HeavyUltraHeavy_CombatRanged"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<label>level 1</label>
+					<minSeverity>1</minSeverity>
+					<statFactors>
+						<ShootingAccuracyPawn>1.025</ShootingAccuracyPawn>
+						<AimingAccuracy>1.025</AimingAccuracy>
+						<AimingDelayFactor>0.975</AimingDelayFactor>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 2</label>
+					<minSeverity>2</minSeverity>
+					<statFactors>
+						<ShootingAccuracyPawn>1.05</ShootingAccuracyPawn>
+						<AimingAccuracy>1.05</AimingAccuracy>
+						<AimingDelayFactor>0.95</AimingDelayFactor>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 3</label>
+					<minSeverity>3</minSeverity>
+					<statFactors>
+						<ShootingAccuracyPawn>1.075</ShootingAccuracyPawn>
+						<AimingAccuracy>1.075</AimingAccuracy>
+						<AimingDelayFactor>0.925</AimingDelayFactor>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 4</label>
+					<minSeverity>4</minSeverity>
+					<statFactors>
+						<ShootingAccuracyPawn>1.1</ShootingAccuracyPawn>
+						<AimingAccuracy>1.1</AimingAccuracy>
+						<AimingDelayFactor>0.9</AimingDelayFactor>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 5</label>
+					<minSeverity>5</minSeverity>
+					<statFactors>
+						<ShootingAccuracyPawn>1.125</ShootingAccuracyPawn>
+						<AimingAccuracy>1.125</AimingAccuracy>
+						<AimingDelayFactor>0.875</AimingDelayFactor>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 6</label>
+					<minSeverity>6</minSeverity>
+					<statFactors>
+						<ShootingAccuracyPawn>1.15</ShootingAccuracyPawn>
+						<AimingAccuracy>1.15</AimingAccuracy>
+						<AimingDelayFactor>0.85</AimingDelayFactor>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 7</label>
+					<minSeverity>7</minSeverity>
+					<statFactors>
+						<ShootingAccuracyPawn>1.175</ShootingAccuracyPawn>
+						<AimingAccuracy>1.175</AimingAccuracy>
+						<AimingDelayFactor>0.825</AimingDelayFactor>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 8</label>
+					<minSeverity>8</minSeverity>
+					<statFactors>
+						<ShootingAccuracyPawn>1.2</ShootingAccuracyPawn>
+						<AimingAccuracy>1.2</AimingAccuracy>
+						<AimingDelayFactor>0.8</AimingDelayFactor>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 9</label>
+					<minSeverity>9</minSeverity>
+					<statFactors>
+						<ShootingAccuracyPawn>1.225</ShootingAccuracyPawn>
+						<AimingAccuracy>1.225</AimingAccuracy>
+						<AimingDelayFactor>0.775</AimingDelayFactor>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 10</label>
+					<minSeverity>10</minSeverity>
+					<statFactors>
+						<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
+						<AimingAccuracy>1.25</AimingAccuracy>
+						<AimingDelayFactor>0.75</AimingDelayFactor>
+					</statFactors>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/UltraHeavy/UltraHeavy_Default.xml b/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/UltraHeavy/UltraHeavy_Default.xml
new file mode 100644
index 0000000000..1fd9e48f30
--- /dev/null
+++ b/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/UltraHeavy/UltraHeavy_Default.xml	
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BMU_MechBoost_Armor_HeavyUltraHeavy_Default"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<label>level 1</label>
+					<minSeverity>1</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.2</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.3</ArmorRating_Blunt>
+					</statOffsets>
+					<capMods>
+						<li>
+							<capacity>Manipulation</capacity>
+							<offset>0.05</offset>
+						</li>
+						<li>
+							<capacity>Moving</capacity>
+							<offset>0.05</offset>
+						</li>
+					</capMods>
+				</li>
+				<li>
+					<label>level 2</label>
+					<minSeverity>2</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.4</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.6</ArmorRating_Blunt>
+					</statOffsets>
+					<capMods>
+						<li>
+							<capacity>Manipulation</capacity>
+							<offset>0.1</offset>
+						</li>
+						<li>
+							<capacity>Moving</capacity>
+							<offset>0.1</offset>
+						</li>
+					</capMods>
+				</li>
+				<li>
+					<label>level 3</label>
+					<minSeverity>3</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.6</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.9</ArmorRating_Blunt>
+					</statOffsets>
+					<capMods>
+						<li>
+							<capacity>Manipulation</capacity>
+							<offset>0.15</offset>
+						</li>
+						<li>
+							<capacity>Moving</capacity>
+							<offset>0.15</offset>
+						</li>
+					</capMods>
+				</li>
+				<li>
+					<label>level 4</label>
+					<minSeverity>4</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.8</ArmorRating_Sharp>
+						<ArmorRating_Blunt>1.2</ArmorRating_Blunt>
+					</statOffsets>
+					<capMods>
+						<li>
+							<capacity>Manipulation</capacity>
+							<offset>0.2</offset>
+						</li>
+						<li>
+							<capacity>Moving</capacity>
+							<offset>0.2</offset>
+						</li>
+					</capMods>
+				</li>
+				<li>
+					<label>level 5</label>
+					<minSeverity>5</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>1.0</ArmorRating_Sharp>
+						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+					</statOffsets>
+					<capMods>
+						<li>
+							<capacity>Manipulation</capacity>
+							<offset>0.25</offset>
+						</li>
+						<li>
+							<capacity>Moving</capacity>
+							<offset>0.25</offset>
+						</li>
+					</capMods>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/UltraHeavy/UltraHeavy_Defense.xml b/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/UltraHeavy/UltraHeavy_Defense.xml
new file mode 100644
index 0000000000..5024d046f6
--- /dev/null
+++ b/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/UltraHeavy/UltraHeavy_Defense.xml	
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BMU_MechBoost_Armor_HeavyUltraHeavy_ImpactDampener"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<label>level 1</label>
+					<minSeverity>1</minSeverity>
+					<statFactors>
+						<IncomingDamageFactor>0.95</IncomingDamageFactor>
+						<StaggerDurationFactor>0.9</StaggerDurationFactor>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 2</label>
+					<minSeverity>2</minSeverity>
+					<statFactors>
+						<IncomingDamageFactor>0.9</IncomingDamageFactor>
+						<StaggerDurationFactor>0.8</StaggerDurationFactor>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 3</label>
+					<minSeverity>3</minSeverity>
+					<statFactors>
+						<IncomingDamageFactor>0.85</IncomingDamageFactor>
+						<StaggerDurationFactor>0.7</StaggerDurationFactor>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 4</label>
+					<minSeverity>4</minSeverity>
+					<statFactors>
+						<IncomingDamageFactor>0.8</IncomingDamageFactor>
+						<StaggerDurationFactor>0.6</StaggerDurationFactor>
+					</statFactors>
+				</li>
+				<li>
+					<label>level 5</label>
+					<minSeverity>5</minSeverity>
+					<statFactors>
+						<IncomingDamageFactor>0.75</IncomingDamageFactor>
+						<StaggerDurationFactor>0.5</StaggerDurationFactor>
+					</statFactors>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/UltraHeavy/UltraHeavy_EMPResistance.xml b/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/UltraHeavy/UltraHeavy_EMPResistance.xml
new file mode 100644
index 0000000000..804daa3bf9
--- /dev/null
+++ b/ModPatches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/UltraHeavy/UltraHeavy_EMPResistance.xml	
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BMU_MechBoost_Armor_HeavyUltraHeavy_EMPResistance"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<label>level 1</label>
+					<minSeverity>1</minSeverity>
+					<statOffsets>
+						<EMPResistance>0.125</EMPResistance>
+						<ArmorRating_Electric>0.125</ArmorRating_Electric>
+					</statOffsets>
+				</li>
+				<li>
+					<label>level 2</label>
+					<minSeverity>2</minSeverity>
+					<statOffsets>
+						<EMPResistance>0.25</EMPResistance>
+						<ArmorRating_Electric>0.25</ArmorRating_Electric>
+					</statOffsets>
+				</li>
+				<li>
+					<label>level 3</label>
+					<minSeverity>3</minSeverity>
+					<statOffsets>
+						<EMPResistance>0.375</EMPResistance>
+						<ArmorRating_Electric>0.375</ArmorRating_Electric>
+					</statOffsets>
+				</li>
+				<li>
+					<label>level 4</label>
+					<minSeverity>4</minSeverity>
+					<statOffsets>
+						<EMPResistance>0.5</EMPResistance>
+						<ArmorRating_Electric>0.5</ArmorRating_Electric>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Biotech Prestige Mechlord Armor 1.4/Patches/Biotech Prestige Mechlord Armor 1.4/Apparel_Mech.xml b/ModPatches/Biotech Prestige Mechlord Armor 1.4/Patches/Biotech Prestige Mechlord Armor 1.4/Apparel_Mech.xml
new file mode 100644
index 0000000000..b8a5ad3699
--- /dev/null
+++ b/ModPatches/Biotech Prestige Mechlord Armor 1.4/Patches/Biotech Prestige Mechlord Armor 1.4/Apparel_Mech.xml	
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Prestige Mechlord Suit ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_PrestigeMechlordSuit"]/statBases</xpath>
+		<value>
+			<Bulk>90</Bulk>
+			<WornBulk>13</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PrestigeMechlordSuit"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PrestigeMechlordSuit"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>34</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ========== Prestige Mechlord Helmet ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_ArmorHelmetPrestigeMechlordHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_ArmorHelmetPrestigeMechlordHelmet"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_ArmorHelmetPrestigeMechlordHelmet"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>26</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ========== Prestige Mechcommander Helmet ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_ArmorHelmetPrestigeMechCommander"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ArmorHelmetPrestigeMechCommander"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ArmorHelmetPrestigeMechCommander"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Birds Beyond - Temperate Forest/Patches/Birds Beyond - Temperate Forest/Races_Animal_Birds.xml b/ModPatches/Birds Beyond - Temperate Forest/Patches/Birds Beyond - Temperate Forest/Races_Animal_Birds.xml
new file mode 100644
index 0000000000..3c866ce4f2
--- /dev/null
+++ b/ModPatches/Birds Beyond - Temperate Forest/Patches/Birds Beyond - Temperate Forest/Races_Animal_Birds.xml	
@@ -0,0 +1,274 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ================== Barn Owl ===================-->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BB_BarnOwl"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BB_BarnOwl"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.24</MeleeDodgeChance>
+			<MeleeCritChance>0.03</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BB_BarnOwl"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>talons</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>beak</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.20</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>20</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.30</armorPenetrationBlunt>
+					<chanceFactor>0.8</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ================== Eagle Owl ===================-->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BB_EagleOwl"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BB_EagleOwl"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.24</MeleeDodgeChance>
+			<MeleeCritChance>0.03</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BB_EagleOwl"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>talons</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>beak</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.20</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>20</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.30</armorPenetrationBlunt>
+					<chanceFactor>0.8</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ================== Kestrel ===================-->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BB_Kestrel"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BB_Kestrel"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.24</MeleeDodgeChance>
+			<MeleeCritChance>0.03</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BB_Kestrel"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>talons</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>beak</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.20</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>20</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.30</armorPenetrationBlunt>
+					<chanceFactor>0.8</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ================== Crow ===================-->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BB_Crow"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BB_Crow"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.24</MeleeDodgeChance>
+			<MeleeCritChance>0.03</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BB_Crow"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>talons</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>beak</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.20</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>20</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.30</armorPenetrationBlunt>
+					<chanceFactor>0.8</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Black Widows/Patches/Black Widows/BodyDefs/Patch_BlackWidow_Body.xml b/ModPatches/Black Widows/Patches/Black Widows/BodyDefs/Patch_BlackWidow_Body.xml
new file mode 100644
index 0000000000..4e9d18ad97
--- /dev/null
+++ b/ModPatches/Black Widows/Patches/Black Widows/BodyDefs/Patch_BlackWidow_Body.xml	
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ======== Black Widow alien race. ======== -->
+	<!-- ==== Natural armor coverage. ==== -->
+	<!-- The torso and some of its children. -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "BlackWidow"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "BlackWidow"]/corePart/parts/li[def = "BlackWidow_Waist"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "BlackWidow"]/corePart/parts/li[def = "BlackWidow_Abdomen"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- The head. -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "BlackWidow"]/corePart/parts/li[def = "Neck"]/parts/li[def = "Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- ==== Know your left and right arms. ==== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "BlackWidow"]/corePart/parts/li[def = "BWTLShoulder" or def = "BWBLShoulder"]/parts/li[customLabel = "left arm" or customLabel = "left pedipalp"]/groups</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "BlackWidow"]/corePart/parts/li[def = "BWTRShoulder" or def = "BWBRShoulder"]/parts/li[customLabel = "right arm" or customLabel = "right pedipalp"]/groups</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "BlackWidow"]/corePart/parts/li[def = "BWTLShoulder" or def = "BWBLShoulder"]/groups</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "BlackWidow"]/corePart/parts/li[def = "BWTRShoulder" or def = "BWBRShoulder"]/groups</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Black Widows/Patches/Black Widows/BodyPartDefs/Patch_BlackWidows_Bodyparts.xml b/ModPatches/Black Widows/Patches/Black Widows/BodyPartDefs/Patch_BlackWidows_Bodyparts.xml
new file mode 100644
index 0000000000..3b6c015375
--- /dev/null
+++ b/ModPatches/Black Widows/Patches/Black Widows/BodyPartDefs/Patch_BlackWidows_Bodyparts.xml	
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==== BionicPedipalp ==== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "BionicRightPedipalp" or defName = "BionicLeftPedipalp"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>bionic pedipalp</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.29</cooldownTime>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.484</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ==== BlackWidowShredderLeg ==== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "BlackWidowShredderLeg"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shredder leg</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>33</power>
+					<cooldownTime>2.13</cooldownTime>
+					<armorPenetrationSharp>3.63</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.63</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ==== BlackWidowSleipnirArm ==== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "BlackWidowSleipnirArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.08</cooldownTime>
+					<armorPenetrationBlunt>2.723</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Black Widows/Patches/Black Widows/PawnKindDefs/Patch_PawnKinds_BlackWidow.xml b/ModPatches/Black Widows/Patches/Black Widows/PawnKindDefs/Patch_PawnKinds_BlackWidow.xml
new file mode 100644
index 0000000000..7ac2ce30eb
--- /dev/null
+++ b/ModPatches/Black Widows/Patches/Black Widows/PawnKindDefs/Patch_PawnKinds_BlackWidow.xml	
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ======== Black Widow faction. ======== -->
+	<!-- ==== BlackWidowMatron ==== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="BlackWidowMatron"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>999999</min>
+					<max>3000000</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.9</shieldChance>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ==== BlackWidowTrader ==== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="BlackWidowTrader"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>1</min>
+					<max>3</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>100</min>
+					<max>200</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.6</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>50</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ==== BlackWidowReaver ==== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="BlackWidowReaver"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>300</min>
+					<max>800</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.8</shieldChance>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ==== BlackWidowSniper ==== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="BlackWidowSniper"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>2000</min>
+					<max>3000</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.2</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>1000</min>
+							<max>2000</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ==== BlackWidowSlasher ==== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="BlackWidowSlasher"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>400</min>
+					<max>999999</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.8</shieldChance>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ==== BlackWidowGrenadier ==== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="BlackWidowGrenadier"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>10</min>
+					<max>30</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>250</min>
+					<max>1000</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>200</min>
+						<max>600</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Melee</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Black Widows/Patches/Black Widows/ThingDefs_Buildings/Patch_Buildings_Widows.xml b/ModPatches/Black Widows/Patches/Black Widows/ThingDefs_Buildings/Patch_Buildings_Widows.xml
new file mode 100644
index 0000000000..fdf6246c9d
--- /dev/null
+++ b/ModPatches/Black Widows/Patches/Black Widows/ThingDefs_Buildings/Patch_Buildings_Widows.xml	
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==== Turret_BWWebcannon ==== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Turret_BWWebcannon"]/statBases</xpath>
+		<value>
+			<Bulk>200</Bulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Turret_BWWebcannon"]</xpath>
+		<value>
+			<tradeTags>
+				<li>CE_Turret</li>
+			</tradeTags>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Turret_BWWebcannon"]/researchPrerequisites</xpath>
+		<value>
+			<researchPrerequisites>
+				<li>GunTurrets</li>
+			</researchPrerequisites>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Black Widows/Patches/Black Widows/ThingDefs_Items/Patch_Items_Resources.xml b/ModPatches/Black Widows/Patches/Black Widows/ThingDefs_Items/Patch_Items_Resources.xml
new file mode 100644
index 0000000000..e6a6d4ccb8
--- /dev/null
+++ b/ModPatches/Black Widows/Patches/Black Widows/ThingDefs_Items/Patch_Items_Resources.xml	
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==== WidowSilk ==== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WidowSilk"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.3</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WidowSilk"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.06</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WidowSilk"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<!-- ==== ThroneSilk ==== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ThroneSilk"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.5</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ThroneSilk"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ThroneSilk"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<!-- ==== AbyssSilk ==== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AbyssSilk"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.7</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AbyssSilk"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.14</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AbyssSilk"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<!-- ==== WidowSilk, ThroneSilk, AbyssSilk new thingCategory ==== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WidowSilk" or defName="ThroneSilk" or defName="AbyssSilk"]/stuffProps/categories</xpath>
+		<value>
+			<li>SoftArmor</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Black Widows/Patches/Black Widows/ThingDefs_Misc/Patch_Apparel_Various.xml b/ModPatches/Black Widows/Patches/Black Widows/ThingDefs_Misc/Patch_Apparel_Various.xml
new file mode 100644
index 0000000000..d55e666445
--- /dev/null
+++ b/ModPatches/Black Widows/Patches/Black Widows/ThingDefs_Misc/Patch_Apparel_Various.xml	
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==== Apparel_HoverThrone ==== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparel_HoverThrone"]/statBases/Mass</xpath>
+		<value>
+			<Mass>8</Mass>
+			<Bulk>60</Bulk>
+			<WornBulk>8</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- ==== Apparel_BWSpiderFurs ==== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparel_BWSpiderFurs"]/statBases/Mass</xpath>
+		<value>
+			<Mass>4</Mass>
+			<Bulk>40</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- ==== Apparel_MAGISuit ==== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparel_MAGISuit"]/statBases/Mass</xpath>
+		<value>
+			<Mass>40</Mass>
+			<Bulk>80</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparel_MAGISuit"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparel_MAGISuit"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>40.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparel_MAGISuit"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MoveSpeed>1</MoveSpeed>
+				<CarryWeight>60</CarryWeight>
+				<CarryBulk>8</CarryBulk>
+				<AimingDelayFactor>-0.2</AimingDelayFactor>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- ==== Apparel_BWDuster ==== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparel_BWDuster"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
+			<Bulk>7.5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- ==== Apparel_BWWidowVeil ==== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparel_BWWidowVeil"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- ==== Apparel_BWMAGISuitHelm ==== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparel_BWMAGISuitHelm"]/statBases/Mass</xpath>
+		<value>
+			<Mass>4</Mass>
+			<Bulk>8</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparel_BWMAGISuitHelm"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14.4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparel_BWMAGISuitHelm"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>32.4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparel_BWMAGISuitHelm"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<AimingAccuracy>0.2</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!-- ==== Apparel_BWReaverHelm ==== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparel_BWReaverHelm"]/statBases/Mass</xpath>
+		<value>
+			<Mass>6</Mass>
+			<Bulk>12</Bulk>
+			<WornBulk>4</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparel_BWReaverHelm"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparel_BWReaverHelm"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>37.8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparel_BWReaverHelm"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>-0.3</AimingAccuracy>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Black Widows/Patches/Black Widows/ThingDefs_Races/Patch_Races_BlackWidow.xml b/ModPatches/Black Widows/Patches/Black Widows/ThingDefs_Races/Patch_Races_BlackWidow.xml
new file mode 100644
index 0000000000..f80c26e957
--- /dev/null
+++ b/ModPatches/Black Widows/Patches/Black Widows/ThingDefs_Races/Patch_Races_BlackWidow.xml	
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Races_BlackWidow -->
+	<!-- Combat -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Races_BlackWidow"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Races_BlackWidow"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Races_BlackWidow"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<AimingAccuracy>1</AimingAccuracy>
+			<MeleeCritChance>1.68</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>0.9</Suppressability>
+			<ReloadSpeed>1.1</ReloadSpeed>
+			<MeleeDodgeChance>1.41</MeleeDodgeChance>
+		</value>
+	</Operation>
+	<!-- Unarmed -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Races_BlackWidow"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.08</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>18</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.243</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.08</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>18</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.243</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Brood Mind</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2.13</cooldownTime>
+					<linkedBodyPartsGroup>Torso</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>45</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>3.652</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Black Widows/Patches/Black Widows/ThingDefs_Races/Patch_Races_BlackWidow_Animal.xml b/ModPatches/Black Widows/Patches/Black Widows/ThingDefs_Races/Patch_Races_BlackWidow_Animal.xml
new file mode 100644
index 0000000000..185a358926
--- /dev/null
+++ b/ModPatches/Black Widows/Patches/Black Widows/ThingDefs_Races/Patch_Races_BlackWidow_Animal.xml	
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- BWFlooferMoth  -->
+	<!-- Combat -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BWFlooferMoth"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "BWFlooferMoth"]/statBases</xpath>
+		<value>
+			<MeleeCritChance>0.38</MeleeCritChance>
+			<MeleeParryChance>0.46</MeleeParryChance>
+			<MeleeDodgeChance>0.07</MeleeDodgeChance>
+		</value>
+	</Operation>
+	<!-- Unarmed -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BWFlooferMoth"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>psionic gem</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>2.52</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>45</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.07</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+					<armorPenetrationBlunt>1.8</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left wing</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>3.09</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right wing</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>3.09</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>5.05</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- BWShadowWorm -->
+	<!-- Combat -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BWShadowWorm"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "BWShadowWorm"]/statBases</xpath>
+		<value>
+			<MeleeCritChance>0.18</MeleeCritChance>
+			<MeleeParryChance>0.27</MeleeParryChance>
+			<MeleeDodgeChance>0.07</MeleeDodgeChance>
+		</value>
+	</Operation>
+	<!-- Unarmed -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BWShadowWorm"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2.23</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+					<armorPenetrationBlunt>0.64</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.93</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.92</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2.65</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2.65</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Black Widows/Patches/Black Widows/ThingDefs_Weapons/Patch_Weapons.xml b/ModPatches/Black Widows/Patches/Black Widows/ThingDefs_Weapons/Patch_Weapons.xml
new file mode 100644
index 0000000000..c200e397a1
--- /dev/null
+++ b/ModPatches/Black Widows/Patches/Black Widows/ThingDefs_Weapons/Patch_Weapons.xml	
@@ -0,0 +1,375 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationInsert">
+		<xpath>Defs/ThingCategoryDef[defName="AmmoGreatArrows"]</xpath>
+		<value>
+			<!-- ==== Ammo ==== -->
+			<ThingCategoryDef>
+				<defName>AmmoBlackWidowArrows</defName>
+				<label>black widow arrows</label>
+				<parent>AmmoNeolithic</parent>
+				<iconPath>UI/Icons/ThingCategories/CaliberArrow</iconPath>
+			</ThingCategoryDef>
+			<!-- ==================== AmmoSet ========================== -->
+			<CombatExtended.AmmoSetDef>
+				<defName>AmmoSet_BlackWidowArrow</defName>
+				<label>black widow arrows</label>
+				<ammoTypes>
+					<Ammo_BlackWidowArrow_Steel>Projectile_BlackWidowArrow_Steel</Ammo_BlackWidowArrow_Steel>
+					<Ammo_BlackWidowArrow_Plasteel>Projectile_BlackWidowArrow_Plasteel</Ammo_BlackWidowArrow_Plasteel>
+				</ammoTypes>
+			</CombatExtended.AmmoSetDef>
+			<!-- ==================== Ammo ========================== -->
+			<ThingDef Class="CombatExtended.AmmoDef" Name="AmmoBlackWidowArrowBase" ParentName="NeolithicAmmoBase" Abstract="True">
+				<description>Special arrow designed by black widows for use in their bow.</description>
+				<statBases>
+					<Mass>0.2</Mass>
+					<Bulk>0.2</Bulk>
+					<Flammability>0.8</Flammability>
+				</statBases>
+				<thingCategories>
+					<li>AmmoBlackWidowArrows</li>
+				</thingCategories>
+				<stackLimit>200</stackLimit>
+				<tradeTags>
+					<li>CE_AutoEnableTrade</li>
+					<li>CE_AutoEnableCrafting_FueledSmithy</li>
+					<li>CE_AutoEnableCrafting_ElectricSmithy</li>
+				</tradeTags>
+			</ThingDef>
+			<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoBlackWidowArrowBase">
+				<defName>Ammo_BlackWidowArrow_Steel</defName>
+				<label>black widow arrow (steel)</label>
+				<graphicData>
+					<texPath>Things/Ammo/Medieval/Bolt/Steel</texPath>
+					<graphicClass>Graphic_StackCount</graphicClass>
+				</graphicData>
+				<statBases>
+					<MarketValue>1.32</MarketValue>
+				</statBases>
+				<ammoClass>SteelArrow</ammoClass>
+			</ThingDef>
+			<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoBlackWidowArrowBase">
+				<defName>Ammo_BlackWidowArrow_Plasteel</defName>
+				<label>black widow arrow (plasteel)</label>
+				<graphicData>
+					<texPath>Things/Ammo/Medieval/Bolt/Plasteel</texPath>
+					<graphicClass>Graphic_StackCount</graphicClass>
+				</graphicData>
+				<statBases>
+					<MarketValue>6.12</MarketValue>
+				</statBases>
+				<ammoClass>PlasteelArrow</ammoClass>
+				<generateAllowChance>0.5</generateAllowChance>
+			</ThingDef>
+			<!-- ================== Projectiles ================== -->
+			<ThingDef Class="CombatExtended.AmmoDef" Name="BaseBlackWidowArrowProjectile" ParentName="BaseBulletCE" Abstract="true">
+				<graphicData>
+					<texPath>Things/Projectile/Arrow_Small</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<projectile Class="CombatExtended.ProjectilePropertiesCE">
+					<damageDef>Arrow</damageDef>
+					<speed>30</speed>
+				</projectile>
+			</ThingDef>
+			<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseBlackWidowArrowProjectile">
+				<defName>Projectile_BlackWidowArrow_Steel</defName>
+				<label>black widow arrow (steel)</label>
+				<graphicData>
+					<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<projectile Class="CombatExtended.ProjectilePropertiesCE">
+					<damageAmountBase>20</damageAmountBase>
+					<armorPenetrationBlunt>6.686</armorPenetrationBlunt>
+					<armorPenetrationSharp>5.714</armorPenetrationSharp>
+					<preExplosionSpawnChance>0.8</preExplosionSpawnChance>
+					<preExplosionSpawnThingDef>Ammo_BlackWidowArrow_Steel</preExplosionSpawnThingDef>
+				</projectile>
+			</ThingDef>
+			<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseBlackWidowArrowProjectile">
+				<defName>Projectile_BlackWidowArrow_Plasteel</defName>
+				<label>black widow arrow (plasteel)</label>
+				<graphicData>
+					<texPath>Things/Projectile/Arrows/Arrow_Plasteel</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<projectile Class="CombatExtended.ProjectilePropertiesCE">
+					<damageAmountBase>24</damageAmountBase>
+					<armorPenetrationBlunt>8.56</armorPenetrationBlunt>
+					<armorPenetrationSharp>12</armorPenetrationSharp>
+					<preExplosionSpawnChance>0.9</preExplosionSpawnChance>
+					<preExplosionSpawnThingDef>Ammo_BlackWidowArrow_Plasteel</preExplosionSpawnThingDef>
+				</projectile>
+			</ThingDef>
+			<!-- ==================== Recipes ========================== -->
+			<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+				<defName>MakeAmmo_BlackWidowArrow_Steel</defName>
+				<label>make steel black widow arrows x10</label>
+				<description>Craft 10 steel black widow arrows.</description>
+				<jobString>Making steel black widow arrows.</jobString>
+				<ingredients>
+					<li>
+						<filter>
+							<thingDefs>
+								<li>WoodLog</li>
+							</thingDefs>
+						</filter>
+						<count>4</count>
+					</li>
+					<li>
+						<filter>
+							<thingDefs>
+								<li>Steel</li>
+							</thingDefs>
+						</filter>
+						<count>3</count>
+					</li>
+				</ingredients>
+				<fixedIngredientFilter>
+					<thingDefs>
+						<li>WoodLog</li>
+						<li>Steel</li>
+					</thingDefs>
+				</fixedIngredientFilter>
+				<products>
+					<Ammo_BlackWidowArrow_Steel>10</Ammo_BlackWidowArrow_Steel>
+				</products>
+			</RecipeDef>
+			<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+				<defName>MakeAmmo_BlackWidowArrow_Plasteel</defName>
+				<label>make plasteel black widow arrows x10</label>
+				<description>Craft 10 plasteel black widow arrows.</description>
+				<jobString>Making plasteel black widow arrows.</jobString>
+				<ingredients>
+					<li>
+						<filter>
+							<thingDefs>
+								<li>WoodLog</li>
+							</thingDefs>
+						</filter>
+						<count>4</count>
+					</li>
+					<li>
+						<filter>
+							<thingDefs>
+								<li>Plasteel</li>
+							</thingDefs>
+						</filter>
+						<count>4</count>
+					</li>
+				</ingredients>
+				<fixedIngredientFilter>
+					<thingDefs>
+						<li>WoodLog</li>
+						<li>Plasteel</li>
+					</thingDefs>
+				</fixedIngredientFilter>
+				<products>
+					<Ammo_BlackWidowArrow_Plasteel>10</Ammo_BlackWidowArrow_Plasteel>
+				</products>
+			</RecipeDef>
+		</value>
+	</Operation>
+
+	<!-- ==== Black Widow Rifle. ==== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_BWRifle</defName>
+		<statBases>
+			<Mass>10</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>10</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.73</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_5x35mmCharged</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>59</range>
+			<soundCast>ChargeLance_Fire</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<reloadTime>4</reloadTime><!-- ep... -->
+			<magazineSize>20</magazineSize><!-- ...ic -->
+			<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>BWRifle</li>
+			<li>BlackWidowRanged</li>
+		</weaponTags>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_BWRifle"]/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.63</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.55</cooldownTime>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ==== Black Widow Bow. ==== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Bow_BWBow</defName>
+		<statBases>
+			<Mass>8</Mass>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.8</ShotSpread>
+			<SwayFactor>3</SwayFactor>
+			<Bulk>7.5</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_BlackWidowArrow_Steel</defaultProjectile>
+			<warmupTime>8.5</warmupTime>
+			<range>54</range>
+			<soundCast>Bow_Large</soundCast>
+		</Properties>
+		<AmmoUser>
+			<ammoSet>AmmoSet_BlackWidowArrow</ammoSet>
+		</AmmoUser>
+		<weaponTags>
+			<li>BWBow</li>
+			<li>BlackWidowRanged</li>
+		</weaponTags>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bow_BWBow"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>upper blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.43</cooldownTime>
+					<armorPenetrationSharp>0.16</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.563</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>lower blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.43</cooldownTime>
+					<armorPenetrationSharp>0.16</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.563</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ==== Black Widow Scythe ==== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_bwscythe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>hand guard</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>hook</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.11</cooldownTime>
+					<armorPenetrationSharp>2.82</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>1.32</cooldownTime>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.375</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_bwscythe"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.5</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_bwscythe"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.6</MeleeDodgeChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_bwscythe"]/statBases/Mass</xpath>
+		<value>
+			<Mass>4</Mass>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>0.54</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_bwscythe" or defName="Bow_BWBow"]/stuffCategories</xpath>
+		<value>
+			<stuffCategories>
+				<li>Metallic_Weapon</li>
+			</stuffCategories>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Bori Race/Defs/Bori Race/Recipes_Bori.xml b/ModPatches/Bori Race/Defs/Bori Race/Recipes_Bori.xml
new file mode 100644
index 0000000000..f58f96de59
--- /dev/null
+++ b/ModPatches/Bori Race/Defs/Bori Race/Recipes_Bori.xml	
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>Craft_10_BR_Grenade</defName>
+		<label>Craft 10 frag grenades</label>
+		<description>Craft 10 frag grenades charges.</description>
+		<jobString>Crafting frag grenades</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>30</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+		</ingredients>
+		<researchPrerequisite>Bori_B3</researchPrerequisite>
+		<skillRequirements>
+			<Crafting>4</Crafting>
+		</skillRequirements>
+		<products>
+			<BD_GrenadeFrag>10</BD_GrenadeFrag>
+		</products>
+		<workAmount>20000</workAmount>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Bori Race/Patches/Bori Race/PawnKindDefs/Bori_PawnKind.xml b/ModPatches/Bori Race/Patches/Bori Race/PawnKindDefs/Bori_PawnKind.xml
new file mode 100644
index 0000000000..38a1037f8f
--- /dev/null
+++ b/ModPatches/Bori Race/Patches/Bori Race/PawnKindDefs/Bori_PawnKind.xml	
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Ammo-->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			@Name="BoriCivBase"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>0</min>
+					<max>1</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="Bori_Soldier_Light" or
+			defName="Bori_Soldier"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="Bori_Soldier_Elite" or
+			defName="Bori_Soldier" or
+			defName="Bori_Soldier_MachineGun"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>7</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Bori_Soldier_MachineGun"]/weaponMoney</xpath>
+		<value>
+			<weaponMoney>
+				<min>600</min>
+				<max>2000</max>
+			</weaponMoney>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="Bori_Soldier_Boom"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>10</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="Bori_Space_Soldier" or
+			defName="Bori_0_Sniper" or
+			defName="Bori_0_SMG"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="Bori_Soldier_Boom"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>15</min>
+					<max>20</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Backpack-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[
+			defName="Bori_Soldier_Light" or
+			defName="Bori_Soldier" or
+			defName="Bori_Soldier_Elite" or
+			defName="Bori_Soldier_MachineGun" or
+			defName="Bori_Assult" or
+			defName="Bori_Assult_Rocketeer" or
+			defName="Bori_Soldier_Boom" or
+			defName="Bori_Space_Soldier" or
+			defName="Bori_0_Sniper" or
+			defName="Bori_0_SMG"
+			]/apparelRequired </xpath>
+		<value>
+			<li>CE_Apparel_Backpack</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Bori Race/Patches/Bori Race/Scenario/Bori_Scenario.xml b/ModPatches/Bori Race/Patches/Bori Race/Scenario/Bori_Scenario.xml
new file mode 100644
index 0000000000..fee4b2bc71
--- /dev/null
+++ b/ModPatches/Bori Race/Patches/Bori Race/Scenario/Bori_Scenario.xml	
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="BoriStart"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_8x22mmNambu_FMJ</thingDef>
+				<count>210</count>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="BoriStart"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_30Carbine_FMJ</thingDef>
+				<count>120</count>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Bori Race/Patches/Bori Race/ThingDefs_Items/Items_Resources.xml b/ModPatches/Bori Race/Patches/Bori Race/ThingDefs_Items/Items_Resources.xml
new file mode 100644
index 0000000000..5e603ca4c0
--- /dev/null
+++ b/ModPatches/Bori Race/Patches/Bori Race/ThingDefs_Items/Items_Resources.xml	
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==========  Chiffron Wool  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SP_Weave"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.05</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SP_Weave"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.08</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SP_Weave"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.10</StuffPower_Armor_Heat>
+			<StuffPower_Armor_Electric>0.05</StuffPower_Armor_Electric>
+		</value>
+	</Operation>
+
+	<!-- ==========  Orion  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SPBD_Orion"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>2.50</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SPBD_Orion"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>3</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SPBD_Orion"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.15</StuffPower_Armor_Heat>
+			<StuffPower_Armor_Electric>0.05</StuffPower_Armor_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SPBD_Orion"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>0.65</Mass>
+			<MeleePenetrationFactor>1.2</MeleePenetrationFactor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SPBD_Orion"]/stuffProps/categories</xpath>
+		<value>
+			<li>Metallic_Weapon</li>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="SPBD_Orion"
+			]/statBases </xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="SP_Weave"
+			]/statBases </xpath>
+		<value>
+			<Bulk>0.04</Bulk>
+			<WornBulk>0.0</WornBulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Bori Race/Patches/Bori Race/ThingDefs_Misc/Bori_Apparel.xml b/ModPatches/Bori Race/Patches/Bori Race/ThingDefs_Misc/Bori_Apparel.xml
new file mode 100644
index 0000000000..ca5466b690
--- /dev/null
+++ b/ModPatches/Bori Race/Patches/Bori Race/ThingDefs_Misc/Bori_Apparel.xml	
@@ -0,0 +1,311 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--========= Stuffable =========-->
+
+	<!--Basic-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BD_CasualClothes" or defName="BD_WorkClothes"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
+			<Bulk>2</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BD_NewsboyCap"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="BD_NewsboyCap"]/statBases/ArmorRating_Blunt</xpath>
+	</Operation>
+
+	<!--Armor-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BD_IndSoldierUniform"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+			<Bulk>8</Bulk>
+			<WornBulk>5</WornBulk>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BD_IndSoldierUniform"]/statBases/Mass</xpath>
+		<value>
+			<Mass>8</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BD_IndHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Armor-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BD_IndSoldierArmour"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>20</Bulk>
+			<WornBulk>8</WornBulk>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+			<ArmorRating_Blunt>14</ArmorRating_Blunt>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BD_IndSoldierArmour"]/statBases/Mass</xpath>
+		<value>
+			<Mass>15</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="BD_IndSoldierArmour"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BD_IndSoldierArmour"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>1.2</ArmorRating_Sharp>
+						<parts>
+							<li>Torso</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>1.2</ArmorRating_Blunt>
+						<parts>
+							<li>Torso</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+							<li>Foot</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+							<li>Foot</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.40</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.40</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BD_IndArmHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+			<Bulk>4</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BD_MilitaryStyleCoat"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BD_PeakedCap"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+			<Bulk>1</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BD_PeakedCap"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BD_WindbreakPoncho"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5.5</StuffEffectMultiplierArmor>
+			<Bulk>7</Bulk>
+			<WornBulk>4</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Sheep-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SP_ChroniclerUniform" or defName="SP_WorkClothes"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
+			<Bulk>2</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SP_ChroniclerCap"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="SP_ChroniclerCap"]/statBases/ArmorRating_Blunt</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SP_WorkHairband"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SP_SummerDress"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.75</StuffEffectMultiplierArmor>
+			<Bulk>2</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SP_SummerDress"]/statBases/Mass</xpath>
+		<value>
+			<Mass>0.65</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SP_PiknicStrawHat"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.01</ArmorRating_Sharp>
+			<Bulk>1</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SP_PiknicStrawHat"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.01</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SP_NurseUniform"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+			<Bulk>5</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SP_NurseCap"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="SP_NurseCap"]/statBases/ArmorRating_Blunt</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SP_Special"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+			<Bulk>1</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SP_Special"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SP_BellTag"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+			<Bulk>0.1</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Bori Race/Patches/Bori Race/ThingDefs_Misc/Bori_Explosives.xml b/ModPatches/Bori Race/Patches/Bori Race/ThingDefs_Misc/Bori_Explosives.xml
new file mode 100644
index 0000000000..04fb3a050d
--- /dev/null
+++ b/ModPatches/Bori Race/Patches/Bori Race/ThingDefs_Misc/Bori_Explosives.xml	
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Remove Recipe Maker & Verbs ========== -->
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="BD_GrenadeFrag"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>BaseWeapon</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="BD_GrenadeFrag"]/recipeMaker</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="BD_GrenadeFrag"]/costList</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="BD_GrenadeFrag"]/verbs</xpath>
+	</Operation>
+
+	<!-- ========== Projectile thingClass ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Proj_BR_Fr"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+
+	<!-- ========== Projectile ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Proj_BR_Fr"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<explosionRadius>1.5</explosionRadius>
+				<damageDef>Bomb</damageDef>
+				<damageAmountBase>80</damageAmountBase>
+				<explosionDelay>80</explosionDelay>
+				<dropsCasings>false</dropsCasings>
+				<speed>10</speed>
+				<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+				<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+				<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
+			</projectile>
+		</value>
+	</Operation>
+
+	<!-- ========== Check Comp ========== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Proj_BR_Fr"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Proj_BR_Fr"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<!-- ========== Add Fragmentation ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Proj_BR_Fr"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>60</Fragment_Small>
+				</fragments>
+			</li>
+		</value>
+	</Operation>
+	<!-- Weapon Stack and Appearance -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BD_GrenadeFrag"]/graphicData</xpath>
+		<value>
+			<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BD_GrenadeFrag"]</xpath>
+		<value>
+			<thingClass>CombatExtended.AmmoThing</thingClass>
+			<stackLimit>75</stackLimit>
+			<resourceReadoutPriority>First</resourceReadoutPriority>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="BD_GrenadeFrag"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<!-- Weapon Check Comps -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="BD_GrenadeFrag"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="BD_GrenadeFrag"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<!-- Weapon Values -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BD_GrenadeFrag"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>80</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1.5</explosiveRadius>
+
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>60</Fragment_Small>
+				</fragments>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BD_GrenadeFrag</defName>
+		<statBases>
+			<Mass>1.08</Mass>
+			<MarketValue>7.42</MarketValue>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<label>throw grenade</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<range>10.0</range>
+			<minRange>4</minRange>
+			<warmupTime>0.8</warmupTime>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<soundCast>ThrowGrenade</soundCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<defaultProjectile>Proj_BR_Fr</defaultProjectile>
+			<onlyManualCast>true</onlyManualCast>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<weaponTags>
+			<li>CE_AI_Grenade</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Bori Race/Patches/Bori Race/ThingDefs_Misc/Weapons.xml b/ModPatches/Bori Race/Patches/Bori Race/ThingDefs_Misc/Weapons.xml
new file mode 100644
index 0000000000..a8f66be3c8
--- /dev/null
+++ b/ModPatches/Bori Race/Patches/Bori Race/ThingDefs_Misc/Weapons.xml	
@@ -0,0 +1,906 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Rifle =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BD_BoltActionRifle</defName>
+		<statBases>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.49</SwayFactor>
+			<Bulk>11.0</Bulk>
+			<Mass>3.90</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<WoodLog>15</WoodLog>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_3006Springfield</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Light Rifle =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BD_LightWeightedBoltActionRifle</defName>
+		<statBases>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.14</SwayFactor>
+			<Bulk>9.00</Bulk>
+			<Mass>2.4</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<WoodLog>5</WoodLog>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_30Carbine_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>37</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_30Carbine</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== SMG =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BD_SdangSMG</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.96</SwayFactor>
+			<Bulk>4.81</Bulk>
+			<Mass>2.7</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.44</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<range>25</range>
+			<soundCast>Shot_HeavySMG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>35</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== LMG =========== -->
+	<!--			
+<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+<defName>BD_HeavyMachineGun</defName>
+<statBases>
+<SightsEfficiency>1.00</SightsEfficiency>
+<ShotSpread>0.05</ShotSpread>
+<SwayFactor>2.61</SwayFactor>
+<Bulk>15.46</Bulk>
+<Mass>12.60</Mass>
+<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+</statBases>
+<costList>
+  <Steel>105</Steel>
+  <ComponentIndustrial>5</ComponentIndustrial>
+</costList>
+<Properties>
+<recoilAmount>1.19</recoilAmount>
+<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+<hasStandardCommand>true</hasStandardCommand>
+<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
+<warmupTime>1.3</warmupTime>
+<burstShotCount>10</burstShotCount>
+<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+<range>44</range>
+<soundCast>Shot_Minigun</soundCast>
+<soundCastTail>GunTail_Medium</soundCastTail>
+<muzzleFlashScale>9</muzzleFlashScale>
+</Properties>
+
+<AmmoUser>
+<magazineSize>100</magazineSize>
+<reloadTime>7.8</reloadTime>
+<ammoSet>AmmoSet_3006Springfield</ammoSet>
+</AmmoUser>
+<FireModes>
+<aimedBurstShotCount>5</aimedBurstShotCount>
+<aiUseBurstMode>FALSE</aiUseBurstMode>
+<aiAimMode>SuppressFire</aiAimMode>
+</FireModes>
+</li>
+-->
+	<!-- ========== LMG - Tripod=========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BD_MtHeavyMachineGun</defName>
+		<statBases>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.04</SwayFactor>
+			<Bulk>18.00</Bulk>
+			<Mass>16.00</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>145</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>0.98</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
+			<warmupTime>0.8</warmupTime>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<range>44</range>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<weaponTags>
+			<li>Bipod_ATR</li>
+		</weaponTags>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_3006Springfield</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Rifle =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BD_AssaultRifle</defName>
+		<statBases>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.22</SwayFactor>
+			<Bulk>8.89</Bulk>
+			<Mass>3.5</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>45</Steel>
+			<WoodLog>10</WoodLog>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.56</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_30Carbine_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<range>61</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_30Carbine</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Plamsa Pistol =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BD_Autopistol</defName>
+		<statBases>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.00</SwayFactor>
+			<Bulk>1.90</Bulk>
+			<Mass>1.11</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>15</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>9</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BD_Autopistol"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Auto Heavy Rifle =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BD_AutoBoltActionRifle</defName>
+		<statBases>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.56</SwayFactor>
+			<Bulk>11.50</Bulk>
+			<Mass>4.12</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>55</Steel>
+			<WoodLog>15</WoodLog>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.08</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<range>55</range>
+			<soundCast>Shot_SniperRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_3006Springfield</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Sniper Rifle =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BD_Sniper</defName>
+		<statBases>
+			<SightsEfficiency>2.26</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.65</SwayFactor>
+			<Bulk>11.0</Bulk>
+			<Mass>4.72</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>55</Steel>
+			<WoodLog>15</WoodLog>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>75</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_3006Springfield</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Charge Sniper Rifle =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BD_ChargeLance</defName>
+		<statBases>
+			<SightsEfficiency>2.26</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.65</SwayFactor>
+			<Bulk>11.0</Bulk>
+			<Mass>5.60</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>60</Steel>
+			<Plasteel>30</Plasteel>
+			<Chemfuel>25</Chemfuel>
+			<ComponentIndustrial>11</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x50mmCharged</defaultProjectile>
+			<warmupTime>1.9</warmupTime>
+			<range>86</range>
+			<soundCast>ChargeLance_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_8x50mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Charge Rifle =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BD_ChargeRifle</defName>
+		<statBases>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.56</SwayFactor>
+			<Bulk>9.50</Bulk>
+			<Mass>4.12</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>60</Steel>
+			<Plasteel>30</Plasteel>
+			<Chemfuel>25</Chemfuel>
+			<ComponentIndustrial>11</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.23</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<range>65</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BD_ChargeRifle"]/weaponTags</xpath>
+		<value>
+			<li>NoSwitch</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Charge SMG =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BD_ChargeSMG</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.21</SwayFactor>
+			<Bulk>7.85</Bulk>
+			<Mass>4.25</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>60</Steel>
+			<Plasteel>30</Plasteel>
+			<Chemfuel>25</Chemfuel>
+			<ComponentIndustrial>11</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.06</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<range>31</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Heavy SMG =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BD_HeavySMG</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.97</SwayFactor>
+			<Bulk>4.81</Bulk>
+			<Mass>3.2</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.27</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_357Magnum_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<range>21</range>
+			<soundCast>Shot_HeavySMG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_357Magnum</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ==========  Claymore  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BD_Claymore"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.01</cooldownTime>
+					<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>47</power>
+					<cooldownTime>2.01</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.2</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>60</power>
+					<cooldownTime>3.12</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.8</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BD_Claymore"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<MeleeCounterParryBonus>0.59</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BD_Claymore"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.08</MeleeCritChance>
+				<MeleeParryChance>0.5</MeleeParryChance>
+				<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- ==========  Halberd  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BD_halberd"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>47</power>
+					<cooldownTime>2.9</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>27</power>
+					<cooldownTime>1.16</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.03</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.31</cooldownTime>
+					<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BD_halberd"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>1.08</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BD_halberd"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.22</MeleeCritChance>
+				<MeleeParryChance>1.53</MeleeParryChance>
+				<MeleeDodgeChance>0.67</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- ==========  Spear  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BD_Spear"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.35</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.78</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.19</cooldownTime>
+					<chanceFactor>1.00</chanceFactor>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BD_Spear"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BD_Spear"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.24</MeleeCritChance>
+				<MeleeParryChance>1.45</MeleeParryChance>
+				<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- ==========  Cane  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SP_Staff"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.35</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.78</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SP_Staff"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SP_Staff"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.24</MeleeCritChance>
+			<MeleeParryChance>1.45</MeleeParryChance>
+			<MeleeDodgeChance>0.9</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- ==========  Melee Tools  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BD_BoltActionRifle" or
+			defName="BD_LightWeightedBoltActionRifle" or
+			defName="BD_SdangSMG" or
+			defName="BD_MtHeavyMachineGun" or
+			defName="BD_AssaultRifle" or
+			defName="BD_AutoBoltActionRifle" or
+			defName="BD_Sniper" or
+			defName="BD_HeavySMG" or
+			defName="BD_ChargeLance" or
+			defName="BD_ChargeSMG"
+			]/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="BD_Autopistol"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BD_ChargeRifle"]/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</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>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>bayonet</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.62</cooldownTime>
+					<armorPenetrationBlunt>2.304</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Bori Race/Patches/Bori Race/ThingDefs_Races/AlienRace_Bori.xml b/ModPatches/Bori Race/Patches/Bori Race/ThingDefs_Races/AlienRace_Bori.xml
new file mode 100644
index 0000000000..a95211b50a
--- /dev/null
+++ b/ModPatches/Bori Race/Patches/Bori Race/ThingDefs_Races/AlienRace_Bori.xml	
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="BaseBoriPawn"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="BaseBoriPawn"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Bori"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>1.5</MeleeDodgeChance>
+			<Suppressability>0.8</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Bori"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.375</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.375</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>3.9</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Bori"]/alienRace/raceRestriction/whiteApparelList</xpath>
+		<value>
+			<li>CE_Apparel_TacVest</li>
+			<li>CE_Apparel_Backpack</li>
+			<li>CE_Apparel_TribalBackpack</li>
+			<li>CE_Apparel_BallisticShield</li>
+			<li>CE_Apparel_MeleeShield</li>
+			<li>CE_Apparel_GasMask</li>
+			<li>CE_Apparel_ImprovGasMask</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="BaseSPPawn"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="BaseSPPawn"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_SP"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>1.2</MeleeDodgeChance>
+			<Suppressability>1</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_SP"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.44</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.200</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.44</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.200</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.75</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.500</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_SP"]/alienRace/raceRestriction</xpath>
+		<value>
+			<whiteApparelList>
+				<li>CE_Apparel_TacVest</li>
+				<li>CE_Apparel_Backpack</li>
+				<li>CE_Apparel_TribalBackpack</li>
+				<li>CE_Apparel_BallisticShield</li>
+				<li>CE_Apparel_MeleeShield</li>
+				<li>CE_Apparel_GasMask</li>
+				<li>CE_Apparel_ImprovGasMask</li>
+			</whiteApparelList>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Bori Race/Patches/Bori Race/ThingDefs_Races/Race_Realyangdang.xml b/ModPatches/Bori Race/Patches/Bori Race/ThingDefs_Races/Race_Realyangdang.xml
new file mode 100644
index 0000000000..6d8873bbd5
--- /dev/null
+++ b/ModPatches/Bori Race/Patches/Bori Race/ThingDefs_Races/Race_Realyangdang.xml	
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Canis_Lupus_Crinitus"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Canis_Lupus_Crinitus"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.8</cooldownTime>
+					<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.8</cooldownTime>
+					<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>1.63</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.380</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Canis_Lupus_Crinitus"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/British Weapons Set/Patches/British Weapons Set/British_weapon_set.xml b/ModPatches/British Weapons Set/Patches/British Weapons Set/British_weapon_set.xml
new file mode 100644
index 0000000000..3962f31714
--- /dev/null
+++ b/ModPatches/British Weapons Set/Patches/British Weapons Set/British_weapon_set.xml	
@@ -0,0 +1,763 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Bren Gun -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BWS_Bren</defName>
+		<statBases>
+			<Mass>11</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.53</SwayFactor>
+			<Bulk>12</Bulk>
+			<WorkToMake>30500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>85</Steel>
+			<WoodLog>10</WoodLog>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.32</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>60</range>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_303British</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_MachineGun</li>
+			<li>CE_AI_LMG</li>
+			<li>Bipod_LMG</li>
+		</weaponTags>
+		<researchPrerequisite>GasOperation</researchPrerequisite>
+		<AllowWithRunAndGun>FALSE</AllowWithRunAndGun>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BWS_Bren"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.35,1.18</DrawSize>
+				<DrawOffset>0.13,-0.03</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Browning HP -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BWP_Browning</defName>
+		<statBases>
+			<Mass>1</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.07</SwayFactor>
+			<Bulk>1.90</Bulk>
+			<WorkToMake>5000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>20</Steel>
+			<WoodLog>5</WoodLog>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_BROOM</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+		<researchPrerequisite>BlowbackOperation</researchPrerequisite>
+		<AllowWithRunAndGun>true</AllowWithRunAndGun>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BWP_Browning"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.00,1.00</DrawSize>
+				<DrawOffset>0.0,0.0</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- EM-2 -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BWP_EM</defName>
+		<statBases>
+			<Mass>3.5</Mass>
+			<RangedWeapon_Cooldown>0.40</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.35</SwayFactor>
+			<Bulk>8.30</Bulk>
+			<WorkToMake>50000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<WoodLog>35</WoodLog>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>50</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>6</burstShotCount>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4.4</reloadTime>
+			<ammoSet>AmmoSet_303British</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>true</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AR</li>
+		</weaponTags>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+		<AllowWithRunAndGun>true</AllowWithRunAndGun>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BWP_EM"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.25,1.33</DrawSize>
+				<DrawOffset>0.12,-0.10</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Lee-3 -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BWS_LeeA</defName>
+		<statBases>
+			<Mass>3.80</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.30</SwayFactor>
+			<Bulk>10.60</Bulk>
+			<WorkToMake>11000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<WoodLog>25</WoodLog>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>50</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_303British</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_SR</li>
+		</weaponTags>
+		<researchPrerequisite>Gunsmithing</researchPrerequisite>
+		<AllowWithRunAndGun>FALSE</AllowWithRunAndGun>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BWS_LeeA"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.34,1.34</DrawSize>
+				<DrawOffset>0.12,-0.10</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Lee-4 -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BWS_LeeB</defName>
+		<statBases>
+			<Mass>4</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.40</SwayFactor>
+			<Bulk>11.30</Bulk>
+			<WorkToMake>12000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>60</Steel>
+			<WoodLog>10</WoodLog>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>53</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_303British</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_SR</li>
+		</weaponTags>
+		<researchPrerequisite>Gunsmithing</researchPrerequisite>
+		<AllowWithRunAndGun>FALSE</AllowWithRunAndGun>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BWS_LeeB"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.34,1.34</DrawSize>
+				<DrawOffset>0.12,-0.10</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Lewis Gun -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BWS_LewisGun</defName>
+		<statBases>
+			<Mass>13</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.5</ShotSpread>
+			<SwayFactor>1.83</SwayFactor>
+			<Bulk>18</Bulk>
+			<WorkToMake>34000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>110</Steel>
+			<WoodLog>20</WoodLog>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.32</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>65</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>47</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_3006Springfield</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_MachineGun</li>
+			<li>CE_AI_LMG</li>
+			<li>Bipod_LMG</li>
+		</weaponTags>
+		<researchPrerequisite>GasOperation</researchPrerequisite>
+		<AllowWithRunAndGun>FALSE</AllowWithRunAndGun>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BWS_LewisGun"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.35,1.18</DrawSize>
+				<DrawOffset>0.13,-0.03</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Martini Henry -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BWP_MartiniHenry</defName>
+		<statBases>
+			<Mass>3.8</Mass>
+			<RangedWeapon_Cooldown>0.75</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.30</SwayFactor>
+			<Bulk>11</Bulk>
+			<WorkToMake>8000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<WoodLog>40</WoodLog>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>60</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>10</AmmoGenPerMagOverride>
+			<reloadTime>2</reloadTime>
+			<ammoSet>AmmoSet_303British</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_SR</li>
+		</weaponTags>
+		<researchPrerequisite>Gunsmithing</researchPrerequisite>
+		<AllowWithRunAndGun>FALSE</AllowWithRunAndGun>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BWP_MartiniHenry"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.34,1.34</DrawSize>
+				<DrawOffset>0.12,0.0</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Sten -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BWS_Sten</defName>
+		<statBases>
+			<Mass>3.2</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>0.80</SwayFactor>
+			<Bulk>5</Bulk>
+			<WorkToMake>15000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>6</burstShotCount>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+		<researchPrerequisite>BlowbackOperation</researchPrerequisite>
+		<AllowWithRunAndGun>true</AllowWithRunAndGun>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BWS_Sten"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>0.85,0.85</DrawSize>
+				<DrawOffset>0.00,-0.03</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Sterling -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BWS_Sterling</defName>
+		<statBases>
+			<Mass>2.7</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.80</SwayFactor>
+			<Bulk>4</Bulk>
+			<WorkToMake>21000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>24</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+		<researchPrerequisite>BlowbackOperation</researchPrerequisite>
+		<AllowWithRunAndGun>true</AllowWithRunAndGun>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BWS_Sterling"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>0.85,0.85</DrawSize>
+				<DrawOffset>0.00,-0.03</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Tommy Gun -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BWP_TommyB</defName>
+		<statBases>
+			<Mass>5</Mass>
+			<RangedWeapon_Cooldown>0.40</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.10</ShotSpread>
+			<SwayFactor>1.14</SwayFactor>
+			<Bulk>8.50</Bulk>
+			<WorkToMake>27000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<WoodLog>25</WoodLog>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.18</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>25</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>Shot_HeavySMG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+		<researchPrerequisite>BlowbackOperation</researchPrerequisite>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BWP_TommyB"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>0.85,0.85</DrawSize>
+				<DrawOffset>0.00,-0.03</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Webley -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BWS_Webley</defName>
+		<statBases>
+			<Mass>1.1</Mass>
+			<RangedWeapon_Cooldown>0.49</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>2.41</Bulk>
+			<WorkToMake>7000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>20</Steel>
+			<WoodLog>10</WoodLog>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_455Webley_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Revolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_455Webley</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_BROOM</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+		<researchPrerequisite>Gunsmithing</researchPrerequisite>
+		<AllowWithRunAndGun>true</AllowWithRunAndGun>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BWS_Webley"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.00,1.00</DrawSize>
+				<DrawOffset>0.0,0.0</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- L1A1 -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BWP_FAL</defName>
+		<statBases>
+			<Mass>4.3</Mass>
+			<RangedWeapon_Cooldown>0.40</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.52</SwayFactor>
+			<Bulk>10.90</Bulk>
+			<WorkToMake>28000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>55</Steel>
+			<WoodLog>10</WoodLog>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.07</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>6</burstShotCount>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>true</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AR</li>
+		</weaponTags>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+		<AllowWithRunAndGun>true</AllowWithRunAndGun>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BWP_FAL"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.25,1.33</DrawSize>
+				<DrawOffset>0.12,-0.10</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Tools -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BWP_Browning" or defName="BWS_Webley"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName="BWS_Bren" or
+			defName="BWS_LeeA" or
+			defName="BWS_LeeB" or
+			defName="BWS_LewisGun" or
+			defName="BWS_Sten" or
+			defName="BWS_Sterling" or
+			defName="BWP_EM" or
+			defName="BWP_MartiniHenry" or
+			defName="BWP_TommyB" or
+			defName="BWP_FAL"
+			]/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>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Bulgarian Imperial Uniforms/Patches/Bulgarian Imperial Uniforms/Apparel_Industrial.xml b/ModPatches/Bulgarian Imperial Uniforms/Patches/Bulgarian Imperial Uniforms/Apparel_Industrial.xml
new file mode 100644
index 0000000000..775ab6380e
--- /dev/null
+++ b/ModPatches/Bulgarian Imperial Uniforms/Patches/Bulgarian Imperial Uniforms/Apparel_Industrial.xml	
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Uniform -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Hessian_Bulgarian_Uniform"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Hessian_Bulgarian_Uniform"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Hessian_Bulgarian_Uniform"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Uniform Cap -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Hessian_Bulgarian_Cap"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.02</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Hessian_Bulgarian_Cap"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.03</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Webbing -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Hessian_Bulgarian_Webbing"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.02</ArmorRating_Sharp>
+			<Bulk>5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Hessian_Bulgarian_Webbing"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.03</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Hessian_Bulgarian_Webbing"]/equippedStatOffsets/CarryingCapacity</xpath>
+		<value>
+			<CarryBulk>45</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Hessian_Bulgarian_Webbing"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Hessian_Bulgarian_Webbing"]/apparel/layers/li[.="Belt"]</xpath>
+		<value>
+			<li>Webbing</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Hessian_Bulgarian_Webbing"]/apparel/bodyPartGroups/li[.="Waist"]</xpath>
+		<value>
+			<li>Shoulders</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Bulgarian Imperial Uniforms/Patches/Bulgarian Imperial Uniforms/RangedIndustrial.xml b/ModPatches/Bulgarian Imperial Uniforms/Patches/Bulgarian Imperial Uniforms/RangedIndustrial.xml
new file mode 100644
index 0000000000..838379fff1
--- /dev/null
+++ b/ModPatches/Bulgarian Imperial Uniforms/Patches/Bulgarian Imperial Uniforms/RangedIndustrial.xml	
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_M1879_Peabody_Martini"]/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_M1879_Peabody_Martini_Bayonet"]/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>bayonet</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>2.14</cooldownTime>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>bayonet</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.49</cooldownTime>
+					<armorPenetrationBlunt>2.16</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.44</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_M1879_Peabody_Martini</defName>
+		<statBases>
+			<Mass>3.83</Mass>
+			<Bulk>12.45</Bulk>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.63</SwayFactor>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.87</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>10</AmmoGenPerMagOverride>
+			<reloadTime>2</reloadTime>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<ammoSet>AmmoSet_303British</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_M1879_Peabody_Martini_Bayonet</defName>
+		<statBases>
+			<Mass>4.40</Mass>
+			<Bulk>14.85</Bulk>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.71</SwayFactor>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.87</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>10</AmmoGenPerMagOverride>
+			<reloadTime>2</reloadTime>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<ammoSet>AmmoSet_303British</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_AI_Rifle</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Gun_M1879_Peabody_Martini_Bayonet" or defName="Gun_M1879_Peabody_Martini"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.34,1.84</DrawSize>
+				<DrawOffset>0.12,-0.10</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/CP British Military Kit/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_Armor.xml b/ModPatches/CP British Military Kit/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_Armor.xml
new file mode 100644
index 0000000000..9000c624b6
--- /dev/null
+++ b/ModPatches/CP British Military Kit/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_Armor.xml	
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== load carrying Jerkin (RAF) ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_LoadCarryingVest_RAF"]/statBases</xpath>
+		<value>
+			<Bulk>2.5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_LoadCarryingVest_RAF"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>10</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_LoadCarryingVest_RAF"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_LoadCarryingVest_RAF"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_LoadCarryingVest_RAF"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.36</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!-- ========== Osprey body armour ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_Osprey_Vest"]/statBases</xpath>
+		<value>
+			<Bulk>7.5</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_Osprey_Vest"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>10</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_Osprey_Vest"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_Osprey_Vest"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_Osprey_Vest"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.36</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!-- ========== VIRTUS STV body armor ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_VIRTUSSTV_Vest"]/statBases</xpath>
+		<value>
+			<Bulk>6.5</Bulk>
+			<WornBulk>4</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_VIRTUSSTV_Vest"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>10</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_VIRTUSSTV_Vest"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_VIRTUSSTV_Vest"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>28</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_VIRTUSSTV_Vest"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.36</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!-- ========== Crye JPC body armor (UKSF) ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_CryeJPC_UKSF"]/statBases</xpath>
+		<value>
+			<Bulk>5.5</Bulk>
+			<WornBulk>3.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_CryeJPC_UKSF"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>10</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_CryeJPC_UKSF"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_CryeJPC_UKSF"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>28</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_CryeJPC_UKSF"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.36</ArmorRating_Heat>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/CP British Military Kit/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_Armor_Headgear.xml b/ModPatches/CP British Military Kit/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_Armor_Headgear.xml
new file mode 100644
index 0000000000..fce0c688c6
--- /dev/null
+++ b/ModPatches/CP British Military Kit/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_Armor_Headgear.xml	
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== AFV crew helmet ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_AFV_CrewHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1.5</WornBulk>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+			<ArmorRating_Blunt>13</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.54</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_AFV_CrewHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.20</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== aircrew helmet (RAF) ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_RAFAircrewHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>3.75</Bulk>
+			<WornBulk>1.5</WornBulk>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+			<ArmorRating_Blunt>13</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.54</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_RAFAircrewHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.20</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Mk 7 helmet ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_MK7Helmet"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1.25</WornBulk>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+			<ArmorRating_Blunt>13</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.54</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_MK7Helmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.20</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== VIRTUS helmet (standard, goggle up, goggle down, masked, full masked, GSR gasmask, para, marine variants) ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_VIRTUSHelmet" or
+			defName="RNApparel_VIRTUSHelmet_GoggleUp" or
+			defName="RNApparel_VIRTUSHelmet_GoggleDown" or
+			defName="RNApparel_VIRTUSHelmet_Masked" or
+			defName="RNApparel_VIRTUSHelmet_FullMasked" or
+			defName="RNApparel_VIRTUSHelmet_GSRGasmask" or
+			defName="RNApparel_VIRTUSHelmet_Scrim" or
+			defName="RNApparel_VIRTUSHelmet_CamCream"
+			]/statBases </xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.54</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_VIRTUSHelmet" or
+			defName="RNApparel_VIRTUSHelmet_GoggleUp" or
+			defName="RNApparel_VIRTUSHelmet_GoggleDown" or
+			defName="RNApparel_VIRTUSHelmet_Masked" or
+			defName="RNApparel_VIRTUSHelmet_FullMasked" or
+			defName="RNApparel_VIRTUSHelmet_GSRGasmask" or
+			defName="RNApparel_VIRTUSHelmet_Scrim" or
+			defName="RNApparel_VIRTUSHelmet_CamCream"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.20</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_VIRTUSHelmet_GSRGasmask"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RNApparel_VIRTUSHelmet_GSRGasmask"]</xpath>
+		<value>
+			<li Class="CombatExtended.ApparelHediffExtension">
+				<hediff>WearingGasMask</hediff>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== FAST helmet UKSF (A, B, C variants) ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_FASTHelmetUKSF_A" or
+			defName="RNApparel_FASTHelmetUKSF_B" or
+			defName="RNApparel_FASTHelmetUKSF_C"
+			]/statBases </xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>7</ArmorRating_Sharp>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.54</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_FASTHelmetUKSF_A" or
+			defName="RNApparel_FASTHelmetUKSF_B" or
+			defName="RNApparel_FASTHelmetUKSF_C"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.20</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/CP British Military Kit/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_Backpacks.xml b/ModPatches/CP British Military Kit/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_Backpacks.xml
new file mode 100644
index 0000000000..046ce397b3
--- /dev/null
+++ b/ModPatches/CP British Military Kit/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_Backpacks.xml	
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Bergen rucksack ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_Rucksack_Bergen"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_Rucksack_Bergen"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>35</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_Rucksack_Bergen"]/apparel
+		</xpath>
+		<value>
+			<apparel>
+				<careIfWornByCorpse>false</careIfWornByCorpse>
+				<bodyPartGroups>
+					<li>Shoulders</li>
+				</bodyPartGroups>
+				<layers>
+					<li>Backpack</li>
+				</layers>
+				<tags>
+					<li>RN_Backpack</li>
+				</tags>
+				<defaultOutfitTags>
+					<li>Soldier</li>
+				</defaultOutfitTags>
+				<wornGraphicPath>Things/Apparel/Belt/MTP_Bergen</wornGraphicPath>
+			</apparel>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/CP British Military Kit/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_Belts.xml b/ModPatches/CP British Military Kit/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_Belts.xml
new file mode 100644
index 0000000000..56e54194f5
--- /dev/null
+++ b/ModPatches/CP British Military Kit/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_Belts.xml	
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Webbing PLCE ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_Harness_PLCE_MTP"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_Harness_PLCE_MTP"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>10</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_Harness_PLCE_MTP"]/apparel
+		</xpath>
+		<value>
+			<apparel>
+				<bodyPartGroups>
+					<li>Shoulders</li>
+				</bodyPartGroups>
+				<layers>
+					<li>Webbing</li>
+				</layers>
+				<tags>
+					<li>IndustrialAdvanced</li>
+				</tags>
+				<defaultOutfitTags>
+					<li>Soldier</li>
+				</defaultOutfitTags>
+				<wornGraphicPath>Things/Apparel/Belt/PLCE_MTP_Harness</wornGraphicPath>
+			</apparel>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/CP British Military Kit/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_Headgear.xml b/ModPatches/CP British Military Kit/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_Headgear.xml
new file mode 100644
index 0000000000..1ec7916fdf
--- /dev/null
+++ b/ModPatches/CP British Military Kit/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_Headgear.xml	
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== ghillie suit hood (British) ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_British_GhillieHood"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/CP British Military Kit/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_OnSkin.xml b/ModPatches/CP British Military Kit/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_OnSkin.xml
new file mode 100644
index 0000000000..2dab5c487a
--- /dev/null
+++ b/ModPatches/CP British Military Kit/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_OnSkin.xml	
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Combat Uniform MTP, Combat Uniform MTP UBAC, RAF Nomex flight suit ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_combats_MTP_British" or
+			defName="RNApparel_combats_MTP_UBAC_British" or
+			defName="RNApparel_Nomex_FlightSuit_RAF"
+			]/statBases </xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>3</WornBulk>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+			<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_combats_MTP_British" or
+			defName="RNApparel_combats_MTP_UBAC_British" or
+			defName="RNApparel_Nomex_FlightSuit_RAF"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<!-- Slightly tougher than vanilla pants, T-shirt and button-down shirt -->
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/CP British Military Kit/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_Shell.xml b/ModPatches/CP British Military Kit/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_Shell.xml
new file mode 100644
index 0000000000..394cd83972
--- /dev/null
+++ b/ModPatches/CP British Military Kit/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_Shell.xml	
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== pcs smock MTP ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_PcsParka_MTP"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_PcsParka_MTP"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== pcs smock MTP (PLCE) ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_PcsParka_MTP_PLCE"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<WornBulk>7</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_PcsParka_MTP_PLCE"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>10</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_PcsParka_MTP_PLCE"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== ghillie suit British ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_GhillieSuit_British"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>7.5</WornBulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/CP DOOM/Defs/CP DOOM/CP_DOOM_CE_Patch_Ammo_12Gauge_Dual.xml b/ModPatches/CP DOOM/Defs/CP DOOM/CP_DOOM_CE_Patch_Ammo_12Gauge_Dual.xml
new file mode 100644
index 0000000000..b88ee7207e
--- /dev/null
+++ b/ModPatches/CP DOOM/Defs/CP DOOM/CP_DOOM_CE_Patch_Ammo_12Gauge_Dual.xml	
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- ========== Custom variants of the standard 12 Gauge shotgun projectiles, emulating the effect of two ordinary 12 Gauge shotgun shells being fired side-by-side simultaneously ========== -->
+
+	<ThingDef ParentName="Base12GaugeBullet">
+		<defName>Bullet_12Gauge_DoubleBarreled_Buck</defName>
+		<label>buckshot pellet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shotgun_Pellet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>18</damageAmountBase>
+			<pelletCount>18</pelletCount><!-- Twice the usual number of buckshot pellets -->
+			<armorPenetrationSharp>4</armorPenetrationSharp>
+			<armorPenetrationBlunt>5.7</armorPenetrationBlunt>
+			<spreadMult>17.8</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base12GaugeBullet">
+		<defName>Bullet_12Gauge_DoubleBarreled_Slug</defName>
+		<label>shotgun slug</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>92</speed>
+			<damageAmountBase>46</damageAmountBase>
+			<pelletCount>2</pelletCount><!-- Double slugs -->
+			<armorPenetrationSharp>6</armorPenetrationSharp>
+			<armorPenetrationBlunt>48.04</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base12GaugeBullet">
+		<defName>Bullet_12Gauge_DoubleBarreled_Beanbag</defName>
+		<label>beanbag</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>30</speed>
+			<damageDef>Beanbag</damageDef>
+			<damageAmountBase>18</damageAmountBase>
+			<pelletCount>2</pelletCount><!-- Double beanbags -->
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>3.240</armorPenetrationBlunt>
+			<spreadMult>2</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base12GaugeBullet">
+		<defName>Bullet_12Gauge_DoubleBarreled_ElectroSlug</defName>
+		<label>EMP slug</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>43</speed>
+			<damageDef>EMP</damageDef>
+			<damageAmountBase>24</damageAmountBase>
+			<pelletCount>2</pelletCount><!-- Double EMP slugs -->
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>8.509</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<!-- ========== Custom AmmoSet for the double-barreled Super Shotgun, which maps the custom 12 Gauge shotgun projectiles to standard versions of their craftable ammo ========== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_12Gauge_CP_DOOM_SuperShotgun</defName>
+		<label>12 Gauge</label>
+		<ammoTypes>
+			<Ammo_12Gauge_Buck>Bullet_12Gauge_DoubleBarreled_Buck</Ammo_12Gauge_Buck>
+			<Ammo_12Gauge_Slug>Bullet_12Gauge_DoubleBarreled_Slug</Ammo_12Gauge_Slug>
+			<Ammo_12Gauge_Beanbag>Bullet_12Gauge_DoubleBarreled_Beanbag</Ammo_12Gauge_Beanbag>
+			<Ammo_12Gauge_ElectroSlug>Bullet_12Gauge_DoubleBarreled_ElectroSlug</Ammo_12Gauge_ElectroSlug>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/CP DOOM/Defs/CP DOOM/CP_DOOM_CE_Patch_Ammo_BfgCell.xml b/ModPatches/CP DOOM/Defs/CP DOOM/CP_DOOM_CE_Patch_Ammo_BfgCell.xml
new file mode 100644
index 0000000000..08180b27b6
--- /dev/null
+++ b/ModPatches/CP DOOM/Defs/CP DOOM/CP_DOOM_CE_Patch_Ammo_BfgCell.xml	
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- There is only one type of UAC BFG Cell for CE, no subcategory for variants required -->
+
+	<!-- ==================== AmmoSets ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Doom2016Bfg9000Gun</defName>
+		<label>UAC BFG Cell</label>
+		<ammoTypes>
+			<Ammo_Doom2016BfgCell>Bullet_Doom2016Bfg9000Gun</Ammo_Doom2016BfgCell>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerAmmoBase">
+		<defName>Ammo_Doom2016BfgCell</defName>
+		<label>UAC BFG Cell</label>
+		<description>Plasma containment power cell developed by the Union Aerospace Corporation for the BFG 9000, utilizing the compression of Argent energy</description>
+		<statBases>
+			<Mass>0.5</Mass>
+			<Bulk>1.21</Bulk>
+			<MarketValue>31.92</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+			<!-- Plasma ammo can't be handloaded, and the containment cell must be precision-machined anyway -->
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoAdvanced</li>
+		</thingCategories>
+		<stackLimit>25</stackLimit>
+		<graphicData>
+			<texPath>ThirdParty/CP DOOM and DOOM Kit Classic/Doom2016BfgCell</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<ammoClass>Plasma</ammoClass>
+		<comps>
+			<!-- Arbitarily defined cookoff explosive stats; represents a plasma containment system failing -->
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>20</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>2</Fragment_Large>
+					<Fragment_Small>10</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<!-- Workaround for conditionally-patched projectiles: use an existing abstract class from the generic ammo library (In this case, Base6x24mmChargedBullet) -->
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_Doom2016Bfg9000Gun</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>BFG Plasma Shot</label>
+		<graphicData>
+			<texPath>Things/Projectile/BFGPLAZMA</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>200</speed>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>500</damageAmountBase>
+			<explosionRadius>2.5</explosionRadius>
+			<suppressionFactor>3.0</suppressionFactor>
+			<dangerFactor>2.0</dangerFactor>
+			<soundExplode>RHHit_DOOMBFG</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>600</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_Doom2016BfgCell</defName>
+		<label>make UAC BFG Cells x25</label>
+		<description>Craft 25 UAC BFG Cells.</description>
+		<jobString>Making UAC BFG Cells.</jobString>
+		<workAmount>33000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>26</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>73</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Plasteel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Doom2016BfgCell>25</Ammo_Doom2016BfgCell>
+		</products>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/CP DOOM/Defs/CP DOOM/CP_DOOM_CE_Patch_Ammo_EmgMkVPistol.xml b/ModPatches/CP DOOM/Defs/CP DOOM/CP_DOOM_CE_Patch_Ammo_EmgMkVPistol.xml
new file mode 100644
index 0000000000..317283cb7e
--- /dev/null
+++ b/ModPatches/CP DOOM/Defs/CP DOOM/CP_DOOM_CE_Patch_Ammo_EmgMkVPistol.xml	
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- There is only one type of UAC EMG Cell for CE, no subcategory for variants required -->
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Doom2016EmgMkVPistol</defName>
+		<label>UAC EMG Cell</label>
+		<ammoTypes>
+			<Ammo_Doom2016EmgMkVPistol>Bullet_Doom2016EmgMkVPistol</Ammo_Doom2016EmgMkVPistol>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_Doom2016EmgMkVPistol</defName>
+		<label>UAC EMG Cell</label>
+		<description>Plasma containment power cell developed by the Union Aerospace Corporation for directed-energy sidearms, utilizing the compression of Argent energy into a kinetic slug</description>
+		<statBases>
+			<Mass>0.004</Mass>
+			<Bulk>0.01</Bulk>
+			<MarketValue>0.21</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+			<!-- Plasma ammo can't be handloaded, and the containment cell must be precision-machined anyway -->
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoAdvanced</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>Things/Ammo/Charged/Concentrated</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<ammoClass>Plasma</ammoClass>
+		<comps>
+			<!-- Arbitarily defined cookoff explosive stats; represents a plasma containment system failing -->
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>20</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>2</Fragment_Large>
+					<Fragment_Small>10</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<!-- Workaround for conditionally-patched projectiles: use an existing abstract class from the generic ammo library (In this case, Base6x24mmChargedBullet) -->
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_Doom2016EmgMkVPistol</defName>
+		<label>EMG Bolt</label>
+		<graphicData>
+			<texPath>Things/Projectile/EMGMarkV</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>140</speed>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>3</damageAmountBase>
+			<explosionRadius>0.5</explosionRadius>
+			<suppressionFactor>3.0</suppressionFactor>
+			<dangerFactor>2.0</dangerFactor>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>12</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_Doom2016EmgMkVPistol</defName>
+		<label>make UAC EMG Cells</label>
+		<description>Craft 500 shots' worth of UAC EMG Cells.</description>
+		<jobString>Making UAC EMG Cells.</jobString>
+		<workAmount>2800</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Plasteel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Doom2016EmgMkVPistol>500</Ammo_Doom2016EmgMkVPistol>
+		</products>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/CP DOOM/Defs/CP DOOM/CP_DOOM_CE_Patch_Ammo_EmgPistol.xml b/ModPatches/CP DOOM/Defs/CP DOOM/CP_DOOM_CE_Patch_Ammo_EmgPistol.xml
new file mode 100644
index 0000000000..8fb8659fd6
--- /dev/null
+++ b/ModPatches/CP DOOM/Defs/CP DOOM/CP_DOOM_CE_Patch_Ammo_EmgPistol.xml	
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- Projectile-only definition for the weaker infinite-ammo EMG Pistol; uses same stats as the generic Plasma Pistol projectile -->
+
+	<!-- ================== Projectiles ================== -->
+
+	<!-- Workaround for conditionally-patched projectiles: use an existing abstract class from the generic ammo library (In this case, Base6x24mmChargedBullet) -->
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_Doom2016EmgPistol</defName>
+		<label>EMG Bolt</label>
+		<graphicData>
+			<texPath>Things/Projectile/UACSidearmProj</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>140</speed>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>2</damageAmountBase>
+			<explosionRadius>0.5</explosionRadius>
+			<suppressionFactor>3.0</suppressionFactor>
+			<dangerFactor>2.0</dangerFactor>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>9</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/CP DOOM/Defs/CP DOOM/CP_DOOM_CE_Patch_Ammo_GaussCannonFlechette.xml b/ModPatches/CP DOOM/Defs/CP DOOM/CP_DOOM_CE_Patch_Ammo_GaussCannonFlechette.xml
new file mode 100644
index 0000000000..79cf70e4cd
--- /dev/null
+++ b/ModPatches/CP DOOM/Defs/CP DOOM/CP_DOOM_CE_Patch_Ammo_GaussCannonFlechette.xml	
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- DOOM 2016 specifies that the Guass Cannon uses Plasma Cells as ammo, but fires steel (railgun) flechettes instead -->
+
+	<!-- ==================== AmmoSets ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Doom2016GaussCannon</defName>
+		<label>UAC Plasma Cell</label>
+		<ammoTypes>
+			<Ammo_Doom2016PlasmaCell>Bullet_Doom2016GaussCannonFlechette</Ammo_Doom2016PlasmaCell>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<!-- Workaround for conditionally-patched projectiles: use an existing abstract class from the generic ammo library (In this case, Base6x24mmChargedBullet) -->
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_Doom2016GaussCannonFlechette</defName>
+		<label>UAC Gauss Cannon Flechette</label>
+		<graphicData>
+			<texPath>Things/Projectile/GAUSSBeam</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>121</damageAmountBase>
+			<armorPenetrationSharp>160</armorPenetrationSharp>
+			<armorPenetrationBlunt>11348.10</armorPenetrationBlunt>
+			<speed>500</speed>
+		</projectile>
+	</ThingDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/CP DOOM/Defs/CP DOOM/CP_DOOM_CE_Patch_Ammo_PlasmaCell.xml b/ModPatches/CP DOOM/Defs/CP DOOM/CP_DOOM_CE_Patch_Ammo_PlasmaCell.xml
new file mode 100644
index 0000000000..ff2baf5ac6
--- /dev/null
+++ b/ModPatches/CP DOOM/Defs/CP DOOM/CP_DOOM_CE_Patch_Ammo_PlasmaCell.xml	
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- There is only one type of UAC Plasma Cell for CE, no subcategory for variants required -->
+
+	<!-- ==================== AmmoSets ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Doom2016PlasmaGun</defName>
+		<label>UAC Plasma Cell</label>
+		<ammoTypes>
+			<Ammo_Doom2016PlasmaCell>Bullet_Doom2016PlasmaGun</Ammo_Doom2016PlasmaCell>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Doom2016VortexRifle</defName>
+		<label>UAC Plasma Cell</label>
+		<ammoTypes>
+			<Ammo_Doom2016PlasmaCell>Bullet_Doom2016VortexRifle</Ammo_Doom2016PlasmaCell>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Doom2016Hellshot</defName>
+		<label>UAC Plasma Cell</label>
+		<ammoTypes>
+			<Ammo_Doom2016PlasmaCell>Bullet_Doom2016Hellshot</Ammo_Doom2016PlasmaCell>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_Doom2016PlasmaCell</defName>
+		<label>UAC Plasma Cell</label>
+		<description>Plasma containment power cell developed by the Union Aerospace Corporation for heavy energy weapons, utilizing the compression of Argent energy</description>
+		<statBases>
+			<Mass>0.002</Mass>
+			<Bulk>0.01</Bulk>
+			<MarketValue>0.84</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+			<!-- Plasma ammo can't be handloaded, and the containment cell must be precision-machined anyway -->
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoAdvanced</li>
+		</thingCategories>
+		<stackLimit>450</stackLimit>
+		<graphicData>
+			<texPath>ThirdParty/CP DOOM and DOOM Kit Classic/Doom2016PlasmaCell</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>Plasma</ammoClass>
+		<comps>
+			<!-- Arbitarily defined cookoff explosive stats; represents a plasma containment system failing -->
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>80</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>2</Fragment_Large>
+					<Fragment_Small>10</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<!-- Workaround for conditionally-patched projectiles: use an existing abstract class from the generic ammo library (In this case, Base6x24mmChargedBullet) -->
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_Doom2016PlasmaGun</defName>
+		<label>Plasma Shot</label>
+		<graphicData>
+			<texPath>Things/Projectile/Plasma2016</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>200</speed>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>12</damageAmountBase>
+			<explosionRadius>0.5</explosionRadius>
+			<suppressionFactor>3.0</suppressionFactor>
+			<dangerFactor>2.0</dangerFactor>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>22</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_Doom2016VortexRifle</defName>
+		<label>Plasma Shot</label>
+		<graphicData>
+			<texPath>Things/Projectile/Vortexbeam</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>200</speed>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>12</damageAmountBase>
+			<explosionRadius>0.5</explosionRadius>
+			<suppressionFactor>3.0</suppressionFactor>
+			<dangerFactor>2.0</dangerFactor>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>22</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_Doom2016Hellshot</defName>
+		<label>Plasma Shot</label>
+		<graphicData>
+			<texPath>Things/Projectile/HellshotPlasma</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>200</speed>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>12</damageAmountBase>
+			<explosionRadius>0.5</explosionRadius>
+			<suppressionFactor>3.0</suppressionFactor>
+			<dangerFactor>2.0</dangerFactor>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>22</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_Doom2016PlasmaCell</defName>
+		<label>make UAC Plasma Cells x450 shots</label>
+		<description>Craft 450 shots' worth of UAC Plasma Cells.</description>
+		<jobString>Making UAC Plasma Cells.</jobString>
+		<workAmount>12600</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>33</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Plasteel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Doom2016PlasmaCell>450</Ammo_Doom2016PlasmaCell>
+		</products>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/CP DOOM/Defs/CP DOOM/CP_DOOM_CE_Patch_Ammo_Rocket.xml b/ModPatches/CP DOOM/Defs/CP DOOM/CP_DOOM_CE_Patch_Ammo_Rocket.xml
new file mode 100644
index 0000000000..8a66e70bc1
--- /dev/null
+++ b/ModPatches/CP DOOM/Defs/CP DOOM/CP_DOOM_CE_Patch_Ammo_Rocket.xml	
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoDoom2016Rockets</defName>
+		<label>UAC Rocket Mk VI</label>
+		<parent>AmmoRockets</parent>
+		<iconPath>ThirdParty/CP DOOM and DOOM Kit Classic/Doom2016Rocket/Doom2016Rocket_c</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Doom2016Rocket</defName>
+		<label>UAC Rocket Mk VI</label>
+		<ammoTypes>
+			<Ammo_Doom2016Rocket_HEAT>Bullet_Doom2016Rocket_HEAT</Ammo_Doom2016Rocket_HEAT>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="Doom2016RocketBase" ParentName="MediumAmmoBase" Abstract="True">
+		<description>Compact 60mm rocket developed by the Union Aerospace Corporation for infantry rocket launchers.</description>
+		<statBases>
+			<MaxHitPoints>150</MaxHitPoints>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoDoom2016Rockets</li>
+		</thingCategories>
+		<stackLimit>9</stackLimit>
+		<cookOffFlashScale>40</cookOffFlashScale>
+		<cookOffSound>MortarBomb_Explode</cookOffSound>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Doom2016RocketBase">
+		<defName>Ammo_Doom2016Rocket_HEAT</defName>
+		<label>UAC Rocket Mk VI (HEAT)</label>
+		<graphicData>
+			<texPath>ThirdParty/CP DOOM and DOOM Kit Classic/Doom2016Rocket</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>22.42</MarketValue>
+			<Mass>0.75</Mass>
+			<Bulk>1.53</Bulk>
+		</statBases>
+		<ammoClass>RocketHEAT</ammoClass>
+		<detonateProjectile>Bullet_Doom2016Rocket_HEAT</detonateProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<!-- Workaround for conditionally-patched projectiles: use an existing abstract class from the generic ammo library (In this case, BaseM6Rocket) -->
+
+	<ThingDef ParentName="BaseM6Rocket">
+		<defName>Bullet_Doom2016Rocket_HEAT</defName>
+		<label>UAC Rocket Mk VI (HEAT)</label>
+		<graphicData>
+			<texPath>Things/Projectile/UACRocket2016</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>225</damageAmountBase>
+			<armorPenetrationSharp>76</armorPenetrationSharp>
+			<armorPenetrationBlunt>19.178</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>64</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1</explosiveRadius>
+				<explosionSound>RHHit_DOOMRocketLauncher</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>1</Fragment_Large>
+					<Fragment_Small>12</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_Doom2016Rocket_HEAT</defName>
+		<label>make UAC Rocket Mk VI (HEAT) rockets x9</label>
+		<description>Craft 9 UAC Rocket Mk VI (HEAT) rockets.</description>
+		<jobString>Making UAC Rocket Mk VI (HEAT) rockets.</jobString>
+		<workAmount>6200</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>14</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Doom2016Rocket_HEAT>9</Ammo_Doom2016Rocket_HEAT>
+		</products>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/CP DOOM/Patches/CP DOOM/CP_DOOM_CE_Patch_Apparel_Armor.xml b/ModPatches/CP DOOM/Patches/CP DOOM/CP_DOOM_CE_Patch_Apparel_Armor.xml
new file mode 100644
index 0000000000..3af0ad7d31
--- /dev/null
+++ b/ModPatches/CP DOOM/Patches/CP DOOM/CP_DOOM_CE_Patch_Apparel_Armor.xml	
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Praetor Suit ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_DOOM2016_PraetorSuit"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_DOOM2016_PraetorSuit"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>40</CarryBulk>
+			<CarryWeight>90</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_DOOM2016_PraetorSuit"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_DOOM2016_PraetorSuit"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>40</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_DOOM2016_PraetorSuit"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>1.0</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_DOOM2016_PraetorSuit"]/statBases</xpath>
+		<value>
+			<ArmorRating_Electric>0.975</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_DOOM2016_PraetorSuit"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/CP DOOM/Patches/CP DOOM/CP_DOOM_CE_Patch_Apparel_Armor_Headgear.xml b/ModPatches/CP DOOM/Patches/CP DOOM/CP_DOOM_CE_Patch_Apparel_Armor_Headgear.xml
new file mode 100644
index 0000000000..1e9d1a2f18
--- /dev/null
+++ b/ModPatches/CP DOOM/Patches/CP DOOM/CP_DOOM_CE_Patch_Apparel_Armor_Headgear.xml	
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Praetor Suit helmet ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_DOOM2016_PraetorSuitHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_DOOM2016_PraetorSuitHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_DOOM2016_PraetorSuitHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>40</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_DOOM2016_PraetorSuitHelmet"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>1.0</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_DOOM2016_PraetorSuitHelmet"]/statBases</xpath>
+		<value>
+			<ArmorRating_Electric>0.975</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="RHApparel_DOOM2016_PraetorSuitHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="RHApparel_DOOM2016_PraetorSuitHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_DOOM2016_PraetorSuitHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!-- WearingGasMask Hediff not applicable -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_DOOM2016_PraetorSuitHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/CP DOOM/Patches/CP DOOM/CP_DOOM_CE_Patch_LauncherDOOM_Weapons.xml b/ModPatches/CP DOOM/Patches/CP DOOM/CP_DOOM_CE_Patch_LauncherDOOM_Weapons.xml
new file mode 100644
index 0000000000..e675161c20
--- /dev/null
+++ b/ModPatches/CP DOOM/Patches/CP DOOM/CP_DOOM_CE_Patch_LauncherDOOM_Weapons.xml	
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== UAC Gauss Cannon ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHEx_DOOM_GAUSSCannon</defName>
+		<statBases>
+			<Mass>12.50</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.20</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.78</SwayFactor>
+			<Bulk>12</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Doom2016GaussCannonFlechette</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<ammoConsumedPerShotCount>30</ammoConsumedPerShotCount>
+			<range>126</range>
+			<soundCast>RHShot_DOOMGAUSS</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<muzzleFlashScale>15</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>150</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_Doom2016GaussCannon</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== BFG 9000 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHEx_DOOM_BFG9000Gun</defName>
+		<statBases>
+			<Mass>10.00</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>0.88</SwayFactor>
+			<Bulk>13.00</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Doom2016Bfg9000Gun</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<soundAiming>RHGun_DOOMBFGAiming</soundAiming>
+			<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+			<range>62</range>
+			<soundCast>RHShot_DOOMBFG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>false</onlyManualCast>
+			<muzzleFlashScale>20</muzzleFlashScale>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>3</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_Doom2016Bfg9000Gun</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== UAC Rocket Launcher ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHEx_DOOM_RocketLauncher</defName>
+		<statBases>
+			<Mass>8.00</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.82</SwayFactor>
+			<Bulk>11.20</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Doom2016Rocket_HEAT</defaultProjectile>
+			<warmupTime>1.9</warmupTime>
+			<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+			<range>40</range>
+			<soundCast>RHShot_DOOMRocketLauncher</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>15</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>5.1</reloadTime>
+			<ammoSet>AmmoSet_Doom2016Rocket</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+	</Operation>
+
+	<!-- ========== UAC Grenade Launcher ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHEx_UACGrenadeLauncher</defName>
+		<statBases>
+			<Mass>5.30</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>1.31</SwayFactor>
+			<Bulk>7.67</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>40</range>
+			<soundCast>RHShot_DOOMGrenadeLauncher</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>15</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>5.1</reloadTime>
+			<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RHEx_DOOM_GAUSSCannon" or
+			defName="RHEx_UACGrenadeLauncher"
+			]/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="RHEx_DOOM_BFG9000Gun" or
+			defName="RHEx_DOOM_RocketLauncher"
+			]/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>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/CP DOOM/Patches/CP DOOM/CP_DOOM_CE_Patch_MeleeDOOM_Weapons.xml b/ModPatches/CP DOOM/Patches/CP DOOM/CP_DOOM_CE_Patch_MeleeDOOM_Weapons.xml
new file mode 100644
index 0000000000..b6a6c33756
--- /dev/null
+++ b/ModPatches/CP DOOM/Patches/CP DOOM/CP_DOOM_CE_Patch_MeleeDOOM_Weapons.xml	
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Mixom Beavertooth Painsaw (Chainsaw) ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHMelee_DOOM_Chainsaw"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>RHMelee_ChainsawSlash</li>
+					</capacities>
+					<power>38</power>
+					<cooldownTime>4.36</cooldownTime>
+					<armorPenetrationBlunt>3.7</armorPenetrationBlunt>
+					<armorPenetrationSharp>14.8</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>RHMelee_ChainsawStab</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>2.47</cooldownTime>
+					<armorPenetrationBlunt>3.7</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.65</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHMelee_DOOM_Chainsaw"]/statBases</xpath>
+		<value>
+			<Bulk>9</Bulk>
+			<MeleeCounterParryBonus>0.14</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHMelee_DOOM_Chainsaw"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.04</MeleeCritChance>
+				<MeleeParryChance>0.1</MeleeParryChance>
+				<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- ========== Crucible Blade ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHMelee_DOOMCrucible"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.69</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.80</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>40</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>5</amount>
+							<chance>0.3</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>2.06</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>3.20</armorPenetrationBlunt>
+					<armorPenetrationSharp>16</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>17</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>3</amount>
+							<chance>0.2</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>0.99</cooldownTime>
+					<armorPenetrationBlunt>3.24</armorPenetrationBlunt>
+					<armorPenetrationSharp>32.4</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHMelee_DOOMCrucible"]/statBases</xpath>
+		<value>
+			<Bulk>8.5</Bulk>
+			<MeleeCounterParryBonus>0.80</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHMelee_DOOMCrucible"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.00</MeleeCritChance>
+				<MeleeParryChance>0.60</MeleeParryChance>
+				<MeleeDodgeChance>0.40</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/CP DOOM/Patches/CP DOOM/CP_DOOM_CE_Patch_RangedDOOM_Weapons.xml b/ModPatches/CP DOOM/Patches/CP DOOM/CP_DOOM_CE_Patch_RangedDOOM_Weapons.xml
new file mode 100644
index 0000000000..182c763a1e
--- /dev/null
+++ b/ModPatches/CP DOOM/Patches/CP DOOM/CP_DOOM_CE_Patch_RangedDOOM_Weapons.xml	
@@ -0,0 +1,546 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== UAC EMG Sidearm ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHGun_DOOM_UACEMGPistol</defName>
+		<statBases>
+			<Mass>1.35</Mass>
+			<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.176</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>2.45</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Doom2016EmgPistol</defaultProjectile>
+			<warmupTime>0.0</warmupTime>
+			<range>12</range>
+			<soundCast>RHShot_DOOMEMGPistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<!-- Infinite ammo -->
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+	</Operation>
+
+	<!-- ========== UAC EMG Mk V Pistol ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHGun_DOOM_UACEMGMarkVPistol</defName>
+		<statBases>
+			<Mass>1.35</Mass>
+			<RangedWeapon_Cooldown>0.05</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.176</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>2.45</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Doom2016EmgMkVPistol</defaultProjectile>
+			<warmupTime>0.0</warmupTime>
+			<range>12</range>
+			<soundCast>RHShot_DOOMEMGMarkVPistol</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_Doom2016EmgMkVPistol</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== UAC Combat Shotgun ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHGun_DOOM_CombatShotgun</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.49</SwayFactor>
+			<Bulk>7.67</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.26</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>RHShot_DOOMCombatShotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+	</Operation>
+
+	<!-- ========== UAC Combat Shotgun - Eternal ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHGun_DOOM_CombatShotgunEternal</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.68</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.49</SwayFactor>
+			<Bulk>7.67</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.26</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.7</warmupTime>
+			<range>26</range>
+			<soundCast>RHShot_DOOMCombatShotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+	</Operation>
+
+	<!-- ========== Super Shotgun ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHGun_DOOM_SuperShotgun</defName>
+		<statBases>
+			<Mass>1.90</Mass>
+			<RangedWeapon_Cooldown>0.93</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>2.73</SwayFactor>
+			<Bulk>6.29</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_DoubleBarreled_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<range>11</range>
+			<soundCast>RHShot_DOOMSuperShotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>2</magazineSize>
+			<reloadTime>1.7</reloadTime>
+			<ammoSet>AmmoSet_12Gauge_CP_DOOM_SuperShotgun</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== UAC Heavy Assault Rifle ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHGun_DOOM_HeavyAssaultRifle</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>9.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.48</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>6</burstShotCount>
+			<soundCast>RHShot_DOOMHeavyAssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>90</magazineSize>
+			<reloadTime>7.80</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== UAC Heavy Assault Rifle ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHGun_DOOM_HeavyCannon</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.01</SwayFactor>
+			<Bulk>10.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.45</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>82</range>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>RHShot_EternalHeavyCannon</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.80</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== UAC D12 Chaingun ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHGun_DOOM_Chaingun</defName>
+		<statBases>
+			<Mass>39.00</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.32</SwayFactor>
+			<Bulk>9.5</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.58</recoilAmount>
+			<recoilPattern>Mounted</recoilPattern>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>2.3</warmupTime>
+			<range>62</range>
+			<burstShotCount>150</burstShotCount>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<soundCast>RHFire_DOOMChaingun</soundCast>
+			<soundAiming>RHGun_DOOMChaingunAiming</soundAiming>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>150</magazineSize>
+			<reloadTime>9.2</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== UAC Plasma Rifle ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHGun_DOOM_PlasmaRifle</defName>
+		<statBases>
+			<Mass>8.20</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>13.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.48</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Doom2016PlasmaGun</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>RHShot_DOOMPlasmaRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>150</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_Doom2016PlasmaGun</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== UAC Plasma Gun ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHGun_DOOM_PlasmaGun</defName>
+		<statBases>
+			<Mass>8.20</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>10.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.48</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Doom2016PlasmaGun</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>RHShot_DOOMPlasmaGun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>150</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_Doom2016PlasmaGun</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== UAC Vortex Rifle ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHGun_DOOM_VortexRifle</defName>
+		<statBases>
+			<Mass>7.51</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.60</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.76</SwayFactor>
+			<Bulk>9.05</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Doom2016VortexRifle</defaultProjectile>
+			<warmupTime>1.6</warmupTime>
+			<range>68</range>
+			<soundCast>RHFire_DOOMVortexRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_Doom2016VortexRifle</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== UAC Hellshot ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHGun_DOOM_Hellshot</defName>
+		<statBases>
+			<Mass>6.35</Mass>
+			<RangedWeapon_Cooldown>0.05</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.42</SwayFactor>
+			<Bulk>7.49</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Doom2016Hellshot</defaultProjectile>
+			<warmupTime>0.0</warmupTime>
+			<range>48</range>
+			<soundCast>RHFire_DOOMHellshot</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>60</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_Doom2016Hellshot</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RHGun_DOOM_UACEMGPistol" or
+			defName="RHGun_DOOM_UACEMGMarkVPistol"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RHGun_DOOM_CombatShotgun" or
+			defName="RHGun_DOOM_CombatShotgunEternal" or
+			defName="RHGun_DOOM_SuperShotgun" or
+			defName="RHGun_DOOM_HeavyAssaultRifle" or
+			defName="RHGun_DOOM_PlasmaRifle" or
+			defName="RHGun_DOOM_PlasmaGun" or
+			defName="RHGun_DOOM_VortexRifle" or
+			defName="RHGun_DOOM_HeavyCannon" or
+			defName="RHGun_DOOM_Hellshot"
+			]/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="RHGun_DOOM_Chaingun"
+			]/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>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/CP Spec Ops The Line/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_Apparel_Armor.xml b/ModPatches/CP Spec Ops The Line/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_Apparel_Armor.xml
new file mode 100644
index 0000000000..b1297388bf
--- /dev/null
+++ b/ModPatches/CP Spec Ops The Line/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_Apparel_Armor.xml	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Crye JPC body armor (Delta) ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_CryeJPC_SOTL_Delta"]/statBases</xpath>
+		<value>
+			<Bulk>6.5</Bulk>
+			<WornBulk>4.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_CryeJPC_SOTL_Delta"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>10</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_CryeJPC_SOTL_Delta"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_CryeJPC_SOTL_Delta"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>31</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_CryeJPC_SOTL_Delta"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.36</ArmorRating_Heat>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/CP Spec Ops The Line/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_Apparel_Armor_Headgear.xml b/ModPatches/CP Spec Ops The Line/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_Apparel_Armor_Headgear.xml
new file mode 100644
index 0000000000..57cf0aa54d
--- /dev/null
+++ b/ModPatches/CP Spec Ops The Line/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_Apparel_Armor_Headgear.xml	
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== PT A-Bravo helmet Delta ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_PTABravoHelmet_SOTL_Delta"]/statBases</xpath>
+		<value>
+			<Bulk>4.5</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.54</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_PTABravoHelmet_SOTL_Delta"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.20</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/CP Spec Ops The Line/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_Apparel_Backpacks.xml b/ModPatches/CP Spec Ops The Line/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_Apparel_Backpacks.xml
new file mode 100644
index 0000000000..f252b45ee4
--- /dev/null
+++ b/ModPatches/CP Spec Ops The Line/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_Apparel_Backpacks.xml	
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Messenger Bag Tactical ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_Backpack_Tactical_ShoulderBag"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_Backpack_Tactical_ShoulderBag"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>15</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_Backpack_Tactical_ShoulderBag"]/apparel
+		</xpath>
+		<value>
+			<apparel>
+				<careIfWornByCorpse>false</careIfWornByCorpse>
+				<bodyPartGroups>
+					<li>Shoulders</li>
+				</bodyPartGroups>
+				<layers>
+					<li>Backpack</li>
+				</layers>
+				<tags>
+					<li>RH_Backpack_ShoulderBag</li>
+					<li>PassiveCamo_Desert_Med</li>
+				</tags>
+				<defaultOutfitTags>
+					<li>Soldier</li>
+				</defaultOutfitTags>
+				<wornGraphicPath>Things/Apparel/Belt/MessengerBag_Tactical</wornGraphicPath>
+			</apparel>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/CP Spec Ops The Line/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_Apparel_Headgear.xml b/ModPatches/CP Spec Ops The Line/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_Apparel_Headgear.xml
new file mode 100644
index 0000000000..89993b8689
--- /dev/null
+++ b/ModPatches/CP Spec Ops The Line/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_Apparel_Headgear.xml	
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Shemagh scarf (Walker) & Shemagh mask (Walker) ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_Shemagh_Scarf_Delta" or
+			defName="RHApparel_Shemagh_Mask_Delta"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<!-- Equivalent to vanilla pants, T-shirt and button-down shirt -->
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Baseball Cap Backwards (Delta), Baseball Cap (Lugo), Boonie Hat A-TACS AU (Delta) ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_BackwardsCap_ATACSAU_Delta" or
+			defName="RHApparel_LugoCap" or
+			defName="RHApparel_ATACSAUBoonie_Delta"
+			]/statBases </xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_BackwardsCap_ATACSAU_Delta" or
+			defName="RHApparel_LugoCap" or
+			defName="RHApparel_ATACSAUBoonie_Delta"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<!-- Equivalent to vanilla fabric hats -->
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/CP Spec Ops The Line/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_Apparel_OnSkin.xml b/ModPatches/CP Spec Ops The Line/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_Apparel_OnSkin.xml
new file mode 100644
index 0000000000..670c001369
--- /dev/null
+++ b/ModPatches/CP Spec Ops The Line/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_Apparel_OnSkin.xml	
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Combat UBAC A-TACS AU, Combats A-TACS AU (Delta) ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_combats_ATACSAU_Delta" or
+			defName="RHApparel_combats_ATACSAU_DeltaII"
+			]/statBases </xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>3</WornBulk>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+			<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_combats_ATACSAU_Delta" or
+			defName="RHApparel_combats_ATACSAU_DeltaII"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<!-- Slightly tougher than vanilla pants, T-shirt and button-down shirt -->
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/CP Spec Ops The Line/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_PawnKindDefs.xml b/ModPatches/CP Spec Ops The Line/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_PawnKindDefs.xml
new file mode 100644
index 0000000000..255e45585f
--- /dev/null
+++ b/ModPatches/CP Spec Ops The Line/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_PawnKindDefs.xml	
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Reduce meals and medicine carried by all pawns ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[@Name="RH_DeltaSOTL_Bare"]/invNutrition</xpath>
+		<value>
+			<invNutrition>1</invNutrition>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RH_SOTL_Delta_Operator"]/inventoryOptions/subOptionsChooseOne/li/countRange</xpath>
+		<value>
+			<countRange>
+				<min>0</min>
+				<max>1</max>
+			</countRange>
+		</value>
+	</Operation>
+
+	<!-- ========== Delta QRF Operator pawns should spawn backpacks, allowing them to carry their (huge) inventory ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="RH_SOTL_Delta_QRF"]/apparelRequired</xpath>
+		<value>
+			<li>RHApparel_Backpack_Tactical_ShoulderBag</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Delta QRF Operator pawns should spawn with ammo appropriate to their primary weapon ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RH_SOTL_Delta_QRF"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Delta Rogue Operator pawns should spawn with ammo appropriate to their primary weapon ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RH_SOTL_Delta_Rogue"]/inventoryOptions/subOptionsChooseOne/li/countRange</xpath>
+		<value>
+			<countRange>0~2</countRange>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RH_SOTL_Delta_Rogue"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/CP Spec Ops The Line/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_RangedIndustrial_LMG.xml b/ModPatches/CP Spec Ops The Line/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_RangedIndustrial_LMG.xml
new file mode 100644
index 0000000000..0eef572cb9
--- /dev/null
+++ b/ModPatches/CP Spec Ops The Line/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_RangedIndustrial_LMG.xml	
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+Chicken Plucker's Project Red Horse mods often have duplicate items, apparels and defs shared between them,
+so this patch will only be applied if:
+
+Spec Ops: The Line is active && Rimmu-Nation Weapons is NOT active
+
+If both mods are active, the CE patch from Rimmu-Nation Weapons should automatically take over
+--><Patch>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>[CP] Rimmu-Nation - Weapons (1.0)</li>
+		</mods>
+		<nomatch Class="PatchOperationSequence">
+			<operations>
+
+				<!-- ========== M249 ========== -->
+
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>RNGun_M249LMG</defName>
+					<statBases>
+						<Mass>7.5</Mass>
+						<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
+						<SightsEfficiency>2.21</SightsEfficiency>
+						<ShotSpread>0.06</ShotSpread>
+						<SwayFactor>1.27</SwayFactor>
+						<Bulk>13.35</Bulk>
+						<WorkToMake>42500</WorkToMake>
+					</statBases>
+					<costList>
+						<Chemfuel>15</Chemfuel>
+						<Steel>70</Steel>
+						<ComponentIndustrial>7</ComponentIndustrial>
+					</costList>
+					<Properties>
+						<recoilAmount>0.94</recoilAmount>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+						<warmupTime>1.475</warmupTime>
+						<range>75</range>
+						<burstShotCount>10</burstShotCount>
+						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+						<soundCast>RNShotL86LMG</soundCast>
+						<soundCastTail>GunTail_Medium</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+
+					<AmmoUser>
+						<magazineSize>200</magazineSize>
+						<reloadTime>7.8</reloadTime>
+						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+					</AmmoUser>
+
+					<FireModes>
+						<aiUseBurstMode>FALSE</aiUseBurstMode>
+						<aiAimMode>SuppressFire</aiAimMode>
+						<aimedBurstShotCount>5</aimedBurstShotCount>
+					</FireModes>
+
+					<!-- No additional CE weaponTags needed -->
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="RNGun_M249LMG"]/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>
+				</li>
+
+			</operations>
+		</nomatch>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/CP Spec Ops The Line/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_RangedIndustrial_M_BoltAction.xml b/ModPatches/CP Spec Ops The Line/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_RangedIndustrial_M_BoltAction.xml
new file mode 100644
index 0000000000..251cd62ba0
--- /dev/null
+++ b/ModPatches/CP Spec Ops The Line/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_RangedIndustrial_M_BoltAction.xml	
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Steyr Scout ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_SteyrScoutSn</defName>
+		<statBases>
+			<Mass>3.20</Mass>
+			<RangedWeapon_Cooldown>1.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.15</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>0.93</SwayFactor>
+			<Bulk>10.80</Bulk>
+			<WorkToMake>21500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.425</warmupTime>
+			<range>75</range>
+			<soundCast>RNShot_SSG08Sn</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNGun_SteyrScoutSn"]/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>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/CP Spec Ops The Line/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_RangedIndustrial_R_AR_Style.xml b/ModPatches/CP Spec Ops The Line/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_RangedIndustrial_R_AR_Style.xml
new file mode 100644
index 0000000000..6f86e03943
--- /dev/null
+++ b/ModPatches/CP Spec Ops The Line/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_RangedIndustrial_R_AR_Style.xml	
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== M4A1 Walker ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M4A1Walker</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>
+			<WorkToMake>32000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.58</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR_II</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNGun_M4A1Walker"]/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>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/CP Spec Ops The Line/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_RangedIndustrial_SF_Pack.xml b/ModPatches/CP Spec Ops The Line/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_RangedIndustrial_SF_Pack.xml
new file mode 100644
index 0000000000..cb48efad59
--- /dev/null
+++ b/ModPatches/CP Spec Ops The Line/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_RangedIndustrial_SF_Pack.xml	
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== M4A1 SD Delta ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M4A1Delta</defName>
+		<statBases>
+			<Mass>3.52</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.40</SwayFactor>
+			<Bulk>9.21</Bulk>
+			<WorkToMake>37000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.44</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_SDAR_III</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== HK416 SD Wolfpack ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_HK416SD_Wolfpack</defName>
+		<statBases>
+			<Mass>4.38</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.54</SwayFactor>
+			<Bulk>10.10</Bulk>
+			<WorkToMake>35500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>55</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.27</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>62</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_SDAR</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNGun_M4A1Delta" or
+			defName="RNGun_HK416SD_Wolfpack"
+			]/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>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/CP Spec Ops The Line/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_RangedSpecial_AirSupport.xml b/ModPatches/CP Spec Ops The Line/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_RangedSpecial_AirSupport.xml
new file mode 100644
index 0000000000..acd072bf3f
--- /dev/null
+++ b/ModPatches/CP Spec Ops The Line/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_RangedSpecial_AirSupport.xml	
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Adjust mass and bulk of SOFLAM based on real-life stats for the AN/PEQ-1 -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNAir_SOFLAM"]</xpath>
+		<value>
+			<statBases>
+				<Mass>5.2</Mass>
+				<Bulk>2.5</Bulk>
+			</statBases>
+		</value>
+	</Operation>
+
+	<!-- Increase SOFLAM range, to match its real-life performance relative to RimWorld-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNAir_SOFLAM"]/verbs/li/range</xpath>
+		<value>
+			<range>700</range>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/CP Spec Ops The Line/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_Scenario.xml b/ModPatches/CP Spec Ops The Line/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_Scenario.xml
new file mode 100644
index 0000000000..7e6e2e9ca6
--- /dev/null
+++ b/ModPatches/CP Spec Ops The Line/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_Scenario.xml	
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="RH_Scenario_SOTL_Delta"]/scenario/parts</xpath>
+		<value>
+
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_556x45mmNATO_FMJ</thingDef>
+				<count>1000</count>
+			</li>
+
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_762x51mmNATO_FMJ</thingDef>
+				<count>500</count>
+			</li>
+
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/CP The DOOM Kit - Classic/Defs/CP The DOOM Kit - Classic/CP_DOOM_CE_Patch_Ammo_12Gauge_Dual_Classic.xml b/ModPatches/CP The DOOM Kit - Classic/Defs/CP The DOOM Kit - Classic/CP_DOOM_CE_Patch_Ammo_12Gauge_Dual_Classic.xml
new file mode 100644
index 0000000000..b88ee7207e
--- /dev/null
+++ b/ModPatches/CP The DOOM Kit - Classic/Defs/CP The DOOM Kit - Classic/CP_DOOM_CE_Patch_Ammo_12Gauge_Dual_Classic.xml	
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- ========== Custom variants of the standard 12 Gauge shotgun projectiles, emulating the effect of two ordinary 12 Gauge shotgun shells being fired side-by-side simultaneously ========== -->
+
+	<ThingDef ParentName="Base12GaugeBullet">
+		<defName>Bullet_12Gauge_DoubleBarreled_Buck</defName>
+		<label>buckshot pellet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shotgun_Pellet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>18</damageAmountBase>
+			<pelletCount>18</pelletCount><!-- Twice the usual number of buckshot pellets -->
+			<armorPenetrationSharp>4</armorPenetrationSharp>
+			<armorPenetrationBlunt>5.7</armorPenetrationBlunt>
+			<spreadMult>17.8</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base12GaugeBullet">
+		<defName>Bullet_12Gauge_DoubleBarreled_Slug</defName>
+		<label>shotgun slug</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>92</speed>
+			<damageAmountBase>46</damageAmountBase>
+			<pelletCount>2</pelletCount><!-- Double slugs -->
+			<armorPenetrationSharp>6</armorPenetrationSharp>
+			<armorPenetrationBlunt>48.04</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base12GaugeBullet">
+		<defName>Bullet_12Gauge_DoubleBarreled_Beanbag</defName>
+		<label>beanbag</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>30</speed>
+			<damageDef>Beanbag</damageDef>
+			<damageAmountBase>18</damageAmountBase>
+			<pelletCount>2</pelletCount><!-- Double beanbags -->
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>3.240</armorPenetrationBlunt>
+			<spreadMult>2</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base12GaugeBullet">
+		<defName>Bullet_12Gauge_DoubleBarreled_ElectroSlug</defName>
+		<label>EMP slug</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>43</speed>
+			<damageDef>EMP</damageDef>
+			<damageAmountBase>24</damageAmountBase>
+			<pelletCount>2</pelletCount><!-- Double EMP slugs -->
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>8.509</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<!-- ========== Custom AmmoSet for the double-barreled Super Shotgun, which maps the custom 12 Gauge shotgun projectiles to standard versions of their craftable ammo ========== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_12Gauge_CP_DOOM_SuperShotgun</defName>
+		<label>12 Gauge</label>
+		<ammoTypes>
+			<Ammo_12Gauge_Buck>Bullet_12Gauge_DoubleBarreled_Buck</Ammo_12Gauge_Buck>
+			<Ammo_12Gauge_Slug>Bullet_12Gauge_DoubleBarreled_Slug</Ammo_12Gauge_Slug>
+			<Ammo_12Gauge_Beanbag>Bullet_12Gauge_DoubleBarreled_Beanbag</Ammo_12Gauge_Beanbag>
+			<Ammo_12Gauge_ElectroSlug>Bullet_12Gauge_DoubleBarreled_ElectroSlug</Ammo_12Gauge_ElectroSlug>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/CP The DOOM Kit - Classic/Defs/CP The DOOM Kit - Classic/CP_DOOM_KitClassic_CE_Patch_Ammo_ClassicEnergyCell.xml b/ModPatches/CP The DOOM Kit - Classic/Defs/CP The DOOM Kit - Classic/CP_DOOM_KitClassic_CE_Patch_Ammo_ClassicEnergyCell.xml
new file mode 100644
index 0000000000..06ab8ddd60
--- /dev/null
+++ b/ModPatches/CP The DOOM Kit - Classic/Defs/CP The DOOM Kit - Classic/CP_DOOM_KitClassic_CE_Patch_Ammo_ClassicEnergyCell.xml	
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- There is only one type of UAC Energy Cell for CE, no subcategory for variants required -->
+
+	<!-- ==================== AmmoSets ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_DoomClassicPlasmaGun</defName>
+		<label>UAC Energy Cell</label>
+		<ammoTypes>
+			<Ammo_DoomClassicEnergyCell>Bullet_DoomClassicPlasmaGun</Ammo_DoomClassicEnergyCell>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_DoomClassicBfg9000Gun</defName>
+		<label>UAC Energy Cell</label>
+		<ammoTypes>
+			<Ammo_DoomClassicEnergyCell>Bullet_DoomClassicBfg9000Gun</Ammo_DoomClassicEnergyCell>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_DoomClassicEnergyCell</defName>
+		<label>UAC Energy Cell</label>
+		<description>Plasma containment power cell developed by the Union Aerospace Corporation for experimental energy weapons</description>
+		<statBases>
+			<Mass>0.013</Mass>
+			<Bulk>0.03</Bulk>
+			<MarketValue>1.48</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+			<!-- Plasma ammo can't be handloaded, and the containment cell must be precision-machined anyway -->
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoAdvanced</li>
+		</thingCategories>
+		<stackLimit>100</stackLimit>
+		<graphicData>
+			<texPath>ThirdParty/CP DOOM and DOOM Kit Classic/DoomClassicEnergyCell</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>Plasma</ammoClass>
+		<comps>
+			<!-- Arbitarily defined cookoff explosive stats; represents a plasma containment system failing -->
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>20</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>2</Fragment_Large>
+					<Fragment_Small>10</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<!-- Workaround for conditionally-patched projectiles: use an existing abstract class from the generic ammo library (In this case, Base6x24mmChargedBullet) -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_DoomClassicPlasmaGun</defName>
+		<label>Plasma Shot</label>
+		<graphicData>
+			<texPath>Things/Projectile/Plasma_Classic</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>200</speed>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>14</damageAmountBase>
+			<explosionRadius>0.5</explosionRadius>
+			<suppressionFactor>3.0</suppressionFactor>
+			<dangerFactor>2.0</dangerFactor>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>67</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_DoomClassicBfg9000Gun</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>BFG Plasma Shot</label>
+		<graphicData>
+			<texPath>Things/Projectile/BFGPLAZMA</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>200</speed>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>560</damageAmountBase>
+			<explosionRadius>2.5</explosionRadius>
+			<suppressionFactor>3.0</suppressionFactor>
+			<dangerFactor>2.0</dangerFactor>
+			<soundExplode>RHHit_DOOMClassicBFG</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>2680</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_DoomClassicEnergyCell</defName>
+		<label>make UAC Energy Cells x100 shots</label>
+		<description>Craft 100 shots' worth of UAC Energy Cells.</description>
+		<jobString>Making UAC Energy Cells.</jobString>
+		<workAmount>4800</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Plasteel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_DoomClassicEnergyCell>100</Ammo_DoomClassicEnergyCell>
+		</products>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/CP The DOOM Kit - Classic/Defs/CP The DOOM Kit - Classic/CP_DOOM_KitClassic_CE_Patch_Ammo_ClassicRocket.xml b/ModPatches/CP The DOOM Kit - Classic/Defs/CP The DOOM Kit - Classic/CP_DOOM_KitClassic_CE_Patch_Ammo_ClassicRocket.xml
new file mode 100644
index 0000000000..1e70309f6b
--- /dev/null
+++ b/ModPatches/CP The DOOM Kit - Classic/Defs/CP The DOOM Kit - Classic/CP_DOOM_KitClassic_CE_Patch_Ammo_ClassicRocket.xml	
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoDoomClassicRockets</defName>
+		<label>UAC Rocket Mk I</label>
+		<parent>AmmoRockets</parent>
+		<iconPath>ThirdParty/CP DOOM and DOOM Kit Classic/DoomClassicRocket/DoomClassicRocket_c</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_DoomClassicRocket</defName>
+		<label>UAC Rocket Mk I</label>
+		<ammoTypes>
+			<Ammo_DoomClassicRocket_HEAT>Bullet_DoomClassicRocket_HEAT</Ammo_DoomClassicRocket_HEAT>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="DoomClassicRocketBase" ParentName="MediumAmmoBase" Abstract="True">
+		<description>Compact 60mm rocket developed by the Union Aerospace Corporation for infantry rocket launchers.</description>
+		<statBases>
+			<MaxHitPoints>150</MaxHitPoints>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoDoomClassicRockets</li>
+		</thingCategories>
+		<stackLimit>5</stackLimit>
+		<cookOffFlashScale>40</cookOffFlashScale>
+		<cookOffSound>MortarBomb_Explode</cookOffSound>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="DoomClassicRocketBase">
+		<defName>Ammo_DoomClassicRocket_HEAT</defName>
+		<label>UAC Rocket Mk I (HEAT)</label>
+		<graphicData>
+			<texPath>ThirdParty/CP DOOM and DOOM Kit Classic/DoomClassicRocket</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>34.44</MarketValue>
+			<Mass>0.75</Mass>
+			<Bulk>1.53</Bulk>
+		</statBases>
+		<ammoClass>RocketHEAT</ammoClass>
+		<detonateProjectile>Bullet_DoomClassicRocket_HEAT</detonateProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<!-- Workaround for conditionally-patched projectiles: use an existing abstract class from the generic ammo library (In this case, BaseM6Rocket) -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseM6Rocket">
+		<defName>Bullet_DoomClassicRocket_HEAT</defName>
+		<label>UAC Rocket Mk I (HEAT)</label>
+		<graphicData>
+			<texPath>Things/Projectile/DOOM_Rocket</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>60</speed>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>225</damageAmountBase>
+			<armorPenetrationSharp>76</armorPenetrationSharp>
+			<armorPenetrationBlunt>19.178</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>64</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1</explosiveRadius>
+				<explosionSound>RHHit_DOOMClassicRocketLauncher</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>1</Fragment_Large>
+					<Fragment_Small>12</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_DoomClassicRocket_HEAT</defName>
+		<label>make UAC Rocket Mk I (HEAT) rockets x5</label>
+		<description>Craft 5 UAC Rocket Mk I (HEAT) rockets.</description>
+		<jobString>Making UAC Rocket Mk I (HEAT) rockets.</jobString>
+		<workAmount>4800</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_DoomClassicRocket_HEAT>5</Ammo_DoomClassicRocket_HEAT>
+		</products>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/CP The DOOM Kit - Classic/Patches/CP The DOOM Kit - Classic/CP_DOOM_KitClassic_CE_Patch_Apparel_Armor.xml b/ModPatches/CP The DOOM Kit - Classic/Patches/CP The DOOM Kit - Classic/CP_DOOM_KitClassic_CE_Patch_Apparel_Armor.xml
new file mode 100644
index 0000000000..73e52758ef
--- /dev/null
+++ b/ModPatches/CP The DOOM Kit - Classic/Patches/CP The DOOM Kit - Classic/CP_DOOM_KitClassic_CE_Patch_Apparel_Armor.xml	
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Praetor Suit (classic) ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_PraetorSuit"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_PraetorSuit"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>40</CarryBulk>
+			<CarryWeight>90</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_PraetorSuit"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_PraetorSuit"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>40</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_PraetorSuit"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>1.0</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_PraetorSuit"]/statBases</xpath>
+		<value>
+			<ArmorRating_Electric>0.975</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_PraetorSuit"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/CP The DOOM Kit - Classic/Patches/CP The DOOM Kit - Classic/CP_DOOM_KitClassic_CE_Patch_Apparel_Armor_Headgear.xml b/ModPatches/CP The DOOM Kit - Classic/Patches/CP The DOOM Kit - Classic/CP_DOOM_KitClassic_CE_Patch_Apparel_Armor_Headgear.xml
new file mode 100644
index 0000000000..1e521ed04d
--- /dev/null
+++ b/ModPatches/CP The DOOM Kit - Classic/Patches/CP The DOOM Kit - Classic/CP_DOOM_KitClassic_CE_Patch_Apparel_Armor_Headgear.xml	
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Praetor Suit helmet (classic) ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_PraetorSuitHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_PraetorSuitHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_PraetorSuitHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>40</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_PraetorSuitHelmet"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>1.0</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_PraetorSuitHelmet"]/statBases</xpath>
+		<value>
+			<ArmorRating_Electric>0.975</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_PraetorSuitHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_PraetorSuitHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_PraetorSuitHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!-- WearingGasMask Hediff not applicable -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_PraetorSuitHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Security Helmet (DOOM) ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_OriginalSecurityHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_OriginalSecurityHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_OriginalSecurityHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>32</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_OriginalSecurityHelmet"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.76</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_OriginalSecurityHelmet"]/statBases</xpath>
+		<value>
+			<ArmorRating_Electric>0.75</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_OriginalSecurityHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_OriginalSecurityHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_OriginalSecurityHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_OriginalSecurityHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/CP The DOOM Kit - Classic/Patches/CP The DOOM Kit - Classic/CP_DOOM_KitClassic_CE_Patch_LauncherDOOM_Weapons.xml b/ModPatches/CP The DOOM Kit - Classic/Patches/CP The DOOM Kit - Classic/CP_DOOM_KitClassic_CE_Patch_LauncherDOOM_Weapons.xml
new file mode 100644
index 0000000000..f882852074
--- /dev/null
+++ b/ModPatches/CP The DOOM Kit - Classic/Patches/CP The DOOM Kit - Classic/CP_DOOM_KitClassic_CE_Patch_LauncherDOOM_Weapons.xml	
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== BFG 9000 (DOOM) ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHEx_DOOMClassic_BFG9000Gun</defName>
+		<statBases>
+			<Mass>10.00</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>0.88</SwayFactor>
+			<Bulk>13.00</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_DoomClassicBfg9000Gun</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<ammoConsumedPerShotCount>40</ammoConsumedPerShotCount>
+			<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+			<range>62</range>
+			<soundCast>RHShot_DOOMClassicBFG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<muzzleFlashScale>20</muzzleFlashScale>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_DoomClassicBfg9000Gun</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Rocket Launcher (DOOM) ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHEx_DOOMClassic_RocketLauncher</defName>
+		<statBases>
+			<Mass>8.00</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.82</SwayFactor>
+			<Bulk>11.20</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_DoomClassicRocket_HEAT</defaultProjectile>
+			<warmupTime>1.9</warmupTime>
+			<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+			<range>40</range>
+			<soundCast>RHShot_DOOMClassicRocketLauncher</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>15</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>5.1</reloadTime>
+			<ammoSet>AmmoSet_DoomClassicRocket</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RHEx_DOOMClassic_BFG9000Gun" or
+			defName="RHEx_DOOMClassic_RocketLauncher"
+			]/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>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/CP The DOOM Kit - Classic/Patches/CP The DOOM Kit - Classic/CP_DOOM_KitClassic_CE_Patch_MeleeDOOM_Weapons.xml b/ModPatches/CP The DOOM Kit - Classic/Patches/CP The DOOM Kit - Classic/CP_DOOM_KitClassic_CE_Patch_MeleeDOOM_Weapons.xml
new file mode 100644
index 0000000000..989b630a95
--- /dev/null
+++ b/ModPatches/CP The DOOM Kit - Classic/Patches/CP The DOOM Kit - Classic/CP_DOOM_KitClassic_CE_Patch_MeleeDOOM_Weapons.xml	
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Mixom Beavertooth Painsaw (chainsaw) ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHMelee_DOOMClassic_Chainsaw"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>RHMelee_ClassicChainsawSlash</li>
+					</capacities>
+					<power>38</power>
+					<cooldownTime>4.36</cooldownTime>
+					<armorPenetrationBlunt>3.7</armorPenetrationBlunt>
+					<armorPenetrationSharp>14.8</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>RHMelee_ClassicChainsawStab</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>2.47</cooldownTime>
+					<armorPenetrationBlunt>3.7</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.65</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHMelee_DOOMClassic_Chainsaw"]/statBases</xpath>
+		<value>
+			<Bulk>9</Bulk>
+			<MeleeCounterParryBonus>0.14</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHMelee_DOOMClassic_Chainsaw"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.04</MeleeCritChance>
+				<MeleeParryChance>0.1</MeleeParryChance>
+				<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/CP The DOOM Kit - Classic/Patches/CP The DOOM Kit - Classic/CP_DOOM_KitClassic_CE_Patch_RangedDOOM_Weapons.xml b/ModPatches/CP The DOOM Kit - Classic/Patches/CP The DOOM Kit - Classic/CP_DOOM_KitClassic_CE_Patch_RangedDOOM_Weapons.xml
new file mode 100644
index 0000000000..1833e6d8a7
--- /dev/null
+++ b/ModPatches/CP The DOOM Kit - Classic/Patches/CP The DOOM Kit - Classic/CP_DOOM_KitClassic_CE_Patch_RangedDOOM_Weapons.xml	
@@ -0,0 +1,286 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Pistol (DOOM) ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_DOOMClassic_Pistol</defName>
+		<statBases>
+			<Mass>0.97</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.05</SwayFactor>
+			<Bulk>2.17</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RHShot_DOOMClassic_Pistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Shotgun (DOOM) ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHGun_DOOMClassic_Shotgun</defName>
+		<statBases>
+			<Mass>3.40</Mass>
+			<RangedWeapon_Cooldown>1.00</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.55</SwayFactor>
+			<Bulk>12.07</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RHShot_DOOMClassicShotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>5.1</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Super Shotgun (DOOM) ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHGun_DOOMClassic_SuperShotgun</defName>
+		<statBases>
+			<Mass>1.90</Mass>
+			<RangedWeapon_Cooldown>0.93</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>2.73</SwayFactor>
+			<Bulk>6.29</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_DoubleBarreled_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<range>11</range>
+			<soundCast>RHShot_DOOMClassicSuperShotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>2</magazineSize>
+			<reloadTime>1.7</reloadTime>
+			<ammoSet>AmmoSet_12Gauge_CP_DOOM_SuperShotgun</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Chaingun (DOOM) ========== -->
+	<!-- Note: In-game lore explicitly states that the chaingun uses the same ammo as the pistol -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHGun_DOOMClassic_Chaingun</defName>
+		<statBases>
+			<Mass>39.00</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.32</SwayFactor>
+			<Bulk>8.02</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.58</recoilAmount>
+			<recoilPattern>Mounted</recoilPattern>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>2.3</warmupTime>
+			<range>62</range>
+			<burstShotCount>200</burstShotCount>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<soundCast>RHShot_DOOMClassic_Pistol</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>9.2</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHGun_DOOMClassic_Chaingun"]/description</xpath>
+		<value>
+			<description>The chaingun (also known as "gatling gun") is a rapid-firing, multi-barrelled automatic weapon that uses the same ammunition as the pistol. A high velocity heavy weapon capable of suppressing multiple targets at once.</description>
+		</value>
+	</Operation>
+
+	<!-- ========== Plasma Gun (DOOM) ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHGun_DOOMClassic_PlasmaGun</defName>
+		<statBases>
+			<Mass>8.20</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>13.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.48</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_DoomClassicPlasmaGun</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>RHShot_DOOMClassicPlasmaGun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_DoomClassicPlasmaGun</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNGun_DOOMClassic_Pistol"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RHGun_DOOMClassic_Shotgun" or
+			defName="RHGun_DOOMClassic_SuperShotgun" or
+			defName="RHGun_DOOMClassic_PlasmaGun"
+			]/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="RHGun_DOOMClassic_Chaingun"
+			]/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>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Call of Cthulhu - Cosmic Horrors/Defs/Call of Cthulhu - Cosmic Horrors/Ammo.xml b/ModPatches/Call of Cthulhu - Cosmic Horrors/Defs/Call of Cthulhu - Cosmic Horrors/Ammo.xml
new file mode 100644
index 0000000000..5b3fc84923
--- /dev/null
+++ b/ModPatches/Call of Cthulhu - Cosmic Horrors/Defs/Call of Cthulhu - Cosmic Horrors/Ammo.xml	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>AmmoMiGoCastingWeapon</defName>
+		<label>MiGo Casting Weapon</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_MiGoCastingWeapon</defName>
+		<label>MiGo Casting Weapon ammo</label>
+		<ammoTypes>
+			<Ammo_MiGoCastingWeapon>Bullet_MiGoCastingWeapon</Ammo_MiGoCastingWeapon>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="MiGoCastingWeaponBase" ParentName="AmmoBase" Abstract="True">
+		<description>MiGo Casting Weapon ammo</description>
+		<statBases>
+			<Mass>0.01</Mass>
+			<Bulk>0.02</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade_Sellable</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoMiGoCastingWeapon</li>
+		</thingCategories>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="MiGoCastingWeaponBase">
+		<defName>Ammo_MiGoCastingWeapon</defName>
+		<label>MiGo Casting Weapon cartridge</label>
+		<graphicData>
+			<texPath>Item/Weapon/MiGoCasterWeapon</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.95</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="BaseMiGoCastingWeapon" ParentName="BaseBulletCE" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Charge_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>(10,10)</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>120</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseMiGoCastingWeapon">
+		<defName>Bullet_MiGoCastingWeapon</defName>
+		<label>Rhombohedral Energy blast</label>
+		<thingClass>CombatExtended.BulletCE</thingClass>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>27</damageAmountBase>
+			<armorPenetrationSharp>15</armorPenetrationSharp>
+			<armorPenetrationBlunt>30.6</armorPenetrationBlunt>
+			<damageDef>Bullet</damageDef>
+			<speed>120</speed>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== Recipes ================== -->
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_MiGoCastingWeapon</defName>
+		<label>make MiGo Casting Weapon cartridge x50</label>
+		<description>Craft 50 MiGo Casting Weapon cartridges.</description>
+		<jobString>Making MiGo Casting Weapon cartridge.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Plasteel</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_MiGoCastingWeapon>50</Ammo_MiGoCastingWeapon>
+		</products>
+		<workAmount>2600</workAmount>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/BodyDefs_CosmicHorrors/Bodies_BlackTree.xml b/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/BodyDefs_CosmicHorrors/Bodies_BlackTree.xml
new file mode 100644
index 0000000000..3296ba558a
--- /dev/null
+++ b/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/BodyDefs_CosmicHorrors/Bodies_BlackTree.xml	
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="ROM_DarkYoungBody"]//*[
+			def="Body"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="ROM_DarkYoungBody"]//*[
+			def="Body" or
+			def="ROM_TentacleFirst" or
+			def="ROM_TentacleSecond" or
+			def="ROM_TentacleThird" or
+			def="ROM_TentacleFourth" or
+			def="ROM_TentacleFifth" or
+			def="ROM_TentacleSixth" or
+			def="ROM_TentacleSeventh" or
+			def="ROM_LegFirst" or
+			def="ROM_LegSecond" or
+			def="ROM_LegThird"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/BodyDefs_CosmicHorrors/Bodies_Fishboy.xml b/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/BodyDefs_CosmicHorrors/Bodies_Fishboy.xml
new file mode 100644
index 0000000000..ab4c8e3646
--- /dev/null
+++ b/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/BodyDefs_CosmicHorrors/Bodies_Fishboy.xml	
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ROM_DeepOneBody"]//*[
+			def="Torso" or
+			def="Head" or
+			def="Shoulder" or
+			def="Neck" or
+			def="Arm" or
+			def="Leg"]/groups </xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/BodyDefs_CosmicHorrors/Bodies_Migo.xml b/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/BodyDefs_CosmicHorrors/Bodies_Migo.xml
new file mode 100644
index 0000000000..fce1334cfb
--- /dev/null
+++ b/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/BodyDefs_CosmicHorrors/Bodies_Migo.xml	
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="ROM_MiGoBody"]//*[
+			def="Body" or
+			def="Pronotum" or
+			def="ROM_SporeHead"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="ROM_MiGoBody"]//*[
+			def="Body" or
+			def="Pronotum" or
+			def="ROM_SporeHead" or
+			def="InsectLeg"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/BodyDefs_CosmicHorrors/Bodies_Shoggoth.xml b/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/BodyDefs_CosmicHorrors/Bodies_Shoggoth.xml
new file mode 100644
index 0000000000..996b9b7bca
--- /dev/null
+++ b/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/BodyDefs_CosmicHorrors/Bodies_Shoggoth.xml	
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="ROM_ShoggothBody"]//*[
+			def="Body" or
+			def="Leg"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="ROM_ShoggothBody"]//*[
+			def="Body" or
+			def="ROM_Tentacle" or
+			def="Shoulder" or
+			def="Arm" or
+			def="Hand" or
+			def="Paws" or
+			def="Leg"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/BodyDefs_CosmicHorrors/Bodies_Squidward.xml b/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/BodyDefs_CosmicHorrors/Bodies_Squidward.xml
new file mode 100644
index 0000000000..b32add8dff
--- /dev/null
+++ b/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/BodyDefs_CosmicHorrors/Bodies_Squidward.xml	
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ROM_CthulhidBody"]//*[
+			def="Torso" or
+			def="Neck" or
+			def="Shoulder" or
+			def="Arm" or
+			def="Hand" or
+			def="ROM_RightWing" or
+			def="ROM_LeftWing" or
+			def="Leg"]/groups </xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/BodyDefs_CosmicHorrors/Bodies_Wormy.xml b/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/BodyDefs_CosmicHorrors/Bodies_Wormy.xml
new file mode 100644
index 0000000000..b29fcdadc7
--- /dev/null
+++ b/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/BodyDefs_CosmicHorrors/Bodies_Wormy.xml	
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ROM_ChthonianBody"]//*[
+			def="ROM_ChthonianFirstRing" or
+			def="ROM_ChthonianThirdRing" or
+			def="ROM_ChthonianFourthRing" or
+			def="ROM_ChthonianFifthRing" or
+			def="ROM_ChthonianSixthRing"] </xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ROM_ChthonianBody"]//*[
+			def="ROM_ChthonianFirstRing" or
+			def="ROM_ChthonianSecondRing" or
+			def="ROM_ChthonianThirdRing" or
+			def="ROM_ChthonianFourthRing" or
+			def="ROM_ChthonianFifthRing" or
+			def="Head" or
+			def="ROM_ChthonianSixthRing"]/groups </xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/Leather/ROM_CosmicHorrors_Resources_Leathers.xml b/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/Leather/ROM_CosmicHorrors_Resources_Leathers.xml
new file mode 100644
index 0000000000..0dcfe05ac7
--- /dev/null
+++ b/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/Leather/ROM_CosmicHorrors_Resources_Leathers.xml	
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CH_Leather_Chthonian"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.25</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CH_Leather_Chthonian"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.18</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CH_Leather_Cthulhid"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.4</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CH_Leather_Cthulhid"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.28</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CH_Leather_Cthulhid"]/stuffProps</xpath>
+		<value>
+			<categories>
+				<li>SoftArmor</li>
+			</categories>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CH_Leather_DarkYoung"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.1</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CH_Leather_DarkYoung"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.07</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CH_Leather_DeepOne"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.12</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CH_Leather_DeepOne"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.06</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CH_Leather_StarVampire"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.08</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CH_Leather_StarVampire"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.04</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/MiGo_Weapons.xml b/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/MiGo_Weapons.xml
new file mode 100644
index 0000000000..fdef6836cf
--- /dev/null
+++ b/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/MiGo_Weapons.xml	
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ROM_MiGoCastingWeapon</defName>
+		<statBases>
+			<Mass>1.50</Mass>
+			<RangedWeapon_Cooldown>0.48</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.50</SwayFactor>
+			<Bulk>5</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_MiGoCastingWeapon</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>60</range>
+			<soundCast>Shot_ChargeBlaster</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>18</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_MiGoCastingWeapon</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>MiGoGunLow</li>
+		</weaponTags>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsChthonian.xml b/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsChthonian.xml
new file mode 100644
index 0000000000..15eae533dc
--- /dev/null
+++ b/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsChthonian.xml	
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ROM_Chthonian"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ROM_Chthonian"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.01</MeleeDodgeChance>
+			<MeleeCritChance>0.9</MeleeCritChance>
+			<MeleeParryChance>0.5</MeleeParryChance>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+			<ArmorRating_Blunt>32</ArmorRating_Blunt>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ROM_Chthonian"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tentacles</label>
+					<capacities>
+						<li>ROM_BluntMonstrous</li>
+					</capacities>
+					<power>38</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>ROM_Tentacles</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>40.8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>coiling tentacles</label>
+					<capacities>
+						<li>ROM_ConstrictMonstrous</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>ROM_Tentacles</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>75.6</armorPenetrationBlunt>
+					<chanceFactor>0.25</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>overwhelming mind</label>
+					<capacities>
+						<li>ROM_Psychic</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>ROM_Mind</linkedBodyPartsGroup>
+					<armorPenetrationSharp>100</armorPenetrationSharp>
+					<armorPenetrationBlunt>100.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>body</label>
+					<capacities>
+						<li>ROM_BluntMonstrous</li>
+					</capacities>
+					<power>64</power>
+					<cooldownTime>3.4</cooldownTime>
+					<linkedBodyPartsGroup>ROM_BodyAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>65.6</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ROM_ChthonianLarva"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ROM_ChthonianLarva"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.08</MeleeDodgeChance>
+			<MeleeCritChance>0.24</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ROM_ChthonianLarva"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ROM_ChthonianLarva"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ROM_ChthonianLarva"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tentacles</label>
+					<capacities>
+						<li>ROM_BluntMonstrous</li>
+						<li>ROM_ConstrictMonstrous</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>ROM_Tentacles</linkedBodyPartsGroup>
+					<armorPenetrationSharp>7</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>overwhelming mind</label>
+					<capacities>
+						<li>ROM_Psychic</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.55</cooldownTime>
+					<linkedBodyPartsGroup>ROM_Mind</linkedBodyPartsGroup>
+					<armorPenetrationSharp>32</armorPenetrationSharp>
+					<armorPenetrationBlunt>50.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>body</label>
+					<capacities>
+						<li>ROM_BluntMonstrous</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>2.45</cooldownTime>
+					<linkedBodyPartsGroup>ROM_BodyAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>5</armorPenetrationSharp>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsCthulhids.xml b/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsCthulhids.xml
new file mode 100644
index 0000000000..322a370b70
--- /dev/null
+++ b/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsCthulhids.xml	
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ROM_Cthulhid"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ROM_Cthulhid"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.08</MeleeDodgeChance>
+			<MeleeCritChance>0.68</MeleeCritChance>
+			<MeleeParryChance>0.5</MeleeParryChance>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ROM_Cthulhid"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>17</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ROM_Cthulhid"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>34</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ROM_Cthulhid"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>wings</label>
+					<capacities>
+						<li>ROM_BluntMonstrous</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>ROM_Wings</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>18.6</armorPenetrationBlunt>
+					<chanceFactor>0.25</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>ROM_ScratchMonstrous</li>
+					</capacities>
+					<power>48</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>18</armorPenetrationSharp>
+					<armorPenetrationBlunt>40.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>ROM_ScratchMonstrous</li>
+					</capacities>
+					<power>48</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>18</armorPenetrationSharp>
+					<armorPenetrationBlunt>40.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>overwhelming mind</label>
+					<capacities>
+						<li>ROM_Psychic</li>
+					</capacities>
+					<power>60</power>
+					<cooldownTime>1.55</cooldownTime>
+					<linkedBodyPartsGroup>ROM_Mind</linkedBodyPartsGroup>
+					<armorPenetrationSharp>100</armorPenetrationSharp>
+					<armorPenetrationBlunt>155.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>maw</label>
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>54</power>
+					<cooldownTime>1.55</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>24</armorPenetrationSharp>
+					<armorPenetrationBlunt>36.6</armorPenetrationBlunt>
+					<chanceFactor>0.33</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsDarkYoung.xml b/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsDarkYoung.xml
new file mode 100644
index 0000000000..ba6db27698
--- /dev/null
+++ b/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsDarkYoung.xml	
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ROM_DarkYoung"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ROM_DarkYoung"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.48</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ROM_DarkYoung"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>hooves</label>
+					<capacities>
+						<li>ROM_BluntMonstrous</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.55</cooldownTime>
+					<linkedBodyPartsGroup>ROM_Hooves</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>15.6</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>tentacles</label>
+					<capacities>
+						<li>ROM_BluntMonstrous</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>ROM_Tentacles</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>14.8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>coiling tentacles</label>
+					<capacities>
+						<li>ROM_ConstrictMonstrous</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>ROM_Tentacles</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>28.8</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>maw</label>
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>1.75</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>7</armorPenetrationSharp>
+					<armorPenetrationBlunt>18.6</armorPenetrationBlunt>
+					<chanceFactor>0.4</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsDeepOne.xml b/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsDeepOne.xml
new file mode 100644
index 0000000000..c4b780af9a
--- /dev/null
+++ b/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsDeepOne.xml	
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ROM_DeepOne"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ROM_DeepOne"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.24</MeleeDodgeChance>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.28</MeleeParryChance>
+			<SmokeSensitivity>0.25</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ROM_DeepOne"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ROM_DeepOne"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ROM_DeepOne"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>ROM_ScratchMonstrous</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>ROM_LeftClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>6</armorPenetrationSharp>
+					<armorPenetrationBlunt>13.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>ROM_ScratchMonstrous</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>ROM_RightClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>6</armorPenetrationSharp>
+					<armorPenetrationBlunt>13.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.75</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
+					<armorPenetrationBlunt>24.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>15.6</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ROM_DeepOneGreat"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ROM_DeepOneGreat"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.48</MeleeCritChance>
+			<MeleeParryChance>0.45</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ROM_DeepOneGreat"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ROM_DeepOneGreat"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>7</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ROM_DeepOneGreat"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>ROM_ScratchMonstrous</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>ROM_LeftClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>13</armorPenetrationSharp>
+					<armorPenetrationBlunt>30.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>ROM_ScratchMonstrous</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>ROM_RightClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>13</armorPenetrationSharp>
+					<armorPenetrationBlunt>30.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>20</armorPenetrationSharp>
+					<armorPenetrationBlunt>50.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsMiGo.xml b/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsMiGo.xml
new file mode 100644
index 0000000000..35943af178
--- /dev/null
+++ b/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsMiGo.xml	
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ROM_MiGo"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ROM_MiGo"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.8</MeleeDodgeChance>
+			<MeleeCritChance>0.22</MeleeCritChance>
+			<MeleeParryChance>0.8</MeleeParryChance>
+			<SmokeSensitivity>0.5</SmokeSensitivity>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>2</ShootingAccuracyPawn>
+			<Suppressability>0.2</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ROM_MiGo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>legs</label>
+					<capacities>
+						<li>ROM_ScratchMonstrous</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>0.55</cooldownTime>
+					<linkedBodyPartsGroup>Legs</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>overwhelming mind</label>
+					<capacities>
+						<li>ROM_Psychic</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>ROM_Mind</linkedBodyPartsGroup>
+					<armorPenetrationSharp>65</armorPenetrationSharp>
+					<armorPenetrationBlunt>85.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>body</label>
+					<capacities>
+						<li>ROM_BluntMonstrous</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>ROM_Wings</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="ROM_MiGoCaster"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="ROM_MiGoCaster"]/aiAvoidCover</xpath>
+		<value>
+			<aiAvoidCover>false</aiAvoidCover>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="ROM_MiGo"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="ROM_MiGo"]/</xpath>
+			<value>
+				<comps />
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ROM_MiGo"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsShoggoths.xml b/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsShoggoths.xml
new file mode 100644
index 0000000000..96d4a3e365
--- /dev/null
+++ b/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsShoggoths.xml	
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ROM_Shoggoth"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ROM_Shoggoth"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.12</MeleeDodgeChance>
+			<MeleeCritChance>0.68</MeleeCritChance>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ROM_ShoggothColossal"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.12</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ROM_ShoggothTiny"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.35</MeleeDodgeChance>
+			<MeleeCritChance>0.38</MeleeCritChance>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ROM_ShoggothTiny"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ROM_ShoggothTiny"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ROM_Shoggoth"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ROM_Shoggoth"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ROM_ShoggothColossal"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ROM_ShoggothColossal"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>38</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ROM_Shoggoth"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tentacles</label>
+					<capacities>
+						<li>ROM_BluntMonstrous</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>1.75</cooldownTime>
+					<linkedBodyPartsGroup>ROM_Tentacles</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>29.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>ROM_BluntMonstrous</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>20.8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>ROM_BluntMonstrous</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>20.8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>maw</label>
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
+					<armorPenetrationBlunt>23.6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ROM_ShoggothTiny"]/tools</xpath>
+		<value>
+			<tools Inherit="False">
+				<li Class="CombatExtended.ToolCE">
+					<label>tentacles</label>
+					<capacities>
+						<li>ROM_BluntMonstrous</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>ROM_Tentacles</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>ROM_BluntMonstrous</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.55</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<chanceFactor>0.25</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>ROM_BluntMonstrous</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.55</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<chanceFactor>0.25</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>maw</label>
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>2.08</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ROM_ShoggothColossal"]/tools</xpath>
+		<value>
+			<tools Inherit="False">
+				<li Class="CombatExtended.ToolCE">
+					<label>tentacles</label>
+					<capacities>
+						<li>ROM_BluntMonstrous</li>
+					</capacities>
+					<power>38</power>
+					<cooldownTime>2.38</cooldownTime>
+					<linkedBodyPartsGroup>ROM_Tentacles</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>64.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>ROM_BluntMonstrous</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>30.6</armorPenetrationBlunt>
+					<chanceFactor>0.25</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>ROM_BluntMonstrous</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>30.6</armorPenetrationBlunt>
+					<chanceFactor>0.25</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>maw</label>
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>50</power>
+					<cooldownTime>2.68</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>24</armorPenetrationSharp>
+					<armorPenetrationBlunt>52.8</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsStarVampire.xml b/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsStarVampire.xml
new file mode 100644
index 0000000000..60518d19d2
--- /dev/null
+++ b/ModPatches/Call of Cthulhu - Cosmic Horrors/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsStarVampire.xml	
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ROM_StarVampire"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ROM_StarVampire"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			<MeleeCritChance>0.7</MeleeCritChance>
+			<MeleeParryChance>0.5</MeleeParryChance>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ROM_StarVampire"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>needles</label>
+					<capacities>
+						<li>ROM_ScratchMonstrous</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>0.95</cooldownTime>
+					<linkedBodyPartsGroup>ROM_Tentacles</linkedBodyPartsGroup>
+					<armorPenetrationSharp>14</armorPenetrationSharp>
+					<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>tentacles</label>
+					<capacities>
+						<li>ROM_BluntMonstrous</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>0.95</cooldownTime>
+					<linkedBodyPartsGroup>ROM_Tentacles</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>20.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>coiling tentacles</label>
+					<capacities>
+						<li>ROM_ConstrictMonstrous</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>ROM_Tentacles</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>24.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>ROM_Exsanguination</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.75</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>7</armorPenetrationSharp>
+					<armorPenetrationBlunt>14</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Blunders/Acidgat.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Blunders/Acidgat.xml
new file mode 100644
index 0000000000..5cc2f92f41
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Blunders/Acidgat.xml	
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoAcidgat</defName>
+		<label>Acidgat</label>
+		<parent>AmmoWonders</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberShotgun</iconPath>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Acidgat</defName>
+		<label>Acidgat</label>
+		<ammoTypes>
+			<Ammo_Acidgat_Buck>Bullet_Acidgat_Buck</Ammo_Acidgat_Buck>
+			<Ammo_Acidgat_Slug>Bullet_Acidgat_Slug</Ammo_Acidgat_Slug>
+		</ammoTypes>
+		<similarTo>AmmoSet_Blundergat</similarTo>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="AcidgatBase" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Wear protective goggles when using in battle.</description>
+		<statBases>
+			<Mass>0.023</Mass>
+			<Bulk>0.06</Bulk>
+		</statBases>
+		<graphicData>
+			<texPath>ThirdParty/CoD Zombies Pack/Acidgat</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<tradeTags>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoAcidgat</li>
+		</thingCategories>
+		<stackLimit>100</stackLimit>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AcidgatBase">
+		<defName>Ammo_Acidgat_Buck</defName>
+		<label>Acidgat shell (Buck)</label>
+		<statBases>
+			<MarketValue>0.2</MarketValue>
+		</statBases>
+		<ammoClass>BuckShot</ammoClass>
+		<cookOffProjectile>Bullet_Acidgat_Buck</cookOffProjectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AcidgatBase">
+		<defName>Ammo_Acidgat_Slug</defName>
+		<label>Acidgat shell (Slug)</label>
+		<statBases>
+			<Mass>0.048</Mass>
+			<MarketValue>0.4</MarketValue>
+		</statBases>
+		<ammoClass>Slug</ammoClass>
+		<cookOffProjectile>Bullet_Acidgat_Slug</cookOffProjectile>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef ParentName="CODZP_BlunderBulletBase">
+		<defName>Bullet_Acidgat_Buck</defName>
+		<label>buckshot pellet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shotgun_Pellet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<color>(0, 160, 20)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>11</damageAmountBase>
+			<damageDef>CodZP_Toxic_Burn</damageDef>
+			<armorPenetrationSharp>2</armorPenetrationSharp>
+			<armorPenetrationBlunt>4.52</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="CODZP_BlunderBulletBase">
+		<defName>Bullet_Acidgat_Slug</defName>
+		<label>Slug shot</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<color>(0, 160, 20)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>44</damageAmountBase>
+			<damageDef>CodZP_Toxic_Burn</damageDef>
+			<pelletCount>1</pelletCount>
+			<armorPenetrationSharp>2</armorPenetrationSharp>
+			<armorPenetrationBlunt>4.52</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeAmmo">
+		<defName>MakeAmmo_Acidgat_Buck</defName>
+		<label>make Acidgat (Buck) shell x20</label>
+		<description>Craft 20 Acidgat (Buck) shells .</description>
+		<jobString>Making Acidgat (Buck) shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_Blundergat_Buck</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_Blundergat_Buck</li>
+				<li>Uranium</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Acidgat_Buck>20</Ammo_Acidgat_Buck>
+		</products>
+		<workAmount>1000</workAmount>
+	</RecipeDef>
+	<RecipeDef ParentName="CODZP_AmmoRecipeAmmo">
+		<defName>MakeAmmo_Acidgat_Slug</defName>
+		<label>make Acidgat (Slug) shell x20</label>
+		<description>Craft 20 Acidgat (Slug) shells .</description>
+		<jobString>Making Acidgat (Slug) shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_Blundergat_Slug</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_Blundergat_Slug</li>
+				<li>Uranium</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Acidgat_Slug>20</Ammo_Acidgat_Slug>
+		</products>
+		<workAmount>1000</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Blunders/Acidgat_Punched.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Blunders/Acidgat_Punched.xml
new file mode 100644
index 0000000000..7e29f1a5a3
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Blunders/Acidgat_Punched.xml	
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoAcidgat_Punched</defName>
+		<label>Vitriolic Withering</label>
+		<parent>AmmoWonders_Punched</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberShotgun</iconPath>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Acidgat_Punched</defName>
+		<label>Vitriolic Withering Ammo Set</label>
+		<ammoTypes>
+			<Ammo_Acidgat_Buck_Punched>Bullet_Acidgat_Buck_Punched</Ammo_Acidgat_Buck_Punched>
+			<Ammo_Acidgat_Slug_Punched>Bullet_Acidgat_Slug_Punched</Ammo_Acidgat_Slug_Punched>
+		</ammoTypes>
+		<similarTo>AmmoSet_Blundergat_Punched</similarTo>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="AcidgatPunched" ParentName="SmallAmmoBase" Abstract="True">
+		<description>A highly acidic chemical reaction.</description>
+		<statBases>
+			<Mass>0.023</Mass>
+			<Bulk>0.06</Bulk>
+		</statBases>
+		<graphicData>
+			<texPath>ThirdParty/CoD Zombies Pack/Acidgat</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(200,200,200)</color>
+		</graphicData>
+		<tradeTags>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoAcidgat_Punched</li>
+		</thingCategories>
+		<stackLimit>150</stackLimit>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AcidgatPunched">
+		<defName>Ammo_Acidgat_Buck_Punched</defName>
+		<label>Vitriolic Withering shell (Buck)</label>
+		<statBases>
+			<MarketValue>0.2</MarketValue>
+		</statBases>
+		<ammoClass>BuckShot</ammoClass>
+		<cookOffProjectile>Bullet_Acidgat_Buck_Punched</cookOffProjectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AcidgatPunched">
+		<defName>Ammo_Acidgat_Slug_Punched</defName>
+		<label>Vitriolic Withering shell (Slug)</label>
+		<statBases>
+			<Mass>0.048</Mass>
+			<MarketValue>0.4</MarketValue>
+		</statBases>
+		<ammoClass>Slug</ammoClass>
+		<cookOffProjectile>Bullet_Acidgat_Slug_Punched</cookOffProjectile>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef ParentName="CODZP_BlunderBulletPunched">
+		<defName>Bullet_Acidgat_Buck_Punched</defName>
+		<label>buckshot pellet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shotgun_Pellet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<color>(0, 160, 20)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>22</damageAmountBase>
+			<damageDef>CodZP_Toxic_Burn</damageDef>
+			<armorPenetrationSharp>4</armorPenetrationSharp>
+			<armorPenetrationBlunt>9</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="CODZP_BlunderBulletPunched">
+		<defName>Bullet_Acidgat_Slug_Punched</defName>
+		<label>Slug shot</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<color>(0, 160, 20)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>88</damageAmountBase>
+			<damageDef>CodZP_Toxic_Burn</damageDef>
+			<pelletCount>1</pelletCount>
+			<armorPenetrationSharp>4</armorPenetrationSharp>
+			<armorPenetrationBlunt>9</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonderAmmo_Punched">
+		<defName>MakeAmmo_Acidgat_Buck_Punched</defName>
+		<label>make Vitriolic Withering (Buck) shell x20</label>
+		<description>Craft 20 Vitriolic Withering (Buck) shells .</description>
+		<jobString>Making Vitriolic Withering (Buck) shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_Acidgat_Buck</li>
+					</thingDefs>
+				</filter>
+				<count>80</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_Acidgat_Buck</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Acidgat_Buck_Punched>20</Ammo_Acidgat_Buck_Punched>
+		</products>
+		<workAmount>1000</workAmount>
+	</RecipeDef>
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonderAmmo_Punched">
+		<defName>MakeAmmo_Acidgat_Slug_Punched</defName>
+		<label>make Vitriolic Withering (Slug) shell x20</label>
+		<description>Craft 20 Vitriolic Withering (Slug) shells .</description>
+		<jobString>Making Vitriolic Withering (Slug) shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_Acidgat_Slug</li>
+					</thingDefs>
+				</filter>
+				<count>80</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_Acidgat_Slug</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Acidgat_Slug_Punched>20</Ammo_Acidgat_Slug_Punched>
+		</products>
+		<workAmount>1000</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Blunders/Blundergat.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Blunders/Blundergat.xml
new file mode 100644
index 0000000000..524b78e55c
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Blunders/Blundergat.xml	
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoBlundergat</defName>
+		<label>Blundergat</label>
+		<parent>AmmoWonders</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberShotgun</iconPath>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Blundergat</defName>
+		<label>Blundergat</label>
+		<ammoTypes>
+			<Ammo_Blundergat_Buck>Bullet_Blundergat_Buck</Ammo_Blundergat_Buck>
+			<Ammo_Blundergat_Slug>Bullet_Blundergat_Slug</Ammo_Blundergat_Slug>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="BlundergatBase" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Not heavily different from a 12-Guage.</description>
+		<statBases>
+			<Mass>0.023</Mass>
+			<Bulk>0.06</Bulk>
+		</statBases>
+		<graphicData>
+			<texPath>ThirdParty/CoD Zombies Pack/Blundergat</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<tradeTags>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoBlundergat</li>
+		</thingCategories>
+		<stackLimit>100</stackLimit>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BlundergatBase">
+		<defName>Ammo_Blundergat_Buck</defName>
+		<label>Blundergat shell (Buck)</label>
+		<statBases>
+			<MarketValue>0.2</MarketValue>
+		</statBases>
+		<ammoClass>BuckShot</ammoClass>
+		<cookOffProjectile>Bullet_Blundergat_Buck</cookOffProjectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BlundergatBase">
+		<defName>Ammo_Blundergat_Slug</defName>
+		<label>Blundergat shell (Slug)</label>
+		<statBases>
+			<Mass>0.048</Mass>
+			<MarketValue>0.4</MarketValue>
+		</statBases>
+		<ammoClass>Slug</ammoClass>
+		<cookOffProjectile>Bullet_Blundergat_Slug</cookOffProjectile>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef Name="CODZP_BlunderBulletBase" ParentName="Base12GaugeBullet" Abstract="true">
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>92</speed>
+			<dropsCasings>true</dropsCasings>
+			<damageDef>Bullet</damageDef>
+			<pelletCount>4</pelletCount>
+			<spreadMult>15</spreadMult>
+			<casingMoteDefname>Fleck_ShotgunShell</casingMoteDefname>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="CODZP_BlunderBulletBase">
+		<defName>Bullet_Blundergat_Buck</defName>
+		<label>buckshot pellet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shotgun_Pellet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<color>(255, 0, 0)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>11</damageAmountBase>
+			<armorPenetrationSharp>2</armorPenetrationSharp>
+			<armorPenetrationBlunt>4.52</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="CODZP_BlunderBulletBase">
+		<defName>Bullet_Blundergat_Slug</defName>
+		<label>Slug shot</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<color>(255, 0, 0)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>44</damageAmountBase>
+			<pelletCount>1</pelletCount>
+			<armorPenetrationSharp>2</armorPenetrationSharp>
+			<armorPenetrationBlunt>4.52</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonder">
+		<defName>MakeAmmo_Blundergat_Buck</defName>
+		<label>make Blundergat (Buck) shell x20</label>
+		<description>Craft 20 Blundergat (Buck) shells .</description>
+		<jobString>Making Blundergat (Buck) shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Blundergat_Buck>20</Ammo_Blundergat_Buck>
+		</products>
+		<workAmount>1000</workAmount>
+	</RecipeDef>
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonder">
+		<defName>MakeAmmo_Blundergat_Slug</defName>
+		<label>make Blundergat (Slug) shell x20</label>
+		<description>Craft 20 Blundergat (Slug) shells .</description>
+		<jobString>Making Blundergat (Slug) shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Blundergat_Slug>20</Ammo_Blundergat_Slug>
+		</products>
+		<workAmount>1000</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Blunders/Blundergat_Punched.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Blunders/Blundergat_Punched.xml
new file mode 100644
index 0000000000..6dbc98c57f
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Blunders/Blundergat_Punched.xml	
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoBlundergat_Punched</defName>
+		<label>Sweeper</label>
+		<parent>AmmoWonders_Punched</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberShotgun</iconPath>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Blundergat_Punched</defName>
+		<label>Sweeper Ammo Set</label>
+		<ammoTypes>
+			<Ammo_Blundergat_Buck_Punched>Bullet_Blundergat_Buck_Punched</Ammo_Blundergat_Buck_Punched>
+			<Ammo_Blundergat_Slug_Punched>Bullet_Blundergat_Slug_Punched</Ammo_Blundergat_Slug_Punched>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="BlundergatPunched" ParentName="SmallAmmoBase" Abstract="True">
+		<description>A tale from an bygone age.</description>
+		<statBases>
+			<Mass>0.023</Mass>
+			<Bulk>0.06</Bulk>
+		</statBases>
+		<graphicData>
+			<texPath>ThirdParty/CoD Zombies Pack/Blundergat</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(200,200,200)</color>
+		</graphicData>
+		<tradeTags>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoBlundergat_Punched</li>
+		</thingCategories>
+		<stackLimit>150</stackLimit>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BlundergatPunched">
+		<defName>Ammo_Blundergat_Buck_Punched</defName>
+		<label>Sweeper shell (Buck)</label>
+		<statBases>
+			<MarketValue>0.2</MarketValue>
+		</statBases>
+		<ammoClass>BuckShot</ammoClass>
+		<cookOffProjectile>Bullet_Blundergat_Buck_Punched</cookOffProjectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BlundergatPunched">
+		<defName>Ammo_Blundergat_Slug_Punched</defName>
+		<label>Sweeper shell (Slug)</label>
+		<statBases>
+			<Mass>0.048</Mass>
+			<MarketValue>0.4</MarketValue>
+		</statBases>
+		<ammoClass>Slug</ammoClass>
+		<cookOffProjectile>Bullet_Blundergat_Slug_Punched</cookOffProjectile>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef Name="CODZP_BlunderBulletPunched" ParentName="CODZP_BlunderBulletBase" Abstract="true">
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>102</speed>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="CODZP_BlunderBulletPunched">
+		<defName>Bullet_Blundergat_Buck_Punched</defName>
+		<label>buckshot pellet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shotgun_Pellet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<color>(255, 0, 0)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>22</damageAmountBase>
+			<armorPenetrationSharp>4</armorPenetrationSharp>
+			<armorPenetrationBlunt>9</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="CODZP_BlunderBulletPunched">
+		<defName>Bullet_Blundergat_Slug_Punched</defName>
+		<label>Slug shot</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<color>(255, 0, 0)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>88</damageAmountBase>
+			<pelletCount>1</pelletCount>
+			<armorPenetrationSharp>4</armorPenetrationSharp>
+			<armorPenetrationBlunt>9</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonder_Punched">
+		<defName>MakeAmmo_Blundergat_Buck_Punched</defName>
+		<label>make Sweeper (Buck) shell x20</label>
+		<description>Craft 20 Sweeper (Buck) shells .</description>
+		<jobString>Making Sweeper (Buck) shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_Blundergat_Buck</li>
+					</thingDefs>
+				</filter>
+				<count>80</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_Blundergat_Buck</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Blundergat_Buck_Punched>20</Ammo_Blundergat_Buck_Punched>
+		</products>
+		<workAmount>1000</workAmount>
+	</RecipeDef>
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonder_Punched">
+		<defName>MakeAmmo_Blundergat_Slug_Punched</defName>
+		<label>make Sweeper (Slug) shell x20</label>
+		<description>Craft 20 Sweeper (Slug) shells .</description>
+		<jobString>Making Sweeper (Slug) shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_Blundergat_Slug</li>
+					</thingDefs>
+				</filter>
+				<count>80</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_Blundergat_Slug</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Blundergat_Slug_Punched>20</Ammo_Blundergat_Slug_Punched>
+		</products>
+		<workAmount>1000</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Blunders/Magmagat.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Blunders/Magmagat.xml
new file mode 100644
index 0000000000..b4104177a1
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Blunders/Magmagat.xml	
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoMagmagat</defName>
+		<label>Magmagat</label>
+		<parent>AmmoWonders</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberShotgun</iconPath>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Magmagat</defName>
+		<label>Magmagat</label>
+		<ammoTypes>
+			<Ammo_Magmagat_Buck>Bullet_Magmagat_Buck</Ammo_Magmagat_Buck>
+			<Ammo_Magmagat_Slug>Bullet_Magmagat_Slug</Ammo_Magmagat_Slug>
+		</ammoTypes>
+		<similarTo>AmmoSet_Blundergat</similarTo>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="MagmagatBase" ParentName="SmallAmmoBase" Abstract="True">
+		<description>A single touch from this fiery will light all.</description>
+		<statBases>
+			<Mass>0.023</Mass>
+			<Bulk>0.06</Bulk>
+		</statBases>
+		<graphicData>
+			<texPath>ThirdParty/CoD Zombies Pack/Magmagat</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<tradeTags>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoMagmagat</li>
+		</thingCategories>
+		<stackLimit>100</stackLimit>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="MagmagatBase">
+		<defName>Ammo_Magmagat_Buck</defName>
+		<label>Magmagat shell (Buck)</label>
+		<statBases>
+			<MarketValue>0.2</MarketValue>
+		</statBases>
+		<ammoClass>BuckShot</ammoClass>
+		<cookOffProjectile>Bullet_Magmagat_Buck</cookOffProjectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="MagmagatBase">
+		<defName>Ammo_Magmagat_Slug</defName>
+		<label>Magmagat shell (Slug)</label>
+		<statBases>
+			<Mass>0.048</Mass>
+			<MarketValue>0.4</MarketValue>
+		</statBases>
+		<ammoClass>Slug</ammoClass>
+		<cookOffProjectile>Bullet_Magmagat_Slug</cookOffProjectile>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef ParentName="CODZP_BlunderBulletBase">
+		<defName>Bullet_Magmagat_Buck</defName>
+		<label>buckshot pellet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shotgun_Pellet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<color>(255, 100, 0)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>11</damageAmountBase>
+			<armorPenetrationSharp>2</armorPenetrationSharp>
+			<armorPenetrationBlunt>4.52</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>8</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="CODZP_BlunderBulletBase">
+		<defName>Bullet_Magmagat_Slug</defName>
+		<label>Slug shot</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<color>(255, 100, 0)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>44</damageAmountBase>
+			<pelletCount>1</pelletCount>
+			<armorPenetrationSharp>2</armorPenetrationSharp>
+			<armorPenetrationBlunt>4.52</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>14</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeAmmo">
+		<defName>MakeAmmo_Magmagat_Buck</defName>
+		<label>make Magmagat (Buck) shell x20</label>
+		<description>Craft 20 Magmagat (Buck) shells .</description>
+		<jobString>Making Magmagat (Buck) shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_Blundergat_Buck</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_Blundergat_Buck</li>
+				<li>Prometheum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Magmagat_Buck>20</Ammo_Magmagat_Buck>
+		</products>
+		<workAmount>1000</workAmount>
+	</RecipeDef>
+	<RecipeDef ParentName="CODZP_AmmoRecipeAmmo">
+		<defName>MakeAmmo_Magmagat_Slug</defName>
+		<label>make Magmagat (Slug) shell x20</label>
+		<description>Craft 20 Magmagat (Slug) shells .</description>
+		<jobString>Making Magmagat (Slug) shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_Blundergat_Slug</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_Blundergat_Slug</li>
+				<li>Prometheum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Magmagat_Slug>20</Ammo_Magmagat_Slug>
+		</products>
+		<workAmount>1000</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Blunders/Magmagat_Punched.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Blunders/Magmagat_Punched.xml
new file mode 100644
index 0000000000..e1301a836f
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Blunders/Magmagat_Punched.xml	
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoMagmagat_Punched</defName>
+		<label>Magmus Operandi</label>
+		<parent>AmmoWonders_Punched</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberShotgun</iconPath>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Magmagat_Punched</defName>
+		<label>Magmus Operandi Ammo Set</label>
+		<ammoTypes>
+			<Ammo_Magmagat_Buck_Punched>Bullet_Magmagat_Buck_Punched</Ammo_Magmagat_Buck_Punched>
+			<Ammo_Magmagat_Slug_Punched>Bullet_Magmagat_Slug_Punched</Ammo_Magmagat_Slug_Punched>
+		</ammoTypes>
+		<similarTo>AmmoSet_Blundergat_Punched</similarTo>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="MagmagatPunched" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Extremely flamable, burning everything in it's wake.</description>
+		<statBases>
+			<Mass>0.023</Mass>
+			<Bulk>0.06</Bulk>
+		</statBases>
+		<graphicData>
+			<texPath>ThirdParty/CoD Zombies Pack/Magmagat</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(200,200,200)</color>
+		</graphicData>
+		<tradeTags>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoMagmagat_Punched</li>
+		</thingCategories>
+		<stackLimit>150</stackLimit>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="MagmagatPunched">
+		<defName>Ammo_Magmagat_Buck_Punched</defName>
+		<label>Magmus Operandi shell (Buck)</label>
+		<statBases>
+			<MarketValue>0.2</MarketValue>
+		</statBases>
+		<ammoClass>BuckShot</ammoClass>
+		<cookOffProjectile>Bullet_Magmagat_Buck_Punched</cookOffProjectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="MagmagatPunched">
+		<defName>Ammo_Magmagat_Slug_Punched</defName>
+		<label>Magmus Operandi shell (Slug)</label>
+		<statBases>
+			<Mass>0.048</Mass>
+			<MarketValue>0.4</MarketValue>
+		</statBases>
+		<ammoClass>Slug</ammoClass>
+		<cookOffProjectile>Bullet_Magmagat_Slug_Punched</cookOffProjectile>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef ParentName="CODZP_BlunderBulletPunched">
+		<defName>Bullet_Magmagat_Buck_Punched</defName>
+		<label>buckshot pellet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shotgun_Pellet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<color>(255, 100, 0)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>22</damageAmountBase>
+			<armorPenetrationSharp>4</armorPenetrationSharp>
+			<armorPenetrationBlunt>9</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>10</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="CODZP_BlunderBulletPunched">
+		<defName>Bullet_Magmagat_Slug_Punched</defName>
+		<label>Slug shot</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<color>(255, 100, 0)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>88</damageAmountBase>
+			<pelletCount>1</pelletCount>
+			<armorPenetrationSharp>4</armorPenetrationSharp>
+			<armorPenetrationBlunt>9</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>16</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonderAmmo_Punched">
+		<defName>MakeAmmo_Magmagat_Buck_Punched</defName>
+		<label>make Magmus Operandi (Buck) shell x20</label>
+		<description>Craft 20 Magmus Operandi (Buck) shells .</description>
+		<jobString>Making Magmus Operandi (Buck) shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_Magmagat_Buck</li>
+					</thingDefs>
+				</filter>
+				<count>80</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_Magmagat_Buck</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Magmagat_Buck_Punched>20</Ammo_Magmagat_Buck_Punched>
+		</products>
+		<workAmount>1000</workAmount>
+	</RecipeDef>
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonderAmmo_Punched">
+		<defName>MakeAmmo_Magmagat_Slug_Punched</defName>
+		<label>make Magmus Operandi (Slug) shell x20</label>
+		<description>Craft 20 Magmus Operandi (Slug) shells .</description>
+		<jobString>Making Magmus Operandi (Slug) shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_Magmagat_Slug</li>
+					</thingDefs>
+				</filter>
+				<count>80</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_Magmagat_Slug</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Magmagat_Slug_Punched>20</Ammo_Magmagat_Slug_Punched>
+		</products>
+		<workAmount>1000</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Hells/Hells Retriever.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Hells/Hells Retriever.xml
new file mode 100644
index 0000000000..0ad81e678e
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Hells/Hells Retriever.xml	
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingDef Name="BaseHellsRetriever" ParentName="Base44MagnumBullet" Abstract="true">
+		<graphicData>
+			<shaderType>TransparentPostLight</shaderType>
+			<graphicClass>Graphic_Random</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Blunt</damageDef>
+			<dropsCasings>false</dropsCasings>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseHellsRetriever">
+		<defName>Bullet_Hells_Retriever</defName>
+		<label>Hells Retriever</label>
+		<graphicData>
+			<texPath>Things/Projectile/CODZP_Hell_Retriever</texPath>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>144</speed>
+			<damageAmountBase>60</damageAmountBase>
+			<armorPenetrationSharp>20</armorPenetrationSharp>
+			<armorPenetrationBlunt>20</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Hells/Hells Retriever_Punched.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Hells/Hells Retriever_Punched.xml
new file mode 100644
index 0000000000..46051d5485
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Hells/Hells Retriever_Punched.xml	
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingDef ParentName="BaseHellsRetriever">
+		<defName>Bullet_Hells_Retriever_Punched</defName>
+		<label>Hells Redeemer</label>
+		<graphicData>
+			<texPath>Things/Projectile/CODZP_Hell_Redeemer</texPath>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>165</speed>
+			<damageAmountBase>80</damageAmountBase>
+			<armorPenetrationSharp>40</armorPenetrationSharp>
+			<armorPenetrationBlunt>40</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun.xml
new file mode 100644
index 0000000000..bec6f4f54e
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun.xml	
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoRaygun</defName>
+		<label>Raygun</label>
+		<parent>AmmoWonders</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Raygun</defName>
+		<label>Raygun</label>
+		<ammoTypes>
+			<Ammo_Raygun>Bullet_Raygun</Ammo_Raygun>
+		</ammoTypes>
+		<similarTo>AmmoSet_Pistol</similarTo>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="RaygunBase" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Pistol cartridge favoured for its above average stopping power.</description>
+		<statBases>
+			<Mass>0.02</Mass>
+			<Bulk>0.02</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoRaygun</li>
+		</thingCategories>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="RaygunBase">
+		<defName>Ammo_Raygun</defName>
+		<label>Raygun cartridge</label>
+		<graphicData>
+			<texPath>ThirdParty/CoD Zombies Pack/Raygun/1</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>ExplosiveAP</ammoClass>
+		<cookOffProjectile>Bullet_Raygun</cookOffProjectile>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef Name="BaseRaygunBullet" ParentName="Base44MagnumBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/CodZP_Bullet_Plasma_Normal</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>67</speed>
+			<dropsCasings>true</dropsCasings>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="BaseRaygunBullet">
+		<defName>Bullet_Raygun</defName>
+		<label>Raygun Plasma</label>
+		<graphicData>
+			<color>(100,255,60)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>3</armorPenetrationSharp>
+			<armorPenetrationBlunt>10.860</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>107</damageAmountBase>
+				<explosiveDamageType>CodZP_RaygunGreenBomb</explosiveDamageType>
+				<explosiveRadius>1</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonder">
+		<defName>MakeAmmo_Raygun</defName>
+		<label>make Raygun cartridge x500</label>
+		<description>Craft 500 Raygun cartridges.</description>
+		<jobString>Making Raygun cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Raygun>500</Ammo_Raygun>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2.xml
new file mode 100644
index 0000000000..346a311d15
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2.xml	
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoRaygun_two</defName>
+		<label>Raygun Mk.2</label>
+		<parent>AmmoWonders</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Raygun_two</defName>
+		<label>Raygun Mk.2 Cartridge</label>
+		<ammoTypes>
+			<Ammo_Raygun_two>Bullet_Raygun_two</Ammo_Raygun_two>
+		</ammoTypes>
+		<similarTo>AmmoSet_Pistol</similarTo>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="Raygun_twoBase" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Raygun 2 cartridges</description>
+		<statBases>
+			<Mass>0.02</Mass>
+			<Bulk>0.02</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoRaygun_two</li>
+		</thingCategories>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Raygun_twoBase">
+		<defName>Ammo_Raygun_two</defName>
+		<label>Raygun Mk.2 Cartridge</label>
+		<graphicData>
+			<texPath>ThirdParty/CoD Zombies Pack/Raygun/2/Base</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_Raygun_two</cookOffProjectile>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef Name="Raygun2Bullet" ParentName="Base44MagnumBullet" Abstract="true">
+		<graphicData>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>242</speed>
+			<dropsCasings>false</dropsCasings>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Raygun2Bullet">
+		<defName>Bullet_Raygun_two</defName>
+		<label>Raygun Mk.2 Plasma</label>
+		<graphicData>
+			<texPath>Things/Projectile/CodZP_Bullet_Plasma_Normal</texPath>
+			<color>(100,255,60)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>27</armorPenetrationSharp>
+			<armorPenetrationBlunt>4.4</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonder">
+		<defName>MakeAmmo_Raygun_two</defName>
+		<label>make Raygun Mk.2 Cartridge x500</label>
+		<description>Craft 500 Raygun Mk.2 Cartridge.</description>
+		<jobString>Making Raygun_two cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Raygun_two>500</Ammo_Raygun_two>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2V.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2V.xml
new file mode 100644
index 0000000000..803fad8147
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2V.xml	
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoRaygun_two_v</defName>
+		<label>Raygun Mk.2 V</label>
+		<parent>AmmoWonders</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Raygun_two_v</defName>
+		<label>Raygun Mk.2 V Cartridge</label>
+		<ammoTypes>
+			<Ammo_Raygun_two_v>Bullet_Raygun_two_v</Ammo_Raygun_two_v>
+		</ammoTypes>
+		<similarTo>AmmoSet_Pistol</similarTo>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="Raygun_two_vBase" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Pistol cartridge favoured for its above average stopping power.</description>
+		<statBases>
+			<Mass>0.02</Mass>
+			<Bulk>0.02</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoRaygun_two_v</li>
+		</thingCategories>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Raygun_two_vBase">
+		<defName>Ammo_Raygun_two_v</defName>
+		<label>Raygun Mk.2 V Cartridge</label>
+		<graphicData>
+			<texPath>ThirdParty/CoD Zombies Pack/Raygun/2/V</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_Raygun_two_v</cookOffProjectile>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef ParentName="Raygun2Bullet">
+		<defName>Bullet_Raygun_two_v</defName>
+		<label>Raygun Mk.2 V Plasma</label>
+		<graphicData>
+			<texPath>Things/Projectile/CodZP_Bullet_Plasma_Straight</texPath>
+			<color>(255, 255, 31)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Electrical</damageDef>
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>27</armorPenetrationSharp>
+			<armorPenetrationBlunt>4.4</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeAmmo">
+		<defName>MakeAmmo_Raygun_two_v</defName>
+		<label>make Raygun Mk.2 V Cartridge x500</label>
+		<description>Craft 500 Raygun Mk.2 V Cartridges.</description>
+		<jobString>Making Raygun Mk.2 V Cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Raygun_two_v>500</Ammo_Raygun_two_v>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2V_Punched.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2V_Punched.xml
new file mode 100644
index 0000000000..adc76ca24f
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2V_Punched.xml	
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoRaygun_two_v_Punched</defName>
+		<label>Porter's Raygun Mk.2 V</label>
+		<parent>AmmoWonders_Punched</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Raygun_two_v_Punched</defName>
+		<label>Porter's Raygun Mk.2 V Ammo Set</label>
+		<ammoTypes>
+			<Ammo_Raygun_two_v_Punched>Bullet_Raygun_two_v_Punched</Ammo_Raygun_two_v_Punched>
+		</ammoTypes>
+		<similarTo>AmmoSet_Pistol</similarTo>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="Raygun_two_vPunched" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Pistol cartridge favoured for its above average stopping power.</description>
+		<statBases>
+			<Mass>0.02</Mass>
+			<Bulk>0.02</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoRaygun_two_v_Punched</li>
+		</thingCategories>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Raygun_two_vPunched">
+		<defName>Ammo_Raygun_two_v_Punched</defName>
+		<label>Porter's Raygun Mk.2 V Cartridge</label>
+		<graphicData>
+			<texPath>ThirdParty/CoD Zombies Pack/Raygun/2/V</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_Raygun_two_v_Punched</cookOffProjectile>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef ParentName="Raygun2BulletPunched">
+		<defName>Bullet_Raygun_two_v_Punched</defName>
+		<label>Porter's Raygun Mk.2 V Plasma</label>
+		<graphicData>
+			<texPath>Things/Projectile/CodZP_Bullet_Plasma_Straight</texPath>
+			<color>(255, 255, 31)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Electrical</damageDef>
+			<damageAmountBase>40</damageAmountBase>
+			<armorPenetrationSharp>54</armorPenetrationSharp>
+			<armorPenetrationBlunt>8.8</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonderAmmo_Punched">
+		<defName>MakeAmmo_Raygun_two_v_Punched</defName>
+		<label>make Porter's Raygun Mk.2 V Cartridge x500</label>
+		<description>Craft 500 Porter's Raygun Mk.2 V Cartridges.</description>
+		<jobString>Making Porter's Raygun Mk.2 V Cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Raygun_two_v_Punched>500</Ammo_Raygun_two_v_Punched>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2X.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2X.xml
new file mode 100644
index 0000000000..bc4cfb3ad4
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2X.xml	
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoRaygun_two_x</defName>
+		<label>Raygun Mk.2 X</label>
+		<parent>AmmoWonders</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Raygun_two_x</defName>
+		<label>Raygun Mk.2 X Cartridge</label>
+		<ammoTypes>
+			<Ammo_Raygun_two_x>Bullet_Raygun_two_x</Ammo_Raygun_two_x>
+		</ammoTypes>
+		<similarTo>AmmoSet_Pistol</similarTo>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="Raygun_two_xBase" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Pistol cartridge favoured for its above average stopping power.</description>
+		<statBases>
+			<Mass>0.02</Mass>
+			<Bulk>0.02</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoRaygun_two_x</li>
+		</thingCategories>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Raygun_two_xBase">
+		<defName>Ammo_Raygun_two_x</defName>
+		<label>Raygun Mk.2 X Cartridge</label>
+		<graphicData>
+			<texPath>ThirdParty/CoD Zombies Pack/Raygun/2/X</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_Raygun_two_x</cookOffProjectile>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef ParentName="Raygun2Bullet">
+		<defName>Bullet_Raygun_two_x</defName>
+		<label>Raygun Mk.2 X Plasma</label>
+		<graphicData>
+			<texPath>Things/Projectile/CodZP_Bullet_Plasma_Normal</texPath>
+			<color>(0, 70, 230)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>27</armorPenetrationSharp>
+			<armorPenetrationBlunt>4.4</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeAmmo">
+		<defName>MakeAmmo_Raygun_two_x</defName>
+		<label>make Raygun Mk.2 X Cartridge x500</label>
+		<description>Craft 500 Raygun Mk.2 X Cartridges.</description>
+		<jobString>Making Raygun Mk.2 X Cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Raygun_two_x>500</Ammo_Raygun_two_x>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2X_Punched.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2X_Punched.xml
new file mode 100644
index 0000000000..7b16a0ff10
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2X_Punched.xml	
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoRaygun_two_x_Punched</defName>
+		<label>Porter's Raygun Mk.2 X</label>
+		<parent>AmmoWonders_Punched</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Raygun_two_x_Punched</defName>
+		<label>Porter's Raygun Mk.2 X Ammo Set</label>
+		<ammoTypes>
+			<Ammo_Raygun_two_x_Punched>Bullet_Raygun_two_x_Punched</Ammo_Raygun_two_x_Punched>
+		</ammoTypes>
+		<similarTo>AmmoSet_Pistol</similarTo>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="Raygun_two_xPunched" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Pistol cartridge favoured for its above average stopping power.</description>
+		<statBases>
+			<Mass>0.02</Mass>
+			<Bulk>0.02</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoRaygun_two_x_Punched</li>
+		</thingCategories>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Raygun_two_xPunched">
+		<defName>Ammo_Raygun_two_x_Punched</defName>
+		<label>Porter's Raygun Mk.2 X Cartridge</label>
+		<graphicData>
+			<texPath>ThirdParty/CoD Zombies Pack/Raygun/2/X</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_Raygun_two_x_Punched</cookOffProjectile>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef ParentName="Raygun2BulletPunched">
+		<defName>Bullet_Raygun_two_x_Punched</defName>
+		<label>Porter's Raygun Mk.2 X Plasma</label>
+		<graphicData>
+			<texPath>Things/Projectile/CodZP_Bullet_Plasma_Normal</texPath>
+			<color>(0, 70, 230)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>40</damageAmountBase>
+			<armorPenetrationSharp>54</armorPenetrationSharp>
+			<armorPenetrationBlunt>8.8</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonderAmmo_Punched">
+		<defName>MakeAmmo_Raygun_two_x_Punched</defName>
+		<label>make Porter's Raygun Mk.2 X Cartridge x500</label>
+		<description>Craft 500 Porter's Raygun Mk.2 X Cartridges.</description>
+		<jobString>Making Porter's Raygun Mk.2 X Cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Raygun_two_x_Punched>500</Ammo_Raygun_two_x_Punched>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2Y.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2Y.xml
new file mode 100644
index 0000000000..6f486121ed
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2Y.xml	
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoRaygun_two_y</defName>
+		<label>Raygun Mk.2 Y</label>
+		<parent>AmmoWonders</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Raygun_two_y</defName>
+		<label>Raygun Mk.2 Y Cartridge</label>
+		<ammoTypes>
+			<Ammo_Raygun_two_y>Bullet_Raygun_two_y</Ammo_Raygun_two_y>
+		</ammoTypes>
+		<similarTo>AmmoSet_Pistol</similarTo>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="Raygun_two_yBase" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Pistol cartridge favoured for its above average stopping power.</description>
+		<statBases>
+			<Mass>0.02</Mass>
+			<Bulk>0.02</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoRaygun_two_y</li>
+		</thingCategories>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Raygun_two_yBase">
+		<defName>Ammo_Raygun_two_y</defName>
+		<label>Raygun Mk.2 Y Cartridge</label>
+		<graphicData>
+			<texPath>ThirdParty/CoD Zombies Pack/Raygun/2/Y</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>ExplosiveAP</ammoClass>
+		<cookOffProjectile>Bullet_Raygun_two_y</cookOffProjectile>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef ParentName="Raygun2Bullet">
+		<defName>Bullet_Raygun_two_y</defName>
+		<label>Raygun Mk.2 Y Plasma</label>
+		<graphicData>
+			<texPath>Things/Projectile/CodZP_Bullet_Plasma_Trail</texPath>
+			<color>(250, 90, 10)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>27</armorPenetrationSharp>
+			<armorPenetrationBlunt>4.4</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>107</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeAmmo">
+		<defName>MakeAmmo_Raygun_two_y</defName>
+		<label>make Raygun Mk.2 Y Cartridge x500</label>
+		<description>Craft 500 Raygun Mk.2 Y Cartridges.</description>
+		<jobString>Making Raygun Mk.2 Y Cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Raygun_two_y>500</Ammo_Raygun_two_y>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2Y_Punched.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2Y_Punched.xml
new file mode 100644
index 0000000000..2eff7ff8e9
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2Y_Punched.xml	
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoRaygun_two_y_Punched</defName>
+		<label>Porter's Raygun Mk.2 Y</label>
+		<parent>AmmoWonders_Punched</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Raygun_two_y_Punched</defName>
+		<label>Porter's Raygun Mk.2 Y Ammo Set</label>
+		<ammoTypes>
+			<Ammo_Raygun_two_y_Punched>Bullet_Raygun_two_y_Punched</Ammo_Raygun_two_y_Punched>
+		</ammoTypes>
+		<similarTo>AmmoSet_Pistol</similarTo>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="Raygun_two_yPunched" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Pistol cartridge favoured for its above average stopping power.</description>
+		<statBases>
+			<Mass>0.02</Mass>
+			<Bulk>0.02</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoRaygun_two_y_Punched</li>
+		</thingCategories>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Raygun_two_yPunched">
+		<defName>Ammo_Raygun_two_y_Punched</defName>
+		<label>Porter's Raygun Mk.2 Y Cartridge</label>
+		<graphicData>
+			<texPath>ThirdParty/CoD Zombies Pack/Raygun/2/Y</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>ExplosiveAP</ammoClass>
+		<cookOffProjectile>Bullet_Raygun_two_y_Punched</cookOffProjectile>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef ParentName="Raygun2BulletPunched">
+		<defName>Bullet_Raygun_two_y_Punched</defName>
+		<label>Porter's Raygun Mk.2 Y Plasma</label>
+		<graphicData>
+			<texPath>Things/Projectile/CodZP_Bullet_Plasma_Trail</texPath>
+			<color>(250, 90, 10)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>40</damageAmountBase>
+			<armorPenetrationSharp>54</armorPenetrationSharp>
+			<armorPenetrationBlunt>8.8</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>214</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonderAmmo_Punched">
+		<defName>MakeAmmo_Raygun_two_y_Punched</defName>
+		<label>make Porter's Raygun Mk.2 Y Cartridge x500</label>
+		<description>Craft 500 Porter's Raygun Mk.2 Y Cartridges.</description>
+		<jobString>Making Porter's Raygun Mk.2 Y Cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Raygun_two_y_Punched>500</Ammo_Raygun_two_y_Punched>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2Z.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2Z.xml
new file mode 100644
index 0000000000..2ce2fd4890
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2Z.xml	
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoRaygun_two_z</defName>
+		<label>Raygun Mk.2 Z</label>
+		<parent>AmmoWonders</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Raygun_two_z</defName>
+		<label>Raygun Mk.2 Z Cartridge</label>
+		<ammoTypes>
+			<Ammo_Raygun_two_z>Bullet_Raygun_two_z</Ammo_Raygun_two_z>
+		</ammoTypes>
+		<similarTo>AmmoSet_Pistol</similarTo>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="Raygun_two_zBase" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Pistol cartridge favoured for its above average stopping power.</description>
+		<statBases>
+			<Mass>0.02</Mass>
+			<Bulk>0.02</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoRaygun_two_z</li>
+		</thingCategories>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Raygun_two_zBase">
+		<defName>Ammo_Raygun_two_z</defName>
+		<label>Raygun Mk.2 Z Cartridge</label>
+		<graphicData>
+			<texPath>ThirdParty/CoD Zombies Pack/Raygun/2/Z</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_Raygun_two_z</cookOffProjectile>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef ParentName="Raygun2Bullet">
+		<defName>Bullet_Raygun_two_z</defName>
+		<label>Raygun Mk.2 Z Plasma</label>
+		<graphicData>
+			<texPath>Things/Projectile/CodZP_Bullet_Plasma_Ringed</texPath>
+			<color>(140, 0, 255)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>27</armorPenetrationSharp>
+			<armorPenetrationBlunt>4.4</armorPenetrationBlunt>
+			<pelletCount>3</pelletCount>
+			<spreadMult>20</spreadMult>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeAmmo">
+		<defName>MakeAmmo_Raygun_two_z</defName>
+		<label>make Raygun Mk.2 Z Cartridge x500</label>
+		<description>Craft 500 Raygun Mk.2 Z Cartridges.</description>
+		<jobString>Making Raygun Mk.2 Z Cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Raygun_two_z>500</Ammo_Raygun_two_z>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2Z_Punched.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2Z_Punched.xml
new file mode 100644
index 0000000000..70daf6a932
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2Z_Punched.xml	
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoRaygun_two_z_Punched</defName>
+		<label>Porter's Raygun Mk.2 Z</label>
+		<parent>AmmoWonders_Punched</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Raygun_two_z_Punched</defName>
+		<label>Porter's Raygun Mk.2 Z Ammo Set</label>
+		<ammoTypes>
+			<Ammo_Raygun_two_z_Punched>Bullet_Raygun_two_z_Punched</Ammo_Raygun_two_z_Punched>
+		</ammoTypes>
+		<similarTo>AmmoSet_Pistol</similarTo>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="Raygun_two_zPunched" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Pistol cartridge favoured for its above average stopping power.</description>
+		<statBases>
+			<Mass>0.02</Mass>
+			<Bulk>0.02</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoRaygun_two_z_Punched</li>
+		</thingCategories>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Raygun_two_zPunched">
+		<defName>Ammo_Raygun_two_z_Punched</defName>
+		<label>Porter's Raygun Mk.2 Z Cartridge</label>
+		<graphicData>
+			<texPath>ThirdParty/CoD Zombies Pack/Raygun/2/Z</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_Raygun_two_z_Punched</cookOffProjectile>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef ParentName="Raygun2BulletPunched">
+		<defName>Bullet_Raygun_two_z_Punched</defName>
+		<label>Porter's Raygun Mk.2 Z Plasma</label>
+		<graphicData>
+			<texPath>Things/Projectile/CodZP_Bullet_Plasma_Ringed</texPath>
+			<color>(140, 0, 255)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>40</damageAmountBase>
+			<armorPenetrationSharp>54</armorPenetrationSharp>
+			<armorPenetrationBlunt>8.8</armorPenetrationBlunt>
+			<pelletCount>3</pelletCount>
+			<spreadMult>20</spreadMult>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonderAmmo_Punched">
+		<defName>MakeAmmo_Raygun_two_z_Punched</defName>
+		<label>make Porter's Raygun Mk.2 Z Cartridge x500</label>
+		<description>Craft 500 Porter's Raygun Mk.2 Z Cartridges.</description>
+		<jobString>Making Porter's Raygun Mk.2 Z Cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Raygun_two_z_Punched>500</Ammo_Raygun_two_z_Punched>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2_Punched.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2_Punched.xml
new file mode 100644
index 0000000000..fe55f67ab5
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2_Punched.xml	
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoRaygun_two_Punched</defName>
+		<label>Porter's Raygun Mk.2</label>
+		<parent>AmmoWonders_Punched</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Raygun_two_Punched</defName>
+		<label>Porter's Raygun Mk.2 Ammo Set</label>
+		<ammoTypes>
+			<Ammo_Raygun_two_Punched>Bullet_Raygun_two_Punched</Ammo_Raygun_two_Punched>
+		</ammoTypes>
+		<similarTo>AmmoSet_Pistol</similarTo>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="Raygun_twoPunched" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Raygun 2 cartridges</description>
+		<statBases>
+			<Mass>0.02</Mass>
+			<Bulk>0.02</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoRaygun_two_Punched</li>
+		</thingCategories>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Raygun_twoPunched">
+		<defName>Ammo_Raygun_two_Punched</defName>
+		<label>Porter's Raygun Mk.2 Cartridge</label>
+		<graphicData>
+			<texPath>ThirdParty/CoD Zombies Pack/Raygun/2/Porter</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_Raygun_two_Punched</cookOffProjectile>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef Name="Raygun2BulletPunched" ParentName="Raygun2Bullet" Abstract="true">
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>268</speed>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Raygun2BulletPunched">
+		<defName>Bullet_Raygun_two_Punched</defName>
+		<label>Porter's Raygun Mk.2 Plasma</label>
+		<graphicData>
+			<texPath>Things/Projectile/CodZP_Bullet_Plasma_Normal</texPath>
+			<color>(255,31,31)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>40</damageAmountBase>
+			<armorPenetrationSharp>54</armorPenetrationSharp>
+			<armorPenetrationBlunt>8.8</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonder_Punched">
+		<defName>MakeAmmo_Raygun_two_Punched</defName>
+		<label>make Porter's Raygun Mk.2 Cartridge x500</label>
+		<description>Craft 500 Porter's Raygun Mk.2 Cartridge.</description>
+		<jobString>Making Porter's Raygun_two cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Raygun_two_Punched>500</Ammo_Raygun_two_Punched>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun3.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun3.xml
new file mode 100644
index 0000000000..2bd3aafbcc
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun3.xml	
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoRaygun_three</defName>
+		<label>Raygun Mk.3</label>
+		<parent>AmmoWonders</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Raygun_three</defName>
+		<label>Raygun Mk.3</label>
+		<ammoTypes>
+			<Ammo_Raygun_three>Bullet_Raygun_three</Ammo_Raygun_three>
+		</ammoTypes>
+		<similarTo>AmmoSet_Pistol</similarTo>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="Raygun_threeBase" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Pistol cartridge favoured for its above average stopping power.</description>
+		<statBases>
+			<Mass>0.02</Mass>
+			<Bulk>0.02</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoRaygun_three</li>
+		</thingCategories>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Raygun_threeBase">
+		<defName>Ammo_Raygun_three</defName>
+		<label>Raygun Mk.3 cartridge</label>
+		<graphicData>
+			<texPath>Things/Ammo/Pistol/FMJ</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_Raygun_three</cookOffProjectile>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef ParentName="BaseRaygunBullet">
+		<defName>Bullet_Raygun_three</defName>
+		<label>Raygun Mark 3 Plasma</label>
+		<graphicData>
+			<color>(100,255,60)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>3</armorPenetrationSharp>
+			<armorPenetrationBlunt>10.860</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonder">
+		<defName>MakeAmmo_Raygun_three</defName>
+		<label>make Raygun Mk.3 cartridge x500</label>
+		<description>Craft 500 Raygun Mk.3 cartridges.</description>
+		<jobString>Making Raygun Mk.3 cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Raygun_three>500</Ammo_Raygun_three>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun3GKZ.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun3GKZ.xml
new file mode 100644
index 0000000000..98fc77cca0
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun3GKZ.xml	
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoRaygun_three_GKZ</defName>
+		<label>GKZ-45</label>
+		<parent>AmmoWonders</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Raygun_three_GKZ</defName>
+		<label>GKZ-45</label>
+		<ammoTypes>
+			<Ammo_Raygun_three_GKZ>Bullet_Raygun_three_GKZ</Ammo_Raygun_three_GKZ>
+		</ammoTypes>
+		<similarTo>AmmoSet_Pistol</similarTo>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="Raygun_three_GKZBase" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Pistol cartridge favoured for its above average stopping power.</description>
+		<statBases>
+			<Mass>0.02</Mass>
+			<Bulk>0.02</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoRaygun_three_GKZ</li>
+		</thingCategories>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Raygun_three_GKZBase">
+		<defName>Ammo_Raygun_three_GKZ</defName>
+		<label>GKZ-45 cartridge</label>
+		<graphicData>
+			<texPath>Things/Ammo/Pistol/FMJ</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>ExplosiveAP</ammoClass>
+		<cookOffProjectile>Bullet_Raygun_three_GKZ</cookOffProjectile>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef ParentName="BaseRaygunBullet">
+		<defName>Bullet_Raygun_three_GKZ</defName>
+		<label>GKZ-45 Plasma</label>
+		<graphicData>
+			<color>(255,255,31)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>3</armorPenetrationSharp>
+			<armorPenetrationBlunt>10.860</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>107</damageAmountBase>
+				<explosiveDamageType>CodZP_RaygunYellowBomb</explosiveDamageType>
+				<explosiveRadius>1</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonder">
+		<defName>MakeAmmo_Raygun_three_GKZ</defName>
+		<label>make GKZ-45 cartridge x500</label>
+		<description>Craft 500 GKZ-45 cartridges.</description>
+		<jobString>Making GKZ-45 cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Raygun_three_GKZ>500</Ammo_Raygun_three_GKZ>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun3GKZ_Punched.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun3GKZ_Punched.xml
new file mode 100644
index 0000000000..7bd287b4ca
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun3GKZ_Punched.xml	
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoRaygun_three_GKZ_Punched</defName>
+		<label>Maelstorm</label>
+		<parent>AmmoWonders_Punched</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Raygun_three_GKZ_Punched</defName>
+		<label>Maelstorm Cartridge</label>
+		<ammoTypes>
+			<Ammo_Raygun_three_GKZ_Punched>Bullet_Raygun_three_GKZ_Punched</Ammo_Raygun_three_GKZ_Punched>
+		</ammoTypes>
+		<similarTo>AmmoSet_Pistol</similarTo>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="Raygun_three_GKZPunched" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Pistol cartridge favoured for its above average stopping power.</description>
+		<statBases>
+			<Mass>0.02</Mass>
+			<Bulk>0.02</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoRaygun_three_GKZ_Punched</li>
+		</thingCategories>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Raygun_three_GKZPunched">
+		<defName>Ammo_Raygun_three_GKZ_Punched</defName>
+		<label>Maelstorm cartridge</label>
+		<graphicData>
+			<texPath>Things/Ammo/Pistol/FMJ</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>ExplosiveAP</ammoClass>
+		<cookOffProjectile>Bullet_Raygun_three_GKZ_Punched</cookOffProjectile>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef ParentName="RaygunBulletPunched">
+		<defName>Bullet_Raygun_three_GKZ_Punched</defName>
+		<label>Maelstorm Plasma</label>
+		<graphicData>
+			<color>(255,255,31)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>24</damageAmountBase>
+			<armorPenetrationSharp>6</armorPenetrationSharp>
+			<armorPenetrationBlunt>20.860</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>214</damageAmountBase>
+				<explosiveDamageType>CodZP_RaygunYellowBomb</explosiveDamageType>
+				<explosiveRadius>1</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonder_Punched">
+		<defName>MakeAmmo_Raygun_three_GKZ_Punched</defName>
+		<label>make Maelstorm cartridge x500</label>
+		<description>Craft 500 Maelstorm cartridges.</description>
+		<jobString>Making Maelstorm cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Raygun_three_GKZ_Punched>500</Ammo_Raygun_three_GKZ_Punched>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun3_Punched.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun3_Punched.xml
new file mode 100644
index 0000000000..37cc2878b2
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun3_Punched.xml	
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoRaygun_three_Punched</defName>
+		<label>Eris</label>
+		<parent>AmmoWonders_Punched</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Raygun_three_Punched</defName>
+		<label>Eris Cartridge</label>
+		<ammoTypes>
+			<Ammo_Raygun_three_Punched>Bullet_Raygun_three_Punched</Ammo_Raygun_three_Punched>
+		</ammoTypes>
+		<similarTo>AmmoSet_Pistol</similarTo>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="Raygun_threePunched" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Pistol cartridge favoured for its above average stopping power.</description>
+		<statBases>
+			<Mass>0.02</Mass>
+			<Bulk>0.02</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoRaygun_three_Punched</li>
+		</thingCategories>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Raygun_threePunched">
+		<defName>Ammo_Raygun_three_Punched</defName>
+		<label>Eris Cartridge</label>
+		<graphicData>
+			<texPath>Things/Ammo/Pistol/FMJ</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_Raygun_three_Punched</cookOffProjectile>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef ParentName="RaygunBulletPunched">
+		<defName>Bullet_Raygun_three_Punched</defName>
+		<label>Eris Plasma</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<color>(255,31,31)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>24</damageAmountBase>
+			<armorPenetrationSharp>6</armorPenetrationSharp>
+			<armorPenetrationBlunt>20.860</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonder_Punched">
+		<defName>MakeAmmo_Raygun_three_Punched</defName>
+		<label>make Eris cartridge x50</label>
+		<description>Craft 50 Eris cartridges.</description>
+		<jobString>Making Eris cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_Raygun_three</li>
+					</thingDefs>
+				</filter>
+				<count>200</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_Raygun_three</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Raygun_three_Punched>50</Ammo_Raygun_three_Punched>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun_Punched.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun_Punched.xml
new file mode 100644
index 0000000000..dba7367747
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun_Punched.xml	
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoRaygun_Punched</defName>
+		<label>Porter's Raygun</label>
+		<parent>AmmoWonders_Punched</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Raygun_Punched</defName>
+		<label>Porter's Raygun Ammo Set</label>
+		<ammoTypes>
+			<Ammo_Raygun_Punched>Bullet_Raygun_Punched</Ammo_Raygun_Punched>
+		</ammoTypes>
+		<similarTo>AmmoSet_Pistol</similarTo>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="RaygunPunched" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Pistol cartridge favoured for its above average stopping power.</description>
+		<statBases>
+			<Mass>0.02</Mass>
+			<Bulk>0.02</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoRaygun_Punched</li>
+		</thingCategories>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="RaygunPunched">
+		<defName>Ammo_Raygun_Punched</defName>
+		<label>Porter's Raygun cartridge</label>
+		<graphicData>
+			<texPath>ThirdParty/CoD Zombies Pack/Raygun/1</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(200,200,200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>ExplosiveAP</ammoClass>
+		<cookOffProjectile>Bullet_Raygun_Punched</cookOffProjectile>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef Name="RaygunBulletPunched" ParentName="BaseRaygunBullet" Abstract="true">
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>78</speed>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="RaygunBulletPunched">
+		<defName>Bullet_Raygun_Punched</defName>
+		<label>Porter's Raygun Plasma</label>
+		<graphicData>
+			<color>(255,31,31)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>24</damageAmountBase>
+			<armorPenetrationSharp>6</armorPenetrationSharp>
+			<armorPenetrationBlunt>20.860</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>214</damageAmountBase>
+				<explosiveDamageType>CodZP_RaygunRedBomb</explosiveDamageType>
+				<explosiveRadius>1</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonder_Punched">
+		<defName>MakeAmmo_Raygun_Punched</defName>
+		<label>make Porter's Raygun cartridge x500</label>
+		<description>Craft 500 Porter's Raygun cartridges.</description>
+		<jobString>Making Porter's Raygun cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Raygun_Punched>500</Ammo_Raygun_Punched>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Recipe/12Gauge-Punched.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Recipe/12Gauge-Punched.xml
new file mode 100644
index 0000000000..432eeda94d
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Recipe/12Gauge-Punched.xml	
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>Ammo12Gauge_Punched</defName>
+		<label>Punched 12 gauge</label>
+		<parent>AmmoShotguns_Punched</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberShotgun</iconPath>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_12Gauge_Punched</defName>
+		<label>Punched 12 Gauge</label>
+		<ammoTypes>
+			<Ammo_12Gauge_Buck_Punched>Bullet_12Gauge_Buck_Punched</Ammo_12Gauge_Buck_Punched>
+			<Ammo_12Gauge_Slug_Punched>Bullet_12Gauge_Slug_Punched</Ammo_12Gauge_Slug_Punched>
+			<Ammo_12Gauge_ElectroSlug_Punched>Bullet_12Gauge_ElectroSlug_Punched</Ammo_12Gauge_ElectroSlug_Punched>
+		</ammoTypes>
+		<similarTo>AmmoSet_12Gauge</similarTo>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="12GaugePunched" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Extremely common shotgun caliber used in almost every application, from hunting over riot control to military firearms.</description>
+		<statBases>
+			<Mass>0.023</Mass>
+			<Bulk>0.06</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo12Gauge_Punched</li>
+		</thingCategories>
+		<stackLimit>5000</stackLimit>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="12GaugePunched">
+		<defName>Ammo_12Gauge_Buck_Punched</defName>
+		<label>12 gauge shell (Buck) (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Shotgun/Shot</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.2</MarketValue>
+		</statBases>
+		<ammoClass>BuckShot</ammoClass>
+		<cookOffProjectile>Bullet_12Gauge_Buck_Punched</cookOffProjectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="12GaugePunched">
+		<defName>Ammo_12Gauge_Slug_Punched</defName>
+		<label>12 gauge shell (Slug) (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Shotgun/Slug</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<statBases>
+			<Mass>0.048</Mass>
+			<MarketValue>0.4</MarketValue>
+		</statBases>
+		<ammoClass>Slug</ammoClass>
+		<cookOffProjectile>Bullet_12Gauge_Slug_Punched</cookOffProjectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="12GaugePunched">
+		<defName>Ammo_12Gauge_ElectroSlug_Punched</defName>
+		<label>12 gauge shell (EMP) (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Shotgun/EMP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<statBases>
+			<Mass>0.054</Mass>
+			<MarketValue>1.74</MarketValue>
+		</statBases>
+		<ammoClass>ElectroSlug</ammoClass>
+		<cookOffProjectile>Bullet_12Gauge_ElectroSlug_Punched</cookOffProjectile>
+	</ThingDef>
+	<!-- ==================== Projectiles ==================== -->
+	<ThingDef Name="Punched12GaugeBullet" ParentName="BaseBulletCE" Abstract="true">
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>92</speed>
+			<dropsCasings>true</dropsCasings>
+			<casingMoteDefname>Fleck_ShotgunShell</casingMoteDefname>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Punched12GaugeBullet">
+		<defName>Bullet_12Gauge_Buck_Punched</defName>
+		<label>buckshot pellet (Punched)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shotgun_Pellet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>16</damageAmountBase>
+			<pelletCount>9</pelletCount>
+			<armorPenetrationSharp>4</armorPenetrationSharp>
+			<armorPenetrationBlunt>4.52</armorPenetrationBlunt>
+			<spreadMult>17.8</spreadMult>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Punched12GaugeBullet">
+		<defName>Bullet_12Gauge_Slug_Punched</defName>
+		<label>shotgun slug (Punched)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>126</speed>
+			<damageAmountBase>56</damageAmountBase>
+			<armorPenetrationSharp>12</armorPenetrationSharp>
+			<armorPenetrationBlunt>85.2</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Punched12GaugeBullet">
+		<defName>Bullet_12Gauge_ElectroSlug_Punched</defName>
+		<label>EMP slug (Punched)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>43</speed>
+			<damageDef>EMP</damageDef>
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+			<empShieldBreakChance>0.2</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ==================== -->
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_12Gauge_Buck_Punched</defName>
+		<label>make 12 gauge (Buck) shell (Punched) x200</label>
+		<description>Craft 200 12 gauge (Buck) shells (Punched).</description>
+		<jobString>Making 12 gauge (Buck) shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_12Gauge_Buck</li>
+					</thingDefs>
+				</filter>
+				<count>800</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_12Gauge_Buck</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_12Gauge_Buck_Punched>200</Ammo_12Gauge_Buck_Punched>
+		</products>
+		<workAmount>1000</workAmount>
+	</RecipeDef>
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_12Gauge_Slug_Punched</defName>
+		<label>make 12 gauge (Slug) shell (Punched) x200</label>
+		<description>Craft 200 12 gauge (Slug) shells (Punched).</description>
+		<jobString>Making 12 gauge (Slug) shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_12Gauge_Slug</li>
+					</thingDefs>
+				</filter>
+				<count>800</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_12Gauge_Slug</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_12Gauge_Slug_Punched>200</Ammo_12Gauge_Slug_Punched>
+		</products>
+		<workAmount>2000</workAmount>
+	</RecipeDef>
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_12Gauge_ElectroSlug_Punched</defName>
+		<label>make 12 gauge (EMP) shell (Punched) x200</label>
+		<description>Craft 200 12 gauge (EMP) shells (Punched).</description>
+		<jobString>Making 12 gauge (EMP) shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_12Gauge_ElectroSlug</li>
+					</thingDefs>
+				</filter>
+				<count>800</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_12Gauge_ElectroSlug</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_12Gauge_ElectroSlug_Punched>200</Ammo_12Gauge_ElectroSlug_Punched>
+		</products>
+		<workAmount>4600</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Recipe/303British-Punched.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Recipe/303British-Punched.xml
new file mode 100644
index 0000000000..84d527a2af
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Recipe/303British-Punched.xml	
@@ -0,0 +1,353 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>Ammo303British_Punched</defName>
+		<label>Punched .303 British</label>
+		<parent>AmmoRifles_Punched</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_303British_Punched</defName>
+		<label>Punched .303 British</label>
+		<ammoTypes>
+			<Ammo_303British_FMJ_Punched>Bullet_303British_FMJ_Punched</Ammo_303British_FMJ_Punched>
+			<Ammo_303British_AP_Punched>Bullet_303British_AP_Punched</Ammo_303British_AP_Punched>
+			<Ammo_303British_HP_Punched>Bullet_303British_HP_Punched</Ammo_303British_HP_Punched>
+			<Ammo_303British_Incendiary_Punched>Bullet_303British_Incendiary_Punched</Ammo_303British_Incendiary_Punched>
+			<Ammo_303British_HE_Punched>Bullet_303British_HE_Punched</Ammo_303British_HE_Punched>
+			<Ammo_303British_Sabot_Punched>Bullet_303British_Sabot_Punched</Ammo_303British_Sabot_Punched>
+		</ammoTypes>
+		<similarTo>AmmoSet_303British</similarTo>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="303BritishPunched" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Large rifle bullet found mostly in outdated bolt-action firearms.</description>
+		<statBases>
+			<Mass>0.026</Mass>
+			<Bulk>0.03</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo303British_Punched</li>
+		</thingCategories>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="303BritishPunched">
+		<defName>Ammo_303British_FMJ_Punched</defName>
+		<label>.303 British cartridge (FMJ) (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/FMJ</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.24</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_303British_FMJ_Punched</cookOffProjectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="303BritishPunched">
+		<defName>Ammo_303British_AP_Punched</defName>
+		<label>.303 British cartridge (AP) (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/AP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.24</MarketValue>
+		</statBases>
+		<ammoClass>ArmorPiercing</ammoClass>
+		<cookOffProjectile>Bullet_303British_AP_Punched</cookOffProjectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="303BritishPunched">
+		<defName>Ammo_303British_HP_Punched</defName>
+		<label>.303 British cartridge (HP) (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/HP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.24</MarketValue>
+		</statBases>
+		<ammoClass>HollowPoint</ammoClass>
+		<cookOffProjectile>Bullet_303British_HP_Punched</cookOffProjectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="303BritishPunched">
+		<defName>Ammo_303British_Incendiary_Punched</defName>
+		<label>.303 British cartridge (AP-I) (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/Incendiary</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.30</MarketValue>
+		</statBases>
+		<ammoClass>IncendiaryAP</ammoClass>
+		<cookOffProjectile>Bullet_303British_Incendiary_Punched</cookOffProjectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="303BritishPunched">
+		<defName>Ammo_303British_HE_Punched</defName>
+		<label>.303 British cartridge (HE) (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/HE</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.52</MarketValue>
+		</statBases>
+		<ammoClass>ExplosiveAP</ammoClass>
+		<cookOffProjectile>Bullet_303British_HE_Punched</cookOffProjectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="303BritishPunched">
+		<defName>Ammo_303British_Sabot_Punched</defName>
+		<label>.303 British cartridge (Sabot) (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/Sabot</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.28</MarketValue>
+			<Mass>0.022</Mass>
+		</statBases>
+		<ammoClass>Sabot</ammoClass>
+		<cookOffProjectile>Bullet_303British_Sabot_Punched</cookOffProjectile>
+	</ThingDef>
+	<!-- ==================== Projectiles ==================== -->
+	<ThingDef Name="Punched303BritishBullet" ParentName="BaseBulletCE" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>159</speed>
+			<dropsCasings>true</dropsCasings>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Punched303BritishBullet">
+		<defName>Bullet_303British_FMJ_Punched</defName>
+		<label>.303 British bullet (FMJ) (Punched)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>38</damageAmountBase>
+			<armorPenetrationSharp>14</armorPenetrationSharp>
+			<armorPenetrationBlunt>62.540</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Punched303BritishBullet">
+		<defName>Bullet_303British_AP_Punched</defName>
+		<label>.303 British bullet (AP) (Punched)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>24</damageAmountBase>
+			<armorPenetrationSharp>28</armorPenetrationSharp>
+			<armorPenetrationBlunt>62.540</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Punched303BritishBullet">
+		<defName>Bullet_303British_HP_Punched</defName>
+		<label>.303 British bullet (HP) (Punched)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>48</damageAmountBase>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+			<armorPenetrationBlunt>62.540</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Punched303BritishBullet">
+		<defName>Bullet_303British_Incendiary_Punched</defName>
+		<label>.303 British bullet (AP-I) (Punched)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>24</damageAmountBase>
+			<armorPenetrationSharp>28</armorPenetrationSharp>
+			<armorPenetrationBlunt>62.540</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>16</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Punched303BritishBullet">
+		<defName>Bullet_303British_HE_Punched</defName>
+		<label>.303 British bullet (HE) (Punched)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>38</damageAmountBase>
+			<armorPenetrationSharp>12</armorPenetrationSharp>
+			<armorPenetrationBlunt>62.540</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>24</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Punched303BritishBullet">
+		<defName>Bullet_303British_Sabot_Punched</defName>
+		<label>.303 British bullet (Sabot) (Punched)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>42</armorPenetrationSharp>
+			<armorPenetrationBlunt>80.960</armorPenetrationBlunt>
+			<speed>215</speed>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ==================== -->
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_303British_FMJ_Punched</defName>
+		<label>make .303 British (FMJ) cartridge (Punched) x500</label>
+		<description>Craft 500 .303 British (FMJ) cartridges (Punched).</description>
+		<jobString>Making .303 British (FMJ) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_303British_FMJ</li>
+					</thingDefs>
+				</filter>
+				<count>2000</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_303British_FMJ</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_303British_FMJ_Punched>500</Ammo_303British_FMJ_Punched>
+		</products>
+		<workAmount>2800</workAmount>
+	</RecipeDef>
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_303British_AP_Punched</defName>
+		<label>make .303 British (AP) cartridge (Punched) x500</label>
+		<description>Craft 500 .303 British (AP) cartridges (Punched).</description>
+		<jobString>Making .303 British (AP) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_303British_AP</li>
+					</thingDefs>
+				</filter>
+				<count>2000</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_303British_AP</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_303British_AP_Punched>500</Ammo_303British_AP_Punched>
+		</products>
+		<workAmount>2800</workAmount>
+	</RecipeDef>
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_303British_HP_Punched</defName>
+		<label>make .303 British (HP) cartridge (Punched) x500</label>
+		<description>Craft 500 .303 British (HP) cartridges (Punched).</description>
+		<jobString>Making .303 British (HP) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_303British_HP</li>
+					</thingDefs>
+				</filter>
+				<count>2000</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_303British_HP</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_303British_HP_Punched>500</Ammo_303British_HP_Punched>
+		</products>
+		<workAmount>2800</workAmount>
+	</RecipeDef>
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_303British_Incendiary_Punched</defName>
+		<label>make .303 British (AP-I) cartridge (Punched) x500</label>
+		<description>Craft 500 .303 British (AP-I) cartridges (Punched).</description>
+		<jobString>Making .303 British (AP-I) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_303British_Incendiary</li>
+					</thingDefs>
+				</filter>
+				<count>2000</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_303British_Incendiary</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_303British_Incendiary_Punched>500</Ammo_303British_Incendiary_Punched>
+		</products>
+		<workAmount>4000</workAmount>
+	</RecipeDef>
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_303British_HE_Punched</defName>
+		<label>make .303 British (HE) cartridge (Punched) x500</label>
+		<description>Craft 500 .303 British (HE) cartridges (Punched).</description>
+		<jobString>Making .303 British (HE) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_303British_HE</li>
+					</thingDefs>
+				</filter>
+				<count>2000</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_303British_HE</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_303British_HE_Punched>500</Ammo_303British_HE_Punched>
+		</products>
+		<workAmount>5600</workAmount>
+	</RecipeDef>
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_303British_Sabot_Punched</defName>
+		<label>make .303 British (Sabot) cartridge (Punched) x500</label>
+		<description>Craft 500 .303 British (Sabot) cartridges (Punched).</description>
+		<jobString>Making .303 British (Sabot) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_303British_Sabot</li>
+					</thingDefs>
+				</filter>
+				<count>2000</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_303British_Sabot</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_303British_Sabot_Punched>500</Ammo_303British_Sabot_Punched>
+		</products>
+		<workAmount>4000</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Recipe/30x64mmFuelCell-Punched.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Recipe/30x64mmFuelCell-Punched.xml
new file mode 100644
index 0000000000..a0ea2bfa83
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Recipe/30x64mmFuelCell-Punched.xml	
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>Ammo30x64mmFuelCell_Punched</defName>
+		<label>Punched 30x64mm Fuel Cell</label>
+		<parent>AmmoAdvanced_Punched</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberFuel</iconPath>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_30x64mmFuel_Punched</defName>
+		<label>Punched 30x64mm Fuel Cell</label>
+		<ammoTypes>
+			<Ammo_30x64mmFuel_Incendiary_Punched>Bullet_30x64mmFuel_Incendiary_Punched</Ammo_30x64mmFuel_Incendiary_Punched>
+			<Ammo_30x64mmFuel_Thermobaric_Punched>Bullet_30x64mmFuel_Thermobaric_Punched</Ammo_30x64mmFuel_Thermobaric_Punched>
+			<Ammo_30x64mmFuel_Foam_Punched>Bullet_30x64mmFuel_Foam_Punched</Ammo_30x64mmFuel_Foam_Punched>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="30x64mmFuelpunched" ParentName="SpacerSmallAmmoBase" Abstract="True">
+		<description>Container holding fuel for incendiary shot firearms.</description>
+		<statBases>
+			<Mass>0.08</Mass>
+			<Bulk>0.14</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo30x64mmFuelCell_Punched</li>
+		</thingCategories>
+		<stackLimit>3000</stackLimit>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="30x64mmFuelpunched">
+		<defName>Ammo_30x64mmFuel_Incendiary_Punched</defName>
+		<label>30x64mm fuel cell (Incendiary) (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/FuelCell/Incendiary</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>6.8</MarketValue>
+		</statBases>
+		<ammoClass>IncendiaryFuel</ammoClass>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="30x64mmFuelpunched">
+		<defName>Ammo_30x64mmFuel_Thermobaric_Punched</defName>
+		<label>30x64mm fuel cell (Thermobaric) (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/FuelCell/Thermobaric</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>11.92</MarketValue>
+		</statBases>
+		<ammoClass>ThermobaricFuel</ammoClass>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="30x64mmFuelpunched">
+		<defName>Ammo_30x64mmFuel_Foam_Punched</defName>
+		<label>30x64mm fuel cell (Foam) (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/FuelCell/Foam</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>7.32</MarketValue>
+		</statBases>
+		<ammoClass>FoamFuel</ammoClass>
+		<generateAllowChance>0</generateAllowChance>
+	</ThingDef>
+	<!-- ==================== Projectiles ==================== -->
+	<ThingDef Name="punched30x64mmFuelBullet" ParentName="BaseBulletCE" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/LauncherShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>60</speed>
+			<flyOverhead>false</flyOverhead>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="punched30x64mmFuelBullet">
+		<defName>Bullet_30x64mmFuel_Incendiary_Punched</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>incendiary bolt (Punched)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>PrometheumFlame</damageDef>
+			<damageAmountBase>10</damageAmountBase>
+			<explosionRadius>6.5</explosionRadius>
+			<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
+			<preExplosionSpawnChance>0.25</preExplosionSpawnChance>
+			<ai_IsIncendiary>true</ai_IsIncendiary>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="punched30x64mmFuelBullet">
+		<defName>Bullet_30x64mmFuel_Thermobaric_Punched</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>thermobaric bolt (Punched)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>2.0</explosionRadius>
+			<damageDef>Thermobaric</damageDef>
+			<damageAmountBase>64</damageAmountBase>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<ai_IsIncendiary>true</ai_IsIncendiary>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="punched30x64mmFuelBullet">
+		<defName>Bullet_30x64mmFuel_Foam_Punched</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>foam bolt (Punched)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Extinguish</damageDef>
+			<explosionRadius>6.5</explosionRadius>
+			<postExplosionSpawnThingDef>Filth_FireFoam</postExplosionSpawnThingDef>
+			<preExplosionSpawnChance>1</preExplosionSpawnChance>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ==================== -->
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_30x64mmFuel_Incendiary_Punched</defName>
+		<label>make 30x64mm fuel cell (Incendiary) (Punched) x50</label>
+		<description>Craft 50 30x64mm incendiary fuel cells (Punched).</description>
+		<jobString>Making incendiary fuel cells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_30x64mmFuel_Incendiary</li>
+					</thingDefs>
+				</filter>
+				<count>200</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_30x64mmFuel_Incendiary</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_30x64mmFuel_Incendiary_Punched>50</Ammo_30x64mmFuel_Incendiary_Punched>
+		</products>
+		<workAmount>7600</workAmount>
+	</RecipeDef>
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_30x64mmFuel_Thermobaric_Punched</defName>
+		<label>make 30x64mm fuel cell (Thermobaric) (Punched) x50</label>
+		<description>Craft 50 30x64mm thermobaric fuel cells (Punched).</description>
+		<jobString>Making thermobaric fuel cells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_30x64mmFuel_Thermobaric</li>
+					</thingDefs>
+				</filter>
+				<count>200</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_30x64mmFuel_Thermobaric</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_30x64mmFuel_Thermobaric_Punched>50</Ammo_30x64mmFuel_Thermobaric_Punched>
+		</products>
+		<workAmount>10400</workAmount>
+	</RecipeDef>
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_30x64mmFuel_Foam_Punched</defName>
+		<label>make 30x64mm fuel cell (Foam) (Punched) x50</label>
+		<description>Craft 50 30x64mm foam fuel cells (Punched).</description>
+		<jobString>Making foam fuel cells.</jobString>
+		<researchPrerequisite>Firefoam</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_30x64mmFuel_Foam</li>
+					</thingDefs>
+				</filter>
+				<count>200</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_30x64mmFuel_Foam</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_30x64mmFuel_Foam_Punched>50</Ammo_30x64mmFuel_Foam_Punched>
+		</products>
+		<workAmount>11400</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Recipe/44Magnum-Punched.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Recipe/44Magnum-Punched.xml
new file mode 100644
index 0000000000..1650fd4738
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Recipe/44Magnum-Punched.xml	
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>Ammo44Magnum_Punched</defName>
+		<label>Punched .44 Magnum</label>
+		<parent>AmmoPistols_Punched</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_44Magnum_Punched</defName>
+		<label>Punched .44 Magnum</label>
+		<ammoTypes>
+			<Ammo_44Magnum_FMJ_Punched>Bullet_44Magnum_FMJ_Punched</Ammo_44Magnum_FMJ_Punched>
+			<Ammo_44Magnum_AP_Punched>Bullet_44Magnum_AP_Punched</Ammo_44Magnum_AP_Punched>
+			<Ammo_44Magnum_HP_Punched>Bullet_44Magnum_HP_Punched</Ammo_44Magnum_HP_Punched>
+		</ammoTypes>
+		<similarTo>AmmoSet_44Magnum</similarTo>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="44MagnumPunched" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Ancient pistol cartridge originally designed for revolvers.</description>
+		<statBases>
+			<Mass>0.023</Mass>
+			<Bulk>0.02</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo44Magnum_Punched</li>
+		</thingCategories>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="44MagnumPunched">
+		<defName>Ammo_44Magnum_FMJ_Punched</defName>
+		<label>.44 Magnum cartridge (FMJ) (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Pistol/FMJ</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.2</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_44Magnum_FMJ_Punched</cookOffProjectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="44MagnumPunched">
+		<defName>Ammo_44Magnum_AP_Punched</defName>
+		<label>.44 Magnum cartridge (AP) (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Pistol/AP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.2</MarketValue>
+		</statBases>
+		<ammoClass>ArmorPiercing</ammoClass>
+		<cookOffProjectile>Bullet_44Magnum_AP_Punched</cookOffProjectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="44MagnumPunched">
+		<defName>Ammo_44Magnum_HP_Punched</defName>
+		<label>.44 Magnum cartridge (HP) (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Pistol/HP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.2</MarketValue>
+		</statBases>
+		<ammoClass>HollowPoint</ammoClass>
+		<cookOffProjectile>Bullet_44Magnum_HP_Punched</cookOffProjectile>
+	</ThingDef>
+	<!-- ==================== Projectiles ==================== -->
+	<ThingDef Name="Punched44MagnumBullet" ParentName="BaseBulletCE" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>98</speed>
+			<dropsCasings>true</dropsCasings>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Punched44MagnumBullet">
+		<defName>Bullet_44Magnum_FMJ_Punched</defName>
+		<label>.44 Magnum bullet (FMJ) (Punched)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>30</damageAmountBase>
+			<armorPenetrationSharp>12</armorPenetrationSharp>
+			<armorPenetrationBlunt>23.280</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Punched44MagnumBullet">
+		<defName>Bullet_44Magnum_AP_Punched</defName>
+		<label>.44 Magnum bullet (AP) (Punched)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>24</armorPenetrationSharp>
+			<armorPenetrationBlunt>23.280</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Punched44MagnumBullet">
+		<defName>Bullet_44Magnum_HP_Punched</defName>
+		<label>.44 Magnum bullet (HP) (Punched)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>38</damageAmountBase>
+			<armorPenetrationSharp>6</armorPenetrationSharp>
+			<armorPenetrationBlunt>23.280</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ==================== -->
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_44Magnum_FMJ_Punched</defName>
+		<label>make .44 Magnum (FMJ) cartridge (Punched) x500</label>
+		<description>Craft 500 .44 Magnum (FMJ) cartridges (Punched).</description>
+		<jobString>Making .44 Magnum (FMJ) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_44Magnum_FMJ</li>
+					</thingDefs>
+				</filter>
+				<count>2000</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_44Magnum_FMJ</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_44Magnum_FMJ_Punched>500</Ammo_44Magnum_FMJ_Punched>
+		</products>
+		<workAmount>2400</workAmount>
+	</RecipeDef>
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_44Magnum_AP_Punched</defName>
+		<label>make .44 Magnum (AP) cartridge (Punched) x500</label>
+		<description>Craft 500 .44 Magnum (AP) cartridges (Punched).</description>
+		<jobString>Making .44 Magnum (AP) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_44Magnum_AP</li>
+					</thingDefs>
+				</filter>
+				<count>2000</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_44Magnum_AP</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_44Magnum_AP_Punched>500</Ammo_44Magnum_AP_Punched>
+		</products>
+		<workAmount>2400</workAmount>
+	</RecipeDef>
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_44Magnum_HP_Punched</defName>
+		<label>make .44 Magnum (HP) cartridge (Punched) x500</label>
+		<description>Craft 500 .44 Magnum (HP) cartridges (Punched).</description>
+		<jobString>Making .44 Magnum (HP) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_44Magnum_HP</li>
+					</thingDefs>
+				</filter>
+				<count>2000</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_44Magnum_HP</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_44Magnum_HP_Punched>500</Ammo_44Magnum_HP_Punched>
+		</products>
+		<workAmount>2400</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Recipe/45ACP-Punched.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Recipe/45ACP-Punched.xml
new file mode 100644
index 0000000000..313fa910cf
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Recipe/45ACP-Punched.xml	
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>Ammo45ACP_Punched</defName>
+		<label>Punched .45 ACP</label>
+		<parent>AmmoPistols_Punched</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_45ACP_Punched</defName>
+		<label>Punched .45 ACP</label>
+		<ammoTypes>
+			<Ammo_45ACP_FMJ_Punched>Bullet_45ACP_FMJ_Punched</Ammo_45ACP_FMJ_Punched>
+			<Ammo_45ACP_AP_Punched>Bullet_45ACP_AP_Punched</Ammo_45ACP_AP_Punched>
+			<Ammo_45ACP_HP_Punched>Bullet_45ACP_HP_Punched</Ammo_45ACP_HP_Punched>
+		</ammoTypes>
+		<similarTo>AmmoSet_45ACP</similarTo>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="45ACPPunched" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Pistol cartridge favoured for its above average stopping power.</description>
+		<statBases>
+			<Mass>0.02</Mass>
+			<Bulk>0.02</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo45ACP_Punched</li>
+		</thingCategories>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="45ACPPunched">
+		<defName>Ammo_45ACP_FMJ_Punched</defName>
+		<label>.45 ACP cartridge (FMJ) (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Pistol/FMJ</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.18</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_45ACP_FMJ_Punched</cookOffProjectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="45ACPPunched">
+		<defName>Ammo_45ACP_AP_Punched</defName>
+		<label>.45 ACP cartridge (AP) (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Pistol/AP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.18</MarketValue>
+		</statBases>
+		<ammoClass>ArmorPiercing</ammoClass>
+		<cookOffProjectile>Bullet_45ACP_AP_Punched</cookOffProjectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="45ACPPunched">
+		<defName>Ammo_45ACP_HP_Punched</defName>
+		<label>.45 ACP cartridge (HP) (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Pistol/HP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.18</MarketValue>
+		</statBases>
+		<ammoClass>HollowPoint</ammoClass>
+		<cookOffProjectile>Bullet_45ACP_HP_Punched</cookOffProjectile>
+	</ThingDef>
+	<!-- ==================== Projectiles ==================== -->
+	<ThingDef Name="Punched45ACPBullet" ParentName="BaseBulletCE" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>74</speed>
+			<dropsCasings>true</dropsCasings>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Punched45ACPBullet">
+		<defName>Bullet_45ACP_FMJ_Punched</defName>
+		<label>.45 ACP bullet (FMJ) (Punched)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>24</damageAmountBase>
+			<armorPenetrationSharp>6</armorPenetrationSharp>
+			<armorPenetrationBlunt>10.860</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Punched45ACPBullet">
+		<defName>Bullet_45ACP_AP_Punched</defName>
+		<label>.45 ACP bullet (AP) (Punched)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>14</damageAmountBase>
+			<armorPenetrationSharp>12</armorPenetrationSharp>
+			<armorPenetrationBlunt>10.860</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Punched45ACPBullet">
+		<defName>Bullet_45ACP_HP_Punched</defName>
+		<label>.45 ACP bullet (HP) (Punched)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>30</damageAmountBase>
+			<armorPenetrationSharp>4</armorPenetrationSharp>
+			<armorPenetrationBlunt>10.860</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ==================== -->
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_45ACP_FMJ_Punched</defName>
+		<label>make .45 ACP (FMJ) cartridge (Punched) x500</label>
+		<description>Craft 500 .45 ACP (FMJ) cartridges (Punched).</description>
+		<jobString>Making .45 ACP (FMJ) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_45ACP_FMJ</li>
+					</thingDefs>
+				</filter>
+				<count>2000</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_45ACP_FMJ</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_45ACP_FMJ_Punched>500</Ammo_45ACP_FMJ_Punched>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_45ACP_AP_Punched</defName>
+		<label>make .45 ACP (AP) cartridge (Punched) x500</label>
+		<description>Craft 500 .45 ACP (AP) cartridges (Punched).</description>
+		<jobString>Making .45 ACP (AP) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_45ACP_AP</li>
+					</thingDefs>
+				</filter>
+				<count>2000</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_45ACP_AP</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_45ACP_AP_Punched>500</Ammo_45ACP_AP_Punched>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_45ACP_HP_Punched</defName>
+		<label>make .45 ACP (HP) cartridge (Punched) x500</label>
+		<description>Craft 500 .45 ACP (HP) cartridges (Punched).</description>
+		<jobString>Making .45 ACP (HP) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_45ACP_HP</li>
+					</thingDefs>
+				</filter>
+				<count>2000</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_45ACP_HP</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_45ACP_HP_Punched>500</Ammo_45ACP_HP_Punched>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Recipe/556x45mmNATO-Punched.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Recipe/556x45mmNATO-Punched.xml
new file mode 100644
index 0000000000..c98c546fdc
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Recipe/556x45mmNATO-Punched.xml	
@@ -0,0 +1,353 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>Ammo556x45mmNATO_Punched</defName>
+		<label>Punched 5.56x45mm NATO</label>
+		<parent>AmmoRifles_Punched</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_556x45mmNATO_Punched</defName>
+		<label>Punched 5.56x45mm NATO</label>
+		<ammoTypes>
+			<Ammo_556x45mmNATO_FMJ_Punched>Bullet_556x45mmNATO_FMJ_Punched</Ammo_556x45mmNATO_FMJ_Punched>
+			<Ammo_556x45mmNATO_AP_Punched>Bullet_556x45mmNATO_AP_Punched</Ammo_556x45mmNATO_AP_Punched>
+			<Ammo_556x45mmNATO_HP_Punched>Bullet_556x45mmNATO_HP_Punched</Ammo_556x45mmNATO_HP_Punched>
+			<Ammo_556x45mmNATO_Incendiary_Punched>Bullet_556x45mmNATO_Incendiary_Punched</Ammo_556x45mmNATO_Incendiary_Punched>
+			<Ammo_556x45mmNATO_HE_Punched>Bullet_556x45mmNATO_HE_Punched</Ammo_556x45mmNATO_HE_Punched>
+			<Ammo_556x45mmNATO_Sabot_Punched>Bullet_556x45mmNATO_Sabot_Punched</Ammo_556x45mmNATO_Sabot_Punched>
+		</ammoTypes>
+		<similarTo>AmmoSet_556x45mmNATO</similarTo>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="556x45mmNATOPunched" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Small, high-velocity rifle bullet used in a variety of assault rifles.</description>
+		<statBases>
+			<Mass>0.013</Mass>
+			<Bulk>0.02</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo556x45mmNATO</li>
+		</thingCategories>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="556x45mmNATOPunched">
+		<defName>Ammo_556x45mmNATO_FMJ_Punched</defName>
+		<label>5.56x45mm NATO cartridge (FMJ) (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/FMJ</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.12</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_556x45mmNATO_FMJ_Punched</cookOffProjectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="556x45mmNATOPunched">
+		<defName>Ammo_556x45mmNATO_AP_Punched</defName>
+		<label>5.56x45mm NATO cartridge (AP) (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/AP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.12</MarketValue>
+		</statBases>
+		<ammoClass>ArmorPiercing</ammoClass>
+		<cookOffProjectile>Bullet_556x45mmNATO_AP_Punched</cookOffProjectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="556x45mmNATOPunched">
+		<defName>Ammo_556x45mmNATO_HP_Punched</defName>
+		<label>5.56x45mm NATO cartridge (HP) (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/HP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.18</MarketValue>
+		</statBases>
+		<ammoClass>HollowPoint</ammoClass>
+		<cookOffProjectile>Bullet_556x45mmNATO_HP_Punched</cookOffProjectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="556x45mmNATOPunched">
+		<defName>Ammo_556x45mmNATO_Incendiary_Punched</defName>
+		<label>5.56x45mm NATO cartridge (AP-I) (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/Incendiary</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.24</MarketValue>
+		</statBases>
+		<ammoClass>IncendiaryAP</ammoClass>
+		<cookOffProjectile>Bullet_556x45mmNATO_Incendiary_Punched</cookOffProjectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="556x45mmNATOPunched">
+		<defName>Ammo_556x45mmNATO_HE_Punched</defName>
+		<label>5.56x45mm NATO cartridge (HE) (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/HE</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.14</MarketValue>
+		</statBases>
+		<ammoClass>ExplosiveAP</ammoClass>
+		<cookOffProjectile>Bullet_556x45mmNATO_HE_Punched</cookOffProjectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="556x45mmNATOPunched">
+		<defName>Ammo_556x45mmNATO_Sabot_Punched</defName>
+		<label>5.56x45mm NATO cartridge (Sabot) (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/Sabot</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.14</MarketValue>
+			<Mass>0.011</Mass>
+		</statBases>
+		<ammoClass>Sabot</ammoClass>
+		<cookOffProjectile>Bullet_556x45mmNATO_Sabot_Punched</cookOffProjectile>
+	</ThingDef>
+	<!-- ==================== Projectiles ==================== -->
+	<ThingDef Name="Punched556x45mmNATOBullet" ParentName="BaseBulletCE" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>186</speed>
+			<dropsCasings>true</dropsCasings>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Punched556x45mmNATOBullet">
+		<defName>Bullet_556x45mmNATO_FMJ_Punched</defName>
+		<label>5.56mm NATO bullet (FMJ) (Punched)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>28</damageAmountBase>
+			<armorPenetrationSharp>12</armorPenetrationSharp>
+			<armorPenetrationBlunt>34.18</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Punched556x45mmNATOBullet">
+		<defName>Bullet_556x45mmNATO_AP_Punched</defName>
+		<label>5.56mm NATO bullet (AP) (Punched)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>18</damageAmountBase>
+			<armorPenetrationSharp>24</armorPenetrationSharp>
+			<armorPenetrationBlunt>34.18</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Punched556x45mmNATOBullet">
+		<defName>Bullet_556x45mmNATO_HP_Punched</defName>
+		<label>5.56mm NATO bullet (HP) (Punched)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>36</damageAmountBase>
+			<armorPenetrationSharp>6</armorPenetrationSharp>
+			<armorPenetrationBlunt>34.18</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Punched556x45mmNATOBullet">
+		<defName>Bullet_556x45mmNATO_Incendiary_Punched</defName>
+		<label>5.56mm NATO bullet (AP-I) (Punched)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>18</damageAmountBase>
+			<armorPenetrationSharp>24</armorPenetrationSharp>
+			<armorPenetrationBlunt>34.18</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>10</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Punched556x45mmNATOBullet">
+		<defName>Bullet_556x45mmNATO_HE_Punched</defName>
+		<label>5.56mm NATO bullet (HE) (Punched)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>28</damageAmountBase>
+			<armorPenetrationSharp>12</armorPenetrationSharp>
+			<armorPenetrationBlunt>34.18</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>16</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Punched556x45mmNATOBullet">
+		<defName>Bullet_556x45mmNATO_Sabot_Punched</defName>
+		<label>5.56mm NATO bullet (Sabot) (Punched)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>14</damageAmountBase>
+			<armorPenetrationSharp>42</armorPenetrationSharp>
+			<armorPenetrationBlunt>44.18</armorPenetrationBlunt>
+			<speed>252</speed>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ==================== -->
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_556x45mmNATO_FMJ_Punched</defName>
+		<label>make 5.56x45mm NATO (FMJ) cartridge (Punched) x500</label>
+		<description>Craft 500 5.56x45mm NATO (FMJ) cartridges (Punched).</description>
+		<jobString>Making 5.56x45mm NATO (FMJ) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_556x45mmNATO_FMJ</li>
+					</thingDefs>
+				</filter>
+				<count>2000</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_556x45mmNATO_FMJ</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_556x45mmNATO_FMJ_Punched>500</Ammo_556x45mmNATO_FMJ_Punched>
+		</products>
+		<workAmount>1400</workAmount>
+	</RecipeDef>
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_556x45mmNATO_AP_Punched</defName>
+		<label>make 5.56x45mm NATO (AP) cartridge (Punched) x500</label>
+		<description>Craft 500 5.56x45mm NATO (AP) cartridges (Punched).</description>
+		<jobString>Making 5.56x45mm NATO (AP) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_556x45mmNATO_AP</li>
+					</thingDefs>
+				</filter>
+				<count>2000</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_556x45mmNATO_AP</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_556x45mmNATO_AP_Punched>500</Ammo_556x45mmNATO_AP_Punched>
+		</products>
+		<workAmount>1400</workAmount>
+	</RecipeDef>
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_556x45mmNATO_HP_Punched</defName>
+		<label>make 5.56x45mm NATO (HP) cartridge (Punched) x500</label>
+		<description>Craft 500 5.56x45mm NATO (HP) cartridges (Punched).</description>
+		<jobString>Making 5.56x45mm NATO (HP) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_556x45mmNATO_HP</li>
+					</thingDefs>
+				</filter>
+				<count>2000</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_556x45mmNATO_HP</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_556x45mmNATO_HP_Punched>500</Ammo_556x45mmNATO_HP_Punched>
+		</products>
+		<workAmount>1400</workAmount>
+	</RecipeDef>
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_556x45mmNATO_Incendiary_Punched</defName>
+		<label>make 5.56x45mm NATO (AP-I) cartridge (Punched) x500</label>
+		<description>Craft 500 5.56x45mm NATO (AP-I) cartridges (Punched).</description>
+		<jobString>Making 5.56x45mm NATO (AP-I) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_556x45mmNATO_Incendiary</li>
+					</thingDefs>
+				</filter>
+				<count>2000</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_556x45mmNATO_Incendiary</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_556x45mmNATO_Incendiary_Punched>500</Ammo_556x45mmNATO_Incendiary_Punched>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_556x45mmNATO_HE_Punched</defName>
+		<label>make 5.56x45mm NATO (HE) cartridge (Punched) x500</label>
+		<description>Craft 500 5.56x45mm NATO (HE) cartridges (Punched).</description>
+		<jobString>Making 5.56x45mm NATO (HE) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_556x45mmNATO_HE</li>
+					</thingDefs>
+				</filter>
+				<count>2000</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_556x45mmNATO_HE</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_556x45mmNATO_HE_Punched>500</Ammo_556x45mmNATO_HE_Punched>
+		</products>
+		<workAmount>3000</workAmount>
+	</RecipeDef>
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_556x45mmNATO_Sabot_Punched</defName>
+		<label>make 5.56x45mm NATO (Sabot) cartridge (Punched) x500</label>
+		<description>Craft 500 5.56x45mm NATO (Sabot) cartridges (Punched).</description>
+		<jobString>Making 5.56x45mm NATO (Sabot) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_556x45mmNATO_Sabot</li>
+					</thingDefs>
+				</filter>
+				<count>2000</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_556x45mmNATO_Sabot</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_556x45mmNATO_Sabot_Punched>500</Ammo_556x45mmNATO_Sabot_Punched>
+		</products>
+		<workAmount>2000</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Recipe/6x24mmCharged-Punched.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Recipe/6x24mmCharged-Punched.xml
new file mode 100644
index 0000000000..b0ab91caac
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Recipe/6x24mmCharged-Punched.xml	
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>Ammo6x24mmCharged_Punched</defName>
+		<label>Punched 6x24mm Charged</label>
+		<parent>AmmoAdvanced_Punched</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_6x24mmCharged_Punched</defName>
+		<label>Punched 6x24mm Charged</label>
+		<ammoTypes>
+			<Ammo_6x24mmCharged_Punched>Bullet_6x24mmCharged_Punched</Ammo_6x24mmCharged_Punched>
+			<Ammo_6x24mmCharged_AP_Punched>Bullet_6x24mmCharged_AP_Punched</Ammo_6x24mmCharged_AP_Punched>
+			<Ammo_6x24mmCharged_Ion_Punched>Bullet_6x24mmCharged_Ion_Punched</Ammo_6x24mmCharged_Ion_Punched>
+		</ammoTypes>
+		<similarTo>AmmoSet_6x24mmCharged</similarTo>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="6x24mmChargedPunched" ParentName="SpacerSmallAmmoBase" Abstract="True">
+		<description>Charged shot ammo used by advanced assault rifle designs.</description>
+		<statBases>
+			<Mass>0.01</Mass>
+			<Bulk>0.01</Bulk>
+			<MarketValue>1.4</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo6x24mmCharged_Punched</li>
+		</thingCategories>
+		<stackLimit>5000</stackLimit>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="6x24mmChargedPunched">
+		<defName>Ammo_6x24mmCharged_Punched</defName>
+		<label>6x24mm Charged cartridge (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Charged/MediumRegular</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<ammoClass>Charged</ammoClass>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="6x24mmChargedPunched">
+		<defName>Ammo_6x24mmCharged_AP_Punched</defName>
+		<label>6x24mm Charged cartridge (Conc.) (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Charged/MediumConc</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<ammoClass>ChargedAP</ammoClass>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="6x24mmChargedPunched">
+		<defName>Ammo_6x24mmCharged_Ion_Punched</defName>
+		<label>6x24mm Charged cartridge (Ion) (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Charged/MediumIon</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<ammoClass>Ionized</ammoClass>
+		<generateAllowChance>0</generateAllowChance>
+	</ThingDef>
+	<!-- ==================== Projectiles ==================== -->
+	<ThingDef Name="Punched6x24mmChargedBullet" ParentName="BaseBulletCE" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Charge_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>168</speed>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Punched6x24mmChargedBullet">
+		<defName>Bullet_6x24mmCharged_Punched</defName>
+		<label>6x24mm Charged bullet (Punched)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>26</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>8</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>15</armorPenetrationSharp>
+			<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Punched6x24mmChargedBullet">
+		<defName>Bullet_6x24mmCharged_AP_Punched</defName>
+		<label>6x24mm Charged bullet (Conc.) (Punched)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>20</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>4</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>30</armorPenetrationSharp>
+			<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Punched6x24mmChargedBullet">
+		<defName>Bullet_6x24mmCharged_Ion_Punched</defName>
+		<label>6x24mm Charged bullet (Ion) (Punched)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>20</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>12</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>22.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
+			<empShieldBreakChance>0.2</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ==================== -->
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_6x24mmCharged_Punched</defName>
+		<label>make 6x24mm Charged cartridge (Punched) x500</label>
+		<description>Craft 500 6x24mm Charged cartridges (Punched).</description>
+		<jobString>Making 6x24mm Charged cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_6x24mmCharged</li>
+					</thingDefs>
+				</filter>
+				<count>2000</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_6x24mmCharged</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_6x24mmCharged_Punched>500</Ammo_6x24mmCharged_Punched>
+		</products>
+		<workAmount>8600</workAmount>
+	</RecipeDef>
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_6x24mmCharged_AP_Punched</defName>
+		<label>make 6x24mm Charged (Conc.) cartridge (Punched) x500</label>
+		<description>Craft 500 6x24mm Charged (Conc.) cartridges (Punched).</description>
+		<jobString>Making 6x24mm Charged (Conc.) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_6x24mmCharged_AP</li>
+					</thingDefs>
+				</filter>
+				<count>2000</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_6x24mmCharged_AP</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_6x24mmCharged_AP_Punched>500</Ammo_6x24mmCharged_AP_Punched>
+		</products>
+		<workAmount>8600</workAmount>
+	</RecipeDef>
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_6x24mmCharged_Ion_Punched</defName>
+		<label>make 6x24mm Charged (Ion) cartridge (Punched) x500</label>
+		<description>Craft 500 6x24mm Charged (Ion) cartridges (Punched).</description>
+		<jobString>Making 6x24mm Charged (Ion) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_6x24mmCharged_Ion</li>
+					</thingDefs>
+				</filter>
+				<count>2000</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_6x24mmCharged_Ion</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_6x24mmCharged_Ion_Punched>500</Ammo_6x24mmCharged_Ion_Punched>
+		</products>
+		<workAmount>8600</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Recipe/762x51mmNATO-Punched.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Recipe/762x51mmNATO-Punched.xml
new file mode 100644
index 0000000000..d54ea2df50
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Recipe/762x51mmNATO-Punched.xml	
@@ -0,0 +1,353 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>Ammo762x51mmNATO_Punched</defName>
+		<label>Punched 7.62x51mm NATO</label>
+		<parent>AmmoRifles_Punched</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_762x51mmNATO_Punched</defName>
+		<label>Punched 7.62x51mm NATO</label>
+		<ammoTypes>
+			<Ammo_762x51mmNATO_FMJ_Punched>Bullet_762x51mmNATO_FMJ_Punched</Ammo_762x51mmNATO_FMJ_Punched>
+			<Ammo_762x51mmNATO_AP_Punched>Bullet_762x51mmNATO_AP_Punched</Ammo_762x51mmNATO_AP_Punched>
+			<Ammo_762x51mmNATO_HP_Punched>Bullet_762x51mmNATO_HP_Punched</Ammo_762x51mmNATO_HP_Punched>
+			<Ammo_762x51mmNATO_Incendiary_Punched>Bullet_762x51mmNATO_Incendiary_Punched</Ammo_762x51mmNATO_Incendiary_Punched>
+			<Ammo_762x51mmNATO_HE_Punched>Bullet_762x51mmNATO_HE_Punched</Ammo_762x51mmNATO_HE_Punched>
+			<Ammo_762x51mmNATO_Sabot_Punched>Bullet_762x51mmNATO_Sabot_Punched</Ammo_762x51mmNATO_Sabot_Punched>
+		</ammoTypes>
+		<similarTo>AmmoSet_762x51mmNATO</similarTo>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="762x51mmNATOPunched" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Large rifle bullet used in machine guns, sniper rifles and the occasional assault rifle.</description>
+		<statBases>
+			<Mass>0.025</Mass>
+			<Bulk>0.03</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo762x51mmNATO</li>
+		</thingCategories>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x51mmNATOPunched">
+		<defName>Ammo_762x51mmNATO_FMJ_Punched</defName>
+		<label>7.62x51mm NATO cartridge (FMJ) (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/FMJ</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.22</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_762x51mmNATO_FMJ_Punched</cookOffProjectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x51mmNATOPunched">
+		<defName>Ammo_762x51mmNATO_AP_Punched</defName>
+		<label>7.62x51mm NATO cartridge (AP) (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/AP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.22</MarketValue>
+		</statBases>
+		<ammoClass>ArmorPiercing</ammoClass>
+		<cookOffProjectile>Bullet_762x51mmNATO_AP_Punched</cookOffProjectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x51mmNATOPunched">
+		<defName>Ammo_762x51mmNATO_HP_Punched</defName>
+		<label>7.62x51mm NATO cartridge (HP) (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/HP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.22</MarketValue>
+		</statBases>
+		<ammoClass>HollowPoint</ammoClass>
+		<cookOffProjectile>Bullet_762x51mmNATO_HP_Punched</cookOffProjectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x51mmNATOPunched">
+		<defName>Ammo_762x51mmNATO_Incendiary_Punched</defName>
+		<label>7.62x51mm NATO cartridge (AP-I) (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/Incendiary</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.30</MarketValue>
+		</statBases>
+		<ammoClass>IncendiaryAP</ammoClass>
+		<cookOffProjectile>Bullet_762x51mmNATO_Incendiary_Punched</cookOffProjectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x51mmNATOPunched">
+		<defName>Ammo_762x51mmNATO_HE_Punched</defName>
+		<label>7.62x51mm NATO cartridge (HE) (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/HE</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.42</MarketValue>
+		</statBases>
+		<ammoClass>ExplosiveAP</ammoClass>
+		<cookOffProjectile>Bullet_762x51mmNATO_HE_Punched</cookOffProjectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x51mmNATOPunched">
+		<defName>Ammo_762x51mmNATO_Sabot_Punched</defName>
+		<label>7.62x51mm NATO cartridge (Sabot) (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/Sabot</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.24</MarketValue>
+			<Mass>0.02</Mass>
+		</statBases>
+		<ammoClass>Sabot</ammoClass>
+		<cookOffProjectile>Bullet_762x51mmNATO_Sabot_Punched</cookOffProjectile>
+	</ThingDef>
+	<!-- ==================== Projectiles ==================== -->
+	<ThingDef Name="Punched762x51mmNATOBullet" ParentName="BaseBulletCE" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>174</speed>
+			<dropsCasings>true</dropsCasings>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Punched762x51mmNATOBullet">
+		<defName>Bullet_762x51mmNATO_FMJ_Punched</defName>
+		<label>7.62mm NATO bullet (FMJ) (Punched)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>40</damageAmountBase>
+			<armorPenetrationSharp>14</armorPenetrationSharp>
+			<armorPenetrationBlunt>66.72</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Punched762x51mmNATOBullet">
+		<defName>Bullet_762x51mmNATO_AP_Punched</defName>
+		<label>7.62mm NATO bullet (AP) (Punched)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>24</damageAmountBase>
+			<armorPenetrationSharp>28</armorPenetrationSharp>
+			<armorPenetrationBlunt>66.72</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Punched762x51mmNATOBullet">
+		<defName>Bullet_762x51mmNATO_HP_Punched</defName>
+		<label>7.62mm NATO bullet (HP) (Punched)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>50</damageAmountBase>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+			<armorPenetrationBlunt>66.72</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Punched762x51mmNATOBullet">
+		<defName>Bullet_762x51mmNATO_Incendiary_Punched</defName>
+		<label>7.62mm NATO bullet (AP-I) (Punched)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>24</damageAmountBase>
+			<armorPenetrationSharp>28</armorPenetrationSharp>
+			<armorPenetrationBlunt>66.72</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>16</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Punched762x51mmNATOBullet">
+		<defName>Bullet_762x51mmNATO_HE_Punched</defName>
+		<label>7.62mm NATO bullet (HE) (Punched)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>40</damageAmountBase>
+			<armorPenetrationSharp>14</armorPenetrationSharp>
+			<armorPenetrationBlunt>66.72</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>24</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Punched762x51mmNATOBullet">
+		<defName>Bullet_762x51mmNATO_Sabot_Punched</defName>
+		<label>7.62mm NATO bullet (Sabot) (Punched)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>50</armorPenetrationSharp>
+			<armorPenetrationBlunt>86.28</armorPenetrationBlunt>
+			<speed>235</speed>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ==================== -->
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_762x51mmNATO_FMJ_Punched</defName>
+		<label>make 7.62x51mm NATO (FMJ) cartridge (Punched) x500</label>
+		<description>Craft 500 7.62x51mm NATO (FMJ) cartridges (Punched).</description>
+		<jobString>Making 7.62x51mm NATO (FMJ) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_762x51mmNATO_FMJ</li>
+					</thingDefs>
+				</filter>
+				<count>2000</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_762x51mmNATO_FMJ</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_762x51mmNATO_FMJ_Punched>500</Ammo_762x51mmNATO_FMJ_Punched>
+		</products>
+		<workAmount>2600</workAmount>
+	</RecipeDef>
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_762x51mmNATO_AP_Punched</defName>
+		<label>make 7.62x51mm NATO (AP) cartridge (Punched) x500</label>
+		<description>Craft 500 7.62x51mm NATO (AP) cartridges (Punched).</description>
+		<jobString>Making 7.62x51mm NATO (AP) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_762x51mmNATO_AP</li>
+					</thingDefs>
+				</filter>
+				<count>2000</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_762x51mmNATO_AP</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_762x51mmNATO_AP_Punched>500</Ammo_762x51mmNATO_AP_Punched>
+		</products>
+		<workAmount>2600</workAmount>
+	</RecipeDef>
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_762x51mmNATO_HP_Punched</defName>
+		<label>make 7.62x51mm NATO (HP) cartridge (Punched) x500</label>
+		<description>Craft 500 7.62x51mm NATO (HP) cartridges (Punched).</description>
+		<jobString>Making 7.62x51mm NATO (HP) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_762x51mmNATO_HP</li>
+					</thingDefs>
+				</filter>
+				<count>2000</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_762x51mmNATO_HP</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_762x51mmNATO_HP_Punched>500</Ammo_762x51mmNATO_HP_Punched>
+		</products>
+		<workAmount>2600</workAmount>
+	</RecipeDef>
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_762x51mmNATO_Incendiary_Punched</defName>
+		<label>make 7.62x51mm NATO (AP-I) cartridge (Punched) x500</label>
+		<description>Craft 500 7.62x51mm NATO (AP-I) cartridges (Punched).</description>
+		<jobString>Making 7.62x51mm NATO (AP-I) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_762x51mmNATO_Incendiary</li>
+					</thingDefs>
+				</filter>
+				<count>2000</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_762x51mmNATO_Incendiary</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_762x51mmNATO_Incendiary_Punched>500</Ammo_762x51mmNATO_Incendiary_Punched>
+		</products>
+		<workAmount>3800</workAmount>
+	</RecipeDef>
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_762x51mmNATO_HE_Punched</defName>
+		<label>make 7.62x51mm NATO (HE) cartridge (Punched) x500</label>
+		<description>Craft 500 7.62x51mm NATO (HE) cartridges (Punched).</description>
+		<jobString>Making 7.62x51mm NATO (HE) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_762x51mmNATO_HE</li>
+					</thingDefs>
+				</filter>
+				<count>2000</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_762x51mmNATO_HE</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_762x51mmNATO_HE_Punched>500</Ammo_762x51mmNATO_HE_Punched>
+		</products>
+		<workAmount>4600</workAmount>
+	</RecipeDef>
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_762x51mmNATO_Sabot_Punched</defName>
+		<label>make 7.62x51mm NATO (Sabot) cartridge (Punched) x500</label>
+		<description>Craft 500 7.62x51mm NATO (Sabot) cartridges (Punched).</description>
+		<jobString>Making 7.62x51mm NATO (Sabot) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_762x51mmNATO_Sabot</li>
+					</thingDefs>
+				</filter>
+				<count>2000</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_762x51mmNATO_Sabot</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_762x51mmNATO_Sabot_Punched>500</Ammo_762x51mmNATO_Sabot_Punched>
+		</products>
+		<workAmount>3400</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Recipe/762x54mmR-Punched.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Recipe/762x54mmR-Punched.xml
new file mode 100644
index 0000000000..29860018d8
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Recipe/762x54mmR-Punched.xml	
@@ -0,0 +1,353 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>Ammo762x54mmR_Punched</defName>
+		<label>Punched 7.62x54mmR</label>
+		<parent>AmmoRifles_Punched</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_762x54mmR_Punched</defName>
+		<label>Punched 7.62x54mmR</label>
+		<ammoTypes>
+			<Ammo_762x54mmR_FMJ_Punched>Bullet_762x54mmR_FMJ_Punched</Ammo_762x54mmR_FMJ_Punched>
+			<Ammo_762x54mmR_AP_Punched>Bullet_762x54mmR_AP_Punched</Ammo_762x54mmR_AP_Punched>
+			<Ammo_762x54mmR_HP_Punched>Bullet_762x54mmR_HP_Punched</Ammo_762x54mmR_HP_Punched>
+			<Ammo_762x54mmR_Incendiary_Punched>Bullet_762x54mmR_Incendiary_Punched</Ammo_762x54mmR_Incendiary_Punched>
+			<Ammo_762x54mmR_HE_Punched>Bullet_762x54mmR_HE_Punched</Ammo_762x54mmR_HE_Punched>
+			<Ammo_762x54mmR_Sabot_Punched>Bullet_762x54mmR_Sabot_Punched</Ammo_762x54mmR_Sabot_Punched>
+		</ammoTypes>
+		<similarTo>AmmoSet_762x54mmR</similarTo>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="762x54mmRPunched" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Rimmed rifle cartridge used by many machine guns, bolt-action and sniper rifles.</description>
+		<statBases>
+			<Mass>0.026</Mass>
+			<Bulk>0.03</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo762x54mmR_Punched</li>
+		</thingCategories>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x54mmRPunched">
+		<defName>Ammo_762x54mmR_FMJ_Punched</defName>
+		<label>7.62x54mmR cartridge (FMJ) (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/FMJ</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.24</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_762x54mmR_FMJ_Punched</cookOffProjectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x54mmRPunched">
+		<defName>Ammo_762x54mmR_AP_Punched</defName>
+		<label>7.62x54mmR cartridge (AP) (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/AP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.24</MarketValue>
+		</statBases>
+		<ammoClass>ArmorPiercing</ammoClass>
+		<cookOffProjectile>Bullet_762x54mmR_AP_Punched</cookOffProjectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x54mmRPunched">
+		<defName>Ammo_762x54mmR_HP_Punched</defName>
+		<label>7.62x54mmR cartridge (HP) (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/HP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.24</MarketValue>
+		</statBases>
+		<ammoClass>HollowPoint</ammoClass>
+		<cookOffProjectile>Bullet_762x54mmR_HP_Punched</cookOffProjectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x54mmRPunched">
+		<defName>Ammo_762x54mmR_Incendiary_Punched</defName>
+		<label>7.62x54mmR cartridge (AP-I) (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/Incendiary</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.30</MarketValue>
+		</statBases>
+		<ammoClass>IncendiaryAP</ammoClass>
+		<cookOffProjectile>Bullet_762x54mmR_Incendiary_Punched</cookOffProjectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x54mmRPunched">
+		<defName>Ammo_762x54mmR_HE_Punched</defName>
+		<label>7.62x54mmR cartridge (HE) (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/HE</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.44</MarketValue>
+		</statBases>
+		<ammoClass>ExplosiveAP</ammoClass>
+		<cookOffProjectile>Bullet_762x54mmR_HE_Punched</cookOffProjectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x54mmRPunched">
+		<defName>Ammo_762x54mmR_Sabot_Punched</defName>
+		<label>7.62x54mmR cartridge (Sabot) (Punched)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/Sabot</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.26</MarketValue>
+			<Mass>0.022</Mass>
+		</statBases>
+		<ammoClass>Sabot</ammoClass>
+		<cookOffProjectile>Bullet_762x54mmR_Sabot_Punched</cookOffProjectile>
+	</ThingDef>
+	<!-- ==================== Projectiles ==================== -->
+	<ThingDef Name="Punched762x54mmRBullet" ParentName="BaseBulletCE" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>172</speed>
+			<dropsCasings>true</dropsCasings>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Punched762x54mmRBullet">
+		<defName>Bullet_762x54mmR_FMJ_Punched</defName>
+		<label>7.62mmR bullet (FMJ) (Punched)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>40</damageAmountBase>
+			<armorPenetrationSharp>14</armorPenetrationSharp>
+			<armorPenetrationBlunt>67.340</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Punched762x54mmRBullet">
+		<defName>Bullet_762x54mmR_AP_Punched</defName>
+		<label>7.62mmR bullet (AP) (Punched)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>24</damageAmountBase>
+			<armorPenetrationSharp>28</armorPenetrationSharp>
+			<armorPenetrationBlunt>67.340</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Punched762x54mmRBullet">
+		<defName>Bullet_762x54mmR_HP_Punched</defName>
+		<label>7.62mmR bullet (HP) (Punched)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>50</damageAmountBase>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+			<armorPenetrationBlunt>67.340</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Punched762x54mmRBullet">
+		<defName>Bullet_762x54mmR_Incendiary_Punched</defName>
+		<label>7.62mmR bullet (AP-I) (Punched)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>24</damageAmountBase>
+			<armorPenetrationSharp>28</armorPenetrationSharp>
+			<armorPenetrationBlunt>67.340</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>16</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Punched762x54mmRBullet">
+		<defName>Bullet_762x54mmR_HE_Punched</defName>
+		<label>7.62mmR bullet (HE) (Punched)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>40</damageAmountBase>
+			<armorPenetrationSharp>14</armorPenetrationSharp>
+			<armorPenetrationBlunt>67.340</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>24</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Punched762x54mmRBullet">
+		<defName>Bullet_762x54mmR_Sabot_Punched</defName>
+		<label>7.62mmR bullet (Sabot) (Punched)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>50</armorPenetrationSharp>
+			<armorPenetrationBlunt>87.280</armorPenetrationBlunt>
+			<speed>233</speed>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ==================== -->
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_762x54mmR_FMJ_Punched</defName>
+		<label>make 7.62x54mmR (FMJ) cartridge (Punched) x500</label>
+		<description>Craft 500 7.62x54mmR (FMJ) cartridges (Punched).</description>
+		<jobString>Making 7.62x54mmR (FMJ) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_762x54mmR_FMJ</li>
+					</thingDefs>
+				</filter>
+				<count>2000</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_762x54mmR_FMJ</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_762x54mmR_FMJ_Punched>500</Ammo_762x54mmR_FMJ_Punched>
+		</products>
+		<workAmount>2800</workAmount>
+	</RecipeDef>
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_762x54mmR_AP_Punched</defName>
+		<label>make 7.62x54mmR (AP) cartridge (Punched) x500</label>
+		<description>Craft 500 7.62x54mmR (AP) cartridges (Punched).</description>
+		<jobString>Making 7.62x54mmR (AP) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_762x54mmR_AP</li>
+					</thingDefs>
+				</filter>
+				<count>2000</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_762x54mmR_AP</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_762x54mmR_AP_Punched>500</Ammo_762x54mmR_AP_Punched>
+		</products>
+		<workAmount>2800</workAmount>
+	</RecipeDef>
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_762x54mmR_HP_Punched</defName>
+		<label>make 7.62x54mmR (HP) cartridge (Punched) x500</label>
+		<description>Craft 500 7.62x54mmR (HP) cartridges (Punched).</description>
+		<jobString>Making 7.62x54mmR (HP) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_762x54mmR_HP</li>
+					</thingDefs>
+				</filter>
+				<count>2000</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_762x54mmR_HP</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_762x54mmR_HP_Punched>500</Ammo_762x54mmR_HP_Punched>
+		</products>
+		<workAmount>2800</workAmount>
+	</RecipeDef>
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_762x54mmR_Incendiary_Punched</defName>
+		<label>make 7.62x54mmR (AP-I) cartridge (Punched) x500</label>
+		<description>Craft 500 7.62x54mmR (AP-I) cartridges (Punched).</description>
+		<jobString>Making 7.62x54mmR (AP-I) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_762x54mmR_Incendiary</li>
+					</thingDefs>
+				</filter>
+				<count>2000</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_762x54mmR_Incendiary</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_762x54mmR_Incendiary_Punched>500</Ammo_762x54mmR_Incendiary_Punched>
+		</products>
+		<workAmount>4000</workAmount>
+	</RecipeDef>
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_762x54mmR_HE_Punched</defName>
+		<label>make 7.62x54mmR (HE) cartridge (Punched) x500</label>
+		<description>Craft 500 7.62x54mmR (HE) cartridges (Punched).</description>
+		<jobString>Making 7.62x54mmR (HE) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_762x54mmR_HE</li>
+					</thingDefs>
+				</filter>
+				<count>2000</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_762x54mmR_HE</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_762x54mmR_HE_Punched>500</Ammo_762x54mmR_HE_Punched>
+		</products>
+		<workAmount>4800</workAmount>
+	</RecipeDef>
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_762x54mmR_Sabot_Punched</defName>
+		<label>make 7.62x54mmR (Sabot) cartridge (Punched) x500</label>
+		<description>Craft 500 7.62x54mmR (Sabot) cartridges (Punched).</description>
+		<jobString>Making 7.62x54mmR (Sabot) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_762x54mmR_Sabot</li>
+					</thingDefs>
+				</filter>
+				<count>2000</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_762x54mmR_Sabot</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_762x54mmR_Sabot_Punched>500</Ammo_762x54mmR_Sabot_Punched>
+		</products>
+		<workAmount>3600</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Fire.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Fire.xml
new file mode 100644
index 0000000000..8110bda999
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Fire.xml	
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoElementalStaff</defName>
+		<label>Elemental Staffs</label>
+		<parent>AmmoWonders</parent>
+	</ThingCategoryDef>
+	<ThingCategoryDef>
+		<defName>AmmoElementalStaff_Fire</defName>
+		<label>Fire Staff</label>
+		<parent>AmmoElementalStaff</parent>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Elemental_Staff_Fire</defName>
+		<label>Elemental fire crystal set</label>
+		<ammoTypes>
+			<Ammo_Elemental_Staff_Fire>Bullet_Elemental_Staff_Fire</Ammo_Elemental_Staff_Fire>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="ElementalStaffBase" ParentName="SmallAmmoBase" Abstract="True">
+		<description>A brilliant coloured Gem that radiates power</description>
+		<statBases>
+			<Mass>0.2</Mass>
+			<Bulk>0.2</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="ElementalStaffBase">
+		<defName>Ammo_Elemental_Staff_Fire</defName>
+		<label>Elemental Fire Crystal</label>
+		<graphicData>
+			<texPath>ThirdParty/CoD Zombies Pack/Crystal_Fire</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>ExplosiveAP</ammoClass>
+		<cookOffProjectile>Bullet_Elemental_Staff_Fire</cookOffProjectile>
+		<thingCategories>
+			<li>AmmoElementalStaff_Fire</li>
+		</thingCategories>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef Name="BaseElementalStaffBullet" ParentName="Base44MagnumBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/CodZP_StaffProjectile</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>50</speed>
+			<dropsCasings>false</dropsCasings>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="BaseElementalStaffBullet">
+		<defName>Bullet_Elemental_Staff_Fire</defName>
+		<label>Fire Projectile</label>
+		<graphicData>
+			<color>(255,48,48)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<pelletCount>3</pelletCount>
+			<damageAmountBase>1</damageAmountBase>
+			<armorPenetrationSharp>1</armorPenetrationSharp>
+			<armorPenetrationBlunt>1</armorPenetrationBlunt>
+			<spreadMult>45</spreadMult>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>30</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1.9</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonder">
+		<defName>MakeAmmo_Elemental_Staff_Fire</defName>
+		<label>make Elemental Fire Crystal x5</label>
+		<description>Craft 5 Elemental Fire Crystals.</description>
+		<jobString>Making Elemental Fire Crystals.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Elemental_Staff_Fire>5</Ammo_Elemental_Staff_Fire>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Fire_Punched.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Fire_Punched.xml
new file mode 100644
index 0000000000..e43aa0f20e
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Fire_Punched.xml	
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoElementalStaff_Punched</defName>
+		<label>Elemental Staffs</label>
+		<parent>AmmoWonders_Punched</parent>
+	</ThingCategoryDef>
+	<ThingCategoryDef>
+		<defName>AmmoElementalStaff_Fire_Punched</defName>
+		<label>Fire Staff</label>
+		<parent>AmmoElementalStaff_Punched</parent>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Elemental_Staff_Fire_Punched</defName>
+		<label>Empowered elemental fire crystal set</label>
+		<ammoTypes>
+			<Ammo_Elemental_Staff_Fire_Punched>Bullet_Elemental_Staff_Fire_Punched</Ammo_Elemental_Staff_Fire_Punched>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="ElementalStaffPunched" ParentName="SpacerSmallAmmoBase" Abstract="True">
+		<description>A Blue Gem</description>
+		<statBases>
+			<Mass>0.2</Mass>
+			<Bulk>0.2</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="ElementalStaffPunched">
+		<defName>Ammo_Elemental_Staff_Fire_Punched</defName>
+		<label>Empowered Elemental Fire Crystal</label>
+		<graphicData>
+			<texPath>ThirdParty/CoD Zombies Pack/Crystal_Fire</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>ExplosiveAP</ammoClass>
+		<cookOffProjectile>Bullet_Elemental_Staff_Fire_Punched</cookOffProjectile>
+		<thingCategories>
+			<li>AmmoElementalStaff_Fire_Punched</li>
+		</thingCategories>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef Name="PunchedElementalStaffBullet" ParentName="BaseElementalStaffBullet" Abstract="true">
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>64</speed>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="PunchedElementalStaffBullet">
+		<defName>Bullet_Elemental_Staff_Fire_Punched</defName>
+		<label>Empowered Fire Projectile</label>
+		<graphicData>
+			<color>(255,48,48)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>1</damageAmountBase>
+			<pelletCount>3</pelletCount>
+			<armorPenetrationSharp>1</armorPenetrationSharp>
+			<armorPenetrationBlunt>1</armorPenetrationBlunt>
+			<spreadMult>30</spreadMult>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>45</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1.9</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonder_Punched">
+		<defName>MakeAmmo_Elemental_Staff_Fire_Punched</defName>
+		<label>make Empowered Elemental Fire Crystal x5</label>
+		<description>Craft 5 Empowered Elemental Fire Crystals.</description>
+		<jobString>Making Empowered Elemental Fire Crystals.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_Elemental_Staff_Fire</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_Elemental_Staff_Fire</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Elemental_Staff_Fire_Punched>5</Ammo_Elemental_Staff_Fire_Punched>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Ice.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Ice.xml
new file mode 100644
index 0000000000..6ab3ea322b
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Ice.xml	
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoElementalStaff_Ice</defName>
+		<label>Ice Staff</label>
+		<parent>AmmoElementalStaff</parent>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Elemental_Staff_Ice</defName>
+		<label>Elemental ice crystal set</label>
+		<ammoTypes>
+			<Ammo_Elemental_Staff_Ice>Bullet_Elemental_Staff_Ice</Ammo_Elemental_Staff_Ice>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="ElementalStaffBase">
+		<defName>Ammo_Elemental_Staff_Ice</defName>
+		<label>Elemental Ice Crystal</label>
+		<graphicData>
+			<texPath>ThirdParty/CoD Zombies Pack/Crystal_Ice</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_Elemental_Staff_Ice</cookOffProjectile>
+		<thingCategories>
+			<li>AmmoElementalStaff_Ice</li>
+		</thingCategories>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef ParentName="BaseElementalStaffBullet">
+		<defName>Bullet_Elemental_Staff_Ice</defName>
+		<label>Ice Projectile</label>
+		<graphicData>
+			<color>(220,243,255)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CodZP_Frostbite</damageDef>
+			<damageAmountBase>1</damageAmountBase>
+			<armorPenetrationSharp>1</armorPenetrationSharp>
+			<armorPenetrationBlunt>1</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonder">
+		<defName>MakeAmmo_Elemental_Staff_Ice</defName>
+		<label>make Elemental Ice Crystal x5</label>
+		<description>Craft 5 Elemental Ice Crystals.</description>
+		<jobString>Making Elemental Ice Crystals.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Elemental_Staff_Ice>5</Ammo_Elemental_Staff_Ice>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Ice_Punched.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Ice_Punched.xml
new file mode 100644
index 0000000000..3aea8ef3ac
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Ice_Punched.xml	
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoElementalStaff_Ice_Punched</defName>
+		<label>Ice Staff</label>
+		<parent>AmmoElementalStaff_Punched</parent>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Elemental_Staff_Ice_Punched</defName>
+		<label>Empowered elemental ice crystal set</label>
+		<ammoTypes>
+			<Ammo_Elemental_Staff_Ice_Punched>Bullet_Elemental_Staff_Ice_Punched</Ammo_Elemental_Staff_Ice_Punched>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="ElementalStaffPunched">
+		<defName>Ammo_Elemental_Staff_Ice_Punched</defName>
+		<label>Empowered Elemental Ice Crystal</label>
+		<graphicData>
+			<texPath>ThirdParty/CoD Zombies Pack/Crystal_Ice</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(200,200,255)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_Elemental_Staff_Ice_Punched</cookOffProjectile>
+		<thingCategories>
+			<li>AmmoElementalStaff_Ice_Punched</li>
+		</thingCategories>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef ParentName="PunchedElementalStaffBullet">
+		<defName>Bullet_Elemental_Staff_Ice_Punched</defName>
+		<label>Empowered Ice Projectile</label>
+		<graphicData>
+			<color>(162,210,223)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CodZP_Frostbite</damageDef>
+			<damageAmountBase>1</damageAmountBase>
+			<armorPenetrationSharp>1</armorPenetrationSharp>
+			<armorPenetrationBlunt>1</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonder_Punched">
+		<defName>MakeAmmo_Elemental_Staff_Ice_Punched</defName>
+		<label>make Empowered Elemental Ice Crystal x5</label>
+		<description>Craft 5 Empowered Elemental Ice Crystals.</description>
+		<jobString>Making Empowered Elemental Ice Crystals.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_Elemental_Staff_Ice</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_Elemental_Staff_Ice</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Elemental_Staff_Ice_Punched>5</Ammo_Elemental_Staff_Ice_Punched>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Lightning.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Lightning.xml
new file mode 100644
index 0000000000..ecf898173c
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Lightning.xml	
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoElementalStaff_Lightning</defName>
+		<label>Lightning Staff</label>
+		<parent>AmmoElementalStaff</parent>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Elemental_Staff_Lightning</defName>
+		<label>Elemental lightning crystal set</label>
+		<ammoTypes>
+			<Ammo_Elemental_Staff_Lightning>Bullet_Elemental_Staff_Lightning</Ammo_Elemental_Staff_Lightning>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="ElementalStaffBase">
+		<defName>Ammo_Elemental_Staff_Lightning</defName>
+		<label>Elemental Lightning Crystal</label>
+		<graphicData>
+			<texPath>ThirdParty/CoD Zombies Pack/Crystal_Lightning</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_Elemental_Staff_Lightning</cookOffProjectile>
+		<thingCategories>
+			<li>AmmoElementalStaff_Lightning</li>
+		</thingCategories>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef ParentName="BaseElementalStaffBullet">
+		<defName>Bullet_Elemental_Staff_Lightning</defName>
+		<label>Lightning Projectile</label>
+		<graphicData>
+			<shaderType>TransparentPostLight</shaderType>
+			<color>(113, 4, 255)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Electrical</damageDef>
+			<pelletCount>2</pelletCount>
+			<damageAmountBase>1</damageAmountBase>
+			<armorPenetrationSharp>1</armorPenetrationSharp>
+			<armorPenetrationBlunt>1</armorPenetrationBlunt>
+			<spreadMult>10</spreadMult>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonder">
+		<defName>MakeAmmo_Elemental_Staff_Lightning</defName>
+		<label>make Elemental Lightning Crystal x5</label>
+		<description>Craft 5 Elemental Lightning Crystals.</description>
+		<jobString>Making Elemental Lightning Crystals.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Elemental_Staff_Lightning>5</Ammo_Elemental_Staff_Lightning>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Lightning_Punched.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Lightning_Punched.xml
new file mode 100644
index 0000000000..ceabf20b35
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Lightning_Punched.xml	
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoElementalStaff_Lightning_Punched</defName>
+		<label>Lightning Staff</label>
+		<parent>AmmoElementalStaff_Punched</parent>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Elemental_Staff_Lightning_Punched</defName>
+		<label>Empowered elemental lightning crystal set</label>
+		<ammoTypes>
+			<Ammo_Elemental_Staff_Lightning_Punched>Bullet_Elemental_Staff_Lightning_Punched</Ammo_Elemental_Staff_Lightning_Punched>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="ElementalStaffPunched">
+		<defName>Ammo_Elemental_Staff_Lightning_Punched</defName>
+		<label>Empowered Elemental Lightning Crystal</label>
+		<graphicData>
+			<texPath>ThirdParty/CoD Zombies Pack/Crystal_Lightning</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(255,200,200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_Elemental_Staff_Lightning_Punched</cookOffProjectile>
+		<thingCategories>
+			<li>AmmoElementalStaff_Lightning_Punched</li>
+		</thingCategories>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef ParentName="PunchedElementalStaffBullet">
+		<defName>Bullet_Elemental_Staff_Lightning_Punched</defName>
+		<label>Empowered Lightning Projectile</label>
+		<graphicData>
+			<shaderType>TransparentPostLight</shaderType>
+			<color>(113, 4, 255)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Electrical</damageDef>
+			<pelletCount>2</pelletCount>
+			<damageAmountBase>1</damageAmountBase>
+			<armorPenetrationSharp>1</armorPenetrationSharp>
+			<armorPenetrationBlunt>1</armorPenetrationBlunt>
+			<spreadMult>10</spreadMult>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonder_Punched">
+		<defName>MakeAmmo_Elemental_Staff_Lightning_Punched</defName>
+		<label>make Empowered elemental lightning crystal x5</label>
+		<description>Craft 5 Empowered elemental lightning crystals.</description>
+		<jobString>Making Empowered elemental lightning crystals.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_Elemental_Staff_Lightning</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_Elemental_Staff_Lightning</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Elemental_Staff_Lightning_Punched>5</Ammo_Elemental_Staff_Lightning_Punched>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Wind.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Wind.xml
new file mode 100644
index 0000000000..e2cac0014a
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Wind.xml	
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoElementalStaff_Wind</defName>
+		<label>Wind Staff</label>
+		<parent>AmmoElementalStaff</parent>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Elemental_Staff_Wind</defName>
+		<label>Elemental wind crystal set</label>
+		<ammoTypes>
+			<Ammo_Elemental_Staff_Wind>Bullet_Elemental_Staff_Wind</Ammo_Elemental_Staff_Wind>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="ElementalStaffBase">
+		<defName>Ammo_Elemental_Staff_Wind</defName>
+		<label>Elemental Wind Crystal</label>
+		<graphicData>
+			<texPath>ThirdParty/CoD Zombies Pack/Crystal_Wind</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_Elemental_Staff_Wind</cookOffProjectile>
+		<thingCategories>
+			<li>AmmoElementalStaff_Wind</li>
+		</thingCategories>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef ParentName="BaseElementalStaffBullet">
+		<defName>Bullet_Elemental_Staff_Wind</defName>
+		<label>Wind Projectile</label>
+		<graphicData>
+			<color>(0, 255, 0)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>1</damageAmountBase>
+			<armorPenetrationSharp>1</armorPenetrationSharp>
+			<armorPenetrationBlunt>1</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonder">
+		<defName>MakeAmmo_Elemental_Staff_Wind</defName>
+		<label>make Elemental Wind Crystal x5</label>
+		<description>Craft 5 Elemental Wind Crystals.</description>
+		<jobString>Making Elemental Wind Crystals.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Elemental_Staff_Wind>5</Ammo_Elemental_Staff_Wind>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Wind_Punched.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Wind_Punched.xml
new file mode 100644
index 0000000000..c058fecead
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Wind_Punched.xml	
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoElementalStaff_Wind_Punched</defName>
+		<label>Wind Staff</label>
+		<parent>AmmoElementalStaff_Punched</parent>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Elemental_Staff_Wind_Punched</defName>
+		<label>Empowered elemental wind crystal set</label>
+		<ammoTypes>
+			<Ammo_Elemental_Staff_Wind_Punched>Bullet_Elemental_Staff_Wind_Punched</Ammo_Elemental_Staff_Wind_Punched>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="ElementalStaffPunched">
+		<defName>Ammo_Elemental_Staff_Wind_Punched</defName>
+		<label>Empowered Elemental Wind Crystal</label>
+		<graphicData>
+			<texPath>ThirdParty/CoD Zombies Pack/Crystal_Wind</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(200,255,200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_Elemental_Staff_Wind_Punched</cookOffProjectile>
+		<thingCategories>
+			<li>AmmoElementalStaff_Wind_Punched</li>
+		</thingCategories>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef ParentName="PunchedElementalStaffBullet">
+		<defName>Bullet_Elemental_Staff_Wind_Punched</defName>
+		<label>Empowered Wind Projectile</label>
+		<graphicData>
+			<color>(0, 255, 0)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>1</damageAmountBase>
+			<armorPenetrationSharp>1</armorPenetrationSharp>
+			<armorPenetrationBlunt>1</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonder_Punched">
+		<defName>MakeAmmo_Elemental_Staff_Wind_Punched</defName>
+		<label>make Empowered elemental wind crystal x5</label>
+		<description>Craft 5 Empowered elemental wind crystals.</description>
+		<jobString>Making Empowered elemental wind crystals.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_Elemental_Staff_Wind</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_Elemental_Staff_Wind</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Elemental_Staff_Wind_Punched>5</Ammo_Elemental_Staff_Wind_Punched>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Thunders/Thunders.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Thunders/Thunders.xml
new file mode 100644
index 0000000000..bf0873f592
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Thunders/Thunders.xml	
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoThunder</defName>
+		<label>Thunder</label>
+		<parent>AmmoWonders</parent>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Thunder</defName>
+		<label>Thundergun Ammo Set</label>
+		<ammoTypes>
+			<Ammo_Thunder>Bullet_Thunder</Ammo_Thunder>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="ThunderBase" ParentName="SmallAmmoBase" Abstract="True">
+		<statBases>
+			<Mass>0.2</Mass>
+			<Bulk>0.2</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="ThunderBase">
+		<defName>Ammo_Thunder</defName>
+		<label>Thundergun Cannister</label>
+		<description>A large compressed air cannister used for the Thundergun</description>
+		<graphicData>
+			<texPath>ThirdParty/CoD Zombies Pack/Thunder</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_Thunder</cookOffProjectile>
+		<thingCategories>
+			<li>AmmoThunder</li>
+		</thingCategories>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef Name="ThunderBullet" ParentName="Base44MagnumBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/CodZP_ThunderShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<dropsCasings>false</dropsCasings>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="ThunderBullet">
+		<defName>Bullet_Thunder</defName>
+		<label>Air Projectile</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>27</armorPenetrationSharp>
+			<armorPenetrationBlunt>4.4</armorPenetrationBlunt>
+			<damageDef>CodZP_Stun_Bullet</damageDef>
+			<speed>300</speed>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonder">
+		<defName>MakeAmmo_Thunder</defName>
+		<label>make Thundergun Cannister x5</label>
+		<description>Craft 5 Thundergun Cannister.</description>
+		<jobString>Making Thundergun Cannister.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Thunder>5</Ammo_Thunder>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Thunders/Thunders_Punched.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Thunders/Thunders_Punched.xml
new file mode 100644
index 0000000000..a09d3675b9
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Thunders/Thunders_Punched.xml	
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoThunder_Punched</defName>
+		<label>Zeus Cannon</label>
+		<parent>AmmoWonders_Punched</parent>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Thunder_Punched</defName>
+		<label>Zeus Cannon Ammo set</label>
+		<ammoTypes>
+			<Ammo_Thunder_Punched>Bullet_Thunder_Punched</Ammo_Thunder_Punched>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="ThunderPunched" ParentName="SmallAmmoBase" Abstract="True">
+		<statBases>
+			<Mass>0.2</Mass>
+			<Bulk>0.2</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="ThunderPunched">
+		<defName>Ammo_Thunder_Punched</defName>
+		<label>ZeusCannon Cannister</label>
+		<description>A large compressed air cannister used for the Zeus Cannon</description>
+		<graphicData>
+			<texPath>ThirdParty/CoD Zombies Pack/Thunder</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<color>(200, 200, 200)</color>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_Thunder_Punched</cookOffProjectile>
+		<thingCategories>
+			<li>AmmoThunder_Punched</li>
+		</thingCategories>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef ParentName="ThunderBullet">
+		<defName>Bullet_Thunder_Punched</defName>
+		<label>Air Projectile</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>40</damageAmountBase>
+			<armorPenetrationSharp>54</armorPenetrationSharp>
+			<armorPenetrationBlunt>8.8</armorPenetrationBlunt>
+			<damageDef>CodZP_Stun_Bullet</damageDef>
+			<speed>345</speed>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonder_Punched">
+		<defName>MakeAmmo_Thunder_Punched</defName>
+		<label>make Zeus Cannon Cannister x5</label>
+		<description>Craft 5 Zeus Cannon Cannisters.</description>
+		<jobString>Making Zeus Cannon Cannisters.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_Thunder</li>
+					</thingDefs>
+				</filter>
+				<count>50</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_Thunder</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Thunder_Punched>5</Ammo_Thunder_Punched>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Thunders/Tundra.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Thunders/Tundra.xml
new file mode 100644
index 0000000000..174bc91bb3
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Thunders/Tundra.xml	
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoTundra</defName>
+		<label>Tundragun</label>
+		<parent>AmmoWonders</parent>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Tundra</defName>
+		<label>Tundra</label>
+		<ammoTypes>
+			<Ammo_Tundra>Bullet_Tundra</Ammo_Tundra>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="TundraBase" ParentName="SmallAmmoBase" Abstract="True">
+		<statBases>
+			<Mass>0.2</Mass>
+			<Bulk>0.2</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="TundraBase">
+		<defName>Ammo_Tundra</defName>
+		<label>Tundragun Cannister</label>
+		<description>A large compressed air cannister used for the Tundragun</description>
+		<graphicData>
+			<texPath>ThirdParty/CoD Zombies Pack/Tundra</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_Tundra</cookOffProjectile>
+		<thingCategories>
+			<li>AmmoTundra</li>
+		</thingCategories>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef ParentName="ThunderBullet">
+		<defName>Bullet_Tundra</defName>
+		<label>Chilled Air Projectile</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>27</armorPenetrationSharp>
+			<armorPenetrationBlunt>4.4</armorPenetrationBlunt>
+			<damageDef>CodZP_Frostbite</damageDef>
+			<speed>300</speed>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeAmmo">
+		<defName>MakeAmmo_Tundra</defName>
+		<label>make Tundragun Cannister x5</label>
+		<description>Craft 5 Tundragun Cannister.</description>
+		<jobString>Making Tundragun Cannister.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_Thunder</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_Thunder</li>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Tundra>5</Ammo_Tundra>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Thunders/Tundra_Punched.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Thunders/Tundra_Punched.xml
new file mode 100644
index 0000000000..ac1ac87ecf
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Thunders/Tundra_Punched.xml	
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoTundra_Punched</defName>
+		<label>Boreas Blizzard</label>
+		<parent>AmmoWonders_Punched</parent>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Tundra_Punched</defName>
+		<label>Boreas Blizzard set</label>
+		<ammoTypes>
+			<Ammo_Tundra_Punched>Bullet_Tundra_Punched</Ammo_Tundra_Punched>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="TundraPunched" ParentName="SmallAmmoBase" Abstract="True">
+		<statBases>
+			<Mass>0.2</Mass>
+			<Bulk>0.2</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="TundraPunched">
+		<defName>Ammo_Tundra_Punched</defName>
+		<label>Boreas Blizzard Cannister</label>
+		<description>A large compressed air cannister used for the Boreas Blizzard</description>
+		<graphicData>
+			<texPath>ThirdParty/CoD Zombies Pack/Blizzard</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_Tundra_Punched</cookOffProjectile>
+		<thingCategories>
+			<li>AmmoTundra_Punched</li>
+		</thingCategories>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef ParentName="ThunderBullet">
+		<defName>Bullet_Tundra_Punched</defName>
+		<label>Chilled Air Projectile</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>40</damageAmountBase>
+			<armorPenetrationSharp>54</armorPenetrationSharp>
+			<armorPenetrationBlunt>8.8</armorPenetrationBlunt>
+			<damageDef>CodZP_Frostbite</damageDef>
+			<speed>345</speed>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonderAmmo_Punched">
+		<defName>MakeAmmo_Tundra_Punched</defName>
+		<label>make Boreas Blizzard Cannister x5</label>
+		<description>Craft 5 Boreas Blizzard Cannister.</description>
+		<jobString>Making Boreas Blizzard Cannister.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_Tundra</li>
+					</thingDefs>
+				</filter>
+				<count>50</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_Tundra</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Tundra_Punched>5</Ammo_Tundra_Punched>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Winters/WintersHowl.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Winters/WintersHowl.xml
new file mode 100644
index 0000000000..c378c56462
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Winters/WintersHowl.xml	
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoWinters</defName>
+		<label>Winter's Howl</label>
+		<parent>AmmoWonders</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Winters</defName>
+		<label>Winter's Howl set</label>
+		<ammoTypes>
+			<Ammo_Winters_Cryo>Bullet_Winters_Cryo</Ammo_Winters_Cryo>
+		</ammoTypes>
+		<similarTo>AmmoSet_Pistol</similarTo>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="WintersBase" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Pistol cartridge favoured for its above average stopping power.</description>
+		<statBases>
+			<Mass>0.02</Mass>
+			<Bulk>0.02</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoWinters</li>
+		</thingCategories>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="WintersBase">
+		<defName>Ammo_Winters_Cryo</defName>
+		<label>Winters cartridge</label>
+		<graphicData>
+			<texPath>Things/Ammo/Pistol/FMJ</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_Winters_Cryo</cookOffProjectile>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef Name="BaseWintersBullet" ParentName="Base44MagnumBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/CodZP_StaffProjectile</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<dropsCasings>true</dropsCasings>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="BaseWintersBullet">
+		<defName>Bullet_Winters_Cryo</defName>
+		<label>Winters Howl bullet</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<speed>54</speed>
+			<damageDef>CodZP_Frostbite</damageDef>
+			<armorPenetrationSharp>3</armorPenetrationSharp>
+			<armorPenetrationBlunt>10.860</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonder">
+		<defName>MakeAmmo_Winters_Cryo</defName>
+		<label>make Winter's Howl cartridge x75</label>
+		<description>Craft 75 Winter's Howl cartridges.</description>
+		<jobString>Making Winter's Howl cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Winters_Cryo>75</Ammo_Winters_Cryo>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Winters/WintersHowl_Punched.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Winters/WintersHowl_Punched.xml
new file mode 100644
index 0000000000..b1a5d90610
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Winters/WintersHowl_Punched.xml	
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoWinters_Punched</defName>
+		<label>Winter's Fury</label>
+		<parent>AmmoWonders_Punched</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Winters_Punched</defName>
+		<label>Winter's Fury set</label>
+		<ammoTypes>
+			<Ammo_Winters_Cryo_Punched>Bullet_Winters_Cryo_Punched</Ammo_Winters_Cryo_Punched>
+		</ammoTypes>
+		<similarTo>AmmoSet_Pistol</similarTo>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="WintersPunched" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Pistol cartridge favoured for its above average stopping power.</description>
+		<statBases>
+			<Mass>0.02</Mass>
+			<Bulk>0.02</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoWinters_Punched</li>
+		</thingCategories>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="WintersPunched">
+		<defName>Ammo_Winters_Cryo_Punched</defName>
+		<label>Winter's Fury cartridge</label>
+		<graphicData>
+			<texPath>Things/Ammo/Pistol/FMJ</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_Winters_Cryo_Punched</cookOffProjectile>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef ParentName="BaseWintersBullet">
+		<defName>Bullet_Winters_Cryo_Punched</defName>
+		<label>Winters Fury bullet</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>24</damageAmountBase>
+			<speed>66</speed>
+			<damageDef>CodZP_Frostbite</damageDef>
+			<armorPenetrationSharp>6</armorPenetrationSharp>
+			<armorPenetrationBlunt>21.720</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="AmmoRecipePunched">
+		<defName>MakeAmmo_Winters_Cryo_Punched</defName>
+		<label>make Winter's Fury cartridge x75</label>
+		<description>Craft 75 Winter's Fury cartridges.</description>
+		<jobString>Making Winter's Fury cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_Winters_Cryo</li>
+					</thingDefs>
+				</filter>
+				<count>300</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_Winters_Cryo</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Winters_Cryo_Punched>75</Ammo_Winters_Cryo_Punched>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Wunders/Wunders.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Wunders/Wunders.xml
new file mode 100644
index 0000000000..2f708f5704
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Wunders/Wunders.xml	
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoWunder</defName>
+		<label>Wunderwaffle</label>
+		<parent>AmmoWonders</parent>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Wunder</defName>
+		<label>Wunderwaffe DG-2 Ammo Set</label>
+		<ammoTypes>
+			<Ammo_Wunder>Bullet_Wunder</Ammo_Wunder>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef Name="WunderBullet" ParentName="Base44MagnumBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/CodZP_ShockBolt</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<dropsCasings>false</dropsCasings>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="WunderBullet">
+		<defName>Bullet_Wunder</defName>
+		<label>Wunder Electrical Volt</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>300</speed>
+			<damageDef>Electrical</damageDef>
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>27</armorPenetrationSharp>
+			<armorPenetrationBlunt>4.4</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="WunderBase" ParentName="SmallAmmoBase" Abstract="True">
+		<statBases>
+			<Mass>0.2</Mass>
+			<Bulk>0.2</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="WunderBase">
+		<defName>Ammo_Wunder</defName>
+		<label>Wunderwaffe DG-2 Bulbs</label>
+		<description>A large compressed air Bulbs used for the Wundergun</description>
+		<graphicData>
+			<texPath>ThirdParty/CoD Zombies Pack/Wunder</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_Wunder</cookOffProjectile>
+		<thingCategories>
+			<li>AmmoWunder</li>
+		</thingCategories>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonder">
+		<defName>MakeAmmo_Wunder</defName>
+		<label>make Wunderwaffe DG-2 Bulbs x20</label>
+		<description>Craft 20 Wunderwaffe DG-2 Bulbs.</description>
+		<jobString>Making Wunderwaffe DG-2 Bulbs.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Wunder>20</Ammo_Wunder>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Wunders/WundersS.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Wunders/WundersS.xml
new file mode 100644
index 0000000000..124bb70b4d
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Wunders/WundersS.xml	
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoWunder_s</defName>
+		<label>DG-Scharfschutze</label>
+		<parent>AmmoWonders</parent>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Wunder_s</defName>
+		<label>DG-Scharfschutze Ammo Set</label>
+		<ammoTypes>
+			<Ammo_Wunder_s>Bullet_Wunder_s</Ammo_Wunder_s>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="Wunder_sBase" ParentName="SmallAmmoBase" Abstract="True">
+		<statBases>
+			<Mass>0.2</Mass>
+			<Bulk>0.2</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Wunder_sBase">
+		<defName>Ammo_Wunder_s</defName>
+		<label>DG-Scharfschutze Bulbs</label>
+		<description>Bulbs used for the DG-Scharfschutze</description>
+		<graphicData>
+			<texPath>ThirdParty/CoD Zombies Pack/Wunder</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>ExplosiveAP</ammoClass>
+		<cookOffProjectile>Bullet_Wunder_s</cookOffProjectile>
+		<thingCategories>
+			<li>AmmoWunder_s</li>
+		</thingCategories>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef ParentName="WunderBullet">
+		<defName>Bullet_Wunder_s</defName>
+		<label>Wunder Explosive Volt</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>300</speed>
+			<damageDef>Electrical</damageDef>
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationSharp>27</armorPenetrationSharp>
+			<armorPenetrationBlunt>4.4</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>107</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeAmmo">
+		<defName>MakeAmmo_Wunder_s</defName>
+		<label>make DG-Scharfschutze Bulbs x5</label>
+		<description>Craft 5 DG-Scharfschutze Bulbs.</description>
+		<jobString>Making DG-Scharfschutze Bulbs.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Wunder_s>5</Ammo_Wunder_s>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Wunders/WundersS_Punched.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Wunders/WundersS_Punched.xml
new file mode 100644
index 0000000000..dc3fa88cc1
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Wunders/WundersS_Punched.xml	
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoWunder_s_Punched</defName>
+		<label>DG-Funkenschutze</label>
+		<parent>AmmoWonders_Punched</parent>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Wunder_s_Punched</defName>
+		<label>DG-Funkenschutze Ammo Set</label>
+		<ammoTypes>
+			<Ammo_Wunder_s_Punched>Bullet_Wunder_s_Punched</Ammo_Wunder_s_Punched>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="Wunder_sPunched" ParentName="SmallAmmoBase" Abstract="True">
+		<statBases>
+			<Mass>0.2</Mass>
+			<Bulk>0.2</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Wunder_sPunched">
+		<defName>Ammo_Wunder_s_Punched</defName>
+		<label>DG-Funkenschutze Bulbs</label>
+		<description>Bulbs used for the Funkenschutze</description>
+		<graphicData>
+			<texPath>ThirdParty/CoD Zombies Pack/Wunder</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>ExplosiveAP</ammoClass>
+		<cookOffProjectile>Bullet_Wunder_s_Punched</cookOffProjectile>
+		<thingCategories>
+			<li>AmmoWunder_s_Punched</li>
+		</thingCategories>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef ParentName="WunderBullet">
+		<defName>Bullet_Wunder_s_Punched</defName>
+		<label>Wunder Explosive Volt</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>345</speed>
+			<damageDef>Electrical</damageDef>
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>54</armorPenetrationSharp>
+			<armorPenetrationBlunt>8.8</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>214</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonderAmmo_Punched">
+		<defName>MakeAmmo_Wunder_s_Punched</defName>
+		<label>make DG-Scharfschutze Bulbs x5</label>
+		<description>Craft 5 DG-Funkenschutze Bulbs.</description>
+		<jobString>Making DG-Funkenschutze Bulbs.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_Wunder_s</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_Wunder_s</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Wunder_s_Punched>5</Ammo_Wunder_s_Punched>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Wunders/Wunders_Punched.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Wunders/Wunders_Punched.xml
new file mode 100644
index 0000000000..1ff0ef391f
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Wunders/Wunders_Punched.xml	
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoWunder_Punched</defName>
+		<label>Wunderwaffe DG-3 JZ</label>
+		<parent>AmmoWonders_Punched</parent>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Wunder_Punched</defName>
+		<label>Wunderwaffe DG-3 JZ Ammo Set</label>
+		<ammoTypes>
+			<Ammo_Wunder_Punched>Bullet_Wunder_Punched</Ammo_Wunder_Punched>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="WunderPunched" ParentName="SmallAmmoBase" Abstract="True">
+		<statBases>
+			<Mass>0.2</Mass>
+			<Bulk>0.2</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="WunderPunched">
+		<defName>Ammo_Wunder_Punched</defName>
+		<label>Wunderwaffe DG-3 JZ Bulbs</label>
+		<description>A large compressed air Bulbs used for the Wundergun</description>
+		<graphicData>
+			<texPath>ThirdParty/CoD Zombies Pack/Wunder</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_Wunder_Punched</cookOffProjectile>
+		<thingCategories>
+			<li>AmmoWunder_Punched</li>
+		</thingCategories>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef ParentName="WunderBullet">
+		<defName>Bullet_Wunder_Punched</defName>
+		<label>Wunder Electrical Volt</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>345</speed>
+			<damageDef>Electrical</damageDef>
+			<damageAmountBase>40</damageAmountBase>
+			<armorPenetrationSharp>54</armorPenetrationSharp>
+			<armorPenetrationBlunt>8.8</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonder_Punched">
+		<defName>MakeAmmo_Wunder_Punched</defName>
+		<label>make Wunderwaffe DG-3 JZ Bulbs x20</label>
+		<description>Craft 20 Wunderwaffe DG-3 JZ Bulbs.</description>
+		<jobString>Making Wunderwaffe DG-3 JZ Bulbs.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_Wunder</li>
+					</thingDefs>
+				</filter>
+				<count>80</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_Wunder</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Wunder_Punched>20</Ammo_Wunder_Punched>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Zaps/Waveguns.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Zaps/Waveguns.xml
new file mode 100644
index 0000000000..d3c709eb6d
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Zaps/Waveguns.xml	
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoWavegun</defName>
+		<label>Wavegun</label>
+		<parent>AmmoWonders</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Wavegun</defName>
+		<label>Wavegun</label>
+		<ammoTypes>
+			<Ammo_Wavegun>Bullet_Wavegun</Ammo_Wavegun>
+		</ammoTypes>
+		<similarTo>AmmoSet_Pistol</similarTo>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="WavegunBase" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Pistol cartridge favoured for its above average stopping power.</description>
+		<statBases>
+			<Mass>0.02</Mass>
+			<Bulk>0.02</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoWavegun</li>
+		</thingCategories>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="WavegunBase">
+		<defName>Ammo_Wavegun</defName>
+		<label>Wavegun cartridge</label>
+		<graphicData>
+			<texPath>Things/Ammo/Pistol/FMJ</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>ExplosiveAP</ammoClass>
+		<cookOffProjectile>Bullet_Wavegun</cookOffProjectile>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef Name="BaseZapGun" ParentName="Base44MagnumBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/CodZP_ShockBolt</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>150</speed>
+			<dropsCasings>false</dropsCasings>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="BaseZapGun">
+		<defName>Bullet_Wavegun</defName>
+		<label>Wave Blast</label>
+		<graphicData>
+			<color>(167, 0, 207)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationSharp>3</armorPenetrationSharp>
+			<armorPenetrationBlunt>1</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>107</damageAmountBase>
+				<explosiveDamageType>CodZP_WavegunPurpleBomb</explosiveDamageType>
+				<explosiveRadius>1</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonder">
+		<defName>MakeAmmo_Wavegun</defName>
+		<label>make Wavegun cartridge x500</label>
+		<description>Craft 500 Wavegun cartridges.</description>
+		<jobString>Making Wavegun cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Wavegun>500</Ammo_Wavegun>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Zaps/Waveguns_Punched.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Zaps/Waveguns_Punched.xml
new file mode 100644
index 0000000000..b3563ad5f4
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Zaps/Waveguns_Punched.xml	
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoWavegun_Punched</defName>
+		<label>Max Wavegun</label>
+		<parent>AmmoWonders_Punched</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Wavegun_Punched</defName>
+		<label>Max Wavegun Ammo Set</label>
+		<ammoTypes>
+			<Ammo_Wavegun_Punched>Bullet_Wavegun_Punched</Ammo_Wavegun_Punched>
+		</ammoTypes>
+		<similarTo>AmmoSet_Pistol</similarTo>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="WavegunPunched" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Pistol cartridge favoured for its above average stopping power.</description>
+		<statBases>
+			<Mass>0.02</Mass>
+			<Bulk>0.02</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoWavegun_Punched</li>
+		</thingCategories>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="WavegunPunched">
+		<defName>Ammo_Wavegun_Punched</defName>
+		<label>Max Wavegun cartridge</label>
+		<graphicData>
+			<texPath>Things/Ammo/Pistol/FMJ</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>ExplosiveAP</ammoClass>
+		<cookOffProjectile>Bullet_Wavegun_Punched</cookOffProjectile>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef ParentName="BaseZapGun">
+		<defName>Bullet_Zapgun_Punched</defName>
+		<label>Purple Zap Bolt</label>
+		<graphicData>
+			<color>(167, 0, 207)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>180</speed>
+			<damageAmountBase>30</damageAmountBase>
+			<armorPenetrationSharp>10</armorPenetrationSharp>
+			<armorPenetrationBlunt>4</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonder_Punched">
+		<defName>MakeAmmo_Wavegun_Punched</defName>
+		<label>make Max Wavegun cartridge x500</label>
+		<description>Craft 500 Max Wavegun cartridges.</description>
+		<jobString>Making Max Wavegun cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Wavegun_Punched>500</Ammo_Wavegun_Punched>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Zaps/Zapgun Blue.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Zaps/Zapgun Blue.xml
new file mode 100644
index 0000000000..6446fcc6f8
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Zaps/Zapgun Blue.xml	
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoZapgun</defName>
+		<label>Zapgun</label>
+		<parent>AmmoWonders</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Zapgun_blue</defName>
+		<label>Blue Zapgun Ammo Set</label>
+		<ammoTypes>
+			<Ammo_Zapgun_blue>Bullet_Zapgun_blue</Ammo_Zapgun_blue>
+		</ammoTypes>
+		<similarTo>AmmoSet_Pistol</similarTo>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="ZapgunBase" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Pistol cartridge favoured for its above average stopping power.</description>
+		<statBases>
+			<Mass>0.02</Mass>
+			<Bulk>0.02</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoZapgun</li>
+		</thingCategories>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="ZapgunBase">
+		<defName>Ammo_Zapgun_blue</defName>
+		<label>Blue Zapgun cartridge</label>
+		<graphicData>
+			<texPath>Things/Ammo/Pistol/FMJ</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_Zapgun_blue</cookOffProjectile>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef ParentName="BaseZapGun">
+		<defName>Bullet_Zapgun_blue</defName>
+		<label>Blue Zap Bolt</label>
+		<graphicData>
+			<color>(68, 85, 206)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>15</damageAmountBase>
+			<armorPenetrationSharp>5</armorPenetrationSharp>
+			<armorPenetrationBlunt>2</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonder">
+		<defName>MakeAmmo_Zapgun_blue</defName>
+		<label>make Blue Zapgun cartridge x500</label>
+		<description>Craft 500 Blue Zapgun cartridges.</description>
+		<jobString>Making Blue Zapgun cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Zapgun_blue>500</Ammo_Zapgun_blue>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Zaps/Zapgun Red.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Zaps/Zapgun Red.xml
new file mode 100644
index 0000000000..e748ccb38d
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Zaps/Zapgun Red.xml	
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Zapgun_red</defName>
+		<label>Red Zapgun Ammo Set</label>
+		<ammoTypes>
+			<Ammo_Zapgun_red>Bullet_Zapgun_red</Ammo_Zapgun_red>
+		</ammoTypes>
+		<similarTo>AmmoSet_Pistol</similarTo>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="ZapgunBase">
+		<defName>Ammo_Zapgun_red</defName>
+		<label>Red Zapgun Cartridge</label>
+		<graphicData>
+			<texPath>Things/Ammo/Pistol/FMJ</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_Zapgun_red</cookOffProjectile>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef ParentName="BaseZapGun">
+		<defName>Bullet_Zapgun_red</defName>
+		<label>Red Zap Bolt</label>
+		<graphicData>
+			<color>(209, 39, 74)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>15</damageAmountBase>
+			<armorPenetrationSharp>5</armorPenetrationSharp>
+			<armorPenetrationBlunt>2</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonder">
+		<defName>MakeAmmo_Zapgun_red</defName>
+		<label>make Red Zapgun cartridge x500</label>
+		<description>Craft 500 Red Zapgun cartridges.</description>
+		<jobString>Making Red Zapgun cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Zapgun_red>500</Ammo_Zapgun_red>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Zaps/Zapguns Punched.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Zaps/Zapguns Punched.xml
new file mode 100644
index 0000000000..b803c05a49
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Ammo/Zaps/Zapguns Punched.xml	
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoZapgun_Punched</defName>
+		<label>Porter's X2 Zapgun</label>
+		<parent>AmmoWonders_Punched</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
+	</ThingCategoryDef>
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Zapgun_Punched</defName>
+		<label>Porter's X2 Zapgun Ammo Set</label>
+		<ammoTypes>
+			<Ammo_Zapgun_Punched>Bullet_Zapgun_Punched</Ammo_Zapgun_Punched>
+		</ammoTypes>
+		<similarTo>AmmoSet_Pistol</similarTo>
+	</CombatExtended.AmmoSetDef>
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="ZapgunPunched" ParentName="SmallAmmoBase" Abstract="True">
+		<description>A electrical battery that is used for both the blue and red zap guns</description>
+		<statBases>
+			<Mass>0.02</Mass>
+			<Bulk>0.02</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoZapgun_Punched</li>
+		</thingCategories>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="ZapgunPunched">
+		<defName>Ammo_Zapgun_Punched</defName>
+		<label>Porter's X2 Zapgun cartridge</label>
+		<graphicData>
+			<texPath>Things/Ammo/Pistol/FMJ</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_Zapgun_Punched</cookOffProjectile>
+	</ThingDef>
+	<!-- ==================== Projectiles ========================== -->
+	<ThingDef ParentName="BaseZapGun">
+		<defName>Bullet_Wavegun_Punched</defName>
+		<label>Max Wave Blast</label>
+		<graphicData>
+			<color>(255,31,31)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>5</armorPenetrationSharp>
+			<armorPenetrationBlunt>2</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>214</damageAmountBase>
+				<explosiveDamageType>CodZP_RaygunRedBomb</explosiveDamageType>
+				<explosiveRadius>1.9</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="CODZP_AmmoRecipeWonder_Punched">
+		<defName>MakeAmmo_Zapgun_Punched</defName>
+		<label>make Porter's X2 Zapgun cartridge x500</label>
+		<description>Craft 500 Porter's X2 Zapgun cartridges.</description>
+		<jobString>Making Porter's X2 Zapgun cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Zapgun_Punched>500</Ammo_Zapgun_Punched>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Punched Wonders.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Punched Wonders.xml
new file mode 100644
index 0000000000..54224a3793
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Punched Wonders.xml	
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<RecipeDef Name="CODZP_AmmoRecipeWonder_Punched" ParentName="AmmoRecipeBase" Abstract="true">
+		<researchPrerequisites>
+			<li>CodZP_WonderWorks</li>
+			<li>CodZP_PackAPunch</li>
+		</researchPrerequisites>
+	</RecipeDef>
+
+	<RecipeDef Name="CODZP_AmmoRecipeWonderAmmo_Punched" ParentName="AmmoRecipeBase" Abstract="true">
+		<researchPrerequisites>
+			<li>CodZP_AmmoMatic</li>
+			<li>CodZP_PackAPunch</li>
+		</researchPrerequisites>
+	</RecipeDef>
+
+	<ThingCategoryDef>
+		<defName>AmmoWonders_Punched</defName>
+		<label>Wonder</label>
+		<parent>AmmoPunched</parent>
+	</ThingCategoryDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Punched.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Punched.xml
new file mode 100644
index 0000000000..f802c3d40b
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Punched.xml	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<RecipeDef Name="AmmoRecipePunched" ParentName="AmmoRecipeBase" Abstract="true">
+		<researchPrerequisite>
+			<li>CodZP_PackAPunch</li>
+		</researchPrerequisite>
+	</RecipeDef>
+
+	<ThingCategoryDef>
+		<defName>AmmoPunched</defName>
+		<label>Pack a Punched</label>
+		<parent>Ammo</parent>
+	</ThingCategoryDef>
+
+	<ThingCategoryDef>
+		<defName>AmmoAdvanced_Punched</defName>
+		<label>advanced</label>
+		<parent>AmmoPunched</parent>
+	</ThingCategoryDef>
+
+	<ThingCategoryDef>
+		<defName>AmmoPistols_Punched</defName>
+		<label>pistol</label>
+		<parent>AmmoPunched</parent>
+	</ThingCategoryDef>
+
+	<ThingCategoryDef>
+		<defName>AmmoRifles_Punched</defName>
+		<label>rifle</label>
+		<parent>AmmoPunched</parent>
+	</ThingCategoryDef>
+
+	<ThingCategoryDef>
+		<defName>AmmoShotguns_Punched</defName>
+		<label>shotgun</label>
+		<parent>AmmoPunched</parent>
+	</ThingCategoryDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Wonders.xml b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Wonders.xml
new file mode 100644
index 0000000000..d384fd3110
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Defs/Call of Duty - Zombies Pack/Wonders.xml	
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<RecipeDef Name="CODZP_AmmoRecipeWonder" ParentName="AmmoRecipeBase" Abstract="true">
+		<researchPrerequisite>
+			<li>CodZP_WonderWorks</li>
+		</researchPrerequisite>
+	</RecipeDef>
+
+	<RecipeDef Name="CODZP_AmmoRecipeAmmo" ParentName="AmmoRecipeBase" Abstract="true">
+		<researchPrerequisite>
+			<li>CodZP_AmmoMatic</li>
+		</researchPrerequisite>
+	</RecipeDef>
+
+	<ThingCategoryDef>
+		<defName>AmmoWonders</defName>
+		<label>Wonder</label>
+		<parent>Ammo</parent>
+	</ThingCategoryDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Patches/Call of Duty - Zombies Pack/MysteryBox.xml b/ModPatches/Call of Duty - Zombies Pack/Patches/Call of Duty - Zombies Pack/MysteryBox.xml
new file mode 100644
index 0000000000..23a1b54f57
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Patches/Call of Duty - Zombies Pack/MysteryBox.xml	
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/MysteryBoxFrameWork.ItemReplacerDef[defName="Replacer_RandomWeapons"]/producedItems/Gun_SmokeLauncher</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/MysteryBoxFrameWork.ItemReplacerDef[defName="Replacer_RandomWeapons"]/producedItems/Gun_EmpLauncher</xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Patches/Call of Duty - Zombies Pack/Weapons/Base-Persona.xml b/ModPatches/Call of Duty - Zombies Pack/Patches/Call of Duty - Zombies Pack/Weapons/Base-Persona.xml
new file mode 100644
index 0000000000..5a89216d0c
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Patches/Call of Duty - Zombies Pack/Weapons/Base-Persona.xml	
@@ -0,0 +1,595 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Persona Bond Forge</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+				<!-- tools -->
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[
+						defName="CodZP_Gun_Revolver-Persona" or
+						defName="CodZP_Gun_Autopistol-Persona" or
+						defName="CodZP_Gun_MachinePistol-Persona" or
+						defName="CodZP_Gun_HeavySMG-Persona" or
+						defName="CodZP_Gun_AssaultRifle-Persona"]/tools </xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>grip</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>12</power>
+								<cooldownTime>2</cooldownTime>
+								<chanceFactor>1.5</chanceFactor>
+								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>barrel</label>
+								<capacities>
+									<li>Blunt</li>
+									<li>Poke</li>
+								</capacities>
+								<power>3</power>
+								<cooldownTime>2</cooldownTime>
+								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+							</li>
+						</tools>
+					</value>
+				</li>
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[
+						defName="CodZP_Gun_IncendiaryLauncher-Persona" or
+						defName="CodZP_Gun_BoltActionRifle-Persona" or
+						defName="CodZP_Gun_PumpShotgun-Persona" or
+						defName="CodZP_Gun_ChainShotgun-Persona" or
+						defName="CodZP_Gun_LMG-Persona" or
+						defName="CodZP_Gun_SniperRifle-Persona" or
+						defName="CodZP_Gun_ChargeRifle-Persona"]/tools </xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>stock</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>12</power>
+								<cooldownTime>2</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>12</power>
+								<cooldownTime>2</cooldownTime>
+								<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+							</li>
+						</tools>
+					</value>
+				</li>
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[
+						defName="CodZP_Gun_Minigun-Persona"]/tools </xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>barrel</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>15</power>
+								<cooldownTime>2</cooldownTime>
+								<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+							</li>
+						</tools>
+					</value>
+				</li>
+				<!--Pistols-->
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>CodZP_Gun_Revolver-Persona</defName>
+					<statBases>
+						<Mass>1.39</Mass>
+						<RangedWeapon_Cooldown>0.31</RangedWeapon_Cooldown>
+						<SightsEfficiency>0.93</SightsEfficiency>
+						<ShotSpread>0.13</ShotSpread>
+						<SwayFactor>0.9</SwayFactor>
+						<Bulk>2.1</Bulk>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_44Magnum_FMJ_Punched</defaultProjectile>
+						<warmupTime>0.49</warmupTime>
+						<range>17</range>
+						<soundCast>CodZP_Shot_PAP</soundCast>
+						<soundCastTail>GunTail_Light</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>12</magazineSize>
+						<reloadTime>2.94</reloadTime>
+						<ammoSet>AmmoSet_44Magnum_Punched</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aiUseBurstMode>FALSE</aiUseBurstMode>
+					</FireModes>
+					<weaponTags>
+						<li>CE_Sidearm</li>
+						<li>CE_AI_BROOM</li>
+						<li>CE_OneHandedWeapon</li>
+					</weaponTags>
+				</li>
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>CodZP_Gun_Autopistol-Persona</defName>
+					<statBases>
+						<Mass>1.11</Mass>
+						<RangedWeapon_Cooldown>0.24</RangedWeapon_Cooldown>
+						<SightsEfficiency>0.93</SightsEfficiency>
+						<ShotSpread>0.12</ShotSpread>
+						<SwayFactor>0.8</SwayFactor>
+						<Bulk>2.10</Bulk>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_45ACP_FMJ_Punched</defaultProjectile>
+						<warmupTime>0.49</warmupTime>
+						<range>17</range>
+						<soundCast>CodZP_Shot_PAP</soundCast>
+						<soundCastTail>GunTail_Light</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>15</magazineSize>
+						<reloadTime>2.56</reloadTime>
+						<ammoSet>AmmoSet_45ACP_Punched</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aiUseBurstMode>FALSE</aiUseBurstMode>
+					</FireModes>
+					<weaponTags>
+						<li>CE_Sidearm</li>
+						<li>CE_AI_BROOM</li>
+						<li>CE_OneHandedWeapon</li>
+					</weaponTags>
+				</li>
+
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>CodZP_Gun_MachinePistol-Persona</defName>
+					<statBases>
+						<Mass>2.84</Mass>
+						<RangedWeapon_Cooldown>0.23</RangedWeapon_Cooldown>
+						<SightsEfficiency>0.93</SightsEfficiency>
+						<ShotSpread>0.12</ShotSpread>
+						<SwayFactor>1.4</SwayFactor>
+						<Bulk>2.95</Bulk>
+					</statBases>
+					<Properties>
+						<recoilAmount>1.3</recoilAmount>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_45ACP_FMJ_Punched</defaultProjectile>
+						<warmupTime>0.49</warmupTime>
+						<range>17</range>
+						<burstShotCount>6</burstShotCount>
+						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+						<soundCast>CodZP_Shot_PAP</soundCast>
+						<soundCastTail>GunTail_Light</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>45</magazineSize>
+						<reloadTime>2.56</reloadTime>
+						<ammoSet>AmmoSet_45ACP_Punched</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aimedBurstShotCount>2</aimedBurstShotCount>
+						<aiUseBurstMode>FALSE</aiUseBurstMode>
+					</FireModes>
+					<weaponTags>
+						<li>CE_SMG</li>
+						<li>CE_AI_BROOM</li>
+						<li>CE_OneHandedWeapon</li>
+					</weaponTags>
+				</li>
+				<!--Launchers-->
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>CodZP_Gun_IncendiaryLauncher-Persona</defName>
+					<statBases>
+						<Mass>8</Mass>
+						<RangedWeapon_Cooldown>0.28</RangedWeapon_Cooldown>
+						<SightsEfficiency>1.32</SightsEfficiency>
+						<ShotSpread>0.11</ShotSpread>
+						<SwayFactor>1.3</SwayFactor>
+						<Bulk>10</Bulk>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_30x64mmFuel_Incendiary_Punched</defaultProjectile>
+						<warmupTime>0.89</warmupTime>
+						<range>58</range>
+						<burstShotCount>3</burstShotCount>
+						<soundCast>Shot_IncendiaryLauncher</soundCast>
+						<soundCastTail>GunTail_Medium</soundCastTail>
+						<muzzleFlashScale>14</muzzleFlashScale>
+						<targetParams>
+							<canTargetLocations>true</canTargetLocations>
+						</targetParams>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>9</magazineSize>
+						<reloadTime>2.56</reloadTime>
+						<ammoSet>AmmoSet_30x64mmFuel_Punched</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aiUseBurstMode>FALSE</aiUseBurstMode>
+						<aiAimMode>SuppressFire</aiAimMode>
+					</FireModes>
+					<weaponTags>
+						<li>CE_AI_AOE</li>
+						<li>EliteGun</li>
+					</weaponTags>
+					<AllowWithRunAndGun>false</AllowWithRunAndGun>
+				</li>
+				<!-- Remove Smoke and EMP Launchers -->
+				<li Class="PatchOperationRemove">
+					<xpath>Defs/ThingDef[defName="CodZP_Gun_SmokeLauncher-Persona"]</xpath>
+				</li>
+
+				<li Class="PatchOperationRemove">
+					<xpath>Defs/RecipeDef[defName="CodZP_make_BondPAPSmokeLauncher"]</xpath>
+				</li>
+
+				<li Class="PatchOperationRemove">
+					<xpath>Defs/ThingDef[defName="CodZP_Gun_EmpLauncher-Persona"]</xpath>
+				</li>
+
+				<li Class="PatchOperationRemove">
+					<xpath>Defs/RecipeDef[defName="CodZP_make_BondPAPEMPLauncher"]</xpath>
+				</li>
+				<!--Snipers-->
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>CodZP_Gun_BoltActionRifle-Persona</defName>
+					<statBases>
+						<Mass>4.19</Mass>
+						<RangedWeapon_Cooldown>0.75</RangedWeapon_Cooldown>
+						<SightsEfficiency>1.32</SightsEfficiency>
+						<ShotSpread>0.01</ShotSpread>
+						<SwayFactor>1.2</SwayFactor>
+						<Bulk>12.60</Bulk>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_303British_FMJ_Punched</defaultProjectile>
+						<warmupTime>0.89</warmupTime>
+						<range>79</range>
+						<soundCast>CodZP_Shot_PAP</soundCast>
+						<soundCastTail>GunTail_Heavy</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>10</magazineSize>
+						<reloadTime>2.75</reloadTime>
+						<ammoSet>AmmoSet_303British_Punched</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aiAimMode>AimedShot</aiAimMode>
+					</FireModes>
+					<weaponTags>
+						<li>CE_AI_SR</li>
+					</weaponTags>
+					<AllowWithRunAndGun>false</AllowWithRunAndGun>
+				</li>
+
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>CodZP_Gun_SniperRifle-Persona</defName>
+					<statBases>
+						<Mass>7.30</Mass>
+						<RangedWeapon_Cooldown>0.87</RangedWeapon_Cooldown>
+						<SightsEfficiency>3.44</SightsEfficiency>
+						<ShotSpread>0.04</ShotSpread>
+						<SwayFactor>1.0</SwayFactor>
+						<Bulk>11.92</Bulk>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_762x51mmNATO_FMJ_Punched</defaultProjectile>
+						<warmupTime>1.46</warmupTime>
+						<range>108</range>
+						<soundCast>CodZP_Shot_PAP</soundCast>
+						<soundCastTail>GunTail_Heavy</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>10</magazineSize>
+						<reloadTime>2.56</reloadTime>
+						<ammoSet>AmmoSet_762x51mmNATO_Punched</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aiAimMode>AimedShot</aiAimMode>
+					</FireModes>
+					<weaponTags>
+						<li>CE_AI_SR</li>
+						<li>Bipod_DMR</li>
+					</weaponTags>
+					<AllowWithRunAndGun>false</AllowWithRunAndGun>
+				</li>
+				<!--Shotguns-->
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>CodZP_Gun_PumpShotgun-Persona</defName>
+					<statBases>
+						<Mass>3.00</Mass>
+						<RangedWeapon_Cooldown>0.64</RangedWeapon_Cooldown>
+						<SightsEfficiency>0.19</SightsEfficiency>
+						<ShotSpread>0.87</ShotSpread>
+						<SwayFactor>6.5</SwayFactor>
+						<Bulk>9.0</Bulk>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_12Gauge_Buck_Punched</defaultProjectile>
+						<warmupTime>0.49</warmupTime>
+						<range>23</range>
+						<soundCast>CodZP_Shot_PAP</soundCast>
+						<soundCastTail>GunTail_Heavy</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>15</magazineSize>
+						<reloadOneAtATime>true</reloadOneAtATime>
+						<reloadTime>0.54</reloadTime>
+						<ammoSet>AmmoSet_12Gauge_Punched</ammoSet>
+					</AmmoUser>
+					<FireModes/>
+					<weaponTags>
+						<li>CE_AI_BROOM</li>
+					</weaponTags>
+				</li>
+
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>CodZP_Gun_ChainShotgun-Persona</defName>
+					<statBases>
+						<Mass>3.50</Mass>
+						<RangedWeapon_Cooldown>0.25</RangedWeapon_Cooldown>
+						<SightsEfficiency>1.32</SightsEfficiency>
+						<ShotSpread>0.11</ShotSpread>
+						<SwayFactor>0.9</SwayFactor>
+						<Bulk>6.7</Bulk>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_12Gauge_Buck_Punched</defaultProjectile>
+						<warmupTime>0.49</warmupTime>
+						<range>23</range>
+						<soundCast>CodZP_Shot_PAP</soundCast>
+						<soundCastTail>GunTail_Heavy</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+						<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>20</magazineSize>
+						<reloadTime>2.56</reloadTime>
+						<ammoSet>AmmoSet_12Gauge_Punched</ammoSet>
+					</AmmoUser>
+					<FireModes/>
+					<weaponTags>
+						<li>CE_AI_BROOM</li>
+					</weaponTags>
+				</li>
+				<!--Misc-->
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>CodZP_Gun_HeavySMG-Persona</defName>
+					<statBases>
+						<Mass>2.50</Mass>
+						<RangedWeapon_Cooldown>0.24</RangedWeapon_Cooldown>
+						<SightsEfficiency>1.32</SightsEfficiency>
+						<ShotSpread>0.10</ShotSpread>
+						<SwayFactor>0.70</SwayFactor>
+						<Bulk>4.50</Bulk>
+					</statBases>
+					<Properties>
+						<recoilAmount>1.5</recoilAmount>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_45ACP_FMJ_Punched</defaultProjectile>
+						<warmupTime>0.49</warmupTime>
+						<range>36</range>
+						<burstShotCount>6</burstShotCount>
+						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+						<soundCast>CodZP_Shot_PAP</soundCast>
+						<soundCastTail>GunTail_Heavy</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>50</magazineSize>
+						<reloadTime>2.56</reloadTime>
+						<ammoSet>AmmoSet_45ACP_Punched</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aimedBurstShotCount>6</aimedBurstShotCount>
+						<aiUseBurstMode>FALSE</aiUseBurstMode>
+					</FireModes>
+					<weaponTags>
+						<li>CE_SMG</li>
+						<li>CE_AI_BROOM</li>
+					</weaponTags>
+				</li>
+
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>CodZP_Gun_LMG-Persona</defName>
+					<statBases>
+						<Mass>9.12</Mass>
+						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+						<SightsEfficiency>1.32</SightsEfficiency>
+						<ShotSpread>0.04</ShotSpread>
+						<SwayFactor>1.1</SwayFactor>
+						<Bulk>14.7</Bulk>
+					</statBases>
+					<Properties>
+						<recoilAmount>1.0</recoilAmount>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_762x54mmR_FMJ_Punched</defaultProjectile>
+						<warmupTime>1.05</warmupTime>
+						<range>89</range>
+						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+						<burstShotCount>10</burstShotCount>
+						<soundCast>CodZP_Shot_PAP</soundCast>
+						<soundCastTail>GunTail_Medium</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+						<targetParams>
+							<canTargetLocations>true</canTargetLocations>
+						</targetParams>
+						<recoilPattern>Mounted</recoilPattern>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>100</magazineSize>
+						<reloadTime>3.14</reloadTime>
+						<ammoSet>AmmoSet_762x54mmR_Punched</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aimedBurstShotCount>10</aimedBurstShotCount>
+						<aiUseBurstMode>FALSE</aiUseBurstMode>
+						<aiAimMode>SuppressFire</aiAimMode>
+					</FireModes>
+					<weaponTags>
+						<li>CE_MachineGun</li>
+						<li>CE_AI_LMG</li>
+						<li>Bipod_LMG</li>
+					</weaponTags>
+					<AllowWithRunAndGun>false</AllowWithRunAndGun>
+				</li>
+
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>CodZP_Gun_AssaultRifle-Persona</defName>
+					<statBases>
+						<Mass>3.26</Mass>
+						<RangedWeapon_Cooldown>0.23</RangedWeapon_Cooldown>
+						<SightsEfficiency>1.32</SightsEfficiency>
+						<ShotSpread>0.05</ShotSpread>
+						<SwayFactor>1.0</SwayFactor>
+						<Bulk>10.03</Bulk>
+					</statBases>
+					<Properties>
+						<recoilAmount>1.10</recoilAmount>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_556x45mmNATO_FMJ_Punched</defaultProjectile>
+						<warmupTime>0.89</warmupTime>
+						<range>79</range>
+						<burstShotCount>6</burstShotCount>
+						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+						<soundCast>CodZP_Shot_PAP</soundCast>
+						<soundCastTail>GunTail_Medium</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>60</magazineSize>
+						<reloadTime>2.56</reloadTime>
+						<ammoSet>AmmoSet_556x45mmNATO_Punched</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aimedBurstShotCount>2</aimedBurstShotCount>
+						<aiUseBurstMode>TRUE</aiUseBurstMode>
+						<aiAimMode>AimedShot</aiAimMode>
+					</FireModes>
+					<weaponTags>
+						<li>CE_AI_AR</li>
+					</weaponTags>
+				</li>
+
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>CodZP_Gun_Minigun-Persona</defName>
+					<statBases>
+						<Mass>30.00</Mass>
+						<RangedWeapon_Cooldown>0.22</RangedWeapon_Cooldown>
+						<SightsEfficiency>1.32</SightsEfficiency>
+						<ShotSpread>0.04</ShotSpread>
+						<SwayFactor>3.9</SwayFactor>
+						<Bulk>10</Bulk>
+					</statBases>
+					<Properties>
+						<recoilAmount>0.5</recoilAmount>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_762x51mmNATO_FMJ_Punched</defaultProjectile>
+						<warmupTime>1.86</warmupTime>
+						<range>81</range>
+						<burstShotCount>100</burstShotCount>
+						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+						<soundCast>CodZP_Shot_PAP</soundCast>
+						<soundCastTail>GunTail_Medium</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>500</magazineSize>
+						<reloadTime>5.89</reloadTime>
+						<ammoSet>AmmoSet_762x51mmNATO_Punched</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aiAimMode>SuppressFire</aiAimMode>
+						<aimedBurstShotCount>50</aimedBurstShotCount>
+					</FireModes>
+					<weaponTags>
+						<li>CE_AI_Suppressive</li>
+						<li>GunMinigun</li>
+					</weaponTags>
+				</li>
+
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>CodZP_Gun_ChargeRifle-Persona</defName>
+					<statBases>
+						<Mass>3.0</Mass>
+						<RangedWeapon_Cooldown>0.23</RangedWeapon_Cooldown>
+						<SightsEfficiency>1.45</SightsEfficiency>
+						<ShotSpread>0.06</ShotSpread>
+						<SwayFactor>0.9</SwayFactor>
+						<Bulk>7.00</Bulk>
+					</statBases>
+					<Properties>
+						<recoilAmount>1.1</recoilAmount>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_6x24mmCharged_Punched</defaultProjectile>
+						<warmupTime>0.81</warmupTime>
+						<range>79</range>
+						<burstShotCount>6</burstShotCount>
+						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+						<soundCast>CodZP_Shot_PAP</soundCast>
+						<soundCastTail>GunTail_Medium</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>60</magazineSize>
+						<reloadTime>2.56</reloadTime>
+						<ammoSet>AmmoSet_6x24mmCharged_Punched</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aimedBurstShotCount>3</aimedBurstShotCount>
+						<aiUseBurstMode>TRUE</aiUseBurstMode>
+						<aiAimMode>AimedShot</aiAimMode>
+					</FireModes>
+					<weaponTags>
+						<li>CE_AI_AR</li>
+					</weaponTags>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Patches/Call of Duty - Zombies Pack/Weapons/Base.xml b/ModPatches/Call of Duty - Zombies Pack/Patches/Call of Duty - Zombies Pack/Weapons/Base.xml
new file mode 100644
index 0000000000..52026251cf
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Patches/Call of Duty - Zombies Pack/Weapons/Base.xml	
@@ -0,0 +1,577 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--tools-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="CodZP_Gun_Revolver-PAP" or
+			defName="CodZP_Gun_Autopistol-PAP" or
+			defName="CodZP_Gun_MachinePistol-PAP" or
+			defName="CodZP_Gun_HeavySMG-PAP" or
+			defName="CodZP_Gun_AssaultRifle-PAP"]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="CodZP_Gun_IncendiaryLauncher-PAP" or
+			defName="CodZP_Gun_BoltActionRifle-PAP" or
+			defName="CodZP_Gun_PumpShotgun-PAP" or
+			defName="CodZP_Gun_ChainShotgun-PAP" or
+			defName="CodZP_Gun_LMG-PAP" or
+			defName="CodZP_Gun_SniperRifle-PAP" or
+			defName="CodZP_Gun_ChargeRifle-PAP"]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</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>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="CodZP_Gun_Minigun-PAP"]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!--Pistols-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_Revolver-PAP</defName>
+		<statBases>
+			<Mass>1.39</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.81</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.1</SwayFactor>
+			<Bulk>2.1</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_44Magnum_FMJ_Punched</defaultProjectile>
+			<warmupTime>0.54</warmupTime>
+			<range>14</range>
+			<soundCast>CodZP_Shot_PAP</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>3.68</reloadTime>
+			<ammoSet>AmmoSet_44Magnum_Punched</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_BROOM</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_Autopistol-PAP</defName>
+		<statBases>
+			<Mass>1.11</Mass>
+			<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.81</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.9</SwayFactor>
+			<Bulk>2.10</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ_Punched</defaultProjectile>
+			<warmupTime>0.54</warmupTime>
+			<range>14</range>
+			<soundCast>CodZP_Shot_PAP</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>3.2</reloadTime>
+			<ammoSet>AmmoSet_45ACP_Punched</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_BROOM</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_MachinePistol-PAP</defName>
+		<statBases>
+			<Mass>2.84</Mass>
+			<RangedWeapon_Cooldown>0.29</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.81</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.64</SwayFactor>
+			<Bulk>2.95</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.49</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ_Punched</defaultProjectile>
+			<warmupTime>0.54</warmupTime>
+			<range>14</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<soundCast>CodZP_Shot_PAP</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>45</magazineSize>
+			<reloadTime>3.2</reloadTime>
+			<ammoSet>AmmoSet_45ACP_Punched</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_BROOM</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+	<!--Launchers-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_IncendiaryLauncher-PAP</defName>
+		<statBases>
+			<Mass>8</Mass>
+			<RangedWeapon_Cooldown>0.34</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.15</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.53</SwayFactor>
+			<Bulk>10</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_30x64mmFuel_Incendiary_Punched</defaultProjectile>
+			<warmupTime>0.99</warmupTime>
+			<range>48</range>
+			<burstShotCount>3</burstShotCount>
+			<soundCast>Shot_IncendiaryLauncher</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>9</magazineSize>
+			<reloadTime>3.2</reloadTime>
+			<ammoSet>AmmoSet_30x64mmFuel_Punched</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AOE</li>
+			<li>EliteGun</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+	<!-- Remove Smoke and EMP Launchers -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CodZP_Gun_SmokeLauncher-PAP"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CodZP_Gun_EmpLauncher-PAP"]</xpath>
+	</Operation>
+	<!--Snipers-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_BoltActionRifle-PAP</defName>
+		<statBases>
+			<Mass>4.19</Mass>
+			<RangedWeapon_Cooldown>0.94</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.15</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.43</SwayFactor>
+			<Bulk>12.60</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_303British_FMJ_Punched</defaultProjectile>
+			<warmupTime>0.99</warmupTime>
+			<range>66</range>
+			<soundCast>CodZP_Shot_PAP</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>3.44</reloadTime>
+			<ammoSet>AmmoSet_303British_Punched</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_SR</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_SniperRifle-PAP</defName>
+		<statBases>
+			<Mass>7.30</Mass>
+			<RangedWeapon_Cooldown>1.09</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.99</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.15</SwayFactor>
+			<Bulk>11.92</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ_Punched</defaultProjectile>
+			<warmupTime>1.62</warmupTime>
+			<range>90</range>
+			<soundCast>CodZP_Shot_PAP</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>3.2</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO_Punched</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_SR</li>
+			<li>Bipod_DMR</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+	<!--Shotguns-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_PumpShotgun-PAP</defName>
+		<statBases>
+			<Mass>3.00</Mass>
+			<RangedWeapon_Cooldown>0.8</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.16</SightsEfficiency>
+			<ShotSpread>1.02</ShotSpread>
+			<SwayFactor>7.65</SwayFactor>
+			<Bulk>9.0</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck_Punched</defaultProjectile>
+			<warmupTime>0.54</warmupTime>
+			<range>19</range>
+			<soundCast>CodZP_Shot_PAP</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.68</reloadTime>
+			<ammoSet>AmmoSet_12Gauge_Punched</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_ChainShotgun-PAP</defName>
+		<statBases>
+			<Mass>3.50</Mass>
+			<RangedWeapon_Cooldown>0.31</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.15</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.07</SwayFactor>
+			<Bulk>6.7</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck_Punched</defaultProjectile>
+			<warmupTime>0.54</warmupTime>
+			<range>19</range>
+			<soundCast>CodZP_Shot_PAP</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>3.2</reloadTime>
+			<ammoSet>AmmoSet_12Gauge_Punched</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+	<!--Misc-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_HeavySMG-PAP</defName>
+		<statBases>
+			<Mass>2.50</Mass>
+			<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.15</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>0.80</SwayFactor>
+			<Bulk>4.50</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.77</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ_Punched</defaultProjectile>
+			<warmupTime>0.54</warmupTime>
+			<range>30</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>CodZP_Shot_PAP</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>3.2</reloadTime>
+			<ammoSet>AmmoSet_45ACP_Punched</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>6</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_LMG-PAP</defName>
+		<statBases>
+			<Mass>9.12</Mass>
+			<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.15</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.30</SwayFactor>
+			<Bulk>14.7</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.12</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ_Punched</defaultProjectile>
+			<warmupTime>1.17</warmupTime>
+			<range>74</range>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>CodZP_Shot_PAP</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>3.92</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR_Punched</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>10</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_MachineGun</li>
+			<li>CE_AI_LMG</li>
+			<li>Bipod_LMG</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_AssaultRifle-PAP</defName>
+		<statBases>
+			<Mass>3.26</Mass>
+			<RangedWeapon_Cooldown>0.29</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.15</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.13</SwayFactor>
+			<Bulk>10.03</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.30</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ_Punched</defaultProjectile>
+			<warmupTime>0.99</warmupTime>
+			<range>66</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<soundCast>CodZP_Shot_PAP</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>60</magazineSize>
+			<reloadTime>3.2</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO_Punched</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AR</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_Minigun-PAP</defName>
+		<statBases>
+			<Mass>30.00</Mass>
+			<RangedWeapon_Cooldown>0.28</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.15</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>4.6</SwayFactor>
+			<Bulk>10</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.64</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ_Punched</defaultProjectile>
+			<warmupTime>2.07</warmupTime>
+			<range>67</range>
+			<burstShotCount>100</burstShotCount>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<soundCast>CodZP_Shot_PAP</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>500</magazineSize>
+			<reloadTime>7.36</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO_Punched</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>50</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Suppressive</li>
+			<li>GunMinigun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_ChargeRifle-PAP</defName>
+		<statBases>
+			<Mass>3.0</Mass>
+			<RangedWeapon_Cooldown>0.29</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.27</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.02</SwayFactor>
+			<Bulk>7.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.28</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmCharged_Punched</defaultProjectile>
+			<warmupTime>0.9</warmupTime>
+			<range>66</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>CodZP_Shot_PAP</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>60</magazineSize>
+			<reloadTime>3.2</reloadTime>
+			<ammoSet>AmmoSet_6x24mmCharged_Punched</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AR</li>
+		</weaponTags>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Patches/Call of Duty - Zombies Pack/Weapons/Melee-Persona.xml b/ModPatches/Call of Duty - Zombies Pack/Patches/Call of Duty - Zombies Pack/Weapons/Melee-Persona.xml
new file mode 100644
index 0000000000..13aef90a7c
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Patches/Call of Duty - Zombies Pack/Weapons/Melee-Persona.xml	
@@ -0,0 +1,288 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Persona Bond Forge</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!--Mono Sword-->
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_MonoSword-Persona"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>handle</label>
+								<capacities>
+									<li>Poke</li>
+								</capacities>
+								<power>2</power>
+								<cooldownTime>1.5</cooldownTime>
+								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>edge</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>35</power>
+								<cooldownTime>0.83</cooldownTime>
+								<chanceFactor>1.33</chanceFactor>
+								<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
+								<armorPenetrationSharp>18</armorPenetrationSharp>
+								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>point</label>
+								<capacities>
+									<li>Stab</li>
+								</capacities>
+								<power>16</power>
+								<cooldownTime>0.94</cooldownTime>
+								<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
+								<armorPenetrationSharp>25</armorPenetrationSharp>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_MonoSword-Persona"]/statBases</xpath>
+					<value>
+						<Bulk>4</Bulk>
+						<MeleeCounterParryBonus>0.40</MeleeCounterParryBonus>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_MonoSword-Persona"]</xpath>
+					<value>
+						<equippedStatOffsets>
+							<MeleeCritChance>1.00</MeleeCritChance>
+							<MeleeParryChance>0.40</MeleeParryChance>
+							<MeleeDodgeChance>0.27</MeleeDodgeChance>
+						</equippedStatOffsets>
+					</value>
+				</li>
+
+				<!--Zeus hammer-->
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_Zeushammer-Persona"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>handle</label>
+								<capacities>
+									<li>Poke</li>
+								</capacities>
+								<power>4</power>
+								<cooldownTime>1.78</cooldownTime>
+								<chanceFactor>0.10</chanceFactor>
+								<armorPenetrationBlunt>1.000</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>41</power>
+								<extraMeleeDamages>
+									<li>
+										<def>EMP</def>
+										<amount>5</amount>
+									</li>
+								</extraMeleeDamages>
+								<cooldownTime>2.76</cooldownTime>
+								<armorPenetrationBlunt>157.5</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+								<chanceFactor>0.30</chanceFactor>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_Zeushammer-Persona"]/statBases</xpath>
+					<value>
+						<Bulk>8</Bulk>
+						<MeleeCounterParryBonus>0.40</MeleeCounterParryBonus>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_Zeushammer-Persona"]</xpath>
+					<value>
+						<equippedStatOffsets>
+							<MeleeCritChance>1.50</MeleeCritChance>
+							<MeleeParryChance>0.30</MeleeParryChance>
+							<MeleeDodgeChance>0.30</MeleeDodgeChance>
+						</equippedStatOffsets>
+					</value>
+				</li>
+				<!--Plasma Sword-->
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_PlasmaSword-Persona"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>handle</label>
+								<capacities>
+									<li>Poke</li>
+								</capacities>
+								<power>3</power>
+								<cooldownTime>1.69</cooldownTime>
+								<chanceFactor>0.10</chanceFactor>
+								<armorPenetrationBlunt>0.80</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>edge</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>47</power>
+								<extraMeleeDamages>
+									<li>
+										<def>Flame</def>
+										<amount>5</amount>
+										<chance>0.3</chance>
+									</li>
+								</extraMeleeDamages>
+								<cooldownTime>1.17</cooldownTime>
+								<chanceFactor>0.66</chanceFactor>
+								<armorPenetrationBlunt>4.06</armorPenetrationBlunt>
+								<armorPenetrationSharp>24</armorPenetrationSharp>
+								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>point</label>
+								<capacities>
+									<li>Stab</li>
+								</capacities>
+								<power>25</power>
+								<extraMeleeDamages>
+									<li>
+										<def>Flame</def>
+										<amount>3</amount>
+										<chance>0.2</chance>
+									</li>
+								</extraMeleeDamages>
+								<cooldownTime>1.05</cooldownTime>
+								<armorPenetrationBlunt>2.048</armorPenetrationBlunt>
+								<armorPenetrationSharp>32</armorPenetrationSharp>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_PlasmaSword-Persona"]/statBases</xpath>
+					<value>
+						<Bulk>8.5</Bulk>
+						<MeleeCounterParryBonus>0.80</MeleeCounterParryBonus>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_PlasmaSword-Persona"]</xpath>
+					<value>
+						<equippedStatOffsets>
+							<MeleeCritChance>1.00</MeleeCritChance>
+							<MeleeParryChance>0.60</MeleeParryChance>
+							<MeleeDodgeChance>0.40</MeleeDodgeChance>
+						</equippedStatOffsets>
+					</value>
+				</li>
+
+				<!--Spork-->
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_Spoon-PAP"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>handle</label>
+								<capacities>
+									<li>Poke</li>
+								</capacities>
+								<power>3</power>
+								<cooldownTime>1.5</cooldownTime>
+								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>edge</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>50</power>
+								<cooldownTime>0.83</cooldownTime>
+								<chanceFactor>1.33</chanceFactor>
+								<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
+								<armorPenetrationSharp>18</armorPenetrationSharp>
+								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>point</label>
+								<capacities>
+									<li>Stab</li>
+								</capacities>
+								<power>24</power>
+								<cooldownTime>0.94</cooldownTime>
+								<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
+								<armorPenetrationSharp>25</armorPenetrationSharp>
+							</li>
+						</tools>
+					</value>
+				</li>
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName = "CodZP_MeleeWeapon_Spoon-Persona"]/statBases</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName = "CodZP_MeleeWeapon_Spoon-Persona"]</xpath>
+						<value>
+							<statBases/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_Spoon-Persona"]/statBases</xpath>
+					<value>
+						<Bulk>1</Bulk>
+						<MeleeCounterParryBonus>0.60</MeleeCounterParryBonus>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_Spoon-Persona"]</xpath>
+					<value>
+						<equippedStatOffsets>
+							<MeleeCritChance>1.30</MeleeCritChance>
+							<MeleeParryChance>0.60</MeleeParryChance>
+							<MeleeDodgeChance>0.42</MeleeDodgeChance>
+						</equippedStatOffsets>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName = "CodZP_MeleeWeapon_Spoon-Persona"]/weaponTags</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName = "CodZP_MeleeWeapon_Spoon-Persona"]</xpath>
+						<value>
+							<weaponTags/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_Spoon-Persona"]/weaponTags</xpath>
+					<value>
+						<li>CE_OneHandedWeapon</li>
+					</value>
+				</li>
+			</operations>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Patches/Call of Duty - Zombies Pack/Weapons/Melee.xml b/ModPatches/Call of Duty - Zombies Pack/Patches/Call of Duty - Zombies Pack/Weapons/Melee.xml
new file mode 100644
index 0000000000..f89bf86e8c
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Patches/Call of Duty - Zombies Pack/Weapons/Melee.xml	
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Spoon-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_Spoon"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>0.83</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
+					<armorPenetrationSharp>18</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>0.94</cooldownTime>
+					<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
+					<armorPenetrationSharp>25</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "CodZP_MeleeWeapon_Spoon"]/statBases</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "CodZP_MeleeWeapon_Spoon"]</xpath>
+			<value>
+				<statBases/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_Spoon"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<MeleeCounterParryBonus>0.40</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_Spoon"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.00</MeleeCritChance>
+				<MeleeParryChance>0.40</MeleeParryChance>
+				<MeleeDodgeChance>0.27</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "CodZP_MeleeWeapon_Spoon"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "CodZP_MeleeWeapon_Spoon"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_Spoon"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Patches/Call of Duty - Zombies Pack/Weapons/Melee_Punched.xml b/ModPatches/Call of Duty - Zombies Pack/Patches/Call of Duty - Zombies Pack/Weapons/Melee_Punched.xml
new file mode 100644
index 0000000000..8f3b0f672d
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Patches/Call of Duty - Zombies Pack/Weapons/Melee_Punched.xml	
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Spork-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_Spoon-PAP"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>0.83</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
+					<armorPenetrationSharp>18</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>0.94</cooldownTime>
+					<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
+					<armorPenetrationSharp>25</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "CodZP_MeleeWeapon_Spoon-PAP"]/statBases</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "CodZP_MeleeWeapon_Spoon-PAP"]</xpath>
+			<value>
+				<statBases/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_Spoon-PAP"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<MeleeCounterParryBonus>0.40</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_Spoon-PAP"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.00</MeleeCritChance>
+				<MeleeParryChance>0.40</MeleeParryChance>
+				<MeleeDodgeChance>0.27</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "CodZP_MeleeWeapon_Spoon-PAP"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "CodZP_MeleeWeapon_Spoon-PAP"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_Spoon-PAP"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Patches/Call of Duty - Zombies Pack/Weapons/Melee_Royalty.xml b/ModPatches/Call of Duty - Zombies Pack/Patches/Call of Duty - Zombies Pack/Weapons/Melee_Royalty.xml
new file mode 100644
index 0000000000..a2eda67795
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Patches/Call of Duty - Zombies Pack/Weapons/Melee_Royalty.xml	
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Royalty</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+				<!--===== Start of Patch =====-->
+				<!--Mono Sword-->
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_MonoSword"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>handle</label>
+								<capacities>
+									<li>Poke</li>
+								</capacities>
+								<power>2</power>
+								<cooldownTime>1.5</cooldownTime>
+								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>edge</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>35</power>
+								<cooldownTime>0.83</cooldownTime>
+								<chanceFactor>1.33</chanceFactor>
+								<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
+								<armorPenetrationSharp>18</armorPenetrationSharp>
+								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>point</label>
+								<capacities>
+									<li>Stab</li>
+								</capacities>
+								<power>16</power>
+								<cooldownTime>0.94</cooldownTime>
+								<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
+								<armorPenetrationSharp>25</armorPenetrationSharp>
+							</li>
+						</tools>
+					</value>
+				</li>
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_MonoSword"]/statBases</xpath>
+					<value>
+						<Bulk>4</Bulk>
+						<MeleeCounterParryBonus>0.40</MeleeCounterParryBonus>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_MonoSword"]</xpath>
+					<value>
+						<equippedStatOffsets>
+							<MeleeCritChance>1.00</MeleeCritChance>
+							<MeleeParryChance>0.40</MeleeParryChance>
+							<MeleeDodgeChance>0.27</MeleeDodgeChance>
+						</equippedStatOffsets>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_MonoSword"]/weaponTags</xpath>
+					<value>
+						<li>CE_OneHandedWeapon</li>
+					</value>
+				</li>
+				<!--Zeus hammer-->
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_Zeushammer"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>handle</label>
+								<capacities>
+									<li>Poke</li>
+								</capacities>
+								<power>4</power>
+								<cooldownTime>1.78</cooldownTime>
+								<chanceFactor>0.10</chanceFactor>
+								<armorPenetrationBlunt>1.000</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>41</power>
+								<extraMeleeDamages>
+									<li>
+										<def>EMP</def>
+										<amount>5</amount>
+									</li>
+								</extraMeleeDamages>
+								<cooldownTime>2.76</cooldownTime>
+								<armorPenetrationBlunt>157.5</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+								<chanceFactor>0.30</chanceFactor>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_Zeushammer"]/statBases</xpath>
+					<value>
+						<Bulk>8</Bulk>
+						<MeleeCounterParryBonus>0.40</MeleeCounterParryBonus>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_Zeushammer"]</xpath>
+					<value>
+						<equippedStatOffsets>
+							<MeleeCritChance>1.50</MeleeCritChance>
+							<MeleeParryChance>0.30</MeleeParryChance>
+							<MeleeDodgeChance>0.30</MeleeDodgeChance>
+						</equippedStatOffsets>
+					</value>
+				</li>
+				<!--Plasma Sword-->
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_PlasmaSword"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>handle</label>
+								<capacities>
+									<li>Poke</li>
+								</capacities>
+								<power>3</power>
+								<cooldownTime>1.69</cooldownTime>
+								<chanceFactor>0.10</chanceFactor>
+								<armorPenetrationBlunt>0.80</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>edge</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>47</power>
+								<extraMeleeDamages>
+									<li>
+										<def>Flame</def>
+										<amount>5</amount>
+										<chance>0.3</chance>
+									</li>
+								</extraMeleeDamages>
+								<cooldownTime>1.17</cooldownTime>
+								<chanceFactor>0.66</chanceFactor>
+								<armorPenetrationBlunt>4.06</armorPenetrationBlunt>
+								<armorPenetrationSharp>24</armorPenetrationSharp>
+								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>point</label>
+								<capacities>
+									<li>Stab</li>
+								</capacities>
+								<power>25</power>
+								<extraMeleeDamages>
+									<li>
+										<def>Flame</def>
+										<amount>3</amount>
+										<chance>0.2</chance>
+									</li>
+								</extraMeleeDamages>
+								<cooldownTime>1.05</cooldownTime>
+								<armorPenetrationBlunt>2.048</armorPenetrationBlunt>
+								<armorPenetrationSharp>32</armorPenetrationSharp>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_PlasmaSword"]/statBases</xpath>
+					<value>
+						<Bulk>8.5</Bulk>
+						<MeleeCounterParryBonus>0.80</MeleeCounterParryBonus>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_PlasmaSword"]</xpath>
+					<value>
+						<equippedStatOffsets>
+							<MeleeCritChance>1.00</MeleeCritChance>
+							<MeleeParryChance>0.60</MeleeParryChance>
+							<MeleeDodgeChance>0.40</MeleeDodgeChance>
+						</equippedStatOffsets>
+					</value>
+				</li>
+				<!--===== End of Patch =====-->
+			</operations>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Patches/Call of Duty - Zombies Pack/Weapons/Wonder-Persona.xml b/ModPatches/Call of Duty - Zombies Pack/Patches/Call of Duty - Zombies Pack/Weapons/Wonder-Persona.xml
new file mode 100644
index 0000000000..aa73fe659f
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Patches/Call of Duty - Zombies Pack/Weapons/Wonder-Persona.xml	
@@ -0,0 +1,875 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Persona Bond Forge</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+				<!--Tools-->
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[
+						defName="CodZP_Gun_RayGun-Persona" or
+						defName="CodZP_Gun_RayGunMkThree-Persona" or
+						defName="CODZP_Gun_Zapgun_Red-Persona" or
+						defName="CODZP_Gun_Zapgun_Blue-Persona" or
+						defName="CodZP_Gun_WintersHowl-Persona" or
+						defName="CodZP_Gun_GKZ-Persona"]/tools </xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>grip</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>12</power>
+								<cooldownTime>2</cooldownTime>
+								<chanceFactor>1.5</chanceFactor>
+								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>barrel</label>
+								<capacities>
+									<li>Blunt</li>
+									<li>Poke</li>
+								</capacities>
+								<power>3</power>
+								<cooldownTime>2</cooldownTime>
+								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+							</li>
+						</tools>
+					</value>
+				</li>
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[
+						defName="CodZP_Gun_Blundergat-Persona" or
+						defName="CodZP_Gun_Acidgat-Persona" or
+						defName="CodZP_Gun_Magmagat-Persona" or
+						defName="CodZP_Gun_RayGunMkTwo-Persona" or
+						defName="CodZP_Gun_RayGunMkTwo-V-Persona" or
+						defName="CodZP_Gun_RayGunMkTwo-X-Persona" or
+						defName="CodZP_Gun_RayGunMkTwo-Y-Persona" or
+						defName="CodZP_Gun_RayGunMkTwo-Z-Persona" or
+						defName="CodZP_Gun_Wunderwaffe-Persona" or
+						defName="CodZP_Gun_Wunderwaffe_Scharf-Persona" or
+						defName="CodZP_Gun_Wavegun-Persona"]/tools </xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>stock</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>12</power>
+								<cooldownTime>2</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>12</power>
+								<cooldownTime>2</cooldownTime>
+								<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+							</li>
+						</tools>
+					</value>
+				</li>
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[
+						defName="CodZP_Gun_Thundergun-Persona" or
+						defName="CodZP_Gun_Tundragun-Persona"]/tools </xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>barrel</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>15</power>
+								<cooldownTime>2</cooldownTime>
+								<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+							</li>
+						</tools>
+					</value>
+				</li>
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[
+						defName="CodZP_Gun_Staff-Ice-Persona" or
+						defName="CodZP_Gun_Staff-Wind-Persona" or
+						defName="CodZP_Gun_Staff-Fire-Persona" or
+						defName="CodZP_Gun_Staff-Lightning-Persona"]/tools </xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>Sekhmet's Vigor</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>12</power>
+								<cooldownTime>1</cooldownTime>
+								<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+							</li>
+						</tools>
+					</value>
+				</li>
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="CodZP_Hells_Retriever-Persona"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>Retriever's Cinder</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>60</power>
+								<cooldownTime>9</cooldownTime>
+								<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+							</li>
+						</tools>
+					</value>
+				</li>
+				<!--Wonder Weapons-->
+				<!--Blunders-->
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>CodZP_Gun_Blundergat-Persona</defName>
+					<statBases>
+						<Mass>3.94</Mass>
+						<RangedWeapon_Cooldown>0.23</RangedWeapon_Cooldown>
+						<SightsEfficiency>1.06</SightsEfficiency>
+						<ShotSpread>0.10</ShotSpread>
+						<SwayFactor>1.1</SwayFactor>
+						<Bulk>10.92</Bulk>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_Blundergat_Buck_Punched</defaultProjectile>
+						<warmupTime>0.49</warmupTime>
+						<range>36</range>
+						<soundCast>CodZP_Shot_Blundergat</soundCast>
+						<soundCastTail>GunTail_Medium</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>2</magazineSize>
+						<reloadOneAtATime>true</reloadOneAtATime>
+						<reloadTime>1.6</reloadTime>
+						<ammoSet>AmmoSet_Blundergat_Punched</ammoSet>
+					</AmmoUser>
+					<FireModes/>
+					<weaponTags>
+						<li>CE_AI_BROOM</li>
+					</weaponTags>
+				</li>
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>CodZP_Gun_Acidgat-Persona</defName>
+					<statBases>
+						<Mass>3.94</Mass>
+						<RangedWeapon_Cooldown>0.23</RangedWeapon_Cooldown>
+						<SightsEfficiency>1.06</SightsEfficiency>
+						<ShotSpread>0.10</ShotSpread>
+						<SwayFactor>1.1</SwayFactor>
+						<Bulk>10.92</Bulk>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_Acidgat_Buck_Punched</defaultProjectile>
+						<warmupTime>0.49</warmupTime>
+						<range>36</range>
+						<soundCast>CodZP_Shot_Blundergat</soundCast>
+						<soundCastTail>GunTail_Medium</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>2</magazineSize>
+						<reloadOneAtATime>true</reloadOneAtATime>
+						<reloadTime>1.6</reloadTime>
+						<ammoSet>AmmoSet_Acidgat_Punched</ammoSet>
+					</AmmoUser>
+					<FireModes/>
+					<weaponTags>
+						<li>CE_AI_BROOM</li>
+					</weaponTags>
+				</li>
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>CodZP_Gun_Magmagat-Persona</defName>
+					<statBases>
+						<Mass>3.94</Mass>
+						<RangedWeapon_Cooldown>0.23</RangedWeapon_Cooldown>
+						<SightsEfficiency>1.06</SightsEfficiency>
+						<ShotSpread>0.10</ShotSpread>
+						<SwayFactor>1.1</SwayFactor>
+						<Bulk>10.92</Bulk>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_Magmagat_Buck_Punched</defaultProjectile>
+						<warmupTime>0.49</warmupTime>
+						<range>36</range>
+						<soundCast>CodZP_Shot_Blundergat</soundCast>
+						<soundCastTail>GunTail_Medium</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>2</magazineSize>
+						<reloadOneAtATime>true</reloadOneAtATime>
+						<reloadTime>1.6</reloadTime>
+						<ammoSet>AmmoSet_Magmagat_Punched</ammoSet>
+					</AmmoUser>
+					<FireModes/>
+					<weaponTags>
+						<li>CE_AI_BROOM</li>
+					</weaponTags>
+				</li>
+				<!--Elemental Staffs-->
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>CodZP_Gun_Staff-Ice-Persona</defName>
+					<statBases>
+						<Mass>8</Mass>
+						<RangedWeapon_Cooldown>0.74</RangedWeapon_Cooldown>
+						<SightsEfficiency>1.06</SightsEfficiency>
+						<ShotSpread>0.14</ShotSpread>
+						<SwayFactor>1.5</SwayFactor>
+						<Bulk>13</Bulk>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_Elemental_Staff_Ice_Punched</defaultProjectile>
+						<warmupTime>2.11</warmupTime>
+						<range>29</range>
+						<soundCast>Shot_ChargeBlaster</soundCast>
+						<soundCastTail>GunTail_Medium</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>9</magazineSize>
+						<reloadTime>1.6</reloadTime>
+						<ammoSet>AmmoSet_Elemental_Staff_Ice_Punched</ammoSet>
+					</AmmoUser>
+					<FireModes/>
+				</li>
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>CodZP_Gun_Staff-Wind-Persona</defName>
+					<statBases>
+						<Mass>8</Mass>
+						<RangedWeapon_Cooldown>0.74</RangedWeapon_Cooldown>
+						<SightsEfficiency>1.06</SightsEfficiency>
+						<ShotSpread>0.14</ShotSpread>
+						<SwayFactor>1.5</SwayFactor>
+						<Bulk>13</Bulk>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_Elemental_Staff_Wind_Punched</defaultProjectile>
+						<warmupTime>2.11</warmupTime>
+						<range>29</range>
+						<soundCast>Shot_ChargeBlaster</soundCast>
+						<soundCastTail>GunTail_Medium</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>6</magazineSize>
+						<reloadTime>1.6</reloadTime>
+						<ammoSet>AmmoSet_Elemental_Staff_Wind_Punched</ammoSet>
+					</AmmoUser>
+					<FireModes/>
+				</li>
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>CodZP_Gun_Staff-Fire-Persona</defName>
+					<statBases>
+						<Mass>8</Mass>
+						<RangedWeapon_Cooldown>0.74</RangedWeapon_Cooldown>
+						<SightsEfficiency>1.06</SightsEfficiency>
+						<ShotSpread>0.14</ShotSpread>
+						<SwayFactor>1.5</SwayFactor>
+						<Bulk>13</Bulk>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_Elemental_Staff_Fire_Punched</defaultProjectile>
+						<warmupTime>2.11</warmupTime>
+						<range>29</range>
+						<soundCast>Shot_ChargeBlaster</soundCast>
+						<soundCastTail>GunTail_Medium</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>9</magazineSize>
+						<reloadTime>1.6</reloadTime>
+						<ammoSet>AmmoSet_Elemental_Staff_Fire_Punched</ammoSet>
+					</AmmoUser>
+					<FireModes/>
+				</li>
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>CodZP_Gun_Staff-Lightning-Persona</defName>
+					<statBases>
+						<Mass>8</Mass>
+						<RangedWeapon_Cooldown>0.74</RangedWeapon_Cooldown>
+						<SightsEfficiency>1.06</SightsEfficiency>
+						<ShotSpread>0.14</ShotSpread>
+						<SwayFactor>1.5</SwayFactor>
+						<Bulk>13</Bulk>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_Elemental_Staff_Lightning_Punched</defaultProjectile>
+						<warmupTime>2.11</warmupTime>
+						<range>29</range>
+						<soundCast>Shot_ChargeBlaster</soundCast>
+						<soundCastTail>GunTail_Medium</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>18</magazineSize>
+						<reloadTime>1.6</reloadTime>
+						<ammoSet>AmmoSet_Elemental_Staff_Lightning_Punched</ammoSet>
+					</AmmoUser>
+					<FireModes/>
+				</li>
+				<!--Hells-->
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>CodZP_Hells_Retriever-Persona</defName>
+					<statBases>
+						<Mass>2</Mass>
+						<RangedWeapon_Cooldown>8</RangedWeapon_Cooldown>
+						<SightsEfficiency>0.66</SightsEfficiency>
+						<ShotSpread>0.14</ShotSpread>
+						<SwayFactor>0.6</SwayFactor>
+						<Bulk>0.5</Bulk>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_Hells_Retriever_Punched</defaultProjectile>
+						<warmupTime>0.16</warmupTime>
+						<range>66</range>
+						<soundCast>CodZP_Shot_Hells</soundCast>
+						<soundCastTail>GunTail_Medium</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<FireModes/>
+					<weaponTags>
+						<li>CE_OneHandedWeapon</li>
+						<li>CE_AI_Pistol</li>
+					</weaponTags>
+				</li>
+				<!--Ray Guns-->
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>CodZP_Gun_RayGun-Persona</defName>
+					<statBases>
+						<Mass>1.36</Mass>
+						<RangedWeapon_Cooldown>0.24</RangedWeapon_Cooldown>
+						<SightsEfficiency>0.66</SightsEfficiency>
+						<ShotSpread>0.12</ShotSpread>
+						<SwayFactor>1.2</SwayFactor>
+						<Bulk>3</Bulk>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_Raygun_Punched</defaultProjectile>
+						<warmupTime>0.49</warmupTime>
+						<range>79</range>
+						<soundCast>CodZP_Shot_Raygun</soundCast>
+						<soundCastTail>GunTail_Medium</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>40</magazineSize>
+						<reloadTime>1.92</reloadTime>
+						<ammoSet>AmmoSet_Raygun_Punched</ammoSet>
+					</AmmoUser>
+					<FireModes/>
+					<weaponTags>
+						<li>CE_OneHandedWeapon</li>
+						<li>CE_AI_Pistol</li>
+					</weaponTags>
+				</li>
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>CodZP_Gun_RayGunMkTwo-Persona</defName>
+					<statBases>
+						<Mass>3.45</Mass>
+						<RangedWeapon_Cooldown>0.23</RangedWeapon_Cooldown>
+						<SightsEfficiency>1.45</SightsEfficiency>
+						<ShotSpread>0.08</ShotSpread>
+						<SwayFactor>0.9</SwayFactor>
+						<Bulk>10.03</Bulk>
+					</statBases>
+					<Properties>
+						<recoilAmount>1.0</recoilAmount>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_Raygun_two_Punched</defaultProjectile>
+						<warmupTime>0.81</warmupTime>
+						<range>79</range>
+						<soundCast>CodZP_Shot_Raygun2</soundCast>
+						<soundCastTail>GunTail_Medium</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+						<burstShotCount>3</burstShotCount>
+						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>42</magazineSize>
+						<reloadTime>1.91</reloadTime>
+						<ammoSet>AmmoSet_Raygun_two_Punched</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aimedBurstShotCount>3</aimedBurstShotCount>
+					</FireModes>
+					<weaponTags>
+					</weaponTags>
+				</li>
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>CodZP_Gun_RayGunMkThree-Persona</defName>
+					<statBases>
+						<Mass>1.36</Mass>
+						<RangedWeapon_Cooldown>0.23</RangedWeapon_Cooldown>
+						<SightsEfficiency>0.66</SightsEfficiency>
+						<ShotSpread>0.1</ShotSpread>
+						<SwayFactor>1.7</SwayFactor>
+						<Bulk>3</Bulk>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_Raygun_three_Punched</defaultProjectile>
+						<warmupTime>0.49</warmupTime>
+						<range>108</range>
+						<soundCast>CodZP_Shot_Raygun</soundCast>
+						<soundCastTail>GunTail_Medium</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>30</magazineSize>
+						<reloadTime>1.92</reloadTime>
+						<ammoSet>AmmoSet_Raygun_three_Punched</ammoSet>
+					</AmmoUser>
+					<FireModes/>
+					<weaponTags>
+						<li>CE_OneHandedWeapon</li>
+						<li>CE_AI_Pistol</li>
+					</weaponTags>
+				</li>
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>CodZP_Gun_GKZ-Persona</defName>
+					<statBases>
+						<Mass>2.67</Mass>
+						<RangedWeapon_Cooldown>0.61</RangedWeapon_Cooldown>
+						<SightsEfficiency>0.66</SightsEfficiency>
+						<ShotSpread>0.14</ShotSpread>
+						<SwayFactor>1.6</SwayFactor>
+						<Bulk>4</Bulk>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_Raygun_three_GKZ_Punched</defaultProjectile>
+						<warmupTime>0.49</warmupTime>
+						<range>48</range>
+						<soundCast>CodZP_Shot_Raygun</soundCast>
+						<soundCastTail>GunTail_Medium</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>5</magazineSize>
+						<reloadTime>1.92</reloadTime>
+						<ammoSet>AmmoSet_Raygun_three_GKZ_Punched</ammoSet>
+					</AmmoUser>
+					<FireModes/>
+					<weaponTags>
+						<li>CE_OneHandedWeapon</li>
+						<li>CE_AI_Pistol</li>
+					</weaponTags>
+				</li>
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>CodZP_Gun_RayGunMkTwo-V-Persona</defName>
+					<statBases>
+						<Mass>3.45</Mass>
+						<RangedWeapon_Cooldown>7</RangedWeapon_Cooldown><!--Would normally be 0.22-->
+						<SightsEfficiency>1.45</SightsEfficiency>
+						<ShotSpread>0.08</ShotSpread>
+						<SwayFactor>0.9</SwayFactor>
+						<Bulk>10.03</Bulk>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_Raygun_two_v_Punched</defaultProjectile>
+						<warmupTime>0.81</warmupTime>
+						<range>79</range>
+						<soundCast>CodZP_Shot_Raygun2</soundCast>
+						<soundCastTail>GunTail_Medium</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+						<burstShotCount>3</burstShotCount>
+					</Properties><!--
+                    <AmmoUser>
+                        <magazineSize>150</magazineSize>
+                        <reloadTime>5.76</reloadTime>
+                        <AmmoSet>SlowPassiveRefilling</AmmoSet>
+                    </AmmoUser>-->
+					<FireModes>
+						<aimedBurstShotCount>2</aimedBurstShotCount>
+					</FireModes>
+					<weaponTags>
+						<li/>
+					</weaponTags>
+				</li>
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>CodZP_Gun_RayGunMkTwo-X-Persona</defName>
+					<statBases>
+						<Mass>3.45</Mass>
+						<RangedWeapon_Cooldown>0.14</RangedWeapon_Cooldown>
+						<SightsEfficiency>1.45</SightsEfficiency>
+						<ShotSpread>0.08</ShotSpread>
+						<SwayFactor>0.9</SwayFactor>
+						<Bulk>10.03</Bulk>
+					</statBases>
+					<Properties>
+						<recoilAmount>1.0</recoilAmount>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_Raygun_two_x_Punched</defaultProjectile>
+						<warmupTime>0.81</warmupTime>
+						<range>79</range>
+						<soundCast>CodZP_Shot_Raygun2</soundCast>
+						<soundCastTail>GunTail_Medium</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>66</magazineSize>
+						<reloadTime>1.91</reloadTime>
+						<ammoSet>AmmoSet_Raygun_two_x_Punched</ammoSet>
+					</AmmoUser>
+					<FireModes/>
+					<weaponTags>
+						<li>CE_AI_AR</li>
+					</weaponTags>
+				</li>
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>CodZP_Gun_RayGunMkTwo-Y-Persona</defName>
+					<statBases>
+						<Mass>3.45</Mass>
+						<RangedWeapon_Cooldown>0.61</RangedWeapon_Cooldown>
+						<SightsEfficiency>1.45</SightsEfficiency>
+						<ShotSpread>0.13</ShotSpread>
+						<SwayFactor>0.9</SwayFactor>
+						<Bulk>10.03</Bulk>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_Raygun_two_y_Punched</defaultProjectile>
+						<warmupTime>0.81</warmupTime>
+						<range>58</range>
+						<soundCast>CodZP_Shot_Raygun2</soundCast>
+						<soundCastTail>GunTail_Medium</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>6</magazineSize>
+						<reloadTime>1.91</reloadTime>
+						<ammoSet>AmmoSet_Raygun_two_y_Punched</ammoSet>
+					</AmmoUser>
+					<FireModes/>
+					<weaponTags>
+						<li/>
+					</weaponTags>
+				</li>
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>CodZP_Gun_RayGunMkTwo-Z-Persona</defName>
+					<statBases>
+						<Mass>3.45</Mass>
+						<RangedWeapon_Cooldown>0.61</RangedWeapon_Cooldown>
+						<SightsEfficiency>1.45</SightsEfficiency>
+						<ShotSpread>0.12</ShotSpread>
+						<SwayFactor>0.9</SwayFactor>
+						<Bulk>10.03</Bulk>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_Raygun_two_z_Punched</defaultProjectile>
+						<warmupTime>0.81</warmupTime>
+						<range>58</range>
+						<soundCast>CodZP_Shot_Raygun2</soundCast>
+						<soundCastTail>GunTail_Medium</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>18</magazineSize>
+						<reloadTime>1.91</reloadTime>
+						<ammoSet>AmmoSet_Raygun_two_z_Punched</ammoSet>
+					</AmmoUser>
+					<FireModes/>
+					<weaponTags>
+						<li>CE_AI_BROOM</li>
+					</weaponTags>
+				</li>
+				<!--Thunder Guns-->
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>CodZP_Gun_Thundergun-Persona</defName>
+					<statBases>
+						<Mass>10.7</Mass>
+						<RangedWeapon_Cooldown>0.24</RangedWeapon_Cooldown>
+						<SightsEfficiency>1.32</SightsEfficiency>
+						<ShotSpread>0.09</ShotSpread>
+						<SwayFactor>1.7</SwayFactor>
+						<Bulk>13</Bulk>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_Thunder_Punched</defaultProjectile>
+						<warmupTime>1.7</warmupTime>
+						<range>17</range>
+						<soundCast>CodZP_Shot_Thundergun</soundCast>
+						<soundCastTail>GunTail_Heavy</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>4</magazineSize>
+						<reloadTime>1.28</reloadTime>
+						<ammoSet>AmmoSet_Thunder_Punched</ammoSet>
+					</AmmoUser>
+					<FireModes/>
+					<weaponTags>
+						<li/>
+					</weaponTags>
+				</li>
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>CodZP_Gun_Tundragun-Persona</defName>
+					<statBases>
+						<Mass>10.7</Mass>
+						<RangedWeapon_Cooldown>0.24</RangedWeapon_Cooldown>
+						<SightsEfficiency>1.32</SightsEfficiency>
+						<ShotSpread>0.09</ShotSpread>
+						<SwayFactor>1.7</SwayFactor>
+						<Bulk>13</Bulk>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_Tundra_Punched</defaultProjectile>
+						<warmupTime>1.7</warmupTime>
+						<range>17</range>
+						<soundCast>CodZP_Shot_Thundergun</soundCast>
+						<soundCastTail>GunTail_Heavy</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>4</magazineSize>
+						<reloadTime>1.28</reloadTime>
+						<ammoSet>AmmoSet_Tundra_Punched</ammoSet>
+					</AmmoUser>
+					<FireModes/>
+					<weaponTags>
+						<li/>
+					</weaponTags>
+				</li>
+				<!--Winters-->
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>CodZP_Gun_WintersHowl-Persona</defName>
+					<statBases>
+						<Mass>1.78</Mass>
+						<RangedWeapon_Cooldown>0.23</RangedWeapon_Cooldown>
+						<SightsEfficiency>0.93</SightsEfficiency>
+						<ShotSpread>0.13</ShotSpread>
+						<SwayFactor>1.1</SwayFactor>
+						<Bulk>3</Bulk>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_Winters_Cryo_Punched</defaultProjectile>
+						<warmupTime>0.49</warmupTime>
+						<range>73</range>
+						<soundCast>CodZP_Shot_Wintershowl</soundCast>
+						<soundCastTail>GunTail_Medium</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>9</magazineSize>
+						<reloadTime>2.43</reloadTime>
+						<ammoSet>AmmoSet_Winters_Punched</ammoSet>
+					</AmmoUser>
+					<FireModes/>
+					<weaponTags>
+						<li>CE_OneHandedWeapon</li>
+						<li>CE_AI_Pistol</li>
+					</weaponTags>
+				</li>
+				<!--Wunderwaffes-->
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>CodZP_Gun_Wunderwaffe-Persona</defName>
+					<statBases>
+						<Mass>4.3</Mass>
+						<RangedWeapon_Cooldown>0.23</RangedWeapon_Cooldown>
+						<SightsEfficiency>1.32</SightsEfficiency>
+						<ShotSpread>0.04</ShotSpread>
+						<SwayFactor>1.2</SwayFactor>
+						<Bulk>13</Bulk>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_Wunder_Punched</defaultProjectile>
+						<warmupTime>0.89</warmupTime>
+						<range>73</range>
+						<soundCast>CodZP_Shot_Wunderwaffe</soundCast>
+						<soundCastTail>GunTail_Medium</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>6</magazineSize>
+						<reloadTime>3.97</reloadTime>
+						<ammoSet>AmmoSet_Wunder_Punched</ammoSet>
+					</AmmoUser>
+					<FireModes/>
+					<weaponTags>
+						<li/>
+					</weaponTags>
+				</li>
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>CodZP_Gun_Wunderwaffe_Scharf-Persona</defName>
+					<statBases>
+						<Mass>4.3</Mass>
+						<RangedWeapon_Cooldown>0.61</RangedWeapon_Cooldown>
+						<SightsEfficiency>1.32</SightsEfficiency>
+						<ShotSpread>0.04</ShotSpread>
+						<SwayFactor>1.2</SwayFactor>
+						<Bulk>13</Bulk>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_Wunder_s_Punched</defaultProjectile>
+						<warmupTime>0.89</warmupTime>
+						<range>73</range>
+						<soundCast>CodZP_Shot_Wunderwaffe</soundCast>
+						<soundCastTail>GunTail_Medium</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>8</magazineSize>
+						<reloadTime>3.97</reloadTime>
+						<ammoSet>AmmoSet_Wunder_s_Punched</ammoSet>
+					</AmmoUser>
+					<FireModes/>
+					<weaponTags>
+						<li/>
+					</weaponTags>
+				</li>
+				<!--Zap Guns-->
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>CODZP_Gun_Zapgun_Red-Persona</defName>
+					<statBases>
+						<Mass>2.63</Mass>
+						<RangedWeapon_Cooldown>0.23</RangedWeapon_Cooldown>
+						<SightsEfficiency>0.66</SightsEfficiency>
+						<ShotSpread>0.14</ShotSpread>
+						<SwayFactor>1.4</SwayFactor>
+						<Bulk>3</Bulk>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_Zapgun_Punched</defaultProjectile>
+						<warmupTime>0.49</warmupTime>
+						<range>69</range>
+						<soundCast>CodZP_Shot_Zapgun</soundCast>
+						<soundCastTail>GunTail_Medium</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>12</magazineSize>
+						<reloadTime>1.6</reloadTime>
+						<ammoSet>AmmoSet_Zapgun_Punched</ammoSet>
+					</AmmoUser>
+					<FireModes/>
+					<weaponTags>
+						<li>CE_OneHandedWeapon</li>
+						<li>CE_AI_Pistol</li>
+					</weaponTags>
+				</li>
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>CODZP_Gun_Zapgun_Blue-Persona</defName>
+					<statBases>
+						<Mass>2.63</Mass>
+						<RangedWeapon_Cooldown>0.23</RangedWeapon_Cooldown>
+						<SightsEfficiency>0.66</SightsEfficiency>
+						<ShotSpread>0.14</ShotSpread>
+						<SwayFactor>1.4</SwayFactor>
+						<Bulk>3</Bulk>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_Zapgun_Punched</defaultProjectile>
+						<warmupTime>0.49</warmupTime>
+						<range>69</range>
+						<soundCast>CodZP_Shot_Zapgun</soundCast>
+						<soundCastTail>GunTail_Medium</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>12</magazineSize>
+						<reloadTime>1.6</reloadTime>
+						<ammoSet>AmmoSet_Zapgun_Punched</ammoSet>
+					</AmmoUser>
+					<FireModes/>
+					<weaponTags>
+						<li>CE_OneHandedWeapon</li>
+						<li>CE_AI_Pistol</li>
+					</weaponTags>
+				</li>
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>CodZP_Gun_Wavegun-Persona</defName>
+					<statBases>
+						<Mass>5.26</Mass>
+						<RangedWeapon_Cooldown>0.23</RangedWeapon_Cooldown>
+						<SightsEfficiency>1.45</SightsEfficiency>
+						<ShotSpread>0.14</ShotSpread>
+						<SwayFactor>0.8</SwayFactor>
+						<Bulk>6</Bulk>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_Wavegun_Punched</defaultProjectile>
+						<warmupTime>0.41</warmupTime>
+						<range>45</range>
+						<soundCast>CodZP_Shot_Zapgun</soundCast>
+						<soundCastTail>GunTail_Medium</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>4</magazineSize>
+						<reloadTime>1.92</reloadTime>
+						<ammoSet>AmmoSet_Wavegun_Punched</ammoSet>
+					</AmmoUser>
+					<FireModes/>
+					<weaponTags>
+						<li/>
+					</weaponTags>
+				</li>
+			</operations>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Patches/Call of Duty - Zombies Pack/Weapons/Wonder.xml b/ModPatches/Call of Duty - Zombies Pack/Patches/Call of Duty - Zombies Pack/Weapons/Wonder.xml
new file mode 100644
index 0000000000..4c60aee625
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Patches/Call of Duty - Zombies Pack/Weapons/Wonder.xml	
@@ -0,0 +1,866 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Tools -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="CodZP_Gun_RayGun" or
+			defName="CodZP_Gun_RayGunMkThree" or
+			defName="CODZP_Gun_Zapgun_Red" or
+			defName="CODZP_Gun_Zapgun_Blue" or
+			defName="CodZP_Gun_WintersHowl" or
+			defName="CodZP_Gun_GKZ"]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="CodZP_Gun_Blundergat" or
+			defName="CodZP_Gun_Acidgat" or
+			defName="CodZP_Gun_Magmagat" or
+			defName="CodZP_Gun_RayGunMkTwo" or
+			defName="CodZP_Gun_RayGunMkTwo-V" or
+			defName="CodZP_Gun_RayGunMkTwo-X" or
+			defName="CodZP_Gun_RayGunMkTwo-Y" or
+			defName="CodZP_Gun_RayGunMkTwo-Z" or
+			defName="CodZP_Gun_Wunderwaffe" or
+			defName="CodZP_Gun_Wunderwaffe_Scharf" or
+			defName="CodZP_Gun_Wavegun"]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</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>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="CodZP_Gun_Thundergun" or
+			defName="CodZP_Gun_Tundragun"]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="CodZP_Gun_Staff-Ice" or
+			defName="CodZP_Gun_Staff-Wind" or
+			defName="CodZP_Gun_Staff-Fire" or
+			defName="CodZP_Gun_Staff-Lightning"]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Sekhmet's Vigor</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1</cooldownTime>
+					<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CodZP_Hells_Retriever"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Retriever's Cinder</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>60</power>
+					<cooldownTime>9</cooldownTime>
+					<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!--Wonder Weapons-->
+	<!--Blunders-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_Blundergat</defName>
+		<statBases>
+			<Mass>3.94</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.49</SwayFactor>
+			<Bulk>10.92</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Blundergat_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>25</range>
+			<soundCast>CodZP_Shot_Blundergat</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>2.5</reloadTime>
+			<ammoSet>AmmoSet_Blundergat</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_Acidgat</defName>
+		<statBases>
+			<Mass>3.94</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.49</SwayFactor>
+			<Bulk>10.92</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Acidgat_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>25</range>
+			<soundCast>CodZP_Shot_Blundergat</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>2.5</reloadTime>
+			<ammoSet>AmmoSet_Acidgat</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_Magmagat</defName>
+		<statBases>
+			<Mass>3.94</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.49</SwayFactor>
+			<Bulk>10.92</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Magmagat_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>25</range>
+			<soundCast>CodZP_Shot_Blundergat</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>2.5</reloadTime>
+			<ammoSet>AmmoSet_Magmagat</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+	<!--Elemental Staffs-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_Staff-Ice</defName>
+		<statBases>
+			<Mass>8</Mass>
+			<RangedWeapon_Cooldown>1.15</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>2.1</SwayFactor>
+			<Bulk>13</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Elemental_Staff_Ice</defaultProjectile>
+			<warmupTime>2.6</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_ChargeBlaster</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>2.5</reloadTime>
+			<ammoSet>AmmoSet_Elemental_Staff_Ice</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_Staff-Wind</defName>
+		<statBases>
+			<Mass>8</Mass>
+			<RangedWeapon_Cooldown>1.15</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>2.1</SwayFactor>
+			<Bulk>13</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Elemental_Staff_Wind</defaultProjectile>
+			<warmupTime>2.6</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_ChargeBlaster</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>3</magazineSize>
+			<reloadTime>2.5</reloadTime>
+			<ammoSet>AmmoSet_Elemental_Staff_Wind</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_Staff-Fire</defName>
+		<statBases>
+			<Mass>8</Mass>
+			<RangedWeapon_Cooldown>1.15</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>2.1</SwayFactor>
+			<Bulk>13</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Elemental_Staff_Fire</defaultProjectile>
+			<warmupTime>2.6</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_ChargeBlaster</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>9</magazineSize>
+			<reloadTime>2.5</reloadTime>
+			<ammoSet>AmmoSet_Elemental_Staff_Fire</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_Staff-Lightning</defName>
+		<statBases>
+			<Mass>8</Mass>
+			<RangedWeapon_Cooldown>1.15</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>2.1</SwayFactor>
+			<Bulk>13</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Elemental_Staff_Lightning</defaultProjectile>
+			<warmupTime>2.6</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_ChargeBlaster</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>9</magazineSize>
+			<reloadTime>2.5</reloadTime>
+			<ammoSet>AmmoSet_Elemental_Staff_Lightning</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+	</Operation>
+	<!--Hells-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Hells_Retriever</defName>
+		<statBases>
+			<Mass>2</Mass>
+			<RangedWeapon_Cooldown>10</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>0.83</SwayFactor>
+			<Bulk>0.5</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Hells_Retriever</defaultProjectile>
+			<warmupTime>0.2</warmupTime>
+			<range>46</range>
+			<soundCast>CodZP_Shot_Hells</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+	<!--Ray Guns-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_RayGun</defName>
+		<statBases>
+			<Mass>1.36</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.67</SwayFactor>
+			<Bulk>3</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Raygun</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>55</range>
+			<soundCast>CodZP_Shot_Raygun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_Raygun</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_RayGunMkTwo</defName>
+		<statBases>
+			<Mass>3.45</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.3</SwayFactor>
+			<Bulk>10.03</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.41</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Raygun_two</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>55</range>
+			<soundCast>CodZP_Shot_Raygun2</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>21</magazineSize>
+			<reloadTime>2.98</reloadTime>
+			<ammoSet>AmmoSet_Raygun_two</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+		</weaponTags>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_RayGunMkThree</defName>
+		<statBases>
+			<Mass>1.36</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>2.33</SwayFactor>
+			<Bulk>3</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Raygun_three</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>75</range>
+			<soundCast>CodZP_Shot_Raygun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_Raygun_three</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_GKZ</defName>
+		<statBases>
+			<Mass>2.67</Mass>
+			<RangedWeapon_Cooldown>0.96</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>2.22</SwayFactor>
+			<Bulk>4</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Raygun_three_GKZ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>29</range>
+			<soundCast>CodZP_Shot_Raygun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>3</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_Raygun_three_GKZ</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_RayGunMkTwo-V</defName>
+		<statBases>
+			<Mass>3.45</Mass>
+			<RangedWeapon_Cooldown>9</RangedWeapon_Cooldown><!--Would normally be 0.35-->
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.3</SwayFactor>
+			<Bulk>10.03</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Raygun_two_v</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>55</range>
+			<soundCast>CodZP_Shot_Raygun2</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<burstShotCount>3</burstShotCount>
+		</Properties><!--
+                    <AmmoUser>
+                        <magazineSize>100</magazineSize>
+                        <reloadTime>9</reloadTime>
+                        <AmmoSet>SlowPassiveRefilling</AmmoSet>
+                    </AmmoUser>-->
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li/>
+		</weaponTags>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_RayGunMkTwo-X</defName>
+		<statBases>
+			<Mass>3.45</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.3</SwayFactor>
+			<Bulk>10.03</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.41</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Raygun_two_x</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>55</range>
+			<soundCast>CodZP_Shot_Raygun2</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>33</magazineSize>
+			<reloadTime>2.98</reloadTime>
+			<ammoSet>AmmoSet_Raygun_two_x</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_AI_AR</li>
+		</weaponTags>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_RayGunMkTwo-Y</defName>
+		<statBases>
+			<Mass>3.45</Mass>
+			<RangedWeapon_Cooldown>0.96</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>1.3</SwayFactor>
+			<Bulk>10.03</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Raygun_two_y</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>40</range>
+			<soundCast>CodZP_Shot_Raygun2</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>3</magazineSize>
+			<reloadTime>2.98</reloadTime>
+			<ammoSet>AmmoSet_Raygun_two_y</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li/>
+		</weaponTags>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_RayGunMkTwo-Z</defName>
+		<statBases>
+			<Mass>3.45</Mass>
+			<RangedWeapon_Cooldown>0.96</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.3</SwayFactor>
+			<Bulk>10.03</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Raygun_two_z</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>40</range>
+			<soundCast>CodZP_Shot_Raygun2</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>9</magazineSize>
+			<reloadTime>2.98</reloadTime>
+			<ammoSet>AmmoSet_Raygun_two_z</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+	<!--Thunder Guns-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_Thundergun</defName>
+		<statBases>
+			<Mass>10.7</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>2.37</SwayFactor>
+			<Bulk>13</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Thunder</defaultProjectile>
+			<warmupTime>2.1</warmupTime>
+			<range>12</range>
+			<soundCast>CodZP_Shot_Thundergun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>2</magazineSize>
+			<reloadTime>2</reloadTime>
+			<ammoSet>AmmoSet_Thunder</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li/>
+		</weaponTags>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_Tundragun</defName>
+		<statBases>
+			<Mass>10.7</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>2.37</SwayFactor>
+			<Bulk>13</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Tundra</defaultProjectile>
+			<warmupTime>2.1</warmupTime>
+			<range>12</range>
+			<soundCast>CodZP_Shot_Thundergun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>2</magazineSize>
+			<reloadTime>2</reloadTime>
+			<ammoSet>AmmoSet_Tundra</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li/>
+		</weaponTags>
+	</Operation>
+	<!--Winters-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_WintersHowl</defName>
+		<statBases>
+			<Mass>1.78</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>1.59</SwayFactor>
+			<Bulk>3</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Winters_Cryo</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>51</range>
+			<soundCast>CodZP_Shot_Wintershowl</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>3.8</reloadTime>
+			<ammoSet>AmmoSet_Winters</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+	<!--Wunderwaffes-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_Wunderwaffe</defName>
+		<statBases>
+			<Mass>4.3</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.73</SwayFactor>
+			<Bulk>13</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Wunder</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>51</range>
+			<soundCast>CodZP_Shot_Wunderwaffe</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>3</magazineSize>
+			<reloadTime>6.2</reloadTime>
+			<ammoSet>AmmoSet_Wunder</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li/>
+		</weaponTags>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_Wunderwaffe_Scharf</defName>
+		<statBases>
+			<Mass>4.3</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>2.73</SwayFactor>
+			<Bulk>13</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Wunder_s</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>51</range>
+			<soundCast>CodZP_Shot_Wunderwaffe</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>6.2</reloadTime>
+			<ammoSet>AmmoSet_Wunder_s</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li/>
+		</weaponTags>
+	</Operation>
+	<!--Zap Guns-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CODZP_Gun_Zapgun_Red</defName>
+		<statBases>
+			<Mass>2.63</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.88</SwayFactor>
+			<Bulk>3</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Zapgun_red</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>48</range>
+			<soundCast>CodZP_Shot_Zapgun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>2.5</reloadTime>
+			<ammoSet>AmmoSet_Zapgun_red</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CODZP_Gun_Zapgun_Blue</defName>
+		<statBases>
+			<Mass>2.63</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.88</SwayFactor>
+			<Bulk>3</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Zapgun_blue</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>48</range>
+			<soundCast>CodZP_Shot_Zapgun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>2.5</reloadTime>
+			<ammoSet>AmmoSet_Zapgun_blue</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_Wavegun</defName>
+		<statBases>
+			<Mass>5.26</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.13</SwayFactor>
+			<Bulk>6</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Wavegun</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>31</range>
+			<soundCast>CodZP_Shot_Zapgun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>2</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_Wavegun</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li/>
+		</weaponTags>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Call of Duty - Zombies Pack/Patches/Call of Duty - Zombies Pack/Weapons/Wonder_Punched.xml b/ModPatches/Call of Duty - Zombies Pack/Patches/Call of Duty - Zombies Pack/Weapons/Wonder_Punched.xml
new file mode 100644
index 0000000000..eefb7bb10c
--- /dev/null
+++ b/ModPatches/Call of Duty - Zombies Pack/Patches/Call of Duty - Zombies Pack/Weapons/Wonder_Punched.xml	
@@ -0,0 +1,866 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Tools-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="CodZP_Gun_RayGun-PAP" or
+			defName="CodZP_Gun_RayGunMkThree-PAP" or
+			defName="CODZP_Gun_Zapgun_Red-PAP" or
+			defName="CODZP_Gun_Zapgun_Blue-PAP" or
+			defName="CodZP_Gun_WintersHowl-PAP" or
+			defName="CodZP_Gun_GKZ-PAP"]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="CodZP_Gun_Blundergat-PAP" or
+			defName="CodZP_Gun_Acidgat-PAP" or
+			defName="CodZP_Gun_Magmagat-PAP" or
+			defName="CodZP_Gun_RayGunMkTwo-PAP" or
+			defName="CodZP_Gun_RayGunMkTwo-V-PAP" or
+			defName="CodZP_Gun_RayGunMkTwo-X-PAP" or
+			defName="CodZP_Gun_RayGunMkTwo-Y-PAP" or
+			defName="CodZP_Gun_RayGunMkTwo-Z-PAP" or
+			defName="CodZP_Gun_Wunderwaffe-PAP" or
+			defName="CodZP_Gun_Wunderwaffe_Scharf-PAP" or
+			defName="CodZP_Gun_Wavegun-PAP"]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</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>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="CodZP_Gun_Thundergun-PAP" or
+			defName="CodZP_Gun_Tundragun-PAP"]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="CodZP_Gun_Staff-Ice-PAP" or
+			defName="CodZP_Gun_Staff-Wind-PAP" or
+			defName="CodZP_Gun_Staff-Fire-PAP" or
+			defName="CodZP_Gun_Staff-Lightning-PAP"]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Sekhmet's Vigor</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1</cooldownTime>
+					<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CodZP_Hells_Retriever-PAP"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Retriever's Cinder</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>60</power>
+					<cooldownTime>9</cooldownTime>
+					<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!--Wonder Weapons-->
+	<!--Blunders-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_Blundergat-PAP</defName>
+		<statBases>
+			<Mass>3.94</Mass>
+			<RangedWeapon_Cooldown>0.29</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.92</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>10.92</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Blundergat_Buck_Punched</defaultProjectile>
+			<warmupTime>0.54</warmupTime>
+			<range>30</range>
+			<soundCast>CodZP_Shot_Blundergat</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>2</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>2</reloadTime>
+			<ammoSet>AmmoSet_Blundergat_Punched</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_Acidgat-PAP</defName>
+		<statBases>
+			<Mass>3.94</Mass>
+			<RangedWeapon_Cooldown>0.29</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.92</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>10.92</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Acidgat_Buck_Punched</defaultProjectile>
+			<warmupTime>0.54</warmupTime>
+			<range>30</range>
+			<soundCast>CodZP_Shot_Blundergat</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>2</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>2</reloadTime>
+			<ammoSet>AmmoSet_Acidgat_Punched</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_Magmagat-PAP</defName>
+		<statBases>
+			<Mass>3.94</Mass>
+			<RangedWeapon_Cooldown>0.29</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.92</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>10.92</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Magmagat_Buck_Punched</defaultProjectile>
+			<warmupTime>0.54</warmupTime>
+			<range>30</range>
+			<soundCast>CodZP_Shot_Blundergat</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>2</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>2</reloadTime>
+			<ammoSet>AmmoSet_Magmagat_Punched</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+	<!--Elemental Staffs-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_Staff-Ice-PAP</defName>
+		<statBases>
+			<Mass>8</Mass>
+			<RangedWeapon_Cooldown>0.92</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.92</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.79</SwayFactor>
+			<Bulk>13</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Elemental_Staff_Ice_Punched</defaultProjectile>
+			<warmupTime>2.34</warmupTime>
+			<range>24</range>
+			<soundCast>Shot_ChargeBlaster</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>9</magazineSize>
+			<reloadTime>2</reloadTime>
+			<ammoSet>AmmoSet_Elemental_Staff_Ice_Punched</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_Staff-Wind-PAP</defName>
+		<statBases>
+			<Mass>8</Mass>
+			<RangedWeapon_Cooldown>0.92</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.92</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.79</SwayFactor>
+			<Bulk>13</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Elemental_Staff_Wind_Punched</defaultProjectile>
+			<warmupTime>2.34</warmupTime>
+			<range>24</range>
+			<soundCast>Shot_ChargeBlaster</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>2</reloadTime>
+			<ammoSet>AmmoSet_Elemental_Staff_Wind_Punched</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_Staff-Fire-PAP</defName>
+		<statBases>
+			<Mass>8</Mass>
+			<RangedWeapon_Cooldown>0.92</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.92</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.79</SwayFactor>
+			<Bulk>13</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Elemental_Staff_Fire_Punched</defaultProjectile>
+			<warmupTime>2.34</warmupTime>
+			<range>24</range>
+			<soundCast>Shot_ChargeBlaster</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>9</magazineSize>
+			<reloadTime>2</reloadTime>
+			<ammoSet>AmmoSet_Elemental_Staff_Fire_Punched</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_Staff-Lightning-PAP</defName>
+		<statBases>
+			<Mass>8</Mass>
+			<RangedWeapon_Cooldown>0.92</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.92</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.79</SwayFactor>
+			<Bulk>13</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Elemental_Staff_Lightning_Punched</defaultProjectile>
+			<warmupTime>2.34</warmupTime>
+			<range>24</range>
+			<soundCast>Shot_ChargeBlaster</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>18</magazineSize>
+			<reloadTime>2</reloadTime>
+			<ammoSet>AmmoSet_Elemental_Staff_Lightning_Punched</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+	</Operation>
+	<!--Hells-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Hells_Retriever-PAP</defName>
+		<statBases>
+			<Mass>2</Mass>
+			<RangedWeapon_Cooldown>8</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.58</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.71</SwayFactor>
+			<Bulk>0.5</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Hells_Retriever_Punched</defaultProjectile>
+			<warmupTime>0.18</warmupTime>
+			<range>55</range>
+			<soundCast>CodZP_Shot_Hells</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+	<!--Ray Guns-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_RayGun-PAP</defName>
+		<statBases>
+			<Mass>1.36</Mass>
+			<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.58</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.42</SwayFactor>
+			<Bulk>3</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Raygun_Punched</defaultProjectile>
+			<warmupTime>0.54</warmupTime>
+			<range>66</range>
+			<soundCast>CodZP_Shot_Raygun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>2.4</reloadTime>
+			<ammoSet>AmmoSet_Raygun_Punched</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_RayGunMkTwo-PAP</defName>
+		<statBases>
+			<Mass>3.45</Mass>
+			<RangedWeapon_Cooldown>0.29</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.27</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.11</SwayFactor>
+			<Bulk>10.03</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.20</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Raygun_two_Punched</defaultProjectile>
+			<warmupTime>0.9</warmupTime>
+			<range>66</range>
+			<soundCast>CodZP_Shot_Raygun2</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>42</magazineSize>
+			<reloadTime>2.38</reloadTime>
+			<ammoSet>AmmoSet_Raygun_two_Punched</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+		</weaponTags>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_RayGunMkThree-PAP</defName>
+		<statBases>
+			<Mass>1.36</Mass>
+			<RangedWeapon_Cooldown>0.29</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.58</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.98</SwayFactor>
+			<Bulk>3</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Raygun_three_Punched</defaultProjectile>
+			<warmupTime>0.54</warmupTime>
+			<range>90</range>
+			<soundCast>CodZP_Shot_Raygun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>2.4</reloadTime>
+			<ammoSet>AmmoSet_Raygun_three_Punched</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_GKZ-PAP</defName>
+		<statBases>
+			<Mass>2.67</Mass>
+			<RangedWeapon_Cooldown>0.77</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.58</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.89</SwayFactor>
+			<Bulk>4</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Raygun_three_GKZ_Punched</defaultProjectile>
+			<warmupTime>0.54</warmupTime>
+			<range>35</range>
+			<soundCast>CodZP_Shot_Raygun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>2.4</reloadTime>
+			<ammoSet>AmmoSet_Raygun_three_GKZ_Punched</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_RayGunMkTwo-V-PAP</defName>
+		<statBases>
+			<Mass>3.45</Mass>
+			<RangedWeapon_Cooldown>9</RangedWeapon_Cooldown><!--Would normally be 0.35-->
+			<SightsEfficiency>1.27</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.11</SwayFactor>
+			<Bulk>10.03</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Raygun_two_v_Punched</defaultProjectile>
+			<warmupTime>0.9</warmupTime>
+			<range>66</range>
+			<soundCast>CodZP_Shot_Raygun2</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<burstShotCount>3</burstShotCount>
+		</Properties><!--
+                    <AmmoUser>
+                        <magazineSize>150</magazineSize>
+                        <reloadTime>7.2</reloadTime>
+                        <AmmoSet>SlowPassiveRefilling</AmmoSet>
+                    </AmmoUser>-->
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li/>
+		</weaponTags>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_RayGunMkTwo-X-PAP</defName>
+		<statBases>
+			<Mass>3.45</Mass>
+			<RangedWeapon_Cooldown>0.18</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.27</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.11</SwayFactor>
+			<Bulk>10.03</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.20</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Raygun_two_x_Punched</defaultProjectile>
+			<warmupTime>0.9</warmupTime>
+			<range>66</range>
+			<soundCast>CodZP_Shot_Raygun2</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>66</magazineSize>
+			<reloadTime>2.38</reloadTime>
+			<ammoSet>AmmoSet_Raygun_two_x_Punched</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_AI_AR</li>
+		</weaponTags>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_RayGunMkTwo-Y-PAP</defName>
+		<statBases>
+			<Mass>3.45</Mass>
+			<RangedWeapon_Cooldown>0.77</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.27</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.11</SwayFactor>
+			<Bulk>10.03</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Raygun_two_y_Punched</defaultProjectile>
+			<warmupTime>0.9</warmupTime>
+			<range>48</range>
+			<soundCast>CodZP_Shot_Raygun2</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>2.38</reloadTime>
+			<ammoSet>AmmoSet_Raygun_two_y_Punched</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li/>
+		</weaponTags>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_RayGunMkTwo-Z-PAP</defName>
+		<statBases>
+			<Mass>3.45</Mass>
+			<RangedWeapon_Cooldown>0.77</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.27</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.11</SwayFactor>
+			<Bulk>10.03</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Raygun_two_z_Punched</defaultProjectile>
+			<warmupTime>0.9</warmupTime>
+			<range>48</range>
+			<soundCast>CodZP_Shot_Raygun2</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>18</magazineSize>
+			<reloadTime>2.38</reloadTime>
+			<ammoSet>AmmoSet_Raygun_two_z_Punched</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+	<!--Thunder Guns-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_Thundergun-PAP</defName>
+		<statBases>
+			<Mass>10.7</Mass>
+			<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.15</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>2.01</SwayFactor>
+			<Bulk>13</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Thunder_Punched</defaultProjectile>
+			<warmupTime>1.89</warmupTime>
+			<range>14</range>
+			<soundCast>CodZP_Shot_Thundergun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>4</magazineSize>
+			<reloadTime>1.6</reloadTime>
+			<ammoSet>AmmoSet_Thunder_Punched</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li/>
+		</weaponTags>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_Tundragun-PAP</defName>
+		<statBases>
+			<Mass>10.7</Mass>
+			<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.15</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>2.01</SwayFactor>
+			<Bulk>13</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Tundra_Punched</defaultProjectile>
+			<warmupTime>1.89</warmupTime>
+			<range>14</range>
+			<soundCast>CodZP_Shot_Thundergun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>4</magazineSize>
+			<reloadTime>1.6</reloadTime>
+			<ammoSet>AmmoSet_Tundra_Punched</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li/>
+		</weaponTags>
+	</Operation>
+	<!--Winters-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_WintersHowl-PAP</defName>
+		<statBases>
+			<Mass>1.78</Mass>
+			<RangedWeapon_Cooldown>0.29</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.81</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.35</SwayFactor>
+			<Bulk>3</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Winters_Cryo_Punched</defaultProjectile>
+			<warmupTime>0.54</warmupTime>
+			<range>61</range>
+			<soundCast>CodZP_Shot_Wintershowl</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>9</magazineSize>
+			<reloadTime>3.04</reloadTime>
+			<ammoSet>AmmoSet_Winters_Punched</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+	<!--Wunderwaffes-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_Wunderwaffe-PAP</defName>
+		<statBases>
+			<Mass>4.3</Mass>
+			<RangedWeapon_Cooldown>0.29</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.15</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.47</SwayFactor>
+			<Bulk>13</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Wunder_Punched</defaultProjectile>
+			<warmupTime>0.99</warmupTime>
+			<range>61</range>
+			<soundCast>CodZP_Shot_Wunderwaffe</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4.96</reloadTime>
+			<ammoSet>AmmoSet_Wunder_Punched</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li/>
+		</weaponTags>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_Wunderwaffe_Scharf-PAP</defName>
+		<statBases>
+			<Mass>4.3</Mass>
+			<RangedWeapon_Cooldown>0.76</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.15</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>2.32</SwayFactor>
+			<Bulk>13</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Wunder_s_Punched</defaultProjectile>
+			<warmupTime>0.99</warmupTime>
+			<range>61</range>
+			<soundCast>CodZP_Shot_Wunderwaffe</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4.96</reloadTime>
+			<ammoSet>AmmoSet_Wunder_s_Punched</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li/>
+		</weaponTags>
+	</Operation>
+	<!--Zap Guns-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CODZP_Gun_Zapgun_Red-PAP</defName>
+		<statBases>
+			<Mass>2.63</Mass>
+			<RangedWeapon_Cooldown>0.29</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.58</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.60</SwayFactor>
+			<Bulk>3</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Zapgun_Punched</defaultProjectile>
+			<warmupTime>0.54</warmupTime>
+			<range>54</range>
+			<soundCast>CodZP_Shot_Zapgun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>2</reloadTime>
+			<ammoSet>AmmoSet_Zapgun_Punched</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CODZP_Gun_Zapgun_Blue-PAP</defName>
+		<statBases>
+			<Mass>2.63</Mass>
+			<RangedWeapon_Cooldown>0.29</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.58</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.60</SwayFactor>
+			<Bulk>3</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Zapgun_Punched</defaultProjectile>
+			<warmupTime>0.54</warmupTime>
+			<range>54</range>
+			<soundCast>CodZP_Shot_Zapgun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>2</reloadTime>
+			<ammoSet>AmmoSet_Zapgun_Punched</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CodZP_Gun_Wavegun-PAP</defName>
+		<statBases>
+			<Mass>5.26</Mass>
+			<RangedWeapon_Cooldown>0.29</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.27</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.96</SwayFactor>
+			<Bulk>6</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Wavegun_Punched</defaultProjectile>
+			<warmupTime>0.45</warmupTime>
+			<range>37</range>
+			<soundCast>CodZP_Shot_Zapgun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>4</magazineSize>
+			<reloadTime>2.4</reloadTime>
+			<ammoSet>AmmoSet_Wavegun_Punched</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li/>
+		</weaponTags>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Carbon/Patches/Carbon/Items_Resource_Stuff.xml b/ModPatches/Carbon/Patches/Carbon/Items_Resource_Stuff.xml
new file mode 100644
index 0000000000..39180c5dbc
--- /dev/null
+++ b/ModPatches/Carbon/Patches/Carbon/Items_Resource_Stuff.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Item Bulk === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CarbonWeave" or defName="CarbonFiber" or defName="CarbonDiamond"]/statBases</xpath>
+		<value>
+			<Bulk>0.3</Bulk>
+		</value>
+	</Operation>
+
+	<!-- === Carbon Weave === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CarbonWeave"]/stuffProps</xpath>
+		<value>
+			<statOffsets>
+				<Mass>0.325</Mass>
+				<WornBulk>0.25</WornBulk>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CarbonWeave"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>1.65</Mass>
+			<WornBulk>1.65</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CarbonWeave"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.6</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CarbonWeave"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CarbonWeave"]/stuffProps/categories</xpath>
+		<value>
+			<li>SoftArmor</li>
+		</value>
+	</Operation>
+
+	<!-- === Carbon Fiber === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CarbonFiber"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.2</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CarbonFiber"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>1.6</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CarbonFiber"]/stuffProps/categories</xpath>
+		<value>
+			<li>Metallic_Weapon</li>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<!-- === Carbon Diamond === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CarbonDiamond"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>2.2</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CarbonDiamond"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.6</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Censored Armory/Defs/Censored Armory/30mm Rifle Grenade.xml b/ModPatches/Censored Armory/Defs/Censored Armory/30mm Rifle Grenade.xml
new file mode 100644
index 0000000000..4eb4b226c0
--- /dev/null
+++ b/ModPatches/Censored Armory/Defs/Censored Armory/30mm Rifle Grenade.xml	
@@ -0,0 +1,289 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>Ammo30mmRifleGrenades</defName>
+		<label>30mm rifleGrenade</label>
+		<parent>AmmoGrenades</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberGrenade</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_30mmRifleGrenade</defName>
+		<label>30mm Rifle Grenades</label>
+		<ammoTypes>
+			<Ammo_30mmRifleGrenade_HE>Bullet_30mmRifleGrenade_HE</Ammo_30mmRifleGrenade_HE>
+			<Ammo_30mmRifleGrenade_EMP>Bullet_30mmRifleGrenade_EMP</Ammo_30mmRifleGrenade_EMP>
+			<Ammo_30mmRifleGrenade_Smoke>Bullet_30mmRifleGrenade_Smoke</Ammo_30mmRifleGrenade_Smoke>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="30mmRifleGrenadeBase" ParentName="MediumAmmoBase" Abstract="True">
+		<description>A small, low velocity rifle grenade propelled with a blank cartridge.</description>
+		<statBases>
+			<Mass>0.36</Mass>
+			<Bulk>0.28</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo30mmRifleGrenades</li>
+		</thingCategories>
+		<stackLimit>2000</stackLimit>
+		<cookOffFlashScale>20</cookOffFlashScale>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="30mmRifleGrenadeBase">
+		<defName>Ammo_30mmRifleGrenade_HE</defName>
+		<label>30mm rifle grenade (HE)</label>
+		<graphicData>
+			<texPath>Things/Ammo/GrenadeLauncher/HE</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>2.62</MarketValue>
+		</statBases>
+		<ammoClass>GrenadeHE</ammoClass>
+		<detonateProjectile>Bullet_30mmRifleGrenade_HE</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="30mmRifleGrenadeBase">
+		<defName>Ammo_30mmRifleGrenade_EMP</defName>
+		<label>30mm rifle grenade (EMP)</label>
+		<graphicData>
+			<texPath>Things/Ammo/GrenadeLauncher/EMP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>4.72</MarketValue>
+		</statBases>
+		<ammoClass>GrenadeEMP</ammoClass>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>5</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.75</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>1</Fragment_Large>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="30mmRifleGrenadeBase">
+		<defName>Ammo_30mmRifleGrenade_Smoke</defName>
+		<label>30mm riflegrenade (Smoke)</label>
+		<graphicData>
+			<texPath>Things/Ammo/GrenadeLauncher/SMK</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>2.31</MarketValue>
+		</statBases>
+		<ammoClass>Smoke</ammoClass>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>5</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.75</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>1</Fragment_Large>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef Name="Base30mmRifleGrenadeBullet" ParentName="BaseExplosiveBullet" Abstract="true">
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_Big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>26</speed>
+			<flyOverhead>false</flyOverhead>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base30mmRifleGrenadeBullet">
+		<defName>Bullet_30mmRifleGrenade_HE</defName>
+		<label>30mm riflegrenade (HE)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>1</explosionRadius>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>18</damageAmountBase>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>1</Fragment_Large>
+					<Fragment_Small>3</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="Base30mmRifleGrenadeBullet">
+		<defName>Bullet_30mmRifleGrenade_EMP</defName>
+		<label>30mm riflegrenade (EMP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>1.25</explosionRadius>
+			<damageDef>EMP</damageDef>
+			<damageAmountBase>18</damageAmountBase>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base30mmRifleGrenadeBullet">
+		<defName>Bullet_30mmRifleGrenade_Smoke</defName>
+		<label>30mm riflegrenade (Smoke)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>1.5</explosionRadius>
+			<damageDef>Smoke</damageDef>
+			<suppressionFactor>0.0</suppressionFactor>
+			<dangerFactor>0.0</dangerFactor>
+			<postExplosionGasType>BlindSmoke</postExplosionGasType>
+			<preExplosionSpawnChance>1</preExplosionSpawnChance>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_30mmRifleGrenade_HE</defName>
+		<label>make 30mm rifleHE grenades x100</label>
+		<description>Craft 100 30mm rifleHE grenades.</description>
+		<jobString>Making 30mm rifleHE grenades.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>70</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_30mmRifleGrenade_HE>100</Ammo_30mmRifleGrenade_HE>
+		</products>
+		<workAmount>11000</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_30mmRifleGrenade_EMP</defName>
+		<label>make 30mm rifleEMP grenades x100</label>
+		<description>Craft 100 30mm rifleEMP grenades.</description>
+		<jobString>Making 30mm rifleEMP grenades.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>70</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_30mmRifleGrenade_EMP>100</Ammo_30mmRifleGrenade_EMP>
+		</products>
+		<workAmount>13000</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_30mmRifleGrenade_Smoke</defName>
+		<label>make 30mm riflesmoke grenades x100</label>
+		<description>Craft 100 30mm riflesmoke grenades.</description>
+		<jobString>Making 30mm riflesmoke grenades.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>70</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Prometheum</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_30mmRifleGrenade_Smoke>100</Ammo_30mmRifleGrenade_Smoke>
+		</products>
+		<workAmount>9400</workAmount>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Censored Armory/Defs/Censored Armory/37x249mmR.xml b/ModPatches/Censored Armory/Defs/Censored Armory/37x249mmR.xml
new file mode 100644
index 0000000000..5d9c0af6cd
--- /dev/null
+++ b/ModPatches/Censored Armory/Defs/Censored Armory/37x249mmR.xml	
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>Ammo37x249mmR</defName>
+		<label>37x249mmR</label>
+		<parent>AmmoShells</parent>
+		<iconPath>Turret/PaK_36/Projectile/Shell_HE/Shell_PaK_36_HE</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_37x249mmR</defName>
+		<label>37x249mmR</label>
+		<ammoTypes>
+			<Ammo_37x249mmR_HE>Bullet_37x249mmR_HE</Ammo_37x249mmR_HE>
+			<Ammo_37x249mmR_AP>Bullet_37x249mmR_AP</Ammo_37x249mmR_AP>
+		</ammoTypes>
+		<isMortarAmmoSet>true</isMortarAmmoSet>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="Ammo37x249mmRBase" ParentName="MediumAmmoBase" Abstract="True">
+		<description>Medium caliber cannon shell used by light, quick-firing anti-tank guns.</description>
+		<statBases>
+			<Mass>1.305</Mass>
+			<Bulk>1.41</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo37x249mmR</li>
+		</thingCategories>
+		<stackLimit>150</stackLimit>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo37x249mmRBase">
+		<defName>Ammo_37x249mmR_HE</defName>
+		<label>37x249mmR cartridge (APHE)</label>
+		<graphicData>
+			<texPath>Turret/PaK_36/Projectile/Shell_HE/Shell_PaK_36_HE</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>1.50</drawSize>
+		</graphicData>
+		<statBases>
+			<MarketValue>7.75</MarketValue>
+		</statBases>
+		<ammoClass>ExplosiveAP</ammoClass>
+		<cookOffProjectile>Bullet_37x249mmR_HE</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo37x249mmRBase">
+		<defName>Ammo_37x249mmR_AP</defName>
+		<label>37x249mmR cartridge (AP)</label>
+		<graphicData>
+			<texPath>Turret/PaK_36/Projectile/Shell_APCR/Shell_PaK_36_APCR</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>1.50</drawSize>
+		</graphicData>
+		<statBases>
+			<MarketValue>5.24</MarketValue>
+		</statBases>
+		<ammoClass>ArmorPiercing</ammoClass>
+		<cookOffProjectile>Bullet_37x249mmR_AP</cookOffProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base40x365mmBoforsBullet">
+		<defName>Bullet_37x249mmR_HE</defName>
+		<label>37x249mmR shell (APHE)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>146</speed>
+			<damageAmountBase>155</damageAmountBase>
+			<armorPenetrationSharp>54</armorPenetrationSharp>
+			<armorPenetrationBlunt>5574.18</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>93</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base40x365mmBoforsBullet">
+		<defName>Bullet_37x249mmR_AP</defName>
+		<label>37x249mmR shell (AP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>146</speed>
+			<damageAmountBase>97</damageAmountBase>
+			<armorPenetrationSharp>77</armorPenetrationSharp>
+			<armorPenetrationBlunt>5574.18</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_37x249mmR_HE</defName>
+		<label>make 37x249mmR (HE) cartridge x25</label>
+		<description>Craft 25 37x249mmR (HE) cartridges.</description>
+		<jobString>Making 37x249mmR (HE) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>66</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>23</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_37x249mmR_HE>25</Ammo_37x249mmR_HE>
+		</products>
+		<workAmount>15800</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_37x249mmR_AP</defName>
+		<label>make 37x249mmR (AP) cartridge x25</label>
+		<description>Craft 25 37x249mmR (AP) cartridges.</description>
+		<jobString>Making 37x249mmR (AP) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>66</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_37x249mmR_AP>25</Ammo_37x249mmR_AP>
+		</products>
+		<workAmount>10800</workAmount>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Censored Armory/Defs/Censored Armory/75cm leIG18.xml b/ModPatches/Censored Armory/Defs/Censored Armory/75cm leIG18.xml
new file mode 100644
index 0000000000..72c71d2ddd
--- /dev/null
+++ b/ModPatches/Censored Armory/Defs/Censored Armory/75cm leIG18.xml	
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>Ammo75cmleIG18CannonShells</defName>
+		<label>7.5 cm Cannon shell</label>
+		<parent>AmmoShells</parent>
+		<iconPath>Turret/le.IG_18/Projectile/Shell_le.IG_18_HE</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_75cmleIG18Shell</defName>
+		<label>7.5 cm Cannon shells</label>
+		<ammoTypes>
+			<Ammo_75cmleIG18CannonShell_HE>Bullet_75cmleIG18CannonShell_HE</Ammo_75cmleIG18CannonShell_HE>
+			<Ammo_75cmleIG18CannonShell_EMP>Bullet_75cmleIG18CannonShell_EMP</Ammo_75cmleIG18CannonShell_EMP>
+		</ammoTypes>
+		<isMortarAmmoSet>true</isMortarAmmoSet>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="75cmleIG18CannonShellBase" ParentName="HeavyAmmoBase" Abstract="True">
+		<description>Light cannon shell used in field guns.</description>
+		<thingCategories>
+			<li>Ammo75cmleIG18CannonShells</li>
+		</thingCategories>
+		<stackLimit>25</stackLimit>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<statBases>
+			<MaxHitPoints>150</MaxHitPoints>
+			<Mass>6.62</Mass>
+			<Bulk>13</Bulk>
+		</statBases>
+		<cookOffFlashScale>20</cookOffFlashScale>
+		<cookOffSound>MortarBomb_Explode</cookOffSound>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="75cmleIG18CannonShellBase">
+		<defName>Ammo_75cmleIG18CannonShell_HE</defName>
+		<label>7.5cm cannon shell (HE)</label>
+		<graphicData>
+			<texPath>Turret/le.IG_18/Projectile/Shell_le.IG_18_HE</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>88.82</MarketValue>
+		</statBases>
+		<ammoClass>GrenadeHE</ammoClass>
+		<detonateProjectile>Bullet_75cmleIG18CannonShell_HE</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="75cmleIG18CannonShellBase">
+		<defName>Ammo_75cmleIG18CannonShell_EMP</defName>
+		<label>7.5cm cannon shell (EMP)</label>
+		<graphicData>
+			<texPath>Turret/le.IG_18/Projectile/Shell_HEAT/Shell_le.IG_18_HEAT</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>162.07</MarketValue>
+		</statBases>
+		<ammoClass>GrenadeEMP</ammoClass>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>99</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>3</explosiveRadius>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>20</Fragment_Large>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef Name="Base75cmleIG18CannonShell" ParentName="BaseExplosiveBullet" Abstract="true">
+		<graphicData>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>56</speed>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<flyOverhead>false</flyOverhead>
+			<dropsCasings>true</dropsCasings>
+			<casingMoteDefname>Fleck_BigShell</casingMoteDefname>
+			<casingFilthDefname>Filth_CannonAmmoCasings</casingFilthDefname>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base75cmleIG18CannonShell">
+		<defName>Bullet_75cmleIG18CannonShell_HE</defName>
+		<label>7.5 cm shell (HE)</label>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<graphicData>
+			<texPath>Turret/le.IG_18/Projectile/Bullet_le.IG_18_HE</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>184</damageAmountBase>
+			<explosionRadius>3</explosionRadius>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>17</Fragment_Large>
+					<Fragment_Small>40</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="Base75cmleIG18CannonShell">
+		<defName>Bullet_75cmleIG18CannonShell_EMP</defName>
+		<label>7.5 cm shell (EMP)</label>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<graphicData>
+			<texPath>Turret/le.IG_18/Projectile/Bullet_le.IG_18_HEAT</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>EMP</damageDef>
+			<damageAmountBase>99</damageAmountBase>
+			<explosionRadius>6</explosionRadius>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_75cmleIG18CannonShell_HE</defName>
+		<label>make 7.5 cm HE cannon shells x5</label>
+		<description>Craft 5 7.5 cm HE cannon shells.</description>
+		<jobString>Making 7.5 cm HE cannon shells.</jobString>
+		<workAmount>13000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>130</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>14</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_75cmleIG18CannonShell_HE>5</Ammo_75cmleIG18CannonShell_HE>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_75cmleIG18CannonShell_EMP</defName>
+		<label>make 7.5 cm EMP cannon shells x5</label>
+		<description>Craft 5 7.5 cm EMP cannon shells.</description>
+		<jobString>Making 7.5 cm EMP cannon shells.</jobString>
+		<workAmount>13800</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>130</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>17</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_75cmleIG18CannonShell_EMP>5</Ammo_75cmleIG18CannonShell_EMP>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Censored Armory/Defs/Censored Armory/75x714mmR.xml b/ModPatches/Censored Armory/Defs/Censored Armory/75x714mmR.xml
new file mode 100644
index 0000000000..e75ce66a2f
--- /dev/null
+++ b/ModPatches/Censored Armory/Defs/Censored Armory/75x714mmR.xml	
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>Ammo75x714mmRShells</defName>
+		<label>75x714mmR shell</label>
+		<parent>AmmoShells</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberCannon</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_75x714mmRShell</defName>
+		<label>75x714mmR shells</label>
+		<ammoTypes>
+			<Ammo_75x714mmRShell_AP>Bullet_75x714mmRShell_AP</Ammo_75x714mmRShell_AP>
+			<Ammo_75x714mmRShell_HE>Bullet_75x714mmRShell_HE</Ammo_75x714mmRShell_HE>
+		</ammoTypes>
+		<isMortarAmmoSet>true</isMortarAmmoSet>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="75x714mmRShellBase" ParentName="HeavyAmmoBase" Abstract="True">
+		<description>A relatively powerful, high-velocity shell designed to destroy heavily armored targets.</description>
+		<thingCategories>
+			<li>Ammo75x714mmRShells</li>
+		</thingCategories>
+		<stackLimit>25</stackLimit>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<statBases>
+			<MaxHitPoints>200</MaxHitPoints>
+			<Mass>6.1</Mass>
+			<Bulk>22.84</Bulk>
+		</statBases>
+		<cookOffFlashScale>30</cookOffFlashScale>
+		<cookOffSound>MortarBomb_Explode</cookOffSound>
+		<isMortarAmmo>true</isMortarAmmo>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="75x714mmRShellBase">
+		<defName>Ammo_75x714mmRShell_AP</defName>
+		<label>75x714mmR shell (AP)</label>
+		<graphicData>
+			<texPath>Turret/PaK_40/Projectile/Shell_APCR/Shell_PaK_40_APCR</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>1.50</drawSize>
+		</graphicData>
+		<statBases>
+			<MarketValue>50</MarketValue>
+		</statBases>
+		<ammoClass>ArmorPiercing</ammoClass>
+		<detonateProjectile>Bullet_75x714mmRShell_AP</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="75x714mmRShellBase">
+		<defName>Ammo_75x714mmRShell_HE</defName>
+		<label>75x714mmR shell (HE)</label>
+		<graphicData>
+			<texPath>Turret/PaK_40/Projectile/Shell_HE/Shell_PaK_40_HE</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>1.50</drawSize>
+		</graphicData>
+		<statBases>
+			<MarketValue>47.5</MarketValue>
+		</statBases>
+		<ammoClass>GrenadeHE</ammoClass>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>285</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>2.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>5</Fragment_Large>
+					<Fragment_Small>18</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base90mmCannonShell">
+		<defName>Bullet_75x714mmRShell_AP</defName>
+		<label>75x714mmR shell (AP)</label>
+		<graphicData>
+			<texPath>Turret/PaK_40/Projectile/Bullet_PaK_40_APCR</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>98</speed>
+			<dropsCasings>true</dropsCasings>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>248</damageAmountBase>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<armorPenetrationSharp>400</armorPenetrationSharp>
+			<armorPenetrationBlunt>33.339</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>111</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>3</Fragment_Large>
+					<Fragment_Small>8</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="Base90mmCannonShell">
+		<defName>Bullet_75x714mmRShell_HE</defName>
+		<label>75x714mmR shell (HE)</label>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<graphicData>
+			<texPath>Turret/PaK_40/Projectile/Bullet_PaK_40_HE</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>98</speed>
+			<dropsCasings>true</dropsCasings>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>111</damageAmountBase>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+			<explosionRadius>2</explosionRadius>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>15</Fragment_Large>
+					<Fragment_Small>57</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_75x714mmRShell_AP</defName>
+		<label>make 75x714mm AP cannon shells x5</label>
+		<description>Craft 5 75x714mm AP cannon shells.</description>
+		<jobString>Making 75x714mm AP cannon shells.</jobString>
+		<workAmount>9800</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>62</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_75x714mmRShell_AP>5</Ammo_75x714mmRShell_AP>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_75x714mmRShell_HE</defName>
+		<label>make 75x714mm HE cannon shells x5</label>
+		<description>Craft 5 75x714mm HE cannon shells.</description>
+		<jobString>Making 75x714mm HE cannon shells.</jobString>
+		<workAmount>9800</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>62</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_75x714mmRShell_HE>5</Ammo_75x714mmRShell_HE>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Censored Armory/Defs/Censored Armory/80mm Panzerfaust.xml b/ModPatches/Censored Armory/Defs/Censored Armory/80mm Panzerfaust.xml
new file mode 100644
index 0000000000..113936ecc9
--- /dev/null
+++ b/ModPatches/Censored Armory/Defs/Censored Armory/80mm Panzerfaust.xml	
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="BaseRPG7Grenade">
+		<defName>Bullet_Panzerfaust60_HEAT</defName>
+		<label>Panzerfaust 60 rocket</label>
+		<graphicData>
+			<texPath>Weapon/Heavy/Projectile/Bullet_Faustpatrone</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>34</speed>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>208</damageAmountBase>
+			<armorPenetrationSharp>200</armorPenetrationSharp>
+			<armorPenetrationBlunt>37.321</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>124</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Censored Armory/Defs/Censored Armory/Recipes_Grenades.xml b/ModPatches/Censored Armory/Defs/Censored Armory/Recipes_Grenades.xml
new file mode 100644
index 0000000000..d95967542c
--- /dev/null
+++ b/ModPatches/Censored Armory/Defs/Censored Armory/Recipes_Grenades.xml	
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeM24Grenade</defName>
+		<label>make M24 grenades x10</label>
+		<description>Craft 10 M24 grenades.</description>
+		<jobString>Making M24 grenades.</jobString>
+		<workAmount>3400</workAmount>
+		<recipeUsers Inherit="False">
+			<li>TableRA</li>
+		</recipeUsers>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>WoodLog</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<researchPrerequisite>Stage0b_RA</researchPrerequisite>
+		<products>
+			<Weapon_M24_RA>10</Weapon_M24_RA>
+		</products>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Censored Armory/Patches/Censored Armory/Weapons_Guns.xml b/ModPatches/Censored Armory/Patches/Censored Armory/Weapons_Guns.xml
new file mode 100644
index 0000000000..15f150f48a
--- /dev/null
+++ b/ModPatches/Censored Armory/Patches/Censored Armory/Weapons_Guns.xml	
@@ -0,0 +1,1345 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Remove Recipes ========== -->
+
+	<!-- <li Class="PatchOperationRemove">
+		<xpath>Defs/RecipeDef[defName="Make_Kar98K_Ammo_RA"]</xpath>
+	</li>
+
+	<li Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="TableRA"]/recipes/li[text()="Make_Kar98K_Ammo_RA"]</xpath>
+	</li> -->
+
+	<!-- ========== Tools ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName="Gun_P08_RA" or
+			defName="Gun_P38_RA" or
+			defName="Gun_PPK_RA" or
+			defName="Gun_Volkspistole_RA"
+			]/tools
+		</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName="Gun_StG_44_Scope_RA" or
+			defName="Gun_StG_44_RA" or
+			defName="Gun_FG_42_RA" or
+			defName="Gun_MP_507_RA" or
+			defName="Gun_MP_40_RA" or
+			defName="Gun_MP_35_RA" or
+			defName="Gun_MP_3008_RA" or
+			defName="Gun_MG_42_RA" or
+			defName="Gun_MG_34_RA" or
+			defName="Gun_Kar98K_Sniper_RA" or
+			defName="Gun_Kar98K_Schiessbecher_RA" or
+			defName="Gun_Kar98K_RA" or
+			defName="Gun_VG1_RA" or
+			defName="Gun_Gew_Scope_43_RA" or
+			defName="Gun_Gew_43_RA" or
+			defName="Gun_PzB_39_RA"
+			]/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="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Gun_Panzerfaust_60_RA" or defName="Gun_Eintossflammenwerfer_46_RA"]</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>
+
+	<!-- ========== STG 44 w/ Scope ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_StG_44_Scope_RA</defName>
+		<statBases>
+			<Mass>4.80</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.46</SwayFactor>
+			<Bulk>9.40</Bulk>
+			<WorkToMake>500</WorkToMake>
+		</statBases>
+		<costList>
+			<Gun_StG_44_RA>1</Gun_StG_44_RA>
+			<Steel>10</Steel>
+		</costList>
+		<Properties>
+			<recoilAmount>1.51</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_792x33mmKurz_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<soundCast>Shot_StG_44</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_792x33mmKurz</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<researchPrerequisite>Stage2b_RA</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== STG 44 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_StG_44_RA</defName>
+		<statBases>
+			<Mass>4.60</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.40</SwayFactor>
+			<Bulk>9.35</Bulk>
+			<WorkToMake>20000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>90</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+			<WoodLog>5</WoodLog>
+		</costList>
+		<Properties>
+			<recoilAmount>1.54</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_792x33mmKurz_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<soundCast>Shot_StG_44</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_792x33mmKurz</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<researchPrerequisite>Stage2b_RA</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== FG 42 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_FG_42_RA</defName>
+		<statBases>
+			<Mass>4.20</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.41</SwayFactor>
+			<Bulk>9.45</Bulk>
+			<WorkToMake>24000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>120</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+			<WoodLog>10</WoodLog>
+		</costList>
+		<Properties>
+			<recoilAmount>2.14</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>Shot_FG_42</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<researchPrerequisite>Stage1b_RA</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== MP 507 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MP_507_RA</defName>
+		<statBases>
+			<Mass>4.60</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.35</SwayFactor>
+			<Bulk>8.85</Bulk>
+			<WorkToMake>12000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+			<WoodLog>10</WoodLog>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_792x33mmKurz_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>40</range>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<soundCast>Shot_MP_507</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_792x33mmKurz</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<researchPrerequisite>Stage2c_RA</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== MP 40 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MP_40_RA</defName>
+		<statBases>
+			<Mass>3.97</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<Bulk>6.30</Bulk>
+			<WorkToMake>14000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>70</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.16</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<soundCast>Shot_MP_40</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<researchPrerequisite>Stage1b_RA</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== MP 35 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MP_35_RA</defName>
+		<statBases>
+			<Mass>4.24</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.26</SwayFactor>
+			<Bulk>8.40</Bulk>
+			<WorkToMake>18000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>60</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+			<WoodLog>10</WoodLog>
+		</costList>
+		<Properties>
+			<recoilAmount>1.12</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<soundCast>Shot_MP_35</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>24</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<researchPrerequisite>Stage0b_RA</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== MP 3008 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MP_3008_RA</defName>
+		<statBases>
+			<Mass>4.24</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.08</SwayFactor>
+			<Bulk>7.60</Bulk>
+			<WorkToMake>8000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.29</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<soundCast>Shot_MP_3008</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<researchPrerequisite>Stage2c_RA</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== P38 (Walther) ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_P38_RA</defName>
+		<statBases>
+			<Mass>0.84</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.00</SwayFactor>
+			<Bulk>2.16</Bulk>
+			<WorkToMake>10000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_P38</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<researchPrerequisite>Stage1b_RA</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== P08 (Luger) ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_P08_RA</defName>
+		<statBases>
+			<Mass>0.87</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.03</SwayFactor>
+			<Bulk>2.22</Bulk>
+			<WorkToMake>14000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_P08</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<researchPrerequisite>Stage0b_RA</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== PPK ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PPK_RA</defName>
+		<statBases>
+			<Mass>0.59</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.19</ShotSpread>
+			<SwayFactor>0.71</SwayFactor>
+			<Bulk>1.55</Bulk>
+			<WorkToMake>10000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_32ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_PPK</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_32ACP</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<researchPrerequisite>Stage0b_RA</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== Volkspistole ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Volkspistole_RA</defName>
+		<statBases>
+			<Mass>1.10</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.08</SwayFactor>
+			<Bulk>2.15</Bulk>
+			<WorkToMake>6000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Volkspistole</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<researchPrerequisite>Stage2c_RA</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== MG 42 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MG_42_RA</defName>
+		<statBases>
+			<Mass>15.20</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.67</SwayFactor>
+			<Bulk>11.60</Bulk>
+			<WorkToMake>18000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>140</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+			<WoodLog>5</WoodLog>
+		</costList>
+		<Properties>
+			<recoilAmount>1.25</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>65</range>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>Shot_MG_42</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<researchPrerequisite>Stage0b_RA</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== MG 34 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MG_34_RA</defName>
+		<statBases>
+			<Mass>15.20</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.70</SwayFactor>
+			<Bulk>12.10</Bulk>
+			<WorkToMake>18000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>130</Steel>
+			<ComponentIndustrial>8</ComponentIndustrial>
+			<WoodLog>5</WoodLog>
+		</costList>
+		<Properties>
+			<recoilAmount>1.22</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>68</range>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>Shot_MG_34</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<researchPrerequisite>Stage0b_RA</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Kar98k with Scope ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Kar98K_Sniper_RA</defName>
+		<statBases>
+			<Mass>4.20</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.56</SwayFactor>
+			<Bulk>11.00</Bulk>
+			<WorkToMake>500</WorkToMake>
+		</statBases>
+		<costList>
+			<Gun_Kar98K_RA>1</Gun_Kar98K_RA>
+			<Steel>10</Steel>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>68</range>
+			<soundCast>Shot_Kar98K</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<researchPrerequisite>Stage0b_RA</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Kar98k with Grenade Launcher ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Kar98K_Schiessbecher_RA</defName>
+		<statBases>
+			<Mass>4.20</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.56</SwayFactor>
+			<Bulk>11.00</Bulk>
+			<WorkToMake>500</WorkToMake>
+		</statBases>
+		<costList>
+			<Gun_Kar98K_RA>1</Gun_Kar98K_RA>
+			<FSX>7</FSX>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_30mmRifleGrenade_HE</defaultProjectile>
+			<warmupTime>1.8</warmupTime>
+			<minRange>6</minRange>
+			<range>44</range>
+			<soundCast>Shot_Schiessbecher</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<requireLineOfSight>false</requireLineOfSight>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>2</AmmoGenPerMagOverride>
+			<reloadTime>6</reloadTime>
+			<ammoSet>AmmoSet_30mmRifleGrenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<researchPrerequisite>Stage1b_RA</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== Kar98k with Bayonet ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Kar98K_Bayonet_RA</defName>
+		<statBases>
+			<Mass>4.10</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.90</SwayFactor>
+			<Bulk>14.85</Bulk>
+			<WorkToMake>500</WorkToMake>
+		</statBases>
+		<costList>
+			<Gun_Kar98K_RA>1</Gun_Kar98K_RA>
+			<MeleeWeapon_S84_98_III_RA>1</MeleeWeapon_S84_98_III_RA>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_Kar98K</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>IndustrialGunAdvanced</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+		<researchPrerequisite>Stage0b_RA</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Gun_Kar98K_Bayonet_RA"]/equippedStatOffsets/MentalBreakThreshold</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_Kar98K_Bayonet_RA"]/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>bayonet</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>2.14</cooldownTime>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>bayonet</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.49</cooldownTime>
+					<armorPenetrationBlunt>2.16</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.44</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Kar98k ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Kar98K_RA</defName>
+		<statBases>
+			<Mass>4.00</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.50</SwayFactor>
+			<Bulk>11.00</Bulk>
+			<WorkToMake>12000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+			<WoodLog>20</WoodLog>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_Kar98K</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<researchPrerequisite>Stage0b_RA</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Walther VG-1 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_VG1_RA</defName>
+		<statBases>
+			<Mass>3.76</Mass>
+			<RangedWeapon_Cooldown>1.18</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.47</SwayFactor>
+			<Bulk>10.92</Bulk>
+			<WorkToMake>8000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+			<WoodLog>20</WoodLog>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_VG1</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4.0</reloadTime>
+			<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<researchPrerequisite>Stage2c_RA</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== G43 w/ Scope ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Gew_Scope_43_RA</defName>
+		<statBases>
+			<Mass>4.60</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.61</SwayFactor>
+			<Bulk>11.30</Bulk>
+			<WorkToMake>500</WorkToMake>
+		</statBases>
+		<costList>
+			<Gun_Gew_43_RA>1</Gun_Gew_43_RA>
+			<Steel>10</Steel>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>68</range>
+			<soundCast>Shot_Gew_43</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<researchPrerequisite>Stage1b_RA</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== G43 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Gew_43_RA</defName>
+		<statBases>
+			<Mass>4.40</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.57</SwayFactor>
+			<Bulk>11.30</Bulk>
+			<WorkToMake>18000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>70</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+			<WoodLog>20</WoodLog>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_Gew_43</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<researchPrerequisite>Stage1b_RA</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== PzB 38 Anti-tank Rifle ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PzB_39_RA</defName>
+		<statBases>
+			<Mass>11.60</Mass>
+			<RangedWeapon_Cooldown>1.05</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.95</SwayFactor>
+			<Bulk>17.20</Bulk>
+			<WorkToMake>8000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+			<WoodLog>20</WoodLog>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_792x94mmPatronen_FMJ</defaultProjectile>
+			<warmupTime>2.8</warmupTime>
+			<range>62</range>
+			<soundCast>Shot_PzB_39</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>8</AmmoGenPerMagOverride>
+			<reloadTime>1.6</reloadTime>
+			<ammoSet>AmmoSet_792x94mmPatronen</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<researchPrerequisite>Stage2c_RA</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Panzerfaust 60 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Panzerfaust_60_RA</defName>
+		<statBases>
+			<Mass>6.80</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.80</SightsEfficiency>
+			<ShotSpread>0.6</ShotSpread>
+			<SwayFactor>1.65</SwayFactor>
+			<Bulk>11.40</Bulk>
+			<WorkToMake>6000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+			<FSX>4</FSX>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Panzerfaust60_HEAT</defaultProjectile>
+			<warmupTime>1.8</warmupTime>
+			<range>14</range>
+			<soundCast>Shot_Panzerfaust</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes/>
+		<weaponTags>
+			<li>GunHeavy</li>
+		</weaponTags>
+		<researchPrerequisite>Stage2b_RA</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== Eintossflammenwerfer 46 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Eintossflammenwerfer_46_RA</defName>
+		<statBases>
+			<Mass>3.60</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.80</SightsEfficiency>
+			<ShotSpread>0.6</ShotSpread>
+			<SwayFactor>1.65</SwayFactor>
+			<Bulk>7.50</Bulk>
+			<WorkToMake>6000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+			<Chemfuel>40</Chemfuel>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Flamethrower_Napalm</defaultProjectile>
+			<warmupTime>1.8</warmupTime>
+			<range>11</range>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<burstShotCount>25</burstShotCount>
+			<soundCast>Shot_Eintoss</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<muzzleFlashScale>14</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>GunHeavy</li>
+		</weaponTags>
+		<researchPrerequisite>Stage2c_RA</researchPrerequisite>
+	</Operation>
+
+	<!-- M24 Stielhandgranate Concussion Grenade -->
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="Weapon_M24_RA"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>BaseWeapon</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Weapon_M24_RA"]/label</xpath>
+		<value>
+			<label>M24 concussion grenade</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Weapon_M24_RA"]</xpath>
+		<value>
+			<equippedAngleOffset>90</equippedAngleOffset>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Weapon_M24_RA"]</xpath>
+		<value>
+			<thingClass>CombatExtended.AmmoThing</thingClass>
+			<stackLimit>75</stackLimit>
+			<resourceReadoutPriority>First</resourceReadoutPriority>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="Weapon_M24_RA"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Weapon_M24_RA"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Weapon_M24_RA"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Weapon_M24_RA"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>60</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>2</explosiveRadius>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Weapon_M24_RA</defName>
+		<statBases>
+			<Mass>0.82</Mass>
+			<Bulk>0.36</Bulk>
+			<MarketValue>12.22</MarketValue>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<label>throw concussion grenade</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<range>13.0</range>
+			<minRange>2</minRange>
+			<warmupTime>0.8</warmupTime>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<soundCast>ThrowGrenade</soundCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<defaultProjectile>Proj_M24_RA</defaultProjectile>
+			<onlyManualCast>true</onlyManualCast>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<weaponTags>
+			<li>CE_AI_Grenade</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+		<researchPrerequisite>Stage0b_RA</researchPrerequisite>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Weapon_M24_RA"]/recipeMaker</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Weapon_M24_RA"]/costList</xpath>
+	</Operation>
+
+	<!-- Projectile -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Proj_M24_RA"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Proj_M24_RA"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<explosionRadius>2</explosionRadius>
+				<damageDef>Bomb</damageDef>
+				<damageAmountBase>56</damageAmountBase>
+				<explosionDelay>60</explosionDelay>
+				<dropsCasings>false</dropsCasings>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<speed>19</speed>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Proj_M24_RA"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Proj_M24_RA"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Censored Armory/Patches/Censored Armory/Weapons_Melee.xml b/ModPatches/Censored Armory/Patches/Censored Armory/Weapons_Melee.xml
new file mode 100644
index 0000000000..e5575b6a3e
--- /dev/null
+++ b/ModPatches/Censored Armory/Patches/Censored Armory/Weapons_Melee.xml	
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Shovel === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="Feldspaten_RA"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>0.40</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="Feldspaten_RA"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>0.40</MeleeParryChance>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Feldspaten_RA"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.28</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Bayonet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_S84_98_III_RA"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<MeleeCounterParryBonus>0.30</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_S84_98_III_RA"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.10</MeleeCritChance>
+			<MeleeParryChance>0.30</MeleeParryChance>
+			<MeleeDodgeChance>0.010</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_S84_98_III_RA"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_S84_98_III_RA"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1</cooldownTime>
+					<armorPenetrationBlunt>0.56</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.72</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1</cooldownTime>
+					<chanceFactor>1.88</chanceFactor>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.76</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Censored Armory/Patches/Censored Armory/Weapons_Turrets.xml b/ModPatches/Censored Armory/Patches/Censored Armory/Weapons_Turrets.xml
new file mode 100644
index 0000000000..5105627a30
--- /dev/null
+++ b/ModPatches/Censored Armory/Patches/Censored Armory/Weapons_Turrets.xml	
@@ -0,0 +1,559 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Common to all Turrets ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			@Name="Base_PaK_36_RA" or
+			@Name="Base_leIG_18_RA" or
+			@Name="Base_Nebelwerfer_41_RA" or
+			@Name="Base_PaK_40_RA" or
+			defName="Turret_Flak_38_Panzergrau_RA" or
+			defName="Turret_Flak_38_Dunkelgelb_RA" or
+			defName="Turret_Flak_38_Camo_RA" or
+			defName="Turret_MG_42_RA"
+			]/thingClass
+		</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="Base_PaK_40_Weapon_RA"]/building/defaultStorageSettings/filter/disallowedThingDefs</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="Base_PaK_40_RA"]/inspectorTabs</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>
+			Defs/ThingDef[
+			defName="Turret_Flak_38_Panzergrau_RA" or
+			defName="Turret_Flak_38_Dunkelgelb_RA" or
+			defName="Turret_Flak_38_Camo_RA" or
+			defName="Turret_MG_42_RA"
+			]/comps/li[@Class = "CompProperties_Refuelable"]
+		</xpath>
+	</Operation>
+
+	<!-- ========== Remove Vanilla Shells & Ammo & References ========== -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>
+			Defs/ThingDef[defName="Shell_PaK_36_HE_RA"] |
+			Defs/ThingDef[defName="Shell_PaK_36_APCR_RA"] |
+			Defs/ThingDef[defName="Shell_leIG_18_HE_RA"] |
+			Defs/ThingDef[defName="Shell_leIG_18_HEAT_RA"] |
+			Defs/ThingDef[defName="Shell_Nebelwerfer_41_HE_RA"] |
+			Defs/ThingDef[defName="Belt_Flak_38_HEFIT_RA"] |
+			Defs/ThingDef[defName="Shell_PaK_40_HE_RA"] |
+			Defs/ThingDef[defName="Shell_PaK_40_APHECBC_RA"] |
+			Defs/ThingDef[defName="Shell_PaK_40_APCR_RA"]
+		</xpath>
+	</Operation>
+
+	<!-- ========== MG 42 (Static) ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MG_42_T_RA</defName>
+		<statBases>
+			<Mass>15.20</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>0.94</SwayFactor>
+			<Bulk>11.60</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.25</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>62</range>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>Shot_MG_42</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Flak 38 ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Flak_38_Camo_RA</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>2.3</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.18</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>3.07</SwayFactor>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_20x138mmB_AP</defaultProjectile>
+			<warmupTime>4.45</warmupTime>
+			<range>72</range>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
+			<soundCast>Shot_Flak_38</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>6</reloadTime>
+			<ammoSet>AmmoSet_20x138mmB</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>4</aimedBurstShotCount>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Flak_38_Panzergrau_RA</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>2.3</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.18</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>3.07</SwayFactor>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_20x138mmB_AP</defaultProjectile>
+			<warmupTime>4.45</warmupTime>
+			<range>72</range>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
+			<soundCast>Shot_Flak_38</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>6</reloadTime>
+			<ammoSet>AmmoSet_20x138mmB</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>4</aimedBurstShotCount>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Flak_38_Dunkelgelb_RA</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>2.3</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.18</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>3.07</SwayFactor>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_20x138mmB_AP</defaultProjectile>
+			<warmupTime>4.45</warmupTime>
+			<range>72</range>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
+			<soundCast>Shot_Flak_38</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>6</reloadTime>
+			<ammoSet>AmmoSet_20x138mmB</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>4</aimedBurstShotCount>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== PaK 36 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Artillery_PaK_36_RA</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>1.6</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.5</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.89</SwayFactor>
+			<Bulk>40.00</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_37x249mmR_HE</defaultProjectile>
+			<warmupTime>1.4</warmupTime>
+			<range>78</range>
+			<soundCast>Shot_PaK_36</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_37x249mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Flak 40 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Artillery_PaK_40_Panzergrau_RA</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>2.5</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.01</SwayFactor>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_75x714mmRShell_HE</defaultProjectile>
+			<warmupTime>3.7</warmupTime>
+			<range>94</range>
+			<soundCast>Shot_PaK_40</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>29</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>10</reloadTime>
+			<ammoSet>AmmoSet_75x714mmRShell</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Artillery_PaK_40_Camo_RA</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>2.5</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.01</SwayFactor>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_75x714mmRShell_HE</defaultProjectile>
+			<warmupTime>3.7</warmupTime>
+			<range>94</range>
+			<soundCast>Shot_PaK_40</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>29</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>10</reloadTime>
+			<ammoSet>AmmoSet_75x714mmRShell</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Artillery_PaK_40_Dunkelgelb_RA</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>2.5</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.01</SwayFactor>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_75x714mmRShell_HE</defaultProjectile>
+			<warmupTime>3.7</warmupTime>
+			<range>94</range>
+			<soundCast>Shot_PaK_40</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>29</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>10</reloadTime>
+			<ammoSet>AmmoSet_75x714mmRShell</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== leIG 18 ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Artillery_leIG_18_RA"]</xpath>
+		<value>
+			<statBases>
+				<SightsEfficiency>0.8</SightsEfficiency>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Artillery_leIG_18_RA"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Artillery_leIG_18_RA"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Artillery_leIG_18_RA"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>30</li>
+					<li>42</li>
+					<li>70</li>
+					<li>80</li>
+				</chargeSpeeds>
+			</li>
+			<li Class="CombatExtended.CompProperties_AmmoUser">
+				<magazineSize>1</magazineSize>
+				<reloadTime>5</reloadTime>
+				<ammoSet>AmmoSet_75cmleIG18Shell</ammoSet>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Artillery_leIG_18_RA"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+					<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+					<hasStandardCommand>true</hasStandardCommand>
+					<requireLineOfSight>false</requireLineOfSight>
+					<defaultProjectile>Bullet_75cmleIG18CannonShell_HE</defaultProjectile>
+					<warmupTime>10</warmupTime>
+					<minRange>10</minRange>
+					<range>95</range>
+					<burstShotCount>1</burstShotCount>
+					<soundCast>Shot_le.IG_18</soundCast>
+					<muzzleFlashScale>39</muzzleFlashScale>
+					<circularError>1</circularError>
+					<indirectFirePenalty>0.15</indirectFirePenalty>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Patch base -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Base_leIG_18_RA"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Base_leIG_18_RA"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>5</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="Base_leIG_18_RA"]/building</xpath>
+		<value>
+			<spawnedConceptLearnOpportunity>CE_MortarDirectFire</spawnedConceptLearnOpportunity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="Base_leIG_18_RA"]/inspectorTabs</xpath>
+	</Operation>
+
+	<!-- ========== Nebelwerfer 41 ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Artillery_Nebelwerfer_41_RA"]</xpath>
+		<value>
+			<statBases>
+				<SightsEfficiency>0.8</SightsEfficiency>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Artillery_Nebelwerfer_41_RA"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Artillery_Nebelwerfer_41_RA"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Artillery_Nebelwerfer_41_RA"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>30</li>
+					<li>50</li>
+					<li>70</li>
+					<li>90</li>
+				</chargeSpeeds>
+			</li>
+			<li Class="CombatExtended.CompProperties_AmmoUser">
+				<magazineSize>6</magazineSize>
+				<reloadTime>8.5</reloadTime>
+				<ammoSet>AmmoSet_15cmNebelwerfer</ammoSet>
+			</li>
+			<li Class="CombatExtended.CompProperties_FireModes">
+				<aimedBurstShotCount>3</aimedBurstShotCount>
+				<aiUseBurstMode>FALSE</aiUseBurstMode>
+				<aiAimMode>AimedShot</aiAimMode>
+				<noSnapshot>true</noSnapshot>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Artillery_Nebelwerfer_41_RA"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+					<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+					<hasStandardCommand>true</hasStandardCommand>
+					<requireLineOfSight>false</requireLineOfSight>
+					<defaultProjectile>Bullet_15cmNebelwerfer_HE</defaultProjectile>
+					<warmupTime>10</warmupTime>
+					<minRange>40</minRange>
+					<range>1000</range>
+					<burstShotCount>6</burstShotCount>
+					<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+					<soundCast>Shot_Nebelwerfer_41</soundCast>
+					<muzzleFlashScale>39</muzzleFlashScale>
+					<circularError>1</circularError>
+					<indirectFirePenalty>0.15</indirectFirePenalty>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Patch base -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Base_Nebelwerfer_41_RA"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Base_Nebelwerfer_41_RA"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>5</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="Base_Nebelwerfer_41_RA"]/building</xpath>
+		<value>
+			<spawnedConceptLearnOpportunity>CE_MortarDirectFire</spawnedConceptLearnOpportunity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="Base_Nebelwerfer_41_RA"]/inspectorTabs</xpath>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Charge-Loading Lee-Enfield/Patches/Charge-Loading Lee-Enfield/ThingDefs_Weapons.xml b/ModPatches/Charge-Loading Lee-Enfield/Patches/Charge-Loading Lee-Enfield/ThingDefs_Weapons.xml
new file mode 100644
index 0000000000..9880d81fa1
--- /dev/null
+++ b/ModPatches/Charge-Loading Lee-Enfield/Patches/Charge-Loading Lee-Enfield/ThingDefs_Weapons.xml	
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Melee Tools -->
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Gun_ChargeEnfield" or defName="Gun_ChargeLewis"]/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 Enfield -->
+<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>Gun_ChargeEnfield</defName>
+	<statBases>
+		<Mass>4.19</Mass>
+		<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+		<SightsEfficiency>1</SightsEfficiency>
+		<ShotSpread>0.02</ShotSpread>
+		<SwayFactor>1.68</SwayFactor>
+		<Bulk>12.60</Bulk>
+	</statBases>
+	<Properties>
+		<recoilAmount>1.75</recoilAmount>
+		<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+		<hasStandardCommand>true</hasStandardCommand>
+		<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
+		<warmupTime>1.1</warmupTime>
+		<range>55</range>
+		<soundCast>Shot_ChargeEnfield</soundCast>
+		<soundCastTail>GunTail_Medium</soundCastTail>
+		<muzzleFlashScale>9</muzzleFlashScale>
+	</Properties>
+	<AmmoUser>
+		<magazineSize>10</magazineSize>
+		<reloadTime>4.3</reloadTime>
+		<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
+	</AmmoUser>
+	<FireModes>
+		<aiAimMode>AimedShot</aiAimMode>
+	</FireModes>
+	<weaponTags>
+		<li>CE_AI_SR</li>
+	</weaponTags>
+	<AllowWithRunAndGun>false</AllowWithRunAndGun>
+</Operation>
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/ThingDef[defName="Gun_ChargeEnfield"]</xpath>
+	<value>
+		<li Class="CombatExtended.GunDrawExtension">
+			<DrawSize>1.15,1.15</DrawSize>
+			<DrawOffset>0.02,0.04</DrawOffset>
+			<CasingOffset>-0.1,0.1</CasingOffset>
+		</li>
+	</value>
+</Operation>
+
+<!-- Charge Lewis Gun -->
+<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>Gun_ChargeLewis</defName>
+	<statBases>
+		<Mass>8.7</Mass>
+		<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		<SightsEfficiency>1</SightsEfficiency>
+		<ShotSpread>0.05</ShotSpread>
+		<SwayFactor>1.37</SwayFactor>
+		<Bulk>12.9</Bulk>
+	</statBases>
+	<Properties>
+		<recoilAmount>1.17</recoilAmount>
+		<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+		<hasStandardCommand>true</hasStandardCommand>
+		<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
+		<warmupTime>1.3</warmupTime>
+		<range>62</range>
+		<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+		<burstShotCount>10</burstShotCount>
+		<soundCast>Shot_ChargeBlaster</soundCast>
+		<soundCastTail>GunTail_Medium</soundCastTail>
+		<muzzleFlashScale>9</muzzleFlashScale>
+		<targetParams>
+			<canTargetLocations>true</canTargetLocations>
+		</targetParams>
+		<recoilPattern>Mounted</recoilPattern>
+	</Properties>
+	<AmmoUser>
+		<magazineSize>50</magazineSize>
+		<reloadTime>4.9</reloadTime>
+		<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
+	</AmmoUser>
+	<FireModes>
+		<aimedBurstShotCount>5</aimedBurstShotCount>
+		<aiUseBurstMode>FALSE</aiUseBurstMode>
+		<aiAimMode>SuppressFire</aiAimMode>
+	</FireModes>
+	<weaponTags>
+		<li>CE_MachineGun</li>
+		<li>CE_AI_LMG</li>
+		<li>Bipod_LMG</li>
+	</weaponTags>
+</Operation>
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/ThingDef[defName="Gun_ChargeLewis"]</xpath>
+	<value>
+		<li Class="CombatExtended.GunDrawExtension">
+			<DrawSize>1.2,1.14</DrawSize>
+			<DrawOffset>0.08,-0.03</DrawOffset>
+		</li>
+	</value>
+</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Civilization Beyond Earth Armor Sets/Defs/Civilization Beyond Earth Armor Sets/Ammo.xml b/ModPatches/Civilization Beyond Earth Armor Sets/Defs/Civilization Beyond Earth Armor Sets/Ammo.xml
new file mode 100644
index 0000000000..dfba0c57b7
--- /dev/null
+++ b/ModPatches/Civilization Beyond Earth Armor Sets/Defs/Civilization Beyond Earth Armor Sets/Ammo.xml	
@@ -0,0 +1,729 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>HarmonyCharged</defName>
+		<label>Harmony</label>
+		<description>The charged particle coating disrupts armor and tissue in equal measure. Harmony infused.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>PurityCharged</defName>
+		<label>Purity</label>
+		<description>The charged particle coating disrupts armor and tissue in equal measure. Purity infused.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>SupremacyCharged</defName>
+		<label>Supremacy</label>
+		<description>The charged particle coating disrupts armor and tissue in equal measure. Supremacy infused</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<DamageDef ParentName="Arrow">
+		<defName>HarmonyVenom</defName>
+		<label>Venom</label>
+		<hediff>HarmonyBullet</hediff>
+	</DamageDef>
+
+	<HediffDef ParentName="Cut">
+		<defName>HarmonyBullet</defName>
+		<label>harmony toxin</label>
+		<labelNoun>harmony toxin</labelNoun>
+		<comps>
+			<li Class="CombatExtended.HediffCompProperties_Venom">
+				<VenomPerSeverity>0.0000230</VenomPerSeverity>
+				<MinTicks>10000</MinTicks>
+				<MaxTicks>17500</MaxTicks>
+			</li>
+		</comps>
+	</HediffDef>
+
+	<ThingCategoryDef>
+		<defName>Ammo6x24mmHarmonyCharged</defName>
+		<label>6x24mm Harmony Charged</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
+	</ThingCategoryDef>
+
+	<ThingCategoryDef>
+		<defName>Ammo6x24mmPurityCharged</defName>
+		<label>6x24mm Purity Charged</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
+	</ThingCategoryDef>
+
+	<ThingCategoryDef>
+		<defName>Ammo6x24mmSupremacyCharged</defName>
+		<label>6x24mm Supremacy Charged</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
+	</ThingCategoryDef>
+
+	<ThingCategoryDef>
+		<defName>Ammo8x35mmHarmonyCharged</defName>
+		<label>8x35mm Harmony Charged</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
+	</ThingCategoryDef>
+
+	<ThingCategoryDef>
+		<defName>Ammo8x35mmPurityCharged</defName>
+		<label>8x35mm Purity Charged</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
+	</ThingCategoryDef>
+
+	<ThingCategoryDef>
+		<defName>Ammo8x35mmSupremacyCharged</defName>
+		<label>8x35mm Supremacy Charged</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_6x24mmHarmonyCharged</defName>
+		<label>6x24mm Harmony Charged</label>
+		<ammoTypes>
+			<Ammo_6x24mmHarmonyCharged>Bullet_6x24mmHarmonyCharged</Ammo_6x24mmHarmonyCharged>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_6x24mmPurityCharged</defName>
+		<label>6x24mm Purity Charged</label>
+		<ammoTypes>
+			<Ammo_6x24mmPurityCharged>Bullet_6x24mmPurityCharged</Ammo_6x24mmPurityCharged>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_6x24mmSupremacyCharged</defName>
+		<label>6x24mm Supremacy Charged</label>
+		<ammoTypes>
+			<Ammo_6x24mmSupremacyCharged>Bullet_6x24mmSupremacyCharged</Ammo_6x24mmSupremacyCharged>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_8x35mmHarmonyCharged</defName>
+		<label>8x35mm Harmony Charged</label>
+		<ammoTypes>
+			<Ammo_8x35mmHarmonyCharged>Bullet_8x35mmHarmonyCharged</Ammo_8x35mmHarmonyCharged>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_8x35mmPurityCharged</defName>
+		<label>8x35mm Purity Charged</label>
+		<ammoTypes>
+			<Ammo_8x35mmPurityCharged>Bullet_8x35mmPurityCharged</Ammo_8x35mmPurityCharged>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_8x35mmSupremacyCharged</defName>
+		<label>8x35mm Supremacy Charged</label>
+		<ammoTypes>
+			<Ammo_8x35mmSupremacyCharged>Bullet_8x35mmSupremacyCharged</Ammo_8x35mmSupremacyCharged>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!--===== Tier4_Purity+Supremacy_Gun =====-->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_6x24mmPuritySupremacyCharged</defName>
+		<label>6x24mm Purity/Supremacy Charged</label>
+		<ammoTypes>
+			<Ammo_6x24mmPurityCharged>Bullet_6x24mmPurityCharged</Ammo_6x24mmPurityCharged>
+			<Ammo_8x35mmPurityCharged>Bullet_8x35mmPurityCharged</Ammo_8x35mmPurityCharged>
+			<Ammo_6x24mmSupremacyCharged>Bullet_6x24mmSupremacyCharged</Ammo_6x24mmSupremacyCharged>
+			<Ammo_8x35mmSupremacyCharged>Bullet_8x35mmSupremacyCharged</Ammo_8x35mmSupremacyCharged>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!--===== Tier4_Purity+Harmony_Gun =====-->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_6x24mmPurityHarmonyCharged</defName>
+		<label>6x24mm Purity/Harmony Charged</label>
+		<ammoTypes>
+			<Ammo_6x24mmPurityCharged>Bullet_6x24mmPurityCharged</Ammo_6x24mmPurityCharged>
+			<Ammo_8x35mmPurityCharged>Bullet_8x35mmPurityCharged</Ammo_8x35mmPurityCharged>
+			<Ammo_6x24mmHarmonyCharged>Bullet_6x24mmHarmonyCharged</Ammo_6x24mmHarmonyCharged>
+			<Ammo_8x35mmHarmonyCharged>Bullet_8x35mmHarmonyCharged</Ammo_8x35mmHarmonyCharged>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!--===== Tier4_Harmony+Supremacy_Gun =====-->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_6x24mmHarmonySupremacyCharged</defName>
+		<label>6x24mm Harmony/Supremacy Charged</label>
+		<ammoTypes>
+			<Ammo_6x24mmHarmonyCharged>Bullet_6x24mmHarmonyCharged</Ammo_6x24mmHarmonyCharged>
+			<Ammo_8x35mmHarmonyCharged>Bullet_8x35mmHarmonyCharged</Ammo_8x35mmHarmonyCharged>
+			<Ammo_6x24mmSupremacyCharged>Bullet_6x24mmSupremacyCharged</Ammo_6x24mmSupremacyCharged>
+			<Ammo_8x35mmSupremacyCharged>Bullet_8x35mmSupremacyCharged</Ammo_8x35mmSupremacyCharged>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="6x24mmBEChargedBase" ParentName="SpacerSmallAmmoBase" Abstract="True">
+		<statBases>
+			<Mass>0.01</Mass>
+			<Bulk>0.01</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+		</tradeTags>
+		<stackLimit>5000</stackLimit>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="6x24mmBEChargedBase">
+		<defName>Ammo_6x24mmHarmonyCharged</defName>
+		<label>6x24mm Harmony Charged cartridge</label>
+		<description>Charged shot ammo used by advanced Harmony infused assault rifle designs.</description>
+		<graphicData>
+			<texPath>Things/Ammo/Charged/MediumIon</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.7</MarketValue>
+		</statBases>
+		<thingCategories>
+			<li>Ammo6x24mmHarmonyCharged</li>
+		</thingCategories>
+		<ammoClass>HarmonyCharged</ammoClass>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="6x24mmBEChargedBase">
+		<defName>Ammo_6x24mmPurityCharged</defName>
+		<label>6x24mm Purity Charged cartridge</label>
+		<description>Charged shot ammo used by advanced Purity infused assault rifle designs.</description>
+		<graphicData>
+			<texPath>Things/Ammo/Charged/MediumConc</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.7</MarketValue>
+		</statBases>
+		<thingCategories>
+			<li>Ammo6x24mmPurityCharged</li>
+		</thingCategories>
+		<ammoClass>PurityCharged</ammoClass>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="6x24mmBEChargedBase">
+		<defName>Ammo_6x24mmSupremacyCharged</defName>
+		<label>6x24mm Supremacy Charged cartridge</label>
+		<description>Charged shot ammo used by advanced Supremacy infused assault rifle designs.</description>
+		<graphicData>
+			<texPath>Things/Ammo/Charged/MediumRegular</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.7</MarketValue>
+		</statBases>
+		<thingCategories>
+			<li>Ammo6x24mmSupremacyCharged</li>
+		</thingCategories>
+		<ammoClass>SupremacyCharged</ammoClass>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="8x35mmBEChargedBase" ParentName="SpacerSmallAmmoBase" Abstract="True">
+		<statBases>
+			<Mass>0.018</Mass>
+			<Bulk>0.01</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+		</tradeTags>
+		<stackLimit>5000</stackLimit>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="8x35mmBEChargedBase">
+		<defName>Ammo_8x35mmHarmonyCharged</defName>
+		<label>8x35mm Harmony Charged cartridge</label>
+		<description>Charged shot ammo used by advanced Harmony battle rifle designs.</description>
+		<graphicData>
+			<texPath>Things/Ammo/Charged/MediumIon</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>1.55</MarketValue>
+		</statBases>
+		<thingCategories>
+			<li>Ammo8x35mmHarmonyCharged</li>
+		</thingCategories>
+		<ammoClass>HarmonyCharged</ammoClass>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="8x35mmBEChargedBase">
+		<defName>Ammo_8x35mmPurityCharged</defName>
+		<label>8x35mm Purity Charged cartridge</label>
+		<description>Charged shot ammo used by advanced Purity battle rifle designs.</description>
+		<graphicData>
+			<texPath>Things/Ammo/Charged/MediumConc</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>1.55</MarketValue>
+		</statBases>
+		<thingCategories>
+			<li>Ammo8x35mmPurityCharged</li>
+		</thingCategories>
+		<ammoClass>PurityCharged</ammoClass>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="8x35mmBEChargedBase">
+		<defName>Ammo_8x35mmSupremacyCharged</defName>
+		<label>8x35mm Supremacy Charged cartridge</label>
+		<description>Charged shot ammo used by advanced Supremacy battle rifle designs.</description>
+		<graphicData>
+			<texPath>Things/Ammo/Charged/MediumRegular</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>1.55</MarketValue>
+		</statBases>
+		<thingCategories>
+			<li>Ammo8x35mmSupremacyCharged</li>
+		</thingCategories>
+		<ammoClass>SupremacyCharged</ammoClass>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+	<ThingDef Name="Base6x24mmBEChargedBullet" ParentName="BaseBullet" Abstract="true">
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>160</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base6x24mmBEChargedBullet">
+		<defName>Bullet_6x24mmHarmonyCharged</defName>
+		<label>6x24mm Harmony Charged bullet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Harmony</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>13</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>2</amount>
+				</li>
+				<li>
+					<def>HarmonyVenom</def>
+					<amount>2</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>15</armorPenetrationSharp>
+			<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base6x24mmBEChargedBullet">
+		<defName>Bullet_6x24mmPurityCharged</defName>
+		<label>6x24mm Purity Charged bullet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Purity</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>13</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>2</amount>
+				</li>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>5</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>15</armorPenetrationSharp>
+			<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base6x24mmBEChargedBullet">
+		<defName>Bullet_6x24mmSupremacyCharged</defName>
+		<label>6x24mm Supremacy Charged bullet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Supremacy</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>13</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>2</amount>
+				</li>
+				<li>
+					<def>EMP</def>
+					<amount>6</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>15</armorPenetrationSharp>
+			<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
+			<empShieldBreakChance>0.2</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+	<ThingDef Name="Base8x35mmBEChargedBullet" ParentName="BaseBullet" Abstract="true">
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>160</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base8x35mmBEChargedBullet">
+		<defName>Bullet_8x35mmHarmonyCharged</defName>
+		<label>8x35mm Harmony Charged bullet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Harmony</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>19</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>3</amount>
+				</li>
+				<li>
+					<def>HarmonyVenom</def>
+					<amount>4</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>16</armorPenetrationSharp>
+			<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base8x35mmBEChargedBullet">
+		<defName>Bullet_8x35mmPurityCharged</defName>
+		<label>8x35mm Purity Charged bullet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Purity</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>19</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>3</amount>
+				</li>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>8</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>16</armorPenetrationSharp>
+			<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base8x35mmBEChargedBullet">
+		<defName>Bullet_8x35mmSupremacyCharged</defName>
+		<label>8x35mm Supremacy Charged bullet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Supremacy</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>19</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>3</amount>
+				</li>
+				<li>
+					<def>EMP</def>
+					<amount>9</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>16</armorPenetrationSharp>
+			<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
+			<empShieldBreakChance>0.33</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_6x24mmHarmonyCharged</defName>
+		<label>make 6x24mm Harmony Charged cartridge x500</label>
+		<description>Craft 500 6x24mm Harmony Charged cartridges.</description>
+		<jobString>Making 6x24mm Harmony Charged cartridges.</jobString>
+		<researchPrerequisite>CBEATier3Harmony</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Plasteel</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_6x24mmHarmonyCharged>500</Ammo_6x24mmHarmonyCharged>
+		</products>
+		<workAmount>6800</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_6x24mmPurityCharged</defName>
+		<label>make 6x24mm Purity Charged cartridge x500</label>
+		<description>Craft 500 6x24mm Purity Charged cartridges.</description>
+		<jobString>Making 6x24mm Purity Charged cartridges.</jobString>
+		<researchPrerequisite>CBEATier3Purity</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Plasteel</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_6x24mmPurityCharged>500</Ammo_6x24mmPurityCharged>
+		</products>
+		<workAmount>6800</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_6x24mmSupremacyCharged</defName>
+		<label>make 6x24mm Supremacy Charged cartridge x500</label>
+		<description>Craft 500 6x24mm Supremacy Charged cartridges.</description>
+		<jobString>Making 6x24mm Supremacy Charged cartridges.</jobString>
+		<researchPrerequisite>CBEATier3Supremacy</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Plasteel</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_6x24mmSupremacyCharged>500</Ammo_6x24mmSupremacyCharged>
+		</products>
+		<workAmount>6800</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_8x35mmHarmonyCharged</defName>
+		<label>make 8x35mm Harmony Charged cartridge x500</label>
+		<description>Craft 500 8x35mm Harmony Charged cartridges.</description>
+		<jobString>Making 8x35mm Harmony Charged cartridges.</jobString>
+		<researchPrerequisite>CBEATier4Harmony</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>18</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>9</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Plasteel</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_8x35mmCharged>500</Ammo_8x35mmCharged>
+		</products>
+		<workAmount>13600</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_8x35mmPurityCharged</defName>
+		<label>make 8x35mm Purity Charged cartridge x500</label>
+		<description>Craft 500 8x35mm Purity Charged cartridges.</description>
+		<jobString>Making 8x35mm Purity Charged cartridges.</jobString>
+		<researchPrerequisite>CBEATier4Purity</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>18</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>9</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Plasteel</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_8x35mmPurityCharged>500</Ammo_8x35mmPurityCharged>
+		</products>
+		<workAmount>13600</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_8x35mmSupremacyCharged</defName>
+		<label>make 8x35mm Supremacy Charged cartridge x500</label>
+		<description>Craft 500 8x35mm Supremacy Charged cartridges.</description>
+		<jobString>Making 8x35mm Supremacy Charged cartridges.</jobString>
+		<researchPrerequisite>CBEATier4Supremacy</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>18</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>9</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Plasteel</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_8x35mmSupremacyCharged>500</Ammo_8x35mmSupremacyCharged>
+		</products>
+		<workAmount>13600</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Civilization Beyond Earth Armor Sets/Patches/Civilization Beyond Earth Armor Sets/Apparels.xml b/ModPatches/Civilization Beyond Earth Armor Sets/Patches/Civilization Beyond Earth Armor Sets/Apparels.xml
new file mode 100644
index 0000000000..c88e79444e
--- /dev/null
+++ b/ModPatches/Civilization Beyond Earth Armor Sets/Patches/Civilization Beyond Earth Armor Sets/Apparels.xml	
@@ -0,0 +1,527 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--===== Add Smoke res =====-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="Tier1_Helmet" or
+			@Name="Tier2_Helmet" or
+			@Name="Tier3_Helmet" or
+			@Name="Tier4_Helmet"]/statBases</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!--===== Add NV =====-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="Tier2_Helmet" or @Name="Tier3_Helmet"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency_Apparel>0.4</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="Tier4_Helmet"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<!--===== Set Flammability =====-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="Tier1_Helmet" or
+			@Name="Tier2_Helmet" or
+			@Name="Tier3_Helmet" or
+			@Name="Tier4_Helmet"]/statBases</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<!--===== Parts & Layers=====-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="Tier1_Helmet" or
+			@Name="Tier2_Helmet" or
+			@Name="Tier3_Helmet" or
+			@Name="Tier4_Helmet"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Eyes</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="Tier1_Helmet" or
+			@Name="Tier2_Helmet" or
+			@Name="Tier3_Helmet" or
+			@Name="Tier4_Helmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!--===== Partial Armor Coverage =====-->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="Tier1_Helmet" or @Name="Tier2_Helmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.50</ArmorRating_Sharp>
+						<parts>
+							<li>Nose</li>
+							<li>Jaw</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.50</ArmorRating_Blunt>
+						<parts>
+							<li>Nose</li>
+							<li>Jaw</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="Tier3_Helmet" or @Name="Tier4_Helmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!--===== Add RadioPack =====-->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="Tier1_Helmet" or
+			@Name="Tier2_Helmet" or
+			@Name="Tier3_Helmet" or
+			@Name="Tier4_Helmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.ApparelDefExtension">
+				<isRadioPack>true</isRadioPack>
+			</li>
+		</value>
+	</Operation>
+
+	<!--===== Helmet =====-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="Tier1_Helmet"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Tier1_Helmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Tier1_Helmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>27</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tier1_Modded_Helmet_Soldier"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tier1_Modded_Helmet_Soldier"]/statBases</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tier1_Modded_Helmet_Soldier"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>11</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tier1_Modded_Helmet_Soldier"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>27.7</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="Tier2_Helmet"]/statBases</xpath>
+		<value>
+			<Bulk>4.5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Tier2_Helmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12.8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Tier2_Helmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>28</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Tier2_Helmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>3</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="Tier3_Helmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Tier3_Helmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Tier3_Helmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Tier3_Helmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>4.8</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="Tier4_Helmet"]/statBases</xpath>
+		<value>
+			<Bulk>7</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Tier4_Helmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>21</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Tier4_Helmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>50</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Tier4_Helmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>6.6</Mass>
+		</value>
+	</Operation>
+
+	<!--===== Armor =====-->
+	<!--===== Set Flammability =====-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			@Name="Tier1_Armor" or
+			defName="Tier1_Modded_Armor_Soldier" or
+			@Name="Tier2_Armor" or
+			@Name="Tier3_Armor" or
+			@Name="Tier4_Armor"]/statBases</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<!--===== Hands and Feet =====-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			@Name="Tier1_Armor" or
+			defName="Tier1_Modded_Armor_Soldier" or
+			@Name="Tier2_Armor" or
+			@Name="Tier3_Armor" or
+			@Name="Tier4_Armor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<!--===== Partial Armor =====-->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[
+			@Name="Tier1_Armor" or
+			defName="Tier1_Modded_Armor_Soldier" or
+			@Name="Tier2_Armor" or
+			@Name="Tier3_Armor" or
+			@Name="Tier4_Armor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!--===== Remove Boots & Glove =====-->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Tier1_Boots" or defName="Tier1_Glove"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="Tier1_Armor"]/statBases</xpath>
+		<value>
+			<Bulk>46.67</Bulk>
+			<WornBulk>7</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Tier1_Armor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Tier1_Armor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>33.75</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="Tier1_Armor"]/equippedStatOffsets</xpath>
+		<value>
+			<Bulk>50</Bulk>
+			<CarryBulk>7</CarryBulk>
+		</value>
+	</Operation>
+
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tier1_Modded_Armor_Soldier"]/statBases</xpath>
+		<value>
+			<Bulk>46.67</Bulk>
+			<WornBulk>7</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tier1_Modded_Armor_Soldier"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tier1_Modded_Armor_Soldier"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>35</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="Tier2_Armor"]/statBases</xpath>
+		<value>
+			<Bulk>80</Bulk>
+			<WornBulk>12</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Tier2_Armor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Tier2_Armor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>40</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Tier2_Armor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>30</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="Tier2_Armor"]/equippedStatOffsets</xpath>
+		<value>
+			<Bulk>60</Bulk>
+			<CarryBulk>8</CarryBulk>
+			<CarryWeight>50</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="Tier3_Armor"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Tier3_Armor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Tier3_Armor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Tier3_Armor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>50</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="Tier3_Armor"]/equippedStatOffsets</xpath>
+		<value>
+			<Bulk>80</Bulk>
+			<CarryBulk>10</CarryBulk>
+			<CarryWeight>80</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="Tier4_Armor"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Tier4_Armor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>26</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Tier4_Armor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>55</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Tier4_Armor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>80</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="Tier4_Armor"]/equippedStatOffsets</xpath>
+		<value>
+			<Bulk>80</Bulk>
+			<CarryBulk>20</CarryBulk>
+			<CarryWeight>80</CarryWeight>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Civilization Beyond Earth Armor Sets/Patches/Civilization Beyond Earth Armor Sets/Weapons.xml b/ModPatches/Civilization Beyond Earth Armor Sets/Patches/Civilization Beyond Earth Armor Sets/Weapons.xml
new file mode 100644
index 0000000000..7e415d4573
--- /dev/null
+++ b/ModPatches/Civilization Beyond Earth Armor Sets/Patches/Civilization Beyond Earth Armor Sets/Weapons.xml	
@@ -0,0 +1,603 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Tier1_Carbine_Soldier" or
+			defName="Tier1_Carbine_Soldier_Modded" or
+			@Name="Tier2_Weapon" or
+			@Name="Tier3_Weapon" or
+			@Name="Tier4_Weapon"]/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>
+
+	<!--===== Tier1_Carbine_Soldier =====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Tier1_Carbine_Soldier</defName>
+		<statBases>
+			<Mass>2.50</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.94</SwayFactor>
+			<Bulk>4.50</Bulk>
+			<WorkToMake>25500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<Chemfuel>10</Chemfuel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.08</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>25</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>Tier1_SMG_Gun_Sound</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!--===== Tier1_Carbine_Soldier_Modded =====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Tier1_Carbine_Soldier_Modded</defName>
+		<statBases>
+			<Mass>2.50</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.94</SwayFactor>
+			<Bulk>4.50</Bulk>
+			<WorkToMake>25500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>45</Steel>
+			<Chemfuel>12</Chemfuel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.08</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_300AACBlackout_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>25</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>Tier1_silenced-pistol-sound-effect</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_300AACBlackout</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!--===== Tier2_Soldier_Gun =====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Tier2_Soldier_Gun</defName>
+		<statBases>
+			<Mass>3.26</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>10.03</Bulk>
+			<WorkToMake>30000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>55</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>Tier2_Rifle_Gun_Sound</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>45</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!--===== Tier3_Harmony_Gun =====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Tier3_Harmony_Gun</defName>
+		<statBases>
+			<Mass>3.0</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.20</SwayFactor>
+			<Bulk>7.00</Bulk>
+			<WorkToMake>50000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<Plasteel>30</Plasteel>
+			<ComponentIndustrial>11</ComponentIndustrial>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>1.51</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmHarmonyCharged</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>55</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>6</burstShotCount>
+			<soundCast>Tier3_Harmony_Rifle_Sound</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>45</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_6x24mmHarmonyCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!--===== Tier3_Supremacy_Gun =====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Tier3_Supremacy_Gun</defName>
+		<statBases>
+			<Mass>3.0</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.20</SwayFactor>
+			<Bulk>7.00</Bulk>
+			<WorkToMake>50000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<Plasteel>30</Plasteel>
+			<ComponentIndustrial>11</ComponentIndustrial>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>1.51</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmSupremacyCharged</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>55</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>6</burstShotCount>
+			<soundCast>Tier3_Supremacy_Rifle_Sound</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>45</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_6x24mmSupremacyCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!--===== Tier3_Purity_Gun =====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Tier3_Purity_Gun</defName>
+		<statBases>
+			<Mass>3.0</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.20</SwayFactor>
+			<Bulk>7.00</Bulk>
+			<WorkToMake>50000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<Plasteel>30</Plasteel>
+			<ComponentIndustrial>11</ComponentIndustrial>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>1.51</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmPurityCharged</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>55</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>6</burstShotCount>
+			<soundCast>Tier3_Purity_Rifle_Sound</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>45</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_6x24mmPurityCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!--===== Tier4_Harmony_Gun =====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Tier4_Harmony_Gun</defName>
+		<statBases>
+			<WorkToMake>60000</WorkToMake>
+			<Mass>9.0</Mass>
+			<Bulk>16.46</Bulk>
+			<SwayFactor>1.26</SwayFactor>
+			<ShotSpread>0.05</ShotSpread>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>70</Steel>
+			<Plasteel>35</Plasteel>
+			<Chemfuel>15</Chemfuel>
+			<ComponentIndustrial>11</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_8x35mmHarmonyCharged</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>1.2</warmupTime>
+			<range>62</range>
+			<soundCast>Tier3_Harmony_Rifle_Sound</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilAmount>1.16</recoilAmount>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_8x35mmHarmonyCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!--===== Tier4_Supremacy_Gun =====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Tier4_Supremacy_Gun</defName>
+		<statBases>
+			<WorkToMake>60000</WorkToMake>
+			<Mass>9.0</Mass>
+			<Bulk>16.46</Bulk>
+			<SwayFactor>1.26</SwayFactor>
+			<ShotSpread>0.05</ShotSpread>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>70</Steel>
+			<Plasteel>35</Plasteel>
+			<Chemfuel>15</Chemfuel>
+			<ComponentIndustrial>11</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_8x35mmSupremacyCharged</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>1.2</warmupTime>
+			<range>62</range>
+			<soundCast>Tier3_Supremacy_Rifle_Sound</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilAmount>1.16</recoilAmount>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_8x35mmSupremacyCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!--===== Tier4_Purity_Gun =====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Tier4_Purity_Gun</defName>
+		<statBases>
+			<WorkToMake>60000</WorkToMake>
+			<Mass>9.0</Mass>
+			<Bulk>16.46</Bulk>
+			<SwayFactor>1.26</SwayFactor>
+			<ShotSpread>0.05</ShotSpread>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>70</Steel>
+			<Plasteel>35</Plasteel>
+			<Chemfuel>15</Chemfuel>
+			<ComponentIndustrial>11</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_8x35mmPurityCharged</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>1.2</warmupTime>
+			<range>62</range>
+			<soundCast>Tier4_Purity_Rifle_Sound</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilAmount>1.16</recoilAmount>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_8x35mmPurityCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!--===== Tier4_Purity+Supremacy_Gun =====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Tier4_Eidolon_Gun</defName>
+		<statBases>
+			<WorkToMake>60000</WorkToMake>
+			<Mass>9.0</Mass>
+			<Bulk>16.46</Bulk>
+			<SwayFactor>1.26</SwayFactor>
+			<ShotSpread>0.05</ShotSpread>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>70</Steel>
+			<Plasteel>35</Plasteel>
+			<Chemfuel>15</Chemfuel>
+			<ComponentIndustrial>11</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmPurityCharged</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>1.2</warmupTime>
+			<range>62</range>
+			<soundCast>Tier3_Purity_Rifle_Sound</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilAmount>1.16</recoilAmount>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_6x24mmPuritySupremacyCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!--===== Tier4_Purity+Harmony_Gun =====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Tier4_Champion_Gun</defName>
+		<statBases>
+			<WorkToMake>60000</WorkToMake>
+			<Mass>9.0</Mass>
+			<Bulk>16.46</Bulk>
+			<SwayFactor>1.26</SwayFactor>
+			<ShotSpread>0.05</ShotSpread>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>70</Steel>
+			<Plasteel>35</Plasteel>
+			<Chemfuel>15</Chemfuel>
+			<ComponentIndustrial>11</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmPurityCharged</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>1.2</warmupTime>
+			<range>62</range>
+			<soundCast>Tier3_Purity_Rifle_Sound</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilAmount>1.16</recoilAmount>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_6x24mmPurityHarmonyCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!--===== Tier4_Harmony+Supremacy_Gun =====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Tier4_Hellion_Gun</defName>
+		<statBases>
+			<WorkToMake>60000</WorkToMake>
+			<Mass>9.0</Mass>
+			<Bulk>16.46</Bulk>
+			<SwayFactor>1.26</SwayFactor>
+			<ShotSpread>0.05</ShotSpread>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>70</Steel>
+			<Plasteel>35</Plasteel>
+			<Chemfuel>15</Chemfuel>
+			<ComponentIndustrial>11</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmSupremacyCharged</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>1.2</warmupTime>
+			<range>62</range>
+			<soundCast>Tier3_Purity_Rifle_Sound</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilAmount>1.16</recoilAmount>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_6x24mmHarmonySupremacyCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Clay Soldier Race/Patches/Clay Soldier Race/Bodies/Golem_Bodytype.xml b/ModPatches/Clay Soldier Race/Patches/Clay Soldier Race/Bodies/Golem_Bodytype.xml
new file mode 100644
index 0000000000..3b12a0f9b3
--- /dev/null
+++ b/ModPatches/Clay Soldier Race/Patches/Clay Soldier Race/Bodies/Golem_Bodytype.xml	
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Arm Groups-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="CM_Golem"]//*[
+			customLabel="left shoulder"
+			]/groups
+		</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="CM_Golem"]//*[
+			customLabel="right shoulder"
+			]/groups
+		</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="CM_Golem"]//*[
+			customLabel="left arm"
+			]/groups
+		</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="CM_Golem"]//*[
+			customLabel="right arm"
+			]/groups
+		</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+
+	<!--Natural Armor-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="CM_Golem"]//*[
+			def="CM_Torso" or
+			def="CM_Neck" or
+			def="Head" or
+			def="CM_Ear" or
+			def="CM_Nose" or
+			def="CM_Jaw" or
+			def="CM_Shoulder" or
+			def="CM_Arm" or
+			def="CM_Hand" or
+			def="CM_Finger" or
+			def="CM_Leg" or
+			def="CM_Foot" or
+			def="CM_Toe"
+			]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="CM_Golem"]//*[
+			def="CM_Nose" or
+			def="CM_Jaw" or
+			def="CM_Eye" ]/groups
+		</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Clay Soldier Race/Patches/Clay Soldier Race/ThingDefs_Races/AlienRace_Claygolem.xml b/ModPatches/Clay Soldier Race/Patches/Clay Soldier Race/ThingDefs_Races/AlienRace_Claygolem.xml
new file mode 100644
index 0000000000..a2b2690b50
--- /dev/null
+++ b/ModPatches/Clay Soldier Race/Patches/Clay Soldier Race/ThingDefs_Races/AlienRace_Claygolem.xml	
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Claymanman"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Claymanman"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Claymanman"]</xpath>
+			<value>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Claymanman"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Inventory"/>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Claymanman"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Claymanman"]/statBases</xpath>
+		<value>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>0</Suppressability>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!--Human-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Claymanman"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Add loadout update behavior ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThinkTreeDef[defName="CL_Golem"]/thinkRoot/subNodes/li[@Class="ThinkNode_ConditionalColonist"]/subNodes</xpath>
+		<value>
+			<li Class="CombatExtended.JobGiver_UpdateLoadout"/>
+			<li Class="CombatExtended.JobGiver_CheckReload"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Colony Leadership/Patches/Colony Leadership/WarriorLeadership.xml b/ModPatches/Colony Leadership/Patches/Colony Leadership/WarriorLeadership.xml
new file mode 100644
index 0000000000..41355787e2
--- /dev/null
+++ b/ModPatches/Colony Leadership/Patches/Colony Leadership/WarriorLeadership.xml	
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="leader2"]/stages/li[1]/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<TradePriceImprovement>+0.05</TradePriceImprovement>
+				<NegotiationAbility>+0.05</NegotiationAbility>
+				<MoveSpeed>+0.10</MoveSpeed>
+				<MeleeHitChance>+0.05</MeleeHitChance>
+				<MedicalTendQualityOffset>+0.05</MedicalTendQualityOffset>
+				<Suppressability>-0.12</Suppressability>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="leader2"]/stages/li[1]/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<TradePriceImprovement>+0.10</TradePriceImprovement>
+				<NegotiationAbility>+0.10</NegotiationAbility>
+				<MoveSpeed>+0.20</MoveSpeed>
+				<MeleeHitChance>+0.15</MeleeHitChance>
+				<MedicalTendQualityOffset>+0.10</MedicalTendQualityOffset>
+				<Suppressability>-0.25</Suppressability>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="leader2"]/stages/li[1]/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<TradePriceImprovement>+0.15</TradePriceImprovement>
+				<NegotiationAbility>+0.15</NegotiationAbility>
+				<MoveSpeed>+0.3</MoveSpeed>
+				<MeleeHitChance>+0.30</MeleeHitChance>
+				<MedicalTendQualityOffset>+0.2</MedicalTendQualityOffset>
+				<Suppressability>-0.4</Suppressability>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="leaderAura2"]/stages/li[1]/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<MoveSpeed>+0.10</MoveSpeed>
+				<MeleeHitChance>+0.05</MeleeHitChance>
+				<MeleeWeapon_CooldownMultiplier>0.96</MeleeWeapon_CooldownMultiplier>
+				<MedicalTendQualityOffset>+0.05</MedicalTendQualityOffset>
+				<Suppressability>-0.1</Suppressability>
+				<ShootingAccuracyPawn>0.1</ShootingAccuracyPawn>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="leaderAura2"]/stages/li[2]/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<MoveSpeed>+0.20</MoveSpeed>
+				<MeleeHitChance>+0.15</MeleeHitChance>
+				<MeleeWeapon_CooldownMultiplier>0.92</MeleeWeapon_CooldownMultiplier>
+				<MedicalTendQualityOffset>+0.1</MedicalTendQualityOffset>
+				<Suppressability>-0.2</Suppressability>
+				<ShootingAccuracyPawn>0.2</ShootingAccuracyPawn>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="leaderAura2"]/stages/li[3]/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<MoveSpeed>+0.30</MoveSpeed>
+				<MeleeHitChance>+0.25</MeleeHitChance>
+				<MeleeWeapon_CooldownMultiplier>0.87</MeleeWeapon_CooldownMultiplier>
+				<MedicalTendQualityOffset>+0.15</MedicalTendQualityOffset>
+				<Suppressability>-0.35</Suppressability>
+				<ShootingAccuracyPawn>0.35</ShootingAccuracyPawn>
+			</statOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Combat Enthusiast's Collection/Patches/Combat Enthusiast's Collection/ThingDefs_Weapons.xml b/ModPatches/Combat Enthusiast's Collection/Patches/Combat Enthusiast's Collection/ThingDefs_Weapons.xml
new file mode 100644
index 0000000000..a80499c24a
--- /dev/null
+++ b/ModPatches/Combat Enthusiast's Collection/Patches/Combat Enthusiast's Collection/ThingDefs_Weapons.xml	
@@ -0,0 +1,1103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--  ==========Guns==========  -->
+
+	<!-- AN-94 -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CEC_BurstRifle</defName>
+		<statBases>
+			<Mass>3.85</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>7.28</Bulk>
+			<WorkToMake>48000</WorkToMake>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.29</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>CEC_AN94Shot</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>false</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!-- HK G11 -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CEC_ClockworkAR</defName>
+		<statBases>
+			<Bulk>7.50</Bulk>
+			<Mass>3.65</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.25</SightsEfficiency>
+			<SwayFactor>1.15</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<WorkToMake>55000</WorkToMake>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.30</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_473x33mmCaseless_FMJ</defaultProjectile>
+			<warmupTime>1.225</warmupTime>
+			<range>48</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<soundCast>CEC_G11Shot</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>45</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_473x33mmCaseless</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<researchPrerequisite>Fabrication</researchPrerequisite>
+	</Operation>
+
+	<!-- AS Val -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CEC_SSRifle</defName>
+		<statBases>
+			<Mass>2.50</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.13</SwayFactor>
+			<Bulk>6.15</Bulk>
+			<WorkToMake>35000</WorkToMake>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.94</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<burstShotCount>4</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>CEC_SuppressedShot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!-- A-545 -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CEC_MRS</defName>
+		<statBases>
+			<Mass>3.30</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.29</SwayFactor>
+			<Bulk>7.20</Bulk>
+			<WorkToMake>43000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<recoilAmount>1.39</recoilAmount>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>CEC_A545Shot</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>false</noSnapshot>
+			<noSingleShot>false</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!-- AKS-47UN -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CEC_CompactSR</defName>
+		<statBases>
+			<Mass>2.49</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.98</SwayFactor>
+			<Bulk>4.90</Bulk>
+			<WorkToMake>28000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<recoilAmount>1.60</recoilAmount>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>0.9</warmupTime>
+			<range>31</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>CEC_AKS74UShot</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<noSnapshot>false</noSnapshot>
+			<noSingleShot>false</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+		<researchPrerequisite>GasOperation</researchPrerequisite>
+	</Operation>
+
+	<!-- Zip 22 -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CEC_Zipper</defName>
+		<statBases>
+			<Mass>0.43</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.28</ShotSpread>
+			<SwayFactor>0.76</SwayFactor>
+			<Bulk>1.84</Bulk>
+			<WorkToMake>3000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_22LR_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_22LR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<noSnapshot>false</noSnapshot>
+			<noSingleShot>false</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_Pistol</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+		<researchPrerequisite>Gunsmithing</researchPrerequisite>
+	</Operation>
+
+	<!-- Colt Dragoon -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CEC_BigIron</defName>
+		<statBases>
+			<Mass>1.90</Mass>
+			<RangedWeapon_Cooldown>0.88</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.88</SwayFactor>
+			<Bulk>3.75</Bulk>
+			<WorkToMake>6000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_44Magnum_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>CEC_DragoonShot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>5.1</reloadTime>
+			<ammoSet>AmmoSet_44Magnum</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<noSnapshot>false</noSnapshot>
+			<noSingleShot>false</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_Pistol</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+		<researchPrerequisite>Gunsmithing</researchPrerequisite>
+	</Operation>
+
+	<!-- THUN-DER! -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CEC_Thunder</defName>
+		<statBases>
+			<Mass>5.44</Mass>
+			<RangedWeapon_Cooldown>0.92</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.10</ShotSpread>
+			<SwayFactor>3.25</SwayFactor>
+			<Bulk>4.30</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>1.85</warmupTime>
+			<range>16</range>
+			<soundCast>Shot_TurretSniper</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>4</AmmoGenPerMagOverride>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>false</noSnapshot>
+			<noSingleShot>false</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>SimpleGun</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CEC_Thunder"]/recipeMaker</xpath>
+	</Operation>
+
+	<!-- FiveSeven -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CEC_FiveSeven</defName>
+		<statBases>
+			<Mass>0.61</Mass>
+			<RangedWeapon_Cooldown>0.836</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.90</SwayFactor>
+			<Bulk>2.08</Bulk>
+			<WorkToMake>10000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>18.5</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_FN57x28mm</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<noSnapshot>false</noSnapshot>
+			<noSingleShot>false</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_Pistol</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+		<researchPrerequisite>BlowbackOperation</researchPrerequisite>
+	</Operation>
+
+	<!-- P90 -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CEC_PDW</defName>
+		<statBases>
+			<WorkToMake>34000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>0.93</SwayFactor>
+			<Bulk>6.67</Bulk>
+			<Mass>2.6</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
+			<warmupTime>0.4</warmupTime>
+			<range>15</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>Shot_HeavySMG</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+			<recoilAmount>0.66</recoilAmount>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_FN57x28mm</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+		<researchPrerequisite>BlowbackOperation</researchPrerequisite>
+	</Operation>
+
+	<!-- Suomi KP-31 -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CEC_WoodlandSMG</defName>
+		<statBases>
+			<Mass>4.60</Mass>
+			<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>8.70</Bulk>
+			<WorkToMake>26000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<recoilAmount>1.08</recoilAmount>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>CEC_SuomiShot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>36</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>4</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<noSnapshot>false</noSnapshot>
+			<noSingleShot>false</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+		<researchPrerequisite>BlowbackOperation</researchPrerequisite>
+	</Operation>
+
+	<!-- Skorpion Evo -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CEC_SkorpionEvo</defName>
+		<statBases>
+			<Mass>2.60</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>0.93</SwayFactor>
+			<Bulk>4.10</Bulk>
+			<WorkToMake>26000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<recoilAmount>1.44</recoilAmount>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<noSnapshot>false</noSnapshot>
+			<noSingleShot>false</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<researchPrerequisite>BlowbackOperation</researchPrerequisite>
+	</Operation>
+
+	<!-- MG-42 -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CEC_TMG</defName>
+		<statBases>
+			<Mass>15.20</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.67</SwayFactor>
+			<Bulk>11.60</Bulk>
+			<WorkToMake>18000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>140</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+			<WoodLog>5</WoodLog>
+		</costList>
+		<Properties>
+			<recoilAmount>1.25</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>65</range>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>CEC_MG42Shot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>Bipod_LMG</li>
+		</weaponTags>
+		<researchPrerequisite>GasOperation</researchPrerequisite>
+	</Operation>
+
+	<!-- LWAMG -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CEC_LWAMG</defName>
+		<statBases>
+			<Mass>8.20</Mass>
+			<RangedWeapon_Cooldown>0.58</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>13.0</Bulk>
+			<WorkToMake>42000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<recoilAmount>1.4</recoilAmount>
+			<recoilPattern>Mounted</recoilPattern>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>68</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>CEC_KnightsLWAMGShot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<noSnapshot>false</noSnapshot>
+			<noSingleShot>false</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>CE_MachineGun</li>
+			<li>CE_AI_Suppressive</li>
+			<li>Bipod_SAW</li>
+		</weaponTags>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!-- M14 -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CEC_BattleRifle</defName>
+		<statBases>
+			<Mass>4.10</Mass>
+			<RangedWeapon_Cooldown>0.41</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.54</SwayFactor>
+			<Bulk>11.26</Bulk>
+			<WorkToMake>16000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<recoilAmount>3.38</recoilAmount>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>59</range>
+			<burstShotCount>4</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>CEC_M14Shot</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4.0</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>false</noSnapshot>
+			<noSingleShot>false</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>IndustrialGunAdvanced</li>
+			<li>SniperRifle</li>
+		</weaponTags>
+		<researchPrerequisite>GasOperation</researchPrerequisite>
+	</Operation>
+
+	<!-- M200 Intervention -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CEC_Intervention</defName>
+		<statBases>
+			<Mass>14.10</Mass>
+			<RangedWeapon_Cooldown>1.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.72</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.98</SwayFactor>
+			<Bulk>12.87</Bulk>
+			<WorkToMake>59000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_408CheyenneTactical_FMJ</defaultProjectile>
+			<warmupTime>1.90</warmupTime>
+			<range>75</range>
+			<soundCast>CEC_InterventionShot</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>4.0</reloadTime>
+			<ammoSet>AmmoSet_408CheyenneTactical</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>false</noSnapshot>
+			<noSingleShot>false</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>SniperRifle</li>
+			<li>IndustrialGunAdvanced</li>
+			<li>Bipod_AMR</li>
+		</weaponTags>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!-- NTW-20 -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CEC_AntiMaterielRifle</defName>
+		<statBases>
+			<Mass>31.0</Mass>
+			<RangedWeapon_Cooldown>1.08</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.72</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>3.51</SwayFactor>
+			<Bulk>18.95</Bulk>
+			<WorkToMake>64000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<recoilPattern>Mounted</recoilPattern>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_20x110mmHispano_AP</defaultProjectile>
+			<warmupTime>1.90</warmupTime>
+			<range>86</range>
+			<soundCast>CEC_NTW20Shot</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
+			<reloadTime>1</reloadTime>
+			<ammoSet>AmmoSet_20x110mmHispano</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>false</noSnapshot>
+			<noSingleShot>false</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>SniperRifle</li>
+			<li>Bipod_ATR</li>
+		</weaponTags>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!-- DVL-10 Saboteur -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CEC_DVLTen</defName>
+		<statBases>
+			<Mass>4.80</Mass>
+			<RangedWeapon_Cooldown>1.40</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.60</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.11</SwayFactor>
+			<Bulk>11.04</Bulk>
+			<WorkToMake>47000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.46</warmupTime>
+			<range>75</range>
+			<soundCast>CEC_DVL10Shot</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4.0</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>false</noSnapshot>
+			<noSingleShot>false</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>SniperRifle</li>
+			<li>Bipod_DMR</li>
+		</weaponTags>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!-- WA 2000 -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CEC_BullpupSniper</defName>
+		<statBases>
+			<Mass>7.20</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.7</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.73</SwayFactor>
+			<Bulk>9.05</Bulk>
+			<WorkToMake>52000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.60</warmupTime>
+			<range>75</range>
+			<soundCast>CEC_WA2000Shot</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>false</noSnapshot>
+			<noSingleShot>false</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>SniperRifle</li>
+			<li>Bipod_DMR</li>
+		</weaponTags>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!-- Super Shorty -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CEC_MuffaloCannon</defName>
+		<statBases>
+			<Mass>1.80</Mass>
+			<RangedWeapon_Cooldown>1.01</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>2.00</SwayFactor>
+			<Bulk>4.19</Bulk>
+			<WorkToMake>10000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.60</warmupTime>
+			<range>12</range>
+			<soundCast>CEC_SuperShortyShot</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>2</magazineSize>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+			<reloadOneAtATime>true</reloadOneAtATime>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<noSnapshot>false</noSnapshot>
+			<noSingleShot>false</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_Pistol</li>
+			<li>IndustrialGunAdvanced</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+		<researchPrerequisite>Gunsmithing</researchPrerequisite>
+	</Operation>
+
+	<!-- UTS-15 -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CEC_CombatShotgun</defName>
+		<statBases>
+			<Mass>3.10</Mass>
+			<RangedWeapon_Cooldown>0.99</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.03</SwayFactor>
+			<Bulk>7.20</Bulk>
+			<WorkToMake>27000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.60</warmupTime>
+			<range>16</range>
+			<soundCast>CEC_UTS15Shot</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>14</magazineSize>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+			<reloadOneAtATime>true</reloadOneAtATime>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<noSnapshot>false</noSnapshot>
+			<noSingleShot>false</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<researchPrerequisite>GasOperation</researchPrerequisite>
+	</Operation>
+
+	<!-- PAW-20 -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CEC_Neopup</defName>
+		<statBases>
+			<Mass>5.90</Mass>
+			<RangedWeapon_Cooldown>0.41</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.10</ShotSpread>
+			<SwayFactor>1.44</SwayFactor>
+			<Bulk>7.70</Bulk>
+			<WorkToMake>22000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<recoilAmount>0.41</recoilAmount>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_20x42mmGrenade_HE</defaultProjectile>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<warmupTime>1</warmupTime>
+			<range>62</range>
+			<minRange>4</minRange>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_20x42mmGrenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<noSnapshot>false</noSnapshot>
+			<noSingleShot>false</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Launcher</li>
+		</weaponTags>
+		<researchPrerequisite>CE_Launchers</researchPrerequisite>
+	</Operation>
+
+	<!-- Tactical Sledgehammer -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CEC_TacticalSledgeHammer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.78</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>1.000</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>2.36</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>12.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CEC_TacticalSledgeHammer"]/statBases/Mass</xpath>
+		<value>
+			<Mass>5.76</Mass>
+			<Bulk>9</Bulk>
+			<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CEC_TacticalSledgeHammer"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>2.30</MeleeCritChance>
+				<MeleeParryChance>0.18</MeleeParryChance>
+				<MeleeDodgeChance>0.30</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- ========== Tools ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="CEC_Zipper" or
+			defName="CEC_MuffaloCannon" or
+			defName="CEC_FiveSeven" or
+			defName="CEC_Thunder" or
+			defName="CEC_BigIron"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="CEC_BurstRifle" or
+			defName="CEC_ClockworkAR" or
+			defName="CEC_MRS" or
+			defName="CEC_SSRifle" or
+			defName="CEC_CompactSR" or
+			defName="CEC_Neopup" or
+			defName="CEC_CombatShotgun" or
+			defName="CEC_BullpupSniper" or
+			defName="CEC_DVLTen" or
+			defName="CEC_AntiMaterielRifle" or
+			defName="CEC_Intervention" or
+			defName="CEC_BattleRifle" or
+			defName="CEC_LWAMG" or
+			defName="CEC_WoodlandSMG" or
+			defName="CEC_PDW" or
+			defName="CEC_TMG" or
+			defName="CEC_SkorpionEvo"
+			]/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>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Comigo's Fancy Floating Turrets/Patches/Comigo's Fancy Floating Turrets/ThingDefs_Turrets.xml b/ModPatches/Comigo's Fancy Floating Turrets/Patches/Comigo's Fancy Floating Turrets/ThingDefs_Turrets.xml
new file mode 100644
index 0000000000..14a89bb1db
--- /dev/null
+++ b/ModPatches/Comigo's Fancy Floating Turrets/Patches/Comigo's Fancy Floating Turrets/ThingDefs_Turrets.xml	
@@ -0,0 +1,252 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Remove refuelable property -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName = "COMIGO_FloatingTurret_Simple" or
+			defName = "COMIGO_FloatingTurret_Double" or
+			defName = "COMIGO_FloatingTurret_Slug" or
+			defName = "COMIGO_FloatingTurret_EMP"
+			]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
+	</Operation>
+
+	<!-- Replace vanilla thingClass -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "COMIGO_FloatingTurret_Simple" or
+			defName = "COMIGO_FloatingTurret_Slug" or
+			defName = "COMIGO_FloatingTurret_Double" or
+			defName = "COMIGO_FloatingTurret_EMP"
+			]/thingClass </xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<!-- Make turrets taller -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "COMIGO_FloatingTurret_Simple" or
+			defName = "COMIGO_FloatingTurret_Double" or
+			defName = "COMIGO_FloatingTurret_Slug" or
+			defName = "COMIGO_FloatingTurret_EMP"
+			]/fillPercent </xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName = "COMIGO_FloatingTurret_Simple" or
+			defName = "COMIGO_FloatingTurret_Double" or
+			defName = "COMIGO_FloatingTurret_Slug" or
+			defName = "COMIGO_FloatingTurret_EMP"
+			]/statBases </xpath>
+		<value>
+			<AimingAccuracy>0.25</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "COMIGO_FloatingTurret_Simple" or
+			defName = "COMIGO_FloatingTurret_Double" or
+			defName = "COMIGO_FloatingTurret_Slug" or
+			defName = "COMIGO_FloatingTurret_EMP"
+			]/statBases/ShootingAccuracyTurret </xpath>
+		<value>
+			<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "COMIGO_FloatingTurret_Simple" or
+			defName = "COMIGO_FloatingTurret_Double" or
+			defName = "COMIGO_FloatingTurret_Slug" or
+			defName = "COMIGO_FloatingTurret_EMP"
+			]/building/turretBurstCooldownTime </xpath>
+		<value>
+			<turretBurstCooldownTime>1.6</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<!-- Simple Turret -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>COMIGO_FloatingTurret_Simple_Gun</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.65</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>0.82</SwayFactor>
+			<Bulk>10.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.76</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>48</range>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<burstShotCount>5</burstShotCount>
+			<soundCast>GunShotA</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- Double Simple Turret -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>COMIGO_FloatingTurret_Double_Gun</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.65</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>0.82</SwayFactor>
+			<Bulk>10.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.76</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>48</range>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>GunShotA</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>12</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- Slug Turret -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="COMIGO_FloatingTurret_Slug"]/description</xpath>
+		<value>
+			<description>An anchored turret that can float on water and fires a heavy round, capable of defeating armor at long distance.</description>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "COMIGO_FloatingTurret_Slug"]/researchPrerequisites</xpath>
+		<value>
+			<researchPrerequisites>
+				<li>CE_TurretHeavyWeapons</li>
+			</researchPrerequisites>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>COMIGO_FloatingTurret_Slug_Gun</defName>
+		<statBases>
+			<MarketValue>2000</MarketValue>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.6</SwayFactor>
+			<RangedWeapon_Cooldown>0.76</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.52</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_145x114mm_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
+			<burstShotCount>8</burstShotCount>
+			<soundCast>HeavyMG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>16</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>8.4</reloadTime>
+			<ammoSet>AmmoSet_145x114mm</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- EMP Turret -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="COMIGO_FloatingTurret_EMP"]/description</xpath>
+		<value>
+			<description>An anchored turret that can float and that launches various explosive shells.</description>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="COMIGO_FloatingTurret_EMP"]/label</xpath>
+		<value>
+			<label>Floating turret with a grenade launcher</label>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>COMIGO_FloatingTurret_EMP_Gun</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.20</SwayFactor>
+			<Bulk>8.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.83</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_25x40mmGrenade_HE</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>3</burstShotCount>
+			<soundCast>Shot_IncendiaryLauncher</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>18</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_25x40mmGrenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Communitable Diseases/Patches/Communitable Diseases/Communitable_Disease_Apparel.xml b/ModPatches/Communitable Diseases/Patches/Communitable Diseases/Communitable_Disease_Apparel.xml
new file mode 100644
index 0000000000..76c4eee258
--- /dev/null
+++ b/ModPatches/Communitable Diseases/Patches/Communitable Diseases/Communitable_Disease_Apparel.xml	
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ====================== Dust Mask ===================== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_DustMask"]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>Overhead</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_DustMask"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>Teeth</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<!-- ====================== Respirator ===================== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Respirator"]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>Overhead</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Respirator"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>Teeth</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Cossacks of the Rim/Patches/Cossacks of the Rim/Cossack_Apparel.xml b/ModPatches/Cossacks of the Rim/Patches/Cossacks of the Rim/Cossack_Apparel.xml
new file mode 100644
index 0000000000..ce74bde8ec
--- /dev/null
+++ b/ModPatches/Cossacks of the Rim/Patches/Cossacks of the Rim/Cossack_Apparel.xml	
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ======= Cossack headgear ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Cossack_floppy_cap" or defName="Cossack_noble_fur_hat"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Cossack_floppy_cap" or defName="Cossack_noble_fur_hat"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ======= Cossack garment ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Cossack_garment" or defName="Cossack_noble_garment"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Cossack_garment" or defName="Cossack_noble_garment"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ======= Cossack fur coat ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Cossack_fur_coat" or defName="Cossack_royal_cloak"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Cossack_fur_coat" or defName="Cossack_royal_cloak"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Cossacks of the Rim/Patches/Cossacks of the Rim/Cossack_MeleeMedieval.xml b/ModPatches/Cossacks of the Rim/Patches/Cossacks of the Rim/Cossack_MeleeMedieval.xml
new file mode 100644
index 0000000000..b9ba9437b0
--- /dev/null
+++ b/ModPatches/Cossacks of the Rim/Patches/Cossacks of the Rim/Cossack_MeleeMedieval.xml	
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === Cossack Mace === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_CossackNobleMace"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_CossackNobleMace"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.42</MeleeCritChance>
+				<MeleeParryChance>0.24</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_CossackNobleMace"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_CossackNobleMace"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>2</cooldownTime>
+					<chanceFactor>0.90</chanceFactor>
+					<armorPenetrationBlunt>7.125</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Cossacks Saber === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_CossackSabre"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_CossackSabre"]</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="MeleeWeapon_CossackSabre"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_CossackSabre"]/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>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Cossacks of the Rim/Patches/Cossacks of the Rim/Cossack_Pawnkinds.xml b/ModPatches/Cossacks of the Rim/Patches/Cossacks of the Rim/Cossack_Pawnkinds.xml
new file mode 100644
index 0000000000..2af0fda5fe
--- /dev/null
+++ b/ModPatches/Cossacks of the Rim/Patches/Cossacks of the Rim/Cossack_Pawnkinds.xml	
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[@Name="Cossack_NobleBase" or @Name="Cossack_CommonBase"]/apparelRequired</xpath>
+		<value>
+			<li>CE_Apparel_TribalBackpack</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/PawnKindDef[@Name="Cossack_CommonBase" or defName="Cossack_Private" or defName="Cossack_Private2" or defName="Cossack_Peasant" or defName="Cossack_Trader"]/itemQuality</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Cossack_Captain2" or defName="Cossack_Private2" or defName="Cossack_Peasant"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>15</min>
+					<max>30</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>200</min>
+						<max>300</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>NeolithicMeleeBasic</li>
+						<li>MedievalMeleeDecent</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Weapons Expanded</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/PawnKindDef[@Name="Cossack_NobleBase" or @Name="Cossack_CommonBase" or defName="Cossack_Private2" or defName="Cossack_Captain2"]</xpath>
+					<value>
+						<li Class="CombatExtended.LoadoutPropertiesExtension">
+							<primaryMagazineCount>
+								<min>15</min>
+								<max>20</max>
+							</primaryMagazineCount>
+							<forcedSidearm>
+								<sidearmMoney>
+									<min>200</min>
+									<max>450</max>
+								</sidearmMoney>
+								<weaponTags>
+									<li>CossackSabre</li>
+								</weaponTags>
+							</forcedSidearm>
+						</li>
+					</value>
+				</li>
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Crowns and Regalia/Patches/Crowns and Regalia/ThingDefs_Crowns.xml b/ModPatches/Crowns and Regalia/Patches/Crowns and Regalia/ThingDefs_Crowns.xml
new file mode 100644
index 0000000000..551d9c8433
--- /dev/null
+++ b/ModPatches/Crowns and Regalia/Patches/Crowns and Regalia/ThingDefs_Crowns.xml	
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Byzantine Imperial Crown -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Canon_Crown_Byzantine"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Canon_Crown_Byzantine"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>1.8</ArmorRating_Sharp>
+			<ArmorRating_Blunt>2.4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Byzantine Imperial Crown (Stuffable) -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Canon_Crown_Byzantine_Stuffable"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Canon_Crown_Byzantine_Stuffable"]/statBases</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Emerald Crown -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Canon_Crown_Emerald"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Canon_Crown_Emerald"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>1.8</ArmorRating_Sharp>
+			<ArmorRating_Blunt>2.4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Emerald Crown (Stuffable) -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Canon_Crown_Emerald_Stuffable"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Canon_Crown_Emerald_Stuffable"]/statBases</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Holy Roman Reichskrone -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Canon_Crown_Reichskrone"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Canon_Crown_Reichskrone"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>1.8</ArmorRating_Sharp>
+			<ArmorRating_Blunt>2.4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Holy Roman Reichskrone (Stuffable) -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Canon_Crown_Reichskrone_Stuffable"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Canon_Crown_Reichskrone_Stuffable"]/statBases</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/CuprosAlloys/Patches/CuprosAlloys/ThingDefs/Patch_Materials_Alloy_Advanced.xml b/ModPatches/CuprosAlloys/Patches/CuprosAlloys/ThingDefs/Patch_Materials_Alloy_Advanced.xml
new file mode 100644
index 0000000000..6e289dbea7
--- /dev/null
+++ b/ModPatches/CuprosAlloys/Patches/CuprosAlloys/ThingDefs/Patch_Materials_Alloy_Advanced.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ======== CAL_BlackSteel ======== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_BlackSteel"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>1.2</MeleePenetrationFactor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_BlackSteel"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>2.2</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_BlackSteel"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.4</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_BlackSteel"]/statBases/SharpDamageMultiplier</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_BlackSteel"]/statBases/BluntDamageMultiplier</xpath>
+	</Operation>
+
+	<!-- ======== CAL_Plastin ======== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Plastin"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>1.4</MeleePenetrationFactor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Plastin"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>3.6</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Plastin"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>2.4</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_Plastin"]/statBases/SharpDamageMultiplier</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_Plastin"]/statBases/BluntDamageMultiplier</xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/CuprosAlloys/Patches/CuprosAlloys/ThingDefs/Patch_Materials_Alloy_Decorative.xml b/ModPatches/CuprosAlloys/Patches/CuprosAlloys/ThingDefs/Patch_Materials_Alloy_Decorative.xml
new file mode 100644
index 0000000000..c153c23438
--- /dev/null
+++ b/ModPatches/CuprosAlloys/Patches/CuprosAlloys/ThingDefs/Patch_Materials_Alloy_Decorative.xml
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ======== CAL_ShinyIngotBase ======== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="CAL_ShinyIngotBase"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="CAL_ShinyIngotBase"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>1.5</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="CAL_ShinyIngotBase"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<!-- ======== CAL_Brass ======== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CAL_Brass"]/stuffProps/statFactors/ArmorRating_Sharp</xpath>
+		<value>
+			<MeleePenetrationFactor>0.9</MeleePenetrationFactor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_Brass"]/stuffProps/statFactors/ArmorRating_Blunt</xpath>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Brass"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.8</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Brass"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.62</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_Brass"]/statBases/SharpDamageMultiplier</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_Brass"]/statBases/BluntDamageMultiplier</xpath>
+	</Operation>
+
+	<!-- ======== CAL_ChromePlatedSteel ======== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_ChromePlatedSteel"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>1.02</MeleePenetrationFactor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_ChromePlatedSteel"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>1.55</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_ChromePlatedSteel"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.04</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_ChromePlatedSteel"]/statBases/SharpDamageMultiplier</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_ChromePlatedSteel"]/statBases/BluntDamageMultiplier</xpath>
+	</Operation>
+
+	<!-- ======== CAL_Aurichalcum ======== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Aurichalcum"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>0.88</MeleePenetrationFactor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Aurichalcum"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.74</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Aurichalcum"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.38</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_Aurichalcum"]/statBases/SharpDamageMultiplier</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_Aurichalcum"]/statBases/BluntDamageMultiplier</xpath>
+	</Operation>
+
+	<!-- ======== CAL_SterlingSilver ======== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_SterlingSilver"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>0.9</MeleePenetrationFactor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_SterlingSilver"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.71</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_SterlingSilver"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.42</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CAL_SterlingSilver"]/statBases/SharpDamageMultiplier</xpath>
+		<value>
+			<SharpDamageMultiplier>0.952</SharpDamageMultiplier>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CAL_SterlingSilver"]/statBases/BluntDamageMultiplier</xpath>
+		<value>
+			<BluntDamageMultiplier>1.05</BluntDamageMultiplier>
+		</value>
+	</Operation>
+
+	<!-- ======== CAL_RoseGold ======== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_RoseGold"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>0.86</MeleePenetrationFactor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_RoseGold"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.9</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_RoseGold"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.32</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CAL_RoseGold"]/statBases/SharpDamageMultiplier</xpath>
+		<value>
+			<SharpDamageMultiplier>0.909</SharpDamageMultiplier>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CAL_RoseGold"]/statBases/BluntDamageMultiplier</xpath>
+		<value>
+			<BluntDamageMultiplier>1.1</BluntDamageMultiplier>
+		</value>
+	</Operation>
+
+	<!-- ======== CAL_Electrum ======== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Electrum"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>0.82</MeleePenetrationFactor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Electrum"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.66</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Electrum"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.34</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_Electrum"]/statBases/SharpDamageMultiplier</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_Electrum"]/statBases/BluntDamageMultiplier</xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/CuprosAlloys/Patches/CuprosAlloys/ThingDefs/Patch_Materials_Alloy_Utility.xml b/ModPatches/CuprosAlloys/Patches/CuprosAlloys/ThingDefs/Patch_Materials_Alloy_Utility.xml
new file mode 100644
index 0000000000..41c220c68a
--- /dev/null
+++ b/ModPatches/CuprosAlloys/Patches/CuprosAlloys/ThingDefs/Patch_Materials_Alloy_Utility.xml
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ======== CAL_DullIngotBase ======== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="CAL_DullIngotBase"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="CAL_DullIngotBase"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>1.5</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="CAL_DullIngotBase"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<!-- ======== CAL_Plumchalcum ======== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Plumchalcum"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>0.9</MeleePenetrationFactor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Plumchalcum"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.96</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Plumchalcum"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.44</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CAL_Plumchalcum"]/statBases/SharpDamageMultiplier</xpath>
+		<value>
+			<SharpDamageMultiplier>0.909</SharpDamageMultiplier>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CAL_Plumchalcum"]/statBases/BluntDamageMultiplier</xpath>
+		<value>
+			<BluntDamageMultiplier>1.1</BluntDamageMultiplier>
+		</value>
+	</Operation>
+
+	<!-- ======== CAL_Duralumin ======== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Duralumin"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>0.92</MeleePenetrationFactor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Duralumin"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.86</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Duralumin"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.6</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_Duralumin"]/statBases/SharpDamageMultiplier</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_Duralumin"]/statBases/BluntDamageMultiplier</xpath>
+	</Operation>
+
+	<!-- ======== CAL_Zamak ======== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Zamak"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>0.94</MeleePenetrationFactor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Zamak"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.82</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Zamak"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.64</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_Zamak"]/statBases/SharpDamageMultiplier</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_Zamak"]/statBases/BluntDamageMultiplier</xpath>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Zamak"]/stuffProps/categories</xpath>
+		<value>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<!-- ======== CAL_BismuthBronze ======== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_BismuthBronze"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>0.96</MeleePenetrationFactor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_BismuthBronze"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.88</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_BismuthBronze"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.68</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_BismuthBronze"]/statBases/SharpDamageMultiplier</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_BismuthBronze"]/statBases/BluntDamageMultiplier</xpath>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_BismuthBronze"]/stuffProps/categories</xpath>
+		<value>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<!-- ======== CAL_Bronze ======== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Bronze"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>0.80</MeleePenetrationFactor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Bronze"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.84</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Bronze"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.7</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_Bronze"]/statBases/SharpDamageMultiplier</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_Bronze"]/statBases/BluntDamageMultiplier</xpath>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Bronze"]/stuffProps/categories</xpath>
+		<value>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<!-- ======== CAL_Cupronickel ======== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Cupronickel"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>0.98</MeleePenetrationFactor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Cupronickel"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.76</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Cupronickel"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.72</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_Cupronickel"]/statBases/SharpDamageMultiplier</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_Cupronickel"]/statBases/BluntDamageMultiplier</xpath>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Cupronickel"]/stuffProps/categories</xpath>
+		<value>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<!-- ======== CAL_StainlessSteel ======== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_StainlessSteel"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>1.06</MeleePenetrationFactor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_StainlessSteel"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>1.7</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_StainlessSteel"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.16</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_StainlessSteel"]/statBases/SharpDamageMultiplier</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_StainlessSteel"]/statBases/BluntDamageMultiplier</xpath>
+	</Operation>
+
+	<!-- ======== CAL_Hepatzion ======== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Hepatzion"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>0.8</MeleePenetrationFactor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Hepatzion"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.8</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Hepatzion"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.66</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_Hepatzion"]/statBases/SharpDamageMultiplier</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_Hepatzion"]/statBases/BluntDamageMultiplier</xpath>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Hepatzion"]/stuffProps/categories</xpath>
+		<value>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/CuprosAlloys/Patches/CuprosAlloys/ThingDefs/Patch_Materials_BaseMetal.xml b/ModPatches/CuprosAlloys/Patches/CuprosAlloys/ThingDefs/Patch_Materials_BaseMetal.xml
new file mode 100644
index 0000000000..a2733c83d6
--- /dev/null
+++ b/ModPatches/CuprosAlloys/Patches/CuprosAlloys/ThingDefs/Patch_Materials_BaseMetal.xml
@@ -0,0 +1,240 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ======== CAL_OreBase ======== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="CAL_OreBase"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="CAL_OreBase"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>1</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="CAL_OreBase"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.5</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<!-- ======== CAL_Copper ======== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Copper"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>0.86</MeleePenetrationFactor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Copper"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.7</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Copper"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.46</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_Copper"]/statBases/SharpDamageMultiplier</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_Copper"]/statBases/BluntDamageMultiplier</xpath>
+	</Operation>
+
+	<!-- ======== CAL_Lead ======== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Lead"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>0.8</MeleePenetrationFactor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CAL_Lead"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.6</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CAL_Lead"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.14</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_Lead"]/statBases/StuffPower_Armor_Heat</xpath>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CAL_Lead"]/statBases/SharpDamageMultiplier</xpath>
+		<value>
+			<SharpDamageMultiplier>0.909</SharpDamageMultiplier>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CAL_Lead"]/statBases/BluntDamageMultiplier</xpath>
+		<value>
+			<BluntDamageMultiplier>1.1</BluntDamageMultiplier>
+		</value>
+	</Operation>
+
+	<!-- ======== CAL_Tin ======== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Tin"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>0.82</MeleePenetrationFactor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CAL_Tin"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.55</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CAL_Tin"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.45</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_Tin"]/statBases/StuffPower_Armor_Heat</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_Tin"]/statBases/SharpDamageMultiplier</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_Tin"]/statBases/BluntDamageMultiplier</xpath>
+	</Operation>
+
+	<!-- ======== CAL_Aluminum ======== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Aluminum"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>0.7</MeleePenetrationFactor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CAL_Aluminum"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.325</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CAL_Aluminum"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.33</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_Aluminum"]/statBases/StuffPower_Armor_Heat</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_Aluminum"]/statBases/SharpDamageMultiplier</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_Aluminum"]/statBases/BluntDamageMultiplier</xpath>
+	</Operation>
+
+	<!-- ======== CAL_Nickel ======== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Nickel"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>0.92</MeleePenetrationFactor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CAL_Nickel"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.55</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<!-- !! Nickel already has the correct sharp protection lol !! -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_Nickel"]/statBases/StuffPower_Armor_Heat</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_Nickel"]/statBases/SharpDamageMultiplier</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_Nickel"]/statBases/BluntDamageMultiplier</xpath>
+	</Operation>
+
+	<!-- ======== CAL_Zinc ======== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Zinc"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>0.8</MeleePenetrationFactor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CAL_Zinc"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.525</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CAL_Zinc"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.38</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_Zinc"]/statBases/StuffPower_Armor_Heat</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_Zinc"]/statBases/SharpDamageMultiplier</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_Zinc"]/statBases/BluntDamageMultiplier</xpath>
+	</Operation>
+
+	<!-- ======== CAL_Bismuth ======== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Bismuth"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>0.76</MeleePenetrationFactor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Bismuth"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.95</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Bismuth"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.16</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<!-- ======== CAL_Chromium ======== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Chromium"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>1.02</MeleePenetrationFactor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Chromium"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>1.01</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CAL_Chromium"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.08</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_Chromium"]/statBases/SharpDamageMultiplier</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CAL_Chromium"]/statBases/BluntDamageMultiplier</xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Cursed Guns/Defs/Cursed Guns/Ammo_Cursed.xml b/ModPatches/Cursed Guns/Defs/Cursed Guns/Ammo_Cursed.xml
new file mode 100644
index 0000000000..16706868bd
--- /dev/null
+++ b/ModPatches/Cursed Guns/Defs/Cursed Guns/Ammo_Cursed.xml	
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>GrenadeRubber</defName>
+		<label>Rubberised slug</label>
+		<description>A rubber slug with a metal core inside. Less lethal than usual ammunition, but can still maim or kill someone.</description>
+		<advanced>true</advanced>
+	</CombatExtended.AmmoCategoryDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="40x46mmGrenadeBase">
+		<defName>Ammo_40x46mmGrenade_Rubber</defName>
+		<label>40x46mm grenade (Rubber)</label>
+		<graphicData>
+			<texPath>Things/Ammo/GrenadeLauncher/HE</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>2.37</MarketValue>
+		</statBases>
+		<ammoClass>GrenadeRubber</ammoClass>
+		<cookOffProjectile>Bullet_40x46mmGrenade_Rubber</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base12GaugeBullet">
+		<defName>Bullet_40x46mmGrenade_Rubber</defName>
+		<label>Rubberised slug</label>
+		<graphicData>
+			<texPath>Rubberdong</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>27</speed>
+			<damageDef>Beanbag</damageDef>
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>3.240</armorPenetrationBlunt>
+			<spreadMult>2</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_40x46mmGrenade_Rubber</defName>
+		<label>make 40x46mm Rubber grenades x100</label>
+		<description>Craft 100 40x46mm Rubber grenades.</description>
+		<jobString>Making 40x46mm Rubber grenades.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>50</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Chemfuel</li>
+					</thingDefs>
+				</filter>
+				<count>7</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Chemfuel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_40x46mmGrenade_Rubber>100</Ammo_40x46mmGrenade_Rubber>
+		</products>
+		<workAmount>9000</workAmount>
+	</RecipeDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>KniperBlade</defName>
+		<label>Blade</label>
+		<description>A ballistic knife blade.</description>
+		<advanced>false</advanced>
+	</CombatExtended.AmmoCategoryDef>
+
+	<ThingCategoryDef>
+		<defName>KniperBlade</defName>
+		<label>Blade</label>
+		<parent>AmmoNeolithic</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberArrow</iconPath>
+	</ThingCategoryDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Ballistic_Blade</defName>
+		<label>kniper blades</label>
+		<ammoTypes>
+			<Ammo_kniper_blade>Projectile_kniper_blade</Ammo_kniper_blade>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoArrowBase">
+		<defName>Ammo_kniper_blade</defName>
+		<label>kniper blade</label>
+		<description>A ballistic knife blade.</description>
+		<statBases>
+			<Mass>0.014</Mass>
+			<Bulk>0.04</Bulk>
+			<Flammability>0</Flammability>
+		</statBases>
+		<graphicData>
+			<texPath>Things/Ammo/Neolithic/Dart</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<ammoClass>KniperBlade</ammoClass>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseArrowProjectile">
+		<defName>Projectile_kniper_blade</defName>
+		<label>Blade</label>
+		<graphicData>
+			<texPath>Knife</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>55</speed>
+			<damageDef>RangedStab</damageDef>
+			<damageAmountBase>9</damageAmountBase>
+			<armorPenetrationSharp>0.65</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.60</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>MakeAmmo_kniper_blade</defName>
+		<label>make kniper blades x10</label>
+		<description>Craft 10 kniper blades.</description>
+		<jobString>Making kniper blades.</jobString>
+		<workAmount>960</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<recipeUsers>
+			<li>TableMachining</li>
+		</recipeUsers>
+		<products>
+			<Ammo_kniper_blade>10</Ammo_kniper_blade>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Cursed Guns/Defs/Cursed Guns/Recipes_Cursed.xml b/ModPatches/Cursed Guns/Defs/Cursed Guns/Recipes_Cursed.xml
new file mode 100644
index 0000000000..1eba9fe635
--- /dev/null
+++ b/ModPatches/Cursed Guns/Defs/Cursed Guns/Recipes_Cursed.xml	
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeZipTwoTwoThrown</defName>
+		<label>make Yeep 22</label>
+		<description>Craft 10 Yeep 22.</description>
+		<jobString>Making Yeep 22.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>15</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<recipeUsers>
+			<li>TableMachining</li>
+		</recipeUsers>
+		<products>
+			<CursedGun_ZipTwoTwoThrown>1</CursedGun_ZipTwoTwoThrown>
+		</products>
+		<workAmount>1500</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeZipTwoTwoThrownX10</defName>
+		<label>make Yeep 22 x10</label>
+		<description>Craft 10 Yeep 22s.</description>
+		<jobString>Making Yeep 22s.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>150</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<recipeUsers>
+			<li>TableMachining</li>
+		</recipeUsers>
+		<products>
+			<CursedGun_ZipTwoTwoThrown>10</CursedGun_ZipTwoTwoThrown>
+		</products>
+		<workAmount>15000</workAmount>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Cursed Guns/Patches/Cursed Guns/CursedGuns.xml b/ModPatches/Cursed Guns/Patches/Cursed Guns/CursedGuns.xml
new file mode 100644
index 0000000000..287986d5c1
--- /dev/null
+++ b/ModPatches/Cursed Guns/Patches/Cursed Guns/CursedGuns.xml	
@@ -0,0 +1,1253 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Tools ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName="CursedGun_MacSixTeen" or
+			defName="CursedGun_Lugernikov" or
+			defName="CursedGun_PKMini" or
+			defName="CursedGun_GSTFourFour" or
+			defName="CursedGun_AmericanNinety" or
+			defName="CursedGun_TomNine" or
+			defName="CursedGun_PPCyka" or
+			defName="CursedGun_Khaukhat" or
+			defName="CursedGun_KammyGun" or
+			defName="CursedGun_ASFAL" or
+			defName="CursedGun_Bossmerg" or
+			defName="CursedGun_Fringspield"
+			]/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="CursedGun_Deaglov" or
+			defName="CursedGun_MPZweiundvierzig" or
+			defName="CursedGun_SaigaEleven" or
+			defName="CursedGun_Obrez" or
+			defName="CursedGun_ZipTwoTwo" or
+			defName="CursedGun_ZipTwoTwoThrown" or
+			defName="CursedGun_SawPoint" or
+			defName="CursedGun_Makeagle" or
+			defName="CursedGun_Gluger" or
+			defName="CursedGun_Llock" or
+			defName="CursedGun_ScopedPistol"
+			]/tools
+		</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[defName="CursedGun_Kniper"]/tools
+		</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Stab</li>
+						<li>Cut</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Guns ========== -->
+
+	<!-- MAC-16 -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CursedGun_MacSixTeen</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.90</SwayFactor>
+			<Bulk>2.50</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.3</warmupTime>
+			<range>28</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Lugernikov -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CursedGun_Lugernikov</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>0.85</SwayFactor>
+			<Bulk>4.5</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.3</warmupTime>
+			<range>28</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>9</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- PKMini -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CursedGun_PKMini</defName>
+		<statBases>
+			<Bulk>10.00</Bulk>
+			<SwayFactor>1.6</SwayFactor>
+			<ShotSpread>0.6</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>0.7</warmupTime>
+			<range>45</range>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilAmount>1.6</recoilAmount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+			<li>CE_MachineGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- GSt 44 -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CursedGun_GSTFourFour</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.90</SwayFactor>
+			<Bulk>2.50</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_792x33mmKurz_FMJ</defaultProjectile>
+			<warmupTime>0.3</warmupTime>
+			<range>33</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>Shot_HeavySMG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>31</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_792x33mmKurz</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- MP42 -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CursedGun_MPZweiundvierzig</defName>
+		<statBases>
+			<Bulk>7.5</Bulk>
+			<SwayFactor>2</SwayFactor>
+			<ShotSpread>0.6</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>0.7</warmupTime>
+			<range>45</range>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilAmount>2</recoilAmount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+			<li>CE_MachineGun</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Saiga 11 -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CursedGun_SaigaEleven</defName>
+		<statBases>
+			<Mass>2.84</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.93</SwayFactor>
+			<Bulk>2.95</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>4</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_BROOM</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Obrez -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CursedGun_Obrez</defName>
+		<statBases>
+			<Mass>1.5</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.1</SightsEfficiency>
+			<ShotSpread>0.7</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>2.95</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- American-90 -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CursedGun_AmericanNinety</defName>
+		<statBases>
+			<Bulk>5.00</Bulk>
+			<SwayFactor>1.6</SwayFactor>
+			<ShotSpread>0.6</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_22LR_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<warmupTime>0.2</warmupTime>
+			<range>45</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilAmount>0.1</recoilAmount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>83</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_22LR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Tom-9 -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CursedGun_TomNine</defName>
+		<statBases>
+			<Bulk>5.00</Bulk>
+			<SwayFactor>1.6</SwayFactor>
+			<ShotSpread>0.6</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<burstShotCount>8</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<warmupTime>0.2</warmupTime>
+			<range>45</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilAmount>0.8</recoilAmount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aimedBurstShotCount>4</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Deaglov -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CursedGun_Deaglov</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.9</SwayFactor>
+			<Bulk>1.5</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>9</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_BROOM</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Skorpiov -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CursedGun_Skorpiov</defName>
+		<statBases>
+			<Bulk>2</Bulk>
+			<SwayFactor>0.9</SwayFactor>
+			<ShotSpread>0.17</ShotSpread>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.46</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_9x18mmMakarov_FMJ</defaultProjectile>
+			<burstShotCount>8</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<warmupTime>0.2</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilAmount>0.8</recoilAmount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aimedBurstShotCount>4</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+			<li>CE_SMG</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- AK4.7 -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CursedGun_AKFourPointSeven</defName>
+		<statBases>
+			<Bulk>4.4</Bulk>
+			<SwayFactor>0.9</SwayFactor>
+			<ShotSpread>0.17</ShotSpread>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.46</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<burstShotCount>8</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>0.2</warmupTime>
+			<range>22</range>
+			<soundCast>Shot_HeavySMG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilAmount>0.8</recoilAmount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aimedBurstShotCount>4</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+			<li>CE_SMG</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- PPCyka -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CursedGun_PPCyka</defName>
+		<statBases>
+			<Bulk>3.00</Bulk>
+			<SwayFactor>1.6</SwayFactor>
+			<ShotSpread>0.3</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<warmupTime>0.2</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilAmount>0.1</recoilAmount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>71</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Khaukhat -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CursedGun_Khaukhat</defName>
+		<statBases>
+			<Bulk>3.50</Bulk>
+			<SwayFactor>1.6</SwayFactor>
+			<ShotSpread>0.1</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<warmupTime>0.2</warmupTime>
+			<range>75</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilAmount>1.1</recoilAmount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>34</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+			<li>CE_MachineGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Kammy Gun -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CursedGun_KammyGun</defName>
+		<statBases>
+			<Bulk>8.8</Bulk>
+			<SwayFactor>1.19</SwayFactor>
+			<ShotSpread>0.09</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>0.2</warmupTime>
+			<range>44</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilAmount>1.8</recoilAmount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- AS FAL -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CursedGun_ASFAL</defName>
+		<statBases>
+			<Bulk>6</Bulk>
+			<SwayFactor>1.04</SwayFactor>
+			<ShotSpread>0.08</ShotSpread>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_9x39mmSoviet_FMJ</defaultProjectile>
+			<burstShotCount>4</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>1</warmupTime>
+			<range>48</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilAmount>1.1</recoilAmount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Zip 22 -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CursedGun_ZipTwoTwo</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.1</SightsEfficiency>
+			<ShotSpread>0.5</ShotSpread>
+			<SwayFactor>0.9</SwayFactor>
+			<Bulk>0.5</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_22LR_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_22LR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_BROOM</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Zip 22 Thrown -->
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="CursedGun_ZipTwoTwoThrown"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>BaseWeapon</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CursedGun_ZipTwoTwoThrown"]</xpath>
+		<value>
+			<thingCategories>
+				<li>WeaponsRanged</li>
+			</thingCategories>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CursedGun_ZipTwoTwoThrown"]</xpath>
+		<value>
+			<thingClass>CombatExtended.AmmoThing</thingClass>
+			<stackLimit>75</stackLimit>
+			<resourceReadoutPriority>First</resourceReadoutPriority>
+			<techLevel>Industrial</techLevel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CursedGun_ZipTwoTwoThrown"]/recipeMaker</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="CursedGun_ZipTwoTwoThrown"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CursedGun_ZipTwoTwoThrown</defName>
+		<statBases>
+			<SightsEfficiency>0.5</SightsEfficiency>
+			<ShotSpread>1.5</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>0.5</Bulk>
+			<RangedWeapon_Cooldown>0.48</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<label>Throw Zip 22</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_ZipTwoTwoThrown</defaultProjectile>
+			<warmupTime>0.66</warmupTime>
+			<range>10</range>
+			<soundCast>ThrowGrenade</soundCast>
+			<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+		</Properties>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_ZipTwoTwoThrown"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<damageDef>Blunt</damageDef>
+				<damageAmountBase>20</damageAmountBase>
+				<flyOverhead>false</flyOverhead>
+				<speed>35</speed>
+				<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+				<armorPenetrationSharp>0</armorPenetrationSharp>
+				<preExplosionSpawnChance>1</preExplosionSpawnChance>
+				<preExplosionSpawnThingDef>CursedGun_ZipTwoTwoThrown</preExplosionSpawnThingDef>
+			</projectile>
+		</value>
+	</Operation>
+
+	<!-- Makeagle -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CursedGun_Makeagle</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.9</SwayFactor>
+			<Bulk>1.7</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50AE_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_50AE</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_BROOM</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- SawPoint -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CursedGun_SawPoint</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.9</SwayFactor>
+			<Bulk>2</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_380ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_380ACP</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Kniper -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CursedGun_Kniper</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.67</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.75</SightsEfficiency>
+			<ShotSpread>0.32</ShotSpread>
+			<SwayFactor>1.3</SwayFactor>
+			<Bulk>1.2</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_kniper_blade</defaultProjectile>
+			<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+			<warmupTime>0.5</warmupTime>
+			<range>25</range>
+			<soundCast>Bow_Large</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>2</AmmoGenPerMagOverride>
+			<reloadTime>1.2</reloadTime>
+			<ammoSet>AmmoSet_Ballistic_Blade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_BROOM</li>
+			<li>Bipod_DMR</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Gluger	-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CursedGun_Gluger</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.03</SwayFactor>
+			<Bulk>1.7</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_BROOM</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Llock -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CursedGun_Llock</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.2</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.00</SwayFactor>
+			<Bulk>1.5</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>17</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_BROOM</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Bossmerg -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CursedGun_Bossmerg</defName>
+		<statBases>
+			<Bulk>8.50</Bulk>
+			<SwayFactor>1.0</SwayFactor>
+			<ShotSpread>0.14</ShotSpread>
+			<SightsEfficiency>1.2</SightsEfficiency>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilAmount>1.1</recoilAmount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>False</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Dongopod -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_40x46mmGrenade"]/ammoTypes</xpath>
+		<value>
+			<Ammo_40x46mmGrenade_Rubber>Bullet_40x46mmGrenade_Rubber</Ammo_40x46mmGrenade_Rubber>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CursedGun_Dongopod</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.75</SightsEfficiency>
+			<ShotSpread>0.32</ShotSpread>
+			<SwayFactor>1.3</SwayFactor>
+			<Bulk>5</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<warmupTime>1.1</warmupTime>
+			<range>33</range>
+			<minRange>5</minRange>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
+			<reloadTime>2.2</reloadTime>
+			<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>GunGrenadeLauncher</li>
+			<li>GrenadeEMP</li>
+			<li>CE_AI_SMOKE</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Dongopod Rubber -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="CursedGun_DongopodRubber"]</xpath>
+	</Operation>
+
+	<!-- Fringspield -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CursedGun_Fringspield</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.68</SwayFactor>
+			<Bulk>12</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_3006Springfield</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Scoped Pistol -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CursedGun_ScopedPistol</defName>
+		<statBases>
+			<Mass>1.5</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.01</SightsEfficiency>
+			<ShotSpread>0.7</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>4</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_303British</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>Bipod_DMR</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Cursed Guns/Patches/Cursed Guns/Fedora.xml b/ModPatches/Cursed Guns/Patches/Cursed Guns/Fedora.xml
new file mode 100644
index 0000000000..e5c8b93e77
--- /dev/null
+++ b/ModPatches/Cursed Guns/Patches/Cursed Guns/Fedora.xml	
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_FedoraCursedGun"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Cybernet/Patches/Cybernet/HediffDefs/Hediffs_CyberNet_BodyParts.xml b/ModPatches/Cybernet/Patches/Cybernet/HediffDefs/Hediffs_CyberNet_BodyParts.xml
new file mode 100644
index 0000000000..42c4caef91
--- /dev/null
+++ b/ModPatches/Cybernet/Patches/Cybernet/HediffDefs/Hediffs_CyberNet_BodyParts.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Base version is comparable to bionic arm-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="CNNetworkedArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.11</cooldownTime>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="CNAdvancedNetworkedArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.98</cooldownTime>
+					<armorPenetrationBlunt>2.168</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Cybernet/Patches/Cybernet/HediffDefs/Hediffs_CyberNet_Brain.xml b/ModPatches/Cybernet/Patches/Cybernet/HediffDefs/Hediffs_CyberNet_Brain.xml
new file mode 100644
index 0000000000..0b86d61f73
--- /dev/null
+++ b/ModPatches/Cybernet/Patches/Cybernet/HediffDefs/Hediffs_CyberNet_Brain.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Combat Implant-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="CNCombatOptimizationImplant"]/stages/li[label="disconnected"]/statOffsets/MeleeArmorPenetration</xpath>
+		<value>
+			<MeleeCritChance>-0.05</MeleeCritChance>
+			<MeleeParryChance>-0.0625</MeleeParryChance>
+			<Suppressability>0.25</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="CNCombatOptimizationImplant"]/stages/li[label="disconnected"]/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>-0.2</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="CNCombatOptimizationImplant"]/stages/li[label="disconnected"]/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>-0.4</ShootingAccuracyPawn>
+			<AimingAccuracy>-0.2</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="CNCombatOptimizationImplant"]/stages/li[label="throttled"]/statOffsets/MeleeArmorPenetration</xpath>
+		<value>
+			<MeleeCritChance>0.025</MeleeCritChance>
+			<MeleeParryChance>0.03125</MeleeParryChance>
+			<Suppressability>0</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="CNCombatOptimizationImplant"]/stages/li[label="throttled"]/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="CNCombatOptimizationImplant"]/stages/li[label="throttled"]/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>0</ShootingAccuracyPawn>
+			<AimingAccuracy>0</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="CNCombatOptimizationImplant"]/stages/li[label="sluggish"]/statOffsets/MeleeArmorPenetration</xpath>
+		<value>
+			<MeleeCritChance>0.075</MeleeCritChance>
+			<MeleeParryChance>0.09375</MeleeParryChance>
+			<Suppressability>-0.25</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="CNCombatOptimizationImplant"]/stages/li[label="sluggish"]/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="CNCombatOptimizationImplant"]/stages/li[label="sluggish"]/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>0.4</ShootingAccuracyPawn>
+			<AimingAccuracy>0.2</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="CNCombatOptimizationImplant"]/stages/li[label="connected"]/statOffsets/MeleeArmorPenetration</xpath>
+		<value>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.1875</MeleeParryChance>
+			<Suppressability>-0.50</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="CNCombatOptimizationImplant"]/stages/li[label="connected"]/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.5</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="CNCombatOptimizationImplant"]/stages/li[label="connected"]/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<AimingAccuracy>0.5</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="CNCombatOptimizationImplant"]/stages/li[label="overclocked"]/statOffsets/MeleeArmorPenetration</xpath>
+		<value>
+			<MeleeCritChance>0.175</MeleeCritChance>
+			<MeleeParryChance>0.219</MeleeParryChance>
+			<Suppressability>-0.75</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="CNCombatOptimizationImplant"]/stages/li[label="overclocked"]/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.65</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="CNCombatOptimizationImplant"]/stages/li[label="overclocked"]/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>1.3</ShootingAccuracyPawn>
+			<AimingAccuracy>0.65</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="CNCombatOptimizationImplant"]/stages/li[label="supercharged"]/statOffsets/MeleeArmorPenetration</xpath>
+		<value>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+			<Suppressability>-1</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="CNCombatOptimizationImplant"]/stages/li[label="supercharged"]/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.8</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="CNCombatOptimizationImplant"]/stages/li[label="supercharged"]/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>1.6</ShootingAccuracyPawn>
+			<AimingAccuracy>0.8</AimingAccuracy>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Cybernetic Organism and Neural Network/Patches/Cybernetic Organism and Neural Network/Hediffs/CONN_CombatAdvancedBionics.xml b/ModPatches/Cybernetic Organism and Neural Network/Patches/Cybernetic Organism and Neural Network/Hediffs/CONN_CombatAdvancedBionics.xml
new file mode 100644
index 0000000000..6b1275d26a
--- /dev/null
+++ b/ModPatches/Cybernetic Organism and Neural Network/Patches/Cybernetic Organism and Neural Network/Hediffs/CONN_CombatAdvancedBionics.xml	
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Robotic eye -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="CONN_hediff_IndependentEye"]/stages/li</xpath>
+		<value>
+			<statOffsets>
+				<NightVisionEfficiency_Implant>0.4</NightVisionEfficiency_Implant>
+			</statOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CONN_IndependentEye"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency_Implant>0.4</NightVisionEfficiency_Implant>
+		</value>
+	</Operation>
+
+	<!-- Outer blade -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="CONN_hediff_OuterBlade"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<statOffsets>
+						<MeleeDodgeChance>0.4</MeleeDodgeChance>
+						<MeleeCritChance>0.14</MeleeCritChance>
+						<MeleeParryChance>0.4</MeleeParryChance>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="CONN_hediff_OuterBlade"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>32</power>
+					<cooldownTime>0.83</cooldownTime>
+					<armorPenetrationSharp>30</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Power arm -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/HediffDef[defName="CONN_hediff_PowerArms"]/stages</xpath>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="CONN_hediff_PowerArms"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>0.5</cooldownTime>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Exoskeleton armor -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="CONN_hediff_ExoskeletonArmor"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<statOffsets>
+						<ArmorRating_Blunt>4</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.1</ArmorRating_Heat>
+						<ArmorRating_Sharp>2</ArmorRating_Sharp>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+
+	<!-- Dermalplating -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="CONN_hediff_Dermalplating"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<statOffsets>
+						<ArmorRating_Blunt>8</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.2</ArmorRating_Heat>
+						<ArmorRating_Sharp>4</ArmorRating_Sharp>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+
+	<!-- Lionheart -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="CONN_hediff_Lionheart"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Cybernetic Organism and Neural Network/Patches/Cybernetic Organism and Neural Network/Hediffs/CONN_CombatBionics.xml b/ModPatches/Cybernetic Organism and Neural Network/Patches/Cybernetic Organism and Neural Network/Hediffs/CONN_CombatBionics.xml
new file mode 100644
index 0000000000..f80fb314f5
--- /dev/null
+++ b/ModPatches/Cybernetic Organism and Neural Network/Patches/Cybernetic Organism and Neural Network/Hediffs/CONN_CombatBionics.xml	
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Zomm (eye replacement) -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="CONN_hediff_Zoom"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<NightVisionEfficiency_Implant>0.3</NightVisionEfficiency_Implant>
+			<AimingAccuracy>0.6</AimingAccuracy><!-- I did the math, and with an aiming accuracy bonus of this, with two of these, a level 20 shooter basically has a sniper rifle scope on 100% sight efficiency guns. -->
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CONN_Zoom"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency_Implant>0.3</NightVisionEfficiency_Implant>
+		</value>
+	</Operation>
+
+	<!-- Energy fist -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="CONN_hediff_EnergyFist"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.3</cooldownTime>
+					<armorPenetrationBlunt>1.531</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Elastic achilles (foot? replacement) -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="CONN_hediff_ElasticAchilles"]/stages/li/statOffsets/MeleeHitChance</xpath><!-- Why does it have an increased melee hit chance in vanilla and not increased dodge chance? -->
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance><!-- A bit better than an archotech leg at giving dodge chance -->
+		</value>
+	</Operation>
+
+	<!-- Cyclops visor -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="CONN_hediff_CyclopsVisor"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<AimingAccuracy>0.1</AimingAccuracy>
+			<ShootingAccuracyPawn>0.1</ShootingAccuracyPawn>
+		</value>
+	</Operation>
+
+	<!-- Laser detection (ear implant) -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="CONN_hediff_LaserDetection"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<AimingAccuracy>0.15</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!-- Sensoric earside (ear replacement) -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="CONN_hediff_SensoricEarside"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Cybernetic Organism and Neural Network/Patches/Cybernetic Organism and Neural Network/Hediffs/CONN_MindAlteringBionics.xml b/ModPatches/Cybernetic Organism and Neural Network/Patches/Cybernetic Organism and Neural Network/Hediffs/CONN_MindAlteringBionics.xml
new file mode 100644
index 0000000000..5a4193df2d
--- /dev/null
+++ b/ModPatches/Cybernetic Organism and Neural Network/Patches/Cybernetic Organism and Neural Network/Hediffs/CONN_MindAlteringBionics.xml	
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Berserker chip -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="CONN_hediff_BerserkerChip"]/stages/li/statOffsets/MeleeHitChance</xpath>
+		<value>
+			<MeleeHitChance>12</MeleeHitChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="CONN_hediff_BerserkerChip"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.4</MeleeDodgeChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="CONN_hediff_BerserkerChip"]/stages/li</xpath>
+		<value>
+			<statFactors>
+				<Suppressability>0</Suppressability>
+			</statFactors>
+		</value>
+	</Operation>
+
+	<!-- Combat AI -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="CONN_hediff_CombatAI"]/stages/li/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.25</Suppressability>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Cybernetic Organism and Neural Network/Patches/Cybernetic Organism and Neural Network/Hediffs/CONN_ProductiveBionics.xml b/ModPatches/Cybernetic Organism and Neural Network/Patches/Cybernetic Organism and Neural Network/Hediffs/CONN_ProductiveBionics.xml
new file mode 100644
index 0000000000..930e26948c
--- /dev/null
+++ b/ModPatches/Cybernetic Organism and Neural Network/Patches/Cybernetic Organism and Neural Network/Hediffs/CONN_ProductiveBionics.xml	
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Black pearl -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="CONN_hediff_BlackPearl"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<statOffsets>
+						<NightVisionEfficiency_Implant>0.4</NightVisionEfficiency_Implant><!-- With both eyes, the same night vision as mechanoids -->
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CONN_BlackPearl"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency_Implant>0.4</NightVisionEfficiency_Implant>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Cybernetic Warfare and Special Weapons/Patches/Cybernetic Warfare and Special Weapons/CyberneticWarfare_Melee.xml b/ModPatches/Cybernetic Warfare and Special Weapons/Patches/Cybernetic Warfare and Special Weapons/CyberneticWarfare_Melee.xml
new file mode 100644
index 0000000000..6d48f309f3
--- /dev/null
+++ b/ModPatches/Cybernetic Warfare and Special Weapons/Patches/Cybernetic Warfare and Special Weapons/CyberneticWarfare_Melee.xml	
@@ -0,0 +1,322 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- =========== DamageDefs =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/DamageDef[defName="CW_ElectroBurn"]</xpath>
+		<value>
+			<soundExplosion>CW_PowerSpark</soundExplosion>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/DamageDef[defName="CW_ElectroCharge"]</xpath>
+		<value>
+			<soundExplosion>CW_ContinousSpark</soundExplosion>
+		</value>
+	</Operation>
+
+	<!-- =========== Melee Weapons =========== -->
+
+	<!-- =============== Power Fist =============== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CW_PowerFist"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Pummel</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<armorPenetrationBlunt>70</armorPenetrationBlunt>
+					<cooldownTime>0.25</cooldownTime>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Crush</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9.3</power>
+					<armorPenetrationBlunt>150</armorPenetrationBlunt>
+					<cooldownTime>0.25</cooldownTime>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Knockback</label>
+					<capacities>
+						<li>BluntKnockback</li>
+					</capacities>
+					<power>11.3</power>
+					<armorPenetrationBlunt>90</armorPenetrationBlunt>
+					<cooldownTime>0.25</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CW_PowerFist"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CW_PowerFist"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.75</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "CW_PowerFist"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "CW_PowerFist"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CW_PowerFist"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- =============== Energy Claw =============== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CW_EnergyClaw"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>energy burst</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>50</armorPenetrationSharp>
+					<cooldownTime>0.25</cooldownTime>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>0.25</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<armorPenetrationSharp>50</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>claw</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>10</power>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<armorPenetrationSharp>50</armorPenetrationSharp>
+					<cooldownTime>0.25</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>sidestep stab</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>12</power>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+					<cooldownTime>0.25</cooldownTime>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CW_EnergyClaw"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CW_EnergyClaw"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.25</MeleeCritChance>
+				<MeleeParryChance>0.75</MeleeParryChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "CW_EnergyClaw"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "CW_EnergyClaw"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CW_EnergyClaw"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- =============== Energy Sword =============== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CW_EnergySword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<armorPenetrationBlunt>0.500</armorPenetrationBlunt>
+					<cooldownTime>1</cooldownTime>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>1</cooldownTime>
+					<armorPenetrationBlunt>11.250</armorPenetrationBlunt>
+					<armorPenetrationSharp>90</armorPenetrationSharp>
+					<armorPenetration>0.33</armorPenetration>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1</cooldownTime>
+					<armorPenetrationBlunt>45</armorPenetrationBlunt>
+					<armorPenetrationSharp>80</armorPenetrationSharp>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetration>0.33</armorPenetration>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CW_EnergySword"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CW_EnergySword"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.5</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "CW_EnergySword"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "CW_EnergySword"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CW_EnergySword"]/weaponTags</xpath>
+		<value>
+			<li>CE_Sidearm_Melee</li>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- =============== Chain Sword =============== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CW_ChainSword"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CW_ChainSword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.5</MeleeCritChance>
+				<MeleeParryChance>0.25</MeleeParryChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "CW_ChainSword"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "CW_ChainSword"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CW_ChainSword"]/weaponTags</xpath>
+		<value>
+			<li>CE_Sidearm_Melee</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CW_ChainSword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Uppercut</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<armorPenetrationBlunt>0.500</armorPenetrationBlunt>
+					<cooldownTime>0.5</cooldownTime>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Shocker</label>
+					<capacities>
+						<li>CW_Shock</li>
+					</capacities>
+					<power>5</power>
+					<armorPenetrationBlunt>7.250</armorPenetrationBlunt>
+					<armorPenetrationSharp>75</armorPenetrationSharp>
+					<cooldownTime>0.5</cooldownTime>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Punch</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>7</power>
+					<armorPenetrationBlunt>35</armorPenetrationBlunt>
+					<armorPenetrationSharp>70</armorPenetrationSharp>
+					<cooldownTime>0.5</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Cybernetic Warfare and Special Weapons/Patches/Cybernetic Warfare and Special Weapons/CyberneticWarfare_Ranged_Industrial.xml b/ModPatches/Cybernetic Warfare and Special Weapons/Patches/Cybernetic Warfare and Special Weapons/CyberneticWarfare_Ranged_Industrial.xml
new file mode 100644
index 0000000000..8aa7d7d8d3
--- /dev/null
+++ b/ModPatches/Cybernetic Warfare and Special Weapons/Patches/Cybernetic Warfare and Special Weapons/CyberneticWarfare_Ranged_Industrial.xml	
@@ -0,0 +1,437 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Riot Breaker -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CW_RiotBreaker</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>0.85</SwayFactor>
+			<Bulk>9</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_20Gauge_Beanbag</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>14</range>
+			<minRange>1.5</minRange>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>1.5</reloadTime>
+			<ammoSet>AmmoSet_20Gauge</ammoSet>
+			<reloadOneAtATime>true</reloadOneAtATime>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CW_RiotBreaker"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Ballistic Shredder -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CW_BallisticShredder</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.19</ShotSpread>
+			<SwayFactor>1.06</SwayFactor>
+			<Bulk>6</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>22</range>
+			<minRange>1.5</minRange>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>2.25</reloadTime>
+			<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_SMG</li>
+			<li>CE_Sidearm</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CW_BallisticShredder"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.8</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Ballistic Combat Gun -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CW_BallisticCombatGun</defName>
+		<statBases>
+			<SightsEfficiency>0.85</SightsEfficiency>
+			<ShotSpread>0.55</ShotSpread>
+			<SwayFactor>1.46</SwayFactor>
+			<Bulk>5</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>22</range>
+			<minRange>1.5</minRange>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>2.25</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_SMG</li>
+			<li>CE_Sidearm</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CW_BallisticCombatGun"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.8</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Ballistic Enforcer -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CW_BallisticEnforcer</defName>
+		<statBases>
+			<SightsEfficiency>0.85</SightsEfficiency>
+			<ShotSpread>0.55</ShotSpread>
+			<SwayFactor>1.46</SwayFactor>
+			<Bulk>5</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.8</warmupTime>
+			<range>39.9</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<soundCast>Shot_SniperRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>1.75</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_SMG</li>
+			<li>CE_Sidearm</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CW_BallisticEnforcer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.9</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.9</cooldownTime>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.9</cooldownTime>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Havoc Launcher -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CW_HavocLauncher</defName>
+		<statBases>
+			<SightsEfficiency>0.85</SightsEfficiency>
+			<ShotSpread>0.55</ShotSpread>
+			<SwayFactor>1.25</SwayFactor>
+			<Bulk>8</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_RPG7Grenade_HEAT</defaultProjectile>
+			<warmupTime>1.8</warmupTime>
+			<range>39.9</range>
+			<soundCast>Shot_SniperRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_RPG7Grenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CW_HavocLauncher"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>2.3</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.3</cooldownTime>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2.3</cooldownTime>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Recon Bolter -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CW_ReconBolter</defName>
+		<statBases>
+			<SightsEfficiency>1.75</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.5</SwayFactor>
+			<Bulk>3</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_30x64mmFuel_Thermobaric</defaultProjectile>
+			<warmupTime>1.8</warmupTime>
+			<range>39.9</range>
+			<soundCast>Shot_SniperRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>4</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_30x64mmFuel</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CW_ReconBolter"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>2.4</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2.4</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2.4</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Cybernetic Warfare and Special Weapons/Patches/Cybernetic Warfare and Special Weapons/CyberneticWarfare_Ranged_Spacer.xml b/ModPatches/Cybernetic Warfare and Special Weapons/Patches/Cybernetic Warfare and Special Weapons/CyberneticWarfare_Ranged_Spacer.xml
new file mode 100644
index 0000000000..aeeb66ec62
--- /dev/null
+++ b/ModPatches/Cybernetic Warfare and Special Weapons/Patches/Cybernetic Warfare and Special Weapons/CyberneticWarfare_Ranged_Spacer.xml	
@@ -0,0 +1,538 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Gun Blade -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CW_GunBlade</defName>
+		<statBases>
+			<Bulk>3</Bulk>
+			<SightsEfficiency>0.9</SightsEfficiency>
+			<ShotSpread>0.25</ShotSpread>
+			<SwayFactor>0.45</SwayFactor>
+			<RangedWeapon_Cooldown>0.1</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_PlasmaCellPistol</defaultProjectile>
+			<warmupTime>2</warmupTime>
+			<range>14.9</range>
+			<burstShotCount>7</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>Shot_Revolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>21</magazineSize>
+			<reloadTime>2.45</reloadTime>
+			<ammoSet>AmmoSet_PlasmaCellPistol</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags Inherit="False">
+			<li>CE_Sidearm</li>
+			<li>CE_AI_Pistol</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CW_GunBlade"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<cooldownTime>1.6</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.555</armorPenetrationSharp>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>25</power>
+					<armorPenetrationBlunt>3.275</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.255</armorPenetrationSharp>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Disruptor -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CW_Disruptor</defName>
+		<statBases>
+			<Bulk>6</Bulk>
+			<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>0.25</SwayFactor>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_PlasmaCellHeavy</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>39.9</range>
+			<minRange>1.5</minRange>
+			<soundCast>CW_ElectricPulse</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_PlasmaCellHeavy</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags Inherit="False">
+			<li>AdvancedGun</li>
+			<li>CE_Sidearm</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CW_Disruptor"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<cooldownTime>1.6</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<cooldownTime>1.6</cooldownTime>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>21</power>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<cooldownTime>1.6</cooldownTime>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Napalm Blaster -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CW_NapalmBlaster</defName>
+		<statBases>
+			<Bulk>12</Bulk>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>1.5</ShotSpread>
+			<SwayFactor>0.1</SwayFactor>
+			<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Flamethrower_Napalm</defaultProjectile>
+			<warmupTime>2.5</warmupTime>
+			<range>14.9</range>
+			<minRange>1.5</minRange>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<soundCast>CW_NapalmFlame</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_Flamethrower</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>true</aiUseBurstMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags Inherit="False">
+			<li>SpacerGun</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CW_NapalmBlaster"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<cooldownTime>1.7</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<cooldownTime>1.7</cooldownTime>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<cooldownTime>1.7</cooldownTime>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Dual Eraser -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CW_DualEraser</defName>
+		<statBases>
+			<Bulk>4.5</Bulk>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.75</ShotSpread>
+			<SwayFactor>0.95</SwayFactor>
+			<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_44Magnum_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>19.9</range>
+			<burstShotCount>24</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>24</magazineSize>
+			<reloadTime>0.5</reloadTime>
+			<ammoSet>AmmoSet_44Magnum</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>12</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags Inherit="False">
+			<li>CE_Sidearm</li>
+			<li>CE_SMG</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CW_DualEraser"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<cooldownTime>1.5</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Accelerator -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CW_Accelerator</defName>
+		<statBases>
+			<Bulk>5</Bulk>
+			<SightsEfficiency>1.5</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>0.50</SwayFactor>
+			<RangedWeapon_Cooldown>2.5</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmCharged_Ion</defaultProjectile>
+			<warmupTime>3.5</warmupTime>
+			<range>49.9</range>
+			<minRange>1.5</minRange>
+			<burstShotCount>12</burstShotCount>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<soundCast>CW_GaussProjectile</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>24</magazineSize>
+			<reloadTime>0.5</reloadTime>
+			<ammoSet>AmmoSet_44Magnum</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>8</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags Inherit="False">
+			<li>CE_Sidearm</li>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CW_Accelerator"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<cooldownTime>1.9</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<cooldownTime>1.9</cooldownTime>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<cooldownTime>1.9</cooldownTime>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Plasma Gun -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CW_PlasmaGun</defName>
+		<statBases>
+			<Bulk>5</Bulk>
+			<SightsEfficiency>1.25</SightsEfficiency>
+			<ShotSpread>0.33</ShotSpread>
+			<SwayFactor>0.66</SwayFactor>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_PlasmaCellRifle</defaultProjectile>
+			<warmupTime>3</warmupTime>
+			<range>35.9</range>
+			<burstShotCount>12</burstShotCount>
+			<soundCast>CW_FuturisticWeapon</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>1.5</reloadTime>
+			<ammoSet>AmmoSet_PlasmaCellRifle</ammoSet>
+		</AmmoUser>
+		<weaponTags Inherit="False">
+			<li>CE_Sidearm</li>
+			<li>AdvancedGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CW_PlasmaGun"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<cooldownTime>1.6</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>17</power>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<cooldownTime>1.6</cooldownTime>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Coil Gun -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CW_CoilGun</defName>
+		<statBases>
+			<Bulk>5</Bulk>
+			<Bulk>6</Bulk>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>0.01</SwayFactor>
+			<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>59.9</range>
+			<minRange>1.5</minRange>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<soundCast>CW_RailGun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>0.5</reloadTime>
+			<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>1</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags Inherit="False">
+			<li>CE_Sidearm</li>
+			<li>AdvancedGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CW_CoilGun"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.8</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/DD Elves/Patches/DD Elves/AnimalDefs.xml b/ModPatches/DD Elves/Patches/DD Elves/AnimalDefs.xml
new file mode 100644
index 0000000000..80be3ca91c
--- /dev/null
+++ b/ModPatches/DD Elves/Patches/DD Elves/AnimalDefs.xml	
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ===== Body Type ===== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="DevDesigner_AncientDeer"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="DevDesigner_ColdOne"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Ancient Deer === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_AncientDeer"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>0.07</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_AncientDeer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.27</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="DevDesigner_AncientDeer"]/combatPower</xpath>
+		<value>
+			<combatPower>60</combatPower>
+		</value>
+	</Operation>
+
+	<!-- === Cold One === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_ColdOne"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.31</MeleeDodgeChance>
+			<MeleeCritChance>0.07</MeleeCritChance>
+			<MeleeParryChance>0.03</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_ColdOne"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>venom-fangs</label>
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>0.7</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.925</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.925</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="DevDesigner_ColdOne"]/combatPower</xpath>
+		<value>
+			<combatPower>145</combatPower>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/DD Elves/Patches/DD Elves/PawnKindDefs.xml b/ModPatches/DD Elves/Patches/DD Elves/PawnKindDefs.xml
new file mode 100644
index 0000000000..dba70482a6
--- /dev/null
+++ b/ModPatches/DD Elves/Patches/DD Elves/PawnKindDefs.xml	
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === Spearman === -->
+	<!-- Give Shields -->
+
+	<!-- Dark elves -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="DevDesigner_DarkElves_DreadspearBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>100</min>
+					<max>2000</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>DevDesigner_DarkElves_Shield</li>
+				</shieldTags>
+				<shieldChance>0.65</shieldChance>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- High elves -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="DevDesigner_HighElves_SpearmanBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>100</min>
+					<max>2000</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>DevDesigner_HighElves_Shield</li>
+				</shieldTags>
+				<shieldChance>0.65</shieldChance>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Wood elves -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="DevDesigner_WoodElves_StagKnigthBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>100</min>
+					<max>2000</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>DevDesigner_WoodElves_Shield</li>
+				</shieldTags>
+				<shieldChance>0.65</shieldChance>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Ranged === -->
+
+	<!-- Dark elves -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="DevDesigner_DarkElves_DarkshardBase" or @Name="DevDesigner_DarkElves_DarkRiderBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>12</min>
+					<max>15</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>150</min>
+						<max>250</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>NeolithicMeleeBasic</li>
+						<li>MedievalMeleeDecent</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- High elves -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="DevDesigner_HighElves_ArcherBase" or @Name="DevDesigner_HighElves_ShadowWarriorBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>15</min>
+					<max>30</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>150</min>
+						<max>250</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>NeolithicMeleeBasic</li>
+						<li>MedievalMeleeDecent</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Wood elves -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="DevDesigner_WoodElves_ArcherBase" or @Name="DevDesigner_WoodElves_GuardBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>15</min>
+					<max>30</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>150</min>
+						<max>250</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>NeolithicMeleeBasic</li>
+						<li>MedievalMeleeDecent</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[@Name="DevDesigner_DarkElves_DarkshardBase" or @Name="DevDesigner_DarkElves_DarkRiderBase" or @Name="DevDesigner_HighElves_ArcherBase" or @Name="DevDesigner_HighElves_ShadowWarriorBase" or @Name="DevDesigner_WoodElves_ArcherBase" or @Name="DevDesigner_WoodElves_GuardBase"]</xpath>
+		<value>
+			<apparelRequired>
+				<li>CE_Apparel_TribalBackpack</li>
+			</apparelRequired>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/DD Elves/Patches/DD Elves/ThingDefs_Apparel.xml b/ModPatches/DD Elves/Patches/DD Elves/ThingDefs_Apparel.xml
new file mode 100644
index 0000000000..9dbd4d7e6b
--- /dev/null
+++ b/ModPatches/DD Elves/Patches/DD Elves/ThingDefs_Apparel.xml	
@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ===== Common ===== -->
+	<!-- === Breast Plate === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="DevDesigner_Elves_BreastplateBase"]/statBases</xpath>
+		<value>
+			<Bulk>25</Bulk>
+			<WornBulk>7</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="DevDesigner_Elves_BreastplateBase"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.8</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="DevDesigner_Elves_BreastplateBase"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<!-- === Chainmail === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Elves_Chainmail"]/statBases/Mass</xpath>
+		<value>
+			<Mass>3</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Elves_Chainmail"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Elves_Chainmail"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.45</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- === Gambeson === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Elves_Gambeson"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>6</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Elves_Gambeson"]/statBases/Mass</xpath>
+		<value>
+			<Mass>3</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Elves_Gambeson"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ===== Dark Elves ===== -->
+	<!-- === Leather Armor === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_LeatherArmor"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_LeatherArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>7</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- === Cloak ===-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_ColdOneKnightCloak" or defName="DevDesigner_DarkElves_BlackGuardCloak" or defName="DevDesigner_DarkElves_Cape"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_ColdOneKnightCloak" or defName="DevDesigner_DarkElves_BlackGuardCloak" or defName="DevDesigner_DarkElves_Cape"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- === Breast Plate === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_ColdOneKnightArmor" or defName="DevDesigner_DarkElves_BlackGuardArmor"]/statBases</xpath>
+		<value>
+			<Bulk>25</Bulk>
+			<WornBulk>7</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_ColdOneKnightArmor" or defName="DevDesigner_DarkElves_BlackGuardArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_ColdOneKnightArmor" or defName="DevDesigner_DarkElves_BlackGuardArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<!-- === Clothing ===-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_MorathiRobe" or defName="DevDesigner_DarkElves_SorceressRobe" or defName="DevDesigner_DarkElves_WitchBikini"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_MorathiRobe" or defName="DevDesigner_DarkElves_SorceressRobe" or defName="DevDesigner_DarkElves_WitchBikini"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ===== High Elves ===== -->
+	<!-- === Cloak ===-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_Cloak" or defName="DevDesigner_HighElves_WhiteLionPelt" or defName="DevDesigner_HighElves_LordCloak"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_Cloak" or defName="DevDesigner_HighElves_WhiteLionPelt" or defName="DevDesigner_HighElves_LordCloak"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- === Breast Plate === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_WhiteLionArmor" or defName="DevDesigner_HighElves_DragonPrinceArmor" or defName="DevDesigner_HighElves_LordArmor"]/statBases</xpath>
+		<value>
+			<Bulk>25</Bulk>
+			<WornBulk>7</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_WhiteLionArmor" or defName="DevDesigner_HighElves_DragonPrinceArmor" or defName="DevDesigner_HighElves_LordArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_WhiteLionArmor" or defName="DevDesigner_HighElves_DragonPrinceArmor" or defName="DevDesigner_HighElves_LordArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<!-- === Clothing ===-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_AlarielleRobe"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_AlarielleRobe"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ===== Wood Elves ===== -->
+	<!-- === Leather Armor === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_LeatherArmor"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_LeatherArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>7</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- === Cloak ===-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_Cloak" or defName="DevDesigner_WoodElves_ShamanCloak" or defName="DevDesigner_HighElves_LordCloak"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_Cloak" or defName="DevDesigner_WoodElves_ShamanCloak" or defName="DevDesigner_HighElves_LordCloak"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- === Chainmail === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_Scalemail"]/statBases/Mass</xpath>
+		<value>
+			<Mass>3</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_Scalemail"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Elves_Chainmail"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.45</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- === Clothing ===-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_Tunic" or defName="DevDesigner_WoodElves_ShamanRobe" or defName="DevDesigner_WoodElves_Bikini" or defName="DevDesigner_WoodElves_Lioncloth" or defName="DevDesigner_WoodElves_Corset"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_Tunic" or defName="DevDesigner_WoodElves_ShamanRobe" or defName="DevDesigner_WoodElves_Bikini" or defName="DevDesigner_WoodElves_Lioncloth" or defName="DevDesigner_WoodElves_Corset"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/DD Elves/Patches/DD Elves/ThingDefs_Headgear.xml b/ModPatches/DD Elves/Patches/DD Elves/ThingDefs_Headgear.xml
new file mode 100644
index 0000000000..3e8b8a9f87
--- /dev/null
+++ b/ModPatches/DD Elves/Patches/DD Elves/ThingDefs_Headgear.xml	
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ===== Dark Elves ===== -->
+	<!-- === Deadspear Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_DreadspearHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_DreadspearHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.0</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- === Hood === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_MaskedHoodA" or defName="DevDesigner_DarkElves_MaskedHoodB"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_MaskedHoodA" or defName="DevDesigner_DarkElves_MaskedHoodB"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- === Knight Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_ColdOneKnightHelmet" or defName="DevDesigner_DarkElves_BlackGuardHelmet" or defName="DevDesigner_DarkElves_MorathiHelmet" or defName="DevDesigner_DarkElves_WitchHelmet" or defName="DevDesigner_DarkElves_SorceressHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_ColdOneKnightHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingAccuracy>-0.3</AimingAccuracy>
+			<MeleeHitChance>-1.5</MeleeHitChance>
+			<Suppressability>-0.15</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_ColdOneKnightHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.7</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ===== High Elves ===== -->
+	<!-- === Spearman Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_SpearmanHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_SpearmanHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.0</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- === Knight Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_ShadowWarriorHelmet" or defName="DevDesigner_HighElves_WhiteLionHelmet" or defName="DevDesigner_HighElves_DragonPrinceHelmet" or defName="DevDesigner_HighElves_AlarielleHelmet" or defName="DevDesigner_HighElves_LordHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_ShadowWarriorHelmet" or defName="DevDesigner_HighElves_WhiteLionHelmet" or defName="DevDesigner_HighElves_DragonPrinceHelmet" or defName="DevDesigner_HighElves_AlarielleHelmet" or defName="DevDesigner_HighElves_LordHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingAccuracy>-0.3</AimingAccuracy>
+			<MeleeHitChance>-1.5</MeleeHitChance>
+			<Suppressability>-0.15</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_ShadowWarriorHelmet" or defName="DevDesigner_HighElves_WhiteLionHelmet" or defName="DevDesigner_HighElves_DragonPrinceHelmet" or defName="DevDesigner_HighElves_AlarielleHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.7</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_LordHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.0</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ===== Wood Elves ===== -->
+	<!-- === Stag Knight Helmet and Shaman Crown === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_StagKnightHelmet" or @Name="DevDesigner_WoodElves_ShamanCrownBase"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_StagKnightHelmet" or @Name="DevDesigner_WoodElves_ShamanCrownBase"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.25</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- === Hood === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_Hood" or defName="DevDesigner_WoodElves_MaskedHood"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_ArmoredHood"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_Hood" or defName="DevDesigner_WoodElves_MaskedHood"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_ArmoredHood"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.25</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- === Bladedancer Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_BladeDancerHelmetA"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_BladeDancerHelmetA"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.55</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/DD Elves/Patches/DD Elves/ThingDefs_MeleeWeapon.xml b/ModPatches/DD Elves/Patches/DD Elves/ThingDefs_MeleeWeapon.xml
new file mode 100644
index 0000000000..ff6f8e974a
--- /dev/null
+++ b/ModPatches/DD Elves/Patches/DD Elves/ThingDefs_MeleeWeapon.xml	
@@ -0,0 +1,606 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Spear === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Spear" or defName="DevDesigner_HighElves_Spear" or defName="DevDesigner_WoodElves_Spear"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>4</Bulk>
+				<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Spear" or defName="DevDesigner_HighElves_Spear" or defName="DevDesigner_WoodElves_Spear"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.17</MeleeCritChance>
+				<MeleeParryChance>0.5</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Spear" or defName="DevDesigner_HighElves_Spear" or defName="DevDesigner_WoodElves_Spear"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Spear" or defName="DevDesigner_HighElves_Spear" or defName="DevDesigner_WoodElves_Spear"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.50</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.6</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.6</cooldownTime>
+					<chanceFactor>0.90</chanceFactor>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.75</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Greatsword === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Greatsword" or defName="DevDesigner_HighElves_Greatsword" or defName="DevDesigner_WoodElves_Greatsword"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>12</Bulk>
+				<MeleeCounterParryBonus>0.70</MeleeCounterParryBonus>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Greatsword" or defName="DevDesigner_HighElves_Greatsword" or defName="DevDesigner_WoodElves_Greatsword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.30</MeleeCritChance>
+				<MeleeParryChance>1.20</MeleeParryChance>
+				<MeleeDodgeChance>0.50</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Greatsword" or defName="DevDesigner_HighElves_Greatsword" or defName="DevDesigner_WoodElves_Greatsword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.69</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.98</cooldownTime>
+					<chanceFactor>0.50</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.90</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>48</power>
+					<cooldownTime>2.86</cooldownTime>
+					<chanceFactor>0.45</chanceFactor>
+					<armorPenetrationBlunt>3.592</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.58</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Halberd === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Halberd"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>10</Bulk>
+				<MeleeCounterParryBonus>1.08</MeleeCounterParryBonus>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Halberd"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.22</MeleeCritChance>
+				<MeleeParryChance>1.53</MeleeParryChance>
+				<MeleeDodgeChance>0.67</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Halberd"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.31</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>2.9</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>
+
+	<!-- === Longsword === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_Longsword"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_Longsword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.63</MeleeCritChance>
+				<MeleeParryChance>0.75</MeleeParryChance>
+				<MeleeDodgeChance>0.40</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_Longsword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.69</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.60</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.56</cooldownTime>
+					<chanceFactor>0.35</chanceFactor>
+					<armorPenetrationBlunt>2.592</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.58</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Sword === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Sword" or defName="DevDesigner_HighElves_Sword" or defName="DevDesigner_WoodElves_Sword"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Sword" or defName="DevDesigner_HighElves_Sword" or defName="DevDesigner_WoodElves_Sword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.40</MeleeCritChance>
+				<MeleeParryChance>0.60</MeleeParryChance>
+				<MeleeDodgeChance>0.30</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Sword" or defName="DevDesigner_HighElves_Sword" or defName="DevDesigner_WoodElves_Sword"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Sword" or defName="DevDesigner_HighElves_Sword" or defName="DevDesigner_WoodElves_Sword"]/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.05</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.46</cooldownTime>
+					<chanceFactor>0.50</chanceFactor>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.40</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.45</chanceFactor>
+					<armorPenetrationBlunt>1.1</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.58</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Dagger === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Dagger"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>0.3</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Dagger"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.40</MeleeCritChance>
+				<MeleeParryChance>0.60</MeleeParryChance>
+				<MeleeDodgeChance>0.30</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Dagger"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Dagger"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.46</cooldownTime>
+					<chanceFactor>0.50</chanceFactor>
+					<armorPenetrationBlunt>0.685</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.75</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.45</chanceFactor>
+					<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.725</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Axe === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_Axe"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<MeleeCounterParryBonus>0.22</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_Axe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.31</MeleeCritChance>
+				<MeleeParryChance>0.22</MeleeParryChance>
+				<MeleeDodgeChance>0.22</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_Axe"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_Axe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>0.95</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>15</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.25</chanceFactor>
+					<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.32</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.58</cooldownTime>
+					<chanceFactor>0.70</chanceFactor>
+					<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Greataxe === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_Greataxe" or defName="DevDesigner_WoodElves_Greataxe"]/statBases</xpath>
+		<value>
+			<Bulk>7</Bulk>
+			<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_Greataxe" or defName="DevDesigner_WoodElves_Greataxe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.30</MeleeCritChance>
+				<MeleeParryChance>0.40</MeleeParryChance>
+				<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_Greataxe" or defName="DevDesigner_WoodElves_Greataxe"]/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>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2.18</cooldownTime>
+					<chanceFactor>0.25</chanceFactor>
+					<armorPenetrationBlunt>9.6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>37</power>
+					<cooldownTime>2.18</cooldownTime>
+					<chanceFactor>0.70</chanceFactor>
+					<armorPenetrationBlunt>9.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.95</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Staff === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_AlarielleStaff" or defName="DevDesigner_WoodElves_ShamanStaff"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>1.56</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_AlarielleStaff" or defName="DevDesigner_WoodElves_ShamanStaff"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.6</MeleeCritChance>
+				<MeleeParryChance>1.17</MeleeParryChance>
+				<MeleeDodgeChance>0.47</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_AlarielleStaff" or defName="DevDesigner_WoodElves_ShamanStaff"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_AlarielleStaff" or defName="DevDesigner_WoodElves_ShamanStaff"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.3</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.3</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.84</cooldownTime>
+					<armorPenetrationBlunt>4.28</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/DD Elves/Patches/DD Elves/ThingDefs_Misc.xml b/ModPatches/DD Elves/Patches/DD Elves/ThingDefs_Misc.xml
new file mode 100644
index 0000000000..3aa5dbeea3
--- /dev/null
+++ b/ModPatches/DD Elves/Patches/DD Elves/ThingDefs_Misc.xml	
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Pauldrons === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_BlackGuardPauldrons" or defName="DevDesigner_DarkElves_MorathiPauldrons" or defName="DevDesigner_HighElves_ShadowWarriorPauldrons" or defName="DevDesigner_HighElves_DragonPrincePauldrons" or defName="DevDesigner_HighElves_LordPauldrons" or defName="DevDesigner_WoodElves_StagKnightPauldrons"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_ShadowWarriorPauldrons"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.25</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_BlackGuardPauldrons" or defName="DevDesigner_DarkElves_MorathiPauldrons" or defName="DevDesigner_HighElves_DragonPrincePauldrons" or defName="DevDesigner_HighElves_LordPauldrons"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.7</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_StagKnightPauldrons"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.35</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- === Gloves and Boots === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_Boots" or defName="DevDesigner_WoodElves_Gloves"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_Boots" or defName="DevDesigner_WoodElves_Gloves"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- === Quiver === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="DevDesigner_Utility_QuiverBase"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="DevDesigner_Utility_QuiverBase"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>15</CarryBulk>
+				<ReloadSpeed>0.4</ReloadSpeed>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/DD Elves/Patches/DD Elves/ThingDefs_RangedWeapon.xml b/ModPatches/DD Elves/Patches/DD Elves/ThingDefs_RangedWeapon.xml
new file mode 100644
index 0000000000..812d0f54a3
--- /dev/null
+++ b/ModPatches/DD Elves/Patches/DD Elves/ThingDefs_RangedWeapon.xml	
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Crossbow"]/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>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_Bow" or defName="DevDesigner_WoodElves_Greatbow" or defName="DevDesigner_WoodElves_RecurveBow" or defName="DevDesigner_HighElves_Longbow"]/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>
+	</Operation>
+
+	<!-- === Dark Elves Repeating Crossbow === -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Crossbow"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DevDesigner_DarkElves_Crossbow</defName>
+		<statBases>
+			<Bulk>10</Bulk>
+			<SwayFactor>1.2</SwayFactor>
+			<ShotSpread>0.25</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Projectile_CrossbowBolt_Steel</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>23</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
+			<soundCast>Bow_Large</soundCast>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>3</magazineSize>
+			<reloadTime>7</reloadTime>
+			<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- === Wood Elves Bow === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DevDesigner_WoodElves_Bow</defName>
+		<statBases>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.85</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>5.00</Bulk>
+			<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>50</WoodLog>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_StreamlinedArrow_Stone</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>26</range>
+			<soundCast>Bow_Recurve</soundCast>
+		</Properties>
+		<AmmoUser>
+			<ammoSet>AmmoSet_StreamlinedArrow</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- === Wood Elves Greatbow === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DevDesigner_WoodElves_Greatbow</defName>
+		<statBases>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.85</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>5.00</Bulk>
+			<RangedWeapon_Cooldown>0.75</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>70</WoodLog>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_GreatArrow_Stone</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>33</range>
+			<soundCast>Bow_Large</soundCast>
+		</Properties>
+		<AmmoUser>
+			<ammoSet>AmmoSet_GreatArrow</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- === Wood Elves Recurve Bow === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DevDesigner_WoodElves_RecurveBow</defName>
+		<statBases>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.85</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>6.00</Bulk>
+			<RangedWeapon_Cooldown>0.8</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>50</WoodLog>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_StreamlinedArrow_Stone</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>35</range>
+			<soundCast>Bow_Recurve</soundCast>
+		</Properties>
+		<AmmoUser>
+			<ammoSet>AmmoSet_StreamlinedArrow</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- === High Elves Longbow === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DevDesigner_HighElves_Longbow</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.9</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>7.50</Bulk>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>85</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/>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/DD Elves/Patches/DD Elves/ThingDefs_Shields.xml b/ModPatches/DD Elves/Patches/DD Elves/ThingDefs_Shields.xml
new file mode 100644
index 0000000000..817bf21320
--- /dev/null
+++ b/ModPatches/DD Elves/Patches/DD Elves/ThingDefs_Shields.xml	
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Replace ThingClass === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="DevDesigner_BaseShield"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Apparel_Shield</thingClass>
+		</value>
+	</Operation>
+
+	<!-- === Replace Parent === -->
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[@Name="DevDesigner_BaseShield"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>ArmorSmithableBase</value>
+	</Operation>
+
+	<!-- === Replace Apparel Layer & BodyPart Group === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="DevDesigner_BaseShield"]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>Shield</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="DevDesigner_BaseShield"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>LeftShoulder</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<!-- === Remove VFE Shield Stuff === -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="DevDesigner_BaseShield"]/tools</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_Shield" or defName="DevDesigner_HighElves_Shield" or defName="DevDesigner_HighElves_DragonPrinceShield" or defName="DevDesigner_DarkElves_Shield"]/comps/li[@Class="VFECore.CompProperties_Shield"]</xpath>
+	</Operation>
+
+	<!-- === Add CE Shield Stuff === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="DevDesigner_BaseShield"]</xpath>
+		<value>
+			<li Class="CombatExtended.ShieldDefExtension">
+				<shieldCoverage>
+					<li>Hands</li>
+					<li>Arms</li>
+					<li>Shoulders</li>
+					<li>Torso</li>
+					<li>Neck</li>
+				</shieldCoverage>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Add Bulk === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_Shield" or defName="DevDesigner_HighElves_Shield" or defName="DevDesigner_HighElves_DragonPrinceShield" or defName="DevDesigner_DarkElves_Shield"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- === Replace Stat Offsets === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="DevDesigner_BaseShield"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<ReloadSpeed>-0.2</ReloadSpeed>
+				<MeleeHitChance>-1</MeleeHitChance>
+				<ShootingAccuracyPawn>-0.15</ShootingAccuracyPawn>
+				<AimingAccuracy>-0.08</AimingAccuracy>
+				<Suppressability>-0.25</Suppressability>
+				<MeleeCritChance>-0.05</MeleeCritChance>
+				<MeleeParryChance>1.0</MeleeParryChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- === Replace Stuff Thickness === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_Shield" or defName="DevDesigner_HighElves_Shield" or defName="DevDesigner_HighElves_DragonPrinceShield" or defName="DevDesigner_DarkElves_Shield"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/DD House Sanguin/Patches/DD House Sanguin/Mods/Medieval Overhaul/Bloodwine_MO.xml b/ModPatches/DD House Sanguin/Patches/DD House Sanguin/Mods/Medieval Overhaul/Bloodwine_MO.xml
new file mode 100644
index 0000000000..3ae00c4a27
--- /dev/null
+++ b/ModPatches/DD House Sanguin/Patches/DD House Sanguin/Mods/Medieval Overhaul/Bloodwine_MO.xml	
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Medieval Overhaul</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!-- === Blood Wine === -->
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="DevDesigner_BloodWine"]/statBases</xpath>
+					<value>
+						<Bulk>1.5</Bulk>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/DD House Sanguin/Patches/DD House Sanguin/Mods/RimFantasy - Medeival Overhaul/Blood Weapons.xml b/ModPatches/DD House Sanguin/Patches/DD House Sanguin/Mods/RimFantasy - Medeival Overhaul/Blood Weapons.xml
new file mode 100644
index 0000000000..29c1e60d05
--- /dev/null
+++ b/ModPatches/DD House Sanguin/Patches/DD House Sanguin/Mods/RimFantasy - Medeival Overhaul/Blood Weapons.xml	
@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>RimFantasy - Medieval Overhaul Edition</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!-- === Blood Longsword === -->
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_BloodLongsword"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>handle</label>
+								<capacities>
+									<li>Poke</li>
+								</capacities>
+								<power>4</power>
+								<cooldownTime>1.78</cooldownTime>
+								<chanceFactor>0.10</chanceFactor>
+								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>point</label>
+								<capacities>
+									<li>Stab</li>
+								</capacities>
+								<power>20</power>
+								<cooldownTime>1.80</cooldownTime>
+								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+								<armorPenetrationSharp>2.25</armorPenetrationSharp>
+								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>edge</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>44</power>
+								<cooldownTime>1.68</cooldownTime>
+								<armorPenetrationBlunt>3.44</armorPenetrationBlunt>
+								<armorPenetrationSharp>0.86</armorPenetrationSharp>
+								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_BloodLongsword"]/statBases</xpath>
+					<value>
+						<Bulk>8</Bulk>
+						<MeleeCounterParryBonus>0.8</MeleeCounterParryBonus>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_BloodLongsword"]</xpath>
+					<value>
+						<equippedStatOffsets>
+							<MeleeCritChance>0.5</MeleeCritChance>
+							<MeleeParryChance>0.6</MeleeParryChance>
+							<MeleeDodgeChance>0.4</MeleeDodgeChance>
+						</equippedStatOffsets>
+					</value>
+				</li>
+
+				<!-- === Blood Executioner's Greatsword === -->
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_BloodExecutionerGreatsword"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>handle</label>
+								<capacities>
+									<li>Poke</li>
+								</capacities>
+								<power>5</power>
+								<cooldownTime>1.99</cooldownTime>
+								<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
+								<chanceFactor>0.15</chanceFactor>
+								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>point</label>
+								<capacities>
+									<li>Stab</li>
+								</capacities>
+								<power>60</power>
+								<cooldownTime>1.99</cooldownTime>
+								<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
+								<armorPenetrationSharp>0.87</armorPenetrationSharp>
+								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>edge</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>49</power>
+								<cooldownTime>3.18</cooldownTime>
+								<armorPenetrationBlunt>3.888</armorPenetrationBlunt>
+								<armorPenetrationSharp>0.48</armorPenetrationSharp>
+								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_BloodExecutionerGreatsword"]/statBases</xpath>
+					<value>
+						<Bulk>8</Bulk>
+						<MeleeCounterParryBonus>0.65</MeleeCounterParryBonus>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_BloodExecutionerGreatsword"]</xpath>
+					<value>
+						<equippedStatOffsets>
+							<MeleeCritChance>0.08</MeleeCritChance>
+							<MeleeParryChance>0.54</MeleeParryChance>
+							<MeleeDodgeChance>0.45</MeleeDodgeChance>
+						</equippedStatOffsets>
+					</value>
+				</li>
+
+				<!-- === Blood Arming Sword === -->
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_BloodSword"]/statBases</xpath>
+					<value>
+						<Bulk>6</Bulk>
+						<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_BloodSword"]</xpath>
+					<value>
+						<equippedStatOffsets>
+							<MeleeCritChance>0.46</MeleeCritChance>
+							<MeleeParryChance>0.60</MeleeParryChance>
+							<MeleeDodgeChance>0.34</MeleeDodgeChance>
+						</equippedStatOffsets>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_BloodSword"]/weaponTags</xpath>
+					<value>
+						<li>CE_OneHandedWeapon</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_BloodSword"]/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.05</chanceFactor>
+								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>point</label>
+								<capacities>
+									<li>Stab</li>
+								</capacities>
+								<power>22</power>
+								<cooldownTime>1.46</cooldownTime>
+								<chanceFactor>0.50</chanceFactor>
+								<armorPenetrationBlunt>0.62</armorPenetrationBlunt>
+								<armorPenetrationSharp>1.48</armorPenetrationSharp>
+								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>edge</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>25</power>
+								<cooldownTime>1.63</cooldownTime>
+								<chanceFactor>0.45</chanceFactor>
+								<armorPenetrationBlunt>1.08</armorPenetrationBlunt>
+								<armorPenetrationSharp>0.63</armorPenetrationSharp>
+								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<!-- === Void Longsword === -->
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_VoidLongsword"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>handle</label>
+								<capacities>
+									<li>Poke</li>
+								</capacities>
+								<power>4</power>
+								<cooldownTime>1.78</cooldownTime>
+								<chanceFactor>0.10</chanceFactor>
+								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>point</label>
+								<capacities>
+									<li>Stab</li>
+								</capacities>
+								<power>20</power>
+								<cooldownTime>1.80</cooldownTime>
+								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+								<armorPenetrationSharp>2.25</armorPenetrationSharp>
+								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>edge</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>44</power>
+								<cooldownTime>1.68</cooldownTime>
+								<armorPenetrationBlunt>3.44</armorPenetrationBlunt>
+								<armorPenetrationSharp>0.86</armorPenetrationSharp>
+								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_VoidLongsword"]/statBases</xpath>
+					<value>
+						<Bulk>8</Bulk>
+						<MeleeCounterParryBonus>0.8</MeleeCounterParryBonus>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_VoidLongsword"]/equippedStatOffsets</xpath>
+					<value>
+						<MeleeCritChance>0.5</MeleeCritChance>
+						<MeleeParryChance>0.6</MeleeParryChance>
+						<MeleeDodgeChance>0.4</MeleeDodgeChance>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/DD House Sanguin/Patches/DD House Sanguin/Mods/Vanilla Faction Expanded Medieval/BloodWine_VFEM.xml b/ModPatches/DD House Sanguin/Patches/DD House Sanguin/Mods/Vanilla Faction Expanded Medieval/BloodWine_VFEM.xml
new file mode 100644
index 0000000000..783c8cb6d0
--- /dev/null
+++ b/ModPatches/DD House Sanguin/Patches/DD House Sanguin/Mods/Vanilla Faction Expanded Medieval/BloodWine_VFEM.xml	
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Medieval Overhaul</li>
+		</mods>
+		<nomatch Class="PatchOperationFindMod">
+			<mods>
+				<li>Vanilla Factions Expanded - Medieval</li>
+			</mods>
+			<match Class="PatchOperationSequence">
+				<operations>
+
+					<!-- === Blood Wine === -->
+					<li Class="PatchOperationAdd" MayRequire="oskarpotocki.vanillafactionsexpanded.medievalmodule">
+						<xpath>Defs/ThingDef[defName="DevDesigner_VFEM_BloodWine"]/statBases</xpath>
+						<value>
+							<Bulk>1.5</Bulk>
+						</value>
+					</li>
+					<li Class="PatchOperationReplace" MayRequire="oskarpotocki.vanillafactionsexpanded.medievalmodule">
+						<xpath>Defs/ThingDef[defName="DevDesigner_VFEM_BloodWine"]/tools</xpath>
+						<value>
+							<tools>
+								<li Class="CombatExtended.ToolCE">
+									<capacities>
+										<li>Blunt</li>
+									</capacities>
+									<power>2</power>
+									<cooldownTime>2.22</cooldownTime>
+									<chanceFactor>1.33</chanceFactor>
+									<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
+									<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
+								</li>
+								<li Class="CombatExtended.ToolCE">
+									<label>neck</label>
+									<capacities>
+										<li>Poke</li>
+									</capacities>
+									<power>1</power>
+									<cooldownTime>3.33</cooldownTime>
+									<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
+									<linkedBodyPartsGroup>Neck</linkedBodyPartsGroup>
+								</li>
+							</tools>
+						</value>
+					</li>
+				</operations>
+			</match>
+		</nomatch>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/DD House Sanguin/Patches/DD House Sanguin/ThingDefs_Apparel.xml b/ModPatches/DD House Sanguin/Patches/DD House Sanguin/ThingDefs_Apparel.xml
new file mode 100644
index 0000000000..20758b033c
--- /dev/null
+++ b/ModPatches/DD House Sanguin/Patches/DD House Sanguin/ThingDefs_Apparel.xml	
@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Heavy Hauberk === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_HeraldicHeavyHauberk"]/statBases</xpath>
+		<value>
+			<Bulk>30</Bulk>
+			<WornBulk>8</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_HeraldicHeavyHauberk"]/statBases/Mass</xpath>
+		<value>
+			<Mass>9</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_HeraldicHeavyHauberk"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_HeraldicHeavyHauberk"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>Torso</li>
+				<li>Shoulders</li>
+				<li>Arms</li>
+				<li>Legs</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_HeraldicHeavyHauberk"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_HeraldicHeavyHauberk"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeDodgeChance>-0.10</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- === Full Plate === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_FullPlate"]/statBases</xpath>
+		<value>
+			<Bulk>110</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_FullPlate"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.8</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_FullPlate"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_FullPlate"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeDodgeChance>-0.15</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_FullPlate"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_FullPlate"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Lord Full Plate === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_LordFullPlate"]/statBases</xpath>
+		<value>
+			<Bulk>110</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_LordFullPlate"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6.8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_LordFullPlate"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>10.2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_LordFullPlate"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_LordFullPlate"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeDodgeChance>-0.15</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_LordFullPlate"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_LordFullPlate"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/DD House Sanguin/Patches/DD House Sanguin/ThingDefs_Headgear.xml b/ModPatches/DD House Sanguin/Patches/DD House Sanguin/ThingDefs_Headgear.xml
new file mode 100644
index 0000000000..dc841cecae
--- /dev/null
+++ b/ModPatches/DD House Sanguin/Patches/DD House Sanguin/ThingDefs_Headgear.xml	
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Hood === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_Hood"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_Hood"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- === Great & Armet Helmets === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="DevDesigner_Blood_Apparel_HeraldicGreatHelm" or
+			defName="DevDesigner_Blood_Apparel_ArmetNormal" or
+			defName="DevDesigner_Blood_Apparel_Armet" or
+			defName="DevDesigner_Blood_Apparel_ArmetWinged"
+			]/statBases </xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="DevDesigner_Blood_Apparel_HeraldicGreatHelm" or
+			defName="DevDesigner_Blood_Apparel_ArmetNormal" or
+			defName="DevDesigner_Blood_Apparel_Armet" or
+			defName="DevDesigner_Blood_Apparel_ArmetWinged"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_HeraldicGreatHelm"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>-0.4</AimingAccuracy>
+				<MeleeHitChance>-2</MeleeHitChance>
+				<PainShockThreshold>0.15</PainShockThreshold>
+				<MentalBreakThreshold>-0.15</MentalBreakThreshold>
+				<NegotiationAbility>0.05</NegotiationAbility>
+				<SocialImpact>0.30</SocialImpact>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="DevDesigner_Blood_Apparel_ArmetNormal" or
+			defName="DevDesigner_Blood_Apparel_Armet" or
+			defName="DevDesigner_Blood_Apparel_ArmetWinged"
+			]/equippedStatOffsets </xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>-0.4</AimingAccuracy>
+				<MeleeHitChance>-2</MeleeHitChance>
+				<PainShockThreshold>0.15</PainShockThreshold>
+				<MentalBreakThreshold>-0.15</MentalBreakThreshold>
+				<NegotiationAbility>0.05</NegotiationAbility>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[
+			defName="DevDesigner_Blood_Apparel_HeraldicGreatHelm" or
+			defName="DevDesigner_Blood_Apparel_ArmetNormal" or
+			defName="DevDesigner_Blood_Apparel_Armet" or
+			defName="DevDesigner_Blood_Apparel_ArmetWinged"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Jaw</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Jaw</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Lord Armet Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_ArmetLord"]/statBases</xpath>
+		<value>
+			<Bulk>7</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_ArmetLord"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>-0.4</AimingAccuracy>
+				<MeleeHitChance>-2</MeleeHitChance>
+				<PainShockThreshold>0.20</PainShockThreshold>
+				<MentalBreakThreshold>-0.18</MentalBreakThreshold>
+				<NegotiationAbility>0.10</NegotiationAbility>
+				<SocialImpact>0.35</SocialImpact>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_ArmetLord"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Jaw</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Jaw</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/DD House Sanguin/Patches/DD House Sanguin/ThingDefs_HorseApparel.xml b/ModPatches/DD House Sanguin/Patches/DD House Sanguin/ThingDefs_HorseApparel.xml
new file mode 100644
index 0000000000..bcf764ff01
--- /dev/null
+++ b/ModPatches/DD House Sanguin/Patches/DD House Sanguin/ThingDefs_HorseApparel.xml	
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Animal Gear</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!-- === Caparison === -->
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[@Name="DevDesigner_Apparel_Horse_CaparisonBase" or @Name="DevDesigner_Apparel_Horse_DarkCaparisonBase"]/statBases</xpath>
+					<value>
+						<Bulk>5</Bulk>
+						<WornBulk>1</WornBulk>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[@Name="DevDesigner_Apparel_Horse_CaparisonBase" or @Name="DevDesigner_Apparel_Horse_DarkCaparisonBase"]/statBases/StuffEffectMultiplierArmor</xpath>
+					<value>
+						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+					</value>
+				</li>
+
+				<!-- === Horse Plate Armor === -->
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[@Name="DevDesigner_Apparel_Horse_PlateBase"]/statBases</xpath>
+					<value>
+						<Bulk>100</Bulk>
+						<WornBulk>5</WornBulk>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[@Name="DevDesigner_Apparel_Horse_PlateBase"]/statBases/StuffEffectMultiplierArmor</xpath>
+					<value>
+						<StuffEffectMultiplierArmor>2.85</StuffEffectMultiplierArmor>
+					</value>
+				</li>
+
+				<!-- === Horse Bone Armor === -->
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[@Name="DevDesigner_Apparel_Horse_BoneBase"]/statBases</xpath>
+					<value>
+						<Bulk>100</Bulk>
+						<WornBulk>5</WornBulk>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[@Name="DevDesigner_Apparel_Horse_BoneBase"]/statBases/StuffEffectMultiplierArmor</xpath>
+					<value>
+						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/DD House Sanguin/Patches/DD House Sanguin/ThingDefs_MeleeWeapons.xml b/ModPatches/DD House Sanguin/Patches/DD House Sanguin/ThingDefs_MeleeWeapons.xml
new file mode 100644
index 0000000000..cc27191870
--- /dev/null
+++ b/ModPatches/DD House Sanguin/Patches/DD House Sanguin/ThingDefs_MeleeWeapons.xml	
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Longsword === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_Longsword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.78</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.78</cooldownTime>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.80</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>42</power>
+					<cooldownTime>1.64</cooldownTime>
+					<armorPenetrationBlunt>3.24</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.82</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_Longsword"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>0.75</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_Longsword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.46</MeleeCritChance>
+				<MeleeParryChance>0.57</MeleeParryChance>
+				<MeleeDodgeChance>0.43</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- === Executioner's Greatsword === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_ExecutionerGreatsword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.99</cooldownTime>
+					<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>47</power>
+					<cooldownTime>3.0</cooldownTime>
+					<armorPenetrationBlunt>3.688</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.42</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_ExecutionerGreatsword"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>0.62</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_ExecutionerGreatsword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.082</MeleeCritChance>
+				<MeleeParryChance>0.55</MeleeParryChance>
+				<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- === Arming Sword === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_Sword"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_Sword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.40</MeleeCritChance>
+				<MeleeParryChance>0.60</MeleeParryChance>
+				<MeleeDodgeChance>0.30</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_Sword"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_Sword"]/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.05</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.46</cooldownTime>
+					<chanceFactor>0.50</chanceFactor>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.40</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.45</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.58</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Polearm: Pike-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_PikeStandard"]</xpath>
+		<value>
+			<tools Inherit="False">
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.3</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>1.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.5</cooldownTime>
+					<chanceFactor>0.95</chanceFactor>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_PikeStandard"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.08</MeleeCritChance>
+				<MeleeParryChance>0.95</MeleeParryChance>
+				<MeleeDodgeChance>1.27</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_PikeStandard"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>12</Bulk>
+				<MeleeCounterParryBonus>1.27</MeleeCounterParryBonus>
+			</statBases>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/DD House Sanguin/Patches/DD House Sanguin/ThingDefs_Misc.xml b/ModPatches/DD House Sanguin/Patches/DD House Sanguin/ThingDefs_Misc.xml
new file mode 100644
index 0000000000..33fbbc8857
--- /dev/null
+++ b/ModPatches/DD House Sanguin/Patches/DD House Sanguin/ThingDefs_Misc.xml	
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Cape === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_Cape"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/DD House Sanguin/Patches/DD House Sanguin/ThingDefs_Shields.xml b/ModPatches/DD House Sanguin/Patches/DD House Sanguin/ThingDefs_Shields.xml
new file mode 100644
index 0000000000..b9c1d5111e
--- /dev/null
+++ b/ModPatches/DD House Sanguin/Patches/DD House Sanguin/ThingDefs_Shields.xml	
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_KiteShield"]</xpath>
+		<value>
+			<ThingDef ParentName="ShieldBase">
+				<defName>DevDesigner_Blood_Apparel_KiteShield</defName>
+				<label>kite shield (Sanguin)</label>
+				<description>An elongated shield that offers a wide area of protection. Somewhat bulky for close combat.  \n\nThis kite shield carries the colors of house Sanguin.</description>
+				<techLevel>Medieval</techLevel>
+				<graphicData>
+					<texPath>Apparel/Utility/BloodKiteShield</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+					<drawSize>0.83</drawSize>
+				</graphicData>
+				<possessionCount>1</possessionCount>
+				<costStuffCount>80</costStuffCount>
+				<stuffCategories>
+					<li>Steeled</li>
+					<li>Woody</li>
+				</stuffCategories>
+				<costList Inherit="False">
+				  <HemogenPack>1</HemogenPack>
+				</costList>
+				<recipeMaker>
+					<researchPrerequisite>Smithing</researchPrerequisite>
+					<recipeUsers>
+						<li>FueledSmithy</li>
+						<li>ElectricSmithy</li>
+					</recipeUsers>
+				</recipeMaker>
+				<statBases>
+					<WorkToMake>9500</WorkToMake>
+					<MaxHitPoints>125</MaxHitPoints>
+					<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+					<Mass>7</Mass>
+					<Bulk>8</Bulk>
+					<WornBulk>5</WornBulk>
+				</statBases>
+				<equippedStatOffsets>
+					<ReloadSpeed>-0.2</ReloadSpeed>
+					<MeleeHitChance>-1</MeleeHitChance>
+					<ShootingAccuracyPawn>-0.15</ShootingAccuracyPawn>
+					<AimingAccuracy>-0.08</AimingAccuracy>
+					<Suppressability>-0.25</Suppressability>
+					<MeleeCritChance>-0.05</MeleeCritChance>
+					<MeleeParryChance>1.0</MeleeParryChance>
+				</equippedStatOffsets>
+				<apparel>
+					<developmentalStageFilter>Child, Adult</developmentalStageFilter>
+					<tags>
+						<li>TribalShield</li>
+					</tags>
+				</apparel>
+				<modExtensions>
+					<li Class="CombatExtended.ShieldDefExtension">
+						<shieldCoverage>
+							<li>Hands</li>
+							<li>Arms</li>
+							<li>Shoulders</li>
+							<li>Torso</li>
+							<li>Neck</li>
+						</shieldCoverage>
+					</li>
+				</modExtensions>
+				<tradeTags>
+					<li>Armor</li>
+				</tradeTags>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_Kite2Shield"]</xpath>
+		<value>
+			<ThingDef ParentName="ShieldBase">
+				<defName>DevDesigner_Blood_Apparel_Kite2Shield</defName>
+				<label>kite shield (Sanguin)</label>
+				<description>An elongated shield that offers a wide area of protection. Somewhat bulky for close combat.  \n\nThis kite shield carries the colors of house Sanguin.</description>
+				<techLevel>Medieval</techLevel>
+				<graphicData>
+					<texPath>Apparel/Utility/Kite2/Shield</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+					<drawSize>0.83</drawSize>
+				</graphicData>
+				<possessionCount>1</possessionCount>
+				<costStuffCount>80</costStuffCount>
+				<stuffCategories>
+					<li>Steeled</li>
+					<li>Woody</li>
+				</stuffCategories>
+				<costList Inherit="False">
+				  <HemogenPack>1</HemogenPack>
+				</costList>
+				<recipeMaker>
+					<researchPrerequisite>Smithing</researchPrerequisite>
+					<recipeUsers>
+						<li>FueledSmithy</li>
+						<li>ElectricSmithy</li>
+					</recipeUsers>
+				</recipeMaker>
+				<statBases>
+					<WorkToMake>9500</WorkToMake>
+					<MaxHitPoints>125</MaxHitPoints>
+					<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+					<Mass>7</Mass>
+					<Bulk>8</Bulk>
+					<WornBulk>5</WornBulk>
+				</statBases>
+				<equippedStatOffsets>
+					<ReloadSpeed>-0.2</ReloadSpeed>
+					<MeleeHitChance>-1</MeleeHitChance>
+					<ShootingAccuracyPawn>-0.15</ShootingAccuracyPawn>
+					<AimingAccuracy>-0.08</AimingAccuracy>
+					<Suppressability>-0.25</Suppressability>
+					<MeleeCritChance>-0.05</MeleeCritChance>
+					<MeleeParryChance>1.0</MeleeParryChance>
+				</equippedStatOffsets>
+				<apparel>
+					<developmentalStageFilter>Child, Adult</developmentalStageFilter>
+					<tags>
+						<li>TribalShield</li>
+					</tags>
+				</apparel>
+				<modExtensions>
+					<li Class="CombatExtended.ShieldDefExtension">
+						<shieldCoverage>
+							<li>Hands</li>
+							<li>Arms</li>
+							<li>Shoulders</li>
+							<li>Torso</li>
+							<li>Neck</li>
+						</shieldCoverage>
+					</li>
+				</modExtensions>
+				<tradeTags>
+					<li>Armor</li>
+				</tradeTags>
+			</ThingDef>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/DMWands/Defs/DMWands/Projectiles_Wands.xml b/ModPatches/DMWands/Defs/DMWands/Projectiles_Wands.xml
new file mode 100644
index 0000000000..8ac9c4d7b7
--- /dev/null
+++ b/ModPatches/DMWands/Defs/DMWands/Projectiles_Wands.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingDef ParentName="BaseExplosiveBullet">
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<defName>DM_MagicBolt</defName>
+		<label>magic bolt</label>
+		<graphicData>
+			<texPath>Things/Item/Equipment/WeaponRanged/DM_MagicBolts/DM_LesserMagicBolt</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<color>(120,255,255)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>DM_Arcane</damageDef>
+			<armorPenetrationBlunt>20</armorPenetrationBlunt>
+			<armorPenetrationSharp>20</armorPenetrationSharp>
+			<speed>50</speed>
+			<dropsCasings>false</dropsCasings>
+			<ai_IsIncendiary>false</ai_IsIncendiary>
+			<arcHeightFactor>1</arcHeightFactor>
+			<shadowSize>1</shadowSize>
+			<explosionRadius>1</explosionRadius>
+			<damageAmountBase>8</damageAmountBase>
+			<soundExplode>Explosion_EMP</soundExplode>
+			<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseExplosiveBullet">
+		<thingClass>CombatExtended.Projectile_FireTrail</thingClass>
+		<defName>DM_FireBolt</defName>
+		<label>fire bolt</label>
+		<graphicData>
+			<texPath>Things/Item/Equipment/WeaponRanged/DM_MagicBolts/DM_FireBolt</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<color>(254,189,58)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>DM_Fire</damageDef>
+			<armorPenetrationBlunt>20</armorPenetrationBlunt>
+			<armorPenetrationSharp>10</armorPenetrationSharp>
+			<speed>20</speed>
+			<dropsCasings>false</dropsCasings>
+			<ai_IsIncendiary>true</ai_IsIncendiary>
+			<arcHeightFactor>1</arcHeightFactor>
+			<shadowSize>1.5</shadowSize>
+			<damageAmountBase>5</damageAmountBase>
+			<explosionRadius>2</explosionRadius>
+			<flyOverhead>false</flyOverhead>
+			<soundExplode>Explosion_Flame</soundExplode>
+			<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseExplosiveBullet">
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<defName>DM_PoisonBolt</defName>
+		<label>poison bolt</label>
+		<graphicData>
+			<texPath>Things/Item/Equipment/WeaponRanged/DM_MagicBolts/DM_PoisonBolt</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<color>(100,255,100)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>DM_Poison</damageDef>
+			<armorPenetrationBlunt>20</armorPenetrationBlunt>
+			<armorPenetrationSharp>10</armorPenetrationSharp>
+			<speed>17.5</speed>
+			<dropsCasings>false</dropsCasings>
+			<ai_IsIncendiary>false</ai_IsIncendiary>
+			<arcHeightFactor>-1</arcHeightFactor>
+			<shadowSize>0.5</shadowSize>
+			<damageAmountBase>3</damageAmountBase>
+			<explosionRadius>3</explosionRadius>
+			<soundExplode>Hive_Spawn</soundExplode>
+			<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/DMWands/Patches/DMWands/Patch_Weapons.xml b/ModPatches/DMWands/Patches/DMWands/Patch_Weapons.xml
new file mode 100644
index 0000000000..816e4232ac
--- /dev/null
+++ b/ModPatches/DMWands/Patches/DMWands/Patch_Weapons.xml
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="DM_BasicMagicWand" or
+			defName="DM_LesserMagicWand" or
+			defName="DM_MagicWand" or
+			defName="DM_GreaterMagicWand" or
+			defName="DM_FireWand" or
+			defName="DM_PoisonWand"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>wand</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.2</cooldownTime>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="DM_MagicBolt"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="DM_FireBolt"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="DM_PoisonBolt"]</xpath>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DM_BasicMagicWand</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.3</ShotSpread>
+			<SwayFactor>1.01</SwayFactor>
+			<Bulk>1</Bulk>
+			<Mass>1</Mass>
+			<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>DM_MagicBolt</defaultProjectile>
+			<warmupTime>2</warmupTime>
+			<range>20</range>
+			<soundCast>BuildingDestroyed_Wood_Big</soundCast>
+			<muzzleFlashScale>5</muzzleFlashScale>
+			<soundCastTail>GunTail_Light</soundCastTail>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DM_LesserMagicWand</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.25</ShotSpread>
+			<SwayFactor>1.01</SwayFactor>
+			<Bulk>1</Bulk>
+			<Mass>1</Mass>
+			<RangedWeapon_Cooldown>1.8</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>DM_MagicBolt</defaultProjectile>
+			<warmupTime>1.8</warmupTime>
+			<range>22</range>
+			<soundCast>BuildingDestroyed_Wood_Big</soundCast>
+			<muzzleFlashScale>5</muzzleFlashScale>
+			<soundCastTail>GunTail_Light</soundCastTail>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DM_MagicWand</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.01</SwayFactor>
+			<Bulk>1</Bulk>
+			<Mass>1</Mass>
+			<RangedWeapon_Cooldown>1.6</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>DM_MagicBolt</defaultProjectile>
+			<warmupTime>1.6</warmupTime>
+			<range>24</range>
+			<soundCast>BuildingDestroyed_Wood_Big</soundCast>
+			<muzzleFlashScale>5</muzzleFlashScale>
+			<soundCastTail>GunTail_Light</soundCastTail>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DM_GreaterMagicWand</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>0.7</SwayFactor>
+			<Bulk>1</Bulk>
+			<Mass>1</Mass>
+			<RangedWeapon_Cooldown>1.4</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>DM_MagicBolt</defaultProjectile>
+			<warmupTime>1.4</warmupTime>
+			<range>26</range>
+			<soundCast>BuildingDestroyed_Wood_Big</soundCast>
+			<muzzleFlashScale>5</muzzleFlashScale>
+			<soundCastTail>GunTail_Light</soundCastTail>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DM_PoisonWand</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.4</ShotSpread>
+			<SwayFactor>1.4</SwayFactor>
+			<Bulk>1</Bulk>
+			<Mass>1</Mass>
+			<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>DM_PoisonBolt</defaultProjectile>
+			<warmupTime>1.4</warmupTime>
+			<range>26</range>
+			<soundCast>BuildingDestroyed_Wood_Big</soundCast>
+			<muzzleFlashScale>5</muzzleFlashScale>
+			<soundCastTail>GunTail_Light</soundCastTail>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DM_FireWand</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.01</SwayFactor>
+			<Bulk>1</Bulk>
+			<Mass>1</Mass>
+			<RangedWeapon_Cooldown>1.9</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>DM_FireBolt</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>25</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<soundCast>BuildingDestroyed_Wood_Big</soundCast>
+			<muzzleFlashScale>5</muzzleFlashScale>
+			<soundCastTail>GunTail_Light</soundCastTail>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Dark Ages - Medieval Tools/Patches/Dark Ages - Medieval Tools/MeleeMedieval.xml b/ModPatches/Dark Ages - Medieval Tools/Patches/Dark Ages - Medieval Tools/MeleeMedieval.xml
new file mode 100644
index 0000000000..65a7a2746f
--- /dev/null
+++ b/ModPatches/Dark Ages - Medieval Tools/Patches/Dark Ages - Medieval Tools/MeleeMedieval.xml	
@@ -0,0 +1,311 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Hammer -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DA_MeleeWeapon_Hammer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5.0</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1.1</chanceFactor>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9.0</power>
+					<cooldownTime>2.0</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DA_MeleeWeapon_Hammer"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DA_MeleeWeapon_Hammer"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.20</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DA_MeleeWeapon_Hammer"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- Pickaxe -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DA_MeleeWeapon_Pickaxe"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>0.22</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DA_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="DA_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>head</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>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Cleaver -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DA_MeleeWeapon_Cleaver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.656</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.43</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DA_MeleeWeapon_Cleaver"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DA_MeleeWeapon_Cleaver"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.4</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DA_MeleeWeapon_Cleaver"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- Hacksaw -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DA_MeleeWeapon_Hacksaw"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.6</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.65</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.55</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DA_MeleeWeapon_Hacksaw"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DA_MeleeWeapon_Hacksaw"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DA_MeleeWeapon_Hacksaw"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- Scythe -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DA_MeleeWeapon_Scythe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.78</cooldownTime>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>29</power>
+					<cooldownTime>3.57</cooldownTime>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>3.57</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DA_MeleeWeapon_Scythe"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<MeleeCounterParryBonus>0.33</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<!-- Broom -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DA_MeleeWeapon_Broom"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.21</cooldownTime>
+					<chanceFactor>1.43</chanceFactor>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.64</cooldownTime>
+					<armorPenetrationBlunt>1.26</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DA_MeleeWeapon_Broom"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DA_MeleeWeapon_Broom"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>1.4</MeleeParryChance>
+			<MeleeDodgeChance>0.8</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Darkest Night SK Steam/Patches/Darkest Night SK Steam/Darkest_Void_CE.xml b/ModPatches/Darkest Night SK Steam/Patches/Darkest Night SK Steam/Darkest_Void_CE.xml
new file mode 100644
index 0000000000..95a41d973e
--- /dev/null
+++ b/ModPatches/Darkest Night SK Steam/Patches/Darkest Night SK Steam/Darkest_Void_CE.xml	
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/Verse.ThingDef[defName="Void"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Verse.ThingDef[defName="Void"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.33</MeleeDodgeChance>
+			<MeleeCritChance>0.36</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Verse.ThingDef[defName="Void"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.9</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<armorPenetrationSharp>4</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Cut</li>
+						<li>Stab</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>1.18</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Verse.ThingDef[defName="Void"]/race/baseBodySize</xpath>
+		<value>
+			<baseBodySize>0.6</baseBodySize>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Void"]/combatPower</xpath>
+		<value>
+			<combatPower>100</combatPower>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Darkest Rim Core/Patches/Darkest Rim Core/Apparel_DarkestCE.xml b/ModPatches/Darkest Rim Core/Patches/Darkest Rim Core/Apparel_DarkestCE.xml
new file mode 100644
index 0000000000..98ce496036
--- /dev/null
+++ b/ModPatches/Darkest Rim Core/Patches/Darkest Rim Core/Apparel_DarkestCE.xml	
@@ -0,0 +1,257 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Highwayman Mask === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_HighwaymanMask"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_HighwaymanMask"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>FullHead</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_HighwaymanMask"]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>StrappedHead</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_HighwaymanMask"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-0.3</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!-- === Highwayman Apparel === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Highwayman"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>7</StuffEffectMultiplierArmor>
+			<Bulk>8</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Highwayman"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- === Crusader Helmet === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_CrusaderHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_CrusaderHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_CrusaderHelmet"]/recipeMaker/skillRequirements</xpath>
+		<value>
+			<skillRequirements>
+				<Crafting>8</Crafting>
+			</skillRequirements>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_CrusaderHelmet"]/statBases/WorkToMake</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_CrusaderHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingAccuracy>-0.4</AimingAccuracy>
+			<MeleeHitChance>-2</MeleeHitChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_CrusaderHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!-- === Crusader Armour === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PlateArmorCrusader"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PlateArmorCrusader"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4</ArmorRating_Blunt>
+			<Bulk>100</Bulk>
+			<WornBulk>8</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PlateArmorCrusader"]/recipeMaker/skillRequirements</xpath>
+		<value>
+			<skillRequirements>
+				<Crafting>7</Crafting>
+			</skillRequirements>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PlateArmorCrusader"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<MeleeDodgeChance>-0.15</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_PlateArmorCrusader"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<!-- === Vestal Hood === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_VestalHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.2</ArmorRating_Sharp>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_VestalHelmet"]/recipeMaker/skillRequirements</xpath>
+		<value>
+			<skillRequirements>
+				<Crafting>3</Crafting>
+			</skillRequirements>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_VestalHelmet"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>UpperHead</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<!-- === Vestal Armor === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PlateArmorVestal"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.85</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PlateArmorVestal"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2.35</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_PlateArmorVestal"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeDodgeChance>-0.07</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PlateArmorVestal"]/statBases/Mass</xpath>
+		<value>
+			<Mass>10</Mass>
+			<Bulk>50</Bulk>
+			<WornBulk>8</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- === Plague Doctor Mask === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PlagueMask"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+			<Bulk>2</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PlagueMask"]/recipeMaker/skillRequirements</xpath>
+		<value>
+			<skillRequirements>
+				<Crafting>5</Crafting>
+			</skillRequirements>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_PlagueMask"]/apparel/layers</xpath>
+		<value>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PlagueMask"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
+		<value>
+			<ToxicEnvironmentResistance>0.33</ToxicEnvironmentResistance>
+			<SmokeSensitivity>-0.60</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!-- === Plague Doctor Apparel === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PlagueDoctor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
+			<Bulk>8</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Det's Energy Weapons/Defs/Det's Energy Weapons/EnergyBoltAmmoSet.XML b/ModPatches/Det's Energy Weapons/Defs/Det's Energy Weapons/EnergyBoltAmmoSet.XML
new file mode 100644
index 0000000000..0bcb080f8e
--- /dev/null
+++ b/ModPatches/Det's Energy Weapons/Defs/Det's Energy Weapons/EnergyBoltAmmoSet.XML	
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_LaserBoltPistol</defName>
+		<label>laser charge</label>
+		<ammoTypes>
+			<Ammo_LaserChargePack>Bullet_Bolt_LaserPistol</Ammo_LaserChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_LaserBoltRifle</defName>
+		<label>laser charge</label>
+		<ammoTypes>
+			<Ammo_LaserChargePack>Bullet_Bolt_LaserRifle</Ammo_LaserChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_LaserBoltSniperRifle</defName>
+		<label>laser charge</label>
+		<ammoTypes>
+			<Ammo_LaserChargePack>Bullet_Bolt_LaserSniperRifle</Ammo_LaserChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ================== Projectiles ================== -->
+	<ThingDef Name="BaseEnergyBoltBullet" ParentName="BaseBulletCE" Abstract="true">
+		<label>laser bolt</label>
+		<graphicData>
+			<texPath>Things/EnergyBolt</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<speed>156</speed>
+			<dropsCasings>false</dropsCasings>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseEnergyBoltBullet">
+		<defName>Bullet_Bolt_LaserPistol</defName>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationSharp>17.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>1</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseEnergyBoltBullet">
+		<defName>Bullet_Bolt_LaserRifle</defName>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>18</damageAmountBase>
+			<armorPenetrationSharp>17.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>1</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseEnergyBoltBullet">
+		<defName>Bullet_Bolt_LaserSniperRifle</defName>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>20.25</armorPenetrationSharp>
+			<armorPenetrationBlunt>1</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Det's Energy Weapons/Patches/Det's Energy Weapons/Guns_Defs.XML b/ModPatches/Det's Energy Weapons/Patches/Det's Energy Weapons/Guns_Defs.XML
new file mode 100644
index 0000000000..36eb3c0245
--- /dev/null
+++ b/ModPatches/Det's Energy Weapons/Patches/Det's Energy Weapons/Guns_Defs.XML	
@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Damage -->
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/DamageDef[defName="EnergyDamage"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>Flame</value>
+	</Operation>
+
+	<!-- Weapons -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Energy_Rifle</defName>
+		<statBases>
+			<Mass>6</Mass>
+			<Bulk>9</Bulk>
+			<SwayFactor>1.30</SwayFactor>
+			<ShotSpread>0.07</ShotSpread>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<RangedWeapon_Cooldown>1.3</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.24</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Bolt_LaserRifle</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>52</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+			<soundCast>Shot_EnergyRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_LaserBoltRifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Energy_Gattler</defName>
+		<statBases>
+			<Mass>10</Mass>
+			<Bulk>15.0</Bulk>
+			<SwayFactor>2.0</SwayFactor>
+			<ShotSpread>0.3</ShotSpread>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<RangedWeapon_Cooldown>3</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.09</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Bolt_LaserRifle</defaultProjectile>
+			<warmupTime>2</warmupTime>
+			<range>48</range>
+			<burstShotCount>20</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<soundCast>Shot_EnergyRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>80</magazineSize>
+			<reloadTime>6</reloadTime>
+			<ammoSet>AmmoSet_LaserBoltRifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>10</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Energy_Revolver</defName>
+		<statBases>
+			<Mass>1.8</Mass>
+			<Bulk>3.0</Bulk>
+			<SwayFactor>1.0</SwayFactor>
+			<ShotSpread>0.1</ShotSpread>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.6</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Bolt_LaserPistol</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_EnergyRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>9</magazineSize>
+			<reloadTime>3.50</reloadTime>
+			<ammoSet>AmmoSet_LaserBoltPistol</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Energy_PrecisionRifle</defName>
+		<statBases>
+			<Mass>8</Mass>
+			<Bulk>13.0</Bulk>
+			<SwayFactor>1.70</SwayFactor>
+			<ShotSpread>0.04</ShotSpread>
+			<SightsEfficiency>2.10</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.50</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.4</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Bolt_LaserSniperRifle</defaultProjectile>
+			<warmupTime>1.4</warmupTime>
+			<range>70</range>
+			<soundCast>Shot_EnergyRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_LaserBoltSniperRifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+	</Operation>
+
+	<!-- Melee Tools -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Energy_Rifle" or defName="Energy_PrecisionRifle"]/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 = "Energy_Gattler"]/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 = "Energy_Revolver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Devilstrand Animals/Patches/Devilstrand Animals/Devilstrand_Animals.xml b/ModPatches/Devilstrand Animals/Patches/Devilstrand Animals/Devilstrand_Animals.xml
new file mode 100644
index 0000000000..432a00bf91
--- /dev/null
+++ b/ModPatches/Devilstrand Animals/Patches/Devilstrand Animals/Devilstrand_Animals.xml	
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Animal stats are identical to Vanilla equivalents. Devilhare is already covered by @BaseHare patches in Core. ========== -->
+
+	<!-- ========== Devilbex ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ATK_Devilbex"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATK_Devilbex"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4.4</MoveSpeed>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.08</MeleeCritChance>
+			<MeleeParryChance>0.07</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATK_Devilbex"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2.13</cooldownTime>
+					<restrictedGender>Female</restrictedGender>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3.630</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>antlers</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2.13</cooldownTime>
+					<restrictedGender>Male</restrictedGender>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.630</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATK_Devilbex"]/race/baseBodySize</xpath>
+		<value>
+			<baseBodySize>0.9</baseBodySize>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="ATK_Devilbex"]/combatPower</xpath>
+		<value>
+			<combatPower>55</combatPower>
+		</value>
+	</Operation>
+
+	<!-- ========== DevilATK_Devilyak ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATK_Devilyak"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>5</MoveSpeed>
+			<MeleeDodgeChance>0.11</MeleeDodgeChance>
+			<MeleeCritChance>0.30</MeleeCritChance>
+			<MeleeParryChance>0.19</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATK_Devilyak"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.66</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>horns</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>2.05</cooldownTime>
+					<restrictedGender>Female</restrictedGender>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>horns</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>2.05</cooldownTime>
+					<restrictedGender>Male</restrictedGender>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATK_Devilyak"]/race/baseBodySize</xpath>
+		<value>
+			<baseBodySize>1.65</baseBodySize>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ATK_Devilyak"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="ATK_Devilyak"]/combatPower</xpath>
+		<value>
+			<combatPower>75</combatPower>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Devilstrand Colour Bundle/Patches/Devilstrand Colour Bundle/Items_Resources_Stuff.xml b/ModPatches/Devilstrand Colour Bundle/Patches/Devilstrand Colour Bundle/Items_Resources_Stuff.xml
new file mode 100644
index 0000000000..ba69795193
--- /dev/null
+++ b/ModPatches/Devilstrand Colour Bundle/Patches/Devilstrand Colour Bundle/Items_Resources_Stuff.xml	
@@ -0,0 +1,450 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==========  Devilstrand_Blue  =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DS-B_DEVILSTRAND-B_CLOTH_DEF"]/statBases</xpath>
+		<value>
+			<Bulk>0.3</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DS-B_DEVILSTRAND-B_CLOTH_DEF"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>0.95</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DS-B_DEVILSTRAND-B_CLOTH_DEF"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.5</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DS-B_DEVILSTRAND-B_CLOTH_DEF"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DS-B_DEVILSTRAND-B_CLOTH_DEF"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
+			<StuffPower_Armor_Electric>0.05</StuffPower_Armor_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DS-B_DEVILSTRAND-B_CLOTH_DEF"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="DS-B_DEVILSTRAND-B_CLOTH_DEF"]/stuffProps/categories</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="DS-B_DEVILSTRAND-B_DEF"]/stuffProps</xpath>
+			<value>
+				<categories>
+					<li>SoftArmor</li>
+				</categories>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="DS-B_DEVILSTRAND-B_CLOTH_DEF"]/stuffProps/categories</xpath>
+			<value>
+				<li>SoftArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<!-- ==========  Devilstrand_Cyan  =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DS-C_DEVILSTRAND-C_CLOTH_DEF"]/statBases</xpath>
+		<value>
+			<Bulk>0.3</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DS-C_DEVILSTRAND-C_CLOTH_DEF"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>0.95</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DS-C_DEVILSTRAND-C_CLOTH_DEF"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.5</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DS-C_DEVILSTRAND-C_CLOTH_DEF"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DS-C_DEVILSTRAND-C_CLOTH_DEF"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
+			<StuffPower_Armor_Electric>0.05</StuffPower_Armor_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DS-C_DEVILSTRAND-C_CLOTH_DEF"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="DS-C_DEVILSTRAND-C_CLOTH_DEF"]/stuffProps/categories</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="DS-C_DEVILSTRAND-C_CLOTH_DEF"]/stuffProps</xpath>
+			<value>
+				<categories>
+					<li>SoftArmor</li>
+				</categories>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="DS-C_DEVILSTRAND-C_CLOTH_DEF"]/stuffProps/categories</xpath>
+			<value>
+				<li>SoftArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<!-- ==========  Devilstrand_Green  =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DS-G_DEVILSTRAND-G_CLOTH_DEF"]/statBases</xpath>
+		<value>
+			<Bulk>0.3</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DS-G_DEVILSTRAND-G_CLOTH_DEF"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>0.95</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DS-G_DEVILSTRAND-G_CLOTH_DEF"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.5</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DS-G_DEVILSTRAND-G_CLOTH_DEF"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DS-G_DEVILSTRAND-G_CLOTH_DEF"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
+			<StuffPower_Armor_Electric>0.05</StuffPower_Armor_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DS-G_DEVILSTRAND-G_CLOTH_DEF"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="DS-G_DEVILSTRAND-G_CLOTH_DEF"]/stuffProps/categories</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="DS-G_DEVILSTRAND-G_CLOTH_DEF"]/stuffProps</xpath>
+			<value>
+				<categories>
+					<li>SoftArmor</li>
+				</categories>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="DS-G_DEVILSTRAND-G_CLOTH_DEF"]/stuffProps/categories</xpath>
+			<value>
+				<li>SoftArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<!-- ==========  Devilstrand_Pink  =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DS-K_DEVILSTRAND-K_CLOTH_DEF"]/statBases</xpath>
+		<value>
+			<Bulk>0.3</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DS-K_DEVILSTRAND-K_CLOTH_DEF"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>0.95</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DS-K_DEVILSTRAND-K_CLOTH_DEF"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.5</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DS-K_DEVILSTRAND-K_CLOTH_DEF"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DS-K_DEVILSTRAND-K_CLOTH_DEF"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
+			<StuffPower_Armor_Electric>0.05</StuffPower_Armor_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DS-K_DEVILSTRAND-K_CLOTH_DEF"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="DS-K_DEVILSTRAND-K_CLOTH_DEF"]/stuffProps/categories</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="DS-K_DEVILSTRAND-K_CLOTH_DEF"]/stuffProps</xpath>
+			<value>
+				<categories>
+					<li>SoftArmor</li>
+				</categories>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="DS-K_DEVILSTRAND-K_CLOTH_DEF"]/stuffProps/categories</xpath>
+			<value>
+				<li>SoftArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<!-- ==========  Devilstrand_Orange  =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DS-O_DEVILSTRAND-O_CLOTH_DEF"]/statBases</xpath>
+		<value>
+			<Bulk>0.3</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DS-O_DEVILSTRAND-O_CLOTH_DEF"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>0.95</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DS-O_DEVILSTRAND-O_CLOTH_DEF"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.5</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DS-O_DEVILSTRAND-O_CLOTH_DEF"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DS-O_DEVILSTRAND-O_CLOTH_DEF"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
+			<StuffPower_Armor_Electric>0.05</StuffPower_Armor_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DS-O_DEVILSTRAND-O_CLOTH_DEF"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="DS-O_DEVILSTRAND-O_CLOTH_DEF"]/stuffProps/categories</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="DS-O_DEVILSTRAND-O_CLOTH_DEF"]/stuffProps</xpath>
+			<value>
+				<categories>
+					<li>SoftArmor</li>
+				</categories>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="DS-O_DEVILSTRAND-O_CLOTH_DEF"]/stuffProps/categories</xpath>
+			<value>
+				<li>SoftArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<!-- ==========  Devilstrand_Purple  =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DS-P_DEVILSTRAND-P_CLOTH_DEF"]/statBases</xpath>
+		<value>
+			<Bulk>0.3</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DS-P_DEVILSTRAND-P_CLOTH_DEF"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>0.95</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DS-P_DEVILSTRAND-P_CLOTH_DEF"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.5</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DS-P_DEVILSTRAND-P_CLOTH_DEF"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DS-P_DEVILSTRAND-P_CLOTH_DEF"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
+			<StuffPower_Armor_Electric>0.05</StuffPower_Armor_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DS-P_DEVILSTRAND-P_CLOTH_DEF"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="DS-P_DEVILSTRAND-P_CLOTH_DEF"]/stuffProps/categories</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="DS-P_DEVILSTRAND-P_CLOTH_DEF"]/stuffProps</xpath>
+			<value>
+				<categories>
+					<li>SoftArmor</li>
+				</categories>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="DS-P_DEVILSTRAND-P_CLOTH_DEF"]/stuffProps/categories</xpath>
+			<value>
+				<li>SoftArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<!-- ==========  Devilstrand_Yellow  =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DS-Y_DEVILSTRAND-Y_CLOTH_DEF"]/statBases</xpath>
+		<value>
+			<Bulk>0.3</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DS-Y_DEVILSTRAND-Y_CLOTH_DEF"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>0.95</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DS-Y_DEVILSTRAND-Y_CLOTH_DEF"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.5</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DS-Y_DEVILSTRAND-Y_CLOTH_DEF"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DS-Y_DEVILSTRAND-Y_CLOTH_DEF"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
+			<StuffPower_Armor_Electric>0.05</StuffPower_Armor_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DS-Y_DEVILSTRAND-Y_CLOTH_DEF"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="DS-Y_DEVILSTRAND-Y_CLOTH_DEF"]/stuffProps/categories</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="DS-Y_DEVILSTRAND-Y_CLOTH_DEF"]/stuffProps</xpath>
+			<value>
+				<categories>
+					<li>SoftArmor</li>
+				</categories>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="DS-Y_DEVILSTRAND-Y_CLOTH_DEF"]/stuffProps/categories</xpath>
+			<value>
+				<li>SoftArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Dinosauria/Patches/Dinosauria/Dino_Bodies.xml b/ModPatches/Dinosauria/Patches/Dinosauria/Dino_Bodies.xml
new file mode 100644
index 0000000000..7dc8dd1838
--- /dev/null
+++ b/ModPatches/Dinosauria/Patches/Dinosauria/Dino_Bodies.xml
@@ -0,0 +1,313 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Natural Armor -->
+	<!-- Theropod -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Theropod"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Tail"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Theropod"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Tail" or
+			def="AnimalJaw" or
+			def="Head" or
+			def="Leg" or
+			def="Foot"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- Natural Armor -->
+	<!-- Theropod wit claws -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="TheropodWithClaws"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Leg" or
+			def="Tail"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="TheropodWithClaws"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Tail" or
+			def="AnimalJaw" or
+			def="Head" or
+			def="Leg" or
+			def="FootClaw" or
+			def="Foot"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- Natural Armor -->
+	<!-- kNUCKLES -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Knucklehead"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Leg" or
+			def="Tail"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Knucklehead"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Tail" or
+			def="AnimalJaw" or
+			def="Head" or
+			def="Leg" or
+			def="Foot"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- BipedalRunner -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="BipedalRunner"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Tail"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="BipedalRunner"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Tail" or
+			def="AnimalJaw" or
+			def="Head" or
+			def="Leg" or
+			def="Foot"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- BipedalOther -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="BipedalOther"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Tail"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="BipedalOther"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Tail" or
+			def="AnimalJaw" or
+			def="Head" or
+			def="Leg" or
+			def="Foot"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- BirdMimic -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="BirdMimic"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Shoulder" or
+			def="Arm" or
+			def="Tail"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="BirdMimic"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Tail" or
+			def="AnimalJaw" or
+			def="Head" or
+			def="Shoulder" or
+			def="Arm" or
+			def="FrontClaw" or
+			def="Leg" or
+			def="Foot"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- BipedalOther -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Ceratopsid"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Crest" or
+			def="Foot" or
+			def="Tail"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Ceratopsid"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Tail" or
+			def="Beak" or
+			def="Horn" or
+			def="Head" or
+			def="Crest" or
+			def="Leg" or
+			def="Foot"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- Sauropod -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Sauropod"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Foot"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Sauropod"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Tail" or
+			def="AnimalJaw" or
+			def="Head" or
+			def="Leg" or
+			def="Foot"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- ThyreophoraeWithSpikes -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="ThyreophoraeWithSpikes"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Foot" or
+			def="Tail"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="ThyreophoraeWithSpikes"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Tail" or
+			def="Spikes" or
+			def="AnimalJaw" or
+			def="Head" or
+			def="Leg" or
+			def="Foot"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!--ThyreophoraeWithClub -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="ThyreophoraeWithClub"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Foot" or
+			def="Tail"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="ThyreophoraeWithClub"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Tail" or
+			def="Club" or
+			def="AnimalJaw" or
+			def="Head" or
+			def="Leg" or
+			def="Foot"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Dinosauria/Patches/Dinosauria/Items_Resource_Dinosauria_Items.xml b/ModPatches/Dinosauria/Patches/Dinosauria/Items_Resource_Dinosauria_Items.xml
new file mode 100644
index 0000000000..e2832f20ea
--- /dev/null
+++ b/ModPatches/Dinosauria/Patches/Dinosauria/Items_Resource_Dinosauria_Items.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ====== Triceratops Horn ====== -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="TriceratopsHorn"]/tools</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="TriceratopsHorn"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>ResourceBase</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Dinosauria/Patches/Dinosauria/Items_Resource_Dinosauria_Stuff_Leather.xml b/ModPatches/Dinosauria/Patches/Dinosauria/Items_Resource_Dinosauria_Stuff_Leather.xml
new file mode 100644
index 0000000000..0dd1c9737a
--- /dev/null
+++ b/ModPatches/Dinosauria/Patches/Dinosauria/Items_Resource_Dinosauria_Stuff_Leather.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--========== Basic leathers ============-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Raptor" or defName="Leather_DinosaurFuzz" or defName="Leather_DinosaurHide"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.05</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<!--========== Thin leathers ============-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_DinosaurSkin" or defName="Leather_PterosaurSkin"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.03</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_DinosaurSkin" or defName="Leather_PterosaurSkin"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.02</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!--========== Tough leathers ============-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Theropod" or defName="Leather_Sauropod" or defName="Leather_Redhide"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.06</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Theropod" or defName="Leather_Redhide"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.04</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!--========== Super leathers ============-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Tyrannosaurus" or defName="Leather_Spinosaurus"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.72</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Tyrannosaurus" or defName="Leather_Spinosaurus"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Bluefuzz"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.7</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Bluefuzz"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.09</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_ArmoredDino"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.75</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_ArmoredDino"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.14</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!--========== Leather_Tyrannosaurus, Leather_Spinosaurus, Leather_Bluefuzz, Leather_ArmoredDino ============-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Leather_Tyrannosaurus" or defName="Leather_Spinosaurus" or defName="Leather_Bluefuzz" or defName="Leather_ArmoredDino"]/stuffProps</xpath>
+		<value>
+			<categories>
+				<li>SoftArmor</li>
+			</categories>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Dinosauria/Patches/Dinosauria/Races_Animal_Dinosauria.xml b/ModPatches/Dinosauria/Patches/Dinosauria/Races_Animal_Dinosauria.xml
new file mode 100644
index 0000000000..59be5f9293
--- /dev/null
+++ b/ModPatches/Dinosauria/Patches/Dinosauria/Races_Animal_Dinosauria.xml
@@ -0,0 +1,2543 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Spreadsheets for this patch can be found here: https://drive.google.com/open?id=1YHXVEMYF5HC62COJoguEQQ8l5P6O7_FIeNbnokURlnM
+https://drive.google.com/open?id=1ah4ESB3nCYnbxtD4sf7uyXvWi301o0vr1yNwt1jS6io
+--><Patch>
+	<!-- ========= TYRANNOSAURUS REX ========= -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="TyrannosaurusRex"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TyrannosaurusRex"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.06</MeleeDodgeChance>
+			<MeleeCritChance>1.15</MeleeCritChance>
+			<MeleeParryChance>0.83</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TyrannosaurusRex"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>5</MoveSpeed>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TyrannosaurusRex"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TyrannosaurusRex"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TyrannosaurusRex"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>129</power>
+					<cooldownTime>3.85</cooldownTime>
+					<linkedBodyPartsGroup>LeftLeg</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>64.8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>129</power>
+					<cooldownTime>3.85</cooldownTime>
+					<linkedBodyPartsGroup>RightLeg</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>64.8</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>136</power>
+					<cooldownTime>3.7</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>2.07</armorPenetrationSharp>
+					<armorPenetrationBlunt>207</armorPenetrationBlunt>
+					<chanceFactor>0.7</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= YUTYRANNUS ========= -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Yutyrannus"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Yutyrannus"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.16</MeleeDodgeChance>
+			<MeleeCritChance>0.62</MeleeCritChance>
+			<MeleeParryChance>0.42</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Yutyrannus"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>6.5</MoveSpeed>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Yutyrannus"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Yutyrannus"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Yutyrannus"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>LeftLeg</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>11.76</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>RightLeg</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>11.76</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>44</power>
+					<cooldownTime>2.8</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>17.664</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.23</armorPenetrationSharp>
+					<chanceFactor>0.7</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= CARNOTAURUS ========= -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Carnotaurus"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Carnotaurus"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.14</MeleeDodgeChance>
+			<MeleeCritChance>0.66</MeleeCritChance>
+			<MeleeParryChance>0.53</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Carnotaurus"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>6</MoveSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Carnotaurus"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Carnotaurus"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Carnotaurus"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>34</power>
+					<cooldownTime>2.35</cooldownTime>
+					<linkedBodyPartsGroup>LeftLeg</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>14.486</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>34</power>
+					<cooldownTime>2.35</cooldownTime>
+					<linkedBodyPartsGroup>RightLeg</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>14.486</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>51</power>
+					<cooldownTime>3.05</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.32</armorPenetrationSharp>
+					<armorPenetrationBlunt>25.234</armorPenetrationBlunt>
+					<chanceFactor>0.7</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= ALLOSAURUS ========= -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Allosaurus"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Allosaurus"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.12</MeleeDodgeChance>
+			<MeleeCritChance>0.43</MeleeCritChance>
+			<MeleeParryChance>0.43</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Allosaurus"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>5</MoveSpeed>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Allosaurus"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Allosaurus"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Allosaurus"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2.6</cooldownTime>
+					<linkedBodyPartsGroup>LeftLeg</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>7.779</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2.6</cooldownTime>
+					<linkedBodyPartsGroup>RightLeg</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>7.779</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>45</power>
+					<cooldownTime>2.85</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.24</armorPenetrationSharp>
+					<armorPenetrationBlunt>18.926</armorPenetrationBlunt>
+					<chanceFactor>0.7</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= SPINOSAURUS ========= -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Spinosaurus"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Spinosaurus"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			<MeleeCritChance>0.35</MeleeCritChance>
+			<MeleeParryChance>0.75</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Spinosaurus"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>2.6</MoveSpeed>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Spinosaurus"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Spinosaurus"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Spinosaurus"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>43</power>
+					<cooldownTime>5.2</cooldownTime>
+					<linkedBodyPartsGroup>LeftLeg</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>19.2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>43</power>
+					<cooldownTime>5.2</cooldownTime>
+					<linkedBodyPartsGroup>RightLeg</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>19.2</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>111</power>
+					<cooldownTime>3.3</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.38</armorPenetrationSharp>
+					<armorPenetrationBlunt>138</armorPenetrationBlunt>
+					<chanceFactor>0.7</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= BARYONYX ========= -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Baryonyx"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Baryonyx"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.14</MeleeDodgeChance>
+			<MeleeCritChance>0.53</MeleeCritChance>
+			<MeleeParryChance>0.42</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Baryonyx"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Baryonyx"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>2.3</cooldownTime>
+					<linkedBodyPartsGroup>LeftLeg</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>8.64</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>2.3</cooldownTime>
+					<linkedBodyPartsGroup>RightLeg</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>8.64</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>44</power>
+					<cooldownTime>2.8</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.23</armorPenetrationSharp>
+					<armorPenetrationBlunt>17.664</armorPenetrationBlunt>
+					<chanceFactor>0.7</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= ANKYLOSAURUS ========= -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Ankylosaurus"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Ankylosaurus"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			<MeleeCritChance>0.42</MeleeCritChance>
+			<MeleeParryChance>0.54</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Ankylosaurus"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>3</MoveSpeed>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Ankylosaurus"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>18</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Ankylosaurus"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Ankylosaurus"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tail</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>63</power>
+					<cooldownTime>5.1</cooldownTime>
+					<linkedBodyPartsGroup>TailAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>29.153</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>5.9</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>8.957</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= MINMI ========= -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Minmi"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Minmi"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			<MeleeCritChance>0.18</MeleeCritChance>
+			<MeleeParryChance>0.17</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Minmi"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Minmi"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.40</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Minmi"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tail</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.95</cooldownTime>
+					<linkedBodyPartsGroup>TailAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>7.2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>2.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= BRACHIOSAURUS ========= -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Brachiosaurus"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Brachiosaurus"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.77</MeleeCritChance>
+			<MeleeParryChance>0.156</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Brachiosaurus"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>2.4</MoveSpeed>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Brachiosaurus"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Brachiosaurus"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Brachiosaurus"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tail</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>151</power>
+					<cooldownTime>11.4</cooldownTime>
+					<linkedBodyPartsGroup>TailAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>77.4</armorPenetrationBlunt>
+					<chanceFactor>0.3</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>61</power>
+					<cooldownTime>8.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>27.864</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>61</power>
+					<cooldownTime>8.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>27.864</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= BRONTOSAURUS ========= -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Brontosaurus"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Brontosaurus"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.04</MeleeDodgeChance>
+			<MeleeCritChance>0.44</MeleeCritChance>
+			<MeleeParryChance>1.18</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Brontosaurus"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>2.4</MoveSpeed>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Brontosaurus"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Brontosaurus"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Brontosaurus"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tail</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>55</power>
+					<cooldownTime>8.6</cooldownTime>
+					<linkedBodyPartsGroup>TailAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>25.2</armorPenetrationBlunt>
+					<chanceFactor>0.3</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>6.65</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>9.072</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>6.65</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>9.072</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= DIPLODOCUS ========= -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Diplodocus"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Diplodocus"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.04</MeleeDodgeChance>
+			<MeleeCritChance>0.42</MeleeCritChance>
+			<MeleeParryChance>1.15</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Diplodocus"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>2.4</MoveSpeed>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Diplodocus"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Diplodocus"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Diplodocus"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tail</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>52</power>
+					<cooldownTime>8.45</cooldownTime>
+					<linkedBodyPartsGroup>TailAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>23.4</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>6.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>8.424</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>6.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>8.424</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= MAGYAROSAURUS ========= -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Magyarosaurus"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Magyarosaurus"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.10</MeleeDodgeChance>
+			<MeleeCritChance>0.27</MeleeCritChance>
+			<MeleeParryChance>0.35</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Magyarosaurus"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4</MoveSpeed>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Magyarosaurus"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Magyarosaurus"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.00</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Magyarosaurus"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tail</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>3.25</cooldownTime>
+					<linkedBodyPartsGroup>TailAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>11</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>2.7</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>2.7</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= UTAHRAPTOR ========= -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Utahraptor"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Utahraptor"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.31</MeleeCritChance>
+			<MeleeParryChance>0.19</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Utahraptor"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>6</MoveSpeed>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Utahraptor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Utahraptor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.01</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Utahraptor"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>41</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>FootClawAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.94</armorPenetrationSharp>
+					<armorPenetrationBlunt>8.438</armorPenetrationBlunt>
+					<chanceFactor>0.25</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>41</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>FootClawAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.94</armorPenetrationSharp>
+					<armorPenetrationBlunt>8.438</armorPenetrationBlunt>
+					<chanceFactor>0.25</chanceFactor>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>29</power>
+					<cooldownTime>1.7</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.41</armorPenetrationSharp>
+					<armorPenetrationBlunt>9</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= DAKOTARAPTOR ========= -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Dakotaraptor"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Dakotaraptor"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.23</MeleeCritChance>
+			<MeleeParryChance>0.16</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Dakotaraptor"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>6</MoveSpeed>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Dakotaraptor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Dakotaraptor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.01</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Dakotaraptor"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>32</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>FootClawAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.52</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.68</armorPenetrationBlunt>
+					<chanceFactor>0.25</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>32</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>FootClawAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.52</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.68</armorPenetrationBlunt>
+					<chanceFactor>0.25</chanceFactor>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.79</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= DILOPHOSAURUS ========= -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Dilophosaurus"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Dilophosaurus"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.16</MeleeDodgeChance>
+			<MeleeCritChance>0.27</MeleeCritChance>
+			<MeleeParryChance>0.18</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Dilophosaurus"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>6</MoveSpeed>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Dilophosaurus"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Dilophosaurus"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.01</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Dilophosaurus"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.55</cooldownTime>
+					<linkedBodyPartsGroup>FootClawAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.73</armorPenetrationSharp>
+					<armorPenetrationBlunt>6.525</armorPenetrationBlunt>
+					<chanceFactor>0.25</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.55</cooldownTime>
+					<linkedBodyPartsGroup>FootClawAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.73</armorPenetrationSharp>
+					<armorPenetrationBlunt>6.525</armorPenetrationBlunt>
+					<chanceFactor>0.25</chanceFactor>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>7.031</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= VELOCIRAPTOR ========= -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Velociraptor"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Velociraptor"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.31</MeleeDodgeChance>
+			<MeleeCritChance>0.07</MeleeCritChance>
+			<MeleeParryChance>0.03</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Velociraptor"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>7.2</MoveSpeed>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Velociraptor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.00</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Velociraptor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.00</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Velociraptor"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.7</cooldownTime>
+					<linkedBodyPartsGroup>FootClawAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.281</armorPenetrationBlunt>
+					<chanceFactor>0.3</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.7</cooldownTime>
+					<linkedBodyPartsGroup>FootClawAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.281</armorPenetrationBlunt>
+					<chanceFactor>0.3</chanceFactor>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.7</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+					<chanceFactor>0.4</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Velociraptor"]/race/manhunterOnDamageChance</xpath>
+		<value>
+			<manhunterOnDamageChance>0.75</manhunterOnDamageChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Velociraptor"]/combatPower</xpath>
+		<value>
+			<combatPower>70</combatPower>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Velociraptor"]/wildGroupSize/min</xpath>
+		<value>
+			<min>5</min>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Velociraptor"]/wildGroupSize/max</xpath>
+		<value>
+			<max>7</max>
+		</value>
+	</Operation>
+
+	<!-- ========= COMPSOGNATHUS ========= -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Compsognathus"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Compsognathus"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.32</MeleeDodgeChance>
+			<MeleeCritChance>0.03</MeleeCritChance>
+			<MeleeParryChance>0.00</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Compsognathus"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>6</MoveSpeed>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Compsognathus"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>0.5</cooldownTime>
+					<linkedBodyPartsGroup>FootClawAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>5</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.049</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>0.5</cooldownTime>
+					<linkedBodyPartsGroup>FootClawAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>5</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.049</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.6</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.038</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Compsognathus"]/combatPower</xpath>
+		<value>
+			<combatPower>25</combatPower>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Compsognathus"]/wildGroupSize/min</xpath>
+		<value>
+			<min>2</min>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Compsognathus"]/wildGroupSize/max</xpath>
+		<value>
+			<max>3</max>
+		</value>
+	</Operation>
+
+	<!-- ========= GALLIMIMUS ========= -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Gallimimus"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Gallimimus"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.17</MeleeDodgeChance>
+			<MeleeCritChance>0.29</MeleeCritChance>
+			<MeleeParryChance>0.24</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gallimimus"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>5.8</MoveSpeed>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gallimimus"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left leg</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>2.1</cooldownTime>
+					<linkedBodyPartsGroup>LeftLeg</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.39</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.91</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right leg</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>2.1</cooldownTime>
+					<linkedBodyPartsGroup>RightLeg</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.39</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.91</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Gallimimus"]/combatPower</xpath>
+		<value>
+			<combatPower>150</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Gallimimus"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========= GIGANTORAPTOR ========= -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Gigantoraptor"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Gigantoraptor"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.12</MeleeDodgeChance>
+			<MeleeCritChance>0.47</MeleeCritChance>
+			<MeleeParryChance>0.32</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gigantoraptor"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>5.4</MoveSpeed>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gigantoraptor"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left leg</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>31</power>
+					<cooldownTime>2.8</cooldownTime>
+					<linkedBodyPartsGroup>LeftLeg</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.22</armorPenetrationSharp>
+					<armorPenetrationBlunt>6.085</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right leg</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>31</power>
+					<cooldownTime>2.8</cooldownTime>
+					<linkedBodyPartsGroup>RightLeg</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.22</armorPenetrationSharp>
+					<armorPenetrationBlunt>6.085</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= IGUANODON ========= -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Iguanodon"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Iguanodon"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.07</MeleeDodgeChance>
+			<MeleeCritChance>0.36</MeleeCritChance>
+			<MeleeParryChance>0.45</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Iguanodon"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>3.5</MoveSpeed>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Iguanodon"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Iguanodon"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Iguanodon"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>37</power>
+					<cooldownTime>4.2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>12</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>16.2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= PARASAUR ========= -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Parasaur"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Parasaur"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.07</MeleeDodgeChance>
+			<MeleeCritChance>0.33</MeleeCritChance>
+			<MeleeParryChance>0.43</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Parasaur"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>3.5</MoveSpeed>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Parasaur"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Parasaur"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Parasaur"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>32</power>
+					<cooldownTime>4</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>12</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>13.478</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= CORYTHOSAURUS ========= -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Corythosaurus"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Corythosaurus"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.09</MeleeDodgeChance>
+			<MeleeCritChance>0.69</MeleeCritChance>
+			<MeleeParryChance>0.48</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Corythosaurus"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>5</MoveSpeed>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Corythosaurus"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Corythosaurus"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Corythosaurus"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>55</power>
+					<cooldownTime>4</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>12</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>25.2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= DEINOCHEIRUS ========= -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Deinocheirus"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Deinocheirus"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.06</MeleeDodgeChance>
+			<MeleeCritChance>0.52</MeleeCritChance>
+			<MeleeParryChance>0.61</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Deinocheirus"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>3.5</MoveSpeed>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Deinocheirus"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Deinocheirus"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Deinocheirus"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>33</power>
+					<cooldownTime>2.7</cooldownTime>
+					<linkedBodyPartsGroup>ArmClawAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.425</armorPenetrationBlunt>
+					<chanceFactor>0.4</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>33</power>
+					<cooldownTime>2.7</cooldownTime>
+					<linkedBodyPartsGroup>ArmClawAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.425</armorPenetrationBlunt>
+					<chanceFactor>0.4</chanceFactor>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>2.8</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>6.2</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= THERIZINOSAURUS ========= -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Therizinosaurus"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Therizinosaurus"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.07</MeleeDodgeChance>
+			<MeleeCritChance>0.46</MeleeCritChance>
+			<MeleeParryChance>0.56</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Therizinosaurus"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>3.6</MoveSpeed>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Therizinosaurus"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Therizinosaurus"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Therizinosaurus"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>41</power>
+					<cooldownTime>2.5</cooldownTime>
+					<linkedBodyPartsGroup>ArmClawAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.99</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
+					<chanceFactor>0.4</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>41</power>
+					<cooldownTime>2.5</cooldownTime>
+					<linkedBodyPartsGroup>ArmClawAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.99</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
+					<chanceFactor>0.4</chanceFactor>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.5</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= PACHYCEPHALOSAURUS ========= -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Pachycephalosaurus"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Pachycephalosaurus"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.14</MeleeDodgeChance>
+			<MeleeCritChance>0.31</MeleeCritChance>
+			<MeleeParryChance>0.16</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Pachycephalosaurus"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Pachycephalosaurus"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>2.95</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= STYGIMOLOCH ========= -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Stygimoloch"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Stygimoloch"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.04</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Stygimoloch"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.1</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>1.95</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= DRYOSAURUS ========= -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Dryosaurus"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Dryosaurus"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.04</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Dryosaurus"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.9</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.3</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= STEGOSAURUS ========= -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Stegosaurus"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Stegosaurus"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.22</MeleeCritChance>
+			<MeleeParryChance>0.57</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Stegosaurus"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>2</MoveSpeed>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Stegosaurus"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>7</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Stegosaurus"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Stegosaurus"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tail</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>63</power>
+					<cooldownTime>2.8</cooldownTime>
+					<linkedBodyPartsGroup>TailAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>29.153</armorPenetrationBlunt>
+					<chanceFactor>0.8</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>4.7</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>12</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>12.8</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= TRICERATOPS ========= -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Triceratops"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Triceratops"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.06</MeleeDodgeChance>
+			<MeleeCritChance>0.76</MeleeCritChance>
+			<MeleeParryChance>0.70</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Triceratops"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4</MoveSpeed>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Triceratops"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Triceratops"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.13</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Triceratops"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horns</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>38</power>
+					<cooldownTime>2.5</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>4</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<chanceFactor>0.8</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>3.5</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= PROTOCERATOPS ========= -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Protoceratops"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Protoceratops"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.09</MeleeDodgeChance>
+			<MeleeCritChance>0.07</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Protoceratops"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2.35</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= QUETZALCOATLUS ========= -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Quetzalcoatlus"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Quetzalcoatlus"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.09</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0.29</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Quetzalcoatlus"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Quetzalcoatlus"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Quetzalcoatlus"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>beak</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2.3</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>7.92</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= PTERANODON ========= -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Pteranodon"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Pteranodon"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.07</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+			<MeleeParryChance>0.04</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Pteranodon"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>beak</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2.24</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Divine Order/Patches/Divine Order/PawnKindDefs/Divine_Order_CE_Pawnkinds.xml b/ModPatches/Divine Order/Patches/Divine Order/PawnKindDefs/Divine_Order_CE_Pawnkinds.xml
new file mode 100644
index 0000000000..62874738a9
--- /dev/null
+++ b/ModPatches/Divine Order/Patches/Divine Order/PawnKindDefs/Divine_Order_CE_Pawnkinds.xml	
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Give ammo to crosbowman-->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="BotchJob_DivineOrderScout"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>12</min>
+					<max>20</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>100</min>
+						<max>200</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>MedievalMeleeDecent</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="BotchJob_DivineOrderSharpshooter" or defName="BotchJob_DivineOrderInquisitor"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>12</min>
+					<max>20</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>100</min>
+						<max>200</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>MedievalMeleeDecent</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="BotchJob_DivineOrderHerald" or defName="BotchJob_DivineOrderMerchant"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>10</min>
+					<max>30</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>100</min>
+						<max>200</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>MedievalMeleeDecent</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="BotchJob_DivineOrderConscript"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>30</min>
+					<max>40</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[
+			defName="BotchJob_DivineOrderScout" or
+			defName="BotchJob_DivineOrderSharpshooter" or
+			defName="BotchJob_DivineOrderInquisitor" or
+			defName="BotchJob_DivineOrderMerchant" or
+			defName="BotchJob_DivineOrderConscript"]
+		</xpath>
+		<value>
+			<apparelRequired>
+				<li>CE_Apparel_TribalBackpack</li>
+			</apparelRequired>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Expanded Framework</li>
+		</mods>
+		<match Class="PatchOperationAddModExtension">
+			<xpath>Defs/PawnKindDef[defName="BotchJob_DivineOrderKnight"]</xpath>
+			<value>
+				<li Class="CombatExtended.LoadoutPropertiesExtension">
+					<shieldMoney>
+						<min>100</min>
+						<max>350</max>
+					</shieldMoney>
+					<shieldTags>
+						<li>BotchJob_DivineOrderShield</li>
+					</shieldTags>
+					<shieldChance>0.65</shieldChance>
+				</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="BotchJob_DivineOrderHerald"]/apparelRequired</xpath>
+		<value>
+			<li>CE_Apparel_TribalBackpack</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Divine Order/Patches/Divine Order/Scenario/DivineOrder_CE_Scenario_Patch.xml b/ModPatches/Divine Order/Patches/Divine Order/Scenario/DivineOrder_CE_Scenario_Patch.xml
new file mode 100644
index 0000000000..f98ab470c1
--- /dev/null
+++ b/ModPatches/Divine Order/Patches/Divine Order/Scenario/DivineOrder_CE_Scenario_Patch.xml	
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="BotchJob_DivineOrderStart"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_CrossbowBolt_Steel</thingDef>
+				<count>50</count>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Divine Order/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Apparel.xml b/ModPatches/Divine Order/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Apparel.xml
new file mode 100644
index 0000000000..f4fe955e4f
--- /dev/null
+++ b/ModPatches/Divine Order/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Apparel.xml	
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Cloak  -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderCloak" or defName="BotchJob_InquisitorCloak"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderCloak" or defName="BotchJob_InquisitorCloak"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Fur Cloak -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderFurCloak"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderFurCloak"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+	
+	<!-- Zealot Robes -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderZealotRobes"]/statBases</xpath>
+		<value>
+			<Bulk>20</Bulk>
+			<WornBulk>6</WornBulk>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderZealotRobes"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Headstuff -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderHood" or defName="BotchJob_DivineOrderFurHood"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderHood" or defName="BotchJob_DivineOrderFurHood"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Merchant Hat -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderMerchantHat"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderMerchantHat"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Tunic (But its really a gambeson) -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderTunic"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>6</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderTunic"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Arms</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderTunic"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>10</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Breeches -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderBreeches"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderBreeches"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Divine Order/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Armor.xml b/ModPatches/Divine Order/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Armor.xml
new file mode 100644
index 0000000000..7196ca0eb7
--- /dev/null
+++ b/ModPatches/Divine Order/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Armor.xml	
@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Skirmisher Armor -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderSkirmisherArmor"]/statBases</xpath>
+		<value>
+			<Bulk>18</Bulk>
+			<WornBulk>4</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderSkirmisherArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderSkirmisherArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderSkirmisherArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Inquisitor Garb -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_InquisitorArmor"]/statBases</xpath>
+		<value>
+			<Bulk>18</Bulk>
+			<WornBulk>4</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_InquisitorArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_InquisitorArmor"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_InquisitorArmor"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Inquisitor Garb -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_HeraldRobes"]/statBases</xpath>
+		<value>
+			<Bulk>20</Bulk>
+			<WornBulk>6</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_HeraldRobes"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>10</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_HeraldRobes"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_HeraldRobes"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Breast Plate-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderBreastplate"]/statBases</xpath>
+		<value>
+			<Bulk>25</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderBreastplate"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderBreastplate"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<!-- Plate Armor -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderPlateArmor" or defName="BotchJob_CrusaderArmor"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderPlateArmor" or defName="BotchJob_CrusaderArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderPlateArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>15</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderPlateArmor" or defName="BotchJob_CrusaderArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<MeleeDodgeChance>-0.15</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderPlateArmor" or defName="BotchJob_CrusaderArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderPlateArmor" or defName="BotchJob_CrusaderArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Elite Armor -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_CrusaderArmor"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_CrusaderArmor"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Divine Order/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Headgear.xml b/ModPatches/Divine Order/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Headgear.xml
new file mode 100644
index 0000000000..ed4c308151
--- /dev/null
+++ b/ModPatches/Divine Order/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Headgear.xml	
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Cowled Helmet -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderCowledHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderCowledHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderCowledHelmet"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderCowledHelmet"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Plate Helmet -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderOpenHelmet"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>100</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderPlateHelmet" or defName="BotchJob_DivineOrderOpenHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderPlateHelmet" or defName="BotchJob_DivineOrderOpenHelmet"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>FullHead</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderPlateHelmet"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderPlateHelmet" or defName="BotchJob_DivineOrderOpenHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingAccuracy>-0.4</AimingAccuracy><!--CE Bascinet-->
+			<MeleeHitChance>-2</MeleeHitChance>
+			<Suppressability>-0.20</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderPlateHelmet" or defName="BotchJob_DivineOrderOpenHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.75</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Light Helmet -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderLightHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderLightHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Crusader Helmet -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_CrusaderHelmet" or defName="BotchJob_HeraldHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_CrusaderHelmet" or defName="BotchJob_HeraldHelmet"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>FullHead</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<!-- Slightly Better than Plate Helm for hitting -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_CrusaderHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>-0.4</AimingAccuracy><!--CE Bascinet-->
+				<Suppressability>-0.20</Suppressability>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_HeraldHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingAccuracy>-0.4</AimingAccuracy><!--CE Bascinet-->
+			<MeleeHitChance>-2</MeleeHitChance>
+			<Suppressability>-0.20</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_CrusaderHelmet" or defName="BotchJob_HeraldHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.75</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_CrusaderHelmet" or defName="BotchJob_HeraldHelmet"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_CrusaderHelmet"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Inquisitor Helmet -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_InquisitorHat"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_InquisitorHat"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_InquisitorHat"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_InquisitorHat"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Divine Order/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Shield.xml b/ModPatches/Divine Order/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Shield.xml
new file mode 100644
index 0000000000..a281cb8abd
--- /dev/null
+++ b/ModPatches/Divine Order/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Shield.xml	
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderShield"]</xpath>
+		<value>
+
+			<ThingDef ParentName="ShieldBase">
+				<defName>BotchJob_DivineOrderShield</defName>
+				<label>divine order shield</label>
+				<description>A sturdy, reinforced shield that bears the insignia of the Divine Order.</description>
+				<techLevel>Medieval</techLevel>
+				<graphicData>
+					<texPath>Things/Pawn/Humanlike/Apparel/Other/DivineOrderShield</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+					<drawSize>1</drawSize>
+					<shaderType>CutoutComplex</shaderType>
+				</graphicData>
+				<thingCategories Inherit="False">
+					<li>Shields</li>
+				</thingCategories>
+				<stuffCategories>
+					<li>Metallic</li>
+				</stuffCategories>
+				<costStuffCount>150</costStuffCount>
+				<costList>
+					<Gold>5</Gold>
+				</costList>
+				<recipeMaker>
+					<researchPrerequisite>BotchJob_DivineOrderSmithing</researchPrerequisite>
+					<recipeUsers>
+						<li>FueledSmithy</li>
+						<li>ElectricSmithy</li>
+					</recipeUsers>
+					<skillRequirements>
+						<Crafting>8</Crafting>
+					</skillRequirements>
+				</recipeMaker>
+				<statBases>
+					<WorkToMake>3000</WorkToMake>
+					<MaxHitPoints>145</MaxHitPoints>
+					<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+					<Mass>8</Mass>
+					<Bulk>9</Bulk>
+					<WornBulk>6</WornBulk>
+				</statBases>
+				<equippedStatOffsets>
+					<ReloadSpeed>-0.2</ReloadSpeed>
+					<MeleeHitChance>-1</MeleeHitChance>
+					<ShootingAccuracyPawn>-0.15</ShootingAccuracyPawn>
+					<AimingAccuracy>-0.08</AimingAccuracy>
+					<Suppressability>-0.25</Suppressability>
+					<MeleeCritChance>-0.05</MeleeCritChance>
+					<MeleeParryChance>1.0</MeleeParryChance>
+				</equippedStatOffsets>
+				<apparel>
+					<tags>
+						<li>KiteShield</li>
+					</tags>
+					<defaultOutfitTags>
+						<li>Soldier</li>
+					</defaultOutfitTags>
+					<countsAsClothingForNudity>false</countsAsClothingForNudity>
+					<canBeDesiredForIdeo>false</canBeDesiredForIdeo>
+				</apparel>
+				<comps>
+					<li>
+						<compClass>CompColorable</compClass>
+					</li>
+				</comps>
+				<modExtensions>
+					<li Class="CombatExtended.ShieldDefExtension">
+						<shieldCoverage>
+							<li>Hands</li>
+							<li>Arms</li>
+							<li>Shoulders</li>
+							<li>Torso</li>
+							<li>Neck</li>
+						</shieldCoverage>
+						<drawAsTall>false</drawAsTall>
+					</li>
+				</modExtensions>
+			</ThingDef>
+
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Expanded Framework</li>
+		</mods>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/PawnKindDef[defName="BotchJob_DivineOrderKnight"]</xpath>
+			<value>
+				<apparelRequired>
+					<li>BotchJob_DivineOrderShield</li>
+				</apparelRequired>
+			</value>
+		</nomatch>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Divine Order/Patches/Divine Order/ThingDef_Misc/Weapons/Divine_Order_CE_Grenades.xml b/ModPatches/Divine Order/Patches/Divine Order/ThingDef_Misc/Weapons/Divine_Order_CE_Grenades.xml
new file mode 100644
index 0000000000..02b18e3b0a
--- /dev/null
+++ b/ModPatches/Divine Order/Patches/Divine Order/ThingDef_Misc/Weapons/Divine_Order_CE_Grenades.xml	
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Grenade Base ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderCleansingConcoction"]</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Body</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.75</cooldownTime>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Fire Bomb ========== -->
+
+	<!-- Projectile -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderCleansingConcoctionThrown"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<explosionRadius>3</explosionRadius>
+				<damageDef>BotchJob_DivineOrderCleansingBlast</damageDef>
+				<speed>15</speed>
+				<ai_IsIncendiary>true</ai_IsIncendiary>
+				<shadowSize>0.6</shadowSize>
+				<screenShakeFactor>0.5</screenShakeFactor>
+				<explosionDelay>200</explosionDelay>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderCleansingConcoctionThrown"]</xpath>
+		<value>
+			<thingClass>CombatExtended.Projectile_FireTrail</thingClass>
+		</value>
+	</Operation>
+
+	<!-- Grenade -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderCleansingConcoction"]</xpath>
+		<value>
+			<thingClass>CombatExtended.AmmoThing</thingClass>
+			<stackLimit>50</stackLimit>
+			<resourceReadoutPriority>First</resourceReadoutPriority>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderCleansingConcoction"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderCleansingConcoction"]/comps</xpath>
+		<value>
+			<comps>
+				<li Class="CompProperties_Explosive">
+					<explosiveRadius>3</explosiveRadius>
+					<explosiveDamageType>BotchJob_DivineOrderCleansingBlast</explosiveDamageType>
+					<startWickHitPointsPercent>0.7</startWickHitPointsPercent>
+					<explodeOnKilled>True</explodeOnKilled>
+					<wickTicks>60~100</wickTicks>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BotchJob_DivineOrderCleansingConcoction</defName>
+		<statBases>
+			<Mass>0.6</Mass>
+			<Bulk>1.8</Bulk>
+			<MarketValue>3</MarketValue>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<label>throw cleansing bomb</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<range>10</range>
+			<minRange>3</minRange>
+			<warmupTime>1.8</warmupTime>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<soundCast>ThrowMolotovCocktail</soundCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<defaultProjectile>BotchJob_DivineOrderCleansingConcoctionThrown</defaultProjectile>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Divine Order/Patches/Divine Order/ThingDef_Misc/Weapons/Divine_Order_CE_Melee.xml b/ModPatches/Divine Order/Patches/Divine Order/ThingDef_Misc/Weapons/Divine_Order_CE_Melee.xml
new file mode 100644
index 0000000000..cb9c6d3f69
--- /dev/null
+++ b/ModPatches/Divine Order/Patches/Divine Order/ThingDef_Misc/Weapons/Divine_Order_CE_Melee.xml	
@@ -0,0 +1,320 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Divine Order Mace -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderMace"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderMace"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.42</MeleeCritChance>
+				<MeleeParryChance>0.24</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderMace"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderMace"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>2.1</cooldownTime>
+					<chanceFactor>0.90</chanceFactor>
+					<armorPenetrationBlunt>7.625</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Divine Order Shortsword -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderShortsword"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderShortsword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.40</MeleeCritChance>
+				<MeleeParryChance>0.60</MeleeParryChance>
+				<MeleeDodgeChance>0.30</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderShortsword"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderShortsword"]/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.05</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.46</cooldownTime>
+					<chanceFactor>0.50</chanceFactor>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.40</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.45</chanceFactor>
+					<armorPenetrationBlunt>1.1</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.58</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Divine Order Longsword -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderLongsword"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>0.8</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderLongsword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.5</MeleeCritChance>
+				<MeleeParryChance>0.6</MeleeParryChance>
+				<MeleeDodgeChance>0.40</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderLongsword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.78</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.78</cooldownTime>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.0</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>1.64</cooldownTime>
+					<chanceFactor>0.35</chanceFactor>
+					<armorPenetrationBlunt>3.24</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.72</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderLongsword"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- Battle Standard -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderBattleStandard"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<MeleeCounterParryBonus>1.27</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderBattleStandard"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.08</MeleeCritChance>
+				<MeleeParryChance>0.95</MeleeParryChance>
+				<MeleeDodgeChance>1.27</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderBattleStandard"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.3</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>1.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.5</cooldownTime>
+					<chanceFactor>0.95</chanceFactor>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Divine Order Greatsword -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderGreatsword"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<MeleeCounterParryBonus>0.70</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderGreatsword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.30</MeleeCritChance>
+				<MeleeParryChance>1.20</MeleeParryChance>
+				<MeleeDodgeChance>0.50</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderGreatsword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.69</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.98</cooldownTime>
+					<chanceFactor>0.50</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.90</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>48</power>
+					<cooldownTime>2.86</cooldownTime>
+					<chanceFactor>0.45</chanceFactor>
+					<armorPenetrationBlunt>3.592</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.58</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Divine Order/Patches/Divine Order/ThingDef_Misc/Weapons/Divine_Order_CE_Ranged.xml b/ModPatches/Divine Order/Patches/Divine Order/ThingDef_Misc/Weapons/Divine_Order_CE_Ranged.xml
new file mode 100644
index 0000000000..064aaa92a8
--- /dev/null
+++ b/ModPatches/Divine Order/Patches/Divine Order/ThingDef_Misc/Weapons/Divine_Order_CE_Ranged.xml	
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Tools -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderPistol"]/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="BotchJob_DivineOrderCrossbow" or defName="BotchJob_DivineOrderHandCrossbow"]/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>
+	</Operation>
+
+	<!-- === Divine Order Pistol === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BotchJob_DivineOrderPistol</defName>
+		<statBases>
+			<Bulk>7</Bulk>
+			<SwayFactor>1.22</SwayFactor>
+			<ShotSpread>0.36</ShotSpread>
+			<SightsEfficiency>0.85</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_SlowMusketBall</defaultProjectile>
+			<warmupTime>1.66</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Shotgun_NoRack</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<ammoConsumedPerShotCount>4</ammoConsumedPerShotCount>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>4</magazineSize>
+			<reloadTime>5.1</reloadTime>
+			<ammoSet>AmmoSet_SlowMusketBall</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>NeolithicRangedHeavy</li>
+			<li>NeolithicRangedChief</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Crossbow === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BotchJob_DivineOrderCrossbow</defName>
+		<statBases>
+			<Bulk>6</Bulk>
+			<SwayFactor>1.2</SwayFactor>
+			<ShotSpread>0.25</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Projectile_CrossbowBolt_Steel</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>23</range>
+			<soundCast>Bow_Large</soundCast>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_XBow</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Hand Crossbow === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BotchJob_DivineOrderHandCrossbow</defName>
+		<statBases>
+			<Bulk>2.5</Bulk>
+			<SwayFactor>1.2</SwayFactor>
+			<ShotSpread>0.35</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Projectile_CrossbowBolt_Steel</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>10</range>
+			<soundCast>Bow_Large</soundCast>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Divine Judgement Staff -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BotchJob_DivineJudgementStaff</defName>
+		<statBases>
+			<Bulk>6</Bulk>
+			<SwayFactor>0</SwayFactor>
+			<ShotSpread>0.0</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>6</RangedWeapon_Cooldown>
+			<MeleeCounterParryBonus>0.93</MeleeCounterParryBonus>
+		</statBases>
+		<Properties>
+			<verbClass>Verb_Shoot</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>BotchJob_DivineOrderStaffThrown</defaultProjectile>
+			<warmupTime>12</warmupTime>
+			<range>35</range>
+			<forcedMissRadius>1</forcedMissRadius>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+				<canTargetPawns>false</canTargetPawns>
+			</targetParams>
+			<aimingChargeMote>BotchJob_StaffChargeMote</aimingChargeMote>
+			<aimingTargetMote>BotchJob_StaffTargetMote</aimingTargetMote>
+			<beamTargetsGround>true</beamTargetsGround>
+			<soundAiming>BotchJob_DivineStaffCharge</soundAiming>
+			<minRange>5.9</minRange>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineJudgementStaff"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.85</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>1.69</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineJudgementStaff"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.00</MeleeCritChance>
+				<MeleeParryChance>0.70</MeleeParryChance>
+				<MeleeDodgeChance>0.47</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Divine Order/Patches/Divine Order/ThingDef_Races/Divine_Order_CE_Horse.xml b/ModPatches/Divine Order/Patches/Divine Order/ThingDef_Races/Divine_Order_CE_Horse.xml
new file mode 100644
index 0000000000..87af7a421b
--- /dev/null
+++ b/ModPatches/Divine Order/Patches/Divine Order/ThingDef_Races/Divine_Order_CE_Horse.xml	
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Divine Order Horse ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderHorse"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderHorse"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>6</MoveSpeed>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.39</MeleeCritChance>
+			<MeleeParryChance>0.24</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderHorse"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.97</cooldownTime>
+					<chanceFactor>0.5</chanceFactor>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Divine Order/Patches/Divine Order/TraderDefs/Divine_Order_CE_Traders.xml b/ModPatches/Divine Order/Patches/Divine Order/TraderDefs/Divine_Order_CE_Traders.xml
new file mode 100644
index 0000000000..b68f397651
--- /dev/null
+++ b/ModPatches/Divine Order/Patches/Divine Order/TraderDefs/Divine_Order_CE_Traders.xml	
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="BotchJob_DivineOrderBaseTrader"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_Category">
+				<categoryDef>CannonBall</categoryDef>
+				<countRange>
+					<min>12</min>
+					<max>36</max>
+				</countRange>
+				<price>Expensive</price>
+				<thingDefCountRange>
+					<min>1</min>
+					<max>3</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Category">
+				<categoryDef>MiniCannonBall</categoryDef>
+				<countRange>
+					<min>50</min>
+					<max>100</max>
+				</countRange>
+				<price>Normal</price>
+				<thingDefCountRange>
+					<min>1</min>
+					<max>2</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_PreIndustrialAmmo</tradeTag>
+				<countRange>
+					<min>300</min>
+					<max>1200</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>2</min>
+					<max>4</max>
+				</thingDefCountRange>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="BotchJob_DivineOrderCaravanTrader"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_Category">
+				<categoryDef>MiniCannonBall</categoryDef>
+				<countRange>
+					<min>25</min>
+					<max>50</max>
+				</countRange>
+				<price>Normal</price>
+				<thingDefCountRange>
+					<min>1</min>
+					<max>2</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_PreIndustrialAmmo</tradeTag>
+				<countRange>
+					<min>100</min>
+					<max>200</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>1</min>
+					<max>3</max>
+				</thingDefCountRange>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Doom Factions/Defs/Doom Factions/Ammo_Doom.xml b/ModPatches/Doom Factions/Defs/Doom Factions/Ammo_Doom.xml
new file mode 100644
index 0000000000..ec72755de9
--- /dev/null
+++ b/ModPatches/Doom Factions/Defs/Doom Factions/Ammo_Doom.xml	
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ========== AmmoSet ========== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_PlasmaRifle</defName>
+		<label>Energy Cell</label>
+		<ammoTypes>
+			<Ammo_PlasmaCellRifle>Bullet_UACPlasmaRifle</Ammo_PlasmaCellRifle>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_GaussCannon</defName>
+		<label>Energy Cell</label>
+		<ammoTypes>
+			<Ammo_PlasmaCellRifle>Bullet_UACGaussCannonFlechette</Ammo_PlasmaCellRifle>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_VortexRifle</defName>
+		<label>Energy Cell</label>
+		<ammoTypes>
+			<Ammo_PlasmaCellRifle>Bullet_UACVortexRiflePlasma</Ammo_PlasmaCellRifle>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Hellshot</defName>
+		<label>Energy Cell</label>
+		<ammoTypes>
+			<Ammo_PlasmaCellRifle>Bullet_UACHellshotBolt</Ammo_PlasmaCellRifle>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_BFG</defName>
+		<label>Energy Cell</label>
+		<ammoTypes>
+			<Ammo_80x256mmFuel_Incendiary>Bullet_UACBFG</Ammo_80x256mmFuel_Incendiary>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ========== Projectiles ========== -->
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_PlasmaCellPistol</defName>
+		<label>Plasma</label>
+		<graphicData>
+			<texPath>Things/Projectile/UACSidearmProj</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>140</speed>
+			<damageDef>UAC_Plasm</damageDef>
+			<damageAmountBase>8</damageAmountBase>
+			<armorPenetrationSharp>25</armorPenetrationSharp>
+			<armorPenetrationBlunt>65.6</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_UACPlasmaRifle</defName>
+		<label>Plasma</label>
+		<graphicData>
+			<texPath>Things/Projectile/Plasma2016</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>(0.5,0.5)</drawSize><!-- this is assuming you are running TasteofVanillaish Doom Faction -->
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>200</speed>
+			<damageDef>UAC_Plasm</damageDef>
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationSharp>25</armorPenetrationSharp>
+			<armorPenetrationBlunt>165.6</armorPenetrationBlunt>
+			<!--explosionRadius>0.9</explosionRadius>
+		<soundExplode>Hit_UACBFG9000</soundExplode-->
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>3</damageAmountBase>
+				<explosiveDamageType>UAC_Plasm</explosiveDamageType>
+				<explosiveRadius>0.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<explosionSound>Hit_UACBFG9000</explosionSound>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_UACVortexRiflePlasma</defName>
+		<label>Plasma</label>
+		<graphicData>
+			<texPath>Things/Projectile/Vortexbeam</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>200</speed>
+			<damageDef>UAC_Plasm</damageDef>
+			<damageAmountBase>40</damageAmountBase>
+			<armorPenetrationSharp>60</armorPenetrationSharp>
+			<armorPenetrationBlunt>165.6</armorPenetrationBlunt>
+			<!--explosionRadius>0.9</explosionRadius>
+		<soundExplode>Hit_UACBFG9000</soundExplode-->
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>5</damageAmountBase>
+				<explosiveDamageType>UAC_Plasm</explosiveDamageType>
+				<explosiveRadius>0.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<explosionSound>Hit_UACBFG9000</explosionSound>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_UACHellshotBolt</defName>
+		<label>Plasma</label>
+		<graphicData>
+			<texPath>Things/Projectile/HellshotPlasma</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>(0.75,0.75)</drawSize><!-- this is assuming you are running TasteofVanillaish Doom Faction -->
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>200</speed>
+			<damageDef>UAC_Plasm</damageDef>
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>25</armorPenetrationSharp>
+			<armorPenetrationBlunt>165.6</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>20</damageAmountBase>
+				<explosiveDamageType>Flame_Secondary</explosiveDamageType>
+				<explosiveRadius>0.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<explosionSound>Explosion_EMP</explosionSound>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_UACGaussCannonFlechette</defName>
+		<label>Gauss Cannon Flechette</label>
+		<graphicData>
+			<texPath>Things/Projectile/GAUSSBeam</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>150</damageAmountBase>
+			<armorPenetrationSharp>130</armorPenetrationSharp>
+			<armorPenetrationBlunt>7250</armorPenetrationBlunt>
+			<speed>500</speed>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>150</damageAmountBase>
+				<explosiveDamageType>UAC_GAUSS</explosiveDamageType>
+				<explosiveRadius>1.9</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_UACBFG</defName>
+		<label>BFG Plasma</label>
+		<graphicData>
+			<texPath>Things/Projectile/BFGPLAZMA</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>9000</damageAmountBase>
+			<armorPenetrationSharp>9000</armorPenetrationSharp>
+			<armorPenetrationBlunt>9000</armorPenetrationBlunt>
+			<speed>30</speed>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>9000</damageAmountBase>
+				<explosiveDamageType>UAC_BFG</explosiveDamageType>
+				<explosiveRadius>3.9</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Doom Factions/Patches/Doom Factions/DoomFactions_Ammo.xml b/ModPatches/Doom Factions/Patches/Doom Factions/DoomFactions_Ammo.xml
new file mode 100644
index 0000000000..b7cbc8cac3
--- /dev/null
+++ b/ModPatches/Doom Factions/Patches/Doom Factions/DoomFactions_Ammo.xml	
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Change the damagedefs ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="UAC_Plasm"]/label</xpath>
+		<value>
+			<label>Plasma</label>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="UAC_GAUSS"]/label</xpath>
+		<value>
+			<label>Plasma</label>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="UAC_BFG"]/label</xpath>
+		<value>
+			<label>BFG Plasma</label>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="UAC_Plasm" or defName="UAC_GAUSS" or defName="UAC_BFG"]/hediff</xpath>
+		<value>
+			<hediff>BurnSecondary</hediff>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/DamageDef[defName="UAC_Plasm"]</xpath>
+		<value>
+			<explosionCellMote>UACMote_BlastGAUSS</explosionCellMote>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/DamageDef[defName="UAC_GAUSS"]</xpath>
+		<value>
+			<minDamageToFragment>15</minDamageToFragment>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/DamageDef[defName="UAC_BFG"]</xpath>
+		<value>
+			<minDamageToFragment>150</minDamageToFragment>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/DamageDef[defName="UAC_Plasm"]</xpath>
+		<value>
+			<li Class="CombatExtended.DamageDefExtensionCE">
+				<harmOnlyOutsideLayers>true</harmOnlyOutsideLayers>
+				<isAmbientDamage>true</isAmbientDamage>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Doom Factions/Patches/Doom Factions/DoomFactions_Apperal.xml b/ModPatches/Doom Factions/Patches/Doom Factions/DoomFactions_Apperal.xml
new file mode 100644
index 0000000000..6fc02487a1
--- /dev/null
+++ b/ModPatches/Doom Factions/Patches/Doom Factions/DoomFactions_Apperal.xml	
@@ -0,0 +1,307 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Armor ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_UACRavenArmor" or defName="Apparel_UACTrackerArmor" or defName="Apparel_UACFractalArmor" or defName="Apparel_UACLEETArmor" or defName="Apparel_UACSheperdArmor"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>20</WornBulk>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_UACRavenArmor" or defName="Apparel_UACTrackerArmor" or defName="Apparel_UACFractalArmor" or defName="Apparel_UACLEETArmor" or defName="Apparel_UACSheperdArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>800</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_UACRavenArmor" or defName="Apparel_UACTrackerArmor" or defName="Apparel_UACFractalArmor" or defName="Apparel_UACLEETArmor" or defName="Apparel_UACSheperdArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>80</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_UACRavenArmor" or defName="Apparel_UACTrackerArmor" or defName="Apparel_UACFractalArmor" or defName="Apparel_UACLEETArmor" or defName="Apparel_UACSheperdArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>30</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_UACRavenArmor" or defName="Apparel_UACTrackerArmor" or defName="Apparel_UACFractalArmor" or defName="Apparel_UACLEETArmor" or defName="Apparel_UACSheperdArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>75</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_UACRavenArmor" or defName="Apparel_UACTrackerArmor" or defName="Apparel_UACFractalArmor" or defName="Apparel_UACLEETArmor" or defName="Apparel_UACSheperdArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>150</CarryWeight><!-- Has a built-in exoskeleton -->
+			<CarryBulk>120</CarryBulk><!-- has a TacVest and backpack -->
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_UACRavenArmor" or defName="Apparel_UACTrackerArmor" or defName="Apparel_UACFractalArmor" or defName="Apparel_UACLEETArmor" or defName="Apparel_UACSheperdArmor"]/apparel/layers</xpath>
+		<value>
+			<li>Webbing</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Helmet ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_UACWildcatHelm" or defName="Apparel_UACSheperdHelm" or defName="Apparel_UACRavenHelm" or defName="Apparel_UACLEETHelm" or defName="Apparel_UACASPHelm"]/statBases</xpath>
+		<value>
+			<Bulk>7</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_UACWildcatHelm" or defName="Apparel_UACSheperdHelm" or defName="Apparel_UACRavenHelm" or defName="Apparel_UACLEETHelm" or defName="Apparel_UACASPHelm"]/statBases/Mass</xpath>
+		<value>
+			<Mass>6</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_UACWildcatHelm" or defName="Apparel_UACSheperdHelm" or defName="Apparel_UACRavenHelm" or defName="Apparel_UACLEETHelm" or defName="Apparel_UACASPHelm"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>300</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_UACWildcatHelm" or defName="Apparel_UACSheperdHelm" or defName="Apparel_UACRavenHelm" or defName="Apparel_UACLEETHelm" or defName="Apparel_UACASPHelm"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>24</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_UACWildcatHelm" or defName="Apparel_UACSheperdHelm" or defName="Apparel_UACRavenHelm" or defName="Apparel_UACLEETHelm" or defName="Apparel_UACASPHelm"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>60</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Apparel_UACWildcatHelm" or defName="Apparel_UACSheperdHelm" or defName="Apparel_UACRavenHelm" or defName="Apparel_UACLEETHelm" or defName="Apparel_UACASPHelm"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Apparel_UACWildcatHelm" or defName="Apparel_UACSheperdHelm" or defName="Apparel_UACRavenHelm" or defName="Apparel_UACLEETHelm" or defName="Apparel_UACASPHelm"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_UACWildcatHelm" or defName="Apparel_UACSheperdHelm" or defName="Apparel_UACRavenHelm" or defName="Apparel_UACLEETHelm" or defName="Apparel_UACASPHelm"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>0.15</AimingAccuracy>
+				<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+				<MoveSpeed>-0.02</MoveSpeed>
+				<ShootingAccuracyPawn>0.40</ShootingAccuracyPawn>
+				<AimingDelayFactor>-0.10</AimingDelayFactor>
+				<MentalBreakThreshold>-0.04</MentalBreakThreshold>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_UACWildcatHelm" or defName="Apparel_UACSheperdHelm" or defName="Apparel_UACRavenHelm" or defName="Apparel_UACLEETHelm" or defName="Apparel_UACASPHelm"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Praetor Suit ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_DOOMPraetorSuit"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>20</WornBulk>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_DOOMPraetorSuit"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>1000</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_DOOMPraetorSuit"]/statBases/Mass</xpath>
+		<value>
+			<Mass>60</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_DOOMPraetorSuit"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>34</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_DOOMPraetorSuit"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>90</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_DOOMPraetorSuit"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>150</CarryWeight><!-- Built-in exoskeleton -->
+				<CarryBulk>150</CarryBulk><!-- has a TacVest and backpack -->
+				<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+				<MoveSpeed>1</MoveSpeed>
+				<MeleeHitChance>1</MeleeHitChance>
+				<MeleeDodgeChance>1</MeleeDodgeChance>
+				<MedicalTendQualityOffset>0.25</MedicalTendQualityOffset>
+				<AimingDelayFactor>-0.10</AimingDelayFactor>
+				<ShootingAccuracyPawn>0.10</ShootingAccuracyPawn>
+				<MentalBreakThreshold>-0.07</MentalBreakThreshold>
+				<WorkSpeedGlobal>1</WorkSpeedGlobal>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_DOOMPraetorSuit"]/apparel/layers</xpath>
+		<value>
+			<li>Webbing</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Praetor Helmet & DOOMGuy Helmet ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_DOOMPraetorHelm" or defName="Apparel_DOOMGuyHelm"]/statBases</xpath>
+		<value>
+			<Bulk>7</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_DOOMPraetorHelm" or defName="Apparel_DOOMGuyHelm"]/statBases/Mass</xpath>
+		<value>
+			<Mass>6.2</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_DOOMPraetorHelm" or defName="Apparel_DOOMGuyHelm"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>400</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_DOOMPraetorHelm" or defName="Apparel_DOOMGuyHelm"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>26</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_DOOMPraetorHelm" or defName="Apparel_DOOMGuyHelm"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>60</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Apparel_DOOMPraetorHelm" or defName="Apparel_DOOMGuyHelm"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Apparel_DOOMPraetorHelm" or defName="Apparel_DOOMGuyHelm"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_DOOMPraetorHelm" or defName="Apparel_DOOMGuyHelm"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<ShootingAccuracyPawn>0.30</ShootingAccuracyPawn>
+				<AimingDelayFactor>-0.05</AimingDelayFactor>
+				<MentalBreakThreshold>-0.04</MentalBreakThreshold>
+				<AimingAccuracy>0.15</AimingAccuracy>
+				<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_DOOMPraetorHelm" or defName="Apparel_DOOMGuyHelm"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Apparel ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_UACCsuit" or defName="Apparel_UACVIPSuit" or defName="Apparel_UACBusinessSuit" or defName="Apparel_UACLabcoat"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_UACCsuit" or defName="Apparel_UACLabcoat"]/statBases</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor><!-- Slightly tougher than vanilla pants, T-shirt and button-down shirt -->
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_UACVIPSuit" or defName="Apparel_UACBusinessSuit"]/statBases</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor><!-- Slightly tougher than vanilla pants, T-shirt and button-down shirt -->
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_UACVIPSuit" or defName="Apparel_UACBusinessSuit"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>26</ArmorRating_Blunt><!-- Slightly tougher than vanilla pants, T-shirt and button-down shirt -->
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_UACShades"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_UACShades"]/apparel</xpath>
+		<value>
+			<hatRenderedFrontOfFace>true</hatRenderedFrontOfFace>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Doom Factions/Patches/Doom Factions/DoomFactions_Hediff.xml b/ModPatches/Doom Factions/Patches/Doom Factions/DoomFactions_Hediff.xml
new file mode 100644
index 0000000000..cf6f47ff42
--- /dev/null
+++ b/ModPatches/Doom Factions/Patches/Doom Factions/DoomFactions_Hediff.xml	
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="UACSyntheticArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/verbs</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.11</cooldownTime>
+					<armorPenetrationBlunt>3.00</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Doom Factions/Patches/Doom Factions/DoomFactions_PawnKinds.xml b/ModPatches/Doom Factions/Patches/Doom Factions/DoomFactions_PawnKinds.xml
new file mode 100644
index 0000000000..590337808f
--- /dev/null
+++ b/ModPatches/Doom Factions/Patches/Doom Factions/DoomFactions_PawnKinds.xml	
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="UAC_FBase" or defName="UAC_Scientist" or defName="UAC_Wildcat" or defName="UAC_Sheperd" or defName="UAC_Raven" or defName="UAC_ASP" or defName="UAC_XO" or defName="UAC_EliteLight" or defName="UAC_EliteSniper" or defName="UAC_EliteHeavy"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>10</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>300</min>
+						<max>1200</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>UACMelee</li>
+						<li>CE_Sidearm_Melee</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="SpaceMarine_FBase" or defName="Doom_MarineBerserker" or defName="Doom_MarineLight" or defName="Doom_MarineHeavy" or defName="Doom_MarineSniper" or defName="Doom_MarineBoss"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>7</min>
+					<max>13</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>300</min>
+						<max>1200</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>UACMelee</li>
+						<li>CE_Sidearm_Melee</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Doom Factions/Patches/Doom Factions/DoomFactions_Traders.xml b/ModPatches/Doom Factions/Patches/Doom Factions/DoomFactions_Traders.xml
new file mode 100644
index 0000000000..f6d5c6ccce
--- /dev/null
+++ b/ModPatches/Doom Factions/Patches/Doom Factions/DoomFactions_Traders.xml	
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/TraderKindDef[defName="SpaceMarine_Base"]/stockGenerators/li[thingDef="Shell_HighExplosive"]</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/TraderKindDef[defName="SpaceMarine_CombatSupplier"]/stockGenerators/li[thingDef="Shell_HighExplosive"]</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/TraderKindDef[defName="SpaceMarine_Supplier"]/stockGenerators/li[thingDef="Shell_HighExplosive"]</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/TraderKindDef[defName="UAC_Base"]/stockGenerators/li[thingDef="Shell_HighExplosive"]</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/TraderKindDef[defName="UAC_CombatSupplier"]/stockGenerators/li[thingDef="Shell_HighExplosive"]</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/TraderKindDef[defName="UAC_Supplier"]/stockGenerators/li[thingDef="Shell_HighExplosive"]</xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Doom Factions/Patches/Doom Factions/DoomFactions_Weapons.xml b/ModPatches/Doom Factions/Patches/Doom Factions/DoomFactions_Weapons.xml
new file mode 100644
index 0000000000..b84df5b181
--- /dev/null
+++ b/ModPatches/Doom Factions/Patches/Doom Factions/DoomFactions_Weapons.xml	
@@ -0,0 +1,488 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Remove Unneccessary ========== -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="Bullet_UACPistol" or
+			defName="Bullet_UACCombatShotgun" or
+			defName="UAC_BulletSuperShotgun" or
+			defName="Bullet_UACHeavyAssaultRifle" or
+			defName="Bullet_UACChaingun" or
+			defName="UAC_GAUSSBEAM" or
+			defName="Bullet_UACPlasmaGun" or
+			defName="UAC_RocketLauncher" or
+			defName="Bullet_UACHellshot" or
+			defName="Bullet_UACVortexRifle" or
+			defName="Proj_UACBFG"
+			] </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Gun_UACChaingun"]/recipeMaker/researchPrerequisite</xpath>
+	</Operation>
+
+	<!-- ========== Chainsaw ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_UACSaw"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_UACSaw"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>chainsaw</label>
+					<capacities>
+						<li>Saw</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>0.5</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>9.290</armorPenetrationBlunt>
+					<armorPenetrationSharp>7.6</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Melee Tools for weapons ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="UACBaseHumanMakeableGun"]</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Guns ========== -->
+
+	<!-- ========== UAC Pistol ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>UAC_Pistol</defName>
+		<statBases>
+			<Mass>1</Mass>
+			<Bulk>2.20</Bulk>
+			<SwayFactor>1.07</SwayFactor>
+			<ShotSpread>0.15</ShotSpread>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_PlasmaCellPistol</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>25</range>
+			<soundCast>Fire_UACPistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<!-- ========== Supposedly has infinite ammo ========== -->
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>UAC_Pistol</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== UAC Combat Shotgun ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>UAC_CombatShotgun</defName>
+		<statBases>
+			<Mass>3</Mass>
+			<Bulk>7.67</Bulk>
+			<SwayFactor>1.49</SwayFactor>
+			<ShotSpread>0.14</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.26</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>21</range>
+			<soundCast>Fire_UACCombatShotgun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>UAC_Shotgun</li>
+			<li>UAC_Wildcat</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Super Shotgun ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>UAC_SuperShotgun</defName>
+		<statBases>
+			<Mass>1.9</Mass>
+			<Bulk>6.9</Bulk>
+			<SwayFactor>1.25</SwayFactor>
+			<ShotSpread>0.18</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.9</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_23x75mmR_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<burstShotCount>2</burstShotCount>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<soundCast>Fire_UACCombatShotgun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>2</magazineSize>
+			<reloadTime>1</reloadTime>
+			<ammoSet>AmmoSet_23x75mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>UACGun</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Heavy Assault Rifle ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>UAC_HeavyAssaultRifle</defName>
+		<statBases>
+			<Mass>6</Mass>
+			<Bulk>9</Bulk>
+			<SwayFactor>1.27</SwayFactor>
+			<ShotSpread>0.07</ShotSpread>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.48</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>1.2</warmupTime>
+			<range>60</range>
+			<soundCast>Fire_UACHeavyAssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>90</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>UAC_Wildcat</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Chaingun ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_UACChaingun</defName>
+		<statBases>
+			<Mass>39</Mass>
+			<Bulk>9.5</Bulk>
+			<SwayFactor>1.32</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.58</recoilAmount>
+			<recoilPattern>Mounted</recoilPattern>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<burstShotCount>150</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>2.3</warmupTime>
+			<range>62</range>
+			<soundCast>Fire_UACChaingun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>150</magazineSize>
+			<reloadTime>9.2</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>UAC_Sheperd</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Plasma Rifle ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>UAC_PlasmaGun</defName>
+		<statBases>
+			<Mass>8.2</Mass>
+			<Bulk>7.67</Bulk>
+			<SwayFactor>1.27</SwayFactor>
+			<ShotSpread>0.07</ShotSpread>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.48</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_UACPlasmaRifle</defaultProjectile>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>1.2</warmupTime>
+			<range>62</range>
+			<soundCast>Fire_UACPlasmagun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>150</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_PlasmaRifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>UAC_Wildcat</li>
+			<li>UAC_EliteLight</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Hellshot ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>UAC_Hellshot</defName>
+		<statBases>
+			<Mass>6.35</Mass>
+			<Bulk>7.49</Bulk>
+			<SwayFactor>1.42</SwayFactor>
+			<ShotSpread>0.2</ShotSpread>
+			<SightsEfficiency>1.24</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_UACHellshotBolt</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>48</range>
+			<soundCast>Fire_UACHellshot</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>60</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_Hellshot</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>UAC_ASP</li>
+			<li>UAC_EliteLight</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Vortex Rifle ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>UAC_VortexRifle</defName>
+		<statBases>
+			<Mass>7.51</Mass>
+			<Bulk>9.05</Bulk>
+			<SwayFactor>1.76</SwayFactor>
+			<ShotSpread>0.04</ShotSpread>
+			<SightsEfficiency>2.6</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_UACVortexRiflePlasma</defaultProjectile>
+			<warmupTime>1.6</warmupTime>
+			<range>75</range>
+			<soundCast>Fire_UACVortex</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_VortexRifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>UAC_Raven</li>
+			<li>UAC_EliteSniper</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Gauss cannon ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_GAUSSCannon</defName>
+		<statBases>
+			<Mass>12.5</Mass>
+			<Bulk>12.20</Bulk>
+			<SwayFactor>1.78</SwayFactor>
+			<ShotSpread>0.04</ShotSpread>
+			<SightsEfficiency>2.2</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_UACGaussCannonFlechette</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>86</range>
+			<ammoConsumedPerShotCount>15</ammoConsumedPerShotCount>
+			<soundCast>Fire_UACGAUSS</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>15</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>150</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_GaussCannon</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>UAC_Sheperd</li>
+			<li>UAC_EliteHeavy</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Rocket Launcher ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_UACRocketLauncher</defName>
+		<statBases>
+			<Mass>8</Mass>
+			<Bulk>11.2</Bulk>
+			<SwayFactor>1.82</SwayFactor>
+			<ShotSpread>0.2</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_84x246mmR_HEAT</defaultProjectile>
+			<warmupTime>1.9</warmupTime>
+			<range>40</range>
+			<soundCast>Fire_UACRocketLauncher</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>15</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>5.1</reloadTime>
+			<ammoSet>AmmoSet_84x246mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>UAC_Sheperd</li>
+			<li>UAC_EliteHeavy</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== BFG ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>UAC_BFG</defName>
+		<statBases>
+			<Mass>10</Mass>
+			<Bulk>13</Bulk>
+			<SwayFactor>0.88</SwayFactor>
+			<ShotSpread>0.01</ShotSpread>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_UACBFG</defaultProjectile>
+			<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+			<warmupTime>1.3</warmupTime>
+			<range>62</range>
+			<soundCast>Shot_UACBFG9000</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>20</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>3</magazineSize>
+			<reloadTime>10</reloadTime>
+			<ammoSet>AmmoSet_BFG</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>UAC_XO</li>
+			<li>MarineBoss</li>
+			<li>CE_AI_Launcher</li>
+		</weaponTags>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Dragons Descent/Defs/Dragons Descent/Projectile_Dragon.xml b/ModPatches/Dragons Descent/Defs/Dragons Descent/Projectile_Dragon.xml
new file mode 100644
index 0000000000..bae4796e09
--- /dev/null
+++ b/ModPatches/Dragons Descent/Defs/Dragons Descent/Projectile_Dragon.xml	
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- New CE projectile to try to counter DD's animation -->
+
+	<ThingDef ParentName="BaseBulletCE">
+		<defName>Projectile_RedDragonBreath_Fire_CE</defName>
+		<label>Fire_Breath</label>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<!-- Not sure if comps is needed, only kept for the MoteGlow -->
+		<comps>
+			<li Class="CompProperties_Glower">
+				<overlightRadius>1.0</overlightRadius>
+				<glowRadius>1</glowRadius>
+				<glowColor>(255, 161, 0, 0.19)</glowColor>
+			</li>
+		</comps>
+		<graphicData>
+			<texPath>AnimalProjectile/DragonBreath_Fire</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>MoteGlow</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<flyOverhead>false</flyOverhead>
+			<damageDef>DraconicFlame</damageDef>
+			<explosionRadius>3</explosionRadius>
+			<suppressionFactor>3.0</suppressionFactor>
+			<dangerFactor>2.0</dangerFactor>
+			<damageAmountBase>8</damageAmountBase>
+			<stoppingPower>3.5</stoppingPower>
+			<ai_IsIncendiary>true</ai_IsIncendiary>
+			<preExplosionSpawnThingDef>Filth_Ash</preExplosionSpawnThingDef>
+			<preExplosionSpawnChance>.3</preExplosionSpawnChance>
+			<speed>30</speed>
+			<extraDamages>
+				<li>
+					<def>Flame</def>
+					<amount>6</amount>
+					<armorPenetration>4</armorPenetration>
+					<chance>0.3</chance>
+				</li>
+			</extraDamages>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Dragons Descent/Patches/Dragons Descent/BodyDefs/Bodies_Animal_Dragon.xml b/ModPatches/Dragons Descent/Patches/Dragons Descent/BodyDefs/Bodies_Animal_Dragon.xml
new file mode 100644
index 0000000000..0e93af513d
--- /dev/null
+++ b/ModPatches/Dragons Descent/Patches/Dragons Descent/BodyDefs/Bodies_Animal_Dragon.xml	
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Wing"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Wing"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Wing"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Tail"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Tail"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Tail"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Neck"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Neck"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Shoulder"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Paw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Paw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Paw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Leg"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Leg"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Leg"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Dragons Descent/Patches/Dragons Descent/DamageDefs/DamageDef_DraconicFlame.xml b/ModPatches/Dragons Descent/Patches/Dragons Descent/DamageDefs/DamageDef_DraconicFlame.xml
new file mode 100644
index 0000000000..247e193442
--- /dev/null
+++ b/ModPatches/Dragons Descent/Patches/Dragons Descent/DamageDefs/DamageDef_DraconicFlame.xml	
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--=== Draconic Flame ===-->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/DamageDef[defName="DraconicFlame"]</xpath>
+		<value>
+			<li Class="CombatExtended.DamageDefExtensionCE">
+				<isAmbientDamage>true</isAmbientDamage>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="DraconicFlame"]/defaultArmorPenetration</xpath>
+		<value>
+			<defaultArmorPenetration>2</defaultArmorPenetration>
+		</value>
+	</Operation>
+	<!--=== Draconic Explosion ===-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="DraconicExplosion"]/defaultArmorPenetration</xpath>
+		<value>
+			<defaultArmorPenetration>2</defaultArmorPenetration>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/DamageDef[defName="DraconicExplosion"]</xpath>
+		<value>
+			<li Class="CombatExtended.DamageDefExtensionCE">
+				<!-- <harmOnlyOutsideLayers>true</harmOnlyOutsideLayers> -->
+				<isAmbientDamage>true</isAmbientDamage>
+			</li>
+		</value>
+	</Operation>
+	<!-- I think buffing damage is probably good -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="DraconicExplosion"]/defaultDamage</xpath>
+		<value>
+			<defaultDamage>17</defaultDamage>
+		</value>
+	</Operation>
+	<!--=== Draconic Blunt (Probably not used) ===-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="DraconicBlunt"]/defaultArmorPenetration</xpath>
+		<value>
+			<defaultArmorPenetration>25</defaultArmorPenetration>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="DraconicBlunt"]/armorCategory</xpath>
+		<value>
+			<armorCategory>Blunt</armorCategory>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Dragons Descent/Patches/Dragons Descent/DamageDefs/DamageDef_DragonMelee.xml b/ModPatches/Dragons Descent/Patches/Dragons Descent/DamageDefs/DamageDef_DragonMelee.xml
new file mode 100644
index 0000000000..c5baa8c311
--- /dev/null
+++ b/ModPatches/Dragons Descent/Patches/Dragons Descent/DamageDefs/DamageDef_DragonMelee.xml	
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/DamageDef[defName="Pyro_Bite"]</xpath>
+		<value>
+			<li Class="CombatExtended.DamageDefExtensionCE">
+				<isAmbientDamage>true</isAmbientDamage>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Dragons Descent/Patches/Dragons Descent/Drugs/Draconic_Ambrosia.xml b/ModPatches/Dragons Descent/Patches/Dragons Descent/Drugs/Draconic_Ambrosia.xml
new file mode 100644
index 0000000000..597de87a71
--- /dev/null
+++ b/ModPatches/Dragons Descent/Patches/Dragons Descent/Drugs/Draconic_Ambrosia.xml	
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Hooray, more updating -->
+	<!-- ======== DraconicAmbrosia (Draconic ambrosia) ======== -->
+	<!-- ====== statBases ====== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DraconicAmbrosia"]/statBases</xpath>
+		<value>
+			<Bulk>0.2</Bulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Dragons Descent/Patches/Dragons Descent/Drugs/Dragon_Blood_Potion.xml b/ModPatches/Dragons Descent/Patches/Dragons Descent/Drugs/Dragon_Blood_Potion.xml
new file mode 100644
index 0000000000..df55d81a59
--- /dev/null
+++ b/ModPatches/Dragons Descent/Patches/Dragons Descent/Drugs/Dragon_Blood_Potion.xml	
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Hooray, more updating -->
+	<!-- ======== DragonsBlood (Dragon's blood potion) ======== -->
+	<!-- ====== statBases ====== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DragonsBlood"]/statBases</xpath>
+		<value>
+			<Bulk>0.5</Bulk>
+		</value>
+	</Operation>
+	<!-- ======== DragonsBloodHigh ======== -->
+	<!-- ====== stages ====== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="DragonsBloodHigh"]/stages/li[1]</xpath>
+		<value>
+			<statOffsets>
+				<Suppressability>-0.25</Suppressability>
+			</statOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Dragons Descent/Patches/Dragons Descent/Drugs/Moon_Stone.xml b/ModPatches/Dragons Descent/Patches/Dragons Descent/Drugs/Moon_Stone.xml
new file mode 100644
index 0000000000..73edec88dc
--- /dev/null
+++ b/ModPatches/Dragons Descent/Patches/Dragons Descent/Drugs/Moon_Stone.xml	
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Hooray, more updating -->
+	<!-- ======== MoonStone ======== -->
+	<!-- ====== statBases ====== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MoonStone"]/statBases</xpath>
+		<value>
+			<Bulk>0.2</Bulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Dragons Descent/Patches/Dragons Descent/HediffDefs/Hediff_Attacks.xml b/ModPatches/Dragons Descent/Patches/Dragons Descent/HediffDefs/Hediff_Attacks.xml
new file mode 100644
index 0000000000..7da14ed6ad
--- /dev/null
+++ b/ModPatches/Dragons Descent/Patches/Dragons Descent/HediffDefs/Hediff_Attacks.xml	
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Filthy_Wound"]/comps/li[@Class="HediffCompProperties_Infecter"]</xpath>
+		<value>
+			<li Class="CombatExtended.HediffCompProperties_InfecterCE">
+				<infectionChancePerHourUntended>0.1</infectionChancePerHourUntended>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Dragons Descent/Patches/Dragons Descent/Projectiles/Projectile_Dragon.xml b/ModPatches/Dragons Descent/Patches/Dragons Descent/Projectiles/Projectile_Dragon.xml
new file mode 100644
index 0000000000..485bf92969
--- /dev/null
+++ b/ModPatches/Dragons Descent/Patches/Dragons Descent/Projectiles/Projectile_Dragon.xml	
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Spit Blunt -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Projectile_DragonSpitBlunt"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Projectile_DragonSpitBlunt"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>26</speed>
+				<damageDef>DraconicFlame</damageDef>
+				<damageAmountBase>30</damageAmountBase>
+				<soundExplode>DragonBreathFire</soundExplode>
+				<preExplosionSpawnThingDef>Filth_Dirt</preExplosionSpawnThingDef>
+				<preExplosionSpawnChance>0.3</preExplosionSpawnChance>
+				<explosionRadius>4</explosionRadius>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+				<ai_IsIncendiary>true</ai_IsIncendiary>
+				<shadowSize>1</shadowSize>
+			</projectile>
+		</value>
+	</Operation>
+	<!-- Fire Spit (Probably not used) -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Projectile_DragonSpit"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Projectile_DragonSpit"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>38</speed>
+				<damageDef>Flame</damageDef>
+				<explosionRadius>4.5</explosionRadius>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+				<damageAmountBase>27</damageAmountBase>
+				<preExplosionSpawnThingDef>Filth_Ash</preExplosionSpawnThingDef>
+				<preExplosionSpawnChance>0.3</preExplosionSpawnChance>
+				<ai_IsIncendiary>true</ai_IsIncendiary>
+				<arcHeightFactor>0.2</arcHeightFactor>
+				<shadowSize>1</shadowSize>
+				<explosionDamageFalloff>false</explosionDamageFalloff>
+				<armorPenetrationBase>20</armorPenetrationBase>
+			</projectile>
+		</value>
+	</Operation>
+	<!-- Placeholder Spit -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Projectile_DragonBreath_AOE"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Projectile_DragonBreath_AOE"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>38</speed>
+				<damageDef>DraconicFlame</damageDef>
+				<explosionRadius>4.5</explosionRadius>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+				<damageAmountBase>27</damageAmountBase>
+				<preExplosionSpawnThingDef>Filth_Ash</preExplosionSpawnThingDef>
+				<preExplosionSpawnChance>0.3</preExplosionSpawnChance>
+				<ai_IsIncendiary>true</ai_IsIncendiary>
+				<arcHeightFactor>0.2</arcHeightFactor>
+				<shadowSize>1</shadowSize>
+			</projectile>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Dragons Descent/Patches/Dragons Descent/Scenarios/Scenarios_DragonsDescent.xml b/ModPatches/Dragons Descent/Patches/Dragons Descent/Scenarios/Scenarios_DragonsDescent.xml
new file mode 100644
index 0000000000..d01dc51af7
--- /dev/null
+++ b/ModPatches/Dragons Descent/Patches/Dragons Descent/Scenarios/Scenarios_DragonsDescent.xml	
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="DragonThieves"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_Arrow_Stone</thingDef>
+				<count>100</count>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Items/Items_Exotic.xml b/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Items/Items_Exotic.xml
new file mode 100644
index 0000000000..8416dec819
--- /dev/null
+++ b/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Items/Items_Exotic.xml	
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === DragonHorn === -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="DragonHorn"]/tools</xpath>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DragonHorn"]/statBases/Mass</xpath>
+		<value>
+			<Mass>50</Mass>
+			<Bulk>25</Bulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="DragonHorn"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>ResourceBase</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Items/Items_Resource_Leather.xml b/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Items/Items_Resource_Leather.xml
new file mode 100644
index 0000000000..8e492e9c4f
--- /dev/null
+++ b/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Items/Items_Resource_Leather.xml	
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === Dragon_Leather === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Dragon_Leather"]/statBases/StuffPower_Armor_Sharp</xpath>
+
+		<value>
+			<StuffPower_Armor_Sharp>0.907</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Dragon_Leather"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.24</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Dragon_Leather"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.178</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Dragon_Leather"]/stuffProps</xpath>
+		<value>
+			<categories>
+				<li>SoftArmor</li>
+			</categories>
+		</value>
+	</Operation>
+	<!-- === Rare_Dragon_Leather === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Rare_Dragon_Leather"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.079</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Rare_Dragon_Leather"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.279</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Rare_Dragon_Leather"]/statBases/StuffPower_Armor_Heat</xpath>
+
+		<value>
+			<StuffPower_Armor_Heat>0.2</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Rare_Dragon_Leather"]/stuffProps</xpath>
+		<value>
+			<categories>
+				<li>SoftArmor</li>
+			</categories>
+		</value>
+	</Operation>
+	<!-- === True_Dragon_Leather === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="True_Dragon_Leather"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.282</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="True_Dragon_Leather"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.324</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="True_Dragon_Leather"]/statBases/StuffPower_Armor_Heat</xpath>
+
+		<value>
+			<StuffPower_Armor_Heat>0.226</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="True_Dragon_Leather"]/stuffProps</xpath>
+		<value>
+			<categories>
+				<li>SoftArmor</li>
+			</categories>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Items/Items_Resource_Scale.xml b/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Items/Items_Resource_Scale.xml
new file mode 100644
index 0000000000..0b40291dbd
--- /dev/null
+++ b/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Items/Items_Resource_Scale.xml	
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === Hard Scale === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HardScale"]/statBases</xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HardScale"]/stuffProps/categories</xpath>
+		<value>
+			<li>Metallic_Weapon</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HardScale"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.02</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HardScale"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>1.6</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HardScale"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.2</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Misc/Apparel_Headgear.xml b/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Misc/Apparel_Headgear.xml
new file mode 100644
index 0000000000..70f3364a3b
--- /dev/null
+++ b/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Misc/Apparel_Headgear.xml	
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- scale helmet -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DD_Apparel_ScaleHelm"]/statBases</xpath>
+		<value>
+			<Bulk>4.25</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DD_Apparel_ScaleHelm"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DD_Apparel_ScaleHelm"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>UpperHead</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+	<!-- dragon crown -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DD_Apparel_DragonCrown"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DD_Apparel_DragonCrown"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<AimingAccuracy>-0.1</AimingAccuracy>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Misc/Apparel_Various.xml b/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Misc/Apparel_Various.xml
new file mode 100644
index 0000000000..6593fabf83
--- /dev/null
+++ b/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Misc/Apparel_Various.xml	
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- scale mail -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DD_Apparel_ScaleMail"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DD_Apparel_ScaleMail"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DD_Apparel_ScaleMail"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeDodgeChance>-0.1</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<!-- wing cape -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DD_Apparel_WingCape"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>7</Bulk>
+			<WornBulk>2.5</WornBulk>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Misc/Weapons/MeleeDD.xml b/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Misc/Weapons/MeleeDD.xml
new file mode 100644
index 0000000000..79b7552ca2
--- /dev/null
+++ b/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Misc/Weapons/MeleeDD.xml	
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- horned lance -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DD_MeleeWeapon_HornedLance"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>1.34</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DD_MeleeWeapon_HornedLance"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.11</MeleeCritChance>
+				<MeleeParryChance>1.16</MeleeParryChance>
+				<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DD_MeleeWeapon_HornedLance"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.43</cooldownTime>
+					<armorPenetrationBlunt>2.813</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.89</cooldownTime>
+					<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.25</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>6.98</cooldownTime>
+					<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- drachen sword -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DD_MeleeWeapon_DrachenSword"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>1.04</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DD_MeleeWeapon_DrachenSword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.37</MeleeCritChance>
+				<MeleeParryChance>0.78</MeleeParryChance>
+				<MeleeDodgeChance>0.47</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DD_MeleeWeapon_DrachenSword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.81</cooldownTime>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>1.74</cooldownTime>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.8</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>1.72</cooldownTime>
+					<armorPenetrationBlunt>2.916</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.65</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- thrumbo battle axe -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DDMeleeWeapon_ThrumboBattleAxe"]/statBases</xpath>
+		<value>
+			<Bulk>13</Bulk>
+			<MeleeCounterParryBonus>1.5</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DDMeleeWeapon_ThrumboBattleAxe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.3</MeleeCritChance>
+				<MeleeParryChance>1.6</MeleeParryChance>
+				<MeleeDodgeChance>0.56</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DDMeleeWeapon_ThrumboBattleAxe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.93</cooldownTime>
+					<armorPenetrationBlunt>3.8</armorPenetrationBlunt>
+					<armorPenetrationSharp>20</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>60</power>
+					<cooldownTime>4.82</cooldownTime>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+					<armorPenetrationSharp>18.62</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- focusing tome -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DDMeleeWeapon_FocusingTome"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<MeleeCounterParryBonus>0.14</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DDMeleeWeapon_FocusingTome"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.23</MeleeCritChance>
+			<MeleeParryChance>0.14</MeleeParryChance>
+			<MeleeDodgeChance>0.07</MeleeDodgeChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DDMeleeWeapon_FocusingTome"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>spine</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2.0</cooldownTime>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DDMeleeWeapon_FocusingTome"]</xpath>
+		<value>
+			<weaponTags>
+				<li>CE_OneHandedWeapon</li>
+			</weaponTags>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Misc/Weapons/RangedDD.xml b/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Misc/Weapons/RangedDD.xml
new file mode 100644
index 0000000000..a3003cbc16
--- /dev/null
+++ b/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Misc/Weapons/RangedDD.xml	
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- dragonfire launcher -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DD_Gun_DragonfireLauncher</defName>
+		<statBases>
+			<MarketValue>3000</MarketValue>
+			<WorkToMake>43000</WorkToMake>
+			<Mass>8.9</Mass>
+			<RangedWeapon_Cooldown>0.52</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.82</SwayFactor>
+			<Bulk>11</Bulk>
+		</statBases>
+		<costList>
+			<Steel>75</Steel>
+			<Plasteel>30</Plasteel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+			<Chemfuel>11</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>2.9</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_30x64mmFuel_Incendiary</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>43</range>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<burstShotCount>3</burstShotCount>
+			<soundCast>Shot_IncendiaryLauncher</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>9</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_30x64mmFuel</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AOE</li>
+			<li>EliteGun</li>
+		</weaponTags>
+		<researchPrerequisite>CE_AdvancedLaunchers</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DD_Gun_DragonfireLauncher"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.55</cooldownTime>
+					<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>
+	<!-- double crossbow -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DD_Bow_DoubleCrossbow</defName>
+		<statBases>
+			<MarketValue>300</MarketValue>
+			<WorkToMake>19000</WorkToMake>
+			<Mass>5.9</Mass>
+			<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.58</ShotSpread>
+			<SwayFactor>1.10</SwayFactor>
+			<Bulk>9</Bulk>
+		</statBases>
+		<costList>
+			<Steel>35</Steel>
+			<WoodLog>70</WoodLog>
+		</costList>
+		<Properties>
+			<recoilAmount>2.3</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_CrossbowBolt_Steel</defaultProjectile>
+			<warmupTime>1.4</warmupTime>
+			<range>21</range>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<burstShotCount>2</burstShotCount>
+			<soundCast>Bow_Recurve</soundCast>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>2</magazineSize>
+			<reloadTime>6.5</reloadTime>
+			<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>NeolithicRangedHeavy</li>
+			<li>NeolithicRangedChief</li>
+		</weaponTags>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DD_Bow_DoubleCrossbow"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.65</cooldownTime>
+					<armorPenetrationBlunt>0.67</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Races/Races_Animal_Common_Dragon.xml b/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Races/Races_Animal_Common_Dragon.xml
new file mode 100644
index 0000000000..c5aa7ffdcb
--- /dev/null
+++ b/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Races/Races_Animal_Common_Dragon.xml	
@@ -0,0 +1,475 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ======== Common Dragons ======== -->
+	<!-- ====== Tools ====== -->
+	<!-- ==== Base Tools ==== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName="Black_Dragon" or
+			defName="Blue_Dragon" or
+			defName="Green_Dragon" or
+			defName="Purple_Dragon" or
+			defName="Red_Dragon" or
+			defName="White_Dragon" or
+			defName="Yellow_Dragon"]/tools
+		</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>DD_Knockback</label>
+					<capacities>
+						<li>DD_Knockback</li>
+					</capacities>
+					<power>110</power>
+					<armorPenetrationBlunt>115.115</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+					<cooldownTime>4.0</cooldownTime>
+					<linkedBodyPartsGroup>Tail</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- ==== Blue, Green, Purple, White, Yellow Claws and Horns ==== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/ThingDef[
+			defName="Blue_Dragon" or
+			defName="Green_Dragon" or
+			defName="Purple_Dragon" or
+			defName="White_Dragon" or
+			defName="Yellow_Dragon"]/tools
+		</xpath>
+		<value>
+			<li Class="CombatExtended.ToolCE">
+				<label>left claw</label>
+				<capacities>
+					<li>Scratch</li>
+					<li>Cut</li>
+					<li>Stab</li>
+				</capacities>
+				<power>76</power>
+				<cooldownTime>3</cooldownTime>
+				<armorPenetrationSharp>16.09</armorPenetrationSharp>
+				<armorPenetrationBlunt>120.417</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>right claw</label>
+				<capacities>
+					<li>Scratch</li>
+					<li>Cut</li>
+					<li>Stab</li>
+				</capacities>
+				<power>76</power>
+				<cooldownTime>3</cooldownTime>
+				<armorPenetrationSharp>16.09</armorPenetrationSharp>
+				<armorPenetrationBlunt>120.417</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>horn</label>
+				<capacities>
+					<li>Cut</li>
+				</capacities>
+				<surpriseAttack>
+					<extraMeleeDamages>
+						<li>
+							<def>Stun</def>
+							<amount>30</amount>
+						</li>
+					</extraMeleeDamages>
+				</surpriseAttack>
+				<power>69</power>
+				<cooldownTime>5.68</cooldownTime>
+				<armorPenetrationSharp>3</armorPenetrationSharp>
+				<armorPenetrationBlunt>24.725</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Horns</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>horn</label>
+				<capacities>
+					<li>Stab</li>
+				</capacities>
+				<surpriseAttack>
+					<extraMeleeDamages>
+						<li>
+							<def>Stun</def>
+							<amount>30</amount>
+						</li>
+					</extraMeleeDamages>
+				</surpriseAttack>
+				<power>38</power>
+				<cooldownTime>5.68</cooldownTime>
+				<armorPenetrationSharp>14</armorPenetrationSharp>
+				<armorPenetrationBlunt>21.725</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Horns</linkedBodyPartsGroup>
+			</li>
+		</value>
+	</Operation>
+	<!-- ==== Black, Purple, Yellow Dragon Teeth === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/ThingDef[
+			defName="Black_Dragon" or
+			defName="Purple_Dragon" or
+			defName="Yellow_Dragon"]/tools
+		</xpath>
+		<value>
+			<li Class="CombatExtended.ToolCE">
+				<label>teeth</label>
+				<capacities>
+					<li>Bite</li>
+					<li>Cut</li>
+					<li>Stab</li>
+				</capacities>
+				<power>86</power>
+				<cooldownTime>3.7</cooldownTime>
+				<armorPenetrationSharp>26.75</armorPenetrationSharp>
+				<armorPenetrationBlunt>301.042</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+			</li>
+		</value>
+	</Operation>
+	<!-- ==== Purple, White, Yellow Dragon Skull bash -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/ThingDef[
+			defName="Purple_Dragon" or
+			defName="White_Dragon" or
+			defName="Yellow_Dragon"]/tools
+		</xpath>
+		<value>
+			<li Class="CombatExtended.ToolCE">
+				<cooldownTime>5.48</cooldownTime>
+				<power>120</power>
+				<capacities>
+					<li>Skull_Bash</li>
+				</capacities>
+				<surpriseAttack>
+					<extraMeleeDamages>
+						<li>
+							<def>Stun</def>
+							<amount>20</amount>
+						</li>
+					</extraMeleeDamages>
+				</surpriseAttack>
+				<linkedBodyPartsGroup>Horns</linkedBodyPartsGroup>
+				<label>head</label>
+				<armorPenetrationBlunt>75.26</armorPenetrationBlunt>
+			</li>
+		</value>
+	</Operation>
+	<!-- ==== Purple, Red, White, Yellow Tail whip replace ==== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/ThingDef[
+			defName="Purple_Dragon" or
+			defName="Red_Dragon" or
+			defName="White_Dragon" or
+			defName="Yellow_Dragon"]/tools
+		</xpath>
+		<value>
+			<li Class="CombatExtended.ToolCE">
+				<cooldownTime>4.66</cooldownTime>
+				<power>107</power>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<surpriseAttack>
+					<extraMeleeDamages>
+						<li>
+							<def>Stun</def>
+							<amount>20</amount>
+						</li>
+					</extraMeleeDamages>
+				</surpriseAttack>
+				<linkedBodyPartsGroup>Tail</linkedBodyPartsGroup>
+				<label>tail</label>
+				<armorPenetrationBlunt>54.611</armorPenetrationBlunt>
+			</li>
+		</value>
+	</Operation>
+	<!-- ==== Base Verbs ==== -->
+	<!-- In game only one projectile gets chosen for the dragons when tamed deselect/select options -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName="Black_Dragon" or
+			defName="Blue_Dragon" or
+			defName="Green_Dragon" or
+			defName="Purple_Dragon" or
+			defName="Red_Dragon" or
+			defName="White_Dragon" or
+			defName="Yellow_Dragon"]/verbs
+		</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Projectile_RedDragonBreath_Fire_CE</defaultProjectile>
+					<warmupTime>1.4</warmupTime>
+					<burstShotCount>10</burstShotCount>
+					<minRange>4</minRange>
+					<range>24</range>
+					<soundCast>DragonBreathShot</soundCast>
+					<muzzleFlashScale>2</muzzleFlashScale>
+					<label>Fire Breath</label>
+					<commonality>0.2</commonality>
+					<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+				</li>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Projectile_DragonSpitBlunt</defaultProjectile>
+					<warmupTime>2.2</warmupTime>
+					<minRange>5</minRange>
+					<range>32</range>
+					<burstShotCount>2</burstShotCount>
+					<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
+					<soundCast>DragonBreathFire</soundCast>
+					<muzzleFlashScale>1</muzzleFlashScale>
+					<label>Dragon Spit</label>
+					<commonality>0.3</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+	<!-- ==== Unique Tools and Verbs ==== -->
+	<!-- == Black Dragon == -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Black_Dragon"]/tools</xpath>
+		<value>
+			<li Class="CombatExtended.ToolCE">
+				<label>left claw</label>
+				<capacities>
+					<li>Scratch</li>
+					<li>Cut</li>
+					<li>Stab</li>
+				</capacities>
+				<power>73</power>
+				<cooldownTime>3</cooldownTime>
+				<armorPenetrationSharp>15.93</armorPenetrationSharp>
+				<armorPenetrationBlunt>120.350</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>right claw</label>
+				<capacities>
+					<li>Scratch</li>
+					<li>Cut</li>
+					<li>Stab</li>
+				</capacities>
+				<power>73</power>
+				<cooldownTime>3</cooldownTime>
+				<armorPenetrationSharp>15.93</armorPenetrationSharp>
+				<armorPenetrationBlunt>120.350</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>horn</label>
+				<capacities>
+					<li>Cut</li>
+				</capacities>
+				<surpriseAttack>
+					<extraMeleeDamages>
+						<li>
+							<def>Stun</def>
+							<amount>30</amount>
+						</li>
+					</extraMeleeDamages>
+				</surpriseAttack>
+				<power>66</power>
+				<cooldownTime>5.68</cooldownTime>
+				<armorPenetrationSharp>2.98</armorPenetrationSharp>
+				<armorPenetrationBlunt>24.718</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Horns</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>horn</label>
+				<capacities>
+					<li>Stab</li>
+				</capacities>
+				<surpriseAttack>
+					<extraMeleeDamages>
+						<li>
+							<def>Stun</def>
+							<amount>30</amount>
+						</li>
+					</extraMeleeDamages>
+				</surpriseAttack>
+				<power>35</power>
+				<cooldownTime>5.68</cooldownTime>
+				<armorPenetrationSharp>13.89</armorPenetrationSharp>
+				<armorPenetrationBlunt>21.709</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Horns</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<cooldownTime>3.04</cooldownTime>
+				<power>100</power>
+				<capacities>
+					<li>Rend</li>
+				</capacities>
+				<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+				<label>teeth</label>
+				<armorPenetrationSharp>30.67</armorPenetrationSharp>
+				<armorPenetrationBlunt>677.344</armorPenetrationBlunt>
+			</li>
+		</value>
+	</Operation>
+	<!-- == Blue Dragon == -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Blue_Dragon"]/tools</xpath>
+		<value>
+			<li Class="CombatExtended.ToolCE">
+				<cooldownTime>2.86</cooldownTime>
+				<power>90</power>
+				<capacities>
+					<li>Frost_Bite</li>
+				</capacities>
+				<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+				<label>teeth</label>
+				<armorPenetrationSharp>25.26</armorPenetrationSharp>
+				<armorPenetrationBlunt>460.97</armorPenetrationBlunt>
+			</li>
+		</value>
+	</Operation>
+	<!-- == Green Dragon == -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Green_Dragon"]/tools</xpath>
+		<value>
+			<li Class="CombatExtended.ToolCE">
+				<cooldownTime>3.6</cooldownTime>
+				<power>100</power>
+				<capacities>
+					<li>ToxicBite</li>
+				</capacities>
+				<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+				<label>teeth</label>
+				<armorPenetrationSharp>24.26</armorPenetrationSharp>
+				<armorPenetrationBlunt>460.97</armorPenetrationBlunt>
+			</li>
+		</value>
+	</Operation>
+	<!-- == Purple Dragon == -->
+
+	<!-- == Red Dragon == -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Red_Dragon"]/tools</xpath>
+		<value>
+			<li Class="CombatExtended.ToolCE">
+				<label>left claw</label>
+				<capacities>
+					<li>Scratch</li>
+					<li>Cut</li>
+					<li>Stab</li>
+				</capacities>
+				<power>81</power>
+				<cooldownTime>3</cooldownTime>
+				<armorPenetrationSharp>16.32</armorPenetrationSharp>
+				<armorPenetrationBlunt>120.447</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>right claw</label>
+				<capacities>
+					<li>Scratch</li>
+					<li>Cut</li>
+					<li>Stab</li>
+				</capacities>
+				<power>81</power>
+				<cooldownTime>3</cooldownTime>
+				<armorPenetrationSharp>16.32</armorPenetrationSharp>
+				<armorPenetrationBlunt>120.447</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>horn</label>
+				<capacities>
+					<li>Cut</li>
+				</capacities>
+				<surpriseAttack>
+					<extraMeleeDamages>
+						<li>
+							<def>Stun</def>
+							<amount>30</amount>
+						</li>
+					</extraMeleeDamages>
+				</surpriseAttack>
+				<power>74</power>
+				<cooldownTime>5.68</cooldownTime>
+				<armorPenetrationSharp>3.016</armorPenetrationSharp>
+				<armorPenetrationBlunt>24.760</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Horns</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>horn</label>
+				<capacities>
+					<li>Stab</li>
+				</capacities>
+				<surpriseAttack>
+					<extraMeleeDamages>
+						<li>
+							<def>Stun</def>
+							<amount>30</amount>
+						</li>
+					</extraMeleeDamages>
+				</surpriseAttack>
+				<power>41</power>
+				<cooldownTime>5.68</cooldownTime>
+				<armorPenetrationSharp>14.025</armorPenetrationSharp>
+				<armorPenetrationBlunt>21.760</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Horns</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<cooldownTime>3.3</cooldownTime>
+				<power>100</power>
+				<capacities>
+					<li>Pyro_Bite</li>
+				</capacities>
+				<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+				<label>teeth</label>
+				<armorPenetrationSharp>24.26</armorPenetrationSharp>
+				<armorPenetrationBlunt>460.97</armorPenetrationBlunt>
+				<chanceFactor>0.1</chanceFactor>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<cooldownTime>4.66</cooldownTime>
+				<power>130</power>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<surpriseAttack>
+					<extraMeleeDamages>
+						<li>
+							<def>Stun</def>
+							<amount>20</amount>
+						</li>
+					</extraMeleeDamages>
+				</surpriseAttack>
+				<linkedBodyPartsGroup>Tail</linkedBodyPartsGroup>
+				<label>tail</label>
+				<armorPenetrationBlunt>60.233</armorPenetrationBlunt>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- == White Dragon == -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="White_Dragon"]/tools</xpath>
+		<value>
+			<li Class="CombatExtended.ToolCE">
+				<cooldownTime>2.12</cooldownTime>
+				<power>111</power>
+				<capacities>
+					<li>Frost_Bite</li>
+				</capacities>
+				<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+				<label>teeth</label>
+				<armorPenetrationSharp>7.26</armorPenetrationSharp>
+				<armorPenetrationBlunt>460.97</armorPenetrationBlunt>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Races/Races_Animal_Dragon_Base.xml b/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Races/Races_Animal_Dragon_Base.xml
new file mode 100644
index 0000000000..e78492b37c
--- /dev/null
+++ b/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Races/Races_Animal_Dragon_Base.xml	
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ======== BaseDragon (Dragon Base) ======== -->
+	<!-- ====== ModExtension ====== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="BaseDragon"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ======== DragonRaceBase (Common Dragon Base) ======== -->
+	<!-- ====== statBases ====== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="DragonRaceBase"]/statBases</xpath>
+		<value>
+			<MeleeCritChance>1.75</MeleeCritChance>
+			<MeleeParryChance>0.54</MeleeParryChance>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="DragonRaceBase"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.13</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="DragonRaceBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>40</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="DragonRaceBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="DragonRaceBase"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>4250</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ======== RDragonRaceBase (Rare Dragon Base) ======== -->
+	<!-- ====== statBases ====== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RDragonRaceBase"]/statBases</xpath>
+		<value>
+			<MeleeCritChance>1.96</MeleeCritChance>
+			<MeleeParryChance>0.64</MeleeParryChance>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1.75</ShootingAccuracyPawn>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RDragonRaceBase"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.13</MeleeDodgeChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RDragonRaceBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>48</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RDragonRaceBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>19.2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RDragonRaceBase"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>5075</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Races/Races_Animal_Rare_Dragon.xml b/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Races/Races_Animal_Rare_Dragon.xml
new file mode 100644
index 0000000000..d71186ac6d
--- /dev/null
+++ b/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Races/Races_Animal_Rare_Dragon.xml	
@@ -0,0 +1,433 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ======== Rare Dragons ======== -->
+	<!-- ====== Tools ====== -->
+	<!-- ==== Base Tools ==== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName="Gold_Dragon" or
+			defName="Silver_Dragon" or
+			defName="Jade_Dragon" or
+			defName="True_Dragon"]/tools
+		</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>DD_Knockback</label>
+					<capacities>
+						<li>DD_Knockback</li>
+					</capacities>
+					<power>110</power>
+					<armorPenetrationBlunt>115.115</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+					<cooldownTime>4.0</cooldownTime>
+					<linkedBodyPartsGroup>Tail</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/ThingDef[
+			defName="Gold_Dragon" or
+			defName="Silver_Dragon" or
+			defName="True_Dragon"]/tools
+		</xpath>
+		<value>
+			<li Class="CombatExtended.ToolCE">
+				<label>left claw</label>
+				<capacities>
+					<li>Scratch</li>
+					<li>Cut</li>
+					<li>Stab</li>
+				</capacities>
+				<power>100</power>
+				<cooldownTime>3.01</cooldownTime>
+				<chanceFactor>0.3</chanceFactor>
+				<armorPenetrationSharp>22.11</armorPenetrationSharp>
+				<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+				<armorPenetrationBlunt>150.521</armorPenetrationBlunt>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>right claw</label>
+				<capacities>
+					<li>Scratch</li>
+					<li>Cut</li>
+					<li>Stab</li>
+				</capacities>
+				<power>100</power>
+				<cooldownTime>3.01</cooldownTime>
+				<chanceFactor>0.3</chanceFactor>
+				<armorPenetrationSharp>22.11</armorPenetrationSharp>
+				<armorPenetrationBlunt>150.521</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/ThingDef[
+			defName="Gold_Dragon" or
+			defName="Silver_Dragon"]/tools
+		</xpath>
+		<value>
+			<li Class="CombatExtended.ToolCE">
+				<cooldownTime>5.64</cooldownTime>
+				<power>100</power>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<surpriseAttack>
+					<extraMeleeDamages>
+						<li>
+							<def>Stun</def>
+							<amount>20</amount>
+						</li>
+					</extraMeleeDamages>
+				</surpriseAttack>
+				<linkedBodyPartsGroup>Tail</linkedBodyPartsGroup>
+				<label>tail</label>
+				<armorPenetrationBlunt>62.365</armorPenetrationBlunt>
+				<chanceFactor>0.1</chanceFactor>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>horn</label>
+				<capacities>
+					<li>Cut</li>
+				</capacities>
+				<surpriseAttack>
+					<extraMeleeDamages>
+						<li>
+							<def>Stun</def>
+							<amount>30</amount>
+						</li>
+					</extraMeleeDamages>
+				</surpriseAttack>
+				<power>100</power>
+				<cooldownTime>5.75</cooldownTime>
+				<chanceFactor>0.1</chanceFactor>
+				<armorPenetrationSharp>13.162</armorPenetrationSharp>
+				<armorPenetrationBlunt>26.345</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Horns</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>horn</label>
+				<capacities>
+					<li>Stab</li>
+				</capacities>
+				<surpriseAttack>
+					<extraMeleeDamages>
+						<li>
+							<def>Stun</def>
+							<amount>30</amount>
+						</li>
+					</extraMeleeDamages>
+				</surpriseAttack>
+				<power>65</power>
+				<cooldownTime>5.75</cooldownTime>
+				<chanceFactor>0.1</chanceFactor>
+				<armorPenetrationSharp>22.869</armorPenetrationSharp>
+				<armorPenetrationBlunt>22.795</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Horns</linkedBodyPartsGroup>
+			</li>
+		</value>
+	</Operation>
+	<!-- ==== Common Verbs ==== -->
+	<!-- In game only one projectile gets chosen for the dragons when tamed deselect/select options -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName="Gold_Dragon" or
+			defName="Silver_Dragon" or
+			defName="Jade_Dragon" or
+			defName="True_Dragon"]/verbs
+		</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Projectile_RedDragonBreath_Fire_CE</defaultProjectile>
+					<warmupTime>1.2</warmupTime>
+					<burstShotCount>10</burstShotCount>
+					<minRange>4</minRange>
+					<range>24</range>
+					<soundCast>DragonBreathShot</soundCast>
+					<muzzleFlashScale>2</muzzleFlashScale>
+					<label>Fire Breath</label>
+					<commonality>0.2</commonality>
+					<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+				</li>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Projectile_DragonSpitBlunt</defaultProjectile>
+					<warmupTime>2.0</warmupTime>
+					<minRange>5</minRange>
+					<range>34</range>
+					<burstShotCount>2</burstShotCount>
+					<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
+					<soundCast>DragonBreathFire</soundCast>
+					<muzzleFlashScale>1</muzzleFlashScale>
+					<label>Dragon Spit</label>
+					<commonality>0.3</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+	<!-- ==== Unique Tools ==== -->
+	<!-- == Gold Dragon == -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Gold_Dragon"]/tools</xpath>
+		<value>
+			<li Class="CombatExtended.ToolCE">
+				<cooldownTime>2.84</cooldownTime>
+				<power>122</power>
+				<capacities>
+					<li>Pyro_Bite</li>
+				</capacities>
+				<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+				<label>teeth</label>
+				<armorPenetrationSharp>31.08</armorPenetrationSharp>
+				<armorPenetrationBlunt>576.213</armorPenetrationBlunt>
+				<chanceFactor>0.1</chanceFactor>
+			</li>
+		</value>
+	</Operation>
+	<!-- == Silver Dragon == -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Silver_Dragon"]/tools</xpath>
+		<value>
+			<li Class="CombatExtended.ToolCE">
+				<cooldownTime>2.84</cooldownTime>
+				<power>122</power>
+				<capacities>
+					<li>Frost_Bite</li>
+				</capacities>
+				<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+				<label>teeth</label>
+				<armorPenetrationSharp>24.08</armorPenetrationSharp>
+				<armorPenetrationBlunt>576.213</armorPenetrationBlunt>
+				<chanceFactor>0.1</chanceFactor>
+			</li>
+		</value>
+	</Operation>
+	<!-- == Jade Dragon == -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Jade_Dragon"]/tools</xpath>
+		<value>
+			<li Class="CombatExtended.ToolCE">
+				<label>left claw</label>
+				<capacities>
+					<li>Scratch</li>
+				</capacities>
+				<power>98</power>
+				<cooldownTime>3.01</cooldownTime>
+				<chanceFactor>0.3</chanceFactor>
+				<armorPenetrationSharp>26.50</armorPenetrationSharp>
+				<armorPenetrationBlunt>150.496</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>right claw</label>
+				<capacities>
+					<li>Scratch</li>
+				</capacities>
+				<power>98</power>
+				<cooldownTime>3.01</cooldownTime>
+				<chanceFactor>0.3</chanceFactor>
+				<armorPenetrationSharp>26.50</armorPenetrationSharp>
+				<armorPenetrationBlunt>150.496</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>teeth</label>
+				<capacities>
+					<li>ToxicBite</li>
+				</capacities>
+				<power>122</power>
+				<cooldownTime>2.84</cooldownTime>
+				<chanceFactor>0.1</chanceFactor>
+				<armorPenetrationSharp>24.08</armorPenetrationSharp>
+				<armorPenetrationBlunt>576.213</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>horn</label>
+				<capacities>
+					<li>Cut</li>
+				</capacities>
+				<surpriseAttack>
+					<extraMeleeDamages>
+						<li>
+							<def>Stun</def>
+							<amount>30</amount>
+						</li>
+					</extraMeleeDamages>
+				</surpriseAttack>
+				<power>72</power>
+				<cooldownTime>5.75</cooldownTime>
+				<chanceFactor>0.1</chanceFactor>
+				<armorPenetrationSharp>9.356</armorPenetrationSharp>
+				<armorPenetrationBlunt>19.867</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Horns</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>horn</label>
+				<capacities>
+					<li>Stab</li>
+				</capacities>
+				<surpriseAttack>
+					<extraMeleeDamages>
+						<li>
+							<def>Stun</def>
+							<amount>30</amount>
+						</li>
+					</extraMeleeDamages>
+				</surpriseAttack>
+				<power>38</power>
+				<cooldownTime>5.75</cooldownTime>
+				<chanceFactor>0.1</chanceFactor>
+				<armorPenetrationSharp>18.265</armorPenetrationSharp>
+				<armorPenetrationBlunt>18.186</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Horns</linkedBodyPartsGroup>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ======== True Dragon ======== -->
+	<!-- ====== statBases ====== -->
+	<!-- <li Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="True_Dragon"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.14</MeleeDodgeChance>
+			<MeleeCritChance>2.34</MeleeCritChance>
+			<MeleeParryChance>0.64</MeleeParryChance>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>2.0</ShootingAccuracyPawn>
+		</value>
+	</li>
+
+	<li Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="True_Dragon"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>57.5</ArmorRating_Blunt>
+		</value>
+	</li>
+	<li Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="True_Dragon"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>23</ArmorRating_Sharp>
+		</value>
+	</li> -->
+
+	<!-- ====== Tools ====== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="True_Dragon"]/tools</xpath>
+		<value>
+			<li Class="CombatExtended.ToolCE">
+				<label>teeth</label>
+				<capacities>
+					<li>Pyro_Bite</li>
+				</capacities>
+				<power>128</power>
+				<cooldownTime>3.0</cooldownTime>
+				<chanceFactor>0.2</chanceFactor>
+				<armorPenetrationSharp>36.18</armorPenetrationSharp>
+				<armorPenetrationBlunt>645.996</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>teeth</label>
+				<capacities>
+					<li>ToxicBite</li>
+				</capacities>
+				<power>128</power>
+				<cooldownTime>3.0</cooldownTime>
+				<chanceFactor>0.2</chanceFactor>
+				<armorPenetrationSharp>36.18</armorPenetrationSharp>
+				<armorPenetrationBlunt>645.996</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>horn</label>
+				<capacities>
+					<li>Cut</li>
+				</capacities>
+				<surpriseAttack>
+					<extraMeleeDamages>
+						<li>
+							<def>Stun</def>
+							<amount>30</amount>
+						</li>
+					</extraMeleeDamages>
+				</surpriseAttack>
+				<power>80</power>
+				<cooldownTime>5.1</cooldownTime>
+				<chanceFactor>0.05</chanceFactor>
+				<armorPenetrationSharp>16.18</armorPenetrationSharp>
+				<armorPenetrationBlunt>30.438</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Horns</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>horn</label>
+				<capacities>
+					<li>Stab</li>
+				</capacities>
+				<surpriseAttack>
+					<extraMeleeDamages>
+						<li>
+							<def>Stun</def>
+							<amount>30</amount>
+						</li>
+					</extraMeleeDamages>
+				</surpriseAttack>
+				<power>43</power>
+				<cooldownTime>5.1</cooldownTime>
+				<chanceFactor>0.1</chanceFactor>
+				<armorPenetrationSharp>24.35</armorPenetrationSharp>
+				<armorPenetrationBlunt>23.438</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Horns</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>skull bash</label>
+				<capacities>
+					<li>Skull_Bash</li>
+				</capacities>
+				<surpriseAttack>
+					<extraMeleeDamages>
+						<li>
+							<def>Stun</def>
+							<amount>20</amount>
+						</li>
+					</extraMeleeDamages>
+				</surpriseAttack>
+				<power>148</power>
+				<cooldownTime>7.8</cooldownTime>
+				<chanceFactor>0.05</chanceFactor>
+				<armorPenetrationBlunt>105.469</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Horns</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>tail</label>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<surpriseAttack>
+					<extraMeleeDamages>
+						<li>
+							<def>Stun</def>
+							<amount>20</amount>
+						</li>
+					</extraMeleeDamages>
+				</surpriseAttack>
+				<power>124</power>
+				<cooldownTime>5.65</cooldownTime>
+				<chanceFactor>0.1</chanceFactor>
+				<armorPenetrationBlunt>76.531</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Tail</linkedBodyPartsGroup>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Dubs Rimatomics/Patches/Dubs Rimatomics/Apparel_Atomic.xml b/ModPatches/Dubs Rimatomics/Patches/Dubs Rimatomics/Apparel_Atomic.xml
new file mode 100644
index 0000000000..25b39db542
--- /dev/null
+++ b/ModPatches/Dubs Rimatomics/Patches/Dubs Rimatomics/Apparel_Atomic.xml	
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Radiation Suits === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RadSuitBodyBase" or defName = "Apparel_RadiationSuit"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="MopSuitBodyBase" or defName = "Apparel_RadiationSuit"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>4</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="MopSuitBodyBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="MopSuitBodyBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Radiation Masks === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RadSuitMaskBase"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingAccuracy>-0.1</AimingAccuracy>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[@Name="RadSuitMaskBase"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[@Name="RadSuitMaskBase"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RadSuitMaskBase"]/apparel/layers</xpath>
+		<value>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="RadSuitMaskBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.ApparelHediffExtension">
+				<hediff>WearingGasMask</hediff>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_RadiationMask"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.35</ArmorRating_Sharp>
+			<Bulk>4</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_RadiationMask"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="MopSuitMaskBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+			<Bulk>7</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="MopSuitMaskBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Dubs Rimatomics/Patches/Dubs Rimatomics/Atomics_Trader.xml b/ModPatches/Dubs Rimatomics/Patches/Dubs Rimatomics/Atomics_Trader.xml
new file mode 100644
index 0000000000..32e747db90
--- /dev/null
+++ b/ModPatches/Dubs Rimatomics/Patches/Dubs Rimatomics/Atomics_Trader.xml	
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="Orbital_Rimatomics"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>FSX</thingDef>
+				<countRange>
+					<min>75</min>
+					<max>300</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>Prometheum</thingDef>
+				<countRange>
+					<min>75</min>
+					<max>300</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Ammo</tradeTag>
+				<countRange>
+					<min>500</min>
+					<max>2000</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>6</min>
+					<max>11</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_MediumAmmo</tradeTag>
+				<countRange>
+					<min>70</min>
+					<max>250</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>5</min>
+					<max>10</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_HeavyAmmo</tradeTag>
+				<countRange>
+					<min>20</min>
+					<max>120</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>5</min>
+					<max>8</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Category">
+				<categoryDef>Ammo</categoryDef>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>0</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Turret</tradeTag>
+				<thingDefCountRange>
+					<min>-2</min>
+					<max>4</max>
+				</thingDefCountRange>
+				<countRange>
+					<min>1</min>
+					<max>2</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_Category">
+				<categoryDef>WeaponsTurrets</categoryDef>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>0</max>
+				</thingDefCountRange>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Dubs Rimatomics/Patches/Dubs Rimatomics/Damages_LocalInjury.xml b/ModPatches/Dubs Rimatomics/Patches/Dubs Rimatomics/Damages_LocalInjury.xml
new file mode 100644
index 0000000000..412ebf306e
--- /dev/null
+++ b/ModPatches/Dubs Rimatomics/Patches/Dubs Rimatomics/Damages_LocalInjury.xml	
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/DamageDef[defName="ArcDischarge"]</xpath>
+		<value>
+			<li Class="CombatExtended.DamageDefExtensionCE">
+				<isAmbientDamage>true</isAmbientDamage>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/DamageDef[defName="LaserDischarge"]</xpath>
+		<value>
+			<li Class="CombatExtended.DamageDefExtensionCE">
+				<harmOnlyOutsideLayers>true</harmOnlyOutsideLayers>
+				<isAmbientDamage>true</isAmbientDamage>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Dubs Rimatomics/Patches/Dubs Rimatomics/Turrets_Rimatomics.xml b/ModPatches/Dubs Rimatomics/Patches/Dubs Rimatomics/Turrets_Rimatomics.xml
new file mode 100644
index 0000000000..36ede6b75e
--- /dev/null
+++ b/ModPatches/Dubs Rimatomics/Patches/Dubs Rimatomics/Turrets_Rimatomics.xml	
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Sabots : Damage Stuff-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="Bomb_Sabot"]/defaultDamage</xpath>
+		<value>
+			<defaultDamage>200</defaultDamage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="Bomb_Sabot"]/defaultArmorPenetration</xpath>
+		<value>
+			<defaultArmorPenetration>120000</defaultArmorPenetration>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="Bomb_DUSabot"]/defaultDamage</xpath>
+		<value>
+			<defaultDamage>800</defaultDamage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="Bomb_DUSabot"]/defaultArmorPenetration</xpath>
+		<value>
+			<defaultArmorPenetration>240000</defaultArmorPenetration>
+		</value>
+	</Operation>
+
+	<!--Sabots : Projectile Tweaks-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_Sabot"]/projectile/speed</xpath>
+		<value>
+			<speed>500</speed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_Sabot_DU"]/projectile/speed</xpath>
+		<value>
+			<speed>500</speed>
+		</value>
+	</Operation>
+
+	<!--Sabots : Fire Mission Tweaks-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SabotRoundIncoming"]/skyfaller/explosionDamage</xpath>
+		<value>
+			<explosionDamage>Bomb_Sabot</explosionDamage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DUSabotRoundIncoming"]/skyfaller/explosionDamage</xpath>
+		<value>
+			<explosionDamage>Bomb_DUSabot</explosionDamage>
+		</value>
+	</Operation>
+
+	<!--Marauder : Damage Stuff-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="Bomb_PlasmaToroid"]/defaultDamage</xpath>
+		<value>
+			<defaultDamage>70</defaultDamage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="Bomb_PlasmaToroid"]/defaultArmorPenetration</xpath>
+		<value>
+			<defaultArmorPenetration>80</defaultArmorPenetration>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_PlasmaToroid"]/projectile/speed</xpath>
+		<value>
+			<speed>300</speed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Bullet_PlasmaToroid"]/projectile/damageAmountBase</xpath>
+	</Operation>
+
+	<!--Marauder : Range-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Marauder_Railgun"]/verbs/li/range</xpath>
+		<value>
+			<range>86</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Marauder_Railgun"]/EnergyWep/range</xpath>
+		<value>
+			<range>86</range>
+		</value>
+	</Operation>
+
+	<!--Turrets : Stats-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PPCMarauder" or defName="PPCRailgun"]/statBases</xpath>
+		<value>
+			<ShootingAccuracyTurret>5</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PPCMarauder"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>86</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HEL_Laser"]/EnergyWep/range</xpath>
+		<value>
+			<range>62</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HEL_Laser"]/EnergyWep/cooldownForShot</xpath>
+		<value>
+			<cooldownForShot>8</cooldownForShot>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HEL_Laser"]/verbs/li/ticksBetweenBurstShots</xpath>
+		<value>
+			<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Dumbs' Dachshunds/Patches/Dumbs' Dachshunds/ThingDefs_Dachshund.xml b/ModPatches/Dumbs' Dachshunds/Patches/Dumbs' Dachshunds/ThingDefs_Dachshund.xml
new file mode 100644
index 0000000000..c14acd54fa
--- /dev/null
+++ b/ModPatches/Dumbs' Dachshunds/Patches/Dumbs' Dachshunds/ThingDefs_Dachshund.xml	
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ERN_DachshundShorthair" or defName="ERN_DachshundLonghair" or defName="ERN_DachshundWirehair"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.17</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ERN_DachshundShorthair" or defName="ERN_DachshundLonghair" or defName="ERN_DachshundWirehair"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.62</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.62</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.66</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>0.62</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ERN_DachshundShorthair" or defName="ERN_DachshundLonghair" or defName="ERN_DachshundWirehair"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Dusk Armory/Patches/Dusk Armory/Apparel_Dusk_Armor.xml b/ModPatches/Dusk Armory/Patches/Dusk Armory/Apparel_Dusk_Armor.xml
new file mode 100644
index 0000000000..b420b64c79
--- /dev/null
+++ b/ModPatches/Dusk Armory/Patches/Dusk Armory/Apparel_Dusk_Armor.xml	
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DF_Dusk_Reactive" or defName="DF_Dusk_Mesh"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DF_Dusk_Reactive" or defName="DF_Dusk_Mesh"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>400</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DF_Dusk_Reactive" or defName="DF_Dusk_Mesh"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DF_Dusk_Reactive" or defName="DF_Dusk_Mesh"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Dusk Armory/Patches/Dusk Armory/Apparel_Dusk_Cloak.xml b/ModPatches/Dusk Armory/Patches/Dusk Armory/Apparel_Dusk_Cloak.xml
new file mode 100644
index 0000000000..fd725e6ffb
--- /dev/null
+++ b/ModPatches/Dusk Armory/Patches/Dusk Armory/Apparel_Dusk_Cloak.xml	
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DF_Dusk_Cloak" or defName="DF_Dusk_Cloak_Fur"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DF_Dusk_Cloak" or defName="DF_Dusk_Cloak_Fur"]/statBases</xpath>
+		<value>
+			<Bulk>4.5</Bulk>
+			<WornBulk>1.0</WornBulk>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Dusk Armory/Patches/Dusk Armory/Apparel_Dusk_Helmet.xml b/ModPatches/Dusk Armory/Patches/Dusk Armory/Apparel_Dusk_Helmet.xml
new file mode 100644
index 0000000000..47ef09c38f
--- /dev/null
+++ b/ModPatches/Dusk Armory/Patches/Dusk Armory/Apparel_Dusk_Helmet.xml	
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DF_Dusk_Helmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.7</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DF_Dusk_Helmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DF_Dusk_Helmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>240</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DF_Dusk_Helmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DF_Dusk_Helmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DF_Dusk_Helmet"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<PsychicSensitivity>-0.2</PsychicSensitivity>
+				<AimingAccuracy>0.15</AimingAccuracy>
+				<ToxicResistance>0.50</ToxicResistance>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+				<SocialImpact>0.10</SocialImpact>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DF_Dusk_Helmet"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>45</Plasteel>
+			<DevilstrandCloth>20</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DF_Dusk_Helmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Dusk Armory/Patches/Dusk Armory/Apparel_Dusk_Hood.xml b/ModPatches/Dusk Armory/Patches/Dusk Armory/Apparel_Dusk_Hood.xml
new file mode 100644
index 0000000000..b9628296c0
--- /dev/null
+++ b/ModPatches/Dusk Armory/Patches/Dusk Armory/Apparel_Dusk_Hood.xml	
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="DF_Hood" or @Name="DF_Hood_Fur"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Dusk Armory/Patches/Dusk Armory/Apparel_Dusk_Hooded_Helmet.xml b/ModPatches/Dusk Armory/Patches/Dusk Armory/Apparel_Dusk_Hooded_Helmet.xml
new file mode 100644
index 0000000000..55b06daec3
--- /dev/null
+++ b/ModPatches/Dusk Armory/Patches/Dusk Armory/Apparel_Dusk_Hooded_Helmet.xml	
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DF_Dusk_Helmet_Hooded"]/statBases</xpath>
+		<value>
+			<Bulk>5.5</Bulk>
+			<WornBulk>1.5</WornBulk>
+			<NightVisionEfficiency_Apparel>0.7</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DF_Dusk_Helmet_Hooded"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DF_Dusk_Helmet_Hooded" or defName="DF_Dusk_Helmet_Hooded_Fur"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>240</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DF_Dusk_Helmet_Hooded"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DF_Dusk_Helmet_Hooded"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DF_Dusk_Helmet_Hooded"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<PsychicSensitivity>-0.2</PsychicSensitivity>
+				<AimingAccuracy>0.15</AimingAccuracy>
+				<ToxicResistance>0.50</ToxicResistance>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+				<SocialImpact>0.15</SocialImpact>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DF_Dusk_Helmet_Hooded"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>45</Plasteel>
+			<DevilstrandCloth>20</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DF_Dusk_Helmet_Hooded"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DF_Dusk_Helmet_Hooded" or defName="DF_Dusk_Helmet_Hooded_Fur"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Dusk Armory/Patches/Dusk Armory/Weapons_Dusk_Melee.xml b/ModPatches/Dusk Armory/Patches/Dusk Armory/Weapons_Dusk_Melee.xml
new file mode 100644
index 0000000000..a6ad486f2f
--- /dev/null
+++ b/ModPatches/Dusk Armory/Patches/Dusk Armory/Weapons_Dusk_Melee.xml	
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--===== Dusk Kris =====-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DF_Dusk_Kris"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Dusk Kris handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<chanceFactor>0.33</chanceFactor>
+					<cooldownTime>1.34</cooldownTime>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Dusk Kris point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>31</power>
+					<cooldownTime>1.34</cooldownTime>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.2</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Dusk Kris edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.24</cooldownTime>
+					<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.6</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DF_Dusk_Kris"]/statBases</xpath>
+		<value>
+			<Bulk>3.4</Bulk>
+			<MeleeCounterParryBonus>0.45</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DF_Dusk_Kris"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.3</MeleeCritChance>
+				<MeleeParryChance>0.45</MeleeParryChance>
+				<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DF_Dusk_Kris"]/weaponTags</xpath>
+		<value>
+			<li>CE_Sidearm_Melee</li>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!--===== Dusk Razor =====-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DF_Dusk_Razor"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Dusk Razor handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.33</chanceFactor>
+					<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Dusk Razor point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.59</cooldownTime>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>3.0</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Dusk Razor edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>38</power>
+					<cooldownTime>1.46</cooldownTime>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DF_Dusk_Razor"]/statBases</xpath>
+		<value>
+			<Bulk>7.9</Bulk>
+			<MeleeCounterParryBonus>1.2</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DF_Dusk_Razor"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.73</MeleeCritChance>
+				<MeleeParryChance>0.85</MeleeParryChance>
+				<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!--===== Dusk Saw =====-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="DF_Dusk_Saw"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Dusk Saw chain</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.1</cooldownTime>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="DF_Dusk_Saw"]/statBases/Mass</xpath>
+		<value>
+			<Bulk>6.5</Bulk>
+			<Mass>5</Mass>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DF_Dusk_Saw"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.15</MeleeCritChance>
+				<MeleeParryChance>0.3</MeleeParryChance>
+				<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Dusk Armory/Patches/Dusk Armory/Weapons_Dusk_Ranged.xml b/ModPatches/Dusk Armory/Patches/Dusk Armory/Weapons_Dusk_Ranged.xml
new file mode 100644
index 0000000000..7a82a89977
--- /dev/null
+++ b/ModPatches/Dusk Armory/Patches/Dusk Armory/Weapons_Dusk_Ranged.xml	
@@ -0,0 +1,328 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--===== TOOLS FOR THE TOOL GOD =====-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DF_Dusk_Enforcer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			/Defs/ThingDef[
+			defName = "DF_Dusk_Carbine" or
+			defName = "DF_Dusk_Launcher" or
+			defName = "DF_Dusk_MAG" or
+			defName = "DF_Dusk_SMG" or
+			defName = "DF_Dusk_Striker"]/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>
+
+	<!--===== Dusk Carbine =====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DF_Dusk_Carbine</defName>
+		<statBases>
+			<Mass>3.16</Mass>
+			<Bulk>9.93</Bulk>
+			<SwayFactor>1.33</SwayFactor>
+			<ShotSpread>0.07</ShotSpread>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_9x39mmSoviet_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>DF_Shot_Dusk_Carbine</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilAmount>1.53</recoilAmount>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>60</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!--===== Dusk Enforcer =====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DF_Dusk_Enforcer</defName>
+		<statBases>
+			<Mass>1.29</Mass>
+			<Bulk>2.31</Bulk>
+			<SwayFactor>1.27</SwayFactor>
+			<ShotSpread>0.18</ShotSpread>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_500SWMagnum_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>DF_Shot_Dusk_Enforcer</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_500SWMagnum</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_Pistol</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!--===== Dusk Launcher =====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DF_Dusk_Launcher</defName>
+		<statBases>
+			<Mass>7.9</Mass>
+			<Bulk>9.9</Bulk>
+			<SwayFactor>1.8</SwayFactor>
+			<ShotSpread>0.15</ShotSpread>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.43</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>45</range>
+			<soundCast>DF_Shot_Dusk_Launcher</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>CE_AI_Launcher</li>
+			<li>EliteGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!--===== Dusk MAG =====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DF_Dusk_MAG</defName>
+		<statBases>
+			<Mass>9.11</Mass>
+			<Bulk>14.6</Bulk>
+			<SwayFactor>1.53</SwayFactor>
+			<ShotSpread>0.05</ShotSpread>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Silver>65</Silver>
+			<Plasteel>65</Plasteel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_127x55mm_FMJ</defaultProjectile>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<warmupTime>1.3</warmupTime>
+			<range>68</range>
+			<soundCast>DF_Shot_Dusk_MAG</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilAmount>1.32</recoilAmount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>250</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_127x55mm</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_MachineGun</li>
+			<li>CE_AI_Suppressive</li>
+		</weaponTags>
+	</Operation>
+
+	<!--===== Dusk SMG =====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DF_Dusk_SMG</defName>
+		<statBases>
+			<Mass>2.4</Mass>
+			<Bulk>4.4</Bulk>
+			<SwayFactor>0.94</SwayFactor>
+			<ShotSpread>0.14</ShotSpread>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Silver>35</Silver>
+			<Plasteel>35</Plasteel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_50AE_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>25</range>
+			<soundCast>DF_Shot_Dusk_SMG</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilAmount>2.08</recoilAmount>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>80</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_50AE</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!--===== Dusk Striker =====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DF_Dusk_Striker</defName>
+		<statBases>
+			<Mass>3.40</Mass>
+			<Bulk>6.6</Bulk>
+			<SwayFactor>1.26</SwayFactor>
+			<ShotSpread>0.15</ShotSpread>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Silver>60</Silver>
+			<Plasteel>60</Plasteel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>DF_Shot_Dusk_Striker</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/EPOE Forked Royalty DLC expansion/Patches/EPOE Forked Royalty DLC expansion/Bionics_Patch.xml b/ModPatches/EPOE Forked Royalty DLC expansion/Patches/EPOE Forked Royalty DLC expansion/Bionics_Patch.xml
new file mode 100644
index 0000000000..e22d232eec
--- /dev/null
+++ b/ModPatches/EPOE Forked Royalty DLC expansion/Patches/EPOE Forked Royalty DLC expansion/Bionics_Patch.xml	
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EPOE_AdvancedDrillArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>drill arm</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.88</cooldownTime>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.32</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<soundMeleeHit>MeleeHit_DrillArm</soundMeleeHit>
+					<soundMeleeMiss>MeleeMiss_DrillArm</soundMeleeMiss>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EPOE_AdvancedFieldHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>knuckle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.66</cooldownTime>
+					<armorPenetrationSharp>0.00</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<soundMeleeHit>MeleeHit_FieldHand</soundMeleeHit>
+					<soundMeleeMiss>MeleeMiss_FieldHand</soundMeleeMiss>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EPOE_AdvancedHandTalon"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>talon</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>0.99</cooldownTime>
+					<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.58</armorPenetrationSharp>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<soundMeleeHit>MeleeHit_BionicSlash</soundMeleeHit>
+					<soundMeleeMiss>MeleeMiss_BionicSlash</soundMeleeMiss>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EPOE_AdvancedHandTalon"]/stages/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<MeleeHitChance>5</MeleeHitChance>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EPOE_AdvancedElbowBlade"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.0</cooldownTime>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<soundMeleeHit>MeleeHit_BionicSlash</soundMeleeHit>
+					<soundMeleeMiss>MeleeMiss_BionicSlash</soundMeleeMiss>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EPOE_AdvancedKneeSpike"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>spike</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.0</cooldownTime>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.0</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<soundMeleeHit>MeleeHit_BionicSlash</soundMeleeHit>
+					<soundMeleeMiss>MeleeMiss_BionicSlash</soundMeleeMiss>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EPOE_ScytherHandTalon"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>talon</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.05</cooldownTime>
+					<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.36</armorPenetrationSharp>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<soundMeleeHit>MeleeHit_BionicSlash</soundMeleeHit>
+					<soundMeleeMiss>MeleeMiss_BionicSlash</soundMeleeMiss>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EPOE_ScytherHandTalon"]/stages/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<MeleeHitChance>2.5</MeleeHitChance>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EPOE_ScytherElbowBlade"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.1</cooldownTime>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<soundMeleeHit>MeleeHit_BionicSlash</soundMeleeHit>
+					<soundMeleeMiss>MeleeMiss_BionicSlash</soundMeleeMiss>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EPOE_ScytherKneeSpike"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>spike</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.1</cooldownTime>
+					<armorPenetrationBlunt>0.65</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<soundMeleeHit>MeleeHit_BionicSlash</soundMeleeHit>
+					<soundMeleeMiss>MeleeMiss_BionicSlash</soundMeleeMiss>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/EPOE Forked/Patches/EPOE Forked/Bionics_Patch.xml b/ModPatches/EPOE Forked/Patches/EPOE Forked/Bionics_Patch.xml
new file mode 100644
index 0000000000..8b2b7bc31d
--- /dev/null
+++ b/ModPatches/EPOE Forked/Patches/EPOE Forked/Bionics_Patch.xml	
@@ -0,0 +1,314 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EPOE_ScytherBlade"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>23</power>
+					<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.8</armorPenetrationSharp>
+					<cooldownTime>1.29</cooldownTime>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+					<soundMeleeHit>MeleeHit_BionicSlash</soundMeleeHit>
+					<soundMeleeMiss>MeleeMiss_BionicSlash</soundMeleeMiss>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>19</power>
+					<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.56</armorPenetrationSharp>
+					<cooldownTime>1.29</cooldownTime>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+					<soundMeleeHit>MeleeHit_BionicSlash</soundMeleeHit>
+					<soundMeleeMiss>MeleeMiss_BionicSlash</soundMeleeMiss>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="HookHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>hook hand</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>5</power>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<cooldownTime>1.26</cooldownTime>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BionicHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.11</cooldownTime>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+					<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
+					<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AdvancedBionicArm" or defName="AdvancedBionicHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.11</cooldownTime>
+					<armorPenetrationBlunt>1.988</armorPenetrationBlunt>
+					<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
+					<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="PowerArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>0.89</cooldownTime>
+					<armorPenetrationSharp>0.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+					<soundMeleeHit>Pawn_Melee_PowerClaw_Hit</soundMeleeHit>
+					<soundMeleeMiss>Pawn_Melee_PowerClaw_Miss</soundMeleeMiss>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AdvancedPowerArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>0.89</cooldownTime>
+					<armorPenetrationSharp>0.96</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.75</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+					<soundMeleeHit>Pawn_Melee_PowerClaw_Hit</soundMeleeHit>
+					<soundMeleeMiss>Pawn_Melee_PowerClaw_Miss</soundMeleeMiss>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="TacticalCorneaImplant" or defName="EPIA_TacticalBionicEye"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="TacticalCorneaImplant" or defName="EPIA_TacticalBionicEye"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<AimingAccuracy>0.5</AimingAccuracy>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EPIA_AuxiliaryAI_Sharpshooter"]/stages/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ShootingAccuracyPawn>+3</ShootingAccuracyPawn>
+				<AimingAccuracy>+1.5</AimingAccuracy>
+				<AimingDelayFactor>0.20</AimingDelayFactor>
+				<MeleeHitChance>-3</MeleeHitChance>
+				<MeleeCritChance>-0.15</MeleeCritChance>
+				<MeleeParryChance>-0.15</MeleeParryChance>
+				<MeleeDodgeChance>-0.15</MeleeDodgeChance>
+			</statOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EPIA_AuxiliaryAI_Commando"]/stages/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ShootingAccuracyPawn>+1</ShootingAccuracyPawn>
+				<AimingAccuracy>0.5</AimingAccuracy>
+				<AimingDelayFactor>-0.15</AimingDelayFactor>
+				<MentalBreakThreshold>-0.06</MentalBreakThreshold>
+				<Suppressability>-0.50</Suppressability>
+			</statOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EPIA_AuxiliaryAI_Brawler"]/stages/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ShootingAccuracyPawn>-1.2</ShootingAccuracyPawn>
+				<AimingAccuracy>-0.6</AimingAccuracy>
+				<MentalBreakThreshold>-0.14</MentalBreakThreshold>
+				<MeleeHitChance>8</MeleeHitChance>
+				<MeleeCritChance>0.50</MeleeCritChance>
+				<MeleeParryChance>0.50</MeleeParryChance>
+				<MeleeDodgeChance>0.50</MeleeDodgeChance>
+				<Suppressability>-1</Suppressability>
+			</statOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EPOE_InstinctOptimizedEyes"]/stages/li[minSeverity="0.99"]/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/HediffDef[defName="EPOE_InstinctOptimizedEyes"]/stages/li[minSeverity="0.99"]/statOffsets/MeleeCritChance</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/HediffDef[defName="EPOE_InstinctOptimizedEyes"]/stages/li[minSeverity="0.99"]/statOffsets</xpath>
+			<value>
+				<MeleeCritChance>0.075</MeleeCritChance>
+				<MeleeParryChance>0.075</MeleeParryChance>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/HediffDef[defName="EPOE_InstinctOptimizedEyes"]/stages/li[minSeverity="0.99"]/statOffsets</xpath>
+			<value>
+			</value>
+		</match>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EPOE_InstinctOptimizedEyes"]/stages/li[label="Optimizing"]/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<AimingAccuracy>0.1</AimingAccuracy>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EPOE_InstinctOptimizedEyes"]/stages/li[minSeverity="0.99"]/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<AimingAccuracy>0.25</AimingAccuracy>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/HediffDef[defName="EPOE_InstinctOptimizedHand"]/stages/li[label="Optimizing"]/statOffsets/MeleeCritChance</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/HediffDef[defName="EPOE_InstinctOptimizedHand"]/stages/li[label="Optimizing"]/statOffsets</xpath>
+			<value>
+				<MeleeCritChance>0.15</MeleeCritChance>
+				<MeleeParryChance>0.15</MeleeParryChance>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/HediffDef[defName="EPOE_InstinctOptimizedHand"]/stages/li[label="Optimizing"]/statOffsets</xpath>
+			<value>
+			</value>
+		</match>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/HediffDef[defName="EPOE_InstinctOptimizedHand"]/stages/li[minSeverity="0.99"]/statOffsets/MeleeCritChance</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/HediffDef[defName="EPOE_InstinctOptimizedHand"]/stages/li[minSeverity="0.99"]/statOffsets</xpath>
+			<value>
+				<MeleeCritChance>0.25</MeleeCritChance>
+				<MeleeParryChance>0.25</MeleeParryChance>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/HediffDef[defName="EPOE_InstinctOptimizedHand"]/stages/li[minSeverity="0.99"]/statOffsets</xpath>
+			<value>
+			</value>
+		</match>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EPOE_InstinctOptimizedFoot"]/stages/li[label="Optimizing"]/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.075</MeleeDodgeChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EPOE_InstinctOptimizedFoot"]/stages/li[minSeverity="0.99"]/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="SimpleProstheticHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Jaws -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AdvancedBionicJaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.25</cooldownTime>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BionicJaw" or defName="SilentJaw" or defName="HydraulicJaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.25</cooldownTime>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.0</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/EPOE/Patches/EPOE/Bionics.xml b/ModPatches/EPOE/Patches/EPOE/Bionics.xml
new file mode 100644
index 0000000000..bb43eb8443
--- /dev/null
+++ b/ModPatches/EPOE/Patches/EPOE/Bionics.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Basic prosthetics ========== -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/HediffDef[defName="SteelArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="WoodenHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>hook hand</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>5</power>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<cooldownTime>1.26</cooldownTime>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Simple prosthetics ========== -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/HediffDef[defName="SimpleProstheticHand" or defName="SimpleProstheticArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]</xpath>
+	</Operation>
+
+	<!-- ========== Bionics ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BionicHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>bionic fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+					<cooldownTime>1.66</cooldownTime>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="PowerArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>bionic fist</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>9</power>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<cooldownTime>1.66</cooldownTime>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Advanced Bionics ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AdvancedPowerArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>bionic fist</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>22</power>
+					<armorPenetrationBlunt>4.75</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.96</armorPenetrationSharp>
+					<cooldownTime>0.76</cooldownTime>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AdvancedBionicArm" or defName="AdvancedBionicHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>bionic fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<cooldownTime>0.83</cooldownTime>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ESCP - Spriggans/Patches/ESCP - Spriggans/ESCP_BodyDefs_Spriggan.xml b/ModPatches/ESCP - Spriggans/Patches/ESCP - Spriggans/ESCP_BodyDefs_Spriggan.xml
new file mode 100644
index 0000000000..f62f0b479a
--- /dev/null
+++ b/ModPatches/ESCP - Spriggans/Patches/ESCP - Spriggans/ESCP_BodyDefs_Spriggan.xml	
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Bipedal -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="ECP_Spriggan"]//*[
+			def="Body" or
+			def="Ear" or
+			def="Nose" or
+			def="Neck" or
+			def="Leg"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="ECP_Spriggan"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Head" or
+			def="Ear" or
+			def="Nose" or
+			def="AnimalJaw" or
+			def="Shoulder" or
+			def="Arm" or
+			def="Hand" or
+			def="FrontClaw" or
+			def="Leg" or
+			def="Foot"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ESCP - Spriggans/Patches/ESCP - Spriggans/ESCP_Projectiles_Spriggan.xml b/ModPatches/ESCP - Spriggans/Patches/ESCP - Spriggans/ESCP_Projectiles_Spriggan.xml
new file mode 100644
index 0000000000..fd44d6b34e
--- /dev/null
+++ b/ModPatches/ESCP - Spriggans/Patches/ESCP - Spriggans/ESCP_Projectiles_Spriggan.xml	
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Spriggan Fireball -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ESCP_SprigganFireball"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.BulletCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ESCP_SprigganFireball"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>Flame</damageDef>
+				<damageAmountBase>10</damageAmountBase>
+				<speed>50</speed>
+				<ai_IsIncendiary>true</ai_IsIncendiary>
+			</projectile>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ESCP - Spriggans/Patches/ESCP - Spriggans/ESCP_Spriggan_Scenario.xml b/ModPatches/ESCP - Spriggans/Patches/ESCP - Spriggans/ESCP_Spriggan_Scenario.xml
new file mode 100644
index 0000000000..cc293f7133
--- /dev/null
+++ b/ModPatches/ESCP - Spriggans/Patches/ESCP - Spriggans/ESCP_Spriggan_Scenario.xml	
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="ESCP_SprigganScenario"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_Arrow_Stone</thingDef>
+				<count>100</count>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ESCP - Spriggans/Patches/ESCP - Spriggans/ESCP_ThingDef_Spriggan.xml b/ModPatches/ESCP - Spriggans/Patches/ESCP - Spriggans/ESCP_ThingDef_Spriggan.xml
new file mode 100644
index 0000000000..50ba684b5d
--- /dev/null
+++ b/ModPatches/ESCP - Spriggans/Patches/ESCP - Spriggans/ESCP_ThingDef_Spriggan.xml	
@@ -0,0 +1,581 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Spriggan Base -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="ESCP_SprigganThingBase"]/tools</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="ESCP_SprigganThingBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Spriggan and Anima Spriggan -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ESCP_Spriggan" or defName="ESCP_Spriggan_Anima" or defName="ESCP_Spriggan_Parasol"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.33</MeleeCritChance>
+			<MeleeParryChance>0.33</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ESCP_Spriggan" or defName="ESCP_Spriggan_Anima" or defName="ESCP_Spriggan_Parasol"]</xpath>
+		<value>
+			<tools Inherit="False">
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.7</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>14</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.7</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>14</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Spriggan Bog -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ESCP_Spriggan_Bog"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.33</MeleeCritChance>
+			<MeleeParryChance>0.33</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ESCP_Spriggan_Bog"]/tools</xpath>
+		<value>
+			<tools Inherit="False">
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>ScratchToxic</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.7</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>14</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>ScratchToxic</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.7</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>14</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Burnt Spriggan -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ESCP_Spriggan_Burnt"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.33</MeleeCritChance>
+			<MeleeParryChance>0.33</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ESCP_Spriggan_Burnt"]/tools</xpath>
+		<value>
+			<tools Inherit="False">
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.7</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>10</amount>
+							<chance>0.2</chance>
+						</li>
+					</extraMeleeDamages>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>14</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.7</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>10</amount>
+							<chance>0.2</chance>
+						</li>
+					</extraMeleeDamages>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>14</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ESCP_Spriggan_Burnt"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>ESCP_SprigganFireball</defaultProjectile>
+					<warmupTime>1.8</warmupTime>
+					<range>19.9</range>
+					<minRange>2</minRange>
+					<soundCast>ESCP_Spriggan_Fireball</soundCast>
+					<muzzleFlashScale>9</muzzleFlashScale>
+					<label>spriggan fireball</label>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Spriggan Earth Mother -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ESCP_Spriggan_EarthMother"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.58</MeleeCritChance>
+			<MeleeParryChance>0.66</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ESCP_Spriggan_EarthMother"]/tools</xpath>
+		<value>
+			<tools Inherit="False">
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>17</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Blunt</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>17</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.9</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>17</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Spriggan Matron -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ESCP_Spriggan_Matron"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.58</MeleeCritChance>
+			<MeleeParryChance>0.66</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ESCP_Spriggan_Matron"]/tools</xpath>
+		<value>
+			<tools Inherit="False">
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>17</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Blunt</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>17</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.9</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>17</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Spriggan Thorny -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ESCP_Spriggan_Thorni"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.33</MeleeCritChance>
+			<MeleeParryChance>0.33</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ESCP_Spriggan_Thorni"]/tools</xpath>
+		<value>
+			<tools Inherit="False">
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Spriggan Tundra -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ESCP_Spriggan_Tundra"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.33</MeleeCritChance>
+			<MeleeParryChance>0.33</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ESCP_Spriggan_Tundra"]/tools</xpath>
+		<value>
+			<tools Inherit="False">
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.7</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>14</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.7</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>14</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ESCP - Trolls/Patches/ESCP - Trolls/ESCP_BodyDefs_Trolls.xml b/ModPatches/ESCP - Trolls/Patches/ESCP - Trolls/ESCP_BodyDefs_Trolls.xml
new file mode 100644
index 0000000000..b8574df36a
--- /dev/null
+++ b/ModPatches/ESCP - Trolls/Patches/ESCP - Trolls/ESCP_BodyDefs_Trolls.xml	
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Bipedal -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="ESCP_Troll"]//*[
+			def="Body" or
+			def="Ear" or
+			def="Nose" or
+			def="Neck" or
+			def="Leg"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="ESCP_Troll"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Head" or
+			def="Ear" or
+			def="Nose" or
+			def="AnimalJaw" or
+			def="Shoulder" or
+			def="Arm" or
+			def="Hand" or
+			def="FrontClaw" or
+			def="Leg" or
+			def="Foot"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="ESCP_TrollTusked"]//*[
+			def="Body" or
+			def="Ear" or
+			def="Nose" or
+			def="Neck" or
+			def="Leg"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="ESCP_TrollTusked"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Head" or
+			def="Ear" or
+			def="Nose" or
+			def="AnimalJaw" or
+			def="Tusk" or
+			def="Shoulder" or
+			def="Arm" or
+			def="Hand" or
+			def="FrontClaw" or
+			def="Leg" or
+			def="Foot"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ESCP - Trolls/Patches/ESCP - Trolls/ESCP_Hediff_TrollAffliction.xml b/ModPatches/ESCP - Trolls/Patches/ESCP - Trolls/ESCP_Hediff_TrollAffliction.xml
new file mode 100644
index 0000000000..d7734b0800
--- /dev/null
+++ b/ModPatches/ESCP - Trolls/Patches/ESCP - Trolls/ESCP_Hediff_TrollAffliction.xml	
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ESCP_AfflictedTroll"]/stages/li[1]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ESCP_AfflictedTroll"]/stages/li[1]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ESCP - Trolls/Patches/ESCP - Trolls/ESCP_Item_TrollLeather.xml b/ModPatches/ESCP - Trolls/Patches/ESCP - Trolls/ESCP_Item_TrollLeather.xml
new file mode 100644
index 0000000000..cf8ff6974d
--- /dev/null
+++ b/ModPatches/ESCP - Trolls/Patches/ESCP - Trolls/ESCP_Item_TrollLeather.xml	
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ESCP_GrahlTusk -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="ESCP_GrahlTusk"]/tools</xpath>
+	</Operation>
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="ESCP_GrahlTusk"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>ResourceBase</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ESCP_GrahlTusk"]/description</xpath>
+		<value>
+			<description>A grahl's tusk. It is very durable and valuable. While somewhat unwieldy as a melee weapon, it can still be deadly. Traders and collectors might pay a high price for this.</description>
+		</value>
+	</Operation>
+
+	<!-- ESCP_UderfrykteTusk -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="ESCP_UderfrykteTusk"]/tools</xpath>
+	</Operation>
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="ESCP_UderfrykteTusk"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>ResourceBase</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ESCP_UderfrykteTusk"]/description</xpath>
+		<value>
+			<description>An udyrfrykte 's tusk. It is very durable and valuable, and works reasonably well as a weapon.</description>
+		</value>
+	</Operation>
+
+	<!--Trolls -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ESCP_Leather_LightTroll"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.07</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ESCP_Leather_LightTroll"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.056</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!--Big Troll -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ESCP_Leather_HeavyTroll"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.09</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ESCP_Leather_HeavyTroll"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.06</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!--Grahl -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ESCP_Leather_Grahl"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.11</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ESCP_Leather_Grahl"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.064</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ESCP - Trolls/Patches/ESCP - Trolls/ESCP_Item_TrollTusk.xml b/ModPatches/ESCP - Trolls/Patches/ESCP - Trolls/ESCP_Item_TrollTusk.xml
new file mode 100644
index 0000000000..f12992405c
--- /dev/null
+++ b/ModPatches/ESCP - Trolls/Patches/ESCP - Trolls/ESCP_Item_TrollTusk.xml	
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ESCP_GrahlTusk -->
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="ESCP_GrahlTusk"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>ResourceBase</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ESCP_GrahlTusk"]/description</xpath>
+		<value>
+			<description>A grahl's tusk. It is very durable and valuable. While somewhat unwieldy as a melee weapon, it can still be deadly. Traders and collectors might pay a high price for this.</description>
+		</value>
+	</Operation>
+
+	<!-- ESCP_UderfrykteTusk -->
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="ESCP_UderfrykteTusk"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>ResourceBase</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ESCP_UderfrykteTusk"]/description</xpath>
+		<value>
+			<description>An udyrfrykte 's tusk. It is very durable and valuable, and works reasonably well as a weapon.</description>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ESCP - Trolls/Patches/ESCP - Trolls/ESCP_ThingDef_Trolls.xml b/ModPatches/ESCP - Trolls/Patches/ESCP - Trolls/ESCP_ThingDef_Trolls.xml
new file mode 100644
index 0000000000..0dc24c73e7
--- /dev/null
+++ b/ModPatches/ESCP - Trolls/Patches/ESCP - Trolls/ESCP_ThingDef_Trolls.xml	
@@ -0,0 +1,1387 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Tier 1 Trolls -->
+	<!-- Barren Troll -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollBarren"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.33</MeleeCritChance>
+			<MeleeParryChance>0.33</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollBarren"]</xpath>
+		<value>
+			<tools Inherit="False">
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.7</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>14</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.7</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>14</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.95</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollBarren"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Forest Troll -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollForest"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.33</MeleeCritChance>
+			<MeleeParryChance>0.33</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollForest"]</xpath>
+		<value>
+			<tools Inherit="False">
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.7</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>14</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.7</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>14</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.95</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollForest"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Pygmy Troll -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollPygmy"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.33</MeleeCritChance>
+			<MeleeParryChance>0.33</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollPygmy"]</xpath>
+		<value>
+			<tools Inherit="False">
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollPygmy"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Swamp Troll -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollSwamp"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.33</MeleeCritChance>
+			<MeleeParryChance>0.33</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollSwamp"]</xpath>
+		<value>
+			<tools Inherit="False">
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.7</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>14</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.7</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>14</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.95</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollSwamp"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Fungal Troll -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollFungal"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.33</MeleeCritChance>
+			<MeleeParryChance>0.33</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollFungal"]</xpath>
+		<value>
+			<tools Inherit="False">
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.7</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>14</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.7</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>14</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.95</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollFungal"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Boom Troll -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollBoom"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.33</MeleeCritChance>
+			<MeleeParryChance>0.33</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollBoom"]</xpath>
+		<value>
+			<tools Inherit="False">
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.7</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>14</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.7</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>14</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.95</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollBoom"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Coastal Troll -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollCoastal"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.33</MeleeCritChance>
+			<MeleeParryChance>0.33</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollCoastal"]</xpath>
+		<value>
+			<tools Inherit="False">
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.7</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>14</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.7</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>14</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.95</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollCoastal"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Tier 2 Trolls -->
+	<!-- Frost Troll -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollFrost"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.58</MeleeCritChance>
+			<MeleeParryChance>0.66</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollFrost"]</xpath>
+		<value>
+			<tools Inherit="False">
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>17</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Blunt</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>17</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.9</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>17</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollFrost"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Hill Troll -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollHill"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.58</MeleeCritChance>
+			<MeleeParryChance>0.66</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollHill"]</xpath>
+		<value>
+			<tools Inherit="False">
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>17</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Blunt</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>17</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.9</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>17</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollHill"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- River Troll -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollRiver"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.58</MeleeCritChance>
+			<MeleeParryChance>0.66</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollRiver"]</xpath>
+		<value>
+			<tools Inherit="False">
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>17</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Blunt</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>17</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.9</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>17</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollRiver"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Cave Troll -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollCave"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.58</MeleeCritChance>
+			<MeleeParryChance>0.66</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollCave"]</xpath>
+		<value>
+			<tools Inherit="False">
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>17</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Blunt</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>17</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.9</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>17</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollCave"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Anima Troll -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollAnima"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.58</MeleeCritChance>
+			<MeleeParryChance>0.66</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollAnima"]</xpath>
+		<value>
+			<tools Inherit="False">
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>17</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Blunt</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>17</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.9</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>17</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollAnima"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Tier 3 Trolls -->
+	<!-- Grahl Troll -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollGrahl"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>31</power>
+					<cooldownTime>1.65</cooldownTime>
+					<chanceFactor>0.7</chanceFactor>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>2.25</cooldownTime>
+					<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>18</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>31</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.9</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.5</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollGrahl"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollGrahl"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.22</MeleeDodgeChance>
+			<MeleeCritChance>0.58</MeleeCritChance>
+			<MeleeParryChance>0.99</MeleeParryChance>
+		</value>
+	</Operation>
+	<!-- Udyrfrykte Troll -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollUdyrfrykte"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.45</cooldownTime>
+					<chanceFactor>0.7</chanceFactor>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>17</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>18</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>16</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Blunt</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>17</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.5</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollUdyrfrykte"]/race</xpath>
+		<value>
+			<baseHealthScale>2</baseHealthScale>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollUdyrfrykte"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ESCP_TrollUdyrfrykte"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.22</MeleeDodgeChance>
+			<MeleeCritChance>0.58</MeleeCritChance>
+			<MeleeParryChance>0.99</MeleeParryChance>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ESCP - Trolls/Patches/ESCP - Trolls/Mods/ESCP_BioTechTrolls.xml b/ModPatches/ESCP - Trolls/Patches/ESCP - Trolls/Mods/ESCP_BioTechTrolls.xml
new file mode 100644
index 0000000000..6e8707424b
--- /dev/null
+++ b/ModPatches/ESCP - Trolls/Patches/ESCP - Trolls/Mods/ESCP_BioTechTrolls.xml	
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!-- Toxic Troll -->
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="ESCP_TrollToxi"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.2</MeleeDodgeChance>
+						<MeleeCritChance>0.58</MeleeCritChance>
+						<MeleeParryChance>0.66</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="ESCP_TrollToxi"]</xpath>
+					<value>
+						<tools Inherit="False">
+							<li Class="CombatExtended.ToolCE">
+								<label>left claw</label>
+								<capacities>
+									<li>Scratch</li>
+								</capacities>
+								<power>26</power>
+								<cooldownTime>1.6</cooldownTime>
+								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>14</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>2.4</armorPenetrationSharp>
+								<armorPenetrationBlunt>17</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>right claw</label>
+								<capacities>
+									<li>Scratch</li>
+									<li>Blunt</li>
+								</capacities>
+								<power>26</power>
+								<cooldownTime>1.6</cooldownTime>
+								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>14</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>2.4</armorPenetrationSharp>
+								<armorPenetrationBlunt>17</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<capacities>
+									<li>Bite</li>
+								</capacities>
+								<power>24</power>
+								<cooldownTime>1.9</cooldownTime>
+								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+								<chanceFactor>0.7</chanceFactor>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>14</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>2.8</armorPenetrationSharp>
+								<armorPenetrationBlunt>17</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>8</power>
+								<cooldownTime>2</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>1</armorPenetrationBlunt>
+								<chanceFactor>0.2</chanceFactor>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="ESCP_TrollToxi"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Humanoid</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<!-- Haemo Troll -->
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="ESCP_TrollHaemo"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.2</MeleeDodgeChance>
+						<MeleeCritChance>0.58</MeleeCritChance>
+						<MeleeParryChance>0.66</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="ESCP_TrollHaemo"]</xpath>
+					<value>
+						<tools Inherit="False">
+							<li Class="CombatExtended.ToolCE">
+								<label>left claw</label>
+								<capacities>
+									<li>Scratch</li>
+								</capacities>
+								<power>26</power>
+								<cooldownTime>1.6</cooldownTime>
+								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>14</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>2.4</armorPenetrationSharp>
+								<armorPenetrationBlunt>17</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>right claw</label>
+								<capacities>
+									<li>Scratch</li>
+									<li>Blunt</li>
+								</capacities>
+								<power>26</power>
+								<cooldownTime>1.6</cooldownTime>
+								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>14</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>2.4</armorPenetrationSharp>
+								<armorPenetrationBlunt>17</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<capacities>
+									<li>Bite</li>
+								</capacities>
+								<power>24</power>
+								<cooldownTime>1.9</cooldownTime>
+								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+								<chanceFactor>0.7</chanceFactor>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>14</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>2.8</armorPenetrationSharp>
+								<armorPenetrationBlunt>17</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>8</power>
+								<cooldownTime>2</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>1</armorPenetrationBlunt>
+								<chanceFactor>0.2</chanceFactor>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="ESCP_TrollHaemo"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Humanoid</bodyShape>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Eccentric Militor/Defs/Eccentric Militor/Eccentric_Militor_Ammo.xml b/ModPatches/Eccentric Militor/Defs/Eccentric Militor/Eccentric_Militor_Ammo.xml
new file mode 100644
index 0000000000..a0cf8d8548
--- /dev/null
+++ b/ModPatches/Eccentric Militor/Defs/Eccentric Militor/Eccentric_Militor_Ammo.xml	
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- Double Barrel Ammo Set -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_12Gauge_Eccentric_Militor_Double</defName>
+		<label>12 Gauge</label>
+		<ammoTypes>
+			<Ammo_12Gauge_Buck>Bullet_12Gauge_Eccentric_Militor_Double_Buck</Ammo_12Gauge_Buck>
+			<Ammo_12Gauge_Slug>Bullet_12Gauge_Eccentric_Militor_Double_Slug</Ammo_12Gauge_Slug>
+			<Ammo_12Gauge_Beanbag>Bullet_12Gauge_Eccentric_Militor_Double_Beanbag</Ammo_12Gauge_Beanbag>
+			<Ammo_12Gauge_ElectroSlug>Bullet_12Gauge_Eccentric_Militor_Double_ElectroSlug</Ammo_12Gauge_ElectroSlug>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- Double Barrel Fire -->
+	<ThingDef ParentName="Base12GaugeBullet">
+		<defName>Bullet_12Gauge_Eccentric_Militor_Double_Buck</defName>
+		<label>buckshot pellet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shotgun_Pellet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>8</damageAmountBase>
+			<pelletCount>18</pelletCount><!-- Twice the usual number of buckshot pellets -->
+			<armorPenetrationSharp>4</armorPenetrationSharp>
+			<armorPenetrationBlunt>4.52</armorPenetrationBlunt>
+			<spreadMult>17.8</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base12GaugeBullet">
+		<defName>Bullet_12Gauge_Eccentric_Militor_Double_Slug</defName>
+		<label>shotgun slug</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>106</speed>
+			<damageAmountBase>28</damageAmountBase>
+			<pelletCount>2</pelletCount><!-- Double slugs -->
+			<armorPenetrationSharp>6</armorPenetrationSharp>
+			<armorPenetrationBlunt>85.2</armorPenetrationBlunt>
+			<casingMoteDefname>Fleck_ShotgunShell_Green</casingMoteDefname>
+			<casingFilthDefname>Filth_ShotgunAmmoCasings_Green</casingFilthDefname>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base12GaugeBullet">
+		<defName>Bullet_12Gauge_Eccentric_Militor_Double_Beanbag</defName>
+		<label>beanbag</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>30</speed>
+			<damageDef>Beanbag</damageDef>
+			<damageAmountBase>9</damageAmountBase>
+			<pelletCount>2</pelletCount><!-- Double beanbags -->
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>3.240</armorPenetrationBlunt>
+			<spreadMult>2</spreadMult>
+			<casingMoteDefname>Fleck_ShotgunShell_White</casingMoteDefname>
+			<casingFilthDefname>Filth_ShotgunAmmoCasings_White</casingFilthDefname>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base12GaugeBullet">
+		<defName>Bullet_12Gauge_Eccentric_Militor_Double_ElectroSlug</defName>
+		<label>EMP slug</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<color>(68,210,215)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>EMP</damageDef>
+			<speed>43</speed>
+			<damageAmountBase>12</damageAmountBase>
+			<pelletCount>2</pelletCount><!-- Double EMP slugs -->
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+			<empShieldBreakChance>0.2</empShieldBreakChance>
+			<casingMoteDefname>Fleck_ShotgunShell_Black</casingMoteDefname>
+			<casingFilthDefname>Filth_ShotgunAmmoCasings_Black</casingFilthDefname>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Eccentric Militor/Patches/Eccentric Militor/Eccentric_Militor_Ability.xml b/ModPatches/Eccentric Militor/Patches/Eccentric Militor/Eccentric_Militor_Ability.xml
new file mode 100644
index 0000000000..62dd96ba3b
--- /dev/null
+++ b/ModPatches/Eccentric Militor/Patches/Eccentric Militor/Eccentric_Militor_Ability.xml	
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Jolly Militor -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AbilityDef[defName="JollyLauncher_Militor"]/comps/li[@Class="CompProperties_AbilityLaunchProjectile"]/projectileDef</xpath>
+		<value>
+			<projectileDef>Bullet_30x29mmGrenade_HE</projectileDef>
+		</value>
+	</Operation>
+
+	<!-- Holy Blades -->
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="HolyBlade"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>BaseBulletCE</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HolyBlade"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<damageDef>HolyFire_Greater</damageDef>
+				<damageAmountBase>17.0</damageAmountBase>
+				<armorPenetrationSharp>25.5</armorPenetrationSharp>
+				<armorPenetrationBlunt>1</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Eccentric Militor/Patches/Eccentric Militor/Eccentric_Militor_Building.xml b/ModPatches/Eccentric Militor/Patches/Eccentric Militor/Eccentric_Militor_Building.xml
new file mode 100644
index 0000000000..c5e1a8b910
--- /dev/null
+++ b/ModPatches/Eccentric Militor/Patches/Eccentric Militor/Eccentric_Militor_Building.xml	
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Mini-turret ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_DualBarreledChristmasTurret"]/comps/li[@Class="CompProperties_Power"]/basePowerConsumption</xpath>
+		<value>
+			<basePowerConsumption>120</basePowerConsumption>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_DualBarreledChristmasTurret"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Turret_DualBarreledChristmasTurret"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.25</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_DualBarreledChristmasTurret"]/statBases/ShootingAccuracyTurret</xpath>
+		<value>
+			<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_DualBarreledChristmasTurret"]/statBases/Mass</xpath>
+		<value>
+			<Mass>25</Mass>
+			<Bulk>15</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Turret_DualBarreledChristmasTurret"]/comps/li[@Class="CompProperties_Explosive"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Turret_DualBarreledChristmasTurret"]/comps/li[@Class="CompProperties_Refuelable"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_DualBarreledChristmasTurret"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_DualBarreledChristmasTurret"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>1.0</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<!-- Add trade tags -->
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Turret_DualBarreledChristmasTurret"]/tradeTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Turret_DualBarreledChristmasTurret"]</xpath>
+			<value>
+				<tradeTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Turret_DualBarreledChristmasTurret"]/tradeTags</xpath>
+		<value>
+			<li>CE_Turret</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_DualBarrelledTurret</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.32</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.3</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>2.1</warmupTime>
+			<range>54</range>
+			<burstShotCount>25</burstShotCount>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>250</magazineSize>
+			<reloadTime>9.2</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags Inherit="False">
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Eccentric Militor/Patches/Eccentric Militor/Eccentric_Militor_Races.xml b/ModPatches/Eccentric Militor/Patches/Eccentric Militor/Eccentric_Militor_Races.xml
new file mode 100644
index 0000000000..d5b79c331d
--- /dev/null
+++ b/ModPatches/Eccentric Militor/Patches/Eccentric Militor/Eccentric_Militor_Races.xml	
@@ -0,0 +1,295 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Eccentric Militor Base -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[@Name="EccentricMilitorKind"]/combatPower</xpath>
+		<value>
+			<combatPower>60</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="EccentricMilitor"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="EccentricMilitor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="EccentricMilitor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="EccentricMilitor"]/statBases</xpath>
+		<value>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.04</MeleeCritChance>
+			<MeleeParryChance>0.04</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="EccentricMilitor"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[@Name="EccentricMilitor"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[@Name="EccentricMilitor"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="EccentricMilitor"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>700</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>70</MaxOverHeal>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Militor Ammo Loadout -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+		defName="Mech_ArchotechMilitor" or
+		defName="Mech_BochiMilitor" or
+		defName="Mech_ChickenCrusaderMilitor" or
+		defName="Mech_EasterBunnyMilitor" or
+		defName="Mech_GuraMilitor" or
+		defName="Mech_JorisMilitor" or
+		defName="Mech_KnightMilitor"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Mech_PMCSantaMilitor"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>20</min>
+					<max>30</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Mini Mechs -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Mech_ChristmasUrchin"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>3</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Mech_ChristmasUrchin"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Inventory"/>
+			<li Class="CombatExtended.CompProperties_TacticalManager"/>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[
+		defName="Mech_ChristmasUrchin" or
+		defName="Mech_MiniShark" or
+		defName="Mech_MiniChicken"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Vehicle</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+		defName="Mech_ChristmasUrchin" or
+		defName="Mech_MiniShark" or
+		defName="Mech_MiniChicken"]/statBases/ArmorRating_Blunt
+		</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+		defName="Mech_ChristmasUrchin" or
+		defName="Mech_MiniShark" or
+		defName="Mech_MiniChicken"]/statBases/ArmorRating_Sharp
+		</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+		defName="Mech_ChristmasUrchin" or
+		defName="Mech_MiniShark" or
+		defName="Mech_MiniChicken"]/statBases
+		</xpath>
+		<value>
+			<CarryWeight>30</CarryWeight>
+			<CarryBulk>15</CarryBulk>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.04</MeleeCritChance>
+			<MeleeParryChance>0.04</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+		defName="Mech_ChristmasUrchin" or
+		defName="Mech_MiniShark"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>16</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_MiniChicken"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>peck</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>3.0</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>8.0</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Mech_ChristmasUrchin"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Mech_ChristmasUrchin"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Mech_MiniShark"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Mech_MiniShark"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Mech_MiniChicken"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Mech_MiniChicken"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+		defName="Mech_ChristmasUrchin" or
+		defName="Mech_MiniShark" or
+		defName="Mech_MiniChicken"]/comps
+		</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>700</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>70</MaxOverHeal>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Eccentric Militor/Patches/Eccentric Militor/Eccentric_Militor_Weapons.xml b/ModPatches/Eccentric Militor/Patches/Eccentric Militor/Eccentric_Militor_Weapons.xml
new file mode 100644
index 0000000000..0a0dba375c
--- /dev/null
+++ b/ModPatches/Eccentric Militor/Patches/Eccentric Militor/Eccentric_Militor_Weapons.xml	
@@ -0,0 +1,327 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Archotech Shotgun ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_ArchotechShotgun</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>0.53</SwayFactor>
+			<Bulk>7.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.42</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_410Bore_Buck</defaultProjectile>
+			<warmupTime>0.8</warmupTime>
+			<range>14</range>
+			<soundCast>Shot_Shotgun_NoRack</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>6</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_410Bore</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Bochi Shotgun ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_BochiShotgun</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>0.53</SwayFactor>
+			<Bulk>7.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.42</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_410Bore_Buck</defaultProjectile>
+			<warmupTime>0.8</warmupTime>
+			<range>14</range>
+			<soundCast>Shot_Shotgun_NoRack</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>6</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_410Bore</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Carrot Shotgun ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_CarrotShotgun</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>0.53</SwayFactor>
+			<Bulk>7.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.42</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_410Bore_Buck</defaultProjectile>
+			<warmupTime>0.8</warmupTime>
+			<range>14</range>
+			<soundCast>Shot_Shotgun_NoRack</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>6</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_410Bore</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Cluck Shotgun ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_CluckShotgun</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>0.53</SwayFactor>
+			<Bulk>7.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.42</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_410Bore_Buck</defaultProjectile>
+			<warmupTime>0.8</warmupTime>
+			<range>14</range>
+			<soundCast>Shot_Shotgun_NoRack</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>6</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_410Bore</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Shark Shotgun ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SharkShotgun</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>0.53</SwayFactor>
+			<Bulk>7.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.42</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_410Bore_Buck</defaultProjectile>
+			<warmupTime>0.8</warmupTime>
+			<range>14</range>
+			<soundCast>Shot_Shotgun_NoRack</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>6</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_410Bore</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Knight Shotgun ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_KnightShotgun</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>0.53</SwayFactor>
+			<Bulk>7.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.42</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_410Bore_Buck</defaultProjectile>
+			<warmupTime>0.8</warmupTime>
+			<range>14</range>
+			<soundCast>Shot_Shotgun_NoRack</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>6</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_410Bore</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== RimRim Shotgun ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_RimRimShotgun</defName>
+		<statBases>
+			<Mass>3.50</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.26</SwayFactor>
+			<Bulk>6.7</Bulk>
+			<SightsEfficiency>1</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.54</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>Shot_Shotgun_NoRack</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Santa's DoubleBarrel Shotgun ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SantasDoubleBarrel</defName>
+		<statBases>
+			<Mass>1.90</Mass>
+			<RangedWeapon_Cooldown>0.93</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>2.73</SwayFactor>
+			<Bulk>6.29</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Eccentric_Militor_Double_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<range>11</range>
+			<soundCast>Shot_Shotgun_NoRack</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>2</magazineSize>
+			<reloadTime>1.7</reloadTime>
+			<ammoSet>AmmoSet_12Gauge_Eccentric_Militor_Double</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Christmas AK Spiner ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_ChristmasAKSpiner</defName>
+		<statBases>
+			<Mass>3.30</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.21</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.86</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>44</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>Shot_CE_AssaultRifleSlow</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<ai_AvoidFriendlyFireRadius>4</ai_AvoidFriendlyFireRadius>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Edge of Descension - Monoblades/Patches/Edge of Descension - Monoblades/EoD_BladelinksWeaponsDefs.xml b/ModPatches/Edge of Descension - Monoblades/Patches/Edge of Descension - Monoblades/EoD_BladelinksWeaponsDefs.xml
new file mode 100644
index 0000000000..abe8bce55e
--- /dev/null
+++ b/ModPatches/Edge of Descension - Monoblades/Patches/Edge of Descension - Monoblades/EoD_BladelinksWeaponsDefs.xml	
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ===== Persona Monoblade ===== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_MonobladeBladelink"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>0.50</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_MonobladeBladelink"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.10</MeleeCritChance>
+				<MeleeParryChance>0.50</MeleeParryChance>
+				<MeleeDodgeChance>0.37</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_MonobladeBladelink"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.4</cooldownTime>
+					<armorPenetrationBlunt>0.7</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>0.78</cooldownTime>
+					<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
+					<armorPenetrationSharp>34.77</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>33</power>
+					<cooldownTime>0.67</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>4.18</armorPenetrationBlunt>
+					<armorPenetrationSharp>25.3</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ===== Persona Prestige Monoblade ===== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_MonobladePrestigeBladelink"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>0.50</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_MonobladePrestigeBladelink"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>1.10</MeleeCritChance>
+			<MeleeParryChance>0.53</MeleeParryChance>
+			<MeleeDodgeChance>0.40</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_MonobladePrestigeBladelink"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.4</cooldownTime>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>0.76</cooldownTime>
+					<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
+					<armorPenetrationSharp>34.77</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>0.65</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>4.18</armorPenetrationBlunt>
+					<armorPenetrationSharp>25.3</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ===== Archoblade ===== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Archoblade"]/statBases</xpath>
+		<value>
+			<Bulk>7</Bulk>
+			<MeleeCounterParryBonus>1.20</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Archoblade"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>2.50</MeleeCritChance>
+				<MeleeParryChance>1.0</MeleeParryChance>
+				<MeleeDodgeChance>0.45</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Archoblade"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.4</cooldownTime>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Stun</def>
+							<amount>5</amount>
+							<chance>0.3</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>0.71</cooldownTime>
+					<armorPenetrationBlunt>3.72</armorPenetrationBlunt>
+					<armorPenetrationSharp>63.25</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>37</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Stun</def>
+							<amount>5</amount>
+							<chance>0.3</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>0.6</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>8.28</armorPenetrationBlunt>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Edge of Descension - Monoblades/Patches/Edge of Descension - Monoblades/EoD_WeaponsDefs.xml b/ModPatches/Edge of Descension - Monoblades/Patches/Edge of Descension - Monoblades/EoD_WeaponsDefs.xml
new file mode 100644
index 0000000000..25e3c9d9cf
--- /dev/null
+++ b/ModPatches/Edge of Descension - Monoblades/Patches/Edge of Descension - Monoblades/EoD_WeaponsDefs.xml	
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ===== Monoblade ===== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Monoblade"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>0.40</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Monoblade"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.00</MeleeCritChance>
+				<MeleeParryChance>0.40</MeleeParryChance>
+				<MeleeDodgeChance>0.27</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Monoblade"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.4</cooldownTime>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>0.8</cooldownTime>
+					<armorPenetrationBlunt>1.18</armorPenetrationBlunt>
+					<armorPenetrationSharp>31.25</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>0.71</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>2.48</armorPenetrationBlunt>
+					<armorPenetrationSharp>21</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ===== Prestige Monoblade ===== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_MonobladePrestige"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>0.40</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_MonobladePrestige"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>1.00</MeleeCritChance>
+			<MeleeParryChance>0.45</MeleeParryChance>
+			<MeleeDodgeChance>0.3</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_MonobladePrestige"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.4</cooldownTime>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>0.8</cooldownTime>
+					<armorPenetrationBlunt>1.18</armorPenetrationBlunt>
+					<armorPenetrationSharp>31.25</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>0.71</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>2.48</armorPenetrationBlunt>
+					<armorPenetrationSharp>21</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ===== Luciblade ===== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_LuciBlade"]/statBases</xpath>
+		<value>
+			<Bulk>7</Bulk>
+			<MeleeCounterParryBonus>0.60</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_LuciBlade"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeCritChance>1.50</MeleeCritChance>
+			<MeleeParryChance>0.45</MeleeParryChance>
+			<MeleeDodgeChance>0.5</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_LuciBlade"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.4</cooldownTime>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>15</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>5</amount>
+							<chance>0.4</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>0.65</cooldownTime>
+					<armorPenetrationBlunt>1.72</armorPenetrationBlunt>
+					<armorPenetrationSharp>33.75</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>26</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>5</amount>
+							<chance>0.4</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>0.57</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>3.98</armorPenetrationBlunt>
+					<armorPenetrationSharp>24.3</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Eisenhans Power Armor/Patches/Eisenhans Power Armor/ThingDefs_Various.xml b/ModPatches/Eisenhans Power Armor/Patches/Eisenhans Power Armor/ThingDefs_Various.xml
new file mode 100644
index 0000000000..2b9071a214
--- /dev/null
+++ b/ModPatches/Eisenhans Power Armor/Patches/Eisenhans Power Armor/ThingDefs_Various.xml	
@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Helmet"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Helmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Helmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>150</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Helmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Helmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Helmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Helmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Helmet"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<PsychicSensitivity>-0.1</PsychicSensitivity>
+				<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+				<ShootingAccuracyPawn>-0.10</ShootingAccuracyPawn>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Helmet"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>80</Steel>
+				<Cloth>20</Cloth>
+				<ComponentIndustrial>2</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Helmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!-- === Armor === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Powerarmor"]/statBases</xpath>
+		<value>
+			<Bulk>120</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Powerarmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>300</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Powerarmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>50</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Powerarmor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Powerarmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>13</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Powerarmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>24</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Powerarmor"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>180</Steel>
+				<Cloth>40</Cloth>
+				<ComponentIndustrial>5</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Powerarmor"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>80</CarryWeight>
+				<CarryBulk>15</CarryBulk>
+				<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+				<MoveSpeed>-2</MoveSpeed>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Powerarmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>
+			Defs/ThingDef[defName="Proj_IncendiaryMortarEisenhand"] |
+			Defs/ThingDef[defName="Proj_ExplosiveMortarEisenhans"] |
+			Defs/ThingDef[defName="Proj_EmpMortarEisenhans"] |
+			Defs/ThingDef[defName="Proj_SmokeMortarEisenhans"]
+		</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Powerarmor"]/comps/li[@Class="CompProperties_Reloadable"]/ammoDef</xpath>
+		<value>
+			<ammoDef>Shell_60mmMortar_HE</ammoDef>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Powerarmor"]/comps/li[@Class="CompProperties_Reloadable"]/maxCharges</xpath>
+		<value>
+			<maxCharges>2</maxCharges>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Powerarmor"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountPerCharge</xpath>
+		<value>
+			<ammoCountPerCharge>1</ammoCountPerCharge>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Powerarmor"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>30</li>
+					<li>50</li>
+					<li>70</li>
+					<li>90</li>
+				</chargeSpeeds>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Powerarmor"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<label>launch 60mm shell</label>
+					<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<onlyManualCast>True</onlyManualCast>
+					<warmupTime>2</warmupTime>
+					<range>40</range>
+					<minRange>5</minRange>
+					<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+					<soundAiming>EisenhansMortar_Aiming</soundAiming>
+					<soundCast>Shot_EisenhansMortar</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>14</muzzleFlashScale>
+					<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+					<defaultProjectile>Bullet_60mmMortarShell_HE</defaultProjectile>
+					<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- === Battering Ram === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_EisenhansBatteringRam"]/stuffCategories</xpath>
+		<value>
+			<stuffCategories>
+				<li>Metallic_Weapon</li>
+			</stuffCategories>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_EisenhansBatteringRam"]/costList/ComponentIndustrial</xpath>
+		<value>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_EisenhansBatteringRam"]/statBases/Mass</xpath>
+		<value>
+			<Mass>12</Mass>
+			<Bulk>14</Bulk>
+			<MeleeCounterParryBonus>0.38</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_EisenhansBatteringRam"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.42</MeleeCritChance>
+				<MeleeParryChance>0.24</MeleeParryChance>
+				<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_EisenhansBatteringRam"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.1</cooldownTime>
+					<armorPenetrationBlunt>8.625</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+					<extraMeleeDamages>
+						<li>
+							<def>EMP</def>
+							<amount>6</amount>
+							<chance>0.75</chance>
+						</li>
+					</extraMeleeDamages>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Eltex Bodysuit/Patches/Eltex Bodysuit/Apparel_Various.xml b/ModPatches/Eltex Bodysuit/Patches/Eltex Bodysuit/Apparel_Various.xml
new file mode 100644
index 0000000000..1cffdd3243
--- /dev/null
+++ b/ModPatches/Eltex Bodysuit/Patches/Eltex Bodysuit/Apparel_Various.xml	
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- == Eltex Bodysuit == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="eltex_bodysuit"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>1.5</WornBulk>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Epona Race/Defs/Epona Race/Ammo/Ammo_Epona.xml b/ModPatches/Epona Race/Defs/Epona Race/Ammo/Ammo_Epona.xml
new file mode 100644
index 0000000000..6eb3c80274
--- /dev/null
+++ b/ModPatches/Epona Race/Defs/Epona Race/Ammo/Ammo_Epona.xml	
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- ==================== Plasma Cell Variants ========================== -->
+
+	<!--Shock-->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Epona_Shock</defName>
+		<label>toxic pulse</label>
+		<ammoTypes>
+			<Ammo_PlasmaCellRifle>Bullet_Epona_Shock</Ammo_PlasmaCellRifle>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_Epona_Shock</defName>
+		<label>vaporized toxin pulse</label>
+		<graphicData>
+			<texPath>Things/WeaponRanged/Projectile/PoisonProjectile</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>160</speed>
+			<damageAmountBase>15</damageAmountBase>
+			<damageDef>EponaShocker</damageDef>
+			<armorPenetrationSharp>28</armorPenetrationSharp>
+			<armorPenetrationBlunt>40</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<!--Shard-->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Epona_Shard</defName>
+		<label>shard pulse</label>
+		<ammoTypes>
+			<Ammo_PlasmaCellRifle>Bullet_Epona_Shock</Ammo_PlasmaCellRifle>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base30x64mmFuelBullet">
+		<defName>Bullet_Epona_Shard</defName>
+		<label>shard pulse</label>
+		<graphicData>
+			<texPath>Things/WeaponRanged/Projectile/ShardProjectile</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>100</speed>
+			<damageDef>EponaPegasusShard</damageDef>
+			<damageAmountBase>25</damageAmountBase>
+			<explosionRadius>1.4</explosionRadius>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+		</projectile>
+	</ThingDef>
+
+	<!--Molten-->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Epona_Molten</defName>
+		<label>plasma pulse</label>
+		<ammoTypes>
+			<Ammo_PlasmaCellHeavy>Bullet_Epona_Molten</Ammo_PlasmaCellHeavy>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base30x64mmFuelBullet">
+		<defName>Bullet_Epona_Molten</defName>
+		<label>plasma pulse</label>
+		<graphicData>
+			<texPath>Things/WeaponRanged/Projectile/SunProjectile</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>10</speed>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>300</damageAmountBase>
+			<explosionRadius>5</explosionRadius>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+		</projectile>
+	</ThingDef>
+
+	<!--plasma-->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Epona_Plasma</defName>
+		<label>shard pulse</label>
+		<ammoTypes>
+			<Ammo_PlasmaCellRifle>Bullet_Epona_Plasma</Ammo_PlasmaCellRifle>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base30x64mmFuelBullet">
+		<defName>Bullet_Epona_Plasma</defName>
+		<label>plasma</label>
+		<graphicData>
+			<texPath>Things/WeaponRanged/Projectile/Plasmasperm</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>0.8</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>100</speed>
+			<damageDef>EponaLancePlasma</damageDef>
+			<damageAmountBase>5</damageAmountBase>
+			<explosionRadius>0.5</explosionRadius>
+			<applyDamageToExplosionCellsNeighbors>false</applyDamageToExplosionCellsNeighbors>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Flamer Variant ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_NuckelaveeShotgun</defName>
+		<label>Thermal Shot</label>
+		<ammoTypes>
+			<Ammo_30x64mmFuel_Incendiary>Bullet_Epona_NapalmShotgun</Ammo_30x64mmFuel_Incendiary>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x18mmChargedBullet">
+		<defName>Bullet_Epona_NapalmShotgun</defName>
+		<label>shotgun_blast</label>
+		<graphicData>
+			<texPath>Things/WeaponRanged/Projectile/DragonbreathProjectile</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>70</speed>
+			<damageDef>EponaFlameshot</damageDef>
+			<damageAmountBase>4</damageAmountBase>
+			<pelletCount>6</pelletCount>
+			<spreadMult>17.8</spreadMult>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Railgun Variant ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_6mmEponaShock</defName>
+		<label>6mm Railgun</label>
+		<ammoTypes>
+			<Ammo_6mmRailgun_Sabot>Bullet_6mmEponaShock</Ammo_6mmRailgun_Sabot>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x18mmChargedBullet">
+		<defName>Bullet_6mmEponaShock</defName>
+		<label>6mm Railgun bullet (Neurotoxin)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>EponaShocker</damageDef>
+			<damageAmountBase>7</damageAmountBase>
+			<armorPenetrationSharp>24</armorPenetrationSharp>
+			<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
+			<speed>120</speed>
+		</projectile>
+	</ThingDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Epona Race/Patches/Epona Race/Bodies/Epona_Bodytype.xml b/ModPatches/Epona Race/Patches/Epona Race/Bodies/Epona_Bodytype.xml
new file mode 100644
index 0000000000..bbdb707086
--- /dev/null
+++ b/ModPatches/Epona Race/Patches/Epona Race/Bodies/Epona_Bodytype.xml	
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Arm Groups-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Centaur"]//*[
+			customLabel="왼쪽 어깨"
+			]/groups
+		</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Centaur"]//*[
+			customLabel="오른쪽 어깨"
+			]/groups
+		</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Centaur"]//*[
+			customLabel="왼팔"
+			]/groups
+		</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Centaur"]//*[
+			customLabel="오른팔"
+			]/groups
+		</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+
+	<!--Natural Armor-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Centaur"]//*[
+			def="Torso" or
+			def="CentaurTail" or
+			def="Neck" or
+			def="Head" or
+			def="Nose" or
+			def="Jaw" or
+			def="Shoulder" or
+			def="Arm" or
+			def="Hand" or
+			def="Finger" or
+			def="Leg" or
+			def="Foot"
+			]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Epona Race/Patches/Epona Race/Bodies/Epona_Hediff.xml b/ModPatches/Epona Race/Patches/Epona Race/Bodies/Epona_Hediff.xml
new file mode 100644
index 0000000000..11d65c268f
--- /dev/null
+++ b/ModPatches/Epona Race/Patches/Epona Race/Bodies/Epona_Hediff.xml	
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="WarHorse"]/stages/li/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.25</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="SmallHorse"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>1.2</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="WarHorse"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="RoyalHorse"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			<MeleeParryChance>0.4</MeleeParryChance>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Epona Race/Patches/Epona Race/PawnKindDefs/Epona_PawnKind.xml b/ModPatches/Epona Race/Patches/Epona Race/PawnKindDefs/Epona_PawnKind.xml
new file mode 100644
index 0000000000..c060e28c57
--- /dev/null
+++ b/ModPatches/Epona Race/Patches/Epona Race/PawnKindDefs/Epona_PawnKind.xml	
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Ammo-->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="EponaMerchant" or
+			defName="EponaDemiLancer" or
+			defName="EponaHarquebusier" or
+			defName="EponaKnight" or
+			defName="EponaKnightCaptain" or
+			defName="EponaHighlander" or
+			defName="EponaHighlanderRanger" or
+			defName="EponaHighlanderCaptain" or
+			defName="EponaSenator" or
+			defName="EponaPaladin"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="Epona_BattleRamNPC"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>4</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="EponaArcher"]</xpath>
+		<value>
+			<li Inherit="False" Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>15</min>
+					<max>25</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>500</min>
+						<max>1200</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>EponaCommon</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="EponaHighlanderGrenade"]</xpath>
+		<value>
+			<li Inherit="False" Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>15</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>500</min>
+						<max>1200</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>EponaCommon</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="EponaTankDestroyer"]</xpath>
+		<value>
+			<li Inherit="False" Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>500</min>
+						<max>1200</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>EponaCommon</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Epona Race/Patches/Epona Race/Scenario/Epona_Scenario.xml b/ModPatches/Epona Race/Patches/Epona Race/Scenario/Epona_Scenario.xml
new file mode 100644
index 0000000000..c5793eac1d
--- /dev/null
+++ b/ModPatches/Epona Race/Patches/Epona Race/Scenario/Epona_Scenario.xml	
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="EponaNomadStart"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_44-40Winchester_FMJ</thingDef>
+				<count>100</count>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="EponaNomadStart"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_Arrow_Steel</thingDef>
+				<count>30</count>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Epona Race/Patches/Epona Race/ThingDefs_Items/Items_Resources.xml b/ModPatches/Epona Race/Patches/Epona Race/ThingDefs_Items/Items_Resources.xml
new file mode 100644
index 0000000000..d4b77388a2
--- /dev/null
+++ b/ModPatches/Epona Race/Patches/Epona Race/ThingDefs_Items/Items_Resources.xml	
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==========  Giant Sheep Wool  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Epona_Sheep_Wool"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.45</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Epona_Sheep_Wool"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.18</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Epona_Sheep_Wool"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
+			<StuffPower_Armor_Electric>0.05</StuffPower_Armor_Electric>
+			<Bulk>0.3</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Epona_Sheep_Wool"]/stuffProps/categories</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Epona_Sheep_Wool"]/stuffProps</xpath>
+			<value>
+				<categories>
+					<li>SoftArmor</li>
+				</categories>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Epona_Sheep_Wool"]/stuffProps/categories</xpath>
+			<value>
+				<li>SoftArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Epona Race/Patches/Epona Race/ThingDefs_Misc/Epona_Apparel.xml b/ModPatches/Epona Race/Patches/Epona Race/ThingDefs_Misc/Epona_Apparel.xml
new file mode 100644
index 0000000000..3d42548dbf
--- /dev/null
+++ b/ModPatches/Epona Race/Patches/Epona Race/ThingDefs_Misc/Epona_Apparel.xml	
@@ -0,0 +1,362 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--========= Stuffable =========-->
+
+	<!--Shirt-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_EponaShirt" or
+			defName="Apparel_EponaShirtNoSleeves" or
+			defName="Apparel_EponaThighSocks" or
+			defName="Apparel_EponaThighSocksSkirt"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!--Beret-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_EponaHelmetBeret"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!--Shirt-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_EponaRibbonRed" or
+			defName="Apparel_EponaRibbonBlue" or
+			defName="Apparel_EponaHairbandMaid"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.25</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!--Barding-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Apparel_EponaCoatBardPlain" or
+			defName="Apparel_EponaCoatBardBavaria" or
+			defName="Apparel_EponaCoatBardQuarter" or
+			defName="Apparel_EponaCoatBardCross" or
+			defName="Apparel_EponaCoatBardFleur" or
+			defName="Apparel_EponaCoatBardStripes" or
+			defName="Apparel_EponaCoatBardEagle" or
+			defName="Apparel_EponaCoatBardLion" or
+			defName="Apparel_EponaCoatBardClover" or
+			defName="Apparel_EponaCoatBardDiamond" or
+			defName="Apparel_EponaCoatBardHeart" or
+			defName="Apparel_EponaCoatBardSpade"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+			<Bulk>12.5</Bulk>
+			<WornBulk>4</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Maid Coat-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Apparel_EponaCoatMaid"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
+			<Bulk>7.5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Buff Coat-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Apparel_EponaCoatBuff"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>7.5</StuffEffectMultiplierArmor>
+			<Bulk>12.5</Bulk>
+			<WornBulk>4</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Robe-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Apparel_EponaRobeArctic"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
+			<Bulk>7.5</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Cloak-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Apparel_EponaRobeCloak"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Breastplate-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Apparel_EponaArmorBreastplate"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+			<Bulk>5</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Full Plate-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Apparel_EponaArmorFullPlate"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.7</StuffEffectMultiplierArmor>
+			<Bulk>100</Bulk>
+			<WornBulk>6</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Plate Leggings-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Apparel_EponaThighGreaves"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Plate Helmets-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Apparel_EponaHelmetLobster"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+			<Bulk>3</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Apparel_EponaHelmetBurgonet"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4.5</StuffEffectMultiplierArmor>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Apparel_EponaHelmetArmet"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
+			<Bulk>3</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Metallic Armor Adjustments-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Apparel_EponaHelmetArmet" or
+			defName="Apparel_EponaHelmetBurgonet" or
+			defName="Apparel_EponaHelmetLobster" or
+			defName="Apparel_EponaThighGreaves" or
+			defName="Apparel_EponaArmorFullPlate" or
+			defName="Apparel_EponaArmorBreastplate"
+			]/stuffCategories </xpath>
+		<value>
+			<stuffCategories>
+				<li>Steeled</li>
+			</stuffCategories>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="Apparel_EponaHelmetArmet" or
+			defName="Apparel_EponaHelmetBurgonet" or
+			defName="Apparel_EponaThighGreaves" or
+			defName="Apparel_EponaArmorFullPlate" or
+			defName="Apparel_EponaArmorBreastplate"
+			]/equippedStatOffsets/MoveSpeed </xpath>
+	</Operation>
+
+	<!--========= Fixed Armor Value =========-->
+
+	<!--Royalrobe-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_EponaRobeRoyalRed" or
+			defName="Apparel_EponaRobeRoyalBlue"
+			]/statBases </xpath>
+		<value>
+			<Bulk>5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_EponaRobeRoyalRed" or
+			defName="Apparel_EponaRobeRoyalBlue"]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_EponaRobeRoyalRed" or
+			defName="Apparel_EponaRobeRoyalBlue"]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--EVA Coat-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_EponaSpaceSuitRobe"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_EponaSpaceSuitRobe"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_EponaSpaceSuitRobe"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--EVA-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_EponaEVASuit"]/statBases/Mass</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+			<Mass>50</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_EponaEVASuit"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_EponaEVASuit"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_EponaEVASuit"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<CarryWeight>80</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+			<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			<MoveSpeed>-0.8</MoveSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_EponaEVASuit"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>50</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<!--EVA Helmet-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_EponaSpaceSuitHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_EponaSpaceSuitHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_EponaSpaceSuitHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Apparel_EponaSpaceSuitHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Apparel_EponaSpaceSuitHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_EponaSpaceSuitHelmet"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<AimingAccuracy>0.15</AimingAccuracy>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_EponaSpaceSuitHelmet"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>20</DevilstrandCloth>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Epona Race/Patches/Epona Race/ThingDefs_Misc/Weapons.xml b/ModPatches/Epona Race/Patches/Epona Race/ThingDefs_Misc/Weapons.xml
new file mode 100644
index 0000000000..42edf0247a
--- /dev/null
+++ b/ModPatches/Epona Race/Patches/Epona Race/ThingDefs_Misc/Weapons.xml	
@@ -0,0 +1,923 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Dirk =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Epona_SwordDirk"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.18</cooldownTime>
+					<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.32</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.26</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.42</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Epona_SwordDirk"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.39</MeleeCounterParryBonus>
+			<Bulk>1.5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Epona_SwordDirk"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.08</MeleeCritChance>
+			<MeleeParryChance>0.24</MeleeParryChance>
+			<MeleeDodgeChance>1.07</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- ========== Falchion =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Epona_SwordFalchion"]/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>32</power>
+					<cooldownTime>1.34</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.956</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.43</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Epona_SwordFalchion"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Epona_SwordFalchion"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>0.35</MeleeParryChance>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- ========== Sabre =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Epona_SwordSabre"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.69</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.69</cooldownTime>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.6</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.56</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>2.592</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.58</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Epona_SwordSabre"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Epona_SwordSabre"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.63</MeleeCritChance>
+			<MeleeParryChance>0.75</MeleeParryChance>
+			<MeleeDodgeChance>0.4</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- ========== Epona_SwordClaymore =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Epona_SwordClaymore"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.01</cooldownTime>
+					<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>60</power>
+					<cooldownTime>2.01</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.89</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>47</power>
+					<cooldownTime>3.12</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Epona_SwordClaymore"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<MeleeCounterParryBonus>0.59</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Epona_SwordClaymore"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.08</MeleeCritChance>
+			<MeleeParryChance>0.5</MeleeParryChance>
+			<MeleeDodgeChance>0.5</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- ========== Dane Axe =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Epona_AxeDaneAxe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.78</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>31</power>
+					<cooldownTime>4.09</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>4.84</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.97</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Epona_AxeDaneAxe"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Epona_AxeDaneAxe"]/equippedStatOffsets/MeleeHitChance</xpath>
+		<value>
+			<MeleeCritChance>0.06</MeleeCritChance>
+			<MeleeParryChance>0.75</MeleeParryChance>
+			<MeleeDodgeChance>0.50</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- ========== Holy Axe =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Epona_EponaAxeHoly"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.31</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>2.9</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>8.1</armorPenetrationBlunt>
+					<armorPenetrationSharp>3.42</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>1.16</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
+					<armorPenetrationSharp>4.06</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Epona_EponaAxeHoly"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>1.08</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Epona_EponaAxeHoly"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.22</MeleeCritChance>
+			<MeleeParryChance>1.53</MeleeParryChance>
+			<MeleeDodgeChance>0.67</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- ========== Lance =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Epona_Lance"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>47</power>
+					<cooldownTime>3.5</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>9.06</armorPenetrationBlunt>
+					<armorPenetrationSharp>4.06</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Epona_Lance"]/statBases</xpath>
+		<value>
+			<Bulk>18</Bulk>
+			<MeleeCounterParryBonus>0.12</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Epona_Lance"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>2.11</MeleeCritChance>
+			<MeleeParryChance>0.95</MeleeParryChance>
+			<MeleeDodgeChance>0.33</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- ========== Shotgun =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Epona_PonyShotgun</defName>
+		<statBases>
+			<Mass>3.00</Mass>
+			<RangedWeapon_Cooldown>0.8</RangedWeapon_Cooldown>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.20</SwayFactor>
+			<Bulk>9.0</Bulk>
+			<SightsEfficiency>1</SightsEfficiency>
+			<WorkToMake>9500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>45</Steel>
+			<WoodLog>10</WoodLog>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Repeater =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Epona_PonyRifle</defName>
+		<statBases>
+			<WorkToMake>11500</WorkToMake>
+			<SightsEfficiency>2.12</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.68</SwayFactor>
+			<Bulk>12.50</Bulk>
+			<Mass>4.30</Mass>
+			<RangedWeapon_Cooldown>0.80</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>60</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+			<WoodLog>10</WoodLog>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_44-40Winchester_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_44-40Winchester</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Repeating shotgun =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Epona_ZebraShotgun</defName>
+		<statBases>
+			<Mass>3.50</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.26</SwayFactor>
+			<Bulk>6.7</Bulk>
+			<SightsEfficiency>1</SightsEfficiency>
+			<WorkToMake>22500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+	</Operation>
+
+	<!-- ========== Repeating shotgun =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Epona_ZebraShotgunExplosive</defName>
+		<statBases>
+			<Mass>5.50</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.41</SwayFactor>
+			<Bulk>6.7</Bulk>
+			<SightsEfficiency>1</SightsEfficiency>
+			<WorkToMake>25500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<recoilAmount>2.93</recoilAmount>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_20x42mmGrenade_HE</defaultProjectile>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<warmupTime>1.1</warmupTime>
+			<range>25</range>
+			<minRange>5</minRange>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>5.1</reloadTime>
+			<ammoSet>AmmoSet_20x42mmGrenade</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+	</Operation>
+
+	<!-- ========== Nuckelavee =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Epona_NuckelaveeShotgun</defName>
+		<statBases>
+			<Mass>4.50</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.29</SwayFactor>
+			<Bulk>7.7</Bulk>
+			<SightsEfficiency>1</SightsEfficiency>
+			<WorkToMake>22500</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Epona_NapalmShotgun</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_NuckelaveeShotgun</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+	</Operation>
+
+	<!-- ========== Assault Rifle =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Epona_ColtTacticalRifle</defName>
+		<statBases>
+			<Mass>3.0</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.31</SwayFactor>
+			<Bulk>10.03</Bulk>
+			<WorkToMake>30000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>Shot_HeavySMG</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== LMG =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Epona_DestrierTacticalMachinegun</defName>
+		<statBases>
+			<WorkToMake>40500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.48</SwayFactor>
+			<Bulk>12.05</Bulk>
+			<Mass>10.50</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>85</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+			<Chemfuel>15</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>1.3</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>62</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>45</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Rail Rifle =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Epona_CourserRailgun</defName>
+		<statBases>
+			<Mass>4.2</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.43</SwayFactor>
+			<Bulk>11.12</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.25</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6mmRailgun_Sabot</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>62</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+			<soundCast>Epona_RailgunSound</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_6mmRailgun</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Ram HMG =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Epona_BattleRamHMG</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.8</ShotSpread>
+			<SwayFactor>1.89</SwayFactor>
+			<Bulk>18</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.88</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>2.5</warmupTime>
+			<range>51</range>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<burstShotCount>20</burstShotCount>
+			<soundCast>Shot_SniperRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>20</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>10</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Ram Mortar =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Epona_BattleRamGL</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.30</ShotSpread>
+			<SwayFactor>1.00</SwayFactor>
+			<Bulk>7.31</Bulk>
+			<Mass>20.00</Mass>
+			<RangedWeapon_Cooldown>6</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+			<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_60mmMortarShell_HE</defaultProjectile>
+			<warmupTime>3</warmupTime>
+			<minRange>10</minRange>
+			<range>40</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>120</ticksBetweenBurstShots>
+			<soundCast>Shot_IncendiaryLauncher</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>16</muzzleFlashScale>
+			<circularError>2.5</circularError>
+			<indirectFirePenalty>0.2</indirectFirePenalty>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>12</reloadTime>
+			<ammoSet>AmmoSet_60mmMortarShell</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Epona_BattleRamGL"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>30</li>
+					<li>50</li>
+					<li>70</li>
+					<li>90</li>
+				</chargeSpeeds>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Melee Attacks =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Epona_CourserRailgun" or
+			defName="Epona_DestrierTacticalMachinegun" or
+			defName="Epona_ZebraShotgunExplosive" or
+			defName="Epona_ZebraShotgun" or
+			defName="Epona_PonyRifle" or
+			defName="Epona_PonyShotgun"
+			]/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="Epona_ColtTacticalRifle"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.55</cooldownTime>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.69</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.6</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Epona_NuckelaveeShotgun"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.55</cooldownTime>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+						<li>Cut</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.69</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.6</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Epona Race/Patches/Epona Race/ThingDefs_Misc/Weapons_Spacer.xml b/ModPatches/Epona Race/Patches/Epona Race/ThingDefs_Misc/Weapons_Spacer.xml
new file mode 100644
index 0000000000..bebca2b125
--- /dev/null
+++ b/ModPatches/Epona Race/Patches/Epona Race/ThingDefs_Misc/Weapons_Spacer.xml	
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Shock =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Epona_PegasusShock</defName>
+		<statBases>
+			<SightsEfficiency>2.12</SightsEfficiency>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>1.60</SwayFactor>
+			<Bulk>7</Bulk>
+			<Mass>9</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Epona_Shock</defaultProjectile>
+			<warmupTime>1.35</warmupTime>
+			<range>62</range>
+			<soundCast>Epona_Pulsecarbine</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_Epona_Shock</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Shard =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Epona_PegasusShards</defName>
+		<statBases>
+			<Mass>5.0</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.15</SwayFactor>
+			<Bulk>6.50</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<recoilAmount>2.05</recoilAmount>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Epona_Shard</defaultProjectile>
+			<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+			<warmupTime>0.5</warmupTime>
+			<range>31</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<soundCast>Epona_ShardsSound</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_Epona_Shard</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Plasma =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Epona_PegasusMolten</defName>
+		<statBases>
+			<Mass>15</Mass>
+			<RangedWeapon_Cooldown>1.57</RangedWeapon_Cooldown>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>2.55</SwayFactor>
+			<Bulk>11.50</Bulk>
+			<SightsEfficiency>1.10</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<recoilAmount>2.93</recoilAmount>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Epona_Molten</defaultProjectile>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<warmupTime>1.1</warmupTime>
+			<range>51</range>
+			<minRange>5</minRange>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<soundCast>Epona_SunmakerSound</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+			<ammoConsumedPerShotCount>25</ammoConsumedPerShotCount>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>5.2</reloadTime>
+			<ammoSet>AmmoSet_Epona_Molten</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+	</Operation>
+
+	<!-- ========== Lance =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Epona_LancePlasma</defName>
+		<statBases>
+			<Mass>21</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>3.50</SwayFactor>
+			<Bulk>14</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<recoilAmount>0.05</recoilAmount>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Epona_Shard</defaultProjectile>
+			<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+			<warmupTime>2.5</warmupTime>
+			<range>12</range>
+			<burstShotCount>60</burstShotCount>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<soundCast>Epona_PlasmaSound</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>120</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_Epona_Plasma</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>30</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Hippogryph Railgun =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Epona_HippogryphRailgun</defName>
+		<statBases>
+			<Mass>8.5</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.60</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.89</SwayFactor>
+			<Bulk>12.85</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.25</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6mmRailgun_Sabot</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>75</range>
+			<soundCast>Epona_RailgunSound</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_8mmRailgun</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Nightmare =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Epona_NightmareShock</defName>
+		<statBases>
+			<Mass>2.0</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>0.85</SwayFactor>
+			<Bulk>6.25</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.52</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6mmEponaShock</defaultProjectile>
+			<warmupTime>0.50</warmupTime>
+			<range>31</range>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>Epona_SilencerSound</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_6mmEponaShock</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Melee Attacks =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Epona_PegasusShock" or
+			defName="Epona_PegasusShards" or
+			defName="Epona_PegasusMolten" or
+			defName="Epona_HippogryphRailgun" or
+			defName="Epona_NightmareShock"
+			]/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="Epona_LancePlasma"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>MeleePlasma</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>4</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>25</armorPenetrationBlunt>
+					<armorPenetrationSharp>30</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Epona Race/Patches/Epona Race/ThingDefs_Races/AlienRace_Epona.xml b/ModPatches/Epona Race/Patches/Epona Race/ThingDefs_Races/AlienRace_Epona.xml
new file mode 100644
index 0000000000..c6210b326f
--- /dev/null
+++ b/ModPatches/Epona Race/Patches/Epona Race/ThingDefs_Races/AlienRace_Epona.xml	
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="EponaCentaur_PawnBase"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="EponaCentaur_PawnBase"]/inspectorTabs/li[.="ITab_Pawn_Gear"]</xpath>
+		<value>
+			<li>CombatExtended.ITab_Inventory</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="EponaCentaur_PawnBase"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Inventory"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Eponalike"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Eponalike"]/statBases</xpath>
+		<value>
+			<!--Quadruped means better leverage, especially on offense.-->
+			<MeleeCritChance>1.15</MeleeCritChance>
+			<MeleeParryChance>1.10</MeleeParryChance>
+			<Suppressability>1</Suppressability>
+			<SmokeSensitivity>1</SmokeSensitivity>
+			<CarryBulk>32</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Eponalike"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.313</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.313</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>hooves</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2.5</cooldownTime>
+					<chanceFactor>0.5</chanceFactor>
+					<linkedBodyPartsGroup>CentaurHooves</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.850</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Quadruped means better leverage, especially on offense.-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Eponalike"]/alienRace/raceRestriction/whiteApparelList</xpath>
+		<value>
+			<li>CE_Apparel_BallisticShield</li>
+			<li>CE_Apparel_MeleeShield</li>
+			<li>CE_Apparel_GasMask</li>
+			<li>CE_Apparel_ImprovGasMask</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Epona Race/Patches/Epona Race/ThingDefs_Races/Race_Sheep.xml b/ModPatches/Epona Race/Patches/Epona Race/ThingDefs_Races/Race_Sheep.xml
new file mode 100644
index 0000000000..2e368f2f9e
--- /dev/null
+++ b/ModPatches/Epona Race/Patches/Epona Race/ThingDefs_Races/Race_Sheep.xml	
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Giant Sheep-->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Epona_Sheep"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Epona_Sheep"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.08</MeleeDodgeChance>
+			<MeleeCritChance>0.79</MeleeCritChance>
+			<MeleeParryChance>0.51</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Epona_Sheep"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>55</power>
+					<cooldownTime>3.99</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Epona_Sheep"]/race/baseBodySize</xpath>
+		<value>
+			<baseBodySize>3</baseBodySize>
+		</value>
+	</Operation>
+
+	<!--Giant War Sheep-->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Epona_WarRam"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Epona_WarRam"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.12</MeleeDodgeChance>
+			<MeleeCritChance>0.85</MeleeCritChance>
+			<MeleeParryChance>0.55</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Epona_WarRam"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Epona_WarRam"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Epona_WarRam"]/statBases/ArmorRating_Heat</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Epona_WarRam"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>55</power>
+					<cooldownTime>3.99</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Epona_WarRam"]/race/baseBodySize</xpath>
+		<value>
+			<baseBodySize>3</baseBodySize>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Equium/Patches/Equium/Equium_Race.xml b/ModPatches/Equium/Patches/Equium/Equium_Race.xml
new file mode 100644
index 0000000000..884d4c63f9
--- /dev/null
+++ b/ModPatches/Equium/Patches/Equium/Equium_Race.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Turn our horse boys into horse *boys* ========== -->
+	<!-- ========== To be human is to be a tall brick 	  ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<!-- === Note to future furball compatibility nerds: 		=== -->
+		<!-- === Paste the defName of your horrible alien there   |	=== -->
+		<!-- === 												  V	=== -->
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Equium"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Gives Gun Gizmos to Equium HUD thing ========== -->
+	<!-- ========== Also Makes Em Suppressable		   ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<!-- === Shouldn't need to change this at all		  === -->
+		<!-- === Unless you changed the name of your BasePawn === -->
+		<!-- === In which case change "BasePawn" to that name === -->
+		<xpath>Defs/ThingDef[@Name="BaseEquium"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<!-- === Patch Equium default melee attacks === -->
+	<!-- === For the most part, it adds the CE melee handler thing 	=== -->
+	<!-- === And also defines armor penetration, which allows them	=== -->
+	<!-- === to actually do damage. Try attacking a raccoon with an === -->
+	<!-- === unpatched melee attack. I'll wait.						=== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Equium"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.9</AimingAccuracy>
+			<MeleeCritChance>1.5</MeleeCritChance>
+			<MeleeParryChance>01.1</MeleeParryChance>
+			<ReloadSpeed>0.9</ReloadSpeed>
+			<Suppressability>0.85</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Equium"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left handnhoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>LeftHandnHoof</linkedBodyPartsGroup>
+					<armorPenetration>0.12</armorPenetration>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right handnhoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>RightHandnHoof</linkedBodyPartsGroup>
+					<armorPenetration>0.12</armorPenetration>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.9</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetration>0.20</armorPenetration>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- ===================================== -->
+	<!-- === BaseBodySize, ArmorRatings, MoveSpeed, and BaseHealth should already be set. I think. === -->
+	<!-- ===================================== -->
+	<!-- === Adds In Inspector Tabs 	   === -->
+	<!-- === Inventory and all that jazz   === -->
+	<!-- === Again, no need to change 'em  === -->
+	<!-- === Unless you changed it         === -->
+	<!-- === then change 'em			   === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="BaseEquium"]/inspectorTabs/li[.="ITab_Pawn_Gear"]</xpath>
+		<value>
+			<li>CombatExtended.ITab_Inventory</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+
+		<xpath>Defs/ThingDef[@Name="BaseEquium"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Inventory"/>
+		</value>
+	</Operation>
+
+	<!-- === Congratulations! Your alien is Combat Ready!	 === -->
+	<!-- === If your alien comes with extra guns and gear,	 === -->
+	<!-- === Congratulations! You're not even close to done! === -->
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Equium/Patches/Equium/PawnKinds_Equium.xml b/ModPatches/Equium/Patches/Equium/PawnKinds_Equium.xml
new file mode 100644
index 0000000000..916548d021
--- /dev/null
+++ b/ModPatches/Equium/Patches/Equium/PawnKinds_Equium.xml
@@ -0,0 +1,314 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Scoot ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="EquiumVillager"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="EquiumPackLeader"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="EquiumElder"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="EquiumTrader"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="EquiumSlave"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="HorseInBlack"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>8</min>
+					<max>9</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="HorseInBlackJoin"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="EquiumRefugee"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="EquiumHunter"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="EquiumSecurityGuard"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Equium/Patches/Equium/PawnKinds_Equium_Gangs.xml b/ModPatches/Equium/Patches/Equium/PawnKinds_Equium_Gangs.xml
new file mode 100644
index 0000000000..e0053163e6
--- /dev/null
+++ b/ModPatches/Equium/Patches/Equium/PawnKinds_Equium_Gangs.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Scoot ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="EquiumThug"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="EquiumBully"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="EquiumGangLeader"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="EquiumDealer"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Equium/Patches/Equium/PawnKinds_Equium_Military.xml b/ModPatches/Equium/Patches/Equium/PawnKinds_Equium_Military.xml
new file mode 100644
index 0000000000..0f88b14609
--- /dev/null
+++ b/ModPatches/Equium/Patches/Equium/PawnKinds_Equium_Military.xml
@@ -0,0 +1,283 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Scoot ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="EquiumRecruitUnarmed"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="EquiumRecruit"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="EquiumPrivateUnarmed"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="EquiumPrivate"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="EquiumCombatSpecialist"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="EquiumMilitaryTrader"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>8</min>
+					<max>9</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="EquiumExplosiveSpecialist"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="EquiumXO"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="EquiumCommander"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Equium/Patches/Equium/PawnKinds_Equium_Tribal.xml b/ModPatches/Equium/Patches/Equium/PawnKinds_Equium_Tribal.xml
new file mode 100644
index 0000000000..6540b7e5a9
--- /dev/null
+++ b/ModPatches/Equium/Patches/Equium/PawnKinds_Equium_Tribal.xml
@@ -0,0 +1,314 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Scoot ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="EquiumTribalMember"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>30</min>
+					<max>50</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="EquiumTribalElder"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>30</min>
+					<max>50</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="EquiumTribalWarrior"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>30</min>
+					<max>50</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="EquiumTribalTrader"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>30</min>
+					<max>50</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="EquiumTribalArcher"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>30</min>
+					<max>50</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="EquiumTribalHunter"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>8</min>
+					<max>9</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="EquiumTribalHeavyArcher"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>30</min>
+					<max>50</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="EquiumTribalBerserker"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>30</min>
+					<max>50</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="EquiumTribalChiefMelee"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>30</min>
+					<max>50</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="EquiumTribalChiefRanged"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>30</min>
+					<max>50</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Au Ra/Patches/Erin's Au Ra/Patch_Bodies.xml b/ModPatches/Erin's Au Ra/Patches/Erin's Au Ra/Patch_Bodies.xml
new file mode 100644
index 0000000000..7508cf1bc8
--- /dev/null
+++ b/ModPatches/Erin's Au Ra/Patches/Erin's Au Ra/Patch_Bodies.xml	
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "AURA_AuRa"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "right eye"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "AURA_AuRa"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "left eye"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "AURA_AuRa"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "AURA_AuRa"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "AURA_AuRa"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "AURA_AuRa"]/corePart/parts/li[def = "Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "AURA_AuRa"]/corePart/parts/li[def = "AURA_AuRaTail"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "AURA_AuRa"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "AURA_AuRa"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "AURA_AuRa"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "AURA_AuRa"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Ear"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "AURA_AuRa"]/corePart/parts/li[def = "Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "AURA_AuRa"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "AURA_AuRa"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "AURA_AuRa"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/parts/li[def = "Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "AURA_AuRa"]/corePart/parts/li[def = "Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "AURA_AuRa"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "AURA_AuRa"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/parts/li[def = "Toe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Au Ra/Patches/Erin's Au Ra/PawnKinds.xml b/ModPatches/Erin's Au Ra/Patches/Erin's Au Ra/PawnKinds.xml
new file mode 100644
index 0000000000..c6f58bdb0b
--- /dev/null
+++ b/ModPatches/Erin's Au Ra/Patches/Erin's Au Ra/PawnKinds.xml	
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Give ammo to pawns. ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="AURA_RaenTribalBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>12</min>
+					<max>20</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>NeolithicMeleeBasic</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			@Name="AURA_RaenOutlanderBase" or
+			@Name="AURA_RaenMercenaryMercenaryBase" or
+			@Name="AURA_RaenPirateBase" or
+			defName="AURA_RaenAncientSoldier"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>8</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Au Ra/Patches/Erin's Au Ra/Race_AuRa.xml b/ModPatches/Erin's Au Ra/Patches/Erin's Au Ra/Race_AuRa.xml
new file mode 100644
index 0000000000..f9410194ce
--- /dev/null
+++ b/ModPatches/Erin's Au Ra/Patches/Erin's Au Ra/Race_AuRa.xml	
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="AURA_AuRa"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="AURA_AuRa"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="AURA_AuRa"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="AURA_AuRa"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<CarryWeight>35</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="AURA_AuRa"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="AURA_AuRa"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Auronya Biotech/Patches/Erin's Auronya Biotech/Auronya_Hediffs_BodyParts.xml b/ModPatches/Erin's Auronya Biotech/Patches/Erin's Auronya Biotech/Auronya_Hediffs_BodyParts.xml
new file mode 100644
index 0000000000..91e3931d00
--- /dev/null
+++ b/ModPatches/Erin's Auronya Biotech/Patches/Erin's Auronya Biotech/Auronya_Hediffs_BodyParts.xml	
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ERN_AuronyaClaws"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>8</power>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.18</armorPenetrationSharp>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<cooldownTime>1.5</cooldownTime>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Auronya/Patches/Erin's Auronya/PawnKinds_Auronya.xml b/ModPatches/Erin's Auronya/Patches/Erin's Auronya/PawnKinds_Auronya.xml
new file mode 100644
index 0000000000..e2f097d0f2
--- /dev/null
+++ b/ModPatches/Erin's Auronya/Patches/Erin's Auronya/PawnKinds_Auronya.xml	
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Give ammo to pawns. ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="ERN_KoyanTribalBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>12</min>
+					<max>20</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>NeolithicMeleeBasic</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			@Name="ERN_KoyanOutlanderBase" or
+			@Name="ERN_KoyanMercenaryBase" or
+			@Name="ERN_KoyanPirateBase" or
+			defName="ERN_KoyanAncientSoldier"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>8</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Auronya/Patches/Erin's Auronya/Race_Auronya.xml b/ModPatches/Erin's Auronya/Patches/Erin's Auronya/Race_Auronya.xml
new file mode 100644
index 0000000000..ab18742f7e
--- /dev/null
+++ b/ModPatches/Erin's Auronya/Patches/Erin's Auronya/Race_Auronya.xml	
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Koyan"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Koyan"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Koyan"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Koyan"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<NightVisionEfficiency>0.4</NightVisionEfficiency>
+			<MeleeDodgeChance>1.25</MeleeDodgeChance>
+			<MeleeCritChance>0.8</MeleeCritChance>
+			<MeleeParryChance>0.85</MeleeParryChance>
+			<CarryWeight>35</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Koyan"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.07</chanceFactor>
+					<armorPenetrationSharp>0.9</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
+					<soundMeleeHit>Pawn_Melee_HumanBite_Hit</soundMeleeHit>
+					<soundMeleeMiss>Pawn_Melee_HumanBite_Miss</soundMeleeMiss>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Koyan"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Azaphrae/Patches/Erin's Azaphrae/Animal_Nuzox.xml b/ModPatches/Erin's Azaphrae/Patches/Erin's Azaphrae/Animal_Nuzox.xml
new file mode 100644
index 0000000000..c9b38ae3ff
--- /dev/null
+++ b/ModPatches/Erin's Azaphrae/Patches/Erin's Azaphrae/Animal_Nuzox.xml	
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ======= Nuzox Animal Stats ======= -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ERN_Nuzox"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ERN_Nuzox"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.28</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+			<MeleeParryChance>0.02</MeleeParryChance>
+			<SightsEfficiency>1</SightsEfficiency>
+			<AimingAccuracy>0.8</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ERN_Nuzox"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>false</hasStandardCommand>
+					<defaultProjectile>ERN_NuzoxSpit</defaultProjectile>
+					<burstShotCount>1</burstShotCount>
+					<warmupTime>1.5</warmupTime>
+					<range>10</range>
+					<minRange>2</minRange>
+					<muzzleFlashScale>1</muzzleFlashScale>
+					<label>Nuzox Spit</label>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- ======= Nuzox Projectile Stats ======= -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ERN_NuzoxSpit"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ERN_NuzoxSpit"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<damageDef>ERN_NuzoxSpit</damageDef>
+				<damageAmountBase>2</damageAmountBase>
+				<explosionRadius>0.5</explosionRadius>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+				<speed>18</speed>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<postExplosionSpawnThingDef>ERN_NuzoxSlime</postExplosionSpawnThingDef>
+				<preExplosionSpawnChance>1</preExplosionSpawnChance>
+				<postExplosionSpawnThingCount>2</postExplosionSpawnThingCount>
+				<explosionEffect>ExtinguisherExplosion</explosionEffect>
+			</projectile>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Azaphrae/Patches/Erin's Azaphrae/Hediff_Racial_Azaphrae.xml b/ModPatches/Erin's Azaphrae/Patches/Erin's Azaphrae/Hediff_Racial_Azaphrae.xml
new file mode 100644
index 0000000000..98e6bb19a6
--- /dev/null
+++ b/ModPatches/Erin's Azaphrae/Patches/Erin's Azaphrae/Hediff_Racial_Azaphrae.xml	
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ======= Adjusted Hediff Stats ======= -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ERN_AzaphraeMale"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.10</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Azaphrae/Patches/Erin's Azaphrae/PawnKinds.xml b/ModPatches/Erin's Azaphrae/Patches/Erin's Azaphrae/PawnKinds.xml
new file mode 100644
index 0000000000..6ee87ca692
--- /dev/null
+++ b/ModPatches/Erin's Azaphrae/Patches/Erin's Azaphrae/PawnKinds.xml	
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ======= Give Ammo to PawnKinds ======= -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="ERN_MercenaryMercenaryBase" or @Name="ERN_AzaphraeOutlanderBase" or @Name="ERN_AzaphraePirateBase" or defName="ERN_AzaphraeAncientSoldier"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>8</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="ERN_AzaphraeTribalBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>12</min>
+					<max>20</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>NeolithicMeleeBasic</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Azaphrae/Patches/Erin's Azaphrae/Race_Azaphrae.xml b/ModPatches/Erin's Azaphrae/Patches/Erin's Azaphrae/Race_Azaphrae.xml
new file mode 100644
index 0000000000..5ec16b8058
--- /dev/null
+++ b/ModPatches/Erin's Azaphrae/Patches/Erin's Azaphrae/Race_Azaphrae.xml	
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Azaphrae"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Azaphrae"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Azaphrae"]</xpath>
+			<value>
+				<comps>
+					<li>
+						<compClass>CombatExtended.CompPawnGizmo</compClass>
+					</li>
+					<li Class="CombatExtended.CompProperties_Suppressable"/>
+				</comps>
+			</value>
+		</nomatch>
+
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Azaphrae"]/comps</xpath>
+			<value>
+				<li>
+					<compClass>CombatExtended.CompPawnGizmo</compClass>
+				</li>
+				<li Class="CombatExtended.CompProperties_Suppressable"/>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Azaphrae"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<CarryWeight>35</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Azaphrae"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.89</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.07</chanceFactor>
+					<armorPenetrationSharp>0.725</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.150</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.35</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.850</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Azaphrae/Patches/Erin's Azaphrae/Scenarios_Azaphrae.xml b/ModPatches/Erin's Azaphrae/Patches/Erin's Azaphrae/Scenarios_Azaphrae.xml
new file mode 100644
index 0000000000..ba8d84a1d9
--- /dev/null
+++ b/ModPatches/Erin's Azaphrae/Patches/Erin's Azaphrae/Scenarios_Azaphrae.xml	
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="ERN_AzaphraeCrashlanded"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_303British_FMJ</thingDef>
+				<count>100</count>
+			</li>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_44Magnum_FMJ</thingDef>
+				<count>120</count>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ScenarioDef[defName="ERN_AzaphraeCrashlanded"]/scenario/parts/li[thingDef="Apparel_FlakPants"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ScenarioDef[defName="ERN_AzaphraeCrashlanded"]/scenario/parts/li[thingDef="Apparel_FlakVest"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ScenarioDef[defName="ERN_AzaphraeCrashlanded"]/scenario/parts/li[thingDef="Apparel_AdvancedHelmet"]</xpath>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Chocobos/Patches/Erin's Chocobos/Erin_Chocobos.xml b/ModPatches/Erin's Chocobos/Patches/Erin's Chocobos/Erin_Chocobos.xml
new file mode 100644
index 0000000000..9f735567ba
--- /dev/null
+++ b/ModPatches/Erin's Chocobos/Patches/Erin's Chocobos/Erin_Chocobos.xml	
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ERN_Chocobo"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ERN_Chocobo"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.22</MeleeDodgeChance>
+			<MeleeCritChance>0.11</MeleeCritChance>
+			<MeleeParryChance>0.03</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ERN_Chocobo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.52</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.52</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>8.3</power>
+					<cooldownTime>1.93</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.350</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.82</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.05</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Final Fantasy Races/Patches/Erin's Final Fantasy Races/PatchBodies_AuRa.xml b/ModPatches/Erin's Final Fantasy Races/Patches/Erin's Final Fantasy Races/PatchBodies_AuRa.xml
new file mode 100644
index 0000000000..5736d631e7
--- /dev/null
+++ b/ModPatches/Erin's Final Fantasy Races/Patches/Erin's Final Fantasy Races/PatchBodies_AuRa.xml	
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="AURA_AuRa"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel="right eye"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="AURA_AuRa"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel="left eye"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="AURA_AuRa"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="AURA_AuRa"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="AURA_AuRa"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="AURA_AuRa"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="AURA_AuRa"]/corePart/parts/li[def="AURA_AuRaTail"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="AURA_AuRa"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="AURA_AuRa"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="AURA_AuRa"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="AURA_AuRa"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="AURA_AuRa"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="AURA_AuRa"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="AURA_AuRa"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="AURA_AuRa"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="AURA_AuRa"]/corePart/parts/li[def="Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="AURA_AuRa"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="AURA_AuRa"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Final Fantasy Races/Patches/Erin's Final Fantasy Races/PatchBodies_MQ.xml b/ModPatches/Erin's Final Fantasy Races/Patches/Erin's Final Fantasy Races/PatchBodies_MQ.xml
new file mode 100644
index 0000000000..110f6c9c3b
--- /dev/null
+++ b/ModPatches/Erin's Final Fantasy Races/Patches/Erin's Final Fantasy Races/PatchBodies_MQ.xml	
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MQT_Miqote"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel="right eye"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MQT_Miqote"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel="left eye"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MQT_Miqote"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MQT_Miqote"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MQT_Miqote"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MQT_Miqote"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MQT_Miqote"]/corePart/parts/li[def="MQT_MiqoteTail"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MQT_Miqote"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MQT_Miqote"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MQT_Miqote"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MQT_Miqote"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MQT_Miqote"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MQT_Miqote"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MQT_Miqote"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MQT_Miqote"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MQT_Miqote"]/corePart/parts/li[def="Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MQT_Miqote"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MQT_Miqote"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Final Fantasy Races/Patches/Erin's Final Fantasy Races/PawnKinds_AuRa.xml b/ModPatches/Erin's Final Fantasy Races/Patches/Erin's Final Fantasy Races/PawnKinds_AuRa.xml
new file mode 100644
index 0000000000..c6f58bdb0b
--- /dev/null
+++ b/ModPatches/Erin's Final Fantasy Races/Patches/Erin's Final Fantasy Races/PawnKinds_AuRa.xml	
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Give ammo to pawns. ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="AURA_RaenTribalBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>12</min>
+					<max>20</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>NeolithicMeleeBasic</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			@Name="AURA_RaenOutlanderBase" or
+			@Name="AURA_RaenMercenaryMercenaryBase" or
+			@Name="AURA_RaenPirateBase" or
+			defName="AURA_RaenAncientSoldier"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>8</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Final Fantasy Races/Patches/Erin's Final Fantasy Races/PawnKinds_MQ.xml b/ModPatches/Erin's Final Fantasy Races/Patches/Erin's Final Fantasy Races/PawnKinds_MQ.xml
new file mode 100644
index 0000000000..540e0740ab
--- /dev/null
+++ b/ModPatches/Erin's Final Fantasy Races/Patches/Erin's Final Fantasy Races/PawnKinds_MQ.xml	
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Give ammo to pawns. ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="MQT_MiqoteTribalBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>12</min>
+					<max>20</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>NeolithicMeleeBasic</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			@Name="MQT_MiqoteOutlanderBase" or
+			@Name="MQT_MercenaryMercenaryBase" or
+			@Name="MQT_MiqotePirateBase" or
+			defName="MQT_MiqoteAncientSoldier"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>8</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Final Fantasy Races/Patches/Erin's Final Fantasy Races/PawnKinds_Viera.xml b/ModPatches/Erin's Final Fantasy Races/Patches/Erin's Final Fantasy Races/PawnKinds_Viera.xml
new file mode 100644
index 0000000000..1404b80bc0
--- /dev/null
+++ b/ModPatches/Erin's Final Fantasy Races/Patches/Erin's Final Fantasy Races/PawnKinds_Viera.xml	
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Give ammo to pawns. ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="ERN_VieraTribalBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>12</min>
+					<max>20</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>NeolithicMeleeBasic</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			@Name="ERN_MercenaryMercenaryBase" or
+			@Name="ERN_VieraOutlanderBase" or
+			@Name="ERN_VieraPirateBase" or
+			@Name="ERN_MercenaryMidTierBase" or
+			defName="ERN_VieraAncientSoldier"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>8</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Final Fantasy Races/Patches/Erin's Final Fantasy Races/Race_AuRa.xml b/ModPatches/Erin's Final Fantasy Races/Patches/Erin's Final Fantasy Races/Race_AuRa.xml
new file mode 100644
index 0000000000..f9410194ce
--- /dev/null
+++ b/ModPatches/Erin's Final Fantasy Races/Patches/Erin's Final Fantasy Races/Race_AuRa.xml	
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="AURA_AuRa"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="AURA_AuRa"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="AURA_AuRa"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="AURA_AuRa"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<CarryWeight>35</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="AURA_AuRa"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="AURA_AuRa"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Final Fantasy Races/Patches/Erin's Final Fantasy Races/Race_MQ.xml b/ModPatches/Erin's Final Fantasy Races/Patches/Erin's Final Fantasy Races/Race_MQ.xml
new file mode 100644
index 0000000000..2fa47d8324
--- /dev/null
+++ b/ModPatches/Erin's Final Fantasy Races/Patches/Erin's Final Fantasy Races/Race_MQ.xml	
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="MQT_Miqote"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="MQT_Miqote"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="MQT_Miqote"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="MQT_Miqote"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<NightVisionEfficiency>0.4</NightVisionEfficiency>
+			<MeleeDodgeChance>1.1</MeleeDodgeChance>
+			<MeleeCritChance>0.8</MeleeCritChance>
+			<MeleeParryChance>0.85</MeleeParryChance>
+			<CarryWeight>35</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="MQT_Miqote"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="MQT_Miqote"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Final Fantasy Races/Patches/Erin's Final Fantasy Races/Race_Viera.xml b/ModPatches/Erin's Final Fantasy Races/Patches/Erin's Final Fantasy Races/Race_Viera.xml
new file mode 100644
index 0000000000..bade1057cc
--- /dev/null
+++ b/ModPatches/Erin's Final Fantasy Races/Patches/Erin's Final Fantasy Races/Race_Viera.xml	
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Viera"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Viera"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Viera"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Viera"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<CarryWeight>35</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Viera"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Viera"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Fox Squirrel/Patches/Erin's Fox Squirrel/ThingDefs_Races.xml b/ModPatches/Erin's Fox Squirrel/Patches/Erin's Fox Squirrel/ThingDefs_Races.xml
new file mode 100644
index 0000000000..0de177e3be
--- /dev/null
+++ b/ModPatches/Erin's Fox Squirrel/Patches/Erin's Fox Squirrel/ThingDefs_Races.xml	
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === bodyShape === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="FoxSquirrel"]</xpath>
+
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="FoxSquirrel"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.22</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="FoxSquirrel"]/combatPower</xpath>
+		<value>
+			<combatPower>20</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FoxSquirrel"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.91</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.198</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.91</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.198</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.49</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>1.440</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Friendly Ferrets/Patches/Erin's Friendly Ferrets/ThingDefs_Races.xml b/ModPatches/Erin's Friendly Ferrets/Patches/Erin's Friendly Ferrets/ThingDefs_Races.xml
new file mode 100644
index 0000000000..d95bc63b49
--- /dev/null
+++ b/ModPatches/Erin's Friendly Ferrets/Patches/Erin's Friendly Ferrets/ThingDefs_Races.xml	
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === Ferret === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ERN_Ferret"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ERN_Ferret"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.27</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.02</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ERN_Ferret"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.67</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.67</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.88</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>3.00</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Lizard Doggo/Patches/Erin's Lizard Doggo/ThingDefs_Races.xml b/ModPatches/Erin's Lizard Doggo/Patches/Erin's Lizard Doggo/ThingDefs_Races.xml
new file mode 100644
index 0000000000..dff302e557
--- /dev/null
+++ b/ModPatches/Erin's Lizard Doggo/Patches/Erin's Lizard Doggo/ThingDefs_Races.xml	
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Lizard Doggo ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ERN_lizarddoggo"]</xpath>
+
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ERN_lizarddoggo"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.22</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0.04</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="ERN_lizarddoggo"]/combatPower</xpath>
+		<value>
+			<combatPower>50</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ERN_lizarddoggo"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.8</cooldownTime>
+					<armorPenetrationBlunt>0.400</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.045</armorPenetrationSharp>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.8</cooldownTime>
+					<armorPenetrationBlunt>0.400</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.045</armorPenetrationSharp>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.63</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.10</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.20</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.230</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Miqo'te/Patches/Erin's Miqo'te/Patch_Bodies.xml b/ModPatches/Erin's Miqo'te/Patches/Erin's Miqo'te/Patch_Bodies.xml
new file mode 100644
index 0000000000..a0239b2fa9
--- /dev/null
+++ b/ModPatches/Erin's Miqo'te/Patches/Erin's Miqo'te/Patch_Bodies.xml	
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MQT_Miqote"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "right eye"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MQT_Miqote"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "left eye"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MQT_Miqote"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MQT_Miqote"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MQT_Miqote"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MQT_Miqote"]/corePart/parts/li[def = "Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MQT_Miqote"]/corePart/parts/li[def = "MQT_MiqoteTail"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MQT_Miqote"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MQT_Miqote"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MQT_Miqote"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MQT_Miqote"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Ear"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MQT_Miqote"]/corePart/parts/li[def = "Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MQT_Miqote"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MQT_Miqote"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MQT_Miqote"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/parts/li[def = "Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MQT_Miqote"]/corePart/parts/li[def = "Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MQT_Miqote"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MQT_Miqote"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/parts/li[def = "Toe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Miqo'te/Patches/Erin's Miqo'te/PawnKinds.xml b/ModPatches/Erin's Miqo'te/Patches/Erin's Miqo'te/PawnKinds.xml
new file mode 100644
index 0000000000..540e0740ab
--- /dev/null
+++ b/ModPatches/Erin's Miqo'te/Patches/Erin's Miqo'te/PawnKinds.xml	
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Give ammo to pawns. ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="MQT_MiqoteTribalBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>12</min>
+					<max>20</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>NeolithicMeleeBasic</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			@Name="MQT_MiqoteOutlanderBase" or
+			@Name="MQT_MercenaryMercenaryBase" or
+			@Name="MQT_MiqotePirateBase" or
+			defName="MQT_MiqoteAncientSoldier"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>8</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Miqo'te/Patches/Erin's Miqo'te/Race_MQ.xml b/ModPatches/Erin's Miqo'te/Patches/Erin's Miqo'te/Race_MQ.xml
new file mode 100644
index 0000000000..2fa47d8324
--- /dev/null
+++ b/ModPatches/Erin's Miqo'te/Patches/Erin's Miqo'te/Race_MQ.xml	
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="MQT_Miqote"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="MQT_Miqote"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="MQT_Miqote"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="MQT_Miqote"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<NightVisionEfficiency>0.4</NightVisionEfficiency>
+			<MeleeDodgeChance>1.1</MeleeDodgeChance>
+			<MeleeCritChance>0.8</MeleeCritChance>
+			<MeleeParryChance>0.85</MeleeParryChance>
+			<CarryWeight>35</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="MQT_Miqote"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="MQT_Miqote"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Mountain Animals/Patches/Erin's Mountain Animals/ThingDefs_Races.xml b/ModPatches/Erin's Mountain Animals/Patches/Erin's Mountain Animals/ThingDefs_Races.xml
new file mode 100644
index 0000000000..d163dee8be
--- /dev/null
+++ b/ModPatches/Erin's Mountain Animals/Patches/Erin's Mountain Animals/ThingDefs_Races.xml	
@@ -0,0 +1,354 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === bodyShape === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Pika"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Snow_leopard" or defName="Pallas_cat" or defName="Argali"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Pallas Cat ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Pallas_cat"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Pallas_cat"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.55</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.55</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.85</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.254</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>0.55</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Snow Leopard ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Snow_leopard"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.26</MeleeDodgeChance>
+			<MeleeCritChance>0.20</MeleeCritChance>
+			<MeleeParryChance>0.07</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Snow_leopard"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>0.92</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>0.92</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.690</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Pika ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Pika"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>2.3</MoveSpeed>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.0</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Pika"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.69</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.013</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.69</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.013</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.95</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>3</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Argali ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Argali"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4.4</MoveSpeed>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.08</MeleeCritChance>
+			<MeleeParryChance>0.07</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Argali"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>antlers</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2.13</cooldownTime>
+					<restrictedGender>Female</restrictedGender>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3.630</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>antlers</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2.13</cooldownTime>
+					<restrictedGender>Male</restrictedGender>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.630</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Argali"]/race/baseBodySize</xpath>
+		<value>
+			<baseBodySize>0.9</baseBodySize>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Sephyr/Patches/Erin's Sephyr/Hediff_Racial_Sephyr.xml b/ModPatches/Erin's Sephyr/Patches/Erin's Sephyr/Hediff_Racial_Sephyr.xml
new file mode 100644
index 0000000000..1889a080ac
--- /dev/null
+++ b/ModPatches/Erin's Sephyr/Patches/Erin's Sephyr/Hediff_Racial_Sephyr.xml	
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ======= Adjust Hediff Stats ======= -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ERN_SephyrToughen"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ERN_SephyrToughen"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ERN_SephyrToughen"]/stages/li/statOffsets/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.35</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Sephyr/Patches/Erin's Sephyr/PawnKinds_Sephyr.xml b/ModPatches/Erin's Sephyr/Patches/Erin's Sephyr/PawnKinds_Sephyr.xml
new file mode 100644
index 0000000000..2f49f0fa4b
--- /dev/null
+++ b/ModPatches/Erin's Sephyr/Patches/Erin's Sephyr/PawnKinds_Sephyr.xml	
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ======= Give ammo to Pawnkinds ======= -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="ERN_SephyrTribalBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>12</min>
+					<max>20</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>NeolithicMeleeBasic</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			@Name="ERN_SephyrOutlanderBase" or
+			@Name="ERN_SephyrMercenaryBase" or
+			@Name="ERN_SephyrPirateBase" or
+			defName="ERN_SephyrAncientSoldier"] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>8</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Sephyr/Patches/Erin's Sephyr/Race_Sephyr.xml b/ModPatches/Erin's Sephyr/Patches/Erin's Sephyr/Race_Sephyr.xml
new file mode 100644
index 0000000000..26538e552f
--- /dev/null
+++ b/ModPatches/Erin's Sephyr/Patches/Erin's Sephyr/Race_Sephyr.xml	
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Sephyr"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Sephyr"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Sephyr"]</xpath>
+			<value>
+				<comps>
+					<li>
+						<compClass>CombatExtended.CompPawnGizmo</compClass>
+					</li>
+					<li Class="CombatExtended.CompProperties_Suppressable"/>
+				</comps>
+			</value>
+		</nomatch>
+
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Sephyr"]/comps</xpath>
+			<value>
+				<li>
+					<compClass>CombatExtended.CompPawnGizmo</compClass>
+				</li>
+				<li Class="CombatExtended.CompProperties_Suppressable"/>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Sephyr"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<CarryWeight>35</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Sephyr"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Sephyr"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Sephyr"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.35</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Sephyr"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Sephyr/Patches/Erin's Sephyr/Scenarios_Sephyr.xml b/ModPatches/Erin's Sephyr/Patches/Erin's Sephyr/Scenarios_Sephyr.xml
new file mode 100644
index 0000000000..5806037920
--- /dev/null
+++ b/ModPatches/Erin's Sephyr/Patches/Erin's Sephyr/Scenarios_Sephyr.xml	
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="ERN_SephyrCrashlanded"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_303British_FMJ</thingDef>
+				<count>100</count>
+			</li>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_44Magnum_FMJ</thingDef>
+				<count>120</count>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ScenarioDef[defName="ERN_SephyrCrashlanded"]/scenario/parts/li[thingDef="Apparel_FlakPants"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ScenarioDef[defName="ERN_SephyrCrashlanded"]/scenario/parts/li[thingDef="Apparel_FlakVest"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ScenarioDef[defName="ERN_SephyrCrashlanded"]/scenario/parts/li[thingDef="Apparel_AdvancedHelmet"]</xpath>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Shisune/Patches/Erin's Shisune/Shisune_Hediffs_BodyParts.xml b/ModPatches/Erin's Shisune/Patches/Erin's Shisune/Shisune_Hediffs_BodyParts.xml
new file mode 100644
index 0000000000..38a44f3080
--- /dev/null
+++ b/ModPatches/Erin's Shisune/Patches/Erin's Shisune/Shisune_Hediffs_BodyParts.xml	
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ERN_Fangs"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fangs</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Valheim Creatures/Patches/Erin's Valheim Creatures/Races_Animal_Frostwolf.xml b/ModPatches/Erin's Valheim Creatures/Patches/Erin's Valheim Creatures/Races_Animal_Frostwolf.xml
new file mode 100644
index 0000000000..b5e9abbd22
--- /dev/null
+++ b/ModPatches/Erin's Valheim Creatures/Patches/Erin's Valheim Creatures/Races_Animal_Frostwolf.xml	
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ERN_FrostWolf"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ERN_FrostWolf"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.27</MeleeDodgeChance>
+			<MeleeCritChance>0.10</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ERN_FrostWolf"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>1.73</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.55</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.225</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Valheim Creatures/Patches/Erin's Valheim Creatures/Races_Animal_Lox.xml b/ModPatches/Erin's Valheim Creatures/Patches/Erin's Valheim Creatures/Races_Animal_Lox.xml
new file mode 100644
index 0000000000..01fc413e9b
--- /dev/null
+++ b/ModPatches/Erin's Valheim Creatures/Patches/Erin's Valheim Creatures/Races_Animal_Lox.xml	
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ERN_Lox"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4.5</MoveSpeed>
+			<MeleeDodgeChance>0.36</MeleeDodgeChance>
+			<MeleeCritChance>0.12</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ERN_Lox"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>3.17</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.2</cooldownTime>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.2</cooldownTime>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.2</cooldownTime>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.2</cooldownTime>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>0.8</cooldownTime>
+					<chanceFactor>0.5</chanceFactor>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ERN_Lox"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="ERN_Lox"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="ERN_Lox"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ERN_Lox"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1500</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>8</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Valheim Creatures/Patches/Erin's Valheim Creatures/Races_Animal_Misthare.xml b/ModPatches/Erin's Valheim Creatures/Patches/Erin's Valheim Creatures/Races_Animal_Misthare.xml
new file mode 100644
index 0000000000..1a866c63c1
--- /dev/null
+++ b/ModPatches/Erin's Valheim Creatures/Patches/Erin's Valheim Creatures/Races_Animal_Misthare.xml	
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ERN_Misthare"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.36</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+			<MeleeParryChance>0</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ERN_Misthare"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ERN_Misthare"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Valheim Creatures/Patches/Erin's Valheim Creatures/Races_Animal_Neck.xml b/ModPatches/Erin's Valheim Creatures/Patches/Erin's Valheim Creatures/Races_Animal_Neck.xml
new file mode 100644
index 0000000000..9a97059073
--- /dev/null
+++ b/ModPatches/Erin's Valheim Creatures/Patches/Erin's Valheim Creatures/Races_Animal_Neck.xml	
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ERN_Neck"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+			<MeleeParryChance>0.08</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ERN_Neck"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.89</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.24</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ERN_Neck"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Serpentine</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Valheim Creatures/Patches/Erin's Valheim Creatures/Races_Animal_Valboar.xml b/ModPatches/Erin's Valheim Creatures/Patches/Erin's Valheim Creatures/Races_Animal_Valboar.xml
new file mode 100644
index 0000000000..2e19b1a225
--- /dev/null
+++ b/ModPatches/Erin's Valheim Creatures/Patches/Erin's Valheim Creatures/Races_Animal_Valboar.xml	
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ERN_Valboar"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ERN_Valboar"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.14</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.07</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ERN_Valboar"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tusk</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.89</cooldownTime>
+					<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>tusk</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.41</cooldownTime>
+					<chanceFactor>0.65</chanceFactor>
+					<linkedBodyPartsGroup>TuskAttackTool_2</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.57</cooldownTime>
+					<chanceFactor>0.6</chanceFactor>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Viera/Patches/Erin's Viera/PawnKinds.xml b/ModPatches/Erin's Viera/Patches/Erin's Viera/PawnKinds.xml
new file mode 100644
index 0000000000..1404b80bc0
--- /dev/null
+++ b/ModPatches/Erin's Viera/Patches/Erin's Viera/PawnKinds.xml	
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Give ammo to pawns. ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="ERN_VieraTribalBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>12</min>
+					<max>20</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>NeolithicMeleeBasic</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			@Name="ERN_MercenaryMercenaryBase" or
+			@Name="ERN_VieraOutlanderBase" or
+			@Name="ERN_VieraPirateBase" or
+			@Name="ERN_MercenaryMidTierBase" or
+			defName="ERN_VieraAncientSoldier"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>8</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Viera/Patches/Erin's Viera/Race_Viera.xml b/ModPatches/Erin's Viera/Patches/Erin's Viera/Race_Viera.xml
new file mode 100644
index 0000000000..bade1057cc
--- /dev/null
+++ b/ModPatches/Erin's Viera/Patches/Erin's Viera/Race_Viera.xml	
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Viera"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Viera"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Viera"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Viera"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<CarryWeight>35</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Viera"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Viera"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Erin's Wildlife/Patches/Erin's Wildlife/ThingDefs_Races.xml b/ModPatches/Erin's Wildlife/Patches/Erin's Wildlife/ThingDefs_Races.xml
new file mode 100644
index 0000000000..505edc6957
--- /dev/null
+++ b/ModPatches/Erin's Wildlife/Patches/Erin's Wildlife/ThingDefs_Races.xml	
@@ -0,0 +1,507 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === bodyShape === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[
+		defName="ERN_Greyfox" or
+		defName="ERN_Redpanda" or
+		defName="ERN_Hedgehog" or
+		defName="ERN_Mink" or
+		defName="ERN_Armadillo"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ERN_ptarmigan"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ERN_Gartersnake"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Serpentine</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Grey Fox === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ERN_Greyfox"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.24</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.02</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="ERN_Greyfox"]/combatPower</xpath>
+		<value>
+			<combatPower>25</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ERN_Greyfox"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.91</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.198</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.91</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.198</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.49</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>1.440</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Mink === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ERN_Mink"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.27</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.02</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ERN_Mink"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.67</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.67</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.88</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>3.00</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>	
+	</Operation>
+
+	<!-- === Hedgehog === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ERN_Hedgehog"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.17</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="ERN_Hedgehog"]/combatPower</xpath>
+		<value>
+			<combatPower>5</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ERN_Hedgehog"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.67</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.67</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.88</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>3.00</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Garter Snake === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ERN_Gartersnake"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.20</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="ERN_Gartersnake"]/combatPower</xpath>
+		<value>
+			<combatPower>5</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ERN_Gartersnake"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fangs</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2.4</cooldownTime>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>9</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2</cooldownTime>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === ERN_Armadillo === -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>
+			Defs/ThingDef[defName="ERN_Armadillo"]/statBases/ArmorRating_Blunt |
+			Defs/ThingDef[defName="ERN_Armadillo"]/statBases/ArmorRating_Sharp
+		</xpath>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ERN_Armadillo"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.17</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0.13</MeleeParryChance>
+			<ArmorRating_Blunt>0.36</ArmorRating_Blunt>
+			<ArmorRating_Sharp>0.36</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="ERN_Armadillo"]/combatPower</xpath>
+		<value>
+			<combatPower>25</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ERN_Armadillo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.55</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.55</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.85</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>8</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.254</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.55</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Red Panda === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ERN_Redpanda"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.16</MeleeDodgeChance>
+			<MeleeCritChance>0.03</MeleeCritChance>
+			<MeleeParryChance>0.02</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ERN_Redpanda"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.55</cooldownTime>
+					<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.55</cooldownTime>
+					<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.85</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>8</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.254</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.55</cooldownTime>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Ptarmigan === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ERN_ptarmigan"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.22</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ERN_ptarmigan"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.85</cooldownTime>
+					<armorPenetrationBlunt>0.096</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.65</cooldownTime>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.480</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/EvolvedOrgansRedux/Patches/EvolvedOrgansRedux/Brain_Evo_CE.xml b/ModPatches/EvolvedOrgansRedux/Patches/EvolvedOrgansRedux/Brain_Evo_CE.xml
new file mode 100644
index 0000000000..2af01a627b
--- /dev/null
+++ b/ModPatches/EvolvedOrgansRedux/Patches/EvolvedOrgansRedux/Brain_Evo_CE.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EVOR_Hediff_Brain_ButchersNails"]/stages/li[1]/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+				<MeleeHitChance>1</MeleeHitChance>
+				<MentalBreakThreshold>0.05</MentalBreakThreshold>
+				<NegotiationAbility>-1.5</NegotiationAbility>
+				<SocialImpact>-1.5</SocialImpact>
+				<AimingDelayFactor>-0.15</AimingDelayFactor>
+				<Suppressability>-0.4</Suppressability>
+			</statOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EVOR_Hediff_Brain_ReptilianFrontalCortex"]/stages/li[1]/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.12</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EVOR_Hediff_Brain_ReptilianFrontalCortex"]/stages/li[1]/statOffsets/MeleeHitChance</xpath>
+		<value>
+			<MeleeHitChance>0.5</MeleeHitChance>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/EvolvedOrgansRedux/Patches/EvolvedOrgansRedux/Ideological_organs.xml b/ModPatches/EvolvedOrgansRedux/Patches/EvolvedOrgansRedux/Ideological_organs.xml
new file mode 100644
index 0000000000..ac8239186f
--- /dev/null
+++ b/ModPatches/EvolvedOrgansRedux/Patches/EvolvedOrgansRedux/Ideological_organs.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Ideology</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="EVOR_Item_Eye_EyeOfTheVoid"]</xpath>
+					<value>
+						<statBases>
+							<NightVisionEfficiency_Implant>0.3</NightVisionEfficiency_Implant>
+						</statBases>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[defName="EVOR_Hediff_Eye_EyeOfTheVoid"]/stages/li[1]/statOffsets</xpath>
+					<value>
+						<statOffsets>
+							<MeleeHitChanceOutdoorsDarkOffset>0.3</MeleeHitChanceOutdoorsDarkOffset>
+							<MeleeHitChanceIndoorsDarkOffset>0.3</MeleeHitChanceIndoorsDarkOffset>
+							<MeleeDodgeChanceOutdoorsDarkOffset>0.15</MeleeDodgeChanceOutdoorsDarkOffset>
+							<MeleeDodgeChanceIndoorsDarkOffset>0.15</MeleeDodgeChanceIndoorsDarkOffset>
+							<NightVisionEfficiency_Implant>0.4</NightVisionEfficiency_Implant>
+						</statOffsets>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/EvolvedOrgansRedux/Patches/EvolvedOrgansRedux/Limbs_Evo_CE.xml b/ModPatches/EvolvedOrgansRedux/Patches/EvolvedOrgansRedux/Limbs_Evo_CE.xml
new file mode 100644
index 0000000000..9acb0cf884
--- /dev/null
+++ b/ModPatches/EvolvedOrgansRedux/Patches/EvolvedOrgansRedux/Limbs_Evo_CE.xml
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EVOR_Hediff_Appendage_ExtradextrousArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.11</cooldownTime>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EVOR_Hediff_Appendage_RendingClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.23</cooldownTime>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>1.29</cooldownTime>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EVOR_Hediff_Appendage_HighPressurePincer"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>pinchy</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>2.3</cooldownTime>
+					<armorPenetrationBlunt>14</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>pinchy</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>2.1</cooldownTime>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EVOR_Hediff_Appendage_SonicImpactMace"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<chanceFactor>10</chanceFactor>
+					<capacities>
+						<li>Blunt</li>
+						<li>EVOR_Cap_Sonic</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetrationBlunt>9</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>35</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EVOR_Hediff_Appendage_VenopillarArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>ScratchToxic</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.11</cooldownTime>
+					<armorPenetrationSharp>1.0</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EVOR_Hediff_Appendage_FrostMantisHook"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>EVOR_Frostbite</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.4</cooldownTime>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EVOR_Hediff_Appendage_SalamanderWhip"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>EVOR_Burn</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.4</cooldownTime>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EVOR_Hediff_Appendage_OssifiedBoneSaber"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Stab</li>
+						<li>Cut</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>0.88</cooldownTime>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EVOR_Hediff_Appendage_TriPlacedLimb"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.9</cooldownTime>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EVOR_Hediff_Tail_VenomousStinger"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>ScratchToxic</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.11</cooldownTime>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EVOR_Hediff_Appendage_WeightedTail"]/stages/li[1]/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			</statOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/EvolvedOrgansRedux/Patches/EvolvedOrgansRedux/Organ_Evo_CE.xml b/ModPatches/EvolvedOrgansRedux/Patches/EvolvedOrgansRedux/Organ_Evo_CE.xml
new file mode 100644
index 0000000000..5736d82834
--- /dev/null
+++ b/ModPatches/EvolvedOrgansRedux/Patches/EvolvedOrgansRedux/Organ_Evo_CE.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="EVOR_Item_Eye_MultispectrumEye"]</xpath>
+		<value>
+			<statBases>
+				<NightVisionEfficiency_Implant>0.3</NightVisionEfficiency_Implant>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EVOR_Hediff_Eye_MultispectrumEye"]/stages/li[1]/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<AimingDelayFactor>-0.10</AimingDelayFactor>
+				<ShootingAccuracyPawn>0.2</ShootingAccuracyPawn>
+				<NightVisionEfficiency_Implant>0.3</NightVisionEfficiency_Implant>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EVOR_Hediff_Ear_MultifrequencyEar"]/stages/li[1]/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EVOR_Hediff_Jaw_DistendableJaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Stab</li>
+						<li>Bite</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2.4</cooldownTime>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EVOR_Hediff_Jaw_VenomousFangs"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>EVOR_Cap_Toxic</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.4</cooldownTime>
+					<armorPenetrationSharp>0.6</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/EvolvedOrgansRedux/Patches/EvolvedOrgansRedux/Protec_Evo_CE.xml b/ModPatches/EvolvedOrgansRedux/Patches/EvolvedOrgansRedux/Protec_Evo_CE.xml
new file mode 100644
index 0000000000..110e7a34bb
--- /dev/null
+++ b/ModPatches/EvolvedOrgansRedux/Patches/EvolvedOrgansRedux/Protec_Evo_CE.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EVOR_Hediff_Protection_Skull_CranialPlating"]/stages/li[1]/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+				<ArmorRating_Heat>0.10</ArmorRating_Heat>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EVOR_Hediff_Protection_Torso_MultilayeredDermalPlating"]/stages/li[1]/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+				<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
+				<ArmorRating_Heat>0.20</ArmorRating_Heat>
+				<ComfyTemperatureMin>-5</ComfyTemperatureMin>
+				<ComfyTemperatureMax>10</ComfyTemperatureMax>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EVOR_Hediff_Protection_Skin_FlameRetardantSkin"]/stages/li[1]/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ArmorRating_Sharp>1</ArmorRating_Sharp>
+				<ArmorRating_Heat>0.20</ArmorRating_Heat>
+				<ComfyTemperatureMax>50</ComfyTemperatureMax>
+				<Flammability>-.6</Flammability>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EVOR_Hediff_Protection_Skin_VariableInsulationSkin"]/stages/li[1]/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ArmorRating_Sharp>0.40</ArmorRating_Sharp>
+				<ArmorRating_Heat>0.10</ArmorRating_Heat>
+				<ComfyTemperatureMin>-35</ComfyTemperatureMin>
+				<ComfyTemperatureMax>30</ComfyTemperatureMax>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EVOR_Hediff_Protection_Ribcage_CalciumAlloyRibcage"]/stages/li[1]/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ArmorRating_Blunt>2</ArmorRating_Blunt>
+				<ArmorRating_Sharp>4</ArmorRating_Sharp>
+				<ArmorRating_Heat>0.20</ArmorRating_Heat>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EVOR_Hediff_Protection_Neck_ReinforcedNeckMuscles"]/stages/li[1]/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ArmorRating_Blunt>4</ArmorRating_Blunt>
+				<ArmorRating_Sharp>1</ArmorRating_Sharp>
+			</statOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/EvolvedOrgansRedux/Patches/EvolvedOrgansRedux/Royal_organs.xml b/ModPatches/EvolvedOrgansRedux/Patches/EvolvedOrgansRedux/Royal_organs.xml
new file mode 100644
index 0000000000..5f1ab22c26
--- /dev/null
+++ b/ModPatches/EvolvedOrgansRedux/Patches/EvolvedOrgansRedux/Royal_organs.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Royalty</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[defName="EVOR_Hediff_Torso_MucousGland"]/stages/li[1]/statOffsets/MeleeDodgeChance</xpath>
+					<value>
+						<MeleeDodgeChance>0.3</MeleeDodgeChance>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/EvolvedOrgansRedux/Patches/EvolvedOrgansRedux/Torso_Evo_CE.xml b/ModPatches/EvolvedOrgansRedux/Patches/EvolvedOrgansRedux/Torso_Evo_CE.xml
new file mode 100644
index 0000000000..4bde8d7688
--- /dev/null
+++ b/ModPatches/EvolvedOrgansRedux/Patches/EvolvedOrgansRedux/Torso_Evo_CE.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EVOR_Hediff_AbdominalAndChestcavity_CombatSerumGland"]/stages/li[1]/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<MeleeDodgeChance>0.18</MeleeDodgeChance>
+				<MeleeHitChance>2</MeleeHitChance>
+			</statOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Exotic Arsenal/Defs/Exotic Arsenal/DamageDefs_Exotic.xml b/ModPatches/Exotic Arsenal/Defs/Exotic Arsenal/DamageDefs_Exotic.xml
new file mode 100644
index 0000000000..a1a61d733b
--- /dev/null
+++ b/ModPatches/Exotic Arsenal/Defs/Exotic Arsenal/DamageDefs_Exotic.xml	
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<DamageDef Name="Gauss">
+		<defName>UnleashedCE</defName>
+		<label>charge blaster shot</label>
+		<workerClass>DamageWorker_AddInjury</workerClass>
+		<externalViolence>true</externalViolence>
+		<isExplosive>true</isExplosive>
+		<deathMessage>{0} has died in an explosion.</deathMessage>
+		<hediff>Shredded</hediff>
+		<hediffSolid>Crack</hediffSolid>
+		<harmAllLayersUntilOutside>true</harmAllLayersUntilOutside>
+		<impactSoundType>Electric</impactSoundType>
+		<armorCategory>Blunt</armorCategory>
+		<minDamageToFragment>15</minDamageToFragment>
+		<defaultDamage>200</defaultDamage>
+		<defaultStoppingPower>1</defaultStoppingPower>
+		<defaultArmorPenetration>96</defaultArmorPenetration>
+		<buildingDamageFactor>4</buildingDamageFactor>
+		<plantDamageFactor>4</plantDamageFactor>
+		<explosionAffectOutsidePartsOnly>false</explosionAffectOutsidePartsOnly>
+		<explosionHeatEnergyPerCell>5</explosionHeatEnergyPerCell>
+		<explosionCellMote>UnleashedMote</explosionCellMote>
+		<soundExplosion>Explosion_EMP</soundExplosion>
+		<combatLogRules>Damage_Bomb</combatLogRules>
+	</DamageDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Exotic Arsenal/Defs/Exotic Arsenal/Exotic_Ammo_Energy.xml b/ModPatches/Exotic Arsenal/Defs/Exotic Arsenal/Exotic_Ammo_Energy.xml
new file mode 100644
index 0000000000..35c18e4524
--- /dev/null
+++ b/ModPatches/Exotic Arsenal/Defs/Exotic Arsenal/Exotic_Ammo_Energy.xml	
@@ -0,0 +1,738 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ==================== Ammo Cat========================== -->
+
+	<ThingCategoryDef>
+		<defName>Exotic_Ars</defName>
+		<label>Exotic Ammo</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberPlasmaMedium</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Equilibrium</defName>
+		<label>Exotic energy cells</label>
+		<ammoTypes>
+			<Ammo_Exotic_Energy>Bullet_Equilibrium_CE</Ammo_Exotic_Energy>
+			<Ammo_Exotic_Energy_HI>Bullet_Equilibrium_HI</Ammo_Exotic_Energy_HI>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Aesa</defName>
+		<label>Exotic energy cells</label>
+		<ammoTypes>
+			<Ammo_Exotic_Energy>Bullet_Aesa_CE</Ammo_Exotic_Energy>
+			<Ammo_Exotic_Energy_HI>Bullet_Aesa_HI</Ammo_Exotic_Energy_HI>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Shiver</defName>
+		<label>Exotic energy cells</label>
+		<ammoTypes>
+			<Ammo_Exotic_Energy>Bullet_Shiver_CE</Ammo_Exotic_Energy>
+			<Ammo_Exotic_Energy_HI>Bullet_Shiver_HI</Ammo_Exotic_Energy_HI>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Slashfire</defName>
+		<label>Exotic energy cells</label>
+		<ammoTypes>
+			<Ammo_Exotic_Energy>Bullet_Slashfire_CE</Ammo_Exotic_Energy>
+			<Ammo_Exotic_Energy_HI>Bullet_Slashfire_HI</Ammo_Exotic_Energy_HI>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_GlacialSF</defName>
+		<label>Exotic energy cells</label>
+		<ammoTypes>
+			<Ammo_Exotic_Energy>Bullet_GlacialSF_CE</Ammo_Exotic_Energy>
+			<Ammo_Exotic_Energy_HI>Bullet_GlacialSF_HI</Ammo_Exotic_Energy_HI>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_celsius</defName>
+		<label>Exotic energy cells</label>
+		<ammoTypes>
+			<Ammo_Exotic_Energy>Bullet_celsius_CE</Ammo_Exotic_Energy>
+			<Ammo_Exotic_Energy_HI>Bullet_celsius_HI</Ammo_Exotic_Energy_HI>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Oberon</defName>
+		<label>Toxic energy bolts</label>
+		<ammoTypes>
+			<Ammo_Exotic_Energy>Bullet_Oberon_CE</Ammo_Exotic_Energy>
+			<Ammo_Exotic_Energy_HI>Bullet_Oberon_HI</Ammo_Exotic_Energy_HI>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Paladin</defName>
+		<label>Hard light</label>
+		<ammoTypes>
+			<Ammo_Exotic_Energy>Bullet_Paladin_CE</Ammo_Exotic_Energy>
+			<Ammo_Exotic_Energy_HI>Bullet_Paladin_HI</Ammo_Exotic_Energy_HI>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_BFaith</defName>
+		<label>Plasma incinerator</label>
+		<ammoTypes>
+			<Ammo_Exotic_Energy>Bullet_BFaith_CE</Ammo_Exotic_Energy>
+			<Ammo_Exotic_Energy_HI>Bullet_BFaith_HI</Ammo_Exotic_Energy_HI>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Unleashed</defName>
+		<label>Exotic energy cells</label>
+		<ammoTypes>
+			<Ammo_Exotic_Energy>Bullet_Unleashed_CE</Ammo_Exotic_Energy>
+			<Ammo_Exotic_Energy_HI>Bullet_Unleashed_HI</Ammo_Exotic_Energy_HI>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== AmmoClass========================== -->
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>Exotic_Normal</defName>
+		<label>Exotic energy cell</label>
+		<labelShort>EEC</labelShort>
+		<description>The exotic energy cell does a funni.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>Exotic_Hipower</defName>
+		<label>Overcharged exotic energy cell</label>
+		<labelShort>OEEC</labelShort>
+		<description>Overcharge the energy cell to increase its power output at the cost of making it unstable and volatile. Its effects are weapon dependent, it is also usually less accurate than thr regular version.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<!-- ==================== Ammo Type ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_Exotic_Energy</defName>
+		<label>Exotic energy cells</label>
+		<description>Exotic energy cell used by rare glitterworld energy weapons.</description>
+		<statBases>
+			<Mass>0.014</Mass>
+			<Bulk>0.014</Bulk>
+			<MarketValue>0.95</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<!-- Plasma ammo can't be handloaded, and the containment cell must be precision-machined anyway -->
+		</tradeTags>
+		<thingCategories>
+			<li>Exotic_Ars</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>Things/Ammo/PlasmaCell/Rifle</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>Exotic_Normal</ammoClass>
+		<generateAllowChance>0.4</generateAllowChance>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_Exotic_Energy_HI</defName>
+		<label>Overcharged Exotic energy cells</label>
+		<description>Exotic energy cell used by rare glitterworld energy weapons. These cells in particular, exudes big dick energy.</description>
+		<statBases>
+			<Mass>0.018</Mass>
+			<Bulk>0.014</Bulk>
+			<MarketValue>1.57</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<!-- Plasma ammo can't be handloaded, and the containment cell must be precision-machined anyway -->
+		</tradeTags>
+		<thingCategories>
+			<li>Exotic_Ars</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>Things/Ammo/PlasmaCell/Rifle</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>Exotic_Hipower</ammoClass>
+		<generateAllowChance>0.2</generateAllowChance>
+		<comps>
+			<!-- Arbitarily defined cookoff explosive stats; represents a plasma containment system failing -->
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>12</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.4</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>1</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ================== New DMG================== -->
+
+	<DamageDef ParentName="Flame">
+		<defName>ExoticFlame</defName>
+		<label>prometheum flame</label>
+		<additionalHediffs>
+			<li>
+				<hediff>PrometheumSoaked</hediff>
+				<severityPerDamageDealt>0.02</severityPerDamageDealt>
+			</li>
+		</additionalHediffs>
+	</DamageDef>
+
+	<!-- ================== Projectiles Equilibrium================== -->
+
+	<ThingDef Name="BaseEquilibriumBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Equilibrium</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>1.2</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Energy_Damage</damageDef>
+			<speed>90</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseEquilibriumBullet">
+		<defName>Bullet_Equilibrium_CE</defName>
+		<label>Equilibrium shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Energy_Damage</damageDef>
+			<damageAmountBase>23</damageAmountBase>
+			<armorPenetrationSharp>24</armorPenetrationSharp>
+			<armorPenetrationBlunt>36</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>13</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseEquilibriumBullet">
+		<defName>Bullet_Equilibrium_HI</defName>
+		<label>equilibrium shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>23</damageAmountBase>
+			<armorPenetrationSharp>24</armorPenetrationSharp>
+			<armorPenetrationBlunt>36</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>20</amount>
+				</li>
+			</secondaryDamage>
+			<spreadMult>3.0</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== Aesa ================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="BaseAesaBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Aesa</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>1.2</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>ExoticFlame</damageDef>
+			<speed>168</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseAesaBullet">
+		<defName>Bullet_Aesa_CE</defName>
+		<label>aesa p40 shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>30</damageAmountBase>
+			<armorPenetrationSharp>50</armorPenetrationSharp>
+			<armorPenetrationBlunt>50</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseAesaBullet">
+		<defName>Bullet_Aesa_HI</defName>
+		<label>aesa p40 shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>50</armorPenetrationSharp>
+			<armorPenetrationBlunt>50</armorPenetrationBlunt>
+			<spreadMult>2.0</spreadMult>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<explosiveDamageType>ExoticFlame</explosiveDamageType>
+				<damageAmountBase>20</damageAmountBase>
+				<explosiveRadius>0.9</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ================== Shiver ================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="BaseShiverBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Shiver</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Stasis_Damage</damageDef>
+			<speed>150</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseShiverBullet">
+		<defName>Bullet_Shiver_CE</defName>
+		<label>frostmourne shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>18</damageAmountBase>
+			<armorPenetrationSharp>30</armorPenetrationSharp>
+			<armorPenetrationBlunt>30</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseShiverBullet">
+		<defName>Bullet_Shiver_HI</defName>
+		<label>frostmourne shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>23</damageAmountBase>
+			<armorPenetrationSharp>30</armorPenetrationSharp>
+			<armorPenetrationBlunt>30</armorPenetrationBlunt>
+			<spreadMult>2.5</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== Slashfire ================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="BaseSlashfireBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>88</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseSlashfireBullet">
+		<defName>Bullet_Slashfire_CE</defName>
+		<label>Slashfire bullet</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>15</armorPenetrationSharp>
+			<armorPenetrationBlunt>30</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>5</amount>
+				</li>
+				<li>
+					<def>Flame</def>
+					<amount>1</amount>
+					<chance>0.15</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseSlashfireBullet">
+		<defName>Bullet_Slashfire_HI</defName>
+		<label>Slashfire bullet</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>15</armorPenetrationSharp>
+			<armorPenetrationBlunt>30</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>8</amount>
+				</li>
+				<li>
+					<def>ExoticFlame</def>
+					<amount>1</amount>
+					<chance>0.15</chance>
+				</li>
+			</secondaryDamage>
+			<spreadMult>2.5</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== GlacialSF ================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="BaseGlacialSFBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>88</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGlacialSFBullet">
+		<defName>Bullet_GlacialSF_CE</defName>
+		<label>Slashfire bullet</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>16</armorPenetrationSharp>
+			<armorPenetrationBlunt>30</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Stasis_Damage</def>
+					<amount>6</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGlacialSFBullet">
+		<defName>Bullet_GlacialSF_HI</defName>
+		<label>Slashfire bullet</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>16</armorPenetrationSharp>
+			<armorPenetrationBlunt>30</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Stasis_Damage</def>
+					<amount>9</amount>
+				</li>
+			</secondaryDamage>
+			<spreadMult>2.5</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== celsius ================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="BasecelsiusBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Celsius1</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Flame</damageDef>
+			<speed>144</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BasecelsiusBullet">
+		<defName>Bullet_celsius_CE</defName>
+		<label>plasma blast</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>16</damageAmountBase>
+			<armorPenetrationSharp>30</armorPenetrationSharp>
+			<armorPenetrationBlunt>30</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BasecelsiusBullet">
+		<defName>Bullet_celsius_HI</defName>
+		<label>stasis blast</label>
+		<graphicData>
+			<texPath>Things/Projectile/Celsius2</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Stasis_Damage</damageDef>
+			<damageAmountBase>16</damageAmountBase>
+			<armorPenetrationSharp>30</armorPenetrationSharp>
+			<armorPenetrationBlunt>30</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== Oberon ================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="BaseOberonBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Oberon</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Oberon_damage</damageDef>
+			<speed>90</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseOberonBullet">
+		<defName>Bullet_Oberon_CE</defName>
+		<label>Oberon Toxin Bolt</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>24</damageAmountBase>
+			<armorPenetrationSharp>30</armorPenetrationSharp>
+			<armorPenetrationBlunt>40</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseOberonBullet">
+		<defName>Bullet_Oberon_HI</defName>
+		<label>Oberon Toxin Bolt</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>30</damageAmountBase>
+			<armorPenetrationSharp>40</armorPenetrationSharp>
+			<armorPenetrationBlunt>40</armorPenetrationBlunt>
+			<spreadMult>2.0</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== Paladin ================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="BasePaladinBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Paladin</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>2</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>HL_Bullet</damageDef>
+			<speed>400</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BasePaladinBullet">
+		<defName>Bullet_Paladin_CE</defName>
+		<label>mox8 paladin javelin shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>16</damageAmountBase>
+			<armorPenetrationSharp>40</armorPenetrationSharp>
+			<armorPenetrationBlunt>40</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BasePaladinBullet">
+		<defName>Bullet_Paladin_HI</defName>
+		<label>mox8 paladin javelin shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>21</damageAmountBase>
+			<armorPenetrationSharp>40</armorPenetrationSharp>
+			<armorPenetrationBlunt>40</armorPenetrationBlunt>
+			<spreadMult>2.5</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== BFaith ================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="BaseBFaithBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/BFBullet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>1.2</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Flame</damageDef>
+			<speed>148</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseBFaithBullet">
+		<defName>Bullet_BFaith_CE</defName>
+		<label>blinding faith plasma</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>16</damageAmountBase>
+			<armorPenetrationSharp>24</armorPenetrationSharp>
+			<armorPenetrationBlunt>5</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseBFaithBullet">
+		<defName>Bullet_BFaith_HI</defName>
+		<label>blinding faith plasma</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>11</damageAmountBase>
+			<armorPenetrationSharp>32</armorPenetrationSharp>
+			<armorPenetrationBlunt>5</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ExoticFlame</def>
+					<amount>5</amount>
+				</li>
+			</secondaryDamage>
+			<spreadMult>2.5</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== Unleashed ================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="BaseUnleashedBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/ChargeBlaster</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>88</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseUnleashedBullet">
+		<defName>Bullet_Unleashed_CE</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>41</damageAmountBase>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<armorPenetrationSharp>60</armorPenetrationSharp>
+			<armorPenetrationBlunt>38.005</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<explosiveDamageType>UnleashedCE</explosiveDamageType>
+				<explosiveRadius>2.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseUnleashedBullet">
+		<defName>Bullet_Unleashed_HI</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>41</damageAmountBase>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<armorPenetrationSharp>60</armorPenetrationSharp>
+			<armorPenetrationBlunt>38.005</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<explosiveDamageType>UnleashedCE</explosiveDamageType>
+				<explosiveRadius>3.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ================== Ammo make ================== -->
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_Exotic_Energy</defName>
+		<label>make exotic energy cell x100</label>
+		<description>Craft 100 exotic energy cell.</description>
+		<jobString>Making exotic energy cell.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Plasteel</li>
+				<li>FSX</li>
+				<li>Prometheum</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Exotic_Energy>100</Ammo_Exotic_Energy>
+		</products>
+		<workAmount>4000</workAmount>
+		<researchPrerequisite>Exotic_Decoding</researchPrerequisite>
+		<recipeUsers>
+			<li>Exotic_Bench</li>
+		</recipeUsers>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_Exotic_Energy_HI</defName>
+		<label>make overcharged exotic energy cell x100</label>
+		<description>Craft 100 overcharged exotic energy cell.</description>
+		<jobString>Making overcharged exotic energy cell.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Plasteel</li>
+				<li>FSX</li>
+				<li>Prometheum</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Exotic_Energy_HI>100</Ammo_Exotic_Energy_HI>
+		</products>
+		<workAmount>8000</workAmount>
+		<researchPrerequisite>Exotic_Decoding</researchPrerequisite>
+		<recipeUsers>
+			<li>Exotic_Bench</li>
+		</recipeUsers>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Exotic Arsenal/Defs/Exotic Arsenal/Exotic_Ammo_Others.xml b/ModPatches/Exotic Arsenal/Defs/Exotic Arsenal/Exotic_Ammo_Others.xml
new file mode 100644
index 0000000000..6b01e6ce8f
--- /dev/null
+++ b/ModPatches/Exotic Arsenal/Defs/Exotic Arsenal/Exotic_Ammo_Others.xml	
@@ -0,0 +1,583 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_5mmMono</defName>
+		<label>Monomolecular shards</label>
+		<ammoTypes>
+			<Ammo_5mmMono_Steel>Bullet_5mm_MonoSteel</Ammo_5mmMono_Steel>
+			<Ammo_5mmMono_Plasteel>Bullet_5mm_MonoPlasteel</Ammo_5mmMono_Plasteel>
+			<Ammo_5mmMono_Uranium>Bullet_5mm_MonoUranium</Ammo_5mmMono_Uranium>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Judgment</defName>
+		<label>8 gauge cluster shells</label>
+		<ammoTypes>
+			<Ammo_Judgment_Buck>Bullet_Judgment_CE</Ammo_Judgment_Buck>
+			<Ammo_Judgment_HE>Bullet_Judgment_HE</Ammo_Judgment_HE>
+			<Ammo_Judgment_Mayhem>Bullet_Judgment_Mayhem</Ammo_Judgment_Mayhem>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== AmmoClass========================== -->
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>Exotic_Monoshard</defName>
+		<label>Monosteel</label>
+		<labelShort>Monosteel</labelShort>
+		<description>Wickedly sharp and resilient monomolecular bullets.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>Exotic_Monoshard2</defName>
+		<label>MonoPlasteel</label>
+		<labelShort>MonoPlasteel</labelShort>
+		<description>Wickedly sharp and resilient monomolecular bullets. This one is made out of plasteel.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>Exotic_Monoshard3</defName>
+		<label>MonoUranium</label>
+		<labelShort>MonoUranium</labelShort>
+		<description>Wickedly sharp and resilient monomolecular bullets. This one features a heavy depleted uranium core.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>Exotic_Buck</defName>
+		<label>High Explosive Buckshot</label>
+		<labelShort>HE buckshot</labelShort>
+		<description>Large scattershot pellets tipped with a small explosive charge.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>Exotic_Cluster</defName>
+		<label>Cluster shot</label>
+		<labelShort>Cluster</labelShort>
+		<description>You should test fire it inside your base and see what it does.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>Exotic_Mayhem</defName>
+		<label>Mayhem shot</label>
+		<labelShort>Mayhem</labelShort>
+		<description>Fuck around and find out.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="5mmMonoBase" ParentName="SmallAmmoBase" Abstract="True">
+		<description>This high-velocity monomolecular shard is only fired by exotic glitterworld weapons.</description>
+		<statBases>
+			<Mass>0.007</Mass>
+			<Bulk>0.007</Bulk>
+		</statBases>
+		<thingCategories>
+			<li>Exotic_Ars</li>
+		</thingCategories>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="5mmMonoBase">
+		<defName>Ammo_5mmMono_Steel</defName>
+		<label>5mm Monoshard</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/FMJ</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.08</MarketValue>
+		</statBases>
+		<ammoClass>Exotic_Monoshard</ammoClass>
+		<generateAllowChance>0.1</generateAllowChance>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="5mmMonoBase">
+		<defName>Ammo_5mmMono_Plasteel</defName>
+		<label>5mm Monoshard (plasteel)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/AP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.18</MarketValue>
+		</statBases>
+		<ammoClass>Exotic_Monoshard2</ammoClass>
+		<generateAllowChance>0</generateAllowChance>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="5mmMonoBase">
+		<defName>Ammo_5mmMono_Uranium</defName>
+		<label>5mm Monoshard (uranium)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/Sabot</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<Mass>0.012</Mass>
+			<MarketValue>0.18</MarketValue>
+		</statBases>
+		<ammoClass>Exotic_Monoshard3</ammoClass>
+		<generateAllowChance>0</generateAllowChance>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="JudgmentBase" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Exotic shotgunshell, contains multiple high explosive submunition within.</description>
+		<statBases>
+			<Mass>0.05</Mass>
+			<Bulk>0.1</Bulk>
+		</statBases>
+		<thingCategories>
+			<li>Exotic_Ars</li>
+		</thingCategories>
+		<stackLimit>1000</stackLimit>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="12GaugeBase">
+		<defName>Ammo_Judgment_Buck</defName>
+		<label>8 gauge Judgment shell (APHE)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Shotgun/Shot</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.18</MarketValue>
+		</statBases>
+		<ammoClass>Exotic_Buck</ammoClass>
+		<generateAllowChance>0.1</generateAllowChance>
+		<cookOffProjectile>Bullet_Judgment_CE</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="12GaugeBase">
+		<defName>Ammo_Judgment_HE</defName>
+		<label>8 gauge Judgment shell (Cluster HE)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Shotgun/Shot</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.32</MarketValue>
+		</statBases>
+		<ammoClass>Exotic_Cluster</ammoClass>
+		<generateAllowChance>0.05</generateAllowChance>
+		<cookOffProjectile>Bullet_Judgment_HE</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="12GaugeBase">
+		<defName>Ammo_Judgment_Mayhem</defName>
+		<label>8 gauge Judgment shell (Mayhem)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Shotgun/Slug</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.45</MarketValue>
+		</statBases>
+		<ammoClass>Exotic_Mayhem</ammoClass>
+		<generateAllowChance>0</generateAllowChance>
+		<cookOffProjectile>Bullet_Judgment_Mayhem</cookOffProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseFragment">
+		<defName>Mayhem_Bomblet</defName>
+		<label>bomblet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Sling/Stone</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Fragment</damageDef>
+			<damageAmountBase>5</damageAmountBase>
+			<speed>10</speed>
+			<armorPenetrationSharp>3</armorPenetrationSharp>
+			<armorPenetrationBlunt>10</armorPenetrationBlunt>
+			<gravityFactor>15</gravityFactor>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>38</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.9</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>9</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="Base5mmMonoBullet" ParentName="BaseBulletCE" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Tyrant</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>200</speed>
+			<dropsCasings>false</dropsCasings>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base5mmMonoBullet">
+		<defName>Bullet_5mm_MonoSteel</defName>
+		<label>5mm monoshard</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>18</armorPenetrationSharp>
+			<armorPenetrationBlunt>31.980</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base5mmMonoBullet">
+		<defName>Bullet_5mm_MonoPlasteel</defName>
+		<label>5mm monoshard(plasteel)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>300</speed>
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationSharp>40</armorPenetrationSharp>
+			<armorPenetrationBlunt>24.80</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base5mmMonoBullet">
+		<defName>Bullet_5mm_MonoUranium</defName>
+		<label>5mm monoshard (uranium)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>260</speed>
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationSharp>30</armorPenetrationSharp>
+			<armorPenetrationBlunt>51.980</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base12GaugeBullet">
+		<defName>Bullet_Judgment_CE</defName>
+		<label>buckshot pellet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shotgun_Pellet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>9</damageAmountBase>
+			<pelletCount>8</pelletCount>
+			<armorPenetrationSharp>5</armorPenetrationSharp>
+			<armorPenetrationBlunt>6.52</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>4</amount>
+				</li>
+			</secondaryDamage>
+			<spreadMult>17.8</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base12GaugeBullet">
+		<defName>Bullet_Judgment_HE</defName>
+		<label>Cluster</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shotgun_Pellet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>3</damageAmountBase>
+			<pelletCount>7</pelletCount>
+			<armorPenetrationSharp>5</armorPenetrationSharp>
+			<armorPenetrationBlunt>6.52</armorPenetrationBlunt>
+			<spreadMult>36.6</spreadMult>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>30</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.9</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>1</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base12GaugeBullet">
+		<defName>Bullet_Judgment_Mayhem</defName>
+		<label>Mayhem</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationSharp>5</armorPenetrationSharp>
+			<armorPenetrationBlunt>7.52</armorPenetrationBlunt>
+			<speed>24</speed>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>10</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.9</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Mayhem_Bomblet>7</Mayhem_Bomblet>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_5mmMono_Steel</defName>
+		<label>make 5mm Monoshard x500</label>
+		<description>Craft 500 5mm Monoshard.</description>
+		<jobString>Making 5mm Monoshard.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_5mmMono_Steel>500</Ammo_5mmMono_Steel>
+		</products>
+		<workAmount>2500</workAmount>
+		<researchPrerequisite>Exotic_Decoding</researchPrerequisite>
+		<recipeUsers>
+			<li>Exotic_Bench</li>
+		</recipeUsers>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_5mmMono_Plasteel</defName>
+		<label>make 5mm Monoshard (plasteel) x500</label>
+		<description>Craft 5mm Monoshard (plasteel).</description>
+		<jobString>Making 5mm Monoshard (plasteel).</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_5mmMono_Plasteel>500</Ammo_5mmMono_Plasteel>
+		</products>
+		<workAmount>5000</workAmount>
+		<researchPrerequisite>Exotic_Decoding</researchPrerequisite>
+		<recipeUsers>
+			<li>Exotic_Bench</li>
+		</recipeUsers>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_5mmMono_Uranium</defName>
+		<label>make 5mm monoshard (uranium) x500</label>
+		<description>Craft 5mm monoshard (uranium).</description>
+		<jobString>Making 5mm monoshard (uranium).</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Uranium</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_5mmMono_Uranium>500</Ammo_5mmMono_Uranium>
+		</products>
+		<workAmount>5000</workAmount>
+		<researchPrerequisite>Exotic_Decoding</researchPrerequisite>
+		<recipeUsers>
+			<li>Exotic_Bench</li>
+		</recipeUsers>
+	</RecipeDef>
+
+	<!-- ==================== Shotty Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_Judgment_Buck</defName>
+		<label>make APHE buckshot x100</label>
+		<description>Craft 100 APHE buckshot.</description>
+		<jobString>Making APHE buckshot.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>15</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>7</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Judgment_Buck>100</Ammo_Judgment_Buck>
+		</products>
+		<workAmount>2500</workAmount>
+		<researchPrerequisite>Exotic_Decoding</researchPrerequisite>
+		<recipeUsers>
+			<li>Exotic_Bench</li>
+		</recipeUsers>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_Judgment_HE</defName>
+		<label>make HE cluster shot x50</label>
+		<description>Craft 50 HE cluster shot.</description>
+		<jobString>Making HE cluster shot.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>15</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>7</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Judgment_HE>50</Ammo_Judgment_HE>
+		</products>
+		<workAmount>5000</workAmount>
+		<researchPrerequisite>Exotic_Decoding</researchPrerequisite>
+		<recipeUsers>
+			<li>Exotic_Bench</li>
+		</recipeUsers>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_Judgment_Mayhem</defName>
+		<label>make Mayhem Shot x25</label>
+		<description>Craft 25 Mayhem Shot.</description>
+		<jobString>Making Mayhem Shot.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>15</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>9</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>7</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Judgment_Mayhem>25</Ammo_Judgment_Mayhem>
+		</products>
+		<workAmount>7500</workAmount>
+		<researchPrerequisite>Exotic_Decoding</researchPrerequisite>
+		<recipeUsers>
+			<li>Exotic_Bench</li>
+		</recipeUsers>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Exotic Arsenal/Patches/Exotic Arsenal/Exotic_Damage_CE.xml b/ModPatches/Exotic Arsenal/Patches/Exotic Arsenal/Exotic_Damage_CE.xml
new file mode 100644
index 0000000000..29b424474e
--- /dev/null
+++ b/ModPatches/Exotic Arsenal/Patches/Exotic Arsenal/Exotic_Damage_CE.xml	
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Hard_Burn"]/injuryProps/painPerSeverity</xpath>
+		<value>
+			<painPerSeverity>0.025</painPerSeverity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Energy_Burn"]/injuryProps/painPerSeverity</xpath>
+		<value>
+			<painPerSeverity>0.025</painPerSeverity>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Exotic Arsenal/Patches/Exotic Arsenal/Exotic_Weapons_CE.xml b/ModPatches/Exotic Arsenal/Patches/Exotic Arsenal/Exotic_Weapons_CE.xml
new file mode 100644
index 0000000000..bb689d209a
--- /dev/null
+++ b/ModPatches/Exotic Arsenal/Patches/Exotic Arsenal/Exotic_Weapons_CE.xml	
@@ -0,0 +1,853 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--  ==========Remove vanilla comp==========  -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Xedos_celsius" or defName="Xedos_BFaith" or defName="Xedos_SniperRifle"]/comps</xpath>
+	</Operation>
+	<!--  ==========Resize==========  -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Xedos_Aesa" or defName="Xedos_Equilibrium" or
+			defName="Xedos_Tyrant" or
+			defName="Xedos_Shiver" or
+			defName="Xedos_celsius" or
+			defName="Xedos_Oberon" or
+			defName="Xedos_Judgement" or
+			defName="Xedos_Paladin" or
+			defName="Xedos_Unleashed" or
+			defName="Xedos_BlazeSF" or
+			defName="Xedos_GlacialSF"] </xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>0.9,0.9</DrawSize>
+				<DrawOffset>0.0,0.0</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Xedos_BFaith"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>0.95,0.95</DrawSize>
+				<DrawOffset>0.0,0.0</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Xedos_SniperRifle"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.1,1.1</DrawSize>
+				<DrawOffset>0.15,0.15</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+	<!--  ==========Space guns==========  -->
+
+	<!-- equilibrium -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Xedos_Equilibrium</defName>
+		<statBases>
+			<Mass>0.85</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.19</SwayFactor>
+			<Bulk>2.5</Bulk>
+			<WorkToMake>29000</WorkToMake>
+		</statBases>
+		<costList>
+			<Plasteel>40</Plasteel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+			<ComponentSpacer>1</ComponentSpacer>
+			<ExoticEngram>1</ExoticEngram>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Equilibrium_CE</defaultProjectile>
+			<warmupTime>0.55</warmupTime>
+			<range>24</range>
+			<soundCast>Equilibrium_Sound</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_Equilibrium</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Xedos_Aesa -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Xedos_Aesa</defName>
+		<statBases>
+			<Mass>4.8</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.9</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.5</SwayFactor>
+			<Bulk>9.95</Bulk>
+			<WorkToMake>60000</WorkToMake>
+		</statBases>
+		<costList>
+			<Plasteel>80</Plasteel>
+			<Uranium>40</Uranium>
+			<ComponentSpacer>3</ComponentSpacer>
+			<ExoticEngram>1</ExoticEngram>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Aesa_CE</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>80</range>
+			<soundCast>Aesa_Sound</soundCast>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>16</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_Aesa</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- Tyrant -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Xedos_Tyrant</defName>
+		<statBases>
+			<Mass>3.6</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>1.37</SwayFactor>
+			<Bulk>7.5</Bulk>
+			<WorkToMake>55000</WorkToMake>
+		</statBases>
+		<costList>
+			<Plasteel>80</Plasteel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+			<ComponentSpacer>3</ComponentSpacer>
+			<ExoticEngram>1</ExoticEngram>
+		</costList>
+		<Properties>
+			<recoilAmount>1.16</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_5mm_MonoSteel</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>55</range>
+			<burstShotCount>20</burstShotCount>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>150</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_5mmMono</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>10</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Xedos_Shiver -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Xedos_Shiver</defName>
+		<statBases>
+			<Mass>4.40</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.29</SwayFactor>
+			<Bulk>7.20</Bulk>
+			<WorkToMake>50000</WorkToMake>
+		</statBases>
+		<costList>
+			<Plasteel>65</Plasteel>
+			<Silver>500</Silver>
+			<ComponentIndustrial>4</ComponentIndustrial>
+			<ComponentSpacer>3</ComponentSpacer>
+			<ExoticEngram>1</ExoticEngram>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<recoilAmount>1.27</recoilAmount>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Shiver_CE</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>Frostmourne_Sound</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>45</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_Shiver</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Xedos_BlazeSF -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Xedos_BlazeSF</defName>
+		<statBases>
+			<Mass>1</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.1</SwayFactor>
+			<Bulk>3.50</Bulk>
+			<WorkToMake>29000</WorkToMake>
+		</statBases>
+		<costList>
+			<Plasteel>30</Plasteel>
+			<Uranium>10</Uranium>
+			<ComponentIndustrial>3</ComponentIndustrial>
+			<ComponentSpacer>1</ComponentSpacer>
+			<ExoticEngram>1</ExoticEngram>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<recoilAmount>1.50</recoilAmount>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Slashfire_CE</defaultProjectile>
+			<warmupTime>0.35</warmupTime>
+			<range>16</range>
+			<burstShotCount>4</burstShotCount>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>6</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>18</magazineSize>
+			<reloadTime>3.0</reloadTime>
+			<ammoSet>AmmoSet_Slashfire</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Xedos_GlacialSF -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Xedos_GlacialSF</defName>
+		<statBases>
+			<Mass>1</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.1</SwayFactor>
+			<Bulk>3.5</Bulk>
+			<WorkToMake>29000</WorkToMake>
+		</statBases>
+		<costList>
+			<Plasteel>30</Plasteel>
+			<Silver>200</Silver>
+			<ComponentIndustrial>3</ComponentIndustrial>
+			<ComponentSpacer>1</ComponentSpacer>
+			<ExoticEngram>1</ExoticEngram>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<recoilAmount>1.50</recoilAmount>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_GlacialSF_CE</defaultProjectile>
+			<warmupTime>0.35</warmupTime>
+			<range>16</range>
+			<burstShotCount>4</burstShotCount>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>18</magazineSize>
+			<reloadTime>3.0</reloadTime>
+			<ammoSet>AmmoSet_GlacialSF</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Xedos_celsius -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Xedos_celsius</defName>
+		<statBases>
+			<Mass>4.20</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.3</SwayFactor>
+			<Bulk>7.66</Bulk>
+			<WorkToMake>45000</WorkToMake>
+		</statBases>
+		<costList>
+			<Plasteel>60</Plasteel>
+			<Uranium>20</Uranium>
+			<ComponentSpacer>3</ComponentSpacer>
+			<ExoticEngram>1</ExoticEngram>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<recoilAmount>1.2</recoilAmount>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_celsius_CE</defaultProjectile>
+			<warmupTime>0.75</warmupTime>
+			<range>40</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>Celsius_Sound</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_celsius</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+		<researchPrerequisite>GasOperation</researchPrerequisite>
+	</Operation>
+
+	<!-- Xedos_Oberon -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Xedos_Oberon</defName>
+		<statBases>
+			<Mass>5.00</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.4</SwayFactor>
+			<Bulk>10.00</Bulk>
+			<WorkToMake>29000</WorkToMake>
+		</statBases>
+		<costList>
+			<Plasteel>75</Plasteel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+			<ComponentSpacer>1</ComponentSpacer>
+			<ExoticEngram>1</ExoticEngram>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Oberon_CE</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>68</range>
+			<soundCast>Oberon_Sound</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>0</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>3.0</reloadTime>
+			<ammoSet>AmmoSet_Oberon</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Xedos_Judgement -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Xedos_Judgement</defName>
+		<statBases>
+			<Mass>4.8</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.40</SwayFactor>
+			<Bulk>7.73</Bulk>
+			<WorkToMake>55000</WorkToMake>
+		</statBases>
+		<costList>
+			<Plasteel>60</Plasteel>
+			<Uranium>20</Uranium>
+			<ComponentIndustrial>4</ComponentIndustrial>
+			<ComponentSpacer>3</ComponentSpacer>
+			<ExoticEngram>1</ExoticEngram>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Judgment_CE</defaultProjectile>
+			<warmupTime>0.60</warmupTime>
+			<range>20</range>
+			<minRange>1.5</minRange>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>18</ticksBetweenBurstShots>
+			<soundCast>Judgment_Sound</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_Judgment</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- Xedos_Paladin -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Xedos_Paladin</defName>
+		<statBases>
+			<Mass>3.2</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.29</SwayFactor>
+			<Bulk>8.60</Bulk>
+			<WorkToMake>55000</WorkToMake>
+		</statBases>
+		<costList>
+			<Plasteel>60</Plasteel>
+			<Uranium>20</Uranium>
+			<ComponentIndustrial>4</ComponentIndustrial>
+			<ComponentSpacer>3</ComponentSpacer>
+			<ExoticEngram>1</ExoticEngram>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<recoilAmount>1.0</recoilAmount>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Paladin_CE</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>60</range>
+			<burstShotCount>8</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>Aesa_Sound</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>60</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_Paladin</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>4</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- Blinding Faith -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Xedos_BFaith</defName>
+		<statBases>
+			<Mass>5</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.37</SwayFactor>
+			<Bulk>8.0</Bulk>
+			<WorkToMake>55000</WorkToMake>
+		</statBases>
+		<costList>
+			<Plasteel>60</Plasteel>
+			<Uranium>20</Uranium>
+			<ComponentIndustrial>4</ComponentIndustrial>
+			<ComponentSpacer>3</ComponentSpacer>
+			<ExoticEngram>1</ExoticEngram>
+		</costList>
+		<Properties>
+			<recoilAmount>1.1</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BFaith_CE</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>50</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<soundCast>Aesa_Sound</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>35</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_BFaith</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- Blaster -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Xedos_Unleashed</defName>
+		<statBases>
+			<Mass>6.4</Mass>
+			<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.62</SwayFactor>
+			<Bulk>11.87</Bulk>
+			<WorkToMake>64000</WorkToMake>
+		</statBases>
+		<costList>
+			<Plasteel>75</Plasteel>
+			<Uranium>25</Uranium>
+			<ComponentIndustrial>6</ComponentIndustrial>
+			<ComponentSpacer>4</ComponentSpacer>
+			<ExoticEngram>1</ExoticEngram>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Unleashed_CE</defaultProjectile>
+			<warmupTime>1.4</warmupTime>
+			<range>42</range>
+			<minRange>1.5</minRange>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<ammoConsumedPerShotCount>6</ammoConsumedPerShotCount>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>24</magazineSize>
+			<reloadTime>4.8</reloadTime>
+			<ammoSet>AmmoSet_Unleashed</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Xedos_SniperRifle -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Xedos_SniperRifle</defName>
+		<statBases>
+			<Mass>5.5</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>3.6</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>0.88</SwayFactor>
+			<Bulk>10.80</Bulk>
+			<WorkToMake>55000</WorkToMake>
+		</statBases>
+		<costList>
+			<Plasteel>60</Plasteel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+			<ComponentSpacer>3</ComponentSpacer>
+			<ExoticEngram>1</ExoticEngram>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_338Norma_FMJ</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>86</range>
+			<soundCast>Shot_SniperRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>3.0</reloadTime>
+			<ammoSet>AmmoSet_338Norma</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Tools ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Xedos_BlazeSF" or defName="Xedos_GlacialSF"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.6</MeleeCritChance>
+				<MeleeParryChance>0.15</MeleeParryChance>
+				<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Xedos_BlazeSF" or defName="Xedos_GlacialSF"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Xedos_Equilibrium"]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Xedos_BlazeSF"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.24</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.24</cooldownTime>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame_Secondary</def>
+							<amount>7</amount>
+							<chance>1</chance>
+						</li>
+					</extraMeleeDamages>
+					<armorPenetrationSharp>5</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle blade</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.24</cooldownTime>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>6</amount>
+							<chance>0.6</chance>
+						</li>
+					</extraMeleeDamages>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Xedos_GlacialSF"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.24</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.24</cooldownTime>
+					<extraMeleeDamages>
+						<li>
+							<def>Stasis_Damage</def>
+							<amount>7</amount>
+							<chance>1</chance>
+						</li>
+					</extraMeleeDamages>
+					<armorPenetrationSharp>5</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle blade</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.24</cooldownTime>
+					<extraMeleeDamages>
+						<li>
+							<def>Stasis_Damage</def>
+							<amount>6</amount>
+							<chance>1</chance>
+						</li>
+					</extraMeleeDamages>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Xedos_Aesa" or
+			defName="Xedos_Tyrant" or
+			defName="Xedos_Shiver" or
+			defName="Xedos_celsius" or
+			defName="Xedos_Oberon" or
+			defName="Xedos_Judgement" or
+			defName="Xedos_Paladin" or
+			defName="Xedos_BFaith" or
+			defName="Xedos_Unleashed" or
+			defName="Xedos_SniperRifle"
+			]/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>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Defs/Expanded Materials - Metals/Arrows_Iron.xml b/ModPatches/Expanded Materials - Metals/Defs/Expanded Materials - Metals/Arrows_Iron.xml
new file mode 100644
index 0000000000..52ddd13339
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Defs/Expanded Materials - Metals/Arrows_Iron.xml	
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ==================== Arrows & Streamlined Arrows ========================== -->
+
+	<!-- ==================== Ammo Category ========================== -->
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>IronArrow</defName>
+		<label>iron arrow</label>
+		<labelShort>iron</labelShort>
+		<description>The arrow head is made from iron, capable of punching through shields and leather armor.</description>
+		<advanced>true</advanced>
+	</CombatExtended.AmmoCategoryDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoArrowBase">
+		<defName>Ammo_Arrow_Iron</defName>
+		<label>arrow (iron)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Neolithic/Arrow/Steel</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<Mass>0.034</Mass>
+			<MarketValue>0.53</MarketValue>
+		</statBases>
+		<ammoClass>IronArrow</ammoClass>
+	</ThingDef>
+
+	<!-- ================== Projectiles (short bow) ================== -->
+
+	<ThingDef ParentName="BaseArrowProjectile">
+		<defName>Projectile_Arrow_Iron</defName>
+		<label>arrow (iron)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>37</speed>
+			<damageAmountBase>7</damageAmountBase>
+			<armorPenetrationSharp>0.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>3.02</armorPenetrationBlunt>
+			<preExplosionSpawnChance>0.666</preExplosionSpawnChance><!-- 29.94 arrows per resource -->
+			<preExplosionSpawnThingDef>Ammo_Arrow_Iron</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles (Recurve Bow) ================== -->
+
+	<ThingDef ParentName="BaseStreamlinedArrowProjectile">
+		<defName>Projectile_StreamlinedArrow_Iron</defName>
+		<label>streamlined arrow (iron)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>47</speed>
+			<damageAmountBase>9</damageAmountBase>
+			<armorPenetrationSharp>1.0</armorPenetrationSharp>
+			<armorPenetrationBlunt>5.9</armorPenetrationBlunt>
+			<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>Ammo_Arrow_Iron</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>MakeAmmo_Arrow_Iron</defName>
+		<label>make iron arrows x10</label>
+		<description>Craft 10 iron arrows.</description>
+		<jobString>Making iron arrows.</jobString>
+		<workAmount>300</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>VMEu_Iron</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+				<li>VMEu_Iron</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Arrow_Iron>10</Ammo_Arrow_Iron>
+		</products>
+	</RecipeDef>
+
+	<!-- ==================== Great Arrows ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoGreatArrowBase">
+		<defName>Ammo_GreatArrow_Iron</defName>
+		<label>great arrow (iron)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Neolithic/Arrow/Steel</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<Mass>0.115</Mass>
+			<MarketValue>0.66</MarketValue>
+		</statBases>
+		<ammoClass>IronArrow</ammoClass>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGreatArrowProjectile">
+		<defName>Projectile_GreatArrow_Iron</defName>
+		<label>great arrow (iron)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>7</damageAmountBase>
+			<armorPenetrationBlunt>2.340</armorPenetrationBlunt>
+			<armorPenetrationSharp>2</armorPenetrationSharp>
+			<preExplosionSpawnChance>0.6</preExplosionSpawnChance><!-- 25 arrows per resource -->
+			<preExplosionSpawnThingDef>Ammo_GreatArrow_Iron</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>MakeAmmo_GreatArrow_Iron</defName>
+		<label>make steel great arrows x10</label>
+		<description>Craft 10 steel great arrows.</description>
+		<jobString>Making steel great arrows.</jobString>
+		<workAmount>400</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>VMEu_Iron</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_GreatArrow_Iron>10</Ammo_GreatArrow_Iron>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Arrows_ExpandedMetals.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Arrows_ExpandedMetals.xml
new file mode 100644
index 0000000000..f905bd05c7
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Arrows_ExpandedMetals.xml	
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_Arrow"]/ammoTypes</xpath>
+		<value>
+			<Ammo_Arrow_Iron>Projectile_Arrow_Iron</Ammo_Arrow_Iron>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_StreamlinedArrow"]/ammoTypes</xpath>
+		<value>
+			<Ammo_Arrow_Iron>Projectile_StreamlinedArrow_Iron</Ammo_Arrow_Iron>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_GreatArrow"]/ammoTypes</xpath>
+		<value>
+			<Ammo_GreatArrow_Iron>Projectile_GreatArrow_Iron</Ammo_GreatArrow_Iron>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/127x108mm.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/127x108mm.xml
new file mode 100644
index 0000000000..c47b6e1fae
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/127x108mm.xml	
@@ -0,0 +1,276 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_127x108mm_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>17</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>15</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_127x108mm_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_127x108mm_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>17</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>15</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_127x108mm_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing incendiary -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_127x108mm_Incendiary"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>17</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>15</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Prometheum</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_127x108mm_Incendiary"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- High-8 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_127x108mm_HE"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>13</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>15</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>FSX</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_127x108mm_HE"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Sabot -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_127x108mm_Sabot"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>17</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>15</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Uranium</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_127x108mm_Sabot"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/145x114mm.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/145x114mm.xml
new file mode 100644
index 0000000000..c6ecb69e5c
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/145x114mm.xml	
@@ -0,0 +1,276 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_145x114mm_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>26</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.8</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>17</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>23</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_145x114mm_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_145x114mm_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>26</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.8</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>17</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>23</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_145x114mm_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing incendiary -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_145x114mm_Incendiary"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>26</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.8</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>17</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>23</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Prometheum</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_145x114mm_Incendiary"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- High-8 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_145x114mm_HE"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>20</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.8</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>17</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>23</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>FSX</li>
+						</thingDefs>
+					</filter>
+					<count>14</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_145x114mm_HE"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Sabot -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_145x114mm_Sabot"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>26</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>23</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Uranium</li>
+						</thingDefs>
+					</filter>
+					<count>9</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_145x114mm_Sabot"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/20x102mmNATO.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/20x102mmNATO.xml
new file mode 100644
index 0000000000..8ebd235ec0
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/20x102mmNATO.xml	
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_20x102mmNATO_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>36</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>1.1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>23</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>31</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_20x102mmNATO_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing incendiary -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_20x102mmNATO_Incendiary"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>36</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>1.1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>23</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>31</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Prometheum</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_20x102mmNATO_Incendiary"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- High-8 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_20x102mmNATO_HE"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>29</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>1.1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>23</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>31</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>FSX</li>
+						</thingDefs>
+					</filter>
+					<count>20</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_20x102mmNATO_HE"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Sabot -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_20x102mmNATO_Sabot"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>36</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>31</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Uranium</li>
+						</thingDefs>
+					</filter>
+					<count>12</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_20x102mmNATO_Sabot"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/20x110mmHispano.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/20x110mmHispano.xml
new file mode 100644
index 0000000000..967913cc54
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/20x110mmHispano.xml	
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_20x110mmHispano_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>36</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>1.1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>23</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>31</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_20x110mmHispano_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing incendiary -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_20x110mmHispano_Incendiary"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>36</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>1.1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>23</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>31</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Prometheum</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_20x110mmHispano_Incendiary"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- High-8 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_20x110mmHispano_HE"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>29</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>1.1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>23</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>31</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>FSX</li>
+						</thingDefs>
+					</filter>
+					<count>20</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_20x110mmHispano_HE"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Sabot -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_20x110mmHispano_Sabot"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>36</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>31</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Uranium</li>
+						</thingDefs>
+					</filter>
+					<count>12</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_20x110mmHispano_Sabot"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/25x137mmNATO.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/25x137mmNATO.xml
new file mode 100644
index 0000000000..b25d488c85
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/25x137mmNATO.xml	
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_25x137mmNATO_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>71</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>2.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>44</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>61</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_25x137mmNATO_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing incendiary -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_25x137mmNATO_Incendiary"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>71</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>2.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>44</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>61</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Prometheum</li>
+						</thingDefs>
+					</filter>
+					<count>20</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_25x137mmNATO_Incendiary"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- High-8 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_25x137mmNATO_HE"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>55</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>2.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>44</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>61</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>FSX</li>
+						</thingDefs>
+					</filter>
+					<count>40</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_25x137mmNATO_HE"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Sabot -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_25x137mmNATO_Sabot"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>71</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>61</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Uranium</li>
+						</thingDefs>
+					</filter>
+					<count>24</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_25x137mmNATO_Sabot"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/300WinchesterMagnum.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/300WinchesterMagnum.xml
new file mode 100644
index 0000000000..3b6b6d06f4
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/300WinchesterMagnum.xml	
@@ -0,0 +1,276 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_300WinchesterMagnum_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_300WinchesterMagnum_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_300WinchesterMagnum_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_300WinchesterMagnum_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing incendiary -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_300WinchesterMagnum_Incendiary"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Prometheum</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_300WinchesterMagnum_Incendiary"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- High-8 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_300WinchesterMagnum_HE"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>FSX</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_300WinchesterMagnum_HE"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Sabot -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_300WinchesterMagnum_Sabot"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Uranium</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_300WinchesterMagnum_Sabot"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/30x173mmNATO.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/30x173mmNATO.xml
new file mode 100644
index 0000000000..119be4d6c4
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/30x173mmNATO.xml	
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_30x173mmNATO_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>59</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>1.8</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>37</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>50</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_30x173mmNATO_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing incendiary -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_30x173mmNATO_Incendiary"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>59</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>1.8</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>37</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>50</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Prometheum</li>
+						</thingDefs>
+					</filter>
+					<count>17</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_30x173mmNATO_Incendiary"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- High-8 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_30x173mmNATO_HE"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>46</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>1.8</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>37</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>50</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>FSX</li>
+						</thingDefs>
+					</filter>
+					<count>34</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_30x173mmNATO_HE"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Sabot -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_30x173mmNATO_Sabot"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>59</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>50</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Uranium</li>
+						</thingDefs>
+					</filter>
+					<count>20</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_30x173mmNATO_Sabot"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/338Lapua.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/338Lapua.xml
new file mode 100644
index 0000000000..3c197cd68c
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/338Lapua.xml	
@@ -0,0 +1,276 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_338Lapua_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_338Lapua_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_338Lapua_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_338Lapua_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing incendiary -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_338Lapua_Incendiary"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Prometheum</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_338Lapua_Incendiary"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- High-8 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_338Lapua_HE"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>FSX</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_338Lapua_HE"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Sabot -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_338Lapua_Sabot"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Uranium</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_338Lapua_Sabot"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/338Norma.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/338Norma.xml
new file mode 100644
index 0000000000..c2a037030b
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/338Norma.xml	
@@ -0,0 +1,276 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_338Norma_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_338Norma_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_338Norma_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_338Norma_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing incendiary -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_338Norma_Incendiary"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Prometheum</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_338Norma_Incendiary"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- High-8 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_338Norma_HE"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>FSX</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_338Norma_HE"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Sabot -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_338Norma_Sabot"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Uranium</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_338Norma_Sabot"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/408CheyenneTactical.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/408CheyenneTactical.xml
new file mode 100644
index 0000000000..3c989b304c
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/408CheyenneTactical.xml	
@@ -0,0 +1,276 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_408CheyenneTactical_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_408CheyenneTactical_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_408CheyenneTactical_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_408CheyenneTactical_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing incendiary -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_408CheyenneTactical_Incendiary"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Prometheum</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_408CheyenneTactical_Incendiary"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- High-8 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_408CheyenneTactical_HE"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>9</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>FSX</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_408CheyenneTactical_HE"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Sabot -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_408CheyenneTactical_Sabot"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Uranium</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_408CheyenneTactical_Sabot"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/40x311mmR.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/40x311mmR.xml
new file mode 100644
index 0000000000..8b352dee74
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/40x311mmR.xml	
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_40x311mmR_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>76</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>2.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>48</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>65</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_40x311mmR_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing incendiary -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_40x311mmR_Incendiary"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>76</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>2.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>48</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>65</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Prometheum</li>
+						</thingDefs>
+					</filter>
+					<count>22</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_40x311mmR_Incendiary"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- High-8 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_40x311mmR_HE"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>60</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>2.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>48</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>65</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>FSX</li>
+						</thingDefs>
+					</filter>
+					<count>43</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_40x311mmR_HE"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Sabot -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_40x311mmR_Sabot"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>76</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>65</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Uranium</li>
+						</thingDefs>
+					</filter>
+					<count>26</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_40x311mmR_Sabot"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/50BMG.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/50BMG.xml
new file mode 100644
index 0000000000..6cacb76ac5
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/50BMG.xml	
@@ -0,0 +1,276 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_50BMG_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>17</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>15</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_50BMG_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_50BMG_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>17</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>15</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_50BMG_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing incendiary -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_50BMG_Incendiary"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>17</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>15</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Prometheum</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_50BMG_Incendiary"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- High-8 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_50BMG_HE"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>13</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>15</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>FSX</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_50BMG_HE"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Sabot -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_50BMG_Sabot"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>17</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>15</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Uranium</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_50BMG_Sabot"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_10mmAuto.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_10mmAuto.xml
new file mode 100644
index 0000000000..e31783a290
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_10mmAuto.xml	
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_10mmAuto_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_10mmAuto_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_10mmAuto_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_10mmAuto_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_10mmAuto_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_10mmAuto_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_22LR.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_22LR.xml
new file mode 100644
index 0000000000..4cbb30e9a7
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_22LR.xml	
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_22LR_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_22LR_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_22LR_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_22LR_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_22LR_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_22LR_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_32ACP.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_32ACP.xml
new file mode 100644
index 0000000000..7dcb6b003b
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_32ACP.xml	
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_32ACP_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_32ACP_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_32ACP_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_32ACP_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_32ACP_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_32ACP_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_357Magnum.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_357Magnum.xml
new file mode 100644
index 0000000000..b402e00a40
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_357Magnum.xml	
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_357Magnum_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_357Magnum_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_357Magnum_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_357Magnum_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_357Magnum_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_357Magnum_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_357SIG.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_357SIG.xml
new file mode 100644
index 0000000000..f1fcfc0331
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_357SIG.xml	
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_357SIG_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_357SIG_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_357SIG_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_357SIG_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_357SIG_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_357SIG_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_40SW.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_40SW.xml
new file mode 100644
index 0000000000..74ad3972ed
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_40SW.xml	
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_40SW_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_40SW_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_40SW_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_40SW_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_40SW_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_40SW_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_44Magnum.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_44Magnum.xml
new file mode 100644
index 0000000000..9a572980c5
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_44Magnum.xml	
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_44Magnum_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_44Magnum_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_44Magnum_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_44Magnum_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_44Magnum_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_44Magnum_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_454Casull.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_454Casull.xml
new file mode 100644
index 0000000000..d16ac4a39b
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_454Casull.xml	
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_454Casull_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>14</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_454Casull_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_454Casull_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>14</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_454Casull_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_454Casull_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>14</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_454Casull_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_455Webley.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_455Webley.xml
new file mode 100644
index 0000000000..90881d7a2c
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_455Webley.xml	
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_455Webley_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_455Webley_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_455Webley_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_455Webley_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_455Webley_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_455Webley_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_45ACP.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_45ACP.xml
new file mode 100644
index 0000000000..80d71c0894
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_45ACP.xml	
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_45ACP_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>9</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_45ACP_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_45ACP_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>9</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_45ACP_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_45ACP_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>9</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_45ACP_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_45Colt.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_45Colt.xml
new file mode 100644
index 0000000000..bf8eb61ea8
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_45Colt.xml	
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_45Colt_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_45Colt_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_45Colt_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_45Colt_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_45Colt_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_45Colt_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_46x30mm.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_46x30mm.xml
new file mode 100644
index 0000000000..8f4935494e
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_46x30mm.xml	
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_46x30mm_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_46x30mm_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_46x30mm_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_46x30mm_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_46x30mm_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_46x30mm_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_500SWMagnum.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_500SWMagnum.xml
new file mode 100644
index 0000000000..a18985a37a
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_500SWMagnum.xml	
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_500SWMagnum_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>15</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.8</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>12</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_500SWMagnum_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_500SWMagnum_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>15</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.8</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>12</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_500SWMagnum_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_500SWMagnum_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>15</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.8</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>12</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_500SWMagnum_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_50AE.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_50AE.xml
new file mode 100644
index 0000000000..4be62459ba
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_50AE.xml	
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_50AE_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>12</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_50AE_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_50AE_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>12</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_50AE_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_50AE_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>12</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_50AE_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_58x21mmDAP92.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_58x21mmDAP92.xml
new file mode 100644
index 0000000000..0415a52c44
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_58x21mmDAP92.xml	
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_58x21mmDAP92_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_58x21mmDAP92_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_58x21mmDAP92_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_58x21mmDAP92_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_58x21mmDAP92_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_58x21mmDAP92_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_762x25mmTokarev.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_762x25mmTokarev.xml
new file mode 100644
index 0000000000..7a4bef757f
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_762x25mmTokarev.xml	
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x25mmTokarev_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x25mmTokarev_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x25mmTokarev_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x25mmTokarev_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x25mmTokarev_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x25mmTokarev_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_762x38mmR.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_762x38mmR.xml
new file mode 100644
index 0000000000..966ea65986
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_762x38mmR.xml	
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x38mmR_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x38mmR_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x38mmR_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x38mmR_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x38mmR_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x38mmR_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_763x25mmMauser.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_763x25mmMauser.xml
new file mode 100644
index 0000000000..a20175744a
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_763x25mmMauser.xml	
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_763x25mmMauser_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_763x25mmMauser_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_763x25mmMauser_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_763x25mmMauser_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_763x25mmMauser_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_763x25mmMauser_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_765x20mmLongue.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_765x20mmLongue.xml
new file mode 100644
index 0000000000..09b3681270
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_765x20mmLongue.xml	
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_765x20mmLongue_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_765x20mmLongue_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_765x20mmLongue_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_765x20mmLongue_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_765x20mmLongue_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_765x20mmLongue_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_9x18mmMakarov.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_9x18mmMakarov.xml
new file mode 100644
index 0000000000..597c2d4d84
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_9x18mmMakarov.xml	
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_9x18mmMakarov_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_9x18mmMakarov_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_9x18mmMakarov_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_9x18mmMakarov_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_9x18mmMakarov_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_9x18mmMakarov_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_9x19mmPara.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_9x19mmPara.xml
new file mode 100644
index 0000000000..475dc13ac1
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_9x19mmPara.xml	
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_9x19mmPara_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_9x19mmPara_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_9x19mmPara_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_9x19mmPara_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_9x19mmPara_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_9x19mmPara_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_9x21mmGyurza.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_9x21mmGyurza.xml
new file mode 100644
index 0000000000..ee5314f8e5
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_9x21mmGyurza.xml	
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_9x21mmGyurza_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_9x21mmGyurza_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_9x21mmGyurza_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_9x21mmGyurza_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_9x21mmGyurza_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_9x21mmGyurza_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_FN57x28mm.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_FN57x28mm.xml
new file mode 100644
index 0000000000..f604315cfc
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_FN57x28mm.xml	
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_FN57x28mm_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_FN57x28mm_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_FN57x28mm_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_FN57x28mm_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_FN57x28mm_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_FN57x28mm_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_127x55mmAR.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_127x55mmAR.xml
new file mode 100644
index 0000000000..7ef29b8920
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_127x55mmAR.xml	
@@ -0,0 +1,329 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_127x55mmAR_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>25</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>1.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>12</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>25</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_127x55mmAR_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_127x55mmAR_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>25</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>1.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>12</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>25</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_127x55mmAR_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_127x55mmAR_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>25</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>1.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>12</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>25</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_127x55mmAR_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing incendiary -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_127x55mmAR_Incendiary"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>25</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>1.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>12</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>25</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Prometheum</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_127x55mmAR_Incendiary"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- High-8 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_127x55mmAR_HE"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>20</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>1.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>12</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>25</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>FSX</li>
+						</thingDefs>
+					</filter>
+					<count>15</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_127x55mmAR_HE"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Sabot -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_127x55mmAR_Sabot"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>24</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>30</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Uranium</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_127x55mmAR_Sabot"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_277Fury.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_277Fury.xml
new file mode 100644
index 0000000000..f0611db357
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_277Fury.xml	
@@ -0,0 +1,329 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_277Fury_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_277Fury_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_277Fury_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_277Fury_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_277Fury_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_277Fury_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing incendiary -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_277Fury_Incendiary"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Prometheum</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_277Fury_Incendiary"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- High-8 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_277Fury_HE"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>FSX</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_277Fury_HE"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Sabot -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_277Fury_Sabot"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Uranium</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_277Fury_Sabot"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_3006Springfield.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_3006Springfield.xml
new file mode 100644
index 0000000000..dc4c86f584
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_3006Springfield.xml	
@@ -0,0 +1,329 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_3006Springfield_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>9</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_3006Springfield_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_3006Springfield_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>9</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_3006Springfield_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_3006Springfield_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>9</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_3006Springfield_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing incendiary -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_3006Springfield_Incendiary"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>9</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Prometheum</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_3006Springfield_Incendiary"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- High-8 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_3006Springfield_HE"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>FSX</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_3006Springfield_HE"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Sabot -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_3006Springfield_Sabot"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Uranium</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_3006Springfield_Sabot"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_300AACBlackout.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_300AACBlackout.xml
new file mode 100644
index 0000000000..674c173435
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_300AACBlackout.xml	
@@ -0,0 +1,329 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_300AACBlackout_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_300AACBlackout_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_300AACBlackout_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_300AACBlackout_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_300AACBlackout_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_300AACBlackout_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing incendiary -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_300AACBlackout_Incendiary"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Prometheum</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_300AACBlackout_Incendiary"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- High-8 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_300AACBlackout_HE"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>FSX</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_300AACBlackout_HE"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Sabot -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_300AACBlackout_Sabot"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Uranium</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_300AACBlackout_Sabot"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_303British.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_303British.xml
new file mode 100644
index 0000000000..8e9f6be4bb
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_303British.xml	
@@ -0,0 +1,329 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_303British_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_303British_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_303British_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_303British_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_303British_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_303British_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing incendiary -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_303British_Incendiary"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Prometheum</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_303British_Incendiary"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- High-8 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_303British_HE"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>FSX</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_303British_HE"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Sabot -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_303British_Sabot"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Uranium</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_303British_Sabot"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_30Carbine.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_30Carbine.xml
new file mode 100644
index 0000000000..8e2d13695d
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_30Carbine.xml	
@@ -0,0 +1,329 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_30Carbine_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_30Carbine_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_30Carbine_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_30Carbine_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_30Carbine_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_30Carbine_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing incendiary -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_30Carbine_Incendiary"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Prometheum</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_30Carbine_Incendiary"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- High-8 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_30Carbine_HE"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>FSX</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_30Carbine_HE"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Sabot -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_30Carbine_Sabot"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Uranium</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_30Carbine_Sabot"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_545x39mmSoviet.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_545x39mmSoviet.xml
new file mode 100644
index 0000000000..9584c7acc7
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_545x39mmSoviet.xml	
@@ -0,0 +1,329 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_545x39mmSoviet_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_545x39mmSoviet_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_545x39mmSoviet_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_545x39mmSoviet_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_545x39mmSoviet_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_545x39mmSoviet_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing incendiary -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_545x39mmSoviet_Incendiary"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Prometheum</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_545x39mmSoviet_Incendiary"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- High-8 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_545x39mmSoviet_HE"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>FSX</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_545x39mmSoviet_HE"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Sabot -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_545x39mmSoviet_Sabot"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Uranium</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_545x39mmSoviet_Sabot"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_556x45mmNATO.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_556x45mmNATO.xml
new file mode 100644
index 0000000000..2ad1652062
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_556x45mmNATO.xml	
@@ -0,0 +1,329 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_556x45mmNATO_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_556x45mmNATO_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_556x45mmNATO_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_556x45mmNATO_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_556x45mmNATO_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_556x45mmNATO_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing incendiary -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_556x45mmNATO_Incendiary"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Prometheum</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_556x45mmNATO_Incendiary"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- High-8 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_556x45mmNATO_HE"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>FSX</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_556x45mmNATO_HE"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Sabot -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_556x45mmNATO_Sabot"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Uranium</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_556x45mmNATO_Sabot"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_58x42mmDBP10.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_58x42mmDBP10.xml
new file mode 100644
index 0000000000..2f4ed62772
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_58x42mmDBP10.xml	
@@ -0,0 +1,329 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_58x42mmDBP10_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_58x42mmDBP10_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_58x42mmDBP10_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_58x42mmDBP10_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_58x42mmDBP10_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_58x42mmDBP10_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing incendiary -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_58x42mmDBP10_Incendiary"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Prometheum</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_58x42mmDBP10_Incendiary"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- High-8 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_58x42mmDBP10_HE"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>FSX</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_58x42mmDBP10_HE"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Sabot -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_58x42mmDBP10_Sabot"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Uranium</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_58x42mmDBP10_Sabot"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_65x52mmCarcano.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_65x52mmCarcano.xml
new file mode 100644
index 0000000000..f5df4318ed
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_65x52mmCarcano.xml	
@@ -0,0 +1,329 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_65x52mmCarcano_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>9</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_65x52mmCarcano_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_65x52mmCarcano_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>9</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_65x52mmCarcano_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_65x52mmCarcano_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>9</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_65x52mmCarcano_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing incendiary -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_65x52mmCarcano_Incendiary"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>9</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Prometheum</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_65x52mmCarcano_Incendiary"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- High-8 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_65x52mmCarcano_HE"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>FSX</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_65x52mmCarcano_HE"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Sabot -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_65x52mmCarcano_Sabot"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Uranium</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_65x52mmCarcano_Sabot"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_75x54mmFrench.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_75x54mmFrench.xml
new file mode 100644
index 0000000000..a6b5a9e9d3
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_75x54mmFrench.xml	
@@ -0,0 +1,329 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_75x54mmFrench_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_75x54mmFrench_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_75x54mmFrench_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_75x54mmFrench_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_75x54mmFrench_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_75x54mmFrench_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing incendiary -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_75x54mmFrench_Incendiary"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Prometheum</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_75x54mmFrench_Incendiary"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- High-8 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_75x54mmFrench_HE"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>FSX</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_75x54mmFrench_HE"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Sabot -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_75x54mmFrench_Sabot"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Uranium</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_75x54mmFrench_Sabot"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_762x39mmSoviet.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_762x39mmSoviet.xml
new file mode 100644
index 0000000000..4959742723
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_762x39mmSoviet.xml	
@@ -0,0 +1,329 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x39mmSoviet_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x39mmSoviet_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x39mmSoviet_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x39mmSoviet_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x39mmSoviet_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x39mmSoviet_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing incendiary -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x39mmSoviet_Incendiary"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Prometheum</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x39mmSoviet_Incendiary"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- High-8 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x39mmSoviet_HE"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>FSX</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x39mmSoviet_HE"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Sabot -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x39mmSoviet_Sabot"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Uranium</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x39mmSoviet_Sabot"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_762x51mmNATO.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_762x51mmNATO.xml
new file mode 100644
index 0000000000..84c59a12f6
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_762x51mmNATO.xml	
@@ -0,0 +1,329 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x51mmNATO_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x51mmNATO_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x51mmNATO_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x51mmNATO_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x51mmNATO_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x51mmNATO_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing incendiary -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x51mmNATO_Incendiary"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Prometheum</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x51mmNATO_Incendiary"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- High-8 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x51mmNATO_HE"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>FSX</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x51mmNATO_HE"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Sabot -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x51mmNATO_Sabot"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Uranium</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x51mmNATO_Sabot"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_762x54mmR.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_762x54mmR.xml
new file mode 100644
index 0000000000..21f3b9f857
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_762x54mmR.xml	
@@ -0,0 +1,329 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x54mmR_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x54mmR_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x54mmR_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x54mmR_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x54mmR_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x54mmR_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing incendiary -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x54mmR_Incendiary"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Prometheum</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x54mmR_Incendiary"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- High-8 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x54mmR_HE"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>FSX</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x54mmR_HE"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Sabot -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x54mmR_Sabot"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Uranium</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_762x54mmR_Sabot"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_77x58mmArisaka.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_77x58mmArisaka.xml
new file mode 100644
index 0000000000..2f99fe6b51
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_77x58mmArisaka.xml	
@@ -0,0 +1,329 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_77x58mmArisaka_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>9</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_77x58mmArisaka_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_77x58mmArisaka_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>9</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_77x58mmArisaka_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_77x58mmArisaka_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>9</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_77x58mmArisaka_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing incendiary -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_77x58mmArisaka_Incendiary"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>9</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Prometheum</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_77x58mmArisaka_Incendiary"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- High-8 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_77x58mmArisaka_HE"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>FSX</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_77x58mmArisaka_HE"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Sabot -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_77x58mmArisaka_Sabot"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Uranium</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_77x58mmArisaka_Sabot"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_792x33mmKurz.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_792x33mmKurz.xml
new file mode 100644
index 0000000000..d924e37077
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_792x33mmKurz.xml	
@@ -0,0 +1,329 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_792x33mmKurz_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_792x33mmKurz_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_792x33mmKurz_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_792x33mmKurz_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_792x33mmKurz_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_792x33mmKurz_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing incendiary -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_792x33mmKurz_Incendiary"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Prometheum</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_792x33mmKurz_Incendiary"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- High-8 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_792x33mmKurz_HE"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>FSX</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_792x33mmKurz_HE"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Sabot -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_792x33mmKurz_Sabot"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Uranium</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_792x33mmKurz_Sabot"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_792x57mmMauser.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_792x57mmMauser.xml
new file mode 100644
index 0000000000..569edf4cf9
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_792x57mmMauser.xml	
@@ -0,0 +1,329 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_792x57mmMauser_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>9</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_792x57mmMauser_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_792x57mmMauser_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>9</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_792x57mmMauser_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_792x57mmMauser_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>9</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_792x57mmMauser_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing incendiary -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_792x57mmMauser_Incendiary"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>9</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Prometheum</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_792x57mmMauser_Incendiary"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- High-8 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_792x57mmMauser_HE"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>FSX</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_792x57mmMauser_HE"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Sabot -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_792x57mmMauser_Sabot"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Uranium</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_792x57mmMauser_Sabot"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_8x50mmRLebel.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_8x50mmRLebel.xml
new file mode 100644
index 0000000000..31aeb56750
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_8x50mmRLebel.xml	
@@ -0,0 +1,329 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_8x50mmRLebel_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>9</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_8x50mmRLebel_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_8x50mmRLebel_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>9</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_8x50mmRLebel_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_8x50mmRLebel_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>9</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_8x50mmRLebel_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing incendiary -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_8x50mmRLebel_Incendiary"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>9</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Prometheum</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_8x50mmRLebel_Incendiary"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- High-8 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_8x50mmRLebel_HE"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>FSX</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_8x50mmRLebel_HE"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Sabot -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_8x50mmRLebel_Sabot"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Uranium</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_8x50mmRLebel_Sabot"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_9x39mmSoviet.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_9x39mmSoviet.xml
new file mode 100644
index 0000000000..218b3ec6f1
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_9x39mmSoviet.xml	
@@ -0,0 +1,329 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Full Metal Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_9x39mmSoviet_FMJ"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>9</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_9x39mmSoviet_FMJ"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Hollow Point -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_9x39mmSoviet_HP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>9</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_9x39mmSoviet_HP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_9x39mmSoviet_AP"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>9</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_9x39mmSoviet_AP"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Armor-piercing incendiary -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_9x39mmSoviet_Incendiary"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>9</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Prometheum</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_9x39mmSoviet_Incendiary"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- High-8 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_9x39mmSoviet_HE"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>7</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Copper</li>
+						</thingDefs>
+					</filter>
+					<count>0.4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>FSX</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_9x39mmSoviet_HE"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Sabot -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_9x39mmSoviet_Sabot"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Uranium</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_9x39mmSoviet_Sabot"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Sabot.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Sabot.xml
new file mode 100644
index 0000000000..28d6ded665
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Sabot.xml	
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[
+			defName="MakeAmmo_127x55mmAR_Sabot" or
+			defName="MakeAmmo_3006Springfield_Sabot" or
+			defName="MakeAmmo_300AACBlackout_Sabot" or
+			defName="MakeAmmo_303British_Sabot" or
+			defName="MakeAmmo_30Carbine_Sabot" or
+			defName="MakeAmmo_545x39mmSoviet_Sabot" or
+			defName="MakeAmmo_556x45mmNATO_Sabot" or
+			defName="MakeAmmo_58x42mmDBP10_Sabot" or
+			defName="MakeAmmo_65x52mmCarcano_Sabot" or
+			defName="MakeAmmo_75x54mmFrench_Sabot" or
+			defName="MakeAmmo_762x51mmNATO_Sabot" or
+			defName="MakeAmmo_762x39mmSoviet_Sabot" or
+			defName="MakeAmmo_762x54mmR_Sabot" or
+			defName="MakeAmmo_77x58mmArisaka_Sabot" or
+			defName="MakeAmmo_792x33mmKurz_Sabot" or
+			defName="MakeAmmo_792x57mmMauser_Sabot" or
+			defName="MakeAmmo_8x50mmRLebel_Sabot" or
+			defName="MakeAmmo_9x39mmSoviet_Sabot" or
+			defName="MakeAmmo_300WinchesterMagnum_Sabot" or
+			defName="MakeAmmo_338Lapua_Sabot" or
+			defName="MakeAmmo_338Norma_Sabot" or
+			defName="MakeAmmo_408CheyenneTactical_Sabot" or
+			defName="MakeAmmo_50BMG_Sabot" or
+			defName="MakeAmmo_127x108mm_Sabot" or
+			defName="MakeAmmo_145x114mm_Sabot" or
+			defName="MakeAmmo_20x102mmNATO_Sabot" or
+			defName="MakeAmmo_20x110mmHispano_Sabot" or
+			defName="MakeAmmo_25x137mmNATO_Sabot" or
+			defName="MakeAmmo_30x173mmNATO_Sabot" or
+			defName="MakeAmmo_40x311mmR_Sabot"]/ingredients/li[3]/filter
+		</xpath>
+		<value>
+			<filter>
+				<thingDefs>
+					<li>VMEu_Tungsten</li>
+					<li>Uranium</li>
+				</thingDefs>
+			</filter>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[
+			defName="MakeAmmo_127x55mmAR_Sabot" or
+			defName="MakeAmmo_3006Springfield_Sabot" or
+			defName="MakeAmmo_300AACBlackout_Sabot" or
+			defName="MakeAmmo_303British_Sabot" or
+			defName="MakeAmmo_30Carbine_Sabot" or
+			defName="MakeAmmo_545x39mmSoviet_Sabot" or
+			defName="MakeAmmo_556x45mmNATO_Sabot" or
+			defName="MakeAmmo_58x42mmDBP10_Sabot" or
+			defName="MakeAmmo_65x52mmCarcano_Sabot" or
+			defName="MakeAmmo_75x54mmFrench_Sabot" or
+			defName="MakeAmmo_762x51mmNATO_Sabot" or
+			defName="MakeAmmo_762x39mmSoviet_Sabot" or
+			defName="MakeAmmo_762x54mmR_Sabot" or
+			defName="MakeAmmo_77x58mmArisaka_Sabot" or
+			defName="MakeAmmo_792x33mmKurz_Sabot" or
+			defName="MakeAmmo_792x57mmMauser_Sabot" or
+			defName="MakeAmmo_8x50mmRLebel_Sabot" or
+			defName="MakeAmmo_9x39mmSoviet_Sabot" or
+			defName="MakeAmmo_300WinchesterMagnum_Sabot" or
+			defName="MakeAmmo_338Lapua_Sabot" or
+			defName="MakeAmmo_338Norma_Sabot" or
+			defName="MakeAmmo_408CheyenneTactical_Sabot" or
+			defName="MakeAmmo_50BMG_Sabot" or
+			defName="MakeAmmo_127x108mm_Sabot" or
+			defName="MakeAmmo_145x114mm_Sabot" or
+			defName="MakeAmmo_20x102mmNATO_Sabot" or
+			defName="MakeAmmo_20x110mmHispano_Sabot" or
+			defName="MakeAmmo_25x137mmNATO_Sabot" or
+			defName="MakeAmmo_30x173mmNATO_Sabot" or
+			defName="MakeAmmo_40x311mmR_Sabot"]/fixedIngredientFilter
+		</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+					<li>VMEu_Tungsten</li>
+					<li>Uranium</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Shotgun/12Gauge.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Shotgun/12Gauge.xml
new file mode 100644
index 0000000000..e985b71e7e
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Shotgun/12Gauge.xml	
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Buckshot -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_12Gauge_Buck"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>13</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_12Gauge_Buck"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Slug -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_12Gauge_Slug"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>12</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_12Gauge_Slug"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Beanbag -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_12Gauge_Beanbag"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>5</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>11</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Cloth</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_12Gauge_Beanbag"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- ElectroSlug -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_12Gauge_ElectroSlug"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>6</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>ComponentIndustrial</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_12Gauge_ElectroSlug"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Shotgun/20Gauge.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Shotgun/20Gauge.xml
new file mode 100644
index 0000000000..263584bc93
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Shotgun/20Gauge.xml	
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Buckshot -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_20Gauge_Buck"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>9</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_20Gauge_Buck"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Slug -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_20Gauge_Slug"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_20Gauge_Slug"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Beanbag -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_20Gauge_Beanbag"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>8</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Cloth</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_20Gauge_Beanbag"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- ElectroSlug -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_20Gauge_ElectroSlug"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>2</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>4</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>ComponentIndustrial</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_20Gauge_ElectroSlug"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Shotgun/23x75mmR.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Shotgun/23x75mmR.xml
new file mode 100644
index 0000000000..a64638a760
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Shotgun/23x75mmR.xml	
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Buckshot -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_23x75mmR_Buck"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>13</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>18</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>50</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_23x75mmR_Buck"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Slug -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_23x75mmR_Slug"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>13</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>18</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>46</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_23x75mmR_Slug"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- Beanbag -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_23x75mmR_Beanbag"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>13</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>18</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>42</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Cloth</li>
+						</thingDefs>
+					</filter>
+					<count>23</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_23x75mmR_Beanbag"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+
+	<!-- ElectroSlug -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_23x75mmR_ElectroSlug"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>13</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>23</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>ComponentIndustrial</li>
+						</thingDefs>
+					</filter>
+					<count>12</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_23x75mmR_ElectroSlug"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Shotgun/410Bore.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Shotgun/410Bore.xml
new file mode 100644
index 0000000000..4fb88abad4
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Shotgun/410Bore.xml	
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Buckshot -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_410Bore_Buck"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Bronze</li>
+							<li>Steel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Chemfuel</li>
+						</thingDefs>
+					</filter>
+					<count>1</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>VMEu_Lead</li>
+						</thingDefs>
+					</filter>
+					<count>3</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_410Bore_Buck"]/fixedIngredientFilter</xpath>
+		<value>
+			<fixedIngredientFilter>
+				<thingDefs>
+					<li>VMEu_Bronze</li>
+					<li>Steel</li>
+				</thingDefs>
+			</fixedIngredientFilter>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Items_Resource_Stuff.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Items_Resource_Stuff.xml
new file mode 100644
index 0000000000..aab6f04bf1
--- /dev/null
+++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Items_Resource_Stuff.xml	
@@ -0,0 +1,281 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === Iron === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VMEu_Iron"]/statBases</xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VMEu_Iron"]/stuffProps/categories</xpath>
+		<value>
+			<li>Metallic_Weapon</li>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VMEu_Iron"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.8</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VMEu_Iron"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>1.2</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Lead === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VMEu_Lead"]/statBases</xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VMEu_Lead"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.3</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VMEu_Lead"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.3</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VMEu_Lead"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>1.4</Mass>
+			<MeleePenetrationFactor>1.05</MeleePenetrationFactor>
+		</value>
+	</Operation>
+
+	<!-- === Bronze === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VMEu_Bronze"]/statBases</xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VMEu_Bronze"]/stuffProps/categories</xpath>
+		<value>
+			<li>Metallic_Weapon</li>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VMEu_Bronze"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.83</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VMEu_Bronze"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>1.24</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VMEu_Bronze"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>1.1</Mass>
+			<MeleePenetrationFactor>0.80</MeleePenetrationFactor>
+		</value>
+	</Operation>
+
+	<!-- === Tin === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VMEu_Tin"]/statBases</xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VMEu_Tin"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.13</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VMEu_Tin"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.2</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Copper === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VMEu_Copper"]/statBases</xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VMEu_Copper"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.25</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VMEu_Copper"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.32</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Tungsten === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VMEu_Tungsten"]/statBases</xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VMEu_Tungsten"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.3</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VMEu_Tungsten"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>1.8</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VMEu_Tungsten"]/stuffProps/statFactors/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>3</MaxHitPoints>
+			<Mass>2.1</Mass>
+		</value>
+	</Operation>
+
+	<!-- === Chromium === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VMEu_Chromium"]/statBases</xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VMEu_Chromium"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.6</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VMEu_Chromium"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.8</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Stainless Steel === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VMEu_StainlessSteel"]/statBases</xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VMEu_StainlessSteel"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.2</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VMEu_StainlessSteel"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>1.65</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VMEu_StainlessSteel"]/stuffProps/categories</xpath>
+		<value>
+			<li>Metallic_Weapon</li>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<!-- === Titanium === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VMEu_Titanium"]/statBases</xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VMEu_Titanium"]/stuffProps/categories</xpath>
+		<value>
+			<li>Metallic_Weapon</li>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VMEu_Titanium"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.9</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VMEu_Titanium"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>2.75</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VMEu_Titanium"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>0.7</Mass>
+			<MeleePenetrationFactor>1.2</MeleePenetrationFactor>
+		</value>
+	</Operation>
+
+	<!-- === Lithium and Germanium === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VMEu_Lithium" or defName="VMEu_Germanium"]/statBases</xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+
+	<!-- === Concrete, Rock Powder, and Fossil === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VMEu_Concrete" or defName="VMEu_RockPowder" or defName="VMEu_Fossil"]/statBases</xpath>
+		<value>
+			<Bulk>0.2</Bulk>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Plastics/Patches/Expanded Materials - Plastics/Items_Resource_Addon.xml b/ModPatches/Expanded Materials - Plastics/Patches/Expanded Materials - Plastics/Items_Resource_Addon.xml
new file mode 100644
index 0000000000..a8ad06a586
--- /dev/null
+++ b/ModPatches/Expanded Materials - Plastics/Patches/Expanded Materials - Plastics/Items_Resource_Addon.xml	
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Expanded Materials - Metals</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VMEu_CarbonFiber"]/statBases</xpath>
+					<value>
+						<Bulk>0.05</Bulk>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VMEu_CarbonFiber"]/stuffProps/categories</xpath>
+					<value>
+						<li>Metallic_Weapon</li>
+						<li>Steeled</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VMEu_CarbonFiber"]/statBases/StuffPower_Armor_Sharp</xpath>
+					<value>
+						<StuffPower_Armor_Sharp>1.4</StuffPower_Armor_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VMEu_CarbonFiber"]/statBases/StuffPower_Armor_Blunt</xpath>
+					<value>
+						<StuffPower_Armor_Blunt>1.5</StuffPower_Armor_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VMEu_CarbonFiber"]/statBases/StuffPower_Armor_Heat</xpath>
+					<value>
+						<StuffPower_Armor_Heat>0.08</StuffPower_Armor_Heat>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VMEu_CarbonFiber"]/stuffProps/statFactors</xpath>
+					<value>
+						<Mass>0.4</Mass>
+						<MeleePenetrationFactor>0.8</MeleePenetrationFactor>
+					</value>
+				</li>
+			</operations>
+		</match>
+		<nomatch Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VMEu_Fossil"]/statBases</xpath>
+					<value>
+						<Bulk>0.2</Bulk>
+					</value>
+				</li>
+
+			</operations>
+		</nomatch>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Materials - Plastics/Patches/Expanded Materials - Plastics/Items_Resource_Stuff.xml b/ModPatches/Expanded Materials - Plastics/Patches/Expanded Materials - Plastics/Items_Resource_Stuff.xml
new file mode 100644
index 0000000000..aa8bba1f45
--- /dev/null
+++ b/ModPatches/Expanded Materials - Plastics/Patches/Expanded Materials - Plastics/Items_Resource_Stuff.xml	
@@ -0,0 +1,362 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === Polyester Cloth === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VMEu_PolyesterCloth" or @Name="SynthleatherBase"]/statBases</xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="VMEu_PolyesterCloth"]/statBases/StuffPower_Armor_Sharp </xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.012</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VMEu_PolyesterCloth"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.015</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			@Name="SynthleatherBase"]/statBases/StuffPower_Armor_Sharp </xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.06</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="SynthleatherBase"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.07</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Plastic Pellets - T1 === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VMEu_PlasticPellets_TierOne"]/statBases</xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VMEu_PlasticPellets_TierOne"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.4</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VMEu_PlasticPellets_TierOne"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.6</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VMEu_PlasticPellets_TierOne"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>0.75</Mass>
+			<MeleePenetrationFactor>0.5</MeleePenetrationFactor>
+		</value>
+	</Operation>
+
+	<!-- === Plastic Pellets - T2 === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VMEu_PlasticPellets_TierTwo"]/statBases</xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VMEu_PlasticPellets_TierTwo"]/stuffProps/categories</xpath>
+		<value>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VMEu_PlasticPellets_TierTwo"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.8</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VMEu_PlasticPellets_TierTwo"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>1.2</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- UHMWPE is a fairly good thermal conductor, making it poor thermal armor. === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VMEu_PlasticPellets_TierTwo"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.01</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VMEu_PlasticPellets_TierTwo"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>0.8</Mass>
+			<MeleePenetrationFactor>0.7</MeleePenetrationFactor>
+		</value>
+	</Operation>
+
+	<!-- === Misc. === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VMEu_AsphaltMix" or defName="VMEu_LiquidPlastic_TierOne" or defName="VMEu_LiquidPlastic_TierTwo"]/statBases</xpath>
+		<value>
+			<Bulk>0.1</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VMEu_NylonRoll"]/statBases</xpath>
+		<value>
+			<Bulk>0.05</Bulk>
+		</value>
+	</Operation>
+
+	<!-- === Shell Recipes === -->
+
+	<!-- === HE === -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_HighExplosive"]/ingredients/li[2]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_HighExplosive"]/fixedIngredientFilter/thingDefs/li[.="Chemfuel"]</xpath>
+		<value>
+			<li>FSX</li>
+			<li>ComponentIndustrial</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_HighExplosive"]/workAmount</xpath>
+		<value>
+			<workAmount>10600</workAmount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_HighExplosive"]/products</xpath>
+		<value>
+			<products>
+				<Shell_HighExplosive>5</Shell_HighExplosive>
+			</products>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_HighExplosive"]/ingredients</xpath>
+		<value>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Incendiary === -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_Incendiary"]/ingredients/li[2]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_Incendiary"]/fixedIngredientFilter/thingDefs/li[.="Chemfuel"]</xpath>
+		<value>
+			<li>Prometheum</li>
+			<li>ComponentIndustrial</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_Incendiary"]/workAmount</xpath>
+		<value>
+			<workAmount>9000</workAmount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_Incendiary"]/products</xpath>
+		<value>
+			<products>
+				<Shell_Incendiary>5</Shell_Incendiary>
+			</products>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_Incendiary"]/ingredients</xpath>
+		<value>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === EMP === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_EMP"]/workAmount</xpath>
+		<value>
+			<workAmount>13800</workAmount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_EMP"]/products</xpath>
+		<value>
+			<products>
+				<Shell_EMP>5</Shell_EMP>
+			</products>
+		</value>
+	</Operation>
+
+	<!-- === Smoke === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_Smoke"]/fixedIngredientFilter/thingDefs</xpath>
+		<value>
+			<li>Prometheum</li>
+			<li>ComponentIndustrial</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_Smoke"]/workAmount</xpath>
+		<value>
+			<workAmount>6600</workAmount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_Smoke"]/products</xpath>
+		<value>
+			<products>
+				<Shell_Smoke>5</Shell_Smoke>
+			</products>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_Smoke"]/ingredients</xpath>
+		<value>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Firefoam === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_Firefoam"]/fixedIngredientFilter/thingDefs</xpath>
+		<value>
+			<li>ComponentIndustrial</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_Firefoam"]/fixedIngredientFilter</xpath>
+		<value>
+			<categories>
+				<li>MeatRaw</li>
+			</categories>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_Firefoam"]/workAmount</xpath>
+		<value>
+			<workAmount>8800</workAmount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_Firefoam"]/products</xpath>
+		<value>
+			<products>
+				<Shell_Firefoam>5</Shell_Firefoam>
+			</products>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_Firefoam"]/ingredients</xpath>
+		<value>
+			<li>
+				<filter>
+					<categories>
+						<li>MeatRaw</li>
+					</categories>
+				</filter>
+				<count>17</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Anti-Grain === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="VMEu_MakeAntigrainWarhead"]/workAmount</xpath>
+		<value>
+			<workAmount>4750</workAmount>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Expanded Woodworking/Patches/Expanded Woodworking/Items_Resources.xml b/ModPatches/Expanded Woodworking/Patches/Expanded Woodworking/Items_Resources.xml
new file mode 100644
index 0000000000..d0e3fd9944
--- /dev/null
+++ b/ModPatches/Expanded Woodworking/Patches/Expanded Woodworking/Items_Resources.xml	
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WoodLumberBase" or @Name="WoodLogBase"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.99</cooldownTime>
+					<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="WoodLumberBase" or @Name="WoodLogBase"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.2</MeleeCritChance>
+				<MeleeParryChance>1</MeleeParryChance>
+				<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="WoodLumberBase" or @Name="WoodLogBase"]/statBases</xpath>
+		<value>
+			<Bulk>0.07</Bulk>
+			<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WoodLumberBase" or @Name="WoodLogBase"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.1</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WoodLumberBase" or @Name="WoodLogBase"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.2</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WoodLumberBase" or @Name="WoodLogBase"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.025</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WoodLumberBase" or @Name="WoodLogBase"]/statBases/SharpDamageMultiplier</xpath>
+		<value>
+			<SharpDamageMultiplier>0.7</SharpDamageMultiplier>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WoodLumberBase" or @Name="WoodLogBase"]/statBases/BluntDamageMultiplier</xpath>
+		<value>
+			<BluntDamageMultiplier>0.5</BluntDamageMultiplier>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="WoodLumberBase" or @Name="WoodLogBase"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>0.3</Mass>
+			<MeleePenetrationFactor>0.3</MeleePenetrationFactor>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Extended Storage/Patches/Extended Storage/Storage.xml b/ModPatches/Extended Storage/Patches/Extended Storage/Storage.xml
new file mode 100644
index 0000000000..d4a528b97b
--- /dev/null
+++ b/ModPatches/Extended Storage/Patches/Extended Storage/Storage.xml	
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Storage_WoodenPallet"]/building/fixedStorageSettings/filter/categories</xpath>
+		<value>
+			<li>Ammo</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/FF Bushi!/Patches/FF Bushi!/Headgear_Bushi.xml b/ModPatches/FF Bushi!/Patches/FF Bushi!/Headgear_Bushi.xml
new file mode 100644
index 0000000000..dec3837f12
--- /dev/null
+++ b/ModPatches/FF Bushi!/Patches/FF Bushi!/Headgear_Bushi.xml	
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Masks === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="FFApparel_Samurai_mask_of_perseverance" or
+			defName="FFApparel_Samurai_mask_of_Destruction" or
+			defName="FFApparel_Samurai_mask_of_Communicating"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/FF Bushi!/Patches/FF Bushi!/Melee_Bushi.xml b/ModPatches/FF Bushi!/Patches/FF Bushi!/Melee_Bushi.xml
new file mode 100644
index 0000000000..6ddf07339d
--- /dev/null
+++ b/ModPatches/FF Bushi!/Patches/FF Bushi!/Melee_Bushi.xml	
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === One-handed Tags === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "MeleeWeapon_Wakizashi" or defName="MeleeWeapon_Tanto"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- === Katana === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Katana"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.33</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.936</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.33</cooldownTime>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>0.936</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.88</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>31</power>
+					<cooldownTime>1.28</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>2.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.65</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Katana"]/statBases</xpath>
+		<value>
+			<Bulk>7.85</Bulk>
+			<MeleeCounterParryBonus>1.38</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Katana"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.85</MeleeCritChance>
+				<MeleeParryChance>0.69</MeleeParryChance>
+				<MeleeDodgeChance>0.37</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- === Wakizashi === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Wakizashi"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.18</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.339</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.18</cooldownTime>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>0.339</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.05</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>0.717</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.36</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Wakizashi"]/statBases</xpath>
+		<value>
+			<Bulk>6.4</Bulk>
+			<MeleeCounterParryBonus>0.43</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Wakizashi"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.60</MeleeCritChance>
+				<MeleeParryChance>0.43</MeleeParryChance>
+				<MeleeDodgeChance>0.16</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- === Tanto === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Tanto"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>0.97</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.259</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>0.97</cooldownTime>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>0.259</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.48</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.05</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>0.304</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.28</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Tanto"]/statBases</xpath>
+		<value>
+			<Bulk>4.2</Bulk>
+			<MeleeCounterParryBonus>0.38</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Tanto"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.93</MeleeCritChance>
+				<MeleeParryChance>0.38</MeleeParryChance>
+				<MeleeDodgeChance>0.09</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/FFGermanSheperd/Patches/FFGermanSheperd/Races_Animal_FFGermanShepherd.xml b/ModPatches/FFGermanSheperd/Patches/FFGermanSheperd/Races_Animal_FFGermanShepherd.xml
new file mode 100644
index 0000000000..df45fa1828
--- /dev/null
+++ b/ModPatches/FFGermanSheperd/Patches/FFGermanSheperd/Races_Animal_FFGermanShepherd.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Quadruped === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GermanShepherd"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GermanShepherd"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			<MeleeCritChance>0.06</MeleeCritChance>
+			<MeleeParryChance>0.06</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="GermanShepherd"]/combatPower</xpath>
+		<value>
+			<combatPower>60</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GermanShepherd"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.7</cooldownTime>
+					<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.7</cooldownTime>
+					<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.50</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.410</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.20</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.3</chanceFactor>
+					<armorPenetrationBlunt>0.280</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/FROG Suit Set/Patches/FROG Suit Set/Armor_Spacer.xml b/ModPatches/FROG Suit Set/Patches/FROG Suit Set/Armor_Spacer.xml
new file mode 100644
index 0000000000..a2ca93557e
--- /dev/null
+++ b/ModPatches/FROG Suit Set/Patches/FROG Suit Set/Armor_Spacer.xml	
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Frog Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="FROG_Helmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FROG_Helmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FROG_Helmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>38</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="FROG_Helmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="FROG_Helmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="FROG_Helmet"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!-- === Frog Suit === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="FROG_Suit"]/statBases</xpath>
+		<value>
+			<Bulk>40</Bulk>
+			<WornBulk>4</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FROG_Suit"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FROG_Suit"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>32</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="FROG_Suit"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>25</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="FROG_Suit"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/FROG Suit Set/Patches/FROG Suit Set/Industrial_Ranged.xml b/ModPatches/FROG Suit Set/Patches/FROG Suit Set/Industrial_Ranged.xml
new file mode 100644
index 0000000000..4f52e8784c
--- /dev/null
+++ b/ModPatches/FROG Suit Set/Patches/FROG Suit Set/Industrial_Ranged.xml	
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tools === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Gewehr3_Rifle"]/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>
+
+	<!-- ========== Gewehr 3 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gewehr3_Rifle</defName>
+		<statBases>
+			<Mass>4.38</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.46</SwayFactor>
+			<Bulk>10.25</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.91</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<burstShotCount>4</burstShotCount>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/FSF Advanced Bionics Expansion/Patches/FSF Advanced Bionics Expansion/HediffDefs/FSFAdvancedBionics_AddedParts.xml b/ModPatches/FSF Advanced Bionics Expansion/Patches/FSF Advanced Bionics Expansion/HediffDefs/FSFAdvancedBionics_AddedParts.xml
new file mode 100644
index 0000000000..b8f7f53eb6
--- /dev/null
+++ b/ModPatches/FSF Advanced Bionics Expansion/Patches/FSF Advanced Bionics Expansion/HediffDefs/FSFAdvancedBionics_AddedParts.xml	
@@ -0,0 +1,500 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="FSFAdvBionicPowerArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.21</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>30</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
+					<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>1.21</cooldownTime>
+					<armorPenetrationSharp>9</armorPenetrationSharp>
+					<armorPenetrationBlunt>6.25</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
+					<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.21</cooldownTime>
+					<armorPenetrationSharp>18</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.75</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
+					<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="FSFArchotechPowerArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>0.71</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>120</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
+					<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>0.71</cooldownTime>
+					<armorPenetrationSharp>24</armorPenetrationSharp>
+					<armorPenetrationBlunt>6.25</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
+					<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.21</cooldownTime>
+					<armorPenetrationSharp>48</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.75</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
+					<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="FSFAdvBionicArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.92</cooldownTime>
+					<armorPenetrationBlunt>2.43</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="FSFAdvBionicTaserArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.92</cooldownTime>
+					<armorPenetrationBlunt>2.43</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<extraMeleeDamages>
+						<li>
+							<def>EMP</def>
+							<amount>12.5</amount>
+						</li>
+					</extraMeleeDamages>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="FSFAdvBionicJaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.25</cooldownTime>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="FSFAdvBionicFieldArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.98</cooldownTime>
+					<armorPenetrationBlunt>2.168</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="FSFAdvBionicConstructionArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.98</cooldownTime>
+					<armorPenetrationBlunt>2.168</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="FSFAdvBionicDrillArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.07</cooldownTime>
+					<armorPenetrationSharp>0.13</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.98</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Implants-->
+
+	<!--Tone down Speed torso implant dodge chance to be more inline with CE stats (also so it doesn't instantly max out dodge)-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="FSFImplantMechanitesSpeed"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!--Archotech Armor implant : Slightly better sharp (1 vs 0.7), much better blunt (1 vs 0.3)-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="FSFArchotechSkinI"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="FSFArchotechSkinI"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>15</ArmorRating_Blunt>
+			<ArmorRating_Electric>0.5</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="FSFImplantBrainMeleeCombat"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>1.5</MeleeDodgeChance>
+			<MeleeCritChance>0.40</MeleeCritChance>
+			<MeleeParryChance>0.50</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="FSFImplantBrainRangedCombat"]/stages/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ShootingAccuracyPawn>+1</ShootingAccuracyPawn>
+				<AimingAccuracy>+0.5</AimingAccuracy>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="FSFImplantTorsoRespirator"]/stages/li/statOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1.0</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="FSFAdvBionicEye"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency_Implant>0.4</NightVisionEfficiency_Implant>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="FSFAdvBionicEye"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<statOffsets>
+						<NightVisionEfficiency_Implant>0.4</NightVisionEfficiency_Implant>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="FSFAdvBionicTaserJaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.25</cooldownTime>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<extraMeleeDamages>
+						<li>
+							<def>EMP</def>
+							<amount>12.5</amount>
+						</li>
+					</extraMeleeDamages>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="FSFAdvBionicBreachArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Demolish</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.48</cooldownTime>
+					<armorPenetrationBlunt>60</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="FSFBionicFieldArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.11</cooldownTime>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="FSFBionicDrillArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>drill</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.25</cooldownTime>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.72</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/HediffDef[defName="FSFAdvBionicMedicArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+				<value>
+					<tools>
+						<li Class="CombatExtended.ToolCE">
+							<label>fist</label>
+							<capacities>
+								<li>Blunt</li>
+							</capacities>
+							<power>14</power>
+							<cooldownTime>2</cooldownTime>
+							<armorPenetrationBlunt>2.0</armorPenetrationBlunt>
+							<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
+							<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
+						</li>
+					</tools>
+				</value>
+			</li>
+
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/HediffDef[defName="FSFArchotechMedicArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+				<value>
+					<tools>
+						<li Class="CombatExtended.ToolCE">
+							<label>fist</label>
+							<capacities>
+								<li>Blunt</li>
+							</capacities>
+							<power>14</power>
+							<cooldownTime>2</cooldownTime>
+							<armorPenetrationBlunt>3.0</armorPenetrationBlunt>
+							<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
+							<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
+						</li>
+					</tools>
+				</value>
+			</li>
+
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/HediffDef[defName="FSFBionicConstructionArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+				<value>
+					<tools>
+						<li Class="CombatExtended.ToolCE">
+							<label>fist</label>
+							<capacities>
+								<li>Blunt</li>
+							</capacities>
+							<power>14</power>
+							<cooldownTime>2</cooldownTime>
+							<armorPenetrationBlunt>2.0</armorPenetrationBlunt>
+							<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
+							<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
+						</li>
+					</tools>
+				</value>
+			</li>
+
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/HediffDef[defName="FSFAdvBionicConstructionArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+				<value>
+					<tools>
+						<li Class="CombatExtended.ToolCE">
+							<label>fist</label>
+							<capacities>
+								<li>Blunt</li>
+							</capacities>
+							<power>14</power>
+							<cooldownTime>2</cooldownTime>
+							<armorPenetrationBlunt>2.0</armorPenetrationBlunt>
+							<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
+							<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
+						</li>
+					</tools>
+				</value>
+			</li>
+
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/HediffDef[defName="FSFAdvBionicDrillArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+				<value>
+					<tools>
+						<li Class="CombatExtended.ToolCE">
+							<label>drill</label>
+							<capacities>
+								<li>Stab</li>
+							</capacities>
+							<power>14</power>
+							<cooldownTime>2</cooldownTime>
+							<armorPenetrationBlunt>6.0</armorPenetrationBlunt>
+							<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
+							<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
+						</li>
+					</tools>
+				</value>
+			</li>
+
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/HediffDef[defName="FSFAdvBionicFieldArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+				<value>
+					<tools>
+						<li Class="CombatExtended.ToolCE">
+							<label>knuckle</label>
+							<capacities>
+								<li>Blunt</li>
+							</capacities>
+							<power>3</power>
+							<cooldownTime>1.66</cooldownTime>
+							<armorPenetrationSharp>0.00</armorPenetrationSharp>
+							<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+							<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+							<soundMeleeHit>MeleeHit_FieldHand</soundMeleeHit>
+							<soundMeleeMiss>MeleeMiss_FieldHand</soundMeleeMiss>
+						</li>
+					</tools>
+				</value>
+			</li>
+
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/HediffDef[defName="FSFArchotechSkinI"]/stages/li/statOffsets</xpath>
+				<value>
+					<statOffsets>
+						<ArmorRating_Sharp>7</ArmorRating_Sharp>
+						<ArmorRating_Blunt>12</ArmorRating_Blunt>
+						<ArmorRating_Heat>1.5</ArmorRating_Heat>
+						<PawnBeauty>1</PawnBeauty>
+					</statOffsets>
+				</value>
+			</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/FSF More Psycasts Powers/Patches/FSF More Psycasts Powers/AbilitiesPatch.xml b/ModPatches/FSF More Psycasts Powers/Patches/FSF More Psycasts Powers/AbilitiesPatch.xml
new file mode 100644
index 0000000000..c6d689ff10
--- /dev/null
+++ b/ModPatches/FSF More Psycasts Powers/Patches/FSF More Psycasts Powers/AbilitiesPatch.xml	
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Psyblade ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="FSFPsyblade"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>0.83</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>3.46</armorPenetrationBlunt>
+					<armorPenetrationSharp>21.6</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>0.94</cooldownTime>
+					<armorPenetrationBlunt>1.54</armorPenetrationBlunt>
+					<armorPenetrationSharp>30</armorPenetrationSharp>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/FSF Vanilla Bionics Expansion/Patches/FSF Vanilla Bionics Expansion/HediffDefs/FSFBionics_AddedParts.xml b/ModPatches/FSF Vanilla Bionics Expansion/Patches/FSF Vanilla Bionics Expansion/HediffDefs/FSFBionics_AddedParts.xml
new file mode 100644
index 0000000000..7711e22e33
--- /dev/null
+++ b/ModPatches/FSF Vanilla Bionics Expansion/Patches/FSF Vanilla Bionics Expansion/HediffDefs/FSFBionics_AddedParts.xml	
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Power Arm-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="FSFBionicPowerArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>0.89</cooldownTime>
+					<armorPenetrationSharp>0.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Prosthetics -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="FSFProstheticHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="FSFBionicJaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.0</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="FSFArchotechJaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.0</cooldownTime>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.0</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="FSFBionicFieldArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.11</cooldownTime>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="FSFBionicDrillArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>drill</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.25</cooldownTime>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.72</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Faction - Mafia/Patches/Faction - Mafia/Apparel_Industrial.xml b/ModPatches/Faction - Mafia/Patches/Faction - Mafia/Apparel_Industrial.xml
new file mode 100644
index 0000000000..04d84071d1
--- /dev/null
+++ b/ModPatches/Faction - Mafia/Patches/Faction - Mafia/Apparel_Industrial.xml	
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="survetement" or defName="Bonnet_mafieux"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Faction - Mafia/Patches/Faction - Mafia/Industrial_Melee.xml b/ModPatches/Faction - Mafia/Patches/Faction - Mafia/Industrial_Melee.xml
new file mode 100644
index 0000000000..196bab298a
--- /dev/null
+++ b/ModPatches/Faction - Mafia/Patches/Faction - Mafia/Industrial_Melee.xml	
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Mafia Knife === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="indus_couteau_poissoir"]/statBases</xpath>
+		<value>
+			<Bulk>0.25</Bulk>
+			<MeleeCounterParryBonus>0.30</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="indus_couteau_poissoir"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.10</MeleeCritChance>
+				<MeleeParryChance>0.30</MeleeParryChance>
+				<MeleeDodgeChance>0.010</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="indus_couteau_poissoir"]/weaponTags</xpath>
+		<value>
+			<li>CE_Sidearm_Melee</li>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="indus_couteau_poissoir"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.06</cooldownTime>
+					<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.99</cooldownTime>
+					<armorPenetrationBlunt>0.38</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.20</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.06</cooldownTime>
+					<chanceFactor>1.88</chanceFactor>
+					<armorPenetrationBlunt>0.42</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.76</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Faction - Mafia/Patches/Faction - Mafia/PawnKinds_Mafia.xml b/ModPatches/Faction - Mafia/Patches/Faction - Mafia/PawnKinds_Mafia.xml
new file mode 100644
index 0000000000..6e63a9d12c
--- /dev/null
+++ b/ModPatches/Faction - Mafia/Patches/Faction - Mafia/PawnKinds_Mafia.xml	
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Leader & Trader === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Mafia_leader" or defName="Mafia_trader"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>200</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>Mafiamelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Molotov === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Mafia_molotov"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>200</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>Mafiamelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Fusil & Pompe === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Mafia_fusil" or defName="Mafia_pompe"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.3</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>200</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>Mafiamelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Faction - Mafia/Patches/Faction - Mafia/Traders_Mafia.xml b/ModPatches/Faction - Mafia/Patches/Faction - Mafia/Traders_Mafia.xml
new file mode 100644
index 0000000000..89c7ca34a4
--- /dev/null
+++ b/ModPatches/Faction - Mafia/Patches/Faction - Mafia/Traders_Mafia.xml	
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Base Mafia ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="Base_Mafia"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>FSX</thingDef>
+				<countRange>
+					<min>25</min>
+					<max>90</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>Prometheum</thingDef>
+				<countRange>
+					<min>25</min>
+					<max>90</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Ammo</tradeTag>
+				<countRange>
+					<min>200</min>
+					<max>1000</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>1</min>
+					<max>4</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_MediumAmmo</tradeTag>
+				<countRange>
+					<min>30</min>
+					<max>60</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>1</min>
+					<max>3</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_HeavyAmmo</tradeTag>
+				<countRange>
+					<min>10</min>
+					<max>25</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>2</max>
+				</thingDefCountRange>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Fallout New Vegas - Elite Riot Gear/Patches/Fallout New Vegas - Elite Riot Gear/Apparel_RiotGear.xml b/ModPatches/Fallout New Vegas - Elite Riot Gear/Patches/Fallout New Vegas - Elite Riot Gear/Apparel_RiotGear.xml
new file mode 100644
index 0000000000..248e2bc3d9
--- /dev/null
+++ b/ModPatches/Fallout New Vegas - Elite Riot Gear/Patches/Fallout New Vegas - Elite Riot Gear/Apparel_RiotGear.xml	
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Stranger -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Stranger"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Riot Armor -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "ZSP_EliteRiotArmor" or defName = "ZSP_StuffableEliteRiotArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>10</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "ZSP_EliteRiotArmor" or defName = "ZSP_StuffableEliteRiotArmor"]/statBases</xpath>
+		<value>
+			<Bulk>40</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "ZSP_EliteRiotArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "ZSP_EliteRiotArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>18</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName= "ZSP_StuffableEliteRiotArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>12</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Riot Helmet -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName= "ZSP_StuffableEliteRiotHelmet" or defName= "ZSP_EliteRiotHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName= "ZSP_StuffableEliteRiotHelmet" or defName= "ZSP_EliteRiotHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName= "ZSP_StuffableEliteRiotHelmet" or defName= "ZSP_EliteRiotHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "ZSP_StuffableEliteRiotHelmet" or defName= "ZSP_EliteRiotHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "ZSP_EliteRiotHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "ZSP_EliteRiotHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName= "ZSP_StuffableEliteRiotHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>10</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Riot Armor Jacket -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "ZSP_StuffableEliteRiotJacket" or defName = "ZSP_EliteRiotJacket"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>10</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName= "ZSP_StuffableEliteRiotJacket" or defName = "ZSP_EliteRiotJacket"]/statBases</xpath>
+		<value>
+			<Bulk>7.5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "ZSP_EliteRiotJacket"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "ZSP_EliteRiotJacket"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName= "ZSP_StuffableEliteRiotJacket"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Fantasy Metals Reforged/Patches/Fantasy Metals Reforged/Fantasy Metals Reforged.xml b/ModPatches/Fantasy Metals Reforged/Patches/Fantasy Metals Reforged/Fantasy Metals Reforged.xml
new file mode 100644
index 0000000000..6cf9b7e7df
--- /dev/null
+++ b/ModPatches/Fantasy Metals Reforged/Patches/Fantasy Metals Reforged/Fantasy Metals Reforged.xml	
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Add Bulk and thingCategories -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="Mithril" or
+			defName="Orichalcum" or
+			defName="Adamantite" or
+			defName="Tozra" or
+			defName="Solorite" or
+			defName="Skelsshkrum"
+			]/statBases </xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="Mithril" or
+			defName="Orichalcum" or
+			defName="Adamantite" or
+			defName="Tozra" or
+			defName="Solorite" or
+			defName="Skelsshkrum"
+			]/stuffProps/categories </xpath>
+		<value>
+			<li>Metallic_Weapon</li>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<!-- Mithril -->
+
+	<!-- From 'The Hobbit,' Mithril is described as triple the strength of steel. -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mithril"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>3</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mithril"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>3.2</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Mithril"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>0.7</Mass>
+		</value>
+	</Operation>
+
+	<!-- Orichalcum -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Orichalcum"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.3</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Orichalcum"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>1.5</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Orichalcum"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>1.4</Mass>
+		</value>
+	</Operation>
+
+	<!-- Adamantite -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Adamantite"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>3.4</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Adamantite"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>4.2</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Tozra -->
+
+	<!-- Nothing to indicate it's any good as armor, so we'll say it's not. -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tozra"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.7</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tozra"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.9</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tozra"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>1.5</MeleePenetrationFactor>
+		</value>
+	</Operation>
+
+	<!-- Solorite -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Solorite"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.3</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Solorite"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.2</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Solorite"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>0.7</MeleePenetrationFactor>
+		</value>
+	</Operation>
+
+	<!-- Skelsshkrum -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Skelsshkrum"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.8</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Skelsshkrum"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>4.6</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Farming Expansion/Patches/Farming Expansion/Race_CropEaterInsect.xml b/ModPatches/Farming Expansion/Patches/Farming Expansion/Race_CropEaterInsect.xml
new file mode 100644
index 0000000000..15302e3dd0
--- /dev/null
+++ b/ModPatches/Farming Expansion/Patches/Farming Expansion/Race_CropEaterInsect.xml	
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="FE_CropEaterInsect"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FE_CropEaterInsect"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>3</MoveSpeed>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			<MeleeCritChance>0.00</MeleeCritChance>
+			<MeleeParryChance>0.00</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FE_CropEaterInsect"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.00</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FE_CropEaterInsect"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.00</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FE_CropEaterInsect"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>2.50</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.00</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.02</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/FashionRIMsta/Patches/FashionRIMsta/ThingsDefs_Misc/FashionRIMsta_Apparel.xml b/ModPatches/FashionRIMsta/Patches/FashionRIMsta/ThingsDefs_Misc/FashionRIMsta_Apparel.xml
new file mode 100644
index 0000000000..274775f270
--- /dev/null
+++ b/ModPatches/FashionRIMsta/Patches/FashionRIMsta/ThingsDefs_Misc/FashionRIMsta_Apparel.xml
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Coats -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_FSFurCoat"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<WornBulk>6</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Apparel_FSFurCoat"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Apparel_FSFurCoat"]/equippedStatOffsets/WorkSpeedGlobal</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_FSDesertRobe"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_FSGardeningVest"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_FSGardeningVest"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>5</CarryBulk>
+		</value>
+	</Operation>
+
+	<!-- Pants -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_FSThermalPants"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Apparel_FSCargoShorts"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Apparel_FSCargoShorts"]/equippedStatOffsets/WorkSpeedGlobal</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_FSCargoShorts"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>5</CarryBulk>
+		</value>
+	</Operation>
+
+	<!-- Middle -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_FSOveralls"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Apparel_FSOveralls"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Apparel_FSOveralls"]/equippedStatOffsets/WorkSpeedGlobal</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_FSOveralls"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>5</CarryBulk>
+		</value>
+	</Operation>
+
+	<!-- Hats -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_FSFurHat"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_FSDesertWrap"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- Stuff-less Apparel -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_FSChefJacket"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_FSScrubs"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_FSConstructionJacket"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_FSConstructionJacket"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>5</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_FSGasmask"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_FSGasmask"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Apparel_FSGasmask"]</xpath>
+		<value>
+			<li Class="CombatExtended.ApparelHediffExtension">
+				<hediff>WearingGasMask</hediff>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_FSGasmask"]/apparel/layers</xpath>
+		<value>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Fate Grand Order Styles Pack/Patches/Fate Grand Order Styles Pack/ThingDefs_Misc/Apparel_FGO.xml b/ModPatches/Fate Grand Order Styles Pack/Patches/Fate Grand Order Styles Pack/ThingDefs_Misc/Apparel_FGO.xml
new file mode 100644
index 0000000000..d9c6db3153
--- /dev/null
+++ b/ModPatches/Fate Grand Order Styles Pack/Patches/Fate Grand Order Styles Pack/ThingDefs_Misc/Apparel_FGO.xml	
@@ -0,0 +1,280 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Joan Hat/High-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FateGrandOrder_HATjoan"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>11.4</ArmorRating_Sharp>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FateGrandOrder_HATjoan"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>14.25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Hoksai Hat/Low-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FateGrandOrder_HAThokusai"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FateGrandOrder_HAThokusai"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.42</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Hoksai C Hat/Low-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FateGrandOrder_HAThokusaiC"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3.125</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FateGrandOrder_HAThokusaiC"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.54</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FateGrandOrder_HAThokusaiC"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+
+		</value>
+	</Operation>
+
+	<!--Saber Uniform/High-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FateGrandOrder_Saberarmour"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+			<Bulk>50</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FateGrandOrder_Saberarmour"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FateGrandOrder_Saberarmour"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeParryChance>0.025</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<!--Mash Uniform/Low-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FateGrandOrder_Mashtights"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6.56</ArmorRating_Sharp>
+			<Bulk>7</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FateGrandOrder_Mashtights"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Assasin Uniform/Low-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FateGrandOrder_AssassinUndies"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3.44</ArmorRating_Sharp>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FateGrandOrder_AssassinUndies"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.24</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FateGrandOrder_AssassinUndies"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!--Joan Uniform/High-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FateGrandOrder_Joanarmour"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+			<Bulk>50</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FateGrandOrder_Joanarmour"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>52</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Arthur Mantle/Low-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FateGrandOrder_ArthurMantle"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4.56</ArmorRating_Sharp>
+			<Bulk>5</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FateGrandOrder_ArthurMantle"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.744</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Hoksai Uniform/Low-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FateGrandOrder_KimonoHokusai"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5.3</ArmorRating_Sharp>
+			<Bulk>5</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FateGrandOrder_KimonoHokusai"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.08</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FateGrandOrder_KimonoHokusai"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!--Astolfo Uniform/High-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FateGrandOrder_Astolfoarmour"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>13</ArmorRating_Sharp>
+			<Bulk>50</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FateGrandOrder_Astolfoarmour"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Astolfo Cloak/Low-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FateGrandOrder_Astolfocloak"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2.7</ArmorRating_Sharp>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FateGrandOrder_Astolfocloak"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.42</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Joan New Uniform/High-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FateGrandOrder_JoanNewArmour"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+			<Bulk>50</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FateGrandOrder_JoanNewArmour"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>48</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Joan Mantle/Low-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FateGrandOrder_JoanNewMantle"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3.5</ArmorRating_Sharp>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FateGrandOrder_JoanNewMantle"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Mash Tasset/Mid-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FateGrandOrder_MashTasset"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3</ArmorRating_Sharp>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FateGrandOrder_MashTasset"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Feles - Felines of the Rim [1.3]/Patches/Feles - Felines of the Rim [1.3]/Bodies_Feles.xml b/ModPatches/Feles - Felines of the Rim [1.3]/Patches/Feles - Felines of the Rim [1.3]/Bodies_Feles.xml
new file mode 100644
index 0000000000..68ecadd3d4
--- /dev/null
+++ b/ModPatches/Feles - Felines of the Rim [1.3]/Patches/Feles - Felines of the Rim [1.3]/Bodies_Feles.xml	
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Add groups ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Feles"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "right eye"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Feles"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "left eye"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Feles"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Feles"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Feles"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Feles"]/corePart/parts/li[def = "Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Feles"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Feles"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Feles"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Feles"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Ear"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Feles"]/corePart/parts/li[def = "Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Feles"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Feles"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Feles"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/parts/li[def = "Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Feles"]/corePart/parts/li[def = "Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Feles"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Feles"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/parts/li[def = "Toe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Feles - Felines of the Rim [1.3]/Patches/Feles - Felines of the Rim [1.3]/Feles_Leather.xml b/ModPatches/Feles - Felines of the Rim [1.3]/Patches/Feles - Felines of the Rim [1.3]/Feles_Leather.xml
new file mode 100644
index 0000000000..d4cf973905
--- /dev/null
+++ b/ModPatches/Feles - Felines of the Rim [1.3]/Patches/Feles - Felines of the Rim [1.3]/Feles_Leather.xml	
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Leo_leather" or
+			defName="Tigris_leather" or
+			defName="Jaguar_leather" or
+			defName="Cheetah_leather" or
+			defName="Panther_leather"
+			]/statBases/StuffPower_Armor_Sharp </xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.04</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Leo_leather" or
+			defName="Tigris_leather" or
+			defName="Jaguar_leather" or
+			defName="Cheetah_leather" or
+			defName="Panther_leather"
+			]/statBases/StuffPower_Armor_Blunt </xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.03</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Feles - Felines of the Rim [1.3]/Patches/Feles - Felines of the Rim [1.3]/Races_Feles.xml b/ModPatches/Feles - Felines of the Rim [1.3]/Patches/Feles - Felines of the Rim [1.3]/Races_Feles.xml
new file mode 100644
index 0000000000..082904b70b
--- /dev/null
+++ b/ModPatches/Feles - Felines of the Rim [1.3]/Patches/Feles - Felines of the Rim [1.3]/Races_Feles.xml	
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[
+			defName="YanzihkoJaguar" or
+			defName="YanzihkoLeo" or
+			defName="YanzihkoPanther" or
+			defName="YanzihkoTigris" or
+			defName="YanzihkoCheetah"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[
+			defName="YanzihkoJaguar" or
+			defName="YanzihkoLeo" or
+			defName="YanzihkoPanther" or
+			defName="YanzihkoTigris" or
+			defName="YanzihkoCheetah"
+			]/statBases </xpath>
+		<value>
+			<MeleeDodgeChance>1.1</MeleeDodgeChance>
+			<MeleeCritChance>0.85</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>1</Suppressability>
+			<SmokeSensitivity>1</SmokeSensitivity>
+			<NightVisionEfficiency_Apparel>0.4</NightVisionEfficiency_Apparel>
+			<CarryWeight>40</CarryWeight>
+			<CarryBulk>30</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[
+			defName="YanzihkoJaguar" or
+			defName="YanzihkoLeo" or
+			defName="YanzihkoPanther" or
+			defName="YanzihkoTigris" or
+			defName="YanzihkoCheetah"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.91</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.20</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.91</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.20</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.49</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.640</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>4.29</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.525</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[
+			defName="YanzihkoJaguar" or
+			defName="YanzihkoLeo" or
+			defName="YanzihkoPanther" or
+			defName="YanzihkoTigris" or
+			defName="YanzihkoCheetah"
+			]/comps </xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[
+				defName="YanzihkoJaguar" or
+				defName="YanzihkoLeo" or
+				defName="YanzihkoPanther" or
+				defName="YanzihkoTigris" or
+				defName="YanzihkoCheetah"
+				] </xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[
+			defName="YanzihkoJaguar" or
+			defName="YanzihkoLeo" or
+			defName="YanzihkoPanther" or
+			defName="YanzihkoTigris" or
+			defName="YanzihkoCheetah"
+			]/comps </xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Feles - Felines of the Rim [1.3]/Patches/Feles - Felines of the Rim [1.3]/Scenarios_Feles.xml b/ModPatches/Feles - Felines of the Rim [1.3]/Patches/Feles - Felines of the Rim [1.3]/Scenarios_Feles.xml
new file mode 100644
index 0000000000..a4ff86a02f
--- /dev/null
+++ b/ModPatches/Feles - Felines of the Rim [1.3]/Patches/Feles - Felines of the Rim [1.3]/Scenarios_Feles.xml	
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="FelesScenario1"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_45ACP_FMJ</thingDef>
+				<count>350</count>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="FelesScenario2"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_Arrow_Stone</thingDef>
+				<count>100</count>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="FelesScenario2"]/scenario/parts/li[thingDef="Pila"]</xpath>
+		<value>
+			<count>20</count>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Fell Tribes/Patches/Fell Tribes/PawnkindDefs/PawnKinds_Fell.xml b/ModPatches/Fell Tribes/Patches/Fell Tribes/PawnkindDefs/PawnKinds_Fell.xml
new file mode 100644
index 0000000000..dc823e2b87
--- /dev/null
+++ b/ModPatches/Fell Tribes/Patches/Fell Tribes/PawnkindDefs/PawnKinds_Fell.xml	
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Give ammo to bowman ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/PawnKindDef[
+			defName="FellFox" or
+			defName="FellWolf" or
+			defName="FellLynx" or
+			defName="FellServal" or
+			defName="FellBear"]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>12</min>
+					<max>20</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Fell Tribes/Patches/Fell Tribes/ThingDefs_Races/Bear.xml b/ModPatches/Fell Tribes/Patches/Fell Tribes/ThingDefs_Races/Bear.xml
new file mode 100644
index 0000000000..571a55238b
--- /dev/null
+++ b/ModPatches/Fell Tribes/Patches/Fell Tribes/ThingDefs_Races/Bear.xml	
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Found the mod ========== -->
+
+	<!-- ========== Now patch the basics... ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<!-- === Note to future furball compatibility nerds: 		=== -->
+		<!-- === Paste the defName of your horrible alien there   |	=== -->
+		<!-- === 												  V	=== -->
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Bear"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Done! ========== -->
+	<!-- ========== Now for the gun settings and suppression ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<!-- === Shouldn't need to change this at all		  === -->
+		<!-- === Unless you changed the name of your BasePawn === -->
+		<!-- === In which case change "BasePawn" to that name === -->
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Bear"]</xpath>
+		<value>
+			<comps>
+				<li>
+					<compClass>CombatExtended.CompPawnGizmo</compClass>
+				</li>
+				<li Class="CombatExtended.CompProperties_Suppressable"/>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- === Patch their default melee attacks === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Bear"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1</AimingAccuracy>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1.15</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<ReloadSpeed>1</ReloadSpeed>
+			<Suppressability>1</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Bear"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.15</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.15</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.923</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Fell Tribes/Patches/Fell Tribes/ThingDefs_Races/Fox.xml b/ModPatches/Fell Tribes/Patches/Fell Tribes/ThingDefs_Races/Fox.xml
new file mode 100644
index 0000000000..84e2f72f25
--- /dev/null
+++ b/ModPatches/Fell Tribes/Patches/Fell Tribes/ThingDefs_Races/Fox.xml	
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Now patch the basics... ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<!-- === Note to future furball compatibility nerds: 		=== -->
+		<!-- === Paste the defName of your horrible alien there   |	=== -->
+		<!-- === 												  V	=== -->
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Fox"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Done! ========== -->
+	<!-- ========== Now for the gun settings and suppression ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<!-- === Shouldn't need to change this at all		  === -->
+		<!-- === Unless you changed the name of your BasePawn === -->
+		<!-- === In which case change "BasePawn" to that name === -->
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Fox"]</xpath>
+		<value>
+			<comps>
+				<li>
+					<compClass>CombatExtended.CompPawnGizmo</compClass>
+				</li>
+				<li Class="CombatExtended.CompProperties_Suppressable"/>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- === Patch their default melee attacks === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Fox"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1</AimingAccuracy>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1.15</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<ReloadSpeed>1</ReloadSpeed>
+			<Suppressability>1</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Fox"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.15</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.15</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.923</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Fell Tribes/Patches/Fell Tribes/ThingDefs_Races/Lynx.xml b/ModPatches/Fell Tribes/Patches/Fell Tribes/ThingDefs_Races/Lynx.xml
new file mode 100644
index 0000000000..61fdd8c3ea
--- /dev/null
+++ b/ModPatches/Fell Tribes/Patches/Fell Tribes/ThingDefs_Races/Lynx.xml	
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Now patch the basics... ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<!-- === Note to future furball compatibility nerds: 		=== -->
+		<!-- === Paste the defName of your horrible alien there   |	=== -->
+		<!-- === 												  V	=== -->
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Lynx"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Done! ========== -->
+	<!-- ========== Now for the gun settings and suppression ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<!-- === Shouldn't need to change this at all		  === -->
+		<!-- === Unless you changed the name of your BasePawn === -->
+		<!-- === In which case change "BasePawn" to that name === -->
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Lynx"]</xpath>
+		<value>
+			<comps>
+				<li>
+					<compClass>CombatExtended.CompPawnGizmo</compClass>
+				</li>
+				<li Class="CombatExtended.CompProperties_Suppressable"/>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- === Patch their default melee attacks === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Lynx"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1</AimingAccuracy>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1.15</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<ReloadSpeed>1</ReloadSpeed>
+			<Suppressability>1</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Lynx"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.15</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.15</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.923</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Fell Tribes/Patches/Fell Tribes/ThingDefs_Races/Serval.xml b/ModPatches/Fell Tribes/Patches/Fell Tribes/ThingDefs_Races/Serval.xml
new file mode 100644
index 0000000000..6dbf37d8e2
--- /dev/null
+++ b/ModPatches/Fell Tribes/Patches/Fell Tribes/ThingDefs_Races/Serval.xml	
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Now patch the basics... ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<!-- === Note to future furball compatibility nerds: 		=== -->
+		<!-- === Paste the defName of your horrible alien there   |	=== -->
+		<!-- === 												  V	=== -->
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Serval"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Done! ========== -->
+	<!-- ========== Now for the gun settings and suppression ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<!-- === Shouldn't need to change this at all		  === -->
+		<!-- === Unless you changed the name of your BasePawn === -->
+		<!-- === In which case change "BasePawn" to that name === -->
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Serval"]</xpath>
+		<value>
+			<comps>
+				<li>
+					<compClass>CombatExtended.CompPawnGizmo</compClass>
+				</li>
+				<li Class="CombatExtended.CompProperties_Suppressable"/>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- === Patch their default melee attacks === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Serval"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1</AimingAccuracy>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1.15</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<ReloadSpeed>1</ReloadSpeed>
+			<Suppressability>1</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Serval"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.15</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.15</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.923</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Fell Tribes/Patches/Fell Tribes/ThingDefs_Races/Wolf.xml b/ModPatches/Fell Tribes/Patches/Fell Tribes/ThingDefs_Races/Wolf.xml
new file mode 100644
index 0000000000..7d31c88f40
--- /dev/null
+++ b/ModPatches/Fell Tribes/Patches/Fell Tribes/ThingDefs_Races/Wolf.xml	
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Now patch the basics... ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<!-- === Note to future furball compatibility nerds: 		=== -->
+		<!-- === Paste the defName of your horrible alien there   |	=== -->
+		<!-- === 												  V	=== -->
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Wolf"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Done! ========== -->
+	<!-- ========== Now for the gun settings and suppression ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<!-- === Shouldn't need to change this at all		  === -->
+		<!-- === Unless you changed the name of your BasePawn === -->
+		<!-- === In which case change "BasePawn" to that name === -->
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Wolf"]</xpath>
+		<value>
+			<comps>
+				<li>
+					<compClass>CombatExtended.CompPawnGizmo</compClass>
+				</li>
+				<li Class="CombatExtended.CompProperties_Suppressable"/>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- === Patch their default melee attacks === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Wolf"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1</AimingAccuracy>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1.15</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<ReloadSpeed>1</ReloadSpeed>
+			<Suppressability>1</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Wolf"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.15</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.15</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.923</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Ferrex/Patches/Ferrex/Ferrex_Weapons.xml b/ModPatches/Ferrex/Patches/Ferrex/Ferrex_Weapons.xml
new file mode 100644
index 0000000000..cd3bfac971
--- /dev/null
+++ b/ModPatches/Ferrex/Patches/Ferrex/Ferrex_Weapons.xml
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Ferrex F90 (P90) -->
+	<!-- Stolen from CE Guns' Vector until I can figure out how to make it P90-y -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Ferrex_P90x</defName>
+		<!-- Cute -->
+		<statBases>
+			<Bulk>4.1</Bulk>
+			<Mass>2.7</Mass>
+			<SwayFactor>0.89</SwayFactor>
+			<ShotSpread>0.16</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<WorkToMake>28000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>35</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>14</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<researchPrerequisite>GasOperation</researchPrerequisite>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Ferrex_P90x"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.8</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>magazine</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.8</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Magazine</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.9</cooldownTime>
+					<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.9</cooldownTime>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Ferrex Vactor -->
+	<!-- Stolen from CE Guns' Vector, fullstop -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Ferrex_Vac</defName>
+		<statBases>
+			<Bulk>4.1</Bulk>
+			<Mass>2.7</Mass>
+			<SwayFactor>0.89</SwayFactor>
+			<ShotSpread>0.16</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<WorkToMake>28000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>35</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.84</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>14</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>Xen_SD</soundCast>
+			<muzzleFlashScale>4</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<researchPrerequisite>GasOperation</researchPrerequisite>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Ferrex_Vac"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.8</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>magazine</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.8</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Magazine</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.9</cooldownTime>
+					<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.9</cooldownTime>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Ferrex/Patches/Ferrex/PawnKinds_Ferrex.xml b/ModPatches/Ferrex/Patches/Ferrex/PawnKinds_Ferrex.xml
new file mode 100644
index 0000000000..8483705a79
--- /dev/null
+++ b/ModPatches/Ferrex/Patches/Ferrex/PawnKinds_Ferrex.xml
@@ -0,0 +1,314 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Scoot ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FerrexColonist"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FerrexExecutive"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FerrexTrader"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FerrexSlave"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FerrexRefugee"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FerrexSecurityGuard"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FerrexMerc"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FerrexSurveyor"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FerrexProfessional"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FerrexNinja"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Ferrex/Patches/Ferrex/Race_Ferrex.xml b/ModPatches/Ferrex/Patches/Ferrex/Race_Ferrex.xml
new file mode 100644
index 0000000000..720b03accc
--- /dev/null
+++ b/ModPatches/Ferrex/Patches/Ferrex/Race_Ferrex.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Ferrex"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Gives Gun Gizmos to Ferrex HUD thing ========== -->
+	<!-- ========== Also Makes Em Suppressable ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="BaseFerretPawn"]</xpath>
+		<value>
+			<comps>
+				<li>
+					<compClass>CombatExtended.CompPawnGizmo</compClass>
+				</li>
+				<li Class="CombatExtended.CompProperties_Suppressable"/>
+			</comps>
+		</value>
+	</Operation>
+	<!-- ========== Patch Ferrex Melee Attacks ========== -->
+	<!-- ========== Punch punch, no claws or teeth. Fair enough! ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Ferrex"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1</AimingAccuracy>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<ReloadSpeed>1</ReloadSpeed>
+			<Suppressability>1</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Ferrex"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetration>0.12</armorPenetration>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.690</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== BaseBodySize, ArmorRatings, MoveSpeed, and BaseHealth are already set. I think. ========== -->
+	<!-- ========== Thanks Xenn! ========== -->
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Filthy Orc Invasion/Defs/Filthy Orc Invasion/FilthyOrcInvasion_AmmoPatch.xml b/ModPatches/Filthy Orc Invasion/Defs/Filthy Orc Invasion/FilthyOrcInvasion_AmmoPatch.xml
new file mode 100644
index 0000000000..3a1ebccc6a
--- /dev/null
+++ b/ModPatches/Filthy Orc Invasion/Defs/Filthy Orc Invasion/FilthyOrcInvasion_AmmoPatch.xml	
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingDef ParentName="BaseBulletCE">
+		<defName>Javelin_Thrown_CE</defName>
+		<graphicData>
+			<texPath>Things/Projectile/Javelin_Thrown</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<label>Javelin</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>RangedStab</damageDef>
+			<speed>35</speed>
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>3.25</armorPenetrationSharp>
+			<armorPenetrationBlunt>5.44</armorPenetrationBlunt>
+			<preExplosionSpawnChance>0.65</preExplosionSpawnChance><!-- 4 javelins per resource -->
+			<preExplosionSpawnThingDef>Javelin</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>MakeAmmo_Javelin</defName>
+		<label>make javelin x5</label>
+		<description>Craft 5 javelins.</description>
+		<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+		<workSkill>Crafting</workSkill>
+		<recipeUsers>
+			<li>ElectricSmithy</li>
+			<li>FueledSmithy</li>
+			<li>CraftingSpot</li>
+		</recipeUsers>
+		<effectWorking>Smelt</effectWorking>
+		<unfinishedThingDef>UnfinishedAmmo</unfinishedThingDef>
+		<workAmount>2500</workAmount>
+		<jobString>Making javelins.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>45</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Javelin>5</Javelin>
+		</products>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Filthy Orc Invasion/Patches/Filthy Orc Invasion/FilthyOrcInvasion_Orc_Race.xml b/ModPatches/Filthy Orc Invasion/Patches/Filthy Orc Invasion/FilthyOrcInvasion_Orc_Race.xml
new file mode 100644
index 0000000000..7c667043a5
--- /dev/null
+++ b/ModPatches/Filthy Orc Invasion/Patches/Filthy Orc Invasion/FilthyOrcInvasion_Orc_Race.xml	
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="OrcScenario"]/scenario/parts/li[thingDef="Javelin"]</xpath>
+		<value>
+			<count>20</count>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Orc"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Orc"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetration>0.1</armorPenetration>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetration>0.1</armorPenetration>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Orc"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Orc"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Orc"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Filthy Orc Invasion/Patches/Filthy Orc Invasion/FilthyOrcInvasion_Orc_Weapons.xml b/ModPatches/Filthy Orc Invasion/Patches/Filthy Orc Invasion/FilthyOrcInvasion_Orc_Weapons.xml
new file mode 100644
index 0000000000..4cea0c4072
--- /dev/null
+++ b/ModPatches/Filthy Orc Invasion/Patches/Filthy Orc Invasion/FilthyOrcInvasion_Orc_Weapons.xml	
@@ -0,0 +1,348 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_HandCannon</defName>
+		<statBases>
+			<Mass>1.50</Mass>
+			<RangedWeapon_Cooldown>12.0</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.9</SightsEfficiency>
+			<ShotSpread>0.22</ShotSpread>
+			<SwayFactor>1.50</SwayFactor>
+			<Bulk>1.50</Bulk>
+			<WorkToMake>22000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>400</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>0.60</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_CannonBall_Round</defaultProjectile>
+			<warmupTime>4.6</warmupTime>
+			<range>40</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>6.75</reloadTime>
+			<ammoSet>AmmoSet_CannonBall</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_HandCannon"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.9</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Javelin"]</xpath>
+		<value>
+			<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseWeaponAndAmmoNeolithic">
+				<defName>Javelin</defName>
+				<label>javelin</label>
+				<description>light spears designed for throwing. Its weight allows for quick throwing, useful for skirmishing at close range.</description>
+				<graphicData>
+					<texPath>Things/Item/Equipment/WeaponRanged/Javelin</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+					<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
+				</graphicData>
+				<soundInteract>Interact_BeatFire</soundInteract>
+				<statBases>
+					<MarketValue>7.26</MarketValue>
+					<SightsEfficiency>1.0</SightsEfficiency>
+					<ShotSpread>1.5</ShotSpread>
+					<SwayFactor>2.5</SwayFactor>
+					<Bulk>3.5</Bulk>
+					<Mass>2.00</Mass>
+					<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+				</statBases>
+				<equippedAngleOffset>30</equippedAngleOffset>
+				<stackLimit>25</stackLimit>
+				<weaponTags>
+					<li>NeolithicRangedHeavy</li>
+					<li>CE_Pila</li>
+					<li>CE_OneHandedWeapon</li>
+				</weaponTags>
+				<tradeability>All</tradeability>
+				<verbs>
+					<li Class="CombatExtended.VerbPropertiesCE">
+						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Javelin_Thrown_CE</defaultProjectile>
+						<warmupTime>0.8</warmupTime>
+						<range>14</range>
+						<!--<soundCast>Interact_BeatFire</soundCast>-->
+					</li>
+				</verbs>
+				<tools>
+					<li Class="CombatExtended.ToolCE">
+						<label>shaft</label>
+						<capacities>
+							<li>Blunt</li>
+						</capacities>
+						<power>7</power>
+						<cooldownTime>1.35</cooldownTime>
+						<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+						<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+					</li>
+					<li Class="CombatExtended.ToolCE">
+						<label>point</label>
+						<capacities>
+							<li>Stab</li>
+						</capacities>
+						<power>15</power>
+						<cooldownTime>1.37</cooldownTime>
+						<chanceFactor>1.5</chanceFactor>
+						<armorPenetrationBlunt>1.69</armorPenetrationBlunt>
+						<armorPenetrationSharp>0.34</armorPenetrationSharp>
+						<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+					</li>
+				</tools>
+				<ammoClass>Javelin</ammoClass>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>HeavySling</defName>
+		<statBases>
+			<Mass>0.5</Mass>
+			<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>1</SwayFactor>
+			<Bulk>2</Bulk>
+			<WorkToMake>12000</WorkToMake>
+		</statBases>
+		<Properties>
+			<recoilAmount>0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Ammo_SlingBullet_Stone</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>20</range>
+			<soundAiming>Sling_Aiming</soundAiming>
+			<soundCast>Sling_Firing</soundCast>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>3.25</reloadTime>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HeavySling"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>sling</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_GreatMaul"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>hammer</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2.0</cooldownTime>
+					<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>pick</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>3.5</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_GreatMaul"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_GreatMaul"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.4</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_GreatMaul"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="MeleeWeapon_GreatMaul"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_GreatMaul"]/weaponTags</xpath>
+		<value>
+			<li>GiantMelee</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_GreatClub"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.0</cooldownTime>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.46</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_GreatClub"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_GreatClub"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.4</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_GreatClub"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="MeleeWeapon_GreatClub"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_GreatClub"]/weaponTags</xpath>
+		<value>
+			<li>GiantMelee</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_GreatAxe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>3.2</cooldownTime>
+					<armorPenetrationBlunt>0.956</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.43</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_GreatAxe"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_GreatAxe"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.4</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_GreatAxe"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="MeleeWeapon_GreatAxe"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_GreatAxe"]/weaponTags</xpath>
+		<value>
+			<li>GiantMelee</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Filthy Orc Invasion/Patches/Filthy Orc Invasion/FilthyOrcInvasion_PawnKind_Player_Orc.xml b/ModPatches/Filthy Orc Invasion/Patches/Filthy Orc Invasion/FilthyOrcInvasion_PawnKind_Player_Orc.xml
new file mode 100644
index 0000000000..b10cbccb7f
--- /dev/null
+++ b/ModPatches/Filthy Orc Invasion/Patches/Filthy Orc Invasion/FilthyOrcInvasion_PawnKind_Player_Orc.xml	
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="OrcPlayer"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>80</min>
+						<max>500</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>GiantMelee</li>
+						<li>GiantRanged</li>
+						<li>CE_Sidearm_Melee</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Filthy Orc Invasion/Patches/Filthy Orc Invasion/FilthyOrcInvasion_PawnKinds_Orc.xml b/ModPatches/Filthy Orc Invasion/Patches/Filthy Orc Invasion/FilthyOrcInvasion_PawnKinds_Orc.xml
new file mode 100644
index 0000000000..b1c0cda164
--- /dev/null
+++ b/ModPatches/Filthy Orc Invasion/Patches/Filthy Orc Invasion/FilthyOrcInvasion_PawnKinds_Orc.xml	
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Alien_Orc"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>80</min>
+						<max>500</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>GiantMelee</li>
+						<li>GiantRanged</li>
+						<li>CE_Sidearm_Melee</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="OrcRaider"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>80</min>
+						<max>500</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>GiantMelee</li>
+						<li>GiantRanged</li>
+						<li>CE_Sidearm_Melee</li>
+					</weaponTags>
+					<magazineCount>
+						<min>4</min>
+						<max>5</max>
+					</magazineCount>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="OrcScrounger"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>80</min>
+						<max>500</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Melee</li>
+					</weaponTags>
+					<magazineCount>
+						<min>3</min>
+						<max>5</max>
+					</magazineCount>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Flak Dusters/Patches/Flak Dusters/ThingDefs_Misc/Apparel_FD.xml b/ModPatches/Flak Dusters/Patches/Flak Dusters/ThingDefs_Misc/Apparel_FD.xml
new file mode 100644
index 0000000000..107ad90d81
--- /dev/null
+++ b/ModPatches/Flak Dusters/Patches/Flak Dusters/ThingDefs_Misc/Apparel_FD.xml	
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_FlakDuster"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_FlakDuster"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Apparel_FlakDuster"]/statBases/ArmorRating_Heat</xpath>
+	</Operation>
+
+	<!--Not stuffable as leather in CE-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_FlakDuster"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>32</Steel>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_FlakDuster"]/stuffCategories</xpath>
+		<value>
+			<stuffCategories>
+				<li>Fabric</li>
+			</stuffCategories>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_FlakDuster"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>90</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_FlakDuster"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+			<Bulk>7</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_FlakDuster"]/statBases/StuffEffectMultiplierInsulation_Cold</xpath>
+		<value>
+			<StuffEffectMultiplierInsulation_Cold>0.9</StuffEffectMultiplierInsulation_Cold>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_FlakDuster"]/statBases/StuffEffectMultiplierInsulation_Heat</xpath>
+		<value>
+			<StuffEffectMultiplierInsulation_Heat>0.4</StuffEffectMultiplierInsulation_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Apparel_FlakDuster"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Apparel_FlakDuster"]/statBases/Insulation_Cold</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Apparel_FlakDuster"]/statBases/Insulation_Heat</xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Forgelings race/Patches/Forgelings race/Apparel_Forge.xml b/ModPatches/Forgelings race/Patches/Forgelings race/Apparel_Forge.xml
new file mode 100644
index 0000000000..f7e3233138
--- /dev/null
+++ b/ModPatches/Forgelings race/Patches/Forgelings race/Apparel_Forge.xml	
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Crusader Helmet === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Forge_Apparel_Helmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.0</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Forge_Apparel_Helmet"]/recipeMaker</xpath>
+		<value>
+			<skillRequirements>
+				<Crafting>8</Crafting>
+			</skillRequirements>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Forge_Apparel_Helmet"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>60</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Forge_Apparel_Helmet"]/statBases/WorkToMake</xpath>
+		<value>
+			<WorkToMake>6400</WorkToMake>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Forge_Apparel_Helmet"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>-0.4</AimingAccuracy>
+				<MeleeHitChance>-2</MeleeHitChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Forge_Apparel_Helmet"]/apparel/layers</xpath>
+		<value>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Forge_Apparel_Helmet"]/stuffCategories</xpath>
+		<value>
+			<stuffCategories>
+				<li>Steeled</li>
+			</stuffCategories>
+		</value>
+	</Operation>
+
+	<!-- === Crusader Armour === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Forge_Apparel_CruciblePlate"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
+			<Bulk>100</Bulk>
+			<WornBulk>12</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Forge_Apparel_CruciblePlate"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>200</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Forge_Apparel_CruciblePlate"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<MeleeDodgeChance>-0.15</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Forge_Apparel_CruciblePlate"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Forge_Apparel_CruciblePlate"]/stuffCategories</xpath>
+		<value>
+			<stuffCategories>
+				<li>Steeled</li>
+			</stuffCategories>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Forgelings race/Patches/Forgelings race/Forgling_Melee.xml b/ModPatches/Forgelings race/Patches/Forgelings race/Forgling_Melee.xml
new file mode 100644
index 0000000000..8d2daaf0fc
--- /dev/null
+++ b/ModPatches/Forgelings race/Patches/Forgelings race/Forgling_Melee.xml	
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Forge_ForgeDagger"]/statBases</xpath>
+		<value>
+			<statBases>
+				<WorkToMake>25500</WorkToMake>
+				<Mass>0.6</Mass>
+				<Bulk>5</Bulk>
+				<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Forge_ForgeDagger"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.9</MeleeCritChance>
+				<MeleeParryChance>0.69</MeleeParryChance>
+				<MeleeDodgeChance>0.33</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Forge_ForgeDagger"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.27</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.7</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.33</cooldownTime>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>6</amount>
+						</li>
+					</extraMeleeDamages>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>0.459</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.4</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>1.4</cooldownTime>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>8</amount>
+						</li>
+					</extraMeleeDamages>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>0.674</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.0</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Forgelings race/Patches/Forgelings race/Races_Forgeling.xml b/ModPatches/Forgelings race/Patches/Forgelings race/Races_Forgeling.xml
new file mode 100644
index 0000000000..b99562d0b6
--- /dev/null
+++ b/ModPatches/Forgelings race/Patches/Forgelings race/Races_Forgeling.xml	
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Forge_Forgeling_Race"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Forge_Forgeling_Race"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2.25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Forge_Forgeling_Race"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Forge_Forgeling_Race"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.8</ArmorRating_Heat>
+			<ToxicResistance>0.4</ToxicResistance>
+			<SmokeSensitivity>0.5</SmokeSensitivity>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Forge_Forgeling_Race"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Burn</def>
+							<amount>3</amount>
+							<chance>0.4</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>1.96</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Burn</def>
+							<amount>3</amount>
+							<chance>0.4</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>1.96</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Burn</def>
+							<amount>3</amount>
+							<chance>0.6</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>4.59</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>5.825</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Forge_Forgeling_Race"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Forge_Forgeling_Race"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Forge_Forgeling_Race"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Forgotten Realms - Lizardfolk/Defs/Forgotten Realms - Lizardfolk/PawnKinds_Crocodillian.xml b/ModPatches/Forgotten Realms - Lizardfolk/Defs/Forgotten Realms - Lizardfolk/PawnKinds_Crocodillian.xml
new file mode 100644
index 0000000000..375611e25f
--- /dev/null
+++ b/ModPatches/Forgotten Realms - Lizardfolk/Defs/Forgotten Realms - Lizardfolk/PawnKinds_Crocodillian.xml	
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ========== Tribals ========== -->
+
+	<PawnKindDef>
+		<defName>CrocoGrenadier</defName>
+		<race>FR_Alien_Croco</race>
+		<label>growler</label>
+		<combatPower>70</combatPower>
+		<defaultFactionType>FR_CrocoTribes</defaultFactionType>
+		<backstoryCategories>
+			<li>Tribal</li>
+		</backstoryCategories>
+		<maxGenerationAge>60</maxGenerationAge>
+		<chemicalAddictionChance>0.05</chemicalAddictionChance>
+		<invNutrition>2.55</invNutrition>
+		<invFoodDef>Pemmican</invFoodDef>
+		<canBeSapper>true</canBeSapper>
+		<gearHealthRange>
+			<min>0.5</min>
+			<max>1.8</max>
+		</gearHealthRange>
+		<apparelMoney>
+			<min>180</min>
+			<max>350</max>
+		</apparelMoney>
+		<apparelRequired>
+			<li>Apparel_WarVeil</li>
+			<li>CE_Apparel_TribalBackpack</li>
+		</apparelRequired>
+		<apparelTags>
+			<li>Tribal</li>
+		</apparelTags>
+		<weaponMoney>
+			<min>60</min>
+			<max>400</max>
+		</weaponMoney>
+		<weaponTags>
+			<li>CE_GrenadeNeolithic</li>
+		</weaponTags>
+		<techHediffsMoney>
+			<min>50</min>
+			<max>800</max>
+		</techHediffsMoney>
+		<techHediffsTags>
+			<li>Poor</li>
+			<li>Simple</li>
+		</techHediffsTags>
+		<techHediffsChance>0.33</techHediffsChance>
+		<modExtensions>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>18</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>80</min>
+						<max>160</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Tribal</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</modExtensions>
+	</PawnKindDef>
+
+	<PawnKindDef>
+		<defName>CrocoGunner</defName>
+		<race>FR_Alien_Croco</race>
+		<label>hisser</label>
+		<combatPower>75</combatPower>
+		<defaultFactionType>FR_CrocoTribes</defaultFactionType>
+		<backstoryCategories>
+			<li>Tribal</li>
+		</backstoryCategories>
+		<maxGenerationAge>60</maxGenerationAge>
+		<chemicalAddictionChance>0.05</chemicalAddictionChance>
+		<invNutrition>2.55</invNutrition>
+		<invFoodDef>Pemmican</invFoodDef>
+		<gearHealthRange>
+			<min>0.5</min>
+			<max>1.8</max>
+		</gearHealthRange>
+		<apparelMoney>
+			<min>180</min>
+			<max>350</max>
+		</apparelMoney>
+		<apparelTags>
+			<li>Tribal</li>
+		</apparelTags>
+		<apparelRequired>
+			<li>Apparel_WarMask</li>
+		</apparelRequired>
+		<weaponMoney>
+			<min>180</min>
+			<max>290</max>
+		</weaponMoney>
+		<weaponTags>
+			<li>Gun</li>
+		</weaponTags>
+		<techHediffsMoney>
+			<min>50</min>
+			<max>800</max>
+		</techHediffsMoney>
+		<techHediffsTags>
+			<li>Poor</li>
+			<li>Simple</li>
+		</techHediffsTags>
+		<techHediffsChance>0.20</techHediffsChance>
+		<modExtensions>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>120</min>
+					<max>160</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.8</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</modExtensions>
+	</PawnKindDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Forgotten Realms - Lizardfolk/Defs/Forgotten Realms - Lizardfolk/PawnKinds_Squadmata.xml b/ModPatches/Forgotten Realms - Lizardfolk/Defs/Forgotten Realms - Lizardfolk/PawnKinds_Squadmata.xml
new file mode 100644
index 0000000000..fbda8881e2
--- /dev/null
+++ b/ModPatches/Forgotten Realms - Lizardfolk/Defs/Forgotten Realms - Lizardfolk/PawnKinds_Squadmata.xml	
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ========== Tribals ========== -->
+
+	<PawnKindDef>
+		<defName>LizoGrenadier</defName>
+		<race>FR_Alien_Squamata</race>
+		<label>boomer</label>
+		<combatPower>65</combatPower>
+		<defaultFactionType>FR_SquamataTribes</defaultFactionType>
+		<backstoryCategories>
+			<li>Tribal</li>
+		</backstoryCategories>
+		<maxGenerationAge>60</maxGenerationAge>
+		<chemicalAddictionChance>0.05</chemicalAddictionChance>
+		<invNutrition>2.55</invNutrition>
+		<invFoodDef>Pemmican</invFoodDef>
+		<canBeSapper>true</canBeSapper>
+		<gearHealthRange>
+			<min>0.5</min>
+			<max>1.8</max>
+		</gearHealthRange>
+		<apparelMoney>
+			<min>180</min>
+			<max>350</max>
+		</apparelMoney>
+		<apparelRequired>
+			<li>Apparel_WarVeil</li>
+			<li>CE_Apparel_TribalBackpack</li>
+		</apparelRequired>
+		<apparelTags>
+			<li>Tribal</li>
+		</apparelTags>
+		<weaponMoney>
+			<min>60</min>
+			<max>400</max>
+		</weaponMoney>
+		<weaponTags>
+			<li>CE_GrenadeNeolithic</li>
+		</weaponTags>
+		<techHediffsMoney>
+			<min>50</min>
+			<max>800</max>
+		</techHediffsMoney>
+		<techHediffsTags>
+			<li>Poor</li>
+			<li>Simple</li>
+		</techHediffsTags>
+		<techHediffsChance>0.33</techHediffsChance>
+		<modExtensions>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>18</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>80</min>
+						<max>160</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Tribal</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</modExtensions>
+	</PawnKindDef>
+
+	<PawnKindDef>
+		<defName>LizoGunner</defName>
+		<race>FR_Alien_Squamata</race>
+		<label>thunderer</label>
+		<combatPower>65</combatPower>
+		<defaultFactionType>FR_SquamataTribes</defaultFactionType>
+		<backstoryCategories>
+			<li>Tribal</li>
+		</backstoryCategories>
+		<maxGenerationAge>60</maxGenerationAge>
+		<chemicalAddictionChance>0.05</chemicalAddictionChance>
+		<invNutrition>2.55</invNutrition>
+		<invFoodDef>Pemmican</invFoodDef>
+		<gearHealthRange>
+			<min>0.5</min>
+			<max>1.8</max>
+		</gearHealthRange>
+		<apparelMoney>
+			<min>180</min>
+			<max>350</max>
+		</apparelMoney>
+		<apparelTags>
+			<li>Tribal</li>
+		</apparelTags>
+		<apparelRequired>
+			<li>Apparel_WarMask</li>
+		</apparelRequired>
+		<weaponMoney>
+			<min>180</min>
+			<max>290</max>
+		</weaponMoney>
+		<weaponTags>
+			<li>Gun</li>
+		</weaponTags>
+		<techHediffsMoney>
+			<min>50</min>
+			<max>800</max>
+		</techHediffsMoney>
+		<techHediffsTags>
+			<li>Poor</li>
+			<li>Simple</li>
+		</techHediffsTags>
+		<techHediffsChance>0.20</techHediffsChance>
+		<modExtensions>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>120</min>
+					<max>160</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.8</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</modExtensions>
+	</PawnKindDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Forgotten Realms - Lizardfolk/Patches/Forgotten Realms - Lizardfolk/Patch_Lizardfolk_Race.xml b/ModPatches/Forgotten Realms - Lizardfolk/Patches/Forgotten Realms - Lizardfolk/Patch_Lizardfolk_Race.xml
new file mode 100644
index 0000000000..0f0070e2a3
--- /dev/null
+++ b/ModPatches/Forgotten Realms - Lizardfolk/Patches/Forgotten Realms - Lizardfolk/Patch_Lizardfolk_Race.xml	
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Squamata" or defName="FR_Alien_Croco"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Squamata"]/statBases/Mass</xpath>
+		<value>
+			<Mass>45</Mass>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Croco"]/statBases/Mass</xpath>
+		<value>
+			<Mass>60</Mass>
+			<MeleeDodgeChance>0.8</MeleeDodgeChance>
+			<MeleeCritChance>1.2</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>0.75</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Squamata"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4.6</MoveSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Croco"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4.1</MoveSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Squamata" or defName="FR_Alien_Croco"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0.5</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Squamata"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Croco"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.35</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Squamata"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Croco"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Squamata" or defName="FR_Alien_Croco"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.1</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Squamata"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>1.15</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Croco"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>1.4</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Squamata"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.55</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.0</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Croco"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>2.5</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.0</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Squamata" or defName="FR_Alien_Croco"]</xpath>
+		<value>
+			<comps>
+				<li>
+					<compClass>CombatExtended.CompPawnGizmo</compClass>
+				</li>
+				<li Class="CombatExtended.CompProperties_Suppressable"/>
+			</comps>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Forgotten Realms - Lizardfolk/Patches/Forgotten Realms - Lizardfolk/Patch_Lizardfolk_Skin.xml b/ModPatches/Forgotten Realms - Lizardfolk/Patches/Forgotten Realms - Lizardfolk/Patch_Lizardfolk_Skin.xml
new file mode 100644
index 0000000000..7800eef30e
--- /dev/null
+++ b/ModPatches/Forgotten Realms - Lizardfolk/Patches/Forgotten Realms - Lizardfolk/Patch_Lizardfolk_Skin.xml	
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Leather -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Squamata"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.08</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Squamata"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.064</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Croco"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.1</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Croco"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.068</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Forgotten Realms - Lizardfolk/Patches/Forgotten Realms - Lizardfolk/Patch_PawnKinds_Lizardfolk.xml b/ModPatches/Forgotten Realms - Lizardfolk/Patches/Forgotten Realms - Lizardfolk/Patch_PawnKinds_Lizardfolk.xml
new file mode 100644
index 0000000000..53f52ef63c
--- /dev/null
+++ b/ModPatches/Forgotten Realms - Lizardfolk/Patches/Forgotten Realms - Lizardfolk/Patch_PawnKinds_Lizardfolk.xml	
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Tribal -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="FR_SquamataTribes_Peasant" or defName="FR_CrocoTribes_Peasant"]/combatPower</xpath>
+		<value>
+			<combatPower>25</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="FR_CrocoTribes_Fighter" or defName="FR_SquamataTribes_Fighter"]/combatPower</xpath>
+		<value>
+			<combatPower>30</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="FR_SquamataTribes_Warrior" or defName="FR_CrocoTribes_Warrior"]/combatPower</xpath>
+		<value>
+			<combatPower>40</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="FR_CrocoTribes_Bowman" or defName="FR_SquamataTribes_Bowman"]/combatPower</xpath>
+		<value>
+			<combatPower>40</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="FR_SquamataTribes_Champion" or defName="FR_SquamataTribes_Chief" or defName="FR_CrocoTribes_Champion" or defName="FR_CrocoTribes_Chief"]/combatPower</xpath>
+		<value>
+			<combatPower>70</combatPower>
+		</value>
+	</Operation>
+
+	<!-- Hive_Archer -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FR_CrocoTribes_Bowman" or defName="FR_SquamataTribes_Bowman"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>20</min>
+					<max>40</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>100</min>
+					<max>140</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>40</min>
+							<max>80</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Hiver_Warrior -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FR_SquamataTribes_Warrior" or defName="FR_CrocoTribes_Warrior" or defName="FR_CrocoTribes_Fighter" or defName="FR_SquamataTribes_Fighter"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>100</min>
+					<max>200</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.75</shieldChance>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Forgotten Realms - Lizardfolk/Patches/Forgotten Realms - Lizardfolk/Patch_Scenarios_Squamata.xml b/ModPatches/Forgotten Realms - Lizardfolk/Patches/Forgotten Realms - Lizardfolk/Patch_Scenarios_Squamata.xml
new file mode 100644
index 0000000000..b83e084cfe
--- /dev/null
+++ b/ModPatches/Forgotten Realms - Lizardfolk/Patches/Forgotten Realms - Lizardfolk/Patch_Scenarios_Squamata.xml	
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Squamata === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="FR_CrashlandedSquamata"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_303British_FMJ</thingDef>
+				<count>100</count>
+			</li>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_44Magnum_FMJ</thingDef>
+				<count>60</count>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="FR_LostTribeSquamata"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_Arrow_Stone</thingDef>
+				<count>100</count>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="FR_LostTribeSquamata"]/scenario/parts/li[thingDef="Pila"]</xpath>
+		<value>
+			<count>20</count>
+		</value>
+	</Operation>
+
+	<!-- === Crocodillian === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="FR_CrashlandedCroco"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_303British_FMJ</thingDef>
+				<count>100</count>
+			</li>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_44Magnum_FMJ</thingDef>
+				<count>60</count>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="FR_LostTribeCroco"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_Arrow_Stone</thingDef>
+				<count>100</count>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="FR_LostTribeCroco"]/scenario/parts/li[thingDef="Pila"]</xpath>
+		<value>
+			<count>20</count>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Forgotten Realms - Lizardfolk/Patches/Forgotten Realms - Lizardfolk/PawnKinds_Crocodillian.xml b/ModPatches/Forgotten Realms - Lizardfolk/Patches/Forgotten Realms - Lizardfolk/PawnKinds_Crocodillian.xml
new file mode 100644
index 0000000000..ed386394e3
--- /dev/null
+++ b/ModPatches/Forgotten Realms - Lizardfolk/Patches/Forgotten Realms - Lizardfolk/PawnKinds_Crocodillian.xml	
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Add tribal grenadies ========== -->
+
+	<Operation Class="PatchOperationAdd"><!-- Combat -->
+		<xpath>Defs/FactionDef[defName="FR_CrocoTribes"]/pawnGroupMakers/li[1]/options</xpath>
+		<value>
+			<CrocoGrenadier>10</CrocoGrenadier>
+			<CrocoGunner>20</CrocoGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Normal fights, ranged only -->
+		<xpath>Defs/FactionDef[defName="FR_CrocoTribes"]/pawnGroupMakers/li[2]/options</xpath>
+		<value>
+			<CrocoGrenadier>20</CrocoGrenadier>
+			<CrocoGunner>25</CrocoGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!--Peaceful-->
+		<xpath>Defs/FactionDef[defName="FR_CrocoTribes"]/pawnGroupMakers/li[4]/options</xpath>
+		<value>
+			<CrocoGrenadier>5</CrocoGrenadier>
+			<CrocoGunner>20</CrocoGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!--Trader-->
+		<xpath>Defs/FactionDef[defName="FR_CrocoTribes"]/pawnGroupMakers/li[5]/guards</xpath>
+		<value>
+			<CrocoGrenadier>7</CrocoGrenadier>
+			<CrocoGunner>20</CrocoGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Settlement -->
+		<xpath>Defs/FactionDef[defName="FR_CrocoTribes"]/pawnGroupMakers/li[6]/options</xpath>
+		<value>
+			<CrocoGrenadier>20</CrocoGrenadier>
+			<CrocoGunner>40</CrocoGunner>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Forgotten Realms - Lizardfolk/Patches/Forgotten Realms - Lizardfolk/PawnKinds_Squadmata.xml b/ModPatches/Forgotten Realms - Lizardfolk/Patches/Forgotten Realms - Lizardfolk/PawnKinds_Squadmata.xml
new file mode 100644
index 0000000000..f65650d477
--- /dev/null
+++ b/ModPatches/Forgotten Realms - Lizardfolk/Patches/Forgotten Realms - Lizardfolk/PawnKinds_Squadmata.xml	
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Add tribal grenadies ========== -->
+
+	<Operation Class="PatchOperationAdd"><!-- Combat -->
+		<xpath>Defs/FactionDef[defName="FR_SquamataTribes"]/pawnGroupMakers/li[1]/options</xpath>
+		<value>
+			<LizoGrenadier>10</LizoGrenadier>
+			<LizoGunner>20</LizoGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Normal fights, ranged only -->
+		<xpath>Defs/FactionDef[defName="FR_SquamataTribes"]/pawnGroupMakers/li[2]/options</xpath>
+		<value>
+			<LizoGrenadier>15</LizoGrenadier>
+			<LizoGunner>30</LizoGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!--Peaceful-->
+		<xpath>Defs/FactionDef[defName="FR_SquamataTribes"]/pawnGroupMakers/li[4]/options</xpath>
+		<value>
+			<LizoGrenadier>5</LizoGrenadier>
+			<LizoGunner>20</LizoGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!--Trader-->
+		<xpath>Defs/FactionDef[defName="FR_SquamataTribes"]/pawnGroupMakers/li[5]/guards</xpath>
+		<value>
+			<LizoGrenadier>7</LizoGrenadier>
+			<LizoGunner>20</LizoGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Settlement -->
+		<xpath>Defs/FactionDef[defName="FR_SquamataTribes"]/pawnGroupMakers/li[6]/options</xpath>
+		<value>
+			<LizoGrenadier>20</LizoGrenadier>
+			<LizoGunner>40</LizoGunner>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Forgotten Realms - Minotaur/Defs/Forgotten Realms - Minotaur/PawnKinds_Minos.xml b/ModPatches/Forgotten Realms - Minotaur/Defs/Forgotten Realms - Minotaur/PawnKinds_Minos.xml
new file mode 100644
index 0000000000..804cecbb26
--- /dev/null
+++ b/ModPatches/Forgotten Realms - Minotaur/Defs/Forgotten Realms - Minotaur/PawnKinds_Minos.xml	
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ========== Tribals ========== -->
+
+	<PawnKindDef>
+		<defName>MinoGrenadier</defName>
+		<race>FR_Alien_Minotaur</race>
+		<label>kara boomer</label>
+		<combatPower>70</combatPower>
+		<defaultFactionType>FR_MinotaurTribes</defaultFactionType>
+		<backstoryCategories>
+			<li>Tribal</li>
+		</backstoryCategories>
+		<maxGenerationAge>60</maxGenerationAge>
+		<chemicalAddictionChance>0.05</chemicalAddictionChance>
+		<invNutrition>2.55</invNutrition>
+		<invFoodDef>Pemmican</invFoodDef>
+		<canBeSapper>true</canBeSapper>
+		<gearHealthRange>
+			<min>0.5</min>
+			<max>1.8</max>
+		</gearHealthRange>
+		<apparelMoney>
+			<min>180</min>
+			<max>350</max>
+		</apparelMoney>
+		<apparelRequired>
+			<li>Apparel_WarVeil</li>
+			<li>CE_Apparel_TribalBackpack</li>
+		</apparelRequired>
+		<apparelTags>
+			<li>Tribal</li>
+		</apparelTags>
+		<weaponMoney>
+			<min>60</min>
+			<max>400</max>
+		</weaponMoney>
+		<weaponTags>
+			<li>CE_GrenadeNeolithic</li>
+		</weaponTags>
+		<techHediffsMoney>
+			<min>50</min>
+			<max>800</max>
+		</techHediffsMoney>
+		<techHediffsTags>
+			<li>Poor</li>
+			<li>Simple</li>
+		</techHediffsTags>
+		<techHediffsChance>0.33</techHediffsChance>
+		<modExtensions>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>18</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>80</min>
+						<max>160</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Tribal</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</modExtensions>
+	</PawnKindDef>
+
+	<PawnKindDef>
+		<defName>MinoGunner</defName>
+		<race>FR_Alien_Minotaur</race>
+		<label>boga thunderer</label>
+		<combatPower>75</combatPower>
+		<defaultFactionType>FR_MinotaurTribes</defaultFactionType>
+		<backstoryCategories>
+			<li>Tribal</li>
+		</backstoryCategories>
+		<maxGenerationAge>60</maxGenerationAge>
+		<chemicalAddictionChance>0.05</chemicalAddictionChance>
+		<invNutrition>2.55</invNutrition>
+		<invFoodDef>Pemmican</invFoodDef>
+		<gearHealthRange>
+			<min>0.5</min>
+			<max>1.8</max>
+		</gearHealthRange>
+		<apparelMoney>
+			<min>180</min>
+			<max>350</max>
+		</apparelMoney>
+		<apparelTags>
+			<li>Tribal</li>
+		</apparelTags>
+		<apparelRequired>
+			<li>Apparel_WarMask</li>
+		</apparelRequired>
+		<weaponMoney>
+			<min>180</min>
+			<max>290</max>
+		</weaponMoney>
+		<weaponTags>
+			<li>Gun</li>
+		</weaponTags>
+		<techHediffsMoney>
+			<min>50</min>
+			<max>800</max>
+		</techHediffsMoney>
+		<techHediffsTags>
+			<li>Poor</li>
+			<li>Simple</li>
+		</techHediffsTags>
+		<techHediffsChance>0.20</techHediffsChance>
+		<modExtensions>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>120</min>
+					<max>160</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.8</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</modExtensions>
+	</PawnKindDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Forgotten Realms - Minotaur/Patches/Forgotten Realms - Minotaur/Patch_Mino_Leather.xml b/ModPatches/Forgotten Realms - Minotaur/Patches/Forgotten Realms - Minotaur/Patch_Mino_Leather.xml
new file mode 100644
index 0000000000..2a8b39f0cc
--- /dev/null
+++ b/ModPatches/Forgotten Realms - Minotaur/Patches/Forgotten Realms - Minotaur/Patch_Mino_Leather.xml	
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Leather -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Minotaur"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.07</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Minotaur"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.056</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Forgotten Realms - Minotaur/Patches/Forgotten Realms - Minotaur/Patch_Mino_Race.xml b/ModPatches/Forgotten Realms - Minotaur/Patches/Forgotten Realms - Minotaur/Patch_Mino_Race.xml
new file mode 100644
index 0000000000..eec1077bfc
--- /dev/null
+++ b/ModPatches/Forgotten Realms - Minotaur/Patches/Forgotten Realms - Minotaur/Patch_Mino_Race.xml	
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Minotaur"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Minotaur"]/statBases/Mass</xpath>
+		<value>
+			<Mass>75</Mass>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1.66</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<AimingAccuracy>0.66</AimingAccuracy>
+			<Suppressability>0.66</Suppressability>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>30</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Minotaur"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4.8</MoveSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Minotaur"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0.6</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Minotaur"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>1.75</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Minotaur"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.0</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.0</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Horn</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>3</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.33</chanceFactor>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Minotaur"]</xpath>
+		<value>
+			<comps>
+				<li>
+					<compClass>CombatExtended.CompPawnGizmo</compClass>
+				</li>
+				<li Class="CombatExtended.CompProperties_Suppressable"/>
+			</comps>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Forgotten Realms - Minotaur/Patches/Forgotten Realms - Minotaur/Patch_PawnKinds_Mino.xml b/ModPatches/Forgotten Realms - Minotaur/Patches/Forgotten Realms - Minotaur/Patch_PawnKinds_Mino.xml
new file mode 100644
index 0000000000..6995c8ca02
--- /dev/null
+++ b/ModPatches/Forgotten Realms - Minotaur/Patches/Forgotten Realms - Minotaur/Patch_PawnKinds_Mino.xml	
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Tribal -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="FR_MinotaurTribes_Peasant"]/combatPower</xpath>
+		<value>
+			<combatPower>25</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="FR_MinotaurTribes_Fighter"]/combatPower</xpath>
+		<value>
+			<combatPower>32</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="FR_MinotaurTribes_Warrior"]/combatPower</xpath>
+		<value>
+			<combatPower>40</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="FR_MinotaurTribes_Bowman"]/combatPower</xpath>
+		<value>
+			<combatPower>40</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="FR_MinotaurTribes_Champion" or defName="FR_MinotaurTribes_Chief"]/combatPower</xpath>
+		<value>
+			<combatPower>70</combatPower>
+		</value>
+	</Operation>
+
+	<!-- Hive_Archer -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FR_MinotaurTribes_Bowman"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>20</min>
+					<max>40</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>100</min>
+					<max>140</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.6</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>40</min>
+							<max>80</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Hiver_Warrior -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FR_MinotaurTribes_Fighter" or defName="FR_MinotaurTribes_Warrior"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>100</min>
+					<max>200</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.75</shieldChance>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Forgotten Realms - Minotaur/Patches/Forgotten Realms - Minotaur/PawnKinds_Minos.xml b/ModPatches/Forgotten Realms - Minotaur/Patches/Forgotten Realms - Minotaur/PawnKinds_Minos.xml
new file mode 100644
index 0000000000..cf3adcf934
--- /dev/null
+++ b/ModPatches/Forgotten Realms - Minotaur/Patches/Forgotten Realms - Minotaur/PawnKinds_Minos.xml	
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Add tribal grenadies ========== -->
+
+	<Operation Class="PatchOperationAdd"><!-- Combat -->
+		<xpath>Defs/FactionDef[defName="FR_MinotaurTribes"]/pawnGroupMakers/li[1]/options</xpath>
+		<value>
+			<MinoGrenadier>10</MinoGrenadier>
+			<MinoGunner>20</MinoGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Normal fights, ranged only -->
+		<xpath>Defs/FactionDef[defName="FR_MinotaurTribes"]/pawnGroupMakers/li[2]/options</xpath>
+		<value>
+			<MinoGrenadier>15</MinoGrenadier>
+			<MinoGunner>30</MinoGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!--Peaceful-->
+		<xpath>Defs/FactionDef[defName="FR_MinotaurTribes"]/pawnGroupMakers/li[4]/options</xpath>
+		<value>
+			<MinoGrenadier>5</MinoGrenadier>
+			<MinoGunner>20</MinoGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!--Trader-->
+		<xpath>Defs/FactionDef[defName="FR_MinotaurTribes"]/pawnGroupMakers/li[5]/guards</xpath>
+		<value>
+			<MinoGrenadier>7</MinoGrenadier>
+			<MinoGunner>20</MinoGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Settlement -->
+		<xpath>Defs/FactionDef[defName="FR_MinotaurTribes"]/pawnGroupMakers/li[6]/options</xpath>
+		<value>
+			<MinoGrenadier>20</MinoGrenadier>
+			<MinoGunner>40</MinoGunner>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Forgotten Realms - Minotaur/Patches/Forgotten Realms - Minotaur/Scenarios_Mino.xml b/ModPatches/Forgotten Realms - Minotaur/Patches/Forgotten Realms - Minotaur/Scenarios_Mino.xml
new file mode 100644
index 0000000000..5e430b517a
--- /dev/null
+++ b/ModPatches/Forgotten Realms - Minotaur/Patches/Forgotten Realms - Minotaur/Scenarios_Mino.xml	
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Add ammo to scenario === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="FR_CrashlandedMinotaur"]/scenario/parts</xpath>
+
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_303British_FMJ</thingDef>
+				<count>100</count>
+			</li>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_44Magnum_FMJ</thingDef>
+				<count>60</count>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="FR_LostTribeMinotaur"]/scenario/parts</xpath>
+
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_Arrow_Stone</thingDef>
+				<count>100</count>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="FR_LostTribeMinotaur"]/scenario/parts/li[thingDef="Pila"]</xpath>
+
+		<value>
+			<count>20</count>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Fort's Firefighter Gadget/Patches/Fort's Firefighter Gadget/Apparel_Industrial.xml b/ModPatches/Fort's Firefighter Gadget/Patches/Fort's Firefighter Gadget/Apparel_Industrial.xml
new file mode 100644
index 0000000000..2baa0a86a2
--- /dev/null
+++ b/ModPatches/Fort's Firefighter Gadget/Patches/Fort's Firefighter Gadget/Apparel_Industrial.xml	
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Firefighter Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="Apparel_FirefighterHelmetA" or
+			defName="Apparel_FirefighterHelmetB" or
+			defName="Apparel_FirefighterHelmetC" or
+			defName="Apparel_FirefighterHelmetG"
+			]/statBases </xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Apparel_FirefighterHelmetA" or
+			defName="Apparel_FirefighterHelmetB" or
+			defName="Apparel_FirefighterHelmetC" or
+			defName="Apparel_FirefighterHelmetG"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.8</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="Apparel_FirefighterHelmetA" or
+			defName="Apparel_FirefighterHelmetB" or
+			defName="Apparel_FirefighterHelmetC" or
+			defName="Apparel_FirefighterHelmetG"
+			]/statBases </xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[
+			defName="Apparel_FirefighterHelmetA" or
+			defName="Apparel_FirefighterHelmetB" or
+			defName="Apparel_FirefighterHelmetC" or
+			defName="Apparel_FirefighterHelmetG"]/apparel/immuneToToxGasExposure </xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[
+				defName="Apparel_FirefighterHelmetA" or
+				defName="Apparel_FirefighterHelmetB" or
+				defName="Apparel_FirefighterHelmetC" or
+				defName="Apparel_FirefighterHelmetG"]/apparel </xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="Apparel_FirefighterHelmetA" or
+			defName="Apparel_FirefighterHelmetB" or
+			defName="Apparel_FirefighterHelmetC" or
+			defName="Apparel_FirefighterHelmetG"
+			]/equippedStatOffsets </xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[
+			defName="Apparel_FirefighterHelmetA" or
+			defName="Apparel_FirefighterHelmetB" or
+			defName="Apparel_FirefighterHelmetC" or
+			defName="Apparel_FirefighterHelmetG"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.50</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+							<li>Jaw</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.50</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+							<li>Jaw</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Firefighter Jacket === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="Apparel_Firefighter_A" or
+			defName="Apparel_Firefighter_B" or
+			defName="Apparel_Firefighter_R"
+			]/statBases </xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>7.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Apparel_Firefighter_A" or
+			defName="Apparel_Firefighter_B" or
+			defName="Apparel_Firefighter_R"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Apparel_Firefighter_A" or
+			defName="Apparel_Firefighter_B" or
+			defName="Apparel_Firefighter_R"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Apparel_Firefighter_A" or
+			defName="Apparel_Firefighter_B" or
+			defName="Apparel_Firefighter_R"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>2.25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Fort's Firefighter Gadget/Patches/Fort's Firefighter Gadget/Industrial_Melee.xml b/ModPatches/Fort's Firefighter Gadget/Patches/Fort's Firefighter Gadget/Industrial_Melee.xml
new file mode 100644
index 0000000000..2d5a53e659
--- /dev/null
+++ b/ModPatches/Fort's Firefighter Gadget/Patches/Fort's Firefighter Gadget/Industrial_Melee.xml	
@@ -0,0 +1,342 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Bolt Cutters -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Boltcutter"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.32</cooldownTime>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+					<armorPenetrationSharp>5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>2.81</cooldownTime>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Boltcutter"]/statBases</xpath>
+		<value>
+			<Bulk>5.25</Bulk>
+			<MeleeCounterParryBonus>0.34</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Boltcutter"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.40</MeleeCritChance>
+			<MeleeParryChance>0.16</MeleeParryChance>
+			<MeleeDodgeChance>0.21</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- Crowbar -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Crowbar"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.32</cooldownTime>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>0.63</cooldownTime>
+					<armorPenetrationBlunt>5.625</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>prying</label>
+					<capacities>
+						<li>Demolish</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.63</cooldownTime>
+					<armorPenetrationBlunt>5.625</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Crowbar"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Crowbar"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.42</MeleeCritChance>
+				<MeleeParryChance>0.24</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Halligan Bar -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Halligan_Bar"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>pick</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.68</cooldownTime>
+					<armorPenetrationBlunt>2.34</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.34</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.63</cooldownTime>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>prying</label>
+					<capacities>
+						<li>Demolish</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.43</cooldownTime>
+					<armorPenetrationBlunt>2.625</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Halligan_Bar"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>0.40</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Halligan_Bar"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.22</MeleeCritChance>
+			<MeleeParryChance>0.30</MeleeParryChance>
+			<MeleeDodgeChance>0.30</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- Fire Axe -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_FireAxe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.3</cooldownTime>
+					<armorPenetrationBlunt>3.263</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>pick</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.96</cooldownTime>
+					<armorPenetrationBlunt>13.05</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.31</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>41</power>
+					<cooldownTime>2.41</cooldownTime>
+					<armorPenetrationBlunt>13.05</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.16</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_FireAxe"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.28</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_FireAxe"]/statBases/Mass</xpath>
+		<value>
+			<Mass>2.9</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_FireAxe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.11</MeleeCritChance>
+				<MeleeParryChance>0.28</MeleeParryChance>
+				<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Sledgehammer -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Sledgehammer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.87</cooldownTime>
+					<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Demolish</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>2.43</cooldownTime>
+					<armorPenetrationBlunt>10.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Sledgehammer"]/statBases</xpath>
+		<value>
+			<Bulk>7</Bulk>
+			<MeleeCounterParryBonus>0.38</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Sledgehammer"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.2</MeleeCritChance>
+				<MeleeParryChance>0.5</MeleeParryChance>
+				<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Hydraulic Rescue Tool -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_HydraulicRescueTool"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>body</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>3.33</cooldownTime>
+					<armorPenetrationBlunt>3.2</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.33</cooldownTime>
+					<armorPenetrationBlunt>3.45</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.23</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>cut and spread</label>
+					<capacities>
+						<li>Demolish</li>
+					</capacities>
+					<power>50</power>
+					<cooldownTime>3.63</cooldownTime>
+					<armorPenetrationBlunt>8.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_HydraulicRescueTool"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<MeleeCounterParryBonus>0.38</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_HydraulicRescueTool"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>1.2</MeleeCritChance>
+			<MeleeParryChance>0.5</MeleeParryChance>
+			<MeleeDodgeChance>0.3</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Frontline - Additional Guns For Bunkers/Patches/Frontline - Additional Guns For Bunkers/FrontlineAdditionalGunsForBunkers_GA_TRLMGII.xml b/ModPatches/Frontline - Additional Guns For Bunkers/Patches/Frontline - Additional Guns For Bunkers/FrontlineAdditionalGunsForBunkers_GA_TRLMGII.xml
new file mode 100644
index 0000000000..5be89a0c84
--- /dev/null
+++ b/ModPatches/Frontline - Additional Guns For Bunkers/Patches/Frontline - Additional Guns For Bunkers/FrontlineAdditionalGunsForBunkers_GA_TRLMGII.xml	
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BK_Base_LMGII"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="BK_Base_LMGII"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="BK_Base_LMGII"]/tradeTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="BK_Base_LMGII"]</xpath>
+			<value>
+				<tradeTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BK_Base_LMGII"]/tradeTags</xpath>
+		<value>
+			<li>CE_Turret</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BK_Gun_LMGII</defName>
+		<statBases>
+			<MarketValue>800</MarketValue>
+			<RangedWeapon_Cooldown>3</RangedWeapon_Cooldown>
+			<Mass>20</Mass>
+			<Bulk>10.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.7</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
+			<warmupTime>3</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
+			<burstShotCount>6</burstShotCount>
+			<soundCast>BK_LMGII_Fire</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>20</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_303British</ammoSet>
+		</AmmoUser>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Frontline - Additional Guns For Bunkers/Patches/Frontline - Additional Guns For Bunkers/FrontlineAdditionalGunsForBunkers_HA_TRMMGII.xml b/ModPatches/Frontline - Additional Guns For Bunkers/Patches/Frontline - Additional Guns For Bunkers/FrontlineAdditionalGunsForBunkers_HA_TRMMGII.xml
new file mode 100644
index 0000000000..b5f98ae856
--- /dev/null
+++ b/ModPatches/Frontline - Additional Guns For Bunkers/Patches/Frontline - Additional Guns For Bunkers/FrontlineAdditionalGunsForBunkers_HA_TRMMGII.xml	
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BK_Base_MMGII"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="BK_Base_MMGII"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="BK_Base_MMGII"]/tradeTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="BK_Base_MMGII"]</xpath>
+			<value>
+				<tradeTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BK_Base_MMGII"]/tradeTags</xpath>
+		<value>
+			<li>CE_Turret</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BK_Gun_MMGII</defName>
+		<statBases>
+			<MarketValue>800</MarketValue>
+			<RangedWeapon_Cooldown>3</RangedWeapon_Cooldown>
+			<Mass>20</Mass>
+			<Bulk>10.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.3</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>3</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>6</burstShotCount>
+			<soundCast>BK_MMGII_Fire</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>20</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Frontline - Additional Guns For Bunkers/Patches/Frontline - Additional Guns For Bunkers/FrontlineAdditionalGunsForBunkers_IA_TRHMGII.xml b/ModPatches/Frontline - Additional Guns For Bunkers/Patches/Frontline - Additional Guns For Bunkers/FrontlineAdditionalGunsForBunkers_IA_TRHMGII.xml
new file mode 100644
index 0000000000..b0eba4896a
--- /dev/null
+++ b/ModPatches/Frontline - Additional Guns For Bunkers/Patches/Frontline - Additional Guns For Bunkers/FrontlineAdditionalGunsForBunkers_IA_TRHMGII.xml	
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BK_Base_HMGII"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="BK_Base_HMGII"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="BK_Base_HMGII"]/tradeTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="BK_Base_HMGII"]</xpath>
+			<value>
+				<tradeTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BK_Base_HMGII"]/tradeTags</xpath>
+		<value>
+			<li>CE_Turret</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BK_Gun_HMGII</defName>
+		<statBases>
+			<MarketValue>800</MarketValue>
+			<RangedWeapon_Cooldown>3</RangedWeapon_Cooldown>
+			<Mass>20</Mass>
+			<Bulk>10.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>3</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>BK_HMGII_Fire</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>20</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Frontline - Additional Guns For Trenches/Patches/Frontline - Additional Guns For Trenches/FrontlineAdditionalGunsForTrenches_GA_TRLMGII.xml b/ModPatches/Frontline - Additional Guns For Trenches/Patches/Frontline - Additional Guns For Trenches/FrontlineAdditionalGunsForTrenches_GA_TRLMGII.xml
new file mode 100644
index 0000000000..95d396144c
--- /dev/null
+++ b/ModPatches/Frontline - Additional Guns For Trenches/Patches/Frontline - Additional Guns For Trenches/FrontlineAdditionalGunsForTrenches_GA_TRLMGII.xml	
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TR_Base_LMGII" or defName="TR_Base_LMGIISB"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="TR_Base_LMGII" or defName="TR_Base_LMGIISB"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="TR_Base_LMGII" or defName="TR_Base_LMGIISB"]/tradeTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="TR_Base_LMGII" or defName="TR_Base_LMGIISB"]</xpath>
+			<value>
+				<tradeTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TR_Base_LMGII" or defName="TR_Base_LMGIISB"]/tradeTags</xpath>
+		<value>
+			<li>CE_Turret</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>TR_Gun_LMGII</defName>
+		<statBases>
+			<MarketValue>800</MarketValue>
+			<RangedWeapon_Cooldown>3</RangedWeapon_Cooldown>
+			<Mass>20</Mass>
+			<Bulk>10.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.7</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
+			<warmupTime>3</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
+			<burstShotCount>6</burstShotCount>
+			<soundCast>TR_LMGII_Fire</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>20</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_303British</ammoSet>
+		</AmmoUser>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Frontline - Additional Guns For Trenches/Patches/Frontline - Additional Guns For Trenches/FrontlineAdditionalGunsForTrenches_HA_TRMMGII.xml b/ModPatches/Frontline - Additional Guns For Trenches/Patches/Frontline - Additional Guns For Trenches/FrontlineAdditionalGunsForTrenches_HA_TRMMGII.xml
new file mode 100644
index 0000000000..58b201f771
--- /dev/null
+++ b/ModPatches/Frontline - Additional Guns For Trenches/Patches/Frontline - Additional Guns For Trenches/FrontlineAdditionalGunsForTrenches_HA_TRMMGII.xml	
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TR_Base_MMGII" or defName="TR_Base_MMGIISB"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="TR_Base_MMGII" or defName="TR_Base_MMGIISB"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="TR_Base_MMGII" or defName="TR_Base_MMGIISB"]/tradeTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="TR_Base_MMGII" or defName="TR_Base_MMGIISB"]</xpath>
+			<value>
+				<tradeTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TR_Base_MMGII" or defName="TR_Base_MMGIISB"]/tradeTags</xpath>
+		<value>
+			<li>CE_Turret</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>TR_Gun_MMGII</defName>
+		<statBases>
+			<MarketValue>800</MarketValue>
+			<RangedWeapon_Cooldown>3</RangedWeapon_Cooldown>
+			<Mass>20</Mass>
+			<Bulk>10.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.3</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>3</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>6</burstShotCount>
+			<soundCast>TR_MMGII_Fire</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>20</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Frontline - Additional Guns For Trenches/Patches/Frontline - Additional Guns For Trenches/FrontlineAdditionalGunsForTrenches_IA_TRHMGII.xml b/ModPatches/Frontline - Additional Guns For Trenches/Patches/Frontline - Additional Guns For Trenches/FrontlineAdditionalGunsForTrenches_IA_TRHMGII.xml
new file mode 100644
index 0000000000..43a66750a9
--- /dev/null
+++ b/ModPatches/Frontline - Additional Guns For Trenches/Patches/Frontline - Additional Guns For Trenches/FrontlineAdditionalGunsForTrenches_IA_TRHMGII.xml	
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TR_Base_HMGII" or defName="TR_Base_HMGIISB"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="TR_Base_HMGII" or defName="TR_Base_HMGIISB"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="TR_Base_HMGII" or defName="TR_Base_HMGIISB"]/tradeTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="TR_Base_HMGII" or defName="TR_Base_HMGIISB"]</xpath>
+			<value>
+				<tradeTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TR_Base_HMGII" or defName="TR_Base_HMGIISB"]/tradeTags</xpath>
+		<value>
+			<li>CE_Turret</li>
+		</value>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>TR_Gun_HMGII</defName>
+		<statBases>
+			<MarketValue>800</MarketValue>
+			<RangedWeapon_Cooldown>3</RangedWeapon_Cooldown>
+			<Mass>20</Mass>
+			<Bulk>10.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>3</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>TR_HMGII_Fire</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>20</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Frontline - Bunkers/Patches/Frontline - Bunkers/FrontlineBunkers_G_TRLMG.xml b/ModPatches/Frontline - Bunkers/Patches/Frontline - Bunkers/FrontlineBunkers_G_TRLMG.xml
new file mode 100644
index 0000000000..778c565cdf
--- /dev/null
+++ b/ModPatches/Frontline - Bunkers/Patches/Frontline - Bunkers/FrontlineBunkers_G_TRLMG.xml	
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BK_Base_LMG"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="BK_Base_LMG"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="BK_Base_LMG"]/tradeTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="BK_Base_LMG"]</xpath>
+			<value>
+				<tradeTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BK_Base_LMG"]/tradeTags</xpath>
+		<value>
+			<li>CE_Turret</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BK_Gun_LMG</defName>
+		<statBases>
+			<MarketValue>800</MarketValue>
+			<RangedWeapon_Cooldown>4</RangedWeapon_Cooldown>
+			<Mass>20</Mass>
+			<Bulk>10.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.7</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>3</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
+			<burstShotCount>12</burstShotCount>
+			<soundCast>BK_LMG_Fire</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>20</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Frontline - Bunkers/Patches/Frontline - Bunkers/FrontlineBunkers_H_TRMMG.xml b/ModPatches/Frontline - Bunkers/Patches/Frontline - Bunkers/FrontlineBunkers_H_TRMMG.xml
new file mode 100644
index 0000000000..ddea4fd4f6
--- /dev/null
+++ b/ModPatches/Frontline - Bunkers/Patches/Frontline - Bunkers/FrontlineBunkers_H_TRMMG.xml	
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BK_Base_MMG"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="BK_Base_MMG"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="BK_Base_MMG"]/tradeTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="BK_Base_MMG"]</xpath>
+			<value>
+				<tradeTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BK_Base_MMG"]/tradeTags</xpath>
+		<value>
+			<li>CE_Turret</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BK_Gun_MMG</defName>
+		<statBases>
+			<MarketValue>800</MarketValue>
+			<RangedWeapon_Cooldown>4</RangedWeapon_Cooldown>
+			<Mass>14</Mass>
+			<Bulk>10.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.3</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>3</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>12</burstShotCount>
+			<soundCast>BK_MMG_Fire</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>20</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Frontline - Bunkers/Patches/Frontline - Bunkers/FrontlineBunkers_I_TRHMG.xml b/ModPatches/Frontline - Bunkers/Patches/Frontline - Bunkers/FrontlineBunkers_I_TRHMG.xml
new file mode 100644
index 0000000000..6d3e065623
--- /dev/null
+++ b/ModPatches/Frontline - Bunkers/Patches/Frontline - Bunkers/FrontlineBunkers_I_TRHMG.xml	
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BK_Base_HMG"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="BK_Base_HMG"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="BK_Base_HMG"]/tradeTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="BK_Base_HMG"]</xpath>
+			<value>
+				<tradeTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BK_Base_HMG"]/tradeTags</xpath>
+		<value>
+			<li>CE_Turret</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BK_Gun_HMG</defName>
+		<statBases>
+			<MarketValue>800</MarketValue>
+			<RangedWeapon_Cooldown>4</RangedWeapon_Cooldown>
+			<Mass>12</Mass>
+			<Bulk>10.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.6</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>3</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<burstShotCount>24</burstShotCount>
+			<soundCast>BK_HMG_Fire</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>20</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Frontline - Trenches/Defs/Frontline - Trenches/FrontlineTrenches_AmmoPatch.xml b/ModPatches/Frontline - Trenches/Defs/Frontline - Trenches/FrontlineTrenches_AmmoPatch.xml
new file mode 100644
index 0000000000..feeaffb02f
--- /dev/null
+++ b/ModPatches/Frontline - Trenches/Defs/Frontline - Trenches/FrontlineTrenches_AmmoPatch.xml	
@@ -0,0 +1,441 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoTRMortarGrenades</defName>
+		<label>TR Mortar Grenade</label>
+		<parent>AmmoShells</parent>
+		<iconPath>Things/Building/Mounted/Ammo/Ammo-Mortar</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet TRMortarGrenade ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_TRMortarGrenade</defName>
+		<label>TRMortar Grenades</label>
+		<ammoTypes>
+			<Ammo_TRMortarGrenade_HE>Bullet_TRMortarGrenade_HE</Ammo_TRMortarGrenade_HE>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="TRMortarGrenadesBase" ParentName="MediumAmmoBase" Abstract="True">
+		<description>Grenades for your Mortar.</description>
+		<thingCategories>
+			<li>AmmoTRMortarGrenades</li>
+		</thingCategories>
+		<stackLimit>25</stackLimit>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<statBases>
+			<MaxHitPoints>100</MaxHitPoints>
+			<Mass>0.4</Mass>
+			<Bulk>0.5</Bulk>
+		</statBases>
+		<cookOffFlashScale>20</cookOffFlashScale>
+		<cookOffSound>MortarBomb_Explode</cookOffSound>
+		<destroyOnDrop>False</destroyOnDrop>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="TRMortarGrenadesBase">
+		<defName>Ammo_TRMortarGrenade_HE</defName>
+		<label>Mortar Round (HE)</label>
+		<graphicData>
+			<texPath>Things/Building/Mounted/Ammo/Ammo-Mortar</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>3.2</MarketValue>
+		</statBases>
+		<ammoClass>GrenadeHE</ammoClass>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>25</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>3</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>120</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="BaseTRMortarGrenade" ParentName="BaseExplosiveBullet" Abstract="true">
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<graphicData>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>29</speed>
+			<soundExplode>TR_ExplosionMortar</soundExplode>
+			<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+			<flyOverhead>true</flyOverhead>
+			<dropsCasings>false</dropsCasings>
+			<gravityFactor>5</gravityFactor>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseTRMortarGrenade">
+		<defName>Bullet_TRMortarGrenade_HE</defName>
+		<label>Mortar round (HE)</label>
+		<graphicData>
+			<texPath>Things/Building/Mounted/Bullets/Mortarbullet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>2.5</explosionRadius>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>80</damageAmountBase>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<soundExplode>TR_ExplosionMortar</soundExplode>
+			<soundAmbient>MortarRound_Ambient</soundAmbient>
+			<soundImpactAnticipate>TR_IncomingMortar</soundImpactAnticipate>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>80</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>2.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>120</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeAmmo_TRMortarGrenade_HE</defName>
+		<label>make TR-Mortar rounds x5</label>
+		<description>Craft 5 TR-Mortar rounds.</description>
+		<jobString>Making TR-Mortar rounds.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>50</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Chemfuel</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Chemfuel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_TRMortarGrenade_HE>5</Ammo_TRMortarGrenade_HE>
+		</products>
+	</RecipeDef>
+	<ThingCategoryDef>
+		<defName>AmmoTRHowitzerShells</defName>
+		<label>TRHowitzer Shell</label>
+		<parent>AmmoShells</parent>
+		<iconPath>Things/Building/Mounted/Ammo/Ammo-Howitzer</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet TRHowitzerShell ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_TRHowitzerShell</defName>
+		<label>TRHowitzer Shells</label>
+		<ammoTypes>
+			<Ammo_TRHowitzerShell_HE>Bullet_TRHowitzerShell_HE</Ammo_TRHowitzerShell_HE>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="TRHowitzerShellsBase" ParentName="HeavyAmmoBase" Abstract="True">
+		<description>Shells for your Howitzer.</description>
+		<thingCategories>
+			<li>AmmoTRHowitzerShells</li>
+		</thingCategories>
+		<stackLimit>10</stackLimit>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<statBases>
+			<MaxHitPoints>200</MaxHitPoints>
+			<Mass>4</Mass>
+			<Bulk>5</Bulk>
+		</statBases>
+		<cookOffFlashScale>30</cookOffFlashScale>
+		<cookOffSound>MortarBomb_Explode</cookOffSound>
+		<destroyOnDrop>False</destroyOnDrop>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="TRHowitzerShellsBase">
+		<defName>Ammo_TRHowitzerShell_HE</defName>
+		<label>Howitzer Shell (HE)</label>
+		<graphicData>
+			<texPath>Things/Building/Mounted/Ammo/Ammo-Howitzer</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>27.83</MarketValue>
+		</statBases>
+		<ammoClass>GrenadeHE</ammoClass>
+		<detonateProjectile>Bullet_TRHowitzerShell_HE</detonateProjectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>50</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>4</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>70</Fragment_Large>
+					<Fragment_Small>130</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="BaseTRHowitzerShell" ParentName="BaseBulletCE" Abstract="true">
+		<graphicData>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>180</speed>
+			<soundExplode>TR_ExplosionHowitzer</soundExplode>
+			<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+			<flyOverhead>true</flyOverhead>
+			<dropsCasings>true</dropsCasings>
+			<casingMoteDefname>Fleck_BigShell</casingMoteDefname>
+			<casingFilthDefname>Filth_CannonAmmoCasings</casingFilthDefname>
+			<gravityFactor>5</gravityFactor>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseTRHowitzerShell">
+		<defName>Bullet_TRHowitzerShell_HE</defName>
+		<label>Howitzer Shell (HE)</label>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<graphicData>
+			<texPath>Things/Building/Mounted/Bullets/Howitzerbullet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>150</damageAmountBase>
+			<explosionRadius>4</explosionRadius>
+			<soundExplode>TR_ExplosionHowitzer</soundExplode>
+			<soundAmbient>MortarRound_Ambient</soundAmbient>
+			<soundImpactAnticipate>TR_IncomingHowitzer</soundImpactAnticipate>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>100</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>4</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>70</Fragment_Large>
+					<Fragment_Small>120</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeAmmo_TRHowitzerShell_HE</defName>
+		<label>make TR-Howitzer shells x5</label>
+		<description>Craft 5 TR-Howitzer shells.</description>
+		<jobString>Making TR-Howitzer shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>75</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Chemfuel</li>
+					</thingDefs>
+				</filter>
+				<count>50</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Chemfuel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_TRHowitzerShell_HE>5</Ammo_TRHowitzerShell_HE>
+		</products>
+	</RecipeDef>
+
+	<ThingCategoryDef>
+		<defName>AmmoTRPAKShells</defName>
+		<label>TRPAK Shell</label>
+		<parent>AmmoShells</parent>
+		<iconPath>Things/Building/Mounted/Ammo/Ammo-PAK</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet TRPAKShell ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_TRPAKShell</defName>
+		<label>TRPAK Shells</label>
+		<ammoTypes>
+			<Ammo_TRPAKShell_HEAT>Bullet_TRPAKShell_HEAT</Ammo_TRPAKShell_HEAT>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="TRPAKShellsBase" ParentName="HeavyAmmoBase" Abstract="True">
+		<description>Shell for your PAK.</description>
+		<thingCategories>
+			<li>AmmoTRPAKShells</li>
+		</thingCategories>
+		<stackLimit>25</stackLimit>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<statBases>
+			<MaxHitPoints>200</MaxHitPoints>
+			<Mass>5</Mass>
+			<Bulk>6</Bulk>
+		</statBases>
+		<cookOffFlashScale>30</cookOffFlashScale>
+		<cookOffSound>MortarBomb_Explode</cookOffSound>
+		<destroyOnDrop>False</destroyOnDrop>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="TRPAKShellsBase">
+		<defName>Ammo_TRPAKShell_HEAT</defName>
+		<label>PAK Shell (HEAT)</label>
+		<graphicData>
+			<texPath>Things/Building/Mounted/Ammo/Ammo-PAK</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>48.7</MarketValue>
+			<Mass>8.8</Mass>
+		</statBases>
+		<ammoClass>RocketHEAT</ammoClass>
+		<detonateProjectile>Bullet_TRPAKShell_HEAT</detonateProjectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>50</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>2</explosiveRadius>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>30</Fragment_Large>
+					<Fragment_Small>70</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="BasePAKShell" ParentName="BaseBulletCE" Abstract="true">
+		<graphicData>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>290</speed>
+			<soundExplode>TR_ExplosionHowitzer</soundExplode>
+			<flyOverhead>false</flyOverhead>
+			<dropsCasings>true</dropsCasings>
+			<casingMoteDefname>Fleck_BigShell</casingMoteDefname>
+			<casingFilthDefname>Filth_CannonAmmoCasings</casingFilthDefname>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BasePAKShell">
+		<defName>Bullet_TRPAKShell_HEAT</defName>
+		<label>PAK Shell (HEAT)</label>
+		<graphicData>
+			<texPath>Things/Building/Mounted/Bullets/Howitzerbullet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>200</damageAmountBase>
+			<soundExplode>TR_ExplosionHowitzer</soundExplode>
+			<armorPenetrationBase>7.0</armorPenetrationBase>
+			<armorPenetrationSharp>300</armorPenetrationSharp>
+			<armorPenetrationBlunt>18.005</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>70</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>2</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>22</Fragment_Large>
+					<Fragment_Small>36</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeAmmo_TRPAKShell_HEAT</defName>
+		<label>make TR-PAK shells x5</label>
+		<description>Craft 5 TR-PAK shells.</description>
+		<jobString>Making TR-PAK shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>150</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Chemfuel</li>
+					</thingDefs>
+				</filter>
+				<count>50</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Chemfuel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_TRPAKShell_HEAT>5</Ammo_TRPAKShell_HEAT>
+		</products>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Frontline - Trenches/Patches/Frontline - Trenches/FrontlineTrenches_G_TRLMG.xml b/ModPatches/Frontline - Trenches/Patches/Frontline - Trenches/FrontlineTrenches_G_TRLMG.xml
new file mode 100644
index 0000000000..7cb241287b
--- /dev/null
+++ b/ModPatches/Frontline - Trenches/Patches/Frontline - Trenches/FrontlineTrenches_G_TRLMG.xml	
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TR_Base_LMG" or defName="TR_Base_LMGSB"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="TR_Base_LMG" or defName="TR_Base_LMGSB"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="TR_Base_LMG" or defName="TR_Base_LMGSB"]/tradeTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="TR_Base_LMG" or defName="TR_Base_LMGSB"]</xpath>
+			<value>
+				<tradeTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TR_Base_LMG" or defName="TR_Base_LMGSB"]/tradeTags</xpath>
+		<value>
+			<li>CE_Turret</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>TR_Gun_LMG</defName>
+		<statBases>
+			<MarketValue>800</MarketValue>
+			<RangedWeapon_Cooldown>4</RangedWeapon_Cooldown>
+			<Mass>20</Mass>
+			<Bulk>10.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.7</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>3</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
+			<burstShotCount>12</burstShotCount>
+			<soundCast>TR_LMG_Fire</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>20</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Frontline - Trenches/Patches/Frontline - Trenches/FrontlineTrenches_H_TRMMG.xml b/ModPatches/Frontline - Trenches/Patches/Frontline - Trenches/FrontlineTrenches_H_TRMMG.xml
new file mode 100644
index 0000000000..be4575bcc3
--- /dev/null
+++ b/ModPatches/Frontline - Trenches/Patches/Frontline - Trenches/FrontlineTrenches_H_TRMMG.xml	
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TR_Base_MMG" or defName="TR_Base_MMGSB"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="TR_Base_MMG" or defName="TR_Base_MMGSB"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="TR_Base_MMG" or defName="TR_Base_MMGSB"]/tradeTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="TR_Base_MMG" or defName="TR_Base_MMGSB"]</xpath>
+			<value>
+				<tradeTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TR_Base_MMG" or defName="TR_Base_MMGSB"]/tradeTags</xpath>
+		<value>
+			<li>CE_Turret</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>TR_Gun_MMG</defName>
+		<statBases>
+			<MarketValue>800</MarketValue>
+			<RangedWeapon_Cooldown>4</RangedWeapon_Cooldown>
+			<Mass>14</Mass>
+			<Bulk>10.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.3</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>3</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>12</burstShotCount>
+			<soundCast>TR_MMG_Fire</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>20</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Frontline - Trenches/Patches/Frontline - Trenches/FrontlineTrenches_I_TRHMG.xml b/ModPatches/Frontline - Trenches/Patches/Frontline - Trenches/FrontlineTrenches_I_TRHMG.xml
new file mode 100644
index 0000000000..e50f246629
--- /dev/null
+++ b/ModPatches/Frontline - Trenches/Patches/Frontline - Trenches/FrontlineTrenches_I_TRHMG.xml	
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TR_Base_HMG" or defName="TR_Base_HMGSB"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="TR_Base_HMG" or defName="TR_Base_HMGSB"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="TR_Base_HMG" or defName="TR_Base_HMGSB"]/tradeTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="TR_Base_HMG" or defName="TR_Base_HMGSB"]</xpath>
+			<value>
+				<tradeTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TR_Base_HMG" or defName="TR_Base_HMGSB"]/tradeTags</xpath>
+		<value>
+			<li>CE_Turret</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>TR_Gun_HMG</defName>
+		<statBases>
+			<MarketValue>800</MarketValue>
+			<RangedWeapon_Cooldown>4</RangedWeapon_Cooldown>
+			<Mass>12</Mass>
+			<Bulk>10.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.6</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>3</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<burstShotCount>24</burstShotCount>
+			<soundCast>TR_HMG_Fire</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>20</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Frontline - Trenches/Patches/Frontline - Trenches/FrontlineTrenches_J_TRHowitzer.xml b/ModPatches/Frontline - Trenches/Patches/Frontline - Trenches/FrontlineTrenches_J_TRHowitzer.xml
new file mode 100644
index 0000000000..498d811944
--- /dev/null
+++ b/ModPatches/Frontline - Trenches/Patches/Frontline - Trenches/FrontlineTrenches_J_TRHowitzer.xml	
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TR_Base_Howitzer"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="TR_Base_Howitzer"]/tradeTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="TR_Base_Howitzer"]</xpath>
+			<value>
+				<tradeTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TR_Base_Howitzer"]/tradeTags</xpath>
+		<value>
+			<li>CE_Turret</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>TR_Gun_Howitzer</defName>
+		<statBases>
+			<DeteriorationRate>0</DeteriorationRate>
+			<Flammability>0</Flammability>
+			<MarketValue>2500</MarketValue>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>0.9</SwayFactor>
+			<RangedWeapon_Cooldown>15</RangedWeapon_Cooldown>
+			<MaxHitPoints>800</MaxHitPoints>
+			<Bulk>30.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.78</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_TRHowitzerShell_HE</defaultProjectile>
+			<warmupTime>5</warmupTime>
+			<range>2000</range>
+			<minRange>25</minRange>
+			<ticksBetweenBurstShots>25</ticksBetweenBurstShots>
+			<burstShotCount>1</burstShotCount>
+			<soundCast>TR_Howitzer_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>16</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_TRHowitzerShell</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "TR_Gun_Howitzer"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>30</li>
+					<li>50</li>
+					<li>70</li>
+					<li>90</li>
+				</chargeSpeeds>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Frontline - Trenches/Patches/Frontline - Trenches/FrontlineTrenches_K_TRMortar.xml b/ModPatches/Frontline - Trenches/Patches/Frontline - Trenches/FrontlineTrenches_K_TRMortar.xml
new file mode 100644
index 0000000000..febf275576
--- /dev/null
+++ b/ModPatches/Frontline - Trenches/Patches/Frontline - Trenches/FrontlineTrenches_K_TRMortar.xml	
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TR_Base_Mortar"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="TR_Base_Mortar"]/tradeTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="TR_Base_Mortar"]</xpath>
+			<value>
+				<tradeTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TR_Base_Mortar"]/tradeTags</xpath>
+		<value>
+			<li>CE_Turret</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>TR_Gun_Mortar</defName>
+		<statBases>
+			<DeteriorationRate>0</DeteriorationRate>
+			<Flammability>0</Flammability>
+			<MarketValue>2500</MarketValue>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>0.4</SwayFactor>
+			<RangedWeapon_Cooldown>2.0</RangedWeapon_Cooldown>
+			<MaxHitPoints>400</MaxHitPoints>
+			<Bulk>20.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_TRMortarGrenade_HE</defaultProjectile>
+			<warmupTime>2</warmupTime>
+			<range>65</range>
+			<minRange>3</minRange>
+			<ticksBetweenBurstShots>25</ticksBetweenBurstShots>
+			<burstShotCount>1</burstShotCount>
+			<soundCast>TR_Mortar_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>16</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>0.5</reloadTime>
+			<ammoSet>AmmoSet_TRMortarGrenade</ammoSet>
+		</AmmoUser>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Frontline - Trenches/Patches/Frontline - Trenches/FrontlineTrenches_L_TRPak5cm.xml b/ModPatches/Frontline - Trenches/Patches/Frontline - Trenches/FrontlineTrenches_L_TRPak5cm.xml
new file mode 100644
index 0000000000..4992e8cfa4
--- /dev/null
+++ b/ModPatches/Frontline - Trenches/Patches/Frontline - Trenches/FrontlineTrenches_L_TRPak5cm.xml	
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TR_Base_Pak"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="TR_Base_Pak"]/tradeTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="TR_Base_Pak"]</xpath>
+			<value>
+				<tradeTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TR_Base_Pak"]/tradeTags</xpath>
+		<value>
+			<li>CE_Turret</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TR_Base_Pak"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>TR_Gun_Pak</defName>
+		<statBases>
+			<DeteriorationRate>0</DeteriorationRate>
+			<Flammability>0</Flammability>
+			<MarketValue>2500</MarketValue>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>0.2</SwayFactor>
+			<RangedWeapon_Cooldown>10</RangedWeapon_Cooldown>
+			<MaxHitPoints>600</MaxHitPoints>
+			<Bulk>15.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_TRPAKShell_HEAT</defaultProjectile>
+			<warmupTime>2</warmupTime>
+			<range>2000</range>
+			<minRange>3</minRange>
+			<ticksBetweenBurstShots>25</ticksBetweenBurstShots>
+			<burstShotCount>1</burstShotCount>
+			<soundCast>TR_Pak_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>16</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_TRPAKShell</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Frontline - Trenches/Patches/Frontline - Trenches/FrontlineTrenches_TRWizz_Patch.xml b/ModPatches/Frontline - Trenches/Patches/Frontline - Trenches/FrontlineTrenches_TRWizz_Patch.xml
new file mode 100644
index 0000000000..5538a22d48
--- /dev/null
+++ b/ModPatches/Frontline - Trenches/Patches/Frontline - Trenches/FrontlineTrenches_TRWizz_Patch.xml	
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationRemove">
+		<success>Always</success>
+		<xpath>Defs/ThingDef[defName="Bullet_762x51mmNATO_FMJ" or defName="Bullet_762x51mmNATO_AP" or defName="Bullet_762x51mmNATO_HP" or defName="Bullet_303British_FMJ" or defName="Bullet_303British_AP" or defName="Bullet_303British_HP" or defName="Bullet_762x54mmR_FMJ" or defName="Bullet_762x54mmR_AP" or defName="Bullet_762x54mmR_HP" or defName="Bullet_4570Gov_FMJ" or defName="Bullet_4570Gov_AP" or defName="Bullet_4570Gov_HP"]/projectile/soundImpactAnticipate</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Bullet_762x51mmNATO_FMJ" or defName="Bullet_762x51mmNATO_AP" or defName="Bullet_762x51mmNATO_HP" or defName="Bullet_303British_FMJ" or defName="Bullet_303British_AP" or defName="Bullet_303British_HP" or defName="Bullet_762x54mmR_FMJ" or defName="Bullet_762x54mmR_AP" or defName="Bullet_762x54mmR_HP" or defName="Bullet_4570Gov_FMJ" or defName="Bullet_4570Gov_AP" or defName="Bullet_4570Gov_HP"]/projectile</xpath>
+		<value>
+			<soundImpactAnticipate>TR_Wizz</soundImpactAnticipate>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Fuck it Unboomas your Lope/Patches/Fuck it Unboomas your Lope/Noboom.xml b/ModPatches/Fuck it Unboomas your Lope/Patches/Fuck it Unboomas your Lope/Noboom.xml
new file mode 100644
index 0000000000..704e469511
--- /dev/null
+++ b/ModPatches/Fuck it Unboomas your Lope/Patches/Fuck it Unboomas your Lope/Noboom.xml	
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Boomalope"]/butcherProducts</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Boomalope"]/comps/li[@Class ="CombatExtended.CompProperties_ShearableRenameable"]</xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Gas Traps and Shells/Defs/Gas Traps and Shells/Ammo_60mm.xml b/ModPatches/Gas Traps and Shells/Defs/Gas Traps and Shells/Ammo_60mm.xml
new file mode 100644
index 0000000000..64738af8ac
--- /dev/null
+++ b/ModPatches/Gas Traps and Shells/Defs/Gas Traps and Shells/Ammo_60mm.xml	
@@ -0,0 +1,610 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- Ammo -->
+
+    <ThingDef Class="CombatExtended.AmmoDef" ParentName="60mmMortarShellBase">
+        <defName>Shell_60mmMortar_ToxicGas</defName>
+        <label>60mm mortar shell (Toxic)</label>
+        <graphicData>
+            <texPath>ThirdParty/GasTraps/Mortar</texPath>
+            <graphicClass>Graphic_StackCount</graphicClass>
+            <color>(70,183,79)</color>
+            <shaderType>CutoutComplex</shaderType>
+        </graphicData>
+        <statBases>
+            <MarketValue>22.20</MarketValue>
+            <Mass>4.1</Mass>
+            <Bulk>10.01</Bulk>
+        </statBases>
+        <ammoClass>Toxic</ammoClass>
+        <detonateProjectile>Bullet_60mmMortarShell_60mmMortar_ToxicGas</detonateProjectile>
+        <comps>
+            <!-- Vanilla values -->
+            <li Class="CompProperties_Explosive">
+                <explosiveRadius>4.5</explosiveRadius>
+                <explosiveDamageType>Bomb</explosiveDamageType>
+                <startWickHitPointsPercent>0.7</startWickHitPointsPercent>
+                <postExplosionSpawnThingDef>ToxicGas</postExplosionSpawnThingDef>
+                <preExplosionSpawnChance>1</preExplosionSpawnChance>
+                <explodeOnKilled>True</explodeOnKilled>
+                <wickTicks>30~60</wickTicks>
+            </li>
+        </comps>
+    </ThingDef>
+
+    <ThingDef Class="CombatExtended.AmmoDef" ParentName="60mmMortarShellBase">
+        <defName>Shell_60mmMortar_RageGas</defName>
+        <label>60mm mortar shell (Rage)</label>
+        <graphicData>
+            <texPath>ThirdParty/GasTraps/Mortar</texPath>
+            <graphicClass>Graphic_StackCount</graphicClass>
+            <shaderType>CutoutComplex</shaderType>
+            <color>(200,112,112)</color>
+        </graphicData>
+        <statBases>
+            <MarketValue>22.20</MarketValue>
+            <Mass>4.1</Mass>
+            <Bulk>10.01</Bulk>
+        </statBases>
+        <ammoClass>Rage</ammoClass>
+        <detonateProjectile>Bullet_60mmMortarShell_60mmMortar_RageGas</detonateProjectile>
+        <comps>
+            <!-- Vanilla values -->
+            <li Class="CompProperties_Explosive">
+                <explosiveRadius>4.5</explosiveRadius>
+                <explosiveDamageType>Bomb</explosiveDamageType>
+                <startWickHitPointsPercent>0.7</startWickHitPointsPercent>
+                <postExplosionSpawnThingDef>RageGas</postExplosionSpawnThingDef>
+                <preExplosionSpawnChance>1</preExplosionSpawnChance>
+                <explodeOnKilled>True</explodeOnKilled>
+                <wickTicks>30~60</wickTicks>
+            </li>
+        </comps>
+    </ThingDef>
+
+    <ThingDef Class="CombatExtended.AmmoDef" ParentName="60mmMortarShellBase">
+        <defName>Shell_60mmMortar_TearGas</defName>
+        <label>60mm mortar shell (Tear)</label>
+        <graphicData>
+            <texPath>ThirdParty/GasTraps/Mortar</texPath>
+            <graphicClass>Graphic_StackCount</graphicClass>
+            <color>(181,151,185)</color>
+            <shaderType>CutoutComplex</shaderType>
+        </graphicData>
+        <statBases>
+            <MarketValue>22.20</MarketValue>
+            <Mass>4.1</Mass>
+            <Bulk>10.01</Bulk>
+        </statBases>
+        <ammoClass>TearGas</ammoClass>
+        <detonateProjectile>Bullet_60mmMortarShell_60mmMortar_TearGas</detonateProjectile>
+        <comps>
+            <!-- Vanilla values -->
+            <li Class="CompProperties_Explosive">
+                <explosiveRadius>4.5</explosiveRadius>
+                <explosiveDamageType>Bomb</explosiveDamageType>
+                <startWickHitPointsPercent>0.7</startWickHitPointsPercent>
+                <postExplosionSpawnThingDef>TearGas</postExplosionSpawnThingDef>
+                <preExplosionSpawnChance>1</preExplosionSpawnChance>
+                <explodeOnKilled>True</explodeOnKilled>
+                <wickTicks>30~60</wickTicks>
+            </li>
+        </comps>
+    </ThingDef>
+
+    <ThingDef Class="CombatExtended.AmmoDef" ParentName="60mmMortarShellBase">
+        <defName>Shell_60mmMortar_SleepGas</defName>
+        <label>60mm mortar shell (Sleep)</label>
+        <graphicData>
+            <texPath>ThirdParty/GasTraps/Mortar</texPath>
+            <graphicClass>Graphic_StackCount</graphicClass>
+            <color>(113,154,208)</color>
+            <shaderType>CutoutComplex</shaderType>
+        </graphicData>
+        <statBases>
+            <MarketValue>22.20</MarketValue>
+            <Mass>4.1</Mass>
+            <Bulk>10.01</Bulk>
+        </statBases>
+        <ammoClass>Sleep</ammoClass>
+        <detonateProjectile>Bullet_60mmMortarShell_60mmMortar_SleepGas</detonateProjectile>
+        <comps>
+            <!-- Vanilla values -->
+            <li Class="CompProperties_Explosive">
+                <explosiveRadius>4.5</explosiveRadius>
+                <explosiveDamageType>Bomb</explosiveDamageType>
+                <startWickHitPointsPercent>0.7</startWickHitPointsPercent>
+                <postExplosionSpawnThingDef>SleepGas</postExplosionSpawnThingDef>
+                <preExplosionSpawnChance>1</preExplosionSpawnChance>
+                <explodeOnKilled>True</explodeOnKilled>
+                <wickTicks>30~60</wickTicks>
+            </li>
+        </comps>
+    </ThingDef>
+
+    <ThingDef Class="CombatExtended.AmmoDef" ParentName="60mmMortarShellBase">
+        <defName>Shell_60mmMortar_FearGas</defName>
+        <label>60mm mortar shell (Fear)</label>
+        <graphicData>
+            <texPath>ThirdParty/GasTraps/Mortar</texPath>
+            <graphicClass>Graphic_StackCount</graphicClass>
+            <color>(185,142,132)</color>
+            <shaderType>CutoutComplex</shaderType>
+        </graphicData>
+        <statBases>
+            <MarketValue>22.20</MarketValue>
+            <Mass>4.1</Mass>
+            <Bulk>10.01</Bulk>
+        </statBases>
+        <ammoClass>Fear</ammoClass>
+        <detonateProjectile>Bullet_60mmMortarShell_60mmMortar_FearGas</detonateProjectile>
+        <comps>
+            <!-- Vanilla values -->
+            <li Class="CompProperties_Explosive">
+                <explosiveRadius>4.5</explosiveRadius>
+                <explosiveDamageType>Bomb</explosiveDamageType>
+                <startWickHitPointsPercent>0.7</startWickHitPointsPercent>
+                <postExplosionSpawnThingDef>FearGas</postExplosionSpawnThingDef>
+                <preExplosionSpawnChance>1</preExplosionSpawnChance>
+                <explodeOnKilled>True</explodeOnKilled>
+                <wickTicks>30~60</wickTicks>
+            </li>
+        </comps>
+    </ThingDef>
+
+    <ThingDef Class="CombatExtended.AmmoDef" ParentName="60mmMortarShellBase">
+        <defName>Shell_60mmMortar_AcidGas</defName>
+        <label>60mm mortar shell (Acid)</label>
+        <graphicData>
+            <texPath>ThirdParty/GasTraps/Mortar</texPath>
+            <graphicClass>Graphic_StackCount</graphicClass>
+            <color>(179,178,119)</color>
+            <shaderType>CutoutComplex</shaderType>
+        </graphicData>
+        <statBases>
+            <MarketValue>22.20</MarketValue>
+            <Mass>4.1</Mass>
+            <Bulk>10.01</Bulk>
+        </statBases>
+        <ammoClass>Acid</ammoClass>
+        <detonateProjectile>Bullet_60mmMortarShell_60mmMortar_AcidGas</detonateProjectile>
+        <comps>
+            <!-- Vanilla values -->
+            <li Class="CompProperties_Explosive">
+                <explosiveRadius>4.5</explosiveRadius>
+                <explosiveDamageType>Bomb</explosiveDamageType>
+                <startWickHitPointsPercent>0.7</startWickHitPointsPercent>
+                <postExplosionSpawnThingDef>AcidGas</postExplosionSpawnThingDef>
+                <preExplosionSpawnChance>1</preExplosionSpawnChance>
+                <explodeOnKilled>True</explodeOnKilled>
+                <wickTicks>30~60</wickTicks>
+            </li>
+        </comps>
+    </ThingDef>
+
+	<!-- Projectile -->
+
+    <ThingDef ParentName="Base60mmMortarShell">
+        <defName>Bullet_60mmMortarShell_60mmMortar_ToxicGas</defName>
+        <label>60mm mortar shell (Toxic)</label>
+        <graphicData>
+            <texPath>ThirdParty/GasTraps/gas_mortar_projectile</texPath>
+            <graphicClass>Graphic_Single</graphicClass>
+            <color>(70,183,79)</color>
+            <shaderType>CutoutComplex</shaderType>
+        </graphicData>
+        <projectile Class="CombatExtended.ProjectilePropertiesCE">
+            <damageDef>Bomb</damageDef>
+            <damageAmountBase>5</damageAmountBase>
+            <armorPenetrationSharp>0</armorPenetrationSharp>
+            <armorPenetrationBlunt>0</armorPenetrationBlunt>
+            <explosionRadius>4.5</explosionRadius>
+            <flyOverhead>true</flyOverhead>
+            <soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+            <soundExplode>Explosion_EMP</soundExplode>
+            <soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+            <soundAmbient>MortarRound_Ambient</soundAmbient>
+            <postExplosionSpawnThingDef>ToxicGas</postExplosionSpawnThingDef>
+            <preExplosionSpawnChance>1</preExplosionSpawnChance>
+            <applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+            <explosionEffect>ExtinguisherExplosion</explosionEffect>
+        </projectile>
+    </ThingDef>
+
+    <ThingDef ParentName="Base60mmMortarShell">
+        <defName>Bullet_60mmMortarShell_60mmMortar_RageGas</defName>
+        <label>60mm mortar shell (Rage)</label>
+        <graphicData>
+            <texPath>ThirdParty/GasTraps/gas_mortar_projectile</texPath>
+            <graphicClass>Graphic_Single</graphicClass>
+            <color>(200,112,112)</color>
+            <shaderType>CutoutComplex</shaderType>
+        </graphicData>
+        <projectile Class="CombatExtended.ProjectilePropertiesCE">
+            <damageDef>Bomb</damageDef>
+            <damageAmountBase>5</damageAmountBase>
+            <armorPenetrationSharp>0</armorPenetrationSharp>
+            <armorPenetrationBlunt>0</armorPenetrationBlunt>
+            <explosionRadius>4.5</explosionRadius>
+            <flyOverhead>true</flyOverhead>
+            <soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+            <soundExplode>Explosion_EMP</soundExplode>
+            <soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+            <soundAmbient>MortarRound_Ambient</soundAmbient>
+            <postExplosionSpawnThingDef>RageGas</postExplosionSpawnThingDef>
+            <preExplosionSpawnChance>1</preExplosionSpawnChance>
+            <applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+            <explosionEffect>ExtinguisherExplosion</explosionEffect>
+        </projectile>
+    </ThingDef>
+
+    <ThingDef ParentName="Base60mmMortarShell">
+        <defName>Bullet_60mmMortarShell_60mmMortar_TearGas</defName>
+        <label>60mm mortar shell (Tear)</label>
+        <graphicData>
+            <texPath>ThirdParty/GasTraps/gas_mortar_projectile</texPath>
+            <graphicClass>Graphic_Single</graphicClass>
+            <color>(181,151,185)</color>
+            <shaderType>CutoutComplex</shaderType>
+        </graphicData>
+        <projectile Class="CombatExtended.ProjectilePropertiesCE">
+            <damageDef>Bomb</damageDef>
+            <damageAmountBase>5</damageAmountBase>
+            <armorPenetrationSharp>0</armorPenetrationSharp>
+            <armorPenetrationBlunt>0</armorPenetrationBlunt>
+            <explosionRadius>4.5</explosionRadius>
+            <flyOverhead>true</flyOverhead>
+            <soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+            <soundExplode>Explosion_EMP</soundExplode>
+            <soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+            <soundAmbient>MortarRound_Ambient</soundAmbient>
+            <postExplosionSpawnThingDef>TearGas</postExplosionSpawnThingDef>
+            <preExplosionSpawnChance>1</preExplosionSpawnChance>
+            <applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+            <explosionEffect>ExtinguisherExplosion</explosionEffect>
+        </projectile>
+    </ThingDef>
+
+    <ThingDef ParentName="Base60mmMortarShell">
+        <defName>Bullet_60mmMortarShell_60mmMortar_SleepGas</defName>
+        <label>60mm mortar shell (Sleep)</label>
+        <graphicData>
+            <texPath>ThirdParty/GasTraps/gas_mortar_projectile</texPath>
+            <graphicClass>Graphic_Single</graphicClass>
+            <color>(113,154,208)</color>
+            <shaderType>CutoutComplex</shaderType>
+        </graphicData>
+        <projectile Class="CombatExtended.ProjectilePropertiesCE">
+            <damageDef>Bomb</damageDef>
+            <damageAmountBase>5</damageAmountBase>
+            <armorPenetrationSharp>0</armorPenetrationSharp>
+            <armorPenetrationBlunt>0</armorPenetrationBlunt>
+            <explosionRadius>4.5</explosionRadius>
+            <flyOverhead>true</flyOverhead>
+            <soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+            <soundExplode>Explosion_EMP</soundExplode>
+            <soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+            <soundAmbient>MortarRound_Ambient</soundAmbient>
+            <postExplosionSpawnThingDef>SleepGas</postExplosionSpawnThingDef>
+            <preExplosionSpawnChance>1</preExplosionSpawnChance>
+            <applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+            <explosionEffect>ExtinguisherExplosion</explosionEffect>
+        </projectile>
+    </ThingDef>
+
+    <ThingDef ParentName="Base60mmMortarShell">
+        <defName>Bullet_60mmMortarShell_60mmMortar_FearGas</defName>
+        <label>60mm mortar shell (Fear)</label>
+        <graphicData>
+            <texPath>ThirdParty/GasTraps/gas_mortar_projectile</texPath>
+            <graphicClass>Graphic_Single</graphicClass>
+            <color>(185,142,132)</color>
+            <shaderType>CutoutComplex</shaderType>
+        </graphicData>
+        <projectile Class="CombatExtended.ProjectilePropertiesCE">
+            <damageDef>Bomb</damageDef>
+            <damageAmountBase>5</damageAmountBase>
+            <armorPenetrationSharp>0</armorPenetrationSharp>
+            <armorPenetrationBlunt>0</armorPenetrationBlunt>
+            <explosionRadius>4.5</explosionRadius>
+            <flyOverhead>true</flyOverhead>
+            <soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+            <soundExplode>Explosion_EMP</soundExplode>
+            <soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+            <soundAmbient>MortarRound_Ambient</soundAmbient>
+            <postExplosionSpawnThingDef>FearGas</postExplosionSpawnThingDef>
+            <preExplosionSpawnChance>1</preExplosionSpawnChance>
+            <applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+            <explosionEffect>ExtinguisherExplosion</explosionEffect>
+        </projectile>
+    </ThingDef>
+
+    <ThingDef ParentName="Base60mmMortarShell">
+        <defName>Bullet_60mmMortarShell_60mmMortar_AcidGas</defName>
+        <label>60mm mortar shell (Acid)</label>
+        <graphicData>
+            <texPath>ThirdParty/GasTraps/gas_mortar_projectile</texPath>
+            <graphicClass>Graphic_Single</graphicClass>
+            <color>(179,178,119)</color>
+            <shaderType>CutoutComplex</shaderType>
+        </graphicData>
+        <projectile Class="CombatExtended.ProjectilePropertiesCE">
+            <damageDef>Bomb</damageDef>
+            <damageAmountBase>5</damageAmountBase>
+            <armorPenetrationSharp>0</armorPenetrationSharp>
+            <armorPenetrationBlunt>0</armorPenetrationBlunt>
+            <explosionRadius>4.5</explosionRadius>
+            <flyOverhead>true</flyOverhead>
+            <soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+            <soundExplode>Explosion_EMP</soundExplode>
+            <soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+            <soundAmbient>MortarRound_Ambient</soundAmbient>
+            <postExplosionSpawnThingDef>AcidGas</postExplosionSpawnThingDef>
+            <preExplosionSpawnChance>1</preExplosionSpawnChance>
+            <applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+            <explosionEffect>ExtinguisherExplosion</explosionEffect>
+        </projectile>
+    </ThingDef>
+
+	<!-- Recipes -->
+
+    <RecipeDef ParentName="AmmoRecipeBase">
+        <defName>MakeShell_60mmMortar_ToxicGas</defName>
+        <label>make 60mm toxic gas mortar shells x5</label>
+        <description>Craft 5 60mm toxic gas mortar shells.</description>
+        <jobString>Making 60mm toxic gas mortar shells.</jobString>
+        <ingredients>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>Steel</li>
+                    </thingDefs>
+                </filter>
+                <count>20</count>
+            </li>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>ComponentIndustrial</li>
+                    </thingDefs>
+                </filter>
+                <count>1</count>
+            </li>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>Canister_ToxicGas</li>
+                    </thingDefs>
+                </filter>
+                <count>1</count>
+            </li>
+        </ingredients>
+        <fixedIngredientFilter>
+            <thingDefs>
+                <li>Steel</li>
+                <li>ComponentIndustrial</li>
+                <li>Canister_ToxicGas</li>
+            </thingDefs>
+        </fixedIngredientFilter>
+        <products>
+            <Shell_60mmMortar_ToxicGas>5</Shell_60mmMortar_ToxicGas>
+        </products>
+    </RecipeDef>
+
+    <RecipeDef ParentName="AmmoRecipeBase">
+        <defName>MakeShell_60mmMortar_RageGas</defName>
+        <label>make 60mm rage gas mortar shells x5</label>
+        <description>Craft 5 60mm rage gas mortar shells.</description>
+        <jobString>Making 60mm rage gas mortar shells.</jobString>
+        <ingredients>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>Steel</li>
+                    </thingDefs>
+                </filter>
+                <count>20</count>
+            </li>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>ComponentIndustrial</li>
+                    </thingDefs>
+                </filter>
+                <count>1</count>
+            </li>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>Canister_RageGas</li>
+                    </thingDefs>
+                </filter>
+                <count>1</count>
+            </li>
+        </ingredients>
+        <fixedIngredientFilter>
+            <thingDefs>
+                <li>Steel</li>
+                <li>ComponentIndustrial</li>
+                <li>Canister_RageGas</li>
+            </thingDefs>
+        </fixedIngredientFilter>
+        <products>
+            <Shell_60mmMortar_RageGas>5</Shell_60mmMortar_RageGas>
+        </products>
+    </RecipeDef>
+
+    <RecipeDef ParentName="AmmoRecipeBase">
+        <defName>MakeShell_60mmMortar_TearGas</defName>
+        <label>make 60mm tear gas mortar shells x5</label>
+        <description>Craft 5 60mm tear gas mortar shells.</description>
+        <jobString>Making 60mm tear gas mortar shells.</jobString>
+        <ingredients>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>Steel</li>
+                    </thingDefs>
+                </filter>
+                <count>20</count>
+            </li>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>ComponentIndustrial</li>
+                    </thingDefs>
+                </filter>
+                <count>1</count>
+            </li>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>Canister_TearGas</li>
+                    </thingDefs>
+                </filter>
+                <count>1</count>
+            </li>
+        </ingredients>
+        <fixedIngredientFilter>
+            <thingDefs>
+                <li>Steel</li>
+                <li>ComponentIndustrial</li>
+                <li>Canister_TearGas</li>
+            </thingDefs>
+        </fixedIngredientFilter>
+        <products>
+            <Shell_60mmMortar_TearGas>5</Shell_60mmMortar_TearGas>
+        </products>
+    </RecipeDef>
+
+    <RecipeDef ParentName="AmmoRecipeBase">
+        <defName>MakeShell_60mmMortar_SleepGas</defName>
+        <label>make 60mm sleep gas mortar shells x5</label>
+        <description>Craft 5 60mm sleep gas mortar shells.</description>
+        <jobString>Making 60mm sleep gas mortar shells.</jobString>
+        <ingredients>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>Steel</li>
+                    </thingDefs>
+                </filter>
+                <count>20</count>
+            </li>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>ComponentIndustrial</li>
+                    </thingDefs>
+                </filter>
+                <count>1</count>
+            </li>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>Canister_SleepGas</li>
+                    </thingDefs>
+                </filter>
+                <count>1</count>
+            </li>
+        </ingredients>
+        <fixedIngredientFilter>
+            <thingDefs>
+                <li>Steel</li>
+                <li>ComponentIndustrial</li>
+                <li>Canister_SleepGas</li>
+            </thingDefs>
+        </fixedIngredientFilter>
+        <products>
+            <Shell_60mmMortar_SleepGas>5</Shell_60mmMortar_SleepGas>
+        </products>
+    </RecipeDef>
+
+    <RecipeDef ParentName="AmmoRecipeBase">
+        <defName>MakeShell_60mmMortar_FearGas</defName>
+        <label>make 60mm fear gas mortar shells x5</label>
+        <description>Craft 5 60mm fear gas mortar shells.</description>
+        <jobString>Making 60mm fear gas mortar shells.</jobString>
+        <ingredients>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>Steel</li>
+                    </thingDefs>
+                </filter>
+                <count>20</count>
+            </li>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>ComponentIndustrial</li>
+                    </thingDefs>
+                </filter>
+                <count>1</count>
+            </li>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>Canister_FearGas</li>
+                    </thingDefs>
+                </filter>
+                <count>1</count>
+            </li>
+        </ingredients>
+        <fixedIngredientFilter>
+            <thingDefs>
+                <li>Steel</li>
+                <li>ComponentIndustrial</li>
+                <li>Canister_FearGas</li>
+            </thingDefs>
+        </fixedIngredientFilter>
+        <products>
+            <Shell_60mmMortar_FearGas>5</Shell_60mmMortar_FearGas>
+        </products>
+    </RecipeDef>
+
+    <RecipeDef ParentName="AmmoRecipeBase">
+        <defName>MakeShell_60mmMortar_AcidGas</defName>
+        <label>make 60mm corrosive acid mortar shells x5</label>
+        <description>Craft 5 60mm corrosive acid mortar shells.</description>
+        <jobString>Making 60mm corrosive acid mortar shells.</jobString>
+        <ingredients>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>Steel</li>
+                    </thingDefs>
+                </filter>
+                <count>20</count>
+            </li>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>ComponentIndustrial</li>
+                    </thingDefs>
+                </filter>
+                <count>1</count>
+            </li>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>Canister_AcidGas</li>
+                    </thingDefs>
+                </filter>
+                <count>1</count>
+            </li>
+        </ingredients>
+        <fixedIngredientFilter>
+            <thingDefs>
+                <li>Steel</li>
+                <li>ComponentIndustrial</li>
+                <li>Canister_AcidGas</li>
+            </thingDefs>
+        </fixedIngredientFilter>
+        <products>
+            <Shell_60mmMortar_AcidGas>5</Shell_60mmMortar_AcidGas>
+        </products>
+    </RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Gas Traps and Shells/Defs/Gas Traps and Shells/Patch_AmmoCategories_Grenades.xml b/ModPatches/Gas Traps and Shells/Defs/Gas Traps and Shells/Patch_AmmoCategories_Grenades.xml
new file mode 100644
index 0000000000..6f0cda0ff6
--- /dev/null
+++ b/ModPatches/Gas Traps and Shells/Defs/Gas Traps and Shells/Patch_AmmoCategories_Grenades.xml	
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<CombatExtended.AmmoCategoryDef>
+		<defName>Toxic</defName>
+		<label>Toxic gas</label>
+		<description>Filled with a potent nerve agent harmful to most complex forms of organic life.</description>
+		<advanced>true</advanced>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>Rage</defName>
+		<label>Rage gas</label>
+		<description>Filled with a specialized airbone agent that induces a blind, uncontrollable rage.</description>
+		<advanced>true</advanced>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>TearGas</defName>
+		<label>Tear gas</label>
+		<description>Filled with a specialized airbone agent that attacks the sensitive membranes of the eyes and nose, making it difficult to see or breathe.</description>
+		<advanced>true</advanced>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>Sleep</defName>
+		<label>Sleep gas</label>
+		<description>Filled with a powerful sedative, capable of knocking unconscious anyone exposed to it.</description>
+		<advanced>true</advanced>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>Fear</defName>
+		<label>Fear gas</label>
+		<description>Filled with a specialized airbone agent that induces an extremely strong feeling of dread and terror.</description>
+		<advanced>true</advanced>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>Acid</defName>
+		<label>Corrosive gas</label>
+		<description>Filled with an extremely strong acid, capable of quickly burning flesh and metal alike.</description>
+		<advanced>true</advanced>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>MechVirus</defName>
+		<label>Nanomachine</label>
+		<description>Contains nanomachines designed to latch onto and wreck havoc on the systems of mechanoids. Ineffective against organic life.</description>
+		<advanced>true</advanced>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>AntiInsect</defName>
+		<label>Insecticide</label>
+		<description>Filled with a special aerosol designed to kill insectoids.</description>
+		<advanced>true</advanced>
+	</CombatExtended.AmmoCategoryDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Gas Traps and Shells/Defs/Gas Traps and Shells/Patch_Ammo_Gas.xml b/ModPatches/Gas Traps and Shells/Defs/Gas Traps and Shells/Patch_Ammo_Gas.xml
new file mode 100644
index 0000000000..49334673a2
--- /dev/null
+++ b/ModPatches/Gas Traps and Shells/Defs/Gas Traps and Shells/Patch_Ammo_Gas.xml	
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<CombatExtended.AmmoCategoryDef>
+		<defName>GasToxic</defName>
+		<label>toxic gas</label>
+		<labelShort>Toxic</labelShort>
+		<description>This shell contains a potent, nerve agent, harmful to most complex forms of organic life.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>GasRage</defName>
+		<label>rage gas</label>
+		<labelShort>Rage</labelShort>
+		<description>This shell contains a potent, specialized airborne agent that induces blind, uncontrollable rage.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>GasTear</defName>
+		<label>tear gas</label>
+		<labelShort>CN</labelShort>
+		<description>This shell contains a potent, specialized airborne agent that attacks the sensitive membranes of the eyes and nose, making it difficult to see or breathe.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>GasFear</defName>
+		<label>fear gas</label>
+		<labelShort>Fear</labelShort>
+		<description>This shell contains a potent, specialized airborne agent that induces an extremely strong feeling of dread and terror.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>GasSleep</defName>
+		<label>sleeping gas</label>
+		<labelShort>sleep</labelShort>
+		<description>This shell contains a potent sedative, capable of quickly knocking unconscious anyone exposed to it.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>GasAcid</defName>
+		<label>acid</label>
+		<labelShort>acid</labelShort>
+		<description>This shell contains an extremely strong acid, capable of quickly burning away flesh and metal alike.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>MechVirus</defName>
+		<label>Nanomachines</label>
+		<labelShort>Nano</labelShort>
+		<description>This shell contains nanomachines designed to latch onto and wreck havoc on the systems of mechanoids. Ineffective against organic life.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>AntiBug</defName>
+		<label>Insecticide</label>
+		<labelShort>Anti-Bug</labelShort>
+		<description>This shell is filled with a special aerosol specially designed to kill insectoids.</description>
+	</CombatExtended.AmmoCategoryDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Gas Traps and Shells/Defs/Gas Traps and Shells/Patch_PawnKinds_CE.xml b/ModPatches/Gas Traps and Shells/Defs/Gas Traps and Shells/Patch_PawnKinds_CE.xml
new file mode 100644
index 0000000000..79b3f0bea4
--- /dev/null
+++ b/ModPatches/Gas Traps and Shells/Defs/Gas Traps and Shells/Patch_PawnKinds_CE.xml	
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- Mercenary chemical grenadier -->
+
+	<PawnKindDef ParentName="MercenaryGunnerBase">
+		<defName>MercenaryChemGrenadier</defName>
+		<label>mercenary chemical grenadier</label>
+		<combatPower>60</combatPower>
+		<canBeSapper>true</canBeSapper>
+		<weaponTags Inherit="False">
+			<li>GrenadeSmoke</li>
+		</weaponTags>
+		<initialResistanceRange>10~20</initialResistanceRange>
+		<weaponMoney>500~500</weaponMoney>
+		<apparelRequired>
+			<li>CE_Apparel_GasMask</li>
+		</apparelRequired>
+		<techHediffsTags>
+			<li>Advanced</li>
+		</techHediffsTags>
+		<techHediffsChance>0.01</techHediffsChance>
+		<modExtensions>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>10</min>
+					<max>30</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>100</min>
+						<max>200</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</modExtensions>
+	</PawnKindDef>
+
+	<PawnKindDef ParentName="PirateScavTierBase">
+		<defName>Noxxer</defName>
+		<label>scavenger noxxer</label>
+		<combatPower>40</combatPower>
+		<canBeSapper>true</canBeSapper>
+		<apparelMoney>300~500</apparelMoney>
+		<apparelRequired>
+			<li>CE_Apparel_GasMask</li>
+		</apparelRequired>
+		<weaponMoney>200~300</weaponMoney>
+		<weaponTags>
+			<li>GrenadeSmoke</li>
+		</weaponTags>
+		<initialResistanceRange>10~20</initialResistanceRange>
+		<modExtensions>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>10</min>
+					<max>30</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>100</min>
+						<max>200</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Melee</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</modExtensions>
+	</PawnKindDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Gas Traps and Shells/Defs/Gas Traps and Shells/Recipes_81mm.xml b/ModPatches/Gas Traps and Shells/Defs/Gas Traps and Shells/Recipes_81mm.xml
new file mode 100644
index 0000000000..0a7da9a959
--- /dev/null
+++ b/ModPatches/Gas Traps and Shells/Defs/Gas Traps and Shells/Recipes_81mm.xml	
@@ -0,0 +1,349 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- Recipes -->
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeShell_GasToxic</defName>
+		<label>make 81mm toxic gas mortar shells x5</label>
+		<description>Craft 5 81mm toxic gas mortar shells.</description>
+		<jobString>Making 81mm toxic gas mortar shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Canister_ToxicGas</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>Canister_ToxicGas</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Shell_GasToxic>5</Shell_GasToxic>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeShell_GasRage</defName>
+		<label>make 81mm rage gas mortar shells x5</label>
+		<description>Craft 5 81mm rage gas mortar shells.</description>
+		<jobString>Making 81mm rage gas mortar shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Canister_RageGas</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>Canister_RageGas</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Shell_GasRage>5</Shell_GasRage>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeShell_GasTear</defName>
+		<label>make 81mm tear gas mortar shells x5</label>
+		<description>Craft 5 81mm tear gas mortar shells.</description>
+		<jobString>Making 81mm tear gas mortar shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Canister_TearGas</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>Canister_TearGas</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Shell_GasTear>5</Shell_GasTear>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeShell_GasSleep</defName>
+		<label>make 81mm sleep gas mortar shells x5</label>
+		<description>Craft 5 81mm sleep gas mortar shells.</description>
+		<jobString>Making 81mm sleep gas mortar shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Canister_SleepGas</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>Canister_SleepGas</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Shell_GasSleep>5</Shell_GasSleep>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeShell_GasFear</defName>
+		<label>make 81mm fear gas mortar shells x5</label>
+		<description>Craft 5 81mm fear gas mortar shells.</description>
+		<jobString>Making 81mm fear gas mortar shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Canister_FearGas</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>Canister_FearGas</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Shell_GasFear>5</Shell_GasFear>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeShell_GasAcid</defName>
+		<label>make 81mm corrosive acid mortar shells x5</label>
+		<description>Craft 5 81mm corrosive acid mortar shells.</description>
+		<jobString>Making 81mm corrosive acid mortar shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Canister_AcidGas</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>Canister_AcidGas</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Shell_GasAcid>5</Shell_GasAcid>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeShell_MechVirus</defName>
+		<label>make 81mm nanomachines mortar shells x5</label>
+		<description>Craft 5 81mm nanomachines mortar shells.</description>
+		<jobString>Making 81mm nanomachines mortar shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Canister_MechVirusGas</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>Canister_MechVirusGas</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Shell_MechVirus>5</Shell_MechVirus>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeShell_GasAntiBug</defName>
+		<label>make 81mm insecticide mortar shells x5</label>
+		<description>Craft 5 81mm insecticide mortar shells.</description>
+		<jobString>Making 81mm insecticide mortar shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Canister_AntibugGas</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>Canister_AntibugGas</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Shell_GasAntiBug>5</Shell_GasAntiBug>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Gas Traps and Shells/Defs/Gas Traps and Shells/Recipes_HandGrenades.xml b/ModPatches/Gas Traps and Shells/Defs/Gas Traps and Shells/Recipes_HandGrenades.xml
new file mode 100644
index 0000000000..8463083495
--- /dev/null
+++ b/ModPatches/Gas Traps and Shells/Defs/Gas Traps and Shells/Recipes_HandGrenades.xml	
@@ -0,0 +1,356 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeToxicGasGrenade</defName>
+		<label>make toxic gas grenades x10</label>
+		<description>Craft 10 toxic gas grenades.</description>
+		<jobString>Making toxic gas grenades.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Canister_ToxicGas</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>Canister_ToxicGas</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Weapon_GrenadeToxic>10</Weapon_GrenadeToxic>
+		</products>
+		<workAmount>3600</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeRageGasGrenade</defName>
+		<label>make rage gas grenades x10</label>
+		<description>Craft 10 rage gas grenades.</description>
+		<jobString>Making rage gas grenades.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Canister_RageGas</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>Canister_RageGas</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Weapon_GrenadeRage>10</Weapon_GrenadeRage>
+		</products>
+		<workAmount>3600</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeTearGasGrenade</defName>
+		<label>make tear gas grenades x10</label>
+		<description>Craft 10 tear gas grenades.</description>
+		<jobString>Making tear gas grenades.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Canister_TearGas</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>Canister_TearGas</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Weapon_GrenadeTearGas>10</Weapon_GrenadeTearGas>
+		</products>
+		<workAmount>3600</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeSleepGasGrenade</defName>
+		<label>make sleep gas grenades x10</label>
+		<description>Craft 10 sleep gas grenades.</description>
+		<jobString>Making sleep gas grenades.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Canister_SleepGas</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>Canister_SleepGas</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Weapon_GrenadeSleep>10</Weapon_GrenadeSleep>
+		</products>
+		<workAmount>3600</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeFearGasGrenade</defName>
+		<label>make fear gas grenades x10</label>
+		<description>Craft 10 fear gas grenades.</description>
+		<jobString>Making fear gas grenades.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Canister_FearGas</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>Canister_FearGas</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Weapon_GrenadeFear>10</Weapon_GrenadeFear>
+		</products>
+		<workAmount>3600</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeAcidGasGrenade</defName>
+		<label>make corrosive gas grenades x10</label>
+		<description>Craft 10 corrosive gas grenades.</description>
+		<jobString>Making corrosive gas grenades.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Canister_AcidGas</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>Canister_AcidGas</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Weapon_GrenadeAcid>10</Weapon_GrenadeAcid>
+		</products>
+		<workAmount>3600</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeMechVirusGrenade</defName>
+		<label>make nanomachine canisters x10</label>
+		<description>Craft 10 nanomachine canisters.</description>
+		<jobString>Making nanomachine canisters.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Canister_MechVirusGas</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>Canister_MechVirusGas</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Weapon_GrenadeMechVirus>10</Weapon_GrenadeMechVirus>
+		</products>
+		<workAmount>3600</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeAntiBugGrenade</defName>
+		<label>make insecticide gas grenades x10</label>
+		<description>Craft 10 insecticide gas grenades.</description>
+		<jobString>Making insecticide gas grenades.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Canister_AntibugGas</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>Canister_AntibugGas</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Weapon_GrenadeAntiBug>10</Weapon_GrenadeAntiBug>
+		</products>
+		<workAmount>3600</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Gas Traps and Shells/Defs/Gas Traps and Shells/Weapons_Grenades.xml b/ModPatches/Gas Traps and Shells/Defs/Gas Traps and Shells/Weapons_Grenades.xml
new file mode 100644
index 0000000000..875ad23bab
--- /dev/null
+++ b/ModPatches/Gas Traps and Shells/Defs/Gas Traps and Shells/Weapons_Grenades.xml	
@@ -0,0 +1,642 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- ==================== Toxic Gas Grenade ========================== -->
+
+	<ThingDef ParentName="BaseGrenadeProjectile">
+		<defName>Proj_GrenadeToxic</defName>
+		<label>toxic gas grenade</label>
+		<graphicData>
+			<texPath>ThirdParty/GasTraps/gas_grenade_projectile</texPath>
+			<color>(70,183,79)</color>
+			<shaderType>CutoutComplex</shaderType>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>4</explosionRadius>
+			<damageDef>Smoke</damageDef>
+			<suppressionFactor>0.0</suppressionFactor>
+			<dangerFactor>0.0</dangerFactor>
+			<explosionDelay>30</explosionDelay>
+			<dropsCasings>true</dropsCasings>
+			<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+			<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+			<postExplosionSpawnThingDef>ToxicGas</postExplosionSpawnThingDef>
+			<preExplosionSpawnChance>1</preExplosionSpawnChance>
+			<speed>10</speed>
+		</projectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGrenadeEquipment">
+		<defName>Weapon_GrenadeToxic</defName>
+		<equipmentType>Primary</equipmentType>
+		<label>toxic gas grenade</label>
+		<description>Releases a large cloud of a potent nerve agent harmful to most complex forms of organic life.</description>
+		<graphicData>
+			<texPath>ThirdParty/GasTraps/HandGrenade</texPath>
+			<color>(70,183,79)</color>
+			<shaderType>CutoutComplex</shaderType>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<soundInteract>Interact_Grenade</soundInteract>
+		<techLevel>Industrial</techLevel>
+		<statBases>
+			<Mass>0.539</Mass>
+			<Bulk>1.05</Bulk>
+			<MarketValue>10.15</MarketValue>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Grenade</li>
+			<li>GrenadeSmoke</li>
+		</weaponTags>
+		<thingCategories>
+			<li>Grenades</li>
+		</thingCategories>
+		<verbs>
+			<li Class="CombatExtended.VerbPropertiesCE">
+				<label>throw toxic gas grenade</label>
+				<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+				<hasStandardCommand>true</hasStandardCommand>
+				<range>10</range>
+				<warmupTime>1.8</warmupTime>
+				<noiseRadius>4</noiseRadius>
+				<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+				<soundCast>ThrowGrenade</soundCast>
+				<targetParams>
+					<canTargetLocations>true</canTargetLocations>
+				</targetParams>
+				<defaultProjectile>Proj_GrenadeToxic</defaultProjectile>
+				<onlyManualCast>true</onlyManualCast>
+				<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+			</li>
+		</verbs>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>4</damageAmountBase>
+				<explosiveDamageType>Smoke</explosiveDamageType>
+				<postExplosionSpawnThingDef>ToxicGas</postExplosionSpawnThingDef>
+				<preExplosionSpawnChance>1</preExplosionSpawnChance>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Rage Gas Grenade ========================== -->
+
+	<ThingDef ParentName="BaseGrenadeProjectile">
+		<defName>Proj_GrenadeRage</defName>
+		<label>rage gas grenade</label>
+		<graphicData>
+			<texPath>ThirdParty/GasTraps/gas_grenade_projectile</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>CutoutComplex</shaderType>
+			<color>(200,112,112)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>4</explosionRadius>
+			<damageDef>Smoke</damageDef>
+			<suppressionFactor>0.0</suppressionFactor>
+			<dangerFactor>0.0</dangerFactor>
+			<explosionDelay>30</explosionDelay>
+			<dropsCasings>true</dropsCasings>
+			<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+			<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+			<postExplosionSpawnThingDef>RageGas</postExplosionSpawnThingDef>
+			<preExplosionSpawnChance>1</preExplosionSpawnChance>
+			<speed>10</speed>
+		</projectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGrenadeEquipment">
+		<defName>Weapon_GrenadeRage</defName>
+		<equipmentType>Primary</equipmentType>
+		<label>rage gas grenade</label>
+		<description>Releases a large cloud of a specialized airbone agent that induces a blind, uncontrollable rage..</description>
+		<graphicData>
+			<texPath>ThirdParty/GasTraps/HandGrenade</texPath>
+			<color>(200,112,112)</color>
+			<shaderType>CutoutComplex</shaderType>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<soundInteract>Interact_Grenade</soundInteract>
+		<techLevel>Industrial</techLevel>
+		<statBases>
+			<Mass>0.539</Mass>
+			<Bulk>1.05</Bulk>
+			<MarketValue>10.15</MarketValue>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<weaponTags>
+			<li>CE_AI_Nonlethal</li>
+			<li>GrenadeSmoke</li>
+		</weaponTags>
+		<thingCategories>
+			<li>Grenades</li>
+		</thingCategories>
+		<verbs>
+			<li Class="CombatExtended.VerbPropertiesCE">
+				<label>throw rage gas grenade</label>
+				<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+				<hasStandardCommand>true</hasStandardCommand>
+				<range>10</range>
+				<warmupTime>1.8</warmupTime>
+				<noiseRadius>4</noiseRadius>
+				<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+				<soundCast>ThrowGrenade</soundCast>
+				<targetParams>
+					<canTargetLocations>true</canTargetLocations>
+				</targetParams>
+				<defaultProjectile>Proj_GrenadeRage</defaultProjectile>
+				<onlyManualCast>true</onlyManualCast>
+				<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+			</li>
+		</verbs>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>4</damageAmountBase>
+				<explosiveDamageType>Smoke</explosiveDamageType>
+				<postExplosionSpawnThingDef>RageGas</postExplosionSpawnThingDef>
+				<preExplosionSpawnChance>1</preExplosionSpawnChance>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Tear Gas Grenade ========================== -->
+
+	<ThingDef ParentName="BaseGrenadeProjectile">
+		<defName>Proj_GrenadeTearGas</defName>
+		<label>tear gas grenade</label>
+		<graphicData>
+			<texPath>ThirdParty/GasTraps/gas_grenade_projectile</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>CutoutComplex</shaderType>
+			<color>(181,151,185)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>4</explosionRadius>
+			<damageDef>Smoke</damageDef>
+			<suppressionFactor>0.0</suppressionFactor>
+			<dangerFactor>0.0</dangerFactor>
+			<explosionDelay>30</explosionDelay>
+			<dropsCasings>true</dropsCasings>
+			<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+			<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+			<postExplosionSpawnThingDef>TearGas</postExplosionSpawnThingDef>
+			<preExplosionSpawnChance>1</preExplosionSpawnChance>
+			<speed>10</speed>
+		</projectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGrenadeEquipment">
+		<defName>Weapon_GrenadeTearGas</defName>
+		<equipmentType>Primary</equipmentType>
+		<label>tear gas grenade</label>
+		<description>Releases a large cloud of a specialized airbone agent that attacks the sensitive membranes of the eyes and nose, making it difficult to see or breathe..</description>
+		<graphicData>
+			<texPath>ThirdParty/GasTraps/HandGrenade</texPath>
+			<color>(181,151,185)</color>
+			<shaderType>CutoutComplex</shaderType>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<soundInteract>Interact_Grenade</soundInteract>
+		<techLevel>Industrial</techLevel>
+		<statBases>
+			<Mass>0.539</Mass>
+			<Bulk>1.05</Bulk>
+			<MarketValue>10.15</MarketValue>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<weaponTags>
+			<li>CE_AI_Nonlethal</li>
+			<li>GrenadeSmoke</li>
+		</weaponTags>
+		<thingCategories>
+			<li>Grenades</li>
+		</thingCategories>
+		<verbs>
+			<li Class="CombatExtended.VerbPropertiesCE">
+				<label>throw tear gas grenade</label>
+				<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+				<hasStandardCommand>true</hasStandardCommand>
+				<range>10</range>
+				<warmupTime>1.8</warmupTime>
+				<noiseRadius>4</noiseRadius>
+				<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+				<soundCast>ThrowGrenade</soundCast>
+				<targetParams>
+					<canTargetLocations>true</canTargetLocations>
+				</targetParams>
+				<defaultProjectile>Proj_GrenadeTearGas</defaultProjectile>
+				<onlyManualCast>true</onlyManualCast>
+				<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+			</li>
+		</verbs>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>4</damageAmountBase>
+				<explosiveDamageType>Smoke</explosiveDamageType>
+				<postExplosionSpawnThingDef>TearGas</postExplosionSpawnThingDef>
+				<preExplosionSpawnChance>1</preExplosionSpawnChance>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Sleep Gas Grenade ========================== -->
+
+	<ThingDef ParentName="BaseGrenadeProjectile">
+		<defName>Proj_GrenadeSleep</defName>
+		<label>sleep gas grenade</label>
+		<graphicData>
+			<texPath>ThirdParty/GasTraps/gas_grenade_projectile</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<color>(113,154,208)</color>
+			<shaderType>CutoutComplex</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>4</explosionRadius>
+			<damageDef>Smoke</damageDef>
+			<suppressionFactor>0.0</suppressionFactor>
+			<dangerFactor>0.0</dangerFactor>
+			<explosionDelay>30</explosionDelay>
+			<dropsCasings>true</dropsCasings>
+			<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+			<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+			<postExplosionSpawnThingDef>SleepGas</postExplosionSpawnThingDef>
+			<preExplosionSpawnChance>1</preExplosionSpawnChance>
+			<speed>10</speed>
+		</projectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGrenadeEquipment">
+		<defName>Weapon_GrenadeSleep</defName>
+		<equipmentType>Primary</equipmentType>
+		<label>sleep gas grenade</label>
+		<description>Releases a large cloud of powerful sedatives, capable of knocking unconscious anyone exposed to it.</description>
+		<graphicData>
+			<texPath>ThirdParty/GasTraps/HandGrenade</texPath>
+			<color>(113,154,208)</color>
+			<shaderType>CutoutComplex</shaderType>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<soundInteract>Interact_Grenade</soundInteract>
+		<techLevel>Industrial</techLevel>
+		<statBases>
+			<Mass>0.539</Mass>
+			<Bulk>1.05</Bulk>
+			<MarketValue>10.15</MarketValue>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<weaponTags>
+			<li>CE_AI_Nonlethal</li>
+			<li>GrenadeSmoke</li>
+		</weaponTags>
+		<thingCategories>
+			<li>Grenades</li>
+		</thingCategories>
+		<verbs>
+			<li Class="CombatExtended.VerbPropertiesCE">
+				<label>throw sleep gas grenade</label>
+				<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+				<hasStandardCommand>true</hasStandardCommand>
+				<range>10</range>
+				<warmupTime>1.8</warmupTime>
+				<noiseRadius>4</noiseRadius>
+				<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+				<soundCast>ThrowGrenade</soundCast>
+				<targetParams>
+					<canTargetLocations>true</canTargetLocations>
+				</targetParams>
+				<defaultProjectile>Proj_GrenadeSleep</defaultProjectile>
+				<onlyManualCast>true</onlyManualCast>
+				<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+			</li>
+		</verbs>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>4</damageAmountBase>
+				<explosiveDamageType>Smoke</explosiveDamageType>
+				<postExplosionSpawnThingDef>SleepGas</postExplosionSpawnThingDef>
+				<preExplosionSpawnChance>1</preExplosionSpawnChance>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Fear Gas Grenade ========================== -->
+
+	<ThingDef ParentName="BaseGrenadeProjectile">
+		<defName>Proj_GrenadeFear</defName>
+		<label>fear gas grenade</label>
+		<graphicData>
+			<texPath>ThirdParty/GasTraps/gas_grenade_projectile</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>CutoutComplex</shaderType>
+			<color>(185,142,132)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>4</explosionRadius>
+			<damageDef>Smoke</damageDef>
+			<suppressionFactor>0.0</suppressionFactor>
+			<dangerFactor>0.0</dangerFactor>
+			<explosionDelay>30</explosionDelay>
+			<dropsCasings>true</dropsCasings>
+			<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+			<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+			<postExplosionSpawnThingDef>FearGas</postExplosionSpawnThingDef>
+			<preExplosionSpawnChance>1</preExplosionSpawnChance>
+			<speed>10</speed>
+		</projectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGrenadeEquipment">
+		<defName>Weapon_GrenadeFear</defName>
+		<equipmentType>Primary</equipmentType>
+		<label>fear gas grenade</label>
+		<description>Releases a large cloud of a specialized airbone agent that induces an extremely strong feeling of dread and terror.</description>
+		<graphicData>
+			<texPath>ThirdParty/GasTraps/HandGrenade</texPath>
+			<color>(185,142,132)</color>
+			<shaderType>CutoutComplex</shaderType>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<soundInteract>Interact_Grenade</soundInteract>
+		<techLevel>Industrial</techLevel>
+		<statBases>
+			<Mass>0.539</Mass>
+			<Bulk>1.05</Bulk>
+			<MarketValue>10.15</MarketValue>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<weaponTags>
+			<li>CE_AI_Nonlethal</li>
+			<li>GrenadeSmoke</li>
+		</weaponTags>
+		<thingCategories>
+			<li>Grenades</li>
+		</thingCategories>
+		<verbs>
+			<li Class="CombatExtended.VerbPropertiesCE">
+				<label>throw fear gas grenade</label>
+				<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+				<hasStandardCommand>true</hasStandardCommand>
+				<range>10</range>
+				<warmupTime>1.8</warmupTime>
+				<noiseRadius>4</noiseRadius>
+				<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+				<soundCast>ThrowGrenade</soundCast>
+				<targetParams>
+					<canTargetLocations>true</canTargetLocations>
+				</targetParams>
+				<defaultProjectile>Proj_GrenadeFear</defaultProjectile>
+				<onlyManualCast>true</onlyManualCast>
+				<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+			</li>
+		</verbs>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>4</damageAmountBase>
+				<explosiveDamageType>Smoke</explosiveDamageType>
+				<postExplosionSpawnThingDef>FearGas</postExplosionSpawnThingDef>
+				<preExplosionSpawnChance>1</preExplosionSpawnChance>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Corrosive Gas Grenade ========================== -->
+
+	<ThingDef ParentName="BaseGrenadeProjectile">
+		<defName>Proj_GrenadeAcid</defName>
+		<label>corrosive gas grenade</label>
+		<graphicData>
+			<texPath>ThirdParty/GasTraps/gas_grenade_projectile</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<color>(179,178,119)</color>
+			<shaderType>CutoutComplex</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>4</explosionRadius>
+			<damageDef>Smoke</damageDef>
+			<suppressionFactor>0.0</suppressionFactor>
+			<dangerFactor>0.0</dangerFactor>
+			<explosionDelay>30</explosionDelay>
+			<dropsCasings>true</dropsCasings>
+			<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+			<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+			<postExplosionSpawnThingDef>AcidGas</postExplosionSpawnThingDef>
+			<preExplosionSpawnChance>1</preExplosionSpawnChance>
+			<speed>10</speed>
+		</projectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGrenadeEquipment">
+		<defName>Weapon_GrenadeAcid</defName>
+		<equipmentType>Primary</equipmentType>
+		<label>corrosive gas grenade</label>
+		<description>Releases a large cloud of an extremely strong acid, capable of quickly burning flesh and metal alike.</description>
+		<graphicData>
+			<texPath>ThirdParty/GasTraps/HandGrenade</texPath>
+			<color>(179,178,119)</color>
+			<shaderType>CutoutComplex</shaderType>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<soundInteract>Interact_Grenade</soundInteract>
+		<techLevel>Industrial</techLevel>
+		<statBases>
+			<Mass>0.539</Mass>
+			<Bulk>1.05</Bulk>
+			<MarketValue>10.15</MarketValue>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Grenade</li>
+			<li>GrenadeSmoke</li>
+		</weaponTags>
+		<thingCategories>
+			<li>Grenades</li>
+		</thingCategories>
+		<verbs>
+			<li Class="CombatExtended.VerbPropertiesCE">
+				<label>throw corrosive gas grenade</label>
+				<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+				<hasStandardCommand>true</hasStandardCommand>
+				<range>10</range>
+				<warmupTime>1.8</warmupTime>
+				<noiseRadius>4</noiseRadius>
+				<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+				<soundCast>ThrowGrenade</soundCast>
+				<targetParams>
+					<canTargetLocations>true</canTargetLocations>
+				</targetParams>
+				<defaultProjectile>Proj_GrenadeAcid</defaultProjectile>
+				<onlyManualCast>true</onlyManualCast>
+				<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+			</li>
+		</verbs>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>4</damageAmountBase>
+				<explosiveDamageType>Smoke</explosiveDamageType>
+				<postExplosionSpawnThingDef>AcidGas</postExplosionSpawnThingDef>
+				<preExplosionSpawnChance>1</preExplosionSpawnChance>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Nanomachine canister ========================== -->
+
+	<ThingDef ParentName="BaseGrenadeProjectile">
+		<defName>Proj_GrenadeMechVirus</defName>
+		<label>nanomachine canister</label>
+		<graphicData>
+			<texPath>ThirdParty/GasTraps/gas_grenade_projectile</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>CutoutComplex</shaderType>
+			<color>(220,220,220)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>4</explosionRadius>
+			<damageDef>Smoke</damageDef>
+			<suppressionFactor>0.0</suppressionFactor>
+			<dangerFactor>0.0</dangerFactor>
+			<explosionDelay>30</explosionDelay>
+			<dropsCasings>true</dropsCasings>
+			<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+			<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+			<postExplosionSpawnThingDef>MechanoidVirusGas</postExplosionSpawnThingDef>
+			<preExplosionSpawnChance>1</preExplosionSpawnChance>
+			<speed>10</speed>
+		</projectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGrenadeEquipment">
+		<defName>Weapon_GrenadeMechVirus</defName>
+		<equipmentType>Primary</equipmentType>
+		<label>nanomachine canister</label>
+		<description>Releases a large cloud of nanomachines designed to latch onto and wreck havoc on the systems of mechanoids. Ineffective against organic life.</description>
+		<graphicData>
+			<texPath>ThirdParty/GasTraps/HandGrenade</texPath>
+			<color>(220,220,220)</color>
+			<shaderType>CutoutComplex</shaderType>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<soundInteract>Interact_Grenade</soundInteract>
+		<techLevel>Industrial</techLevel>
+		<statBases>
+			<Mass>0.539</Mass>
+			<Bulk>1.05</Bulk>
+			<MarketValue>15</MarketValue>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<weaponTags>
+			<li>GrenadeMech</li>
+		</weaponTags>
+		<thingCategories>
+			<li>Grenades</li>
+		</thingCategories>
+		<verbs>
+			<li Class="CombatExtended.VerbPropertiesCE">
+				<label>throw nanomachine canister</label>
+				<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+				<hasStandardCommand>true</hasStandardCommand>
+				<range>10</range>
+				<warmupTime>1.8</warmupTime>
+				<noiseRadius>4</noiseRadius>
+				<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+				<soundCast>ThrowGrenade</soundCast>
+				<targetParams>
+					<canTargetLocations>true</canTargetLocations>
+				</targetParams>
+				<defaultProjectile>Proj_GrenadeMechVirus</defaultProjectile>
+				<onlyManualCast>true</onlyManualCast>
+				<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+			</li>
+		</verbs>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>4</damageAmountBase>
+				<explosiveDamageType>Smoke</explosiveDamageType>
+				<postExplosionSpawnThingDef>MechanoidVirusGas</postExplosionSpawnThingDef>
+				<preExplosionSpawnChance>1</preExplosionSpawnChance>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Insecticide Gas Grenade ========================== -->
+
+	<ThingDef ParentName="BaseGrenadeProjectile">
+		<defName>Proj_GrenadeAntiBug</defName>
+		<label>insecticide gas grenade</label>
+		<graphicData>
+			<texPath>ThirdParty/GasTraps/gas_grenade_projectile</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>CutoutComplex</shaderType>
+			<color>(70,183,79)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>4</explosionRadius>
+			<damageDef>Smoke</damageDef>
+			<suppressionFactor>0.0</suppressionFactor>
+			<dangerFactor>0.0</dangerFactor>
+			<explosionDelay>30</explosionDelay>
+			<dropsCasings>true</dropsCasings>
+			<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+			<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+			<postExplosionSpawnThingDef>AntiBugGas</postExplosionSpawnThingDef>
+			<preExplosionSpawnChance>1</preExplosionSpawnChance>
+			<speed>10</speed>
+		</projectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGrenadeEquipment">
+		<defName>Weapon_GrenadeAntiBug</defName>
+		<equipmentType>Primary</equipmentType>
+		<label>insecticide gas grenade</label>
+		<description>Releases a large cloud of a special aerosol designed to kill insectoids.</description>
+		<graphicData>
+			<texPath>ThirdParty/GasTraps/HandGrenade</texPath>
+			<color>(70,183,79)</color>
+			<shaderType>CutoutComplex</shaderType>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<soundInteract>Interact_Grenade</soundInteract>
+		<techLevel>Industrial</techLevel>
+		<statBases>
+			<Mass>0.539</Mass>
+			<Bulk>1.05</Bulk>
+			<MarketValue>10.15</MarketValue>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<weaponTags>
+			<li>GrenadeAntiBug</li>
+		</weaponTags>
+		<thingCategories>
+			<li>Grenades</li>
+		</thingCategories>
+		<verbs>
+			<li Class="CombatExtended.VerbPropertiesCE">
+				<label>throw insecticide gas grenade</label>
+				<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+				<hasStandardCommand>true</hasStandardCommand>
+				<range>10</range>
+				<warmupTime>1.8</warmupTime>
+				<noiseRadius>4</noiseRadius>
+				<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+				<soundCast>ThrowGrenade</soundCast>
+				<targetParams>
+					<canTargetLocations>true</canTargetLocations>
+				</targetParams>
+				<defaultProjectile>Proj_GrenadeAntiBug</defaultProjectile>
+				<onlyManualCast>true</onlyManualCast>
+				<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+			</li>
+		</verbs>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>4</damageAmountBase>
+				<explosiveDamageType>Smoke</explosiveDamageType>
+				<postExplosionSpawnThingDef>AntiBugGas</postExplosionSpawnThingDef>
+				<preExplosionSpawnChance>1</preExplosionSpawnChance>
+			</li>
+		</comps>
+	</ThingDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Gas Traps and Shells/Patches/Gas Traps and Shells/Patch_AmmoCategories_Gas.xml b/ModPatches/Gas Traps and Shells/Patches/Gas Traps and Shells/Patch_AmmoCategories_Gas.xml
new file mode 100644
index 0000000000..dac3ff1330
--- /dev/null
+++ b/ModPatches/Gas Traps and Shells/Patches/Gas Traps and Shells/Patch_AmmoCategories_Gas.xml	
@@ -0,0 +1,330 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Change gas colors to better fit gaz type/texture colors... -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MechanoidVirusGas"]/graphicData/color</xpath>
+		<value>
+			<color>(0.6,0.7,0.7,0.3)</color>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AntiBugGas"]/graphicData/color</xpath>
+		<value>
+			<color>(0.7,0.6,0.0,0.3)</color>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ToxicGas"]/graphicData/color</xpath>
+		<value>
+			<color>(0.2,0.4,0.2,0.3)</color>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SleepGas"]/graphicData/color</xpath>
+		<value>
+			<color>(0.4,0.3,0.9,0.3)</color>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RageGas"]/graphicData/color</xpath>
+		<value>
+			<color>(1.0,0.3,0.4,0.3)</color>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AcidGas"]/graphicData/color</xpath>
+		<value>
+			<color>(0.6,0.8,0.1,0.3)</color>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FearGas"]/graphicData/color</xpath>
+		<value>
+			<color>(0.7,0.3,0.3,0.3)</color>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TearGas"]/graphicData/color</xpath>
+		<value>
+			<color>(0.6,0.2,0.9,0.3)</color>
+		</value>
+	</Operation>
+
+	<!-- Change damage type of certain shells, to be used in sieges -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_Shell_GasToxic"]/projectile/damageDef</xpath>
+		<value>
+			<damageDef>Bomb</damageDef>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_Shell_GasAcid"]/projectile/damageDef</xpath>
+		<value>
+			<damageDef>Bomb</damageDef>
+		</value>
+	</Operation>
+
+	<!-- Change shell textures -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Shell_GasToxic"]/graphicData</xpath>
+		<value>
+			<graphicData>
+				<texPath>ThirdParty/GasTraps/Mortar</texPath>
+				<graphicClass>Graphic_StackCount</graphicClass>
+				<shaderType>CutoutComplex</shaderType>
+				<color>(70,183,79)</color>
+			</graphicData>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Shell_GasRage"]/graphicData</xpath>
+		<value>
+			<graphicData>
+				<texPath>ThirdParty/GasTraps/Mortar</texPath>
+				<graphicClass>Graphic_StackCount</graphicClass>
+				<shaderType>CutoutComplex</shaderType>
+				<color>(200,112,112)</color>
+			</graphicData>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Shell_GasTear"]/graphicData</xpath>
+		<value>
+			<graphicData>
+				<texPath>ThirdParty/GasTraps/Mortar</texPath>
+				<graphicClass>Graphic_StackCount</graphicClass>
+				<shaderType>CutoutComplex</shaderType>
+				<color>(181,151,185)</color>
+			</graphicData>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Shell_GasFear"]/graphicData</xpath>
+		<value>
+			<graphicData>
+				<texPath>ThirdParty/GasTraps/Mortar</texPath>
+				<graphicClass>Graphic_StackCount</graphicClass>
+				<shaderType>CutoutComplex</shaderType>
+				<color>(185,142,132)</color>
+			</graphicData>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Shell_GasSleep"]/graphicData</xpath>
+		<value>
+			<graphicData>
+				<texPath>ThirdParty/GasTraps/Mortar</texPath>
+				<graphicClass>Graphic_StackCount</graphicClass>
+				<shaderType>CutoutComplex</shaderType>
+				<color>(113,154,208)</color>
+			</graphicData>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Shell_GasAcid"]/graphicData</xpath>
+		<value>
+			<graphicData>
+				<texPath>ThirdParty/GasTraps/Mortar</texPath>
+				<graphicClass>Graphic_StackCount</graphicClass>
+				<shaderType>CutoutComplex</shaderType>
+				<color>(179,178,119)</color>
+			</graphicData>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Shell_MechVirus"]/graphicData</xpath>
+		<value>
+			<graphicData>
+				<texPath>ThirdParty/GasTraps/Mortar</texPath>
+				<graphicClass>Graphic_StackCount</graphicClass>
+				<shaderType>CutoutComplex</shaderType>
+				<color>(220,220,220)</color>
+			</graphicData>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Shell_GasAntiBug"]/graphicData</xpath>
+		<value>
+			<graphicData>
+				<texPath>ThirdParty/GasTraps/Mortar</texPath>
+				<graphicClass>Graphic_StackCount</graphicClass>
+				<shaderType>CutoutComplex</shaderType>
+				<color>(70,183,79)</color>
+			</graphicData>
+		</value>
+	</Operation>
+
+	<!-- Change projectile textures -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_Shell_GasToxic"]/graphicData</xpath>
+		<value>
+			<graphicData>
+				<texPath>ThirdParty/GasTraps/gas_mortar_projectile</texPath>
+				<graphicClass>Graphic_Single</graphicClass>
+				<shaderType>CutoutComplex</shaderType>
+				<color>(70,183,79)</color>
+			</graphicData>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_Shell_GasRage"]/graphicData</xpath>
+		<value>
+			<graphicData>
+				<texPath>ThirdParty/GasTraps/gas_mortar_projectile</texPath>
+				<graphicClass>Graphic_Single</graphicClass>
+				<shaderType>CutoutComplex</shaderType>
+				<color>(200,112,112)</color>
+			</graphicData>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_Shell_GasTear"]/graphicData</xpath>
+		<value>
+			<graphicData>
+				<texPath>ThirdParty/GasTraps/gas_mortar_projectile</texPath>
+				<graphicClass>Graphic_Single</graphicClass>
+				<shaderType>CutoutComplex</shaderType>
+				<color>(181,151,185)</color>
+			</graphicData>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_Shell_GasFear"]/graphicData</xpath>
+		<value>
+			<graphicData>
+				<texPath>ThirdParty/GasTraps/gas_mortar_projectile</texPath>
+				<graphicClass>Graphic_Single</graphicClass>
+				<shaderType>CutoutComplex</shaderType>
+				<color>(185,142,132)</color>
+			</graphicData>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_Shell_GasSleep"]/graphicData</xpath>
+		<value>
+			<graphicData>
+				<texPath>ThirdParty/GasTraps/gas_mortar_projectile</texPath>
+				<graphicClass>Graphic_Single</graphicClass>
+				<shaderType>CutoutComplex</shaderType>
+				<color>(113,154,208)</color>
+			</graphicData>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_Shell_GasAcid"]/graphicData</xpath>
+		<value>
+			<graphicData>
+				<texPath>ThirdParty/GasTraps/gas_mortar_projectile</texPath>
+				<graphicClass>Graphic_Single</graphicClass>
+				<shaderType>CutoutComplex</shaderType>
+				<color>(179,178,119)</color>
+			</graphicData>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_Shell_MechVirus"]/graphicData</xpath>
+		<value>
+			<graphicData>
+				<texPath>ThirdParty/GasTraps/gas_mortar_projectile</texPath>
+				<graphicClass>Graphic_Single</graphicClass>
+				<shaderType>CutoutComplex</shaderType>
+				<color>(220,220,220)</color>
+			</graphicData>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_Shell_GasAntiBug"]/graphicData</xpath>
+		<value>
+			<graphicData>
+				<texPath>ThirdParty/GasTraps/gas_mortar_projectile</texPath>
+				<graphicClass>Graphic_Single</graphicClass>
+				<shaderType>CutoutComplex</shaderType>
+				<color>(70,183,79)</color>
+			</graphicData>
+		</value>
+	</Operation>
+
+	<!-- Change shell names to better fit Combat Extended -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Shell_GasToxic"]/label</xpath>
+		<value>
+			<label>81mm mortar shell (Toxic)</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Shell_GasRage"]/label</xpath>
+		<value>
+			<label>81mm mortar shell (Rage)</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Shell_GasTear"]/label</xpath>
+		<value>
+			<label>81mm mortar shell (Tear gas)</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Shell_GasSleep"]/label</xpath>
+		<value>
+			<label>81mm mortar shell (Sleep)</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Shell_GasFear"]/label</xpath>
+		<value>
+			<label>81mm mortar shell (Fear)</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Shell_GasAcid"]/label</xpath>
+		<value>
+			<label>81mm mortar shell (Acid)</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Shell_MechVirus"]/label</xpath>
+		<value>
+			<label>81mm mortar shell (Nanomachines)</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Shell_GasAntiBug"]/label</xpath>
+		<value>
+			<label>81mm mortar shell (Insecticide)</label>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Gas Traps and Shells/Patches/Gas Traps and Shells/Patch_Buildings_GasTrap.xml b/ModPatches/Gas Traps and Shells/Patches/Gas Traps and Shells/Patch_Buildings_GasTrap.xml
new file mode 100644
index 0000000000..a421212280
--- /dev/null
+++ b/ModPatches/Gas Traps and Shells/Patches/Gas Traps and Shells/Patch_Buildings_GasTrap.xml	
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Changing names & descs of gas traps -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GasTrap"]/label</xpath>
+		<value>
+			<label>IED toxic gas trap</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GasTrapRage"]/label</xpath>
+		<value>
+			<label>IED rage gas trap</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GasTrapSleepGas"]/label</xpath>
+		<value>
+			<label>IED sleep gas trap</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GasTrapFearGas"]/label</xpath>
+		<value>
+			<label>IED fear gas trap</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GasTrapAcid"]/label</xpath>
+		<value>
+			<label>IED corrosive gas trap</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GasTrapMechanoidVirus"]/label</xpath>
+		<value>
+			<label>IED nanomachine trap</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GasTrapAntiBugGas"]/label</xpath>
+		<value>
+			<label>IED insecticide gas trap</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GasTrap"]/description</xpath>
+		<value>
+			<description>A toxic gas shell connected to a trigger which detonates on touch or bullet impact. Since it is hidden in the surrounding terrain, it cannot be placed adjacent to other traps. Animals can sense these when calm.</description>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GasTrapRage"]/description</xpath>
+		<value>
+			<description>Ar rage gas shell connected to a trigger which detonates on touch or bullet impact. Since it is hidden in the surrounding terrain, it cannot be placed adjacent to other traps. Animals can sense these when calm.</description>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GasTrapSleepGas"]/description</xpath>
+		<value>
+			<description>A sleep gas shell connected to a trigger which detonates on touch or bullet impact. Since it is hidden in the surrounding terrain, it cannot be placed adjacent to other traps. Animals can sense these when calm.</description>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GasTrapFearGas"]/description</xpath>
+		<value>
+			<description>A fear gas shell connected to a trigger which detonates on touch or bullet impact. Since it is hidden in the surrounding terrain, it cannot be placed adjacent to other traps. Animals can sense these when calm.</description>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GasTrapAcid"]/description</xpath>
+		<value>
+			<description>A corrosive gas shell connected to a trigger which detonates on touch or bullet impact. Since it is hidden in the surrounding terrain, it cannot be placed adjacent to other traps. Animals can sense these when calm.</description>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GasTrapMechanoidVirus"]/description</xpath>
+		<value>
+			<description>A nanomachine shell connected to a trigger which detonates on touch or bullet impact. Since it is hidden in the surrounding terrain, it cannot be placed adjacent to other traps. Animals can sense these when calm.</description>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GasTrapAntiBugGas"]/description</xpath>
+		<value>
+			<description>A insecticide gas shell connected to a trigger which detonates on touch or bullet impact. Since it is hidden in the surrounding terrain, it cannot be placed adjacent to other traps. Animals can sense these when calm.</description>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Gas Traps and Shells/Patches/Gas Traps and Shells/Patch_Hediff_Gas.xml b/ModPatches/Gas Traps and Shells/Patches/Gas Traps and Shells/Patch_Hediff_Gas.xml
new file mode 100644
index 0000000000..62ae1aa354
--- /dev/null
+++ b/ModPatches/Gas Traps and Shells/Patches/Gas Traps and Shells/Patch_Hediff_Gas.xml	
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Change Mechanoid Virus to [pending], and make descriptions less cringy... -->
+	<!--	
+<li Class="PatchOperationReplace">
+	<xpath>Defs/HediffDef[defName="ToxicGas"]/description</xpath>
+	<value>
+	<description>Potent nerve agent in the lungs. Affects consciousness and most bodily functions. Can cause dementia and carcinoma at moderate doses, and death at extreme doses.</description>
+	</value>
+</li>
+
+<li Class="PatchOperationReplace">
+	<xpath>Defs/HediffDef[defName="RageGas"]/description</xpath>
+	<value>
+	<description>Induces a blind, uncontrollable rage at moderate doses. Moderately affects bodily functions.</description>
+	</value>
+</li>
+
+<li Class="PatchOperationReplace">
+	<xpath>Defs/HediffDef[defName="TearGas"]/description</xpath>
+	<value>
+	<description>Specialized airbone agent that attacks the sensitive membranes of the eyes and nose, making it difficult to see or breathe.</description>
+	</value>
+</li>
+
+<li Class="PatchOperationReplace">
+	<xpath>Defs/HediffDef[defName="SleepGas"]/description</xpath>
+	<value>
+	<description>Powerful sedative in the lungs, affects consciousness.</description>
+	</value>
+</li>
+
+<li Class="PatchOperationReplace">
+	<xpath>Defs/HediffDef[defName="FearGas"]/description</xpath>
+	<value>
+	<description>Induces an extremely strong feeling of dread and terror.</description>
+	</value>
+</li>
+
+<li Class="PatchOperationReplace">
+	<xpath>Defs/HediffDef[defName="AcidGas"]/description</xpath>
+	<value>
+	<description>Severely irritate and dissolves the lungs. Causes excrutiating pain, vomiting, and death.</description>
+	</value>
+</li>
+
+<li Class="PatchOperationReplace">
+	<xpath>Defs/HediffDef[defName="MechanoidVirus"]/description</xpath>
+	<value>
+	<description>A special blend of mechanites nanomachines that cause chaos inside mechanoids. Causes various and unpredictable effects on mechanoids. Otherwise useless.</description>
+	</value>
+</li>
+
+<li Class="PatchOperationReplace">
+	<xpath>Defs/HediffDef[defName="MechanoidVirus"]/label</xpath>
+	<value>
+	<label>Nanomachine invasion</label>
+	</value>
+</li>
+
+<li Class="PatchOperationReplace">
+	<xpath>Defs/HediffDef[defName="MechStunLoop"]/description</xpath>
+	<value>
+	<description>A failure in the power core is causing this mechanoid to reboot constantly.</description>
+	</value>
+</li>
+
+<li Class="PatchOperationReplace">
+	<xpath>Defs/HediffDef[defName="MechStunLoop"]/label</xpath>
+	<value>
+	<label>Power core failure</label>
+	</value>
+</li>
+
+<li Class="PatchOperationReplace">
+	<xpath>Defs/HediffDef[defName="AntiBugPoison"]/description</xpath>
+	<value>
+	<description>Powerful neurotoxin specifically designed to progessively destroy all bodily functions of insectoids.</description>
+	</value>
+</li>
+-->
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Gas Traps and Shells/Patches/Gas Traps and Shells/Patch_Mortars.xml b/ModPatches/Gas Traps and Shells/Patches/Gas Traps and Shells/Patch_Mortars.xml
new file mode 100644
index 0000000000..f53c571da0
--- /dev/null
+++ b/ModPatches/Gas Traps and Shells/Patches/Gas Traps and Shells/Patch_Mortars.xml	
@@ -0,0 +1,363 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Add Shells to AmmoSet -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_81mmMortarShell"]/ammoTypes</xpath>
+		<value>
+			<Shell_MechVirus>Bullet_Shell_MechVirus</Shell_MechVirus>
+			<Shell_GasAntiBug>Bullet_Shell_GasAntiBug</Shell_GasAntiBug>
+			<Shell_GasToxic>Bullet_Shell_GasToxic</Shell_GasToxic>
+			<Shell_GasRage>Bullet_Shell_GasRage</Shell_GasRage>
+			<Shell_GasTear>Bullet_Shell_GasTear</Shell_GasTear>
+			<Shell_GasSleep>Bullet_Shell_GasSleep</Shell_GasSleep>
+			<Shell_GasFear>Bullet_Shell_GasFear</Shell_GasFear>
+			<Shell_GasAcid>Bullet_Shell_GasAcid</Shell_GasAcid>
+		</value>
+	</Operation>
+
+
+	<!-- Add Shells to AmmoSet -->
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_60mmMortarShell"]/ammoTypes</xpath>
+		<value>
+			<Shell_60mmMortar_ToxicGas>Bullet_60mmMortarShell_60mmMortar_ToxicGas</Shell_60mmMortar_ToxicGas>
+			<Shell_60mmMortar_RageGas>Bullet_60mmMortarShell_60mmMortar_RageGas</Shell_60mmMortar_RageGas>
+			<Shell_60mmMortar_TearGas>Bullet_60mmMortarShell_60mmMortar_TearGas</Shell_60mmMortar_TearGas>
+			<Shell_60mmMortar_SleepGas>Bullet_60mmMortarShell_60mmMortar_SleepGas</Shell_60mmMortar_SleepGas>
+			<Shell_60mmMortar_FearGas>Bullet_60mmMortarShell_60mmMortar_FearGas</Shell_60mmMortar_FearGas>
+			<Shell_60mmMortar_AcidGas>Bullet_60mmMortarShell_60mmMortar_AcidGas</Shell_60mmMortar_AcidGas>
+		</value>
+	</Operation>
+
+	<!-- Add CE Ammo.Def to Shells & Ammo-->
+
+	<Operation Class="PatchOperationAttributeAdd">
+		<xpath>Defs/ThingDef[
+			defName="Shell_GasToxic" or
+			defName="Shell_GasRage" or
+			defName="Shell_GasTear" or
+			defName="Shell_GasSleep" or
+			defName="Shell_GasFear" or
+			defName="Shell_GasAcid" or
+			defName="Shell_GasAntiBug" or
+			defName="Shell_MechVirus" or
+			defName="Bullet_Shell_GasToxic" or
+			defName="Bullet_Shell_GasRage" or
+			defName="Bullet_Shell_GasTear" or
+			defName="Bullet_Shell_GasSleep" or
+			defName="Bullet_Shell_GasFear" or
+			defName="Bullet_Shell_GasAcid" or
+			defName="Bullet_Shell_MechVirus" or
+			defName="Bullet_Shell_GasAntiBug"] </xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<!-- Add New Shell Base-->
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[
+			defName="Shell_GasToxic" or
+			defName="Shell_GasRage" or
+			defName="Shell_GasTear" or
+			defName="Shell_GasSleep" or
+			defName="Shell_GasFear" or
+			defName="Shell_GasAcid" or
+			defName="Shell_GasAntiBug" or
+			defName="Shell_MechVirus"] </xpath>
+		<attribute>ParentName</attribute>
+		<value>81mmMortarShellBaseCraftableBase</value>
+	</Operation>
+
+	<!-- Remove Stuff -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="Shell_GasToxic" or
+			defName="Shell_GasRage" or
+			defName="Shell_GasTear" or
+			defName="Shell_GasSleep" or
+			defName="Shell_GasFear" or
+			defName="Shell_GasAcid" or
+			defName="Shell_GasAntiBug" or
+			defName="Shell_MechVirus"]/projectileWhenLoaded </xpath>
+	</Operation>
+
+	<!-- Add Shell Mass-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="Shell_GasToxic" or
+			defName="Shell_GasRage" or
+			defName="Shell_GasTear" or
+			defName="Shell_GasSleep" or
+			defName="Shell_GasFear" or
+			defName="Shell_GasAcid" or
+			defName="Shell_GasAntiBug" or
+			defName="Shell_MechVirus"] </xpath>
+		<value>
+			<statBases>
+				<Mass>4.3</Mass>
+				<Bulk>5</Bulk>
+			</statBases>
+		</value>
+	</Operation>
+
+	<!-- Add Shell Ammo Type-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Shell_GasToxic"]</xpath>
+		<value>
+			<ammoClass>GasToxic</ammoClass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Shell_GasRage"]</xpath>
+		<value>
+			<ammoClass>GasRage</ammoClass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Shell_GasTear"]</xpath>
+		<value>
+			<ammoClass>GasTear</ammoClass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Shell_GasFear"]</xpath>
+		<value>
+			<ammoClass>GasFear</ammoClass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Shell_GasSleep"]</xpath>
+		<value>
+			<ammoClass>GasSleep</ammoClass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Shell_GasAcid"]</xpath>
+		<value>
+			<ammoClass>GasAcid</ammoClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Shell_MechVirus"]</xpath>
+		<value>
+			<ammoClass>MechVirus</ammoClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Shell_GasAntiBug"]</xpath>
+		<value>
+			<ammoClass>AntiBug</ammoClass>
+		</value>
+	</Operation>
+
+	<!-- Add CE Explosives Comps to Shells -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Shell_GasToxic"]/comps</xpath>
+		<value>
+			<comps>
+				<li Class="CompProperties_Explosive">
+					<explosiveRadius>5.9</explosiveRadius>
+					<explosiveDamageType>Smoke</explosiveDamageType>
+					<explosiveExpandPerStackcount>0.4</explosiveExpandPerStackcount>
+					<startWickHitPointsPercent>0.333</startWickHitPointsPercent>
+					<postExplosionSpawnThingDef>ToxicGas</postExplosionSpawnThingDef>
+					<postExplosionSpawnChance>1.0</postExplosionSpawnChance>
+					<wickTicks>
+						<min>10</min>
+						<max>30</max>
+					</wickTicks>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Shell_GasRage"]/comps</xpath>
+		<value>
+			<comps>
+				<li Class="CompProperties_Explosive">
+					<explosiveRadius>5.9</explosiveRadius>
+					<explosiveDamageType>Smoke</explosiveDamageType>
+					<explosiveExpandPerStackcount>0.4</explosiveExpandPerStackcount>
+					<startWickHitPointsPercent>0.333</startWickHitPointsPercent>
+					<postExplosionSpawnThingDef>RageGas</postExplosionSpawnThingDef>
+					<postExplosionSpawnChance>1.0</postExplosionSpawnChance>
+					<wickTicks>
+						<min>10</min>
+						<max>30</max>
+					</wickTicks>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Shell_GasTear"]/comps</xpath>
+		<value>
+			<comps>
+				<li Class="CompProperties_Explosive">
+					<explosiveRadius>5.9</explosiveRadius>
+					<explosiveDamageType>Smoke</explosiveDamageType>
+					<explosiveExpandPerStackcount>0.4</explosiveExpandPerStackcount>
+					<startWickHitPointsPercent>0.333</startWickHitPointsPercent>
+					<postExplosionSpawnThingDef>TearGas</postExplosionSpawnThingDef>
+					<postExplosionSpawnChance>1.0</postExplosionSpawnChance>
+					<wickTicks>
+						<min>10</min>
+						<max>30</max>
+					</wickTicks>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Shell_GasSleep"]/comps</xpath>
+		<value>
+			<comps>
+				<li Class="CompProperties_Explosive">
+					<explosiveRadius>5.9</explosiveRadius>
+					<explosiveDamageType>Smoke</explosiveDamageType>
+					<explosiveExpandPerStackcount>0.4</explosiveExpandPerStackcount>
+					<startWickHitPointsPercent>0.333</startWickHitPointsPercent>
+					<postExplosionSpawnThingDef>SleepGas</postExplosionSpawnThingDef>
+					<postExplosionSpawnChance>1.0</postExplosionSpawnChance>
+					<wickTicks>
+						<min>10</min>
+						<max>30</max>
+					</wickTicks>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Shell_GasFear"]/comps</xpath>
+		<value>
+			<comps>
+				<li Class="CompProperties_Explosive">
+					<explosiveRadius>5.9</explosiveRadius>
+					<explosiveDamageType>Smoke</explosiveDamageType>
+					<explosiveExpandPerStackcount>0.4</explosiveExpandPerStackcount>
+					<startWickHitPointsPercent>0.333</startWickHitPointsPercent>
+					<postExplosionSpawnThingDef>FearGas</postExplosionSpawnThingDef>
+					<postExplosionSpawnChance>1.0</postExplosionSpawnChance>
+					<wickTicks>
+						<min>10</min>
+						<max>30</max>
+					</wickTicks>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Shell_GasAcid"]/comps</xpath>
+		<value>
+			<comps>
+				<li Class="CompProperties_Explosive">
+					<explosiveRadius>5.9</explosiveRadius>
+					<explosiveDamageType>Smoke</explosiveDamageType>
+					<explosiveExpandPerStackcount>0.4</explosiveExpandPerStackcount>
+					<startWickHitPointsPercent>0.333</startWickHitPointsPercent>
+					<postExplosionSpawnThingDef>AcidGas</postExplosionSpawnThingDef>
+					<postExplosionSpawnChance>1.0</postExplosionSpawnChance>
+					<wickTicks>
+						<min>10</min>
+						<max>30</max>
+					</wickTicks>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Shell_MechVirus"]/comps</xpath>
+		<value>
+			<comps>
+				<li Class="CompProperties_Explosive">
+					<explosiveRadius>5.9</explosiveRadius>
+					<explosiveDamageType>Smoke</explosiveDamageType>
+					<explosiveExpandPerStackcount>0.4</explosiveExpandPerStackcount>
+					<startWickHitPointsPercent>0.333</startWickHitPointsPercent>
+					<postExplosionSpawnThingDef>MechanoidVirusGas</postExplosionSpawnThingDef>
+					<postExplosionSpawnChance>1.0</postExplosionSpawnChance>
+					<wickTicks>
+						<min>10</min>
+						<max>30</max>
+					</wickTicks>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Shell_GasAntiBug"]/comps</xpath>
+		<value>
+			<comps>
+				<li Class="CompProperties_Explosive">
+					<explosiveRadius>5.9</explosiveRadius>
+					<explosiveDamageType>Smoke</explosiveDamageType>
+					<explosiveExpandPerStackcount>0.4</explosiveExpandPerStackcount>
+					<startWickHitPointsPercent>0.333</startWickHitPointsPercent>
+					<postExplosionSpawnThingDef>AntiBugGas</postExplosionSpawnThingDef>
+					<postExplosionSpawnChance>1.0</postExplosionSpawnChance>
+					<wickTicks>
+						<min>10</min>
+						<max>30</max>
+					</wickTicks>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- Add New Bullet Base-->
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[
+			defName="Bullet_Shell_GasToxic" or
+			defName="Bullet_Shell_GasRage" or
+			defName="Bullet_Shell_GasTear" or
+			defName="Bullet_Shell_GasSleep" or
+			defName="Bullet_Shell_GasFear" or
+			defName="Bullet_Shell_GasAcid" or
+			defName="Bullet_Shell_MechVirus" or
+			defName="Bullet_Shell_GasAntiBug"] </xpath>
+		<attribute>ParentName</attribute>
+		<value>Base81mmMortarShell</value>
+	</Operation>
+
+	<!-- Projectiles -->
+	<Operation Class="PatchOperationAttributeAdd">
+		<xpath>Defs/ThingDef[
+			defName="Bullet_Shell_GasToxic" or
+			defName="Bullet_Shell_GasRage" or
+			defName="Bullet_Shell_GasTear" or
+			defName="Bullet_Shell_GasSleep" or
+			defName="Bullet_Shell_GasFear" or
+			defName="Bullet_Shell_GasAcid" or
+			defName="Bullet_Shell_MechVirus" or
+			defName="Bullet_Shell_GasAntiBug"]/projectile </xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.ProjectilePropertiesCE</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Bullet_Shell_GasToxic" or
+			defName="Bullet_Shell_GasRage" or
+			defName="Bullet_Shell_GasTear" or
+			defName="Bullet_Shell_GasSleep" or
+			defName="Bullet_Shell_GasFear" or
+			defName="Bullet_Shell_GasAcid" or
+			defName="Bullet_Shell_MechVirus" or
+			defName="Bullet_Shell_GasAntiBug"]/thingClass </xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Gestalt Engine/Patches/Gestalt Engine/ThingDefs_Races/Matriach.xml b/ModPatches/Gestalt Engine/Patches/Gestalt Engine/ThingDefs_Races/Matriach.xml
new file mode 100644
index 0000000000..4ce7fbadc9
--- /dev/null
+++ b/ModPatches/Gestalt Engine/Patches/Gestalt Engine/ThingDefs_Races/Matriach.xml	
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RM_Mech_Matriarch"]/statBases</xpath>
+		<value>
+			<PartialArmorBody>0</PartialArmorBody>
+		</value>
+	</Operation>
+
+	<!--Consistency with vanilla mechs-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RM_Mech_Matriarch"]/statBases</xpath>
+		<value>
+			<SmokeSensitivity>0</SmokeSensitivity>
+			<NightVisionEfficiency>0.80</NightVisionEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RM_Mech_Matriarch"]/statBases</xpath>
+		<value>
+			<CarryWeight>30</CarryWeight>
+			<CarryBulk>40</CarryBulk>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.06</MeleeCritChance>
+			<MeleeParryChance>0.12</MeleeParryChance>
+			<MaxHitPoints>100</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RM_Mech_Matriarch"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RM_Mech_Matriarch"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RM_Mech_Matriarch"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>3.51</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>false</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.51</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.51</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Giddy-Up 2/Patches/Giddy-Up 2/Job_Patch.xml b/ModPatches/Giddy-Up 2/Patches/Giddy-Up 2/Job_Patch.xml
new file mode 100644
index 0000000000..994e441acc
--- /dev/null
+++ b/ModPatches/Giddy-Up 2/Patches/Giddy-Up 2/Job_Patch.xml	
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/JobDef[defName="ReloadWeapon"]</xpath>
+		<value>
+			<li Class="GiddyUp.CanDoMounted"/>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Girls Frontline Apparel Pack/Patches/Girls Frontline Apparel Pack/ThingDefs_Misc/ThingDef_Apparel.xml b/ModPatches/Girls Frontline Apparel Pack/Patches/Girls Frontline Apparel Pack/ThingDefs_Misc/ThingDef_Apparel.xml
new file mode 100644
index 0000000000..80156437b2
--- /dev/null
+++ b/ModPatches/Girls Frontline Apparel Pack/Patches/Girls Frontline Apparel Pack/ThingDefs_Misc/ThingDef_Apparel.xml	
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[@Name="GF_Making_puppet_clothes"]/recipeMaker/recipeUsers</xpath>
+	<value>
+		<recipeUsers>
+			<li>TableMachining</li>
+		</recipeUsers>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[
+		defName="AR_M4Costume" or
+		defName="AR_M16A1Costume" or
+		defName="AR_M16A1Costume_b" or
+		defName="AR_M4SOPIICostume" or
+		defName="AR_AR15Costume" or
+		defName="AR_RO635Costume" or
+		defName="404_HK416Costume" or
+		defName="404_G11Costume" or
+		defName="404_UMP9Costume" or
+		defName="404_UMP40Costume" or
+		defName="404_UMP45Costume" or
+		defName="Defy_AK12Costume" or
+		defName="Defy_AN94Costume" or
+		defName="Kanade_NEGEVCostume" or
+		defName="Kanade_IWS2000Costume" or
+		defName="Kanade_JERICHOCostume"
+		]/statBases/ArmorRating_Sharp</xpath>
+	<value>
+		<Bulk>5</Bulk>
+		<WornBulk>5</WornBulk>
+		<ArmorRating_Sharp>2</ArmorRating_Sharp>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[
+		defName="AR_M4Costume" or
+		defName="AR_M16A1Costume" or
+		defName="AR_M16A1Costume_b" or
+		defName="AR_M4SOPIICostume" or
+		defName="AR_AR15Costume" or
+		defName="AR_RO635Costume" or
+		defName="404_HK416Costume" or
+		defName="404_G11Costume" or
+		defName="404_UMP9Costume" or
+		defName="404_UMP40Costume" or
+		defName="404_UMP45Costume" or
+		defName="Defy_AK12Costume" or
+		defName="Defy_AN94Costume" or
+		defName="Kanade_NEGEVCostume" or
+		defName="Kanade_IWS2000Costume" or
+		defName="Kanade_JERICHOCostume"
+		]/statBases/StuffEffectMultiplierArmor</xpath>
+	<value>
+		<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[
+		defName="AR_M4Costume" or
+		defName="AR_M16A1Costume" or
+		defName="AR_M16A1Costume_b" or
+		defName="AR_M4SOPIICostume" or
+		defName="AR_AR15Costume" or
+		defName="AR_RO635Costume" or
+		defName="404_HK416Costume" or
+		defName="404_G11Costume" or
+		defName="404_UMP9Costume" or
+		defName="404_UMP40Costume" or
+		defName="404_UMP45Costume" or
+		defName="Defy_AK12Costume" or
+		defName="Defy_AN94Costume" or
+		defName="Kanade_NEGEVCostume" or
+		defName="Kanade_IWS2000Costume" or
+		defName="Kanade_JERICHOCostume"
+		]/statBases/ArmorRating_Blunt</xpath>
+	<value>
+		<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[
+		defName="AR_M4SOPIICostume" or
+		defName="Kanade_JERICHOCostume"
+		]/equippedStatOffsets/MeleeDodgeChance</xpath>
+	<value>
+		<MeleeDodgeChance>0.25</MeleeDodgeChance>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="AR_M4SOPIICostume"]/equippedStatOffsets/MeleeHitChance</xpath>
+	<value>
+		<MeleeHitChance>1</MeleeHitChance>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Kanade_JERICHOCostume"]/equippedStatOffsets/MeleeHitChance</xpath>
+	<value>
+		<MeleeHitChance>1.5</MeleeHitChance>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="Defy_AN94_Mask" or defName="Defy_AK12_Mask"]/equippedStatOffsets</xpath>
+	<value>
+		<SmokeSensitivity>-0.25</SmokeSensitivity>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="404_G11Hat"]/statBases/StuffEffectMultiplierArmor</xpath>
+	<value>
+		<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		<WornBulk>0</WornBulk>
+	</value>
+</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Girls Frontline Styles 404 Team/Patches/Girls Frontline Styles 404 Team/ThingDefs_Misc/Apparel_404Team.xml b/ModPatches/Girls Frontline Styles 404 Team/Patches/Girls Frontline Styles 404 Team/ThingDefs_Misc/Apparel_404Team.xml
new file mode 100644
index 0000000000..ea15d119a4
--- /dev/null
+++ b/ModPatches/Girls Frontline Styles 404 Team/Patches/Girls Frontline Styles 404 Team/ThingDefs_Misc/Apparel_404Team.xml	
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--416 Hat-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RFGirlsFrontline_HK416hat"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>9.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RFGirlsFrontline_HK416hat"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>0.05</ShootingAccuracyPawn>
+			<AimingAccuracy>0.025</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!--G11 Hat-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RFGirlsFrontline_G11hat"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!--All Uniforms-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RFGirlsFrontline_HK416uni" or
+			defName="RFGirlsFrontline_G11uni" or
+			defName="RFGirlsFrontline_UMP9uni" or
+			defName="RFGirlsFrontline_UMP45uni"
+			]/statBases </xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>8</WornBulk>
+		</value>
+	</Operation>
+
+	<!--416 Uniform-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RFGirlsFrontline_HK416uni"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RFGirlsFrontline_HK416uni"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.696</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RFGirlsFrontline_HK416uni"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+			<AimingAccuracy>0.075</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!--G11 Uniform-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RFGirlsFrontline_G11uni"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RFGirlsFrontline_G11uni"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.168</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--UMP9 Uniform-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RFGirlsFrontline_UMP9uni"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6.56</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RFGirlsFrontline_UMP9uni"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--UMP45 Uniform-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RFGirlsFrontline_UMP45uni"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>9.06</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RFGirlsFrontline_UMP45uni"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.48</ArmorRating_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Girls Frontline Styles AR Team/Patches/Girls Frontline Styles AR Team/ThingDefs_Misc/Apparel_ARTeam.xml b/ModPatches/Girls Frontline Styles AR Team/Patches/Girls Frontline Styles AR Team/ThingDefs_Misc/Apparel_ARTeam.xml
new file mode 100644
index 0000000000..433190fff2
--- /dev/null
+++ b/ModPatches/Girls Frontline Styles AR Team/Patches/Girls Frontline Styles AR Team/ThingDefs_Misc/Apparel_ARTeam.xml	
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--M4A1 Hat-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RFGirlsFrontline_M4A1headset"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>9</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RFGirlsFrontline_M4A1headset"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>11</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--M4SOP2 Hat-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RFGirlsFrontline_M4SOP2headset"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10.2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RFGirlsFrontline_M4SOP2headset"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>8.1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RFGirlsFrontline_M4SOP2headset"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>0.05</ShootingAccuracyPawn>
+			<AimingAccuracy>0.025</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!--All Uniforms-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RFGirlsFrontline_M4A1uni" or
+			defName="RFGirlsFrontline_AR15uni" or
+			defName="RFGirlsFrontline_M4SOP2uni" or
+			defName="RFGirlsFrontline_RO635uni" or
+			defName="RFGirlsFrontline_M16A1uni"
+			]/statBases </xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>8</WornBulk>
+		</value>
+	</Operation>
+
+	<!--M4A1 Uniform-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RFGirlsFrontline_M4A1uni"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RFGirlsFrontline_M4A1uni"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.84</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RFGirlsFrontline_M4A1uni"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>0.08</ShootingAccuracyPawn>
+			<AimingAccuracy>0.04</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!--AR15 Uniform-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RFGirlsFrontline_AR15uni"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5.65</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RFGirlsFrontline_AR15uni"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.48</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--M4SOP2 Uniform-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RFGirlsFrontline_M4SOP2uni"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>7.20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RFGirlsFrontline_M4SOP2uni"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.96</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RFGirlsFrontline_M4SOP2uni"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+			<AimingAccuracy>0.075</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!--RO635 Uniform-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RFGirlsFrontline_RO635uni"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5.95</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RFGirlsFrontline_RO635uni"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.72</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RFGirlsFrontline_RO635uni"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.0635</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!--M16A4 Uniform-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RFGirlsFrontline_M16A1uni"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RFGirlsFrontline_M16A1uni"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.39</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RFGirlsFrontline_M16A1uni"]/equippedStatOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Girls Frontline Weapon Pack/Patches/Girls Frontline Weapon Pack/ThingsDef_Misc/GFWeapons.xml b/ModPatches/Girls Frontline Weapon Pack/Patches/Girls Frontline Weapon Pack/ThingsDef_Misc/GFWeapons.xml
new file mode 100644
index 0000000000..c9ad281a2e
--- /dev/null
+++ b/ModPatches/Girls Frontline Weapon Pack/Patches/Girls Frontline Weapon Pack/ThingsDef_Misc/GFWeapons.xml	
@@ -0,0 +1,779 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="G_M4A1_AR" or
+			defName="G_M16A1_AR" or
+			defName="G_AR15_AR" or
+			defName="G_SOPMODII_AR" or
+			defName="G_HK416_AR" or
+			defName="G_NEGEV_MG" or
+			defName="G_G11_AR" or
+			defName="G_AK12_AR" or
+			defName="G_AN94_AR" or
+			defName="G_RO635_SMG" or
+			defName="G_UMP9_SMG" or
+			defName="G_UMP40_SMG" or
+			defName="G_UMP45_SMG" or
+			defName="G_IWS2000_RF" or
+			defName="G_MobileFireSupportPlatform"]/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="G_JERICHO_HG"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--M4A1-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>G_M4A1_AR</defName>
+		<statBases>
+			<Bulk>7.56</Bulk>
+			<Mass>3.01</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<SwayFactor>1.14</SwayFactor>
+			<ShotSpread>0.1</ShotSpread>
+			<WorkToMake>33500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<Chemfuel>10</Chemfuel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.60</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>GF556NatoFire</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!--M16A1-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>G_M16A1_AR</defName>
+		<statBases>
+			<Bulk>10.03</Bulk>
+			<Mass>3.26</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<SwayFactor>1.33</SwayFactor>
+			<ShotSpread>0.07</ShotSpread>
+			<WorkToMake>30000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<Chemfuel>10</Chemfuel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>GF556NatoFire</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!--AR 15-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>G_AR15_AR</defName>
+		<statBases>
+			<Bulk>9.05</Bulk>
+			<Mass>3.26</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.48</SightsEfficiency>
+			<SwayFactor>1.31</SwayFactor>
+			<ShotSpread>0.09</ShotSpread>
+			<WorkToMake>37000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>45</Steel>
+			<Chemfuel>10</Chemfuel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>AR15Fire</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!--SOPMODII-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>G_SOPMODII_AR</defName>
+		<statBases>
+			<Bulk>7.56</Bulk>
+			<Mass>3.01</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<SwayFactor>1.14</SwayFactor>
+			<ShotSpread>0.1</ShotSpread>
+			<WorkToMake>33500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<Chemfuel>10</Chemfuel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.60</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>GF556NatoFire</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!--HK416_AR-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>G_HK416_AR</defName>
+		<statBases>
+			<Bulk>7.09</Bulk>
+			<Mass>3.12</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<SwayFactor>1.12</SwayFactor>
+			<ShotSpread>0.12</ShotSpread>
+			<WorkToMake>32500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>45</Steel>
+			<Chemfuel>5</Chemfuel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.57</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>48</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>GF556NatoFire</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!--Negev-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>G_NEGEV_MG</defName>
+		<statBases>
+			<Bulk>11.10</Bulk>
+			<Mass>7.65</Mass>
+			<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<SwayFactor>1.25</SwayFactor>
+			<ShotSpread>0.08</ShotSpread>
+			<WorkToMake>38500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>80</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>0.93</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>55</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>GF556NatoFire</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>150</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!--G 11-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>G_G11_AR</defName>
+		<statBases>
+			<Bulk>7.50</Bulk>
+			<Mass>3.65</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.21</SightsEfficiency>
+			<SwayFactor>1.15</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<WorkToMake>34000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>45</Steel>
+			<Chemfuel>10</Chemfuel>
+			<ComponentIndustrial>8</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.30</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_473x33mmCaseless_FMJ</defaultProjectile>
+			<warmupTime>1.275</warmupTime>
+			<range>48</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>G11Fire</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_473x33mmCaseless</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!--AK12-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>G_AK12_AR</defName>
+		<statBases>
+			<Bulk>7.25</Bulk>
+			<Mass>3.3</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<SwayFactor>1.28</SwayFactor>
+			<ShotSpread>0.09</ShotSpread>
+			<WorkToMake>32500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<Chemfuel>10</Chemfuel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.38</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>51</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>AK12Fire</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>60</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!--AN94-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>G_AN94_AR</defName>
+		<statBases>
+			<Bulk>9.43</Bulk>
+			<Mass>3.85</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<SwayFactor>1.33</SwayFactor>
+			<ShotSpread>0.09</ShotSpread>
+			<WorkToMake>32500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<Chemfuel>10</Chemfuel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.38</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>64</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>AN94Fire</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>45</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!--RO365-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>G_RO635_SMG</defName>
+		<statBases>
+			<Bulk>6.50</Bulk>
+			<Mass>2.61</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<SwayFactor>0.99</SwayFactor>
+			<ShotSpread>0.12</ShotSpread>
+			<WorkToMake>29500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>45</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.46</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>9MMFIRE</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!--UMP9-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>G_UMP9_SMG</defName>
+		<statBases>
+			<Bulk>4.50</Bulk>
+			<Mass>2.3</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<SwayFactor>0.92</SwayFactor>
+			<ShotSpread>0.14</ShotSpread>
+			<WorkToMake>30500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<Chemfuel>10</Chemfuel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.41</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>20</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>9MMFIRE</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<researchPrerequisite>BlowbackOperation</researchPrerequisite>
+	</Operation>
+
+	<!--Jericho-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>G_JERICHO_HG</defName>
+		<statBases>
+			<Bulk>2.07</Bulk>
+			<Mass>1.05</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<SwayFactor>1.04</SwayFactor>
+			<ShotSpread>0.17</ShotSpread>
+			<WorkToMake>7000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>9MMFIRE</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>16</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+		<researchPrerequisite>BlowbackOperation</researchPrerequisite>
+	</Operation>
+
+	<!--UMP40-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>G_UMP40_SMG</defName>
+		<statBases>
+			<Bulk>4.50</Bulk>
+			<Mass>2.3</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<SwayFactor>0.92</SwayFactor>
+			<ShotSpread>0.14</ShotSpread>
+			<WorkToMake>30500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<Chemfuel>10</Chemfuel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.78</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_40SW_FMJ</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>20</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>45ACPFIRE</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_40SW</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<researchPrerequisite>BlowbackOperation</researchPrerequisite>
+	</Operation>
+
+	<!--UMP45-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>G_UMP45_SMG</defName>
+		<statBases>
+			<Bulk>4.50</Bulk>
+			<Mass>2.5</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<SwayFactor>0.92</SwayFactor>
+			<ShotSpread>0.14</ShotSpread>
+			<WorkToMake>30500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<Chemfuel>10</Chemfuel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.08</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>15</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>45ACPFIRE</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<researchPrerequisite>BlowbackOperation</researchPrerequisite>
+	</Operation>
+
+	<!--IWS2000-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>G_IWS2000_RF</defName>
+		<statBases>
+			<Bulk>19.00</Bulk>
+			<Mass>18.00</Mass>
+			<RangedWeapon_Cooldown>1.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.6</SightsEfficiency>
+			<SwayFactor>2.59</SwayFactor>
+			<ShotSpread>0.01</ShotSpread>
+			<WorkToMake>45500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>110</Steel>
+			<Chemfuel>30</Chemfuel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_152x169mm_Sabot</defaultProjectile>
+			<warmupTime>3.3</warmupTime>
+			<range>86</range>
+			<soundCast>GF50SniperFire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_152x169mm</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!--Mobile Fire Support Platform-->
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>SheathYourSword</li>
+		</mods>
+		<nomatch Class="PatchOperationRemove">
+			<xpath>Defs/ThingDef[defName="G_MobileFireSupportPlatform"]/comps/li[@Class="SYS.CompProperties_Sheath"]</xpath>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>G_MobileFireSupportPlatform</defName>
+		<statBases>
+			<Bulk>20.00</Bulk>
+			<Mass>15.00</Mass>
+			<RangedWeapon_Cooldown>2.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<SwayFactor>3.20</SwayFactor>
+			<ShotSpread>0.07</ShotSpread>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_80x256mmFuel_Incendiary</defaultProjectile>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<warmupTime>1.9</warmupTime>
+			<range>48</range>
+			<soundCast>MFSP</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>9.1</reloadTime>
+			<ammoSet>AmmoSet_80x256mmFuel</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Glitter Tech/Defs/Glitter Tech/GlitterTech_CE_Patch_Ammo_Shells.xml b/ModPatches/Glitter Tech/Defs/Glitter Tech/GlitterTech_CE_Patch_Ammo_Shells.xml
new file mode 100644
index 0000000000..8c16366e73
--- /dev/null
+++ b/ModPatches/Glitter Tech/Defs/Glitter Tech/GlitterTech_CE_Patch_Ammo_Shells.xml	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- ========== Dynamically create new ammosets for GT mortar turrets ========== -->
+
+	<!-- Automatic Mortar -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_81mmMortarShell_GlitterTechAutoMortar</defName>
+		<label>81mm mortar shells</label>
+		<ammoTypes>
+			<Shell_HighExplosive>Bullet_81mmMortarShell_HE</Shell_HighExplosive>
+			<Shell_Incendiary>Bullet_81mmMortarShell_Incendiary</Shell_Incendiary>
+			<Shell_Firefoam>Bullet_81mmMortarShell_Firefoam</Shell_Firefoam>
+			<Shell_AntigrainWarhead>Bullet_81mmMortarShell_Antigrain</Shell_AntigrainWarhead>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- Automatic Cluster Mortar -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_81mmMortarShell_GlitterTechClusterMortar</defName>
+		<label>81mm mortar shells</label>
+		<ammoTypes>
+			<Shell_HighExplosive>Bullet_81mmMortarShell_HE</Shell_HighExplosive>
+			<Shell_Incendiary>Bullet_81mmMortarShell_Incendiary</Shell_Incendiary>
+			<Shell_Firefoam>Bullet_81mmMortarShell_Firefoam</Shell_Firefoam>
+			<Shell_AntigrainWarhead>Bullet_81mmMortarShell_Antigrain</Shell_AntigrainWarhead>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- Automatic EMP Mortar -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_81mmMortarShell_GlitterTechEMPAMortar</defName>
+		<label>81mm mortar shells</label>
+		<ammoTypes>
+			<Shell_EMP>Bullet_81mmMortarShell_EMP</Shell_EMP>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Apparel_AdvancedShield.xml b/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Apparel_AdvancedShield.xml
new file mode 100644
index 0000000000..8ad12fd33c
--- /dev/null
+++ b/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Apparel_AdvancedShield.xml	
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== HC-1 shield ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_HC1Shield"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- ========== Orion Corp defense shield ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_OCShield"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Apparel_NanoSuitArmour.xml b/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Apparel_NanoSuitArmour.xml
new file mode 100644
index 0000000000..3fa5738caf
--- /dev/null
+++ b/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Apparel_NanoSuitArmour.xml	
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Nano Suit ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_NanoSuit"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_NanoSuit"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>15</CarryBulk>
+			<CarryWeight>50</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_NanoSuit"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>32</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_NanoSuit"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_NanoSuit"]/statBases</xpath>
+		<value>
+			<ArmorRating_Electric>0.8</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<!-- ========== Nano Suit helmet ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_NanoSuitHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_NanoSuitHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>24</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_NanoSuitHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_NanoSuitHelmet"]/statBases</xpath>
+		<value>
+			<ArmorRating_Electric>0.8</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<!-- ========== Reactive Suit ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_Reactive"]/statBases</xpath>
+		<value>
+			<Bulk>20</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Reactive"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>40</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Reactive"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- ========== Fibre Skin Suit ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_NanoSkin"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>28</ArmorRating_Blunt>
+			<Bulk>3</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_NanoSkin"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- ========== Speed Skin Suit ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_NanoSpeed"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+			<Bulk>3</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_NanoSpeed"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Apparel_OrionCo.xml b/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Apparel_OrionCo.xml
new file mode 100644
index 0000000000..2be7696e5c
--- /dev/null
+++ b/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Apparel_OrionCo.xml	
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Orion Corporation Helmet ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_OCHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_OCHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>22</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_OCHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- ========== Orion Unfiorm Shirt and Pants ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Apparel_OCShirt" or
+			defName="Apparel_OCPants"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+			<Bulk>1</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Apparel_OCShirt" or
+			defName="Apparel_OCPants"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_HeDiffs_AddedParts.xml b/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_HeDiffs_AddedParts.xml
new file mode 100644
index 0000000000..27bddcb2c0
--- /dev/null
+++ b/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_HeDiffs_AddedParts.xml	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Advanced bionic arm ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GTArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/verbs</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power><!-- between vanilla Bionic and Archotech Arms -->
+					<cooldownTime>1.11</cooldownTime>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Advanced bionic hand ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GTHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/verbs</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power><!-- between vanilla Bionic and Archotech Arms -->
+					<cooldownTime>1.11</cooldownTime>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_HeDiffs_OCAddedParts.xml b/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_HeDiffs_OCAddedParts.xml
new file mode 100644
index 0000000000..68eb6e625b
--- /dev/null
+++ b/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_HeDiffs_OCAddedParts.xml	
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Orion Exoskeleton ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="OCExo"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/verbs</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>0.83</cooldownTime>
+					<armorPenetrationBlunt>3.00</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_PawnKindDefs.xml b/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_PawnKindDefs.xml
new file mode 100644
index 0000000000..335af33f45
--- /dev/null
+++ b/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_PawnKindDefs.xml	
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Commandos and Orion Corp faction pawns should spawn with ammo appropriate to their primary weapon ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="ComBase" or @Name="OCBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Commandos and Orion Corp faction pawns should spawn backpacks, allowing them to carry extra inventory such as ammo ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="Commando" or
+			defName="CommandoH" or
+			defName="CommandoScout" or
+			defName="OCSoldier" or
+			defName="OCHeavy" or
+			defName="OCPeaceKeeper" or
+			defName="OCDirector"] </xpath>
+		<value>
+			<apparelRequired>
+				<li>CE_Apparel_Backpack</li>
+			</apparelRequired>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_TraderKinds.xml b/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_TraderKinds.xml
new file mode 100644
index 0000000000..1f4296058c
--- /dev/null
+++ b/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_TraderKinds.xml	
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Allow Black Market traders to sell (lots!) of CE ammo and turrets -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="BlackMarket"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Ammo</tradeTag>
+				<countRange>
+					<min>1000</min>
+					<max>3000</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>18</min>
+					<max>24</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_HeavyAmmo</tradeTag>
+				<countRange>
+					<min>10</min>
+					<max>50</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>4</min>
+					<max>6</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_MediumAmmo</tradeTag>
+				<countRange>
+					<min>30</min>
+					<max>60</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>3</min>
+					<max>6</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Category">
+				<categoryDef>Ammo</categoryDef>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>0</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Turret</tradeTag>
+				<thingDefCountRange>
+					<min>-2</min>
+					<max>4</max>
+				</thingDefCountRange>
+				<countRange>
+					<min>1</min>
+					<max>2</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_Category">
+				<categoryDef>WeaponsTurrets</categoryDef>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>0</max>
+				</thingDefCountRange>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Turrets.xml b/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Turrets.xml
new file mode 100644
index 0000000000..ec89f1df8b
--- /dev/null
+++ b/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Turrets.xml	
@@ -0,0 +1,406 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== EMRG turret ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_EMRGTurret</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.19</SwayFactor>
+			<Bulk>8.94</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12mmRailgun_Sabot</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>86</range>
+			<soundCast>EM</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<requireLineOfSight>false</requireLineOfSight>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_12mmRailgun</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="EMTurret"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>2.5</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="EMTurret"]/statBases</xpath>
+		<value>
+			<WorkToBuild>83500</WorkToBuild>
+			<Bulk>15</Bulk>
+		</value>
+	</Operation>
+
+	<!-- ========== Canister turret ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_CanisterTurret</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>2.02</SwayFactor>
+			<Bulk>10.66</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.34</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<burstShotCount>6</burstShotCount>
+			<soundCast>Shot_IncendiaryLauncher</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<requireLineOfSight>false</requireLineOfSight>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>6</aimedBurstShotCount>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CanisterTurret"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>1.1</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CanisterTurret"]/statBases</xpath>
+		<value>
+			<WorkToBuild>89500</WorkToBuild>
+			<Bulk>20</Bulk>
+		</value>
+	</Operation>
+
+	<!-- ========== Automatic mortar ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Auto_Artillery_Mortar</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>0.1</SwayFactor>
+			<Bulk>12.9</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+			<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_81mmMortarShell_HE</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<minRange>30</minRange>
+			<range>500</range>
+			<burstShotCount>1</burstShotCount>
+			<soundCast>Mortar_LaunchA</soundCast>
+			<muzzleFlashScale>16</muzzleFlashScale>
+			<requireLineOfSight>false</requireLineOfSight>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_81mmMortarShell_GlitterTechAutoMortar</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Automatic cluster mortar ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Auto_Cluster_Mortar</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>0.1</SwayFactor>
+			<Bulk>12.9</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+			<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_81mmMortarShell_HE</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<minRange>30</minRange>
+			<range>500</range>
+			<burstShotCount>5</burstShotCount>
+			<soundCast>Mortar_LaunchA</soundCast>
+			<muzzleFlashScale>16</muzzleFlashScale>
+			<requireLineOfSight>false</requireLineOfSight>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_81mmMortarShell_GlitterTechClusterMortar</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Automatic EMP mortar ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Auto_EMP_Mortar</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>0.1</SwayFactor>
+			<Bulk>12.9</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+			<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_81mmMortarShell_EMP</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<minRange>30</minRange>
+			<range>500</range>
+			<burstShotCount>5</burstShotCount>
+			<soundCast>Mortar_LaunchA</soundCast>
+			<muzzleFlashScale>16</muzzleFlashScale>
+			<requireLineOfSight>false</requireLineOfSight>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_81mmMortarShell_GlitterTechEMPAMortar</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Long range missile turret ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_RocketswarmLauncher_GT</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>0.1</SwayFactor>
+			<Bulk>12.9</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+			<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_70mmAPKWS_HEAT</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<minRange>30</minRange>
+			<range>500</range>
+			<burstShotCount>25</burstShotCount>
+			<soundCast>Missile_small</soundCast>
+			<muzzleFlashScale>16</muzzleFlashScale>
+			<requireLineOfSight>false</requireLineOfSight>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_70mmAPKWS</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Cruise missile turret ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_CMissileTurret</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>0.1</SwayFactor>
+			<Bulk>12.9</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+			<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_TomahawkLAM</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<minRange>30</minRange>
+			<range>500</range>
+			<burstShotCount>1</burstShotCount>
+			<soundCast>Missile_large</soundCast>
+			<muzzleFlashScale>16</muzzleFlashScale>
+			<requireLineOfSight>false</requireLineOfSight>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_TomahawkLAM</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Shared settings for direct-fire turrets ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="EMTurret" or
+			defName="CanisterTurret"
+			] </xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="EMTurret" or
+			defName="CanisterTurret"
+			]/statBases/ShootingAccuracyTurret </xpath>
+		<value>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyTurret>1.0</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<!-- Allows turrets to be fired from behind CE embrasures -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="EMTurret" or
+			defName="CanisterTurret"
+			] </xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<!-- ========== Shared settings for mortar and missile Turrets ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="Auto_Artillery_Mortar" or
+			defName="Auto_Cluster_Mortar" or
+			defName="Auto_EMP_Mortar" or
+			defName="Gun_RocketswarmLauncher_GT" or
+			defName="Gun_CMissileTurret"
+			]/comps </xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>30</li>
+					<li>50</li>
+					<li>70</li>
+					<li>90</li>
+				</chargeSpeeds>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="AutoMortarBase_GT"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name = "AutoMortarBase_GT"]/statBases/WorkToBuild</xpath>
+		<value>
+			<WorkToBuild>58500</WorkToBuild>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name = "AutoMortarBase_GT"]/statBases/ShootingAccuracyTurret</xpath>
+		<value>
+			<ShootingAccuracyTurret>0.875</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name = "AutoMortarBase_GT"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1</AimingAccuracy>
+			<Bulk>25</Bulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_APB-1Group.xml b/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_APB-1Group.xml
new file mode 100644
index 0000000000..721a41f840
--- /dev/null
+++ b/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_APB-1Group.xml	
@@ -0,0 +1,257 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== APB-1 Pistol ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_APB-1Pistol</defName>
+		<statBases>
+			<Mass>0.66</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.80</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.84</SwayFactor>
+			<Bulk>1.86</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.00</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_PlasmaCellPistol</defaultProjectile>
+			<warmupTime>0.1</warmupTime>
+			<range>12</range>
+			<soundCast>PB</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_PlasmaCellPistol</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_APB-1Pistol"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_PlasmaCellPistol"]/graphicData/texPath</xpath>
+		<value>
+			<texPath>Things/Projectile/APBP</texPath>
+		</value>
+	</Operation>
+
+	<!-- ========== APB-1 Projector ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_APB-1Projector</defName>
+		<statBases>
+			<Mass>6.35</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.38</SwayFactor>
+			<Bulk>7.49</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.00</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_PlasmaCellHeavy</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>48</range>
+			<soundCast>PBP</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_PlasmaCellHeavy</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_APB-1Projector"]/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="Bullet_PlasmaCellHeavy"]/graphicData/texPath</xpath>
+		<value>
+			<texPath>Things/Projectile/APBProj</texPath>
+		</value>
+	</Operation>
+
+	<!-- ========== APB-1 Rifle ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_APB-1Rifle</defName>
+		<statBases>
+			<Mass>3.00</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.20</SwayFactor>
+			<Bulk>9.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.00</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_PlasmaCellRifle</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>PB</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_PlasmaCellRifle</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_APB-1Rifle"]/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="Bullet_PlasmaCellRifle"]/graphicData/texPath</xpath>
+		<value>
+			<texPath>Things/Projectile/APBR</texPath>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_EMRG-1.xml b/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_EMRG-1.xml
new file mode 100644
index 0000000000..5bbd64bac8
--- /dev/null
+++ b/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_EMRG-1.xml	
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== EMRG-1 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_EMRifle</defName>
+		<statBases>
+			<Mass>2.6</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.19</SwayFactor>
+			<Bulk>8.94</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12mmRailgun_Sabot</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>86</range>
+			<soundCast>EM</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_12mmRailgun</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_EMRifle"]/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="Bullet_12mmRailgun_Sabot"]/graphicData/texPath</xpath>
+		<value>
+			<texPath>Things/Projectile/EM_Small</texPath>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_MRG-5Group.xml b/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_MRG-5Group.xml
new file mode 100644
index 0000000000..459d6c6193
--- /dev/null
+++ b/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_MRG-5Group.xml	
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== MRG-5 Pistol ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MRGPistol</defName>
+		<statBases>
+			<Mass>1.01</Mass>
+			<RangedWeapon_Cooldown>0.40</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.06</SwayFactor>
+			<Bulk>2.17</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.1</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8mmRailgun_Sabot</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>EM_small</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_8mmRailgun</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_MRGPistol"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_8mmRailgun_Sabot"]/graphicData/texPath</xpath>
+		<value>
+			<texPath>Things/Projectile/MRGP</texPath>
+		</value>
+	</Operation>
+
+	<!-- ========== MRG-5 Rifle ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MRGRifle</defName>
+		<statBases>
+			<Mass>3.60</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.05</SwayFactor>
+			<Bulk>6.88</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.43</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6mmRailgun_Sabot</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>86</range>
+			<soundCast>EM_small</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_6mmRailgun</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_MRGRifle"]/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="Bullet_6mmRailgun_Sabot"]/graphicData/texPath</xpath>
+		<value>
+			<texPath>Things/Projectile/MRGP</texPath>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_OCGroup.xml b/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_OCGroup.xml
new file mode 100644
index 0000000000..eaff8b0e94
--- /dev/null
+++ b/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_OCGroup.xml	
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== OC Defense Pistol ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_OCPDPistol</defName>
+		<statBases>
+			<Mass>0.97</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.05</SwayFactor>
+			<Bulk>2.17</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<burstShotCount>2</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>OCDRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_OCPDPistol"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== OC Defense Rifle ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_OCPDRifle</defName>
+		<statBases>
+			<Mass>3.20</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.22</SwayFactor>
+			<Bulk>9.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.49</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>OCDRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_OCPDRifle"]/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>
+
+	<!-- ========== Orion rocket launcher ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_OCRocket</defName>
+		<statBases>
+			<Mass>12.00</Mass>
+			<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.10</SwayFactor>
+			<Bulk>13.00</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Rocket</defaultProjectile>
+			<warmupTime>1.9</warmupTime>
+			<range>60</range>
+			<ticksBetweenBurstShots>20</ticksBetweenBurstShots>
+			<burstShotCount>3</burstShotCount>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_OCRocket"]/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>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_OCTurrets.xml b/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_OCTurrets.xml
new file mode 100644
index 0000000000..79eab7c271
--- /dev/null
+++ b/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_OCTurrets.xml	
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== OC Tank Cannon ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_OCTurret</defName>
+		<statBases>
+			<Mass>1120</Mass>
+			<RangedWeapon_Cooldown>2.61</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>3.04</SwayFactor>
+			<Bulk>54.83</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>4.61</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_90mmCannonShell_HEAT</defaultProjectile>
+			<warmupTime>4</warmupTime>
+			<range>86</range>
+			<soundCast>TCannon</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>9.8</reloadTime>
+			<ammoSet>AmmoSet_90mmCannonShell</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- Change cannon name and description to something other than the placeholder "inferno cannon" -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_OCTurret"]/label</xpath>
+		<value>
+			<label>OC tank cannon</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_OCTurret"]/description</xpath>
+		<value>
+			<description>90mm cannon mounted on Orion Corp tanks.</description>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Glitter Weaponry/Defs/Glitter Weaponry/Ammo.xml b/ModPatches/Glitter Weaponry/Defs/Glitter Weaponry/Ammo.xml
new file mode 100644
index 0000000000..74220ad601
--- /dev/null
+++ b/ModPatches/Glitter Weaponry/Defs/Glitter Weaponry/Ammo.xml	
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- === Ammo Sets === -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Laser_Handcannon</defName>
+		<label>laser charge</label>
+		<ammoTypes>
+			<Ammo_LaserChargePack>Bullet_Laser_Laser_Handcannon</Ammo_LaserChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Laser_Carbine</defName>
+		<label>laser charge</label>
+		<ammoTypes>
+			<Ammo_LaserChargePack>Bullet_Laser_Laser_Carbine</Ammo_LaserChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Laser_Scatterer</defName>
+		<label>laser charge</label>
+		<ammoTypes>
+			<Ammo_LaserChargePack>Bullet_Laser_Laser_Scatterer</Ammo_LaserChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_DestructorLaser</defName>
+		<label>laser charge</label>
+		<ammoTypes>
+			<Ammo_LaserChargePack>Bullet_Laser_DestructorLaser</Ammo_LaserChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- === Projectiles === -->
+	<ThingDef ParentName="BaseBulletCE">
+		<defName>Bullet_Laser_Laser_Carbine</defName>
+		<label>laser bolt</label>
+		<graphicData>
+			<texPath>Things/LaserBolt</texPath>
+			<shaderType>TransparentPostLight</shaderType>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>DV_Laser</damageDef>
+			<speed>125</speed>
+			<damageAmountBase>16</damageAmountBase>
+			<armorPenetrationBase>0.35</armorPenetrationBase>
+		</projectile>
+		<comps>
+			<li Class="AthenaFramework.CompProperties_ProjectileImpactEffect">
+				<fleck>Fleck_Burn</fleck>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBulletCE">
+		<defName>Bullet_Laser_Laser_Handcannon</defName>
+		<label>small laser bolt</label>
+		<graphicData>
+			<texPath>Things/LaserBolt</texPath>
+			<shaderType>TransparentPostLight</shaderType>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>DV_Laser</damageDef>
+			<speed>125</speed>
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationBase>0.3</armorPenetrationBase>
+		</projectile>
+		<comps>
+			<li Class="AthenaFramework.CompProperties_ProjectileImpactEffect">
+				<fleck>Fleck_Burn</fleck>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBulletCE">
+		<defName>Bullet_Laser_Laser_Scatterer</defName>
+		<label>laser bolt</label>
+		<graphicData>
+			<texPath>Things/LaserBolt</texPath>
+			<shaderType>TransparentPostLight</shaderType>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>DV_Laser</damageDef>
+			<speed>125</speed>
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationBase>0.3</armorPenetrationBase>
+			<pelletCount>6</pelletCount>
+			<spreadMult>8.9</spreadMult>
+		</projectile>
+		<comps>
+			<li Class="AthenaFramework.CompProperties_ProjectileImpactEffect">
+				<fleck>Fleck_Burn</fleck>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBulletCE">
+		<defName>Bullet_Laser_DestructorLaser</defName>
+		<label>laser bolt</label>
+		<graphicData>
+			<texPath>Things/LaserBig</texPath>
+			<shaderType>TransparentPostLight</shaderType>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>DV_Laser</damageDef>
+			<speed>125</speed>
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationBase>0.15</armorPenetrationBase>
+			<explosionRadius>1.8</explosionRadius>
+			<explosionEffect>LaserBlast</explosionEffect>
+			<preExplosionSpawnThingDef>Filth_Ash</preExplosionSpawnThingDef>
+			<preExplosionSpawnChance>0.27</preExplosionSpawnChance>
+			<screenShakeFactor>0.5</screenShakeFactor>
+			<pelletCount>3</pelletCount>
+			<spreadMult>5.9</spreadMult>
+		</projectile>
+		<comps>
+			<li Class="AthenaFramework.CompProperties_ProjectileImpactEffect">
+				<fleck>Fleck_Burn</fleck>
+			</li>
+		</comps>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Glitter Weaponry/Patches/Glitter Weaponry/RangedSpacer.xml b/ModPatches/Glitter Weaponry/Patches/Glitter Weaponry/RangedSpacer.xml
new file mode 100644
index 0000000000..2da893b3ce
--- /dev/null
+++ b/ModPatches/Glitter Weaponry/Patches/Glitter Weaponry/RangedSpacer.xml	
@@ -0,0 +1,285 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/DamageDef[defName="DV_Laser"]</xpath>
+		<value>
+			<li Class="CombatExtended.DamageDefExtensionCE">
+				<harmOnlyOutsideLayers>true</harmOnlyOutsideLayers>
+				<isAmbientDamage>true</isAmbientDamage>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Laser_Saber"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<chanceFactor>0.33</chanceFactor>
+					<cooldownTime>1.52</cooldownTime>
+					<armorPenetrationBlunt>0.500</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.24</cooldownTime>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<armorPenetrationSharp>42</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+					<extraMeleeDamages>
+						<li>
+							<def>DV_Laser</def>
+							<amount>10</amount>
+							<chance>0.5</chance>
+						</li>
+					</extraMeleeDamages>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.14</cooldownTime>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+					<armorPenetrationSharp>20</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+					<extraMeleeDamages>
+						<li>
+							<def>DV_Laser</def>
+							<amount>10</amount>
+							<chance>0.5</chance>
+						</li>
+					</extraMeleeDamages>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Laser_Saber"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Laser_Saber"]/equippedAngleOffset</xpath>
+		<value>
+			<equippedAngleOffset>-45</equippedAngleOffset>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Laser_Saber"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.63</MeleeCritChance>
+				<MeleeParryChance>0.75</MeleeParryChance>
+				<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Laser_Saber"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Laser_Handcannon"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Laser_Carbine" or defName = "Laser_Scatterer"]/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>
+
+	<!-- === Remove Shotgun Gizmo === -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName = "Laser_Scatterer"]/verbs</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName = "Laser_Scatterer"]/modExtensions/li[@Class="AthenaFramework.AngularShotgunExtension"]</xpath>
+	</Operation>
+
+	<!-- === Laser Handcannon === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Laser_Handcannon</defName>
+		<statBases>
+			<Mass>1.20</Mass>
+			<Bulk>2.30</Bulk>
+			<SwayFactor>1.17</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Laser_Laser_Handcannon</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>22</range>
+			<soundCast>Laser_Woop</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>2.5</reloadTime>
+			<ammoSet>AmmoSet_Laser_Handcannon</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Laser Rifle === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Laser_Carbine</defName>
+		<statBases>
+			<Mass>3.50</Mass>
+			<Bulk>10.00</Bulk>
+			<SwayFactor>1.35</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.01</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Laser_Laser_Carbine</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>62</range>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>Laser_Woop</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_Laser_Carbine</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- === Laser Shotgun === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Laser_Scatterer</defName>
+		<statBases>
+			<Mass>3.40</Mass>
+			<Bulk>9.00</Bulk>
+			<SwayFactor>1.24</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.01</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Laser_Laser_Scatterer</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>22</range>
+			<soundCast>Laser_Woop</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_Laser_Scatterer</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+		</FireModes>
+
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Glitter Weaponry/Patches/Glitter Weaponry/RangedSpacer_Heavy.xml b/ModPatches/Glitter Weaponry/Patches/Glitter Weaponry/RangedSpacer_Heavy.xml
new file mode 100644
index 0000000000..65244a1386
--- /dev/null
+++ b/ModPatches/Glitter Weaponry/Patches/Glitter Weaponry/RangedSpacer_Heavy.xml	
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Weapons Expanded - Heavy Weapons</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!-- === Tools === -->
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Laser_Destructor"]/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>
+				</li>
+
+				<!-- === Remove Shotgun Gizmo === -->
+				<li Class="PatchOperationRemove">
+					<xpath>Defs/ThingDef[defName = "Laser_Destructor"]/verbs</xpath>
+				</li>
+
+				<li Class="PatchOperationRemove">
+					<xpath>Defs/ThingDef[defName = "Laser_Destructor"]/modExtensions/li[@Class="AthenaFramework.AngularShotgunExtension"]</xpath>
+				</li>
+
+				<!-- === Laser Destructor === -->
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>Laser_Destructor</defName>
+					<statBases>
+						<Mass>3</Mass>
+						<Bulk>15</Bulk>
+						<SwayFactor>1.24</SwayFactor>
+						<ShotSpread>0.06</ShotSpread>
+						<SightsEfficiency>1.10</SightsEfficiency>
+						<RangedWeapon_Cooldown>1.58</RangedWeapon_Cooldown>
+					</statBases>
+					<Properties>
+						<recoilAmount>0.01</recoilAmount>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>True</hasStandardCommand>
+						<defaultProjectile>Bullet_Laser_DestructorLaser</defaultProjectile>
+						<warmupTime>1.2</warmupTime>
+						<range>45</range>
+						<soundCast>Laser_Woop</soundCast>
+						<soundCastTail>GunTail_Heavy</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+						<targetParams>
+							<canTargetLocations>true</canTargetLocations>
+						</targetParams>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>20</magazineSize>
+						<reloadTime>4</reloadTime>
+						<ammoSet>AmmoSet_DestructorLaser</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aiAimMode>AimedShot</aiAimMode>
+						<aiUseBurstMode>True</aiUseBurstMode>
+					</FireModes>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Gloomy Dragonian Race/Patches/Gloomy Dragonian Race/ThingDefs_Bodies/Dragonian_Bodytype.xml b/ModPatches/Gloomy Dragonian Race/Patches/Gloomy Dragonian Race/ThingDefs_Bodies/Dragonian_Bodytype.xml
new file mode 100644
index 0000000000..988e6571b0
--- /dev/null
+++ b/ModPatches/Gloomy Dragonian Race/Patches/Gloomy Dragonian Race/ThingDefs_Bodies/Dragonian_Bodytype.xml	
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Patch Dragonian Bodytype-->
+
+	<!--Arm Groups-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Dragonian_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="Left arm"]/groups</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Dragonian_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="Right arm"]/groups</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Dragonian_Body"]/corePart/parts/li[customLabel="Left shoulder"]/groups</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Dragonian_Body"]/corePart/parts/li[customLabel="Right shoulder"]/groups</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<!--Natural Armor-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Dragonian_Body"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Dragonian_Body"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Dragonian_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Dragonian_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Dragonian_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Dragonian_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Dragonian_Body"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Dragonian_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Dragonian_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Dragonian_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Dragonian_Body"]/corePart/parts/li[def="Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Dragonian_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Dragonian_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Gloomy Dragonian Race/Patches/Gloomy Dragonian Race/ThingDefs_Items/Items_Resource_Stuff.xml b/ModPatches/Gloomy Dragonian Race/Patches/Gloomy Dragonian Race/ThingDefs_Items/Items_Resource_Stuff.xml
new file mode 100644
index 0000000000..b0cd0fb01b
--- /dev/null
+++ b/ModPatches/Gloomy Dragonian Race/Patches/Gloomy Dragonian Race/ThingDefs_Items/Items_Resource_Stuff.xml	
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoolDragonian"]/statBases</xpath>
+		<value>
+			<Bulk>0.3</Bulk>
+			<WornBulk>0.3</WornBulk>
+			<StuffPower_Armor_Electric>0.10</StuffPower_Armor_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoolDragonian"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.675</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoolDragonian"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.85</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoolDragonian"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.15</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoolDragonian"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>0.90</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="WoolDragonian"]/stuffProps/categories</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="WoolDragonian"]/stuffProps</xpath>
+			<value>
+				<categories>
+					<li>SoftArmor</li>
+				</categories>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="WoolDragonian"]/stuffProps/categories</xpath>
+			<value>
+				<li>SoftArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Gloomy Dragonian Race/Patches/Gloomy Dragonian Race/ThingDefs_Misc/DR_Apparel.xml b/ModPatches/Gloomy Dragonian Race/Patches/Gloomy Dragonian Race/ThingDefs_Misc/DR_Apparel.xml
new file mode 100644
index 0000000000..2be289fac7
--- /dev/null
+++ b/ModPatches/Gloomy Dragonian Race/Patches/Gloomy Dragonian Race/ThingDefs_Misc/DR_Apparel.xml	
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Basic Wears ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DR_BasicWear" or defName="DR_BasicDress"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Regular ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DR_OpenDress" or
+			defName="DR_SideDress" or
+			defName="DR_OffshoulderDress" or
+			defName="DR_Seethrough" or
+			defName="DR_MidOff" or
+			defName="DR_SlaveCloth"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- ========== Armor ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DR_BattleDress"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+			<Bulk>15</Bulk>
+			<WornBulk>7.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DR_BattleDress"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4.05</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DR_BattleDress"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>5.1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DR_BattleDress"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DR_BattleHelmA"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DR_BattleHelmA"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DR_BattleHelmA"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DR_PsychicDress"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+			<Bulk>7.5</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DR_PsychicDress"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DR_PsychicDress"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2.6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DR_PsychicDress"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DR_PsychicHelm"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DR_PsychicHelm"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DR_PsychicHelm"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.75</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Gloomy Dragonian Race/Patches/Gloomy Dragonian Race/ThingDefs_Misc/DR_Weapon.xml b/ModPatches/Gloomy Dragonian Race/Patches/Gloomy Dragonian Race/ThingDefs_Misc/DR_Weapon.xml
new file mode 100644
index 0000000000..27d7bb98d6
--- /dev/null
+++ b/ModPatches/Gloomy Dragonian Race/Patches/Gloomy Dragonian Race/ThingDefs_Misc/DR_Weapon.xml	
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DR_BattleMace"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.37</cooldownTime>
+					<armorPenetrationBlunt>0.87</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Demolish</li>
+					</capacities>
+					<power>38</power>
+					<cooldownTime>2.59</cooldownTime>
+					<armorPenetrationBlunt>16.38</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DR_BattleMace"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>0.40</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "DR_BattleMace"]/equippedStatOffsets</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "DR_BattleMace"]</xpath>
+			<value>
+				<equippedStatOffsets/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DR_BattleMace"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>1.50</MeleeCritChance>
+			<MeleeParryChance>0.30</MeleeParryChance>
+			<MeleeDodgeChance>0.30</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DR_Battlesword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.37</cooldownTime>
+					<armorPenetrationBlunt>0.87</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Blunt blade</label>
+					<labelUsedInLogging>false</labelUsedInLogging>
+					<capacities>
+						<li>Blunt</li>
+						<li>Demolish</li>
+						<li>Cut</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>2.23</cooldownTime>
+					<armorPenetrationBlunt>11.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.32</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DR_Battlesword"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>0.67</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "DR_Battlesword"]/equippedStatOffsets</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "DR_Battlesword"]</xpath>
+			<value>
+				<equippedStatOffsets/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DR_Battlesword"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.16</MeleeCritChance>
+			<MeleeParryChance>0.50</MeleeParryChance>
+			<MeleeDodgeChance>0.50</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DR_BattleStaff"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.37</cooldownTime>
+					<armorPenetrationBlunt>0.87</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Demolish</li>
+					</capacities>
+					<power>45</power>
+					<extraMeleeDamages>
+						<li>
+							<def>EMP</def>
+							<amount>4.5</amount>
+						</li>
+						<li>
+							<def>Stun</def>
+							<amount>1.5</amount>
+							<chance>0.25</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>5.14</cooldownTime>
+					<armorPenetrationBlunt>22.94</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DR_BattleStaff"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>0.50</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "DR_BattleStaff"]/equippedStatOffsets</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "DR_BattleStaff"]</xpath>
+			<value>
+				<equippedStatOffsets/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DR_BattleStaff"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>1.60</MeleeCritChance>
+			<MeleeParryChance>0.38</MeleeParryChance>
+			<MeleeDodgeChance>0.40</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Gloomy Dragonian Race/Patches/Gloomy Dragonian Race/ThingDefs_Races/Race_Dragonian.xml b/ModPatches/Gloomy Dragonian Race/Patches/Gloomy Dragonian Race/ThingDefs_Races/Race_Dragonian.xml
new file mode 100644
index 0000000000..44140b0fe7
--- /dev/null
+++ b/ModPatches/Gloomy Dragonian Race/Patches/Gloomy Dragonian Race/ThingDefs_Races/Race_Dragonian.xml	
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Dragonian_Race"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>500</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Dragonian_Race"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- 5.2 Speed/0.8 Size/60 kg -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Dragonian_Race"]/statBases</xpath>
+		<value>
+			<MeleeCritChance>1.08</MeleeCritChance>
+			<MeleeParryChance>1.06</MeleeParryChance>
+			<Suppressability>1</Suppressability>
+			<!--Innate toxic resistance of 0.6-->
+			<SmokeSensitivity>0.6</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Dragonian_Race"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>1.18</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!--4mm Wool (skin+scales), their vanilla armor is thrumbo level-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Dragonian_Race"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2.7</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Dragonian_Race"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3.4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Dragonian_Race"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.6</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!--Their vanilla melee is very strong (18 verus 8.2 for humanlike)-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Dragonian_Race"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.89</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.47</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.89</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.47</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>tail</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2.28</cooldownTime>
+					<linkedBodyPartsGroup>Dragonian_Tail</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>7.875</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Dragonian_Race"]/alienRace/raceRestriction/whiteApparelList</xpath>
+		<value>
+			<li>CE_Apparel_TacVest</li>
+			<li>CE_Apparel_Backpack</li>
+			<li>CE_Apparel_TribalBackpack</li>
+			<li>CE_Apparel_BallisticShield</li>
+			<li>CE_Apparel_MeleeShield</li>
+			<li>CE_Apparel_GasMask</li>
+			<li>CE_Apparel_ImprovGasMask</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/GouRIMet/Patches/GouRIMet/Items_GouRIMet.xml b/ModPatches/GouRIMet/Patches/GouRIMet/Items_GouRIMet.xml
new file mode 100644
index 0000000000..75ade10a99
--- /dev/null
+++ b/ModPatches/GouRIMet/Patches/GouRIMet/Items_GouRIMet.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Sweets -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CaramelBalls" or
+			defName="HotCocoa" or
+			defName="HotTea"
+			]/statBases </xpath>
+		<value>
+			<Bulk>0.05</Bulk>
+		</value>
+	</Operation>
+
+	<!-- Resources -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="ResourceBaseGRM"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>0.1</Bulk>
+			</statBases>
+		</value>
+	</Operation>
+
+	<!-- Smoked Meat -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SmokedMeat"]/statBases</xpath>
+		<value>
+			<Bulk>0.1</Bulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Grimworld Autoguns/Patches/Grimworld Autoguns/Autoguns.xml b/ModPatches/Grimworld Autoguns/Patches/Grimworld Autoguns/Autoguns.xml
new file mode 100644
index 0000000000..fece77ad1d
--- /dev/null
+++ b/ModPatches/Grimworld Autoguns/Patches/Grimworld Autoguns/Autoguns.xml	
@@ -0,0 +1,402 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_Agripinaamkii" or
+			defName="Gun_Agripinaamkiitanker" or
+			defName="Gun_OrlockAutogun" or
+			defName="Gun_Heavystubber" or
+			defName="Gun_MilitarumShotgun" or
+			defName="Gun_MilitarumShotgunSawn"]/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_Zarona" or
+			defName="Gun_Hiveworldautopistol"]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Agripinaa-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Agripinaamkii</defName>
+		<statBases>
+			<Bulk>10.9</Bulk>
+			<Mass>6.2</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<SwayFactor>1.71</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<WorkToMake>41000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>60</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.71</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>68</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!--Agripinaa Tanker-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Agripinaamkiitanker</defName>
+		<statBases>
+			<Bulk>6.84</Bulk>
+			<Mass>3.9</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<SwayFactor>1.07</SwayFactor>
+			<ShotSpread>0.09</ShotSpread>
+			<WorkToMake>39000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>60</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.79</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>6</ticksBetweenBurstShots>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!--Orlock Autogun-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_OrlockAutogun</defName>
+		<statBases>
+			<Bulk>9.38</Bulk>
+			<Mass>5.70</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<SwayFactor>1.41</SwayFactor>
+			<ShotSpread>0.09</ShotSpread>
+			<WorkToMake>30000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>60</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.48</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>14</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!--Zarona-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Zarona</defName>
+		<statBases>
+			<Bulk>0.9</Bulk>
+			<Mass>0.3</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<SwayFactor>0.4</SwayFactor>
+			<ShotSpread>0.2</ShotSpread>
+			<WorkToMake>4000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_44Magnum_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Revolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_44Magnum</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!--Hiveworld Autopistol-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Hiveworldautopistol</defName>
+		<statBases>
+			<Bulk>1.8</Bulk>
+			<Mass>0.80</Mass>
+			<RangedWeapon_Cooldown>0.41</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<SwayFactor>0.26</SwayFactor>
+			<ShotSpread>0.19</ShotSpread>
+			<WorkToMake>11000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>58</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>3.35</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!--Heavy Stubber-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Heavystubber</defName>
+		<statBases>
+			<Bulk>15.2</Bulk>
+			<Mass>7.80</Mass>
+			<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<SwayFactor>0.55</SwayFactor>
+			<ShotSpread>0.05</ShotSpread>
+			<WorkToMake>38000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>120</Steel>
+			<ComponentIndustrial>10</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>0.82</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>65</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!--Militarum Shotgun-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MilitarumShotgun</defName>
+		<statBases>
+			<Bulk>9.2</Bulk>
+			<Mass>5.60</Mass>
+			<RangedWeapon_Cooldown>0.98</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<SwayFactor>1.48</SwayFactor>
+			<ShotSpread>0.15</ShotSpread>
+			<WorkToMake>14000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>60</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>5.1</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!--Militarum Shotgun Sawn-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MilitarumShotgunSawn</defName>
+		<statBases>
+			<Bulk>7.68</Bulk>
+			<Mass>4.68</Mass>
+			<RangedWeapon_Cooldown>0.98</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<SwayFactor>1.24</SwayFactor>
+			<ShotSpread>0.16</ShotSpread>
+			<WorkToMake>13000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</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>6</magazineSize>
+			<reloadTime>5.1</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Grimworld Lasguns/Patches/Grimworld Lasguns/lasguns.xml b/ModPatches/Grimworld Lasguns/Patches/Grimworld Lasguns/lasguns.xml
new file mode 100644
index 0000000000..dc0e3b7539
--- /dev/null
+++ b/ModPatches/Grimworld Lasguns/Patches/Grimworld Lasguns/lasguns.xml	
@@ -0,0 +1,517 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tools === -->
+
+	<!-- == Rifles == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "Gun_Kantrael" or
+			defName = "Gun_Kantraelsanctified" or
+			defName = "Gun_Kantraelt" or
+			defName = "Gun_Lascarbinefour" or
+			defName = "Gun_Lascarbinefoursanctified" or
+			defName = "Gun_VossPattern" or
+			defName = "Gun_VossPatternsanctified" or
+			defName = "Gun_Accatranfive" or
+			defName = "Gun_Lucius" or
+			defName = "Gun_Hellgun" or
+			defName = "Gun_Locke" or
+			defName = "Gun_LongLas"
+			]/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>
+
+	<!-- == Pistols == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "Gun_Kantraeldefender" or
+			defName = "Gun_Kantraeldefendert"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Kantrael MG === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Kantrael</defName>
+		<statBases>
+			<Mass>3.80</Mass>
+			<Bulk>15.00</Bulk>
+			<SwayFactor>1.35</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Lasgun_Rifle</defaultProjectile>
+			<warmupTime>0.75</warmupTime>
+			<range>60</range>
+			<soundCast>VWE_LaserShot_Rifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>150</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_Lasgun_Rifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- === Sanctified Kantrael MG === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Kantraelsanctified</defName>
+		<statBases>
+			<Mass>3.80</Mass>
+			<Bulk>15.00</Bulk>
+			<SwayFactor>1.25</SwayFactor>
+			<ShotSpread>0.03</ShotSpread>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Lasgun_Rifle</defaultProjectile>
+			<warmupTime>0.75</warmupTime>
+			<range>60</range>
+			<soundCast>VWE_LaserShot_Rifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>150</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_Lasgun_Rifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- === Kantrael MG-t === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Kantraelt</defName>
+		<statBases>
+			<Mass>3.80</Mass>
+			<Bulk>15.00</Bulk>
+			<SwayFactor>1.2</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Lasgun_Rifle</defaultProjectile>
+			<warmupTime>0.7</warmupTime>
+			<range>60</range>
+			<soundCast>VWE_LaserShot_Rifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>150</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_Lasgun_Rifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- === MK4 Lascarbine === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Lascarbinefour</defName>
+		<statBases>
+			<Mass>3.40</Mass>
+			<Bulk>13.50</Bulk>
+			<SwayFactor>1.25</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Lasgun_Rifle</defaultProjectile>
+			<warmupTime>0.2</warmupTime>
+			<range>45</range>
+			<soundCast>VWE_LaserShot_Rifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_Lasgun_Rifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- === Sanctified MK4 Lascarbine === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Lascarbinefoursanctified</defName>
+		<statBases>
+			<Mass>3.40</Mass>
+			<Bulk>13.50</Bulk>
+			<SwayFactor>1.15</SwayFactor>
+			<ShotSpread>0.03</ShotSpread>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Lasgun_Rifle</defaultProjectile>
+			<warmupTime>0.2</warmupTime>
+			<range>45</range>
+			<soundCast>VWE_LaserShot_Rifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_Lasgun_Rifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- === Voss MKI === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_VossPattern</defName>
+		<statBases>
+			<Mass>3.20</Mass>
+			<Bulk>12.0</Bulk>
+			<SwayFactor>1.15</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.7</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Lasgun_Rifle</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>40</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<soundCast>VWE_LaserShot_Rifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>150</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_Lasgun_Rifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- === Sanctified Voss MKI === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_VossPatternsanctified</defName>
+		<statBases>
+			<Mass>3.20</Mass>
+			<Bulk>12.0</Bulk>
+			<SwayFactor>1.05</SwayFactor>
+			<ShotSpread>0.03</ShotSpread>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Lasgun_Rifle</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>45</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<soundCast>VWE_LaserShot_Rifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>150</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_Lasgun_Rifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- === Accatran MKIV === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Accatranfive</defName><!-- I know that IV is 4, this is the mod dev's mistake -FT -->
+		<statBases>
+			<Mass>3.20</Mass>
+			<Bulk>10.0</Bulk>
+			<SwayFactor>1.3</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.7</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Lasgun_Rifle</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>45</range>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>VWE_LaserShot_Rifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>150</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_Lasgun_Rifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- === Lucius MKI === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Lucius</defName>
+		<statBases>
+			<Mass>3.80</Mass>
+			<Bulk>16.00</Bulk>
+			<SwayFactor>1.35</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.9</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Lasgun_HellGun</defaultProjectile>
+			<warmupTime>0.75</warmupTime>
+			<range>70</range>
+			<soundCast>VWE_LaserShot_Rifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>80</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_Lasgun_HellGun</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- === Kantrael MG Defender === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Kantraeldefender</defName>
+		<statBases>
+			<Mass>1.20</Mass>
+			<Bulk>3.20</Bulk>
+			<SwayFactor>1.2</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Lasgun_Pistol</defaultProjectile>
+			<warmupTime>0.3</warmupTime>
+			<range>20</range>
+			<soundCast>VWE_LaserShot_Light</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>80</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_Lasgun_Pistol</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>LaserGun</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Kantrael MG-t Defender === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Kantraeldefendert</defName>
+		<statBases>
+			<Mass>1.20</Mass>
+			<Bulk>3.20</Bulk>
+			<SwayFactor>1.15</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.2</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Lasgun_Pistol</defaultProjectile>
+			<warmupTime>0.25</warmupTime>
+			<range>20</range>
+			<soundCast>VWE_LaserShot_Light</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>80</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_Lasgun_Pistol</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>LaserGun</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Ryza Hellgun === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Hellgun</defName>
+		<statBases>
+			<Mass>3.80</Mass>
+			<Bulk>16.00</Bulk>
+			<SwayFactor>1.35</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.9</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Lasgun_HellGun</defaultProjectile>
+			<warmupTime>0.75</warmupTime>
+			<range>70</range>
+			<soundCast>VWE_LaserShot_Rifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>80</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_Lasgun_HellGun</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- === MK4 Lascarbine === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Locke</defName>
+		<statBases>
+			<Mass>3.40</Mass>
+			<Bulk>13.50</Bulk>
+			<SwayFactor>1.25</SwayFactor>
+			<ShotSpread>0.07</ShotSpread>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Lasgun_Rifle</defaultProjectile>
+			<warmupTime>0.18</warmupTime>
+			<range>45</range>
+			<soundCast>VWE_LaserShot_Rifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_Lasgun_Rifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Grimworld Melee/Patches/Grimworld Melee/IndustrialMelee.xml b/ModPatches/Grimworld Melee/Patches/Grimworld Melee/IndustrialMelee.xml
new file mode 100644
index 0000000000..26335ee3fd
--- /dev/null
+++ b/ModPatches/Grimworld Melee/Patches/Grimworld Melee/IndustrialMelee.xml	
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === One-handed Tags === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "MeleeWeapon_TrenchShovel" and "MeleeWeapon_Chainshortsword"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Chainsword ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Chainsword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.33</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.936</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>45</power>
+					<cooldownTime>2.0</cooldownTime>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>18.55</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Chainsword"]/statBases</xpath>
+		<value>
+			<Bulk>15.50</Bulk>
+			<MeleeCounterParryBonus>1.38</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Chainsword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.86</MeleeCritChance>
+				<MeleeParryChance>0.69</MeleeParryChance>
+				<MeleeDodgeChance>0.37</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- ========== Short Chainsword ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Chainshortsword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.45</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.936</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>1.0</cooldownTime>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>18.55</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Chainshortsword"]/statBases</xpath>
+		<value>
+			<Bulk>9.50</Bulk>
+			<MeleeCounterParryBonus>0.76</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Chainshortsword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.56</MeleeCritChance>
+				<MeleeParryChance>0.45</MeleeParryChance>
+				<MeleeDodgeChance>0.41</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- ========== Trench Shovel ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_TrenchShovel"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.37</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.936</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.0</cooldownTime>
+					<armorPenetrationBlunt>9.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_TrenchShovel"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>0.38</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_TrenchShovel"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.46</MeleeCritChance>
+				<MeleeParryChance>0.35</MeleeParryChance>
+				<MeleeDodgeChance>0.50</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Grimworld Melee/Patches/Grimworld Melee/SpacerMelee.xml b/ModPatches/Grimworld Melee/Patches/Grimworld Melee/SpacerMelee.xml
new file mode 100644
index 0000000000..8f4fe585f1
--- /dev/null
+++ b/ModPatches/Grimworld Melee/Patches/Grimworld Melee/SpacerMelee.xml	
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === One-handed Tags === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "MeleeWeapon_PowerFist"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- ========== PowerFist ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_PowerFist"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.33</cooldownTime>
+					<armorPenetrationBlunt>14.00</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_PowerFist"]/statBases</xpath>
+		<value>
+			<Bulk>5.50</Bulk>
+			<MeleeCounterParryBonus>0.25</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_PowerFist"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.86</MeleeCritChance>
+				<MeleeParryChance>0.69</MeleeParryChance>
+				<MeleeDodgeChance>0.37</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- ========== Power Sword ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_PowerSword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.35</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.936</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>47</power>
+					<extraMeleeDamages>
+						<li>
+							<def>EMP</def>
+							<amount>3</amount>
+							<chance>0.2</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>1.45</cooldownTime>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>27.35</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>50</power>
+					<extraMeleeDamages>
+						<li>
+							<def>EMP</def>
+							<amount>3</amount>
+							<chance>0.3</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>2.00</cooldownTime>
+					<armorPenetrationBlunt>3.00</armorPenetrationBlunt>
+					<armorPenetrationSharp>32.00</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_PowerSword"]/statBases</xpath>
+		<value>
+			<Bulk>9.50</Bulk>
+			<MeleeCounterParryBonus>0.85</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_PowerSword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.00</MeleeCritChance>
+				<MeleeParryChance>0.55</MeleeParryChance>
+				<MeleeDodgeChance>0.45</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- ========== Power Sword Crossguard ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_PowerSwordtwo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.35</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.936</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>47</power>
+					<extraMeleeDamages>
+						<li>
+							<def>EMP</def>
+							<amount>3</amount>
+							<chance>0.2</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>1.45</cooldownTime>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>27.35</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>50</power>
+					<extraMeleeDamages>
+						<li>
+							<def>EMP</def>
+							<amount>3</amount>
+							<chance>0.3</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>2.0</cooldownTime>
+					<armorPenetrationBlunt>3.00</armorPenetrationBlunt>
+					<armorPenetrationSharp>32.00</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_PowerSwordtwo"]/statBases</xpath>
+		<value>
+			<Bulk>10.50</Bulk>
+			<MeleeCounterParryBonus>0.95</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_PowerSwordtwo"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.00</MeleeCritChance>
+				<MeleeParryChance>0.75</MeleeParryChance>
+				<MeleeDodgeChance>0.45</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Gulden Mod/Patches/Gulden Mod/GuldenSheep.xml b/ModPatches/Gulden Mod/Patches/Gulden Mod/GuldenSheep.xml
new file mode 100644
index 0000000000..5053790405
--- /dev/null
+++ b/ModPatches/Gulden Mod/Patches/Gulden Mod/GuldenSheep.xml	
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GuldenSheep"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GuldenSheep"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.11</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>0.03</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GuldenSheep"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.60</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Gulden Mod/Patches/Gulden Mod/Gulden_Forest_Resources_Leather.xml b/ModPatches/Gulden Mod/Patches/Gulden Mod/Gulden_Forest_Resources_Leather.xml
new file mode 100644
index 0000000000..d78fc125b2
--- /dev/null
+++ b/ModPatches/Gulden Mod/Patches/Gulden Mod/Gulden_Forest_Resources_Leather.xml	
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Runic Pelt-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RuneBearLeatherBase"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>5</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RuneBearLeatherBase"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>1</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GuldenWoolSheep"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.06</StuffPower_Armor_Sharp>
+			<StuffPower_Armor_Blunt>0.05</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Gulden Mod/Patches/Gulden Mod/Horse_Named_Norman.xml b/ModPatches/Gulden Mod/Patches/Gulden Mod/Horse_Named_Norman.xml
new file mode 100644
index 0000000000..de7cb05589
--- /dev/null
+++ b/ModPatches/Gulden Mod/Patches/Gulden Mod/Horse_Named_Norman.xml	
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Gulden_Animal_Capricorn"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Gulden_Animal_Capricorn"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.04</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>0.4</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gulden_Animal_Capricorn"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.700</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>2.2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.125</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Gulden Mod/Patches/Gulden Mod/Rabitgaroo.xml b/ModPatches/Gulden Mod/Patches/Gulden Mod/Rabitgaroo.xml
new file mode 100644
index 0000000000..968dab5896
--- /dev/null
+++ b/ModPatches/Gulden Mod/Patches/Gulden Mod/Rabitgaroo.xml	
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="BaseRabbitgaroo"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="BaseRabbitgaroo"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="BaseRabbitgaroo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.85</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Gulden Mod/Patches/Gulden Mod/RuneBear.xml b/ModPatches/Gulden Mod/Patches/Gulden Mod/RuneBear.xml
new file mode 100644
index 0000000000..8243443034
--- /dev/null
+++ b/ModPatches/Gulden Mod/Patches/Gulden Mod/RuneBear.xml	
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="RuneBear"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RuneBear"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>32</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RuneBear"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RuneBear"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.02</MeleeDodgeChance>
+			<MeleeCritChance>1.75</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RuneBear"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Cut</li>
+					</capacities>
+					<power>65</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>35</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>25</armorPenetrationSharp>
+					<armorPenetrationBlunt>30</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Cut</li>
+					</capacities>
+					<power>65</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>35</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>25</armorPenetrationSharp>
+					<armorPenetrationBlunt>30</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>56</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>12</armorPenetrationSharp>
+					<armorPenetrationBlunt>40</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>47</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>45</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Half Dragons/Patches/Half Dragons/Apparel_Various.xml b/ModPatches/Half Dragons/Patches/Half Dragons/Apparel_Various.xml
new file mode 100644
index 0000000000..df766cffae
--- /dev/null
+++ b/ModPatches/Half Dragons/Patches/Half Dragons/Apparel_Various.xml	
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Dragon Power Armor -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="ApparelDragonArmorPowerBase"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="ApparelDragonArmorPowerBase"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>500</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="ApparelDragonArmorPowerBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="ApparelDragonArmorPowerBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="ApparelDragonArmorPowerBase"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>50</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="ApparelDragonArmorPowerBase"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="ApparelDragonArmorPowerBase"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>80</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="ApparelDragonArmorPowerBase"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<!-- Dragon Power Armor Helmet -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="ApparelDragonArmorHelmetPowerBase"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>240</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="ApparelDragonArmorHelmetPowerBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="ApparelDragonArmorHelmetPowerBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[@Name="ApparelDragonArmorHelmetPowerBase"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[@Name="ApparelDragonArmorHelmetPowerBase"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="ApparelDragonArmorHelmetPowerBase"]/equippedStatOffsets</xpath>
+		<value>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="ApparelDragonArmorHelmetPowerBase"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>60</Plasteel>
+			<DevilstrandCloth>20</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="ApparelDragonArmorHelmetPowerBase"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Half Dragons/Patches/Half Dragons/HalfDragons_Body.xml b/ModPatches/Half Dragons/Patches/Half Dragons/HalfDragons_Body.xml
new file mode 100644
index 0000000000..ddd1e29a4f
--- /dev/null
+++ b/ModPatches/Half Dragons/Patches/Half Dragons/HalfDragons_Body.xml	
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Outside Squishy-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "halfdragonbody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "right eye"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "halfdragonbody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "left eye"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "halfdragonbody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "halfdragonbody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<!--Arm Groups-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="halfdragonbody"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="halfdragonbody"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="halfdragonbody"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="halfdragonbody"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<!--Natural Armor-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="halfdragonbody"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="halfdragonbody"]/corePart/parts/li[def="Pelvis"]/parts/li[def="Tail"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="halfdragonbody"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="halfdragonbody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="halfdragonbody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="halfdragonbody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="halfdragonbody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="halfdragonbody"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="halfdragonbody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="halfdragonbody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="halfdragonbody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="halfdragonbody"]/corePart/parts/li[def="Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="halfdragonbody"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="halfdragonbody"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Half Dragons/Patches/Half Dragons/HalfDragons_Scenario.xml b/ModPatches/Half Dragons/Patches/Half Dragons/HalfDragons_Scenario.xml
new file mode 100644
index 0000000000..762785b298
--- /dev/null
+++ b/ModPatches/Half Dragons/Patches/Half Dragons/HalfDragons_Scenario.xml	
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ScenarioDef[defName="Half-Dragon_Scenario"]/scenario/parts/li[thingDef="Apparel_FlakVest"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ScenarioDef[defName="Half-Dragon_Scenario"]/scenario/parts/li[thingDef="Apparel_FlakPants"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ScenarioDef[defName="Half-Dragon_Scenario"]/scenario/parts/li[thingDef="Apparel_AdvancedHelmet"]</xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Half Dragons/Patches/Half Dragons/Patch_Weapons.xml b/ModPatches/Half Dragons/Patches/Half Dragons/Patch_Weapons.xml
new file mode 100644
index 0000000000..921950d452
--- /dev/null
+++ b/ModPatches/Half Dragons/Patches/Half Dragons/Patch_Weapons.xml	
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Base -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="BaseDragonMeleeWeapon"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.24</MeleeCritChance>
+				<MeleeParryChance>1.45</MeleeParryChance>
+				<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="BaseDragonMeleeWeapon"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<!-- Double Lance -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HD_doublelance"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.35</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>2.05</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.85</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>2.125</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.55</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>2.95</armorPenetrationBlunt>
+					<armorPenetrationSharp>4.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Piercer Lance -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HD_piercerlance"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.35</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>3.25</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.70</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.16</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>2.95</armorPenetrationBlunt>
+					<armorPenetrationSharp>8.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Average Lance -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HD_averagelance"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.35</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>3.33</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>4.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.25</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.19</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>3.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>5.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Half Dragons/Patches/Half Dragons/Race_HalfDragons.xml b/ModPatches/Half Dragons/Patches/Half Dragons/Race_HalfDragons.xml
new file mode 100644
index 0000000000..de234f05ac
--- /dev/null
+++ b/ModPatches/Half Dragons/Patches/Half Dragons/Race_HalfDragons.xml	
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="BaseDragon"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="BaseDragon"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="BaseDragon"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="BaseDragon"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<NightVisionEfficiency>0.4</NightVisionEfficiency>
+			<MeleeDodgeChance>1.1</MeleeDodgeChance>
+			<MeleeCritChance>0.8</MeleeCritChance>
+			<MeleeParryChance>0.85</MeleeParryChance>
+			<CarryWeight>35</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="BaseDragon"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="BaseDragon"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Halo - UNSC Armoury/Patches/Halo - UNSC Armoury/Apparel_Headgear.xml b/ModPatches/Halo - UNSC Armoury/Patches/Halo - UNSC Armoury/Apparel_Headgear.xml
new file mode 100644
index 0000000000..6af27d9ba4
--- /dev/null
+++ b/ModPatches/Halo - UNSC Armoury/Patches/Halo - UNSC Armoury/Apparel_Headgear.xml	
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Combat Helmet === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HUA_Apparel_CombatHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>2</WornBulk>
+			<ArmorRating_Heat>0.54</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HUA_Apparel_CombatHelmet"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+			<ArmorRating_Blunt>14</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HUA_Apparel_CombatHelmet"]/description</xpath>
+		<value>
+			<description>A heavy combat helmet with a complex design, reinforced with plasteel.</description>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HUA_Apparel_CombatHelmet"]/stuffCategories/li[.="Metallic"]</xpath>
+		<value>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HUA_Apparel_CombatHelmet"]/costList</xpath>
+		<value>
+			<costList>
+				<Plasteel>20</Plasteel>
+				<DevilstrandCloth>15</DevilstrandCloth>
+			</costList>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Halo - UNSC Armoury/Patches/Halo - UNSC Armoury/Weapons_Laser.xml b/ModPatches/Halo - UNSC Armoury/Patches/Halo - UNSC Armoury/Weapons_Laser.xml
new file mode 100644
index 0000000000..96089abbb3
--- /dev/null
+++ b/ModPatches/Halo - UNSC Armoury/Patches/Halo - UNSC Armoury/Weapons_Laser.xml	
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Weapons Expanded - Laser</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!-- === Melee === -->
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="HUA_Gun_Anti-TankLaserRifle"]/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>
+				</li>
+
+				<!-- === Remove Vanilla Expanded Laser Stuff & MoveSpeed Penalty. === -->
+				<li Class="PatchOperationRemove">
+					<xpath>Defs/ThingDef[defName = "HUA_Gun_Anti-TankLaserRifle"]/comps/li[@Class="VanillaWeaponsExpandedLaser.CompProperties_LaserCapacitor"]</xpath>
+				</li>
+
+				<li Class="PatchOperationRemove">
+					<xpath>Defs/ThingDef[defName = "HUA_Gun_Anti-TankLaserRifle"]/equippedStatOffsets</xpath>
+				</li>
+
+				<!-- === Spartan Laser === -->
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>HUA_Gun_Anti-TankLaserRifle</defName>
+					<statBases>
+						<Mass>22</Mass>
+						<Bulk>16.00</Bulk>
+						<SwayFactor>3.42</SwayFactor>
+						<ShotSpread>0.01</ShotSpread>
+						<SightsEfficiency>2.15</SightsEfficiency>
+						<RangedWeapon_Cooldown>2.65</RangedWeapon_Cooldown>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>True</hasStandardCommand>
+						<defaultProjectile>Bullet_Laser_SpartanLaser</defaultProjectile>
+						<warmupTime>2.2</warmupTime>
+						<range>65</range>
+						<soundCast>VWE_LaserShot_Heavy</soundCast>
+						<soundCastTail>GunTail_Heavy</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>4</magazineSize>
+						<reloadTime>8.6</reloadTime>
+						<ammoSet>AmmoSet_SpartanLaser</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aiAimMode>AimedShot</aiAimMode>
+					</FireModes>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Halo - UNSC Armoury/Patches/Halo - UNSC Armoury/Weapons_Ranged.xml b/ModPatches/Halo - UNSC Armoury/Patches/Halo - UNSC Armoury/Weapons_Ranged.xml
new file mode 100644
index 0000000000..b09854bcb8
--- /dev/null
+++ b/ModPatches/Halo - UNSC Armoury/Patches/Halo - UNSC Armoury/Weapons_Ranged.xml	
@@ -0,0 +1,391 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HUA_Gun_AdvancedMagnum"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "HUA_Gun_AdvancedAssaultRifle" or
+			defName = "HUA_Gun_AdvancedBattleRifle" or
+			defName = "HUA_Gun_AdvancedDMR" or
+			defName = "HUA_Gun_AdvancedShotgun" or
+			defName = "HUA_Gun_AdvancedSniperRifle" or
+			defName = "HUA_Gun_HeavyChargeRifle" or
+			defName = "HUA_Gun_ChargeStanchion"
+			]/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>
+
+	<!-- === Industrial === -->
+
+	<!-- == Advanced Pistol == -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>HUA_Gun_AdvancedMagnum</defName>
+		<statBases>
+			<WorkToMake>9000</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.5</ShotSpread>
+			<SwayFactor>1.10</SwayFactor>
+			<Bulk>2.10</Bulk>
+			<Mass>1.05</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_500SWMagnum_FMJ</defaultProjectile>
+			<warmupTime>0.7</warmupTime>
+			<range>12</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>Shot_Revolver</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>1.90</reloadTime>
+			<ammoSet>AmmoSet_500SWMagnum</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>1</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>HUA_Gun</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_Sidearm</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- == Advanced Assault Rifle == -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>HUA_Gun_AdvancedAssaultRifle</defName>
+		<statBases>
+			<WorkToMake>48000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.10</ShotSpread>
+			<SwayFactor>1.30</SwayFactor>
+			<Bulk>7</Bulk>
+			<Mass>4.32</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.51</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>1.0</warmupTime>
+			<range>48</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>true</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- == Advanced Battle Rifle == -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>HUA_Gun_AdvancedBattleRifle</defName>
+		<statBases>
+			<WorkToMake>44000</WorkToMake>
+			<SightsEfficiency>1.2</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<Bulk>6</Bulk>
+			<Mass>5</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.35</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_95x40mmUNSC_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>36</magazineSize>
+			<reloadTime>4.00</reloadTime>
+			<ammoSet>AmmoSet_95x40mmUNSC</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>true</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- == Advanced Marksman Rifle == -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>HUA_Gun_AdvancedDMR</defName>
+		<statBases>
+			<WorkToMake>42000</WorkToMake>
+			<SightsEfficiency>1.5</SightsEfficiency>
+			<ShotSpread>0.10</ShotSpread>
+			<SwayFactor>1.40</SwayFactor>
+			<Bulk>11.9</Bulk>
+			<Mass>4.75</Mass>
+			<RangedWeapon_Cooldown>0.48</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>62</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>14</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SniperRifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- == Advanced Shotgun == -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>HUA_Gun_AdvancedShotgun</defName>
+		<statBases>
+			<WorkToMake>44000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.5</ShotSpread>
+			<SwayFactor>1.9</SwayFactor>
+			<Bulk>9.0</Bulk>
+			<Mass>4.0</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.7</warmupTime>
+			<range>18</range>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>1.7</reloadTime>
+			<reloadOneAtATime>True</reloadOneAtATime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- == Advanced Sniper Rifle == -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>HUA_Gun_AdvancedSniperRifle</defName>
+		<statBases>
+			<WorkToMake>48000</WorkToMake>
+			<SightsEfficiency>3.5</SightsEfficiency>
+			<ShotSpread>0.5</ShotSpread>
+			<SwayFactor>1.9</SwayFactor>
+			<Bulk>16</Bulk>
+			<Mass>9</Mass>
+			<RangedWeapon_Cooldown>1.28</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>60</Steel>
+			<Plasteel>40</Plasteel>
+			<ComponentIndustrial>8</ComponentIndustrial>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_145x114mm_FMJ</defaultProjectile>
+			<warmupTime>3</warmupTime>
+			<range>96</range>
+			<soundCast>Shot_SniperRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>4</magazineSize>
+			<reloadTime>5.6</reloadTime>
+			<ammoSet>AmmoSet_145x114mm</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags Inherit="False">
+			<li>SniperRifle</li>
+			<li>HUA_Gun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Spacer === -->
+
+	<!-- == Heavy Charge Rifle == -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>HUA_Gun_HeavyChargeRifle</defName>
+		<statBases>
+			<WorkToMake>50000</WorkToMake>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.52</SwayFactor>
+			<Bulk>11.6</Bulk>
+			<Mass>8</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.43</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
+			<burstShotCount>2</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>1.3</warmupTime>
+			<range>62</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>5.5</reloadTime>
+			<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>true</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- == Stanchion Sniper Rifle == -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>HUA_Gun_ChargeStanchion</defName>
+		<statBases>
+			<WorkToMake>50000</WorkToMake>
+			<SightsEfficiency>4</SightsEfficiency>
+			<ShotSpread>0.5</ShotSpread>
+			<SwayFactor>1.9</SwayFactor>
+			<Bulk>17</Bulk>
+			<Mass>9</Mass>
+			<RangedWeapon_Cooldown>1.56</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<Plasteel>50</Plasteel>
+			<ComponentSpacer>5</ComponentSpacer>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6mmRailgun_Sabot</defaultProjectile>
+			<warmupTime>4</warmupTime>
+			<range>100</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>5.6</reloadTime>
+			<ammoSet>AmmoSet_6mmRailgun</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags Inherit="False">
+			<li>SpacerGun</li>
+		</weaponTags>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Halo Ammo/Defs/Halo Ammo/102mmM41Rockets.xml b/ModPatches/Halo Ammo/Defs/Halo Ammo/102mmM41Rockets.xml
new file mode 100644
index 0000000000..112f752697
--- /dev/null
+++ b/ModPatches/Halo Ammo/Defs/Halo Ammo/102mmM41Rockets.xml	
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>AmmoM41Rockets</defName>
+		<label>M41 rockets</label>
+		<parent>AmmoRockets</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRocket</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_M41Rocket</defName>
+		<label>M41 Rockets</label>
+		<ammoTypes>
+			<Ammo_M41Rocket_HEAT>Bullet_M41Rocket_HEAT</Ammo_M41Rocket_HEAT>
+			<Ammo_M41Rocket_HE>Bullet_M41Rocket_HE</Ammo_M41Rocket_HE>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="M41RocketBase" ParentName="HeavyAmmoBase" Abstract="True">
+		<description>Rockets designed for the M41 launcher. After being fired, a rocket motor kicks in to propel the Rocket further.</description>
+		<statBases>
+			<MaxHitPoints>150</MaxHitPoints>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoM41Rockets</li>
+		</thingCategories>
+		<stackLimit>25</stackLimit>
+		<cookOffFlashScale>40</cookOffFlashScale>
+		<cookOffSound>MortarBomb_Explode</cookOffSound>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="M41RocketBase">
+		<defName>Ammo_M41Rocket_HEAT</defName>
+		<label>M41 rocket (HEAT)</label>
+		<graphicData>
+			<texPath>Things/Ammo/RPG/RPG32_HEAT</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>90.61</MarketValue>
+			<Mass>5.5</Mass>
+			<Bulk>9.45</Bulk>
+		</statBases>
+		<ammoClass>RocketHEAT</ammoClass>
+		<generateAllowChance>0.2</generateAllowChance>
+		<detonateProjectile>Bullet_M41Rocket_HEAT</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="M41RocketBase">
+		<defName>Ammo_M41Rocket_HE</defName>
+		<label>M41 Rocket (Anti-personnel)</label>
+		<graphicData>
+			<texPath>Things/Ammo/RPG/RPG32_Thermobaric</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>99.15</MarketValue>
+			<Mass>5.5</Mass>
+			<Bulk>9.45</Bulk>
+		</statBases>
+		<ammoClass>GrenadeHE</ammoClass>
+		<generateAllowChance>0.2</generateAllowChance>
+		<detonateProjectile>Bullet_M41Rocket_HE</detonateProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="BaseRPG7Grenade">
+		<defName>Bullet_M41Rocket_HEAT</defName>
+		<label>M19 102mm missile (HEAT)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Rocket/SMAW_Thermobaric</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>264</damageAmountBase>
+			<armorPenetrationSharp>650</armorPenetrationSharp>
+			<armorPenetrationBlunt>41.818</armorPenetrationBlunt>
+			<speed>51</speed>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>139</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>6</Fragment_Large>
+					<Fragment_Small>42</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseRPG7Grenade">
+		<defName>Bullet_M41Rocket_HE</defName>
+		<label>M21 102mm missile (Anti-Personnel)</label>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<graphicData>
+			<texPath>Things/Projectile/Rocket/SMAW_Thermobaric</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>3.5</explosionRadius>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>240</damageAmountBase>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<speed>51</speed>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>24</Fragment_Large>
+					<Fragment_Small>148</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_M41Rocket_HEAT</defName>
+		<label>make M19 HEAT rockets x5</label>
+		<description>Craft 5 M19 HEAT rockets.</description>
+		<jobString>Making M19 HEAT rockets.</jobString>
+		<workAmount>13000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>80</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_M41Rocket_HEAT>5</Ammo_M41Rocket_HEAT>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_M41Rocket_HE</defName>
+		<label>make M21 Anti-personnel rockets x5</label>
+		<description>Craft 5 M21 Anti-personnel rockets.</description>
+		<jobString>Making M21 Anti-personnel rockets.</jobString>
+		<workAmount>25000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>80</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>16</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_M41Rocket_HE>5</Ammo_M41Rocket_HE>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Halo Ammo/Defs/Halo Ammo/12.7x40mm.xml b/ModPatches/Halo Ammo/Defs/Halo Ammo/12.7x40mm.xml
new file mode 100644
index 0000000000..b452517f09
--- /dev/null
+++ b/ModPatches/Halo Ammo/Defs/Halo Ammo/12.7x40mm.xml	
@@ -0,0 +1,240 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>Ammo127x40mm</defName>
+		<label>12.7x40mm</label>
+		<parent>AmmoPistols</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_127x40mmUNSC</defName>
+		<label>12.7x40mm</label>
+		<ammoTypes>
+			<Ammo_127x40mm_FMJ>Bullet_127x40mm_FMJ</Ammo_127x40mm_FMJ>
+			<Ammo_127x40mm_AP>Bullet_127x40mm_AP</Ammo_127x40mm_AP>
+			<Ammo_127x40mm_HP>Bullet_127x40mm_HP</Ammo_127x40mm_HP>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_127x40mmUNSCLight</defName>
+		<label>12.7x40mm</label>
+		<ammoTypes>
+			<Ammo_127x40mm_FMJ>Bullet_127x40mm_FMJ_Light</Ammo_127x40mm_FMJ>
+			<Ammo_127x40mm_AP>Bullet_127x40mm_AP_Light</Ammo_127x40mm_AP>
+			<Ammo_127x40mm_HP>Bullet_127x40mm_HP_Light</Ammo_127x40mm_HP>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="127x40mmBase" ParentName="AmmoBase" Abstract="True">
+		<description>This high-powered cartridge is one of the largest calibers found in handguns. Commonly used by UNSC magnum pistols.</description>
+		<statBases>
+			<Mass>0.029</Mass>
+			<Bulk>0.02</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo127x40mm</li>
+		</thingCategories>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="127x40mmBase">
+		<defName>Ammo_127x40mm_FMJ</defName>
+		<label>12.7x40mm cartridge (FMJ)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Pistol/FMJ</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.12</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_127x40mm_FMJ</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="127x40mmBase">
+		<defName>Ammo_127x40mm_AP</defName>
+		<label>12.7x40mm cartridge (AP)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Pistol/AP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.12</MarketValue>
+		</statBases>
+		<ammoClass>ArmorPiercing</ammoClass>
+		<cookOffProjectile>Bullet_127x40mm_AP</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="127x40mmBase">
+		<defName>Ammo_127x40mm_HP</defName>
+		<label>12.7x40mm cartridge (HP)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Pistol/HP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.12</MarketValue>
+		</statBases>
+		<ammoClass>HollowPoint</ammoClass>
+		<cookOffProjectile>Bullet_127x40mm_HP</cookOffProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base50AEBullet">
+		<defName>Bullet_127x40mm_FMJ</defName>
+		<label>12.7x40mm bullet (FMJ)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>19</damageAmountBase>
+			<armorPenetrationSharp>9</armorPenetrationSharp>
+			<armorPenetrationBlunt>38.480</armorPenetrationBlunt>
+			<speed>105</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base50AEBullet">
+		<defName>Bullet_127x40mm_AP</defName>
+		<label>12.7x40mm bullet (AP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>18</armorPenetrationSharp>
+			<armorPenetrationBlunt>38.480</armorPenetrationBlunt>
+			<speed>105</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base50AEBullet">
+		<defName>Bullet_127x40mm_HP</defName>
+		<label>12.7x40mm bullet (HP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>24</damageAmountBase>
+			<armorPenetrationSharp>4.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>38.480</armorPenetrationBlunt>
+			<speed>105</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base50AEBullet">
+		<defName>Bullet_127x40mm_FMJ_Light</defName>
+		<label>12.7x40mm bullet (FMJ)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>17</damageAmountBase>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+			<armorPenetrationBlunt>32.480</armorPenetrationBlunt>
+			<speed>105</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base50AEBullet">
+		<defName>Bullet_127x40mm_AP_Light</defName>
+		<label>12.7x40mm bullet (AP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>11</damageAmountBase>
+			<armorPenetrationSharp>16</armorPenetrationSharp>
+			<armorPenetrationBlunt>32.480</armorPenetrationBlunt>
+			<speed>105</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base50AEBullet">
+		<defName>Bullet_127x40mm_HP_Light</defName>
+		<label>12.7x40mm bullet (HP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>22</damageAmountBase>
+			<armorPenetrationSharp>4</armorPenetrationSharp>
+			<armorPenetrationBlunt>32.480</armorPenetrationBlunt>
+			<speed>105</speed>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="UNAmmoRecipeBase">
+		<defName>MakeAmmo_127x40mm_FMJ</defName>
+		<label>make 12.7x40mm (FMJ) cartridge x500</label>
+		<description>Craft 500 12.7x40mm (FMJ) cartridges.</description>
+		<jobString>Making 12.7x40mm (FMJ) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>30</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_127x40mm_FMJ>500</Ammo_127x40mm_FMJ>
+		</products>
+		<workAmount>3000</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="UNAmmoRecipeBase">
+		<defName>MakeAmmo_127x40mm_HP</defName>
+		<label>make 12.7x40mm (HP) cartridge x500</label>
+		<description>Craft 500 12.7x40mm (HP) cartridges.</description>
+		<jobString>Making 12.7x40mm (HP) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>30</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_127x40mm_HP>500</Ammo_127x40mm_HP>
+		</products>
+		<workAmount>3000</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="UNAmmoRecipeBase">
+		<defName>MakeAmmo_127x40mm_AP</defName>
+		<label>make 12.7x40mm (AP) cartridge x500</label>
+		<description>Craft 500 12.7x40mm (AP) cartridges.</description>
+		<jobString>Making 12.7x40mm (AP) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>30</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_127x40mm_AP>500</Ammo_127x40mm_AP>
+		</products>
+		<workAmount>3000</workAmount>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Halo Ammo/Defs/Halo Ammo/12.7x99mm.xml b/ModPatches/Halo Ammo/Defs/Halo Ammo/12.7x99mm.xml
new file mode 100644
index 0000000000..f107360908
--- /dev/null
+++ b/ModPatches/Halo Ammo/Defs/Halo Ammo/12.7x99mm.xml	
@@ -0,0 +1,297 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>Ammo127x99mm</defName>
+		<label>12.7x99mm</label>
+		<parent>AmmoHighCaliber</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberHighCaliber</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_127x99mm</defName>
+		<label>12.7x99mm</label>
+		<ammoTypes>
+			<Ammo_127x99mm_FMJ>Bullet_127x99mm_FMJ</Ammo_127x99mm_FMJ>
+			<Ammo_127x99mm_Incendiary>Bullet_127x99mm_Incendiary</Ammo_127x99mm_Incendiary>
+			<Ammo_127x99mm_HE>Bullet_127x99mm_HE</Ammo_127x99mm_HE>
+			<Ammo_127x99mm_Sabot>Bullet_127x99mm_Sabot</Ammo_127x99mm_Sabot>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="Ammo127x99mmBase" ParentName="MediumAmmoBase" Abstract="True">
+		<description>Large caliber bullet used by many UNSC heavy machine guns.</description>
+		<statBases>
+			<Mass>0.115</Mass>
+			<Bulk>0.14</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo127x99mm</li>
+		</thingCategories>
+		<stackLimit>5000</stackLimit>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo127x99mmBase">
+		<defName>Ammo_127x99mm_FMJ</defName>
+		<label>12.7x99mm cartridge (FMJ)</label>
+		<graphicData>
+			<texPath>Things/Ammo/HighCaliber/FMJ</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.48</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_127x99mm_FMJ</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo127x99mmBase">
+		<defName>Ammo_127x99mm_Incendiary</defName>
+		<label>12.7x99mm cartridge (AP-I)</label>
+		<graphicData>
+			<texPath>Things/Ammo/HighCaliber/Incendiary</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.8</MarketValue>
+			<Mass>0.112</Mass>
+		</statBases>
+		<ammoClass>IncendiaryAP</ammoClass>
+		<cookOffProjectile>Bullet_127x99mm_Incendiary</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo127x99mmBase">
+		<defName>Ammo_127x99mm_HE</defName>
+		<label>12.7x99mm cartridge (AP-HE)</label>
+		<graphicData>
+			<texPath>Things/Ammo/HighCaliber/HE</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.95</MarketValue>
+		</statBases>
+		<ammoClass>ExplosiveAP</ammoClass>
+		<cookOffProjectile>Bullet_127x99mm_HE</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo127x99mmBase">
+		<defName>Ammo_127x99mm_Sabot</defName>
+		<label>12.7x99mm cartridge (Sabot)</label>
+		<graphicData>
+			<texPath>Things/Ammo/HighCaliber/Sabot</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.78</MarketValue>
+			<Mass>0.095</Mass>
+		</statBases>
+		<ammoClass>Sabot</ammoClass>
+		<cookOffProjectile>Bullet_127x99mm_Sabot</cookOffProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base50BMGBullet">
+		<defName>Bullet_127x99mm_FMJ</defName>
+		<label>12.7x99mm bullet (FMJ)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>40</damageAmountBase>
+			<armorPenetrationSharp>18</armorPenetrationSharp>
+			<armorPenetrationBlunt>356.380</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base50BMGBullet">
+		<defName>Bullet_127x99mm_Incendiary</defName>
+		<label>12.7x99mm bullet (AP-I)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>25</damageAmountBase>
+			<armorPenetrationSharp>36</armorPenetrationSharp>
+			<armorPenetrationBlunt>356.7</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>15</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base50BMGBullet">
+		<defName>Bullet_127x99mm_HE</defName>
+		<label>12.7x99mm bullet (AP-HE)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>40</damageAmountBase>
+			<armorPenetrationSharp>18</armorPenetrationSharp>
+			<armorPenetrationBlunt>356.380</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>24</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base50BMGBullet">
+		<defName>Bullet_127x99mm_Sabot</defName>
+		<label>12.7x99mm bullet (Sabot)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>19</damageAmountBase>
+			<armorPenetrationSharp>55</armorPenetrationSharp>
+			<armorPenetrationBlunt>384.780</armorPenetrationBlunt>
+			<speed>207</speed>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="UNAmmoRecipeBase">
+		<defName>MakeAmmo_127x99mm_FMJ</defName>
+		<label>make 12.7x99mm (FMJ) cartridge x200</label>
+		<description>Craft 200 12.7x99mm (FMJ) cartridges.</description>
+		<jobString>Making 12.7x99mm (FMJ) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>48</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_127x99mm_FMJ>200</Ammo_127x99mm_FMJ>
+		</products>
+		<workAmount>6000</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AdvancedAmmoRecipeBase">
+		<defName>MakeAmmo_127x99mm_Incendiary</defName>
+		<label>make 12.7x99mm (AP-I) cartridge x200</label>
+		<description>Craft 200 12.7x99mm (AP-I) cartridges.</description>
+		<jobString>Making 12.7x99mm (AP-I) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>46</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Prometheum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_127x99mm_Incendiary>200</Ammo_127x99mm_Incendiary>
+		</products>
+		<workAmount>8200</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AdvancedAmmoRecipeBase">
+		<defName>MakeAmmo_127x99mm_HE</defName>
+		<label>make 12.7x99mm (AP-HE) cartridge x200</label>
+		<description>Craft 200 12.7x99mm (HE) cartridges.</description>
+		<jobString>Making 12.7x99mm (HE) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>48</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_127x99mm_HE>200</Ammo_127x99mm_HE>
+		</products>
+		<workAmount>10800</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AdvancedAmmoRecipeBase">
+		<defName>MakeAmmo_127x99mm_Sabot</defName>
+		<label>make 12.7x99mm (Sabot) cartridge x200</label>
+		<description>Craft 200 12.7x99mm (Sabot) cartridges.</description>
+		<jobString>Making 12.7x99mm (Sabot) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>30</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Chemfuel</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Uranium</li>
+				<li>Chemfuel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_127x99mm_Sabot>200</Ammo_127x99mm_Sabot>
+		</products>
+		<workAmount>8000</workAmount>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Halo Ammo/Defs/Halo Ammo/14.5x114mmUNSC.xml b/ModPatches/Halo Ammo/Defs/Halo Ammo/14.5x114mmUNSC.xml
new file mode 100644
index 0000000000..908c89f90f
--- /dev/null
+++ b/ModPatches/Halo Ammo/Defs/Halo Ammo/14.5x114mmUNSC.xml	
@@ -0,0 +1,300 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>Ammo145x114mmUNSC</defName>
+		<label>14.5x114mmUNSC</label>
+		<parent>AmmoHighCaliber</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberHighCaliber</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_145x114mmUNSC</defName>
+		<label>14.5x114mmUNSC</label>
+		<ammoTypes>
+			<Ammo_145x114mmUNSC_FMJ>Bullet_145x114mmUNSC_FMJ</Ammo_145x114mmUNSC_FMJ>
+			<Ammo_145x114mmUNSC_Incendiary>Bullet_145x114mmUNSC_Incendiary</Ammo_145x114mmUNSC_Incendiary>
+			<Ammo_145x114mmUNSC_HE>Bullet_145x114mmUNSC_HE</Ammo_145x114mmUNSC_HE>
+			<Ammo_145x114mmUNSC_Sabot>Bullet_145x114mmUNSC_Sabot</Ammo_145x114mmUNSC_Sabot>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="Ammo145x114mmUNSCBase" ParentName="MediumAmmoBase" Abstract="True">
+		<description>Old-school anti-tank cartridge originally designed for AT rifles, it is now used by UNSC heavy sniper rifles.</description>
+		<statBases>
+			<Mass>0.186</Mass>
+			<Bulk>0.27</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo145x114mmUNSC</li>
+		</thingCategories>
+		<stackLimit>2000</stackLimit>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo145x114mmUNSCBase">
+		<defName>Ammo_145x114mmUNSC_FMJ</defName>
+		<label>14.5x114mmUNSC cartridge (FMJ)</label>
+		<graphicData>
+			<texPath>Things/Ammo/HighCaliber/FMJ</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.86</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<generateAllowChance>0.3</generateAllowChance>
+		<cookOffProjectile>Bullet_145x114mmUNSC_FMJ</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo145x114mmUNSCBase">
+		<defName>Ammo_145x114mmUNSC_Incendiary</defName>
+		<label>14.5x114mmUNSC cartridge (AP-I)</label>
+		<graphicData>
+			<texPath>Things/Ammo/HighCaliber/Incendiary</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>1.1</MarketValue>
+		</statBases>
+		<ammoClass>IncendiaryAP</ammoClass>
+		<generateAllowChance>0.15</generateAllowChance>
+		<cookOffProjectile>Bullet_145x114mmUNSC_Incendiary</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo145x114mmUNSCBase">
+		<defName>Ammo_145x114mmUNSC_HE</defName>
+		<label>14.5x114mmUNSC cartridge (HE)</label>
+		<graphicData>
+			<texPath>Things/Ammo/HighCaliber/HE</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>1.48</MarketValue>
+		</statBases>
+		<ammoClass>ExplosiveAP</ammoClass>
+		<generateAllowChance>0.15</generateAllowChance>
+		<cookOffProjectile>Bullet_145x114mmUNSC_HE</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo145x114mmUNSCBase">
+		<defName>Ammo_145x114mmUNSC_Sabot</defName>
+		<label>14.5x114mmUNSC cartridge (Sabot)</label>
+		<graphicData>
+			<texPath>Things/Ammo/HighCaliber/Sabot</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.95</MarketValue>
+			<Mass>0.159</Mass>
+		</statBases>
+		<ammoClass>Sabot</ammoClass>
+		<generateAllowChance>0.1</generateAllowChance>
+		<cookOffProjectile>Bullet_145x114mmUNSC_Sabot</cookOffProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base145x114mmBullet">
+		<defName>Bullet_145x114mmUNSC_FMJ</defName>
+		<label>14.5x114mmUNSC bullet (FMJ)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>52</damageAmountBase>
+			<armorPenetrationSharp>24</armorPenetrationSharp>
+			<armorPenetrationBlunt>678</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base145x114mmBullet">
+		<defName>Bullet_145x114mmUNSC_Incendiary</defName>
+		<label>14.5x114mmUNSC bullet (AP-I)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>33</damageAmountBase>
+			<armorPenetrationSharp>48</armorPenetrationSharp>
+			<armorPenetrationBlunt>678</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>19</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base145x114mmBullet">
+		<defName>Bullet_145x114mmUNSC_HE</defName>
+		<label>14.5x114mmUNSC bullet (HE)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>52</damageAmountBase>
+			<armorPenetrationSharp>24</armorPenetrationSharp>
+			<armorPenetrationBlunt>678</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>30</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base145x114mmBullet">
+		<defName>Bullet_145x114mmUNSC_Sabot</defName>
+		<label>14.5x114mmUNSC bullet (Sabot)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>242</speed>
+			<damageAmountBase>27</damageAmountBase>
+			<armorPenetrationSharp>74</armorPenetrationSharp>
+			<armorPenetrationBlunt>860.360</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="UNAmmoRecipeBase">
+		<defName>MakeAmmo_145x114mmUNSC_FMJ</defName>
+		<label>make 14.5x114mmUNSC (FMJ) cartridge x200</label>
+		<description>Craft 200 14.5x114mmUNSC (FMJ) cartridges.</description>
+		<jobString>Making 14.5x114mmUNSC (FMJ) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>76</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_145x114mmUNSC_FMJ>200</Ammo_145x114mmUNSC_FMJ>
+		</products>
+		<workAmount>10000</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AdvancedAmmoRecipeBase">
+		<defName>MakeAmmo_145x114mmUNSC_Incendiary</defName>
+		<label>make 14.5x114mmUNSC (AP-I) cartridge x200</label>
+		<description>Craft 200 14.5x114mmUNSC (AP-I) cartridges.</description>
+		<jobString>Making 14.5x114mmUNSC (AP-I) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>76</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>7</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Prometheum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_145x114mmUNSC_Incendiary>200</Ammo_145x114mmUNSC_Incendiary>
+		</products>
+		<workAmount>13600</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AdvancedAmmoRecipeBase">
+		<defName>MakeAmmo_145x114mmUNSC_HE</defName>
+		<label>make 14.5x114mmUNSC (HE) cartridge x200</label>
+		<description>Craft 200 14.5x114mmUNSC (HE) cartridges.</description>
+		<jobString>Making 14.5x114mmUNSC (HE) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>76</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>13</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_145x114mmUNSC_HE>200</Ammo_145x114mmUNSC_HE>
+		</products>
+		<workAmount>16000</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AdvancedAmmoRecipeBase">
+		<defName>MakeAmmo_145x114mmUNSC_Sabot</defName>
+		<label>make 14.5x114mmUNSC (Sabot) cartridge x200</label>
+		<description>Craft 200 14.5x114mmUNSC (Sabot) cartridges.</description>
+		<jobString>Making 14.5x114mmUNSC (Sabot) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>50</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Chemfuel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Chemfuel</li>
+				<li>Steel</li>
+				<li>Uranium</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_145x114mmUNSC_Sabot>200</Ammo_145x114mmUNSC_Sabot>
+		</products>
+		<workAmount>13000</workAmount>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Halo Ammo/Defs/Halo Ammo/16x65mm.xml b/ModPatches/Halo Ammo/Defs/Halo Ammo/16x65mm.xml
new file mode 100644
index 0000000000..2fb12819e6
--- /dev/null
+++ b/ModPatches/Halo Ammo/Defs/Halo Ammo/16x65mm.xml	
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>Ammo16x65mm</defName>
+		<label>16x65mm</label>
+		<parent>AmmoHighCaliber</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberHighCaliber</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_16x65mm</defName>
+		<label>16x65mm</label>
+		<ammoTypes>
+			<Ammo_16x65mm_HE>Bullet_16x65mm_HE</Ammo_16x65mm_HE>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="Ammo16x65mmBase" ParentName="SpacerAmmoBase" Abstract="True">
+		<description>The M645 Ferric-Tungsten Projectile - High Explosive is a 16x65mm slug round used by Acheron Security's ARC-920 railgun.</description>
+		<statBases>
+			<Mass>0.12</Mass>
+			<Bulk>0.24</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo16x65mm</li>
+		</thingCategories>
+		<stackLimit>2000</stackLimit>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo16x65mmBase">
+		<defName>Ammo_16x65mm_HE</defName>
+		<label>16x65mm cartridge (HE)</label>
+		<graphicData>
+			<texPath>Things/Ammo/HighCaliber/HE</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>11</MarketValue>
+		</statBases>
+		<ammoClass>ExplosiveAP</ammoClass>
+		<cookOffProjectile>Bullet_16x65mm_HE</cookOffProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectile ================== -->
+
+	<ThingDef ParentName="Base145x114mmBullet">
+		<defName>Bullet_16x65mm_HE</defName>
+		<label>16x65mm bullet (HE)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_Big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>406</speed>
+			<damageAmountBase>72</damageAmountBase>
+			<armorPenetrationSharp>300</armorPenetrationSharp>
+			<armorPenetrationBlunt>920.88</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>36</amount>
+				</li>
+			</secondaryDamage>
+			<dropsCasings>false</dropsCasings>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>30</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.9</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AdvancedAmmoRecipeBase">
+		<defName>MakeAmmo_16x65mm_HE</defName>
+		<label>make 16x65mm (HE) cartridge x100</label>
+		<description>Craft 100 16x65mm (HE) cartridges.</description>
+		<jobString>Making 16x65mm (HE) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>40</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Uranium</li>
+				<li>FSX</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_16x65mm_HE>100</Ammo_16x65mm_HE>
+		</products>
+		<workAmount>10000</workAmount>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Halo Ammo/Defs/Halo Ammo/40x46mmGrenadesUNSC.xml b/ModPatches/Halo Ammo/Defs/Halo Ammo/40x46mmGrenadesUNSC.xml
new file mode 100644
index 0000000000..b5725883bc
--- /dev/null
+++ b/ModPatches/Halo Ammo/Defs/Halo Ammo/40x46mmGrenadesUNSC.xml	
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_40mmGrenade</defName>
+		<label>40x46mm Grenades</label>
+		<ammoTypes>
+			<Ammo_40mmGrenade_UNSCHEDP>Bullet_40mmGrenade_UNSCHEDP</Ammo_40mmGrenade_UNSCHEDP>
+			<Ammo_40x46mmGrenade_HE>Bullet_40x46mmGrenade_UNSCHE</Ammo_40x46mmGrenade_HE>
+			<Ammo_40x46mmGrenade_EMP>Bullet_40x46mmGrenade_UNSCEMP</Ammo_40x46mmGrenade_EMP>
+			<Ammo_40x46mmGrenade_Smoke>Bullet_40x46mmGrenade_UNSCSmoke</Ammo_40x46mmGrenade_Smoke>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="40mmGrenadeBase" ParentName="MediumAmmoBase" Abstract="True">
+		<description>Medium velocity grenade fired from handheld grenade launchers. This one features a heat warhead.</description>
+		<statBases>
+			<Mass>0.2</Mass>
+			<Bulk>0.36</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo40x46mmGrenades</li>
+		</thingCategories>
+		<stackLimit>500</stackLimit>
+		<cookOffFlashScale>100</cookOffFlashScale>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="40mmGrenadeBase">
+		<defName>Ammo_40mmGrenade_UNSCHEDP</defName>
+		<label>40mm grenade UNSC (HEDP)</label>
+		<graphicData>
+			<texPath>Things/Ammo/GrenadeLauncher/HE</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>6.01</MarketValue>
+		</statBases>
+		<ammoClass>GrenadeHEDP</ammoClass>
+		<detonateProjectile>Bullet_40x46mmGrenade_HE</detonateProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base40x46mmGrenadeBullet">
+		<defName>Bullet_40mmGrenade_UNSCHEDP</defName>
+		<label>40x46mm grenade (HEDP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>48</damageAmountBase>
+			<armorPenetrationSharp>50</armorPenetrationSharp>
+			<armorPenetrationBlunt>31.584</armorPenetrationBlunt>
+			<speed>33</speed>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>12</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>40</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>14</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="Base40x46mmGrenadeBullet">
+		<defName>Bullet_40x46mmGrenade_UNSCHE</defName>
+		<label>40x46mm grenade (HE)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>1.0</explosionRadius>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>25</damageAmountBase>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<speed>33</speed>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>19</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="Base40x46mmGrenadeBullet">
+		<defName>Bullet_40x46mmGrenade_UNSCEMP</defName>
+		<label>40x46mm grenade (EMP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>1.5</explosionRadius>
+			<damageDef>EMP</damageDef>
+			<damageAmountBase>25</damageAmountBase>
+			<speed>33</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base40x46mmGrenadeBullet">
+		<defName>Bullet_40x46mmGrenade_UNSCSmoke</defName>
+		<label>40x46mm grenade (Smoke)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>2</explosionRadius>
+			<damageDef>Smoke</damageDef>
+			<suppressionFactor>0.0</suppressionFactor>
+			<dangerFactor>0.0</dangerFactor>
+			<postExplosionGasType>BlindSmoke</postExplosionGasType>
+			<preExplosionSpawnChance>1</preExplosionSpawnChance>
+			<speed>33</speed>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="UNAmmoRecipeBase">
+		<defName>MakeAmmo_40mmGrenade_UNSCHEDP</defName>
+		<label>make 40mm UNSC HEDP grenades x100</label>
+		<description>Craft 100 40mm UNSC HEDP grenades.</description>
+		<jobString>Making 40mm UNSC HEDP grenades.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>50</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_40mmGrenade_UNSCHEDP>100</Ammo_40mmGrenade_UNSCHEDP>
+		</products>
+		<workAmount>12000</workAmount>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Halo Ammo/Defs/Halo Ammo/5x23mmCaseless.xml b/ModPatches/Halo Ammo/Defs/Halo Ammo/5x23mmCaseless.xml
new file mode 100644
index 0000000000..7af617c731
--- /dev/null
+++ b/ModPatches/Halo Ammo/Defs/Halo Ammo/5x23mmCaseless.xml	
@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>Ammo5x23mmCaseless</defName>
+		<label>5x23mm Caseless</label>
+		<parent>AmmoRifles</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_5x23mmCaseless</defName>
+		<label>5x23mm Caseless</label>
+		<ammoTypes>
+			<Ammo_5x23mmCaseless_FMJ>Bullet_5x23mmCaseless_FMJ</Ammo_5x23mmCaseless_FMJ>
+			<Ammo_5x23mmCaseless_AP>Bullet_5x23mmCaseless_AP</Ammo_5x23mmCaseless_AP>
+			<Ammo_5x23mmCaseless_HP>Bullet_5x23mmCaseless_HP</Ammo_5x23mmCaseless_HP>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="5x23mmCaselessBase" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Caseless bullet with a solid propellant enveloping the projectile. It is used by UNSC SMGs.</description>
+		<statBases>
+			<Mass>0.008</Mass>
+			<Bulk>0.009</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo5x23mmCaseless</li>
+		</thingCategories>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="5x23mmCaselessBase">
+		<defName>Ammo_5x23mmCaseless_FMJ</defName>
+		<label>5x23mm Caseless cartridge (FMJ)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/FMJ</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.08</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_5x23mmCaseless_FMJ</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="5x23mmCaselessBase">
+		<defName>Ammo_5x23mmCaseless_AP</defName>
+		<label>5x23mm Caseless cartridge (AP)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/AP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.08</MarketValue>
+		</statBases>
+		<ammoClass>ArmorPiercing</ammoClass>
+		<cookOffProjectile>Bullet_5x23mmCaseless_AP</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="5x23mmCaselessBase">
+		<defName>Ammo_5x23mmCaseless_HP</defName>
+		<label>5x23mm Caseless cartridge (HP)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/HP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.08</MarketValue>
+		</statBases>
+		<ammoClass>HollowPoint</ammoClass>
+		<cookOffProjectile>Bullet_5x23mmCaseless_HP</cookOffProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="BaseFN57x28mmBullet">
+		<defName>Bullet_5x23mmCaseless_FMJ</defName>
+		<label>5mm Caseless bullet (FMJ)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>11</damageAmountBase>
+			<armorPenetrationSharp>7</armorPenetrationSharp>
+			<armorPenetrationBlunt>24.5</armorPenetrationBlunt>
+			<dropsCasings>false</dropsCasings>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseFN57x28mmBullet">
+		<defName>Bullet_5x23mmCaseless_AP</defName>
+		<label>5mm Caseless bullet (AP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>7</damageAmountBase>
+			<armorPenetrationSharp>14</armorPenetrationSharp>
+			<armorPenetrationBlunt>24.5</armorPenetrationBlunt>
+			<dropsCasings>false</dropsCasings>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseFN57x28mmBullet">
+		<defName>Bullet_5x23mmCaseless_HP</defName>
+		<label>5mm Caseless bullet (HP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>15</damageAmountBase>
+			<armorPenetrationSharp>3.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>24.5</armorPenetrationBlunt>
+			<dropsCasings>false</dropsCasings>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseFN57x28mmBullet">
+		<defName>Bullet_5x23mmCaseless_Incendiary</defName>
+		<label>5mm Caseless bullet (AP-I)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>8</damageAmountBase>
+			<armorPenetrationSharp>12</armorPenetrationSharp>
+			<armorPenetrationBlunt>28.5</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>4</amount>
+				</li>
+			</secondaryDamage>
+			<dropsCasings>false</dropsCasings>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseFN57x28mmBullet">
+		<defName>Bullet_5x23mmCaseless_HE</defName>
+		<label>5mm Caseless bullet (HE)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>6</armorPenetrationSharp>
+			<armorPenetrationBlunt>28.5</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>7</amount>
+				</li>
+			</secondaryDamage>
+			<dropsCasings>false</dropsCasings>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseFN57x28mmBullet">
+		<defName>Bullet_5x23mmCaseless_Sabot</defName>
+		<label>5mm Caseless bullet (Sabot)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>6</damageAmountBase>
+			<armorPenetrationSharp>21</armorPenetrationSharp>
+			<armorPenetrationBlunt>36.58</armorPenetrationBlunt>
+			<speed>205</speed>
+			<dropsCasings>false</dropsCasings>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="UNAmmoRecipeBase">
+		<defName>MakeAmmo_5x23mmCaseless_FMJ</defName>
+		<label>make 5x23mm Caseless (FMJ) cartridge x500</label>
+		<description>Craft 500 5x23mm Caseless (FMJ) cartridges.</description>
+		<jobString>Making 5x23mm Caseless (FMJ) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_5x23mmCaseless_FMJ>500</Ammo_5x23mmCaseless_FMJ>
+		</products>
+		<workAmount>1500</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="UNAmmoRecipeBase">
+		<defName>MakeAmmo_5x23mmCaseless_AP</defName>
+		<label>make 5x23mm Caseless (AP) cartridge x500</label>
+		<description>Craft 500 5x23mm Caseless (AP) cartridges.</description>
+		<jobString>Making 5x23mm Caseless (AP) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_5x23mmCaseless_AP>500</Ammo_5x23mmCaseless_AP>
+		</products>
+		<workAmount>1500</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="UNAmmoRecipeBase">
+		<defName>MakeAmmo_5x23mmCaseless_HP</defName>
+		<label>make 5x23mm Caseless (HP) cartridge x500</label>
+		<description>Craft 500 5x23mm Caseless (HP) cartridges.</description>
+		<jobString>Making 5x23mm Caseless (HP) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_5x23mmCaseless_HP>500</Ammo_5x23mmCaseless_HP>
+		</products>
+		<workAmount>1500</workAmount>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Halo Ammo/Defs/Halo Ammo/7.62x51mmUNSC.xml b/ModPatches/Halo Ammo/Defs/Halo Ammo/7.62x51mmUNSC.xml
new file mode 100644
index 0000000000..26cdfc9a37
--- /dev/null
+++ b/ModPatches/Halo Ammo/Defs/Halo Ammo/7.62x51mmUNSC.xml	
@@ -0,0 +1,585 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>Ammo762x51mmUNSC</defName>
+		<label>7.62x51mm UNSC</label>
+		<parent>AmmoRifles</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_762x51mmUNSC</defName>
+		<label>7.62x51mm UNSC</label>
+		<ammoTypes>
+			<Ammo_762x51mmUNSC_FMJ>Bullet_762x51mmUNSC_FMJ</Ammo_762x51mmUNSC_FMJ>
+			<Ammo_762x51mmUNSC_AP>Bullet_762x51mmUNSC_AP</Ammo_762x51mmUNSC_AP>
+			<Ammo_762x51mmUNSC_HP>Bullet_762x51mmUNSC_HP</Ammo_762x51mmUNSC_HP>
+			<Ammo_762x51mmUNSC_Shredder>Bullet_762x51mmUNSC_Shredder</Ammo_762x51mmUNSC_Shredder>
+			<Ammo_762x51mmUNSC_Incendiary>Bullet_762x51mmUNSC_Incendiary</Ammo_762x51mmUNSC_Incendiary>
+			<Ammo_762x51mmUNSC_HE>Bullet_762x51mmUNSC_HE</Ammo_762x51mmUNSC_HE>
+			<Ammo_762x51mmUNSC_Sabot>Bullet_762x51mmUNSC_Sabot</Ammo_762x51mmUNSC_Sabot>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_762x51mmUNSC_DMR</defName>
+		<label>7.62x51mm UNSC</label>
+		<ammoTypes>
+			<Ammo_762x51mmUNSC_FMJ>Bullet_762x51mmUNSC_FMJ_DMR</Ammo_762x51mmUNSC_FMJ>
+			<Ammo_762x51mmUNSC_AP>Bullet_762x51mmUNSC_AP_DMR</Ammo_762x51mmUNSC_AP>
+			<Ammo_762x51mmUNSC_HP>Bullet_762x51mmUNSC_HP_DMR</Ammo_762x51mmUNSC_HP>
+			<Ammo_762x51mmUNSC_Shredder>Bullet_762x51mmUNSC_Shredder_DMR</Ammo_762x51mmUNSC_Shredder>
+			<Ammo_762x51mmUNSC_Incendiary>Bullet_762x51mmUNSC_Incendiary_DMR</Ammo_762x51mmUNSC_Incendiary>
+			<Ammo_762x51mmUNSC_HE>Bullet_762x51mmUNSC_HE_DMR</Ammo_762x51mmUNSC_HE>
+			<Ammo_762x51mmUNSC_Sabot>Bullet_762x51mmUNSC_Sabot_DMR</Ammo_762x51mmUNSC_Sabot>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_762x51mmExtra</defName>
+		<label>7.62x51mm UNSC Extra</label>
+		<ammoTypes>
+			<Ammo_762x51mmUNSC_FMJ>Bullet_762x51mmUNSC_FMJ</Ammo_762x51mmUNSC_FMJ>
+			<Ammo_762x51mmUNSC_AP>Bullet_762x51mmUNSC_AP</Ammo_762x51mmUNSC_AP>
+			<Ammo_762x51mmUNSC_HP>Bullet_762x51mmUNSC_HP</Ammo_762x51mmUNSC_HP>
+			<Ammo_762x51mmUNSC_Shredder>Bullet_762x51mmUNSC_Shredder</Ammo_762x51mmUNSC_Shredder>
+			<Ammo_762x51mmUNSC_Incendiary>Bullet_762x51mmUNSC_Incendiary</Ammo_762x51mmUNSC_Incendiary>
+			<Ammo_762x51mmUNSC_HE>Bullet_762x51mmUNSC_HE</Ammo_762x51mmUNSC_HE>
+			<Ammo_762x51mmUNSC_Sabot>Bullet_762x51mmUNSC_Sabot</Ammo_762x51mmUNSC_Sabot>
+			<Ammo_762x51mmNATO_FMJ>Bullet_762x51mmNATO_FMJ</Ammo_762x51mmNATO_FMJ>
+			<Ammo_762x51mmNATO_AP>Bullet_762x51mmNATO_AP</Ammo_762x51mmNATO_AP>
+			<Ammo_762x51mmNATO_HP>Bullet_762x51mmNATO_HP</Ammo_762x51mmNATO_HP>
+			<Ammo_762x51mmNATO_Incendiary>Bullet_762x51mmNATO_Incendiary</Ammo_762x51mmNATO_Incendiary>
+			<Ammo_762x51mmNATO_HE>Bullet_762x51mmNATO_HE</Ammo_762x51mmNATO_HE>
+			<Ammo_762x51mmNATO_Sabot>Bullet_762x51mmNATO_Sabot</Ammo_762x51mmNATO_Sabot>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="762x51mmUNSCBase" ParentName="SmallAmmoBase" Abstract="True">
+		<description>An improved version of the ancient 7.62x51mm cartridge, featuring a hardened penetrator and better propellent to counter advancements in body armour. A tiny amount of stopping power is sacrificed to achieve this superior penetrative capability. It is used by a large number of UNSC weaponry.</description>
+		<statBases>
+			<Mass>0.025</Mass>
+			<Bulk>0.03</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo762x51mmUNSC</li>
+		</thingCategories>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x51mmUNSCBase">
+		<defName>Ammo_762x51mmUNSC_FMJ</defName>
+		<label>7.62x51mm UNSC cartridge (FMJ)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/FMJ</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.12</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<generateAllowChance>0.4</generateAllowChance>
+		<cookOffProjectile>Bullet_762x51mmUNSC_FMJ</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x51mmUNSCBase">
+		<defName>Ammo_762x51mmUNSC_AP</defName>
+		<label>7.62x51mm UNSC cartridge (AP)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/AP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.12</MarketValue>
+		</statBases>
+		<ammoClass>ArmorPiercing</ammoClass>
+		<generateAllowChance>0.4</generateAllowChance>
+		<cookOffProjectile>Bullet_762x51mmUNSC_AP</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x51mmUNSCBase">
+		<defName>Ammo_762x51mmUNSC_HP</defName>
+		<label>7.62x51mm UNSC cartridge (HP)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/HP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.12</MarketValue>
+		</statBases>
+		<ammoClass>HollowPoint</ammoClass>
+		<generateAllowChance>0.1</generateAllowChance>
+		<cookOffProjectile>Bullet_762x51mmUNSC_HP</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x51mmUNSCBase">
+		<defName>Ammo_762x51mmUNSC_Shredder</defName>
+		<label>7.62x51mm UNSC cartridge (Shredder)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/HP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.13</MarketValue>
+		</statBases>
+		<ammoClass>Shredder</ammoClass>
+		<generateAllowChance>0.1</generateAllowChance>
+		<cookOffProjectile>Bullet_762x51mmUNSC_Shredder</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x51mmUNSCBase">
+		<defName>Ammo_762x51mmUNSC_Incendiary</defName>
+		<label>7.62x51mm UNSC cartridge (AP-I)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/Incendiary</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.17</MarketValue>
+		</statBases>
+		<ammoClass>IncendiaryAP</ammoClass>
+		<generateAllowChance>0.2</generateAllowChance>
+		<cookOffProjectile>Bullet_762x51mmUNSC_Incendiary</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x51mmUNSCBase">
+		<defName>Ammo_762x51mmUNSC_HE</defName>
+		<label>7.62x51mm UNSC cartridge (HEDP)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/HE</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.20</MarketValue>
+		</statBases>
+		<ammoClass>ExplosiveAP</ammoClass>
+		<generateAllowChance>0.2</generateAllowChance>
+		<cookOffProjectile>Bullet_762x51mmUNSC_HE</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x51mmUNSCBase">
+		<defName>Ammo_762x51mmUNSC_Sabot</defName>
+		<label>7.62x51mm UNSC cartridge (Sabot)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/Sabot</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.13</MarketValue>
+			<Mass>0.02</Mass>
+		</statBases>
+		<ammoClass>Sabot</ammoClass>
+		<generateAllowChance>0.2</generateAllowChance>
+		<cookOffProjectile>Bullet_762x51mmUNSC_Sabot</cookOffProjectile>
+	</ThingDef>
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base762x51mmNATOBullet">
+		<defName>Bullet_762x51mmUNSC_FMJ</defName>
+		<label>7.62mm UNSC bullet (FMJ)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>19</damageAmountBase>
+			<armorPenetrationSharp>10</armorPenetrationSharp>
+			<armorPenetrationBlunt>69.72</armorPenetrationBlunt>
+			<speed>170</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base762x51mmNATOBullet">
+		<defName>Bullet_762x51mmUNSC_AP</defName>
+		<label>7.62mm UNSC bullet (AP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>20</armorPenetrationSharp>
+			<armorPenetrationBlunt>69.72</armorPenetrationBlunt>
+			<speed>170</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base762x51mmNATOBullet">
+		<defName>Bullet_762x51mmUNSC_HP</defName>
+		<label>7.62mm UNSC bullet (HP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>24</damageAmountBase>
+			<armorPenetrationSharp>5</armorPenetrationSharp>
+			<armorPenetrationBlunt>69.72</armorPenetrationBlunt>
+			<speed>170</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base762x51mmNATOBullet">
+		<defName>Bullet_762x51mmUNSC_Shredder</defName>
+		<label>7.62mm UNSC bullet (Shredder)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>22</damageAmountBase>
+			<damageDef>Fragment</damageDef>
+			<armorPenetrationSharp>5</armorPenetrationSharp>
+			<armorPenetrationBlunt>69.72</armorPenetrationBlunt>
+			<speed>170</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base762x51mmNATOBullet">
+		<defName>Bullet_762x51mmUNSC_Incendiary</defName>
+		<label>7.62mm UNSC bullet (AP-I)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>20</armorPenetrationSharp>
+			<armorPenetrationBlunt>69.72</armorPenetrationBlunt>
+			<speed>170</speed>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>7</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base762x51mmNATOBullet">
+		<defName>Bullet_762x51mmUNSC_HE</defName>
+		<label>7.62mm UNSC bullet (HEDP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>19</damageAmountBase>
+			<armorPenetrationSharp>10</armorPenetrationSharp>
+			<armorPenetrationBlunt>69.72</armorPenetrationBlunt>
+			<speed>170</speed>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>11</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base762x51mmNATOBullet">
+		<defName>Bullet_762x51mmUNSC_Sabot</defName>
+		<label>7.62mm UNSC bullet (Sabot)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationSharp>30</armorPenetrationSharp>
+			<armorPenetrationBlunt>92.28</armorPenetrationBlunt>
+			<speed>228</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base762x51mmNATOBullet">
+		<defName>Bullet_762x51mmUNSC_FMJ_DMR</defName>
+		<label>7.62mm UNSC bullet (FMJ)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>21</damageAmountBase>
+			<armorPenetrationSharp>11</armorPenetrationSharp>
+			<armorPenetrationBlunt>74.72</armorPenetrationBlunt>
+			<speed>184</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base762x51mmNATOBullet">
+		<defName>Bullet_762x51mmUNSC_AP_DMR</defName>
+		<label>7.62mm UNSC bullet (AP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>13</damageAmountBase>
+			<armorPenetrationSharp>22</armorPenetrationSharp>
+			<armorPenetrationBlunt>74.72</armorPenetrationBlunt>
+			<speed>184</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base762x51mmNATOBullet">
+		<defName>Bullet_762x51mmUNSC_HP_DMR</defName>
+		<label>7.62mm UNSC bullet (HP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>25</damageAmountBase>
+			<armorPenetrationSharp>5.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>74.72</armorPenetrationBlunt>
+			<speed>184</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base762x51mmNATOBullet">
+		<defName>Bullet_762x51mmUNSC_Shredder_DMR</defName>
+		<label>7.62mm UNSC bullet (Shredder)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>23</damageAmountBase>
+			<damageDef>Fragment</damageDef>
+			<armorPenetrationSharp>5.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>74.72</armorPenetrationBlunt>
+			<speed>184</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base762x51mmNATOBullet">
+		<defName>Bullet_762x51mmUNSC_Incendiary_DMR</defName>
+		<label>7.62mm UNSC bullet (AP-I)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>13</damageAmountBase>
+			<armorPenetrationSharp>22</armorPenetrationSharp>
+			<armorPenetrationBlunt>74.72</armorPenetrationBlunt>
+			<speed>184</speed>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>7</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base762x51mmNATOBullet">
+		<defName>Bullet_762x51mmUNSC_HE_DMR</defName>
+		<label>7.62mm UNSC bullet (HEDP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>21</damageAmountBase>
+			<armorPenetrationSharp>11</armorPenetrationSharp>
+			<armorPenetrationBlunt>74.72</armorPenetrationBlunt>
+			<speed>184</speed>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>12</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base762x51mmNATOBullet">
+		<defName>Bullet_762x51mmUNSC_Sabot_DMR</defName>
+		<label>7.62mm UNSC bullet (Sabot)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>11</damageAmountBase>
+			<armorPenetrationSharp>33</armorPenetrationSharp>
+			<armorPenetrationBlunt>100.28</armorPenetrationBlunt>
+			<speed>228</speed>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="UNAmmoRecipeBase">
+		<defName>MakeAmmo_762x51mmUNSC_FMJ</defName>
+		<label>make 7.62x51mm UNSC (FMJ) cartridge x500</label>
+		<description>Craft 500 7.62x51mm UNSC (FMJ) cartridges.</description>
+		<jobString>Making 7.62x51mm UNSC (FMJ) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>26</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_762x51mmUNSC_FMJ>500</Ammo_762x51mmUNSC_FMJ>
+		</products>
+		<workAmount>3400</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="UNAmmoRecipeBase">
+		<defName>MakeAmmo_762x51mmUNSC_AP</defName>
+		<label>make 7.62x51mm UNSC (AP) cartridge x500</label>
+		<description>Craft 500 7.62x51mm UNSC (AP) cartridges.</description>
+		<jobString>Making 7.62x51mm UNSC (AP) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>26</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_762x51mmUNSC_AP>500</Ammo_762x51mmUNSC_AP>
+		</products>
+		<workAmount>3400</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="UNAmmoRecipeBase">
+		<defName>MakeAmmo_762x51mmUNSC_HP</defName>
+		<label>make 7.62x51mm UNSC (HP) cartridge x500</label>
+		<description>Craft 500 7.62x51mm UNSC (HP) cartridges.</description>
+		<jobString>Making 7.62x51mm UNSC (HP) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>26</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_762x51mmUNSC_HP>500</Ammo_762x51mmUNSC_HP>
+		</products>
+		<workAmount>3400</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="UNAmmoRecipeBase">
+		<defName>MakeAmmo_762x51mmUNSC_Shredder</defName>
+		<label>make 7.62x51mm UNSC (Shredder) cartridge x500</label>
+		<description>Craft 500 7.62x51mm UNSC (Shredder) cartridges.</description>
+		<jobString>Making 7.62x51mm UNSC (Shredder) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>30</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_762x51mmUNSC_Shredder>500</Ammo_762x51mmUNSC_Shredder>
+		</products>
+		<workAmount>4000</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AdvancedAmmoRecipeBase">
+		<defName>MakeAmmo_762x51mmUNSC_Incendiary</defName>
+		<label>make 7.62x51mm UNSC (AP-I) cartridge x500</label>
+		<description>Craft 500 7.62x51mm UNSC (AP-I) cartridges.</description>
+		<jobString>Making 7.62x51mm UNSC (AP-I) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>26</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Prometheum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_762x51mmUNSC_Incendiary>500</Ammo_762x51mmUNSC_Incendiary>
+		</products>
+		<workAmount>5000</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AdvancedAmmoRecipeBase">
+		<defName>MakeAmmo_762x51mmUNSC_HE</defName>
+		<label>make 7.62x51mm UNSC (HEDP) cartridge x500</label>
+		<description>Craft 500 7.62x51mm UNSC (HEDP) cartridges.</description>
+		<jobString>Making 7.62x51mm UNSC (HEDP) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>26</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_762x51mmUNSC_HE>500</Ammo_762x51mmUNSC_HE>
+		</products>
+		<workAmount>6000</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AdvancedAmmoRecipeBase">
+		<defName>MakeAmmo_762x51mmUNSC_Sabot</defName>
+		<label>make 7.62x51mm UNSC (Sabot) cartridge x500</label>
+		<description>Craft 500 7.62x51mm UNSC (Sabot) cartridges.</description>
+		<jobString>Making 7.62x51mm UNSC (Sabot) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>16</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Chemfuel</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Uranium</li>
+				<li>Chemfuel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_762x51mmUNSC_Sabot>500</Ammo_762x51mmUNSC_Sabot>
+		</products>
+		<workAmount>4000</workAmount>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Halo Ammo/Defs/Halo Ammo/8 Gauge.xml b/ModPatches/Halo Ammo/Defs/Halo Ammo/8 Gauge.xml
new file mode 100644
index 0000000000..6bfa7bcc8a
--- /dev/null
+++ b/ModPatches/Halo Ammo/Defs/Halo Ammo/8 Gauge.xml	
@@ -0,0 +1,281 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>Ammo8Gauge</defName>
+		<label>8 gauge</label>
+		<parent>AmmoShotguns</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberShotgun</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_8GaugeUNSC</defName>
+		<label>8 Gauge</label>
+		<ammoTypes>
+			<Ammo_8Gauge_Buck>Bullet_8Gauge_Buck</Ammo_8Gauge_Buck>
+			<Ammo_8Gauge_Slug>Bullet_8Gauge_Slug</Ammo_8Gauge_Slug>
+			<Ammo_8Gauge_ElectroSlug>Bullet_8Gauge_ElectroSlug</Ammo_8Gauge_ElectroSlug>
+			<Ammo_8Gauge_Flechette>Bullet_8Gauge_Flechette</Ammo_8Gauge_Flechette>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="8GaugeBase" ParentName="MediumAmmoBase" Abstract="True">
+		<description>An uncommon, oversized shotgun shell used primarily in military application.</description>
+		<statBases>
+			<Mass>0.04</Mass>
+			<Bulk>0.08</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo8Gauge</li>
+		</thingCategories>
+		<stackLimit>3000</stackLimit>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="8GaugeBase">
+		<defName>Ammo_8Gauge_Buck</defName>
+		<label>Soellkraft 8 gauge shell (Buck)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Shotgun/Shot</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.2</MarketValue>
+		</statBases>
+		<ammoClass>BuckShot</ammoClass>
+		<cookOffProjectile>Bullet_8Gauge_Buck</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="8GaugeBase">
+		<defName>Ammo_8Gauge_Flechette</defName>
+		<label>Soellkraft 8 gauge shell (Flechette)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Shotgun/Shot</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.2</MarketValue>
+		</statBases>
+		<ammoClass>Sabot</ammoClass>
+		<cookOffProjectile>Bullet_8Gauge_Flechette</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="8GaugeBase">
+		<defName>Ammo_8Gauge_Slug</defName>
+		<label>Soellkraft 8 gauge shell (Slug)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Shotgun/Slug</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<Mass>0.08</Mass>
+			<MarketValue>0.3</MarketValue>
+		</statBases>
+		<ammoClass>Slug</ammoClass>
+		<cookOffProjectile>Bullet_8Gauge_Slug</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="8GaugeBase">
+		<defName>Ammo_8Gauge_ElectroSlug</defName>
+		<label>Soellkraft 8 gauge shell (EMP)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Shotgun/EMP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<Mass>0.08</Mass>
+			<MarketValue>1.2</MarketValue>
+		</statBases>
+		<ammoClass>ElectroSlug</ammoClass>
+		<cookOffProjectile>Bullet_8Gauge_ElectroSlug</cookOffProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base12GaugeBullet">
+		<defName>Bullet_8Gauge_Buck</defName>
+		<label>buckshot pellet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shotgun_Pellet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>9</damageAmountBase>
+			<pelletCount>15</pelletCount>
+			<armorPenetrationSharp>5.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>6.52</armorPenetrationBlunt>
+			<spreadMult>17.8</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base12GaugeBullet">
+		<defName>Bullet_8Gauge_Flechette</defName>
+		<label>Flechette</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shotgun_Pellet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>5</damageAmountBase>
+			<pelletCount>15</pelletCount>
+			<armorPenetrationSharp>11</armorPenetrationSharp>
+			<armorPenetrationBlunt>7.52</armorPenetrationBlunt>
+			<spreadMult>17.8</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base12GaugeBullet">
+		<defName>Bullet_8Gauge_Slug</defName>
+		<label>shotgun slug</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>114</speed>
+			<damageAmountBase>39</damageAmountBase>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+			<armorPenetrationBlunt>98.2</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base12GaugeBullet">
+		<defName>Bullet_8Gauge_ElectroSlug</defName>
+		<label>EMP slug</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>54</speed>
+			<damageDef>EMP</damageDef>
+			<damageAmountBase>22</damageAmountBase>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+			<empShieldBreakChance>0.35</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipe ========================== -->
+
+	<RecipeDef ParentName="UNAmmoRecipeBase">
+		<defName>MakeAmmo_8Gauge_Buck</defName>
+		<label>make 8 gauge (Buck) shell x200</label>
+		<description>Craft 200 8 gauge (Buck) shells.</description>
+		<jobString>Making 8 gauge (Buck) shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_8Gauge_Buck>200</Ammo_8Gauge_Buck>
+		</products>
+		<workAmount>2500</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="UNAmmoRecipeBase">
+		<defName>MakeAmmo_8Gauge_Slug</defName>
+		<label>make 8 gauge (Slug) shell x200</label>
+		<description>Craft 200 8 gauge (Slug) shells.</description>
+		<jobString>Making 8 gauge (Slug) shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>36</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_8Gauge_Slug>200</Ammo_8Gauge_Slug>
+		</products>
+		<workAmount>4000</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AdvancedAmmoRecipeBase">
+		<defName>MakeAmmo_8Gauge_Flechette</defName>
+		<label>make 8 gauge (Flechette) shell x200</label>
+		<description>Craft 200 8 gauge (Flechette) shells.</description>
+		<jobString>Making 8 gauge (Flechette) shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>30</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_8Gauge_Flechette>200</Ammo_8Gauge_Flechette>
+		</products>
+		<workAmount>9000</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="UNAmmoRecipeBase">
+		<defName>MakeAmmo_8Gauge_ElectroSlug</defName>
+		<label>make 8 gauge (EMP) shell x200</label>
+		<description>Craft 200 8 gauge (EMP) shells.</description>
+		<jobString>Making 8 gauge (EMP) shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>36</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_8Gauge_ElectroSlug>200</Ammo_8Gauge_ElectroSlug>
+		</products>
+		<workAmount>9000</workAmount>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Halo Ammo/Defs/Halo Ammo/9.5x40mm.xml b/ModPatches/Halo Ammo/Defs/Halo Ammo/9.5x40mm.xml
new file mode 100644
index 0000000000..62964cdad8
--- /dev/null
+++ b/ModPatches/Halo Ammo/Defs/Halo Ammo/9.5x40mm.xml	
@@ -0,0 +1,408 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>Ammo95x40mmUNSC</defName>
+		<label>9.5x40mm UNSC</label>
+		<parent>AmmoRifles</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_95x40mmUNSC</defName>
+		<label>9.5x40mm UNSC</label>
+		<ammoTypes>
+			<Ammo_95x40mmUNSC_FMJ>Bullet_95x40mmUNSC_FMJ</Ammo_95x40mmUNSC_FMJ>
+			<Ammo_95x40mmUNSC_AP>Bullet_95x40mmUNSC_AP</Ammo_95x40mmUNSC_AP>
+			<Ammo_95x40mmUNSC_HP>Bullet_95x40mmUNSC_HP</Ammo_95x40mmUNSC_HP>
+			<Ammo_95x40mmUNSC_Incendiary>Bullet_95x40mmUNSC_Incendiary</Ammo_95x40mmUNSC_Incendiary>
+			<Ammo_95x40mmUNSC_HE>Bullet_95x40mmUNSC_HE</Ammo_95x40mmUNSC_HE>
+			<Ammo_95x40mmUNSC_Sabot>Bullet_95x40mmUNSC_Sabot</Ammo_95x40mmUNSC_Sabot>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="95x40mmUNSCBase" ParentName="SmallAmmoBase" Abstract="True">
+		<description>A relatively rare large diameter rifle cartridge, advanced propellents allow it to be shortened consideraly without any loss of power. It is currently only used by UNSC battlerifles.</description>
+		<statBases>
+			<Mass>0.024</Mass>
+			<Bulk>0.02</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo95x40mmUNSC</li>
+		</thingCategories>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="95x40mmUNSCBase">
+		<defName>Ammo_95x40mmUNSC_FMJ</defName>
+		<label>9.5x40mm UNSC cartridge (FMJ)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/FMJ</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.12</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<generateAllowChance>0.4</generateAllowChance>
+		<cookOffProjectile>Bullet_95x40mmUNSC_FMJ</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="95x40mmUNSCBase">
+		<defName>Ammo_95x40mmUNSC_AP</defName>
+		<label>9.5x40mm UNSC cartridge (AP)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/AP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.12</MarketValue>
+		</statBases>
+		<ammoClass>ArmorPiercing</ammoClass>
+		<generateAllowChance>0.4</generateAllowChance>
+		<cookOffProjectile>Bullet_95x40mmUNSC_AP</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="95x40mmUNSCBase">
+		<defName>Ammo_95x40mmUNSC_HP</defName>
+		<label>9.5x40mm UNSC cartridge (HP)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/HP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.12</MarketValue>
+		</statBases>
+		<ammoClass>HollowPoint</ammoClass>
+		<generateAllowChance>0.1</generateAllowChance>
+		<cookOffProjectile>Bullet_95x40mmUNSC_HP</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="95x40mmUNSCBase">
+		<defName>Ammo_95x40mmUNSC_Incendiary</defName>
+		<label>9.5x40mm UNSC cartridge (AP-I)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/Incendiary</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.17</MarketValue>
+		</statBases>
+		<ammoClass>IncendiaryAP</ammoClass>
+		<generateAllowChance>0.2</generateAllowChance>
+		<cookOffProjectile>Bullet_95x40mmUNSC_Incendiary</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="95x40mmUNSCBase">
+		<defName>Ammo_95x40mmUNSC_HE</defName>
+		<label>9.5x40mm UNSC cartridge (HEDP)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/HE</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.20</MarketValue>
+		</statBases>
+		<ammoClass>ExplosiveAP</ammoClass>
+		<generateAllowChance>0.2</generateAllowChance>
+		<cookOffProjectile>Bullet_95x40mmUNSC_HE</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="95x40mmUNSCBase">
+		<defName>Ammo_95x40mmUNSC_Sabot</defName>
+		<label>9.5x40mm UNSC cartridge (Sabot)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/Sabot</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.13</MarketValue>
+			<Mass>0.02</Mass>
+		</statBases>
+		<ammoClass>Sabot</ammoClass>
+		<generateAllowChance>0.2</generateAllowChance>
+		<cookOffProjectile>Bullet_95x40mmUNSC_Sabot</cookOffProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base762x51mmNATOBullet">
+		<defName>Bullet_95x40mmUNSC_FMJ</defName>
+		<label>9.5mm UNSC bullet (FMJ)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>23</damageAmountBase>
+			<armorPenetrationSharp>12</armorPenetrationSharp>
+			<armorPenetrationBlunt>80.72</armorPenetrationBlunt>
+			<speed>176</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base762x51mmNATOBullet">
+		<defName>Bullet_95x40mmUNSC_AP</defName>
+		<label>9.5mm UNSC bullet (AP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>15</damageAmountBase>
+			<armorPenetrationSharp>24</armorPenetrationSharp>
+			<armorPenetrationBlunt>80.72</armorPenetrationBlunt>
+			<speed>176</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base762x51mmNATOBullet">
+		<defName>Bullet_95x40mmUNSC_HP</defName>
+		<label>9.5mm UNSC bullet (HP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>28</damageAmountBase>
+			<armorPenetrationSharp>6</armorPenetrationSharp>
+			<armorPenetrationBlunt>80.72</armorPenetrationBlunt>
+			<speed>176</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base762x51mmNATOBullet">
+		<defName>Bullet_95x40mmUNSC_Incendiary</defName>
+		<label>9.5mm UNSC bullet (AP-I)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>15</damageAmountBase>
+			<armorPenetrationSharp>24</armorPenetrationSharp>
+			<armorPenetrationBlunt>80.72</armorPenetrationBlunt>
+			<speed>176</speed>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>8</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base762x51mmNATOBullet">
+		<defName>Bullet_95x40mmUNSC_HE</defName>
+		<label>9.5mm UNSC bullet (HEDP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>23</damageAmountBase>
+			<armorPenetrationSharp>12</armorPenetrationSharp>
+			<armorPenetrationBlunt>80.72</armorPenetrationBlunt>
+			<speed>176</speed>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>13</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base762x51mmNATOBullet">
+		<defName>Bullet_95x40mmUNSC_Sabot</defName>
+		<label>9.5mm UNSC bullet (Sabot)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>11</damageAmountBase>
+			<armorPenetrationSharp>35</armorPenetrationSharp>
+			<armorPenetrationBlunt>101.28</armorPenetrationBlunt>
+			<speed>228</speed>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="UNAmmoRecipeBase">
+		<defName>MakeAmmo_95x40mmUNSC_FMJ</defName>
+		<label>make 9.5x40mm UNSC (FMJ) cartridge x500</label>
+		<description>Craft 500 9.5x40mm UNSC (FMJ) cartridges.</description>
+		<jobString>Making 9.5x40mm UNSC (FMJ) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>29</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_95x40mmUNSC_FMJ>500</Ammo_95x40mmUNSC_FMJ>
+		</products>
+		<workAmount>5000</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="UNAmmoRecipeBase">
+		<defName>MakeAmmo_95x40mmUNSC_AP</defName>
+		<label>make 9.5x40mm UNSC (AP) cartridge x500</label>
+		<description>Craft 500 9.5x40mm UNSC (AP) cartridges.</description>
+		<jobString>Making 9.5x40mm UNSC (AP) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>29</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_95x40mmUNSC_AP>500</Ammo_95x40mmUNSC_AP>
+		</products>
+		<workAmount>5000</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="UNAmmoRecipeBase">
+		<defName>MakeAmmo_95x40mmUNSC_HP</defName>
+		<label>make 9.5x40mm UNSC (HP) cartridge x500</label>
+		<description>Craft 500 9.5x40mm UNSC (HP) cartridges.</description>
+		<jobString>Making 9.5x40mm UNSC (HP) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>29</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_95x40mmUNSC_HP>500</Ammo_95x40mmUNSC_HP>
+		</products>
+		<workAmount>5000</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AdvancedAmmoRecipeBase">
+		<defName>MakeAmmo_95x40mmUNSC_Incendiary</defName>
+		<label>make 9.5x40mm UNSC (AP-I) cartridge x500</label>
+		<description>Craft 500 9.5x40mm UNSC (AP-I) cartridges.</description>
+		<jobString>Making 9.5x40mm UNSC (AP-I) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>29</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Prometheum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_95x40mmUNSC_Incendiary>500</Ammo_95x40mmUNSC_Incendiary>
+		</products>
+		<workAmount>6900</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AdvancedAmmoRecipeBase">
+		<defName>MakeAmmo_95x40mmUNSC_HE</defName>
+		<label>make 9.5x40mm UNSC (HEDP) cartridge x500</label>
+		<description>Craft 500 9.5x40mm UNSC (HEDP) cartridges.</description>
+		<jobString>Making 9.5x40mm UNSC (HEDP) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>29</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_95x40mmUNSC_HE>500</Ammo_95x40mmUNSC_HE>
+		</products>
+		<workAmount>6900</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AdvancedAmmoRecipeBase">
+		<defName>MakeAmmo_95x40mmUNSC_Sabot</defName>
+		<label>make 9.5x40mm UNSC (Sabot) cartridge x500</label>
+		<description>Craft 500 9.5x40mm UNSC (Sabot) cartridges.</description>
+		<jobString>Making 9.5x40mm UNSC (Sabot) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>18</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Chemfuel</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Uranium</li>
+				<li>Chemfuel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_95x40mmUNSC_Sabot>500</Ammo_95x40mmUNSC_Sabot>
+		</products>
+		<workAmount>5000</workAmount>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Halo Ammo/Defs/Halo Ammo/Ammo_SpartanLaser.xml b/ModPatches/Halo Ammo/Defs/Halo Ammo/Ammo_SpartanLaser.xml
new file mode 100644
index 0000000000..03b3a3a06d
--- /dev/null
+++ b/ModPatches/Halo Ammo/Defs/Halo Ammo/Ammo_SpartanLaser.xml	
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- === Spartan Laser Beam === -->
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletRed">
+		<defName>Bullet_Laser_SpartanLaserInf</defName>
+		<label>laser beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>100</damageAmountBase>
+			<armorPenetrationSharp>600</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Burn</def>
+					<amount>100</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>100</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1.0</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+		<seam>2</seam>
+	</ThingDef>
+
+	<!-- === Spartan Laser Battery === -->
+
+	<ThingCategoryDef>
+		<defName>AmmoHeavyLaserChargePack</defName>
+		<label>heavy laser charge pack</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_SpartanLaser</defName>
+		<label>Spartan laser battery cell</label>
+		<ammoTypes>
+			<Ammo_HeavyLaserChargePack>Bullet_Laser_SpartanLaser</Ammo_HeavyLaserChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="HeavyLaserChargePackBase" ParentName="SpacerMediumAmmoBase" Abstract="True">
+		<description>A battery pack for a heavy laser weapon.</description>
+		<statBases>
+			<Mass>0.5</Mass>
+			<Bulk>1</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade_Sellable</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoHeavyLaserChargePack</li>
+		</thingCategories>
+		<stackLimit>200</stackLimit>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="LaserChargePackBase">
+		<defName>Ammo_HeavyLaserChargePack</defName>
+		<label>heavy laser charge pack</label>
+		<graphicData>
+			<texPath>Things/Ammo/PlasmaCell/Heavy</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>10.69</MarketValue>
+		</statBases>
+		<ammoClass>Charged</ammoClass>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_HeavyLaserChargePack</defName>
+		<label>make laser charge pack x10</label>
+		<description>Craft 10 laser charge pack.</description>
+		<jobString>Making laser charge pack.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Plasteel</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_HeavyLaserChargePack>10</Ammo_HeavyLaserChargePack>
+		</products>
+		<workAmount>8400</workAmount>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Halo Ammo/Defs/Halo Ammo/Ammo_UNSC_Misc.xml b/ModPatches/Halo Ammo/Defs/Halo Ammo/Ammo_UNSC_Misc.xml
new file mode 100644
index 0000000000..b523904fbb
--- /dev/null
+++ b/ModPatches/Halo Ammo/Defs/Halo Ammo/Ammo_UNSC_Misc.xml	
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<RecipeDef Name="UNAmmoRecipeBase" ParentName="AmmoRecipeBase" Abstract="true">
+		<researchPrerequisite>MicroelectronicsBasics</researchPrerequisite>
+	</RecipeDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>Shredder</defName>
+		<label>Shredder</label>
+		<labelShort>Shredder</labelShort>
+		<description>Splinters on impact in many small fragments, tearing through light armor and "shredding" targets into ribbons. Increasing tissue damage at the cost of armor penetration.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Halo UNSC Weapon Pack/Patches/Halo UNSC Weapon Pack/UNSC_CE.xml b/ModPatches/Halo UNSC Weapon Pack/Patches/Halo UNSC Weapon Pack/UNSC_CE.xml
new file mode 100644
index 0000000000..baa3391875
--- /dev/null
+++ b/ModPatches/Halo UNSC Weapon Pack/Patches/Halo UNSC Weapon Pack/UNSC_CE.xml	
@@ -0,0 +1,632 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ResearchProjectDef[defName="UNSC_RocketLauncher"]/prerequisites</xpath>
+		<value>
+			<prerequisites>
+				<li>CE_Launchers</li>
+				<li>Basic_UNSCWeapons</li>
+			</prerequisites>
+		</value>
+	</Operation>
+
+	<!-- ========== Melee Tools ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="M7_SubmachineGun" or defName="M6D_Personal_Defense_Weapon_System"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MA5D_ICWS" or defName="BR85_Service_Rifle" or defName="M90-CAWS_Shotgun"
+			or defName="SRS99C-S2_AM" or defName="M392_Designated_Marksman_Rifle" or defName="M41_SSR_MAV_AW" or defName="M319_Individual_Grenade_Launcher" or defName="M739_SAW" or defName="Asymmetric_Recoilless_Carbine" or defName="W-AV_M6_G-NR"]/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>7</power>
+					<cooldownTime>1.55</cooldownTime>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='M6D_Personal_Defense_Weapon_System' or defName='M7_SubmachineGun' or defName='M319_Individual_Grenade_Launcher']/recipeMaker/skillRequirements</xpath>
+		<value>
+			<skillRequirements>
+				<Crafting>5</Crafting>
+			</skillRequirements>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='MA5D_ICWS' or defName='BR85_Service_Rifle' or defName='M392_Designated_Marksman_Rifle']/recipeMaker/skillRequirements</xpath>
+		<value>
+			<skillRequirements>
+				<Crafting>6</Crafting>
+			</skillRequirements>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='SRS99C-S2_AM' or defName='M739_SAW' or defName='Asymmetric_Recoilless_Carbine']/recipeMaker/skillRequirements</xpath>
+		<value>
+			<skillRequirements>
+				<Crafting>7</Crafting>
+			</skillRequirements>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='W-AV_M6_G-NR']/recipeMaker/skillRequirements</xpath>
+		<value>
+			<skillRequirements>
+				<Crafting>8</Crafting>
+			</skillRequirements>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName='SRS99C-S2_AM' or defName='M739_SAW' or defName='Asymmetric_Recoilless_Carbine' or defName='MA5D_ICWS' or defName='BR85_Service_Rifle' or defName='M392_Designated_Marksman_Rifle' or defName='W-AV_M6_G-NR' or defName='M6D_Personal_Defense_Weapon_System' or defName='M7_SubmachineGun' or defName='M319_Individual_Grenade_Launcher' or defName='M41_SSR_MAV_AW'or defName='M90-CAWS_Shotgun']/statBases/MarketValue</xpath>
+	</Operation>
+
+	<!-- === Spartan Laser === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>W-AV_M6_G-NR</defName>
+		<statBases>
+			<WorkToMake>100000</WorkToMake>
+			<Mass>19.07</Mass>
+			<Bulk>18.00</Bulk>
+			<SwayFactor>2</SwayFactor>
+			<ShotSpread>0.01</ShotSpread>
+			<SightsEfficiency>2.25</SightsEfficiency>
+			<RangedWeapon_Cooldown>1.6</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>100</Steel>
+			<Chemfuel>60</Chemfuel>
+			<Plasteel>100</Plasteel>
+			<ComponentSpacer>6</ComponentSpacer>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Laser_SpartanLaser</defaultProjectile>
+			<warmupTime>2.6</warmupTime>
+			<range>86</range>
+			<soundCast>Shot_SpartanLaser</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>18</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>4</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_SpartanLaser</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== MA5C ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>MA5D_ICWS</defName>
+		<statBases>
+			<WorkToMake>31000</WorkToMake>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.32</SwayFactor>
+			<Bulk>8</Bulk>
+			<Mass>3.8</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmUNSC_FMJ</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>Shot_MA5D</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+			<recoilAmount>1.8</recoilAmount>
+		</Properties>
+		<costList>
+			<Steel>60</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+			<Chemfuel>20</Chemfuel>
+		</costList>
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_762x51mmUNSC</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== BR85 ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BR85_Service_Rifle</defName>
+		<statBases>
+			<WorkToMake>35000</WorkToMake>
+			<SightsEfficiency>1.5</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.4</SwayFactor>
+			<Bulk>8</Bulk>
+			<Mass>3.8</Mass>
+			<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_95x40mmUNSC_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>60</range>
+			<soundCast>Shot_BattleRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilAmount>1.67</recoilAmount>
+		</Properties>
+		<costList>
+			<Steel>60</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+			<Chemfuel>20</Chemfuel>
+		</costList>
+		<AmmoUser>
+			<magazineSize>36</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_95x40mmUNSC</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== SAW ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>M739_SAW</defName>
+		<statBases>
+			<WorkToMake>56000</WorkToMake>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.43</SwayFactor>
+			<Bulk>12</Bulk>
+			<Mass>6</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmUNSC_FMJ</defaultProjectile>
+			<warmupTime>1.25</warmupTime>
+			<range>62</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>Shot_SAW</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<recoilAmount>1.33</recoilAmount>
+		</Properties>
+		<costList>
+			<Steel>90</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+			<Chemfuel>30</Chemfuel>
+		</costList>
+		<AmmoUser>
+			<magazineSize>128</magazineSize>
+			<reloadTime>6.0</reloadTime>
+			<ammoSet>AmmoSet_762x51mmUNSC</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== M-7 ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>M7_SubmachineGun</defName>
+		<statBases>
+			<WorkToMake>18000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.24</SwayFactor>
+			<Bulk>3.75</Bulk>
+			<Mass>1.8</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_5x23mmCaseless_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>26</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>Shot_SMG</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+			<recoilAmount>1.17</recoilAmount>
+		</Properties>
+		<costList>
+			<Steel>35</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<AmmoUser>
+			<magazineSize>60</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_5x23mmCaseless</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== SRS99 ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>SRS99C-S2_AM</defName>
+		<statBases>
+			<WorkToMake>56000</WorkToMake>
+			<SightsEfficiency>3.5</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.88</SwayFactor>
+			<Bulk>15.0</Bulk>
+			<Mass>8.20</Mass>
+			<RangedWeapon_Cooldown>1.0</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_145x114mmUNSC_FMJ</defaultProjectile>
+			<warmupTime>3.2</warmupTime>
+			<range>90</range>
+			<soundCast>Shot_SRS99C-S2_AM</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<costList>
+			<Steel>80</Steel>
+			<Plasteel>20</Plasteel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+			<Chemfuel>30</Chemfuel>
+		</costList>
+		<AmmoUser>
+			<magazineSize>4</magazineSize>
+			<reloadTime>4.8</reloadTime>
+			<ammoSet>AmmoSet_145x114mmUNSC</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Shotgun ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>M90-CAWS_Shotgun</defName>
+		<statBases>
+			<WorkToMake>25000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.28</SwayFactor>
+			<Bulk>8</Bulk>
+			<Mass>3.4</Mass>
+			<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_8Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>18</range>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<costList>
+			<Steel>60</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+			<Chemfuel>20</Chemfuel>
+		</costList>
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_8GaugeUNSC</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>False</aiUseBurstMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ==========heavy Magnum ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>M6D_Personal_Defense_Weapon_System</defName>
+		<statBases>
+			<WorkToMake>13000</WorkToMake>
+			<SightsEfficiency>0.75</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.35</SwayFactor>
+			<Bulk>2.5</Bulk>
+			<Mass>1</Mass>
+			<RangedWeapon_Cooldown>0.48</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_127x40mm_FMJ</defaultProjectile>
+			<warmupTime>0.66</warmupTime>
+			<range>15</range>
+			<soundCast>Shot_Magnum</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<costList>
+			<Steel>30</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_127x40mmUNSC</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>False</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Grenadier === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>M319_Individual_Grenade_Launcher</defName>
+		<statBases>
+			<WorkToMake>12000</WorkToMake>
+			<Mass>3</Mass>
+			<Bulk>7.0</Bulk>
+			<SwayFactor>1</SwayFactor>
+			<ShotSpread>0.12</ShotSpread>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<Chemfuel>20</Chemfuel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_40mmGrenade_UNSCHEDP</defaultProjectile>
+			<burstShotCount>1</burstShotCount>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<ai_AvoidFriendlyFireRadius>4</ai_AvoidFriendlyFireRadius>
+			<minRange>4</minRange>
+			<soundCast>Shot_Halo_GrenadeLauncher</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<magazineSize>1</magazineSize>
+			<reloadTime>2</reloadTime>
+			<ammoSet>AmmoSet_40mmGrenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- === Railgun === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Asymmetric_Recoilless_Carbine</defName>
+		<statBases>
+			<WorkToMake>60000</WorkToMake>
+			<Mass>14.9</Mass>
+			<Bulk>12.0</Bulk>
+			<SwayFactor>1.5</SwayFactor>
+			<ShotSpread>0.01</ShotSpread>
+			<SightsEfficiency>1.6</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>60</Steel>
+			<Chemfuel>40</Chemfuel>
+			<Plasteel>50</Plasteel>
+			<ComponentSpacer>2</ComponentSpacer>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_16x65mm_HE</defaultProjectile>
+			<burstShotCount>1</burstShotCount>
+			<warmupTime>1.45</warmupTime>
+			<range>78</range>
+			<minRange>1.5</minRange>
+			<soundCast>Shot_Halo_Railgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+				<canTargetPawns>true</canTargetPawns>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>2</reloadTime>
+			<ammoSet>AmmoSet_16x65mm</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- === Rocket Launcher === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>M41_SSR_MAV_AW</defName>
+		<statBases>
+			<WorkToMake>45000</WorkToMake>
+			<Mass>8</Mass>
+			<Bulk>12.0</Bulk>
+			<SwayFactor>2</SwayFactor>
+			<ShotSpread>0.03</ShotSpread>
+			<SightsEfficiency>2</SightsEfficiency>
+			<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>100</Steel>
+			<Chemfuel>30</Chemfuel>
+			<Plasteel>20</Plasteel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_M41Rocket_HEAT</defaultProjectile>
+			<burstShotCount>1</burstShotCount>
+			<warmupTime>2</warmupTime>
+			<range>62</range>
+			<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+			<minRange>4</minRange>
+			<soundCast>Shot_Halo_Rocketlauncher</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<onlyManualCast>True</onlyManualCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+				<canTargetPawns>true</canTargetPawns>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<magazineSize>2</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_M41Rocket</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== M392 DMR========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>M392_Designated_Marksman_Rifle</defName>
+		<statBases>
+			<WorkToMake>35000</WorkToMake>
+			<SightsEfficiency>2.4</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.47</SwayFactor>
+			<Bulk>10.0</Bulk>
+			<Mass>4.40</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmUNSC_FMJ_DMR</defaultProjectile>
+			<burstShotCount>2</burstShotCount>
+			<ticksBetweenBurstShots>45</ticksBetweenBurstShots>
+			<recoilAmount>1.56</recoilAmount>
+			<warmupTime>1.2</warmupTime>
+			<range>72</range>
+			<soundCast>Shot_DMR</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<costList>
+			<Steel>60</Steel>
+			<Chemfuel>20</Chemfuel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_762x51mmUNSC_DMR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Heavy Melee Weapons/Patches/Heavy Melee Weapons/ThingDefs_Misc/Weapons.xml b/ModPatches/Heavy Melee Weapons/Patches/Heavy Melee Weapons/ThingDefs_Misc/Weapons.xml
new file mode 100644
index 0000000000..2cadbe304b
--- /dev/null
+++ b/ModPatches/Heavy Melee Weapons/Patches/Heavy Melee Weapons/ThingDefs_Misc/Weapons.xml	
@@ -0,0 +1,450 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==========  Maul  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_PsychicWarhammer" or
+			defName="HMW_MeleeWeapon_PersonaPsychicWarhammer"]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.78</cooldownTime>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>2.75</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>1200</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_PsychicWarhammer"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.10</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_PsychicWarhammer"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0.50</MeleeParryChance>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_PersonaPsychicWarhammer"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.30</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_PersonaPsychicWarhammer"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.70</MeleeParryChance>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_PsychicWarhammer" or
+			defName="HMW_MeleeWeapon_PersonaPsychicWarhammer"]/statBases/Mass </xpath>
+		<value>
+			<Mass>25</Mass>
+			<Bulk>20</Bulk>
+		</value>
+	</Operation>
+
+	<!-- ==========  Heavy Monosword  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_HeavyMonoSword" or
+			defName="HMW_MeleeWeapon_PersonaHeavyMonoSword"]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.32</cooldownTime>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3.375</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>29</power>
+					<cooldownTime>3.12</cooldownTime>
+					<chanceFactor>1.2</chanceFactor>
+					<armorPenetrationBlunt>5.415</armorPenetrationBlunt>
+					<armorPenetrationSharp>67.7</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>80</power>
+					<cooldownTime>3.36</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>12.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>35.72</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_HeavyMonoSword"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.10</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_HeavyMonoSword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.05</MeleeCritChance>
+				<MeleeParryChance>0.50</MeleeParryChance>
+				<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_PersonaHeavyMonoSword"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.30</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_PersonaHeavyMonoSword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.25</MeleeCritChance>
+				<MeleeParryChance>0.70</MeleeParryChance>
+				<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_HeavyMonoSword" or
+			defName="HMW_MeleeWeapon_PersonaHeavyMonoSword"]/statBases/Mass </xpath>
+		<value>
+			<Mass>25</Mass>
+			<Bulk>20</Bulk>
+		</value>
+	</Operation>
+
+	<!-- ==========  Zeusblade  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_ZeusSword" or
+			defName="HMW_MeleeWeapon_PersonaZeusSword"]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>38</power>
+					<extraMeleeDamages>
+						<li>
+							<def>EMP</def>
+							<amount>15</amount>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>3.12</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>5.415</armorPenetrationBlunt>
+					<armorPenetrationSharp>43.32</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>68</power>
+					<extraMeleeDamages>
+						<li>
+							<def>EMP</def>
+							<amount>15</amount>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>3.94</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>9.68</armorPenetrationBlunt>
+					<armorPenetrationSharp>32.7</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.12</cooldownTime>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>4.05</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_ZeusSword"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.10</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_ZeusSword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.05</MeleeCritChance>
+				<MeleeParryChance>0.50</MeleeParryChance>
+				<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_PersonaZeusSword"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.30</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_PersonaZeusSword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.25</MeleeCritChance>
+				<MeleeParryChance>0.70</MeleeParryChance>
+				<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_ZeusSword" or
+			defName="HMW_MeleeWeapon_PersonaZeusSword"]/statBases/Mass </xpath>
+		<value>
+			<Mass>25</Mass>
+			<Bulk>20</Bulk>
+		</value>
+	</Operation>
+
+	<!-- ==========  Flame Lance  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_FlameLance" or
+			defName="HMW_MeleeWeapon_PersonaFlameLance"]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>48</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>10</amount>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>3.91</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>9.72</armorPenetrationBlunt>
+					<armorPenetrationSharp>97.2</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>55</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>10</amount>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>3.68</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>9.68</armorPenetrationBlunt>
+					<armorPenetrationSharp>27.6</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.32</cooldownTime>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3.375</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_FlameLance"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.10</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_FlameLance"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.05</MeleeCritChance>
+				<MeleeParryChance>0.50</MeleeParryChance>
+				<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_PersonaFlameLance"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.30</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_PersonaFlameLance"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.25</MeleeCritChance>
+				<MeleeParryChance>0.70</MeleeParryChance>
+				<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_FlameLance" or
+			defName="HMW_MeleeWeapon_PersonaFlameLance"]/statBases/Mass </xpath>
+		<value>
+			<Mass>25</Mass>
+			<Bulk>20</Bulk>
+		</value>
+	</Operation>
+
+	<!-- ==========  Heavy Zeushammer  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_HeavyZeushammer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.78</cooldownTime>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>72</power>
+					<extraMeleeDamages>
+						<li>
+							<def>EMP</def>
+							<amount>20</amount>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>5.17</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>412.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_HeavyZeushammer"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.10</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_HeavyZeushammer"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.05</MeleeCritChance>
+				<MeleeParryChance>0.50</MeleeParryChance>
+				<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<!--		
+<li Class="PatchOperationAdd">
+<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_PersonaHeavyZeushammer"]/statBases</xpath>
+<value>
+<MeleeCounterParryBonus>0.30</MeleeCounterParryBonus>
+</value>
+</li>
+
+<li Class="PatchOperationAdd">
+<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_PersonaHeavyZeushammer"]</xpath>
+<value>
+<equippedStatOffsets>
+  <MeleeCritChance>0.25</MeleeCritChance>
+  <MeleeParryChance>0.70</MeleeParryChance>
+  <MeleeDodgeChance>0.25</MeleeDodgeChance>
+</equippedStatOffsets>
+</value>
+</li>
+-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_HeavyZeushammer"]/statBases/Mass</xpath>
+		<value>
+			<Mass>25</Mass>
+			<Bulk>20</Bulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Heyra the Horned/Patches/Heyra the Horned/Bodydef/Heyra_Bodytype.xml b/ModPatches/Heyra the Horned/Patches/Heyra the Horned/Bodydef/Heyra_Bodytype.xml
new file mode 100644
index 0000000000..cfd1dd135c
--- /dev/null
+++ b/ModPatches/Heyra the Horned/Patches/Heyra the Horned/Bodydef/Heyra_Bodytype.xml	
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Arm Groups-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HeyraBody"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HeyraBody"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HeyraBody"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HeyraBody"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<!--Natural Armor-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="HeyraBody"]//*[
+			def="Torso" or
+			def="Neck" or
+			def="Head" or
+			def="Heyra_Horn" or
+			def="Nose" or
+			def="Jaw" or
+			def="Ear" or
+			def="Shoulder" or
+			def="Arm" or
+			def="Hand" or
+			def="Finger" or
+			def="Leg" or
+			def="Foot" or
+			def="Toe"]/groups
+		</xpath>
+
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/High Caliber/Patches/High Caliber/HighCaliber_CE_Patch_Weapons.xml b/ModPatches/High Caliber/Patches/High Caliber/HighCaliber_CE_Patch_Weapons.xml
new file mode 100644
index 0000000000..ad1b78b6a9
--- /dev/null
+++ b/ModPatches/High Caliber/Patches/High Caliber/HighCaliber_CE_Patch_Weapons.xml	
@@ -0,0 +1,1349 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Melee Tools ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="HC_BaseGun"]/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>
+
+	<!-- ========== XM25 CDTE ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_HC_HKXM25_HC</defName>
+		<statBases>
+			<Mass>6.35</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.42</SwayFactor>
+			<Bulk>7.49</Bulk>
+			<WorkToMake>31000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.67</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_25x40mmGrenade_HE</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>48</range>
+			<soundCast>Shot_IncendiaryLauncher</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_25x40mmGrenade</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Launcher</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Saiga-12 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_HC_Saiga12K_HC</defName>
+		<statBases>
+			<Mass>3.50</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.26</SwayFactor>
+			<Bulk>9.10</Bulk>
+			<WorkToMake>20500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.93</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>ShotSaiga12K</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Accuracy International AWM ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_HC_AIAWM_HC</defName>
+		<statBases>
+			<Mass>7.18</Mass>
+			<RangedWeapon_Cooldown>1.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>3.50</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.61</SwayFactor>
+			<Bulk>15.60</Bulk>
+			<WorkToMake>42000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>20</Chemfuel>
+			<Steel>70</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.02</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
+			<warmupTime>2.35</warmupTime>
+			<range>107</range>
+			<soundCast>ShotAWM</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_338Lapua</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Barrett M82A1 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_HC_BarrettM82_HC</defName>
+		<statBases>
+			<Mass>13.50</Mass>
+			<RangedWeapon_Cooldown>0.58</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.84</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.87</SwayFactor>
+			<Bulk>13.00</Bulk>
+			<WorkToMake>38500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>105</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.49</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>3.3</warmupTime>
+			<range>126</range>
+			<soundCast>RNShot50Cal</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Dragunov SVU ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_HC_DragunovSVU_HC</defName>
+		<statBases>
+			<Mass>4.10</Mass>
+			<RangedWeapon_Cooldown>0.57</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>0.92</SwayFactor>
+			<Bulk>9.70</Bulk>
+			<WorkToMake>31000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.99</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>97</range>
+			<soundCast>ShotSVU</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== FN P90TR ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_HC_FNP90_HC</defName>
+		<statBases>
+			<Mass>2.60</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>0.77</SwayFactor>
+			<Bulk>5.05</Bulk>
+			<WorkToMake>37000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>30</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.05</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>31</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>ShotP90</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_FN57x28mm</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Heckler Koch MP5A3 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_HC_HKMP5_HC</defName>
+		<statBases>
+			<Mass>3.10</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.01</SwayFactor>
+			<Bulk>5.50</Bulk>
+			<WorkToMake>30500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.44</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>31</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>ShotMP5</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== UMP45 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_HC_HKUMP45_HC</defName>
+		<statBases>
+			<Mass>2.50</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.94</SwayFactor>
+			<Bulk>4.50</Bulk>
+			<WorkToMake>30500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>30</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.85</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>15</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>ShotUMP45</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== AKS-74U ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_HC_AKS74U_HC</defName>
+		<statBases>
+			<Mass>2.70</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.00</SwayFactor>
+			<Bulk>4.90</Bulk>
+			<WorkToMake>29000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.38</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>0.9</warmupTime>
+			<range>31</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>ShotAKS74U</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== FAMAS ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_HC_FAMAS_HC</defName>
+		<statBases>
+			<Mass>3.61</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.12</SwayFactor>
+			<Bulk>7.17</Bulk>
+			<WorkToMake>37500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>45</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.44</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>40</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericBullpup_II</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== SIG SG553 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_HC_SIGSG553_HC</defName>
+		<statBases>
+			<Mass>3.20</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.05</SwayFactor>
+			<Bulk>5.03</Bulk>
+			<WorkToMake>30500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+			<Chemfuel>5</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>1.35</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>ShotSG553</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Steyr AUG A3 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_HC_SteyrAUG_HC</defName>
+		<statBases>
+			<Mass>3.65</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.09</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.17</SwayFactor>
+			<Bulk>7.90</Bulk>
+			<WorkToMake>39500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>45</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>1.56</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.175</warmupTime>
+			<range>40</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>ShotAUG</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Heckler Koch G36 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_HC_HKG36_HC</defName>
+		<statBases>
+			<Mass>2.82</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.18</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.03</SwayFactor>
+			<Bulk>5.00</Bulk>
+			<WorkToMake>34000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>1.43</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>0.9</warmupTime>
+			<range>31</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>ShotG36</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Heckler Koch MG4 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_HC_HKMG4_HC</defName>
+		<statBases>
+			<Mass>8.15</Mass>
+			<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.18</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.31</SwayFactor>
+			<Bulk>11.30</Bulk>
+			<WorkToMake>44500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>65</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+			<Chemfuel>15</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>0.90</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.25</warmupTime>
+			<range>75</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>ShotMG4</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_MachineGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== AK47 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_HC_AK47_HC</defName>
+		<statBases>
+			<Mass>3.47</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<Bulk>8.80</Bulk>
+			<WorkToMake>27000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>45</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+			<WoodLog>10</WoodLog>
+		</costList>
+		<Properties>
+			<recoilAmount>1.82</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>44</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>ShotAK47</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== FN SCAR-H ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_HC_SCAR-H_HC</defName>
+		<statBases>
+			<Mass>3.58</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.36</SwayFactor>
+			<Bulk>7.11</Bulk>
+			<WorkToMake>35500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>2.09</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>62</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>ShotSCAR_H</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Mk14 EBR ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_HC_Mk14EBR_HC</defName>
+		<statBases>
+			<Mass>6.75</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.60</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>9.89</Bulk>
+			<WorkToMake>33500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>70</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.64</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.6</warmupTime>
+			<range>75</range>
+			<soundCast>ShotMk14EBR</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Glock 17 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_HC_Glock17_HC</defName>
+		<statBases>
+			<Mass>0.63</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.83</SwayFactor>
+			<Bulk>1.86</Bulk>
+			<WorkToMake>7500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>20</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>3.11</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>17</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Gun_HC_Glock17_HC"]</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Desert Eagle ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_HC_DesertEagle_HC</defName>
+		<statBases>
+			<Mass>1.63</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.58</SwayFactor>
+			<Bulk>3.92</Bulk>
+			<WorkToMake>7500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>3.01</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50AE_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot50AE500MAG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_50AE</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Gun_HC_DesertEagle_HC"]</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Smith & Wesson Model 500 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_HC_SW500_HC</defName>
+		<statBases>
+			<Mass>1.96</Mass>
+			<RangedWeapon_Cooldown>0.41</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.92</SwayFactor>
+			<Bulk>3.81</Bulk>
+			<WorkToMake>5000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>35</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>3.52</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_500SWMagnum_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot50AE500MAG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_500SWMagnum</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Gun_HC_SW500_HC"]</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== SIG Sauer P226 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_HC_P226_HC</defName>
+		<statBases>
+			<Mass>0.96</Mass>
+			<RangedWeapon_Cooldown>0.40</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.97</SwayFactor>
+			<Bulk>1.96</Bulk>
+			<WorkToMake>7000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>3.10</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>ShotP226</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>17</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Gun_HC_P226_HC"]</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Heckler Koch HK45 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_HC_HK45_HC</defName>
+		<statBases>
+			<Mass>0.77</Mass>
+			<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.94</SwayFactor>
+			<Bulk>2.04</Bulk>
+			<WorkToMake>7000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>20</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+			<Chemfuel>5</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>3.76</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>ShotHK45</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Gun_HC_HK45_HC"]</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== FN Five-seven ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_HC_Fiveseven_HC</defName>
+		<statBases>
+			<Mass>0.61</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.90</SwayFactor>
+			<Bulk>2.08</Bulk>
+			<WorkToMake>7500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>20</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.87</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>ShotFiveseven</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_FN57x28mm</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Gun_HC_Fiveseven_HC"]</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/High Tech Laboratory Facilities/Patches/High Tech Laboratory Facilities/ThingDef_Apparel.xml b/ModPatches/High Tech Laboratory Facilities/Patches/High Tech Laboratory Facilities/ThingDef_Apparel.xml
new file mode 100644
index 0000000000..69f9456edb
--- /dev/null
+++ b/ModPatches/High Tech Laboratory Facilities/Patches/High Tech Laboratory Facilities/ThingDef_Apparel.xml	
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Leviathan"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>30</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Leviathan"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Apparel_Leviathan"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
+						<parts>
+							<li>Shoulder</li>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.85</ArmorRating_Blunt>
+						<parts>
+							<li>Shoulder</li>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.75</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+							<li>Arm</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_Leviathan"]/statBases</xpath>
+		<value>
+			<Bulk>90</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_Leviathan"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>25</CarryBulk>
+			<CarryWeight>75</CarryWeight>
+			<ShootingAccuracyPawn>1.0</ShootingAccuracyPawn>
+			<ToxicResistance>0.75</ToxicResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Leviathan"]/statBases/Mass</xpath>
+		<value>
+			<Mass>35</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Leviathan"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>125</Steel>
+				<ComponentSpacer>2</ComponentSpacer>
+				<Plasteel>250</Plasteel>
+			</costList>
+		</value>
+	</Operation>
+
+	<!-- ============================= Helmet ============================= -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_LeviathanH"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_LeviathanH"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Apparel_LeviathanH"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.85</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_LeviathanH"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>450</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_LeviathanH"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_LeviathanH"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>2</WornBulk>
+			<NightVisionEfficiency_Apparel>0.80</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_LeviathanH"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>100</Steel>
+				<ComponentSpacer>1</ComponentSpacer>
+				<Plasteel>200</Plasteel>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_LeviathanH"]/equippedStatOffsets</xpath>
+		<value>
+			<PsychicSensitivity>-0.25</PsychicSensitivity>
+			<AimingAccuracy>0.20</AimingAccuracy>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+			<ToxicResistance>0.75</ToxicResistance>
+		</value>
+	</Operation>
+
+	<!-- ============================= Lab Coat ============================= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="LabCoat"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- ============================= Cyber Suit ============================= -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_CyberSuit"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_CyberSuit"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_CyberSuit"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_CyberSuit"]/costList/ComponentIndustrial</xpath>
+		<value>
+			<ComponentSpacer>1</ComponentSpacer>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Hive Armory/Patches/Hive Armory/HiveArmory_Armor.xml b/ModPatches/Hive Armory/Patches/Hive Armory/HiveArmory_Armor.xml
new file mode 100644
index 0000000000..7f9576438f
--- /dev/null
+++ b/ModPatches/Hive Armory/Patches/Hive Armory/HiveArmory_Armor.xml	
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Hive Heavy Armor-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Kenshi_HiverHeavyArmor"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>12</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_HiverHeavyArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_HiverHeavyArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>10</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_HiverHeavyArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeDodgeChance>-0.1</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!--Hive plate Helmet-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Kenshi_HiverHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_HiverHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.25</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_HiverHelmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>2</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kenshi_HiverHelmet"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>50</costStuffCount>
+		</value>
+	</Operation>
+
+	<!-- Hive Chain Vest -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kenshi_HiverChainVest"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>4</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kenshi_HiverChainVest"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_HiverChainVest"]/statBases/Mass</xpath>
+		<value>
+			<Mass>6</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_HiverChainVest"]/statBases/WorkToMake</xpath>
+		<value>
+			<WorkToMake>12000</WorkToMake>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kenshi_HiverChainVest"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>75</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName = "Kenshi_HiverChainVest"]/equippedStatOffsets</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kenshi_HiverChainVest" or defName="Kenshi_HiverLeatherVest"]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>Middle</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<!-- Hive Leather Vest -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kenshi_HiverLeatherVest"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kenshi_HiverLeatherVest"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_HiverLeatherVest"]/statBases/Mass</xpath>
+		<value>
+			<Mass>2.4</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kenshi_HiverLeatherVest"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>60</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_HiverLeatherVest"]/statBases/WorkToMake</xpath>
+		<value>
+			<WorkToMake>8000</WorkToMake>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName = "Kenshi_HiverLeatherVest"]/equippedStatOffsets</xpath>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Hive Armory/Patches/Hive Armory/HiveArmory_Weapons.xml b/ModPatches/Hive Armory/Patches/Hive Armory/HiveArmory_Weapons.xml
new file mode 100644
index 0000000000..299fec3899
--- /dev/null
+++ b/ModPatches/Hive Armory/Patches/Hive Armory/HiveArmory_Weapons.xml	
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kenshi_Polearm"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.31</cooldownTime>
+					<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>2.08</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>4.8</armorPenetrationBlunt>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.64</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>2.4</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.33</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kenshi_Polearm"]/statBases</xpath>
+		<value>
+			<Bulk>11</Bulk>
+			<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kenshi_Polearm"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.21</MeleeCritChance>
+				<MeleeParryChance>1.1</MeleeParryChance>
+				<MeleeDodgeChance>0.8</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kenshi_Polearm"]/stuffCategories</xpath>
+		<value>
+			<stuffCategories>
+				<li>Metallic_Weapon</li>
+			</stuffCategories>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kenshi_Staff"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.31</cooldownTime>
+					<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetrationBlunt>6.0</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Head</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.2</cooldownTime>
+					<armorPenetrationBlunt>3.0</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kenshi_Staff"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>1.2</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kenshi_Staff"]/stuffCategories</xpath>
+		<value>
+			<stuffCategories>
+				<li>Metallic_Weapon</li>
+				<li>Woody</li>
+			</stuffCategories>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Idhale Race/Patches/Idhale Race/Bodies/Idhale_Bodytype.xml b/ModPatches/Idhale Race/Patches/Idhale Race/Bodies/Idhale_Bodytype.xml
new file mode 100644
index 0000000000..a166939e38
--- /dev/null
+++ b/ModPatches/Idhale Race/Patches/Idhale Race/Bodies/Idhale_Bodytype.xml	
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Nearmare Bodytype-->
+
+	<!--Arm Groups-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<!--Natural Armor-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/parts/li[def="Idhale_DevilFire_B"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Eye"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Idhale_DevilFire_F"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/parts/li[def="Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Idhale Race/Patches/Idhale Race/PawnKindDefs/Idhale_PawnKind.xml b/ModPatches/Idhale Race/Patches/Idhale Race/PawnKindDefs/Idhale_PawnKind.xml
new file mode 100644
index 0000000000..2149c77f6a
--- /dev/null
+++ b/ModPatches/Idhale Race/Patches/Idhale Race/PawnKindDefs/Idhale_PawnKind.xml	
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Ammo-->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="HAR_Idhale_KindBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Backpack-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CE_Apparel_Backpack"]/apparel/tags</xpath>
+		<value>
+			<li>HAR_IH_AT_e</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Idhale Race/Patches/Idhale Race/ThingDefs_Misc/Idhale_Apparel.xml b/ModPatches/Idhale Race/Patches/Idhale Race/ThingDefs_Misc/Idhale_Apparel.xml
new file mode 100644
index 0000000000..7dfd76575a
--- /dev/null
+++ b/ModPatches/Idhale Race/Patches/Idhale Race/ThingDefs_Misc/Idhale_Apparel.xml	
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--========= Stuffable =========-->
+
+	<!--Skin Layer minimum protection-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_IH_AO_a"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.25</StuffEffectMultiplierArmor>
+			<Bulk>0.5</Bulk>
+			<WornBulk>0.25</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Middle Mid-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_IH_AT_a" or
+			defName="HAR_IH_AT_b" or
+			defName="HAR_IH_AT_c" or
+			defName="HAR_IH_AT_d" or
+			defName="HAR_IH_AT_e"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Shell-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_IH_AS_a"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>10</StuffEffectMultiplierArmor>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Idhale Race/Patches/Idhale Race/ThingDefs_Races/AlienRace_Idhale.xml b/ModPatches/Idhale Race/Patches/Idhale Race/ThingDefs_Races/AlienRace_Idhale.xml
new file mode 100644
index 0000000000..e5b2cc616c
--- /dev/null
+++ b/ModPatches/Idhale Race/Patches/Idhale Race/ThingDefs_Races/AlienRace_Idhale.xml	
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="HAR_Idhale_BaseNRPawn"]/inspectorTabs/li[.="ITab_Pawn_Gear"]</xpath>
+		<value>
+			<li>CombatExtended.ITab_Inventory</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="HAR_Idhale_BaseNRPawn"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Inventory"/>
+			<li Class="CombatExtended.CompProperties_TacticalManager"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="HAR_Idhale_BaseNRPawn"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="HAR_Idhale_Base"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="HAR_Idhale_Base"]/statBases</xpath>
+		<value>
+			<Suppressability>1</Suppressability>
+			<SmokeSensitivity>1.2</SmokeSensitivity>
+			<ArmorRating_Electric>10</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="HAR_Idhale_Base"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1000</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="HAR_Idhale_Base"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>100000</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="HAR_Idhale_Base"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.005</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.005</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.005</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="HAR_Idhale_Base"]/alienRace/raceRestriction/whiteApparelList</xpath>
+		<value>
+			<li>CE_Apparel_TacVest</li>
+			<li>CE_Apparel_Backpack</li>
+			<li>CE_Apparel_TribalBackpack</li>
+			<li>CE_Apparel_BallisticShield</li>
+			<li>CE_Apparel_MeleeShield</li>
+			<li>CE_Apparel_GasMask</li>
+			<li>CE_Apparel_ImprovGasMask</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Impact Weaponry/Defs/Impact Weaponry/ImpactAmmo.xml b/ModPatches/Impact Weaponry/Defs/Impact Weaponry/ImpactAmmo.xml
new file mode 100644
index 0000000000..26fc338570
--- /dev/null
+++ b/ModPatches/Impact Weaponry/Defs/Impact Weaponry/ImpactAmmo.xml	
@@ -0,0 +1,589 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>Impact_Rounds</defName>
+		<label>Impact Shells</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberHighCaliber</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSets ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_ImpactShellsSmall</defName>
+		<label>Impact Shells (Small)</label>
+		<ammoTypes>
+			<Ammo_ImpactShellsSmall>Bullet_ImpactShellsSmall</Ammo_ImpactShellsSmall>
+		</ammoTypes>
+		<similarTo>AmmoSet_AntiMateriel</similarTo>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_ImpactShellsBig</defName>
+		<label>Impact Shells (Big)</label>
+		<ammoTypes>
+			<Ammo_ImpactShellsBig>Bullet_ImpactShellsBig</Ammo_ImpactShellsBig>
+		</ammoTypes>
+		<similarTo>AmmoSet_AntiMateriel</similarTo>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_ImpactShellsShell</defName>
+		<label>Impact Shells (Shell)</label>
+		<ammoTypes>
+			<Ammo_ImpactShellsShell>Bullet_ImpactShellsShell</Ammo_ImpactShellsShell>
+		</ammoTypes>
+		<similarTo>AmmoSet_AntiMateriel</similarTo>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_ImpactShellsSniper</defName>
+		<label>Impact Shells (Sniper)</label>
+		<ammoTypes>
+			<Ammo_ImpactShellsSniper>Bullet_ImpactShellsSniper</Ammo_ImpactShellsSniper>
+		</ammoTypes>
+		<similarTo>AmmoSet_AntiMateriel</similarTo>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_ImpactShellsBolter</defName>
+		<label>Impact Shells (Bolter)</label>
+		<ammoTypes>
+			<Ammo_ImpactShellsBolter>Bullet_ImpactShellsBolter</Ammo_ImpactShellsBolter>
+		</ammoTypes>
+		<similarTo>AmmoSet_AntiMateriel</similarTo>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_ImpactShellsSlugger</defName>
+		<label>Impact Shells (Slugger)</label>
+		<ammoTypes>
+			<Ammo_ImpactShellsSlugger>Bullet_ImpactShellsSlugger</Ammo_ImpactShellsSlugger>
+		</ammoTypes>
+		<similarTo>AmmoSet_AntiMateriel</similarTo>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="AmmoImpactBase" ParentName="SmallAmmoBase" Abstract="True">
+		<description>A Large caliber, gryojet-stabilized projectile with an explosive charge.</description>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Impact_Rounds</li>
+		</thingCategories>
+		<stackLimit>5000</stackLimit>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoImpactBase">
+		<defName>Ammo_ImpactShellsSmall</defName>
+		<label>Impact Shells (Small)</label>
+		<statBases>
+			<Mass>0.151</Mass>
+			<Bulk>0.06</Bulk>
+		</statBases>
+		<graphicData>
+			<texPath>ThirdParty/Warhammer/Bolter/Standard</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<ammoClass>GrenadeHE</ammoClass>
+		<detonateProjectile>Bullet_ImpactShellsSmall</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoImpactBase">
+		<defName>Ammo_ImpactShellsBig</defName>
+		<label>Impact Shells (Big)</label>
+		<statBases>
+			<Mass>0.201</Mass>
+			<Bulk>0.09</Bulk>
+		</statBases>
+		<graphicData>
+			<texPath>ThirdParty/Warhammer/Bolter/Standard</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<ammoClass>GrenadeHE</ammoClass>
+		<detonateProjectile>Bullet_ImpactShellsBig</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoImpactBase">
+		<defName>Ammo_ImpactShellsShell</defName>
+		<label>Impact Shells (Shell)</label>
+		<statBases>
+			<Mass>0.251</Mass>
+			<Bulk>0.12</Bulk>
+		</statBases>
+		<graphicData>
+			<texPath>ThirdParty/Warhammer/Bolter/Standard</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<ammoClass>GrenadeHE</ammoClass>
+		<detonateProjectile>Bullet_ImpactShellsShell</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoImpactBase">
+		<defName>Ammo_ImpactShellsSniper</defName>
+		<label>Impact Shells (Sniper)</label>
+		<statBases>
+			<Mass>0.221</Mass>
+			<Bulk>0.10</Bulk>
+		</statBases>
+		<graphicData>
+			<texPath>ThirdParty/Warhammer/Bolter/Standard</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<ammoClass>GrenadeHE</ammoClass>
+		<detonateProjectile>Bullet_ImpactShellsSniper</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoImpactBase">
+		<defName>Ammo_ImpactShellsBolter</defName>
+		<label>Impact Shells (Bolter)</label>
+		<statBases>
+			<Mass>0.251</Mass>
+			<Bulk>0.12</Bulk>
+		</statBases>
+		<graphicData>
+			<texPath>ThirdParty/Warhammer/Bolter/Standard</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<ammoClass>GrenadeHE</ammoClass>
+		<detonateProjectile>Bullet_ImpactShellsBolter</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoImpactBase">
+		<defName>Ammo_ImpactShellsSlugger</defName>
+		<label>Impact Shells (Slugger)</label>
+		<statBases>
+			<Mass>0.61</Mass>
+			<Bulk>0.18</Bulk>
+		</statBases>
+		<graphicData>
+			<texPath>ThirdParty/Warhammer/Bolter/Standard</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<ammoClass>GrenadeHE</ammoClass>
+		<detonateProjectile>Bullet_ImpactShellsSlugger</detonateProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+	<ThingDef Name="BaseImpactShellCE" ParentName="BaseBulletCE" Abstract="true">
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<dropsCasings>true</dropsCasings>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseImpactShellCE">
+		<defName>Bullet_ImpactShellsSmall</defName>
+		<graphicData>
+			<texPath>Things/ImpactBullet</texPath>
+			<shaderType>TransparentPostLight</shaderType>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<label>Impact Shells (Small)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>90</speed>
+			<damageAmountBase>18</damageAmountBase>
+			<armorPenetrationSharp>6</armorPenetrationSharp>
+			<armorPenetrationBlunt>2.131</armorPenetrationBlunt>
+			<casingMoteDefname>Mote_BolterCasing</casingMoteDefname>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>15</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.6</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseImpactShellCE">
+		<defName>Bullet_ImpactShellsBig</defName>
+		<graphicData>
+			<texPath>Things/ImpactBulletBig</texPath>
+			<shaderType>TransparentPostLight</shaderType>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<label>Impact Shells (Big)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>37</damageAmountBase>
+			<armorPenetrationSharp>14</armorPenetrationSharp>
+			<armorPenetrationBlunt>2.931</armorPenetrationBlunt>
+			<speed>86</speed>
+			<casingMoteDefname>Mote_BolterCasing</casingMoteDefname>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<explosiveRadius>1.5</explosiveRadius>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<damageAmountBase>17</damageAmountBase>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseImpactShellCE">
+		<defName>Bullet_ImpactShellsShell</defName>
+		<graphicData>
+			<texPath>Things/ImpactBulletShell</texPath>
+			<shaderType>TransparentPostLight</shaderType>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<label>Impact Shells (Shell)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>64</damageAmountBase>
+			<armorPenetrationSharp>20</armorPenetrationSharp>
+			<armorPenetrationBlunt>5.101</armorPenetrationBlunt>
+			<speed>81</speed>
+			<damageDef>Bullet</damageDef>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<explosiveRadius>2.2</explosiveRadius>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<damageAmountBase>18</damageAmountBase>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseImpactShellCE">
+		<defName>Bullet_ImpactShellsSniper</defName>
+		<graphicData>
+			<texPath>Things/ImpactBulletSniper</texPath>
+			<shaderType>TransparentPostLight</shaderType>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<label>Impact Shells (Sniper)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>88</speed>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>56</damageAmountBase>
+			<armorPenetrationSharp>18</armorPenetrationSharp>
+			<armorPenetrationBlunt>4.801</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<explosiveRadius>1.6</explosiveRadius>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<damageAmountBase>24</damageAmountBase>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseImpactShellCE">
+		<defName>Bullet_ImpactShellsBolter</defName>
+		<graphicData>
+			<texPath>Things/ImpactBolterShell</texPath>
+			<shaderType>TransparentPostLight</shaderType>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<label>Impact Shells (Bolter)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>88</speed>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>24</damageAmountBase>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+			<armorPenetrationBlunt>2.831</armorPenetrationBlunt>
+			<casingMoteDefname>Mote_BolterCasing</casingMoteDefname>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>18</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1.8</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseImpactShellCE">
+		<defName>Bullet_ImpactShellsSlugger</defName>
+		<graphicData>
+			<texPath>Things/ImpactBulletSlugger</texPath>
+			<shaderType>TransparentPostLight</shaderType>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<label>Impact Shells (Slugger)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>86</speed>
+			<pelletCount>3</pelletCount>
+			<explosionRadius>0.4</explosionRadius>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>16</damageAmountBase>
+			<spreadMult>9.9</spreadMult>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<casingMoteDefname>Mote_HeavyBolterCasing</casingMoteDefname>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_ImpactShellsSmall</defName>
+		<label>make Impact Shells (Small) x200</label>
+		<description>Craft Impact Shells (Small).</description>
+		<jobString>Making Impact Shells (Small).</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>31</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>7</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_ImpactShellsSmall>200</Ammo_ImpactShellsSmall>
+		</products>
+		<workAmount>10400</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_ImpactShellsBig</defName>
+		<label>make Impact Shells (Big) x200</label>
+		<description>Craft Impact Shells (Big).</description>
+		<jobString>Making Impact Shells (Big).</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>35</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_ImpactShellsBig>200</Ammo_ImpactShellsBig>
+		</products>
+		<workAmount>10400</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_ImpactShellsShell</defName>
+		<label>make Impact Shells (Shell) x200</label>
+		<description>Craft Impact Shells (Shell).</description>
+		<jobString>Making Impact Shells (Shell).</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>45</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_ImpactShellsShell>200</Ammo_ImpactShellsShell>
+		</products>
+		<workAmount>10400</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_ImpactShellsSniper</defName>
+		<label>make Impact Shells (Sniper) x200</label>
+		<description>Craft Impact Shells (Sniper).</description>
+		<jobString>Making Impact Shells (Sniper).</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>42</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_ImpactShellsSniper>200</Ammo_ImpactShellsSniper>
+		</products>
+		<workAmount>10400</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_ImpactShellsBolter</defName>
+		<label>make Impact Shells (Bolter) x200</label>
+		<description>Craft Impact Shells (Bolter).</description>
+		<jobString>Making Impact Shells (Bolter).</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>45</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_ImpactShellsBolter>200</Ammo_ImpactShellsBolter>
+		</products>
+		<workAmount>10400</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_ImpactShellsSlugger</defName>
+		<label>make Impact Shells (Slugger) x200</label>
+		<description>Craft Impact Shells (Slugger).</description>
+		<jobString>Making Impact Shells (Slugger).</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>55</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>15</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_ImpactShellsSlugger>200</Ammo_ImpactShellsSlugger>
+		</products>
+		<workAmount>10400</workAmount>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Impact Weaponry/Patches/Impact Weaponry/Addon Weapons/AthenaRanged.xml b/ModPatches/Impact Weaponry/Patches/Impact Weaponry/Addon Weapons/AthenaRanged.xml
new file mode 100644
index 0000000000..902a18786f
--- /dev/null
+++ b/ModPatches/Impact Weaponry/Patches/Impact Weaponry/Addon Weapons/AthenaRanged.xml	
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Athena Framework</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName = "DV_ImpactSlugger"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>stock</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>12</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>10</power>
+								<cooldownTime>1.55</cooldownTime>
+								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationRemove">
+					<xpath>Defs/ThingDef[defName = "DV_ImpactSlugger"]/verbs</xpath>
+				</li>
+
+				<!-- === Slugger === -->
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>DV_ImpactSlugger</defName>
+					<statBases>
+						<SightsEfficiency>0.85</SightsEfficiency>
+						<ShotSpread>0.01</ShotSpread>
+						<SwayFactor>2.55</SwayFactor>
+						<Bulk>10.5</Bulk>
+						<Mass>5.6</Mass>
+						<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
+					</statBases>
+					<Properties>
+						<recoilAmount>3.22</recoilAmount>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_ImpactShellsSlugger</defaultProjectile>
+						<warmupTime>1.3</warmupTime>
+						<range>22</range>
+						<soundCast>Shot_ImpactSlugger</soundCast>
+						<soundCastTail>GunTail_Heavy</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+						<targetParams>
+							<canTargetLocations>true</canTargetLocations>
+						</targetParams>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>5</magazineSize>
+						<reloadTime>6.2</reloadTime>
+						<ammoSet>AmmoSet_ImpactShellsSlugger</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aiAimMode>AimedShot</aiAimMode>
+					</FireModes>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Impact Weaponry/Patches/Impact Weaponry/Addon Weapons/ImpactMelee.xml b/ModPatches/Impact Weaponry/Patches/Impact Weaponry/Addon Weapons/ImpactMelee.xml
new file mode 100644
index 0000000000..faa77759db
--- /dev/null
+++ b/ModPatches/Impact Weaponry/Patches/Impact Weaponry/Addon Weapons/ImpactMelee.xml	
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Royalty</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="DV_ChainswordBladelink"]/statBases</xpath>
+					<value>
+						<Bulk>15</Bulk>
+						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+						<ToughnessRating>24</ToughnessRating>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="DV_ChainswordBladelink"]</xpath>
+					<value>
+						<equippedStatOffsets>
+							<MeleeCritChance>0.11</MeleeCritChance>
+							<MeleeParryChance>0.47</MeleeParryChance>
+							<MeleeDodgeChance>0.15</MeleeDodgeChance>
+						</equippedStatOffsets>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName = "DV_ChainswordBladelink"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>handle</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>12</power>
+								<cooldownTime>1.6</cooldownTime>
+								<armorPenetrationBlunt>2</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+								<chanceFactor>0.33</chanceFactor>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>teeth</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>25</power>
+								<cooldownTime>2.8</cooldownTime>
+								<chanceFactor>0.60</chanceFactor>
+								<armorPenetrationBlunt>11.5</armorPenetrationBlunt>
+								<armorPenetrationSharp>12</armorPenetrationSharp>
+								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+								<extraMeleeDamages>
+									<li>
+										<def>Shred</def>
+										<amount>10</amount>
+										<chance>0.4</chance>
+									</li>
+								</extraMeleeDamages>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>point</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>25</power>
+								<cooldownTime>2.8</cooldownTime>
+								<chanceFactor>0.30</chanceFactor>
+								<armorPenetrationBlunt>17</armorPenetrationBlunt>
+								<armorPenetrationSharp>18</armorPenetrationSharp>
+								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+								<extraMeleeDamages>
+									<li>
+										<def>Shred</def>
+										<amount>10</amount>
+										<chance>0.5</chance>
+									</li>
+								</extraMeleeDamages>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Impact Weaponry/Patches/Impact Weaponry/Addon Weapons/PiratesRanged.xml b/ModPatches/Impact Weaponry/Patches/Impact Weaponry/Addon Weapons/PiratesRanged.xml
new file mode 100644
index 0000000000..d35cf6a0ec
--- /dev/null
+++ b/ModPatches/Impact Weaponry/Patches/Impact Weaponry/Addon Weapons/PiratesRanged.xml	
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Factions Expanded - Pirates</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName = "DV_WarcasketGun_ImpactBolter"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>barrel</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>35</power>
+								<cooldownTime>2.44</cooldownTime>
+								<armorPenetrationBlunt>16</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<!-- === Bolter === -->
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>DV_WarcasketGun_ImpactBolter</defName>
+					<statBases>
+						<SightsEfficiency>1</SightsEfficiency>
+						<ShotSpread>0.01</ShotSpread>
+						<SwayFactor>2.55</SwayFactor>
+						<Bulk>16.5</Bulk>
+						<Mass>59</Mass>
+						<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
+					</statBases>
+					<Properties>
+						<recoilAmount>3.22</recoilAmount>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_ImpactShellsBolter</defaultProjectile>
+						<warmupTime>1.3</warmupTime>
+						<burstShotCount>5</burstShotCount>
+						<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+						<range>52</range>
+						<soundCast>Shot_Autocannon</soundCast>
+						<soundCastTail>GunTail_Heavy</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+						<targetParams>
+							<canTargetLocations>true</canTargetLocations>
+						</targetParams>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>40</magazineSize>
+						<reloadTime>6.2</reloadTime>
+						<ammoSet>AmmoSet_ImpactShellsBolter</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aimedBurstShotCount>4</aimedBurstShotCount>
+						<aiUseBurstMode>FALSE</aiUseBurstMode>
+						<aiAimMode>AimedShot</aiAimMode>
+					</FireModes>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Impact Weaponry/Patches/Impact Weaponry/ImpactMelee.xml b/ModPatches/Impact Weaponry/Patches/Impact Weaponry/ImpactMelee.xml
new file mode 100644
index 0000000000..4767e2b303
--- /dev/null
+++ b/ModPatches/Impact Weaponry/Patches/Impact Weaponry/ImpactMelee.xml	
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DV_Chainsword"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+			<ToughnessRating>20</ToughnessRating>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DV_Chainsword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.11</MeleeCritChance>
+				<MeleeParryChance>0.47</MeleeParryChance>
+				<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "DV_Chainsword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+					<chanceFactor>0.33</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>2.8</cooldownTime>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>11.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>12</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+					<extraMeleeDamages>
+						<li>
+							<def>Shred</def>
+							<amount>10</amount>
+							<chance>0.4</chance>
+						</li>
+					</extraMeleeDamages>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>2.8</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>17</armorPenetrationBlunt>
+					<armorPenetrationSharp>18</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+					<extraMeleeDamages>
+						<li>
+							<def>Shred</def>
+							<amount>10</amount>
+							<chance>0.5</chance>
+						</li>
+					</extraMeleeDamages>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Impact Weaponry/Patches/Impact Weaponry/ImpactRanged.xml b/ModPatches/Impact Weaponry/Patches/Impact Weaponry/ImpactRanged.xml
new file mode 100644
index 0000000000..337ebd831a
--- /dev/null
+++ b/ModPatches/Impact Weaponry/Patches/Impact Weaponry/ImpactRanged.xml	
@@ -0,0 +1,317 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "DV_ImpactStubber"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[
+			defName = "DV_ImpactRifle" or
+			defName = "DV_ImpactCannon" or
+			defName = "DV_ImpactSlinger" or
+			defName = "DV_ImpactSniper"]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</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>10</power>
+					<cooldownTime>1.55</cooldownTime>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Impact Rifle === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DV_ImpactRifle</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.88</SwayFactor>
+			<Bulk>10.5</Bulk>
+			<Mass>5.2</Mass>
+			<RangedWeapon_Cooldown>0.43</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.27</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_ImpactShellsSmall</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>14</ticksBetweenBurstShots>
+			<range>42</range>
+			<soundCast>Shot_ImpactRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_ImpactShellsSmall</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AOE</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Impact Stubber === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DV_ImpactStubber</defName>
+		<statBases>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>2.87</SwayFactor>
+			<Bulk>8.5</Bulk>
+			<Mass>4.2</Mass>
+			<RangedWeapon_Cooldown>0.58</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>3.38</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_ImpactShellsSmall</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>14</ticksBetweenBurstShots>
+			<range>38</range>
+			<soundCast>Shot_ImpactSmall</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>6</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_ImpactShellsSmall</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AOE</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Impact Cannon === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DV_ImpactCannon</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>14.5</Bulk>
+			<Mass>6.6</Mass>
+			<RangedWeapon_Cooldown>0.68</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.38</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_ImpactShellsBig</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>45</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>25</ticksBetweenBurstShots>
+			<soundCast>Shot_ImpactCannon</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>7.5</reloadTime>
+			<ammoSet>AmmoSet_ImpactShellsBig</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AOE</li>
+		</weaponTags>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="DV_ImpactCannon"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.35,1.35</DrawSize>
+				<DrawOffset>0.0,0.0</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Impact Slinger === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DV_ImpactSlinger</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>10.5</Bulk>
+			<Mass>5.7</Mass>
+			<RangedWeapon_Cooldown>0.68</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.38</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_ImpactShellsShell</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<burstShotCount>4</burstShotCount>
+			<ticksBetweenBurstShots>20</ticksBetweenBurstShots>
+			<soundCast>Shot_ImpactRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>5.5</reloadTime>
+			<ammoSet>AmmoSet_ImpactShellsShell</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AOE</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="DV_ImpactSlinger"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.25,1.25</DrawSize>
+				<DrawOffset>0.0,0.0</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Impact Sniper === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DV_ImpactSniper</defName>
+		<statBases>
+			<SightsEfficiency>1.8</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>14.5</Bulk>
+			<Mass>5.6</Mass>
+			<RangedWeapon_Cooldown>0.68</RangedWeapon_Cooldown>
+			<NightVisionEfficiency_Weapon>0.6</NightVisionEfficiency_Weapon>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.38</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_ImpactShellsSniper</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>86</range>
+			<soundCast>Shot_ImpactSniper</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>5.5</reloadTime>
+			<ammoSet>AmmoSet_ImpactShellsSniper</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>Bipod_AMR</li>
+			<li>CE_AI_SR</li>
+			<li>CE_AI_AOE</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="DV_ImpactSniper"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.20,1.20</DrawSize>
+				<DrawOffset>0.0,0.0</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Imperial Arsenal Royal Warcasket/Defs/Imperial Arsenal Royal Warcasket/Ammo/AmmoCategories_Bolts.xml b/ModPatches/Imperial Arsenal Royal Warcasket/Defs/Imperial Arsenal Royal Warcasket/Ammo/AmmoCategories_Bolts.xml
new file mode 100644
index 0000000000..d4b81f4363
--- /dev/null
+++ b/ModPatches/Imperial Arsenal Royal Warcasket/Defs/Imperial Arsenal Royal Warcasket/Ammo/AmmoCategories_Bolts.xml	
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>Standard</defName>
+		<label>Standard</label>
+		<labelShort>Standard</labelShort>
+		<description>A gyro-stabilized projectile equipped with a hardened tip for penetrating armor and laden with a small explosive charge.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>Inferno</defName>
+		<label>Inferno</label>
+		<labelShort>Inferno</labelShort>
+		<description>A gyro-stabilized projectile equipped with the explosive filler replaced with sticky, highly flammable prometheum.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>MetalStorm</defName>
+		<label>Metal Storm</label>
+		<labelShort>Metal Storm</labelShort>
+		<description>A gyro-stabilized equipped with a proximity fuse, designed to shower lighly armored targets with a devestating shower of fragmention when it detonates.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>Kraken</defName>
+		<label>Kraken</label>
+		<labelShort>Kraken</labelShort>
+		<description>A gyro-stabilized projectile with hardened penetrator and explosive 'kicker' charge, designed to punch through heavy armor.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Imperial Arsenal Royal Warcasket/Defs/Imperial Arsenal Royal Warcasket/Ammo/Xonus.xml b/ModPatches/Imperial Arsenal Royal Warcasket/Defs/Imperial Arsenal Royal Warcasket/Ammo/Xonus.xml
new file mode 100644
index 0000000000..d13abf27b4
--- /dev/null
+++ b/ModPatches/Imperial Arsenal Royal Warcasket/Defs/Imperial Arsenal Royal Warcasket/Ammo/Xonus.xml	
@@ -0,0 +1,383 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>AmmoBoltXonus</defName>
+		<label>Xonus Bolt</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberHighCaliber</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_BoltXonus</defName>
+		<label>Xonus Bolt</label>
+		<ammoTypes>
+			<Ammo_BoltXonus_Standard>Bullet_BoltXonus_Standard</Ammo_BoltXonus_Standard>
+			<Ammo_BoltXonus_Inferno>Bullet_BoltXonus_Inferno</Ammo_BoltXonus_Inferno>
+			<Ammo_BoltXonus_MetalStorm>Bullet_BoltXonus_MetalStorm</Ammo_BoltXonus_MetalStorm>
+			<Ammo_BoltXonus_Kraken>Bullet_BoltXonus_Kraken</Ammo_BoltXonus_Kraken>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="AmmoBoltXonusBase" ParentName="AmmoBase" Abstract="True">
+		<description>A .998 caliber, gryojet-stabilized projectile with an explosive charge and hardened tip, fired from most patterns of Astartes heavy bolters.</description>
+		<statBases>
+			<Mass>0.385</Mass>
+			<Bulk>0.15</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoBoltXonus</li>
+		</thingCategories>
+		<stackLimit>2000</stackLimit>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoBoltXonusBase">
+		<defName>Ammo_BoltXonus_Standard</defName>
+		<label>Xonus bolt shell (Standard)</label>
+		<graphicData>
+			<texPath>ThirdParty/Warhammer/HeavyBolter/Standard</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>4.44</MarketValue>
+		</statBases>
+		<ammoClass>Standard</ammoClass>
+		<cookOffProjectile>Bullet_BoltXonus_Standard</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoBoltXonusBase">
+		<defName>Ammo_BoltXonus_Inferno</defName>
+		<label>Xonus bolt shell (Inferno)</label>
+		<graphicData>
+			<texPath>ThirdParty/Warhammer/HeavyBolter/Inferno</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>2.28</MarketValue>
+		</statBases>
+		<ammoClass>Inferno</ammoClass>
+		<cookOffProjectile>Bullet_BoltXonus_Inferno</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoBoltXonusBase">
+		<defName>Ammo_BoltXonus_MetalStorm</defName>
+		<label>Xonus bolt shell (Metal Storm)</label>
+		<graphicData>
+			<texPath>ThirdParty/Warhammer/HeavyBolter/MetalStorm</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>2.70</MarketValue>
+		</statBases>
+		<ammoClass>MetalStorm</ammoClass>
+		<cookOffProjectile>Bullet_BoltXonus_MetalStorm</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoBoltXonusBase">
+		<defName>Ammo_BoltXonus_Kraken</defName>
+		<label>Xonus bolt shell (Kraken)</label>
+		<graphicData>
+			<texPath>ThirdParty/Warhammer/HeavyBolter/Kraken</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>2.37</MarketValue>
+		</statBases>
+		<ammoClass>Kraken</ammoClass>
+		<cookOffProjectile>Bullet_BoltXonus_Kraken</cookOffProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef Name="BaseBoltXonusBullet" ParentName="BaseExplosiveBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_Big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<thingClass>CombatExtended.BulletCE</thingClass>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>96</speed>
+			<dropsCasings>true</dropsCasings>
+			<casingMoteDefname>Fleck_RifleAmmoCasings_HighCal</casingMoteDefname>
+			<casingFilthDefname>Filth_RifleAmmoCasings_HighCal</casingFilthDefname>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBoltXonusBullet">
+		<defName>Bullet_BoltXonus_Standard</defName>
+		<label>.998 cal bolt (Standard)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>64</damageAmountBase>
+			<armorPenetrationSharp>20</armorPenetrationSharp>
+			<armorPenetrationBlunt>5.101</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>38</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBoltXonusBullet">
+		<defName>Bullet_BoltXonus_Inferno</defName>
+		<label>.998 cal bolt (Inferno)</label>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>PrometheumFlame</damageDef>
+			<damageAmountBase>5</damageAmountBase>
+			<explosionRadius>1.5</explosionRadius>
+			<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
+			<preExplosionSpawnChance>0.7</preExplosionSpawnChance>
+			<soundExplode>MortarIncendiary_Explode</soundExplode>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>7</damageAmountBase>
+				<explosiveDamageType>Thermobaric</explosiveDamageType>
+				<explosiveRadius>1</explosiveRadius>
+				<explosionSound>MortarIncendiary_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBoltXonusBullet">
+		<defName>Bullet_BoltXonus_MetalStorm</defName>
+		<thingClass>CombatExtended.ProjectileCE_Bursting</thingClass>
+		<label>.998 cal bolt (Metal Storm)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>1</explosionRadius>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>17</damageAmountBase>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<aimHeightOffset>1.05</aimHeightOffset>
+			<armingDelay>1.75</armingDelay>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>6</Fragment_Small>
+				</fragments>
+				<fragAngleRange>-89~-5</fragAngleRange>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBoltXonusBullet">
+		<defName>Bullet_BoltXonus_Kraken</defName>
+		<label>.998 cal bolt (Kraken)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>142</damageAmountBase>
+			<armorPenetrationSharp>46</armorPenetrationSharp>
+			<armorPenetrationBlunt>5.101</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>17</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.5</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_BoltXonus_Standard</defName>
+		<label>make Xonus bolt (standard) shell x200</label>
+		<description>Craft 200 Xonus bolt (standard) shells.</description>
+		<jobString>Making Xonus bolt (standard) shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>154</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>18</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_BoltXonus_Standard>200</Ammo_BoltXonus_Standard>
+		</products>
+		<workAmount>36600</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_BoltXonus_Inferno</defName>
+		<label>make Xonus bolt (inferno) shell x200</label>
+		<description>Craft 200 Xonus bolt (inferno) shells.</description>
+		<jobString>Making Xonus bolt (inferno) shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>154</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Prometheum</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_BoltXonus_Inferno>200</Ammo_BoltXonus_Inferno>
+		</products>
+		<workAmount>19400</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_BoltXonus_MetalStorm</defName>
+		<label>make Xonus bolt (metal storm) shell x200</label>
+		<description>Craft 200 Xonus bolt (metal storm) shells.</description>
+		<jobString>Making Xonus bolt (metal storm) shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>154</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_BoltXonus_MetalStorm>200</Ammo_BoltXonus_MetalStorm>
+		</products>
+		<workAmount>21800</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_BoltXonus_Kraken</defName>
+		<label>make Xonus bolt (kraken) shell x200</label>
+		<description>Craft 200 Xonus bolt (kraken) shells.</description>
+		<jobString>Making Xonus bolt (kraken) shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>154</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+				<li>Uranium</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_BoltXonus_Kraken>200</Ammo_BoltXonus_Kraken>
+		</products>
+		<workAmount>20600</workAmount>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Imperial Arsenal Royal Warcasket/Patches/Imperial Arsenal Royal Warcasket/Apparel_Royal_Warcaskets.xml b/ModPatches/Imperial Arsenal Royal Warcasket/Patches/Imperial Arsenal Royal Warcasket/Apparel_Royal_Warcaskets.xml
new file mode 100644
index 0000000000..b2bff8a2ca
--- /dev/null
+++ b/ModPatches/Imperial Arsenal Royal Warcasket/Patches/Imperial Arsenal Royal Warcasket/Apparel_Royal_Warcaskets.xml	
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Royal Warcasket ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Royal"]/statBases</xpath>
+		<value>
+			<Bulk>250</Bulk>
+			<WornBulk>25</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Royal"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>34</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Royal"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>86</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Royal"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>250</CarryWeight>
+			<CarryBulk>200</CarryBulk>
+			<Suppressability>-100</Suppressability>
+		</value>
+	</Operation>
+
+	<!-- ========== Royal Warcasket - Shoulders ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_Royal"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_Royal"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>34</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_Royal"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>86</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Royal Warcasket Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Royal"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>8</WornBulk>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Royal"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Royal"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Royal"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Royal"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>30</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Royal"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>68</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Imperial Arsenal Royal Warcasket/Patches/Imperial Arsenal Royal Warcasket/RangedWeapons.xml b/ModPatches/Imperial Arsenal Royal Warcasket/Patches/Imperial Arsenal Royal Warcasket/RangedWeapons.xml
new file mode 100644
index 0000000000..66b49dc2b7
--- /dev/null
+++ b/ModPatches/Imperial Arsenal Royal Warcasket/Patches/Imperial Arsenal Royal Warcasket/RangedWeapons.xml	
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "RWC_Halberd"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>VFEP_GravityHammerAttack</li>
+					</capacities>
+					<power>135</power>
+					<cooldownTime>2.14</cooldownTime>
+					<armorPenetrationBlunt>16</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>75</power>
+					<cooldownTime>1.34</cooldownTime>
+					<armorPenetrationBlunt>16</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>25</amount>
+							<chance>1</chance>
+						</li>
+					</extraMeleeDamages>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ===  Halberd === -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>/Defs/ThingDef[defName="RWC_Halberd"]/verbs</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>/Defs/ThingDef[defName="RWC_Halberd"]/comps/li[@Class="CompToggleFireMode.CompProperties_ToggleFireMode"]</xpath>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RWC_Halberd</defName>
+		<statBases>
+			<Bulk>15</Bulk>
+			<SwayFactor>1.2</SwayFactor>
+			<ShotSpread>0.08</ShotSpread>
+			<SightsEfficiency>2.20</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.40</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.19</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_BoltXonus_Standard</defaultProjectile>
+			<warmupTime>0.8</warmupTime>
+			<range>68</range>
+			<soundCast>Xonus_ShotHeavy</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>16</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>3.0</reloadTime>
+			<ammoSet>AmmoSet_BoltXonus</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RWC_Halberd"]</xpath>
+		<value>
+			<equippedAngleOffset>-90</equippedAngleOffset>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>/Defs/ThingDef[defName="RWC_Halberd"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.9,1.9</DrawSize>
+				<DrawOffset>0.0,0.0</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Individuality/Patches/Individuality/Traits_Patch_CE.xml b/ModPatches/Individuality/Patches/Individuality/Traits_Patch_CE.xml
new file mode 100644
index 0000000000..937874438e
--- /dev/null
+++ b/ModPatches/Individuality/Patches/Individuality/Traits_Patch_CE.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ===== Trait: Stealthy ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName = "SYR_Agile"]/degreeDatas/li/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.35</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- ===== Trait: Hand-eye Coordination ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName = "SYR_HandEyeCoordination"]/degreeDatas/li/statOffsets/MeleeHitChance</xpath>
+		<value>
+			<MeleeHitChance>2.5</MeleeHitChance>
+		</value>
+	</Operation>
+
+	<!-- ===== Trait: Steady Hands ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName = "SYR_SteadyHands"]/degreeDatas/li/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+		</value>
+	</Operation>
+
+	<!-- ===== Trait: Strong Back ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName = "SYR_StrongBack"]/degreeDatas/li/statOffsets/CarryingCapacity</xpath>
+		<value>
+			<CarryWeight>+20</CarryWeight>
+			<CarryBulk>+20</CarryBulk>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Industrial Melee Weaponry/Patches/Industrial Melee Weaponry/Weapons_Melee.xml b/ModPatches/Industrial Melee Weaponry/Patches/Industrial Melee Weaponry/Weapons_Melee.xml
new file mode 100644
index 0000000000..72ccdd70ba
--- /dev/null
+++ b/ModPatches/Industrial Melee Weaponry/Patches/Industrial Melee Weaponry/Weapons_Melee.xml	
@@ -0,0 +1,579 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Baseball Bat -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="IMW_BaseballBat"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.46</cooldownTime>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>6.0</armorPenetrationBlunt>
+					<chanceFactor>2</chanceFactor>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="IMW_BaseballBat"]/statBases</xpath>
+		<value>
+			<Bulk>7.5</Bulk>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="IMW_BaseballBat"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.5</MeleeCritChance>
+				<MeleeParryChance>0.15</MeleeParryChance>
+				<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Machete -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="IMW_Machete"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.3</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.70</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="IMW_Machete"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="IMW_Machete"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="IMW_Machete"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.5</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- Crowbar -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="IMW_Crowbar"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.32</cooldownTime>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>0.63</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>5.625</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>prying</label>
+					<capacities>
+						<li>Demolish</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.63</cooldownTime>
+					<armorPenetrationBlunt>5.625</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="IMW_Crowbar"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="IMW_Crowbar"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.42</MeleeCritChance>
+				<MeleeParryChance>0.24</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Claw Hammer -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="IMW_ClawHammer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5.0</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1.1</chanceFactor>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9.0</power>
+					<cooldownTime>2.0</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="IMW_ClawHammer"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="IMW_ClawHammer"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.20</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="IMW_ClawHammer"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- Sledgehammer -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="IMW_Sledgehammer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.87</cooldownTime>
+					<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Demolish</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>2.43</cooldownTime>
+					<armorPenetrationBlunt>10.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="IMW_Sledgehammer"]/statBases</xpath>
+		<value>
+			<Bulk>7</Bulk>
+			<MeleeCounterParryBonus>0.38</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="IMW_Sledgehammer"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.2</MeleeCritChance>
+				<MeleeParryChance>0.5</MeleeParryChance>
+				<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Spiked Baseball Bat -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="IMW_SpikedBat"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.46</cooldownTime>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Stab</def>
+							<amount>6</amount>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>6.0</armorPenetrationBlunt>
+					<chanceFactor>2</chanceFactor>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="IMW_SpikedBat"]/statBases</xpath>
+		<value>
+			<Bulk>7.5</Bulk>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="IMW_SpikedBat"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.5</MeleeCritChance>
+				<MeleeParryChance>0.15</MeleeParryChance>
+				<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Knuckleduster -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="IMW_Knuckleduster"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.46</cooldownTime>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="IMW_Knuckleduster"]/statBases</xpath>
+		<value>
+			<Bulk>0.25</Bulk>
+			<MeleeCounterParryBonus>0.01</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="IMW_Knuckleduster"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.2</MeleeCritChance>
+				<MeleeParryChance>0.01</MeleeParryChance>
+				<MeleeDodgeChance>0</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="IMW_Knuckleduster"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- Boxing Glove -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="IMW_BoxingGlove"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Stun</def>
+							<amount>14</amount>
+							<chance>0.3</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>1.85</cooldownTime>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="IMW_BoxingGlove"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<MeleeCounterParryBonus>0.01</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="IMW_BoxingGlove"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.01</MeleeCritChance>
+				<MeleeParryChance>0.05</MeleeParryChance>
+				<MeleeDodgeChance>0</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="IMW_BoxingGlove"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- Pocket Knife -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="IMW_PocketKnife"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<chanceFactor>0.33</chanceFactor>
+					<cooldownTime>0.4</cooldownTime>
+					<armorPenetrationBlunt>0.007</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.06</cooldownTime>
+					<armorPenetrationBlunt>0.01</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.12</cooldownTime>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="IMW_PocketKnife"]/statBases</xpath>
+		<value>
+			<Bulk>0.1</Bulk>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="IMW_PocketKnife"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.33</MeleeCritChance>
+				<MeleeParryChance>0.01</MeleeParryChance>
+				<MeleeDodgeChance>0.04</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="IMW_PocketKnife"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- Sock Mace -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="IMW_SockMace"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>heavy end</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Stun</def>
+							<amount>6</amount>
+							<chance>0.2</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>3.16</cooldownTime>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="IMW_SockMace"]/statBases</xpath>
+		<value>
+			<Bulk>0.2</Bulk>
+			<MeleeCounterParryBonus>0</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="IMW_SockMace"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.28</MeleeCritChance>
+				<MeleeParryChance>0</MeleeParryChance>
+				<MeleeDodgeChance>0.12</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="IMW_SockMace"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- Brief Case -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="IMW_Briefcase"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>case</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>3.46</cooldownTime>
+					<armorPenetrationBlunt>0.85</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="IMW_Briefcase"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<MeleeCounterParryBonus>0</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="IMW_Briefcase"]/equippedStatOffsets/CarryingCapacity</xpath>
+		<value>
+			<CarryBulk>15</CarryBulk>
+			<MeleeCritChance>0.28</MeleeCritChance>
+			<MeleeParryChance>0.3</MeleeParryChance>
+			<MeleeDodgeChance>0.12</MeleeDodgeChance>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Infinity Rim Ariadna/Defs/Infinity Rim Ariadna/Ammo/AmmoClass.xml b/ModPatches/Infinity Rim Ariadna/Defs/Infinity Rim Ariadna/Ammo/AmmoClass.xml
new file mode 100644
index 0000000000..d28f0b8c7d
--- /dev/null
+++ b/ModPatches/Infinity Rim Ariadna/Defs/Infinity Rim Ariadna/Ammo/AmmoClass.xml	
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>Teseum</defName>
+		<label>teseum</label>
+		<labelShort>Teseum</labelShort>
+		<description>This teseum coated projectile offers more penetration without compromizing damage potential. Can only be fired from teseum reinforced guns.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>TeseumArrow</defName>
+		<label>teseum arrow</label>
+		<labelShort>teseum</labelShort>
+		<description>The arrow head is made from teseum.</description>
+	</CombatExtended.AmmoCategoryDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Infinity Rim Ariadna/Defs/Infinity Rim Ariadna/Ammo/Arrow.xml b/ModPatches/Infinity Rim Ariadna/Defs/Infinity Rim Ariadna/Ammo/Arrow.xml
new file mode 100644
index 0000000000..d73c021e45
--- /dev/null
+++ b/ModPatches/Infinity Rim Ariadna/Defs/Infinity Rim Ariadna/Ammo/Arrow.xml	
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ==================== Arrow - AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_GreatArrowAntipode</defName>
+		<label>great arrows</label>
+		<ammoTypes>
+			<Ammo_GreatArrow_Flame>Projectile_GreatArrow_Flame</Ammo_GreatArrow_Flame>
+			<Ammo_GreatArrow_Teseum>Projectile_GreatArrow_Teseum</Ammo_GreatArrow_Teseum>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoGreatArrowBase">
+		<defName>Ammo_GreatArrow_Teseum</defName>
+		<label>great arrow (Teseum)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Neolithic/Arrow/Plasteel</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<Mass>0.108</Mass>
+			<MarketValue>3.06</MarketValue>
+		</statBases>
+		<ammoClass>TeseumArrow</ammoClass>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseGreatArrowProjectile">
+		<defName>Projectile_GreatArrow_Teseum</defName>
+		<label>great arrow (Teseum)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Plasteel</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>70</speed>
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationBlunt>2.340</armorPenetrationBlunt>
+			<armorPenetrationSharp>12</armorPenetrationSharp>
+			<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>Ammo_GreatArrow_Teseum</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>MakeAmmo_GreatArrow_Teseum</defName>
+		<label>make teseum great arrows x10</label>
+		<description>Craft 10 teseum great arrows.</description>
+		<jobString>Making teseum great arrows.</jobString>
+		<workAmount>1000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Teseum</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+				<li>Teseum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_GreatArrow_Teseum>10</Ammo_GreatArrow_Teseum>
+		</products>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Infinity Rim Ariadna/Defs/Infinity Rim Ariadna/Ammo/Autocannon.xml b/ModPatches/Infinity Rim Ariadna/Defs/Infinity Rim Ariadna/Ammo/Autocannon.xml
new file mode 100644
index 0000000000..7c44059053
--- /dev/null
+++ b/ModPatches/Infinity Rim Ariadna/Defs/Infinity Rim Ariadna/Ammo/Autocannon.xml	
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ==================== Autocamnon - AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+
+		<defName>AmmoSet_TeseumAutocannon</defName>
+		<label>20x99mmR Ariadnan</label>
+		<ammoTypes>
+			<Ammo_20x99mmRShVAK_AP>Bullet_20x99mmRShVAK_AP</Ammo_20x99mmRShVAK_AP>
+			<Ammo_20x99mmRShVAK_Teseum>Bullet_20x99mmRShVAK_Teseum</Ammo_20x99mmRShVAK_Teseum>
+		</ammoTypes>
+		<similarTo>AmmoSet_TeseumAutocannonGeneric</similarTo>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_TeseumAutocannonGeneric</defName>
+		<label>autocannon shell</label>
+		<ammoTypes>
+			<Ammo_Autocannon_AP>Bullet_20x110mmHispano_AP</Ammo_Autocannon_AP>
+			<Ammo_Autocannon_Teseum>Bullet_20x99mmRShVAK_Teseum</Ammo_Autocannon_Teseum>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo20x99mmRShVAKBase">
+		<defName>Ammo_20x99mmRShVAK_Teseum</defName>
+		<label>20x99mmR ShVAK cartridge (Teseum)</label>
+		<graphicData>
+			<texPath>ThirdParty/InfinityRimAriadna/TeseumAC</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>1.86</MarketValue>
+		</statBases>
+		<ammoClass>Teseum</ammoClass>
+		<cookOffProjectile>Bullet_20x99mmRShVAK_Teseum</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoAutocannonShellBase">
+		<defName>Ammo_Autocannon_Teseum</defName>
+		<label>autocannon shell (Teseum)</label>
+		<graphicData>
+			<texPath>ThirdParty/InfinityRimAriadna/TeseumAC</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>1.86</MarketValue>
+		</statBases>
+		<ammoClass>Teseum</ammoClass>
+		<cookOffProjectile>Bullet_20x99mmRShVAK_Teseum</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base20x99mmRShVAKBullet">
+		<defName>Bullet_20x99mmRShVAK_Teseum</defName>
+		<label>20mmR ShVAK bullet (Teseum)</label>
+		<graphicData>
+			<color>(170,170,210)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>225</speed>
+			<damageAmountBase>35</damageAmountBase>
+			<armorPenetrationSharp>47</armorPenetrationSharp>
+			<armorPenetrationBlunt>696.1</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_20x99mmRShVAK_Teseum</defName>
+		<label>make 20x99mmR ShVAK cartridge (Teseum) x200</label>
+		<description>Craft 20x99mmR ShVAK cartridge (Teseum).</description>
+		<jobString>Making 20x99mmR ShVAK cartridge (Teseum).</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>194</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Teseum</li>
+					</thingDefs>
+				</filter>
+				<count>40</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Teseum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_20x99mmRShVAK_Teseum>200</Ammo_20x99mmRShVAK_Teseum>
+		</products>
+		<workAmount>19600</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_Autocannon_Teseum</defName>
+		<label>make autocannon shell (Teseum) x200</label>
+		<description>Craft 200 autocannon shell (Teseum).</description>
+		<jobString>Making autocannon shell (Teseum).</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>194</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Teseum</li>
+					</thingDefs>
+				</filter>
+				<count>40</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Teseum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Autocannon_Teseum>200</Ammo_Autocannon_Teseum>
+		</products>
+		<workAmount>19600</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Infinity Rim Ariadna/Defs/Infinity Rim Ariadna/Ammo/MicroMissile.xml b/ModPatches/Infinity Rim Ariadna/Defs/Infinity Rim Ariadna/Ammo/MicroMissile.xml
new file mode 100644
index 0000000000..571075d649
--- /dev/null
+++ b/ModPatches/Infinity Rim Ariadna/Defs/Infinity Rim Ariadna/Ammo/MicroMissile.xml	
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>AmmoAriadnanMicroMissile</defName>
+		<label>Ariadnan micro missiles</label>
+		<parent>AmmoRockets</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRocket</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== Autocamnon - AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_AriadnanMicroMissile</defName>
+		<label>Ariadnan micro missiles</label>
+		<ammoTypes>
+			<Ammo_AriadnanMicroMissile_HE>Bullet_BaseAriadnanMicroMissile_HE</Ammo_AriadnanMicroMissile_HE>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="AmmoAriadnanMicroMissileBase" ParentName="MediumAmmoBase" Abstract="True">
+		<description>Ariadnan micro missiles that is small enough to be carried by the missile launcher.</description>
+		<statBases>
+			<MaxHitPoints>150</MaxHitPoints>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoAriadnanMicroMissile</li>
+		</thingCategories>
+		<stackLimit>75</stackLimit>
+		<cookOffFlashScale>25</cookOffFlashScale>
+		<cookOffSound>MortarBomb_Explode</cookOffSound>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoAriadnanMicroMissileBase">
+		<defName>Ammo_AriadnanMicroMissile_HE</defName>
+		<label>Ariadnan micro missile (HE)</label>
+		<graphicData>
+			<texPath>ThirdParty/InfinityRimAriadna/Micro_Missile</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<drawSize>0.75</drawSize>
+		</graphicData>
+		<statBases>
+			<MarketValue>13.64</MarketValue>
+			<Mass>0.52</Mass>
+			<Bulk>0.88</Bulk>
+		</statBases>
+		<ammoClass>GrenadeHE</ammoClass>
+		<detonateProjectile>Bullet_BaseAriadnanMicroMissile_HE</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Name="BaseAriadnanMicroMissile" ParentName="BaseExplosiveBullet" Abstract="true">
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<graphicData>
+			<texPath>ThirdParty/InfinityRimAriadna/MicroMissile_projectile</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>0.75</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>70</speed>
+			<soundAmbient>RocketPropelledLoop_Small</soundAmbient>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseAriadnanMicroMissile">
+		<defName>Bullet_BaseAriadnanMicroMissile_HE</defName>
+		<label>Ariadnan micro missile (HE)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>28</damageAmountBase>
+			<explosionRadius>1.5</explosionRadius>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>25</Fragment_Small>
+					<Fragment_Large>8</Fragment_Large>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<RecipeDef ParentName="LauncherAmmoRecipeBase">
+		<defName>MakeAmmo_AriadnanMicroMissile_HE</defName>
+		<label>make Ariadnan micro missile (HE) x10</label>
+		<description>Craft 10 Ariadnan HE micro missile.</description>
+		<jobString>Making Ariadnan micro missile (HE).</jobString>
+		<workAmount>4200</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>18</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_AriadnanMicroMissile_HE>10</Ammo_AriadnanMicroMissile_HE>
+		</products>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Infinity Rim Ariadna/Defs/Infinity Rim Ariadna/Ammo/Pistol.xml b/ModPatches/Infinity Rim Ariadna/Defs/Infinity Rim Ariadna/Ammo/Pistol.xml
new file mode 100644
index 0000000000..87eb4bfe5f
--- /dev/null
+++ b/ModPatches/Infinity Rim Ariadna/Defs/Infinity Rim Ariadna/Ammo/Pistol.xml	
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ==================== Pistol - Normal ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_TeseumPistol</defName>
+		<label>9x19mm Ariadnan</label>
+		<ammoTypes>
+			<Ammo_9x19mmPara_FMJ>Bullet_9x19mmPara_FMJ</Ammo_9x19mmPara_FMJ>
+			<Ammo_9x19mmPara_AP>Bullet_9x19mmPara_AP</Ammo_9x19mmPara_AP>
+			<Ammo_9x19mmPara_HP>Bullet_9x19mmPara_HP</Ammo_9x19mmPara_HP>
+			<Ammo_9x19mmPara_Teseum>Bullet_9x19mmPara_Teseum</Ammo_9x19mmPara_Teseum>
+		</ammoTypes>
+		<similarTo>AmmoSet_TeseumPistolGeneric</similarTo>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_TeseumPistolGeneric</defName>
+		<label>pistol</label>
+		<ammoTypes>
+			<Ammo_Pistol_FMJ>Bullet_9x19mmPara_FMJ</Ammo_Pistol_FMJ>
+			<Ammo_Pistol_AP>Bullet_9x19mmPara_AP</Ammo_Pistol_AP>
+			<Ammo_Pistol_HP>Bullet_9x19mmPara_HP</Ammo_Pistol_HP>
+			<Ammo_Pistol_Teseum>Bullet_9x19mmPara_Teseum</Ammo_Pistol_Teseum>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="9x19mmParaBase">
+		<defName>Ammo_9x19mmPara_Teseum</defName>
+		<label>9x19mm Para cartridge (Teseum)</label>
+		<graphicData>
+			<texPath>ThirdParty/InfinityRimAriadna/TeseumPistol</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.1</MarketValue>
+		</statBases>
+		<ammoClass>Teseum</ammoClass>
+		<cookOffProjectile>Bullet_9x19mmPara_Teseum</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoPistolBase">
+		<defName>Ammo_Pistol_Teseum</defName>
+		<label>pistol cartridge (Teseum)</label>
+		<graphicData>
+			<texPath>ThirdParty/InfinityRimAriadna/TeseumPistol</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.1</MarketValue>
+		</statBases>
+		<ammoClass>Teseum</ammoClass>
+		<cookOffProjectile>Bullet_9x19mmPara_Teseum</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base9x19mmParaBullet">
+		<defName>Bullet_9x19mmPara_Teseum</defName>
+		<label>9mm Para bullet (Teseum)</label>
+		<graphicData>
+			<color>(170,170,210)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>13</damageAmountBase>
+			<armorPenetrationSharp>10</armorPenetrationSharp>
+			<armorPenetrationBlunt>9.66</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_9x19mmPara_Teseum</defName>
+		<label>make 9x19mm Parabellum (Teseum) cartridge x500</label>
+		<description>Craft 500 9x19mm Parabellum (Teseum) cartridges.</description>
+		<jobString>Making 9x19mm Parabellum (Teseum) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>14</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Teseum</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Teseum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_9x19mmPara_Teseum>500</Ammo_9x19mmPara_Teseum>
+		</products>
+		<workAmount>1400</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_Pistol_Teseum</defName>
+		<label>make pistol (Teseum) cartridge x500</label>
+		<description>Craft 500 pistol (Teseum) cartridges.</description>
+		<jobString>Making pistol (Teseum) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>14</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Teseum</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Teseum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Pistol_Teseum>500</Ammo_Pistol_Teseum>
+		</products>
+		<workAmount>1400</workAmount>
+	</RecipeDef>
+
+	<!-- ==================== Pistol - magnum ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_TeseumPistolMagnum</defName>
+		<label>.44 Magnum Ariadnan</label>
+		<ammoTypes>
+			<Ammo_44Magnum_FMJ>Bullet_44Magnum_FMJ</Ammo_44Magnum_FMJ>
+			<Ammo_44Magnum_AP>Bullet_44Magnum_AP</Ammo_44Magnum_AP>
+			<Ammo_44Magnum_HP>Bullet_44Magnum_HP</Ammo_44Magnum_HP>
+			<Ammo_44Magnum_Teseum>Bullet_44Magnum_Teseum</Ammo_44Magnum_Teseum>
+		</ammoTypes>
+		<similarTo>AmmoSet_TeseumPistolMagnumGeneric</similarTo>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_TeseumPistolMagnumGeneric</defName>
+		<label>magnum pistol</label>
+		<ammoTypes>
+			<Ammo_PistolMagnum_FMJ>Bullet_44Magnum_FMJ</Ammo_PistolMagnum_FMJ>
+			<Ammo_PistolMagnum_AP>Bullet_44Magnum_AP</Ammo_PistolMagnum_AP>
+			<Ammo_PistolMagnum_HP>Bullet_44Magnum_HP</Ammo_PistolMagnum_HP>
+			<Ammo_PistolMagnum_Teseum>Bullet_44Magnum_Teseum</Ammo_PistolMagnum_Teseum>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="44MagnumBase">
+		<defName>Ammo_44Magnum_Teseum</defName>
+		<label>.44 Magnum cartridge (Teseum)</label>
+		<graphicData>
+			<texPath>ThirdParty/InfinityRimAriadna/TeseumPistol</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.1</MarketValue>
+		</statBases>
+		<ammoClass>Teseum</ammoClass>
+		<cookOffProjectile>Bullet_44Magnum_Teseum</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoPistomMagnum">
+		<defName>Ammo_PistolMagnum_Teseum</defName>
+		<label>magnum pistol cartridge (Teseum)</label>
+		<graphicData>
+			<texPath>ThirdParty/InfinityRimAriadna/TeseumPistol</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.1</MarketValue>
+		</statBases>
+		<ammoClass>Teseum</ammoClass>
+		<cookOffProjectile>Bullet_44Magnum_Teseum</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base44MagnumBullet">
+		<defName>Bullet_44Magnum_Teseum</defName>
+		<label>.44 Magnum bullet (Teseum)</label>
+		<graphicData>
+			<color>(170,170,210)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>19</damageAmountBase>
+			<armorPenetrationSharp>15</armorPenetrationSharp>
+			<armorPenetrationBlunt>23.280</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_44Magnum_Teseum</defName>
+		<label>make .44 Magnum (Teseum) cartridge x500</label>
+		<description>Craft 500 .44 Magnum (Teseum) cartridges.</description>
+		<jobString>Making .44 Magnum (Teseum) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>24</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Teseum</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Teseum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_44Magnum_Teseum>500</Ammo_44Magnum_Teseum>
+		</products>
+		<workAmount>2400</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_PistolMagnum_Teseum</defName>
+		<label>make magnum pistol (Teseum) cartridge x500</label>
+		<description>Craft 500 magnum pistol (Teseum) cartridges.</description>
+		<jobString>Making magnum pistol (Teseum) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>24</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Teseum</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Teseum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_PistolMagnum_Teseum>500</Ammo_PistolMagnum_Teseum>
+		</products>
+		<workAmount>2400</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Infinity Rim Ariadna/Defs/Infinity Rim Ariadna/Ammo/Rifle.xml b/ModPatches/Infinity Rim Ariadna/Defs/Infinity Rim Ariadna/Ammo/Rifle.xml
new file mode 100644
index 0000000000..aec384cee5
--- /dev/null
+++ b/ModPatches/Infinity Rim Ariadna/Defs/Infinity Rim Ariadna/Ammo/Rifle.xml	
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ==================== Rifle - SmallCal ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_TeseumRifleIntermediate</defName>
+		<label>5.45x39mm Ariadnan</label>
+		<ammoTypes>
+			<Ammo_545x39mmSoviet_FMJ>Bullet_545x39mmSoviet_FMJ</Ammo_545x39mmSoviet_FMJ>
+			<Ammo_545x39mmSoviet_AP>Bullet_545x39mmSoviet_AP</Ammo_545x39mmSoviet_AP>
+			<Ammo_545x39mmSoviet_HP>Bullet_545x39mmSoviet_HP</Ammo_545x39mmSoviet_HP>
+			<Ammo_545x39mmSoviet_Teseum>Bullet_545x39mmSoviet_Teseum</Ammo_545x39mmSoviet_Teseum>
+		</ammoTypes>
+		<similarTo>AmmoSet_TeseumRifleIntermediateGeneric</similarTo>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_TeseumRifleIntermediateGeneric</defName>
+		<label>intermediate rifle</label>
+		<ammoTypes>
+			<Ammo_RifleIntermediate_FMJ>Bullet_545x39mmSoviet_FMJ</Ammo_RifleIntermediate_FMJ>
+			<Ammo_RifleIntermediate_AP>Bullet_545x39mmSoviet_AP</Ammo_RifleIntermediate_AP>
+			<Ammo_RifleIntermediate_HP>Bullet_545x39mmSoviet_HP</Ammo_RifleIntermediate_HP>
+			<Ammo_RifleIntermediate_Teseum>Bullet_545x39mmSoviet_Teseum</Ammo_RifleIntermediate_Teseum>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="545x39mmSovietBase">
+		<defName>Ammo_545x39mmSoviet_Teseum</defName>
+		<label>5.45x39mm Soviet cartridge (Teseum)</label>
+		<graphicData>
+			<texPath>ThirdParty/InfinityRimAriadna/TeseumRifle</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.14</MarketValue>
+		</statBases>
+		<ammoClass>Teseum</ammoClass>
+		<cookOffProjectile>Bullet_545x39mmSoviet_Teseum</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoRifleIntermediateBase">
+		<defName>Ammo_RifleIntermediate_Teseum</defName>
+		<label>intermediate rifle cartridge (Teseum)</label>
+		<graphicData>
+			<texPath>ThirdParty/InfinityRimAriadna/TeseumRifle</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.14</MarketValue>
+		</statBases>
+		<ammoClass>Teseum</ammoClass>
+		<cookOffProjectile>Bullet_545x39mmSoviet_Teseum</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base545x39mmSovietBullet">
+		<defName>Bullet_545x39mmSoviet_Teseum</defName>
+		<label>5.45mm Soviet bullet (Teseum)</label>
+		<graphicData>
+			<color>(170,170,210)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>16</damageAmountBase>
+			<armorPenetrationSharp>18</armorPenetrationSharp>
+			<armorPenetrationBlunt>28.04</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_545x39mmSoviet_Teseum</defName>
+		<label>make 5.45x39mm Soviet (Teseum) cartridge x500</label>
+		<description>Craft 500 5.45x39mm Soviet (Teseum) cartridges.</description>
+		<jobString>Making 5.45x39mm Soviet (Teseum) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Teseum</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Teseum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_545x39mmSoviet_Teseum>500</Ammo_545x39mmSoviet_Teseum>
+		</products>
+		<workAmount>2400</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_RifleIntermediate_Teseum</defName>
+		<label>make intermediate rifle (Teseum) cartridge x500</label>
+		<description>Craft 500 intermediate rifle (Teseum) cartridges.</description>
+		<jobString>Making intermediate rifle (Teseum) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Teseum</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Teseum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_545x39mmSoviet_Teseum>500</Ammo_545x39mmSoviet_Teseum>
+		</products>
+		<workAmount>2400</workAmount>
+	</RecipeDef>
+
+	<!-- ==================== Rifle - FullPower ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_TeseumRifleFullPower</defName>
+		<label>7.62x54mm Ariadnan</label>
+		<ammoTypes>
+			<Ammo_762x54mmR_FMJ>Bullet_762x54mmR_FMJ</Ammo_762x54mmR_FMJ>
+			<Ammo_762x54mmR_AP>Bullet_762x54mmR_AP</Ammo_762x54mmR_AP>
+			<Ammo_762x54mmR_HP>Bullet_762x54mmR_HP</Ammo_762x54mmR_HP>
+			<Ammo_762x54mmR_Teseum>Bullet_762x54mmR_Teseum</Ammo_762x54mmR_Teseum>
+		</ammoTypes>
+		<similarTo>AmmoSet_TeseumRifleFullPowerGeneric</similarTo>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_TeseumRifleFullPowerGeneric</defName>
+		<label>full power rifle</label>
+		<ammoTypes>
+			<Ammo_Rifle_FMJ>Bullet_762x51mmNATO_FMJ</Ammo_Rifle_FMJ>
+			<Ammo_Rifle_AP>Bullet_762x51mmNATO_AP</Ammo_Rifle_AP>
+			<Ammo_Rifle_HP>Bullet_762x51mmNATO_HP</Ammo_Rifle_HP>
+			<Ammo_Rifle_Teseum>Bullet_762x54mmR_Teseum</Ammo_Rifle_Teseum>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x54mmRBase">
+		<defName>Ammo_762x54mmR_Teseum</defName>
+		<label>7.62x54mmR cartridge (Teseum)</label>
+		<graphicData>
+			<texPath>ThirdParty/InfinityRimAriadna/TeseumRifle</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.22</MarketValue>
+		</statBases>
+		<ammoClass>Teseum</ammoClass>
+		<cookOffProjectile>Bullet_762x54mmR_Teseum</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoRifleBase">
+		<defName>Ammo_Rifle_Teseum</defName>
+		<label>rifle cartridge (Teseum)</label>
+		<graphicData>
+			<texPath>ThirdParty/InfinityRimAriadna/TeseumRifle</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.22</MarketValue>
+		</statBases>
+		<ammoClass>Teseum</ammoClass>
+		<cookOffProjectile>Bullet_762x54mmR_Teseum</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base762x54mmRBullet">
+		<defName>Bullet_762x54mmR_Teseum</defName>
+		<label>7.62mmR bullet (Teseum)</label>
+		<graphicData>
+			<color>(170,170,210)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>25</damageAmountBase>
+			<armorPenetrationSharp>24</armorPenetrationSharp>
+			<armorPenetrationBlunt>67.340</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_762x54mmR_Teseum</defName>
+		<label>make 7.62x54mmR (Teseum) cartridge x500</label>
+		<description>Craft 500 7.62x54mmR (Teseum) cartridges.</description>
+		<jobString>Making 7.62x54mmR (Teseum) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>28</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Teseum</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Teseum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_762x54mmR_Teseum>500</Ammo_762x54mmR_Teseum>
+		</products>
+		<workAmount>5600</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_Rifle_Teseum</defName>
+		<label>make rifle (Teseum) cartridge x500</label>
+		<description>Craft 500 rifle (Teseum) cartridges.</description>
+		<jobString>Making rifle (Teseum) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>26</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Teseum</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Teseum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Rifle_Teseum>500</Ammo_Rifle_Teseum>
+		</products>
+		<workAmount>5600</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Infinity Rim Ariadna/Defs/Infinity Rim Ariadna/Ammo/Shotgun.xml b/ModPatches/Infinity Rim Ariadna/Defs/Infinity Rim Ariadna/Ammo/Shotgun.xml
new file mode 100644
index 0000000000..9689124380
--- /dev/null
+++ b/ModPatches/Infinity Rim Ariadna/Defs/Infinity Rim Ariadna/Ammo/Shotgun.xml	
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ==================== Shotgun - AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_12GaugeTeseum</defName>
+		<label>12 Gauge Ariadnan</label>
+		<ammoTypes>
+			<Ammo_12Gauge_Buck>Bullet_12Gauge_Buck</Ammo_12Gauge_Buck>
+			<Ammo_12Gauge_Slug>Bullet_12Gauge_Slug</Ammo_12Gauge_Slug>
+			<Ammo_12Gauge_Teseum>Bullet_12Gauge_Teseum</Ammo_12Gauge_Teseum>
+		</ammoTypes>
+		<similarTo>AmmoSet_12GaugeTeseumGeneric</similarTo>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_12GaugeTeseumGeneric</defName>
+		<label>shotgun shell</label>
+		<ammoTypes>
+			<Ammo_Shotgun_Buck>Bullet_12Gauge_Buck</Ammo_Shotgun_Buck>
+			<Ammo_Shotgun_Slug>Bullet_12Gauge_Slug</Ammo_Shotgun_Slug>
+			<Ammo_Shotgun_Teseum>Bullet_12Gauge_Teseum</Ammo_Shotgun_Teseum>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="12GaugeBase">
+		<defName>Ammo_12Gauge_Teseum</defName>
+		<label>12 gauge shell (Teseum)</label>
+		<graphicData>
+			<texPath>ThirdParty/InfinityRimAriadna/TeseumHeavy</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<Mass>0.054</Mass>
+			<MarketValue>0.87</MarketValue>
+		</statBases>
+		<ammoClass>ElectroSlug</ammoClass>
+		<cookOffProjectile>Bullet_12Gauge_Teseum</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoShotgunBase">
+		<defName>Ammo_Shotgun_Teseum</defName>
+		<label>shotgun shell (Teseum)</label>
+		<graphicData>
+			<texPath>ThirdParty/InfinityRimAriadna/TeseumHeavy</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<Mass>0.054</Mass>
+			<MarketValue>0.87</MarketValue>
+		</statBases>
+		<ammoClass>ElectroSlug</ammoClass>
+		<cookOffProjectile>Bullet_12Gauge_Teseum</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base12GaugeBullet">
+		<defName>Bullet_12Gauge_Teseum</defName>
+		<label>buckshot pellet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shotgun_Pellet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<color>(170,170,210)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>8</damageAmountBase>
+			<pelletCount>9</pelletCount>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+			<armorPenetrationBlunt>4.52</armorPenetrationBlunt>
+			<spreadMult>17.8</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_12Gauge_Teseum</defName>
+		<label>make 12 gauge (Teseum) shell x200</label>
+		<description>Craft 200 12 gauge (Teseum) shells.</description>
+		<jobString>Making 12 gauge (Teseum) shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Teseum</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Teseum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_12Gauge_Teseum>200</Ammo_12Gauge_Teseum>
+		</products>
+		<workAmount>4400</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_Shotgun_Teseum</defName>
+		<label>make shotgun (Teseum) shell x200</label>
+		<description>Craft 200 shotgun (Teseum) shells.</description>
+		<jobString>Making shotgun (Teseum) shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Teseum</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Teseum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Shotgun_Teseum>200</Ammo_Shotgun_Teseum>
+		</products>
+		<workAmount>4400</workAmount>
+	</RecipeDef>
+
+	<!-- ==================== Chaingun - AmmoSet ========================== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_AriadnanChainGun</defName>
+		<label>Ariadnan chain rifle</label>
+		<ammoTypes>
+			<Ammo_AriadnanChainGun>Bullet_AriadnanChainGun</Ammo_AriadnanChainGun>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="12GaugeBase">
+		<defName>Ammo_AriadnanChainGun</defName>
+		<label>chain rifle segments</label>
+		<graphicData>
+			<texPath>ThirdParty/InfinityRimAriadna/Chain</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<stackLimit>75</stackLimit>
+		<statBases>
+			<Mass>0.1</Mass>
+			<Bulk>0.1</Bulk>
+			<MarketValue>0.08</MarketValue>
+		</statBases>
+		<ammoClass>BuckShot</ammoClass>
+	</ThingDef>
+
+	<ThingDef ParentName="Base12GaugeBullet">
+		<defName>Bullet_AriadnanChainGun</defName>
+		<label>molten metal</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shotgun_Pellet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<color>(200,150,100)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>4</damageAmountBase>
+			<pelletCount>9</pelletCount>
+			<armorPenetrationSharp>2</armorPenetrationSharp>
+			<armorPenetrationBlunt>2.52</armorPenetrationBlunt>
+			<spreadMult>37.8</spreadMult>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>5</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_AriadnanChainGun</defName>
+		<label>make chain rifle segments x200</label>
+		<description>Craft 100 chain rifle segments.</description>
+		<jobString>Making chain rifle segments.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>25</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_AriadnanChainGun>75</Ammo_AriadnanChainGun>
+		</products>
+		<workAmount>1000</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Infinity Rim Ariadna/Patches/Infinity Rim Ariadna/Antipode.xml b/ModPatches/Infinity Rim Ariadna/Patches/Infinity Rim Ariadna/Antipode.xml
new file mode 100644
index 0000000000..13c5c51be0
--- /dev/null
+++ b/ModPatches/Infinity Rim Ariadna/Patches/Infinity Rim Ariadna/Antipode.xml	
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Race_Antipode"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Race_Antipode"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.17</MeleeDodgeChance>
+			<MeleeCritChance>0.21</MeleeCritChance>
+			<MeleeParryChance>0.17</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Race_Antipode"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Race_Antipode"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Race_Antipode"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+			<li>
+				<compClass>CombatExtended.CompAmmoGiver</compClass>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Race_Antipode"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>9.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2.22</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>4.235</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="AntipodeWarrior"]/weaponTags</xpath>
+		<value>
+			<li>MedievalMeleeDecent</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="AntipodeWarrior"]/weaponMoney</xpath>
+		<value>
+			<weaponMoney>
+				<min>200</min>
+				<max>400</max>
+			</weaponMoney>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="AntipodeHunter"]/weaponTags</xpath>
+		<value>
+			<li>CE_Bow</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="AntipodeHunter" or defName="AntipodeChampion"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>20</min>
+					<max>40</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>100</min>
+					<max>130</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.6</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>80</min>
+							<max>160</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="AntipodeWarrior"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>100</min>
+					<max>130</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.6</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>80</min>
+							<max>160</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/PawnKindDef[
+			defName="AntipodeWarrior" or
+			defName="AntipodeHunter" or
+			defName="AntipodeChampion"
+			]
+		</xpath>
+		<value>
+			<combatEnhancingDrugsChance>1</combatEnhancingDrugsChance>
+			<combatEnhancingDrugsCount>1</combatEnhancingDrugsCount>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Infinity Rim Ariadna/Patches/Infinity Rim Ariadna/Apparel.xml b/ModPatches/Infinity Rim Ariadna/Patches/Infinity Rim Ariadna/Apparel.xml
new file mode 100644
index 0000000000..40aa6f38d7
--- /dev/null
+++ b/ModPatches/Infinity Rim Ariadna/Patches/Infinity Rim Ariadna/Apparel.xml	
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==================== Armor =====================-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_LightArmor"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_LightArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>11</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_LightArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_LightArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Apparel_LightArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Shoulder</li>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Shoulder</li>
+							<li>Leg</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ==================== Various =====================-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_Telnyashka" or defName="Apparel_ArmyFatigue" or defName="Apparel_SpetsnazBeret"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>0.3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_SpetsnazBeret"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<!-- ==================== Armor =====================-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_Cherkesska"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>20</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Cherkesska"]/statBases/WorkToMake</xpath>
+		<value>
+			<WorkToMake>75000</WorkToMake>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_Cherkesska"]/statBases</xpath>
+		<value>
+			<Flammability>0.2</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Cherkesska"]/statBases/Mass</xpath>
+		<value>
+			<Mass>50</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Cherkesska"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Cherkesska"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>35</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_Cherkesska"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>65</CarryWeight>
+			<CarryBulk>15</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Cherkesska"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>-0.3</MoveSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_Cherkesska"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Apparel_Cherkesska"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.50</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.50</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.40</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.40</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_CherkesskaHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_CherkesskaHelmet"]/statBases/WorkToMake</xpath>
+		<value>
+			<WorkToMake>35000</WorkToMake>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_CherkesskaHelmet"]/statBases</xpath>
+		<value>
+			<Flammability>0.2</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_CherkesskaHelmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>8</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_CherkesskaHelmet"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_CherkesskaHelmet"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>28</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Apparel_CherkesskaHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_CherkesskaHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Apparel_CherkesskaHelmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.30</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.30</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Infinity Rim Ariadna/Patches/Infinity Rim Ariadna/Weapons/AntipodeWeapon.xml b/ModPatches/Infinity Rim Ariadna/Patches/Infinity Rim Ariadna/Weapons/AntipodeWeapon.xml
new file mode 100644
index 0000000000..9ddf262c09
--- /dev/null
+++ b/ModPatches/Infinity Rim Ariadna/Patches/Infinity Rim Ariadna/Weapons/AntipodeWeapon.xml	
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Bow_Antipode</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>1</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>5.00</Bulk>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_GreatArrow_Teseum</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>30</range>
+			<soundCast>Bow_Large</soundCast>
+		</Properties>
+		<AmmoUser>
+			<ammoSet>AmmoSet_GreatArrowAntipode</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Bow_Antipode"]</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>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AntipodeCCW"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>0.83</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
+					<armorPenetrationSharp>9</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>0.94</cooldownTime>
+					<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
+					<armorPenetrationSharp>18</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Infinity Rim Ariadna/Patches/Infinity Rim Ariadna/Weapons/Heavy.xml b/ModPatches/Infinity Rim Ariadna/Patches/Infinity Rim Ariadna/Weapons/Heavy.xml
new file mode 100644
index 0000000000..d967d76c4d
--- /dev/null
+++ b/ModPatches/Infinity Rim Ariadna/Patches/Infinity Rim Ariadna/Weapons/Heavy.xml	
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Gun_MissileLauncher" or defName="Gun_AutoCannon"]/statBases/MarketValue</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_MissileLauncher" or defName="Gun_AutoCannon"]/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="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Gun_AutoCannon"]/graphicData</xpath>
+		<value>
+			<drawSize>(1.5, 1)</drawSize>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MissileLauncher</defName>
+		<statBases>
+			<Mass>5.80</Mass>
+			<RangedWeapon_Cooldown>1.6</RangedWeapon_Cooldown>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>0.5</SwayFactor>
+			<Bulk>9.0</Bulk>
+			<SightsEfficiency>1.4</SightsEfficiency>
+			<WorkToMake>56000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>45</Steel>
+			<Plasteel>55</Plasteel>
+			<Teseum>25</Teseum>
+			<ComponentIndustrial>8</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>0.5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BaseAriadnanMicroMissile_HE</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>55</range>
+			<soundCast>ShotMissileLauncher</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_AriadnanMicroMissile</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AOE</li>
+			<li>AdvancedGun</li>
+			<li>GunHeavy</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AutoCannon</defName>
+		<statBases>
+			<Mass>25.80</Mass>
+			<RangedWeapon_Cooldown>2.5</RangedWeapon_Cooldown>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>2.5</SwayFactor>
+			<Bulk>29.0</Bulk>
+			<SightsEfficiency>1.4</SightsEfficiency>
+			<WorkToMake>88000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>60</Steel>
+			<Plasteel>85</Plasteel>
+			<Teseum>50</Teseum>
+			<ComponentIndustrial>15</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_20x99mmRShVAK_Teseum</defaultProjectile>
+			<warmupTime>2.5</warmupTime>
+			<range>55</range>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<soundCast>ShotAutoCannon</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>16</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>12.5</reloadTime>
+			<ammoSet>AmmoSet_TeseumAutocannon</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>Bipod_ATR</li>
+			<li>AdvancedGun</li>
+			<li>GunHeavy</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Gun_AutoCannon"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.5,1</DrawSize>
+				<DrawOffset>0.05,0.0</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Gun_MissileLauncher"]</xpath>
+		<value>
+			<recipeMaker>
+				<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+				<workSkill>Crafting</workSkill>
+				<effectWorking>Smith</effectWorking>
+				<soundWorking>Recipe_Smith</soundWorking>
+				<recipeUsers>
+					<li>TableMachining</li>
+				</recipeUsers>
+				<unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
+				<researchPrerequisite>CE_Launchers</researchPrerequisite>
+			</recipeMaker>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Gun_AutoCannon"]</xpath>
+		<value>
+			<recipeMaker>
+				<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+				<workSkill>Crafting</workSkill>
+				<effectWorking>Smith</effectWorking>
+				<soundWorking>Recipe_Smith</soundWorking>
+				<recipeUsers>
+					<li>TableMachining</li>
+				</recipeUsers>
+				<unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
+				<researchPrerequisite>CE_TurretHeavyWeapons</researchPrerequisite>
+			</recipeMaker>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Infinity Rim Ariadna/Patches/Infinity Rim Ariadna/Weapons/Machinegun.xml b/ModPatches/Infinity Rim Ariadna/Patches/Infinity Rim Ariadna/Weapons/Machinegun.xml
new file mode 100644
index 0000000000..ff92ab92e1
--- /dev/null
+++ b/ModPatches/Infinity Rim Ariadna/Patches/Infinity Rim Ariadna/Weapons/Machinegun.xml	
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_Molotok" or defName="Gun_Hishchnik"]/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>
+
+	<!--Compact, thus low weight, low bulk, but high recoil and spread-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Molotok</defName>
+		<statBases>
+			<Mass>6.12</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.83</SwayFactor>
+			<Bulk>10.03</Bulk>
+			<WorkToMake>64000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>80</Steel>
+			<Plasteel>20</Plasteel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+			<Teseum>20</Teseum>
+		</costList>
+		<Properties>
+			<recoilAmount>1.8</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_Teseum</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>72</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>ShotMolotok</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_TeseumRifleIntermediate</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_MachineGun</li>
+			<li>CE_AI_LMG</li>
+			<li>Bipod_LMG</li>
+		</weaponTags>
+		<researchPrerequisite>GasOperation</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Gun_Molotok"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.16,1.25</DrawSize>
+				<DrawOffset>0.05,-0.07</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Hishchnik</defName>
+		<statBases>
+			<Mass>12.5</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.53</SwayFactor>
+			<Bulk>16.7</Bulk>
+			<WorkToMake>58000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>150</Steel>
+			<ComponentIndustrial>12</ComponentIndustrial>
+			<Teseum>30</Teseum>
+		</costList>
+		<Properties>
+			<recoilAmount>1.5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_Teseum</defaultProjectile>
+			<warmupTime>1.8</warmupTime>
+			<range>62</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>15</burstShotCount>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_TeseumRifleFullPower</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_MachineGun</li>
+			<li>CE_AI_LMG</li>
+			<li>Bipod_LMG</li>
+			<li>AdvancedGun</li>
+			<li>GunHeavy</li>
+		</weaponTags>
+		<researchPrerequisite>GasOperation</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Gun_Hishchnik"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.35,1.18</DrawSize>
+				<DrawOffset>0.13,-0.03</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Infinity Rim Ariadna/Patches/Infinity Rim Ariadna/Weapons/Melee.xml b/ModPatches/Infinity Rim Ariadna/Patches/Infinity Rim Ariadna/Weapons/Melee.xml
new file mode 100644
index 0000000000..666af93c0c
--- /dev/null
+++ b/ModPatches/Infinity Rim Ariadna/Patches/Infinity Rim Ariadna/Weapons/Melee.xml	
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_APKnife"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.18</cooldownTime>
+					<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
+					<armorPenetrationSharp>5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>12</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_APCCW"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>0.83</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
+					<armorPenetrationSharp>9</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>0.94</cooldownTime>
+					<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
+					<armorPenetrationSharp>18</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="IRA_Vodka"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2.22</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>neck</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>3.33</cooldownTime>
+					<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Neck</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Infinity Rim Ariadna/Patches/Infinity Rim Ariadna/Weapons/Pistols.xml b/ModPatches/Infinity Rim Ariadna/Patches/Infinity Rim Ariadna/Weapons/Pistols.xml
new file mode 100644
index 0000000000..a0833ebaed
--- /dev/null
+++ b/ModPatches/Infinity Rim Ariadna/Patches/Infinity Rim Ariadna/Weapons/Pistols.xml	
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_HeavyPistol" or defName="Gun_AssaultPistol"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_HeavyPistol</defName>
+		<statBases>
+			<Mass>2.39</Mass>
+			<RangedWeapon_Cooldown>0.49</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>3.41</Bulk>
+			<WorkToMake>14000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>55</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+			<Teseum>10</Teseum>
+		</costList>
+		<Properties>
+			<recoilAmount>2.96</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_44Magnum_Teseum</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>15</range>
+			<soundCast>ShotHeavyPistol</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>0.8</reloadTime>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<ammoSet>AmmoSet_TeseumPistolMagnum</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_BROOM</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+		<researchPrerequisite>Gunsmithing</researchPrerequisite>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AssaultPistol</defName>
+		<statBases>
+			<Mass>1.35</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.07</SwayFactor>
+			<Bulk>2.5</Bulk>
+			<WorkToMake>14000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>90</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+			<Teseum>5</Teseum>
+		</costList>
+		<Properties>
+			<recoilAmount>1.72</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_Teseum</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>ShotAssaultPistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_TeseumPistol</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_BROOM</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+		<researchPrerequisite>BlowbackOperation</researchPrerequisite>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Gun_AssaultPistol"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>0.93,0.93</DrawSize>
+				<DrawOffset>0.0,0.0</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Infinity Rim Ariadna/Patches/Infinity Rim Ariadna/Weapons/Rifles.xml b/ModPatches/Infinity Rim Ariadna/Patches/Infinity Rim Ariadna/Weapons/Rifles.xml
new file mode 100644
index 0000000000..da907f640a
--- /dev/null
+++ b/ModPatches/Infinity Rim Ariadna/Patches/Infinity Rim Ariadna/Weapons/Rifles.xml	
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_APRifle" or defName="Gun_APSniperRifle" or defName="Gun_Ohotnik"]/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="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_APRifle</defName>
+		<statBases>
+			<Mass>3.26</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>10.03</Bulk>
+			<WorkToMake>60000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>80</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+			<Teseum>10</Teseum>
+		</costList>
+		<Properties>
+			<recoilAmount>1.50</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_Teseum</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>65</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>ShotAPRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_TeseumRifleIntermediate</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AR</li>
+		</weaponTags>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Gun_APRifle"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.16,1.25</DrawSize>
+				<DrawOffset>0.05,-0.07</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_APSniperRifle</defName>
+		<statBases>
+			<Mass>7.30</Mass>
+			<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.6</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.35</SwayFactor>
+			<Bulk>11.92</Bulk>
+			<WorkToMake>60000</WorkToMake>
+		</statBases>
+		<costList>
+			<Teseum>18</Teseum>
+			<Steel>100</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.50</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_Teseum</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>86</range>
+			<soundCast>ShotAPSniperRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_TeseumRifleIntermediate</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_SR</li>
+			<li>Bipod_DMR</li>
+		</weaponTags>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Gun_APSniperRifle"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.25,1.45</DrawSize>
+				<DrawOffset>0.15,-0.05</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Ohotnik</defName>
+		<statBases>
+			<Mass>4.19</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.68</SwayFactor>
+			<Bulk>12.60</Bulk>
+			<WorkToMake>24000</WorkToMake>
+		</statBases>
+		<costList>
+			<Teseum>15</Teseum>
+			<Steel>70</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+			<WoodLog>15</WoodLog>
+		</costList>
+		<Properties>
+			<recoilAmount>2.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_Teseum</defaultProjectile>
+			<warmupTime>1.9</warmupTime>
+			<range>65</range>
+			<soundCast>ShotAPSniperRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_TeseumRifleFullPower</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_SR</li>
+		</weaponTags>
+		<researchPrerequisite>Gunsmithing</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Gun_Ohotnik"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.34,1.34</DrawSize>
+				<DrawOffset>0.12,-0.10</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Infinity Rim Ariadna/Patches/Infinity Rim Ariadna/Weapons/Shotguns.xml b/ModPatches/Infinity Rim Ariadna/Patches/Infinity Rim Ariadna/Weapons/Shotguns.xml
new file mode 100644
index 0000000000..b8a64928a5
--- /dev/null
+++ b/ModPatches/Infinity Rim Ariadna/Patches/Infinity Rim Ariadna/Weapons/Shotguns.xml	
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_BoardingShotgun" or defName="Gun_ChainRifle"]/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="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_BoardingShotgun</defName>
+		<statBases>
+			<Mass>2.50</Mass>
+			<RangedWeapon_Cooldown>1.0</RangedWeapon_Cooldown>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.20</SwayFactor>
+			<Bulk>7.0</Bulk>
+			<SightsEfficiency>1</SightsEfficiency>
+			<WorkToMake>20500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>65</Steel>
+			<Teseum>8</Teseum>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>3.15</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Teseum</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>16</range>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>4</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_12GaugeTeseum</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+		<researchPrerequisite>Gunsmithing</researchPrerequisite>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Gun_BoardingShotgun"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.03,1.25</DrawSize>
+				<DrawOffset>0.05,0.0</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_ChainRifle</defName>
+		<statBases>
+			<Mass>4.50</Mass>
+			<RangedWeapon_Cooldown>1.3</RangedWeapon_Cooldown>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.5</SwayFactor>
+			<Bulk>11.0</Bulk>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<WorkToMake>5800</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>65</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>3.15</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_AriadnanChainGun</defaultProjectile>
+			<warmupTime>0.8</warmupTime>
+			<range>10</range>
+			<soundCast>ShotAssaultPistol</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>5</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>4</AmmoGenPerMagOverride>
+			<reloadTime>2.5</reloadTime>
+			<ammoSet>AmmoSet_AriadnanChainGun</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+		<researchPrerequisite>Gunsmithing</researchPrerequisite>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Infused 2 Expansion/Patches/Infused 2 Expansion/Infused2_anyTier.xml b/ModPatches/Infused 2 Expansion/Patches/Infused 2 Expansion/Infused2_anyTier.xml
new file mode 100644
index 0000000000..b7588888dd
--- /dev/null
+++ b/ModPatches/Infused 2 Expansion/Patches/Infused 2 Expansion/Infused2_anyTier.xml	
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Uncommon tier ========== -->
+
+	<!-- ======= Apparel =======-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Infusion.InfusionDef[defName="Pocketed"]/stats</xpath>
+		<value>
+			<stats>
+				<li>
+					<key>CarryBulk</key>
+					<value>
+						<offset>5</offset>
+					</value>
+				</li>
+			</stats>
+		</value>
+	</Operation>
+
+	<!-- ======= Melee Weapon =======-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Infusion.InfusionDef[defName="Speedy"]/stats/li[3]/value/offset</xpath>
+		<value>
+			<offset>0.10</offset>
+		</value>
+	</Operation>
+
+	<!-- ======= Ranged Weapon ======= -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Infusion.InfusionDef[defName="AimAssist"]/stats</xpath>
+		<value>
+			<stats>
+				<li>
+					<key>SightsEfficiency</key>
+					<value>
+						<offset>0.10</offset>
+					</value>
+				</li>
+			</stats>
+		</value>
+	</Operation>
+
+	<!-- ========== Rare tier ========== -->
+
+	<!-- ======= Apparel =======-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Infusion.InfusionDef[defName="DeepPocketed"]/stats</xpath>
+		<value>
+			<stats>
+				<li>
+					<key>CarryBulk</key>
+					<value>
+						<offset>15</offset>
+					</value>
+				</li>
+			</stats>
+		</value>
+	</Operation>
+
+	<!-- ======= Melee Weapon =======-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Infusion.InfusionDef[defName="Jock"]/stats/li[3]/value/offset</xpath>
+		<value>
+			<offset>0.12</offset>
+		</value>
+	</Operation>
+
+	<!-- ========== Legendary tier ========== -->
+
+	<!-- ======= Melee Weapon =======-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Infusion.InfusionDef[defName="Doppelganger"]/stats/li[1]/value/offset</xpath>
+		<value>
+			<offset>0.35</offset>
+		</value>
+	</Operation>
+
+	<!-- ======= Ranged Weapon ======= -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Infusion.InfusionDef[defName="TrueShot"]/stats</xpath>
+		<value>
+			<stats>
+				<li>
+					<key>SightsEfficiency</key>
+					<value>
+						<offset>0.25</offset>
+					</value>
+				</li>
+			</stats>
+		</value>
+	</Operation>
+
+	<!-- ========== Cursed tier ========== -->
+
+	<!-- ======= Ranged Weapon ======= -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Infusion.InfusionDef[defName="CurseOfGambling"]/stats</xpath>
+		<value>
+			<stats>
+				<li>
+					<key>SightsEfficiency</key>
+					<value>
+						<offset>-0.95</offset>
+					</value>
+				</li>
+			</stats>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Infusion 2/Patches/Infusion 2/Common_tier.xml b/ModPatches/Infusion 2/Patches/Infusion 2/Common_tier.xml
new file mode 100644
index 0000000000..fa0031b5a3
--- /dev/null
+++ b/ModPatches/Infusion 2/Patches/Infusion 2/Common_tier.xml	
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Common tier ========== -->
+
+	<!-- ======= Apparel =======-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Infusion.InfusionDef[defName="Absorbing"]/stats/li[1]/value/offset</xpath>
+		<value>
+			<offset>0.75</offset>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Infusion.InfusionDef[defName="Hardened"]/stats/li[1]/value/offset</xpath>
+		<value>
+			<offset>0.75</offset>
+		</value>
+	</Operation>
+
+	<!-- ======= Melee Weapon ======= -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Infusion.InfusionDef[defName="Keen"]/stats/li[1]/value/offset</xpath>
+		<value>
+			<offset>0.10</offset>
+		</value>
+	</Operation>
+
+	<!-- ======= Ranged Weapon ======= -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Infusion.InfusionDef[defName="Accurate"]/stats</xpath>
+		<value>
+			<stats>
+				<li>
+					<key>SightsEfficiency</key>
+					<value>
+						<offset>0.05</offset>
+					</value>
+				</li>
+			</stats>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Infusion 2/Patches/Infusion 2/Legendary_tier.xml b/ModPatches/Infusion 2/Patches/Infusion 2/Legendary_tier.xml
new file mode 100644
index 0000000000..71b36b7560
--- /dev/null
+++ b/ModPatches/Infusion 2/Patches/Infusion 2/Legendary_tier.xml	
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Legendary tier ========== -->
+
+	<!-- ======= Apparel =======-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Infusion.InfusionDef[defName="Protective"]/stats/li[1]/value/offset</xpath>
+		<value>
+			<offset>4.15</offset>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Infusion.InfusionDef[defName="Protective"]/stats/li[2]/value/offset</xpath>
+		<value>
+			<offset>4.15</offset>
+		</value>
+	</Operation>
+
+	<!-- ======= Melee Weapon =======-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Infusion.InfusionDef[defName="Accelerated"]/stats/li[3]/value/offset</xpath>
+		<value>
+			<offset>0.25</offset>
+		</value>
+	</Operation>
+
+	<!-- ======= Ranged Weapon ======= -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Infusion.InfusionDef[defName="Homing"]/stats</xpath>
+		<value>
+			<stats>
+				<li>
+					<key>SightsEfficiency</key>
+					<value>
+						<offset>0.16</offset>
+					</value>
+				</li>
+			</stats>
+		</value>
+	</Operation>
+
+	<!-- ======= Weapons Infusion =======-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Infusion.InfusionDef[defName="Guardian"]/stats/li[2]/value/offset</xpath>
+		<value>
+			<offset>2.75</offset>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Infusion.InfusionDef[defName="Guardian"]/stats/li[3]/value/offset</xpath>
+		<value>
+			<offset>2.75</offset>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Infusion 2/Patches/Infusion 2/Rare_tier.xml b/ModPatches/Infusion 2/Patches/Infusion 2/Rare_tier.xml
new file mode 100644
index 0000000000..d77bcd1df0
--- /dev/null
+++ b/ModPatches/Infusion 2/Patches/Infusion 2/Rare_tier.xml	
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Rare tier ========== -->
+
+	<!-- ======= Apparel =======-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Infusion.InfusionDef[defName="Deflecting"]/stats/li[2]/value/offset</xpath>
+		<value>
+			<offset>2.75</offset>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Infusion.InfusionDef[defName="Dispersing"]/stats/li[2]/value/offset</xpath>
+		<value>
+			<offset>2.75</offset>
+		</value>
+	</Operation>
+
+	<!-- ======= Melee Weapon =======-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Infusion.InfusionDef[defName="Dancing"]/stats/li[2]/value/offset</xpath>
+		<value>
+			<offset>0.20</offset>
+		</value>
+	</Operation>
+
+	<!-- ======= Ranged Weapon ======= -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Infusion.InfusionDef[defName="Optimized"]/stats</xpath>
+		<value>
+			<stats>
+				<li>
+					<key>SightsEfficiency</key>
+					<value>
+						<offset>0.08</offset>
+					</value>
+				</li>
+			</stats>
+		</value>
+	</Operation>
+
+	<!-- ======= Weapons Infusion =======-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Infusion.InfusionDef[defName="Shielding"]/stats/li[2]/value/offset</xpath>
+		<value>
+			<offset>1.45</offset>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Infusion.InfusionDef[defName="Shielding"]/stats/li[3]/value/offset</xpath>
+		<value>
+			<offset>1.45</offset>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Infusion 2/Patches/Infusion 2/Uncommon_tier.xml b/ModPatches/Infusion 2/Patches/Infusion 2/Uncommon_tier.xml
new file mode 100644
index 0000000000..cfdf21fede
--- /dev/null
+++ b/ModPatches/Infusion 2/Patches/Infusion 2/Uncommon_tier.xml	
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Uncommon tier ========== -->
+
+	<!-- ======= Apparel ======= -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Infusion.InfusionDef[defName="Padded"]/stats/li[1]/value/offset</xpath>
+		<value>
+			<offset>1.45</offset>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Infusion.InfusionDef[defName="Plated"]/stats/li[1]/value/offset</xpath>
+		<value>
+			<offset>1.45</offset>
+		</value>
+	</Operation>
+
+	<!-- ======= Melee Weapon ======= -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Infusion.InfusionDef[defName="Nimble"]/stats/li[1]/value/offset</xpath>
+		<value>
+			<offset>0.15</offset>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Insects have chitin/Patches/Insects have chitin/ThingDefs_Items/Chitin.xml b/ModPatches/Insects have chitin/Patches/Insects have chitin/ThingDefs_Items/Chitin.xml
new file mode 100644
index 0000000000..2d7d8eba4c
--- /dev/null
+++ b/ModPatches/Insects have chitin/Patches/Insects have chitin/ThingDefs_Items/Chitin.xml	
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Finding the mod -->
+	<!-- InsectChitin -->
+	<!-- statBases. Armor values are based on the Alpha Animals patch. -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="InsectChitin"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.25</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="InsectChitin"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.05</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="InsectChitin"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.025</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="InsectChitin"]/statBases/SharpDamageMultiplier</xpath>
+		<value>
+			<SharpDamageMultiplier>0.6</SharpDamageMultiplier>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="InsectChitin"]/statBases/BluntDamageMultiplier</xpath>
+		<value>
+			<BluntDamageMultiplier>0.7</BluntDamageMultiplier>
+		</value>
+	</Operation>
+	<!-- StuffProps -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="InsectChitin"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>0.6</MeleePenetrationFactor>
+			<Mass>0.2</Mass>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/JDS Castle Walls/Patches/JDS Castle Walls/ThingDefs_Tower.xml b/ModPatches/JDS Castle Walls/Patches/JDS Castle Walls/ThingDefs_Tower.xml
new file mode 100644
index 0000000000..1f2415720f
--- /dev/null
+++ b/ModPatches/JDS Castle Walls/Patches/JDS Castle Walls/ThingDefs_Tower.xml	
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Remove refuelable property -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name = "CaslteDefendsBase"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
+	</Operation>
+
+	<!-- Replace vanilla thingClass -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name = "CaslteDefendsBase"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name = "CaslteDefendsBase"]/statBases/ShootingAccuracyTurret</xpath>
+		<value>
+			<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name = "CaslteDefendsBase"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>5</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<!-- Tower Turret -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Defend_Tower_GreatBow</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>1</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>5.00</Bulk>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_GreatArrow_Stone</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>32</range>
+			<soundCast>Bow_Large</soundCast>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>10</reloadTime>
+			<ammoSet>AmmoSet_GreatArrow</ammoSet>
+		</AmmoUser>
+		<weaponTags Inherit="False">
+			<li>TurretGun</li>
+		</weaponTags>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/JDS EFT Apparel/Defs/JDS EFT Apparel/Apparel_Base.xml b/ModPatches/JDS EFT Apparel/Defs/JDS EFT Apparel/Apparel_Base.xml
new file mode 100644
index 0000000000..088fac5122
--- /dev/null
+++ b/ModPatches/JDS EFT Apparel/Defs/JDS EFT Apparel/Apparel_Base.xml	
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- === Helmets - Face Shield / Eye Shield Base === -->
+
+	<ThingDef Name="EFTHeadgearShield" ParentName="JDSFrontierHeadgearBase" Abstract="True">
+		<apparel Inherit="False">
+			<bodyPartGroups>
+				<li>FullHead</li>
+			</bodyPartGroups>
+			<layers>
+				<li>Overhead</li>
+			</layers>
+			<tags>
+				<li>MilitaryHeadgear</li>
+			</tags>
+			<defaultOutfitTags>
+				<li>Soldier</li>
+			</defaultOutfitTags>
+			<useDeflectMetalEffect>true</useDeflectMetalEffect>
+		</apparel>
+	</ThingDef>
+
+	<ThingDef Name="EFTHeadgearEyeShield" ParentName="JDSFrontierHeadgearBase" Abstract="True">
+		<apparel Inherit="False">
+			<bodyPartGroups>
+				<li>UpperHead</li>
+				<li>Eyes</li>
+			</bodyPartGroups>
+			<layers>
+				<li>Overhead</li>
+			</layers>
+			<tags>
+				<li>MilitaryHeadgear</li>
+			</tags>
+			<defaultOutfitTags>
+				<li>Soldier</li>
+			</defaultOutfitTags>
+			<useDeflectMetalEffect>true</useDeflectMetalEffect>
+		</apparel>
+	</ThingDef>
+
+	<!-- === Caps / Ushanka / Beanie  ===  -->
+
+	<ThingDef Name="EFTHeadgearCaps" ParentName="JDSFrontierFaceMaskBase" Abstract="True">
+		<apparel Inherit="False">
+			<bodyPartGroups>
+				<li>UpperHead</li>
+			</bodyPartGroups>
+			<layers>
+				<li>Overhead</li>
+			</layers>
+			<tags>
+				<li>MilitaryHeadgear</li>
+			</tags>
+			<defaultOutfitTags>
+				<li>Soldier</li>
+			</defaultOutfitTags>
+		</apparel>
+	</ThingDef>
+
+	<ThingDef Name="EFTHeadgearBeanie" ParentName="JDSFrontierFaceMaskBase" Abstract="True">
+		<apparel Inherit="False">
+			<bodyPartGroups>
+				<li>UpperHead</li>
+			</bodyPartGroups>
+			<layers>
+				<li>OnHead</li>
+			</layers>
+			<tags>
+				<li>MilitaryHeadgear</li>
+			</tags>
+			<defaultOutfitTags>
+				<li>Soldier</li>
+			</defaultOutfitTags>
+		</apparel>
+	</ThingDef>
+
+	<!-- === Webbing === -->
+
+	<ThingDef Name="EFTWebbingBase" ParentName="JDSFrontierChestRigBase" Abstract="True">
+		<apparel Inherit="False">
+			<bodyPartGroups>
+				<li>Shoulders</li>
+			</bodyPartGroups>
+			<layers>
+				<li>Webbing</li>
+			</layers>
+			<tags>
+				<li>MilitaryArmor</li>
+			</tags>
+			<defaultOutfitTags>
+				<li>Soldier</li>
+			</defaultOutfitTags>
+		</apparel>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/JDS EFT Apparel/Patches/JDS EFT Apparel/Apparel_Armor.xml b/ModPatches/JDS EFT Apparel/Patches/JDS EFT Apparel/Apparel_Armor.xml
new file mode 100644
index 0000000000..c5d49fb680
--- /dev/null
+++ b/ModPatches/JDS EFT Apparel/Patches/JDS EFT Apparel/Apparel_Armor.xml	
@@ -0,0 +1,325 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Class 2 === -->
+
+	<!-- == Module-3M / PAC SA / 6B2 == -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_Module-3M" or
+			defName = "JDSTarkov_PACA_Soft_Armor" or
+			defName = "JDSTarkov_6B2_Armor"
+			]/statBases
+		</xpath>
+		<value>
+			<Bulk>4.5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- == statBases == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_Module-3M" or
+			defName = "JDSTarkov_PACA_Soft_Armor" or
+			defName = "JDSTarkov_6B2_Armor"
+			]/statBases/ArmorRating_Sharp
+		</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_Module-3M" or
+			defName = "JDSTarkov_PACA_Soft_Armor" or
+			defName = "JDSTarkov_6B2_Armor"
+			]/statBases/ArmorRating_Blunt
+		</xpath>
+		<value>
+			<ArmorRating_Blunt>8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_Module-3M" or
+			defName = "JDSTarkov_PACA_Soft_Armor" or
+			defName = "JDSTarkov_6B2_Armor"
+			]/statBases/ArmorRating_Heat
+		</xpath>
+		<value>
+			<ArmorRating_Heat>0.24</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!-- === Class 3 === -->
+
+	<!-- == MF-UNTAR / Zhuk-3 PA / 6B23-1 / BNTI Kirasa-N == -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_MF-UNTAR_Armor_Vest" or
+			defName = "JDSTarkov_Zhuk-3_Press_Armor" or
+			defName = "JDSTarkov_6B23-1_Armor" or
+			defName = "JDSTarkov_BNTI_Kirasa-N_Armor"
+			]/statBases
+		</xpath>
+		<value>
+			<Bulk>6.5</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- == statBases == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_MF-UNTAR_Armor_Vest" or
+			defName = "JDSTarkov_Zhuk-3_Press_Armor" or
+			defName = "JDSTarkov_6B23-1_Armor" or
+			defName = "JDSTarkov_BNTI_Kirasa-N_Armor"
+			]/statBases/ArmorRating_Sharp
+		</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_MF-UNTAR_Armor_Vest" or
+			defName = "JDSTarkov_Zhuk-3_Press_Armor" or
+			defName = "JDSTarkov_6B23-1_Armor" or
+			defName = "JDSTarkov_BNTI_Kirasa-N_Armor"
+			]/statBases/ArmorRating_Blunt
+		</xpath>
+		<value>
+			<ArmorRating_Blunt>18</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_MF-UNTAR_Armor_Vest" or
+			defName = "JDSTarkov_Zhuk-3_Press_Armor" or
+			defName = "JDSTarkov_6B23-1_Armor" or
+			defName = "JDSTarkov_BNTI_Kirasa-N_Armor"
+			]/statBases/ArmorRating_Heat
+		</xpath>
+		<value>
+			<ArmorRating_Heat>0.36</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!-- === Class 4 === -->
+
+	<!-- == Highcom Trooper TFO / 6B13 / 6B23-2 == -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_Highcom_Trooper_TFO_Armor" or
+			defName = "JDSTarkov_6B13_Assault_Armor" or
+			defName = "JDSTarkov_6B23-2_Armor"
+			]/statBases
+		</xpath>
+		<value>
+			<Bulk>7</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- == statBases == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_Highcom_Trooper_TFO_Armor" or
+			defName = "JDSTarkov_6B13_Assault_Armor" or
+			defName = "JDSTarkov_6B23-2_Armor"
+			]/statBases/ArmorRating_Sharp
+		</xpath>
+		<value>
+			<ArmorRating_Sharp>15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_Highcom_Trooper_TFO_Armor" or
+			defName = "JDSTarkov_6B13_Assault_Armor" or
+			defName = "JDSTarkov_6B23-2_Armor"
+			]/statBases/ArmorRating_Blunt
+		</xpath>
+		<value>
+			<ArmorRating_Blunt>26</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_Highcom_Trooper_TFO_Armor" or
+			defName = "JDSTarkov_6B13_Assault_Armor" or
+			defName = "JDSTarkov_6B23-2_Armor"
+			]/statBases/ArmorRating_Heat
+		</xpath>
+		<value>
+			<ArmorRating_Heat>0.36</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!-- === Class 5 === -->
+
+	<!-- == FORT Redut-M / 6B13 M / IOTV Gen4 / BNTI Gzhel-K / FORT Defender-2 == -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_FORT_Redut-M_Body_Armor" or
+			defName = "JDSTarkov_6B13_M_Assault_Armor" or
+			defName = "JDSTarkov_IOTV_Gen4_Armor" or
+			defName = "JDSTarkov_BNTI_Gzhel-K_Armor" or
+			defName = "JDSTarkov_FORT_Defender-2_Body_Armor"
+			]/statBases
+		</xpath>
+		<value>
+			<Bulk>7</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- == IOTV Gen4 Armor (Assault) / IOTV Gen4 Armor (Assault) / FORT Redut-T5 == -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_IOTV_Gen4_ArmorAssaultkit" or
+			defName = "JDSTarkov_IOTV_Gen4_ArmorFullProtection" or
+			defName = "JDSTarkov_FORT_Redut-T5_Body_Armor"
+			]/statBases
+		</xpath>
+		<value>
+			<Bulk>8.5</Bulk>
+			<WornBulk>3.5</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- == statBases == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_FORT_Redut-M_Body_Armor" or
+			defName = "JDSTarkov_6B13_M_Assault_Armor" or
+			defName = "JDSTarkov_IOTV_Gen4_Armor" or
+			defName = "JDSTarkov_BNTI_Gzhel-K_Armor" or
+			defName = "JDSTarkov_FORT_Defender-2_Body_Armor" or
+			defName = "JDSTarkov_IOTV_Gen4_ArmorAssaultkit" or
+			defName = "JDSTarkov_IOTV_Gen4_ArmorFullProtection" or
+			defName = "JDSTarkov_FORT_Redut-T5_Body_Armor"
+			]/statBases/ArmorRating_Sharp
+		</xpath>
+		<value>
+			<ArmorRating_Sharp>14.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_FORT_Redut-M_Body_Armor" or
+			defName = "JDSTarkov_6B13_M_Assault_Armor" or
+			defName = "JDSTarkov_IOTV_Gen4_Armor" or
+			defName = "JDSTarkov_BNTI_Gzhel-K_Armor" or
+			defName = "JDSTarkov_FORT_Defender-2_Body_Armor" or
+			defName = "JDSTarkov_IOTV_Gen4_ArmorAssaultkit" or
+			defName = "JDSTarkov_IOTV_Gen4_ArmorFullProtection" or
+			defName = "JDSTarkov_FORT_Redut-T5_Body_Armor"
+			]/statBases/ArmorRating_Blunt
+		</xpath>
+		<value>
+			<ArmorRating_Blunt>26</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_FORT_Redut-M_Body_Armor" or
+			defName = "JDSTarkov_6B13_M_Assault_Armor" or
+			defName = "JDSTarkov_IOTV_Gen4_Armor" or
+			defName = "JDSTarkov_BNTI_Gzhel-K_Armor" or
+			defName = "JDSTarkov_FORT_Defender-2_Body_Armor" or
+			defName = "JDSTarkov_IOTV_Gen4_ArmorAssaultkit" or
+			defName = "JDSTarkov_IOTV_Gen4_ArmorFullProtection" or
+			defName = "JDSTarkov_FORT_Redut-T5_Body_Armor"
+			]/statBases/ArmorRating_Heat
+		</xpath>
+		<value>
+			<ArmorRating_Heat>0.36</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!-- === Class 6 === -->
+
+	<!-- == LBT 6094A SPC == -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "JDSTarkov_LBT_6094A_Slick_Plate_Carrier"]/statBases</xpath>
+		<value>
+			<Bulk>7.5</Bulk>
+			<WornBulk>4</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- == 6B43 Z-Sh 6A == -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "JDSTarkov_6B43_Zabralo-Sh_6A_Armor"]/statBases</xpath>
+		<value>
+			<Bulk>9</Bulk>
+			<WornBulk>5.5</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- == statBases == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_6B43_Zabralo-Sh_6A_Armor" or
+			defName = "JDSTarkov_LBT_6094A_Slick_Plate_Carrier"
+			]/statBases/ArmorRating_Sharp
+		</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_6B43_Zabralo-Sh_6A_Armor" or
+			defName = "JDSTarkov_LBT_6094A_Slick_Plate_Carrier"
+			]/statBases/ArmorRating_Blunt
+		</xpath>
+		<value>
+			<ArmorRating_Blunt>32</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_6B43_Zabralo-Sh_6A_Armor" or
+			defName = "JDSTarkov_LBT_6094A_Slick_Plate_Carrier"
+			]/statBases/ArmorRating_Heat
+		</xpath>
+		<value>
+			<ArmorRating_Heat>0.36</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/JDS EFT Apparel/Patches/JDS EFT Apparel/Apparel_Backpacks.xml b/ModPatches/JDS EFT Apparel/Patches/JDS EFT Apparel/Apparel_Backpacks.xml
new file mode 100644
index 0000000000..0616a03215
--- /dev/null
+++ b/ModPatches/JDS EFT Apparel/Patches/JDS EFT Apparel/Apparel_Backpacks.xml	
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Backpacks  === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="JDSFrontierBackpackBase"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Shoulders</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="JDSFrontierBackpackBase"]/apparel/layers</xpath>
+		<value>
+			<li>Backpack</li>
+		</value>
+	</Operation>
+
+	<!-- == statBases == -->
+	<!-- Sling / Small Packs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_Backpack_TacticalSling" or
+			defName = "JDSTarkov_Backpack_T-Bag" or
+			defName = "JDSTarkov_Backpack_Beta2Bag" or
+			defName = "JDSTarkov_Backpack_MBSS" or
+			defName = "JDSTarkov_Backpack_DayPack" or
+			defName = "JDSTarkov_Backpack_SFMP"
+			]/statBases
+		</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- Medium Packs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_Backpack_Paratus" or
+			defName = "JDSTarkov_Backpack_Tri-Zip" or
+			defName = "JDSTarkov_Backpack_F5bag" or
+			defName = "JDSTarkov_Backpack_Mechanism" or
+			defName = "JDSTarkov_Backpack_AttackTwo" or
+			defName = "JDSTarkov_Backpack_ArmyBag" or
+			defName = "JDSTarkov_Backpack_Berkut" or
+			defName = "JDSTarkov_Backpack_ScavBP"
+			]/statBases
+		</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- Large Packs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_Backpack_6SH118bag" or
+			defName = "JDSTarkov_Backpack_F4Bag" or
+			defName = "JDSTarkov_Backpack_Blackjack50Bag" or
+			defName = "JDSTarkov_Backpack_Pilgrim"
+			]/statBases
+		</xpath>
+		<value>
+			<Bulk>20</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- == CarryBulk == -->
+	<!-- Sling Packs -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JDSTarkov_Backpack_TacticalSling" or defName="JDSTarkov_Backpack_T-Bag"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>10</CarryBulk>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Small Packs -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_Backpack_Beta2Bag" or
+			defName = "JDSTarkov_Backpack_MBSS" or
+			defName = "JDSTarkov_Backpack_DayPack" or
+			defName = "JDSTarkov_Backpack_SFMP"
+			]/equippedStatOffsets
+		</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>20</CarryBulk>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Medium Packs -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_Backpack_Paratus" or
+			defName = "JDSTarkov_Backpack_Tri-Zip" or
+			defName = "JDSTarkov_Backpack_F5bag" or
+			defName = "JDSTarkov_Backpack_Mechanism" or
+			defName = "JDSTarkov_Backpack_AttackTwo" or
+			defName = "JDSTarkov_Backpack_ArmyBag" or
+			defName = "JDSTarkov_Backpack_Berkut" or
+			defName = "JDSTarkov_Backpack_ScavBP"
+			]/equippedStatOffsets
+		</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>30</CarryBulk>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Large Packs -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_Backpack_6SH118bag" or
+			defName = "JDSTarkov_Backpack_F4Bag" or
+			defName = "JDSTarkov_Backpack_Blackjack50Bag" or
+			defName = "JDSTarkov_Backpack_Pilgrim"
+			]/equippedStatOffsets
+		</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>50</CarryBulk>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/JDS EFT Apparel/Patches/JDS EFT Apparel/Apparel_ChestRigs.xml b/ModPatches/JDS EFT Apparel/Patches/JDS EFT Apparel/Apparel_ChestRigs.xml
new file mode 100644
index 0000000000..b495040040
--- /dev/null
+++ b/ModPatches/JDS EFT Apparel/Patches/JDS EFT Apparel/Apparel_ChestRigs.xml	
@@ -0,0 +1,335 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Armored === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="JDSFrontierChestRigBase"]/apparel/layers</xpath>
+		<value>
+			<li>Webbing</li>
+		</value>
+	</Operation>
+
+	<!-- == Remove CarryingCapacity == -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_6B5-16_Zh-86_rig" or
+			defName = "JDSTarkov_6B3TM-01M" or
+			defName = "JDSTarkov_6B5-15_Zh-86_rig" or
+			defName = "JDSTarkov_ANA_Tactical_M2_rig" or
+			defName = "JDSTarkov_ANA_Tactical_M1_rig" or
+			defName = "JDSTarkov_Crye_Precision_AVS" or
+			defName = "JDSTarkov_Ars_Arma_A18_Skanda" or
+			defName = "JDSTarkov_Wartech_TV-110_rig" or
+			defName = "JDSTarkov_5_11_Tactec_plate_carrier" or
+			defName = "JDSTarkov_Ars_Arma_CPC_MOD_2_rig"
+			]/equippedStatOffsets/CarryingCapacity
+		</xpath>
+	</Operation>
+
+	<!-- == Add CarryBulk == -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_6B5-16_Zh-86_rig" or
+			defName = "JDSTarkov_6B3TM-01M" or
+			defName = "JDSTarkov_6B5-15_Zh-86_rig" or
+			defName = "JDSTarkov_ANA_Tactical_M2_rig" or
+			defName = "JDSTarkov_5_11_Tactec_plate_carrier" or
+			defName = "JDSTarkov_ANA_Tactical_M1_rig" or
+			defName = "JDSTarkov_Crye_Precision_AVS" or
+			defName = "JDSTarkov_Ars_Arma_A18_Skanda" or
+			defName = "JDSTarkov_Wartech_TV-110_rig" or
+			defName = "JDSTarkov_Ars_Arma_CPC_MOD_2_rig"
+			]/equippedStatOffsets
+		</xpath>
+		<value>
+			<CarryBulk>15</CarryBulk>
+		</value>
+	</Operation>
+
+	<!-- === ReloadSpeed === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_6B5-16_Zh-86_rig" or
+			defName = "JDSTarkov_6B3TM-01M" or
+			defName = "JDSTarkov_6B5-15_Zh-86_rig" or
+			defName = "JDSTarkov_5_11_Tactec_plate_carrier"
+			]/equippedStatOffsets
+		</xpath>
+		<value>
+			<ReloadSpeed>0.05</ReloadSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_ANA_Tactical_M2_rig" or
+			defName = "JDSTarkov_ANA_Tactical_M1_rig" or
+			defName = "JDSTarkov_Crye_Precision_AVS" or
+			defName = "JDSTarkov_Ars_Arma_A18_Skanda" or
+			defName = "JDSTarkov_Wartech_TV-110_rig" or
+			defName = "JDSTarkov_Ars_Arma_CPC_MOD_2_rig"
+			]/equippedStatOffsets
+		</xpath>
+		<value>
+			<ReloadSpeed>0.1</ReloadSpeed>
+		</value>
+	</Operation>
+
+	<!-- == 6B5-16 / 6B3TM-01M / 6B5-15 / ANA Tactical M2 / ANA Tactical M1 / Cry Precn AVS ==  -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_6B5-16_Zh-86_rig" or
+			defName = "JDSTarkov_6B3TM-01M" or
+			defName = "JDSTarkov_6B5-15_Zh-86_rig" or
+			defName = "JDSTarkov_ANA_Tactical_M2_rig" or
+			defName = "JDSTarkov_ANA_Tactical_M1_rig" or
+			defName = "JDSTarkov_Crye_Precision_AVS"
+			]/statBases
+		</xpath>
+		<value>
+			<Bulk>7.5</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- == 6B5-16 / 6B3TM-01M / 6B5-15 / ANA Tactical M2 / ANA Tactical M1 / Cry Prec AVS / Ars Arma A18 / Wartech TV-110 ==  -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_6B5-16_Zh-86_rig" or
+			defName = "JDSTarkov_6B3TM-01M" or
+			defName = "JDSTarkov_6B5-15_Zh-86_rig" or
+			defName = "JDSTarkov_ANA_Tactical_M2_rig" or
+			defName = "JDSTarkov_ANA_Tactical_M1_rig" or
+			defName = "JDSTarkov_Crye_Precision_AVS" or
+			defName = "JDSTarkov_Ars_Arma_A18_Skanda" or
+			defName = "JDSTarkov_Wartech_TV-110_rig"
+			]/statBases/ArmorRating_Sharp
+		</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_6B5-16_Zh-86_rig" or
+			defName = "JDSTarkov_6B3TM-01M" or
+			defName = "JDSTarkov_6B5-15_Zh-86_rig" or
+			defName = "JDSTarkov_ANA_Tactical_M2_rig" or
+			defName = "JDSTarkov_ANA_Tactical_M1_rig" or
+			defName = "JDSTarkov_Crye_Precision_AVS" or
+			defName = "JDSTarkov_Ars_Arma_A18_Skanda" or
+			defName = "JDSTarkov_Wartech_TV-110_rig"
+			]/statBases/ArmorRating_Blunt
+		</xpath>
+		<value>
+			<ArmorRating_Blunt>24</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_6B5-16_Zh-86_rig" or
+			defName = "JDSTarkov_6B3TM-01M" or
+			defName = "JDSTarkov_6B5-15_Zh-86_rig" or
+			defName = "JDSTarkov_ANA_Tactical_M2_rig" or
+			defName = "JDSTarkov_ANA_Tactical_M1_rig" or
+			defName = "JDSTarkov_Crye_Precision_AVS" or
+			defName = "JDSTarkov_Ars_Arma_A18_Skanda" or
+			defName = "JDSTarkov_Wartech_TV-110_rig"
+			]/statBases/ArmorRating_Heat
+		</xpath>
+		<value>
+			<ArmorRating_Heat>0.36</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!-- == Ars Arma A18 / Wartech TV-110 / 5.11 Tactec / Ars Arma CPC == -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_Ars_Arma_A18_Skanda" or
+			defName = "JDSTarkov_Wartech_TV-110_rig" or
+			defName = "JDSTarkov_5_11_Tactec_plate_carrier" or
+			defName = "JDSTarkov_Ars_Arma_CPC_MOD_2_rig"
+			]/statBases
+		</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- == 5.11 Tactec / Ars Arma CPC == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_5_11_Tactec_plate_carrier" or
+			defName = "JDSTarkov_Ars_Arma_CPC_MOD_2_rig"
+			]/statBases/ArmorRating_Sharp
+		</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_5_11_Tactec_plate_carrier" or
+			defName = "JDSTarkov_Ars_Arma_CPC_MOD_2_rig"
+			]/statBases/ArmorRating_Blunt
+		</xpath>
+		<value>
+			<ArmorRating_Blunt>28</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_5_11_Tactec_plate_carrier" or
+			defName = "JDSTarkov_Ars_Arma_CPC_MOD_2_rig"
+			]/statBases/ArmorRating_Heat
+		</xpath>
+		<value>
+			<ArmorRating_Heat>0.36</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!-- === Unarmored === -->
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_Scav_Vest" or
+			defName = "JDSTarkov_Spiritus_Systems" or
+			defName = "JDSTarkov_SOE_Micro" or
+			defName = "JDSTarkov_Wartech_TV-109_Rig" or
+			defName = "JDSTarkov_UMTBS_6sh112_Rig" or
+			defName = "JDSTarkov_Splav_Tarzan_M22_Rig" or
+			defName = "JDSTarkov_Haley_Strategic_D3CRX" or
+			defName = "JDSTarkov_Triton_M43-A" or
+			defName = "JDSTarkov_Commando_Chest_Harness" or
+			defName = "JDSTarkov_Direct_Action_Compact" or
+			defName = "JDSTarkov_LBT-1961A_Load_Bearing" or
+			defName = "JDSTarkov_BlackRock" or
+			defName = "JDSTarkov_Wartech_MK3_Rig" or
+			defName = "JDSTarkov_ANA_Tactical" or
+			defName = "JDSTarkov_Velocity_Systems" or
+			defName = "JDSTarkov_Belt-A"
+			]
+		</xpath>
+		<attribute>ParentName</attribute>
+		<value>EFTWebbingBase</value>
+	</Operation>
+
+	<!-- == Remove Stuff  == -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_Scav_Vest" or
+			defName = "JDSTarkov_Spiritus_Systems" or
+			defName = "JDSTarkov_SOE_Micro" or
+			defName = "JDSTarkov_Wartech_TV-109_Rig" or
+			defName = "JDSTarkov_UMTBS_6sh112_Rig" or
+			defName = "JDSTarkov_Splav_Tarzan_M22_Rig" or
+			defName = "JDSTarkov_Haley_Strategic_D3CRX" or
+			defName = "JDSTarkov_Triton_M43-A" or
+			defName = "JDSTarkov_Commando_Chest_Harness" or
+			defName = "JDSTarkov_Direct_Action_Compact" or
+			defName = "JDSTarkov_LBT-1961A_Load_Bearing" or
+			defName = "JDSTarkov_BlackRock" or
+			defName = "JDSTarkov_Wartech_MK3_Rig" or
+			defName = "JDSTarkov_ANA_Tactical" or
+			defName = "JDSTarkov_Velocity_Systems" or
+			defName = "JDSTarkov_Belt-A"
+			]/statBases/ArmorRating_Sharp |
+			Defs/ThingDef[
+			defName = "JDSTarkov_Triton_M43-A" or
+			defName = "JDSTarkov_BlackRock" or
+			defName = "JDSTarkov_Wartech_MK3_Rig" or
+			defName = "JDSTarkov_ANA_Tactical" or
+			defName = "JDSTarkov_Velocity_Systems" or
+			defName = "JDSTarkov_Belt-A"
+			]/statBases/ArmorRating_Blunt |
+			Defs/ThingDef[
+			defName = "JDSTarkov_Scav_Vest" or
+			defName = "JDSTarkov_Spiritus_Systems" or
+			defName = "JDSTarkov_SOE_Micro" or
+			defName = "JDSTarkov_Wartech_TV-109_Rig" or
+			defName = "JDSTarkov_UMTBS_6sh112_Rig" or
+			defName = "JDSTarkov_Splav_Tarzan_M22_Rig" or
+			defName = "JDSTarkov_Haley_Strategic_D3CRX" or
+			defName = "JDSTarkov_Triton_M43-A" or
+			defName = "JDSTarkov_Commando_Chest_Harness" or
+			defName = "JDSTarkov_Direct_Action_Compact" or
+			defName = "JDSTarkov_LBT-1961A_Load_Bearing" or
+			defName = "JDSTarkov_BlackRock" or
+			defName = "JDSTarkov_Wartech_MK3_Rig" or
+			defName = "JDSTarkov_ANA_Tactical" or
+			defName = "JDSTarkov_Velocity_Systems" or
+			defName = "JDSTarkov_Belt-A"
+			]/equippedStatOffsets/CarryingCapacity
+		</xpath>
+	</Operation>
+
+	<!-- == Add CarryBulk == -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_Scav_Vest" or
+			defName = "JDSTarkov_Spiritus_Systems" or
+			defName = "JDSTarkov_SOE_Micro" or
+			defName = "JDSTarkov_Wartech_TV-109_Rig" or
+			defName = "JDSTarkov_UMTBS_6sh112_Rig" or
+			defName = "JDSTarkov_Splav_Tarzan_M22_Rig"
+			]/equippedStatOffsets
+		</xpath>
+		<value>
+			<CarryBulk>10</CarryBulk>
+			<ReloadSpeed>0.06</ReloadSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_Haley_Strategic_D3CRX" or
+			defName = "JDSTarkov_Triton_M43-A" or
+			defName = "JDSTarkov_Commando_Chest_Harness" or
+			defName = "JDSTarkov_Direct_Action_Compact" or
+			defName = "JDSTarkov_LBT-1961A_Load_Bearing"
+			]/equippedStatOffsets
+		</xpath>
+		<value>
+			<CarryBulk>18</CarryBulk>
+			<ReloadSpeed>0.1</ReloadSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_BlackRock" or
+			defName = "JDSTarkov_Wartech_MK3_Rig" or
+			defName = "JDSTarkov_ANA_Tactical" or
+			defName = "JDSTarkov_Velocity_Systems" or
+			defName = "JDSTarkov_Belt-A"
+			]/equippedStatOffsets
+		</xpath>
+		<value>
+			<CarryBulk>30</CarryBulk>
+			<ReloadSpeed>0.12</ReloadSpeed>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/JDS EFT Apparel/Patches/JDS EFT Apparel/Apparel_Headgear.xml b/ModPatches/JDS EFT Apparel/Patches/JDS EFT Apparel/Apparel_Headgear.xml
new file mode 100644
index 0000000000..fe50881940
--- /dev/null
+++ b/ModPatches/JDS EFT Apparel/Patches/JDS EFT Apparel/Apparel_Headgear.xml	
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Balaclavas === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="JDSFrontierFaceMaskBase"]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>OnHead</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="JDSFrontierFaceMaskBase"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>UpperHead</li>
+				<li>Teeth</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_Headgear_Balaclava" or
+			defName = "JDSTarkov_Headwear_Balaclava2_Mask" or
+			defName = "JDSTarkov_Headwear_Balaclava3_Mask" or
+			defName = "JDSTarkov_Headwear_Balaclava4_Mask" or
+			defName = "JDSTarkov_Headwear_Balaclava5_Mask" or
+			defName = "JDSTarkov_Headwear_Balaclava6_Mask" or
+			defName = "JDSTarkov_Headwear_Balaclava7_Mask"
+			]/statBases/ArmorRating_Sharp |
+			Defs/ThingDef[
+			defName = "JDSTarkov_Headgear_Balaclava" or
+			defName = "JDSTarkov_Headwear_Balaclava2_Mask" or
+			defName = "JDSTarkov_Headwear_Balaclava3_Mask" or
+			defName = "JDSTarkov_Headwear_Balaclava4_Mask" or
+			defName = "JDSTarkov_Headwear_Balaclava5_Mask" or
+			defName = "JDSTarkov_Headwear_Balaclava6_Mask" or
+			defName = "JDSTarkov_Headwear_Balaclava7_Mask"
+			]/statBases/ArmorRating_Blunt |
+			Defs/ThingDef[
+			defName = "JDSTarkov_Headgear_Balaclava" or
+			defName = "JDSTarkov_Headwear_Balaclava2_Mask" or
+			defName = "JDSTarkov_Headwear_Balaclava3_Mask" or
+			defName = "JDSTarkov_Headwear_Balaclava4_Mask" or
+			defName = "JDSTarkov_Headwear_Balaclava5_Mask" or
+			defName = "JDSTarkov_Headwear_Balaclava6_Mask" or
+			defName = "JDSTarkov_Headwear_Balaclava7_Mask"
+			]/statBases/ArmorRating_Heat |
+			Defs/ThingDef[
+			defName = "JDSTarkov_Headgear_Balaclava" or
+			defName = "JDSTarkov_Headwear_Balaclava2_Mask" or
+			defName = "JDSTarkov_Headwear_Balaclava3_Mask" or
+			defName = "JDSTarkov_Headwear_Balaclava4_Mask" or
+			defName = "JDSTarkov_Headwear_Balaclava5_Mask" or
+			defName = "JDSTarkov_Headwear_Balaclava6_Mask" or
+			defName = "JDSTarkov_Headwear_Balaclava7_Mask"
+			]/statBases/Insulation_Cold
+		</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_Headgear_Balaclava" or
+			defName = "JDSTarkov_Headwear_Balaclava2_Mask" or
+			defName = "JDSTarkov_Headwear_Balaclava3_Mask" or
+			defName = "JDSTarkov_Headwear_Balaclava4_Mask" or
+			defName = "JDSTarkov_Headwear_Balaclava5_Mask" or
+			defName = "JDSTarkov_Headwear_Balaclava6_Mask" or
+			defName = "JDSTarkov_Headwear_Balaclava7_Mask"
+			]/statBases
+		</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Blunt>0.01</ArmorRating_Blunt>
+			<ArmorRating_Sharp>0.01</ArmorRating_Sharp>
+			<Insulation_Cold>2</Insulation_Cold>
+			<Insulation_Heat>0.5</Insulation_Heat>
+		</value>
+	</Operation>
+
+	<!-- === Beanie === -->
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="JDSTarkov_Headwear_Beanie"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>EFTHeadgearBeanie</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>
+			Defs/ThingDef[defName="JDSTarkov_Headwear_Beanie"]/statBases/ArmorRating_Sharp |
+			Defs/ThingDef[defName="JDSTarkov_Headwear_Beanie"]/statBases/ArmorRating_Blunt |
+			Defs/ThingDef[defName="JDSTarkov_Headwear_Beanie"]/statBases/ArmorRating_Heat |
+			Defs/ThingDef[defName="JDSTarkov_Headwear_Beanie"]/statBases/Insulation_Cold
+		</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="JDSTarkov_Headwear_Beanie"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>0.01</ArmorRating_Sharp>
+			<ArmorRating_Blunt>0.01</ArmorRating_Blunt>
+			<Insulation_Heat>5</Insulation_Heat>
+			<Insulation_Cold>10</Insulation_Cold><!-- Personally i think 22 is too much -->
+		</value>
+	</Operation>
+
+	<!-- === Caps / Ushanka === -->
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_Headwear_Army_Cap" or
+			defName = "JDSTarkov_Headwear_Baseball_Cap_Black" or
+			defName = "JDSTarkov_Headwear_Baseball_Cap_Green" or
+			defName = "JDSTarkov_Headwear_Baseball_Cap_Tan" or
+			defName = "JDSTarkov_Headwear_Ushanka_Cap"
+			]
+		</xpath>
+		<attribute>ParentName</attribute>
+		<value>EFTHeadgearCaps</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_Headwear_Army_Cap" or
+			defName = "JDSTarkov_Headwear_Baseball_Cap_Black" or
+			defName = "JDSTarkov_Headwear_Baseball_Cap_Green" or
+			defName = "JDSTarkov_Headwear_Baseball_Cap_Tan" or
+			defName = "JDSTarkov_Headwear_Ushanka_Cap"
+			]/statBases/ArmorRating_Sharp |
+			Defs/ThingDef[
+			defName = "JDSTarkov_Headwear_Army_Cap" or
+			defName = "JDSTarkov_Headwear_Baseball_Cap_Black" or
+			defName = "JDSTarkov_Headwear_Baseball_Cap_Green" or
+			defName = "JDSTarkov_Headwear_Baseball_Cap_Tan" or
+			defName = "JDSTarkov_Headwear_Ushanka_Cap"
+			]/statBases/ArmorRating_Blunt |
+			Defs/ThingDef[
+			defName = "JDSTarkov_Headwear_Army_Cap" or
+			defName = "JDSTarkov_Headwear_Baseball_Cap_Black" or
+			defName = "JDSTarkov_Headwear_Baseball_Cap_Green" or
+			defName = "JDSTarkov_Headwear_Baseball_Cap_Tan" or
+			defName = "JDSTarkov_Headwear_Ushanka_Cap"
+			]/statBases/ArmorRating_Heat |
+			Defs/ThingDef[
+			defName = "JDSTarkov_Headwear_Army_Cap" or
+			defName = "JDSTarkov_Headwear_Baseball_Cap_Black" or
+			defName = "JDSTarkov_Headwear_Baseball_Cap_Green" or
+			defName = "JDSTarkov_Headwear_Baseball_Cap_Tan"
+			]/statBases/Insulation_Cold
+		</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_Headwear_Army_Cap" or
+			defName = "JDSTarkov_Headwear_Baseball_Cap_Black" or
+			defName = "JDSTarkov_Headwear_Baseball_Cap_Green" or
+			defName = "JDSTarkov_Headwear_Baseball_Cap_Tan"
+			]/statBases
+		</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>0.01</ArmorRating_Sharp>
+			<ArmorRating_Blunt>0.01</ArmorRating_Blunt>
+			<Insulation_Cold>0.50</Insulation_Cold>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="JDSTarkov_Headwear_Ushanka_Cap"]/statBases</xpath>
+		<value>
+			<Bulk>2.5</Bulk>
+			<WornBulk>1.5</WornBulk>
+			<ArmorRating_Sharp>0.06</ArmorRating_Sharp>
+			<ArmorRating_Blunt>0.10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/JDS EFT Apparel/Patches/JDS EFT Apparel/Apparel_HeadgearArmor.xml b/ModPatches/JDS EFT Apparel/Patches/JDS EFT Apparel/Apparel_HeadgearArmor.xml
new file mode 100644
index 0000000000..acb4c72d74
--- /dev/null
+++ b/ModPatches/JDS EFT Apparel/Patches/JDS EFT Apparel/Apparel_HeadgearArmor.xml	
@@ -0,0 +1,340 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Helmets - Shieldless Base === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="JDSFrontierHeadgearBase"]/apparel</xpath>
+		<value>
+			<apparel>
+				<bodyPartGroups>
+					<li>UpperHead</li>
+				</bodyPartGroups>
+				<layers>
+					<li>Overhead</li>
+				</layers>
+				<tags>
+					<li>MilitaryHeadgear</li>
+				</tags>
+				<defaultOutfitTags>
+					<li>Soldier</li>
+				</defaultOutfitTags>
+				<useDeflectMetalEffect>true</useDeflectMetalEffect>
+			</apparel>
+		</value>
+	</Operation>
+
+	<!-- === Helmets - Face Shield === -->
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_Headgear_Kolpak-1S_Riot_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_SHPM_Firefighter_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_PSH-97_Djeta_Helmet_Shield_UI" or
+			defName = "JDSTarkov_Headgear_Kiver_M_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_ZSh-1-2M_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_BNTI_LSHZ-2DTM_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_BNTI_LSHZ-2DTM_Helmet_Full" or
+			defName = "JDSTarkov_Headgear_Maska_1Sch_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_Altyn_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_Vulkan-5_Heavy_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_Tac-Kek_Fast_MT_Mando" or
+			defName = "JDSTarkov_Headgear_Ops-Core_Fast_mod_MT" or
+			defName = "JDSTarkov_Headgear_Ops-Core_Fast_MT_Mando" or
+			defName = "JDSTarkov_Headgear_Ops-Core_Fast_Full_MT" or
+			defName = "JDSTarkov_Headgear_Rys-T_Helmet_Shield"
+			]
+		</xpath>
+		<attribute>ParentName</attribute>
+		<value>EFTHeadgearShield</value>
+	</Operation>
+
+	<!-- === Helmets - Eye Shield === -->
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_Headgear_Ops-Core_Fast_MT_Helmet_Shield"
+			]
+		</xpath>
+		<attribute>ParentName</attribute>
+		<value>EFTHeadgearEyeShield</value>
+	</Operation>
+
+	<!-- === Remove ===  -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_Headgear_Soft_Tank_Crew" or
+			defName = "JDSTarkov_Headgear_Kolpak-1S_Riot_Helmet" or
+			defName = "JDSTarkov_Headgear_Kolpak-1S_Riot_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_PSH-97_Djeta_Helmet_UI" or
+			defName = "JDSTarkov_Headgear_PSH-97_Djeta_Helmet_Shield_UI" or
+			defName = "JDSTarkov_Headgear_SHPM_Firefighter_Helmet" or
+			defName = "JDSTarkov_Headgear_SHPM_Firefighter_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_UNTAR_Helmet" or
+			defName = "JDSTarkov_Headgear_Ratnik-BSh_Helmet" or
+			defName = "JDSTarkov_Headgear_LZSh_Light_Helmet" or
+			defName = "JDSTarkov_Headgear_SSh-68_Helmet" or
+			defName = "JDSTarkov_Headgear_Kiver_M_Helmet" or
+			defName = "JDSTarkov_Headgear_Kiver_M_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_Kiver_M_Helmet_Shieldup" or
+			defName = "JDSTarkov_Headgear_SSSh_95_Sfera_S" or
+			defName = "JDSTarkov_Headgear_MSA_TC_800_Helmet" or
+			defName = "JDSTarkov_Headgear_MSA_TC_2001_Helmet" or
+			defName = "JDSTarkov_Headgear_MSA_TC_2002_Helmet" or
+			defName = "JDSTarkov_Headgear_Highcom_Striker_ACHHC_IIIA_Helmet" or
+			defName = "JDSTarkov_Headgear_Highcom_Striker_ACHHC_IIIA_Helmet_Black" or
+			defName = "JDSTarkov_Headgear_Highcom_Striker_ULACH_IIIA_Helmet" or
+			defName = "JDSTarkov_Headgear_ZSh-1-2M_Helmet" or
+			defName = "JDSTarkov_Headgear_ZSh-1-2M_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_Ops-Core_Fast_MT_Helmet" or
+			defName = "JDSTarkov_Headgear_Ops-Core_Fast_MT_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_Ops-Core_Fast_MT_Mando" or
+			defName = "JDSTarkov_Headgear_Ops-Core_Fast_mod_MT" or
+			defName = "JDSTarkov_Headgear_Ops-Core_Fast_Full_MT" or
+			defName = "JDSTarkov_Headgear_Ops-Core_Fast_MT_Ten" or
+			defName = "JDSTarkov_Headgear_BNTI_LSHZ-2DTM_Helmet" or
+			defName = "JDSTarkov_Headgear_BNTI_LSHZ-2DTM_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_BNTI_LSHZ-2DTM_Helmet_Full" or
+			defName = "JDSTarkov_Headgear_Maska_1Sch_Helmet" or
+			defName = "JDSTarkov_Headgear_Maska_1Sch_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_Maska_1Sch_Helmet_Shieldup" or
+			defName = "JDSTarkov_Headgear_Tac-Kek_Fast_MT" or
+			defName = "JDSTarkov_Headgear_Tac-Kek_Fast_MT_Mando" or
+			defName = "JDSTarkov_Headgear_Altyn_Helmet" or
+			defName = "JDSTarkov_Headgear_Altyn_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_Altyn_Helmet_Shieldup" or
+			defName = "JDSTarkov_Headgear_Rys-T_Helme" or
+			defName = "JDSTarkov_Headgear_Rys-T_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_Rys-T_Helmet_up_Shield" or
+			defName = "JDSTarkov_Headgear_Vulkan-5_Heavy_Helmet" or
+			defName = "JDSTarkov_Headgear_Vulkan-5_Heavy_Helmet_Shield"
+			]/statBases/ArmorRating_Sharp |
+			Defs/ThingDef[
+			defName = "JDSTarkov_Headgear_Soft_Tank_Crew" or
+			defName = "JDSTarkov_Headgear_Kolpak-1S_Riot_Helmet" or
+			defName = "JDSTarkov_Headgear_Kolpak-1S_Riot_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_PSH-97_Djeta_Helmet_UI" or
+			defName = "JDSTarkov_Headgear_PSH-97_Djeta_Helmet_Shield_UI" or
+			defName = "JDSTarkov_Headgear_SHPM_Firefighter_Helmet" or
+			defName = "JDSTarkov_Headgear_SHPM_Firefighter_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_UNTAR_Helmet" or
+			defName = "JDSTarkov_Headgear_Ratnik-BSh_Helmet" or
+			defName = "JDSTarkov_Headgear_LZSh_Light_Helmet" or
+			defName = "JDSTarkov_Headgear_SSh-68_Helmet" or
+			defName = "JDSTarkov_Headgear_Kiver_M_Helmet" or
+			defName = "JDSTarkov_Headgear_Kiver_M_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_Kiver_M_Helmet_Shieldup" or
+			defName = "JDSTarkov_Headgear_SSSh_95_Sfera_S" or
+			defName = "JDSTarkov_Headgear_MSA_TC_800_Helmet" or
+			defName = "JDSTarkov_Headgear_MSA_TC_2001_Helmet" or
+			defName = "JDSTarkov_Headgear_MSA_TC_2002_Helmet" or
+			defName = "JDSTarkov_Headgear_Highcom_Striker_ACHHC_IIIA_Helmet" or
+			defName = "JDSTarkov_Headgear_Highcom_Striker_ACHHC_IIIA_Helmet_Black" or
+			defName = "JDSTarkov_Headgear_Highcom_Striker_ULACH_IIIA_Helmet" or
+			defName = "JDSTarkov_Headgear_ZSh-1-2M_Helmet" or
+			defName = "JDSTarkov_Headgear_ZSh-1-2M_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_Ops-Core_Fast_MT_Helmet" or
+			defName = "JDSTarkov_Headgear_Ops-Core_Fast_MT_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_Ops-Core_Fast_MT_Mando" or
+			defName = "JDSTarkov_Headgear_Ops-Core_Fast_mod_MT" or
+			defName = "JDSTarkov_Headgear_Ops-Core_Fast_Full_MT" or
+			defName = "JDSTarkov_Headgear_Ops-Core_Fast_MT_Ten" or
+			defName = "JDSTarkov_Headgear_BNTI_LSHZ-2DTM_Helmet" or
+			defName = "JDSTarkov_Headgear_BNTI_LSHZ-2DTM_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_BNTI_LSHZ-2DTM_Helmet_Full" or
+			defName = "JDSTarkov_Headgear_Maska_1Sch_Helmet" or
+			defName = "JDSTarkov_Headgear_Maska_1Sch_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_Maska_1Sch_Helmet_Shieldup" or
+			defName = "JDSTarkov_Headgear_Tac-Kek_Fast_MT" or
+			defName = "JDSTarkov_Headgear_Tac-Kek_Fast_MT_Mando" or
+			defName = "JDSTarkov_Headgear_Altyn_Helmet" or
+			defName = "JDSTarkov_Headgear_Altyn_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_Altyn_Helmet_Shieldup" or
+			defName = "JDSTarkov_Headgear_Rys-T_Helme" or
+			defName = "JDSTarkov_Headgear_Rys-T_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_Rys-T_Helmet_up_Shield" or
+			defName = "JDSTarkov_Headgear_Vulkan-5_Heavy_Helmet" or
+			defName = "JDSTarkov_Headgear_Vulkan-5_Heavy_Helmet_Shield"
+			]/statBases/ArmorRating_Blunt |
+			Defs/ThingDef[
+			defName = "JDSTarkov_Headgear_Soft_Tank_Crew" or
+			defName = "JDSTarkov_Headgear_Kolpak-1S_Riot_Helmet" or
+			defName = "JDSTarkov_Headgear_Kolpak-1S_Riot_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_PSH-97_Djeta_Helmet_UI" or
+			defName = "JDSTarkov_Headgear_PSH-97_Djeta_Helmet_Shield_UI" or
+			defName = "JDSTarkov_Headgear_SHPM_Firefighter_Helmet" or
+			defName = "JDSTarkov_Headgear_SHPM_Firefighter_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_UNTAR_Helmet" or
+			defName = "JDSTarkov_Headgear_Ratnik-BSh_Helmet" or
+			defName = "JDSTarkov_Headgear_LZSh_Light_Helmet" or
+			defName = "JDSTarkov_Headgear_SSh-68_Helmet" or
+			defName = "JDSTarkov_Headgear_Kiver_M_Helmet" or
+			defName = "JDSTarkov_Headgear_Kiver_M_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_Kiver_M_Helmet_Shieldup" or
+			defName = "JDSTarkov_Headgear_SSSh_95_Sfera_S" or
+			defName = "JDSTarkov_Headgear_MSA_TC_800_Helmet" or
+			defName = "JDSTarkov_Headgear_MSA_TC_2001_Helmet" or
+			defName = "JDSTarkov_Headgear_MSA_TC_2002_Helmet" or
+			defName = "JDSTarkov_Headgear_Highcom_Striker_ACHHC_IIIA_Helmet" or
+			defName = "JDSTarkov_Headgear_Highcom_Striker_ACHHC_IIIA_Helmet_Black" or
+			defName = "JDSTarkov_Headgear_Highcom_Striker_ULACH_IIIA_Helmet" or
+			defName = "JDSTarkov_Headgear_ZSh-1-2M_Helmet" or
+			defName = "JDSTarkov_Headgear_ZSh-1-2M_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_Ops-Core_Fast_MT_Helmet" or
+			defName = "JDSTarkov_Headgear_Ops-Core_Fast_MT_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_Ops-Core_Fast_MT_Mando" or
+			defName = "JDSTarkov_Headgear_Ops-Core_Fast_mod_MT" or
+			defName = "JDSTarkov_Headgear_Ops-Core_Fast_Full_MT" or
+			defName = "JDSTarkov_Headgear_Ops-Core_Fast_MT_Ten" or
+			defName = "JDSTarkov_Headgear_BNTI_LSHZ-2DTM_Helmet" or
+			defName = "JDSTarkov_Headgear_BNTI_LSHZ-2DTM_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_BNTI_LSHZ-2DTM_Helmet_Full" or
+			defName = "JDSTarkov_Headgear_Maska_1Sch_Helmet" or
+			defName = "JDSTarkov_Headgear_Maska_1Sch_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_Maska_1Sch_Helmet_Shieldup" or
+			defName = "JDSTarkov_Headgear_Tac-Kek_Fast_MT" or
+			defName = "JDSTarkov_Headgear_Tac-Kek_Fast_MT_Mando" or
+			defName = "JDSTarkov_Headgear_Altyn_Helmet" or
+			defName = "JDSTarkov_Headgear_Altyn_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_Altyn_Helmet_Shieldup" or
+			defName = "JDSTarkov_Headgear_Rys-T_Helme" or
+			defName = "JDSTarkov_Headgear_Rys-T_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_Rys-T_Helmet_up_Shield" or
+			defName = "JDSTarkov_Headgear_Vulkan-5_Heavy_Helmet" or
+			defName = "JDSTarkov_Headgear_Vulkan-5_Heavy_Helmet_Shield"
+			]/statBases/ArmorRating_Heat
+		</xpath>
+	</Operation>
+
+	<!-- === Class 1 === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="JDSTarkov_Headgear_Soft_Tank_Crew"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>0.10</ArmorRating_Sharp>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.2</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!-- === Class 2 === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_Headgear_Kolpak-1S_Riot_Helmet" or
+			defName = "JDSTarkov_Headgear_Kolpak-1S_Riot_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_PSH-97_Djeta_Helmet_UI" or
+			defName = "JDSTarkov_Headgear_PSH-97_Djeta_Helmet_Shield_UI" or
+			defName = "JDSTarkov_Headgear_SHPM_Firefighter_Helmet" or
+			defName = "JDSTarkov_Headgear_SHPM_Firefighter_Helmet_Shield"
+			]/statBases
+		</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
+			<ArmorRating_Blunt>4</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.4</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!-- === Class 3 === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_Headgear_UNTAR_Helmet" or
+			defName = "JDSTarkov_Headgear_Ratnik-BSh_Helmet" or
+			defName = "JDSTarkov_Headgear_LZSh_Light_Helmet" or
+			defName = "JDSTarkov_Headgear_SSh-68_Helmet" or
+			defName = "JDSTarkov_Headgear_Kiver_M_Helmet" or
+			defName = "JDSTarkov_Headgear_Kiver_M_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_Kiver_M_Helmet_Shieldup" or
+			defName = "JDSTarkov_Headgear_SSSh_95_Sfera_S"
+			]/statBases
+		</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+			<ArmorRating_Blunt>8</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.4</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!-- === Class 4 === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_Headgear_MSA_TC_800_Helmet" or
+			defName = "JDSTarkov_Headgear_MSA_TC_2001_Helmet" or
+			defName = "JDSTarkov_Headgear_MSA_TC_2002_Helmet" or
+			defName = "JDSTarkov_Headgear_Highcom_Striker_ACHHC_IIIA_Helmet" or
+			defName = "JDSTarkov_Headgear_Highcom_Striker_ACHHC_IIIA_Helmet_Black" or
+			defName = "JDSTarkov_Headgear_Highcom_Striker_ULACH_IIIA_Helmet" or
+			defName = "JDSTarkov_Headgear_ZSh-1-2M_Helmet" or
+			defName = "JDSTarkov_Headgear_ZSh-1-2M_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_Ops-Core_Fast_MT_Helmet" or
+			defName = "JDSTarkov_Headgear_Ops-Core_Fast_MT_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_Ops-Core_Fast_MT_Mando" or
+			defName = "JDSTarkov_Headgear_Ops-Core_Fast_mod_MT" or
+			defName = "JDSTarkov_Headgear_Ops-Core_Fast_Full_MT" or
+			defName = "JDSTarkov_Headgear_Ops-Core_Fast_MT_Ten" or
+			defName = "JDSTarkov_Headgear_BNTI_LSHZ-2DTM_Helmet" or
+			defName = "JDSTarkov_Headgear_BNTI_LSHZ-2DTM_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_BNTI_LSHZ-2DTM_Helmet_Full" or
+			defName = "JDSTarkov_Headgear_Maska_1Sch_Helmet" or
+			defName = "JDSTarkov_Headgear_Maska_1Sch_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_Maska_1Sch_Helmet_Shieldup" or
+			defName = "JDSTarkov_Headgear_Tac-Kek_Fast_MT" or
+			defName = "JDSTarkov_Headgear_Tac-Kek_Fast_MT_Mando"
+			]/statBases
+		</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+			<ArmorRating_Blunt>10</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.45</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!-- === Class 5 === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_Headgear_Altyn_Helmet" or
+			defName = "JDSTarkov_Headgear_Altyn_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_Altyn_Helmet_Shieldup" or
+			defName = "JDSTarkov_Headgear_Rys-T_Helme" or
+			defName = "JDSTarkov_Headgear_Rys-T_Helmet_Shield" or
+			defName = "JDSTarkov_Headgear_Rys-T_Helmet_up_Shield"
+			]/statBases
+		</xpath>
+		<value>
+			<Bulk>4.5</Bulk>
+			<WornBulk>1.5</WornBulk>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+			<ArmorRating_Blunt>13</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.6</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!-- === Class 6 === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/ThingDef[
+			defName = "JDSTarkov_Headgear_Vulkan-5_Heavy_Helmet" or
+			defName = "JDSTarkov_Headgear_Vulkan-5_Heavy_Helmet_Shield"
+			]/statBases
+		</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+			<ArmorRating_Blunt>22</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.6</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/JDS Exiled Dawn/Defs/JDS Exiled Dawn/Ammo/Ammo_ExilePlasma.xml b/ModPatches/JDS Exiled Dawn/Defs/JDS Exiled Dawn/Ammo/Ammo_ExilePlasma.xml
new file mode 100644
index 0000000000..9bb4ff6d90
--- /dev/null
+++ b/ModPatches/JDS Exiled Dawn/Defs/JDS Exiled Dawn/Ammo/Ammo_ExilePlasma.xml	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<CombatExtended.AmmoSetDef>
+	<defName>AmmoSet_ExileLight</defName>
+	<label>Light Plasma Cell</label>
+	<ammoTypes>
+		<Ammo_PlasmaCellPistol>Bullet_ExilePlasmaPistol</Ammo_PlasmaCellPistol>
+	</ammoTypes>
+</CombatExtended.AmmoSetDef>
+
+<CombatExtended.AmmoSetDef>
+	<defName>AmmoSet_ExileMid</defName>
+	<label>Rifle Plasma Cell</label>
+	<ammoTypes>
+		<Ammo_PlasmaCellRifle>Bullet_ExilePlasmaMid</Ammo_PlasmaCellRifle>
+	</ammoTypes>
+</CombatExtended.AmmoSetDef>
+
+<CombatExtended.AmmoSetDef>
+	<defName>AmmoSet_ExileRifle</defName>
+	<label>Rifle Plasma Cell (Accelerated)</label>
+	<ammoTypes>
+		<Ammo_PlasmaCellRifle>Bullet_ExilePlasmaHeavy</Ammo_PlasmaCellRifle>
+	</ammoTypes>
+</CombatExtended.AmmoSetDef>
+
+<CombatExtended.AmmoSetDef>
+	<defName>AmmoSet_ExileAccelerated</defName>
+	<label>Heavy Plasma Cell</label>
+	<ammoTypes>
+		<Ammo_PlasmaCellHeavy>Bullet_ExilePlasmaAccelerated</Ammo_PlasmaCellHeavy>
+	</ammoTypes>
+</CombatExtended.AmmoSetDef>
+
+<ThingDef ParentName="Base556x45mmNATOBullet">
+	<defName>Bullet_ExilePlasmaPistol</defName>
+	<label>Low Density Plasma Bolt</label>
+	<graphicData>
+		<texPath>Things/Misc/Plasma_Bullet</texPath>
+		<graphicClass>Graphic_Single</graphicClass>
+	</graphicData>
+	<projectile Class="CombatExtended.ProjectilePropertiesCE">
+		<speed>100</speed>
+		<damageAmountBase>10</damageAmountBase>
+		<secondaryDamage>
+			<li>
+				<def>Flame_Secondary</def>
+				<amount>2</amount>
+			</li>
+		</secondaryDamage>
+		<armorPenetrationSharp>19</armorPenetrationSharp>
+		<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+	</projectile>
+</ThingDef>
+
+<ThingDef ParentName="Base556x45mmNATOBullet">
+	<defName>Bullet_ExilePlasmaMid</defName>
+	<label>Medium Density Plasma Bolt</label>
+	<graphicData>
+		<texPath>Things/Misc/Plasma_Bullet</texPath>
+		<graphicClass>Graphic_Single</graphicClass>
+	</graphicData>
+	<projectile Class="CombatExtended.ProjectilePropertiesCE">
+		<speed>150</speed>
+		<damageAmountBase>12</damageAmountBase>
+		<secondaryDamage>
+			<li>
+				<def>Flame_Secondary</def>
+				<amount>2</amount>
+			</li>
+		</secondaryDamage>
+		<armorPenetrationSharp>26</armorPenetrationSharp>
+		<armorPenetrationBlunt>4</armorPenetrationBlunt>
+	</projectile>
+</ThingDef>
+
+<ThingDef ParentName="Base556x45mmNATOBullet">
+	<defName>Bullet_ExilePlasmaHeavy</defName>
+	<label>High Density Plasma Bolt</label>
+	<graphicData>
+		<texPath>Things/Misc/Plasma_Bullet</texPath>
+		<graphicClass>Graphic_Single</graphicClass>
+	</graphicData>
+	<projectile Class="CombatExtended.ProjectilePropertiesCE">
+		<speed>150</speed>
+		<damageAmountBase>17</damageAmountBase>
+		<secondaryDamage>
+			<li>
+				<def>Flame_Secondary</def>
+				<amount>3</amount>
+			</li>
+		</secondaryDamage>
+		<armorPenetrationSharp>30</armorPenetrationSharp>
+		<armorPenetrationBlunt>9</armorPenetrationBlunt>
+	</projectile>
+</ThingDef>
+
+<ThingDef ParentName="Base556x45mmNATOBullet">
+	<defName>Bullet_ExilePlasmaAccelerated</defName>
+	<label>Accelerated Plasma Bolt</label>
+	<graphicData>
+		<texPath>Things/Misc/Plasma_Bullet</texPath>
+		<graphicClass>Graphic_Single</graphicClass>
+	</graphicData>
+	<projectile Class="CombatExtended.ProjectilePropertiesCE">
+		<speed>200</speed>
+		<damageAmountBase>24</damageAmountBase>
+		<secondaryDamage>
+			<li>
+				<def>Flame_Secondary</def>
+				<amount>4</amount>
+			</li>
+		</secondaryDamage>
+		<armorPenetrationSharp>41</armorPenetrationSharp>
+		<armorPenetrationBlunt>23</armorPenetrationBlunt>
+	</projectile>
+</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/JDS Exiled Dawn/Patches/JDS Exiled Dawn/PawnKindDefs/PawnKinds_Exile.xml b/ModPatches/JDS Exiled Dawn/Patches/JDS Exiled Dawn/PawnKindDefs/PawnKinds_Exile.xml
new file mode 100644
index 0000000000..9654818a6e
--- /dev/null
+++ b/ModPatches/JDS Exiled Dawn/Patches/JDS Exiled Dawn/PawnKindDefs/PawnKinds_Exile.xml	
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/PawnKindDef[defName="ExiledDawn_Common_Trader" or
+		defName="ExiledDawn_Fighter_FieldMarshalRanged" or
+		defName="ExiledDawn_Fighter_KnightCaptainRanged" or
+		@Name="ExiledDawnRangedBase" or
+		@Name="ExiledDawnGrenadierBase" or
+		@Name="ExiledDawnScholarBase"
+		] </xpath>
+	<value>
+		<li Class="CombatExtended.LoadoutPropertiesExtension">
+			<primaryMagazineCount>
+				<min>6</min>
+				<max>8</max>
+			</primaryMagazineCount>
+		</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/PawnKindDef[defName="ExiledDawn_Fighter_Knight" or
+		defName="ExiledDawn_Fighter_FieldMarshalMelee" or
+		@Name="ExiledDawnMeleeBase"
+		] </xpath>
+	<value>
+		<li Class="CombatExtended.LoadoutPropertiesExtension">
+			<shieldMoney>
+				<min>800</min>
+				<max>2000</max>
+			</shieldMoney>
+			<shieldTags>
+				<li>OutlanderShield</li>
+			</shieldTags>
+		</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/PawnKindDef[@Name="ExiledDawnFighterBase"]</xpath>
+	<value>
+		<apparelTags>
+			<li>IndustrialBasic</li>
+		</apparelTags>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/PawnKindDef[
+		defName="ExiledDawn_Fighter_KnightCaptainRanged"
+		] </xpath>
+	<value>
+		<apparelRequired/>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/PawnKindDef[defName="ExiledDawn_Common_Trader" or
+		defName="ExiledDawn_Fighter_1TrooperRanged" or
+		defName="ExiledDawn_Fighter_2TrooperRanged" or
+		defName="ExiledDawn_Fighter_3TrooperRanged" or
+		defName="ExiledDawn_Fighter_1Grenadier" or
+		defName="ExiledDawn_Fighter_2Grenadier" or
+		defName="ExiledDawn_Fighter_3Grenadier" or
+		defName="ExiledDawn_Fighter_FieldMarshalRanged" or
+		defName="ExiledDawn_Fighter_KnightCaptainRanged" or
+		defName="ExiledDawn_Fighter_KnightCaptainMelee" or
+		@Name="ExiledDawnScholarBase"
+		]/apparelRequired </xpath>
+	<value>
+		<li>CE_Apparel_Backpack</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/PawnKindDef[@Name="ExiledDawnMeleeBase"]/combatPower</xpath>
+	<value>
+		<combatPower>135</combatPower>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/PawnKindDef[@Name="ExiledDawnRangedBase"]/combatPower</xpath>
+	<value>
+		<combatPower>145</combatPower>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/PawnKindDef[@Name="ExiledDawnGrenadierBase"]/combatPower</xpath>
+	<value>
+		<combatPower>145</combatPower>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/PawnKindDef[@Name="ExiledDawnFieldMarshalBase"]/combatPower</xpath>
+	<value>
+		<combatPower>155</combatPower>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/PawnKindDef[@Name="ExiledDawnScholarBase"]/combatPower</xpath>
+	<value>
+		<combatPower>225</combatPower>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/PawnKindDef[defName="ExiledDawn_Fighter_Knight"]/combatPower</xpath>
+	<value>
+		<combatPower>250</combatPower>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/PawnKindDef[@Name="ExiledDawnKnightCaptainBase"]/combatPower</xpath>
+	<value>
+		<combatPower>265</combatPower>
+	</value>
+</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/JDS Exiled Dawn/Patches/JDS Exiled Dawn/Thingdefs_Misc/Apparel.xml b/ModPatches/JDS Exiled Dawn/Patches/JDS Exiled Dawn/Thingdefs_Misc/Apparel.xml
new file mode 100644
index 0000000000..7a8d6b334c
--- /dev/null
+++ b/ModPatches/JDS Exiled Dawn/Patches/JDS Exiled Dawn/Thingdefs_Misc/Apparel.xml	
@@ -0,0 +1,451 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Chestplate-->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[@Name="JDSExiledChestPlate(AR)ArmorBase" or
+		@Name="JDSExiledChestPlateArmorBase"]/statBases/ArmorRating_Sharp </xpath>
+	<value>
+		<ArmorRating_Sharp>9.6</ArmorRating_Sharp>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[@Name="JDSExiledChestPlate(AR)ArmorBase" or
+		@Name="JDSExiledChestPlateArmorBase"]/statBases/ArmorRating_Blunt </xpath>
+	<value>
+		<ArmorRating_Blunt>24</ArmorRating_Blunt>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[@Name="JDSExiledChestPlateArmorBase"]/statBases/Mass</xpath>
+	<value>
+		<Mass>14</Mass>
+		<Bulk>25</Bulk>
+		<WornBulk>12</WornBulk>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[@Name="JDSExiledChestPlate(AR)ArmorBase"]/statBases/Mass</xpath>
+	<value>
+		<Mass>15</Mass>
+		<Bulk>25</Bulk>
+		<WornBulk>12</WornBulk>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationRemove">
+	<xpath>Defs/ThingDef[@Name="JDSExiledChestPlate(AR)ArmorBase" or
+		@Name="JDSExiledChestPlateArmorBase"]/equippedStatOffsets/MoveSpeed </xpath>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[@Name="JDSExiledChestPlate(AR)ArmorBase"]/equippedStatOffsets</xpath>
+	<value>
+		<CarryBulk>10</CarryBulk>
+		<ReloadSpeed>0.1</ReloadSpeed>
+	</value>
+</Operation>
+
+<!--Field Marshal Armor-->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[@Name="JDSExiledFieldMarshalARArmorBase" or
+		@Name="JDSExiledFieldMarshalArmorBase"]/statBases/ArmorRating_Sharp </xpath>
+	<value>
+		<ArmorRating_Sharp>9.6</ArmorRating_Sharp>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[@Name="JDSExiledFieldMarshalARArmorBase" or
+		@Name="JDSExiledFieldMarshalArmorBase"]/statBases/ArmorRating_Blunt </xpath>
+	<value>
+		<ArmorRating_Blunt>24</ArmorRating_Blunt>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[@Name="JDSExiledFieldMarshalArmorBase"]/statBases/Mass</xpath>
+	<value>
+		<Mass>15</Mass>
+		<Bulk>30</Bulk>
+		<WornBulk>13</WornBulk>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[@Name="JDSExiledFieldMarshalARArmorBase"]/statBases/Mass</xpath>
+	<value>
+		<Mass>16</Mass>
+		<Bulk>30</Bulk>
+		<WornBulk>13</WornBulk>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationRemove">
+	<xpath>Defs/ThingDef[@Name="JDSExiledFieldMarshalARArmorBase" or
+		@Name="JDSExiledFieldMarshalArmorBase"]/equippedStatOffsets/MoveSpeed </xpath>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[@Name="JDSExiledFieldMarshalARArmorBase"]/equippedStatOffsets</xpath>
+	<value>
+		<CarryBulk>10</CarryBulk>
+		<ReloadSpeed>0.1</ReloadSpeed>
+	</value>
+</Operation>
+
+<!--Foot Soldier-->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[@Name="JDSExiledFootSoldierARArmorBase" or
+		@Name="JDSExiledFootSoldierArmorBase"]/statBases/ArmorRating_Sharp </xpath>
+	<value>
+		<ArmorRating_Sharp>9.6</ArmorRating_Sharp>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[@Name="JDSExiledFootSoldierARArmorBase" or
+		@Name="JDSExiledFootSoldierArmorBase"]/statBases/ArmorRating_Blunt </xpath>
+	<value>
+		<ArmorRating_Blunt>24</ArmorRating_Blunt>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[@Name="JDSExiledFootSoldierArmorBase"]/statBases/Mass</xpath>
+	<value>
+		<Mass>15</Mass>
+		<Bulk>30</Bulk>
+		<WornBulk>13</WornBulk>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[@Name="JDSExiledFootSoldierARArmorBase"]/statBases/Mass</xpath>
+	<value>
+		<Mass>16</Mass>
+		<Bulk>30</Bulk>
+		<WornBulk>13</WornBulk>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationRemove">
+	<xpath>Defs/ThingDef[@Name="JDSExiledFootSoldierARArmorBase" or
+		@Name="JDSExiledFootSoldierArmorBase"]/equippedStatOffsets/MoveSpeed </xpath>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[@Name="JDSExiledFootSoldierARArmorBase"]/equippedStatOffsets</xpath>
+	<value>
+		<CarryBulk>10</CarryBulk>
+		<ReloadSpeed>0.1</ReloadSpeed>
+	</value>
+</Operation>
+
+<!--Plate Gambeson : Stronger in vanilla but costs less. No idea why.-->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[@Name="JDSExiledPlateGambesonARArmorBase" or
+		@Name="JDSExiledPlateGambesonArmorBase"]/statBases/ArmorRating_Sharp </xpath>
+	<value>
+		<ArmorRating_Sharp>12</ArmorRating_Sharp>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[@Name="JDSExiledPlateGambesonARArmorBase" or
+		@Name="JDSExiledPlateGambesonArmorBase"]/statBases/ArmorRating_Blunt </xpath>
+	<value>
+		<ArmorRating_Blunt>30</ArmorRating_Blunt>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[@Name="JDSExiledPlateGambesonArmorBase"]/statBases/Mass</xpath>
+	<value>
+		<Mass>22</Mass>
+		<Bulk>30</Bulk>
+		<WornBulk>22</WornBulk>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[@Name="JDSExiledPlateGambesonARArmorBase"]/statBases/Mass</xpath>
+	<value>
+		<Mass>23</Mass>
+		<Bulk>30</Bulk>
+		<WornBulk>22</WornBulk>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationRemove">
+	<xpath>Defs/ThingDef[@Name="JDSExiledPlateGambesonARArmorBase" or
+		@Name="JDSExiledPlateGambesonArmorBase"]/equippedStatOffsets/MoveSpeed </xpath>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[@Name="JDSExiledPlateGambesonARArmorBase"]/equippedStatOffsets</xpath>
+	<value>
+		<CarryBulk>10</CarryBulk>
+		<ReloadSpeed>0.1</ReloadSpeed>
+	</value>
+</Operation>
+
+<!--King Armor-->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[@Name="JDSExiledKingArmorBase"]/statBases/ArmorRating_Sharp</xpath>
+	<value>
+		<ArmorRating_Sharp>24</ArmorRating_Sharp>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[@Name="JDSExiledKingArmorBase"]/statBases/ArmorRating_Blunt</xpath>
+	<value>
+		<ArmorRating_Blunt>65</ArmorRating_Blunt>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[@Name="JDSExiledKingArmorBase"]/statBases/Mass</xpath>
+	<value>
+		<Mass>65</Mass>
+		<Bulk>100</Bulk>
+		<WornBulk>25</WornBulk>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[@Name="JDSExiledKingArmorBase"]/equippedStatOffsets/MoveSpeed</xpath>
+	<value>
+		<CarryBulk>10</CarryBulk>
+		<CarryWeight>60</CarryWeight>
+	</value>
+</Operation>
+
+<!--Knight Armor-->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[@Name="JDSExiledKnightArmorBase"]/statBases/ArmorRating_Sharp</xpath>
+	<value>
+		<ArmorRating_Sharp>24</ArmorRating_Sharp>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[@Name="JDSExiledKnightArmorBase"]/statBases/ArmorRating_Blunt</xpath>
+	<value>
+		<ArmorRating_Blunt>55</ArmorRating_Blunt>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[@Name="JDSExiledKnightArmorBase"]/statBases/Mass</xpath>
+	<value>
+		<Mass>60</Mass>
+		<Bulk>100</Bulk>
+		<WornBulk>25</WornBulk>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[@Name="JDSExiledKnightArmorBase"]/equippedStatOffsets/MoveSpeed</xpath>
+	<value>
+		<CarryBulk>10</CarryBulk>
+		<CarryWeight>50</CarryWeight>
+	</value>
+</Operation>
+
+<!--Knight Captain Armor-->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[@Name="JDSExiledKnightCaptainArmorBase"]/statBases/ArmorRating_Sharp</xpath>
+	<value>
+		<ArmorRating_Sharp>24</ArmorRating_Sharp>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[@Name="JDSExiledKnightCaptainArmorBase"]/statBases/ArmorRating_Blunt</xpath>
+	<value>
+		<ArmorRating_Blunt>55</ArmorRating_Blunt>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[@Name="JDSExiledKnightCaptainArmorBase"]/statBases/Mass</xpath>
+	<value>
+		<Mass>60</Mass>
+		<Bulk>100</Bulk>
+		<WornBulk>25</WornBulk>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[@Name="JDSExiledKnightCaptainArmorBase"]/equippedStatOffsets/MoveSpeed</xpath>
+	<value>
+		<CarryBulk>10</CarryBulk>
+		<CarryWeight>65</CarryWeight>
+	</value>
+</Operation>
+
+<!--Price Change-->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Colored_King_Armor" or
+		defName="Colored_Knight_Armor" or
+		defName="Colored_Knight_Captain"
+		]/costList/Plasteel </xpath>
+	<value>
+		<Plasteel>190</Plasteel>
+		<DevilstrandCloth>50</DevilstrandCloth>
+	</value>
+</Operation>
+
+<!--Scholar Armor-->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[@Name="JDSExiledScholarArmorBase"]/statBases/ArmorRating_Sharp</xpath>
+	<value>
+		<ArmorRating_Sharp>18</ArmorRating_Sharp>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[@Name="JDSExiledScholarArmorBase"]/statBases/ArmorRating_Blunt</xpath>
+	<value>
+		<ArmorRating_Blunt>45</ArmorRating_Blunt>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[@Name="JDSExiledScholarArmorBase"]/statBases/Mass</xpath>
+	<value>
+		<Mass>50</Mass>
+		<Bulk>100</Bulk>
+		<WornBulk>25</WornBulk>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[@Name="JDSExiledScholarArmorBase"]/equippedStatOffsets/MoveSpeed</xpath>
+	<value>
+		<CarryBulk>10</CarryBulk>
+		<CarryWeight>60</CarryWeight>
+	</value>
+</Operation>
+
+<!--Price Change-->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Colored_Scholar_Armor"
+		]/costList/Steel </xpath>
+	<value>
+		<Plasteel>100</Plasteel>
+		<Steel>200</Steel>
+		<DevilstrandCloth>40</DevilstrandCloth>
+	</value>
+</Operation>
+
+<!--Helmets-->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="ExiledDawn_Casque_Helmet"]/statBases/ArmorRating_Sharp</xpath>
+	<value>
+		<ArmorRating_Sharp>7</ArmorRating_Sharp>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="ExiledDawn_Casque_Helmet"]/statBases/ArmorRating_Blunt</xpath>
+	<value>
+		<ArmorRating_Blunt>17.5</ArmorRating_Blunt>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ExiledDawn_Casque_Helmet"]/statBases</xpath>
+	<value>
+		<Bulk>5</Bulk>
+		<WornBulk>2</WornBulk>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="ExiledDawn_FootSoldier_Headgear" or
+		defName="ExiledDawn_Defender_Helmet" or
+		defName="ExiledDawn_Headguard"
+		]/statBases/ArmorRating_Sharp </xpath>
+	<value>
+		<ArmorRating_Sharp>9</ArmorRating_Sharp>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="ExiledDawn_FootSoldier_Headgear" or
+		defName="ExiledDawn_Defender_Helmet" or
+		defName="ExiledDawn_Headguard"
+		]/statBases/ArmorRating_Blunt </xpath>
+	<value>
+		<ArmorRating_Blunt>22.5</ArmorRating_Blunt>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ExiledDawn_FootSoldier_Headgear" or
+		defName="ExiledDawn_Defender_Helmet" or
+		defName="ExiledDawn_Headguard"
+		]/statBases </xpath>
+	<value>
+		<Bulk>5</Bulk>
+		<WornBulk>3</WornBulk>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="ExiledDawn_Knight_Headgear"]/statBases/ArmorRating_Sharp</xpath>
+	<value>
+		<ArmorRating_Sharp>19.8</ArmorRating_Sharp>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="ExiledDawn_Knight_Headgear"]/statBases/ArmorRating_Blunt</xpath>
+	<value>
+		<ArmorRating_Blunt>49.5</ArmorRating_Blunt>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ExiledDawn_Knight_Headgear"]/statBases</xpath>
+	<value>
+		<Bulk>5</Bulk>
+		<WornBulk>3</WornBulk>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationConditional">
+	<xpath>Defs/ThingDef[defName="ExiledDawn_Knight_Headgear"]/apparel/immuneToToxGasExposure</xpath>
+	<nomatch Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ExiledDawn_Knight_Headgear"]/apparel</xpath>
+		<value>
+			<immuneToToxGasExposure>true</immuneToToxGasExposure>
+		</value>
+	</nomatch>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="ExiledDawn_Knight_Headgear"]/equippedStatOffsets</xpath>
+	<value>
+		<SmokeSensitivity>-1</SmokeSensitivity>
+	</value>
+</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/JDS Exiled Dawn/Patches/JDS Exiled Dawn/Thingdefs_Misc/Weapons_Melee.xml b/ModPatches/JDS Exiled Dawn/Patches/JDS Exiled Dawn/Thingdefs_Misc/Weapons_Melee.xml
new file mode 100644
index 0000000000..ec8020876a
--- /dev/null
+++ b/ModPatches/JDS Exiled Dawn/Patches/JDS Exiled Dawn/Thingdefs_Misc/Weapons_Melee.xml	
@@ -0,0 +1,357 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_Eternal_Glory" or
+		defName="JDSExiledDawn_Melee_Reforged_WarCleaver" or
+		defName="JDSExiledDawn_Melee_Reforged_Oathkeeper" or
+		defName="JDSExiledDawn_Melee_Reforged_Bludgeon"
+		]/weaponTags </xpath>
+	<value>
+		<li>CE_OneHandedWeapon</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_Eternal_Glory"]/tools</xpath>
+	<value>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>handle</label>
+				<capacities>
+					<li>Poke</li>
+				</capacities>
+				<power>2</power>
+				<cooldownTime>1.54</cooldownTime>
+				<chanceFactor>0.5</chanceFactor>
+				<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>point</label>
+				<capacities>
+					<li>Stab</li>
+				</capacities>
+				<power>11</power>
+				<cooldownTime>1.18</cooldownTime>
+				<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
+				<armorPenetrationSharp>9.30</armorPenetrationSharp>
+				<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+			</li>
+		</tools>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_Eternal_Glory"]/statBases</xpath>
+	<value>
+		<Bulk>6.5</Bulk>
+		<MeleeCounterParryBonus>0.65</MeleeCounterParryBonus>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_Eternal_Glory"]</xpath>
+	<value>
+		<equippedStatOffsets>
+			<MeleeCritChance>1.82</MeleeCritChance>
+			<MeleeParryChance>0.45</MeleeParryChance>
+			<MeleeDodgeChance>0.4</MeleeDodgeChance>
+		</equippedStatOffsets>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_WarCleaver"]/tools</xpath>
+	<value>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>handle</label>
+				<capacities>
+					<li>Poke</li>
+				</capacities>
+				<power>2</power>
+				<cooldownTime>1.54</cooldownTime>
+				<chanceFactor>0.5</chanceFactor>
+				<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>blade</label>
+				<capacities>
+					<li>Cut</li>
+				</capacities>
+				<power>25</power>
+				<cooldownTime>1.54</cooldownTime>
+				<armorPenetrationBlunt>1.238</armorPenetrationBlunt>
+				<armorPenetrationSharp>4.95</armorPenetrationSharp>
+				<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+			</li>
+		</tools>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_WarCleaver"]/statBases</xpath>
+	<value>
+		<Bulk>6.5</Bulk>
+		<MeleeCounterParryBonus>0.82</MeleeCounterParryBonus>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_WarCleaver"]</xpath>
+	<value>
+		<equippedStatOffsets>
+			<MeleeCritChance>0.45</MeleeCritChance>
+			<MeleeParryChance>0.36</MeleeParryChance>
+			<MeleeDodgeChance>0.4</MeleeDodgeChance>
+		</equippedStatOffsets>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_Oathkeeper"]/tools</xpath>
+	<value>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>handle</label>
+				<capacities>
+					<li>Poke</li>
+				</capacities>
+				<power>3</power>
+				<cooldownTime>1.69</cooldownTime>
+				<chanceFactor>0.5</chanceFactor>
+				<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>blade</label>
+				<capacities>
+					<li>Cut</li>
+				</capacities>
+				<power>26</power>
+				<cooldownTime>3.75</cooldownTime>
+				<armorPenetrationBlunt>2.592</armorPenetrationBlunt>
+				<armorPenetrationSharp>7.65</armorPenetrationSharp>
+				<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+			</li>
+		</tools>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_Oathkeeper"]/statBases</xpath>
+	<value>
+		<Bulk>7</Bulk>
+		<MeleeCounterParryBonus>0.59</MeleeCounterParryBonus>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_Oathkeeper"]</xpath>
+	<value>
+		<equippedStatOffsets>
+			<MeleeCritChance>0.21</MeleeCritChance>
+			<MeleeParryChance>0.38</MeleeParryChance>
+			<MeleeDodgeChance>0.5</MeleeDodgeChance>
+		</equippedStatOffsets>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_Bludgeon"]/tools</xpath>
+	<value>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>handle</label>
+				<capacities>
+					<li>Poke</li>
+				</capacities>
+				<power>3</power>
+				<cooldownTime>1.69</cooldownTime>
+				<chanceFactor>0.5</chanceFactor>
+				<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>head</label>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<power>18</power>
+				<cooldownTime>2.19</cooldownTime>
+				<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+			</li>
+		</tools>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_Bludgeon"]/statBases</xpath>
+	<value>
+		<Bulk>7</Bulk>
+		<MeleeCounterParryBonus>0.78</MeleeCounterParryBonus>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_Bludgeon"]</xpath>
+	<value>
+		<equippedStatOffsets>
+			<MeleeCritChance>0.53</MeleeCritChance>
+			<MeleeParryChance>0.28</MeleeParryChance>
+			<MeleeDodgeChance>0.5</MeleeDodgeChance>
+		</equippedStatOffsets>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_WarSpear"]/tools</xpath>
+	<value>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>handle</label>
+				<capacities>
+					<li>Poke</li>
+				</capacities>
+				<power>8</power>
+				<cooldownTime>2.87</cooldownTime>
+				<chanceFactor>0.5</chanceFactor>
+				<armorPenetrationBlunt>2.588</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>point</label>
+				<capacities>
+					<li>Stab</li>
+				</capacities>
+				<power>26</power>
+				<cooldownTime>1.23</cooldownTime>
+				<armorPenetrationBlunt>2.588</armorPenetrationBlunt>
+				<armorPenetrationSharp>12.95</armorPenetrationSharp>
+				<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+			</li>
+		</tools>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_WarSpear"]/statBases</xpath>
+	<value>
+		<Bulk>12</Bulk>
+		<MeleeCounterParryBonus>1.42</MeleeCounterParryBonus>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_WarSpear"]</xpath>
+	<value>
+		<equippedStatOffsets>
+			<MeleeCritChance>0.29</MeleeCritChance>
+			<MeleeParryChance>1.39</MeleeParryChance>
+			<MeleeDodgeChance>0.93</MeleeDodgeChance>
+		</equippedStatOffsets>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_Headhunter"]/tools</xpath>
+	<value>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>handle</label>
+				<capacities>
+					<li>Poke</li>
+				</capacities>
+				<power>8</power>
+				<cooldownTime>2.22</cooldownTime>
+				<chanceFactor>0.5</chanceFactor>
+				<armorPenetrationBlunt>2.588</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>blade</label>
+				<capacities>
+					<li>Cut</li>
+				</capacities>
+				<power>43</power>
+				<cooldownTime>2.51</cooldownTime>
+				<armorPenetrationBlunt>3.726</armorPenetrationBlunt>
+				<armorPenetrationSharp>11.18</armorPenetrationSharp>
+				<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+			</li>
+		</tools>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_Headhunter"]/statBases</xpath>
+	<value>
+		<Bulk>12</Bulk>
+		<MeleeCounterParryBonus>3.02</MeleeCounterParryBonus>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_Headhunter"]</xpath>
+	<value>
+		<equippedStatOffsets>
+			<MeleeCritChance>0.09</MeleeCritChance>
+			<MeleeParryChance>0.52</MeleeParryChance>
+			<MeleeDodgeChance>0.83</MeleeDodgeChance>
+		</equippedStatOffsets>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_Alpha"]/tools</xpath>
+	<value>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>handle</label>
+				<capacities>
+					<li>Poke</li>
+				</capacities>
+				<power>3</power>
+				<cooldownTime>1.55</cooldownTime>
+				<chanceFactor>0.5</chanceFactor>
+				<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>blade</label>
+				<capacities>
+					<li>Cut</li>
+				</capacities>
+				<power>55</power>
+				<cooldownTime>2.03</cooldownTime>
+				<armorPenetrationBlunt>4.6</armorPenetrationBlunt>
+				<armorPenetrationSharp>9.207</armorPenetrationSharp>
+				<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+			</li>
+		</tools>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_Alpha"]/statBases</xpath>
+	<value>
+		<Bulk>12</Bulk>
+		<MeleeCounterParryBonus>1.39</MeleeCounterParryBonus>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_Alpha"]</xpath>
+	<value>
+		<equippedStatOffsets>
+			<MeleeCritChance>0.17</MeleeCritChance>
+			<MeleeParryChance>1.04</MeleeParryChance>
+			<MeleeDodgeChance>0.8</MeleeDodgeChance>
+		</equippedStatOffsets>
+	</value>
+</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/JDS Exiled Dawn/Patches/JDS Exiled Dawn/Thingdefs_Misc/Weapons_Ranged.xml b/ModPatches/JDS Exiled Dawn/Patches/JDS Exiled Dawn/Thingdefs_Misc/Weapons_Ranged.xml
new file mode 100644
index 0000000000..bbd11f8066
--- /dev/null
+++ b/ModPatches/JDS Exiled Dawn/Patches/JDS Exiled Dawn/Thingdefs_Misc/Weapons_Ranged.xml	
@@ -0,0 +1,280 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="JDSExiledDawn_Reforged_Plasma_Shortstop" or
+		defName="JDSExiledDawn_Reforged_Plasma_Shooter" or
+		defName="JDSExiledDawn_Reforged_Plasma_Rifle" or
+		defName="JDSExiledDawn_Reforged_Plasma_Rail" or
+		defName="JDSExiledDawn_Reforged_Cannon"]/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="JDSExiledDawn_Reforged_Plasma_Minigun"]/tools</xpath>
+	<value>
+		<tools>
+			<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="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>JDSExiledDawn_Reforged_Plasma_Shortstop</defName>
+	<statBases>
+		<Bulk>6.50</Bulk>
+		<Mass>2.50</Mass>
+		<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		<SightsEfficiency>1.00</SightsEfficiency>
+		<SwayFactor>0.90</SwayFactor>
+		<ShotSpread>0.09</ShotSpread>
+	</statBases>
+	<Properties>
+		<recoilAmount>1.55</recoilAmount>
+		<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+		<hasStandardCommand>true</hasStandardCommand>
+		<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
+		<warmupTime>0.6</warmupTime>
+		<range>31</range>
+		<burstShotCount>6</burstShotCount>
+		<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+		<soundCast>reforged_plasma_shortstop_shot</soundCast>
+		<soundCastTail>GunTail_Light</soundCastTail>
+		<muzzleFlashScale>9</muzzleFlashScale>
+	</Properties>
+	<AmmoUser>
+		<magazineSize>30</magazineSize>
+		<reloadTime>4</reloadTime>
+		<ammoSet>AmmoSet_ExileLight</ammoSet>
+	</AmmoUser>
+	<FireModes>
+		<aimedBurstShotCount>3</aimedBurstShotCount>
+		<aiUseBurstMode>FALSE</aiUseBurstMode>
+		<aiAimMode>Snapshot</aiAimMode>
+	</FireModes>
+</Operation>
+
+<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>JDSExiledDawn_Reforged_Plasma_Shooter</defName>
+	<statBases>
+		<Bulk>8.50</Bulk>
+		<Mass>3.50</Mass>
+		<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		<SightsEfficiency>1.00</SightsEfficiency>
+		<SwayFactor>1.20</SwayFactor>
+		<ShotSpread>0.05</ShotSpread>
+	</statBases>
+	<Properties>
+		<recoilAmount>1.79</recoilAmount>
+		<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+		<hasStandardCommand>true</hasStandardCommand>
+		<defaultProjectile>Bullet_ExilePlasmaMid</defaultProjectile>
+		<warmupTime>1.1</warmupTime>
+		<range>51</range>
+		<burstShotCount>6</burstShotCount>
+		<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+		<soundCast>reforged_plasma_shooter_shot</soundCast>
+		<soundCastTail>GunTail_Light</soundCastTail>
+		<muzzleFlashScale>9</muzzleFlashScale>
+	</Properties>
+	<AmmoUser>
+		<magazineSize>30</magazineSize>
+		<reloadTime>4</reloadTime>
+		<ammoSet>AmmoSet_ExileMid</ammoSet>
+	</AmmoUser>
+	<FireModes>
+		<aimedBurstShotCount>3</aimedBurstShotCount>
+		<aiUseBurstMode>TRUE</aiUseBurstMode>
+		<aiAimMode>AimedShot</aiAimMode>
+	</FireModes>
+</Operation>
+
+<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>JDSExiledDawn_Reforged_Plasma_Rifle</defName>
+	<statBases>
+		<Bulk>10.50</Bulk>
+		<Mass>4.50</Mass>
+		<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		<SightsEfficiency>1.00</SightsEfficiency>
+		<SwayFactor>1.50</SwayFactor>
+		<ShotSpread>0.04</ShotSpread>
+	</statBases>
+	<Properties>
+		<recoilAmount>1.85</recoilAmount>
+		<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+		<hasStandardCommand>true</hasStandardCommand>
+		<defaultProjectile>Bullet_ExilePlasmaHeavy</defaultProjectile>
+		<warmupTime>1.1</warmupTime>
+		<range>55</range>
+		<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+		<burstShotCount>6</burstShotCount>
+		<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+		<soundCast>reforged_Plasma_rifle_shot</soundCast>
+		<soundCastTail>GunTail_Light</soundCastTail>
+		<muzzleFlashScale>9</muzzleFlashScale>
+	</Properties>
+	<AmmoUser>
+		<magazineSize>40</magazineSize>
+		<reloadTime>4</reloadTime>
+		<ammoSet>AmmoSet_ExileRifle</ammoSet>
+	</AmmoUser>
+	<FireModes>
+		<aimedBurstShotCount>3</aimedBurstShotCount>
+		<aiUseBurstMode>TRUE</aiUseBurstMode>
+		<aiAimMode>AimedShot</aiAimMode>
+	</FireModes>
+</Operation>
+
+<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>JDSExiledDawn_Reforged_Plasma_Rail</defName>
+	<statBases>
+		<Bulk>12.50</Bulk>
+		<Mass>10.50</Mass>
+		<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		<SightsEfficiency>2.24</SightsEfficiency>
+		<SwayFactor>2.34</SwayFactor>
+		<ShotSpread>0.01</ShotSpread>
+	</statBases>
+	<Properties>
+		<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+		<hasStandardCommand>true</hasStandardCommand>
+		<defaultProjectile>Bullet_ExilePlasmaAccelerated</defaultProjectile>
+		<warmupTime>2.8</warmupTime>
+		<range>86</range>
+		<soundCast>reforged_plasma_rail_shot</soundCast>
+		<soundCastTail>GunTail_Light</soundCastTail>
+		<muzzleFlashScale>9</muzzleFlashScale>
+	</Properties>
+	<AmmoUser>
+		<magazineSize>8</magazineSize>
+		<reloadTime>4</reloadTime>
+		<ammoSet>AmmoSet_ExileAccelerated</ammoSet>
+	</AmmoUser>
+	<FireModes>
+		<aiAimMode>AimedShot</aiAimMode>
+	</FireModes>
+</Operation>
+
+<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>JDSExiledDawn_Reforged_Cannon</defName>
+	<statBases>
+		<Bulk>8.00</Bulk>
+		<Mass>5.00</Mass>
+		<RangedWeapon_Cooldown>0.46</RangedWeapon_Cooldown>
+		<SightsEfficiency>1.00</SightsEfficiency>
+		<SwayFactor>1.35</SwayFactor>
+		<ShotSpread>0.16</ShotSpread>
+	</statBases>
+	<Properties>
+		<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+		<hasStandardCommand>true</hasStandardCommand>
+		<defaultProjectile>Bullet_30x64mmFuel_Incendiary</defaultProjectile>
+		<warmupTime>1.1</warmupTime>
+		<range>40</range>
+		<soundCast>Shot_IncendiaryLauncher</soundCast>
+		<soundCastTail>GunTail_Medium</soundCastTail>
+		<muzzleFlashScale>9</muzzleFlashScale>
+		<targetParams>
+			<canTargetLocations>true</canTargetLocations>
+		</targetParams>
+	</Properties>
+	<AmmoUser>
+		<magazineSize>8</magazineSize>
+		<reloadTime>4</reloadTime>
+		<ammoSet>AmmoSet_30x64mmFuel</ammoSet>
+	</AmmoUser>
+	<FireModes>
+		<aiAimMode>AimedShot</aiAimMode>
+	</FireModes>
+</Operation>
+
+<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>JDSExiledDawn_Reforged_Plasma_Minigun</defName>
+	<statBases>
+		<Bulk>14.50</Bulk>
+		<Mass>18</Mass>
+		<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		<SightsEfficiency>1.00</SightsEfficiency>
+		<SwayFactor>3.25</SwayFactor>
+		<ShotSpread>0.05</ShotSpread>
+	</statBases>
+	<Properties>
+		<recoilAmount>0.79</recoilAmount>
+		<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+		<hasStandardCommand>true</hasStandardCommand>
+		<defaultProjectile>Bullet_ExilePlasmaPistol</defaultProjectile>
+		<warmupTime>2.1</warmupTime>
+		<range>55</range>
+		<burstShotCount>50</burstShotCount>
+		<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+		<soundCast>reforged_plasma_minigun_shot</soundCast>
+		<soundCastTail>GunTail_Light</soundCastTail>
+		<muzzleFlashScale>9</muzzleFlashScale>
+		<recoilPattern>Mounted</recoilPattern>
+	</Properties>
+	<AmmoUser>
+		<magazineSize>150</magazineSize>
+		<reloadTime>9.2</reloadTime>
+		<ammoSet>AmmoSet_ExileLight</ammoSet>
+	</AmmoUser>
+	<FireModes>
+		<aimedBurstShotCount>25</aimedBurstShotCount>
+		<aiUseBurstMode>FALSE</aiUseBurstMode>
+		<aiAimMode>SuppressFire</aiAimMode>
+	</FireModes>
+</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/JDS Star Wars - Armory/Defs/JDS Star Wars - Armory/Ammo_Blastech.xml b/ModPatches/JDS Star Wars - Armory/Defs/JDS Star Wars - Armory/Ammo_Blastech.xml
new file mode 100644
index 0000000000..2a16ae8cea
--- /dev/null
+++ b/ModPatches/JDS Star Wars - Armory/Defs/JDS Star Wars - Armory/Ammo_Blastech.xml	
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- AmmoSet -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_SWPlasmaGasCartridgeYellow</defName>
+		<label>Plasma Gas Cartridges</label>
+		<ammoTypes>
+			<Ammo_SWPlasmaGasCartridge>Bullet_SWPlasmaGasCartridgeYellow</Ammo_SWPlasmaGasCartridge>
+			<Ammo_SWPlasmaGasCartridge_AP>Bullet_SWPlasmaGasCartridge_AP</Ammo_SWPlasmaGasCartridge_AP>
+			<Ammo_SWPlasmaGasCartridge_Ion>Bullet_SWPlasmaGasCartridge_Ion</Ammo_SWPlasmaGasCartridge_Ion>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- DamageDefs -->
+	<DamageDef>
+		<defName>CE_Blaster_Damage</defName>
+		<label>blaster bolt</label>
+		<workerClass>DamageWorker_AddInjury</workerClass>
+		<externalViolence>true</externalViolence>
+		<isExplosive>true</isExplosive>
+		<deathMessage>{0} has been shot to death.</deathMessage>
+		<hediff>Burn</hediff>
+		<harmAllLayersUntilOutside>true</harmAllLayersUntilOutside>
+		<impactSoundType>Blunt</impactSoundType>
+		<armorCategory>Sharp</armorCategory>
+		<minDamageToFragment>15</minDamageToFragment>
+		<defaultDamage>3</defaultDamage>
+		<buildingDamageFactor>3</buildingDamageFactor>
+		<plantDamageFactor>3</plantDamageFactor>
+		<explosionAffectOutsidePartsOnly>false</explosionAffectOutsidePartsOnly>
+		<explosionHeatEnergyPerCell>5</explosionHeatEnergyPerCell>
+		<explosionCellFleck>BlastFlame</explosionCellFleck>
+		<explosionColorCenter>(1, 0.5, 0.3)</explosionColorCenter>
+		<explosionColorEdge>(0.6, 0.5, 0.4)</explosionColorEdge>
+		<soundExplosion>Explosion_Flame</soundExplosion>
+		<combatLogRules>Damage_Flame</combatLogRules>
+		<canUseDeflectMetalEffect>false</canUseDeflectMetalEffect>
+	</DamageDef>
+
+	<!-- Projectiles -->
+	<ThingDef ParentName="BaseSWPlasmaGasCartridgeBullet">
+		<defName>Bullet_SWPlasmaGasCartridgeYellow</defName>
+		<label>Blaster Bolt</label>
+		<graphicData>
+			<texPath>Things/Projectile/Yellow_Bullet_Laser</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>18</damageAmountBase>
+			<armorPenetrationBlunt>3</armorPenetrationBlunt>
+			<armorPenetrationSharp>16</armorPenetrationSharp>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base556x45mmNATOBullet">
+		<defName>Bullet_Blaster_Blue_Mid</defName>
+		<label>blaster bolt</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_Laser</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Blaster_Damage</damageDef>
+			<speed>150</speed>
+			<dropsCasings>false</dropsCasings>
+			<damageAmountBase>13</damageAmountBase>
+			<armorPenetrationBlunt>3</armorPenetrationBlunt>
+			<armorPenetrationSharp>18</armorPenetrationSharp>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base762x51mmNATOBullet">
+		<defName>Bullet_Blaster_Blue_High</defName>
+		<label>blaster bolt</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_Laser</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Blaster_Damage</damageDef>
+			<speed>150</speed>
+			<dropsCasings>false</dropsCasings>
+			<damageAmountBase>25</damageAmountBase>
+			<armorPenetrationBlunt>3</armorPenetrationBlunt>
+			<armorPenetrationSharp>23</armorPenetrationSharp>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base45ACPBullet">
+		<defName>Bullet_Blaster_Blue_Low</defName>
+		<label>blaster bolt</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_Laser</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Blaster_Damage</damageDef>
+			<speed>130</speed>
+			<dropsCasings>false</dropsCasings>
+			<damageAmountBase>8</damageAmountBase>
+			<armorPenetrationBlunt>3</armorPenetrationBlunt>
+			<armorPenetrationSharp>15</armorPenetrationSharp>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base45ACPBullet">
+		<defName>Bullet_Blaster_Red_Low</defName>
+		<label>blaster bolt</label>
+		<graphicData>
+			<texPath>Things/Projectile/Red_Bullet_Laser</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Blaster_Damage</damageDef>
+			<speed>130</speed>
+			<dropsCasings>false</dropsCasings>
+			<damageAmountBase>7</damageAmountBase>
+			<armorPenetrationBlunt>3</armorPenetrationBlunt>
+			<armorPenetrationSharp>15</armorPenetrationSharp>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base556x45mmNATOBullet">
+		<defName>Bullet_Blaster_Red_Mid</defName>
+		<label>blaster bolt</label>
+		<graphicData>
+			<texPath>Things/Projectile/Red_Bullet_Laser</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Blaster_Damage</damageDef>
+			<speed>150</speed>
+			<dropsCasings>false</dropsCasings>
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationBlunt>3</armorPenetrationBlunt>
+			<armorPenetrationSharp>18</armorPenetrationSharp>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base556x45mmNATOBullet">
+		<defName>Bullet_Blaster_Red_High</defName>
+		<label>blaster bolt</label>
+		<graphicData>
+			<texPath>Things/Projectile/Red_Bullet_Laser</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Blaster_Damage</damageDef>
+			<speed>150</speed>
+			<dropsCasings>false</dropsCasings>
+			<damageAmountBase>23</damageAmountBase>
+			<armorPenetrationBlunt>3</armorPenetrationBlunt>
+			<armorPenetrationSharp>23</armorPenetrationSharp>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base40x365mmBoforsBullet">
+		<defName>Bullet_B2Cannon</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>b-2 droid wrist cannon shot</label>
+		<graphicData>
+			<texPath>Things/Projectile/Red_Bullet_cannon</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Blaster_Damage</damageDef>
+			<speed>80</speed>
+			<dropsCasings>false</dropsCasings>
+			<damageAmountBase>60</damageAmountBase>
+			<armorPenetrationBlunt>35</armorPenetrationBlunt>
+			<armorPenetrationSharp>15</armorPenetrationSharp>
+			<explosionRadius>1.0</explosionRadius>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/JDS Star Wars - Armory/Patches/JDS Star Wars - Armory/CE_Patch.xml b/ModPatches/JDS Star Wars - Armory/Patches/JDS Star Wars - Armory/CE_Patch.xml
new file mode 100644
index 0000000000..4e7daf8b97
--- /dev/null
+++ b/ModPatches/JDS Star Wars - Armory/Patches/JDS Star Wars - Armory/CE_Patch.xml	
@@ -0,0 +1,1006 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- DC Series -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="DC-17_Blaster_Pistol" or
+			defName="DC17B_Blaster_Pistol"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="DC-15S_Blaster_Carbine" or
+			defName="DC-15A_Blaster_Rifle" or
+			defName="Z6_Rotary_Blaster_Cannon" or
+			defName="DC-17M_Repeating_Blaster_Rifle" or
+			defName="DC15x_Sinper_Rifle"
+			]/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="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DC-15S_Blaster_Carbine</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.01</SwayFactor>
+			<Bulk>6.35</Bulk>
+			<Mass>3.5</Mass>
+			<RangedWeapon_Cooldown>.065</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Blaster_Blue_Mid</defaultProjectile>
+			<warmupTime>0.8</warmupTime>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<range>40</range>
+			<soundCast>DC-15S_Blaster_Carbine_Shot</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+		</Properties>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DC-15A_Blaster_Rifle</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.70</SwayFactor>
+			<Bulk>12.25</Bulk>
+			<Mass>4.3</Mass>
+			<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.73</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Blaster_Blue_Mid</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
+			<range>55</range>
+			<soundCast>DC-15A_Blaster_Rifle_Shot</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<soundCastTail>GunTail_Light</soundCastTail>
+		</Properties>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DC-17M_Repeating_Blaster_Rifle</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.34</SwayFactor>
+			<Bulk>7.20</Bulk>
+			<Mass>3.5</Mass>
+			<RangedWeapon_Cooldown>.5</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.48</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Blaster_Blue_Mid</defaultProjectile>
+			<warmupTime>0.8</warmupTime>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<range>30</range>
+			<soundCast>DC-17_Blaster_Pistol_Shot</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+		</Properties>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DC15x_Sinper_Rifle</defName>
+		<statBases>
+			<SightsEfficiency>2.3</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.7</SwayFactor>
+			<Bulk>12.25</Bulk>
+			<Mass>5</Mass>
+			<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.48</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Blaster_Blue_High</defaultProjectile>
+			<warmupTime>3</warmupTime>
+			<range>75</range>
+			<soundCast>38x-targeting-rifle-sound-effects-battlefront-ii</soundCast>
+			<muzzleFlashScale>10</muzzleFlashScale>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Z6_Rotary_Blaster_Cannon</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.32</SwayFactor>
+			<Bulk>8.02</Bulk>
+			<Mass>30</Mass>
+			<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.68</recoilAmount>
+			<recoilPattern>Mounted</recoilPattern>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Blaster_Blue_Low</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<burstShotCount>100</burstShotCount>
+			<range>60</range>
+			<soundCast>Z6_Rotary_Blaster_Cannon_Shot</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+		</Properties>
+		<FireModes>
+			<aimedBurstShotCount>50</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DC-17_Blaster_Pistol</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>0.87</SwayFactor>
+			<Bulk>1.75</Bulk>
+			<Mass>1.5</Mass>
+			<RangedWeapon_Cooldown>.9</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.48</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Blaster_Blue_Low</defaultProjectile>
+			<warmupTime>0.05</warmupTime>
+			<range>15</range>
+			<soundCast>DC-17_Blaster_Pistol_Shot</soundCast>
+			<muzzleFlashScale>7</muzzleFlashScale>
+			<soundCastTail>GunTail_Light</soundCastTail>
+		</Properties>
+		<FireModes/>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DC17B_Blaster_Pistol</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>0.87</SwayFactor>
+			<Bulk>1.75</Bulk>
+			<Mass>1.5</Mass>
+			<RangedWeapon_Cooldown>.9</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.48</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Blaster_Blue_Low</defaultProjectile>
+			<warmupTime>0.05</warmupTime>
+			<range>20</range>
+			<soundCast>DC-17_Blaster_Pistol_Shot</soundCast>
+			<muzzleFlashScale>7</muzzleFlashScale>
+			<soundCastTail>GunTail_Light</soundCastTail>
+		</Properties>
+		<FireModes/>
+	</Operation>
+
+	<!-- E Series -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="SE-14_Light_Blaster_Pistol"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="E-5_Blaster_Rifle" or
+			defName="EE-3_Carbine_Rifle" or
+			defName="E-5S_Sniper_Rifle"
+			]/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="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>SE-14_Light_Blaster_Pistol</defName>
+		<statBases>
+			<SightsEfficiency>1.5</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>0.87</SwayFactor>
+			<Bulk>1.75</Bulk>
+			<Mass>1.5</Mass>
+			<RangedWeapon_Cooldown>.4</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.48</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Blaster_Red_Low</defaultProjectile>
+			<warmupTime>0.25</warmupTime>
+			<range>20</range>
+			<soundCast>E-5_Bblaster_Rifle_Shot</soundCast>
+			<muzzleFlashScale>7</muzzleFlashScale>
+			<soundCastTail>GunTail_Light</soundCastTail>
+		</Properties>
+		<FireModes/>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>E-5_Blaster_Rifle</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.34</SwayFactor>
+			<Bulk>7.20</Bulk>
+			<Mass>2.2</Mass>
+			<RangedWeapon_Cooldown>.65</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.48</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Blaster_Red_Mid</defaultProjectile>
+			<warmupTime>0.8</warmupTime>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<range>35</range>
+			<soundCast>E-5_Bblaster_Rifle_Shot</soundCast>
+			<muzzleFlashScale>6</muzzleFlashScale>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>EE-3_Carbine_Rifle</defName>
+		<statBases>
+			<SightsEfficiency>1.5</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.34</SwayFactor>
+			<Bulk>7.20</Bulk>
+			<Mass>2.2</Mass>
+			<RangedWeapon_Cooldown>.65</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.48</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Blaster_Red_Mid</defaultProjectile>
+			<warmupTime>0.8</warmupTime>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<range>40</range>
+			<soundCast>16_Carbine_Rifle_Shot</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>E-5S_Sniper_Rifle</defName>
+		<statBases>
+			<SightsEfficiency>2.5</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.34</SwayFactor>
+			<Bulk>7.20</Bulk>
+			<Mass>2.2</Mass>
+			<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.48</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Blaster_Red_High</defaultProjectile>
+			<warmupTime>3</warmupTime>
+			<range>75</range>
+			<soundCast>E-5_Bblaster_Rifle_Shot</soundCast>
+			<muzzleFlashScale>10</muzzleFlashScale>
+			<soundCastTail>GunTail_Light</soundCastTail>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- Westar Series-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Westar-34_Blaster_Pistol" or
+			defName="Westar-35_Blaster_Pistol"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Westar-M5_Blaster_Rifle"
+			]/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="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Westar-34_Blaster_Pistol</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>0.87</SwayFactor>
+			<Bulk>1.75</Bulk>
+			<Mass>1.5</Mass>
+			<RangedWeapon_Cooldown>.4</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.48</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Blaster_Red_Mid</defaultProjectile>
+			<warmupTime>0.25</warmupTime>
+			<range>15</range>
+			<soundCast>1Mandalorian_Blaster_Weapon_Shot</soundCast>
+			<muzzleFlashScale>7</muzzleFlashScale>
+			<soundCastTail>GunTail_Light</soundCastTail>
+		</Properties>
+		<FireModes/>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Westar-35_Blaster_Pistol</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>0.87</SwayFactor>
+			<Bulk>1.75</Bulk>
+			<Mass>1.5</Mass>
+			<RangedWeapon_Cooldown>.4</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.48</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Blaster_Red_Mid</defaultProjectile>
+			<warmupTime>0.25</warmupTime>
+			<range>20</range>
+			<soundCast>1Mandalorian_Blaster_Weapon_Shot</soundCast>
+			<muzzleFlashScale>7</muzzleFlashScale>
+			<soundCastTail>GunTail_Light</soundCastTail>
+		</Properties>
+		<FireModes/>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Westar-M5_Blaster_Rifle</defName>
+		<statBases>
+			<SightsEfficiency>1.3</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.34</SwayFactor>
+			<Bulk>7.20</Bulk>
+			<Mass>3.5</Mass>
+			<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.48</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Blaster_Red_Mid</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
+			<range>35</range>
+			<soundCast>DC-15A_Blaster_Rifle_Shot</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<soundCastTail>GunTail_Light</soundCastTail>
+		</Properties>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- Droid -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="B-2_Super_Droid_Wrist_Blaster" or
+			defName="Droidekas_Blaster" or
+			defName="B-2_Super_Droid_Wrist_Cannon"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>2</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>B-2_Super_Droid_Wrist_Blaster</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.01</SwayFactor>
+			<Bulk>10</Bulk>
+			<Mass>5</Mass>
+			<RangedWeapon_Cooldown>.4</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Blaster_Red_Mid</defaultProjectile>
+			<warmupTime>0.25</warmupTime>
+			<burstShotCount>2</burstShotCount>
+			<ticksBetweenBurstShots>14</ticksBetweenBurstShots>
+			<range>40</range>
+			<soundCast>B-2_Wrist_Blaster_Shot</soundCast>
+			<muzzleFlashScale>7</muzzleFlashScale>
+			<soundCastTail>GunTail_Light</soundCastTail>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Droidekas_Blaster</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.01</SwayFactor>
+			<Bulk>10</Bulk>
+			<Mass>5</Mass>
+			<RangedWeapon_Cooldown>.4</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Blaster_Red_Mid</defaultProjectile>
+			<warmupTime>0.25</warmupTime>
+			<burstShotCount>2</burstShotCount>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<range>25</range>
+			<soundCast>Droidek_Shot</soundCast>
+			<muzzleFlashScale>7</muzzleFlashScale>
+			<soundCastTail>GunTail_Light</soundCastTail>
+		</Properties>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>B-2_Super_Droid_Wrist_Cannon</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.24</ShotSpread>
+			<SwayFactor>1.48</SwayFactor>
+			<Bulk>12.70</Bulk>
+			<Mass>7.50</Mass>
+			<RangedWeapon_Cooldown>1.9</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.58</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_B2Cannon</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<ticksBetweenBurstShots>50</ticksBetweenBurstShots>
+			<range>38</range>
+			<soundCast>B-2_Wrist_Cannon_Shot</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- Mando -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Mando_Blaster_Carbine" or
+			defName="Mando_Heavy_Weapon" or
+			defName="Amban_Rifle"
+			]/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="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Mando_Blaster_Carbine</defName>
+		<statBases>
+			<SightsEfficiency>1.5</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>0.87</SwayFactor>
+			<Bulk>3.75</Bulk>
+			<Mass>2.5</Mass>
+			<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.48</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Blaster_Red_Mid</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<range>35</range>
+			<soundCast>3Mandalorian_Blaster_Weapon_Shot</soundCast>
+			<muzzleFlashScale>7</muzzleFlashScale>
+			<soundCastTail>GunTail_Light</soundCastTail>
+		</Properties>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Mando_Heavy_Weapon</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.32</SwayFactor>
+			<Bulk>8.02</Bulk>
+			<Mass>30</Mass>
+			<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.78</recoilAmount>
+			<recoilPattern>Mounted</recoilPattern>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Blaster_Red_Low</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<burstShotCount>100</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<range>62</range>
+			<soundCast>4Mandalorian_Blaster_Weapon_Shot</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+		</Properties>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Amban_Rifle</defName>
+		<statBases>
+			<SightsEfficiency>1.5</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.34</SwayFactor>
+			<Bulk>7.20</Bulk>
+			<Mass>2.2</Mass>
+			<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.48</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Blaster_Red_High</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>60</range>
+			<soundCast>3Mandalorian_Blaster_Weapon_Shot</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<soundCastTail>GunTail_Light</soundCastTail>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- Ammo -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/DamageDef[defName="Blaster_Damage"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DC-15A_Blaster_Rifle"</xpath>
+		<value>
+			<modExtensions>
+				<li Class="CombatExtended.GunDrawExtension">
+					<DrawSize>1.5,1.5</DrawSize>
+					<DrawOffset>0,0</DrawOffset>
+				</li>
+			</modExtensions>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Mando_Heavy_Weapon"]</xpath>
+		<value>
+			<modExtensions>
+				<li Class="CombatExtended.GunDrawExtension">
+					<DrawSize>1.35,1.35</DrawSize>
+					<DrawOffset>.5,.15</DrawOffset>
+				</li>
+			</modExtensions>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mando_Heavy_Weapon"]/graphicData/drawSize </xpath>
+		<value>
+			<drawSize>1.6</drawSize>
+		</value>
+	</Operation>
+
+	<!-- Melee -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Electrostaff"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>jab</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.35</cooldownTime>
+					<chanceFactor>1.6</chanceFactor>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Electrostaff_Stun</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1.00</chanceFactor>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Electrostaff"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Electrostaff"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.17</MeleeCritChance>
+				<MeleeParryChance>1.45</MeleeParryChance>
+				<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Vibrosword"]/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>12</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>9</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Vibrosword"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Vibrosword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.2</MeleeCritChance>
+				<MeleeParryChance>0.35</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/JDS Star Wars - Armory/Patches/JDS Star Wars - Armory/Patch_Weapons.xml b/ModPatches/JDS Star Wars - Armory/Patches/JDS Star Wars - Armory/Patch_Weapons.xml
new file mode 100644
index 0000000000..2a5b4f613a
--- /dev/null
+++ b/ModPatches/JDS Star Wars - Armory/Patches/JDS Star Wars - Armory/Patch_Weapons.xml	
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Blue-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="DC-15S_Blaster_Carbine" or
+			defName="DC-15A_Blaster_Rifle" or
+			defName="DC-17M_Repeating_Blaster_Rifle" or
+			defName="DC15x_Sinper_Rifle" or
+			defName="Z6_Rotary_Blaster_Cannon" or
+			defName="DC-17_Blaster_Pistol" or
+			defName="DC17B_Blaster_Pistol"
+			]/verbs/li[@Class="CombatExtended.VerbPropertiesCE"]/defaultProjectile</xpath>
+		<value>
+			<defaultProjectile>Bullet_SWPlasmaGasCartridgeBlue</defaultProjectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="DC-15S_Blaster_Carbine" or
+			defName="DC-15A_Blaster_Rifle" or
+			defName="DC-17M_Repeating_Blaster_Rifle" or
+			defName="DC15x_Sinper_Rifle" or
+			defName="Z6_Rotary_Blaster_Cannon" or
+			defName="DC-17_Blaster_Pistol" or
+			defName="DC17B_Blaster_Pistol"
+			]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_AmmoUser">
+				<ammoSet>AmmoSet_SWPlasmaGasCartridgeBlue</ammoSet>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Red-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="B-2_Super_Droid_Wrist_Blaster" or
+			defName="SE-14_Light_Blaster_Pistol" or
+			defName="E-5_Blaster_Rifle" or
+			defName="EE-3_Carbine_Rifle" or
+			defName="E-5S_Sniper_Rifle" or
+			defName="Droidekas_Blaster" or
+			defName="B-2_Super_Droid_Wrist_Cannon" or
+			defName="Mando_Blaster_Carbine" or
+			defName="Mando_Heavy_Weapon" or
+			defName="Westar-M5_Blaster_Rifle"
+			]/verbs/li[@Class="CombatExtended.VerbPropertiesCE"]/defaultProjectile </xpath>
+		<value>
+			<defaultProjectile>Bullet_SWPlasmaGasCartridge</defaultProjectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="B-2_Super_Droid_Wrist_Blaster" or
+			defName="SE-14_Light_Blaster_Pistol" or
+			defName="E-5_Blaster_Rifle" or
+			defName="EE-3_Carbine_Rifle" or
+			defName="E-5S_Sniper_Rifle" or
+			defName="Droidekas_Blaster" or
+			defName="B-2_Super_Droid_Wrist_Cannon" or
+			defName="Mando_Blaster_Carbine" or
+			defName="Mando_Heavy_Weapon" or
+			defName="Westar-M5_Blaster_Rifle"
+			]/comps </xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_AmmoUser">
+				<ammoSet>AmmoSet_SWPlasmaGasCartridge</ammoSet>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Yellow-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Amban_Rifle" or
+			defName="Westar-34_Blaster_Pistol" or
+			defName="Westar-35_Blaster_Pistol"
+			]/verbs/li[@Class="CombatExtended.VerbPropertiesCE"]/defaultProjectile </xpath>
+		<value>
+			<defaultProjectile>Bullet_SWPlasmaGasCartridgeYellow</defaultProjectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="Amban_Rifle" or
+			defName="Westar-34_Blaster_Pistol" or
+			defName="Westar-35_Blaster_Pistol"
+			]/comps </xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_AmmoUser">
+				<ammoSet>AmmoSet_SWPlasmaGasCartridgeYellow</ammoSet>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Ammo and Reload -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="DC-15S_Blaster_Carbine" or
+			defName="DC-17M_Repeating_Blaster_Rifle" or
+			defName="E-5_Blaster_Rifle"
+			]/comps/li[@Class="CombatExtended.CompProperties_AmmoUser"] </xpath>
+		<value>
+			<magazineSize>24</magazineSize>
+			<reloadTime>3</reloadTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="Westar-M5_Blaster_Rifle" or
+			defName="DC-15A_Blaster_Rifle"
+			]/comps/li[@Class="CombatExtended.CompProperties_AmmoUser"] </xpath>
+		<value>
+			<magazineSize>20</magazineSize>
+			<reloadTime>2.4</reloadTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="DC15x_Sinper_Rifle" or
+			defName="Amban_Rifle" or
+			defName="E-5S_Sniper_Rifle"
+			]/comps/li[@Class="CombatExtended.CompProperties_AmmoUser"] </xpath>
+		<value>
+			<magazineSize>10</magazineSize>
+			<reloadTime>3</reloadTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="Z6_Rotary_Blaster_Cannon" or
+			defName="Mando_Heavy_Weapon"
+			]/comps/li[@Class="CombatExtended.CompProperties_AmmoUser"] </xpath>
+		<value>
+			<magazineSize>300</magazineSize>
+			<reloadTime>9.2</reloadTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="DC-17_Blaster_Pistol" or
+			defName="DC17B_Blaster_Pistol" or
+			defName="Mando_Blaster_Carbine" or
+			defName="SE-14_Light_Blaster_Pistol" or
+			defName="EE-3_Carbine_Rifle" or
+			defName="Westar-34_Blaster_Pistol" or
+			defName="Westar-35_Blaster_Pistol"
+			]/comps/li[@Class="CombatExtended.CompProperties_AmmoUser"] </xpath>
+		<value>
+			<magazineSize>15</magazineSize>
+			<reloadTime>2</reloadTime>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/JDS Star Wars - Armory/Patches/JDS Star Wars - Armory/ProjectileFix.xml b/ModPatches/JDS Star Wars - Armory/Patches/JDS Star Wars - Armory/ProjectileFix.xml
new file mode 100644
index 0000000000..817792ca9d
--- /dev/null
+++ b/ModPatches/JDS Star Wars - Armory/Patches/JDS Star Wars - Armory/ProjectileFix.xml	
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Projectile Ammo Fix -->
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Star Wars - Factions</li>
+		</mods>
+		<nomatch Class="PatchOperationSequence">
+			<operations>
+
+				<!-- Both are used by Blastech Industries -->
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Bullet_SWPlasmaGasCartridgeBlue"]/graphicData</xpath>
+					<value>
+						<graphicData>
+							<texPath>Things/Projectile/Bullet_Laser</texPath>
+							<graphicClass>Graphic_Single</graphicClass>
+						</graphicData>
+					</value>
+				</li>
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Bullet_SWPlasmaGasCartridge"]/graphicData</xpath>
+					<value>
+						<graphicData>
+							<texPath>Things/Projectile/Red_Bullet_Laser</texPath>
+							<graphicClass>Graphic_Single</graphicClass>
+						</graphicData>
+					</value>
+				</li>
+
+				<!-- Unused projectiles get a dummy texture -->
+				<li Class="PatchOperationReplace">
+					<xpath>
+						Defs/ThingDef[
+						defName = "Bullet_SWPlasmaGasCartridge_AP" or
+						defName = "Bullet_SWPlasmaGasCartridge_Ion" or
+						defName = "Bullet_SWBigPlasmaGasCartridge" or
+						defName = "Bullet_SWBigPlasmaGasCartridge_AP" or
+						defName = "Bullet_SWBigPlasmaGasCartridge_Ion"
+						]/graphicData </xpath>
+					<value>
+						<graphicData>
+							<texPath>Things/Projectile/Yellow_Bullet_Laser</texPath>
+							<graphicClass>Graphic_Single</graphicClass>
+						</graphicData>
+					</value>
+				</li>
+
+				<!-- Both are used by Blastech Industries -->
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Bullet_SWPlasmaGasCartridgeBlue"]/graphicData</xpath>
+					<value>
+						<graphicData>
+							<texPath>Things/Projectile/Bullet_Laser</texPath>
+							<graphicClass>Graphic_Single</graphicClass>
+						</graphicData>
+					</value>
+				</li>
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Bullet_SWPlasmaGasCartridge"]/graphicData</xpath>
+					<value>
+						<graphicData>
+							<texPath>Things/Projectile/Red_Bullet_Laser</texPath>
+							<graphicClass>Graphic_Single</graphicClass>
+						</graphicData>
+					</value>
+				</li>
+
+				<!-- Unused projectiles get a dummy texture -->
+				<li Class="PatchOperationReplace">
+					<xpath>
+						Defs/ThingDef[
+						defName = "Bullet_SWPlasmaGasCartridge_AP" or
+						defName = "Bullet_SWPlasmaGasCartridge_Ion" or
+						defName = "Bullet_SWBigPlasmaGasCartridge" or
+						defName = "Bullet_SWBigPlasmaGasCartridge_AP" or
+						defName = "Bullet_SWBigPlasmaGasCartridge_Ion"
+						]/graphicData </xpath>
+					<value>
+						<graphicData>
+							<texPath>Things/Projectile/Yellow_Bullet_Laser</texPath>
+							<graphicClass>Graphic_Single</graphicClass>
+						</graphicData>
+					</value>
+				</li>
+
+			</operations>
+		</nomatch>
+	</Operation>
+
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/JDS The Forge - NCR Armory/Patches/JDS The Forge - NCR Armory/Defs_Apparel.xml b/ModPatches/JDS The Forge - NCR Armory/Patches/JDS The Forge - NCR Armory/Defs_Apparel.xml
new file mode 100644
index 0000000000..73bd982fc8
--- /dev/null
+++ b/ModPatches/JDS The Forge - NCR Armory/Patches/JDS The Forge - NCR Armory/Defs_Apparel.xml	
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Fatigues ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_FatiguesArmor"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_FatiguesArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_FatiguesArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2.8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_FatiguesArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<CarryBulk>5</CarryBulk>
+		</value>
+	</Operation>
+
+	<!-- ========== Trooper ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_TrooperArmor"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>4</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_TrooperArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4.75</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_TrooperArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_TrooperArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<CarryBulk>5</CarryBulk>
+		</value>
+	</Operation>
+
+	<!-- ========== Bandoleer ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_BandoleerArmor"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<WornBulk>2.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_BandoleerArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4.75</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_BandoleerArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_BandoleerArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<CarryBulk>5</CarryBulk>
+		</value>
+	</Operation>
+
+	<!-- ========== Mantle ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_MantleArmor"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<WornBulk>2.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_MantleArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4.75</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_MantleArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_MantleArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<CarryBulk>5</CarryBulk>
+		</value>
+	</Operation>
+
+	<!-- ========== Ranger Patrol ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_RangerPatrolArmor"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_RangerPatrolArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_RangerPatrolArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>22</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_RangerPatrolArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<CarryBulk>5</CarryBulk>
+		</value>
+	</Operation>
+
+	<!-- ========== Ranger Combat ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_RangerCombatArmor"]/statBases</xpath>
+		<value>
+			<Bulk>30</Bulk>
+			<WornBulk>12</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_RangerCombatArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_RangerCombatArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>32</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_RangerCombatArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<CarryBulk>10</CarryBulk>
+		</value>
+	</Operation>
+
+	<!-- ========== Salvaged Power Armor ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_SalvagedPowerArmor"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>20</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_SalvagedPowerArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_SalvagedPowerArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>42</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_SalvagedPowerArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/JDS The Forge - NCR Armory/Patches/JDS The Forge - NCR Armory/Defs_Headgear.xml b/ModPatches/JDS The Forge - NCR Armory/Patches/JDS The Forge - NCR Armory/Defs_Headgear.xml
new file mode 100644
index 0000000000..044acf2685
--- /dev/null
+++ b/ModPatches/JDS The Forge - NCR Armory/Patches/JDS The Forge - NCR Armory/Defs_Headgear.xml	
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Pith and Ranger Hats ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_Pith_Hat" or defName="JDS_NCR_Pith2_Hat" or defName="JDS_NCR_Ranger_Hat"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_Pith_Hat" or defName="JDS_NCR_Pith2_Hat" or defName="JDS_NCR_Ranger_Hat"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_Pith_Hat" or defName="JDS_NCR_Pith2_Hat" or defName="JDS_NCR_Ranger_Hat"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ========== Pith Hats w/ Face Wrap ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_Wrap_Pith_Hat" or defName="JDS_NCR_Wrap2_Pith_Hat"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_Wrap_Pith_Hat" or defName="JDS_NCR_Wrap2_Pith_Hat"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_Wrap_Pith_Hat" or defName="JDS_NCR_Wrap2_Pith_Hat"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_Wrap_Pith_Hat" or defName="JDS_NCR_Wrap2_Pith_Hat"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<SmokeSensitivity>-0.10</SmokeSensitivity>
+				<ToxicEnvironmentResistance>0.10</ToxicEnvironmentResistance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- ========== Beret ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_Beret"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_Beret"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.02</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_Beret"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.03</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ========== Ranger Combat Helmet ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_Ranger_Combat_Helmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_Ranger_Combat_Helmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_Ranger_Combat_Helmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>32</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_Ranger_Combat_Helmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="JDS_NCR_Ranger_Combat_Helmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_Ranger_Combat_Helmet"]/equippedStatOffsets/ToxicResistance</xpath>
+		<value>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_Ranger_Combat_Helmet"]/apparel</xpath>
+		<value>
+			<layers>
+				<li>OnHead</li>
+				<li>StrappedHead</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<!-- ========== Salvaged Power Armor Helmet ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_SalvagedPowerArmor_Helmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_SalvagedPowerArmor_Helmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_SalvagedPowerArmor_Helmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>34</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_SalvagedPowerArmor_Helmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="JDS_NCR_SalvagedPowerArmor_Helmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_SalvagedPowerArmor_Helmet"]/equippedStatOffsets/ToxicResistance</xpath>
+		<value>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_SalvagedPowerArmor_Helmet"]/apparel</xpath>
+		<value>
+			<layers>
+				<li>OnHead</li>
+				<li>StrappedHead</li>
+			</layers>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/JDS The Forge - NCR Armory/Patches/JDS The Forge - NCR Armory/Defs_Weapons.xml b/ModPatches/JDS The Forge - NCR Armory/Patches/JDS The Forge - NCR Armory/Defs_Weapons.xml
new file mode 100644
index 0000000000..8442642c40
--- /dev/null
+++ b/ModPatches/JDS The Forge - NCR Armory/Patches/JDS The Forge - NCR Armory/Defs_Weapons.xml	
@@ -0,0 +1,384 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Tools ========== -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="JDSNCRGunBase"]/tools</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_Weapon_Hunting_Revolver" or defName="JDS_NCR_Weapon_N99_10mm_pistol"]</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="JDS_NCR_Weapon_Anti-Material_Rifle" or
+			defName="SDKS-501 Rifle" or
+			defName="JDS_NCR_Weapon_ServiceRifle" or
+			defName="JDS_NCR_Weapon_Lever_Action_Carbine" or
+			defName="JDS_NCR_Weapon_9mm_SMG"] </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>
+
+	<!-- ========== N99 10mm Pistol ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>JDS_NCR_Weapon_N99_10mm_pistol</defName>
+		<statBases>
+			<Mass>1.36</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.07</SwayFactor>
+			<Bulk>2.10</Bulk>
+			<WorkToMake>4500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>110</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_10mmAuto_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_10mmAuto</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>NCRArmory</li>
+			<li>JDS_NCRArmory_N99_10mm_pistol</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+		<researchPrerequisite>JDSENCRArmoryCraft</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== Hunting Revolver ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>JDS_NCR_Weapon_Hunting_Revolver</defName>
+		<statBases>
+			<Mass>1.80</Mass>
+			<RangedWeapon_Cooldown>0.41</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>0.50</SwayFactor>
+			<Bulk>3.00</Bulk>
+			<WorkToMake>6000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>100</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_4570Gov_FMJ</defaultProjectile>
+			<warmupTime>0.723</warmupTime>
+			<range>17</range>
+			<soundCast>Shot_Revolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.95</reloadTime>
+			<ammoSet>AmmoSet_4570Gov</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>NCRArmory</li>
+			<li>JDS_NCRArmory_Hunting_Revolver</li>
+		</weaponTags>
+		<researchPrerequisite>JDSENCRArmoryCraft</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== 9mm SMG ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>JDS_NCR_Weapon_9mm_SMG</defName>
+		<statBases>
+			<Mass>3.70</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.11</SwayFactor>
+			<Bulk>5.56</Bulk>
+			<WorkToMake>5000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>120</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.20</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<soundCast>Shot_HeavySMG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>NCRArmory</li>
+			<li>JDS_NCRArmory_9mm_SMG</li>
+		</weaponTags>
+		<researchPrerequisite>JDSENCRArmoryCraft</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== Brush Gun ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>JDS_NCR_Weapon_Lever_Action_Carbine</defName>
+		<statBases>
+			<WorkToMake>10000</WorkToMake>
+			<Mass>4.10</Mass>
+			<Bulk>11.30</Bulk>
+			<SwayFactor>1.54</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.98</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>200</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_4570Gov_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_4570Gov</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>NCRArmory</li>
+			<li>JDS_NCRArmory_Lever_Action_Carbine</li>
+		</weaponTags>
+		<researchPrerequisite>JDSENCRArmoryCraft</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== NCR Service Rifle ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>JDS_NCR_Weapon_ServiceRifle</defName>
+		<statBases>
+			<Mass>3.26</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>10.03</Bulk>
+			<WorkToMake>11250</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>250</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>NCRArmory</li>
+			<li>JDS_NCRArmory_ServiceRifle</li>
+		</weaponTags>
+		<researchPrerequisite>JDSENCRArmoryCraft</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== Sniper Rifle ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>JDS_NCR_Weapon_SDKS-501_Rifle</defName>
+		<statBases>
+			<Mass>7.30</Mass>
+			<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.0</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.35</SwayFactor>
+			<Bulk>11.92</Bulk>
+			<WorkToMake>11000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>300</Steel>
+			<Plasteel>80</Plasteel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.8</warmupTime>
+			<range>75</range>
+			<soundCast>Shot_SniperRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>NCRArmory</li>
+			<li>JDS_NCRArmory_SDKS-501_Rifle</li>
+		</weaponTags>
+		<researchPrerequisite>JDSENCRArmoryCraft</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Anti-Materiel Rifle ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>JDS_NCR_Weapon_Anti-Material_Rifle</defName>
+		<statBases>
+			<Mass>13.80</Mass>
+			<RangedWeapon_Cooldown>1.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.6</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>2.00</SwayFactor>
+			<Bulk>14.80</Bulk>
+			<WorkToMake>12000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>320</Steel>
+			<Plasteel>120</Plasteel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>3.3</warmupTime>
+			<range>86</range>
+			<soundCast>Shot_SniperRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>NCRArmory</li>
+			<li>JDS_NCRArmory_Anti-Material_Rifle</li>
+		</weaponTags>
+		<researchPrerequisite>JDSENCRArmoryCraft</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/JPT Open The Windows/Patches/JPT Open The Windows/Openvindows.xml b/ModPatches/JPT Open The Windows/Patches/JPT Open The Windows/Openvindows.xml
new file mode 100644
index 0000000000..61ffd7ae59
--- /dev/null
+++ b/ModPatches/JPT Open The Windows/Patches/JPT Open The Windows/Openvindows.xml	
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name = "WindowBase"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.6</fillPercent>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Japanese Dogs/Patches/Japanese Dogs/Dogs.xml b/ModPatches/Japanese Dogs/Patches/Japanese Dogs/Dogs.xml
new file mode 100644
index 0000000000..fc9ad95934
--- /dev/null
+++ b/ModPatches/Japanese Dogs/Patches/Japanese Dogs/Dogs.xml	
@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === bodyShape === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Poetik_Shiba" or
+			defName="Poetik_Kai" or
+			defName="Poetik_Hokkaido" or
+			defName="Poetik_Kishu" or
+			defName="Poetik_Shikoku" or
+			defName="Poetik_AkitaJapanese"] </xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Shiba and Kai === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Poetik_Shiba" or defName="Poetik_Kai"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.04</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Poetik_Shiba" or defName="Poetik_Kai"]/combatPower</xpath>
+		<value>
+			<combatPower>30</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Poetik_Shiba" ordefName="Poetik_Kai"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.62</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.21</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.62</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.21</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.66</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.76</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Hokkaido === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Poetik_Hokkaido"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.24</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Poetik_Hokkaido"]/combatPower</xpath>
+		<value>
+			<combatPower>40</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Poetik_Hokkaido"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.69</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.24</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.69</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.24</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.66</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.72</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.12</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Kishu and Shikoku === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Poetik_Kishu" ordefName="Poetik_Shikoku"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.19</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0.03</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/PawnKindDef[defName="Poetik_Kishu" ordefName="Poetik_Shikoku"]/combatPower </xpath>
+		<value>
+			<combatPower>50</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Poetik_Kishu" ordefName="Poetik_Shikoku"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.86</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.28</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.86</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.28</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.77</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.72</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Akita === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Poetik_AkitaJapanese"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.24</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0.04</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Poetik_AkitaJapanese"]/combatPower</xpath>
+		<value>
+			<combatPower>65</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Poetik_AkitaJapanese"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.72</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.42</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.72</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.42</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.51</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.15</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.24</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Jernalk's Skeletal Legion/Patches/Jernalk's Skeletal Legion/Bodies/Bodies_Skeleton.xml b/ModPatches/Jernalk's Skeletal Legion/Patches/Jernalk's Skeletal Legion/Bodies/Bodies_Skeleton.xml
new file mode 100644
index 0000000000..c63c63ccda
--- /dev/null
+++ b/ModPatches/Jernalk's Skeletal Legion/Patches/Jernalk's Skeletal Legion/Bodies/Bodies_Skeleton.xml	
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--All bones should be covered-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Skeletal"]//*/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Jernalk's Skeletal Legion/Patches/Jernalk's Skeletal Legion/PawnKindDefs/Skeleton_PawnKind.xml b/ModPatches/Jernalk's Skeletal Legion/Patches/Jernalk's Skeletal Legion/PawnKindDefs/Skeleton_PawnKind.xml
new file mode 100644
index 0000000000..10fe2aa896
--- /dev/null
+++ b/ModPatches/Jernalk's Skeletal Legion/Patches/Jernalk's Skeletal Legion/PawnKindDefs/Skeleton_PawnKind.xml	
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[
+			defName="SL_Peon" or
+			defName="SL_Archer" or
+			defName="SL_Runner"
+			]/combatPower </xpath>
+		<value>
+			<combatPower>28</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="SL_Peon"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>100</min>
+					<max>150</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.9</shieldChance>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="SL_Archer"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>20</min>
+					<max>40</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>100</min>
+					<max>130</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.6</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>80</min>
+							<max>160</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[
+			defName="SL_Hero"
+			]/combatPower </xpath>
+		<value>
+			<combatPower>90</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="SL_Hero"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>20</min>
+					<max>40</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>2000</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>1</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>200</min>
+							<max>2000</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>MedievalMeleeAdvanced</li>
+							<li>NeolithicMeleeAdvanced</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Jernalk's Skeletal Legion/Patches/Jernalk's Skeletal Legion/ThingDefs_Races/Skeletons.xml b/ModPatches/Jernalk's Skeletal Legion/Patches/Jernalk's Skeletal Legion/ThingDefs_Races/Skeletons.xml
new file mode 100644
index 0000000000..f6d623b680
--- /dev/null
+++ b/ModPatches/Jernalk's Skeletal Legion/Patches/Jernalk's Skeletal Legion/ThingDefs_Races/Skeletons.xml	
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="BaseSkeleton"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="BaseSkeleton"]/statBases</xpath>
+		<value>
+			<Suppressability>0</Suppressability>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="SL_Runner" or
+			defName="SL_Peon" or
+			defName="SL_Archer"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SL_Runner"]/statBases</xpath>
+		<value>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<MeleeDodgeChance>1.2</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SL_Runner"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.60</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SL_Runner"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.20</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="SL_Peon" or
+			defName="SL_Archer"
+			]/statBases </xpath>
+		<value>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="SL_Peon" or
+			defName="SL_Archer"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>0.32</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.60</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="SL_Peon" or
+			defName="SL_Archer"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>0.26</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SL_Hero"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.11</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.11</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.99</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.406</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SL_Hero"]/statBases</xpath>
+		<value>
+			<MeleeCritChance>1.5</MeleeCritChance>
+			<MeleeParryChance>1.125</MeleeParryChance>
+			<MeleeDodgeChance>1.25</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SL_Hero"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3</ArmorRating_Sharp>
+			<ArmorRating_Electric>1</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SL_Hero"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</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.xml b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/Apparel.xml
new file mode 100644
index 0000000000..07b0e9f5a7
--- /dev/null
+++ b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/Apparel.xml	
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Thawb, Kimono -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+		@Name="K4GThawb" or
+		@Name="K4GKimono"
+		]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>1.5</Bulk>
+			<WornBulk>1</WornBulk>
+			<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
+		</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"
+		]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- Imperial & Outlander Helmet -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="K4GImperialHelmet" or defName="K4G_Apparel_OutlanderHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="K4GImperialHelmet" or defName="K4G_Apparel_OutlanderHelmet"]/stuffCategories/li[.="Metallic"]</xpath>
+		<value>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<!-- Goggled & Advanced Outlander Helmet -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+		defName="K4G_Apparel_AdvancedOutlanderHelmet" or
+		defName="K4G_Apparel_GoggledHelmet" or
+		defName="K4G_Apparel_LegionaryHelmet"
+		]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+		defName="K4G_Apparel_AdvancedOutlanderHelmet" or
+		defName="K4G_Apparel_GoggledHelmet" or
+		defName="K4G_Apparel_LegionaryHelmet"					
+		]/stuffCategories/li[.="Metallic"]</xpath>
+		<value>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<!-- Flak Mask -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Apparel_FlakMask"]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Apparel_FlakMask"]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Apparel_FlakMask"]/apparel/layers/li[.="EyeCover"] </xpath>
+		<value>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!-- Coveralls & Overcoat-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="K4GCoveralls" or @Name="K4GOvercoat"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Advanced Flak Vest -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Apparel_AdvancedFlakVest"]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+			<Bulk>5</Bulk>
+			<WornBulk>3.5</WornBulk>						
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Apparel_AdvancedFlakVest"]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Apparel_AdvancedFlakVest"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>150</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="K4G_Apparel_AdvancedFlakVest"]</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>
+	</Operation>
+
+	<!-- Goggles -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Apparel_Goggles"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.5</StuffEffectMultiplierArmor>
+			<Bulk>0.5</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- Lab Coat -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Apparel_LabCoat"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>7.5</Bulk>
+			<WornBulk>1</WornBulk>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</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
new file mode 100644
index 0000000000..afee66c76e
--- /dev/null
+++ b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/Apparel_Royalty.xml	
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+	<mods>
+		<li>Royalty</li>
+	</mods>
+	<match Class="PatchOperationSequence">
+		<operations>
+
+		<!-- Dynasty Crown -->
+
+		<li Class="PatchOperationReplace">
+			<xpath>Defs/ThingDef[defName="K4G_Apparel_DynastyCrown"]/statBases/StuffEffectMultiplierArmor</xpath>
+			<value>
+				<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
+			</value>
+		</li>				
+
+		</operations>
+	</match>
+</Operation>
+
+</Patch>
\ No newline at end of file
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
new file mode 100644
index 0000000000..f366528813
--- /dev/null
+++ b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee.xml	
@@ -0,0 +1,382 @@
+<?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/WeaponsRanged.xml b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsRanged.xml
new file mode 100644
index 0000000000..e3eb87097e
--- /dev/null
+++ b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsRanged.xml	
@@ -0,0 +1,543 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Tools ========== -->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[
+	defName="K4G_Gun_Snubgun" or
+	defName="K4G_Gun_Bolter" or
+	defName="K4G_Gun_AdvancedAutopistol" or
+	defName="K4G_Gun_PrecisionPistol"
+	]/tools</xpath>
+	<value>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>grip</label>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<power>2</power>
+				<cooldownTime>1.54</cooldownTime>
+				<chanceFactor>1.5</chanceFactor>
+				<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>muzzle</label>
+				<capacities>
+					<li>Poke</li>
+				</capacities>
+				<power>2</power>
+				<cooldownTime>1.54</cooldownTime>
+				<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+			</li>
+		</tools>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[
+	defName="K4G_Gun_LongGun" or
+	defName="K4G_Gun_Carbiner" or
+	defName="K4G_Gun_DuneRifle" or
+	defName="K4G_Gun_HeavyShotgun" or
+	defName="K4G_Gun_LightSMG" or
+	defName="K4G_Gun_AdvancedSMG" or
+	defName="K4G_Gun_CompactRifle" or
+	defName="K4G_Gun_BattleRifle"
+	]/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>
+
+<!-- ========== Snubgun ========== -->
+
+<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>K4G_Gun_Snubgun</defName>
+	<statBases>
+		<Mass>1.42</Mass>
+		<RangedWeapon_Cooldown>0.49</RangedWeapon_Cooldown>
+		<SightsEfficiency>0.7</SightsEfficiency>
+		<ShotSpread>0.18</ShotSpread>
+		<SwayFactor>1.31</SwayFactor>
+		<Bulk>2.41</Bulk>
+	</statBases>
+	<Properties>
+		<recoilAmount>2.96</recoilAmount>
+		<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+		<hasStandardCommand>true</hasStandardCommand>
+		<defaultProjectile>Bullet_44Magnum_FMJ</defaultProjectile>
+		<warmupTime>0.6</warmupTime>
+		<range>12</range>
+		<soundCast>Shot_Revolver</soundCast>
+		<soundCastTail>GunTail_Light</soundCastTail>
+		<muzzleFlashScale>9</muzzleFlashScale>
+	</Properties>
+	<AmmoUser>
+		<magazineSize>6</magazineSize>
+		<reloadTime>4.6</reloadTime>
+		<ammoSet>AmmoSet_44Magnum</ammoSet>
+	</AmmoUser>
+	<FireModes>
+		<aiUseBurstMode>FALSE</aiUseBurstMode>
+		<aiAimMode>Snapshot</aiAimMode>
+	</FireModes>
+	<weaponTags>
+		<li>CE_Sidearm</li>
+		<li>CE_AI_BROOM</li>
+		<li>CE_OneHandedWeapon</li>
+	</weaponTags>
+</Operation>
+
+<!-- ========== Bolter (Makeshift 9mm) ========== -->
+<!-- Mod says it fires 'a sharp metal rod known as a bolt' and is generally junk,
+	easier to make it a sort of 9mm pipe pistol. -->
+
+<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>K4G_Gun_Bolter</defName>
+	<statBases>
+		<Mass>1.33</Mass>
+		<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
+		<SightsEfficiency>0.70</SightsEfficiency>
+		<ShotSpread>0.60</ShotSpread>
+		<SwayFactor>1.30</SwayFactor>
+		<Bulk>2.62</Bulk>
+	</statBases>
+	<Properties>
+		<recoilAmount>2.75</recoilAmount>
+		<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+		<hasStandardCommand>true</hasStandardCommand>
+		<defaultProjectile>Bullet_9x19mmParaSD_FMJ</defaultProjectile>
+		<warmupTime>0.5</warmupTime>
+		<range>10</range>
+		<soundCast>Shot_Autopistol</soundCast>
+		<soundCastTail>GunTail_Light</soundCastTail>
+		<muzzleFlashScale>9</muzzleFlashScale>
+	</Properties>
+	<AmmoUser>
+		<magazineSize>5</magazineSize>
+		<reloadTime>4</reloadTime>
+		<ammoSet>AmmoSet_9x19mmParaSD</ammoSet> <!-- Simulate low velocity from poor construction.-->
+	</AmmoUser>
+	<FireModes>
+		<aiUseBurstMode>FALSE</aiUseBurstMode>
+		<aiAimMode>Snapshot</aiAimMode>
+	</FireModes>
+	<weaponTags>
+		<li>CE_AI_Pistol</li>
+		<li>CE_OneHandedWeapon</li>
+	</weaponTags>
+</Operation>
+
+<!-- ========== Advanced Autopistol (Glock 21) ========== -->
+
+<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>K4G_Gun_AdvancedAutopistol</defName>
+	<statBases>
+		<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		<SightsEfficiency>0.7</SightsEfficiency>
+		<ShotSpread>0.17</ShotSpread>
+		<SwayFactor>1.07</SwayFactor>
+		<Mass>1.4</Mass>
+		<Bulk>2.0</Bulk>
+	</statBases>
+	<Properties>
+		<recoilAmount>2.72</recoilAmount>
+		<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+		<hasStandardCommand>true</hasStandardCommand>
+		<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+		<warmupTime>0.6</warmupTime>
+		<range>12</range>
+		<soundCast>Shot_Autopistol</soundCast>
+		<soundCastTail>GunTail_Light</soundCastTail>
+		<muzzleFlashScale>9</muzzleFlashScale>
+	</Properties>
+	<AmmoUser>
+		<magazineSize>13</magazineSize>
+		<reloadTime>4</reloadTime>
+		<ammoSet>AmmoSet_45ACP</ammoSet>
+	</AmmoUser>
+	<FireModes>
+		<aiUseBurstMode>FALSE</aiUseBurstMode>
+		<aiAimMode>Snapshot</aiAimMode>
+	</FireModes>
+	<weaponTags>
+		<li>CE_Sidearm</li>
+		<li>CE_AI_BROOM</li>
+		<li>CE_OneHandedWeapon</li>
+	</weaponTags>
+</Operation>
+
+<!-- === Precision Pistol (M1911 w/ 3x Scope) === -->
+
+<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>K4G_Gun_PrecisionPistol</defName>
+	<statBases>
+		<Mass>1.30</Mass>
+		<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		<SightsEfficiency>1.88</SightsEfficiency>
+		<ShotSpread>0.17</ShotSpread>
+		<SwayFactor>1.16</SwayFactor>
+		<Bulk>2.20</Bulk>
+	</statBases>
+	<Properties>
+		<recoilAmount>2.51</recoilAmount>
+		<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+		<hasStandardCommand>true</hasStandardCommand>
+		<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+		<warmupTime>1.0</warmupTime>
+		<range>18</range>
+		<soundCast>Shot_Autopistol</soundCast>
+		<soundCastTail>GunTail_Light</soundCastTail>
+		<muzzleFlashScale>9</muzzleFlashScale>
+	</Properties>
+	<AmmoUser>
+		<magazineSize>7</magazineSize>
+		<reloadTime>4</reloadTime>
+		<ammoSet>AmmoSet_45ACP</ammoSet>
+	</AmmoUser>
+	<FireModes>
+		<aiUseBurstMode>FALSE</aiUseBurstMode>
+		<aiAimMode>AimedShot</aiAimMode>
+	</FireModes>
+	<weaponTags>
+		<li>CE_Sidearm</li>
+		<li>CE_OneHandedWeapon</li>					
+	</weaponTags>
+</Operation>
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/ThingDef[defName="K4G_Gun_PrecisionPistol"]</xpath>
+	<value>
+		<li Class="CombatExtended.GunDrawExtension">
+			<DrawSize>0.93,0.93</DrawSize>
+			<DrawOffset>0.0,0.0</DrawOffset>
+		</li>
+	</value>
+</Operation>
+
+<!-- === Long Gun === -->
+
+<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>K4G_Gun_LongGun</defName>
+	<statBases>
+		<Mass>4.30</Mass>
+		<Bulk>12.50</Bulk>
+		<SwayFactor>1.67</SwayFactor>
+		<ShotSpread>0.02</ShotSpread>
+		<SightsEfficiency>1</SightsEfficiency>
+		<RangedWeapon_Cooldown>0.77</RangedWeapon_Cooldown>
+	</statBases>
+	<Properties>
+		<recoilAmount>1.75</recoilAmount>
+		<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+		<hasStandardCommand>True</hasStandardCommand>
+		<defaultProjectile>Bullet_44-40Winchester_FMJ</defaultProjectile>
+		<warmupTime>1.1</warmupTime>
+		<range>31</range>
+		<soundCast>Shot_BoltActionRifle</soundCast>
+		<soundCastTail>GunTail_Heavy</soundCastTail>
+		<muzzleFlashScale>9</muzzleFlashScale>
+	</Properties>
+	<AmmoUser>
+		<magazineSize>7</magazineSize>
+		<reloadTime>0.85</reloadTime>
+		<ammoSet>AmmoSet_44-40Winchester</ammoSet>
+		<reloadOneAtATime>true</reloadOneAtATime>
+	</AmmoUser>
+	<FireModes>
+		<aiAimMode>AimedShot</aiAimMode>
+	</FireModes>
+</Operation>
+
+<!-- === Carbiner (M1 Carbine) === -->
+
+<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>K4G_Gun_Carbiner</defName>
+	<statBases>
+		<Mass>2.40</Mass>
+		<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		<SightsEfficiency>1.00</SightsEfficiency>
+		<ShotSpread>0.08</ShotSpread>
+		<SwayFactor>1.14</SwayFactor>
+		<Bulk>6.00</Bulk>
+	</statBases>
+	<Properties>
+		<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+		<hasStandardCommand>true</hasStandardCommand>
+		<defaultProjectile>Bullet_30Carbine_FMJ</defaultProjectile>
+		<warmupTime>1.1</warmupTime>
+		<range>37</range>
+		<soundCast>Shot_BoltActionRifle</soundCast>
+		<soundCastTail>GunTail_Heavy</soundCastTail>
+		<muzzleFlashScale>9</muzzleFlashScale>
+	</Properties>
+	<AmmoUser>
+		<magazineSize>15</magazineSize>
+		<reloadTime>4</reloadTime>
+		<ammoSet>AmmoSet_30Carbine</ammoSet>
+	</AmmoUser>
+	<FireModes>
+		<aiUseBurstMode>FALSE</aiUseBurstMode>
+		<aiAimMode>AimedShot</aiAimMode>
+	</FireModes>
+</Operation>
+
+<!-- === Dune Rifle === -->
+
+<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>K4G_Gun_DuneRifle</defName>
+	<statBases>
+		<Mass>4.10</Mass>
+		<Bulk>11.26</Bulk>
+		<SwayFactor>1.54</SwayFactor>
+		<ShotSpread>0.06</ShotSpread>
+		<SightsEfficiency>1</SightsEfficiency>
+		<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+	</statBases>
+	<Properties>
+		<recoilAmount>1.75</recoilAmount>
+		<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+		<hasStandardCommand>True</hasStandardCommand>
+		<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
+		<burstShotCount>2</burstShotCount>
+		<ticksBetweenBurstShots>3</ticksBetweenBurstShots>					
+		<warmupTime>1.1</warmupTime>
+		<range>52</range>
+		<soundCast>Shot_BoltActionRifle</soundCast>
+		<soundCastTail>GunTail_Heavy</soundCastTail>
+		<muzzleFlashScale>9</muzzleFlashScale>
+	</Properties>
+	<AmmoUser>
+		<magazineSize>10</magazineSize>
+		<reloadTime>4</reloadTime>
+		<ammoSet>AmmoSet_303British</ammoSet>
+	</AmmoUser>
+	<FireModes>
+		<aiAimMode>AimedShot</aiAimMode>
+		<aiUseBurstMode>TRUE</aiUseBurstMode>
+	</FireModes>
+</Operation>
+
+<!-- ========== Heavy Shotgun (semi-auto USAS) ========== -->
+
+<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>K4G_Gun_HeavyShotgun</defName>
+	<statBases>
+		<Mass>5.45</Mass>
+		<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		<SightsEfficiency>1</SightsEfficiency>
+		<ShotSpread>0.14</ShotSpread>
+		<SwayFactor>1.51</SwayFactor>
+		<Bulk>9.60</Bulk>
+	</statBases>
+	<Properties>
+		<recoilAmount>2.36</recoilAmount>
+		<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+		<hasStandardCommand>true</hasStandardCommand>
+		<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+		<warmupTime>0.6</warmupTime>
+		<range>16</range>
+		<soundCast>Shot_Shotgun_NoRack</soundCast>
+		<soundCastTail>GunTail_Heavy</soundCastTail>
+		<muzzleFlashScale>9</muzzleFlashScale>
+	</Properties>
+	<AmmoUser>
+		<magazineSize>12</magazineSize>
+		<reloadTime>4</reloadTime>
+		<ammoSet>AmmoSet_12Gauge</ammoSet>
+	</AmmoUser>
+	<FireModes>
+		<aiAimMode>Snapshot</aiAimMode>
+	</FireModes>
+	<weaponTags>
+		<li>CE_AI_AssaultWeapon</li>
+	</weaponTags>
+</Operation>
+
+<!-- === Light SMG (MP5) === -->
+
+<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>K4G_Gun_LightSMG</defName>
+	<statBases>
+		<Mass>2.50</Mass>
+		<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		<SightsEfficiency>1.00</SightsEfficiency>
+		<ShotSpread>0.16</ShotSpread>
+		<SwayFactor>0.85</SwayFactor>
+		<Bulk>3.68</Bulk>
+	</statBases>
+	<Properties>
+		<recoilAmount>1.55</recoilAmount>
+		<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+		<hasStandardCommand>true</hasStandardCommand>
+		<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+		<warmupTime>0.6</warmupTime>
+		<range>20</range>
+		<burstShotCount>6</burstShotCount>
+		<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+		<soundCast>Shot_HeavySMG</soundCast>
+		<soundCastTail>GunTail_Heavy</soundCastTail>
+		<muzzleFlashScale>9</muzzleFlashScale>
+	</Properties>
+	<AmmoUser>
+		<magazineSize>30</magazineSize>
+		<reloadTime>4</reloadTime>
+		<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+	</AmmoUser>
+	<FireModes>
+		<aiUseBurstMode>FALSE</aiUseBurstMode>
+		<aiAimMode>Snapshot</aiAimMode>
+		<aimedBurstShotCount>3</aimedBurstShotCount>
+	</FireModes>
+	<weaponTags>
+		<li>CE_AI_AssaultWeapon</li>
+		<li>CE_SMG</li>
+	</weaponTags>
+</Operation>
+
+<!-- ========== Advanced SMG (P90) ========== -->
+
+<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>K4G_Gun_AdvancedSMG</defName>
+	<statBases>
+		<Mass>2.60</Mass>
+		<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		<SightsEfficiency>1.10</SightsEfficiency>
+		<ShotSpread>0.12</ShotSpread>
+		<SwayFactor>0.77</SwayFactor>
+		<Bulk>5.05</Bulk>
+	</statBases>
+	<Properties>
+		<recoilAmount>1.05</recoilAmount>
+		<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+		<hasStandardCommand>true</hasStandardCommand>
+		<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
+		<warmupTime>0.5</warmupTime>
+		<range>31</range>
+		<burstShotCount>6</burstShotCount>
+		<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+		<soundCast>Shot_HeavySMG</soundCast>
+		<soundCastTail>GunTail_Heavy</soundCastTail>
+		<muzzleFlashScale>9</muzzleFlashScale>
+	</Properties>
+	<AmmoUser>
+		<magazineSize>50</magazineSize>
+		<reloadTime>4.5</reloadTime>
+		<ammoSet>AmmoSet_FN57x28mm</ammoSet>
+	</AmmoUser>
+	<FireModes>
+		<aiUseBurstMode>FALSE</aiUseBurstMode>
+		<aiAimMode>Snapshot</aiAimMode>
+		<aimedBurstShotCount>3</aimedBurstShotCount>
+	</FireModes>
+</Operation>
+
+<!-- ========== Compact Rifle (M4A1) ========== -->
+
+<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>K4G_Gun_CompactRifle</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>
+	</statBases>
+	<Properties>
+		<recoilAmount>1.58</recoilAmount>
+		<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+		<hasStandardCommand>true</hasStandardCommand>
+		<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+		<warmupTime>1.1</warmupTime>
+		<range>55</range>
+		<burstShotCount>6</burstShotCount>
+		<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+		<soundCast>Shot_AssaultRifle</soundCast>
+		<soundCastTail>GunTail_Medium</soundCastTail>
+		<muzzleFlashScale>9</muzzleFlashScale>
+	</Properties>
+	<AmmoUser>
+		<magazineSize>30</magazineSize>
+		<reloadTime>4</reloadTime>
+		<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+	</AmmoUser>
+	<FireModes>
+		<aiUseBurstMode>TRUE</aiUseBurstMode>
+		<aiAimMode>AimedShot</aiAimMode>
+		<aimedBurstShotCount>3</aimedBurstShotCount>
+	</FireModes>
+</Operation>
+
+<!-- ========== Batttle Rifle (G3A2) ========== -->
+
+<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>K4G_Gun_BattleRifle</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>
+	</statBases>
+	<Properties>
+		<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+		<hasStandardCommand>True</hasStandardCommand>
+		<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+		<recoilAmount>2.00</recoilAmount>
+		<burstShotCount>6</burstShotCount>
+		<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+		<warmupTime>1.1</warmupTime>
+		<range>57</range>
+		<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>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Empires of Old - Engineers Institute/Patches/K4G Empires of Old - Engineers Institute/PawnKinds_Guild.xml b/ModPatches/K4G Empires of Old - Engineers Institute/Patches/K4G Empires of Old - Engineers Institute/PawnKinds_Guild.xml
new file mode 100644
index 0000000000..2c7c4448ae
--- /dev/null
+++ b/ModPatches/K4G Empires of Old - Engineers Institute/Patches/K4G Empires of Old - Engineers Institute/PawnKinds_Guild.xml	
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === Civilians / Royals === -->
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/PawnKindDef[
+	defName="K4G_Guild_Common_Trader" or
+	defName="K4G_Guild_Common_Worker" or
+	@Name="K4GGuildRoyalBase"
+	]</xpath>
+	<value>
+		<li Class="CombatExtended.LoadoutPropertiesExtension">
+			<primaryMagazineCount>
+				<min>3</min>
+				<max>4</max>
+			</primaryMagazineCount>
+		</li>
+	</value>
+</Operation>
+
+<!-- === Fighters === -->
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/PawnKindDef[@Name="K4GGuildGruntBase" or @Name="K4GGuildTrooperBase"]</xpath>
+	<value>
+		<li Class="CombatExtended.LoadoutPropertiesExtension">
+			<primaryMagazineCount>
+				<min>4</min>
+				<max>6</max>
+			</primaryMagazineCount>
+		</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/PawnKindDef[defName="K4G_Guild_Fighter_Cataphract" or defName="K4G_Guild_Fighter_SentinelGuardRanged"]</xpath>
+	<value>
+		<li Class="CombatExtended.LoadoutPropertiesExtension">
+			<primaryMagazineCount>
+				<min>5</min>
+				<max>7</max>
+			</primaryMagazineCount>
+		</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/PawnKindDef[defName="K4G_Guild_Fighter_Grenadier"]</xpath>
+	<value>
+		<li Class="CombatExtended.LoadoutPropertiesExtension">
+			<primaryMagazineCount>
+				<min>8</min>
+				<max>12</max>
+			</primaryMagazineCount>
+		</li>
+	</value>
+</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Empires of Old - The Faceless Sultainate/Patches/K4G Empires of Old - The Faceless Sultainate/PawnKinds_Sultanate.xml b/ModPatches/K4G Empires of Old - The Faceless Sultainate/Patches/K4G Empires of Old - The Faceless Sultainate/PawnKinds_Sultanate.xml
new file mode 100644
index 0000000000..82c97e0c89
--- /dev/null
+++ b/ModPatches/K4G Empires of Old - The Faceless Sultainate/Patches/K4G Empires of Old - The Faceless Sultainate/PawnKinds_Sultanate.xml	
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === Civilians / Royals === -->
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/PawnKindDef[defName="K4G_Sultanate_Common_Trader" or defName="K4G_Sultanate_Common_Worker"]</xpath>
+	<value>
+		<li Class="CombatExtended.LoadoutPropertiesExtension">
+			<primaryMagazineCount>
+				<min>3</min>
+				<max>4</max>
+			</primaryMagazineCount>
+		</li>
+	</value>
+</Operation>
+
+<!-- === Fighters === -->
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/PawnKindDef[@Name="K4GSultanateGuerrillaBase" or @Name="K4GSultanateJanissaryBase"]</xpath>
+	<value>
+		<li Class="CombatExtended.LoadoutPropertiesExtension">
+			<primaryMagazineCount>
+				<min>4</min>
+				<max>6</max>
+			</primaryMagazineCount>
+		</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/PawnKindDef[
+	defName="K4G_Sultanate_Fighter_Cataphract" or
+	defName="K4G_Sultanate_Fighter_KhanGuardRanged" or
+	defName="K4G_Sultanate_Fighter_BlackMarketMercenary"]</xpath>
+	<value>
+		<li Class="CombatExtended.LoadoutPropertiesExtension">
+			<primaryMagazineCount>
+				<min>5</min>
+				<max>7</max>
+			</primaryMagazineCount>
+		</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/PawnKindDef[defName="K4G_Sultanate_Fighter_Bomber"]</xpath>
+	<value>
+		<li Class="CombatExtended.LoadoutPropertiesExtension">
+			<primaryMagazineCount>
+				<min>8</min>
+				<max>12</max>
+			</primaryMagazineCount>
+		</li>
+	</value>
+</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Empires of Old - The Faceless Sultainate/Patches/K4G Empires of Old - The Faceless Sultainate/TraderKinds_Sultanate.xml b/ModPatches/K4G Empires of Old - The Faceless Sultainate/Patches/K4G Empires of Old - The Faceless Sultainate/TraderKinds_Sultanate.xml
new file mode 100644
index 0000000000..378d32225a
--- /dev/null
+++ b/ModPatches/K4G Empires of Old - The Faceless Sultainate/Patches/K4G Empires of Old - The Faceless Sultainate/TraderKinds_Sultanate.xml	
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ======= Trader Base =======-->
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/TraderKindDef[defName="K4G_Base_Sultanate_Standard"]/stockGenerators</xpath>
+	<value>
+		<li Class="StockGenerator_SingleDef">
+			<thingDef>FSX</thingDef>
+			<countRange>
+				<min>15</min>
+				<max>40</max>
+			</countRange>
+		</li>
+		<li Class="StockGenerator_SingleDef">
+			<thingDef>Prometheum</thingDef>
+			<countRange>
+				<min>15</min>
+				<max>40</max>
+			</countRange>
+		</li>
+		<li Class="StockGenerator_Tag">
+			<tradeTag>CE_Ammo</tradeTag>
+			<countRange>
+				<min>400</min>
+				<max>1000</max>
+			</countRange>
+			<thingDefCountRange>
+				<min>3</min>
+				<max>8</max>
+			</thingDefCountRange>
+		</li>
+		<li Class="StockGenerator_Tag">
+			<tradeTag>CE_MediumAmmo</tradeTag>
+			<countRange>
+				<min>400</min>
+				<max>1000</max>
+			</countRange>
+			<thingDefCountRange>
+				<min>3</min>
+				<max>8</max>
+			</thingDefCountRange>
+		</li>
+		<li Class="StockGenerator_Tag">
+			<tradeTag>CE_HeavyAmmo</tradeTag>
+			<countRange>
+				<min>10</min>
+				<max>50</max>
+			</countRange>
+			<thingDefCountRange>
+				<min>2</min>
+				<max>5</max>
+			</thingDefCountRange>
+		</li>
+		<li Class="StockGenerator_Category">
+			<categoryDef>Ammo</categoryDef>
+			<thingDefCountRange>
+				<min>0</min>
+				<max>0</max>
+			</thingDefCountRange>
+		</li>
+	</value>
+</Operation>
+
+<!-- ======= Trader Caravan Base =======-->
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/TraderKindDef[defName="K4G_Base_Sultanate_Standard"]/stockGenerators</xpath>
+	<value>
+		<li Class="StockGenerator_SingleDef">
+			<thingDef>FSX</thingDef>
+			<countRange>
+				<min>15</min>
+				<max>40</max>
+			</countRange>
+		</li>
+		<li Class="StockGenerator_SingleDef">
+			<thingDef>Prometheum</thingDef>
+			<countRange>
+				<min>15</min>
+				<max>40</max>
+			</countRange>
+		</li>
+		<li Class="StockGenerator_Tag">
+			<tradeTag>CE_Ammo</tradeTag>
+			<countRange>
+				<min>400</min>
+				<max>1000</max>
+			</countRange>
+			<price>Cheap</price>
+			<thingDefCountRange>
+				<min>3</min>
+				<max>8</max>
+			</thingDefCountRange>
+		</li>
+		<li Class="StockGenerator_Tag">
+			<tradeTag>CE_MediumAmmo</tradeTag>
+			<countRange>
+				<min>10</min>
+				<max>50</max>
+			</countRange>
+			<thingDefCountRange>
+				<min>2</min>
+				<max>4</max>
+			</thingDefCountRange>
+		</li>
+		<li Class="StockGenerator_Tag">
+			<tradeTag>CE_HeavyAmmo</tradeTag>
+			<countRange>
+				<min>5</min>
+				<max>30</max>
+			</countRange>
+			<thingDefCountRange>
+				<min>2</min>
+				<max>6</max>
+			</thingDefCountRange>
+		</li>
+		<li Class="StockGenerator_Category">
+			<categoryDef>Ammo</categoryDef>
+			<thingDefCountRange>
+				<min>0</min>
+				<max>0</max>
+			</thingDefCountRange>
+		</li>
+		<li Class="StockGenerator_Tag">
+			<tradeTag>CE_Turret</tradeTag>
+			<thingDefCountRange>
+				<min>-4</min>
+				<max>2</max>
+			</thingDefCountRange>
+			<countRange>
+				<min>1</min>
+				<max>1</max>
+			</countRange>
+		</li>
+		<li Class="StockGenerator_Category">
+			<categoryDef>WeaponsTurrets</categoryDef>
+			<thingDefCountRange>
+				<min>0</min>
+				<max>0</max>
+			</thingDefCountRange>
+		</li>
+		<li Class="StockGenerator_Animals">
+			<tradeTagsSell>
+				<li>CE_AnimalBoom</li>
+			</tradeTagsSell>
+			<tradeTagsBuy>
+				<li>CE_AnimalBoom</li>
+			</tradeTagsBuy>
+			<kindCountRange>
+				<min>0</min>
+				<max>1</max>
+			</kindCountRange>
+			<countRange>
+				<min>-1</min>
+				<max>2</max>
+			</countRange>
+		</li>
+	</value>
+</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Empires of Old - The Polluted Legion/Patches/K4G Empires of Old - The Polluted Legion/PawnKinds_Legion.xml b/ModPatches/K4G Empires of Old - The Polluted Legion/Patches/K4G Empires of Old - The Polluted Legion/PawnKinds_Legion.xml
new file mode 100644
index 0000000000..70f0abaf9d
--- /dev/null
+++ b/ModPatches/K4G Empires of Old - The Polluted Legion/Patches/K4G Empires of Old - The Polluted Legion/PawnKinds_Legion.xml	
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === Civilians === -->
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/PawnKindDef[defName="K4G_Legion_Common_Trader" or defName="K4G_Legion_Common_Worker"]</xpath>
+	<value>
+		<li Class="CombatExtended.LoadoutPropertiesExtension">
+			<primaryMagazineCount>
+				<min>3</min>
+				<max>4</max>
+			</primaryMagazineCount>
+		</li>
+	</value>
+</Operation>
+
+<!-- === Fighters === -->
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/PawnKindDef[@Name="K4GLegionMilitesBase" or @Name="K4GLegionLegionaryBase"]</xpath>
+	<value>
+		<li Class="CombatExtended.LoadoutPropertiesExtension">
+			<primaryMagazineCount>
+				<min>4</min>
+				<max>6</max>
+			</primaryMagazineCount>
+		</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/PawnKindDef[defName="K4G_Legion_Fighter_HeavyLegionnaire" or defName="K4G_Legion_Fighter_PraetorianGuardRanged"]</xpath>
+	<value>
+		<li Class="CombatExtended.LoadoutPropertiesExtension">
+			<primaryMagazineCount>
+				<min>5</min>
+				<max>7</max>
+			</primaryMagazineCount>
+		</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/PawnKindDef[defName="K4G_Legion_Fighter_Grenadier"]</xpath>
+	<value>
+		<li Class="CombatExtended.LoadoutPropertiesExtension">
+			<primaryMagazineCount>
+				<min>8</min>
+				<max>12</max>
+			</primaryMagazineCount>
+		</li>
+	</value>
+</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Empires of Old - The Rising Sun/Patches/K4G Empires of Old - The Rising Sun/PawnKinds_Dynasty.xml b/ModPatches/K4G Empires of Old - The Rising Sun/Patches/K4G Empires of Old - The Rising Sun/PawnKinds_Dynasty.xml
new file mode 100644
index 0000000000..1e8c50c83b
--- /dev/null
+++ b/ModPatches/K4G Empires of Old - The Rising Sun/Patches/K4G Empires of Old - The Rising Sun/PawnKinds_Dynasty.xml	
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === Civilians === -->
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/PawnKindDef[defName="K4G_Dynasty_Common_Trader" or defName="K4G_Dynasty_Common_Worker"]</xpath>
+	<value>
+		<li Class="CombatExtended.LoadoutPropertiesExtension">
+			<primaryMagazineCount>
+				<min>3</min>
+				<max>4</max>
+			</primaryMagazineCount>
+		</li>
+	</value>
+</Operation>
+
+<!-- === Fighters === -->
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/PawnKindDef[@Name="K4GDynastyRoninBase" or @Name="K4GDynastyAshigaruBase"]</xpath>
+	<value>
+		<li Class="CombatExtended.LoadoutPropertiesExtension">
+			<primaryMagazineCount>
+				<min>4</min>
+				<max>6</max>
+			</primaryMagazineCount>
+		</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/PawnKindDef[defName="K4G_Dynasty_Fighter_Cataphract" or defName="K4G_Dynasty_Fighter_WarriorMonkRanged"]</xpath>
+	<value>
+		<li Class="CombatExtended.LoadoutPropertiesExtension">
+			<primaryMagazineCount>
+				<min>5</min>
+				<max>7</max>
+			</primaryMagazineCount>
+		</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/PawnKindDef[defName="K4G_Dynasty_Fighter_Grenadier"]</xpath>
+	<value>
+		<li Class="CombatExtended.LoadoutPropertiesExtension">
+			<primaryMagazineCount>
+				<min>8</min>
+				<max>12</max>
+			</primaryMagazineCount>
+		</li>
+	</value>
+</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Equipment of the Weimar Republic/Patches/K4G Equipment of the Weimar Republic/Apparel_Various.xml b/ModPatches/K4G Equipment of the Weimar Republic/Patches/K4G Equipment of the Weimar Republic/Apparel_Various.xml
new file mode 100644
index 0000000000..72f12b047a
--- /dev/null
+++ b/ModPatches/K4G Equipment of the Weimar Republic/Patches/K4G Equipment of the Weimar Republic/Apparel_Various.xml	
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ======= Uniforms ======= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+		defName="K4G_Apparel_WRSicherheitspolizeiOfficerUniform" or
+		defName="K4G_Apparel_WRReichswehrInfantryUniform"					
+		]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+		defName="K4G_Apparel_WRSicherheitspolizeiOfficerUniform" or
+		defName="K4G_Apparel_WRReichswehrInfantryUniform"
+		]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.03</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+		defName="K4G_Apparel_WRSicherheitspolizeiOfficerUniform" or
+		defName="K4G_Apparel_WRReichswehrInfantryUniform"
+		]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.045</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ======= Coat ======= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Apparel_WRSicherheitspolizeiOfficerTrenchcoat"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Apparel_WRSicherheitspolizeiOfficerTrenchcoat"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Apparel_WRSicherheitspolizeiOfficerTrenchcoat"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Apparel_WRSicherheitspolizeiOfficerTrenchcoat"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>15</CarryBulk>
+			<ReloadSpeed>0.1</ReloadSpeed>
+		</value>
+	</Operation>
+
+	<!-- === Backpack === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Apparel_WRReichswehrInfantryRucksack"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Apparel_WRReichswehrInfantryRucksack"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>Shoulders</li>
+			</bodyPartGroups>
+			<careIfDamaged>false</careIfDamaged>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Apparel_WRReichswehrInfantryRucksack"]/thingCategories</xpath>
+		<value>
+			<thingCategories>
+				<li>Loadout</li>
+			</thingCategories>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Apparel_WRReichswehrInfantryRucksack"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>40</CarryBulk>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- === Webbing === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+		defName="K4G_Apparel_WRSicherheitspolizeiOfficerWebbing" or
+		defName="K4G_Apparel_WRReichswehrInfantryWebbing"
+		]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+		defName="K4G_Apparel_WRSicherheitspolizeiOfficerWebbing" or
+		defName="K4G_Apparel_WRReichswehrInfantryWebbing"
+		]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>Shoulders</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+		defName="K4G_Apparel_WRSicherheitspolizeiOfficerWebbing" or
+		defName="K4G_Apparel_WRReichswehrInfantryWebbing"
+		]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>Webbing</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+		defName="K4G_Apparel_WRSicherheitspolizeiOfficerWebbing" or
+		defName="K4G_Apparel_WRReichswehrInfantryWebbing"
+		]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>15</CarryBulk>
+				<ReloadSpeed>0.1</ReloadSpeed>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- ======= Helmets ======= -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Apparel_WRReichswehrInfantryHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Apparel_WRReichswehrInfantryHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ======= Caps ======= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Apparel_WRSicherheitspolizeiOfficerShako"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Equipment of the Weimar Republic/Patches/K4G Equipment of the Weimar Republic/WeaponRanged.xml b/ModPatches/K4G Equipment of the Weimar Republic/Patches/K4G Equipment of the Weimar Republic/WeaponRanged.xml
new file mode 100644
index 0000000000..f83d5205aa
--- /dev/null
+++ b/ModPatches/K4G Equipment of the Weimar Republic/Patches/K4G Equipment of the Weimar Republic/WeaponRanged.xml	
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Gewehr 98 ========== -->
+
+<Operation Class="PatchOperationReplace">
+<xpath>
+	Defs/ThingDef[
+	defName="K4G_Gun_WRGewehr98Rifle" or
+	defName="K4G_Gun_WRMP34SMG"
+	]/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>
+
+<!-- ========== Gewehr 98 ========== -->
+
+<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+<defName>K4G_Gun_WRGewehr98Rifle</defName>
+<statBases>
+	<Mass>4.09</Mass>
+	<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+	<SightsEfficiency>1</SightsEfficiency>
+	<ShotSpread>0.02</ShotSpread>
+	<SwayFactor>1.66</SwayFactor>
+	<Bulk>12.50</Bulk>
+</statBases>
+<Properties>
+	<recoilAmount>2.17</recoilAmount>
+	<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+	<hasStandardCommand>true</hasStandardCommand>
+	<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+	<warmupTime>1.1</warmupTime>
+	<range>55</range>
+	<soundCast>Shot_BoltActionRifle</soundCast>
+	<soundCastTail>GunTail_Heavy</soundCastTail>
+	<muzzleFlashScale>9</muzzleFlashScale>
+</Properties>
+<AmmoUser>
+	<magazineSize>5</magazineSize>
+	<reloadTime>4.3</reloadTime>
+	<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+</AmmoUser>
+<FireModes>
+	<aiAimMode>AimedShot</aiAimMode>
+</FireModes>
+<weaponTags>
+	<li>CE_AI_SR</li>
+</weaponTags>
+<AllowWithRunAndGun>false</AllowWithRunAndGun>
+</Operation>
+
+<Operation Class="PatchOperationAddModExtension">
+<xpath>Defs/ThingDef[defName="K4G_Gun_WRGewehr98Rifle"]</xpath>
+<value>
+	<li Class="CombatExtended.GunDrawExtension">
+		<DrawSize>1.3,1.3</DrawSize>
+		<DrawOffset>0.12,0.04</DrawOffset>
+		<CasingOffset>-0.1,0.1</CasingOffset>
+	</li>
+</value>
+</Operation>
+
+<!-- ========== MP 34 ========== -->
+
+<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+<defName>K4G_Gun_WRMP34SMG</defName>
+<statBases>
+	<Mass>4.25</Mass>
+	<RangedWeapon_Cooldown>0.41</RangedWeapon_Cooldown>
+	<SightsEfficiency>0.7</SightsEfficiency>
+	<ShotSpread>0.14</ShotSpread>
+	<SwayFactor>1.28</SwayFactor>
+	<Bulk>8.5</Bulk>
+</statBases>
+<Properties>
+	<recoilAmount>1.12</recoilAmount>
+	<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+	<hasStandardCommand>true</hasStandardCommand>
+	<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+	<warmupTime>0.6</warmupTime>
+	<range>25</range>
+	<burstShotCount>5</burstShotCount>
+	<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+	<soundCast>Shot_HeavySMG</soundCast>
+	<soundCastTail>GunTail_Heavy</soundCastTail>
+	<muzzleFlashScale>9</muzzleFlashScale>
+</Properties>
+<AmmoUser>
+	<magazineSize>20</magazineSize>
+	<reloadTime>4</reloadTime>
+	<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+</AmmoUser>
+<FireModes>
+	<aimedBurstShotCount>3</aimedBurstShotCount>
+	<aiUseBurstMode>FALSE</aiUseBurstMode>
+	<aiAimMode>Snapshot</aiAimMode>
+</FireModes>
+<weaponTags>
+	<li>CE_SMG</li>
+	<li>CE_AI_BROOM</li>
+</weaponTags>
+</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Rimworld War 2/Defs/K4G Rimworld War 2/AmmoDefs/WW2_RocketAmmo.xml b/ModPatches/K4G Rimworld War 2/Defs/K4G Rimworld War 2/AmmoDefs/WW2_RocketAmmo.xml
new file mode 100644
index 0000000000..01f52dc158
--- /dev/null
+++ b/ModPatches/K4G Rimworld War 2/Defs/K4G Rimworld War 2/AmmoDefs/WW2_RocketAmmo.xml	
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- ===================== Category Defs =====================-->
+
+	<!-- ======= Type 74mm Rocket ======= -->
+	<ThingCategoryDef>
+		<defName>AmmoK4GType74mmRockets</defName>
+		<label>Type 74mm Rockets</label>
+		<parent>AmmoRockets</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRocket</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ===================== Ammo Sets ===================== -->
+
+	<!-- ======= Type 74mm Rocket ======= -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_K4GType74mmRocket</defName>
+		<label>Type 74mm Rockets</label>
+		<ammoTypes>
+			<Ammo_K4GType74mm_HEAT>Bullet_K4GType74mm_HEAT</Ammo_K4GType74mm_HEAT>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ===================== Rocket Ammo ===================== -->
+
+	<!-- ======= Type 74mm Rocket ======= -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="K4GType74mmRocketBase" ParentName="MediumAmmoBase" Abstract="True">
+		<description>Outdated 74mm rocket-propelled grenade designed for the Type-4 74mm Rocket Launcher.</description>
+		<statBases>
+			<MaxHitPoints>150</MaxHitPoints>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoK4GType74mmRockets</li>
+		</thingCategories>
+		<stackLimit>25</stackLimit>
+		<cookOffFlashScale>40</cookOffFlashScale>
+		<cookOffSound>MortarBomb_Explode</cookOffSound>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="K4GType74mmRocketBase">
+		<defName>Ammo_K4GType74mm_HEAT</defName>
+		<label>Type 74mm Rocket (HEAT)</label>
+		<graphicData>
+			<texPath>Things/Ammo/RPG/HEAT</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>47.61</MarketValue>
+			<Mass>1.59</Mass>
+			<Bulk>4.66</Bulk>
+		</statBases>
+		<ammoClass>RocketHEAT</ammoClass>
+		<detonateProjectile>Bullet_K4GType74mm_HEAT</detonateProjectile>
+	</ThingDef>
+
+	<!-- ===================== Projectiles ===================== -->
+
+	<!-- ======= Panzerfaust 80mm Rocket ======= -->
+	<ThingDef ParentName="BaseRPG7Grenade">
+		<defName>Bullet_K4GPanzerFaust60_HEAT</defName>
+		<label>Panzerfaust 60 rocket</label>
+		<graphicData>
+			<texPath>Things/Projectile/WW2GermanServiceDisposableRocket</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>34</speed>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>208</damageAmountBase>
+			<armorPenetrationSharp>200</armorPenetrationSharp>
+			<armorPenetrationBlunt>37.321</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>124</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>1</Fragment_Large>
+					<Fragment_Small>19</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ======= Panzerfaust 60mm Rocket ======= -->
+	<ThingDef ParentName="BaseRPG7Grenade">
+		<defName>Bullet_K4GPanzerFaust50_HEAT</defName>
+		<label>Panzerfaust 50 rocket</label>
+		<graphicData>
+			<texPath>Things/Projectile/WW2GermanServiceDisposableRocketB</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>34</speed>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>208</damageAmountBase>
+			<armorPenetrationSharp>150</armorPenetrationSharp>
+			<armorPenetrationBlunt>34.321</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>124</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>1</Fragment_Large>
+					<Fragment_Small>13</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ======= Type 74mm Rocket ======= -->
+	<ThingDef ParentName="BaseRPG7Grenade">
+		<defName>Bullet_K4GType74mm_HEAT</defName>
+		<label>Type 74mm Rocket (HEAT)</label>
+		<graphicData>
+			<texPath>Things/Projectile/WW2JapaneseServiceRocket</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>31</speed>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>208</damageAmountBase>
+			<armorPenetrationSharp>172</armorPenetrationSharp>
+			<armorPenetrationBlunt>39.273</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>132</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1.2</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>2</Fragment_Large>
+					<Fragment_Small>39</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<!-- ======= Type 74mm Rocket ======= -->
+	<RecipeDef ParentName="LauncherAmmoRecipeBase">
+		<defName>MakeAmmo_K4GType74mm_HEAT</defName>
+		<label>make Type 74mm HEAT rockets x5</label>
+		<description>Craft 5 Type 74mm HEAT rockets.</description>
+		<jobString>Making Type 74mm HEAT rockets.</jobString>
+		<workAmount>7900</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>25</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>7</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_K4GType74mm_HEAT>5</Ammo_K4GType74mm_HEAT>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/K4G Rimworld War 2/Defs/K4G Rimworld War 2/RecipeDefs/WW2_GrenadeRecipes.xml b/ModPatches/K4G Rimworld War 2/Defs/K4G Rimworld War 2/RecipeDefs/WW2_GrenadeRecipes.xml
new file mode 100644
index 0000000000..e32de812b1
--- /dev/null
+++ b/ModPatches/K4G Rimworld War 2/Defs/K4G Rimworld War 2/RecipeDefs/WW2_GrenadeRecipes.xml	
@@ -0,0 +1,957 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ======= Grenades Recipes ======= -->
+
+	<!-- ===== Service Grenades ===== -->
+
+	<!-- === British No. 36M Mk I Mills Bomb Grenades === -->
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>K4GWW2_Make_BritishServiceGrenade</defName>
+		<label>make British No. 36M Mk I Mills Bomb grenades x10</label>
+		<description>Craft 10 British No. 36M Mk I Mills Bomb grenades.</description>
+		<jobString>Making british no. 36M Mk I Mills bomb grenades.</jobString>
+		<workAmount>4200</workAmount>
+		<researchPrerequisite>K4G_WW2InfantryHandGrenades</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<K4G_Weapon_WW2BritishServiceGrenades>10</K4G_Weapon_WW2BritishServiceGrenades>
+		</products>
+	</RecipeDef>
+
+	<!-- === Finnish Mk II Grenades === -->
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>K4GWW2_Make_FinnishServiceGrenade</defName>
+		<label>make Finnish Mk II grenades x10</label>
+		<description>Craft 10 Finnish Mk II grenades.</description>
+		<jobString>Making finnish Mk II grenades.</jobString>
+		<workAmount>4200</workAmount>
+		<researchPrerequisite>K4G_WW2InfantryHandGrenades</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<K4G_Weapon_WW2FinnishServiceGrenades>10</K4G_Weapon_WW2FinnishServiceGrenades>
+		</products>
+	</RecipeDef>
+
+	<!-- === French F1 Grenades === -->
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>K4GWW2_Make_FrenchServiceGrenade</defName>
+		<label>make French F1 grenades x10</label>
+		<description>Craft 10 French F1 grenades.</description>
+		<jobString>Making french F1 grenades.</jobString>
+		<workAmount>4200</workAmount>
+		<researchPrerequisite>K4G_WW2InfantryHandGrenades</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<K4G_Weapon_WW2FrenchServiceGrenades>10</K4G_Weapon_WW2FrenchServiceGrenades>
+		</products>
+	</RecipeDef>
+
+	<!-- === German M24 Stielhandgranate Grenades === -->
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>K4GWW2_Make_GermanServiceGrenade</defName>
+		<label>make German M24 Stielhandgranate grenades x10</label>
+		<description>Craft 10 German M24 Stielhandgranate grenades.</description>
+		<jobString>Making german M24 stielhandgranate grenades.</jobString>
+		<workAmount>4200</workAmount>
+		<researchPrerequisite>K4G_WW2InfantryHandGrenades</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<K4G_Weapon_WW2GermanServiceGrenades>10</K4G_Weapon_WW2GermanServiceGrenades>
+		</products>
+	</RecipeDef>
+
+	<!-- === German M39 Grenades === -->
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>K4GWW2_Make_GermanServiceGrenadeB</defName>
+		<label>make German M39 grenades x10</label>
+		<description>Craft 10 German M39 grenades.</description>
+		<jobString>Making german M39 grenades.</jobString>
+		<workAmount>4500</workAmount>
+		<researchPrerequisite>K4G_WW2InfantryHandGrenades</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<K4G_Weapon_WW2GermanServiceGrenadesB>10</K4G_Weapon_WW2GermanServiceGrenadesB>
+		</products>
+	</RecipeDef>
+
+	<!-- === Italian SRCM Mod.35 Grenades === -->
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>K4GWW2_Make_ItalianServiceGrenade</defName>
+		<label>make Italian SRCM Mod.35 grenades x10</label>
+		<description>Craft 10 Italian SRCM Mod.35 grenades.</description>
+		<jobString>Making italian SRCM Mod.35 grenades.</jobString>
+		<workAmount>4200</workAmount>
+		<researchPrerequisite>K4G_WW2InfantryHandGrenades</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<K4G_Weapon_WW2GermanServiceGrenades>10</K4G_Weapon_WW2GermanServiceGrenades>
+		</products>
+	</RecipeDef>
+
+	<!-- === Italian OTO Mod.35 Grenades === -->
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>K4GWW2_Make_ItalianServiceGrenadeB</defName>
+		<label>make italian OTO Mod.35 grenades x10</label>
+		<description>Craft 10 Italian OTO Mod.35 grenades.</description>
+		<jobString>Making Italian OTO Mod.35 grenades.</jobString>
+		<workAmount>4350</workAmount>
+		<researchPrerequisite>K4G_WW2InfantryHandGrenades</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>9</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<K4G_Weapon_WW2ItalianServiceGrenadesB>10</K4G_Weapon_WW2ItalianServiceGrenadesB>
+		</products>
+	</RecipeDef>
+
+	<!-- === Italian Breda Mod.35 Grenades === -->
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>K4GWW2_Make_ItalianServiceGrenadeC</defName>
+		<label>make italian breda Mod.35 grenades x10</label>
+		<description>Craft 10 Italian Breda Mod.35 grenades.</description>
+		<jobString>Making Italian Breda Mod.35 grenades.</jobString>
+		<workAmount>4500</workAmount>
+		<researchPrerequisite>K4G_WW2InfantryHandGrenades</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<K4G_Weapon_WW2ItalianServiceGrenadesC>10</K4G_Weapon_WW2ItalianServiceGrenadesC>
+		</products>
+	</RecipeDef>
+
+	<!-- === Japanese Type 97 Grenades === -->
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>K4GWW2_Make_JapaneseServiceGrenade</defName>
+		<label>make Japanese Type 97 grenades x10</label>
+		<description>Craft Japanese Type 97 grenades.</description>
+		<jobString>Making japanese type 97 grenades.</jobString>
+		<workAmount>4200</workAmount>
+		<researchPrerequisite>K4G_WW2InfantryHandGrenades</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<K4G_Weapon_WW2JapaneseServiceGrenades>10</K4G_Weapon_WW2JapaneseServiceGrenades>
+		</products>
+	</RecipeDef>
+
+	<!-- === Russian F1 Grenades === -->
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>K4GWW2_Make_RussianServiceGrenade</defName>
+		<label>make Russian F1 grenades x10</label>
+		<description>Craft 10 Russian F1 grenades.</description>
+		<jobString>Making russian F1 grenades.</jobString>
+		<workAmount>4200</workAmount>
+		<researchPrerequisite>K4G_WW2InfantryHandGrenades</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<K4G_Weapon_WW2RussianServiceGrenades>10</K4G_Weapon_WW2RussianServiceGrenades>
+		</products>
+	</RecipeDef>
+
+	<!-- === Russian RG-42 Grenades === -->
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>K4GWW2_Make_RussianServiceGrenadeB</defName>
+		<label>make Russian RG-42 grenades x10</label>
+		<description>Craft 10 russian RG-42 grenades.</description>
+		<jobString>Making Russian RG-42 grenades.</jobString>
+		<workAmount>4350</workAmount>
+		<researchPrerequisite>K4G_WW2InfantryHandGrenades</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>9</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<K4G_Weapon_WW2RussianServiceGrenadesB>10</K4G_Weapon_WW2RussianServiceGrenadesB>
+		</products>
+	</RecipeDef>
+
+	<!-- === Russian RGD-33 Grenades === -->
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>K4GWW2_Make_RussianServiceGrenadeC</defName>
+		<label>make Russian RGD-33 grenades x10</label>
+		<description>Craft 10 Russian RGD-33 grenades.</description>
+		<jobString>Making russian RGD-33 grenades.</jobString>
+		<workAmount>4500</workAmount>
+		<researchPrerequisite>K4G_WW2InfantryHandGrenades</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<K4G_Weapon_WW2RussianServiceGrenadesC>10</K4G_Weapon_WW2RussianServiceGrenadesC>
+		</products>
+	</RecipeDef>
+
+	<!-- === American Mk II Grenades === -->
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>K4GWW2_Make_AmericanServiceGrenade</defName>
+		<label>make American Mk II grenades x10</label>
+		<description>Craft 10 American Mk II grenades.</description>
+		<jobString>Making american Mk II grenades.</jobString>
+		<workAmount>4200</workAmount>
+		<researchPrerequisite>K4G_WW2InfantryHandGrenades</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<K4G_Weapon_WW2AmericanServiceGrenades>10</K4G_Weapon_WW2AmericanServiceGrenades>
+		</products>
+	</RecipeDef>
+
+	<!-- ===== Anti-Tank Grenades ===== -->
+
+	<!-- === British No. 73 Anti-Tank Grenades === -->
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>K4GWW2_Make_BritishATGrenade</defName>
+		<label>make British No. 73 Anti-Tank grenades x10</label>
+		<description>Craft 10 british no. 73 anti-tank grenades.</description>
+		<jobString>Making british no. 73 anti-tank grenades.</jobString>
+		<workAmount>4200</workAmount>
+		<researchPrerequisite>K4G_WW2AntiTankEquipment</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>FSX</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<K4G_Weapon_WW2BritishServiceAntiTankGrenades>10</K4G_Weapon_WW2BritishServiceAntiTankGrenades>
+		</products>
+	</RecipeDef>
+
+	<!-- === British No. 74 Sticky Bomb Anti-Tank Grenades === -->
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>K4GWW2_Make_BritishATGrenadeB</defName>
+		<label>make British No. 74 Sticky Bomb Anti-Tank grenades x10</label>
+		<description>Craft 10 british no. 74 sticky bomb anti-tank grenades.</description>
+		<jobString>Making british no. 74 sticky bomb anti-tank grenades.</jobString>
+		<workAmount>4600</workAmount>
+		<researchPrerequisite>K4G_WW2AntiTankEquipment</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>FSX</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<K4G_Weapon_WW2BritishServiceAntiTankGrenadesB>10</K4G_Weapon_WW2BritishServiceAntiTankGrenadesB>
+		</products>
+	</RecipeDef>
+
+	<!-- === German M24 Stielhandgranate Bundle Anti-Tank Grenades === -->
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>K4GWW2_Make_GermanATGrenade</defName>
+		<label>make German M24 Stielhandgranate Bundle Anti-Tank grenades x10</label>
+		<description>Craft 10 german M24 stielhandgranate bundle anti-tank grenades.</description>
+		<jobString>Making german M24 stielhandgranate bundle anti-tank grenades.</jobString>
+		<workAmount>4600</workAmount>
+		<researchPrerequisite>K4G_WW2AntiTankEquipment</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+				<li>FSX</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<K4G_Weapon_WW2GermanServiceAntiTankGrenades>10</K4G_Weapon_WW2GermanServiceAntiTankGrenades>
+		</products>
+	</RecipeDef>
+
+	<!-- === Italian Type L Anti-Tank Grenades === -->
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>K4GWW2_Make_ItalianATGrenade</defName>
+		<label>make Italian Type L Anti-Tank grenades x10</label>
+		<description>Craft 10 italian type L 73 anti-tank grenades.</description>
+		<jobString>Making italian type L 73 anti-tank grenades.</jobString>
+		<workAmount>4200</workAmount>
+		<researchPrerequisite>K4G_WW2AntiTankEquipment</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>FSX</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<K4G_Weapon_WW2ItalianServiceAntiTankGrenades>10</K4G_Weapon_WW2ItalianServiceAntiTankGrenades>
+		</products>
+	</RecipeDef>
+
+	<!-- === Russian RPG-40 Anti-Tank Grenades === -->
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>K4GWW2_Make_RussianATGrenade</defName>
+		<label>make Russian RPG-40 Anti-Tank grenades x10</label>
+		<description>Craft 10 russian RPG-40 anti-tank grenades.</description>
+		<jobString>Making russian RPG-40 anti-tank grenades.</jobString>
+		<workAmount>4200</workAmount>
+		<researchPrerequisite>K4G_WW2AntiTankEquipment</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>FSX</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<K4G_Weapon_WW2RussianServiceAntiTankGrenades>10</K4G_Weapon_WW2RussianServiceAntiTankGrenades>
+		</products>
+	</RecipeDef>
+
+	<!-- === Russian RPG-43 Anti-Tank Grenades === -->
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>K4GWW2_Make_RussianATGrenadeB</defName>
+		<label>make Russian RPG-43 Anti-Tank grenades x10</label>
+		<description>Craft 10 russian RPG-43 anti-tank grenades.</description>
+		<jobString>Making russian RPG-43 anti-tank grenades.</jobString>
+		<workAmount>4400</workAmount>
+		<researchPrerequisite>K4G_WW2AntiTankEquipment</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+				<li>FSX</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<K4G_Weapon_WW2RussianServiceAntiTankGrenadesB>10</K4G_Weapon_WW2RussianServiceAntiTankGrenadesB>
+		</products>
+	</RecipeDef>
+
+	<!-- === Russian RPG-6 Anti-Tank Grenades === -->
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>K4GWW2_Make_RussianATGrenadeC</defName>
+		<label>make Russian RPG-6 Anti-Tank grenades x10</label>
+		<description>Craft 10 russian RPG-6 anti-tank grenades.</description>
+		<jobString>Making russian RPG-6 anti-tank grenades.</jobString>
+		<workAmount>4600</workAmount>
+		<researchPrerequisite>K4G_WW2AntiTankEquipment</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>25</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>FSX</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<K4G_Weapon_WW2RussianServiceAntiTankGrenadesC>10</K4G_Weapon_WW2RussianServiceAntiTankGrenadesC>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FinlandCoBelligerentAllies.xml b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FinlandCoBelligerentAllies.xml
new file mode 100644
index 0000000000..46871a3221
--- /dev/null
+++ b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FinlandCoBelligerentAllies.xml	
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Private & Medic === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2FinnishPrivateCoBelligerentAllies" or defName="K4G_WW2FinnishMedicCoBelligerentAllies"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Rifleman & Infantry === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2FinnishRiflemanCoBelligerentAllies" or
+			defName="K4G_WW2FinnishRiflemanSharedCoBelligerentAllies" or
+			defName="K4G_WW2FinnishInfantryCoBelligerentAllies"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.25</generateChance>
+						<sidearmMoney>
+							<min>75</min>
+							<max>185</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2FinlandMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Machine Gunner === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2FinnishMachineGunnerCoBelligerentAllies" or
+			defName="K4G_WW2FinnishMachineGunnerSharedCoBelligerentAllies"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>85</min>
+							<max>195</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2FinlandMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Sniper === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2FinnishSniperCoBelligerentAllies"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>95</min>
+							<max>195</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2FinlandMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Grenadier === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2FinnishGrenadierCoBelligerentAllies"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>8</min>
+					<max>14</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>25</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2FinlandPistol</li>
+						</weaponTags>
+						<magazineCount>
+							<min>3</min>
+							<max>5</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Anti-Tank === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2FinnishAntiTankCoBelligerentAllies" or defName="K4G_WW2FinnishAntiTankSharedCoBelligerentAllies"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>25</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2FinlandPistol</li>
+						</weaponTags>
+						<magazineCount>
+							<min>3</min>
+							<max>5</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Officers === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2FinnishOfficerCoBelligerentAllies" or
+			defName="K4G_WW2FinnishOfficerSharedCoBelligerentAllies" or
+			defName="K4G_WW2FinnishLogisticsOfficerCoBelligerentAllies" or
+			defName="K4G_WW2FinnishLogisticsOfficerSharedCoBelligerentAllies" or
+			defName="K4G_WW2FinnishLeaderCoBelligerentAllies" or
+			defName="K4G_WW2FinnishLeaderSharedCoBelligerentAllies"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.33</generateChance>
+						<sidearmMoney>
+							<min>20</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2FinlandMelee</li>
+						</weaponTags>
+					</li>
+					<li>
+						<generateChance>0.1</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_FlareLauncher</li>
+						</weaponTags>
+						<magazineCount>
+							<min>2</min>
+							<max>4</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FinlandCoBelligerentGermany.xml b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FinlandCoBelligerentGermany.xml
new file mode 100644
index 0000000000..c80995b23d
--- /dev/null
+++ b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FinlandCoBelligerentGermany.xml	
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Private & Medic === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2FinnishPrivateCoBelligerentGermany" or defName="K4G_WW2FinnishMedicCoBelligerentGermany"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Rifleman & Infantry === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2FinnishRiflemanCoBelligerentGermany" or
+			defName="K4G_WW2FinnishRiflemanSharedCoBelligerentGermany" or
+			defName="K4G_WW2FinnishInfantryCoBelligerentGermany"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.25</generateChance>
+						<sidearmMoney>
+							<min>75</min>
+							<max>185</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2FinlandMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Machine Gunner === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2FinnishMachineGunnerCoBelligerentGermany" or
+			defName="K4G_WW2FinnishMachineGunnerSharedCoBelligerentGermany"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>85</min>
+							<max>195</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2FinlandMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Sniper === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2FinnishSniperCoBelligerentGermany"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>95</min>
+							<max>195</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2FinlandMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Grenadier === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2FinnishGrenadierCoBelligerentGermany"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>8</min>
+					<max>14</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>25</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2FinlandPistol</li>
+						</weaponTags>
+						<magazineCount>
+							<min>3</min>
+							<max>5</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Anti-Tank === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2FinnishAntiTankCoBelligerentGermany" or defName="K4G_WW2FinnishAntiTankSharedCoBelligerentGermany"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>25</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2FinlandPistol</li>
+						</weaponTags>
+						<magazineCount>
+							<min>3</min>
+							<max>5</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Officers === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2FinnishOfficerCoBelligerentGermany" or
+			defName="K4G_WW2FinnishOfficerSharedCoBelligerentGermany" or
+			defName="K4G_WW2FinnishLogisticsOfficerCoBelligerentGermany" or
+			defName="K4G_WW2FinnishLogisticsOfficerSharedCoBelligerentGermany" or
+			defName="K4G_WW2FinnishLeaderCoBelligerentGermany" or
+			defName="K4G_WW2FinnishLeaderSharedCoBelligerentGermany"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.33</generateChance>
+						<sidearmMoney>
+							<min>20</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2FinlandMelee</li>
+						</weaponTags>
+					</li>
+					<li>
+						<generateChance>0.1</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_FlareLauncher</li>
+						</weaponTags>
+						<magazineCount>
+							<min>2</min>
+							<max>4</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FinlandIndependent.xml b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FinlandIndependent.xml
new file mode 100644
index 0000000000..da151b95f1
--- /dev/null
+++ b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FinlandIndependent.xml	
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Private & Medic === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2FinnishPrivateIndependent" or
+			defName="K4G_WW2FinnishPrivateSharedIndependent" or
+			defName="K4G_WW2FinnishMedicIndependent"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Rifleman & Infantry === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2FinnishRiflemanIndependent" or
+			defName="K4G_WW2FinnishRiflemanSharedIndependent" or
+			defName="K4G_WW2FinnishInfantryIndependent" or
+			defName="K4G_WW2FinnishInfantrySharedIndependent"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.25</generateChance>
+						<sidearmMoney>
+							<min>75</min>
+							<max>185</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2FinlandMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Machine Gunner === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2FinnishMachineGunnerIndependent" or
+			defName="K4G_WW2FinnishMachineGunnerSharedIndependent"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>85</min>
+							<max>195</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2FinlandMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Sniper === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2FinnishSniperIndependent" or defName="K4G_WW2FinnishSniperSharedIndependent"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>95</min>
+							<max>195</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2FinlandMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Grenadier === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2FinnishGrenadierIndependent" or defName="K4G_WW2FinnishGrenadierSharedIndependent"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>8</min>
+					<max>14</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>25</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2FinlandPistol</li>
+						</weaponTags>
+						<magazineCount>
+							<min>3</min>
+							<max>5</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Anti-Tank === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2FinnishAntiTankIndependent" or defName="K4G_WW2FinnishAntiTankSharedIndependent"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>25</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2FinlandPistol</li>
+						</weaponTags>
+						<magazineCount>
+							<min>3</min>
+							<max>5</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Officers === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2FinnishOfficerIndependent" or
+			defName="K4G_WW2FinnishOfficerSharedIndependent" or
+			defName="K4G_WW2FinnishLogisticsOfficerIndependent" or
+			defName="K4G_WW2FinnishLogisticsOfficerSharedIndependent" or
+			defName="K4G_WW2FinnishLeaderIndependent" or
+			defName="K4G_WW2FinnishLeaderSharedIndependent"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.33</generateChance>
+						<sidearmMoney>
+							<min>20</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2FinlandMelee</li>
+						</weaponTags>
+					</li>
+					<li>
+						<generateChance>0.1</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_FlareLauncher</li>
+						</weaponTags>
+						<magazineCount>
+							<min>2</min>
+							<max>4</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FranceAllies.xml b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FranceAllies.xml
new file mode 100644
index 0000000000..173d010736
--- /dev/null
+++ b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FranceAllies.xml	
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Private & Medic === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2FrenchPrivateAllies" or
+			defName="K4G_WW2FrenchMedicAllies" or
+			defName="K4G_WW2FrenchPrivateSharedAllies"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Rifleman & Infantry === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2FrenchRiflemanAllies" or
+			defName="K4G_WW2FrenchRiflemanSharedAllies" or
+			defName="K4G_WW2FrenchInfantryAllies" or
+			defName="K4G_WW2FrenchInfantrySharedAllies"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.25</generateChance>
+						<sidearmMoney>
+							<min>75</min>
+							<max>185</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2FranceMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Machine Gunner === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2FrenchMachineGunnerAllies" or
+			defName="K4G_WW2FrenchMachineGunnerSharedAllies"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>85</min>
+							<max>195</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2FranceMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Sniper === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2FrenchSniperSharedAllies"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>95</min>
+							<max>195</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2FranceMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Grenadier === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2FrenchGrenadierAllies"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>8</min>
+					<max>14</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>25</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2FrancePistol</li>
+						</weaponTags>
+						<magazineCount>
+							<min>3</min>
+							<max>5</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Anti-Tank === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2FrenchAntiTankSharedAllies"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>25</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2FrancePistol</li>
+						</weaponTags>
+						<magazineCount>
+							<min>3</min>
+							<max>5</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Officers === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2FrenchOfficerAllies" or
+			defName="K4G_WW2FrenchLogisticsOfficerAllies" or
+			defName="K4G_WW2FrenchLeaderAllies"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.33</generateChance>
+						<sidearmMoney>
+							<min>20</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2FranceMelee</li>
+						</weaponTags>
+					</li>
+					<li>
+						<generateChance>0.1</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_FlareLauncher</li>
+						</weaponTags>
+						<magazineCount>
+							<min>2</min>
+							<max>4</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FranceAxis.xml b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FranceAxis.xml
new file mode 100644
index 0000000000..429af63185
--- /dev/null
+++ b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FranceAxis.xml	
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Private & Medic === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2FrenchPrivateAxis" or
+			defName="K4G_WW2FrenchPrivateSharedAxis" or
+			defName="K4G_WW2FrenchMedicAxis" or
+			defName="K4G_WW2FrenchMedicSharedAxis"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Rifleman & Infantry === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2FrenchRiflemanAxis" or
+			defName="K4G_WW2FrenchRiflemanSharedAxis" or
+			defName="K4G_WW2FrenchInfantryAxis" or
+			defName="K4G_WW2FrenchInfantrySharedAxis"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.25</generateChance>
+						<sidearmMoney>
+							<min>75</min>
+							<max>185</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2FranceMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Machine Gunner === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2FrenchMachineGunnerAxis" or
+			defName="K4G_WW2FrenchMachineGunnerSharedAxis"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>85</min>
+							<max>195</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2FranceMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Sniper === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2FrenchSniperSharedAxis" or defName="K4G_WW2FrenchGrenadierSharedAxis"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>95</min>
+							<max>195</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2FranceMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Grenadier === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2FrenchGrenadierAxis" or
+			defName="K4G_WW2FrenchGrenadierSharedAxis"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>8</min>
+					<max>14</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>25</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2FrancePistol</li>
+						</weaponTags>
+						<magazineCount>
+							<min>3</min>
+							<max>5</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Anti-Tank === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2FrenchAntiTankSharedAxis" or
+			defName="K4G_WW2FrenchAntiTankBSharedAxis"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>25</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2FrancePistol</li>
+						</weaponTags>
+						<magazineCount>
+							<min>3</min>
+							<max>5</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Officers === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2FrenchOfficerAxis" or
+			defName="K4G_WW2FrenchOfficerSharedAxis" or
+			defName="K4G_WW2FrenchOfficerBSharedAxis" or
+			defName="K4G_WW2FrenchLogisticsOfficerAxis" or
+			defName="K4G_WW2FrenchLogisticsOfficerSharedAxis" or
+			defName="K4G_WW2FrenchLogisticsOfficerBSharedAxis" or
+			defName="K4G_WW2FrenchLeaderAxis" or
+			defName="K4G_WW2FrenchLeaderSharedAxis" or
+			defName="K4G_WW2FrenchLeaderBSharedAxis"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.33</generateChance>
+						<sidearmMoney>
+							<min>20</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2FranceMelee</li>
+						</weaponTags>
+					</li>
+					<li>
+						<generateChance>0.1</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_FlareLauncher</li>
+						</weaponTags>
+						<magazineCount>
+							<min>2</min>
+							<max>4</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FranceExile.xml b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FranceExile.xml
new file mode 100644
index 0000000000..bd4f2e6231
--- /dev/null
+++ b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FranceExile.xml	
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Private & Medic === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2FrenchPrivateExile" or
+			defName="K4G_WW2FrenchPrivateSharedExile" or
+			defName="K4G_WW2FrenchMedicExile" or
+			defName="K4G_WW2FrenchMedicSharedExile"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Rifleman & Infantry === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2FrenchRiflemanExile" or
+			defName="K4G_WW2FrenchRiflemanSharedExile" or
+			defName="K4G_WW2FrenchInfantryExile" or
+			defName="K4G_WW2FrenchInfantrySharedExile"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.25</generateChance>
+						<sidearmMoney>
+							<min>75</min>
+							<max>185</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2FranceMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Machine Gunner === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2FrenchMachineGunnerExile" or
+			defName="K4G_WW2FrenchMachineGunnerSharedExile"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>85</min>
+							<max>195</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2FranceMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Sniper === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2FrenchSniperExile" or
+			defName="K4G_WW2FrenchSniperBSharedExile"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>95</min>
+							<max>195</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2FranceMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Grenadier === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2FrenchGrenadierExile" or defName="K4G_WW2FrenchGrenadierSharedExile"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>8</min>
+					<max>14</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>25</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2FrancePistol</li>
+						</weaponTags>
+						<magazineCount>
+							<min>3</min>
+							<max>5</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Anti-Tank === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2FrenchAntiTankSharedExile" or defName="K4G_WW2FrenchAntiTankSharedExile"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>25</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2FrancePistol</li>
+						</weaponTags>
+						<magazineCount>
+							<min>3</min>
+							<max>5</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Officers === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2FrenchOfficerExile" or
+			defName="K4G_WW2FrenchOfficerSharedExile" or
+			defName="K4G_WW2FrenchOfficerBSharedExile" or
+			defName="K4G_WW2FrenchLogisticsOfficerExile" or
+			defName="K4G_WW2FrenchLogisticsOfficerSharedExile" or
+			defName="K4G_WW2FrenchLogisticsOfficerBSharedExile" or
+			defName="K4G_WW2FrenchLeaderExile" or
+			defName="K4G_WW2FrenchLeaderSharedExile" or
+			defName="K4G_WW2FrenchLeaderBSharedExile"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.33</generateChance>
+						<sidearmMoney>
+							<min>20</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2FranceMelee</li>
+						</weaponTags>
+					</li>
+					<li>
+						<generateChance>0.1</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_FlareLauncher</li>
+						</weaponTags>
+						<magazineCount>
+							<min>2</min>
+							<max>4</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_Germany.xml b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_Germany.xml
new file mode 100644
index 0000000000..2054a14516
--- /dev/null
+++ b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_Germany.xml	
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Private & Medic === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2GermanPrivate" or defName="K4G_WW2GermanMedic"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Rifleman & Infantry === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2GermanRifleman" or
+			defName="K4G_WW2GermanRiflemanShared" or
+			defName="K4G_WW2GermanInfantry"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.25</generateChance>
+						<sidearmMoney>
+							<min>75</min>
+							<max>185</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2GermanyMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Machine Gunner === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2GermanMachineGunner" or
+			defName="K4G_WW2GermanMachineGunnerShared"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>85</min>
+							<max>195</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2GermanyMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Sniper === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2GermanSniper"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>95</min>
+							<max>195</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2GermanyMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Grenadier === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2GermanGrenadier"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>8</min>
+					<max>14</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>25</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2GermanyPistol</li>
+						</weaponTags>
+						<magazineCount>
+							<min>3</min>
+							<max>5</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Anti-Tank === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2GermanAntiTank" or defName="K4G_WW2GermanAntiTankShared"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>25</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2GermanyPistol</li>
+						</weaponTags>
+						<magazineCount>
+							<min>3</min>
+							<max>5</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Officers === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2GermanOfficer" or
+			defName="K4G_WW2GermanOfficerB" or
+			defName="K4G_WW2GermanLogisticsOfficer" or
+			defName="K4G_WW2GermanLogisticsOfficerB" or
+			defName="K4G_WW2GermanLeader" or
+			defName="K4G_WW2GermanLeaderB"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>7</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.25</generateChance>
+						<sidearmMoney>
+							<min>20</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2GermanyMelee</li>
+						</weaponTags>
+					</li>
+					<li>
+						<generateChance>0.075</generateChance>
+						<sidearmMoney>
+							<min>10</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_FlareLauncher</li>
+						</weaponTags>
+						<magazineCount>
+							<min>1</min>
+							<max>3</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_ItalyAxis.xml b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_ItalyAxis.xml
new file mode 100644
index 0000000000..c057dab793
--- /dev/null
+++ b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_ItalyAxis.xml	
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Private & Medic === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2ItalianPrivateAxis" or
+			defName="K4G_WW2ItalianMedicAxis" or
+			defName="K4G_WW2ItalianMedicSharedAxis"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Rifleman & Infantry === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2ItalianRiflemanAxis" or
+			defName="K4G_WW2ItalianRiflemanSharedAxis" or
+			defName="K4G_WW2ItalianInfantryAxis"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.25</generateChance>
+						<sidearmMoney>
+							<min>75</min>
+							<max>185</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2ItalyMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Machine Gunner === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2ItalianMachineGunnerAxis" or
+			defName="K4G_WW2ItalianMachineGunnerSharedAxis"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>85</min>
+							<max>195</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2ItalyMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Sniper === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2ItalianSniperSharedAxis"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>95</min>
+							<max>195</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2ItalyMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Grenadier === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2ItalianGrenadierAxis"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>8</min>
+					<max>14</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>25</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2ItalyPistol</li>
+						</weaponTags>
+						<magazineCount>
+							<min>3</min>
+							<max>5</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Anti-Tank === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2ItalianAntiTankSharedAxis"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>25</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2ItalyPistol</li>
+						</weaponTags>
+						<magazineCount>
+							<min>3</min>
+							<max>5</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Officers === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2ItalianOfficerAxis" or
+			defName="K4G_WW2ItalianOfficerSharedAxis" or
+			defName="K4G_WW2ItalianOfficerBAxis" or
+			defName="K4G_WW2ItalianOfficerBSharedAxis" or
+			defName="K4G_WW2ItalianLogisticsOfficerAxis" or
+			defName="K4G_WW2ItalianLogisticsOfficerSharedAxis" or
+			defName="K4G_WW2ItalianLogisticsOfficerBAxis" or
+			defName="K4G_WW2ItalianLogisticsOfficerBSharedAxis" or
+			defName="K4G_WW2ItalianLeaderAxis" or
+			defName="K4G_WW2ItalianLeaderSharedAxis" or
+			defName="K4G_WW2ItalianLeaderBAxis" or
+			defName="K4G_WW2ItalianLeaderBSharedAxis"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.33</generateChance>
+						<sidearmMoney>
+							<min>20</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2ItalyMelee</li>
+						</weaponTags>
+					</li>
+					<li>
+						<generateChance>0.1</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_FlareLauncher</li>
+						</weaponTags>
+						<magazineCount>
+							<min>2</min>
+							<max>4</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_ItalyAxisB.xml b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_ItalyAxisB.xml
new file mode 100644
index 0000000000..af81e8c0a5
--- /dev/null
+++ b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_ItalyAxisB.xml	
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Private & Medic === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2ItalianPrivateAxisB" or
+			defName="K4G_WW2ItalianMedicAxisB" or
+			defName="K4G_WW2ItalianMedicSharedAxisB"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Rifleman & Infantry === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2ItalianRiflemanAxisB" or
+			defName="K4G_WW2ItalianRiflemanSharedAxisB" or
+			defName="K4G_WW2ItalianInfantryAxisB"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.25</generateChance>
+						<sidearmMoney>
+							<min>75</min>
+							<max>185</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2ItalyMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Machine Gunner === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2ItalianMachineGunnerAxisB" or
+			defName="K4G_WW2ItalianMachineGunnerSharedAxisB"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>85</min>
+							<max>195</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2ItalyMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Sniper === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2ItalianSniperSharedAxisB"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>95</min>
+							<max>195</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2ItalyMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Grenadier === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2ItalianGrenadierAxisB"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>8</min>
+					<max>14</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>25</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2ItalyPistol</li>
+						</weaponTags>
+						<magazineCount>
+							<min>3</min>
+							<max>5</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Anti-Tank === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2ItalianAntiTankSharedAxisB"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>25</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2ItalyPistol</li>
+						</weaponTags>
+						<magazineCount>
+							<min>3</min>
+							<max>5</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Officers === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2ItalianOfficerAxisB" or
+			defName="K4G_WW2ItalianOfficerSharedAxisB" or
+			defName="K4G_WW2ItalianOfficerBAxisB" or
+			defName="K4G_WW2ItalianOfficerBSharedAxisB" or
+			defName="K4G_WW2ItalianLogisticsOfficerAxisB" or
+			defName="K4G_WW2ItalianLogisticsOfficerSharedAxisB" or
+			defName="K4G_WW2ItalianLogisticsOfficerBAxisB" or
+			defName="K4G_WW2ItalianLogisticsOfficerBSharedAxisB" or
+			defName="K4G_WW2ItalianLeaderAxisB" or
+			defName="K4G_WW2ItalianLeaderSharedAxisB" or
+			defName="K4G_WW2ItalianLeaderBAxisB" or
+			defName="K4G_WW2ItalianLeaderBSharedAxisB"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.33</generateChance>
+						<sidearmMoney>
+							<min>20</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2ItalyMelee</li>
+						</weaponTags>
+					</li>
+					<li>
+						<generateChance>0.1</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_FlareLauncher</li>
+						</weaponTags>
+						<magazineCount>
+							<min>2</min>
+							<max>4</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_ItalyCoBelligerentAllies.xml b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_ItalyCoBelligerentAllies.xml
new file mode 100644
index 0000000000..c828d575e8
--- /dev/null
+++ b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_ItalyCoBelligerentAllies.xml	
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Private & Medic === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2ItalianPrivateCoBelligerentAllies" or defName="K4G_WW2ItalianMedicCoBelligerentAllies"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Rifleman & Infantry === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2ItalianRiflemanCoBelligerentAllies" or
+			defName="K4G_WW2ItalianRiflemanSharedCoBelligerentAllies" or
+			defName="K4G_WW2ItalianInfantryCoBelligerentAllies" or
+			defName="K4G_WW2ItalianInfantrySharedCoBelligerentAllies"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.25</generateChance>
+						<sidearmMoney>
+							<min>75</min>
+							<max>185</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2ItalyMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Machine Gunner === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2ItalianMachineGunnerCoBelligerentAllies" or
+			defName="K4G_WW2ItalianMachineGunnerSharedCoBelligerentAllies"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>85</min>
+							<max>195</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2ItalyMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Sniper === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2ItalianSniperSharedCoBelligerentAllies"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>95</min>
+							<max>195</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2ItalyMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Grenadier === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2ItalianGrenadierCoBelligerentAllies"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>8</min>
+					<max>14</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>25</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2ItalyPistol</li>
+						</weaponTags>
+						<magazineCount>
+							<min>3</min>
+							<max>5</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Anti-Tank === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2ItalianAntiTankCoBelligerentAllies"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>25</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2ItalyPistol</li>
+						</weaponTags>
+						<magazineCount>
+							<min>3</min>
+							<max>5</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Officers === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2ItalianOfficerCoBelligerentAllies" or
+			defName="K4G_WW2ItalianOfficerBCoBelligerentAllies" or
+			defName="K4G_WW2ItalianLogisticsOfficerCoBelligerentAllies" or
+			defName="K4G_WW2ItalianLogisticsOfficerBCoBelligerentAllies" or
+			defName="K4G_WW2ItalianLeaderCoBelligerentAllies" or
+			defName="K4G_WW2ItalianLeaderBCoBelligerentAllies"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.33</generateChance>
+						<sidearmMoney>
+							<min>20</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2ItalyMelee</li>
+						</weaponTags>
+					</li>
+					<li>
+						<generateChance>0.1</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_FlareLauncher</li>
+						</weaponTags>
+						<magazineCount>
+							<min>2</min>
+							<max>4</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_Japan.xml b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_Japan.xml
new file mode 100644
index 0000000000..cb220a0ff0
--- /dev/null
+++ b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_Japan.xml	
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Private & Medic === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2JapanesePrivate" or defName="K4G_WW2JapaneseMedic"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Rifleman & Infantry === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2JapaneseRifleman" or
+			defName="K4G_WW2JapaneseRiflemanShared" or
+			defName="K4G_WW2JapaneseInfantry"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.25</generateChance>
+						<sidearmMoney>
+							<min>75</min>
+							<max>185</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2JapanMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Machine Gunner === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2JapaneseMachineGunner" or
+			defName="K4G_WW2JapaneseMachineGunnerShared"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>85</min>
+							<max>195</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2JapanMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Sniper === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2JapaneseSniper"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>95</min>
+							<max>195</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2JapanMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Grenadier === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2JapaneseGrenadier"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>8</min>
+					<max>14</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>25</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2JapanPistol</li>
+						</weaponTags>
+						<magazineCount>
+							<min>3</min>
+							<max>5</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Anti-Tank === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2JapaneseAntiTank" or defName="K4G_WW2JapaneseAntiTankShared"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>25</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2JapanPistol</li>
+						</weaponTags>
+						<magazineCount>
+							<min>3</min>
+							<max>5</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Officers === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2JapaneseOfficer" or
+			defName="K4G_WW2JapaneseOfficerB" or
+			defName="K4G_WW2JapaneseLogisticsOfficer" or
+			defName="K4G_WW2JapaneseLogisticsOfficerB" or
+			defName="K4G_WW2JapaneseLeader" or
+			defName="K4G_WW2JapaneseLeaderB"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>7</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.25</generateChance>
+						<sidearmMoney>
+							<min>20</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2JapanMelee</li>
+						</weaponTags>
+					</li>
+					<li>
+						<generateChance>0.075</generateChance>
+						<sidearmMoney>
+							<min>80</min>
+							<max>160</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_FlareLauncher</li>
+						</weaponTags>
+						<magazineCount>
+							<min>1</min>
+							<max>3</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_RussiaAllies.xml b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_RussiaAllies.xml
new file mode 100644
index 0000000000..82fd726ad1
--- /dev/null
+++ b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_RussiaAllies.xml	
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Private & Medic === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2RussianPrivateAllies" or defName="K4G_WW2RussianMedicAllies"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Rifleman & Infantry === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2RussianRiflemanAllies" or
+			defName="K4G_WW2RussianRiflemanSharedAllies" or
+			defName="K4G_WW2RussianInfantryAllies"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.25</generateChance>
+						<sidearmMoney>
+							<min>75</min>
+							<max>185</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2RussiaMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Machine Gunner === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2RussianMachineGunnerAllies" or
+			defName="K4G_WW2RussianMachineGunnerSharedAllies"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>85</min>
+							<max>195</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2RussiaMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Sniper === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2RussianSniperAllies"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>95</min>
+							<max>195</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2RussiaMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Grenadier === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2RussianGrenadierAllies"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>8</min>
+					<max>14</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>25</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2RussiaPistol</li>
+						</weaponTags>
+						<magazineCount>
+							<min>3</min>
+							<max>5</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Anti-Tank === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2RussianAntiTankAllies" or defName="K4G_WW2RussianAntiTankSharedAllies"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>25</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2RussiaPistol</li>
+						</weaponTags>
+						<magazineCount>
+							<min>3</min>
+							<max>5</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Officers === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2RussianOfficerAllies" or
+			defName="K4G_WW2RussianOfficerBAllies" or
+			defName="K4G_WW2RussianOfficerCAllies" or
+			defName="K4G_WW2RussianLogisticsOfficerAllies" or
+			defName="K4G_WW2RussianLogisticsOfficerBAllies" or
+			defName="K4G_WW2RussianLogisticsOfficerCAllies" or
+			defName="K4G_WW2RussianLeaderAllies" or
+			defName="K4G_WW2RussianLeaderBAllies" or
+			defName="K4G_WW2RussianLeaderCAllies"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.33</generateChance>
+						<sidearmMoney>
+							<min>20</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2RussiaMelee</li>
+						</weaponTags>
+					</li>
+					<li>
+						<generateChance>0.1</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_FlareLauncher</li>
+						</weaponTags>
+						<magazineCount>
+							<min>2</min>
+							<max>4</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_RussiaCoBelligerentGermany.xml b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_RussiaCoBelligerentGermany.xml
new file mode 100644
index 0000000000..a294ac10ae
--- /dev/null
+++ b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_RussiaCoBelligerentGermany.xml	
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Private & Medic === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2RussianPrivateCoBelligerentGermany" or defName="K4G_WW2RussianMedicCoBelligerentGermany"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Rifleman & Infantry === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2RussianRiflemanCoBelligerentGermany" or
+			defName="K4G_WW2RussianRiflemanSharedCoBelligerentGermany" or
+			defName="K4G_WW2RussianInfantryCoBelligerentGermany"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.25</generateChance>
+						<sidearmMoney>
+							<min>75</min>
+							<max>185</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2RussiaMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Machine Gunner === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2RussianMachineGunnerCoBelligerentGermany" or
+			defName="K4G_WW2RussianMachineGunnerSharedCoBelligerentGermany"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>85</min>
+							<max>195</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2RussiaMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Sniper === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2RussianSniperCoBelligerentGermany"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>95</min>
+							<max>195</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2RussiaMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Grenadier === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2RussianGrenadierCoBelligerentGermany"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>8</min>
+					<max>14</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>25</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2RussiaPistol</li>
+						</weaponTags>
+						<magazineCount>
+							<min>3</min>
+							<max>5</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Anti-Tank === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2RussianAntiTankCoBelligerentGermany" or defName="K4G_WW2RussianAntiTankSharedCoBelligerentGermany"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>25</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2RussiaPistol</li>
+						</weaponTags>
+						<magazineCount>
+							<min>3</min>
+							<max>5</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Officers === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2RussianOfficerCoBelligerentGermany" or
+			defName="K4G_WW2RussianOfficerBCoBelligerentGermany" or
+			defName="K4G_WW2RussianOfficerCCoBelligerentGermany" or
+			defName="K4G_WW2RussianLogisticsOfficerCoBelligerentGermany" or
+			defName="K4G_WW2RussianLogisticsOfficerBCoBelligerentGermany" or
+			defName="K4G_WW2RussianLogisticsOfficerCCoBelligerentGermany" or
+			defName="K4G_WW2RussianLeaderCoBelligerentGermany" or
+			defName="K4G_WW2RussianLeaderBCoBelligerentGermany" or
+			defName="K4G_WW2RussianLeaderCCoBelligerentGermany"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.33</generateChance>
+						<sidearmMoney>
+							<min>20</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2RussiaMelee</li>
+						</weaponTags>
+					</li>
+					<li>
+						<generateChance>0.1</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_FlareLauncher</li>
+						</weaponTags>
+						<magazineCount>
+							<min>2</min>
+							<max>4</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_UnitedKingdom.xml b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_UnitedKingdom.xml
new file mode 100644
index 0000000000..0fe3886172
--- /dev/null
+++ b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_UnitedKingdom.xml	
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Private & Medic === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2BritishPrivate" or defName="K4G_WW2BritishMedic"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Rifleman & Infantry === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2BritishRifleman" or
+			defName="K4G_WW2BritishRiflemanShared" or
+			defName="K4G_WW2BritishInfantry"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.25</generateChance>
+						<sidearmMoney>
+							<min>75</min>
+							<max>185</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2UnitedKingdomMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Machine Gunner === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2BritishMachineGunner" or
+			defName="K4G_WW2BritishMachineGunnerShared"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>85</min>
+							<max>195</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2UnitedKingdomMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Sniper === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2BritishSniper"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>95</min>
+							<max>195</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2UnitedKingdomMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Grenadier === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2BritishGrenadier"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>8</min>
+					<max>14</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>25</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2UnitedKingdomPistol</li>
+						</weaponTags>
+						<magazineCount>
+							<min>3</min>
+							<max>5</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Anti-Tank === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2BritishAntiTank" or defName="K4G_WW2BritishAntiTankShared"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>25</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2UnitedKingdomPistol</li>
+						</weaponTags>
+						<magazineCount>
+							<min>3</min>
+							<max>5</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Officers === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2BritishOfficer" or
+			defName="K4G_WW2BritishOfficerB" or
+			defName="K4G_WW2BritishLogisticsOfficer" or
+			defName="K4G_WW2BritishLogisticsOfficerB" or
+			defName="K4G_WW2BritishLeader" or
+			defName="K4G_WW2BritishLeaderB"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.33</generateChance>
+						<sidearmMoney>
+							<min>20</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2UnitedStatesMelee</li>
+						</weaponTags>
+					</li>
+					<li>
+						<generateChance>0.1</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_FlareLauncher</li>
+						</weaponTags>
+						<magazineCount>
+							<min>2</min>
+							<max>4</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_UnitedStates.xml b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_UnitedStates.xml
new file mode 100644
index 0000000000..a1abc61502
--- /dev/null
+++ b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_UnitedStates.xml	
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Private & Medic === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2AmericanPrivate" or defName="K4G_WW2AmericanMedic"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Rifleman & Infantry === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2AmericanRifleman" or
+			defName="K4G_WW2AmericanRiflemanShared" or
+			defName="K4G_WW2AmericanInfantry"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.25</generateChance>
+						<sidearmMoney>
+							<min>75</min>
+							<max>185</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2UnitedStatesMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Machine Gunner === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2AmericanMachineGunner" or
+			defName="K4G_WW2AmericanMachineGunnerShared"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>85</min>
+							<max>195</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2UnitedStatesMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Sniper === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2AmericanSniper"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>95</min>
+							<max>195</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2UnitedStatesMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Grenadier === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2AmericanGrenadier"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>8</min>
+					<max>14</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>25</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2UnitedStatesPistol</li>
+						</weaponTags>
+						<magazineCount>
+							<min>3</min>
+							<max>5</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Anti-Tank === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="K4G_WW2AmericanAntiTank" or defName="K4G_WW2AmericanAntiTankShared"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>25</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2UnitedStatesPistol</li>
+						</weaponTags>
+						<magazineCount>
+							<min>3</min>
+							<max>5</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Officers === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="K4G_WW2AmericanOfficer" or
+			defName="K4G_WW2AmericanOfficerB" or
+			defName="K4G_WW2AmericanLogisticsOfficer" or
+			defName="K4G_WW2AmericanLogisticsOfficerB" or
+			defName="K4G_WW2AmericanLeader" or
+			defName="K4G_WW2AmericanLeaderB"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.33</generateChance>
+						<sidearmMoney>
+							<min>20</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>K4GWW2UnitedStatesMelee</li>
+						</weaponTags>
+					</li>
+					<li>
+						<generateChance>0.1</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_FlareLauncher</li>
+						</weaponTags>
+						<magazineCount>
+							<min>2</min>
+							<max>4</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_WW2Base.xml b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_WW2Base.xml
new file mode 100644
index 0000000000..5cfe1cf319
--- /dev/null
+++ b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_WW2Base.xml	
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Assign SoldierBase some ammo. -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="WW2SoldierBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ResearchProjectDefs/ResearchProjects.xml b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ResearchProjectDefs/ResearchProjects.xml
new file mode 100644
index 0000000000..8cd4b17fd8
--- /dev/null
+++ b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ResearchProjectDefs/ResearchProjects.xml	
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ResearchProjectDef[defName="K4G_WW2AntiTankEquipment"]/prerequisites</xpath>
+		<value>
+			<li>CE_Launchers</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/Scenarios/Scenarios_Classic.xml b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/Scenarios/Scenarios_Classic.xml
new file mode 100644
index 0000000000..e9020ba8c7
--- /dev/null
+++ b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/Scenarios/Scenarios_Classic.xml	
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="K4G_WW2NewAllies" or defName="K4G_WW2NewAxis"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_303British_FMJ</thingDef>
+				<count>150</count>
+			</li>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_44Magnum_FMJ</thingDef>
+				<count>60</count>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ThingDefs_Misc/BaseWeapons.xml b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ThingDefs_Misc/BaseWeapons.xml
new file mode 100644
index 0000000000..02c4b30357
--- /dev/null
+++ b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ThingDefs_Misc/BaseWeapons.xml	
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Remove Vanilla Verbs ========== -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			@Name="WW2ServiceRevolver" or
+			@Name="WW2ServicePistol" or
+			@Name="WW2ServiceSemiAutomaticPistol" or
+			@Name="WW2ServiceRifle" or
+			@Name="WW2ServiceSemiAutomaticRifle" or
+			@Name="WW2ServiceCarbine" or
+			@Name="WW2ServiceShotgun" or
+			@Name="WW2ServiceSMG" or
+			@Name="WW2ServiceLMG" or
+			@Name="WW2ServiceAutomaticRifle" or
+			@Name="WW2ServiceSniperRifle" or
+			@Name="WW2ServiceSemiAutomaticSniperRifle" or
+			@Name="WW2ServiceAntiTankRifle"
+			]/verbs</xpath>
+	</Operation>
+
+	<!-- ========== One-handed Weapons ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			@Name="WW2ServiceRevolver" or
+			@Name="WW2SingleShotPistol" or
+			@Name="WW2ServicePistol" or
+			@Name="WW2ServiceSemiAutomaticPistol"
+			]</xpath>
+		<value>
+			<weaponTags>
+				<li>CE_OneHandedWeapon</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+	<!-- ========== Melee Tools ========== -->
+
+	<!-- Handguns -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			@Name="WW2ServiceRevolver" or
+			@Name="WW2SingleShotPistol" or
+			@Name="WW2ServicePistol" or
+			@Name="WW2ServiceSemiAutomaticPistol"
+			]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Rifles -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			@Name="WW2ServiceRifle" or
+			@Name="WW2ServiceSemiAutomaticRifle" or
+			@Name="WW2ServiceSMG" or
+			@Name="WW2ServiceLMG" or
+			@Name="WW2ServiceCarbine" or
+			@Name="WW2ServiceShotgun" or
+			@Name="WW2ServiceAutomaticRifle" or
+			@Name="WW2ServiceSniperRifle" or
+			@Name="WW2ServiceSemiAutomaticSniperRifle"
+			]/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>
+
+	<!-- Rifles (Bayonet)-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			@Name="WW2ServiceRifleBayonet" or
+			@Name="WW2ServiceSemiAutomaticRifleBayonet" or
+			@Name="WW2ServiceShotgunBayonet"
+			]/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>bayonet</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>2.14</cooldownTime>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>bayonet</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.49</cooldownTime>
+					<armorPenetrationBlunt>2.16</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.44</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Heavy Weapons -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WW2ServiceAntiTankRifle"]/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>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ThingDefs_Misc/BritishWeapons_Ranged.xml b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ThingDefs_Misc/BritishWeapons_Ranged.xml
new file mode 100644
index 0000000000..2f7a554aef
--- /dev/null
+++ b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ThingDefs_Misc/BritishWeapons_Ranged.xml	
@@ -0,0 +1,433 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Melee Tools ========== -->
+
+	<!-- Heavy Weapons -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceRocketLauncher"]/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>
+
+	<!-- ========== Weapons ========== -->
+
+	<!-- Webley Mk VI -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceRevolver"]</xpath>
+		<value>
+			<statBases>
+				<SightsEfficiency>0.7</SightsEfficiency>
+				<ShotSpread>0.18</ShotSpread>
+				<SwayFactor>1.2</SwayFactor>
+				<Bulk>2.2</Bulk>
+				<Mass>1.1</Mass>
+				<RangedWeapon_Cooldown>0.50</RangedWeapon_Cooldown>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.57</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_455Webley_FMJ</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<range>12</range>
+					<soundCast>Shot_Revolver</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>6</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_455Webley</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- Enfield No. 2 Revolver -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceRevolverB"]</xpath>
+		<value>
+			<statBases>
+				<SightsEfficiency>0.7</SightsEfficiency>
+				<ShotSpread>0.18</ShotSpread>
+				<SwayFactor>1.2</SwayFactor>
+				<Bulk>2.2</Bulk>
+				<Mass>1.1</Mass>
+				<RangedWeapon_Cooldown>0.50</RangedWeapon_Cooldown>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.62</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_38SW_FMJ</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<range>12</range>
+					<soundCast>Shot_Revolver</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>6</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_38SW</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- Lee Enfield No. 4 Mk I-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceRifle"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.19</Mass>
+				<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+				<SightsEfficiency>1</SightsEfficiency>
+				<ShotSpread>0.02</ShotSpread>
+				<SwayFactor>1.68</SwayFactor>
+				<Bulk>12.60</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.04</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>55</range>
+					<soundCast>Shot_BoltActionRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>10</magazineSize>
+					<reloadTime>4.3</reloadTime>
+					<ammoSet>AmmoSet_303British</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- Lee Enfield No. 4 Mk I with Bayonet-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceRifleBayonet"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.30</Mass>
+				<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+				<SightsEfficiency>1</SightsEfficiency>
+				<ShotSpread>0.02</ShotSpread>
+				<SwayFactor>1.74</SwayFactor>
+				<Bulk>12.80</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.03</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>55</range>
+					<soundCast>Shot_BoltActionRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>10</magazineSize>
+					<reloadTime>4.3</reloadTime>
+					<ammoSet>AmmoSet_303British</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- Lanchester SMG -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceSMG"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.3</Mass>
+				<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.14</ShotSpread>
+				<SwayFactor>1.21</SwayFactor>
+				<Bulk>8.43</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>0.95</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<range>24</range>
+					<burstShotCount>5</burstShotCount>
+					<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+					<soundCast>Shot_HeavySMG</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>32</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>Snapshot</aiAimMode>
+					<aimedBurstShotCount>4</aimedBurstShotCount>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- Sten Mk II SMG -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceSMGB"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.3</Mass>
+				<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.16</ShotSpread>
+				<SwayFactor>0.80</SwayFactor>
+				<Bulk>8.43</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>0.95</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<range>24</range>
+					<burstShotCount>5</burstShotCount>
+					<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+					<soundCast>Shot_HeavySMG</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>32</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>Snapshot</aiAimMode>
+					<aimedBurstShotCount>4</aimedBurstShotCount>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- Bren Mk IV LMG -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceLMG"]</xpath>
+		<value>
+			<statBases>
+				<Mass>8.7</Mass>
+				<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+				<SightsEfficiency>1</SightsEfficiency>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.37</SwayFactor>
+				<Bulk>12.9</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.38</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
+					<warmupTime>1.3</warmupTime>
+					<range>62</range>
+					<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+					<burstShotCount>10</burstShotCount>
+					<soundCast>Shot_CE_BattleRifle</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<recoilPattern>Mounted</recoilPattern>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>50</magazineSize>
+					<reloadTime>4.9</reloadTime>
+					<ammoSet>AmmoSet_303British</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aimedBurstShotCount>5</aimedBurstShotCount>
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>SuppressFire</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceLMG"]/weaponTags</xpath>
+		<value>
+			<li>Bipod_LMG</li>
+		</value>
+	</Operation>
+
+	<!-- Lee Enfield No. 4 Mk I (T) Sniper Rifle -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceSniperRifle"]</xpath>
+		<value>
+			<statBases>
+				<Mass>5.19</Mass>
+				<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+				<SightsEfficiency>2.21</SightsEfficiency>
+				<ShotSpread>0.02</ShotSpread>
+				<SwayFactor>1.68</SwayFactor>
+				<Bulk>12.60</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
+					<warmupTime>1.27</warmupTime>
+					<range>75</range>
+					<soundCast>Shot_BoltActionRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>10</magazineSize>
+					<reloadOneAtATime>True</reloadOneAtATime>
+					<reloadTime>0.85</reloadTime>
+					<ammoSet>AmmoSet_303British</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- PIAT -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>K4G_Gun_WW2BritishServiceRocketLauncher</defName>
+		<statBases>
+			<Mass>15.00</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>2.49</SwayFactor>
+			<Bulk>10.90</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_83mmPIATGrenade_HEAT</defaultProjectile>
+			<warmupTime>1.9</warmupTime>
+			<range>20</range>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>5.6</reloadTime>
+			<ammoSet>AmmoSet_83mmPIATGrenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- Boys Anti-Tank Rifle -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceAntiTankRifle"]</xpath>
+		<value>
+			<statBases>
+				<SightsEfficiency>1.0</SightsEfficiency>
+				<ShotSpread>0.01</ShotSpread>
+				<SwayFactor>2.89</SwayFactor>
+				<Bulk>22.0</Bulk>
+				<Mass>20.30</Mass>
+				<RangedWeapon_Cooldown>0.58</RangedWeapon_Cooldown>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_55Boys_FMJ</defaultProjectile>
+					<warmupTime>2.8</warmupTime>
+					<range>62</range>
+					<soundCast>HeavyMG</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>5</magazineSize>
+					<reloadTime>4.3</reloadTime>
+					<ammoSet>AmmoSet_55Boys</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceAntiTankRifle"]/weaponTags</xpath>
+		<value>
+			<li>Bipod_ATR</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ThingDefs_Misc/FinnishWeapons_Ranged.xml b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ThingDefs_Misc/FinnishWeapons_Ranged.xml
new file mode 100644
index 0000000000..75a325badc
--- /dev/null
+++ b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ThingDefs_Misc/FinnishWeapons_Ranged.xml	
@@ -0,0 +1,530 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Weapons ========== -->
+
+	<!-- Finnish Lahti L-35 Pistol -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FinnishServicePistol"]</xpath>
+		<value>
+			<statBases>
+				<Mass>0.87</Mass>
+				<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+				<SightsEfficiency>0.7</SightsEfficiency>
+				<ShotSpread>0.16</ShotSpread>
+				<SwayFactor>1.07</SwayFactor>
+				<Bulk>1.9</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.57</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+					<warmupTime>0.5</warmupTime>
+					<range>12</range>
+					<soundCast>Shot_Autopistol</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>8</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- Finnish Mosin Nagant M/27 Rifle -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceRifleB"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.00</Mass>
+				<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.68</SwayFactor>
+				<Bulk>12.32</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.04</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>55</range>
+					<soundCast>Shot_BoltActionRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>5</magazineSize>
+					<reloadTime>4.3</reloadTime>
+					<ammoSet>AmmoSet_762x54mmR</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- Finnish Mosin Nagant M/39 Rifle -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceRifleC"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.00</Mass>
+				<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.63</SwayFactor>
+				<Bulk>12.32</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.04</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>55</range>
+					<soundCast>Shot_BoltActionRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>5</magazineSize>
+					<reloadTime>4.3</reloadTime>
+					<ammoSet>AmmoSet_762x54mmR</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- Finnish Mosin Nagant Rifle M/91 (Bayonet) -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceRifleBayonet"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.2</Mass>
+				<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.68</SwayFactor>
+				<Bulk>12.5</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>55</range>
+					<soundCast>Shot_BoltActionRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>5</magazineSize>
+					<reloadTime>4.3</reloadTime>
+					<ammoSet>AmmoSet_762x54mmR</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- Finnish Mosin Nagant Rifle M/27 (Bayonet) -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceRifleBayonetB"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.2</Mass>
+				<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.68</SwayFactor>
+				<Bulk>12.5</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>55</range>
+					<soundCast>Shot_BoltActionRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>5</magazineSize>
+					<reloadTime>4.3</reloadTime>
+					<ammoSet>AmmoSet_762x54mmR</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- Finnish Mosin Nagant M/39 Rifle (Bayonet) -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceRifleBayonetC"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.2</Mass>
+				<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.68</SwayFactor>
+				<Bulk>12.5</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>55</range>
+					<soundCast>Shot_BoltActionRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>5</magazineSize>
+					<reloadTime>4.3</reloadTime>
+					<ammoSet>AmmoSet_762x54mmR</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- Finnish Suomi KP/-31 SMG -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceSMG"]</xpath>
+		<value>
+			<statBases>
+				<Mass>3.63</Mass>
+				<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.14</ShotSpread>
+				<SwayFactor>1.21</SwayFactor>
+				<Bulk>8.43</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.22</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<range>23</range>
+					<burstShotCount>6</burstShotCount>
+					<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+					<soundCast>Shot_HeavySMG</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>71</magazineSize>
+					<reloadTime>4.9</reloadTime>
+					<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>Snapshot</aiAimMode>
+					<aimedBurstShotCount>3</aimedBurstShotCount>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- Finnish KP m/44 SMG -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceSMGB"]</xpath>
+		<value>
+			<statBases>
+				<Mass>3.9</Mass>
+				<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.14</ShotSpread>
+				<SwayFactor>1.21</SwayFactor>
+				<Bulk>7</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>0.8</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<range>23</range>
+					<burstShotCount>6</burstShotCount>
+					<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+					<soundCast>Shot_HeavySMG</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>36</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>Snapshot</aiAimMode>
+					<aimedBurstShotCount>3</aimedBurstShotCount>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= Finnish Lahti-Saloranta M/26 LMG ======= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceLMG"]</xpath>
+		<value>
+			<statBases>
+				<Mass>8.72</Mass>
+				<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+				<SightsEfficiency>1</SightsEfficiency>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.43</SwayFactor>
+				<Bulk>14.3</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.32</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+					<warmupTime>1.3</warmupTime>
+					<range>62</range>
+					<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+					<burstShotCount>5</burstShotCount>
+					<soundCast>Shot_Minigun</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<recoilPattern>Mounted</recoilPattern>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>20</magazineSize>
+					<reloadTime>4.3</reloadTime>
+					<ammoSet>AmmoSet_762x54mmR</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aimedBurstShotCount>5</aimedBurstShotCount>
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>SuppressFire</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceLMG"]/weaponTags</xpath>
+		<value>
+			<li>Bipod_LMG</li>
+		</value>
+	</Operation>
+
+	<!-- Finnish Mosin Nagant M/91 Sniper Rifle -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceSniperRifle"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.1</Mass>
+				<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+				<SightsEfficiency>2.3</SightsEfficiency>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.53</SwayFactor>
+				<Bulk>11.00</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.1</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+					<warmupTime>1.5</warmupTime>
+					<range>75</range>
+					<soundCast>Shot_BoltActionRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>5</magazineSize>
+					<reloadOneAtATime>True</reloadOneAtATime>
+					<reloadTime>0.85</reloadTime>
+					<ammoSet>AmmoSet_762x54mmR</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- Finnish Mosin Nagant M/27 Sniper Rifle -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceSniperRifleB"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.1</Mass>
+				<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+				<SightsEfficiency>2.3</SightsEfficiency>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.53</SwayFactor>
+				<Bulk>11.00</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.1</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+					<warmupTime>1.5</warmupTime>
+					<range>75</range>
+					<soundCast>Shot_BoltActionRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>5</magazineSize>
+					<reloadOneAtATime>True</reloadOneAtATime>
+					<reloadTime>0.85</reloadTime>
+					<ammoSet>AmmoSet_762x54mmR</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- Finnish Mosin Nagant M/39 Sniper Rifle -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceSniperRifleC"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.1</Mass>
+				<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+				<SightsEfficiency>2.3</SightsEfficiency>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.48</SwayFactor>
+				<Bulk>11.00</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.1</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+					<warmupTime>1.5</warmupTime>
+					<range>75</range>
+					<soundCast>Shot_BoltActionRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>5</magazineSize>
+					<reloadOneAtATime>True</reloadOneAtATime>
+					<reloadTime>0.85</reloadTime>
+					<ammoSet>AmmoSet_762x54mmR</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= Finnish Lahti L-39 Anti-Tank Rifle ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceAntiTankRifle"]</xpath>
+		<value>
+			<statBases>
+				<SightsEfficiency>1.0</SightsEfficiency>
+				<ShotSpread>0.01</ShotSpread>
+				<SwayFactor>2.79</SwayFactor>
+				<Bulk>24.0</Bulk>
+				<Mass>20.80</Mass>
+				<RangedWeapon_Cooldown>0.58</RangedWeapon_Cooldown>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.52</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_20x138mmB_AP</defaultProjectile>
+					<warmupTime>2.8</warmupTime>
+					<range>62</range>
+					<soundCast>HeavyMG</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>10</magazineSize>
+					<reloadTime>4.7</reloadTime>
+					<ammoSet>AmmoSet_20x138mmB</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ThingDefs_Misc/FrenchWeapons_Ranged.xml b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ThingDefs_Misc/FrenchWeapons_Ranged.xml
new file mode 100644
index 0000000000..34e4a95c61
--- /dev/null
+++ b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ThingDefs_Misc/FrenchWeapons_Ranged.xml	
@@ -0,0 +1,491 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- French MAS 1873 Revolver -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceRevolver"]</xpath>
+		<value>
+			<statBases>
+				<SightsEfficiency>0.7</SightsEfficiency>
+				<ShotSpread>0.18</ShotSpread>
+				<SwayFactor>1.2</SwayFactor>
+				<Bulk>2.2</Bulk>
+				<Mass>1.1</Mass>
+				<RangedWeapon_Cooldown>0.50</RangedWeapon_Cooldown>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.57</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_765x20mmLongue_FMJ</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<range>12</range>
+					<soundCast>Shot_Revolver</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>6</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_765x20mmLongue</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- French Model 1892 Revolver -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceRevolverB"]</xpath>
+		<value>
+			<statBases>
+				<SightsEfficiency>0.7</SightsEfficiency>
+				<ShotSpread>0.18</ShotSpread>
+				<SwayFactor>1.2</SwayFactor>
+				<Bulk>2.2</Bulk>
+				<Mass>1.1</Mass>
+				<RangedWeapon_Cooldown>0.50</RangedWeapon_Cooldown>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.57</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_765x20mmLongue_FMJ</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<range>12</range>
+					<soundCast>Shot_Revolver</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>6</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_765x20mmLongue</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- French MAB Model D Pistol -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FrenchServicePistol"]</xpath>
+		<value>
+			<statBases>
+				<Mass>0.87</Mass>
+				<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+				<SightsEfficiency>0.7</SightsEfficiency>
+				<ShotSpread>0.16</ShotSpread>
+				<SwayFactor>1.07</SwayFactor>
+				<Bulk>1.9</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.57</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_765x20mmLongue_FMJ</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<range>12</range>
+					<soundCast>Shot_Autopistol</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>8</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_765x20mmLongue</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- French Lebel M1886 Rifle -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceRifle"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.19</Mass>
+				<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.39</SwayFactor>
+				<Bulk>12.60</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.04</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_8x50mmRLebel_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>55</range>
+					<soundCast>Shot_BoltActionRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>8</magazineSize>
+					<reloadTime>4.3</reloadTime>
+					<ammoSet>AmmoSet_8x50mmRLebel</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- French MAS-36 Rifle -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceRifleB"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.19</Mass>
+				<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.39</SwayFactor>
+				<Bulk>12.60</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.04</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_8x50mmRLebel_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>55</range>
+					<soundCast>Shot_BoltActionRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>8</magazineSize>
+					<reloadTime>4.3</reloadTime>
+					<ammoSet>AmmoSet_8x50mmRLebel</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- French Lebel M1886 Rifle (Bayonet) -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceRifleBayonet"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.19</Mass>
+				<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.39</SwayFactor>
+				<Bulk>12.60</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.04</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_8x50mmRLebel_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>55</range>
+					<soundCast>Shot_BoltActionRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>8</magazineSize>
+					<reloadTime>4.3</reloadTime>
+					<ammoSet>AmmoSet_8x50mmRLebel</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- French Lebel M1886 Rifle (Bayonet B) -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceRifleBayonetB"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.6</Mass>
+				<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.39</SwayFactor>
+				<Bulk>12.60</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.04</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_8x50mmRLebel_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>55</range>
+					<soundCast>Shot_BoltActionRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>8</magazineSize>
+					<reloadTime>4.3</reloadTime>
+					<ammoSet>AmmoSet_8x50mmRLebel</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- French MAS-36 Rifle (Bayonet) -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceRifleBBayonet"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.6</Mass>
+				<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.39</SwayFactor>
+				<Bulk>12.60</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.04</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_75x54mmFrench_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>55</range>
+					<soundCast>Shot_BoltActionRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>5</magazineSize>
+					<reloadTime>4.3</reloadTime>
+					<ammoSet>AmmoSet_75x54mmFrench</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- French Berthier M1916 Carbine -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceCarbine"]</xpath>
+		<value>
+			<statBases>
+				<Mass>3.7</Mass>
+				<SightsEfficiency>1</SightsEfficiency>
+				<ShotSpread>0.06</ShotSpread>
+				<SwayFactor>1.25</SwayFactor>
+				<Bulk>9</Bulk>
+				<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.4</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_8x50mmRLebel_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>47</range>
+					<soundCast>Shot_AssaultRifle</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>5</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_8x50mmRLebel</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- French MAS-38 SMG -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceSMG"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.3</Mass>
+				<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.14</ShotSpread>
+				<SwayFactor>1.21</SwayFactor>
+				<Bulk>8.43</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>0.90</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_765x20mmLongue_FMJ</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<range>27</range>
+					<burstShotCount>6</burstShotCount>
+					<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+					<soundCast>Shot_HeavySMG</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>32</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_765x20mmLongue</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>Snapshot</aiAimMode>
+					<aimedBurstShotCount>3</aimedBurstShotCount>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- French FM 24/29 LMG -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceLMG"]</xpath>
+		<value>
+			<statBases>
+				<Mass>8.68</Mass>
+				<Bulk>16.56</Bulk>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.42</SwayFactor>
+				<SightsEfficiency>1.2</SightsEfficiency>
+				<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.28</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_75x54mmFrench_FMJ</defaultProjectile>
+					<warmupTime>1.3</warmupTime>
+					<range>62</range>
+					<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+					<burstShotCount>10</burstShotCount>
+					<soundCast>Shot_Minigun</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<recoilPattern>Mounted</recoilPattern>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>25</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_75x54mmFrench</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aimedBurstShotCount>5</aimedBurstShotCount>
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>SuppressFire</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- French Chauchat LMG -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceLMGB"]</xpath>
+		<value>
+			<statBases>
+				<Mass>8.68</Mass>
+				<Bulk>16.56</Bulk>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.42</SwayFactor>
+				<SightsEfficiency>1.2</SightsEfficiency>
+				<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.32</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_8x50mmRLebel_FMJ</defaultProjectile>
+					<warmupTime>1.3</warmupTime>
+					<range>65</range>
+					<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
+					<burstShotCount>10</burstShotCount>
+					<soundCast>Shot_Minigun</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<recoilPattern>Mounted</recoilPattern>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>19</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_8x50mmRLebel</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aimedBurstShotCount>5</aimedBurstShotCount>
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>SuppressFire</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ThingDefs_Misc/GermanWeapons_Ranged.xml b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ThingDefs_Misc/GermanWeapons_Ranged.xml
new file mode 100644
index 0000000000..31a029503f
--- /dev/null
+++ b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ThingDefs_Misc/GermanWeapons_Ranged.xml	
@@ -0,0 +1,786 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--  German Luger P08 Pistol  -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2GermanServicePistol"]</xpath>
+		<value>
+			<statBases>
+				<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+				<SightsEfficiency>0.7</SightsEfficiency>
+				<ShotSpread>0.16</ShotSpread>
+				<SwayFactor>1.07</SwayFactor>
+				<Bulk>1.9</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.57</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<range>12</range>
+					<soundCast>Shot_Autopistol</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>8</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>Snapshot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!--  German Mauser HSc Pistol  -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2GermanServicePistolB"]</xpath>
+		<value>
+			<statBases>
+				<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+				<SightsEfficiency>0.7</SightsEfficiency>
+				<ShotSpread>0.16</ShotSpread>
+				<SwayFactor>1.07</SwayFactor>
+				<Bulk>1.9</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.55</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_32ACP_FMJ</defaultProjectile>
+					<warmupTime>0.5</warmupTime>
+					<range>14</range>
+					<soundCast>Shot_Autopistol</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>8</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_32ACP</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>Snapshot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+	<!--  German Walther P38 Pistol  -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2GermanServicePistolC"]</xpath>
+		<value>
+			<statBases>
+				<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+				<SightsEfficiency>0.7</SightsEfficiency>
+				<ShotSpread>0.16</ShotSpread>
+				<SwayFactor>1.07</SwayFactor>
+				<Bulk>1.9</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.55</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+					<warmupTime>0.5</warmupTime>
+					<range>12</range>
+					<soundCast>Shot_Autopistol</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>8</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>Snapshot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!--  German Mauser C96 Semi-Automatic Pistol  -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceSemiAutomaticPistol"]</xpath>
+		<value>
+			<statBases>
+				<RangedWeapon_Cooldown>0.05</RangedWeapon_Cooldown>
+				<SightsEfficiency>0.7</SightsEfficiency>
+				<ShotSpread>0.16</ShotSpread>
+				<SwayFactor>1.4</SwayFactor>
+				<Bulk>1.9</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.2</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_763x25mmMauser_FMJ</defaultProjectile>
+					<warmupTime>0.5</warmupTime>
+					<range>12</range>
+					<soundCast>Shot_Autopistol</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>20</magazineSize>
+					<reloadTime>4.3</reloadTime>
+					<ammoSet>AmmoSet_763x25mmMauser</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>Snapshot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!--  German Karabiner K98 Rifle  -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceRifle"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.30</Mass>
+				<RangedWeapon_Cooldown>1.16</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.0</SightsEfficiency>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.48</SwayFactor>
+				<Bulk>11</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.04</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>55</range>
+					<soundCast>Shot_BoltActionRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>5</magazineSize>
+					<reloadTime>4.3</reloadTime>
+					<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!--  German Karabiner K98 Rifle (Bayonet)  -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceRifleBayonet"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.30</Mass>
+				<RangedWeapon_Cooldown>1.16</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.0</SightsEfficiency>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.48</SwayFactor>
+				<Bulk>13</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.04</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>55</range>
+					<soundCast>Shot_BoltActionRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>5</magazineSize>
+					<reloadTime>4.3</reloadTime>
+					<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!--  German Gewehr 43 Semi-Automatic Rifle  -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceSemiAutomaticRifle"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.20</Mass>
+				<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.04</ShotSpread>
+				<SwayFactor>1.61</SwayFactor>
+				<Bulk>12.26</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.04</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>55</range>
+					<soundCast>Shot_HeavySMG</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>7</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>10</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!--  German Gewehr 43 Semi-Automatic Rifle (Bayonet)  -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceSemiAutomaticRifleBayonet"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.20</Mass>
+				<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.04</ShotSpread>
+				<SwayFactor>1.61</SwayFactor>
+				<Bulk>12.26</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.04</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>55</range>
+					<soundCast>Shot_HeavySMG</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>7</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>10</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!--  German MP 40 SMG  -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceSMG"]</xpath>
+		<value>
+			<statBases>
+				<Mass>3.9</Mass>
+				<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.14</ShotSpread>
+				<SwayFactor>1.21</SwayFactor>
+				<Bulk>7</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>0.6</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<burstShotCount>6</burstShotCount>
+					<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+					<range>23</range>
+					<soundCast>Shot_HeavySMG</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>7</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>32</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>Snapshot</aiAimMode>
+					<aimedBurstShotCount>3</aimedBurstShotCount>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!--  German MP 28 SMG  -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceSMGB"]</xpath>
+		<value>
+			<statBases>
+				<Mass>3.9</Mass>
+				<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.14</ShotSpread>
+				<SwayFactor>1.21</SwayFactor>
+				<Bulk>7</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>0.6</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<burstShotCount>6</burstShotCount>
+					<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+					<range>21</range>
+					<soundCast>Shot_HeavySMG</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>7</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>32</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>Snapshot</aiAimMode>
+					<aimedBurstShotCount>3</aimedBurstShotCount>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!--  German MP 38 SMG  -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceSMGC"]</xpath>
+		<value>
+			<statBases>
+				<Mass>3.9</Mass>
+				<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.14</ShotSpread>
+				<SwayFactor>1.21</SwayFactor>
+				<Bulk>7</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>0.6</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<burstShotCount>6</burstShotCount>
+					<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+					<range>23</range>
+					<soundCast>Shot_HeavySMG</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>7</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>32</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>Snapshot</aiAimMode>
+					<aimedBurstShotCount>3</aimedBurstShotCount>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!--  German MP 18 SMG  -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceSMGD"]</xpath>
+		<value>
+			<statBases>
+				<Mass>3.9</Mass>
+				<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.14</ShotSpread>
+				<SwayFactor>1.21</SwayFactor>
+				<Bulk>7</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>0.6</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<burstShotCount>6</burstShotCount>
+					<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+					<range>21</range>
+					<soundCast>Shot_HeavySMG</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>7</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>32</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>Snapshot</aiAimMode>
+					<aimedBurstShotCount>3</aimedBurstShotCount>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!--  German MG-42 LMG  -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceLMG"]</xpath>
+		<value>
+			<statBases>
+				<Mass>11.60</Mass>
+				<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.06</ShotSpread>
+				<SwayFactor>1.67</SwayFactor>
+				<Bulk>15.20</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.36</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<burstShotCount>6</burstShotCount>
+					<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+					<range>64</range>
+					<soundCast>Shot_Minigun</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>150</magazineSize>
+					<reloadTime>7.8</reloadTime>
+					<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aimedBurstShotCount>5</aimedBurstShotCount>
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>SuppressFire</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceLMG"]/weaponTags</xpath>
+		<value>
+			<li>Bipod_LMG</li>
+		</value>
+	</Operation>
+
+	<!--  German StG 44 Automatic Rifle  -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceAutomaticRifle"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.60</Mass>
+				<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.07</ShotSpread>
+				<SwayFactor>1.40</SwayFactor>
+				<Bulk>9.40</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.54</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_792x33mmKurz_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>48</range>
+					<burstShotCount>6</burstShotCount>
+					<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+					<soundCast>Shot_AssaultRifle</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>30</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_792x33mmKurz</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiUseBurstMode>TRUE</aiUseBurstMode>
+					<aiAimMode>AimedShot</aiAimMode>
+					<aimedBurstShotCount>3</aimedBurstShotCount>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!--  German Karabiner K98 Sniper Rifle  -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceSniperRifle"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.1</Mass>
+				<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+				<SightsEfficiency>2.3</SightsEfficiency>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.48</SwayFactor>
+				<Bulk>11.00</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.04</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+					<warmupTime>1.5</warmupTime>
+					<range>75</range>
+					<soundCast>Shot_BoltActionRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>5</magazineSize>
+					<reloadOneAtATime>True</reloadOneAtATime>
+					<reloadTime>0.85</reloadTime>
+					<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!--  German Gewehr 43 Semi-Automatic Sniper Rifle  -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceSemiAutomaticSniperRifle"]</xpath>
+		<value>
+			<statBases>
+				<Mass>3.85</Mass>
+				<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.04</ShotSpread>
+				<SwayFactor>1.61</SwayFactor>
+				<Bulk>12.26</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.04</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+					<warmupTime>1.5</warmupTime>
+					<range>75</range>
+					<soundCast>Shot_HeavySMG</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>7</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>10</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!--  German Panzerschreck Rocket Launcher  -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>K4G_Gun_WW2GermanServiceRocketLauncher</defName>
+		<statBases>
+			<Mass>11</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.15</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.68</SwayFactor>
+			<Bulk>12.50</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_88mmRPzB_HEAT</defaultProjectile>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<warmupTime>2.01</warmupTime>
+			<range>40</range>
+			<minRange>5</minRange>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>5.6</reloadTime>
+			<ammoSet>AmmoSet_88mmRPzBRocket</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!--  German Panzerfaust Gross Rocket Launcher  -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>K4G_Gun_WW2GermanServiceDisposableRocketLauncher</defName>
+		<statBases>
+			<Mass>5.1</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.15</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.68</SwayFactor>
+			<Bulk>12.50</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_K4GPanzerFaust60_HEAT</defaultProjectile>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<warmupTime>1.9</warmupTime>
+			<range>31</range>
+			<minRange>5</minRange>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!--  German Panzerfaust Klein Rocket Launcher  -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>K4G_Gun_WW2GermanServiceDisposableRocketLauncherB</defName>
+		<statBases>
+			<Mass>3.4</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.68</SwayFactor>
+			<Bulk>6.25</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_K4GPanzerFaust50_HEAT</defaultProjectile>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<warmupTime>1.9</warmupTime>
+			<range>31</range>
+			<minRange>5</minRange>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!--  German Panzerbusche 39 Anti-Tank Rifle  -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceAntiTankRifle"]</xpath>
+		<value>
+			<statBases>
+				<SightsEfficiency>1.0</SightsEfficiency>
+				<ShotSpread>0.01</ShotSpread>
+				<SwayFactor>2.89</SwayFactor>
+				<Bulk>22.0</Bulk>
+				<Mass>16.20</Mass>
+				<RangedWeapon_Cooldown>0.58</RangedWeapon_Cooldown>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_792x94mmPatronen_FMJ</defaultProjectile>
+					<warmupTime>2.8</warmupTime>
+					<range>62</range>
+					<soundCast>HeavyMG</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>1</magazineSize>
+					<AmmoGenPerMagOverride>8</AmmoGenPerMagOverride>
+					<reloadTime>3.8</reloadTime>
+					<ammoSet>AmmoSet_792x94mmPatronen</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceAntiTankRifle"]/weaponTags</xpath>
+		<value>
+			<li>Bipod_ATR</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ThingDefs_Misc/ItalianWeapons_Ranged.xml b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ThingDefs_Misc/ItalianWeapons_Ranged.xml
new file mode 100644
index 0000000000..8a34a80850
--- /dev/null
+++ b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ThingDefs_Misc/ItalianWeapons_Ranged.xml	
@@ -0,0 +1,367 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ======= Italian Bodeo Model 1889 Revolver ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2ItalianServiceRevolver"]</xpath>
+		<value>
+			<statBases>
+				<Mass>0.95</Mass>
+				<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+				<SightsEfficiency>0.7</SightsEfficiency>
+				<ShotSpread>0.17</ShotSpread>
+				<SwayFactor>1.03</SwayFactor>
+				<Bulk>2.22</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<recoilAmount>2.57</recoilAmount>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<range>16</range>
+					<soundCast>Shot_Revolver</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>6</magazineSize>
+					<reloadTime>4.6</reloadTime>
+					<ammoSet>AmmoSet_45ACP</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= Italian Beretta M1934 Pistol ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2ItalianServicePistol"]</xpath>
+		<value>
+			<statBases>
+				<Mass>0.66</Mass>
+				<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+				<SightsEfficiency>0.7</SightsEfficiency>
+				<ShotSpread>0.17</ShotSpread>
+				<SwayFactor>1.07</SwayFactor>
+				<Bulk>1.7</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<recoilAmount>2.27</recoilAmount>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_380ACP_FMJ</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<range>16</range>
+					<soundCast>Shot_Autopistol</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>8</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_380ACP</ammoSet>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= Italian Carcano Rifle  ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2ItalianServiceRifle"]</xpath>
+		<value>
+			<statBases>
+				<Mass>3.8</Mass>
+				<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.63</SwayFactor>
+				<Bulk>12.00</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.04</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_65x52mmCarcano_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>55</range>
+					<soundCast>Shot_BoltActionRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>6</magazineSize>
+					<reloadTime>4.3</reloadTime>
+					<ammoSet>AmmoSet_65x52mmCarcano</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= Italian Carcano Rifle (Bayonet) ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2ItalianServiceRifleBayonet"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.05</Mass>
+				<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.63</SwayFactor>
+				<Bulk>12.00</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.04</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_65x52mmCarcano_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>55</range>
+					<soundCast>Shot_BoltActionRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>6</magazineSize>
+					<reloadTime>4.3</reloadTime>
+					<ammoSet>AmmoSet_65x52mmCarcano</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= Italian Carcano Carbine ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2ItalianServiceCarbine"]</xpath>
+		<value>
+			<statBases>
+				<Mass>3</Mass>
+				<RangedWeapon_Cooldown>0.97</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.06</ShotSpread>
+				<SwayFactor>1.4</SwayFactor>
+				<Bulk>9.5</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.04</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_65x52mmCarcano_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>48</range>
+					<soundCast>Shot_BoltActionRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>6</magazineSize>
+					<reloadTime>4.3</reloadTime>
+					<ammoSet>AmmoSet_65x52mmCarcano</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= Italian Beretta M1918 SMG ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2ItalianServiceSMG"]</xpath>
+		<value>
+			<statBases>
+				<Mass>3.3</Mass>
+				<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.14</ShotSpread>
+				<SwayFactor>1.21</SwayFactor>
+				<Bulk>8.1</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.05</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_22LR_FMJ</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<range>21</range>
+					<burstShotCount>6</burstShotCount>
+					<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+					<soundCast>Shot_MachinePistol</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>25</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_22LR</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>Snapshot</aiAimMode>
+					<aimedBurstShotCount>3</aimedBurstShotCount>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= Italian MAB 38/42 SMG ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2ItalianServiceSMGB"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.2</Mass>
+				<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.14</ShotSpread>
+				<SwayFactor>1.21</SwayFactor>
+				<Bulk>9.1</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.22</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<range>23</range>
+					<burstShotCount>6</burstShotCount>
+					<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+					<soundCast>Shot_HeavySMG</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>20</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>Snapshot</aiAimMode>
+					<aimedBurstShotCount>3</aimedBurstShotCount>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= Italian FNAB-43 SMG ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2ItalianServiceSMGC"]</xpath>
+		<value>
+			<statBases>
+				<Mass>3.9</Mass>
+				<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.14</ShotSpread>
+				<SwayFactor>1.21</SwayFactor>
+				<Bulk>7.5</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.05</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<range>23</range>
+					<burstShotCount>8</burstShotCount>
+					<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+					<soundCast>Shot_HeavySMG</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>20</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>Snapshot</aiAimMode>
+					<aimedBurstShotCount>3</aimedBurstShotCount>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= Italian Breda 30 LMG ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2ItalianServiceLMG"]</xpath>
+		<value>
+			<statBases>
+				<Mass>10.6</Mass>
+				<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+				<SightsEfficiency>1</SightsEfficiency>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.53</SwayFactor>
+				<Bulk>15.7</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.22</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_65x52mmCarcano_FMJ</defaultProjectile>
+					<warmupTime>1.3</warmupTime>
+					<range>62</range>
+					<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+					<burstShotCount>6</burstShotCount>
+					<soundCast>Shot_Minigun</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<recoilPattern>Mounted</recoilPattern>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>20</magazineSize>
+					<reloadTime>7.5</reloadTime>
+					<ammoSet>AmmoSet_65x52mmCarcano</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aimedBurstShotCount>3</aimedBurstShotCount>
+					<aiAimMode>SuppressFire</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2ItalianServiceLMG"]/weaponTags</xpath>
+		<value>
+			<li>Bipod_LMG</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ThingDefs_Misc/JapaneseWeapons_Ranged.xml b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ThingDefs_Misc/JapaneseWeapons_Ranged.xml
new file mode 100644
index 0000000000..e6f0616f1f
--- /dev/null
+++ b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ThingDefs_Misc/JapaneseWeapons_Ranged.xml	
@@ -0,0 +1,355 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ======= Japanese Type 14 Nambu Pistol ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2JapaneseServicePistol"]</xpath>
+		<value>
+			<statBases>
+				<Mass>0.9</Mass>
+				<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+				<SightsEfficiency>0.7</SightsEfficiency>
+				<ShotSpread>0.17</ShotSpread>
+				<SwayFactor>1.07</SwayFactor>
+				<Bulk>2</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_8x22mmNambu_FMJ</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<range>16</range>
+					<soundCast>Shot_Autopistol</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>8</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_8x22mmNambu</ammoSet>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= Japanese Type 26 Revolver ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2JapaneseServiceRevolver"]</xpath>
+		<value>
+			<statBases>
+				<Mass>0.95</Mass>
+				<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+				<SightsEfficiency>0.7</SightsEfficiency>
+				<ShotSpread>0.17</ShotSpread>
+				<SwayFactor>1.03</SwayFactor>
+				<Bulk>2.22</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_38SW_FMJ</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<range>16</range>
+					<soundCast>Shot_Revolver</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>6</magazineSize>
+					<reloadTime>4.6</reloadTime>
+					<ammoSet>AmmoSet_38SW</ammoSet>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= Japanese Type 99 Rifle ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2JapaneseServiceRifle"]</xpath>
+		<value>
+			<statBases>
+				<Mass>3.75</Mass>
+				<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.63</SwayFactor>
+				<Bulk>12.00</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.04</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_77x58mmArisaka_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>55</range>
+					<soundCast>Shot_BoltActionRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>5</magazineSize>
+					<reloadTime>4.3</reloadTime>
+					<ammoSet>AmmoSet_77x58mmArisaka</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ========== Japanese Type 99 Rifle (Bayonet)  ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2JapaneseServiceRifleBayonet"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4</Mass>
+				<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.63</SwayFactor>
+				<Bulk>12.00</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.04</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_77x58mmArisaka_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>55</range>
+					<soundCast>Shot_BoltActionRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>5</magazineSize>
+					<reloadTime>4.3</reloadTime>
+					<ammoSet>AmmoSet_77x58mmArisaka</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= Japanese Type 38 Carbine ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2JapaneseServiceCarbine"]</xpath>
+		<value>
+			<statBases>
+				<Mass>3.3</Mass>
+				<RangedWeapon_Cooldown>0.97</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.06</ShotSpread>
+				<SwayFactor>1.4</SwayFactor>
+				<Bulk>9.5</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.04</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+					<warmupTime>0.85</warmupTime>
+					<range>48</range>
+					<soundCast>Shot_BoltActionRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>5</magazineSize>
+					<reloadTime>4.3</reloadTime>
+					<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= Japanese Type 100 SMG ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2JapaneseServiceSMG"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.3</Mass>
+				<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.14</ShotSpread>
+				<SwayFactor>1.21</SwayFactor>
+				<Bulk>8.43</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>0.8</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_8x22mmNambu_FMJ</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<range>23</range>
+					<burstShotCount>6</burstShotCount>
+					<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+					<soundCast>Shot_HeavySMG</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>30</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_8x22mmNambu</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>Snapshot</aiAimMode>
+					<aimedBurstShotCount>3</aimedBurstShotCount>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= Japanese Type 99 LMG ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2JapaneseServiceLMG"]</xpath>
+		<value>
+			<statBases>
+				<Mass>10.4</Mass>
+				<Bulk>16.56</Bulk>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.42</SwayFactor>
+				<SightsEfficiency>1.2</SightsEfficiency>
+				<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.34</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_77x58mmArisaka_FMJ</defaultProjectile>
+					<warmupTime>1.3</warmupTime>
+					<range>62</range>
+					<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+					<burstShotCount>10</burstShotCount>
+					<soundCast>Shot_Minigun</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<recoilPattern>Mounted</recoilPattern>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>30</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_77x58mmArisaka</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aimedBurstShotCount>5</aimedBurstShotCount>
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>SuppressFire</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2JapaneseServiceLMG"]/weaponTags</xpath>
+		<value>
+			<li>Bipod_LMG</li>
+		</value>
+	</Operation>
+
+	<!-- ======= Japanese Type 99 Sniper Rifle ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2JapaneseServiceSniperRifle"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4</Mass>
+				<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+				<SightsEfficiency>2.21</SightsEfficiency>
+				<ShotSpread>0.04</ShotSpread>
+				<SwayFactor>1.63</SwayFactor>
+				<Bulk>12.00</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.04</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_77x58mmArisaka_FMJ</defaultProjectile>
+					<warmupTime>1.4</warmupTime>
+					<range>75</range>
+					<soundCast>Shot_BoltActionRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>5</magazineSize>
+					<reloadOneAtATime>True</reloadOneAtATime>
+					<reloadTime>0.85</reloadTime>
+					<ammoSet>AmmoSet_77x58mmArisaka</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= Japanese Type 4 Rocket Launcher ======= -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>K4G_Gun_WW2JapaneseServiceRocketLauncher</defName>
+		<statBases>
+			<Mass>7.20</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.15</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.68</SwayFactor>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_K4GType74mm_HEAT</defaultProjectile>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<warmupTime>2.01</warmupTime>
+			<range>40</range>
+			<minRange>5</minRange>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>5.6</reloadTime>
+			<ammoSet>AmmoSet_K4GType74mmRocket</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ThingDefs_Misc/RussianWeapons_Ranged.xml b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ThingDefs_Misc/RussianWeapons_Ranged.xml
new file mode 100644
index 0000000000..cabd9d8617
--- /dev/null
+++ b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ThingDefs_Misc/RussianWeapons_Ranged.xml	
@@ -0,0 +1,612 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ======= Russian Nagant M1895 Revolver ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceRevolver"]</xpath>
+		<value>
+			<statBases>
+				<SightsEfficiency>0.7</SightsEfficiency>
+				<ShotSpread>0.18</ShotSpread>
+				<SwayFactor>1.2</SwayFactor>
+				<Bulk>2.2</Bulk>
+				<Mass>0.82</Mass>
+				<RangedWeapon_Cooldown>0.50</RangedWeapon_Cooldown>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.57</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_762x38mmR_FMJ</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<range>16</range>
+					<soundCast>Shot_Revolver</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>7</magazineSize>
+					<reloadOneAtATime>True</reloadOneAtATime>
+					<reloadTime>0.85</reloadTime>
+					<ammoSet>AmmoSet_762x38mmR</ammoSet>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= Russian TT-33 Pistol ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2RussianServicePistol"]</xpath>
+		<value>
+			<statBases>
+				<Mass>0.85</Mass>
+				<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+				<SightsEfficiency>0.7</SightsEfficiency>
+				<ShotSpread>0.17</ShotSpread>
+				<SwayFactor>1.07</SwayFactor>
+				<Bulk>1.7</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.05</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<range>16</range>
+					<soundCast>Shot_Autopistol</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>8</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= Russian Mosin-Nagant Model 1891/30 Rifle ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceRifle"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.00</Mass>
+				<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.63</SwayFactor>
+				<Bulk>12.32</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.04</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>55</range>
+					<soundCast>Shot_BoltActionRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>5</magazineSize>
+					<reloadTime>4.3</reloadTime>
+					<ammoSet>AmmoSet_762x54mmR</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= Russian Mosin-Nagant Model 1891/30 Rifle (Bayonet) ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceRifleBayonet"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.2</Mass>
+				<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.63</SwayFactor>
+				<Bulk>12.32</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.04</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>55</range>
+					<soundCast>Shot_BoltActionRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>5</magazineSize>
+					<reloadTime>4.3</reloadTime>
+					<ammoSet>AmmoSet_762x54mmR</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= Russian SVT-40 Semi-Automatic Rifle ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceSemiAutomaticRifle"]</xpath>
+		<value>
+			<statBases>
+				<Mass>3.85</Mass>
+				<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.04</ShotSpread>
+				<SwayFactor>1.61</SwayFactor>
+				<Bulk>12.26</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.04</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>55</range>
+					<soundCast>Shot_HeavySMG</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>7</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>10</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_762x54mmR</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= Russian SVT-40 Semi-Automatic Rifle (Bayonet) ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceSemiAutomaticRifleBayonet"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.05</Mass>
+				<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.04</ShotSpread>
+				<SwayFactor>1.61</SwayFactor>
+				<Bulk>12.26</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.04</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>55</range>
+					<soundCast>Shot_HeavySMG</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>7</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>10</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_762x54mmR</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= Russian PPSh-41 Stick Mag SMG ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceSMG"]</xpath>
+		<value>
+			<statBases>
+				<Mass>3.63</Mass>
+				<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.14</ShotSpread>
+				<SwayFactor>1.21</SwayFactor>
+				<Bulk>8.43</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.22</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<range>23</range>
+					<burstShotCount>6</burstShotCount>
+					<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+					<soundCast>Shot_HeavySMG</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>35</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>Snapshot</aiAimMode>
+					<aimedBurstShotCount>3</aimedBurstShotCount>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= Russian PPSh-41 Drum Mag SMG ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceSMGB"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.03</Mass>
+				<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.14</ShotSpread>
+				<SwayFactor>1.21</SwayFactor>
+				<Bulk>8.43</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.22</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<range>23</range>
+					<burstShotCount>6</burstShotCount>
+					<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+					<soundCast>Shot_HeavySMG</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>71</magazineSize>
+					<reloadTime>4.9</reloadTime>
+					<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>Snapshot</aiAimMode>
+					<aimedBurstShotCount>3</aimedBurstShotCount>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= Russian PPS-43 SMG ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceSMGC"]</xpath>
+		<value>
+			<statBases>
+				<Mass>3.23</Mass>
+				<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.13</ShotSpread>
+				<SwayFactor>1.12</SwayFactor>
+				<Bulk>6.43</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.35</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<range>23</range>
+					<burstShotCount>6</burstShotCount>
+					<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+					<soundCast>Shot_HeavySMG</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>35</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>Snapshot</aiAimMode>
+					<aimedBurstShotCount>3</aimedBurstShotCount>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= Russian DP-27 LMG ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceLMG"]</xpath>
+		<value>
+			<statBases>
+				<Mass>9.12</Mass>
+				<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+				<SightsEfficiency>1</SightsEfficiency>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.53</SwayFactor>
+				<Bulk>14.7</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.32</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+					<warmupTime>1.3</warmupTime>
+					<range>62</range>
+					<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+					<burstShotCount>10</burstShotCount>
+					<soundCast>Shot_Minigun</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<recoilPattern>Mounted</recoilPattern>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>47</magazineSize>
+					<reloadTime>4.9</reloadTime>
+					<ammoSet>AmmoSet_762x54mmR</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aimedBurstShotCount>5</aimedBurstShotCount>
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>SuppressFire</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceLMG"]/weaponTags</xpath>
+		<value>
+			<li>Bipod_LMG</li>
+		</value>
+	</Operation>
+
+	<!-- ======= Russian Fedorov Avtomat Automatic Rifle ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceAutomaticRifle"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.60</Mass>
+				<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.03</ShotSpread>
+				<SwayFactor>1.49</SwayFactor>
+				<Bulk>9.40</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.68</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>48</range>
+					<burstShotCount>5</burstShotCount>
+					<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+					<soundCast>Shot_AssaultRifle</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>25</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_762x54mmR</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiUseBurstMode>TRUE</aiUseBurstMode>
+					<aiAimMode>AimedShot</aiAimMode>
+					<aimedBurstShotCount>3</aimedBurstShotCount>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= Russian Mosin-Nagant Model 1891/30 Sniper Rifle ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceSniperRifle"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.27</Mass>
+				<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+				<SightsEfficiency>2.21</SightsEfficiency>
+				<ShotSpread>0.04</ShotSpread>
+				<SwayFactor>1.63</SwayFactor>
+				<Bulk>12.32</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.04</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+					<warmupTime>1.4</warmupTime>
+					<range>75</range>
+					<soundCast>Shot_BoltActionRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>5</magazineSize>
+					<reloadOneAtATime>True</reloadOneAtATime>
+					<reloadTime>0.85</reloadTime>
+					<ammoSet>AmmoSet_762x54mmR</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= Russian SVT-40 Semi-Automatic Sniper Rifle ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceSemiAutomaticSniperRifle"]</xpath>
+		<value>
+			<statBases>
+				<Mass>3.85</Mass>
+				<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.04</ShotSpread>
+				<SwayFactor>1.61</SwayFactor>
+				<Bulk>12.26</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.68</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>75</range>
+					<soundCast>Shot_HeavySMG</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>7</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>10</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_762x54mmR</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= Russian PTRD-41 Anti-Tank Rifle ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceAntiTankRifle"]</xpath>
+		<value>
+			<statBases>
+				<SightsEfficiency>1.0</SightsEfficiency>
+				<ShotSpread>0.01</ShotSpread>
+				<SwayFactor>2.89</SwayFactor>
+				<Bulk>22.0</Bulk>
+				<Mass>20.30</Mass>
+				<RangedWeapon_Cooldown>0.58</RangedWeapon_Cooldown>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_145x114mm_FMJ</defaultProjectile>
+					<warmupTime>2.8</warmupTime>
+					<range>62</range>
+					<soundCast>HeavyMG</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>1</magazineSize>
+					<AmmoGenPerMagOverride>4</AmmoGenPerMagOverride>
+					<reloadTime>3.8</reloadTime>
+					<ammoSet>AmmoSet_145x114mm</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceAntiTankRifle"]/weaponTags</xpath>
+		<value>
+			<li>Bipod_ATR</li>
+		</value>
+	</Operation>
+
+	<!-- ======= Russian PTRS-41 Anti-Tank Rifle ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceAntiTankRifleB"]</xpath>
+		<value>
+			<statBases>
+				<SightsEfficiency>1.0</SightsEfficiency>
+				<ShotSpread>0.01</ShotSpread>
+				<SwayFactor>2.89</SwayFactor>
+				<Bulk>22.0</Bulk>
+				<Mass>20.30</Mass>
+				<RangedWeapon_Cooldown>0.58</RangedWeapon_Cooldown>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_145x114mm_FMJ</defaultProjectile>
+					<warmupTime>2.8</warmupTime>
+					<range>62</range>
+					<soundCast>HeavyMG</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>5</magazineSize>
+					<reloadTime>4.3</reloadTime>
+					<ammoSet>AmmoSet_145x114mm</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceAntiTankRifleB"]/weaponTags</xpath>
+		<value>
+			<li>Bipod_ATR</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ThingDefs_Misc/UnitedStatesWeapons_Ranged.xml b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ThingDefs_Misc/UnitedStatesWeapons_Ranged.xml
new file mode 100644
index 0000000000..f4920bdeb2
--- /dev/null
+++ b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ThingDefs_Misc/UnitedStatesWeapons_Ranged.xml	
@@ -0,0 +1,839 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ======= American FP-45 Liberator Single-Shot Pistol ======= -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>K4G_Gun_WW2AmericanSingleShotPistol</defName>
+		<statBases>
+			<Mass>0.5</Mass>
+			<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>1.41</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.3</warmupTime>
+			<range>10</range>
+			<soundCast>Shot_Revolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ======= American M1917 Revolver ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceRevolver"]</xpath>
+		<value>
+			<statBases>
+				<SightsEfficiency>0.7</SightsEfficiency>
+				<ShotSpread>0.18</ShotSpread>
+				<SwayFactor>1.2</SwayFactor>
+				<Bulk>2.1</Bulk>
+				<Mass>1.1</Mass>
+				<RangedWeapon_Cooldown>0.50</RangedWeapon_Cooldown>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.57</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<range>16</range>
+					<soundCast>Shot_Revolver</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>6</magazineSize>
+					<reloadTime>4.6</reloadTime>
+					<ammoSet>AmmoSet_45ACP</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= American M1911 Pistol ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServicePistol"]</xpath>
+		<value>
+			<statBases>
+				<Mass>1.11</Mass>
+				<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+				<SightsEfficiency>0.7</SightsEfficiency>
+				<ShotSpread>0.17</ShotSpread>
+				<SwayFactor>1.07</SwayFactor>
+				<Bulk>2.10</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.05</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<range>16</range>
+					<soundCast>Shot_Autopistol</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>8</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_45ACP</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= American M1903 Springfield Rifle ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceRifle"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.19</Mass>
+				<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.63</SwayFactor>
+				<Bulk>12.60</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.04</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>55</range>
+					<soundCast>Shot_BoltActionRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>5</magazineSize>
+					<reloadTime>4.3</reloadTime>
+					<ammoSet>AmmoSet_3006Springfield</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= American M1917 Endfield Rifle ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceRifleB"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.19</Mass>
+				<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.63</SwayFactor>
+				<Bulk>12.60</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.04</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>55</range>
+					<soundCast>Shot_BoltActionRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>6</magazineSize>
+					<reloadTime>4.3</reloadTime>
+					<ammoSet>AmmoSet_3006Springfield</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= American M1903 Springfield Rifle (Bayonet) ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceRifleBayonet"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.35</Mass>
+				<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.63</SwayFactor>
+				<Bulk>12.60</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.04</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>55</range>
+					<soundCast>Shot_BoltActionRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>5</magazineSize>
+					<reloadTime>4.3</reloadTime>
+					<ammoSet>AmmoSet_3006Springfield</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= American M1917 Endfield Rifle (Bayonet) ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceRifleBBayonet"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.35</Mass>
+				<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.63</SwayFactor>
+				<Bulk>12.60</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.04</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>55</range>
+					<soundCast>Shot_BoltActionRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>6</magazineSize>
+					<reloadTime>4.3</reloadTime>
+					<ammoSet>AmmoSet_3006Springfield</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= American M1 Garand Semi-Automatic Rifle ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceSemiAutomaticRifle"]</xpath>
+		<value>
+			<statBases>
+				<SightsEfficiency>1</SightsEfficiency>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.41</SwayFactor>
+				<Bulk>11.2</Bulk>
+				<Mass>4.5</Mass>
+				<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.72</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>55</range>
+					<soundCast>Shot_SniperRifle</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>8</magazineSize>
+					<reloadTime>4.3</reloadTime>
+					<ammoSet>AmmoSet_3006Springfield</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= American M1 Garand Semi-Automatic Rifle (Bayonet) ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceSemiAutomaticRifleBayonet"]</xpath>
+		<value>
+			<statBases>
+				<SightsEfficiency>1</SightsEfficiency>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.41</SwayFactor>
+				<Bulk>11.2</Bulk>
+				<Mass>4.7</Mass>
+				<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.72</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>55</range>
+					<soundCast>Shot_SniperRifle</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>8</magazineSize>
+					<reloadTime>4.3</reloadTime>
+					<ammoSet>AmmoSet_3006Springfield</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= American M1 Carbine ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceCarbine"]</xpath>
+		<value>
+			<statBases>
+				<SightsEfficiency>1</SightsEfficiency>
+				<ShotSpread>0.06</ShotSpread>
+				<SwayFactor>1.25</SwayFactor>
+				<Bulk>9</Bulk>
+				<Mass>2.4</Mass>
+				<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.3</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_30Carbine_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>42</range>
+					<soundCast>Shot_AssaultRifle</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>15</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_30Carbine</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= American M12 Shotgun ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceShotgun"]</xpath>
+		<value>
+			<statBases>
+				<Mass>3.2</Mass>
+				<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
+				<ShotSpread>0.20</ShotSpread>
+				<SwayFactor>1.20</SwayFactor>
+				<Bulk>9.5</Bulk>
+				<SightsEfficiency>0.7</SightsEfficiency>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.5</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+					<warmupTime>0.3</warmupTime>
+					<range>16</range>
+					<soundCast>Shot_Shotgun</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>6</magazineSize>
+					<reloadOneAtATime>true</reloadOneAtATime>
+					<reloadTime>0.9</reloadTime>
+					<ammoSet>AmmoSet_12Gauge</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes"/>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= American M12 Shotgun (Bayonet) ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceShotgunBayonet"]</xpath>
+		<value>
+			<statBases>
+				<Mass>3.5</Mass>
+				<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
+				<ShotSpread>0.20</ShotSpread>
+				<SwayFactor>1.20</SwayFactor>
+				<Bulk>9.5</Bulk>
+				<SightsEfficiency>0.7</SightsEfficiency>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.5</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+					<warmupTime>0.3</warmupTime>
+					<range>16</range>
+					<soundCast>Shot_Shotgun</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>6</magazineSize>
+					<reloadOneAtATime>true</reloadOneAtATime>
+					<reloadTime>0.9</reloadTime>
+					<ammoSet>AmmoSet_12Gauge</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes"/>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= American M1 Thompson SMG ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceSMG"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.5</Mass>
+				<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.13</ShotSpread>
+				<SwayFactor>1.21</SwayFactor>
+				<Bulk>8.9</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.22</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<range>26</range>
+					<burstShotCount>6</burstShotCount>
+					<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+					<soundCast>Shot_HeavySMG</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>30</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_45ACP</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>Snapshot</aiAimMode>
+					<aimedBurstShotCount>3</aimedBurstShotCount>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= American M3 SMG ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceSMGB"]</xpath>
+		<value>
+			<statBases>
+				<Mass>3.61</Mass>
+				<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.14</ShotSpread>
+				<SwayFactor>1.21</SwayFactor>
+				<Bulk>6</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.1</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<range>26</range>
+					<burstShotCount>6</burstShotCount>
+					<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+					<soundCast>Shot_HeavySMG</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>20</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_45ACP</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>Snapshot</aiAimMode>
+					<aimedBurstShotCount>3</aimedBurstShotCount>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= American M2 Hyde SMG ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceSMGC"]</xpath>
+		<value>
+			<statBases>
+				<Mass>4.2</Mass>
+				<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.14</ShotSpread>
+				<SwayFactor>1.21</SwayFactor>
+				<Bulk>8.4</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.20</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<range>26</range>
+					<burstShotCount>6</burstShotCount>
+					<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+					<soundCast>Shot_HeavySMG</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>30</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_45ACP</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>Snapshot</aiAimMode>
+					<aimedBurstShotCount>3</aimedBurstShotCount>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= American M1928 Thompson SMG ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceSMGD"]</xpath>
+		<value>
+			<statBases>
+				<Mass>5</Mass>
+				<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.13</ShotSpread>
+				<SwayFactor>1.21</SwayFactor>
+				<Bulk>8.9</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.45</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<range>26</range>
+					<burstShotCount>10</burstShotCount>
+					<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+					<soundCast>Shot_HeavySMG</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>30</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_45ACP</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>Snapshot</aiAimMode>
+					<aimedBurstShotCount>5</aimedBurstShotCount>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= American Johnson M1941 LMG ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceLMG"]</xpath>
+		<value>
+			<statBases>
+				<Mass>5.9</Mass>
+				<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+				<SightsEfficiency>1</SightsEfficiency>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.40</SwayFactor>
+				<Bulk>13</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.32</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
+					<warmupTime>1.3</warmupTime>
+					<range>62</range>
+					<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+					<burstShotCount>6</burstShotCount>
+					<soundCast>Shot_Minigun</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<recoilPattern>Mounted</recoilPattern>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>20</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_3006Springfield</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aimedBurstShotCount>3</aimedBurstShotCount>
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>SuppressFire</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceLMG"]/weaponTags</xpath>
+		<value>
+			<li>Bipod_LMG</li>
+		</value>
+	</Operation>
+
+	<!-- ======= American Browning Automatic Rifle ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceAutomaticRifle"]</xpath>
+		<value>
+			<statBases>
+				<Mass>7.25</Mass>
+				<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.00</SightsEfficiency>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.34</SwayFactor>
+				<Bulk>12.94</Bulk>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.51</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
+					<warmupTime>1.3</warmupTime>
+					<range>58</range>
+					<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+					<burstShotCount>6</burstShotCount>
+					<soundCast>Shot_SniperRifle</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>20</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_3006Springfield</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>SuppressFire</aiAimMode>
+					<aimedBurstShotCount>3</aimedBurstShotCount>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= American M1903A4 Springfield Sniper Rifle ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceSniperRifle"]</xpath>
+		<value>
+			<statBases>
+				<SightsEfficiency>2.4</SightsEfficiency>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.41</SwayFactor>
+				<Bulk>13.60</Bulk>
+				<Mass>4.9</Mass>
+				<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.72</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
+					<warmupTime>1.4</warmupTime>
+					<range>74</range>
+					<soundCast>Shot_SniperRifle</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>5</magazineSize>
+					<reloadTime>4.3</reloadTime>
+					<ammoSet>AmmoSet_3006Springfield</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= American M1903 Springfield Sniper Rifle ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceSniperRifleB"]</xpath>
+		<value>
+			<statBases>
+				<SightsEfficiency>2.3</SightsEfficiency>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.41</SwayFactor>
+				<Bulk>13.60</Bulk>
+				<Mass>4.8</Mass>
+				<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			</statBases>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.72</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
+					<warmupTime>1.4</warmupTime>
+					<range>74</range>
+					<soundCast>Shot_SniperRifle</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>5</magazineSize>
+					<reloadTime>4.3</reloadTime>
+					<ammoSet>AmmoSet_3006Springfield</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= American M1 Bazooka Rocket Launcher ======= -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>K4G_Gun_WW2AmericanServiceRocketLauncher</defName>
+		<statBases>
+			<Mass>7.20</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.15</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.68</SwayFactor>
+			<Bulk>12.50</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_M6_HEAT</defaultProjectile>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<warmupTime>2.01</warmupTime>
+			<range>40</range>
+			<minRange>5</minRange>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>5.6</reloadTime>
+			<ammoSet>AmmoSet_M6Rocket</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ThingDefs_Misc/WW2_Apparel.xml b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ThingDefs_Misc/WW2_Apparel.xml
new file mode 100644
index 0000000000..17383843d7
--- /dev/null
+++ b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ThingDefs_Misc/WW2_Apparel.xml	
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ======= Uniforms ======= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="WW2Uniform" or @Name="WW2OfficerUniform"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WW2Uniform" or @Name="WW2OfficerUniform"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.03</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WW2Uniform" or @Name="WW2OfficerUniform"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.045</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ======= Coat ======= -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WW2Coat"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>						
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WW2Coat"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ======= Rain Cape ======= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="WW2RainCape" or @Name="WW2StuffableRainCape"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WW2StuffableRainCape"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WW2RainCape"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.01</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WW2RainCape"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.015</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ======= Winter Parka ======= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="WW2WinterParka"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WW2WinterParka"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.04</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WW2WinterParka"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.06</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ======= Winter Coat ======= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="WW2WinterCoat"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<WornBulk>7</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WW2WinterCoat"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.06</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WW2WinterCoat"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.08</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ======= Loadbearings ======= -->
+
+	<!-- === Backpack === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="WW2Rucksack"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WW2Rucksack"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>Shoulders</li>
+			</bodyPartGroups>
+			<careIfDamaged>false</careIfDamaged>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WW2Rucksack"]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>Backpack</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WW2Rucksack"]/costList</xpath>
+		<value>
+			<costStuffCount>40</costStuffCount>
+			<stuffCategories>
+				<li>Fabric</li>
+				<li>Leathery</li>
+			</stuffCategories>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WW2Rucksack"]/thingCategories</xpath>
+		<value>
+			<thingCategories>
+				<li>Loadout</li>
+			</thingCategories>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WW2Rucksack"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>40</CarryBulk>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- === Satchel === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="WW2Satchel"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WW2Satchel"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>Shoulders</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WW2Satchel"]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>Webbing</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="WW2Satchel"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>15</CarryBulk>
+		</value>
+	</Operation>
+
+	<!-- === Field Gear === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="WW2FieldGear"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WW2FieldGear"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>Shoulders</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WW2FieldGear"]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>Webbing</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WW2FieldGear"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>15</CarryBulk>
+				<ReloadSpeed>0.1</ReloadSpeed>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- ======= Helmets ======= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			@Name="WW2Helmet" or
+			@Name="WW2StuffableHelmet" or
+			@Name="WW2StuffablePithHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WW2StuffableHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WW2StuffablePithHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WW2StuffablePithHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WW2Helmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WW2Helmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ======= Gas Masks ======= -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WW2GasMask"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WW2GasMask"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>UpperHead</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WW2GasMask"]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>Overhead</li>
+				<li>StrappedHead</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="WW2GasMask"]/apparel</xpath>
+		<value>
+			<tags>
+				<li>IndustrialMilitaryBasic</li>
+				<li>GasMask</li>
+			</tags>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="WW2GasMask"]</xpath>
+		<value>
+			<modExtensions>
+				<li Class="CombatExtended.ApparelHediffExtension">
+					<hediff>WearingGasMask</hediff>
+				</li>
+				<li Class="CombatExtended.ApperalRenderingExtension">
+					<HideHair>false</HideHair>
+					<HideBeard>true</HideBeard>
+				</li>
+			</modExtensions>
+		</value>
+	</Operation>
+
+	<!-- ======= Caps ======= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			@Name="WW2PeakedCap" or
+			@Name="WW2FieldCap" or
+			@Name="WW2SideCap" or
+			@Name="WW2FurHat" or
+			@Name="WW2Kepi"
+			]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- === Stuffable Hats === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			@Name="WW2StuffableKepi" or
+			@Name="WW2StuffablePeakedCap" or
+			@Name="WW2StuffableFieldCap" or
+			@Name="WW2StuffableSideCap"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WW2StuffableFurHat"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ThingDefs_Misc/WW2_Grenades.xml b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ThingDefs_Misc/WW2_Grenades.xml
new file mode 100644
index 0000000000..e10a761804
--- /dev/null
+++ b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ThingDefs_Misc/WW2_Grenades.xml	
@@ -0,0 +1,1665 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ======= Projectiles ======= -->
+
+	<!-- ===== ThingClass ===== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="K4G_Proj_WW2BritishServiceGrenade" or
+			defName="K4G_Proj_WW2FinnishServiceGrenade" or
+			defName="K4G_Proj_WW2FrenchServiceGrenade" or
+			defName="K4G_Proj_WW2GermanServiceGrenade" or
+			defName="K4G_Proj_WW2GermanServiceGrenade" or
+			defName="K4G_Proj_WW2ItalianServiceGrenade" or
+			defName="K4G_Proj_WW2ItalianServiceGrenadeB" or
+			defName="K4G_Proj_WW2ItalianServiceGrenadeC" or
+			defName="K4G_Proj_WW2JapaneseServiceGrenade" or
+			defName="K4G_Proj_WW2RussianServiceGrenade" or
+			defName="K4G_Proj_WW2RussianServiceGrenadeB" or
+			defName="K4G_Proj_WW2RussianServiceGrenadeC" or
+			defName="K4G_Proj_WW2AmericanServiceGrenade" or
+			defName="K4G_Proj_WW2BritishServiceAntiTankGrenade" or
+			defName="K4G_Proj_WW2BritishServiceAntiTankGrenadeB" or
+			defName="K4G_Proj_WW2GermanServiceAntiTankGrenade" or
+			defName="K4G_Proj_WW2ItalianServiceAntiTankGrenade" or
+			defName="K4G_Proj_WW2RussianServiceAntiTankGrenade" or
+			defName="K4G_Proj_WW2RussianServiceAntiTankGrenadeB" or
+			defName="K4G_Proj_WW2RussianServiceAntiTankGrenadeC"
+			]</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+
+	<!-- ===== Fragmentation ===== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="K4G_Proj_WW2BritishServiceGrenade" or
+			defName="K4G_Proj_WW2FinnishServiceGrenade" or
+			defName="K4G_Proj_WW2FrenchServiceGrenade" or
+			defName="K4G_Proj_WW2GermanServiceGrenade" or
+			defName="K4G_Proj_WW2GermanServiceGrenade" or
+			defName="K4G_Proj_WW2ItalianServiceGrenade" or
+			defName="K4G_Proj_WW2ItalianServiceGrenadeB" or
+			defName="K4G_Proj_WW2ItalianServiceGrenadeC" or
+			defName="K4G_Proj_WW2JapaneseServiceGrenade" or
+			defName="K4G_Proj_WW2RussianServiceGrenade" or
+			defName="K4G_Proj_WW2RussianServiceGrenadeB" or
+			defName="K4G_Proj_WW2RussianServiceGrenadeC" or
+			defName="K4G_Proj_WW2AmericanServiceGrenade"
+			]</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<explosionRadius>1.5</explosionRadius>
+				<damageDef>Bomb</damageDef>
+				<damageAmountBase>56</damageAmountBase>
+				<explosionDelay>60</explosionDelay>
+				<dropsCasings>true</dropsCasings>
+				<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+				<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<speed>12</speed>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+				<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="K4G_Proj_WW2BritishServiceGrenade" or
+			defName="K4G_Proj_WW2FinnishServiceGrenade" or
+			defName="K4G_Proj_WW2FrenchServiceGrenade" or
+			defName="K4G_Proj_WW2GermanServiceGrenade" or
+			defName="K4G_Proj_WW2ItalianServiceGrenade" or
+			defName="K4G_Proj_WW2ItalianServiceGrenadeB" or
+			defName="K4G_Proj_WW2ItalianServiceGrenadeC" or
+			defName="K4G_Proj_WW2JapaneseServiceGrenade" or
+			defName="K4G_Proj_WW2RussianServiceGrenade" or
+			defName="K4G_Proj_WW2RussianServiceGrenadeB" or
+			defName="K4G_Proj_WW2RussianServiceGrenadeC" or
+			defName="K4G_Proj_WW2AmericanServiceGrenade"
+			]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_Fragments">
+					<fragments>
+						<Fragment_Small>40</Fragment_Small>
+					</fragments>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ===== Anti-Tank ===== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="K4G_Proj_WW2BritishServiceAntiTankGrenade" or
+			defName="K4G_Proj_WW2BritishServiceAntiTankGrenadeB" or
+			defName="K4G_Proj_WW2GermanServiceAntiTankGrenade" or
+			defName="K4G_Proj_WW2ItalianServiceAntiTankGrenade" or
+			defName="K4G_Proj_WW2RussianServiceAntiTankGrenade" or
+			defName="K4G_Proj_WW2RussianServiceAntiTankGrenadeB" or
+			defName="K4G_Proj_WW2RussianServiceAntiTankGrenadeC"
+			]</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<explosionRadius>1.5</explosionRadius>
+				<damageDef>Bomb</damageDef>
+				<damageAmountBase>56</damageAmountBase>
+				<explosionDelay>60</explosionDelay>
+				<dropsCasings>true</dropsCasings>
+				<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+				<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<speed>12</speed>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+				<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="K4G_Proj_WW2BritishServiceAntiTankGrenade" or
+			defName="K4G_Proj_WW2BritishServiceAntiTankGrenadeB" or
+			defName="K4G_Proj_WW2GermanServiceAntiTankGrenade" or
+			defName="K4G_Proj_WW2ItalianServiceAntiTankGrenade" or
+			defName="K4G_Proj_WW2RussianServiceAntiTankGrenade" or
+			defName="K4G_Proj_WW2RussianServiceAntiTankGrenadeB" or
+			defName="K4G_Proj_WW2RussianServiceAntiTankGrenadeC"
+			]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_Fragments">
+					<fragments>
+						<Fragment_Small>5</Fragment_Small>
+					</fragments>
+				</li>
+				<li Class="CombatExtended.CompProperties_ExplosiveCE">
+					<damageAmountBase>100</damageAmountBase>
+					<explosiveDamageType>Bomb</explosiveDamageType>
+					<explosiveRadius>0.5</explosiveRadius>
+					<explosionSound>Explosion_Thump</explosionSound>
+					<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ======= Grenades Equipment ======= -->
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[
+			defName="K4G_Weapon_WW2BritishServiceGrenades" or
+			defName="K4G_Weapon_WW2BritishServiceAntiTankGrenades" or
+			defName="K4G_Weapon_WW2BritishServiceAntiTankGrenadesB" or
+			defName="K4G_Weapon_WW2FinnishServiceGrenades" or
+			defName="K4G_Weapon_WW2FrenchServiceGrenades" or
+			defName="K4G_Weapon_WW2GermanServiceGrenades" or
+			defName="K4G_Weapon_WW2GermanServiceGrenadesB" or
+			defName="K4G_Weapon_WW2GermanServiceAntiTankGrenades" or
+			defName="K4G_Weapon_WW2ItalianServiceGrenades" or
+			defName="K4G_Weapon_WW2ItalianServiceGrenadesB" or
+			defName="K4G_Weapon_WW2ItalianServiceGrenadesC" or
+			defName="K4G_Weapon_WW2ItalianServiceAntiTankGrenades" or
+			defName="K4G_Weapon_WW2JapaneseServiceGrenades" or
+			defName="K4G_Weapon_WW2RussianServiceGrenades" or
+			defName="K4G_Weapon_WW2RussianServiceGrenadesB" or
+			defName="K4G_Weapon_WW2RussianServiceGrenadesC" or
+			defName="K4G_Weapon_WW2RussianServiceAntiTankGrenades" or
+			defName="K4G_Weapon_WW2RussianServiceAntiTankGrenadesB" or
+			defName="K4G_Weapon_WW2RussianServiceAntiTankGrenadesC" or
+			defName="K4G_Weapon_WW2AmericanServiceGrenades"
+			]</xpath>
+		<attribute>ParentName</attribute>
+		<value>BaseWeapon</value>
+	</Operation>
+
+	<!-- Grenade -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="K4G_Weapon_WW2BritishServiceGrenades" or
+			defName="K4G_Weapon_WW2BritishServiceAntiTankGrenades" or
+			defName="K4G_Weapon_WW2BritishServiceAntiTankGrenadesB" or
+			defName="K4G_Weapon_WW2FinnishServiceGrenades" or
+			defName="K4G_Weapon_WW2FrenchServiceGrenades" or
+			defName="K4G_Weapon_WW2GermanServiceGrenades" or
+			defName="K4G_Weapon_WW2GermanServiceGrenadesB" or
+			defName="K4G_Weapon_WW2GermanServiceAntiTankGrenades" or
+			defName="K4G_Weapon_WW2ItalianServiceGrenades" or
+			defName="K4G_Weapon_WW2ItalianServiceGrenadesB" or
+			defName="K4G_Weapon_WW2ItalianServiceGrenadesC" or
+			defName="K4G_Weapon_WW2ItalianServiceAntiTankGrenades" or
+			defName="K4G_Weapon_WW2JapaneseServiceGrenades" or
+			defName="K4G_Weapon_WW2RussianServiceGrenades" or
+			defName="K4G_Weapon_WW2RussianServiceGrenadesB" or
+			defName="K4G_Weapon_WW2RussianServiceGrenadesC" or
+			defName="K4G_Weapon_WW2RussianServiceAntiTankGrenades" or
+			defName="K4G_Weapon_WW2RussianServiceAntiTankGrenadesB" or
+			defName="K4G_Weapon_WW2RussianServiceAntiTankGrenadesC" or
+			defName="K4G_Weapon_WW2AmericanServiceGrenades"
+			]</xpath>
+		<value>
+			<thingClass>CombatExtended.AmmoThing</thingClass>
+			<stackLimit>75</stackLimit>
+			<resourceReadoutPriority>First</resourceReadoutPriority>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[
+			defName="K4G_Weapon_WW2BritishServiceGrenades" or
+			defName="K4G_Weapon_WW2BritishServiceAntiTankGrenades" or
+			defName="K4G_Weapon_WW2BritishServiceAntiTankGrenadesB" or
+			defName="K4G_Weapon_WW2FinnishServiceGrenades" or
+			defName="K4G_Weapon_WW2FrenchServiceGrenades" or
+			defName="K4G_Weapon_WW2GermanServiceGrenades" or
+			defName="K4G_Weapon_WW2GermanServiceGrenadesB" or
+			defName="K4G_Weapon_WW2GermanServiceAntiTankGrenades" or
+			defName="K4G_Weapon_WW2ItalianServiceGrenades" or
+			defName="K4G_Weapon_WW2ItalianServiceGrenadesB" or
+			defName="K4G_Weapon_WW2ItalianServiceGrenadesC" or
+			defName="K4G_Weapon_WW2ItalianServiceAntiTankGrenades" or
+			defName="K4G_Weapon_WW2JapaneseServiceGrenades" or
+			defName="K4G_Weapon_WW2RussianServiceGrenades" or
+			defName="K4G_Weapon_WW2RussianServiceGrenadesB" or
+			defName="K4G_Weapon_WW2RussianServiceGrenadesC" or
+			defName="K4G_Weapon_WW2RussianServiceAntiTankGrenades" or
+			defName="K4G_Weapon_WW2RussianServiceAntiTankGrenadesB" or
+			defName="K4G_Weapon_WW2RussianServiceAntiTankGrenadesC" or
+			defName="K4G_Weapon_WW2AmericanServiceGrenades"
+			]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="K4G_Weapon_WW2BritishServiceGrenades" or
+			defName="K4G_Weapon_WW2BritishServiceAntiTankGrenades" or
+			defName="K4G_Weapon_WW2BritishServiceAntiTankGrenadesB" or
+			defName="K4G_Weapon_WW2FinnishServiceGrenades" or
+			defName="K4G_Weapon_WW2FrenchServiceGrenades" or
+			defName="K4G_Weapon_WW2GermanServiceGrenades" or
+			defName="K4G_Weapon_WW2GermanServiceGrenadesB" or
+			defName="K4G_Weapon_WW2GermanServiceAntiTankGrenades" or
+			defName="K4G_Weapon_WW2ItalianServiceGrenades" or
+			defName="K4G_Weapon_WW2ItalianServiceGrenadesB" or
+			defName="K4G_Weapon_WW2ItalianServiceGrenadesC" or
+			defName="K4G_Weapon_WW2ItalianServiceAntiTankGrenades" or
+			defName="K4G_Weapon_WW2JapaneseServiceGrenades" or
+			defName="K4G_Weapon_WW2RussianServiceGrenades" or
+			defName="K4G_Weapon_WW2RussianServiceGrenadesB" or
+			defName="K4G_Weapon_WW2RussianServiceGrenadesC" or
+			defName="K4G_Weapon_WW2RussianServiceAntiTankGrenades" or
+			defName="K4G_Weapon_WW2RussianServiceAntiTankGrenadesB" or
+			defName="K4G_Weapon_WW2RussianServiceAntiTankGrenadesC" or
+			defName="K4G_Weapon_WW2AmericanServiceGrenades"
+			]/comps</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_ExplosiveCE">
+					<damageAmountBase>56</damageAmountBase>
+					<explosiveDamageType>Bomb</explosiveDamageType>
+					<explosiveRadius>1.5</explosiveRadius>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ===== British ===== -->
+
+	<!-- === British No. 36M Mk I Mills Bomb Grenades === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2BritishServiceGrenades"]</xpath>
+		<value>
+			<ThingDef ParentName="BaseGrenadeEquipment">
+				<defName>K4G_Weapon_WW2BritishServiceGrenades</defName>
+				<label>British No. 36M Mk I Mills Bomb Grenades</label>
+				<description>Old-school fragmentation grenades used during WW2. They can be thrown a short distance, where they'll explode, damaging anything and anyone nearby.</description>
+				<graphicData>
+					<texPath>Things/Item/Equipment/WeaponRanged/UnitedKingdom/WW2BritishServiceGrenades</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<weaponTags Inherit="False">
+					<li>CE_AI_AOE</li>
+					<li>CE_OneHandedWeapon</li>
+					<li>K4GWW2UnitedKingdomTrading</li>
+					<li>K4GWW2UnitedKingdomGrenade</li>
+				</weaponTags>
+				<soundInteract>Interact_Grenade</soundInteract>
+				<techLevel>Industrial</techLevel>
+				<statBases>
+					<Mass>0.6</Mass>
+					<Bulk>0.87</Bulk>
+					<MarketValue>12.22</MarketValue>
+					<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+					<SightsEfficiency>1.0</SightsEfficiency>
+				</statBases>
+				<thingCategories>
+					<li>Grenades</li>
+				</thingCategories>
+				<verbs>
+					<li Class="CombatExtended.VerbPropertiesCE">
+						<label>throw frag grenade</label>
+						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<range>11</range>
+						<minRange>4</minRange>
+						<warmupTime>1.2</warmupTime>
+						<noiseRadius>4</noiseRadius>
+						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+						<soundCast>ThrowGrenade</soundCast>
+						<targetParams>
+							<canTargetLocations>true</canTargetLocations>
+						</targetParams>
+						<defaultProjectile>K4G_Proj_WW2BritishServiceGrenade</defaultProjectile>
+						<onlyManualCast>true</onlyManualCast>
+						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+					</li>
+				</verbs>
+				<comps>
+					<li Class="CombatExtended.CompProperties_ExplosiveCE">
+						<damageAmountBase>56</damageAmountBase>
+						<explosiveDamageType>Bomb</explosiveDamageType>
+						<explosiveRadius>1.5</explosiveRadius>
+					</li>
+					<li Class="CombatExtended.CompProperties_Fragments">
+						<fragments>
+							<Fragment_Small>40</Fragment_Small>
+						</fragments>
+					</li>
+				</comps>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<!-- === British No. 73 Anti-Tank Grenades === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2BritishServiceAntiTankGrenades"]</xpath>
+		<value>
+			<ThingDef ParentName="BaseEquipment">
+				<defName>K4G_Weapon_WW2BritishServiceAntiTankGrenades</defName>
+				<label>British No. 73 Anti-Tank Grenade</label>
+				<description>Heavy explosive grenades used during WW2. They can be thrown a short distance and are designed to damage or destroy armored targets.</description>
+				<graphicData>
+					<texPath>Things/Item/Equipment/WeaponRanged/UnitedKingdom/WW2BritishServiceAntiTankGrenades</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<soundInteract>Interact_Grenade</soundInteract>
+				<techLevel>Industrial</techLevel>
+				<stackLimit>25</stackLimit>
+				<statBases>
+					<Mass>1.36</Mass>
+					<Bulk>10</Bulk>
+					<MarketValue>25</MarketValue>
+					<SightsEfficiency>1.0</SightsEfficiency>
+					<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+				</statBases>
+				<weaponTags>
+					<li>CE_AI_Grenade</li>
+					<li>CE_OneHandedWeapon</li>
+					<li>GrenadeDestructive</li>
+					<li>K4GWW2UnitedKingdomTrading</li>
+					<li>K4GWW2UnitedKingdomAntiTankGrenade</li>
+				</weaponTags>
+				<thingCategories>
+					<li>Grenades</li>
+				</thingCategories>
+				<verbs>
+					<li Class="CombatExtended.VerbPropertiesCE">
+						<label>throw anti-tank grenade</label>
+						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<range>16.0</range>
+						<warmupTime>1.4</warmupTime>
+						<noiseRadius>4</noiseRadius>
+						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+						<soundCast>ThrowGrenade</soundCast>
+						<targetParams>
+							<canTargetLocations>true</canTargetLocations>
+						</targetParams>
+						<defaultProjectile>K4G_Proj_WW2BritishServiceAntiTankGrenade</defaultProjectile>
+						<onlyManualCast>true</onlyManualCast>
+						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+					</li>
+				</verbs>
+				<comps>
+					<li Class="CombatExtended.CompProperties_FireModes">
+						<aiUseBurstMode>FALSE</aiUseBurstMode>
+						<aiAimMode>AimedShot</aiAimMode>
+					</li>
+				</comps>
+				<tools>
+					<li Class="CombatExtended.ToolCE">
+						<label>Body</label>
+						<capacities>
+							<li>Blunt</li>
+						</capacities>
+						<power>2</power>
+						<cooldownTime>1.75</cooldownTime>
+						<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+						<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
+					</li>
+				</tools>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<!-- === British No. 74 Sticky Bomb Anti-Tank Grenades === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2BritishServiceAntiTankGrenadesB"]</xpath>
+		<value>
+			<ThingDef ParentName="BaseEquipment">
+				<defName>K4G_Weapon_WW2BritishServiceAntiTankGrenadesB</defName>
+				<label>British No. 74 Sticky Bomb Anti-Tank Grenades</label>
+				<description>Heavy explosive grenades used during WW2. They can be thrown a short distance and are designed to damage or destroy armored targets.</description>
+				<graphicData>
+					<texPath>Things/Item/Equipment/WeaponRanged/UnitedKingdom/WW2BritishServiceAntiTankGrenadesB</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<weaponTags Inherit="False">
+					<li>CE_AI_Grenade</li>
+					<li>CE_OneHandedWeapon</li>
+					<li>GrenadeDestructive</li>
+					<li>K4GWW2UnitedKingdomTrading</li>
+					<li>K4GWW2UnitedKingdomAntiTankGrenade</li>
+				</weaponTags>
+				<soundInteract>Interact_Grenade</soundInteract>
+				<techLevel>Industrial</techLevel>
+				<stackLimit>25</stackLimit>
+				<statBases>
+					<Mass>1.36</Mass>
+					<Bulk>10</Bulk>
+					<MarketValue>27</MarketValue>
+					<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+					<SightsEfficiency>1.0</SightsEfficiency>
+				</statBases>
+				<thingCategories>
+					<li>Grenades</li>
+				</thingCategories>
+				<verbs>
+					<li Class="CombatExtended.VerbPropertiesCE">
+						<label>throw anti-tank grenade</label>
+						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<range>16</range>
+						<warmupTime>1.2</warmupTime>
+						<noiseRadius>4</noiseRadius>
+						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+						<soundCast>ThrowGrenade</soundCast>
+						<targetParams>
+							<canTargetLocations>true</canTargetLocations>
+						</targetParams>
+						<defaultProjectile>K4G_Proj_WW2BritishServiceAntiTankGrenadeB</defaultProjectile>
+						<onlyManualCast>true</onlyManualCast>
+						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+					</li>
+				</verbs>
+				<comps>
+					<li Class="CombatExtended.CompProperties_FireModes">
+						<aiUseBurstMode>FALSE</aiUseBurstMode>
+						<aiAimMode>AimedShot</aiAimMode>
+					</li>
+				</comps>
+				<tools>
+					<li Class="CombatExtended.ToolCE">
+						<label>Body</label>
+						<capacities>
+							<li>Blunt</li>
+						</capacities>
+						<power>2</power>
+						<cooldownTime>1.75</cooldownTime>
+						<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+						<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
+					</li>
+				</tools>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<!-- ===== Finnish ===== -->
+
+	<!-- === Finnish Mk II Grenades === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2FinnishServiceGrenades"]</xpath>
+		<value>
+			<ThingDef ParentName="BaseGrenadeEquipment">
+				<defName>K4G_Weapon_WW2FinnishServiceGrenades</defName>
+				<label>Finnish M32 Mortar Shell Grenades</label>
+				<description>Old-school fragmentation grenades used during WW2. They can be thrown a short distance, where they'll explode, damaging anything and anyone nearby.</description>
+				<graphicData>
+					<texPath>Things/Item/Equipment/WeaponRanged/Finland/WW2FinnishServiceGrenades</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<weaponTags Inherit="False">
+					<li>CE_AI_AOE</li>
+					<li>CE_OneHandedWeapon</li>
+					<li>K4GWW2FinlandTrading</li>
+					<li>K4GWW2FinlandGrenade</li>
+				</weaponTags>
+				<soundInteract>Interact_Grenade</soundInteract>
+				<techLevel>Industrial</techLevel>
+				<statBases>
+					<Mass>0.6</Mass>
+					<Bulk>0.87</Bulk>
+					<MarketValue>12.22</MarketValue>
+					<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+					<SightsEfficiency>1.0</SightsEfficiency>
+				</statBases>
+				<thingCategories>
+					<li>Grenades</li>
+				</thingCategories>
+				<verbs>
+					<li Class="CombatExtended.VerbPropertiesCE">
+						<label>throw frag grenade</label>
+						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<range>11</range>
+						<minRange>4</minRange>
+						<warmupTime>1.2</warmupTime>
+						<noiseRadius>4</noiseRadius>
+						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+						<soundCast>ThrowGrenade</soundCast>
+						<targetParams>
+							<canTargetLocations>true</canTargetLocations>
+						</targetParams>
+						<defaultProjectile>K4G_Proj_WW2FinnishServiceGrenade</defaultProjectile>
+						<onlyManualCast>true</onlyManualCast>
+						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+					</li>
+				</verbs>
+				<comps>
+					<li Class="CombatExtended.CompProperties_ExplosiveCE">
+						<damageAmountBase>56</damageAmountBase>
+						<explosiveDamageType>Bomb</explosiveDamageType>
+						<explosiveRadius>1.5</explosiveRadius>
+					</li>
+					<li Class="CombatExtended.CompProperties_Fragments">
+						<fragments>
+							<Fragment_Small>40</Fragment_Small>
+						</fragments>
+					</li>
+				</comps>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<!-- ===== France ===== -->
+
+	<!-- === French F1 Grenades === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2FrenchServiceGrenades"]</xpath>
+		<value>
+			<ThingDef ParentName="BaseGrenadeEquipment">
+				<defName>K4G_Weapon_WW2FrenchServiceGrenades</defName>
+				<label>French F1 Grenades</label>
+				<description>Old-school fragmentation grenades used during WW2. They can be thrown a short distance, where they'll explode, damaging anything and anyone nearby.</description>
+				<graphicData>
+					<texPath>Things/Item/Equipment/WeaponRanged/France/WW2FrenchServiceGrenades</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<weaponTags Inherit="False">
+					<li>CE_AI_AOE</li>
+					<li>CE_OneHandedWeapon</li>
+					<li>K4GWW2FranceTrading</li>
+					<li>K4GWW2FranceGrenade</li>
+				</weaponTags>
+				<soundInteract>Interact_Grenade</soundInteract>
+				<techLevel>Industrial</techLevel>
+				<statBases>
+					<Mass>0.6</Mass>
+					<Bulk>0.87</Bulk>
+					<MarketValue>12.22</MarketValue>
+					<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+					<SightsEfficiency>1.0</SightsEfficiency>
+				</statBases>
+				<thingCategories>
+					<li>Grenades</li>
+				</thingCategories>
+				<verbs>
+					<li Class="CombatExtended.VerbPropertiesCE">
+						<label>throw frag grenade</label>
+						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<range>11</range>
+						<minRange>4</minRange>
+						<warmupTime>1.2</warmupTime>
+						<noiseRadius>4</noiseRadius>
+						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+						<soundCast>ThrowGrenade</soundCast>
+						<targetParams>
+							<canTargetLocations>true</canTargetLocations>
+						</targetParams>
+						<defaultProjectile>K4G_Proj_WW2FrenchServiceGrenade</defaultProjectile>
+						<onlyManualCast>true</onlyManualCast>
+						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+					</li>
+				</verbs>
+				<comps>
+					<li Class="CombatExtended.CompProperties_ExplosiveCE">
+						<damageAmountBase>56</damageAmountBase>
+						<explosiveDamageType>Bomb</explosiveDamageType>
+						<explosiveRadius>1.5</explosiveRadius>
+					</li>
+					<li Class="CombatExtended.CompProperties_Fragments">
+						<fragments>
+							<Fragment_Small>40</Fragment_Small>
+						</fragments>
+					</li>
+				</comps>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<!-- ===== Germany ===== -->
+
+	<!-- === German M24 Stielhandgranate Grenades === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2GermanServiceGrenades"]</xpath>
+		<value>
+			<ThingDef ParentName="BaseGrenadeEquipment">
+				<defName>K4G_Weapon_WW2GermanServiceGrenades</defName>
+				<label>German M24 Stielhandgranate Grenades</label>
+				<description>Old-school fragmentation grenades used during WW2. They can be thrown a short distance, where they'll explode, damaging anything and anyone nearby.</description>
+				<graphicData>
+					<texPath>Things/Item/Equipment/WeaponRanged/Germany/WW2GermanServiceGrenades</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<weaponTags Inherit="False">
+					<li>CE_AI_AOE</li>
+					<li>CE_OneHandedWeapon</li>
+					<li>K4GWW2GermanyTrading</li>
+					<li>K4GWW2GermanyGrenade</li>
+				</weaponTags>
+				<soundInteract>Interact_Grenade</soundInteract>
+				<techLevel>Industrial</techLevel>
+				<statBases>
+					<Mass>0.6</Mass>
+					<Bulk>0.87</Bulk>
+					<MarketValue>12.22</MarketValue>
+					<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+					<SightsEfficiency>1.0</SightsEfficiency>
+				</statBases>
+				<thingCategories>
+					<li>Grenades</li>
+				</thingCategories>
+				<verbs>
+					<li Class="CombatExtended.VerbPropertiesCE">
+						<label>throw frag grenade</label>
+						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<range>11</range>
+						<minRange>4</minRange>
+						<warmupTime>1.2</warmupTime>
+						<noiseRadius>4</noiseRadius>
+						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+						<soundCast>ThrowGrenade</soundCast>
+						<targetParams>
+							<canTargetLocations>true</canTargetLocations>
+						</targetParams>
+						<defaultProjectile>K4G_Proj_WW2GermanServiceGrenade</defaultProjectile>
+						<onlyManualCast>true</onlyManualCast>
+						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+					</li>
+				</verbs>
+				<comps>
+					<li Class="CombatExtended.CompProperties_ExplosiveCE">
+						<damageAmountBase>56</damageAmountBase>
+						<explosiveDamageType>Bomb</explosiveDamageType>
+						<explosiveRadius>1.5</explosiveRadius>
+					</li>
+					<li Class="CombatExtended.CompProperties_Fragments">
+						<fragments>
+							<Fragment_Small>40</Fragment_Small>
+						</fragments>
+					</li>
+				</comps>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<!-- === German M39 Grenades === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2GermanServiceGrenadesB"]</xpath>
+		<value>
+			<ThingDef ParentName="BaseGrenadeEquipment">
+				<defName>K4G_Weapon_WW2GermanServiceGrenadesB</defName>
+				<label>German M39 Grenades</label>
+				<description>Old-school fragmentation grenades used during WW2. They can be thrown a short distance, where they'll explode, damaging anything and anyone nearby.</description>
+				<graphicData>
+					<texPath>Things/Item/Equipment/WeaponRanged/Germany/WW2GermanServiceGrenadesB</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<weaponTags Inherit="False">
+					<li>CE_AI_AOE</li>
+					<li>CE_OneHandedWeapon</li>
+					<li>K4GWW2GermanyTrading</li>
+					<li>K4GWW2GermanyGrenade</li>
+					<li>K4GWW2RussiaGrenadeSharedAllies</li>
+					<li>K4GWW2RussiaGrenadeSharedCoBelligerentGermany</li>
+				</weaponTags>
+				<soundInteract>Interact_Grenade</soundInteract>
+				<techLevel>Industrial</techLevel>
+				<statBases>
+					<Mass>0.6</Mass>
+					<Bulk>0.87</Bulk>
+					<MarketValue>13.22</MarketValue>
+					<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+					<SightsEfficiency>1.0</SightsEfficiency>
+				</statBases>
+				<thingCategories>
+					<li>Grenades</li>
+				</thingCategories>
+				<verbs>
+					<li Class="CombatExtended.VerbPropertiesCE">
+						<label>throw frag grenade</label>
+						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<range>11</range>
+						<minRange>4</minRange>
+						<warmupTime>1.2</warmupTime>
+						<noiseRadius>4</noiseRadius>
+						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+						<soundCast>ThrowGrenade</soundCast>
+						<targetParams>
+							<canTargetLocations>true</canTargetLocations>
+						</targetParams>
+						<defaultProjectile>K4G_Proj_WW2GermanServiceGrenade</defaultProjectile>
+						<onlyManualCast>true</onlyManualCast>
+						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+					</li>
+				</verbs>
+				<comps>
+					<li Class="CombatExtended.CompProperties_ExplosiveCE">
+						<damageAmountBase>56</damageAmountBase>
+						<explosiveDamageType>Bomb</explosiveDamageType>
+						<explosiveRadius>1.5</explosiveRadius>
+					</li>
+					<li Class="CombatExtended.CompProperties_Fragments">
+						<fragments>
+							<Fragment_Small>40</Fragment_Small>
+						</fragments>
+					</li>
+				</comps>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<!-- === German M24 Stielhandgranate Bundle Anti-Tank Grenades === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2GermanServiceAntiTankGrenades"]</xpath>
+		<value>
+			<ThingDef ParentName="BaseEquipment">
+				<defName>K4G_Weapon_WW2GermanServiceAntiTankGrenades</defName>
+				<label>German M24 Stielhandgranate Bundle Anti-Tank Grenades</label>
+				<description>Heavy explosive grenades used during WW2. They can be thrown a short distance and are designed to damage or destroy armored targets.</description>
+				<graphicData>
+					<texPath>Things/Item/Equipment/WeaponRanged/Germany/WW2GermanServiceAntiTankGrenades</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<weaponTags Inherit="False">
+					<li>CE_AI_Grenade</li>
+					<li>CE_OneHandedWeapon</li>
+					<li>GrenadeDestructive</li>
+					<li>K4GWW2GermanyTrading</li>
+					<li>K4GWW2GermanyAntiTankGrenade</li>
+				</weaponTags>
+				<soundInteract>Interact_Grenade</soundInteract>
+				<techLevel>Industrial</techLevel>
+				<stackLimit>25</stackLimit>
+				<statBases>
+					<Mass>1.36</Mass>
+					<Bulk>10</Bulk>
+					<MarketValue>28</MarketValue>
+					<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+					<SightsEfficiency>1.0</SightsEfficiency>
+				</statBases>
+				<thingCategories>
+					<li>Grenades</li>
+				</thingCategories>
+				<verbs>
+					<li Class="CombatExtended.VerbPropertiesCE">
+						<label>throw anti-tank grenade</label>
+						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<range>16</range>
+						<warmupTime>1.2</warmupTime>
+						<noiseRadius>4</noiseRadius>
+						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+						<soundCast>ThrowGrenade</soundCast>
+						<targetParams>
+							<canTargetLocations>true</canTargetLocations>
+						</targetParams>
+						<defaultProjectile>K4G_Proj_WW2GermanServiceAntiTankGrenade</defaultProjectile>
+						<onlyManualCast>true</onlyManualCast>
+						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+					</li>
+				</verbs>
+				<comps>
+					<li Class="CombatExtended.CompProperties_FireModes">
+						<aiUseBurstMode>FALSE</aiUseBurstMode>
+						<aiAimMode>AimedShot</aiAimMode>
+					</li>
+				</comps>
+				<tools>
+					<li Class="CombatExtended.ToolCE">
+						<label>Body</label>
+						<capacities>
+							<li>Blunt</li>
+						</capacities>
+						<power>2</power>
+						<cooldownTime>1.75</cooldownTime>
+						<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+						<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
+					</li>
+				</tools>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<!-- ===== Italy ===== -->
+
+	<!-- === Italian SRCM Mod.35 Grenades === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2ItalianServiceGrenades"]</xpath>
+		<value>
+			<ThingDef ParentName="BaseGrenadeEquipment">
+				<defName>K4G_Weapon_WW2ItalianServiceGrenades</defName>
+				<label>Italian SRCM Mod.35 Grenades</label>
+				<description>Old-school fragmentation grenades used during WW2. They can be thrown a short distance, where they'll explode, damaging anything and anyone nearby.</description>
+				<graphicData>
+					<texPath>Things/Item/Equipment/WeaponRanged/Italy/WW2ItalianServiceGrenades</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<weaponTags Inherit="False">
+					<li>CE_AI_AOE</li>
+					<li>CE_OneHandedWeapon</li>
+					<li>K4GWW2ItalyTrading</li>
+					<li>K4GWW2ItalyGrenade</li>
+				</weaponTags>
+				<soundInteract>Interact_Grenade</soundInteract>
+				<techLevel>Industrial</techLevel>
+				<statBases>
+					<Mass>0.6</Mass>
+					<Bulk>0.87</Bulk>
+					<MarketValue>11.22</MarketValue>
+					<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+					<SightsEfficiency>1.0</SightsEfficiency>
+				</statBases>
+				<thingCategories>
+					<li>Grenades</li>
+				</thingCategories>
+				<verbs>
+					<li Class="CombatExtended.VerbPropertiesCE">
+						<label>throw frag grenade</label>
+						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<range>11</range>
+						<minRange>4</minRange>
+						<warmupTime>1.2</warmupTime>
+						<noiseRadius>4</noiseRadius>
+						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+						<soundCast>ThrowGrenade</soundCast>
+						<targetParams>
+							<canTargetLocations>true</canTargetLocations>
+						</targetParams>
+						<defaultProjectile>K4G_Proj_WW2ItalianServiceGrenade</defaultProjectile>
+						<onlyManualCast>true</onlyManualCast>
+						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+					</li>
+				</verbs>
+				<comps>
+					<li Class="CombatExtended.CompProperties_ExplosiveCE">
+						<damageAmountBase>56</damageAmountBase>
+						<explosiveDamageType>Bomb</explosiveDamageType>
+						<explosiveRadius>1.5</explosiveRadius>
+					</li>
+					<li Class="CombatExtended.CompProperties_Fragments">
+						<fragments>
+							<Fragment_Small>30</Fragment_Small>
+						</fragments>
+					</li>
+				</comps>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<!-- === Italian OTO Mod.35 Grenades === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2ItalianServiceGrenadesB"]</xpath>
+		<value>
+			<ThingDef ParentName="BaseGrenadeEquipment">
+				<defName>K4G_Weapon_WW2ItalianServiceGrenadesB</defName>
+				<label>Italian OTO Mod.35 Grenades</label>
+				<description>Old-school fragmentation grenades used during WW2. They can be thrown a short distance, where they'll explode, damaging anything and anyone nearby.</description>
+				<graphicData>
+					<texPath>Things/Item/Equipment/WeaponRanged/Italy/WW2ItalianServiceGrenadesB</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<weaponTags Inherit="False">
+					<li>CE_AI_AOE</li>
+					<li>CE_OneHandedWeapon</li>
+					<li>K4GWW2ItalyTrading</li>
+					<li>K4GWW2ItalyGrenade</li>
+				</weaponTags>
+				<soundInteract>Interact_Grenade</soundInteract>
+				<techLevel>Industrial</techLevel>
+				<statBases>
+					<Mass>0.6</Mass>
+					<Bulk>0.87</Bulk>
+					<MarketValue>12.22</MarketValue>
+					<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+					<SightsEfficiency>1.0</SightsEfficiency>
+				</statBases>
+				<thingCategories>
+					<li>Grenades</li>
+				</thingCategories>
+				<verbs>
+					<li Class="CombatExtended.VerbPropertiesCE">
+						<label>throw frag grenade</label>
+						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<range>11</range>
+						<minRange>4</minRange>
+						<warmupTime>1.2</warmupTime>
+						<noiseRadius>4</noiseRadius>
+						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+						<soundCast>ThrowGrenade</soundCast>
+						<targetParams>
+							<canTargetLocations>true</canTargetLocations>
+						</targetParams>
+						<defaultProjectile>K4G_Proj_WW2ItalianServiceGrenadeB</defaultProjectile>
+						<onlyManualCast>true</onlyManualCast>
+						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+					</li>
+				</verbs>
+				<comps>
+					<li Class="CombatExtended.CompProperties_ExplosiveCE">
+						<damageAmountBase>56</damageAmountBase>
+						<explosiveDamageType>Bomb</explosiveDamageType>
+						<explosiveRadius>1.5</explosiveRadius>
+					</li>
+					<li Class="CombatExtended.CompProperties_Fragments">
+						<fragments>
+							<Fragment_Small>35</Fragment_Small>
+						</fragments>
+					</li>
+				</comps>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<!-- === Italian Breda Mod.35 Grenades === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2ItalianServiceGrenadesC"]</xpath>
+		<value>
+			<ThingDef ParentName="BaseGrenadeEquipment">
+				<defName>K4G_Weapon_WW2ItalianServiceGrenadesC</defName>
+				<label>Italian Breda Mod.35 Grenades</label>
+				<description>Old-school fragmentation grenades used during WW2. They can be thrown a short distance, where they'll explode, damaging anything and anyone nearby.</description>
+				<graphicData>
+					<texPath>Things/Item/Equipment/WeaponRanged/Italy/WW2ItalianServiceGrenadesC</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<weaponTags Inherit="False">
+					<li>CE_AI_AOE</li>
+					<li>CE_OneHandedWeapon</li>
+					<li>K4GWW2ItalyTrading</li>
+					<li>K4GWW2ItalyGrenade</li>
+				</weaponTags>
+				<soundInteract>Interact_Grenade</soundInteract>
+				<techLevel>Industrial</techLevel>
+				<statBases>
+					<Mass>0.6</Mass>
+					<Bulk>0.87</Bulk>
+					<MarketValue>13.22</MarketValue>
+					<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+					<SightsEfficiency>1.0</SightsEfficiency>
+				</statBases>
+				<thingCategories>
+					<li>Grenades</li>
+				</thingCategories>
+				<verbs>
+					<li Class="CombatExtended.VerbPropertiesCE">
+						<label>throw frag grenade</label>
+						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<range>11</range>
+						<minRange>4</minRange>
+						<warmupTime>1.2</warmupTime>
+						<noiseRadius>4</noiseRadius>
+						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+						<soundCast>ThrowGrenade</soundCast>
+						<targetParams>
+							<canTargetLocations>true</canTargetLocations>
+						</targetParams>
+						<defaultProjectile>K4G_Proj_WW2ItalianServiceGrenadeC</defaultProjectile>
+						<onlyManualCast>true</onlyManualCast>
+						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+					</li>
+				</verbs>
+				<comps>
+					<li Class="CombatExtended.CompProperties_ExplosiveCE">
+						<damageAmountBase>56</damageAmountBase>
+						<explosiveDamageType>Bomb</explosiveDamageType>
+						<explosiveRadius>1.5</explosiveRadius>
+					</li>
+					<li Class="CombatExtended.CompProperties_Fragments">
+						<fragments>
+							<Fragment_Small>40</Fragment_Small>
+						</fragments>
+					</li>
+				</comps>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<!-- === Italian Type L Anti-Tank Grenades === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2ItalianServiceAntiTankGrenades"]</xpath>
+		<value>
+			<ThingDef ParentName="BaseEquipment">
+				<defName>K4G_Weapon_WW2ItalianServiceAntiTankGrenades</defName>
+				<label>Italian Type L Anti-Tank Grenades</label>
+				<description>Heavy explosive grenades used during WW2. They can be thrown a short distance and are designed to damage or destroy armored targets.</description>
+				<graphicData>
+					<texPath>Things/Item/Equipment/WeaponRanged/Italy/WW2ItalianServiceAntiTankGrenades</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<weaponTags Inherit="False">
+					<li>CE_AI_Grenade</li>
+					<li>CE_OneHandedWeapon</li>
+					<li>GrenadeDestructive</li>
+					<li>K4GWW2ItalyTrading</li>
+					<li>K4GWW2ItalyAntiTankGrenade</li>
+				</weaponTags>
+				<soundInteract>Interact_Grenade</soundInteract>
+				<techLevel>Industrial</techLevel>
+				<stackLimit>25</stackLimit>
+				<statBases>
+					<Mass>1.36</Mass>
+					<Bulk>10</Bulk>
+					<MarketValue>25</MarketValue>
+					<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+					<SightsEfficiency>1.0</SightsEfficiency>
+				</statBases>
+				<thingCategories>
+					<li>Grenades</li>
+				</thingCategories>
+				<verbs>
+					<li Class="CombatExtended.VerbPropertiesCE">
+						<label>throw anti-tank grenade</label>
+						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<range>16</range>
+						<warmupTime>1.2</warmupTime>
+						<noiseRadius>4</noiseRadius>
+						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+						<soundCast>ThrowGrenade</soundCast>
+						<targetParams>
+							<canTargetLocations>true</canTargetLocations>
+						</targetParams>
+						<defaultProjectile>K4G_Proj_WW2ItalianServiceAntiTankGrenade</defaultProjectile>
+						<onlyManualCast>true</onlyManualCast>
+						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+					</li>
+				</verbs>
+				<comps>
+					<li Class="CombatExtended.CompProperties_FireModes">
+						<aiUseBurstMode>FALSE</aiUseBurstMode>
+						<aiAimMode>AimedShot</aiAimMode>
+					</li>
+				</comps>
+				<tools>
+					<li Class="CombatExtended.ToolCE">
+						<label>Body</label>
+						<capacities>
+							<li>Blunt</li>
+						</capacities>
+						<power>2</power>
+						<cooldownTime>1.75</cooldownTime>
+						<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+						<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
+					</li>
+				</tools>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<!-- ===== Japan ===== -->
+
+	<!-- === Japanese Type 97 Grenades === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2JapaneseServiceGrenades"]</xpath>
+		<value>
+			<ThingDef ParentName="BaseGrenadeEquipment">
+				<defName>K4G_Weapon_WW2JapaneseServiceGrenades</defName>
+				<label>Japanese Type 97 Grenades</label>
+				<description>Old-school fragmentation grenades used during WW2. They can be thrown a short distance, where they'll explode, damaging anything and anyone nearby.</description>
+				<graphicData>
+					<texPath>Things/Item/Equipment/WeaponRanged/Japan/WW2JapaneseServiceGrenades</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<weaponTags Inherit="False">
+					<li>CE_AI_AOE</li>
+					<li>CE_OneHandedWeapon</li>
+					<li>K4GWW2JapanTrading</li>
+					<li>K4GWW2JapanGrenade</li>
+				</weaponTags>
+				<soundInteract>Interact_Grenade</soundInteract>
+				<techLevel>Industrial</techLevel>
+				<statBases>
+					<Mass>0.6</Mass>
+					<Bulk>0.87</Bulk>
+					<MarketValue>12.22</MarketValue>
+					<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+					<SightsEfficiency>1.0</SightsEfficiency>
+				</statBases>
+				<thingCategories>
+					<li>Grenades</li>
+				</thingCategories>
+				<verbs>
+					<li Class="CombatExtended.VerbPropertiesCE">
+						<label>throw frag grenade</label>
+						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<range>11</range>
+						<minRange>4</minRange>
+						<warmupTime>1.2</warmupTime>
+						<noiseRadius>4</noiseRadius>
+						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+						<soundCast>ThrowGrenade</soundCast>
+						<targetParams>
+							<canTargetLocations>true</canTargetLocations>
+						</targetParams>
+						<defaultProjectile>K4G_Proj_WW2JapaneseServiceGrenade</defaultProjectile>
+						<onlyManualCast>true</onlyManualCast>
+						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+					</li>
+				</verbs>
+				<comps>
+					<li Class="CombatExtended.CompProperties_ExplosiveCE">
+						<damageAmountBase>56</damageAmountBase>
+						<explosiveDamageType>Bomb</explosiveDamageType>
+						<explosiveRadius>1.5</explosiveRadius>
+					</li>
+					<li Class="CombatExtended.CompProperties_Fragments">
+						<fragments>
+							<Fragment_Small>40</Fragment_Small>
+						</fragments>
+					</li>
+				</comps>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<!-- ===== Russia ===== -->
+
+	<!-- === Russian F1 Grenades === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2RussianServiceGrenades"]</xpath>
+		<value>
+			<ThingDef ParentName="BaseGrenadeEquipment">
+				<defName>K4G_Weapon_WW2RussianServiceGrenades</defName>
+				<label>Russian F1 Grenades</label>
+				<description>Old-school fragmentation grenades used during WW2. They can be thrown a short distance, where they'll explode, damaging anything and anyone nearby.</description>
+				<graphicData>
+					<texPath>Things/Item/Equipment/WeaponRanged/Russia/WW2RussianServiceGrenades</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<weaponTags Inherit="False">
+					<li>CE_AI_AOE</li>
+					<li>CE_OneHandedWeapon</li>
+					<li>K4GWW2RussiaTrading</li>
+					<li>K4GWW2RussiaGrenade</li>
+				</weaponTags>
+				<soundInteract>Interact_Grenade</soundInteract>
+				<techLevel>Industrial</techLevel>
+				<statBases>
+					<Mass>0.6</Mass>
+					<Bulk>0.87</Bulk>
+					<MarketValue>11.22</MarketValue>
+					<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+					<SightsEfficiency>1.0</SightsEfficiency>
+				</statBases>
+				<thingCategories>
+					<li>Grenades</li>
+				</thingCategories>
+				<verbs>
+					<li Class="CombatExtended.VerbPropertiesCE">
+						<label>throw frag grenade</label>
+						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<range>11</range>
+						<minRange>4</minRange>
+						<warmupTime>1.2</warmupTime>
+						<noiseRadius>4</noiseRadius>
+						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+						<soundCast>ThrowGrenade</soundCast>
+						<targetParams>
+							<canTargetLocations>true</canTargetLocations>
+						</targetParams>
+						<defaultProjectile>K4G_Proj_WW2RussianServiceGrenade</defaultProjectile>
+						<onlyManualCast>true</onlyManualCast>
+						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+					</li>
+				</verbs>
+				<comps>
+					<li Class="CombatExtended.CompProperties_ExplosiveCE">
+						<damageAmountBase>56</damageAmountBase>
+						<explosiveDamageType>Bomb</explosiveDamageType>
+						<explosiveRadius>1.5</explosiveRadius>
+					</li>
+					<li Class="CombatExtended.CompProperties_Fragments">
+						<fragments>
+							<Fragment_Small>30</Fragment_Small>
+						</fragments>
+					</li>
+				</comps>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<!-- === Russian RG-42 Grenades === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2RussianServiceGrenadesB"]</xpath>
+		<value>
+			<ThingDef ParentName="BaseGrenadeEquipment">
+				<defName>K4G_Weapon_WW2RussianServiceGrenadesB</defName>
+				<label>Russian RG-42 Grenades</label>
+				<description>Old-school fragmentation grenades used during WW2. They can be thrown a short distance, where they'll explode, damaging anything and anyone nearby.</description>
+				<graphicData>
+					<texPath>Things/Item/Equipment/WeaponRanged/Russia/WW2RussianServiceGrenadesB</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<weaponTags Inherit="False">
+					<li>CE_AI_AOE</li>
+					<li>CE_OneHandedWeapon</li>
+					<li>K4GWW2RussiaTrading</li>
+					<li>K4GWW2RussiaGrenade</li>
+				</weaponTags>
+				<soundInteract>Interact_Grenade</soundInteract>
+				<techLevel>Industrial</techLevel>
+				<statBases>
+					<Mass>0.6</Mass>
+					<Bulk>0.87</Bulk>
+					<MarketValue>12.22</MarketValue>
+					<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+					<SightsEfficiency>1.0</SightsEfficiency>
+				</statBases>
+				<thingCategories>
+					<li>Grenades</li>
+				</thingCategories>
+				<verbs>
+					<li Class="CombatExtended.VerbPropertiesCE">
+						<label>throw frag grenade</label>
+						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<range>11</range>
+						<minRange>4</minRange>
+						<warmupTime>1.2</warmupTime>
+						<noiseRadius>4</noiseRadius>
+						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+						<soundCast>ThrowGrenade</soundCast>
+						<targetParams>
+							<canTargetLocations>true</canTargetLocations>
+						</targetParams>
+						<defaultProjectile>K4G_Proj_WW2RussianServiceGrenadeB</defaultProjectile>
+						<onlyManualCast>true</onlyManualCast>
+						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+					</li>
+				</verbs>
+				<comps>
+					<li Class="CombatExtended.CompProperties_ExplosiveCE">
+						<damageAmountBase>56</damageAmountBase>
+						<explosiveDamageType>Bomb</explosiveDamageType>
+						<explosiveRadius>1.5</explosiveRadius>
+					</li>
+					<li Class="CombatExtended.CompProperties_Fragments">
+						<fragments>
+							<Fragment_Small>35</Fragment_Small>
+						</fragments>
+					</li>
+				</comps>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<!-- === Russian RGD-33 Grenades === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2RussianServiceGrenadesC"]</xpath>
+		<value>
+			<ThingDef ParentName="BaseGrenadeEquipment">
+				<defName>K4G_Weapon_WW2RussianServiceGrenadesC</defName>
+				<label>Russian RGD-33 Grenades</label>
+				<description>Old-school fragmentation grenades used during WW2. They can be thrown a short distance, where they'll explode, damaging anything and anyone nearby.</description>
+				<graphicData>
+					<texPath>Things/Item/Equipment/WeaponRanged/Russia/WW2RussianServiceGrenadesC</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<weaponTags Inherit="False">
+					<li>CE_AI_AOE</li>
+					<li>CE_OneHandedWeapon</li>
+					<li>K4GWW2RussiaTrading</li>
+					<li>K4GWW2RussiaGrenade</li>
+				</weaponTags>
+				<soundInteract>Interact_Grenade</soundInteract>
+				<techLevel>Industrial</techLevel>
+				<statBases>
+					<Mass>0.6</Mass>
+					<Bulk>0.87</Bulk>
+					<MarketValue>13.22</MarketValue>
+					<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+					<SightsEfficiency>1.0</SightsEfficiency>
+				</statBases>
+				<thingCategories>
+					<li>Grenades</li>
+				</thingCategories>
+				<verbs>
+					<li Class="CombatExtended.VerbPropertiesCE">
+						<label>throw frag grenade</label>
+						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<range>11</range>
+						<minRange>4</minRange>
+						<warmupTime>1.2</warmupTime>
+						<noiseRadius>4</noiseRadius>
+						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+						<soundCast>ThrowGrenade</soundCast>
+						<targetParams>
+							<canTargetLocations>true</canTargetLocations>
+						</targetParams>
+						<defaultProjectile>K4G_Proj_WW2RussianServiceGrenadeC</defaultProjectile>
+						<onlyManualCast>true</onlyManualCast>
+						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+					</li>
+				</verbs>
+				<comps>
+					<li Class="CombatExtended.CompProperties_ExplosiveCE">
+						<damageAmountBase>56</damageAmountBase>
+						<explosiveDamageType>Bomb</explosiveDamageType>
+						<explosiveRadius>1.5</explosiveRadius>
+					</li>
+					<li Class="CombatExtended.CompProperties_Fragments">
+						<fragments>
+							<Fragment_Small>40</Fragment_Small>
+						</fragments>
+					</li>
+				</comps>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<!-- === Russian RPG-40 Anti-Tank Grenades === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2RussianServiceAntiTankGrenades"]</xpath>
+		<value>
+			<ThingDef ParentName="BaseEquipment">
+				<defName>K4G_Weapon_WW2RussianServiceAntiTankGrenades</defName>
+				<label>Russian RPG-40 Anti-Tank Grenades</label>
+				<description>Heavy explosive grenades used during WW2. They can be thrown a short distance and are designed to damage or destroy armored targets.</description>
+				<graphicData>
+					<texPath>Things/Item/Equipment/WeaponRanged/Russia/WW2RussianServiceAntiTankGrenades</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<weaponTags Inherit="False">
+					<li>CE_AI_Grenade</li>
+					<li>CE_OneHandedWeapon</li>
+					<li>GrenadeDestructive</li>
+					<li>K4GWW2RussiaTrading</li>
+					<li>K4GWW2RussiaAntiTankGrenade</li>
+				</weaponTags>
+				<soundInteract>Interact_Grenade</soundInteract>
+				<techLevel>Industrial</techLevel>
+				<stackLimit>25</stackLimit>
+				<statBases>
+					<Mass>1.36</Mass>
+					<Bulk>10</Bulk>
+					<MarketValue>25</MarketValue>
+					<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+					<SightsEfficiency>1.0</SightsEfficiency>
+				</statBases>
+				<thingCategories>
+					<li>Grenades</li>
+				</thingCategories>
+				<verbs>
+					<li Class="CombatExtended.VerbPropertiesCE">
+						<label>throw anti-tank grenade</label>
+						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<range>16</range>
+						<warmupTime>1.2</warmupTime>
+						<noiseRadius>4</noiseRadius>
+						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+						<soundCast>ThrowGrenade</soundCast>
+						<targetParams>
+							<canTargetLocations>true</canTargetLocations>
+						</targetParams>
+						<defaultProjectile>K4G_Proj_WW2RussianServiceAntiTankGrenade</defaultProjectile>
+						<onlyManualCast>true</onlyManualCast>
+						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+					</li>
+				</verbs>
+				<comps>
+					<li Class="CombatExtended.CompProperties_FireModes">
+						<aiUseBurstMode>FALSE</aiUseBurstMode>
+						<aiAimMode>AimedShot</aiAimMode>
+					</li>
+				</comps>
+				<tools>
+					<li Class="CombatExtended.ToolCE">
+						<label>Body</label>
+						<capacities>
+							<li>Blunt</li>
+						</capacities>
+						<power>2</power>
+						<cooldownTime>1.75</cooldownTime>
+						<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+						<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
+					</li>
+				</tools>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<!-- === Russian RPG-43 Anti-Tank Grenades === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2RussianServiceAntiTankGrenadesB"]</xpath>
+		<value>
+			<ThingDef ParentName="BaseEquipment">
+				<defName>K4G_Weapon_WW2RussianServiceAntiTankGrenadesB</defName>
+				<label>Russian RPG-43 Anti-Tank Grenades</label>
+				<description>Heavy explosive grenades used during WW2. They can be thrown a short distance and are designed to damage or destroy armored targets.</description>
+				<graphicData>
+					<texPath>Things/Item/Equipment/WeaponRanged/Russia/WW2RussianServiceAntiTankGrenadesB</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<weaponTags Inherit="False">
+					<li>CE_AI_Grenade</li>
+					<li>CE_OneHandedWeapon</li>
+					<li>GrenadeDestructive</li>
+					<li>K4GWW2RussiaTrading</li>
+					<li>K4GWW2RussiaAntiTankGrenade</li>
+				</weaponTags>
+				<soundInteract>Interact_Grenade</soundInteract>
+				<techLevel>Industrial</techLevel>
+				<stackLimit>25</stackLimit>
+				<statBases>
+					<Mass>1.36</Mass>
+					<Bulk>10</Bulk>
+					<MarketValue>27</MarketValue>
+					<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+					<SightsEfficiency>1.0</SightsEfficiency>
+				</statBases>
+				<thingCategories>
+					<li>Grenades</li>
+				</thingCategories>
+				<verbs>
+					<li Class="CombatExtended.VerbPropertiesCE">
+						<label>throw anti-tank grenade</label>
+						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<range>16</range>
+						<warmupTime>1.2</warmupTime>
+						<noiseRadius>4</noiseRadius>
+						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+						<soundCast>ThrowGrenade</soundCast>
+						<targetParams>
+							<canTargetLocations>true</canTargetLocations>
+						</targetParams>
+						<defaultProjectile>K4G_Proj_WW2RussianServiceAntiTankGrenadeB</defaultProjectile>
+						<onlyManualCast>true</onlyManualCast>
+						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+					</li>
+				</verbs>
+				<comps>
+					<li Class="CombatExtended.CompProperties_FireModes">
+						<aiUseBurstMode>FALSE</aiUseBurstMode>
+						<aiAimMode>AimedShot</aiAimMode>
+					</li>
+				</comps>
+				<tools>
+					<li Class="CombatExtended.ToolCE">
+						<label>Body</label>
+						<capacities>
+							<li>Blunt</li>
+						</capacities>
+						<power>2</power>
+						<cooldownTime>1.75</cooldownTime>
+						<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+						<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
+					</li>
+				</tools>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<!-- === Russian RPG-6 Anti-Tank Grenades === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2RussianServiceAntiTankGrenadesC"]</xpath>
+		<value>
+			<ThingDef ParentName="BaseEquipment">
+				<defName>K4G_Weapon_WW2RussianServiceAntiTankGrenadesC</defName>
+				<label>Russian RPG-6 Anti-Tank Grenades</label>
+				<description>Heavy explosive grenades used during WW2. They can be thrown a short distance and are designed to damage or destroy armored targets.</description>
+				<graphicData>
+					<texPath>Things/Item/Equipment/WeaponRanged/Russia/WW2RussianServiceAntiTankGrenadesC</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<weaponTags Inherit="False">
+					<li>CE_AI_Grenade</li>
+					<li>CE_OneHandedWeapon</li>
+					<li>GrenadeDestructive</li>
+					<li>K4GWW2RussiaTrading</li>
+					<li>K4GWW2RussiaAntiTankGrenade</li>
+				</weaponTags>
+				<soundInteract>Interact_Grenade</soundInteract>
+				<techLevel>Industrial</techLevel>
+				<stackLimit>25</stackLimit>
+				<statBases>
+					<Mass>1.36</Mass>
+					<Bulk>10</Bulk>
+					<MarketValue>28</MarketValue>
+					<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+					<SightsEfficiency>1.0</SightsEfficiency>
+				</statBases>
+				<thingCategories>
+					<li>Grenades</li>
+				</thingCategories>
+				<verbs>
+					<li Class="CombatExtended.VerbPropertiesCE">
+						<label>throw anti-tank grenade</label>
+						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<range>16</range>
+						<warmupTime>1.2</warmupTime>
+						<noiseRadius>4</noiseRadius>
+						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+						<soundCast>ThrowGrenade</soundCast>
+						<targetParams>
+							<canTargetLocations>true</canTargetLocations>
+						</targetParams>
+						<defaultProjectile>K4G_Proj_WW2RussianServiceAntiTankGrenadeC</defaultProjectile>
+						<onlyManualCast>true</onlyManualCast>
+						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+					</li>
+				</verbs>
+				<comps>
+					<li Class="CombatExtended.CompProperties_FireModes">
+						<aiUseBurstMode>FALSE</aiUseBurstMode>
+						<aiAimMode>AimedShot</aiAimMode>
+					</li>
+				</comps>
+				<tools>
+					<li Class="CombatExtended.ToolCE">
+						<label>Body</label>
+						<capacities>
+							<li>Blunt</li>
+						</capacities>
+						<power>2</power>
+						<cooldownTime>1.75</cooldownTime>
+						<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+						<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
+					</li>
+				</tools>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<!-- ===== United States ===== -->
+
+	<!-- === American Mk II Grenades === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2AmericanServiceGrenades"]</xpath>
+		<value>
+			<ThingDef ParentName="BaseGrenadeEquipment">
+				<defName>K4G_Weapon_WW2AmericanServiceGrenades</defName>
+				<label>American Mk II Grenades</label>
+				<description>Old-school fragmentation grenades used during WW2. They can be thrown a short distance, where they'll explode, damaging anything and anyone nearby.</description>
+				<graphicData>
+					<texPath>Things/Item/Equipment/WeaponRanged/UnitedStates/WW2AmericanServiceGrenades</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<weaponTags Inherit="False">
+					<li>CE_AI_AOE</li>
+					<li>CE_OneHandedWeapon</li>
+					<li>K4GWW2UnitedStatesTrading</li>
+					<li>K4GWW2UnitedStatesGrenade</li>
+				</weaponTags>
+				<soundInteract>Interact_Grenade</soundInteract>
+				<techLevel>Industrial</techLevel>
+				<statBases>
+					<Mass>0.6</Mass>
+					<Bulk>0.87</Bulk>
+					<MarketValue>12.22</MarketValue>
+					<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+					<SightsEfficiency>1.0</SightsEfficiency>
+				</statBases>
+				<thingCategories>
+					<li>Grenades</li>
+				</thingCategories>
+				<verbs>
+					<li Class="CombatExtended.VerbPropertiesCE">
+						<label>throw frag grenade</label>
+						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<range>11</range>
+						<minRange>4</minRange>
+						<warmupTime>1.2</warmupTime>
+						<noiseRadius>4</noiseRadius>
+						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+						<soundCast>ThrowGrenade</soundCast>
+						<targetParams>
+							<canTargetLocations>true</canTargetLocations>
+						</targetParams>
+						<defaultProjectile>K4G_Proj_WW2AmericanServiceGrenade</defaultProjectile>
+						<onlyManualCast>true</onlyManualCast>
+						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+					</li>
+				</verbs>
+				<comps>
+					<li Class="CombatExtended.CompProperties_ExplosiveCE">
+						<damageAmountBase>56</damageAmountBase>
+						<explosiveDamageType>Bomb</explosiveDamageType>
+						<explosiveRadius>1.5</explosiveRadius>
+					</li>
+					<li Class="CombatExtended.CompProperties_Fragments">
+						<fragments>
+							<Fragment_Small>40</Fragment_Small>
+						</fragments>
+					</li>
+				</comps>
+			</ThingDef>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ThingDefs_Misc/WW2_Melee.xml b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ThingDefs_Misc/WW2_Melee.xml
new file mode 100644
index 0000000000..d6975ece5a
--- /dev/null
+++ b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/ThingDefs_Misc/WW2_Melee.xml	
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ======= Bayonet (Identical to Vanilla Knife) ======= -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WW2ServiceBayonet"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<chanceFactor>0.33</chanceFactor>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.18</cooldownTime>
+					<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.32</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.2</cooldownTime>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.42</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="WW2ServiceBayonet"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="WW2ServiceBayonet"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.5</MeleeCritChance>
+				<MeleeParryChance>0.15</MeleeParryChance>
+				<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="WW2ServiceBayonet"]</xpath>
+		<value>
+			<weaponTags>
+				<li>CE_Sidearm_Melee</li>
+				<li>CE_OneHandedWeapon</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+	<!-- ===== Japanese Shin Gunto Service Sword ===== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WW2ServiceSword"]/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.05</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.46</cooldownTime>
+					<chanceFactor>0.50</chanceFactor>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.20</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.39</cooldownTime>
+					<chanceFactor>0.45</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.48</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="WW2ServiceSword"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="WW2ServiceSword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.63</MeleeCritChance>
+				<MeleeParryChance>0.75</MeleeParryChance>
+				<MeleeDodgeChance>0.40</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="WW2ServiceSword"]</xpath>
+		<value>
+			<weaponTags>
+				<li>CE_Sidearm_Melee</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/TraderKinds_Defs/TraderKinds_Defs.xml b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/TraderKinds_Defs/TraderKinds_Defs.xml
new file mode 100644
index 0000000000..34767a47ae
--- /dev/null
+++ b/ModPatches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/TraderKinds_Defs/TraderKinds_Defs.xml	
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ======= Remove Vanilla Mortar Shells. =======-->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/TraderKindDef[@Name="WW2BaseTrader"]/stockGenerators/li[thingDef="Shell_HighExplosive"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/TraderKindDef[@Name="WW2BaseTrader"]/stockGenerators/li[thingDef="Shell_Incendiary"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/TraderKindDef[@Name="WW2BaseTrader"]/stockGenerators/li[thingDef="Shell_Smoke"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/TraderKindDef[@Name="WW2CaravanTrader"]/stockGenerators/li[thingDef="Shell_HighExplosive"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/TraderKindDef[@Name="WW2CaravanTrader"]/stockGenerators/li[thingDef="Shell_Incendiary"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/TraderKindDef[@Name="WW2CaravanTrader"]/stockGenerators/li[thingDef="Shell_Smoke"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/TraderKindDef[@Name="WW2VisitorTrader"]/stockGenerators/li[thingDef="Shell_HighExplosive"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/TraderKindDef[@Name="WW2VisitorTrader"]/stockGenerators/li[thingDef="Shell_Incendiary"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/TraderKindDef[@Name="WW2VisitorTrader"]/stockGenerators/li[thingDef="Shell_Smoke"]</xpath>
+	</Operation>
+
+	<!-- ======= Trader Base =======-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[@Name="WW2BaseTrader"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>FSX</thingDef>
+				<countRange>
+					<min>15</min>
+					<max>40</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>Prometheum</thingDef>
+				<countRange>
+					<min>15</min>
+					<max>40</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Ammo</tradeTag>
+				<countRange>
+					<min>400</min>
+					<max>1000</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>3</min>
+					<max>8</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_MediumAmmo</tradeTag>
+				<countRange>
+					<min>400</min>
+					<max>1000</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>3</min>
+					<max>8</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_HeavyAmmo</tradeTag>
+				<countRange>
+					<min>10</min>
+					<max>50</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>2</min>
+					<max>5</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Category">
+				<categoryDef>Ammo</categoryDef>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>0</max>
+				</thingDefCountRange>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ======= Trader Caravan Base =======-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[@Name="WW2CaravanTrader"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>FSX</thingDef>
+				<countRange>
+					<min>15</min>
+					<max>40</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>Prometheum</thingDef>
+				<countRange>
+					<min>15</min>
+					<max>40</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Ammo</tradeTag>
+				<countRange>
+					<min>400</min>
+					<max>1000</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>3</min>
+					<max>8</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_MediumAmmo</tradeTag>
+				<countRange>
+					<min>10</min>
+					<max>50</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>2</min>
+					<max>4</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_HeavyAmmo</tradeTag>
+				<countRange>
+					<min>5</min>
+					<max>30</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>2</min>
+					<max>6</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Category">
+				<categoryDef>Ammo</categoryDef>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>0</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Turret</tradeTag>
+				<thingDefCountRange>
+					<min>-4</min>
+					<max>2</max>
+				</thingDefCountRange>
+				<countRange>
+					<min>1</min>
+					<max>1</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_Category">
+				<categoryDef>WeaponsTurrets</categoryDef>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>0</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Animals">
+				<tradeTagsSell>
+					<li>CE_AnimalBoom</li>
+				</tradeTagsSell>
+				<tradeTagsBuy>
+					<li>CE_AnimalBoom</li>
+				</tradeTagsBuy>
+				<kindCountRange>
+					<min>0</min>
+					<max>1</max>
+				</kindCountRange>
+				<countRange>
+					<min>-1</min>
+					<max>2</max>
+				</countRange>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ======= Trader Visitor Base =======-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[@Name="WW2VisitorTrader"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>FSX</thingDef>
+				<countRange>
+					<min>0</min>
+					<max>15</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>Prometheum</thingDef>
+				<countRange>
+					<min>0</min>
+					<max>15</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Ammo</tradeTag>
+				<countRange>
+					<min>100</min>
+					<max>250</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>4</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Category">
+				<categoryDef>Ammo</categoryDef>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>0</max>
+				</thingDefCountRange>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/KV Hand n Footwear/Patches/KV Hand n Footwear/HnF_Apparel_Footwear.xml b/ModPatches/KV Hand n Footwear/Patches/KV Hand n Footwear/HnF_Apparel_Footwear.xml
new file mode 100644
index 0000000000..2c147c6d53
--- /dev/null
+++ b/ModPatches/KV Hand n Footwear/Patches/KV Hand n Footwear/HnF_Apparel_Footwear.xml	
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== All footwear ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="FootArmorMakeableBase"]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>Shell</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<!-- ========== Tribal Boots ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_TribalBoots"]/statBases</xpath>
+		<value>
+			<Bulk>1.5</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_TribalBoots"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Cowboy Boots ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_CowboyBoots"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_CowboyBoots"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Plated Boots ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_CombatBoots"]/statBases</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+			<Bulk>3</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Apparel_CombatBoots"]/equippedStatOffsets</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_CombatBoots"]/statBases/Mass</xpath>
+		<value>
+			<Mass>3</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_CombatBoots"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.35</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_CombatBoots"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.125</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ========== Power Boots ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_PowerBoots"]/statBases/Mass</xpath>
+		<value>
+			<Mass>3</Mass>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PowerBoots"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PowerBoots"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>40.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_PowerBoots"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>6</CarryWeight>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/KV Hand n Footwear/Patches/KV Hand n Footwear/HnF_Apparel_Handwear.xml b/ModPatches/KV Hand n Footwear/Patches/KV Hand n Footwear/HnF_Apparel_Handwear.xml
new file mode 100644
index 0000000000..fe6eba48b1
--- /dev/null
+++ b/ModPatches/KV Hand n Footwear/Patches/KV Hand n Footwear/HnF_Apparel_Handwear.xml	
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== All handwear ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "Apparel_Gloves" or
+			defName = "Apparel_DexterousGloves" or
+			defName = "Apparel_PlatedGloves" or
+			defName = "Apparel_PowerGloves"
+			]/apparel/layers/li
+		</xpath>
+		<value>
+			<li>Shell</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Gloves"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_DexterousGloves"]/statBases</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Dexterous Gloves ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_DexterousGloves"]/equippedStatOffsets</xpath>
+		<value>
+			<ReloadSpeed>0.1</ReloadSpeed>
+		</value>
+	</Operation>
+
+	<!-- ========== Plated Gloves ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_PlatedGloves"]/statBases</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+			<Bulk>3</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Apparel_PlatedGloves"]/equippedStatOffsets</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PlatedGloves"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.35</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PlatedGloves"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.125</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ========== Power Gloves ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PowerGloves"]/statBases/Mass</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+			<Mass>3</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PowerGloves"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PowerGloves"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>40.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kaiser Armory/Defs/Kaiser Armory/105x155mmR.xml b/ModPatches/Kaiser Armory/Defs/Kaiser Armory/105x155mmR.xml
new file mode 100644
index 0000000000..3ebd947126
--- /dev/null
+++ b/ModPatches/Kaiser Armory/Defs/Kaiser Armory/105x155mmR.xml	
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>Ammo105x155mmRCannonShells</defName>
+		<label>105x155mmR cannon shell</label>
+		<parent>AmmoShells</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberCannon</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_105x155mmRCannonShell</defName>
+		<label>105x155mmR howitzer shells</label>
+		<ammoTypes>
+			<Ammo_105x155mmRCannonShell_HE>Bullet_105x155mmRCannonShell_HE</Ammo_105x155mmRCannonShell_HE>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="105x155mmRCannonShellBase" ParentName="HeavyAmmoBase" Abstract="True">
+		<description>Light howitzer shell used in field guns.</description>
+		<thingCategories>
+			<li>Ammo105x155mmRCannonShells</li>
+		</thingCategories>
+		<stackLimit>25</stackLimit>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<statBases>
+			<MaxHitPoints>150</MaxHitPoints>
+			<Mass>14.81</Mass>
+			<Bulk>10.40</Bulk>
+		</statBases>
+		<cookOffFlashScale>20</cookOffFlashScale>
+		<cookOffSound>MortarBomb_Explode</cookOffSound>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="105x155mmRCannonShellBase">
+		<defName>Ammo_105x155mmRCannonShell_HE</defName>
+		<label>105x155mmR Cannon shell (HE)</label>
+		<graphicData>
+			<texPath>Turret/leFH_16/Projectile/Shell_HE</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<drawSize>1.30</drawSize>
+		</graphicData>
+		<statBases>
+			<MarketValue>96.36</MarketValue>
+		</statBases>
+		<ammoClass>GrenadeHE</ammoClass>
+		<detonateProjectile>Bullet_105x155mmRCannonShell_HE</detonateProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef Name="Base105x155mmRCannonShell" ParentName="BaseExplosiveBullet" Abstract="true">
+		<graphicData>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>0</speed>
+			<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+			<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+			<soundAmbient>MortarRound_Ambient</soundAmbient>
+			<flyOverhead>true</flyOverhead>
+			<dropsCasings>true</dropsCasings>
+			<casingMoteDefname>Fleck_BigShell</casingMoteDefname>
+			<casingFilthDefname>Filth_CannonAmmoCasings</casingFilthDefname>
+			<gravityFactor>5</gravityFactor>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base105x155mmRCannonShell">
+		<defName>Bullet_105x155mmRCannonShell_HE</defName>
+		<label>105x155mmR Cannon shell (HE)</label>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<graphicData>
+			<texPath>Turret/leFH_16/Projectile/Bullet_10,5cm_HE</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>0.80</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>190</damageAmountBase>
+			<explosionRadius>3.5</explosionRadius>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>15</Fragment_Large>
+					<Fragment_Small>50</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_105x155mmRCannonShell_HE</defName>
+		<label>make 105x155mmR HE cannon shells x5</label>
+		<description>Craft 5 105x155mmR HE cannon shells.</description>
+		<jobString>Making 105x155mmR HE cannon shells.</jobString>
+		<workAmount>9000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>70</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_105x155mmRCannonShell_HE>5</Ammo_105x155mmRCannonShell_HE>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Kaiser Armory/Defs/Kaiser Armory/77x230mmR.xml b/ModPatches/Kaiser Armory/Defs/Kaiser Armory/77x230mmR.xml
new file mode 100644
index 0000000000..eb8c18f929
--- /dev/null
+++ b/ModPatches/Kaiser Armory/Defs/Kaiser Armory/77x230mmR.xml	
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>Ammo77x230mmRCannonShells</defName>
+		<label>77x230mmR cannon shell</label>
+		<parent>AmmoShells</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberCannon</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_77x230mmRCannonShell</defName>
+		<label>77x230mmR Cannon shells</label>
+		<ammoTypes>
+			<Ammo_77x230mmRCannonShell_HE>Bullet_77x230mmRCannonShell_HE</Ammo_77x230mmRCannonShell_HE>
+			<Ammo_77x230mmRCannonShell_EMP>Bullet_77x230mmRCannonShell_EMP</Ammo_77x230mmRCannonShell_EMP>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="77x230mmRCannonShellBase" ParentName="HeavyAmmoBase" Abstract="True">
+		<description>Light shell used in field guns.</description>
+		<thingCategories>
+			<li>Ammo77x230mmRCannonShells</li>
+		</thingCategories>
+		<stackLimit>25</stackLimit>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<statBases>
+			<MaxHitPoints>150</MaxHitPoints>
+			<Mass>6.85</Mass>
+			<Bulk>9.32</Bulk>
+		</statBases>
+		<cookOffFlashScale>20</cookOffFlashScale>
+		<cookOffSound>MortarBomb_Explode</cookOffSound>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="77x230mmRCannonShellBase">
+		<defName>Ammo_77x230mmRCannonShell_HE</defName>
+		<label>77x230mmR Cannon shell (HE)</label>
+		<graphicData>
+			<texPath>Turret/FK_96/Projectile/Shell_HE</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<drawSize>1.60</drawSize>
+		</graphicData>
+		<statBases>
+			<MarketValue>41.3</MarketValue>
+		</statBases>
+		<ammoClass>GrenadeHE</ammoClass>
+		<detonateProjectile>Bullet_77x230mmRCannonShell_HE</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="77x230mmRCannonShellBase">
+		<defName>Ammo_77x230mmRCannonShell_EMP</defName>
+		<label>77x230mmR Cannon shell (EMP)</label>
+		<graphicData>
+			<texPath>Turret/FK_96/Projectile/Shell_AP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<drawSize>1.60</drawSize>
+		</graphicData>
+		<statBases>
+			<MarketValue>60.27</MarketValue>
+		</statBases>
+		<ammoClass>GrenadeEMP</ammoClass>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>99</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>2</explosiveRadius>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>22</Fragment_Large>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef Name="Base77x230mmRCannonShell" ParentName="BaseExplosiveBullet" Abstract="true">
+		<graphicData>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>101</speed>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<flyOverhead>false</flyOverhead>
+			<dropsCasings>true</dropsCasings>
+			<casingMoteDefname>Fleck_BigShell</casingMoteDefname>
+			<casingFilthDefname>Filth_CannonAmmoCasings</casingFilthDefname>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base77x230mmRCannonShell">
+		<defName>Bullet_77x230mmRCannonShell_HE</defName>
+		<label>77x230mmR Cannon shell (HE)</label>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<graphicData>
+			<texPath>Turret/FK_96/Projectile/Bullet_7,7cm_HE</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>57</damageAmountBase>
+			<explosionRadius>1.5</explosionRadius>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>20</Fragment_Large>
+					<Fragment_Small>19</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="Base77x230mmRCannonShell">
+		<defName>Bullet_77x230mmRCannonShell_EMP</defName>
+		<label>77x230mmR Cannon shell (EMP)</label>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<graphicData>
+			<texPath>Turret/FK_96/Projectile/Bullet_7,7cm_AP</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>EMP</damageDef>
+			<damageAmountBase>99</damageAmountBase>
+			<explosionRadius>3</explosionRadius>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_77x230mmRCannonShell_HE</defName>
+		<label>make 77x230mmR HE cannon shells x5</label>
+		<description>Craft 5 77x230mmR HE cannon shells.</description>
+		<jobString>Making 77x230mmR HE cannon shells.</jobString>
+		<workAmount>9000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>70</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_77x230mmRCannonShell_HE>5</Ammo_77x230mmRCannonShell_HE>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_77x230mmRCannonShell_EMP</defName>
+		<label>make 77x230mmR EMP cannon shells x5</label>
+		<description>Craft 5 77x230mmR EMP cannon shells.</description>
+		<jobString>Making 77x230mmR EMP cannon shells.</jobString>
+		<workAmount>10000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>70</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_77x230mmRCannonShell_EMP>5</Ammo_77x230mmRCannonShell_EMP>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Kaiser Armory/Defs/Kaiser Armory/KaiserArmory_GrenadeRecipe.xml b/ModPatches/Kaiser Armory/Defs/Kaiser Armory/KaiserArmory_GrenadeRecipe.xml
new file mode 100644
index 0000000000..b7e6224159
--- /dev/null
+++ b/ModPatches/Kaiser Armory/Defs/Kaiser Armory/KaiserArmory_GrenadeRecipe.xml	
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeM1915Grenade</defName>
+		<label>make M1915 grenades x10</label>
+		<description>Craft 10 M1915 grenades.</description>
+		<jobString>Making M1915 grenades.</jobString>
+		<workAmount>3400</workAmount>
+		<recipeUsers Inherit="False">
+			<li>TableKA</li>
+		</recipeUsers>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>WoodLog</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Weapon_M1915_KA>10</Weapon_M1915_KA>
+		</products>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Kaiser Armory/Patches/Kaiser Armory/KaiserArmory_Guns.xml b/ModPatches/Kaiser Armory/Patches/Kaiser Armory/KaiserArmory_Guns.xml
new file mode 100644
index 0000000000..f3b4b81fda
--- /dev/null
+++ b/ModPatches/Kaiser Armory/Patches/Kaiser Armory/KaiserArmory_Guns.xml	
@@ -0,0 +1,683 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Tools ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_C96_KA" or defName="Gun_P08_KA"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_MP_18_KA" or
+			defName="Gun_Gew_98_KA" or
+			defName="Gun_P08_Artillerie_KA" or
+			defName="Gun_MG_15_KA" or
+			defName="Gun_M1916_Selbstlader_KA"]/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_WEX_KA"]/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>
+
+	<!-- ========== MP 18 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MP_18_KA</defName>
+		<statBases>
+			<Mass>4.18</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.25</SwayFactor>
+			<Bulk>8.32</Bulk>
+			<WorkToMake>18000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>70</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+			<WoodLog>10</WoodLog>
+		</costList>
+		<Properties>
+			<recoilAmount>1.13</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<soundCast>Shot_MP_18</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>4</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<researchPrerequisite>Stage2b_KA</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== Gew 98 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Gew_98_KA</defName>
+		<statBases>
+			<Mass>4.10</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.66</SwayFactor>
+			<Bulk>12.50</Bulk>
+			<WorkToMake>12000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+			<WoodLog>20</WoodLog>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_Gew_98</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<researchPrerequisite>Stage0b_KA</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== Gew 98 with Bayonet ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Gew_98_Bayonet_KA</defName>
+		<statBases>
+			<Mass>4.40</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>2.06</SwayFactor>
+			<Bulk>16.50</Bulk>
+			<WorkToMake>500</WorkToMake>
+		</statBases>
+		<costList>
+			<Gun_Gew_98_KA>1</Gun_Gew_98_KA>
+			<MeleeWeapon_S98_05_KA>1</MeleeWeapon_S98_05_KA>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_Gew_98</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+		<researchPrerequisite>Stage0b_KA</researchPrerequisite>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_Gew_98_Bayonet_KA"]/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>bayonet</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>2.14</cooldownTime>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.17</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>bayonet</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.49</cooldownTime>
+					<armorPenetrationBlunt>2.16</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.44</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Mauser 1916 Selbstlader ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_M1916_Selbstlader_KA</defName>
+		<statBases>
+			<Mass>4.90</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.64</SwayFactor>
+			<Bulk>11.50</Bulk>
+			<WorkToMake>20000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>80</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+			<WoodLog>20</WoodLog>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_Gew_98</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<researchPrerequisite>Stage2b_KA</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== Mauser C96 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_C96_KA</defName>
+		<statBases>
+			<Mass>1.13</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.42</SwayFactor>
+			<Bulk>3.12</Bulk>
+			<WorkToMake>8000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+			<WoodLog>5</WoodLog>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_763x25mmMauser_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_C96</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_763x25mmMauser</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<researchPrerequisite>Stage0b_KA</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== WEX (Flamethrower) ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_WEX_KA</defName>
+		<statBases>
+			<Mass>24</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.35</SwayFactor>
+			<Bulk>24</Bulk>
+			<WorkToMake>14000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>120</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>0.85</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<defaultProjectile>Bullet_Flamethrower_Prometheum</defaultProjectile>
+			<hasStandardCommand>true</hasStandardCommand>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<warmupTime>1.1</warmupTime>
+			<range>11</range>
+			<minRange>3</minRange>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<soundCast>Shot_WEX</soundCast>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<muzzleFlashScale>0</muzzleFlashScale>
+			<burstShotCount>20</burstShotCount>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>80</magazineSize>
+			<reloadTime>10</reloadTime>
+			<ammoSet>AmmoSet_Flamethrower</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>true</aiUseBurstMode>
+			<aimedBurstShotCount>10</aimedBurstShotCount>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>GunHeavy</li>
+		</weaponTags>
+		<researchPrerequisite>Stage1b_KA</researchPrerequisite>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Gun_WEX_KA"]/equippedStatOffsets</xpath>
+	</Operation>
+
+	<!-- ========== P08 (Luger) ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_P08_KA</defName>
+		<statBases>
+			<Mass>0.87</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.03</SwayFactor>
+			<Bulk>2.22</Bulk>
+			<WorkToMake>14000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_P08</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<researchPrerequisite>Stage1b_KA</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== P08 (Artillery Luger) ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_P08_Artillerie_KA</defName>
+		<statBases>
+			<Mass>2.20</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.97</SwayFactor>
+			<Bulk>7.50</Bulk>
+			<WorkToMake>16000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+			<WoodLog>5</WoodLog>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_P08</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4.8</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<researchPrerequisite>Stage1b_KA</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== MG 15 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MG_15_KA</defName>
+		<statBases>
+			<Mass>11.80</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.62</SwayFactor>
+			<Bulk>12.40</Bulk>
+			<WorkToMake>22000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>140</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+			<WoodLog>5</WoodLog>
+		</costList>
+		<Properties>
+			<recoilAmount>1.20</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>62</range>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>Shot_MG_15</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>75</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<researchPrerequisite>Stage2b_KA</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Gun_MG_15_KA"]/equippedStatOffsets</xpath>
+	</Operation>
+
+	<!-- ========== M1914 Concussion Grenade ========== -->
+
+	<!-- Projectile -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Proj_M1915_KA"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Proj_M1915_KA"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<explosionRadius>2</explosionRadius>
+				<damageDef>Bomb</damageDef>
+				<damageAmountBase>60</damageAmountBase>
+				<explosionDelay>100</explosionDelay>
+				<dropsCasings>true</dropsCasings>
+				<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+				<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<speed>12</speed>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+				<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Proj_M1915_KA"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Proj_M1915_KA"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<!-- M1915 Concussion Grenade -->
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="Weapon_M1915_KA"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>BaseWeapon</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Weapon_M1915_KA"]/recipeMaker</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Weapon_M1915_KA"]/costList</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Weapon_M1915_KA"]/label</xpath>
+		<value>
+			<label>M1915 concussion grenade</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Weapon_M1915_KA"]</xpath>
+		<value>
+			<equippedAngleOffset>90</equippedAngleOffset>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Weapon_M1915_KA"]</xpath>
+		<value>
+			<thingClass>CombatExtended.AmmoThing</thingClass>
+			<stackLimit>75</stackLimit>
+			<resourceReadoutPriority>First</resourceReadoutPriority>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="Weapon_M1915_KA"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Weapon_M1915_KA"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Weapon_M1915_KA"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Weapon_M1915_KA"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>60</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>2</explosiveRadius>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Weapon_M1915_KA</defName>
+		<statBases>
+			<Mass>0.82</Mass>
+			<Bulk>0.36</Bulk>
+			<MarketValue>12.22</MarketValue>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<label>throw concussion grenade</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<range>13.0</range>
+			<minRange>2</minRange>
+			<warmupTime>0.8</warmupTime>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<soundCast>ThrowGrenade</soundCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<defaultProjectile>Proj_M1915_KA</defaultProjectile>
+			<onlyManualCast>true</onlyManualCast>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<weaponTags>
+			<li>CE_AI_Grenade</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kaiser Armory/Patches/Kaiser Armory/KaiserArmory_Melee.xml b/ModPatches/Kaiser Armory/Patches/Kaiser Armory/KaiserArmory_Melee.xml
new file mode 100644
index 0000000000..8d2a2db5ed
--- /dev/null
+++ b/ModPatches/Kaiser Armory/Patches/Kaiser Armory/KaiserArmory_Melee.xml	
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === Shovel === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="Feldspaten_KA"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>0.40</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="Feldspaten_KA"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>0.40</MeleeParryChance>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Feldspaten_KA"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.28</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Bayonet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_S98_05_KA"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<MeleeCounterParryBonus>0.30</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_S98_05_KA"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.10</MeleeCritChance>
+			<MeleeParryChance>0.30</MeleeParryChance>
+			<MeleeDodgeChance>0.010</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_S98_05_KA"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_S98_05_KA"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1</cooldownTime>
+					<armorPenetrationBlunt>0.56</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.72</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1</cooldownTime>
+					<chanceFactor>1.88</chanceFactor>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.76</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Saber === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Sabel"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Sabel"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>0.35</MeleeParryChance>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Sabel"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Sabel"]/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>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kaiser Armory/Patches/Kaiser Armory/KaiserArmory_Turrets.xml b/ModPatches/Kaiser Armory/Patches/Kaiser Armory/KaiserArmory_Turrets.xml
new file mode 100644
index 0000000000..c0643e0353
--- /dev/null
+++ b/ModPatches/Kaiser Armory/Patches/Kaiser Armory/KaiserArmory_Turrets.xml	
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Common to all Turrets ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			@Name="Base_FK_96_KA" or
+			@Name="Base_leFH_16_KA" or
+			defName="Turret_MG_08_KA"
+			]/thingClass </xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<!-- ========== Remove Vanilla Ammo Shells ========== -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Shell_77cm_AP_KA"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Shell_77cm_HE_KA"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Shell_105cm_HE_KA"]</xpath>
+	</Operation>
+	<!-- ========== MG 08 ========== -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Turret_MG_08_KA"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MG_08_KA</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.66</SwayFactor>
+			<Bulk>13.75</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.40</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>62</range>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>Shot_MG_08</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>250</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== FK 96 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Artillery_FK_96_KA</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>2.75</RangedWeapon_Cooldown>
+			<SightsEfficiency>2</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.14</SwayFactor>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_77x230mmRCannonShell_HE</defaultProjectile>
+			<warmupTime>4.55</warmupTime>
+			<range>78</range>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>Shot_FK_96</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>20</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>9.8</reloadTime>
+			<ammoSet>AmmoSet_77x230mmRCannonShell</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== leFH 16 ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Artillery_leFH_16_KA"]</xpath>
+		<value>
+			<statBases>
+				<SightsEfficiency>0.8</SightsEfficiency>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Artillery_leFH_16_KA"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Artillery_leFH_16_KA"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Artillery_leFH_16_KA"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>30</li>
+					<li>50</li>
+					<li>70</li>
+					<li>90</li>
+				</chargeSpeeds>
+			</li>
+			<li Class="CombatExtended.CompProperties_AmmoUser">
+				<magazineSize>1</magazineSize>
+				<reloadTime>5</reloadTime>
+				<ammoSet>AmmoSet_105x155mmRCannonShell</ammoSet>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Artillery_leFH_16_KA"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+					<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+					<hasStandardCommand>true</hasStandardCommand>
+					<requireLineOfSight>false</requireLineOfSight>
+					<defaultProjectile>Bullet_105x155mmRCannonShell_HE</defaultProjectile>
+					<warmupTime>10</warmupTime>
+					<minRange>32</minRange>
+					<range>1000</range>
+					<burstShotCount>1</burstShotCount>
+					<soundCast>Shot_leFH_16</soundCast>
+					<muzzleFlashScale>39</muzzleFlashScale>
+					<circularError>1</circularError>
+					<indirectFirePenalty>0.15</indirectFirePenalty>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Patch base -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Base_leFH_16_KA"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Base_leFH_16_KA"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>5</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="Base_leFH_16_KA"]/building</xpath>
+		<value>
+			<spawnedConceptLearnOpportunity>CE_MortarDirectFire</spawnedConceptLearnOpportunity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="Base_leFH_16_KA"]/inspectorTabs</xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kemomimihouse/Patches/Kemomimihouse/ThingDefs_Misc/Weapons_kemomimiMelee.xml b/ModPatches/Kemomimihouse/Patches/Kemomimihouse/ThingDefs_Misc/Weapons_kemomimiMelee.xml
new file mode 100644
index 0000000000..5650e158b3
--- /dev/null
+++ b/ModPatches/Kemomimihouse/Patches/Kemomimihouse/ThingDefs_Misc/Weapons_kemomimiMelee.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_konkatana"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.69</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.69</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationSharp>1.6</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>38</power>
+					<cooldownTime>1.05</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationSharp>0.97</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.872</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_konkatana"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>1.19</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_konkatana"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.43</MeleeCritChance>
+				<MeleeParryChance>0.57</MeleeParryChance>
+				<MeleeDodgeChance>0.33</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_sirokatana"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.19</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.8</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>0.63</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationSharp>0.84</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_sirokatana"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>1.43</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_sirokatana"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.48</MeleeCritChance>
+				<MeleeParryChance>1.07</MeleeParryChance>
+				<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kemomimihouse/Patches/Kemomimihouse/ThingDefs_Races/Race_Animals.xml b/ModPatches/Kemomimihouse/Patches/Kemomimihouse/ThingDefs_Races/Race_Animals.xml
new file mode 100644
index 0000000000..9c9d7e5a4a
--- /dev/null
+++ b/ModPatches/Kemomimihouse/Patches/Kemomimihouse/ThingDefs_Races/Race_Animals.xml
@@ -0,0 +1,761 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[
+			defName="akame" or
+			defName="aome" or
+			defName="hana" or
+			defName="kon" or
+			defName="kuro" or
+			defName="miko" or
+			defName="siro" or
+			defName="yuki" or
+			defName="kohime" or
+			defName="konf" or
+			defName="sirof"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="akame" or
+			defName="aome" or
+			defName="hana" or
+			defName="kon" or
+			defName="kuro" or
+			defName="miko" or
+			defName="siro" or
+			defName="yuki" or
+			defName="kohime" or
+			defName="konf" or
+			defName="sirof"
+			]/comps </xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Inventory"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="akame" or
+			defName="aome" or
+			defName="hana" or
+			defName="kon" or
+			defName="kuro" or
+			defName="miko" or
+			defName="siro" or
+			defName="yuki" or
+			defName="kohime" or
+			defName="konf" or
+			defName="sirof"
+			]/statBases </xpath>
+		<value>
+			<Suppressability>0</Suppressability>
+			<SmokeSensitivity>1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!-- Siro-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="siro"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+			<MeleeCritChance>0.75</MeleeCritChance>
+			<MeleeParryChance>0.75</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="siro"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="siro"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>忍刀</label>
+					<capacities>
+						<li>Cut</li>
+						<li>Stab</li>
+					</capacities>
+					<cooldownTime>0.53</cooldownTime>
+					<power>25</power>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.82</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>忍刀</label>
+					<capacities>
+						<li>Cut</li>
+						<li>Stab</li>
+					</capacities>
+					<cooldownTime>0.53</cooldownTime>
+					<power>25</power>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.82</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Kon -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="kon"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+			<MeleeCritChance>0.80</MeleeCritChance>
+			<MeleeParryChance>0.60</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="kon"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="kon"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>刀</label>
+					<capacities>
+						<li>Cut</li>
+						<li>Stab</li>
+					</capacities>
+					<cooldownTime>1</cooldownTime>
+					<power>35</power>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>3.5</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>刀</label>
+					<capacities>
+						<li>Cut</li>
+						<li>Stab</li>
+					</capacities>
+					<cooldownTime>1</cooldownTime>
+					<power>35</power>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>3.5</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Hana -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="hana"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>0.3</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="hana"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="hana"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>パンチ</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<cooldownTime>2</cooldownTime>
+					<power>1</power>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>パンチ</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<cooldownTime>2</cooldownTime>
+					<power>1</power>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Miko -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="miko"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+			<MeleeCritChance>1.20</MeleeCritChance>
+			<MeleeParryChance>1.00</MeleeParryChance>
+			<ShotSpread>2</ShotSpread>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="miko"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="miko"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>パンチ</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<cooldownTime>0.8</cooldownTime>
+					<power>30</power>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>16</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>パンチ</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<cooldownTime>0.8</cooldownTime>
+					<power>30</power>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>16</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Akame/Aome -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="akame" or defName="aome"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+			<ShotSpread>1</ShotSpread>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="akame" or defName="aome"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="akame" or defName="aome"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>クマゴン</label>
+					<capacities>
+						<li>Cut</li>
+						<li>Stab</li>
+					</capacities>
+					<cooldownTime>1.2</cooldownTime>
+					<power>15</power>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.8</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.7</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>クマゴン</label>
+					<capacities>
+						<li>Cut</li>
+						<li>Stab</li>
+					</capacities>
+					<cooldownTime>1.2</cooldownTime>
+					<power>15</power>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.8</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.7</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Kuro -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="kuro"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+			<MeleeCritChance>0.75</MeleeCritChance>
+			<MeleeParryChance>0.90</MeleeParryChance>
+			<ShotSpread>2</ShotSpread>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="kuro"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="kuro"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>忍刀</label>
+					<capacities>
+						<li>Cut</li>
+						<li>Stab</li>
+					</capacities>
+					<cooldownTime>0.25</cooldownTime>
+					<power>10</power>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.00</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.25</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>忍刀</label>
+					<capacities>
+						<li>Cut</li>
+						<li>Stab</li>
+					</capacities>
+					<cooldownTime>0.25</cooldownTime>
+					<power>10</power>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.00</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.25</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- yuki -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="yuki"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>80</ArmorRating_Sharp>
+			<MeleeCritChance>0.6</MeleeCritChance>
+			<MeleeParryChance>0.6</MeleeParryChance>
+			<ShotSpread>1</ShotSpread>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="yuki"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>200</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="yuki"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>ドラゴンクロー</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<cooldownTime>2</cooldownTime>
+					<power>1</power>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>ドラゴンクロー</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<cooldownTime>2</cooldownTime>
+					<power>1</power>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- konf-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="konf"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+			<MeleeCritChance>0.8</MeleeCritChance>
+			<MeleeParryChance>0.6</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="konf"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="konf"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>刀</label>
+					<capacities>
+						<li>Cut</li>
+						<li>Stab</li>
+					</capacities>
+					<cooldownTime>1</cooldownTime>
+					<power>35</power>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>3.5</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>刀</label>
+					<capacities>
+						<li>Cut</li>
+						<li>Stab</li>
+					</capacities>
+					<cooldownTime>1</cooldownTime>
+					<power>35</power>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>3.5</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Sirof-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="sirof"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+			<MeleeCritChance>0.75</MeleeCritChance>
+			<MeleeParryChance>0.75</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="sirof"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="sirof"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>忍刀</label>
+					<capacities>
+						<li>Cut</li>
+						<li>Stab</li>
+					</capacities>
+					<cooldownTime>0.53</cooldownTime>
+					<power>25</power>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.82</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>忍刀</label>
+					<capacities>
+						<li>Cut</li>
+						<li>Stab</li>
+					</capacities>
+					<cooldownTime>0.53</cooldownTime>
+					<power>25</power>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.82</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Kohime-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="kohime"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+			<MeleeCritChance>0.6</MeleeCritChance>
+			<MeleeParryChance>0.75</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="kohime"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="kohime"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>パンチ</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<cooldownTime>1</cooldownTime>
+					<power>20</power>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>パンチ</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<cooldownTime>1</cooldownTime>
+					<power>20</power>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- verbs -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="miko"]/verbs/li</xpath>
+		<value>
+			<li Class="CombatExtended.VerbPropertiesCE">
+				<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+				<hasStandardCommand>true</hasStandardCommand>
+				<defaultProjectile>Projectile_mikoshot</defaultProjectile>
+				<warmupTime>1.6</warmupTime>
+				<burstShotCount>6</burstShotCount>
+				<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+				<minRange>1</minRange>
+				<range>36</range>
+				<soundCast>BulletImpact_Wood</soundCast>
+				<soundCastTail>GunTail_Heavy</soundCastTail>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="kohime"]/verbs/li</xpath>
+		<value>
+			<li Class="CombatExtended.VerbPropertiesCE">
+				<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+				<hasStandardCommand>true</hasStandardCommand>
+				<defaultProjectile>Projectile_kohimeshot</defaultProjectile>
+				<warmupTime>2</warmupTime>
+				<burstShotCount>1</burstShotCount>
+				<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+				<minRange>1</minRange>
+				<range>30</range>
+				<soundCast>ThrowGrenade</soundCast>
+				<soundCastTail>GunTail_Heavy</soundCastTail>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="akame"]/verbs/li</xpath>
+		<value>
+			<li Class="CombatExtended.VerbPropertiesCE">
+				<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+				<hasStandardCommand>true</hasStandardCommand>
+				<defaultProjectile>Projectile_kumagonshot</defaultProjectile>
+				<warmupTime>2</warmupTime>
+				<burstShotCount>1</burstShotCount>
+				<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+				<minRange>1</minRange>
+				<range>30</range>
+				<soundCast>ThrowGrenade</soundCast>
+				<soundCastTail>GunTail_Heavy</soundCastTail>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="aome"]/verbs/li</xpath>
+		<value>
+			<li Class="CombatExtended.VerbPropertiesCE">
+				<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+				<hasStandardCommand>true</hasStandardCommand>
+				<defaultProjectile>Projectile_kumagoroushot</defaultProjectile>
+				<warmupTime>2</warmupTime>
+				<burstShotCount>1</burstShotCount>
+				<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+				<minRange>1</minRange>
+				<range>30</range>
+				<soundCast>Pawn_Melee_Punch_HitPawn</soundCast>
+				<soundCastTail>GunTail_Light</soundCastTail>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="kuro"]/verbs/li</xpath>
+		<value>
+			<li Class="CombatExtended.VerbPropertiesCE">
+				<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+				<hasStandardCommand>true</hasStandardCommand>
+				<defaultProjectile>Projectile_kuroshot</defaultProjectile>
+				<warmupTime>1.6</warmupTime>
+				<burstShotCount>8</burstShotCount>
+				<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+				<minRange>1</minRange>
+				<range>25</range>
+				<soundCast>BulletImpact_Wood</soundCast>
+				<soundCastTail>GunTail_Light</soundCastTail>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="yuki"]/verbs/li</xpath>
+		<value>
+			<li Class="CombatExtended.VerbPropertiesCE">
+				<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+				<hasStandardCommand>true</hasStandardCommand>
+				<defaultProjectile>Projectile_yukishot</defaultProjectile>
+				<warmupTime>3</warmupTime>
+				<burstShotCount>1</burstShotCount>
+				<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+				<minRange>1</minRange>
+				<range>30</range>
+				<soundCast>ThrowGrenade</soundCast>
+				<soundCastTail>GunTail_Light</soundCastTail>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Projectile -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Projectile_mikoshot" or
+			defName="Projectile_kumagonshot" or
+			defName="Projectile_kumagoroushot" or
+			defName="Projectile_kuroshot" or
+			defName="Projectile_yukishot" or
+			defName="Projectile_kohimeshot"
+			] </xpath>
+		<value>
+			<thingClass>CombatExtended.BulletCE</thingClass>
+		</value>
+	</Operation>
+
+	<!-- Projectile -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Projectile_mikoshot"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>30</speed>
+				<flyOverhead>false</flyOverhead>
+				<damageDef>Flame</damageDef>
+				<damageAmountBase>8</damageAmountBase>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Projectile_kumagonshot"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<speed>15</speed>
+				<damageDef>Bullet</damageDef>
+				<stoppingPower>1.5</stoppingPower>
+				<armorPenetrationBase>0.25</armorPenetrationBase>
+				<damageAmountBase>16</damageAmountBase>
+				<armorPenetrationSharp>3</armorPenetrationSharp>
+				<armorPenetrationBlunt>25</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Projectile_kumagoroushot"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<speed>25</speed>
+				<damageDef>Bullet_harapan</damageDef>
+				<stoppingPower>1.5</stoppingPower>
+				<armorPenetrationBase>0.25</armorPenetrationBase>
+				<damageAmountBase>16</damageAmountBase>
+				<armorPenetrationSharp>3</armorPenetrationSharp>
+				<armorPenetrationBlunt>25</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Projectile_kuroshot"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<speed>20</speed>
+				<damageDef>Bullet</damageDef>
+				<stoppingPower>1.5</stoppingPower>
+				<armorPenetrationBase>0.25</armorPenetrationBase>
+				<damageAmountBase>10</damageAmountBase>
+				<armorPenetrationSharp>3</armorPenetrationSharp>
+				<armorPenetrationBlunt>25</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Projectile_yukishot"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<speed>20</speed>
+				<damageDef>Frostbite</damageDef>
+				<stoppingPower>0.1</stoppingPower>
+				<damageAmountBase>1</damageAmountBase>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Projectile_kohimeshot"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>20</speed>
+				<flyOverhead>false</flyOverhead>
+				<damageDef>Flame</damageDef>
+				<damageAmountBase>40</damageAmountBase>
+			</projectile>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kemomimihouse/Patches/Kemomimihouse/ThingDes_Items/Items_Resource_Stuff.xml b/ModPatches/Kemomimihouse/Patches/Kemomimihouse/ThingDes_Items/Items_Resource_Stuff.xml
new file mode 100644
index 0000000000..adc59fc561
--- /dev/null
+++ b/ModPatches/Kemomimihouse/Patches/Kemomimihouse/ThingDes_Items/Items_Resource_Stuff.xml
@@ -0,0 +1,252 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="hanaWool" or
+			defName="akameWool" or
+			defName="aomeWool" or
+			defName="konWool"
+			]/statBases/StuffPower_Armor_Sharp </xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.30</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="hanaWool" or
+			defName="akameWool" or
+			defName="aomeWool" or
+			defName="siroWool"
+			]/statBases/StuffPower_Armor_Blunt </xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.15</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="siroWool"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.5</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="konWool"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.30</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="kuroWool"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.65</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="kuroWool"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.35</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="mikoWool"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.75</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="mikoWool"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.5</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="yukiwool"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.75</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="yukiwool"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>2.25</StuffPower_Armor_Blunt>
+			<WornBulk>0.75</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="kohimeWool"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.6</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="kohimeWool"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.45</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="siroWool" or
+			defName="mikoWool" or
+			defName="akameWool" or
+			defName="aomeWool" or
+			defName="kohimeWool"
+			]/statBases/StuffPower_Armor_Heat </xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.20</StuffPower_Armor_Heat>
+			<StuffPower_Armor_Electric>0.10</StuffPower_Armor_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="hanaWool" or
+			defName="yukiwool"
+			]/statBases/StuffPower_Armor_Heat </xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="konWool"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.10</StuffPower_Armor_Heat>
+			<StuffPower_Armor_Electric>0.05</StuffPower_Armor_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="kuroWool"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.40</StuffPower_Armor_Heat>
+			<StuffPower_Armor_Electric>0.20</StuffPower_Armor_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="yukiwool"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>1.2</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="siroWool"]/stuffProps/categories</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="siroWool"]/stuffProps</xpath>
+			<value>
+				<categories>
+					<li>SoftArmor</li>
+				</categories>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="siroWool"]/stuffProps/categories</xpath>
+			<value>
+				<li>SoftArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="konWool"]/stuffProps/categories</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="konWool"]/stuffProps</xpath>
+			<value>
+				<categories>
+					<li>SoftArmor</li>
+				</categories>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="konWool"]/stuffProps/categories</xpath>
+			<value>
+				<li>SoftArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="kuroWool"]/stuffProps/categories</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="kuroWool"]/stuffProps</xpath>
+			<value>
+				<categories>
+					<li>SoftArmor</li>
+				</categories>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="kuroWool"]/stuffProps/categories</xpath>
+			<value>
+				<li>SoftArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="mikoWool"]/stuffProps/categories</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="mikoWool"]/stuffProps</xpath>
+			<value>
+				<categories>
+					<li>SoftArmor</li>
+				</categories>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="mikoWool"]/stuffProps/categories</xpath>
+			<value>
+				<li>SoftArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="yukiwool"]/stuffProps/categories</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="yukiwool"]/stuffProps</xpath>
+			<value>
+				<categories>
+					<li>SoftArmor</li>
+				</categories>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="yukiwool"]/stuffProps/categories</xpath>
+			<value>
+				<li>SoftArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="kohimeWool"]/stuffProps/categories</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="kohimeWool"]/stuffProps</xpath>
+			<value>
+				<categories>
+					<li>SoftArmor</li>
+				</categories>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="kohimeWool"]/stuffProps/categories</xpath>
+			<value>
+				<li>SoftArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kenshi Armory/Patches/Kenshi Armory/KenshiArmory_Apparel.xml b/ModPatches/Kenshi Armory/Patches/Kenshi Armory/KenshiArmory_Apparel.xml
new file mode 100644
index 0000000000..461dd20240
--- /dev/null
+++ b/ModPatches/Kenshi Armory/Patches/Kenshi Armory/KenshiArmory_Apparel.xml	
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Iron Hat -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Kenshi_IronHat"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_IronHat"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_IronHat"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2.25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Ninja Mask -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Kenshi_NinjaMask"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_NinjaMask"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.8</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Kusari Zukin -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Kenshi_KusariZukin"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_KusariZukin"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Armored Hood -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Kenshi_ArmouredHood"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_ArmouredHood"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.7</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Basket Hat -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Kenshi_BasketHat"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_BasketHat"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kenshi Armory/Patches/Kenshi Armory/KenshiArmory_Armour.xml b/ModPatches/Kenshi Armory/Patches/Kenshi Armory/KenshiArmory_Armour.xml
new file mode 100644
index 0000000000..5ca81e1bfe
--- /dev/null
+++ b/ModPatches/Kenshi Armory/Patches/Kenshi Armory/KenshiArmory_Armour.xml	
@@ -0,0 +1,1320 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Holy Chest Plate -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Kenshi_HolyChestPlate"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_HolyChestPlate"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_HolyChestPlate"]/statBases/Mass</xpath>
+		<value>
+			<Mass>6</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_HolyChestPlate"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeDodgeChance>-0.05</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Heavy Hachigane -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Kenshi_HeavyHachigane"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_HeavyHachigane"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Holy Full Plate -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Kenshi_HeavyHolyChestPlate"]/statBases</xpath>
+		<value>
+			<Bulk>115</Bulk>
+			<WornBulk>12</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_HeavyHolyChestPlate"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.25</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_HeavyHolyChestPlate"]/statBases/Mass</xpath>
+		<value>
+			<Mass>20</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_HeavyHolyChestPlate"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeDodgeChance>-0.35</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Kenshi_HeavyHolyChestPlate"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Holy Full Helmet -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Kenshi_HeavyPaladinsHelm"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_HeavyPaladinsHelm"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_HeavyPaladinsHelm"]/statBases/Mass</xpath>
+		<value>
+			<Mass>3.5</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_HeavyPaladinsHelm"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>-0.4</AimingAccuracy>
+				<MeleeHitChance>-2</MeleeHitChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Kenshi_HeavyPaladinsHelm"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Samurai Plate -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Kenshi_SamuraiPlateArmor"]/statBases</xpath>
+		<value>
+			<Bulk>95</Bulk>
+			<WornBulk>8</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_SamuraiPlateArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_SamuraiPlateArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>12</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_SamuraiPlateArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeDodgeChance>-0.08</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Kenshi_SamuraiPlateArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Samurai Helmet -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Kenshi_SamuraiHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_SamuraiHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_SamuraiHelmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>2.5</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_SamuraiHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>-0.6</AimingAccuracy>
+				<ShootingAccuracyPawn>-0.3</ShootingAccuracyPawn>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Kenshi_SamuraiHelmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Mercenary Plate -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Kenshi_UnstrainedMercenaryPlate"]/statBases</xpath>
+		<value>
+			<Bulk>85</Bulk>
+			<WornBulk>6</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_UnstrainedMercenaryPlate"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_UnstrainedMercenaryPlate"]/statBases/Mass</xpath>
+		<value>
+			<Mass>9.5</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_UnstrainedMercenaryPlate"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeDodgeChance>-0.02</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Kenshi_UnstrainedMercenaryPlate"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Tin Can -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Kenshi_UnstrainedTinCan"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_UnstrainedTinCan"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_UnstrainedTinCan"]/statBases/Mass</xpath>
+		<value>
+			<Mass>3</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_UnstrainedTinCan"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>-0.4</AimingAccuracy>
+				<MeleeHitChance>-2</MeleeHitChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Kenshi_SamuraiHelmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Factional Ver -->
+
+	<!-- Holy Chest Plate -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Kenshi_PaladinsHolyChestPlate"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_PaladinsHolyChestPlate"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_PaladinsHolyChestPlate"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_PaladinsHolyChestPlate"]/statBases/Mass</xpath>
+		<value>
+			<Mass>6</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_PaladinsHolyChestPlate"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeDodgeChance>-0.05</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Heavy Hachigane -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Kenshi_PaladinsHeavyHachigane"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_PaladinsHeavyHachigane"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_PaladinsHeavyHachigane"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Holy Full Plate -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Kenshi_PaladinsHeavyPlate"]/statBases</xpath>
+		<value>
+			<Bulk>115</Bulk>
+			<WornBulk>12</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_PaladinsHeavyPlate"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_PaladinsHeavyPlate"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4.875</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_PaladinsHeavyPlate"]/statBases/Mass</xpath>
+		<value>
+			<Mass>20</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_PaladinsHeavyPlate"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeDodgeChance>-0.35</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Kenshi_PaladinsHeavyPlate"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Holy Full Helmet -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Kenshi_PaladinsHeavyHelm"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_PaladinsHeavyHelm"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_PaladinsHeavyHelm"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_PaladinsHeavyHelm"]/statBases/Mass</xpath>
+		<value>
+			<Mass>3.5</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_PaladinsHeavyHelm"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>-0.4</AimingAccuracy>
+				<MeleeHitChance>-2</MeleeHitChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Kenshi_PaladinsHeavyHelm"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Samurai Plate -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Kenshi_EmpireSamuraiPlateArmor"]/statBases</xpath>
+		<value>
+			<Bulk>95</Bulk>
+			<WornBulk>8</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_EmpireSamuraiPlateArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_EmpireSamuraiPlateArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3.75</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_EmpireSamuraiPlateArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>12</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_EmpireSamuraiPlateArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeDodgeChance>-0.08</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Kenshi_EmpireSamuraiPlateArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Samurai Helmet -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Kenshi_EmpireSamuraiHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_EmpireSamuraiHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_EmpireSamuraiHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_EmpireSamuraiHelmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>2.5</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_EmpireSamuraiHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>-0.6</AimingAccuracy>
+				<ShootingAccuracyPawn>-0.3</ShootingAccuracyPawn>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Kenshi_EmpireSamuraiHelmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Crab Plate -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Kenshi_CrabArmor"]/statBases</xpath>
+		<value>
+			<Bulk>115</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_CrabArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_CrabArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_CrabArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>18</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_CrabArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeDodgeChance>-0.30</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Kenshi_CrabArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Crab Helmet -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Kenshi_CrabRaiderHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_CrabRaiderHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_CrabRaiderHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_CrabRaiderHelmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>3.5</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_CrabRaiderHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>-0.4</AimingAccuracy>
+				<MeleeHitChance>-2</MeleeHitChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Kenshi_CrabRaiderHelmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Mercenary Plate -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Kenshi_GuildMercenaryPlate"]/statBases</xpath>
+		<value>
+			<Bulk>85</Bulk>
+			<WornBulk>6</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_GuildMercenaryPlate"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_GuildMercenaryPlate"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_GuildMercenaryPlate"]/statBases/Mass</xpath>
+		<value>
+			<Mass>9.5</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_GuildMercenaryPlate"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeDodgeChance>-0.02</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Kenshi_GuildMercenaryPlate"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Tin Can -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Kenshi_TinCan"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_TinCan"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_TinCan"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6.75</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_TinCan"]/statBases/Mass</xpath>
+		<value>
+			<Mass>3</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_TinCan"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>-0.4</AimingAccuracy>
+				<MeleeHitChance>-2</MeleeHitChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Kenshi_TinCan"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Hack Stopper Jacket -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Kenshi_HackStopperJacket"]/statBases</xpath>
+		<value>
+			<Bulk>95</Bulk>
+			<WornBulk>8</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_HackStopperJacket"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_HackStopperJacket"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_HackStopperJacket"]/statBases/Mass</xpath>
+		<value>
+			<Mass>7</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_HackStopperJacket"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeDodgeChance>-0.02</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Kenshi_HackStopperJacket"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Hack Stopper Helmet -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Kenshi_HackStopperHat"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_HackStopperHat"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_HackStopperHat"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Kenshi_HackStopperHat"]/statBases/Mass</xpath>
+		<value>
+			<Mass>1</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Kenshi_HackStopperHat"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kenshi Armory/Patches/Kenshi Armory/KenshiArmory_Weapons.xml b/ModPatches/Kenshi Armory/Patches/Kenshi Armory/KenshiArmory_Weapons.xml
new file mode 100644
index 0000000000..266f0a3d6f
--- /dev/null
+++ b/ModPatches/Kenshi Armory/Patches/Kenshi Armory/KenshiArmory_Weapons.xml	
@@ -0,0 +1,724 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Paladin's Cross -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kenshi_PaladinsCross"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2.24</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.94</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>8.1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>60</power>
+					<cooldownTime>3.2</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.61</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kenshi_PaladinsCross"]/statBases</xpath>
+		<value>
+			<Bulk>16</Bulk>
+			<MeleeCounterParryBonus>0.43</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kenshi_PaladinsCross"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeCritChance>0.10</MeleeCritChance>
+			<MeleeParryChance>0.32</MeleeParryChance>
+			<MeleeDodgeChance>0.53</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- Combat Cleaver -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kenshi_CombatCleaver"]/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="Kenshi_CombatCleaver"]/statBases</xpath>
+		<value>
+			<Bulk>11</Bulk>
+			<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kenshi_CombatCleaver"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.50</MeleeCritChance>
+				<MeleeParryChance>0.4</MeleeParryChance>
+				<MeleeDodgeChance>0.27</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Katana -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kenshi_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="Kenshi_Katana"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>1.27</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kenshi_Katana"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeCritChance>0.95</MeleeCritChance>
+			<MeleeParryChance>0.54</MeleeParryChance>
+			<MeleeDodgeChance>0.33</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- Guardless Katana -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kenshi_GuardlessKatana"]/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="Kenshi_GuardlessKatana"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>0.89</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kenshi_GuardlessKatana"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeCritChance>1.48</MeleeCritChance>
+			<MeleeParryChance>0.07</MeleeParryChance>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- Naginata -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kenshi_Naginata"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.76</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>0.95</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.76</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationSharp>1.9</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.95</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>32</power>
+					<cooldownTime>1.41</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationSharp>1.27</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kenshi_Naginata"]/statBases</xpath>
+		<value>
+			<Bulk>14</Bulk>
+			<MeleeCounterParryBonus>1.78</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kenshi_Naginata"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.56</MeleeCritChance>
+			<MeleeParryChance>0.75</MeleeParryChance>
+			<MeleeDodgeChance>0.6</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- Naginata Katana -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kenshi_NaginataKatana"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.87</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.76</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationSharp>2.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>42</power>
+					<cooldownTime>1.49</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationSharp>1.6</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kenshi_NaginataKatana"]/statBases</xpath>
+		<value>
+			<Bulk>18</Bulk>
+			<MeleeCounterParryBonus>1.03</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kenshi_NaginataKatana"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.42</MeleeCritChance>
+			<MeleeParryChance>0.73</MeleeParryChance>
+			<MeleeDodgeChance>0.6</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- Falling Sun -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kenshi_FallingSun"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2.31</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>2.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.85</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationSharp>2.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.15</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>65</power>
+					<cooldownTime>1.7</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationSharp>1.78</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kenshi_FallingSun"]/statBases</xpath>
+		<value>
+			<Bulk>22</Bulk>
+			<MeleeCounterParryBonus>0.43</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kenshi_FallingSun"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.71</MeleeCritChance>
+				<MeleeParryChance>0.32</MeleeParryChance>
+				<MeleeDodgeChance>0.6</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Fragment Axe -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kenshi_FragmentAxe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>2.79</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>2.79</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationSharp>1.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>71</power>
+					<cooldownTime>4.13</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationSharp>1.02</armorPenetrationSharp>
+					<armorPenetrationBlunt>10.14</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kenshi_FragmentAxe"]/statBases</xpath>
+		<value>
+			<Bulk>22</Bulk>
+			<MeleeCounterParryBonus>0.32</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kenshi_FragmentAxe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.06</MeleeCritChance>
+				<MeleeParryChance>0.2</MeleeParryChance>
+				<MeleeDodgeChance>0.58</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Ringed Sabre -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kenshi_RingedSabre"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.74</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>1.41</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationSharp>2.31</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.152</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>38</power>
+					<cooldownTime>0.99</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationSharp>0.65</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.872</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kenshi_RingedSabre"]/statBases</xpath>
+		<value>
+			<Bulk>9</Bulk>
+			<MeleeCounterParryBonus>1.07</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kenshi_RingedSabre"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeCritChance>0.74</MeleeCritChance>
+			<MeleeParryChance>0.56</MeleeParryChance>
+			<MeleeDodgeChance>0.4</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- Foreign Sabre -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kenshi_ForeignSabre"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.02</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationSharp>1.24</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.238</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>34</power>
+					<cooldownTime>0.89</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationSharp>0.6</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.662</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kenshi_ForeignSabre"]/statBases</xpath>
+		<value>
+			<Bulk>9</Bulk>
+			<MeleeCounterParryBonus>2</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kenshi_ForeignSabre"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeCritChance>0.28</MeleeCritChance>
+			<MeleeParryChance>1.5</MeleeParryChance>
+			<MeleeDodgeChance>0.3</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- Merc Club -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kenshi_MercenaryClub"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.97</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1</cooldownTime>
+					<armorPenetrationBlunt>10.95</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kenshi_MercenaryClub"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>0.67</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kenshi_MercenaryClub"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>1.2</MeleeCritChance>
+			<MeleeParryChance>0.50</MeleeParryChance>
+			<MeleeDodgeChance>0.4</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- Jitte -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kenshi_Jitte"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.68</cooldownTime>
+					<armorPenetrationBlunt>2.188</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kenshi_Jitte"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kenshi_Jitte"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<MeleeDodgeChance>0.4</MeleeDodgeChance>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kijin 2.0/Defs/Kijin 2.0/Ammo/Arrows_Kijin.xml b/ModPatches/Kijin 2.0/Defs/Kijin 2.0/Ammo/Arrows_Kijin.xml
new file mode 100644
index 0000000000..72da837603
--- /dev/null
+++ b/ModPatches/Kijin 2.0/Defs/Kijin 2.0/Ammo/Arrows_Kijin.xml	
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- DamageDef -->
+	<DamageDef ParentName="Flame">
+		<defName>Flame_Nopenetration</defName>
+		<harmAllLayersUntilOutside>false</harmAllLayersUntilOutside>
+	</DamageDef>
+
+	<!-- AmmoSet -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_ArrowKijinVenom</defName>
+		<label>venom arrows</label>
+		<ammoTypes>
+			<Ammo_Arrow_Venom>Projectile_StreamlinedArrow_Venom</Ammo_Arrow_Venom>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_ArrowKijinFlame</defName>
+		<label>flame arrows</label>
+		<ammoTypes>
+			<Ammo_Arrow_Flame>Projectile_StreamlinedArrow_Flame</Ammo_Arrow_Flame>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Kijin 2.0/Defs/Kijin 2.0/Ammo/Projectiles_Kijin.xml b/ModPatches/Kijin 2.0/Defs/Kijin 2.0/Ammo/Projectiles_Kijin.xml
new file mode 100644
index 0000000000..1f841d802d
--- /dev/null
+++ b/ModPatches/Kijin 2.0/Defs/Kijin 2.0/Ammo/Projectiles_Kijin.xml	
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingDef>
+		<defName>Projectile_KijinDarkmatter</defName>
+		<label>dark matter</label>
+		<category>Projectile</category>
+		<altitudeLayer>Projectile</altitudeLayer>
+		<thingClass>CombatExtended.BulletCE</thingClass>
+		<tickerType>Normal</tickerType>
+		<useHitPoints>False</useHitPoints>
+		<neverMultiSelect>True</neverMultiSelect>
+		<graphicData>
+			<texPath>Kijin/Projectile/Projectile_Darkmatter</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>KijinDarkMatter</damageDef>
+			<speed>6</speed>
+			<damageAmountBase>1</damageAmountBase>
+			<armorPenetrationSharp>0.25</armorPenetrationSharp>
+			<armorPenetrationBlunt>2</armorPenetrationBlunt>
+			<flyOverhead>false</flyOverhead>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseFlamethrowerBullet">
+		<defName>Bullet_KijinFlame</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>Blazing Orb</label>
+		<graphicData>
+			<texPath>Kijin/Projectile/FireA</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Flame</damageDef>
+			<damageAmountBase>3</damageAmountBase>
+			<soundExplode>CE_FlamethrowerExplosion</soundExplode>
+			<explosionRadius>1.0</explosionRadius>
+			<ai_IsIncendiary>true</ai_IsIncendiary>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseGrenadeProjectile">
+		<defName>Proj_KijinSmoke</defName>
+		<label>smoke grenade</label>
+		<graphicData>
+			<texPath>Kijin/Projectile/SmokeBomb</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>3.5</explosionRadius>
+			<damageDef>Smoke</damageDef>
+			<suppressionFactor>0.0</suppressionFactor>
+			<dangerFactor>0.0</dangerFactor>
+			<explosionDelay>30</explosionDelay>
+			<dropsCasings>true</dropsCasings>
+			<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+			<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+			<postExplosionGasType>BlindSmoke</postExplosionGasType>
+			<preExplosionSpawnChance>1</preExplosionSpawnChance>
+			<speed>8</speed>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Kijin 2.0/Patches/Kijin 2.0/Bodies/Mod_Bodies_Kijin.xml b/ModPatches/Kijin 2.0/Patches/Kijin 2.0/Bodies/Mod_Bodies_Kijin.xml
new file mode 100644
index 0000000000..8eae4ee9f3
--- /dev/null
+++ b/ModPatches/Kijin 2.0/Patches/Kijin 2.0/Bodies/Mod_Bodies_Kijin.xml	
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Kijin Bodytype-->
+
+	<!--Arm Groups-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Kijin_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Kijin_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Kijin_Body"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Kijin_Body"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<!--Natural Armor-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Kijin_Body"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Kijin_Body"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Kijin_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Kijin_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Kijin_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Kijin_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Kijin_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Kijin_Horn"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Kijin_Body"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Kijin_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Kijin_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Kijin_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Kijin_Body"]/corePart/parts/li[def="Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Kijin_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Kijin_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kijin 2.0/Patches/Kijin 2.0/PawnKindDefs/PawnKind_Kijin.xml b/ModPatches/Kijin 2.0/Patches/Kijin 2.0/PawnKindDefs/PawnKind_Kijin.xml
new file mode 100644
index 0000000000..4357f66edf
--- /dev/null
+++ b/ModPatches/Kijin 2.0/Patches/Kijin 2.0/PawnKindDefs/PawnKind_Kijin.xml	
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			@Name="KijinOutlanderBase" or
+			@Name="KijinMercenaryBase"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>45</min>
+					<max>60</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>20</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kijin 2.0/Patches/Kijin 2.0/Scenario/Kijin_Scenario.xml b/ModPatches/Kijin 2.0/Patches/Kijin 2.0/Scenario/Kijin_Scenario.xml
new file mode 100644
index 0000000000..bf68e3320c
--- /dev/null
+++ b/ModPatches/Kijin 2.0/Patches/Kijin 2.0/Scenario/Kijin_Scenario.xml	
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="Kijin_Scenario"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_Arrow_Venom</thingDef>
+				<count>150</count>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Couldn't get it to play nicely with a conditional-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/FactionDef[defName="Kijin_Player"]/apparelStuffFilter/thingDefs</xpath>
+		<value>
+			<li>Steel</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kijin 2.0/Patches/Kijin 2.0/ThingDef_Misc/Kijin_Apparel.xml b/ModPatches/Kijin 2.0/Patches/Kijin 2.0/ThingDef_Misc/Kijin_Apparel.xml
new file mode 100644
index 0000000000..967eb7c29f
--- /dev/null
+++ b/ModPatches/Kijin 2.0/Patches/Kijin 2.0/ThingDef_Misc/Kijin_Apparel.xml	
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--========= Vest =========-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kijin_FlakVest"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>3</WornBulk>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kijin_FlakVest"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>9</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kijin_FlakVest"]/statBases/Mass</xpath>
+		<value>
+			<Mass>13.5</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kijin_FlakVest"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>50</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kijin_FlakVest"]/costList/Steel</xpath>
+		<value>
+			<Steel>70</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Kijin_FlakVest"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Kijin_FlakVest"]/statBases/ArmorRating_Heat</xpath>
+	</Operation>
+
+	<!--========= Inferno Armor =========-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kijin_EpicArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<Bulk>120</Bulk>
+			<WornBulk>15</WornBulk>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kijin_EpicArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>21</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kijin_EpicArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>25</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kijin_EpicArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kijin_EpicHelm"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>3</WornBulk>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kijin_EpicHelm"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>18</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kijin_EpicHelm"]/statBases/Mass</xpath>
+		<value>
+			<Mass>5</Mass>
+		</value>
+	</Operation>
+
+	<!--========= Dark Power Armor =========-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PowerArmorDK"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PowerArmorDK"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PowerArmorDK"]/statBases/Mass</xpath>
+		<value>
+			<Mass>50</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PowerArmorDK"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>500</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PowerArmorDK"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_PowerArmorDK"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>50</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_PowerArmorDK"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>80</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+			<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Apparel_PowerArmorDK"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_PowerArmorDK"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PowerArmorHelmetDK"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PowerArmorHelmetDK"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PowerArmorHelmetDK"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>240</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PowerArmorHelmetDK"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PowerArmorHelmetDK"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>45</Plasteel>
+			<DevilstrandCloth>20</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Apparel_PowerArmorHelmetDK"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Apparel_PowerArmorHelmetDK"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_PowerArmorHelmetDK"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>0.15</AimingAccuracy>
+				<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kijin 2.0/Patches/Kijin 2.0/ThingDef_Misc/Kijin_Weapons_Melee.xml b/ModPatches/Kijin 2.0/Patches/Kijin 2.0/ThingDef_Misc/Kijin_Weapons_Melee.xml
new file mode 100644
index 0000000000..d206ceee58
--- /dev/null
+++ b/ModPatches/Kijin 2.0/Patches/Kijin 2.0/ThingDef_Misc/Kijin_Weapons_Melee.xml	
@@ -0,0 +1,255 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--========= Melee =========-->
+
+	<!--Polearm counts as Glaive-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kijin_Polearm"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.31</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>2.9</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="Kijin_Polearm"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>1.08</MeleeCounterParryBonus>
+			<Bulk>10</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kijin_Polearm"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.22</MeleeCritChance>
+				<MeleeParryChance>1.53</MeleeParryChance>
+				<MeleeDodgeChance>0.67</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!--Mace with 2kg mass-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kijin_Mace"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.78</cooldownTime>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.9</cooldownTime>
+					<chanceFactor>2.14</chanceFactor>
+					<armorPenetrationBlunt>9</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kijin_Mace"]/statBases</xpath>
+		<value>
+			<Bulk>5.5</Bulk>
+			<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kijin_Mace"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.42</MeleeCritChance>
+				<MeleeParryChance>0.24</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!--30kg, 12.5m/s swing, top heavy-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kijin_100tHammer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>52</power>
+					<cooldownTime>8.43</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>23.438</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kijin_100tHammer"]/statBases</xpath>
+		<value>
+			<Bulk>15.5</Bulk>
+			<MeleeCounterParryBonus>0.07</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kijin_100tHammer"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<!--Crit is technically 15 according to sheet. Toned down for obvious reasons-->
+				<MeleeCritChance>2</MeleeCritChance>
+				<MeleeParryChance>0.05</MeleeParryChance>
+				<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!--Dagger : Double Parry length, two handed-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kijin_PoisonDagger"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>KijinPoisonDagger</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.26</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.42</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kijin_PoisonDagger"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<MeleeCounterParryBonus>0.2</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kijin_PoisonDagger"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1</MeleeCritChance>
+				<MeleeParryChance>0.6</MeleeParryChance>
+				<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!--Fireblade : Royalty Only-->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Kijin_FlameSword"]</xpath>
+		<match Class="PatchOperationSequence">
+			<operations>
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Kijin_FlameSword"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>edge</label>
+								<capacities>
+									<li>KijinSword</li>
+								</capacities>
+								<power>22</power>
+								<cooldownTime>2.06</cooldownTime>
+								<chanceFactor>1.33</chanceFactor>
+								<armorPenetrationBlunt>0</armorPenetrationBlunt>
+								<armorPenetrationSharp>0</armorPenetrationSharp>
+								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ManeuverDef[defName="Kijin_Sword"]/verb/verbClass</xpath>
+					<value>
+						<verbClass>CombatExtended.Verb_MeleeAttackCE</verbClass>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="Kijin_FlameSword"]/statBases</xpath>
+					<value>
+						<Bulk>8.5</Bulk>
+						<MeleeCounterParryBonus>0.90</MeleeCounterParryBonus>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="Kijin_FlameSword"]</xpath>
+					<value>
+						<equippedStatOffsets>
+							<MeleeCritChance>1.10</MeleeCritChance>
+							<MeleeParryChance>0.70</MeleeParryChance>
+							<MeleeDodgeChance>0.50</MeleeDodgeChance>
+						</equippedStatOffsets>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kijin 2.0/Patches/Kijin 2.0/ThingDef_Misc/Kijin_Weapons_Ranged.xml b/ModPatches/Kijin 2.0/Patches/Kijin 2.0/ThingDef_Misc/Kijin_Weapons_Ranged.xml
new file mode 100644
index 0000000000..05250e2fbf
--- /dev/null
+++ b/ModPatches/Kijin 2.0/Patches/Kijin 2.0/ThingDef_Misc/Kijin_Weapons_Ranged.xml	
@@ -0,0 +1,312 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--========= Ranged =========-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Kijin_Fan</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>1</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>4.00</Bulk>
+			<RangedWeapon_Cooldown>0.8</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>30</WoodLog>
+			<DevilstrandCloth>60</DevilstrandCloth>
+			<Prometheum>10</Prometheum>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_KijinFlame</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>12</range>
+			<soundCast>ThrowMolotovCocktail</soundCast>
+			<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes/>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kijin_Fan"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetration>0.102</armorPenetration>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetration>0.075</armorPenetration>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Kijin_FlameBow</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>1</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>4.00</Bulk>
+			<RangedWeapon_Cooldown>0.8</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>35</WoodLog>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_StreamlinedArrow_Flame</defaultProjectile>
+			<warmupTime>0.8</warmupTime>
+			<range>32</range>
+			<soundCast>Bow_Small</soundCast>
+		</Properties>
+		<AmmoUser>
+			<ammoSet>AmmoSet_ArrowKijinFlame</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kijin_FlameBow"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>limb</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetration>0.102</armorPenetration>
+					<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>nock</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetration>0.075</armorPenetration>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Kijin_PosionBow</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.5</ShotSpread>
+			<SwayFactor>1</SwayFactor>
+			<Bulk>4.00</Bulk>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>35</WoodLog>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_StreamlinedArrow_Venom</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>35</range>
+			<soundCast>Bow_Small</soundCast>
+		</Properties>
+		<AmmoUser>
+			<ammoSet>AmmoSet_ArrowKijinVenom</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kijin_PosionBow"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>limb</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetration>0.102</armorPenetration>
+					<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>nock</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetration>0.075</armorPenetration>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kijin_PosionBow"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>limb</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetration>0.102</armorPenetration>
+					<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>nock</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetration>0.075</armorPenetration>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kijin_SmokeBomb"]</xpath>
+		<value>
+			<ThingDef ParentName="KijinWeapon">
+				<defName>Kijin_SmokeBomb</defName>
+				<equipmentType>Primary</equipmentType>
+				<label>kijin smokebomb</label>
+				<tickerType>Normal</tickerType>
+				<description>It will release a cloud of smoke, obscuring incoming shots and preventing turrets from locking on.</description>
+				<graphicData>
+					<texPath>Kijin/Item/SmokeBomb</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<soundInteract>Interact_Grenade</soundInteract>
+				<statBases>
+					<Mass>0.539</Mass>
+					<Bulk>1.05</Bulk>
+					<MarketValue>8.88</MarketValue>
+					<SightsEfficiency>1.0</SightsEfficiency>
+					<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+					<WorkToMake>24000</WorkToMake>
+				</statBases>
+				<recipeMaker>
+					<researchPrerequisite>KijinSmokeWeapons</researchPrerequisite>
+					<skillRequirements>
+						<Crafting>6</Crafting>
+					</skillRequirements>
+					<soundWorking>Recipe_Tailor</soundWorking>
+					<unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
+				</recipeMaker>
+				<costStuffCount>25</costStuffCount>
+				<stuffCategories>
+					<li>Fabric</li>
+					<li>Leathery</li>
+				</stuffCategories>
+				<costList>
+					<SmokeleafLeaves>25</SmokeleafLeaves>
+				</costList>
+				<weaponTags>
+					<li>KijinGrenadeSmoke</li>
+				</weaponTags>
+				<thingCategories>
+					<li>Grenades</li>
+				</thingCategories>
+				<verbs>
+					<li Class="CombatExtended.VerbPropertiesCE">
+						<label>throw smoke grenade</label>
+						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<range>10</range>
+						<warmupTime>0.8</warmupTime>
+						<noiseRadius>4</noiseRadius>
+						<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+						<soundCast>ThrowGrenade</soundCast>
+						<targetParams>
+							<canTargetLocations>true</canTargetLocations>
+						</targetParams>
+						<defaultProjectile>Proj_KijinSmoke</defaultProjectile>
+						<onlyManualCast>true</onlyManualCast>
+						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+					</li>
+				</verbs>
+				<comps>
+					<li Class="CombatExtended.CompProperties_ExplosiveCE">
+						<explosiveDamageType>Smoke</explosiveDamageType>
+						<explosiveRadius>3</explosiveRadius>
+						<postExplosionGasType>BlindSmoke</postExplosionGasType>
+						<preExplosionSpawnChance>1</preExplosionSpawnChance>
+					</li>
+				</comps>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>KijinDarkMatter</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>1</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>1</Bulk>
+			<RangedWeapon_Cooldown>0.8</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<label>throw dark matter</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<range>10</range>
+			<warmupTime>0.8</warmupTime>
+			<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+			<soundCast>ThrowGrenade</soundCast>
+			<defaultProjectile>Projectile_KijinDarkmatter</defaultProjectile>
+			<onlyManualCast>true</onlyManualCast>
+		</Properties>
+		<FireModes/>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="KijinDarkMatter"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<label>throw dark matter</label>
+					<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<range>10</range>
+					<warmupTime>0.8</warmupTime>
+					<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+					<soundCast>ThrowGrenade</soundCast>
+					<defaultProjectile>Projectile_KijinDarkmatter</defaultProjectile>
+					<onlyManualCast>true</onlyManualCast>
+					<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kijin 2.0/Patches/Kijin 2.0/ThingDefs_Races/Race_Kijin.xml b/ModPatches/Kijin 2.0/Patches/Kijin 2.0/ThingDefs_Races/Race_Kijin.xml
new file mode 100644
index 0000000000..14f9be24e6
--- /dev/null
+++ b/ModPatches/Kijin 2.0/Patches/Kijin 2.0/ThingDefs_Races/Race_Kijin.xml	
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Kijin"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Kijin"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Kijin"]</xpath>
+			<value>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Kijin"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Kijin"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Kijin"]/statBases</xpath>
+		<value>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1.25</MeleeParryChance>
+			<Suppressability>1</Suppressability>
+			<SmokeSensitivity>1</SmokeSensitivity>
+			<CarryBulk>30</CarryBulk>
+			<CarryWeight>60</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Kijin"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>1.10</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Kijin"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>KijinFlameSmash</li>
+					</capacities>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>1</amount>
+							<chance>0.3</chance>
+						</li>
+					</extraMeleeDamages>
+					<power>2</power>
+					<cooldownTime>1.12</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.586</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>KijinStunPunch</li>
+					</capacities>
+					<extraMeleeDamages>
+						<li>
+							<def>Stun</def>
+							<amount>5</amount>
+							<chance>0.3</chance>
+						</li>
+					</extraMeleeDamages>
+					<power>2</power>
+					<cooldownTime>1.12</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.586</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.99</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ManeuverDef[defName="KijinFlameSmash"]/verb/meleeDamageDef</xpath>
+		<value>
+			<meleeDamageDef>Flame_Secondary</meleeDamageDef>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ManeuverDef[defName="KijinStunPunch"]/verb/meleeDamageDef</xpath>
+		<value>
+			<meleeDamageDef>Blunt</meleeDamageDef>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kill la Kill Styles Pack/Patches/Kill la Kill Styles Pack/ThingDefs_Misc/Apparel_KLK.xml b/ModPatches/Kill la Kill Styles Pack/Patches/Kill la Kill Styles Pack/ThingDefs_Misc/Apparel_KLK.xml
new file mode 100644
index 0000000000..d9129b67fd
--- /dev/null
+++ b/ModPatches/Kill la Kill Styles Pack/Patches/Kill la Kill Styles Pack/ThingDefs_Misc/Apparel_KLK.xml	
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Senketsu-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="KLK_SYBbase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+			<Bulk>5</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="KLK_SYBbase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>5.4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Active-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="KLK_SYBactive"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16.8</ArmorRating_Sharp>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="KLK_SYBactive"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>27</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="KLK_SYBactive"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.94</MeleeDodgeChance>
+			<Suppressability>-0.8</Suppressability>
+			<MeleeCritChance>0.08</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kill la Kill Styles Pack/Patches/Kill la Kill Styles Pack/ThingDefs_Misc/ScissorBlade.xml b/ModPatches/Kill la Kill Styles Pack/Patches/Kill la Kill Styles Pack/ThingDefs_Misc/ScissorBlade.xml
new file mode 100644
index 0000000000..b3b7f77979
--- /dev/null
+++ b/ModPatches/Kill la Kill Styles Pack/Patches/Kill la Kill Styles Pack/ThingDefs_Misc/ScissorBlade.xml	
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ScissorBlade"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>0.95</cooldownTime>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>0.95</cooldownTime>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+					<armorPenetrationSharp>18</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Ultimate Skill - The Scissor Blade Decapitation Mode</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>2.36</cooldownTime>
+					<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>6.4</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Fiber Lost</label>
+					<capacities>
+						<li>KLKSBCut</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>2.36</cooldownTime>
+					<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>6.4</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ScissorBlade"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ScissorBlade"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.58</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ScissorBlade"]/equippedStatOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+			<MeleeCritChance>1.25</MeleeCritChance>
+			<MeleeParryChance>1.44</MeleeParryChance>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Killzone Concept Armor Set/Patches/Killzone Concept Armor Set/Apparel_Armor.xml b/ModPatches/Killzone Concept Armor Set/Patches/Killzone Concept Armor Set/Apparel_Armor.xml
new file mode 100644
index 0000000000..a6b1a448f6
--- /dev/null
+++ b/ModPatches/Killzone Concept Armor Set/Patches/Killzone Concept Armor Set/Apparel_Armor.xml	
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Heavy Trooper Armor === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Bot_Soldier_Armor"]/statBases</xpath>
+		<value>
+			<Bulk>75</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bot_Soldier_Armor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14.7</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bot_Soldier_Armor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>28.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Bot_Soldier_Armor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>20</CarryBulk>
+			<CarryWeight>25</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Bot_Soldier_Armor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Bot_Soldier_Armor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Heavy Trooper Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Bot_Soldier_Helmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.50</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Bot_Soldier_Helmet"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bot_Soldier_Helmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bot_Soldier_Helmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Bot_Soldier_Helmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Killzone Concept Armor Set/Patches/Killzone Concept Armor Set/Ranged_Industrial.xml b/ModPatches/Killzone Concept Armor Set/Patches/Killzone Concept Armor Set/Ranged_Industrial.xml
new file mode 100644
index 0000000000..6c0742ee53
--- /dev/null
+++ b/ModPatches/Killzone Concept Armor Set/Patches/Killzone Concept Armor Set/Ranged_Industrial.xml	
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "StA25_SMG" or
+			defName = "StA-3_HMG"
+			]/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>
+
+	<!-- StA25 Vlug -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>StA25_SMG</defName>
+		<statBases>
+			<Mass>3.0</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>0.49</SwayFactor>
+			<Bulk>7.5</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.04</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_46x30mm_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>35</range>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.0</reloadTime>
+			<ammoSet>AmmoSet_46x30mm</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>10</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- StA-3 Light Machine Gun -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>StA-3_HMG</defName>
+		<statBases>
+			<Mass>8.50</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.65</SwayFactor>
+			<Bulk>11.0</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.25</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>60</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>5.2</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_MachineGun</li>
+			<li>CE_AI_Suppressive</li>
+			<li>Bipod_LMG</li>
+		</weaponTags>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kit's Gunpowder Weapons/Defs/Kit's Gunpowder Weapons/Ammo_KitsGunpowder.xml b/ModPatches/Kit's Gunpowder Weapons/Defs/Kit's Gunpowder Weapons/Ammo_KitsGunpowder.xml
new file mode 100644
index 0000000000..a924f03eb3
--- /dev/null
+++ b/ModPatches/Kit's Gunpowder Weapons/Defs/Kit's Gunpowder Weapons/Ammo_KitsGunpowder.xml	
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- ==================== ThingCategories ========================== -->
+
+	<ThingCategoryDef>
+		<defName>LargeCannonBall</defName>
+		<label>Large Cannon Ball</label>
+		<parent>AmmoShells</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberMortar</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_BlunderShot</defName>
+		<label>Blunder Shot</label>
+		<ammoTypes>
+			<Ammo_MusketBall>Bullet_BlunderShot_Ball</Ammo_MusketBall>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_LargeCannonBall</defName>
+		<label>Large Cannon Ball</label>
+		<ammoTypes>
+			<Shell_LargeCannonBall_Steel>Bullet_LargeCannonBall_Steel</Shell_LargeCannonBall_Steel>
+		</ammoTypes>
+		<isMortarAmmoSet>true</isMortarAmmoSet>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<!-- ==== Large Steel Cannon Ball	==== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBaseCraftableBase">
+		<defName>Shell_LargeCannonBall_Steel</defName>
+		<label>Large Cannon Ball</label>
+		<graphicData>
+			<texPath>Things/Ammo/Cannon/BlackPowder/Cannon_Round</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.5</MarketValue>
+			<Mass>16</Mass>
+			<Bulk>12</Bulk>
+		</statBases>
+		<ammoClass>CannonBall</ammoClass>
+		<detonateProjectile>Bullet_LargeCannonBall_Steel</detonateProjectile>
+		<comps>
+			<!-- Vanilla values -->
+			<li Class="CompProperties_Explosive">
+				<explosiveRadius>4</explosiveRadius>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<!--<explosiveExpandPerStackcount>0.4</explosiveExpandPerStackcount>-->
+				<startWickHitPointsPercent>0.7</startWickHitPointsPercent>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<explodeOnKilled>True</explodeOnKilled>
+				<wickTicks>30~60</wickTicks>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<!-- ==== Blunder Shot ==== -->
+	<ThingDef ParentName="Base12GaugeBullet">
+		<defName>Bullet_BlunderShot_Ball</defName>
+		<label>lead ball</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shotgun_Pellet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>10</damageAmountBase>
+			<pelletCount>10</pelletCount>
+			<armorPenetrationSharp>2.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>12</armorPenetrationBlunt>
+			<spreadMult>22.5</spreadMult>
+			<speed>76</speed>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==== Large Steel Cannon Ball ==== -->
+	<ThingDef ParentName="Base81mmMortarShell">
+		<defName>Bullet_LargeCannonBall_Steel</defName>
+		<label>Large Cannon Ball</label>
+		<graphicData>
+			<texPath>Things/Projectile/Mortar/Illumination</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>56</damageAmountBase>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>128</armorPenetrationBlunt>
+			<explosionRadius>2.5</explosionRadius>
+			<flyOverhead>true</flyOverhead>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<ai_IsIncendiary>false</ai_IsIncendiary>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>4</Fragment_Large>
+					<Fragment_Small>15</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<!-- ==== Mortar Grenade ==== -->
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_MortarGrenade</defName>
+		<label>Make Mortar Grenade x5</label>
+		<description>Craft 5 Mortar Grenades</description>
+		<jobString>Making Mortar Grenades</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>15</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_MortarGrenade>5</Ammo_MortarGrenade>
+		</products>
+		<workAmount>8500</workAmount>
+	</RecipeDef>
+
+	<!-- ==== Large Steel Cannon Ball ==== -->
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeShell_LargeCannonBall_Steel</defName>
+		<label>Make Steel Large Cannon Balls x5</label>
+		<description>Craft 5 Steel Large Cannon Balls</description>
+		<jobString>Making Steel Large Cannon Balls</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>100</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Shell_LargeCannonBall_Steel>5</Shell_LargeCannonBall_Steel>
+		</products>
+		<workAmount>28000</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Kit's Gunpowder Weapons/Patches/Kit's Gunpowder Weapons/KitsGunpowder_Guns.xml b/ModPatches/Kit's Gunpowder Weapons/Patches/Kit's Gunpowder Weapons/KitsGunpowder_Guns.xml
new file mode 100644
index 0000000000..e457877770
--- /dev/null
+++ b/ModPatches/Kit's Gunpowder Weapons/Patches/Kit's Gunpowder Weapons/KitsGunpowder_Guns.xml	
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Tools ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="KIT_Gun_Arquebus" or
+			defName="KIT_Gun_Blunderbuss" or
+			defName="KIT_Gun_HandMortar"
+			]/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="KIT_Gun_BayonetMusket"]/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>bayonet</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.49</cooldownTime>
+					<armorPenetrationBlunt>2.16</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.44</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="KIT_Gun_BayonetMusket"]/weaponTags</xpath>
+		<value>
+			<li>NoSwitch</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Guns ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>KIT_Gun_Arquebus</defName>
+		<statBases>
+			<Mass>5</Mass>
+			<Bulk>14</Bulk>
+			<SwayFactor>1.90</SwayFactor>
+			<ShotSpread>0.18</ShotSpread>
+			<SightsEfficiency>0.80</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_FastMusketBall</defaultProjectile>
+			<warmupTime>2</warmupTime>
+			<range>34</range>
+			<soundCast>KIT_Arquebus</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>5</AmmoGenPerMagOverride>
+			<reloadTime>8</reloadTime>
+			<ammoSet>AmmoSet_FastMusketBall</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>KIT_Gun_BayonetMusket</defName>
+		<statBases>
+			<Mass>5.2</Mass>
+			<Bulk>15</Bulk>
+			<SwayFactor>2.02</SwayFactor>
+			<ShotSpread>0.10</ShotSpread>
+			<SightsEfficiency>0.80</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_FastMusketBall</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>40</range>
+			<soundCast>KIT_BayonetMusket</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>5</AmmoGenPerMagOverride>
+			<reloadTime>8</reloadTime>
+			<ammoSet>AmmoSet_FastMusketBall</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>KIT_Gun_Blunderbuss</defName>
+		<statBases>
+			<Mass>4.8</Mass>
+			<Bulk>14.9</Bulk>
+			<SwayFactor>1.20</SwayFactor>
+			<ShotSpread>0.24</ShotSpread>
+			<SightsEfficiency>0.80</SightsEfficiency>
+			<RangedWeapon_Cooldown>1.35</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_BlunderShot_Ball</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>16</range>
+			<soundCast>Shot_Shotgun_NoRack</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<ammoConsumedPerShotCount>7</ammoConsumedPerShotCount>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>7</reloadTime>
+			<ammoSet>AmmoSet_BlunderShot</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>KIT_Gun_HandMortar</defName>
+		<statBases>
+			<Mass>4.8</Mass>
+			<Bulk>14.9</Bulk>
+			<SwayFactor>1.92</SwayFactor>
+			<ShotSpread>0.30</ShotSpread>
+			<SightsEfficiency>0.85</SightsEfficiency>
+			<RangedWeapon_Cooldown>1.35</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_MortarGrenade</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>20</range>
+			<soundCast>KIT_HandMortar</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>True</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>8</reloadTime>
+			<ammoSet>AmmoSet_MortarGrenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kit's Gunpowder Weapons/Patches/Kit's Gunpowder Weapons/KitsGunpowder_Security.xml b/ModPatches/Kit's Gunpowder Weapons/Patches/Kit's Gunpowder Weapons/KitsGunpowder_Security.xml
new file mode 100644
index 0000000000..866fe1a980
--- /dev/null
+++ b/ModPatches/Kit's Gunpowder Weapons/Patches/Kit's Gunpowder Weapons/KitsGunpowder_Security.xml	
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName = "KIT_Turret_Organ" or
+			defName = "KIT_Turret_12Pounder"or
+			defName = "KIT_Turret_Bombard"
+			]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "KIT_Turret_Organ" or
+			defName = "KIT_Turret_12Pounder" or
+			defName = "KIT_Turret_Bombard"
+			]/thingClass </xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "KIT_Turret_Organ" or
+			defName = "KIT_Turret_12Pounder"or
+			defName = "KIT_Turret_Bombard"
+			]/fillPercent </xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName = "KIT_Turret_Bombard"
+			]/placeWorkers/li["PlaceWorker_ShowTurretRadius"] </xpath>
+	</Operation>
+
+	<!-- ========== 12 Pounder ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>KIT_Gun_12Pounder</defName>
+		<statBases>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.4</ShotSpread>
+			<SwayFactor>1</SwayFactor>
+			<Bulk>18</Bulk>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_CannonBall_Round</defaultProjectile>
+			<warmupTime>1.4</warmupTime>
+			<range>108</range>
+			<soundCast>KIT_Shot_12Pounder</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<recoilPattern>Mounted</recoilPattern>
+			<targetParams>
+				<canTargetLocations>True</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>9.6</reloadTime>
+			<ammoSet>AmmoSet_CannonBall</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>false</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "KIT_Gun_12Pounder"]/weaponTags</xpath>
+		<value>
+			<li>TurretGun</li>
+		</value>
+	</Operation>
+
+	<!-- Organ Gun -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>KIT_Gun_Organ</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.59</SwayFactor>
+			<Bulk>15.54</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_FastMusketBall</defaultProjectile>
+			<warmupTime>3.2</warmupTime>
+			<range>54</range>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>KIT_Shot_Organ</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<targetParams>
+				<canTargetLocations>True</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>9.6</reloadTime>
+			<ammoSet>AmmoSet_FastMusketBall</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags Inherit="False">
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Bombard - Weapon ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>KIT_Gun_Bombard</defName>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+			<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_LargeCannonBall_Steel</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<minRange>15</minRange>
+			<range>156</range>
+			<burstShotCount>1</burstShotCount>
+			<soundCast>KIT_Shot_Bombard</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>8</muzzleFlashScale>
+			<circularError>1.2</circularError>
+			<requireLineOfSight>false</requireLineOfSight>
+			<indirectFirePenalty>0.3</indirectFirePenalty>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>7.5</reloadTime>
+			<ammoSet>AmmoSet_LargeCannonBall</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "KIT_Gun_Bombard"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>30</li>
+					<li>50</li>
+					<li>70</li>
+					<li>90</li>
+				</chargeSpeeds>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "KIT_Gun_Bombard"]/weaponTags</xpath>
+		<value>
+			<li>TurretGun</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kit's Industrial Weapons/Patches/Kit's Industrial Weapons/KitsIndustrial_Guns.xml b/ModPatches/Kit's Industrial Weapons/Patches/Kit's Industrial Weapons/KitsIndustrial_Guns.xml
new file mode 100644
index 0000000000..c3e3064803
--- /dev/null
+++ b/ModPatches/Kit's Industrial Weapons/Patches/Kit's Industrial Weapons/KitsIndustrial_Guns.xml	
@@ -0,0 +1,355 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Tools ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="KIT_Gun_SemiAutomaticPistol"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="KIT_Gun_PrecisionLMG" or
+			defName="KIT_Gun_BoltSMG" or
+			defName="KIT_Gun_AntiqueSniperRifle"
+			]/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="KIT_Gun_BayonetRifle"]/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>bayonet</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>2.14</cooldownTime>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>bayonet</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.49</cooldownTime>
+					<armorPenetrationBlunt>2.16</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.44</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="KIT_Bazooka"]/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>
+
+	<!-- ========== Mauser C96 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>KIT_Gun_SemiAutomaticPistol</defName>
+		<statBases>
+			<Mass>1.13</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.42</SwayFactor>
+			<Bulk>3.12</Bulk>
+			<WorkToMake>8000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_763x25mmMauser_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>KIT_SemiAutomaticPistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_763x25mmMauser</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+			<li>SimpleGun</li>
+			<li>Pistol</li>
+		</weaponTags>
+		<researchPrerequisite>KIT_EarlyGunsmithing</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== Bren LMG ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>KIT_Gun_PrecisionLMG</defName>
+		<statBases>
+			<Mass>10.35</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.53</SwayFactor>
+			<Bulk>12.56</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.22</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>59</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_303British</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Mosin-Nagant scoped ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>KIT_Gun_AntiqueSniperRifle</defName>
+		<statBases>
+			<Mass>4.27</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.21</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.69</SwayFactor>
+			<Bulk>12.32</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1.275</warmupTime>
+			<range>75</range>
+			<soundCast>KIT_AntiqueSniperRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Bayonet Rifle ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>KIT_Gun_BayonetRifle</defName>
+		<statBases>
+			<Mass>3.85</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.41</SwayFactor>
+			<Bulk>10.20</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<soundCast>KIT_BayonetRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Bolt SMG ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>KIT_Gun_BoltSMG</defName>
+		<statBases>
+			<Mass>3.63</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.21</SwayFactor>
+			<Bulk>9.43</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.22</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>23</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>36</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>KIT_Bazooka</defName>
+		<statBases>
+			<Mass>7.20</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>2.27</SwayFactor>
+			<Bulk>16.50</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_M6A3_HEAT</defaultProjectile>
+			<warmupTime>1.9</warmupTime>
+			<range>40</range>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kit's Industrial Weapons/Patches/Kit's Industrial Weapons/KitsIndustrial_Melee.xml b/ModPatches/Kit's Industrial Weapons/Patches/Kit's Industrial Weapons/KitsIndustrial_Melee.xml
new file mode 100644
index 0000000000..685d7083ba
--- /dev/null
+++ b/ModPatches/Kit's Industrial Weapons/Patches/Kit's Industrial Weapons/KitsIndustrial_Melee.xml	
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === Utility Knife === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="KIT_MeleeWeapon_UtilityKnife"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<MeleeCounterParryBonus>0.30</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="KIT_MeleeWeapon_UtilityKnife"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.10</MeleeCritChance>
+			<MeleeParryChance>0.30</MeleeParryChance>
+			<MeleeDodgeChance>0.010</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="KIT_MeleeWeapon_UtilityKnife"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="KIT_MeleeWeapon_UtilityKnife"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1</cooldownTime>
+					<armorPenetrationBlunt>0.56</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.72</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1</cooldownTime>
+					<chanceFactor>1.88</chanceFactor>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.76</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kit's Roman Weapons/Patches/Kit's Roman Weapons/Roman_Security.xml b/ModPatches/Kit's Roman Weapons/Patches/Kit's Roman Weapons/Roman_Security.xml
new file mode 100644
index 0000000000..5948330d31
--- /dev/null
+++ b/ModPatches/Kit's Roman Weapons/Patches/Kit's Roman Weapons/Roman_Security.xml	
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName = "KIT_Turret_Scorpio"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "KIT_Turret_Scorpio"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "KIT_Turret_Scorpio"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<!-- ========== Scorpio - Weapon ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>KIT_Gun_Scorpio</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>1</ShotSpread>
+			<SwayFactor>1</SwayFactor>
+			<Bulk>4.00</Bulk>
+			<RangedWeapon_Cooldown>1.8</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Pilum_Fired</defaultProjectile>
+			<warmupTime>1.4</warmupTime>
+			<range>40</range>
+			<soundCast>KIT_Shot_Scorpio</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>6</reloadTime>
+			<ammoSet>AmmoSet_Javelins</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>false</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "KIT_Gun_Scorpio"]/weaponTags</xpath>
+		<value>
+			<li>TurretGun</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kit's Roman Weapons/Patches/Kit's Roman Weapons/Roman_Shields.xml b/ModPatches/Kit's Roman Weapons/Patches/Kit's Roman Weapons/Roman_Shields.xml
new file mode 100644
index 0000000000..553db98991
--- /dev/null
+++ b/ModPatches/Kit's Roman Weapons/Patches/Kit's Roman Weapons/Roman_Shields.xml	
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Scutum -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="KIT_Shield_Scutum"]</xpath>
+		<value>
+			<ThingDef ParentName="ShieldBase">
+				<defName>KIT_Shield_Scutum</defName>
+				<label>scutum shield</label>
+				<description>A large stony shield, with the front decoratively painted. Offers a great amount of protection against melee and ranged attacks.</description>
+				<techLevel>Medieval</techLevel>
+				<graphicData>
+					<texPath>Things/Shield/ScutumShield</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+					<drawSize>0.83</drawSize>
+				</graphicData>
+				<thingCategories Inherit="False">
+					<li>Shields</li>
+				</thingCategories>
+				<stuffCategories>
+					<li>Stony</li>
+				</stuffCategories>
+				<costStuffCount>80</costStuffCount>
+				<recipeMaker>
+					<researchPrerequisite>Smithing</researchPrerequisite>
+					<recipeUsers>
+						<li>FueledSmithy</li>
+						<li>ElectricSmithy</li>
+					</recipeUsers>
+				</recipeMaker>
+				<statBases>
+					<WorkToMake>12000</WorkToMake>
+					<MaxHitPoints>145</MaxHitPoints>
+					<ArmorRating_Sharp>1.75</ArmorRating_Sharp>
+					<ArmorRating_Blunt>6</ArmorRating_Blunt>
+					<Mass>8</Mass>
+					<Bulk>8</Bulk>
+					<WornBulk>6</WornBulk>
+				</statBases>
+				<equippedStatOffsets>
+					<ReloadSpeed>-0.1</ReloadSpeed>
+					<MeleeHitChance>-1</MeleeHitChance>
+					<ShootingAccuracyPawn>-0.2</ShootingAccuracyPawn>
+					<AimingAccuracy>-0.05</AimingAccuracy>
+					<Suppressability>-0.25</Suppressability>
+					<MeleeCritChance>-0.08</MeleeCritChance>
+					<MeleeParryChance>1.0</MeleeParryChance>
+				</equippedStatOffsets>
+				<apparel>
+					<tags>
+						<li>ClassicalShield</li>
+					</tags>
+				</apparel>
+				<modExtensions>
+					<li Class="CombatExtended.ShieldDefExtension">
+						<shieldCoverage>
+							<li>Hands</li>
+							<li>Arms</li>
+							<li>Shoulders</li>
+							<li>Torso</li>
+							<li>Neck</li>
+						</shieldCoverage>
+						<crouchCoverage>
+							<li>Legs</li>
+						</crouchCoverage>
+						<drawAsTall>false</drawAsTall>
+					</li>
+				</modExtensions>
+			</ThingDef>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kit's Roman Weapons/Patches/Kit's Roman Weapons/Roman_Weapons.xml b/ModPatches/Kit's Roman Weapons/Patches/Kit's Roman Weapons/Roman_Weapons.xml
new file mode 100644
index 0000000000..509614ca28
--- /dev/null
+++ b/ModPatches/Kit's Roman Weapons/Patches/Kit's Roman Weapons/Roman_Weapons.xml	
@@ -0,0 +1,373 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Dolabra === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="KIT_MeleeWeapon_Dolabra"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.78</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>2.79</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>6.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.63</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>spike</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>3.49</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>6.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.09</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="KIT_MeleeWeapon_Dolabra"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.20</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="KIT_MeleeWeapon_Dolabra"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.03</MeleeCritChance>
+			<MeleeParryChance>0.20</MeleeParryChance>
+			<MeleeDodgeChance>0.27</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- === Pugio === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="KIT_MeleeWeapon_Pugio"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.29</cooldownTime>
+					<armorPenetrationBlunt>0.275</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.42</cooldownTime>
+					<armorPenetrationBlunt>0.396</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.35</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.29</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.275</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.31</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="KIT_MeleeWeapon_Pugio"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="KIT_MeleeWeapon_Pugio"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.63</MeleeCritChance>
+				<MeleeParryChance>0.5</MeleeParryChance>
+				<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="KIT_MeleeWeapon_Pugio"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- Hasta -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="KIT_MeleeWeapon_Hasta"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.35</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.78</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.19</cooldownTime>
+					<chanceFactor>1.00</chanceFactor>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.75</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="KIT_MeleeWeapon_Hasta"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="KIT_MeleeWeapon_Hasta"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.17</MeleeCritChance>
+				<MeleeParryChance>1.45</MeleeParryChance>
+				<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Falx -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="KIT_MeleeWeapon_Falx"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.63</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.7</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>32</power>
+					<cooldownTime>1.56</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>2.268</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.51</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="KIT_MeleeWeapon_Falx"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.29</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<MeleeDodgeChance>0.47</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="KIT_MeleeWeapon_Falx"]/statBases</xpath>
+		<value>
+			<Bulk>7</Bulk>
+			<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<!-- === Plumbata === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="KIT_WeaponRanged_Plumbatae"]</xpath>
+		<value>
+
+			<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseWeaponAndAmmoNeolithic">
+				<defName>KIT_WeaponRanged_Plumbatae</defName>
+				<label>plumbata</label>
+				<description>A handful of darts. Can inflict injuries in close range. Simple but effective.</description>
+				<graphicData>
+					<texPath>Things/Projectile/PlumbataeThrown</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+					<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
+				</graphicData>
+				<soundInteract>Interact_Grenade</soundInteract>
+				<statBases>
+					<MarketValue>2.36</MarketValue>
+					<SightsEfficiency>1.0</SightsEfficiency>
+					<ShotSpread>1.5</ShotSpread>
+					<SwayFactor>2.5</SwayFactor>
+					<Bulk>3.5</Bulk>
+					<Mass>0.5</Mass>
+					<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+				</statBases>
+				<equippedAngleOffset>30</equippedAngleOffset>
+				<stackLimit>50</stackLimit>
+				<weaponTags>
+					<li>NeolithicRanged</li>
+					<li>MedievalRangedBasic</li>
+					<li>CE_OneHandedWeapon</li>
+					<li>CE_AI_Rifle</li>
+				</weaponTags>
+				<tradeTags>
+					<li>CE_AutoEnableTrade</li>
+				</tradeTags>
+				<verbs>
+					<li Class="CombatExtended.VerbPropertiesCE">
+						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>KitPlumbata_Thrown</defaultProjectile>
+						<warmupTime>1.5</warmupTime>
+						<range>14</range>
+						<soundCast>Interact_Grenade</soundCast>
+					</li>
+				</verbs>
+				<tools>
+					<li Class="CombatExtended.ToolCE">
+						<label>handle</label>
+						<capacities>
+							<li>Poke</li>
+						</capacities>
+						<power>1</power>
+						<cooldownTime>1.26</cooldownTime>
+						<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+						<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+					</li>
+					<li Class="CombatExtended.ToolCE">
+						<label>point</label>
+						<capacities>
+							<li>Stab</li>
+						</capacities>
+						<power>8</power>
+						<cooldownTime>1.26</cooldownTime>
+						<chanceFactor>1.33</chanceFactor>
+						<armorPenetrationBlunt>0.20</armorPenetrationBlunt>
+						<armorPenetrationSharp>0.42</armorPenetrationSharp>
+						<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+					</li>
+				</tools>
+				<ammoClass>Javelin</ammoClass>
+			</ThingDef>
+
+			<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+				<defName>MakeAmmo_KIT_WeaponRanged_Plumbatae</defName>
+				<label>make plumbata x10</label>
+				<description>Craft 10 plumbata.</description>
+				<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+				<workSkill>Crafting</workSkill>
+				<recipeUsers>
+					<li>ElectricSmithy</li>
+					<li>FueledSmithy</li>
+					<li>CraftingSpot</li>
+				</recipeUsers>
+				<effectWorking>Smelt</effectWorking>
+				<unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
+				<workAmount>2500</workAmount>
+				<jobString>Making plumbata.</jobString>
+				<ingredients>
+					<li>
+						<filter>
+							<thingDefs>
+								<li>Steel</li>
+							</thingDefs>
+						</filter>
+						<count>20</count>
+					</li>
+				</ingredients>
+				<fixedIngredientFilter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</fixedIngredientFilter>
+				<products>
+					<KIT_WeaponRanged_Plumbatae>10</KIT_WeaponRanged_Plumbatae>
+				</products>
+			</RecipeDef>
+
+			<ThingDef Class="CombatExtended.AmmoDef" ParentName="BasePilumProjectile">
+				<defName>KitPlumbata_Thrown</defName>
+				<label>plumbata</label>
+				<graphicData>
+					<texPath>Things/Projectile/PlumbataeThrown</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<projectile Class="CombatExtended.ProjectilePropertiesCE">
+					<damageAmountBase>8</damageAmountBase>
+					<speed>18</speed>
+					<armorPenetrationBlunt>2.36</armorPenetrationBlunt>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<preExplosionSpawnChance>0.65</preExplosionSpawnChance><!-- 4 javelins per resource -->
+					<preExplosionSpawnThingDef>KIT_WeaponRanged_Plumbatae</preExplosionSpawnThingDef>
+				</projectile>
+			</ThingDef>
+
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kit's VFE Weapons/Defs/Kit's VFE Weapons/Ammo/Ammo_KitPlasma.xml b/ModPatches/Kit's VFE Weapons/Defs/Kit's VFE Weapons/Ammo/Ammo_KitPlasma.xml
new file mode 100644
index 0000000000..6067ba01f0
--- /dev/null
+++ b/ModPatches/Kit's VFE Weapons/Defs/Kit's VFE Weapons/Ammo/Ammo_KitPlasma.xml	
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- ==================== Boltcaster ========================== -->
+
+	<!-- ==================== AmmoSets ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_KIT_PlasmaPistol</defName>
+		<label>Plasma Pistol Power Cell</label>
+		<ammoTypes>
+			<Ammo_PlasmaCellPistol>Bullet_KIT_PlasmaPistol</Ammo_PlasmaCellPistol>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_KIT_PlasmaSMG</defName>
+		<label>Plasma Pistol Power Cell</label>
+		<ammoTypes>
+			<Ammo_PlasmaCellPistol>Bullet_KIT_PlasmaSMG</Ammo_PlasmaCellPistol>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_KIT_PlasmaRifle</defName>
+		<label>Plasma Rifle Power Cell</label>
+		<ammoTypes>
+			<Ammo_PlasmaCellRifle>Bullet_KIT_PlasmaRifle</Ammo_PlasmaCellRifle>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_KIT_PlasmaRifle</defName>
+		<label>Plasma Rifle Power Cell</label>
+		<ammoTypes>
+			<Ammo_PlasmaCellRifle>Bullet_KIT_PlasmaSniper</Ammo_PlasmaCellRifle>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="BaseVFEIPlasmaBullet">
+		<defName>Bullet_KIT_PlasmaPistol</defName>
+		<label>plasma pistol shot</label>
+		<graphicData>
+			<texPath>Things/Item/Weapons/Plasma_Beam</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>15</damageAmountBase>
+			<armorPenetrationSharp>10</armorPenetrationSharp>
+			<armorPenetrationBlunt>10</armorPenetrationBlunt>
+			<empShieldBreakChance>0.2</empShieldBreakChance>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>3</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseVFEIPlasmaBullet">
+		<defName>Bullet_KIT_PlasmaRifle</defName>
+		<label>plasma rifle shot</label>
+		<graphicData>
+			<texPath>Things/Item/Weapons/Plasma_Nail</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>30</damageAmountBase>
+			<armorPenetrationSharp>10</armorPenetrationSharp>
+			<armorPenetrationBlunt>10</armorPenetrationBlunt>
+			<empShieldBreakChance>0.5</empShieldBreakChance>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>9</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseVFEIPlasmaBullet">
+		<defName>Bullet_KIT_PlasmaSMG</defName>
+		<label>plasma submachine gun shot</label>
+		<graphicData>
+			<texPath>Things/Item/Weapons/Plasma_Beam</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>6</damageAmountBase>
+			<armorPenetrationSharp>10</armorPenetrationSharp>
+			<armorPenetrationBlunt>10</armorPenetrationBlunt>
+			<empShieldBreakChance>0.05</empShieldBreakChance>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>1</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseVFEIPlasmaBullet">
+		<defName>Bullet_KIT_PlasmaSniper</defName>
+		<label>plasma rifle shot</label>
+		<graphicData>
+			<texPath>Things/Item/Weapons/Plasma_Nail</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>45</damageAmountBase>
+			<armorPenetrationSharp>10</armorPenetrationSharp>
+			<armorPenetrationBlunt>10</armorPenetrationBlunt>
+			<empShieldBreakChance>1</empShieldBreakChance>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>12</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Kit's VFE Weapons/Defs/Kit's VFE Weapons/DamageDefs/DamageDefs_Vikings.xml b/ModPatches/Kit's VFE Weapons/Defs/Kit's VFE Weapons/DamageDefs/DamageDefs_Vikings.xml
new file mode 100644
index 0000000000..e394f0d685
--- /dev/null
+++ b/ModPatches/Kit's VFE Weapons/Defs/Kit's VFE Weapons/DamageDefs/DamageDefs_Vikings.xml	
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ToolCapacityDef>
+		<defName>CE_CryptoBlunt</defName>
+		<label>blunt</label>
+	</ToolCapacityDef>
+
+	<DamageDef ParentName="BluntBase">
+		<defName>CE_CryptoBlunt</defName>
+		<label>the crushing and hypothermic damage of advanced crypto weaponry</label>
+		<additionalHediffs>
+			<li>
+				<hediff>Hypothermia</hediff>
+				<severityPerDamageDealt>0.01</severityPerDamageDealt>
+			</li>
+		</additionalHediffs>
+	</DamageDef>
+
+	<ManeuverDef>
+		<defName>CE_Cryptosmash</defName>
+		<requiredCapacity>CE_CryptoBlunt</requiredCapacity>
+		<verb>
+			<verbClass Class="CombatExtended.VerbPropertiesCE">CombatExtended.Verb_MeleeAttackCE</verbClass>
+			<meleeDamageDef>CE_CryptoBlunt</meleeDamageDef>
+		</verb>
+		<logEntryDef>MeleeAttack</logEntryDef>
+		<combatLogRulesHit>Maneuver_Smash_MeleeHit</combatLogRulesHit>
+		<combatLogRulesDeflect>Maneuver_Smash_MeleeDeflect</combatLogRulesDeflect>
+		<combatLogRulesMiss>Maneuver_Smash_MeleeMiss</combatLogRulesMiss>
+		<combatLogRulesDodge>Maneuver_Smash_MeleeDodge</combatLogRulesDodge>
+	</ManeuverDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Kit's VFE Weapons/Patches/Kit's VFE Weapons/ThingDefs_Misc/Weapons.xml b/ModPatches/Kit's VFE Weapons/Patches/Kit's VFE Weapons/ThingDefs_Misc/Weapons.xml
new file mode 100644
index 0000000000..c8ebb27830
--- /dev/null
+++ b/ModPatches/Kit's VFE Weapons/Patches/Kit's VFE Weapons/ThingDefs_Misc/Weapons.xml	
@@ -0,0 +1,429 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==========  Hammer  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="KIT_CryptoHammer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.84</cooldownTime>
+					<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>CE_CryptoBlunt</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>2.61</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>135</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="KIT_CryptoHammer"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.25</MeleeCounterParryBonus>
+			<Bulk>3.5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="KIT_CryptoHammer"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.67</MeleeCritChance>
+				<MeleeParryChance>0.25</MeleeParryChance>
+				<MeleeDodgeChance>0.33</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- ==========  Knife  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="KIT_CryptoKnife"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.01</cooldownTime>
+					<chanceFactor>0.4</chanceFactor>
+					<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>VFEV_Cut</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>0.72</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<armorPenetrationSharp>8</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="KIT_CryptoKnife"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.39</MeleeCounterParryBonus>
+			<Bulk>1.5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="KIT_CryptoKnife"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.08</MeleeCritChance>
+				<MeleeParryChance>0.24</MeleeParryChance>
+				<MeleeDodgeChance>1.07</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- ========== Glaive  =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="KIT_CryptoSpear"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>1.08</MeleeCounterParryBonus>
+			<Bulk>12.50</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="KIT_CryptoSpear"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.22</MeleeCritChance>
+				<MeleeParryChance>1.53</MeleeParryChance>
+				<MeleeDodgeChance>0.67</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="KIT_CryptoSpear"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>VFEV_Cut</li>
+					</capacities>
+					<power>37</power>
+					<cooldownTime>3.16</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+					<armorPenetrationSharp>25</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.38</cooldownTime>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>4.05</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ==========  Sword  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="KIT_CryptoSword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.01</cooldownTime>
+					<chanceFactor>0.4</chanceFactor>
+					<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>VFEV_Cut</li>
+					</capacities>
+					<power>44</power>
+					<cooldownTime>0.99</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>4.05</armorPenetrationBlunt>
+					<armorPenetrationSharp>13.35</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="KIT_CryptoSword"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.39</MeleeCounterParryBonus>
+			<Bulk>1.5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="KIT_CryptoSword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.08</MeleeCritChance>
+				<MeleeParryChance>0.24</MeleeParryChance>
+				<MeleeDodgeChance>1.07</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- ========== Pistol =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>KIT_Gun_PlasmaPistol</defName>
+		<statBases>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.72</SwayFactor>
+			<Bulk>3.21</Bulk>
+			<Mass>2.65</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_KIT_PlasmaPistol</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>VFE_PlasmaShot_Cutter</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_KIT_PlasmaPistol</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="KIT_Gun_PlasmaPistol"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- ========== SMG =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>KIT_Gun_PlasmaSMG</defName>
+		<statBases>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.84</SwayFactor>
+			<Bulk>6.80</Bulk>
+			<Mass>3.00</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>0.76</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_KIT_PlasmaSMG</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<range>31</range>
+			<soundCast>VFE_PlasmaShot_Scattergun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>35</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_KIT_PlasmaSMG</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Rifle =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>KIT_Gun_PlasmaRifle</defName>
+		<statBases>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.41</SwayFactor>
+			<Bulk>9.85</Bulk>
+			<Mass>4.21</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_KIT_PlasmaRifle</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>51</range>
+			<soundCast>VFE_PlasmaShot_Piercer</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>27</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_KIT_PlasmaRifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Sniper Rifle =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>KIT_Gun_PlasmaSniper</defName>
+		<statBases>
+			<SightsEfficiency>4.36</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.78</SwayFactor>
+			<Bulk>9.95</Bulk>
+			<Mass>4.79</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_KIT_PlasmaSniper</defaultProjectile>
+			<warmupTime>2.1</warmupTime>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<range>78</range>
+			<soundCast>VFE_PlasmaShot_Beam</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_KIT_PlasmaRifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Melee Attacks =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="KIT_Gun_PlasmaSniper" or
+			defName="KIT_Gun_PlasmaSMG" or
+			defName="KIT_Gun_PlasmaRifle"
+			]/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="KIT_Gun_PlasmaPistol"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kobold Factions/Defs/Kobold Factions/Pawnkinds_Kobold.xml b/ModPatches/Kobold Factions/Defs/Kobold Factions/Pawnkinds_Kobold.xml
new file mode 100644
index 0000000000..7aab823d8d
--- /dev/null
+++ b/ModPatches/Kobold Factions/Defs/Kobold Factions/Pawnkinds_Kobold.xml	
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!--Medieval Kobold with Sticky Bomb -->
+	<PawnKindDef>
+		<defName>Kobold_Kamikaze</defName>
+		<race>Alien_Kobold</race>
+		<label>Blaster</label>
+		<combatPower>65</combatPower>
+		<defaultFactionType>LTS_MedboldEmpireFriendly</defaultFactionType>
+		<backstoryCategories>
+			<li>MedboldBackstory</li>
+		</backstoryCategories>
+		<maxGenerationAge>10</maxGenerationAge>
+		<chemicalAddictionChance>0.05</chemicalAddictionChance>
+		<invNutrition>1.8</invNutrition>
+		<invFoodDef>Pemmican</invFoodDef>
+		<canBeSapper>true</canBeSapper>
+		<gearHealthRange>
+			<min>0.5</min>
+			<max>1.8</max>
+		</gearHealthRange>
+		<apparelMoney>
+			<min>180</min>
+			<max>350</max>
+		</apparelMoney>
+		<apparelRequired>
+			<li>Apparel_Pants</li>
+			<li>CE_Apparel_TribalBackpack</li>
+		</apparelRequired>
+		<apparelTags>
+			<li>IndustrialBasic</li>
+		</apparelTags>
+		<weaponMoney>
+			<min>120</min>
+			<max>400</max>
+		</weaponMoney>
+		<weaponTags>
+			<li>CE_GrenadeNeolithic</li>
+		</weaponTags>
+		<techHediffsMoney>
+			<min>50</min>
+			<max>800</max>
+		</techHediffsMoney>
+		<techHediffsTags>
+			<li>Poor</li>
+			<li>Simple</li>
+		</techHediffsTags>
+		<techHediffsChance>0.33</techHediffsChance>
+		<disallowedTraits>
+			<li>Brawler</li>
+		</disallowedTraits>
+		<initialWillRange>2~4</initialWillRange>
+		<initialResistanceRange>14~22</initialResistanceRange>
+		<modExtensions>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>18</max>
+				</primaryMagazineCount>
+				<!-- No sidearms, these guys are literally just sticky-bomb launchers-->
+			</li>
+		</modExtensions>
+	</PawnKindDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Kobold Factions/Patches/Kobold Factions/Kobold_Kamikaze_Pawnkind.xml b/ModPatches/Kobold Factions/Patches/Kobold Factions/Kobold_Kamikaze_Pawnkind.xml
new file mode 100644
index 0000000000..ef67a89f2e
--- /dev/null
+++ b/ModPatches/Kobold Factions/Patches/Kobold Factions/Kobold_Kamikaze_Pawnkind.xml	
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Adding Kobold Kamikazes -->
+	<Operation Class="PatchOperationAdd"><!-- Combat -->
+		<xpath>Defs/FactionDef[@Name="Medbold_FactionBase"]/pawnGroupMakers/li[1]/options</xpath>
+		<value>
+			<Kobold_Kamikaze>10</Kobold_Kamikaze>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!--Peaceful-->
+		<xpath>Defs/FactionDef[@Name="Medbold_FactionBase"]/pawnGroupMakers/li[2]/options</xpath>
+		<value>
+			<Kobold_Kamikaze>5</Kobold_Kamikaze>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!--Trader-->
+		<xpath>Defs/FactionDef[@Name="Medbold_FactionBase"]/pawnGroupMakers/li[3]/guards</xpath>
+		<value>
+			<Kobold_Kamikaze>7</Kobold_Kamikaze>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Settlement -->
+		<xpath>Defs/FactionDef[@Name="Medbold_FactionBase"]/pawnGroupMakers/li[4]/options</xpath>
+		<value>
+			<Kobold_Kamikaze>20</Kobold_Kamikaze>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!--Adding Kamikaze ONLY raid -->
+		<xpath>Defs/FactionDef[@Name="Medbold_FactionBase"]/pawnGroupMakers</xpath>
+		<value>
+			<li>
+				<kindDef>Combat</kindDef>
+				<commonality>30</commonality>
+				<options>
+					<Kobold_Kamikaze>20</Kobold_Kamikaze>
+				</options>
+			</li>
+		</value>
+	</Operation>
+	
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kobold Factions/Patches/Kobold Factions/Medieval_Kobold_Pawnkind.xml b/ModPatches/Kobold Factions/Patches/Kobold Factions/Medieval_Kobold_Pawnkind.xml
new file mode 100644
index 0000000000..df1957b9f1
--- /dev/null
+++ b/ModPatches/Kobold Factions/Patches/Kobold Factions/Medieval_Kobold_Pawnkind.xml	
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[ @Name="MedboldBase"]/apparelRequired</xpath>
+		<value>
+			<li>CE_Apparel_TribalBackpack</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[ defName="LTS_MedboldScout" or defName="LTS_MedboldRanger" or defName="LTS_MedboldLord"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>15</min>
+					<max>30</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kobolds of the Rim/Patches/Kobolds of the Rim/Apparel_Kobold.xml b/ModPatches/Kobolds of the Rim/Patches/Kobolds of the Rim/Apparel_Kobold.xml
new file mode 100644
index 0000000000..b0902fadf9
--- /dev/null
+++ b/ModPatches/Kobolds of the Rim/Patches/Kobolds of the Rim/Apparel_Kobold.xml	
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Simple Shirt -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kobold_SimpleShirt"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Tribal Armor -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Kobold_TribalArmor"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName= "Kobold_TribalArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+			<ArmorRating_Sharp>0.30</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Scout Armor -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Kobold_ScoutArmor"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName= "Kobold_ScoutArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+			<ArmorRating_Blunt>1.3</ArmorRating_Blunt>
+			<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Tribal Hat -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kobold_TribalHat"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Paint & Earrings -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kobold_ScoutPaint" or defName="Kobold_WarlordPaint" or defName="Kobold_GeneralEarring"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>0.05</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Kobold_ScoutPaint" or defName="Kobold_WarlordPaint" or defName="Kobold_GeneralEarring"]/statBases/StuffEffectMultiplierArmor</xpath>
+	</Operation>
+
+	<!-- Shoulder Fur -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kobold_ShoulderFur"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kobold_ShoulderFur"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- General & Warlord Armor -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Kobold_GeneralArmor" or defName ="Kobold_WarlordArmor"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName= "Kobold_GeneralArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+			<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName= "Kobold_WarlordArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+			<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kobolds of the Rim/Patches/Kobolds of the Rim/Melee_Kobold.xml b/ModPatches/Kobolds of the Rim/Patches/Kobolds of the Rim/Melee_Kobold.xml
new file mode 100644
index 0000000000..d999a74df3
--- /dev/null
+++ b/ModPatches/Kobolds of the Rim/Patches/Kobolds of the Rim/Melee_Kobold.xml	
@@ -0,0 +1,291 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Bone -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kobold_Bone"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.78</cooldownTime>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>3.01</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kobold_Bone"]/statBases</xpath>
+		<value>
+			<Bulk>3.75</Bulk>
+			<MeleeCounterParryBonus>0.14</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kobold_Bone"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.58</MeleeCritChance>
+				<MeleeParryChance>0.14</MeleeParryChance>
+				<MeleeDodgeChance>0.16</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kobold_Bone"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- Bone Dagger -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kobold_BoneDagger"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.2</cooldownTime>
+					<armorPenetration>0.071</armorPenetration>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Kobold_StabToxic</li>
+					</capacities>
+					<power>9.5</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetration>0.208</armorPenetration>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kobold_BoneDagger"]/statBases</xpath>
+		<value>
+			<Bulk>0.15</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kobold_BoneDagger"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.1</MeleeCritChance>
+				<MeleeParryChance>0.1</MeleeParryChance>
+				<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kobold_BoneDagger"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- Ceremonial Dagger -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kobold_Dagger"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Kobold_CutToxic</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.18</cooldownTime>
+					<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.32</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Kobold_StabToxic</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.26</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.42</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kobold_Dagger"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kobold_Dagger"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.5</MeleeCritChance>
+				<MeleeParryChance>0.15</MeleeParryChance>
+				<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Bone Sword -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kobold_BoneSword"]/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>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kobold_BoneSword"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kobold_BoneSword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.2</MeleeCritChance>
+				<MeleeParryChance>0.35</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Bone Spear -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kobold_Spear"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.35</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Kobold_StabToxic</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.19</cooldownTime>
+					<chanceFactor>1.00</chanceFactor>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kobold_Spear"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kobold_Spear"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.17</MeleeCritChance>
+				<MeleeParryChance>1.45</MeleeParryChance>
+				<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kobolds of the Rim/Patches/Kobolds of the Rim/Patch_Body_Kobold.xml b/ModPatches/Kobolds of the Rim/Patches/Kobolds of the Rim/Patch_Body_Kobold.xml
new file mode 100644
index 0000000000..501d247652
--- /dev/null
+++ b/ModPatches/Kobolds of the Rim/Patches/Kobolds of the Rim/Patch_Body_Kobold.xml	
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Add armor coverage (for pawns with non-zero armor that use human body) ========== -->
+
+	<!-- Kobold -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Kobold"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Kobold"]/corePart/parts/li[def = "Tail"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Kobold"]/corePart/parts/li[def = "Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Kobold"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Kobold"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Kobold"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Kobold"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Ear"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Kobold"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="KoboldLeftHorn"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Kobold"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="KoboldRightHorn"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Kobold"]/corePart/parts/li[def = "Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Kobold"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Kobold"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Kobold"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/parts/li[def = "Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Kobold"]/corePart/parts/li[def = "Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Kobold"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Kobold"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/parts/li[def = "Toe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kobolds of the Rim/Patches/Kobolds of the Rim/PawnKinds_Kobold.xml b/ModPatches/Kobolds of the Rim/Patches/Kobolds of the Rim/PawnKinds_Kobold.xml
new file mode 100644
index 0000000000..4b192d8efb
--- /dev/null
+++ b/ModPatches/Kobolds of the Rim/Patches/Kobolds of the Rim/PawnKinds_Kobold.xml	
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Give ammo to pawns with bows ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/PawnKindDef[defName="LTS_KoboldSkirmisher" or defName="LTS_KoboldWarlord"]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>12</min>
+					<max>20</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kobolds of the Rim/Patches/Kobolds of the Rim/Race_Kobold.xml b/ModPatches/Kobolds of the Rim/Patches/Kobolds of the Rim/Race_Kobold.xml
new file mode 100644
index 0000000000..08a4fd27e1
--- /dev/null
+++ b/ModPatches/Kobolds of the Rim/Patches/Kobolds of the Rim/Race_Kobold.xml	
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Kobold"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Kobold"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Kobold"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Kobold"]/alienRace/generalSettings</xpath>
+		<value>
+			<forcedRaceTraitEntries>
+				<li>
+					<defName>Xenophobia</defName>
+					<degree>1</degree>
+					<chance>20</chance>
+				</li>
+			</forcedRaceTraitEntries>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Kobold"]/race/baseBodySize</xpath>
+		<value>
+			<baseBodySize>0.6</baseBodySize>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Kobold"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency>0.4</NightVisionEfficiency>
+			<CarryWeight>40</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+			<MeleeDodgeChance>1.1</MeleeDodgeChance>
+			<MeleeCritChance>0.4</MeleeCritChance>
+			<MeleeParryChance>0.5</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Kobold"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.57</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.57</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.46</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Kobold"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kurin Deluxe Patch/Defs/Kurin Deluxe Patch/Ammo/Ammo_Kurin.xml b/ModPatches/Kurin Deluxe Patch/Defs/Kurin Deluxe Patch/Ammo/Ammo_Kurin.xml
new file mode 100644
index 0000000000..e5582e770b
--- /dev/null
+++ b/ModPatches/Kurin Deluxe Patch/Defs/Kurin Deluxe Patch/Ammo/Ammo_Kurin.xml	
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- 8x35mmChargedkurin -->
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_8x35mmChargedK</defName>
+		<label>8x35mm Charged K</label>
+		<ammoTypes>
+			<Ammo_8x35mmCharged>Bullet_8x35mmChargedK</Ammo_8x35mmCharged>
+			<Ammo_8x35mmCharged_AP>Bullet_8x35mmChargedK_AP</Ammo_8x35mmCharged_AP>
+			<Ammo_8x35mmCharged_Ion>Bullet_8x35mmChargedK_Ion</Ammo_8x35mmCharged_Ion>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- normal charged bullets -->
+	<ThingDef Name="Bullet_8x35mmChargedK" ParentName="Base8x35mmChargedBullet">
+		<defName>Bullet_8x35mmChargedK</defName>
+		<label>8x35mm Charged bullet K</label>
+		<graphicData>
+			<texPath>Kurin/Projectile/Charge_Rifle_Bullet/Texture</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+
+			<damageDef>Bullet</damageDef>
+			<speed>144</speed>
+			<damageAmountBase>18</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>8</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>15</armorPenetrationSharp>
+			<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<!-- concentrated bullets -->
+	<ThingDef Name="Bullet_8x35mmChargedK_AP" ParentName="Base8x35mmChargedBullet">
+		<defName>Bullet_8x35mmChargedK_AP</defName>
+		<label>8x35mm Charged bullet K (Conc.)</label>
+		<graphicData>
+			<texPath>Kurin/Projectile/Charge_Rifle_Bullet/Texture</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>144</speed>
+			<damageAmountBase>14</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>4</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>30</armorPenetrationSharp>
+			<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<!-- ion bullets -->
+	<ThingDef Name="Bullet_8x35mmChargedK_Ion" ParentName="Base8x35mmChargedBullet">
+		<defName>Bullet_8x35mmChargedK_Ion</defName>
+		<label>8x35mm Charged bullet K (Ion)</label>
+		<graphicData>
+			<texPath>Kurin/Projectile/Charge_Rifle_Bullet/Texture</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>144</speed>
+			<damageAmountBase>14</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>12</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>22.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
+			<empShieldBreakChance>0.2</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<!-- 12mmRailgunkurin -->
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_12mmRailgunK</defName>
+		<label>12mm Railgun K</label>
+		<ammoTypes>
+			<Ammo_12mmRailgun_Sabot>Bullet_12mmRailgun_K_Sabot</Ammo_12mmRailgun_Sabot>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="BaseBulletCE">
+		<defName>Bullet_12mmRailgun_K_Sabot</defName>
+		<label>12mm Railgun bullet K (Sabot)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Charged/ChargeLanceShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>40</damageAmountBase>
+			<armorPenetrationSharp>70</armorPenetrationSharp>
+			<armorPenetrationBlunt>500</armorPenetrationBlunt>
+			<speed>144</speed>
+		</projectile>
+	</ThingDef>
+
+	<!-- Surigum -->
+	<ThingDef ParentName="BaseBulletCE">
+		<defName>Bullet_Kurin_Surigum_CE</defName>
+		<thingClass>CombatExtended.BulletCE</thingClass>
+		<label>Surigum</label>
+		<graphicData>
+			<texPath>Kurin/Projectile/Surigum_Bullet/Texture</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>RangedStab</damageDef>
+			<damageAmountBase>15</damageAmountBase>
+			<speed>32</speed>
+			<armorPenetrationBlunt>2.22</armorPenetrationBlunt>
+			<armorPenetrationSharp>1</armorPenetrationSharp>
+		</projectile>
+	</ThingDef>
+
+	<!-- Unmaker -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_PlasmaCellHeavy_K</defName>
+		<label>Plasma Heavy Power Cell</label>
+		<ammoTypes>
+			<Ammo_PlasmaCellHeavy>Bullet_Unmakerblast_Standard</Ammo_PlasmaCellHeavy>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+	<ThingDef ParentName="BaseExplosiveBullet">
+		<defName>Bullet_Unmakerblast_Standard</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>Unmaker blast shell</label>
+		<graphicData>
+			<texPath>Kurin/Projectile/Unmaker_Bullet/Texture</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Kurin_Damage_Unmaker</damageDef>
+			<damageAmountBase>175</damageAmountBase>
+			<speed>98</speed>
+			<flyOverhead>false</flyOverhead>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<explosionRadius>3.9</explosionRadius>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>200</damageAmountBase>
+				<explosiveDamageType>EMP</explosiveDamageType>
+				<explosiveRadius>3.9</explosiveRadius>
+			</li>
+		</comps>
+	</ThingDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Kurin Deluxe Patch/Patches/Kurin Deluxe Patch/ScenarioDef/Scenarios_DRNTF.xml b/ModPatches/Kurin Deluxe Patch/Patches/Kurin Deluxe Patch/ScenarioDef/Scenarios_DRNTF.xml
new file mode 100644
index 0000000000..dee9d006be
--- /dev/null
+++ b/ModPatches/Kurin Deluxe Patch/Patches/Kurin Deluxe Patch/ScenarioDef/Scenarios_DRNTF.xml	
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === Add ammo to scenario === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="Kurin_Scenario_1"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_556x45mmNATO_FMJ</thingDef>
+				<count>200</count>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="Kurin_Scenario_2"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_556x45mmNATO_FMJ</thingDef>
+				<count>200</count>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="Kurin_Scenario_3"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_556x45mmNATO_FMJ</thingDef>
+				<count>200</count>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kurin Deluxe Patch/Patches/Kurin Deluxe Patch/ThingDefs_Misc/DRNTF_Apparel.xml b/ModPatches/Kurin Deluxe Patch/Patches/Kurin Deluxe Patch/ThingDefs_Misc/DRNTF_Apparel.xml
new file mode 100644
index 0000000000..d1617e99f3
--- /dev/null
+++ b/ModPatches/Kurin Deluxe Patch/Patches/Kurin Deluxe Patch/ThingDefs_Misc/DRNTF_Apparel.xml	
@@ -0,0 +1,444 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--========= Underwear/On Skin =========-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="Kurin_UnderwearBase" or @Name="Kurin_StockingBase"]/statBases</xpath>
+		<value>
+			<Bulk>0.5</Bulk>
+			<WornBulk>0.25</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Kurin_UnderwearBase" or @Name="Kurin_StockingBase"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="Kurin_ApparelBase"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Shirt" or
+			defName="Kurin_OnSkin_T_Shirt" or
+			defName="Kurin_Legs_Shorts" or
+			defName="Kurin_Legs_Pants" or
+			defName="Kurin_OnSkin_Hot_Pants" or
+			defName="Kurin_OnSkin_Pajama_A" or
+			defName="Kurin_OnSkin_Pajama_B" or
+			defName="Kurin_OnSkin_Pajama_C" or
+			defName="Kurin_OnSkin_One_Piece_Dress" or
+			defName="Kurin_OnSkin_Open_Back_Knit" or
+			defName="Kurin_OnSkin_Open_Front_Knit" or
+			defName="Kurin_OnSkin_Open_Shoulder_Knit" or
+			defName="Kurin_OnSkin_Casual_Wear" or
+			defName="Kurin_Legs_Long_Skirt" or
+			defName="Kurin_Legs_Skirt" or
+			defName="Kurin_OnSkin_Hoodie"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Gothic_Dress" or
+			defName="Kurin_OnSkin_Nun_Dress" or
+			defName="Kurin_OnSkin_Work_Jumpsuit" or
+			defName="Kurin_OnSkin_Traditional_Simple_Dress" or
+			defName="Kurin_OnSkin_Traditional_Fancy_Dress" or
+			defName="Kurin_OnSkin_Traditional_Luxury_Dress" or
+			defName="Kurin_OnSkin_Cute_Dress" or
+			defName="Kurin_OnSkin_Seductive_White_Dress" or
+			defName="Kurin_OnSkin_Seductive_Black_Dress"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Short_Jumpsuit"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Short_Jumpsuit"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!--========= Onskin Armor =========-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Armored_Gothic_Dress" or
+			defName="Kurin_OnSkin_Military_Uniform"
+			]/statBases </xpath>
+		<value>
+			<Bulk>20</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Armored_Gothic_Dress" or
+			defName="Kurin_OnSkin_Military_Uniform"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Military_Uniform" or
+			defName="Kurin_OnSkin_Spaceship_Crew_Suit"
+			]/equippedStatOffsets/ShootingAccuracyPawn </xpath>
+		<value>
+			<ShootingAccuracyPawn>0.4</ShootingAccuracyPawn>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Armored_Gothic_Dress"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.75</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Armored_Gothic_Dress"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2.30</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Military_Uniform" or
+			defName="Kurin_OnSkin_Spaceship_Crew_Suit"]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>2.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Military_Uniform" or
+			defName="Kurin_OnSkin_Spaceship_Crew_Suit"]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>3.05</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Bikini_Armor"
+			]/statBases </xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Bikini_Armor"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Bikini_Armor"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.6</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!--========= Hats =========-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kurin_Overhead_Winter_Hat" or
+			defName="Kurin_Overhead_Summer_Hat" or
+			defName="Kurin_Overhead_Cap" or
+			defName="Kurin_Overhead_Sunglasses" or
+			defName="Kurin_Overhead_Goggles" or
+			defName="Kurin_Overhead_Casual_Hair_Pin"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kurin_Overhead_Gothic_Hair_Pin" or
+			defName="Kurin_Overhead_Traditional_Hair_Pin" or
+			defName="Kurin_Overhead_Cute_Hair_Pin"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!--========= Overhead Armor =========-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kurin_Overhead_Goggles"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kurin_Overhead_Goggles"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kurin_Overhead_Bikini_Armor_Headgear"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>7.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kurin_Overhead_Bikini_Armor_Headgear" or
+			defName="Kurin_OnSkin_Spaceship_Crew_Suit"]/statBases </xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kurin_Overhead_Military_Helmet_A" or
+			defName="Kurin_Overhead_Military_Helmet_B"]/statBases </xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kurin_Overhead_Military_Helmet_A"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kurin_Overhead_Military_Helmet_B"]/statBases</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kurin_Overhead_Military_Helmet_A"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingDelayFactor>-0.1</AimingDelayFactor>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kurin_Overhead_Military_Helmet_B"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingDelayFactor>-0.1</AimingDelayFactor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kurin_Middle_Scarf"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kurin_Middle_Scarf"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kurin_Power_Armor_Helmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20.4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kurin_Power_Armor_Helmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>50</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kurin_Heavy_Power_Armor_Helmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kurin_Heavy_Power_Armor_Helmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>60</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kurin_Power_Armor_Helmet" or
+			defName="Kurin_Heavy_Power_Armor_Helmet"]/statBases </xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kurin_Power_Armor_Helmet" or
+			defName="Kurin_Heavy_Power_Armor_Helmet"]/statBases </xpath>
+		<value>
+			<NightVisionEfficiency_Apparel>0.8</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kurin_Power_Armor_Helmet" or
+			defName="Kurin_Heavy_Power_Armor_Helmet"]/equippedStatOffsets </xpath>
+		<value>
+			<AimingDelayFactor>-0.15</AimingDelayFactor>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kurin_Backpack_Civil"]/equippedStatOffsets/CarryingCapacity</xpath>
+		<value>
+			<CarryBulk>40</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kurin_Backpack_Military"]/equippedStatOffsets/CarryingCapacity</xpath>
+		<value>
+			<CarryBulk>60</CarryBulk>
+		</value>
+	</Operation>
+
+	<!--========= Middle Apparel =========-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kurin_Middle_Body_Armor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!--========= Middle_Heavy =========-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kurin_Middle_Heavy_Body_Armor"]/statBases</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!--========= Shell Apparel =========-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kurin_Shell_Cardigan" or
+			defName="Kurin_Shell_Duster" or
+			defName="Kurin_Shell_Winter_Padding"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kurin_Shell_Cardigan" or
+			defName="Kurin_Shell_Duster" or
+			defName="Kurin_Shell_Winter_Padding"
+			]/statBases </xpath>
+		<value>
+			<Bulk>7.5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kurin_Shell_Traditional_Coat"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>6.25</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kurin_Shell_Traditional_Coat"]/statBases</xpath>
+		<value>
+			<Bulk>7.5</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<!--========= Power Armor =========-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/KurinDeluxeEdition.PowerArmor.KurinPowerArmorThingDef[defName="Kurin_Power_Armor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>26</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/KurinDeluxeEdition.PowerArmor.KurinPowerArmorThingDef[defName="Kurin_Heavy_Power_Armor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>30</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/KurinDeluxeEdition.PowerArmor.KurinPowerArmorThingDef[defName="Kurin_Power_Armor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>64</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/KurinDeluxeEdition.PowerArmor.KurinPowerArmorThingDef[defName="Kurin_Heavy_Power_Armor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>76</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/KurinDeluxeEdition.PowerArmor.KurinPowerArmorThingDef[defName="Kurin_Power_Armor" or "Kurin_Heavy_Power_Armor"]/statBases</xpath>
+		<value>
+			<Bulk>45.5</Bulk>
+			<WornBulk>6.5</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/KurinDeluxeEdition.PowerArmor.KurinPowerArmorThingDef[defName="Kurin_Power_Armor"
+			or "Kurin_Heavy_Power_Armor"
+			]/equippedStatOffsets </xpath>
+		<value>
+			<CarryWeight>120</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kurin Deluxe Patch/Patches/Kurin Deluxe Patch/ThingDefs_Misc/DRNTF_Weapon.xml b/ModPatches/Kurin Deluxe Patch/Patches/Kurin Deluxe Patch/ThingDefs_Misc/DRNTF_Weapon.xml
new file mode 100644
index 0000000000..a38977bb9d
--- /dev/null
+++ b/ModPatches/Kurin Deluxe Patch/Patches/Kurin Deluxe Patch/ThingDefs_Misc/DRNTF_Weapon.xml	
@@ -0,0 +1,1004 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--========= Rifle : K2 as a Basis =========-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Kurin_Gun_Assault_Rifle</defName>
+		<statBases>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.31</SwayFactor>
+			<Bulk>7.30</Bulk>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.50</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<range>60</range>
+			<soundCast>Kurin_Sound_Assault_Rifle</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Kurin_Gun_Heavy_Assault_Rifle</defName>
+		<statBases>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.60</SwayFactor>
+			<Bulk>8.30</Bulk>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.50</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<range>58</range>
+			<soundCast>Kurin_Sound_Heavy_Assault_Rifle</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Kurin_Gun_Sniper_Rifle</defName>
+		<statBases>
+			<SightsEfficiency>2.0</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.60</SwayFactor>
+			<Bulk>8.30</Bulk>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.4</warmupTime>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<range>75</range>
+			<soundCast>Kurin_Sound_Sniper_Rifle</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Kurin_Gun_Auto_Shotgun</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.49</SwayFactor>
+			<Bulk>10.66</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.26</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>18</range>
+			<soundCast>Kurin_Sound_Auto_Shotgun</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Kurin_Gun_Heavy_Sniper_Rifle</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.80</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.5</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.92</SwayFactor>
+			<Bulk>13.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.00</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>3.2</warmupTime>
+			<range>86</range>
+			<soundCast>Kurin_Sound_Heavy_Sniper_Rifle</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Kurin_Gun_Heavy_Sniper_Rifle_HE</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.80</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.5</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.92</SwayFactor>
+			<Bulk>13.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.60</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_127x108mm_FMJ</defaultProjectile>
+			<warmupTime>3.2</warmupTime>
+			<range>86</range>
+			<soundCast>Kurin_Sound_Heavy_Sniper_Rifle</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_127x108mm</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Kurin_Gun_Hunting_Shotgun</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.10</ShotSpread>
+			<SwayFactor>1.36</SwayFactor>
+			<Bulk>8.25</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.80</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>Kurin_Sound_Hunting_Shotgun</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>2</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>1</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Kurin_Gun_Heavy_SMG</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.00</SwayFactor>
+			<Bulk>4.90</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.90</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_AP</defaultProjectile>
+			<warmupTime>0.8</warmupTime>
+			<range>32</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>Kurin_Sound_Heavy_SMG</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Kurin_Gun_Pistol</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.90</SwayFactor>
+			<Bulk>2.08</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.60</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>12</range>
+			<soundCast>Kurin_Sound_Pistol</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_FN57x28mm</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Kurin_Gun_Charge_LMG</defName>
+		<statBases>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.50</SwayFactor>
+			<Bulk>11.00</Bulk>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>70</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>Kurin_Sound_Charge_LMG</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>6</reloadTime>
+			<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_MachineGun</li>
+			<li>CE_AI_Suppressive</li>
+			<li>AdvancedGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Kurin_Gun_Charge_Rifle</defName>
+		<statBases>
+			<SightsEfficiency>1.2</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.30</SwayFactor>
+			<Bulk>9.60</Bulk>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.3</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x35mmChargedK</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>62</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>Kurin_Sound_Charge_Rifle</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>36</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_8x35mmChargedK</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>AdvancedGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Kurin_Gun_Sniper_Charge_Rifle</defName>
+		<statBases>
+			<SightsEfficiency>3.0</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>2.08</SwayFactor>
+			<Bulk>12.00</Bulk>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.3</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12x72mmCharged</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>86</range>
+			<soundCast>Kurin_Sound_Sniper_Charge_Rifle</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_12x72mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>SniperRifle</li>
+			<li>AdvancedGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Kurin_Gun_Flamethrower</defName>
+		<statBases>
+			<SwayFactor>2.10</SwayFactor>
+			<ShotSpread>3.00</ShotSpread>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.55</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Flamethrower_Prometheum</defaultProjectile>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<warmupTime>1.3</warmupTime>
+			<range>25</range>
+			<minRange>3</minRange>
+			<soundCast>Kurin_Sound_Flamethrower</soundCast>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>6.6</reloadTime>
+			<ammoSet>AmmoSet_Flamethrower</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<noSingleShot>True</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Kurin_Gun_Gauss_Rifle</defName>
+		<statBases>
+			<SightsEfficiency>3.5</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.95</SwayFactor>
+			<Bulk>12.00</Bulk>
+			<RangedWeapon_Cooldown>1.10</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.00</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12mmRailgun_K_Sabot</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>86</range>
+			<soundCast>Kurin_Sound_Gauss_Rifle</soundCast>
+			<muzzleFlashScale>15</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_12mmRailgunK</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>SniperRifle</li>
+			<li>AdvancedGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Kurin_Special_Rocket_Launcher</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.16</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.68</SwayFactor>
+			<Bulk>10.50</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_RPG32Rocket_HEAT</defaultProjectile>
+			<warmupTime>2.5</warmupTime>
+			<range>40</range>
+			<minRange>3</minRange>
+			<onlyManualCast>true</onlyManualCast>
+			<soundCast>Kurin_Sound_Rocket_Launcher</soundCast>
+			<muzzleFlashScale>15</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>8.4</reloadTime>
+			<ammoSet>AmmoSet_RPG32Rocket</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Kurin_Special_Rocket_Launcher_Typhoon</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.5</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.68</SwayFactor>
+			<Bulk>10.50</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_RPG32Rocket_HEAT</defaultProjectile>
+			<warmupTime>2.5</warmupTime>
+			<range>40</range>
+			<minRange>3</minRange>
+			<onlyManualCast>true</onlyManualCast>
+			<soundCast>Kurin_Sound_Rocket_Launcher_Various</soundCast>
+			<muzzleFlashScale>15</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>4</magazineSize>
+			<reloadTime>12.6</reloadTime>
+			<ammoSet>AmmoSet_RPG32Rocket</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Kurin_Gun_Unmaker</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.5</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.0</SwayFactor>
+			<Bulk>10.50</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Unmakerblast_Standard</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<range>86</range>
+			<onlyManualCast>true</onlyManualCast>
+			<soundCast>Kurin_Sound_Unmaker</soundCast>
+			<muzzleFlashScale>15</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_PlasmaCellHeavy_K</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Kurin_Gun_Grenade_Launcher</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.10</ShotSpread>
+			<SwayFactor>1.00</SwayFactor>
+			<Bulk>7.31</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.50</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>42</range>
+			<minRange>3</minRange>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<soundCast>Kurin_Sound_Grenade_Launcher</soundCast>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Kurin_Gun_Grenade_Launcher_IM</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>1.0</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.00</SwayFactor>
+			<Bulk>7.31</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.50</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_30x64mmFuel_Incendiary</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>40</range>
+			<minRange>3</minRange>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<onlyManualCast>true</onlyManualCast>
+			<soundCast>Kurin_Sound_Grenade_Launcher</soundCast>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Kurin_Gun_Grenade_Launcher_EMPM</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>1.0</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.00</SwayFactor>
+			<Bulk>7.31</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.50</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_40x46mmGrenade_EMP</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>40</range>
+			<minRange>3</minRange>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<onlyManualCast>true</onlyManualCast>
+			<soundCast>Kurin_Sound_Grenade_Launcher</soundCast>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Kurin_Gun_Grenade_Launcher_FEM</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>1.0</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.00</SwayFactor>
+			<Bulk>7.31</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.50</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_30x64mmFuel_Foam</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>40</range>
+			<minRange>3</minRange>
+			<onlyManualCast>true</onlyManualCast>
+			<soundCast>Kurin_Sound_Grenade_Launcher</soundCast>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Kurin_Gun_Grenade_Launcher_SM</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>1.0</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.00</SwayFactor>
+			<Bulk>7.31</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.50</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_40x46mmGrenade_Smoke</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>40</range>
+			<minRange>3</minRange>
+			<onlyManualCast>true</onlyManualCast>
+			<soundCast>Kurin_Sound_Grenade_Launcher</soundCast>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kurin_Gun_Assault_Rifle" or
+			defName="Kurin_Gun_Heavy_Assault_Rifle" or
+			defName="Kurin_Gun_Auto_Shotgun" or
+			defName="Kurin_Gun_Heavy_Sniper_Rifle" or
+			defName="Kurin_Gun_Heavy_Sniper_Rifle_HE" or
+			defName="Kurin_Gun_Hunting_Shotgun" or
+			defName="Kurin_Gun_Heavy_SMG" or
+			defName="Kurin_Gun_Pistol" or
+			defName="Kurin_Gun_Charge_LMG" or
+			defName="Kurin_Gun_Charge_Rifle" or
+			defName="Kurin_Gun_Sniper_Charge_Rifle" or
+			defName="Kurin_Gun_Flamethrower" or
+			defName="Kurin_Gun_Gauss_Rifle" or
+			defName="Kurin_Special_Rocket_Launcher" or
+			defName="Kurin_Special_Rocket_Launcher_Typhoon" or
+			defName="Kurin_Gun_Unmaker" or
+			defName="Kurin_Gun_Sniper_Rifle"]/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>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Kurin_GrenadeLauncherBase"]/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>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kurin_MeleeWeapon_Katana" or defName="Kimiri_MeleeWeapon_Katana"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>0.80</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.5</cooldownTime>
+					<chanceFactor>0.50</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.4</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>31</power>
+					<cooldownTime>1.5</cooldownTime>
+					<chanceFactor>0.50</chanceFactor>
+					<armorPenetrationBlunt>3.8</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.8</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kurin_MeleeWeapon_Ceremonial_Sword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>47</power>
+					<cooldownTime>2.5</cooldownTime>
+					<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kurin_MeleeWeapon_Katana" or defName="Kimiri_MeleeWeapon_Katana"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.5</MeleeCritChance>
+				<MeleeParryChance>0.45</MeleeParryChance>
+				<MeleeDodgeChance>0.45</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kurin_MeleeWeapon_Ceremonial_Sword"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.08</MeleeCritChance>
+			<MeleeParryChance>0.5</MeleeParryChance>
+			<MeleeDodgeChance>0.5</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Kurin_Gun_Surigum</defName>
+		<statBases>
+			<SightsEfficiency>0.50</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.0</SwayFactor>
+			<Bulk>2.00</Bulk>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.50</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Kurin_Surigum_CE</defaultProjectile>
+			<warmupTime>0.3</warmupTime>
+			<range>15</range>
+			<soundCast>ThrowGrenade</soundCast>
+			<muzzleFlashScale>0</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kurin_Gun_Surigum"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.5</MeleeCritChance>
+				<MeleeParryChance>0.15</MeleeParryChance>
+				<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kurin_Gun_Surigum"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>0.5</cooldownTime>
+					<armorPenetrationBlunt>4.44</armorPenetrationBlunt>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kurin_MeleeWeapon_Ceremonial_Sword"]/statBases</xpath>
+		<value>
+			<Bulk>20.00</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kurin_MeleeWeapon_Katana" or defName="Kimiri_MeleeWeapon_Katana"]/statBases</xpath>
+		<value>
+			<Bulk>5.00</Bulk>
+		</value>
+	</Operation>
+
+	<!--========= Turret =========-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Kurin_Ship_Turret</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.00</SwayFactor>
+			<Bulk>40.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.00</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Unmakerblast_Standard</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>86</range>
+			<soundCast>Kurin_Sound_Unmaker</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kurin Deluxe Patch/Patches/Kurin Deluxe Patch/ThingDefs_Races/Race_DRNTF.xml b/ModPatches/Kurin Deluxe Patch/Patches/Kurin Deluxe Patch/ThingDefs_Races/Race_DRNTF.xml
new file mode 100644
index 0000000000..bfdec03af0
--- /dev/null
+++ b/ModPatches/Kurin Deluxe Patch/Patches/Kurin Deluxe Patch/ThingDefs_Races/Race_DRNTF.xml	
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Kurin" or defName="Kimiri"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Kurin" or defName="Kimiri"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Kurin" or defName="Kimiri"]</xpath>
+			<value>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Kurin" or defName="Kimiri"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Kurin" or defName="Kimiri"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Kurin" or defName="Kimiri"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>1</Suppressability>
+			<SmokeSensitivity>1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Kurin"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>0.5</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>0.5</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2.14</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.245</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Kimiri"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>0.5</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>0.5</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2.14</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.245</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>tail</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>3</cooldownTime>
+					<linkedBodyPartsGroup>Kimiri_Tail</linkedBodyPartsGroup>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationBlunt>2.625</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left horn</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationSharp>2.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.245</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right horn</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationSharp>2.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.245</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kurin/Patches/Kurin/Bodies/Mod_Bodies_Kurin.xml b/ModPatches/Kurin/Patches/Kurin/Bodies/Mod_Bodies_Kurin.xml
new file mode 100644
index 0000000000..ad49f58294
--- /dev/null
+++ b/ModPatches/Kurin/Patches/Kurin/Bodies/Mod_Bodies_Kurin.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Arm Groups-->
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Kurin_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
+	<value>
+		<li>LeftArm</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Kurin_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
+	<value>
+		<li>RightArm</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Kurin_Body"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
+	<value>
+		<li>LeftShoulder</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Kurin_Body"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
+	<value>
+		<li>RightShoulder</li>
+	</value>
+</Operation>
+
+<!--Natural Armor-->
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Kurin_Body"]/corePart/groups</xpath>
+	<value>
+		<li>CoveredByNaturalArmor</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Kurin_Body"]/corePart/parts/li[def="Kurin_Tail"]/groups</xpath>
+	<value>
+		<li>CoveredByNaturalArmor</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Kurin_Body"]/corePart/parts/li[def="Neck"]/groups</xpath>
+	<value>
+		<li>CoveredByNaturalArmor</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Kurin_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+	<value>
+		<li>CoveredByNaturalArmor</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Kurin_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
+	<value>
+		<li>CoveredByNaturalArmor</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Kurin_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
+	<value>
+		<li>CoveredByNaturalArmor</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Kurin_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Kurin_Ear"]/groups</xpath>
+	<value>
+		<li>CoveredByNaturalArmor</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Kurin_Body"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
+	<value>
+		<li>CoveredByNaturalArmor</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Kurin_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
+	<value>
+		<li>CoveredByNaturalArmor</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Kurin_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
+	<value>
+		<li>CoveredByNaturalArmor</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Kurin_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
+	<value>
+		<li>CoveredByNaturalArmor</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Kurin_Body"]/corePart/parts/li[def="Leg"]/groups</xpath>
+	<value>
+		<li>CoveredByNaturalArmor</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Kurin_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
+	<value>
+		<li>CoveredByNaturalArmor</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Kurin_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
+	<value>
+		<li>CoveredByNaturalArmor</li>
+	</value>
+</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kurin/Patches/Kurin/PawnKindDefs/DRNTF_PawnKind.xml b/ModPatches/Kurin/Patches/Kurin/PawnKindDefs/DRNTF_PawnKind.xml
new file mode 100644
index 0000000000..d1dafbdacc
--- /dev/null
+++ b/ModPatches/Kurin/Patches/Kurin/PawnKindDefs/DRNTF_PawnKind.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/PawnKindDef[@Name="Kurin_RepublicBase" or @Name="Kurin_HostileBase"]</xpath>
+	<value>
+		<li Class="CombatExtended.LoadoutPropertiesExtension">
+			<primaryMagazineCount>
+				<min>4</min>
+				<max>6</max>
+			</primaryMagazineCount>
+			<sidearms>
+				<li>
+					<generateChance>0.5</generateChance>
+					<sidearmMoney>
+						<min>20</min>
+						<max>120</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Melee</li>
+					</weaponTags>
+				</li>
+			</sidearms>
+		</li>
+	</value>
+</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kurin/Patches/Kurin/Scenario/DRNTF_Scenario.xml b/ModPatches/Kurin/Patches/Kurin/Scenario/DRNTF_Scenario.xml
new file mode 100644
index 0000000000..cf2c687124
--- /dev/null
+++ b/ModPatches/Kurin/Patches/Kurin/Scenario/DRNTF_Scenario.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ScenarioDef[defName="Kurin_Scenario"]/scenario/parts</xpath>
+	<value>
+		<li Class="ScenPart_StartingThing_Defined">
+			<def>StartingThing_Defined</def>
+			<thingDef>Ammo_556x45mmNATO_FMJ</thingDef>
+			<count>150</count>
+		</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/FactionDef[defName="Kurin_PlayerFaction"]/apparelStuffFilter/thingDefs</xpath>
+	<value>
+		<li>Steel</li>
+	</value>
+</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kurin/Patches/Kurin/ThingDef_Misc/DRNTF_Apparel.xml b/ModPatches/Kurin/Patches/Kurin/ThingDef_Misc/DRNTF_Apparel.xml
new file mode 100644
index 0000000000..775fa92d9b
--- /dev/null
+++ b/ModPatches/Kurin/Patches/Kurin/ThingDef_Misc/DRNTF_Apparel.xml
@@ -0,0 +1,307 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--========= Underwear/On Skin =========-->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[@Name="Kurin_UnderwearBase" or @Name="Kurin_StockingBase"]/statBases/StuffEffectMultiplierArmor</xpath>
+	<value>
+		<Bulk>0.5</Bulk>
+		<WornBulk>0.25</WornBulk>
+		<StuffEffectMultiplierArmor>0.25</StuffEffectMultiplierArmor>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[@Name="Kurin_ApparelBase"]/statBases</xpath>
+	<value>
+		<Bulk>1</Bulk>
+		<WornBulk>1</WornBulk>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Shirt" or
+		defName="Kurin_OnSkin_T_Shirt" or
+		defName="Kurin_OnSkin_Hot_Pants" or
+		defName="Kurin_OnSkin_Pajamas" or
+		defName="Kurin_OnSkin_One_Piece_Dress" or
+		defName="Kurin_OnSkin_Open_Back_Knit" or
+		defName="Kurin_OnSkin_Open_Shoulder_Knit" or
+		defName="Kurin_OnSkin_Hoodie" or
+		defName="Kurin_OnSkin_Casual_Wear"
+		]/statBases/StuffEffectMultiplierArmor </xpath>
+	<value>
+		<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Gothic_Dress" or
+		defName="Kurin_OnSkin_Nun_Dress" or
+		defName="Kurin_OnSkin_Work_Jumpsuit" or
+		defName="Kurin_OnSkin_Traditional_Simple_Dress" or
+		defName="Kurin_OnSkin_Traditional_Fancy_Dress" or
+		defName="Kurin_OnSkin_Traditional_Luxury_Dress" or
+		defName="Kurin_OnSkin_Cute_Dress" or
+		defName="Kurin_OnSkin_Seductive_White_Dress" or
+		defName="Kurin_OnSkin_Seductive_Black_Dress"
+		]/statBases/StuffEffectMultiplierArmor </xpath>
+	<value>
+		<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
+	</value>
+</Operation>
+
+<!--========= Onskin Armor =========-->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Armored_Gothic_Dress" or
+		defName="Kurin_OnSkin_Military_Uniform"
+		]/statBases/StuffEffectMultiplierArmor </xpath>
+	<value>
+		<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+		<Bulk>24</Bulk>
+		<WornBulk>10</WornBulk>
+		<Mass>6</Mass>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Armored_Gothic_Dress"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+	<value>
+		<MeleeDodgeChance>0.2</MeleeDodgeChance>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Military_Uniform"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+	<value>
+		<ShootingAccuracyPawn>0.4</ShootingAccuracyPawn>
+		<AimingAccuracy>0.2</AimingAccuracy>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Armored_Gothic_Dress"]/statBases/ArmorRating_Sharp</xpath>
+	<value>
+		<ArmorRating_Sharp>1.75</ArmorRating_Sharp>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Armored_Gothic_Dress"]/statBases/ArmorRating_Blunt</xpath>
+	<value>
+		<ArmorRating_Blunt>2.30</ArmorRating_Blunt>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Military_Uniform"]/statBases/ArmorRating_Sharp</xpath>
+	<value>
+		<ArmorRating_Sharp>2.25</ArmorRating_Sharp>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Military_Uniform"]/statBases/ArmorRating_Blunt</xpath>
+	<value>
+		<ArmorRating_Blunt>3.05</ArmorRating_Blunt>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Bikini_Armor"
+		]/statBases/StuffEffectMultiplierArmor </xpath>
+	<value>
+		<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+		<Bulk>100</Bulk>
+		<WornBulk>15</WornBulk>
+		<Mass>15</Mass>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Bikini_Armor"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+	<value>
+		<MeleeDodgeChance>0.6</MeleeDodgeChance>
+	</value>
+</Operation>
+
+<!--========= Hats =========-->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Kurin_Overhead_Winter_Hat" or
+		defName="Kurin_Overhead_Summer_Hat" or
+		defName="Kurin_Overhead_Casual_Hair_Pin"
+		]/statBases/StuffEffectMultiplierArmor </xpath>
+	<value>
+		<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Kurin_Overhead_Gothic_Hair_Pin" or
+		defName="Kurin_Overhead_Traditional_Hair_Pin" or
+		defName="Kurin_Overhead_Cute_Hair_Pin"
+		]/statBases/StuffEffectMultiplierArmor </xpath>
+	<value>
+		<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
+	</value>
+</Operation>
+
+<!--========= Overhead Armor =========-->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Kurin_Overhead_Goggles"]/statBases/ArmorRating_Sharp</xpath>
+	<value>
+		<ArmorRating_Sharp>4</ArmorRating_Sharp>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Kurin_Overhead_Goggles"]/statBases/ArmorRating_Blunt</xpath>
+	<value>
+		<ArmorRating_Blunt>6</ArmorRating_Blunt>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Kurin_Overhead_Bikini_Armor_Headgear"]/statBases/StuffEffectMultiplierArmor</xpath>
+	<value>
+		<StuffEffectMultiplierArmor>7.5</StuffEffectMultiplierArmor>
+		<ArmorRating_Heat>0.20</ArmorRating_Heat>
+		<Bulk>5</Bulk>
+		<WornBulk>3</WornBulk>
+		<Mass>3</Mass>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Kurin_Overhead_Bikini_Armor_Headgear"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+	<value>
+		<MeleeDodgeChance>0.2</MeleeDodgeChance>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Kurin_Overhead_Military_Helmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+	<value>
+		<StuffEffectMultiplierArmor>5.5</StuffEffectMultiplierArmor>
+		<Bulk>5</Bulk>
+		<WornBulk>3</WornBulk>
+		<Mass>3</Mass>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Kurin_Overhead_Military_Helmet"]/statBases/ArmorRating_Sharp</xpath>
+	<value>
+		<ArmorRating_Sharp>4</ArmorRating_Sharp>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Kurin_Overhead_Military_Helmet"]/statBases/ArmorRating_Blunt</xpath>
+	<value>
+		<ArmorRating_Blunt>6</ArmorRating_Blunt>
+	</value>
+</Operation>
+
+<!--========= Middle Apparel =========-->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Kurin_Middle_Body_Armor"]/statBases/StuffEffectMultiplierArmor</xpath>
+	<value>
+		<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
+		<Bulk>5</Bulk>
+		<WornBulk>3</WornBulk>
+		<Mass>13</Mass>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Kurin_Middle_Body_Armor"]/statBases/MaxHitPoints</xpath>
+	<value>
+		<MaxHitPoints>125</MaxHitPoints>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Kurin_Middle_Body_Armor"]/statBases/WorkToMake</xpath>
+	<value>
+		<WorkToMake>9000</WorkToMake>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Kurin_Middle_Body_Armor"]/stuffCategories</xpath>
+	<value>
+		<stuffCategories>
+			<li>Steeled</li>
+		</stuffCategories>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Kurin_Middle_Body_Armor"]/costList</xpath>
+	<value>
+		<costList>
+			<Cloth>30</Cloth>
+		</costList>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Kurin_Middle_Body_Armor"]/costStuffCount</xpath>
+	<value>
+		<costStuffCount>90</costStuffCount>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="Kurin_Middle_Body_Armor"]/apparel</xpath>
+	<value>
+		<bodyPartGroups>
+			<li>Torso</li>
+			<li>Neck</li>
+			<li>Shoulders</li>
+		</bodyPartGroups>
+	</value>
+</Operation>
+
+<!--========= Shell Apparel =========-->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Kurin_Shell_Cardigan" or
+		defName="Kurin_Shell_Duster" or
+		defName="Kurin_Shell_Winter_Padding"
+		]/statBases/StuffEffectMultiplierArmor </xpath>
+	<value>
+		<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="Kurin_Shell_Cardigan" or
+		defName="Kurin_Shell_Duster" or
+		defName="Kurin_Shell_Winter_Padding"]/statBases </xpath>
+	<value>
+		<Bulk>7.5</Bulk>
+		<WornBulk>1</WornBulk>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Traditional_Coat"]/statBases/StuffEffectMultiplierArmor</xpath>
+	<value>
+		<StuffEffectMultiplierArmor>6.25</StuffEffectMultiplierArmor>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Traditional_Coat"]/statBases</xpath>
+	<value>
+		<Bulk>7.5</Bulk>
+		<WornBulk>1.5</WornBulk>
+	</value>
+</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kurin/Patches/Kurin/ThingDef_Misc/DRNTF_Weapon.xml b/ModPatches/Kurin/Patches/Kurin/ThingDef_Misc/DRNTF_Weapon.xml
new file mode 100644
index 0000000000..6348042f24
--- /dev/null
+++ b/ModPatches/Kurin/Patches/Kurin/ThingDef_Misc/DRNTF_Weapon.xml
@@ -0,0 +1,260 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--========= Rifle : K2 as a Basis =========-->
+
+<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>Kurin_Gun_Assault_Rifle</defName>
+	<statBases>
+		<SightsEfficiency>1.00</SightsEfficiency>
+		<ShotSpread>0.07</ShotSpread>
+		<SwayFactor>1.31</SwayFactor>
+		<Bulk>8.30</Bulk>
+		<Mass>3.26</Mass>
+		<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+	</statBases>
+
+	<Properties>
+		<recoilAmount>1.50</recoilAmount>
+		<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+		<hasStandardCommand>true</hasStandardCommand>
+		<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+		<warmupTime>1.1</warmupTime>
+		<burstShotCount>6</burstShotCount>
+		<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+		<range>48</range>
+		<soundCast>Kurin_Shot_Tactical_Rifle</soundCast>
+		<soundCastTail>GunTail_Medium</soundCastTail>
+		<muzzleFlashScale>9</muzzleFlashScale>
+	</Properties>
+
+	<AmmoUser>
+		<magazineSize>30</magazineSize>
+		<reloadTime>4</reloadTime>
+		<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+	</AmmoUser>
+	<FireModes>
+		<aimedBurstShotCount>3</aimedBurstShotCount>
+		<aiUseBurstMode>TRUE</aiUseBurstMode>
+	</FireModes>
+</Operation>
+
+<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>Kurin_Gun_Sniper_Rifle</defName>
+	<statBases>
+		<SightsEfficiency>2.36</SightsEfficiency>
+		<ShotSpread>0.07</ShotSpread>
+		<SwayFactor>1.50</SwayFactor>
+		<Bulk>8.30</Bulk>
+		<Mass>3.78</Mass>
+		<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+	</statBases>
+
+	<Properties>
+		<recoilAmount>1.39</recoilAmount>
+		<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+		<hasStandardCommand>true</hasStandardCommand>
+		<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+		<warmupTime>1.4</warmupTime>
+		<burstShotCount>6</burstShotCount>
+		<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+		<range>62</range>
+		<soundCast>Kurin_Shot_Tactical_Rifle</soundCast>
+		<soundCastTail>GunTail_Medium</soundCastTail>
+		<muzzleFlashScale>9</muzzleFlashScale>
+	</Properties>
+
+	<AmmoUser>
+		<magazineSize>30</magazineSize>
+		<reloadTime>4</reloadTime>
+		<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+	</AmmoUser>
+	<FireModes>
+		<aimedBurstShotCount>3</aimedBurstShotCount>
+		<aiUseBurstMode>TRUE</aiUseBurstMode>
+	</FireModes>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Kurin_Gun_Assault_Rifle" or
+		defName="Kurin_Gun_Sniper_Rifle"]/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>
+
+<!--========= Ceremonial Sword : Changed to Zweihandler Clone =========-->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Kurin_MeleeWeapon_Ceremonial_Sword"]/tools</xpath>
+	<value>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>handle</label>
+				<capacities>
+					<li>Poke</li>
+				</capacities>
+				<power>5</power>
+				<cooldownTime>2.01</cooldownTime>
+				<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>point</label>
+				<capacities>
+					<li>Stab</li>
+				</capacities>
+				<power>60</power>
+				<cooldownTime>2.01</cooldownTime>
+				<chanceFactor>1.165</chanceFactor>
+				<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
+				<armorPenetrationSharp>0.89</armorPenetrationSharp>
+				<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>edge</label>
+				<capacities>
+					<li>Cut</li>
+				</capacities>
+				<power>47</power>
+				<cooldownTime>3.12</cooldownTime>
+				<chanceFactor>1.165</chanceFactor>
+				<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
+				<armorPenetrationSharp>0.4</armorPenetrationSharp>
+				<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+			</li>
+		</tools>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Kurin_MeleeWeapon_Ceremonial_Sword"]/statBases</xpath>
+	<value>
+		<statBases>
+			<WorkToMake>25000</WorkToMake>
+			<Mass>3.2</Mass>
+			<Bulk>12</Bulk>
+			<MeleeCounterParryBonus>0.59</MeleeCounterParryBonus>
+		</statBases>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Kurin_MeleeWeapon_Ceremonial_Sword"]/costStuffCount</xpath>
+	<value>
+		<costStuffCount>150</costStuffCount>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="Kurin_MeleeWeapon_Ceremonial_Sword"]</xpath>
+	<value>
+		<equippedStatOffsets>
+			<MeleeCritChance>0.08</MeleeCritChance>
+			<MeleeParryChance>0.5</MeleeParryChance>
+			<MeleeDodgeChance>0.5</MeleeDodgeChance>
+		</equippedStatOffsets>
+	</value>
+</Operation>
+
+<!--========= Surigum : Changed to Dagger, thrown property removed =========-->
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="Kurin_Gun_Surigum"]</xpath>
+	<value>
+		<equippedStatOffsets>
+			<MeleeCritChance>0.5</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+		</equippedStatOffsets>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Kurin_Gun_Surigum"]/statBases</xpath>
+	<value>
+		<statBases>
+			<WorkToMake>8000</WorkToMake>
+			<Mass>0.4</Mass>
+			<Bulk>1</Bulk>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</statBases>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Kurin_Gun_Surigum"]/tools</xpath>
+	<value>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>handle</label>
+				<capacities>
+					<li>Poke</li>
+				</capacities>
+				<power>1</power>
+				<cooldownTime>1.26</cooldownTime>
+				<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>blade</label>
+				<capacities>
+					<li>Cut</li>
+				</capacities>
+				<power>10</power>
+				<cooldownTime>1.18</cooldownTime>
+				<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
+				<armorPenetrationSharp>0.32</armorPenetrationSharp>
+				<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>point</label>
+				<capacities>
+					<li>Stab</li>
+				</capacities>
+				<power>11</power>
+				<cooldownTime>1.26</cooldownTime>
+				<chanceFactor>1.33</chanceFactor>
+				<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				<armorPenetrationSharp>0.42</armorPenetrationSharp>
+				<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+			</li>
+		</tools>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationRemove">
+	<xpath>Defs/ThingDef[defName="Kurin_Gun_Surigum"]/verbs</xpath>
+</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Kurin/Patches/Kurin/ThingDefs_Races/Race_DRNTF.xml b/ModPatches/Kurin/Patches/Kurin/ThingDefs_Races/Race_DRNTF.xml
new file mode 100644
index 0000000000..a148c2b333
--- /dev/null
+++ b/ModPatches/Kurin/Patches/Kurin/ThingDefs_Races/Race_DRNTF.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationConditional">
+	<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Kurin_Race"]/comps</xpath>
+	<nomatch Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Kurin_Race"]</xpath>
+		<value>
+			<comps/>
+		</value>
+	</nomatch>
+	<match Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Kurin_Race"]</xpath>
+		<value>
+		</value>
+	</match>
+</Operation>
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Kurin_Race"]</xpath>
+	<value>
+		<li Class="CombatExtended.RacePropertiesExtensionCE">
+			<bodyShape>Humanoid</bodyShape>
+		</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Kurin_Race"]/comps</xpath>
+	<value>
+		<li>
+			<compClass>CombatExtended.CompPawnGizmo</compClass>
+		</li>
+		<li Class="CombatExtended.CompProperties_Suppressable"/>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Kurin_Race"]/statBases</xpath>
+	<value>
+		<MeleeDodgeChance>1</MeleeDodgeChance>
+		<MeleeCritChance>1</MeleeCritChance>
+		<MeleeParryChance>1</MeleeParryChance>
+		<Suppressability>1</Suppressability>
+		<SmokeSensitivity>1</SmokeSensitivity>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Kurin_Race"]/tools</xpath>
+	<value>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>left fist</label>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<power>1</power>
+				<cooldownTime>1.26</cooldownTime>
+				<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+				<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>right fist</label>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<power>1</power>
+				<cooldownTime>1.26</cooldownTime>
+				<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+				<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>teeth</label>
+				<capacities>
+					<li>Bite</li>
+				</capacities>
+				<power>4</power>
+				<cooldownTime>2.14</cooldownTime>
+				<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+				<chanceFactor>0.2</chanceFactor>
+				<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				<armorPenetrationBlunt>0.245</armorPenetrationBlunt>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>head</label>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<power>2</power>
+				<cooldownTime>4.49</cooldownTime>
+				<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+				<chanceFactor>0.2</chanceFactor>
+				<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+			</li>
+		</tools>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Kurin_Race"]/alienRace/raceRestriction/apparelList</xpath>
+	<value>
+		<li>CE_Apparel_TacVest</li>
+		<li>CE_Apparel_Backpack</li>
+		<li>CE_Apparel_TribalBackpack</li>
+		<li>CE_Apparel_BallisticShield</li>
+		<li>CE_Apparel_MeleeShield</li>
+		<li>CE_Apparel_GasMask</li>
+		<li>CE_Apparel_ImprovGasMask</li>
+	</value>
+</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/LF Command And Conquer NOD Combat Armor/Patches/LF Command And Conquer NOD Combat Armor/CE_Nod.xml b/ModPatches/LF Command And Conquer NOD Combat Armor/Patches/LF Command And Conquer NOD Combat Armor/CE_Nod.xml
new file mode 100644
index 0000000000..825215dc19
--- /dev/null
+++ b/ModPatches/LF Command And Conquer NOD Combat Armor/Patches/LF Command And Conquer NOD Combat Armor/CE_Nod.xml	
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="NOD_Militant_Helmet"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>2</WornBulk>
+			<Flammability>0.4</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NOD_Militant_Helmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>130</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NOD_Militant_Helmet"]/statBases/WorkToMake</xpath>
+		<value>
+			<WorkToMake>11000</WorkToMake>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NOD_Militant_Helmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NOD_Militant_Helmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="NOD_Militant_Helmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="NOD_Militant_Helmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NOD_Militant_Helmet"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<PsychicSensitivity>-0.1</PsychicSensitivity>
+				<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+				<ShootingAccuracyPawn>0.1</ShootingAccuracyPawn>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NOD_Militant_Helmet"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>40</Steel>
+				<Plasteel>10</Plasteel>
+				<Cloth>5</Cloth>
+				<DevilstrandCloth>15</DevilstrandCloth>
+				<ComponentSpacer>1</ComponentSpacer>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="NOD_Militant_Helmet"]/apparel/layers</xpath>
+		<value>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!-- === Armor === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CNC_NOD_Militant_Armor"]/statBases</xpath>
+		<value>
+			<Bulk>50</Bulk>
+			<WornBulk>12</WornBulk>
+			<Flammability>0.4</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CNC_NOD_Militant_Armor"]/statBases/WorkToMake</xpath>
+		<value>
+			<WorkToMake>34000</WorkToMake>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CNC_NOD_Militant_Armor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>18</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CNC_NOD_Militant_Armor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>300</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CNC_NOD_Militant_Armor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CNC_NOD_Militant_Armor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>22</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CNC_NOD_Militant_Armor"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>80</Steel>
+				<Plasteel>40</Plasteel>
+				<Cloth>20</Cloth>
+				<DevilstrandCloth>40</DevilstrandCloth>
+				<ComponentIndustrial>4</ComponentIndustrial>
+				<ComponentSpacer>1</ComponentSpacer>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CNC_NOD_Militant_Armor"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>8</CarryBulk>
+				<ToxicEnvironmentResistance>0.20</ToxicEnvironmentResistance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/LF Red Dawn/Defs/LF Red Dawn/135mm9M113Konkur.xml b/ModPatches/LF Red Dawn/Defs/LF Red Dawn/135mm9M113Konkur.xml
new file mode 100644
index 0000000000..06884a8cef
--- /dev/null
+++ b/ModPatches/LF Red Dawn/Defs/LF Red Dawn/135mm9M113Konkur.xml	
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>Ammo9M113</defName>
+		<label>9M113 Konkur Missile</label>
+		<parent>AmmoRockets</parent>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Konkur</defName>
+		<label>9M113 Missiles</label>
+		<ammoTypes>
+			<Ammo_9M113_HEAT>Bullet_9M113_HEAT</Ammo_9M113_HEAT>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="9M113Base" ParentName="HeavyAmmoBase" Abstract="True">
+		<description>135mm Anti-tank guided missiles for use in Konkur system.</description>
+		<statBases>
+			<MaxHitPoints>200</MaxHitPoints>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade_Sellable</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo9M113</li>
+		</thingCategories>
+		<stackLimit>10</stackLimit>
+		<cookOffFlashScale>30</cookOffFlashScale>
+		<cookOffSound>MortarBomb_Explode</cookOffSound>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="9M113Base">
+		<defName>Ammo_9M113_HEAT</defName>
+		<label>9M113 Missile (HEAT)</label>
+		<graphicData>
+			<texPath>Things\Projectile\Konkurs_Shell\Shell_HE\Shell_Konkurs</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<drawSize>1.0</drawSize>
+		</graphicData>
+		<statBases>
+			<MarketValue>170</MarketValue>
+			<Mass>14.1</Mass>
+			<Bulk>27.17</Bulk>
+		</statBases>
+		<ammoClass>RocketHEAT</ammoClass>
+		<detonateProjectile>Bullet_9M113_HEAT</detonateProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseRPG7Grenade">
+		<defName>Bullet_9M113_HEAT</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>9M113 Missile (HEAT)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Rocket_Big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>56</speed>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>300</damageAmountBase>
+			<armorPenetrationSharp>800</armorPenetrationSharp>
+			<armorPenetrationBlunt>151.584</armorPenetrationBlunt>
+			<soundAmbient>RocketPropelledLoop_Small</soundAmbient>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>240</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1.5</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>10</Fragment_Large>
+					<Fragment_Small>50</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_9M113_HEAT</defName>
+		<label>make 9M113 HEAT Missile</label>
+		<description>Craft 5 9M113 HEAT Missiles.</description>
+		<jobString>Making 9M113 HEAT Missiles.</jobString>
+		<workAmount>42000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>190</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>FSX</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_9M113_HEAT>5</Ammo_9M113_HEAT>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/LF Red Dawn/Defs/LF Red Dawn/82mmMortar.xml b/ModPatches/LF Red Dawn/Defs/LF Red Dawn/82mmMortar.xml
new file mode 100644
index 0000000000..d10f5c6c03
--- /dev/null
+++ b/ModPatches/LF Red Dawn/Defs/LF Red Dawn/82mmMortar.xml	
@@ -0,0 +1,521 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>Ammo82mmMortarShells</defName>
+		<label>82mm mortar shell</label>
+		<parent>AmmoShells</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberMortar</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_82mmMortarShell</defName>
+		<label>82mm mortar shells</label>
+		<ammoTypes>
+			<!-- Overrides vanilla artillery shell -->
+			<Shell_82mmMortar_HE>Bullet_82mmMortarShell_HE</Shell_82mmMortar_HE>
+			<Shell_82mmMortar_Incendiary>Bullet_82mmMortarShell_Incendiary</Shell_82mmMortar_Incendiary>
+			<Shell_82mmMortar_EMP>Bullet_82mmMortarShell_EMP</Shell_82mmMortar_EMP>
+			<Shell_82mmMortar_Firefoam>Bullet_82mmMortarShell_Firefoam</Shell_82mmMortar_Firefoam>
+			<Shell_82mmMortar_Smoke>Bullet_82mmMortarShell_82mmMortar_Smoke</Shell_82mmMortar_Smoke>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="82mmMortarShellBase" ParentName="HeavyAmmoBase" Abstract="True">
+		<description>Low-velocity shell designed to be fired from a mortar.</description>
+		<graphicData>
+			<drawSize>0.80</drawSize>
+		</graphicData>
+		<statBases>
+			<MaxHitPoints>200</MaxHitPoints>
+			<Mass>5.27</Mass>
+			<Bulk>8.17</Bulk>
+		</statBases>
+		<thingCategories>
+			<li>Ammo82mmMortarShells</li>
+		</thingCategories>
+		<stackLimit>25</stackLimit>
+		<cookOffFlashScale>30</cookOffFlashScale>
+		<cookOffSound>MortarBomb_Explode</cookOffSound>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="82mmMortarShellBaseCraftableBase" ParentName="82mmMortarShellBase" Abstract="True">
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="82mmMortarShellBaseCraftableBase">
+		<defName>Shell_82mmMortar_HE</defName>
+		<label>82mm mortar shell (HE)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Mortar/HE</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>50.68</MarketValue>
+		</statBases>
+		<ammoClass>GrenadeHE</ammoClass>
+		<detonateProjectile>Bullet_82mmMortarShell_HE</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="82mmMortarShellBaseCraftableBase">
+		<defName>Shell_82mmMortar_Incendiary</defName>
+		<label>82mm mortar shell (Incendiary)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Mortar/Incendiary</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>42.34</MarketValue>
+			<Mass>4.1</Mass>
+			<Bulk>10.01</Bulk>
+		</statBases>
+		<ammoClass>GrenadeIncendiary</ammoClass>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>11</damageAmountBase>
+				<explosiveDamageType>PrometheumFlame</explosiveDamageType>
+				<explosiveRadius>5</explosiveRadius>
+				<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
+				<preExplosionSpawnChance>0.5</preExplosionSpawnChance>
+				<explosionSound>MortarIncendiary_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="82mmMortarShellBaseCraftableBase">
+		<defName>Shell_82mmMortar_EMP</defName>
+		<label>82mm mortar shell (EMP)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Mortar/EMP</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>112.42</MarketValue>
+			<Mass>5.27</Mass>
+			<Bulk>8.17</Bulk>
+		</statBases>
+		<ammoClass>GrenadeEMP</ammoClass>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>34</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>5.5</explosiveRadius>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="82mmMortarShellBaseCraftableBase">
+		<defName>Shell_82mmMortar_Firefoam</defName>
+		<label>82mm mortar shell (Foam)</label>
+		<generateAllowChance>0</generateAllowChance>
+		<graphicData>
+			<texPath>Things/Ammo/Mortar/Firefoam</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>37.03</MarketValue>
+			<Mass>4.1</Mass>
+			<Bulk>10.01</Bulk>
+		</statBases>
+		<ammoClass>FoamFuel</ammoClass>
+		<detonateProjectile>Bullet_82mmMortarShell_Firefoam</detonateProjectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>7</damageAmountBase>
+				<explosiveDamageType>Extinguish</explosiveDamageType>
+				<postExplosionSpawnThingDef>Filth_FireFoam</postExplosionSpawnThingDef>
+				<postExplosionSpawnChance>1</postExplosionSpawnChance>
+				<postExplosionSpawnThingCount>3</postExplosionSpawnThingCount>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="82mmMortarShellBaseCraftableBase">
+		<defName>Shell_82mmMortar_Smoke</defName>
+		<label>82mm mortar shell (Smoke)</label>
+		<generateAllowChance>0</generateAllowChance>
+		<graphicData>
+			<texPath>Things/Ammo/Mortar/Smoke</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>37.03</MarketValue>
+			<Mass>4.1</Mass>
+			<Bulk>10.01</Bulk>
+		</statBases>
+		<ammoClass>Smoke</ammoClass>
+		<detonateProjectile>Bullet_82mmMortarShell_82mmMortar_Smoke</detonateProjectile>
+		<comps>
+			<!-- Vanilla values -->
+			<li Class="CompProperties_Explosive">
+				<explosiveRadius>6</explosiveRadius>
+				<explosiveDamageType>Smoke</explosiveDamageType>
+				<startWickHitPointsPercent>0.7</startWickHitPointsPercent>
+				<postExplosionGasType>BlindSmoke</postExplosionGasType>
+				<preExplosionSpawnChance>1</preExplosionSpawnChance>
+				<explodeOnKilled>True</explodeOnKilled>
+				<wickTicks>30~82</wickTicks>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef Name="Base82mmMortarShell" ParentName="BaseExplosiveBullet" Abstract="true">
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<graphicData>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>0</speed>
+			<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+			<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+			<soundAmbient>MortarRound_Ambient</soundAmbient>
+			<flyOverhead>true</flyOverhead>
+			<dropsCasings>false</dropsCasings>
+			<gravityFactor>5</gravityFactor>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base82mmMortarShell">
+		<defName>Bullet_82mmMortarShell_HE</defName>
+		<label>82mm mortar shell (HE)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Mortar/HE</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>156</damageAmountBase>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+			<explosionRadius>2.5</explosionRadius>
+			<flyOverhead>true</flyOverhead>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<ai_IsIncendiary>true</ai_IsIncendiary>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>16</Fragment_Large>
+					<Fragment_Small>100</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="Base82mmMortarShell">
+		<defName>Bullet_82mmMortarShell_Incendiary</defName>
+		<label>82mm mortar shell (Incendiary)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Mortar/Incendiary</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>PrometheumFlame</damageDef>
+			<damageAmountBase>11</damageAmountBase>
+			<explosionRadius>6.5</explosionRadius>
+			<flyOverhead>true</flyOverhead>
+			<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
+			<preExplosionSpawnChance>0.15</preExplosionSpawnChance>
+			<soundExplode>MortarIncendiary_Explode</soundExplode>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base82mmMortarShell">
+		<defName>Bullet_82mmMortarShell_EMP</defName>
+		<label>82mm mortar shell (EMP)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Mortar/EMP</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>EMP</damageDef>
+			<damageAmountBase>156</damageAmountBase>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+			<flyOverhead>true</flyOverhead>
+			<explosionRadius>5.5</explosionRadius>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base82mmMortarShell">
+		<defName>Bullet_82mmMortarShell_Firefoam</defName>
+		<label>82mm mortar shell (Foam)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Mortar/Firefoam</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Extinguish</damageDef>
+			<suppressionFactor>0.0</suppressionFactor>
+			<dangerFactor>0.0</dangerFactor>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+			<explosionRadius>4.75</explosionRadius>
+			<flyOverhead>true</flyOverhead>
+			<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+			<soundExplode>Explosion_EMP</soundExplode>
+			<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+			<soundAmbient>MortarRound_Ambient</soundAmbient>
+			<postExplosionSpawnThingDef>Filth_FireFoam</postExplosionSpawnThingDef>
+			<postExplosionSpawnChance>1</postExplosionSpawnChance>
+			<postExplosionSpawnThingCount>3</postExplosionSpawnThingCount>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<explosionEffect>ExtinguisherExplosion</explosionEffect>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base82mmMortarShell">
+		<defName>Bullet_82mmMortarShell_82mmMortar_Smoke</defName>
+		<label>82mm mortar shell (Smoke)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Mortar/Smoke</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Smoke</damageDef>
+			<suppressionFactor>0.0</suppressionFactor>
+			<dangerFactor>0.0</dangerFactor>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+			<explosionRadius>6</explosionRadius>
+			<flyOverhead>true</flyOverhead>
+			<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+			<soundExplode>Explosion_EMP</soundExplode>
+			<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+			<soundAmbient>MortarRound_Ambient</soundAmbient>
+			<postExplosionGasType>BlindSmoke</postExplosionGasType>
+			<preExplosionSpawnChance>1</preExplosionSpawnChance>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<explosionEffect>ExtinguisherExplosion</explosionEffect>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeShell_82mmMortar_HE</defName>
+		<label>make 82mm HE mortar shells x5</label>
+		<description>Craft 5 82mm HE mortar shells.</description>
+		<jobString>Making 82mm HE mortar shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>54</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Shell_82mmMortar_HE>5</Shell_82mmMortar_HE>
+		</products>
+		<workAmount>10600</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeShell_82mmMortar_Incendiary</defName>
+		<label>make 82mm incendiary mortar shells x5</label>
+		<description>Craft 5 82mm incendiary mortar shells.</description>
+		<jobString>Making 82mm incendiary mortar shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>58</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Prometheum</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Shell_82mmMortar_Incendiary>5</Shell_82mmMortar_Incendiary>
+		</products>
+		<workAmount>9000</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeShell_82mmMortar_EMP</defName>
+		<label>make 82mm EMP mortar shells x5</label>
+		<description>Craft 5 82mm EMP mortar shells.</description>
+		<jobString>Making 82mm EMP mortar shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>54</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>14</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Shell_82mmMortar_EMP>5</Shell_82mmMortar_EMP>
+		</products>
+		<workAmount>13800</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeShell_82mmMortar_Firefoam</defName>
+		<label>make 82mm firefoam mortar shells x5</label>
+		<description>Craft 5 82mm firefoam mortar shells.</description>
+		<jobString>Making 82mm firefoam mortar shells.</jobString>
+		<researchPrerequisite>Firefoam</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>42</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<categories>
+						<li>MeatRaw</li>
+					</categories>
+				</filter>
+				<count>17</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+			<categories>
+				<li>MeatRaw</li>
+			</categories>
+		</fixedIngredientFilter>
+		<products>
+			<Shell_82mmMortar_Firefoam>5</Shell_82mmMortar_Firefoam>
+		</products>
+		<workAmount>8800</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeShell_82mmMortar_Smoke</defName>
+		<label>make 82mm smoke mortar shells x5</label>
+		<description>Craft 5 82mm smoke mortar shells.</description>
+		<jobString>Making 82mm smoke mortar shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>42</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Prometheum</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Shell_82mmMortar_Smoke>5</Shell_82mmMortar_Smoke>
+		</products>
+		<workAmount>6600</workAmount>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/LF Red Dawn/Defs/LF Red Dawn/RPG123456789_Projectiles.xml b/ModPatches/LF Red Dawn/Defs/LF Red Dawn/RPG123456789_Projectiles.xml
new file mode 100644
index 0000000000..9e551be369
--- /dev/null
+++ b/ModPatches/LF Red Dawn/Defs/LF Red Dawn/RPG123456789_Projectiles.xml	
@@ -0,0 +1,500 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseRPG7Grenade">
+		<defName>Bullet_RPG18_HEAT</defName>
+		<label>RPG18 grenade</label>
+		<graphicData>
+			<texPath>Things/Projectile/RPG</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>42</speed>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>248</damageAmountBase>
+			<armorPenetrationSharp>300</armorPenetrationSharp>
+			<armorPenetrationBlunt>31.584</armorPenetrationBlunt>
+			<soundAmbient>RocketPropelledLoop_Small</soundAmbient>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>105</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>3</Fragment_Large>
+					<Fragment_Small>26</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseRPG7Grenade">
+		<defName>Bullet_RPG22_HEAT</defName>
+		<label>RPG22 grenade</label>
+		<graphicData>
+			<texPath>Things/Projectile/RPG</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>42</speed>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>268</damageAmountBase>
+			<armorPenetrationSharp>400</armorPenetrationSharp>
+			<armorPenetrationBlunt>31.584</armorPenetrationBlunt>
+			<soundAmbient>RocketPropelledLoop_Small</soundAmbient>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>105</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>3</Fragment_Large>
+					<Fragment_Small>26</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseRPG7Grenade">
+		<defName>Bullet_RPG26_HEAT</defName>
+		<label>RPG26 grenade</label>
+		<graphicData>
+			<texPath>Things/Projectile/RocketS</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>42</speed>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>268</damageAmountBase>
+			<armorPenetrationSharp>440</armorPenetrationSharp>
+			<armorPenetrationBlunt>31.584</armorPenetrationBlunt>
+			<soundAmbient>RocketPropelledLoop_Small</soundAmbient>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>105</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>3</Fragment_Large>
+					<Fragment_Small>26</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseRPG7Grenade">
+		<defName>Bullet_RPG27_HEAT</defName>
+		<label>RPG27 grenade</label>
+		<graphicData>
+			<texPath>Things/Projectile/RocketS</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>50</speed>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>375</damageAmountBase>
+			<armorPenetrationSharp>750</armorPenetrationSharp>
+			<armorPenetrationBlunt>31.584</armorPenetrationBlunt>
+			<soundAmbient>RocketPropelledLoop_Small</soundAmbient>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>150</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1.5</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>4</Fragment_Large>
+					<Fragment_Small>47</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeGun_RPG18D</defName>
+		<label>make RPG18 LAW launchers x5</label>
+		<description>Craft 5 RPG18 launchers.</description>
+		<jobString>Making RPG 18 LAW launchers.</jobString>
+		<workAmount>32500</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>100</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Gun_RPG18D>5</Gun_RPG18D>
+		</products>
+		<researchPrerequisite>CE_Launchers</researchPrerequisite>
+	</RecipeDef>
+
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeGun_RPG18D_x1</defName>
+		<label>make RPG18 LAW launchers x1</label>
+		<description>Craft one RPG18 launcher.</description>
+		<jobString>Making RPG 18 LAW launcher.</jobString>
+		<workAmount>8125</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>25</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Gun_RPG18D>1</Gun_RPG18D>
+		</products>
+		<researchPrerequisite>CE_Launchers</researchPrerequisite>
+	</RecipeDef>
+
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeGun_RPG22D</defName>
+		<label>make RPG22 x5</label>
+		<description>Craft 5 RPG22 launchers.</description>
+		<jobString>Making RPG22 launchers.</jobString>
+		<workAmount>32500</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>100</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Gun_RPG22D>5</Gun_RPG22D>
+		</products>
+		<researchPrerequisite>CE_Launchers</researchPrerequisite>
+	</RecipeDef>
+
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeGun_RPG22D_x1</defName>
+		<label>make RPG22 x1</label>
+		<description>Craft one RPG22 launcher.</description>
+		<jobString>Making RPG22 launcher.</jobString>
+		<workAmount>8125</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>25</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Gun_RPG22D>1</Gun_RPG22D>
+		</products>
+		<researchPrerequisite>CE_Launchers</researchPrerequisite>
+	</RecipeDef>
+
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeGun_RPG26D</defName>
+		<label>make RPG26 x5</label>
+		<description>Craft 5 RPG26 launchers.</description>
+		<jobString>Making RPG26 launchers.</jobString>
+		<workAmount>32500</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>100</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Gun_RPG26D>5</Gun_RPG26D>
+		</products>
+		<researchPrerequisite>CE_Launchers</researchPrerequisite>
+	</RecipeDef>
+
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeGun_RPG26D_x1</defName>
+		<label>make RPG26 x1</label>
+		<description>Craft one RPG26 launcher.</description>
+		<jobString>Making RPG26 launcher.</jobString>
+		<workAmount>8125</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>25</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Gun_RPG26D>1</Gun_RPG26D>
+		</products>
+		<researchPrerequisite>CE_Launchers</researchPrerequisite>
+	</RecipeDef>
+
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeGun_RPG27D</defName>
+		<label>make RPG27 x5</label>
+		<description>Craft 5 RPG27 launchers.</description>
+		<jobString>Making RPG27 launchers.</jobString>
+		<workAmount>32500</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>100</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Gun_RPG27D>5</Gun_RPG27D>
+		</products>
+		<researchPrerequisite>CE_Launchers</researchPrerequisite>
+	</RecipeDef>
+
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeGun_RPG27D_x1</defName>
+		<label>make RPG27 x1</label>
+		<description>Craft one RPG27 launcher.</description>
+		<jobString>Making RPG27 launcher.</jobString>
+		<workAmount>8125</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>25</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Gun_RPG27D>1</Gun_RPG27D>
+		</products>
+		<researchPrerequisite>CE_Launchers</researchPrerequisite>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/LF Red Dawn/Defs/LF Red Dawn/RPG16.xml b/ModPatches/LF Red Dawn/Defs/LF Red Dawn/RPG16.xml
new file mode 100644
index 0000000000..f42a759e35
--- /dev/null
+++ b/ModPatches/LF Red Dawn/Defs/LF Red Dawn/RPG16.xml	
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>AmmoRPG16Grenades</defName>
+		<label>RPG-16 grenades</label>
+		<parent>AmmoRockets</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRocket</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_RPG16Grenade</defName>
+		<label>RPG-16 Grenades</label>
+		<ammoTypes>
+			<Ammo_RPG16Grenade_HEAT>Bullet_RPG16Grenade_HEAT</Ammo_RPG16Grenade_HEAT>
+			<Ammo_RPG16Grenade_Frag>Bullet_RPG16Grenade_Frag</Ammo_RPG16Grenade_Frag>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="RPG16GrenadeBase" ParentName="MediumAmmoBase" Abstract="True">
+		<description>Rocket-propelled grenade designed for the RPG-16 launcher. After being fired a rocket motor kicks in to propel the grenade further.</description>
+		<statBases>
+			<MaxHitPoints>150</MaxHitPoints>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoRPG16Grenades</li>
+		</thingCategories>
+		<stackLimit>25</stackLimit>
+		<cookOffFlashScale>40</cookOffFlashScale>
+		<cookOffSound>MortarBomb_Explode</cookOffSound>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="RPG16GrenadeBase">
+		<defName>Ammo_RPG16Grenade_HEAT</defName>
+		<label>RPG-16 grenade (HEAT)</label>
+		<graphicData>
+			<texPath>Things/Ammo/RPG/HEAT</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>55.78</MarketValue>
+			<Mass>2.8</Mass>
+			<Bulk>9.37</Bulk>
+		</statBases>
+		<ammoClass>RocketHEAT</ammoClass>
+		<detonateProjectile>Bullet_RPG16Grenade_HEAT</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="RPG16GrenadeBase">
+		<defName>Ammo_RPG16Grenade_Frag</defName>
+		<label>RPG-16 grenade (Frag)</label>
+		<graphicData>
+			<texPath>Things/Ammo/RPG/Frag</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>36.96</MarketValue>
+			<Mass>2.2</Mass>
+			<Bulk>1.89</Bulk>
+		</statBases>
+		<stackLimit>100</stackLimit>
+		<ammoClass>RocketFrag</ammoClass>
+		<detonateProjectile>Bullet_RPG16Grenade_Frag</detonateProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="BaseRPG16Grenade" ParentName="BaseExplosiveBullet" Abstract="true">
+		<graphicData>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>83</speed>
+			<soundAmbient>RocketPropelledLoop_Small</soundAmbient>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseRPG16Grenade">
+		<defName>Bullet_RPG16Grenade_HEAT</defName>
+		<label>RPG-16 grenade (HEAT)</label>
+		<graphicData>
+			<texPath>Things/Projectile/RPG/HEAT</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>200</damageAmountBase>
+			<armorPenetrationSharp>300</armorPenetrationSharp>
+			<armorPenetrationBlunt>44.956</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>90</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1.5</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>2</Fragment_Large>
+					<Fragment_Small>31</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseRPG16Grenade">
+		<defName>Bullet_RPG16Grenade_Frag</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>RPG-16 grenade (Frag)</label>
+		<graphicData>
+			<texPath>Things/Projectile/RPG/Frag</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>1.5</explosionRadius>
+			<damageDef>Bomb</damageDef>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<damageAmountBase>40</damageAmountBase>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>120</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_RPG16Grenade_HEAT</defName>
+		<label>make RPG-16 HEAT grenades x5</label>
+		<description>Craft 5 RPG-16 HEAT grenades.</description>
+		<jobString>Making RPG-16 HEAT grenades.</jobString>
+		<workAmount>9200</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>28</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>9</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_RPG16Grenade_HEAT>5</Ammo_RPG16Grenade_HEAT>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_RPG16Grenade_Frag</defName>
+		<label>make RPG-16 frag grenades x5</label>
+		<description>Craft 5 RPG-16 frag grenades.</description>
+		<jobString>Making RPG-16 frag grenades.</jobString>
+		<workAmount>5400</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_RPG16Grenade_Frag>5</Ammo_RPG16Grenade_Frag>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/LF Red Dawn/Defs/LF Red Dawn/RPG29.xml b/ModPatches/LF Red Dawn/Defs/LF Red Dawn/RPG29.xml
new file mode 100644
index 0000000000..56b4fff686
--- /dev/null
+++ b/ModPatches/LF Red Dawn/Defs/LF Red Dawn/RPG29.xml	
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>AmmoRPG29</defName>
+		<label>RPG29 Rocket</label>
+		<parent>AmmoRockets</parent>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_RPG29</defName>
+		<label>RPG29 Missiles</label>
+		<ammoTypes>
+			<Ammo_RPG29_HEAT>Bullet_RPG29_HEAT</Ammo_RPG29_HEAT>
+			<Ammo_RPG29_Thermobaric>Bullet_RPG29_Thermobaric</Ammo_RPG29_Thermobaric>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="RPG29Base" ParentName="HeavyAmmoBase" Abstract="True">
+		<description>Rocket propelled grenades for use in RPG-29.</description>
+		<statBases>
+			<MaxHitPoints>200</MaxHitPoints>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade_Sellable</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoRPG29</li>
+		</thingCategories>
+		<stackLimit>20</stackLimit>
+		<cookOffFlashScale>30</cookOffFlashScale>
+		<cookOffSound>MortarBomb_Explode</cookOffSound>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="RPG29Base">
+		<defName>Ammo_RPG29_HEAT</defName>
+		<label>PG-29V grenade (HEAT)</label>
+		<graphicData>
+			<texPath>Things/Ammo/RPG/RPG32_Thermobaric</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<drawSize>1.65</drawSize>
+		</graphicData>
+		<statBases>
+			<MarketValue>95</MarketValue>
+			<Mass>6.7</Mass>
+			<Bulk>9.17</Bulk>
+		</statBases>
+		<ammoClass>RocketHEAT</ammoClass>
+		<detonateProjectile>Bullet_RPG29_HEAT</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="RPG29Base">
+		<defName>Ammo_RPG29_Thermobaric</defName>
+		<label>TPG-29V grenade (Thermobaric)</label>
+		<graphicData>
+			<texPath>Things/Ammo/RPG/Thermobaric</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>119.58</MarketValue>
+			<Mass>6.7</Mass>
+			<Bulk>9.99</Bulk>
+		</statBases>
+		<ammoClass>RocketThermobaric</ammoClass>
+		<detonateProjectile>Bullet_RPG29_Thermobaric</detonateProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseRPG7Grenade">
+		<defName>Bullet_RPG29_HEAT</defName>
+		<label>PG-29V (HEAT)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Rocket29M</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>76</speed>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>380</damageAmountBase>
+			<armorPenetrationSharp>750</armorPenetrationSharp>
+			<armorPenetrationBlunt>151.584</armorPenetrationBlunt>
+			<soundAmbient>RocketPropelledLoop_Small</soundAmbient>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>200</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1.5</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>4</Fragment_Large>
+					<Fragment_Small>60</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseRPG7Grenade">
+		<defName>Bullet_RPG29_Thermobaric</defName>
+		<label>TPG-29V grenade (Thermobaric)</label>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<graphicData>
+			<texPath>Things/Projectile/RPG/Thermobaric</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>5.5</explosionRadius>
+			<damageDef>Thermobaric</damageDef>
+			<damageAmountBase>300</damageAmountBase>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<ai_IsIncendiary>true</ai_IsIncendiary>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_RPG29_HEAT</defName>
+		<label>make RPG29 HEAT Missile</label>
+		<description>Craft 5 RPG29 HEAT Missiles.</description>
+		<jobString>Making RPG29 HEAT Missiles.</jobString>
+		<workAmount>13000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>40</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>13</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>FSX</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_RPG29_HEAT>5</Ammo_RPG29_HEAT>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_RPG29_Thermobaric</defName>
+		<label>make RPG-29 thermobaric grenades x5</label>
+		<description>Craft 5 RPG-29 thermobaric grenades.</description>
+		<jobString>Making RPG-29 thermobaric grenades.</jobString>
+		<workAmount>23400</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>54</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>38</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_RPG29_Thermobaric>5</Ammo_RPG29_Thermobaric>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/LF Red Dawn/Defs/LF Red Dawn/Recipes_Grenades.xml b/ModPatches/LF Red Dawn/Defs/LF Red Dawn/Recipes_Grenades.xml
new file mode 100644
index 0000000000..57c289c48b
--- /dev/null
+++ b/ModPatches/LF Red Dawn/Defs/LF Red Dawn/Recipes_Grenades.xml	
@@ -0,0 +1,246 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ==================== Projectiles ========================== -->
+
+	<ThingDef ParentName="BaseGrenadeProjectile">
+		<defName>RD_Proj_RGD5Grenade</defName>
+		<label>RG5 grenade (HE)</label>
+		<graphicData>
+			<texPath>Things/Projectile/RGD</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>1.5</explosionRadius>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>40</damageAmountBase>
+			<explosionDelay>60</explosionDelay>
+			<dropsCasings>true</dropsCasings>
+			<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+			<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<speed>10</speed>
+			<suppressionFactor>3.0</suppressionFactor>
+			<dangerFactor>2.0</dangerFactor>
+			<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>30</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseGrenadeProjectile">
+		<defName>RD_Proj_RGNGrenade</defName>
+		<label>RGN grenade</label>
+		<graphicData>
+			<texPath>Things/Projectile/RGNB</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>1.5</explosionRadius>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>40</damageAmountBase>
+			<explosionDelay>60</explosionDelay>
+			<dropsCasings>true</dropsCasings>
+			<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+			<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<speed>10</speed>
+			<suppressionFactor>3.0</suppressionFactor>
+			<dangerFactor>2.0</dangerFactor>
+			<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>30</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseGrenadeProjectile">
+		<defName>RD_Proj_RGOGrenade</defName>
+		<label>RGO grenade</label>
+		<graphicData>
+			<texPath>Things/Projectile/RGOB</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>2</explosionRadius>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>69</damageAmountBase>
+			<explosionDelay>60</explosionDelay>
+			<dropsCasings>true</dropsCasings>
+			<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+			<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<speed>10</speed>
+			<suppressionFactor>3.0</suppressionFactor>
+			<dangerFactor>2.0</dangerFactor>
+			<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>49</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseGrenadeProjectile">
+		<defName>RD_Proj_F1Grenade</defName>
+		<label>F1 grenade</label>
+		<graphicData>
+			<texPath>Things/Projectile/FG</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>1</explosionRadius>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>20</damageAmountBase>
+			<explosionDelay>60</explosionDelay>
+			<dropsCasings>true</dropsCasings>
+			<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+			<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<speed>10</speed>
+			<suppressionFactor>3.0</suppressionFactor>
+			<dangerFactor>2.0</dangerFactor>
+			<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>40</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseGrenadeProjectile">
+		<defName>RD_Proj_RKGATGrenade</defName>
+		<label>RKG-3 grenade</label>
+		<graphicData>
+			<texPath>Weapons/RKG3</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>90</damageAmountBase>
+			<armorPenetrationSharp>125</armorPenetrationSharp>
+			<armorPenetrationBlunt>1.995</armorPenetrationBlunt>
+			<speed>7</speed>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>40</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>20</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_RPG29_HEAT</defName>
+		<label>make RPG29 HEAT Missile</label>
+		<description>Craft 5 RPG29 HEAT Missiles.</description>
+		<jobString>Making RPG29 HEAT Missiles.</jobString>
+		<workAmount>13000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>40</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>13</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>FSX</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_RPG29_HEAT>5</Ammo_RPG29_HEAT>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_RPG29_Thermobaric</defName>
+		<label>make RPG-29 thermobaric grenades x5</label>
+		<description>Craft 5 RPG-29 thermobaric grenades.</description>
+		<jobString>Making RPG-29 thermobaric grenades.</jobString>
+		<workAmount>23400</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>54</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>38</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_RPG29_Thermobaric>5</Ammo_RPG29_Thermobaric>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/LF Red Dawn/Patches/LF Red Dawn/Armors_RD.xml b/ModPatches/LF Red Dawn/Patches/LF Red Dawn/Armors_RD.xml
new file mode 100644
index 0000000000..6bf78835f8
--- /dev/null
+++ b/ModPatches/LF Red Dawn/Patches/LF Red Dawn/Armors_RD.xml	
@@ -0,0 +1,571 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--========================= Helmets ========================-->
+	<!--Ssh60-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_Ssh60helmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<WornBulk>1</WornBulk>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_Ssh60helmet"]/stuffCategories/li[.="Metallic"]</xpath>
+		<value>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<!--Ssh68-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_Ssh68helmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>7</ArmorRating_Sharp>
+			<ArmorRating_Blunt>10.5</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.36</ArmorRating_Heat>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_Ssh68helmet"]/stuffCategories/li[.="Metallic"]</xpath>
+		<value>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+	<!--Sfera-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_SferaHelmt"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_SferaHelmt"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_SferaHelmt"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.386</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!--Altyn no mask-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_AltynMaskless"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1.5</WornBulk>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_AltynMaskless"]/statBases/Mass</xpath>
+		<value>
+			<Mass>4</Mass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_AltynMaskless"]/stuffCategories/li[.="Metallic"]</xpath>
+		<value>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_AltynMaskless"]/costList</xpath>
+		<value>
+			<costList>
+				<ComponentIndustrial>1</ComponentIndustrial>
+				<Plasteel>10</Plasteel>
+			</costList>
+		</value>
+	</Operation>
+
+	<!--Altyn mask down-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_AltynMaskDown"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1.5</WornBulk>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_AltynMaskDown"]/statBases/Mass</xpath>
+		<value>
+			<Mass>4</Mass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_AltynMaskDown"]/stuffCategories/li[.="Metallic"]</xpath>
+		<value>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_AltynMaskDown"]/costList</xpath>
+		<value>
+			<costList>
+				<ComponentIndustrial>1</ComponentIndustrial>
+				<Plasteel>10</Plasteel>
+			</costList>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_AltynMaskDown"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>FullHead</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RD_AltynMaskDown"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>-0.4</AimingAccuracy>
+				<MeleeHitChance>-2</MeleeHitChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!--Altyn mask up-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_AltynMaskUP"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1.5</WornBulk>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_AltynMaskUP"]/statBases/Mass</xpath>
+		<value>
+			<Mass>4</Mass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_AltynMaskUP"]/stuffCategories/li[.="Metallic"]</xpath>
+		<value>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_AltynMaskUP"]/costList</xpath>
+		<value>
+			<costList>
+				<ComponentIndustrial>1</ComponentIndustrial>
+				<Plasteel>10</Plasteel>
+			</costList>
+		</value>
+	</Operation>
+
+	<!--PSH77 Maskless-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_PSHMaskless"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1.5</WornBulk>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_PSHMaskless"]/statBases/Mass</xpath>
+		<value>
+			<Mass>4</Mass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_PSHMaskless"]/stuffCategories/li[.="Metallic"]</xpath>
+		<value>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_PSHMaskless"]/costList</xpath>
+		<value>
+			<costList>
+				<ComponentIndustrial>1</ComponentIndustrial>
+				<Plasteel>10</Plasteel>
+			</costList>
+		</value>
+	</Operation>
+
+	<!--PSH77 mask down-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_PSHMaskDown"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1.5</WornBulk>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_PSHMaskDown"]/statBases/Mass</xpath>
+		<value>
+			<Mass>4</Mass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_PSHMaskDown"]/stuffCategories/li[.="Metallic"]</xpath>
+		<value>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_PSHMaskDown"]/costList</xpath>
+		<value>
+			<costList>
+				<ComponentIndustrial>1</ComponentIndustrial>
+				<Plasteel>10</Plasteel>
+			</costList>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_PSHMaskDown"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>FullHead</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RD_PSHMaskDown"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>-0.4</AimingAccuracy>
+				<MeleeHitChance>-2</MeleeHitChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!--PSHMaskUP mask up-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_PSHMaskUP"]/statBases/Mass</xpath>
+		<value>
+			<Mass>4</Mass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_PSHMaskUP"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1.5</WornBulk>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_PSHMaskUP"]/stuffCategories/li[.="Metallic"]</xpath>
+		<value>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_PSHMaskUP"]/costList</xpath>
+		<value>
+			<costList>
+				<ComponentIndustrial>1</ComponentIndustrial>
+				<Plasteel>10</Plasteel>
+			</costList>
+		</value>
+	</Operation>
+
+	<!--SSh-68 Helmet-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_DesertHelmet" or defName="RD_KLMKHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<WornBulk>1</WornBulk>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_DesertHelmet" or defName="RD_KLMKHelmet"]/stuffCategories/li[.="Metallic"]</xpath>
+		<value>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_DesertHelmet" or defName="RD_KLMKHelmet"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>30</costStuffCount>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_DesertHelmet" or defName="RD_KLMKHelmet"]/costList</xpath>
+		<value>
+			<costList>
+				<Plasteel>10</Plasteel>
+			</costList>
+		</value>
+	</Operation>
+
+	<!--========================== Body Armors =====================================-->
+	<!--6b2-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RD_6b2FlakVest"]/statBases/Mass</xpath>
+		<value>
+			<Mass>13</Mass>
+			<Bulk>5</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_6b2FlakVest"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>125</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_6b2FlakVest"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_6b2FlakVest"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>14</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_6b2FlakVest"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0</ArmorRating_Heat>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_6b2FlakVest"]/costList</xpath>
+		<value>
+			<costList>
+				<Cloth>10</Cloth>
+				<Steel>80</Steel>
+			</costList>
+		</value>
+	</Operation>
+
+	<!--6B3-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RD_6b3FlakVest"]/statBases/Mass</xpath>
+		<value>
+			<Mass>10.4</Mass>
+			<Bulk>5</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_6b3FlakVest"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>250</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_6b3FlakVest"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_6b3FlakVest"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>24</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_6b3FlakVest"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0</ArmorRating_Heat>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_6b3FlakVest"]/costList</xpath>
+		<value>
+			<costList>
+				<Cloth>10</Cloth>
+				<Plasteel>90</Plasteel>
+			</costList>
+		</value>
+	</Operation>
+
+	<!--Very Heavy-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RD_BzhVest"]/statBases/Mass</xpath>
+		<value>
+			<Mass>20</Mass>
+			<Bulk>8</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_BzhVest"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>250</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_BzhVest"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_BzhVest"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>26</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_BzhVest"]/costList</xpath>
+		<value>
+			<costList>
+				<Cloth>10</Cloth>
+				<Plasteel>110</Plasteel>
+			</costList>
+		</value>
+	</Operation>
+	<!--Light-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_LightPilotFlightVest"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>100</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_LightPilotFlightVest"]/statBases/Mass</xpath>
+		<value>
+			<Mass>8</Mass>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_LightPilotFlightVest"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_LightPilotFlightVest"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_LightPilotFlightVest"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.1</ArmorRating_Heat>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_LightPilotFlightVest"]/costList</xpath>
+		<value>
+			<costList>
+				<Cloth>5</Cloth>
+				<Steel>65</Steel>
+			</costList>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_VDBVest"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>100</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_VDBVest"]/statBases/Mass</xpath>
+		<value>
+			<Mass>7.5</Mass>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_LightPilotFlightVest"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_VDBVest"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>9</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_VDBVest"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.12</ArmorRating_Heat>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_VDBVest"]/costList</xpath>
+		<value>
+			<costList>
+				<Cloth>20</Cloth>
+				<Steel>60</Steel>
+			</costList>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RD_VDBVest"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>6</CarryBulk>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_LightPilotFlightVestCamo"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>100</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_LightPilotFlightVestCamo"]/statBases/Mass</xpath>
+		<value>
+			<Mass>7.5</Mass>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_LightPilotFlightVestCamo"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_LightPilotFlightVestCamo"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>9</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_LightPilotFlightVestCamo"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.12</ArmorRating_Heat>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_LightPilotFlightVestCamo"]/costList</xpath>
+		<value>
+			<costList>
+				<Cloth>10</Cloth>
+				<Steel>60</Steel>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RD_6b2FlakVest" or defName="RD_6b3FlakVest" or defName="RD_BzhVest"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/LF Red Dawn/Patches/LF Red Dawn/Jacket_Pants_Boots.xml b/ModPatches/LF Red Dawn/Patches/LF Red Dawn/Jacket_Pants_Boots.xml
new file mode 100644
index 0000000000..67ada9054b
--- /dev/null
+++ b/ModPatches/LF Red Dawn/Patches/LF Red Dawn/Jacket_Pants_Boots.xml	
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==================== Jackets ========================== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_SovietCoat"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>110</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_SovietCoat"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>7.5</StuffEffectMultiplierArmor>
+			<WornBulk>2</WornBulk>
+			<Bulk>5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_SovietOfficerJacket"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>75</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_SovietOfficerJacket"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
+			<Bulk>2</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_SovietOfficerJacket"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<SocialImpact>0.15</SocialImpact>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<!-- ==================== PANTS ========================== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_AFGHANKACombatPants"
+			or defName="RD_OfficerPants"
+			or defName="RNApparel_Pants_HelikonPilgrim"
+			or defName="RNApparel_Pants_511StrykeMulticam"
+			or defName="RNApparel_Pants_FjallravenKeb"
+			or defName="RNApparel_Pants_BearGryllsSurvivor"
+			or defName="RNApparel_Pants_GORKA3Pants"
+			or defName="RNApparel_Jeans_Generic"
+			or defName="RNApparel_Pants_ACUUCP"
+			or defName="RNApparel_Pants_BDUDMARPAT"
+			or defName="RNApparel_Pants_CombatsDDPM"]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_AFGHANKACombatPants"
+			or defName="RD_OfficerPants"
+			or defName="RNApparel_Pants_HelikonPilgrim"
+			or defName="RNApparel_Pants_511StrykeMulticam"
+			or defName="RNApparel_Pants_FjallravenKeb"
+			or defName="RNApparel_Pants_BearGryllsSurvivor"
+			or defName="RNApparel_Pants_GORKA3Pants"
+			or defName="RNApparel_Jeans_Generic"
+			or defName="RNApparel_Pants_ACUUCP"
+			or defName="RNApparel_Pants_BDUDMARPAT"
+			or defName="RNApparel_Pants_CombatsDDPM"]/costStuffCount </xpath>
+		<value>
+			<costStuffCount>20</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RD_AFGHANKACombatPants"
+			or defName="RD_OfficerPants"
+			or defName="RNApparel_Pants_HelikonPilgrim"]/equippedStatOffsets </xpath>
+	</Operation>
+
+	<!-- ==================== Carriers ========================== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_Lifchik"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>25</CarryBulk>
+				<ReloadSpeed>0.1</ReloadSpeed>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_LifchikWithPoyasB"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>25</CarryBulk>
+				<ReloadSpeed>0.1</ReloadSpeed>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_ChiCom"
+			or defName="RD_RPGbackpackGunnerAssistant"
+			or defName="RD_RPGbackpackGunner"]/equippedStatOffsets </xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>20</CarryBulk>
+				<ReloadSpeed>0.1</ReloadSpeed>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_SovietHarness"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>15</CarryBulk>
+				<ReloadSpeed>0.1</ReloadSpeed>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_RDBackpack"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>25</CarryBulk>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- ==================== Boots ========================== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RDFootwear_SovCombatBoots"
+			or defName="RDFootwear_SovSpetnazBoots"
+			or defName="RDFootwear_SovJackBoots"
+			]/statBases </xpath>
+		<value>
+			<Bulk>2</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="RDFootwear_SovCombatBoots"
+			or defName="RDFootwear_SovSpetnazBoots"
+			or defName="RDFootwear_SovJackBoots"
+			]/equippedStatOffsets/Flammability </xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/LF Red Dawn/Patches/LF Red Dawn/RD_CE_Fixed_Weapons.xml b/ModPatches/LF Red Dawn/Patches/LF Red Dawn/RD_CE_Fixed_Weapons.xml
new file mode 100644
index 0000000000..06fcf18538
--- /dev/null
+++ b/ModPatches/LF Red Dawn/Patches/LF Red Dawn/RD_CE_Fixed_Weapons.xml	
@@ -0,0 +1,414 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Mounted DShK Gun ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Sov_Gun_DShK</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.57</SwayFactor>
+			<Bulk>18.54</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.33</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_127x108mm_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>DSHKshoot</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<muzzleFlashScale>18</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>5.8</reloadTime>
+			<ammoSet>AmmoSet_127x108mm</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Sov_Turret_DShK"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>75</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Sov_Turret_DShK"]/statBases</xpath>
+		<value>
+			<statBases>
+				<MaxHitPoints>150</MaxHitPoints>
+				<WorkToBuild>60000</WorkToBuild>
+				<Mass>52</Mass>
+				<Beauty>-20</Beauty>
+			</statBases>
+		</value>
+	</Operation>
+
+	<!-- ========== Mounted NSV Gun ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Sov_Gun_NSV</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.41</SwayFactor>
+			<Bulk>18.54</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_127x108mm_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>NSVshoot</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_127x108mm</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Sov_Turret_NSV"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>75</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Sov_Turret_NSV"]/statBases</xpath>
+		<value>
+			<statBases>
+				<MaxHitPoints>150</MaxHitPoints>
+				<WorkToBuild>60000</WorkToBuild>
+				<Mass>41</Mass>
+				<Beauty>-20</Beauty>
+			</statBases>
+		</value>
+	</Operation>
+
+	<!-- ========== Mounted AGS-17 Turret ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Sov_Gun_AGS</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.49</SwayFactor>
+			<Bulk>12.90</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.57</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_30x29mmGrenade_HE</defaultProjectile>
+			<warmupTime>1.35</warmupTime>
+			<range>62</range>
+			<minRange>6</minRange>
+			<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
+			<burstShotCount>6</burstShotCount>
+			<soundCast>AGSshoot</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<muzzleFlashScale>16</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>29</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_30x29mmGrenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_Turret_AGS"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>62</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_Turret_AGS"]/statBases</xpath>
+		<value>
+			<statBases>
+				<MaxHitPoints>150</MaxHitPoints>
+				<WorkToBuild>41000</WorkToBuild>
+				<Mass>31</Mass>
+				<Beauty>-20</Beauty>
+			</statBases>
+		</value>
+	</Operation>
+
+	<!-- ========== Konkur launcher ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Artillery_KonkursGun</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>2.5</RangedWeapon_Cooldown>
+			<SightsEfficiency>4.0</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.87</SwayFactor>
+			<Bulk>12.90</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9M113_HEAT</defaultProjectile>
+			<warmupTime>2.80</warmupTime>
+			<ai_AvoidFriendlyFireRadius>3</ai_AvoidFriendlyFireRadius>
+			<range>100</range>
+			<minRange>6</minRange>
+			<soundCast>KonkursFire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<muzzleFlashScale>16</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>8.9</reloadTime>
+			<ammoSet>AmmoSet_Konkur</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Turret_KonkursATGM"]</xpath>
+		<value>
+			<specialDisplayRadius>100</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Turret_KonkursATGM"]</xpath>
+		<value>
+			<statBases>
+				<MaxHitPoints>120</MaxHitPoints>
+				<WorkToBuild>55000</WorkToBuild>
+				<Mass>22.5</Mass>
+				<Beauty>-20</Beauty>
+			</statBases>
+		</value>
+	</Operation>
+
+	<!-- ========== SPG ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Artillery_SPG9Gun</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.50</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.68</SwayFactor>
+			<Bulk>12.90</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_SPG9Grenade_HEAT</defaultProjectile>
+			<warmupTime>3.0</warmupTime>
+			<ai_AvoidFriendlyFireRadius>3</ai_AvoidFriendlyFireRadius>
+			<range>100</range>
+			<minRange>4.9</minRange>
+			<soundCast>SPGFire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<muzzleFlashScale>18</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>7.9</reloadTime>
+			<ammoSet>AmmoSet_SPG9Grenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Turret_SPG9AT"]</xpath>
+		<value>
+			<specialDisplayRadius>100</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Base_SPG9AT"]/statBases</xpath>
+		<value>
+			<statBases>
+				<MaxHitPoints>175</MaxHitPoints>
+				<Flammability>0.4</Flammability>
+				<WorkToBuild>32000</WorkToBuild>
+				<Mass>59.5</Mass>
+				<Beauty>-10</Beauty>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Base_SPG9AT"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>200</Steel>
+				<ComponentIndustrial>4</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<!-- == Shared patches == -->
+
+	<!-- === Remove Shells === -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Shell_SACLOS_HE" or defName="Shell_SPG_HE"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Sov_Turret_DShK"
+			or defName="Sov_Turret_NSV"
+			or defName="RD_Turret_AGS"
+			or defName="Turret_KonkursATGM"
+			or defName="Turret_SPG9AT"]/statBases </xpath>
+		<value>
+			<ShootingAccuracyTurret>2.0</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Sov_Turret_DShK"
+			or defName="Sov_Turret_NSV"
+			or defName="RD_Turret_AGS"
+			or @Name="Base_KonkursAT"
+			or @Name="Base_SPG9AT"]/thingClass </xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Sov_Turret_DShK"
+			or defName="Sov_Turret_NSV"
+			or defName="RD_Turret_AGS"
+			]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Sov_Turret_DShK"
+			or defName="Sov_Turret_NSV"
+			or defName="RD_Turret_AGS"]/researchPrerequisites </xpath>
+		<value>
+			<researchPrerequisites>
+				<li>CE_TurretHeavyWeapons</li>
+			</researchPrerequisites>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Base_KonkursAT"]/researchPrerequisites</xpath>
+		<value>
+			<researchPrerequisites>
+				<li>CE_TurretHeavyWeapons</li>
+				<li>CE_Launchers</li>
+			</researchPrerequisites>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Base_SPG9AT"]/researchPrerequisites</xpath>
+		<value>
+			<researchPrerequisites>
+				<li>CE_TurretHeavyWeapons</li>
+				<li>CE_Launchers</li>
+			</researchPrerequisites>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Sov_Gun_DShK"
+			or defName="Sov_Gun_NSV"
+			or defName="Sov_Gun_AGS"
+			or @Name="Base_KonkursAT_Weapon"
+			or @Name="Base_PodnosMortar_Weapon"
+			or @Name="Base_SPG9AT_Weapon"]/menuHidden </xpath>
+		<value>
+			<modExtensions>
+				<li Class="CombatExtended.ThingDefExtensionCE">
+					<MenuHidden>True</MenuHidden>
+				</li>
+			</modExtensions>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Base_KonkursAT"
+			or @Name="Base_SPG9AT"]/fillPercent </xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/LF Red Dawn/Patches/LF Red Dawn/RD_CE_mortars.xml b/ModPatches/LF Red Dawn/Patches/LF Red Dawn/RD_CE_mortars.xml
new file mode 100644
index 0000000000..b82e20b781
--- /dev/null
+++ b/ModPatches/LF Red Dawn/Patches/LF Red Dawn/RD_CE_mortars.xml	
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Remove 82mm Mortar Shell === -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Shell_Sov82mm_HE"]</xpath>
+	</Operation>
+
+	<!-- === Patch Base === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name = "Base_PodnosMortar"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name = "Base_PodnosMortar"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>2.0</turretBurstCooldownTime>
+			<spawnedConceptLearnOpportunity>CE_MortarDirectFire</spawnedConceptLearnOpportunity>
+		</value>
+	</Operation>
+
+	<!-- === Mortar === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Artillery_PodnosGun"]</xpath>
+		<value>
+			<statBases>
+				<SightsEfficiency>0.5</SightsEfficiency>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Artillery_PodnosGun"]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_Charges">
+					<chargeSpeeds>
+						<li>30</li>
+						<li>50</li>
+						<li>70</li>
+						<li>90</li>
+					</chargeSpeeds>
+				</li>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>1</magazineSize>
+					<reloadTime>5</reloadTime>
+					<ammoSet>AmmoSet_82mmMortarShell</ammoSet>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Artillery_PodnosGun"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+					<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_82mmMortarShell_HE</defaultProjectile>
+					<warmupTime>5.5</warmupTime>
+					<minRange>32</minRange>
+					<range>500</range>
+					<burstShotCount>1</burstShotCount>
+					<soundCast>SovMortarFire</soundCast>
+					<muzzleFlashScale>19</muzzleFlashScale>
+					<circularError>1</circularError>
+					<indirectFirePenalty>0.2</indirectFirePenalty>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Artillery_PodnosGun"]</xpath>
+		<value>
+			<weaponTags>
+				<li>TurretGun</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+	<!-- === Turret === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Turret_Podnos"]</xpath>
+		<value>
+			<tradeTags>
+				<li>CE_Turret</li>
+			</tradeTags>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/LF Red Dawn/Patches/LF Red Dawn/RD_Grenade.xml b/ModPatches/LF Red Dawn/Patches/LF Red Dawn/RD_Grenade.xml
new file mode 100644
index 0000000000..92fe31f107
--- /dev/null
+++ b/ModPatches/LF Red Dawn/Patches/LF Red Dawn/RD_Grenade.xml	
@@ -0,0 +1,279 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--
+		RGD5
+		RGN
+		RGO
+		F-1
+		RKG-3 AT
+	-->
+
+	<!-- ======== Setting Grenade attributes ======== -->
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="Weapon_RGD5Grenade"
+			or defName="Weapon_RGNGrenade"
+			or defName="Weapon_RGOGrenade"
+			or defName="Weapon_F1Grenade"
+			or defName="Weapon_RKGATGrenade"] </xpath>
+		<attribute>ParentName</attribute>
+		<value>BaseWeapon</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Weapon_RGD5Grenade"
+			or defName="Weapon_RGNGrenade"
+			or defName="Weapon_RGOGrenade"
+			or defName="Weapon_F1Grenade"
+			or defName="Weapon_RKGATGrenade"] </xpath>
+		<value>
+			<thingClass>CombatExtended.AmmoThing</thingClass>
+			<stackLimit>75</stackLimit>
+			<resourceReadoutPriority>First</resourceReadoutPriority>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Weapon_RGD5Grenade"]/comps</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_ExplosiveCE">
+					<damageAmountBase>56</damageAmountBase>
+					<explosiveDamageType>Bomb</explosiveDamageType>
+					<explosiveRadius>1.5</explosiveRadius>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Weapon_RGNGrenade"]/comps</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_ExplosiveCE">
+					<damageAmountBase>56</damageAmountBase>
+					<explosiveDamageType>Bomb</explosiveDamageType>
+					<explosiveRadius>1.5</explosiveRadius>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Weapon_RGOGrenade"]/comps</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_ExplosiveCE">
+					<damageAmountBase>56</damageAmountBase>
+					<explosiveDamageType>Bomb</explosiveDamageType>
+					<explosiveRadius>1.5</explosiveRadius>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Weapon_F1Grenade"]/comps</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_ExplosiveCE">
+					<damageAmountBase>56</damageAmountBase>
+					<explosiveDamageType>Bomb</explosiveDamageType>
+					<explosiveRadius>1.5</explosiveRadius>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Weapon_RKGATGrenade"]/comps</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_ExplosiveCE">
+					<damageAmountBase>56</damageAmountBase>
+					<explosiveDamageType>Bomb</explosiveDamageType>
+					<explosiveRadius>1.5</explosiveRadius>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="Weapon_F1Grenade"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="Weapon_RKGATGrenade"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<!-- ======== Throwing data ======== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Weapon_RGD5Grenade</defName>
+		<statBases>
+			<Mass>0.31</Mass>
+			<Bulk>1.5</Bulk>
+			<MarketValue>4.55</MarketValue>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<label>throw grenade</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<range>11</range>
+			<minRange>1.5</minRange>
+			<warmupTime>0.6</warmupTime>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<soundCast>ThrowGrenade</soundCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<defaultProjectile>RD_Proj_RGD5Grenade</defaultProjectile>
+			<onlyManualCast>true</onlyManualCast>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<weaponTags>
+			<li>CE_AI_Grenade</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Weapon_RGNGrenade</defName>
+		<statBases>
+			<Mass>0.29</Mass>
+			<Bulk>1.5</Bulk>
+			<MarketValue>4.55</MarketValue>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<label>throw grenade</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<range>12</range>
+			<minRange>1.5</minRange>
+			<warmupTime>0.6</warmupTime>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<soundCast>ThrowGrenade</soundCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<defaultProjectile>RD_Proj_RGNGrenade</defaultProjectile>
+			<onlyManualCast>true</onlyManualCast>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<weaponTags>
+			<li>CE_AI_Grenade</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Weapon_RGOGrenade</defName>
+		<statBases>
+			<Mass>0.53</Mass>
+			<Bulk>1.5</Bulk>
+			<MarketValue>4.55</MarketValue>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<label>throw grenade</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<range>10</range>
+			<minRange>1.5</minRange>
+			<warmupTime>0.9</warmupTime>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<soundCast>ThrowGrenade</soundCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<defaultProjectile>RD_Proj_RGOGrenade</defaultProjectile>
+			<onlyManualCast>true</onlyManualCast>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<weaponTags>
+			<li>CE_AI_Grenade</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Weapon_F1Grenade</defName>
+		<statBases>
+			<Mass>0.31</Mass>
+			<Bulk>1.5</Bulk>
+			<MarketValue>4.55</MarketValue>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<label>throw grenade</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<range>10</range>
+			<minRange>1.5</minRange>
+			<warmupTime>0.8</warmupTime>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<soundCast>ThrowGrenade</soundCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<defaultProjectile>RD_Proj_F1Grenade</defaultProjectile>
+			<onlyManualCast>true</onlyManualCast>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<weaponTags>
+			<li>CE_AI_Grenade</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Weapon_RKGATGrenade</defName>
+		<statBases>
+			<Mass>1.07</Mass>
+			<Bulk>1.5</Bulk>
+			<MarketValue>4.55</MarketValue>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<label>throw an AT grenade</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<range>7</range>
+			<minRange>1.5</minRange>
+			<warmupTime>0.8</warmupTime>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<soundCast>ThrowGrenade</soundCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<defaultProjectile>RD_Proj_RKGATGrenade</defaultProjectile>
+			<onlyManualCast>true</onlyManualCast>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<weaponTags>
+			<li>CE_AI_Grenade</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Remove cost========== -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Weapon_RGD5Grenade" or
+			defName="Weapon_RGNGrenade" or
+			defName="Weapon_RGOGrenade" or
+			defName="Weapon_F1Grenade" or
+			defName="Weapon_RKGATGrenade"
+			]/costList </xpath>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/LF Red Dawn/Patches/LF Red Dawn/RD_LMG.xml b/ModPatches/LF Red Dawn/Patches/LF Red Dawn/RD_LMG.xml
new file mode 100644
index 0000000000..fceb9761ce
--- /dev/null
+++ b/ModPatches/LF Red Dawn/Patches/LF Red Dawn/RD_LMG.xml	
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== PK ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PKGPMG</defName>
+		<statBases>
+			<Mass>9.00</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.37</SwayFactor>
+			<Bulk>14.92</Bulk>
+			<WorkToMake>36000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>80</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.45</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<warmupTime>1.3</warmupTime>
+			<range>62</range>
+			<soundCast>PKshoot</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_MachineGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== RPD ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_RPDLMG</defName>
+		<statBases>
+			<Mass>7.40</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.24</SwayFactor>
+			<Bulk>13.37</Bulk>
+			<WorkToMake>35000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>70</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.24</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>48</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>PKshoot</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_MachineGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== RPK-47 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_RPKMMG</defName>
+		<statBases>
+			<Mass>4.80</Mass>
+			<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.2</SwayFactor>
+			<Bulk>12.40</Bulk>
+			<WorkToMake>29500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>65</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.24</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>48</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>Ak47Shoot</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>75</magazineSize>
+			<reloadTime>4.8</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_MachineGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== RPK-74 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_RPKLMG</defName>
+		<statBases>
+			<Mass>4.80</Mass>
+			<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.2</SwayFactor>
+			<Bulk>12.40</Bulk>
+			<WorkToMake>29500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>65</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.10</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>58</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>Ak74Shoot</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>75</magazineSize>
+			<reloadTime>4.8</reloadTime>
+			<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_MachineGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Gun_PKGPMG" or
+			defName="Gun_RPDLMG" or
+			defName="Gun_RPKMMG" or
+			defName="Gun_RPKLMG"
+			]/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>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/LF Red Dawn/Patches/LF Red Dawn/RD_Launchers.xml b/ModPatches/LF Red Dawn/Patches/LF Red Dawn/RD_Launchers.xml
new file mode 100644
index 0000000000..6a46c86900
--- /dev/null
+++ b/ModPatches/LF Red Dawn/Patches/LF Red Dawn/RD_Launchers.xml	
@@ -0,0 +1,403 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== RPG18 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_RPG18D</defName>
+		<statBases>
+			<MarketValue>33.72</MarketValue>
+			<Mass>2.60</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.24</SwayFactor>
+			<Bulk>7.05</Bulk>
+			<WorkToMake>12000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+			<FSX>3</FSX>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_RPG18_HEAT</defaultProjectile>
+			<warmupTime>1.9</warmupTime>
+			<range>31</range>
+			<minRange>2</minRange>
+			<soundCast>LauncherFire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>15</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== RPG22 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_RPG22D</defName>
+		<statBases>
+			<MarketValue>33.72</MarketValue>
+			<Mass>2.80</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.24</SwayFactor>
+			<Bulk>7.85</Bulk>
+			<WorkToMake>12000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+			<FSX>3</FSX>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_RPG22_HEAT</defaultProjectile>
+			<warmupTime>1.9</warmupTime>
+			<range>32</range>
+			<minRange>2</minRange>
+			<soundCast>LauncherFire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>15</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== RPG26 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_RPG26D</defName>
+		<statBases>
+			<MarketValue>33.72</MarketValue>
+			<Mass>2.90</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.24</SwayFactor>
+			<Bulk>7.70</Bulk>
+			<WorkToMake>12000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+			<FSX>3</FSX>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_RPG26_HEAT</defaultProjectile>
+			<warmupTime>1.9</warmupTime>
+			<range>32</range>
+			<minRange>2</minRange>
+			<soundCast>RPGHeavyFire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>15</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== RPG27 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_RPG27D</defName>
+		<statBases>
+			<MarketValue>33.72</MarketValue>
+			<Mass>7.60</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.57</SwayFactor>
+			<Bulk>11.55</Bulk>
+			<WorkToMake>12000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+			<FSX>4</FSX>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_RPG27_HEAT</defaultProjectile>
+			<warmupTime>2.05</warmupTime>
+			<range>31</range>
+			<minRange>2</minRange>
+			<soundCast>LauncherFire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>19</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== RPG-7 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_RPG7v</defName>
+		<statBases>
+			<Mass>7.00</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.16</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.68</SwayFactor>
+			<Bulk>10.50</Bulk>
+			<WorkToMake>25500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>70</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_RPG7Grenade_HEAT</defaultProjectile>
+			<warmupTime>2.035</warmupTime>
+			<range>40</range>
+			<minRange>3</minRange>
+			<soundCast>RPGFire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>15</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>5.6</reloadTime>
+			<ammoSet>AmmoSet_RPG7Grenade</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== RPG-16 ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_RPG16v</defName>
+		<statBases>
+			<Mass>9.40</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.16</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.43</SwayFactor>
+			<Bulk>10.50</Bulk>
+			<WorkToMake>27500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>75</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_RPG16Grenade_HEAT</defaultProjectile>
+			<warmupTime>2</warmupTime>
+			<ai_AvoidFriendlyFireRadius>2</ai_AvoidFriendlyFireRadius>
+			<range>46</range>
+			<minRange>3</minRange>
+			<soundCast>RPGFire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>15</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>5.6</reloadTime>
+			<ammoSet>AmmoSet_RPG16Grenade</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== RPG-29 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_RPG29v</defName>
+		<statBases>
+			<Mass>12.10</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.16</SightsEfficiency>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>1.68</SwayFactor>
+			<Bulk>10.50</Bulk>
+			<WorkToMake>35000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>120</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_RPG29_HEAT</defaultProjectile>
+			<warmupTime>3</warmupTime>
+			<ai_AvoidFriendlyFireRadius>2</ai_AvoidFriendlyFireRadius>
+			<range>52</range>
+			<minRange>3</minRange>
+			<soundCast>RPGALTFire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>20</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>5.9</reloadTime>
+			<ammoSet>AmmoSet_RPG29</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Gun_RPG18D" or
+			defName="Gun_RPG16v" or
+			defName="Gun_RPG22D" or
+			defName="Gun_RPG26D" or
+			defName="Gun_RPG27D" or
+			defName="Gun_RPG16v" or
+			defName="Gun_RPG29v"]/recipeMaker </xpath>
+		<value>
+			<researchPrerequisite>CE_Launchers</researchPrerequisite>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_RPG18D" or
+			defName="Gun_RPG16v" or
+			defName="Gun_RPG22D" or
+			defName="Gun_RPG26D" or
+			defName="Gun_RPG27D" or
+			defName="Gun_RPG16v" or
+			defName="Gun_RPG29v"]/weaponTags </xpath>
+		<value>
+			<weaponTags>
+				<li>GunHeavy</li>
+				<li>CE_AI_AOE</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Gun_RPG18D" or
+			defName="Gun_RPG16v" or
+			defName="Gun_RPG22D" or
+			defName="Gun_RPG26D" or
+			defName="Gun_RPG27D" or
+			defName="Gun_RPG16v" or
+			defName="Gun_RPG29v"
+			]/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>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/LF Red Dawn/Patches/LF Red Dawn/RD_Pistols.xml b/ModPatches/LF Red Dawn/Patches/LF Red Dawn/RD_Pistols.xml
new file mode 100644
index 0000000000..5e26add291
--- /dev/null
+++ b/ModPatches/LF Red Dawn/Patches/LF Red Dawn/RD_Pistols.xml	
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Makarov (PM) ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MakarovPistol</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>
+			<WorkToMake>7000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x18mmMakarov_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Makarov</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<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>
+
+	<!-- ========== Steckin ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_APSPistol</defName>
+		<statBases>
+			<Mass>1.22</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.90</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>0.78</SwayFactor>
+			<Bulk>2.25</Bulk>
+			<WorkToMake>20000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.41</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x18mmMakarov_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>Makarov</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== TT-33 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_TokarevPistol</defName>
+		<statBases>
+			<Mass>0.85</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.93</SwayFactor>
+			<Bulk>1.94</Bulk>
+			<WorkToMake>7000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Makarov</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Gun_MakarovPistol" or
+			defName="Gun_APSPistol" or
+			defName="Gun_TokarevPistol"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/LF Red Dawn/Patches/LF Red Dawn/RD_RifleS.xml b/ModPatches/LF Red Dawn/Patches/LF Red Dawn/RD_RifleS.xml
new file mode 100644
index 0000000000..3a545a79f4
--- /dev/null
+++ b/ModPatches/LF Red Dawn/Patches/LF Red Dawn/RD_RifleS.xml	
@@ -0,0 +1,594 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== AK-47 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Ak47Normal</defName>
+		<statBases>
+			<Mass>3.47</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<Bulk>8.80</Bulk>
+			<WorkToMake>27000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>45</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.82</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>44</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>Ak47Shoot</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== AK-74 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Ak74Normal</defName>
+		<statBases>
+			<Mass>3.07</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.25</SwayFactor>
+			<Bulk>9.43</Bulk>
+			<WorkToMake>27500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.43</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>Ak74Shoot</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== AKS-47 ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Ak47Short</defName>
+		<statBases>
+			<Mass>3.20</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<Bulk>6.80</Bulk>
+			<WorkToMake>27000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>45</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.82</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>44</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>Ak47Shoot</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== AKS-74 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Ak74paratrooper</defName>
+		<statBases>
+			<Mass>2.87</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.25</SwayFactor>
+			<Bulk>7.23</Bulk>
+			<WorkToMake>27500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.43</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>Ak74Shoot</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== AKM ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AkM</defName>
+		<statBases>
+			<Mass>3.47</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<Bulk>8.80</Bulk>
+			<WorkToMake>27000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>45</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.82</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>44</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>Ak47Shoot</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== SKS ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SKS</defName>
+		<statBases>
+			<Mass>3.85</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.41</SwayFactor>
+			<Bulk>10.20</Bulk>
+			<WorkToMake>15000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.72</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<soundCast>SVDshoot</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== AK-74U ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Ak74U</defName>
+		<statBases>
+			<Mass>2.85</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.02</SwayFactor>
+			<Bulk>4.90</Bulk>
+			<WorkToMake>29000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>0.66</warmupTime>
+			<range>40</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>ModelUshoot</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Kiparis ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Kiparis</defName>
+		<statBases>
+			<Mass>1.60</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.94</SwayFactor>
+			<Bulk>4.52</Bulk>
+			<WorkToMake>22000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>30</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.22</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x18mmMakarov_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>25</range>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>OTSshoot</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- AS Val -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_ASVal</defName>
+		<statBases>
+			<Mass>2.50</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.17</SwayFactor>
+			<Bulk>6.15</Bulk>
+			<WorkToMake>35000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>45</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.94</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>31</range>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>ASVSSshoot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>1</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== VSS Vintorez ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_VssVintz</defName>
+		<statBases>
+			<Mass>2.60</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.19</SwayFactor>
+			<Bulk>8.94</Bulk>
+			<WorkToMake>40000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Chemfuel>5</Chemfuel>
+			<Steel>45</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.94</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>48</range>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>Shot_VSS</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ==========SVD Dragunov ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Dragunov</defName>
+		<statBases>
+			<Mass>4.30</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.70</SwayFactor>
+			<Bulk>12.25</Bulk>
+			<WorkToMake>23000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>60</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<soundCast>SVDshoot</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Gun_Ak47Normal" or
+			defName="Gun_Ak74Normal" or
+			defName="Gun_AkM" or
+			defName="Gun_SKS" or
+			defName="Gun_Ak74U" or
+			defName="Gun_Kiparis" or
+			defName="Gun_ASVal" or
+			defName="Gun_VssVintz" or
+			defName="Gun_Dragunov"
+			]/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>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/LF Red Dawn/Patches/LF Red Dawn/RespiratorsHelmets_RD.xml b/ModPatches/LF Red Dawn/Patches/LF Red Dawn/RespiratorsHelmets_RD.xml
new file mode 100644
index 0000000000..946e40ffb8
--- /dev/null
+++ b/ModPatches/LF Red Dawn/Patches/LF Red Dawn/RespiratorsHelmets_RD.xml	
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName = "RD_PMK"
+			or defName = "RD_MMGasMask"
+			or defName = "RD_GPgasmask"]/statBases </xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "RD_PMK"
+			or defName = "RD_MMGasMask"
+			or defName = "RD_GPgasmask"
+			]/equippedStatOffsets </xpath>
+		<value>
+			<equippedStatOffsets>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "RD_PMK"
+			or defName = "RD_MMGasMask"
+			or defName = "RD_GPgasmask"
+			]/apparel/layers </xpath>
+		<value>
+			<layers>
+				<li>StrappedHead</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName = "RD_PMK"
+			or defName = "RD_MMGasMask"
+			] </xpath>
+		<value>
+			<modExtensions>
+				<li Class="CombatExtended.ApparelHediffExtension">
+					<hediff>WearingGasMask</hediff>
+				</li>
+				<li Class="CombatExtended.ApperalRenderingExtension">
+					<HideHair>false</HideHair>
+					<HideBeard>true</HideBeard>
+				</li>
+			</modExtensions>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "RD_GPgasmask"]</xpath>
+		<value>
+			<modExtensions>
+				<li Class="CombatExtended.ApparelHediffExtension">
+					<hediff>WearingGasMask</hediff>
+				</li>
+				<li Class="CombatExtended.ApperalRenderingExtension">
+					<HideHair>true</HideHair>
+					<HideBeard>true</HideBeard>
+				</li>
+			</modExtensions>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "RD_PMK"
+			or defName = "RD_MMGasMask"
+			or defName = "RD_GPgasmask"]/recipeMaker </xpath>
+		<value>
+			<recipeMaker>
+				<skillRequirements>
+					<Crafting>8</Crafting>
+				</skillRequirements>
+				<unfinishedThingDef>UnfinishedTechArmor</unfinishedThingDef>
+				<recipeUsers>
+					<li>TableMachining</li>
+				</recipeUsers>
+			</recipeMaker>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "RD_PMK"
+			or defName = "RD_MMGasMask"
+			or defName = "RD_GPgasmask"
+			]/costList </xpath>
+		<value>
+			<costList>
+				<ComponentIndustrial>2</ComponentIndustrial>
+				<Chemfuel>10</Chemfuel>
+			</costList>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/LF Red Dawn/Patches/LF Red Dawn/Shirt_RD.xml b/ModPatches/LF Red Dawn/Patches/LF Red Dawn/Shirt_RD.xml
new file mode 100644
index 0000000000..af9a024130
--- /dev/null
+++ b/ModPatches/LF Red Dawn/Patches/LF Red Dawn/Shirt_RD.xml	
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RD_SovietAfghan"
+			or defName="RD_SovietTTsKoMarine"
+			or defName="RD_SovietEuropeUniform"
+			or defName="RD_SovietOMONuniform"
+			or defName="RD_SovietMabuta"
+			or defName="RD_SovietColdWarUniEarly"
+			or defName="RD_SovietColdWarUniLate"
+			or defName="RD_SovietGymnaEarly"
+			or defName="RD_SovietGymnaLate"
+			or defName="RD_SovietGorkaBeryozka"
+			or defName="RD_SovietTelogreika"
+			or defName="RD_GulagTelogreika"
+			or defName="RD_SovietGorkaKLMK"
+			or defName="RD_SovietGorkaDesert"
+			or defName="RD_SovietPilotUni"
+			or defName="RD_SovietPilotUniJET"
+			or defName="RD_SovietEuroTanker"
+			or defName="RD_SovietAfghanTanker"
+			or defName="RD_RussianKLMKparka"
+			or defName="RD_GorkaKGB"
+			or defName="RD_GorkaEUROPE"]/costStuffCount </xpath>
+		<value>
+			<costStuffCount>65</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RD_RussianTenyanska"]/costStuffCount </xpath>
+		<value>
+			<costStuffCount>24</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_RussianTenyanska"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.75</StuffEffectMultiplierArmor>
+			<Bulk>0.5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RD_SovietAfghan"
+			or defName="RD_SovietTTsKoMarine"
+			or defName="RD_SovietEuropeUniform"
+			or defName="RD_SovietOMONuniform"
+			or defName="RD_SovietMabuta"
+			or defName="RD_SovietColdWarUniEarly"
+			or defName="RD_SovietColdWarUniLate"
+			or defName="RD_SovietGymnaEarly"
+			or defName="RD_SovietGymnaLate"
+			or defName="RD_SovietGorkaBeryozka"
+			or defName="RD_SovietTelogreika"
+			or defName="RD_GulagTelogreika"
+			or defName="RD_SovietGorkaKLMK"
+			or defName="RD_SovietGorkaDesert"
+			or defName="RD_SovietPilotUni"
+			or defName="RD_SovietPilotUniJET"
+			or defName="RD_SovietEuroTanker"
+			or defName="RD_SovietAfghanTanker"
+			or defName="RD_RussianKLMKparka"
+			or defName="RD_GorkaKGB"
+			or defName="RD_GorkaEUROPE"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+			<Bulk>2</Bulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/LF Red Dawn/Patches/LF Red Dawn/Softhead.xml b/ModPatches/LF Red Dawn/Patches/LF Red Dawn/Softhead.xml
new file mode 100644
index 0000000000..66e049b9e2
--- /dev/null
+++ b/ModPatches/LF Red Dawn/Patches/LF Red Dawn/Softhead.xml	
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === Beanie === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_GRUBeanie"
+			or defName="RD_HoodNormal"
+			or defName="RD_HoodZKS"
+			or defName="RD_HoodKLMK"
+			or defName="RD_Panama"
+			or defName="RD_Afgcap"
+			or defName="RD_Facemask"
+			or defName="RD_Mabutacap"
+			or defName="RD_Sovhat"]/costStuffCount </xpath>
+		<value>
+			<costStuffCount>20</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_TKDVDHelmet"
+			or defName="RD_SovEurTankerHelm"
+			or defName="RD_TankerHelmCamo"]/costStuffCount </xpath>
+		<value>
+			<costStuffCount>30</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_GRUBeanie"
+			or defName="RD_HoodNormal"
+			or defName="RD_HoodZKS"
+			or defName="RD_HoodKLMK"
+			or defName="RD_Panama"
+			or defName="RD_Afgcap"
+			or defName="RD_OfficerCap"
+			or defName="RD_NCOCap"
+			or defName="RD_Facemask"
+			or defName="RD_Mabutacap"
+			or defName="RD_SovUshanka"
+			or defName="RD_SovBeret"
+			or defName="RD_Sovhat"
+			or defName="RD_SovEurTankerHelm"
+			or defName="RD_TKDVDHelmet"
+			or defName="RD_TankerHelmCamo"]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
+			<Bulk>0.5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RD_HoodNormal"
+			or defName="RD_HoodZKS"
+			or defName="RD_HoodKLMK"
+			or defName="RD_HoodZKS"]/equippedStatOffsets </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RD_Facemask"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<ToxicEnvironmentResistance>0.05</ToxicEnvironmentResistance>
+				<SmokeSensitivity>-0.1</SmokeSensitivity>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "RD_Facemask" ]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>StrappedHead</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName = "RD_Facemask"]</xpath>
+		<value>
+			<li Class="CombatExtended.ApperalRenderingExtension">
+				<HideHair>false</HideHair>
+				<HideBeard>false</HideBeard>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RD_PVNHelmet"]/equippedStatOffsets</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RD_PVNHelmet"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency_Apparel>0.4</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "RD_PVNHelmet" ]/apparel/layers</xpath>
+		<value>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName = "RD_PVNHelmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.ApperalRenderingExtension">
+				<HideHair>true</HideHair>
+				<HideBeard>false</HideBeard>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "RD_PVNHelmet" ]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>40</Steel>
+				<ComponentIndustrial>5</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "RD_PVNHelmet" ]/recipeMaker/researchPrerequisite</xpath>
+		<value>
+			<researchPrerequisite>CE_SimpleNV</researchPrerequisite>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "RD_PVNHelmet" ]/recipeMaker/skillRequirements</xpath>
+		<value>
+			<skillRequirements>
+				<Crafting>6</Crafting>
+			</skillRequirements>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/LTS Military/Defs/LTS Military/Recipes_Grenades.xml b/ModPatches/LTS Military/Defs/LTS Military/Recipes_Grenades.xml
new file mode 100644
index 0000000000..3c22bfbb6a
--- /dev/null
+++ b/ModPatches/LTS Military/Defs/LTS Military/Recipes_Grenades.xml	
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- = Recipe = -->
+
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>LTS_Handgranat</defName>
+		<label>make M59 grenades x10</label>
+		<description>Craft 10 M59 grenades.</description>
+		<jobString>Making M59 grenades.</jobString>
+		<workAmount>3800</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<LTS_Handgranat>10</LTS_Handgranat>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/LTS Military/Patches/LTS Military/Apparel.xml b/ModPatches/LTS Military/Patches/LTS Military/Apparel.xml
new file mode 100644
index 0000000000..4093040d06
--- /dev/null
+++ b/ModPatches/LTS Military/Patches/LTS Military/Apparel.xml	
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== M90 Uniform ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="LTS_Uniform" or defName="LTS_UniformPants"]/statBases/Mass</xpath>
+		<value>
+			<Mass>0.5</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="LTS_Uniform" or defName="LTS_UniformPants"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Cap / Beret ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="LTS_UniformCap" or defName="LTS_UniformBeret"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>0.5</WornBulk>
+			<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/LTS Military/Patches/LTS Military/Weapons.xml b/ModPatches/LTS Military/Patches/LTS Military/Weapons.xml
new file mode 100644
index 0000000000..24cc4c1958
--- /dev/null
+++ b/ModPatches/LTS Military/Patches/LTS Military/Weapons.xml	
@@ -0,0 +1,749 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Tools ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="LTS_KPist" or defName="LTS_MP5SD" or defName="LTS_Glock"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName="LTS_UMP" or
+			defName="LTS_PSG" or
+			defName="LTS_AKIV" or
+			defName="LTS_AKV" or
+			defName="LTS_G36Rifle" or
+			defName="LTS_KSP" or
+			defName="LTS_PKM"
+			]/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="LTS_AT" or defName="LTS_grg"]/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>
+
+	<!-- ========== KPIST ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>LTS_KPist</defName>
+		<statBases>
+			<Mass>3.35</Mass>
+			<Bulk>5.50</Bulk>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.14</SwayFactor>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.95</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>35</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>SMG_Fire</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== UMP45 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>LTS_UMP</defName>
+		<statBases>
+			<Mass>2.50</Mass>
+			<Bulk>4.50</Bulk>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.94</SwayFactor>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.08</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>25</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>HeavySMG_Fire</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== MP5SD ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>LTS_MP5SD</defName>
+		<statBases>
+			<Mass>3.10</Mass>
+			<Bulk>7.90</Bulk>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.10</SwayFactor>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.21</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmParaSD_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>26</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>Silenced_Fire</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>1</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmParaSD</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== PSG90 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>LTS_PSG</defName>
+		<statBases>
+			<Mass>6.5</Mass>
+			<Bulk>11.80</Bulk>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.83</SwayFactor>
+			<SightsEfficiency>2.8</SightsEfficiency>
+			<RangedWeapon_Cooldown>1.56</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_300WinchesterMagnum_FMJ</defaultProjectile>
+			<warmupTime>2</warmupTime>
+			<range>80</range>
+			<soundCast>DMR_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_300WinchesterMagnum</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_SNIPER</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== AK4 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>LTS_AKIV</defName>
+		<statBases>
+			<Mass>4.10</Mass>
+			<Bulk>10.45</Bulk>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.46</SwayFactor>
+			<SightsEfficiency>1.5</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.07</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>58</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>AssaultRifle_Fire</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AR</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== AK5 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>LTS_AKV</defName>
+		<statBases>
+			<Mass>3.90</Mass>
+			<Bulk>7.60</Bulk>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.40</SwayFactor>
+			<SightsEfficiency>1.5</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.38</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>58</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>AssaultRifle_Fire</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AR</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== G36 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>LTS_G36Rifle</defName>
+		<statBases>
+			<Mass>3.63</Mass>
+			<Bulk>7.58</Bulk>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.37</SwayFactor>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.38</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>58</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>Rifle_Fire</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AR</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Glock 19 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>LTS_Glock</defName>
+		<statBases>
+			<Mass>0.78</Mass>
+			<Bulk>1.86</Bulk>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.88</SwayFactor>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.4</warmupTime>
+			<range>12</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>Handgun_Fire</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+			<recoilAmount>2.74</recoilAmount>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>17</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== KSP58 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>LTS_KSP</defName>
+		<statBases>
+			<Mass>11.80</Mass>
+			<Bulk>15.63</Bulk>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.71</SwayFactor>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.21</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>75</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>LMG_Fire</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_LMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== PKM ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>LTS_PKM</defName>
+		<statBases>
+			<Mass>7.50</Mass>
+			<Bulk>14.92</Bulk>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.36</SwayFactor>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.45</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>62</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>LMG_Fire</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_LMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== AT4 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>LTS_AT</defName>
+		<statBases>
+			<Mass>6.7</Mass>
+			<Bulk>16.50</Bulk>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>2.27</SwayFactor>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_84mmAT4_HEAT</defaultProjectile>
+			<warmupTime>1.9</warmupTime>
+			<range>40</range>
+			<soundCast>Recoilless_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AOE</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== GRG ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>LTS_grg</defName>
+		<statBases>
+			<Mass>10</Mass>
+			<Bulk>11.3</Bulk>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>2.58</SwayFactor>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_84x246mmR_HEAT</defaultProjectile>
+			<warmupTime>2</warmupTime>
+			<range>55</range>
+			<soundCast>Recoilless_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>8.6</reloadTime>
+			<ammoSet>AmmoSet_84x246mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>false</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AOE</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== M59 ========== -->
+
+	<!-- = Projectile = -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Proj_Handgranat"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Proj_Handgranat"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<explosionRadius>2</explosionRadius>
+				<damageDef>Bomb</damageDef>
+				<damageAmountBase>60</damageAmountBase>
+				<explosionDelay>100</explosionDelay>
+				<dropsCasings>true</dropsCasings>
+				<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+				<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<speed>12</speed>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Proj_Handgranat"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Proj_Handgranat"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Proj_Handgranat"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>40</Fragment_Small>
+				</fragments>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- = Grenade = -->
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="LTS_Handgranat"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>BaseWeapon</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="LTS_Handgranat"]/graphicData</xpath>
+		<value>
+			<graphicData>
+				<texPath>Projectiles/SpranghandgranatM59_Projectile</texPath>
+				<graphicClass>Graphic_Single</graphicClass>
+				<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
+			</graphicData>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="LTS_Handgranat"]/recipeMaker</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="LTS_Handgranat"]/costList</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="LTS_Handgranat"]</xpath>
+		<value>
+			<thingClass>CombatExtended.AmmoThing</thingClass>
+			<stackLimit>75</stackLimit>
+			<resourceReadoutPriority>First</resourceReadoutPriority>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="LTS_Handgranat"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="LTS_Handgranat"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="LTS_Handgranat"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="LTS_Handgranat"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>60</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>2</explosiveRadius>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>40</Fragment_Small>
+				</fragments>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="LTS_Handgranat"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>40</Fragment_Small>
+				</fragments>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>LTS_Handgranat</defName>
+		<statBases>
+			<Mass>0.82</Mass>
+			<Bulk>0.36</Bulk>
+			<MarketValue>11.22</MarketValue>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<label>throw grenade</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<range>13.0</range>
+			<minRange>2</minRange>
+			<warmupTime>0.8</warmupTime>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<soundCast>ThrowGrenade</soundCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<defaultProjectile>Proj_Handgranat</defaultProjectile>
+			<onlyManualCast>true</onlyManualCast>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<weaponTags>
+			<li>CE_AI_AOE</li>
+			<li>CE_AI_Grenade</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Leeani/Patches/Leeani/Apparel_Various.xml b/ModPatches/Leeani/Patches/Leeani/Apparel_Various.xml
new file mode 100644
index 0000000000..1563296f17
--- /dev/null
+++ b/ModPatches/Leeani/Patches/Leeani/Apparel_Various.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== The Bycocket ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "LeeaniBycocket"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Leeani/Patches/Leeani/PawnKindDefs_Humanlikes/PawnKinds_Leeani.xml b/ModPatches/Leeani/Patches/Leeani/PawnKindDefs_Humanlikes/PawnKinds_Leeani.xml
new file mode 100644
index 0000000000..07332a0478
--- /dev/null
+++ b/ModPatches/Leeani/Patches/Leeani/PawnKindDefs_Humanlikes/PawnKinds_Leeani.xml
@@ -0,0 +1,365 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Scoot ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="LeeaniScout"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<!-- ========== LeeaniMercenary ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="LeeaniMercenary"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Soldier ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="LeeaniSoldier"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>1</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.8</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.3</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Champion ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="LeeaniChampion"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>1</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>600</min>
+					<max>2000</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.9</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>1</generateChance>
+						<sidearmMoney>
+							<min>1000</min>
+							<max>3000</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Captain ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="LeeaniCaptain"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>1</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>600</min>
+					<max>2000</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.3</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.3</generateChance>
+						<sidearmMoney>
+							<min>200</min>
+							<max>400</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Civvies! ========== -->
+	<!-- ========== Peasant ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="LeeaniPeasant"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>1</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.2</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>60</min>
+							<max>150</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Noble ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="LeeaniNoble"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>1</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Trader ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="LeeaniTrader"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>1</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.8</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.3</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== LeeaniTradie? ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="LeeaniTradie"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>1</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>600</min>
+					<max>2000</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.9</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>1</generateChance>
+						<sidearmMoney>
+							<min>1000</min>
+							<max>3000</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Archvile ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="LeeaniArkhaevest"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>1</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>600</min>
+					<max>2000</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.3</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.3</generateChance>
+						<sidearmMoney>
+							<min>200</min>
+							<max>400</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Lourde ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="LeeaniLoord"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>1</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>600</min>
+					<max>2000</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.3</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.3</generateChance>
+						<sidearmMoney>
+							<min>200</min>
+							<max>400</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Leeani/Patches/Leeani/Race_Leeani.xml b/ModPatches/Leeani/Patches/Leeani/Race_Leeani.xml
new file mode 100644
index 0000000000..bf44e3707d
--- /dev/null
+++ b/ModPatches/Leeani/Patches/Leeani/Race_Leeani.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Leeani"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Gives Gun Gizmos to Leeani HUD thing ========== -->
+	<!-- ========== Also Makes Em Suppressable ========== -->
+
+	<!-- ========== Patch Leeani Melee Attacks ========== -->
+	<!-- ========== Also Sharpens Their Slashers ========== -->
+	<!-- ========== And adds fists and chompers ========== -->
+	<!-- ========== A bit more robust than ferians ========== -->
+	<!-- ========== We'll see how that works out? ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Leeani"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1</AimingAccuracy>
+			<MeleeDodgeChance>1.5</MeleeDodgeChance>
+			<MeleeCritChance>1.3</MeleeCritChance>
+			<MeleeParryChance>1.2</MeleeParryChance>
+			<ReloadSpeed>1</ReloadSpeed>
+			<Suppressability>1</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Leeani"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetration>0.12</armorPenetration>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetration>0.12</armorPenetration>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetration>0.10</armorPenetration>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetration>0.10</armorPenetration>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.7</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetration>0.16</armorPenetration>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== BaseBodySize, ArmorRatings, MoveSpeed, and BaseHealth are already set. I think. ========== -->
+	<!-- ========== Thanks Mike! ========== -->
+
+	<!-- ========== Adds In Inspector Tabs ========== -->
+	<!-- ========== Inventory and all that jazz ========== -->
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Leeani/Patches/Leeani/Weapons_Leeani.xml b/ModPatches/Leeani/Patches/Leeani/Weapons_Leeani.xml
new file mode 100644
index 0000000000..686feaec2d
--- /dev/null
+++ b/ModPatches/Leeani/Patches/Leeani/Weapons_Leeani.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Quarterstaff ========== -->
+	<!-- ========== Lifted wholesale from VFWE_MELEE ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>/ThingDefs/ThingDef[defName = "MeleeWeapon_Quarterstaff"]/statBases/MeleeWeapon_DamageAmount</xpath>
+		<value>
+			<MeleeWeapon_DamageAmount>11</MeleeWeapon_DamageAmount>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>/ThingDefs/ThingDef[defName = "MeleeWeapon_Quarterstaff"]/statBases/MeleeWeapon_Cooldown</xpath>
+		<value>
+			<MeleeWeapon_Cooldown>0.92</MeleeWeapon_Cooldown>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>/ThingDefs/ThingDef[defName = "MeleeWeapon_Quarterstaff"]/statBases</xpath>
+		<value>
+			<MeleeWeapon_Penetration>0.16</MeleeWeapon_Penetration>
+			<Bulk>6</Bulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>/ThingDefs/ThingDef[defName = "MeleeWeapon_Quarterstaff"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.5</MeleeCritChance>
+				<MeleeParryChance>0.8</MeleeParryChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>/ThingDefs/ThingDef[defName = "MeleeWeapon_Quarterstaff"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li>
+					<verbClass>CombatExtended.Verb_MeleeAttackCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<meleeDamageDef>Blunt</meleeDamageDef>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Lemolim Race/Defs/Lemolim Race/Pawnkinds_Lemonim.xml b/ModPatches/Lemolim Race/Defs/Lemolim Race/Pawnkinds_Lemonim.xml
new file mode 100644
index 0000000000..4e4d3e70d1
--- /dev/null
+++ b/ModPatches/Lemolim Race/Defs/Lemolim Race/Pawnkinds_Lemonim.xml	
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!--Lemolim Tribal with Sticky Bomb -->
+
+	<PawnKindDef>
+		<defName>Lemolim_Grenadier</defName>
+		<race>Lemolim</race>
+		<label>blaster</label>
+		<combatPower>65</combatPower>
+		<defaultFactionType>LemolimTribeCautious</defaultFactionType>
+		<backstoryCategories>
+			<li>Tribal</li>
+		</backstoryCategories>
+		<maxGenerationAge>30</maxGenerationAge>
+		<chemicalAddictionChance>0.05</chemicalAddictionChance>
+		<invNutrition>1.8</invNutrition>
+		<invFoodDef>Pemmican</invFoodDef>
+		<canBeSapper>true</canBeSapper>
+		<gearHealthRange>
+			<min>0.5</min>
+			<max>1.8</max>
+		</gearHealthRange>
+		<apparelMoney>
+			<min>180</min>
+			<max>350</max>
+		</apparelMoney>
+		<apparelRequired>
+			<li>Apparel_WarVeil</li>
+			<li>CE_Apparel_TribalBackpack</li>
+		</apparelRequired>
+		<apparelTags>
+			<li>Tribal</li>
+		</apparelTags>
+		<weaponMoney>
+			<min>60</min>
+			<max>400</max>
+		</weaponMoney>
+		<weaponTags>
+			<li>CE_GrenadeNeolithic</li>
+		</weaponTags>
+		<techHediffsMoney>
+			<min>50</min>
+			<max>800</max>
+		</techHediffsMoney>
+		<techHediffsTags>
+			<li>Poor</li>
+			<li>Simple</li>
+		</techHediffsTags>
+		<techHediffsChance>0.33</techHediffsChance>
+		<disallowedTraits>
+			<li>Brawler</li>
+		</disallowedTraits>
+		<initialWillRange>2~4</initialWillRange>
+		<initialResistanceRange>14~22</initialResistanceRange>
+		<modExtensions>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>18</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>80</min>
+						<max>160</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Tribal</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</modExtensions>
+	</PawnKindDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Lemolim Race/Patches/Lemolim Race/Lemolim_Leather.xml b/ModPatches/Lemolim Race/Patches/Lemolim Race/Lemolim_Leather.xml
new file mode 100644
index 0000000000..031705d52f
--- /dev/null
+++ b/ModPatches/Lemolim Race/Patches/Lemolim Race/Lemolim_Leather.xml	
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Lemolim"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.06</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Leather_Lemolim"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.05</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Lemolim Race/Patches/Lemolim Race/Lemolim_Race.xml b/ModPatches/Lemolim Race/Patches/Lemolim Race/Lemolim_Race.xml
new file mode 100644
index 0000000000..cf3e4e16d5
--- /dev/null
+++ b/ModPatches/Lemolim Race/Patches/Lemolim Race/Lemolim_Race.xml	
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Lemolim"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Lemolim"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<MeleeDodgeChance>1.1</MeleeDodgeChance>
+			<MeleeCritChance>1.1</MeleeCritChance>
+			<MeleeParryChance>0.7</MeleeParryChance>
+			<ReloadSpeed>1.1</ReloadSpeed>
+			<Suppressability>0.9</Suppressability>
+			<SmokeSensitivity>1</SmokeSensitivity>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Lemolim"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Lemolim"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Lemolim"]/race/baseBodySize</xpath>
+		<value>
+			<baseBodySize>0.8</baseBodySize>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Lemolim"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>12</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>12</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.80</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Lemolim"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Lemolim Race/Patches/Lemolim Race/Lemonim_Body.xml b/ModPatches/Lemolim Race/Patches/Lemolim Race/Lemonim_Body.xml
new file mode 100644
index 0000000000..89c4027fee
--- /dev/null
+++ b/ModPatches/Lemolim Race/Patches/Lemolim Race/Lemonim_Body.xml	
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- patch for body armor -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName ="Bodies_Lemolim"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Bodies_Lemolim"]/corePart/parts/li[def = "Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Bodies_Lemolim"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Bodies_Lemolim"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Bodies_Lemolim"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Bodies_Lemolim"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Ear"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Bodies_Lemolim"]/corePart/parts/li[def = "Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Bodies_Lemolim"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Bodies_Lemolim"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Bodies_Lemolim"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/parts/li[def = "Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Bodies_Lemolim"]/corePart/parts/li[def = "Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Bodies_Lemolim"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Bodies_Lemolim"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/parts/li[def = "Toe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Lemolim Race/Patches/Lemolim Race/Lemonim_Pawnkind.xml b/ModPatches/Lemolim Race/Patches/Lemolim Race/Lemonim_Pawnkind.xml
new file mode 100644
index 0000000000..89b7b69843
--- /dev/null
+++ b/ModPatches/Lemolim Race/Patches/Lemolim Race/Lemonim_Pawnkind.xml	
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Tribal Pawns-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[ @Name="LemolimTribalBase" or defName="LemolimTribal"]</xpath>
+		<value>
+			<apparelRequired>
+				<li>CE_Apparel_TribalBackpack</li>
+			</apparelRequired>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[ @Name="LemolimTribalBase"]/invNutrition</xpath>
+		<value>
+			<invNutrition>1.8</invNutrition>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[ defName="LemolimTribal_Archer" or defName="LemolimTribal_Hunter" or defName="LemolimTribal_HeavyArcher" or defName="LemolimTribal_ChiefRanged"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>15</min>
+					<max>30</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>500</min>
+						<max>700</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Tribal</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Pirate Pawns -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[ @Name="LemolimPirateBase" or @Name="LemolimMercenaryBase" or defName="LemolimColonist"]</xpath>
+		<value>
+			<apparelRequired>
+				<li>CE_Apparel_Backpack</li>
+			</apparelRequired>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="LemolimPirate_Renegade"]/weaponMoney</xpath>
+		<value>
+			<weaponMoney>
+				<min>147</min>
+				<max>250</max>
+			</weaponMoney>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[ defName="LemolimPirate_Scavenger" or defName="LemolimPirate_Conscript"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>3</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>50</min>
+						<max>120</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>MedievalMeleeBasic</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[ defName="LemolimPirate_Scavenger" or defName="LemolimPirate_Conscript"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>3</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>50</min>
+						<max>120</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>MedievalMeleeBasic</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="LemolimPirate_Captain"]/weaponTags</xpath>
+		<value>
+			<li>SpacerGun</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[ defName="LemolimPirate_Captain"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>150</min>
+						<max>320</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Melee</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Mercenaries Pawnkinds -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[ defName="LemolimMercenary_Zapper"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>10</min>
+					<max>15</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>150</min>
+						<max>320</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Melee</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[ defName="LemolimMercenary_ZapperEmp"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>10</min>
+					<max>15</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>100</min>
+						<max>250</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm</li>
+					</weaponTags>
+					<magazineCount>
+						<min>2</min>
+						<max>5</max>
+					</magazineCount>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="LemolimMercenary_ZapperEmp"]/label</xpath>
+		<value>
+			<label>advanced grenadier</label>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="LemolimMercenary_ZapperEmp"]/weaponTags</xpath>
+		<value>
+			<li>CE_GrenadeFlashbang</li>
+			<li>GrenadeSmoke</li>
+			<li>GrenadeDestructive</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="LemolimMercenary_ZapperEmp"]/combatPower</xpath>
+		<value>
+			<combatPower>85</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[ defName="LemolimMercenary_Hitman" or defName="LemolimMercenary_Shocktrooper"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>250</min>
+						<max>420</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Melee</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[ defName="LemolimMercenary_Headhunter"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>1</min>
+					<max>3</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>200</min>
+						<max>450</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm</li>
+					</weaponTags>
+					<magazineCount>
+						<min>2</min>
+						<max>4</max>
+					</magazineCount>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Lemolim Race/Patches/Lemolim Race/Pawnkind_LemolimGrenadier.xml b/ModPatches/Lemolim Race/Patches/Lemolim Race/Pawnkind_LemolimGrenadier.xml
new file mode 100644
index 0000000000..fef9d269d2
--- /dev/null
+++ b/ModPatches/Lemolim Race/Patches/Lemolim Race/Pawnkind_LemolimGrenadier.xml	
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Adding Lemonim Boomers -->
+
+	<Operation Class="PatchOperationAdd"><!-- Combat -->
+		<xpath>Defs/FactionDef[@Name="LemolimFactionTribalBase"]/pawnGroupMakers/li[1]/options</xpath>
+		<value>
+			<Lemolim_Grenadier>10</Lemolim_Grenadier>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Normal fights, ranged only -->
+		<xpath>Defs/FactionDef[@Name="LemolimFactionTribalBase"]/pawnGroupMakers/li[2]/options</xpath>
+		<value>
+			<Lemolim_Grenadier>15</Lemolim_Grenadier>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!--Peaceful-->
+		<xpath>Defs/FactionDef[@Name="LemolimFactionTribalBase"]/pawnGroupMakers/li[4]/options</xpath>
+		<value>
+			<Lemolim_Grenadier>5</Lemolim_Grenadier>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!--Trader-->
+		<xpath>Defs/FactionDef[@Name="LemolimFactionTribalBase"]/pawnGroupMakers/li[5]/guards</xpath>
+		<value>
+			<Lemolim_Grenadier>7</Lemolim_Grenadier>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Settlement -->
+		<xpath>Defs/FactionDef[@Name="LemolimFactionTribalBase"]/pawnGroupMakers/li[6]/options</xpath>
+		<value>
+			<Lemolim_Grenadier>20</Lemolim_Grenadier>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Lemolim Race/Patches/Lemolim Race/Scenarios_Patch.xml b/ModPatches/Lemolim Race/Patches/Lemolim Race/Scenarios_Patch.xml
new file mode 100644
index 0000000000..0c5999ad6e
--- /dev/null
+++ b/ModPatches/Lemolim Race/Patches/Lemolim Race/Scenarios_Patch.xml	
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="LemolimTribe"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_Arrow_Stone</thingDef>
+				<count>50</count>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="LemolimColony"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_45ACP_FMJ</thingDef>
+				<count>70</count>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Let's Have a Cat!/Patches/Let's Have a Cat!/LHaC_CE_Patch_Races_Animal_NEKO.xml b/ModPatches/Let's Have a Cat!/Patches/Let's Have a Cat!/LHaC_CE_Patch_Races_Animal_NEKO.xml
new file mode 100644
index 0000000000..eaacd443b2
--- /dev/null
+++ b/ModPatches/Let's Have a Cat!/Patches/Let's Have a Cat!/LHaC_CE_Patch_Races_Animal_NEKO.xml	
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Same stats and melee tools as cats from the vanilla game (Core) -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="akaNEKO_A_Shorthair" or
+			defName="akaNEKO_J_Bobtail" or
+			defName="akaNEKO_kijitora" or
+			defName="akaNEKO_kuroneko" or
+			defName="akaNEKO_Maine_Coon" or
+			defName="akaNEKO_N_Forest_Cat" or
+			defName="akaNEKO_Persian" or
+			defName="akaNEKO_Russian_Blue" or
+			defName="akaNEKO_Scottish_Fold" or
+			defName="akaNEKO_Scottish_Fold_Long" or
+			defName="akaNEKO_shironeko" or
+			defName="akaNEKO_Siamese"
+			]/statBases </xpath>
+		<value>
+			<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="akaNEKO_A_Shorthair" or
+			defName="akaNEKO_J_Bobtail" or
+			defName="akaNEKO_kijitora" or
+			defName="akaNEKO_kuroneko" or
+			defName="akaNEKO_Maine_Coon" or
+			defName="akaNEKO_N_Forest_Cat" or
+			defName="akaNEKO_Persian" or
+			defName="akaNEKO_Russian_Blue" or
+			defName="akaNEKO_Scottish_Fold" or
+			defName="akaNEKO_Scottish_Fold_Long" or
+			defName="akaNEKO_shironeko" or
+			defName="akaNEKO_Siamese"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.55</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.55</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.85</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.254</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>0.55</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[
+			defName="akaNEKO_A_Shorthair" or
+			defName="akaNEKO_J_Bobtail" or
+			defName="akaNEKO_kijitora" or
+			defName="akaNEKO_kuroneko" or
+			defName="akaNEKO_Maine_Coon" or
+			defName="akaNEKO_N_Forest_Cat" or
+			defName="akaNEKO_Persian" or
+			defName="akaNEKO_Russian_Blue" or
+			defName="akaNEKO_Scottish_Fold" or
+			defName="akaNEKO_Scottish_Fold_Long" or
+			defName="akaNEKO_shironeko" or
+			defName="akaNEKO_Siamese"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[
+			defName="akaNEKO_A_Shorthair" or
+			defName="akaNEKO_J_Bobtail" or
+			defName="akaNEKO_kijitora" or
+			defName="akaNEKO_kuroneko" or
+			defName="akaNEKO_Maine_Coon" or
+			defName="akaNEKO_N_Forest_Cat" or
+			defName="akaNEKO_Persian" or
+			defName="akaNEKO_Russian_Blue" or
+			defName="akaNEKO_Scottish_Fold" or
+			defName="akaNEKO_Scottish_Fold_Long" or
+			defName="akaNEKO_shironeko" or
+			defName="akaNEKO_Siamese"
+			]/combatPower </xpath>
+		<value>
+			<combatPower>14</combatPower>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Littluna Race/Patches/Littluna Race/Bodies/Bodies_Summon.xml b/ModPatches/Littluna Race/Patches/Littluna Race/Bodies/Bodies_Summon.xml
new file mode 100644
index 0000000000..44a39c865c
--- /dev/null
+++ b/ModPatches/Littluna Race/Patches/Littluna Race/Bodies/Bodies_Summon.xml	
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Nearmare Summon === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="HAR_LL_M_Body"]//*[
+			def="Body" or
+			def="Tail" or
+			def="Neck" or
+			def="Nose" or
+			def="Leg" or
+			customLabel="rear left paw" or
+			customLabel="rear right paw" or
+			def="Eye" or
+			def="Ear"]
+		</xpath>
+
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="HAR_LL_M_Body"]//*[
+			def="Body" or
+			def="Tail" or
+			def="Neck" or
+			def="Head" or
+			def="Leg" or
+			def="Paw" or
+			def="Eye" or
+			def="Ear" or
+			def="AnimalJaw"]/groups
+		</xpath>
+
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Littluna Race/Patches/Littluna Race/Bodies/Littluna_Bodytype.xml b/ModPatches/Littluna Race/Patches/Littluna Race/Bodies/Littluna_Bodytype.xml
new file mode 100644
index 0000000000..1174d1e4fb
--- /dev/null
+++ b/ModPatches/Littluna Race/Patches/Littluna Race/Bodies/Littluna_Bodytype.xml	
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Nearmare Bodytype-->
+
+	<!--Arm Groups-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Littluna_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Littluna_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Littluna_Body"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Littluna_Body"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<!--Natural Armor-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Littluna_Body"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Littluna_Body"]/corePart/parts/li[def="Littluna_Wing"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Littluna_Body"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Littluna_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Littluna_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Littluna_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Littluna_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Littluna_Body"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Littluna_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Littluna_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Littluna_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Littluna_Body"]/corePart/parts/li[def="Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Littluna_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Littluna_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Littluna Race/Patches/Littluna Race/PawnKindDefs/Littluna_PawnKind.xml b/ModPatches/Littluna Race/Patches/Littluna Race/PawnKindDefs/Littluna_PawnKind.xml
new file mode 100644
index 0000000000..dc10d444ea
--- /dev/null
+++ b/ModPatches/Littluna Race/Patches/Littluna Race/PawnKindDefs/Littluna_PawnKind.xml	
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Ammo-->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			@Name="HAR_Littluna_KindBase"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Backpack-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CE_Apparel_Backpack"]/apparel/tags</xpath>
+		<value>
+			<li>HAR_LL_Apparel</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Littluna Race/Patches/Littluna Race/ThingDefs_Misc/Littluna_Apparel.xml b/ModPatches/Littluna Race/Patches/Littluna Race/ThingDefs_Misc/Littluna_Apparel.xml
new file mode 100644
index 0000000000..d16eca30c5
--- /dev/null
+++ b/ModPatches/Littluna Race/Patches/Littluna Race/ThingDefs_Misc/Littluna_Apparel.xml	
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--========= Stuffable =========-->
+
+	<!--Skin Layer minimum protection-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_LL_O_a"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.25</StuffEffectMultiplierArmor>
+			<Bulk>0.5</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_LL_T_a" or
+			defName="HAR_LL_T_b" or
+			defName="HAR_LL_T_c" or
+			defName="HAR_LL_T_e"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+			<Bulk>2</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Shell-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_LL_S_a" or
+			defName="HAR_LL_S_b" or
+			defName="HAR_LL_S_c" or
+			defName="HAR_LL_S_e"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>10</StuffEffectMultiplierArmor>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Overhead-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_LL_H_a" or
+			defName="HAR_LL_H_b" or
+			defName="HAR_LL_H_e"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_LL_H_c"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Littluna Race/Patches/Littluna Race/ThingDefs_Races/AlienRace_Littluna.xml b/ModPatches/Littluna Race/Patches/Littluna Race/ThingDefs_Races/AlienRace_Littluna.xml
new file mode 100644
index 0000000000..84dce38749
--- /dev/null
+++ b/ModPatches/Littluna Race/Patches/Littluna Race/ThingDefs_Races/AlienRace_Littluna.xml	
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="HAR_Littluna_BaseNRPawn"]/inspectorTabs/li[.="ITab_Pawn_Gear"]</xpath>
+		<value>
+			<li>CombatExtended.ITab_Inventory</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="HAR_Littluna_BaseNRPawn"]</xpath>
+		<value>
+			<comps>
+				<li>
+					<compClass>CombatExtended.CompPawnGizmo</compClass>
+				</li>
+				<li Class="CombatExtended.CompProperties_Suppressable"/>
+				<li Class="CombatExtended.CompProperties_Inventory"/>
+				<li Class="CombatExtended.CompProperties_TacticalManager"/>
+			</comps>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="HAR_Littluna_Race_Base"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="HAR_Littluna_Race_Base"]/statBases</xpath>
+		<value>
+			<Suppressability>1</Suppressability>
+			<SmokeSensitivity>1.2</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="HAR_Littluna_Race_Base"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.162</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.162</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="HAR_Littluna_Race_Base"]/alienRace/raceRestriction/whiteApparelList</xpath>
+		<value>
+			<li>CE_Apparel_TacVest</li>
+			<li>CE_Apparel_Backpack</li>
+			<li>CE_Apparel_TribalBackpack</li>
+			<li>CE_Apparel_BallisticShield</li>
+			<li>CE_Apparel_MeleeShield</li>
+			<li>CE_Apparel_GasMask</li>
+			<li>CE_Apparel_ImprovGasMask</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Littluna Race/Patches/Littluna Race/ThingDefs_Races/Race_Summons.xml b/ModPatches/Littluna Race/Patches/Littluna Race/ThingDefs_Races/Race_Summons.xml
new file mode 100644
index 0000000000..7908d7591b
--- /dev/null
+++ b/ModPatches/Littluna Race/Patches/Littluna Race/ThingDefs_Races/Race_Summons.xml	
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Super Summon -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="LL_Summon_PawnBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="LL_Summon_PawnBase"]/statBases</xpath>
+		<value>
+			<Suppressability>0</Suppressability>
+			<SmokeSensitivity>0</SmokeSensitivity>
+
+			<MeleeDodgeChance>0</MeleeDodgeChance>
+			<MeleeCritChance>3</MeleeCritChance>
+			<MeleeParryChance>3</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HAR_LL_M_a"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>ScratchToxic</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>6.25</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>ScratchToxic</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>6.25</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HAR_LL_M_a"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>600</ArmorRating_Sharp>
+			<ArmorRating_Electric>1</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HAR_LL_M_a"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1800</ArmorRating_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Logann/Patches/Logann/PawnKinds_Wolv.xml b/ModPatches/Logann/Patches/Logann/PawnKinds_Wolv.xml
new file mode 100644
index 0000000000..1b0f6531ea
--- /dev/null
+++ b/ModPatches/Logann/Patches/Logann/PawnKinds_Wolv.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Civilians ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="WolvxCivBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Security ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="WolvxSecurityGuard"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.2</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="WolvxMilBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.3</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.6</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="WolvxNinja"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Logann/Patches/Logann/Race_Wolvx.xml b/ModPatches/Logann/Patches/Logann/Race_Wolvx.xml
new file mode 100644
index 0000000000..9a345b31d7
--- /dev/null
+++ b/ModPatches/Logann/Patches/Logann/Race_Wolvx.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Wolvx"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Gives Gun Gizmos to Wolvx HUD thing ========== -->
+	<!-- ========== Also Makes Em Suppressable ========== -->
+	<!-- ========== Wait is it wolvx or logann ========== -->
+	<!-- ========== Question for the ages! \o/ ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="BaseWolvPawn"]</xpath>
+		<value>
+			<comps>
+				<li>
+					<compClass>CombatExtended.CompPawnGizmo</compClass>
+				</li>
+				<li Class="CombatExtended.CompProperties_Suppressable"/>
+			</comps>
+		</value>
+	</Operation>
+	<!-- ========== Patch Wolvx Melee Attacks ========== -->
+	<!-- ========== Big fuckin large boys (and girls) ========== -->
+	<!-- ========== Hit hard, and prefer to hit hard ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Wolvx"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.8</AimingAccuracy>
+			<MeleeDodgeChance>0.8</MeleeDodgeChance>
+			<MeleeCritChance>1.75</MeleeCritChance>
+			<MeleeParryChance>1.75</MeleeParryChance>
+			<ReloadSpeed>0.8</ReloadSpeed>
+			<Suppressability>0.15</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Wolvx"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.0</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2.5</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.40</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== BaseBodySize, ArmorRatings, MoveSpeed, and BaseHealth are already set. I think. ========== -->
+	<!-- ========== Thanks Xenn! ========== -->
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Logann/Patches/Logann/Wolv_Weapons.xml b/ModPatches/Logann/Patches/Logann/Wolv_Weapons.xml
new file mode 100644
index 0000000000..d309bca082
--- /dev/null
+++ b/ModPatches/Logann/Patches/Logann/Wolv_Weapons.xml
@@ -0,0 +1,232 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Wolverine Supershotgun -->
+	<!-- Big dumb shotgun for big dumb animals -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_WolvShotgun</defName>
+		<statBases>
+			<Bulk>8</Bulk>
+			<Mass>5</Mass>
+			<SwayFactor>0.5</SwayFactor>
+			<ShotSpread>0.16</ShotSpread>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<WorkToMake>31000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>45</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>4</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>Shot_Shotgun</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>5.2</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>WolvWep</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_WolvShotgun"]/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>bayonet</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.38</cooldownTime>
+					<armorPenetrationBlunt>1.08</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.72</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- To be expected from a gun designed by wild animals -->
+
+	<!-- ========== Wolverine Katana ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Wolv_Katana"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Wolv_Katana"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1</MeleeCritChance>
+				<MeleeParryChance>0.8</MeleeParryChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Wolv_Katana"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1</cooldownTime>
+					<armorPenetration>0.15</armorPenetration>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Wolverine Axe ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Wolv_Axe"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Wolv_Axe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.3</MeleeCritChance>
+				<MeleeParryChance>1.6</MeleeParryChance>
+				<MeleeDodgeChance>0.56</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Wolv_Axe"]/tools</xpath>
+		<value>
+			<tools>
+				<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>
+	</Operation>
+
+	<!-- ========== Wolverine Mace ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Wolv_Mace"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Wolv_Mace"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.8</MeleeCritChance>
+				<MeleeParryChance>0.7</MeleeParryChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Wolv_Mace"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>3.51</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>9.375</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Wolverine Sword ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Wolv_Sword"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Wolv_Sword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1</MeleeCritChance>
+				<MeleeParryChance>1.5</MeleeParryChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Wolv_Sword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Logistics_Mechanoid/Patches/Logistics_Mechanoid/Bodies_Mechanoid_Heavy.xml b/ModPatches/Logistics_Mechanoid/Patches/Logistics_Mechanoid/Bodies_Mechanoid_Heavy.xml
new file mode 100644
index 0000000000..0c00e7f506
--- /dev/null
+++ b/ModPatches/Logistics_Mechanoid/Patches/Logistics_Mechanoid/Bodies_Mechanoid_Heavy.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==================== Logistic Mech ==================== -->
+
+	<!-- ========== Add groups entry if it doesn't exist already ========== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/parts/li[def="MechanicalNeck"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/parts/li[def="MechanicalShoulder"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="PowerClaw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="PowerClaw"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/parts/li[def="MechanicalLeg"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<!-- ========== Add armor coverage ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="PowerClaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Logistics_Mechanoid/Patches/Logistics_Mechanoid/MeleeMechanoid.xml b/ModPatches/Logistics_Mechanoid/Patches/Logistics_Mechanoid/MeleeMechanoid.xml
new file mode 100644
index 0000000000..cd8d8f2eb9
--- /dev/null
+++ b/ModPatches/Logistics_Mechanoid/Patches/Logistics_Mechanoid/MeleeMechanoid.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Hydraulic Claws -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "MeleeWeapon_HydraulicClaw"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.28</MeleeCounterParryBonus>
+			<Bulk>0</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_HydraulicClaw"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>base</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>3.51</cooldownTime>
+					<armorPenetrationBlunt>13</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>pincer</label>
+					<labelUsedInLogging>false</labelUsedInLogging>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>3.51</cooldownTime>
+					<armorPenetrationBlunt>13</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Logistics_Mechanoid/Patches/Logistics_Mechanoid/Races_Mechanoids_Heavy.xml b/ModPatches/Logistics_Mechanoid/Patches/Logistics_Mechanoid/Races_Mechanoids_Heavy.xml
new file mode 100644
index 0000000000..0ca19a06c9
--- /dev/null
+++ b/ModPatches/Logistics_Mechanoid/Patches/Logistics_Mechanoid/Races_Mechanoids_Heavy.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Logistics ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Mech_Logistic"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Logistic"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Logistic"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Mech_Logistic"]/statBases</xpath>
+		<value>
+			<CarryWeight>250</CarryWeight>
+			<CarryBulk>60</CarryBulk>
+			<MeleeDodgeChance>0.09</MeleeDodgeChance>
+			<MeleeCritChance>0.21</MeleeCritChance>
+			<MeleeParryChance>0.44</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Logistic"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.51</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MH Android Tiers Core/Patches/MH Android Tiers Core/Hediffs/Hediffs_Android.xml b/ModPatches/MH Android Tiers Core/Patches/MH Android Tiers Core/Hediffs/Hediffs_Android.xml
new file mode 100644
index 0000000000..465c766f8c
--- /dev/null
+++ b/ModPatches/MH Android Tiers Core/Patches/MH Android Tiers Core/Hediffs/Hediffs_Android.xml	
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ATR_CombatAssistant"]/stages/li/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.25</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ATR_CombatAssistant"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>1.0</ShootingAccuracyPawn>
+			<AimingAccuracy>0.4</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ATR_CombatAssistant"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ATR_PlatingPlasteel"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ATR_PlatingPlasteel"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ATR_CompositePlating"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+			<ArmorRating_Heat>0.1</ArmorRating_Heat>
+			<ArmorRating_Electric>0.1</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ATR_CompositePlating"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ATR_HydraulicFrame"]/stages/li/statOffsets</xpath>
+		<value>
+			<CarryWeight>10</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ATR_MobilityFrame"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.5</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ATR_SuppressorFrame"]/stages/li/statOffsets</xpath>
+		<value>
+			<Suppressability>1</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ATR_MiningArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>drill</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.25</cooldownTime>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ATR_AgriArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>scythe</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.25</cooldownTime>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ATR_PacificationArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>charged fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.0</cooldownTime>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>10</amount>
+						</li>
+						<li>
+							<def>EMP</def>
+							<amount>5</amount>
+						</li>
+					</extraMeleeDamages>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ATR_ScalpelArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>scalpel</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationSharp>1.0</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>scalpel</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.0</cooldownTime>
+					<armorPenetrationSharp>8</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ATR_RendingArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>carver</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>1.25</cooldownTime>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>carver</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>0.75</cooldownTime>
+					<armorPenetrationSharp>20</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>carver</label>
+					<capacities>
+						<li>Demolish</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2.0</cooldownTime>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ATR_MakeshiftMechArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ATR_AdvancedArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.25</cooldownTime>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MH Android Tiers/Patches/MH Android Tiers/PawnkindDefs/PawnKinds_Android.xml b/ModPatches/MH Android Tiers/Patches/MH Android Tiers/PawnkindDefs/PawnKinds_Android.xml
new file mode 100644
index 0000000000..43ad6988c8
--- /dev/null
+++ b/ModPatches/MH Android Tiers/Patches/MH Android Tiers/PawnkindDefs/PawnKinds_Android.xml	
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="ATR_RaiderSoldierT1" or
+			defName="ATR_RaiderSoldierT2" or
+			defName="ATR_AndroidT2CollectiveTrader" or
+			defName="ATR_AndroidT1CollectiveSoldier" or
+			defName="ATR_AndroidT2CollectiveSoldier"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>3</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>20</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="ATR_RaiderSoldierT3" or
+			defName="ATR_RaiderSoldierT4" or
+			defName="ATR_AndroidT3CollectiveSoldier" or
+			defName="ATR_AndroidT4CollectiveSoldier" or
+			defName="ATR_AndroidT4CollectiveLeader"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.25</generateChance>
+						<sidearmMoney>
+							<min>20</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+					<li>
+						<generateChance>0.075</generateChance>
+						<sidearmMoney>
+							<min>80</min>
+							<max>160</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_FlareLauncher</li>
+						</weaponTags>
+						<magazineCount>
+							<min>1</min>
+							<max>1</max>
+						</magazineCount>
+					</li>
+					<li>
+						<generateChance>0.125</generateChance>
+						<sidearmMoney>
+							<min>10</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>GrenadeDestructive</li>
+						</weaponTags>
+						<magazineCount>
+							<min>1</min>
+							<max>1</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MH Android Tiers/Patches/MH Android Tiers/ScenarioDefs/Scenarios_Androids.xml b/ModPatches/MH Android Tiers/Patches/MH Android Tiers/ScenarioDefs/Scenarios_Androids.xml
new file mode 100644
index 0000000000..22c16a0b53
--- /dev/null
+++ b/ModPatches/MH Android Tiers/Patches/MH Android Tiers/ScenarioDefs/Scenarios_Androids.xml	
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Add ammo to scenario === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="ATR_CrashlandedAndroids"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_303British_FMJ</thingDef>
+				<count>100</count>
+			</li>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_44Magnum_FMJ</thingDef>
+				<count>60</count>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MH Android Tiers/Patches/MH Android Tiers/ThingDef_Misc/Apparel_Packs.xml b/ModPatches/MH Android Tiers/Patches/MH Android Tiers/ThingDef_Misc/Apparel_Packs.xml
new file mode 100644
index 0000000000..581d042cf7
--- /dev/null
+++ b/ModPatches/MH Android Tiers/Patches/MH Android Tiers/ThingDef_Misc/Apparel_Packs.xml	
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ATR_Apparel_ScorchPack"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Shoulders</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ATR_Apparel_ScorchPack"]/apparel/layers</xpath>
+		<value>
+			<li>Backpack</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ATR_Apparel_ScorchPack"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MH Android Tiers/Patches/MH Android Tiers/ThingDef_Races/AlienRace_Androids.xml b/ModPatches/MH Android Tiers/Patches/MH Android Tiers/ThingDef_Races/AlienRace_Androids.xml
new file mode 100644
index 0000000000..e408d41626
--- /dev/null
+++ b/ModPatches/MH Android Tiers/Patches/MH Android Tiers/ThingDef_Races/AlienRace_Androids.xml	
@@ -0,0 +1,366 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Test for comps-->
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier1Android"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier1Android"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier2Android"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier2Android"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier3Android"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier3Android"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier4Android"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier4Android"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier1Android" or
+			defName="ATR_Tier2Android" or
+			defName="ATR_Tier3Android" or
+			defName="ATR_Tier4Android"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier1Android" or
+			defName="ATR_Tier2Android" or
+			defName="ATR_Tier3Android" or
+			defName="ATR_Tier4Android"
+			]/comps </xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li>
+				<compClass>CombatExtended.CompAmmoGiver</compClass>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier2Android" or
+			defName="ATR_Tier3Android" or
+			defName="ATR_Tier4Android"
+			]/comps </xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<!--T1-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier1Android"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			<MeleeCritChance>0.5</MeleeCritChance>
+			<MeleeParryChance>0.5</MeleeParryChance>
+			<SmokeSensitivity>0.5</SmokeSensitivity>
+			<AimingAccuracy>0.75</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier1Android"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.0</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier1Android"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier1Android"]/race/baseBodySize</xpath>
+		<value>
+			<baseBodySize>0.8</baseBodySize>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier1Android"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>2.14</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.245</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>2.14</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.245</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>5.61</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.40</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--T2-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier2Android"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.8</MeleeDodgeChance>
+			<MeleeCritChance>0.8</MeleeCritChance>
+			<MeleeParryChance>0.8</MeleeParryChance>
+			<Suppressability>0.15</Suppressability>
+			<AimingAccuracy>0.9</AimingAccuracy>
+			<SmokeSensitivity>0.25</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier2Android"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier2Android"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier2Android"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.67</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.67</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier2Android"]/race/baseBodySize</xpath>
+		<value>
+			<baseBodySize>1</baseBodySize>
+		</value>
+	</Operation>
+
+	<!--T3-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier3Android"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency>0.25</NightVisionEfficiency>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1.1</MeleeCritChance>
+			<MeleeParryChance>1.1</MeleeParryChance>
+			<Suppressability>0.2</Suppressability>
+			<SmokeSensitivity>0</SmokeSensitivity>
+			<CarryWeight>45</CarryWeight>
+			<CarryBulk>22.5</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier3Android"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier3Android"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier3Android"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.44</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.44</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.8</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--T4-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier4Android"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency>0.4</NightVisionEfficiency>
+			<AimingAccuracy>1.1</AimingAccuracy>
+			<MeleeDodgeChance>1.2</MeleeDodgeChance>
+			<MeleeCritChance>1.2</MeleeCritChance>
+			<MeleeParryChance>1.2</MeleeParryChance>
+			<Suppressability>0.33</Suppressability>
+			<SmokeSensitivity>0</SmokeSensitivity>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>25</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier4Android"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier4Android"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>7.8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier4Android"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.11</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.68</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.11</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.68</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MH Android Tiers/Patches/MH Android Tiers/TraderKindDefs/Android_TraderKinds.xml b/ModPatches/MH Android Tiers/Patches/MH Android Tiers/TraderKindDefs/Android_TraderKinds.xml
new file mode 100644
index 0000000000..7499a778d4
--- /dev/null
+++ b/ModPatches/MH Android Tiers/Patches/MH Android Tiers/TraderKindDefs/Android_TraderKinds.xml	
@@ -0,0 +1,320 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Android Base ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="ATR_Base_AndroidCollective_Standard"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>FSX</thingDef>
+				<countRange>
+					<min>25</min>
+					<max>100</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>Prometheum</thingDef>
+				<countRange>
+					<min>25</min>
+					<max>100</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Ammo</tradeTag>
+				<countRange>
+					<min>500</min>
+					<max>2000</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>5</min>
+					<max>9</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_MediumAmmo</tradeTag>
+				<countRange>
+					<min>30</min>
+					<max>100</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>5</min>
+					<max>8</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_HeavyAmmo</tradeTag>
+				<countRange>
+					<min>10</min>
+					<max>50</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>4</min>
+					<max>6</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Category">
+				<categoryDef>Ammo</categoryDef>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>0</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Turret</tradeTag>
+				<thingDefCountRange>
+					<min>-2</min>
+					<max>4</max>
+				</thingDefCountRange>
+				<countRange>
+					<min>1</min>
+					<max>2</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_Category">
+				<categoryDef>WeaponsTurrets</categoryDef>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>0</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Animals">
+				<tradeTagsSell>
+					<li>CE_AnimalBoom</li>
+				</tradeTagsSell>
+				<tradeTagsBuy>
+					<li>CE_AnimalBoom</li>
+				</tradeTagsBuy>
+				<kindCountRange>
+					<min>1</min>
+					<max>2</max>
+				</kindCountRange>
+				<countRange>
+					<min>-2</min>
+					<max>4</max>
+				</countRange>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Andro Caravan ========== -->
+
+	<!-- Pirate Merchant and Bulk Goods ammo -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="ATR_Caravan_AndroidCollective_BulkGoods" or defName="Caravan_AndroidCollective_AndroidMerchant" or defName="Caravan_AndroidCollective_HighTech"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Ammo</tradeTag>
+				<countRange>
+					<min>200</min>
+					<max>400</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>1</min>
+					<max>4</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_MediumAmmo</tradeTag>
+				<countRange>
+					<min>20</min>
+					<max>40</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>2</min>
+					<max>6</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_HeavyAmmo</tradeTag>
+				<countRange>
+					<min>5</min>
+					<max>10</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>2</min>
+					<max>4</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Category">
+				<categoryDef>Ammo</categoryDef>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>0</max>
+				</thingDefCountRange>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="ATR_Caravan_AndroidCollective_BulkGoods"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>FSX</thingDef>
+				<countRange>
+					<min>25</min>
+					<max>65</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>Prometheum</thingDef>
+				<countRange>
+					<min>25</min>
+					<max>65</max>
+				</countRange>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Combat Supplier -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="Caravan_AndroidCollective_CombatSupplier"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>FSX</thingDef>
+				<countRange>
+					<min>15</min>
+					<max>40</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>Prometheum</thingDef>
+				<countRange>
+					<min>15</min>
+					<max>40</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Ammo</tradeTag>
+				<countRange>
+					<min>400</min>
+					<max>1000</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>3</min>
+					<max>8</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_MediumAmmo</tradeTag>
+				<countRange>
+					<min>30</min>
+					<max>60</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>3</min>
+					<max>6</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_HeavyAmmo</tradeTag>
+				<countRange>
+					<min>10</min>
+					<max>15</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>4</min>
+					<max>6</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Category">
+				<categoryDef>Ammo</categoryDef>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>0</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Turret</tradeTag>
+				<thingDefCountRange>
+					<min>-4</min>
+					<max>2</max>
+				</thingDefCountRange>
+				<countRange>
+					<min>1</min>
+					<max>1</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_Category">
+				<categoryDef>WeaponsTurrets</categoryDef>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>0</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Animals">
+				<tradeTagsSell>
+					<li>CE_AnimalBoom</li>
+				</tradeTagsSell>
+				<tradeTagsBuy>
+					<li>CE_AnimalBoom</li>
+				</tradeTagsBuy>
+				<kindCountRange>
+					<min>1</min>
+					<max>1</max>
+				</kindCountRange>
+				<countRange>
+					<min>-1</min>
+					<max>2</max>
+				</countRange>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Orbital Mechanized Trader -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="ATR_Orbital_Mechanized"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Ammo</tradeTag>
+				<countRange>
+					<min>400</min>
+					<max>1000</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>2</min>
+					<max>4</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_MediumAmmo</tradeTag>
+				<countRange>
+					<min>60</min>
+					<max>120</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>4</min>
+					<max>7</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_HeavyAmmo</tradeTag>
+				<countRange>
+					<min>15</min>
+					<max>50</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>2</min>
+					<max>4</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Category">
+				<categoryDef>Ammo</categoryDef>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>0</max>
+				</thingDefCountRange>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MH Mechanical Biomimetics/Defs/MH Mechanical Biomimetics/Ammo_SwarmShell.xml b/ModPatches/MH Mechanical Biomimetics/Defs/MH Mechanical Biomimetics/Ammo_SwarmShell.xml
new file mode 100644
index 0000000000..44473f628e
--- /dev/null
+++ b/ModPatches/MH Mechanical Biomimetics/Defs/MH Mechanical Biomimetics/Ammo_SwarmShell.xml	
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- Ammo Category -->
+	<CombatExtended.AmmoCategoryDef>
+		<defName>SwarmShell</defName>
+		<label>swarm shell</label>
+		<description>Releases several pre-programmed microscythers on impact.</description>
+		<advanced>true</advanced>
+	</CombatExtended.AmmoCategoryDef>
+
+	<!-- Ammo -->
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBaseCraftableBase">
+		<defName>Swarm_shell_81mm</defName>
+		<label>81mm mortar shell (Swarm)</label>
+		<graphicData>
+			<texPath>Things/Items/Shells/Microscyther_shell</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>60</MarketValue>
+			<Mass>4.1</Mass>
+			<Bulk>11.34</Bulk>
+		</statBases>
+		<ammoClass>SwarmShell</ammoClass>
+		<comps>
+			<li Class="CompProperties_Explosive">
+				<explosiveRadius>2</explosiveRadius>
+				<explosiveDamageType>Smoke</explosiveDamageType>
+				<explosiveExpandPerStackcount>0.4</explosiveExpandPerStackcount>
+				<startWickHitPointsPercent>0.333</startWickHitPointsPercent>
+				<postExplosionSpawnThingDef>Filth_FireFoam</postExplosionSpawnThingDef>
+				<postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<explosionEffect>ExtinguisherExplosion</explosionEffect>
+				<wickTicks>
+					<min>10</min>
+					<max>30</max>
+				</wickTicks>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- Projectile -->
+	<ThingDef ParentName="Base81mmMortarShell">
+		<defName>Bullet_81mmMortarShell_Swarm</defName>
+		<label>81mm mortar shell (Swarm)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Mortar/EMP</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Smoke</damageDef>
+			<suppressionFactor>0.0</suppressionFactor>
+			<dangerFactor>0.0</dangerFactor>
+			<damageAmountBase>0</damageAmountBase>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>39.493</armorPenetrationBlunt>
+			<explosionRadius>1.9</explosionRadius>
+			<soundExplode>Explosion_EMP</soundExplode>
+			<postExplosionSpawnThingDef>ATB_MicroScytherGenerator</postExplosionSpawnThingDef>
+			<postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<explosionEffect>ExtinguisherExplosion</explosionEffect>
+		</projectile>
+	</ThingDef>
+
+	<!-- Recipe -->
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeSwarm_shell_81mm</defName>
+		<label>make 81mm Swarm mortar shell x1</label>
+		<description>Craft 1 81mm Swarm shell.</description>
+		<jobString>Making 81mm Swarm shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>50</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Swarm_shell_81mm>1</Swarm_shell_81mm>
+		</products>
+		<workAmount>3000</workAmount>
+		<recipeUsers Inherit="False">
+			<li>ATR_MechanicalAssemblyPod</li>
+		</recipeUsers>
+		<researchPrerequisite>ATB_MilitaryBiomimetics</researchPrerequisite>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/MH Mechanical Biomimetics/Patches/MH Mechanical Biomimetics/Ammo/81mmMortar_SwarmShell.xml b/ModPatches/MH Mechanical Biomimetics/Patches/MH Mechanical Biomimetics/Ammo/81mmMortar_SwarmShell.xml
new file mode 100644
index 0000000000..a38c09ccde
--- /dev/null
+++ b/ModPatches/MH Mechanical Biomimetics/Patches/MH Mechanical Biomimetics/Ammo/81mmMortar_SwarmShell.xml	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_81mmMortarShell"]/ammoTypes</xpath>
+		<value>
+			<Swarm_shell_81mm>Bullet_81mmMortarShell_Swarm</Swarm_shell_81mm>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="ATB_MicroscytherShell"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATB_TrapIED_Microscyther"]/costList</xpath>
+		<value>
+			<costList>
+				<Swarm_shell_81mm>2</Swarm_shell_81mm>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>MH: Android Tiers</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationRemove">
+					<xpath>Defs/TraderKindDef[defName="ATR_Orbital_Mechanized"]/stockGenerators/li[thingDef="ATB_MicroscytherShell"]</xpath>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MH Mechanical Biomimetics/Patches/MH Mechanical Biomimetics/Bodies/Bodies_Animal_Airborne.xml b/ModPatches/MH Mechanical Biomimetics/Patches/MH Mechanical Biomimetics/Bodies/Bodies_Animal_Airborne.xml
new file mode 100644
index 0000000000..ce0d0bd295
--- /dev/null
+++ b/ModPatches/MH Mechanical Biomimetics/Patches/MH Mechanical Biomimetics/Bodies/Bodies_Animal_Airborne.xml	
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATB_MechAirborne"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATB_MechAirborne"]/corePart/parts/li[def="ATR_Framework"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATB_MechAirborne"]/corePart/parts/li[def="ATR_MechanicalNeck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATB_MechAirborne"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATB_MechAirborne"]/corePart/parts/li[def="ATR_MechanicalWing"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATB_MechAirborne"]/corePart/parts/li[def="ATR_MechanicalPropeller"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATB_MechAirborne"]/corePart/parts/li[def="ATR_MechanicalPropeller"]/parts/li[def="ATR_CounterWeightTop"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MH Mechanical Biomimetics/Patches/MH Mechanical Biomimetics/Bodies/Bodies_Animal_Bipedal.xml b/ModPatches/MH Mechanical Biomimetics/Patches/MH Mechanical Biomimetics/Bodies/Bodies_Animal_Bipedal.xml
new file mode 100644
index 0000000000..82aab72269
--- /dev/null
+++ b/ModPatches/MH Mechanical Biomimetics/Patches/MH Mechanical Biomimetics/Bodies/Bodies_Animal_Bipedal.xml	
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATB_MechBipedal"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATB_MechBipedal"]/corePart/parts/li[def="ATR_Framework"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATB_MechBipedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATB_MechBipedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATB_MechBipedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_MechanicalAudioSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATB_MechBipedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_SmellSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATB_MechBipedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_MechanicalJaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATB_MechBipedal"]/corePart/parts/li[def="ATR_MechanicalLeg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATB_MechBipedal"]/corePart/parts/li[def="ATR_MechanicalLeg"]/parts/li[def="ATR_MechanicalFoot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="ATB_MechBipedal"]//*[
+			def="ATR_MechanicalJaw" or
+			def="ATR_SmellSensor" or
+			def="ATR_MechanicalVisualSensor"]/groups
+		</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MH Mechanical Biomimetics/Patches/MH Mechanical Biomimetics/Bodies/Bodies_Animal_Quadrupedal.xml b/ModPatches/MH Mechanical Biomimetics/Patches/MH Mechanical Biomimetics/Bodies/Bodies_Animal_Quadrupedal.xml
new file mode 100644
index 0000000000..857f10aeae
--- /dev/null
+++ b/ModPatches/MH Mechanical Biomimetics/Patches/MH Mechanical Biomimetics/Bodies/Bodies_Animal_Quadrupedal.xml	
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="ATB_MechQuadrupedal"]/corePart/parts/li[12]/parts/li[def="ATR_MechanicalFoot"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="ATB_MechQuadrupedal"]/corePart/parts/li[12]/parts/li[def="ATR_MechanicalFoot"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="ATB_MechQuadrupedal"]/corePart/parts/li[13]/parts/li[def="ATR_MechanicalFoot"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="ATB_MechQuadrupedal"]/corePart/parts/li[13]/parts/li[def="ATR_MechanicalFoot"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATB_MechQuadrupedal"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATB_MechQuadrupedal"]/corePart/parts/li[def="ATR_Framework"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATB_MechQuadrupedal"]/corePart/parts/li[def="ATR_CounterWeightTail"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATB_MechQuadrupedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATB_MechQuadrupedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATB_MechQuadrupedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_MechanicalAudioSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATB_MechQuadrupedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_SmellSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATB_MechQuadrupedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_MechanicalJaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATB_MechQuadrupedal"]/corePart/parts/li[def="ATR_MechanicalLeg"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATB_MechQuadrupedal"]/corePart/parts/li[def="ATR_MechanicalLeg"]/parts/li[def="ATR_MechanicalFoot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="ATB_MechQuadrupedal"]//*[
+			def="ATR_MechanicalJaw" or
+			def="ATR_SmellSensor" or
+			def="ATR_MechanicalVisualSensor"]/groups
+		</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MH Mechanical Biomimetics/Patches/MH Mechanical Biomimetics/ThingDef_Races/Races_Animals.xml b/ModPatches/MH Mechanical Biomimetics/Patches/MH Mechanical Biomimetics/ThingDef_Races/Races_Animals.xml
new file mode 100644
index 0000000000..83566381f7
--- /dev/null
+++ b/ModPatches/MH Mechanical Biomimetics/Patches/MH Mechanical Biomimetics/ThingDef_Races/Races_Animals.xml	
@@ -0,0 +1,339 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Bodytype-->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ATB_MicroScyther"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ATB_DroneTORT" or
+			defName="ATB_DroneMineralUnit" or
+			defName="ATB_DroneNutritionUnit" or
+			defName="ATB_DroneWatchdog"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ATB_DroneChemUnit"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Micro Scyther-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ATB_MicroScyther"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.26</MeleeDodgeChance>
+			<MeleeCritChance>0.03</MeleeCritChance>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATB_MicroScyther"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left wing</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.54</cooldownTime>
+					<linkedBodyPartsGroup>ATB_MechanicalLeftWing</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.303</armorPenetrationBlunt>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>right wing</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.54</cooldownTime>
+					<linkedBodyPartsGroup>ATB_MechanicalRightWing</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.303</armorPenetrationBlunt>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.05</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Chemical Processing Unit-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ATB_DroneChemUnit"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.0</MeleeCritChance>
+			<SmokeSensitivity>0.05</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATB_DroneChemUnit"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Mineral unit -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ATB_DroneMineralUnit"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.08</MeleeDodgeChance>
+			<MeleeCritChance>0.13</MeleeCritChance>
+			<MeleeParryChance>0.18</MeleeParryChance>
+			<SmokeSensitivity>0.05</SmokeSensitivity>
+			<CarryWeight>60</CarryWeight>
+			<CarryBulk>30</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATB_DroneMineralUnit"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Nutrition unit -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ATB_DroneNutritionUnit"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			<MeleeCritChance>0.28</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
+			<SmokeSensitivity>0.05</SmokeSensitivity>
+			<CarryWeight>60</CarryWeight>
+			<CarryBulk>30</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATB_DroneNutritionUnit"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- TORT unit -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ATB_DroneTORT"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.17</MeleeDodgeChance>
+			<MeleeCritChance>0.23</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+			<SmokeSensitivity>0.05</SmokeSensitivity>
+			<CarryWeight>100</CarryWeight>
+			<CarryBulk>50</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATB_DroneTORT"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATB_DroneTORT"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATB_DroneTORT"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATB_DroneTORT"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!-- Watchdog unit -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ATB_DroneWatchdog"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.16</MeleeDodgeChance>
+			<MeleeCritChance>0.21</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+			<SmokeSensitivity>0</SmokeSensitivity>
+			<CarryWeight>60</CarryWeight>
+			<CarryBulk>30</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATB_DroneWatchdog"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATB_DroneWatchdog"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATB_DroneWatchdog"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>26</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.475</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>26</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.475</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.5</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>32</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>12.8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2.5</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MH Military Tiers/Defs/MH Military Tiers/Ammo/RotaryShrapnelcannonShell.xml b/ModPatches/MH Military Tiers/Defs/MH Military Tiers/Ammo/RotaryShrapnelcannonShell.xml
new file mode 100644
index 0000000000..7af54f655d
--- /dev/null
+++ b/ModPatches/MH Military Tiers/Defs/MH Military Tiers/Ammo/RotaryShrapnelcannonShell.xml	
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>AmmoRotaryShrapnelcannonShell</defName>
+		<label>Rotary Shrapnelcannon shell</label>
+		<parent>AmmoShotguns</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberShotgun</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_RotaryShrapnelcannonShell</defName>
+		<label>Rotary Shrapnelcannon shell</label>
+		<ammoTypes>
+			<Ammo_RotaryShrapnelcannonShell>Bullet_RotaryShrapnelcannonShell</Ammo_RotaryShrapnelcannonShell>
+		</ammoTypes>
+		<similarTo>AmmoSet_Shotgun</similarTo>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="RotaryShrapnelcannonShellBase" ParentName="HeavyAmmoBase" Abstract="True">
+		<description>Very large caliber buckshot shell designed specifically for the mech-operated Rotary Shrapnelcannon.</description>
+		<statBases>
+			<Mass>1.072</Mass>
+			<Bulk>5.9</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoRotaryShrapnelcannonShell</li>
+		</thingCategories>
+		<stackLimit>25</stackLimit>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="RotaryShrapnelcannonShellBase">
+		<defName>Ammo_RotaryShrapnelcannonShell</defName>
+		<label>Shrapnelcannon shell (Buck)</label>
+		<graphicData>
+			<texPath>ThirdParty/Android Tiers/ShrapnelcannonShell</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>4.37</MarketValue>
+		</statBases>
+		<ammoClass>BuckShot</ammoClass>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base12GaugeBullet">
+		<defName>Bullet_RotaryShrapnelcannonShell</defName>
+		<label>Shrapnelcannon buckshot pellet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shotgun_Pellet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>117</speed>
+			<damageAmountBase>57</damageAmountBase>
+			<damageDef>Fragment</damageDef>
+			<pelletCount>6</pelletCount>
+			<armorPenetrationSharp>12</armorPenetrationSharp>
+			<armorPenetrationBlunt>526.34</armorPenetrationBlunt>
+			<spreadMult>7.9</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_RotaryShrapnelcannonShell</defName>
+		<label>make Shrapnelcannon (Buck) shell x10</label>
+		<description>Craft 10 Shrapnelcannon (Buck) shells.</description>
+		<jobString>Making Shrapnelcannon (Buck) shells.</jobString>
+		<workAmount>2200</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_RotaryShrapnelcannonShell>10</Ammo_RotaryShrapnelcannonShell>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/MH Military Tiers/Patches/MH Military Tiers/Bodies/Bodies_MK1.xml b/ModPatches/MH Military Tiers/Patches/MH Military Tiers/Bodies/Bodies_MK1.xml
new file mode 100644
index 0000000000..3b52dd3a6b
--- /dev/null
+++ b/ModPatches/MH Military Tiers/Patches/MH Military Tiers/Bodies/Bodies_MK1.xml	
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark1Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[customLabel="left shoulder"]/groups</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark1Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[customLabel="right shoulder"]/groups</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark1Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalShoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark1Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalShoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark1Body"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark1Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark1Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_Framework"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark1Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalHead"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark1Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_VoiceSynthesizer"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark1Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_MechanicalAudioSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark1Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_SmellSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark1Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalShoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark1Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalShoulder"]/parts/li[def="ATR_MechanicalArm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark1Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalShoulder"]/parts/li[def="ATR_MechanicalArm"]/parts/li[def="ATR_MechanicalHand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark1Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalShoulder"]/parts/li[def="ATR_MechanicalArm"]/parts/li[def="ATR_MechanicalHand"]/parts/li[def="ATR_MechanicalFinger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark1Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalLeg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark1Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalLeg"]/parts/li[def="ATR_MechanicalFoot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="ATM_Mark1Body"]//*[
+			def="ATR_VoiceSynthesizer" or
+			def="ATR_SmellSensor" or
+			def="ATR_MechanicalVisualSensor"]/groups
+		</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MH Military Tiers/Patches/MH Military Tiers/Bodies/Bodies_MK2.xml b/ModPatches/MH Military Tiers/Patches/MH Military Tiers/Bodies/Bodies_MK2.xml
new file mode 100644
index 0000000000..014e8102be
--- /dev/null
+++ b/ModPatches/MH Military Tiers/Patches/MH Military Tiers/Bodies/Bodies_MK2.xml	
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark2Body"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark2Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark2Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_Framework"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark2Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalHead"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark2Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_VoiceSynthesizer"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark2Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_MechanicalAudioSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark2Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_SmellSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark2Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATM_MechanicalLimb"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark2Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATM_MechanicalLimb"]/parts/li[def="ATM_MechanicalManipulator"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="ATM_Mark2Body"]//*[
+			def="ATR_VoiceSynthesizer" or
+			def="ATR_SmellSensor" or
+			def="ATR_MechanicalVisualSensor"]/groups
+		</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MH Military Tiers/Patches/MH Military Tiers/Bodies/Bodies_MK3.xml b/ModPatches/MH Military Tiers/Patches/MH Military Tiers/Bodies/Bodies_MK3.xml
new file mode 100644
index 0000000000..c0f29f76d3
--- /dev/null
+++ b/ModPatches/MH Military Tiers/Patches/MH Military Tiers/Bodies/Bodies_MK3.xml	
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark3Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[customLabel="left shoulder"]/groups</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark3Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[customLabel="right shoulder"]/groups</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark3Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalShoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark3Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalShoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark3Body"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark3Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark3Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_Framework"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark3Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalHead"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark3Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_VoiceSynthesizer"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark3Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_MechanicalAudioSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark3Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_SmellSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark3Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalShoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark3Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalShoulder"]/parts/li[def="ATR_MechanicalArm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark3Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalShoulder"]/parts/li[def="ATR_MechanicalArm"]/parts/li[def="ATR_MechanicalHand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark3Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalShoulder"]/parts/li[def="ATR_MechanicalArm"]/parts/li[def="ATR_MechanicalHand"]/parts/li[def="ATR_MechanicalFinger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark3Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATM_MechanicalLimb"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark3Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATM_MechanicalLimb"]/parts/li[def="ATM_MechanicalManipulator"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="ATM_Mark3Body"]//*[
+			def="ATR_VoiceSynthesizer" or
+			def="ATR_SmellSensor" or
+			def="ATR_MechanicalVisualSensor"]/groups
+		</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MH Military Tiers/Patches/MH Military Tiers/Bodies/Bodies_MK4.xml b/ModPatches/MH Military Tiers/Patches/MH Military Tiers/Bodies/Bodies_MK4.xml
new file mode 100644
index 0000000000..b3f681e94a
--- /dev/null
+++ b/ModPatches/MH Military Tiers/Patches/MH Military Tiers/Bodies/Bodies_MK4.xml	
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark4Body"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark4Body"]/corePart/parts/li[def="ATM_MechaniteTorso"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ATM_Mark4Body"]/corePart/parts/li[def="ATM_MechaniteTorso"]/parts/li[def="ATM_MechaniteHead"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="ATM_Mark4Body"]//*[
+			def="ATR_VoiceSynthesizer" or
+			def="ATR_SmellSensor" or
+			def="ATR_MechanicalVisualSensor"]/groups
+		</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MH Military Tiers/Patches/MH Military Tiers/PawnkindDefs/PawnKinds_Android.xml b/ModPatches/MH Military Tiers/Patches/MH Military Tiers/PawnkindDefs/PawnKinds_Android.xml
new file mode 100644
index 0000000000..e90be08f64
--- /dev/null
+++ b/ModPatches/MH Military Tiers/Patches/MH Military Tiers/PawnkindDefs/PawnKinds_Android.xml	
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>MH: Android Tiers</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/PawnKindDef[
+						defName="ATM_M1WarriorUnion" or
+						defName="ATM_M2BishopUnion"
+						] </xpath>
+					<value>
+						<li Class="CombatExtended.LoadoutPropertiesExtension">
+							<primaryMagazineCount>
+								<min>2</min>
+								<max>3</max>
+							</primaryMagazineCount>
+							<sidearms>
+								<li>
+									<generateChance>0.5</generateChance>
+									<sidearmMoney>
+										<min>20</min>
+										<max>120</max>
+									</sidearmMoney>
+									<weaponTags>
+										<li>CE_Sidearm_Melee</li>
+									</weaponTags>
+								</li>
+							</sidearms>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/PawnKindDef[defName="ATM_M3PaladinUnion"]</xpath>
+					<value>
+						<li Class="CombatExtended.LoadoutPropertiesExtension">
+							<primaryMagazineCount>
+								<min>4</min>
+								<max>6</max>
+							</primaryMagazineCount>
+							<sidearms>
+								<li>
+									<generateChance>0.25</generateChance>
+									<sidearmMoney>
+										<min>20</min>
+										<max>120</max>
+									</sidearmMoney>
+									<weaponTags>
+										<li>CE_Sidearm_Melee</li>
+									</weaponTags>
+								</li>
+								<li>
+									<generateChance>0.075</generateChance>
+									<sidearmMoney>
+										<min>80</min>
+										<max>160</max>
+									</sidearmMoney>
+									<weaponTags>
+										<li>CE_FlareLauncher</li>
+									</weaponTags>
+									<magazineCount>
+										<min>1</min>
+										<max>1</max>
+									</magazineCount>
+								</li>
+								<li>
+									<generateChance>0.125</generateChance>
+									<sidearmMoney>
+										<min>10</min>
+										<max>100</max>
+									</sidearmMoney>
+									<weaponTags>
+										<li>GrenadeDestructive</li>
+									</weaponTags>
+									<magazineCount>
+										<min>1</min>
+										<max>1</max>
+									</magazineCount>
+								</li>
+							</sidearms>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MH Military Tiers/Patches/MH Military Tiers/ThingDef_Misc/Weapons_Mech.xml b/ModPatches/MH Military Tiers/Patches/MH Military Tiers/ThingDef_Misc/Weapons_Mech.xml
new file mode 100644
index 0000000000..a459cc90f0
--- /dev/null
+++ b/ModPatches/MH Military Tiers/Patches/MH Military Tiers/ThingDef_Misc/Weapons_Mech.xml	
@@ -0,0 +1,333 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ==========  Rotary Autocannon  =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ATM_RotaryAutocannon</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.8</SwayFactor>
+			<Bulk>35</Bulk>
+			<Mass>42</Mass>
+			<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.88</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_40x311mmR_AP</defaultProjectile>
+			<warmupTime>1.45</warmupTime>
+			<range>75</range>
+			<soundCast>ATM_AutocannonBlast</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>18</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_40x311mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATM_RotaryAutocannon"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>47</power>
+					<cooldownTime>3.65</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>21</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>47</power>
+					<cooldownTime>3.65</cooldownTime>
+					<armorPenetrationBlunt>21</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>65</power>
+					<cooldownTime>2.81</cooldownTime>
+					<armorPenetrationBlunt>30.24</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ATM_RotaryAutocannon"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>3.0,3.0</DrawSize>
+				<DrawOffset>0.0,0.0</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ==========  Rotary Shrapnelcannon  =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ATM_RotaryShrapnelcannon</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.37</SwayFactor>
+			<Bulk>30</Bulk>
+			<Mass>42</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.72</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_RotaryShrapnelcannonShell</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>31</range>
+			<soundCast>ATM_ShrapnelBlast</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>1.7</reloadTime>
+			<ammoSet>AmmoSet_RotaryShrapnelcannonShell</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATM_RotaryShrapnelcannon"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>47</power>
+					<cooldownTime>3.65</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>21</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>47</power>
+					<cooldownTime>3.65</cooldownTime>
+					<armorPenetrationBlunt>21</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>65</power>
+					<cooldownTime>2.81</cooldownTime>
+					<armorPenetrationBlunt>30.24</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ATM_RotaryShrapnelcannon"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>3.0,3.0</DrawSize>
+				<DrawOffset>0.0,0.0</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ==========  Headhunter Cannon  =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ATM_HeadhunterCannon</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.17</SwayFactor>
+			<Bulk>20</Bulk>
+			<Mass>30</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_20x102mmNATO_AP</defaultProjectile>
+			<warmupTime>0.7</warmupTime>
+			<range>55</range>
+			<soundCast>ATM_AutocannonBlast</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>20</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_20x102mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ATM_HeadhunterCannon"]</xpath>
+		<value>
+			<weaponTags Inherit="False">
+				<li>CE_Sidearm_M7Mech</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATM_HeadhunterCannon"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>3.51</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>3.51</cooldownTime>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>3.51</cooldownTime>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ATM_HeadhunterCannon"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>4.0,4.0</DrawSize>
+				<DrawOffset>0.0,0.0</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ==========  Mech Poleaxe  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATM_MechPoleaxe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>spike</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>125</power>
+					<cooldownTime>1.92</cooldownTime>
+					<armorPenetrationBlunt>38.28</armorPenetrationBlunt>
+					<armorPenetrationSharp>47.86</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>axe</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>182</power>
+					<cooldownTime>2.0</cooldownTime>
+					<armorPenetrationBlunt>63</armorPenetrationBlunt>
+					<armorPenetrationSharp>14.00</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>hammer</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>182</power>
+					<cooldownTime>2.0</cooldownTime>
+					<armorPenetrationBlunt>150</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ATM_MechPoleaxe"]/weaponTags</xpath>
+		<value>
+			<li>CE_Melee_M7Mech</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ATM_MechPoleaxe"]/statBases</xpath>
+		<value>
+			<Bulk>35</Bulk>
+			<MeleeCounterParryBonus>0.25</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ATM_MechPoleaxe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.0</MeleeCritChance>
+				<MeleeParryChance>1.0</MeleeParryChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ATM_MechPoleaxe"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>3.5,3.5</DrawSize>
+				<DrawOffset>0.0,0.0</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MH Military Tiers/Patches/MH Military Tiers/ThingDef_Races/AlienRace_Androids.xml b/ModPatches/MH Military Tiers/Patches/MH Military Tiers/ThingDef_Races/AlienRace_Androids.xml
new file mode 100644
index 0000000000..67568f81ab
--- /dev/null
+++ b/ModPatches/MH Military Tiers/Patches/MH Military Tiers/ThingDef_Races/AlienRace_Androids.xml	
@@ -0,0 +1,470 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Test for comps-->
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark1Warrior"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark1Warrior"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark2Bishop"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark2Bishop"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark3Paladin"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark3Paladin"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark4Jellyman"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark4Jellyman"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark5Titan"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark5Titan"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark1Warrior" or
+			defName="ATM_Mark2Bishop" or
+			defName="ATM_Mark3Paladin" or
+			defName="ATM_Mark4Jellyman" or
+			defName="ATM_Mark5Titan"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark1Warrior" or
+			defName="ATM_Mark2Bishop" or
+			defName="ATM_Mark3Paladin" or
+			defName="ATM_Mark4Jellyman" or
+			defName="ATM_Mark5Titan"
+			]/comps </xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li>
+				<compClass>CombatExtended.CompAmmoGiver</compClass>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[
+			defName="ATM_Mark3Paladin" or
+			defName="ATM_Mark4Jellyman"
+			]/comps </xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<!-- MK1 -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark1Warrior"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.8</MeleeDodgeChance>
+			<MeleeCritChance>0.8</MeleeCritChance>
+			<MeleeParryChance>0.8</MeleeParryChance>
+			<SmokeSensitivity>0.5</SmokeSensitivity>
+			<AimingAccuracy>1.0</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark1Warrior"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark1Warrior"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark1Warrior"]/race/baseBodySize</xpath>
+		<value>
+			<baseBodySize>0.85</baseBodySize>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark1Warrior"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.14</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.14</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>body</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>Torso</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>2.0</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- MK2 -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark2Bishop"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			<MeleeCritChance>0.9</MeleeCritChance>
+			<MeleeParryChance>0.9</MeleeParryChance>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<SmokeSensitivity>0.25</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark2Bishop"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark2Bishop"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark2Bishop"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>manipulator</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>0.75</cooldownTime>
+					<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>manipulator</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.0</cooldownTime>
+					<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.0</armorPenetrationSharp>
+					<chanceFactor>0.75</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>bodyslam</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>Torso</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- MK3 -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark3Paladin"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency>0.25</NightVisionEfficiency>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>0.2</Suppressability>
+			<SmokeSensitivity>0</SmokeSensitivity>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark3Paladin"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark3Paladin"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hand</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.0</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hand</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.0</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>manipulator</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.75</cooldownTime>
+					<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+					<chanceFactor>0.75</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>manipulator</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.0</cooldownTime>
+					<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.0</armorPenetrationSharp>
+					<chanceFactor>0.75</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>bodyslam</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>Torso</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- MK4 -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark4Jellyman"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency>0.4</NightVisionEfficiency>
+			<AimingAccuracy>1.1</AimingAccuracy>
+			<MeleeDodgeChance>1.2</MeleeDodgeChance>
+			<MeleeCritChance>1.2</MeleeCritChance>
+			<MeleeParryChance>1.2</MeleeParryChance>
+			<Suppressability>0.33</Suppressability>
+			<SmokeSensitivity>0</SmokeSensitivity>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>25</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark4Jellyman"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark4Jellyman"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark4Jellyman"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>bodyslam</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>Torso</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- MK5 -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark5Titan"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>30</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark5Titan"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>67.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark5Titan"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark5Titan"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency>0.4</NightVisionEfficiency>
+			<MeleeDodgeChance>1.0</MeleeDodgeChance>
+			<MeleeCritChance>1.0</MeleeCritChance>
+			<MeleeParryChance>1.0</MeleeParryChance>
+			<SmokeSensitivity>0</SmokeSensitivity>
+			<CarryWeight>200</CarryWeight>
+			<CarryBulk>100</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark5Titan"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Demolish</li>
+					</capacities>
+					<power>80</power>
+					<cooldownTime>3.07</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>48.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Demolish</li>
+					</capacities>
+					<power>80</power>
+					<cooldownTime>3.07</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>48.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="ATM_M5TitanColony"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>8</min>
+					<max>10</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>0</min>
+						<max>10000</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_M7Mech</li>
+					</weaponTags>
+					<magazineCount>
+						<min>4</min>
+						<max>5</max>
+					</magazineCount>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ATM_OrbitalTargeterMechFall"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>1</Bulk>
+			</statBases>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Machines of War/Patches/Machines of War/BodyDefs/CicadaBody.xml b/ModPatches/Machines of War/Patches/Machines of War/BodyDefs/CicadaBody.xml
new file mode 100644
index 0000000000..2c5dd22140
--- /dev/null
+++ b/ModPatches/Machines of War/Patches/Machines of War/BodyDefs/CicadaBody.xml	
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Add groups entry if it doesn't exist already ========== -->
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalNeck"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalLeg"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<!-- ========== Add armor coverage ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Machines of War/Patches/Machines of War/BodyDefs/DemolisherBody.xml b/ModPatches/Machines of War/Patches/Machines of War/BodyDefs/DemolisherBody.xml
new file mode 100644
index 0000000000..f485286611
--- /dev/null
+++ b/ModPatches/Machines of War/Patches/Machines of War/BodyDefs/DemolisherBody.xml	
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Add groups entry if it doesn't exist already ========== -->
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalNeck"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalShoulder"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/parts/li[def="MechanicalFinger"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/parts/li[def="MechanicalFinger"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalLeg"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<!-- ========== Add armor coverage ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath> Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/parts/li[def="MechanicalFinger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Machines of War/Patches/Machines of War/BodyDefs/EnforcerBody.xml b/ModPatches/Machines of War/Patches/Machines of War/BodyDefs/EnforcerBody.xml
new file mode 100644
index 0000000000..146a3164f3
--- /dev/null
+++ b/ModPatches/Machines of War/Patches/Machines of War/BodyDefs/EnforcerBody.xml	
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Add groups entry if it doesn't exist already ========== -->
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalNeck"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MOW_MechanicalShoulderPauldron"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MOW_MechanicalShoulderPauldron"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MOW_MechanicalShoulderPauldron"]/parts/li[def="MechanicalArm"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MOW_MechanicalShoulderPauldron"]/parts/li[def="MechanicalArm"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MOW_MechanicalShoulderPauldron"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MOW_MechanicalShoulderPauldron"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MOW_MechanicalShoulderPauldron"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/parts/li[def="MechanicalFinger"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MOW_MechanicalShoulderPauldron"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/parts/li[def="MechanicalFinger"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalLeg"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<!-- ========== Add armor coverage ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MOW_MechanicalShoulderPauldron"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MOW_MechanicalShoulderPauldron"]/parts/li[def="MechanicalArm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath> Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MOW_MechanicalShoulderPauldron"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MOW_MechanicalShoulderPauldron"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/parts/li[def="MechanicalFinger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Misc/BreachCharger.xml b/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Misc/BreachCharger.xml
new file mode 100644
index 0000000000..eca08bf5ce
--- /dev/null
+++ b/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Misc/BreachCharger.xml	
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[defName = "MOW_Gun_BreachChargeScatter"]/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>Bayonet</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2.02</cooldownTime>
+					<armorPenetrationSharp>5.630</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Charge Shotgun === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>MOW_Gun_BreachChargeScatter</defName>
+		<statBases>
+			<Mass>4.35</Mass>
+			<Bulk>6.0</Bulk>
+			<SwayFactor>1.25</SwayFactor>
+			<ShotSpread>0.14</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.26</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>3.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_12GaugeCharged</defaultProjectile>
+			<warmupTime>0.2</warmupTime>
+			<range>12</range>
+			<soundCast>MOW_Shot_StormChargeScatter</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>24</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_12GaugeCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Misc/CricketCannon.xml b/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Misc/CricketCannon.xml
new file mode 100644
index 0000000000..1f765f04d3
--- /dev/null
+++ b/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Misc/CricketCannon.xml	
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MOW_Gun_ShockaveCannon"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>3.0</cooldownTime>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MOW_Gun_ShockaveCannon"]/statBases/RangedWeapon_Cooldown</xpath>
+		<value>
+			<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MOW_Gun_ShockaveCannon"]/verbs/li/warmupTime</xpath>
+		<value>
+			<warmupTime>0.8</warmupTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MOW_Gun_ShockaveCannon"]/verbs/li/range</xpath>
+		<value>
+			<range>35</range>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Misc/Demolisherweapon.xml b/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Misc/Demolisherweapon.xml
new file mode 100644
index 0000000000..e068000141
--- /dev/null
+++ b/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Misc/Demolisherweapon.xml	
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[defName = "MOW_Gun_ParticleLauncher"]/tools
+		</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>1.55</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>30.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>MOW_Gun_ParticleLauncher</defName>
+		<statBases>
+			<Mass>20.00</Mass>
+			<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>0.82</SwayFactor>
+			<Bulk>20.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.01</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_80x256mmFuel_Incendiary</defaultProjectile>
+			<warmupTime>1.7</warmupTime><!-- Intentionally decreased from 4.3s -->
+			<range>40</range>
+			<burstShotCount>1</burstShotCount>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+			<minRange>4</minRange>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<AmmoGenPerMagOverride>15</AmmoGenPerMagOverride>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_80x256mmFuel</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Launcher</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Misc/StormCharger.xml b/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Misc/StormCharger.xml
new file mode 100644
index 0000000000..6e6d5b489b
--- /dev/null
+++ b/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Misc/StormCharger.xml	
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="MOW_Gun_EMMarksmanRifle"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[defName = "MOW_Gun_StormChargeScatter"]/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>Bayonet</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2.02</cooldownTime>
+					<armorPenetrationSharp>5.630</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Charge Shotgun === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>MOW_Gun_StormChargeScatter</defName>
+		<statBases>
+			<Mass>4.35</Mass>
+			<Bulk>6.0</Bulk>
+			<SwayFactor>1.25</SwayFactor>
+			<ShotSpread>0.14</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>3.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_12GaugeCharged</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>24</range>
+			<soundCast>MOW_Shot_StormChargeScatter</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_12GaugeCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/CicadaRaces.xml b/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/CicadaRaces.xml
new file mode 100644
index 0000000000..86d38eb2b9
--- /dev/null
+++ b/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/CicadaRaces.xml	
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MOW_Mech_Cicada"]/statBases</xpath>
+		<value>
+			<PartialArmorBody>0</PartialArmorBody>
+		</value>
+	</Operation>
+
+	<!--Consistency with vanilla mechs-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MOW_Mech_Cicada"]/statBases</xpath>
+		<value>
+			<SmokeSensitivity>0</SmokeSensitivity>
+			<NightVisionEfficiency>0.80</NightVisionEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MOW_Mech_Cicada"]/statBases</xpath>
+		<value>
+			<CarryWeight>200</CarryWeight>
+			<CarryBulk>100</CarryBulk>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.26</MeleeCritChance>
+			<MeleeParryChance>0.52</MeleeParryChance>
+			<AimingDelayFactor>1.25</AimingDelayFactor>
+			<MaxHitPoints>300</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MOW_Mech_Cicada"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MOW_Mech_Cicada"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MOW_Mech_Cicada"]/tools</xpath>
+		<value>
+			<tools>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>3.51</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>false</alwaysTreatAsWeapon>
+				</li>
+
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="MOW_Mech_Cicada"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="MOW_Mech_Cicada"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MOW_Mech_Cicada"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li>
+				<compClass>CombatExtended.CompAmmoGiver</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_MechAmmo">
+				<gizmoIconSetMagCount>UI/Buttons/SetMagCount</gizmoIconSetMagCount>
+				<gizmoIconTakeAmmoNow>UI/Buttons/TakeAmmoNow</gizmoIconTakeAmmoNow>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MOW_Mech_Cicada"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1580</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>158</MaxOverHeal>
+				<MinArmorPct>0.75</MinArmorPct>
+				<MinArmorValueSharp>5</MinArmorValueSharp>
+				<MinArmorValueBlunt>10</MinArmorValueBlunt>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/DemolisherRaces.xml b/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/DemolisherRaces.xml
new file mode 100644
index 0000000000..047c286758
--- /dev/null
+++ b/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/DemolisherRaces.xml	
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MOW_Mech_Demolisher"]/statBases</xpath>
+		<value>
+			<PartialArmorBody>0</PartialArmorBody>
+		</value>
+	</Operation>
+
+	<!--Consistency with vanilla mechs-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MOW_Mech_Demolisher"]/statBases</xpath>
+		<value>
+			<SmokeSensitivity>0</SmokeSensitivity>
+			<NightVisionEfficiency>0.80</NightVisionEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MOW_Mech_Demolisher"]/statBases</xpath>
+		<value>
+			<ArmorRating_Heat>0.25</ArmorRating_Heat>
+			<CarryWeight>200</CarryWeight>
+			<CarryBulk>100</CarryBulk>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.26</MeleeCritChance>
+			<MeleeParryChance>0.52</MeleeParryChance>
+			<AimingDelayFactor>1.25</AimingDelayFactor>
+			<MaxHitPoints>600</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MOW_Mech_Demolisher"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>60</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MOW_Mech_Demolisher"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>24</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MOW_Mech_Demolisher"]/tools</xpath>
+		<value>
+			<tools>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>3.51</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>false</alwaysTreatAsWeapon>
+				</li>
+
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="MOW_Mech_Demolisher"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="MOW_Mech_Demolisher"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MOW_Mech_Demolisher"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li>
+				<compClass>CombatExtended.CompAmmoGiver</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_MechAmmo">
+				<gizmoIconSetMagCount>UI/Buttons/SetMagCount</gizmoIconSetMagCount>
+				<gizmoIconTakeAmmoNow>UI/Buttons/TakeAmmoNow</gizmoIconTakeAmmoNow>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MOW_Mech_Demolisher"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>3950</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>395</MaxOverHeal>
+				<MinArmorPct>0.5</MinArmorPct>
+				<MinArmorValueSharp>14</MinArmorValueSharp>
+				<MinArmorValueBlunt>36</MinArmorValueBlunt>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="MOW_Mech_Demolisher"]/combatPower</xpath>
+		<value>
+			<combatPower>1000</combatPower>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/EnforcerBreachRaces .xml b/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/EnforcerBreachRaces .xml
new file mode 100644
index 0000000000..b8c5631ffb
--- /dev/null
+++ b/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/EnforcerBreachRaces .xml	
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer_Breacher"]/statBases</xpath>
+		<value>
+			<PartialArmorBody>0</PartialArmorBody>
+		</value>
+	</Operation>
+
+	<!--Consistency with vanilla mechs-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer_Breacher"]/statBases</xpath>
+		<value>
+			<SmokeSensitivity>0</SmokeSensitivity>
+			<NightVisionEfficiency>0.80</NightVisionEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer_Breacher"]/statBases</xpath>
+		<value>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>60</CarryBulk>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.26</MeleeCritChance>
+			<MeleeParryChance>0.52</MeleeParryChance>
+			<AimingDelayFactor>1.25</AimingDelayFactor>
+			<MaxHitPoints>200</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer_Breacher"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>9</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer_Breacher"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer_Breacher"]/tools</xpath>
+		<value>
+			<tools>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>3.51</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>false</alwaysTreatAsWeapon>
+				</li>
+
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer_Breacher"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer_Breacher"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer_Breacher"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li>
+				<compClass>CombatExtended.CompAmmoGiver</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_MechAmmo">
+				<gizmoIconSetMagCount>UI/Buttons/SetMagCount</gizmoIconSetMagCount>
+				<gizmoIconTakeAmmoNow>UI/Buttons/TakeAmmoNow</gizmoIconTakeAmmoNow>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer_Breacher"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1310</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>131</MaxOverHeal>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/EnforcerRaces.xml b/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/EnforcerRaces.xml
new file mode 100644
index 0000000000..589e875729
--- /dev/null
+++ b/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/EnforcerRaces.xml	
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer"]/statBases</xpath>
+		<value>
+			<PartialArmorBody>0</PartialArmorBody>
+		</value>
+	</Operation>
+
+	<!--Consistency with vanilla mechs-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer"]/statBases</xpath>
+		<value>
+			<SmokeSensitivity>0</SmokeSensitivity>
+			<NightVisionEfficiency>0.80</NightVisionEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer"]/statBases</xpath>
+		<value>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>60</CarryBulk>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.26</MeleeCritChance>
+			<MeleeParryChance>0.52</MeleeParryChance>
+			<AimingDelayFactor>1.25</AimingDelayFactor>
+			<MaxHitPoints>200</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>9</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer"]/tools</xpath>
+		<value>
+			<tools>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>3.51</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>false</alwaysTreatAsWeapon>
+				</li>
+
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li>
+				<compClass>CombatExtended.CompAmmoGiver</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_MechAmmo">
+				<gizmoIconSetMagCount>UI/Buttons/SetMagCount</gizmoIconSetMagCount>
+				<gizmoIconTakeAmmoNow>UI/Buttons/TakeAmmoNow</gizmoIconTakeAmmoNow>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1310</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>131</MaxOverHeal>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Makeshift Melee Weapons/Patches/Makeshift Melee Weapons/DetVisor_MakeshiftMelee.xml b/ModPatches/Makeshift Melee Weapons/Patches/Makeshift Melee Weapons/DetVisor_MakeshiftMelee.xml
new file mode 100644
index 0000000000..93f568119a
--- /dev/null
+++ b/ModPatches/Makeshift Melee Weapons/Patches/Makeshift Melee Weapons/DetVisor_MakeshiftMelee.xml	
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === Makeshift Hammer === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DV_MakeshiftHammer"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>1.52</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DV_MakeshiftHammer"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.9</MeleeCritChance>
+				<MeleeParryChance>1.11</MeleeParryChance>
+				<MeleeDodgeChance>0.65</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DV_MakeshiftHammer"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DV_MakeshiftHammer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>2.42</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>7.6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>2.22</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>7.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2.02</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>7.05</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Makeshift Mace ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DV_MakeshiftMace"]/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.675</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>3.05</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>3.15</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2.97</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>2.92</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2.79</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>2.7</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DV_MakeshiftMace"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.26</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DV_MakeshiftMace"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.42</MeleeCritChance>
+				<MeleeParryChance>0.24</MeleeParryChance>
+				<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DV_MakeshiftMace"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Makeshift Scythe ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DV_MakeshiftScythe"]/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>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.976</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.44</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.44</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.916</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.40</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.24</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.81</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.34</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DV_MakeshiftScythe"]/statBases</xpath>
+		<value>
+			<Bulk>3.85</Bulk>
+			<MeleeCounterParryBonus>0.30</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DV_MakeshiftScythe"]</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="DV_MakeshiftScythe"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Mantodean Insectoid Race/Defs/Mantodean Insectoid Race/Ammo_Manto.xml b/ModPatches/Mantodean Insectoid Race/Defs/Mantodean Insectoid Race/Ammo_Manto.xml
new file mode 100644
index 0000000000..675b7fd026
--- /dev/null
+++ b/ModPatches/Mantodean Insectoid Race/Defs/Mantodean Insectoid Race/Ammo_Manto.xml	
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ==================== AmmoSets ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_MantoPoison</defName>
+		<label>mantodean toxic gel</label>
+		<ammoTypes>
+			<Ammo_Mantogel>Bullet_MantoLauncher</Ammo_Mantogel>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>MantoPoisonAmmo</defName>
+		<label>incendiary slime</label>
+		<description>incendiary slime</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_Mantogel</defName>
+		<label>mantodean toxic gel</label>
+		<description>Toxic thermal compound used in mantodean bio-launchers</description>
+		<statBases>
+			<Mass>0.50</Mass>
+			<Bulk>0.50</Bulk>
+			<MarketValue>0.9</MarketValue>
+		</statBases>
+		<tradeTags>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoAdvanced</li>
+		</thingCategories>
+		<stackLimit>100</stackLimit>
+		<graphicData>
+			<texPath>Things/Ammo/FuelCell/Incendiary</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<ammoClass>MantoPoisonAmmo</ammoClass>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>MakeAmmo_Mantogel</defName>
+		<label>make mantodean toxic gel x100</label>
+		<description>Craft 100 mantodean toxic gel.</description>
+		<jobString>Making mantodean toxic gel.</jobString>
+		<workAmount>8000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Chemfuel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Chemfuel</li>
+				<li>Prometheum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<recipeUsers Inherit="False">
+			<li>RefineryManto</li>
+		</recipeUsers>
+		<products>
+			<Ammo_Mantogel>100</Ammo_Mantogel>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Mantodean Insectoid Race/Patches/Mantodean Insectoid Race/Ammo/Projectiles.xml b/ModPatches/Mantodean Insectoid Race/Patches/Mantodean Insectoid Race/Ammo/Projectiles.xml
new file mode 100644
index 0000000000..925a6b5a59
--- /dev/null
+++ b/ModPatches/Mantodean Insectoid Race/Patches/Mantodean Insectoid Race/Ammo/Projectiles.xml	
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_MantoLauncher"]</xpath>
+		<value>
+			<ThingDef ParentName="BaseGreatArrowProjectile">
+				<defName>Bullet_MantoLauncher</defName>
+				<label>incendiary slime</label>
+				<graphicData>
+					<texPath>Things/Weapon/MantoCannonShot</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+					<shaderType>TransparentPostLight</shaderType>
+				</graphicData>
+				<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+				<projectile Class="CombatExtended.ProjectilePropertiesCE">
+					<speed>49</speed>
+					<damageDef>MantoPoison</damageDef>
+					<damageAmountBase>7</damageAmountBase>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>0</armorPenetrationBlunt>
+					<preExplosionSpawnThingDef>Filth_Slime</preExplosionSpawnThingDef>
+					<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
+					<explosionRadius>1</explosionRadius>
+					<gravityFactor>4</gravityFactor>
+				</projectile>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="MantoPoison"]/additionalHediffs/li[hediff="ToxicBuildup"]/severityPerDamageDealt</xpath>
+		<value>
+			<severityPerDamageDealt>0.02</severityPerDamageDealt>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Mantodean Insectoid Race/Patches/Mantodean Insectoid Race/Bodies/Bodies_Mantodean.xml b/ModPatches/Mantodean Insectoid Race/Patches/Mantodean Insectoid Race/Bodies/Bodies_Mantodean.xml
new file mode 100644
index 0000000000..fdd1f7dbdf
--- /dev/null
+++ b/ModPatches/Mantodean Insectoid Race/Patches/Mantodean Insectoid Race/Bodies/Bodies_Mantodean.xml	
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Mantodean"]//*[
+			def="Jaw" or
+			def="EyeSet"]/groups
+		</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Mantodean"]//*[
+			def="Torso" or
+			def="Neck" or
+			def="Head" or
+			def="HearingAppendix" or
+			def="HornManto" or
+			def="Jaw" or
+			def="ShoulderManto" or
+			def="Pedipalp" or
+			def="Pincer" or
+			def="InsectLeg" or
+			def="Foot"]/groups
+		</xpath>
+
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Mantodean Insectoid Race/Patches/Mantodean Insectoid Race/Hediffs/Hediffs.xml b/ModPatches/Mantodean Insectoid Race/Patches/Mantodean Insectoid Race/Hediffs/Hediffs.xml
new file mode 100644
index 0000000000..7299933115
--- /dev/null
+++ b/ModPatches/Mantodean Insectoid Race/Patches/Mantodean Insectoid Race/Hediffs/Hediffs.xml	
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="MutatedMarrowLight"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="MutatedMarrowLight"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="MutatedMarrowHeavy"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="MutatedMarrowHeavy"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>48</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="MutatedCombatPincer"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>pincer</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.33</cooldownTime>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="MutatedPincer"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.11</cooldownTime>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Mantodean Insectoid Race/Patches/Mantodean Insectoid Race/PawnKindDefs/Manto_PawnKind.xml b/ModPatches/Mantodean Insectoid Race/Patches/Mantodean Insectoid Race/PawnKindDefs/Manto_PawnKind.xml
new file mode 100644
index 0000000000..e9480c36ae
--- /dev/null
+++ b/ModPatches/Mantodean Insectoid Race/Patches/Mantodean Insectoid Race/PawnKindDefs/Manto_PawnKind.xml	
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Ammo-->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="MantoAdult" or
+			defName="MantoHiveElder"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Mantodean Insectoid Race/Patches/Mantodean Insectoid Race/Scenario/Mantodean_Scenario.xml b/ModPatches/Mantodean Insectoid Race/Patches/Mantodean Insectoid Race/Scenario/Mantodean_Scenario.xml
new file mode 100644
index 0000000000..1742c4c82f
--- /dev/null
+++ b/ModPatches/Mantodean Insectoid Race/Patches/Mantodean Insectoid Race/Scenario/Mantodean_Scenario.xml	
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="Mantohive"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_Arrow_Stone</thingDef>
+				<count>100</count>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Mantodean Insectoid Race/Patches/Mantodean Insectoid Race/ThingDefs_Misc/Turrets.xml b/ModPatches/Mantodean Insectoid Race/Patches/Mantodean Insectoid Race/ThingDefs_Misc/Turrets.xml
new file mode 100644
index 0000000000..b6853b9a11
--- /dev/null
+++ b/ModPatches/Mantodean Insectoid Race/Patches/Mantodean Insectoid Race/ThingDefs_Misc/Turrets.xml	
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BioTurretGun"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BioTurretGun"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.25</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BioTurretGun"]/statBases/ShootingAccuracyTurret</xpath>
+		<value>
+			<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BioTurretGun"]/statBases/Mass</xpath>
+		<value>
+			<Mass>25</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="BioTurretGun"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BioTurretGun"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BioTurretGun"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>1.1</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BioGun_TurretImprovised</defName>
+		<statBases>
+			<Mass>5.35</Mass>
+			<Bulk>5.70</Bulk>
+			<SwayFactor>1.31</SwayFactor>
+			<ShotSpread>0.18</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_MantoLauncher</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>31</range>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<burstShotCount>3</burstShotCount>
+			<soundCast>ShotMantoLauncher</soundCast>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<recoilAmount>2.93</recoilAmount>
+			<ignorePartialLoSBlocker>True</ignorePartialLoSBlocker>
+			<targetParams>
+				<canTargetLocations>True</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>63</magazineSize>
+			<reloadTime>5.1</reloadTime>
+			<ammoSet>AmmoSet_MantoPoison</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<!-- Disallow with Run And Gun -->
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Mantodean Insectoid Race/Patches/Mantodean Insectoid Race/ThingDefs_Misc/Weapons.xml b/ModPatches/Mantodean Insectoid Race/Patches/Mantodean Insectoid Race/ThingDefs_Misc/Weapons.xml
new file mode 100644
index 0000000000..30a809e53d
--- /dev/null
+++ b/ModPatches/Mantodean Insectoid Race/Patches/Mantodean Insectoid Race/ThingDefs_Misc/Weapons.xml	
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[defName = "Gun_MantoLauncher"]/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="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MantoLauncher</defName>
+		<statBases>
+			<Mass>5.35</Mass>
+			<Bulk>5.70</Bulk>
+			<SwayFactor>1.31</SwayFactor>
+			<ShotSpread>0.18</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_MantoLauncher</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>31</range>
+			<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+			<burstShotCount>3</burstShotCount>
+			<soundCast>ShotMantoLauncher</soundCast>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<recoilAmount>1.47</recoilAmount>
+			<ignorePartialLoSBlocker>True</ignorePartialLoSBlocker>
+			<targetParams>
+				<canTargetLocations>True</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>21</magazineSize>
+			<reloadTime>5.1</reloadTime>
+			<ammoSet>AmmoSet_MantoPoison</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<!-- Disallow with Run And Gun -->
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Mantodean Insectoid Race/Patches/Mantodean Insectoid Race/ThingDefs_Races/AlienRace_Mantodean.xml b/ModPatches/Mantodean Insectoid Race/Patches/Mantodean Insectoid Race/ThingDefs_Races/AlienRace_Mantodean.xml
new file mode 100644
index 0000000000..aee05408bb
--- /dev/null
+++ b/ModPatches/Mantodean Insectoid Race/Patches/Mantodean Insectoid Race/ThingDefs_Races/AlienRace_Mantodean.xml	
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="BaseMantoPawn"]/inspectorTabs/li[.="ITab_Pawn_Gear"]</xpath>
+		<value>
+			<li>CombatExtended.ITab_Inventory</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="BaseMantoPawn"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Inventory"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="BaseMantoPawn"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Mantodean"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Mantodean"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+			<MeleeDodgeChance>0.7</MeleeDodgeChance>
+			<MeleeCritChance>1.28</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>0.4</Suppressability>
+			<CarryBulk>30</CarryBulk>
+			<SmokeSensitivity>0.5</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Mantodean"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>1.3</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Mantodean"]/race/baseBodySize</xpath>
+		<value>
+			<baseBodySize>1.3</baseBodySize>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Mantodean"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left pincer</label>
+					<capacities>
+						<li>Cut</li>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.68</cooldownTime>
+					<linkedBodyPartsGroup>Leftpincer</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right pincer</label>
+					<capacities>
+						<li>Cut</li>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.68</cooldownTime>
+					<linkedBodyPartsGroup>Rightpincer</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>jaw</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>28</power>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<cooldownTime>3.17</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+					<armorPenetrationSharp>7</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>jaw</label>
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>20</power>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<cooldownTime>3.17</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.1</chanceFactor>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Marilyn the Mincho Worshipper Witch/Patches/Marilyn the Mincho Worshipper Witch/Hediffs/Hediffs_Biofilm.xml b/ModPatches/Marilyn the Mincho Worshipper Witch/Patches/Marilyn the Mincho Worshipper Witch/Hediffs/Hediffs_Biofilm.xml
new file mode 100644
index 0000000000..de611ee0c5
--- /dev/null
+++ b/ModPatches/Marilyn the Mincho Worshipper Witch/Patches/Marilyn the Mincho Worshipper Witch/Hediffs/Hediffs_Biofilm.xml	
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Simmilar to Armorskin but less blunt-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="MinchoWitch_MintchocoBiofilm"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="MinchoWitch_MintchocoBiofilm"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Marilyn the Mincho Worshipper Witch/Patches/Marilyn the Mincho Worshipper Witch/Scenario/Minchowitch_Scenario.xml b/ModPatches/Marilyn the Mincho Worshipper Witch/Patches/Marilyn the Mincho Worshipper Witch/Scenario/Minchowitch_Scenario.xml
new file mode 100644
index 0000000000..913b010ef8
--- /dev/null
+++ b/ModPatches/Marilyn the Mincho Worshipper Witch/Patches/Marilyn the Mincho Worshipper Witch/Scenario/Minchowitch_Scenario.xml	
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="MinchoWithch_Scenario"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_303British_FMJ</thingDef>
+				<count>100</count>
+			</li>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_44Magnum_FMJ</thingDef>
+				<count>60</count>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Marilyn the Mincho Worshipper Witch/Patches/Marilyn the Mincho Worshipper Witch/ThingDefs_Bodies/MinchoWitch_Bodytype.xml b/ModPatches/Marilyn the Mincho Worshipper Witch/Patches/Marilyn the Mincho Worshipper Witch/ThingDefs_Bodies/MinchoWitch_Bodytype.xml
new file mode 100644
index 0000000000..ab579f1fc3
--- /dev/null
+++ b/ModPatches/Marilyn the Mincho Worshipper Witch/Patches/Marilyn the Mincho Worshipper Witch/ThingDefs_Bodies/MinchoWitch_Bodytype.xml	
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Arm Groups-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="MinchoWitch"]//*[
+			customLabel="left shoulder"
+			]/groups
+		</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="MinchoWitch"]//*[
+			customLabel="right shoulder"
+			]/groups
+		</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="MinchoWitch"]//*[
+			customLabel="left arm"
+			]/groups
+		</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="MinchoWitch"]//*[
+			customLabel="right arm"
+			]/groups
+		</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+
+	<!--Natural Armor-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="MinchoWitch"]//*[
+			def="Torso" or
+			def="Neck" or
+			def="Head" or
+			def="Nose" or
+			def="Jaw" or
+			def="Shoulder" or
+			def="Arm" or
+			def="Hand" or
+			def="Finger" or
+			def="Waist" or
+			def="Leg" or
+			def="Foot" or
+			def="Toe"
+			]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Marilyn the Mincho Worshipper Witch/Patches/Marilyn the Mincho Worshipper Witch/ThingDefs_Bodies/Mincho_Golem.xml b/ModPatches/Marilyn the Mincho Worshipper Witch/Patches/Marilyn the Mincho Worshipper Witch/ThingDefs_Bodies/Mincho_Golem.xml
new file mode 100644
index 0000000000..6a023ddaa7
--- /dev/null
+++ b/ModPatches/Marilyn the Mincho Worshipper Witch/Patches/Marilyn the Mincho Worshipper Witch/ThingDefs_Bodies/Mincho_Golem.xml	
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Natural Armor-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="MinchoGolem"]//*[
+			def="Torso" or
+			def="MinchoGolem_Head" or
+			def="MinchoGolem_Shoulder" or
+			def="MinchoGolem_Arm" or
+			def="MinchoGolem_Hand" or
+			def="MinchoGolem_Waist" or
+			def="MinchoGolem_Leg" or
+			def="MinchoGolem_Foot" or
+			def="MinchoGolem_Hand"
+			]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Marilyn the Mincho Worshipper Witch/Patches/Marilyn the Mincho Worshipper Witch/ThingDefs_Misc/Mincho_Apparel.xml b/ModPatches/Marilyn the Mincho Worshipper Witch/Patches/Marilyn the Mincho Worshipper Witch/ThingDefs_Misc/Mincho_Apparel.xml
new file mode 100644
index 0000000000..6fef3d8ec0
--- /dev/null
+++ b/ModPatches/Marilyn the Mincho Worshipper Witch/Patches/Marilyn the Mincho Worshipper Witch/ThingDefs_Misc/Mincho_Apparel.xml	
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="MinchoWitch_Hat" or
+			defName="MinchoWitch_Lingerie" or
+			defName="MinchoWitch_Robe"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="MinchoWitch_Hat" or
+			defName="MinchoWitch_Lingerie" or
+			defName="MinchoWitch_Robe"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>0.08</ArmorRating_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Marilyn the Mincho Worshipper Witch/Patches/Marilyn the Mincho Worshipper Witch/ThingDefs_Races/Race_Golem.xml b/ModPatches/Marilyn the Mincho Worshipper Witch/Patches/Marilyn the Mincho Worshipper Witch/ThingDefs_Races/Race_Golem.xml
new file mode 100644
index 0000000000..7bc04568e3
--- /dev/null
+++ b/ModPatches/Marilyn the Mincho Worshipper Witch/Patches/Marilyn the Mincho Worshipper Witch/ThingDefs_Races/Race_Golem.xml	
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="MinchoWitch_MinchoGolem"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MinchoWitch_MinchoGolem"]/statBases</xpath>
+		<value>
+			<!--Innate immunity to toxic fallout, high immunity gain rate-->
+			<SmokeSensitivity>0</SmokeSensitivity>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>2</MeleeCritChance>
+			<MeleeParryChance>1.5</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MinchoWitch_MinchoGolem"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MinchoWitch_MinchoGolem"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MinchoWitch_MinchoGolem"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>63</power>
+					<cooldownTime>1.38</cooldownTime>
+					<armorPenetrationBlunt>29.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>63</power>
+					<cooldownTime>1.38</cooldownTime>
+					<armorPenetrationBlunt>29.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>50</power>
+					<cooldownTime>2.11</cooldownTime>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>22.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Marilyn the Mincho Worshipper Witch/Patches/Marilyn the Mincho Worshipper Witch/ThingDefs_Races/Race_Witch.xml b/ModPatches/Marilyn the Mincho Worshipper Witch/Patches/Marilyn the Mincho Worshipper Witch/ThingDefs_Races/Race_Witch.xml
new file mode 100644
index 0000000000..c627d1aaba
--- /dev/null
+++ b/ModPatches/Marilyn the Mincho Worshipper Witch/Patches/Marilyn the Mincho Worshipper Witch/ThingDefs_Races/Race_Witch.xml	
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/Garam_RaceAddon.RaceAddonThingDef[defName="MinchoWitch"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/Garam_RaceAddon.RaceAddonThingDef[defName="MinchoWitch"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/Garam_RaceAddon.RaceAddonThingDef[defName="MinchoWitch"]</xpath>
+			<value>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/Garam_RaceAddon.RaceAddonThingDef[defName="MinchoWitch"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/Garam_RaceAddon.RaceAddonThingDef[defName="MinchoWitch"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/Garam_RaceAddon.RaceAddonThingDef[defName="MinchoWitch"]/statBases</xpath>
+		<value>
+			<Suppressability>1</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Garam_RaceAddon.RaceAddonThingDef[defName="MinchoWitch"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Martens - Nature's Most Adorable Assassins/Patches/Martens - Nature's Most Adorable Assassins/Marty_Extended.xml b/ModPatches/Martens - Nature's Most Adorable Assassins/Patches/Martens - Nature's Most Adorable Assassins/Marty_Extended.xml
new file mode 100644
index 0000000000..a85fdb2596
--- /dev/null
+++ b/ModPatches/Martens - Nature's Most Adorable Assassins/Patches/Martens - Nature's Most Adorable Assassins/Marty_Extended.xml	
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Marts === -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[
+			defName="ZGF_BeechMart" or
+			defName="ZGF_JapaneseMart" or
+			defName="ZGF_NilgiriMart" or
+			defName="ZGF_PineMart" or
+			defName="ZGF_RimMart" or
+			defName="ZGF_Sable" or
+			defName="ZGF_Boommarten" or
+			defName="ZGF_YellowMart"] </xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ZGF_MegaMart"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[
+			defName="ZGF_BeechMart" or
+			defName="ZGF_JapaneseMart" or
+			defName="ZGF_NilgiriMart" or
+			defName="ZGF_PineMart" or
+			defName="ZGF_RimMart" or
+			defName="ZGF_Sable" or
+			defName="ZGF_Boommarten" or
+			defName="ZGF_YellowMart"]/combatPower </xpath>
+		<value>
+			<combatPower>30</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="ZGF_MegaMart"]/combatPower</xpath>
+		<value>
+			<combatPower>180</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="ZGF_BeechMart" or
+			defName="ZGF_JapaneseMart" or
+			defName="ZGF_NilgiriMart" or
+			defName="ZGF_PineMart" or
+			defName="ZGF_RimMart" or
+			defName="ZGF_Sable" or
+			defName="ZGF_Boommarten" or
+			defName="ZGF_YellowMart"]/statBases/MeleeDodgeChance </xpath>
+		<value>
+			<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			<MeleeCritChance>0.03</MeleeCritChance>
+			<MeleeParryChance>0.02</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ZGF_MegaMart"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.27</MeleeDodgeChance>
+			<MeleeCritChance>0.5</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="ZGF_BeechMart" or
+			defName="ZGF_JapaneseMart" or
+			efName="ZGF_NilgiriMart" or
+			defName="ZGF_PineMart" or
+			defName="ZGF_Sable" or
+			defName="ZGF_RimMart" or
+			defName="ZGF_Boommarten"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.32</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.06</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.32</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.06</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.14</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ZGF_MegaMart"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Cut</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.18</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.66</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Cut</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.18</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.66</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+						<li>Stab</li>
+					</capacities>
+					<power>43</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Martens - Nature's Most Adorable Assassins/Patches/Martens - Nature's Most Adorable Assassins/Marty_Resources.xml b/ModPatches/Martens - Nature's Most Adorable Assassins/Patches/Martens - Nature's Most Adorable Assassins/Marty_Resources.xml
new file mode 100644
index 0000000000..7a88d79cb5
--- /dev/null
+++ b/ModPatches/Martens - Nature's Most Adorable Assassins/Patches/Martens - Nature's Most Adorable Assassins/Marty_Resources.xml	
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ZGF_Leather_BeechMartfur" or defName="ZGF_Leather_JapaneseMartfur" or defName="ZGF_Leather_NilgiriMartfur" or defName="ZGF_Leather_SableMartfur"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.036</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ZGF_Leather_BeechMartfur" or defName="ZGF_Leather_JapaneseMartfur" or defName="ZGF_Leather_NilgiriMartfur"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.024</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ZGF_Leather_SableMartfur"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.024</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ZGF_Leather_PineMartfur" or defName="ZGF_Leather_RimMartfur"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.05</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ZGF_Leather_PineMartfur" or defName="ZGF_Leather_RimMartfur"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.036</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ZGF_Leather_MegaMartfur" or defName="ZGF_Leather_YellowMartfur"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.08</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ZGF_Leather_MegaMartfur" or defName="ZGF_Leather_YellowMartfur"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.056</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ZGF_Leather_MegaMartfur"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ZGF_WoolMegamarten"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.036</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ZGF_WoolMegamarten"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.036</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ZGF_WoolMegamarten"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.03</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Mass Effect - Playable Geth/Defs/Mass Effect - Playable Geth/Ammo_ME.xml b/ModPatches/Mass Effect - Playable Geth/Defs/Mass Effect - Playable Geth/Ammo_ME.xml
new file mode 100644
index 0000000000..e279b75d2a
--- /dev/null
+++ b/ModPatches/Mass Effect - Playable Geth/Defs/Mass Effect - Playable Geth/Ammo_ME.xml	
@@ -0,0 +1,418 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>AmmoML77CE</defName>
+		<label>ML-77 Missile</label>
+		<parent>AmmoRockets</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRocket</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_GethRifle</defName>
+		<label>Geth Thermal Clip</label>
+		<ammoTypes>
+			<Ammo_MEG>Bullet_GethRifle</Ammo_MEG>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_GethSMG</defName>
+		<label>Geth Thermal Clip</label>
+		<ammoTypes>
+			<Ammo_MEG>Bullet_GethSMG</Ammo_MEG>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_GethShotgun</defName>
+		<label>Geth Thermal Clip</label>
+		<ammoTypes>
+			<Ammo_MEG>Bullet_GethShotgun</Ammo_MEG>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_M98_Geth</defName>
+		<label>Geth Thermal Clip</label>
+		<ammoTypes>
+			<Ammo_MEG>Bullet_M98_Geth</Ammo_MEG>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_GethSniper</defName>
+		<label>Geth Thermal Clip</label>
+		<ammoTypes>
+			<Ammo_MEG>Bullet_GethSniper</Ammo_MEG>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_GethSpitfire</defName>
+		<label>Geth Thermal Clip</label>
+		<ammoTypes>
+			<Ammo_MEG>Bullet_GethSpitfire</Ammo_MEG>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_ML77CE</defName>
+		<label>ML-77 Missile</label>
+		<ammoTypes>
+			<Ammo_ML77CE>Bullet_ML77CE</Ammo_ML77CE>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_MEG</defName>
+		<label>Geth Thermal clip</label>
+		<description>Thermal clips designed to fit most geth weapons. They are, however, incompatible with weapons made by other races.</description>
+		<statBases>
+			<Mass>0.01</Mass>
+			<Bulk>0.01</Bulk>
+			<MarketValue>0.24</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade_Sellable</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+			<!-- Plasma ammo can't be handloaded, and the containment cell must be precision-machined anyway -->
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoPlasmaCellRifle</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>ThirdParty/MassEffect/Heatsink</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>Plasma</ammoClass>
+	</ThingDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="RPG7GrenadeBase" ParentName="MediumAmmoBase" Abstract="True">
+		<description>Rocket-propelled missile designed for the ML-77. After being fired a rocket motor kicks in to propel the grenade further.</description>
+		<statBases>
+			<MaxHitPoints>150</MaxHitPoints>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade_Sellable</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoML77CE</li>
+		</thingCategories>
+		<stackLimit>20</stackLimit>
+		<cookOffFlashScale>40</cookOffFlashScale>
+		<cookOffSound>MortarBomb_Explode</cookOffSound>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="RPG7GrenadeBase">
+		<defName>Ammo_ML77CE</defName>
+		<label>ML-77 Missile</label>
+		<graphicData>
+			<texPath>Things/Ammo/RPG/HEAT</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>49.78</MarketValue>
+			<Mass>2.25</Mass>
+			<Bulk>3.5</Bulk>
+		</statBases>
+		<ammoClass>RocketHEAT</ammoClass>
+		<detonateProjectile>Bullet_ML77CE</detonateProjectile>
+	</ThingDef>
+
+	<ThingCategoryDef>
+		<defName>AmmoGeth</defName>
+		<label>Geth thermal clip</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberPlasmaMedium</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="BaseRPG7Grenade">
+		<defName>Bullet_ML77CE</defName>
+		<label>ML77 Missile</label>
+		<graphicData>
+			<texPath>Things/Projectile/Rocket/M72LAW</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>60</speed>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>160</damageAmountBase>
+			<armorPenetrationSharp>300</armorPenetrationSharp>
+			<armorPenetrationBlunt>31.584</armorPenetrationBlunt>
+			<soundAmbient>RocketPropelledLoop_Small</soundAmbient>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>90</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1.5</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>5</Fragment_Large>
+					<Fragment_Small>33</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_GethRifle</defName>
+		<label>phasic slugs</label>
+		<graphicData>
+			<texPath>Projectile/PulseRifleProjectile</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>240</speed>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>11</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>2</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>13</armorPenetrationSharp>
+			<armorPenetrationBlunt>21.8</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_GethSMG</defName>
+		<label>superconducting toroids</label>
+		<graphicData>
+			<texPath>Projectile/PulseRifleProjectile</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>180</speed>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>8</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>2</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>9</armorPenetrationSharp>
+			<armorPenetrationBlunt>15.8</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_GethShotgun</defName>
+		<label>superconducting projectiles</label>
+		<graphicData>
+			<texPath>Things/Projectile/Charged/ChargeShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>160</speed>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>22</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>4</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>9</armorPenetrationSharp>
+			<armorPenetrationBlunt>18.8</armorPenetrationBlunt>
+			<pelletCount>3</pelletCount>
+			<spreadMult>17.8</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_M98_Geth</defName>
+		<label>bullet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_Big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>480</speed>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>70</damageAmountBase>
+			<armorPenetrationSharp>44</armorPenetrationSharp>
+			<armorPenetrationBlunt>734.8</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_GethSniper</defName>
+		<label>ferrofluid</label>
+		<graphicData>
+			<texPath>Projectile/JavelinProjectile</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>360</speed>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>30</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>11</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>32</armorPenetrationSharp>
+			<armorPenetrationBlunt>48.8</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_GethSpitfire</defName>
+		<label>superconducting toroids</label>
+		<graphicData>
+			<texPath>Things/Projectile/Charged/ChargeShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>200</speed>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>13</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>3</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>16</armorPenetrationSharp>
+			<armorPenetrationBlunt>29.8</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseExplosiveBullet">
+		<defName>Bullet_GethCannon</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>Geth pulse cannon plasma</label>
+		<graphicData>
+			<texPath>Projectile/ColossusProjectile</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>375</damageAmountBase>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+			<speed>40</speed>
+			<flyOverhead>false</flyOverhead>
+			<explosionRadius>4</explosionRadius>
+			<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+			<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+			<soundAmbient>MortarRound_Ambient</soundAmbient>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_MEG</defName>
+		<label>make Geth thermal clips</label>
+		<description>Craft 100 shots' worth of thermal clips.</description>
+		<jobString>Making thermal clips.</jobString>
+		<workAmount>5000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Plasteel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_MEG>100</Ammo_MEG>
+		</products>
+		<researchPrerequisite>PlasmaSMGTechnology</researchPrerequisite>
+	</RecipeDef>
+
+	<!-- ==================== Recipes ML77========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_ML77CE</defName>
+		<label>make ML77 rockets x2</label>
+		<description>Craft 2 ML77 rockets.</description>
+		<jobString>Making ML77 rockets.</jobString>
+		<workAmount>12000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>100</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_ML77CE>2</Ammo_ML77CE>
+		</products>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Mass Effect - Playable Geth/Patches/Mass Effect - Playable Geth/Firestorm_M77_CE.xml b/ModPatches/Mass Effect - Playable Geth/Patches/Mass Effect - Playable Geth/Firestorm_M77_CE.xml
new file mode 100644
index 0000000000..6214047b76
--- /dev/null
+++ b/ModPatches/Mass Effect - Playable Geth/Patches/Mass Effect - Playable Geth/Firestorm_M77_CE.xml	
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== ML-77 Missile Launcher Rocket ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_ML77MissileLauncher</defName>
+		<statBases>
+			<Mass>7</Mass>
+			<RangedWeapon_Cooldown>0.72</RangedWeapon_Cooldown>
+			<SightsEfficiency>2</SightsEfficiency>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>1.3</SwayFactor>
+			<Bulk>9</Bulk>
+			<WorkToMake>12500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>120</Steel>
+			<ComponentSpacer>2</ComponentSpacer>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_ML77CE</defaultProjectile>
+			<warmupTime>2</warmupTime>
+			<range>50</range>
+			<minRange>5</minRange>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<soundCast>Shot_ML77</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>4.8</reloadTime>
+			<ammoSet>AmmoSet_ML77CE</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>ML77MissileLauncher</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Fire Storm ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Firestorm</defName>
+		<statBases>
+			<Mass>4</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.3</SwayFactor>
+			<Bulk>7.03</Bulk>
+			<WorkToMake>12500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>100</Steel>
+			<ComponentSpacer>2</ComponentSpacer>
+		</costList>
+		<Properties>
+			<recoilAmount>0.6</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Flamethrower_Napalm</defaultProjectile>
+			<warmupTime>0.75</warmupTime>
+			<range>14</range>
+			<minRange>2</minRange>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<burstShotCount>20</burstShotCount>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<soundCast>Shot_Firestorm</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>0</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>60</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_Flamethrower</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>10</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>GethFirestorm</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Gun_ML77MissileLauncher" or
+			defName="Gun_Firestorm"
+			]/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>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Mass Effect - Playable Geth/Patches/Mass Effect - Playable Geth/Geth_Bodies_CE.xml b/ModPatches/Mass Effect - Playable Geth/Patches/Mass Effect - Playable Geth/Geth_Bodies_CE.xml
new file mode 100644
index 0000000000..6ca6a4790c
--- /dev/null
+++ b/ModPatches/Mass Effect - Playable Geth/Patches/Mass Effect - Playable Geth/Geth_Bodies_CE.xml	
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Shoulder & Arm Groups -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Geth"]//*[customLabel="right shoulder"]/groups</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Geth"]//*[customLabel="left shoulder"]/groups</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Geth"]//*[customLabel="right arm"]/groups</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Geth"]//*[customLabel="left arm"]/groups</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+
+	<!-- Natural Armor -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Geth"]//*[
+			def="GethTorso" or
+			def="GethShoulder" or
+			def="GethHead" or
+			def="GethLeg"
+			]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Geth"]//*[def="GethVisualReceptor" or
+			def="GethSpeaker"]/groups
+		</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Mass Effect - Playable Geth/Patches/Mass Effect - Playable Geth/Geth_Traits.xml b/ModPatches/Mass Effect - Playable Geth/Patches/Mass Effect - Playable Geth/Geth_Traits.xml
new file mode 100644
index 0000000000..09931db3b3
--- /dev/null
+++ b/ModPatches/Mass Effect - Playable Geth/Patches/Mass Effect - Playable Geth/Geth_Traits.xml	
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="GethNimble"]/degreeDatas/li/statFactors/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>2</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="GethAimAccuracy"]/degreeDatas/li/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>0.2</ShootingAccuracyPawn>
+			<AimingAccuracy>0.5</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="GethReinforcedStructure"]/degreeDatas/li/statFactors</xpath>
+		<value>
+			<statOffsets>
+				<ArmorRating_Sharp>3</ArmorRating_Sharp>
+				<ArmorRating_Blunt>4.5</ArmorRating_Blunt>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraitDef[defName="GethSlowSpeed"]/degreeDatas/li/statOffsets</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Mass Effect - Playable Geth/Patches/Mass Effect - Playable Geth/Geth_Weapons_CE.xml b/ModPatches/Mass Effect - Playable Geth/Patches/Mass Effect - Playable Geth/Geth_Weapons_CE.xml
new file mode 100644
index 0000000000..af9d1847ab
--- /dev/null
+++ b/ModPatches/Mass Effect - Playable Geth/Patches/Mass Effect - Playable Geth/Geth_Weapons_CE.xml	
@@ -0,0 +1,462 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Widow ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_M98Widow</defName>
+		<statBases>
+			<Mass>12</Mass>
+			<RangedWeapon_Cooldown>0.64</RangedWeapon_Cooldown>
+			<SightsEfficiency>3.5</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.88</SwayFactor>
+			<Bulk>16.80</Bulk>
+			<WorkToMake>12500</WorkToMake>
+		</statBases>
+		<costList>
+			<Plasteel>80</Plasteel>
+			<ComponentSpacer>2</ComponentSpacer>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_M98_Geth</defaultProjectile>
+			<warmupTime>2</warmupTime>
+			<range>88</range>
+			<ammoConsumedPerShotCount>10</ammoConsumedPerShotCount>
+			<soundCast>Shot_M98Widow</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>1.5</reloadTime>
+			<ammoSet>AmmoSet_M98_Geth</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>GethM98Widow</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Geth Javelin ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_GethJavelin</defName>
+		<statBases>
+			<Mass>3</Mass>
+			<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.8</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.62</SwayFactor>
+			<Bulk>10.60</Bulk>
+			<WorkToMake>12500</WorkToMake>
+		</statBases>
+		<costList>
+			<Plasteel>60</Plasteel>
+			<ComponentSpacer>2</ComponentSpacer>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_GethSniper</defaultProjectile>
+			<warmupTime>1.45</warmupTime>
+			<range>83</range>
+			<ammoConsumedPerShotCount>5</ammoConsumedPerShotCount>
+			<soundCast>Shot_Javelin</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>1.1</reloadTime>
+			<ammoSet>AmmoSet_GethSniper</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>GethJavelin</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Gun_GethJavelin"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.18,1.12</DrawSize>
+				<DrawOffset>0.0,0.0</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Geth ShotGun ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_GethPlasmaShotgun</defName>
+		<statBases>
+			<Mass>2.4</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.18</SwayFactor>
+			<Bulk>7.20</Bulk>
+			<WorkToMake>12500</WorkToMake>
+		</statBases>
+		<costList>
+			<Plasteel>50</Plasteel>
+			<ComponentSpacer>2</ComponentSpacer>
+		</costList>
+		<Properties>
+			<recoilAmount>2.18</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_GethShotgun</defaultProjectile>
+			<warmupTime>0.7</warmupTime>
+			<range>18</range>
+			<burstShotCount>2</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
+			<soundCast>Shot_PlasmaShotgun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_GethShotgun</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>GethPlasmaShotgun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Geth Pulse Rifle ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_GethPulseRifle</defName>
+		<statBases>
+			<Mass>2.6</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>8.03</Bulk>
+			<WorkToMake>12500</WorkToMake>
+		</statBases>
+		<costList>
+			<Plasteel>40</Plasteel>
+			<ComponentSpacer>2</ComponentSpacer>
+		</costList>
+		<Properties>
+			<recoilAmount>0.9</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_GethRifle</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>52</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>Shot_PulseRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>3</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>80</magazineSize>
+			<reloadTime>5.9</reloadTime>
+			<ammoSet>AmmoSet_GethRifle</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>GethPulseRifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Geth Pulse SMG ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_GethPlasmaSMG</defName>
+		<statBases>
+			<Mass>1.6</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.95</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.14</SwayFactor>
+			<Bulk>3.5</Bulk>
+			<WorkToMake>12000</WorkToMake>
+		</statBases>
+		<costList>
+			<Plasteel>30</Plasteel>
+			<ComponentSpacer>1</ComponentSpacer>
+		</costList>
+		<Properties>
+			<recoilAmount>0.8</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_GethSMG</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>25</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>Shot_PlasmaSMG</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>3</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>80</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_GethSMG</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>GethPlasmaSMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Geth Spitfire ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_GethSpitfire</defName>
+		<statBases>
+			<Mass>18</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.56</SwayFactor>
+			<Bulk>22.03</Bulk>
+			<WorkToMake>70000</WorkToMake>
+		</statBases>
+		<costList>
+			<Plasteel>150</Plasteel>
+			<ComponentSpacer>4</ComponentSpacer>
+		</costList>
+		<Properties>
+			<recoilAmount>0.88</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_GethSpitfire</defaultProjectile>
+			<warmupTime>1.35</warmupTime>
+			<range>62</range>
+			<minRange>1.5</minRange>
+			<burstShotCount>40</burstShotCount>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<soundCast>Shot_Spitfire</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>220</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_GethSpitfire</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>20</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>GethSpitfire</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Gun_GethSpitfire"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.18,1.12</DrawSize>
+				<DrawOffset>0.0,0.0</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Seige Pulse Assault Cannon ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SiegePulseCannon</defName>
+		<statBases>
+			<Mass>15</Mass>
+			<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.47</SwayFactor>
+			<Bulk>20.03</Bulk>
+			<WorkToMake>50000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_GethCannon</defaultProjectile>
+			<warmupTime>3.2</warmupTime>
+			<minRange>2.5</minRange>
+			<range>78</range>
+			<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+			<soundCast>Shot_Colossus</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>6.8</reloadTime>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>SiegePulseAssaultCannon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Gun_GethJavelin" or
+			defName="Gun_GethPlasmaShotgun" or
+			defName="Gun_GethSpitfire" or
+			defName="Gun_M98Widow" or
+			defName="Gun_GethPulseRifle"
+			]/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_GethPlasmaSMG"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.35</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>2</power>
+					<cooldownTime>1.25</cooldownTime>
+					<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.35</cooldownTime>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Gun_SiegePulseCannon"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>43</power>
+					<cooldownTime>2.8</cooldownTime>
+					<armorPenetrationBlunt>46</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Mass Effect - Playable Geth/Patches/Mass Effect - Playable Geth/PawnKinds_Geth_CE.xml b/ModPatches/Mass Effect - Playable Geth/Patches/Mass Effect - Playable Geth/PawnKinds_Geth_CE.xml
new file mode 100644
index 0000000000..af52d8fc06
--- /dev/null
+++ b/ModPatches/Mass Effect - Playable Geth/Patches/Mass Effect - Playable Geth/PawnKinds_Geth_CE.xml	
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="BaseTraderGeth" or
+			defName="GethTrooper" or
+			defName="GethHunter" or
+			defName="GethHeretic" or
+			defName="GethHereticTrooper" or
+			defName="GethHereticHunter" or
+			defName="GethHereticPyro" or
+			defName="GethPyro"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>1</min>
+					<max>3</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.33</generateChance>
+						<sidearmMoney>
+							<min>20</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="GethPrime" or
+			defName="GethHereticPrime"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>3</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="GethInfiltrator" or
+			defName="GethHereticInfiltrator"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>12</min>
+					<max>20</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="BaseLegion"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>9</min>
+					<max>16</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="GethRocketTrooper" or
+			defName="GethHereticRocketTrooper"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>7</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ======= Combat Power ======= -->
+
+	<!-- Trooper -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[
+			defName="BaseTraderGeth" or
+			defName="GethTrooper" or
+			defName="GethHereticTrooper" or
+			defName="GethHunter" or
+			defName="GethHereticHunter"
+			]/combatPower </xpath>
+		<value>
+			<combatPower>180</combatPower>
+		</value>
+	</Operation>
+
+	<!-- Infiltrator -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[
+			defName="GethInfiltrator" or
+			defName="GethHereticInfiltrator"
+			]/combatPower </xpath>
+		<value>
+			<combatPower>200</combatPower>
+		</value>
+	</Operation>
+
+	<!-- Special -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[
+			defName="GethHereticPyro" or
+			defName="GethPyro" or
+			defName="GethRocketTrooper" or
+			defName="GethHereticRocketTrooper"
+			]/combatPower </xpath>
+		<value>
+			<combatPower>200</combatPower>
+		</value>
+	</Operation>
+
+	<!-- Prime -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[
+			defName="GethPrime" or
+			defName="BaseLegion" or
+			defName="GethHereticPrime"
+			]/combatPower </xpath>
+		<value>
+			<combatPower>300</combatPower>
+		</value>
+	</Operation>
+
+	<!-- Defender Series -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[
+			defName="BaseGethColossus" or
+			defName="BaseGethColossusHeretic"
+			]/combatPower </xpath>
+		<value>
+			<combatPower>500</combatPower>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Mass Effect - Playable Geth/Patches/Mass Effect - Playable Geth/Races_Geth_CE_.xml b/ModPatches/Mass Effect - Playable Geth/Patches/Mass Effect - Playable Geth/Races_Geth_CE_.xml
new file mode 100644
index 0000000000..0d39f7c50f
--- /dev/null
+++ b/ModPatches/Mass Effect - Playable Geth/Patches/Mass Effect - Playable Geth/Races_Geth_CE_.xml	
@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Bodytype-->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Geth" or defName="GethPrime"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="GethColossus"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="GethPrime"]</xpath>
+		<value>
+			<race>
+				<baseHealthScale>1.5</baseHealthScale>
+				<baseBodySize>1.33</baseBodySize>
+			</race>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="GethColossus"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>3.0</baseHealthScale>
+			<baseBodySize>2.5</baseBodySize>
+		</value>
+	</Operation>
+
+	<!--Geth-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Geth"]</xpath>
+		<value>
+			<statBases>
+				<CarryWeight>50</CarryWeight>
+				<CarryBulk>50</CarryBulk>
+				<MeleeDodgeChance>1</MeleeDodgeChance>
+				<MeleeCritChance>1</MeleeCritChance>
+				<MeleeParryChance>1</MeleeParryChance>
+				<SmokeSensitivity>0</SmokeSensitivity>
+				<Suppressability>0.4</Suppressability>
+				<ArmorRating_Blunt>9</ArmorRating_Blunt>
+				<ArmorRating_Sharp>4.5</ArmorRating_Sharp>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="BaseGeth"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftArm</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightArm</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>3.05</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Colossus-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="GethColossus"]/statBases</xpath>
+		<value>
+			<statBases>
+				<GethLinkRepeater>2</GethLinkRepeater>
+				<MeleeDodgeChance>0.5</MeleeDodgeChance>
+				<MeleeCritChance>0.78</MeleeCritChance>
+				<MeleeParryChance>0.5</MeleeParryChance>
+				<ArmorRating_Blunt>42</ArmorRating_Blunt>
+				<ArmorRating_Sharp>20</ArmorRating_Sharp>
+				<Suppressability>0</Suppressability>
+			</statBases>
+		</value>
+	</Operation>
+
+	<!--Base melee is exceptionally strong. -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="GethColossus"]</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Smash</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>45</power>
+					<cooldownTime>3.8</cooldownTime>
+					<linkedBodyPartsGroup>LeftArm</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>78.625</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>Smash</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>45</power>
+					<cooldownTime>3.8</cooldownTime>
+					<linkedBodyPartsGroup>RightArm</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>78.625</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>2.05</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>43</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--GethPrime-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="GethPrime"]/statBases</xpath>
+		<value>
+			<statBases>
+				<CarryWeight>100</CarryWeight>
+				<CarryBulk>60</CarryBulk>
+				<GethLinkRepeater>1</GethLinkRepeater>
+				<MeleeDodgeChance>1</MeleeDodgeChance>
+				<MeleeCritChance>1.1</MeleeCritChance>
+				<MeleeParryChance>1.1</MeleeParryChance>
+				<SmokeSensitivity>0.0</SmokeSensitivity>
+				<Suppressability>0.2</Suppressability>
+				<ArmorRating_Blunt>18</ArmorRating_Blunt>
+				<ArmorRating_Sharp>10</ArmorRating_Sharp>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="GethPrime"]</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Smash</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.56</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>16.625</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>Smash</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.56</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>16.625</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>3.05</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Geth"]</xpath>
+		<value>
+			<comps>
+				<li>
+					<compClass>CombatExtended.CompPawnGizmo</compClass>
+				</li>
+				<li Class="CombatExtended.CompProperties_Suppressable"/>
+			</comps>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="GethPrime"]</xpath>
+		<value>
+			<comps>
+				<li>
+					<compClass>CombatExtended.CompPawnGizmo</compClass>
+				</li>
+				<li Class="CombatExtended.CompProperties_Suppressable"/>
+			</comps>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Matter Manipulator/Patches/Matter Manipulator/MatterManipulator.xml b/ModPatches/Matter Manipulator/Patches/Matter Manipulator/MatterManipulator.xml
new file mode 100644
index 0000000000..5db6b22f09
--- /dev/null
+++ b/ModPatches/Matter Manipulator/Patches/Matter Manipulator/MatterManipulator.xml	
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Matter_Manipulator_Archotech" or
+			defName="Matter_Manipulator_Standard" or
+			defName="Matter_Manipulator_Prototype"]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Mechadroids/Patches/Mechadroids/Bodies_Mechadroids.xml b/ModPatches/Mechadroids/Patches/Mechadroids/Bodies_Mechadroids.xml
new file mode 100644
index 0000000000..cf6274fc62
--- /dev/null
+++ b/ModPatches/Mechadroids/Patches/Mechadroids/Bodies_Mechadroids.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_Mechadroid"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_Mechadroid"]/corePart/parts/li[def = "MechanicalNeck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_Mechadroid"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def = "Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_Mechadroid"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def = "Head"]/parts/li[def="HearingSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_Mechadroid"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def = "Head"]/parts/li[def="HearingSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_Mechadroid"]/corePart/parts/li[def = "MechanicalShoulder"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_Mechadroid"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def = "MechanicalArm"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_Mechadroid"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def = "MechanicalArm"]/parts/li[def = "MechanicalHand"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_Mechadroid"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def = "MechanicalArm"]/parts/li[def = "MechanicalHand"]/parts/li[def = "MechanicalFinger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_Mechadroid"]/corePart/parts/li[def = "MechanicalLeg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_Mechadroid"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def = "MechanicalFoot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="O21_Mechadroid"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
+		<value>
+			<li>LeftShoulder</li>
+			<li>Shoulders</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="O21_Mechadroid"]/corePart/parts/li[customLabel="right mechanical shoulder"]/groups</xpath>
+		<value>
+			<li>RightShoulder</li>
+			<li>Shoulders</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="O21_Mechadroid"]/corePart/parts/li[customLabel="left shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="O21_Mechadroid"]/corePart/parts/li[customLabel="right mechanical shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Mechadroids/Patches/Mechadroids/PawnKinds_Misc.xml b/ModPatches/Mechadroids/Patches/Mechadroids/PawnKinds_Misc.xml
new file mode 100644
index 0000000000..fa9532c187
--- /dev/null
+++ b/ModPatches/Mechadroids/Patches/Mechadroids/PawnKinds_Misc.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Give ammo to droids ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/PawnKindDef[defName="O21_Mechadroid_Villager" or defName="O21_Mechadroid_Primus"]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/PawnKindDef[defName="O21_Mechadroid_Guard"]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>7</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Mechadroids/Patches/Mechadroids/Race_Mechadroids.xml b/ModPatches/Mechadroids/Patches/Mechadroids/Race_Mechadroids.xml
new file mode 100644
index 0000000000..e86cd0d497
--- /dev/null
+++ b/ModPatches/Mechadroids/Patches/Mechadroids/Race_Mechadroids.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="O21_BaseMechadroid"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="O21_BaseMechadroid"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="O21_BaseMechadroid"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="O21_BaseMechadroid"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<SmokeSensitivity>0.00</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="O21_BaseMechadroid"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="O21_BaseMechadroid"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_MechadroidAlpha" or defName="O21_Alien_MechadroidGamma"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_MechadroidDelta"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.56</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.550</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.56</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.550</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>4.89</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.250</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="O21_BaseMechadroid"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Mechadroids/Patches/Mechadroids/ThingDefs_Items.xml b/ModPatches/Mechadroids/Patches/Mechadroids/ThingDefs_Items.xml
new file mode 100644
index 0000000000..99adfcec55
--- /dev/null
+++ b/ModPatches/Mechadroids/Patches/Mechadroids/ThingDefs_Items.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_MechanoidParts"]/statBases</xpath>
+		<value>
+			<Bulk>0.75</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_MechanoidRepairKit"]/statBases</xpath>
+		<value>
+			<Bulk>1.25</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_MechanoidPowerCell"]/statBases</xpath>
+		<value>
+			<Bulk>0.05</Bulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Mechanized Armor Set/Patches/Mechanized Armor Set/Ammo_&_Apparel_Defs.xml b/ModPatches/Mechanized Armor Set/Patches/Mechanized Armor Set/Ammo_&_Apparel_Defs.xml
new file mode 100644
index 0000000000..db895a12b1
--- /dev/null
+++ b/ModPatches/Mechanized Armor Set/Patches/Mechanized Armor Set/Ammo_&_Apparel_Defs.xml	
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Plate Helm-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Mechanized_Helm_Apparel"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mechanized_Helm_Apparel"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mechanized_Helm_Apparel"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>5.2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Mechanized_Helm_Apparel"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-0.8</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!--Plate Armour-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Mechanized_Plate_Apparel"]/statBases</xpath>
+		<value>
+			<Bulk>90</Bulk>
+			<WornBulk>12</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mechanized_Plate_Apparel"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>7.2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mechanized_Plate_Apparel"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>10.8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Mechanized_Plate_Apparel"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Mechanized_Plate_Apparel"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>12</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Mechanized_Plate_Apparel"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Musket-->
+	<!--Tools-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mechanized_Musket"]/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>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2.0</cooldownTime>
+					<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Bayonet</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>2.6</cooldownTime>
+					<armorPenetrationSharp>4.755</armorPenetrationSharp>
+					<armorPenetrationBlunt>6.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!--Shooting-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Mechanized_Musket</defName>
+		<statBases>
+			<Mass>1.25</Mass>
+			<Bulk>3.90</Bulk>
+			<SwayFactor>1.02</SwayFactor>
+			<ShotSpread>0.36</ShotSpread>
+			<SightsEfficiency>0.9</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_FastMusketBall</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>26</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>4</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>10</reloadTime>
+			<ammoSet>AmmoSet_FastMusketBall</ammoSet>
+			<reloadOneAtATime>true</reloadOneAtATime>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Mechanized_Musket"]/weaponTags</xpath>
+		<value>
+			<li>NoSwitch</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Mechanoid Bench 2 JGH/Patches/Mechanoid Bench 2 JGH/Apparel_MB2.xml b/ModPatches/Mechanoid Bench 2 JGH/Patches/Mechanoid Bench 2 JGH/Apparel_MB2.xml
new file mode 100644
index 0000000000..81ecc4b774
--- /dev/null
+++ b/ModPatches/Mechanoid Bench 2 JGH/Patches/Mechanoid Bench 2 JGH/Apparel_MB2.xml	
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ===== Mecha Power Armor ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>16</WornBulk>
+			<MaxHitPoints>1000</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>47</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="ApparelMBBase"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>90</CarryWeight>
+				<CarryBulk>13.5</CarryBulk>
+				<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+				<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaArmor"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>100</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>22</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>50</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="ApparelMBBase"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<!-- == Increase Mecha Armor Cost == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaArmor"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>210</Plasteel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaArmor"]/costList/Uranium</xpath>
+		<value>
+			<Uranium>70</Uranium>
+		</value>
+	</Operation>
+
+	<!-- ===== Mecha Power Helmet ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<MaxHitPoints>280</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaHelmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>2.5</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Apparel_MechaHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaHelmet"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>0.20</AimingAccuracy>
+				<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+				<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaHelmet"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>40</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>38</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="ApparelMBHelmetBase"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Mechanoid Bench 2 JGH/Patches/Mechanoid Bench 2 JGH/Hediff_MB2.xml b/ModPatches/Mechanoid Bench 2 JGH/Patches/Mechanoid Bench 2 JGH/Hediff_MB2.xml
new file mode 100644
index 0000000000..57937d97e6
--- /dev/null
+++ b/ModPatches/Mechanoid Bench 2 JGH/Patches/Mechanoid Bench 2 JGH/Hediff_MB2.xml	
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ===== Mecha Bionic Lens ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="JGH_MechaBionicEye"]/stages/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<AimingAccuracy>0.2</AimingAccuracy>
+				<NightVisionEfficiency_Implant>0.4</NightVisionEfficiency_Implant>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<!-- ===== Mecha Bionic Ear ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="JGH_MechaBionicEar"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- ===== Mecha Bionic Spine ===== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="JGH_MechaBionicSpine"]/stages/li/statOffsets</xpath>
+		<value>
+			<CarryWeight>20</CarryWeight>
+		</value>
+	</Operation>
+
+	<!-- ===== Mecha Bionic Arm ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="JGH_MechaBionicArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.11</cooldownTime>
+					<armorPenetrationBlunt>1.868</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Mechanoid Bench 2 JGH/Patches/Mechanoid Bench 2 JGH/Weapons_MB2.xml b/ModPatches/Mechanoid Bench 2 JGH/Patches/Mechanoid Bench 2 JGH/Weapons_MB2.xml
new file mode 100644
index 0000000000..abcba781a1
--- /dev/null
+++ b/ModPatches/Mechanoid Bench 2 JGH/Patches/Mechanoid Bench 2 JGH/Weapons_MB2.xml	
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ===== Mechanoid Bench Weapon Tools ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Gun_MechaMinigun" or defName = "Gun_MechaSniperRifle"]/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>
+
+	<!-- ===== Mecha Minigun ===== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MechaMinigun</defName>
+		<statBases>
+			<WorkToMake>69500</WorkToMake>
+			<Mass>28.0</Mass>
+			<Bulk>26.5</Bulk>
+			<SwayFactor>1.35</SwayFactor>
+			<ShotSpread>0.10</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
+			<burstShotCount>50</burstShotCount>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<warmupTime>2.5</warmupTime>
+			<range>65</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilAmount>1.24</recoilAmount>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>500</magazineSize>
+			<reloadTime>9.2</reloadTime>
+			<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>20</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>GunHeavy</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ===== Mecha Sniper Rifle ===== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MechaSniperRifle</defName>
+		<statBases>
+			<WorkToMake>53500</WorkToMake>
+			<Mass>4.5</Mass>
+			<Bulk>11.0</Bulk>
+			<SwayFactor>1.9</SwayFactor>
+			<ShotSpread>0.05</ShotSpread>
+			<SightsEfficiency>2.6</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
+			<warmupTime>1.6</warmupTime>
+			<range>77</range>
+			<soundCast>ChargeLance_Fire</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>SniperRifle</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Mechanoid Bench 3 JGH/Patches/Mechanoid Bench 3 JGH/Apparel_MB3.xml b/ModPatches/Mechanoid Bench 3 JGH/Patches/Mechanoid Bench 3 JGH/Apparel_MB3.xml
new file mode 100644
index 0000000000..99e82858e3
--- /dev/null
+++ b/ModPatches/Mechanoid Bench 3 JGH/Patches/Mechanoid Bench 3 JGH/Apparel_MB3.xml	
@@ -0,0 +1,318 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ===== Add Bodypart Groups and Layers ===== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="ApparelMBHelmetBase"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="ApparelMBBase"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<!-- ===== Add Costlist ===== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="ApparelMBHelmetBase"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>40</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="ApparelMBBase"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>100</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<!-- ===== Mecha Heavy Helmet ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaHeavyHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>1.5</WornBulk>
+			<MaxHitPoints>350</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaHeavyHelmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>3</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaHeavyHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Apparel_MechaHeavyHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaHeavyHelmet"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<AimingAccuracy>0.15</AimingAccuracy>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaHeavyHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>22</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaHeavyHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>48</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ===== Mecha Heavy Armor ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaHeavyArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<Bulk>115</Bulk>
+			<WornBulk>16</WornBulk>
+			<MaxHitPoints>1300</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaHeavyArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>55</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaHeavyArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<CarryWeight>95</CarryWeight>
+			<CarryBulk>12.2</CarryBulk>
+			<ShootingAccuracyPawn>0.10</ShootingAccuracyPawn>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaHeavyArmor"]/equippedStatOffsets/WorkSpeedGlobal</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaHeavyArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>28</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaHeavyArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>60</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ===== Mecha Combat Helmet ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaCombatHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<MaxHitPoints>280</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaCombatHelmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>2.5</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaCombatHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Apparel_MechaCombatHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaCombatHelmet"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<AimingAccuracy>0.20</AimingAccuracy>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaCombatHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaCombatHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>38</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ===== Mecha Combat Armor ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaCombatArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+			<MaxHitPoints>1000</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaCombatArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>47</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaCombatArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<CarryWeight>90</CarryWeight>
+			<CarryBulk>13.5</CarryBulk>
+			<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			<MoveSpeed>0.1</MoveSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaCombatArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>22</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaCombatArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>50</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ===== Mecha Sniper Helmet ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaSniperHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<MaxHitPoints>280</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaSniperHelmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>2</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaSniperHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Apparel_MechaSniperHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaSniperHelmet"]/equippedStatOffsets/AimingDelayFactor</xpath>
+		<value>
+			<AimingAccuracy>0.25</AimingAccuracy>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+			<NightVisionEfficiency_Apparel>0.8</NightVisionEfficiency_Apparel>
+			<AimingDelayFactor>-0.1</AimingDelayFactor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaSniperHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaSniperHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ===== Mecha Sniper Armor ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaSniperArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<Bulk>95</Bulk>
+			<WornBulk>14</WornBulk>
+			<MaxHitPoints>800</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaSniperArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>45</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaSniperArmor"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<CarryWeight>85</CarryWeight>
+			<CarryBulk>12.5</CarryBulk>
+			<ShootingAccuracyPawn>0.4</ShootingAccuracyPawn>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			<ReloadSpeed>0.2</ReloadSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaSniperArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MechaSniperArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>48</ArmorRating_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Mechanoid Bench 3 JGH/Patches/Mechanoid Bench 3 JGH/Hediff_MB3.xml b/ModPatches/Mechanoid Bench 3 JGH/Patches/Mechanoid Bench 3 JGH/Hediff_MB3.xml
new file mode 100644
index 0000000000..d649817f87
--- /dev/null
+++ b/ModPatches/Mechanoid Bench 3 JGH/Patches/Mechanoid Bench 3 JGH/Hediff_MB3.xml	
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ===== Mecha Bionic Lens ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="JGH_MechaBionicEye"]/stages/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<AimingAccuracy>0.2</AimingAccuracy>
+				<NightVisionEfficiency_Implant>0.4</NightVisionEfficiency_Implant>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<!-- ===== Mecha Bionic Ear ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="JGH_MechaBionicEar"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- ===== Mecha Bionic Spine ===== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="JGH_MechaBionicSpine"]/stages/li/statOffsets</xpath>
+		<value>
+			<CarryWeight>20</CarryWeight>
+		</value>
+	</Operation>
+
+	<!-- ===== Mecha Bionic Arm ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="JGH_MechaBionicArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.11</cooldownTime>
+					<armorPenetrationBlunt>4.868</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Mechanoid Bench 3 JGH/Patches/Mechanoid Bench 3 JGH/Reverse_Patch_MB3.xml b/ModPatches/Mechanoid Bench 3 JGH/Patches/Mechanoid Bench 3 JGH/Reverse_Patch_MB3.xml
new file mode 100644
index 0000000000..c6fd126e7f
--- /dev/null
+++ b/ModPatches/Mechanoid Bench 3 JGH/Patches/Mechanoid Bench 3 JGH/Reverse_Patch_MB3.xml	
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Vanilla Mechanoid Weapon -->
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Gun_InfernoCannon" or @Name="Gun_ChargeBlasterHeavyBase"]/destroyOnDrop</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Gun_InfernoCannon" or @Name="Gun_ChargeBlasterHeavyBase"]</xpath>
+			<value>
+				<destroyOnDrop>true</destroyOnDrop>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[@Name="Gun_ChargeBlasterHeavyBase"]/tradeability</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[@Name="Gun_ChargeBlasterHeavyBase"]</xpath>
+			<value>
+				<tradeability>None</tradeability>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationReplace">
+			<xpath>Defs/ThingDef[@Name="Gun_ChargeBlasterHeavyBase"]/tradeability</xpath>
+			<value>
+				<tradeability>None</tradeability>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Gun_InfernoCannon"]/tradeability</xpath>
+		<match Class="PatchOperationRemove">
+			<xpath>Defs/ThingDef[defName="Gun_InfernoCannon"]/tradeability</xpath>
+		</match>
+	</Operation>
+
+	<!-- Redundant RecipeDef -->
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="MechanoidBench_Bench"]/recipes/li[7]</xpath>
+		<match Class="PatchOperationRemove">
+			<xpath>Defs/ThingDef[defName="MechanoidBench_Bench"]/recipes/li[7]</xpath>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="MechanoidBench_Bench"]/recipes/li[6]</xpath>
+		<match Class="PatchOperationRemove">
+			<xpath>Defs/ThingDef[defName="MechanoidBench_Bench"]/recipes/li[6]</xpath>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="MechanoidBench_Bench"]/recipes/li[5]</xpath>
+		<match Class="PatchOperationRemove">
+			<xpath>Defs/ThingDef[defName="MechanoidBench_Bench"]/recipes/li[5]</xpath>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/RecipeDef[defName="MechanoidBench_MakeChargeBlaster" or defName="MechanoidBench_MakeInfernoCannon" or defName="MechanoidBench_MakeNeedleGun"]</xpath>
+		<match Class="PatchOperationRemove">
+			<xpath>Defs/RecipeDef[defName="MechanoidBench_MakeChargeBlaster" or defName="MechanoidBench_MakeInfernoCannon" or defName="MechanoidBench_MakeNeedleGun"]</xpath>
+		</match>
+	</Operation>
+
+	<!-- Redundant ResearchProjectDef -->
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/RecipeDef[defName="MechanoidBench_MakeChargeBlaster" or defName="MechanoidBench_MakeInfernoCannon" or defName="MechanoidBench_MakeNeedleGun"]/researchPrerequisite</xpath>
+		<match Class="PatchOperationRemove">
+			<xpath>Defs/RecipeDef[defName="MechanoidBench_MakeChargeBlaster" or defName="MechanoidBench_MakeInfernoCannon" or defName="MechanoidBench_MakeNeedleGun"]/researchPrerequisite</xpath>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ResearchProjectDef[defName="MechanoidBench_Research_Copy"]</xpath>
+		<match Class="PatchOperationRemove">
+			<xpath>Defs/ResearchProjectDef[defName="MechanoidBench_Research_Copy"]</xpath>
+		</match>
+	</Operation>
+
+	<!-- VFE-Mechanoid - Mech Weapon -->
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Factions Expanded - Mechanoids</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="VFE_Gun_AdvancedChargeLance" or @Name="VFE_Gun_ChargeBlasterLightBase"]/destroyOnDrop</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFE_Gun_AdvancedChargeLance" or @Name="VFE_Gun_ChargeBlasterLightBase"]</xpath>
+						<value>
+							<destroyOnDrop>true</destroyOnDrop>
+						</value>
+					</nomatch>
+					<match Class="PatchOperationReplace">
+						<xpath>Defs/ThingDef[defName="VFE_Gun_AdvancedChargeLance" or @Name="VFE_Gun_ChargeBlasterLightBase"]/destroyOnDrop</xpath>
+						<value>
+							<destroyOnDrop>true</destroyOnDrop>
+						</value>
+					</match>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="VFE_Gun_AdvancedChargeLance" or @Name="VFE_Gun_ChargeBlasterLightBase"]/tradeability</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFE_Gun_AdvancedChargeLance" or @Name="VFE_Gun_ChargeBlasterLightBase"]</xpath>
+						<value>
+							<tradeability>None</tradeability>
+						</value>
+					</nomatch>
+					<match Class="PatchOperationReplace">
+						<xpath>Defs/ThingDef[defName="VFE_Gun_AdvancedChargeLance" or @Name="VFE_Gun_ChargeBlasterLightBase"]/tradeability</xpath>
+						<value>
+							<tradeability>None</tradeability>
+						</value>
+					</match>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Mechanoid Bench 3 JGH/Patches/Mechanoid Bench 3 JGH/Weapons_MB3.xml b/ModPatches/Mechanoid Bench 3 JGH/Patches/Mechanoid Bench 3 JGH/Weapons_MB3.xml
new file mode 100644
index 0000000000..27cc9ac68f
--- /dev/null
+++ b/ModPatches/Mechanoid Bench 3 JGH/Patches/Mechanoid Bench 3 JGH/Weapons_MB3.xml	
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ===== Mechanoid Bench Weapon Tools ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Gun_MechaMinigun" or defName = "Gun_MechaSniperRifle" or defName = "Gun_MechaShotgun"]/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>
+
+	<!-- ===== Mecha Minigun ===== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MechaMinigun</defName>
+		<statBases>
+			<Mass>28.0</Mass>
+			<Bulk>26.5</Bulk>
+			<SwayFactor>1.35</SwayFactor>
+			<ShotSpread>0.10</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
+			<burstShotCount>50</burstShotCount>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<warmupTime>2.5</warmupTime>
+			<range>65</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+			<recoilAmount>1.24</recoilAmount>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>750</magazineSize>
+			<reloadTime>9.2</reloadTime>
+			<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>20</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>GunHeavy</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ===== Mecha Sniper Rifle ===== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MechaSniperRifle</defName>
+		<statBases>
+			<Mass>4.5</Mass>
+			<Bulk>11.0</Bulk>
+			<SwayFactor>1.9</SwayFactor>
+			<ShotSpread>0.05</ShotSpread>
+			<SightsEfficiency>2.6</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<NightVisionEfficiency_Weapon>0.4</NightVisionEfficiency_Weapon>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_8x50mmCharged</defaultProjectile>
+			<warmupTime>1.6</warmupTime>
+			<range>85</range>
+			<soundCast>ChargeLance_Fire</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_8x50mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>SniperRifle</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ===== Mecha Shotgun ===== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MechaShotgun</defName>
+		<statBases>
+			<Mass>3.45</Mass>
+			<Bulk>5</Bulk>
+			<SwayFactor>1.25</SwayFactor>
+			<ShotSpread>0.14</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_12GaugeCharged</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>22</range>
+			<soundCast>ChargeLance_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_12GaugeCharged</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Mechanoid Master Blaster/Patches/Mechanoid Master Blaster/MechanoidMasterBlaster_CE_MPC_TE_Patch.xml b/ModPatches/Mechanoid Master Blaster/Patches/Mechanoid Master Blaster/MechanoidMasterBlaster_CE_MPC_TE_Patch.xml
new file mode 100644
index 0000000000..4034451136
--- /dev/null
+++ b/ModPatches/Mechanoid Master Blaster/Patches/Mechanoid Master Blaster/MechanoidMasterBlaster_CE_MPC_TE_Patch.xml	
@@ -0,0 +1,298 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Mod Support for Combat Extended -->
+	<!-- Remove Explosive comp -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName = "MPC_MechanoidBlasterTurret" or
+			defName = "MPC_MechanoidLaserTurret" or
+			defName = "MPC_MechanoidShockwaveTurret" or
+			defName = "MPC_MechanoidDevastatorTurret" or
+			defName = "MPC_MechanoidMultiTurret" or
+			defName = "MPC_MechanoidTrinityTurret"
+			]/comps/li[@Class = "CompProperties_Explosive"] </xpath>
+	</Operation>
+
+	<!-- Replace vanilla thingClass -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "MPC_MechanoidBlasterTurret" or
+			defName = "MPC_MechanoidLaserTurret" or
+			defName = "MPC_MechanoidShockwaveTurret" or
+			defName = "MPC_MechanoidDevastatorTurret" or
+			defName = "MPC_MechanoidMultiTurret" or
+			defName = "MPC_MechanoidTrinityTurret"
+			]/thingClass </xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "MPC_MechanoidBlasterTurret" or
+			defName = "MPC_MechanoidLaserTurret" or
+			defName = "MPC_MechanoidShockwaveTurret" or
+			defName = "MPC_MechanoidDevastatorTurret" or
+			defName = "MPC_MechanoidMultiTurret" or
+			defName = "MPC_MechanoidTrinityTurret"
+			]/statBases/ShootingAccuracyTurret </xpath>
+		<value>
+			<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MechanoidBlasterTurret</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>0.5</SwayFactor>
+			<RangedWeapon_Cooldown>0.1</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.69</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_30x64mmFuel_Incendiary</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>52.4</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>12</burstShotCount>
+			<soundCast>MechanoidPoweredNitroRound</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>false</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+			<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_30x64mmFuel</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>10</aimedBurstShotCount>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MechanoidLaserTurret</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>0.35</SwayFactor>
+			<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.69</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_30x64mmFuel_Thermobaric</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>52.4</range>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<burstShotCount>6</burstShotCount>
+			<soundCast>MechanoidLaserPulse</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>false</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+			<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_30x64mmFuel</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MechanoidShockwaveTurret</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>0.75</SwayFactor>
+			<RangedWeapon_Cooldown>0.1</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.39</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_60x225mmGamma_Standard</defaultProjectile>
+			<warmupTime>0.1</warmupTime>
+			<range>52.4</range>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<burstShotCount>2</burstShotCount>
+			<soundCast>MechanoidEnergizedShot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+			<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_60x225mmGamma</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>1</aimedBurstShotCount>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MechanoidDevastatorTurret</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.73</SwayFactor>
+			<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.25</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
+			<warmupTime>1.8</warmupTime>
+			<range>55</range>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<burstShotCount>4</burstShotCount>
+			<soundCast>MechanoidBlizzard</soundCast>
+			<soundCastTail>MechanoidThermal</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>true</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>1</aimedBurstShotCount>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MechanoidMultiTurret</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>0.23</SwayFactor>
+			<RangedWeapon_Cooldown>0.9</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.25</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.6</warmupTime>
+			<range>55</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>30</burstShotCount>
+			<soundCast>MechanoidPhaserBeam</soundCast>
+			<soundCastTail>MechanoidShredder</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>180</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>true</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>24</aimedBurstShotCount>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MechanoidTrinityTurret</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>0.43</SwayFactor>
+			<RangedWeapon_Cooldown>1.8</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.45</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12x64mmCharged</defaultProjectile>
+			<warmupTime>1.6</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<burstShotCount>25</burstShotCount>
+			<soundCast>MechanoidShredder</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>2</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>150</magazineSize>
+			<reloadTime>8.8</reloadTime>
+			<ammoSet>AmmoSet_12x64mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>true</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>15</aimedBurstShotCount>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MechanoidsExtraordinaire/Patches/MechanoidsExtraordinaire/BodyDefs/Bodies_Mechanoid_Chimera.xml b/ModPatches/MechanoidsExtraordinaire/Patches/MechanoidsExtraordinaire/BodyDefs/Bodies_Mechanoid_Chimera.xml
new file mode 100644
index 0000000000..976890f987
--- /dev/null
+++ b/ModPatches/MechanoidsExtraordinaire/Patches/MechanoidsExtraordinaire/BodyDefs/Bodies_Mechanoid_Chimera.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Add armor coverage ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "ChimeraME"]/corePart</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "ChimeraME"]/corePart/parts/li[def = "ExtensionPortME"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "ChimeraME"]/corePart/parts/li[def = "MechanicalChimeraTailME"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "ChimeraME"]/corePart/parts/li[def = "ExtensionPortME"]/parts/li[def = "WeaponHolderME"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "ChimeraME"]/corePart/parts/li[def = "MechanicalNeckME"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "ChimeraME"]/corePart/parts/li[def = "MechanicalNeckME"]/parts/li[def="MechanicalHeadME"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "ChimeraME"]/corePart/parts/li[def = "MechanicalLeg"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "ChimeraME"]/corePart/parts/li[def = "MechanicalLeg"]/parts/li[def = "MechanicalFoot"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MechanoidsExtraordinaire/Patches/MechanoidsExtraordinaire/BodyDefs/Bodies_Mechanoid_Goliath.xml b/ModPatches/MechanoidsExtraordinaire/Patches/MechanoidsExtraordinaire/BodyDefs/Bodies_Mechanoid_Goliath.xml
new file mode 100644
index 0000000000..22b5c68c63
--- /dev/null
+++ b/ModPatches/MechanoidsExtraordinaire/Patches/MechanoidsExtraordinaire/BodyDefs/Bodies_Mechanoid_Goliath.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Add armor coverage ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "GoliathME"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "GoliathME"]/corePart/parts/li[def = "MechanicalShoulder"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "GoliathME"]/corePart/parts/li[def = "MechanicalShoulder"]/parts/li[def = "MechanicalArm"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "GoliathME"]/corePart/parts/li[def = "MechanicalShoulder"]/parts/li[def = "MechanicalArm"]/parts/li[def = "MechanicalHand"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "GoliathME"]/corePart/parts/li[def = "MechanicalShoulder"]/parts/li[def = "MechanicalArm"]/parts/li[def = "MechanicalHand"]/parts/li[def = "MechanicalFinger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "GoliathME"]/corePart/parts/li[def = "MechanicalLeg"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "GoliathME"]/corePart/parts/li[def = "MechanicalLeg"]/parts/li[def = "MechanicalFoot"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MechanoidsExtraordinaire/Patches/MechanoidsExtraordinaire/BodyDefs/Bodies_Mechanoid_Hound.xml b/ModPatches/MechanoidsExtraordinaire/Patches/MechanoidsExtraordinaire/BodyDefs/Bodies_Mechanoid_Hound.xml
new file mode 100644
index 0000000000..9b684307be
--- /dev/null
+++ b/ModPatches/MechanoidsExtraordinaire/Patches/MechanoidsExtraordinaire/BodyDefs/Bodies_Mechanoid_Hound.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Add armor coverage ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "HoundME"]/corePart</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "HoundME"]/corePart/parts/li[def = "ExtensionPortME"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "HoundME"]/corePart/parts/li[def = "ExtensionPortME"]/parts/li[def = "WeaponHolderME"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "HoundME"]/corePart/parts/li[def = "MechanicalNeck"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "HoundME"]/corePart/parts/li[def = "MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "HoundME"]/corePart/parts/li[def = "MechanicalLegME"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "HoundME"]/corePart/parts/li[def = "MechanicalLegME"]/parts/li[def = "MechanicalPawME"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MechanoidsExtraordinaire/Patches/MechanoidsExtraordinaire/BodyDefs/Bodies_Mechanoid_Kraken.xml b/ModPatches/MechanoidsExtraordinaire/Patches/MechanoidsExtraordinaire/BodyDefs/Bodies_Mechanoid_Kraken.xml
new file mode 100644
index 0000000000..e88d6a2664
--- /dev/null
+++ b/ModPatches/MechanoidsExtraordinaire/Patches/MechanoidsExtraordinaire/BodyDefs/Bodies_Mechanoid_Kraken.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Add armor coverage ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "KrakenME"]/corePart</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "KrakenME"]/corePart/parts/li[def = "MechanicalHeadME"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "KrakenME"]/corePart/parts/li[def = "LimbPortME"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "KrakenME"]/corePart/parts/li[def = "LimbPortME"]/parts/li[def = "MechaTentacleME"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MechanoidsExtraordinaire/Patches/MechanoidsExtraordinaire/BodyDefs/Bodies_Mechanoid_Vespa.xml b/ModPatches/MechanoidsExtraordinaire/Patches/MechanoidsExtraordinaire/BodyDefs/Bodies_Mechanoid_Vespa.xml
new file mode 100644
index 0000000000..cab178dc4d
--- /dev/null
+++ b/ModPatches/MechanoidsExtraordinaire/Patches/MechanoidsExtraordinaire/BodyDefs/Bodies_Mechanoid_Vespa.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Add armor coverage ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "VespaME"]/corePart</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "VespaME"]/corePart/parts/li[def = "MechanicalNeck"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "VespaME"]/corePart/parts/li[def = "MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "VespaME"]/corePart/parts/li[def = "MechanicalShoulder"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "VespaME"]/corePart/parts/li[def = "MechanicalShoulder"]/parts/li[def = "MechanicalArm"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "VespaME"]/corePart/parts/li[def = "MechanicalShoulder"]/parts/li[def = "MechanicalArm"]/parts/li[def = "MechanicalHand"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "VespaME"]/corePart/parts/li[def = "MechanicalLeg"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "VespaME"]/corePart/parts/li[def = "MechanicalLeg"]/parts/li[def = "MechanicalFoot"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MechanoidsExtraordinaire/Patches/MechanoidsExtraordinaire/HediffDefs/Hediffs_Local_AddedParts_MechanoidsExtraordinaire.xml b/ModPatches/MechanoidsExtraordinaire/Patches/MechanoidsExtraordinaire/HediffDefs/Hediffs_Local_AddedParts_MechanoidsExtraordinaire.xml
new file mode 100644
index 0000000000..a2d362b78a
--- /dev/null
+++ b/ModPatches/MechanoidsExtraordinaire/Patches/MechanoidsExtraordinaire/HediffDefs/Hediffs_Local_AddedParts_MechanoidsExtraordinaire.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="MechaTentacleME"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<cooldownTime>1.2</cooldownTime>
+					<power>13</power>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<armorPenetrationBlunt>4.00</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MechanoidsExtraordinaire/Patches/MechanoidsExtraordinaire/PawnKindDefs/PawnKinds_MechanoidsExtraordinaire.xml b/ModPatches/MechanoidsExtraordinaire/Patches/MechanoidsExtraordinaire/PawnKindDefs/PawnKinds_MechanoidsExtraordinaire.xml
new file mode 100644
index 0000000000..5503f7cc0c
--- /dev/null
+++ b/ModPatches/MechanoidsExtraordinaire/Patches/MechanoidsExtraordinaire/PawnKindDefs/PawnKinds_MechanoidsExtraordinaire.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Hound"]/combatPower</xpath>
+		<value>
+			<combatPower>550</combatPower>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Chimera"]/combatPower</xpath>
+		<value>
+			<combatPower>550</combatPower>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Kraken"]/combatPower</xpath>
+		<value>
+			<combatPower>650</combatPower>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Vespa" or defName="Hound" or defName="Chimera" or defName="Kraken"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MechanoidsExtraordinaire/Patches/MechanoidsExtraordinaire/ThingDefs_Misc/Weapons_Grenades_MechanoidsExtraordinaire.xml b/ModPatches/MechanoidsExtraordinaire/Patches/MechanoidsExtraordinaire/ThingDefs_Misc/Weapons_Grenades_MechanoidsExtraordinaire.xml
new file mode 100644
index 0000000000..4cb3d9b4ba
--- /dev/null
+++ b/ModPatches/MechanoidsExtraordinaire/Patches/MechanoidsExtraordinaire/ThingDefs_Misc/Weapons_Grenades_MechanoidsExtraordinaire.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Weapon_GrenadeLauncher_ME"]/label</xpath>
+		<value>
+			<label>Mechanoid Grenade Launcher</label>
+		</value>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Weapon_GrenadeLauncher_ME</defName>
+		<statBases>
+			<Mass>30.00</Mass>
+			<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.28</SwayFactor>
+			<Bulk>14.50</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_70mmMechanoidGrenade_HE</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>75</range>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<soundCast>ThrowGrenade</soundCast>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_70mmMechanoidGrenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Launcher</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MechanoidsExtraordinaire/Patches/MechanoidsExtraordinaire/ThingDefs_Misc/Weapons_Guns_MechanoidsExtraordinaire.xml b/ModPatches/MechanoidsExtraordinaire/Patches/MechanoidsExtraordinaire/ThingDefs_Misc/Weapons_Guns_MechanoidsExtraordinaire.xml
new file mode 100644
index 0000000000..7bb38b1395
--- /dev/null
+++ b/ModPatches/MechanoidsExtraordinaire/Patches/MechanoidsExtraordinaire/ThingDefs_Misc/Weapons_Guns_MechanoidsExtraordinaire.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_InfernoCannonChimeraME</defName>
+		<statBases>
+			<Mass>300.00</Mass>
+			<RangedWeapon_Cooldown>2.53</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>0.82</SwayFactor>
+			<Bulk>20.00</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_80x256mmFuel_Incendiary</defaultProjectile>
+			<warmupTime>4.1</warmupTime>
+			<range>86</range>
+			<burstShotCount>1</burstShotCount>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>2</AmmoGenPerMagOverride>
+			<reloadTime>9.8</reloadTime>
+			<ammoSet>AmmoSet_80x256mmFuel</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Launcher</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MechanoidsExtraordinaire/Patches/MechanoidsExtraordinaire/ThingDefs_Races/Races_Mechanoid_MechanoidsExtraordinaire.xml b/ModPatches/MechanoidsExtraordinaire/Patches/MechanoidsExtraordinaire/ThingDefs_Races/Races_Mechanoid_MechanoidsExtraordinaire.xml
new file mode 100644
index 0000000000..f110f123d5
--- /dev/null
+++ b/ModPatches/MechanoidsExtraordinaire/Patches/MechanoidsExtraordinaire/ThingDefs_Races/Races_Mechanoid_MechanoidsExtraordinaire.xml
@@ -0,0 +1,330 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Vespa ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Mechanoid_Vespa"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Mechanoid_Vespa"]/statBases</xpath>
+		<value>
+			<CarryWeight>55</CarryWeight>
+			<CarryBulk>22</CarryBulk>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.25</MeleeCritChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mechanoid_Vespa"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mechanoid_Vespa"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mechanoid_Vespa"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- ========== Hound ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Mechanoid_Hound"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Mechanoid_Hound"]/statBases</xpath>
+		<value>
+			<CarryWeight>200</CarryWeight>
+			<CarryBulk>100</CarryBulk>
+			<AimingAccuracy>0.8</AimingAccuracy>
+			<ShootingAccuracyPawn>0.8</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mechanoid_Hound"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>27</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mechanoid_Hound"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mechanoid_Hound"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<armorPenetrationSharp>4.5</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<armorPenetrationSharp>4.5</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- ========== Chimera ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Mechanoid_Chimera"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Mechanoid_Chimera"]/statBases</xpath>
+		<value>
+			<CarryWeight>200</CarryWeight>
+			<CarryBulk>120</CarryBulk>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.10</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mechanoid_Chimera"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>30</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mechanoid_Chimera"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mechanoid_Chimera"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.7</cooldownTime>
+					<linkedBodyPartsGroup>TailBladeME</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<armorPenetrationSharp>12</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- ========== Goliath ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Mechanoid_Goliath"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Mechanoid_Goliath"]/statBases</xpath>
+		<value>
+			<CarryWeight>150</CarryWeight>
+			<CarryBulk>40</CarryBulk>
+			<AimingAccuracy>0.8</AimingAccuracy>
+			<ShootingAccuracyPawn>0.8</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.50</MeleeCritChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mechanoid_Goliath"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mechanoid_Goliath"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mechanoid_Goliath"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- ========== Kraken ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Mechanoid_Kraken"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Mechanoid_Kraken"]/statBases</xpath>
+		<value>
+			<CarryWeight>200</CarryWeight>
+			<CarryBulk>150</CarryBulk>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.40</MeleeCritChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mechanoid_Kraken"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mechanoid_Kraken"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>22</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mechanoid_Kraken"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>first left tentacle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>UpperLeftMechaTentacleME</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>16</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>first right tentacle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>UpperRightMechaTentacleME</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>16</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>second left tentacle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>LowerLeftMechaTentacleME</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>16</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>second right tentacle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>LowerRightMechaTentacleME</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>16</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedModules/AddedModules_Archotech.xml b/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedModules/AddedModules_Archotech.xml
new file mode 100644
index 0000000000..93616835b6
--- /dev/null
+++ b/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedModules/AddedModules_Archotech.xml	
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==== Archotech Modules  ==== -->
+	<!-- MSE_ArchotechArmModule -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="MSE_ArchotechArmModule"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.25</cooldownTime>
+					<armorPenetrationBlunt>1.333</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- MSE_ArchotechHandModule -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="MSE_ArchotechHandModule"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>0.95</cooldownTime>
+					<armorPenetrationBlunt>0.444</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- MSE_ArchotechFingerModule -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="MSE_ArchotechFingerModule"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stinger</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>0.63</cooldownTime>
+					<armorPenetrationBlunt>0.089</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedModules/AddedModules_ArchotechSpecial.xml b/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedModules/AddedModules_ArchotechSpecial.xml
new file mode 100644
index 0000000000..4d8f571bf3
--- /dev/null
+++ b/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedModules/AddedModules_ArchotechSpecial.xml	
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==== Special Archotech Modules  ==== -->
+	<!-- MSE_AdvancedRangedPlatformModule -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="MSE_AdvancedRangedPlatformModule"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<capMods>
+						<li>
+							<capacity>Manipulation</capacity>
+							<offset>0.03</offset>
+						</li>
+					</capMods>
+					<statOffsets>
+						<ShootingAccuracyPawn>4</ShootingAccuracyPawn>
+						<AimingAccuracy>0.4</AimingAccuracy>
+						<AimingDelayFactor>-0.2</AimingDelayFactor>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- MSE_AdvancedMeleePlatformModule -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="MSE_AdvancedMeleePlatformModule"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<capMods>
+						<li>
+							<capacity>Manipulation</capacity>
+							<offset>0.03</offset>
+						</li>
+					</capMods>
+					<statOffsets>
+						<MeleeDodgeChance>0.8</MeleeDodgeChance>
+						<MeleeHitChance>8</MeleeHitChance>
+						<MeleeCritChance>0.8</MeleeCritChance>
+						<MeleeParryChance>0.8</MeleeParryChance>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- MSE_AdvancedPowerArmModule -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="MSE_AdvancedPowerArmModule"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.95</cooldownTime>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- MSE_AdvancedPowerClawModule -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="MSE_AdvancedPowerClawModule"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>1</cooldownTime>
+					<armorPenetrationBlunt>3.161</armorPenetrationBlunt>
+					<armorPenetrationSharp>6.33</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- MSE_AdamantiumBoneModule -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="MSE_AdamantiumBoneModule"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<capMods>
+						<li>
+							<capacity>Manipulation</capacity>
+							<offset>0.03</offset>
+						</li>
+					</capMods>
+					<statOffsets>
+						<ArmorRating_Blunt>0.9</ArmorRating_Blunt>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedModules/AddedModules_Bionic.xml b/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedModules/AddedModules_Bionic.xml
new file mode 100644
index 0000000000..c7d2661dc8
--- /dev/null
+++ b/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedModules/AddedModules_Bionic.xml	
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==== Bionic Modules  ==== -->
+	<!-- MSE_BionicArmModule -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="MSE_BionicArmModule"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.66</cooldownTime>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- MSE_BionicHandModule -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="MSE_BionicHandModule"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- MSE_BionicFingerModule -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="MSE_BionicFingerModule"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stinger</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>0.84</cooldownTime>
+					<armorPenetrationBlunt>0.05</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedModules/AddedModules_BionicSpecial.xml b/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedModules/AddedModules_BionicSpecial.xml
new file mode 100644
index 0000000000..065335d16e
--- /dev/null
+++ b/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedModules/AddedModules_BionicSpecial.xml	
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==== Special Bionic Modules  ==== -->
+	<!-- MSE_RangedPlatformModule -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="MSE_RangedPlatformModule"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ShootingAccuracyPawn>2</ShootingAccuracyPawn>
+						<AimingAccuracy>0.2</AimingAccuracy>
+						<AimingDelayFactor>-0.1</AimingDelayFactor>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- MSE_MeleePlatformModule -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="MSE_MeleePlatformModule"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<MeleeDodgeChance>0.4</MeleeDodgeChance>
+						<MeleeHitChance>4</MeleeHitChance>
+						<MeleeCritChance>0.4</MeleeCritChance>
+						<MeleeParryChance>0.4</MeleeParryChance>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- MSE_PowerArmModule -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="MSE_PowerArmModule"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.6</cooldownTime>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- MSE_PowerClawModule -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="MSE_PowerClawModule"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.34</cooldownTime>
+					<armorPenetrationBlunt>1.778</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.36</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- MSE_AdamantiumCoatedBoneModule -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="MSE_AdamantiumCoatedBoneModule"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Blunt>0.3</ArmorRating_Blunt>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts.xml b/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts.xml
new file mode 100644
index 0000000000..3bfbfd3cba
--- /dev/null
+++ b/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts.xml	
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==== Bases ==== -->
+	<!-- Simple -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[@Name="MSE_AddedBodyPartSimpleBase"]/stages/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ArmorRating_Blunt>0.138</ArmorRating_Blunt>
+				<ArmorRating_Sharp>0.075</ArmorRating_Sharp>
+			</statOffsets>
+		</value>
+	</Operation>
+	<!-- Bionic -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[@Name="MSE_AddedBodyPartBionicBase"]/stages/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ArmorRating_Blunt>0.39</ArmorRating_Blunt>
+				<ArmorRating_Sharp>0.212</ArmorRating_Sharp>
+				<ArmorRating_Heat>0.106</ArmorRating_Heat>
+			</statOffsets>
+		</value>
+	</Operation>
+	<!-- Archotech -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[@Name="MSE_AddedBodyPartArchotechBase"]/stages/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ArmorRating_Blunt>1.102</ArmorRating_Blunt>
+				<ArmorRating_Sharp>0.6</ArmorRating_Sharp>
+				<ArmorRating_Heat>0.3</ArmorRating_Heat>
+			</statOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_Archotech.xml b/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_Archotech.xml
new file mode 100644
index 0000000000..55fb830ad2
--- /dev/null
+++ b/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_Archotech.xml	
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==== Archotech Prosthesis  ==== -->
+	<!-- ArchotechHeart -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ArchotechHeart"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.48</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.882</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.064</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- ArchotechStomach and ArchotechPelvis -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ArchotechStomach" or defName="ArchotechPelvis"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.6</ArmorRating_Sharp>
+						<ArmorRating_Blunt>1.102</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.08</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- ArchotechLung -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ArchotechLung"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.66</ArmorRating_Sharp>
+						<ArmorRating_Blunt>1.212</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.088</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- ArchotechKidney -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ArchotechKidney"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.36</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.661</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.048</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- ArchotechLiver -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ArchotechLiver"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.72</ArmorRating_Sharp>
+						<ArmorRating_Blunt>1.323</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.096</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- ArchotechEar -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ArchotechEar"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.026</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.048</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.004</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- ArchotechFoot -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ArchotechFoot"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.115</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.212</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.015</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- ArchotechToe -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ArchotechToe"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.008</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.015</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.001</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- ArchotechShoulder -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ArchotechShoulder"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>1.015</ArmorRating_Sharp>
+						<ArmorRating_Blunt>1.865</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.135</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- ArchotechHand -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ArchotechHand"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.107</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.196</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.014</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ArchotechHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>0.63</cooldownTime>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- ArchotechFinger -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ArchotechFinger"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.007</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.013</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.001</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- ArchotechJaw -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ArchotechJaw"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.079</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.145</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.011</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- ArchotechSpine -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ArchotechSpine"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.3</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.551</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.04</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- ArchotechClavicle -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ArchotechClavicle"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.061</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.112</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.008</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- ArchotechSternum, ArchotechFemur and ArchotechTibia -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ArchotechSternum" or defName="ArchotechFemur" or defName="ArchotechTibia"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.18</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.331</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.024</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- ArchotechRib -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ArchotechRib"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.144</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.265</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.019</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- ArchotechHumerus and ArchotechRadius -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ArchotechHumerus" or defName="ArchotechRadius"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.118</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.216</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.016</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_ArchotechSpecial.xml b/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_ArchotechSpecial.xml
new file mode 100644
index 0000000000..3af4bd4a14
--- /dev/null
+++ b/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_ArchotechSpecial.xml	
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==== Special Archotech Prosthesis  ==== -->
+	<!-- AdvancedAntitoxinKidney -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AdvancedAntitoxinKidney"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.36</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.661</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.048</ArmorRating_Heat>
+						<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- AdvancedMedicalLiver -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AdvancedMedicalLiver"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.72</ArmorRating_Sharp>
+						<ArmorRating_Blunt>1.323</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.096</ArmorRating_Heat>
+						<ImmunityGainSpeed>0.5</ImmunityGainSpeed>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- AdvancedEnergizedLiver -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AdvancedEnergizedLiver"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.72</ArmorRating_Sharp>
+						<ArmorRating_Blunt>1.323</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.096</ArmorRating_Heat>
+					</statOffsets>
+					<restFallFactor>0.5</restFallFactor>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- AdvancedPowerArm -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="AdvancedPowerArm"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.786</ArmorRating_Sharp>
+						<ArmorRating_Blunt>1.444</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.105</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AdvancedPowerArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>41</power>
+					<cooldownTime>1.3</cooldownTime>
+					<armorPenetrationBlunt>18</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- MSE_AdvancedPowerBlade -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="MSE_AdvancedPowerBlade"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>1.015</ArmorRating_Sharp>
+						<ArmorRating_Blunt>1.865</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.135</ArmorRating_Heat>
+						<MeleeCritChance>0.11</MeleeCritChance>
+						<MeleeParryChance>0.13</MeleeParryChance>
+						<MeleeDodgeChance>0.27</MeleeDodgeChance>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="MSE_AdvancedPowerBlade"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>48</power>
+					<cooldownTime>1.32</cooldownTime>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<armorPenetrationSharp>24</armorPenetrationSharp>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.58</cooldownTime>
+					<armorPenetrationBlunt>2.344</armorPenetrationBlunt>
+					<armorPenetrationSharp>46.88</armorPenetrationSharp>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- AdvancedPowerClaw -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="AdvancedPowerClaw"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.107</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.196</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.014</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AdvancedPowerClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>0.67</cooldownTime>
+					<armorPenetrationSharp>14.23</armorPenetrationSharp>
+					<armorPenetrationBlunt>7.111</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- AdvancedBreathingSupportRib -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AdvancedBreathingSupportRib"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.144</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.265</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.019</ArmorRating_Heat>
+					</statOffsets>
+					<capMods>
+						<li>
+							<capacity>Breathing</capacity>
+							<offset>0.2</offset>
+						</li>
+					</capMods>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- AdvancedRelaxationRib -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AdvancedRelaxationRib"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.144</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.265</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.019</ArmorRating_Heat>
+						<MentalBreakThreshold>-0.2</MentalBreakThreshold>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- AdvancedColdRegulatorRib -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AdvancedColdRegulatorRib"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.144</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.265</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.019</ArmorRating_Heat>
+						<ComfyTemperatureMin>-10</ComfyTemperatureMin>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- AdvancedHeatRegulatorRib -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AdvancedHeatRegulatorRib"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.144</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.265</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.019</ArmorRating_Heat>
+						<ComfyTemperatureMax>10</ComfyTemperatureMax>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_Bionic.xml b/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_Bionic.xml
new file mode 100644
index 0000000000..517371cc6a
--- /dev/null
+++ b/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_Bionic.xml	
@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==== Bionic Prosthesis  ==== -->
+	<!-- BionicLung -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="BionicLung"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.233</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.429</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.044</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- BionicKidney -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="BionicKidney"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.127</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.234</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.024</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- BionicLiver -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="BionicLiver"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.255</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.468</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.048</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- BionicFoot -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="BionicFoot"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.041</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.008</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- BionicToe -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="BionicToe"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.003</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.005</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.001</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- BionicShoulder -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="BionicShoulder"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.359</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.659</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.068</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- BionicHand -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="BionicHand"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.038</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.069</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.007</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BionicHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>0.84</cooldownTime>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.563</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- BionicFinger -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="BionicFinger"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.003</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.005</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.0005</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- BionicJaw -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="BionicJaw"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.028</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.051</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.005</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- BionicClavicle -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="BionicClavicle"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.022</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.04</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.004</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- BionicSternum, BionicFemur and BionicTibia -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="BionicSternum" or defName="BionicFemur" or defName="BionicTibia"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.064</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.117</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.012</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- BionicRib -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="BionicRib"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.051</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.094</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.01</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- BionicPelvis -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="BionicPelvis"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.212</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.39</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.04</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- BionicHumerus and BionicRadius -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="BionicHumerus" or defName="BionicRadius"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.042</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.076</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.008</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_BionicSpecial.xml b/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_BionicSpecial.xml
new file mode 100644
index 0000000000..234c78071e
--- /dev/null
+++ b/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_BionicSpecial.xml	
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==== Special Bionic Prosthesis  ==== -->
+	<!-- AntitoxinKidney -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AntitoxinKidney"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.127</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.234</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.024</ArmorRating_Heat>
+						<ToxicEnvironmentResistance>0.25</ToxicEnvironmentResistance>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- MedicalLiver -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="MedicalLiver"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.255</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.468</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.048</ArmorRating_Heat>
+						<ImmunityGainSpeed>0.25</ImmunityGainSpeed>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- EnergizedLiver -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EnergizedLiver"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.255</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.468</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.048</ArmorRating_Heat>
+					</statOffsets>
+					<restFallFactor>0.75</restFallFactor>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- PowerArm -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="PowerArm"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.278</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.511</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.052</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="PowerArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>1.73</cooldownTime>
+					<armorPenetrationBlunt>10.125</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- MSE_PowerBlade -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="MSE_PowerBlade"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.359</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.659</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.068</ArmorRating_Heat>
+						<MeleeCritChance>0.11</MeleeCritChance>
+						<MeleeParryChance>0.13</MeleeParryChance>
+						<MeleeDodgeChance>0.27</MeleeDodgeChance>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="MSE_PowerBlade"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>37</power>
+					<cooldownTime>1.32</cooldownTime>
+					<armorPenetrationBlunt>3.375</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.35</armorPenetrationSharp>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>2.11</cooldownTime>
+					<armorPenetrationBlunt>1.318</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.64</armorPenetrationSharp>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- BreathingSupportRib -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BreathingSupportRib"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.051</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.094</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.01</ArmorRating_Heat>
+					</statOffsets>
+					<capMods>
+						<li>
+							<capacity>Breathing</capacity>
+							<offset>0.10</offset>
+						</li>
+					</capMods>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- RelaxationRib -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="RelaxationRib"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.051</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.094</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.01</ArmorRating_Heat>
+						<MentalBreakThreshold>-0.1</MentalBreakThreshold>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- ColdRegulatorRib -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ColdRegulatorRib"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.051</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.094</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.01</ArmorRating_Heat>
+						<ComfyTemperatureMin>-5</ComfyTemperatureMin>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- HeatRegulatorRib -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="HeatRegulatorRib"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.051</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.094</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.01</ArmorRating_Heat>
+						<ComfyTemperatureMax>5</ComfyTemperatureMax>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_Simple.xml b/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_Simple.xml
new file mode 100644
index 0000000000..564e2cf421
--- /dev/null
+++ b/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_Simple.xml	
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==== Simple Prosthesis  ==== -->
+	<!-- SimpleProstheticFoot -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="SimpleProstheticFoot"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Blunt>0.026</ArmorRating_Blunt>
+						<ArmorRating_Sharp>0.014</ArmorRating_Sharp>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- SimpleProstheticToe and SimpleProstheticFinger -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="SimpleProstheticToe" or defName="SimpleProstheticFinger"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Blunt>0.002</ArmorRating_Blunt>
+						<ArmorRating_Sharp>0.001</ArmorRating_Sharp>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- SimpleProstheticHand -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="SimpleProstheticHand"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Blunt>0.025</ArmorRating_Blunt>
+						<ArmorRating_Sharp>0.013</ArmorRating_Sharp>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="SimpleProstheticHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.96</cooldownTime>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.084</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- SimpleProstheticJaw -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="SimpleProstheticJaw"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Blunt>0.018</ArmorRating_Blunt>
+						<ArmorRating_Sharp>0.01</ArmorRating_Sharp>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- SimpleProstheticClavicle -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="SimpleProstheticClavicle"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Blunt>0.014</ArmorRating_Blunt>
+						<ArmorRating_Sharp>0.008</ArmorRating_Sharp>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- SimpleProstheticSternum, SimpleProstheticFemur and SimpleProstheticTibia -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="SimpleProstheticSternum" or defName="SimpleProstheticFemur" or defName="SimpleProstheticTibia"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Blunt>0.041</ArmorRating_Blunt>
+						<ArmorRating_Sharp>0.023</ArmorRating_Sharp>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- SimpleProstheticRib -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="SimpleProstheticRib"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Blunt>0.033</ArmorRating_Blunt>
+						<ArmorRating_Sharp>0.018</ArmorRating_Sharp>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- SimpleProstheticPelvis -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="SimpleProstheticPelvis"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Blunt>0.138</ArmorRating_Blunt>
+						<ArmorRating_Sharp>0.075</ArmorRating_Sharp>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- SimpleProstheticHumerus and SimpleProstheticRadius -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="SimpleProstheticHumerus" or defName="SimpleProstheticRadius"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Blunt>0.027</ArmorRating_Blunt>
+						<ArmorRating_Sharp>0.015</ArmorRating_Sharp>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_VanillaArchotech.xml b/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_VanillaArchotech.xml
new file mode 100644
index 0000000000..1b232667d9
--- /dev/null
+++ b/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_VanillaArchotech.xml	
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==== Vanilla Archotech Prosthesis  ==== -->
+	<!-- ArchotechEye -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/HediffDef[defName="ArchotechEye"]/stages</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="ArchotechEye"]</xpath>
+			<value>
+				<stages />
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ArchotechEye"]/stages</xpath>
+		<value>
+			<li>
+				<minSeverity>0.000001</minSeverity>
+				<statOffsets>
+					<ArmorRating_Sharp>0.026</ArmorRating_Sharp>
+					<ArmorRating_Blunt>0.048</ArmorRating_Blunt>
+					<ArmorRating_Heat>0.004</ArmorRating_Heat>
+				</statOffsets>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ArchotechArm -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ArchotechArm"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.786</ArmorRating_Sharp>
+						<ArmorRating_Blunt>1.444</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.105</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+
+	<!-- ArchotechLeg -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ArchotechLeg"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>1.195</ArmorRating_Sharp>
+						<ArmorRating_Blunt>2.196</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.159</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_VanillaBionic.xml b/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_VanillaBionic.xml
new file mode 100644
index 0000000000..94b1a00b7e
--- /dev/null
+++ b/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_VanillaBionic.xml	
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==== Vanilla Bionic Prosthesis  ==== -->
+	<!-- BionicEye and BionicEar -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="BionicEye" or defName="BionicEar"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.009</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.017</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.002</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- BionicArm -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="BionicArm"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.278</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.511</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.052</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- BionicLeg -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="BionicLeg"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.423</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.776</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.08</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- BionicSpine -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="BionicSpine"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.106</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.195</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.02</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- BionicHeart -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="BionicHeart"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.17</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.312</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.032</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- BionicStomach -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="BionicStomach"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Sharp>0.212</ArmorRating_Sharp>
+						<ArmorRating_Blunt>0.39</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.04</ArmorRating_Heat>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- PowerClaw -->
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/HediffDef[defName="PowerClaw"]/stages/li</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/HediffDef[defName="PowerClaw"]</xpath>
+			<value>
+				<stages>
+					<li>
+						<minSeverity>0.000001</minSeverity>
+						<statOffsets>
+							<ArmorRating_Sharp>0.038</ArmorRating_Sharp>
+							<ArmorRating_Blunt>0.069</ArmorRating_Blunt>
+							<ArmorRating_Heat>0.007</ArmorRating_Heat>
+						</statOffsets>
+					</li>
+				</stages>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/HediffDef[defName="PowerClaw"]/stages/li</xpath>
+			<value>
+				<minSeverity>0.000001</minSeverity>
+				<statOffsets>
+					<ArmorRating_Sharp>0.038</ArmorRating_Sharp>
+					<ArmorRating_Blunt>0.069</ArmorRating_Blunt>
+					<ArmorRating_Heat>0.007</ArmorRating_Heat>
+				</statOffsets>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_VanillaSimple.xml b/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_VanillaSimple.xml
new file mode 100644
index 0000000000..6a74c5e17c
--- /dev/null
+++ b/ModPatches/Medical System Expansion - Revived/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_VanillaSimple.xml	
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==== Vanilla Simple Prosthesis  ==== -->
+	<!-- SimpleProstheticLeg -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="SimpleProstheticLeg"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Blunt>0.274</ArmorRating_Blunt>
+						<ArmorRating_Sharp>0.149</ArmorRating_Sharp>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- SimpleProstheticArm -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="SimpleProstheticArm"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Blunt>0.181</ArmorRating_Blunt>
+						<ArmorRating_Sharp>0.098</ArmorRating_Sharp>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- SimpleProstheticHeart -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="SimpleProstheticHeart"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Blunt>0.11</ArmorRating_Blunt>
+						<ArmorRating_Sharp>0.06</ArmorRating_Sharp>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+	<!-- CochlearImplant -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="CochlearImplant"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.000001</minSeverity>
+					<statOffsets>
+						<ArmorRating_Blunt>0.006</ArmorRating_Blunt>
+						<ArmorRating_Sharp>0.003</ArmorRating_Sharp>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Medical System Expansion 2/Patches/Medical System Expansion 2/Defs/HediffDefs/Modules/Hediffs_Modules_Bionics.xml b/ModPatches/Medical System Expansion 2/Patches/Medical System Expansion 2/Defs/HediffDefs/Modules/Hediffs_Modules_Bionics.xml
new file mode 100644
index 0000000000..3dd3b8affa
--- /dev/null
+++ b/ModPatches/Medical System Expansion 2/Patches/Medical System Expansion 2/Defs/HediffDefs/Modules/Hediffs_Modules_Bionics.xml	
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- == Combat modules == -->
+	<!-- Ranged platform module -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="RangedPlatformModule"]/stages/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<AimingAccuracy>0.25</AimingAccuracy>
+				<ReloadSpeed>0.25</ReloadSpeed>
+				<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+				<AimingDelayFactor>-0.1</AimingDelayFactor>
+			</statOffsets>
+		</value>
+	</Operation>
+	<!-- Melee platform module -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="MeleePlatformModule"]/stages/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<MeleeDodgeChance>0.24</MeleeDodgeChance>
+				<MeleeHitChance>4</MeleeHitChance>
+				<MeleeParryChance>0.16</MeleeParryChance>
+				<MeleeCritChance>0.16</MeleeCritChance>
+			</statOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Medicine Supplements (Continued)/Patches/Medicine Supplements (Continued)/Items_Bandages.xml b/ModPatches/Medicine Supplements (Continued)/Patches/Medicine Supplements (Continued)/Items_Bandages.xml
new file mode 100644
index 0000000000..6c136b816e
--- /dev/null
+++ b/ModPatches/Medicine Supplements (Continued)/Patches/Medicine Supplements (Continued)/Items_Bandages.xml	
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Give bandages appropriate bulk. -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="MSBandage" or
+			defName="MSASBandage" or
+			defName="MSNanoBandage"
+			]/statBases</xpath>
+		<value>
+			<Bulk>0.1</Bulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Medieval Medicines 1.4 Medieval Overhaul Edition/Patches/Medieval Medicines 1.4 Medieval Overhaul Edition/Hediff_MM.xml b/ModPatches/Medieval Medicines 1.4 Medieval Overhaul Edition/Patches/Medieval Medicines 1.4 Medieval Overhaul Edition/Hediff_MM.xml
new file mode 100644
index 0000000000..63c9ebbf00
--- /dev/null
+++ b/ModPatches/Medieval Medicines 1.4 Medieval Overhaul Edition/Patches/Medieval Medicines 1.4 Medieval Overhaul Edition/Hediff_MM.xml	
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ======= Medieval Limbs ======= -->
+
+	<!-- ===== Mechanical ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="MechanicalMedHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mechanical hand</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.11</cooldownTime>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="MechanicalMedArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mechanical arm</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.11</cooldownTime>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ===== Basic ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="IronArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>iron fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.11</cooldownTime>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ProstheticHook"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>prosthetic hook</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>5</power>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<cooldownTime>1.26</cooldownTime>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ===== Artificial ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ArtificialMedHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>artificial hand</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.11</cooldownTime>
+					<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ArtificialMedArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>artificial arm</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.11</cooldownTime>
+					<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ===== Ambroisen ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AmbroisenMedHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>ambroisen hand</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.11</cooldownTime>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AmbroisenMedArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>ambroisen arm</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.11</cooldownTime>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Defs/Medieval Overhaul/Ammo_Ballista.xml b/ModPatches/Medieval Overhaul/Defs/Medieval Overhaul/Ammo_Ballista.xml
new file mode 100644
index 0000000000..8e69513608
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Defs/Medieval Overhaul/Ammo_Ballista.xml	
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+    <!-- Ammo Set -->
+    <CombatExtended.AmmoSetDef>
+        <defName>AmmoSet_BallistaJavelins</defName>
+        <label>javelins</label>
+        <ammoTypes>
+            <Pila>BallistaPilum_Fired</Pila>
+        </ammoTypes>
+    </CombatExtended.AmmoSetDef>
+
+    <!-- Projectile -->
+    <ThingDef Class="CombatExtended.AmmoDef" ParentName="BasePilumProjectile">
+        <defName>BallistaPilum_Fired</defName>
+        <label>pilum (fired)</label>
+        <projectile Class="CombatExtended.ProjectilePropertiesCE">
+            <damageAmountBase>45</damageAmountBase>
+            <speed>60</speed>
+            <armorPenetrationBlunt>141.12</armorPenetrationBlunt>
+            <armorPenetrationSharp>13</armorPenetrationSharp>
+            <preExplosionSpawnChance>0.4</preExplosionSpawnChance>
+            <preExplosionSpawnThingDef>Pila</preExplosionSpawnThingDef>
+        </projectile>
+    </ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Defs/Medieval Overhaul/Ammo_Catapult.xml b/ModPatches/Medieval Overhaul/Defs/Medieval Overhaul/Ammo_Catapult.xml
new file mode 100644
index 0000000000..143504c9c5
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Defs/Medieval Overhaul/Ammo_Catapult.xml	
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- Ammo Category -->
+	<CombatExtended.AmmoCategoryDef>
+		<defName>Catapult_TarBoulder</defName>
+		<label>tarred boulder</label>
+		<labelShort>tarred boulder</labelShort>
+		<description>A large, heavy boulder covered in tar.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<!-- AmmoSet -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Trebuchet</defName>
+		<label>siege engine ammunition</label>
+		<ammoTypes>
+			<Ammo_Catapult_Boulder>Projectile_CatapultBullet_Boulder</Ammo_Catapult_Boulder>
+			<Ammo_Catapult_TarBoulder>Projectile_CatapultBullet_TarBoulder</Ammo_Catapult_TarBoulder>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- Ammo -->
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="CatapultShellBase">
+		<defName>Ammo_Catapult_TarBoulder</defName>
+		<label>tarred boulder</label>
+		<description>A heavy stone, cut to an appropriate size and shape to be thrown by a siege engine. \n\nCovered with tar, which can be lit once ready to be thrown.</description>
+		<graphicData>
+			<texPath>Resources/STarredStoneBoulder</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<Mass>15</Mass>
+			<DeteriorationRate>0</DeteriorationRate>
+		</statBases>
+		<ammoClass>Catapult_TarBoulder</ammoClass>
+	</ThingDef>
+
+	<!-- Projectile -->
+	<ThingDef ParentName="BaseCatapultBullet">
+		<defName>Projectile_CatapultBullet_TarBoulder</defName>
+		<label>tar covered boulder</label>
+		<graphicData>
+			<texPath>Projectile/BoulderFlamingBullet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>(2.5,2.5)</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Blunt</damageDef>
+			<damageAmountBase>250</damageAmountBase>
+			<explosionRadius>1.5</explosionRadius>
+			<soundExplode>DankPyon_Explosion_Boulder</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<ai_IsIncendiary>true</ai_IsIncendiary>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<explosiveDamageType>Flame</explosiveDamageType>
+				<damageAmountBase>80</damageAmountBase>
+				<explosiveRadius>3</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<preExplosionSpawnChance>0.4</preExplosionSpawnChance>
+				<preExplosionSpawnThingDef>DankPyon_Filth_Tar</preExplosionSpawnThingDef>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- Recipe -->
+	<RecipeDef ParentName="MakeStoneBlocksBase">
+		<defName>MakeAmmo_Catapult_BoulderBulk</defName>
+		<label>cut stone chunk into boulder x5</label>
+		<workAmount>8000</workAmount>
+		<description>Cuts a stone chunk down to size to be thrown by a siege engine.</description>
+		<ingredients>
+			<li>
+				<filter>
+					<categories>
+						<li>StoneChunks</li>
+					</categories>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<categories>
+				<li>StoneChunks</li>
+			</categories>
+		</fixedIngredientFilter>
+		<recipeUsers Inherit="False">
+			<li>TableStonecutter</li>
+		</recipeUsers>
+		<products>
+			<Ammo_Catapult_Boulder>5</Ammo_Catapult_Boulder>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="MakeStoneBlocksBase">
+		<defName>MakeAmmo_Catapult_TarBoulder</defName>
+		<label>tar a stone boulder</label>
+		<description>Cuts a stone chunk down to size and covers in tar to be thrown by a siege engine.</description>
+		<workAmount>400</workAmount>
+		<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+		<workSkill>Crafting</workSkill>
+		<workSkillLearnFactor>0.25</workSkillLearnFactor>
+		<effectWorking>Smith</effectWorking>
+		<soundWorking>Recipe_Smith</soundWorking>
+		<researchPrerequisites>
+			<li>DankPyon_Tar</li>
+		</researchPrerequisites>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_Catapult_Boulder</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>DankPyon_Tar</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_Catapult_Boulder</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<recipeUsers Inherit="False">
+			<li>DankPyon_Workbench</li>
+		</recipeUsers>
+		<products>
+			<Ammo_Catapult_TarBoulder>1</Ammo_Catapult_TarBoulder>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="MakeStoneBlocksBase">
+		<defName>MakeAmmo_Catapult_TarBoulderBulk</defName>
+		<label>tar a stone boulder x5</label>
+		<description>Cuts a stone chunk down to size and covers in tar to be thrown by a siege engine.</description>
+		<workAmount>2000</workAmount>
+		<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+		<workSkill>Crafting</workSkill>
+		<workSkillLearnFactor>0.25</workSkillLearnFactor>
+		<effectWorking>Smith</effectWorking>
+		<soundWorking>Recipe_Smith</soundWorking>
+		<researchPrerequisites>
+			<li>DankPyon_Tar</li>
+		</researchPrerequisites>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Ammo_Catapult_Boulder</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>DankPyon_Tar</li>
+					</thingDefs>
+				</filter>
+				<count>50</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Ammo_Catapult_Boulder</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<recipeUsers Inherit="False">
+			<li>DankPyon_Workbench</li>
+		</recipeUsers>
+		<products>
+			<Ammo_Catapult_TarBoulder>5</Ammo_Catapult_TarBoulder>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Defs/Medieval Overhaul/Ammo_Medieval.xml b/ModPatches/Medieval Overhaul/Defs/Medieval Overhaul/Ammo_Medieval.xml
new file mode 100644
index 0000000000..bb5d582a39
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Defs/Medieval Overhaul/Ammo_Medieval.xml	
@@ -0,0 +1,361 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!--Crossbow Ammos-->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_DankPyonCrossbowBolt</defName>
+		<label>crossbow bolts</label>
+		<ammoTypes>
+			<Ammo_CrossbowBolt_Stone>Projectile_DankPyonCrossbowBolt_Stone</Ammo_CrossbowBolt_Stone>
+			<Ammo_CrossbowBolt_Steel>Projectile_DankPyonCrossbowBolt_Steel</Ammo_CrossbowBolt_Steel>
+			<Ammo_CrossbowBolt_Venom>Projectile_DankPyonCrossbowBolt_Venom</Ammo_CrossbowBolt_Venom>
+			<!-- <Ammo_CrossbowBolt_Flame>Projectile_DankPyonCrossbowBolt_Flame</Ammo_CrossbowBolt_Flame> -->
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef ParentName="BaseCrossbowBoltProjectile">
+		<defName>Projectile_DankPyonCrossbowBolt_Stone</defName>
+		<label>normal crossbow bolt (stone)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Stone</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>8</damageAmountBase>
+			<armorPenetrationBlunt>1.4</armorPenetrationBlunt>
+			<armorPenetrationSharp>1.70</armorPenetrationSharp>
+			<preExplosionSpawnChance>0.1</preExplosionSpawnChance>
+			<speed>35</speed>
+			<preExplosionSpawnThingDef>Ammo_CrossbowBolt_Stone</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseCrossbowBoltProjectile">
+		<defName>Projectile_DankPyonCrossbowBolt_Steel</defName>
+		<label>normal crossbow bolt (steel)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase><!-- -2 -->
+			<armorPenetrationBlunt>6</armorPenetrationBlunt><!-- -0.5 -->
+			<armorPenetrationSharp>2.65</armorPenetrationSharp><!-- -0.2 -->
+			<speed>35</speed>
+			<preExplosionSpawnChance>0.333</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>Ammo_CrossbowBolt_Steel</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseCrossbowBoltProjectile">
+		<defName>Projectile_DankPyonCrossbowBolt_Venom</defName>
+		<label>normal crossbow bolt (venom)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Venom</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>ArrowVenom</damageDef>
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationBlunt>6</armorPenetrationBlunt>
+			<armorPenetrationSharp>2.3</armorPenetrationSharp>
+			<secondaryDamage>
+				<li>
+					<def>ArrowVenom</def>
+					<amount>3</amount>
+				</li>
+			</secondaryDamage>
+			<speed>35</speed>
+			<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>Ammo_CrossbowBolt_Steel</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<!--Heavy Crossbow Ammos-->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_ArbalestBolt</defName>
+		<label>crossbow bolts</label>
+		<ammoTypes>
+			<Ammo_CrossbowBolt_Stone>Projectile_ArbalestBolt_Stone</Ammo_CrossbowBolt_Stone>
+			<Ammo_CrossbowBolt_Steel>Projectile_ArbalestBolt_Steel</Ammo_CrossbowBolt_Steel>
+			<Ammo_CrossbowBolt_Venom>Projectile_ArbalestBolt_Venom</Ammo_CrossbowBolt_Venom>
+			<!-- <Ammo_CrossbowBolt_Flame>Projectile_ArbalestBolt_Flame</Ammo_CrossbowBolt_Flame> -->
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef ParentName="BaseCrossbowBoltProjectile">
+		<defName>Projectile_ArbalestBolt_Stone</defName>
+		<label>crossbow bolt (stone)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Stone</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>13</damageAmountBase>
+			<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+			<armorPenetrationSharp>1.85</armorPenetrationSharp>
+			<preExplosionSpawnChance>0.1</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>Ammo_CrossbowBolt_Stone</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseCrossbowBoltProjectile">
+		<defName>Projectile_ArbalestBolt_Steel</defName>
+		<label>crossbow bolt (steel)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationBlunt>8</armorPenetrationBlunt>
+			<armorPenetrationSharp>3</armorPenetrationSharp>
+			<speed>35</speed>
+			<preExplosionSpawnChance>0.333</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>Ammo_CrossbowBolt_Steel</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseCrossbowBoltProjectile">
+		<defName>Projectile_ArbalestBolt_Venom</defName>
+		<label>crossbow bolt (venom)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Venom</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>ArrowVenom</damageDef>
+			<damageAmountBase>15</damageAmountBase>
+			<armorPenetrationBlunt>6.5</armorPenetrationBlunt>
+			<armorPenetrationSharp>2.5</armorPenetrationSharp>
+			<secondaryDamage>
+				<li>
+					<def>ArrowVenom</def>
+					<amount>4</amount>
+				</li>
+			</secondaryDamage>
+			<speed>35</speed>
+			<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>Ammo_CrossbowBolt_Steel</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<!-- Hunting Bow Ammos (base streamline arrows | recurve bow) -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_HuntingArrow</defName>
+		<label>arrows</label>
+		<ammoTypes>
+			<Ammo_Arrow_Stone>Projectile_HuntingArrow_Stone</Ammo_Arrow_Stone>
+			<Ammo_Arrow_Steel>Projectile_HuntingArrow_Steel</Ammo_Arrow_Steel>
+			<Ammo_Arrow_Venom>Projectile_HuntingArrow_Venom</Ammo_Arrow_Venom>
+			<Ammo_Arrow_Flame>Projectile_HuntingArrow_Flame</Ammo_Arrow_Flame>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef ParentName="BaseStreamlinedArrowProjectile">
+		<defName>Projectile_HuntingArrow_Stone</defName>
+		<label>streamlined hunting arrow (stone)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Stone</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>33</speed>
+			<damageAmountBase>9</damageAmountBase>
+			<armorPenetrationSharp>0.6</armorPenetrationSharp>
+			<armorPenetrationBlunt>1.9</armorPenetrationBlunt>
+			<preExplosionSpawnChance>0.2</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>Ammo_Arrow_Stone</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseStreamlinedArrowProjectile">
+		<defName>Projectile_HuntingArrow_Steel</defName>
+		<label>streamlined hunting arrow (steel)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>33</speed>
+			<damageAmountBase>12</damageAmountBase><!-- + 1 -->
+			<armorPenetrationSharp>1.5</armorPenetrationSharp><!-- + 0.1 -->
+			<armorPenetrationBlunt>6.4</armorPenetrationBlunt><!-- + 0.5 -->
+			<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>Ammo_Arrow_Steel</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseStreamlinedArrowProjectile">
+		<defName>Projectile_HuntingArrow_Venom</defName>
+		<label>streamlined hunting arrow (venom)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Venom</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>33</speed>
+			<damageDef>Arrow</damageDef>
+			<damageAmountBase>10</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>ArrowVenom</def>
+					<amount>2</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>1.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>6.4</armorPenetrationBlunt>
+			<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>Ammo_Arrow_Steel</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseStreamlinedArrowProjectile">
+		<defName>Projectile_HuntingArrow_Flame</defName>
+		<label>streamlined hunting arrow (flame)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Flame</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>33</speed>
+			<damageDef>Arrow</damageDef>
+			<damageAmountBase>4</damageAmountBase>
+			<armorPenetrationSharp>0.6</armorPenetrationSharp>
+			<armorPenetrationBlunt>3.4</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame</def>
+					<amount>1</amount>
+					<chance>0.33</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<!-- War Bow Ammos (base great arrows | great bow) -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_WarArrow</defName>
+		<label>great arrows</label>
+		<ammoTypes>
+			<Ammo_GreatArrow_Stone>Projectile_WarArrow_Stone</Ammo_GreatArrow_Stone>
+			<Ammo_GreatArrow_Steel>Projectile_WarArrow_Steel</Ammo_GreatArrow_Steel>
+			<Ammo_GreatArrow_Venom>Projectile_WarArrow_Venom</Ammo_GreatArrow_Venom>
+			<Ammo_GreatArrow_Flame>Projectile_WarArrow_Flame</Ammo_GreatArrow_Flame>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef ParentName="BaseGreatArrowProjectile">
+		<defName>Projectile_WarArrow_Stone</defName>
+		<label>great war arrow (stone)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Stone</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>33</speed>
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationBlunt>7</armorPenetrationBlunt>
+			<armorPenetrationSharp>1.1</armorPenetrationSharp>
+			<preExplosionSpawnChance>0.2</preExplosionSpawnChance><!-- 12.5 arrows per resource -->
+			<preExplosionSpawnThingDef>Ammo_GreatArrow_Stone</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseGreatArrowProjectile">
+		<defName>Projectile_WarArrow_Steel</defName>
+		<label>great war arrow (steel)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>33</speed>
+			<damageAmountBase>14</damageAmountBase><!-- + 1 -->
+			<armorPenetrationBlunt>7</armorPenetrationBlunt><!-- + 0.5 -->
+			<armorPenetrationSharp>2</armorPenetrationSharp><!-- + 0.2 -->
+			<preExplosionSpawnChance>0.6</preExplosionSpawnChance><!-- 25 arrows per resource -->
+			<preExplosionSpawnThingDef>Ammo_GreatArrow_Steel</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseGreatArrowProjectile">
+		<defName>Projectile_WarArrow_Venom</defName>
+		<label>great war arrow (venom)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Venom</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>33</speed>
+			<damageDef>Arrow</damageDef>
+			<damageAmountBase>12</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>ArrowVenom</def>
+					<amount>3</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationBlunt>8</armorPenetrationBlunt>
+			<armorPenetrationSharp>2.2</armorPenetrationSharp>
+			<preExplosionSpawnChance>0.6</preExplosionSpawnChance><!-- 25 arrows per resource -->
+			<preExplosionSpawnThingDef>Ammo_GreatArrow_Steel</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseGreatArrowProjectile">
+		<defName>Projectile_WarArrow_Flame</defName>
+		<label>great war arrow (flame)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Flame</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>33</speed>
+			<damageDef>Arrow</damageDef>
+			<damageAmountBase>4</damageAmountBase>
+			<armorPenetrationBlunt>1.48</armorPenetrationBlunt>
+			<armorPenetrationSharp>1.1</armorPenetrationSharp>
+			<secondaryDamage>
+				<li>
+					<def>Flame</def>
+					<amount>1</amount>
+					<chance>0.33</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+
+	<!-- Handgonne Ammos (1-Handed Blunderbuss) -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_HandgonneShot</defName>
+		<label>Handgonne Shot</label>
+		<ammoTypes>
+			<Ammo_MusketBall>Bullet_Handgonne_Ball</Ammo_MusketBall>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef ParentName="Base12GaugeBullet">
+		<defName>Bullet_Handgonne_Ball</defName>
+		<label>lead pellet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shotgun_Pellet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>10</damageAmountBase>
+			<pelletCount>6</pelletCount>
+			<armorPenetrationSharp>2.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>12</armorPenetrationBlunt>
+			<spreadMult>22.5</spreadMult>
+			<speed>64</speed>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Defs/Medieval Overhaul/Ammo_Scorpio.xml b/ModPatches/Medieval Overhaul/Defs/Medieval Overhaul/Ammo_Scorpio.xml
new file mode 100644
index 0000000000..edcc69737a
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Defs/Medieval Overhaul/Ammo_Scorpio.xml	
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- Ammo Set -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_ScorpioBolt</defName>
+		<label>scorpio bolts</label>
+		<ammoTypes>
+			<Ammo_CrossbowBolt_Stone>Projectile_ScorpioBolt_Stone</Ammo_CrossbowBolt_Stone>
+			<Ammo_CrossbowBolt_Steel>Projectile_ScorpioBolt_Steel</Ammo_CrossbowBolt_Steel>
+			<Ammo_CrossbowBolt_Plasteel>Projectile_ScorpioBolt_Plasteel</Ammo_CrossbowBolt_Plasteel>
+			<Ammo_CrossbowBolt_Venom>Projectile_ScorpioBolt_Venom</Ammo_CrossbowBolt_Venom>
+			<Ammo_CrossbowBolt_Flame>Projectile_ScorpioBolt_Flame</Ammo_CrossbowBolt_Flame>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- Projectiles -->
+	<ThingDef ParentName="BaseCrossbowBoltProjectile">
+		<defName>Projectile_ScorpioBolt_Stone</defName>
+		<label>scorpio bolt (stone)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Stone</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>9</damageAmountBase>
+			<armorPenetrationBlunt>1.65</armorPenetrationBlunt>
+			<armorPenetrationSharp>1.95</armorPenetrationSharp>
+			<preExplosionSpawnChance>0.05</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>Ammo_CrossbowBolt_Stone</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseCrossbowBoltProjectile">
+		<defName>Projectile_ScorpioBolt_Steel</defName>
+		<label>scorpio bolt (steel)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>14</damageAmountBase>
+			<armorPenetrationBlunt>6.85</armorPenetrationBlunt>
+			<armorPenetrationSharp>3.45</armorPenetrationSharp>
+			<speed>22</speed>
+			<preExplosionSpawnChance>0.233</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>Ammo_CrossbowBolt_Steel</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseCrossbowBoltProjectile">
+		<defName>Projectile_ScorpioBolt_Plasteel</defName>
+		<label>scorpio bolt (plasteel)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Plasteel</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationBlunt>8.82</armorPenetrationBlunt>
+			<armorPenetrationSharp>4.75</armorPenetrationSharp>
+			<speed>24</speed>
+			<preExplosionSpawnChance>0.5</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>Ammo_CrossbowBolt_Plasteel</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseCrossbowBoltProjectile">
+		<defName>Projectile_ScorpioBolt_Venom</defName>
+		<label>scorpio bolt (venom)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Venom</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>ArrowVenom</damageDef>
+			<damageAmountBase>14</damageAmountBase>
+			<armorPenetrationBlunt>6.85</armorPenetrationBlunt>
+			<armorPenetrationSharp>3.25</armorPenetrationSharp>
+			<speed>22</speed>
+			<preExplosionSpawnChance>0.4</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>Ammo_CrossbowBolt_Steel</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseCrossbowBoltProjectile">
+		<defName>Projectile_ScorpioBolt_Flame</defName>
+		<label>scorpio bolt (flame)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Flame</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Flame</damageDef>
+			<damageAmountBase>7</damageAmountBase>
+			<armorPenetrationBlunt>3.68</armorPenetrationBlunt>
+			<armorPenetrationSharp>2.25</armorPenetrationSharp>
+			<speed>22</speed>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Defs/Medieval Overhaul/Recipes_Grenades.xml b/ModPatches/Medieval Overhaul/Defs/Medieval Overhaul/Recipes_Grenades.xml
new file mode 100644
index 0000000000..77414778a3
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Defs/Medieval Overhaul/Recipes_Grenades.xml	
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeFireBomb</defName>
+		<label>make fire bombs x10</label>
+		<description>Craft 10 fire bombs.</description>
+		<jobString>Making fire bombs.</jobString>
+		<workAmount>1200</workAmount>
+		<recipeUsers>
+			<li>CraftingSpot</li>
+		</recipeUsers>
+		<researchPrerequisite>DankPyon_Gunpowder</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Cloth</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>DankPyon_Tar</li>
+					</thingDefs>
+				</filter>
+				<count>26</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Cloth</li>
+				<li>DankPyon_Tar</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<DankPyon_Weapon_PotFire>10</DankPyon_Weapon_PotFire>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeSmokeBomb</defName>
+		<label>make smoke bombs x10</label>
+		<description>Craft 10 smoke bombs.</description>
+		<jobString>Making smoke bombs.</jobString>
+		<workAmount>1200</workAmount>
+		<recipeUsers>
+			<li>CraftingSpot</li>
+		</recipeUsers>
+		<researchPrerequisite>DankPyon_Gunpowder</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>DankPyon_Gunpowder</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>DankPyon_ComponentBasic</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>DankPyon_ComponentBasic</li>
+				<li>DankPyon_Gunpowder</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<DankPyon_Weapon_PotFlash>10</DankPyon_Weapon_PotFlash>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeSmokeFlashBomb</defName>
+		<label>make smoke bombs x10</label>
+		<description>Craft 10 smoke bombs.</description>
+		<jobString>Making smoke bombs.</jobString>
+		<workAmount>1200</workAmount>
+		<recipeUsers>
+			<li>CraftingSpot</li>
+		</recipeUsers>
+		<researchPrerequisite>DankPyon_Gunpowder</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>DankPyon_Gunpowder</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>DankPyon_ComponentBasic</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>DankPyon_ComponentBasic</li>
+				<li>DankPyon_Gunpowder</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<DankPyon_Weapon_PotFlashSmoke>10</DankPyon_Weapon_PotFlashSmoke>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Apparel_Armor.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Apparel_Armor.xml
new file mode 100644
index 0000000000..5e83b725bd
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Apparel_Armor.xml	
@@ -0,0 +1,432 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Padded Surcoat, Gambeson-->
+	<!--Surcoat:skin, Gambeson:middle-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Padded_Surcoat" or defName="Dankpyon_Apparel_Gambeson"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>6</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Padded_Surcoat"]/statBases/Mass</xpath>
+		<value>
+			<Mass>2.3</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Dankpyon_Apparel_Gambeson"]/statBases/Mass</xpath>
+		<value>
+			<Mass>3</Mass>
+		</value>
+	</Operation>
+
+	<!-- Added extra coverage -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Padded_Surcoat" or defName="Dankpyon_Apparel_Gambeson"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Arms</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Padded_Surcoat" or defName="Dankpyon_Apparel_Gambeson"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!--Padded Leather-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Padded_Leather"]/statBases</xpath>
+		<value>
+			<Bulk>18</Bulk>
+			<WornBulk>4</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Padded_Leather"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!--Lamellar-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Light_Lamellar"]/statBases</xpath>
+		<value>
+			<Bulk>20</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Light_Lamellar"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>10</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!--Hauberk, Heavy Hauberk, Heraldic Hauberk-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Hauberk" or defName="DankPyon_Apparel_Heavy_Hauberk" or @Name="DankPyon_HeraldicHauberkBase" or defName="DankPyon_Apparel_AdornedMailShirt"]/statBases</xpath>
+		<value>
+			<Bulk>30</Bulk>
+			<WornBulk>12</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Hauberk"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.85</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Hauberk"]/statBases/Mass</xpath>
+		<value>
+			<Mass>6</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Heavy_Hauberk" or @Name="DankPyon_HeraldicHauberkBase" or defName="DankPyon_Apparel_AdornedMailShirt"]/statBases/Mass</xpath>
+		<value>
+			<Mass>9</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Heavy_Hauberk" or @Name="DankPyon_HeraldicHauberkBase" or defName="DankPyon_Apparel_AdornedMailShirt"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Hauberk" or defName="DankPyon_Apparel_Heavy_Hauberk" or @Name="DankPyon_HeraldicHauberkBase" or defName="DankPyon_Apparel_AdornedMailShirt"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>Torso</li>
+				<li>Shoulders</li>
+				<li>Arms</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Heavy_Hauberk" or @Name="DankPyon_HeraldicHauberkBase" or defName="DankPyon_Apparel_AdornedMailShirt"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Legs</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Hauberk" or defName="DankPyon_Apparel_Heavy_Hauberk" or @Name="DankPyon_HeraldicHauberkBase" or defName="DankPyon_Apparel_AdornedMailShirt"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Heavy_Hauberk" or @Name="DankPyon_HeraldicHauberkBase" or defName="DankPyon_Apparel_AdornedMailShirt"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeDodgeChance>-0.10</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!--Brigandine (Normal + Adorned)-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Brigandine" or defName="DankPyon_Apparel_AdornedWarriorArmor"]/statBases</xpath>
+		<value>
+			<Bulk>60</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Brigandine" or defName="DankPyon_Apparel_AdornedWarriorArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.35</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Brigandine" or defName="DankPyon_Apparel_AdornedWarriorArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>14</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Brigandine" or defName="DankPyon_Apparel_AdornedWarriorArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<MeleeDodgeChance>-0.10</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!--Breast Plate-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Breast_Plate"]/statBases</xpath>
+		<value>
+			<Bulk>25</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Breast_Plate"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Breast_Plate"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<!--Full Plate (Normal + Gilded + Adorned)-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_FullPlate" or defName="DankPyon_Apparel_FullPlateGilded" or defName="DankPyon_Apparel_AdornedHeavyPlate"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_FullPlate" or defName="DankPyon_Apparel_FullPlateGilded" or defName="DankPyon_Apparel_AdornedHeavyPlate"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_FullPlate" or defName="DankPyon_Apparel_FullPlateGilded" or defName="DankPyon_Apparel_AdornedHeavyPlate"]/statBases/Mass</xpath>
+		<value>
+			<Mass>15</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_FullPlate" or defName="DankPyon_Apparel_FullPlateGilded" or defName="DankPyon_Apparel_AdornedHeavyPlate"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<MeleeDodgeChance>-0.15</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_FullPlate" or defName="DankPyon_Apparel_FullPlateGilded" or defName="DankPyon_Apparel_AdornedHeavyPlate"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Full Plate - Named-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_FullPlateNamed"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- Assume thickness of 3.2mm in plasteel -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_FullPlateNamed"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6.4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_FullPlateNamed"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12.8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_FullPlateNamed"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.05</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_FullPlateNamed"]/statBases/Mass</xpath>
+		<value>
+			<Mass>15</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_FullPlateNamed"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<MeleeDodgeChance>-0.15</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_FullPlateNamed"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ==== Pants ==== -->
+	<!-- Padded Chausses -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_ChaussesPadded"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_ChaussesPadded"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Splinted Chausses -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_ChaussesSplinted"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_ChaussesSplinted"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.85</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Plated Chausses -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_ChaussesPlate"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>4</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_ChaussesPlate"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.7</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Apparel_Helmets.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Apparel_Helmets.xml
new file mode 100644
index 0000000000..86be613a8d
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Apparel_Helmets.xml	
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Headgear; Helmets include padding-->
+
+	<!--Coverage-->
+
+	<!--Cover top of the head + neck-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[ defName="DankPyon_Headgear_ChainCoif" or defName="DankPyon_Headgear_ChainCoifClosed" or defName="DankPyon_Headgear_ChainCoifFull" or defName="DankPyon_Headgear_PaddedNasalHelmet" or defName="DankPyon_Headgear_PaddedKettle" or defName="DankPyon_Headgear_PaddedFlatTop" or defName="DankPyon_Headgear_ChainNasalHelm" or defName="DankPyon_Headgear_ChainNasalRedHelmet" or defName="DankPyon_Headgear_ChainKettle" or defName="DankPyon_Headgear_ChainClosedFlatTop"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>UpperHead</li>
+				<li>Neck</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<!--Cover jaw-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[ defName="DankPyon_Headgear_ChainCoifClosed" or defName="DankPyon_Headgear_ChainCoifFull" or defName="DankPyon_Headgear_ChainClosedFlatTop"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Teeth</li>
+		</value>
+	</Operation>
+
+	<!--Red Bandana-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Headgear_RedBandana"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Headgear_RedBandana"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.03</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Headgear_RedBandana"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.045</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Hood-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Headgear_Hood"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Headgear_Hood"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!--Zweihander's Hat-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Headgear_ZweihandersHat"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Headgear_ZweihandersHat"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!--Arming Cap, Full, Coif-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Headgear_coif" or defName="DankPyon_Headgear_ArmingCap" or defName="DankPyon_Headgear_FullArmingCap"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Headgear_ArmingCap" or defName="DankPyon_Headgear_FullArmingCap"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>10</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!--Chain Coif, Closed, Full-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Headgear_ChainCoif" or defName="DankPyon_Headgear_ChainCoifClosed" or defName="DankPyon_Headgear_ChainCoifFull"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Headgear_ChainCoif" or defName="DankPyon_Headgear_ChainCoifClosed" or defName="DankPyon_Headgear_ChainCoifFull"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.65</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!--Padded Flat Top, Kettle, Nasal,-->
+	<!--Chain Helmet Flat Top, Closed Flat Top, Kettle, Nasal-->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="DankPyon_Headgear_PaddedNasalHelmet" or defName="DankPyon_Headgear_PaddedKettleHelmet" or defName="DankPyon_Headgear_PaddedFlatTopHelmet" or defName="DankPyon_Headgear_ChainNasalHelmet" or defName="DankPyon_Headgear_ChainNasalRedHelmet" or defName="DankPyon_Headgear_ChainKettleHelmet" or defName="DankPyon_Headgear_Chain_FlatTopHelmet" or defName="DankPyon_Headgear_ChainClosedFlatTopHelmet" or defName="DankPyon_Headgear_ClosedChain_FlatTopHelmet" or @Name="DankPyon_ZweihanderHelmBase" or defName="DankPyon_Headgear_HeavyBarbrute" or defName="DankPyon_Headgear_OpenBascinet"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Headgear_PaddedNasalHelmet" or defName="DankPyon_Headgear_PaddedKettleHelmet" or defName="DankPyon_Headgear_PaddedFlatTopHelmet" or defName="DankPyon_Headgear_ChainNasalHelmet" or defName="DankPyon_Headgear_ChainKettleHelmet" or defName="DankPyon_Headgear_ClosedChain_FlatTopHelmet" or defName="DankPyon_Headgear_ChainNasalRedHelmet" or defName="DankPyon_Headgear_ChainClosedFlatTopHelmet" or defName="DankPyon_Headgear_Chain_FlatTopHelmet" or @Name="DankPyon_ZweihanderHelmBase" or defName="DankPyon_Adorned_HeavyMailCoif" or defName="DankPyon_Headgear_HeavyBarbrute" or defName="DankPyon_Headgear_OpenBascinet"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Headgear_PaddedNasalHelmet" or defName="DankPyon_Headgear_PaddedKettleHelmet" or defName="DankPyon_Headgear_PaddedFlatTopHelmet" or @Name="DankPyon_ZweihanderHelmBase"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Headgear_ChainNasalHelmet" or defName="DankPyon_Headgear_ChainNasalRedHelmet" or defName="DankPyon_Headgear_ChainKettleHelmet" or defName="DankPyon_Headgear_Chain_FlatTopHelmet" or defName="DankPyon_Headgear_ClosedChain_FlatTopHelmet" or defName="DankPyon_Adorned_HeavyMailCoif" or defName="DankPyon_Headgear_HeavyBarbrute" or defName="DankPyon_Headgear_OpenBascinet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.7</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!--Great Helm, Horn, Crusader, Royal-->
+	<!--Bascinet, Armet, Sallet, Klappvisier, Klappvisier Open, Honskull, Visored Kettle-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Headgear_ClosedBascinetHelmet" or defName="DankPyon_Headgear_SalletHelmet" or defName="DankPyon_Headgear_Bascinet_KlappvisierHelmetClosed" or defName="DankPyon_Headgear_GreatHelm" or defName="DankPyon_Headgear_HeraldicGreatHelm1c" or defName="DankPyon_Headgear_Armet" or defName="DankPyon_Headgear_ArmetGilded" or defName="DankPyon_Headgear_ArmetNamed" or defName="DankPyon_Adorned_FlatTop" or defName="DankPyon_Adorned_GreatHelm"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Headgear_ClosedBascinetHelmet" or defName="DankPyon_Headgear_SalletHelmet" or defName="DankPyon_Headgear_Bascinet_KlappvisierHelmetClosed" or defName="DankPyon_Headgear_GreatHelm" or defName="DankPyon_Headgear_HeraldicGreatHelm1c" or defName="DankPyon_Headgear_Armet" or defName="DankPyon_Headgear_ArmetGilded" or defName="DankPyon_Headgear_ArmetNamed" or defName="DankPyon_Adorned_FlatTop" or defName="DankPyon_Adorned_GreatHelm"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>FullHead</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="DankPyon_Headgear_ClosedBascinetHelmet" or defName="DankPyon_Headgear_SalletHelmet" or defName="DankPyon_Headgear_Bascinet_KlappvisierHelmetClosed" or defName="DankPyon_Headgear_GreatHelm" or defName="DankPyon_Headgear_HeraldicGreatHelm1c" or defName="DankPyon_Headgear_Armet" or defName="DankPyon_Headgear_ArmetGilded" or defName="DankPyon_Headgear_ArmetNamed" or defName="DankPyon_Adorned_FlatTop" or defName="DankPyon_Adorned_GreatHelm"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Headgear_ClosedBascinetHelmet" or defName="DankPyon_Headgear_SalletHelmet" or defName="DankPyon_Headgear_Bascinet_KlappvisierHelmetClosed" or defName="DankPyon_Headgear_GreatHelm" or defName="DankPyon_Headgear_HeraldicGreatHelm1c" or defName="DankPyon_Headgear_Armet" or defName="DankPyon_Headgear_ArmetGilded" or defName="DankPyon_Headgear_ArmetNamed" or defName="DankPyon_Adorned_FlatTop" or defName="DankPyon_Adorned_GreatHelm"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingAccuracy>-0.4</AimingAccuracy><!--CE Bascinet-->
+			<MeleeHitChance>-2</MeleeHitChance>
+			<Suppressability>-0.20</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[ defName="DankPyon_Headgear_ClosedBascinetHelmet" or defName="DankPyon_Headgear_SalletHelmet" or defName="DankPyon_Headgear_Bascinet_KlappvisierHelmetClosed" or defName="DankPyon_Adorned_FlatTop"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Headgear_GreatHelm" or defName="DankPyon_Headgear_HeraldicGreatHelm1c" or defName="DankPyon_Headgear_Armet" or defName="DankPyon_Headgear_ArmetGilded" or defName="DankPyon_Headgear_ArmetNamed" or defName="DankPyon_Adorned_GreatHelm"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.75</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Headgear_ZweihandersHat"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Apparel_Misc.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Apparel_Misc.xml
new file mode 100644
index 0000000000..ad4f3a9e54
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Apparel_Misc.xml	
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Jewelry-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="DankPyon_NecklaceBase"]/statBases</xpath>
+		<value>
+			<Bulk>0.25</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Utility-->
+	<!--Quiver-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Quiver"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Quiver"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>15</CarryBulk>
+				<ReloadSpeed>0.4</ReloadSpeed>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!--Gloves 'n Boots'-->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="DankPyon_Handwear_GlovesLeather" or defName="DankPyon_Handwear_GlovesSplinted" or defName="DankPyon_Handwear_GlovesPlate" or defName="DankPyon_Footwear_BootsLeather" or defName="DankPyon_Footwear_BootsSplinted" or defName="DankPyon_Footwear_BootsPlate"]/equippedStatOffsets</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Handwear_GlovesLeather" or defName="DankPyon_Handwear_GlovesSplinted" or defName="DankPyon_Handwear_GlovesPlate" or defName="DankPyon_Footwear_BootsLeather" or defName="DankPyon_Footwear_BootsSplinted" or defName="DankPyon_Footwear_BootsPlate"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Handwear_GlovesLeather" or defName="DankPyon_Footwear_BootsLeather"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Handwear_GlovesSplinted" or defName="DankPyon_Footwear_BootsSplinted"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.25</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Handwear_GlovesPlate" or defName="DankPyon_Footwear_BootsPlate"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!--Body-->
+	<!--Sackcloth-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Sackcloth"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Sackcloth"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!--Leather Tunic-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Leather_Tunic"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Leather_Tunic"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!--Pants-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="DankPyon_Base_Pants"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="DankPyon_Base_Pants"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Attachments -->
+	<!-- ======= Hood ======= -->
+	<!-- === Wolf === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="DankPyon_WolfHoodBase"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="DankPyon_WolfHoodBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.45</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="DankPyon_WolfHoodBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.20</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Bear === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="DankPyon_BearHoodBase"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="DankPyon_BearHoodBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.55</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="DankPyon_BearHoodBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.24</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ======= Pelt ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_DirewolfPelt" or defName="DankPyon_Apparel_HyenaPelt"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_DirewolfPelt" or defName="DankPyon_Apparel_HyenaPelt"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_DirewolfPelt" or defName="DankPyon_Apparel_HyenaPelt"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>0.45</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Apparel_DirewolfPelt" or defName="DankPyon_Apparel_HyenaPelt"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>0.20</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Items.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Items.xml
new file mode 100644
index 0000000000..8e6a0f878e
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Items.xml	
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Make ammos craftable with the anvil-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="AmmoGreatArrowBase" or @Name="AmmoArrowBase" or @Name="AmmoCrossbowBoltBase"]/tradeTags</xpath>
+		<value>
+			<li>CE_AutoEnableCrafting_DankPyon_Workbench</li>
+			<li>CE_AutoEnableCrafting_DankPyon_Workbench</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="DankPyon_DrugBase" or defName="DankPyon_JuiceApple" or defName="DankPyon_JuiceAppleUnfermented"]/statBases</xpath>
+		<value>
+			<Bulk>1.5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="DankPyon_DrugBase" or defName="DankPyon_JuiceApple" or defName="DankPyon_JuiceAppleUnfermented"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2.22</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>neck</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>3.33</cooldownTime>
+					<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Neck</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Materials.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Materials.xml
new file mode 100644
index 0000000000..d7462c98bf
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Materials.xml	
@@ -0,0 +1,805 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Remove and Adjust - Rox Horn, Daer Antler, Scorpio Bolt, Ballista Bolt, And Stone Boulders -->
+	<!-- Scorpio Bolt, Ballista Bolt, and Stone Boulders -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="DankPyon_ScorpioBolt" or defName="DankPyon_BallistaBolt" or defName="DankPyon_StoneBoulder" or defName="DankPyon_StoneBoulderTarred"]</xpath>
+	</Operation>
+
+	<!-- Rox Horn and Daer Antler -->
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="DankPyon_RoxHorn" or defName="DankPyon_DaerAntler"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>ResourceBase</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="DankPyon_RoxHorn" or defName="DankPyon_DaerAntler"]/tools</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_RoxHorn" or defName="DankPyon_DaerAntler"]/statBases/Mass</xpath>
+		<value>
+			<Mass>30</Mass>
+			<Bulk>20</Bulk>
+		</value>
+	</Operation>
+
+	<!--Basegame rebalance-->
+	<!--Thrumbo Fur-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Thrumbo"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.60</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Thrumbo"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.20</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!--Cloth-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Cloth"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.03</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Cloth"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.02</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!--Linen-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Linen"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.2</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Linen"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.02</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<!--Silk-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Silk"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.3</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Silk"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.02</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<!--Leathers-->
+	<!--Leather-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Plain"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.08</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Plain"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.055</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<!--Thick Leather-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Bear"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.12</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<!--MO and CE both add blunt armor to this def, so it ends up as a duplicate node-->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Leather_Bear"]/statBases/StuffPower_Armor_Blunt</xpath>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Leather_Bear"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.08</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<!--Soft Fur-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Light"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.03</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Light"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.02</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<!--Heavy Fur-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Bluefur"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.09</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Bluefur"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.06</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<!--Scale Leather-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Lizard"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.08</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Lizard"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.06</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!--Thick Scale Leather-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Rhinoceros"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.14</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<!--MO and CE both add blunt armor to this def, so it ends up as a duplicate node-->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Leather_Rhinoceros"]/statBases/StuffPower_Armor_Blunt</xpath>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Leather_Rhinoceros"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!--Bird Leather-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Bird"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.06</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Bird"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.04</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!--Human Leather-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Human"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.06</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Human"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.04</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!--Patchleather-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Patch"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.08</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Patch"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.055</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!--Rawhide-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Leather_Rawhide"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.08</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Leather_Rawhide"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.055</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="DankPyon_Leather_Rawhide"]/statBases/StuffPower_Armor_Heat</xpath>
+	</Operation>
+
+	<!-- Unique Leathers
+<li Class="PatchOperationReplace">
+               <xpath>Defs/ThingDef[defName="DankPyon_Leather_Direwolf"]/statBases/StuffPower_Armor_Sharp</xpath>
+               <value>
+                  <StuffPower_Armor_Sharp>0.14</StuffPower_Armor_Sharp>
+               </value>
+            </li>
+
+            <li Class="PatchOperationAdd">
+               <xpath>Defs/ThingDef[defName="DankPyon_Leather_Direwolf"]/statBases</xpath>
+               <value>
+                  <StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
+               </value>
+            </li>
+
+<li Class="PatchOperationReplace">
+               <xpath>Defs/ThingDef[defName="DankPyon_Leather_Hyena"]/statBases/StuffPower_Armor_Sharp</xpath>
+               <value>
+                  <StuffPower_Armor_Sharp>0.12</StuffPower_Armor_Sharp>
+               </value>
+            </li>
+
+            <li Class="PatchOperationAdd">
+               <xpath>Defs/ThingDef[defName="DankPyon_Leather_Hyena"]/statBases</xpath>
+               <value>
+                  <StuffPower_Armor_Blunt>0.08</StuffPower_Armor_Blunt>
+               </value> 
+            </li> -->
+
+	<!-- Rare Creatures -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Leather_Rox" or defName="DankPyon_Leather_Daer" or defName="DankPyon_Leather_Lindwurm"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.3</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Leather_Rox" or defName="DankPyon_Leather_Daer" or defName="DankPyon_Leather_Lindwurm"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.15</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!--Iron, Woods-->
+	<!--Iron-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_IronIngot"]/statBases</xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_IronIngot"]/stuffProps/categories</xpath>
+		<value>
+			<li>Metallic_Weapon</li>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_IronIngot"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.85</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_IronIngot"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>1.3</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_IronIngot"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="DankPyon_IronIngot"]/statBases/StuffPower_Armor_Heat</xpath>
+	</Operation>
+
+	<!-- Bone -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Bone"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.99</cooldownTime>
+					<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Bone"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.2</MeleeCritChance>
+				<MeleeParryChance>1</MeleeParryChance>
+				<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Bone"]/statBases</xpath>
+		<value>
+			<Bulk>0.07</Bulk>
+			<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Bone"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.15</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Bone"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.3</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Bone"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.025</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Bone"]/statBases/SharpDamageMultiplier</xpath>
+		<value>
+			<SharpDamageMultiplier>0.7</SharpDamageMultiplier>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Bone"]/statBases/BluntDamageMultiplier</xpath>
+		<value>
+			<BluntDamageMultiplier>0.5</BluntDamageMultiplier>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Bone"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>0.3</Mass>
+			<MeleePenetrationFactor>0.3</MeleePenetrationFactor>
+		</value>
+	</Operation>
+
+	<!-- Raw Wood -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_RawWood"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.99</cooldownTime>
+					<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_RawWood"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.2</MeleeCritChance>
+				<MeleeParryChance>1</MeleeParryChance>
+				<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_RawWood"]/statBases</xpath>
+		<value>
+			<Bulk>0.07</Bulk>
+			<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_RawWood"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.1</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_RawWood"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.2</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_RawWood"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.025</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_RawWood"]/statBases/SharpDamageMultiplier</xpath>
+		<value>
+			<SharpDamageMultiplier>0.7</SharpDamageMultiplier>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_RawWood"]/statBases/BluntDamageMultiplier</xpath>
+		<value>
+			<BluntDamageMultiplier>0.5</BluntDamageMultiplier>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_RawWood"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>0.3</Mass>
+			<MeleePenetrationFactor>0.3</MeleePenetrationFactor>
+		</value>
+	</Operation>
+
+	<!-- Dark Wood -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_DarkWoodLog"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.99</cooldownTime>
+					<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_DarkWoodLog"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.2</MeleeCritChance>
+				<MeleeParryChance>1</MeleeParryChance>
+				<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_DarkWoodLog"]/statBases</xpath>
+		<value>
+			<Bulk>0.07</Bulk>
+			<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_DarkWoodLog"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.15</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_DarkWoodLog"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.3</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_DarkWoodLog"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.025</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_DarkWoodLog"]/statBases/SharpDamageMultiplier</xpath>
+		<value>
+			<SharpDamageMultiplier>0.7</SharpDamageMultiplier>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_DarkWoodLog"]/statBases/BluntDamageMultiplier</xpath>
+		<value>
+			<BluntDamageMultiplier>0.5</BluntDamageMultiplier>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_DarkWoodLog"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>0.3</Mass>
+			<MeleePenetrationFactor>0.3</MeleePenetrationFactor>
+		</value>
+	</Operation>
+
+	<!-- Elven Wood -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_ElvenWoodLog"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.99</cooldownTime>
+					<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_ElvenWoodLog"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.2</MeleeCritChance>
+				<MeleeParryChance>1</MeleeParryChance>
+				<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_ElvenWoodLog"]/statBases</xpath>
+		<value>
+			<Bulk>0.07</Bulk>
+			<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_ElvenWoodLog"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.15</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_ElvenWoodLog"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.3</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_ElvenWoodLog"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.025</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_ElvenWoodLog"]/statBases/SharpDamageMultiplier</xpath>
+		<value>
+			<SharpDamageMultiplier>0.7</SharpDamageMultiplier>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_ElvenWoodLog"]/statBases/BluntDamageMultiplier</xpath>
+		<value>
+			<BluntDamageMultiplier>0.5</BluntDamageMultiplier>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_ElvenWoodLog"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>0.3</Mass>
+			<MeleePenetrationFactor>0.3</MeleePenetrationFactor>
+		</value>
+	</Operation>
+
+	<!-- Dryad Wood -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_DryadWoodLog"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.99</cooldownTime>
+					<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_DryadWoodLog"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.2</MeleeCritChance>
+				<MeleeParryChance>1</MeleeParryChance>
+				<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_DryadWoodLog"]/statBases</xpath>
+		<value>
+			<Bulk>0.07</Bulk>
+			<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_DryadWoodLog"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.15</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_DryadWoodLog"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.3</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_DryadWoodLog"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.025</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_DryadWoodLog"]/statBases/SharpDamageMultiplier</xpath>
+		<value>
+			<SharpDamageMultiplier>0.7</SharpDamageMultiplier>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_DryadWoodLog"]/statBases/BluntDamageMultiplier</xpath>
+		<value>
+			<BluntDamageMultiplier>0.5</BluntDamageMultiplier>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_DryadWoodLog"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>0.3</Mass>
+			<MeleePenetrationFactor>0.3</MeleePenetrationFactor>
+		</value>
+	</Operation>
+
+	<!-- Ancient Wood -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_AncientWoodLog"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.99</cooldownTime>
+					<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_AncientWoodLog"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.2</MeleeCritChance>
+				<MeleeParryChance>1</MeleeParryChance>
+				<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_AncientWoodLog"]/statBases</xpath>
+		<value>
+			<Bulk>0.07</Bulk>
+			<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_AncientWoodLog"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.15</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_AncientWoodLog"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.3</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_AncientWoodLog"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.025</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_AncientWoodLog"]/statBases/SharpDamageMultiplier</xpath>
+		<value>
+			<SharpDamageMultiplier>0.7</SharpDamageMultiplier>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_AncientWoodLog"]/statBases/BluntDamageMultiplier</xpath>
+		<value>
+			<BluntDamageMultiplier>0.5</BluntDamageMultiplier>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_AncientWoodLog"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>0.3</Mass>
+			<MeleePenetrationFactor>0.3</MeleePenetrationFactor>
+		</value>
+	</Operation>
+
+	<!--This thing was also a bit annoying-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "DankPyon_TanningLiquor"]/stackLimit</xpath>
+		<value>
+			<stackLimit>75</stackLimit>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Pawns_Medieval.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Pawns_Medieval.xml
new file mode 100644
index 0000000000..d97f76bfb6
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Pawns_Medieval.xml	
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--disabled very stupid raid type-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/FactionDef[@Name = "DankPyon_NobleHouseFactionBase"]/pawnGroupMakers/li[2]/commonality</xpath>
+		<value>
+			<commonality>0</commonality>
+		</value>
+	</Operation>
+
+	<!--Give Shields-->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="DankPyon_Medieval_Mercenary" or
+			defName="DankPyon_Medieval_MercenaryHeavy"] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>100</min>
+					<max>350</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>KiteShield</li>
+					<li>HeaterShield</li>
+					<li>Buckler</li>
+				</shieldTags>
+				<shieldChance>0.35</shieldChance>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="DankPyon_Medieval_Footman"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>100</min>
+					<max>350</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>KiteShield</li>
+					<li>HeaterShield</li>
+					<li>Buckler</li>
+				</shieldTags>
+				<shieldChance>0.65</shieldChance>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="DankPyon_Medieval_Knight" or defName="DankPyon_Medieval_Lord"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>200</min>
+					<max>600</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>HeaterShield</li>
+					<li>KiteShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Trying to add shields to Arbalesters, doesn't work
+	<li Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="DankPyon_Medieval_Arbalester"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>100</min>
+					<max>600</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>Pavise</li>
+					<li>KiteShield</li>
+				</shieldTags>
+				<shieldChance>0.9</shieldChance>
+			</li>
+		</value>
+	</li>-->
+
+	<!--Give ammo to crosbowman-->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="DankPyon_Medieval_Arbalester"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>12</min>
+					<max>20</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>100</min>
+						<max>200</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>NeolithicMeleeBasic</li>
+						<li>MedievalMeleeDecent</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="DankPyon_Medieval_Bowman"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>15</min>
+					<max>30</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>50</min>
+						<max>150</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>NeolithicMeleeBasic</li>
+						<li>MedievalMeleeDecent</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="DankPyon_BrigandMarksman"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>12</min>
+					<max>20</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>50</min>
+						<max>150</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>NeolithicMeleeBasic</li>
+						<li>MedievalMeleeDecent</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[
+			defName="DankPyon_Medieval_Arbalester" or
+			defName="DankPyon_Medieval_Bowman" or
+			defName="DankPyon_BrigandMarksman"] </xpath>
+		<value>
+			<apparelRequired>
+				<li>CE_Apparel_TribalBackpack</li>
+				<li>DankPyon_Apparel_Quiver</li>
+			</apparelRequired>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="DankPyon_Medieval_Arbalester" or defName="DankPyon_BrigandMarksman"]/weaponTags</xpath>
+		<value>
+			<li>CE_XBow</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="DankPyon_Medieval_Bowman" or defName="DankPyon_BrigandMarksman"]/weaponTags</xpath>
+		<value>
+			<li>CE_Bow</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Races.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Races.xml
new file mode 100644
index 0000000000..bfb1cc90ff
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Races.xml	
@@ -0,0 +1,987 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ======= Farm Animal ======= -->
+	<!-- Hampshire, Gloucestershire -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Hampshire" or defName="DankPyon_Gloucestershire"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.07</MeleeDodgeChance>
+			<MeleeCritChance>0.06</MeleeCritChance>
+			<MeleeParryChance>0.08</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Hampshire" or defName="DankPyon_Gloucestershire"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.5</cooldownTime>
+					<chanceFactor>0.7</chanceFactor>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="DankPyon_Hampshire" or defName="DankPyon_Gloucestershire"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Ravelder, Angus -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Ravelder" or defName="DankPyon_Angus"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.08</MeleeDodgeChance>
+			<MeleeCritChance>0.13</MeleeCritChance>
+			<MeleeParryChance>0.22</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Ravelder" or defName="DankPyon_Angus"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1</cooldownTime>
+					<chanceFactor>0.7</chanceFactor>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>2.12</cooldownTime>
+					<chanceFactor>0.2</chanceFactor>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>horns</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>2.0</cooldownTime>
+					<chanceFactor>0.65</chanceFactor>
+					<restrictedGender>Male</restrictedGender>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="DankPyon_Ravelder" or defName="DankPyon_Angus"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Rox === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Rox"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.06</MeleeDodgeChance>
+			<MeleeCritChance>0.41</MeleeCritChance>
+			<MeleeParryChance>0.48</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Rox"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>2.52</cooldownTime>
+					<chanceFactor>0.4</chanceFactor>
+					<linkedBodyPartsGroup>HornAttackTool_2</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>2.13</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>14.640</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>2.13</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>14.640</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>1.62</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.016</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2.52</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="DankPyon_Rox"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="DankPyon_Rox"]/combatPower</xpath>
+		<value>
+			<combatPower>375</combatPower>
+		</value>
+	</Operation>
+
+	<!-- === Direwolf === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="DankPyon_Direwolf"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Direwolf"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>7</MoveSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Direwolf"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+			<MeleeDodgeChance>0.21</MeleeDodgeChance>
+			<MeleeCritChance>0.20</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Direwolf"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.19</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.19</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.46</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<chanceFactor>2</chanceFactor>
+					<armorPenetrationSharp>1.6</armorPenetrationSharp>
+					<armorPenetrationBlunt>8.863</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>3.2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.225</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="DankPyon_Direwolf"]/combatPower</xpath>
+		<value>
+			<combatPower>140</combatPower>
+		</value>
+	</Operation>
+
+	<!-- === Hyena === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="DankPyon_Hyena"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Hyena"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>6.25</MoveSpeed>
+			<MeleeDodgeChance>0.26</MeleeDodgeChance>
+			<MeleeCritChance>0.09</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Hyena"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.73</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.55</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.225</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="DankPyon_Hyena"]/combatPower</xpath>
+		<value>
+			<combatPower>80</combatPower>
+		</value>
+	</Operation>
+
+	<!-- === Daer === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Daer"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.14</MeleeDodgeChance>
+			<MeleeCritChance>0.27</MeleeCritChance>
+			<MeleeParryChance>0.3</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Daer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>2.6</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.5</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>7</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>7</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.44</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="DankPyon_Daer"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="DankPyon_Daer"]/combatPower</xpath>
+		<value>
+			<combatPower>300</combatPower>
+		</value>
+	</Operation>
+
+	<!-- === Dire Boar === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_DireBoar"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.12</MeleeDodgeChance>
+			<MeleeCritChance>0.33</MeleeCritChance>
+			<MeleeParryChance>0.34</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_DireBoar"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tusk</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Stab</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>2.6</cooldownTime>
+					<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2.6</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.92</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="DankPyon_DireBoar"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Schrat === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Schrat"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.12</MeleeDodgeChance>
+			<MeleeCritChance>0.14</MeleeCritChance>
+			<MeleeParryChance>0.22</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Schrat"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="DankPyon_Schrat"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ======= Snakes ======= -->
+	<!-- === Large Cobra === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="DankPyon_LargeCobraBase"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.19</MeleeDodgeChance>
+			<MeleeCritChance>0.18</MeleeCritChance>
+			<MeleeParryChance>0.17</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="DankPyon_LargeCobraBase"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>venom-fangs</label>
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.20</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2</cooldownTime>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="DankPyon_LargeCobraBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Serpentine</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Giant Constrictor === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="DankPyon_GiantConstrictorBase"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			<MeleeCritChance>0.12</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="DankPyon_GiantConstrictorBase"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>2.26</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.49</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.92</cooldownTime>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="DankPyon_GiantConstrictorBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Serpentine</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Lindwurm === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="DankPyon_LindwurmBase"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.20</MeleeDodgeChance>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.08</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="DankPyon_LindwurmBase"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>32</power>
+					<cooldownTime>2.6</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.7</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.823</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.18</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.823</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.18</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.823</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>tail</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>4</cooldownTime>
+					<linkedBodyPartsGroup>DankPyon_TailAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="DankPyon_LindwurmBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- deathstinger - used Megascarab as reference -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Deathstinger"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>5.1</MoveSpeed>
+			<MeleeDodgeChance>0.22</MeleeDodgeChance>
+			<MeleeCritChance>0.03</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Deathstinger"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.24</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Deathstinger"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2.25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Deathstinger"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.7</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Deathstinger"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>0.5</baseHealthScale>
+		</value>
+	</Operation>
+
+	<!-- northern boar - used wildboar as reference -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="DankPyon_NorthernBoar"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_NorthernBoar"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.14</MeleeCritChance>
+			<MeleeParryChance>0.14</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_NorthernBoar"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tusk</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.89</cooldownTime>
+					<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>tusk</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.41</cooldownTime>
+					<chanceFactor>0.65</chanceFactor>
+					<linkedBodyPartsGroup>TuskAttackTool_2</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.940</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>8.7</power>
+					<cooldownTime>1.57</cooldownTime>
+					<chanceFactor>0.6</chanceFactor>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.08</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Scenarios.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Scenarios.xml
new file mode 100644
index 0000000000..94931223dd
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Scenarios.xml	
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="DankPyon_TavernOwnerStart"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_ScatterThingsNearPlayerStart">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_Arrow_Steel</thingDef>
+				<count>60</count>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Shields.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Shields.xml
new file mode 100644
index 0000000000..8136cca3bd
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Shields.xml	
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Replace ThingClass-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="DankPyon_BaseShield"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Apparel_Shield</thingClass>
+		</value>
+	</Operation>
+
+	<!--Replace Parent-->
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[@Name="DankPyon_BaseShield"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>ArmorSmithableBase</value>
+	</Operation>
+
+	<!--Replace Apparel Layer & BodyPart Group-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="DankPyon_BaseShield"]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>Shield</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="DankPyon_BaseShield"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>LeftShoulder</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<!--Remove VFE Shield Stuff-->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="DankPyon_BaseShield"]/tools</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="DankPyon_Shield" or defName="DankPyon_ShieldKite" or defName="DankPyon_ShieldHeater" or defName="DankPyon_ShieldHeater_Amboise" or defName="DankPyon_ShieldHeater_Soren" or defName="DankPyon_ShieldHeater_Oswin" or defName="DankPyon_ShieldHeater_Hesse" ]/comps/li[@Class="VFECore.CompProperties_Shield"]</xpath>
+	</Operation>
+
+	<!--Add CE Shield Stuff-->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="DankPyon_BaseShield"]</xpath>
+		<value>
+			<li Class="CombatExtended.ShieldDefExtension">
+				<shieldCoverage>
+					<li>Hands</li>
+					<li>Arms</li>
+					<li>Shoulders</li>
+					<li>Torso</li>
+					<li>Neck</li>
+				</shieldCoverage>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Add Bulk-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[ defName="DankPyon_Shield" or defName="DankPyon_ShieldKite" or defName="DankPyon_ShieldHeater" or @Name="DankPyon_ShieldHeaterBase"
+			]/statBases </xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Replace Stat Offsets-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="DankPyon_BaseShield"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<ReloadSpeed>-0.2</ReloadSpeed>
+				<MeleeHitChance>-1</MeleeHitChance>
+				<ShootingAccuracyPawn>-0.15</ShootingAccuracyPawn>
+				<AimingAccuracy>-0.08</AimingAccuracy>
+				<Suppressability>-0.25</Suppressability>
+				<MeleeCritChance>-0.05</MeleeCritChance>
+				<MeleeParryChance>1.0</MeleeParryChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!--Replace Stuff Thickness-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Shield"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_ShieldKite"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.85</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_ShieldHeater"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.85</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="DankPyon_ShieldHeaterBase"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.85</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Siege_Ballistas.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Siege_Ballistas.xml
new file mode 100644
index 0000000000..7ac70defcc
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Siege_Ballistas.xml	
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Clean and Replace-->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="DankPyon_Turret_Ballista" or defName="DankPyon_Turret_RepeaterBallista"]/comps/li[@Class="CompProperties_Refuelable"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Turret_Ballista" or defName="DankPyon_Turret_RepeaterBallista"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Turret_Ballista" or defName="DankPyon_Turret_RepeaterBallista"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<!-- ========== Ballista - Weapon ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DankPyon_Gun_BallistaTurret</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>1</ShotSpread>
+			<SwayFactor>0.2</SwayFactor>
+			<Bulk>4.00</Bulk>
+			<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>BallistaPilum_Fired</defaultProjectile>
+			<warmupTime>1.4</warmupTime>
+			<range>45</range>
+			<soundCast>BulletImpact_Wood</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>2.8</reloadTime>
+			<ammoSet>AmmoSet_BallistaJavelins</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>false</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Repeater Ballista - Weapon ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DankPyon_Gun_RepeaterBallistaTurret</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>1</ShotSpread>
+			<SwayFactor>0.2</SwayFactor>
+			<Bulk>4.00</Bulk>
+			<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>BallistaPilum_Fired</defaultProjectile>
+			<warmupTime>1.4</warmupTime>
+			<range>45</range>
+			<burstShotCount>2</burstShotCount>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<soundCast>BulletImpact_Wood</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>2</magazineSize>
+			<reloadTime>3.6</reloadTime>
+			<ammoSet>AmmoSet_BallistaJavelins</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Gun_BallistaTurret" or defName="DankPyon_Gun_RepeaterBallistaTurret"]/weaponTags</xpath>
+		<value>
+			<li>TurretGun</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/RecipeDef[defName="DankPyon_MakeBullet_BallistaBolt" or defName="DankPyon_MakeBullet_BallistaBoltBulk"]</xpath>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Siege_Misc.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Siege_Misc.xml
new file mode 100644
index 0000000000..c67cba9590
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Siege_Misc.xml	
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Adjust palisade embrasure fill.-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_EmbPalisade"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.70</fillPercent>
+		</value>
+	</Operation>
+
+	<!--Adjust castle embrasure fill.-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_CastleWallEmbrasures"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.70</fillPercent>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Siege_Scorpio.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Siege_Scorpio.xml
new file mode 100644
index 0000000000..dc5034ac1f
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Siege_Scorpio.xml	
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Clean and Replace-->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="DankPyon_Turret_Scorpio"]/comps/li[@Class="CompProperties_Refuelable"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Turret_Scorpio"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Turret_Scorpio"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<!-- ========== Scorpio - Weapon ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DankPyon_Gun_ScorpioTurret</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>1</ShotSpread>
+			<SwayFactor>1</SwayFactor>
+			<Bulk>4.00</Bulk>
+			<RangedWeapon_Cooldown>1.8</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_ScorpioBolt_Steel</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>42</range>
+			<soundCast>Bow_Large</soundCast>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_ScorpioBolt</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>false</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Gun_ScorpioTurret"]/weaponTags</xpath>
+		<value>
+			<li>TurretGun</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/RecipeDef[defName="DankPyon_MakeBullet_ScorpioBolt" or defName="DankPyon_MakeBullet_ScorpioBoltBulk"]</xpath>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Siege_Trebuchet.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Siege_Trebuchet.xml
new file mode 100644
index 0000000000..d93b525945
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Siege_Trebuchet.xml	
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="DankPyon_BaseTrebuchetBuilding"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Turret_Trebuchet"]/building</xpath>
+		<value>
+			<spawnedConceptLearnOpportunity>CE_MortarDirectFire</spawnedConceptLearnOpportunity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="DankPyon_BaseTrebuchetBuilding"]/statBases</xpath>
+		<value>
+			<SightsEfficiency>0.5</SightsEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="DankPyon_Artillery_Trebuchet"]/comps/li[@Class="CompProperties_ChangeableProjectile"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Artillery_Trebuchet"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>30</li>
+					<li>50</li>
+					<li>70</li>
+					<li>90</li>
+				</chargeSpeeds>
+			</li>
+			<li Class="CombatExtended.CompProperties_AmmoUser">
+				<magazineSize>1</magazineSize>
+				<reloadTime>14</reloadTime>
+				<ammoSet>AmmoSet_Trebuchet</ammoSet>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Artillery_Trebuchet"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+					<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Projectile_CatapultBullet_Boulder</defaultProjectile>
+					<warmupTime>4</warmupTime>
+					<minRange>30</minRange>
+					<range>500</range>
+					<burstShotCount>1</burstShotCount>
+					<soundCast>Bow_Recurve</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<indirectFirePenalty>0.2</indirectFirePenalty>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Artillery_Trebuchet"]/weaponTags</xpath>
+		<value>
+			<li>TurretGun</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/RecipeDef[defName="DankPyon_MakeBullet_StoneBoulder" or defName="DankPyon_MakeBullet_StoneBoulderBulk" or defName="DankPyon_MakeBullet_StoneBoulderTarred" or defName="DankPyon_MakeBullet_StoneBoulderTarredBulk"]</xpath>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Traits.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Traits.xml
new file mode 100644
index 0000000000..37acadff9f
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Traits.xml	
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/TraitDef[defName="DankPyon_Fighter" or defName="DankPyon_Veteran"]/degreeDatas/li/statOffsets</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraitDef[defName="DankPyon_Fighter"]/degreeDatas/li</xpath>
+		<value>
+			<statOffsets>
+				<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+				<AimingDelayFactor>-0.15</AimingDelayFactor>
+				<MeleeHitChance>3</MeleeHitChance>
+				<MeleeCritChance>0.15</MeleeCritChance>
+				<MeleeParryChance>0.15</MeleeParryChance>
+				<MeleeDodgeChance>0.3</MeleeDodgeChance>
+				<PawnTrapSpringChance>0.2</PawnTrapSpringChance>
+				<MentalBreakThreshold>-0.1</MentalBreakThreshold>
+				<PainShockThreshold>0.10</PainShockThreshold>
+				<Suppressability>-0.15</Suppressability>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraitDef[defName="DankPyon_Veteran"]/degreeDatas/li</xpath>
+		<value>
+			<statOffsets>
+				<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
+				<AimingDelayFactor>-0.15</AimingDelayFactor>
+				<MeleeHitChance>4</MeleeHitChance>
+				<MeleeCritChance>0.25</MeleeCritChance>
+				<MeleeParryChance>0.25</MeleeParryChance>
+				<MeleeDodgeChance>0.5</MeleeDodgeChance>
+				<PawnTrapSpringChance>0.1</PawnTrapSpringChance>
+				<MentalBreakThreshold>-0.2</MentalBreakThreshold>
+				<PainShockThreshold>0.10</PainShockThreshold>
+				<Suppressability>-0.25</Suppressability>
+			</statOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Weapons_Grenades.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Weapons_Grenades.xml
new file mode 100644
index 0000000000..9bb65e12a6
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Weapons_Grenades.xml	
@@ -0,0 +1,327 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Grenade Base ========== -->
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[@Name="DankPyon_Medieval_MakeableGrenade"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>BaseWeapon</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="DankPyon_Medieval_MakeableGrenade"]/recipeMaker</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="DankPyon_Medieval_MakeableGrenade"]</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Body</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.75</cooldownTime>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Fire Bomb ========== -->
+
+	<!-- Projectile -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Proj_PotFire"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<explosionRadius>0.5</explosionRadius>
+				<damageDef>Flame</damageDef>
+				<damageAmountBase>10</damageAmountBase>
+				<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
+				<preExplosionSpawnChance>1</preExplosionSpawnChance>
+				<speed>10</speed>
+				<ai_IsIncendiary>true</ai_IsIncendiary>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Proj_PotFire"]</xpath>
+		<value>
+			<thingClass>CombatExtended.Projectile_FireTrail</thingClass>
+		</value>
+	</Operation>
+
+	<!-- Grenade -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="DankPyon_Weapon_PotFire"]/costList</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Weapon_PotFire"]/graphicData/texPath</xpath>
+		<value>
+			<texPath>Projectile/FirePot</texPath>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Weapon_PotFire"]</xpath>
+		<value>
+			<thingClass>CombatExtended.AmmoThing</thingClass>
+			<stackLimit>50</stackLimit>
+			<resourceReadoutPriority>First</resourceReadoutPriority>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="DankPyon_Weapon_PotFire"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Weapon_PotFire"]/comps</xpath>
+		<value>
+			<li Class="CompProperties_Explosive">
+				<explosiveDamageType>Flame</explosiveDamageType>
+				<explosiveRadius>0.5</explosiveRadius>
+				<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
+				<preExplosionSpawnChance>1</preExplosionSpawnChance>
+				<startWickHitPointsPercent>0.7</startWickHitPointsPercent>
+				<explodeOnKilled>True</explodeOnKilled>
+				<wickTicks>60~80</wickTicks>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DankPyon_Weapon_PotFire</defName>
+		<statBases>
+			<Mass>0.6</Mass>
+			<Bulk>1.8</Bulk>
+			<MarketValue>3</MarketValue>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<label>throw fire pot</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<range>10</range>
+			<minRange>3</minRange>
+			<warmupTime>1.8</warmupTime>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<soundCast>ThrowMolotovCocktail</soundCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<defaultProjectile>DankPyon_Proj_PotFire</defaultProjectile>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Flash Bomb ========== -->
+
+	<!-- Projectile -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Proj_PotFlash"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<explosionRadius>2.5</explosionRadius>
+				<damageDef>Stun</damageDef>
+				<explosionDelay>100</explosionDelay>
+				<speed>10</speed>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Proj_PotFlash"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Projectile_FireTrail</thingClass>
+		</value>
+	</Operation>
+
+	<!-- Grenade -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="DankPyon_Weapon_PotFlash"]/costList</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Weapon_PotFlash"]/graphicData/texPath</xpath>
+		<value>
+			<texPath>Projectile/FlashPot</texPath>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Weapon_PotFlash"]</xpath>
+		<value>
+			<thingClass>CombatExtended.AmmoThing</thingClass>
+			<stackLimit>50</stackLimit>
+			<resourceReadoutPriority>First</resourceReadoutPriority>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="DankPyon_Weapon_PotFlash"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Weapon_PotFlash"]/comps</xpath>
+		<value>
+			<li Class="CompProperties_Explosive">
+				<explosiveRadius>2.5</explosiveRadius>
+				<explosiveDamageType>Stun</explosiveDamageType>
+				<startWickHitPointsPercent>0.7</startWickHitPointsPercent>
+				<explodeOnKilled>True</explodeOnKilled>
+				<wickTicks>60~100</wickTicks>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DankPyon_Weapon_PotFlash</defName>
+		<statBases>
+			<Mass>0.6</Mass>
+			<Bulk>1.8</Bulk>
+			<MarketValue>3</MarketValue>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<label>throw flash pot</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<range>10</range>
+			<minRange>3</minRange>
+			<warmupTime>1.8</warmupTime>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<soundCast>ThrowMolotovCocktail</soundCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<defaultProjectile>DankPyon_Proj_PotFlash</defaultProjectile>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Smoke Bomb ========== -->
+
+	<!-- Projectile -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Proj_PotSmoke"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<explosionRadius>3</explosionRadius>
+				<damageDef>Smoke</damageDef>
+				<suppressionFactor>0.0</suppressionFactor>
+				<dangerFactor>0.0</dangerFactor>
+				<explosionDelay>100</explosionDelay>
+				<postExplosionGasType>BlindSmoke</postExplosionGasType>
+				<postExplosionSpawnChance>1</postExplosionSpawnChance>
+				<speed>10</speed>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Proj_PotSmoke"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Projectile_FireTrail</thingClass>
+		</value>
+	</Operation>
+
+	<!-- Grenade -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="DankPyon_Weapon_PotFlashSmoke"]/costList</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Weapon_PotFlashSmoke"]/graphicData/texPath</xpath>
+		<value>
+			<texPath>Projectile/SmokePot</texPath>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Weapon_PotFlashSmoke"]</xpath>
+		<value>
+			<thingClass>CombatExtended.AmmoThing</thingClass>
+			<stackLimit>50</stackLimit>
+			<resourceReadoutPriority>First</resourceReadoutPriority>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="DankPyon_Weapon_PotFlashSmoke"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_Weapon_PotFlashSmoke"]/comps</xpath>
+		<value>
+			<li Class="CompProperties_Explosive">
+				<explosiveRadius>2.5</explosiveRadius>
+				<explosiveDamageType>Stun</explosiveDamageType>
+				<startWickHitPointsPercent>0.7</startWickHitPointsPercent>
+				<postExplosionGasType>BlindSmoke</postExplosionGasType>
+				<preExplosionSpawnChance>1</preExplosionSpawnChance>
+				<explodeOnKilled>True</explodeOnKilled>
+				<wickTicks>60~100</wickTicks>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DankPyon_Weapon_PotFlashSmoke</defName>
+		<statBases>
+			<Mass>0.6</Mass>
+			<Bulk>1.8</Bulk>
+			<MarketValue>3</MarketValue>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<label>throw smoke pot</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<range>10</range>
+			<minRange>3</minRange>
+			<warmupTime>1.8</warmupTime>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<soundCast>ThrowMolotovCocktail</soundCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<defaultProjectile>DankPyon_Proj_PotSmoke</defaultProjectile>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Weapons_Melee.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Weapons_Melee.xml
new file mode 100644
index 0000000000..d31952919f
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Weapons_Melee.xml	
@@ -0,0 +1,2664 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Table of contents
+
+        Maces
+            Bludgeon
+            Nomad Mace
+            Morning Star
+            Winged Mace
+
+        Two-Handed Maces
+            Goedendag
+            Two-Handed Mace
+            Two-Handed Flanged Mace
+
+        Spears
+            Militia Spear
+            Boar Spear
+            Fighting Spear
+
+        Two-Handed Spears
+            Warfork
+            Spetum
+
+        Swords
+            Falchion
+            Arming Sword
+            Noble Sword
+            Fencing Sword
+
+        Two-Handed Swords
+            Long Sword
+            Great Sword
+
+        Hammers
+            Military Pick
+            Warhammer
+        
+        Two-Handed Hammers
+            Pickaxe
+            Two-Handed Mallet
+            Two-Handed Hammer
+            Polehammer
+
+        Axes
+            Hatchet
+            Handaxe
+            Fighting Axe
+
+        Two-Handed Axes
+            Woodcutter's Axe
+            Bardiche
+            Great Axe
+            Long Axe
+
+        Polearms
+            Pitchfork
+            Hooked Blade
+            Billhook
+            Pike
+            Swordlance
+--><Patch>
+
+	<!--Maces-->
+	<!--Mace : Bludgeon (Standart CE mace) -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Bludgeon"]/statBases</xpath>
+		<value>
+			<Bulk>3.50</Bulk>
+			<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Bludgeon"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.42</MeleeCritChance>
+				<MeleeParryChance>0.24</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Bludgeon"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Bludgeon"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.9</cooldownTime>
+					<chanceFactor>0.90</chanceFactor>
+					<armorPenetrationBlunt>5.625</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Mace : Nomad Mace (Mace with more pen)-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NomadMace"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NomadMace"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.42</MeleeCritChance>
+				<MeleeParryChance>0.24</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NomadMace"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NomadMace"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>2</cooldownTime>
+					<chanceFactor>0.90</chanceFactor>
+					<armorPenetrationBlunt>6.925</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Mace : Morning Star (tad bit more dmg but less pen)-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_MorningStar"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_MorningStar"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.42</MeleeCritChance>
+				<MeleeParryChance>0.24</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_MorningStar"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_MorningStar"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.1</cooldownTime>
+					<chanceFactor>0.90</chanceFactor>
+					<armorPenetrationBlunt>6.925</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Mace : Winged Mace (Mace with even more pen)-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_WingedMace"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_WingedMace"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.42</MeleeCritChance>
+				<MeleeParryChance>0.24</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_WingedMace"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_WingedMace"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>2.1</cooldownTime>
+					<chanceFactor>0.90</chanceFactor>
+					<armorPenetrationBlunt>7.625</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Two-Handed Maces-->
+	<!--Two-Handed Mace: Goedendag -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Goedendag"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Goedendag"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.50</MeleeCritChance>
+				<MeleeParryChance>0.9</MeleeParryChance>
+				<MeleeDodgeChance>0.35</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Goedendag"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2.20</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>2.15</cooldownTime>
+					<chanceFactor>0.35</chanceFactor>
+					<armorPenetrationBlunt>8.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>29</power>
+					<cooldownTime>1.80</cooldownTime>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Two-Handed Mace : Common Two-Handed Mace (2handed morningstar)-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_TwoHandedMace"]/statBases</xpath>
+		<value>
+			<Bulk>9</Bulk>
+			<MeleeCounterParryBonus>0.54</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_TwoHandedMace"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.80</MeleeCritChance>
+				<MeleeParryChance>0.40</MeleeParryChance>
+				<MeleeDodgeChance>0.30</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_TwoHandedMace"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2.40</cooldownTime>
+					<chanceFactor>0.90</chanceFactor>
+					<armorPenetrationBlunt>10.225</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Two-Handed Mace : Two-Handed Flanged Mace (2handed winged mace, more pen a bit less dmg) -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_TwoHandedFlangedMace"]/statBases</xpath>
+		<value>
+			<Bulk>9</Bulk>
+			<MeleeCounterParryBonus>0.54</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_TwoHandedFlangedMace"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>2.30</MeleeCritChance>
+				<MeleeParryChance>0.40</MeleeParryChance>
+				<MeleeDodgeChance>0.30</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_TwoHandedFlangedMace"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>3.30</cooldownTime>
+					<chanceFactor>0.90</chanceFactor>
+					<armorPenetrationBlunt>14.225</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Spears-->
+	<!--Spear : Militia Spear -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_MilitiaSpear"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.58</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_MilitiaSpear"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.17</MeleeCritChance>
+				<MeleeParryChance>0.50</MeleeParryChance>
+				<MeleeDodgeChance>0.27</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_MilitiaSpear"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_MilitiaSpear"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.35</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>0.90</chanceFactor>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.65</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Spear : Boar Spear -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_BoarSpear"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.50</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_BoarSpear"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.17</MeleeCritChance>
+				<MeleeParryChance>0.50</MeleeParryChance>
+				<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_BoarSpear"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_BoarSpear"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.40</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.39</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.60</cooldownTime>
+					<chanceFactor>0.90</chanceFactor>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.71</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Spear : Fighting Spear -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_FightingSpear"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_FightingSpear"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.17</MeleeCritChance>
+				<MeleeParryChance>0.5</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_FightingSpear"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_FightingSpear"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.50</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.6</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.6</cooldownTime>
+					<chanceFactor>0.90</chanceFactor>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.75</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Two-Handed Spears-->
+	<!--Two-Handed Spear : Warfork -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Warfork"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<MeleeCounterParryBonus>0.65</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Warfork"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.17</MeleeCritChance>
+				<MeleeParryChance>1.50</MeleeParryChance>
+				<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Warfork"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2.20</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.79</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.8</cooldownTime>
+					<chanceFactor>0.90</chanceFactor>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.55</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Two-Handed Spear : Spetum -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Spetum"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<MeleeCounterParryBonus>0.45</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Spetum"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.17</MeleeCritChance>
+				<MeleeParryChance>1.50</MeleeParryChance>
+				<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Spetum"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2.20</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.79</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>1.8</cooldownTime>
+					<chanceFactor>0.90</chanceFactor>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.65</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Swords-->
+	<!--Sword : Falchion (sword without Stab and more slash dmg)-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Falchion"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>0.25</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Falchion"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.15</MeleeCritChance>
+				<MeleeParryChance>0.30</MeleeParryChance>
+				<MeleeDodgeChance>0.30</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Falchion"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Falchion"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.69</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>1.36</cooldownTime>
+					<chanceFactor>0.95</chanceFactor>
+					<armorPenetrationBlunt>0.95</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.58</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Sword : Arming Sword -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_ArmingSword"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_ArmingSword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.40</MeleeCritChance>
+				<MeleeParryChance>0.60</MeleeParryChance>
+				<MeleeDodgeChance>0.30</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_ArmingSword"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_ArmingSword"]/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.05</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.46</cooldownTime>
+					<chanceFactor>0.50</chanceFactor>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.40</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.45</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.58</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Sword : Noble Sword (arming sword with more dmg)-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NobleSword"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NobleSword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.40</MeleeCritChance>
+				<MeleeParryChance>0.60</MeleeParryChance>
+				<MeleeDodgeChance>0.30</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NobleSword"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NobleSword"]/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.05</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.46</cooldownTime>
+					<chanceFactor>0.50</chanceFactor>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.40</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.45</chanceFactor>
+					<armorPenetrationBlunt>1.1</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.58</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Sword : Fencing Sword (low slash dmg & chances, low cd, hight crit and parry, high Stab chances and counter parry)-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_FencingSword"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>1.75</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_FencingSword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>2.50</MeleeCritChance>
+				<MeleeParryChance>1</MeleeParryChance>
+				<MeleeDodgeChance>0.50</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_FencingSword"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_FencingSword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.29</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.25</cooldownTime>
+					<chanceFactor>0.85</chanceFactor>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.4</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.46</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>1.3</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.58</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Two-Handed Swords-->
+	<!--Two-Handed Sword Sword : Long Sword-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Longsword"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>0.8</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Longsword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.5</MeleeCritChance>
+				<MeleeParryChance>0.6</MeleeParryChance>
+				<MeleeDodgeChance>0.40</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Longsword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.78</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.78</cooldownTime>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.0</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>1.64</cooldownTime>
+					<chanceFactor>0.35</chanceFactor>
+					<armorPenetrationBlunt>3.24</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.72</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Two-Handed Sword Sword : Great Sword-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Greatsword"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<MeleeCounterParryBonus>0.70</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Greatsword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.30</MeleeCritChance>
+				<MeleeParryChance>1.20</MeleeParryChance>
+				<MeleeDodgeChance>0.50</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Greatsword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.69</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.98</cooldownTime>
+					<chanceFactor>0.50</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.90</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>48</power>
+					<cooldownTime>2.86</cooldownTime>
+					<chanceFactor>0.45</chanceFactor>
+					<armorPenetrationBlunt>3.592</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.58</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Hammers-->
+
+	<!--Hammer: Military Pick-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_MilitaryPick"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>0.22</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_MilitaryPick"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.06</MeleeCritChance>
+			<MeleeParryChance>0.12</MeleeParryChance>
+			<MeleeDodgeChance>0.23</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_MilitaryPick"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_MilitaryPick"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.69</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.80</cooldownTime>
+					<chanceFactor>0.95</chanceFactor>
+					<armorPenetrationBlunt>6.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.8</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Hammer: Warhammer-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Warhammer"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>0.22</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Warhammer"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.06</MeleeCritChance>
+				<MeleeParryChance>0.22</MeleeParryChance>
+				<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Warhammer"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Warhammer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.69</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.85</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>6.7</armorPenetrationBlunt>
+					<armorPenetrationSharp>3.0</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>1.90</cooldownTime>
+					<chanceFactor>0.80</chanceFactor>
+					<armorPenetrationBlunt>8.2</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Two-Handed Hammers-->
+
+	<!--Two-Handed Hammer: Pickaxe-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Pickaxe"]/statBases</xpath>
+		<value>
+			<Bulk>11</Bulk>
+			<MeleeCounterParryBonus>0.22</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_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="DankPyon_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>head</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>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Two-Handed Hammer : Two-Handed Mallet-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_TwoHandedMallet"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>0.54</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_TwoHandedMallet"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>2</MeleeCritChance>
+			<MeleeParryChance>0.40</MeleeParryChance>
+			<MeleeDodgeChance>0.30</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_TwoHandedMallet"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>2.35</cooldownTime>
+					<chanceFactor>0.95</chanceFactor>
+					<armorPenetrationBlunt>9.625</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Two-Handed Hammer : Two-Handed Hammer-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_TwoHandedHammer"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>0.54</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_TwoHandedHammer"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>2.1</MeleeCritChance>
+				<MeleeParryChance>0.50</MeleeParryChance>
+				<MeleeDodgeChance>0.30</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_TwoHandedHammer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>2.86</cooldownTime>
+					<chanceFactor>0.95</chanceFactor>
+					<armorPenetrationBlunt>13.225</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Two-Handed Hammer : Polehammer-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Polehammer"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>0.54</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Polehammer"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>2.40</MeleeCritChance>
+				<MeleeParryChance>1.30</MeleeParryChance>
+				<MeleeDodgeChance>0.30</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Polehammer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>2.7</cooldownTime>
+					<chanceFactor>0.25</chanceFactor>
+					<armorPenetrationBlunt>9.225</armorPenetrationBlunt>
+					<armorPenetrationSharp>4.3</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>2.7</cooldownTime>
+					<chanceFactor>0.70</chanceFactor>
+					<armorPenetrationBlunt>11.825</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Axes-->
+	<!--Axe: Hatchet-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Hatchet"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<MeleeCounterParryBonus>0.22</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Hatchet"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.31</MeleeCritChance>
+			<MeleeParryChance>0.22</MeleeParryChance>
+			<MeleeDodgeChance>0.12</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Hatchet"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Hatchet"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>0.95</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.25</chanceFactor>
+					<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.58</cooldownTime>
+					<chanceFactor>0.70</chanceFactor>
+					<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.32</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Axe: Handaxe-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Handaxe"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<MeleeCounterParryBonus>0.22</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Handaxe"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.31</MeleeCritChance>
+			<MeleeParryChance>0.22</MeleeParryChance>
+			<MeleeDodgeChance>0.22</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Handaxe"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Handaxe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>0.95</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.25</chanceFactor>
+					<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.58</cooldownTime>
+					<chanceFactor>0.70</chanceFactor>
+					<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Axe: Fighting Axe-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_FightingAxe"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<MeleeCounterParryBonus>0.22</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_FightingAxe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.31</MeleeCritChance>
+				<MeleeParryChance>0.22</MeleeParryChance>
+				<MeleeDodgeChance>0.22</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_FightingAxe"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_FightingAxe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>0.95</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>15</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.25</chanceFactor>
+					<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.32</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.58</cooldownTime>
+					<chanceFactor>0.70</chanceFactor>
+					<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Two-Handed Axes-->
+	<!--Two-Handed Axe: Woodcutter's Axe-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_WoodcuttersAxe"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.22</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_WoodcuttersAxe"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.11</MeleeCritChance>
+			<MeleeParryChance>0.28</MeleeParryChance>
+			<MeleeDodgeChance>0.23</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_WoodcuttersAxe"]/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>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.95</cooldownTime>
+					<chanceFactor>0.25</chanceFactor>
+					<armorPenetrationBlunt>9.6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>29</power>
+					<cooldownTime>2.48</cooldownTime>
+					<chanceFactor>0.70</chanceFactor>
+					<armorPenetrationBlunt>9.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.90</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Two-Handed Axe: Bardiche-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Bardiche"]/statBases</xpath>
+		<value>
+			<Bulk>7</Bulk>
+			<MeleeCounterParryBonus>0.40</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Bardiche"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.30</MeleeCritChance>
+				<MeleeParryChance>0.60</MeleeParryChance>
+				<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Bardiche"]/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>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2.48</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>9.6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.95</cooldownTime>
+					<chanceFactor>0.20</chanceFactor>
+					<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.32</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>2.48</cooldownTime>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>9.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.95</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Two-Handed Axe: Great Axe-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Greataxe"]/statBases</xpath>
+		<value>
+			<Bulk>7</Bulk>
+			<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Greataxe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.30</MeleeCritChance>
+				<MeleeParryChance>0.40</MeleeParryChance>
+				<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Greataxe"]/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>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2.18</cooldownTime>
+					<chanceFactor>0.25</chanceFactor>
+					<armorPenetrationBlunt>9.6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>37</power>
+					<cooldownTime>2.18</cooldownTime>
+					<chanceFactor>0.70</chanceFactor>
+					<armorPenetrationBlunt>9.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.95</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Two-Handed Axe: Long Axe-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Longaxe"]/statBases</xpath>
+		<value>
+			<Bulk>7</Bulk>
+			<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Longaxe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.30</MeleeCritChance>
+				<MeleeParryChance>0.50</MeleeParryChance>
+				<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Longaxe"]/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>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2.05</cooldownTime>
+					<chanceFactor>0.25</chanceFactor>
+					<armorPenetrationBlunt>9.6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>32</power>
+					<cooldownTime>2.05</cooldownTime>
+					<chanceFactor>0.70</chanceFactor>
+					<armorPenetrationBlunt>9.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.32</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Polearms-->
+	<!--Polearm: Pitchfork-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Pitchfork"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Pitchfork"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.44</MeleeCritChance>
+				<MeleeParryChance>1.33</MeleeParryChance>
+				<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_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>
+
+	<!--Polearm: Hookedblade (you ugly child)-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_HookedBlade"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_HookedBlade"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.44</MeleeCritChance>
+				<MeleeParryChance>0.90</MeleeParryChance>
+				<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_HookedBlade"]/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>16</power>
+					<cooldownTime>1.8</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>6.9</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.8</cooldownTime>
+					<chanceFactor>0.65</chanceFactor>
+					<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Polearm: Billhook-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Billhook"]/statBases</xpath>
+		<value>
+			<Bulk>7</Bulk>
+			<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Billhook"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.60</MeleeCritChance>
+				<MeleeParryChance>1</MeleeParryChance>
+				<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Billhook"]/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>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.4</cooldownTime>
+					<chanceFactor>0.50</chanceFactor>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.1</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.8</cooldownTime>
+					<chanceFactor>0.45</chanceFactor>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.38</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Polearm: Halberd-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Halberd"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>1.08</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Halberd"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.22</MeleeCritChance>
+				<MeleeParryChance>1.53</MeleeParryChance>
+				<MeleeDodgeChance>0.67</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Halberd"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.31</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>2.9</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>
+
+	<!--Polearm: Pike-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Pike"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<MeleeCounterParryBonus>1.27</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Pike"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.08</MeleeCritChance>
+				<MeleeParryChance>0.95</MeleeParryChance>
+				<MeleeDodgeChance>1.27</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Pike"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.3</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>1.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.5</cooldownTime>
+					<chanceFactor>0.95</chanceFactor>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Polearm: Swordlance-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Swordlance"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<MeleeCounterParryBonus>1.27</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Swordlance"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.08</MeleeCritChance>
+				<MeleeParryChance>0.95</MeleeParryChance>
+				<MeleeDodgeChance>1.27</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Swordlance"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.3</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.8</cooldownTime>
+					<chanceFactor>0.20</chanceFactor>
+					<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>2.3</cooldownTime>
+					<chanceFactor>0.75</chanceFactor>
+					<armorPenetrationBlunt>4.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.85</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ======= Named ======= -->
+	<!-- Two-handed Sword: Greatsword -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NamedGreatsword"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<MeleeCounterParryBonus>0.70</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NamedGreatsword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.30</MeleeCritChance>
+				<MeleeParryChance>1.20</MeleeParryChance>
+				<MeleeDodgeChance>0.50</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NamedGreatsword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.69</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>49</power>
+					<cooldownTime>1.98</cooldownTime>
+					<chanceFactor>0.50</chanceFactor>
+					<armorPenetrationBlunt>1.95</armorPenetrationBlunt>
+					<armorPenetrationSharp>4.64</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>99</power>
+					<cooldownTime>2.86</cooldownTime>
+					<chanceFactor>0.45</chanceFactor>
+					<armorPenetrationBlunt>8.75</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.41</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Two-handed Mace: Flanged Mace -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NamedTwoHandedFlangedMace"]/statBases</xpath>
+		<value>
+			<Bulk>9</Bulk>
+			<MeleeCounterParryBonus>0.54</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NamedTwoHandedFlangedMace"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>2.30</MeleeCritChance>
+				<MeleeParryChance>0.40</MeleeParryChance>
+				<MeleeDodgeChance>0.30</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NamedTwoHandedFlangedMace"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>45</power>
+					<cooldownTime>3.30</cooldownTime>
+					<chanceFactor>0.90</chanceFactor>
+					<armorPenetrationBlunt>32.28</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Two-handed Axe: Great Axe-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NamedGreataxe"]/statBases</xpath>
+		<value>
+			<Bulk>7</Bulk>
+			<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NamedGreataxe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.30</MeleeCritChance>
+				<MeleeParryChance>0.40</MeleeParryChance>
+				<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NamedGreataxe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.3</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>2.18</cooldownTime>
+					<chanceFactor>0.25</chanceFactor>
+					<armorPenetrationBlunt>23.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>76</power>
+					<cooldownTime>2.18</cooldownTime>
+					<chanceFactor>0.70</chanceFactor>
+					<armorPenetrationBlunt>23.4</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.31</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Two-handed Hammer : Two-Handed Hammer-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NamedTwoHandedHammer"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>0.54</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NamedTwoHandedHammer"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>2.1</MeleeCritChance>
+				<MeleeParryChance>0.50</MeleeParryChance>
+				<MeleeDodgeChance>0.30</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NamedTwoHandedHammer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>45</power>
+					<cooldownTime>2.86</cooldownTime>
+					<chanceFactor>0.95</chanceFactor>
+					<armorPenetrationBlunt>32.28</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Polearm: Halberd-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NamedHalberd"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>1.08</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NamedHalberd"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.22</MeleeCritChance>
+				<MeleeParryChance>1.53</MeleeParryChance>
+				<MeleeDodgeChance>0.67</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NamedHalberd"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.31</cooldownTime>
+					<armorPenetrationBlunt>4.94</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>97</power>
+					<cooldownTime>2.9</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>19.75</armorPenetrationBlunt>
+					<armorPenetrationSharp>3.95</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>82</power>
+					<cooldownTime>1.16</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>4.95</armorPenetrationBlunt>
+					<armorPenetrationSharp>4.94</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Weapons_Ranged.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Weapons_Ranged.xml
new file mode 100644
index 0000000000..22cb9acb44
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Weapons_Ranged.xml	
@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DankPyon_Crossbow" or defName="DankPyon_CrossbowHeavy"]/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>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bow_War" or defName="DankPyon_Bow_Hunting"]/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>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "DankPyon_Handgonne"]/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>
+
+	<!-- === Crossbow === -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DankPyon_Crossbow</defName>
+		<statBases>
+			<Bulk>6</Bulk>
+			<SwayFactor>1.2</SwayFactor>
+			<ShotSpread>0.25</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>70</WoodLog>
+			<DankPyon_ComponentBasic>2</DankPyon_ComponentBasic>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Projectile_DankPyonCrossbowBolt_Steel</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>23</range>
+			<soundCast>Bow_Large</soundCast>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_DankPyonCrossbowBolt</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_XBow</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Heavy Crossbow === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DankPyon_CrossbowHeavy</defName>
+		<statBases>
+			<Bulk>6</Bulk>
+			<SwayFactor>1.0</SwayFactor>
+			<ShotSpread>0.20</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>60</WoodLog>
+			<Steel>25</Steel>
+			<DankPyon_ComponentBasic>3</DankPyon_ComponentBasic>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Projectile_ArbalestBolt_Steel</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>26</range>
+			<soundCast>Bow_Large</soundCast>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>5.5</reloadTime>
+			<ammoSet>AmmoSet_ArbalestBolt</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_XBow</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Hunting bow ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DankPyon_Bow_Hunting</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>1</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>4.00</Bulk>
+			<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_HuntingArrow_Stone</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>16</range>
+			<soundCast>Bow_Recurve</soundCast>
+		</Properties>
+		<AmmoUser>
+			<ammoSet>AmmoSet_HuntingArrow</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_Bow</li>
+		</weaponTags>
+		<researchPrerequisite>DankPyon_HuntingBow</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== War bow ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Bow_War</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>1</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>5.00</Bulk>
+			<RangedWeapon_Cooldown>0.7</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>20</WoodLog>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_WarArrow_Stone</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>32</range>
+			<soundCast>Bow_Large</soundCast>
+		</Properties>
+		<AmmoUser>
+			<ammoSet>AmmoSet_WarArrow</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_Bow</li>
+		</weaponTags>
+		<researchPrerequisite>DankPyon_WarBow</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- === Handgonne === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DankPyon_Handgonne</defName>
+		<statBases>
+			<Bulk>7</Bulk>
+			<SwayFactor>1.22</SwayFactor>
+			<ShotSpread>0.36</ShotSpread>
+			<SightsEfficiency>0.85</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Handgonne_Ball</defaultProjectile>
+			<warmupTime>1.66</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Shotgun_NoRack</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<ammoConsumedPerShotCount>4</ammoConsumedPerShotCount>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>4</magazineSize>
+			<reloadTime>5.1</reloadTime>
+			<ammoSet>AmmoSet_HandgonneShot</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>NeolithicRangedHeavy</li>
+			<li>NeolithicRangedChief</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Let musket ammo by made at Medieval Overhaul anvil. === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="MusketBallBase"]/tradeTags</xpath>
+		<value>
+			<li>CE_AutoEnableCrafting_DankPyon_Anvil</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_MusketBall"]/researchPrerequisite</xpath>
+		<value>
+			<researchPrerequisite>DankPyon_Gunpowder</researchPrerequisite>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Medieval Tailor/Patches/Medieval Tailor/MO_Tailor_Armor.xml b/ModPatches/Medieval Tailor/Patches/Medieval Tailor/MO_Tailor_Armor.xml
new file mode 100644
index 0000000000..5106401270
--- /dev/null
+++ b/ModPatches/Medieval Tailor/Patches/Medieval Tailor/MO_Tailor_Armor.xml	
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Gambeson -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AMT_Apparel_Gambeson" or defName="AMT_Apparel_LongGambeson"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>6</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AMT_Apparel_Gambeson" or defName="AMT_Apparel_LongGambeson"]/statBases/Mass</xpath>
+		<value>
+			<Mass>3</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AMT_Apparel_Gambeson"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Arms</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AMT_Apparel_LongGambeson"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Shoulders</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AMT_Apparel_Gambeson" or defName="AMT_Apparel_LongGambeson"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Medieval Tailor/Patches/Medieval Tailor/MO_Tailor_Clothes.xml b/ModPatches/Medieval Tailor/Patches/Medieval Tailor/MO_Tailor_Clothes.xml
new file mode 100644
index 0000000000..13c05cc8ea
--- /dev/null
+++ b/ModPatches/Medieval Tailor/Patches/Medieval Tailor/MO_Tailor_Clothes.xml	
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Shirt -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AMT_Apparel_SimpleShirt" or defName="AMT_Apparel_OldShirt" or defName="AMT_Apparel_Doublet" or defName="AMT_Apparel_PaddedLeatherVest" or defName="AMT_Apparel_Jerkin" or defName="AMT_Apparel_CommonerTunic" or defName="AMT_Apparel_FancyTunic" or defName="AMT_Apparel_RoyalTunic" or defName="AMT_Apparel_BarMaidDress"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AMT_Apparel_SimpleShirt" or defName="AMT_Apparel_OldShirt" or defName="AMT_Apparel_Doublet" or defName="AMT_Apparel_PaddedLeatherVest" or defName="AMT_Apparel_CommonerTunic" or defName="AMT_Apparel_FancyTunic" or defName="AMT_Apparel_RoyalTunic" or defName="AMT_Apparel_BarMaidDress"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Arms</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AMT_Apparel_SimpleShirt" or defName="AMT_Apparel_OldShirt" or defName="AMT_Apparel_Doublet" or defName="AMT_Apparel_PaddedLeatherVest" or defName="AMT_Apparel_Jerkin" or defName="AMT_Apparel_CommonerTunic" or defName="AMT_Apparel_FancyTunic" or defName="AMT_Apparel_RoyalTunic" or defName="AMT_Apparel_BarMaidDress"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Short Coat -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AMT_Apparel_ShortCoat"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AMT_Apparel_ShortCoat"]/statBases/Mass</xpath>
+		<value>
+			<Mass>2</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AMT_Apparel_ShortCoat"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Rags -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AMT_Apparel_Rags"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AMT_Apparel_Rags"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Pants -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AMT_Apparel_Trousers" or defName="AMT_Apparel_RoyalHose"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AMT_Apparel_Trousers" or defName="AMT_Apparel_RoyalHose"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Hats -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AMT_Headgear_Chaperon" or defName="AMT_Headgear_ForesterHat" or defName="AMT_Headgear_ForesterHatF" or defName="Df_Headgear_MerchantHat" or defName="AMT_Headgear_Cap" or defName="AMT_Headgear_PiousCap"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AMT_Headgear_Chaperon" or defName="AMT_Headgear_ForesterHat" or defName="AMT_Headgear_ForesterHatF" or defName="Df_Headgear_MerchantHat" or defName="AMT_Headgear_Cap" or defName="AMT_Headgear_PiousCap"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="AMT_Headgear_Chaperon" or defName="AMT_Headgear_ForesterHat" or defName="AMT_Headgear_Cap"]/equippedStatOffsets/PainShockThreshold</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AMT_Headgear_ForesterHatF"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>.1</AimingAccuracy>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Shoes and Boots -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AMT_Handwear_TownGloves" or defName="AMT_Handwear_HuntingGloves" or defName="AMT_Handwear_NobleGloves" or defName="AMT_Handwear_VambraceLeather" or defName="AMT_Handwear_VambraceSplinted" or defName="AMT_Handwear_HandShackles"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AMT_Handwear_HuntingGloves"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>0.2</AimingAccuracy>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AMT_Handwear_BlacksmithGloves"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AMT_Handwear_TownGloves" or defName="AMT_Handwear_HuntingGloves" or defName="AMT_Handwear_BlacksmithGloves" or defName="AMT_Handwear_NobleGloves" or defName="AMT_Handwear_VambraceLeather" or defName="AMT_Handwear_VambraceSplinted" or defName="AMT_Handwear_HandShackles"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AMT_Handwear_VambraceLeather" or defName="AMT_Handwear_VambraceSplinted"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AMT_Handwear_VambraceSplinted"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.25</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AMT_Handwear_VambraceSplinted"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Shoes and Boots -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AMT_Footwear_Peasantshoes" or defName="AMT_Footwear_Nobleshoes" or defName="AMT_Footwear_Townboots" or defName="AMT_Footwear_Travelboots" or defName="AMT_Footwear_Nobleboots" or defName="AMT_Footwear_Shackles"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AMT_Footwear_Peasantshoes" or defName="AMT_Footwear_Nobleshoes"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AMT_Footwear_Townboots" or defName="AMT_Footwear_Travelboots" or defName="AMT_Footwear_Nobleboots"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AMT_Footwear_Shackles"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Medieval Tailor/Patches/Medieval Tailor/MO_Tailor_Outwear.xml b/ModPatches/Medieval Tailor/Patches/Medieval Tailor/MO_Tailor_Outwear.xml
new file mode 100644
index 0000000000..9087144af4
--- /dev/null
+++ b/ModPatches/Medieval Tailor/Patches/Medieval Tailor/MO_Tailor_Outwear.xml	
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Basically Parka -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AMT_Apparel_Wintercoat"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AMT_Apparel_Wintercoat"]/statBases/Mass</xpath>
+		<value>
+			<Mass>3</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AMT_Apparel_Wintercoat"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Headstuff -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AMT_Headgear_Cowl" or defName="AMT_Apparel_Cloak" or defName="AMT_Apparel_WinterCloak"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AMT_Headgear_Cowl" or defName="AMT_Apparel_Cloak" or defName="AMT_Apparel_WinterCloak"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AMT_Apparel_WinterCloak"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!--Remove Pain Threshold -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="AMT_Apparel_Cloak" or defName="AMT_Apparel_WinterCloak"]/equippedStatOffsets/PainShockThreshold</xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Megafauna/Patches/Megafauna/Items_Resource_Megafauna_Items.xml b/ModPatches/Megafauna/Patches/Megafauna/Items_Resource_Megafauna_Items.xml
new file mode 100644
index 0000000000..c998dbc38c
--- /dev/null
+++ b/ModPatches/Megafauna/Patches/Megafauna/Items_Resource_Megafauna_Items.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ====== Mammoth Tusk ====== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MammothTusk"]/description</xpath>
+		<value>
+			<description>A mammoth's tusk. Very durable and valuable. Too unwieldy to be used as a weapon.</description>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="MammothTusk"]/tools</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="MammothTusk"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>ResourceBase</value>
+	</Operation>
+
+	<!-- ====== Elasmotherium Horn ====== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ElasmotheriumHorn"]/description</xpath>
+		<value>
+			<description>An elasmotherium's horn. Too unwieldy to be used as a weapon.</description>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="ElasmotheriumHorn"]/tools</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="ElasmotheriumHorn"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>ResourceBase</value>
+	</Operation>
+
+	<!-- ====== Smilodon Fangs ====== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SmilodonFangs"]/description</xpath>
+		<value>
+			<description>A dead smilodon's pair of canines.A fantastic trophy.</description>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="SmilodonFangs"]/tools</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="SmilodonFangs"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>ResourceBase</value>
+	</Operation>
+
+	<!-- ====== Deinotherium Tusk ====== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DeinotheriumTusk"]/description</xpath>
+		<value>
+			<description>A deinotherium's tusk. Very durable and valuable. Too unwieldy to be used as a weapon.</description>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="DeinotheriumTusk"]/tools</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="DeinotheriumTusk"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>ResourceBase</value>
+	</Operation>
+
+	<!-- ====== Zygolophodon Tusk ====== -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="ZygolophodonTusk"]/tools</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="ZygolophodonTusk"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>ResourceBase</value>
+	</Operation>
+
+	<!-- ====== PlatybelodonTusk ====== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PlatybelodonTusk"]/description</xpath>
+		<value>
+			<description>A platybelodon's tusk. Somewhat small, compared to those of other proboscidea. Very valuable.</description>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="PlatybelodonTusk"]/tools</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="PlatybelodonTusk"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>ResourceBase</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Megafauna/Patches/Megafauna/Items_Resource_Megafauna_Stuff.xml b/ModPatches/Megafauna/Patches/Megafauna/Items_Resource_Megafauna_Stuff.xml
new file mode 100644
index 0000000000..62da8fec19
--- /dev/null
+++ b/ModPatches/Megafauna/Patches/Megafauna/Items_Resource_Megafauna_Stuff.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--========== Wool ============-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MammothWool" or defName="JosephoartigasiaWool"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.03</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ElasmotheriumWool"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.04</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Megafauna/Patches/Megafauna/Mega_Bodies.xml b/ModPatches/Megafauna/Patches/Megafauna/Mega_Bodies.xml
new file mode 100644
index 0000000000..f278e5f8c2
--- /dev/null
+++ b/ModPatches/Megafauna/Patches/Megafauna/Mega_Bodies.xml
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Natural Armor -->
+	<!-- Seal -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Seal"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Flipper" or
+			def="Tail"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Seal"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Jaw" or
+			def="Flipper" or
+			def="Tail" or
+			def="Head"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- Natural Armor -->
+	<!-- Centipede -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="CentipedeLike"]//*[
+			def="CentipedeFirstSegment" or
+			def="CentipedeFirstSegment" or
+			def="CentipedeSecondSegment" or
+			def="CentipedeThirdSegment" or
+			def="CentipedeFourthSegment" or
+			def="CentipedeFifthSegment" or
+			def="CentipedeSixthSegment" or
+			def="InsectNostril" or
+			def="Pronotum"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="CentipedeLike"]//*[
+			def="CentipedeFirstSegment" or
+			def="CentipedeSecondSegment" or
+			def="CentipedeThirdSegment" or
+			def="CentipedeFourthSegment" or
+			def="CentipedeFifthSegment" or
+			def="CentipedeSixthSegment" or
+			def="Pronotum" or
+			def="InsectNostril" or
+			def="InsectHead"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- fang -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="QuadrupedAnimalWithPawsTailAndFangs"]//*[
+			def="Body" or
+			def="Tail" or
+			def="Leg" or
+			def="Neck"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="QuadrupedAnimalWithPawsTailAndFangs"]//*[
+			def="Body" or
+			def="Tail" or
+			def="Neck" or
+			def="Head" or
+			def="AnimalJaw" or
+			def="Fangs" or
+			def="Paw" or
+			def="Leg"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="QuadrupedAnimalWithCarapace"]//*[
+			def="GlyptodonCarapace" or
+			def="Leg" or
+			def="Neck"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="QuadrupedAnimalWithCarapace"]//*[
+			def="GlyptodonCarapace" or
+			def="GlyptodonShell" or
+			def="Tail" or
+			def="Neck" or
+			def="Leg" or
+			def="Head"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- KangarooLike -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="KangarooLike"]//*[
+			def="Body" or
+			def="Arm" or
+			def="Leg"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="KangarooLike"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Head" or
+			def="AnimalJaw" or
+			def="Shoulder" or
+			def="Arm" or
+			def="Leg"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- FlyingInsect -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="FlyingInsect"]//*[
+			def="Shell" or
+			def="Pronotum" or
+			def="InsectNostril" or
+			def="InsectLeg"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="FlyingInsect"]//*[
+			def="Shell" or
+			def="Pronotum" or
+			def="InsectHead" or
+			def="InsectNostril" or
+			def="InsectMouth" or
+			def="InsectLeg"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- Scorpion -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Scorpion"]//*[
+			def="Shell" or
+			def="Pronotum" or
+			def="InsectNostril" or
+			def="InsectTail" or
+			def="InsectLeg"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Scorpion"]//*[
+			def="Shell" or
+			def="Pronotum" or
+			def="InsectHead" or
+			def="InsectNostril" or
+			def="InsectMouth" or
+			def="InsectTail" or
+			def="Stinger" or
+			def="Pincer" or
+			def="InsectLeg"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Megafauna/Patches/Megafauna/Races_Animal_Megafauna.xml b/ModPatches/Megafauna/Patches/Megafauna/Races_Animal_Megafauna.xml
new file mode 100644
index 0000000000..e230fea8e7
--- /dev/null
+++ b/ModPatches/Megafauna/Patches/Megafauna/Races_Animal_Megafauna.xml
@@ -0,0 +1,2258 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Spreadsheets for this patch can be found here: https://docs.google.com/spreadsheets/d/1lgGUlbR2BYTUpEYWdTQjbu2sPBYPaLKx8gQRdRrm_TM
+https://docs.google.com/spreadsheets/d/1pnhJUo3bkEPxhpmPrHj4spPdvjifLhOsnfFrZmOovmQ
+--><Patch>
+	<!-- BODY SHAPES -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/ThingDef[
+			defName="Gigantopithecus"
+			]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/ThingDef[
+			defName="Andrewsarchus" or
+			defName="Aurochs" or
+			defName="Castoroides" or
+			defName="Chalicotherium" or
+			defName="Daeodon" or
+			defName="Deinotherium" or
+			defName="Dinocrocuta" or
+			defName="Dinopithecus" or
+			defName="Diprotodon" or
+			defName="Elasmotherium" or
+			defName="Josephoartigasia" or
+			defName="Macrauchenia" or
+			defName="Megaloceros" or
+			defName="Paraceratherium" or
+			defName="Platybelodon" or
+			defName="Procoptodon" or
+			defName="ShortfacedBear" or
+			defName="Sivatherium" or
+			defName="Smilodon" or
+			defName="Uintatherium" or
+			defName="WoollyMammoth" or
+			defName="Zygolophodon"
+			]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/ThingDef[
+			defName="Doedicurus" or
+			defName="Enhydriodon" or
+			defName="Gomphotaria" or
+			defName="Megalania" or
+			defName="Megalochelys" or
+			defName="Pulmonoscorpius" or
+			defName="Purussaurus" or
+			defName="Quinkana"
+			]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/ThingDef[
+			defName="Arthropleura" or
+			defName="Gigantophis" or
+			defName="Meganeura" or
+			defName="Titanoboa"
+			]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Serpentine</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/ThingDef[
+			defName="Dinornis" or
+			defName="Palaeeudyptes" or
+			defName="Titanis"
+			]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========= Arthropleura ========= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Arthropleura"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.10</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.27</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arthropleura"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arthropleura"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arthropleura"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.25</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Doedicurus ========= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Doedicurus"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.04</MeleeDodgeChance>
+			<MeleeCritChance>0.13</MeleeCritChance>
+			<MeleeParryChance>0.35</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Doedicurus"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>18</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Doedicurus"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Doedicurus"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tail</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>4</cooldownTime>
+					<linkedBodyPartsGroup>TailWeapon</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>25</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>10.985</armorPenetrationBlunt>
+					<chanceFactor>0.25</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2.1</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Daeodon ========= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Daeodon"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			<MeleeCritChance>0.39</MeleeCritChance>
+			<MeleeParryChance>0.28</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Daeodon"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>2.05</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5.04</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>2.05</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5.04</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>2.45</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>23</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.22</armorPenetrationSharp>
+					<armorPenetrationBlunt>10.8</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Gigantopithecus ========= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Gigantopithecus"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.11</MeleeDodgeChance>
+			<MeleeCritChance>0.18</MeleeCritChance>
+			<MeleeParryChance>0.19</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gigantopithecus"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>2.05</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5.184</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>2.05</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5.184</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.3</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.7</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Paraceratherium ========= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Paraceratherium"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.07</MeleeDodgeChance>
+			<MeleeCritChance>1.04</MeleeCritChance>
+			<MeleeParryChance>1.24</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Paraceratherium"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>131</power>
+					<cooldownTime>5.1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>66</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>131</power>
+					<cooldownTime>5.1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>66</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>114</power>
+					<cooldownTime>5.15</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>205.2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Titanis ========= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Titanis"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.26</MeleeDodgeChance>
+			<MeleeCritChance>0.23</MeleeCritChance>
+			<MeleeParryChance>0.18</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Titanis"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>33</power>
+					<cooldownTime>2.35</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>22</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.06</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.445</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Titanoboa ========= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Titanoboa"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.12</MeleeDodgeChance>
+			<MeleeCritChance>0.27</MeleeCritChance>
+			<MeleeParryChance>0.57</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Titanoboa"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>88</power>
+					<cooldownTime>2.5</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>75</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>42.561</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= WoollyMammoth ========= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoollyMammoth"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.07</MeleeDodgeChance>
+			<MeleeCritChance>0.61</MeleeCritChance>
+			<MeleeParryChance>0.51</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoollyMammoth"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tusk</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>67</power>
+					<cooldownTime>3.55</cooldownTime>
+					<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>31.226</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>31</power>
+					<cooldownTime>2.55</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>12.96</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>31</power>
+					<cooldownTime>2.55</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>12.96</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>55</power>
+					<cooldownTime>4</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Elasmotherium ========= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Elasmotherium"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.08</MeleeDodgeChance>
+			<MeleeCritChance>0.62</MeleeCritChance>
+			<MeleeParryChance>0.48</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Elasmotherium"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>55</power>
+					<cooldownTime>4</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>3.05</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.11</armorPenetrationSharp>
+					<armorPenetrationBlunt>8.75</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>43</power>
+					<cooldownTime>3.7</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>18.75</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Smilodon ========= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Smilodon"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.23</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Smilodon"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.34</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.366</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.34</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.366</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.95</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>22</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.14</armorPenetrationSharp>
+					<armorPenetrationBlunt>6.802</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Chalicotherium ========= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Chalicotherium"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.24</MeleeCritChance>
+			<MeleeParryChance>0.33</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Chalicotherium"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.75</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.06</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.75</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.06</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>2.1</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Megaloceros ========= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Megaloceros"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.14</MeleeDodgeChance>
+			<MeleeCritChance>0.27</MeleeCritChance>
+			<MeleeParryChance>0.3</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Megaloceros"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.55</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>6.75</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.55</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>6.75</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>2.6</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4.75</armorPenetrationBlunt>
+					<chanceFactor>0.25</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2.5</cooldownTime>
+					<restrictedGender>Female</restrictedGender>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>antlers</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>3.65</cooldownTime>
+					<restrictedGender>Male</restrictedGender>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.39</armorPenetrationSharp>
+					<armorPenetrationBlunt>17.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Procoptodon ========= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Procoptodon"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.14</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Procoptodon"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>feet</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>25</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>7.225</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.15</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>22</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>4.335</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.15</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>22</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>4.335</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.9</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Megalania ========= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Megalania"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.09</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Megalania"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>34</power>
+					<cooldownTime>2.05</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.6</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>34</power>
+					<cooldownTime>2.05</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.6</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>toxic bite</label>
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>2.1</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>27</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.08</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.76</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Gomphotaria ========= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Gomphotaria"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>0.43</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gomphotaria"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>37</power>
+					<cooldownTime>3.75</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>36</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.11</armorPenetrationSharp>
+					<armorPenetrationBlunt>10.125</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Diprotodon ========= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Diprotodon"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.06</MeleeDodgeChance>
+			<MeleeCritChance>0.3</MeleeCritChance>
+			<MeleeParryChance>0.45</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Diprotodon"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>2.25</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.13</armorPenetrationSharp>
+					<armorPenetrationBlunt>12.675</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>2.25</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.13</armorPenetrationSharp>
+					<armorPenetrationBlunt>12.675</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>1.95</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>24</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+					<armorPenetrationBlunt>6.76</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= ShortfacedBear ========= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ShortfacedBear"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			<MeleeCritChance>0.34</MeleeCritChance>
+			<MeleeParryChance>0.33</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ShortfacedBear"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>1.55</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>25</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+					<armorPenetrationBlunt>6.75</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>1.55</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>25</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+					<armorPenetrationBlunt>6.75</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>46</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>27</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.23</armorPenetrationSharp>
+					<armorPenetrationBlunt>18</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Dinocrocuta ========= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Dinocrocuta"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.18</MeleeCritChance>
+			<MeleeParryChance>0.18</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Dinocrocuta"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.72</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.72</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>29</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>28</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.96</armorPenetrationSharp>
+					<armorPenetrationBlunt>8.1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Sivatherium ========= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Sivatherium"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.14</MeleeDodgeChance>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>0.28</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Sivatherium"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5.063</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5.063</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2.45</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2.35</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Andrewsarchus ========= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Andrewsarchus"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.12</MeleeDodgeChance>
+			<MeleeCritChance>0.19</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Andrewsarchus"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.925</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.925</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>30</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.07</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Dinornis ========= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Dinornis"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.24</MeleeDodgeChance>
+			<MeleeCritChance>0.21</MeleeCritChance>
+			<MeleeParryChance>0.26</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Dinornis"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>beak</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2.05</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>13</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.025</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Macrauchenia ========= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Macrauchenia"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.49</MeleeCritChance>
+			<MeleeParryChance>0.32</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Macrauchenia"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>2.1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5.976</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>2.1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5.976</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2.55</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4.15</armorPenetrationBlunt>
+					<chanceFactor>0.3</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Quinkana ========= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Quinkana"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			<MeleeCritChance>0.29</MeleeCritChance>
+			<MeleeParryChance>0.26</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Quinkana"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>31</power>
+					<cooldownTime>2.15</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.08</armorPenetrationSharp>
+					<armorPenetrationBlunt>6.48</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>31</power>
+					<cooldownTime>2.15</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.08</armorPenetrationSharp>
+					<armorPenetrationBlunt>6.48</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>32</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>7.84</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Deinotherium ========= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Deinotherium"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.07</MeleeDodgeChance>
+			<MeleeCritChance>0.89</MeleeCritChance>
+			<MeleeParryChance>0.72</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Deinotherium"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tusk</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>85</power>
+					<cooldownTime>3.8</cooldownTime>
+					<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>40.593</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>41</power>
+					<cooldownTime>2.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>18</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>41</power>
+					<cooldownTime>2.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>18</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>79</power>
+					<cooldownTime>4.4</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>37.5</armorPenetrationBlunt>
+					<chanceFactor>0.01</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Aurochs ========= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Aurochs"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.11</MeleeDodgeChance>
+			<MeleeCritChance>0.31</MeleeCritChance>
+			<MeleeParryChance>0.28</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Aurochs"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5.04</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5.04</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.7</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>9</armorPenetrationBlunt>
+					<chanceFactor>0.45</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2.1</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5.76</armorPenetrationBlunt>
+					<chanceFactor>0.25</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Megalochelys ========= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Megalochelys"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.06</MeleeCritChance>
+			<MeleeParryChance>0.44</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Megalochelys"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Megalochelys"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Megalochelys"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>beak</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>3.25</cooldownTime>
+					<linkedBodyPartsGroup>TurtleBeakAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.11</armorPenetrationSharp>
+					<armorPenetrationBlunt>11</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.65</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Palaeeudyptes ========= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Palaeeudyptes"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.14</MeleeDodgeChance>
+			<MeleeCritChance>0.07</MeleeCritChance>
+			<MeleeParryChance>0.16</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Palaeeudyptes"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>3.85</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.24</armorPenetrationSharp>
+					<armorPenetrationBlunt>11.543</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>3.85</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>19</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>11.543</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Josephoartigasia ========= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Josephoartigasia"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.08</MeleeDodgeChance>
+			<MeleeCritChance>0.19</MeleeCritChance>
+			<MeleeParryChance>0.34</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Josephoartigasia"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.07</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.07</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>52</power>
+					<cooldownTime>2.25</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>18</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.13</armorPenetrationSharp>
+					<armorPenetrationBlunt>12.675</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Gigantophis ========= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Gigantophis"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.16</MeleeDodgeChance>
+			<MeleeCritChance>0.19</MeleeCritChance>
+			<MeleeParryChance>0.43</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gigantophis"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>38</power>
+					<cooldownTime>1.95</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>55</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>16.313</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Meganeura ========= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Meganeura"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.37</MeleeDodgeChance>
+			<MeleeCritChance>0.09</MeleeCritChance>
+			<MeleeParryChance>0.04</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Meganeura"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Meganeura"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Meganeura"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>9</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.605</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Zygolophodon ========= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Zygolophodon"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.06</MeleeDodgeChance>
+			<MeleeCritChance>0.98</MeleeCritChance>
+			<MeleeParryChance>0.97</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Zygolophodon"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tusk</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>179</power>
+					<cooldownTime>4.7</cooldownTime>
+					<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>93.677</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>76</power>
+					<cooldownTime>3.3</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>36</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>76</power>
+					<cooldownTime>3.3</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>36</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>125</power>
+					<cooldownTime>5</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>62.5</armorPenetrationBlunt>
+					<chanceFactor>0.01</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Platybelodon ========= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Platybelodon"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.06</MeleeDodgeChance>
+			<MeleeCritChance>0.46</MeleeCritChance>
+			<MeleeParryChance>0.5</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Platybelodon"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tusk</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>3</cooldownTime>
+					<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>15.613</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>29</power>
+					<cooldownTime>2.55</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>12.24</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>29</power>
+					<cooldownTime>2.55</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>12.24</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>50</power>
+					<cooldownTime>3.9</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>22.5</armorPenetrationBlunt>
+					<chanceFactor>0.01</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Purussaurus ========= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Purussaurus"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.08</MeleeDodgeChance>
+			<MeleeCritChance>0.65</MeleeCritChance>
+			<MeleeParryChance>0.62</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Purussaurus"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>65</power>
+					<cooldownTime>3.55</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.47</armorPenetrationSharp>
+					<armorPenetrationBlunt>46.8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>65</power>
+					<cooldownTime>3.55</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.47</armorPenetrationSharp>
+					<armorPenetrationBlunt>46.8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>90</power>
+					<cooldownTime>3.05</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>45</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.99</armorPenetrationSharp>
+					<armorPenetrationBlunt>99</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Uintatherium ========= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Uintatherium"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.08</MeleeDodgeChance>
+			<MeleeCritChance>0.31</MeleeCritChance>
+			<MeleeParryChance>0.41</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Uintatherium"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horns</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>3.35</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>12.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>2.6</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.06</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.375</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>3.1</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>9.375</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Pulmonoscorpius ========= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Pulmonoscorpius"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.19</MeleeDodgeChance>
+			<MeleeCritChance>0.03</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Pulmonoscorpius"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Pulmonoscorpius"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.06</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Pulmonoscorpius"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left pincer</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>LeftPincer</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right pincer</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>RightPincer</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>stinger</label>
+					<capacities>
+						<li>ToxicSting</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.52</cooldownTime>
+					<linkedBodyPartsGroup>Stinger</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>17</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.535</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Dinopithecus ========= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Dinopithecus"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.19</MeleeDodgeChance>
+			<MeleeCritChance>0.08</MeleeCritChance>
+			<MeleeParryChance>0.07</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Dinopithecus"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hand</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.9</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.49</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hand</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.9</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.49</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>19</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.27</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.69</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Castoroides ========= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Castoroides"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			<MeleeCritChance>0.08</MeleeCritChance>
+			<MeleeParryChance>0.08</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Castoroides"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.95</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.32</armorPenetrationBlunt>
+					<chanceFactor>0.7</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.72</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Enhydriodon ========= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Enhydriodon"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.17</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.13</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Enhydriodon"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.59</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.94</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.59</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.94</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.9</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.08</armorPenetrationSharp>
+					<armorPenetrationBlunt>6.338</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Metal Gear Rimworld-Gekko/Patches/Metal Gear Rimworld-Gekko/BodyDefs/GekkoBody.xml b/ModPatches/Metal Gear Rimworld-Gekko/Patches/Metal Gear Rimworld-Gekko/BodyDefs/GekkoBody.xml
new file mode 100644
index 0000000000..717d37bca5
--- /dev/null
+++ b/ModPatches/Metal Gear Rimworld-Gekko/Patches/Metal Gear Rimworld-Gekko/BodyDefs/GekkoBody.xml	
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Add groups entry if it doesn't exist already ========== -->
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalNeck"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalShoulder"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<!-- ========== Add armor coverage ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MGR_SyntheticalLeg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MGR_SyntheticalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MGR_SyntheticalLeg"]/parts/li[def="PowerClaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Metal Gear Rimworld-Gekko/Patches/Metal Gear Rimworld-Gekko/ThingDefs_Misc/Gekko50call.xml b/ModPatches/Metal Gear Rimworld-Gekko/Patches/Metal Gear Rimworld-Gekko/ThingDefs_Misc/Gekko50call.xml
new file mode 100644
index 0000000000..888b16878d
--- /dev/null
+++ b/ModPatches/Metal Gear Rimworld-Gekko/Patches/Metal Gear Rimworld-Gekko/ThingDefs_Misc/Gekko50call.xml	
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>MGR_Gun_Autocannon</defName>
+		<statBases>
+			<Mass>38.00</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.4</SwayFactor>
+			<Bulk>20.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.58</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>50Cal_Browning</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>16</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Suppressive</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Metal Gear Rimworld-Gekko/Patches/Metal Gear Rimworld-Gekko/ThingDefs_Races/Races_Mechanoid.xml b/ModPatches/Metal Gear Rimworld-Gekko/Patches/Metal Gear Rimworld-Gekko/ThingDefs_Races/Races_Mechanoid.xml
new file mode 100644
index 0000000000..4806b368c6
--- /dev/null
+++ b/ModPatches/Metal Gear Rimworld-Gekko/Patches/Metal Gear Rimworld-Gekko/ThingDefs_Races/Races_Mechanoid.xml	
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MGR_Mech_Gekko"]/statBases</xpath>
+		<value>
+			<PartialArmorBody>0</PartialArmorBody>
+		</value>
+	</Operation>
+
+	<!--Consistency with vanilla mechs-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MGR_Mech_Gekko"]/statBases</xpath>
+		<value>
+			<SmokeSensitivity>0</SmokeSensitivity>
+			<NightVisionEfficiency>0.80</NightVisionEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MGR_Mech_Gekko"]/statBases</xpath>
+		<value>
+			<ArmorRating_Heat>0.25</ArmorRating_Heat>
+			<CarryWeight>75</CarryWeight>
+			<CarryBulk>30</CarryBulk>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.26</MeleeCritChance>
+			<MeleeParryChance>0.52</MeleeParryChance>
+			<AimingDelayFactor>1.25</AimingDelayFactor>
+			<MaxHitPoints>500</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MGR_Mech_Gekko"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>38</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MGR_Mech_Gekko"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MGR_Mech_Gekko"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>3.51</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="MGR_Mech_Gekko"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="MGR_Mech_Gekko"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MGR_Mech_Gekko"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li>
+				<compClass>CombatExtended.CompAmmoGiver</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_MechAmmo">
+				<gizmoIconSetMagCount>UI/Buttons/SetMagCount</gizmoIconSetMagCount>
+				<gizmoIconTakeAmmoNow>UI/Buttons/TakeAmmoNow</gizmoIconTakeAmmoNow>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="MGR_Mech_Gekko"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<useStatic>false</useStatic>
+						<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
+						<parts>
+							<li>SightSensor</li>
+						</parts>
+					</li>
+					<li>
+						<useStatic>false</useStatic>
+						<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
+						<parts>
+							<li>SightSensor</li>
+						</parts>
+					</li>
+					<li>
+						<useStatic>false</useStatic>
+						<ArmorRating_Sharp>0.625</ArmorRating_Sharp>
+						<parts>
+							<li>MGR_SyntheticalLeg</li>
+						</parts>
+					</li>
+					<li>
+						<useStatic>true</useStatic>
+						<ArmorRating_Blunt>0.625</ArmorRating_Blunt>
+						<parts>
+							<li>MGR_SyntheticalLeg</li>
+						</parts>
+					</li>
+					<li>
+						<useStatic>false</useStatic>
+						<ArmorRating_Sharp>0.625</ArmorRating_Sharp>
+						<parts>
+							<li>MechanicalFoot</li>
+						</parts>
+					</li>
+					<li>
+						<useStatic>false</useStatic>
+						<ArmorRating_Blunt>0.625</ArmorRating_Blunt>
+						<parts>
+							<li>MechanicalFoot</li>
+						</parts>
+					</li>
+					<li>
+						<useStatic>false</useStatic>
+						<ArmorRating_Sharp>0.625</ArmorRating_Sharp>
+						<parts>
+							<li>PowerClaw</li>
+						</parts>
+					</li>
+					<li>
+						<useStatic>false</useStatic>
+						<ArmorRating_Blunt>0.625</ArmorRating_Blunt>
+						<parts>
+							<li>PowerClaw</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MGR_Mech_Gekko"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>3000</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>300</MaxOverHeal>
+				<MinArmorPct>0.5</MinArmorPct>
+				<MinArmorValueSharp>10</MinArmorValueSharp>
+				<MinArmorValueBlunt>22</MinArmorValueBlunt>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Midworld Expanded Flak Armor/Patches/Midworld Expanded Flak Armor/ThingDefs_Misc/ThingDef_Apparel.xml b/ModPatches/Midworld Expanded Flak Armor/Patches/Midworld Expanded Flak Armor/ThingDefs_Misc/ThingDef_Apparel.xml
new file mode 100644
index 0000000000..c1a47ec5aa
--- /dev/null
+++ b/ModPatches/Midworld Expanded Flak Armor/Patches/Midworld Expanded Flak Armor/ThingDefs_Misc/ThingDef_Apparel.xml	
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Bulk/Mass-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_FlakGloves" or
+			defName="Apparel_FlakBoots" or
+			defName="Apparel_FlakMask"
+			]/statBases/Mass </xpath>
+		<value>
+			<Mass>0.50</Mass>
+			<Bulk>3</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="FlakShirt"
+			]/statBases/Mass </xpath>
+		<value>
+			<Mass>1.2</Mass>
+			<Bulk>5</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="LightFlakVest"
+			]/statBases/Mass </xpath>
+		<value>
+			<Mass>6.25</Mass>
+			<Bulk>5</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="LightFlakVest"
+			]/statBases/MaxHitPoints </xpath>
+		<value>
+			<MaxHitPoints>100</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HeavyFlakSuit"
+			]/statBases/Mass </xpath>
+		<value>
+			<Mass>17.5</Mass>
+			<Bulk>60</Bulk>
+			<WornBulk>14</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Armor Values-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Apparel_FlakBoots" or
+			defName="Apparel_FlakMask"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Apparel_FlakGloves" or
+			defName="FlakShirt"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="LightFlakVest"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HeavyFlakSuit"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>7</StuffEffectMultiplierArmor>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_FlakGloves" or
+			defName="Apparel_FlakBoots" or
+			defName="Apparel_FlakMask" or
+			defName="FlakShirt"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HeavyFlakSuit"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="LightFlakVest"
+			]/statBases/ArmorRating_Blunt </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Apparel_FlakGloves" or
+			defName="Apparel_FlakBoots" or
+			defName="Apparel_FlakMask" or
+			defName="FlakShirt" or
+			defName="LightFlakVest" or
+			defName="HeavyFlakSuit"
+			]/statBases/ArmorRating_Heat </xpath>
+	</Operation>
+
+	<!--Movespeed-->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="Apparel_FlakBoots" or
+			defName="FlakShirt" or
+			defName="HeavyFlakSuit"
+			]/equippedStatOffsets/MoveSpeed </xpath>
+	</Operation>
+
+	<!--Costs-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_FlakGloves" or
+			defName="Apparel_FlakBoots" or
+			defName="FlakShirt"
+			]/costList </xpath>
+		<value>
+			<costList>
+				<Steel>15</Steel>
+			</costList>
+			<stuffCategories>
+				<li>Fabric</li>
+			</stuffCategories>
+			<costStuffCount>35</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Apparel_FlakMask"
+			]/costList </xpath>
+		<value>
+			<costList>
+				<Plasteel>15</Plasteel>
+			</costList>
+			<stuffCategories>
+				<li>Fabric</li>
+			</stuffCategories>
+			<costStuffCount>35</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="LightFlakVest"
+			]/costList </xpath>
+		<value>
+			<costList>
+				<Cloth>20</Cloth>
+			</costList>
+			<stuffCategories>
+				<li>Steeled</li>
+			</stuffCategories>
+			<costStuffCount>45</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HeavyFlakSuit"
+			]/costList </xpath>
+		<value>
+			<costList>
+				<Steel>120</Steel>
+			</costList>
+			<stuffCategories>
+				<li>Fabric</li>
+			</stuffCategories>
+			<costStuffCount>100</costStuffCount>
+		</value>
+	</Operation>
+
+	<!--Layer-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_FlakMask"
+			]/apparel/layers/li[.="Overhead"] </xpath>
+		<value>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Midworld Weaponry Expanded/Patches/Midworld Weaponry Expanded/Industrial_Ranged.xml b/ModPatches/Midworld Weaponry Expanded/Patches/Midworld Weaponry Expanded/Industrial_Ranged.xml
new file mode 100644
index 0000000000..62f1cf9174
--- /dev/null
+++ b/ModPatches/Midworld Weaponry Expanded/Patches/Midworld Weaponry Expanded/Industrial_Ranged.xml	
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tools === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[defName = "Gun_AdvancedRifle"]/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_CompactRifle"]/tools
+		</xpath>
+		<value>
+			<tools>
+				<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_AdvancedGrenadeLauncher"]/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>
+
+	<!-- === Advanced Assault Rifle === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AdvancedRifle</defName>
+		<statBases>
+			<WorkToMake>40000</WorkToMake>
+			<Mass>4.00</Mass>
+			<Bulk>7.50</Bulk>
+			<SwayFactor>1.24</SwayFactor>
+			<ShotSpread>0.11</ShotSpread>
+			<SightsEfficiency>1.2</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.34</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>55</Steel>
+			<Chemfuel>15</Chemfuel>
+			<Gold>7</Gold>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilAmount>2.12</recoilAmount>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>60</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<!-- Required Research Rework -->
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!-- === Compact Rifle === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_CompactRifle</defName>
+		<statBases>
+			<WorkToMake>20000</WorkToMake>
+			<Mass>2.65</Mass>
+			<Bulk>4.00</Bulk>
+			<SwayFactor>2.15</SwayFactor>
+			<ShotSpread>0.15</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>45</Steel>
+			<WoodLog>7</WoodLog>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>0.85</warmupTime>
+			<range>35</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilAmount>1.83</recoilAmount>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<!-- Required Research Rework -->
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!-- ===Advanced  Grenade Launcher === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AdvancedGrenadeLauncher</defName>
+		<statBases>
+			<WorkToMake>35500</WorkToMake>
+			<Mass>8.50</Mass>
+			<Bulk>9.00</Bulk>
+			<SwayFactor>1.31</SwayFactor>
+			<ShotSpread>0.18</ShotSpread>
+			<SightsEfficiency>1.15</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.40</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>60</Steel>
+			<Chemfuel>10</Chemfuel>
+			<Uranium>15</Uranium>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>50</range>
+			<minRange>4</minRange>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<recoilAmount>2.93</recoilAmount>
+			<ai_IsBuildingDestroyer>True</ai_IsBuildingDestroyer>
+			<ignorePartialLoSBlocker>True</ignorePartialLoSBlocker>
+			<targetParams>
+				<canTargetLocations>True</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>5.1</reloadTime>
+			<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aiUseBurstMode>False</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>GunHeavy</li>
+		</weaponTags>
+		<researchPrerequisite>CE_Launchers</researchPrerequisite>
+
+		<!-- Disallow with Run And Gun -->
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Miho Race/Defs/Miho Race/Ammo/Ammo_Miho_Advanced.xml b/ModPatches/Miho Race/Defs/Miho Race/Ammo/Ammo_Miho_Advanced.xml
new file mode 100644
index 0000000000..d650bafbd1
--- /dev/null
+++ b/ModPatches/Miho Race/Defs/Miho Race/Ammo/Ammo_Miho_Advanced.xml	
@@ -0,0 +1,447 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- Ammo Categories -->
+
+	<!-- Ammoset -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_MihoPlasma</defName>
+		<label>Rifle Plasma Cell</label>
+		<ammoTypes>
+			<Ammo_PlasmaCellRifle>Bullet_MihoPlasma</Ammo_PlasmaCellRifle>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_MihoPlasmaSniper</defName>
+		<label>Rifle Plasma Cell</label>
+		<ammoTypes>
+			<Ammo_PlasmaCellRifle>Bullet_MihoPlasmaSniper</Ammo_PlasmaCellRifle>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- Ammoset -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_MihoPlasmaThermo</defName>
+		<label>Thermobaric</label>
+		<ammoTypes>
+			<Ammo_80x256mmFuel_Incendiary>Bullet_75x300mmMiho_Thermobaric</Ammo_80x256mmFuel_Incendiary>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- Psy Shot -->
+
+	<ThingCategoryDef>
+		<defName>AmmoMechPsyShot</defName>
+		<label>Mechite Shot</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
+	</ThingCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>MechaniteMiho</defName>
+		<label>Mechanite (Miholic)</label>
+		<labelShort>MEC-M</labelShort>
+		<description>Mechanite enhanced munitions that are psychically charged. Capable of exotic or distruptive effects to a range of targets.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_MechPsyShot</defName>
+		<label>Psychic Shot</label>
+		<ammoTypes>
+			<Ammo_MechPsyShot>Bullet_MechPsyShot</Ammo_MechPsyShot>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<description>Multi-pellet mech shot cartridge designed for shotgun-type weapons.</description>
+		<thingCategories>
+			<li>AmmoMechPsyShot</li>
+		</thingCategories>
+		<defName>Ammo_MechPsyShot</defName>
+		<label>Mechanite Psyshot</label>
+		<graphicData>
+			<texPath>Things/Ammo/Charged/ShotgunMech</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>4.29</MarketValue>
+			<Mass>0.047</Mass>
+			<Bulk>0.07</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+		</tradeTags>
+		<ammoClass>MechaniteMiho</ammoClass>
+	</ThingDef>
+
+	<ThingDef ParentName="Base12GaugeChargedBullet">
+		<defName>Bullet_MechPsyShot</defName>
+		<label>pellet</label>
+		<graphicData>
+			<texPath>Things/Projectile/MihoThunderSpear</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>3</damageAmountBase>
+			<damageDef>Miho_MagicBombEMP</damageDef>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>1</amount>
+					<chance>0.08</chance>
+				</li>
+				<li>
+					<def>Stun</def>
+					<amount>2</amount>
+					<chance>0.05</chance>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+			<pelletCount>5</pelletCount>
+			<spreadMult>8.9</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_MechPsyShot</defName>
+		<label>make Mechanite Psychic shell x200</label>
+		<description>Craft 200 Mechanite Psychic shells.</description>
+		<jobString>Making Mechanite Psychic shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Miho_MilitaryGradeBalisticCeramics</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Miho_MilitaryGradeBalisticCeramics</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_MechPsyShot>200</Ammo_MechPsyShot>
+		</products>
+		<workAmount>21000</workAmount>
+		<researchPrerequisite>Miho_MechHack</researchPrerequisite>
+		<recipeUsers Inherit="False">
+			<li>Miho_TableMachining</li>
+		</recipeUsers>
+	</RecipeDef>
+
+	<!-- Heavy Pistol Bolt -->
+
+	<ThingCategoryDef>
+		<defName>Ammo10mmMihogrenade</defName>
+		<label>Miho Minigrenade</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
+	</ThingCategoryDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_10mmMihogrenade</defName>
+		<label>Mechanite Grenade (Blast)</label>
+		<ammoTypes>
+			<Ammo_10mmMihogrenade>Bullet_10mmMihogrenade</Ammo_10mmMihogrenade>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_10mmMihogrenadeFlechette</defName>
+		<label>Mechanite Grenade (Flechette)</label>
+		<ammoTypes>
+			<Ammo_10mmMihogrenade>Bullet_10mmMihogrenadeFlechette</Ammo_10mmMihogrenade>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_10mmMihogrenadeBarrier</defName>
+		<label>Mechanite Grenade (Barrier)</label>
+		<ammoTypes>
+			<Ammo_10mmMihogrenade>Bullet_10mmMihogrenadeBarrier</Ammo_10mmMihogrenade>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<description>Special purpose launcher grenades with variable properties.</description>
+		<thingCategories>
+			<li>Ammo10mmMihogrenade</li>
+		</thingCategories>
+		<defName>Ammo_10mmMihogrenade</defName>
+		<label>Mechanite Grenade</label>
+		<graphicData>
+			<texPath>Things/Ammo/Charged/ShotgunMech</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>17.1</MarketValue>
+			<Mass>0.17</Mass>
+			<Bulk>0.20</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+		</tradeTags>
+		<ammoClass>MechaniteMiho</ammoClass>
+	</ThingDef>
+
+	<ThingDef ParentName="Base40x46mmGrenadeBullet">
+		<defName>Bullet_10mmMihogrenade</defName>
+		<label>mechanite smart grenade (Explosive)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_Big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>18</damageAmountBase>
+			<damageDef>Miho_MagicBomb</damageDef>
+			<explosionRadius>1</explosionRadius>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Mihomech>20</Fragment_Mihomech>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_10mmMihogrenade</defName>
+		<label>make Mechanite Grenade x50</label>
+		<description>Craft 50 Mechanite Grenades.</description>
+		<jobString>Making Mechanite Grenades.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Miho_MilitaryGradeBalisticCeramics</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Miho_MilitaryGradeBalisticCeramics</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_10mmMihogrenade>50</Ammo_10mmMihogrenade>
+		</products>
+		<workAmount>20800</workAmount>
+		<researchPrerequisite>Miho_MechHack</researchPrerequisite>
+		<recipeUsers Inherit="False">
+			<li>Miho_TableMachining</li>
+		</recipeUsers>
+	</RecipeDef>
+
+	<!-- Ammoless Projectile -->
+	<ThingDef ParentName="Base556x45mmNATOBullet">
+		<defName>Bullet_MihoPlasma</defName>
+		<label>Plasma Bolt</label>
+		<graphicData>
+			<texPath>Things/Projectile/MihoPlasma</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>100</speed>
+			<damageAmountBase>10</damageAmountBase>
+			<damageDef>MihoPlasma</damageDef>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>200</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base556x45mmNATOBullet">
+		<defName>Bullet_MihoPlasmaSniper</defName>
+		<label>Plasma Bolt</label>
+		<graphicData>
+			<texPath>Things/Projectile/MihoPlasma</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>100</speed>
+			<damageAmountBase>30</damageAmountBase>
+			<damageDef>MihoPlasma</damageDef>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>400</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>60</damageAmountBase>
+				<explosiveDamageType>MihoPlasma</explosiveDamageType>
+				<explosiveRadius>1</explosiveRadius>
+				<explosionSound>Explosion_Bomb</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>false</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletRed">
+		<defName>Bullet_Laser_MihoMiniGun</defName>
+		<label>laser beam</label>
+		<graphicData>
+			<color>(255,160,46)</color>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>MihoPlasma</damageDef>
+			<damageAmountBase>7</damageAmountBase>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>200</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseExplosiveBullet">
+		<defName>Bullet_60x180mmMiho_Thermobaric</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>60x180mm fuel shell (Thermobaric)</label>
+		<graphicData>
+			<texPath>Things/Projectile/LauncherShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Thermobaric</damageDef>
+			<damageAmountBase>160</damageAmountBase>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+			<speed>60</speed>
+			<flyOverhead>false</flyOverhead>
+			<explosionRadius>3.5</explosionRadius>
+			<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
+			<preExplosionSpawnChance>0.5</preExplosionSpawnChance>
+			<soundExplode>MortarIncendiary_Explode</soundExplode>
+			<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+			<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+			<soundAmbient>MortarRound_Ambient</soundAmbient>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<ai_IsIncendiary>true</ai_IsIncendiary>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseExplosiveBullet">
+		<defName>Bullet_75x300mmMiho_Thermobaric</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>75x300mm plasmanized thermobaric shell</label>
+		<graphicData>
+			<texPath>Things/Projectile/LauncherShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>MihoPlasma</damageDef>
+			<damageAmountBase>280</damageAmountBase>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>1000</armorPenetrationBlunt>
+			<speed>60</speed>
+			<flyOverhead>false</flyOverhead>
+			<explosionRadius>3.5</explosionRadius>
+			<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
+			<preExplosionSpawnChance>0.5</preExplosionSpawnChance>
+			<soundExplode>MortarIncendiary_Explode</soundExplode>
+			<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+			<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+			<soundAmbient>MortarRound_Ambient</soundAmbient>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<ai_IsIncendiary>true</ai_IsIncendiary>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseFragment">
+		<defName>Fragment_Mihomech</defName>
+		<label>fragments</label>
+		<graphicData>
+			<texPath>Things/Projectile/MihoThunderSpear</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>0.88</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Miho_MagicBomb</damageDef>
+			<damageAmountBase>4</damageAmountBase>
+			<speed>35</speed>
+			<gravityFactor>5</gravityFactor>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base12GaugeChargedBullet">
+		<defName>Bullet_10mmMihogrenadeFlechette</defName>
+		<label>flechette</label>
+		<graphicData>
+			<texPath>Things/Projectile/MihoThunderSpear</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>1.35</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>65</speed>
+			<damageAmountBase>10</damageAmountBase>
+			<damageDef>Miho_MagicBombEMP</damageDef>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>8</amount>
+					<chance>1</chance>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+			<pelletCount>6</pelletCount>
+			<spreadMult>8.9</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base40x46mmGrenadeBullet">
+		<defName>Bullet_10mmMihogrenadeBarrier</defName>
+		<label>mechanite smart grenade (barrier)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_Big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>0</damageAmountBase>
+			<damageDef>Smoke</damageDef>
+			<explosionRadius>0.5</explosionRadius>
+			<preExplosionSpawnThingDef>Miho_BulletShieldPsychicSmall</preExplosionSpawnThingDef>
+			<preExplosionSpawnChance>1</preExplosionSpawnChance>
+		</projectile>
+	</ThingDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Miho Race/Defs/Miho Race/Ammo/Ammo_Miho_Industrial.xml b/ModPatches/Miho Race/Defs/Miho Race/Ammo/Ammo_Miho_Industrial.xml
new file mode 100644
index 0000000000..1ca6c2c802
--- /dev/null
+++ b/ModPatches/Miho Race/Defs/Miho Race/Ammo/Ammo_Miho_Industrial.xml	
@@ -0,0 +1,896 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- Ammo Categories -->
+	<CombatExtended.AmmoCategoryDef>
+		<defName>IncendiaryMiho</defName>
+		<label>armor-piercing incendiary (Miholic)</label>
+		<labelShort>AP-IM</labelShort>
+		<description>Filled with an high intensity incendiary compound that ignites on impact, burning the target, increasing armor penetration and comprimising the structure of the target.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<!-- Ammo -->
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="8x22mmNambuBase">
+		<defName>Ammo_8x22mmNambu_Miho</defName>
+		<label>8x22mm Nambu cartridge (AP-IM)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Pistol/AP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.12</MarketValue>
+		</statBases>
+		<ammoClass>IncendiaryMiho</ammoClass>
+		<cookOffProjectile>Bullet_8x22mmNambu_Miho</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="65x50mmSRArisakaBase">
+		<defName>Ammo_65x50mmSRArisaka_Miho</defName>
+		<label>6.5x50mmSR cartridge (AP-IM)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/Incendiary</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.14</MarketValue>
+		</statBases>
+		<ammoClass>IncendiaryMiho</ammoClass>
+		<cookOffProjectile>Bullet_65x50mmSRArisaka_Miho</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="77x58mmArisakaBase">
+		<defName>Ammo_77x58mmArisaka_Miho</defName>
+		<label>7.7x58mm Arisaka cartridge (AP-IM)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/Incendiary</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.16</MarketValue>
+		</statBases>
+		<ammoClass>IncendiaryMiho</ammoClass>
+		<cookOffProjectile>Bullet_77x58mmArisaka_Miho</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo132x92mmSRTuFBase">
+		<defName>Ammo_132x92mmSRTuF_Miho</defName>
+		<label>13.2x92mmSR TuF cartridge (AP-IM)</label>
+		<graphicData>
+			<texPath>Things/Ammo/HighCaliber/Incendiary</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.77</MarketValue>
+		</statBases>
+		<ammoClass>IncendiaryMiho</ammoClass>
+		<cookOffProjectile>Bullet_132x92mmSRTuF_Miho</cookOffProjectile>
+	</ThingDef>
+
+	<!-- Projectiles -->
+	<ThingDef ParentName="Base8x22mmNambuBullet">
+		<defName>Bullet_8x22mmNambu_Miho</defName>
+		<label>8x22mm Nambu bullet (AP-IM)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>MihoGunshot</damageDef>
+			<damageAmountBase>5</damageAmountBase>
+			<armorPenetrationSharp>6</armorPenetrationSharp>
+			<armorPenetrationBlunt>5.88</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>3</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base8x22mmNambuBullet">
+		<defName>Bullet_65x50mmSRArisaka_Miho</defName>
+		<label>6.5x50mmSR bullet (AP-IM)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>MihoGunshot</damageDef>
+			<damageAmountBase>5</damageAmountBase>
+			<armorPenetrationSharp>6</armorPenetrationSharp>
+			<armorPenetrationBlunt>5.88</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>3</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base75x54mmFrenchBullet">
+		<defName>Bullet_77x58mmArisaka_Miho</defName>
+		<label>7.7x58mm Arisaka bullet (AP-IM)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>MihoGunshot</damageDef>
+			<damageAmountBase>6</damageAmountBase>
+			<armorPenetrationSharp>12</armorPenetrationSharp>
+			<armorPenetrationBlunt>60.24</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>4</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base132x92mmSRTuFBullet">
+		<defName>Bullet_132x92mmSRTuF_Miho</defName>
+		<label>13.2x92mmSR TuF bullet (AP-IM)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>MihoGunshot</damageDef>
+			<damageAmountBase>25</damageAmountBase>
+			<armorPenetrationSharp>44</armorPenetrationSharp>
+			<armorPenetrationBlunt>317.36</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>16</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<!-- Recipes -->
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_8x22mmNambu_Miho</defName>
+		<label>make 8x22mm Nambu (AP-IM) cartridge x500</label>
+		<description>Craft 500 8x22mm Nambu (AP-IM) cartridges.</description>
+		<jobString>Making 8x22mm Nambu (AP-IM) cartridges.</jobString>
+		<researchPrerequisite>Miho_HeavyWeapon</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>14</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Miho_MilitaryGradeBalisticCeramics</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Prometheum</li>
+				<li>Miho_MilitaryGradeBalisticCeramics</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_8x22mmNambu_Miho>500</Ammo_8x22mmNambu_Miho>
+		</products>
+		<workAmount>3000</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_65x50mmSRArisaka_Miho</defName>
+		<label>make 6.5x50mmSR (AP-IM) cartridge x500</label>
+		<description>Craft 500 6.5x50mmSR Arisaka (AP-IM) cartridges.</description>
+		<jobString>Making 6.5x50mmSR Arisaka (AP-IM) cartridges.</jobString>
+		<researchPrerequisite>Miho_HeavyWeapon</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>24</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Miho_MilitaryGradeBalisticCeramics</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Prometheum</li>
+				<li>Miho_MilitaryGradeBalisticCeramics</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_65x50mmSRArisaka_Miho>500</Ammo_65x50mmSRArisaka_Miho>
+		</products>
+		<workAmount>4600</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_77x58mmArisaka_Miho</defName>
+		<label>make 7.7x58mm Arisaka (AP-IM) cartridge x500</label>
+		<description>Craft 500 7.7x58mm Arisaka (AP-IM) cartridges.</description>
+		<jobString>Making 7.7x58mm Arisaka (AP-IM) cartridges.</jobString>
+		<researchPrerequisite>Miho_HeavyWeapon</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>30</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Miho_MilitaryGradeBalisticCeramics</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Prometheum</li>
+				<li>Miho_MilitaryGradeBalisticCeramics</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_77x58mmArisaka_Miho>500</Ammo_77x58mmArisaka_Miho>
+		</products>
+		<workAmount>6000</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AdvancedAmmoRecipeBase">
+		<defName>MakeAmmo_132x92mmSRTuF_Miho</defName>
+		<label>make 13.2x92mmSR TuF (AP-IM) cartridge x200</label>
+		<description>Craft 200 13.2x92mmSR TuF (AP-IM) cartridges.</description>
+		<jobString>Making 13.2x92mmSR TuF (AP-IM) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>58</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Miho_MilitaryGradeBalisticCeramics</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Prometheum</li>
+				<li>Miho_MilitaryGradeBalisticCeramics</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_132x92mmSRTuF_Miho>200</Ammo_132x92mmSRTuF_Miho>
+		</products>
+		<workAmount>9800</workAmount>
+	</RecipeDef>
+
+	<ThingCategoryDef>
+		<defName>AmmoMiho47x285mm</defName>
+		<label>47x285mm mihoic anti-tank shell</label>
+		<parent>AmmoShells</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberAutocannonLarge</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Miho47x285mm</defName>
+		<label>47x285mm anti-tank shell</label>
+		<ammoTypes>
+			<Ammo_Miho47x285mm_HE>Bullet_Miho47x285mm_HE</Ammo_Miho47x285mm_HE>
+			<Ammo_Miho47x285mm_AP>Bullet_Miho47x285mm_AP</Ammo_Miho47x285mm_AP>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="AmmoMiho47x285mmBase" ParentName="HeavyAmmoBase" Abstract="True">
+		<description>Large caliber cartridge used by autocannons and anti-aircraft cannons.</description>
+		<statBases>
+			<Mass>1.4</Mass>
+			<Bulk>3.98</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoMiho47x285mm</li>
+		</thingCategories>
+		<stackLimit>25</stackLimit>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoMiho47x285mmBase">
+		<defName>Ammo_Miho47x285mm_HE</defName>
+		<label>47x285mm Mihoic anti-tank shell cartridge (HE)</label>
+		<graphicData>
+			<texPath>Things/Ammo/HighCaliber/Bofors/HE</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>21.21</MarketValue>
+		</statBases>
+		<ammoClass>ExplosiveAP</ammoClass>
+		<cookOffProjectile>Bullet_Miho47x285mm_HE</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoMiho47x285mmBase">
+		<defName>Ammo_Miho47x285mm_AP</defName>
+		<label>47x285mm Mihoic anti-tank shell cartridge (APHE)</label>
+		<graphicData>
+			<texPath>Things/Ammo/HighCaliber/Bofors/AP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>7.57</MarketValue>
+		</statBases>
+		<ammoClass>ArmorPiercing</ammoClass>
+		<cookOffProjectile>Bullet_Miho47x285mm_AP</cookOffProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef Name="BaseMiho47x285mmBullet" ParentName="BaseBulletCE" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_Big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>155</speed>
+			<dropsCasings>true</dropsCasings>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseMiho47x285mmBullet">
+		<defName>Bullet_Miho47x285mm_HE</defName>
+		<label>47x285mm Mihoic anti-tank bullet (HE)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>195</damageAmountBase>
+			<armorPenetrationSharp>25</armorPenetrationSharp>
+			<armorPenetrationBlunt>8555.440</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>117</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseMiho47x285mmBullet">
+		<defName>Bullet_Miho47x285mm_AP</defName>
+		<label>47x285mm Mihoic anti-tank bullet (APHE)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>122</damageAmountBase>
+			<armorPenetrationSharp>57</armorPenetrationSharp>
+			<armorPenetrationBlunt>8555.440</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_Miho47x285mm_HE</defName>
+		<label>make 47x285mm Miho (HE) cartridge x25</label>
+		<description>Craft 25 47x285mm Miho (HE) cartridges.</description>
+		<jobString>Making 47x285mm Miho (HE) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>108</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>33</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Miho47x285mm_HE>25</Ammo_Miho47x285mm_HE>
+		</products>
+		<workAmount>24000</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_Miho47x285mm_AP</defName>
+		<label>make 47x285mm Miho (APHE) cartridge x25</label>
+		<description>Craft 25 47x285mm Miho (APHE) cartridges.</description>
+		<jobString>Making 47x285mm Miho (APHE) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>108</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Miho47x285mm_AP>25</Ammo_Miho47x285mm_AP>
+		</products>
+		<workAmount>10800</workAmount>
+	</RecipeDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSetMiho100mm_Incendiary</defName>
+		<label>100mm Rocket</label>
+		<ammoTypes>
+			<Ammo_Miho100mm_Incendiary>Bullet_Miho100mm_Incendiary</Ammo_Miho100mm_Incendiary>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingCategoryDef>
+		<defName>AmmoMiho100mm_Incendiary</defName>
+		<label/>
+		<parent>AmmoRockets</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRocket</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="Miho100mm_IncendiaryBase" ParentName="HeavyAmmoBase" Abstract="True">
+		<description>An unguided rocket equipped with an explosive warhead and a contact fuse.</description>
+		<thingCategories>
+			<li>AmmoMiho100mm_Incendiary</li>
+		</thingCategories>
+		<stackLimit>25</stackLimit>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<statBases>
+			<MaxHitPoints>250</MaxHitPoints>
+			<Mass>19</Mass>
+			<Bulk>20</Bulk>
+		</statBases>
+		<cookOffFlashScale>25</cookOffFlashScale>
+		<cookOffSound>MortarBomb_Explode</cookOffSound>
+		<isMortarAmmo>true</isMortarAmmo>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Miho100mm_IncendiaryBase">
+		<defName>Ammo_Miho100mm_Incendiary</defName>
+		<label>100mm Artillery Rocket (Incendiary)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rocket/M74</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<drawSize>0.90</drawSize>
+		</graphicData>
+		<statBases>
+			<MarketValue>41.52</MarketValue>
+		</statBases>
+		<ammoClass>GrenadeIncendiary</ammoClass>
+		<detonateProjectile>Bullet_Miho100mm_Incendiary</detonateProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef Name="BaseMiho100mm_Incendiary" ParentName="BaseExplosiveBullet" Abstract="true">
+		<graphicData>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>0</speed>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+			<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+			<soundAmbient>MortarRound_Ambient</soundAmbient>
+			<flyOverhead>true</flyOverhead>
+			<dropsCasings>false</dropsCasings>
+			<gravityFactor>5</gravityFactor>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseMiho100mm_Incendiary">
+		<defName>Bullet_Miho100mm_Incendiary</defName>
+		<label>100mm Rocket (Incendiary)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Rocket/SMAW_Thermobaric</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>PrometheumFlame</damageDef>
+			<damageAmountBase>0</damageAmountBase>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+			<explosionRadius>5.9</explosionRadius>
+			<flyOverhead>true</flyOverhead>
+			<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
+			<preExplosionSpawnChance>0.15</preExplosionSpawnChance>
+			<soundExplode>MortarIncendiary_Explode</soundExplode>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>75</damageAmountBase>
+				<explosiveDamageType>MihoGunshotDemo</explosiveDamageType>
+				<explosiveRadius>1.9</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_Miho100mm_Incendiary</defName>
+		<label>make 100mm Miho Rocket x5</label>
+		<description>Craft 5 100mm Miho Rocket cartridges.</description>
+		<jobString>Making 100mm Miho Rocket cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Prometheum</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Miho100mm_Incendiary>5</Ammo_Miho100mm_Incendiary>
+		</products>
+		<workAmount>3730</workAmount>
+	</RecipeDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Miho57x93mmGrenade</defName>
+		<label>57x93mm Grenade</label>
+		<ammoTypes>
+			<Ammo_Miho57x93mmGrenade_HE>Bullet_Miho57x93mmGrenade_HE</Ammo_Miho57x93mmGrenade_HE>
+			<Ammo_Miho57x93mmGrenade_HEDP>Bullet_Miho57x93mmGrenade_HEDP</Ammo_Miho57x93mmGrenade_HEDP>
+			<Ammo_Miho57x93mmGrenade_EMP>Bullet_Miho57x93mmGrenade_EMP</Ammo_Miho57x93mmGrenade_EMP>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+	<ThingCategoryDef>
+		<defName>AmmoMiho57x93mmGrenade</defName>
+		<label>57x93mm mihoic Grenade</label>
+		<parent>AmmoGrenades</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberGrenade</iconPath>
+	</ThingCategoryDef>
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="AmmoMiho57x93mmGrenadeBase" ParentName="MediumAmmoBase" Abstract="True">
+		<description>High velocity grenade fired from mounted and crew-served grenade launchers.</description>
+		<statBases>
+			<Mass>1.6</Mass>
+			<Bulk>0.72</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoMiho57x93mmGrenade</li>
+		</thingCategories>
+		<stackLimit>150</stackLimit>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoMiho57x93mmGrenadeBase">
+		<defName>Ammo_Miho57x93mmGrenade_HE</defName>
+		<label>57x93mm Mihoic Grenade (HE)</label>
+		<graphicData>
+			<texPath>Things/Ammo/GrenadeLauncher/HE</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>10.13</MarketValue>
+		</statBases>
+		<ammoClass>GrenadeHE</ammoClass>
+		<cookOffProjectile>Bullet_Miho57x93mmGrenade_HE</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoMiho57x93mmGrenadeBase">
+		<defName>Ammo_Miho57x93mmGrenade_HEDP</defName>
+		<label>57x93mm Mihoic Grenade (HEDP)</label>
+		<graphicData>
+			<texPath>Things/Ammo/GrenadeLauncher/DP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>10.13</MarketValue>
+		</statBases>
+		<ammoClass>GrenadeHEDP</ammoClass>
+		<cookOffProjectile>Bullet_Miho57x93mmGrenade_HEDP</cookOffProjectile>
+	</ThingDef>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoMiho57x93mmGrenadeBase">
+		<defName>Ammo_Miho57x93mmGrenade_EMP</defName>
+		<label>57x93mm Mihoic Grenade (EMP)</label>
+		<graphicData>
+			<texPath>Things/Ammo/GrenadeLauncher/EMP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>16.1</MarketValue>
+		</statBases>
+		<ammoClass>GrenadeEMP</ammoClass>
+		<cookOffProjectile>Bullet_Miho57x93mmGrenade_EMP</cookOffProjectile>
+	</ThingDef>
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef Name="BaseMiho57x93mmGrenadeBullett" ParentName="BaseExplosiveBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/LauncherShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>(0.5,0.5)</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>60</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseMiho57x93mmGrenadeBullett">
+		<defName>Bullet_Miho57x93mmGrenade_HE</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>57x93mm Mihoic Grenade (HE)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>42</damageAmountBase>
+			<explosionRadius>1.5</explosionRadius>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>40</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+
+	</ThingDef>
+
+	<ThingDef ParentName="BaseMiho57x93mmGrenadeBullett">
+		<defName>Bullet_Miho57x93mmGrenade_HEDP</defName>
+		<thingClass>CombatExtended.BulletCE</thingClass>
+		<label>57x93mm Mihoic Grenade (HEDP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>96</damageAmountBase>
+			<armorPenetrationSharp>76</armorPenetrationSharp>
+			<armorPenetrationBlunt>12.734</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>42</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>25</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseMiho57x93mmGrenadeBullett">
+		<defName>Bullet_Miho57x93mmGrenade_EMP</defName>
+		<label>57x93mm Mihoic Grenade (EMP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>2.5</explosionRadius>
+			<damageDef>EMP</damageDef>
+			<damageAmountBase>42</damageAmountBase>
+		</projectile>
+	</ThingDef>
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_Miho57x93mmGrenade_HE</defName>
+		<label>make 57x93mm Miho (HE) Grenade x50</label>
+		<description>Craft 50 57x93mm Miho (HE) Grenade.</description>
+		<jobString>Making 57x93mm Miho (HE) Grenade.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>160</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Miho57x93mmGrenade_HE>100</Ammo_Miho57x93mmGrenade_HE>
+		</products>
+		<workAmount>22000</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_Miho57x93mmGrenade_HEDP</defName>
+		<label>make 57x93mm Miho (HEDP) Grenade x50</label>
+		<description>Craft 50 57x93mm Miho (HEDP) Grenade.</description>
+		<jobString>Making 57x93mm Miho (HEDP) Grenade.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>160</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Miho57x93mmGrenade_HEDP>50</Ammo_Miho57x93mmGrenade_HEDP>
+		</products>
+		<workAmount>17200</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_Miho57x93mmGrenade_EMP</defName>
+		<label>make 57x93mm Miho (EMP) Grenade x50</label>
+		<description>Craft 50 57x93mm Miho (EMP) Grenade.</description>
+		<jobString>Making 57x93mm Miho (EMP) Grenade.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>160</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>15</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Miho57x93mmGrenade_EMP>50</Ammo_Miho57x93mmGrenade_EMP>
+		</products>
+		<workAmount>25000</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Miho Race/Defs/Miho Race/Ammo/Ammo_Miho_Neolithic.xml b/ModPatches/Miho Race/Defs/Miho Race/Ammo/Ammo_Miho_Neolithic.xml
new file mode 100644
index 0000000000..d0e01ac7bc
--- /dev/null
+++ b/ModPatches/Miho Race/Defs/Miho Race/Ammo/Ammo_Miho_Neolithic.xml	
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Miho Race/Patches/Miho Race/DamageDefs/AbilityDamage.xml b/ModPatches/Miho Race/Patches/Miho Race/DamageDefs/AbilityDamage.xml
new file mode 100644
index 0000000000..39f1828c7e
--- /dev/null
+++ b/ModPatches/Miho Race/Patches/Miho Race/DamageDefs/AbilityDamage.xml	
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="Miho_MagicBombHawk"]/armorCategory</xpath>
+		<value>
+			<armorCategory>Electric</armorCategory>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="Miho_MagicBomb"]/armorCategory</xpath>
+		<value>
+			<armorCategory>Heat</armorCategory>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/DamageDef[defName="Miho_MagicBomb"]</xpath>
+		<value>
+			<li Class="CombatExtended.DamageDefExtensionCE" Inherit="False">
+				<harmOnlyOutsideLayers>true</harmOnlyOutsideLayers>
+				<isAmbientDamage>true</isAmbientDamage>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="Miho_MagicBomb"]/armorCategory</xpath>
+		<value>
+			<armorCategory>Heat</armorCategory>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="Miho_MagicBomb"]/minDamageToFragment</xpath>
+		<value>
+			<minDamageToFragment>7</minDamageToFragment>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="Miho_MagicBombEMP"]/armorCategory</xpath>
+		<value>
+			<armorCategory>Electric</armorCategory>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/DamageDef[defName="Miho_MagicBombEMP"]</xpath>
+		<value>
+			<li Class="CombatExtended.DamageDefExtensionCE">
+				<isAmbientDamage>true</isAmbientDamage>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Abillity Damage Tweaks -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Fireball_Small_Proj"]/projectile/damageAmountBase</xpath>
+		<value>
+			<damageAmountBase>27</damageAmountBase>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Fireball_Proj"]/projectile/damageAmountBase</xpath>
+		<value>
+			<damageAmountBase>27</damageAmountBase>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Fireball_Adept_Proj"]/projectile/damageAmountBase</xpath>
+		<value>
+			<damageAmountBase>44</damageAmountBase>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Thunder_Proj"]/projectile/damageAmountBase</xpath>
+		<value>
+			<damageAmountBase>55</damageAmountBase>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_TalismanStun_Proj"]/projectile/armorPenetrationBase</xpath>
+		<value>
+			<armorPenetrationBase>20</armorPenetrationBase>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Miho Race/Patches/Miho Race/PawnKindDefs/Miho_PawnKind.xml b/ModPatches/Miho Race/Patches/Miho Race/PawnKindDefs/Miho_PawnKind.xml
new file mode 100644
index 0000000000..363075cefc
--- /dev/null
+++ b/ModPatches/Miho Race/Patches/Miho Race/PawnKindDefs/Miho_PawnKind.xml	
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Ammo-->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="Miho_Soldier_Adventurer" or
+			defName="Miho_Soldier_Hunter" or
+			defName="Miho_Soldier_Militia"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="Miho_Soldier_Marksman" or
+			defName="Miho_Soldier_PMC_Sniper"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>10</min>
+					<max>15</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="Miho_Soldier_Firepower" or
+			defName="Miho_Soldier_PMC_InfantryBasic" or
+			defName="Miho_Soldier_AssassinRanged"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Backpack-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CE_Apparel_Backpack"]/apparel/tags</xpath>
+		<value>
+			<li>MihoCommonNecessary</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[
+			defName="Miho_Soldier_Militia" or
+			defName="Miho_Soldier_Hunter" or
+			defName="Miho_Soldier_Marksman" or
+			defName="Miho_Soldier_Firepower" or
+			defName="Miho_Soldier_PMC_Infantry" or
+			defName="Miho_Soldier_PMC_Sniper" or
+			defName="Miho_Soldier_AssassinRanged"
+			]/apparelRequired </xpath>
+		<value>
+			<li>CE_Apparel_Backpack</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Miho Race/Patches/Miho Race/Scenario/Miho_Scenario.xml b/ModPatches/Miho Race/Patches/Miho Race/Scenario/Miho_Scenario.xml
new file mode 100644
index 0000000000..2691072509
--- /dev/null
+++ b/ModPatches/Miho Race/Patches/Miho Race/Scenario/Miho_Scenario.xml	
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="Miho_Start"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_12Gauge_Buck</thingDef>
+				<count>60</count>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Items/Items_Resources.xml b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Items/Items_Resources.xml
new file mode 100644
index 0000000000..36e1c0aa60
--- /dev/null
+++ b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Items/Items_Resources.xml	
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==========  Ebony Silk  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Ebony_SilkCloth"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.50</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Ebony_SilkCloth"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.08</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Ebony_SilkCloth"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.15</StuffPower_Armor_Heat>
+			<StuffPower_Armor_Electric>0.10</StuffPower_Armor_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Ebony_SilkCloth"]/stuffProps/categories</xpath>
+		<value>
+			<li>SoftArmor</li>
+		</value>
+	</Operation>
+
+	<!-- ==========  Military Ceramics  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_MilitaryGradeBalisticCeramics"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.75</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_MilitaryGradeBalisticCeramics"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>2.5</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_MilitaryGradeBalisticCeramics"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
+			<StuffPower_Armor_Electric>0.05</StuffPower_Armor_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_MilitaryGradeBalisticCeramics"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>0.8</Mass>
+			<MeleePenetrationFactor>1.1</MeleePenetrationFactor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_MilitaryGradeBalisticCeramics"]/stuffProps/categories</xpath>
+		<value>
+			<li>Metallic_Weapon</li>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<!-- ==========  Celestial Scale  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_CelestialScale"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>3</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_CelestialScale"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>6</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_CelestialScale"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.10</StuffPower_Armor_Heat>
+			<StuffPower_Armor_Electric>0.15</StuffPower_Armor_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_CelestialScale"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>0.5</Mass>
+			<MeleePenetrationFactor>1.5</MeleePenetrationFactor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_CelestialScale"]/stuffProps/categories</xpath>
+		<value>
+			<li>Metallic_Weapon</li>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<!-- ==========  Ceramics  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Ceramics"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<!-- ==========  Bulk  =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="Miho_Ceramics" or
+			defName="Miho_MilitaryGradeBalisticCeramics" or
+			defName="Miho_CelestialScale"
+			]/statBases </xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="Miho_Ebony_SilkCloth"
+			]/statBases </xpath>
+		<value>
+			<Bulk>0.04</Bulk>
+			<WornBulk>0.4</WornBulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Miho_Apparel.xml b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Miho_Apparel.xml
new file mode 100644
index 0000000000..fdf5af9ce9
--- /dev/null
+++ b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Miho_Apparel.xml	
@@ -0,0 +1,624 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--========= Stuffable =========-->
+
+	<!--Simple Wear-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_Simple"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+			<Bulk>2</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_Regular" or defName="Miho_Apparel_OnSkin_Hoodie"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.75</StuffEffectMultiplierArmor>
+			<Bulk>2</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Milita-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_Militia"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+			<Bulk>2</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_Militia"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_Militia"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Milita Vests-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Miho_Apparel_Middle_Militia" or
+			defName="Miho_Apparel_Middle_Militia_Tan" or
+			defName="Miho_Apparel_Middle_MilitiaMedic"]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
+			<Bulk>6</Bulk>
+			<WornBulk>2.7</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Miho_Apparel_Middle_Militia" or
+			defName="Miho_Apparel_Middle_Militia_Tan" or
+			defName="Miho_Apparel_Middle_MilitiaMedic"]/statBases/Mass </xpath>
+		<value>
+			<Mass>10.5</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="Miho_Apparel_Middle_Militia" or
+			defName="Miho_Apparel_Middle_Militia_Tan" or
+			defName="Miho_Apparel_Middle_MilitiaMedic"]/statBases/ArmorRating_Sharp </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Middle_Militia" or defName="Miho_Apparel_Middle_Militia_Tan"]/costList/ComponentIndustrial</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Middle_Militia" or defName="Miho_Apparel_Middle_Militia_Tan"]/equippedStatOffsets/AimingDelayFactor</xpath>
+		<value>
+			<CarryBulk>8</CarryBulk>
+			<ReloadSpeed>0.1</ReloadSpeed>
+		</value>
+	</Operation>
+
+	<!--Light Milita Vest-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Middle_MilitiaVest"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
+			<Bulk>4</Bulk>
+			<WornBulk>2.7</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Middle_MilitiaVest"]/statBases/Mass</xpath>
+		<value>
+			<Mass>2.7</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Middle_MilitiaVest"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Middle_MilitiaVest"]/equippedStatOffsets/AimingDelayFactor</xpath>
+		<value>
+			<CarryBulk>8</CarryBulk>
+			<ReloadSpeed>0.1</ReloadSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Middle_MilitiaVest"]/stuffCategories</xpath>
+		<value>
+			<stuffCategories>
+				<li>SoftArmor</li>
+			</stuffCategories>
+		</value>
+	</Operation>
+
+	<!--Exosuit-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Middle_Powered"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>9</StuffEffectMultiplierArmor>
+			<Bulk>25</Bulk>
+			<WornBulk>12</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Middle_Powered"]/statBases/Mass</xpath>
+		<value>
+			<Mass>15</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Middle_Powered"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Middle_Powered"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>20</CarryBulk>
+			<CarryWeight>35</CarryWeight>
+		</value>
+	</Operation>
+	
+	<!--Mechniator Exo-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Middle_PoweredMechanitor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>6.75</StuffEffectMultiplierArmor>
+			<Bulk>25</Bulk>
+			<WornBulk>12</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Middle_PoweredMechanitor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>15</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Middle_PoweredMechanitor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Middle_PoweredMechanitor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>20</CarryBulk>
+			<CarryWeight>35</CarryWeight>
+		</value>
+	</Operation>
+
+	<!--Worker Exo-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Middle_PoweredWorker"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.5</StuffEffectMultiplierArmor>
+			<Bulk>25</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace"><!-- Not actually required, but kept for consistency-->
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Middle_PoweredWorker"]/statBases/Mass</xpath>
+		<value>
+			<Mass>8</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Middle_PoweredWorker"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>10</CarryBulk>
+			<CarryWeight>35</CarryWeight>
+		</value>
+	</Operation>
+
+	<!--Pariah-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_Pariah"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
+			<Bulk>40</Bulk>
+			<WornBulk>18</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_Pariah"]/statBases/Mass</xpath>
+		<value>
+			<Mass>25</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_Pariah"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_Pariah"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_Pariah"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>28</CarryBulk>
+			<CarryWeight>40</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_Pariah"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<!--Pariah Helmet-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_Pariah"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>4</WornBulk>
+			<NightVisionEfficiency_Apparel>0.65</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_Pariah"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_Pariah"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_Pariah"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_Pariah"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<AimingAccuracy>1.25</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!-- Winter -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Shell_Winter"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Shell_Winter"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Padding -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Shell_Padding"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>2.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Shell_Padding"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Shell_Padding"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<!-- Ornated Coat -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Shell_Sorceress"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<WornBulk>4</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Shell_Sorceress"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Shell_Sorceress"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Tuque -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_Winter"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- Worker Helmet -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_Worker"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_Worker"]/statBases/Mass</xpath>
+		<value>
+			<Mass>1.25</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_Worker"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_Worker"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Shooter Helmet -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_ShooterCap"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_ShooterCap"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_ShooterCap"]/statBases/Mass</xpath>
+		<value>
+			<Mass>1.5</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_ShooterCap"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>0.20</ShootingAccuracyPawn>
+		</value>
+	</Operation>
+
+	<!-- Milita Helmet -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_Militia" or defName="Miho_Apparel_Hat_MilitiaShoot" or defName="Miho_Apparel_Hat_MilitiaMedic"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+			<Bulk>3</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_Militia" or defName="Miho_Apparel_Hat_MilitiaShoot" or defName="Miho_Apparel_Hat_MilitiaMedic"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_Militia" or defName="Miho_Apparel_Hat_MilitiaShoot" or defName="Miho_Apparel_Hat_MilitiaMedic"]/statBases/Mass</xpath>
+		<value>
+			<Mass>2</Mass>
+		</value>
+	</Operation>
+
+	<!-- Miho_Apparel_Hat_MilitiaEar  little better protectin than other Militia series-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_MilitiaEar"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+			<Bulk>3</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_MilitiaEar"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.55</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_MilitiaEar"]/statBases/Mass</xpath>
+		<value>
+			<Mass>2.1</Mass>
+		</value>
+	</Operation>
+
+	<!-- PMC Helmet -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_PMC"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+			<Bulk>3</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_PMC"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_PMC"]/statBases/Mass</xpath>
+		<value>
+			<Mass>2.5</Mass>
+		</value>
+	</Operation>
+
+	<!--========= Fixed Armor Value =========-->
+
+	<!--Ornated-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_OrnatedOne" or defName="Miho_Apparel_OnSkin_OrnatedTwo"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>0</WornBulk>
+			<!--<ArmorRating_Sharp>2</ArmorRating_Sharp>
+<ArmorRating_Blunt>6</ArmorRating_Blunt>-->
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_OrnatedOne" or defName="Miho_Apparel_OnSkin_OrnatedTwo"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_OrnatedOne" or defName="Miho_Apparel_OnSkin_OrnatedTwo"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<!--Eltex Mask-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Mask_Eltex"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<!--PMC-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_PMC"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>6</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_PMC"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_PMC"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_PMC"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	
+	<!--PMC Shell-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Shell_PMC"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>6</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Shell_PMC"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Shell_PMC"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Shell_PMC"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Miho_Apparel_Special.xml b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Miho_Apparel_Special.xml
new file mode 100644
index 0000000000..2ca81bba4a
--- /dev/null
+++ b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Miho_Apparel_Special.xml	
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--========= Fixed Armor Value =========-->
+
+	<!--Magnifier-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Special_Magnifier"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>2</WornBulk>
+			<NightVisionEfficiency_Apparel>0.3</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Special_Magnifier"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>-0.3</MeleeDodgeChance>
+			<AimingAccuracy>0.25</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Special_Magnifier"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Special_Magnifier"]/equippedStatOffsets/ShootingAccuracyFactor_Long</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Special_Magnifier"]/equippedStatOffsets/ShootingAccuracyFactor_Medium</xpath>
+	</Operation>
+
+	<!--TacAssist-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Special_TacticalAssist"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>2</WornBulk>
+			<NightVisionEfficiency_Apparel>0.8</NightVisionEfficiency_Apparel>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Special_TacticalAssist"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>-0.3</MeleeDodgeChance>
+			<AimingAccuracy>0.35</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Special_TacticalAssist"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<!--Glasses-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Special_Glasses"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>-0.3</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Special_Glasses"]/statBases</xpath>
+		<value>
+			<Bulk>0.5</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+	<!--Toxmask-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Special_Toxmask"]/statBases</xpath>
+		<value>
+			<Bulk>0.5</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Special_Toxmask"]</xpath>
+		<value>
+			<li Class="CombatExtended.ApparelHediffExtension">
+				<hediff>WearingGasMask</hediff>
+			</li>
+		</value>
+	</Operation>
+	<!--Visor-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Special_Visor"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>-1</ShootingAccuracyPawn>
+			<AimingAccuracy>-0.5</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Special_Visor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Special_Visor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Apparel_Special_Visor"]/statBases</xpath>
+		<value>
+			<Bulk>0.5</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Weapons_Mechanoid.xml b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Weapons_Mechanoid.xml
new file mode 100644
index 0000000000..192a57babc
--- /dev/null
+++ b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Weapons_Mechanoid.xml	
@@ -0,0 +1,296 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Rifle =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Miho_MechWeapon_Machinegun</defName>
+		<statBases>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.01</SwayFactor>
+			<Bulk>13.50</Bulk>
+			<Mass>15</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.97</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_77x58mmArisaka_FMJ</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<range>44</range>
+			<soundCast>Miho_SevenSevenRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_77x58mmArisaka</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Miho_MechWeapon_Heavygun</defName>
+		<statBases>
+			<SightsEfficiency>1.56</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.10</SwayFactor>
+			<Bulk>60.00</Bulk>
+			<RangedWeapon_Cooldown>2.51</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Miho47x285mm_AP</defaultProjectile>
+			<warmupTime>2.1</warmupTime>
+			<range>86</range>
+			<soundCast>Miho_KineticCannon</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>4</AmmoGenPerMagOverride>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_Miho47x285mm</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Miho_MechWeapon_PlasmaHowitzer</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>2.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.24</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.29</SwayFactor>
+			<Bulk>60.00</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_75x300mmMiho_Thermobaric</defaultProjectile>
+			<warmupTime>2.5</warmupTime>
+			<range>62</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>60</ticksBetweenBurstShots>
+			<soundCast>Miho_KineticCannon</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<ai_AvoidFriendlyFireRadius>3</ai_AvoidFriendlyFireRadius>
+			<minRange>5</minRange>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>3</magazineSize>
+			<reloadTime>5.6</reloadTime>
+			<ammoSet>AmmoSet_MihoPlasmaThermo</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Launcher</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Miho_MechWeapon_Rocket</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>2.5</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.4</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>40</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Miho100mm_Incendiary</defaultProjectile>
+			<warmupTime>4</warmupTime>
+			<minRange>30</minRange>
+			<range>500</range>
+			<burstShotCount>12</burstShotCount>
+			<soundCast>Miho_Rocket</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>16</muzzleFlashScale>
+			<circularError>1.2</circularError>
+			<requireLineOfSight>false</requireLineOfSight>
+			<indirectFirePenalty>0.3</indirectFirePenalty>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>14</reloadTime>
+			<ammoSet>AmmoSetMiho100mm_Incendiary</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aimedBurstShotCount>6</aimedBurstShotCount>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Launcher</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_MechWeapon_Rocket"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>30</li>
+					<li>50</li>
+					<li>70</li>
+					<li>90</li>
+				</chargeSpeeds>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Miho_MechWeapon_MachinegunTurret</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.56</SwayFactor>
+			<Bulk>6.00</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_77x58mmArisaka_FMJ</defaultProjectile>
+			<range>40</range>
+			<burstShotCount>4</burstShotCount>
+			<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+			<soundCast>Miho_SevenSevenRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<defaultCooldownTime>5.5</defaultCooldownTime>
+			<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+			<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+		</Properties>
+	</Operation>
+	<!--Miho_MechWeapon_Heavygrenade-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Miho_MechWeapon_Heavygrenade</defName>
+		<statBases>
+			<SightsEfficiency>1.56</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.10</SwayFactor>
+			<Bulk>60.00</Bulk>
+			<RangedWeapon_Cooldown>2.51</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Miho57x93mmGrenade_HE</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>62</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>30</ticksBetweenBurstShots>
+			<soundCast>Miho_GrenadeLauncher</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<!--<AmmoGenPerMagOverride>4</AmmoGenPerMagOverride>-->
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_Miho57x93mmGrenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+	<!--Miho_MechWeapon_Cluster-->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[ defName="Miho_MechWeapon_CluRocket" ]/verbs/li[@Class="TorgueMiho.Verb_Properties_ShotGun"]</xpath>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Miho_MechWeapon_CluRocket</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>2.5</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.4</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>40</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50mmRocket_HE</defaultProjectile>
+			<warmupTime>4</warmupTime>
+			<minRange>30</minRange>
+			<range>500</range>
+			<burstShotCount>20</burstShotCount>
+			<soundCast>Miho_Rocket</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>16</muzzleFlashScale>
+			<circularError>1.2</circularError>
+			<requireLineOfSight>false</requireLineOfSight>
+			<indirectFirePenalty>0.3</indirectFirePenalty>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>14</reloadTime>
+			<ammoSet>AmmoSet_50mmRocket</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>10</aimedBurstShotCount>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Launcher</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_MechWeapon_CluRocket"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>30</li>
+					<li>50</li>
+					<li>70</li>
+					<li>90</li>
+				</chargeSpeeds>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Weapons_Melee.xml b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Weapons_Melee.xml
new file mode 100644
index 0000000000..afa83516d6
--- /dev/null
+++ b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Weapons_Melee.xml	
@@ -0,0 +1,423 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==========  Power Claw =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Weapon_PowerClaw"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>0.94</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
+					<armorPenetrationSharp>8</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>0.83</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>2.28</armorPenetrationBlunt>
+					<armorPenetrationSharp>6</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Weapon_PowerClaw"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>2.00</MeleeCounterParryBonus>
+			<Bulk>6.5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Weapon_PowerClaw"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>1.50</MeleeParryChance>
+			<MeleeDodgeChance>0.30</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- ==========  Ringed Blade  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Weapon_RingedBlade"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.57</cooldownTime>
+					<chanceFactor>0.4</chanceFactor>
+					<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.12</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>1.8</armorPenetrationBlunt>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>32</power>
+					<cooldownTime>1.28</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>2.59</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.3</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Weapon_RingedBlade"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.67</MeleeCounterParryBonus>
+			<Bulk>5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Weapon_RingedBlade"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>1.20</MeleeCritChance>
+			<MeleeParryChance>0.50</MeleeParryChance>
+			<MeleeDodgeChance>0.40</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- ==========  Tachi  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Weapon_Tachi"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.57</cooldownTime>
+					<chanceFactor>0.4</chanceFactor>
+					<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.45</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>1.296</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.16</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>45</power>
+					<cooldownTime>1.22</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.8</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Weapon_Tachi"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>1.03</MeleeCounterParryBonus>
+			<Bulk>8</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Weapon_Tachi"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeCritChance>0.40</MeleeCritChance>
+			<MeleeParryChance>0.73</MeleeParryChance>
+			<MeleeDodgeChance>0.60</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- ==========  Breacher  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Weapon_Sappertool"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.78</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>1.000</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Demolish</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>2.36</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>11.76</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Weapon_Sappertool"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
+			<Bulk>8</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Weapon_Sappertool"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeCritChance>2.30</MeleeCritChance>
+			<MeleeParryChance>0.18</MeleeParryChance>
+			<MeleeDodgeChance>0.30</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- ==========  Plasma Tachi  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Weapon_PlasmaTachi"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.69</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.80</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>47</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>5</amount>
+							<chance>0.3</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>1.17</cooldownTime>
+					<chanceFactor>0.66</chanceFactor>
+					<armorPenetrationBlunt>4.06</armorPenetrationBlunt>
+					<armorPenetrationSharp>24</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>25</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>3</amount>
+							<chance>0.2</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>1.05</cooldownTime>
+					<armorPenetrationBlunt>2.048</armorPenetrationBlunt>
+					<armorPenetrationSharp>32</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Weapon_PlasmaTachi"]/statBases</xpath>
+		<value>
+			<Bulk>9</Bulk>
+			<MeleeCounterParryBonus>3.6</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Weapon_PlasmaTachi"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.74</MeleeCritChance>
+			<MeleeParryChance>0.53</MeleeParryChance>
+			<MeleeDodgeChance>0.60</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- ==========  Eltex Axe  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Weapon_EltexAxe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>47</power>
+					<cooldownTime>2.9</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>8.1</armorPenetrationBlunt>
+					<armorPenetrationSharp>16.2</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>29</power>
+					<cooldownTime>1.16</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
+					<armorPenetrationSharp>20.3</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Weapon_EltexAxe"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>1.08</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Weapon_EltexAxe"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.22</MeleeCritChance>
+			<MeleeParryChance>1.53</MeleeParryChance>
+			<MeleeDodgeChance>0.67</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- ==========  Eltex Staff A/B  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Weapon_EltexA"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.85</cooldownTime>
+					<armorPenetrationBlunt>1.69</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Weapon_EltexA"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>0.93</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Weapon_EltexA"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>1.00</MeleeCritChance>
+			<MeleeParryChance>0.70</MeleeParryChance>
+			<MeleeDodgeChance>0.47</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Weapon_EltexB"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.85</cooldownTime>
+					<armorPenetrationBlunt>1.69</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Weapon_EltexB"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>0.93</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Weapon_EltexB"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>1.00</MeleeCritChance>
+			<MeleeParryChance>0.70</MeleeParryChance>
+			<MeleeDodgeChance>0.47</MeleeDodgeChance>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Weapons_Other.xml b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Weapons_Other.xml
new file mode 100644
index 0000000000..60261d584d
--- /dev/null
+++ b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Weapons_Other.xml	
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Weapons_Ranged.xml b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Weapons_Ranged.xml
new file mode 100644
index 0000000000..c09469eb52
--- /dev/null
+++ b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Weapons_Ranged.xml	
@@ -0,0 +1,613 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Ammoset =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_8x22mmNambu"]/ammoTypes</xpath>
+		<value>
+			<Ammo_8x22mmNambu_Miho>Bullet_8x22mmNambu_Miho</Ammo_8x22mmNambu_Miho>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_65x50mmSRArisaka"]/ammoTypes</xpath>
+		<value>
+			<Ammo_65x50mmSRArisaka_Miho>Bullet_65x50mmSRArisaka_Miho</Ammo_65x50mmSRArisaka_Miho>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_77x58mmArisaka"]/ammoTypes</xpath>
+		<value>
+			<Ammo_77x58mmArisaka_Miho>Bullet_77x58mmArisaka_Miho</Ammo_77x58mmArisaka_Miho>
+		</value>
+	</Operation>
+
+	<!-- ========== Remove other verbs =========== -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="Miho_Weapon_Shotgun" or
+			defName="Miho_Weapon_ShotgunPsychic" or
+			defName="Miho_Weapon_HeavyPistolFlechette"
+			]/verbs/li[@Class="TorgueMiho.Verb_Properties_ShotGun"] </xpath>
+	</Operation>
+
+	<!-- ========== SMG =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Miho_Weapon_RifleCQB</defName>
+		<statBases>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.77</SwayFactor>
+			<Bulk>2.7</Bulk>
+			<Mass>2.5</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<WoodLog>5</WoodLog>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x22mmNambu_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<range>21</range>
+			<soundCast>Miho_Pistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>18</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_8x22mmNambu</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Rifle =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Miho_Weapon_RifleDefence</defName>
+		<statBases>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.22</SwayFactor>
+			<Bulk>8.15</Bulk>
+			<Mass>4.00</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<WoodLog>10</WoodLog>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.87</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_65x50mmSRArisaka_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<range>48</range>
+			<soundCast>Miho_DefenceRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_65x50mmSRArisaka</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== MG =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Miho_Weapon_RifleMachinegun</defName>
+		<statBases>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.38</SwayFactor>
+			<Bulk>11.70</Bulk>
+			<Mass>9.00</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>70</Steel>
+			<WoodLog>15</WoodLog>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.21</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_65x50mmSRArisaka_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<range>62</range>
+			<soundCast>Miho_DefenceRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_65x50mmSRArisaka</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>Bipod_LMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Rifle Old =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Miho_Weapon_RifleOld</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.48</SwayFactor>
+			<Bulk>10.73</Bulk>
+		</statBases>
+		<costList>
+			<Steel>55</Steel>
+			<WoodLog>10</WoodLog>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_77x58mmArisaka_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>66</range>
+			<soundCast>Miho_SevenSevenRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_77x58mmArisaka</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Rifle Grenade =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Miho_Weapon_RifleGrenade</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.48</SwayFactor>
+			<Bulk>9.73</Bulk>
+		</statBases>
+		<costList>
+			<Steel>55</Steel>
+			<WoodLog>10</WoodLog>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>46</range>
+			<soundCast>Miho_GrenadeLauncher</soundCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
+			<reloadTime>2.2</reloadTime>
+			<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Shotgun =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Miho_Weapon_Shotgun</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.89</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.45</SwayFactor>
+			<Bulk>10.50</Bulk>
+		</statBases>
+		<costList>
+			<Steel>65</Steel>
+			<WoodLog>10</WoodLog>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.77</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<burstShotCount>2</burstShotCount>
+			<ticksBetweenBurstShots>0</ticksBetweenBurstShots>
+			<range>17</range>
+			<soundCast>Miho_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>2</magazineSize>
+			<reloadTime>1.7</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Heavy 'Pistol' =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Miho_Weapon_HeavyPistol</defName>
+		<statBases>
+			<SightsEfficiency>0.80</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.75</SwayFactor>
+			<Bulk>4.7</Bulk>
+			<Mass>3</Mass>
+			<RangedWeapon_Cooldown>2.1</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.71</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_10mmMihogrenade</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>35</range>
+			<soundCast>Miho_Pistol</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<ammoSet>AmmoSet_10mmMihogrenade</ammoSet>
+			<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Miho_Weapon_HeavyPistolFlechette</defName>
+		<statBases>
+			<SightsEfficiency>0.80</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.75</SwayFactor>
+			<Bulk>4.7</Bulk>
+			<Mass>3</Mass>
+			<RangedWeapon_Cooldown>2.1</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.71</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_10mmMihogrenade</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>35</range>
+			<soundCast>Miho_Pistol</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<ammoSet>AmmoSet_10mmMihogrenadeFlechette</ammoSet>
+			<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Miho_Weapon_HeavyPistolHardkill</defName>
+		<statBases>
+			<SightsEfficiency>0.80</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.75</SwayFactor>
+			<Bulk>4.7</Bulk>
+			<Mass>3</Mass>
+			<RangedWeapon_Cooldown>2.1</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.71</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_10mmMihogrenade</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>35</range>
+			<soundCast>Miho_Pistol</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<ammoSet>AmmoSet_10mmMihogrenadeBarrier</ammoSet>
+			<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Plamsa Rifle =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Miho_Weapon_RiflePlasma</defName>
+		<statBases>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.34</SwayFactor>
+			<Bulk>8.15</Bulk>
+			<Mass>4.00</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.27</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_MihoPlasma</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<soundAiming>Miho_Charging</soundAiming>
+			<burstShotCount>4</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<range>48</range>
+			<soundCast>Miho_RiflePlasmaGun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_MihoPlasma</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Plamsa Sniper =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Miho_Weapon_SniperPlasma</defName>
+		<statBases>
+			<SightsEfficiency>2.60</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.44</SwayFactor>
+			<Bulk>11.15</Bulk>
+			<Mass>7.50</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.27</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_MihoPlasma</defaultProjectile>
+			<warmupTime>2.5</warmupTime>
+			<soundAiming>Miho_Charging</soundAiming>
+			<burstShotCount>1</burstShotCount>
+			<ammoConsumedPerShotCount>4</ammoConsumedPerShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<range>75</range>
+			<soundCast>Miho_CannonPlasma</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>16</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_MihoPlasmaSniper</ammoSet>
+		</AmmoUser>
+		<weaponTags>
+			<li>CE_AI_SR</li>
+			<li>Bipod_DMR</li>
+		</weaponTags>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Shotgun =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Miho_Weapon_ShotgunPsychic</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.40</SwayFactor>
+			<Bulk>9.80</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.70</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_MechPsyShot</defaultProjectile>
+			<warmupTime>0.8</warmupTime>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>20</ticksBetweenBurstShots>
+			<range>66</range>
+			<soundCast>Miho_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_MechPsyShot</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+	<!-- ========== Miho_Weapon_Pistol =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Miho_Weapon_Pistol</defName>
+		<statBases>
+			<SightsEfficiency>0.80</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>0.75</SwayFactor>
+			<Bulk>2.2</Bulk>
+			<Mass>0.9</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.9</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x22mmNambu_FMJ</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>21</range>
+			<soundCast>Miho_Pistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>2</reloadTime>
+			<ammoSet>AmmoSet_8x22mmNambu</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Weapon_Pistol"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Melee Attacks =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Miho_Weapon_RifleDefence" or
+			defName="Miho_Weapon_RifleMachinegun" or
+			defName="Miho_Weapon_RifleOld" or
+			defName="Miho_Weapon_RifleGrenade" or
+			defName="Miho_Weapon_Shotgun" or
+			defName="Miho_Weapon_RiflePlasma" or
+			defName="Miho_Weapon_ShotgunPsychic" or
+			defName="Miho_Weapon_SniperPlasma"
+			]/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="Miho_Weapon_HeavyPistol" or
+			defName="Miho_Weapon_HeavyPistolFlechette" or
+			defName="Miho_Weapon_HeavyPistolHardkill" or
+			defName="Miho_Weapon_RifleCQB" or
+			defName="Miho_Weapon_Pistol"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Races/AlienRace_Miho.xml b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Races/AlienRace_Miho.xml
new file mode 100644
index 0000000000..f1e97430e9
--- /dev/null
+++ b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Races/AlienRace_Miho.xml	
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Miho"]/comps</xpath>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Miho"]/comps</xpath>
+			<value>
+				<li>
+					<compClass>CombatExtended.CompPawnGizmo</compClass>
+				</li>
+				<li Class="CombatExtended.CompProperties_Suppressable"/>
+				<li Class="CombatExtended.CompProperties_ArmorDurability">
+					<Durability>500</Durability>
+					<Regenerates>true</Regenerates>
+					<RegenInterval>600</RegenInterval>
+					<RegenValue>5</RegenValue>
+					<MinArmorPct>0.75</MinArmorPct>
+				</li>
+			</value>
+		</match>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Miho"]</xpath>
+			<value>
+				<comps>
+					<li>
+						<compClass>CombatExtended.CompPawnGizmo</compClass>
+					</li>
+					<li Class="CombatExtended.CompProperties_Suppressable"/>
+					<li Class="CombatExtended.CompProperties_ArmorDurability">
+						<Durability>500</Durability>
+						<Regenerates>true</Regenerates>
+						<RegenInterval>600</RegenInterval>
+						<RegenValue>5</RegenValue>
+						<MinArmorPct>0.75</MinArmorPct>
+					</li>
+				</comps>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Miho"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Miho"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			<Suppressability>1</Suppressability>
+			<SmokeSensitivity>0.5</SmokeSensitivity>
+			<AimingAccuracy>0.75</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Miho"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="MihoPawn"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="MihoPawn"]/damageMultipliers</xpath>
+		<value>
+			<li>
+				<damageDef>PrometheumFlame</damageDef>
+				<multiplier>0.25</multiplier>
+			</li>
+			<li>
+				<damageDef>Flame_Secondary</damageDef>
+				<multiplier>0.25</multiplier>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Miho"]/alienRace/raceRestriction/whiteApparelList</xpath>
+		<value>
+			<li>CE_Apparel_TacVest</li>
+			<li>CE_Apparel_Backpack</li>
+			<li>CE_Apparel_TribalBackpack</li>
+			<li>CE_Apparel_BallisticShield</li>
+			<li>CE_Apparel_MeleeShield</li>
+			<li>CE_Apparel_GasMask</li>
+			<li>CE_Apparel_ImprovGasMask</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/GeneDef[defName="Ears_Arctic_Miho"]/statOffsets</xpath>
+		<value>
+			<CarryWeight>10</CarryWeight>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Races/Race_MihoHediff.xml b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Races/Race_MihoHediff.xml
new file mode 100644
index 0000000000..9bc3e269a0
--- /dev/null
+++ b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Races/Race_MihoHediff.xml	
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Huntress =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Miho_Huntress_I_Hediff"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>0.25</ShootingAccuracyPawn>
+			<AimingAccuracy>0.10</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Miho_Huntress_II_Hediff"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>0.75</ShootingAccuracyPawn>
+			<AimingAccuracy>0.30</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Miho_Huntress_III_Hediff"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>1.00</ShootingAccuracyPawn>
+			<AimingAccuracy>0.40</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Miho_Huntress_IV_Hediff"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
+			<AimingAccuracy>0.5</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Miho_Huntress_V_Hediff"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
+			<AimingAccuracy>0.6</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!-- ========== Fatale =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Miho_Temptress_I_Hediff"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.10</MeleeCritChance>
+			<MeleeParryChance>0.10</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Miho_Temptress_II_Hediff"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.75</MeleeDodgeChance>
+			<MeleeCritChance>0.30</MeleeCritChance>
+			<MeleeParryChance>0.30</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Miho_Temptress_III_Hediff"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>0.4</MeleeCritChance>
+			<MeleeParryChance>0.4</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Miho_Temptress_IV_Hediff"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>1.25</MeleeDodgeChance>
+			<MeleeCritChance>0.50</MeleeCritChance>
+			<MeleeParryChance>0.50</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Miho_Temptress_V_Hediff"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>1.5</MeleeDodgeChance>
+			<MeleeCritChance>0.60</MeleeCritChance>
+			<MeleeParryChance>0.60</MeleeParryChance>
+		</value>
+	</Operation>
+	
+	<!--Tinkerer Abilities-->
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Miho_Armor_HediffTwo"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Miho_Armor_HediffTwo"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Miho_Accuracy_HediffTwo"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>4.8</ShootingAccuracyPawn>
+			<AimingAccuracy>2.4</AimingAccuracy>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="Miho_BulletHell_HediffTwo"]/stages/li/statOffsets</xpath>
+		<value>
+			<ReloadSpeed>2</ReloadSpeed>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Races/Race_MihoMech.xml b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Races/Race_MihoMech.xml
new file mode 100644
index 0000000000..f027c4b762
--- /dev/null
+++ b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Races/Race_MihoMech.xml	
@@ -0,0 +1,423 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Mech_Sapsal"]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_ArmorDurability">
+					<Durability>1000</Durability>
+					<Regenerates>true</Regenerates>
+					<RegenInterval>1250</RegenInterval>
+					<RegenValue>5</RegenValue>
+					<Repairable>true</Repairable>
+					<RepairIngredients>
+						<Steel>5</Steel>
+						<Miho_MilitaryGradeBalisticCeramics>5</Miho_MilitaryGradeBalisticCeramics>
+					</RepairIngredients>
+					<RepairTime>300</RepairTime>
+					<RepairValue>200</RepairValue>
+					<CanOverHeal>true</CanOverHeal>
+					<MaxOverHeal>100</MaxOverHeal>
+					<MinArmorPct>0.50</MinArmorPct>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Mech_Sapsal"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.30</MeleeParryChance>
+			<NightVisionEfficiency>0.60</NightVisionEfficiency>
+			<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Mech_Sapsal"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Mech_Sapsal"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>40</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Mech_Sapsal"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>front left leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.9</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5.5</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>front right leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.9</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5.5</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+					<chanceFactor>0.6</chanceFactor>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Mech_DesertSphex"]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_ArmorDurability">
+					<Durability>500</Durability>
+					<Regenerates>true</Regenerates>
+					<RegenInterval>1250</RegenInterval>
+					<RegenValue>5</RegenValue>
+					<Repairable>true</Repairable>
+					<RepairIngredients>
+						<Steel>5</Steel>
+						<Miho_MilitaryGradeBalisticCeramics>5</Miho_MilitaryGradeBalisticCeramics>
+					</RepairIngredients>
+					<RepairTime>300</RepairTime>
+					<RepairValue>200</RepairValue>
+					<CanOverHeal>true</CanOverHeal>
+					<MaxOverHeal>100</MaxOverHeal>
+					<MinArmorPct>0.50</MinArmorPct>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Mech_DesertSphex"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.65</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0.30</MeleeParryChance>
+			<NightVisionEfficiency>0.60</NightVisionEfficiency>
+			<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Mech_DesertSphex"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>right blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Mech_DesertSphex"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Mech_DesertSphex"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Mech_Bulgasal" or defName="Miho_Mech_BulgasalGrenade"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>3500</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Miho_MilitaryGradeBalisticCeramics>5</Miho_MilitaryGradeBalisticCeramics>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>100</MaxOverHeal>
+				<MinArmorPct>0.50</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Mech_BulgasalSiege"]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_ArmorDurability">
+					<Durability>3500</Durability>
+					<Regenerates>true</Regenerates>
+					<RegenInterval>1250</RegenInterval>
+					<RegenValue>5</RegenValue>
+					<Repairable>true</Repairable>
+					<RepairIngredients>
+						<Steel>5</Steel>
+						<Miho_MilitaryGradeBalisticCeramics>5</Miho_MilitaryGradeBalisticCeramics>
+					</RepairIngredients>
+					<RepairTime>300</RepairTime>
+					<RepairValue>200</RepairValue>
+					<CanOverHeal>true</CanOverHeal>
+					<MaxOverHeal>100</MaxOverHeal>
+					<MinArmorPct>0.50</MinArmorPct>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Mech_Bulgasal" or defName="Miho_Mech_BulgasalSiege" or defName="Miho_Mech_BulgasalGrenade"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.30</MeleeParryChance>
+			<NightVisionEfficiency>0.60</NightVisionEfficiency>
+			<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>50</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Mech_Bulgasal" or defName="Miho_Mech_BulgasalSiege" or defName="Miho_Mech_BulgasalGrenade"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>28</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Mech_Bulgasal" or defName="Miho_Mech_BulgasalSiege" or defName="Miho_Mech_BulgasalGrenade"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>60</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Mech_Bulgasal" or defName="Miho_Mech_BulgasalSiege" or defName="Miho_Mech_BulgasalGrenade"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>front left leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.9</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5.5</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>front right leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.9</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5.5</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Mech_CataphractRocket" or defName="Miho_Mech_CataphractCluRocket"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>5000</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Miho_MilitaryGradeBalisticCeramics>5</Miho_MilitaryGradeBalisticCeramics>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>100</MaxOverHeal>
+				<MinArmorPct>0.50</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Mech_Cataphract"]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_ArmorDurability">
+					<Durability>5000</Durability>
+					<Regenerates>true</Regenerates>
+					<RegenInterval>1250</RegenInterval>
+					<RegenValue>5</RegenValue>
+					<Repairable>true</Repairable>
+					<RepairIngredients>
+						<Steel>5</Steel>
+						<Miho_MilitaryGradeBalisticCeramics>5</Miho_MilitaryGradeBalisticCeramics>
+					</RepairIngredients>
+					<RepairTime>300</RepairTime>
+					<RepairValue>200</RepairValue>
+					<CanOverHeal>true</CanOverHeal>
+					<MaxOverHeal>100</MaxOverHeal>
+					<MinArmorPct>0.50</MinArmorPct>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Mech_Cataphract" or defName="Miho_Mech_CataphractRocket" or defName="Miho_Mech_CataphractCluRocket"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.30</MeleeParryChance>
+			<NightVisionEfficiency>0.60</NightVisionEfficiency>
+			<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
+			<CarryWeight>100</CarryWeight>
+			<CarryBulk>150</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Mech_Cataphract"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>32</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Mech_Cataphract"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>72</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Mech_Cataphract"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>front left leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.9</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>front right leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.9</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>jaw</label>
+					<capacities>
+						<li>Demolish</li>
+					</capacities>
+					<power>80</power>
+					<cooldownTime>7.06</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>37.5</armorPenetrationBlunt>
+					<chanceFactor>2</chanceFactor>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Mech_CataphractRocket" or defName="Miho_Mech_CataphractCluRocket"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Mech_CataphractRocket" or defName="Miho_Mech_CataphractCluRocket"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>22.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Mech_CataphractRocket" or defName="Miho_Mech_CataphractCluRocket"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>front left leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.9</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5.5</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>front right leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.9</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5.5</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Races/Race_MihoSummon.xml b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Races/Race_MihoSummon.xml
new file mode 100644
index 0000000000..516e90cedd
--- /dev/null
+++ b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Races/Race_MihoSummon.xml	
@@ -0,0 +1,259 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Fox"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.27</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Fox"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.91</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.198</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.91</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.198</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.49</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>1.440</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Butterfly"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>2</MeleeDodgeChance>
+			<MeleeCritChance>0.75</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Butterfly"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>blades</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>0.89</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.05</armorPenetrationBlunt>
+					<armorPenetrationSharp>5.6</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Turret_Flame"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Turret_Flame"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.25</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Turret_Flame"]/statBases/ShootingAccuracyTurret</xpath>
+		<value>
+			<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Miho_TurretGun_Flame</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>0.80</SwayFactor>
+			<Bulk>10.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Miho_TurretGun_Flame_Proj</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>40</range>
+			<ticksBetweenBurstShots>16</ticksBetweenBurstShots>
+			<burstShotCount>3</burstShotCount>
+			<soundCast>GunShotA</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_TurretGun_Flame_Proj"]</xpath>
+		<value>
+			<ThingDef ParentName="BaseExplosiveBullet">
+				<defName>Miho_TurretGun_Flame_Proj</defName>
+				<label>fireball</label>
+				<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+				<graphicData>
+					<texPath>Things/Projectile/MihoFireball</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+					<shaderType>TransparentPostLight</shaderType>
+					<drawSize>2.0</drawSize>
+				</graphicData>
+				<projectile Class="CombatExtended.ProjectilePropertiesCE">
+					<damageDef>Miho_MagicBomb</damageDef>
+					<damageAmountBase>7</damageAmountBase>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>0</armorPenetrationBlunt>
+					<stoppingPower>3</stoppingPower>
+					<speed>46</speed>
+					<explosionRadius>2</explosionRadius>
+					<alwaysFreeIntercept>false</alwaysFreeIntercept>
+					<flyOverhead>false</flyOverhead>
+					<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+					<soundAmbient>MortarRound_Ambient</soundAmbient>
+				</projectile>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Miho_Thrumbo"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.09</MeleeDodgeChance>
+			<MeleeCritChance>0.76</MeleeCritChance>
+			<MeleeParryChance>0.45</MeleeParryChance>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Thrumbo"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>63</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Thrumbo"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>28</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Miho_Thrumbo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tentacles</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Stab</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>2.64</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>26.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>9.11</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>45</power>
+					<cooldownTime>2.52</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.1</chanceFactor>
+					<armorPenetrationBlunt>30</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Miho_Thrumbo"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Mincho, The Mint Choco Slime/Patches/Mincho, The Mint Choco Slime/Scenario/Mincho_Scenario.xml b/ModPatches/Mincho, The Mint Choco Slime/Patches/Mincho, The Mint Choco Slime/Scenario/Mincho_Scenario.xml
new file mode 100644
index 0000000000..95569e78f9
--- /dev/null
+++ b/ModPatches/Mincho, The Mint Choco Slime/Patches/Mincho, The Mint Choco Slime/Scenario/Mincho_Scenario.xml	
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ScenarioDef[defName="Mincho_Scenario"]/scenario/parts</xpath>
+	<value>
+		<li Class="ScenPart_StartingThing_Defined">
+			<def>StartingThing_Defined</def>
+			<thingDef>Ammo_303British_FMJ</thingDef>
+			<count>100</count>
+		</li>
+		<li Class="ScenPart_StartingThing_Defined">
+			<def>StartingThing_Defined</def>
+			<thingDef>Ammo_44Magnum_FMJ</thingDef>
+			<count>60</count>
+		</li>
+	</value>
+</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Mincho, The Mint Choco Slime/Patches/Mincho, The Mint Choco Slime/ThingDefs_Bodies/Mincho_Bodytype.xml b/ModPatches/Mincho, The Mint Choco Slime/Patches/Mincho, The Mint Choco Slime/ThingDefs_Bodies/Mincho_Bodytype.xml
new file mode 100644
index 0000000000..087130ee30
--- /dev/null
+++ b/ModPatches/Mincho, The Mint Choco Slime/Patches/Mincho, The Mint Choco Slime/ThingDefs_Bodies/Mincho_Bodytype.xml	
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Arm Groups-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Mincho_BodyDef"]//*[
+			def="Mincho_Core"
+			]/groups
+		</xpath>
+		<value>
+			<li>LeftShoulder</li>
+			<li>RightShoulder</li>
+			<li>LeftArm</li>
+			<li>RightArm</li>
+			<li>Shoulders</li>
+		</value>
+	</Operation>
+
+	<!--Natural Armor-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Mincho_BodyDef"]//*[
+			def="Mincho_Torso" or
+			def="Mincho_Head"
+			]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Mincho, The Mint Choco Slime/Patches/Mincho, The Mint Choco Slime/ThingDefs_Items/Items_Resource_Stuff.xml b/ModPatches/Mincho, The Mint Choco Slime/Patches/Mincho, The Mint Choco Slime/ThingDefs_Items/Items_Resource_Stuff.xml
new file mode 100644
index 0000000000..b8292c9606
--- /dev/null
+++ b/ModPatches/Mincho, The Mint Choco Slime/Patches/Mincho, The Mint Choco Slime/ThingDefs_Items/Items_Resource_Stuff.xml	
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+				<xpath>Defs/ThingDef[defName="Mincho_ChocoStick"]/tools</xpath>
+				<value>
+					<tools>
+						<li Class="CombatExtended.ToolCE">
+							<capacities>
+								<li>Blunt</li>
+							</capacities>
+							<power>2</power>
+							<cooldownTime>0.99</cooldownTime>
+							<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
+						</li>
+					</tools>
+				</value>
+			</Operation>
+
+			<Operation Class="PatchOperationAdd">
+				<xpath>Defs/ThingDef[defName="Mincho_ChocoStick"]</xpath>
+				<value>
+					<equippedStatOffsets>
+						<MeleeCritChance>0.2</MeleeCritChance>
+						<MeleeParryChance>1</MeleeParryChance>
+						<MeleeDodgeChance>0.13</MeleeDodgeChance>
+					</equippedStatOffsets>
+				</value>
+			</Operation>
+
+			<Operation Class="PatchOperationAdd">
+				<xpath>Defs/ThingDef[defName="Mincho_ChocoStick"]/statBases</xpath>
+				<value>
+					<Bulk>0.07</Bulk>
+					<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
+				</value>
+			</Operation>
+
+			<Operation Class="PatchOperationReplace">
+				<xpath>Defs/ThingDef[defName="Mincho_ChocoStick"]/statBases/StuffPower_Armor_Sharp</xpath>
+				<value>
+					<StuffPower_Armor_Sharp>0.1</StuffPower_Armor_Sharp>
+				</value>
+			</Operation>
+
+			<Operation Class="PatchOperationReplace">
+				<xpath>Defs/ThingDef[defName="Mincho_ChocoStick"]/statBases/StuffPower_Armor_Blunt</xpath>
+				<value>
+					<StuffPower_Armor_Blunt>0.2</StuffPower_Armor_Blunt>
+				</value>
+			</Operation>
+
+			<Operation Class="PatchOperationReplace">
+				<xpath>Defs/ThingDef[defName="Mincho_ChocoStick"]/statBases/StuffPower_Armor_Heat</xpath>
+				<value>
+					<StuffPower_Armor_Heat>0.025</StuffPower_Armor_Heat>
+				</value>
+			</Operation>
+
+			<Operation Class="PatchOperationReplace">
+				<xpath>Defs/ThingDef[defName="Mincho_ChocoStick"]/statBases/SharpDamageMultiplier</xpath>
+				<value>
+					<SharpDamageMultiplier>0.7</SharpDamageMultiplier>
+				</value>
+			</Operation>
+
+			<Operation Class="PatchOperationReplace">
+				<xpath>Defs/ThingDef[defName="Mincho_ChocoStick"]/statBases/BluntDamageMultiplier</xpath>
+				<value>
+					<BluntDamageMultiplier>0.5</BluntDamageMultiplier>
+				</value>
+			</Operation>
+
+			<Operation Class="PatchOperationAdd">
+				<xpath>Defs/ThingDef[defName="Mincho_ChocoStick"]/stuffProps/statFactors</xpath>
+				<value>
+					<Mass>0.3</Mass>
+					<MeleePenetrationFactor>0.3</MeleePenetrationFactor>
+				</value>
+			</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Mincho, The Mint Choco Slime/Patches/Mincho, The Mint Choco Slime/ThingDefs_Misc/Mincho_Apparel.xml b/ModPatches/Mincho, The Mint Choco Slime/Patches/Mincho, The Mint Choco Slime/ThingDefs_Misc/Mincho_Apparel.xml
new file mode 100644
index 0000000000..e4a09b7e74
--- /dev/null
+++ b/ModPatches/Mincho, The Mint Choco Slime/Patches/Mincho, The Mint Choco Slime/ThingDefs_Misc/Mincho_Apparel.xml	
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Regular ========== -->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[
+		defName="Mincho_ChocolateNegligee" or
+		defName="Mincho_CupHat"
+		]/statBases/ArmorRating_Sharp </xpath>
+	<value>
+		<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[
+		defName="Mincho_ChocolateNegligee" or
+		defName="Mincho_CupHat"
+		]/statBases/ArmorRating_Blunt </xpath>
+	<value>
+		<ArmorRating_Blunt>0.125</ArmorRating_Blunt>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[
+		defName="Mincho_ChocolateNegligee" or
+		defName="Mincho_MintchocoDonutTiara"
+		]/statBases/ArmorRating_Sharp </xpath>
+	<value>
+		<ArmorRating_Sharp>0.10</ArmorRating_Sharp>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[
+		defName="Mincho_ChocolateCoatingDress" or
+		defName="Mincho_MintchocoDonutTiara"
+		]/statBases/ArmorRating_Blunt </xpath>
+	<value>
+		<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Mincho_ChocoCrust"]/statBases/ArmorRating_Sharp</xpath>
+	<value>
+		<ArmorRating_Sharp>1.8</ArmorRating_Sharp>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Mincho_ChocoCrust"]/statBases/ArmorRating_Blunt</xpath>
+	<value>
+		<ArmorRating_Blunt>2.5</ArmorRating_Blunt>
+	</value>
+</Operation>
+
+<!-- ========== Armor ========== -->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Mincho_KnightlyDress"]/statBases/StuffEffectMultiplierArmor</xpath>
+	<value>
+		<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+		<Bulk>15</Bulk>
+		<WornBulk>7.5</WornBulk>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Mincho_KnightlyTiara"]/statBases/StuffEffectMultiplierArmor</xpath>
+	<value>
+		<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		<Bulk>3</Bulk>
+		<WornBulk>0.5</WornBulk>
+	</value>
+</Operation>
+
+<!-- ========== Regular ========== -->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[@Name="Mincho_BaseApparel"
+		]/statBases/StuffEffectMultiplierArmor </xpath>
+	<value>
+		<StuffEffectMultiplierArmor>4.5</StuffEffectMultiplierArmor>
+		<Bulk>5</Bulk>
+		<WornBulk>0</WornBulk>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationRemove">
+	<xpath>Defs/ThingDef[@Name="Mincho_BaseApparel"
+		]/statBases/ArmorRating_Sharp </xpath>
+</Operation>
+
+<Operation Class="PatchOperationRemove">
+	<xpath>Defs/ThingDef[@Name="Mincho_BaseApparel"
+		]/statBases/ArmorRating_Blunt </xpath>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Mincho_PinkFallInLoveHood"
+		]/statBases/StuffEffectMultiplierArmor </xpath>
+	<value>
+		<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		<Bulk>5</Bulk>
+		<WornBulk>3</WornBulk>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Mincho_BlouseHighWaistSkirt"
+		]/statBases/StuffEffectMultiplierArmor </xpath>
+	<value>
+		<StuffEffectMultiplierArmor>9</StuffEffectMultiplierArmor>
+		<Bulk>5</Bulk>
+		<WornBulk>5</WornBulk>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[@Name="Mincho_CuteHatBase"
+		]/statBases/StuffEffectMultiplierArmor </xpath>
+	<value>
+		<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		<Bulk>2</Bulk>
+		<WornBulk>0</WornBulk>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Mincho_KnightlyCloak"
+		]/statBases/ArmorRating_Sharp </xpath>
+	<value>
+		<ArmorRating_Sharp>3</ArmorRating_Sharp>
+		<ArmorRating_Electric>0.25</ArmorRating_Electric>
+		<Bulk>7.5</Bulk>
+		<WornBulk>5</WornBulk>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Mincho_KnightlyCloak"
+		]/statBases/ArmorRating_Blunt </xpath>
+	<value>
+		<ArmorRating_Blunt>0.6</ArmorRating_Blunt>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Mincho_KnightlyCloak"
+		]/statBases/ArmorRating_Heat </xpath>
+	<value>
+		<ArmorRating_Heat>0.25</ArmorRating_Heat>
+	</value>
+</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Mincho, The Mint Choco Slime/Patches/Mincho, The Mint Choco Slime/ThingDefs_Misc/Mincho_Weapon.xml b/ModPatches/Mincho, The Mint Choco Slime/Patches/Mincho, The Mint Choco Slime/ThingDefs_Misc/Mincho_Weapon.xml
new file mode 100644
index 0000000000..ef33f0b736
--- /dev/null
+++ b/ModPatches/Mincho, The Mint Choco Slime/Patches/Mincho, The Mint Choco Slime/ThingDefs_Misc/Mincho_Weapon.xml	
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Mincho_MintCandy"]/tools</xpath>
+	<value>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>head</label>
+				<labelUsedInLogging>false</labelUsedInLogging>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<power>15</power>
+				<cooldownTime>1.9</cooldownTime>
+				<chanceFactor>1.33</chanceFactor>
+				<armorPenetrationBlunt>5.625</armorPenetrationBlunt>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>handle</label>
+				<capacities>
+					<li>Poke</li>
+				</capacities>
+				<power>2</power>
+				<cooldownTime>1.59</cooldownTime>
+				<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+			</li>
+		</tools>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="Mincho_MintCandy"]/statBases</xpath>
+	<value>
+		<Bulk>3.5</Bulk>
+		<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationConditional">
+	<xpath>Defs/ThingDef[defName="Mincho_MintCandy"]/equippedStatOffsets</xpath>
+	<nomatch Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Mincho_MintCandy"]</xpath>
+		<value>
+			<equippedStatOffsets/>
+		</value>
+	</nomatch>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="Mincho_MintCandy"]/equippedStatOffsets</xpath>
+	<value>
+		<MeleeCritChance>0.42</MeleeCritChance>
+		<MeleeParryChance>0.24</MeleeParryChance>
+		<MeleeDodgeChance>0.2</MeleeDodgeChance>
+	</value>
+</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Mincho, The Mint Choco Slime/Patches/Mincho, The Mint Choco Slime/ThingDefs_Races/Race_Mincho.xml b/ModPatches/Mincho, The Mint Choco Slime/Patches/Mincho, The Mint Choco Slime/ThingDefs_Races/Race_Mincho.xml
new file mode 100644
index 0000000000..dac7b20d25
--- /dev/null
+++ b/ModPatches/Mincho, The Mint Choco Slime/Patches/Mincho, The Mint Choco Slime/ThingDefs_Races/Race_Mincho.xml	
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+	<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Mincho_ThingDef"]/comps</xpath>
+	<value>
+		<li>
+			<compClass>CombatExtended.CompPawnGizmo</compClass>
+		</li>
+		<li Class="CombatExtended.CompProperties_Suppressable"/>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Mincho_ThingDef"]</xpath>
+	<value>
+		<li Class="CombatExtended.RacePropertiesExtensionCE">
+			<bodyShape>Humanoid</bodyShape>
+		</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Mincho_ThingDef"]/statBases</xpath>
+	<value>
+		<Suppressability>0.8</Suppressability>
+		<!--Innate immunity to toxic fallout, high immunity gain rate-->
+		<SmokeSensitivity>0</SmokeSensitivity>
+	</value>
+</Operation>
+
+<!-- -->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Mincho_ThingDef"]/statBases/ArmorRating_Sharp</xpath>
+	<value>
+		<ArmorRating_Sharp>1</ArmorRating_Sharp>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Mincho_ThingDef"]/statBases/ArmorRating_Blunt</xpath>
+	<value>
+		<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Mincho_ThingDef"]/tools</xpath>
+	<value>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>slime fist</label>
+				<capacities>
+					<li>Blunt</li>
+					<li>Poke</li>
+					<li>Cut</li>
+				</capacities>
+				<power>1</power>
+				<cooldownTime>0.9</cooldownTime>
+				<linkedBodyPartsGroup>Torso</linkedBodyPartsGroup>
+				<armorPenetrationSharp>0.05</armorPenetrationSharp>
+				<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+			</li>
+		</tools>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Mincho_ThingDef"]/alienRace/raceRestriction/whiteApparelList</xpath>
+	<value>
+		<li>CE_Apparel_TacVest</li>
+		<li>CE_Apparel_Backpack</li>
+		<li>CE_Apparel_TribalBackpack</li>
+		<li>CE_Apparel_BallisticShield</li>
+		<li>CE_Apparel_MeleeShield</li>
+	</value>
+</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Mincho, The Mint Choco Slime/Patches/Mincho, The Mint Choco Slime/ThingDefs_Races/Race_Pets.xml b/ModPatches/Mincho, The Mint Choco Slime/Patches/Mincho, The Mint Choco Slime/ThingDefs_Races/Race_Pets.xml
new file mode 100644
index 0000000000..596d916de3
--- /dev/null
+++ b/ModPatches/Mincho, The Mint Choco Slime/Patches/Mincho, The Mint Choco Slime/ThingDefs_Races/Race_Pets.xml	
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/ThingDef[defName="Mincho_Minchonyang" or defName="Mincho_Minmoong"]</xpath>
+	<value>
+		<li Class="CombatExtended.RacePropertiesExtensionCE">
+			<bodyShape>Quadruped</bodyShape>
+		</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="Mincho_Minchonyang"]/statBases</xpath>
+	<value>
+		<!--Innate immunity to toxic fallout, high immunity gain rate-->
+		<SmokeSensitivity>0</SmokeSensitivity>
+		<MeleeDodgeChance>0.23</MeleeDodgeChance>
+		<MeleeCritChance>0.02</MeleeCritChance>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="Mincho_Minmoong"]/statBases</xpath>
+	<value>
+		<!--Innate immunity to toxic fallout, high immunity gain rate-->
+		<SmokeSensitivity>0</SmokeSensitivity>
+		<MeleeDodgeChance>0.19</MeleeDodgeChance>
+		<MeleeCritChance>0.06</MeleeCritChance>
+		<MeleeParryChance>0.04</MeleeParryChance>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Mincho_Minchonyang"]/tools</xpath>
+	<value>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>slime fist</label>
+				<capacities>
+					<li>Blunt</li>
+					<li>Poke</li>
+					<li>Cut</li>
+				</capacities>
+				<power>1</power>
+				<cooldownTime>0.9</cooldownTime>
+				<linkedBodyPartsGroup>Torso</linkedBodyPartsGroup>
+				<armorPenetrationSharp>0.05</armorPenetrationSharp>
+				<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+			</li>
+		</tools>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Mincho_Minmoong"]/tools</xpath>
+	<value>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>slime fist</label>
+				<capacities>
+					<li>Blunt</li>
+					<li>Poke</li>
+					<li>Cut</li>
+				</capacities>
+				<power>1.5</power>
+				<cooldownTime>0.9</cooldownTime>
+				<linkedBodyPartsGroup>Torso</linkedBodyPartsGroup>
+				<armorPenetrationSharp>0.05</armorPenetrationSharp>
+				<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+			</li>
+		</tools>
+	</value>
+</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MiningCo. MiningHelmet/Patches/MiningCo. MiningHelmet/MiningCoApparel_HelmetAndVest.xml b/ModPatches/MiningCo. MiningHelmet/Patches/MiningCo. MiningHelmet/MiningCoApparel_HelmetAndVest.xml
new file mode 100644
index 0000000000..31d6cb81bd
--- /dev/null
+++ b/ModPatches/MiningCo. MiningHelmet/Patches/MiningCo. MiningHelmet/MiningCoApparel_HelmetAndVest.xml	
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- MINING VEST - Cloth, 2mm -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MiningVest"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.02</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MiningVest"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.03</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<!-- MINING HELMET - Vanilla Apparel Expanded Hardhat's stats -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MiningHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MiningHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MiningCo. Spaceship/Defs/MiningCo. Spaceship/Defs_Airstrikes.xml b/ModPatches/MiningCo. Spaceship/Defs/MiningCo. Spaceship/Defs_Airstrikes.xml
new file mode 100644
index 0000000000..0de060f23c
--- /dev/null
+++ b/ModPatches/MiningCo. Spaceship/Defs/MiningCo. Spaceship/Defs_Airstrikes.xml	
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- DamageDefs -->
+	<DamageDef>
+		<defName>MiningCo_Cannon</defName>
+		<label>Autocannon</label>
+		<workerClass>DamageWorker_AddInjury</workerClass>
+		<externalViolence>true</externalViolence>
+		<isExplosive>true</isExplosive>
+		<deathMessage>{0} has died in an explosion.</deathMessage>
+		<hediff>Blast</hediff>
+		<hediffSolid>Crack</hediffSolid>
+		<harmAllLayersUntilOutside>true</harmAllLayersUntilOutside>
+		<impactSoundType>Blunt</impactSoundType>
+		<armorCategory>Blunt</armorCategory>
+		<minDamageToFragment>10</minDamageToFragment>
+		<defaultDamage>56</defaultDamage>
+		<defaultStoppingPower>2</defaultStoppingPower>
+		<defaultArmorPenetration>60</defaultArmorPenetration>
+		<buildingDamageFactor>4</buildingDamageFactor>
+		<plantDamageFactor>4</plantDamageFactor>
+		<explosionAffectOutsidePartsOnly>false</explosionAffectOutsidePartsOnly>
+		<explosionHeatEnergyPerCell>5</explosionHeatEnergyPerCell>
+		<explosionCellFleck>BlastDry</explosionCellFleck>
+		<explosionColorCenter>(1, 0.5, 0.3)</explosionColorCenter>
+		<explosionColorEdge>(0.6, 0.5, 0.4)</explosionColorEdge>
+		<soundExplosion>Explosion_Bomb</soundExplosion>
+		<combatLogRules>Damage_Bomb</combatLogRules>
+	</DamageDef>
+
+	<DamageDef>
+		<defName>MiningCo_Rocket</defName>
+		<label>Rocket</label>
+		<workerClass>DamageWorker_AddInjury</workerClass>
+		<externalViolence>true</externalViolence>
+		<isExplosive>true</isExplosive>
+		<deathMessage>{0} has died in an explosion.</deathMessage>
+		<hediff>Blast</hediff>
+		<hediffSolid>Crack</hediffSolid>
+		<harmAllLayersUntilOutside>true</harmAllLayersUntilOutside>
+		<impactSoundType>Blunt</impactSoundType>
+		<armorCategory>Blunt</armorCategory>
+		<minDamageToFragment>10</minDamageToFragment>
+		<defaultDamage>120</defaultDamage>
+		<defaultStoppingPower>3</defaultStoppingPower>
+		<defaultArmorPenetration>160</defaultArmorPenetration>
+		<buildingDamageFactor>4</buildingDamageFactor>
+		<plantDamageFactor>4</plantDamageFactor>
+		<explosionAffectOutsidePartsOnly>false</explosionAffectOutsidePartsOnly>
+		<explosionHeatEnergyPerCell>5</explosionHeatEnergyPerCell>
+		<explosionCellFleck>BlastDry</explosionCellFleck>
+		<explosionColorCenter>(1, 0.5, 0.3)</explosionColorCenter>
+		<explosionColorEdge>(0.6, 0.5, 0.4)</explosionColorEdge>
+		<soundExplosion>Explosion_Bomb</soundExplosion>
+		<combatLogRules>Damage_Bomb</combatLogRules>
+	</DamageDef>
+
+	<!-- Projectiles -->
+	<ThingDef ParentName="BaseBullet">
+		<defName>PrometheumBomb</defName>
+		<label>Prometheum bomb</label>
+		<thingClass>Projectile_Explosive</thingClass>
+		<graphicData>
+			<texPath>Things/Projectile/Rocket_Big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile>
+			<flyOverhead>true</flyOverhead>
+			<damageDef>PrometheumFlame</damageDef>
+			<damageAmountBase>10</damageAmountBase>
+			<explosionRadius>6</explosionRadius>
+			<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
+			<speed>20</speed>
+			<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+		</projectile>
+	</ThingDef>
+
+	<!-- Ship Weapons -->
+	<Def Class="Spaceship.WeaponDef">
+		<defName>PrometheumBombWeapon</defName>
+		<label>Prometheum bomb</label>
+		<ammoDef>PrometheumBomb</ammoDef>
+		<soundCastDef>InfernoCannon_Fire</soundCastDef>
+		<ammoQuantity>3</ammoQuantity>
+		<ticksBetweenShots>60</ticksBetweenShots>
+		<startShootingDistance>10</startShootingDistance>
+		<ammoTravelDistance>5</ammoTravelDistance>
+		<isTwinGun>true</isTwinGun>
+		<horizontalPositionOffset>3.0</horizontalPositionOffset>
+		<verticalPositionOffset>0.0</verticalPositionOffset>
+		<disableRainDurationInTicks>30000</disableRainDurationInTicks>
+	</Def>
+
+	<Def Class="Spaceship.AirStrikeDef">
+		<defName>PrometheumRaid</defName>
+		<label>prometheum bombing run</label>
+		<description>PROMETHEUM STICKS TO MECHANOIDS!</description>
+		<runsNumber>1</runsNumber>
+		<costInSilver>3500</costInSilver>
+		<ammoResupplyDays>20</ammoResupplyDays>
+		<cellsTravelledPerTick>0.08</cellsTravelledPerTick>
+		<ticksBeforeOverflightReducedSpeed>60</ticksBeforeOverflightReducedSpeed>
+		<weapons>
+			<li>PrometheumBombWeapon</li>
+		</weapons>
+	</Def>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/MiningCo. Spaceship/Patches/MiningCo. Spaceship/Airstrike_Damage.xml b/ModPatches/MiningCo. Spaceship/Patches/MiningCo. Spaceship/Airstrike_Damage.xml
new file mode 100644
index 0000000000..26ec6ad006
--- /dev/null
+++ b/ModPatches/MiningCo. Spaceship/Patches/MiningCo. Spaceship/Airstrike_Damage.xml	
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GatlingRound"]/thingClass</xpath>
+		<value>
+			<thingClass>Bullet</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AutocannonRound"]/projectile</xpath>
+		<value>
+			<projectile>
+				<flyOverhead>true</flyOverhead>
+				<damageDef>MiningCo_Cannon</damageDef>
+				<explosionRadius>1.5</explosionRadius>
+				<speed>120</speed>
+				<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RocketAirstrike"]/projectile</xpath>
+		<value>
+			<projectile>
+				<flyOverhead>true</flyOverhead>
+				<damageDef>MiningCo_Rocket</damageDef>
+				<explosionRadius>3</explosionRadius>
+				<speed>64</speed>
+				<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="IncendiaryBomb"]/projectile</xpath>
+		<value>
+			<projectile>
+				<flyOverhead>true</flyOverhead>
+				<damageDef>Flame</damageDef>
+				<damageAmountBase>20</damageAmountBase>
+				<explosionRadius>6</explosionRadius>
+				<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
+				<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
+				<speed>20</speed>
+				<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+			</projectile>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MiningCo. Spaceship/Patches/MiningCo. Spaceship/Helmet.xml b/ModPatches/MiningCo. Spaceship/Patches/MiningCo. Spaceship/Helmet.xml
new file mode 100644
index 0000000000..368848b740
--- /dev/null
+++ b/ModPatches/MiningCo. Spaceship/Patches/MiningCo. Spaceship/Helmet.xml	
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SimpleHelmetMedic"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SimpleHelmetMedic"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SimpleHelmetMedic"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SimpleHelmetMedic"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>50</Steel>
+			</costList>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MiningCo. Spaceship/Patches/MiningCo. Spaceship/Mining_Trader.xml b/ModPatches/MiningCo. Spaceship/Patches/MiningCo. Spaceship/Mining_Trader.xml
new file mode 100644
index 0000000000..11f914e375
--- /dev/null
+++ b/ModPatches/MiningCo. Spaceship/Patches/MiningCo. Spaceship/Mining_Trader.xml	
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==========  ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="SpaceshipCargoPeriodicSupply"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>FSX</thingDef>
+				<countRange>
+					<min>10</min>
+					<max>25</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>Prometheum</thingDef>
+				<countRange>
+					<min>10</min>
+					<max>25</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Ammo</tradeTag>
+				<countRange>
+					<min>500</min>
+					<max>1000</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>2</min>
+					<max>6</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_MediumAmmo</tradeTag>
+				<countRange>
+					<min>20</min>
+					<max>30</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>2</min>
+					<max>5</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_HeavyAmmo</tradeTag>
+				<countRange>
+					<min>10</min>
+					<max>15</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>2</min>
+					<max>3</max>
+				</thingDefCountRange>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="SpaceshipCargoRequestedSupply" or defName="SpaceshipCargoDispatcher"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>FSX</thingDef>
+				<countRange>
+					<min>15</min>
+					<max>45</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>Prometheum</thingDef>
+				<countRange>
+					<min>15</min>
+					<max>45</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Ammo</tradeTag>
+				<countRange>
+					<min>1000</min>
+					<max>3000</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>5</min>
+					<max>12</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_MediumAmmo</tradeTag>
+				<countRange>
+					<min>30</min>
+					<max>60</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>3</min>
+					<max>7</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_HeavyAmmo</tradeTag>
+				<countRange>
+					<min>10</min>
+					<max>30</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>3</min>
+					<max>5</max>
+				</thingDefCountRange>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/TraderKindDef[defName="SpaceshipCargoDispatcher"]/stockGenerators/li[thingDef="Gun_Minigun"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="SpaceshipCargoDispatcher"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>Gun_LMG</thingDef>
+				<countRange>
+					<min>-1</min>
+					<max>1</max>
+				</countRange>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="SpaceshipCargoDamaged"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Ammo</tradeTag>
+				<price>Cheap</price>
+				<countRange>
+					<min>100</min>
+					<max>300</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>1</min>
+					<max>3</max>
+				</thingDefCountRange>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="SpaceshipCargoMedical"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Ammo</tradeTag>
+				<countRange>
+					<min>30</min>
+					<max>60</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>-1</min>
+					<max>1</max>
+				</thingDefCountRange>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MiningCo. Spaceship/Patches/MiningCo. Spaceship/ShipTurrets.xml b/ModPatches/MiningCo. Spaceship/Patches/MiningCo. Spaceship/ShipTurrets.xml
new file mode 100644
index 0000000000..2b2a29ed50
--- /dev/null
+++ b/ModPatches/MiningCo. Spaceship/Patches/MiningCo. Spaceship/ShipTurrets.xml	
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Replace vanilla thingClass -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VulcanTurret"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<!-- Make turrets taller -->
+	<!--<li Class="PatchOperationReplace">
+        		<xpath>Defs/ThingDef[defName = "VulcanTurret"]/fillPercent</xpath>
+        		<value>
+          			<fillPercent>0.85</fillPercent>
+        		</value>
+      		</li>-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName = "VulcanTurret"]/statBases </xpath>
+		<value>
+			<AimingAccuracy>0.25</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "VulcanTurret"]/statBases</xpath>
+		<value>
+			<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VulcanTurret"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>1</turretBurstCooldownTime>
+		</value>
+	</Operation>
+	<!-- Make the Turret usable -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_VulcanTurret</defName>
+		<statBases>
+			<Mass>50.00</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>1.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.03</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>70</range>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<burstShotCount>20</burstShotCount>
+			<minRange>1.5</minRange>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>10</aimedBurstShotCount>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Misc Core/Patches/Misc Core/ThingDefs_Misc/Weapons.xml b/ModPatches/Misc Core/Patches/Misc Core/ThingDefs_Misc/Weapons.xml
new file mode 100644
index 0000000000..10cc30a8db
--- /dev/null
+++ b/ModPatches/Misc Core/Patches/Misc Core/ThingDefs_Misc/Weapons.xml	
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Misc Railgun =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_RailgunMKI</defName>
+		<statBases>
+			<SightsEfficiency>3.50</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.95</SwayFactor>
+			<Bulk>12</Bulk>
+			<Mass>6.25</Mass>
+			<RangedWeapon_Cooldown>1.20</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8mmRailgun_Sabot</defaultProjectile>
+			<warmupTime>2.1</warmupTime>
+			<range>86</range>
+			<soundCast>ChargeLance_Fire</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_8mmRailgun</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Melee Attacks =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_RailgunMKI"]/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>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Misc MAI/Patches/Misc MAI/Bodies/Bodies_AIPawn.xml b/ModPatches/Misc MAI/Patches/Misc MAI/Bodies/Bodies_AIPawn.xml
new file mode 100644
index 0000000000..9b21cf2df8
--- /dev/null
+++ b/ModPatches/Misc MAI/Patches/Misc MAI/Bodies/Bodies_AIPawn.xml	
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="AIPawn"]//*[
+			def="AIPawn_Thorax" or
+			def="MechanicalNeck" or
+			def="Head" or
+			def="HearingSensor" or
+			def="SmellSensor" or
+			def="MechanicalShoulder" or
+			def="MechanicalArm" or
+			def="MechanicalHand" or
+			def="MechanicalFinger" or
+			def="MechanicalLeg" or
+			def="MechanicalFoot"]/groups
+		</xpath>
+
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Misc MAI/Patches/Misc MAI/PawnKindDefs/AI_PawnKind.xml b/ModPatches/Misc MAI/Patches/Misc MAI/PawnKindDefs/AI_PawnKind.xml
new file mode 100644
index 0000000000..bc96405369
--- /dev/null
+++ b/ModPatches/Misc MAI/Patches/Misc MAI/PawnKindDefs/AI_PawnKind.xml	
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Ammo-->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="AIPawn" or
+			defName="AIPawnE"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Misc MAI/Patches/Misc MAI/ThingDefs_Misc/Apparel.xml b/ModPatches/Misc MAI/Patches/Misc MAI/ThingDefs_Misc/Apparel.xml
new file mode 100644
index 0000000000..29f9f84a3d
--- /dev/null
+++ b/ModPatches/Misc MAI/Patches/Misc MAI/ThingDefs_Misc/Apparel.xml	
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AIPawn_Apparel_BaseShielding"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AIPawn_Apparel_BaseShielding"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Misc MAI/Patches/Misc MAI/ThingDefs_Races/Race_AIPawn.xml b/ModPatches/Misc MAI/Patches/Misc MAI/ThingDefs_Races/Race_AIPawn.xml
new file mode 100644
index 0000000000..d6170afe3e
--- /dev/null
+++ b/ModPatches/Misc MAI/Patches/Misc MAI/ThingDefs_Races/Race_AIPawn.xml	
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="BaseAIPawn_MiscMAI"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="BaseAIPawn_MiscMAI"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AIPawn" or defName="AIPawnE"]/statBases</xpath>
+		<value>
+			<Suppressability>0</Suppressability>
+			<SmokeSensitivity>0</SmokeSensitivity>
+			<CarryBulk>50</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AIPawn"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AIPawn"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.75</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AIPawnE"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AIPawnE"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ========== Add loadout update behavior ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThinkTreeDef[defName="AIPawn"]/thinkRoot/subNodes/li[@Class="ThinkNode_ConditionalColonist"]/subNodes</xpath>
+		<value>
+			<li Class="CombatExtended.JobGiver_UpdateLoadout"/>
+			<li Class="CombatExtended.JobGiver_CheckReload"/>
+		</value>
+	</Operation>
+
+	<!-- ========== Add additional inventory behavior ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThinkTreeDef[defName="AIPawnConstant"]/thinkRoot/subNodes/li[@Class="ThinkNode_ConditionalCanDoConstantThinkTreeJobNow"]/subNodes</xpath>
+		<value>
+			<li Class="CombatExtended.JobGiver_TakeAndEquip"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MiscRobots/Patches/MiscRobots/AIRobot_RacesCE.xml b/ModPatches/MiscRobots/Patches/MiscRobots/AIRobot_RacesCE.xml
new file mode 100644
index 0000000000..93430e17d3
--- /dev/null
+++ b/ModPatches/MiscRobots/Patches/MiscRobots/AIRobot_RacesCE.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="Base_X2_AIRobot"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="Base_X2_AIRobot"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.24</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Base_X2_AIRobot"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left manipulator</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right manipulator</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>2.5</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MiscTurrets/Defs/MiscTurrets/Patch_Ammo.xml b/ModPatches/MiscTurrets/Defs/MiscTurrets/Patch_Ammo.xml
new file mode 100644
index 0000000000..a1b41547f5
--- /dev/null
+++ b/ModPatches/MiscTurrets/Defs/MiscTurrets/Patch_Ammo.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>AmmoNanobotsMicroTurret</defName>
+		<label>Nanobots (MicroTurret)</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_NanobotsMicroTurret</defName>
+		<label>Nanobots (MicroTurret)</label>
+		<ammoTypes>
+			<Ammo_NanobotsMicroTurret>Bullet_NanobotsMicroTurret</Ammo_NanobotsMicroTurret>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="NanobotsMicroTurretBase" ParentName="SpacerSmallAmmoBase" Abstract="True">
+		<description>Nanobot ammo used by highly-advanced designs.</description>
+		<statBases>
+			<Mass>0.025</Mass>
+			<Bulk>0.05</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoNanobotsMicroTurret</li>
+		</thingCategories>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="NanobotsMicroTurretBase">
+		<defName>Ammo_NanobotsMicroTurret</defName>
+		<label>Nanobots (MT) cartridge</label>
+		<graphicData>
+			<texPath>Things/Ammo/Charged/MediumRegular</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>2.5</MarketValue>
+		</statBases>
+		<ammoClass>NanobotsMT</ammoClass>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="BaseNanobotsMicroTurretBullet" ParentName="BaseBulletCE" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Charged/ChargeShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>170</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Compatibility.AmmoDef_ThingSpawner" ParentName="BaseNanobotsMicroTurretBullet">
+		<defName>Bullet_NanobotsMicroTurret</defName>
+		<label>Nanobots (MT) bullet</label>
+		<thingClass>CombatExtended.Compatibility.BulletCE_ThingSpawner</thingClass>
+		<spawnDef>MicroTurretMKI</spawnDef>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>1</damageAmountBase>
+			<armorPenetrationSharp>0.01</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.01</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_NanobotsMicroTurret</defName>
+		<label>make Nanobots (MT) cartridge x50</label>
+		<description>Craft 50 Nanobots (MT) cartridges.</description>
+		<jobString>Making Nanobots (MT) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_NanobotsMicroTurret>50</Ammo_NanobotsMicroTurret>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/MiscTurrets/Patches/MiscTurrets/ThingDefs_Guns.xml b/ModPatches/MiscTurrets/Patches/MiscTurrets/ThingDefs_Guns.xml
new file mode 100644
index 0000000000..fbe49d1b5a
--- /dev/null
+++ b/ModPatches/MiscTurrets/Patches/MiscTurrets/ThingDefs_Guns.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_MicroTurretLauncher"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11.2</power>
+					<cooldownTime>2.6</cooldownTime>
+					<armorPenetration>0.032</armorPenetration>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MicroTurretLauncher</defName>
+		<statBases>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.35</SwayFactor>
+			<Bulk>12.5</Bulk>
+			<Mass>8</Mass>
+			<RangedWeapon_Cooldown>1.35</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_NanobotsMicroTurret</defaultProjectile>
+			<warmupTime>2.5</warmupTime>
+			<range>25</range>
+			<burstShotCount>1</burstShotCount>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>2</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_NanobotsMicroTurret</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_MicroTurretLauncher"]/thingSetMakerTags</xpath>
+		<value>
+			<thingSetMakerTags>
+				<li>RewardStandardQualitySuper</li>
+			</thingSetMakerTags>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MiscTurrets/Patches/MiscTurrets/ThingDefs_Turrets.xml b/ModPatches/MiscTurrets/Patches/MiscTurrets/ThingDefs_Turrets.xml
new file mode 100644
index 0000000000..e8414d0167
--- /dev/null
+++ b/ModPatches/MiscTurrets/Patches/MiscTurrets/ThingDefs_Turrets.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Replace thingClass -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			@Name = "BuildingTurretBase_BuildAutoTurret" or
+			@Name = "BuildingTurretBase_AutoTurret" or
+			defName = "TurretWeaponBaseMannable"
+			]/thingClass </xpath>
+		<value>
+			<thingClass>CombatExtended.Compatibility.MiscTurrets_CE_TurretWeaponBase</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "TurretWeaponBaseMannable" or
+			defName = "TurretWeaponBaseAutomatic" or
+			defName = "TurretWeaponBaseAutomatic_Buildable"
+			]/fillPercent </xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "TurretWeaponBaseMannable" or
+			defName = "TurretWeaponBaseAutomatic" or
+			defName = "TurretWeaponBaseAutomaticPlasteel" or
+			defName = "TurretWeaponBaseAutomatic_Buildable"
+			]/statBases/ShootingAccuracyTurret </xpath>
+		<value>
+			<ShootingAccuracyTurret>0.75</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "TurretWeaponBaseAutomaticHighTechTargeting" or
+			defName = "TurretWeaponBaseAutomaticHighTechTargeting_Buildable"
+			]/statBases/ShootingAccuracyTurret </xpath>
+		<value>
+			<ShootingAccuracyTurret>1.0</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<!-- Micro Turret -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MicroTurretMKI"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.5</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MicroTurretMKI"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>1.1</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MicroTurretMKI"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.25</AimingAccuracy>
+			<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MicroTurretMKI</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>0.7</SwayFactor>
+			<Bulk>5.0</Bulk>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.67</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>25</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>2</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Moa/Patches/Moa/Ce_Moa.xml b/ModPatches/Moa/Patches/Moa/Ce_Moa.xml
new file mode 100644
index 0000000000..f627900abf
--- /dev/null
+++ b/ModPatches/Moa/Patches/Moa/Ce_Moa.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Moa"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moa"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.33</MeleeDodgeChance>
+			<MeleeCritChance>0.12</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moa"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>5</MoveSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moa"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.4</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>13</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.24</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.88</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>13</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.55</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Moonjelly Race/Patches/Moonjelly Race/BodyArmor_Patch.xml b/ModPatches/Moonjelly Race/Patches/Moonjelly Race/BodyArmor_Patch.xml
new file mode 100644
index 0000000000..9c6d6bec15
--- /dev/null
+++ b/ModPatches/Moonjelly Race/Patches/Moonjelly Race/BodyArmor_Patch.xml	
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Add armor coverage (for pawns with non-zero armor that use human body) ========== -->
+
+	<!-- Moonjelly -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def = "Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Mouth"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Ear"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Eye"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Brain"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def = "Musclering"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def= "Musclering"]/parts/li[def ="Tentacle"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def="Musclering"]/parts/li[def ="Tentacle"]/parts/li[def = "Tentillum"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def="Musclering"]/parts/li[def ="Tentacle"]/parts/li[def = "Nematocyst"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def = "Waist"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def = "Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/parts/li[def = "Toe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def = "Mesoglea"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def = "Pelvis"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def = "NerveNet"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def = "Stomach"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def = "MucusGland"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Moonjelly Race/Patches/Moonjelly Race/Moonjelly_Patch.xml b/ModPatches/Moonjelly Race/Patches/Moonjelly Race/Moonjelly_Patch.xml
new file mode 100644
index 0000000000..a107cd680c
--- /dev/null
+++ b/ModPatches/Moonjelly Race/Patches/Moonjelly Race/Moonjelly_Patch.xml	
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Add the Humanoid Body Shape to the Moonjelly-->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Moonjelly_Race"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Add Stats to the Moonjelly-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Moonjelly_Race"]/statBases</xpath>
+		<value>
+			<!--They aren't as good at range, have terrible meele, and are easily suppressed-->
+			<!--However, they reload quickly and are very reistant to smoke-->
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			<MeleeCritChance>0.8</MeleeCritChance>
+			<MeleeParryChance>0.7</MeleeParryChance>
+			<ReloadSpeed>1.3</ReloadSpeed>
+			<Suppressability>2.35</Suppressability>
+			<SmokeSensitivity>0.35</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!--Give the Moon Gelly A toxic sting-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Moonjelly_Race"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>poison sting</label>
+					<capacities>
+						<li>Tentacletox</li>
+					</capacities>
+					<power>0.2</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>Tentacles</linkedBodyPartsGroup>
+					<armorPenetration>0.09</armorPenetration>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<!-- had to add both tentacles hits here because they were not applying the anesthetic effect-->
+				<li Class="CombatExtended.ToolCE">
+					<label>left tentacle</label>
+					<capacities>
+						<li>Tentacletox</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.3</cooldownTime>
+					<armorPenetration>0.09</armorPenetration>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Tentacles</linkedBodyPartsGroup>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>right tentacle</label>
+					<capacities>
+						<li>Tentacletox</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.3</cooldownTime>
+					<armorPenetration>0.09</armorPenetration>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Tentacles</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Had to lower the severity of anesthethic by 10 because they were just downing living creatures in one hit-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="TentacleStrikeDmg"]/additionalHediffs/li[hediff="Anesthetic"]/severityPerDamageDealt</xpath>
+		<value>
+			<severityPerDamageDealt>0.03</severityPerDamageDealt>
+		</value>
+	</Operation>
+
+	<!--Checks if the Race has comps and if they don't then it adds them-->
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Moonjelly_Race"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Moonjelly_Race"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<!--Adds the suppresibility to the moonjellyies-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Moonjelly_Race"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Moonjelly Race/Patches/Moonjelly Race/PawnKinds_MoonJelly.xml b/ModPatches/Moonjelly Race/Patches/Moonjelly Race/PawnKinds_MoonJelly.xml
new file mode 100644
index 0000000000..a12bd02d17
--- /dev/null
+++ b/ModPatches/Moonjelly Race/Patches/Moonjelly Race/PawnKinds_MoonJelly.xml	
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="MoonjellyBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount><!-- Neolithic weapons in this pawnkind, need arrows/pila. -->
+					<min>6</min>
+					<max>20</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="MoonjellyBlackmarket" or defName="MoonjellyTrader"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="MoonjellyMilBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>8</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="MoonjellyMad"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>10</min>
+					<max>20</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/More Archotech Garbage Continued/Patches/More Archotech Garbage Continued/MAGC_Hediff.xml b/ModPatches/More Archotech Garbage Continued/Patches/More Archotech Garbage Continued/MAGC_Hediff.xml
new file mode 100644
index 0000000000..2746dab202
--- /dev/null
+++ b/ModPatches/More Archotech Garbage Continued/Patches/More Archotech Garbage Continued/MAGC_Hediff.xml	
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ProtectionBeaconBoost"]/stages/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ArmorRating_Blunt>5</ArmorRating_Blunt>
+				<ArmorRating_Sharp>7.5</ArmorRating_Sharp>
+				<ArmorRating_Heat>0.40</ArmorRating_Heat>
+				<ToxicResistance>1.0</ToxicResistance>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="CombatBeaconBoost"]/stages/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<MeleeDodgeChance>7.5</MeleeDodgeChance>
+				<MeleeHitChance>2</MeleeHitChance>
+				<AimingDelayFactor>-0.25</AimingDelayFactor>
+				<ShootingAccuracyPawn>+2.5</ShootingAccuracyPawn>
+			</statOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/More Archotech Garbage Continued/Patches/More Archotech Garbage Continued/MAGC_Resource_Stuff.xml b/ModPatches/More Archotech Garbage Continued/Patches/More Archotech Garbage Continued/MAGC_Resource_Stuff.xml
new file mode 100644
index 0000000000..ae4651d6c4
--- /dev/null
+++ b/ModPatches/More Archotech Garbage Continued/Patches/More Archotech Garbage Continued/MAGC_Resource_Stuff.xml	
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="archotechmatteraddingsomecraptoavoidproblems"]/statBases</xpath>
+		<value>
+			<Bulk>0.01</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="archotechmatteraddingsomecraptoavoidproblems"]/stuffProps/categories</xpath>
+		<value>
+			<li>Metallic_Weapon</li>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="archotechmatteraddingsomecraptoavoidproblems"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>4</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="archotechmatteraddingsomecraptoavoidproblems"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>6</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="archotechmatteraddingsomecraptoavoidproblems"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>2</MeleePenetrationFactor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="archotechmatteraddingsomecraptoavoidproblems"]/statBases/SharpDamageMultiplier</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="archotechmatteraddingsomecraptoavoidproblems"]/statBases/BluntDamageMultiplier</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="archotechmatteraddingsomecraptoavoidproblems"]/statBases/ShootingAccuracyTurret</xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/More Consumables And Mutagens/Patches/More Consumables And Mutagens/Bodies_Slime.xml b/ModPatches/More Consumables And Mutagens/Patches/More Consumables And Mutagens/Bodies_Slime.xml
new file mode 100644
index 0000000000..4b8e1fdd21
--- /dev/null
+++ b/ModPatches/More Consumables And Mutagens/Patches/More Consumables And Mutagens/Bodies_Slime.xml	
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Bleed Rates === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyPartDef[defName="SlimeBody"]</xpath>
+		<value>
+			<bleedRate>1.5</bleedRate>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyPartDef[defName="SlimeHeart"]/bleedRate</xpath>
+		<value>
+			<bleedRate>18.75</bleedRate>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/More Consumables And Mutagens/Patches/More Consumables And Mutagens/Hediffs_Mutations.xml b/ModPatches/More Consumables And Mutagens/Patches/More Consumables And Mutagens/Hediffs_Mutations.xml
new file mode 100644
index 0000000000..1dac3f5d45
--- /dev/null
+++ b/ModPatches/More Consumables And Mutagens/Patches/More Consumables And Mutagens/Hediffs_Mutations.xml	
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Igni Arm === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="IgniArm"]/stages/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
+				<ArmorRating_Blunt>0.06</ArmorRating_Blunt>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="IgniArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Ursa Claws === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="UrsaClaws"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationSharp>0.066</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/More Consumables And Mutagens/Patches/More Consumables And Mutagens/Races_Slime.xml b/ModPatches/More Consumables And Mutagens/Patches/More Consumables And Mutagens/Races_Slime.xml
new file mode 100644
index 0000000000..3c08b037d9
--- /dev/null
+++ b/ModPatches/More Consumables And Mutagens/Patches/More Consumables And Mutagens/Races_Slime.xml	
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Common === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="CMSlime" or defName="CMSlimeBlue" or defName="CMSlimeRed"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CMSlime" or defName="CMSlimeRed"]</xpath>
+		<value>
+			<damageMultipliers>
+				<li>
+					<damageDef>Bomb</damageDef>
+					<multiplier>1.2</multiplier>
+				</li>
+				<li>
+					<damageDef>Thermobaric</damageDef>
+					<multiplier>1.5</multiplier>
+				</li>
+			</damageMultipliers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CMSlimeBlue"]</xpath>
+		<value>
+			<damageMultipliers>
+				<li>
+					<damageDef>Bomb</damageDef>
+					<multiplier>2.66</multiplier>
+				</li>
+				<li>
+					<damageDef>Flame</damageDef>
+					<multiplier>3</multiplier>
+				</li>
+				<li>
+					<damageDef>Thermobaric</damageDef>
+					<multiplier>3.2</multiplier>
+				</li>
+			</damageMultipliers>
+		</value>
+	</Operation>
+
+	<!-- === Green Slime === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMSlime"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMSlime"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.55</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMSlime"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.35</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMSlime"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>6</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMSlime"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>0.66</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Blue Slime === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMSlimeBlue"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.45</MeleeDodgeChance>
+			<MeleeCritChance>0.66</MeleeCritChance>
+			<MeleeParryChance>0.5</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMSlimeBlue"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2.11</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMSlimeBlue"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.45</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMSlimeBlue"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>14</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMSlimeBlue"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2.1</cooldownTime>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>12</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Red Slime === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMSlimeRed"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.36</MeleeDodgeChance>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMSlimeRed"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.35</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMSlimeRed"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMSlimeRed"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>6</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMSlimeRed"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.66</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>8</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/More Medieval Helms and Armor/Patches/More Medieval Helms and Armor/Apparel.xml b/ModPatches/More Medieval Helms and Armor/Patches/More Medieval Helms and Armor/Apparel.xml
new file mode 100644
index 0000000000..96e082e71d
--- /dev/null
+++ b/ModPatches/More Medieval Helms and Armor/Patches/More Medieval Helms and Armor/Apparel.xml	
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Aketon =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Domi_Aketon"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Domi_Aketon"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Domi_Aketon"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Cloak =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Domi_Cloak"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Domi_Cloak"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Thick Cloak =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Domi_ThickCloak"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>1.85</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Domi_ThickCloak"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/More Medieval Helms and Armor/Patches/More Medieval Helms and Armor/Armor.xml b/ModPatches/More Medieval Helms and Armor/Patches/More Medieval Helms and Armor/Armor.xml
new file mode 100644
index 0000000000..a90a8145d5
--- /dev/null
+++ b/ModPatches/More Medieval Helms and Armor/Patches/More Medieval Helms and Armor/Armor.xml	
@@ -0,0 +1,326 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Breast Plate =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Domi_BrestPlate"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>4</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Domi_BrestPlate"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.0</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Lamellar Armor =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Domi_LamellarArmor"]/statBases</xpath>
+		<value>
+			<Bulk>25</Bulk>
+			<WornBulk>6</WornBulk>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+			<ArmorRating_Blunt>4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Domi_LamellarArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Domi_LamellarArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Domi_LamellarArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Light Plate Mail =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Domi_LightPlateMail"]/statBases</xpath>
+		<value>
+			<Bulk>40</Bulk>
+			<WornBulk>6</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Domi_LightPlateMail"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Domi_LightPlateMail"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Domi_LightPlateMail"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Domi Plate Mail =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Domi_PlateMail"]/statBases</xpath>
+		<value>
+			<Bulk>70</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Domi_PlateMail"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Domi_PlateMail"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Domi_PlateMail"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeDodgeChance>-0.1</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Domi_PlateMail"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Domi_PlateMail"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Tabard =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Domi_Tabard"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Domi_Tabard"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Heavy Plate Armor =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Domi_KnightArmor"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>12</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Domi_KnightArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Domi_KnightArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Domi_KnightArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeDodgeChance>-0.18</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Domi_KnightArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Domi_KnightArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/More Medieval Helms and Armor/Patches/More Medieval Helms and Armor/Footwear.xml b/ModPatches/More Medieval Helms and Armor/Patches/More Medieval Helms and Armor/Footwear.xml
new file mode 100644
index 0000000000..a8fb0b9c4d
--- /dev/null
+++ b/ModPatches/More Medieval Helms and Armor/Patches/More Medieval Helms and Armor/Footwear.xml	
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Work Boots =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Domi_WorkBoots"]/statBases</xpath>
+		<value>
+			<Bulk>1.5</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Domi_WorkBoots"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Light Plate Boots =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Domi_LightPlateBoots"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Domi_LightPlateBoots"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/More Medieval Helms and Armor/Patches/More Medieval Helms and Armor/Handwear.xml b/ModPatches/More Medieval Helms and Armor/Patches/More Medieval Helms and Armor/Handwear.xml
new file mode 100644
index 0000000000..120f12ca3e
--- /dev/null
+++ b/ModPatches/More Medieval Helms and Armor/Patches/More Medieval Helms and Armor/Handwear.xml	
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Work Glove =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Domi_WorkGloves"]/statBases</xpath>
+		<value>
+			<Bulk>1.5</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Domi_WorkGloves"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Light Gauntlets =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Domi_LightGauntlets"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Domi_LightGauntlets"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.25</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Mitten Gauntlets =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Domi_MittenGauntlets"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Domi_MittenGauntlets"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.75</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/More Medieval Helms and Armor/Patches/More Medieval Helms and Armor/Headgear.xml b/ModPatches/More Medieval Helms and Armor/Patches/More Medieval Helms and Armor/Headgear.xml
new file mode 100644
index 0000000000..1b9b8a327f
--- /dev/null
+++ b/ModPatches/More Medieval Helms and Armor/Patches/More Medieval Helms and Armor/Headgear.xml	
@@ -0,0 +1,456 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Improved Helmet =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Domi_ImprovedHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Domi_ImprovedHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Hood =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Domi_Hood"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Domi_Hood"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Thick Hood =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Domi_ThickHood"]/statBases</xpath>
+		<value>
+			<Bulk>1.5</Bulk>
+			<WornBulk>0.25</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Domi_ThickHood"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Spangen Helm A =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Domi_SpangenHelmA"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Domi_SpangenHelmA"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Spangen Helm B =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Domi_SpangenHelmB"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Domi_SpangenHelmB"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Domi_SpangenHelmB"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>-0.2</AimingAccuracy>
+				<MeleeHitChance>-1</MeleeHitChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Domi_SpangenHelmB"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Spangen Helm C =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Domi_SpangenHelmC"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Domi_SpangenHelmC"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Domi_SpangenHelmC"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>-0.2</AimingAccuracy>
+				<MeleeHitChance>-1</MeleeHitChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Domi_SpangenHelmC"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Morion Helmet =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Domi_MorionHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Domi_MorionHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Kettle Helmet =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Domi_KettleHat"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Domi_KettleHat"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Light Helmet =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Domi_PlateHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Domi_PlateHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.0</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Domi_PlateHelmet"]/equippedStatOffsets</xpath>
+	</Operation>
+
+	<!-- ========== Great Helm =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Domi_GreatHelm"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Domi_GreatHelm"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.65</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Domi_GreatHelm"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>-0.5</AimingAccuracy>
+				<MeleeHitChance>-2.5</MeleeHitChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Domi_GreatHelm"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Sallet Helm A =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Domi_SalletHelmA"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Domi_SalletHelmA"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Domi_SalletHelmA"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>-0.3</AimingAccuracy>
+				<MeleeHitChance>-1</MeleeHitChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Domi_SalletHelmA"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Sallet Helm B =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Domi_SalletHelmB"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Domi_SalletHelmB"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Domi_SalletHelmB"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>-0.3</AimingAccuracy>
+				<MeleeHitChance>-1</MeleeHitChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Domi_SalletHelmB"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Sallet Helm C =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Domi_SalletHelmC"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Domi_SalletHelmC"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Domi_SalletHelmC"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>-0.3</AimingAccuracy>
+				<MeleeHitChance>-1</MeleeHitChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Domi_SalletHelmC"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Armet Helm =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Domi_ArmetHelm"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Domi_ArmetHelm"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Domi_ArmetHelm"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>-2</AimingAccuracy>
+				<MeleeHitChance>-1</MeleeHitChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Domi_ArmetHelm"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/More Medieval Helms and Armor/Patches/More Medieval Helms and Armor/Leggings.xml b/ModPatches/More Medieval Helms and Armor/Patches/More Medieval Helms and Armor/Leggings.xml
new file mode 100644
index 0000000000..4bf7f0fd1f
--- /dev/null
+++ b/ModPatches/More Medieval Helms and Armor/Patches/More Medieval Helms and Armor/Leggings.xml	
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Light Leggings =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Domi_LightLeggings"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Domi_LightLeggings"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Domi_PlateLeggings =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Domi_PlateLeggings"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Domi_PlateLeggings"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/More Persona Traits/Patches/More Persona Traits/MorePersonaTraits_Patches.xml b/ModPatches/More Persona Traits/Patches/More Persona Traits/MorePersonaTraits_Patches.xml
new file mode 100644
index 0000000000..4cc56b1fe6
--- /dev/null
+++ b/ModPatches/More Persona Traits/Patches/More Persona Traits/MorePersonaTraits_Patches.xml	
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MPT_MeleeWeapon_PsyfocusStaffBladelink"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.55</cooldownTime>
+					<armorPenetrationBlunt>1.95</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MPT_MeleeWeapon_PsyfocusStaffBladelink"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>1.56</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MPT_MeleeWeapon_PsyfocusStaffBladelink"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.6</MeleeCritChance>
+			<MeleeParryChance>1.17</MeleeParryChance>
+			<MeleeDodgeChance>0.47</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/WeaponTraitDef[defName="MPT_Held_MeleeHitChanceUp"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeHitChance>1</MeleeHitChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/WeaponTraitDef[defName="MPT_Held_MeleeHitChanceDown"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeHitChance>-1</MeleeHitChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/WeaponTraitDef[defName="MPT_Held_ArmorRatingUp"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<ArmorRating_Sharp>2</ArmorRating_Sharp>
+				<ArmorRating_Blunt>2</ArmorRating_Blunt>
+				<ArmorRating_Heat>0.15</ArmorRating_Heat>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/WeaponTraitDef[defName="MPT_Held_ArmorRatingUp"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<ArmorRating_Sharp>2</ArmorRating_Sharp>
+				<ArmorRating_Blunt>2</ArmorRating_Blunt>
+				<ArmorRating_Heat>0.15</ArmorRating_Heat>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/WeaponTraitDef[defName="MPT_Held_MeleeDodgeChanceUp"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/WeaponTraitDef[defName="MPT_Held_MeleeDodgeChanceDown"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeDodgeChance>-0.5</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/More Practical Traits/Patches/More Practical Traits/TraitDefs/Traits_MPT.xml b/ModPatches/More Practical Traits/Patches/More Practical Traits/TraitDefs/Traits_MPT.xml
new file mode 100644
index 0000000000..6e9bd284b8
--- /dev/null
+++ b/ModPatches/More Practical Traits/Patches/More Practical Traits/TraitDefs/Traits_MPT.xml	
@@ -0,0 +1,569 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== V ========== -->
+
+	<!--Show Moe-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="VanyaTA01mhgg"]/degreeDatas/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="VanyaTA01mhgg"]/degreeDatas/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>18</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Coordinator-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraitDef[defName="VanyaTB01tzz"]/degreeDatas/li/statFactors</xpath>
+		<value>
+			<SmokeSensitivity>0.95</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!--Delicate-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="VanyaTC01rrwg"]/degreeDatas/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>17.4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Range Telepathy-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="VanyaTC03fwgz"]/degreeDatas/li/statFactors/ShootingAccuracyPawn</xpath>
+		<value>
+			<AimingAccuracy>1.5</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!--Gaoshi's Blessing-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraitDef[defName="VanyaTE01gsdzf"]/degreeDatas/li/statOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-0.125</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!--Bear-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraitDef[defName="VanyaTS01by"]/degreeDatas/li/statOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-0.275</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!-- ========== Sun ========== -->
+
+	<!--Cover Fire-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="PTA01hlzy"]/degreeDatas/li/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>0.2</ShootingAccuracyPawn>
+			<AimingAccuracy>0.1</AimingAccuracy>
+			<ReloadSpeed>0.1</ReloadSpeed>
+			<Suppressability>-0.1</Suppressability>
+		</value>
+	</Operation>
+
+	<!--Excellent nursing-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraitDef[defName="PTA10zyhl"]/degreeDatas/li/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.10</Suppressability>
+		</value>
+	</Operation>
+
+	<!--Brave-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraitDef[defName="PTA14yg"]/degreeDatas/li/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.50</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="PTA14yg"]/degreeDatas/li/label</xpath>
+		<value>
+			<label>&lt;color=#33ff00&gt;Valiant&lt;/color&gt;</label>
+		</value>
+	</Operation>
+
+	<!--Strong-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraitDef[defName="PTA15qz"]/degreeDatas/li/statFactors</xpath>
+		<value>
+			<CarryWeight>1.8</CarryWeight>
+		</value>
+	</Operation>
+
+	<!--Lumberjack-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraitDef[defName="PTA18fmg"]/degreeDatas/li/statOffsets</xpath>
+		<value>
+			<CarryWeight>8</CarryWeight>
+			<CarryBulk>8</CarryBulk>
+		</value>
+	</Operation>
+
+	<!--Handyman-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraitDef[defName="PTA19zg"]/degreeDatas/li/statOffsets</xpath>
+		<value>
+			<CarryWeight>6</CarryWeight>
+			<CarryBulk>6</CarryBulk>
+		</value>
+	</Operation>
+
+	<!--Hunter-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="PTA24lr"]/degreeDatas/li/statFactors/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>1.20</ShootingAccuracyPawn>
+			<AimingAccuracy>1.10</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!--Ranger-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraitDef[defName="PTB01jb"]/degreeDatas/li/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.15</Suppressability>
+		</value>
+	</Operation>
+
+	<!--Impregnable defense-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="PTB02tb"]/degreeDatas/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3.2</ArmorRating_Sharp>
+			<Suppressability>-0.25</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="PTB02tb"]/degreeDatas/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4.8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Seasoned-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraitDef[defName="PTB05ll"]/degreeDatas/li/statFactors</xpath>
+		<value>
+			<Suppressability>0.90</Suppressability>
+		</value>
+	</Operation>
+
+	<!--Cool Headed-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraitDef[defName="PTB06lc"]/degreeDatas/li/statFactors</xpath>
+		<value>
+			<AimingAccuracy>1.2</AimingAccuracy>
+			<Suppressability>0.95</Suppressability>
+		</value>
+	</Operation>
+
+	<!--Assassin-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraitDef[defName="PTB22ck"]/degreeDatas/li/statFactors</xpath>
+		<value>
+			<MeleeCritChance>1.3</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<!--Executioner-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraitDef[defName="PTB23gzs"]/degreeDatas/li/statOffsets</xpath>
+		<value>
+			<CarryWeight>10</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+		</value>
+	</Operation>
+
+	<!--Martial Arts-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraitDef[defName="PTB25wx"]/degreeDatas/li</xpath>
+		<value>
+			<statOffsets>
+				<UnarmedDamage>5</UnarmedDamage>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<!--Clone-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="PTB27qhr"]/degreeDatas/li/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>0.8</ShootingAccuracyPawn>
+			<AimingAccuracy>0.4</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="PTB27qhr"]/degreeDatas/li/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.7</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!--Drilling Expert-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraitDef[defName="PTC02wjj"]/degreeDatas/li/statOffsets</xpath>
+		<value>
+			<CarryWeight>5</CarryWeight>
+			<CarryBulk>5</CarryBulk>
+		</value>
+	</Operation>
+
+	<!--Sower of life-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraitDef[defName="PTC04smcbz"]/degreeDatas/li/statOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-0.25</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!--Professional doctor-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraitDef[defName="PTC07yl"]/degreeDatas/li/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.10</Suppressability>
+		</value>
+	</Operation>
+
+	<!--Speeding-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="PTC10cgs"]/degreeDatas/li/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>-0.4</ShootingAccuracyPawn>
+			<AimingAccuracy>-0.2</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!--Peerless immunity-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraitDef[defName="PTC11bdbq"]/degreeDatas/li/statOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-0.50</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!--Arms Dealer-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="PTC12jhsr"]/degreeDatas/li/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>0.5</ShootingAccuracyPawn>
+			<AimingAccuracy>0.25</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!--Punisher-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="PTC13cjz"]/degreeDatas/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5.6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraitDef[defName="PTC13cjz"]/degreeDatas/li/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.25</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraitDef[defName="PTC13cjz"]/degreeDatas/li/statFactors</xpath>
+		<value>
+			<MeleeCritChance>1.05</MeleeCritChance>
+			<MeleeParryChance>1.15</MeleeParryChance>
+			<AimingAccuracy>1.175</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!--New Type-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraitDef[defName="PTC17xrl"]/degreeDatas/li/statFactors</xpath>
+		<value>
+			<AimingAccuracy>1.225</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!--Yandere-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraitDef[defName="PTD01bj"]/degreeDatas/li/statFactors</xpath>
+		<value>
+			<Suppressability>0</Suppressability>
+		</value>
+	</Operation>
+
+	<!--Mukuchi-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraitDef[defName="PTD02sw"]/degreeDatas/li/statFactors</xpath>
+		<value>
+			<Suppressability>0.5</Suppressability>
+		</value>
+	</Operation>
+
+	<!--Cass's handbook-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="PTE03csdsc"]/degreeDatas/li/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>-0.4</ShootingAccuracyPawn>
+			<AimingAccuracy>-0.2</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!--Oxana's thoughts-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="PTE04aksndgw"]/degreeDatas/li/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>0.4</ShootingAccuracyPawn>
+			<AimingAccuracy>0.2</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!--Kevin's ideas-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraitDef[defName="PTE05kwdxd"]/degreeDatas/li/statOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-0.15</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!--Red moon-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="PTF01hy"]/degreeDatas/li/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>0.6</ShootingAccuracyPawn>
+			<AimingAccuracy>0.3</AimingAccuracy>
+			<Suppressability>-0.25</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="PTF01hy"]/degreeDatas/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>7.2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!--Warrior of the sun-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="PTF02tyqs"]/degreeDatas/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+			<Suppressability>-0.25</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="PTF02tyqs"]/degreeDatas/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraitDef[defName="PTF02tyqs"]/degreeDatas/li/statFactors</xpath>
+		<value>
+			<MeleeCritChance>1.5</MeleeCritChance>
+			<MeleeParryChance>1.5</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<!--Doomsday Boxer-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="PTF03mrqw"]/degreeDatas/li/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.6</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="PTF03mrqw"]/degreeDatas/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>7.2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraitDef[defName="PTF03mrqw"]/degreeDatas/li/statOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.03</MeleeCritChance>
+			<MeleeParryChance>0.0375</MeleeParryChance>
+			<UnarmedDamage>20</UnarmedDamage>
+			<Suppressability>-0.25</Suppressability>
+			<SmokeSensitivity>-0.3</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!--Swordmaster of Squin-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="PTF04skjs"]/degreeDatas/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8.4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraitDef[defName="PTF04skjs"]/degreeDatas/li/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.25</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraitDef[defName="PTF04skjs"]/degreeDatas/li/statFactors</xpath>
+		<value>
+			<MeleeCritChance>1.05</MeleeCritChance>
+			<MeleeParryChance>1.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<!--Diligent fighter-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="PTS01yz"]/degreeDatas/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="PTS01yz"]/degreeDatas/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>8.8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="PTS01yz"]/degreeDatas/li/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.8</MeleeDodgeChance>
+			<MeleeCritChance>0.04</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+			<Suppressability>-0.75</Suppressability>
+		</value>
+	</Operation>
+
+	<!--Ranged reaper-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="PTS02ss"]/degreeDatas/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8.8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="PTS02ss"]/degreeDatas/li/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>0.8</ShootingAccuracyPawn>
+			<AimingAccuracy>0.4</AimingAccuracy>
+			<ReloadSpeed>0.2</ReloadSpeed>
+			<Suppressability>-0.50</Suppressability>
+		</value>
+	</Operation>
+
+	<!--Child of nature-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="PTS04zrzz"]/degreeDatas/li/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>-0.7</ShootingAccuracyPawn>
+			<AimingAccuracy>-0.35</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraitDef[defName="PTS04zrzz"]/degreeDatas/li/statFactors</xpath>
+		<value>
+			<AimingAccuracy>1.35</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!--Whirlwind-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="PTS05jf"]/degreeDatas/li/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>-1.2</ShootingAccuracyPawn>
+			<AimingAccuracy>-0.6</AimingAccuracy>
+			<SmokeSensitivity>-0.2</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!--The prophet-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="PTS06fkzs"]/degreeDatas/li/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>1.3</MeleeDodgeChance>
+			<MeleeParryChance>0.65</MeleeParryChance>
+			<Suppressability>-0.50</Suppressability>
+			<SmokeSensitivity>-0.325</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!--The Master-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraitDef[defName="PTS07ds"]/degreeDatas/li/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.75</Suppressability>
+			<SmokeSensitivity>-0.25</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraitDef[defName="PTS07ds"]/degreeDatas/li/statFactors</xpath>
+		<value>
+			<MeleeParryChance>1.5</MeleeParryChance>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/More Psycasts/Patches/More Psycasts/AbilitiesPatch.xml b/ModPatches/More Psycasts/Patches/More Psycasts/AbilitiesPatch.xml
new file mode 100644
index 0000000000..3af900543d
--- /dev/null
+++ b/ModPatches/More Psycasts/Patches/More Psycasts/AbilitiesPatch.xml	
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AbilityDef[defName="MorePsycasts_HaulSkip"]/verbProperties/range</xpath>
+		<value>
+			<range>6</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AbilityDef[defName="MorePsycasts_Ignite"]/verbProperties/range</xpath>
+		<value>
+			<range>12</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AbilityDef[defName="MorePsycasts_Mending"]/verbProperties/range</xpath>
+		<value>
+			<range>17</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AbilityDef[defName="MorePsycasts_FertilitySkip"]/verbProperties/range</xpath>
+		<value>
+			<range>17</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AbilityDef[
+			defName="MorePsycasts_ArcticPinhole" or
+			defName="MorePsycasts_CleanSkip"]/verbProperties/range </xpath>
+		<value>
+			<range>28</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AbilityDef[defName="MorePsycasts_FlashHeal"]/verbProperties/range</xpath>
+		<value>
+			<range>32</range>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/More Utility Packs/Patches/More Utility Packs/Apparel_Mechanoids.xml b/ModPatches/More Utility Packs/Patches/More Utility Packs/Apparel_Mechanoids.xml
new file mode 100644
index 0000000000..cca8f0cab1
--- /dev/null
+++ b/ModPatches/More Utility Packs/Patches/More Utility Packs/Apparel_Mechanoids.xml	
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Factions Expanded - Mechanoids</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!-- Quality Comp -->
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[
+						defName="SGC_Apparel_CombatMechPack" or
+						defName="SGC_Apparel_INDMechPack"
+						]/comps/li/compClass[.="CompQuality"] </xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="SGC_Apparel_CombatMechPack" or defName="SGC_Apparel_INDMechPack"]/comps</xpath>
+						<value>
+							<li>
+								<compClass>CompQuality</compClass>
+							</li>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[
+						defName="SGC_Apparel_CombatMechPack" or
+						defName="SGC_Apparel_INDMechPack"
+						]/apparel/layers </xpath>
+					<value>
+						<li>Backpack</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName = "SGC_Apparel_CombatMechPack"]/statBases/EnergyShieldRechargeRate</xpath>
+					<value>
+						<EnergyShieldRechargeRate>0.225</EnergyShieldRechargeRate>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName = "SGC_Apparel_CombatMechPack"]/statBases/EnergyShieldEnergyMax</xpath>
+					<value>
+						<EnergyShieldEnergyMax>1.95</EnergyShieldEnergyMax>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName = "SGC_Apparel_INDMechPack"]/statBases</xpath>
+					<value>
+						<Bulk>9</Bulk>
+						<WornBulk>6</WornBulk>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/More Utility Packs/Patches/More Utility Packs/Apparel_Packs.xml b/ModPatches/More Utility Packs/Patches/More Utility Packs/Apparel_Packs.xml
new file mode 100644
index 0000000000..e5048cbdb5
--- /dev/null
+++ b/ModPatches/More Utility Packs/Patches/More Utility Packs/Apparel_Packs.xml	
@@ -0,0 +1,274 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Quality Comp -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[
+			defName="SGC_Apparel_RoboticRig" or
+			defName="SGC_Apparel_TraumaKit" or
+			defName="SGC_Apparel_FieldMortar"
+			]/comps/li/compClass[.="CompQuality"] </xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="SGC_Apparel_RoboticRig" or defName="SGC_Apparel_TraumaKit" or defName="SGC_Apparel_FieldMortar"]/comps</xpath>
+			<value>
+				<li>
+					<compClass>CompQuality</compClass>
+				</li>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="SGC_Apparel_RescueFrame"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="SGC_Apparel_RescueFrame"]</xpath>
+			<value>
+				<comps>
+					<li>
+						<compClass>CompQuality</compClass>
+					</li>
+				</comps>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="SGC_Apparel_RescueFrame"]/comps</xpath>
+			<value>
+				<li>
+					<compClass>CompQuality</compClass>
+				</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VAE_Accessories.CaravanCapacityApparelDef[defName="SGC_Apparel_Forklift"]/comps/li/compClass[.="CompQuality"]</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VAE_Accessories.CaravanCapacityApparelDef[defName="SGC_Apparel_Forklift"]/comps</xpath>
+			<value>
+				<li>
+					<compClass>CompQuality</compClass>
+				</li>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VAE_Accessories.CaravanCapacityApparelDef[defName="SGC_Apparel_SurvivalPack"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VAE_Accessories.CaravanCapacityApparelDef[defName="SGC_Apparel_SurvivalPack"]</xpath>
+			<value>
+				<comps>
+					<li>
+						<compClass>CompQuality</compClass>
+					</li>
+				</comps>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/VAE_Accessories.CaravanCapacityApparelDef[defName="SGC_Apparel_SurvivalPack"]/comps</xpath>
+			<value>
+				<li>
+					<compClass>CompQuality</compClass>
+				</li>
+			</value>
+		</match>
+	</Operation>
+
+	<!-- Change Layer -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="SGC_Apparel_RoboticRig" or
+			defName="SGC_Apparel_TraumaKit" or
+			defName="SGC_Apparel_SurvivalPack" or
+			defName="SGC_Apparel_RescueFrame" or
+			defName="SGC_Apparel_FieldMortar"
+			]/apparel/layers </xpath>
+		<value>
+			<li>Backpack</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VAE_Accessories.CaravanCapacityApparelDef[
+			defName="SGC_Apparel_Forklift" or
+			defName="SGC_Apparel_SurvivalPack"
+			]/apparel/layers </xpath>
+		<value>
+			<li>Backpack</li>
+		</value>
+	</Operation>
+
+	<!-- Robot Rig -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "SGC_Apparel_RoboticRig"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>7</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "SGC_Apparel_RoboticRig"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>15</CarryBulk>
+			<CarryWeight>25</CarryWeight>
+		</value>
+	</Operation>
+
+	<!-- Medical Bag -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "SGC_Apparel_TraumaKit"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "SGC_Apparel_TraumaKit"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>20</CarryBulk>
+		</value>
+	</Operation>
+
+	<!-- Survival Pack -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VAE_Accessories.CaravanCapacityApparelDef[defName = "SGC_Apparel_SurvivalPack"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VAE_Accessories.CaravanCapacityApparelDef[defName = "SGC_Apparel_SurvivalPack"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>25</CarryBulk>
+		</value>
+	</Operation>
+
+	<!-- Rescue Frame -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "SGC_Apparel_RescueFrame"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<WornBulk>8</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "SGC_Apparel_RescueFrame"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>10</CarryBulk>
+			<CarryWeight>20</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "SGC_Apparel_RescueFrame"]/statBases/EnergyShieldRechargeRate</xpath>
+		<value>
+			<EnergyShieldRechargeRate>0.75</EnergyShieldRechargeRate>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "SGC_Apparel_RescueFrame"]/statBases/EnergyShieldEnergyMax</xpath>
+		<value>
+			<EnergyShieldEnergyMax>9.0</EnergyShieldEnergyMax>
+		</value>
+	</Operation>
+
+	<!-- Forklift Rig -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VAE_Accessories.CaravanCapacityApparelDef[defName = "SGC_Apparel_Forklift"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>7</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VAE_Accessories.CaravanCapacityApparelDef[defName = "SGC_Apparel_Forklift"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>15</CarryBulk>
+			<CarryWeight>100</CarryWeight>
+		</value>
+	</Operation>
+
+	<!-- Mortar Pack -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="SGC_Apparel_FieldMortar"]/equippedStatOffsets</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SGC_Apparel_FieldMortar"]/comps/li[@Class="CompProperties_Reloadable"]/ammoDef</xpath>
+		<value>
+			<ammoDef>Shell_60mmMortar_HE</ammoDef>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SGC_Apparel_FieldMortar"]/comps/li[@Class="CompProperties_Reloadable"]/maxCharges</xpath>
+		<value>
+			<maxCharges>3</maxCharges>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SGC_Apparel_FieldMortar"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountPerCharge</xpath>
+		<value>
+			<ammoCountPerCharge>1</ammoCountPerCharge>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SGC_Apparel_FieldMortar"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>30</li>
+					<li>50</li>
+					<li>70</li>
+					<li>90</li>
+				</chargeSpeeds>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SGC_Apparel_FieldMortar"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<label>launch 60mm shell</label>
+					<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<onlyManualCast>True</onlyManualCast>
+					<warmupTime>2</warmupTime>
+					<range>40</range>
+					<minRange>5</minRange>
+					<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+					<soundCast>Mortar_LaunchA</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>14</muzzleFlashScale>
+					<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+					<defaultProjectile>Bullet_60mmMortarShell_HE</defaultProjectile>
+					<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/More Utility Packs/Patches/More Utility Packs/Apparel_Royalty.xml b/ModPatches/More Utility Packs/Patches/More Utility Packs/Apparel_Royalty.xml
new file mode 100644
index 0000000000..2c05e77e94
--- /dev/null
+++ b/ModPatches/More Utility Packs/Patches/More Utility Packs/Apparel_Royalty.xml	
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Royalty</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!-- Quality Comp -->
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[
+						defName="SGC_Apparel_Jetpack" or
+						defName="SGC_Apparel_CommandTower"
+						]/comps/li/compClass[.="CompQuality"] </xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="SGC_Apparel_Jetpack" or defName="SGC_Apparel_CommandTower"]/comps</xpath>
+						<value>
+							<li>
+								<compClass>CompQuality</compClass>
+							</li>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[
+						defName="SGC_Apparel_Jetpack" or
+						defName="SGC_Apparel_CommandTower"
+						]/apparel/layers </xpath>
+					<value>
+						<li>Backpack</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="SGC_Apparel_Jetpack"]/statBases/EnergyShieldRechargeRate</xpath>
+					<value>
+						<EnergyShieldRechargeRate>0.375</EnergyShieldRechargeRate>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="SGC_Apparel_Jetpack"]/statBases/EnergyShieldEnergyMax</xpath>
+					<value>
+						<EnergyShieldEnergyMax>3.75</EnergyShieldEnergyMax>
+					</value>
+				</li>
+
+				<li Class="PatchOperationFindMod">
+					<mods>
+						<li>Vanilla Factions Expanded - Mechanoids</li>
+					</mods>
+					<match Class="PatchOperationSequence">
+						<operations>
+
+							<li Class="PatchOperationAdd">
+								<xpath>Defs/ThingDef[defName="SGC_Apparel_MechJet"]/apparel/layers</xpath>
+								<value>
+									<li>Backpack</li>
+								</value>
+							</li>
+
+							<!-- Quality Comp -->
+
+							<li Class="PatchOperationConditional">
+								<xpath>Defs/ThingDef[defName="SGC_Apparel_MechJet"]/comps/li/compClass[.="CompQuality"]</xpath>
+								<nomatch Class="PatchOperationAdd">
+									<xpath>Defs/ThingDef[defName="SGC_Apparel_MechJet"]/comps</xpath>
+									<value>
+										<li>
+											<compClass>CompQuality</compClass>
+										</li>
+									</value>
+								</nomatch>
+							</li>
+
+							<li Class="PatchOperationReplace">
+								<xpath>Defs/ThingDef[defName = "SGC_Apparel_MechJet"]/statBases/EnergyShieldRechargeRate</xpath>
+								<value>
+									<EnergyShieldRechargeRate>0.45</EnergyShieldRechargeRate>
+								</value>
+							</li>
+
+							<li Class="PatchOperationReplace">
+								<xpath>Defs/ThingDef[defName = "SGC_Apparel_MechJet"]/statBases/EnergyShieldEnergyMax</xpath>
+								<value>
+									<EnergyShieldEnergyMax>4.5</EnergyShieldEnergyMax>
+								</value>
+							</li>
+
+						</operations>
+					</match>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/More Vanilla Turrets/Defs/More Vanilla Turrets/MVT_CE_Patch_Ammo_Shells.xml b/ModPatches/More Vanilla Turrets/Defs/More Vanilla Turrets/MVT_CE_Patch_Ammo_Shells.xml
new file mode 100644
index 0000000000..56aaf33338
--- /dev/null
+++ b/ModPatches/More Vanilla Turrets/Defs/More Vanilla Turrets/MVT_CE_Patch_Ammo_Shells.xml	
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- ========== Define 81mm plasma mortar shell and unique ammoset for Devastator Mortar ========== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_81mmMortarShell_Plasma</defName>
+		<label>81mm mortar shells</label>
+		<ammoTypes>
+			<Shell_Plasma>Bullet_81mmMortarShell_Plasma</Shell_Plasma>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBaseCraftableBase">
+		<defName>Shell_Plasma</defName>
+		<label>81mm mortar shell (Plasma)</label>
+		<graphicData>
+			<texPath>ThirdParty/More Vanilla Turrets/PlasmaMortarShell</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>237</MarketValue>
+			<Mass>6.5</Mass>
+			<Bulk>8.17</Bulk>
+		</statBases>
+		<ammoClass>Plasma</ammoClass>
+		<detonateProjectile>Bullet_81mmMortarShell_Plasma</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base81mmMortarShell">
+		<defName>Bullet_81mmMortarShell_Plasma</defName>
+		<label>81mm mortar shell (Plasma)</label>
+		<graphicData>
+			<texPath>ThirdParty/More Vanilla Turrets/PlasmaMortarProj</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>524</damageAmountBase>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+			<explosionRadius>5</explosionRadius>
+			<flyOverhead>true</flyOverhead>
+			<explosionChanceToStartFire>0.75</explosionChanceToStartFire>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<explosionEffect>GiantExplosion</explosionEffect>
+			<soundExplode>Explosion_GiantBomb</soundExplode>
+		</projectile>
+	</ThingDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeShell_Plasma</defName>
+		<label>make 81mm Plasma mortar shells x5</label>
+		<description>Craft 5 81mm Plasma mortar shells.</description>
+		<jobString>Making 81mm Plasma mortar shells.</jobString>
+		<workAmount>49200</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>120</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Plasteel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Shell_Plasma>5</Shell_Plasma>
+		</products>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/More Vanilla Turrets/Patches/More Vanilla Turrets/MVT_CE_Patch_Buildings_Security.xml b/ModPatches/More Vanilla Turrets/Patches/More Vanilla Turrets/MVT_CE_Patch_Buildings_Security.xml
new file mode 100644
index 0000000000..c640a5d044
--- /dev/null
+++ b/ModPatches/More Vanilla Turrets/Patches/More Vanilla Turrets/MVT_CE_Patch_Buildings_Security.xml	
@@ -0,0 +1,720 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Gun Complex ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_GunComplex</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.59</SwayFactor>
+			<Bulk>18.54</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.83</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>86</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<muzzleFlashScale>18</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_303British</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GunComplex"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>86</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<!-- ========== Rocket Complex ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_RocketComplex</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.23</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>2.16</SwayFactor>
+			<Bulk>14.71</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_83mmSMAW_HEAT</defaultProjectile>
+			<warmupTime>2.09</warmupTime>
+			<range>58</range>
+			<minRange>3</minRange>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>30</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>8.6</reloadTime>
+			<ammoSet>AmmoSet_83mmSMAW</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RocketComplex"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>48</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<!-- ========== Military Grade Turret ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_TurretMilitary</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>2.13</SwayFactor>
+			<Bulk>37.08</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.84</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>54</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>20</burstShotCount>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>15.6</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MilitaryTurretGun"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>86</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<!-- ========== Manned Military Grade Turret ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_TurretMilitaryManned</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>2.13</SwayFactor>
+			<Bulk>37.08</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.84</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>54</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>20</burstShotCount>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>15.6</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>10</aimedBurstShotCount>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MilitaryTurretGunManned"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>86</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<!-- ========== Shredder Turret ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_TurretShredder</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>2.02</SwayFactor>
+			<Bulk>10.66</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.34</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<burstShotCount>5</burstShotCount>
+			<soundCast>Shot_Shotgun_NoRack</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>18</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<requireLineOfSight>false</requireLineOfSight>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ShredderTurretGun"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>20</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<!-- ========== Manned Shredder Turret ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_TurretShredderManned</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>2.02</SwayFactor>
+			<Bulk>10.66</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.34</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<burstShotCount>5</burstShotCount>
+			<soundCast>Shot_Shotgun_NoRack</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>18</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<requireLineOfSight>false</requireLineOfSight>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ShredderTurretGunManned"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>20</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<!-- ========== Precision Turret ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_TurretPrecision</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.2</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.32</SwayFactor>
+			<Bulk>28.72</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.38</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_145x114mm_FMJ</defaultProjectile>
+			<warmupTime>1.4</warmupTime>
+			<range>89</range>
+			<soundCast>Shot_SniperRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<muzzleFlashScale>45</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_145x114mm</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PrecisionTurretGun"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>89</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<!-- ========== Manned Precision Turret ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_TurretPrecisionManned</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.32</SwayFactor>
+			<Bulk>28.72</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.38</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_145x114mm_FMJ</defaultProjectile>
+			<warmupTime>1.4</warmupTime>
+			<range>89</range>
+			<soundCast>Shot_SniperRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<muzzleFlashScale>45</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_145x114mm</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PrecisionTurretGunManned"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>89</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<!-- ========== Blast Turret ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_BlastCharge</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>0.99</SwayFactor>
+			<Bulk>12.9</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.21</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_40x53mmGrenade_HE</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>40</range>
+			<minRange>5</minRange>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>3</burstShotCount>
+			<soundCast>Mortar_LaunchA</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>20</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>48</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_40x53mmGrenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BlastTurretGun"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>40</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<!-- ========== Manned Blast Turret ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_BlastChargeManned</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>0.99</SwayFactor>
+			<Bulk>12.9</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.21</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_40x53mmGrenade_HE</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>40</range>
+			<minRange>5</minRange>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>4</burstShotCount>
+			<soundCast>Mortar_LaunchA</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>20</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>48</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_40x53mmGrenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BlastTurretGunManned"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>40</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<!-- ========== Vulcan Cannon ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_VulcanCannon</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.20</SwayFactor>
+			<Bulk>20.27</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.80</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_20x102mmNATO_Sabot</defaultProjectile>
+			<warmupTime>4.1</warmupTime>
+			<range>62</range>
+			<minRange>6</minRange>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<burstShotCount>40</burstShotCount>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>6</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>375</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_20x102mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>20</aimedBurstShotCount>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VulcanCannon"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>62</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<!-- ========== Manned Vulcan Cannon ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_VulcanCannonManned</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.20</SwayFactor>
+			<Bulk>20.27</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.80</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_20x102mmNATO_Sabot</defaultProjectile>
+			<warmupTime>4.1</warmupTime>
+			<range>62</range>
+			<minRange>4</minRange>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<burstShotCount>40</burstShotCount>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>6</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>375</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_20x102mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>20</aimedBurstShotCount>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VulcanCannonManned"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>62</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="VulcanCannon" or
+			defName="VulcanCannonManned"
+			]/passability </xpath>
+		<value>
+			<!-- Turrets must be passable to allow reloading -->
+			<passability>PassThroughOnly</passability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="VulcanCannon" or
+			defName="VulcanCannonManned"
+			] </xpath>
+		<value>
+			<!-- Workaround to replace passability=Impassable -->
+			<pathCost>200</pathCost>
+		</value>
+	</Operation>
+
+	<!-- ========== Devastator Mortar ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Artillery_DevastatorBomb</defName>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+			<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_81mmMortarShell_Plasma</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<minRange>20</minRange>
+			<range>500</range>
+			<burstShotCount>5</burstShotCount>
+			<soundCast>ChargeLance_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>55</muzzleFlashScale>
+			<circularError>1.2</circularError>
+			<requireLineOfSight>false</requireLineOfSight>
+			<indirectFirePenalty>0.3</indirectFirePenalty>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_81mmMortarShell_Plasma</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Artillery_DevastatorBomb"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>30</li>
+					<li>50</li>
+					<li>70</li>
+					<li>90</li>
+				</chargeSpeeds>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_DevastatorMortarBomb"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>15</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_81mmMortarShell_Plasma"]/graphicData/texPath</xpath>
+		<value>
+			<texPath>Things/Building/Security/DevastatorShell</texPath>
+		</value>
+	</Operation>
+
+	<!--<li Class="PatchOperationAdd">
+	<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_81mmMortarShell"]/ammoTypes</xpath>
+	<value>
+		<Shell_Plasma>Bullet_81mmMortarShell_Plasma</Shell_Plasma>
+	</value>
+</li>-->
+
+	<!-- ========== Common to many or all Turrets ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="GunComplex" or
+			defName="RocketComplex" or
+			defName="MilitaryTurretGun" or
+			defName="MilitaryTurretGunManned" or
+			defName="ShredderTurretGun" or
+			defName="ShredderTurretGunManned" or
+			defName="PrecisionTurretGun" or
+			defName="PrecisionTurretGunManned" or
+			defName="BlastTurretGun" or
+			defName="BlastTurretGunManned" or
+			defName="VulcanCannon" or
+			defName="VulcanCannonManned" or
+			defName="Turret_DevastatorMortarBomb"
+			]/thingClass </xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="MilitaryTurretGun" or
+			defName="MilitaryTurretGunManned" or
+			defName="ShredderTurretGun" or
+			defName="ShredderTurretGunManned" or
+			defName="PrecisionTurretGun" or
+			defName="PrecisionTurretGunManned" or
+			defName="BlastTurretGun" or
+			defName="BlastTurretGunManned"
+			]/fillPercent </xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="GunComplex" or
+			defName="RocketComplex" or
+			defName="MilitaryTurretGun" or
+			defName="MilitaryTurretGunManned" or
+			defName="ShredderTurretGun" or
+			defName="ShredderTurretGunManned" or
+			defName="PrecisionTurretGun" or
+			defName="PrecisionTurretGunManned" or
+			defName="BlastTurretGun" or
+			defName="BlastTurretGunManned" or
+			defName="VulcanCannon" or
+			defName="VulcanCannonManned"
+			]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
+	</Operation>
+	<!--
+<li Class="PatchOperationRemove">
+	<xpath>Defs/ThingDef[defName="GunComplex"]/thingCategories/li[text()="BuildingsSecurity"]</xpath>
+</li>
+-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="GunComplex" or
+			defName="RocketComplex" or
+			defName="MilitaryTurretGun" or
+			defName="MilitaryTurretGunManned" or
+			defName="ShredderTurretGun" or
+			defName="ShredderTurretGunManned" or
+			defName="PrecisionTurretGun" or
+			defName="PrecisionTurretGunManned" or
+			defName="BlastTurretGun" or
+			defName="BlastTurretGunManned" or
+			defName="VulcanCannon" or
+			defName="VulcanCannonManned"
+			]/statBases </xpath>
+		<value>
+			<AimingAccuracy>1</AimingAccuracy>
+			<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MoreMechanoids/Patches/MoreMechanoids/BodyDefs/Armor.xml b/ModPatches/MoreMechanoids/Patches/MoreMechanoids/BodyDefs/Armor.xml
new file mode 100644
index 0000000000..a420fa2d53
--- /dev/null
+++ b/ModPatches/MoreMechanoids/Patches/MoreMechanoids/BodyDefs/Armor.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Natural armor -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MechanicalCrawler"]//*[def="MechanicalShell" or def="MechanicalCore" or def="MechanicalCrawlerLeg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MechanicalSkullywag"]//*[def="MechanicalThorax" or def="MechanicalCoreSkullywag" or def="MechanicalNeck" or def="MechanicalHead"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MechanicalAssaulter"]//*[def="MechanicalThorax" or def="FrontShield" or def="ShieldWindow" or def="MechanicalNeck" or def="MechanicalHead" or def="MechanicalShoulder" or def="MechanicalArm" or def="MechanicalHand" or def="MechanicalFinger" or def="MechanicalLeg" or def="MechanicalFoot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MechanicalMammoth"]//*[def="MechanicalHead" or def="MetalTusk" or def="MechanicalMammothLeg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MechanicalMammoth"]//*[def="MechanicalBody" or def="ArmorPlating" or def="InternalMetalPlate" or (def="MechanicalMammothLeg" and not(groups)) or def="MechanicalMammothHoof"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MechanicalFlamebot"]//*[def="MechanicalBodySmall" or def="FuelContainer" or def="MechanicalHead"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MechanicalFlamebot"]//*[def="MechanicalCore"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MoreMechanoids/Patches/MoreMechanoids/PawnKinds/PawnKinds.xml b/ModPatches/MoreMechanoids/Patches/MoreMechanoids/PawnKinds/PawnKinds.xml
new file mode 100644
index 0000000000..fe07424c82
--- /dev/null
+++ b/ModPatches/MoreMechanoids/Patches/MoreMechanoids/PawnKinds/PawnKinds.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Mech_Assaulter" or defName="Mech_Flamebot"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Mech_Assaulter"]/combatPower</xpath>
+		<value>
+			<combatPower>400</combatPower>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MoreMechanoids/Patches/MoreMechanoids/ThingDefs_Misc/Weapons_Mechanoid.xml b/ModPatches/MoreMechanoids/Patches/MoreMechanoids/ThingDefs_Misc/Weapons_Mechanoid.xml
new file mode 100644
index 0000000000..430a96230c
--- /dev/null
+++ b/ModPatches/MoreMechanoids/Patches/MoreMechanoids/ThingDefs_Misc/Weapons_Mechanoid.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_ChargeBlasterInternal</defName>
+		<statBases>
+			<Mass>10.00</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>2.0</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>13.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.51</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x22mmCharged</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>31</range>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<burstShotCount>20</burstShotCount>
+			<soundCast>Shot_ChargeBlaster</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>9.2</reloadTime>
+			<ammoSet>AmmoSet_6x22mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Suppressive</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>MechanoidFlameThrower</defName>
+		<statBases>
+			<Mass>2.00</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>5.0</ShotSpread>
+			<SwayFactor>1.00</SwayFactor>
+			<Bulk>1.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Flamethrower_Prometheum</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<burstShotCount>6</burstShotCount>
+			<soundCast>FlameThrower</soundCast>
+			<muzzleFlashScale>5</muzzleFlashScale>
+			<ai_AvoidFriendlyFireRadius>3</ai_AvoidFriendlyFireRadius>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_Flamethrower</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MoreMechanoids/Patches/MoreMechanoids/ThingDefs_Races/Races_Mechanoid.xml b/ModPatches/MoreMechanoids/Patches/MoreMechanoids/ThingDefs_Races/Races_Mechanoid.xml
new file mode 100644
index 0000000000..912149aac3
--- /dev/null
+++ b/ModPatches/MoreMechanoids/Patches/MoreMechanoids/ThingDefs_Races/Races_Mechanoid.xml
@@ -0,0 +1,537 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Crawler ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Mech_Crawler"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Crawler"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Mech_Crawler"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.26</MeleeDodgeChance>
+			<MeleeCritChance>0.06</MeleeCritChance>
+			<MeleeParryChance>0</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Crawler"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>plasma cutter</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>3.1</cooldownTime>
+					<linkedBodyPartsGroup>PlasmaCutter</linkedBodyPartsGroup>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<armorPenetrationSharp>25</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>front legs</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLegs</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>front legs</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLegs</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationSharp>0.84</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Mech_Crawler"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Mech_Crawler"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Mech_Crawler"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>275</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>27</MaxOverHeal>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Skullywag ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Mech_Skullywag"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Skullywag"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Skullywag"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Mech_Skullywag"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.19</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.08</MeleeParryChance>
+			<MaxHitPoints>200</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Skullywag"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>front paralyze component</label>
+					<capacities>
+						<li>ParalyzingPoke</li>
+						<li>UnlockDoor</li>
+					</capacities>
+					<power>2.0</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontParalyzeComponent</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<armorPenetration>0.0</armorPenetration>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5.0</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.875</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Mech_Skullywag"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Mech_Skullywag"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Mech_Skullywag"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>850</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>85</MaxOverHeal>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Flamebot ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Mech_Flamebot"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Flamebot"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Flamebot"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Mech_Flamebot"]/statBases</xpath>
+		<value>
+			<ArmorRating_Heat>0.5</ArmorRating_Heat>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>100</CarryBulk>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1.0</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.10</MeleeDodgeChance>
+			<MeleeCritChance>0.04</MeleeCritChance>
+			<MeleeParryChance>0.0</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Flamebot"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>igniter</label>
+					<capacities>
+						<li>Stab</li>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>Igniter</linkedBodyPartsGroup>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Mech_Flamebot"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Mech_Flamebot"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Mech_Flamebot"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>400</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>40</MaxOverHeal>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Mammoth ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Mech_Mammoth"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Mech_Mammoth"]/statBases</xpath>
+		<value>
+			<ArmorRating_Heat>0.5</ArmorRating_Heat>
+			<MeleeDodgeChance>0.04</MeleeDodgeChance>
+			<MeleeCritChance>0.64</MeleeCritChance>
+			<MeleeParryChance>0.58</MeleeParryChance>
+			<MaxHitPoints>800</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Mammoth"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>22</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Mammoth"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>50</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Mammoth"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Ram</li>
+					</capacities>
+					<power>72</power>
+					<cooldownTime>7</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>25</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>33.750</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>3.51</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>tusk</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>52</power>
+					<cooldownTime>2.34</cooldownTime>
+					<linkedBodyPartsGroup>Tusk</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>33.750</armorPenetrationBlunt>
+					<armorPenetrationSharp>67.5</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>3.51</cooldownTime>
+					<linkedBodyPartsGroup>FrontLegs</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Mech_Mammoth"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Mech_Mammoth"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Mech_Mammoth"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>5500</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>550</MaxOverHeal>
+				<MinArmorPct>0.5</MinArmorPct>
+				<MinArmorValueSharp>12</MinArmorValueSharp>
+				<MinArmorValueBlunt>27</MinArmorValueBlunt>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Assaulter ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Mech_Assaulter"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Assaulter"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Assaulter"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>42</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Mech_Assaulter"]/statBases</xpath>
+		<value>
+			<ArmorRating_Heat>0.25</ArmorRating_Heat>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>40</CarryBulk>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.12</MeleeDodgeChance>
+			<MeleeCritChance>0.16</MeleeCritChance>
+			<MeleeParryChance>0.12</MeleeParryChance>
+			<MaxHitPoints>300</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Assaulter"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shield</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>2.95</cooldownTime>
+					<linkedBodyPartsGroup>CoveredByShield</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>gun protrusion</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2.24</cooldownTime>
+					<linkedBodyPartsGroup>GunProtrusion</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Mech_Assaulter"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Mech_Assaulter"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Mech_Assaulter"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1525</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>152</MaxOverHeal>
+				<MinArmorPct>0.5</MinArmorPct>
+				<MinArmorValueSharp>10</MinArmorValueSharp>
+				<MinArmorValueBlunt>22</MinArmorValueBlunt>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Morgante Mafia Weapons Pack/Patches/Morgante Mafia Weapons Pack/Weapons_Guns.xml b/ModPatches/Morgante Mafia Weapons Pack/Patches/Morgante Mafia Weapons Pack/Weapons_Guns.xml
new file mode 100644
index 0000000000..092533e1fe
--- /dev/null
+++ b/ModPatches/Morgante Mafia Weapons Pack/Patches/Morgante Mafia Weapons Pack/Weapons_Guns.xml	
@@ -0,0 +1,432 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Tools ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName="Morg_Lupara" or
+			defName="Morg_PoketRevolver" or
+			defName="Morg_ServiceRevolver" or
+			defName="Morg_M1911a"
+			]/tools
+		</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName="Morg_TommyGun" or
+			defName="Morg_PumpShotgun" or
+			defName="Morg_BoltActionRifle"
+			]/tools
+		</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</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>2</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>2</power>
+					<cooldownTime>1.55</cooldownTime>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Bolt Action Rifle / Springfield 1903 ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Morg_BoltActionRifle</defName>
+		<statBases>
+			<Mass>3.90</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.49</SwayFactor>
+			<Bulk>11.00</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_3006Springfield</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Pump Shotgun / Model 1897 ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Morg_PumpShotgun</defName>
+		<statBases>
+			<Mass>3.60</Mass>
+			<RangedWeapon_Cooldown>0.99</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.36</SwayFactor>
+			<Bulk>10.00</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.25</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Sawed Off === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Morg_Lupara</defName>
+		<statBases>
+			<WorkToMake>9500</WorkToMake>
+			<Bulk>4.75</Bulk>
+			<Mass>1.85</Mass>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>2.20</SwayFactor>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.93</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>13</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>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Tommy Gun === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Morg_TommyGun</defName>
+		<statBases>
+			<Mass>4.90</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.35</SwayFactor>
+			<Bulk>8.60</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.32</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>25</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>Shot_HeavySMG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Pocket Revolver / S&W Model 10, Snubnose ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Morg_PoketRevolver</defName>
+		<statBases>
+			<Mass>0.82</Mass>
+			<RangedWeapon_Cooldown>0.48</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>0.86</SwayFactor>
+			<Bulk>1.77</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_38Special_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>10</range>
+			<soundCast>Shot_Revolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_38Special</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_Pistol</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Service Revolver / S&W Model 10, 4" Barrel ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Morg_ServiceRevolver</defName>
+		<statBases>
+			<Mass>0.97</Mass>
+			<RangedWeapon_Cooldown>0.48</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>1.08</SwayFactor>
+			<Bulk>2.28</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_38Special_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Revolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_38Special</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_Pistol</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== M1911a1 ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Morg_M1911a</defName>
+		<statBases>
+			<Mass>1.14</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.11</SwayFactor>
+			<Bulk>2.19</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Molotov === -->
+
+	<!-- Projectile -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="BaseIncendiaryProjectile"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<explosionRadius>0.5</explosionRadius>
+				<damageDef>PrometheumFlame</damageDef>
+				<damageAmountBase>10</damageAmountBase>
+				<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
+				<preExplosionSpawnChance>1</preExplosionSpawnChance>
+				<speed>12</speed>
+				<ai_IsIncendiary>true</ai_IsIncendiary>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Morg_MolotovCocktailProj"]</xpath>
+		<value>
+			<thingClass>CombatExtended.Projectile_FireTrail</thingClass>
+		</value>
+	</Operation>
+
+	<!-- Grenade -->
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="Morg_MolotovCocktail"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>BaseWeapon</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Morg_MolotovCocktail"]</xpath>
+		<value>
+			<thingClass>CombatExtended.AmmoThing</thingClass>
+			<stackLimit>50</stackLimit>
+			<resourceReadoutPriority>First</resourceReadoutPriority>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="Morg_MolotovCocktail"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Morg_MolotovCocktail"]/comps</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_ExplosiveCE">
+					<damageAmountBase>1</damageAmountBase>
+					<explosiveDamageType>Flame</explosiveDamageType>
+					<explosiveRadius>0.5</explosiveRadius>
+					<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
+					<preExplosionSpawnChance>1</preExplosionSpawnChance>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Morg_MolotovCocktail</defName>
+		<statBases>
+			<Mass>0.6</Mass>
+			<Bulk>2.55</Bulk>
+			<MarketValue>7.05</MarketValue>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<label>throw molotov</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<range>10</range>
+			<minRange>4</minRange>
+			<warmupTime>0.8</warmupTime>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<soundCast>ThrowMolotovCocktail</soundCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<defaultProjectile>Morg_MolotovCocktailProj</defaultProjectile>
+			<onlyManualCast>true</onlyManualCast>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<weaponTags>
+			<li>CE_AI_Grenade</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Morgante WW2 Italian Weapons/Defs/Morgante WW2 Italian Weapons/Patch_Ammo.xml b/ModPatches/Morgante WW2 Italian Weapons/Defs/Morgante WW2 Italian Weapons/Patch_Ammo.xml
new file mode 100644
index 0000000000..3f159e6c69
--- /dev/null
+++ b/ModPatches/Morgante WW2 Italian Weapons/Defs/Morgante WW2 Italian Weapons/Patch_Ammo.xml	
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>Ammo60mmGrenade</defName>
+		<label>60mm Grenade</label>
+		<parent>AmmoGrenades</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberGrenade</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_60mmGrenade</defName>
+		<label>60mm Grenade</label>
+		<ammoTypes>
+			<Ammo_60mmGrenade_HEAT>Bullet_60mmGrenade_HEAT</Ammo_60mmGrenade_HEAT>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="60mmGrenadeBase" ParentName="MediumAmmoBase" Abstract="True">
+		<description>Large spigot grenade designed to be fired at tanks.</description>
+		<statBases>
+			<Mass>2.176</Mass>
+			<Bulk>4.5</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo60mmGrenade</li>
+		</thingCategories>
+		<stackLimit>25</stackLimit>
+		<cookOffFlashScale>30</cookOffFlashScale>
+		<cookOffSound>MortarBomb_Explode</cookOffSound>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="60mmGrenadeBase">
+		<defName>Ammo_60mmGrenade_HEAT</defName>
+		<label>60mm Grenade (HEAT)</label>
+		<graphicData>
+			<texPath>Things/Ammo/GrenadeLauncher/HE</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>35.3</MarketValue>
+		</statBases>
+		<ammoClass>RocketHEAT</ammoClass>
+		<detonateProjectile>Bullet_60mmGrenade_HEAT</detonateProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base40x46mmGrenadeBullet">
+		<defName>Bullet_60mmGrenade_HEAT</defName>
+		<label>60mm Grenade(HEAT)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>186</damageAmountBase>
+			<armorPenetrationSharp>70</armorPenetrationSharp>
+			<armorPenetrationBlunt>34.818</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>120</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>1</Fragment_Large>
+					<Fragment_Small>32</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_60mmGrenade_HEAT</defName>
+		<label>make 60mm Grenades x5</label>
+		<description>Craft 5 60mm Grenades.</description>
+		<jobString>Making 60mm Grenades.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>26</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>7</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_60mmGrenade_HEAT>5</Ammo_60mmGrenade_HEAT>
+		</products>
+		<workAmount>6500</workAmount>
+	</RecipeDef>
+
+	<!-- ========== Based off of .44 Magnum ========== -->
+
+	<ThingCategoryDef>
+		<defName>Ammo1035mmOrdinanzaItaliana</defName>
+		<label>10.35mm Ordinanza Italiana</label>
+		<parent>AmmoPistols</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_1035mmOrdinanzaItaliana</defName>
+		<label>10.35mm Ordinanza Italiana</label>
+		<ammoTypes>
+			<Ammo_1035mmOrdinanzaItaliana_FMJ>Bullet_1035mmOrdinanzaItaliana_FMJ</Ammo_1035mmOrdinanzaItaliana_FMJ>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="1035mmOrdinanzaItalianaBase" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Ancient pistol cartridge originally designed for Italian revolvers.</description>
+		<statBases>
+			<Mass>0.02</Mass>
+			<Bulk>0.02</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo1035mmOrdinanzaItaliana</li>
+		</thingCategories>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="1035mmOrdinanzaItalianaBase">
+		<defName>Ammo_1035mmOrdinanzaItaliana_FMJ</defName>
+		<label>10.35mm Ordinanza Italiana cartridge (FMJ)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Pistol/FMJ</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.1</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_1035mmOrdinanzaItaliana_FMJ</cookOffProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base44MagnumBullet">
+		<defName>Bullet_1035mmOrdinanzaItaliana_FMJ</defName>
+		<label>10.35mm Ordinanza Italiana bullet (FMJ)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>6.55</armorPenetrationSharp>
+			<armorPenetrationBlunt>21.280</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_1035mmOrdinanzaItaliana_FMJ</defName>
+		<label>make 10.35mm Ordinanza Italiana (FMJ) cartridge x250</label>
+		<description>Craft 250 10.35mm Ordinanza Italiana (FMJ) cartridges.</description>
+		<jobString>Making 10.35mm Ordinanza Italiana (FMJ) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_1035mmOrdinanzaItaliana_FMJ>250</Ammo_1035mmOrdinanzaItaliana_FMJ>
+		</products>
+		<workAmount>2200</workAmount>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Morgante WW2 Italian Weapons/Patches/Morgante WW2 Italian Weapons/Weapons_Guns.xml b/ModPatches/Morgante WW2 Italian Weapons/Patches/Morgante WW2 Italian Weapons/Weapons_Guns.xml
new file mode 100644
index 0000000000..8930b59276
--- /dev/null
+++ b/ModPatches/Morgante WW2 Italian Weapons/Patches/Morgante WW2 Italian Weapons/Weapons_Guns.xml	
@@ -0,0 +1,338 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Tools ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName="MORG_BODEO" or
+			defName="MORG_GLISENTI1910M"
+			]/tools
+		</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName="MORG_MAB38M" or
+			defName="MORG_FNAB43M" or
+			defName="MORG_60MM" or
+			defName="MORG_BREDA30M"
+			]/tools
+		</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</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>2</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>2</power>
+					<cooldownTime>1.55</cooldownTime>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Beretta Model 38 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>MORG_MAB38M</defName>
+		<statBases>
+			<Mass>3.27</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.13</SwayFactor>
+			<Bulk>8.00</Bulk>
+		</statBases>
+		<costList>
+			<Steel>35</Steel>
+			<WoodLog>20</WoodLog>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.32</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>25</range>
+			<burstShotCount>8</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== FNAB-43 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>MORG_FNAB43M</defName>
+		<statBases>
+			<Mass>3.90</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.18</SwayFactor>
+			<Bulk>4.80</Bulk>
+			<WorkToMake>40000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<WoodLog>20</WoodLog>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.20</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>25</range>
+			<burstShotCount>8</burstShotCount>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Breda Model 30 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>MORG_BREDA30M</defName>
+		<statBases>
+			<Mass>10.60</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.60</SwayFactor>
+			<Bulk>13.30</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.06</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_65x52mmCarcano_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>62</range>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>5.3</reloadTime><!-- Due to the Model 30's questionable design, reloading is more time-consuming.-->
+			<ammoSet>AmmoSet_65x52mmCarcano</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== 60mm Heat Grenade Rifle ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>MORG_60MM</defName>
+		<statBases>
+			<Mass>7.80</Mass>
+			<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.76</SwayFactor>
+			<Bulk>10.80</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_60mmGrenade_HEAT</defaultProjectile>
+			<warmupTime>1.8</warmupTime>
+			<minRange>3</minRange>
+			<range>29</range>
+			<soundCast>Shot_IncendiaryLauncher</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<requireLineOfSight>false</requireLineOfSight>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>6</reloadTime>
+			<ammoSet>AmmoSet_60mmGrenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Glisenti Model 1910 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>MORG_GLISENTI1910M</defName>
+		<statBases>
+			<Mass>0.82</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>0.96</SwayFactor>
+			<Bulk>2.07</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Bodel Model 1889 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>MORG_BODEO</defName>
+		<statBases>
+			<Mass>0.95</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.03</SwayFactor>
+			<Bulk>2.22</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_1035mmOrdinanzaItaliana_FMJ</defaultProjectile>
+			<warmupTime>0.3</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_Revolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>5.1</reloadTime>
+			<ammoSet>AmmoSet_1035mmOrdinanzaItaliana</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MorrowRim - Ashlands Swamp/Patches/MorrowRim - Ashlands Swamp/MorrowRim_Lizard.xml b/ModPatches/MorrowRim - Ashlands Swamp/Patches/MorrowRim - Ashlands Swamp/MorrowRim_Lizard.xml
new file mode 100644
index 0000000000..74b2325252
--- /dev/null
+++ b/ModPatches/MorrowRim - Ashlands Swamp/Patches/MorrowRim - Ashlands Swamp/MorrowRim_Lizard.xml	
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="MorrowRim_ArgoBehemoth"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_ArgoBehemoth"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.24</MeleeDodgeChance>
+			<MeleeCritChance>0.38</MeleeCritChance>
+			<MeleeParryChance>0.5</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_ArgoBehemoth"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_ArgoBehemoth"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_ArgoBehemoth"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hand claws</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Blunt</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.02</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hand claws</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Blunt</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.02</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>34</power>
+					<cooldownTime>1.84</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<chanceFactor>0.75</chanceFactor>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Wamasu"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Wamasu"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.34</MeleeCritChance>
+			<MeleeParryChance>0.24</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Wamasu"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hand claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.64</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<extraMeleeDamages>
+						<li>
+							<def>EMP</def>
+							<amount>8</amount>
+							<chance>0.5</chance>
+						</li>
+					</extraMeleeDamages>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hand claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.64</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<extraMeleeDamages>
+						<li>
+							<def>EMP</def>
+							<amount>8</amount>
+							<chance>0.5</chance>
+						</li>
+					</extraMeleeDamages>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>2.05</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<extraMeleeDamages>
+						<li>
+							<def>EMP</def>
+							<amount>14</amount>
+							<chance>0.5</chance>
+						</li>
+					</extraMeleeDamages>
+					<chanceFactor>0.75</chanceFactor>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MorrowRim - Ashlands Swamp/Patches/MorrowRim - Ashlands Swamp/MySwampBodyisReady.xml b/ModPatches/MorrowRim - Ashlands Swamp/Patches/MorrowRim - Ashlands Swamp/MySwampBodyisReady.xml
new file mode 100644
index 0000000000..b18de8a71e
--- /dev/null
+++ b/ModPatches/MorrowRim - Ashlands Swamp/Patches/MorrowRim - Ashlands Swamp/MySwampBodyisReady.xml	
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Tick-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="MorrowRim_Crab"]//*[
+			def="Shell" or
+			def="Pronotum" or
+			def="InsectLeg" or
+			def="InsectNostril"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="MorrowRim_Crab"]//*[
+			def="Shell" or
+			def="Pronotum" or
+			def="InsectNostril" or
+			def="InsectHead" or
+			def="InsectMouth" or
+			def="InsectLeg"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MorrowRim - Ashlands Swamp/Patches/MorrowRim - Ashlands Swamp/SwampInsec.xml b/ModPatches/MorrowRim - Ashlands Swamp/Patches/MorrowRim - Ashlands Swamp/SwampInsec.xml
new file mode 100644
index 0000000000..06ea348935
--- /dev/null
+++ b/ModPatches/MorrowRim - Ashlands Swamp/Patches/MorrowRim - Ashlands Swamp/SwampInsec.xml	
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="MorrowRim_SwampStrider"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedTall</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_SwampStrider"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.51</MeleeDodgeChance>
+			<MeleeCritChance>0.21</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_SwampStrider"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_SwampStrider"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_SwampStrider"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.88</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>16</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left scythed arm</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>MorrowRim_InsectArmAttackTool_L</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+					<armorPenetrationSharp>2.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right scythed arm</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>MorrowRim_InsectArmAttackTool_R</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+					<armorPenetrationSharp>2.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Thunderbug"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Thunderbug"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			<MeleeCritChance>0.09</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Thunderbug"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.33</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Thunderbug"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.33</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Thunderbug"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>8</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Stun</def>
+							<amount>4</amount>
+							<chance>0.5</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.84</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Hoarvor"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Hoarvor"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			<MeleeCritChance>0.09</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Hoarvor"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>MorrowRim_HoarvorBite</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Mudcrab"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Mudcrab"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.17</MeleeDodgeChance>
+			<MeleeCritChance>0.06</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Mudcrab"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.13</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Mudcrab"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.13</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Mudcrab"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>pincers</label>
+					<capacities>
+						<li>Bite</li>
+						<li>MorrowRim_SwampBite</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.21</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MorrowRim - Ashlands Swamp/Patches/MorrowRim - Ashlands Swamp/SwampJello.xml b/ModPatches/MorrowRim - Ashlands Swamp/Patches/MorrowRim - Ashlands Swamp/SwampJello.xml
new file mode 100644
index 0000000000..6212141cad
--- /dev/null
+++ b/ModPatches/MorrowRim - Ashlands Swamp/Patches/MorrowRim - Ashlands Swamp/SwampJello.xml	
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="MorrowRim_SwampJelly"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedTall</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_SwampJelly"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.45</MeleeDodgeChance>
+			<MeleeCritChance>0.09</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_SwampJelly"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>front left tentacle</label>
+					<capacities>
+						<li>ScratchToxic</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>MorrowRim_TentacleAttackTool_FL</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>front right tentacle</label>
+					<capacities>
+						<li>ScratchToxic</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>MorrowRim_TentacleAttackTool_FR</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>middle left tentacle</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>MorrowRim_TentacleAttackTool_BL</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>middle right tentacle</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>MorrowRim_TentacleAttackTool_BR</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MorrowRim - Bloodmoon/Defs/MorrowRim - Bloodmoon/Hunter_Ammo.xml b/ModPatches/MorrowRim - Bloodmoon/Defs/MorrowRim - Bloodmoon/Hunter_Ammo.xml
new file mode 100644
index 0000000000..d887c6d0ca
--- /dev/null
+++ b/ModPatches/MorrowRim - Bloodmoon/Defs/MorrowRim - Bloodmoon/Hunter_Ammo.xml	
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- There is only one type of Forsaken arrow, no subcategory for variants required -->
+
+	<!--==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_HuntardArrow</defName>
+		<label>arrows</label>
+		<ammoTypes>
+			<Ammo_Arrow_Stone>Projectile_HuntardArrow_Stone</Ammo_Arrow_Stone>
+			<Ammo_Arrow_Steel>Projectile_HuntardArrow_Steel</Ammo_Arrow_Steel>
+			<Ammo_Arrow_Plasteel>Projectile_HuntardArrow_Plasteel</Ammo_Arrow_Plasteel>
+			<Ammo_Arrow_Venom>Projectile_HuntardArrow_Venom</Ammo_Arrow_Venom>
+			<Ammo_Arrow_Flame>Projectile_HuntardArrow_Flame</Ammo_Arrow_Flame>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="BaseStreamlinedArrowProjectile">
+		<defName>Projectile_HuntardArrow_Stone</defName>
+		<label>Hunter arrow (stone)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Stone</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>22</speed>
+			<damageDef>MorrowRim_ArrowHunters</damageDef>
+			<damageAmountBase>7</damageAmountBase>
+			<armorPenetrationSharp>0.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>1.740</armorPenetrationBlunt>
+			<preExplosionSpawnChance>0.2</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>Ammo_Arrow_Stone</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseStreamlinedArrowProjectile">
+		<defName>Projectile_HuntardArrow_Steel</defName>
+		<label>Hunter arrow (steel)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>33</speed>
+			<damageDef>MorrowRim_ArrowHunters</damageDef>
+			<damageAmountBase>9</damageAmountBase>
+			<armorPenetrationSharp>1.0</armorPenetrationSharp>
+			<armorPenetrationBlunt>5.9</armorPenetrationBlunt>
+			<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>Ammo_Arrow_Steel</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseStreamlinedArrowProjectile">
+		<defName>Projectile_HuntardArrow_Plasteel</defName>
+		<label>Hunter arrow (plasteel)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Plasteel</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>37</speed>
+			<damageAmountBase>7</damageAmountBase>
+			<damageDef>MorrowRim_ArrowHunters</damageDef>
+			<armorPenetrationSharp>1.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>3.260</armorPenetrationBlunt>
+			<preExplosionSpawnChance>0.75</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>Ammo_Arrow_Plasteel</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseStreamlinedArrowProjectile">
+		<defName>Projectile_HuntardArrow_Venom</defName>
+		<label>hunter arrow (venom)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Venom</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>33</speed>
+			<damageDef>MorrowRim_ArrowHunters</damageDef>
+			<damageAmountBase>9</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>ArrowVenom</def>
+					<amount>2</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>1.0</armorPenetrationSharp>
+			<armorPenetrationBlunt>5.9</armorPenetrationBlunt>
+			<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>Ammo_Arrow_Steel</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseStreamlinedArrowProjectile">
+		<defName>Projectile_HuntardArrow_Flame</defName>
+		<label>hunter arrow (flame)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Flame</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>33</speed>
+			<damageDef>MorrowRim_ArrowHunters</damageDef>
+			<damageAmountBase>3</damageAmountBase>
+			<armorPenetrationSharp>0.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>2.96</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame</def>
+					<amount>1</amount>
+					<chance>0.33</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_3006Springfield_BloodMoon</defName>
+		<label>.30-06 Springfield</label>
+		<ammoTypes>
+			<Ammo_3006Springfield_FMJ>Bullet_3006Springfield_FMJ_BloodMoon</Ammo_3006Springfield_FMJ>
+			<Ammo_3006Springfield_AP>Bullet_3006Springfield_AP_BloodMoon</Ammo_3006Springfield_AP>
+			<Ammo_3006Springfield_HP>Bullet_3006Springfield_HP_BloodMoon</Ammo_3006Springfield_HP>
+			<Ammo_3006Springfield_Incendiary>Bullet_3006Springfield_Incendiary_BloodMoon</Ammo_3006Springfield_Incendiary>
+			<Ammo_3006Springfield_HE>Bullet_3006Springfield_HE_BloodMoon</Ammo_3006Springfield_HE>
+			<Ammo_3006Springfield_Sabot>Bullet_3006Springfield_Sabot_BloodMoon</Ammo_3006Springfield_Sabot>
+		</ammoTypes>
+		<similarTo>AmmoSet_Rifle</similarTo>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base3006SpringfieldBullet">
+		<defName>Bullet_3006Springfield_FMJ_BloodMoon</defName>
+		<label>.30-06 Springfield cartridge (FMJ)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>MorrowRim_BulletHunters</damageDef>
+			<damageAmountBase>21</damageAmountBase>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+			<armorPenetrationBlunt>79.22</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base3006SpringfieldBullet">
+		<defName>Bullet_3006Springfield_AP_BloodMoon</defName>
+		<label>.30-06 Springfield cartridge (AP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>MorrowRim_BulletHunters</damageDef>
+			<damageAmountBase>13</damageAmountBase>
+			<armorPenetrationSharp>16</armorPenetrationSharp>
+			<armorPenetrationBlunt>79.22</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base3006SpringfieldBullet">
+		<defName>Bullet_3006Springfield_HP_BloodMoon</defName>
+		<label>.30-06 Springfield cartridge (HP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>MorrowRim_BulletHunters</damageDef>
+			<damageAmountBase>26</damageAmountBase>
+			<armorPenetrationSharp>4</armorPenetrationSharp>
+			<armorPenetrationBlunt>79.22</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base3006SpringfieldBullet">
+		<defName>Bullet_3006Springfield_Incendiary_BloodMoon</defName>
+		<label>.30-06 Springfield bullet (AP-I)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>MorrowRim_BulletHunters</damageDef>
+			<damageAmountBase>13</damageAmountBase>
+			<armorPenetrationSharp>16</armorPenetrationSharp>
+			<armorPenetrationBlunt>79.22</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>8</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base3006SpringfieldBullet">
+		<defName>Bullet_3006Springfield_HE_BloodMoon</defName>
+		<label>.30-06 Springfield bullet (AP-HE)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>MorrowRim_BulletHunters</damageDef>
+			<damageAmountBase>21</damageAmountBase>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+			<armorPenetrationBlunt>79.22</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>12</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base3006SpringfieldBullet">
+		<defName>Bullet_3006Springfield_Sabot_BloodMoon</defName>
+		<label>.30-06 Springfield bullet (Sabot)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>MorrowRim_BulletHunters</damageDef>
+			<damageAmountBase>11</damageAmountBase>
+			<armorPenetrationSharp>28</armorPenetrationSharp>
+			<armorPenetrationBlunt>101.58</armorPenetrationBlunt>
+			<speed>221</speed>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/MorrowRim - Bloodmoon/Patches/MorrowRim - Bloodmoon/Bloodmoon_Deer.xml b/ModPatches/MorrowRim - Bloodmoon/Patches/MorrowRim - Bloodmoon/Bloodmoon_Deer.xml
new file mode 100644
index 0000000000..ac9280c371
--- /dev/null
+++ b/ModPatches/MorrowRim - Bloodmoon/Patches/MorrowRim - Bloodmoon/Bloodmoon_Deer.xml	
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="MorrowRim_AvatarOfHircine"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_AvatarOfHircine"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			<MeleeCritChance>0.33</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_AvatarOfHircine"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>antlers</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Stab</li>
+						<li>Cut</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.42</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MorrowRim - Bloodmoon/Patches/MorrowRim - Bloodmoon/BodyDef_Patches.xml b/ModPatches/MorrowRim - Bloodmoon/Patches/MorrowRim - Bloodmoon/BodyDef_Patches.xml
new file mode 100644
index 0000000000..61d729c5fc
--- /dev/null
+++ b/ModPatches/MorrowRim - Bloodmoon/Patches/MorrowRim - Bloodmoon/BodyDef_Patches.xml	
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Werewolf -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="MorrowRim_Werewolf"]//*[
+			def="Body" or
+			def="Tail" or
+			def="Neck"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="MorrowRim_Werewolf"]//*[
+			def="Body" or
+			def="Tail" or
+			def="Neck" or
+			def="Head" or
+			def="AnimalJaw" or
+			def="FrontClaw" or
+			def="Shoulder" or
+			def="Arm" or
+			def="Hand" or
+			def="Leg" or
+			def="Foot"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MorrowRim - Bloodmoon/Patches/MorrowRim - Bloodmoon/HediffDef_Disease.xml b/ModPatches/MorrowRim - Bloodmoon/Patches/MorrowRim - Bloodmoon/HediffDef_Disease.xml
new file mode 100644
index 0000000000..8fa44124dc
--- /dev/null
+++ b/ModPatches/MorrowRim - Bloodmoon/Patches/MorrowRim - Bloodmoon/HediffDef_Disease.xml	
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="MorrowRim_BloodOfHircine"]/stages/li[1]/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.1</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="MorrowRim_BloodOfHircine"]/stages/li[2]/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.2</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="MorrowRim_BloodOfHircine"]/stages/li[3]/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.3</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="MorrowRim_BloodOfHircine"]/stages/li[4]/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.4</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="MorrowRim_BloodOfHircine"]/stages/li[5]/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.5</Suppressability>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="MorrowRim_BloodOfHircine"]/stages/li[6]/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.6</Suppressability>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="MorrowRim_BloodOfHircine"]/stages/li[7]/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.7</Suppressability>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="MorrowRim_BloodOfHircine"]/stages/li[8]/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.8</Suppressability>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="MorrowRim_BloodOfHircine"]/stages/li[9]/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.9</Suppressability>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="MorrowRim_BloodOfHircine"]/stages/li[10]/statOffsets</xpath>
+		<value>
+			<Suppressability>-1.0</Suppressability>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MorrowRim - Bloodmoon/Patches/MorrowRim - Bloodmoon/Hunter_Grenades.xml b/ModPatches/MorrowRim - Bloodmoon/Patches/MorrowRim - Bloodmoon/Hunter_Grenades.xml
new file mode 100644
index 0000000000..7b9f202488
--- /dev/null
+++ b/ModPatches/MorrowRim - Bloodmoon/Patches/MorrowRim - Bloodmoon/Hunter_Grenades.xml	
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs</xpath>
+		<value>
+
+			<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGrenadeEquipment">
+				<defName>Weapon_GrenadeWolfBane</defName>
+				<equipmentType>Primary</equipmentType>
+				<label>wolfsbane vessel</label>
+				<description>Glass vessels filled with a potent mixture of wolfsbane extract. Shatters upon impact, releasing a short lived cloud of gas that burns any werewolves within.</description>
+				<graphicData>
+					<texPath>Things/Projectile/MorrowRim_WolfsBaneBombThrown</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<soundInteract>Interact_Grenade</soundInteract>
+				<techLevel>Medieval</techLevel>
+				<stackLimit>50</stackLimit>
+				<statBases>
+					<Mass>0.436</Mass>
+					<Bulk>1.55</Bulk>
+					<MarketValue>12.4</MarketValue>
+					<SightsEfficiency>1.0</SightsEfficiency>
+					<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+				</statBases>
+				<generateCommonality>2.0</generateCommonality>
+				<weaponTags>
+					<li>CE_AI_AOE</li>
+					<li>GrenadeDestructive</li>
+				</weaponTags>
+				<thingCategories>
+					<li>Grenades</li>
+				</thingCategories>
+				<verbs>
+					<li Class="CombatExtended.VerbPropertiesCE">
+						<label>throw wolfsbane vessel</label>
+						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<range>12.9</range>
+						<minRange>2.9</minRange>
+						<warmupTime>0.8</warmupTime>
+						<noiseRadius>4</noiseRadius>
+						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+						<soundCast>ThrowGrenade</soundCast>
+						<targetParams>
+							<canTargetLocations>true</canTargetLocations>
+						</targetParams>
+						<defaultProjectile>Proj_GrenadeWolfBane</defaultProjectile>
+						<onlyManualCast>true</onlyManualCast>
+						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+						<ai_AvoidFriendlyFireRadius>6</ai_AvoidFriendlyFireRadius>
+					</li>
+				</verbs>
+			</ThingDef>
+
+			<ThingDef ParentName="BaseGrenadeProjectile">
+				<defName>Proj_GrenadeWolfBane</defName>
+				<label>wolfsbane vessel</label>
+				<graphicData>
+					<texPath>Things/Projectile/MorrowRim_WolfsBaneBombThrown</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<projectile Class="CombatExtended.ProjectilePropertiesCE">
+					<explosionRadius>3.5</explosionRadius>
+					<damageDef>Burn</damageDef>
+					<damageAmountBase>0</damageAmountBase>
+					<explosionDelay>0</explosionDelay>
+					<postExplosionSpawnThingDef>MorrowRim_Gas_Wolfsbane</postExplosionSpawnThingDef>
+					<postExplosionSpawnChance>1</postExplosionSpawnChance>
+					<speed>10</speed>
+				</projectile>
+			</ThingDef>
+
+			<RecipeDef ParentName="GrenadeRecipeBase">
+				<defName>MakeGrenadeWolfBane</defName>
+				<label>make wolfsbane vessel x5</label>
+				<description>Craft 10 wolfsbane vessels.</description>
+				<jobString>Making wolfsbane vessels.</jobString>
+				<researchPrerequisite>MorrowRim_LycanthropicElixirs</researchPrerequisite>
+				<workAmount>2100</workAmount>
+				<ingredients>
+					<li>
+						<filter>
+							<thingDefs>
+								<li>Steel</li>
+							</thingDefs>
+						</filter>
+						<count>10</count>
+					</li>
+					<li>
+						<filter>
+							<thingDefs>
+								<li>MorrowRim_WolfsbaneExtract</li>
+							</thingDefs>
+						</filter>
+						<count>60</count>
+					</li>
+				</ingredients>
+				<fixedIngredientFilter>
+					<thingDefs>
+						<li>Steel</li>
+						<li>MorrowRim_WolfsbaneExtract</li>
+					</thingDefs>
+				</fixedIngredientFilter>
+				<products>
+					<Weapon_GrenadeWolfBane>5</Weapon_GrenadeWolfBane>
+				</products>
+			</RecipeDef>
+
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Apparel_WolfsbaneBelt"]/costList</xpath>
+		<value>
+			<costList>
+				<Weapon_GrenadeWolfBane>5</Weapon_GrenadeWolfBane>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Apparel_WolfsbaneBelt"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountToRefill</xpath>
+		<value>
+			<ammoCountPerCharge>1</ammoCountPerCharge>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Apparel_WolfsbaneBelt"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<label>throw wolfsbane grenade</label>
+					<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<onlyManualCast>True</onlyManualCast>
+					<warmupTime>0.8</warmupTime>
+					<range>12.9</range>
+					<minRange>3</minRange>
+					<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+					<soundCast>ThrowGrenade</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+					<defaultProjectile>Proj_GrenadeWolfBane</defaultProjectile>
+					<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MorrowRim - Bloodmoon/Patches/MorrowRim - Bloodmoon/Hunter_Weapons.xml b/ModPatches/MorrowRim - Bloodmoon/Patches/MorrowRim - Bloodmoon/Hunter_Weapons.xml
new file mode 100644
index 0000000000..775b0c2730
--- /dev/null
+++ b/ModPatches/MorrowRim - Bloodmoon/Patches/MorrowRim - Bloodmoon/Hunter_Weapons.xml	
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== hunt Spear ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_MeleeWeapon_HuntersSpear"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.35</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>MorrowRim_StabHunters</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.41</cooldownTime>
+					<chanceFactor>1.00</chanceFactor>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_MeleeWeapon_HuntersSpear"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_MeleeWeapon_HuntersSpear"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.17</MeleeCritChance>
+				<MeleeParryChance>1.45</MeleeParryChance>
+				<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- ========== Hunter Bow ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>MorrowRim_Bow_Hunters</defName>
+		<statBases>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.8</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>5.00</Bulk>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_HuntardArrow_Stone</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>26</range>
+			<soundCast>Bow_Recurve</soundCast>
+		</Properties>
+		<AmmoUser>
+			<ammoSet>AmmoSet_HuntardArrow</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<AllowWithRunAndGun>true</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Bow_Hunters"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetrationBlunt>0.65</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Hunter Gun ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>MorrowRim_Gun_Hunters</defName>
+		<statBases>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.8</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>5.00</Bulk>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_3006Springfield_BloodMoon</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<AllowWithRunAndGun>true</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Gun_Hunters"]/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>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MorrowRim - Bloodmoon/Patches/MorrowRim - Bloodmoon/MorrowRim_Werewolf.xml b/ModPatches/MorrowRim - Bloodmoon/Patches/MorrowRim - Bloodmoon/MorrowRim_Werewolf.xml
new file mode 100644
index 0000000000..8911da1ae9
--- /dev/null
+++ b/ModPatches/MorrowRim - Bloodmoon/Patches/MorrowRim - Bloodmoon/MorrowRim_Werewolf.xml	
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Werewolf"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Werewolf"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.36</MeleeDodgeChance>
+			<MeleeCritChance>0.29</MeleeCritChance>
+			<MeleeParryChance>0.5</MeleeParryChance>
+			<ArmorRating_Sharp>0.12</ArmorRating_Sharp>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Werewolf"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hand claws</label>
+					<capacities>
+						<li>MorrowRim_WerewolfScratch</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>0.75</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hand claws</label>
+					<capacities>
+						<li>MorrowRim_WerewolfScratch</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>0.75</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>MorrowRim_WerewolfBite</li>
+					</capacities>
+					<power>29</power>
+					<cooldownTime>1.66</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<chanceFactor>0.75</chanceFactor>
+					<armorPenetrationSharp>2.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MorrowRim - Bloodmoon/Patches/MorrowRim - Bloodmoon/MorrowRim_WerewolfLord.xml b/ModPatches/MorrowRim - Bloodmoon/Patches/MorrowRim - Bloodmoon/MorrowRim_WerewolfLord.xml
new file mode 100644
index 0000000000..d77876403c
--- /dev/null
+++ b/ModPatches/MorrowRim - Bloodmoon/Patches/MorrowRim - Bloodmoon/MorrowRim_WerewolfLord.xml	
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="MorrowRim_WerewolfLord"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_WerewolfLord"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.38</MeleeDodgeChance>
+			<MeleeCritChance>0.58</MeleeCritChance>
+			<MeleeParryChance>0.68</MeleeParryChance>
+			<ArmorRating_Sharp>0.45</ArmorRating_Sharp>
+			<ArmorRating_Blunt>2.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_WerewolfLord"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hand claws</label>
+					<capacities>
+						<li>MorrowRim_WerewolfScratch</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>0.75</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hand claws</label>
+					<capacities>
+						<li>MorrowRim_WerewolfScratch</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>0.75</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>MorrowRim_WerewolfBite</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>1.66</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<chanceFactor>0.75</chanceFactor>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MorrowRim - Colovian Fur Helm/Patches/MorrowRim - Colovian Fur Helm/Furr_Helm.xml b/ModPatches/MorrowRim - Colovian Fur Helm/Patches/MorrowRim - Colovian Fur Helm/Furr_Helm.xml
new file mode 100644
index 0000000000..17b9594c70
--- /dev/null
+++ b/ModPatches/MorrowRim - Colovian Fur Helm/Patches/MorrowRim - Colovian Fur Helm/Furr_Helm.xml	
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- == Fur Helm == -->
+	<!-- statBases -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_ColovianFurHelm"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MorrowRim/Defs/MorrowRim/RetchingShell.xml b/ModPatches/MorrowRim/Defs/MorrowRim/RetchingShell.xml
new file mode 100644
index 0000000000..00d2aa232a
--- /dev/null
+++ b/ModPatches/MorrowRim/Defs/MorrowRim/RetchingShell.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- Ammo Category -->
+	<CombatExtended.AmmoCategoryDef>
+		<defName>Netchyshell</defName>
+		<label>Netch foam</label>
+		<description>Releases a flood of steaming netch jelly that extinguishes fire.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<!-- Ammo -->
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBaseCraftableBase">
+		<defName>MorrowRim_RetchingNetchShell</defName>
+		<label>retching netch gas shell</label>
+		<graphicData>
+			<texPath>MorrowRim/Items/Shells/RetchingNetch</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>20.03</MarketValue>
+			<Mass>5</Mass>
+			<Bulk>8</Bulk>
+		</statBases>
+		<ammoClass>Netchyshell</ammoClass>
+		<generateAllowChance>0</generateAllowChance>
+		<detonateProjectile>Bullet_RetchingNetchShell</detonateProjectile>
+	</ThingDef>
+
+	<!-- Projectile -->
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base81mmMortarShell">
+		<defName>Bullet_RetchingNetchShell</defName>
+		<label>Retching Netch Shell</label>
+		<graphicData>
+			<texPath>Things/Projectile/ShellFirefoam</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Smoke</damageDef>
+			<suppressionFactor>0.0</suppressionFactor>
+			<dangerFactor>0.0</dangerFactor>
+			<damageAmountBase>40</damageAmountBase>
+			<explosionRadius>5</explosionRadius>
+			<flyOverhead>true</flyOverhead>
+			<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+			<soundExplode>Explosion_Smoke</soundExplode>
+			<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+			<soundAmbient>MortarRound_Ambient</soundAmbient>
+			<postExplosionSpawnThingDef>Gas_RetchingNetch</postExplosionSpawnThingDef>
+			<postExplosionSpawnChance>1</postExplosionSpawnChance>
+			<postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<explosionEffect>ExtinguisherExplosion</explosionEffect>
+		</projectile>
+	</ThingDef>
+
+	<!-- Recipe -->
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeMorrowRim_RetchingNetchShell</defName>
+		<label>make 81mm netch foam mortar shell x3</label>
+		<description>Craft 3 netch firefoam shells from netch body mucus.</description>
+		<jobString>Making 81mm netch firefoam shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>30</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>MorrowRim_NetchJelly</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>MorrowRim_NetchJelly</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<MorrowRim_RetchingNetchShell>3</MorrowRim_RetchingNetchShell>
+		</products>
+		<workAmount>2400</workAmount>
+		<researchPrerequisite>Mortars</researchPrerequisite>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/MorrowRim/Patches/MorrowRim/MorrowRim_CnidarianCE.xml b/ModPatches/MorrowRim/Patches/MorrowRim/MorrowRim_CnidarianCE.xml
new file mode 100644
index 0000000000..9afedf47c5
--- /dev/null
+++ b/ModPatches/MorrowRim/Patches/MorrowRim/MorrowRim_CnidarianCE.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="MorrowRim_NetchBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="MorrowRim_NetchBase"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.45</MeleeDodgeChance>
+			<MeleeCritChance>0.4</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="MorrowRim_NetchBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="MorrowRim_NetchBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="MorrowRim_NetchBase"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2.4</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>front left tentacle</label>
+					<capacities>
+						<li>ScratchToxic</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>2.1</cooldownTime>
+					<linkedBodyPartsGroup>MorrowRim_TentacleAttackTool_FL</linkedBodyPartsGroup>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>front right tentacle</label>
+					<capacities>
+						<li>ScratchToxic</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>2.1</cooldownTime>
+					<linkedBodyPartsGroup>MorrowRim_TentacleAttackTool_FR</linkedBodyPartsGroup>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>middle left tentacle</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2.2</cooldownTime>
+					<linkedBodyPartsGroup>MorrowRim_TentacleAttackTool_ML</linkedBodyPartsGroup>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>middle right tentacle</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2.2</cooldownTime>
+					<linkedBodyPartsGroup>MorrowRim_TentacleAttackTool_MR</linkedBodyPartsGroup>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>back left tentacle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>2.2</cooldownTime>
+					<linkedBodyPartsGroup>MorrowRim_TentacleAttackTool_BL</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>back right tentacle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>2.2</cooldownTime>
+					<linkedBodyPartsGroup>MorrowRim_TentacleAttackTool_BR</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MorrowRim/Patches/MorrowRim/MorrowRim_CorpusCE.xml b/ModPatches/MorrowRim/Patches/MorrowRim/MorrowRim_CorpusCE.xml
new file mode 100644
index 0000000000..74c5af71bd
--- /dev/null
+++ b/ModPatches/MorrowRim/Patches/MorrowRim/MorrowRim_CorpusCE.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="MorrowRim_CorprusStalker" or defName="MorrowRim_CorprusLame" or defName="MorrowRim_CorprusBloated"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_CorprusStalker"]</xpath>
+		<value>
+			<statBases>
+				<MoveSpeed>1.33</MoveSpeed>
+				<MeleeDodgeChance>0.5</MeleeDodgeChance>
+				<MeleeCritChance>0.18</MeleeCritChance>
+				<MeleeParryChance>0.3</MeleeParryChance>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_CorprusLame"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			<MeleeCritChance>0.33</MeleeCritChance>
+			<MeleeParryChance>0.4</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_CorprusBloated"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			<MeleeCritChance>0.24</MeleeCritChance>
+			<MeleeParryChance>0.4</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_CorprusStalker"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>MorrowRim_CorprusScratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>MorrowRim_CorprusScratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>MorrowRim_CorprusBite</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_CorprusBloated"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>MorrowRim_CorprusScratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>MorrowRim_CorprusScratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>MorrowRim_CorprusBite</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_CorprusLame"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>MorrowRim_CorprusScratch</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.9</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>MorrowRim_CorprusScratch</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.9</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>MorrowRim_CorprusBite</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MorrowRim/Patches/MorrowRim/MorrowRim_DaedraCE.xml b/ModPatches/MorrowRim/Patches/MorrowRim/MorrowRim_DaedraCE.xml
new file mode 100644
index 0000000000..f8a97da376
--- /dev/null
+++ b/ModPatches/MorrowRim/Patches/MorrowRim/MorrowRim_DaedraCE.xml
@@ -0,0 +1,532 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Clannfear"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Ogrim" or defName="MorrowRim_Daedroth" or defName="MorrowRim_Scamp" or defName="MorrowRim_Hunger" or defName="MorrowRim_OgrimSmol"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Clannfear"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.78</MeleeDodgeChance>
+			<MeleeCritChance>0.22</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Ogrim"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.66</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_OgrimSmol"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.27</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Ogrim"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Ogrim"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.65</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_OgrimSmol"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3.0</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_OgrimSmol"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Daedroth"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.6</MeleeDodgeChance>
+			<MeleeCritChance>0.33</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Scamp"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Hunger"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.66</MeleeDodgeChance>
+			<MeleeCritChance>0.21</MeleeCritChance>
+			<MeleeParryChance>0.23</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Clannfear"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hand claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>0.9</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.9</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hand claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>0.9</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.9</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<chanceFactor>0.75</chanceFactor>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Daedroth"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hand claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.12</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hand claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.12</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>29</power>
+					<cooldownTime>1.55</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<chanceFactor>0.75</chanceFactor>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>9</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Ogrim"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>24</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>24</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>32</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_OgrimSmol"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>14</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>14</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>16</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Scamp"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hand claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.7</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.26</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hand claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.7</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.26</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<chanceFactor>0.75</chanceFactor>
+					<armorPenetrationSharp>0.36</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Hunger"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hand claws</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Stab</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<extraMeleeDamages>
+						<li>
+							<def>MorrowRim_ScratchParalysis</def>
+							<amount>5</amount>
+							<chance>0.1</chance>
+						</li>
+					</extraMeleeDamages>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.0</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hand claws</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Stab</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<extraMeleeDamages>
+						<li>
+							<def>MorrowRim_ScratchParalysis</def>
+							<amount>5</amount>
+							<chance>0.1</chance>
+						</li>
+					</extraMeleeDamages>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<extraMeleeDamages>
+						<li>
+							<def>MorrowRim_AcidBurn</def>
+							<amount>5</amount>
+							<chance>1</chance>
+						</li>
+					</extraMeleeDamages>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="MorrowRim_TitanMode"]/stages/li[2]/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
+				<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+			</statOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MorrowRim/Patches/MorrowRim/MorrowRim_InsectCE.xml b/ModPatches/MorrowRim/Patches/MorrowRim/MorrowRim_InsectCE.xml
new file mode 100644
index 0000000000..134f69993b
--- /dev/null
+++ b/ModPatches/MorrowRim/Patches/MorrowRim/MorrowRim_InsectCE.xml
@@ -0,0 +1,351 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="MorrowRim_SiltStrider"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedTall</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_SiltStrider"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.66</MeleeDodgeChance>
+			<MeleeCritChance>0.67</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_SiltStrider"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_SiltStrider"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_SiltStrider"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>3.4</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>27</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left scythed arm</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>41</power>
+					<cooldownTime>2.4</cooldownTime>
+					<linkedBodyPartsGroup>MorrowRim_InsectArmAttackTool_L</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+					<armorPenetrationSharp>4</armorPenetrationSharp>
+					<armorPenetrationBlunt>16</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right scythed arm</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>41</power>
+					<cooldownTime>2.4</cooldownTime>
+					<linkedBodyPartsGroup>MorrowRim_InsectArmAttackTool_R</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+					<armorPenetrationSharp>4</armorPenetrationSharp>
+					<armorPenetrationBlunt>16</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="MorrowRim_NixHound"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_NixHound"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.14</MeleeParryChance>
+			<ArmorRating_Blunt>0.18</ArmorRating_Blunt>
+			<ArmorRating_Sharp>0.18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_NixHound"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>proboscis</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.444</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Shalk" or defName="MorrowRim_FungalShalk" or defName="MorrowRim_GlowingShalk"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Shalk" or defName="MorrowRim_FungalShalk" or defName="MorrowRim_GlowingShalk"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			<MeleeCritChance>0.04</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Shalk" or defName="MorrowRim_FungalShalk" or defName="MorrowRim_GlowingShalk"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.33</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Shalk" or defName="MorrowRim_FungalShalk" or defName="MorrowRim_GlowingShalk"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.33</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Shalk" or defName="MorrowRim_FungalShalk" or defName="MorrowRim_GlowingShalk"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>Bite</li>
+						<li>MorrowRim_BurnBite</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.26</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.78</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="MorrowRim_AshHopper"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_AshHopper"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.12</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_AshHopper"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_AshHopper"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_AshHopper"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.34</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="MorrowRim_NixOx"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_NixOx"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.19</MeleeCritChance>
+			<MeleeParryChance>0.14</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_NixOx"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_NixOx"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_NixOx"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>3</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MorrowRim/Patches/MorrowRim/MorrowRim_KwamaCE.xml b/ModPatches/MorrowRim/Patches/MorrowRim/MorrowRim_KwamaCE.xml
new file mode 100644
index 0000000000..48b8d6548d
--- /dev/null
+++ b/ModPatches/MorrowRim/Patches/MorrowRim/MorrowRim_KwamaCE.xml
@@ -0,0 +1,321 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="MorrowRim_KwamaScrib"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_KwamaScrib"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.03</MeleeCritChance>
+			<MeleeParryChance>0.07</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_KwamaScrib"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_KwamaScrib"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_KwamaScrib"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.1</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>MorrowRim_ParalyticBite</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="MorrowRim_KwamaForager"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Serpentine</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_KwamaForager"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_KwamaForager"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_KwamaForager"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.27</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_KwamaForager"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="MorrowRim_KwamaWorker"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_KwamaWorker"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.12</MeleeDodgeChance>
+			<MeleeCritChance>0.18</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_KwamaWorker"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_KwamaWorker"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_KwamaWorker"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>2.08</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.55</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.55</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="MorrowRim_KwamaWarrior"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_KwamaWarrior"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.33</MeleeDodgeChance>
+			<MeleeCritChance>0.37</MeleeCritChance>
+			<MeleeParryChance>0.5</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_KwamaWarrior"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>2.3</MoveSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_KwamaWarrior"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_KwamaWarrior"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_KwamaWarrior"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mouth</label>
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.88</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<chanceFactor>0.9</chanceFactor>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MorrowRim/Patches/MorrowRim/MorrowRim_Reptile_PantherCE.xml b/ModPatches/MorrowRim/Patches/MorrowRim/MorrowRim_Reptile_PantherCE.xml
new file mode 100644
index 0000000000..1a250f4cdd
--- /dev/null
+++ b/ModPatches/MorrowRim/Patches/MorrowRim/MorrowRim_Reptile_PantherCE.xml
@@ -0,0 +1,720 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Guar" or defName="MorrowRim_AlbinoGuar" or defName="MorrowRim_Scuttler" or defName="MorrowRim_Alit"
+			or defName="MorrowRim_Kagouti" or defName="MorrowRim_Durzog" or defName="MorrowRim_TigerGuar" or defName="MorrowRim_Wormmouth" or defName="MorrowRim_CliffRacer" or defName="MorrowRim_AshPanther"] </xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="MorrowRim_BantamGuar"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Guar" or defName="MorrowRim_AlbinoGuar"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.29</MeleeDodgeChance>
+			<MeleeCritChance>0.29</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+			<ArmorRating_Blunt>0.15</ArmorRating_Blunt>
+			<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Alit"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.24</MeleeDodgeChance>
+			<MeleeCritChance>0.38</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+			<ArmorRating_Blunt>0.15</ArmorRating_Blunt>
+			<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Kagouti"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.56</MeleeCritChance>
+			<MeleeParryChance>0.4</MeleeParryChance>
+			<ArmorRating_Blunt>0.18</ArmorRating_Blunt>
+			<ArmorRating_Sharp>0.18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Durzog"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.24</MeleeDodgeChance>
+			<MeleeCritChance>0.43</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+			<ArmorRating_Sharp>0.08</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_BantamGuar"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.03</MeleeCritChance>
+			<MeleeParryChance>0.03</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_CliffRacer"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_TigerGuar"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.24</MeleeDodgeChance>
+			<MeleeCritChance>0.37</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+			<ArmorRating_Blunt>0.15</ArmorRating_Blunt>
+			<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Wormmouth"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			<MeleeCritChance>0.29</MeleeCritChance>
+			<MeleeParryChance>0.23</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Wormmouth"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Wormmouth"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Scuttler"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_AshPanther"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.6</MeleeDodgeChance>
+			<MeleeCritChance>0.27</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Guar" or defName="MorrowRim_AlbinoGuar"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>2.9</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>13</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Alit"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>13</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Kagouti"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tusk</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Stab</li>
+					</capacities>
+					<power>34</power>
+					<cooldownTime>1.98</cooldownTime>
+					<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>5</armorPenetrationSharp>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>2.3</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>2.76</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>16</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Durzog"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tusk</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Stab</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>0.75</cooldownTime>
+					<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.75</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>13</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_CliffRacer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tail</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>MorrowRim_TailAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.38</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.24</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>beak</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.23</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>13</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.27</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.58</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_TigerGuar"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.6</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>34</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>13</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_BantamGuar"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.12</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>13</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.24</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Wormmouth"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>2.3</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>13</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Scuttler"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2.1</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>13</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_AshPanther"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>0.7</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>0.7</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MorrowRim/Patches/MorrowRim/MorrowRim_VvarkCE.xml b/ModPatches/MorrowRim/Patches/MorrowRim/MorrowRim_VvarkCE.xml
new file mode 100644
index 0000000000..2153a795d5
--- /dev/null
+++ b/ModPatches/MorrowRim/Patches/MorrowRim/MorrowRim_VvarkCE.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Vvardvark"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Vvardvark"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			<MeleeCritChance>0.12</MeleeCritChance>
+			<MeleeParryChance>0.03</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_Vvardvark"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>feet claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.66</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.12</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MorrowRim/Patches/MorrowRim/MorrowRim_XMaterials.xml b/ModPatches/MorrowRim/Patches/MorrowRim/MorrowRim_XMaterials.xml
new file mode 100644
index 0000000000..f5ce942cd8
--- /dev/null
+++ b/ModPatches/MorrowRim/Patches/MorrowRim/MorrowRim_XMaterials.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Remove horn as a weapon -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="MorrowRim_KagoutiTusk"]/tools</xpath>
+	</Operation>
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="MorrowRim_KagoutiTusk"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>ResourceBase</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_KagoutiTusk"]/description</xpath>
+		<value>
+			<description>A single horn of the mighty Kagouti. Proof that you're a warrior worthy of the title of Aberration Killer. Traders and collectors might pay a high price for this.</description>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_KagoutiTusk"]/statBases/MarketValue</xpath>
+		<value>
+			<MarketValue>100</MarketValue>
+		</value>
+	</Operation>
+	<!--Guar -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_GuarHide" or defName="MorrowRim_AlbinoGuarHide"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.08</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_GuarHide" or defName="MorrowRim_AlbinoGuarHide"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.064</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<!--Netch -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_NetchLeather"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.11</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_NetchLeather"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.068</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_NetchLeather"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.02</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+	<!--Flea -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_SiltStriderChitin"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.18</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_SiltStriderChitin"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.18</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_SiltStriderChitin"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.01</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+	<!--Nix -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_NixHoundLeather"]/statBases/MarketValue</xpath>
+		<value>
+			<MarketValue>1.3</MarketValue>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_NixHoundLeather"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.08</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_NixHoundLeather"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.06</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_NixHoundLeather"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.01</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+	<!-- HeavyLeather-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_HeavyLeather"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.1</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_HeavyLeather"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.068</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<!--Duzog -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_DurzogLeather"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.04</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_DurzogLeather"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.028</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<!--Cliff Racer -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_CliffRacerLeather"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.01</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_CliffRacerLeather"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.01</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_CliffRacerLeather"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+	<!--Daedra -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_DaedraHide"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.12</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_DaedraHide"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.8</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MorrowRim_DaedraHide"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+	<!--Kesh fiber -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_KreshFiber"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.02</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_KreshFiber"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.01</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MorrowRim_KreshFiber"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.01</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MorrowRim/Patches/MorrowRim/MyBodiesAreReady.xml b/ModPatches/MorrowRim/Patches/MorrowRim/MyBodiesAreReady.xml
new file mode 100644
index 0000000000..39479f81ce
--- /dev/null
+++ b/ModPatches/MorrowRim/Patches/MorrowRim/MyBodiesAreReady.xml
@@ -0,0 +1,329 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Bipedal -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="MorrowRim_Bipedal"]//*[
+			def="Body" or
+			def="Tail" or
+			def="Neck" or
+			def="Leg"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="MorrowRim_Bipedal"]//*[
+			def="Body" or
+			def="Tail" or
+			def="Neck" or
+			def="Head" or
+			def="Leg" or
+			def="Foot"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- Clannfear -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="MorrowRim_Clannfear"]//*[
+			def="Body" or
+			def="Tail" or
+			def="Neck" or
+			def="Leg"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="MorrowRim_Clannfear"]//*[
+			def="Body" or
+			def="Tail" or
+			def="Neck" or
+			def="Head" or
+			def="AnimalJaw" or
+			def="FrontClaw" or
+			def="Shoulder" or
+			def="Arm" or
+			def="Hand" or
+			def="Leg" or
+			def="Foot"
+			]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- Daedra -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="MorrowRim_Daedra"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Leg"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="MorrowRim_Daedra"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Head" or
+			def="AnimalJaw" or
+			def="Arm" or
+			def="Shoulder" or
+			def="FrontClaw" or
+			def="Hand" or
+			def="Leg" or
+			def="Foot"
+			]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- BipedalWithTusks -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="MorrowRim_BipedalWithTusks"]//*[
+			def="Body" or
+			def="Tail" or
+			def="Neck" or
+			def="Leg"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="MorrowRim_BipedalWithTusks"]//*[
+			def="Body" or
+			def="Tail" or
+			def="Neck" or
+			def="Head" or
+			def="Tusk" or
+			def="Leg" or
+			def="Foot"
+			]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- KwamaScrib -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="MorrowRim_KwamaScrib"]//*[
+			def="Shell" or
+			def="Pronotum" or
+			def="InsectLeg"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="MorrowRim_KwamaScrib"]//*[
+			def="Shell" or
+			def="Pronotum" or
+			def="InsectHead" or
+			def="InsectMouth" or
+			def="InsectLeg"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- KwamaLeechLike -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="MorrowRim_KwamaLeechLike"]//*[
+			def="MorrowRim_LeechBody" or
+			def="Tail" or
+			def="Pronotum"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="MorrowRim_KwamaLeechLike"]//*[
+			def="MorrowRim_LeechBody" or
+			def="Tail" or
+			def="Pronotum" or
+			def="InsectHead" or
+			def="InsectMouth"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- KwamaWarrior -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="MorrowRim_KwamaWarrior"]//*[
+			def="Shell" or
+			def="Pronotum" or
+			def="MorrowRim_Insect_Arm" or
+			def="InsectLeg"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="MorrowRim_KwamaWarrior"]//*[
+			def="Shell" or
+			def="Pronotum" or
+			def="InsectHead" or
+			def="InsectMouth" or
+			def="MorrowRim_Insect_Arm" or
+			def="FrontClaw" or
+			def="InsectLeg"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- Quadrupedal Insect -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="MorrowRim_QuadrupedalInsect"]//*[
+			def="Shell" or
+			def="Pronotum"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="MorrowRim_QuadrupedalInsect"]//*[
+			def="Shell" or
+			def="Pronotum" or
+			def="InsectHead" or
+			def="InsectMouth" or
+			def="InsectLeg"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- Netcha -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="MorrowRim_Jelly"]//*[
+			def="MorrowRim_Netch_Shell"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="MorrowRim_Jelly"]//*[
+			def="Shell" or
+			def="Head" or
+			def="AnimalJaw"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- Flea-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="MorrowRim_Flea"]//*[
+			def="Shell" or
+			def="Pronotum" or
+			def="InsectLeg" or
+			def="InsectNostril"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="MorrowRim_Flea"]//*[
+			def="Shell" or
+			def="Pronotum" or
+			def="InsectNostril" or
+			def="InsectHead" or
+			def="InsectMouth" or
+			def="MorrowRim_Insect_Arm" or
+			def="InsectLeg"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- Tick-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="MorrowRim_Tick"]//*[
+			def="Shell" or
+			def="Pronotum" or
+			def="InsectLeg" or
+			def="InsectNostril"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="MorrowRim_Tick"]//*[
+			def="Shell" or
+			def="Pronotum" or
+			def="InsectNostril" or
+			def="InsectHead" or
+			def="InsectMouth" or
+			def="InsectLeg"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/MorrowRim/Patches/MorrowRim/Patch_Gasmasks.xml b/ModPatches/MorrowRim/Patches/MorrowRim/Patch_Gasmasks.xml
new file mode 100644
index 0000000000..712bdeefee
--- /dev/null
+++ b/ModPatches/MorrowRim/Patches/MorrowRim/Patch_Gasmasks.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="MorrowRim_RetchingNetchShell"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="CE_Apparel_GasMask"]</xpath>
+		<value>
+			<li Class="MorrowRim.ExtendedRaceProperties">
+				<ashResistant>Resistant</ashResistant>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="CE_Apparel_ImprovGasMask"]</xpath>
+		<value>
+			<li Class="MorrowRim.ExtendedRaceProperties">
+				<ashResistant>Resistant</ashResistant>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="MorrowRim_AshInEyes"]/stages/li/partEfficiencyOffset</xpath>
+		<value>
+			<partEfficiencyOffset>-0.5</partEfficiencyOffset>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Moyo Cartel/Defs/Moyo Cartel/Ammo/Ammo_Moyo.xml b/ModPatches/Moyo Cartel/Defs/Moyo Cartel/Ammo/Ammo_Moyo.xml
new file mode 100644
index 0000000000..6eb1b33032
--- /dev/null
+++ b/ModPatches/Moyo Cartel/Defs/Moyo Cartel/Ammo/Ammo_Moyo.xml	
@@ -0,0 +1,295 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- ==================== Cartel Specific Ammosets ========================== -->
+
+	<!--6x18 Moyo-->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_6x18mmCMoyo</defName>
+		<label>6x18mm Charged Bullet</label>
+		<ammoTypes>
+			<Ammo_6x18mmCharged>Bullet_6x18mmCMoyo</Ammo_6x18mmCharged>
+			<Ammo_6x18mmCharged_AP>Bullet_6x18mmCMoyo_AP</Ammo_6x18mmCharged_AP>
+			<Ammo_6x18mmCharged_Ion>Bullet_6x18mmCMoyo_Ion</Ammo_6x18mmCharged_Ion>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef ParentName="Base6x18mmChargedBullet">
+		<defName>Bullet_6x18mmCMoyo</defName>
+		<label>6x18mm Charged bullet</label>
+		<graphicData>
+			<texPath>Things/Weapons/MoyoCNeedleshot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>10</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>3</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>12</armorPenetrationSharp>
+			<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base6x18mmChargedBullet">
+		<defName>Bullet_6x18mmCMoyo_AP</defName>
+		<label>6x18mm Charged bullet (Conc.)</label>
+		<graphicData>
+			<texPath>Things/Weapons/MoyoCNeedleshot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>8</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>1</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>24</armorPenetrationSharp>
+			<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base6x18mmChargedBullet">
+		<defName>Bullet_6x18mmCMoyo_Ion</defName>
+		<label>6x18mm Charged bullet (Ion)</label>
+		<graphicData>
+			<texPath>Things/Weapons/MoyoCNeedleshot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>8</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>5</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>18</armorPenetrationSharp>
+			<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
+			<empShieldBreakChance>1</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<!--6x24 Moyo-->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_6x24mmCMoyo</defName>
+		<label>6x24mm Charged Bullet</label>
+		<ammoTypes>
+			<Ammo_6x24mmCharged>Bullet_6x24mmCMoyo</Ammo_6x24mmCharged>
+			<Ammo_6x24mmCharged_AP>Bullet_6x24mmCMoyo_AP</Ammo_6x24mmCharged_AP>
+			<Ammo_6x24mmCharged_Ion>Bullet_6x24mmCMoyo_Ion</Ammo_6x24mmCharged_Ion>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_6x24mmCMoyo</defName>
+		<label>6x24mm Charged bullet</label>
+		<graphicData>
+			<texPath>Things/Weapons/MoyoCNeedleshot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>13</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>4</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>15</armorPenetrationSharp>
+			<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_6x24mmCMoyo_AP</defName>
+		<label>6x24mm Charged bullet (Conc.)</label>
+		<graphicData>
+			<texPath>Things/Weapons/MoyoCNeedleshot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>10</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>2</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>30</armorPenetrationSharp>
+			<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_6x24mmCMoyo_Ion</defName>
+		<label>6x24mm Charged bullet (Ion)</label>
+		<graphicData>
+			<texPath>Things/Weapons/MoyoCNeedleshot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>10</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>6</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>22.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
+			<empShieldBreakChance>0.2</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+	<!--8x35 Moyo-->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_10x18mmCMoyo</defName>
+		<label>10x18mm Charged Bullet</label>
+		<ammoTypes>
+			<Ammo_10x18mmCharged>Bullet_10x18mmCMoyo</Ammo_10x18mmCharged>
+			<Ammo_10x18mmCharged_AP>Bullet_10x18mmCMoyo_AP</Ammo_10x18mmCharged_AP>
+			<Ammo_10x18mmCharged_Ion>Bullet_10x18mmCMoyo_Ion</Ammo_10x18mmCharged_Ion>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef ParentName="Base10x18mmChargedBullet">
+		<defName>Bullet_10x18mmCMoyo</defName>
+		<label>10x18mm Charged bullet</label>
+		<graphicData>
+			<texPath>Things/Weapons/MoyoCNeedleshot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>15</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>4</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>13</armorPenetrationSharp>
+			<armorPenetrationBlunt>22.56</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base10x18mmChargedBullet">
+		<defName>Bullet_10x18mmCMoyo_AP</defName>
+		<label>10x18mm Charged bullet (Conc.)</label>
+		<graphicData>
+			<texPath>Things/Weapons/MoyoCNeedleshot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>11</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>2</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>26</armorPenetrationSharp>
+			<armorPenetrationBlunt>22.56</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base10x18mmChargedBullet">
+		<defName>Bullet_10x18mmCMoyo_Ion</defName>
+		<label>10x18mm Charged bullet (Ion)</label>
+		<graphicData>
+			<texPath>Things/Weapons/MoyoCNeedleshot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>11</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>7</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>19.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>22.5</armorPenetrationBlunt>
+			<empShieldBreakChance>0.4</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<!--8x50 Moyo-->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_8x50mmCMoyo</defName>
+		<label>8x50mm Charged Bullet</label>
+		<ammoTypes>
+			<Ammo_8x50mmCharged>Bullet_8x50mmCMoyo</Ammo_8x50mmCharged>
+			<Ammo_8x50mmCharged_AP>Bullet_8x50mmCMoyo_AP</Ammo_8x50mmCharged_AP>
+			<Ammo_8x50mmCharged_Ion>Bullet_8x50mmCMoyo_Ion</Ammo_8x50mmCharged_Ion>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef ParentName="Base8x50mmChargedBullet">
+		<defName>Bullet_8x50mmCMoyo</defName>
+		<label>8x50mm Charged bullet</label>
+		<graphicData>
+			<texPath>Things/Weapons/MoyoCNeedleshot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>24</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>7</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>18</armorPenetrationSharp>
+			<armorPenetrationBlunt>120</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base8x50mmChargedBullet">
+		<defName>Bullet_8x50mmCMoyo_AP</defName>
+		<label>8x50mm Charged bullet (Conc.)</label>
+		<graphicData>
+			<texPath>Things/Weapons/MoyoCNeedleshot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>19</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>3</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>36</armorPenetrationSharp>
+			<armorPenetrationBlunt>120</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base8x50mmChargedBullet">
+		<defName>Bullet_8x50mmCMoyo_Ion</defName>
+		<label>8x50mm Charged bullet (Ion)</label>
+		<graphicData>
+			<texPath>Things/Weapons/MoyoCNeedleshot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>19</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>11</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>27</armorPenetrationSharp>
+			<armorPenetrationBlunt>120</armorPenetrationBlunt>
+			<empShieldBreakChance>1</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Moyo Cartel/Patches/Moyo Cartel/PawnKindDefs/Moyo_PawnKind.xml b/ModPatches/Moyo Cartel/Patches/Moyo Cartel/PawnKindDefs/Moyo_PawnKind.xml
new file mode 100644
index 0000000000..921b045025
--- /dev/null
+++ b/ModPatches/Moyo Cartel/Patches/Moyo Cartel/PawnKindDefs/Moyo_PawnKind.xml	
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Ammo-->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="Moyo_CartelTech" or
+			defName="Moyo_CartelSmuggler" or
+			defName="Moyo_CartelLabourer" or
+			defName="Moyo_CartelTrooper"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="CartelSoldierLight"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="CartelSoldierLight"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="CartelSniper"]</xpath>
+		<value>
+			<li Inherit="False" Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>500</min>
+						<max>1200</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>MoyoBasicGun</li>
+						<li>MoyoCartelBasicGun</li>
+					</weaponTags>
+					<magazineCount>
+						<min>1</min>
+						<max>2</max>
+					</magazineCount>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Backpack-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[
+			@Name="CartelSoldierLight" or
+			@Name="CartelSniper" or
+			defName="Moyo_CartelTrooper" or
+			defName="Moyo_CartelSmuggler"
+			]/apparelRequired </xpath>
+		<value>
+			<li>CE_Apparel_Backpack</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Moyo Cartel/Patches/Moyo Cartel/ThingDefs_Misc/Moyo_Apparel.xml b/ModPatches/Moyo Cartel/Patches/Moyo Cartel/ThingDefs_Misc/Moyo_Apparel.xml
new file mode 100644
index 0000000000..4fbcbeba57
--- /dev/null
+++ b/ModPatches/Moyo Cartel/Patches/Moyo Cartel/ThingDefs_Misc/Moyo_Apparel.xml	
@@ -0,0 +1,350 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--========= Fixed Armor Value =========-->
+
+	<!--Ballistic Suit-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_CBsuit"]/statBases</xpath>
+		<value>
+			<Bulk>25</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_CBsuit"]/statBases/Mass</xpath>
+		<value>
+			<Mass>12</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_CBsuit"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>175</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_CBsuit"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>11.25</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.15</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_CBsuit"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>16.875</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Moyo_CBsuit"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+							<li>Leg</li>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+							<li>Leg</li>
+							<li>Arm</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Ballistic Helmet-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_CBhelmet"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_CBhelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>100</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_CBhelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.15</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_CBhelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Evasuit-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_Cartelsuit"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_Cartelsuit"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.15</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_Cartelsuit"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_Cartelsuit"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<!--Evasuit-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_CartelStrikerHood"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_CartelStrikerHood"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.30</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_CartelStrikerHood"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Strike Armor-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_CSgear"]/statBases</xpath>
+		<value>
+			<Bulk>80</Bulk>
+			<WornBulk>8</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_CSgear"]/statBases/Mass</xpath>
+		<value>
+			<Mass>30</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_CSgear"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.30</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_CSgear"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>35</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_CSgear"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_CSgear"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>40</CarryWeight>
+				<CarryBulk>20</CarryBulk>
+				<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+				<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+				<MoveSpeed>0.3</MoveSpeed>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_CSgear"]/costList/Moyo_Abyssteel</xpath>
+		<value>
+			<Moyo_Abyssteel>115</Moyo_Abyssteel>
+			<DevilstrandCloth>10</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Moyo_CSgear"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Strike Helmet-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_CShelmet"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_CShelmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>2</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_CShelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.30</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_CShelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>40</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_CShelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Moyo_CShelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Moyo_CShelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_CShelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_CShelmet"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<AimingAccuracy>0.15</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_CShelmet"]/costList/Moyo_Abyssteel</xpath>
+		<value>
+			<Moyo_Abyssteel>55</Moyo_Abyssteel>
+			<DevilstrandCloth>10</DevilstrandCloth>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Moyo Cartel/Patches/Moyo Cartel/ThingDefs_Misc/Moyo_Royal_Apparel.xml b/ModPatches/Moyo Cartel/Patches/Moyo Cartel/ThingDefs_Misc/Moyo_Royal_Apparel.xml
new file mode 100644
index 0000000000..1c749f8a27
--- /dev/null
+++ b/ModPatches/Moyo Cartel/Patches/Moyo Cartel/ThingDefs_Misc/Moyo_Royal_Apparel.xml	
@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Royal suit-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_CartelRoyalsuit"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_CartelRoyalsuit"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3.5</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.40</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_CartelRoyalsuit"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>5.25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_CartelRoyalsuit"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<!--Royal Robe-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="Moyo_CartelRobeBase"]/statBases</xpath>
+		<value>
+			<Bulk>7.5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Moyo_CartelRobeBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.60</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Moyo_CartelRobeBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Cartel Executioner Helmet-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_CEhelmet"]/statBases/MarketValue</xpath>
+		<value>
+			<MarketValue>1745</MarketValue>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_CEhelmet"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>4</WornBulk>
+			<NightVisionEfficiency_Apparel>0.8</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_CEhelmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>7</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_CEhelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>22</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.55</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_CEhelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>64</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_CEhelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Moyo_CEhelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Moyo_CEhelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_CEhelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_CEhelmet"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>0.75</ShootingAccuracyPawn>
+			<AimingAccuracy>0.50</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!--Cartel Executioner Armor-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_CEsuit"]/statBases/MarketValue</xpath>
+		<value>
+			<MarketValue>4435</MarketValue>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_CEsuit"]/statBases</xpath>
+		<value>
+			<Bulk>80</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_CEsuit"]/statBases/Mass</xpath>
+		<value>
+			<Mass>30</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_CEsuit"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.30</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_CEsuit"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_CEsuit"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_CEsuit"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>80</CarryWeight>
+			<CarryBulk>30</CarryBulk>
+			<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Moyo_CEsuit"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Moyo Cartel/Patches/Moyo Cartel/ThingDefs_Misc/Weapons.xml b/ModPatches/Moyo Cartel/Patches/Moyo Cartel/ThingDefs_Misc/Weapons.xml
new file mode 100644
index 0000000000..995c6fcbcc
--- /dev/null
+++ b/ModPatches/Moyo Cartel/Patches/Moyo Cartel/ThingDefs_Misc/Weapons.xml	
@@ -0,0 +1,469 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==========  Moyo Knife  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_CombatKnife"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.01</cooldownTime>
+					<chanceFactor>0.4</chanceFactor>
+					<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.36</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>0.30</armorPenetrationBlunt>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.23</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.2</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_CombatKnife"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.39</MeleeCounterParryBonus>
+			<Bulk>1.5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_CombatKnife"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.16</MeleeCritChance>
+				<MeleeParryChance>0.24</MeleeParryChance>
+				<MeleeDodgeChance>1.07</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- ==========  Moyo Vibrokatana  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_Katana"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>46</power>
+					<cooldownTime>1.03</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
+					<armorPenetrationSharp>23.44</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>0.98</cooldownTime>
+					<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
+					<armorPenetrationSharp>25</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_Katana"]/statBases</xpath>
+		<value>
+			<Bulk>8.5</Bulk>
+			<MeleeCounterParryBonus>0.80</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_Katana"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.00</MeleeCritChance>
+				<MeleeParryChance>0.60</MeleeParryChance>
+				<MeleeDodgeChance>0.40</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- ========== Charge Pistol =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Moyo_CartelPistol</defName>
+		<statBases>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.08</SwayFactor>
+			<Bulk>2.45</Bulk>
+			<Mass>0.8</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>2.47</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x18mmCMoyo</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<burstShotCount>2</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<range>15</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_6x18mmCMoyo</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_Pistol"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Charge Revolver =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Moyo_CartelRevolver</defName>
+		<statBases>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.75</SwayFactor>
+			<Bulk>3.25</Bulk>
+			<Mass>2.00</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_10x18mmCMoyo</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>21</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>5.1</reloadTime>
+			<ammoSet>AmmoSet_10x18mmCMoyo</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_Pistol"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Charge SMG =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Moyo_CartelSMGa</defName>
+		<statBases>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.94</SwayFactor>
+			<Bulk>6.25</Bulk>
+			<Mass>3.10</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>1.24</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x18mmCMoyo</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<range>31</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>42</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_6x18mmCMoyo</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Charge Carbine =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Moyo_CarteCarbine</defName>
+		<statBases>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.19</SwayFactor>
+			<Bulk>8.80</Bulk>
+			<Mass>3.10</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>0.14</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmCMoyo</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<range>61</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_6x24mmCMoyo</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Charge Precision Rifle =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Moyo_CartelLongRifle</defName>
+		<statBases>
+			<SightsEfficiency>5.00</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>2.04</SwayFactor>
+			<Bulk>11.00</Bulk>
+			<Mass>8.1</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x50mmCMoyo</defaultProjectile>
+			<warmupTime>2.7</warmupTime>
+			<range>86</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_8x50mmCMoyo</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Melee Attacks =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_CartelLongRifle" or
+			defName="Moyo_CarteCarbine" or
+			defName="Moyo_CartelSMGa"
+			]/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="Moyo_CartelPistol" or
+			defName="Moyo_CartelRevolver"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Persona : Royalty Only-->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Moyo_PersonaKatana"]</xpath>
+		<match Class="PatchOperationSequence">
+			<operations>
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Moyo_PersonaKatana"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>handle</label>
+								<capacities>
+									<li>Poke</li>
+								</capacities>
+								<power>2</power>
+								<cooldownTime>1.5</cooldownTime>
+								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>edge</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>50</power>
+								<cooldownTime>1.03</cooldownTime>
+								<chanceFactor>1.33</chanceFactor>
+								<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
+								<armorPenetrationSharp>28</armorPenetrationSharp>
+								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>point</label>
+								<capacities>
+									<li>Stab</li>
+								</capacities>
+								<power>28</power>
+								<cooldownTime>0.98</cooldownTime>
+								<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
+								<armorPenetrationSharp>36.29</armorPenetrationSharp>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="Moyo_PersonaKatana"]/statBases</xpath>
+					<value>
+						<Bulk>8.5</Bulk>
+						<MeleeCounterParryBonus>0.90</MeleeCounterParryBonus>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="Moyo_PersonaKatana"]</xpath>
+					<value>
+						<equippedStatOffsets>
+							<MeleeCritChance>1.10</MeleeCritChance>
+							<MeleeParryChance>0.70</MeleeParryChance>
+							<MeleeDodgeChance>0.50</MeleeDodgeChance>
+						</equippedStatOffsets>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Moyo from the depth/Defs/Moyo from the depth/Ammo_Moyo.xml b/ModPatches/Moyo from the depth/Defs/Moyo from the depth/Ammo_Moyo.xml
new file mode 100644
index 0000000000..980f9dc226
--- /dev/null
+++ b/ModPatches/Moyo from the depth/Defs/Moyo from the depth/Ammo_Moyo.xml	
@@ -0,0 +1,678 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ==================== Boltcaster ========================== -->
+
+	<!-- ==================== AmmoSets ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_MoyoBallista</defName>
+		<label>Moyo charge bolt</label>
+		<ammoTypes>
+			<Ammo_MoyoBallista>Bullet_MoyoBallista</Ammo_MoyoBallista>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>MoyoBolt</defName>
+		<label>Charged Ion Bolt</label>
+		<description>High velocity charged bolt.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerAmmoBase">
+		<defName>Ammo_MoyoBallista</defName>
+		<label>Moyo charge bolt</label>
+		<description>High power ion charge bolt for use against heavy targets such as mechanoids or power armor.</description>
+		<statBases>
+			<Mass>1.92</Mass>
+			<Bulk>2.87</Bulk>
+			<MarketValue>27.22</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoAdvanced</li>
+		</thingCategories>
+		<stackLimit>100</stackLimit>
+		<graphicData>
+			<texPath>Things/Ammo/Railgun/HighCaliber</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>MoyoBolt</ammoClass>
+		<comps>
+			<!-- Arbitarily defined cookoff explosive stats; represents power cells detonating -->
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>20</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>2</Fragment_Large>
+					<Fragment_Small>10</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_MoyoBallista</defName>
+		<label>moyo heavy chargebolt</label>
+		<graphicData>
+			<texPath>Things/Weapons/MoyoBolt</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>1.5</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>500</speed>
+			<damageDef>Moyo_ChargeBolt</damageDef>
+			<damageAmountBase>100</damageAmountBase>
+			<armorPenetrationSharp>125</armorPenetrationSharp>
+			<armorPenetrationBlunt>7500</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>60</damageAmountBase>
+				<explosiveDamageType>EMP</explosiveDamageType>
+				<explosiveRadius>1</explosiveRadius>
+				<explosionSound>Explosion_EMP</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_MoyoBallista</defName>
+		<label>make Moyo charge bolts x25</label>
+		<description>Craft 25 Moyo charge bolts.</description>
+		<jobString>Making Moyo charge bolts.</jobString>
+		<workAmount>21000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>90</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Plasteel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_MoyoBallista>25</Ammo_MoyoBallista>
+		</products>
+	</RecipeDef>
+
+	<!-- ==================== Cryoblaster ========================== -->
+
+	<!-- ==================== AmmoSets ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Cryoblaster</defName>
+		<label>Moyo Cryocell</label>
+		<ammoTypes>
+			<Ammo_MoyoCryocell>Bullet_MoyoCryocell</Ammo_MoyoCryocell>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_CryoRifle</defName>
+		<label>Moyo Cryocell</label>
+		<ammoTypes>
+			<Ammo_MoyoCryocell>Bullet_MoyoCryocannon</Ammo_MoyoCryocell>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>MoyoCryo</defName>
+		<label>Cryo Cell</label>
+		<description>Cryo fuel cell.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_MoyoCryocell</defName>
+		<label>Moyo cryocell</label>
+		<description>Weaponized cryofreezing cell for Moyo cryotech weapons.</description>
+		<statBases>
+			<Mass>0.02</Mass>
+			<Bulk>0.01</Bulk>
+			<MarketValue>1.56</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoAdvanced</li>
+		</thingCategories>
+		<stackLimit>2000</stackLimit>
+		<graphicData>
+			<texPath>Things/Ammo/FuelCell/Foam</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<ammoClass>MoyoCryo</ammoClass>
+		<comps>
+			<!-- Cell failure releases cryoblast at 1/4 efficency -->
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>2</damageAmountBase>
+				<explosiveDamageType>Moyo_Cryo</explosiveDamageType>
+				<explosiveRadius>0.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="BaseFlamethrowerBullet">
+		<defName>Bullet_MoyoCryocell</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>moyo cryoblast</label>
+		<graphicData>
+			<texPath>Things/Weapons/MoyoCBBlast2</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>1.5</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Moyo_Cryo</damageDef>
+			<speed>20</speed>
+			<damageAmountBase>4</damageAmountBase>
+			<soundExplode>MoyoCryoShatter</soundExplode>
+			<explosionRadius>1.4</explosionRadius>
+			<ai_IsIncendiary>false</ai_IsIncendiary>
+			<gravityFactor>1.5</gravityFactor>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseFlamethrowerBullet">
+		<defName>Bullet_MoyoCryocannon</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>moyo cryoblast</label>
+		<graphicData>
+			<texPath>Things/Weapons/MoyoCBBlast3</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>1.5</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Moyo_Cryo</damageDef>
+			<speed>90</speed>
+			<damageAmountBase>60</damageAmountBase>
+			<soundExplode>MoyoCryoShatter</soundExplode>
+			<explosionRadius>3.5</explosionRadius>
+			<ai_IsIncendiary>false</ai_IsIncendiary>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_MoyoCryocell</defName>
+		<label>make Moyo cryocells x500</label>
+		<description>Craft 500 Moyo cryocells.</description>
+		<jobString>Making Moyo cryocells.</jobString>
+		<workAmount>7000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>30</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Plasteel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_MoyoCryocell>500</Ammo_MoyoCryocell>
+		</products>
+	</RecipeDef>
+
+
+	<!-- ==================== Abysteel Nail ========================== -->
+
+	<!-- ==================== AmmoSets ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Abyssnail</defName>
+		<label>Moyo alloy nail</label>
+		<ammoTypes>
+			<Ammo_Abyssnail>Bullet_Abyssnail</Ammo_Abyssnail>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>MoyoNail</defName>
+		<label>Nail</label>
+		<description>High velocity alloy nail.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_Abyssnail</defName>
+		<label>Abyssal Nail</label>
+		<description>Machined alloy nails.</description>
+		<statBases>
+			<Mass>0.02</Mass>
+			<Bulk>0.01</Bulk>
+			<MarketValue>0.05</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoAdvanced</li>
+		</thingCategories>
+		<stackLimit>500</stackLimit>
+		<graphicData>
+			<texPath>Things/Ammo/Railgun/Pistol</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>MoyoNail</ammoClass>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_Abyssnail</defName>
+		<label>abyssal nail</label>
+		<graphicData>
+			<texPath>Things/Weapons/MoyoNail</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>1</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>200</speed>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>5</damageAmountBase>
+			<armorPenetrationSharp>11</armorPenetrationSharp>
+			<armorPenetrationBlunt>8</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_Abyssnail</defName>
+		<label>make abyssal nails x500</label>
+		<description>Craft 500 abyssal nails.</description>
+		<jobString>Making abyssal nails.</jobString>
+		<workAmount>2500</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Abyssnail>500</Ammo_Abyssnail>
+		</products>
+	</RecipeDef>
+
+	<!-- ==================== Moyo Specific Ammosets ========================== -->
+
+	<!--6x18 Moyo-->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_6x18mmMoyo</defName>
+		<label>6x18mm Charged Bullet</label>
+		<ammoTypes>
+			<Ammo_6x18mmCharged>Bullet_6x18mmMoyo</Ammo_6x18mmCharged>
+			<Ammo_6x18mmCharged_AP>Bullet_6x18mmMoyo_AP</Ammo_6x18mmCharged_AP>
+			<Ammo_6x18mmCharged_Ion>Bullet_6x18mmMoyo_Ion</Ammo_6x18mmCharged_Ion>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+
+	<ThingDef ParentName="Base6x18mmChargedBullet">
+		<defName>Bullet_6x18mmMoyo</defName>
+		<label>6x18mm Charged bullet</label>
+		<graphicData>
+			<texPath>Things/Weapons/MoyoSmallBolt</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>10</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>3</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>12</armorPenetrationSharp>
+			<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base6x18mmChargedBullet">
+		<defName>Bullet_6x18mmMoyo_AP</defName>
+		<label>6x18mm Charged bullet (Conc.)</label>
+		<graphicData>
+			<texPath>Things/Weapons/MoyoSmallBolt</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>8</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>1</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>24</armorPenetrationSharp>
+			<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base6x18mmChargedBullet">
+		<defName>Bullet_6x18mmMoyo_Ion</defName>
+		<label>6x18mm Charged bullet (Ion)</label>
+		<graphicData>
+			<texPath>Things/Weapons/MoyoSmallBolt</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>8</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>5</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>18</armorPenetrationSharp>
+			<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
+			<empShieldBreakChance>1</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<!--6x24 Moyo-->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_6x24mmMoyo</defName>
+		<label>6x24mm Charged Bullet</label>
+		<ammoTypes>
+			<Ammo_6x24mmCharged>Bullet_6x24mmMoyo</Ammo_6x24mmCharged>
+			<Ammo_6x24mmCharged_AP>Bullet_6x24mmMoyo_AP</Ammo_6x24mmCharged_AP>
+			<Ammo_6x24mmCharged_Ion>Bullet_6x24mmMoyo_Ion</Ammo_6x24mmCharged_Ion>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_6x24mmMoyo</defName>
+		<label>6x24mm Charged bullet</label>
+		<graphicData>
+			<texPath>Things/Weapons/MoyoSmallBolt</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>13</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>4</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>15</armorPenetrationSharp>
+			<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_6x24mmMoyo_AP</defName>
+		<label>6x24mm Charged bullet (Conc.)</label>
+		<graphicData>
+			<texPath>Things/Weapons/MoyoSmallBolt</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>10</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>2</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>30</armorPenetrationSharp>
+			<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_6x24mmMoyo_Ion</defName>
+		<label>6x24mm Charged bullet (Ion)</label>
+		<graphicData>
+			<texPath>Things/Weapons/MoyoSmallBolt</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>10</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>6</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>22.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
+			<empShieldBreakChance>0.2</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<!--8x35 Moyo-->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_8x35mmMoyo</defName>
+		<label>8x35mm Charged Bullet</label>
+		<ammoTypes>
+			<Ammo_8x35mmCharged>Bullet_8x35mmMoyo</Ammo_8x35mmCharged>
+			<Ammo_8x35mmCharged_AP>Bullet_8x35mmMoyo_AP</Ammo_8x35mmCharged_AP>
+			<Ammo_8x35mmCharged_Ion>Bullet_8x35mmMoyo_Ion</Ammo_8x35mmCharged_Ion>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+
+	<ThingDef ParentName="Base8x35mmChargedBullet">
+		<defName>Bullet_8x35mmMoyo</defName>
+		<label>8x35mm Charged bullet</label>
+		<graphicData>
+			<texPath>Things/Weapons/MoyoSmallBolt</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>19</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>6</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>15</armorPenetrationSharp>
+			<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base8x35mmChargedBullet">
+		<defName>Bullet_8x35mmMoyo_AP</defName>
+		<label>8x35mm Charged bullet (Conc.)</label>
+		<graphicData>
+			<texPath>Things/Weapons/MoyoSmallBolt</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>15</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>2</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>30</armorPenetrationSharp>
+			<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base8x35mmChargedBullet">
+		<defName>Bullet_8x35mmMoyo_Ion</defName>
+		<label>8x35mm Charged bullet (Ion)</label>
+		<graphicData>
+			<texPath>Things/Weapons/MoyoSmallBolt</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>15</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>9</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>22.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
+			<empShieldBreakChance>0.2</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+
+	<!--8x50 Moyo-->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_8x50mmMoyo</defName>
+		<label>8x50mm Charged Bullet</label>
+		<ammoTypes>
+			<Ammo_8x50mmCharged>Bullet_8x50mmMoyo</Ammo_8x50mmCharged>
+			<Ammo_8x50mmCharged_AP>Bullet_8x50mmMoyo_AP</Ammo_8x50mmCharged_AP>
+			<Ammo_8x50mmCharged_Ion>Bullet_8x50mmMoyo_Ion</Ammo_8x50mmCharged_Ion>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+
+	<ThingDef ParentName="Base8x50mmChargedBullet">
+		<defName>Bullet_8x50mmMoyo</defName>
+		<label>8x50mm Charged bullet</label>
+		<graphicData>
+			<texPath>Things/Weapons/MoyoSmallBolt</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>24</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>7</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>18</armorPenetrationSharp>
+			<armorPenetrationBlunt>120</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base8x50mmChargedBullet">
+		<defName>Bullet_8x50mmMoyo_AP</defName>
+		<label>8x50mm Charged bullet (Conc.)</label>
+		<graphicData>
+			<texPath>Things/Weapons/MoyoSmallBolt</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>19</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>3</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>36</armorPenetrationSharp>
+			<armorPenetrationBlunt>120</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base8x50mmChargedBullet">
+		<defName>Bullet_8x50mmMoyo_Ion</defName>
+		<label>8x50mm Charged bullet (Ion)</label>
+		<graphicData>
+			<texPath>Things/Weapons/MoyoSmallBolt</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>19</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>11</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>27</armorPenetrationSharp>
+			<armorPenetrationBlunt>120</armorPenetrationBlunt>
+			<empShieldBreakChance>1</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Moyo from the depth/Patches/Moyo from the depth/Bodies/Bodies_Moyo_Mech.xml b/ModPatches/Moyo from the depth/Patches/Moyo from the depth/Bodies/Bodies_Moyo_Mech.xml
new file mode 100644
index 0000000000..1c614bfcac
--- /dev/null
+++ b/ModPatches/Moyo from the depth/Patches/Moyo from the depth/Bodies/Bodies_Moyo_Mech.xml	
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Scorpion === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Moyo_Hexapod"]//*[
+			def="Hexapod_TentacleJoint"]
+		</xpath>
+
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Moyo_Hexapod"]//*[
+			def="HexapodHeadShell" or
+			def="Hexapod_TentacleJoint" or
+			def="Hexapod_Tentacle"
+			]/groups
+		</xpath>
+
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- === Scorpion === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Moyo_Pressurepod"]//*[
+			def="PressurePod_Seg1" or
+			def="pressurepod_ArmJoint" or
+			def="pressurepod_Leg" or
+			def="PressurePod_Seg2" or
+			def="PressurePod_Seg3" or
+			def="PressurePod_Seg4" or
+			def="PressurePod_Seg5"]
+		</xpath>
+
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Moyo_Pressurepod"]//*[
+			def="PressurePod_Seg1" or
+			def="pressurepod_ArmJoint" or
+			def="pressurepod_Leg" or
+			def="PressurePod_Seg2" or
+			def="PressurePod_Seg3" or
+			def="PressurePod_Seg4" or
+			def="PressurePod_Seg5" or
+			def="MechanicalHead" or
+			def="pressurepod_club"]/groups
+		</xpath>
+
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Moyo from the depth/Patches/Moyo from the depth/Bodies/Moyo_Bodytype.xml b/ModPatches/Moyo from the depth/Patches/Moyo from the depth/Bodies/Moyo_Bodytype.xml
new file mode 100644
index 0000000000..193fb6257b
--- /dev/null
+++ b/ModPatches/Moyo from the depth/Patches/Moyo from the depth/Bodies/Moyo_Bodytype.xml	
@@ -0,0 +1,256 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Moyo Bodytype-->
+
+	<!--Arm Groups-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<!--Natural Armor-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Moyo"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Moyo_Tail"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- Changing coverage of the bodyDef (should've done this sooner, but eh) -->
+	<!-- why yes dear explorer of this file, i did just literally copy and paste the Moyo bodytype patches -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Ribcage"]/coverage</xpath>
+		<value>
+			<coverage>0.07</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Pelvis"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Stomach"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="MoyoHeart"]/coverage</xpath>
+		<value>
+			<coverage>0.04</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Lung"]/coverage</xpath>
+		<value>
+			<coverage>0.055</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Kidney"]/coverage</xpath>
+		<value>
+			<coverage>0.03</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Liver"]/coverage</xpath>
+		<value>
+			<coverage>0.06</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Neck"]/coverage</xpath>
+		<value>
+			<coverage>0.055</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Skull"]/parts/li[def="Brain"]/coverage</xpath>
+		<value>
+			<coverage>0.9</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Eye"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/coverage</xpath>
+		<value>
+			<coverage>0.08</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Shoulder"]/coverage</xpath>
+		<value>
+			<coverage>0.085</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Clavicle"]/coverage</xpath>
+		<value>
+			<coverage>0.06</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Humerus"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Radius"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Leg"]/parts/li[def="Femur"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Leg"]/parts/li[def="Tibia"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Moyo"]//*[
+			def="Jaw" or
+			def="Nose" or
+			def="Eye"]/groups
+		</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Moyo from the depth/Patches/Moyo from the depth/Drugs/Belial-V_Effect.xml b/ModPatches/Moyo from the depth/Patches/Moyo from the depth/Drugs/Belial-V_Effect.xml
new file mode 100644
index 0000000000..42278922ec
--- /dev/null
+++ b/ModPatches/Moyo from the depth/Patches/Moyo from the depth/Drugs/Belial-V_Effect.xml	
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BelialVEffect_4"]/stages/li[1]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BelialVEffect_4"]/stages/li[1]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BelialVEffect_4U"]/stages/li[1]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.75</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.20</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BelialVEffect_4U"]/stages/li[1]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="BelialVEffect_5"]/stages/li[1]/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.25</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BelialVEffect_7"]/stages/li[1]/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>0.3</ShootingAccuracyPawn>
+			<AimingAccuracy>0.15</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BelialVEffect_7U"]/stages/li[1]/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>0.6</ShootingAccuracyPawn>
+			<AimingAccuracy>0.3</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="BelialVEffect_3"]/stages/li[1]</xpath>
+		<value>
+			<statOffsets>
+				<NightVisionEfficiency>0.20</NightVisionEfficiency>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="BelialVEffect_3U"]/stages/li[1]/statOffsets</xpath>
+		<value>
+			<NightVisionEfficiency>0.60</NightVisionEfficiency>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Moyo from the depth/Patches/Moyo from the depth/Drugs/Deepblue_splicing.xml b/ModPatches/Moyo from the depth/Patches/Moyo from the depth/Drugs/Deepblue_splicing.xml
new file mode 100644
index 0000000000..6ece21b22e
--- /dev/null
+++ b/ModPatches/Moyo from the depth/Patches/Moyo from the depth/Drugs/Deepblue_splicing.xml	
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="BlueYoHigh"]/stages/li[1]</xpath>
+		<value>
+			<statOffsets>
+				<Suppressability>-0.5</Suppressability>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="BlueGoHigh"]/stages/li[1]</xpath>
+		<value>
+			<statOffsets>
+				<Suppressability>-0.5</Suppressability>
+			</statOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Moyo from the depth/Patches/Moyo from the depth/PawnKindDefs/Moyo_PawnKind.xml b/ModPatches/Moyo from the depth/Patches/Moyo from the depth/PawnKindDefs/Moyo_PawnKind.xml
new file mode 100644
index 0000000000..29a95d71e5
--- /dev/null
+++ b/ModPatches/Moyo from the depth/Patches/Moyo from the depth/PawnKindDefs/Moyo_PawnKind.xml	
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Ammo-->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="Moyo_TopCivilan" or
+			defName="Moyo_MiddleCivilan" or
+			defName="Moyo_BottomCivilan" or
+			defName="Moyo_Resercher" or
+			defName="Moyo_TopSmuggler" or
+			defName="Moyo_MiddleSmuggler" or
+			@Name="MoyoSoldierLight" or
+			@Name="MoyoSoliderStandard" or
+			defName="Moyo_leader" or
+			@Name="MoyoGuardian" or
+			@Name="MoyoGuardianAssault" or
+			@Name="MoyoGeneral"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="MoyoSoldierHeavy"]</xpath>
+		<value>
+			<li Inherit="False" Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>3</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>500</min>
+						<max>1200</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>MoyoBasicGun</li>
+						<li>Moyo_SpacerLightGun</li>
+					</weaponTags>
+					<magazineCount>
+						<min>3</min>
+						<max>4</max>
+					</magazineCount>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Backpack-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[
+			@Name="MoyoSoldierLight" or
+			@Name="MoyoSoliderStandard" or
+			@Name="MoyoSoldierHeavy" or
+			@Name="MoyoSoldierAssult" or
+			@Name="MoyoGuardian" or
+			@Name="MoyoGuardianAssault" or
+			@Name="MoyoGeneral" or
+			defName="Moyo_Engineer" or
+			defName="Moyo_Resercher" or
+			defName="Moyo_MiddleSmuggler"
+			]/apparelRequired </xpath>
+		<value>
+			<li>CE_Apparel_Backpack</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CE_Apparel_Backpack"]/apparel/tags</xpath>
+		<value>
+			<li>Moyo_Industrial</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CE_Apparel_KidBackpack"]/apparel/tags</xpath>
+		<value>
+			<li>Moyo_Industrial</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CE_Apparel_TribalBackpack"]/apparel/tags</xpath>
+		<value>
+			<li>Moyo_Neolithic</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Moyo from the depth/Patches/Moyo from the depth/Scenario/Moyo_Scenario.xml b/ModPatches/Moyo from the depth/Patches/Moyo from the depth/Scenario/Moyo_Scenario.xml
new file mode 100644
index 0000000000..17024696ae
--- /dev/null
+++ b/ModPatches/Moyo from the depth/Patches/Moyo from the depth/Scenario/Moyo_Scenario.xml	
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="Moyo_RefugeeScenario"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_6x18mmCharged</thingDef>
+				<count>216</count>
+			</li>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_Abyssnail</thingDef>
+				<count>240</count>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Add material filter to faction for MIB type events-->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/FactionDef[@Name="Moyo_PlayerBase"]/apparelStuffFilter</xpath>
+		<match Class="PatchOperationConditional">
+			<xpath>Defs/FactionDef[@Name="Moyo_PlayerBase"]/apparelStuffFilter/thingDefs</xpath>
+			<match Class="PatchOperationConditional">
+				<xpath>Defs/FactionDef[@Name="Moyo_PlayerBase"]/apparelStuffFilter/thingDefs/li["Steel"]</xpath>
+				<match Class="PatchOperationReplace">
+					<xpath>Defs/FactionDef[@Name="Moyo_PlayerBase"]/apparelStuffFilter/thingDefs/li["Steel"]</xpath>
+					<value>
+						<li>Steel</li>
+					</value>
+				</match>
+				<nomatch Class="PatchOperationAdd">
+					<xpath>Defs/FactionDef[@Name="Moyo_PlayerBase"]/apparelStuffFilter/thingDefs</xpath>
+					<value>
+						<li>Steel</li>
+					</value>
+				</nomatch>
+			</match>
+			<nomatch Class="PatchOperationAdd">
+				<xpath>Defs/FactionDef[@Name="Moyo_PlayerBase"]/apparelStuffFilter</xpath>
+				<value>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</value>
+			</nomatch>
+		</match>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/FactionDef[@Name="Moyo_PlayerBase"]</xpath>
+			<value>
+				<apparelStuffFilter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</apparelStuffFilter>
+			</value>
+		</nomatch>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Moyo from the depth/Patches/Moyo from the depth/ThingDefs_Items/Items_Resources.xml b/ModPatches/Moyo from the depth/Patches/Moyo from the depth/ThingDefs_Items/Items_Resources.xml
new file mode 100644
index 0000000000..7c22aae4e1
--- /dev/null
+++ b/ModPatches/Moyo from the depth/Patches/Moyo from the depth/ThingDefs_Items/Items_Resources.xml	
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==========  Abyssteel  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_Abyssteel"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>2</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_Abyssteel"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>3.5</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_Abyssteel"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
+			<StuffPower_Armor_Electric>0.05</StuffPower_Armor_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_Abyssteel"]/stuffProps/categories</xpath>
+		<value>
+			<li>Metallic_Weapon</li>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<!-- ==========  Depthweave  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_Depthweave"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.25</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_Depthweave"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.08</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_Depthweave"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.025</StuffPower_Armor_Heat>
+			<StuffPower_Armor_Electric>0.025</StuffPower_Armor_Electric>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Moyo from the depth/Patches/Moyo from the depth/ThingDefs_Misc/Moyo_Apparel.xml b/ModPatches/Moyo from the depth/Patches/Moyo from the depth/ThingDefs_Misc/Moyo_Apparel.xml
new file mode 100644
index 0000000000..33d29a479d
--- /dev/null
+++ b/ModPatches/Moyo from the depth/Patches/Moyo from the depth/ThingDefs_Misc/Moyo_Apparel.xml	
@@ -0,0 +1,646 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--========= Stuffable =========-->
+
+	<!--Tribalwear-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_Tribal"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!--Shirt And boots-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_SnB"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.75</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!--Straps-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_BodyStrap"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!--Parka-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_Parka"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_Parka"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!--Jacket/Duster-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_Jacket"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_Duster"]/statBases</xpath>
+		<value>
+			<Bulk>7.5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_Jacket" or
+			defName="Moyo_Duster"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!--Cowboy/Bowler/Tuque-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_Tuque" or
+			defName="Moyo_CowboyHat" or
+			defName="Moyo_BowlerHat"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_Tuque" or
+			defName="Moyo_CowboyHat" or
+			defName="Moyo_BowlerHat"]/apparel/layers </xpath>
+		<value>
+			<layers>
+				<li>Overhead</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<!--========= Fixed Armor Value =========-->
+
+	<!--Bodysuit-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_Bodysuit"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_Bodysuit"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.15</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_Bodysuit"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_Bodysuit"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<!--Engineering Suit-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_EGsuit"]/statBases</xpath>
+		<value>
+			<Bulk>25</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_EGsuit"]/statBases/Mass</xpath>
+		<value>
+			<Mass>12</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_EGsuit"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>175</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_EGsuit"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6.5</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.45</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_EGsuit"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>9.75</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Engineering Mask-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_EGmask"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.1</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_EGmask"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>100</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_EGmask"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.25</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_EGmask"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_EGmask"]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>OnHead</li>
+				<li>StrappedHead</li>
+				<li>Overhead</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<!--Suppressive Mask-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_PShelmet" or defName="Moyo_SShelmet"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.4</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_PShelmet" or defName="Moyo_SShelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.25</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_PShelmet" or defName="Moyo_SShelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Evasuit-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_Evasuit"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_Evasuit"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.30</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_Evasuit"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_Evasuit"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<!--Deepdiving Gear-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_DDgear"]/statBases</xpath>
+		<value>
+			<Bulk>125</Bulk>
+			<WornBulk>20</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_DDgear"]/statBases/Mass</xpath>
+		<value>
+			<Mass>75</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_DDgear"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.60</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_DDgear"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>64</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_DDgear"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_DDgear"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>85</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_DDgear"]/costList/Moyo_Abyssteel</xpath>
+		<value>
+			<Moyo_Abyssteel>190</Moyo_Abyssteel>
+			<DevilstrandCloth>40</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="Moyo_PowerArmorBase"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Moyo_DDgear"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+							<li>Leg</li>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+							<li>Leg</li>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Deepdiving Helmet-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_DDhelmet"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>3</WornBulk>
+			<NightVisionEfficiency_Apparel>0.4</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_DDhelmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>5</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_DDhelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.55</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_DDhelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>64</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_DDhelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Moyo_DDhelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Moyo_DDhelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_DDhelmet"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_DDhelmet"]/costList/Moyo_Abyssteel</xpath>
+		<value>
+			<Moyo_Abyssteel>60</Moyo_Abyssteel>
+			<DevilstrandCloth>20</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Moyo_PowerHelmetBase"]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>OnHead</li>
+				<li>StrappedHead</li>
+				<li>Overhead</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<!--Diving Gear-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_LDgear"]/statBases</xpath>
+		<value>
+			<Bulk>125</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_LDgear"]/statBases/Mass</xpath>
+		<value>
+			<Mass>60</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_LDgear"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.50</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_LDgear"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>50</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_LDgear"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_LDgear"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>75</CarryWeight>
+				<CarryBulk>10</CarryBulk>
+				<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_LDgear"]/costList/Moyo_Abyssteel</xpath>
+		<value>
+			<Moyo_Abyssteel>150</Moyo_Abyssteel>
+			<DevilstrandCloth>30</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Moyo_LDgear"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Diving Helmet-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_LDhelmet"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>2</WornBulk>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_LDhelmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>1.5</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_LDhelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.35</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_LDhelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>48</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_LDhelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Moyo_LDhelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Moyo_LDhelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_LDhelmet"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+				<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_LDhelmet"]/costList/Moyo_Abyssteel</xpath>
+		<value>
+			<Moyo_Abyssteel>50</Moyo_Abyssteel>
+			<DevilstrandCloth>15</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Moyo_LDhelmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+							<li>Jaw</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Moyo from the depth/Patches/Moyo from the depth/ThingDefs_Misc/Moyo_Dragonian_Apparel.xml b/ModPatches/Moyo from the depth/Patches/Moyo from the depth/ThingDefs_Misc/Moyo_Dragonian_Apparel.xml
new file mode 100644
index 0000000000..8a5d4d46ea
--- /dev/null
+++ b/ModPatches/Moyo from the depth/Patches/Moyo from the depth/ThingDefs_Misc/Moyo_Dragonian_Apparel.xml	
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Dragonian GaramRace</li>
+			<li>Dragonian Race</li>
+			<li>Dragonian Race 1.4(unofficial)</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!--Dragon Dress-->
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[@Name="Moyo_DragonDress"]/statBases</xpath>
+					<value>
+						<Bulk>7.5</Bulk>
+						<WornBulk>1</WornBulk>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[@Name="Moyo_DragonDress"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>7.5</ArmorRating_Sharp>
+						<ArmorRating_Electric>0.60</ArmorRating_Electric>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[@Name="Moyo_DragonDress"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>11.25</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="Moyo_Exoframeproto"]/statBases</xpath>
+					<value>
+						<Bulk>7.5</Bulk>
+						<WornBulk>5</WornBulk>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Moyo_Exoframeproto"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Moyo_Exoframeproto"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>1</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="Moyo_Exoframeproto"]/equippedStatOffsets</xpath>
+					<value>
+						<CarryWeight>7.5</CarryWeight>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Moyo from the depth/Patches/Moyo from the depth/ThingDefs_Misc/Moyo_Royal_Apparel.xml b/ModPatches/Moyo from the depth/Patches/Moyo from the depth/ThingDefs_Misc/Moyo_Royal_Apparel.xml
new file mode 100644
index 0000000000..5227cd9148
--- /dev/null
+++ b/ModPatches/Moyo from the depth/Patches/Moyo from the depth/ThingDefs_Misc/Moyo_Royal_Apparel.xml	
@@ -0,0 +1,452 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Royal suit-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_Royalsuit"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_Royalsuit"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3.5</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.40</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_Royalsuit"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>5.25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_Royalsuit"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<!--Celeberty-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_Holosuit"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_Holosuit"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.75</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.20</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_Holosuit"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_Holosuit"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<!--Royal Robe-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="Moyo_RoyalcoatBase"]/statBases</xpath>
+		<value>
+			<Bulk>7.5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Moyo_RoyalcoatBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.60</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Moyo_RoyalcoatBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Exotic Dress-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_RoyalBlackDress"]/statBases</xpath>
+		<value>
+			<Bulk>7.5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_RoyalBlackDress"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.60</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_RoyalBlackDress"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Royal Guard Armor-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_GDsuit"]/statBases</xpath>
+		<value>
+			<Bulk>125</Bulk>
+			<WornBulk>20</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_GDsuit"]/statBases/Mass</xpath>
+		<value>
+			<Mass>50</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_GDsuit"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>26</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.60</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_GDsuit"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>72</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_GDsuit"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_GDsuit"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>85</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+			<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_GDsuit"]/costList/Moyo_Abyssteel</xpath>
+		<value>
+			<Moyo_Abyssteel>260</Moyo_Abyssteel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Moyo_GDsuit"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+							<li>Leg</li>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+							<li>Leg</li>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Royal Guard Helmet-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_GDhelmet"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>3</WornBulk>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_GDhelmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>3</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_GDhelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>22</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.55</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_GDhelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>64</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_GDhelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Moyo_GDhelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Moyo_GDhelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_GDhelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_GDhelmet"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<AimingAccuracy>0.10</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_GDhelmet"]/costList/Moyo_Abyssteel</xpath>
+		<value>
+			<Moyo_Abyssteel>90</Moyo_Abyssteel>
+			<Hyperweave>10</Hyperweave>
+		</value>
+	</Operation>
+
+	<!--Royal Guard Light Armor-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_GSsuit"]/statBases</xpath>
+		<value>
+			<Bulk>80</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_GSsuit"]/statBases/Mass</xpath>
+		<value>
+			<Mass>25</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_GSsuit"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.30</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_GSsuit"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>55</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_GSsuit"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_GSsuit"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>60</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+			<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			<MoveSpeed>0.1</MoveSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_GSsuit"]/costList/Moyo_Abyssteel</xpath>
+		<value>
+			<Moyo_Abyssteel>150</Moyo_Abyssteel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Moyo_GSsuit"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+							<li>Leg</li>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+							<li>Leg</li>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Royal Guard Light Helmet-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_GShelmet"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.8</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_GShelmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>1</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_GShelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.55</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_GShelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>60</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_GShelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Moyo_GShelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Moyo_GShelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_GShelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_GShelmet"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<AimingAccuracy>0.10</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_GShelmet"]/costList/Moyo_Abyssteel</xpath>
+		<value>
+			<Moyo_Abyssteel>80</Moyo_Abyssteel>
+			<Hyperweave>10</Hyperweave>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Moyo from the depth/Patches/Moyo from the depth/ThingDefs_Misc/Weapons.xml b/ModPatches/Moyo from the depth/Patches/Moyo from the depth/ThingDefs_Misc/Weapons.xml
new file mode 100644
index 0000000000..232972fc6f
--- /dev/null
+++ b/ModPatches/Moyo from the depth/Patches/Moyo from the depth/ThingDefs_Misc/Weapons.xml	
@@ -0,0 +1,891 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/DamageDef[defName="Moyo_Cryo"]</xpath>
+		<value>
+			<li Class="CombatExtended.DamageDefExtensionCE">
+				<harmOnlyOutsideLayers>true</harmOnlyOutsideLayers>
+				<isAmbientDamage>true</isAmbientDamage>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="Moyo_Cryo"]/armorCategory</xpath>
+		<value>
+			<armorCategory>Heat</armorCategory>
+		</value>
+	</Operation>
+
+	<!-- ==========  Moyo Wrench  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_Wrench"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.84</cooldownTime>
+					<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>2.61</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>7.605</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_Wrench"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.25</MeleeCounterParryBonus>
+			<Bulk>3.5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_Wrench"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.67</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+			<MeleeDodgeChance>0.33</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- ==========  Moyo Knife  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_Knife"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.01</cooldownTime>
+					<chanceFactor>0.4</chanceFactor>
+					<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.26</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.67</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.18</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.2</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_Knife"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.39</MeleeCounterParryBonus>
+			<Bulk>1.5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_Knife"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.08</MeleeCritChance>
+				<MeleeParryChance>0.24</MeleeParryChance>
+				<MeleeDodgeChance>1.07</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- ==========  Moyo Glaive  =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_Spear"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>1.08</MeleeCounterParryBonus>
+			<Bulk>12.50</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_Spear"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.22</MeleeCritChance>
+				<MeleeParryChance>1.53</MeleeParryChance>
+				<MeleeDodgeChance>0.67</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_Spear"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>34</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Moyo_Cryo</def>
+							<amount>10</amount>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>1.72</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>2.59</armorPenetrationBlunt>
+					<armorPenetrationSharp>17.39</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.38</cooldownTime>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>4.05</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ==========  Moyo Royal Glaive : 20% Reduction to Sway/Recoil =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_GDSpear"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>1.08</MeleeCounterParryBonus>
+			<Bulk>12.50</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_GDSpear"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.22</MeleeCritChance>
+				<MeleeParryChance>1.53</MeleeParryChance>
+				<MeleeDodgeChance>0.67</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_GDSpear"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>41</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Moyo_Cryo</def>
+							<amount>10</amount>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>1.76</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>4.56</armorPenetrationBlunt>
+					<armorPenetrationSharp>26.08</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.38</cooldownTime>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>4.05</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ==========  Moyo Piledriver : No melee bonuses but high power =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_Piledriver"]/statBases</xpath>
+		<value>
+			<Bulk>9.5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_Piledriver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>body</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.15</cooldownTime>
+					<chanceFactor>0.4</chanceFactor>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Stake</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>33</power>
+					<cooldownTime>3.98</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>65</armorPenetrationBlunt>
+					<armorPenetrationSharp>16</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ==========  Moyo Power Fist : Powered weapon, +55MPA Blunt  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_PowerFist"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.37</cooldownTime>
+					<armorPenetrationBlunt>60</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Body</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.37</cooldownTime>
+					<armorPenetrationBlunt>60</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_PowerFist"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.2</MeleeCounterParryBonus>
+			<Bulk>5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_PowerFist"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.85</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+			<MeleeDodgeChance>0.17</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_PowerFist"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- ==========  Moyo Royal Power Fist : Advanced powered weapon, +75MPA Blunt  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_GDPowerFist"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.34</cooldownTime>
+					<armorPenetrationBlunt>81.615</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Body</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.34</cooldownTime>
+					<armorPenetrationBlunt>81.615</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_GDPowerFist"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.17</MeleeCounterParryBonus>
+			<Bulk>5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_GDPowerFist"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>0.04</MeleeParryChance>
+			<MeleeDodgeChance>0.17</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_GDPowerFist"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Charge Pistol =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Moyo_Pistol</defName>
+		<statBases>
+			<SightsEfficiency>0.80</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>1.07</SwayFactor>
+			<Bulk>2.00</Bulk>
+			<Mass>1.20</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Abyssnail</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_Abyssnail</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Moyo_Pistol"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Charge SMG =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Moyo_ChargeSMG</defName>
+		<statBases>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.98</SwayFactor>
+			<Bulk>6.80</Bulk>
+			<Mass>3.00</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>1.26</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x18mmMoyo</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<range>28</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>36</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_6x18mmMoyo</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Charge Rifle =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Moyo_ChargeRifle</defName>
+		<statBases>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.53</SwayFactor>
+			<Bulk>8.80</Bulk>
+			<Mass>6.50</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>0.99</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmMoyo</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<range>51</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_6x24mmMoyo</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Charge Rifle (Warped) : Removed ===========
+
+<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+<defName>Moyo_WarpedRifle</defName>
+<statBases>
+<SightsEfficiency>1.10</SightsEfficiency>
+<ShotSpread>0.09</ShotSpread>
+<SwayFactor>1.53</SwayFactor>
+<Bulk>8.80</Bulk>
+<Mass>6.50</Mass>
+<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+</statBases>
+
+<Properties>
+<recoilAmount>1.14</recoilAmount>
+<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+<hasStandardCommand>true</hasStandardCommand>
+<defaultProjectile>Bullet_6x24mmWMoyo</defaultProjectile>
+<warmupTime>1.0</warmupTime>
+<burstShotCount>6</burstShotCount>
+<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+<range>51</range>
+<soundCast>Shot_ChargeRifle</soundCast>
+<soundCastTail>GunTail_Light</soundCastTail>
+<muzzleFlashScale>9</muzzleFlashScale>
+</Properties>
+
+<AmmoUser>
+<magazineSize>30</magazineSize>
+<reloadTime>4</reloadTime>
+<ammoSet>AmmoSet_6x24mmWMoyo</ammoSet>
+</AmmoUser>
+<FireModes>
+<aimedBurstShotCount>3</aimedBurstShotCount>
+<aiUseBurstMode>TRUE</aiUseBurstMode>
+<aiAimMode>AimedShot</aiAimMode>
+</FireModes>
+</li>
+ -->
+
+	<!-- ========== Charge Autocannon =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Moyo_AutoCannon</defName>
+		<statBases>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>2.15</SwayFactor>
+			<Bulk>12.50</Bulk>
+			<Mass>9.00</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>1.83</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x35mmMoyo</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<burstShotCount>8</burstShotCount>
+			<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
+			<range>51</range>
+			<soundCast>Shot_NeedleGun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_8x35mmMoyo</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>4</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Charge Precision Rifle =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Moyo_PrecisionRifle</defName>
+		<statBases>
+			<SightsEfficiency>2.98</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.77</SwayFactor>
+			<Bulk>10.25</Bulk>
+			<Mass>6.25</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x50mmMoyo</defaultProjectile>
+			<warmupTime>1.7</warmupTime>
+			<range>78</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_8x50mmMoyo</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Charge Ballista =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Moyo_BoltCaster</defName>
+		<statBases>
+			<SightsEfficiency>1.85</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>2.40</SwayFactor>
+			<Bulk>14.00</Bulk>
+			<Mass>9.50</Mass>
+			<RangedWeapon_Cooldown>0.67</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_MoyoBallista</defaultProjectile>
+			<warmupTime>2.85</warmupTime>
+			<range>55</range>
+			<soundCast>ChargeLance_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>4</magazineSize>
+			<reloadTime>8.7</reloadTime>
+			<ammoSet>AmmoSet_MoyoBallista</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Royal Charge Rifle =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Moyo_HeavyChargeRifle</defName>
+		<statBases>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.58</SwayFactor>
+			<Bulk>8.80</Bulk>
+			<Mass>7.00</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>1.43</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x35mmMoyo</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<range>55</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>24</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_8x35mmMoyo</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Royal Charge Autocannon =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Moyo_HeavyAutoCannon</defName>
+		<statBases>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.65</SwayFactor>
+			<Bulk>12.50</Bulk>
+			<Mass>9.00</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>1.68</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x50mmMoyo</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<range>55</range>
+			<soundCast>Shot_NeedleGun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_8x50mmMoyo</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Royal Charge Ballista =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Moyo_HeavyBoltCaster</defName>
+		<statBases>
+			<SightsEfficiency>2.05</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>2.55</SwayFactor>
+			<Bulk>14.00</Bulk>
+			<Mass>11</Mass>
+			<RangedWeapon_Cooldown>0.67</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_MoyoBallista</defaultProjectile>
+			<warmupTime>2.45</warmupTime>
+			<range>62</range>
+			<soundCast>ChargeLance_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>4</magazineSize>
+			<reloadTime>8.7</reloadTime>
+			<ammoSet>AmmoSet_MoyoBallista</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Cryoblaster =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Moyo_CryoBlaster</defName>
+		<statBases>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>3</ShotSpread>
+			<SwayFactor>2.25</SwayFactor>
+			<Bulk>13.00</Bulk>
+			<Mass>9.50</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>0.05</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_MoyoCryocell</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<burstShotCount>40</burstShotCount>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<range>31</range>
+			<soundCast>MoyoCryoSpray</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>160</magazineSize>
+			<reloadTime>6</reloadTime>
+			<ammoSet>AmmoSet_Cryoblaster</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>20</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Melee Attacks =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_CryoBlaster" or
+			defName="Moyo_HeavyAutoCannon" or
+			defName="Moyo_HeavyChargeRifle" or
+			defName="Moyo_HeavyBoltCaster" or
+			defName="Moyo_BoltCaster" or
+			defName="Moyo_PrecisionRifle" or
+			defName="Moyo_AutoCannon" or
+			defName="Moyo_ChargeRifle" or
+			defName="Moyo_ChargeSMG" or
+			defName="Moyo_WarpedRifle"
+			]/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="Moyo_Pistol"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Moyo from the depth/Patches/Moyo from the depth/ThingDefs_Misc/Weapons_Mechanoid.xml b/ModPatches/Moyo from the depth/Patches/Moyo from the depth/ThingDefs_Misc/Weapons_Mechanoid.xml
new file mode 100644
index 0000000000..4d7fb6027d
--- /dev/null
+++ b/ModPatches/Moyo from the depth/Patches/Moyo from the depth/ThingDefs_Misc/Weapons_Mechanoid.xml	
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Cryopod Cryorifle =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Moyo_CryoRifle</defName>
+		<statBases>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>0.86</SwayFactor>
+			<Bulk>20</Bulk>
+			<Mass>22</Mass>
+			<RangedWeapon_Cooldown>2.5</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_MoyoCryocannon</defaultProjectile>
+			<warmupTime>4.3</warmupTime>
+			<ammoConsumedPerShotCount>50</ammoConsumedPerShotCount>
+			<range>55</range>
+			<soundCast>ChargeLance_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>9.8</reloadTime>
+			<ammoSet>AmmoSet_CryoRifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Melee Attacks =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Moyo_CryoRifle"]/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>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Moyo from the depth/Patches/Moyo from the depth/ThingDefs_Races/AlienRace_Moyo.xml b/ModPatches/Moyo from the depth/Patches/Moyo from the depth/ThingDefs_Races/AlienRace_Moyo.xml
new file mode 100644
index 0000000000..a24f528ea3
--- /dev/null
+++ b/ModPatches/Moyo from the depth/Patches/Moyo from the depth/ThingDefs_Races/AlienRace_Moyo.xml	
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Moyo"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Inventory"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Moyo"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Moyo"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Moyo"]/statBases</xpath>
+		<value>
+			<!--Increased mass, better leverage in combat-->
+			<MeleeCritChance>1.05</MeleeCritChance>
+			<MeleeParryChance>1.05</MeleeParryChance>
+			<Suppressability>1</Suppressability>
+			<SmokeSensitivity>0.9</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!--Base has no headbut, only bite-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Moyo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.313</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.313</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2.52</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.245</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Moyo from the depth/Patches/Moyo from the depth/ThingDefs_Races/Race_MoyoMech.xml b/ModPatches/Moyo from the depth/Patches/Moyo from the depth/ThingDefs_Races/Race_MoyoMech.xml
new file mode 100644
index 0000000000..2df8fd70df
--- /dev/null
+++ b/ModPatches/Moyo from the depth/Patches/Moyo from the depth/ThingDefs_Races/Race_MoyoMech.xml	
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Pressurepod-->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="MoyoPressurePod_Race"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MoyoPressurePod_Race"]/statBases</xpath>
+		<value>
+			<MeleeCritChance>1.50</MeleeCritChance>
+			<MeleeParryChance>1.50</MeleeParryChance>
+			<NightVisionEfficiency>0.80</NightVisionEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MoyoPressurePod_Race"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MoyoPressurePod_Race"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>40.5</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.25</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MoyoPressurePod_Race"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left club</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>56</power>
+					<cooldownTime>3.1</cooldownTime>
+					<linkedBodyPartsGroup>LeftClub</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right club</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>56</power>
+					<cooldownTime>3.1</cooldownTime>
+					<linkedBodyPartsGroup>RightClub</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>3.51</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Hexapod -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="Moyo_HexapodBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="Moyo_HexapodBase"]/statBases</xpath>
+		<value>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>2.50</MeleeParryChance>
+			<NightVisionEfficiency>0.80</NightVisionEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Moyo_HexapodBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Moyo_HexapodBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>22.5</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.75</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Moyo_HexapodBase"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tentacle</label>
+					<capacities>
+						<li>HexapodTentacle</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.24</cooldownTime>
+					<linkedBodyPartsGroup>Tentacle1</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>50</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>tentacle</label>
+					<capacities>
+						<li>HexapodTentacle</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.24</cooldownTime>
+					<linkedBodyPartsGroup>Tentacle2</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>50</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>tentacle</label>
+					<capacities>
+						<li>HexapodTentacle</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.24</cooldownTime>
+					<linkedBodyPartsGroup>Tentacle3</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>50</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>tentacle</label>
+					<capacities>
+						<li>HexapodTentacle</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.24</cooldownTime>
+					<linkedBodyPartsGroup>Tentacle4</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>50</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>tentacle</label>
+					<capacities>
+						<li>HexapodTentacle</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.24</cooldownTime>
+					<linkedBodyPartsGroup>Tentacle5</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>50</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>tentacle</label>
+					<capacities>
+						<li>HexapodTentacle</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.24</cooldownTime>
+					<linkedBodyPartsGroup>Tentacle6</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>50</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>3.51</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="MoyoCryopod_Kind"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>20</min>
+					<max>20</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Moyo light in the abyss/Defs/Moyo light in the abyss/Ammo/Ammo_Moyo.xml b/ModPatches/Moyo light in the abyss/Defs/Moyo light in the abyss/Ammo/Ammo_Moyo.xml
new file mode 100644
index 0000000000..8310cab68e
--- /dev/null
+++ b/ModPatches/Moyo light in the abyss/Defs/Moyo light in the abyss/Ammo/Ammo_Moyo.xml	
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_MabyssalLight</defName>
+		<label>Light Plasma Cell</label>
+		<ammoTypes>
+			<Ammo_PlasmaCellPistol>Bullet_MabyssalPlasmaPistol</Ammo_PlasmaCellPistol>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_MabyssalMid</defName>
+		<label>Rifle Plasma Cell</label>
+		<ammoTypes>
+			<Ammo_PlasmaCellRifle>Bullet_MabyssalPlasmaMid</Ammo_PlasmaCellRifle>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_MabyssalAccelerated</defName>
+		<label>Heavy Plasma Cell</label>
+		<ammoTypes>
+			<Ammo_PlasmaCellHeavy>Bullet_MabyssalPlasmaAccelerated</Ammo_PlasmaCellHeavy>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+	<ThingDef ParentName="Base556x45mmNATOBullet">
+		<defName>Bullet_MabyssalPlasmaPistol</defName>
+		<label>Low Density Plasma Bolt</label>
+		<graphicData>
+			<texPath>RedMoyo_Weapons/RedMoyoBolt</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>100</speed>
+			<damageAmountBase>10</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>2</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>12</armorPenetrationSharp>
+			<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Base556x45mmNATOBullet">
+		<defName>Bullet_MabyssalPlasmaMid</defName>
+		<label>Medium Density Plasma Bolt</label>
+		<graphicData>
+			<texPath>RedMoyo_Weapons/RedMoyoBolt</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>150</speed>
+			<damageAmountBase>12</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>2</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>26</armorPenetrationSharp>
+			<armorPenetrationBlunt>4</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Base556x45mmNATOBullet">
+		<defName>Bullet_MabyssalPlasmaAccelerated</defName>
+		<label>Accelerated Plasma Bolt</label>
+		<graphicData>
+			<texPath>RedMoyo_Weapons/RedMoyoBoltLarge</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>200</speed>
+			<damageAmountBase>28</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>6</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>60</armorPenetrationSharp>
+			<armorPenetrationBlunt>23</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeAmmo_PlasmaCellPistol_Abyss</defName>
+		<label>make Plasma Pistol Power Cells</label>
+		<description>Craft 500 shots' worth of Plasma Pistol Power Cells.</description>
+		<jobString>Making Plasma Pistol Power Cells.</jobString>
+		<workAmount>6800</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>14</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Moyo_Abyssteel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Moyo_Abyssteel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_PlasmaCellPistol>500</Ammo_PlasmaCellPistol>
+		</products>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Moyo light in the abyss/Patches/Moyo light in the abyss/PawnKindDefs/Moyo_PawnKind.xml b/ModPatches/Moyo light in the abyss/Patches/Moyo light in the abyss/PawnKindDefs/Moyo_PawnKind.xml
new file mode 100644
index 0000000000..b91edd82f2
--- /dev/null
+++ b/ModPatches/Moyo light in the abyss/Patches/Moyo light in the abyss/PawnKindDefs/Moyo_PawnKind.xml	
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Ammo-->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			@Name="RedMoyoBasePawnKind"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>1</min>
+					<max>3</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			@Name="RedMoyoPolice"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			@Name="RedMoyoSoliderStandard"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Backpack-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[
+			@ParentName="RedMoyoPolice" or
+			@ParentName="RedMoyoSoliderStandard"
+			]/apparelRequired </xpath>
+		<value>
+			<li>CE_Apparel_Backpack</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Moyo light in the abyss/Patches/Moyo light in the abyss/ThingDefs_Misc/Moyo_Apparel.xml b/ModPatches/Moyo light in the abyss/Patches/Moyo light in the abyss/ThingDefs_Misc/Moyo_Apparel.xml
new file mode 100644
index 0000000000..28827f55a9
--- /dev/null
+++ b/ModPatches/Moyo light in the abyss/Patches/Moyo light in the abyss/ThingDefs_Misc/Moyo_Apparel.xml	
@@ -0,0 +1,634 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--========= Stuffable =========-->
+
+	<!--Straps-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_BodyStrap"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!--Worksuit-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_WorkSuit"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+			<Bulk>3</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RedMoyo_WorkSuit"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>5</CarryBulk>
+		</value>
+	</Operation>
+
+	<!--========= Fixed Armor Value =========-->
+
+	<!--Bodysuit-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RedMoyo_BobySuit"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_BobySuit"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.15</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_BobySuit"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RedMoyo_BobySuit"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<!--Tactical Strap-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RedMoyo_TacticalStrap"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_TacticalStrap"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>175</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_TacticalStrap"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.15</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_TacticalStrap"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3.75</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RedMoyo_TacticalStrap"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>20</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RedMoyo_TacticalStrap"]/equippedStatOffsets/AimingDelayFactor</xpath>
+		<value>
+			<ReloadSpeed>0.1</ReloadSpeed>
+			<AimingDelayFactor>-0.05</AimingDelayFactor>
+		</value>
+	</Operation>
+
+	<!--Police Uniform-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RedMoyo_PoliceUniform"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_PoliceUniform"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.45</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_PoliceUniform"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Exoskeleton-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RedMoyo_ExoSkeleton"]/statBases</xpath>
+		<value>
+			<Bulk>40</Bulk>
+			<WornBulk>8</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_ExoSkeleton"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_ExoSkeleton"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RedMoyo_ExoSkeleton"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>20</CarryWeight>
+		</value>
+	</Operation>
+
+	<!--Officer Cape-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RedMoyo_OfficerCape"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_OfficerCape"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.15</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_OfficerCape"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Combat Gear-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RedMoyo_TacticalGears"]/statBases</xpath>
+		<value>
+			<Bulk>50</Bulk>
+			<WornBulk>12</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_TacticalGears"]/statBases/Mass</xpath>
+		<value>
+			<Mass>9.5</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_TacticalGears"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.23</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_TacticalGears"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>14</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RedMoyo_TacticalGears"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<CarryBulk>5</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RedMoyo_TacticalGears"]/equippedStatOffsets/AimingDelayFactor</xpath>
+		<value>
+			<ReloadSpeed>0.1</ReloadSpeed>
+			<AimingDelayFactor>-0.05</AimingDelayFactor>
+		</value>
+	</Operation>
+
+	<!--Helmet-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RedMoyo_Helmet"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_Helmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.23</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_Helmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>14</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Pan Hat-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RedMoyo_PanHat"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_PanHat"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.10</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_PanHat"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Melee Mask-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RedMoyo_MeleeMask"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_MeleeMask"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.10</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_MeleeMask"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>7</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_MeleeMask"]/apparel/layers/li[.="EyeCover"]</xpath>
+		<value>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!--Sniper Mask-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RedMoyo_SniperMask"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.90</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_SniperMask"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.08</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_SniperMask"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_SniperMask"]/apparel/layers/li[.="EyeCover"]</xpath>
+		<value>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_SniperMask"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>2.5</ShootingAccuracyPawn>
+			<AimingAccuracy>2.5</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!--Gas Mask-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RedMoyo_GasMask"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_GasMask"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_GasMask"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_GasMask"]/apparel/layers/li[.="Overhead"]</xpath>
+		<value>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RedMoyo_GasMask"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_GasMask"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>Teeth</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<!--Gas Mask-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RedMoyo_TacticalHeadSet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_TacticalHeadSet"]/apparel/layers/li[.="Overhead"]</xpath>
+		<value>
+			<li>OnHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_TacticalHeadSet"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>Teeth</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<!--Diving Gear-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RedMoyo_AbyssArmour"]/statBases</xpath>
+		<value>
+			<Bulk>125</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_AbyssArmour"]/statBases/Mass</xpath>
+		<value>
+			<Mass>80</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_AbyssArmour"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_AbyssArmour"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>75</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_AbyssArmour"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.75</ArmorRating_Heat>
+			<ArmorRating_Electric>0.50</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_AbyssArmour"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_AbyssArmour"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<CarryWeight>110</CarryWeight>
+			<CarryBulk>15</CarryBulk>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			<MoveSpeed>-0.75</MoveSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_AbyssArmour"]/costList/Moyo_Abyssteel</xpath>
+		<value>
+			<Moyo_Abyssteel>216</Moyo_Abyssteel>
+			<DevilstrandCloth>30</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RedMoyo_AbyssArmour"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Diving Helmet-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RedMoyo_AbyssHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>5</WornBulk>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_AbyssHelmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>6.5</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_AbyssHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_AbyssHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>60</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_AbyssHelmet"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.75</ArmorRating_Heat>
+			<ArmorRating_Electric>0.50</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_AbyssHelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="RedMoyo_AbyssHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="RedMoyo_AbyssHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RedMoyo_AbyssHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_AbyssHelmet"]/costList/Moyo_Abyssteel</xpath>
+		<value>
+			<Moyo_Abyssteel>135</Moyo_Abyssteel>
+			<DevilstrandCloth>15</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RedMoyo_AbyssHelmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Moyo light in the abyss/Patches/Moyo light in the abyss/ThingDefs_Misc/Weapons.xml b/ModPatches/Moyo light in the abyss/Patches/Moyo light in the abyss/ThingDefs_Misc/Weapons.xml
new file mode 100644
index 0000000000..b245e87304
--- /dev/null
+++ b/ModPatches/Moyo light in the abyss/Patches/Moyo light in the abyss/ThingDefs_Misc/Weapons.xml	
@@ -0,0 +1,682 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==========  Moyo Knife : Same as normal variant =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_Knife"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.01</cooldownTime>
+					<chanceFactor>0.4</chanceFactor>
+					<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.26</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.67</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.18</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.2</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RedMoyo_Knife"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.39</MeleeCounterParryBonus>
+			<Bulk>1.5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RedMoyo_Knife"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.08</MeleeCritChance>
+				<MeleeParryChance>0.24</MeleeParryChance>
+				<MeleeDodgeChance>1.07</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- ==========  Moyo Clamp : No melee bonuses but high power =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RedMoyo_KineticClamp"]/statBases</xpath>
+		<value>
+			<Bulk>9.5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_KineticClamp"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>body</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.15</cooldownTime>
+					<chanceFactor>0.4</chanceFactor>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Stake</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>51</power>
+					<cooldownTime>4.3</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>32</armorPenetrationBlunt>
+					<armorPenetrationSharp>8</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ==========  Alloy Harpoon  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_AlloyHarpoon"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.77</cooldownTime>
+					<chanceFactor>0.4</chanceFactor>
+					<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.77</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
+					<armorPenetrationSharp>5.76</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RedMoyo_AlloyHarpoon"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
+			<Bulk>10</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RedMoyo_AlloyHarpoon"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.24</MeleeCritChance>
+				<MeleeParryChance>1.45</MeleeParryChance>
+				<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- ==========  Plasma Harpoon  =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RedMoyo_PlasmaHarpoon"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
+			<Bulk>10</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RedMoyo_PlasmaHarpoon"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.24</MeleeCritChance>
+				<MeleeParryChance>1.45</MeleeParryChance>
+				<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_PlasmaHarpoon"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+						<li>Stab</li>
+					</capacities>
+					<power>17</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Burn</def>
+							<amount>7</amount>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>1.44</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>3.136</armorPenetrationBlunt>
+					<armorPenetrationSharp>24.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.01</cooldownTime>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ==========  Plasma Tachi - Producable, longer and heavier plasmasword =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_PlasmaTachi"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>1.27</MeleeCounterParryBonus>
+			<Bulk>10.50</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_PlasmaTachi"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.95</MeleeCritChance>
+				<MeleeParryChance>0.54</MeleeParryChance>
+				<MeleeDodgeChance>0.33</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_PlasmaTachi"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>56</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Burn</def>
+							<amount>7</amount>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>2.1</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>6.24</armorPenetrationBlunt>
+					<armorPenetrationSharp>16.26</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>14</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Burn</def>
+							<amount>5</amount>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>1.85</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>3.46</armorPenetrationBlunt>
+					<armorPenetrationSharp>24</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2.22</cooldownTime>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>2.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Pistol =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RedMoyo_Pistol</defName>
+		<statBases>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.57</SwayFactor>
+			<Bulk>4.50</Bulk>
+			<Mass>1.20</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_MabyssalPlasmaPistol</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_MabyssalLight</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Police Pistol =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RedMoyo_PistolPolice</defName>
+		<statBases>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.65</SwayFactor>
+			<Bulk>3.75</Bulk>
+			<Mass>1.20</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_MabyssalPlasmaMid</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>18</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>18</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_MabyssalMid</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Charge SMG =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RedMoyo_SMG</defName>
+		<statBases>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.75</SwayFactor>
+			<Bulk>6.80</Bulk>
+			<Mass>3.00</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>1.46</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_MabyssalPlasmaPistol</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<range>31</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>35</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_MabyssalLight</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Civil Rifle =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RedMoyo_CivilAR</defName>
+		<statBases>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.38</SwayFactor>
+			<Bulk>6.50</Bulk>
+			<Mass>7.25</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>1.39</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_MabyssalPlasmaMid</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+			<range>48</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>18</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_MabyssalMid</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AR</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Military Rifle =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RedMoyo_MilitaryAR</defName>
+		<statBases>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.40</SwayFactor>
+			<Bulk>10.50</Bulk>
+			<Mass>3.5</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>1.39</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_MabyssalPlasmaMid</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<range>51</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>24</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_MabyssalMid</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AR</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Precision Rifle =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RedMoyo_MilitarySR</defName>
+		<statBases>
+			<SightsEfficiency>2.25</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<Bulk>11.50</Bulk>
+			<Mass>6.2</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>1.00</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_MabyssalPlasmaMid</defaultProjectile>
+			<warmupTime>1.7</warmupTime>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<range>65</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>24</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_MabyssalMid</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_SR</li>
+			<li>Bipod_DMR</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Accelerator =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RedMoyo_MilitaryHeavyRifle</defName>
+		<statBases>
+			<SightsEfficiency>2.25</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<Bulk>11.50</Bulk>
+			<Mass>6.2</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>2.25</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_MabyssalPlasmaAccelerated</defaultProjectile>
+			<warmupTime>1.875</warmupTime>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>20</ticksBetweenBurstShots>
+			<range>51</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>9</magazineSize>
+			<reloadTime>5.1</reloadTime>
+			<ammoSet>AmmoSet_MabyssalAccelerated</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+	<!-- ========== Melee Attacks =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_Pistol" or
+			defName="RedMoyo_SMG" or
+			defName="RedMoyo_MilitarySR" or
+			defName="RedMoyo_CivilAR" or
+			defName="RedMoyo_MilitaryHeavyRifle"
+			]/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="RedMoyo_PistolPolice"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RedMoyo_MilitaryAR"]/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</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>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>plasma bayonet</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.62</cooldownTime>
+					<armorPenetrationBlunt>2.304</armorPenetrationBlunt>
+					<armorPenetrationSharp>24.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Moyo light in the abyss/Patches/Moyo light in the abyss/ThingDefs_Races/AlienRace_Moyo.xml b/ModPatches/Moyo light in the abyss/Patches/Moyo light in the abyss/ThingDefs_Races/AlienRace_Moyo.xml
new file mode 100644
index 0000000000..301ca22a72
--- /dev/null
+++ b/ModPatches/Moyo light in the abyss/Patches/Moyo light in the abyss/ThingDefs_Races/AlienRace_Moyo.xml	
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_RedMoyo"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Inventory"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_RedMoyo"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_RedMoyo"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_RedMoyo"]/statBases</xpath>
+		<value>
+			<!--Increased mass, better leverage in combat-->
+			<MeleeCritChance>1.05</MeleeCritChance>
+			<MeleeParryChance>1.05</MeleeParryChance>
+			<Suppressability>1</Suppressability>
+			<SmokeSensitivity>0.9</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!--Base has no headbut, only bite-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_RedMoyo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2.52</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.375</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>4.75</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.800</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Nakin Race/Patches/Nakin Race/Nakin_Bionics.xml b/ModPatches/Nakin Race/Patches/Nakin Race/Nakin_Bionics.xml
new file mode 100644
index 0000000000..5aea652250
--- /dev/null
+++ b/ModPatches/Nakin Race/Patches/Nakin Race/Nakin_Bionics.xml	
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Nakin Claw -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Nakin_ARClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<!-- Compared to a Power Claw, Deals more damage, is slower, no movement penalty, slightly more Sharp Penetration and slightly less Blunt Penetration | Is exclusive to Nakins-->
+				<li Class="CombatExtended.ToolCE">
+					<label>claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationSharp>1.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- Nakin Bionic Arm -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Bionic_Nakin_Arm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<!-- Is exclusive to Nakins-->
+				<li Class="CombatExtended.ToolCE">
+					<label>claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationSharp>0.85</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Nakin Race/Patches/Nakin Race/Nakin_Body.xml b/ModPatches/Nakin Race/Patches/Nakin Race/Nakin_Body.xml
new file mode 100644
index 0000000000..b812088ab8
--- /dev/null
+++ b/ModPatches/Nakin Race/Patches/Nakin Race/Nakin_Body.xml	
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Body Armor Patch-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Nakin_body"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Nakin_body"]/corePart/parts/li[def = "Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Nakin_body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Nakin_body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Nakin_body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Nakin_body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Ear"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Nakin_body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Eye"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Nakin_body"]/corePart/parts/li[def = "Nakin_Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Nakin_body"]/corePart/parts/li[def= "Nakin_Shoulder"]/parts/li[def ="Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Nakin_body"]/corePart/parts/li[def="Nakin_Shoulder"]/parts/li[def ="Arm"]/parts/li[def = "Nakin_Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Nakin_body"]/corePart/parts/li[def="Nakin_Shoulder"]/parts/li[def ="Arm"]/parts/li[def = "Nakin_Hand"]/parts/li[def = "Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Nakin_body"]/corePart/parts/li[def = "Waist"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Nakin_body"]/corePart/parts/li[def = "Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Nakin_body"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Nakin_body"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/parts/li[def = "Toe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Nakin_body"]/corePart/parts/li[def = "Tail"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Nakin_body"]/corePart/parts/li[def = "Nakin_Tentacle"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Nakin Race/Patches/Nakin Race/Nakin_Items.xml b/ModPatches/Nakin Race/Patches/Nakin Race/Nakin_Items.xml
new file mode 100644
index 0000000000..9bea563421
--- /dev/null
+++ b/ModPatches/Nakin Race/Patches/Nakin Race/Nakin_Items.xml	
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Nakin Leather | values to represent the Race's natural toughness-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Nakin"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.06</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Nakin"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.08</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Nakin Glasses -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_NakinGlasses"]/statBases</xpath>
+		<value>
+			<Bulk>0</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_NakinGlasses"]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>StrappedHead</li>
+			</layers>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_NakinGlasses"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>0.3</AimingAccuracy>
+				<ShootingAccuracyPawn>5.0</ShootingAccuracyPawn>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Nakin Tactical Ballistc Goggles-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_NakinGogglesA"]/statBases</xpath>
+		<value>
+			<Bulk>0.5</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_NakinGogglesA"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_NakinGogglesA"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_NakinGogglesA"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.366</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_NakinGogglesA"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>15</DevilstrandCloth>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_NakinGogglesA"]/apparel</xpath>
+		<value>
+			<layers>
+				<li>StrappedHead</li>
+			</layers>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_NakinGogglesA"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>0.6</AimingAccuracy>
+				<ShootingAccuracyPawn>10.0</ShootingAccuracyPawn>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Nakin Race/Patches/Nakin Race/Nakin_Pawnkind.xml b/ModPatches/Nakin Race/Patches/Nakin Race/Nakin_Pawnkind.xml
new file mode 100644
index 0000000000..09d855e12d
--- /dev/null
+++ b/ModPatches/Nakin Race/Patches/Nakin Race/Nakin_Pawnkind.xml	
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[@Name="NakinPawnKindBase"]</xpath>
+		<value>
+			<apparelRequired>
+				<li>CE_Apparel_Backpack</li>
+			</apparelRequired>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Nakin Race/Patches/Nakin Race/Nakin_Race.xml b/ModPatches/Nakin Race/Patches/Nakin Race/Nakin_Race.xml
new file mode 100644
index 0000000000..620bb89da1
--- /dev/null
+++ b/ModPatches/Nakin Race/Patches/Nakin Race/Nakin_Race.xml	
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NakinRace"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<!-- Body Armor Values (Had no reference to use. Vanilla values were 0.1 Sharp/ 0.2 Blunt -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NakinRace"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NakinRace"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NakinRace"]/statBases</xpath>
+		<!-- Nakin are Melee focused and are not good at using ranged weapons-->
+		<value>
+			<AimingAccuracy>0.7</AimingAccuracy>
+			<MeleeCritChance>1.3</MeleeCritChance>
+			<MeleeParryChance>1.3</MeleeParryChance>
+			<ReloadSpeed>2.0</ReloadSpeed>
+			<Suppressability>0.50</Suppressability>
+			<SmokeSensitivity>1</SmokeSensitivity>
+			<NightVisionEfficiency>0.2</NightVisionEfficiency>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NakinRace"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>1.5</MeleeDodgeChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NakinRace"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left craw</label><!-- It's literally called "left craw" in the files -->
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.20</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right craw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.20</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2</cooldownTime>
+					<chanceFactor>0.07</chanceFactor>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.7</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NakinRace"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NakinRace"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NakinRace"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Nakin Race/Patches/Nakin Race/Nakin_Scenario.xml b/ModPatches/Nakin Race/Patches/Nakin Race/Nakin_Scenario.xml
new file mode 100644
index 0000000000..a11abb3548
--- /dev/null
+++ b/ModPatches/Nakin Race/Patches/Nakin Race/Nakin_Scenario.xml	
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="NakinCrashlanded"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_303British_FMJ</thingDef>
+				<count>50</count>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ScenarioDef[defName="NakinCrashlanded"]/scenario/parts/li[thingDef="Apparel_AdvancedHelmet"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ScenarioDef[defName="NakinCrashlanded"]/scenario/parts/li[thingDef="Apparel_FlakVest"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ScenarioDef[defName="NakinCrashlanded"]/scenario/parts/li[thingDef="Apparel_FlakPants"]</xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Nanosuit/Patches/Nanosuit/Armor_Crysis.xml b/ModPatches/Nanosuit/Patches/Nanosuit/Armor_Crysis.xml
new file mode 100644
index 0000000000..404fb0d72d
--- /dev/null
+++ b/ModPatches/Nanosuit/Patches/Nanosuit/Armor_Crysis.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Nano Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="NS_Apparel_NanosuitHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NS_Apparel_NanosuitHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NS_Apparel_NanosuitHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NS_Apparel_NanosuitHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>240</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="NS_Apparel_NanosuitHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="NS_Apparel_NanosuitHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="NS_Apparel_NanosuitHelmet"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingDelayFactor>-0.05</AimingDelayFactor>
+				<AimingAccuracy>0.1</AimingAccuracy>
+				<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+				<Suppressability>-0.1</Suppressability>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="NS_Apparel_NanosuitHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!-- === Nano Armor === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="ApparelArmorNanoSuitBase"]/apparel/layers</xpath>
+		<value>
+			<li>Webbing</li>
+			<li>Backpack</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="ApparelArmorNanoSuitBase"]/statBases/Mass</xpath>
+		<value>
+			<Bulk>60</Bulk>
+			<WornBulk>8</WornBulk>
+			<Mass>18</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="ApparelArmorNanoSuitBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="ApparelArmorNanoSuitBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="ApparelArmorNanoSuitBase"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>60</CarryWeight>
+				<CarryBulk>80</CarryBulk>
+				<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+				<MoveSpeed>1</MoveSpeed>
+				<ReloadSpeed>0.15</ReloadSpeed>
+				<Suppressability>-0.33</Suppressability>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="ApparelArmorNanoSuitBase"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Nanosuit.NanosuitDef[defName="NS_Apparel_Nanosuit"]/nightVisor/accuracyBonus</xpath>
+		<value>
+			<accuracyBonus>1.5</accuracyBonus>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Nearmare Race/Patches/Nearmare Race/Ammo/Projectiles.xml b/ModPatches/Nearmare Race/Patches/Nearmare Race/Ammo/Projectiles.xml
new file mode 100644
index 0000000000..166941b779
--- /dev/null
+++ b/ModPatches/Nearmare Race/Patches/Nearmare Race/Ammo/Projectiles.xml	
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Geist_Knife_Projectile"]</xpath>
+		<value>
+			<ThingDef ParentName="BaseGreatArrowProjectile">
+				<defName>Geist_Knife_Projectile</defName>
+				<label>縛刃『ガイスト』</label>
+				<graphicData>
+					<texPath>HAR_NM/Weapons/W_NM_Knife2</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<projectile Class="CombatExtended.ProjectilePropertiesCE">
+					<speed>25</speed>
+					<damageDef>Damage_Geist</damageDef>
+					<damageAmountBase>1</damageAmountBase>
+					<armorPenetrationSharp>6</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.025</armorPenetrationBlunt>
+				</projectile>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Larva_SKnife_Projectile"]</xpath>
+		<value>
+			<ThingDef ParentName="BaseGreatArrowProjectile">
+				<defName>Larva_SKnife_Projectile</defName>
+				<label>憑剣『ラルヴァ』</label>
+				<graphicData>
+					<texPath>HAR_NM/Weapons/W_NM_SKnife2</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<projectile Class="CombatExtended.ProjectilePropertiesCE">
+					<speed>35</speed>
+					<damageDef>Damage_Larva</damageDef>
+					<damageAmountBase>10</damageAmountBase>
+					<armorPenetrationSharp>14</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
+				</projectile>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Rugeiyu_Pilum_Thrown"]</xpath>
+		<value>
+			<ThingDef ParentName="BaseGreatArrowProjectile">
+				<defName>Rugeiyu_Pilum_Thrown</defName>
+				<label>魔槍『ルゲイエ』</label>
+				<graphicData>
+					<texPath>HAR_NM/Weapons/W_NM_lance2</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<projectile Class="CombatExtended.ProjectilePropertiesCE">
+					<speed>25</speed>
+					<damageDef>Damage_Rugeiyu</damageDef>
+					<damageAmountBase>3</damageAmountBase>
+					<armorPenetrationSharp>7</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
+				</projectile>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="Damage_Genocide_Bomb"]/armorCategory</xpath>
+		<value>
+			<armorCategory>Electric</armorCategory>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Nearmaere_WildHunt_B"]</xpath>
+		<value>
+			<ThingDef ParentName="BaseGreatArrowProjectile">
+				<defName>Nearmaere_WildHunt_B</defName>
+				<label>夢杖『ワイルドハント』</label>
+				<graphicData>
+					<texPath>HAR_NM/Weapons/W_NM_Rod2</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+					<shaderType>TransparentPostLight</shaderType>
+				</graphicData>
+				<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+				<projectile Class="CombatExtended.ProjectilePropertiesCE">
+					<speed>35</speed>
+					<damageDef>Damage_Genocide_Bomb</damageDef>
+					<damageAmountBase>3</damageAmountBase>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>0</armorPenetrationBlunt>
+					<explosionRadius>25</explosionRadius>
+					<gravityFactor>4</gravityFactor>
+				</projectile>
+			</ThingDef>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Nearmare Race/Patches/Nearmare Race/Bodies/Bodies_Summon.xml b/ModPatches/Nearmare Race/Patches/Nearmare Race/Bodies/Bodies_Summon.xml
new file mode 100644
index 0000000000..b390d73aba
--- /dev/null
+++ b/ModPatches/Nearmare Race/Patches/Nearmare Race/Bodies/Bodies_Summon.xml	
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Nearmare Summon === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="HAR_NM_M_Body"]//*[
+			def="Body" or
+			def="Tail" or
+			def="Neck" or
+			def="Nose" or
+			def="Leg" or
+			customLabel="rear left paw" or
+			customLabel="rear right paw"]
+		</xpath>
+
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="HAR_NM_M_Body"]//*[
+			def="Body" or
+			def="Tail" or
+			def="Neck" or
+			def="Head" or
+			def="Leg" or
+			def="Paw"]/groups
+		</xpath>
+
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Nearmare Race/Patches/Nearmare Race/Bodies/Nearmare_Bodytype.xml b/ModPatches/Nearmare Race/Patches/Nearmare Race/Bodies/Nearmare_Bodytype.xml
new file mode 100644
index 0000000000..54ee1b686a
--- /dev/null
+++ b/ModPatches/Nearmare Race/Patches/Nearmare Race/Bodies/Nearmare_Bodytype.xml	
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Nearmare Bodytype-->
+
+	<!--Arm Groups-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Nearmaere_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Nearmaere_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Nearmaere_Body"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Nearmaere_Body"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<!--Natural Armor-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Nearmaere_Body"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Nearmaere_Body"]/corePart/parts/li[def="Nearmaere_Wing"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Nearmaere_Body"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Nearmaere_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Nearmaere_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Nearmaere_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Nearmaere_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Nearmaere_Body"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Nearmaere_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Nearmaere_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Nearmaere_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Nearmaere_Body"]/corePart/parts/li[def="Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Nearmaere_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Nearmaere_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Nearmare Race/Patches/Nearmare Race/PawnKindDefs/Nearmare_PawnKind.xml b/ModPatches/Nearmare Race/Patches/Nearmare Race/PawnKindDefs/Nearmare_PawnKind.xml
new file mode 100644
index 0000000000..ff1436d6d9
--- /dev/null
+++ b/ModPatches/Nearmare Race/Patches/Nearmare Race/PawnKindDefs/Nearmare_PawnKind.xml	
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Ammo-->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			@Name="HAR_Nearmaere_KindBase_NPC"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Backpack-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CE_Apparel_Backpack"]/apparel/tags</xpath>
+		<value>
+			<li>HAR_NM_Apparel</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Nearmare Race/Patches/Nearmare Race/Scenario/Nearmare_Scenario.xml b/ModPatches/Nearmare Race/Patches/Nearmare Race/Scenario/Nearmare_Scenario.xml
new file mode 100644
index 0000000000..bdb2f28f20
--- /dev/null
+++ b/ModPatches/Nearmare Race/Patches/Nearmare Race/Scenario/Nearmare_Scenario.xml	
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="Nearmaere_Scenario"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_303British_FMJ</thingDef>
+				<count>100</count>
+			</li>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_44Magnum_FMJ</thingDef>
+				<count>60</count>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ScenarioDef[defName="Nearmaere_Scenario"]/scenario/parts/li[thingDef="Apparel_AdvancedHelmet"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ScenarioDef[defName="Nearmaere_Scenario"]/scenario/parts/li[thingDef="Apparel_FlakVest"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ScenarioDef[defName="Nearmaere_Scenario"]/scenario/parts/li[thingDef="Apparel_FlakPants"]</xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Nearmare Race/Patches/Nearmare Race/ThingDefs_Misc/Nearmare_Apparel.xml b/ModPatches/Nearmare Race/Patches/Nearmare Race/ThingDefs_Misc/Nearmare_Apparel.xml
new file mode 100644
index 0000000000..c3ec783ce9
--- /dev/null
+++ b/ModPatches/Nearmare Race/Patches/Nearmare Race/ThingDefs_Misc/Nearmare_Apparel.xml	
@@ -0,0 +1,318 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--========= Stuffable =========-->
+
+	<!--Skin Layer minimum protection-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_NM_Os_P" or
+			defName="HAR_NM_Os_Pb" or
+			defName="HAR_NM_Os_Pc" or
+			defName="HAR_NM_Os_Pd" or
+			defName="HAR_NM_Os_Pe"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.25</StuffEffectMultiplierArmor>
+			<Bulk>0.5</Bulk>
+			<WornBulk>0.25</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Middle Low-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_NM_RiderS"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.5</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_NM_Tshirt" or
+			defName="HAR_NM_Itimai" or
+			defName="HAR_NM_NurseS"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_NM_Sc_Uniform" or
+			defName="HAR_NM_SShirts"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_NM_Blouse"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Middle Mid-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_NM_BDress" or
+			defName="HAR_NM_WDress" or
+			defName="HAR_NM_China" or
+			defName="HAR_NM_Maid" or
+			defName="HAR_NM_Kimono" or
+			defName="HAR_NM_Miko"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Middle Metallic-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_NM_DLArmor"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
+			<Bulk>60</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HAR_NM_DLArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_NM_KArmor"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
+			<Bulk>60</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HAR_NM_KArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<!--Shell-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_NM_Sh_K" or
+			defName="HAR_NM_Sh_Kb" or
+			defName="HAR_NM_Sh_Kc" or
+			defName="HAR_NM_Sh_Kd" or
+			defName="HAR_NM_Sh_Ke" or
+			defName="HAR_NM_Sh_Ho" or
+			defName="HAR_NM_Sh_SKo"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HAR_NM_Sh_BKo"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Legs</li>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<!--Overhead-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_NM_MCt" or
+			defName="HAR_NM_Tar"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_NM_MHK" or
+			defName="HAR_NM_Cts" or
+			defName="HAR_NM_MRbn"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Overhead Armor-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_NM_HArmor"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_NM_HCArmor"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HAR_NM_A_EyeCover_a"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HAR_NM_Sh_BKo"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HAR_NM_AH_f"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+			<Bulk>40</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HAR_NM_AH_f"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HAR_NM_AH_g"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+			<Bulk>20</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HAR_NM_AH_g"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HAR_NM_A_a"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>22</ArmorRating_Sharp>
+			<Bulk>80</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HAR_NM_A_a"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>50</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HAR_NM_A_b"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+			<Bulk>40</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HAR_NM_A_b"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HAR_NM_A_Belt_a"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+			<Bulk>40</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HAR_NM_A_Belt_a"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>30</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HAR_NM_A_Belt_a"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="HAR_NM_Armor_Base"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Nearmare Race/Patches/Nearmare Race/ThingDefs_Misc/Weapons.xml b/ModPatches/Nearmare Race/Patches/Nearmare Race/ThingDefs_Misc/Weapons.xml
new file mode 100644
index 0000000000..c044a0cc58
--- /dev/null
+++ b/ModPatches/Nearmare Race/Patches/Nearmare Race/ThingDefs_Misc/Weapons.xml	
@@ -0,0 +1,397 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==========  Geist Knife  =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Geist_Knife</defName>
+		<statBases>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>1.5</ShotSpread>
+			<SwayFactor>0.85</SwayFactor>
+			<Bulk>1</Bulk>
+			<Mass>2</Mass>
+			<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Geist_Knife_Projectile</defaultProjectile>
+			<warmupTime>0.3</warmupTime>
+			<range>20</range>
+			<soundCast>Interact_BeatFire</soundCast>
+			<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
+		</Properties>
+		<FireModes>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Geist_Knife"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Geist_Knife"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.5</MeleeCritChance>
+				<MeleeParryChance>0.15</MeleeParryChance>
+				<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Geist_Knife"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.18</cooldownTime>
+					<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.32</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.26</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.42</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ==========  Larva Knife  =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Larva_SKnife</defName>
+		<statBases>
+			<SightsEfficiency>1.25</SightsEfficiency>
+			<ShotSpread>0.20</ShotSpread>
+			<SwayFactor>1.25</SwayFactor>
+			<Bulk>1</Bulk>
+			<Mass>2</Mass>
+			<RangedWeapon_Cooldown>1.26</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Larva_SKnife_Projectile</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>62</range>
+			<soundCast>Interact_BeatFire</soundCast>
+			<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
+		</Properties>
+		<FireModes>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Larva_SKnife"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Larva_SKnife"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.5</MeleeCritChance>
+				<MeleeParryChance>0.15</MeleeParryChance>
+				<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Larva_SKnife"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.18</cooldownTime>
+					<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.32</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.26</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.42</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ==========  Rugeiyo Pila  =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Rugeiyu_Pila</defName>
+		<statBases>
+			<SightsEfficiency>0.85</SightsEfficiency>
+			<ShotSpread>2</ShotSpread>
+			<SwayFactor>1.85</SwayFactor>
+			<Bulk>10</Bulk>
+			<Mass>4</Mass>
+			<RangedWeapon_Cooldown>1.19</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Rugeiyu_Pilum_Thrown</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>20</ticksBetweenBurstShots>
+			<range>51</range>
+			<soundCast>Interact_BeatFire</soundCast>
+			<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
+		</Properties>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Rugeiyu_Pila"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>1.08</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Rugeiyu_Pila"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.17</MeleeCritChance>
+				<MeleeParryChance>1.45</MeleeParryChance>
+				<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Rugeiyu_Pila"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.35</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.78</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.19</cooldownTime>
+					<chanceFactor>1.00</chanceFactor>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ==========  Wild Hunt  =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Nearmaere_WildHunt</defName>
+		<statBases>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.20</ShotSpread>
+			<SwayFactor>1.85</SwayFactor>
+			<Bulk>10</Bulk>
+			<Mass>4</Mass>
+			<RangedWeapon_Cooldown>40</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Nearmaere_WildHunt_B</defaultProjectile>
+			<warmupTime>20</warmupTime>
+			<range>86</range>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<onlyManualCast>true</onlyManualCast>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<FireModes>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Nearmaere_WildHunt"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.85</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>1.69</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_AssaultRifle_NM"]/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.2</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="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AssaultRifle_NM</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<Bulk>6.65</Bulk>
+			<ShotSpread>1</ShotSpread>
+			<SwayFactor>1.3</SwayFactor>
+			<Mass>3.5</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>3</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_127x55mm_FMJ</defaultProjectile>
+			<warmupTime>5</warmupTime>
+			<range>52</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>5.2</reloadTime>
+			<ammoSet>AmmoSet_127x55mm</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Nearmare Race/Patches/Nearmare Race/ThingDefs_Races/AlienRace_Nearmare.xml b/ModPatches/Nearmare Race/Patches/Nearmare Race/ThingDefs_Races/AlienRace_Nearmare.xml
new file mode 100644
index 0000000000..a93b6445a2
--- /dev/null
+++ b/ModPatches/Nearmare Race/Patches/Nearmare Race/ThingDefs_Races/AlienRace_Nearmare.xml	
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="HAR_Nearmaere_BasePawn"]/inspectorTabs/li[.="ITab_Pawn_Gear"]</xpath>
+		<value>
+			<li>CombatExtended.ITab_Inventory</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="HAR_Nearmaere_BasePawn"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Inventory"/>
+			<li Class="CombatExtended.CompProperties_TacticalManager"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="HAR_Nearmaere_BasePawn"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="HAR_Nearmaere_Base"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="HAR_Nearmaere_Base"]/statBases</xpath>
+		<value>
+			<Suppressability>1</Suppressability>
+			<SmokeSensitivity>1.2</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="HAR_Nearmaere_Base"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.162</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.162</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="HAR_Nearmaere_Base"]/alienRace/raceRestriction/whiteApparelList</xpath>
+		<value>
+			<li>CE_Apparel_TacVest</li>
+			<li>CE_Apparel_Backpack</li>
+			<li>CE_Apparel_TribalBackpack</li>
+			<li>CE_Apparel_BallisticShield</li>
+			<li>CE_Apparel_MeleeShield</li>
+			<li>CE_Apparel_GasMask</li>
+			<li>CE_Apparel_ImprovGasMask</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Nearmare Race/Patches/Nearmare Race/ThingDefs_Races/Race_Summons.xml b/ModPatches/Nearmare Race/Patches/Nearmare Race/ThingDefs_Races/Race_Summons.xml
new file mode 100644
index 0000000000..d0e59f2654
--- /dev/null
+++ b/ModPatches/Nearmare Race/Patches/Nearmare Race/ThingDefs_Races/Race_Summons.xml	
@@ -0,0 +1,513 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Nightstalker -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="NM_M_NightStalker_Base"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="NM_M_NightStalker_Base"]/statBases</xpath>
+		<value>
+			<Suppressability>0</Suppressability>
+			<SmokeSensitivity>0</SmokeSensitivity>
+			<ArmorRating_Electric>1</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="NM_M_NightStalker_Base"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+			<MeleeDodgeChance>0.21</MeleeDodgeChance>
+			<MeleeCritChance>0.20</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="NM_M_NightStalker_Base"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>9</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="NM_M_NightStalker_Base"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>ScratchToxic</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.19</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.1</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>ScratchToxic</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.19</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.1</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>1.46</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<chanceFactor>2</chanceFactor>
+					<armorPenetrationSharp>2.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.063</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>3.2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.225</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NM_M_NightStalker"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NM_M_NightStalker"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NM_M_NightStalker_b"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2.4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NM_M_NightStalker_b"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3.6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NM_M_NightStalker_c"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3.6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NM_M_NightStalker_c"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>5.4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NM_M_NightStalker_d"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4.8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NM_M_NightStalker_d"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>7.2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NM_M_NightStalker_e"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NM_M_NightStalker_e"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>9</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Nightgaunt -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="NM_M_NightGaunts_Base"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="NM_M_NightGaunts_Base"]/statBases</xpath>
+		<value>
+			<Suppressability>0</Suppressability>
+			<SmokeSensitivity>0</SmokeSensitivity>
+			<ArmorRating_Electric>1</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="NM_M_NightGaunts_Base"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.65</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="NM_M_NightGaunts_Base"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>9</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="NM_M_NightGaunts_Base"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>6</amount>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>55</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Frostbite</def>
+							<amount>6</amount>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>55</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NM_M_NightGaunts"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NM_M_NightGaunts"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NM_M_NightGaunts_b"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2.4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NM_M_NightGaunts_b"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3.6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NM_M_NightGaunts_c"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3.6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NM_M_NightGaunts_c"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>5.4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NM_M_NightGaunts_d"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4.8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NM_M_NightGaunts_d"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>7.2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NM_M_NightGaunts_e"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NM_M_NightGaunts_e"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>9</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Nightmare -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="NM_M_Nightmare_Base"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="NM_M_Nightmare_Base"]/statBases</xpath>
+		<value>
+			<Suppressability>0</Suppressability>
+			<SmokeSensitivity>0</SmokeSensitivity>
+			<ArmorRating_Electric>1</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="NM_M_Nightmare_Base"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.65</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="NM_M_Nightmare_Base"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>21</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="NM_M_Nightmare_Base"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>2.95</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>6.25</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>2.95</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>6.25</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>3.51</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<chanceFactor>0.9</chanceFactor>
+					<armorPenetrationSharp>9.38</armorPenetrationSharp>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>3.17</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NM_M_Nightmare"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NM_M_Nightmare"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>9</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NM_M_Nightmare_b"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NM_M_Nightmare_b"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NM_M_Nightmare_c"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NM_M_Nightmare_c"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NM_M_Nightmare_d"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NM_M_Nightmare_d"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>18</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NM_M_Nightmare_e"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NM_M_Nightmare_e"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>21</ArmorRating_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Neclose Race/Patches/Neclose Race/Bodies/Neclose_Bodytype.xml b/ModPatches/Neclose Race/Patches/Neclose Race/Bodies/Neclose_Bodytype.xml
new file mode 100644
index 0000000000..e7aa2dba86
--- /dev/null
+++ b/ModPatches/Neclose Race/Patches/Neclose Race/Bodies/Neclose_Bodytype.xml	
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Arm Groups-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="HAR_Neclose_Body"]//*[
+			customLabel="left shoulder"
+			]/groups
+		</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="HAR_Neclose_Body"]//*[
+			customLabel="right shoulder"
+			]/groups
+		</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="HAR_Neclose_Body"]//*[
+			customLabel="left arm"
+			]/groups
+		</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="HAR_Neclose_Body"]//*[
+			customLabel="right arm"
+			]/groups
+		</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+
+	<!--Natural Armor-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="HAR_Neclose_Body"]//*[
+			def="Torso" or
+			def="Neclose_Wing" or
+			def="Neck" or
+			def="Head" or
+			def="Nose" or
+			def="Jaw" or
+			def="Neclose_Horn" or
+			def="Shoulder" or
+			def="Arm" or
+			def="Hand" or
+			def="Finger" or
+			def="Leg" or
+			def="Foot"
+			]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Neclose Race/Patches/Neclose Race/Hediffs/Neclose_Hediffs.xml b/ModPatches/Neclose Race/Patches/Neclose Race/Hediffs/Neclose_Hediffs.xml
new file mode 100644
index 0000000000..894370f3b1
--- /dev/null
+++ b/ModPatches/Neclose Race/Patches/Neclose Race/Hediffs/Neclose_Hediffs.xml	
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="HAR_NC_Hediff_b"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>-1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="HAR_NC_Hediff_b"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>-1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="HAR_NC_Hediff_b"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>-0.20</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="HAR_NC_Hediff_b"]/stages/li[minSeverity="0.3"]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>-3</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="HAR_NC_Hediff_b"]/stages/li[minSeverity="0.3"]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>-4.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="HAR_NC_Hediff_b"]/stages/li[minSeverity="0.3"]/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>-0.40</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="HAR_NC_Hediff_b"]/stages/li[minSeverity="0.6"]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>-4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="HAR_NC_Hediff_b"]/stages/li[minSeverity="0.6"]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>-6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="HAR_NC_Hediff_b"]/stages/li[minSeverity="0.6"]/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>-0.60</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="HAR_NC_Hediff_b"]/stages/li[minSeverity="0.9"]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>-6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="HAR_NC_Hediff_b"]/stages/li[minSeverity="0.9"]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>-9</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="HAR_NC_Hediff_b"]/stages/li[minSeverity="0.9"]/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>-0.80</MeleeDodgeChance>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Neclose Race/Patches/Neclose Race/PawnKindDefs/Neclose_PawnKind.xml b/ModPatches/Neclose Race/Patches/Neclose Race/PawnKindDefs/Neclose_PawnKind.xml
new file mode 100644
index 0000000000..a9733ae76b
--- /dev/null
+++ b/ModPatches/Neclose Race/Patches/Neclose Race/PawnKindDefs/Neclose_PawnKind.xml	
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--combatPower-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[@Name="HAR_Neclose_KindBase"]/combatPower</xpath>
+		<value>
+			<combatPower>200</combatPower>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Neclose Race/Patches/Neclose Race/Scenario/Neclose_Scenario.xml b/ModPatches/Neclose Race/Patches/Neclose Race/Scenario/Neclose_Scenario.xml
new file mode 100644
index 0000000000..1b8eca31bb
--- /dev/null
+++ b/ModPatches/Neclose Race/Patches/Neclose Race/Scenario/Neclose_Scenario.xml	
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="Neclose_Scenario"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_303British_FMJ</thingDef>
+				<count>100</count>
+			</li>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_44Magnum_FMJ</thingDef>
+				<count>60</count>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ScenarioDef[defName="Neclose_Scenario"]/scenario/parts/li[thingDef="Apparel_AdvancedHelmet"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ScenarioDef[defName="Neclose_Scenario"]/scenario/parts/li[thingDef="Apparel_FlakVest"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ScenarioDef[defName="Neclose_Scenario"]/scenario/parts/li[thingDef="Apparel_FlakPants"]</xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Neclose Race/Patches/Neclose Race/ThingDefs_Misc/Neclose_Apparel.xml b/ModPatches/Neclose Race/Patches/Neclose Race/ThingDefs_Misc/Neclose_Apparel.xml
new file mode 100644
index 0000000000..b637d641ec
--- /dev/null
+++ b/ModPatches/Neclose Race/Patches/Neclose Race/ThingDefs_Misc/Neclose_Apparel.xml	
@@ -0,0 +1,262 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--========= Stuffable =========-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_NC_Tops_a" or
+			defName="HAR_NC_Tops_b" or
+			defName="HAR_NC_Tops_c"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Middle PA-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="HAR_NC_Armor_Base"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="HAR_NC_Armor_Base"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>50</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<!--Regular-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_NC_Armor_a"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>15</ArmorRating_Sharp>
+			<Bulk>80</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_NC_Armor_a"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>37.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_NC_Armor_a"
+			]/statBases/Mass </xpath>
+		<value>
+			<Mass>60</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_NC_Armor_a"
+			]/equippedStatOffsets/MoveSpeed </xpath>
+		<value>
+			<CarryWeight>60</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+			<MoveSpeed>-0.5</MoveSpeed>
+			<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<!--Light-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_NC_Armor_b"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+			<Bulk>80</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_NC_Armor_b"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_NC_Armor_b"
+			]/statBases/Mass </xpath>
+		<value>
+			<Mass>50</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_NC_Armor_b"
+			]/equippedStatOffsets/MeleeDodgeChance </xpath>
+		<value>
+			<CarryWeight>70</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<!--Mid-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_NC_Armor_c"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>13</ArmorRating_Sharp>
+			<Bulk>80</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_NC_Armor_c"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>32.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_NC_Armor_c"
+			]/statBases/Mass </xpath>
+		<value>
+			<Mass>60</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_NC_Armor_c"
+			]/equippedStatOffsets/MeleeDodgeChance </xpath>
+		<value>
+			<CarryWeight>70</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+			<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="HAR_NC_Armor_c"
+			]/equippedStatOffsets/MoveSpeed </xpath>
+	</Operation>
+
+	<!--Shell-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_NC_Shell_a" or
+			defName="HAR_NC_Shell_b" or
+			defName="HAR_NC_Shell_c"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Overhead-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_NC_Heads_a"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_NC_Heads_c" or
+			defName="HAR_NC_Heads_d" or
+			defName="HAR_NC_Heads_e"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Overhead Armor-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_NC_Heads_b"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>15</ArmorRating_Sharp>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_NC_Heads_b"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>37.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="HAR_NC_Heads_b"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="HAR_NC_Heads_b"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_NC_Heads_b"
+			]/equippedStatOffsets/MoveSpeed </xpath>
+		<value>
+			<AimingAccuracy>0.15</AimingAccuracy>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HAR_NC_Heads_b"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>60</Plasteel>
+			<DevilstrandCloth>20</DevilstrandCloth>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Neclose Race/Patches/Neclose Race/ThingDefs_Races/AlienRace_Neclose.xml b/ModPatches/Neclose Race/Patches/Neclose Race/ThingDefs_Races/AlienRace_Neclose.xml
new file mode 100644
index 0000000000..d00d2fa38f
--- /dev/null
+++ b/ModPatches/Neclose Race/Patches/Neclose Race/ThingDefs_Races/AlienRace_Neclose.xml	
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="HAR_Neclose_BaseNRPawn"]/inspectorTabs/li[.="ITab_Pawn_Gear"]</xpath>
+		<value>
+			<li>CombatExtended.ITab_Inventory</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="HAR_Neclose_BaseNRPawn"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Inventory"/>
+			<li Class="CombatExtended.CompProperties_TacticalManager"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="HAR_Neclose_BaseNRPawn"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Neclose"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Neclose"]/statBases</xpath>
+		<value>
+			<Suppressability>1</Suppressability>
+			<SmokeSensitivity>0.2</SmokeSensitivity>
+			<MeleeCritChance>1.00</MeleeCritChance>
+			<MeleeParryChance>1.00</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Neclose"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Neclose"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Neclose"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>HAR_NC_Damage_a</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>3.05</cooldownTime>
+					<extraMeleeDamages>
+						<li>
+							<def>HAR_NC_Damage_b</def>
+							<amount>5</amount>
+						</li>
+						<li>
+							<def>EMP</def>
+							<amount>10</amount>
+						</li>
+					</extraMeleeDamages>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationSharp>6.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>12.35</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>HAR_NC_Damage_a</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.66</cooldownTime>
+					<extraMeleeDamages>
+						<li>
+							<def>HAR_NC_Damage_b</def>
+							<amount>5</amount>
+						</li>
+						<li>
+							<def>EMP</def>
+							<amount>8</amount>
+						</li>
+					</extraMeleeDamages>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>2.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>7.75</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>HAR_NC_Damage_a</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.66</cooldownTime>
+					<extraMeleeDamages>
+						<li>
+							<def>HAR_NC_Damage_b</def>
+							<amount>5</amount>
+						</li>
+						<li>
+							<def>EMP</def>
+							<amount>8</amount>
+						</li>
+					</extraMeleeDamages>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>2.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>7.75</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Neclose"]/alienRace/raceRestriction/whiteApparelList</xpath>
+		<value>
+			<li>CE_Apparel_TacVest</li>
+			<li>CE_Apparel_Backpack</li>
+			<li>CE_Apparel_TribalBackpack</li>
+			<li>CE_Apparel_BallisticShield</li>
+			<li>CE_Apparel_MeleeShield</li>
+			<li>CE_Apparel_GasMask</li>
+			<li>CE_Apparel_ImprovGasMask</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Neclose Race/Patches/Neclose Race/ThingDefs_Races/Race_Summons.xml b/ModPatches/Neclose Race/Patches/Neclose Race/ThingDefs_Races/Race_Summons.xml
new file mode 100644
index 0000000000..b923c7de37
--- /dev/null
+++ b/ModPatches/Neclose Race/Patches/Neclose Race/ThingDefs_Races/Race_Summons.xml	
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Summons -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="NC_Summon_PawnBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="NC_Summon_PawnBase"]/statBases</xpath>
+		<value>
+			<Suppressability>0</Suppressability>
+			<SmokeSensitivity>0</SmokeSensitivity>
+			<MeleeDodgeChance>0.20</MeleeDodgeChance>
+			<MeleeCritChance>0.20</MeleeCritChance>
+			<MeleeParryChance>0.20</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			@Name="HAR_NC_M_a_race_Base" or
+			@Name="HAR_NC_M_b_race_Base" or
+			@Name="HAR_NC_M_c_race_Base"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>HAR_NC_Damage_a</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.19</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<extraMeleeDamages>
+						<li>
+							<def>HAR_NC_Damage_b</def>
+							<amount>5</amount>
+						</li>
+					</extraMeleeDamages>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.1</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>HAR_NC_Damage_a</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.19</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<extraMeleeDamages>
+						<li>
+							<def>HAR_NC_Damage_b</def>
+							<amount>5</amount>
+						</li>
+					</extraMeleeDamages>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.1</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>razorfangs</label>
+					<capacities>
+						<li>HAR_NC_Damage_a</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>1.46</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<extraMeleeDamages>
+						<li>
+							<def>HAR_NC_Damage_b</def>
+							<amount>5</amount>
+						</li>
+					</extraMeleeDamages>
+					<chanceFactor>2</chanceFactor>
+					<armorPenetrationSharp>2.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.063</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/New Mech - Mini-Miner/Patches/New Mech - Mini-Miner/Race_MiniMiner.xml b/ModPatches/New Mech - Mini-Miner/Patches/New Mech - Mini-Miner/Race_MiniMiner.xml
new file mode 100644
index 0000000000..8e40bef364
--- /dev/null
+++ b/ModPatches/New Mech - Mini-Miner/Patches/New Mech - Mini-Miner/Race_MiniMiner.xml	
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Pawn inherits needed StatBase stuff from LightMech parent.-->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Mech_MiniMiner"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_MiniMiner"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.0</cooldownTime>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.0</cooldownTime>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/NewRatkinPlus/Defs/NewRatkinPlus/Ammo/Flechette.xml b/ModPatches/NewRatkinPlus/Defs/NewRatkinPlus/Ammo/Flechette.xml
new file mode 100644
index 0000000000..e8cb087180
--- /dev/null
+++ b/ModPatches/NewRatkinPlus/Defs/NewRatkinPlus/Ammo/Flechette.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- Ammo -->
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="65x50mmSRArisakaBase">
+		<defName>Ammo_65x50mmSRArisaka_FLCH</defName>
+		<label>6.5x50mmSR Arisaka cartridge (Flechette)</label>
+		<graphicData>
+			<texPath>ThirdParty/Ratkin/FLCH</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.1</MarketValue>
+		</statBases>
+		<ammoClass>Flechette</ammoClass>
+	</ThingDef>
+
+	<!-- Projectile -->
+	<ThingDef ParentName="Base65x50mmSRArisakaBullet">
+		<defName>Bullet_65x50mmSRArisaka_FLCH</defName>
+		<label>6.5x50mmSR Arisaka cartridge (Flechette)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Fragment</damageDef>
+			<damageAmountBase>17</damageAmountBase>
+			<armorPenetrationSharp>3</armorPenetrationSharp>
+			<armorPenetrationBlunt>53.96</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<!-- Recipe -->
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_65x50mmSRArisaka_FLCH</defName>
+		<label>make 500 65x50mm Arisaka Flechette rounds.</label>
+		<description>Craft 65x50mm Arisaka Flechette rounds.</description>
+		<jobString>Making 65x50mm Arisaka Flechette rounds.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>24</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_65x50mmSRArisaka_FLCH>500</Ammo_65x50mmSRArisaka_FLCH>
+		</products>
+		<researchPrerequisite>FlechetteBullet</researchPrerequisite>
+		<workAmount>2800</workAmount>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/NewRatkinPlus/Defs/NewRatkinPlus/Ammo/RKBallistaBolt.xml b/ModPatches/NewRatkinPlus/Defs/NewRatkinPlus/Ammo/RKBallistaBolt.xml
new file mode 100644
index 0000000000..8e36eb4aeb
--- /dev/null
+++ b/ModPatches/NewRatkinPlus/Defs/NewRatkinPlus/Ammo/RKBallistaBolt.xml
@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoBallistaBolts</defName>
+		<label>Ballista Bolts</label>
+		<parent>AmmoNeolithic</parent>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_RKBallistaBolt</defName>
+		<label>Ballista Bolt</label>
+		<ammoTypes>
+			<Ammo_RKBallistaBolt>Projectile_RKBallistaBolt</Ammo_RKBallistaBolt>
+			<Ammo_RKBallistaBolt_Bodkin>Projectile_RKBallistaBolt_Bodkin</Ammo_RKBallistaBolt_Bodkin>
+			<Ammo_RKBallistaBolt_Fire>Projectile_RKBallistaBolt_Fire</Ammo_RKBallistaBolt_Fire>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Name="AmmoRKBallistaBolt" ParentName="AmmoBase" Abstract="True">
+		<description>Heavy bolt designed to be fired from a ratkin ballista.</description>
+		<statBases>
+			<Mass>2.00</Mass>
+			<Bulk>7.50</Bulk>
+			<Flammability>1</Flammability>
+		</statBases>
+		<thingCategories>
+			<li>AmmoBallistaBolts</li>
+		</thingCategories>
+		<stackLimit>75</stackLimit>
+		<techLevel>Medieval</techLevel>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoRKBallistaBolt">
+		<defName>Ammo_RKBallistaBolt</defName>
+		<label>Ballista Bolt</label>
+		<graphicData>
+			<texPath>Things/Item/Resource/Ballista_Bolt_Normal</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>7.5</MarketValue>
+		</statBases>
+		<ammoClass>RKBallistaBolt</ammoClass>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoRKBallistaBolt">
+		<defName>Ammo_RKBallistaBolt_Bodkin</defName>
+		<label>Ballista Bodkin Bolt</label>
+		<graphicData>
+			<texPath>Things/Item/Resource/Ballista_Bolt_AP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>9.5</MarketValue>
+		</statBases>
+		<ammoClass>RKBallistaBolt_AP</ammoClass>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoRKBallistaBolt">
+		<defName>Ammo_RKBallistaBolt_Fire</defName>
+		<label>Flaming Ballista Bolt</label>
+		<graphicData>
+			<texPath>Things/Item/Resource/Ballista_Bolt_HE</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>10.5</MarketValue>
+		</statBases>
+		<ammoClass>RKBallistaBolt_Fire</ammoClass>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="BaseProjectileNeolithic" Name="BaseProjectileRKBallista" Abstract="true">
+		<thingClass>CombatExtended.BulletCE</thingClass>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>45</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseProjectileRKBallista">
+		<defName>Projectile_RKBallistaBolt_Bodkin</defName>
+		<label>Ballista Bolt</label>
+		<graphicData>
+			<texPath>Things/Projectile/Ballista_Bolt_Normal</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Stab</damageDef>
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationBlunt>12.5</armorPenetrationBlunt>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+			<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>Ammo_RKBallistaBolt</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseProjectileRKBallista">
+		<defName>Projectile_RKBallistaBolt</defName>
+		<label>Ballista Bodkin Bolt</label>
+		<graphicData>
+			<texPath>Things/Projectile/Ballista_Bolt_AP</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Stab</damageDef>
+			<damageAmountBase>19</damageAmountBase>
+			<armorPenetrationBlunt>12.5</armorPenetrationBlunt>
+			<armorPenetrationSharp>4</armorPenetrationSharp>
+			<preExplosionSpawnChance>0.3</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>Ammo_RKBallistaBolt_Bodkin</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseProjectileRKBallista">
+		<defName>Projectile_RKBallistaBolt_Fire</defName>
+		<label>Ballista Bodkin Bolt</label>
+		<thingClass>CombatExtended.Projectile_FireTrail</thingClass>
+		<graphicData>
+			<texPath>Things/Projectile/Ballista_Bolt_HE</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>1.5</explosionRadius>
+			<damageAmountBase>15</damageAmountBase>
+			<damageDef>Flame</damageDef>
+			<armorPenetrationBlunt>12.5</armorPenetrationBlunt>
+			<armorPenetrationSharp>4</armorPenetrationSharp>
+			<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
+			<preExplosionSpawnChance>1</preExplosionSpawnChance>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>MakeRKBallistaBolt</defName>
+		<label>make ballista bolt</label>
+		<description>Craft ballista bolt.</description>
+		<jobString>Making ballista bolt.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>15</count>
+			</li>
+		</ingredients>
+		<workAmount>2300</workAmount>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_RKBallistaBolt>5</Ammo_RKBallistaBolt>
+		</products>
+		<recipeUsers>
+			<li>FueledSmithy</li>
+			<li>ElectricSmithy</li>
+			<li>RK_FueledSmithy</li>
+			<li>RK_ElectricSmithy</li>
+		</recipeUsers>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>MakeRKBallistaBodkinBolt</defName>
+		<label>make ballista bodkin bolt</label>
+		<description>Craft ballista bodkin bolt.</description>
+		<jobString>Making ballista bodkin bolt.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+		</ingredients>
+		<workAmount>3500</workAmount>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_RKBallistaBolt_Bodkin>5</Ammo_RKBallistaBolt_Bodkin>
+		</products>
+		<recipeUsers>
+			<li>FueledSmithy</li>
+			<li>ElectricSmithy</li>
+			<li>RK_FueledSmithy</li>
+			<li>RK_ElectricSmithy</li>
+		</recipeUsers>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>MakeRKBallistaFireBolt</defName>
+		<label>make flaming ballista bolt</label>
+		<description>Craft flaming ballista bolt.</description>
+		<jobString>Making flaming ballista bolt.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+		</ingredients>
+		<workAmount>5000</workAmount>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_RKBallistaBolt_Fire>5</Ammo_RKBallistaBolt_Fire>
+		</products>
+		<recipeUsers>
+			<li>FueledSmithy</li>
+			<li>ElectricSmithy</li>
+			<li>RK_FueledSmithy</li>
+			<li>RK_ElectricSmithy</li>
+		</recipeUsers>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/NewRatkinPlus/Defs/NewRatkinPlus/Ammo/RKCannonShell.xml b/ModPatches/NewRatkinPlus/Defs/NewRatkinPlus/Ammo/RKCannonShell.xml
new file mode 100644
index 0000000000..77d5bd216b
--- /dev/null
+++ b/ModPatches/NewRatkinPlus/Defs/NewRatkinPlus/Ammo/RKCannonShell.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>Ammo_RKCannonShell</defName>
+		<label>Ratkin Cannon Balls</label>
+		<parent>AmmoMedieval</parent>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_RKCannonBall</defName>
+		<label>Cannon Ball</label>
+		<ammoTypes>
+			<Ammo_RKCannonBall>Projectile_RKCannonBall</Ammo_RKCannonBall>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Name="AmmoRKCannonBall" ParentName="HeavyAmmoBase" Abstract="True">
+		<description>Simple solid shot, designed for ratkin cannons.</description>
+		<statBases>
+			<Mass>13.6</Mass>
+			<Bulk>8.31</Bulk>
+			<Flammability>1</Flammability>
+		</statBases>
+		<thingCategories>
+			<li>Ammo_RKCannonShell</li>
+		</thingCategories>
+		<stackLimit>25</stackLimit>
+		<techLevel>Medieval</techLevel>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoRKCannonBall">
+		<defName>Ammo_RKCannonBall</defName>
+		<label>Cannon Ball</label>
+		<graphicData>
+			<texPath>Things/Item/Resource/Big_mouse</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<drawSize>(0.6,0.6)</drawSize>
+		</graphicData>
+		<statBases>
+			<MarketValue>54.7</MarketValue>
+		</statBases>
+		<ammoClass>CannonBall</ammoClass>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="BaseProjectileNeolithic" Name="BaseProjectileRKCannon" Abstract="true">
+		<thingClass>CombatExtended.BulletCE</thingClass>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>45</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseProjectileRKCannon">
+		<defName>Projectile_RKCannonBall</defName>
+		<label>Cannon Ball</label>
+		<graphicData>
+			<texPath>Things/Projectile/Big_mouse</texPath>
+			<drawSize>(0.6,0.6)</drawSize>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>337</damageAmountBase>
+			<armorPenetrationBlunt>17856.08</armorPenetrationBlunt>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>MakeRKCannonBall</defName>
+		<label>make Cannon 5 Balls</label>
+		<description>Craft Cannon Ball x5.</description>
+		<jobString>Making Cannon Ball.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>138</count>
+			</li>
+		</ingredients>
+		<workAmount>13800</workAmount>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_RKCannonBall>5</Ammo_RKCannonBall>
+		</products>
+		<recipeUsers>
+			<li>FueledSmithy</li>
+			<li>ElectricSmithy</li>
+			<li>RK_FueledSmithy</li>
+			<li>RK_ElectricSmithy</li>
+		</recipeUsers>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/NewRatkinPlus/Defs/NewRatkinPlus/ThingDef_Misc/AmmoCategories.xml b/ModPatches/NewRatkinPlus/Defs/NewRatkinPlus/ThingDef_Misc/AmmoCategories.xml
new file mode 100644
index 0000000000..e8ba24ecaa
--- /dev/null
+++ b/ModPatches/NewRatkinPlus/Defs/NewRatkinPlus/ThingDef_Misc/AmmoCategories.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<CombatExtended.AmmoCategoryDef>
+		<defName>RK_CrossbowBolt</defName>
+		<label>Bolt</label>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>Flechette</defName>
+		<label>Flechette</label>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>RKBallistaBolt</defName>
+		<label>Ballista Bolt</label>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>RKBallistaBolt_Fire</defName>
+		<label>Flaming Ballista Bolt</label>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>RKBallistaBolt_AP</defName>
+		<label>Ballista Bodkin Bolt</label>
+	</CombatExtended.AmmoCategoryDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/Bodies/Bodies_Ratkin.xml b/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/Bodies/Bodies_Ratkin.xml
new file mode 100644
index 0000000000..c5a485a574
--- /dev/null
+++ b/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/Bodies/Bodies_Ratkin.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Add new parts ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel = "left arm"]/groups</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel = "right arm"]/groups</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Adjust Coverages ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Ribcage"]/coverage</xpath>
+		<value>
+			<coverage>0.06</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Pelvis"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Stomach"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Heart"]/coverage</xpath>
+		<value>
+			<coverage>0.03</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Lung"]/coverage</xpath>
+		<value>
+			<coverage>0.0525</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Kidney"]/coverage</xpath>
+		<value>
+			<coverage>0.03</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Liver"]/coverage</xpath>
+		<value>
+			<coverage>0.055</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Neck"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Skull"]/parts/li[def = "Brain"]/coverage</xpath>
+		<value>
+			<coverage>0.9</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def = "Eye"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def = "Ear"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def = "Nose"]/coverage</xpath>
+		<value>
+			<coverage>0.08</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Shoulder"]/coverage</xpath>
+		<value>
+			<coverage>0.085</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Clavicle"]/coverage</xpath>
+		<value>
+			<coverage>0.06</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def="Humerus"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def="Radius"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Leg"]/parts/li[def="Femur"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Leg"]/parts/li[def="Tibia"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Neck"]/parts/li[def = "Head"]/parts/li[customLabel="left ear"]/coverage</xpath>
+		<value>
+			<coverage>0.09</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Neck"]/parts/li[def = "Head"]/parts/li[customLabel="right ear"]/coverage</xpath>
+		<value>
+			<coverage>0.09</coverage>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/PawnKindDefs/PawnKinds_Ratkin.xml b/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/PawnKindDefs/PawnKinds_Ratkin.xml
new file mode 100644
index 0000000000..5ac1f5d944
--- /dev/null
+++ b/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/PawnKindDefs/PawnKinds_Ratkin.xml
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Add tags for loadbearing gear to pawns.. =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[
+			defName="RatkinColonist" or
+			defName="RatkinNoble" or
+			defName="RatkinServant" or
+			defName="RatkinCombatant" or
+			defName="RatkinEliteGuardener" or
+			defName="RatkinMercenary" or
+			defName="RatkinKnight" or
+			defName="RatkinKnightCommander" or
+			defName="RatkinPriest" or
+			defName="RatkinMerchant" or
+			defName="RatkinMercenaryLight" or
+			defName="RatkinMurderer" or
+			defName="RatkinVagabond" or
+			defName="RatkinDemonMan" or
+			defName="RatkinEliteSoldier" or
+			defName="RatkinSoldier"
+			]/apparelTags </xpath>
+		<value>
+			<li>RK_Loadbearing</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Combatant ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RatkinCombatant"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>8</min>
+					<max>12</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Mercenary ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RatkinMercenary"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Merchant ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RatkinMerchant"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Soldier ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RatkinSoldier"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Subject ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RatkinSubject"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Guardener ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RatkinEliteGuardener"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Murderer ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RatkinMurderer"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Vagabond ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RatkinVagabond"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Mercenary - Light ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RatkinMercenaryLight"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Elite ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RatkinEliteSoldier"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Demoman ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RatkinDemonMan"]/weaponTags</xpath>
+		<value>
+			<weaponTags>
+				<li>GrenadeDestructive</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RatkinDemonMan"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>8</min>
+					<max>12</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<magazineCount>
+							<min>6</min>
+							<max>10</max>
+						</magazineCount>
+						<generateChance>0.7</generateChance>
+						<sidearmMoney>
+							<min>375</min>
+							<max>825</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>RK_Rifle</li>
+							<li>CE_AI_Grenade</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Vagabond ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RatkinPettyThief"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/Scenarios/Scenarios.xml b/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/Scenarios/Scenarios.xml
new file mode 100644
index 0000000000..6758df3203
--- /dev/null
+++ b/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/Scenarios/Scenarios.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="RK_Scenario"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_CrossbowBolt_Stone</thingDef>
+				<count>60</count>
+			</li>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_65x50mmSRArisaka_FMJ</thingDef>
+				<count>60</count>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/FactionDef[@Name="RK_PlayerFactionBase"]/apparelStuffFilter</xpath>
+		<match Class="PatchOperationConditional">
+			<xpath>Defs/FactionDef[@Name="RK_PlayerFactionBase"]/apparelStuffFilter/thingDefs</xpath>
+			<match Class="PatchOperationConditional">
+				<xpath>Defs/FactionDef[@Name="RK_PlayerFactionBase"]/apparelStuffFilter/thingDefs/li["Steel"]</xpath>
+				<match Class="PatchOperationReplace">
+					<xpath>Defs/FactionDef[@Name="RK_PlayerFactionBase"]/apparelStuffFilter/thingDefs/li["Steel"]</xpath>
+					<value>
+						<li>Steel</li>
+					</value>
+				</match>
+				<nomatch Class="PatchOperationAdd">
+					<xpath>Defs/FactionDef[@Name="RK_PlayerFactionBase"]/apparelStuffFilter/thingDefs</xpath>
+					<value>
+						<li>Steel</li>
+					</value>
+				</nomatch>
+			</match>
+			<nomatch Class="PatchOperationAdd">
+				<xpath>Defs/FactionDef[@Name="RK_PlayerFactionBase"]/apparelStuffFilter</xpath>
+				<value>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</value>
+			</nomatch>
+		</match>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/FactionDef[@Name="RK_PlayerFactionBase"]</xpath>
+			<value>
+				<apparelStuffFilter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</apparelStuffFilter>
+			</value>
+		</nomatch>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_Apparel.xml b/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_Apparel.xml
new file mode 100644
index 0000000000..d98aa3f12b
--- /dev/null
+++ b/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_Apparel.xml
@@ -0,0 +1,555 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--NOTE: Numerous pieces of apparel aren't patched here. Apparel without a specific value for Bulk or WornBulk
+	defaults to '1' for both. So, smaller pieces of clothing don't need patched.-->
+
+	<!-- ========== CLOTHING =========== -->
+	<!-- ========== Apparel Base =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RK_ApparelBase"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="RK_ApronSkirt" or
+			defName="RK_SummerDress" or
+			defName="RK_Cardigan" or
+			defName="RK_WorkerWear" or
+			defName="RK_ResearchGown" or
+			defName="RK_ExplorerWear" or
+			defName="RK_ChefSuit" or
+			defName="RK_GaurdenUniform" or
+			defName="RK_WinterRobe" or
+			defName="RK_FlatColorCoat" or
+			defName="RK_SistersDerss" or
+			defName="RK_SantaRobe"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+	</Operation>
+
+	<!-- ========== Gaurden Uniform =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_GaurdenUniform"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>6</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_GaurdenUniform"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_GaurdenUniform"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ========== Winter Robe =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_WinterRobe"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>4</WornBulk>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Cardigan =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_Cardigan"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Coat =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_FlatColorCoat"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== White Coat =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_WhiteCoat"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>4</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_WhiteCoat"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.60</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_WhiteCoat"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ========== LOADBEARING GEAR =========== -->
+	<!-- ========== Crossback =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_CrossBack"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_CrossBack"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>20</CarryBulk>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- ========== Backpack =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_Backpack"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_Backpack"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>30</CarryBulk>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- ========== Outoor Backpack =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_OutdoorBackpack"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_OutdoorBackpack"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>40</CarryBulk>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- ========== Sack =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_Sack"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_Sack"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>50</CarryBulk>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- ========== Santa Sack =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_SantaSack"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_SantaSack"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>60</CarryBulk>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- ========== ARMOR =========== -->
+	<!-- ========== Combat Helmet =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_BulletProofHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_BulletProofHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_BulletProofHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	
+	<!-- ========== Order Uniform =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_OrderUniform"]/statBases/Mass</xpath>
+		<value>
+			<Bulk>16</Bulk>
+			<WornBulk>10</WornBulk>
+			<Mass>10</Mass>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_OrderUniform"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_OrderUniform"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5.75</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_OrderUniform"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>7.875</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	
+	<!-- ========== Battlesuit =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_BattleSuit"]/statBases</xpath>
+		<value>
+			<Bulk>60</Bulk>
+			<WornBulk>12</WornBulk>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RK_BattleSuit"]/statBases/StuffEffectMultiplierArmor</xpath>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_BattleSuit"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_BattleSuit"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_BattleSuit"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>30</CarryBulk>
+				<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+				<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_BattleSuit"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+	
+	<!-- ========== Combat Mask =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_Mask" or defName="RK_MaskB"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_Mask" or defName="RK_MaskB"]/equippedStatOffsets</xpath>
+		<value>
+			<PsychicSensitivity>-0.1</PsychicSensitivity>
+			<AimingAccuracy>0.1</AimingAccuracy>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RK_Mask" or defName="RK_MaskB"]/statBases/StuffEffectMultiplierArmor</xpath>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_Mask" or defName="RK_MaskB"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>13</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_Mask" or defName="RK_MaskB"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>32</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	
+	<!-- ========== Plate Armor =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_Plate"]/statBases</xpath>
+		<value>
+			<Bulk>80</Bulk>
+			<WornBulk>8</WornBulk>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_Plate"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_Plate"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+	
+	<!-- ========== Plate Armor - Helmets =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_PlateHelmA" or
+			defName="RK_PlateHelmB" or
+			defName="RK_PlateHelmC"]/statBases </xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_PlateHelmA" or
+			defName="RK_PlateHelmB" or
+			defName="RK_PlateHelmC"]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_PlateHelmA" or
+			defName="RK_PlateHelmB" or
+			defName="RK_PlateHelmC"]/equippedStatOffsets </xpath>
+		<value>
+			<AimingAccuracy>-0.4</AimingAccuracy>
+			<MeleeHitChance>-2</MeleeHitChance>
+		</value>
+	</Operation>
+
+	<!-- ========== Shields =========== -->
+	
+	<!-- ========== WoodenShield =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_WoodenShield"]/statBases</xpath>
+		<value>
+			<Bulk>7</Bulk>
+			<WornBulk>4</WornBulk>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_WoodenShield"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_WoodenShield"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.75</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_WoodenShield"]/equippedStatOffsets</xpath>
+		<value>
+			<ReloadSpeed>-0.2</ReloadSpeed>
+			<MeleeHitChance>-1</MeleeHitChance>
+			<ShootingAccuracyPawn>-0.15</ShootingAccuracyPawn>
+			<AimingAccuracy>-0.08</AimingAccuracy>
+			<Suppressability>-0.25</Suppressability>
+			<MeleeCritChance>-0.05</MeleeCritChance>
+			<MeleeParryChance>1.0</MeleeParryChance>
+		</value>
+	</Operation>
+		
+	<!-- ========== HeavyShield =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_HeavyShield"]/statBases/Mass</xpath>
+		<value>
+			<Mass>8</Mass>
+			<Bulk>14</Bulk>
+			<WornBulk>8</WornBulk>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_HeavyShield"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_HeavyShield"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_HeavyShield"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_HeavyShield"]/equippedStatOffsets</xpath>
+		<value>
+			<ReloadSpeed>-0.2</ReloadSpeed>
+			<MeleeHitChance>-1</MeleeHitChance>
+			<ShootingAccuracyPawn>-0.30</ShootingAccuracyPawn>
+			<AimingAccuracy>-0.16</AimingAccuracy>
+			<Suppressability>-0.25</Suppressability>
+			<MeleeCritChance>-0.05</MeleeCritChance>
+			<MeleeParryChance>1.0</MeleeParryChance>
+		</value>
+	</Operation>
+	
+	<!-- ========== HeavyShield_Big =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_HeavyShield_Big"]/statBases/Mass</xpath>
+		<value>
+			<Mass>12</Mass>
+			<Bulk>18</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_HeavyShield_Big"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_HeavyShield_Big"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_HeavyShield_Big"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_HeavyShield_Big"]/equippedStatOffsets/MeleeHitChance</xpath>
+		<value>
+			<ReloadSpeed>-0.3</ReloadSpeed>
+			<MeleeHitChance>-1.2</MeleeHitChance>
+			<ShootingAccuracyPawn>-0.40</ShootingAccuracyPawn>
+			<AimingAccuracy>-0.40</AimingAccuracy>
+			<Suppressability>-0.50</Suppressability>
+			<MeleeCritChance>-0.05</MeleeCritChance>
+			<MeleeParryChance>1.0</MeleeParryChance>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_HeavyShield" or defName="RK_WoodenShield" or defName="RK_HeavyShield_Big"]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>Shield</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<!-- ========== Add proper tags to loadbearing gear. =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RK_SantaSack" or
+			defName="RK_Backpack" or
+			defName="RK_CrossBack" or
+			defName="RK_OutsideBackpack" or
+			defName="RK_Sack"
+			]/apparel/tags </xpath>
+		<value>
+			<li>RK_Loadbearing</li>
+		</value>
+	</Operation>
+	
+	<!-- ========== Fix apparel layer for loadbearing gear. =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RK_SantaSack" or
+			defName="RK_Backpack" or
+			defName="RK_CrossBack" or
+			defName="RK_OutsideBackpack" or
+			defName="RK_Sack"
+			]/apparel/layers </xpath>
+		<value>
+			<layers>
+				<li>Backpack</li>
+			</layers>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_Buildings_Security.xml b/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_Buildings_Security.xml
new file mode 100644
index 0000000000..30f4201eac
--- /dev/null
+++ b/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_Buildings_Security.xml
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Ratkin Ballista ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding"]/inspectorTabs</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding"]/statBases/AccuracyTouch</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding"]/statBases/AccuracyShort</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding"]/statBases/AccuracyMedium</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding"]/statBases/AccuracyLong</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>1</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryWeapon"]/building</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryWeapon"]/comps/li[@Class="CompProperties_ChangeableProjectile"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryWeapon"]/statBases/AccuracyTouch</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryWeapon"]/statBases/AccuracyShort</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryWeapon"]/statBases/AccuracyMedium</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryWeapon"]/statBases/AccuracyLong</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "RK_Turret_Ballista_Strait"]</xpath>
+		<value>
+			<statBases/>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RK_Turret_Ballista_Strait</defName>
+		<statBases>
+			<Mass>16.5</Mass>
+			<Bulk>20</Bulk>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>0.96</SwayFactor>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_RKBallistaBolt</defaultProjectile>
+			<warmupTime>2.1</warmupTime>
+			<range>44</range>
+			<soundCast>BallistaShot</soundCast>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>8</reloadTime>
+			<ammoSet>AmmoSet_RKBallistaBolt</ammoSet>
+		</AmmoUser>
+		<FireModes>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="BallistaBolt_Normal"]</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="BallistaBolt_AP"]</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="BallistaBolt_Heavy"]</xpath>
+	</Operation>
+
+	<!-- ========== Ratkin Cannon ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding_Cannon"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding_Cannon"]/inspectorTabs</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding_Cannon"]/statBases/AccuracyTouch</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding_Cannon"]/statBases/AccuracyShort</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding_Cannon"]/statBases/AccuracyMedium</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding_Cannon"]/statBases/AccuracyLong</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding_Cannon"]/costList/Chemfuel</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding_Cannon"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>1</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryWeapon_Cannon"]/building</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryWeapon_Cannon"]/comps/li[@Class="CompProperties_ChangeableProjectile"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryWeapon_Cannon"]/statBases/AccuracyTouch</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryWeapon_Cannon"]/statBases/AccuracyShort</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryWeapon_Cannon"]/statBases/AccuracyMedium</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryWeapon_Cannon"]/statBases/AccuracyLong</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "RK_Turret_Cannon_Strait"]</xpath>
+		<value>
+			<statBases/>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RK_Turret_Cannon_Strait</defName>
+		<statBases>
+			<Mass>20</Mass>
+			<Bulk>20</Bulk>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.26</ShotSpread>
+			<SwayFactor>1.55</SwayFactor>
+			<RangedWeapon_Cooldown>3</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_RKCannonBall</defaultProjectile>
+			<warmupTime>4.9</warmupTime>
+			<range>75</range>
+			<soundCast>RKCannonShot</soundCast>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>14</reloadTime>
+			<ammoSet>AmmoSet_RKCannonBall</ammoSet>
+		</AmmoUser>
+		<FireModes>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Bolts -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Bullet_Big_mouse"]</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Big_mouse"]</xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_MeleeWeapons.xml b/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_MeleeWeapons.xml
new file mode 100644
index 0000000000..8f8e4d5fc5
--- /dev/null
+++ b/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_MeleeWeapons.xml
@@ -0,0 +1,709 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Axe -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_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>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_Axe"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_Axe"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.10</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+			<MeleeDodgeChance>0.20</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_Axe"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- Cleaver -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_Cleaver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.656</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.43</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_Cleaver"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_Cleaver"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>0.35</MeleeParryChance>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_Cleaver"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- Two-Handed Sword -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_TwoHanded"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.6</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.65</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.6</cooldownTime>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>0.65</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.45</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>33</power>
+					<cooldownTime>1.43</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>2.106</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.53</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_TwoHanded"]/statBases</xpath>
+		<value>
+			<Bulk>7</Bulk>
+			<MeleeCounterParryBonus>1.13</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_TwoHanded"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.77</MeleeCritChance>
+				<MeleeParryChance>0.85</MeleeParryChance>
+				<MeleeDodgeChance>0.37</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_TwoHanded"]/statBases/Mass</xpath>
+		<value>
+			<Mass>1.3</Mass>
+		</value>
+	</Operation>
+
+	<!-- Pitchfork -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_Fork"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.5</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>1.352</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2.11</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.512</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.3</cooldownTime>
+					<chanceFactor>1.00</chanceFactor>
+					<armorPenetrationBlunt>1.352</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.31</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_Fork"]/statBases</xpath>
+		<value>
+			<Bulk>7</Bulk>
+			<MeleeCounterParryBonus>2</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_Fork"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.16</MeleeCritChance>
+			<MeleeParryChance>1.5</MeleeParryChance>
+			<MeleeDodgeChance>0.8</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- Bill -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_Hockey"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.35</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.78</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>3</cooldownTime>
+					<armorPenetrationBlunt>1.44</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.48</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_Hockey"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
+			<Bulk>8</Bulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_Hockey"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.17</MeleeCritChance>
+				<MeleeParryChance>1.45</MeleeParryChance>
+				<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Dagger -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_Dagger"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.18</cooldownTime>
+					<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.32</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.26</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.42</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_Dagger"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_Dagger"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.5</MeleeCritChance>
+				<MeleeParryChance>0.15</MeleeParryChance>
+				<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- One-handed Sword -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_OneHanded"]/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>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_OneHanded"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_OneHanded"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_OneHanded"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.2</MeleeCritChance>
+				<MeleeParryChance>0.35</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Two-handed Sword (Remove pointless duplicate.) -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RK_LongSword"]</xpath>
+	</Operation>
+
+	<!-- Magic Wand/Concussion Grenade -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_MagicWand"]/costList/Chemfuel</xpath>
+		<value>
+			<FSX>1</FSX>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_MagicWand"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Kaboom</li>
+					</capacities>
+					<power>5</power>
+					<armorPenetrationBlunt>5.625</armorPenetrationBlunt>
+					<cooldownTime>1.5</cooldownTime>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Light Lance -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_LightLance"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.67</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>1.224</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2.14</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.544</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.43</cooldownTime>
+					<chanceFactor>1.00</chanceFactor>
+					<armorPenetrationBlunt>1.224</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.84</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_LightLance"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>1.88</MeleeCounterParryBonus>
+			<Bulk>7</Bulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_LightLance"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.2</MeleeCritChance>
+				<MeleeParryChance>1.41</MeleeParryChance>
+				<MeleeDodgeChance>0.8</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Heavy Lance -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_HeavyLance"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.83</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>1.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2.36</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.57</cooldownTime>
+					<chanceFactor>1.00</chanceFactor>
+					<armorPenetrationBlunt>1.8</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.2</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_HeavyLance"]/statBases/Mass</xpath>
+		<value>
+			<MeleeCounterParryBonus>1.28</MeleeCounterParryBonus>
+			<Bulk>7</Bulk>
+			<Mass>5</Mass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_HeavyLance"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.2</MeleeCritChance>
+				<MeleeParryChance>0.98</MeleeParryChance>
+				<MeleeDodgeChance>0.8</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_HeavyLance"]/stuffCategories/li[.="Metallic"]</xpath>
+		<value>
+			<li>Metallic_Weapon</li>
+		</value>
+	</Operation>
+
+	<!-- Gunlances (Normal & Spread) -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_Gunlance_NormalType" or defName="RK_Gunlance_SpreadType"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.9</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.65</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.6</cooldownTime>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.9</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>38</power>
+					<cooldownTime>2.1</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>4.106</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.90</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_Gunlance_NormalType" or defName="RK_Gunlance_SpreadType"]/statBases/Mass</xpath>
+		<value>
+			<MeleeCounterParryBonus>1.28</MeleeCounterParryBonus>
+			<Bulk>7</Bulk>
+			<Mass>8</Mass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_Gunlance_NormalType" or defName="RK_Gunlance_SpreadType"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.2</MeleeCritChance>
+				<MeleeParryChance>0.98</MeleeParryChance>
+				<MeleeDodgeChance>0.8</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_Gunlance_NormalType" or defName="RK_Gunlance_SpreadType"]/stuffCategories/li[.="Metallic"]</xpath>
+		<value>
+			<li>Metallic_Weapon</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Patch StrawberryBeer ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_StrawberryBeer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2.22</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>neck</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>3.33</cooldownTime>
+					<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Neck</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_StrawberryBeer"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.33</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_StrawberryBeer"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.1</MeleeCritChance>
+				<MeleeParryChance>0.33</MeleeParryChance>
+				<MeleeDodgeChance>0.07</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="RK_StrawberryBeer"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="RK_StrawberryBeer"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_StrawberryBeer"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_RangedWeapons.xml b/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_RangedWeapons.xml
new file mode 100644
index 0000000000..8edf4c8cdc
--- /dev/null
+++ b/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_RangedWeapons.xml
@@ -0,0 +1,501 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Melee Tools - Rifles ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_Rifle" or defName="RK_SniperRifle" or defName="RK_FlechetteRifle" or defName="RK_FlechetteSniperRifle" or defName="RK_Rifle_line"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.09</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>1.82</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>bayonet</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.38</cooldownTime>
+					<armorPenetrationBlunt>1.08</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.72</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_Crossbow" or defName="RK_EnhanceCrossBow" or defName="RK_AutoCrossBow"]/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>
+
+	<!-- ========== Crossbow ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RK_Crossbow</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.5</ShotSpread>
+			<SwayFactor>1.2</SwayFactor>
+			<Bulk>7.5</Bulk>
+			<RangedWeapon_Cooldown>0.1</RangedWeapon_Cooldown>
+			<WorkToMake>2400</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_CrossbowBolt_Stone</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>20</range>
+			<soundCast>Bow_Small</soundCast>
+		</Properties>
+		<costList>
+			<WoodLog>40</WoodLog>
+			<Steel>20</Steel>
+		</costList>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>7</reloadTime>
+			<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags Inherit="False">
+			<li>RK_1TierRange</li>
+			<li>RK_Crossbow</li>
+			<li>RK_Weapon</li>
+			<li>RK_RangeWeapon</li>
+			<li>RK_Combatant</li>
+			<li>CE_Bow</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Enhanced Crossbow ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RK_EnhanceCrossBow</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.4</ShotSpread>
+			<SwayFactor>1.4</SwayFactor>
+			<Bulk>9.00</Bulk>
+			<RangedWeapon_Cooldown>0.1</RangedWeapon_Cooldown>
+			<WorkToMake>2600</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_CrossbowBolt_Stone</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>28</range>
+			<soundCast>Bow_Large</soundCast>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>9</reloadTime>
+			<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags Inherit="False">
+			<li>RK_1TierRange</li>
+			<li>RK_Crossbow</li>
+			<li>RK_Weapon</li>
+			<li>RK_RangeWeapon</li>
+			<li>RK_Combatant</li>
+			<li>CE_Bow</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Auto Crossbow ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RK_AutoCrossBow</defName>
+		<statBases>
+			<SightsEfficiency>0.9</SightsEfficiency>
+			<ShotSpread>0.5</ShotSpread>
+			<SwayFactor>1.2</SwayFactor>
+			<Bulk>6.5</Bulk>
+			<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
+			<WorkToMake>7500</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_CrossbowBolt_Stone</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>18</range>
+			<soundCast>Bow_Large</soundCast>
+		</Properties>
+		<AmmoUser>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<magazineSize>6</magazineSize>
+			<reloadTime>1.7</reloadTime>
+			<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags Inherit="False">
+			<li>RK_1TierRange</li>
+			<li>RK_Crossbow</li>
+			<li>RK_Weapon</li>
+			<li>RK_RangeWeapon</li>
+			<li>RK_Combatant</li>
+			<li>CE_Bow</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Rifle ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_65x50mmSRArisaka"]/ammoTypes</xpath>
+		<value>
+			<Ammo_65x50mmSRArisaka_FLCH>Bullet_65x50mmSRArisaka_FLCH</Ammo_65x50mmSRArisaka_FLCH>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RK_Rifle</defName>
+		<statBases>
+			<Mass>3.30</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.30</SwayFactor>
+			<Bulk>9.66</Bulk>
+			<WorkToMake>12000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>30</WoodLog>
+			<Steel>55</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_65x50mmSRArisaka_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Rifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_65x50mmSRArisaka</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>RK_3TierWeapon</li>
+			<li>RK_2TierWeapon</li>
+			<li>RK_Rifle</li>
+			<li>RK_Weapon</li>
+			<li>RK_RangeWeapon</li>
+			<li>RK_Combatant</li>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Shotgun ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RK_Rifle_line</defName>
+		<statBases>
+			<Mass>3.30</Mass>
+			<RangedWeapon_Cooldown>1.00</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.22</SwayFactor>
+			<Bulk>9</Bulk>
+			<WorkToMake>9500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>45</Steel>
+			<WoodLog>10</WoodLog>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>FlechetteRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+		</FireModes>
+		<weaponTags>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Sniper Rifle ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RK_SniperRifle</defName>
+		<statBases>
+			<Mass>3.6</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.37</SwayFactor>
+			<Bulk>9.86</Bulk>
+			<WorkToMake>15000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>30</WoodLog>
+			<Steel>70</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_65x50mmSRArisaka_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>68</range>
+			<soundCast>Rifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_65x50mmSRArisaka</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>RK_3TierWeapon</li>
+			<li>RK_2TierWeapon</li>
+			<li>RK_Rifle</li>
+			<li>RK_Weapon</li>
+			<li>RK_RangeWeapon</li>
+			<li>RK_Combatant</li>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Remove Flechette Rifle & Sniper Rifle ========== -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RK_FlechetteRifle" or defName="RK_FlechetteSniperRifle"]</xpath>
+	</Operation>
+
+	<!-- ========== Prototype Pulse Rifle ========== -->
+	<Operation Class="PatchOperationRemove"><!-- Remove special fire modes; replaced with ammo types. -->
+		<xpath>Defs/ThingDef[defName="RK_PrototypePulseRifle"]/verbs</xpath>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RK_PrototypePulseRifle</defName>
+		<statBases>
+			<Mass>3.5</Mass>
+			<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.05</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.20</SwayFactor>
+			<Bulk>9.00</Bulk>
+			<WorkToMake>40000</WorkToMake>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.51</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>48</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>6</burstShotCount>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>4</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+		<researchPrerequisite>ChargedShot</researchPrerequisite>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_PrototypePulseRifle"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.09</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>1.82</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>3.86</cooldownTime>
+					<armorPenetrationBlunt>0.96</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.79</cooldownTime>
+					<armorPenetrationBlunt>1.82</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Anti-Materiel Rifle ========== -->
+	<Operation Class="PatchOperationRemove"><!-- Remove special fire modes; replaced with ammo types. -->
+		<xpath>Defs/ThingDef[defName="RK_BFR"]/verbs</xpath>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RK_BFR</defName>
+		<statBases>
+			<Mass>10.5</Mass>
+			<RangedWeapon_Cooldown>0.48</RangedWeapon_Cooldown>
+			<SightsEfficiency>3.5</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>2.10</SwayFactor>
+			<Bulk>16.8</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>85</range>
+			<burstShotCount>1</burstShotCount>
+			<soundCast>PrototypePulse</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>2.6</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_BFR"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.09</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>1.82</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>3.86</cooldownTime>
+					<armorPenetrationBlunt>0.96</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.79</cooldownTime>
+					<armorPenetrationBlunt>1.82</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_Rifle" or defName="RK_SniperRifle" or defName="RK_FlechetteRifle" or defName="RK_FlechetteSniperRifle" or defName="RK_Rifle_line"]/weaponTags</xpath>
+		<value>
+			<li>NoSwitch</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDefs_Races/Race_KingHamster.xml b/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDefs_Races/Race_KingHamster.xml
new file mode 100644
index 0000000000..b182dab9e5
--- /dev/null
+++ b/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDefs_Races/Race_KingHamster.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== RK_KingHamster ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RK_KingHamster"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_KingHamster"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4.5</MoveSpeed>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_KingHamster"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.19</MeleeDodgeChance>
+			<MeleeCritChance>0.14</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_KingHamster"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.87</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>2</chanceFactor>
+					<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>3</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDefs_Races/Race_Rakinlike.xml b/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDefs_Races/Race_Rakinlike.xml
new file mode 100644
index 0000000000..5834ba5d3a
--- /dev/null
+++ b/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDefs_Races/Race_Rakinlike.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Ratkin" or defName="Ratkin_Su"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Ratkin" or defName="Ratkin_Su"]/statBases</xpath>
+		<value>
+			<MeleeCritChance>0.95</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Ratkin" or defName="Ratkin_Su"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>1.05</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Ratkin" or defName="Ratkin_Su"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.32</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.03</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.1</chanceFactor>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Adding Inventory Support-->
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Ratkin" or defName="Ratkin_Su"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Ratkin" or defName="Ratkin_Su"]</xpath>
+			<value>
+				<comps>
+					<li>
+						<compClass>CombatExtended.CompPawnGizmo</compClass>
+					</li>
+					<li Class="CombatExtended.CompProperties_Suppressable"/>
+				</comps>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationReplace">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Ratkin" or defName="Ratkin_Su"]/comps</xpath>
+			<value>
+				<comps>
+					<li>
+						<compClass>CombatExtended.CompPawnGizmo</compClass>
+					</li>
+					<li Class="CombatExtended.CompProperties_Suppressable"/>
+				</comps>
+			</value>
+		</match>
+	</Operation>
+
+	<!-- Tweak weaponList -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Ratkin" or defName="Ratkin_Su"]/alienRace/raceRestriction/weaponList/li[.="RK_LongSword"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Ratkin" or defName="Ratkin_Su"]/alienRace/raceRestriction/weaponList/li[.="RK_FlechetteRifle"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Ratkin" or defName="Ratkin_Su"]/alienRace/raceRestriction/weaponList/li[.="RK_FlechetteSniperRifle"]</xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDefs_Races/Race_Rotti.xml b/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDefs_Races/Race_Rotti.xml
new file mode 100644
index 0000000000..9aba571a7f
--- /dev/null
+++ b/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDefs_Races/Race_Rotti.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Rotti ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Rotti"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Rotti"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>3.9</MoveSpeed>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Rotti"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			<MeleeCritChance>0</MeleeCritChance>
+			<MeleeParryChance>0</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Rotti"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>2.01</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>2.01</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>0.84</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>2</chanceFactor>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.144</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>3</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Nihal/Patches/Nihal/PawnKinds_NiHal.xml b/ModPatches/Nihal/Patches/Nihal/PawnKinds_NiHal.xml
new file mode 100644
index 0000000000..186fdab9b8
--- /dev/null
+++ b/ModPatches/Nihal/Patches/Nihal/PawnKinds_NiHal.xml
@@ -0,0 +1,374 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Scoot ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="NihalPeasant"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.25</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="NihalPeasant"]/weaponMoney</xpath>
+		<value>
+			<weaponMoney>
+				<min>350</min>
+				<max>800</max>
+			</weaponMoney>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="NihalSlave"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="NihalRefugee"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="NihalMilitia"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.25</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="NihalTownCouncilman"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.25</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="NihalTownCouncilman"]</xpath>
+		<value>
+			<weaponMoney>
+				<min>400</min>
+				<max>800</max>
+			</weaponMoney>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="NihalSniper"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="NihalSoldier"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="NihalSlasher"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="NihalGunner"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="NihalGrenadier"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="NiHalBoss"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Nihal/Patches/Nihal/Scenarios.xml b/ModPatches/Nihal/Patches/Nihal/Scenarios.xml
new file mode 100644
index 0000000000..5a8d000f11
--- /dev/null
+++ b/ModPatches/Nihal/Patches/Nihal/Scenarios.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="NihalScenario"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_RPG7Grenade_HEAT</thingDef>
+				<count>5</count>
+			</li>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_12x64mmCharged</thingDef>
+				<count>36</count>
+			</li>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_6x18mmCharged</thingDef>
+				<count>192</count>
+			</li>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_6x24mmCharged</thingDef>
+				<count>600</count>
+			</li>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_12GaugeCharged</thingDef>
+				<count>96</count>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Nihal/Patches/Nihal/ThingDefs_Misc/Apparel_Hats.xml b/ModPatches/Nihal/Patches/Nihal/ThingDefs_Misc/Apparel_Hats.xml
new file mode 100644
index 0000000000..6fb8e2d0c1
--- /dev/null
+++ b/ModPatches/Nihal/Patches/Nihal/ThingDefs_Misc/Apparel_Hats.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Ni'Hal 1.0 Power Helmet ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparel_NihalPowerArmorHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Apparel_NihalPowerArmorHelmet"]/equippedStatOffsets</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Apparel_NihalPowerArmorHelmet"]</xpath>
+			<value>
+				<equippedStatOffsets/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_NihalPowerArmorHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingAccuracy>0.15</AimingAccuracy>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_NihalPowerArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_NihalPowerArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_NihalPowerArmorHelmet"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>45</Plasteel>
+			<DevilstrandCloth>20</DevilstrandCloth>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Nihal/Patches/Nihal/ThingDefs_Misc/Apparel_Various.xml b/ModPatches/Nihal/Patches/Nihal/ThingDefs_Misc/Apparel_Various.xml
new file mode 100644
index 0000000000..f35d17dcfb
--- /dev/null
+++ b/ModPatches/Nihal/Patches/Nihal/ThingDefs_Misc/Apparel_Various.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Ni'Hal 1.0 Power Armor ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparel_CatfishArmor"]/statBases</xpath>
+		<value>
+			<Bulk>90</Bulk>
+			<WornBulk>6</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_CatfishArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>90</CarryWeight>
+			<CarryBulk>15</CarryBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_CatfishArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>45</Mass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_CatfishArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_CatfishArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_CatfishArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Nihal/Patches/Nihal/ThingDefs_Races/Drake.xml b/ModPatches/Nihal/Patches/Nihal/ThingDefs_Races/Drake.xml
new file mode 100644
index 0000000000..3161de3eca
--- /dev/null
+++ b/ModPatches/Nihal/Patches/Nihal/ThingDefs_Races/Drake.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Make Drake Drakonic ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Drake"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Serpentine</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<!-- ========== Give em that thicc dragon skin ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Drake"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.85</MeleeCritChance>
+			<MeleeParryChance>0.45</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Drake"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Drake"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- ========== Patch Drake Melee Attacks ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Drake"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetration>0.350</armorPenetration>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetration>0.350</armorPenetration>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetration>0.375</armorPenetration>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetration>0.048</armorPenetration>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>tail spear</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>TailAttackToolStab</linkedBodyPartsGroup>
+					<armorPenetration>0.5</armorPenetration>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- ========== yeah i think i made them a bit op ========== -->
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Nihal/Patches/Nihal/ThingDefs_Races/Nihal_Race.xml b/ModPatches/Nihal/Patches/Nihal/ThingDefs_Races/Nihal_Race.xml
new file mode 100644
index 0000000000..09444242e8
--- /dev/null
+++ b/ModPatches/Nihal/Patches/Nihal/ThingDefs_Races/Nihal_Race.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Got one ========== -->
+
+	<!-- ========== Turn our Fish boys into Fish *boys* ========== -->
+	<!-- ========== To be human is to be a tall brick ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<!-- === Note to future furball compatibility nerds: 		=== -->
+		<!-- === Paste the defName of your horrible alien there   |	=== -->
+		<!-- === 												  V	=== -->
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_NiHal"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Gives Gun Gizmos to Nihal HUD thing ========== -->
+	<!-- ========== Also Makes Em Suppressable		   ========== -->
+
+	<!-- Checking if "Alien_Nihal" has a <comps> node and adding it if it doesn't exist -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_NiHal"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_NiHal"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_NiHal"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<!-- === Patch Nihal default melee attacks === -->
+	<!-- === For the most part, it adds the CE melee handler thing 	=== -->
+	<!-- === And also defines armor penetration, which allows them	=== -->
+	<!-- === to actually do damage. 								=== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_NiHal"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1</AimingAccuracy>
+			<MeleeDodgeChance>1.5</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<ReloadSpeed>1</ReloadSpeed>
+			<Suppressability>1</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_NiHal"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetration>0.15</armorPenetration>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetration>0.15</armorPenetration>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetration>0.10</armorPenetration>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetration>0.10</armorPenetration>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.7</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetration>0.16</armorPenetration>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Claws! Teeth! Blub!		   === -->
+	<!-- ===================================== -->
+	<!-- === BaseBodySize, ArmorRatings, MoveSpeed, and BaseHealth should already be set. I think. === -->
+	<!-- ===================================== -->
+	<!-- === Adds In Inspector Tabs 	   === -->
+	<!-- === Inventory and all that jazz   === -->
+	<!-- === Again, no need to change 'em  === -->
+	<!-- === Unless you changed it         === -->
+	<!-- === then change 'em			   === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="BaseNiHal"]/inspectorTabs/li[.="ITab_Pawn_Gear"]</xpath>
+		<value>
+			<li>CombatExtended.ITab_Inventory</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="BaseNiHal"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Inventory"/>
+		</value>
+	</Operation>
+	<!-- === Congratulations! Your alien is Combat Ready!	 === -->
+	<!-- === If your alien comes with extra guns and gear,	 === -->
+	<!-- === Congratulations! You're not even close to done! === -->
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Nihal/Patches/Nihal/ThingDefs_Weapons/Weapons.xml b/ModPatches/Nihal/Patches/Nihal/ThingDefs_Weapons/Weapons.xml
new file mode 100644
index 0000000000..8e0ff14b7a
--- /dev/null
+++ b/ModPatches/Nihal/Patches/Nihal/ThingDefs_Weapons/Weapons.xml
@@ -0,0 +1,531 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Melee Tools -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_NihalPistol"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_NihalShotgun" or defName="Gun_NihalRifle" or defName="Gun_NihalLMG" or defName="Gun_NihalSniper" or defName="Gun_NihalThoober" or defName="Gun_NihalCarbine"]/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_NihalRocket" or defName="Gun_NihalTripleRocket"]/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>
+
+	<!-- NiHal Bardiche -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_fishytooth"]/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>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_fishytooth"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_fishytooth"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.10</MeleeCritChance>
+				<MeleeParryChance>0.15</MeleeParryChance>
+				<MeleeDodgeChance>0.20</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Nihal Rocket Launcher -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_NihalRocket</defName>
+		<statBases>
+			<Bulk>3.1</Bulk>
+			<Mass>1.0</Mass>
+			<SwayFactor>1.1</SwayFactor>
+			<ShotSpread>1</ShotSpread>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
+			<WorkToMake>32000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_RPG7Grenade_HEAT</defaultProjectile>
+			<warmupTime>3</warmupTime>
+			<range>38</range>
+			<burstShotCount>1</burstShotCount>
+			<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
+			<minRange>5</minRange>
+			<soundCast>OLaunchers</soundCast>
+			<muzzleFlashScale>14</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>8</reloadTime>
+			<ammoSet>AmmoSet_RPG7Grenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+		</FireModes>
+		<weaponTags>
+			<li>NiHalMissile</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Nihal Triple Rocket Launcher -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_NihalTripleRocket</defName>
+		<statBases>
+			<Bulk>3.1</Bulk>
+			<Mass>1.0</Mass>
+			<SwayFactor>1.5</SwayFactor>
+			<ShotSpread>1</ShotSpread>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
+			<WorkToMake>32000</WorkToMake>
+		</statBases>
+		<Properties>
+			<recoilAmount>20</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_RPG7Grenade_HEAT</defaultProjectile>
+			<warmupTime>3</warmupTime>
+			<range>38</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
+			<minRange>5</minRange>
+			<soundCast>OLaunchers</soundCast>
+			<muzzleFlashScale>14</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>3</magazineSize>
+			<reloadTime>8</reloadTime>
+			<ammoSet>AmmoSet_RPG7Grenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+		</FireModes>
+		<weaponTags>
+			<li>NiHalMissile</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Nihal Big Pistol -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_NihalPistol</defName>
+		<statBases>
+			<Mass>3.3</Mass>
+			<RangedWeapon_Cooldown>1.9</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.75</SightsEfficiency>
+			<ShotSpread>0.38</ShotSpread>
+			<SwayFactor>1.3</SwayFactor>
+			<Bulk>4</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>10</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12x64mmCharged</defaultProjectile>
+			<warmupTime>0.40</warmupTime>
+			<range>18</range>
+			<soundCast>OTFalcon</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_12x64mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>NiHalPistol</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Nihal Shotgun -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_NihalShotgun</defName>
+		<statBases>
+			<Mass>3</Mass>
+			<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.1</SwayFactor>
+			<Bulk>7</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.1</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12GaugeCharged</defaultProjectile>
+			<warmupTime>0.3</warmupTime>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<range>27</range>
+			<soundCast>OShotgun</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>2</reloadTime>
+			<ammoSet>AmmoSet_12GaugeCharged</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>AdvancedGun</li>
+			<li>NiHalRifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Nihal Rifle -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_NihalRifle</defName>
+		<statBases>
+			<Mass>2.7</Mass>
+			<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.20</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.15</SwayFactor>
+			<Bulk>8.00</Bulk>
+			<WorkToMake>62000</WorkToMake>
+		</statBases>
+		<costList>
+			<Uranium>5</Uranium>
+			<Steel>100</Steel>
+			<Plasteel>100</Plasteel>
+			<ComponentSpacer>1</ComponentSpacer>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>58</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>3</burstShotCount>
+			<soundCast>ORifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>24</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>NiHalRifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Nihal LMG -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_NihalLMG</defName>
+		<statBases>
+			<Mass>3.2</Mass>
+			<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.25</SightsEfficiency>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>1.17</SwayFactor>
+			<Bulk>8.00</Bulk>
+			<WorkToMake>62000</WorkToMake>
+		</statBases>
+		<costList>
+			<Uranium>5</Uranium>
+			<Steel>100</Steel>
+			<Plasteel>100</Plasteel>
+			<ComponentSpacer>1</ComponentSpacer>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>3</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
+			<warmupTime>2.1</warmupTime>
+			<range>58</range>
+			<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
+			<burstShotCount>50</burstShotCount>
+			<soundCast>OLMG</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>150</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>25</aimedBurstShotCount>
+			<aiUseBurstMode>false</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Nihal Sniper -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_NihalSniper</defName>
+		<statBases>
+			<Mass>3.0</Mass>
+			<RangedWeapon_Cooldown>0.32</RangedWeapon_Cooldown>
+			<SightsEfficiency>3</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.7</SwayFactor>
+			<Bulk>12</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.60</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>55</range>
+			<soundCast>OSniper</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>2</reloadTime>
+			<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>NiHalSniper</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- NiHal Thoober -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_NihalThoober</defName>
+		<statBases>
+			<WorkToMake>14000</WorkToMake>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.00</SwayFactor>
+			<Bulk>7.31</Bulk>
+			<Mass>2.70</Mass>
+			<RangedWeapon_Cooldown>0.93</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Plasteel>20</Plasteel>
+			<Uranium>5</Uranium>
+			<Steel>40</Steel>
+			<ComponentSpacer>1</ComponentSpacer>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<warmupTime>1.1</warmupTime>
+			<range>44</range>
+			<minRange>5</minRange>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>NiHalRifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- NiHal Carbine -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_NihalCarbine</defName>
+		<statBases>
+			<Mass>2.7</Mass>
+			<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.05</SwayFactor>
+			<Bulk>5.50</Bulk>
+			<WorkToMake>42000</WorkToMake>
+		</statBases>
+		<costList>
+			<Uranium>5</Uranium>
+			<Steel>80</Steel>
+			<Plasteel>80</Plasteel>
+			<ComponentSpacer>1</ComponentSpacer>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>46</range>
+			<soundCast>ORifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>NiHalRifle</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Gun_NihalCarbine"]/tools</xpath>
+		<value>
+			<li Class="CombatExtended.ToolCE">
+				<label>bayonet</label>
+				<capacities>
+					<li>Stab</li>
+				</capacities>
+				<power>17</power>
+				<cooldownTime>1.38</cooldownTime>
+				<armorPenetrationBlunt>1.08</armorPenetrationBlunt>
+				<armorPenetrationSharp>0.72</armorPenetrationSharp>
+				<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Not Only Just A Cannon/Defs/Not Only Just A Cannon/Ammo_Cannon.xml b/ModPatches/Not Only Just A Cannon/Defs/Not Only Just A Cannon/Ammo_Cannon.xml
new file mode 100644
index 0000000000..724a6c3ac5
--- /dev/null
+++ b/ModPatches/Not Only Just A Cannon/Defs/Not Only Just A Cannon/Ammo_Cannon.xml	
@@ -0,0 +1,847 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>Ammo164mmCannonShells</defName>
+		<label>32-pounder Cannon Shells</label>
+		<parent>AmmoShells</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberCannon</iconPath>
+	</ThingCategoryDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_164mmCannonBall</defName>
+		<label>164mm 32-pounder Cannonball</label>
+		<ammoTypes>
+			<Ammo_164mmCannonShell_HE>Bullet_164mmCannonShell_HE</Ammo_164mmCannonShell_HE>
+			<Ammo_164mmCannonShell_AP>Bullet_164mmCannonShell_AP</Ammo_164mmCannonShell_AP>
+			<Ammo_164mmCannonShell_FI>Bullet_164mmCannonShell_FI</Ammo_164mmCannonShell_FI>
+		</ammoTypes>
+		<isMortarAmmoSet>true</isMortarAmmoSet>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="164mmCannonShellBase" ParentName="HeavyAmmoBase" Abstract="True">
+		<description>A round shell designed to be fired from a cannon.</description>
+		<thingCategories>
+			<li>Ammo164mmCannonShells</li>
+			<li>CannonShells</li>
+		</thingCategories>
+		<stackLimit>25</stackLimit>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+			<li>MortarShell</li>
+		</tradeTags>
+		<statBases>
+			<MaxHitPoints>100</MaxHitPoints>
+			<Mass>19</Mass>
+			<Bulk>21.41</Bulk>
+		</statBases>
+		<cookOffFlashScale>30</cookOffFlashScale>
+		<cookOffSound>MortarBomb_Explode</cookOffSound>
+		<isMortarAmmo>true</isMortarAmmo>
+	</ThingDef>
+
+	<ThingDef Name="Base164mmCannonShell" ParentName="BaseExplosiveBullet" Abstract="true">
+		<graphicData>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>100</speed>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<flyOverhead>false</flyOverhead>
+			<dropsCasings>false</dropsCasings>
+			<casingMoteDefname>Fleck_BigShell</casingMoteDefname>
+			<casingFilthDefname>Filth_CannonAmmoCasings</casingFilthDefname>
+		</projectile>
+	</ThingDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase" Name="CannonRoundRecipeBase" Abstract="true">
+		<recipeUsers>
+			<li>FueledSmithy</li>
+			<li>ElectricSmithy</li>
+		</recipeUsers>
+	</RecipeDef>
+
+	<!-- HE -->
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="164mmCannonShellBase">
+		<defName>Ammo_164mmCannonShell_HE</defName>
+		<label>32-pounder cannon explosive round</label>
+		<graphicData>
+			<texPath>Things/Item/CannonBall_Explosive</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>100.83</MarketValue>
+		</statBases>
+		<ammoClass>GrenadeHE</ammoClass>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>185</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>2.3</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>10</Fragment_Large>
+					<Fragment_Small>50</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="Base164mmCannonShell">
+		<defName>Bullet_164mmCannonShell_HE</defName>
+		<label>32-pounder cannon shell (HE)</label>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<graphicData>
+			<texPath>Things/Projectile/Projectile_Explosive</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>152</damageAmountBase>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+			<explosionRadius>2.3</explosionRadius>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>10</Fragment_Large>
+					<Fragment_Small>50</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<RecipeDef ParentName="CannonRoundRecipeBase">
+		<defName>MakeAmmo_164mmCannonShell_HE</defName>
+		<label>make 32-pounder shells x5</label>
+		<description>Craft 5 32-pounder cannon shells.</description>
+		<jobString>Making 32-pounder cannon shells.</jobString>
+		<workAmount>1200</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>80</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_164mmCannonShell_HE>5</Ammo_164mmCannonShell_HE>
+		</products>
+	</RecipeDef>
+
+	<!-- HEAT -->
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="164mmCannonShellBase">
+		<defName>Ammo_164mmCannonShell_AP</defName>
+		<label>32-pounder cannon solid round</label>
+		<graphicData>
+			<texPath>Things/Item/CannonBall_Solid</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>1.83</MarketValue>
+		</statBases>
+		<ammoClass>RocketHEAT</ammoClass>
+		<!--<detonateProjectile>Bullet_164mmCannonShell_AP</detonateProjectile>-->
+	</ThingDef>
+
+	<ThingDef ParentName="Base164mmCannonShell">
+		<defName>Bullet_164mmCannonShell_AP</defName>
+		<label>32-pounder cannon solid round</label>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<graphicData>
+			<texPath>Things/Projectile/Projectile_Solid</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>152</damageAmountBase>
+			<armorPenetrationSharp>100</armorPenetrationSharp>
+			<armorPenetrationBlunt>100</armorPenetrationBlunt>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>100</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<!--<Fragment_Large>30</Fragment_Large>-->
+					<Fragment_Small>20</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<RecipeDef ParentName="CannonRoundRecipeBase">
+		<defName>MakeAmmo_164mmCannonShell_AP</defName>
+		<label>make 32-pounder shells x5</label>
+		<description>Craft 5 32-pounder cannon shells.</description>
+		<jobString>Making 32-pounder cannon shells.</jobString>
+		<workAmount>1200</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>100</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_164mmCannonShell_AP>5</Ammo_164mmCannonShell_AP>
+		</products>
+	</RecipeDef>
+
+	<!-- INCENDIARY -->
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="164mmCannonShellBase">
+		<defName>Ammo_164mmCannonShell_FI</defName>
+		<label>32-pounder cannon incendiary round (Incendiary)</label>
+		<graphicData>
+			<texPath>Things/Item/CannonBall_Incendiary</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>1.83</MarketValue>
+		</statBases>
+		<ammoClass>GrenadeIncendiary</ammoClass>
+		<detonateProjectile>Bullet_164mmCannonShell_FI</detonateProjectile>
+		<comps>
+			<li Class="CompProperties_Explosive">
+				<explosiveRadius>2</explosiveRadius>
+				<explosiveDamageType>Flame</explosiveDamageType>
+				<startWickHitPointsPercent>0.7</startWickHitPointsPercent>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<explodeOnKilled>True</explodeOnKilled>
+				<wickTicks>30~60</wickTicks>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="Base164mmCannonShell">
+		<defName>Bullet_164mmCannonShell_FI</defName>
+		<label>32-pounder incendiary shell</label>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<graphicData>
+			<texPath>Things/Projectile/Projectile_Incendiary</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>PrometheumFlame</damageDef>
+			<damageAmountBase>35</damageAmountBase>
+			<explosionRadius>2.8</explosionRadius>
+			<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
+			<preExplosionSpawnChance>0.5</preExplosionSpawnChance>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>1</Fragment_Large>
+					<Fragment_Small>10</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<RecipeDef ParentName="CannonRoundRecipeBase">
+		<defName>MakeAmmo_164mmCannonShell_FI</defName>
+		<label>make 32-pounder shells x5</label>
+		<description>Craft 5 32-pounder cannon shells.</description>
+		<jobString>Making 32-pounder cannon shells.</jobString>
+		<workAmount>1200</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>80</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Prometheum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_164mmCannonShell_FI>5</Ammo_164mmCannonShell_FI>
+		</products>
+	</RecipeDef>
+
+	<ThingCategoryDef>
+		<defName>Ammo164mmCannonShellsChamber</defName>
+		<label>18-pounder Chambered Cannon Shells</label>
+		<parent>AmmoShells</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberCannon</iconPath>
+	</ThingCategoryDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_164mmCannonBallChamber</defName>
+		<label>18-pounder Chambered Cannonball</label>
+		<ammoTypes>
+			<Ammo_164mmCannonShell_HEChamber>Bullet_164mmCannonShell_HE</Ammo_164mmCannonShell_HEChamber>
+			<Ammo_164mmCannonShell_APChamber>Bullet_164mmCannonShell_AP</Ammo_164mmCannonShell_APChamber>
+			<Ammo_164mmCannonShell_FIChamber>Bullet_164mmCannonShell_FI</Ammo_164mmCannonShell_FIChamber>
+		</ammoTypes>
+		<isMortarAmmoSet>true</isMortarAmmoSet>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="164mmCannonShellBaseChamber" ParentName="HeavyAmmoBase" Abstract="True">
+		<description>A metal projectile and powder charge loaded in a mug-shaped chamber to be loaded into a cannon.</description>
+		<thingCategories>
+			<li>Ammo164mmCannonShellsChamber</li>
+		</thingCategories>
+		<stackLimit>25</stackLimit>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<statBases>
+			<MaxHitPoints>100</MaxHitPoints>
+			<Mass>19</Mass>
+			<Bulk>22.41</Bulk>
+		</statBases>
+		<cookOffFlashScale>30</cookOffFlashScale>
+		<cookOffSound>MortarBomb_Explode</cookOffSound>
+		<isMortarAmmo>true</isMortarAmmo>
+	</ThingDef>
+
+	<!-- HE -->
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="164mmCannonShellBaseChamber">
+		<defName>Ammo_164mmCannonShell_HEChamber</defName>
+		<label>18-pounder cannon chamber explosive round</label>
+		<graphicData>
+			<texPath>Things/Item/Chamber_Explosive</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>1.83</MarketValue>
+		</statBases>
+		<ammoClass>GrenadeHE</ammoClass>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>185</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>2.3</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>10</Fragment_Large>
+					<Fragment_Small>50</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<RecipeDef ParentName="CannonRoundRecipeBase">
+		<defName>MakeAmmo_164mmCannonShell_HEChamber</defName>
+		<label>make 18-pounder chamber shells x5</label>
+		<description>Craft 5 18-pounder chamber cannon shells.</description>
+		<jobString>Making 18-pounder chamber cannon shells.</jobString>
+		<workAmount>1200</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>105</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_164mmCannonShell_HEChamber>5</Ammo_164mmCannonShell_HEChamber>
+		</products>
+	</RecipeDef>
+
+	<!-- HEAT -->
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="164mmCannonShellBaseChamber">
+		<defName>Ammo_164mmCannonShell_APChamber</defName>
+		<label>18-pounder cannon chamber solid round</label>
+		<graphicData>
+			<texPath>Things/Item/Chamber_Solid</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>1.83</MarketValue>
+		</statBases>
+		<ammoClass>RocketHEAT</ammoClass>
+	</ThingDef>
+
+	<RecipeDef ParentName="CannonRoundRecipeBase">
+		<defName>MakeAmmo_164mmCannonShell_APChamber</defName>
+		<label>make 18-pounder chamber shells x5</label>
+		<description>Craft 5 18-pounder chamber cannon shells.</description>
+		<jobString>Making 18-pounder chamber cannon shells.</jobString>
+		<workAmount>1200</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>130</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_164mmCannonShell_APChamber>5</Ammo_164mmCannonShell_APChamber>
+		</products>
+	</RecipeDef>
+
+	<!-- INCENDIARY -->
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="164mmCannonShellBaseChamber">
+		<defName>Ammo_164mmCannonShell_FIChamber</defName>
+		<label>18-pounder cannon chamber incendiary round</label>
+		<graphicData>
+			<texPath>Things/Item/Chamber_Incendiary</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>1.83</MarketValue>
+		</statBases>
+		<ammoClass>GrenadeIncendiary</ammoClass>
+		<detonateProjectile>Bullet_164mmCannonShell_FI</detonateProjectile>
+		<comps>
+			<li Class="CompProperties_Explosive">
+				<explosiveRadius>2</explosiveRadius>
+				<explosiveDamageType>Flame</explosiveDamageType>
+				<startWickHitPointsPercent>0.7</startWickHitPointsPercent>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<explodeOnKilled>True</explodeOnKilled>
+				<wickTicks>30~60</wickTicks>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<RecipeDef ParentName="CannonRoundRecipeBase">
+		<defName>MakeAmmo_164mmCannonShell_FIChamber</defName>
+		<label>make 18-pounder chamber shells x5</label>
+		<description>Craft 5 18-pounder chamber cannon shells.</description>
+		<jobString>Making 18-pounder chamber cannon shells.</jobString>
+		<workAmount>1200</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>30</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>80</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Prometheum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_164mmCannonShell_FIChamber>5</Ammo_164mmCannonShell_FIChamber>
+		</products>
+	</RecipeDef>
+
+	<ThingDef ParentName="Base164mmCannonShell">
+		<defName>Bullet_164mmCannonShell_HE_Mortar</defName>
+		<label>24-pounder cannon shell (HE)</label>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<graphicData>
+			<texPath>Things/Projectile/Projectile_Explosive</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>152</damageAmountBase>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+			<explosionRadius>2.3</explosionRadius>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<flyOverhead>true</flyOverhead>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>10</Fragment_Large>
+					<Fragment_Small>50</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="Base164mmCannonShell">
+		<defName>Bullet_164mmCannonShell_AP_Mortar</defName>
+		<label>24-pounder cannon solid round</label>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<graphicData>
+			<texPath>Things/Projectile/Projectile_Solid</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>152</damageAmountBase>
+			<armorPenetrationSharp>100</armorPenetrationSharp>
+			<armorPenetrationBlunt>100</armorPenetrationBlunt>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<flyOverhead>true</flyOverhead>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>100</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<!--<Fragment_Large>30</Fragment_Large>-->
+					<Fragment_Small>20</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="Base164mmCannonShell">
+		<defName>Bullet_164mmCannonShell_FI_Mortar</defName>
+		<label>24-pounder incendiary shell</label>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<graphicData>
+			<texPath>Things/Projectile/Projectile_Incendiary</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>PrometheumFlame</damageDef>
+			<damageAmountBase>35</damageAmountBase>
+			<explosionRadius>2.8</explosionRadius>
+			<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
+			<preExplosionSpawnChance>0.5</preExplosionSpawnChance>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<flyOverhead>true</flyOverhead>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>1</Fragment_Large>
+					<Fragment_Small>10</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="164mmCannonShellBase">
+		<defName>Ammo_164mmCannonShell_GunStoneSmall</defName>
+		<label>24-pounder cannon small gunstone</label>
+		<graphicData>
+			<texPath>Things/Item/SGunstone</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>1.83</MarketValue>
+		</statBases>
+		<ammoClass>CannonBall</ammoClass>
+	</ThingDef>
+
+	<ThingDef ParentName="Base164mmCannonShell">
+		<defName>Bullet_164mmCannonShell_GunStoneSmall</defName>
+		<label>24-pounder cannon small gunstone</label>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<graphicData>
+			<texPath>Things/Projectile/Projectile_SGunstone</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>80</damageAmountBase>
+			<armorPenetrationSharp>50</armorPenetrationSharp>
+			<armorPenetrationBlunt>50</armorPenetrationBlunt>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<flyOverhead>true</flyOverhead>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>50</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<!--<Fragment_Large>30</Fragment_Large>-->
+					<Fragment_Small>10</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="164mmCannonShellBase">
+		<defName>Ammo_164mmCannonShell_GunStone</defName>
+		<label>24-pounder cannon gunstone</label>
+		<graphicData>
+			<texPath>Things/Item/Gunstone</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>1.83</MarketValue>
+		</statBases>
+		<ammoClass>CannonBall</ammoClass>
+	</ThingDef>
+
+	<ThingDef ParentName="Base164mmCannonShell">
+		<defName>Bullet_164mmCannonShell_GunStone</defName>
+		<label>24-pounder cannon gunstone</label>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<graphicData>
+			<texPath>Things/Projectile/Projectile_Gunstone</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>180</damageAmountBase>
+			<armorPenetrationSharp>100</armorPenetrationSharp>
+			<armorPenetrationBlunt>100</armorPenetrationBlunt>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<flyOverhead>true</flyOverhead>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>70</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<!--<Fragment_Large>30</Fragment_Large>-->
+					<Fragment_Small>10</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_164mmCannonBall_Mortar</defName>
+		<label>24-pounder Cannonball</label>
+		<ammoTypes>
+			<Ammo_164mmCannonShell_HE>Bullet_164mmCannonShell_HE_Mortar</Ammo_164mmCannonShell_HE>
+			<Ammo_164mmCannonShell_AP>Bullet_164mmCannonShell_AP_Mortar</Ammo_164mmCannonShell_AP>
+			<Ammo_164mmCannonShell_FI>Bullet_164mmCannonShell_FI_Mortar</Ammo_164mmCannonShell_FI>
+			<Ammo_164mmCannonShell_GunStoneSmall>Bullet_164mmCannonShell_GunStoneSmall</Ammo_164mmCannonShell_GunStoneSmall>
+			<Ammo_164mmCannonShell_GunStone>Bullet_164mmCannonShell_GunStone</Ammo_164mmCannonShell_GunStone>
+		</ammoTypes>
+		<isMortarAmmoSet>true</isMortarAmmoSet>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_164mmCannonBall_MortarSmall</defName>
+		<label>24-pounder Cannonball</label>
+		<ammoTypes>
+			<Ammo_164mmCannonShell_HE>Bullet_164mmCannonShell_HE_Mortar</Ammo_164mmCannonShell_HE>
+			<Ammo_164mmCannonShell_AP>Bullet_164mmCannonShell_AP_Mortar</Ammo_164mmCannonShell_AP>
+			<Ammo_164mmCannonShell_FI>Bullet_164mmCannonShell_FI_Mortar</Ammo_164mmCannonShell_FI>
+			<Ammo_164mmCannonShell_GunStoneSmall>Bullet_164mmCannonShell_GunStoneSmall</Ammo_164mmCannonShell_GunStoneSmall>
+		</ammoTypes>
+		<isMortarAmmoSet>true</isMortarAmmoSet>
+	</CombatExtended.AmmoSetDef>
+
+	<RecipeDef ParentName="MakeStoneBlocksBase">
+		<defName>MakeAmmo_164mmCannonShell_GunStoneSmall</defName>
+		<label>cut stone chunks into small gunstones</label>
+		<description>Cuts stone chunks down to size to be fired by a cannon.</description>
+		<ingredients>
+			<li>
+				<filter>
+					<categories>
+						<li>StoneChunks</li>
+					</categories>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<categories>
+				<li>StoneChunks</li>
+			</categories>
+		</fixedIngredientFilter>
+		<recipeUsers Inherit="False">
+			<li>TableStonecutter</li>
+		</recipeUsers>
+		<products>
+			<Ammo_164mmCannonShell_GunStoneSmall>2</Ammo_164mmCannonShell_GunStoneSmall>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="MakeStoneBlocksBase">
+		<defName>MakeAmmo_164mmCannonShell_GunStone</defName>
+		<label>cut stone chunks into a gunstones</label>
+		<description>Cuts stone chunks down to size to be fired by a cannon.</description>
+		<ingredients>
+			<li>
+				<filter>
+					<categories>
+						<li>StoneChunks</li>
+					</categories>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<categories>
+				<li>StoneChunks</li>
+			</categories>
+		</fixedIngredientFilter>
+		<recipeUsers Inherit="False">
+			<li>TableStonecutter</li>
+		</recipeUsers>
+		<products>
+			<Ammo_164mmCannonShell_GunStone>1</Ammo_164mmCannonShell_GunStone>
+		</products>
+	</RecipeDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Dragonator</defName>
+		<label>Dragonator Spike</label>
+		<ammoTypes>
+			<Ammo_DragonatorSpike>Bullet_DragonatorSpike</Ammo_DragonatorSpike>
+		</ammoTypes>
+		<isMortarAmmoSet>true</isMortarAmmoSet>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>DragonatorSpike</defName>
+		<label>Dragonator Spike</label>
+		<description>A steel spike attached to a long and fletched spiked pole, packing a very strong punch against even the most armored targets.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="164mmCannonShellBase">
+		<defName>Ammo_DragonatorSpike</defName>
+		<label>Dragonator Spike</label>
+		<graphicData>
+			<texPath>Things/Item/Dragonator</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<drawSize>(2)</drawSize>
+		</graphicData>
+		<stackLimit>3</stackLimit>
+		<statBases>
+			<MarketValue>20</MarketValue>
+		</statBases>
+		<ammoClass>DragonatorSpike</ammoClass>
+	</ThingDef>
+
+	<ThingDef ParentName="Base164mmCannonShell">
+		<defName>Bullet_DragonatorSpike</defName>
+		<label>Dragonator Spike</label>
+		<thingClass>CombatExtended.BulletCE</thingClass>
+		<graphicData>
+			<texPath>Things/Projectile/Dragonator</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>2,4</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>450</damageAmountBase>
+			<armorPenetrationSharp>50</armorPenetrationSharp>
+			<armorPenetrationBlunt>400</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<RecipeDef ParentName="MakeStoneBlocksBase">
+		<defName>MakeAmmo_DragonatorSpike</defName>
+		<label>forge dragonator spike</label>
+		<description>Forges steel into dragonator spikes</description>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>150</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_DragonatorSpike>1</Ammo_DragonatorSpike>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Not Only Just A Cannon/Patches/Not Only Just A Cannon/Patch_Cannon_Turret.xml b/ModPatches/Not Only Just A Cannon/Patches/Not Only Just A Cannon/Patch_Cannon_Turret.xml
new file mode 100644
index 0000000000..1c151b8219
--- /dev/null
+++ b/ModPatches/Not Only Just A Cannon/Patches/Not Only Just A Cannon/Patch_Cannon_Turret.xml	
@@ -0,0 +1,820 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="CannonBall_Solidshot" or
+			defName="CannonBall_Explosiveshot" or
+			defName="CannonBall_Incendiary" or
+			defName="Chamber_Solidshot" or
+			defName="Chamber_Explosiveshot" or
+			defName="Chamber_Incendiary" or
+			defName="MortarShell_Solidshot" or
+			defName="MortarShell_Explosiveshot" or
+			defName="MortarShell_Incendiary" or
+			defName="GunStone" or
+			defName="SGunStone"
+			]</xpath>
+	</Operation>
+
+
+	<!-- Mortars won't place if they have show radius -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="BaseCannonBuilding"]/placeWorkers</xpath>
+		<value>
+			<placeWorkers>
+				<li>PlaceWorker_PreventInteractionSpotOverlap</li>
+				<li>PlaceWorker_TurretTop</li>
+			</placeWorkers>
+		</value>
+	</Operation>
+
+	<!--   CANNON   -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Weapon_Cannon</defName>
+
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.3</ShotSpread>
+			<SwayFactor>1.34</SwayFactor>
+			<RangedWeapon_Cooldown>3.2</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>1.52</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_164mmCannonShell_HE</defaultProjectile>
+			<burstShotCount/>
+			<warmupTime>5</warmupTime>
+			<requireLineOfSight>true</requireLineOfSight>
+			<range>86</range>
+			<soundCast>MortarBomb_Explode</soundCast>
+			<muzzleFlashScale>32</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>15</reloadTime>
+			<ammoSet>AmmoSet_164mmCannonBall</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Turret_Cannon"]</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Turret_Cannon"]</xpath>
+		<value>
+			<specialDisplayRadius>86</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Weapon_Cannon"]/comps/li[@Class="CompProperties_ChangeableProjectile"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Weapon_Cannon"]/building</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Turret_Cannon"]</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_Cannon"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>1</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Turret_Cannon"]/statBases</xpath>
+		<value>
+			<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<!--   SWIVEL GUN   -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Weapon_SwivelGun</defName>
+
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.3</ShotSpread>
+			<SwayFactor>1.34</SwayFactor>
+			<RangedWeapon_Cooldown>2.71</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>1.52</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_164mmCannonShell_HE</defaultProjectile>
+			<burstShotCount/>
+			<warmupTime>4.5</warmupTime>
+			<requireLineOfSight>true</requireLineOfSight>
+			<range>86</range>
+			<soundCast>MortarBomb_Explode</soundCast>
+			<muzzleFlashScale>32</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>8.5</reloadTime>
+			<ammoSet>AmmoSet_164mmCannonBallChamber</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Swivel_Gun"]</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Weapon_SwivelGun"]/comps/li[@Class="CompProperties_ChangeableProjectile"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Weapon_SwivelGun"]/building</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Swivel_Gun"]</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Swivel_Gun"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>1</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Swivel_Gun"]/statBases</xpath>
+		<value>
+			<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<!--   PIVOT GUN   -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Weapon_PivotGun</defName>
+
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.3</ShotSpread>
+			<SwayFactor>1.34</SwayFactor>
+			<RangedWeapon_Cooldown>3.2</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>1.52</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_164mmCannonShell_HE</defaultProjectile>
+			<burstShotCount/>
+			<warmupTime>5</warmupTime>
+			<requireLineOfSight>true</requireLineOfSight>
+			<range>86</range>
+			<soundCast>MortarBomb_Explode</soundCast>
+			<muzzleFlashScale>32</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>8.5</reloadTime>
+			<ammoSet>AmmoSet_164mmCannonBallChamber</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Turret_PivotGun"]</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Turret_PivotGun"]</xpath>
+		<value>
+			<specialDisplayRadius>86</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Weapon_PivotGun"]/comps/li[@Class="CompProperties_ChangeableProjectile"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Weapon_PivotGun"]/building</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Turret_PivotGun"]</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_PivotGun"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>1</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Turret_PivotGun"]/statBases</xpath>
+		<value>
+			<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<!--   FORTRESS CANNON   -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Weapon_FortedCannon</defName>
+
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.04</SwayFactor>
+			<RangedWeapon_Cooldown>2.71</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>1.52</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_164mmCannonShell_HE</defaultProjectile>
+			<burstShotCount/>
+			<warmupTime>5</warmupTime>
+			<requireLineOfSight>true</requireLineOfSight>
+			<range>86</range>
+			<soundCast>MortarBomb_Explode</soundCast>
+			<muzzleFlashScale>32</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>15</reloadTime>
+			<ammoSet>AmmoSet_164mmCannonBall</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Forted_Cannon"]</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Forted_Cannon"]</xpath>
+		<value>
+			<specialDisplayRadius>86</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Weapon_FortedCannon"]/comps/li[@Class="CompProperties_ChangeableProjectile"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Weapon_FortedCannon"]/building</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Forted_Cannon"]</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Forted_Cannon"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>1</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Forted_Cannon"]/statBases</xpath>
+		<value>
+			<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<!--   COEHORN   -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Weapon_Coehorn</defName>
+
+		<statBases>
+			<SightsEfficiency>0.5</SightsEfficiency>
+			<ShotSpread>0.3</ShotSpread>
+			<SwayFactor>1.34</SwayFactor>
+			<RangedWeapon_Cooldown>2.71</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+			<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_164mmCannonShell_HE_Mortar</defaultProjectile>
+			<warmupTime>3</warmupTime>
+			<minRange>15</minRange>
+			<range>50</range>
+			<burstShotCount>1</burstShotCount>
+			<soundCast>MortarBomb_Explode</soundCast>
+			<muzzleFlashScale>32</muzzleFlashScale>
+			<circularError>1.5</circularError>
+			<indirectFirePenalty>0.6</indirectFirePenalty>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>10</reloadTime>
+			<ammoSet>AmmoSet_164mmCannonBall_MortarSmall</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Turret_Coehorn"]</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Turret_Coehorn"]</xpath>
+		<value>
+			<specialDisplayRadius>50</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Weapon_Coehorn"]/comps/li[@Class="CompProperties_ChangeableProjectile"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Weapon_Coehorn"]/building</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Turret_Coehorn"]</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_Coehorn"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>2</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Turret_Coehorn"]/statBases</xpath>
+		<value>
+			<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Weapon_Coehorn"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>30</li>
+					<li>50</li>
+					<li>70</li>
+					<li>90</li>
+				</chargeSpeeds>
+			</li>
+			<li Class="CombatExtended.CompProperties_AmmoUser">
+				<magazineSize>1</magazineSize>
+				<reloadTime>10</reloadTime>
+				<ammoSet>AmmoSet_164mmCannonBall_MortarSmall</ammoSet>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Weapon_Coehorn"]/weaponTags</xpath>
+		<value>
+			<li>TurretGun</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Turret_Coehorn"]/tradeTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Turret_Coehorn"]</xpath>
+			<value>
+				<tradeTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Turret_Coehorn"]/tradeTags</xpath>
+		<value>
+			<li>CE_Turret</li>
+		</value>
+	</Operation>
+
+	<!--   EARLY MORTAR   -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Weapon_Early_Mortar</defName>
+
+		<statBases>
+			<SightsEfficiency>0.5</SightsEfficiency>
+			<ShotSpread>0.3</ShotSpread>
+			<SwayFactor>1.34</SwayFactor>
+			<RangedWeapon_Cooldown>2.71</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+			<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_164mmCannonShell_HE_Mortar</defaultProjectile>
+			<warmupTime>4</warmupTime>
+			<minRange>20</minRange>
+			<range>700</range>
+			<burstShotCount>1</burstShotCount>
+			<soundCast>MortarBomb_Explode</soundCast>
+			<muzzleFlashScale>32</muzzleFlashScale>
+			<circularError>1.3</circularError>
+			<indirectFirePenalty>0.4</indirectFirePenalty>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>15</reloadTime>
+			<ammoSet>AmmoSet_164mmCannonBall_Mortar</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Turret_Early_Mortar"]</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Turret_Early_Mortar"]</xpath>
+		<value>
+			<specialDisplayRadius>20</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Weapon_Early_Mortar"]/comps/li[@Class="CompProperties_ChangeableProjectile"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Weapon_Early_Mortar"]/building</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Turret_Early_Mortar"]</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_Early_Mortar"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>2</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Turret_Early_Mortar"]/statBases</xpath>
+		<value>
+			<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Weapon_Early_Mortar"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>30</li>
+					<li>50</li>
+					<li>70</li>
+					<li>90</li>
+				</chargeSpeeds>
+			</li>
+			<li Class="CombatExtended.CompProperties_AmmoUser">
+				<magazineSize>1</magazineSize>
+				<reloadTime>15</reloadTime>
+				<ammoSet>AmmoSet_164mmCannonBall_Mortar</ammoSet>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Weapon_Early_Mortar"]/weaponTags</xpath>
+		<value>
+			<li>TurretGun</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Turret_Early_Mortar"]/tradeTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Turret_Early_Mortar"]</xpath>
+			<value>
+				<tradeTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Turret_Early_Mortar"]/tradeTags</xpath>
+		<value>
+			<li>CE_Turret</li>
+		</value>
+	</Operation>
+
+	<!--   FORTED MORTAR   -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Weapon_Forted_Mortar</defName>
+
+		<statBases>
+			<SightsEfficiency>0.5</SightsEfficiency>
+			<ShotSpread>0.3</ShotSpread>
+			<SwayFactor>1.34</SwayFactor>
+			<RangedWeapon_Cooldown>2.71</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+			<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_164mmCannonShell_HE_Mortar</defaultProjectile>
+			<warmupTime>4</warmupTime>
+			<minRange>32</minRange>
+			<range>700</range>
+			<burstShotCount>1</burstShotCount>
+			<soundCast>MortarBomb_Explode</soundCast>
+			<muzzleFlashScale>32</muzzleFlashScale>
+			<circularError>1</circularError>
+			<indirectFirePenalty>0.3</indirectFirePenalty>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>15</reloadTime>
+			<ammoSet>AmmoSet_164mmCannonBall_Mortar</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Turret_Forted_Mortar"]</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Turret_Forted_Mortar"]</xpath>
+		<value>
+			<specialDisplayRadius>32</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Weapon_Forted_Mortar"]/comps/li[@Class="CompProperties_ChangeableProjectile"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Weapon_Forted_Mortar"]/building</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Turret_Forted_Mortar"]</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_Forted_Mortar"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>2</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Turret_Forted_Mortar"]/statBases</xpath>
+		<value>
+			<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Weapon_Forted_Mortar"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>30</li>
+					<li>50</li>
+					<li>70</li>
+					<li>90</li>
+				</chargeSpeeds>
+			</li>
+			<li Class="CombatExtended.CompProperties_AmmoUser">
+				<magazineSize>1</magazineSize>
+				<reloadTime>15</reloadTime>
+				<ammoSet>AmmoSet_164mmCannonBall_Mortar</ammoSet>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Weapon_Forted_Mortar"]/weaponTags</xpath>
+		<value>
+			<li>TurretGun</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Turret_Forted_Mortar"]/tradeTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Turret_Forted_Mortar"]</xpath>
+			<value>
+				<tradeTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Turret_Forted_Mortar"]/tradeTags</xpath>
+		<value>
+			<li>CE_Turret</li>
+		</value>
+	</Operation>
+
+	<!--   DRAGONATOR   -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Weapon_Dragonator</defName>
+
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.3</ShotSpread>
+			<SwayFactor>1.34</SwayFactor>
+			<RangedWeapon_Cooldown>3.2</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>1.52</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_DragonatorSpike</defaultProjectile>
+			<burstShotCount/>
+			<warmupTime>5</warmupTime>
+			<requireLineOfSight>true</requireLineOfSight>
+			<range>20</range>
+			<soundCast>MortarBomb_Explode</soundCast>
+			<muzzleFlashScale>2</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>30</reloadTime>
+			<ammoSet>AmmoSet_Dragonator</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_Dragonator"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Turret_Dragonator"]</xpath>
+		<value>
+			<specialDisplayRadius>86</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Turret_Dragonator"]/comps/li[@Class="CompProperties_Refuelable"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_Dragonator"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>1</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_Dragonator"]/statBases/ShootingAccuracyTurret</xpath>
+		<value>
+			<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Turret_Dragonator"]</xpath>
+		<value>
+			<hasInteractionCell>True</hasInteractionCell>
+			<interactionCellOffset>(0,0,-2)</interactionCellOffset>
+			<size>(3,3)</size>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Nukes/Defs/Nukes/Ammo_Nuclear.xml b/ModPatches/Nukes/Defs/Nukes/Ammo_Nuclear.xml
new file mode 100644
index 0000000000..4cf87b40fb
--- /dev/null
+++ b/ModPatches/Nukes/Defs/Nukes/Ammo_Nuclear.xml
@@ -0,0 +1,390 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- Ammo Categories -->
+	<CombatExtended.AmmoCategoryDef>
+		<defName>Fusion</defName>
+		<label>Fusion</label>
+		<description>A massively powerful nuclear fusion warhead.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>LargeNuke</defName>
+		<label>Large Nuke</label>
+		<description>A large nuclear fission device.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>SmallNuke</defName>
+		<label>Small Nuke</label>
+		<description>A small nuclear fission device.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>DirtyBomb</defName>
+		<label>Dirty</label>
+		<description>A bomb loaded with dangerous radioactive materials, designed to poison large areas with radiation.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<!-- Ammo Items -->
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBaseCraftableBase">
+		<defName>Ammo_FusionBomb</defName>
+		<label>fusion warhead</label>
+		<graphicData>
+			<texPath>Things/FusionWarhead</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>4000</MarketValue>
+			<Mass>7.5</Mass>
+			<Bulk>15</Bulk>
+		</statBases>
+		<ammoClass>Fusion</ammoClass>
+		<detonateProjectile>Bullet_FusionWarhead</detonateProjectile>
+		<comps>
+			<!-- Vanilla values -->
+			<li Class="CompProperties_Explosive">
+				<explosiveRadius>60</explosiveRadius>
+				<explosiveDamageType>BombSuper</explosiveDamageType>
+				<explosiveExpandPerStackcount>0.4</explosiveExpandPerStackcount>
+				<startWickHitPointsPercent>0.7</startWickHitPointsPercent>
+				<chanceToStartFire>1</chanceToStartFire>
+				<damageFalloff>false</damageFalloff>
+				<explosionEffect>GiantExplosion</explosionEffect>
+				<explosionSound>Explosion_GiantBomb</explosionSound>
+				<wickTicks>
+					<min>60</min>
+					<max>120</max>
+				</wickTicks>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBaseCraftableBase">
+		<defName>Ammo_LargeNuclearBomb</defName>
+		<label>large nuclear warhead</label>
+		<graphicData>
+			<texPath>Things/LargeNuke</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>4000</MarketValue>
+			<Mass>7.5</Mass>
+			<Bulk>15</Bulk>
+		</statBases>
+		<ammoClass>LargeNuke</ammoClass>
+		<detonateProjectile>Bullet_FusionWarhead</detonateProjectile>
+		<comps>
+			<!-- Vanilla values -->
+			<li Class="CompProperties_Explosive">
+				<explosiveRadius>35</explosiveRadius>
+				<explosiveDamageType>BombSuper</explosiveDamageType>
+				<explosiveExpandPerStackcount>0.4</explosiveExpandPerStackcount>
+				<startWickHitPointsPercent>0.7</startWickHitPointsPercent>
+				<chanceToStartFire>0.5</chanceToStartFire>
+				<damageFalloff>false</damageFalloff>
+				<explosionEffect>GiantExplosion</explosionEffect>
+				<explosionSound>Explosion_GiantBomb</explosionSound>
+				<wickTicks>
+					<min>60</min>
+					<max>120</max>
+				</wickTicks>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBaseCraftableBase">
+		<defName>Ammo_SmallNuclearBomb</defName>
+		<label>small nuclear warhead</label>
+		<graphicData>
+			<texPath>Things/SmallNuke</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>500</MarketValue>
+			<Mass>7.5</Mass>
+			<Bulk>15</Bulk>
+		</statBases>
+		<ammoClass>SmallNuke</ammoClass>
+		<detonateProjectile>Bullet_FusionWarhead</detonateProjectile>
+		<comps>
+			<!-- Vanilla values -->
+			<li Class="CompProperties_Explosive">
+				<explosiveRadius>10</explosiveRadius>
+				<explosiveDamageType>BombSuper</explosiveDamageType>
+				<explosiveExpandPerStackcount>0.4</explosiveExpandPerStackcount>
+				<startWickHitPointsPercent>0.7</startWickHitPointsPercent>
+				<chanceToStartFire>0.3</chanceToStartFire>
+				<damageFalloff>true</damageFalloff>
+				<explosionEffect>GiantExplosion</explosionEffect>
+				<explosionSound>Explosion_GiantBomb</explosionSound>
+				<wickTicks>
+					<min>60</min>
+					<max>120</max>
+				</wickTicks>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBaseCraftableBase">
+		<defName>Ammo_DirtyNuclearBomb</defName>
+		<label>dirty nuclear warhead</label>
+		<graphicData>
+			<texPath>Things/DirtyNuke</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>800</MarketValue>
+			<Mass>7.5</Mass>
+			<Bulk>15</Bulk>
+		</statBases>
+		<ammoClass>DirtyBomb</ammoClass>
+		<detonateProjectile>Bullet_FusionWarhead</detonateProjectile>
+		<comps>
+			<!-- Vanilla values -->
+			<li Class="CompProperties_Explosive">
+				<explosiveRadius>4</explosiveRadius>
+				<explosiveDamageType>BombSuper</explosiveDamageType>
+				<explosiveExpandPerStackcount>0.4</explosiveExpandPerStackcount>
+				<startWickHitPointsPercent>0.7</startWickHitPointsPercent>
+				<chanceToStartFire>0</chanceToStartFire>
+				<damageFalloff>true</damageFalloff>
+				<explosionEffect>GiantExplosion</explosionEffect>
+				<explosionSound>Explosion_GiantBomb</explosionSound>
+				<wickTicks>
+					<min>60</min>
+					<max>120</max>
+				</wickTicks>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_FusionBomb</defName>
+		<label>make a fusion shell</label>
+		<description>Craft a fusion shell.</description>
+		<jobString>Making a fusion shell.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>200</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>400</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>40</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentSpacer</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Shell_AntigrainWarhead</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Uranium</li>
+				<li>Plasteel</li>
+				<li>ComponentIndustrial</li>
+				<li>ComponentSpacer</li>
+				<li>Shell_AntigrainWarhead</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_FusionBomb>1</Ammo_FusionBomb>
+		</products>
+		<workAmount>7500</workAmount>
+		<researchPrerequisite>FusionWeaponsResearch</researchPrerequisite>
+		<skillRequirements>
+			<Crafting>15</Crafting>
+		</skillRequirements>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_LargeNuclearBomb</defName>
+		<label>make a large nuclear shell</label>
+		<description>Craft a large nuclear shell.</description>
+		<jobString>Making a large nuclear shell.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>150</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>200</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>40</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Uranium</li>
+				<li>Plasteel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_LargeNuclearBomb>1</Ammo_LargeNuclearBomb>
+		</products>
+		<workAmount>7000</workAmount>
+		<researchPrerequisite>LargeNuclearWeaponsResearch</researchPrerequisite>
+		<skillRequirements>
+			<Crafting>12</Crafting>
+		</skillRequirements>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_SmallNuclearBomb</defName>
+		<label>make a small nuclear shell</label>
+		<description>Craft a small nuclear shell.</description>
+		<jobString>Making a small nuclear shell.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>60</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>30</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Uranium</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_SmallNuclearBomb>1</Ammo_SmallNuclearBomb>
+		</products>
+		<workAmount>6500</workAmount>
+		<researchPrerequisite>SmallNuclearWeaponsResearch</researchPrerequisite>
+		<skillRequirements>
+			<Crafting>8</Crafting>
+		</skillRequirements>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_DirtyNuclearBomb</defName>
+		<label>make a dirty nuclear shell</label>
+		<description>Craft a dirty nuclear shell.</description>
+		<jobString>Making a dirty nuclear shell.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>60</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Uranium</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_DirtyNuclearBomb>1</Ammo_DirtyNuclearBomb>
+		</products>
+		<workAmount>6000</workAmount>
+		<researchPrerequisite>DirtyNuclearWeaponsResearch</researchPrerequisite>
+		<skillRequirements>
+			<Crafting>8</Crafting>
+		</skillRequirements>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Nukes/Patches/Nukes/IEDs_Nuclear.xml b/ModPatches/Nukes/Patches/Nukes/IEDs_Nuclear.xml
new file mode 100644
index 0000000000..66ced95b18
--- /dev/null
+++ b/ModPatches/Nukes/Patches/Nukes/IEDs_Nuclear.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TrapIED_Fusion"]/costList</xpath>
+		<value>
+			<costList>
+				<Ammo_FusionBomb>1</Ammo_FusionBomb>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TrapIED_LargeNuclear"]/costList</xpath>
+		<value>
+			<costList>
+				<Ammo_LargeNuclearBomb>2</Ammo_LargeNuclearBomb>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TrapIED_SmallNuclear"]/costList</xpath>
+		<value>
+			<costList>
+				<Ammo_SmallNuclearBomb>2</Ammo_SmallNuclearBomb>
+			</costList>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Nukes/Patches/Nukes/Projectiles_Nuclear.xml b/ModPatches/Nukes/Patches/Nukes/Projectiles_Nuclear.xml
new file mode 100644
index 0000000000..5d31b28189
--- /dev/null
+++ b/ModPatches/Nukes/Patches/Nukes/Projectiles_Nuclear.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Remove base mod shells.-->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="Shell_FusionWarhead" or
+			defName="Shell_LargeNuclearWarhead" or
+			defName="Shell_SmallNuclearWarhead" or
+			defName="Shell_DirtyNuclearWarhead"]
+		</xpath>
+	</Operation>
+
+	<!-- Add ThingClass-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Bullet_FusionWarhead" or
+			defName="Bullet_LargeNuclearWarhead" or
+			defName="Bullet_SmallNuclearWarhead" or
+			defName="Bullet_DirtyNuclearWarhead"
+			]/thingClass
+		</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[
+			defName="Bullet_FusionWarhead" or
+			defName="Bullet_LargeNuclearWarhead" or
+			defName="Bullet_SmallNuclearWarhead" or
+			defName="Bullet_DirtyNuclearWarhead"
+			]/projectile
+		</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.ProjectilePropertiesCE</value>
+	</Operation>
+
+	<!-- Set speed.-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Bullet_FusionWarhead" or
+			defName="Bullet_LargeNuclearWarhead" or
+			defName="Bullet_SmallNuclearWarhead" or
+			defName="Bullet_DirtyNuclearWarhead"
+			]/projectile/speed
+		</xpath>
+		<value>
+			<speed>0</speed>
+		</value>
+	</Operation>
+
+	<!-- Add shells to 81mm ammo set.-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_81mmMortarShell"]/ammoTypes</xpath>
+		<value>
+			<Ammo_FusionBomb>Bullet_FusionWarhead</Ammo_FusionBomb>
+			<Ammo_LargeNuclearBomb>Bullet_LargeNuclearWarhead</Ammo_LargeNuclearBomb>
+			<Ammo_SmallNuclearBomb>Bullet_SmallNuclearWarhead</Ammo_SmallNuclearBomb>
+			<Ammo_DirtyNuclearBomb>Bullet_DirtyNuclearWarhead</Ammo_DirtyNuclearBomb>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Nyaron/Defs/Nyaron/Ammo/Ammo_Nyaron.xml b/ModPatches/Nyaron/Defs/Nyaron/Ammo/Ammo_Nyaron.xml
new file mode 100644
index 0000000000..8f1d5340c7
--- /dev/null
+++ b/ModPatches/Nyaron/Defs/Nyaron/Ammo/Ammo_Nyaron.xml
@@ -0,0 +1,373 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- ==================== Nyaron Pulse Ammo ========================== -->
+
+	<!-- ==================== AmmoSets ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_NyaronCellBall</defName>
+		<label>Energy Ball</label>
+		<ammoTypes>
+			<Ammo_NyaronCell>Bullet_NyaronCellBall</Ammo_NyaronCell>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_NyaronCellBullet</defName>
+		<label>Energy Ball</label>
+		<ammoTypes>
+			<Ammo_NyaronCell>Bullet_NyaronCellBullet</Ammo_NyaronCell>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_NyaronCellLaser</defName>
+		<label>Energy Ball</label>
+		<ammoTypes>
+			<Ammo_NyaronCell>Bullet_NyaronCellLaser</Ammo_NyaronCell>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>NyaronCell</defName>
+		<label>Cell</label>
+		<description>Energy based weapon.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_NyaronCell</defName>
+		<label>nyaron power cell</label>
+		<description>Energy cells for use in Nyaron energy weapons.</description>
+		<statBases>
+			<Mass>0.01</Mass>
+			<Bulk>0.01</Bulk>
+			<MarketValue>0.7</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoAdvanced</li>
+		</thingCategories>
+		<stackLimit>500</stackLimit>
+		<graphicData>
+			<texPath>ThirdParty/CP DOOM and DOOM Kit Classic/Doom2016PlasmaCell</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>NyaronCell</ammoClass>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_NyaronCellBall</defName>
+		<label>nyaron power ball</label>
+		<graphicData>
+			<texPath>Things/Projectile/Nyaron/Energy_ball</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>1</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>120</speed>
+			<damageDef>EnergyBall</damageDef>
+			<damageAmountBase>16</damageAmountBase>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>60</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_NyaronCellBullet</defName>
+		<label>nyaron shock bullet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Nyaron/Sec_bullet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>1</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>160</speed>
+			<damageDef>Shockbullet</damageDef>
+			<damageAmountBase>4</damageAmountBase>
+			<armorPenetrationSharp>25</armorPenetrationSharp>
+			<armorPenetrationBlunt>45</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletBlue">
+		<defName>Bullet_NyaronCellLaser</defName>
+		<label>pulse beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>EnergyBullet</damageDef>
+			<damageAmountBase>30</damageAmountBase>
+			<armorPenetrationSharp>40</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_NyaronCell</defName>
+		<label>make nyaron power cell x500</label>
+		<description>Craft 500 nyaron power cells.</description>
+		<jobString>Making nyaron power cells.</jobString>
+		<workAmount>8600</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Plasteel</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_NyaronCell>500</Ammo_NyaronCell>
+		</products>
+	</RecipeDef>
+
+	<!-- ==================== Nyaron Super Bow ========================== -->
+
+	<!-- ==================== AmmoSets ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_GreatArrowNyaron</defName>
+		<label>great arrows</label>
+		<ammoTypes>
+			<Ammo_GreatArrow_Stone>Projectile_GreatArrowNyaron_Stone</Ammo_GreatArrow_Stone>
+			<Ammo_GreatArrow_Steel>Projectile_GreatArrowNyaron_Steel</Ammo_GreatArrow_Steel>
+			<Ammo_GreatArrow_Plasteel>Projectile_GreatArrowNyaron_Plasteel</Ammo_GreatArrow_Plasteel>
+			<Ammo_GreatArrow_Venom>Projectile_GreatArrowNyaron_Venom</Ammo_GreatArrow_Venom>
+			<Ammo_GreatArrow_Flame>Projectile_GreatArrowNyaron_Flame</Ammo_GreatArrow_Flame>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="BaseGreatArrowProjectile">
+		<defName>Projectile_GreatArrowNyaron_Stone</defName>
+		<label>great arrow (stone)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Stone</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>33</speed>
+			<damageAmountBase>28</damageAmountBase><!--Artifically reduced from 33-->
+			<armorPenetrationBlunt>14.98</armorPenetrationBlunt>
+			<armorPenetrationSharp>3</armorPenetrationSharp>
+			<preExplosionSpawnChance>0.1</preExplosionSpawnChance><!-- All values are halved from original great arrow -->
+			<preExplosionSpawnThingDef>Ammo_GreatArrow_Stone</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseGreatArrowProjectile">
+		<defName>Projectile_GreatArrowNyaron_Steel</defName>
+		<label>great arrow (steel)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>36</speed>
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationBlunt>21.06</armorPenetrationBlunt>
+			<armorPenetrationSharp>6</armorPenetrationSharp>
+			<preExplosionSpawnChance>0.3</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>Ammo_GreatArrow_Steel</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseGreatArrowProjectile">
+		<defName>Projectile_GreatArrowNyaron_Plasteel</defName>
+		<label>great arrow (plasteel)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Plasteel</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>37</speed>
+			<damageAmountBase>15</damageAmountBase>
+			<armorPenetrationBlunt>19.26</armorPenetrationBlunt>
+			<armorPenetrationSharp>9</armorPenetrationSharp>
+			<preExplosionSpawnChance>0.375</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>Ammo_GreatArrow_Plasteel</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseGreatArrowProjectile">
+		<defName>Projectile_GreatArrowNyaron_Venom</defName>
+		<label>great arrow (venom)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Venom</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>36</speed>
+			<damageDef>Arrow</damageDef>
+			<damageAmountBase>14</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>ArrowVenom</def>
+					<amount>6</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationBlunt>21.06</armorPenetrationBlunt>
+			<armorPenetrationSharp>6</armorPenetrationSharp>
+			<preExplosionSpawnChance>0.3</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>Ammo_GreatArrow_Steel</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseGreatArrowProjectile">
+		<defName>Projectile_GreatArrowNyaron_Flame</defName>
+		<label>great arrow (flame)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Flame</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>36</speed>
+			<damageDef>Arrow</damageDef>
+			<damageAmountBase>6</damageAmountBase>
+			<armorPenetrationBlunt>10.54</armorPenetrationBlunt>
+			<armorPenetrationSharp>3</armorPenetrationSharp>
+			<secondaryDamage>
+				<li>
+					<def>Flame</def>
+					<amount>1</amount>
+					<chance>0.33</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Nyaron Flak Ammo ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_NyaronFlakGrenade</defName>
+		<label>NyaronFlak Grenades</label>
+		<ammoTypes>
+			<Ammo_NyaronFlakGrenade_HE>Bullet_NyaronFlakGrenade_HE</Ammo_NyaronFlakGrenade_HE>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="20x42mmGrenadeBase">
+		<defName>Ammo_NyaronFlakGrenade_HE</defName>
+		<label>Nyaron flak grenade</label>
+		<graphicData>
+			<texPath>Things/Ammo/GrenadeLauncher/HE</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>1.56</MarketValue>
+		</statBases>
+		<ammoClass>GrenadeHE</ammoClass>
+		<thingCategories Inherit="False">
+			<li>AmmoAdvanced</li>
+		</thingCategories>
+		<detonateProjectile>Bullet_NyaronFlakGrenade_HE</detonateProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base20x42mmGrenadeBullet">
+		<defName>Bullet_NyaronFlakGrenade_HE</defName>
+		<label>nyaron grenade (HE)</label>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<graphicData>
+			<texPath>Things/Projectile/Nyaron/Flak_cannon</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>25</speed>
+			<gravityFactor>7</gravityFactor>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>15</damageAmountBase>
+			<explosionRadius>0.5</explosionRadius>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>11</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_NyaronFlakGrenade_HE</defName>
+		<label>make Nyaron Flak grenades x100</label>
+		<description>Craft 100 Nyaron Flak grenades.</description>
+		<jobString>Making Nyaron Flak grenades.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>26</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_NyaronFlakGrenade_HE>100</Ammo_NyaronFlakGrenade_HE>
+		</products>
+		<workAmount>5800</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Nyaron/Patches/Nyaron/Bodies/Nyaron_Bodytype.xml b/ModPatches/Nyaron/Patches/Nyaron/Bodies/Nyaron_Bodytype.xml
new file mode 100644
index 0000000000..7c77ed87d9
--- /dev/null
+++ b/ModPatches/Nyaron/Patches/Nyaron/Bodies/Nyaron_Bodytype.xml
@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Nyaron Bodytype-->
+
+	<!-- ========== Modify coverage ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def = "Ribcage"]/coverage</xpath>
+		<value>
+			<coverage>0.07</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def = "Pelvis"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def = "Stomach"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def = "Heart"]/coverage</xpath>
+		<value>
+			<coverage>0.04</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def = "Lung"]/coverage</xpath>
+		<value>
+			<coverage>0.055</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def = "Kidney"]/coverage</xpath>
+		<value>
+			<coverage>0.03</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def = "Liver"]/coverage</xpath>
+		<value>
+			<coverage>0.06</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def = "Neck"]/coverage</xpath>
+		<value>
+			<coverage>0.055</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Skull"]/parts/li[def = "Brain"]/coverage</xpath>
+		<value>
+			<coverage>0.9</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def = "Eye"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def = "Ear"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def = "Nose"]/coverage</xpath>
+		<value>
+			<coverage>0.08</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def = "Shoulder"]/coverage</xpath>
+		<value>
+			<coverage>0.085</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Clavicle"]/coverage</xpath>
+		<value>
+			<coverage>0.06</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def="Humerus"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def="Radius"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def = "Leg"]/parts/li[def="Femur"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def = "Leg"]/parts/li[def="Tibia"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+
+	<!--Outside Squishy-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "right eye"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "left eye"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<!--Arm Groups-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Nyaron"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Nyaron"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Nyaron"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Nyaron"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<!--Natural Armor-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Nyaron"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Nyaron"]/corePart/parts/li[def="NR_CatTail"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Nyaron"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Nyaron"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Nyaron"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Nyaron"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Nyaron"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Nyaron"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Nyaron"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Nyaron"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Nyaron"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Nyaron"]/corePart/parts/li[def="Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Nyaron"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Nyaron"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Nyaron/Patches/Nyaron/PawnKindDefs/Nyaron_PawnKind.xml b/ModPatches/Nyaron/Patches/Nyaron/PawnKindDefs/Nyaron_PawnKind.xml
new file mode 100644
index 0000000000..94e7c64a91
--- /dev/null
+++ b/ModPatches/Nyaron/Patches/Nyaron/PawnKindDefs/Nyaron_PawnKind.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Ammo-->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			@Name="NyaronCivBase"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>0</min>
+					<max>3</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			@Name="NyaronMilBase"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>200</min>
+					<max>600</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Nyaron/Patches/Nyaron/Scenario/Nyaron_Scenario.xml b/ModPatches/Nyaron/Patches/Nyaron/Scenario/Nyaron_Scenario.xml
new file mode 100644
index 0000000000..f9f8ced7f7
--- /dev/null
+++ b/ModPatches/Nyaron/Patches/Nyaron/Scenario/Nyaron_Scenario.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="NyaronStart"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_NyaronCell</thingDef>
+				<count>240</count>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="NyaronStart_butler"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_303British_FMJ</thingDef>
+				<count>100</count>
+			</li>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_NyaronCell</thingDef>
+				<count>60</count>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Add material filter to faction for MIB type events-->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/FactionDef[@Name="NyaronFactionBase"]/apparelStuffFilter</xpath>
+		<match Class="PatchOperationConditional">
+			<xpath>Defs/FactionDef[@Name="NyaronFactionBase"]/apparelStuffFilter/thingDefs</xpath>
+			<match Class="PatchOperationConditional">
+				<xpath>Defs/FactionDef[@Name="NyaronFactionBase"]/apparelStuffFilter/thingDefs/li["Steel"]</xpath>
+				<match Class="PatchOperationReplace">
+					<xpath>Defs/FactionDef[@Name="NyaronFactionBase"]/apparelStuffFilter/thingDefs/li["Steel"]</xpath>
+					<value>
+						<li>Steel</li>
+					</value>
+				</match>
+				<nomatch Class="PatchOperationAdd">
+					<xpath>Defs/FactionDef[@Name="NyaronFactionBase"]/apparelStuffFilter/thingDefs</xpath>
+					<value>
+						<li>Steel</li>
+					</value>
+				</nomatch>
+			</match>
+			<nomatch Class="PatchOperationAdd">
+				<xpath>Defs/FactionDef[@Name="NyaronFactionBase"]/apparelStuffFilter</xpath>
+				<value>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</value>
+			</nomatch>
+		</match>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/FactionDef[@Name="NyaronFactionBase"]</xpath>
+			<value>
+				<apparelStuffFilter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</apparelStuffFilter>
+			</value>
+		</nomatch>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Nyaron/Patches/Nyaron/ThingDefs_Items/Items_Resources.xml b/ModPatches/Nyaron/Patches/Nyaron/ThingDefs_Items/Items_Resources.xml
new file mode 100644
index 0000000000..e21312ef58
--- /dev/null
+++ b/ModPatches/Nyaron/Patches/Nyaron/ThingDefs_Items/Items_Resources.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==========  Leather  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Nyaron"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.05</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Nyaron/Patches/Nyaron/ThingDefs_Misc/Nyaron_Apparel.xml b/ModPatches/Nyaron/Patches/Nyaron/ThingDefs_Misc/Nyaron_Apparel.xml
new file mode 100644
index 0000000000..73b5bf89d7
--- /dev/null
+++ b/ModPatches/Nyaron/Patches/Nyaron/ThingDefs_Misc/Nyaron_Apparel.xml
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--========= Stuffable =========-->
+
+	<!--Starter-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Nr_SUniform"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Nr_SUniform"]/statBases/ArmorRating_Blunt</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Nr_SUniform"]/statBases/ArmorRating_Heat</xpath>
+	</Operation>
+
+	<!--Cat Jacket-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Nr_CatJacket"
+			]/statBases/Mass </xpath>
+		<value>
+			<Mass>12.5</Mass>
+			<Bulk>20</Bulk>
+			<WornBulk>8</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Nr_CatJacket"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>12</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Nr_CatJacket"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Nr_CatJacket"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Nr_CatJacket"]/stuffCategories</xpath>
+		<value>
+			<stuffCategories>
+				<li>SoftArmor</li>
+			</stuffCategories>
+			<costList>
+				<Steel>90</Steel>
+			</costList>
+		</value>
+	</Operation>
+
+	<!--Cat Hoodie-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Nr_CatHoodie"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Nr_CatHoodie"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Nr_CatHoodie"]/statBases/ArmorRating_Sharp</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Nr_CatHoodie"]/statBases/ArmorRating_Blunt</xpath>
+	</Operation>
+
+	<!--========= Fixed Armor Value =========-->
+
+	<!--Maid-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Nr_CatMaid"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Nr_CatMaid"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Nr_CatMaid"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.05</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Nr_CatMaidBand"]/statBases</xpath>
+		<value>
+			<Bulk>0.5</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Nr_CatMaidBand"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Nr_CatMaidBand"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.05</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Power Armor-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Nr_PowerArmor"]/statBases</xpath>
+		<value>
+			<Bulk>80</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Nr_PowerArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>30</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Nr_PowerArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Nr_PowerArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Nr_PowerArmor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Nr_PowerArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>35</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Nr_PowerArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Nyaron/Patches/Nyaron/ThingDefs_Misc/Weapons.xml b/ModPatches/Nyaron/Patches/Nyaron/ThingDefs_Misc/Weapons.xml
new file mode 100644
index 0000000000..10d3682fa3
--- /dev/null
+++ b/ModPatches/Nyaron/Patches/Nyaron/ThingDefs_Misc/Weapons.xml
@@ -0,0 +1,550 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==========  Clawbar  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Nr_Clawbar"]/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>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2.25</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>4.225</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>2.25</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationSharp>1.06</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.225</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Nr_Clawbar"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
+			<Bulk>5.5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Nr_Clawbar"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Nr_Clawbar"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.42</MeleeCritChance>
+				<MeleeParryChance>0.24</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- ==========  Knife  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Nr_Karambit"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.01</cooldownTime>
+					<chanceFactor>0.4</chanceFactor>
+					<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.26</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.67</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.18</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.2</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Nr_Karambit"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.39</MeleeCounterParryBonus>
+			<Bulk>1.5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Nr_Karambit"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.08</MeleeCritChance>
+				<MeleeParryChance>0.24</MeleeParryChance>
+				<MeleeDodgeChance>1.07</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Nr_Karambit"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- ==========  Sword  =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Nr_Lightbringer"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+			<Bulk>6.5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Nr_Lightbringer"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.63</MeleeCritChance>
+				<MeleeParryChance>0.75</MeleeParryChance>
+				<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Nr_Lightbringer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.69</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<armorPenetrationSharp>22</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.69</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>2.592</armorPenetrationBlunt>
+					<armorPenetrationSharp>16</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.56</cooldownTime>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>4.05</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Charge Pistol =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Nr_CriPistol</defName>
+		<statBases>
+			<SightsEfficiency>0.80</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>2.50</Bulk>
+			<Mass>1.3</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_NyaronCellBall</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>Cripistol_fire</soundCast>
+			<soundCastTail>Secgun_tail</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>16</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_NyaronCellBall</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Nr_CriPistol"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Charge SMG =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Nr_MfoldPdw</defName>
+		<statBases>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>0.95</SwayFactor>
+			<Bulk>6.00</Bulk>
+			<Mass>3.50</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>1.86</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_NyaronCellBall</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<range>28</range>
+			<soundCast>Cripistol_fire</soundCast>
+			<soundCastTail>Secgun_tail</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>36</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_NyaronCellBall</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Rifle =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Nr_NpcRifle</defName>
+		<statBases>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.24</SwayFactor>
+			<Bulk>8.80</Bulk>
+			<Mass>6.50</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>2.34</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_NyaronCellBullet</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<range>51</range>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<soundCast>Secgun_fire</soundCast>
+			<soundCastTail>Secgun_tail</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>48</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_NyaronCellBullet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Beam Rifle =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Nr_ChRifle</defName>
+		<statBases>
+			<SightsEfficiency>2.60</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.90</SwayFactor>
+			<Bulk>12.5</Bulk>
+			<Mass>5.50</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_NyaronCellLaser</defaultProjectile>
+			<warmupTime>1.6</warmupTime>
+			<range>75</range>
+			<ammoConsumedPerShotCount>10</ammoConsumedPerShotCount>
+			<soundCast>Nr_beamfire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>60</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_NyaronCellLaser</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Flak Caster =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Nr_FlakCaster</defName>
+		<statBases>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.20</ShotSpread>
+			<SwayFactor>2.10</SwayFactor>
+			<Bulk>14.00</Bulk>
+			<Mass>7.00</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>2.04</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_NyaronFlakGrenade_HE</defaultProjectile>
+			<warmupTime>2.1</warmupTime>
+			<burstShotCount>16</burstShotCount>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<range>44</range>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>6</reloadTime>
+			<ammoSet>AmmoSet_NyaronFlakGrenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>4</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Bow =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Nr_ChRifle</defName>
+		<statBases>
+			<SightsEfficiency>2.60</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.90</SwayFactor>
+			<Bulk>12.5</Bulk>
+			<Mass>5.50</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_NyaronCellLaser</defaultProjectile>
+			<warmupTime>1.6</warmupTime>
+			<range>75</range>
+			<ammoConsumedPerShotCount>10</ammoConsumedPerShotCount>
+			<soundCast>Nr_beamfire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>60</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_NyaronCellLaser</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Nr_Stkbow</defName>
+		<statBases>
+			<SightsEfficiency>2.5</SightsEfficiency>
+			<ShotSpread>1</ShotSpread>
+			<SwayFactor>1.5</SwayFactor>
+			<Bulk>5.00</Bulk>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_GreatArrowNyaron_Stone</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>30</range>
+			<soundCast>Bow_Large</soundCast>
+		</Properties>
+		<AmmoUser>
+			<ammoSet>AmmoSet_GreatArrowNyaron</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Nr_Stkbow"]/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>
+	</Operation>
+
+	<!-- ========== Melee Attacks =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Nr_FlakCaster" or
+			defName="Nr_ChRifle" or
+			defName="Nr_NpcRifle" or
+			defName="Nr_MfoldPdw"
+			]/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="Nr_CriPistol"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Nyaron/Patches/Nyaron/ThingDefs_Races/AlienRace_Nyaron.xml b/ModPatches/Nyaron/Patches/Nyaron/ThingDefs_Races/AlienRace_Nyaron.xml
new file mode 100644
index 0000000000..29aa2de8ce
--- /dev/null
+++ b/ModPatches/Nyaron/Patches/Nyaron/ThingDefs_Races/AlienRace_Nyaron.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="BaseNyaronPawn"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Nyaron"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Better shooting, Worse melee-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Nyaron"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<MeleeCritChance>1.3</MeleeCritChance>
+			<MeleeParryChance>0.5</MeleeParryChance>
+			<Suppressability>0.9</Suppressability>
+			<SmokeSensitivity>0.9</SmokeSensitivity>
+			<CarryBulk>30</CarryBulk>
+			<CarryWeight>60</CarryWeight>
+			<ReloadSpeed>1.25</ReloadSpeed>
+		</value>
+	</Operation>
+
+	<!--Base has no headbut, only bite-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Nyaron"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left NyanPunch</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right NyanPunch</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Dragons Not Included/Defs/O21 Dragons Not Included/Ammo_Boomerang.xml b/ModPatches/O21 Dragons Not Included/Defs/O21 Dragons Not Included/Ammo_Boomerang.xml
new file mode 100644
index 0000000000..d538a48ba6
--- /dev/null
+++ b/ModPatches/O21 Dragons Not Included/Defs/O21 Dragons Not Included/Ammo_Boomerang.xml	
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingDef ParentName="BasePilumProjectile">
+		<defName>Boomerang_Thrown</defName>
+		<label>boomerang</label>
+		<graphicData>
+			<texPath>Things/Weapons/Melee/Boomerang</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Blunt</damageDef>
+			<damageAmountBase>15</damageAmountBase>
+			<speed>12</speed>
+			<armorPenetrationBlunt>0.18</armorPenetrationBlunt>
+			<preExplosionSpawnChance>0.50</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>O21_DNI_Boomerang</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>MakeAmmo_O21_DNI_Boomerang</defName>
+		<label>make boomerang x5</label>
+		<description>Craft 5 boomerangs.</description>
+		<jobString>Making boomerangs.</jobString>
+		<workAmount>1200</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>15</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<recipeUsers>
+			<li>CraftingSpot</li>
+		</recipeUsers>
+		<products>
+			<O21_DNI_Boomerang>5</O21_DNI_Boomerang>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/O21 Dragons Not Included/Patches/O21 Dragons Not Included/Apparel_Dragon.xml b/ModPatches/O21 Dragons Not Included/Patches/O21 Dragons Not Included/Apparel_Dragon.xml
new file mode 100644
index 0000000000..a00f950448
--- /dev/null
+++ b/ModPatches/O21 Dragons Not Included/Patches/O21 Dragons Not Included/Apparel_Dragon.xml	
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Cloak -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="O21_DNI_ShoulderCloak"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
+			<Bulk>3.5</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- Tunic & Surcoat-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="O21_DNI_TunicKnight" or defName="O21_DNI_KnightSurcoat"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+			<Bulk>3.5</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- Light Leather -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="O21_DNI_LeatherLight"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
+			<Bulk>75</Bulk>
+			<WornBulk>8</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- Pauldrons -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="O21_DNI_PauldronsKnight" or defName="O21_DNI_PauldronsGondorian"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.3</StuffEffectMultiplierArmor>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- Breastplate -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="O21_DNI_BreastplateKnight" or defName="O21_DNI_CuirassGondorian"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+			<Bulk>90</Bulk>
+			<WornBulk>9</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- Helmet -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="O21_DNI_HelmetKnight" or defName="O21_DNI_HelmetGondor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.1</StuffEffectMultiplierArmor>
+			<Bulk>5</Bulk>
+		</value>
+	</Operation>
+
+	<!-- Tropical Mask -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="DNIZoraiMaskBase"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>10</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Hood -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="O21_DNI_NausicHoodGoggled" or defName="O21_DNI_NausicGasmask"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Armored Hood -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="O21_DNI_NausicHoodGoggled_Armoured" or defName="O21_DNI_NausicGasmask_Armoured"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Gas Mask -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_NausicGasmask" or defName="O21_DNI_NausicGasmask_Armoured"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-0.65</SmokeSensitivity>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Dragons Not Included/Patches/O21 Dragons Not Included/Melee_Dragon.xml b/ModPatches/O21 Dragons Not Included/Patches/O21 Dragons Not Included/Melee_Dragon.xml
new file mode 100644
index 0000000000..9943ec208e
--- /dev/null
+++ b/ModPatches/O21 Dragons Not Included/Patches/O21 Dragons Not Included/Melee_Dragon.xml	
@@ -0,0 +1,1221 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Scottish Broadswords -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="O21_DNI_BasketHiltedSword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.69</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.69</cooldownTime>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.6</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.56</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>2.592</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.58</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_BasketHiltedSword"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_BasketHiltedSword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.63</MeleeCritChance>
+				<MeleeParryChance>0.80</MeleeParryChance>
+				<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="O21_DNI_HalflangBroadsword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.69</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.69</cooldownTime>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.6</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.56</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>2.592</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.58</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_HalflangBroadsword"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_HalflangBroadsword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.63</MeleeCritChance>
+				<MeleeParryChance>0.75</MeleeParryChance>
+				<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Lochaber Axe -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="O21_DNI_LochaberAxe"]/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="O21_DNI_LochaberAxe"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>0.89</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_LochaberAxe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.22</MeleeCritChance>
+				<MeleeParryChance>1.33</MeleeParryChance>
+				<MeleeDodgeChance>0.57</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Machete -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="O21_DNI_SpikedMachete"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.3</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.70</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_SpikedMachete"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<MeleeCounterParryBonus>0.26</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_SpikedMachete"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.29</MeleeCritChance>
+				<MeleeParryChance>0.26</MeleeParryChance>
+				<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_SpikedMachete"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- Ball Club -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="O21_DNI_BallClubA"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.06</cooldownTime>
+					<armorPenetrationBlunt>1.15</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>3.06</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>4.598</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_BallClubA"]/statBases</xpath>
+		<value>
+			<Bulk>3.75</Bulk>
+			<MeleeCounterParryBonus>0.16</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_BallClubA"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.63</MeleeCritChance>
+				<MeleeParryChance>0.16</MeleeParryChance>
+				<MeleeDodgeChance>0.20</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_BallClubA"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- Spade-Tipped Sword -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="O21_DNI_SpadeTippedSword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.57</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.30</cooldownTime>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>2.4</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.48</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>1.56</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>1.944</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.44</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_SpadeTippedSword"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>0.45</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_SpadeTippedSword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.20</MeleeCritChance>
+				<MeleeParryChance>0.35</MeleeParryChance>
+				<MeleeDodgeChance>0.20</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Tropical Clubs -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="TropicalClubBase"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.06</cooldownTime>
+					<armorPenetrationBlunt>1.15</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>3.06</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>4.598</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="TropicalClubBase"]/statBases</xpath>
+		<value>
+			<Bulk>3.75</Bulk>
+			<MeleeCounterParryBonus>0.16</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="TropicalClubBase"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.63</MeleeCritChance>
+				<MeleeParryChance>0.16</MeleeParryChance>
+				<MeleeDodgeChance>0.20</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="TropicalClubBase"]</xpath>
+		<value>
+			<weaponTags>
+				<li>CE_OneHandedWeapon</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+	<!-- Yari -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="O21_DNI_JumonjiYari" or defName="O21_DNI_SuYari"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.29</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>1.913</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.71</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.85</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.14</cooldownTime>
+					<chanceFactor>1.00</chanceFactor>
+					<armorPenetrationBlunt>1.913</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.4</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>3.2</cooldownTime>
+					<chanceFactor>0.33</chanceFactor>
+					<armorPenetrationBlunt>1.913</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.28</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_JumonjiYari" or defName="O21_DNI_SuYari"]/statBases</xpath>
+		<value>
+			<Bulk>11</Bulk>
+			<MeleeCounterParryBonus>2.12</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_JumonjiYari" or defName="O21_DNI_SuYari"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.39</MeleeCritChance>
+				<MeleeParryChance>1.59</MeleeParryChance>
+				<MeleeDodgeChance>0.90</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Tanto -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Tanto"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>0.97</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.259</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>0.97</cooldownTime>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>0.259</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.48</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.05</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>0.304</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.28</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Tanto"]/statBases</xpath>
+		<value>
+			<Bulk>4.2</Bulk>
+			<MeleeCounterParryBonus>0.38</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Tanto"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.93</MeleeCritChance>
+				<MeleeParryChance>0.38</MeleeParryChance>
+				<MeleeDodgeChance>0.09</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Ono -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Ono"]/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>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Ono"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Ono"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.10</MeleeCritChance>
+				<MeleeParryChance>0.15</MeleeParryChance>
+				<MeleeDodgeChance>0.20</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Ono"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- Naginata -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Naginata"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.76</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>0.95</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.76</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationSharp>1.9</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.95</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>32</power>
+					<cooldownTime>1.41</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationSharp>1.27</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Naginata"]/statBases</xpath>
+		<value>
+			<Bulk>14</Bulk>
+			<MeleeCounterParryBonus>1.78</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Naginata"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.56</MeleeCritChance>
+				<MeleeParryChance>0.75</MeleeParryChance>
+				<MeleeDodgeChance>0.6</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Jitte -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Jitte"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.68</cooldownTime>
+					<armorPenetrationBlunt>2.188</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Jitte"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Jitte"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.2</MeleeCritChance>
+				<MeleeParryChance>1</MeleeParryChance>
+				<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Jitte"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- Ararebo -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Ararebo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.49</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>3.375</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>2.67</cooldownTime>
+					<armorPenetrationBlunt>15.75</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Ararebo"]/statBases</xpath>
+		<value>
+			<Bulk>14</Bulk>
+			<MeleeCounterParryBonus>0.28</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Ararebo"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.6</MeleeCritChance>
+				<MeleeParryChance>0.38</MeleeParryChance>
+				<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Kabutowari, Sai -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Kabutowari" or defName="O21_DNI_Sai"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.29</cooldownTime>
+					<armorPenetrationBlunt>0.275</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.29</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.275</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Kabutowari" or defName="O21_DNI_Sai"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Kabutowari" or defName="O21_DNI_Sai"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.63</MeleeCritChance>
+				<MeleeParryChance>0.5</MeleeParryChance>
+				<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Kabutowari" or defName="O21_DNI_Sai"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- Tropical Knives -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="TropicalBladeBase"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.18</cooldownTime>
+					<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.32</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.26</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.42</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="TropicalBladeBase"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="TropicalBladeBase"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.5</MeleeCritChance>
+				<MeleeParryChance>0.15</MeleeParryChance>
+				<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="TropicalBladeBase"]</xpath>
+		<value>
+			<weaponTags>
+				<li>CE_OneHandedWeapon</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+	<!-- Masakari Axe -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Masakari"]/statBases</xpath>
+		<value>
+			<Bulk>13</Bulk>
+			<MeleeCounterParryBonus>1.5</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Masakari"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.3</MeleeCritChance>
+				<MeleeParryChance>1.6</MeleeParryChance>
+				<MeleeDodgeChance>0.56</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Masakari"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>48</power>
+					<cooldownTime>3.4</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>10.4</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.8</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<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>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Tropical Spears -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="TropicalSpearBase"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.35</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.78</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.19</cooldownTime>
+					<chanceFactor>1.00</chanceFactor>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="TropicalSpearBase"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="TropicalSpearBase"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.17</MeleeCritChance>
+				<MeleeParryChance>1.45</MeleeParryChance>
+				<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Sasumata -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Sasumata"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.78</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>1.000</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.79</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>6.76</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Sasumata"]/statBases</xpath>
+		<value>
+			<Bulk>7</Bulk>
+			<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Sasumata"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.50</MeleeCritChance>
+				<MeleeParryChance>0.18</MeleeParryChance>
+				<MeleeDodgeChance>0.30</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Katana -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Katana"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.33</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.936</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.33</cooldownTime>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>0.936</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.88</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>31</power>
+					<cooldownTime>1.28</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>2.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.65</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Katana"]/statBases</xpath>
+		<value>
+			<Bulk>7.85</Bulk>
+			<MeleeCounterParryBonus>1.38</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Katana"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.85</MeleeCritChance>
+				<MeleeParryChance>0.69</MeleeParryChance>
+				<MeleeDodgeChance>0.37</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Nagamaki, Odachi -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Nagamaki" or defName="O21_DNI_Odachi"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.38</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>1.08</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.38</cooldownTime>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>1.08</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.55</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>1.49</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Nagamaki" or defName="O21_DNI_Odachi"]/statBases</xpath>
+		<value>
+			<Bulk>9</Bulk>
+			<MeleeCounterParryBonus>3.6</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Nagamaki" or defName="O21_DNI_Odachi"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.74</MeleeCritChance>
+				<MeleeParryChance>0.53</MeleeParryChance>
+				<MeleeDodgeChance>0.60</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Dragons Not Included/Patches/O21 Dragons Not Included/Ranged_Dragon.xml b/ModPatches/O21 Dragons Not Included/Patches/O21 Dragons Not Included/Ranged_Dragon.xml
new file mode 100644
index 0000000000..eb9718904f
--- /dev/null
+++ b/ModPatches/O21 Dragons Not Included/Patches/O21 Dragons Not Included/Ranged_Dragon.xml	
@@ -0,0 +1,398 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Melee -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="O21_Gun_HighlandPistol" or defName="O21_Gun_FlintlockPistol" or defName="O21_Gun_MatchlockPistol"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "O21_Gun_ResonanceRifle"]/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[@Name="TropicalBlowpipeBase"]/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>
+	</Operation>
+
+	<!-- Various Pistols -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>O21_Gun_HighlandPistol</defName>
+		<statBases>
+			<Mass>1.25</Mass>
+			<Bulk>3.90</Bulk>
+			<SwayFactor>1.22</SwayFactor>
+			<ShotSpread>0.36</ShotSpread>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_SlowMusketBall</defaultProjectile>
+			<warmupTime>1.66</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Revolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>5</AmmoGenPerMagOverride>
+			<reloadTime>6.5</reloadTime>
+			<ammoSet>AmmoSet_SlowMusketBall</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>O21_Gun_FlintlockPistol</defName>
+		<statBases>
+			<Mass>1.25</Mass>
+			<Bulk>3.90</Bulk>
+			<SwayFactor>1.22</SwayFactor>
+			<ShotSpread>0.36</ShotSpread>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_SlowMusketBall</defaultProjectile>
+			<warmupTime>1.66</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Revolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>5</AmmoGenPerMagOverride>
+			<reloadTime>6.5</reloadTime>
+			<ammoSet>AmmoSet_SlowMusketBall</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>O21_Gun_MatchlockPistol</defName>
+		<statBases>
+			<Mass>1.45</Mass>
+			<Bulk>4</Bulk>
+			<SwayFactor>1.24</SwayFactor>
+			<ShotSpread>0.37</ShotSpread>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_SlowMusketBall</defaultProjectile>
+			<warmupTime>1.86</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Revolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>5</AmmoGenPerMagOverride>
+			<reloadTime>6.9</reloadTime>
+			<ammoSet>AmmoSet_SlowMusketBall</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Blowpipes -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="TropicalBlowpipeBase"]/verbs</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="TropicalBlowpipeBase"]/statBases/AccuracyTouch</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="TropicalBlowpipeBase"]/statBases/AccuracyShort</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="TropicalBlowpipeBase"]/statBases/AccuracyMedium</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="TropicalBlowpipeBase"]/statBases/AccuracyLong</xpath>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>O21_TropicalBoneBlowpipe</defName>
+		<statBases>
+			<Mass>1</Mass>
+			<Bulk>2.50</Bulk>
+			<SwayFactor>1.22</SwayFactor>
+			<ShotSpread>0.36</ShotSpread>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Projectile_Dart_Venom</defaultProjectile>
+			<warmupTime>1.20</warmupTime>
+			<range>10</range>
+			<soundCast>Bow_Small</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_Blowdart</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>O21_TropicalBambooBlowpipe</defName>
+		<statBases>
+			<Mass>1</Mass>
+			<Bulk>2.50</Bulk>
+			<SwayFactor>1.22</SwayFactor>
+			<ShotSpread>0.36</ShotSpread>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<RangedWeapon_Cooldown>1.85</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Projectile_Dart_Venom</defaultProjectile>
+			<warmupTime>2.60</warmupTime>
+			<range>10</range>
+			<soundCast>Bow_Small</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
+			<reloadTime>5.3</reloadTime>
+			<ammoSet>AmmoSet_Blowdart</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Boomerang =========== -->
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Boomerang"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>BaseWeapon</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Boomerang"]/costStuffCount</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Boomerang"]/recipeMaker</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Boomerang"]</xpath>
+		<value>
+			<thingCategories>
+				<li>WeaponsRanged</li>
+			</thingCategories>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Boomerang"]/statBases</xpath>
+		<value>
+			<statBases>
+				<SightsEfficiency>0.8</SightsEfficiency>
+				<ShotSpread>0.6</ShotSpread>
+				<SwayFactor>2</SwayFactor>
+				<Bulk>1</Bulk>
+				<Mass>0.5</Mass>
+				<RangedWeapon_Cooldown>1.3</RangedWeapon_Cooldown>
+			</statBases>
+			<stackLimit>25</stackLimit>
+			<tradeTags>
+				<li>CE_AutoEnableTrade</li>
+			</tradeTags>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Boomerang"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Boomerang_Thrown</defaultProjectile>
+					<warmupTime>1.5</warmupTime>
+					<range>16</range>
+					<soundCast>Interact_BeatFire</soundCast>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="O21_DNI_Boomerang"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.69</cooldownTime>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>3.29</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>3.2</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Resonance Rifle === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>O21_Gun_ResonanceRifle</defName>
+		<statBases>
+			<Mass>4.8</Mass>
+			<Bulk>14.9</Bulk>
+			<SwayFactor>1.92</SwayFactor>
+			<ShotSpread>0.30</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>1.35</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_FastMusketBall</defaultProjectile>
+			<warmupTime>2.5</warmupTime>
+			<range>45</range>
+			<soundCast>Shot_Revolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>5</AmmoGenPerMagOverride>
+			<reloadTime>10</reloadTime>
+			<ammoSet>AmmoSet_FastMusketBall</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Patch_Bodies.xml b/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Patch_Bodies.xml
new file mode 100644
index 0000000000..4199cfc7a3
--- /dev/null
+++ b/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Patch_Bodies.xml	
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Add armor coverage (for pawns with non-zero armor that use human body) ========== -->
+
+	<!-- Illithid -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_FR_Body_Illithid"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_FR_Body_Illithid"]/corePart/parts/li[def = "Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_FR_Body_Illithid"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_FR_Body_Illithid"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_FR_Body_Illithid"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_FR_Body_Illithid"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Ear"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_FR_Body_Illithid"]/corePart/parts/li[def = "Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_FR_Body_Illithid"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_FR_Body_Illithid"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_FR_Body_Illithid"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/parts/li[def = "Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_FR_Body_Illithid"]/corePart/parts/li[def = "Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_FR_Body_Illithid"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_FR_Body_Illithid"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/parts/li[def = "Toe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- Chitine -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_FR_Chitine"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_FR_Chitine"]/corePart/parts/li[def = "Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_FR_Chitine"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_FR_Chitine"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_FR_Chitine"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_FR_Chitine"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Ear"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_FR_Chitine"]/corePart/parts/li[def = "Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_FR_Chitine"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_FR_Chitine"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_FR_Chitine"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/parts/li[def = "Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_FR_Chitine"]/corePart/parts/li[def = "Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_FR_Chitine"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_FR_Chitine"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/parts/li[def = "Toe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/PawnKinds_Misc.xml b/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/PawnKinds_Misc.xml
new file mode 100644
index 0000000000..b359d8890f
--- /dev/null
+++ b/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/PawnKinds_Misc.xml	
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Give ammo to pawns with bows ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/PawnKindDef[
+			@Name="O21_FR_NPCTribePawnBase_Bowman" or
+			@Name="O21_FR_NPCTribePawnBase_Hunter" or
+			@Name="O21_FR_NPCTribePawnBase_Miner" or
+			@Name="O21_FR_NPCTribePawnBase_Logger" or
+			@Name="O21_FR_NPCTribePawnBase_Farmer"]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>12</min>
+					<max>20</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.3</generateChance>
+						<sidearmMoney>
+							<min>150</min>
+							<max>350</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>NeolithicMeleeBasic</li>
+							<li>MedievalMeleeDecent</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Chitine.xml b/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Chitine.xml
new file mode 100644
index 0000000000..4d2ff9aec7
--- /dev/null
+++ b/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Chitine.xml	
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Chitine"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Chitine"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Chitine"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Chitine"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency>0.6</NightVisionEfficiency>
+			<MeleeDodgeChance>1.1</MeleeDodgeChance>
+			<MeleeCritChance>0.8</MeleeCritChance>
+			<MeleeParryChance>0.85</MeleeParryChance>
+			<CarryWeight>35</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Chitine"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Chitine"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Dwarf.xml b/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Dwarf.xml
new file mode 100644
index 0000000000..4063bfcbbf
--- /dev/null
+++ b/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Dwarf.xml	
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Dwarf"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Dwarf"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Dwarf"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Dwarf"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency>0.5</NightVisionEfficiency>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>0.8</MeleeCritChance>
+			<MeleeParryChance>0.8</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Dwarf"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hand</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.19</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hand</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.19</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.11</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.19</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Dwarf"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_ElfBase.xml b/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_ElfBase.xml
new file mode 100644
index 0000000000..17150bb12e
--- /dev/null
+++ b/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_ElfBase.xml	
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_ElfBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_ElfBase"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_ElfBase"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_ElfBase"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency>0.4</NightVisionEfficiency>
+			<MeleeDodgeChance>1.1</MeleeDodgeChance>
+			<MeleeCritChance>0.8</MeleeCritChance>
+			<MeleeParryChance>0.85</MeleeParryChance>
+			<CarryWeight>35</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_ElfBase"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_ElfBase"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Firbolg.xml b/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Firbolg.xml
new file mode 100644
index 0000000000..f1f0e94465
--- /dev/null
+++ b/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Firbolg.xml	
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Firbolg"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Firbolg"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Firbolg"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Firbolg"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Firbolg"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Firbolg"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Gith.xml b/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Gith.xml
new file mode 100644
index 0000000000..878c67641c
--- /dev/null
+++ b/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Gith.xml	
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Gith"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Gith"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Gith"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Gith"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency>0.4</NightVisionEfficiency>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Gith"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Gith"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Goblin.xml b/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Goblin.xml
new file mode 100644
index 0000000000..227e07391b
--- /dev/null
+++ b/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Goblin.xml	
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Goblins stand about as tall as a child, with strength and wits to match. -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Goblin"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Goblin"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Goblin"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<!-- Goblins are cowardly, cruel, brutal, and not very smart. -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Goblin"]/alienRace/generalSettings/forcedRaceTraitEntries</xpath>
+		<value>
+			<li>
+				<defName>Beauty</defName>
+				<degree>-1</degree>
+				<chance>20</chance>
+			</li>
+			<li>
+				<defName>Greedy</defName>
+				<chance>20</chance>
+			</li>
+			<li>
+				<defName>Bravery</defName>
+				<degree>-1</degree>
+				<chance>20</chance>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- The only good goblins are the ones who never come out of their holes. -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Goblin"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency>0.4</NightVisionEfficiency>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>0.6</MeleeCritChance>
+			<MeleeParryChance>0.8</MeleeParryChance>
+			<CarryWeight>20</CarryWeight>
+			<CarryBulk>15</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Goblin"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hand</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.19</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hand</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.19</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.11</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.19</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Goblins aren't bright, but they're not fools. -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Goblin"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_HalfOrcs.xml b/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_HalfOrcs.xml
new file mode 100644
index 0000000000..b4b23c0c3f
--- /dev/null
+++ b/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_HalfOrcs.xml	
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- You just *know* there's a human bard somewhere out there that's responsible for this. -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_HalfOrc"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_HalfOrc"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_HalfOrc"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<!-- The average half-orc is both larger and taller than your average human. -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_HalfOrc"]/race/baseBodySize</xpath>
+		<value>
+			<baseBodySize>1.1</baseBodySize>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_HalfOrc"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4.35</MoveSpeed>
+		</value>
+	</Operation>
+
+	<!-- Half-orcs benefit from their hybrid parents, mixing human agility with orc strength. -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_HalfOrc"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.95</MeleeDodgeChance>
+			<MeleeCritChance>1.05</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<SmokeSensitivity>0.90</SmokeSensitivity>
+			<CarryWeight>41</CarryWeight>
+			<CarryBulk>22</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_HalfOrc"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.42</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.42</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>4.88</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.875</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.57</cooldownTime>
+					<chanceFactor>0.33</chanceFactor>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_HalfOrc"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Halfing.xml b/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Halfing.xml
new file mode 100644
index 0000000000..d2df9efdbf
--- /dev/null
+++ b/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Halfing.xml	
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Halfling"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Halfling"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Halfling"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Halfling"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1.1</MeleeDodgeChance>
+			<MeleeCritChance>0.8</MeleeCritChance>
+			<MeleeParryChance>0.85</MeleeParryChance>
+			<CarryWeight>35</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Halfling"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Halfling"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Hobgoblins.xml b/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Hobgoblins.xml
new file mode 100644
index 0000000000..d3b7d18ba9
--- /dev/null
+++ b/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Hobgoblins.xml	
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Hobgoblin"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Hobgoblin"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Hobgoblin"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<!-- Goblins are cowardly, cruel, and brutal. This extendeds to their larger breathern. -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Hobgoblin"]/alienRace/generalSettings/forcedRaceTraitEntries</xpath>
+		<value>
+			<li>
+				<defName>Beauty</defName>
+				<degree>-1</degree>
+				<chance>20</chance>
+			</li>
+			<li>
+				<defName>Greedy</defName>
+				<chance>10</chance>
+			</li>
+			<li>
+				<defName>Xenophobia</defName>
+				<degree>-1</degree>
+				<chance>10</chance>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- The typical hobgoblin stands slightly taller than the average human. -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Hobgoblin"]/race/baseBodySize</xpath>
+		<value>
+			<baseBodySize>1.15</baseBodySize>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Hobgoblin"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4.3</MoveSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Hobgoblin"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.90</MeleeDodgeChance>
+			<MeleeCritChance>1.1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<SmokeSensitivity>1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Hobgoblin"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>4.96</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.938</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.57</cooldownTime>
+					<chanceFactor>0.33</chanceFactor>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Hobgoblin"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Illlithids.xml b/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Illlithids.xml
new file mode 100644
index 0000000000..abe47f9964
--- /dev/null
+++ b/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Illlithids.xml	
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Illithid"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Illithid"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Illithid"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Illithid"]/race/baseBodySize</xpath>
+		<value>
+			<baseBodySize>1</baseBodySize>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Illithid"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency>0.6</NightVisionEfficiency>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<SmokeSensitivity>1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Illithid"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>4.96</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.938</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.57</cooldownTime>
+					<chanceFactor>0.33</chanceFactor>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Illithid"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Killoren.xml b/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Killoren.xml
new file mode 100644
index 0000000000..91312d2c17
--- /dev/null
+++ b/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Killoren.xml	
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Killoren"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Killoren"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Killoren"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Killoren"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1.1</MeleeDodgeChance>
+			<MeleeCritChance>0.8</MeleeCritChance>
+			<MeleeParryChance>0.85</MeleeParryChance>
+			<CarryWeight>35</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Killoren"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Killoren"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Kobold.xml b/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Kobold.xml
new file mode 100644
index 0000000000..ee5b699728
--- /dev/null
+++ b/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Kobold.xml	
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Kobold"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Kobold"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Kobold"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Kobold"]/alienRace/generalSettings</xpath>
+		<value>
+			<forcedRaceTraitEntries>
+				<li>
+					<defName>Xenophobia</defName>
+					<degree>1</degree>
+					<chance>20</chance>
+				</li>
+			</forcedRaceTraitEntries>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Kobold"]/race/baseBodySize</xpath>
+		<value>
+			<baseBodySize>0.6</baseBodySize>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Kobold"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency>0.4</NightVisionEfficiency>
+			<CarryWeight>40</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+			<MeleeDodgeChance>1.1</MeleeDodgeChance>
+			<MeleeCritChance>0.4</MeleeCritChance>
+			<MeleeParryChance>0.5</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Kobold"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.57</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.57</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.46</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Kobold"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Orcs.xml b/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Orcs.xml
new file mode 100644
index 0000000000..82cb3ac966
--- /dev/null
+++ b/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Orcs.xml	
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Orc"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Orc"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Orc"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<!-- Orcs are markedly larger than your average human. -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Orc"]/race/baseBodySize</xpath>
+		<value>
+			<baseBodySize>1.3</baseBodySize>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Orc"]/alienRace/generalSettings/disallowedTraits/li[defName="Undergrounder"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Orc"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.70</MeleeDodgeChance>
+			<MeleeCritChance>1.10</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<SmokeSensitivity>0.80</SmokeSensitivity>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>30</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Orc"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.66</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.66</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>5.05</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.57</cooldownTime>
+					<chanceFactor>0.33</chanceFactor>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.08</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- While hardly remarkable for their intellectual prowess, orcs are nonetheless smart enough to take cover when arrows start flying. -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Orc"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Tabaxi.xml b/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Tabaxi.xml
new file mode 100644
index 0000000000..526f1e47d1
--- /dev/null
+++ b/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Tabaxi.xml	
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Tabaxi"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Tabaxi"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Tabaxi"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Tabaxi"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency>0.4</NightVisionEfficiency>
+			<MeleeDodgeChance>1.1</MeleeDodgeChance>
+			<MeleeCritChance>0.8</MeleeCritChance>
+			<MeleeParryChance>0.8</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Tabaxi"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.15</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.15</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.923</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Tabaxi"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Tieflings.xml b/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Tieflings.xml
new file mode 100644
index 0000000000..5aebfe836d
--- /dev/null
+++ b/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Tieflings.xml	
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Tiefling"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Tiefling"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Tiefling"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Tiefling"]/alienRace/generalSettings/forcedRaceTraitEntries</xpath>
+		<value>
+			<li>
+				<defName>Beauty</defName>
+				<degree>1</degree>
+				<chance>10</chance>
+			</li>
+			<li>
+				<defName>Bloodlust</defName>
+				<chance>20</chance>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Tieflings generally have slightly better reflexes than your standard human, and an innate resistance to heat. -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Tiefling"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1.1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<ArmorRating_Heat>0.20</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Tiefling"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Tiefling"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Warforged.xml b/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Warforged.xml
new file mode 100644
index 0000000000..90755469cf
--- /dev/null
+++ b/ModPatches/O21 Forgotten Realms/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Warforged.xml	
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Warforged"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Warforged"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Warforged"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<!-- Warforged are generally slightly larger than your average human. -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Warforged"]/race/baseBodySize</xpath>
+		<value>
+			<baseBodySize>1.1</baseBodySize>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Warforged"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<SmokeSensitivity>0.00</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Warforged"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Warforged"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Warforged"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4.4</MoveSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Warforged"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Warforged"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Mechadroids/Patches/O21 Mechadroids/Bodies_Mechadroids.xml b/ModPatches/O21 Mechadroids/Patches/O21 Mechadroids/Bodies_Mechadroids.xml
new file mode 100644
index 0000000000..cf6274fc62
--- /dev/null
+++ b/ModPatches/O21 Mechadroids/Patches/O21 Mechadroids/Bodies_Mechadroids.xml	
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_Mechadroid"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_Mechadroid"]/corePart/parts/li[def = "MechanicalNeck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_Mechadroid"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def = "Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_Mechadroid"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def = "Head"]/parts/li[def="HearingSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_Mechadroid"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def = "Head"]/parts/li[def="HearingSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_Mechadroid"]/corePart/parts/li[def = "MechanicalShoulder"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_Mechadroid"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def = "MechanicalArm"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_Mechadroid"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def = "MechanicalArm"]/parts/li[def = "MechanicalHand"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_Mechadroid"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def = "MechanicalArm"]/parts/li[def = "MechanicalHand"]/parts/li[def = "MechanicalFinger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_Mechadroid"]/corePart/parts/li[def = "MechanicalLeg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "O21_Mechadroid"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def = "MechanicalFoot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="O21_Mechadroid"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
+		<value>
+			<li>LeftShoulder</li>
+			<li>Shoulders</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="O21_Mechadroid"]/corePart/parts/li[customLabel="right mechanical shoulder"]/groups</xpath>
+		<value>
+			<li>RightShoulder</li>
+			<li>Shoulders</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="O21_Mechadroid"]/corePart/parts/li[customLabel="left shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="O21_Mechadroid"]/corePart/parts/li[customLabel="right mechanical shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Mechadroids/Patches/O21 Mechadroids/PawnKinds_Misc.xml b/ModPatches/O21 Mechadroids/Patches/O21 Mechadroids/PawnKinds_Misc.xml
new file mode 100644
index 0000000000..fa9532c187
--- /dev/null
+++ b/ModPatches/O21 Mechadroids/Patches/O21 Mechadroids/PawnKinds_Misc.xml	
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Give ammo to droids ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/PawnKindDef[defName="O21_Mechadroid_Villager" or defName="O21_Mechadroid_Primus"]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/PawnKindDef[defName="O21_Mechadroid_Guard"]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>7</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Mechadroids/Patches/O21 Mechadroids/Race_Mechadroids.xml b/ModPatches/O21 Mechadroids/Patches/O21 Mechadroids/Race_Mechadroids.xml
new file mode 100644
index 0000000000..e86cd0d497
--- /dev/null
+++ b/ModPatches/O21 Mechadroids/Patches/O21 Mechadroids/Race_Mechadroids.xml	
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="O21_BaseMechadroid"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="O21_BaseMechadroid"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="O21_BaseMechadroid"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="O21_BaseMechadroid"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<SmokeSensitivity>0.00</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="O21_BaseMechadroid"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="O21_BaseMechadroid"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_MechadroidAlpha" or defName="O21_Alien_MechadroidGamma"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_MechadroidDelta"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.56</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.550</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.56</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.550</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>4.89</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.250</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="O21_BaseMechadroid"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Mechadroids/Patches/O21 Mechadroids/ThingDefs_Items.xml b/ModPatches/O21 Mechadroids/Patches/O21 Mechadroids/ThingDefs_Items.xml
new file mode 100644
index 0000000000..99adfcec55
--- /dev/null
+++ b/ModPatches/O21 Mechadroids/Patches/O21 Mechadroids/ThingDefs_Items.xml	
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_MechanoidParts"]/statBases</xpath>
+		<value>
+			<Bulk>0.75</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_MechanoidRepairKit"]/statBases</xpath>
+		<value>
+			<Bulk>1.25</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_MechanoidPowerCell"]/statBases</xpath>
+		<value>
+			<Bulk>0.05</Bulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Outland - Core/Patches/O21 Outland - Core/Apparel_Outland.xml b/ModPatches/O21 Outland - Core/Patches/O21 Outland - Core/Apparel_Outland.xml
new file mode 100644
index 0000000000..3e11a7fec4
--- /dev/null
+++ b/ModPatches/O21 Outland - Core/Patches/O21 Outland - Core/Apparel_Outland.xml	
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Cloak -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_ShoulderCloak"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+			<Bulk>3.5</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- Heavy Tribalwear & Padding -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_HeavyTribalPadding" or defName="Outland_HeavyTribalwear"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
+			<Bulk>3.5</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Outland - Core/Patches/O21 Outland - Core/Buildings_Security.xml b/ModPatches/O21 Outland - Core/Patches/O21 Outland - Core/Buildings_Security.xml
new file mode 100644
index 0000000000..109e4140e9
--- /dev/null
+++ b/ModPatches/O21 Outland - Core/Patches/O21 Outland - Core/Buildings_Security.xml	
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Outland_Ballista" or defName="Outland_Mangonel"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Outland_Ballista" or defName="Outland_Mangonel"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName = "Outland_Gun_Mangonel" or defName="Outland_Gun_BallistaTurret"]/building</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName = "Outland_Gun_Mangonel" or defName="Outland_Gun_BallistaTurret"]/comps/li[@Class="CompProperties_ChangeableProjectile"]</xpath>
+	</Operation>
+
+	<!-- ========== Ballista - Weapon ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Outland_Gun_BallistaTurret</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>1</ShotSpread>
+			<SwayFactor>1</SwayFactor>
+			<Bulk>4.00</Bulk>
+			<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Pilum_Fired</defaultProjectile>
+			<warmupTime>1.4</warmupTime>
+			<range>44</range>
+			<soundCast>Bow_Large</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>8</reloadTime>
+			<ammoSet>AmmoSet_Javelins</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>false</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Catapult - Weapon ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_Gun_Mangonel"]/statBases</xpath>
+		<value>
+			<SightsEfficiency>0.5</SightsEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Outland_Gun_Mangonel"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>10</li>
+					<li>20</li>
+					<li>30</li>
+					<li>50</li>
+					<li>70</li>
+				</chargeSpeeds>
+			</li>
+			<li Class="CombatExtended.CompProperties_AmmoUser">
+				<magazineSize>1</magazineSize>
+				<reloadTime>12</reloadTime>
+				<ammoSet>AmmoSet_Catapult</ammoSet>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Outland_Gun_Mangonel"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+					<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Projectile_CatapultBullet_Boulder</defaultProjectile>
+					<warmupTime>4</warmupTime>
+					<minRange>30</minRange>
+					<range>500</range>
+					<burstShotCount>1</burstShotCount>
+					<soundCast>Bow_Recurve</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<indirectFirePenalty>0.2</indirectFirePenalty>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Outland_Gun_Mangonel"]/weaponTags</xpath>
+		<value>
+			<li>TurretGun</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Outland - Core/Patches/O21 Outland - Core/Items_Resources.xml b/ModPatches/O21 Outland - Core/Patches/O21 Outland - Core/Items_Resources.xml
new file mode 100644
index 0000000000..dc30688865
--- /dev/null
+++ b/ModPatches/O21 Outland - Core/Patches/O21 Outland - Core/Items_Resources.xml	
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Bones -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_Bones"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.25</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_Bones"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_Bones"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.99</cooldownTime>
+					<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Siege Weapon Ammo -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Outland_Ammo_BallistaBolt"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/RecipeDef[defName="Outland_Make_BallistaBolts"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Outland_Ammo_RoundShot"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/RecipeDef[defName="Outland_Make_RoundShots"]</xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Outland - Core/Patches/O21 Outland - Core/ThingDef_Projectiles.xml b/ModPatches/O21 Outland - Core/Patches/O21 Outland - Core/ThingDef_Projectiles.xml
new file mode 100644
index 0000000000..eca6dd124a
--- /dev/null
+++ b/ModPatches/O21 Outland - Core/Patches/O21 Outland - Core/ThingDef_Projectiles.xml	
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Projectiles -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_Projectile_ArcaneShard"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<damageDef>Outland_ArcaneDamage</damageDef>
+				<damageAmountBase>9</damageAmountBase>
+				<armorPenetrationSharp>4</armorPenetrationSharp>
+				<armorPenetrationBlunt>9.66</armorPenetrationBlunt>
+				<speed>60</speed>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_Projectile_ArcaneBolt"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<damageDef>Outland_ArcaneDamage</damageDef>
+				<damageAmountBase>14</damageAmountBase>
+				<armorPenetrationSharp>6</armorPenetrationSharp>
+				<armorPenetrationBlunt>12.18</armorPenetrationBlunt>
+				<speed>60</speed>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_Projectile_ArcaneBlast"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<damageDef>Outland_ArcaneDamage</damageDef>
+				<damageAmountBase>18</damageAmountBase>
+				<armorPenetrationSharp>8.5</armorPenetrationSharp>
+				<armorPenetrationBlunt>18.18</armorPenetrationBlunt>
+				<speed>60</speed>
+			</projectile>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Outland - Eastborn/Patches/O21 Outland - Eastborn/Apparel_Eastborn.xml b/ModPatches/O21 Outland - Eastborn/Patches/O21 Outland - Eastborn/Apparel_Eastborn.xml
new file mode 100644
index 0000000000..b90fca29bf
--- /dev/null
+++ b/ModPatches/O21 Outland - Eastborn/Patches/O21 Outland - Eastborn/Apparel_Eastborn.xml	
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Hakama -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_Hakama"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+			<Bulk>2.5</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- Ninja Garb -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_NinjaGarb"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+			<Bulk>2.5</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- Ninja Mask -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_NinjaHood"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- Haygrass Hat / Conical Hat -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_HaygrassHat"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Shogun Cuirass (has same stats as vanilla plate armor) -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_ShogunCuirass"]/statBases</xpath>
+		<value>
+			<Bulk>90</Bulk>
+			<WornBulk>12.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_ShogunCuirass"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Shogun Pauldrons -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_ShogunPauldrons"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>2.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_ShogunPauldrons"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Shogun Helmet -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_ShogunHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_ShogunHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.75</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Outland - Eastborn/Patches/O21 Outland - Eastborn/Eastborn_WeaponsMelee.xml b/ModPatches/O21 Outland - Eastborn/Patches/O21 Outland - Eastborn/Eastborn_WeaponsMelee.xml
new file mode 100644
index 0000000000..d42b9ea4c8
--- /dev/null
+++ b/ModPatches/O21 Outland - Eastborn/Patches/O21 Outland - Eastborn/Eastborn_WeaponsMelee.xml	
@@ -0,0 +1,660 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Tanto -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_Tanto"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>0.97</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.259</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>0.97</cooldownTime>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>0.259</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.48</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.05</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>0.304</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.28</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_Tanto"]/statBases</xpath>
+		<value>
+			<Bulk>4.2</Bulk>
+			<MeleeCounterParryBonus>0.38</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_Tanto"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.93</MeleeCritChance>
+				<MeleeParryChance>0.38</MeleeParryChance>
+				<MeleeDodgeChance>0.09</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Jitte -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_Jitte"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.68</cooldownTime>
+					<armorPenetrationBlunt>2.188</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_Jitte"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_Jitte"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.2</MeleeCritChance>
+				<MeleeParryChance>1</MeleeParryChance>
+				<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_Jitte"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- Ararebo -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_Ararebo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.49</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>3.375</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>2.67</cooldownTime>
+					<armorPenetrationBlunt>15.75</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_Ararebo"]/statBases</xpath>
+		<value>
+			<Bulk>14</Bulk>
+			<MeleeCounterParryBonus>0.28</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_Ararebo"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.6</MeleeCritChance>
+				<MeleeParryChance>0.38</MeleeParryChance>
+				<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Yari -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_JumonjiYari" or defName="Outland_SuYari"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.29</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>1.913</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.71</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.85</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.14</cooldownTime>
+					<chanceFactor>1.00</chanceFactor>
+					<armorPenetrationBlunt>1.913</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.4</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>3.2</cooldownTime>
+					<chanceFactor>0.33</chanceFactor>
+					<armorPenetrationBlunt>1.913</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.28</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_JumonjiYari" or defName="Outland_SuYari"]/statBases</xpath>
+		<value>
+			<Bulk>11</Bulk>
+			<MeleeCounterParryBonus>2.12</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_JumonjiYari" or defName="Outland_SuYari"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.39</MeleeCritChance>
+				<MeleeParryChance>1.59</MeleeParryChance>
+				<MeleeDodgeChance>0.90</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Odachi -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_Nagamaki" or defName="Outland_Odachi"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.38</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>1.08</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.38</cooldownTime>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>1.08</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.55</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>1.49</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_Nagamaki" or defName="Outland_Odachi"]/statBases</xpath>
+		<value>
+			<Bulk>9</Bulk>
+			<MeleeCounterParryBonus>3.6</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_Nagamaki" or defName="Outland_Odachi"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.74</MeleeCritChance>
+				<MeleeParryChance>0.53</MeleeParryChance>
+				<MeleeDodgeChance>0.60</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Ono -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_Ono"]/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>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_Ono"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_Ono"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.10</MeleeCritChance>
+				<MeleeParryChance>0.15</MeleeParryChance>
+				<MeleeDodgeChance>0.20</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_Ono"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- Sai -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_Kabutowari" or defName="Outland_Sai"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.29</cooldownTime>
+					<armorPenetrationBlunt>0.275</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.29</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.275</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_Kabutowari" or defName="Outland_Sai"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_Kabutowari" or defName="Outland_Sai"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.63</MeleeCritChance>
+				<MeleeParryChance>0.5</MeleeParryChance>
+				<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_Kabutowari" or defName="Outland_Sai"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- Sasumata -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_Sasumata"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.78</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>1.000</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.79</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>6.76</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_Sasumata"]/statBases</xpath>
+		<value>
+			<Bulk>7</Bulk>
+			<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_Sasumata"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.50</MeleeCritChance>
+				<MeleeParryChance>0.18</MeleeParryChance>
+				<MeleeDodgeChance>0.30</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Katana -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_Katana"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.33</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.936</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.33</cooldownTime>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>0.936</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.88</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>31</power>
+					<cooldownTime>1.28</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>2.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.65</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_Katana"]/statBases</xpath>
+		<value>
+			<Bulk>7.85</Bulk>
+			<MeleeCounterParryBonus>1.38</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_Katana"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.85</MeleeCritChance>
+				<MeleeParryChance>0.69</MeleeParryChance>
+				<MeleeDodgeChance>0.37</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Masakari Axe -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_Masakari"]/statBases</xpath>
+		<value>
+			<Bulk>13</Bulk>
+			<MeleeCounterParryBonus>1.5</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_Masakari"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.3</MeleeCritChance>
+				<MeleeParryChance>1.6</MeleeParryChance>
+				<MeleeDodgeChance>0.56</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_Masakari"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>48</power>
+					<cooldownTime>3.4</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>10.4</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.8</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<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>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Naginata -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_Naginata"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.76</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>0.95</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.76</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationSharp>1.9</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.95</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>32</power>
+					<cooldownTime>1.41</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationSharp>1.27</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_Naginata"]/statBases</xpath>
+		<value>
+			<Bulk>14</Bulk>
+			<MeleeCounterParryBonus>1.78</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_Naginata"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.56</MeleeCritChance>
+				<MeleeParryChance>0.75</MeleeParryChance>
+				<MeleeDodgeChance>0.6</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Outland - Eastborn/Patches/O21 Outland - Eastborn/Eastborn_WeaponsRanged.xml b/ModPatches/O21 Outland - Eastborn/Patches/O21 Outland - Eastborn/Eastborn_WeaponsRanged.xml
new file mode 100644
index 0000000000..367259860f
--- /dev/null
+++ b/ModPatches/O21 Outland - Eastborn/Patches/O21 Outland - Eastborn/Eastborn_WeaponsRanged.xml	
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Yumi ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Outland_Yumi</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>1</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>8.00</Bulk>
+			<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_StreamlinedArrow_Steel</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>20</range>
+			<soundCast>Bow_Recurve</soundCast>
+		</Properties>
+		<AmmoUser>
+			<ammoSet>AmmoSet_StreamlinedArrow</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_Bow</li>
+		</weaponTags>
+		<researchPrerequisite>RecurveBow</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_Yumi"]/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>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Outland_EastbornMatchlock</defName>
+		<statBases>
+			<Mass>1.45</Mass>
+			<Bulk>4</Bulk>
+			<SwayFactor>1.24</SwayFactor>
+			<ShotSpread>0.37</ShotSpread>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_SlowMusketBall</defaultProjectile>
+			<warmupTime>1.86</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Revolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>5</AmmoGenPerMagOverride>
+			<reloadTime>6.9</reloadTime>
+			<ammoSet>AmmoSet_SlowMusketBall</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Melee -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_EastbornMatchlock"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Outland - Eastborn/Patches/O21 Outland - Eastborn/PawnKinds_Eastborn.xml b/ModPatches/O21 Outland - Eastborn/Patches/O21 Outland - Eastborn/PawnKinds_Eastborn.xml
new file mode 100644
index 0000000000..5cd0a64635
--- /dev/null
+++ b/ModPatches/O21 Outland - Eastborn/Patches/O21 Outland - Eastborn/PawnKinds_Eastborn.xml	
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Give ammo to pawns with ranged weapons. -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/PawnKindDef[
+			defName="Outland_Ninja" or
+			defName="Outland_Bowman" or
+			defName="Outland_Emperor"]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>12</min>
+					<max>18</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.3</generateChance>
+						<sidearmMoney>
+							<min>150</min>
+							<max>350</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>EastbornLightSharp</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Give tribal backpacks to pawns with ranged weapons. -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/PawnKindDef[
+			defName="Outland_Ninja" or
+			defName="Outland_Emperor"]/apparelRequired
+		</xpath>
+		<value>
+			<li>CE_Apparel_TribalBackpack</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="Outland_Bowman"]</xpath>
+		<value>
+			<apparelRequired>
+				<li>CE_Apparel_TribalBackpack</li>
+			</apparelRequired>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/PawnKindDef[
+			defName="Outland_Bowman" or
+			defName="Outland_Emperor"]/specificApparelRequirements
+		</xpath>
+		<value>
+			<li>
+				<apparelLayer>Backpack</apparelLayer>
+				<color>(50, 123, 168)</color>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/PawnKindDef[defName="Outland_Ninja"]/specificApparelRequirements
+		</xpath>
+		<value>
+			<li>
+				<apparelLayer>Backpack</apparelLayer>
+				<color>(90, 90, 90)</color>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Outland - Eastborn/Patches/O21 Outland - Eastborn/Races_Elf.xml b/ModPatches/O21 Outland - Eastborn/Patches/O21 Outland - Eastborn/Races_Elf.xml
new file mode 100644
index 0000000000..b0c74057a7
--- /dev/null
+++ b/ModPatches/O21 Outland - Eastborn/Patches/O21 Outland - Eastborn/Races_Elf.xml	
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Outland Elves are identical to humans and use their bodyDef, aside from higher dodge. -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Elf"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Elf"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>2</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Elf"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Elf"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Elf"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Elf"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Outland - Eastborn/Patches/O21 Outland - Eastborn/Scenarios_Eastborn.xml b/ModPatches/O21 Outland - Eastborn/Patches/O21 Outland - Eastborn/Scenarios_Eastborn.xml
new file mode 100644
index 0000000000..065ad31c14
--- /dev/null
+++ b/ModPatches/O21 Outland - Eastborn/Patches/O21 Outland - Eastborn/Scenarios_Eastborn.xml	
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Starting Things ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="Outland_EastbornExpedition"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_Arrow_Steel</thingDef>
+				<count>100</count>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Outland - Motz Coalition/Patches/O21 Outland - Motz Coalition/Apparel_MotzPatch.xml b/ModPatches/O21 Outland - Motz Coalition/Patches/O21 Outland - Motz Coalition/Apparel_MotzPatch.xml
new file mode 100644
index 0000000000..43d3508d98
--- /dev/null
+++ b/ModPatches/O21 Outland - Motz Coalition/Patches/O21 Outland - Motz Coalition/Apparel_MotzPatch.xml	
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- captain helmet-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_MotzCaptainHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4.0</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_MotzCaptainHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Outland_MotzCaptainHelmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.9</ArmorRating_Sharp>
+						<parts>
+							<li>Jaw</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.9</ArmorRating_Blunt>
+						<parts>
+							<li>Jaw</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- motz helmet-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_MotzHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4.0</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_MotzHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Outland_MotzHelmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.8</ArmorRating_Sharp>
+						<parts>
+							<li>Jaw</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.8</ArmorRating_Blunt>
+						<parts>
+							<li>Jaw</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Shoulderpads-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_MotzPauldrons"]/statBases/Mass</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<WornBulk>1.0</WornBulk>
+			<Mass>1.0</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_MotzPauldrons"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!--Cuirass-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_MotzCuirass"]/statBases</xpath>
+		<value>
+			<Bulk>50</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_MotzCuirass"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.25</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_MotzCuirass"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeDodgeChance>-0.07</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Outland_MotzCuirass"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.75</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+							<li>Foot</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+							<li>Foot</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Tunic-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_MotzTunic"]/statBases</xpath>
+		<value>
+			<Bulk>1.4</Bulk>
+			<WornBulk>0.4</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_MotzTunic"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.6</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Outland - Motz Coalition/Patches/O21 Outland - Motz Coalition/MotzWeapons_Patch.xml b/ModPatches/O21 Outland - Motz Coalition/Patches/O21 Outland - Motz Coalition/MotzWeapons_Patch.xml
new file mode 100644
index 0000000000..e2a3e2e78d
--- /dev/null
+++ b/ModPatches/O21 Outland - Motz Coalition/Patches/O21 Outland - Motz Coalition/MotzWeapons_Patch.xml	
@@ -0,0 +1,495 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Dory Spear-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_DorySpear"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>1.08</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_DorySpear"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.2</MeleeCritChance>
+				<MeleeParryChance>1.45</MeleeParryChance>
+				<MeleeDodgeChance>0.6</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_DorySpear"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.25</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.5</cooldownTime>
+					<chanceFactor>0.95</chanceFactor>
+					<armorPenetrationBlunt>4.1</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.6</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.5</cooldownTime>
+					<chanceFactor>0.95</chanceFactor>
+					<armorPenetrationBlunt>5.0</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.95</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Epsilon Axe-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_EpsilonAxe"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<MeleeCounterParryBonus>0.22</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_EpsilonAxe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.31</MeleeCritChance>
+				<MeleeParryChance>0.22</MeleeParryChance>
+				<MeleeDodgeChance>0.22</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_EpsilonAxe"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_EpsilonAxe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>0.95</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>0.95</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.9</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Kopis -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_Kopis"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_Kopis"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.40</MeleeCritChance>
+				<MeleeParryChance>0.60</MeleeParryChance>
+				<MeleeDodgeChance>0.30</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_Kopis"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_Kopis"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2.1</cooldownTime>
+					<chanceFactor>0.50</chanceFactor>
+					<armorPenetrationBlunt>0.65</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.8</cooldownTime>
+					<chanceFactor>0.45</chanceFactor>
+					<armorPenetrationBlunt>1.1</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.68</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- labrys axe -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_LabrysAxe"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>0.38</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_LabrysAxe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.31</MeleeCritChance>
+				<MeleeParryChance>0.40</MeleeParryChance>
+				<MeleeDodgeChance>0.22</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_LabrysAxe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<chanceFactor>0.1</chanceFactor>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.95</cooldownTime>
+					<chanceFactor>0.9</chanceFactor>
+					<armorPenetrationBlunt>11</armorPenetrationBlunt>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Machaira-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_Machaira"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_Machaira"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.40</MeleeCritChance>
+				<MeleeParryChance>0.60</MeleeParryChance>
+				<MeleeDodgeChance>0.30</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_Machaira"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_Machaira"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2.1</cooldownTime>
+					<chanceFactor>0.50</chanceFactor>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.8</cooldownTime>
+					<chanceFactor>0.45</chanceFactor>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.8</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Rapier -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_Rapier"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_Rapier"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>2.50</MeleeCritChance>
+				<MeleeParryChance>1</MeleeParryChance>
+				<MeleeDodgeChance>0.50</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_Rapier"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.25</cooldownTime>
+					<chanceFactor>0.85</chanceFactor>
+					<armorPenetrationBlunt>2.3</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.46</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.68</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Xiphos -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_Xiphos"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_Xiphos"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.15</MeleeCritChance>
+				<MeleeParryChance>0.30</MeleeParryChance>
+				<MeleeDodgeChance>0.30</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_Xiphos"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_Xiphos"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.36</cooldownTime>
+					<chanceFactor>0.95</chanceFactor>
+					<armorPenetrationBlunt>1.05</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.68</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- crossbow -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_MotzCrossbow"]/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>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Outland_MotzCrossbow</defName>
+		<statBases>
+			<Bulk>6</Bulk>
+			<SwayFactor>1.2</SwayFactor>
+			<ShotSpread>0.5</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>70</WoodLog>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Projectile_CrossbowBolt_Steel</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>20</range>
+			<soundCast>Bow_Large</soundCast>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>7</reloadTime>
+			<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>NeolithicRangedHeavy</li>
+			<li>NeolithicRangedChief</li>
+			<li>CE_Bow</li>
+		</weaponTags>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Outland - Motz Coalition/Patches/O21 Outland - Motz Coalition/Motz_PawnkindPatch.xml b/ModPatches/O21 Outland - Motz Coalition/Patches/O21 Outland - Motz Coalition/Motz_PawnkindPatch.xml
new file mode 100644
index 0000000000..82483ea1c8
--- /dev/null
+++ b/ModPatches/O21 Outland - Motz Coalition/Patches/O21 Outland - Motz Coalition/Motz_PawnkindPatch.xml	
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Outland_MotzArcher" or defName="Outland_MotzHopliteCaptain" or defName="Outland_MotzArcherCaptain" or defName="Outland_Councillor"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>7</min>
+					<max>10</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>500</min>
+						<max>700</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>MotzLightSharp</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Outland_MotzHoplite" or defName="Outland_MotzMilitia"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>220</min>
+					<max>320</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[@Name="Motz_PawnKindBase"]/apparelRequired</xpath>
+		<value>
+			<li>CE_Apparel_TribalBackpack</li>
+		</value>
+	</Operation>
+
+	<!-- AI Motz carried way too much Pemmican, increasing carried bulk-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[@Name="Motz_PawnKindBase"]/invNutrition</xpath>
+		<value>
+			<invNutrition>1.8</invNutrition>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Outland - Motz Coalition/Patches/O21 Outland - Motz Coalition/Oxcet_BodyPatch.xml b/ModPatches/O21 Outland - Motz Coalition/Patches/O21 Outland - Motz Coalition/Oxcet_BodyPatch.xml
new file mode 100644
index 0000000000..7e480c17d8
--- /dev/null
+++ b/ModPatches/O21 Outland - Motz Coalition/Patches/O21 Outland - Motz Coalition/Oxcet_BodyPatch.xml	
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Outland_Oxect"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Outland_Oxect"]/combatPower</xpath>
+		<value>
+			<combatPower>250</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_Oxect"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_Oxect"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_Oxect"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>3.60</MoveSpeed>
+			<MeleeDodgeChance>0.08</MeleeDodgeChance>
+			<MeleeCritChance>0.8</MeleeCritChance>
+			<MeleeParryChance>0.23</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_Oxect"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head claw</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.6</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<armorPenetrationSharp>4</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2.68</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Outland - Motz Coalition/Patches/O21 Outland - Motz Coalition/Race_MotzPatch.xml b/ModPatches/O21 Outland - Motz Coalition/Patches/O21 Outland - Motz Coalition/Race_MotzPatch.xml
new file mode 100644
index 0000000000..68495505c7
--- /dev/null
+++ b/ModPatches/O21 Outland - Motz Coalition/Patches/O21 Outland - Motz Coalition/Race_MotzPatch.xml	
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Motz"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Motz"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<ReloadSpeed>1.0</ReloadSpeed>
+			<Suppressability>0.60</Suppressability>
+			<SmokeSensitivity>0.2</SmokeSensitivity>
+			<!--Moths can see in the dark and natural light blinds them-->
+			<NightVisionEfficiency>1</NightVisionEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Motz"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>0.3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Motz"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Motz"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.0</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Motz"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Motz"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Motz"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/O21 Outland - Motz Coalition/Patches/O21 Outland - Motz Coalition/ScenarioPatch.xml b/ModPatches/O21 Outland - Motz Coalition/Patches/O21 Outland - Motz Coalition/ScenarioPatch.xml
new file mode 100644
index 0000000000..a8ab383ba8
--- /dev/null
+++ b/ModPatches/O21 Outland - Motz Coalition/Patches/O21 Outland - Motz Coalition/ScenarioPatch.xml	
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="Outland_MotzTraders"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_CrossbowBolt_Steel</thingDef>
+				<count>50</count>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="Outland_MotzTraders"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_CrossbowBolt_Flame</thingDef>
+				<count>25</count>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ODZ Stalingrad - Uniforms/Patches/ODZ Stalingrad - Uniforms/ThingDefs_Apparel.xml b/ModPatches/ODZ Stalingrad - Uniforms/Patches/ODZ Stalingrad - Uniforms/ThingDefs_Apparel.xml
new file mode 100644
index 0000000000..05d3b57529
--- /dev/null
+++ b/ModPatches/ODZ Stalingrad - Uniforms/Patches/ODZ Stalingrad - Uniforms/ThingDefs_Apparel.xml	
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ======= Webbings ======= -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_WWII_GermanRiflemanKit" or defName="ODZ_WWII_GermanAssaultKit" or defName="ODZ_WWII_GermanMGKit" or defName="ODZ_WWII_GermanPlatoonLeaderKit" or defName="ODZ_WWII_SovietRiflemanKit" or defName="ODZ_WWII_SovietAssaultKit" or defName="ODZ_WWII_SovietMGKit" or defName="ODZ_WWII_SovietPlatoonLeaderKit"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>Shoulders</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_WWII_GermanRiflemanKit" or defName="ODZ_WWII_GermanAssaultKit" or defName="ODZ_WWII_GermanMGKit" or defName="ODZ_WWII_GermanPlatoonLeaderKit" or defName="ODZ_WWII_SovietRiflemanKit" or defName="ODZ_WWII_SovietAssaultKit" or defName="ODZ_WWII_SovietMGKit" or defName="ODZ_WWII_SovietPlatoonLeaderKit"]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>Webbing</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ODZ_WWII_GermanRiflemanKit" or defName="ODZ_WWII_GermanAssaultKit" or defName="ODZ_WWII_GermanMGKit" or defName="ODZ_WWII_GermanPlatoonLeaderKit" or defName="ODZ_WWII_SovietRiflemanKit" or defName="ODZ_WWII_SovietAssaultKit" or defName="ODZ_WWII_SovietMGKit" or defName="ODZ_WWII_SovietPlatoonLeaderKit"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- ===== Rifleman Kit ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_WWII_GermanRiflemanKit" or defName="ODZ_WWII_SovietRiflemanKit"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>30</CarryBulk>
+				<AimingDelayFactor>-0.05</AimingDelayFactor>
+				<MedicalTendSpeed>0.05</MedicalTendSpeed>
+				<ReloadSpeed>0.08</ReloadSpeed>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- ===== Assault Kit ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_WWII_GermanAssaultKit" or defName="ODZ_WWII_SovietAssaultKit"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>27</CarryBulk>
+				<AimingDelayFactor>-0.08</AimingDelayFactor>
+				<MedicalTendSpeed>0.05</MedicalTendSpeed>
+				<ReloadSpeed>0.09</ReloadSpeed>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- ===== Machinegunner Kit ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_WWII_GermanMGKit" or defName="ODZ_WWII_SovietMGKit"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>25</CarryBulk>
+				<AimingDelayFactor>-0.10</AimingDelayFactor>
+				<MedicalTendSpeed>0.05</MedicalTendSpeed>
+				<ReloadSpeed>0.1</ReloadSpeed>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- ===== Platoon Leader Kit ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_WWII_GermanPlatoonLeaderKit" or defName="ODZ_WWII_SovietPlatoonLeaderKit"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>30</CarryBulk>
+				<AimingDelayFactor>-0.06</AimingDelayFactor>
+				<MedicalTendSpeed>0.05</MedicalTendSpeed>
+				<ReloadSpeed>0.08</ReloadSpeed>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- ======= Headgear ======= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ODZ_WWII_M24GermanSidecap" or defName="ODZ_WWII_GermanCrusherCap" or defName="ODZ_WWII_SovietPilotka" or defName="ODZ_WWII_SovietM24Cap"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>0.8</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ODZ_WWII_GermanM42Stahlhelm" or defName="ODZ_WWII_SovietSSH40Helmet"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- ===== Helmet ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_WWII_GermanM42Stahlhelm" or defName="ODZ_WWII_SovietSSH40Helmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ===== Caps ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_WWII_M24GermanSidecap" or defName="ODZ_WWII_GermanCrusherCap" or defName="ODZ_WWII_SovietPilotka" or defName="ODZ_WWII_SovietM24Cap"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ======= Uniforms ======= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ODZ_WWII_M42GermanUniform" or defName="ODZ_WWII_M42PlatoonLeader" or defName="ODZ_WWII_Obr35SovietUniform" or defName="ODZ_WWII_Obr35PlatoonLeader"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_WWII_M42GermanUniform" or defName="ODZ_WWII_M42PlatoonLeader" or defName="ODZ_WWII_Obr35SovietUniform" or defName="ODZ_WWII_Obr35PlatoonLeader"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ======= Coats ======= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ODZ_WWII_GermanM40GreatCoat" or defName="ODZ_WWII_SovietM41Overcoat"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_WWII_GermanM40GreatCoat" or defName="ODZ_WWII_SovietM41Overcoat"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ODZ Suits/Patches/ODZ Suits/ThingDefs_Apparel.xml b/ModPatches/ODZ Suits/Patches/ODZ Suits/ThingDefs_Apparel.xml
new file mode 100644
index 0000000000..95e467e089
--- /dev/null
+++ b/ModPatches/ODZ Suits/Patches/ODZ Suits/ThingDefs_Apparel.xml	
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Shell === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName="ODZ_SM_SuitI" or
+			defName="ODZ_SM_SuitII" or
+			defName="ODZ_SR_MonsotaSuit" or
+			defName="ODZ_SR_OXSSuit" or
+			defName="ODZ_SR_Goldmenuit"
+			]/statBases/StuffEffectMultiplierArmor
+		</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- === OnSkin === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName="ODZ_SM_ShirtAndTie" or
+			defName="ODZ_SR_MonsotaShirt" or
+			defName="ODZ_SR_OXSShirt" or
+			defName="ODZ_SR_GoldmenShirt"
+			]/statBases/StuffEffectMultiplierArmor
+		</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName="ODZ_SM_ShirtAndTie" or
+			defName="ODZ_SR_MonsotaShirt" or
+			defName="ODZ_SR_OXSShirt" or
+			defName="ODZ_SR_GoldmenShirt"
+			]/costStuffCount
+		</xpath>
+		<value>
+			<costStuffCount>25</costStuffCount>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Obsidia Expansion/Patches/Obsidia Expansion/ThingDefs_Misc/Obsidia_Expansion_CE_Ability.xml b/ModPatches/Obsidia Expansion/Patches/Obsidia Expansion/ThingDefs_Misc/Obsidia_Expansion_CE_Ability.xml
new file mode 100644
index 0000000000..bbbe1c7f76
--- /dev/null
+++ b/ModPatches/Obsidia Expansion/Patches/Obsidia Expansion/ThingDefs_Misc/Obsidia_Expansion_CE_Ability.xml	
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ============== Atlant Pollen ================ -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AbilityDef[defName="OE_PollenAtlant"]/verbProperties/range</xpath>
+		<value>
+			<range>14.9</range>
+		</value>
+	</Operation>
+
+	<!-- ============== Flight ================ -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AbilityDef[defName="OE_WingsFly"]/verbProperties/range</xpath>
+		<value>
+			<range>27.9</range>
+		</value>
+	</Operation>
+
+	<!-- ============== silkshot compatibility ================ -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AbilityDef[defName="OE_Silkshot"]/verbProperties/range</xpath>
+		<value>
+			<range>11.9</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OE_Silkshot_Bullet"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<damageDef>Stun</damageDef>
+				<speed>95</speed>
+				<damageAmountBase>18</damageAmountBase>
+				<armorPenetrationBlunt>8</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Opossum Friends/Patches/Opossum Friends/OpossumFriend.xml b/ModPatches/Opossum Friends/Patches/Opossum Friends/OpossumFriend.xml
new file mode 100644
index 0000000000..08019702af
--- /dev/null
+++ b/ModPatches/Opossum Friends/Patches/Opossum Friends/OpossumFriend.xml	
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Opossum === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ERN_Opossum"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ERN_Opossum"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ERN_Opossum"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.84</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.144</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>0.84</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.144</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Orassans/Defs/Orassans/Ammo/10mmRailgunOE.xml b/ModPatches/Orassans/Defs/Orassans/Ammo/10mmRailgunOE.xml
new file mode 100644
index 0000000000..299a6a61a1
--- /dev/null
+++ b/ModPatches/Orassans/Defs/Orassans/Ammo/10mmRailgunOE.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>Ammo10mmRailgunOE</defName>
+		<label>10mm Railgun (OE)</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRailgunRifle</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_10mmRailgunOE</defName>
+		<label>10mm Railgun (OE)</label>
+		<ammoTypes>
+			<Ammo_10mmRailgun_SabotOE>Bullet_10mmRailgun_SabotOE</Ammo_10mmRailgun_SabotOE>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerAmmoBase">
+		<defName>Ammo_10mmRailgun_SabotOE</defName>
+		<label>10mm Railgun cartridge (Sabot:OE)</label>
+		<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for long-range railgun weapons.</description>
+		<statBases>
+			<Mass>0.014</Mass>
+			<Bulk>0.022</Bulk>
+			<MarketValue>0.06</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+			<!-- Railgun ammo isn't handloaded because it contains no propellant, and the sabots must be precision-machined anyway -->
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo8mmRailgunOE</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>Things/Ammo/Railgun/Rifle</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>RailgunSabot</ammoClass>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base762x39mmSovietBullet">
+		<defName>Bullet_10mmRailgun_SabotOE</defName>
+		<label>10mm Railgun bullet (Sabot:OE)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>38</damageAmountBase>
+			<armorPenetrationSharp>38</armorPenetrationSharp>
+			<armorPenetrationBlunt>165.320</armorPenetrationBlunt>
+			<speed>294</speed>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_10mmRailgun_SabotOE</defName>
+		<label>make 10mm Railgun cartridge (Sabot:OE) x500</label>
+		<description>Craft 500 10mm Railgun (Sabot:OE) cartridges.</description>
+		<jobString>Making 10mm Railgun (Sabot:OE) cartridges.</jobString>
+		<workAmount>1000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Uranium</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_10mmRailgun_SabotOE>500</Ammo_10mmRailgun_SabotOE>
+		</products>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Orassans/Defs/Orassans/Ammo/12mm-autoRailgunOE.xml b/ModPatches/Orassans/Defs/Orassans/Ammo/12mm-autoRailgunOE.xml
new file mode 100644
index 0000000000..895648294c
--- /dev/null
+++ b/ModPatches/Orassans/Defs/Orassans/Ammo/12mm-autoRailgunOE.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>Ammo12mmautoRailgunOE</defName>
+		<label>12mm auto Railgun (OE)</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRailgunPistol</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_12mmautoRailgunOE</defName>
+		<label>12mm auto Railgun (OE)</label>
+		<ammoTypes>
+			<Ammo_12mmautoRailgun_SabotOE>Bullet_12mmautoRailgun_SabotOE</Ammo_12mmautoRailgun_SabotOE>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerAmmoBase">
+		<defName>Ammo_12mmautoRailgun_SabotOE</defName>
+		<label>12mm auto Railgun cartridge (Sabot:OE)</label>
+		<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for high calibar handguns.</description>
+		<statBases>
+			<Mass>0.012</Mass>
+			<Bulk>0.016</Bulk>
+			<MarketValue>0.16</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+			<!-- Railgun ammo isn't handloaded because it contains no propellant, and the sabots must be precision-machined anyway -->
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo12mmautoRailgunOE</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>Things/Ammo/Railgun/Pistol</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>RailgunSabot</ammoClass>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base50AEBullet">
+		<defName>Bullet_12mmautoRailgun_SabotOE</defName>
+		<label>12mm auto Railgun bullet (Sabot:OE)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>28</damageAmountBase>
+			<armorPenetrationSharp>22</armorPenetrationSharp>
+			<armorPenetrationBlunt>110.80</armorPenetrationBlunt>
+			<speed>253</speed>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_12mmautoRailgun_SabotOE</defName>
+		<label>make 12mm auto Railgun cartridge (Sabot:OE) x500</label>
+		<description>Craft 500 12mm auto Railgun (Sabot:OE) cartridges.</description>
+		<jobString>Making 12mm auto Railgun (Sabot:OE) cartridges.</jobString>
+		<workAmount>1000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Uranium</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_12mmautoRailgun_SabotOE>500</Ammo_12mmautoRailgun_SabotOE>
+		</products>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Orassans/Defs/Orassans/Ammo/12mm-longRailgunOE.xml b/ModPatches/Orassans/Defs/Orassans/Ammo/12mm-longRailgunOE.xml
new file mode 100644
index 0000000000..e4fdbc99a8
--- /dev/null
+++ b/ModPatches/Orassans/Defs/Orassans/Ammo/12mm-longRailgunOE.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>Ammo12mmRailgunOE</defName>
+		<label>12mm Railgun (OE)</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRailgunHighCaliber</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_12mmRailgunOE</defName>
+		<label>12mm Railgun (OE)</label>
+		<ammoTypes>
+			<Ammo_12mmRailgun_SabotOE>Bullet_12mmRailgun_SabotOE</Ammo_12mmRailgun_SabotOE>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerMediumAmmoBase">
+		<defName>Ammo_12mmRailgun_SabotOE</defName>
+		<label>12mm Railgun cartridge (Sabot:OE)</label>
+		<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for large-caliber railgun weapons.</description>
+		<statBases>
+			<Mass>0.020</Mass>
+			<Bulk>0.035</Bulk>
+			<MarketValue>0.33</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+			<!-- Railgun ammo isn't handloaded because it contains no propellant, and the sabots must be precision-machined anyway -->
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo12mmRailgunOE</li>
+		</thingCategories>
+		<stackLimit>200</stackLimit>
+		<graphicData>
+			<texPath>Things/Ammo/Railgun/HighCaliber</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>RailgunSabot</ammoClass>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base950JDJBullet">
+		<defName>Bullet_12mmRailgun_SabotOE</defName>
+		<label>12mm Railgun bullet (Sabot:OE)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_Big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>60</damageAmountBase>
+			<armorPenetrationSharp>52</armorPenetrationSharp>
+			<armorPenetrationBlunt>290.890</armorPenetrationBlunt>
+			<speed>327</speed>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_12mmRailgun_SabotOE</defName>
+		<label>make 12mm Railgun cartridge (Sabot:OE) x200</label>
+		<description>Craft 200 12mm Railgun (Sabot:OE) cartridges.</description>
+		<jobString>Making 12mm Railgun (Sabot:OE) cartridges.</jobString>
+		<workAmount>2200</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Uranium</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_12mmRailgun_SabotOE>200</Ammo_12mmRailgun_SabotOE>
+		</products>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Orassans/Defs/Orassans/Ammo/12mm-subsonicRailgunOE.xml b/ModPatches/Orassans/Defs/Orassans/Ammo/12mm-subsonicRailgunOE.xml
new file mode 100644
index 0000000000..66b8e299a5
--- /dev/null
+++ b/ModPatches/Orassans/Defs/Orassans/Ammo/12mm-subsonicRailgunOE.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>Ammo12mmsubsonicRailgunOE</defName>
+		<label>12mm subsonic Railgun (OE)</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRailgunPistol</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_12mmsubsonicRailgunOE</defName>
+		<label>12mm subsonic Railgun (OE)</label>
+		<ammoTypes>
+			<Ammo_12mmsubsonicRailgun_SabotOE>Bullet_12mmsubsonicRailgun_SabotOE</Ammo_12mmsubsonicRailgun_SabotOE>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerAmmoBase">
+		<defName>Ammo_12mmsubsonicRailgun_SabotOE</defName>
+		<label>12mm subsonic Railgun cartridge (Sabot:OE)</label>
+		<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for high calibar subsonic railguns.</description>
+		<statBases>
+			<Mass>0.016</Mass>
+			<Bulk>0.016</Bulk>
+			<MarketValue>0.16</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+			<!-- Railgun ammo isn't handloaded because it contains no propellant, and the sabots must be precision-machined anyway -->
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo12mmautoRailgunOE</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>Things/Ammo/Railgun/Pistol</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>RailgunSabot</ammoClass>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base9x39mmSovietBullet">
+		<defName>Bullet_12mmsubsonicRailgun_SabotOE</defName>
+		<label>12mm subsonic Railgun bullet (Sabot:OE)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>23</damageAmountBase>
+			<armorPenetrationSharp>50</armorPenetrationSharp>
+			<armorPenetrationBlunt>210.80</armorPenetrationBlunt>
+			<speed>229</speed>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_12mmsubsonicRailgun_SabotOE</defName>
+		<label>make 12mm subsonic Railgun cartridge (Sabot:OE) x500</label>
+		<description>Craft 500 12mm subsonic Railgun (Sabot:OE) cartridges.</description>
+		<jobString>Making 12mm auto Railgun (Sabot:OE) cartridges.</jobString>
+		<workAmount>1000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Uranium</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_12mmsubsonicRailgun_SabotOE>500</Ammo_12mmsubsonicRailgun_SabotOE>
+		</products>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Orassans/Defs/Orassans/Ammo/40x90mmGrenadeOE.xml b/ModPatches/Orassans/Defs/Orassans/Ammo/40x90mmGrenadeOE.xml
new file mode 100644
index 0000000000..d8c3f2e27e
--- /dev/null
+++ b/ModPatches/Orassans/Defs/Orassans/Ammo/40x90mmGrenadeOE.xml
@@ -0,0 +1,386 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>Ammo40x90mmGrenadesOE</defName>
+		<label>40x90mm Grenade OE</label>
+		<parent>AmmoGrenades</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberGrenade</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_40x90mmGrenadeOE</defName>
+		<label>40x90mm Grenades OE</label>
+		<ammoTypes>
+			<Ammo_40x90mmGrenadeOE_HE>Bullet_40x90mmGrenadeOE_HE</Ammo_40x90mmGrenadeOE_HE>
+			<Ammo_40x90mmGrenadeOE_HEAT>Bullet_40x90mmGrenadeOE_HEAT</Ammo_40x90mmGrenadeOE_HEAT>
+			<Ammo_40x90mmGrenadeOE_EMP>Bullet_40x90mmGrenadeOE_EMP</Ammo_40x90mmGrenadeOE_EMP>
+			<Ammo_40x90mmGrenadeOE_Smoke>Bullet_40x90mmGrenadeOE_Smoke</Ammo_40x90mmGrenadeOE_Smoke>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="40x90mmGrenadeBaseOE" ParentName="MediumAmmoBase" Abstract="True">
+		<description>Low velocity caseless grenade fired from handheld railgun grenade launchers.</description>
+		<statBases>
+			<Mass>0.320</Mass>
+			<Bulk>0.40</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo40x90mmGrenadesOE</li>
+		</thingCategories>
+		<stackLimit>500</stackLimit>
+		<cookOffFlashScale>100</cookOffFlashScale>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="40x90mmGrenadeBaseOE">
+		<defName>Ammo_40x90mmGrenadeOE_HE</defName>
+		<label>40x90mm grenade OE (HE)</label>
+		<graphicData>
+			<texPath>ThirdParty/Orassans/Ammo/Grenade/HELL</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>3.3</MarketValue>
+		</statBases>
+		<ammoClass>GrenadeHE</ammoClass>
+		<detonateProjectile>Bullet_40x90mmGrenadeOE_HE</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="40x90mmGrenadeBaseOE">
+		<defName>Ammo_40x90mmGrenadeOE_HEAT</defName>
+		<label>40x90mm grenade OE (HEAT)</label>
+		<graphicData>
+			<texPath>ThirdParty/Orassans/Ammo/Grenade/HEAT</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>3.6</MarketValue>
+		</statBases>
+		<ammoClass>GrenadeHEAT</ammoClass>
+		<detonateProjectile>Bullet_40x90mmGrenadeOE_HEAT</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="40x90mmGrenadeBaseOE">
+		<defName>Ammo_40x90mmGrenadeOE_EMP</defName>
+		<label>40x90mm grenade OE (EMP)</label>
+		<graphicData>
+			<texPath>Things/Ammo/GrenadeLauncher/EMP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>4.5</MarketValue>
+		</statBases>
+		<ammoClass>GrenadeEMP</ammoClass>
+		<detonateProjectile>Bullet_40x90mmGrenadeOE_EMP</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="40x90mmGrenadeBaseOE">
+		<defName>Ammo_40x90mmGrenadeOE_Smoke</defName>
+		<label>40x90mm grenade OE (Smoke)</label>
+		<graphicData>
+			<texPath>Things/Ammo/GrenadeLauncher/SMK</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>2.25</MarketValue>
+		</statBases>
+		<ammoClass>Smoke</ammoClass>
+		<generateAllowChance>0</generateAllowChance>
+		<detonateProjectile>Bullet_40x90mmGrenadeOE_Smoke</detonateProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef Name="Base40x90mmGrenadeOEBullet" ParentName="BaseExplosiveBullet" Abstract="true">
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_Big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>39</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base40x90mmGrenadeOEBullet">
+		<defName>Bullet_40x90mmGrenadeOE_HE</defName>
+		<label>40x90mm grenade OE (HE)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>2.0</explosionRadius>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>45</damageAmountBase>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>16</Fragment_Small>
+					<Fragment_Large>5</Fragment_Large>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="Base40x90mmGrenadeOEBullet">
+		<defName>Bullet_40x90mmGrenadeOE_HEAT</defName>
+		<label>40x90mm grenade OE (HEAT)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>56</speed>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>65</damageAmountBase>
+			<armorPenetrationSharp>75</armorPenetrationSharp>
+			<armorPenetrationBlunt>32.950</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<explosiveRadius>1.5</explosiveRadius>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<damageAmountBase>32</damageAmountBase>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>9</Fragment_Small>
+					<Fragment_Large>5</Fragment_Large>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="Base40x90mmGrenadeOEBullet">
+		<defName>Bullet_40x90mmGrenadeOE_EMP</defName>
+		<label>40x90mm grenade OE (EMP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>2.5</explosionRadius>
+			<damageDef>EMP</damageDef>
+			<damageAmountBase>25</damageAmountBase>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base40x90mmGrenadeOEBullet">
+		<defName>Bullet_40x90mmGrenadeOE_Cryo</defName>
+		<label>40x90mm grenade OE (Cryo)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>48</speed>
+			<damageDef>OFrostbite</damageDef>
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+			<explosionRadius>4.0</explosionRadius>
+			<postExplosionSpawnThingDef>Filth_Snow</postExplosionSpawnThingDef>
+			<postExplosionSpawnChance>1</postExplosionSpawnChance>
+			<postExplosionSpawnThingCount>3</postExplosionSpawnThingCount>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>12</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="Base40x90mmGrenadeOEBullet">
+		<defName>Bullet_40x90mmGrenadeOE_Smoke</defName>
+		<label>40x90mm grenade OE (Smoke)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>5</explosionRadius>
+			<damageDef>Smoke</damageDef>
+			<suppressionFactor>0.0</suppressionFactor>
+			<dangerFactor>0.0</dangerFactor>
+			<postExplosionGasType>BlindSmoke</postExplosionGasType>
+			<preExplosionSpawnChance>1</preExplosionSpawnChance>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>8</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.75</explosiveRadius>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>2</Fragment_Large>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_40x90mmGrenadeOE_HE</defName>
+		<label>make 40x90mm OE HE grenades x100</label>
+		<description>Craft 100 40x90mm OE HE grenades.</description>
+		<jobString>Making 40x90mm OE HE grenades.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>60</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>15</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_40x90mmGrenadeOE_HE>100</Ammo_40x90mmGrenadeOE_HE>
+		</products>
+		<workAmount>11000</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_40x90mmGrenadeOE_HEAT</defName>
+		<label>make 40x90mm OE HEAT grenades x100</label>
+		<description>Craft 100 40x90mm OE HEAT grenades.</description>
+		<jobString>Making 40x90mm OE HEAT grenades.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>60</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_40x90mmGrenadeOE_HEAT>100</Ammo_40x90mmGrenadeOE_HEAT>
+		</products>
+		<workAmount>11000</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_40x90mmGrenadeOE_EMP</defName>
+		<label>make 40x90mm OE EMP grenades x100</label>
+		<description>Craft 100 40x90mm OE EMP grenades.</description>
+		<jobString>Making 40x90mm OE EMP grenades.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>30</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_40x90mmGrenadeOE_EMP>100</Ammo_40x90mmGrenadeOE_EMP>
+		</products>
+		<workAmount>12000</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_40x90mmGrenadeOE_Smoke</defName>
+		<label>make 40x90mm OE Smoke grenades x100</label>
+		<description>Craft 100 40x90mm OE Smoke grenades.</description>
+		<jobString>Making 40x90mm OE Smoke grenades.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>45</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Prometheum</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_40x90mmGrenadeOE_Smoke>100</Ammo_40x90mmGrenadeOE_Smoke>
+		</products>
+		<workAmount>7500</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Orassans/Defs/Orassans/Ammo/6mmRailgunOE.xml b/ModPatches/Orassans/Defs/Orassans/Ammo/6mmRailgunOE.xml
new file mode 100644
index 0000000000..187d12ccf9
--- /dev/null
+++ b/ModPatches/Orassans/Defs/Orassans/Ammo/6mmRailgunOE.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>Ammo6mmRailgunOE</defName>
+		<label>6mm Railgun OE</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRailgunPistol</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_6mmRailgunOE</defName>
+		<label>6mm Railgun OE</label>
+		<ammoTypes>
+			<Ammo_6mmRailgun_SabotOE>Bullet_6mmRailgun_SabotOE</Ammo_6mmRailgun_SabotOE>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_6mmRailgun_SabotOE</defName>
+		<label>6mm Railgun cartridge (Sabot:OE)</label>
+		<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for railgun pistols.</description>
+		<statBases>
+			<Mass>0.008</Mass>
+			<Bulk>0.008</Bulk>
+			<MarketValue>0.06</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+			<!-- Railgun ammo isn't handloaded because it contains no propellant, and the sabots must be precision-machined anyway -->
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo6mmRailgunOE</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>Things/Ammo/Railgun/Pistol</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>RailgunSabot</ammoClass>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="BaseFN57x28mmBullet">
+		<defName>Bullet_6mmRailgun_SabotOE</defName>
+		<label>6mm Railgun bullet (Sabot:OE)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>16</damageAmountBase>
+			<armorPenetrationSharp>18</armorPenetrationSharp>
+			<armorPenetrationBlunt>130.80</armorPenetrationBlunt>
+			<speed>242</speed>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_6mmRailgun_SabotOE</defName>
+		<label>make 6mm Railgun cartridge (Sabot:OE) x500</label>
+		<description>Craft 500 6mm Railgun (Sabot:OE) cartridges.</description>
+		<jobString>Making 6mm Railgun (Sabot:OE) cartridges.</jobString>
+		<workAmount>1000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Uranium</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_6mmRailgun_SabotOE>500</Ammo_6mmRailgun_SabotOE>
+		</products>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Orassans/Defs/Orassans/Ammo/8mmRailgunOE.xml b/ModPatches/Orassans/Defs/Orassans/Ammo/8mmRailgunOE.xml
new file mode 100644
index 0000000000..f42a745108
--- /dev/null
+++ b/ModPatches/Orassans/Defs/Orassans/Ammo/8mmRailgunOE.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>Ammo8mmRailgunOE</defName>
+		<label>8mm Railgun (OE)</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRailgunRifle</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_8mmRailgunOE</defName>
+		<label>8mm Railgun (OE)</label>
+		<ammoTypes>
+			<Ammo_8mmRailgun_SabotOE>Bullet_8mmRailgun_SabotOE</Ammo_8mmRailgun_SabotOE>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerAmmoBase">
+		<defName>Ammo_8mmRailgun_SabotOE</defName>
+		<label>8mm Railgun cartridge (Sabot:OE)</label>
+		<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for railgun rifles.</description>
+		<statBases>
+			<Mass>0.01</Mass>
+			<Bulk>0.014</Bulk>
+			<MarketValue>0.06</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+			<!-- Railgun ammo isn't handloaded because it contains no propellant, and the sabots must be precision-machined anyway -->
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo8mmRailgunOE</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>Things/Ammo/Railgun/Rifle</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>RailgunSabot</ammoClass>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base545x39mmSovietBullet">
+		<defName>Bullet_8mmRailgun_SabotOE</defName>
+		<label>8mm Railgun bullet (Sabot:OE)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>26</damageAmountBase>
+			<armorPenetrationSharp>32</armorPenetrationSharp>
+			<armorPenetrationBlunt>95.720</armorPenetrationBlunt>
+			<speed>271</speed>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_8mmRailgun_SabotOE</defName>
+		<label>make 8mm Railgun cartridge (Sabot:OE) x500</label>
+		<description>Craft 500 8mm Railgun (Sabot:OE) cartridges.</description>
+		<jobString>Making 8mm Railgun (Sabot:OE) cartridges.</jobString>
+		<workAmount>1000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Uranium</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_8mmRailgun_SabotOE>500</Ammo_8mmRailgun_SabotOE>
+		</products>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Orassans/Defs/Orassans/Ammo/AmmoCategories_ChemicalCompoundOE.xml b/ModPatches/Orassans/Defs/Orassans/Ammo/AmmoCategories_ChemicalCompoundOE.xml
new file mode 100644
index 0000000000..5a937e98dc
--- /dev/null
+++ b/ModPatches/Orassans/Defs/Orassans/Ammo/AmmoCategories_ChemicalCompoundOE.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>ChemicalMunitionCompoundAprometheum</defName>
+		<label>accelerated jellied prometheum</label>
+		<labelShort>A.Prometheum</labelShort>
+		<description>Filled with mixture of potent but short-living version of prometheum.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>ChemicalMunitionCompoundThermobaric</defName>
+		<label>Thermobaric</label>
+		<description>Filled with mixture that disperses and subsequently ignites a fuel-air explosive mix, creating a powerful explosion and potentially igniting flammable objects.</description>
+		<advanced>true</advanced>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>ChemicalMunitionCompoundCryo</defName>
+		<label>Cryo</label>
+		<description>Filled with mixture of solid hydrogen and unstable compounds that vaporizes on contact with the air.</description>
+		<advanced>true</advanced>
+	</CombatExtended.AmmoCategoryDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Orassans/Defs/Orassans/Ammo/AmmoCategories_GrenadesOE.xml b/ModPatches/Orassans/Defs/Orassans/Ammo/AmmoCategories_GrenadesOE.xml
new file mode 100644
index 0000000000..e5ff1e23ee
--- /dev/null
+++ b/ModPatches/Orassans/Defs/Orassans/Ammo/AmmoCategories_GrenadesOE.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>GrenadeHEAT</defName>
+		<label>High-explosive anti-tank</label>
+		<labelShort>HEAT</labelShort>
+		<description>Grenade with a shaped charge warhead. Detonates on impact, creating a stream of metal that punches through enemy armor.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>GrenadeThermobaric</defName>
+		<label>Thermobaric</label>
+		<description>Disperses and subsequently ignites a fuel-air explosive mix, creating a powerful explosion and potentially igniting flammable objects.</description>
+		<advanced>true</advanced>
+	</CombatExtended.AmmoCategoryDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Orassans/Defs/Orassans/Ammo/ChemicalCompoundOE.xml b/ModPatches/Orassans/Defs/Orassans/Ammo/ChemicalCompoundOE.xml
new file mode 100644
index 0000000000..ffcbb03e72
--- /dev/null
+++ b/ModPatches/Orassans/Defs/Orassans/Ammo/ChemicalCompoundOE.xml
@@ -0,0 +1,389 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>AmmoChemicalCompoundOE</defName>
+		<label>Chemical munition OE</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberFuel</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_ChemicalCompoundOE</defName>
+		<label>Chemical munition compound OE</label>
+		<ammoTypes>
+			<Ammo_ChemicalCompoundOE_Cryo>Bullet_ChemicalCompoundOE_Cryo</Ammo_ChemicalCompoundOE_Cryo>
+			<Ammo_ChemicalCompoundOE_Napalm>Bullet_ChemicalCompoundOE_Napalm</Ammo_ChemicalCompoundOE_Napalm>
+			<Ammo_ChemicalCompoundOE_Aprometheum>Bullet_ChemicalCompoundOE_Aprometheum</Ammo_ChemicalCompoundOE_Aprometheum>
+			<Ammo_ChemicalCompoundOE_Thermobaric>Bullet_ChemicalCompoundOE_Thermobaric</Ammo_ChemicalCompoundOE_Thermobaric>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="ChemicalCompoundOE" ParentName="AmmoBase" Abstract="True">
+		<description>Stabilised chemical munition compound stored in special canister, for use in advanced chemical launchers.</description>
+		<statBases>
+			<MaxHitPoints>75</MaxHitPoints>
+			<Flammability>1.0</Flammability>
+			<Mass>0.34</Mass>
+			<Bulk>0.45</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_DrugLab</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoFlamethrower</li>
+		</thingCategories>
+		<stackLimit>500</stackLimit>
+		<cookOffFlashScale>50</cookOffFlashScale>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="ChemicalCompoundOE">
+		<defName>Ammo_ChemicalCompoundOE_Cryo</defName>
+		<label>Chemical munition OE (Cryo)</label>
+		<graphicData>
+			<texPath>ThirdParty/Orassans/Ammo/Canister/Cryo</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>5.0</MarketValue>
+		</statBases>
+		<ammoClass>ChemicalMunitionCompoundCryo</ammoClass>
+		<detonateProjectile>Bullet_ChemicalCompoundOE_Cryo</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="ChemicalCompoundOE">
+		<defName>Ammo_ChemicalCompoundOE_Napalm</defName>
+		<label>Chemical munition OE (Napalm)</label>
+		<graphicData>
+			<texPath>ThirdParty/Orassans/Ammo/Canister/Napalm</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>3.3</MarketValue>
+		</statBases>
+		<ammoClass>IncendiaryFuel</ammoClass>
+		<detonateProjectile>Bullet_ChemicalCompoundOE_Napalm</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="ChemicalCompoundOE">
+		<defName>Ammo_ChemicalCompoundOE_Aprometheum</defName>
+		<label>Chemical munition OE (A.Prometheum)</label>
+		<graphicData>
+			<texPath>ThirdParty/Orassans/Ammo/Canister/Aprometheum</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>7.2</MarketValue>
+		</statBases>
+		<ammoClass>ChemicalMunitionCompoundAprometheum</ammoClass>
+		<detonateProjectile>Bullet_ChemicalCompoundOE_Aprometheum</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="ChemicalCompoundOE">
+		<defName>Ammo_ChemicalCompoundOE_Thermobaric</defName>
+		<label>Chemical munition OE (Thermobaric)</label>
+		<graphicData>
+			<texPath>ThirdParty/Orassans/Ammo/Canister/Thermobaric</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>8.5</MarketValue>
+		</statBases>
+		<ammoClass>ChemicalMunitionCompoundThermobaric</ammoClass>
+		<detonateProjectile>Bullet_ChemicalCompoundOE_Thermobaric</detonateProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef Name="BaseChemicalCompoundOEBullet" ParentName="BaseExplosiveBullet" Abstract="true">
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_Big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>40</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseChemicalCompoundOEBullet">
+		<defName>Bullet_ChemicalCompoundOE_Cryo</defName>
+		<label>Chemical munition OE (Cryo)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>45</speed>
+			<damageDef>OFrostbite</damageDef>
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+			<explosionRadius>4.0</explosionRadius>
+			<postExplosionSpawnThingDef>Filth_Snow</postExplosionSpawnThingDef>
+			<postExplosionSpawnChance>1</postExplosionSpawnChance>
+			<postExplosionSpawnThingCount>3</postExplosionSpawnThingCount>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseChemicalCompoundOEBullet">
+		<defName>Bullet_ChemicalCompoundOE_Napalm</defName>
+		<label>Chemical munition OE (Napalm)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Flame</damageDef>
+			<damageAmountBase>8</damageAmountBase>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+			<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
+			<preExplosionSpawnChance>0.33</preExplosionSpawnChance>
+			<soundExplode>CE_FlamethrowerExplosion</soundExplode>
+			<explosionRadius>4.5</explosionRadius>
+			<ai_IsIncendiary>true</ai_IsIncendiary>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseChemicalCompoundOEBullet">
+		<defName>Bullet_ChemicalCompoundOE_Aprometheum</defName>
+		<label>Chemical munition OE (A.Prometheum)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>AprometheumFlame</damageDef>
+			<damageAmountBase>12</damageAmountBase>
+			<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
+			<preExplosionSpawnChance>0.15</preExplosionSpawnChance>
+			<soundExplode>CE_FlamethrowerExplosion</soundExplode>
+			<explosionRadius>2.5</explosionRadius>
+			<ai_IsIncendiary>true</ai_IsIncendiary>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseChemicalCompoundOEBullet">
+		<defName>Bullet_ChemicalCompoundOE_Thermobaric</defName>
+		<label>Chemical munition OE (Thermobaric)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Thermobaric</damageDef>
+			<explosionRadius>4.5</explosionRadius>
+			<damageAmountBase>46</damageAmountBase>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<ai_IsIncendiary>true</ai_IsIncendiary>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_ChemicalCompoundOE_Cryo</defName>
+		<label>make Chemical munition OE Cryo units x100</label>
+		<description>Craft 100 Chemical munition OE Cryo units.</description>
+		<jobString>Making Chemical munition OE Cryo units.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>45</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>Prometheum</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_ChemicalCompoundOE_Cryo>100</Ammo_ChemicalCompoundOE_Cryo>
+		</products>
+		<workAmount>13000</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_ChemicalCompoundOE_Napalm</defName>
+		<label>make Chemical munitio compound OE Napalm units x100</label>
+		<description>Craft 100 Chemical munition OE Napalm units.</description>
+		<jobString>Making Chemical munition OE Napalm units.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>45</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>Prometheum</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_ChemicalCompoundOE_Napalm>100</Ammo_ChemicalCompoundOE_Napalm>
+		</products>
+		<workAmount>13000</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_ChemicalCompoundOE_Aprometheum</defName>
+		<label>make Chemical munition OE A.Prometheum units x100</label>
+		<description>Craft 100 Chemical compound OE A.Prometheum units.</description>
+		<jobString>Making Chemical munitio compound OE A.Prometheum units.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>45</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>Prometheum</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_ChemicalCompoundOE_Aprometheum>100</Ammo_ChemicalCompoundOE_Aprometheum>
+		</products>
+		<workAmount>13000</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_ChemicalCompoundOE_Thermobaric</defName>
+		<label>make Chemical munition OE Thermobaric units x100</label>
+		<description>Craft 100 Chemical compound OE Thermobaric units.</description>
+		<jobString>Making Chemical munition OE Thermobaric units.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>45</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>Prometheum</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_ChemicalCompoundOE_Thermobaric>100</Ammo_ChemicalCompoundOE_Thermobaric>
+		</products>
+		<workAmount>13000</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Orassans/Defs/Orassans/Ammo/CryoBolt.xml b/ModPatches/Orassans/Defs/Orassans/Ammo/CryoBolt.xml
new file mode 100644
index 0000000000..09a6453c35
--- /dev/null
+++ b/ModPatches/Orassans/Defs/Orassans/Ammo/CryoBolt.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- === Custom Snow Filth === -->
+	<ThingDef ParentName="BaseFilth">
+		<defName>Filth_Snow</defName>
+		<label>snow</label>
+		<graphicData>
+			<texPath>Things/Filth/Grainy</texPath>
+			<color>(180, 180, 180, 97)</color>
+		</graphicData>
+		<filth>
+			<placementMask>
+				<li>Terrain</li>
+			</placementMask>
+			<disappearsInDays>5~10</disappearsInDays>
+			<rainWashes>true</rainWashes>
+			<cleaningWorkToReduceThickness>35</cleaningWorkToReduceThickness>
+			<canFilthAttach>true</canFilthAttach>
+			<allowsFire>false</allowsFire>
+		</filth>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseExplosiveBullet">
+		<defName>Bullet_CryBolt</defName>
+		<label>cryo bolt</label>
+		<thingClass>Orassan.Projectile_SnowMaker</thingClass>
+		<graphicData>
+			<texPath>Things/Item/Equipment/Weapons/CryoCannonShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>60</speed>
+			<damageDef>OFrostbite</damageDef>
+			<damageAmountBase>15</damageAmountBase>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+			<explosionRadius>4</explosionRadius>
+			<postExplosionSpawnThingDef>Filth_Snow</postExplosionSpawnThingDef>
+			<postExplosionSpawnChance>1</postExplosionSpawnChance>
+			<postExplosionSpawnThingCount>3</postExplosionSpawnThingCount>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Orassans/Defs/Orassans/Ammo/Damages_LocalInjury_OE.xml b/ModPatches/Orassans/Defs/Orassans/Ammo/Damages_LocalInjury_OE.xml
new file mode 100644
index 0000000000..8c3aba96bd
--- /dev/null
+++ b/ModPatches/Orassans/Defs/Orassans/Ammo/Damages_LocalInjury_OE.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<DamageDef ParentName="Flame">
+		<defName>AprometheumFlame</defName>
+		<label>accelerated prometheum flame</label>
+		<additionalHediffs>
+			<li>
+				<hediff>AprometheumSoaked</hediff>
+				<severityPerDamageDealt>0.08</severityPerDamageDealt>
+			</li>
+		</additionalHediffs>
+	</DamageDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Orassans/Defs/Orassans/Ammo/Hediffs_CE_OE.xml b/ModPatches/Orassans/Defs/Orassans/Ammo/Hediffs_CE_OE.xml
new file mode 100644
index 0000000000..96a689f06e
--- /dev/null
+++ b/ModPatches/Orassans/Defs/Orassans/Ammo/Hediffs_CE_OE.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<HediffDef>
+		<defName>AprometheumSoaked</defName>
+		<label>Accelerated Prometheum-soaked</label>
+		<description>Soaked in Accelerated Prometheum</description>
+		<hediffClass>HediffWithComps</hediffClass>
+		<comps>
+			<li Class="HediffCompProperties_SeverityPerDay">
+				<severityPerDay>-24</severityPerDay>
+			</li>
+			<li Class="CombatExtended.HediffCompProperties_Prometheum"/>
+		</comps>
+		<stages>
+			<li>
+				<minSeverity>0.2</minSeverity>
+				<label>minor</label>
+				<statOffsets>
+					<Flammability>0.3</Flammability>
+				</statOffsets>
+			</li>
+			<li>
+				<minSeverity>0.40</minSeverity>
+				<label>dripping</label>
+				<statOffsets>
+					<Flammability>0.65</Flammability>
+				</statOffsets>
+			</li>
+			<li>
+				<minSeverity>0.5</minSeverity>
+				<label>soaked</label>
+				<statOffsets>
+					<Flammability>1.1</Flammability>
+				</statOffsets>
+			</li>
+			<li>
+				<minSeverity>0.65</minSeverity>
+				<label>soaked</label>
+				<statOffsets>
+					<Flammability>1.3</Flammability>
+				</statOffsets>
+			</li>
+			<li>
+				<minSeverity>0.75</minSeverity>
+				<label>drenched</label>
+				<statOffsets>
+					<Flammability>1.5</Flammability>
+				</statOffsets>
+			</li>
+			<li>
+				<minSeverity>0.8</minSeverity>
+				<label>drenched</label>
+				<statOffsets>
+					<Flammability>1.8</Flammability>
+				</statOffsets>
+			</li>
+			<li>
+				<minSeverity>0.9</minSeverity>
+				<label>overdrenched</label>
+				<statOffsets>
+					<Flammability>2.0</Flammability>
+				</statOffsets>
+			</li>
+		</stages>
+	</HediffDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Orassans/Defs/Orassans/Ammo/MissileAmmo.xml b/ModPatches/Orassans/Defs/Orassans/Ammo/MissileAmmo.xml
new file mode 100644
index 0000000000..237e58ae2f
--- /dev/null
+++ b/ModPatches/Orassans/Defs/Orassans/Ammo/MissileAmmo.xml
@@ -0,0 +1,321 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>AmmoOrassanMissileShells</defName>
+		<label>orassan missile shell</label>
+		<parent>AmmoShells</parent>
+		<iconPath>Things/Projectile/Cannon/HE</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_OrassanMissileShell</defName>
+		<label>Orassan missile shells</label>
+		<ammoTypes>
+			<Ammo_OrassanMissileShell_HEAT>Bullet_OrassanMissileShell_HEAT</Ammo_OrassanMissileShell_HEAT>
+			<Ammo_OrassanMissileShell_HE>Bullet_OrassanMissileShell_HE</Ammo_OrassanMissileShell_HE>
+			<Ammo_OrassanMissileShell_APSabot>Bullet_OrassanMissileShell_APSabot</Ammo_OrassanMissileShell_APSabot>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="OrassanMissileShellBase" ParentName="HeavyAmmoBase" Abstract="True">
+		<description>Large projectiles for the orassan recoilless railgun rifle system The lack of propellent allows for larger payloads for their size, effectively allowing infantry to use armaments typically associated with armor.</description>
+		<thingCategories>
+			<li>AmmoOrassanMissileShells</li>
+		</thingCategories>
+		<stackLimit>25</stackLimit>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<statBases>
+			<MaxHitPoints>250</MaxHitPoints>
+			<Mass>15</Mass>
+			<Bulk>15</Bulk>
+		</statBases>
+		<cookOffFlashScale>35</cookOffFlashScale>
+		<cookOffSound>MortarBomb_Explode</cookOffSound>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="OrassanMissileShellBase">
+		<defName>Ammo_OrassanMissileShell_HEAT</defName>
+		<label>Orassan Missile shell (HEAT)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Cannon/Tank/HEAT</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>141.46</MarketValue>
+		</statBases>
+		<ammoClass>RocketHEAT</ammoClass>
+		<detonateProjectile>Bullet_OrassanMissileShell_HEAT</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="OrassanMissileShellBase">
+		<defName>Ammo_OrassanMissileShell_HE</defName>
+		<label>Orassan Missile shell (HE)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Cannon/Tank/HE</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>180.99</MarketValue>
+		</statBases>
+		<ammoClass>RocketHE</ammoClass>
+		<detonateProjectile>Bullet_OrassanMissileShell_HE</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="OrassanMissileShellBase">
+		<defName>Ammo_OrassanMissileShell_APSabot</defName>
+		<label>Orassan Missile shell (AP Sabot)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Cannon/Tank/Sabot</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>190</MarketValue>
+			<Bulk>10.8</Bulk>
+			<Mass>4</Mass>
+		</statBases>
+		<ammoClass>RailgunSabot</ammoClass>
+		<detonateProjectile>Bullet_OrassanMissileShell_APSabot</detonateProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef Name="BaseOrassanMissileShell" ParentName="Base120mmCannonShell" Abstract="true">
+		<graphicData>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>280</speed>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<flyOverhead>false</flyOverhead>
+			<dropsCasings>false</dropsCasings>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseOrassanMissileShell">
+		<defName>Bullet_OrassanMissileShell_HEAT</defName>
+		<label>Orassan Missile shell (HEAT)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Cannon/HEAT</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>405</damageAmountBase>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<armorPenetrationSharp>420</armorPenetrationSharp>
+			<armorPenetrationBlunt>62.411</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>208</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>18</Fragment_Large>
+					<Fragment_Small>81</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseOrassanMissileShell">
+		<defName>Bullet_OrassanMissileShell_APSabot</defName>
+		<label>Orassan Missile shell (AP Sabot)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Cannon/Sabot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>500</damageAmountBase>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<armorPenetrationSharp>500</armorPenetrationSharp>
+			<armorPenetrationBlunt>75</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>108</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>5</Fragment_Large>
+					<Fragment_Small>25</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseOrassanMissileShell">
+		<defName>Bullet_OrassanMissileShell_HE</defName>
+		<label>Orassan Missile shell (HE)</label>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<graphicData>
+			<texPath>Things/Projectile/Cannon/HE</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>315</damageAmountBase>
+			<explosionRadius>4</explosionRadius>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>30</Fragment_Large>
+					<Fragment_Small>323</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_OrassanMissileShell_HEAT</defName>
+		<label>make HEAT orassan missile shells x2</label>
+		<description>Craft 2 120mm HEAT cannon shells.</description>
+		<jobString>Making 120mm HEAT cannon shells.</jobString>
+		<workAmount>33200</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>90</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>7</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>FSX</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_OrassanMissileShell_HEAT>2</Ammo_OrassanMissileShell_HEAT>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_OrassanMissileShell_APSabot</defName>
+		<label>make armor Piercing Sabot orassan missile shells x2</label>
+		<description>Craft 2 armor piercing sabot orassan missile shells.</description>
+		<jobString>Making armor piercing sabot orassan missile shells.</jobString>
+		<workAmount>30000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>90</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>FSX</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_OrassanMissileShell_APSabot>2</Ammo_OrassanMissileShell_APSabot>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_OrassanMissileShell_HE</defName>
+		<label>make HE orassan missile shells x2</label>
+		<description>Craft 2 120mm HE cannon shells.</description>
+		<jobString>Making 120mm HE cannon shells.</jobString>
+		<workAmount>42400</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>90</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>13</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>FSX</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_OrassanMissileShell_HE>2</Ammo_OrassanMissileShell_HE>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Orassans/Defs/Orassans/Ammo/RailShotgunAmmo.xml b/ModPatches/Orassans/Defs/Orassans/Ammo/RailShotgunAmmo.xml
new file mode 100644
index 0000000000..6ad7408be8
--- /dev/null
+++ b/ModPatches/Orassans/Defs/Orassans/Ammo/RailShotgunAmmo.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>AmmoRailShotOE</defName>
+		<label>railgun shot shell (OE)</label>
+		<parent>AmmoShells</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberShotgun</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_RailShellOE</defName>
+		<label>rail shotgun shells (OE)</label>
+		<ammoTypes>
+			<Ammo_Railgun_BuckOE>Bullet_Railgun_BuckOE</Ammo_Railgun_BuckOE>
+			<Ammo_Railgun_SlugOE>Bullet_Railgun_SlugOE</Ammo_Railgun_SlugOE>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="RailGaugeBase" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Unlike other railgun rounds these require a casing to be used effectively, and unlike shotguns, the buckshot isn't as easily foiled by armor.</description>
+		<statBases>
+			<Mass>0.023</Mass>
+			<Bulk>0.06</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoRailShotOE</li>
+		</thingCategories>
+		<stackLimit>5000</stackLimit>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="RailGaugeBase">
+		<defName>Ammo_Railgun_BuckOE</defName>
+		<label>railgun shell (Buck:OE)</label>
+		<graphicData>
+			<texPath>ThirdParty/Orassans/Ammo/Shotgun/RailShot</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.1</MarketValue>
+		</statBases>
+		<ammoClass>BuckShot</ammoClass>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="RailGaugeBase">
+		<defName>Ammo_Railgun_SlugOE</defName>
+		<label>railgun shell (Slug:OE)</label>
+		<graphicData>
+			<texPath>ThirdParty/Orassans/Ammo/Shotgun/RailSlug</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<Mass>0.048</Mass>
+			<MarketValue>0.2</MarketValue>
+		</statBases>
+		<ammoClass>Slug</ammoClass>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef Name="BaseRailShotBullet" ParentName="Base12GaugeBullet" Abstract="true">
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<dropsCasings>true</dropsCasings>
+			<casingMoteDefname>Fleck_ShotgunShell</casingMoteDefname>
+			<casingFilthDefname>Filth_ShotgunAmmoCasings</casingFilthDefname>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseRailShotBullet">
+		<defName>Bullet_Railgun_BuckOE</defName>
+		<label>rail buckshot pellet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shotgun_Pellet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<pelletCount>9</pelletCount>
+			<armorPenetrationSharp>9</armorPenetrationSharp>
+			<armorPenetrationBlunt>20</armorPenetrationBlunt>
+			<spreadMult>15.8</spreadMult>
+			<speed>380</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseRailShotBullet">
+		<defName>Bullet_Railgun_SlugOE</defName>
+		<label>rail shotgun slug (sabot:OE)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>38</damageAmountBase>
+			<armorPenetrationSharp>20</armorPenetrationSharp>
+			<armorPenetrationBlunt>160.450</armorPenetrationBlunt>
+			<speed>310</speed>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_Railgun_BuckOE</defName>
+		<label>make railgun (Buck:OE) shell x200</label>
+		<description>Craft 200 12 gauge (Buck:OE) shells.</description>
+		<jobString>Making 12 gauge (Buck:OE) shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Uranium</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Railgun_BuckOE>200</Ammo_Railgun_BuckOE>
+		</products>
+		<workAmount>1200</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_Railgun_SlugOE</defName>
+		<label>make railgun (Slug:OE) shell x200</label>
+		<description>Craft 200 railgun (Slug:OE) shells.</description>
+		<jobString>Making railgun (Slug:OE) shells.</jobString>
+		<workAmount>900</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Uranium</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Railgun_SlugOE>200</Ammo_Railgun_SlugOE>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Orassans/Patches/Orassans/PawnKinds_Orassans.xml b/ModPatches/Orassans/Patches/Orassans/PawnKinds_Orassans.xml
new file mode 100644
index 0000000000..c143d0916a
--- /dev/null
+++ b/ModPatches/Orassans/Patches/Orassans/PawnKinds_Orassans.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/PawnKindDef[
+			defName = "Orassan" or
+			defName = "HumanVillager" or
+			defName = "HybridVillager" or
+			defName = "OrassanVillager" or
+			defName = "OrassanSlave" or
+			defName = "HybridRefugee" or
+			defName = "OrassanRefugee" or
+			defName = "OrassanTownCouncilman" or
+			defName = "OrassanTrader" or
+			defName = "OrassanTownGuard" or
+			defName = "OrassanSniper" or
+			defName = "OrassanMercenarySniper" or
+			defName = "OrassanSlasher" or
+			defName = "OrassanPirateSlasher" or
+			defName = "OrassanGunner" or
+			defName = "OrassanMercenaryGunner" or
+			defName = "OrassanGrenadier" or
+			defName = "OrassanSoldier" or
+			defName = "HybridSoldier" or
+			defName = "HumanSoldier" or
+			defName = "OrassanMercenarySoldier" or
+			defName = "OrassanPirate"
+			]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>200</min>
+							<max>400</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>OrassanMeleeSidearm</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Orassans/Patches/Orassans/ThingDefs_Misc/Apparel_Hats.xml b/ModPatches/Orassans/Patches/Orassans/ThingDefs_Misc/Apparel_Hats.xml
new file mode 100644
index 0000000000..f219a38fef
--- /dev/null
+++ b/ModPatches/Orassans/Patches/Orassans/ThingDefs_Misc/Apparel_Hats.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Orassan Power Helmet ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_OrassanPowerArmorHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_OrassanPowerArmorHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingAccuracy>0.15</AimingAccuracy>
+
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_OrassanPowerArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>19.2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_OrassanPowerArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>50</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_OrassanPowerArmorHelmet"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>45</Plasteel>
+			<CatLavenderCloth>20</CatLavenderCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_OrassanPowerArmorHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Orassan Sack Helmet ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_OrassanSacriArmorHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.8</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_OrassanSacriArmorHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingAccuracy>0.15</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_OrassanSacriArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4.8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_OrassanSacriArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_OrassanSacriArmorHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Orassans/Patches/Orassans/ThingDefs_Misc/Apparel_Various.xml b/ModPatches/Orassans/Patches/Orassans/ThingDefs_Misc/Apparel_Various.xml
new file mode 100644
index 0000000000..5f549ffc1c
--- /dev/null
+++ b/ModPatches/Orassans/Patches/Orassans/ThingDefs_Misc/Apparel_Various.xml
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Orassan Power Armor ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_KittyArmor"]/statBases</xpath>
+		<value>
+			<Bulk>90</Bulk>
+			<WornBulk>6</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_KittyArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>90</CarryWeight>
+			<CarryBulk>15</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_KittyArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>45</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_KittyArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>24</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_KittyArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>60</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_KittyArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Orassan Medium Powerarmor ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_MediumKittyArmor"]/statBases</xpath>
+		<value>
+			<Bulk>70</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_MediumKittyArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>100</CarryWeight>
+			<CarryBulk>22.5</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MediumKittyArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>25</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MediumKittyArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MediumKittyArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>50</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_MediumKittyArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Orassan Light Powarmor ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_LightKittyArmor"]/statBases</xpath>
+		<value>
+			<Bulk>50</Bulk>
+			<WornBulk>4</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_LightKittyArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>110</CarryWeight>
+			<CarryBulk>30</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_LightKittyArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>3</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_LightKittyArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>13</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_LightKittyArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>39</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_LightKittyArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Orassan Sack Armor ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_KittySacriSuit"]/statBases</xpath>
+		<value>
+			<Bulk>90</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_KittySacriSuit"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>90</CarryWeight>
+			<CarryBulk>15</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_KittySacriSuit"]/statBases/Mass</xpath>
+		<value>
+			<Mass>15</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_KittySacriSuit"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_KittySacriSuit"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_KittySacriSuit"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<!-- ======= Clothing ======= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_OrassanBasicTop" or defName="Apparel_OrassanBasicShorts"]/statBases</xpath>
+		<value>
+			<Bulk>0.75</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_OrassanBasicTop" or defName="Apparel_OrassanBasicShorts"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Orassans/Patches/Orassans/ThingDefs_Races/Desiri.xml b/ModPatches/Orassans/Patches/Orassans/ThingDefs_Races/Desiri.xml
new file mode 100644
index 0000000000..151e0593f3
--- /dev/null
+++ b/ModPatches/Orassans/Patches/Orassans/ThingDefs_Races/Desiri.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="ThingBaseDesiri"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="ThingBaseDesiri"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.91</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.198</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.91</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.198</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.49</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>1.440</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Animal_Desiri"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.27</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Orassans/Patches/Orassans/ThingDefs_Races/Gryphon.xml b/ModPatches/Orassans/Patches/Orassans/ThingDefs_Races/Gryphon.xml
new file mode 100644
index 0000000000..a004182b87
--- /dev/null
+++ b/ModPatches/Orassans/Patches/Orassans/ThingDefs_Races/Gryphon.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Gryphon"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Copied Big Cat Stats, changed bite to use beak, and paws to claws -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gryphon"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Gryphon"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			<MeleeCritChance>0.12</MeleeCritChance>
+			<MeleeParryChance>0.06</MeleeParryChance>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Orassans/Patches/Orassans/ThingDefs_Races/Hybrid_Race.xml b/ModPatches/Orassans/Patches/Orassans/ThingDefs_Races/Hybrid_Race.xml
new file mode 100644
index 0000000000..499750bd4b
--- /dev/null
+++ b/ModPatches/Orassans/Patches/Orassans/ThingDefs_Races/Hybrid_Race.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_OrassanHumanHybrid"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_OrassanHumanHybrid"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_OrassanHumanHybrid"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_OrassanHumanHybrid"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_OrassanHumanHybrid"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<AimingAccuracy>1</AimingAccuracy>
+			<MeleeCritChance>1.93</MeleeCritChance>
+			<MeleeParryChance>0.75</MeleeParryChance>
+			<ReloadSpeed>1</ReloadSpeed>
+			<Suppressability>1</Suppressability>
+			<MeleeDodgeChance>1.71</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_OrassanHumanHybrid"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.15</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.15</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.923</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Orassans/Patches/Orassans/ThingDefs_Races/Orassan_Race.xml b/ModPatches/Orassans/Patches/Orassans/ThingDefs_Races/Orassan_Race.xml
new file mode 100644
index 0000000000..d2a6aea801
--- /dev/null
+++ b/ModPatches/Orassans/Patches/Orassans/ThingDefs_Races/Orassan_Race.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Orassan"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Orassan"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Orassan"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Orassan"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Orassan"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<AimingAccuracy>1</AimingAccuracy>
+			<MeleeCritChance>1.93</MeleeCritChance>
+			<MeleeParryChance>0.75</MeleeParryChance>
+			<ReloadSpeed>1</ReloadSpeed>
+			<Suppressability>1</Suppressability>
+			<MeleeDodgeChance>1.71</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Orassan"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.15</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.15</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.923</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Orassans/Patches/Orassans/ThingDefs_Races/Ori.xml b/ModPatches/Orassans/Patches/Orassans/ThingDefs_Races/Ori.xml
new file mode 100644
index 0000000000..48882bf2eb
--- /dev/null
+++ b/ModPatches/Orassans/Patches/Orassans/ThingDefs_Races/Ori.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Ori"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Ori"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hand</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.19</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hand</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.19</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.11</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.19</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Ori"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>5</MoveSpeed>
+			<MeleeDodgeChance>0.24</MeleeDodgeChance>
+			<MeleeCritChance>0.03</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Orassans/Patches/Orassans/ThingDefs_Weapons/Weapons.xml b/ModPatches/Orassans/Patches/Orassans/ThingDefs_Weapons/Weapons.xml
new file mode 100644
index 0000000000..92c822307b
--- /dev/null
+++ b/ModPatches/Orassans/Patches/Orassans/ThingDefs_Weapons/Weapons.xml
@@ -0,0 +1,954 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "Gun_OrassanPistol" or
+			defName = "Gun_OrassanAEPistol" or
+			defName = "Gun_OrassanSMG"
+			]/tools
+		</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "Gun_OrassanShotgun" or
+			defName = "Gun_OrassanRifle" or
+			defName = "Gun_OrassanLMG" or
+			defName = "Gun_OrassanSniper" or
+			defName = "Gun_OrassanDMR" or
+			defName = "Gun_OrassanGMG" or
+			defName = "Gun_OrassanBattleRifle" or
+			defName = "Gun_OrassanGrenadeLauncher"
+			]/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_CryoLauncher" or
+			defName = "Gun_OrassanRocket"
+			]/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>
+
+	<!-- === Pistol === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_OrassanPistol</defName>
+		<statBases>
+			<Mass>1</Mass>
+			<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.50</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.37</SwayFactor>
+			<Bulk>1</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.40</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6mmRailgun_SabotOE</defaultProjectile>
+			<warmupTime>0.55</warmupTime>
+			<range>10</range>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<soundCast>Opistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>2</reloadTime>
+			<ammoSet>AmmoSet_6mmRailgunOE</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>AdvancedGun</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_Sidearm</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Heavy Pistol === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_OrassanAEPistol</defName>
+		<statBases>
+			<Mass>3</Mass>
+			<RangedWeapon_Cooldown>2.1</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.40</SightsEfficiency>
+			<ShotSpread>0.35</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>3</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>10</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12mmautoRailgun_SabotOE</defaultProjectile>
+			<warmupTime>0.40</warmupTime>
+			<range>18</range>
+			<soundCast>OTFalcon</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_12mmautoRailgunOE</ammoSet>
+		</AmmoUser>
+		<FireModes>
+		</FireModes>
+		<weaponTags>
+			<li>AdvancedGun</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === SMG === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_OrassanSMG</defName>
+		<statBases>
+			<Mass>3</Mass>
+			<RangedWeapon_Cooldown>0.33</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.2</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>0.88</SwayFactor>
+			<Bulk>6</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.41</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12mmsubsonicRailgun_SabotOE</defaultProjectile>
+			<warmupTime>0.55</warmupTime>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<range>17</range>
+			<soundCast>OSMG</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_12mmsubsonicRailgunOE</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>true</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>AdvancedGun</li>
+			<li>CE_BROOM</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Shotgun === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_OrassanShotgun</defName>
+		<statBases>
+			<Mass>3</Mass>
+			<RangedWeapon_Cooldown>0.89</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.1</SwayFactor>
+			<Bulk>7</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.1</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Railgun_BuckOE</defaultProjectile>
+			<warmupTime>0.7</warmupTime>
+			<range>25</range>
+			<soundCast>OShotgun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>2</reloadTime>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<ammoSet>AmmoSet_RailShellOE</ammoSet>
+		</AmmoUser>
+		<FireModes>
+		</FireModes>
+		<weaponTags>
+			<li>AdvancedGun</li>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Rifle === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_OrassanRifle</defName>
+		<statBases>
+			<Mass>2.7</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.17</SwayFactor>
+			<Bulk>8.00</Bulk>
+			<WorkToMake>62000</WorkToMake>
+		</statBases>
+		<costList>
+			<Uranium>5</Uranium>
+			<Steel>100</Steel>
+			<Plasteel>100</Plasteel>
+			<ComponentSpacer>1</ComponentSpacer>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8mmRailgun_SabotOE</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>58</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>6</burstShotCount>
+			<soundCast>ORifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_8mmRailgunOE</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>true</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>AdvancedGun</li>
+			<li>CE_AI_AR</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_OrassanBattleRifle</defName>
+		<statBases>
+			<Mass>3.2</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>1.22</SwayFactor>
+			<Bulk>8.30</Bulk>
+			<WorkToMake>62000</WorkToMake>
+		</statBases>
+		<costList>
+			<Uranium>5</Uranium>
+			<Steel>100</Steel>
+			<Plasteel>120</Plasteel>
+			<ComponentSpacer>1</ComponentSpacer>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.6</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_10mmRailgun_SabotOE</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>58</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>6</burstShotCount>
+			<soundCast>OTFalcon</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_10mmRailgunOE</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>true</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>AdvancedGun</li>
+			<li>CE_AI_AR</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === LMG === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_OrassanLMG</defName>
+		<statBases>
+			<Mass>2.7</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.17</SwayFactor>
+			<Bulk>8.00</Bulk>
+			<WorkToMake>62000</WorkToMake>
+			<NightVisionEfficiency_Weapon>0.6</NightVisionEfficiency_Weapon>
+		</statBases>
+		<costList>
+			<Uranium>5</Uranium>
+			<Steel>100</Steel>
+			<Plasteel>100</Plasteel>
+			<ComponentSpacer>1</ComponentSpacer>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.16</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8mmRailgun_SabotOE</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>62</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>OLMG</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>90</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_8mmRailgunOE</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>AdvancedGun</li>
+			<li>CE_MachineGun</li>
+			<li>CE_AI_LMG</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_OrassanGMG</defName>
+		<statBases>
+			<Mass>2.7</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.17</SwayFactor>
+			<Bulk>8.00</Bulk>
+			<WorkToMake>62000</WorkToMake>
+			<NightVisionEfficiency_Weapon>0.6</NightVisionEfficiency_Weapon>
+		</statBases>
+		<costList>
+			<Uranium>5</Uranium>
+			<Steel>100</Steel>
+			<Plasteel>100</Plasteel>
+			<ComponentSpacer>1</ComponentSpacer>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.16</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_10mmRailgun_SabotOE</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>62</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>OLMG</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>90</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_10mmRailgunOE</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>AdvancedGun</li>
+			<li>CE_MachineGun</li>
+			<li>CE_AI_LMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Sniper === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_OrassanSniper</defName>
+		<statBases>
+			<Mass>3.0</Mass>
+			<Bulk>12</Bulk>
+			<SightsEfficiency>3</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.3</SwayFactor>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<NightVisionEfficiency_Weapon>0.6</NightVisionEfficiency_Weapon>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12mmRailgun_SabotOE</defaultProjectile>
+			<warmupTime>2</warmupTime>
+			<range>90</range>
+			<soundCast>OSniper</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_12mmRailgunOE</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>AdvancedGun</li>
+			<li>OrassanSniper</li>
+			<li>CE_AI_SR</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === DMR === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_OrassanDMR</defName>
+		<statBases>
+			<Mass>3.0</Mass>
+			<RangedWeapon_Cooldown>0.32</RangedWeapon_Cooldown>
+			<SightsEfficiency>3</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.3</SwayFactor>
+			<Bulk>12</Bulk>
+			<NightVisionEfficiency_Weapon>0.6</NightVisionEfficiency_Weapon>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.60</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_10mmRailgun_SabotOE</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>74</range>
+			<soundCast>OTFalcon</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_10mmRailgunOE</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>AdvancedGun</li>
+			<li>OrassanSniper</li>
+			<li>CE_AI_SR</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Cryo Launcher === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_CryoLauncher</defName>
+		<statBases>
+			<Bulk>5.75</Bulk>
+			<Mass>3.8</Mass>
+			<SwayFactor>0.9</SwayFactor>
+			<ShotSpread>0.15</ShotSpread>
+			<SightsEfficiency>2</SightsEfficiency>
+			<RangedWeapon_Cooldown>.32</RangedWeapon_Cooldown>
+			<WorkToMake>32000</WorkToMake>
+			<NightVisionEfficiency_Weapon>0.6</NightVisionEfficiency_Weapon>
+		</statBases>
+		<costList>
+			<Plasteel>50</Plasteel>
+			<Uranium>20</Uranium>
+			<Steel>75</Steel>
+			<ComponentSpacer>4</ComponentSpacer>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>0.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_ChemicalCompoundOE_Cryo</defaultProjectile>
+			<warmupTime>.8</warmupTime>
+			<range>52</range>
+			<minRange>4</minRange>
+			<soundCast>OLaunchers</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>5.5</reloadTime>
+			<ammoSet>AmmoSet_ChemicalCompoundOE</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>AdvancedGun</li>
+			<li>OrassanCryo</li>
+			<li>CE_AI_AOE</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Grenade Launcher === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_OrassanGrenadeLauncher</defName>
+		<statBases>
+			<Bulk>5.2</Bulk>
+			<Mass>3.5</Mass>
+			<SwayFactor>0.9</SwayFactor>
+			<ShotSpread>0.1</ShotSpread>
+			<SightsEfficiency>2</SightsEfficiency>
+			<RangedWeapon_Cooldown>.35</RangedWeapon_Cooldown>
+			<WorkToMake>32000</WorkToMake>
+			<NightVisionEfficiency_Weapon>0.6</NightVisionEfficiency_Weapon>
+		</statBases>
+		<costList>
+			<Plasteel>40</Plasteel>
+			<Uranium>20</Uranium>
+			<Steel>80</Steel>
+			<ComponentSpacer>3</ComponentSpacer>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>0.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_40x90mmGrenadeOE_HE</defaultProjectile>
+			<warmupTime>.9</warmupTime>
+			<range>54</range>
+			<minRange>5</minRange>
+			<soundCast>OLaunchers</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_40x90mmGrenadeOE</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>AdvancedGun</li>
+			<li>OrassanGrenade</li>
+			<li>CE_AI_AOE</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Rocket Launcher === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_OrassanRocket</defName>
+		<statBases>
+			<Bulk>10</Bulk>
+			<Mass>5.0</Mass>
+			<SwayFactor>0.9</SwayFactor>
+			<ShotSpread>0.1</ShotSpread>
+			<SightsEfficiency>2</SightsEfficiency>
+			<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
+			<WorkToMake>32000</WorkToMake>
+			<NightVisionEfficiency_Weapon>0.6</NightVisionEfficiency_Weapon>
+		</statBases>
+		<costList>
+			<Plasteel>50</Plasteel>
+			<Uranium>20</Uranium>
+			<Steel>75</Steel>
+			<ComponentSpacer>4</ComponentSpacer>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>0.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_OrassanMissileShell_HEAT</defaultProjectile>
+			<warmupTime>1.85</warmupTime>
+			<range>44</range>
+			<minRange>5</minRange>
+			<soundCast>OLaunchers</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>8</reloadTime>
+			<ammoSet>AmmoSet_OrassanMissileShell</ammoSet>
+		</AmmoUser>
+		<FireModes>
+		</FireModes>
+		<weaponTags>
+			<li>AdvancedGun</li>
+			<li>OrassanMissile</li>
+			<li>CE_AI_Launcher</li>
+			<li>CE_AI_AOE</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Kitty Claws (Sabre) === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_kittyclaws"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>hand guard</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.12</cooldownTime>
+					<armorPenetrationBlunt>1.8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>1.12</cooldownTime>
+					<armorPenetrationSharp>28.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>52</power>
+					<cooldownTime>0.9</cooldownTime>
+					<armorPenetrationSharp>10.37</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.832</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_kittyclaws"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.63</MeleeCritChance>
+				<MeleeParryChance>0.75</MeleeParryChance>
+				<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_kittyclaws"]/statBases</xpath>
+		<value>
+			<Bulk>7</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<!-- === Orassan Combat Knife === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OrassanCombatKnife"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<MeleeCounterParryBonus>0.30</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OrassanCombatKnife"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.15</MeleeCritChance>
+				<MeleeParryChance>0.35</MeleeParryChance>
+				<MeleeDodgeChance>0.02</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OrassanCombatKnife"]/weaponTags</xpath>
+		<value>
+			<li>CE_Sidearm_Melee</li>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OrassanCombatKnife"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>.85</cooldownTime>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.8</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>0.85</cooldownTime>
+					<chanceFactor>1.88</chanceFactor>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.8</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Orassan Telescoping Warhammer === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OrassanWarHammer"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<MeleeCounterParryBonus>1.4</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OrassanWarHammer"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.40</MeleeCritChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OrassanWarHammer"]/weaponTags</xpath>
+		<value>
+			<li>CE_Sidearm_Melee</li>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OrassanWarHammer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.8</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<!-- Designed to damage most powered armor -->
+					<armorPenetrationBlunt>60</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Cat's Eye berry juice (bottle) === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Catberryjuice"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2.22</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>neck</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>3.33</cooldownTime>
+					<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Neck</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Catberryjuice"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.33</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Catberryjuice"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.1</MeleeCritChance>
+				<MeleeParryChance>0.33</MeleeParryChance>
+				<MeleeDodgeChance>0.07</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Catberryjuice"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Catberryjuice"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Catberryjuice"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Ordo Tempestus - Tempestus Scions/Patches/Ordo Tempestus - Tempestus Scions/Armor_Industrial.xml b/ModPatches/Ordo Tempestus - Tempestus Scions/Patches/Ordo Tempestus - Tempestus Scions/Armor_Industrial.xml
new file mode 100644
index 0000000000..39891b39f8
--- /dev/null
+++ b/ModPatches/Ordo Tempestus - Tempestus Scions/Patches/Ordo Tempestus - Tempestus Scions/Armor_Industrial.xml	
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Fatigues === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IM_TempestusScion_Fatigues"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IM_TempestusScion_Fatigues"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- === Carapace Armor === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IM_TempestusScion_CarapaceArmor"]/statBases</xpath>
+		<value>
+			<Bulk>20</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IM_TempestusScion_CarapaceArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IM_TempestusScion_CarapaceArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>24</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IM_TempestusScion_CarapaceArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>30</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IM_TempestusScion_CarapaceArmor"]/apparel/layers</xpath>
+		<value>
+			<li>Webbing</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IM_TempestusScion_CarapaceArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Ordo Tempestus - Tempestus Scions/Patches/Ordo Tempestus - Tempestus Scions/Headgear_Industrial.xml b/ModPatches/Ordo Tempestus - Tempestus Scions/Patches/Ordo Tempestus - Tempestus Scions/Headgear_Industrial.xml
new file mode 100644
index 0000000000..288fc2fc3e
--- /dev/null
+++ b/ModPatches/Ordo Tempestus - Tempestus Scions/Patches/Ordo Tempestus - Tempestus Scions/Headgear_Industrial.xml	
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Beret === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IM_TempestusScion_Beret"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- === Helmet === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IM_TempestusScion_Helmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IM_TempestusScion_Helmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>14</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IM_TempestusScion_Helmet"]/stuffCategories/li[.="Metallic"]</xpath>
+		<value>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<!-- === Omni Mask === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IM_TempestusScion_Mask"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>0.5</WornBulk>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+			<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IM_TempestusScion_Mask"]/stuffCategories/li[.="Metallic"]</xpath>
+		<value>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Chiss Ascendancy/Patches/Outer Rim - Chiss Ascendancy/Outer_Rim_Chiss_Ascendancy_Ranged_Weapons.xml b/ModPatches/Outer Rim - Chiss Ascendancy/Patches/Outer Rim - Chiss Ascendancy/Outer_Rim_Chiss_Ascendancy_Ranged_Weapons.xml
new file mode 100644
index 0000000000..69609b144d
--- /dev/null
+++ b/ModPatches/Outer Rim - Chiss Ascendancy/Patches/Outer Rim - Chiss Ascendancy/Outer_Rim_Chiss_Ascendancy_Ranged_Weapons.xml	
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_CharricPistol</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.05</SwayFactor>
+			<Bulk>1.90</Bulk>
+			<Mass>1.20</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>3.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterPistol_Yellow</defaultProjectile>
+			<burstShotCount>2</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>0.5</warmupTime>
+			<range>12</range>
+			<soundCast>OuterRim_Shot_MaserBlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+		<AmmoUser>
+			<magazineSize>24</magazineSize>
+			<reloadTime>3.7</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeYellow_Pistol</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_CharricCarbine</defName>
+		<statBases>
+			<SightsEfficiency>0.95</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>0.75</SwayFactor>
+			<Bulk>5.00</Bulk>
+			<Mass>2.80</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterRifle_Yellow</defaultProjectile>
+			<warmupTime>0.75</warmupTime>
+			<range>35</range>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<burstShotCount>2</burstShotCount>
+			<soundCast>OuterRim_Shot_MaserBlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>70</magazineSize>
+			<reloadTime>3.84</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeYellow_Rifle</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_CharricRifle</defName>
+		<statBases>
+			<SightsEfficiency>1.8</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.8</SwayFactor>
+			<Bulk>6.00</Bulk>
+			<Mass>4.10</Mass>
+			<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.48</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterRifle_Yellow</defaultProjectile>
+			<warmupTime>2.0</warmupTime>
+			<range>62</range>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<burstShotCount>2</burstShotCount>
+			<soundCast>OuterRim_Shot_MaserBlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>3.2</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeYellow_Rifle</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_Ammo.xml b/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_Ammo.xml
new file mode 100644
index 0000000000..c5b8bad1e9
--- /dev/null
+++ b/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_Ammo.xml	
@@ -0,0 +1,1270 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>AmmoPlasmaGasCartridge</defName>
+		<label>Plasma Gas Cartridges</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
+	</ThingCategoryDef>
+	
+	<ThingCategoryDef>
+		<defName>AmmoOuterRimTranqDart</defName>
+		<label>tranquilizer darts</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRocket</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSets ========================== -->
+	
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_PlasmaGasCartridgeRed_Pistol</defName>
+		<label>Pistol Plasma Gas Cartridges (Imperial/Sith)</label>
+		<ammoTypes>
+			<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterPistol_Red</Ammo_PlasmaGasCartridge_Standard>
+			<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterPistol_RedAP</Ammo_PlasmaGasCartridge_AP>
+			<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterPistol_Ion</Ammo_PlasmaGasCartridge_Ion>
+			<Ammo_PlasmaGasCartridge_Stun>Bullet_BlasterPistol_Stun</Ammo_PlasmaGasCartridge_Stun>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+	
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_PlasmaGasCartridgeRed_Rifle</defName>
+		<label>Rifle Plasma Gas Cartridges (Imperial/Sith)</label>
+		<ammoTypes>
+			<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterRifle_Red</Ammo_PlasmaGasCartridge_Standard>
+			<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterRifle_RedAP</Ammo_PlasmaGasCartridge_AP>
+			<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterRifle_Ion</Ammo_PlasmaGasCartridge_Ion>
+			<Ammo_PlasmaGasCartridge_Stun>Bullet_BlasterRifle_Stun</Ammo_PlasmaGasCartridge_Stun>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+	
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_PlasmaGasCartridgeRed_Sniper</defName>
+		<label>Heavy Plasma Gas Cartridges (Imperial/Sith)</label>
+		<ammoTypes>
+			<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterSniper_Red</Ammo_PlasmaGasCartridge_Standard>
+			<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterSniper_RedAP</Ammo_PlasmaGasCartridge_AP>
+			<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterSniper_Ion</Ammo_PlasmaGasCartridge_Ion>
+			<Ammo_PlasmaGasCartridge_Stun>Bullet_BlasterSniper_Stun</Ammo_PlasmaGasCartridge_Stun>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_PlasmaGasCartridgeGreen_Pistol</defName>
+		<label>Pistol Plasma Gas Cartridges (Rebel/Old Republic)</label>
+		<ammoTypes>
+			<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterPistol_Green</Ammo_PlasmaGasCartridge_Standard>
+			<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterPistol_GreenAP</Ammo_PlasmaGasCartridge_AP>
+			<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterPistol_Ion</Ammo_PlasmaGasCartridge_Ion>
+			<Ammo_PlasmaGasCartridge_Stun>Bullet_BlasterPistol_Stun</Ammo_PlasmaGasCartridge_Stun>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_PlasmaGasCartridgeGreen_Rifle</defName>
+		<label>Rifle Plasma Gas Cartridges (Rebel/Old Republic)</label>
+		<ammoTypes>
+			<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterRifle_Green</Ammo_PlasmaGasCartridge_Standard>
+			<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterRifle_GreenAP</Ammo_PlasmaGasCartridge_AP>
+			<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterRifle_Ion</Ammo_PlasmaGasCartridge_Ion>
+			<Ammo_PlasmaGasCartridge_Stun>Bullet_BlasterRifle_Stun</Ammo_PlasmaGasCartridge_Stun>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_PlasmaGasCartridgeGreen_Sniper</defName>
+		<label>Heavy Plasma Gas Cartridges (Rebel/Old Republic)</label>
+		<ammoTypes>
+			<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterSniper_Green</Ammo_PlasmaGasCartridge_Standard>
+			<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterSniper_GreenAP</Ammo_PlasmaGasCartridge_AP>
+			<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterSniper_Ion</Ammo_PlasmaGasCartridge_Ion>
+			<Ammo_PlasmaGasCartridge_Stun>Bullet_BlasterSniper_Stun</Ammo_PlasmaGasCartridge_Stun>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_PlasmaGasCartridgeBlue_Pistol</defName>
+		<label>Plasma Gas Cartridges (Galactic Republic)</label>
+		<ammoTypes>
+			<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterPistol_Blue</Ammo_PlasmaGasCartridge_Standard>
+			<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterPistol_BlueAP</Ammo_PlasmaGasCartridge_AP>
+			<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterPistol_Ion</Ammo_PlasmaGasCartridge_Ion>
+			<Ammo_PlasmaGasCartridge_Stun>Bullet_BlasterPistol_Stun</Ammo_PlasmaGasCartridge_Stun>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_PlasmaGasCartridgeBlue_Rifle</defName>
+		<label>Rifle Plasma Gas Cartridges (Galactic Republic)</label>
+		<ammoTypes>
+			<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterRifle_Blue</Ammo_PlasmaGasCartridge_Standard>
+			<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterRifle_BlueAP</Ammo_PlasmaGasCartridge_AP>
+			<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterRifle_Ion</Ammo_PlasmaGasCartridge_Ion>
+			<Ammo_PlasmaGasCartridge_Stun>Bullet_BlasterRifle_Stun</Ammo_PlasmaGasCartridge_Stun>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_PlasmaGasCartridgeBlue_Sniper</defName>
+		<label>Heavy Plasma Gas Cartridges (Galactic Republic)</label>
+		<ammoTypes>
+			<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterSniper_Blue</Ammo_PlasmaGasCartridge_Standard>
+			<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterSniper_BlueAP</Ammo_PlasmaGasCartridge_AP>
+			<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterSniper_Ion</Ammo_PlasmaGasCartridge_Ion>
+			<Ammo_PlasmaGasCartridge_Stun>Bullet_BlasterSniper_Stun</Ammo_PlasmaGasCartridge_Stun>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_PlasmaGasCartridgeYellow_Pistol</defName>
+		<label>Pistol Plasma Gas Cartridges (Chiss/Mandalorian)</label>
+		<ammoTypes>
+			<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterPistol_Yellow</Ammo_PlasmaGasCartridge_Standard>
+			<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterPistol_YellowAP</Ammo_PlasmaGasCartridge_AP>
+			<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterPistol_Ion</Ammo_PlasmaGasCartridge_Ion>
+			<Ammo_PlasmaGasCartridge_Stun>Bullet_BlasterPistol_Stun</Ammo_PlasmaGasCartridge_Stun>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_PlasmaGasCartridgeYellow_Rifle</defName>
+		<label>Rifle Plasma Gas Cartridges (Chiss/Mandalorian)</label>
+		<ammoTypes>
+			<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterRifle_Yellow</Ammo_PlasmaGasCartridge_Standard>
+			<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterRifle_YellowAP</Ammo_PlasmaGasCartridge_AP>
+			<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterRifle_Ion</Ammo_PlasmaGasCartridge_Ion>
+			<Ammo_PlasmaGasCartridge_Stun>Bullet_BlasterRifle_Stun</Ammo_PlasmaGasCartridge_Stun>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_PlasmaGasCartridgeYellow_Sniper</defName>
+		<label>Heavy Plasma Gas Cartridges (Chiss/Mandalorian)</label>
+		<ammoTypes>
+			<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterSniper_Yellow</Ammo_PlasmaGasCartridge_Standard>
+			<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterSniper_YellowAP</Ammo_PlasmaGasCartridge_AP>
+			<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterSniper_Ion</Ammo_PlasmaGasCartridge_Ion>
+			<Ammo_PlasmaGasCartridge_Stun>Bullet_BlasterSniper_Stun</Ammo_PlasmaGasCartridge_Stun>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_PlasmaGasCartridge_Scatter</defName>
+		<label>Scatterblaster Plasma Gas Cartridges</label>
+		<ammoTypes>
+			<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterBolt_Scatter</Ammo_PlasmaGasCartridge_Standard>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_PlasmaGasCartridgeIon_Pistol</defName>
+		<label>Ionized Pistol Plasma Gas Cartridges</label>
+		<ammoTypes>
+			<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterPistol_Ion</Ammo_PlasmaGasCartridge_Ion>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_PlasmaGasCartridgeIon_Rifle</defName>
+		<label>Ionized Rifle Plasma Gas Cartridges</label>
+		<ammoTypes>
+			<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterRifle_Ion</Ammo_PlasmaGasCartridge_Ion>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_PlasmaGasCartridgeIon_Sniper</defName>
+		<label>Heavy Ionized Plasma Gas Cartridges</label>
+		<ammoTypes>
+			<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterSniper_Ion</Ammo_PlasmaGasCartridge_Ion>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_OuterRim_KnockoutDarts</defName>
+		<label>Knockout Darts</label>
+		<ammoTypes>
+			<Ammo_OuterRim_KnockoutDart>Bullet_OR_KnockoutDart</Ammo_OuterRim_KnockoutDart>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+	
+	<!-- ================== Ammo ================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="PlasmaGasCartridgeBase" ParentName="SpacerSmallAmmoBase" Abstract="True">
+		<description>Plasma gas ammo used by advanced blaster designs. Standard general-purpose tibanna-gas based plasma bolts, effective against most targets and lighter armours.</description>
+		<statBases>
+			<Mass>0.01</Mass>
+			<Bulk>0.03</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoPlasmaGasCartridge</li>
+		</thingCategories>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="PlasmaGasCartridgeBase">
+		<defName>Ammo_PlasmaGasCartridge_Standard</defName>
+		<label>Plasma Gas Cartridges</label>
+		<graphicData>
+			<texPath>Things/Ammo/Charged/MediumRegular</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>1.55</MarketValue>
+		</statBases>
+		<ammoClass>BlasterStandard</ammoClass>
+		<cookOffProjectile>Bullet_BlasterPistol_Red</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="PlasmaGasCartridgeBase">
+		<defName>Ammo_PlasmaGasCartridge_AP</defName>
+		<description>Plasma gas ammo used by advanced blaster designs. A concentrated high-pressure refinement process produces plasma bolts capable of piercing hardened armour more effectively.</description>
+		<label>Plasma Gas Cartridges (Conc.)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Charged/MediumConc</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>1.95</MarketValue>
+		</statBases>
+		<ammoClass>BlasterAP</ammoClass>
+		<generateAllowChance>0.25</generateAllowChance>
+		<cookOffProjectile>Bullet_BlasterPistol_RedAP</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="PlasmaGasCartridgeBase">
+		<defName>Ammo_PlasmaGasCartridge_Ion</defName>
+		<description>Plasma gas ammo used by advanced blaster designs. Specialized particle induction causes ionization effects on bolt impacts, increasing effectiveness against mechanical targets.</description>
+		<label>Plasma Gas Cartridges (Ion)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Charged/MediumIon</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>1.95</MarketValue>
+		</statBases>
+		<ammoClass>BlasterIonized</ammoClass>
+		<generateAllowChance>0.05</generateAllowChance>
+		<cookOffProjectile>Bullet_BlasterPistol_Ion</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="PlasmaGasCartridgeBase">
+		<defName>Ammo_PlasmaGasCartridge_Stun</defName>
+		<description>Plasma gas ammo used by advanced blaster designs. Modulated energy pulse emission generates a non-lethal pulse that can disable organics, but is highly ineffective against mechanical targets.</description>
+		<label>Plasma Gas Cartridges (Stun)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Charged/MediumTox</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>1.95</MarketValue>
+		</statBases>
+		<ammoClass>BlasterStun</ammoClass>
+		<generateAllowChance>0</generateAllowChance>
+		<cookOffProjectile>Bullet_BlasterPistol_Stun</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="PlasmaGasCartridgeBase">
+		<defName>Ammo_OuterRim_KnockoutDart</defName>
+		<description>A small durasteel dart with an integrated injector that's laden with an extremely potent and fast-acting anesthetic. Favoured by bounty hunters who want to bring their targets in alive.</description>
+		<label>Knockout Darts</label>
+		<graphicData>
+			<texPath>ThirdParty/StarWars/Ammo/KnockoutDart</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>3.00</MarketValue>
+		</statBases>
+		<thingCategories>
+			<li>AmmoOuterRimTranqDart</li>
+		</thingCategories>
+		<ammoClass>TranqNonLethal</ammoClass>
+		<generateAllowChance>0</generateAllowChance>
+		<cookOffProjectile>Bullet_OR_KnockoutDart</cookOffProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef Name="BaseBlasterBolt" ParentName="BaseBulletCE" Abstract="true">
+		<label>blaster bolt</label>
+		<graphicData>
+			<texPath>Things/Projectile/Charged/ChargeShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>OuterRim_Blaster</damageDef>
+			<speed>122</speed>
+			<dropsCasings>false</dropsCasings>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Name="BaseBlasterBolt_Pistol" ParentName="BaseBlasterBolt" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Charged/ChargeShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>14</damageAmountBase>
+			<armorPenetrationBlunt>2</armorPenetrationBlunt>
+			<armorPenetrationSharp>14</armorPenetrationSharp>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Name="BaseBlasterBolt_PistolAP" ParentName="BaseBlasterBolt" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Charged/ChargeShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>11</damageAmountBase>
+			<armorPenetrationBlunt>3</armorPenetrationBlunt>
+			<armorPenetrationSharp>18</armorPenetrationSharp>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Name="BaseBlasterBolt_Rifle" ParentName="BaseBlasterBolt" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Charged/ChargeShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>18</damageAmountBase>
+			<armorPenetrationBlunt>3</armorPenetrationBlunt>
+			<armorPenetrationSharp>22</armorPenetrationSharp>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Name="BaseBlasterBolt_RifleAP" ParentName="BaseBlasterBolt" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Charged/ChargeShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationBlunt>4</armorPenetrationBlunt>
+			<armorPenetrationSharp>33</armorPenetrationSharp>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Name="BaseBlasterBolt_Sniper" ParentName="BaseBlasterBolt" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Charged/ChargeShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>175</speed>
+			<damageAmountBase>30</damageAmountBase>
+			<armorPenetrationBlunt>4</armorPenetrationBlunt>
+			<armorPenetrationSharp>20</armorPenetrationSharp>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Name="BaseBlasterBolt_SniperAP" ParentName="BaseBlasterBolt" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Charged/ChargeShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>175</speed>
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationBlunt>6</armorPenetrationBlunt>
+			<armorPenetrationSharp>36</armorPenetrationSharp>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterBolt_Pistol">
+		<defName>Bullet_BlasterPistol_Red</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Red</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterBolt_PistolAP">
+		<defName>Bullet_BlasterPistol_RedAP</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Red</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterBolt_Rifle">
+		<defName>Bullet_BlasterRifle_Red</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Red</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterBolt_RifleAP">
+		<defName>Bullet_BlasterRifle_RedAP</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Red</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterBolt_Sniper">
+		<defName>Bullet_BlasterSniper_Red</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Red</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterBolt_SniperAP">
+		<defName>Bullet_BlasterSniper_RedAP</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Red</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterBolt_Pistol">
+		<defName>Bullet_BlasterPistol_Green</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Green</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterBolt_PistolAP">
+		<defName>Bullet_BlasterPistol_GreenAP</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Green</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterBolt_Rifle">
+		<defName>Bullet_BlasterRifle_Green</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Green</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterBolt_RifleAP">
+		<defName>Bullet_BlasterRifle_GreenAP</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Green</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterBolt_Sniper">
+		<defName>Bullet_BlasterSniper_Green</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Green</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterBolt_SniperAP">
+		<defName>Bullet_BlasterSniper_GreenAP</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Green</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterBolt_Pistol">
+		<defName>Bullet_BlasterPistol_Blue</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Blue</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterBolt_PistolAP">
+		<defName>Bullet_BlasterPistol_BlueAP</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Blue</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterBolt_Rifle">
+		<defName>Bullet_BlasterRifle_Blue</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Blue</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterBolt_RifleAP">
+		<defName>Bullet_BlasterRifle_BlueAP</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Blue</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterBolt_Sniper">
+		<defName>Bullet_BlasterSniper_Blue</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Blue</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterBolt_SniperAP">
+		<defName>Bullet_BlasterSniper_BlueAP</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Blue</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterBolt_Pistol">
+		<defName>Bullet_BlasterPistol_Yellow</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Yellow</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterBolt_PistolAP">
+		<defName>Bullet_BlasterPistol_YellowAP</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Yellow</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterBolt_Rifle">
+		<defName>Bullet_BlasterRifle_Yellow</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Yellow</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterBolt_RifleAP">
+		<defName>Bullet_BlasterRifle_YellowAP</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Yellow</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterBolt_Sniper">
+		<defName>Bullet_BlasterSniper_Yellow</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Yellow</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterBolt_SniperAP">
+		<defName>Bullet_BlasterSniper_YellowAP</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Yellow</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterBolt_Pistol">
+		<defName>Bullet_BlasterPistol_Ion</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Blue</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>8</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>5</amount>
+				</li>
+			</secondaryDamage>
+			<empShieldBreakChance>0.2</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterBolt_Rifle">
+		<defName>Bullet_BlasterRifle_Ion</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Blue</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>8</amount>
+				</li>
+			</secondaryDamage>
+			<empShieldBreakChance>0.33</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterBolt_Sniper">
+		<defName>Bullet_BlasterSniper_Ion</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Blue</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>14</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>11</amount>
+				</li>
+			</secondaryDamage>
+			<empShieldBreakChance>0.66</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterBolt_Pistol">
+		<defName>Bullet_BlasterPistol_Stun</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/Proj_StunPulse</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Neuralizer</damageDef>
+			<damageAmountBase>1</damageAmountBase>
+			<speed>80</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterBolt_Rifle">
+		<defName>Bullet_BlasterRifle_Stun</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/Proj_StunPulse</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Neuralizer</damageDef>
+			<damageAmountBase>1</damageAmountBase>
+			<speed>90</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterBolt_Sniper">
+		<defName>Bullet_BlasterSniper_Stun</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/Proj_StunPulse</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Neuralizer</damageDef>
+			<damageAmountBase>1</damageAmountBase>
+			<speed>100</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterBolt">
+		<defName>Bullet_BlasterBolt_Scatter</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Red</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>8</damageAmountBase>
+			<armorPenetrationBlunt>1</armorPenetrationBlunt>
+			<armorPenetrationSharp>9</armorPenetrationSharp>
+			<pelletCount>12</pelletCount>
+			<spreadMult>15</spreadMult>
+		</projectile>
+	</ThingDef>
+	
+	<!-- ==================== Droid/Vambrace Minirockets ========================== -->
+	
+	<ThingCategoryDef>
+		<defName>AmmoOuterRimMiniRocket</defName>
+		<label>Mini Rockets</label>
+		<parent>AmmoRockets</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRocket</iconPath>
+	</ThingCategoryDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="OR_MiniRocketBase" ParentName="MediumAmmoBase" Abstract="True">
+		<description>A small but nonetheless extremely deadly miniaturized rocket, designed to be launched from wrist-mounted weapon platforms.</description>
+		<statBases>
+			<MaxHitPoints>150</MaxHitPoints>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoOuterRimMiniRocket</li>
+		</thingCategories>
+		<stackLimit>25</stackLimit>
+		<cookOffFlashScale>40</cookOffFlashScale>
+		<cookOffSound>MortarBomb_Explode</cookOffSound>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="OR_MiniRocketBase">
+		<defName>Ammo_OR_MiniRocket_Standard</defName>
+		<label>standard minirocket</label>
+		<graphicData>
+			<texPath>ThirdParty/StarWars/Ammo/OR_MiniRocket</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>24</MarketValue>
+			<Mass>1.25</Mass>
+			<Bulk>3</Bulk>
+		</statBases>
+		<ammoClass>SWRocketPlasma</ammoClass>
+		<detonateProjectile>Bullet_OR_WristRocket</detonateProjectile>
+	</ThingDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_OuterRimMiniRockets</defName>
+		<label>antipersonnel rockets</label>
+		<ammoTypes>
+			<Ammo_OR_MiniRocket_Standard>Bullet_OR_WristRocket</Ammo_OR_MiniRocket_Standard>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef ParentName="BaseBulletCE">
+		<defName>Bullet_OR_WristRocket</defName>
+		<label>wrist rocket</label>
+		<graphicData>
+			<texPath>OuterRim/Projectile/Proj_MicroMissile</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>75</damageAmountBase>
+			<armorPenetrationSharp>60</armorPenetrationSharp>
+			<armorPenetrationBlunt>39.494</armorPenetrationBlunt>
+			<speed>50</speed>
+			<soundAmbient>RocketPropelledLoop_Small</soundAmbient>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>25</damageAmountBase>
+				<explosiveDamageType>Thermobaric</explosiveDamageType>
+				<explosiveRadius>3</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_ProjectileFleck">
+				<FleckDatas>
+					<li>
+						<fleck>Fleck_CERocketFlame</fleck>
+						<emissionsPerTick>7</emissionsPerTick>
+						<flecksPerEmission>3</flecksPerEmission>
+						<scale>1</scale>
+						<cutoffTickRange>25~30</cutoffTickRange>
+						<originOffset>0.4</originOffset>
+					</li>
+					<li>
+						<fleck>Fleck_CERocketSmokeTrail</fleck>
+						<emissionsPerTick>2</emissionsPerTick>
+						<rotation>0~360</rotation>
+						<flecksPerEmission>1</flecksPerEmission>
+					</li>
+					<li>
+						<fleck>Fleck_CERocketSmoke</fleck>
+						<emissionsPerTick>2</emissionsPerTick>
+						<rotation>0~360</rotation>
+						<flecksPerEmission>2</flecksPerEmission>
+						<cutoffTickRange>25~60</cutoffTickRange>
+					</li>
+				</FleckDatas>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBulletCE">
+		<defName>Bullet_OR_KnockoutDart</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/Proj_Dart</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Tranquilizer</damageDef>
+			<damageAmountBase>3</damageAmountBase>
+			<armorPenetrationBlunt>3</armorPenetrationBlunt>
+			<armorPenetrationSharp>22</armorPenetrationSharp>
+			<speed>90</speed>
+		</projectile>
+	</ThingDef>
+	
+	<!-- ==================== RPS6/HH ========================== -->
+	
+	<ThingCategoryDef>
+		<defName>AmmoOuterRimRocket</defName>
+		<label>RPS-6 Rockets</label>
+		<parent>AmmoRockets</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRocket</iconPath>
+	</ThingCategoryDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_OuterRimRockets</defName>
+		<label>RPS-6 Rockets</label>
+		<ammoTypes>
+			<Ammo_RPS6_HEDP>Bullet_RPS6_HEDP</Ammo_RPS6_HEDP>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="RPS6RocketBase" ParentName="MediumAmmoBase" Abstract="True">
+		<description>A powerful rocket first used in the Galactic Republic's RPS-6. Old caches have been repurposed by the Rebel Alliance for use in the HH-12 launcher. The dual-purpose missile is lethal to both vehicles and infantry alike.</description>
+		<statBases>
+			<MaxHitPoints>150</MaxHitPoints>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoOuterRimRocket</li>
+		</thingCategories>
+		<stackLimit>25</stackLimit>
+		<cookOffFlashScale>40</cookOffFlashScale>
+		<cookOffSound>MortarBomb_Explode</cookOffSound>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="RPS6RocketBase">
+		<defName>Ammo_RPS6_HEDP</defName>
+		<label>RPS-6 rocket</label>
+		<graphicData>
+			<texPath>ThirdParty/StarWars/Ammo/OR_RPS6</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>63.92</MarketValue>
+			<Mass>6.3</Mass>
+			<Bulk>17.91</Bulk>
+		</statBases>
+		<ammoClass>SWRocketPlasma</ammoClass>
+		<detonateProjectile>Bullet_RPS6_HEDP</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Name="BaseRPS6" ParentName="BaseExplosiveBullet" Abstract="true">
+		<graphicData>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>58</speed>
+			<soundAmbient>RocketPropelledLoop_Small</soundAmbient>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ProjectileFleck">
+				<FleckDatas>
+					<li>
+						<fleck>Fleck_CERocketFlame</fleck>
+						<emissionsPerTick>7</emissionsPerTick>
+						<flecksPerEmission>3</flecksPerEmission>
+						<scale>1</scale>
+						<cutoffTickRange>25~30</cutoffTickRange>
+						<originOffset>0.4</originOffset>
+					</li>
+					<li>
+						<fleck>Fleck_CERocketSmokeTrail</fleck>
+						<emissionsPerTick>2</emissionsPerTick>
+						<rotation>0~360</rotation>
+						<flecksPerEmission>1</flecksPerEmission>
+					</li>
+					<li>
+						<fleck>Fleck_CERocketSmoke</fleck>
+						<emissionsPerTick>2</emissionsPerTick>
+						<rotation>0~360</rotation>
+						<flecksPerEmission>2</flecksPerEmission>
+						<cutoffTickRange>25~60</cutoffTickRange>
+					</li>
+				</FleckDatas>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseRPS6">
+		<defName>Bullet_RPS6_HEDP</defName>
+		<label>RPS-6 Rocket</label>
+		<graphicData>
+			<texPath>OuterRim/Projectile/HH12Missile</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>248</damageAmountBase>
+			<armorPenetrationSharp>600</armorPenetrationSharp>
+			<armorPenetrationBlunt>39.494</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>132</damageAmountBase>
+				<explosiveDamageType>Thermobaric</explosiveDamageType>
+				<explosiveRadius>5</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="LauncherAmmoRecipeBase">
+		<defName>MakeAmmo_RPS6_HEDP</defName>
+		<label>make RPS-6/HH-12 rockets x5</label>
+		<description>Craft 5 RPS-6/HH-12 rockets.</description>
+		<jobString>Making RPS-6/HH-12 rockets.</jobString>
+		<workAmount>12000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>OuterRim_Durasteel</li>
+					</thingDefs>
+				</filter>
+				<count>64</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>OuterRim_Tibanna</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>OuterRim_ComponentHypertech</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>OuterRim_Durasteel</li>
+				<li>OuterRim_Tibanna</li>
+				<li>OuterRim_ComponentHypertech</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<recipeUsers Inherit="False">
+			<li>OuterRim_HypertechFabricator</li>
+		</recipeUsers>
+		<products>
+			<Ammo_RPS6_HEDP>5</Ammo_RPS6_HEDP>
+		</products>
+		<researchPrerequisite>OuterRim_HypertechFabrication</researchPrerequisite>
+	</RecipeDef>
+
+	<RecipeDef ParentName="LauncherAmmoRecipeBase">
+		<defName>MakeAmmo_OR_MiniRocket_Standard</defName>
+		<label>make mini-rockets x5</label>
+		<description>Craft 5 mini-rockets.</description>
+		<jobString>Making mini-rockets.</jobString>
+		<workAmount>7500</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>OuterRim_Durasteel</li>
+					</thingDefs>
+				</filter>
+				<count>32</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>OuterRim_Tibanna</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>OuterRim_ComponentHypertech</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>OuterRim_Durasteel</li>
+				<li>OuterRim_Tibanna</li>
+				<li>OuterRim_ComponentHypertech</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<recipeUsers Inherit="False">
+			<li>OuterRim_HypertechFabricator</li>
+		</recipeUsers>
+		<products>
+			<Ammo_OR_MiniRocket_Standard>5</Ammo_OR_MiniRocket_Standard>
+		</products>
+		<researchPrerequisite>OuterRim_HypertechFabrication</researchPrerequisite>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_PlasmaGasCartridge_Standard</defName>
+		<label>make Plasma Gas Cartridges x500</label>
+		<description>Craft 500 Standard Plasma Gas Cartridges.</description>
+		<jobString>Making Plasma Gas Cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>OuterRim_Durasteel</li>
+					</thingDefs>
+				</filter>
+				<count>30</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>OuterRim_Tibanna</li>
+					</thingDefs>
+				</filter>
+				<count>30</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>OuterRim_ComponentHypertech</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>OuterRim_Durasteel</li>
+				<li>OuterRim_Tibanna</li>
+				<li>OuterRim_ComponentHypertech</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<recipeUsers Inherit="False">
+			<li>OuterRim_HypertechFabricator</li>
+		</recipeUsers>
+		<products>
+			<Ammo_PlasmaGasCartridge_Standard>500</Ammo_PlasmaGasCartridge_Standard>
+		</products>
+		<researchPrerequisite>OuterRim_HypertechFabrication</researchPrerequisite>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_PlasmaGasCartridge_AP</defName>
+		<label>make Plasma Gas Cartridges (AP) x500</label>
+		<description>Craft 500 Plasma Gas Cartridges (AP).</description>
+		<jobString>Making Plasma Gas Cartridges (AP).</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>OuterRim_Durasteel</li>
+					</thingDefs>
+				</filter>
+				<count>45</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>OuterRim_Tibanna</li>
+					</thingDefs>
+				</filter>
+				<count>45</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>OuterRim_ComponentHypertech</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>OuterRim_Durasteel</li>
+				<li>OuterRim_Tibanna</li>
+				<li>OuterRim_ComponentHypertech</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<recipeUsers Inherit="False">
+			<li>OuterRim_HypertechFabricator</li>
+		</recipeUsers>
+		<products>
+			<Ammo_PlasmaGasCartridge_AP>500</Ammo_PlasmaGasCartridge_AP>
+		</products>
+		<researchPrerequisite>OuterRim_HypertechFabrication</researchPrerequisite>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_PlasmaGasCartridge_Ion</defName>
+		<label>make Plasma Gas Cartridges (Ion) x500</label>
+		<description>Craft 500 PlasmaGas Cartridges (Ion).</description>
+		<jobString>Making Plasma Gas Cartridges (Ion).</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>OuterRim_Durasteel</li>
+					</thingDefs>
+				</filter>
+				<count>30</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>OuterRim_Tibanna</li>
+					</thingDefs>
+				</filter>
+				<count>45</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>OuterRim_ComponentHypertech</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>OuterRim_Durasteel</li>
+				<li>OuterRim_Tibanna</li>
+				<li>OuterRim_ComponentHypertech</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<recipeUsers Inherit="False">
+			<li>OuterRim_HypertechFabricator</li>
+		</recipeUsers>
+		<products>
+			<Ammo_PlasmaGasCartridge_Ion>500</Ammo_PlasmaGasCartridge_Ion>
+		</products>
+		<researchPrerequisite>OuterRim_HypertechFabrication</researchPrerequisite>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_PlasmaGasCartridge_Stun</defName>
+		<label>make Plasma Gas Cartridges (Stun) x500</label>
+		<description>Craft 500 PlasmaGas Cartridges (Stun).</description>
+		<jobString>Making Plasma Gas Cartridges (Stun).</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>OuterRim_Durasteel</li>
+					</thingDefs>
+				</filter>
+				<count>30</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>OuterRim_Tibanna</li>
+					</thingDefs>
+				</filter>
+				<count>60</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>OuterRim_ComponentHypertech</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>OuterRim_Durasteel</li>
+				<li>OuterRim_Tibanna</li>
+				<li>OuterRim_ComponentHypertech</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<recipeUsers Inherit="False">
+			<li>OuterRim_HypertechFabricator</li>
+		</recipeUsers>
+		<products>
+			<Ammo_PlasmaGasCartridge_Stun>500</Ammo_PlasmaGasCartridge_Stun>
+		</products>
+		<researchPrerequisite>OuterRim_HypertechFabrication</researchPrerequisite>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_OuterRim_KnockoutDarts</defName>
+		<label>make knockout dart x5</label>
+		<description>Craft 5 knockout darts.</description>
+		<jobString>Making knockout darts.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>OuterRim_Durasteel</li>
+					</thingDefs>
+				</filter>
+				<count>30</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Neutroamine</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>OuterRim_ComponentHypertech</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>OuterRim_Durasteel</li>
+				<li>Neutroamine</li>
+				<li>OuterRim_ComponentHypertech</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<recipeUsers Inherit="False">
+			<li>OuterRim_HypertechFabricator</li>
+		</recipeUsers>
+		<products>
+			<Ammo_OuterRim_KnockoutDart>5</Ammo_OuterRim_KnockoutDart>
+		</products>
+		<researchPrerequisite>OuterRim_HypertechFabrication</researchPrerequisite>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_GrenadeRecipes.xml b/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_GrenadeRecipes.xml
new file mode 100644
index 0000000000..e6f382306e
--- /dev/null
+++ b/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_GrenadeRecipes.xml	
@@ -0,0 +1,342 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ========== New Recipes ========== -->
+
+<RecipeDef ParentName="GrenadeRecipeBase">
+	<defName>MakeORFragGrenade</defName>
+	<label>make frag detonators x10</label>
+	<description>Craft 10 frag detonators.</description>
+	<jobString>Making frag detonators.</jobString>
+	<researchPrerequisite>OuterRim_HypertechFabrication</researchPrerequisite>
+	<workAmount>3600</workAmount>
+	<ingredients>
+		<li>
+			<filter>
+				<thingDefs>
+					<li>OuterRim_Durasteel</li>
+				</thingDefs>
+			</filter>
+			<count>8</count>
+		</li>
+		<li>
+			<filter>
+				<thingDefs>
+					<li>OuterRim_Tibanna</li>
+				</thingDefs>
+			</filter>
+			<count>4</count>
+		</li>
+		<li>
+			<filter>
+				<thingDefs>
+					<li>ComponentIndustrial</li>
+				</thingDefs>
+			</filter>
+			<count>2</count>
+		</li>
+	</ingredients>
+	<fixedIngredientFilter>
+		<thingDefs>
+			<li>OuterRim_Durasteel</li>
+			<li>OuterRim_Tibanna</li>
+			<li>ComponentIndustrial</li>
+		</thingDefs>
+	</fixedIngredientFilter>
+	<products>
+		<OuterRim_FragGrenade>10</OuterRim_FragGrenade>
+	</products>
+	<recipeUsers Inherit="False">
+		<li>OuterRim_HypertechFabricator</li>
+	</recipeUsers>
+</RecipeDef>
+
+<RecipeDef ParentName="GrenadeRecipeBase">
+	<defName>MakeORCryoGrenade</defName>
+	<label>make cryoban detonators x10</label>
+	<description>Craft 10 cryoban detonators.</description>
+	<jobString>Making cryoban detonators.</jobString>
+	<researchPrerequisite>OuterRim_HypertechFabrication</researchPrerequisite>
+	<workAmount>3600</workAmount>
+	<ingredients>
+		<li>
+			<filter>
+				<thingDefs>
+					<li>OuterRim_Durasteel</li>
+				</thingDefs>
+			</filter>
+			<count>8</count>
+		</li>
+		<li>
+			<filter>
+				<thingDefs>
+					<li>OuterRim_Tibanna</li>
+				</thingDefs>
+			</filter>
+			<count>4</count>
+		</li>
+		<li>
+			<filter>
+				<thingDefs>
+					<li>ComponentIndustrial</li>
+				</thingDefs>
+			</filter>
+			<count>2</count>
+		</li>
+	</ingredients>
+	<fixedIngredientFilter>
+		<thingDefs>
+			<li>OuterRim_Durasteel</li>
+			<li>OuterRim_Tibanna</li>
+			<li>ComponentIndustrial</li>
+		</thingDefs>
+	</fixedIngredientFilter>
+	<products>
+		<OuterRim_CryoBanGrenade>10</OuterRim_CryoBanGrenade>
+	</products>
+	<recipeUsers Inherit="False">
+		<li>OuterRim_HypertechFabricator</li>
+	</recipeUsers>
+</RecipeDef>
+
+<RecipeDef ParentName="GrenadeRecipeBase">
+	<defName>MakeORIonGrenade</defName>
+	<label>make ion detonators x10</label>
+	<description>Craft 10 ion detonators.</description>
+	<jobString>Making ion detonators.</jobString>
+	<researchPrerequisite>OuterRim_HypertechFabrication</researchPrerequisite>
+	<workAmount>3600</workAmount>
+	<ingredients>
+		<li>
+			<filter>
+				<thingDefs>
+					<li>OuterRim_Durasteel</li>
+				</thingDefs>
+			</filter>
+			<count>8</count>
+		</li>
+		<li>
+			<filter>
+				<thingDefs>
+					<li>OuterRim_Tibanna</li>
+				</thingDefs>
+			</filter>
+			<count>4</count>
+		</li>
+		<li>
+			<filter>
+				<thingDefs>
+					<li>ComponentIndustrial</li>
+				</thingDefs>
+			</filter>
+			<count>2</count>
+		</li>
+	</ingredients>
+	<fixedIngredientFilter>
+		<thingDefs>
+			<li>OuterRim_Durasteel</li>
+			<li>OuterRim_Tibanna</li>
+			<li>ComponentIndustrial</li>
+		</thingDefs>
+	</fixedIngredientFilter>
+	<products>
+		<OuterRim_IonGrenade>10</OuterRim_IonGrenade>
+	</products>
+	<recipeUsers Inherit="False">
+		<li>OuterRim_HypertechFabricator</li>
+	</recipeUsers>
+</RecipeDef>
+
+<RecipeDef ParentName="GrenadeRecipeBase">
+	<defName>MakeORPlasmaGrenade</defName>
+	<label>make plasma detonators x10</label>
+	<description>Craft 10 plasma detonators.</description>
+	<jobString>Making plasma detonators.</jobString>
+	<researchPrerequisite>OuterRim_HypertechFabrication</researchPrerequisite>
+	<workAmount>3600</workAmount>
+	<ingredients>
+		<li>
+			<filter>
+				<thingDefs>
+					<li>OuterRim_Durasteel</li>
+				</thingDefs>
+			</filter>
+			<count>8</count>
+		</li>
+		<li>
+			<filter>
+				<thingDefs>
+					<li>OuterRim_Tibanna</li>
+				</thingDefs>
+			</filter>
+			<count>4</count>
+		</li>
+		<li>
+			<filter>
+				<thingDefs>
+					<li>ComponentIndustrial</li>
+				</thingDefs>
+			</filter>
+			<count>2</count>
+		</li>
+	</ingredients>
+	<fixedIngredientFilter>
+		<thingDefs>
+			<li>OuterRim_Durasteel</li>
+			<li>OuterRim_Tibanna</li>
+			<li>ComponentIndustrial</li>
+		</thingDefs>
+	</fixedIngredientFilter>
+	<products>
+		<OuterRim_PlasmaGrenade>10</OuterRim_PlasmaGrenade>
+	</products>
+	<recipeUsers Inherit="False">
+		<li>OuterRim_HypertechFabricator</li>
+	</recipeUsers>
+</RecipeDef>
+
+<RecipeDef ParentName="GrenadeRecipeBase">
+	<defName>MakeORSonicGrenade</defName>
+	<label>make sonic detonators x10</label>
+	<description>Craft 10 sonic detonators.</description>
+	<jobString>Making sonic detonators.</jobString>
+	<researchPrerequisite>OuterRim_HypertechFabrication</researchPrerequisite>
+	<workAmount>3600</workAmount>
+	<ingredients>
+		<li>
+			<filter>
+				<thingDefs>
+					<li>OuterRim_Durasteel</li>
+				</thingDefs>
+			</filter>
+			<count>8</count>
+		</li>
+		<li>
+			<filter>
+				<thingDefs>
+					<li>OuterRim_Tibanna</li>
+				</thingDefs>
+			</filter>
+			<count>4</count>
+		</li>
+		<li>
+			<filter>
+				<thingDefs>
+					<li>ComponentIndustrial</li>
+				</thingDefs>
+			</filter>
+			<count>2</count>
+		</li>
+	</ingredients>
+	<fixedIngredientFilter>
+		<thingDefs>
+			<li>OuterRim_Durasteel</li>
+			<li>OuterRim_Tibanna</li>
+			<li>ComponentIndustrial</li>
+		</thingDefs>
+	</fixedIngredientFilter>
+	<products>
+		<OuterRim_SonicGrenade>10</OuterRim_SonicGrenade>
+	</products>
+	<recipeUsers Inherit="False">
+		<li>OuterRim_HypertechFabricator</li>
+	</recipeUsers>
+</RecipeDef>
+
+<RecipeDef ParentName="GrenadeRecipeBase">
+	<defName>MakeORStunGrenade</defName>
+	<label>make stun detonators x10</label>
+	<description>Craft 10 stun detonators.</description>
+	<jobString>Making stun detonators.</jobString>
+	<researchPrerequisite>OuterRim_HypertechFabrication</researchPrerequisite>
+	<workAmount>3600</workAmount>
+	<ingredients>
+		<li>
+			<filter>
+				<thingDefs>
+					<li>OuterRim_Durasteel</li>
+				</thingDefs>
+			</filter>
+			<count>8</count>
+		</li>
+		<li>
+			<filter>
+				<thingDefs>
+					<li>OuterRim_Tibanna</li>
+				</thingDefs>
+			</filter>
+			<count>4</count>
+		</li>
+		<li>
+			<filter>
+				<thingDefs>
+					<li>ComponentIndustrial</li>
+				</thingDefs>
+			</filter>
+			<count>2</count>
+		</li>
+	</ingredients>
+	<fixedIngredientFilter>
+		<thingDefs>
+			<li>OuterRim_Durasteel</li>
+			<li>OuterRim_Tibanna</li>
+			<li>ComponentIndustrial</li>
+		</thingDefs>
+	</fixedIngredientFilter>
+	<products>
+		<OuterRim_StunGrenade>10</OuterRim_StunGrenade>
+	</products>
+	<recipeUsers Inherit="False">
+		<li>OuterRim_HypertechFabricator</li>
+	</recipeUsers>
+</RecipeDef>
+
+<RecipeDef ParentName="GrenadeRecipeBase">
+	<defName>MakeORThermalGrenade</defName>
+	<label>make thermal detonators x5</label>
+	<description>Craft 5 thermal detonators.</description>
+	<jobString>Making thermal detonators.</jobString>
+	<researchPrerequisite>OuterRim_HypertechFabrication</researchPrerequisite>
+	<workAmount>3600</workAmount>
+	<ingredients>
+		<li>
+			<filter>
+				<thingDefs>
+					<li>OuterRim_Durasteel</li>
+				</thingDefs>
+			</filter>
+			<count>8</count>
+		</li>
+		<li>
+			<filter>
+				<thingDefs>
+					<li>OuterRim_Tibanna</li>
+				</thingDefs>
+			</filter>
+			<count>4</count>
+		</li>
+		<li>
+			<filter>
+				<thingDefs>
+					<li>OuterRim_ComponentHypertech</li>
+				</thingDefs>
+			</filter>
+			<count>2</count>
+		</li>
+	</ingredients>
+	<fixedIngredientFilter>
+		<thingDefs>
+			<li>OuterRim_Durasteel</li>
+			<li>OuterRim_Tibanna</li>
+			<li>OuterRim_ComponentHypertech</li>
+		</thingDefs>
+	</fixedIngredientFilter>
+	<products>
+		<OuterRim_ThermalDetonator>5</OuterRim_ThermalDetonator>
+	</products>
+	<recipeUsers Inherit="False">
+		<li>OuterRim_HypertechFabricator</li>
+	</recipeUsers>
+</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_TurretAmmo.xml b/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_TurretAmmo.xml
new file mode 100644
index 0000000000..6f662b9b8d
--- /dev/null
+++ b/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_TurretAmmo.xml	
@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingDef Name="BaseBlasterTurretBolt" ParentName="BaseBulletCE" Abstract="true">
+		<label>blaster cannon bolt</label>
+		<graphicData>
+			<texPath>Things/Projectile/Charged/ChargeShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>OuterRim_Blaster</damageDef>
+			<speed>122</speed>
+			<dropsCasings>false</dropsCasings>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Name="BaseBlasterTurretBolt_TurretSmall" ParentName="BaseBlasterTurretBolt" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Charged/ChargeShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>18</damageAmountBase>
+			<armorPenetrationBlunt>3</armorPenetrationBlunt>
+			<armorPenetrationSharp>22</armorPenetrationSharp>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Name="BaseBlasterTurretBolt_TurretMedium" ParentName="BaseBlasterTurretBolt" Abstract="true">
+		<label>laser cannon bolt</label>
+		<graphicData>
+			<texPath>Things/Projectile/Charged/ChargeShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>36</damageAmountBase>
+			<armorPenetrationBlunt>6</armorPenetrationBlunt>
+			<armorPenetrationSharp>44</armorPenetrationSharp>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Name="BaseBlasterTurretBolt_TurretLarge" ParentName="BaseBlasterTurretBolt" Abstract="true">
+		<label>turbolaser bolt</label>
+		<graphicData>
+			<texPath>Things/Projectile/Charged/ChargeShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>64</damageAmountBase>
+			<armorPenetrationBlunt>12</armorPenetrationBlunt>
+			<armorPenetrationSharp>88</armorPenetrationSharp>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterTurretBolt_TurretSmall">
+		<defName>Bullet_BlasterTurretSmall_Red</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Red</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterTurretBolt_TurretSmall">
+		<defName>Bullet_BlasterTurretSmall_Green</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Green</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterTurretBolt_TurretSmall">
+		<defName>Bullet_BlasterTurretSmall_Yellow</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Yellow</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterTurretBolt_TurretSmall">
+		<defName>Bullet_BlasterTurretSmall_Ion</defName>
+		<label>blaster cannon ion bolt</label>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Blue</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>EMP</damageDef>
+			<empShieldBreakChance>0.33</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterTurretBolt_TurretMedium">
+		<defName>Bullet_BlasterTurretMedium_Red</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Red</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterTurretBolt_TurretMedium">
+		<defName>Bullet_BlasterTurretMedium_Green</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Green</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterTurretBolt_TurretMedium">
+		<defName>Bullet_BlasterTurretMedium_Yellow</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Yellow</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterTurretBolt_TurretMedium">
+		<defName>Bullet_BlasterTurretMedium_Ion</defName>
+		<label>laser cannon ion bolt</label>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Blue</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>EMP</damageDef>
+			<empShieldBreakChance>0.33</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterTurretBolt_TurretLarge">
+		<defName>Bullet_BlasterTurretLarge_Red</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Red</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterTurretBolt_TurretLarge">
+		<defName>Bullet_BlasterTurretLarge_Green</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Green</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterTurretBolt_TurretLarge">
+		<defName>Bullet_BlasterTurretLarge_Yellow</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Yellow</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterTurretBolt_TurretLarge">
+		<defName>Bullet_BlasterTurretLarge_Ion</defName>
+		<label>turbolaser ion bolt</label>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Blue</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>EMP</damageDef>
+			<empShieldBreakChance>0.8</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseExplosiveBullet">
+    							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<defName>Bullet_OR_ProtonMortar</defName>
+		<label>proton ball</label>
+		<graphicData>
+			<texPath>OuterRim/Projectile/ProtonBall</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>156</damageAmountBase>
+			<speed>0</speed>
+			<gravityFactor>5</gravityFactor>
+			<explosionRadius>5.9</explosionRadius>
+			<flyOverhead>true</flyOverhead>
+			<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+			<soundAmbient>MortarRound_Ambient</soundAmbient>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseExplosiveBullet">
+    							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<defName>Bullet_OR_ProtonArtillery</defName>
+		<label>proton ball</label>
+		<graphicData>
+			<texPath>OuterRim/Projectile/ProtonBall</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>450</damageAmountBase>
+			<speed>0</speed>
+			<gravityFactor>5</gravityFactor>
+			<explosionRadius>7.9</explosionRadius>
+			<flyOverhead>true</flyOverhead>
+			<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+			<soundAmbient>MortarRound_Ambient</soundAmbient>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Apparel.xml b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Apparel.xml
new file mode 100644
index 0000000000..d78cf4676e
--- /dev/null
+++ b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Apparel.xml	
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="OuterRim_UniformBodyFabricatedBase"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="OuterRim_UniformBodyFabricatedBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="OuterRim_UniformBodyFabricatedBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="OuterRim_UniformBodyFabricatedBase"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<ToxicEnvironmentResistance>0.25</ToxicEnvironmentResistance>
+				<CarryBulk>10</CarryBulk>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="OuterRim_UniformHeadwearFabricatedBase"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="OuterRim_UniformHeadwearFabricatedBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="OuterRim_UniformHeadwearFabricatedBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Armour.xml b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Armour.xml
new file mode 100644
index 0000000000..f0dfc80e54
--- /dev/null
+++ b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Armour.xml	
@@ -0,0 +1,296 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="OuterRim_ArmorFabricatedBase"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>80</Bulk>
+				<WornBulk>15</WornBulk>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="OuterRim_ArmorFabricatedBase"]/equippedStatOffsets</xpath>
+		<value>
+			<ToxicEnvironmentResistance>0.25</ToxicEnvironmentResistance>
+			<CarryBulk>25</CarryBulk>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="OuterRim_ArmorFabricatedBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="OuterRim_HelmetFabricatedBase"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>4</Bulk>
+				<WornBulk>2</WornBulk>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="OuterRim_HelmetFabricatedBase"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+			<ToxicEnvironmentResistance>0.25</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="OuterRim_HelmetFabricatedBase"]/apparel/layers</xpath>
+		<value>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="OuterRim_PauldronsFabricatedBase"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>6</Bulk>
+				<WornBulk>3</WornBulk>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="OuterRim_PauldronsFabricatedBase"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<ToxicEnvironmentResistance>0.25</ToxicEnvironmentResistance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="OuterRim_PauldronsFabricatedBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="OuterRim_LightArmorFabricatedBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="OuterRim_LightArmorFabricatedBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>22</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="OuterRim_LightArmorFabricatedBase"]/statBases/ArmorRating_Heat</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="OuterRim_LightHelmetFabricatedBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="OuterRim_LightHelmetFabricatedBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>22</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="OuterRim_LightHelmetFabricatedBase"]/statBases/ArmorRating_Heat</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="OuterRim_LightPauldronsFabricatedBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="OuterRim_LightPauldronsFabricatedBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>22</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="OuterRim_LightPauldronsFabricatedBase"]/statBases/ArmorRating_Heat</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="OuterRim_MediumArmorFabricatedBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="OuterRim_MediumArmorFabricatedBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>32</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="OuterRim_MediumArmorFabricatedBase"]/statBases/ArmorRating_Heat</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="OuterRim_MediumHelmetFabricatedBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="OuterRim_MediumHelmetFabricatedBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>32</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="OuterRim_MediumHelmetFabricatedBase"]/statBases/ArmorRating_Heat</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="OuterRim_MediumPauldronsFabricatedBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="OuterRim_MediumPauldronsFabricatedBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>32</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="OuterRim_MediumPauldronsFabricatedBase"]/statBases/ArmorRating_Heat</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="OuterRim_HeavyArmorFabricatedBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="OuterRim_HeavyArmorFabricatedBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>48</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="OuterRim_HeavyArmorFabricatedBase"]/statBases/ArmorRating_Heat</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="OuterRim_HeavyHelmetFabricatedBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="OuterRim_HeavyHelmetFabricatedBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>48</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="OuterRim_HeavyHelmetFabricatedBase"]/statBases/ArmorRating_Heat</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="OuterRim_HeavyPauldronsFabricatedBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="OuterRim_HeavyPauldronsFabricatedBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>48</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="OuterRim_HeavyPauldronsFabricatedBase"]/statBases/ArmorRating_Heat</xpath>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Grenades.xml b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Grenades.xml
new file mode 100644
index 0000000000..63417244f0
--- /dev/null
+++ b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Grenades.xml	
@@ -0,0 +1,994 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Kill recipe makers ========== -->
+
+<Operation Class="PatchOperationAttributeSet">
+	<xpath>Defs/ThingDef[defName="OuterRim_FragGrenade" or defName="OuterRim_CryoBanGrenade" or defName="OuterRim_IonGrenade" or defName="OuterRim_PlasmaGrenade" or defName="OuterRim_SonicGrenade" or defName="OuterRim_StunGrenade" or defName="OuterRim_ThermalDetonator"]</xpath>
+	<attribute>ParentName</attribute>
+	<value>BaseWeapon</value>
+</Operation>
+
+<!-- ========== Melee tools ========== -->
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="OuterRim_FragGrenade" or defName="OuterRim_CryoBanGrenade" or defName="OuterRim_IonGrenade" or defName="OuterRim_PlasmaGrenade" or defName="OuterRim_SonicGrenade" or defName="OuterRim_StunGrenade" or defName="OuterRim_ThermalDetonator"]</xpath>
+	<value>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>Body</label>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<power>2</power>
+				<cooldownTime>1.75</cooldownTime>
+				<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
+			</li>
+		</tools>
+		<tradeTags Inherit="False">
+			<li>CE_MediumAmmo</li>
+		</tradeTags>
+		<allowedArchonexusCount>5</allowedArchonexusCount>
+	</value>
+</Operation>
+
+<!-- ========== Frag Grenade ========== -->
+
+<!-- Projectile -->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_FragGrenadeProj" or defName="OuterRim_CryoBanGrenadeProj" or defName="OuterRim_IonGrenadeProj" or defName="OuterRim_PlasmaGrenadeProj" or defName="OuterRim_SonicGrenadeProj" or defName="OuterRim_StunGrenadeProj" or defName="OuterRim_ThermalDetProj"]/thingClass</xpath>
+	<value>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_FragGrenade"]/description</xpath>
+	<value>
+		<description>A lightweight but powerful fragmentation grenade, releasing a deadly storm of flechettes on detonation.</description>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_CryoBanGrenade"]/description</xpath>
+	<value>
+		<description>A lightweight but powerful explosive, releasing a cloud of supercooled cryoban to freeze opponents solid. Does little direct damage by itself.</description>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_IonGrenade"]/description</xpath>
+	<value>
+		<description>A lightweight but powerful pulse detonator, burning out its internal components to release an electromagnetic shockwave that can disable or even damage droids.</description>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_PlasmaGrenade"]/description</xpath>
+	<value>
+		<description>A lightweight but powerful plasma detonator, releasing a burst of superheated gas to inflict tremendous burns on anyone nearby.</description>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_SonicGrenade"]/description</xpath>
+	<value>
+		<description>A lightweight but powerful sonic generator, burning out its internal components to release a shockwave that causes blunt force trauma to all in the radius.</description>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_StunGrenade"]/description</xpath>
+	<value>
+		<description>A lightweight but nonlethal detonator, emitting a bright flash and loud sound to stun targets, useful when attempting to take someone in alive and unharmed.</description>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_ThermalDetonator"]/description</xpath>
+	<value>
+		<description>A lightweight but tremendously powerful explosive, capable of inflicting terrible harm on anything caught in its area of effect.</description>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_FragGrenadeProj"]/graphicData</xpath>
+	<value>
+		<graphicData>
+			<texPath>ThirdParty/StarWars/Projectile/OR_FragGrenade</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_CryoBanGrenadeProj"]/graphicData</xpath>
+	<value>
+		<graphicData>
+			<texPath>ThirdParty/StarWars/Projectile/OR_CryoBanGrenade</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_IonGrenadeProj"]/graphicData</xpath>
+	<value>
+		<graphicData>
+			<texPath>ThirdParty/StarWars/Projectile/OR_IonGrenade</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_PlasmaGrenadeProj"]/graphicData</xpath>
+	<value>
+		<graphicData>
+			<texPath>ThirdParty/StarWars/Projectile/OR_PlasmaGrenade</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_SonicGrenadeProj"]/graphicData</xpath>
+	<value>
+		<graphicData>
+			<texPath>ThirdParty/StarWars/Projectile/OR_SonicGrenade</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_StunGrenadeProj"]/graphicData</xpath>
+	<value>
+		<graphicData>
+			<texPath>ThirdParty/StarWars/Projectile/OR_StunGrenade</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_ThermalDetProj"]/graphicData</xpath>
+	<value>
+		<graphicData>
+			<texPath>ThirdParty/StarWars/Projectile/OR_ThermalDetonator</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_FragGrenadeProj"]/projectile</xpath>
+	<value>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>1.5</explosionRadius>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>56</damageAmountBase>
+			<explosionDelay>60</explosionDelay>
+			<dropsCasings>false</dropsCasings>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<speed>12</speed>
+			<suppressionFactor>3.0</suppressionFactor>
+			<dangerFactor>2.0</dangerFactor>
+			<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
+		</projectile>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_CryoBanGrenadeProj"]/projectile</xpath>
+	<value>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>3.5</explosionRadius>
+			<damageDef>OuterRim_CryoBan</damageDef>
+			<explosionDelay>60</explosionDelay>
+			<dropsCasings>false</dropsCasings>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<speed>12</speed>
+			<suppressionFactor>3.0</suppressionFactor>
+			<dangerFactor>2.0</dangerFactor>
+			<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
+		</projectile>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_IonGrenadeProj"]/projectile</xpath>
+	<value>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>3.5</explosionRadius>
+			<damageDef>OuterRim_Ion</damageDef>
+			<damageAmountBase>56</damageAmountBase>
+			<explosionDelay>60</explosionDelay>
+			<dropsCasings>false</dropsCasings>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<speed>12</speed>
+			<suppressionFactor>3.0</suppressionFactor>
+			<dangerFactor>2.0</dangerFactor>
+			<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
+		</projectile>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_PlasmaGrenadeProj"]/projectile</xpath>
+	<value>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>3.5</explosionRadius>
+			<damageDef>Flame</damageDef>
+			<damageAmountBase>56</damageAmountBase>
+			<explosionDelay>60</explosionDelay>
+			<dropsCasings>false</dropsCasings>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<speed>12</speed>
+			<suppressionFactor>3.0</suppressionFactor>
+			<dangerFactor>2.0</dangerFactor>
+			<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
+		</projectile>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_SonicGrenadeProj"]/projectile</xpath>
+	<value>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>3.5</explosionRadius>
+			<damageDef>OuterRim_Sonic</damageDef>
+			<damageAmountBase>56</damageAmountBase>
+			<explosionDelay>60</explosionDelay>
+			<dropsCasings>false</dropsCasings>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<speed>12</speed>
+			<suppressionFactor>3.0</suppressionFactor>
+			<dangerFactor>2.0</dangerFactor>
+			<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
+		</projectile>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_StunGrenadeProj"]/projectile</xpath>
+	<value>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>3.5</explosionRadius>
+			<damageDef>Stun</damageDef>
+			<explosionDelay>60</explosionDelay>
+			<dropsCasings>false</dropsCasings>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<speed>12</speed>
+			<suppressionFactor>3.0</suppressionFactor>
+			<dangerFactor>2.0</dangerFactor>
+			<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
+		</projectile>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_ThermalDetProj"]/projectile</xpath>
+	<value>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>3.5</explosionRadius>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>200</damageAmountBase>
+			<explosionDelay>120</explosionDelay>
+			<dropsCasings>false</dropsCasings>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<speed>12</speed>
+			<suppressionFactor>3.0</suppressionFactor>
+			<dangerFactor>2.0</dangerFactor>
+			<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
+		</projectile>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationConditional">
+	<xpath>Defs/ThingDef[defName="OuterRim_FragGrenadeProj"]/comps</xpath>
+	<nomatch Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_FragGrenadeProj"]</xpath>
+		<value>
+			<comps/>
+		</value>
+	</nomatch>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="OuterRim_FragGrenadeProj"]/comps</xpath>
+	<value>
+		<li Class="CombatExtended.CompProperties_Fragments">
+			<fragments>
+				<Fragment_Small>50</Fragment_Small>
+			</fragments>
+		</li>
+	</value>
+</Operation>
+
+<!-- Grenade -->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_FragGrenade"]/label</xpath>
+	<value>
+		<label>frag detonator</label>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_CryoBanGrenade"]/label</xpath>
+	<value>
+		<label>cryoban detonator</label>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_IonGrenade"]/label</xpath>
+	<value>
+		<label>ion detonator</label>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_PlasmaGrenade"]/label</xpath>
+	<value>
+		<label>plasma detonator</label>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_SonicGrenade"]/label</xpath>
+	<value>
+		<label>sonic detonator</label>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_StunGrenade"]/label</xpath>
+	<value>
+		<label>stun detonator</label>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_ThermalDetonator"]/label</xpath>
+	<value>
+		<label>thermal detonator</label>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_FragGrenade"]/graphicData</xpath>
+	<value>
+		<graphicData>
+			<texPath>OuterRim/Items/FragGrenade</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
+		</graphicData>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_CryoBanGrenade"]/graphicData</xpath>
+	<value>
+		<graphicData>
+			<texPath>OuterRim/Items/CryoBanGrenade</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
+		</graphicData>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_IonGrenade"]/graphicData</xpath>
+	<value>
+		<graphicData>
+			<texPath>OuterRim/Items/IonGrenade</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
+		</graphicData>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_PlasmaGrenade"]/graphicData</xpath>
+	<value>
+		<graphicData>
+			<texPath>OuterRim/Items/PlasmaGrenade</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
+		</graphicData>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_SonicGrenade"]/graphicData</xpath>
+	<value>
+		<graphicData>
+			<texPath>OuterRim/Items/SonicGrenade</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
+		</graphicData>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_StunGrenade"]/graphicData</xpath>
+	<value>
+		<graphicData>
+			<texPath>OuterRim/Items/StunGrenade</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
+		</graphicData>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_ThermalDetonator"]/graphicData</xpath>
+	<value>
+		<graphicData>
+			<texPath>OuterRim/Items/ThermalDetonator</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
+		</graphicData>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="OuterRim_FragGrenade" or defName="OuterRim_CryoBanGrenade" or defName="OuterRim_IonGrenade" or defName="OuterRim_PlasmaGrenade" or defName="OuterRim_SonicGrenade" or defName="OuterRim_StunGrenade" or defName="OuterRim_ThermalDetonator"]</xpath>
+	<value>
+		<thingClass>CombatExtended.AmmoThing</thingClass>
+		<stackLimit>75</stackLimit>
+		<resourceReadoutPriority>First</resourceReadoutPriority>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAttributeSet">
+	<xpath>Defs/ThingDef[defName="OuterRim_FragGrenade" or defName="OuterRim_CryoBanGrenade" or defName="OuterRim_IonGrenade" or defName="OuterRim_PlasmaGrenade" or defName="OuterRim_SonicGrenade" or defName="OuterRim_StunGrenade" or defName="OuterRim_ThermalDetonator"]</xpath>
+	<attribute>Class</attribute>
+	<value>CombatExtended.AmmoDef</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_FragGrenade"]/comps</xpath>
+	<value>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>56</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1.5</explosiveRadius>
+			</li>
+		</comps>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="OuterRim_FragGrenade"]/comps</xpath>
+	<value>
+		<li Class="CombatExtended.CompProperties_Fragments">
+			<fragments>
+				<Fragment_Small>50</Fragment_Small>
+			</fragments>
+		</li>
+	</value>
+</Operation>
+
+<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>OuterRim_FragGrenade</defName>
+	<statBases>
+		<Mass>0.4</Mass>
+		<Bulk>0.87</Bulk>
+		<MarketValue>11.22</MarketValue>
+		<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		<SightsEfficiency>1.0</SightsEfficiency>
+	</statBases>
+	<Properties>
+		<label>throw frag detonator</label>
+		<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+		<hasStandardCommand>true</hasStandardCommand>
+		<range>10.0</range>
+		<minRange>4</minRange>
+		<warmupTime>0.8</warmupTime>
+		<noiseRadius>4</noiseRadius>
+		<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+		<soundCast>ThrowGrenade</soundCast>
+		<targetParams>
+			<canTargetLocations>true</canTargetLocations>
+		</targetParams>
+		<defaultProjectile>OuterRim_FragGrenadeProj</defaultProjectile>
+		<onlyManualCast>true</onlyManualCast>
+		<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		<ai_AvoidFriendlyFireRadius>7</ai_AvoidFriendlyFireRadius>
+	</Properties>
+	<weaponTags>
+		<li>CE_AI_Grenade</li>
+		<li>CE_AI_AOE</li>
+		<li>CE_OneHandedWeapon</li>
+	</weaponTags>
+</Operation>
+
+<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>OuterRim_CryoBanGrenade</defName>
+	<statBases>
+		<Mass>0.4</Mass>
+		<Bulk>0.87</Bulk>
+		<MarketValue>11.22</MarketValue>
+		<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		<SightsEfficiency>1.0</SightsEfficiency>
+	</statBases>
+	<Properties>
+		<label>throw cryoban detonator</label>
+		<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+		<hasStandardCommand>true</hasStandardCommand>
+		<range>10.0</range>
+		<minRange>4</minRange>
+		<warmupTime>0.8</warmupTime>
+		<noiseRadius>4</noiseRadius>
+		<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+		<soundCast>ThrowGrenade</soundCast>
+		<targetParams>
+			<canTargetLocations>true</canTargetLocations>
+		</targetParams>
+		<defaultProjectile>OuterRim_CryoBanGrenadeProj</defaultProjectile>
+		<onlyManualCast>true</onlyManualCast>
+		<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		<ai_AvoidFriendlyFireRadius>7</ai_AvoidFriendlyFireRadius>
+	</Properties>
+	<weaponTags>
+		<li>CE_AI_Grenade</li>
+		<li>CE_AI_AOE</li>
+		<li>CE_OneHandedWeapon</li>
+    					<li>CE_GrenadeFlashbang</li>
+	</weaponTags>
+</Operation>
+
+<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>OuterRim_IonGrenade</defName>
+	<statBases>
+		<Mass>0.4</Mass>
+		<Bulk>0.87</Bulk>
+		<MarketValue>11.22</MarketValue>
+		<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		<SightsEfficiency>1.0</SightsEfficiency>
+	</statBases>
+	<Properties>
+		<label>throw ion detonator</label>
+		<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+		<hasStandardCommand>true</hasStandardCommand>
+		<range>10.0</range>
+		<minRange>4</minRange>
+		<warmupTime>0.8</warmupTime>
+		<noiseRadius>4</noiseRadius>
+		<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+		<soundCast>ThrowGrenade</soundCast>
+		<targetParams>
+			<canTargetLocations>true</canTargetLocations>
+		</targetParams>
+		<defaultProjectile>OuterRim_IonGrenadeProj</defaultProjectile>
+		<onlyManualCast>true</onlyManualCast>
+		<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		<ai_AvoidFriendlyFireRadius>7</ai_AvoidFriendlyFireRadius>
+	</Properties>
+	<weaponTags>
+		<li>CE_AI_Grenade</li>
+		<li>CE_AI_AOE</li>
+		<li>CE_OneHandedWeapon</li>
+	</weaponTags>
+</Operation>
+
+<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>OuterRim_PlasmaGrenade</defName>
+	<statBases>
+		<Mass>0.4</Mass>
+		<Bulk>0.87</Bulk>
+		<MarketValue>11.22</MarketValue>
+		<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		<SightsEfficiency>1.0</SightsEfficiency>
+	</statBases>
+	<Properties>
+		<label>throw plasma detonator</label>
+		<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+		<hasStandardCommand>true</hasStandardCommand>
+		<range>10.0</range>
+		<minRange>4</minRange>
+		<warmupTime>0.8</warmupTime>
+		<noiseRadius>4</noiseRadius>
+		<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+		<soundCast>ThrowGrenade</soundCast>
+		<targetParams>
+			<canTargetLocations>true</canTargetLocations>
+		</targetParams>
+		<defaultProjectile>OuterRim_PlasmaGrenadeProj</defaultProjectile>
+		<onlyManualCast>true</onlyManualCast>
+		<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		<ai_AvoidFriendlyFireRadius>7</ai_AvoidFriendlyFireRadius>
+	</Properties>
+	<weaponTags>
+		<li>CE_AI_Grenade</li>
+		<li>CE_AI_AOE</li>
+		<li>CE_OneHandedWeapon</li>
+	</weaponTags>
+</Operation>
+
+<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>OuterRim_SonicGrenade</defName>
+	<statBases>
+		<Mass>0.4</Mass>
+		<Bulk>0.87</Bulk>
+		<MarketValue>11.22</MarketValue>
+		<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		<SightsEfficiency>1.0</SightsEfficiency>
+	</statBases>
+	<Properties>
+		<label>throw sonic detonator</label>
+		<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+		<hasStandardCommand>true</hasStandardCommand>
+		<range>10.0</range>
+		<minRange>4</minRange>
+		<warmupTime>0.8</warmupTime>
+		<noiseRadius>4</noiseRadius>
+		<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+		<soundCast>ThrowGrenade</soundCast>
+		<targetParams>
+			<canTargetLocations>true</canTargetLocations>
+		</targetParams>
+		<defaultProjectile>OuterRim_SonicGrenadeProj</defaultProjectile>
+		<onlyManualCast>true</onlyManualCast>
+		<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		<ai_AvoidFriendlyFireRadius>7</ai_AvoidFriendlyFireRadius>
+	</Properties>
+	<weaponTags>
+		<li>CE_AI_Grenade</li>
+		<li>CE_AI_AOE</li>
+		<li>CE_OneHandedWeapon</li>
+	</weaponTags>
+</Operation>
+
+<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>OuterRim_StunGrenade</defName>
+	<statBases>
+		<Mass>0.4</Mass>
+		<Bulk>0.87</Bulk>
+		<MarketValue>11.22</MarketValue>
+		<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		<SightsEfficiency>1.0</SightsEfficiency>
+	</statBases>
+	<Properties>
+		<label>throw stun detonator</label>
+		<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+		<hasStandardCommand>true</hasStandardCommand>
+		<range>10.0</range>
+		<minRange>4</minRange>
+		<warmupTime>0.8</warmupTime>
+		<noiseRadius>4</noiseRadius>
+		<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+		<soundCast>ThrowGrenade</soundCast>
+		<targetParams>
+			<canTargetLocations>true</canTargetLocations>
+		</targetParams>
+		<defaultProjectile>OuterRim_StunGrenadeProj</defaultProjectile>
+		<onlyManualCast>true</onlyManualCast>
+		<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		<ai_AvoidFriendlyFireRadius>7</ai_AvoidFriendlyFireRadius>
+	</Properties>
+	<weaponTags>
+		<li>CE_AI_Grenade</li>
+		<li>CE_AI_AOE</li>
+		<li>CE_OneHandedWeapon</li>
+    					<li>CE_GrenadeFlashbang</li>
+	</weaponTags>
+</Operation>
+
+<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>OuterRim_ThermalDetonator</defName>
+	<statBases>
+		<Mass>0.4</Mass>
+		<Bulk>0.87</Bulk>
+		<MarketValue>11.22</MarketValue>
+		<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		<SightsEfficiency>1.0</SightsEfficiency>
+	</statBases>
+	<Properties>
+		<label>throw thermal detonator</label>
+		<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+		<hasStandardCommand>true</hasStandardCommand>
+		<range>10.0</range>
+		<minRange>4</minRange>
+		<warmupTime>0.8</warmupTime>
+		<noiseRadius>4</noiseRadius>
+		<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+		<soundCast>ThrowGrenade</soundCast>
+		<targetParams>
+			<canTargetLocations>true</canTargetLocations>
+		</targetParams>
+		<defaultProjectile>OuterRim_ThermalDetProj</defaultProjectile>
+		<onlyManualCast>true</onlyManualCast>
+		<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		<ai_AvoidFriendlyFireRadius>7</ai_AvoidFriendlyFireRadius>
+	</Properties>
+	<weaponTags>
+		<li>CE_AI_Grenade</li>
+		<li>CE_AI_AOE</li>
+		<li>CE_OneHandedWeapon</li>
+	</weaponTags>
+</Operation>
+
+<!-- Grenade Costs -->
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_FragGrenadeBelt"]/costList</xpath>
+	<value>
+		<costList>
+			<OuterRim_FragGrenade>5</OuterRim_FragGrenade>
+		</costList>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_CryoBanGrenadeBelt"]/costList</xpath>
+	<value>
+		<costList>
+			<OuterRim_CryoBanGrenade>5</OuterRim_CryoBanGrenade>
+		</costList>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_IonGrenadeBelt"]/costList</xpath>
+	<value>
+		<costList>
+			<OuterRim_IonGrenade>5</OuterRim_IonGrenade>
+		</costList>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_PlasmaGrenadeBelt"]/costList</xpath>
+	<value>
+		<costList>
+			<OuterRim_PlasmaGrenade>5</OuterRim_PlasmaGrenade>
+		</costList>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_SonicGrenadeBelt"]/costList</xpath>
+	<value>
+		<costList>
+			<OuterRim_SonicGrenade>5</OuterRim_SonicGrenade>
+		</costList>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_StunGrenadeBelt"]/costList</xpath>
+	<value>
+		<costList>
+			<OuterRim_StunGrenade>5</OuterRim_StunGrenade>
+		</costList>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_ThermalDetonatorBelt"]/costList</xpath>
+	<value>
+		<costList>
+			<OuterRim_ThermalDetonator>5</OuterRim_ThermalDetonator>
+		</costList>
+	</value>
+</Operation>
+
+<!-- Reload Logic -->
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_FragGrenadeBelt" or defName="OuterRim_CryoBanGrenadeBelt" or defName="OuterRim_IonGrenadeBelt" or defName="OuterRim_PlasmaGrenadeBelt" or defName="OuterRim_SonicGrenadeBelt" or defName="OuterRim_StunGrenadeBelt" or defName="OuterRim_ThermalDetonatorBelt"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountToRefill</xpath>
+	<value>
+		<ammoCountPerCharge>1</ammoCountPerCharge>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_FragGrenadeBelt" or defName="OuterRim_CryoBanGrenadeBelt" or defName="OuterRim_IonGrenadeBelt" or defName="OuterRim_PlasmaGrenadeBelt" or defName="OuterRim_SonicGrenadeBelt" or defName="OuterRim_StunGrenadeBelt" or defName="OuterRim_ThermalDetonatorBelt"]/comps/li[@Class="CompProperties_Reloadable"]/chargeNoun</xpath>
+	<value>
+		<chargeNoun>grenade</chargeNoun>
+	</value>
+</Operation>
+<!-- Grenade Verbs -->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_FragGrenadeBelt"]/verbs</xpath>
+	<value>
+		<verbs>
+			<li Class="CombatExtended.VerbPropertiesCE">
+				<label>throw frag detonator</label>
+				<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
+				<hasStandardCommand>true</hasStandardCommand>
+				<onlyManualCast>True</onlyManualCast>
+				<warmupTime>0.8</warmupTime>
+				<range>10</range>
+				<minRange>3</minRange>
+				<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+				<soundCast>ThrowGrenade</soundCast>
+				<soundCastTail>GunTail_Medium</soundCastTail>
+				<muzzleFlashScale>0</muzzleFlashScale>
+				<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
+				<targetParams>
+					<canTargetLocations>true</canTargetLocations>
+				</targetParams>
+				<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+				<defaultProjectile>OuterRim_FragGrenadeProj</defaultProjectile>
+				<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
+			</li>
+		</verbs>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_CryoBanGrenadeBelt"]/verbs</xpath>
+	<value>
+		<verbs>
+			<li Class="CombatExtended.VerbPropertiesCE">
+				<label>throw cryoban detonator</label>
+				<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
+				<hasStandardCommand>true</hasStandardCommand>
+				<onlyManualCast>True</onlyManualCast>
+				<warmupTime>0.8</warmupTime>
+				<range>10</range>
+				<minRange>3</minRange>
+				<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+				<soundCast>ThrowGrenade</soundCast>
+				<soundCastTail>GunTail_Medium</soundCastTail>
+				<muzzleFlashScale>0</muzzleFlashScale>
+				<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
+				<targetParams>
+					<canTargetLocations>true</canTargetLocations>
+				</targetParams>
+				<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+				<defaultProjectile>OuterRim_CryoBanGrenadeProj</defaultProjectile>
+				<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
+			</li>
+		</verbs>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_IonGrenadeBelt"]/verbs</xpath>
+	<value>
+		<verbs>
+			<li Class="CombatExtended.VerbPropertiesCE">
+				<label>throw ion detonator</label>
+				<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
+				<hasStandardCommand>true</hasStandardCommand>
+				<onlyManualCast>True</onlyManualCast>
+				<warmupTime>0.8</warmupTime>
+				<range>10</range>
+				<minRange>3</minRange>
+				<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+				<soundCast>ThrowGrenade</soundCast>
+				<soundCastTail>GunTail_Medium</soundCastTail>
+				<muzzleFlashScale>0</muzzleFlashScale>
+				<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
+				<targetParams>
+					<canTargetLocations>true</canTargetLocations>
+				</targetParams>
+				<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+				<defaultProjectile>OuterRim_IonGrenadeProj</defaultProjectile>
+				<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
+			</li>
+		</verbs>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_PlasmaGrenadeBelt"]/verbs</xpath>
+	<value>
+		<verbs>
+			<li Class="CombatExtended.VerbPropertiesCE">
+				<label>throw plasma detonator</label>
+				<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
+				<hasStandardCommand>true</hasStandardCommand>
+				<onlyManualCast>True</onlyManualCast>
+				<warmupTime>0.8</warmupTime>
+				<range>10</range>
+				<minRange>3</minRange>
+				<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+				<soundCast>ThrowGrenade</soundCast>
+				<soundCastTail>GunTail_Medium</soundCastTail>
+				<muzzleFlashScale>0</muzzleFlashScale>
+				<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
+				<targetParams>
+					<canTargetLocations>true</canTargetLocations>
+				</targetParams>
+				<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+				<defaultProjectile>OuterRim_PlasmaGrenadeProj</defaultProjectile>
+				<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
+			</li>
+		</verbs>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_SonicGrenadeBelt"]/verbs</xpath>
+	<value>
+		<verbs>
+			<li Class="CombatExtended.VerbPropertiesCE">
+				<label>throw sonic detonator</label>
+				<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
+				<hasStandardCommand>true</hasStandardCommand>
+				<onlyManualCast>True</onlyManualCast>
+				<warmupTime>0.8</warmupTime>
+				<range>10</range>
+				<minRange>3</minRange>
+				<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+				<soundCast>ThrowGrenade</soundCast>
+				<soundCastTail>GunTail_Medium</soundCastTail>
+				<muzzleFlashScale>0</muzzleFlashScale>
+				<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
+				<targetParams>
+					<canTargetLocations>true</canTargetLocations>
+				</targetParams>
+				<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+				<defaultProjectile>OuterRim_SonicGrenadeProj</defaultProjectile>
+				<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
+			</li>
+		</verbs>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_StunGrenadeBelt"]/verbs</xpath>
+	<value>
+		<verbs>
+			<li Class="CombatExtended.VerbPropertiesCE">
+				<label>throw stun detonator</label>
+				<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
+				<hasStandardCommand>true</hasStandardCommand>
+				<onlyManualCast>True</onlyManualCast>
+				<warmupTime>0.8</warmupTime>
+				<range>10</range>
+				<minRange>3</minRange>
+				<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+				<soundCast>ThrowGrenade</soundCast>
+				<soundCastTail>GunTail_Medium</soundCastTail>
+				<muzzleFlashScale>0</muzzleFlashScale>
+				<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
+				<targetParams>
+					<canTargetLocations>true</canTargetLocations>
+				</targetParams>
+				<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+				<defaultProjectile>OuterRim_StunGrenadeProj</defaultProjectile>
+				<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
+			</li>
+		</verbs>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="OuterRim_ThermalDetonatorBelt"]/verbs</xpath>
+	<value>
+		<verbs>
+			<li Class="CombatExtended.VerbPropertiesCE">
+				<label>throw thermal detonator</label>
+				<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
+				<hasStandardCommand>true</hasStandardCommand>
+				<onlyManualCast>True</onlyManualCast>
+				<warmupTime>0.8</warmupTime>
+				<range>10</range>
+				<minRange>3</minRange>
+				<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+				<soundCast>ThrowGrenade</soundCast>
+				<soundCastTail>GunTail_Medium</soundCastTail>
+				<muzzleFlashScale>0</muzzleFlashScale>
+				<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
+				<targetParams>
+					<canTargetLocations>true</canTargetLocations>
+				</targetParams>
+				<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+				<defaultProjectile>OuterRim_ThermalDetProj</defaultProjectile>
+				<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
+			</li>
+		</verbs>
+	</value>
+</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Jetpacks.xml b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Jetpacks.xml
new file mode 100644
index 0000000000..5a836c0211
--- /dev/null
+++ b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Jetpacks.xml	
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="OuterRim_JetpackBase"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>3</WornBulk>
+			<JumpRange>30</JumpRange>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="OuterRim_JetpackBase"]/equippedStatOffsets</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="OuterRim_JetpackBase"]</xpath>
+		<value>
+			<verbs>
+				<li>
+					<verbClass>Verb_Jump</verbClass>
+					<label>jump</label>
+					<violent>false</violent>
+					<hasStandardCommand>true</hasStandardCommand>
+					<onlyManualCast>True</onlyManualCast>
+					<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+					<warmupTime>0.5</warmupTime>
+					<warmupEffecter>JumpWarmupEffect</warmupEffecter>
+					<requireLineOfSight>true</requireLineOfSight>
+					<flightEffecterDef>JumpFlightEffect</flightEffecterDef>
+					<soundLanding>JumpPackLand</soundLanding>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+						<canTargetPawns>false</canTargetPawns>
+						<canTargetBuildings>false</canTargetBuildings>
+					</targetParams>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CompProperties_Reloadable">
+					<maxCharges>8</maxCharges>
+					<ammoDef>Chemfuel</ammoDef>
+					<ammoCountPerCharge>10</ammoCountPerCharge>
+					<baseReloadTicks>60</baseReloadTicks>
+					<soundReload>Standard_Reload</soundReload>
+					<hotKey>Misc4</hotKey>
+					<chargeNoun>jump</chargeNoun>
+					<displayGizmoWhileUndrafted>false</displayGizmoWhileUndrafted>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="OuterRim_JT12Jetpack" or defName="OuterRim_IndustrialJetpack" or defName="OuterRim_MakeshiftJetpack"]/comps</xpath>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Materials.xml b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Materials.xml
new file mode 100644
index 0000000000..d2de6bc249
--- /dev/null
+++ b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Materials.xml	
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- general adjustments -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="OuterRimMetal"]/stuffProps/categories</xpath>
+		<value>
+			<li>Metallic_Weapon</li>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="OuterRimMetal"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>0.03</Bulk>
+			</statBases>
+		</value>
+	</Operation>
+	
+	<!-- fabrics -->
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_Durafiber"]/statBases</xpath>
+		<value>
+			<Bulk>0.05</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_Durafiber"]/statBases</xpath>
+		<value>
+			<WornBulk>0.25</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_Durafiber"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>0.9</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_Durafiber"]/stuffProps</xpath>
+		<value>
+			<categories>
+				<li>SoftArmor</li>
+			</categories>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_Durafiber"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.6</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_Durafiber"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.12</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_Durafiber"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.1</StuffPower_Armor_Heat>
+			<StuffPower_Armor_Electric>0.05</StuffPower_Armor_Electric>
+		</value>
+	</Operation>
+	
+	<!-- metals -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="OuterRim_Durasteel"]/statBases/StuffPower_Armor_Heat</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="OuterRim_Beskar"]/statBases/StuffPower_Armor_Heat</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="OuterRim_PureBeskar"]/statBases/StuffPower_Armor_Heat</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_Durasteel"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.5</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_Durasteel"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>2.5</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_Durasteel"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>1.1</MeleePenetrationFactor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_Beskar"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>2</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_Beskar"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>3</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_Beskar"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>1.15</MeleePenetrationFactor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_PureBeskar"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>2.2</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_PureBeskar"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>3.5</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_PureBeskar"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>1.3</MeleePenetrationFactor>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Melee_Weapons.xml b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Melee_Weapons.xml
new file mode 100644
index 0000000000..2c60633639
--- /dev/null
+++ b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Melee_Weapons.xml	
@@ -0,0 +1,398 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_GaderffiiStick"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.84</cooldownTime>
+					<armorPenetrationBlunt>1.54</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>3.5</cooldownTime>
+					<armorPenetrationBlunt>0.956</armorPenetrationBlunt>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_GaderffiiStick"]/statBases</xpath>
+		<value>
+			<Bulk>5.5</Bulk>
+			<MeleeCounterParryBonus>1.5</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_GaderffiiStick"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.25</MeleeCritChance>
+				<MeleeParryChance>1.45</MeleeParryChance>
+				<MeleeDodgeChance>0.6</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_VibroAxe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<chanceFactor>0.1</chanceFactor>
+					<cooldownTime>1.66</cooldownTime>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>2.47</cooldownTime>
+					<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
+					<armorPenetrationSharp>18</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_VibroAxe"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.2</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_VibroAxe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.75</MeleeCritChance>
+				<MeleeParryChance>0.2</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_VibroBlade"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<chanceFactor>0.1</chanceFactor>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>0.83</cooldownTime>
+					<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
+					<armorPenetrationSharp>18</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>0.94</cooldownTime>
+					<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
+					<armorPenetrationSharp>25</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_VibroBlade"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_VibroBlade"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.0</MeleeCritChance>
+				<MeleeParryChance>0.4</MeleeParryChance>
+				<MeleeDodgeChance>0.27</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_VibroBlade"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_VibroCleaver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<chanceFactor>0.1</chanceFactor>
+					<cooldownTime>1.66</cooldownTime>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.97</cooldownTime>
+					<armorPenetrationBlunt>4.69</armorPenetrationBlunt>
+					<armorPenetrationSharp>15</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_VibroCleaver"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_VibroCleaver"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.5</MeleeCritChance>
+				<MeleeParryChance>0.2</MeleeParryChance>
+				<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_VibroCleaver"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_VibroDagger"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>16</power>
+					<chanceFactor>0.1</chanceFactor>
+					<cooldownTime>1</cooldownTime>
+					<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>0.83</cooldownTime>
+					<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
+					<armorPenetrationSharp>12</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>15</power>
+					<chanceFactor>0.4</chanceFactor>
+					<cooldownTime>0.75</cooldownTime>
+					<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
+					<armorPenetrationSharp>30</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_VibroDagger"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<MeleeCounterParryBonus>0.25</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_VibroDagger"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.25</MeleeCritChance>
+				<MeleeParryChance>0.1</MeleeParryChance>
+				<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_VibroDagger"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_VibroDoubleBlade"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>0.46</cooldownTime>
+					<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
+					<armorPenetrationSharp>18</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>0.47</cooldownTime>
+					<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
+					<armorPenetrationSharp>25</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_VibroDoubleBlade"]/statBases</xpath>
+		<value>
+			<Bulk>8.5</Bulk>
+			<MeleeCounterParryBonus>0.8</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_VibroDoubleBlade"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.00</MeleeCritChance>
+				<MeleeParryChance>0.1</MeleeParryChance>
+				<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_VibroGlaive"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<chanceFactor>0.1</chanceFactor>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>46</power>
+					<cooldownTime>1.85</cooldownTime>
+					<armorPenetrationBlunt>4.32</armorPenetrationBlunt>
+					<armorPenetrationSharp>18</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.64</cooldownTime>
+					<armorPenetrationBlunt>1.92</armorPenetrationBlunt>
+					<armorPenetrationSharp>25</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_VibroGlaive"]/statBases</xpath>
+		<value>
+			<Bulk>8.5</Bulk>
+			<MeleeCounterParryBonus>0.75</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_VibroGlaive"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.0</MeleeCritChance>
+				<MeleeParryChance>1.25</MeleeParryChance>
+				<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Mines.xml b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Mines.xml
new file mode 100644
index 0000000000..e6cafcf92d
--- /dev/null
+++ b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Mines.xml	
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_Mine_Frag"]/comps/li[@Class="CompProperties_Explosive"]</xpath>
+		<value>
+			<li Class="CompProperties_Explosive">
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<damageAmountBase>320</damageAmountBase>
+				<explosiveRadius>4.9</explosiveRadius>
+				<startWickOnDamageTaken>
+					<li>Bullet</li>
+					<li>Arrow</li>
+					<li>ArrowHighVelocity</li>
+				</startWickOnDamageTaken>
+				<wickTicks>6</wickTicks>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>32</Fragment_Large>
+					<Fragment_Small>80</Fragment_Small>
+				</fragments>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_Mine_Ion"]/description</xpath>
+		<value>
+			<description>A powerful mine designed to release a large electromagnetic pulse when triggered. Whilst harmless to unaugmented organics, it can temporarily stun cyborgs, mechanoids, droids, and other mechanical entities. Particularly weak mechanoids might be destroyed outright.</description>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_Mine_Ion"]/comps/li[@Class="CompProperties_Explosive"]</xpath>
+		<value>
+			<li Class="CompProperties_Explosive">
+				<explosiveRadius>9.9</explosiveRadius>
+				<explosiveDamageType>EMP</explosiveDamageType>
+				<startWickHitPointsPercent>0.2</startWickHitPointsPercent>
+				<wickTicks>6</wickTicks>
+				<startWickOnDamageTaken>
+					<li>Bullet</li>
+					<li>Arrow</li>
+					<li>ArrowHighVelocity</li>
+				</startWickOnDamageTaken>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Pawnkinds.xml b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Pawnkinds.xml
new file mode 100644
index 0000000000..a419ae1f8f
--- /dev/null
+++ b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Pawnkinds.xml	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="OuterRim_SettlerBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="OuterRim_MercenaryBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="OuterRim_PirateBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Ranged_Weapons.xml b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Ranged_Weapons.xml
new file mode 100644
index 0000000000..bc2d392096
--- /dev/null
+++ b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Ranged_Weapons.xml	
@@ -0,0 +1,537 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="OuterRim_Blaster"]/armorCategory</xpath>
+		<value>
+			<armorCategory>Sharp</armorCategory>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			@Name="OuterRimBlasterBase_Pistol" or
+			@Name="OuterRimBlasterBase_Rifle" or
+			@Name="OuterRimBlasterBase_SniperRifle" or
+			@Name="OuterRimBlasterBase_HeavyWeapon"
+			]/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="PatchOperationRemove">
+			<xpath>Defs/ThingDef[@Name="OuterRimBlasterBase_Pistol"]/statBases/AccuracyTouch
+				| Defs/ThingDef[@Name="OuterRimBlasterBase_Pistol"]/statBases/AccuracyShort
+				| Defs/ThingDef[@Name="OuterRimBlasterBase_Pistol"]/statBases/AccuracyMedium
+				| Defs/ThingDef[@Name="OuterRimBlasterBase_Pistol"]/statBases/AccuracyLong </xpath>
+	</Operation>
+					
+	<Operation Class="PatchOperationRemove">
+			<xpath>Defs/ThingDef[@Name="OuterRimBlasterBase_Rifle"]/statBases/AccuracyTouch
+				| Defs/ThingDef[@Name="OuterRimBlasterBase_Rifle"]/statBases/AccuracyShort
+				| Defs/ThingDef[@Name="OuterRimBlasterBase_Rifle"]/statBases/AccuracyMedium
+				| Defs/ThingDef[@Name="OuterRimBlasterBase_Rifle"]/statBases/AccuracyLong </xpath>
+	</Operation>
+					
+	<Operation Class="PatchOperationRemove">
+			<xpath>Defs/ThingDef[@Name="OuterRimBlasterBase_SniperRifle"]/statBases/AccuracyTouch
+				| Defs/ThingDef[@Name="OuterRimBlasterBase_SniperRifle"]/statBases/AccuracyShort
+				| Defs/ThingDef[@Name="OuterRimBlasterBase_SniperRifle"]/statBases/AccuracyMedium
+				| Defs/ThingDef[@Name="OuterRimBlasterBase_SniperRifle"]/statBases/AccuracyLong </xpath>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_AB75BoRifle</defName>
+		<statBases>
+			<Mass>3.0</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.20</SwayFactor>
+			<Bulk>7.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.45</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterRifle_Red</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>55</range>
+			<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+			<burstShotCount>3</burstShotCount>
+			<soundCast>OuterRim_Shot_AB75BoRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>60</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Rifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_BARMST12Scattergun"]/description</xpath>
+		<value>
+			<description>The BARM-ST12 scattergun was a type of pump-action scatterblaster, the blaster equivalent of a shotgun. It lacks the ability to make use of concentrated or ionized blaster cells, but can fire a spread of micro-blasts that are almost as powerful as individual pistol bolts - at the cost of consuming a lot of energy (and tibanna) to do so.</description>
+		</value>
+	</Operation>
+	
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_BARMST12Scattergun</defName>
+		<statBases>
+			<Mass>4.35</Mass>
+			<Bulk>6.0</Bulk>
+			<SwayFactor>1.25</SwayFactor>
+			<ShotSpread>0.14</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>3.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterBolt_Scatter</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>20</range>
+			<soundCast>OuterRim_Shot_DLT19DBlasterBolt</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<ammoConsumedPerShotCount>4</ammoConsumedPerShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridge_Scatter</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_DE10Blaster</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.05</SwayFactor>
+			<Bulk>2.60</Bulk>
+			<Mass>1.50</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>3.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterPistol_Yellow</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>12</range>
+			<soundCast>OuterRim_Shot_MediumBlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>24</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeYellow_Pistol</ammoSet>
+		</AmmoUser>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_DG29Blaster"]/description</xpath>
+		<value>
+			<description>The DG-29 heavy blaster pistol, also known as the DG-29 sideloader, is a model of heavy blaster pistol produced by BlasTech Industries. Whilst it cannot fire as quickly as other blaster pistols, it has better range and packs a punch comparable to a full-scale rifle in a smaller package.</description>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_DG29Blaster</defName>
+		<statBases>
+			<SightsEfficiency>0.9</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.07</SwayFactor>
+			<Bulk>3.10</Bulk>
+			<Mass>1.80</Mass>
+			<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>4.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterRifle_Red</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>16</range>
+			<soundCast>OuterRim_Shot_MediumBlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>22</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Rifle</ammoSet>
+		</AmmoUser>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_K16BryarBlaster</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.07</SwayFactor>
+			<Bulk>2.60</Bulk>
+			<Mass>1.50</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>3.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterPistol_Yellow</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>12</range>
+			<soundCast>OuterRim_Shot_MediumBlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>24</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeYellow_Pistol</ammoSet>
+		</AmmoUser>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_IonRifle</defName>
+		<statBases>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.2</SwayFactor>
+			<Bulk>3.00</Bulk>
+			<Mass>4.10</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.45</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterRifle_Ion</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>55</range>
+			<soundCast>OuterRim_Shot_DLT19DBlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>3.7</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeIon_Rifle</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_HeavyIonRifle</defName>
+		<statBases>
+			<SightsEfficiency>1.8</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.8</SwayFactor>
+			<Bulk>3.00</Bulk>
+			<Mass>4.10</Mass>
+			<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.48</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterSniper_Ion</defaultProjectile>
+			<warmupTime>2</warmupTime>
+			<range>62</range>
+			<soundCast>OuterRim_Shot_DLT19DBlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>3.7</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeIon_Sniper</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_IonBlaster</defName>
+		<statBases>
+			<SightsEfficiency>0.95</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>0.75</SwayFactor>
+			<Bulk>3.00</Bulk>
+			<Mass>4.10</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterPistol_Ion</defaultProjectile>
+			<warmupTime>0.75</warmupTime>
+			<range>44</range>
+			<soundCast>OuterRim_Shot_DLT19DBlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>21</magazineSize>
+			<reloadTime>2.5</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeIon_Pistol</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_CyclerRifle</defName>
+		<statBases>
+			<SightsEfficiency>1.6</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.75</SwayFactor>
+			<Bulk>12</Bulk>
+			<Mass>7.5</Mass>
+			<RangedWeapon_Cooldown>1.05</RangedWeapon_Cooldown>
+		</statBases>
+		<weaponTags>
+		    <li>Bipod_DMR</li>
+		</weaponTags>
+		<Properties>
+			<recoilAmount>2.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_4570Gov_FMJ</defaultProjectile>
+			<warmupTime>1.8</warmupTime>
+			<range>75</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>1.5</reloadTime>
+			<ammoSet>AmmoSet_4570Gov</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_BlasterCarbine</defName>
+		<statBases>
+			<SightsEfficiency>0.95</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>0.75</SwayFactor>
+			<Bulk>5.30</Bulk>
+			<Mass>3.10</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterRifle_Red</defaultProjectile>
+			<warmupTime>0.75</warmupTime>
+			<range>44</range>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<burstShotCount>3</burstShotCount>
+			<soundCast>OuterRim_Shot_E11BlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>42</magazineSize>
+			<reloadTime>3.36</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Rifle</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_T21RepeatingBlaster</defName>
+		<statBases>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.3</SwayFactor>
+			<Bulk>13.25</Bulk>
+			<Mass>7.75</Mass>
+			<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.15</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterRifle_Red</defaultProjectile>
+			<warmupTime>1.25</warmupTime>
+			<range>62</range>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<burstShotCount>15</burstShotCount>
+			<soundCast>OuterRim_Shot_HeavyMinigunBlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>225</magazineSize>
+			<reloadTime>6.25</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Rifle</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_VSSBlasterCarbine"]/description</xpath>
+		<value>
+			<description>An oddly archaic-looking blaster carbine, favoured by the Pyke Syndicate. Whilst it lacks the rapid-fire capacity of other blaster rifles and carbines, it is precise and has respectable range, and comes with a high-quality optic.</description>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_VSSBlasterCarbine</defName>
+		<statBases>
+			<SightsEfficiency>1.8</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.8</SwayFactor>
+			<Bulk>6.5</Bulk>
+			<Mass>4.30</Mass>
+			<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
+			<NightVisionEfficiency_Weapon>0.4</NightVisionEfficiency_Weapon>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterRifle_Red</defaultProjectile>
+			<warmupTime>2.0</warmupTime>
+			<range>62</range>
+			<soundCast>OuterRim_Shot_E11BlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>44</magazineSize>
+			<reloadTime>3.7</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Rifle</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Turrets.xml b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Turrets.xml
new file mode 100644
index 0000000000..dec976cc6a
--- /dev/null
+++ b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Turrets.xml	
@@ -0,0 +1,548 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="OuterRim_TurretBase"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="OuterRim_TurretBase"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="OuterRim_LightLaserCannon_Coruscant" or defName="OuterRim_LightLaserCannon_Tatooine" or defName="OuterRim_LightLaserCannon_Corellia" or defName="OuterRim_LightIonCannon"]/placeWorkers</xpath>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_LightLaserCannon_Coruscant" or defName="OuterRim_LightLaserCannon_Tatooine" or defName="OuterRim_LightLaserCannon_Corellia" or defName="OuterRim_LightIonCannon"]</xpath>
+		<value>
+			<placeWorkers>
+				<li>PlaceWorker_ShowTurretRadius</li>
+			</placeWorkers>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_LightLaserCannon_Coruscant" or defName="OuterRim_LightLaserCannon_Tatooine" or defName="OuterRim_LightLaserCannon_Corellia"]/description</xpath>
+		<value>
+			<description>A mid-sized automatic blaster turret, small enough to be placed indoors. It runs on Tibanna and must be kept fueled. It may explode when damaged.</description>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_LightIonCannon"]/description</xpath>
+		<value>
+			<description>A mid-sized automatic blaster turret, small enough to be placed indoors. It fires ion bolts that are highly effective against electronics. It runs on Tibanna and must be kept fueled. It may explode when damaged.</description>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_MediumLaserCannon" or defName="OuterRim_Turbolaser" or defName="OuterRim_LightLaserCannon_Corellia" or defName="OuterRim_HeavyTurbolaser" or defName="OuterRim_HeavyLaserCannon" or defName="OuterRim_HeavyIonCannon" or defName="OuterRim_HeavyImperialTurbolaser"]/placeWorkers</xpath>
+		<value>
+			<li>PlaceWorker_ShowTurretRadius</li>
+		</value>
+	</Operation>
+	
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>OuterRim_Gun_LightLaserCannon_Coruscant</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>0.69</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.91</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterTurretSmall_Yellow</defaultProjectile>
+			<warmupTime>0</warmupTime>
+			<range>30</range>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<burstShotCount>4</burstShotCount>
+			<soundCast>OuterRim_Turret_Standard</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<consumeFuelPerShot>0.25</consumeFuelPerShot>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+	
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>OuterRim_Gun_LightLaserCannon_Corellia</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>0.69</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.91</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterTurretSmall_Red</defaultProjectile>
+			<warmupTime>0</warmupTime>
+			<range>30</range>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<burstShotCount>4</burstShotCount>
+			<soundCast>OuterRim_Turret_Standard</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<consumeFuelPerShot>0.25</consumeFuelPerShot>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+	
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>OuterRim_Gun_LightLaserCannon_Tatooine</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>0.69</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.91</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterTurretSmall_Green</defaultProjectile>
+			<warmupTime>0</warmupTime>
+			<range>30</range>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<burstShotCount>4</burstShotCount>
+			<soundCast>OuterRim_Turret_Standard</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<consumeFuelPerShot>0.25</consumeFuelPerShot>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+	
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>OuterRim_Gun_LightIonCannon</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>0.69</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.91</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterTurretSmall_Ion</defaultProjectile>
+			<warmupTime>0</warmupTime>
+			<range>30</range>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<burstShotCount>2</burstShotCount>
+			<soundCast>OuterRim_Turret_Standard</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<consumeFuelPerShot>0.5</consumeFuelPerShot>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+	
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>OuterRim_Gun_PTowerTurret</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>0.69</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.91</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterTurretLarge_Red</defaultProjectile>
+			<warmupTime>0</warmupTime>
+			<minRange>4</minRange>
+			<range>33</range>
+			<soundCast>OuterRim_Shot_ATTBlasterBolt</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<consumeFuelPerShot>1</consumeFuelPerShot>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+	
+	<!-- Medium Turrets -->
+	
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>OuterRim_Gun_MediumLaserCannon</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>0.69</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.91</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterTurretMedium_Yellow</defaultProjectile>
+			<warmupTime>0</warmupTime>
+			<minRange>6.9</minRange>
+			<range>40</range>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<burstShotCount>6</burstShotCount>
+			<soundCast>OuterRim_Shot_HeavyMinigunBlasterBolt</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<consumeFuelPerShot>0.3</consumeFuelPerShot>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+	
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>OuterRim_Gun_Turbolaser</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>0.69</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.91</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterTurretLarge_Green</defaultProjectile>
+			<warmupTime>0</warmupTime>
+			<minRange>6.9</minRange>
+			<range>39.9</range>
+			<ticksBetweenBurstShots>16</ticksBetweenBurstShots>
+			<burstShotCount>2</burstShotCount>
+			<soundCast>OuterRim_Turret_Turbolaser</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<consumeFuelPerShot>1</consumeFuelPerShot>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+	
+	<!-- Large Turrets -->
+	
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>OuterRim_Gun_HeavyTurbolaser</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>0.69</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.91</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterTurretLarge_Green</defaultProjectile>
+			<warmupTime>0</warmupTime>
+			<minRange>6.9</minRange>
+			<range>54.9</range>
+			<ticksBetweenBurstShots>16</ticksBetweenBurstShots>
+			<burstShotCount>2</burstShotCount>
+			<soundCast>OuterRim_Turret_Turbolaser</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<consumeFuelPerShot>1</consumeFuelPerShot>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+	
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>OuterRim_Gun_HeavyLaserCannon</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>0.69</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.91</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterTurretMedium_Yellow</defaultProjectile>
+			<warmupTime>0</warmupTime>
+			<minRange>6.9</minRange>
+			<range>51.9</range>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<burstShotCount>6</burstShotCount>
+			<soundCast>OuterRim_Shot_HeavyMinigunBlasterBolt</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<consumeFuelPerShot>0.5</consumeFuelPerShot>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+	
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>OuterRim_Gun_HeavyImperialTurbolaser</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>0.69</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.91</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterTurretLarge_Green</defaultProjectile>
+			<warmupTime>0</warmupTime>
+			<minRange>6.9</minRange>
+			<range>54.9</range>
+			<ticksBetweenBurstShots>16</ticksBetweenBurstShots>
+			<burstShotCount>2</burstShotCount>
+			<soundCast>OuterRim_Turret_Turbolaser</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<consumeFuelPerShot>1</consumeFuelPerShot>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+	
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>OuterRim_Gun_AnaxesTurret</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>0.69</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.91</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterTurretLarge_Red</defaultProjectile>
+			<warmupTime>0</warmupTime>
+			<minRange>2.9</minRange>
+			<range>32.9</range>
+			<ticksBetweenBurstShots>16</ticksBetweenBurstShots>
+			<burstShotCount>4</burstShotCount>
+			<soundCast>OuterRim_Turret_Turbolaser</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<consumeFuelPerShot>0.75</consumeFuelPerShot>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+	
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>OuterRim_Gun_HeavyIonCannon</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>0.69</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.91</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterTurretLarge_Ion</defaultProjectile>
+			<warmupTime>0</warmupTime>
+			<minRange>6.9</minRange>
+			<range>80</range>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<burstShotCount>2</burstShotCount>
+			<soundCast>OuterRim_Shot_ATTLightBlasterBolt</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<consumeFuelPerShot>1.5</consumeFuelPerShot>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+	
+	<!-- Proton Artillery Turrets -->
+	
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>OuterRim_Gun_ProtonMortar</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>0.69</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.91</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_OR_ProtonMortar</defaultProjectile>
+			<warmupTime>0</warmupTime>
+			<minRange>12.9</minRange>
+			<range>500</range>
+			<burstShotCount>1</burstShotCount>
+			<soundCast>OuterRim_Turret_ProtonTorpedo</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>16</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<consumeFuelPerShot>1</consumeFuelPerShot>
+			<requireLineOfSight>false</requireLineOfSight>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+	
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>OuterRim_Gun_ProtonArtillery</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>0.69</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.91</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_OR_ProtonArtillery</defaultProjectile>
+			<warmupTime>0</warmupTime>
+			<minRange>21.9</minRange>
+			<range>500</range>
+			<burstShotCount>1</burstShotCount>
+			<soundCast>OuterRim_Turret_ProtonTorpedo</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>32</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<consumeFuelPerShot>1</consumeFuelPerShot>
+			<requireLineOfSight>false</requireLineOfSight>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_Gun_ProtonMortar" or defName="OuterRim_Gun_ProtonArtillery"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>30</li>
+					<li>50</li>
+					<li>70</li>
+					<li>90</li>
+				</chargeSpeeds>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_Gun_ProtonMortar"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+					<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_OR_ProtonMortar</defaultProjectile>
+					<warmupTime>0</warmupTime>
+					<minRange>12.9</minRange>
+					<range>700</range>
+					<burstShotCount>1</burstShotCount>
+					<soundCast>OuterRim_Turret_ProtonTorpedo</soundCast>
+					<muzzleFlashScale>16</muzzleFlashScale>
+					<circularError>1</circularError>
+					<indirectFirePenalty>0.2</indirectFirePenalty>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_Gun_ProtonArtillery"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+					<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_OR_ProtonArtillery</defaultProjectile>
+					<warmupTime>0</warmupTime>
+					<minRange>32</minRange>
+					<range>700</range>
+					<burstShotCount>1</burstShotCount>
+					<soundCast>OuterRim_Turret_ProtonTorpedo</soundCast>
+					<muzzleFlashScale>32</muzzleFlashScale>
+					<circularError>1</circularError>
+					<indirectFirePenalty>0.2</indirectFirePenalty>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Vambraces.xml b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Vambraces.xml
new file mode 100644
index 0000000000..284b538608
--- /dev/null
+++ b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Vambraces.xml	
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--
+	<li Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="OuterRim_Vambrace_FlameProjector" or defName="OuterRim_Vambrace_KnockoutDart" or defName="OuterRim_Vambrace_Cryoban"]/comps</xpath>
+	</li>
+	-->
+	
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="OuterRim_Vambrace_KnockoutDart"]/comps</xpath>
+	</Operation>
+	
+	<!-- something about the default projectile's graphicdata setup means the icon for the added verb causes a NRE. the cryoban projector has this issue too.
+	<li Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_Vambrace_FlameProjector"]</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<label>incinerate</label>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<onlyManualCast>True</onlyManualCast>
+					<warmupTime>0.5</warmupTime>
+					<range>12.9</range>
+					<minRange>2</minRange>
+					<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+					<soundCast>OuterRim_Shot_FlameProjector</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
+					<targetParams>
+						<canTargetItems>true</canTargetItems>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+					<defaultProjectile>OuterRim_Bullet_FlameProjector</defaultProjectile>
+					<rangedFireRulepack>Combat_RangedFire</rangedFireRulepack>
+				</li>
+			</verbs>
+		</value>
+	</li>
+	
+	<li Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_Vambrace_FlameProjector"]</xpath>
+		<value>
+			<comps>
+				<li Class="CompProperties_Reloadable">
+					<maxCharges>5</maxCharges>
+					<ammoDef>Chemfuel</ammoDef>
+					<ammoCountPerCharge>10</ammoCountPerCharge>
+					<baseReloadTicks>60</baseReloadTicks>
+					<soundReload>Standard_Reload</soundReload>
+					<hotKey>Misc4</hotKey>
+					<chargeNoun>blast</chargeNoun>
+					<displayGizmoWhileUndrafted>false</displayGizmoWhileUndrafted>
+				</li>
+			</comps>
+		</value>
+	</li>
+	-->
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_Vambrace_KnockoutDart"]</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<label>fire knockout dart</label>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<onlyManualCast>True</onlyManualCast>
+					<warmupTime>0.5</warmupTime>
+					<range>16.9</range>
+					<minRange>1</minRange>
+					<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+					<soundCast>Shot_NeedleGun</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
+					<targetParams>
+						<canTargetLocations>false</canTargetLocations>
+					</targetParams>
+					<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+					<defaultProjectile>Bullet_OR_KnockoutDart</defaultProjectile>
+					<rangedFireRulepack>Combat_RangedFire</rangedFireRulepack>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_Vambrace_KnockoutDart"]</xpath>
+		<value>
+			<comps>
+				<li Class="CompProperties_Reloadable">
+					<maxCharges>5</maxCharges>
+					<ammoDef>Ammo_OuterRim_KnockoutDart</ammoDef>
+					<ammoCountPerCharge>1</ammoCountPerCharge>
+					<baseReloadTicks>60</baseReloadTicks>
+					<soundReload>Standard_Reload</soundReload>
+					<hotKey>Misc4</hotKey>
+					<chargeNoun>dart</chargeNoun>
+					<displayGizmoWhileUndrafted>false</displayGizmoWhileUndrafted>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+	
+	<!--
+	<li Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_Vambrace_Cryoban"]</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<label>carbon-freeze spray</label>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<onlyManualCast>True</onlyManualCast>
+					<warmupTime>0.5</warmupTime>
+					<range>12.9</range>
+					<minRange>2</minRange>
+					<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+					<soundCast>OuterRim_Shot_FlameProjector</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+					<defaultProjectile>OuterRim_Bullet_CryoBanProjector</defaultProjectile>
+					<rangedFireRulepack>Combat_RangedFire</rangedFireRulepack>
+				</li>
+			</verbs>
+		</value>
+	</li>
+
+	<li Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_Vambrace_Cryoban"]</xpath>
+		<value>
+			<comps>
+				<li Class="CompProperties_Reloadable">
+					<maxCharges>5</maxCharges>
+					<ammoDef>Neutroamine</ammoDef>
+					<ammoCountPerCharge>10</ammoCountPerCharge>
+					<baseReloadTicks>60</baseReloadTicks>
+					<soundReload>Standard_Reload</soundReload>
+					<hotKey>Misc4</hotKey>
+					<chargeNoun>blast</chargeNoun>
+					<displayGizmoWhileUndrafted>false</displayGizmoWhileUndrafted>
+				</li>
+			</comps>
+		</value>
+	</li>
+	-->
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_Armour.xml b/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_Armour.xml
new file mode 100644
index 0000000000..c9bf68ffa7
--- /dev/null
+++ b/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_Armour.xml	
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="DroidApparelCraftableBase"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_DroidArmorLight"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+			<ArmorRating_Blunt>13</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_DroidArmorLight"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_DroidArmorModule"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_DroidArmorModule"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_DroidArmorHeavy"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+			<ArmorRating_Blunt>33</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_DroidArmorHeavy"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>10</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_Droids.xml b/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_Droids.xml
new file mode 100644
index 0000000000..b5539c7b44
--- /dev/null
+++ b/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_Droids.xml	
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/Asimov.PawnDef[@Name="OuterRim_BaseHumanoidDroid"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/Asimov.PawnDef[@Name="OuterRim_BaseHumanoidDroid"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+		</value>
+	</Operation>
+	
+	<!-- give everyone the same basic tool set -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Asimov.PawnDef[defName="OuterRim_BattleDroid" or defName="OuterRim_BattleDroidAdvanced" or defName="OuterRim_MagnaGuardDroid" or defName="OuterRim_ProtocolDroid" or defName="OuterRim_CommandoDroid" or defName="OuterRim_HKDroid" or defName="OuterRim_ImperialLaborDroid" or defName="OuterRim_KXSecurityDroid" or defName="OuterRim_SuperTacticalDroid" or defName="OuterRim_TacticalDroid"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- except SBDs, who get a beefed up melee and no headbutt -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Asimov.PawnDef[defName="OuterRim_SuperBattleDroid"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>24</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>24</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/Asimov.PawnDef[@Name="OuterRim_BaseHumanoidDroid"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/Asimov.PawnDef[@Name="OuterRim_BaseHumanoidDroid"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/Asimov.PawnDef[@Name="OuterRim_BaseHumanoidDroid"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>500</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<!-- <Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>240</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>500</MaxOverHeal> -->
+				<MinArmorPct>0.75</MinArmorPct><!-- The default minimal armor percentage for all armor kinds. Will be overriden by any below -->
+				<!-- <MinArmorValueSharp>14</MinArmorValueSharp>
+				<MinArmorValueBlunt>30</MinArmorValueBlunt>
+				<MinArmorValueHeat>0.2</MinArmorValueHeat>
+				<MinArmorValueElectric>0.1</MinArmorValueElectric> -->
+			</li>
+			<!-- I didn't insert the suppressability comp for the base pawntype, because they're, well, droids -->
+			<li>
+				<compClass>CombatExtended.CompAmmoGiver</compClass>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Tactical Droids, on the other hand, are smart enough to take cover -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/Asimov.PawnDef[defName="OuterRim_TacticalDroid" or defName="OuterRim_SuperTacticalDroid"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_Jetpacks.xml b/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_Jetpacks.xml
new file mode 100644
index 0000000000..b9b29cabcb
--- /dev/null
+++ b/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_Jetpacks.xml	
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_DroidPropulsionJets"]/statBases</xpath>
+		<value>
+			<JumpRange>20</JumpRange>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="OuterRim_DroidPropulsionJets"]/equippedStatOffsets</xpath>
+	</Operation>
+	
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="OuterRim_DroidPropulsionJets"]/comps</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_DroidPropulsionJets"]</xpath>
+		<value>
+			<verbs>
+				<li>
+					<verbClass>Verb_Jump</verbClass>
+					<label>jet-jump</label>
+					<violent>false</violent>
+					<hasStandardCommand>true</hasStandardCommand>
+					<onlyManualCast>True</onlyManualCast>
+					<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+					<warmupTime>0.25</warmupTime>
+					<warmupEffecter>JumpWarmupEffect</warmupEffecter>
+					<requireLineOfSight>true</requireLineOfSight>
+					<flightEffecterDef>JumpFlightEffect</flightEffecterDef>
+					<soundLanding>JumpPackLand</soundLanding>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+						<canTargetPawns>false</canTargetPawns>
+						<canTargetBuildings>false</canTargetBuildings>
+					</targetParams>
+				</li>
+			</verbs>
+			<comps>
+				<li Class="CompProperties_Reloadable">
+					<maxCharges>10</maxCharges>
+					<ammoDef>Chemfuel</ammoDef>
+					<ammoCountPerCharge>5</ammoCountPerCharge>
+					<baseReloadTicks>60</baseReloadTicks>
+					<soundReload>Standard_Reload</soundReload>
+					<hotKey>Misc4</hotKey>
+					<chargeNoun>jet-jump</chargeNoun>
+					<displayGizmoWhileUndrafted>false</displayGizmoWhileUndrafted>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_MountedWeapons.xml b/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_MountedWeapons.xml
new file mode 100644
index 0000000000..419ee7425f
--- /dev/null
+++ b/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_MountedWeapons.xml	
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="OuterRim_DroidWeapon_WristRocket" or defName="OuterRim_DroidWeapon_WristBlasterIon" or defName="OuterRim_DroidWeapon_TwinWristBlaster" or defName="OuterRim_DroidWeapon_BlasterCannon" or defName="OuterRim_DroidWeapon_WristBlaster"]/comps</xpath>
+	</Operation>
+	
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="OuterRim_DroidWeapon_WristRocket" or defName="OuterRim_DroidWeapon_WristBlasterIon" or defName="OuterRim_DroidWeapon_TwinWristBlaster" or defName="OuterRim_DroidWeapon_BlasterCannon" or defName="OuterRim_DroidWeapon_WristBlaster"]/verbs</xpath>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_DroidWeapon_WristBlaster"]</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<label>wrist blaster</label>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<onlyManualCast>False</onlyManualCast>
+					<warmupTime>0.5</warmupTime>
+					<range>36</range>
+					<minRange>0</minRange>
+					<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+					<soundCast>OuterRim_Shot_BlasterBolt</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
+					<targetParams>
+						<canTargetItems>true</canTargetItems>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+					<defaultProjectile>Bullet_BlasterRifle_Red</defaultProjectile>
+					<rangedFireRulepack>Combat_RangedFire</rangedFireRulepack>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_DroidWeapon_WristBlaster"]</xpath>
+		<value>
+			<comps>
+				<li Class="CompProperties_Reloadable">
+					<maxCharges>100</maxCharges>
+					<ammoDef>Ammo_PlasmaGasCartridge_Standard</ammoDef>
+					<ammoCountPerCharge>2</ammoCountPerCharge>
+					<baseReloadTicks>60</baseReloadTicks>
+					<soundReload>Standard_Reload</soundReload>
+					<hotKey>Misc4</hotKey>
+					<chargeNoun>shot</chargeNoun>
+					<displayGizmoWhileUndrafted>false</displayGizmoWhileUndrafted>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_DroidWeapon_TwinWristBlaster"]</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<label>twin wrist blaster</label>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<onlyManualCast>False</onlyManualCast>
+					<warmupTime>0.5</warmupTime>
+					<range>32</range>
+					<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+					<burstShotCount>2</burstShotCount>
+					<minRange>0</minRange>
+					<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+					<soundCast>OuterRim_Shot_BlasterBolt</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
+					<targetParams>
+						<canTargetItems>true</canTargetItems>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+					<defaultProjectile>Bullet_BlasterRifle_Red</defaultProjectile>
+					<rangedFireRulepack>Combat_RangedFire</rangedFireRulepack>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_DroidWeapon_TwinWristBlaster"]</xpath>
+		<value>
+			<comps>
+				<li Class="CompProperties_Reloadable">
+					<maxCharges>100</maxCharges>
+					<ammoDef>Ammo_PlasmaGasCartridge_Standard</ammoDef>
+					<ammoCountPerCharge>2</ammoCountPerCharge>
+					<baseReloadTicks>60</baseReloadTicks>
+					<soundReload>Standard_Reload</soundReload>
+					<hotKey>Misc4</hotKey>
+					<chargeNoun>shot</chargeNoun>
+					<displayGizmoWhileUndrafted>false</displayGizmoWhileUndrafted>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_DroidWeapon_BlasterCannon"]</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<label>wrist blaster cannon</label>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<onlyManualCast>False</onlyManualCast>
+					<warmupTime>0.5</warmupTime>
+					<range>48</range>
+					<minRange>0</minRange>
+					<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+					<soundCast>OuterRim_Shot_HeavyMinigunBlasterBolt</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
+					<targetParams>
+						<canTargetItems>true</canTargetItems>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+					<defaultProjectile>Bullet_BlasterSniper_RedAP</defaultProjectile>
+					<rangedFireRulepack>Combat_RangedFire</rangedFireRulepack>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_DroidWeapon_BlasterCannon"]</xpath>
+		<value>
+			<comps>
+				<li Class="CompProperties_Reloadable">
+					<maxCharges>20</maxCharges>
+					<ammoDef>Ammo_PlasmaGasCartridge_AP</ammoDef>
+					<ammoCountPerCharge>3</ammoCountPerCharge>
+					<baseReloadTicks>60</baseReloadTicks>
+					<soundReload>Standard_Reload</soundReload>
+					<hotKey>Misc4</hotKey>
+					<chargeNoun>shot</chargeNoun>
+					<displayGizmoWhileUndrafted>false</displayGizmoWhileUndrafted>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_DroidWeapon_WristBlasterIon"]</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<label>wrist blaster (ion)</label>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<onlyManualCast>False</onlyManualCast>
+					<warmupTime>0.5</warmupTime>
+					<range>36</range>
+					<minRange>0</minRange>
+					<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+					<soundCast>OuterRim_Shot_BlasterBolt</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
+					<targetParams>
+						<canTargetItems>true</canTargetItems>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+					<defaultProjectile>Bullet_BlasterRifle_Ion</defaultProjectile>
+					<rangedFireRulepack>Combat_RangedFire</rangedFireRulepack>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_DroidWeapon_WristBlasterIon"]</xpath>
+		<value>
+			<comps>
+				<li Class="CompProperties_Reloadable">
+					<maxCharges>100</maxCharges>
+					<ammoDef>Ammo_PlasmaGasCartridge_Ion</ammoDef>
+					<ammoCountPerCharge>2</ammoCountPerCharge>
+					<baseReloadTicks>60</baseReloadTicks>
+					<soundReload>Standard_Reload</soundReload>
+					<hotKey>Misc4</hotKey>
+					<chargeNoun>shot</chargeNoun>
+					<displayGizmoWhileUndrafted>false</displayGizmoWhileUndrafted>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_DroidWeapon_WristRocket"]</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<label>wrist rocket launcher</label>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<onlyManualCast>True</onlyManualCast>
+					<warmupTime>0.75</warmupTime>
+					<range>45</range>
+					<minRange>0</minRange>
+					<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+					<soundCast>OuterRim_Shot_RocketLauncher</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
+					<targetParams>
+						<canTargetItems>true</canTargetItems>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+					<defaultProjectile>Bullet_OR_WristRocket</defaultProjectile>
+					<rangedFireRulepack>Combat_RangedFire</rangedFireRulepack>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_DroidWeapon_WristRocket"]</xpath>
+		<value>
+			<comps>
+				<li Class="CompProperties_Reloadable">
+					<maxCharges>3</maxCharges>
+					<ammoDef>Ammo_OR_MiniRocket_Standard</ammoDef>
+					<ammoCountPerCharge>1</ammoCountPerCharge>
+					<baseReloadTicks>60</baseReloadTicks>
+					<soundReload>Standard_Reload</soundReload>
+					<hotKey>Misc4</hotKey>
+					<chargeNoun>rocket</chargeNoun>
+					<displayGizmoWhileUndrafted>false</displayGizmoWhileUndrafted>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Faction - Tatooine/Patches/Outer Rim - Faction - Tatooine/Patch_OuterRim_Factions.xml b/ModPatches/Outer Rim - Faction - Tatooine/Patches/Outer Rim - Faction - Tatooine/Patch_OuterRim_Factions.xml
new file mode 100644
index 0000000000..26b87272f4
--- /dev/null
+++ b/ModPatches/Outer Rim - Faction - Tatooine/Patches/Outer Rim - Faction - Tatooine/Patch_OuterRim_Factions.xml	
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="O21_NPC_TuskenRaiderTrooperRanged" or
+			defName="O21_NPC_TuskenRaiderOfficer" or
+			defName="O21_NPC_TuskenRaiderCommander"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.3</generateChance>
+						<sidearmMoney>
+							<min>20</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>TuskenRaiderWeapons</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="O21_NPC_JawaChief" or
+			defName="O21_NPC_JawaTrader" or
+			defName="O21_NPC_JawaScavenger" or
+			defName="O21_NPC_JawaMechanic" or
+			defName="O21_NPC_JawaShaman" or
+			defName="O21_NPC_JawaVillager"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Apparel.xml b/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Apparel.xml
new file mode 100644
index 0000000000..9628a3cf12
--- /dev/null
+++ b/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Apparel.xml	
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="OuterRim_StormtrooperHelmet"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_StormtrooperHelmet"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
+		<value>
+			<ToxicEnvironmentResistance>0.25</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_ScoutTrooperHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<NightVisionEfficiency>0.8</NightVisionEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="OuterRim_ScoutTrooperHelmet"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_ImperialArmyHelmet"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<ToxicEnvironmentResistance>0</ToxicEnvironmentResistance>
+				<SmokeSensitivity>0</SmokeSensitivity>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_ImperialArmyHelmet"]/apparel</xpath>
+		<value>
+			<bodyPartGroups Inherit="False">
+				<li>UpperHead</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_ImperialCadetHelmet"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
+		<value>
+			<ToxicEnvironmentResistance>0.25</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_ImperialCadetHelmetAlt"]/apparel</xpath>
+		<value>
+			<immuneToToxGasExposure>false</immuneToToxGasExposure>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_ImperialCadetHelmetAlt"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<ToxicEnvironmentResistance>0</ToxicEnvironmentResistance>
+				<SmokeSensitivity>0</SmokeSensitivity>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_ISBAgentHelmet"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<ToxicEnvironmentResistance>0</ToxicEnvironmentResistance>
+				<SmokeSensitivity>0</SmokeSensitivity>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="OuterRim_ISBAgentHelmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Jetpacks.xml b/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Jetpacks.xml
new file mode 100644
index 0000000000..59066ea3db
--- /dev/null
+++ b/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Jetpacks.xml	
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="OuterRim_ImperialJetpack"]/comps</xpath>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Pawnkinds.xml b/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Pawnkinds.xml
new file mode 100644
index 0000000000..634b55d033
--- /dev/null
+++ b/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Pawnkinds.xml	
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="OuterRim_ImperialArmyTroopBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="OuterRim_EMPStormBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Ranged_Weapons.xml b/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Ranged_Weapons.xml
new file mode 100644
index 0000000000..2bee6d0687
--- /dev/null
+++ b/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Ranged_Weapons.xml	
@@ -0,0 +1,405 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_EC17Blaster</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.07</SwayFactor>
+			<Bulk>1.90</Bulk>
+			<Mass>1.20</Mass>
+			<RangedWeapon_Cooldown>0.12</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>3.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterPistol_Red</defaultProjectile>
+			<warmupTime>0.25</warmupTime>
+			<range>10</range>
+			<soundCast>OuterRim_Shot_MediumBlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+		<AmmoUser>
+			<magazineSize>16</magazineSize>
+			<reloadTime>2.4</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Pistol</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_SE14RBlaster</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.05</SwayFactor>
+			<Bulk>2.60</Bulk>
+			<Mass>1.50</Mass>
+			<RangedWeapon_Cooldown>2.5</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>3.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterPistol_Red</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>12</range>
+			<soundCast>OuterRim_Shot_SE14RBlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+		<AmmoUser>
+			<magazineSize>24</magazineSize>
+			<reloadTime>3.84</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Pistol</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_DLT20ABlaster</defName>
+		<statBases>
+			<SightsEfficiency>1.8</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.8</SwayFactor>
+			<Bulk>3.50</Bulk>
+			<Mass>4.70</Mass>
+			<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.48</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterRifle_Red</defaultProjectile>
+			<warmupTime>2.0</warmupTime>
+			<range>62</range>
+			<soundCast>OuterRim_Shot_DLT20BBlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>3.2</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Rifle</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_E10BlasterRifle</defName>
+		<statBases>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.2</SwayFactor>
+			<Bulk>6.00</Bulk>
+			<Mass>4.10</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterRifle_Red</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>55</range>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<burstShotCount>5</burstShotCount>
+			<soundCast>OuterRim_Shot_E11BlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>3.7</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Rifle</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_E11BlasterRifle</defName>
+		<statBases>
+			<SightsEfficiency>0.95</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>0.75</SwayFactor>
+			<Bulk>5.00</Bulk>
+			<Mass>2.80</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterRifle_Red</defaultProjectile>
+			<warmupTime>0.75</warmupTime>
+			<range>44</range>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<burstShotCount>5</burstShotCount>
+			<soundCast>OuterRim_Shot_E11BlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>70</magazineSize>
+			<reloadTime>3.7</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Rifle</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_E22BlasterRifle</defName>
+		<statBases>
+			<SightsEfficiency>0.85</SightsEfficiency>
+			<ShotSpread>0.22</ShotSpread>
+			<SwayFactor>1.25</SwayFactor>
+			<Bulk>6.50</Bulk>
+			<Mass>3.40</Mass>
+			<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterRifle_Red</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>44</range>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<burstShotCount>8</burstShotCount>
+			<soundCast>OuterRim_Shot_E11BlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>4</aimedBurstShotCount>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>112</magazineSize>
+			<reloadTime>4.4</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Rifle</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="OuterRim_DLT19HeavyBlasterRifle"]/statBases/AccuracyTouch
+			| Defs/ThingDef[defName="OuterRim_DLT19HeavyBlasterRifle"]/statBases/AccuracyShort
+			| Defs/ThingDef[defName="OuterRim_DLT19HeavyBlasterRifle"]/statBases/AccuracyMedium
+			| Defs/ThingDef[defName="OuterRim_DLT19HeavyBlasterRifle"]/statBases/AccuracyLong </xpath>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_DLT19HeavyBlasterRifle</defName>
+		<statBases>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.26</SwayFactor>
+			<Bulk>16.50</Bulk>
+			<Mass>9.00</Mass>
+			<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.15</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterRifle_Red</defaultProjectile>
+			<warmupTime>1.25</warmupTime>
+			<range>62</range>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<burstShotCount>5</burstShotCount>
+			<soundCast>OuterRim_Shot_HeavyMinigunBlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>10</aimedBurstShotCount>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>250</magazineSize>
+			<reloadTime>7.5</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Rifle</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_DLT19XTargetingBlaster</defName>
+		<statBases>
+			<SightsEfficiency>2.5</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>2.25</SwayFactor>
+			<Bulk>14.5</Bulk>
+			<Mass>8.0</Mass>
+			<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+			<NightVisionEfficiency_Weapon>0.4</NightVisionEfficiency_Weapon>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterSniper_Red</defaultProjectile>
+			<warmupTime>2.8</warmupTime>
+			<range>75</range>
+			<soundCast>OuterRim_Shot_DLT19DBlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>24</magazineSize>
+			<reloadTime>3.7</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Sniper</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="OuterRim_TL50HeavyRepeaterBlaster"]/statBases/AccuracyTouch
+			| Defs/ThingDef[defName="OuterRim_TL50HeavyRepeaterBlaster"]/statBases/AccuracyShort
+			| Defs/ThingDef[defName="OuterRim_TL50HeavyRepeaterBlaster"]/statBases/AccuracyMedium
+			| Defs/ThingDef[defName="OuterRim_TL50HeavyRepeaterBlaster"]/statBases/AccuracyLong </xpath>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_TL50HeavyRepeaterBlaster</defName>
+		<statBases>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.35</SwayFactor>
+			<Bulk>12.00</Bulk>
+			<Mass>20.00</Mass>
+			<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterRifle_Red</defaultProjectile>
+			<warmupTime>1.25</warmupTime>
+			<range>55</range>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<burstShotCount>50</burstShotCount>
+			<soundCast>OuterRim_Shot_HeavyMinigunBlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>25</aimedBurstShotCount>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>400</magazineSize>
+			<reloadTime>9.5</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Rifle</ammoSet>
+		</AmmoUser>
+	</Operation>
+	
+	<!-- === D72 Flamethrower === -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="OuterRim_D72wOppressor"]/statBases/AccuracyTouch
+			| Defs/ThingDef[defName="OuterRim_D72wOppressor"]/statBases/AccuracyShort
+			| Defs/ThingDef[defName="OuterRim_D72wOppressor"]/statBases/AccuracyMedium
+			| Defs/ThingDef[defName="OuterRim_D72wOppressor"]/statBases/AccuracyLong </xpath>
+	</Operation>
+	
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_D72wOppressor</defName>
+		<statBases>
+			<Mass>5.5</Mass>
+			<Bulk>8</Bulk>
+			<SwayFactor>1.35</SwayFactor>
+			<ShotSpread>0.15</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.85</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Flamethrower_Prometheum</defaultProjectile>
+			<burstShotCount>20</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>11</range>
+			<minRange>3</minRange>
+			<soundCast>OuterRim_Shot_FlameProjector</soundCast>
+			<muzzleFlashScale>0</muzzleFlashScale>
+			<ai_IsBuildingDestroyer>True</ai_IsBuildingDestroyer>
+			<targetParams>
+				<canTargetLocations>True</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_Flamethrower</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>10</aimedBurstShotCount>
+		</FireModes>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Galactic Republic/Patches/Outer Rim - Galactic Republic/Outer_Rim_Galactic_Republic_Apparel.xml b/ModPatches/Outer Rim - Galactic Republic/Patches/Outer Rim - Galactic Republic/Outer_Rim_Galactic_Republic_Apparel.xml
new file mode 100644
index 0000000000..644d873da9
--- /dev/null
+++ b/ModPatches/Outer Rim - Galactic Republic/Patches/Outer Rim - Galactic Republic/Outer_Rim_Galactic_Republic_Apparel.xml	
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_CloneKama"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_CloneKama"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Galactic Republic/Patches/Outer Rim - Galactic Republic/Outer_Rim_Galactic_Republic_Pawnkinds.xml b/ModPatches/Outer Rim - Galactic Republic/Patches/Outer Rim - Galactic Republic/Outer_Rim_Galactic_Republic_Pawnkinds.xml
new file mode 100644
index 0000000000..078872fa3e
--- /dev/null
+++ b/ModPatches/Outer Rim - Galactic Republic/Patches/Outer Rim - Galactic Republic/Outer_Rim_Galactic_Republic_Pawnkinds.xml	
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="OuterRim_CloneP2Base"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Galactic Republic/Patches/Outer Rim - Galactic Republic/Outer_Rim_Galactic_Republic_Ranged_Weapons.xml b/ModPatches/Outer Rim - Galactic Republic/Patches/Outer Rim - Galactic Republic/Outer_Rim_Galactic_Republic_Ranged_Weapons.xml
new file mode 100644
index 0000000000..d0a9f64d85
--- /dev/null
+++ b/ModPatches/Outer Rim - Galactic Republic/Patches/Outer Rim - Galactic Republic/Outer_Rim_Galactic_Republic_Ranged_Weapons.xml	
@@ -0,0 +1,274 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_DC17HandBlaster</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.05</SwayFactor>
+			<Bulk>2.60</Bulk>
+			<Mass>1.50</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>3.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterPistol_Blue</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>12</range>
+			<soundCast>OuterRim_Shot_MediumBlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+		<AmmoUser>
+			<magazineSize>24</magazineSize>
+			<reloadTime>3.84</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeBlue_Pistol</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_DC17mCarbine</defName>
+		<statBases>
+			<SightsEfficiency>0.95</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>0.75</SwayFactor>
+			<Bulk>5.00</Bulk>
+			<Mass>2.80</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterRifle_Blue</defaultProjectile>
+			<warmupTime>0.75</warmupTime>
+			<range>44</range>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<burstShotCount>5</burstShotCount>
+			<soundCast>OuterRim_Shot_EE13BlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>80</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeBlue_Rifle</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_DC15ACarbine</defName>
+		<statBases>
+			<SightsEfficiency>0.95</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.32</SwayFactor>
+			<Bulk>6.00</Bulk>
+			<Mass>4.10</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterRifle_Blue</defaultProjectile>
+			<warmupTime>0.75</warmupTime>
+			<range>44</range>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<burstShotCount>3</burstShotCount>
+			<soundCast>OuterRim_Shot_DC15BlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>42</magazineSize>
+			<reloadTime>3.36</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeBlue_Rifle</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_DC15ARifle</defName>
+		<statBases>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.2</SwayFactor>
+			<Bulk>16.50</Bulk>
+			<Mass>9.00</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.16</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterRifle_Blue</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>55</range>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<burstShotCount>8</burstShotCount>
+			<soundCast>OuterRim_Shot_DC15BlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>4</aimedBurstShotCount>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>160</magazineSize>
+			<reloadTime>7.5</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeBlue_Rifle</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_DC15xSniperRifle</defName>
+		<statBases>
+			<SightsEfficiency>2.5</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>2.25</SwayFactor>
+			<Bulk>14.5</Bulk>
+			<Mass>8.0</Mass>
+			<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+			<NightVisionEfficiency_Weapon>0.4</NightVisionEfficiency_Weapon>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterSniper_Blue</defaultProjectile>
+			<warmupTime>2.8</warmupTime>
+			<range>75</range>
+			<soundCast>OuterRim_Shot_DLT20BBlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>1.2</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeBlue_Sniper</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="OuterRim_Z6RotaryBlaster"]/statBases/AccuracyTouch
+			| Defs/ThingDef[defName="OuterRim_Z6RotaryBlaster"]/statBases/AccuracyShort
+			| Defs/ThingDef[defName="OuterRim_Z6RotaryBlaster"]/statBases/AccuracyMedium
+			| Defs/ThingDef[defName="OuterRim_Z6RotaryBlaster"]/statBases/AccuracyLong </xpath>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_Z6RotaryBlaster</defName>
+		<statBases>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.26</SwayFactor>
+			<Bulk>12.00</Bulk>
+			<Mass>20.00</Mass>
+			<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterRifle_Blue</defaultProjectile>
+			<warmupTime>2.5</warmupTime>
+			<range>62</range>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<burstShotCount>50</burstShotCount>
+			<soundCast>OuterRim_Shot_HeavyMinigunBlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>25</aimedBurstShotCount>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>600</magazineSize>
+			<reloadTime>9.5</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeBlue_Rifle</ammoSet>
+		</AmmoUser>
+	</Operation>
+	
+	<!-- === RPS6 RL === -->
+	
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_RPS6RocketLauncher</defName>
+		<statBases>
+			<Mass>7.5</Mass>
+			<Bulk>10.5</Bulk>
+			<SwayFactor>1.7</SwayFactor>
+			<ShotSpread>0.15</ShotSpread>
+			<SightsEfficiency>2.25</SightsEfficiency>
+			<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_RPS6_HEDP</defaultProjectile>
+			<warmupTime>3.3</warmupTime>
+			<range>58</range>
+			<minRange>10</minRange>
+			<soundCast>OuterRim_Shot_RocketLauncher</soundCast>
+			<muzzleFlashScale>15</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>True</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>12</reloadTime>
+			<ammoSet>AmmoSet_OuterRimRockets</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Apparel.xml b/ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Apparel.xml
new file mode 100644
index 0000000000..8674cb0e22
--- /dev/null
+++ b/ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Apparel.xml	
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="MandalorianChestBase"]/statBases/Mass</xpath>
+		<value>
+			<Mass>15</Mass>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="MandalorianChestBase"]/statBases</xpath>
+		<value>
+			<Bulk>80</Bulk>
+			<WornBulk>15</WornBulk>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+			<ArmorRating_Blunt>18</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="MandalorianChestBase"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>11</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="MandalorianChestBase"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MoveSpeed>-0.15</MoveSpeed>
+				<ToxicEnvironmentResistance>0.25</ToxicEnvironmentResistance>
+				<CarryBulk>25</CarryBulk>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="MandalorianChestBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="MandalorianHelmetBase"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>2</WornBulk>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+			<ArmorRating_Blunt>18</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="MandalorianHelmetBase"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>11</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="MandalorianHelmetBase"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+				<ToxicEnvironmentResistance>0.25</ToxicEnvironmentResistance>
+				<NightVisionEfficiency>0.8</NightVisionEfficiency>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="MandalorianPauldronsBase"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>3</WornBulk>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+			<ArmorRating_Blunt>18</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="MandalorianPauldronsBase"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>11</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="MandalorianPauldronsBase"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<ToxicEnvironmentResistance>0.25</ToxicEnvironmentResistance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="MandalorianPauldronsBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_MandalorianChest_Heavy"]/statBases</xpath>
+		<value>
+			<Bulk>40</Bulk>
+			<WornBulk>25</WornBulk>
+			<ArmorRating_Sharp>7.5</ArmorRating_Sharp>
+			<ArmorRating_Blunt>22.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_MandalorianChest_Heavy"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>15</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_MandalorianHelmet_Heavy"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>4</WornBulk>
+			<ArmorRating_Sharp>7.5</ArmorRating_Sharp>
+			<ArmorRating_Blunt>22.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_MandalorianHelmet_Heavy"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>15</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_MandalorianPauldrons_Heavy"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>4</WornBulk>
+			<ArmorRating_Sharp>7.5</ArmorRating_Sharp>
+			<ArmorRating_Blunt>22.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_MandalorianPauldrons_Heavy"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>15</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Jetpacks.xml b/ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Jetpacks.xml
new file mode 100644
index 0000000000..fa12f917cf
--- /dev/null
+++ b/ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Jetpacks.xml	
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="OuterRim_Z6Jetpack" or defName="OuterRim_SupercommandoJetpack"]/comps</xpath>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Melee_Weapons.xml b/ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Melee_Weapons.xml
new file mode 100644
index 0000000000..0cda0320f5
--- /dev/null
+++ b/ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Melee_Weapons.xml	
@@ -0,0 +1,296 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_MunitkatHalberd"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<chanceFactor>0.1</chanceFactor>
+					<cooldownTime>1.66</cooldownTime>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>2.47</cooldownTime>
+					<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
+					<armorPenetrationSharp>18</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_MunitkatHalberd"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.2</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_MunitkatHalberd"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.75</MeleeCritChance>
+				<MeleeParryChance>0.2</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_MandalorianWarhammer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.78</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>1.000</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>2.36</cooldownTime>
+					<armorPenetrationBlunt>11.76</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_MandalorianWarhammer"]/statBases/Mass</xpath>
+		<value>
+			<Mass>2.5</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_MandalorianWarhammer"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>0.48</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_MandalorianWarhammer"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.25</MeleeCritChance>
+				<MeleeParryChance>0.36</MeleeParryChance>
+				<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_MandalorianHammer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.78</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>1.000</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>2.36</cooldownTime>
+					<armorPenetrationBlunt>10.26</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_MandalorianHammer"]/statBases/Mass</xpath>
+		<value>
+			<Mass>2</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_MandalorianHammer"]/statBases</xpath>
+		<value>
+			<Bulk>5.5</Bulk>
+			<MeleeCounterParryBonus>0.48</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_MandalorianHammer"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.15</MeleeCritChance>
+				<MeleeParryChance>0.32</MeleeParryChance>
+				<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_MandalorianSaber"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<chanceFactor>0.1</chanceFactor>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>0.83</cooldownTime>
+					<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
+					<armorPenetrationSharp>18</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>0.94</cooldownTime>
+					<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
+					<armorPenetrationSharp>25</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_MandalorianSaber"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.40</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_MandalorianSaber"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.00</MeleeCritChance>
+				<MeleeParryChance>0.40</MeleeParryChance>
+				<MeleeDodgeChance>0.27</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_MandalorianSaber"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_MandalorianHookblade"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<chanceFactor>0.1</chanceFactor>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>1.13</cooldownTime>
+					<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
+					<armorPenetrationSharp>18</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.34</cooldownTime>
+					<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
+					<armorPenetrationSharp>25</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_MandalorianHookblade"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.65</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_MandalorianHookblade"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.25</MeleeCritChance>
+				<MeleeParryChance>0.50</MeleeParryChance>
+				<MeleeDodgeChance>0.27</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_MandalorianHookblade"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Pawnkinds.xml b/ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Pawnkinds.xml
new file mode 100644
index 0000000000..2f68d7c592
--- /dev/null
+++ b/ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Pawnkinds.xml	
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="BaseDeathWatchPawn"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Ranged_Weapons.xml b/ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Ranged_Weapons.xml
new file mode 100644
index 0000000000..7257d59450
--- /dev/null
+++ b/ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Ranged_Weapons.xml	
@@ -0,0 +1,403 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_WESTAR35Blaster</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.05</SwayFactor>
+			<Bulk>2.60</Bulk>
+			<Mass>1.50</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>3.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterPistol_Yellow</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>12</range>
+			<soundCast>OuterRim_Shot_RepeaterBlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>24</magazineSize>
+			<reloadTime>3.84</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeYellow_Pistol</ammoSet>
+		</AmmoUser>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+	
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_WESTAR34Blaster</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.05</SwayFactor>
+			<Bulk>2.60</Bulk>
+			<Mass>1.50</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>3.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterPistol_Yellow</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>12</range>
+			<soundCast>OuterRim_Shot_RepeaterBlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>24</magazineSize>
+			<reloadTime>3.84</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeYellow_Pistol</ammoSet>
+		</AmmoUser>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+	
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_WESTAR18Blaster</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.05</SwayFactor>
+			<Bulk>2.60</Bulk>
+			<Mass>1.50</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>3.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterPistol_Yellow</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>12</range>
+			<soundCast>OuterRim_Shot_RepeaterBlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>24</magazineSize>
+			<reloadTime>3.84</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeYellow_Pistol</ammoSet>
+		</AmmoUser>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+	
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_IB94BlasterPistol</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.05</SwayFactor>
+			<Bulk>2.60</Bulk>
+			<Mass>1.50</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>3.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterPistol_Yellow</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>12</range>
+			<soundCast>OuterRim_Shot_RepeaterBlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>24</magazineSize>
+			<reloadTime>3.84</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeYellow_Pistol</ammoSet>
+		</AmmoUser>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+	
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_EE13BlasterPistol</defName>
+		<statBases>
+			<Mass>2.80</Mass>
+			<Bulk>5.00</Bulk>
+			<SwayFactor>0.75</SwayFactor>
+			<ShotSpread>0.16</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterPistol_Yellow</defaultProjectile>
+			<warmupTime>0.75</warmupTime>
+			<range>44</range>
+			<soundCast>OuterRim_Shot_EE13BlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>42</magazineSize>
+			<reloadTime>3.36</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeYellow_Pistol</ammoSet>
+		</AmmoUser>
+		<weaponTags>
+			<li>SpacerGun</li>
+		</weaponTags>
+	</Operation>
+	
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_GALAAR15Blaster</defName>
+		<statBases>
+			<Mass>2.80</Mass>
+			<Bulk>5.00</Bulk>
+			<SwayFactor>0.75</SwayFactor>
+			<ShotSpread>0.16</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterRifle_Yellow</defaultProjectile>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>0.75</warmupTime>
+			<range>44</range>
+			<soundCast>OuterRim_Shot_RepeaterBlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>70</magazineSize>
+			<reloadTime>5.6</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeYellow_Rifle</ammoSet>
+		</AmmoUser>
+		<weaponTags>
+			<li>SpacerGun</li>
+		</weaponTags>
+	</Operation>
+	
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_EE13SniperRifle</defName>
+		<statBases>
+			<Mass>8</Mass>
+			<Bulk>14.5</Bulk>
+			<SwayFactor>2.25</SwayFactor>
+			<ShotSpread>0.01</ShotSpread>
+			<SightsEfficiency>2.5</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+			<NightVisionEfficiency_Weapon>0.4</NightVisionEfficiency_Weapon>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterSniper_Yellow</defaultProjectile>
+			<warmupTime>2.8</warmupTime>
+			<range>75</range>
+			<soundCast>OuterRim_Shot_EE13BlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>1.2</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeYellow_Sniper</ammoSet>
+		</AmmoUser>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>Bipod_DMR</li>
+		</weaponTags>
+	</Operation>
+	
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_EE13BlasterRifle</defName>
+		<statBases>
+			<Mass>3.0</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.2</SwayFactor>
+			<Bulk>7.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.45</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterRifle_Yellow</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>55</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>6</burstShotCount>
+			<soundCast>OuterRim_Shot_EE13BlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>120</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeYellow_Rifle</ammoSet>
+		</AmmoUser>
+		<weaponTags>
+			<li>SpacerGun</li>
+		</weaponTags>
+	</Operation>
+	
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_EE3BlasterCarbine</defName>
+		<statBases>
+			<Mass>3.0</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.95</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>0.75</SwayFactor>
+			<Bulk>7.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterRifle_Yellow</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>0.75</warmupTime>
+			<range>44</range>
+			<soundCast>OuterRim_Shot_EE3BlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>84</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeYellow_Rifle</ammoSet>
+		</AmmoUser>
+		<weaponTags>
+			<li>SpacerGun</li>
+		</weaponTags>
+	</Operation>
+	
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_AmbanSniperRifle</defName>
+		<statBases>
+			<Mass>8</Mass>
+			<Bulk>14.5</Bulk>
+			<SwayFactor>2.25</SwayFactor>
+			<ShotSpread>0.01</ShotSpread>
+			<SightsEfficiency>2.6</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
+			<NightVisionEfficiency_Weapon>0.55</NightVisionEfficiency_Weapon>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterSniper_Yellow</defaultProjectile>
+			<warmupTime>1.6</warmupTime>
+			<range>84</range>
+			<soundCast>OuterRim_Shot_DisintigratorBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+			<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>3</magazineSize>
+			<reloadTime>0.25</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeYellow_Sniper</ammoSet>
+		</AmmoUser>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>Bipod_DMR</li>
+		</weaponTags>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Old Republic/Patches/Outer Rim - Old Republic/Outer_Rim_Old_Republic_Apparel.xml b/ModPatches/Outer Rim - Old Republic/Patches/Outer Rim - Old Republic/Outer_Rim_Old_Republic_Apparel.xml
new file mode 100644
index 0000000000..89c64e8f73
--- /dev/null
+++ b/ModPatches/Outer Rim - Old Republic/Patches/Outer Rim - Old Republic/Outer_Rim_Old_Republic_Apparel.xml	
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_SithTrooperHelmet"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
+		<value>
+			<ToxicEnvironmentResistance>0.25</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_OldRepublicTrooperHelmet"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
+		<value>
+			<ToxicEnvironmentResistance>0</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_OldRepublicTrooperHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_OldRepublicTrooperHelmet"]/apparel</xpath>
+		<value>
+			<bodyPartGroups Inherit="False">
+				<li>UpperHead</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="OuterRim_OldRepublicTrooperHelmet"]/apparel/immuneToToxGasExposure</xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Old Republic/Patches/Outer Rim - Old Republic/Outer_Rim_Old_Republic_Pawnkinds.xml b/ModPatches/Outer Rim - Old Republic/Patches/Outer Rim - Old Republic/Outer_Rim_Old_Republic_Pawnkinds.xml
new file mode 100644
index 0000000000..6041a7946f
--- /dev/null
+++ b/ModPatches/Outer Rim - Old Republic/Patches/Outer Rim - Old Republic/Outer_Rim_Old_Republic_Pawnkinds.xml	
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="OuterRim_OldRepublicPawnBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="OuterRim_SithPawnBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Old Republic/Patches/Outer Rim - Old Republic/Outer_Rim_Old_Republic_Ranged_Weapons.xml b/ModPatches/Outer Rim - Old Republic/Patches/Outer Rim - Old Republic/Outer_Rim_Old_Republic_Ranged_Weapons.xml
new file mode 100644
index 0000000000..8c410dce54
--- /dev/null
+++ b/ModPatches/Outer Rim - Old Republic/Patches/Outer Rim - Old Republic/Outer_Rim_Old_Republic_Ranged_Weapons.xml	
@@ -0,0 +1,402 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_OldRepublicBlaster</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.05</SwayFactor>
+			<Bulk>2.60</Bulk>
+			<Mass>1.50</Mass>
+			<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>3.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterPistol_Green</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>12</range>
+			<soundCast>OuterRim_Shot_BlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+		<AmmoUser>
+			<magazineSize>24</magazineSize>
+			<reloadTime>3.7</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeGreen_Pistol</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_SithBlaster</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.2</SwayFactor>
+			<Bulk>2.60</Bulk>
+			<Mass>1.50</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>3.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterPistol_Red</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>12</range>
+			<soundCast>OuterRim_Shot_BlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+		<AmmoUser>
+			<magazineSize>24</magazineSize>
+			<reloadTime>3.7</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Pistol</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_OldRepublicRifle</defName>
+		<statBases>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.2</SwayFactor>
+			<Bulk>6.00</Bulk>
+			<Mass>4.10</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterRifle_Green</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>55</range>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<burstShotCount>5</burstShotCount>
+			<soundCast>OuterRim_Shot_MediumBlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>3.7</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeGreen_Rifle</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_SithRifle</defName>
+		<statBases>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.2</SwayFactor>
+			<Bulk>6.00</Bulk>
+			<Mass>4.10</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterRifle_Red</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>55</range>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<burstShotCount>5</burstShotCount>
+			<soundCast>OuterRim_Shot_MediumBlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>3.7</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Rifle</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_OldRepublicSniper</defName>
+		<statBases>
+			<SightsEfficiency>2.5</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>2.25</SwayFactor>
+			<Bulk>14.5</Bulk>
+			<Mass>8.0</Mass>
+			<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+			<NightVisionEfficiency_Weapon>0.4</NightVisionEfficiency_Weapon>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterSniper_Green</defaultProjectile>
+			<warmupTime>2.8</warmupTime>
+			<range>75</range>
+			<soundCast>OuterRim_Shot_PowerBlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>3.7</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeGreen_Sniper</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_SithSniper</defName>
+		<statBases>
+			<SightsEfficiency>2.5</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>2.25</SwayFactor>
+			<Bulk>14.5</Bulk>
+			<Mass>8.0</Mass>
+			<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+			<NightVisionEfficiency_Weapon>0.4</NightVisionEfficiency_Weapon>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterSniper_Red</defaultProjectile>
+			<warmupTime>2.8</warmupTime>
+			<range>75</range>
+			<soundCast>OuterRim_Shot_PowerBlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>3.7</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Sniper</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_OldRepublicHeavyRifle</defName>
+		<statBases>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.26</SwayFactor>
+			<Bulk>16.50</Bulk>
+			<Mass>9.00</Mass>
+			<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.15</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterRifle_Green</defaultProjectile>
+			<warmupTime>1.25</warmupTime>
+			<range>62</range>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>OuterRim_Shot_AltHeavyBlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>7.5</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeGreen_Rifle</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_SithHeavyRifle</defName>
+		<statBases>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.26</SwayFactor>
+			<Bulk>16.50</Bulk>
+			<Mass>9.00</Mass>
+			<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.15</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterRifle_Red</defaultProjectile>
+			<warmupTime>1.25</warmupTime>
+			<range>62</range>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>OuterRim_Shot_AltHeavyBlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>7.5</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Rifle</ammoSet>
+		</AmmoUser>
+	</Operation>
+	
+	<!-- === Flamethrowers === -->
+	
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="OuterRim_OldRepublicFlameProjector"]/statBases/AccuracyTouch
+			| Defs/ThingDef[defName="OuterRim_OldRepublicFlameProjector"]/statBases/AccuracyShort
+			| Defs/ThingDef[defName="OuterRim_OldRepublicFlameProjector"]/statBases/AccuracyMedium
+			| Defs/ThingDef[defName="OuterRim_OldRepublicFlameProjector"]/statBases/AccuracyLong </xpath>
+	</Operation>
+	
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_OldRepublicFlameProjector</defName>
+		<statBases>
+			<Mass>5.5</Mass>
+			<Bulk>8</Bulk>
+			<SwayFactor>1.35</SwayFactor>
+			<ShotSpread>0.15</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.85</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Flamethrower_Prometheum</defaultProjectile>
+			<burstShotCount>20</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>11</range>
+			<minRange>3</minRange>
+			<soundCast>OuterRim_Shot_FlameProjector</soundCast>
+			<muzzleFlashScale>0</muzzleFlashScale>
+			<ai_IsBuildingDestroyer>True</ai_IsBuildingDestroyer>
+			<targetParams>
+				<canTargetLocations>True</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_Flamethrower</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>10</aimedBurstShotCount>
+		</FireModes>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+	
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="OuterRim_SithFlameProjector"]/statBases/AccuracyTouch
+			| Defs/ThingDef[defName="OuterRim_SithFlameProjector"]/statBases/AccuracyShort
+			| Defs/ThingDef[defName="OuterRim_SithFlameProjector"]/statBases/AccuracyMedium
+			| Defs/ThingDef[defName="OuterRim_SithFlameProjector"]/statBases/AccuracyLong </xpath>
+	</Operation>
+	
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_SithFlameProjector</defName>
+		<statBases>
+			<Mass>5.5</Mass>
+			<Bulk>8</Bulk>
+			<SwayFactor>1.35</SwayFactor>
+			<ShotSpread>0.15</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.85</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Flamethrower_Prometheum</defaultProjectile>
+			<burstShotCount>20</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>11</range>
+			<minRange>3</minRange>
+			<soundCast>OuterRim_Shot_FlameProjector</soundCast>
+			<muzzleFlashScale>0</muzzleFlashScale>
+			<ai_IsBuildingDestroyer>True</ai_IsBuildingDestroyer>
+			<targetParams>
+				<canTargetLocations>True</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_Flamethrower</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>10</aimedBurstShotCount>
+		</FireModes>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Rebel Alliance/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Apparel.xml b/ModPatches/Outer Rim - Rebel Alliance/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Apparel.xml
new file mode 100644
index 0000000000..ee8197117d
--- /dev/null
+++ b/ModPatches/Outer Rim - Rebel Alliance/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Apparel.xml	
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_RebelFleetTrooperHelmet"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<ToxicEnvironmentResistance>0</ToxicEnvironmentResistance>
+				<SmokeSensitivity>0</SmokeSensitivity>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_RebelForestHelmet"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<ToxicEnvironmentResistance>0</ToxicEnvironmentResistance>
+				<SmokeSensitivity>0</SmokeSensitivity>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Rebel Alliance/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Jetpacks.xml b/ModPatches/Outer Rim - Rebel Alliance/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Jetpacks.xml
new file mode 100644
index 0000000000..8a820ebf79
--- /dev/null
+++ b/ModPatches/Outer Rim - Rebel Alliance/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Jetpacks.xml	
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="OuterRim_RebelJetpack"]/comps</xpath>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Rebel Alliance/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Pawnkinds.xml b/ModPatches/Outer Rim - Rebel Alliance/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Pawnkinds.xml
new file mode 100644
index 0000000000..49bcba5f58
--- /dev/null
+++ b/ModPatches/Outer Rim - Rebel Alliance/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Pawnkinds.xml	
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="OuterRim_RebelPawnBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Rebel Alliance/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Ranged_Weapons.xml b/ModPatches/Outer Rim - Rebel Alliance/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Ranged_Weapons.xml
new file mode 100644
index 0000000000..b06f2b42ae
--- /dev/null
+++ b/ModPatches/Outer Rim - Rebel Alliance/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Ranged_Weapons.xml	
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_A180Blaster"]/description</xpath>
+		<value>
+			<description>The A-180 blaster was a modular blaster manufactured by BlasTech Industries. Though theoretically capable of being easily reconfigured for various battlefield roles, the vast majority found are the simple blaster pistol variant.</description>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_A180Blaster</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.05</SwayFactor>
+			<Bulk>2.60</Bulk>
+			<Mass>1.50</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>3.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterPistol_Green</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>12</range>
+			<soundCast>OuterRim_Shot_SE14RBlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+		<AmmoUser>
+			<magazineSize>24</magazineSize>
+			<reloadTime>3.84</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeGreen_Pistol</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_DH17Pistol"]/label</xpath>
+		<value>
+			<label>dh-17 blaster carbine</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_DH17Pistol"]/description</xpath>
+		<value>
+			<description>The DH-17 blaster carbine was a close-combat blaster weapon produced by BlasTech Industries.</description>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_DH17Pistol</defName>
+		<statBases>
+			<SightsEfficiency>0.95</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>0.75</SwayFactor>
+			<Bulk>5.00</Bulk>
+			<Mass>2.80</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterRifle_Red</defaultProjectile>
+			<warmupTime>0.75</warmupTime>
+			<range>44</range>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<burstShotCount>5</burstShotCount>
+			<soundCast>OuterRim_Shot_E11BlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>70</magazineSize>
+			<reloadTime>5.6</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeGreen_Rifle</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_DH17Rifle"]/description</xpath>
+		<value>
+			<description>Not to be confused with the more compact DH-17 carbine, the DH-17 rifle was another staple of the Rebel Alliance's armouries. With a full stock and improved optics, it was more accurate than the carbine model.</description>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_DH17Rifle</defName>
+		<statBases>
+			<SightsEfficiency>1.8</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.8</SwayFactor>
+			<Bulk>6.00</Bulk>
+			<Mass>4.10</Mass>
+			<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.48</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterRifle_Green</defaultProjectile>
+			<warmupTime>2.0</warmupTime>
+			<range>62</range>
+			<soundCast>OuterRim_Shot_E11BlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>3.2</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeGreen_Rifle</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_A280Blaster</defName>
+		<statBases>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.2</SwayFactor>
+			<Bulk>6.5</Bulk>
+			<Mass>4.30</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.45</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterRifle_Green</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>55</range>
+			<soundCast>OuterRim_Shot_E11BlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>1.6</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeGreen_Rifle</ammoSet>
+		</AmmoUser>
+	</Operation>
+	
+	<!-- === HH12 RL === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_HH12RocketLauncher"]/description</xpath>
+		<value>
+			<description>A simple but effective shoulder-fired rocket launcher utilized by the Rebel Alliance, engineered to take advantage of generous leftover stocks of RPS-6 missiles that were once used by the Galactic Republic before its dissolution.</description>
+		</value>
+	</Operation>
+	
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_HH12RocketLauncher</defName>
+		<statBases>
+			<Mass>7.5</Mass>
+			<Bulk>10.5</Bulk>
+			<SwayFactor>1.7</SwayFactor>
+			<ShotSpread>0.15</ShotSpread>
+			<SightsEfficiency>2.25</SightsEfficiency>
+			<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_RPS6_HEDP</defaultProjectile>
+			<warmupTime>3.3</warmupTime>
+			<range>58</range>
+			<minRange>10</minRange>
+			<soundCast>OuterRim_Shot_RocketLauncher</soundCast>
+			<muzzleFlashScale>15</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>True</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>12</reloadTime>
+			<ammoSet>AmmoSet_OuterRimRockets</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Seperatists/Patches/Outer Rim - Seperatists/Outer_Rim_Seperatist_Melee_Weapons.xml b/ModPatches/Outer Rim - Seperatists/Patches/Outer Rim - Seperatists/Outer_Rim_Seperatist_Melee_Weapons.xml
new file mode 100644
index 0000000000..21776e5242
--- /dev/null
+++ b/ModPatches/Outer Rim - Seperatists/Patches/Outer Rim - Seperatists/Outer_Rim_Seperatist_Melee_Weapons.xml	
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OuterRim_BXVibroblade"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<chanceFactor>0.1</chanceFactor>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>0.83</cooldownTime>
+					<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
+					<armorPenetrationSharp>18</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>0.94</cooldownTime>
+					<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
+					<armorPenetrationSharp>25</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_BXVibroblade"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_BXVibroblade"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.0</MeleeCritChance>
+				<MeleeParryChance>0.4</MeleeParryChance>
+				<MeleeDodgeChance>0.27</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_BXVibroblade"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Seperatists/Patches/Outer Rim - Seperatists/Outer_Rim_Seperatist_Ranged_Weapons.xml b/ModPatches/Outer Rim - Seperatists/Patches/Outer Rim - Seperatists/Outer_Rim_Seperatist_Ranged_Weapons.xml
new file mode 100644
index 0000000000..6ad1a53e37
--- /dev/null
+++ b/ModPatches/Outer Rim - Seperatists/Patches/Outer Rim - Seperatists/Outer_Rim_Seperatist_Ranged_Weapons.xml	
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_RG4DBlaster</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.05</SwayFactor>
+			<Bulk>2.60</Bulk>
+			<Mass>1.50</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>3.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterPistol_Red</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>12</range>
+			<soundCast>OuterRim_Shot_BlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+		<AmmoUser>
+			<magazineSize>24</magazineSize>
+			<reloadTime>3.84</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Pistol</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_E5Blaster</defName>
+		<statBases>
+			<SightsEfficiency>0.95</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>0.75</SwayFactor>
+			<Bulk>6.00</Bulk>
+			<Mass>4.10</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterRifle_Red</defaultProjectile>
+			<warmupTime>0.75</warmupTime>
+			<range>44</range>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<burstShotCount>5</burstShotCount>
+			<soundCast>OuterRim_Shot_MediumBlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>70</magazineSize>
+			<reloadTime>5.6</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Rifle</ammoSet>
+		</AmmoUser>
+	</Operation>
+	
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>OuterRim_E5sSniperRifle</defName>
+		<statBases>
+			<SightsEfficiency>2.5</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>2.25</SwayFactor>
+			<Bulk>14.5</Bulk>
+			<Mass>8.0</Mass>
+			<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+			<NightVisionEfficiency_Weapon>0.4</NightVisionEfficiency_Weapon>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BlasterSniper_Red</defaultProjectile>
+			<warmupTime>2.8</warmupTime>
+			<range>75</range>
+			<soundCast>OuterRim_Shot_PowerBlasterBolt</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>1.2</reloadTime>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Sniper</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Tatooine Sandcrawler/Defs/Outer Rim - Tatooine Sandcrawler/BodyShapeDefs.xml b/ModPatches/Outer Rim - Tatooine Sandcrawler/Defs/Outer Rim - Tatooine Sandcrawler/BodyShapeDefs.xml
new file mode 100644
index 0000000000..cfb352bdc3
--- /dev/null
+++ b/ModPatches/Outer Rim - Tatooine Sandcrawler/Defs/Outer Rim - Tatooine Sandcrawler/BodyShapeDefs.xml	
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<CombatExtended.BodyShapeDef>
+		<defName>Sandcrawler_Shape</defName>
+		<width>0.25</width>
+		<widthLaying>0.25</widthLaying>
+		<height>0.01</height>
+		<heightLaying>0.01</heightLaying>
+	</CombatExtended.BodyShapeDef>
+
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Tatooine Sandcrawler/Patches/Outer Rim - Tatooine Sandcrawler/Patch_OuterRim_SandCrawler.xml b/ModPatches/Outer Rim - Tatooine Sandcrawler/Patches/Outer Rim - Tatooine Sandcrawler/Patch_OuterRim_SandCrawler.xml
new file mode 100644
index 0000000000..3aefbf3284
--- /dev/null
+++ b/ModPatches/Outer Rim - Tatooine Sandcrawler/Patches/Outer Rim - Tatooine Sandcrawler/Patch_OuterRim_SandCrawler.xml	
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Sandcrawler"]/race/baseBodySize</xpath>
+		<value>
+			<baseBodySize>10</baseBodySize>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Sandcrawler"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Sandcrawler_Shape</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Sandcrawler"]/statBases</xpath>
+		<value>
+			<CarryWeight>400</CarryWeight>
+			<CarryBulk>80</CarryBulk>
+			<MeleeDodgeChance>0</MeleeDodgeChance>
+			<MeleeCritChance>0</MeleeCritChance>
+			<MeleeParryChance>0</MeleeParryChance>
+			<MaxHitPoints>1000</MaxHitPoints>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Sandcrawler"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>30</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Sandcrawler"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Sandcrawler"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>3.51</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MechanicalSandcrawler"]//*[def="FrontHatch"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="MechanicalSandcrawler"]//*[def="FrontWindow" or def="Reactor" or def="FluidReprocessor"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Tatooine/Defs/Outer Rim - Tatooine/Ammo_OuterRim.xml b/ModPatches/Outer Rim - Tatooine/Defs/Outer Rim - Tatooine/Ammo_OuterRim.xml
new file mode 100644
index 0000000000..fdb0a12d68
--- /dev/null
+++ b/ModPatches/Outer Rim - Tatooine/Defs/Outer Rim - Tatooine/Ammo_OuterRim.xml	
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_Ion_Energy</defName>
+		<label>Ion Energy</label>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_Ion_Energy</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>EMP</damageDef>
+			<damageAmountBase>23</damageAmountBase>
+			<speed>60</speed>
+			<gravityFactor>0.5</gravityFactor>
+			<explosionRadius>1.5</explosionRadius>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+		</projectile>
+	</ThingDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Tusken</defName>
+		<label>12 Gauge</label>
+		<ammoTypes>
+			<Ammo_12Gauge_Slug>Bullet_12Gauge_Slug</Ammo_12Gauge_Slug>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Tatooine/Patches/Outer Rim - Tatooine/Patch_OuterRim_Apparel.xml b/ModPatches/Outer Rim - Tatooine/Patches/Outer Rim - Tatooine/Patch_OuterRim_Apparel.xml
new file mode 100644
index 0000000000..97317077ea
--- /dev/null
+++ b/ModPatches/Outer Rim - Tatooine/Patches/Outer Rim - Tatooine/Patch_OuterRim_Apparel.xml	
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_OuterRim_JawaRobe" or defName="O21_OuterRim_TuskenRaiderRobeA" or defName="O21_OuterRim_TuskenRaiderRobeB"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>40</CarryBulk>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="O21_OuterRim_JawaRobe" or defName="O21_OuterRim_TuskenRaiderRobeA" or defName="O21_OuterRim_TuskenRaiderRobeB"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_OuterRim_JawaRobe" or defName="O21_OuterRim_TuskenRaiderRobeA" or defName="O21_OuterRim_TuskenRaiderRobeB"]/statBases</xpath>
+		<value>
+			<Bulk>7.5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_OuterRim_JawaRobe" or defName="O21_OuterRim_TuskenRaiderRobeA" or defName="O21_OuterRim_TuskenRaiderRobeB"]/apparel/layers</xpath>
+		<value>
+			<li>Backpack</li>
+			<li>Webbing</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Jawa"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.05</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Leather_Jawa"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.02</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Tatooine/Patches/Outer Rim - Tatooine/Patch_OuterRim_Races.xml b/ModPatches/Outer Rim - Tatooine/Patches/Outer Rim - Tatooine/Patch_OuterRim_Races.xml
new file mode 100644
index 0000000000..7bfe3a5032
--- /dev/null
+++ b/ModPatches/Outer Rim - Tatooine/Patches/Outer Rim - Tatooine/Patch_OuterRim_Races.xml	
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Jawa -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Jawa"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Jawa"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1.35</MeleeDodgeChance>
+			<MeleeCritChance>0.75</MeleeCritChance>
+			<MeleeParryChance>0.9</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Jawa"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>0.8</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>0.8</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1.6</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Jawa"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Jawa"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Jawa"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Jawa"]/race/baseBodySize</xpath>
+		<value>
+			<baseBodySize>0.8</baseBodySize>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Jawa"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>0.8</baseHealthScale>
+		</value>
+	</Operation>
+
+	<!-- Tusken -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_TuskenRaider"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_TuskenRaider"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_TuskenRaider"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1.1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1.1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2.2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_TuskenRaider"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_TuskenRaider"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_TuskenRaider"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_TuskenRaider"]/race/baseBodySize</xpath>
+		<value>
+			<baseBodySize>1.1</baseBodySize>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_TuskenRaider"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>1.1</baseHealthScale>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Tatooine/Patches/Outer Rim - Tatooine/Patch_OuterRim_Weapons.xml b/ModPatches/Outer Rim - Tatooine/Patches/Outer Rim - Tatooine/Patch_OuterRim_Weapons.xml
new file mode 100644
index 0000000000..45f17be38d
--- /dev/null
+++ b/ModPatches/Outer Rim - Tatooine/Patches/Outer Rim - Tatooine/Patch_OuterRim_Weapons.xml	
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="O21_JawaIonBlaster" or
+			defName="O21_TuskenCycler"
+			]/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="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>O21_JawaIonBlaster</defName>
+		<statBases>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.21</ShotSpread>
+			<SwayFactor>1.32</SwayFactor>
+			<Bulk>3.00</Bulk>
+			<Mass>4.10</Mass>
+			<RangedWeapon_Cooldown>2.5</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Ion_Energy</defaultProjectile>
+			<warmupTime>2</warmupTime>
+			<range>35</range>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<!--
+	<AmmoUser>
+		<magazineSize>18</magazineSize>
+		<reloadTime>3.7</reloadTime>
+		<ammoSet>AmmoSet_SWPlasmaGasCartridgeJawa</ammoSet>
+	</AmmoUser>
+	-->
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>O21_TuskenCycler</defName>
+		<statBases>
+			<SightsEfficiency>0.9</SightsEfficiency>
+			<ShotSpread>0.5</ShotSpread>
+			<SwayFactor>1.8</SwayFactor>
+			<Bulk>3.00</Bulk>
+			<Mass>4.10</Mass>
+			<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Slug</defaultProjectile>
+			<warmupTime>2</warmupTime>
+			<range>45</range>
+			<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+			<burstShotCount>2</burstShotCount>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>16</magazineSize>
+			<reloadTime>4.0</reloadTime>
+			<ammoSet>AmmoSet_Tusken</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="O21_Gaderffii"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1</cooldownTime>
+					<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
+					<!--<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>-->
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>3.5</cooldownTime>
+					<armorPenetrationBlunt>0.956</armorPenetrationBlunt>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_Gaderffii"]/statBases</xpath>
+		<value>
+			<Bulk>8.5</Bulk>
+			<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="O21_Gaderffii"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.17</MeleeCritChance>
+				<MeleeParryChance>1.45</MeleeParryChance>
+				<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outland - Core/Patches/Outland - Core/Buildings_Security.xml b/ModPatches/Outland - Core/Patches/Outland - Core/Buildings_Security.xml
new file mode 100644
index 0000000000..d055ccbb4d
--- /dev/null
+++ b/ModPatches/Outland - Core/Patches/Outland - Core/Buildings_Security.xml	
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Pact Catapult -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_PactCatapult"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_PactCatapult"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Outland_Gun_PactCatapult"]/building</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Outland_Gun_PactCatapult"]/comps/li[@Class="CompProperties_ChangeableProjectile"]</xpath>
+	</Operation>
+
+	<!-- Pact Catapult - Weapon -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_Gun_PactCatapult"]/statBases</xpath>
+		<value>
+			<SightsEfficiency>0.5</SightsEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Outland_Gun_PactCatapult"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>10</li>
+					<li>20</li>
+					<li>30</li>
+					<li>50</li>
+					<li>70</li>
+				</chargeSpeeds>
+			</li>
+			<li Class="CombatExtended.CompProperties_AmmoUser">
+				<magazineSize>1</magazineSize>
+				<reloadTime>12</reloadTime>
+				<ammoSet>AmmoSet_Catapult</ammoSet>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Outland_Gun_PactCatapult"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+					<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Projectile_CatapultBullet_Boulder</defaultProjectile>
+					<warmupTime>4</warmupTime>
+					<minRange>30</minRange>
+					<range>500</range>
+					<burstShotCount>1</burstShotCount>
+					<soundCast>Bow_Recurve</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<indirectFirePenalty>0.2</indirectFirePenalty>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Outland_Gun_PactCatapult"]/weaponTags</xpath>
+		<value>
+			<li>TurretGun</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outland - Redburn Pact/Patches/Outland - Redburn Pact/Apparel_Redburn.xml b/ModPatches/Outland - Redburn Pact/Patches/Outland - Redburn Pact/Apparel_Redburn.xml
new file mode 100644
index 0000000000..f75cbe7467
--- /dev/null
+++ b/ModPatches/Outland - Redburn Pact/Patches/Outland - Redburn Pact/Apparel_Redburn.xml	
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Pact Furs -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_PactFurs"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+			<Bulk>2.5</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- Pact Harness -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_PactHarness"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
+			<Bulk>7</Bulk>
+			<WornBulk>3.5</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- Pact Leather Helmet -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_PactLeatherHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- Pact Caster Mask -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_TribalMask_PactCaster"]</xpath>
+		<value>
+			<statBases>
+				<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+				<Bulk>1</Bulk>
+				<WornBulk>0.5</WornBulk>
+			</statBases>
+		</value>
+	</Operation>
+
+	<!-- Pact Cap -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_PactCap"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- Pact Fur Helmet -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_PactFurHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- Pact Warlord Cuirass (has same stats as vanilla plate armor) -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_PactWarlordCuirass"]/statBases</xpath>
+		<value>
+			<Bulk>90</Bulk>
+			<WornBulk>12.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_PactWarlordCuirass"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Pact Warlord Pauldrons -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_PactWarlordPauldrons"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>2.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_PactWarlordPauldrons"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Pact Warlord Helmet -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_PactWarlordHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_PactWarlordHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.75</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outland - Redburn Pact/Patches/Outland - Redburn Pact/PawnKinds_Redburn.xml b/ModPatches/Outland - Redburn Pact/Patches/Outland - Redburn Pact/PawnKinds_Redburn.xml
new file mode 100644
index 0000000000..930a5e4f24
--- /dev/null
+++ b/ModPatches/Outland - Redburn Pact/Patches/Outland - Redburn Pact/PawnKinds_Redburn.xml	
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Give ammo to pawns with ranged weapons. -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Outland_PactArcher" or defName="Outland_PactArcherCaptain" or defName="Outland_Ascensionist"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>12</min>
+					<max>18</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.3</generateChance>
+						<sidearmMoney>
+							<min>150</min>
+							<max>350</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>EastbornLightSharp</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Give tribal backpacks to pawns with ranged weapons. -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="Outland_Ascensionist"]/apparelRequired</xpath>
+		<value>
+			<li>CE_Apparel_TribalBackpack</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="Outland_PactArcher" or defName="Outland_PactArcherCaptain"]</xpath>
+		<value>
+			<apparelRequired>
+				<li>CE_Apparel_TribalBackpack</li>
+			</apparelRequired>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="Outland_PactArcher" or defName="Outland_PactArcherCaptain" or defName="Outland_Ascensionist"]/specificApparelRequirements</xpath>
+		<value>
+			<li>
+				<apparelLayer>Backpack</apparelLayer>
+				<color>(50, 123, 168)</color>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outland - Redburn Pact/Patches/Outland - Redburn Pact/Races_Goblin.xml b/ModPatches/Outland - Redburn Pact/Patches/Outland - Redburn Pact/Races_Goblin.xml
new file mode 100644
index 0000000000..2bb2dacf81
--- /dev/null
+++ b/ModPatches/Outland - Redburn Pact/Patches/Outland - Redburn Pact/Races_Goblin.xml	
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Goblin -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Goblin"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Goblin"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>0.6</MeleeCritChance>
+			<MeleeParryChance>0.8</MeleeParryChance>
+			<CarryWeight>20</CarryWeight>
+			<CarryBulk>15</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Goblin"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hand</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.19</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hand</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.19</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.11</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.19</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Goblin"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Goblin"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Goblin"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outland - Redburn Pact/Patches/Outland - Redburn Pact/Races_Hobgoblin.xml b/ModPatches/Outland - Redburn Pact/Patches/Outland - Redburn Pact/Races_Hobgoblin.xml
new file mode 100644
index 0000000000..c8cbf7f1dd
--- /dev/null
+++ b/ModPatches/Outland - Redburn Pact/Patches/Outland - Redburn Pact/Races_Hobgoblin.xml	
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Hobgoblin -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Hobgoblin"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Hobgoblin"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4.3</MoveSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Hobgoblin"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.90</MeleeDodgeChance>
+			<MeleeCritChance>1.1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<SmokeSensitivity>1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Hobgoblin"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>4.96</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.938</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.57</cooldownTime>
+					<chanceFactor>0.33</chanceFactor>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Hobgoblin"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Hobgoblin"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Hobgoblin"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outland - Redburn Pact/Patches/Outland - Redburn Pact/Races_Orc.xml b/ModPatches/Outland - Redburn Pact/Patches/Outland - Redburn Pact/Races_Orc.xml
new file mode 100644
index 0000000000..ed0cf5d4ff
--- /dev/null
+++ b/ModPatches/Outland - Redburn Pact/Patches/Outland - Redburn Pact/Races_Orc.xml	
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Orc -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Orc"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Orc"]/race/baseBodySize</xpath>
+		<value>
+			<baseBodySize>1.1</baseBodySize>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Orc"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4.35</MoveSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Orc"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.95</MeleeDodgeChance>
+			<MeleeCritChance>1.05</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<SmokeSensitivity>0.90</SmokeSensitivity>
+			<CarryWeight>41</CarryWeight>
+			<CarryBulk>22</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Orc"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.42</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.42</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>4.88</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.875</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.57</cooldownTime>
+					<chanceFactor>0.33</chanceFactor>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Orc"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Orc"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Orc"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outland - Redburn Pact/Patches/Outland - Redburn Pact/Races_Varag.xml b/ModPatches/Outland - Redburn Pact/Patches/Outland - Redburn Pact/Races_Varag.xml
new file mode 100644
index 0000000000..937562f9fe
--- /dev/null
+++ b/ModPatches/Outland - Redburn Pact/Patches/Outland - Redburn Pact/Races_Varag.xml	
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Varag -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Varag"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Varag"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>0.6</MeleeCritChance>
+			<MeleeParryChance>0.8</MeleeParryChance>
+			<CarryWeight>20</CarryWeight>
+			<CarryBulk>15</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Varag"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hand</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.19</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hand</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.19</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.11</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.19</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Varag"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Varag"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Varag"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outland - Redburn Pact/Patches/Outland - Redburn Pact/Redburn_WeaponsMelee.xml b/ModPatches/Outland - Redburn Pact/Patches/Outland - Redburn Pact/Redburn_WeaponsMelee.xml
new file mode 100644
index 0000000000..74b14e0410
--- /dev/null
+++ b/ModPatches/Outland - Redburn Pact/Patches/Outland - Redburn Pact/Redburn_WeaponsMelee.xml	
@@ -0,0 +1,404 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Pact Club -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_PactClub"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.49</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>3.375</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>2.67</cooldownTime>
+					<armorPenetrationBlunt>15.75</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_PactClub"]/statBases</xpath>
+		<value>
+			<Bulk>14</Bulk>
+			<MeleeCounterParryBonus>0.28</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_PactClub"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.6</MeleeCritChance>
+				<MeleeParryChance>0.38</MeleeParryChance>
+				<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Pact Spear -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_PactSpear"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.29</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>1.913</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.71</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.85</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.14</cooldownTime>
+					<chanceFactor>1.00</chanceFactor>
+					<armorPenetrationBlunt>1.913</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.4</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>3.2</cooldownTime>
+					<chanceFactor>0.33</chanceFactor>
+					<armorPenetrationBlunt>1.913</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.28</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_PactSpear"]/statBases</xpath>
+		<value>
+			<Bulk>11</Bulk>
+			<MeleeCounterParryBonus>2.12</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_PactSpear"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.39</MeleeCritChance>
+				<MeleeParryChance>1.59</MeleeParryChance>
+				<MeleeDodgeChance>0.90</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Pact Axe -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_PactAxe"]/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>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_PactAxe"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_PactAxe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.10</MeleeCritChance>
+				<MeleeParryChance>0.15</MeleeParryChance>
+				<MeleeDodgeChance>0.20</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_PactAxe"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- Pact Dagger -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_PactDagger"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.29</cooldownTime>
+					<armorPenetrationBlunt>0.275</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.29</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.275</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_PactDagger"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_PactDagger"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.63</MeleeCritChance>
+				<MeleeParryChance>0.5</MeleeParryChance>
+				<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_PactDagger"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- Pact Fork -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_PactFork"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.78</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>1.000</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.79</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>6.76</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_PactFork"]/statBases</xpath>
+		<value>
+			<Bulk>7</Bulk>
+			<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_PactFork"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.50</MeleeCritChance>
+				<MeleeParryChance>0.18</MeleeParryChance>
+				<MeleeDodgeChance>0.30</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Pact Sword -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_PactSword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.33</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.936</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.33</cooldownTime>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>0.936</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.88</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>31</power>
+					<cooldownTime>1.28</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>2.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.65</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_PactSword"]/statBases</xpath>
+		<value>
+			<Bulk>7.85</Bulk>
+			<MeleeCounterParryBonus>1.38</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_PactSword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.85</MeleeCritChance>
+				<MeleeParryChance>0.69</MeleeParryChance>
+				<MeleeDodgeChance>0.37</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Obsidian Sword -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_ObsidianSword"]/statBases</xpath>
+		<value>
+			<Bulk>13</Bulk>
+			<MeleeCounterParryBonus>1.5</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Outland_ObsidianSword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.3</MeleeCritChance>
+				<MeleeParryChance>1.6</MeleeParryChance>
+				<MeleeDodgeChance>0.56</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_ObsidianSword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>48</power>
+					<cooldownTime>3.4</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>10.4</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.8</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<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>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outland - Redburn Pact/Patches/Outland - Redburn Pact/Redburn_WeaponsRanged.xml b/ModPatches/Outland - Redburn Pact/Patches/Outland - Redburn Pact/Redburn_WeaponsRanged.xml
new file mode 100644
index 0000000000..e658a070a7
--- /dev/null
+++ b/ModPatches/Outland - Redburn Pact/Patches/Outland - Redburn Pact/Redburn_WeaponsRanged.xml	
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Pact Crossbow -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_PactCrossbow"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.65</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Outland_PactCrossbow</defName>
+		<statBases>
+			<Bulk>4</Bulk>
+			<SwayFactor>1.0</SwayFactor>
+			<ShotSpread>0.5</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>2.05</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Projectile_CrossbowBolt_Steel</defaultProjectile>
+			<warmupTime>0.90</warmupTime>
+			<range>20</range>
+			<soundCast>Bow_Small</soundCast>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>MedievalRanged</li>
+			<li>CE_Bow</li>
+		</weaponTags>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Outland - Redburn Pact/Patches/Outland - Redburn Pact/Scenarios_Redburn.xml b/ModPatches/Outland - Redburn Pact/Patches/Outland - Redburn Pact/Scenarios_Redburn.xml
new file mode 100644
index 0000000000..1c082ca16b
--- /dev/null
+++ b/ModPatches/Outland - Redburn Pact/Patches/Outland - Redburn Pact/Scenarios_Redburn.xml	
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Starting Things ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="Outland_RedburnPactScouts"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_Arrow_Steel</thingDef>
+				<count>100</count>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Palm Cats/Patches/Palm Cats/ThingDefs_Races.xml b/ModPatches/Palm Cats/Patches/Palm Cats/ThingDefs_Races.xml
new file mode 100644
index 0000000000..7b897a2016
--- /dev/null
+++ b/ModPatches/Palm Cats/Patches/Palm Cats/ThingDefs_Races.xml	
@@ -0,0 +1,290 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Common === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Leoplicant" or defName="MalmTiger" or defName="PalmCat"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Leoplicant === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Leoplicant"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			<MeleeCritChance>0.12</MeleeCritChance>
+			<MeleeParryChance>0.06</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leoplicant"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>0.97</cooldownTime>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.523</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>0.97</cooldownTime>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.523</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.35</cooldownTime>
+					<armorPenetrationSharp>0.35</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.97</cooldownTime>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Leoplicant"]/combatPower</xpath>
+		<value>
+			<combatPower>120</combatPower>
+		</value>
+	</Operation>
+
+	<!-- === Malm Tiger === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MalmTiger"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.29</MeleeDodgeChance>
+			<MeleeCritChance>0.06</MeleeCritChance>
+			<MeleeParryChance>0.03</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MalmTiger"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>0.97</cooldownTime>
+					<armorPenetrationSharp>0.10</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>0.97</cooldownTime>
+					<armorPenetrationSharp>0.10</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.35</cooldownTime>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.690</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.97</cooldownTime>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="MalmTiger"]/combatPower</xpath>
+		<value>
+			<combatPower>90</combatPower>
+		</value>
+	</Operation>
+
+	<!-- === Palm Cat === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PalmCat"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			<MeleeCritChance>0.06</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PalmCat"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.60</cooldownTime>
+					<armorPenetrationSharp>0.10</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.60</cooldownTime>
+					<armorPenetrationSharp>0.10</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>0.97</cooldownTime>
+					<armorPenetrationBlunt>0.254</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.60</cooldownTime>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="PalmCat"]/combatPower</xpath>
+		<value>
+			<combatPower>90</combatPower>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Paniel the Automata/Defs/Paniel the Automata/Ammo_Paniel.xml b/ModPatches/Paniel the Automata/Defs/Paniel the Automata/Ammo_Paniel.xml
new file mode 100644
index 0000000000..863fd2ba7f
--- /dev/null
+++ b/ModPatches/Paniel the Automata/Defs/Paniel the Automata/Ammo_Paniel.xml	
@@ -0,0 +1,902 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==================== Shells ========================== -->
+
+	<ThingCategoryDef>
+		<defName>AmmoPanielHowitzerShells</defName>
+		<label>Paniel Howitzer shell</label>
+		<parent>AmmoShells</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberCannon</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_PanielHowitzerShell</defName>
+		<label>Paniel Howitzer shells</label>
+		<ammoTypes>
+			<Ammo_PanielHowitzerShell_HE>Bullet_PanielHowitzerShell_HE</Ammo_PanielHowitzerShell_HE>
+			<Ammo_PanielHowitzerShell_Incendiary>Bullet_PanielHowitzerShell_Incendiary</Ammo_PanielHowitzerShell_Incendiary>
+			<Ammo_PanielHowitzerShell_EMP>Bullet_PanielHowitzerShell_EMP</Ammo_PanielHowitzerShell_EMP>
+			<Ammo_PanielHowitzerShell_Smoke>Bullet_PanielHowitzerShell_Smoke</Ammo_PanielHowitzerShell_Smoke>
+			<Ammo_PanielHowitzerShell_Firefoam>Bullet_PanielHowitzerShell_Firefoam</Ammo_PanielHowitzerShell_Firefoam>
+			<Ammo_PanielHowitzerShell_AP>Bullet_PanielHowitzerShell_AP</Ammo_PanielHowitzerShell_AP>
+		</ammoTypes>
+		<isMortarAmmoSet>true</isMortarAmmoSet>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_PanielLSWMulti</defName>
+		<label>Paniel Multi-Launcher munitions</label>
+		<ammoTypes>
+			<Ammo_40x53mmGrenade_HE>Bullet_40x53mmGrenade_HE</Ammo_40x53mmGrenade_HE>
+			<Ammo_40x53mmGrenade_HE_TFuzed>Bullet_40x53mmGrenade_HE_TFuzed</Ammo_40x53mmGrenade_HE_TFuzed>
+			<Ammo_40x53mmGrenade_HEDP>Bullet_40x53mmGrenade_HEDP</Ammo_40x53mmGrenade_HEDP>
+			<Ammo_40x53mmGrenade_EMP>Bullet_40x53mmGrenade_EMP</Ammo_40x53mmGrenade_EMP>
+			<Ammo_40x53mmGrenade_Smoke>Bullet_40x53mmGrenade_Smoke</Ammo_40x53mmGrenade_Smoke>
+			<Ammo_30x64mmFuel_Incendiary>Bullet_30x64mmFuel_Incendiary</Ammo_30x64mmFuel_Incendiary>
+			<Ammo_30x64mmFuel_Thermobaric>Bullet_30x64mmFuel_Thermobaric</Ammo_30x64mmFuel_Thermobaric>
+			<Ammo_30x64mmFuel_Foam>Bullet_30x64mmFuel_Foam</Ammo_30x64mmFuel_Foam>
+		</ammoTypes>
+		<isMortarAmmoSet>false</isMortarAmmoSet>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_PanielRailShell</defName>
+		<label>Paniel Railgun shells</label>
+		<ammoTypes>
+			<Ammo_PanielRailShell>Bullet_PanielRail</Ammo_PanielRailShell>
+		</ammoTypes>
+		<isMortarAmmoSet>false</isMortarAmmoSet>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="105mmHowitzerShellBase">
+		<defName>Ammo_PanielHowitzerShell_HE</defName>
+		<label>Paniel Howitzer shell (HE)</label>
+		<graphicData>
+			<texPath>Things/Item/PNShell/PNShellHE</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<drawSize>0.90</drawSize>
+		</graphicData>
+		<tradeTags Inherit="False">
+			<li>CE_HeavyAmmo</li>
+			<li>CE_AutoEnableTrade</li>
+		</tradeTags>
+		<statBases>
+			<MarketValue>221.6</MarketValue>
+		</statBases>
+		<ammoClass>GrenadeHE</ammoClass>
+		<detonateProjectile>Bullet_PanielHowitzerShell_HE</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="105mmHowitzerShellBase">
+		<defName>Ammo_PanielHowitzerShell_Incendiary</defName>
+		<label>Paniel Howitzer shell (Incendiary)</label>
+		<graphicData>
+			<texPath>Things/Item/PNShell/PNShellIN</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<drawSize>0.90</drawSize>
+		</graphicData>
+		<tradeTags Inherit="False">
+			<li>CE_HeavyAmmo</li>
+			<li>CE_AutoEnableTrade</li>
+		</tradeTags>
+		<statBases>
+			<MarketValue>187.76</MarketValue>
+		</statBases>
+		<ammoClass>GrenadeIncendiary</ammoClass>
+		<detonateProjectile>Bullet_PanielHowitzerShell_Incendiary</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="105mmHowitzerShellBase">
+		<defName>Ammo_PanielHowitzerShell_EMP</defName>
+		<label>Paniel Howitzer shell (EMP)</label>
+		<graphicData>
+			<texPath>Things/Item/PNShell/PNShellEM</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<drawSize>0.90</drawSize>
+		</graphicData>
+		<tradeTags Inherit="False">
+			<li>CE_HeavyAmmo</li>
+			<li>CE_AutoEnableTrade</li>
+		</tradeTags>
+		<statBases>
+			<MarketValue>375.52</MarketValue>
+		</statBases>
+		<ammoClass>GrenadeEMP</ammoClass>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="105mmHowitzerShellBase">
+		<defName>Ammo_PanielHowitzerShell_Smoke</defName>
+		<label>Paniel Howitzer shell (Smoke)</label>
+		<graphicData>
+			<texPath>Things/Item/PNShell/PNShellSM</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<drawSize>0.90</drawSize>
+		</graphicData>
+		<tradeTags Inherit="False">
+			<li>CE_HeavyAmmo</li>
+			<li>CE_AutoEnableTrade</li>
+		</tradeTags>
+		<statBases>
+			<MarketValue>177.6</MarketValue>
+		</statBases>
+		<ammoClass>Smoke</ammoClass>
+		<detonateProjectile>Bullet_PanielHowitzerShell_Smoke</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="105mmHowitzerShellBase">
+		<defName>Ammo_PanielHowitzerShell_Firefoam</defName>
+		<label>Paniel Howitzer shell (Foam)</label>
+		<graphicData>
+			<texPath>Things/Item/PNShell/PNShellFF</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<drawSize>0.90</drawSize>
+		</graphicData>
+		<tradeTags Inherit="False">
+			<li>CE_HeavyAmmo</li>
+			<li>CE_AutoEnableTrade</li>
+		</tradeTags>
+		<statBases>
+			<MarketValue>191.76</MarketValue>
+		</statBases>
+		<ammoClass>FoamFuel</ammoClass>
+		<detonateProjectile>Bullet_PanielHowitzerShell_Firefoam</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="105mmHowitzerShellBase">
+		<defName>Ammo_PanielHowitzerShell_AP</defName>
+		<label>Paniel Howitzer shell (AP)</label>
+		<graphicData>
+			<texPath>Things/Item/PNShell/PNShellAP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<drawSize>0.90</drawSize>
+		</graphicData>
+		<tradeTags Inherit="False">
+			<li>CE_HeavyAmmo</li>
+			<li>CE_AutoEnableTrade</li>
+		</tradeTags>
+		<statBases>
+			<MarketValue>144.04</MarketValue>
+		</statBases>
+		<ammoClass>GrenadeHE</ammoClass>
+		<detonateProjectile>Bullet_PanielHowitzerShell_AP</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="105mmHowitzerShellBase">
+		<defName>Ammo_PanielHowitzerShell_Anti</defName>
+		<label>Paniel Howitzer shell (Anti)</label>
+		<graphicData>
+			<texPath>Things/Item/PNShell/PNShellAG</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<drawSize>0.90</drawSize>
+		</graphicData>
+		<tradeTags Inherit="False">
+			<li>CE_HeavyAmmo</li>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableTrade_Sellable</li>
+		</tradeTags>
+		<statBases>
+			<MarketValue>1500</MarketValue>
+		</statBases>
+		<ammoClass>Antigrain</ammoClass>
+		<detonateProjectile>Bullet_PanielHowitzerShell_Anti</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="105mmHowitzerShellBase">
+		<defName>Ammo_PanielRailShell</defName>
+		<label>Paniel Railgun shell</label>
+		<graphicData>
+			<texPath>Things/Item/PNShell/PNShellAP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<drawSize>0.90</drawSize>
+		</graphicData>
+		<tradeTags Inherit="False">
+			<li>CE_HeavyAmmo</li>
+			<li>CE_AutoEnableTrade</li>
+		</tradeTags>
+		<statBases>
+			<MarketValue>225</MarketValue>
+		</statBases>
+		<ammoClass>Antigrain</ammoClass>
+		<detonateProjectile>Bullet_PanielRail</detonateProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base105mmHowitzerShell">
+		<defName>Bullet_PanielHowitzerShell_HE</defName>
+		<label>Paniel Howitzer shell (HE)</label>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<graphicData>
+			<texPath>Things/Projectile/Cannon/Howitzer/HE</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>5</damageAmountBase>
+			<explosionRadius>0.5</explosionRadius>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Bullet_60mmMortarPaniel_HE>8</Bullet_60mmMortarPaniel_HE>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="Base105mmHowitzerShell">
+		<defName>Bullet_PanielHowitzerShell_Incendiary</defName>
+		<label>Paniel Howitzer shell (Incendiary)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Cannon/Howitzer/INC</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>5</damageAmountBase>
+			<explosionRadius>0.5</explosionRadius>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Bullet_60mmMortarPaniel_Incendiary>8</Bullet_60mmMortarPaniel_Incendiary>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="Base105mmHowitzerShell">
+		<defName>Bullet_PanielHowitzerShell_EMP</defName>
+		<label>Paniel Howitzer shell (EMP)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Cannon/Howitzer/EMP</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>5</damageAmountBase>
+			<explosionRadius>0.5</explosionRadius>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Bullet_60mmMortarPaniel_EMP>8</Bullet_60mmMortarPaniel_EMP>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="Base105mmHowitzerShell">
+		<defName>Bullet_PanielHowitzerShell_Smoke</defName>
+		<label>Paniel Howitzer shell (Smoke)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Cannon/Howitzer/SMK</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>5</damageAmountBase>
+			<explosionRadius>0.5</explosionRadius>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Bullet_60mmMortarPaniel_Smoke>8</Bullet_60mmMortarPaniel_Smoke>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="Base105mmHowitzerShell">
+		<defName>Bullet_PanielHowitzerShell_Firefoam</defName>
+		<label>Paniel Howitzer shell (Foam)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Cannon/Howitzer/SMK</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>5</damageAmountBase>
+			<explosionRadius>0.5</explosionRadius>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Bullet_60mmMortarPaniel_Firefoam>8</Bullet_60mmMortarPaniel_Firefoam>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="Base105mmHowitzerShell">
+		<defName>Bullet_PanielHowitzerShell_AP</defName>
+		<label>Paniel Howitzer shell (AP)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Cannon/Howitzer/IILUM</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>1050</damageAmountBase>
+			<explosionRadius>1</explosionRadius>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>30</Fragment_Large>
+					<Fragment_Small>50</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="Base105mmHowitzerShell">
+		<defName>Bullet_PanielHowitzerShell_Anti</defName>
+		<label>Paniel Howitzer shell (AP)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Cannon/Howitzer/ANTI</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>800</damageAmountBase>
+			<explosionRadius>50</explosionRadius>
+			<explosionChanceToStartFire>0.22</explosionChanceToStartFire>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<flyOverhead>true</flyOverhead>
+			<explosionEffect>GiantExplosion</explosionEffect>
+			<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+			<soundExplode>Explosion_GiantBomb</soundExplode>
+			<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+			<soundAmbient>MortarRound_Ambient</soundAmbient>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Cluster ========================== -->
+
+	<ThingDef ParentName="Base60mmMortarShell">
+		<defName>Bullet_60mmMortarPaniel_HE</defName>
+		<label>60mm mortar shell (HE)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Mortar/HE</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>9</speed>
+			<gravityFactor>5</gravityFactor>
+			<damageDef>Bomb</damageDef>
+			<explosionRadius>2</explosionRadius>
+			<damageAmountBase>76</damageAmountBase>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+			<flyOverhead>true</flyOverhead>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<ai_IsIncendiary>true</ai_IsIncendiary>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>6</Fragment_Large>
+					<Fragment_Small>31</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="Base60mmMortarShell">
+		<defName>Bullet_60mmMortarPaniel_Incendiary</defName>
+		<label>60mm mortar shell (Incendiary)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Mortar/Incendiary</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>9</speed>
+			<gravityFactor>5</gravityFactor>
+			<damageDef>PrometheumFlame</damageDef>
+			<damageAmountBase>6</damageAmountBase>
+			<explosionRadius>4.5</explosionRadius>
+			<flyOverhead>true</flyOverhead>
+			<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
+			<preExplosionSpawnChance>0.15</preExplosionSpawnChance>
+			<soundExplode>MortarIncendiary_Explode</soundExplode>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base60mmMortarShell">
+		<defName>Bullet_60mmMortarPaniel_EMP</defName>
+		<label>60mm mortar shell (EMP)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Mortar/EMP</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>9</speed>
+			<gravityFactor>5</gravityFactor>
+			<damageDef>EMP</damageDef>
+			<damageAmountBase>76</damageAmountBase>
+			<flyOverhead>true</flyOverhead>
+			<explosionRadius>3.5</explosionRadius>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base60mmMortarShell">
+		<defName>Bullet_60mmMortarPaniel_Firefoam</defName>
+		<label>60mm mortar shell (Foam)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Mortar/Firefoam</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>9</speed>
+			<gravityFactor>5</gravityFactor>
+			<damageDef>Extinguish</damageDef>
+			<suppressionFactor>0.0</suppressionFactor>
+			<dangerFactor>0.0</dangerFactor>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+			<explosionRadius>7</explosionRadius>
+			<flyOverhead>true</flyOverhead>
+			<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+			<soundExplode>Explosion_EMP</soundExplode>
+			<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+			<soundAmbient>MortarRound_Ambient</soundAmbient>
+			<postExplosionSpawnThingDef>Filth_FireFoam</postExplosionSpawnThingDef>
+			<postExplosionSpawnChance>1</postExplosionSpawnChance>
+			<postExplosionSpawnThingCount>3</postExplosionSpawnThingCount>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<explosionEffect>ExtinguisherExplosion</explosionEffect>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base60mmMortarShell">
+		<defName>Bullet_60mmMortarPaniel_Smoke</defName>
+		<label>60mm mortar shell (Smoke)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Mortar/Smoke</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>9</speed>
+			<gravityFactor>5</gravityFactor>
+			<damageDef>Smoke</damageDef>
+			<suppressionFactor>0.0</suppressionFactor>
+			<dangerFactor>0.0</dangerFactor>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+			<explosionRadius>4.5</explosionRadius>
+			<flyOverhead>true</flyOverhead>
+			<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+			<soundExplode>Explosion_EMP</soundExplode>
+			<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+			<soundAmbient>MortarRound_Ambient</soundAmbient>
+			<postExplosionGasType>BlindSmoke</postExplosionGasType>
+			<preExplosionSpawnChance>1</preExplosionSpawnChance>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<explosionEffect>ExtinguisherExplosion</explosionEffect>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Railgun Projectile ========================== -->
+
+	<ThingDef ParentName="Base90mmCannonShell">
+		<defName>Bullet_PanielRail</defName>
+		<label>Prototype Railgun Shot</label>
+		<graphicData>
+			<texPath>Things/Projectile/Charged/ChargeLanceShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>400</speed>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>600</damageAmountBase>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<armorPenetrationSharp>500</armorPenetrationSharp>
+			<armorPenetrationBlunt>12000</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>250</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_PanielHowitzerShell_HE</defName>
+		<label>make Paniel HE Howitzer shells x2</label>
+		<description>Craft 2 Paniel HE Howitzer shells.</description>
+		<jobString>Making Paniel HE Howitzer shells.</jobString>
+		<workAmount>11600</workAmount>
+		<recipeUsers Inherit="False">
+			<li>PN_AutomatonBench</li>
+		</recipeUsers>
+		<researchPrerequisite>PNRP_AutoArtillery</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Shell_60mmMortar_HE</li>
+					</thingDefs>
+				</filter>
+				<count>16</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>Shell_60mmMortar_HE</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_PanielHowitzerShell_HE>2</Ammo_PanielHowitzerShell_HE>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_PanielHowitzerShell_Incendiary</defName>
+		<label>make Paniel Incendiary Howitzer shells x2</label>
+		<description>Craft 2 Paniel Incendiary Howitzer shells.</description>
+		<jobString>Making Paniel Incendiary Howitzer shells.</jobString>
+		<workAmount>11600</workAmount>
+		<recipeUsers Inherit="False">
+			<li>PN_AutomatonBench</li>
+		</recipeUsers>
+		<researchPrerequisite>PNRP_AutoArtillery</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Shell_60mmMortar_Incendiary</li>
+					</thingDefs>
+				</filter>
+				<count>16</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>Shell_60mmMortar_Incendiary</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_PanielHowitzerShell_Incendiary>2</Ammo_PanielHowitzerShell_Incendiary>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_PanielHowitzerShell_EMP</defName>
+		<label>make Paniel EMP Howitzer shells x2</label>
+		<description>Craft 2 Paniel EMP Howitzer shells.</description>
+		<jobString>Making Paniel EMP Howitzer shells.</jobString>
+		<workAmount>11600</workAmount>
+		<recipeUsers Inherit="False">
+			<li>PN_AutomatonBench</li>
+		</recipeUsers>
+		<researchPrerequisite>PNRP_AutoArtillery</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Shell_60mmMortar_EMP</li>
+					</thingDefs>
+				</filter>
+				<count>16</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>Shell_60mmMortar_EMP</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_PanielHowitzerShell_EMP>2</Ammo_PanielHowitzerShell_EMP>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_PanielHowitzerShell_Smoke</defName>
+		<label>make Paniel Smoke Howitzer shells x2</label>
+		<description>Craft 2 Paniel Smoke Howitzer shells.</description>
+		<jobString>Making Paniel Smoke Howitzer shells.</jobString>
+		<workAmount>11600</workAmount>
+		<recipeUsers Inherit="False">
+			<li>PN_AutomatonBench</li>
+		</recipeUsers>
+		<researchPrerequisite>PNRP_AutoArtillery</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Shell_60mmMortar_Smoke</li>
+					</thingDefs>
+				</filter>
+				<count>16</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>Shell_60mmMortar_Smoke</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_PanielHowitzerShell_Smoke>2</Ammo_PanielHowitzerShell_Smoke>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_PanielHowitzerShell_Firefoam</defName>
+		<label>make Paniel Firefoam Howitzer shells x2</label>
+		<description>Craft 2 Paniel firefoam Howitzer shells.</description>
+		<jobString>Making Paniel firefoam Howitzer shells.</jobString>
+		<workAmount>11600</workAmount>
+		<recipeUsers Inherit="False">
+			<li>PN_AutomatonBench</li>
+		</recipeUsers>
+		<researchPrerequisite>PNRP_AutoArtillery</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Shell_60mmMortar_Firefoam</li>
+					</thingDefs>
+				</filter>
+				<count>16</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>Shell_60mmMortar_Firefoam</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_PanielHowitzerShell_Firefoam>2</Ammo_PanielHowitzerShell_Firefoam>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_PanielHowitzerShell_Anti</defName>
+		<label>make Paniel Antigrain Howitzer shell</label>
+		<description>Craft Paniel antigrain Howitzer shell.</description>
+		<jobString>Making Paniel antigrain Howitzer shell.</jobString>
+		<workAmount>1200</workAmount>
+		<recipeUsers Inherit="False">
+			<li>PN_AutomatonBench</li>
+		</recipeUsers>
+		<researchPrerequisite>PNRP_AutoArtillery</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Shell_AntigrainWarhead</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Shell_AntigrainWarhead</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_PanielHowitzerShell_Anti>1</Ammo_PanielHowitzerShell_Anti>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_PanielHowitzerShell_AP</defName>
+		<label>make Paniel AP Howitzer shells x2</label>
+		<description>Craft 2 Paniel ap Howitzer shells.</description>
+		<jobString>Making Paniel ap Howitzer shells.</jobString>
+		<workAmount>11600</workAmount>
+		<recipeUsers Inherit="False">
+			<li>PN_AutomatonBench</li>
+		</recipeUsers>
+		<researchPrerequisite>PNRP_AutoArtillery</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>76</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>7</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>FSX</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_PanielHowitzerShell_AP>2</Ammo_PanielHowitzerShell_AP>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_PanielRailShell</defName>
+		<label>make Paniel Railgun Shell</label>
+		<description>Craft Paniel Railgun Shell.</description>
+		<jobString>Making Paniel Railgun Shell.</jobString>
+		<workAmount>16000</workAmount>
+		<recipeUsers Inherit="False">
+			<li>PN_AutomatonBench</li>
+		</recipeUsers>
+		<researchPrerequisite Inherit="False">PNRP_Railgun</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>50</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>30</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentSpacer</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Uranium</li>
+				<li>ComponentSpacer</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_PanielRailShell>1</Ammo_PanielRailShell>
+		</products>
+	</RecipeDef>
+
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Paniel the Automata/Defs/Paniel the Automata/DamageDef_Paniel.xml b/ModPatches/Paniel the Automata/Defs/Paniel the Automata/DamageDef_Paniel.xml
new file mode 100644
index 0000000000..83e8a8c394
--- /dev/null
+++ b/ModPatches/Paniel the Automata/Defs/Paniel the Automata/DamageDef_Paniel.xml	
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<DamageDef ParentName="Flame">
+		<defName>Flame_Nopenetration</defName>
+		<harmAllLayersUntilOutside>false</harmAllLayersUntilOutside>
+	</DamageDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Paniel the Automata/Patches/Paniel the Automata/Bodies/Paniel_Bodytype.xml b/ModPatches/Paniel the Automata/Patches/Paniel the Automata/Bodies/Paniel_Bodytype.xml
new file mode 100644
index 0000000000..e48e2f06ce
--- /dev/null
+++ b/ModPatches/Paniel the Automata/Patches/Paniel the Automata/Bodies/Paniel_Bodytype.xml	
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Arm Groups-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="PanielBody"]/corePart/parts/li[def="PNShoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="PanielBody"]/corePart/parts/li[def="PNShoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="PanielBody"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="PanielBody"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<!--Natural Armor-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="PanielBody"]//*[
+			def="PNTorso" or
+			def="PNNeck" or
+			def="PNHead" or
+			def="PNNose" or
+			def="PNJaw" or
+			def="PNEar" or
+			def="PNShoulder" or
+			def="PNArm" or
+			def="PNHand" or
+			def="PNFinger" or
+			def="PNLeg" or
+			def="PNFoot" or
+			def="PNToe" or
+			def="PNTail"]/groups
+		</xpath>
+
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Paniel the Automata/Patches/Paniel the Automata/HediffDef/Hediff.xml b/ModPatches/Paniel the Automata/Patches/Paniel the Automata/HediffDef/Hediff.xml
new file mode 100644
index 0000000000..bc02a35554
--- /dev/null
+++ b/ModPatches/Paniel the Automata/Patches/Paniel the Automata/HediffDef/Hediff.xml	
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[
+			defName="PN_RapidFireModuleHediff"
+			]/stages/li/statOffsets/ShootingAccuracyPawn </xpath>
+		<value>
+			<ShootingAccuracyPawn>-0.2</ShootingAccuracyPawn>
+			<AimingAccuracy>-0.2</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[
+			defName="PN_CQCModuleHediff"
+			]/stages/li/statOffsets/ShootingAccuracyPawn </xpath>
+		<value>
+			<ShootingAccuracyPawn>-0.4</ShootingAccuracyPawn>
+			<AimingAccuracy>-0.2</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!-- ==========  Abilities  =========== -->
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Ideology</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[
+						defName="PN_OfficerCommand" or
+						defName="PN_OfficerCommandBuff"
+						]/stages/li/statOffsets/ShootingAccuracyPawn </xpath>
+					<value>
+						<ShootingAccuracyPawn>0.4</ShootingAccuracyPawn>
+						<AimingAccuracy>0.2</AimingAccuracy>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[
+						defName="PN_RapidFire"
+						]/stages/li/statOffsets/ShootingAccuracyPawn </xpath>
+					<value>
+						<ShootingAccuracyPawn>-0.4</ShootingAccuracyPawn>
+						<AimingAccuracy>-0.4</AimingAccuracy>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[
+						defName="PN_RapidFireOverload"
+						]/stages/li/statOffsets/ShootingAccuracyPawn </xpath>
+					<value>
+						<ShootingAccuracyPawn>-0.6</ShootingAccuracyPawn>
+						<AimingAccuracy>-0.6</AimingAccuracy>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Paniel the Automata/Patches/Paniel the Automata/PawnKindsDef_Paniel/PawnKinds_Misc.xml b/ModPatches/Paniel the Automata/Patches/Paniel the Automata/PawnKindsDef_Paniel/PawnKinds_Misc.xml
new file mode 100644
index 0000000000..5e02b84770
--- /dev/null
+++ b/ModPatches/Paniel the Automata/Patches/Paniel the Automata/PawnKindsDef_Paniel/PawnKinds_Misc.xml	
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="PN_AssociateH" or
+			defName="PN_AssociateP_EngineerA" or
+			defName="PN_AssociateP_EngineerB" or
+			defName="PN_AssociateP_DomesticA" or
+			defName="PN_AssociateP_DomesticB"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>3</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="PN_ManagerH" or
+			defName="PN_ManageUnit_Enginer" or
+			defName="PN_ManageUnit_Domestic" or
+			defName="PN_Director" or
+			@Name="PN_NPCBasePawnKind"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="PN_GrenadePBase"]</xpath>
+		<value>
+			<li Inherit="False" Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>10</min>
+					<max>20</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>50</min>
+						<max>500</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm</li>
+					</weaponTags>
+					<magazineCount>
+						<min>1</min>
+						<max>2</max>
+					</magazineCount>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="PN_EliteCannonUnit"]</xpath>
+		<value>
+			<li Inherit="False" Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>15</min>
+					<max>20</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>500</min>
+						<max>1200</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>PN_Revolver</li>
+					</weaponTags>
+					<magazineCount>
+						<min>2</min>
+						<max>3</max>
+					</magazineCount>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="PN_SecurityGuardH" or
+			defName="PN_SecurityUnit" or
+			@Name="PN_MidUnitBase"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="PN_EliteUnitBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Paniel the Automata/Patches/Paniel the Automata/ThingDefs_Buildings/Buildings_Turrets.xml b/ModPatches/Paniel the Automata/Patches/Paniel the Automata/ThingDefs_Buildings/Buildings_Turrets.xml
new file mode 100644
index 0000000000..e13a0a6dd2
--- /dev/null
+++ b/ModPatches/Paniel the Automata/Patches/Paniel the Automata/ThingDefs_Buildings/Buildings_Turrets.xml	
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_Artillery_Base_Core"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PN_Artillery_Base_Core"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.25</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_Artillery_Base_Core"]/statBases/Mass</xpath>
+		<value>
+			<Mass>1000</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_Artillery_Base_Core"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_Artillery_Base_Core"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>1.1</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<!-- ==========  Paniel Cannon  =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>PN_Artillery_Turret</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>0.80</SwayFactor>
+			<Bulk>22.00</Bulk>
+			<Mass>18.50</Mass>
+			<RangedWeapon_Cooldown>1.55</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.12</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_81mmMortarShell_HE</defaultProjectile>
+			<warmupTime>8</warmupTime>
+			<minRange>32</minRange>
+			<range>700</range>
+			<soundCast>PNCannonSound</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<circularError>1</circularError>
+			<indirectFirePenalty>0.2</indirectFirePenalty>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<ammoSet>AmmoSet_PanielHowitzerShell</ammoSet>
+		</AmmoUser>
+
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="PN_Artillery_Turret" ]/building/fixedStorageSettings</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="PN_Artillery_Turret" ]/building/defaultStorageSettings</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="PN_Artillery_Turret" ]/comps/li[@Class="CompProperties_ChangeableProjectile"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "PN_Artillery_Turret"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>30</li>
+					<li>50</li>
+					<li>70</li>
+					<li>90</li>
+				</chargeSpeeds>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_Railgun_Base_Core"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PN_Railgun_Base_Core"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.25</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_Railgun_Base_Core"]/statBases/Mass</xpath>
+		<value>
+			<Mass>1000</Mass>
+		</value>
+	</Operation>
+	<!--
+<li Class="PatchOperationRemove">
+<xpath>Defs/ThingDef[@Name="PN_BaseArtilleryBuilding" ]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
+</li>
+-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_Railgun_Base_Core"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_Railgun_Base_Core"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>1.1</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<!-- ==========  Paniel Cannon  =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>PN_Railgun_Turret</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>0.80</SwayFactor>
+			<Bulk>22.00</Bulk>
+			<Mass>18.50</Mass>
+			<RangedWeapon_Cooldown>1.55</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.12</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_PanielRail</defaultProjectile>
+			<warmupTime>4</warmupTime>
+			<minRange>5</minRange>
+			<range>86</range>
+			<soundAiming>PN_PrototypeRailGun_Warmup_Sound</soundAiming>
+			<soundCast>PN_PrototypeRailGun_Fire_Sound</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>16</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<ammoSet>AmmoSet_PanielRailShell</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="PN_Railgun_Turret"]/building/fixedStorageSettings</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="PN_Railgun_Turret"]/building/defaultStorageSettings</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="PN_Railgun_Turret" ]/comps/li[@Class="CompProperties_ChangeableProjectile"]</xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Paniel the Automata/Patches/Paniel the Automata/ThingDefs_Items/Items_Resources.xml b/ModPatches/Paniel the Automata/Patches/Paniel the Automata/ThingDefs_Items/Items_Resources.xml
new file mode 100644
index 0000000000..5eab0bc995
--- /dev/null
+++ b/ModPatches/Paniel the Automata/Patches/Paniel the Automata/ThingDefs_Items/Items_Resources.xml	
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==========  Leather  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Automaton"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.05</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Paniel the Automata/Patches/Paniel the Automata/ThingDefs_Misc/Paniel_Apparel.xml b/ModPatches/Paniel the Automata/Patches/Paniel the Automata/ThingDefs_Misc/Paniel_Apparel.xml
new file mode 100644
index 0000000000..aa39e5777f
--- /dev/null
+++ b/ModPatches/Paniel the Automata/Patches/Paniel the Automata/ThingDefs_Misc/Paniel_Apparel.xml	
@@ -0,0 +1,321 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==========  Module  =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="PN_ApparelModuleBase"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<!--========= Stuffable =========-->
+
+	<!--Fabric-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_ApparelBasic"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_ApparelBasicHat"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PN_ApparelCape"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_ApparelCape"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!--Metallic-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PN_ApparelMilitia" or
+			defName="PN_ApparelWorker" or
+			defName="PN_ApparelMaid"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PN_ApparelMilitiaHat" or
+			defName="PN_ApparelWorkerHat" or
+			defName="PN_ApparelMaidHat"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5.5</StuffEffectMultiplierArmor>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_ApparelMilitia"]/statBases/Mass</xpath>
+		<value>
+			<Mass>8</Mass>
+			<Bulk>25</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PN_ApparelWorker" or
+			defName="PN_ApparelMaid"
+			]/statBases/Mass </xpath>
+		<value>
+			<Mass>6</Mass>
+			<Bulk>25</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- Advanced -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_ApparelSoldier"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>9</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_ApparelSoldier"]/statBases/Mass</xpath>
+		<value>
+			<Mass>12</Mass>
+			<Bulk>28</Bulk>
+			<WornBulk>20</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_ApparelSoldier"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<CarryBulk>20</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_ApparelSoldierHat"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_ApparelSoldierHat"]/statBases/Mass</xpath>
+		<value>
+			<Mass>2</Mass>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.4</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_ApparelSoldierHat"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<AimingAccuracy>0.1</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!-- Security -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_EliteSecurityUniform"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_EliteSecurityUniform"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>40</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_EliteSecurityUniform"]/statBases/Mass</xpath>
+		<value>
+			<Mass>12</Mass>
+			<Bulk>28</Bulk>
+			<WornBulk>16</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_EliteSecurityUniform"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			<CarryBulk>25</CarryBulk>
+			<CarryWeight>10</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_EliteSecurityHat"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_EliteSecurityHat"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>35</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_EliteSecurityHat"]/statBases/Mass</xpath>
+		<value>
+			<Mass>3</Mass>
+			<Bulk>2.5</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.70</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_EliteSecurityHat"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<AimingAccuracy>0.3</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!-- Advanced -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_ApparelRoyalguard"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>12</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_ApparelRoyalguard"]/statBases/Mass</xpath>
+		<value>
+			<Mass>16</Mass>
+			<Bulk>28</Bulk>
+			<WornBulk>22</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_ApparelRoyalguard"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			<CarryBulk>30</CarryBulk>
+			<CarryWeight>20</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_ApparelRoyalguardHat"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>10</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_ApparelRoyalguardHat"]/statBases/Mass</xpath>
+		<value>
+			<Mass>5</Mass>
+			<Bulk>2.5</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_ApparelRoyalguardHat"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<AimingAccuracy>0.3</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!-- Advanced -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_ApparelRoyalmaid" or
+			defName="PN_ApparelRoyalmeister"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>8.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_ApparelRoyalmaid" or
+			defName="PN_ApparelRoyalmeister"]/statBases/Mass </xpath>
+		<value>
+			<Mass>8</Mass>
+			<Bulk>25</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_ApparelRoyalmaidHat" or
+			defName="PN_ApparelRoyalmeisterHat" or
+			defName="PN_ApparelRoyalmeisterHatWithMonocle" or
+			defName="PN_ApparelRoyalmeisterMonocle"]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_ApparelRoyalmaidHat" or
+			defName="PN_ApparelRoyalmeisterHat" or
+			defName="PN_ApparelRoyalmeisterHatWithMonocle" or
+			defName="PN_ApparelRoyalmeisterMonocle"]/statBases/Mass </xpath>
+		<value>
+			<Mass>2</Mass>
+			<Bulk>0.5</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PN_ApparelMilitia" or
+			defName="PN_ApparelMilitiaHat" or
+			defName="PN_ApparelSoldier" or
+			defName="PN_ApparelSoldierHat" or
+			defName="PN_ApparelWorker" or
+			defName="PN_ApparelWorkerHat" or
+			defName="PN_ApparelMaid" or
+			defName="PN_ApparelMaidHat" or
+			defName="PN_ApparelRoyalguard" or
+			defName="PN_ApparelRoyalguardHat" or
+			defName="PN_ApparelRoyalmaid" or
+			defName="PN_ApparelRoyalmaidHat"]/stuffCategories </xpath>
+		<value>
+			<stuffCategories>
+				<li>Steeled</li>
+			</stuffCategories>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Paniel the Automata/Patches/Paniel the Automata/ThingDefs_Misc/Weapons.xml b/ModPatches/Paniel the Automata/Patches/Paniel the Automata/ThingDefs_Misc/Weapons.xml
new file mode 100644
index 0000000000..a5fb81fc2c
--- /dev/null
+++ b/ModPatches/Paniel the Automata/Patches/Paniel the Automata/ThingDefs_Misc/Weapons.xml	
@@ -0,0 +1,1095 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@ParentName="PN_ShellBase"]</xpath>
+	</Operation>
+
+	<!-- ==========  Shovel  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_Shovel"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.78</cooldownTime>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>2.38</cooldownTime>
+					<armorPenetrationBlunt>9</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.19</cooldownTime>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PN_Shovel"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
+			<Bulk>5.5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PN_Shovel"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PN_Shovel"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.42</MeleeCritChance>
+			<MeleeParryChance>0.24</MeleeParryChance>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- ==========  PN_Chainsword  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_Chainsword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.78</cooldownTime>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.19</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>39</power>
+					<cooldownTime>1</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.6</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PN_Chainsword"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.39</MeleeCounterParryBonus>
+			<Bulk>6.5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PN_Chainsword"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.08</MeleeCritChance>
+			<MeleeParryChance>0.24</MeleeParryChance>
+			<MeleeDodgeChance>1.07</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PN_Chainsword"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- ==========  Sword  =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PN_Chainlongsword"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+			<Bulk>13.5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PN_Chainlongsword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.63</MeleeCritChance>
+				<MeleeParryChance>0.75</MeleeParryChance>
+				<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_Chainlongsword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>44</power>
+					<cooldownTime>1.57</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>6.75</armorPenetrationBlunt>
+					<armorPenetrationSharp>13.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>100</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<armorPenetrationSharp>8.1</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2.35</cooldownTime>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ==========  Hammer  =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PN_WarHammer"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.28</MeleeCounterParryBonus>
+			<Bulk>14.5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PN_WarHammer"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.6</MeleeCritChance>
+				<MeleeParryChance>0.38</MeleeParryChance>
+				<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_WarHammer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.8</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>2.67</cooldownTime>
+					<armorPenetrationBlunt>15.75</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Rifle =========== -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="PN_Rifle"]/verbs</xpath>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>PN_Rifle</defName>
+		<statBases>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.34</SwayFactor>
+			<Bulk>10.25</Bulk>
+			<Mass>3.19</Mass>
+			<RangedWeapon_Cooldown>0.78</RangedWeapon_Cooldown>
+			<WorkToMake>10000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+			<WoodLog>10</WoodLog>
+		</costList>
+
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>62</range>
+			<soundCast>PNRifleSound</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>0.65</reloadTime>
+			<ammoSet>AmmoSet_303British</ammoSet>
+			<reloadOneAtATime>true</reloadOneAtATime>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Revolver =========== -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="PN_Revolver"]/verbs</xpath>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>PN_Revolver</defName>
+		<statBases>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.47</SwayFactor>
+			<Bulk>3.25</Bulk>
+			<Mass>1.40</Mass>
+			<RangedWeapon_Cooldown>0.49</RangedWeapon_Cooldown>
+			<WorkToMake>10000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+			<WoodLog>5</WoodLog>
+		</costList>
+
+		<Properties>
+			<recoilAmount>3.71</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_44Magnum_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<range>12</range>
+			<soundCast>Shot_Revolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>5.1</reloadTime>
+			<ammoSet>AmmoSet_44Magnum</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Machinegun =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>PN_Machinegun</defName>
+		<statBases>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.49</SwayFactor>
+			<Bulk>12.35</Bulk>
+			<Mass>10.00</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<WorkToMake>31000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>75</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+			<WoodLog>15</WoodLog>
+		</costList>
+
+		<Properties>
+			<recoilAmount>1.24</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<range>59</range>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>80</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_303British</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PN_Machinegun"]/weaponTags</xpath>
+		<value>
+			<li>Bipod_LMG</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Portable Cannon =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>PN_Cannon</defName>
+		<statBases>
+			<SightsEfficiency>2.60</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>2.58</SwayFactor>
+			<Bulk>19.85</Bulk>
+			<Mass>18.00</Mass>
+			<RangedWeapon_Cooldown>1.38</RangedWeapon_Cooldown>
+			<WorkToMake>19500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>120</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+			<WoodLog>25</WoodLog>
+		</costList>
+
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_20x110mmHispano_AP</defaultProjectile>
+			<warmupTime>2.8</warmupTime>
+			<range>41</range>
+			<soundCast>PNCannonSound</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
+			<reloadTime>2.2</reloadTime>
+			<ammoSet>AmmoSet_20x110mmHispano</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PN_Cannon"]/weaponTags</xpath>
+		<value>
+			<li>Bipod_ATR</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Dual Royal Pistol =========== -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="PN_TwinPistol"]/verbs</xpath>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>PN_TwinPistol</defName>
+		<statBases>
+			<SightsEfficiency>0.60</SightsEfficiency>
+			<ShotSpread>1.70</ShotSpread>
+			<SwayFactor>1.14</SwayFactor>
+			<Bulk>5.50</Bulk>
+			<Mass>4.6</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>1.25</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<burstShotCount>12</burstShotCount>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<range>14</range>
+			<soundCast>Shot_Revolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>36</magazineSize>
+			<reloadTime>5.5</reloadTime>
+			<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>6</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Royal Rifle =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>PN_RoyalRifle</defName>
+		<statBases>
+			<SightsEfficiency>2.60</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.37</SwayFactor>
+			<Bulk>9.05</Bulk>
+			<Mass>4.60</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>2.28</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x50mmCharged</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<range>62</range>
+			<soundCast>PNRoyalRifleSound</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>0.65</reloadTime>
+			<ammoSet>AmmoSet_8x50mmCharged</ammoSet>
+			<reloadOneAtATime>true</reloadOneAtATime>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Royal Machinegun =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>PN_RoyalMachinegun</defName>
+		<statBases>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.49</SwayFactor>
+			<Bulk>12.35</Bulk>
+			<Mass>10.00</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>0.96</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<range>59</range>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<soundCast>PNRoyalMachinegunSound</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>120</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PN_RoyalMachinegun"]/weaponTags</xpath>
+		<value>
+			<li>Bipod_LMG</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Royal Cannon =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>PN_RoyalHeavySlug</defName>
+		<statBases>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.85</SwayFactor>
+			<Bulk>12.00</Bulk>
+			<Mass>4.6</Mass>
+			<RangedWeapon_Cooldown>0.83</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12x72mmCharged</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>31</range>
+			<soundCast>PNRoyalHCSound</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>0.95</reloadTime>
+			<ammoSet>AmmoSet_12x72mmCharged</ammoSet>
+			<reloadOneAtATime>true</reloadOneAtATime>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Royal Launcher =========== -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="PN_RoyalLSW"]/verbs</xpath>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>PN_RoyalLSW</defName>
+		<statBases>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.87</SwayFactor>
+			<Bulk>12.05</Bulk>
+			<Mass>5.70</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>1.89</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_40x53mmGrenade_HE</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_IncendiaryLauncher</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>5.5</reloadTime>
+			<ammoSet>AmmoSet_PanielLSWMulti</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>PN_PrototypeRailGun</defName>
+		<statBases>
+			<Mass>12.00</Mass>
+			<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>2.80</SwayFactor>
+			<Bulk>13.0</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_PanielRail</defaultProjectile>
+			<warmupTime>2.1</warmupTime>
+			<range>53</range>
+			<burstShotCount>1</burstShotCount>
+			<soundAiming>PN_PrototypeRailGun_Warmup_Sound</soundAiming>
+			<soundCast>PN_PrototypeRailGun_Fire_Sound</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<muzzleFlashScale>14</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_PrototypeRailGun"]/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>
+
+	<!-- ========== Melee Attacks =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_Rifle" or
+			defName="PN_Machinegun" or
+			defName="PN_Cannon" or
+			defName="PN_RoyalRifle" or
+			defName="PN_RoyalHeavySlug" or
+			defName="PN_RoyalMachinegun" or
+			defName="PN_RoyalLSW"
+			]/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="PN_Revolver" or
+			defName="PN_TwinPistol"]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PN_TwinPistol"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>kick</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>2.36</cooldownTime>
+					<armorPenetrationBlunt>11.75</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Close Shot</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>0.36</cooldownTime>
+					<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PN_TwinPistol"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.10</MeleeCritChance>
+				<MeleeParryChance>0.70</MeleeParryChance>
+				<MeleeDodgeChance>0.50</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- ========== Cost Adjustments =========== -->
+
+	<!-- ========== Royalty Equipment =========== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="PN_RoyalSaber_Bladelink"]</xpath>
+		<match Class="PatchOperationSequence">
+			<operations>
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="PN_RoyalSaber_Bladelink"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>handle</label>
+								<capacities>
+									<li>Poke</li>
+								</capacities>
+								<power>3</power>
+								<cooldownTime>1.53</cooldownTime>
+								<chanceFactor>0.10</chanceFactor>
+								<armorPenetrationBlunt>0.968</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>edge</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>51</power>
+								<extraMeleeDamages>
+									<li>
+										<def>Flame</def>
+										<amount>8</amount>
+										<chance>0.3</chance>
+									</li>
+								</extraMeleeDamages>
+								<cooldownTime>1.03</cooldownTime>
+								<chanceFactor>0.66</chanceFactor>
+								<armorPenetrationBlunt>5.576</armorPenetrationBlunt>
+								<armorPenetrationSharp>29.04</armorPenetrationSharp>
+								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>point</label>
+								<capacities>
+									<li>Stab</li>
+								</capacities>
+								<power>26</power>
+								<extraMeleeDamages>
+									<li>
+										<def>Flame</def>
+										<amount>5</amount>
+										<chance>0.2</chance>
+									</li>
+								</extraMeleeDamages>
+								<cooldownTime>0.96</cooldownTime>
+								<armorPenetrationBlunt>2.478</armorPenetrationBlunt>
+								<armorPenetrationSharp>38.72</armorPenetrationSharp>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="PN_RoyalSaber_Bladelink"]/statBases</xpath>
+					<value>
+						<Bulk>8.5</Bulk>
+						<MeleeCounterParryBonus>0.90</MeleeCounterParryBonus>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="PN_RoyalSaber_Bladelink"]</xpath>
+					<value>
+						<equippedStatOffsets>
+							<MeleeCritChance>1.10</MeleeCritChance>
+							<MeleeParryChance>0.70</MeleeParryChance>
+							<MeleeDodgeChance>0.50</MeleeDodgeChance>
+						</equippedStatOffsets>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="PN_Chainsword_Bladelink"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>handle</label>
+								<capacities>
+									<li>Poke</li>
+								</capacities>
+								<power>2</power>
+								<cooldownTime>1.36</cooldownTime>
+								<armorPenetrationBlunt>0.605</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>edge</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>38</power>
+								<cooldownTime>0.74</cooldownTime>
+								<chanceFactor>1.33</chanceFactor>
+								<armorPenetrationBlunt>3.485</armorPenetrationBlunt>
+								<armorPenetrationSharp>21.78</armorPenetrationSharp>
+								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>point</label>
+								<capacities>
+									<li>Stab</li>
+								</capacities>
+								<power>16</power>
+								<cooldownTime>0.85</cooldownTime>
+								<armorPenetrationBlunt>1.173</armorPenetrationBlunt>
+								<armorPenetrationSharp>30.24</armorPenetrationSharp>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="PN_Chainsword_Bladelink"]/statBases</xpath>
+					<value>
+						<Bulk>5.5</Bulk>
+						<MeleeCounterParryBonus>0.50</MeleeCounterParryBonus>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="PN_Chainsword_Bladelink"]</xpath>
+					<value>
+						<equippedStatOffsets>
+							<MeleeCritChance>1.10</MeleeCritChance>
+							<MeleeParryChance>0.50</MeleeParryChance>
+							<MeleeDodgeChance>0.37</MeleeDodgeChance>
+						</equippedStatOffsets>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="PN_RoyalHammer_Bladelink"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>handle</label>
+								<capacities>
+									<li>Poke</li>
+								</capacities>
+								<power>4</power>
+								<cooldownTime>1.62</cooldownTime>
+								<chanceFactor>0.10</chanceFactor>
+								<armorPenetrationBlunt>1.21</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>PN_ElectricalBluntTool</li>
+								</capacities>
+								<power>49</power>
+								<extraMeleeDamages>
+									<li>
+										<def>EMP</def>
+										<amount>8</amount>
+									</li>
+								</extraMeleeDamages>
+								<cooldownTime>2.24</cooldownTime>
+								<armorPenetrationBlunt>190.575</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+								<chanceFactor>0.30</chanceFactor>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="PN_RoyalHammer_Bladelink"]/statBases</xpath>
+					<value>
+						<Bulk>5.5</Bulk>
+						<MeleeCounterParryBonus>0.50</MeleeCounterParryBonus>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="PN_RoyalHammer_Bladelink"]</xpath>
+					<value>
+						<equippedStatOffsets>
+							<MeleeCritChance>1.60</MeleeCritChance>
+							<MeleeParryChance>0.40</MeleeParryChance>
+							<MeleeDodgeChance>0.40</MeleeDodgeChance>
+						</equippedStatOffsets>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="PN_StormLance_Bladelink"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>handle</label>
+								<capacities>
+									<li>Poke</li>
+								</capacities>
+								<power>3</power>
+								<cooldownTime>1.53</cooldownTime>
+								<chanceFactor>0.10</chanceFactor>
+								<armorPenetrationBlunt>0.968</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>side</label>
+								<capacities>
+									<li>PN_ElectricalBluntTool</li>
+								</capacities>
+								<power>28</power>
+								<extraMeleeDamages>
+									<li>
+										<def>EMP</def>
+										<amount>8</amount>
+									</li>
+								</extraMeleeDamages>
+								<cooldownTime>1.03</cooldownTime>
+								<chanceFactor>0.66</chanceFactor>
+								<armorPenetrationBlunt>111.6</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>point</label>
+								<capacities>
+									<li>PN_ElectricalStabTool</li>
+								</capacities>
+								<power>26</power>
+								<extraMeleeDamages>
+									<li>
+										<def>EMP</def>
+										<amount>8</amount>
+									</li>
+								</extraMeleeDamages>
+								<cooldownTime>0.96</cooldownTime>
+								<armorPenetrationBlunt>2.478</armorPenetrationBlunt>
+								<armorPenetrationSharp>38.72</armorPenetrationSharp>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="PN_StormLance_Bladelink"]/statBases</xpath>
+					<value>
+						<Bulk>5.5</Bulk>
+						<MeleeCounterParryBonus>0.50</MeleeCounterParryBonus>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="PN_StormLance_Bladelink"]</xpath>
+					<value>
+						<equippedStatOffsets>
+							<MeleeCritChance>1.60</MeleeCritChance>
+							<MeleeParryChance>0.40</MeleeParryChance>
+							<MeleeDodgeChance>0.40</MeleeDodgeChance>
+						</equippedStatOffsets>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Paniel the Automata/Patches/Paniel the Automata/ThingDefs_Races/AlienRace_Paniel.xml b/ModPatches/Paniel the Automata/Patches/Paniel the Automata/ThingDefs_Races/AlienRace_Paniel.xml
new file mode 100644
index 0000000000..5a11c07760
--- /dev/null
+++ b/ModPatches/Paniel the Automata/Patches/Paniel the Automata/ThingDefs_Races/AlienRace_Paniel.xml	
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Paniel_Race"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Paniel_Race"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Paniel_Race"]/statBases</xpath>
+		<value>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>0.5</Suppressability>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Paniel_Race"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Paniel_Race"]/alienRace/raceRestriction/whiteApparelList</xpath>
+		<value>
+			<li>CE_Apparel_TacVest</li>
+			<li>CE_Apparel_Backpack</li>
+			<li>CE_Apparel_TribalBackpack</li>
+			<li>CE_Apparel_BallisticShield</li>
+			<li>CE_Apparel_MeleeShield</li>
+			<li>CE_Apparel_GasMask</li>
+			<li>CE_Apparel_ImprovGasMask</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Pawnbold Race/Patches/Pawnbold Race/Body_Pawnbold.xml b/ModPatches/Pawnbold Race/Patches/Pawnbold Race/Body_Pawnbold.xml
new file mode 100644
index 0000000000..01dcc5504a
--- /dev/null
+++ b/ModPatches/Pawnbold Race/Patches/Pawnbold Race/Body_Pawnbold.xml	
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==================== Pawnbold Body ==================== -->
+
+	<!-- ========== Add groups ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "right eye"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "left eye"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "left ear"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "right ear"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel = "left arm"]/groups</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel = "right arm"]/groups</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Add armor coverage (for pawns with non-zero armor that use Pawnbold_Body body) ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def = "Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def = "Tail"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Ear"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def = "Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/parts/li[def = "Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def = "Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/parts/li[def = "Toe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Pawnbold Race/Patches/Pawnbold Race/PawnKinds_Misc.xml b/ModPatches/Pawnbold Race/Patches/Pawnbold Race/PawnKinds_Misc.xml
new file mode 100644
index 0000000000..9cf1e8241b
--- /dev/null
+++ b/ModPatches/Pawnbold Race/Patches/Pawnbold Race/PawnKinds_Misc.xml	
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Give ammo to bowman ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Pawnbold_Archer" or defName="Pawnbold_Hunter" or defName="Pawnbold_HeavyArcher" or defName="Pawnbold_ChiefRanged"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>14</min>
+					<max>26</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>150</min>
+						<max>350</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>NeolithicMeleeBasic</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Pawnbold Race/Patches/Pawnbold Race/Race_Pawnbold.xml b/ModPatches/Pawnbold Race/Patches/Pawnbold Race/Race_Pawnbold.xml
new file mode 100644
index 0000000000..415b67b239
--- /dev/null
+++ b/ModPatches/Pawnbold Race/Patches/Pawnbold Race/Race_Pawnbold.xml	
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Pawnbold_bold"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Pawnbold_bold"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Pawnbold_bold"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Pawnbold_bold"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Pawnbold_bold"]/race/baseBodySize</xpath>
+		<value>
+			<baseBodySize>0.6</baseBodySize>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Pawnbold_bold"]/statBases</xpath>
+		<value>
+			<CarryWeight>40</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+			<MeleeDodgeChance>1.1</MeleeDodgeChance>
+			<MeleeCritChance>0.4</MeleeCritChance>
+			<MeleeParryChance>0.5</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Pawnbold_bold"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.57</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.57</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.46</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Pawnbold Race/Patches/Pawnbold Race/Scenarios_Misc.xml b/ModPatches/Pawnbold Race/Patches/Pawnbold Race/Scenarios_Misc.xml
new file mode 100644
index 0000000000..001463c795
--- /dev/null
+++ b/ModPatches/Pawnbold Race/Patches/Pawnbold Race/Scenarios_Misc.xml	
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Starting Things ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="PawnboldLostTribe"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_Arrow_Stone</thingDef>
+				<count>100</count>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="PawnboldLostTribe"]/scenario/parts/li[thingDef="Pila" and @Class="ScenPart_StartingThing_Defined"]</xpath>
+		<value>
+			<count>10</count>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Penguin/Patches/Penguin/Races_Penguin.xml b/ModPatches/Penguin/Patches/Penguin/Races_Penguin.xml
new file mode 100644
index 0000000000..a4634da8fb
--- /dev/null
+++ b/ModPatches/Penguin/Patches/Penguin/Races_Penguin.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/ThingDef[defName="CutePenguin"]</xpath>
+	<value>
+		<li Class="CombatExtended.RacePropertiesExtensionCE">
+			<bodyShape>Humanoid</bodyShape>
+		</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="CutePenguin"]/statBases</xpath>
+	<value>
+		<MeleeDodgeChance>0.14</MeleeDodgeChance>
+		<MeleeCritChance>0.05</MeleeCritChance>
+		<MeleeParryChance>0.03</MeleeParryChance>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="CutePenguin"]/verbs</xpath>
+	<value>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<capacities>
+					<li>Bite</li>
+				</capacities>
+				<power>5</power>
+				<cooldownTime>0.6</cooldownTime>
+				<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+				<chanceFactor>0.5</chanceFactor>
+				<armorPenetration>0.117</armorPenetration>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>head</label>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<power>3</power>
+				<cooldownTime>1.65</cooldownTime>
+				<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+				<chanceFactor>0.2</chanceFactor>
+				<armorPenetration>0.08</armorPenetration>
+			</li>
+		</tools>
+	</value>
+</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Polarisbloc Core Lab/Patches/Polarisbloc Core Lab/HediffDefs/Hediffs_CombatChip.xml b/ModPatches/Polarisbloc Core Lab/Patches/Polarisbloc Core Lab/HediffDefs/Hediffs_CombatChip.xml
new file mode 100644
index 0000000000..d5911ff564
--- /dev/null
+++ b/ModPatches/Polarisbloc Core Lab/Patches/Polarisbloc Core Lab/HediffDefs/Hediffs_CombatChip.xml	
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Combat Chip modes-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="PolarisCombatChip_Currency"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>0.2</ShootingAccuracyPawn>
+			<AimingAccuracy>0.1</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="PolarisCombatChip_Sniper"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<AimingAccuracy>0.5</AimingAccuracy>
+			<ReloadSpeed>0.5</ReloadSpeed>
+			<Suppressability>-0.25</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="PolarisCombatChip_Scouter"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.87</MeleeDodgeChance>
+			<MeleeCritChance>0.04</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+			<Suppressability>-0.50</Suppressability>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Polarisbloc Security Force/Defs/Polarisbloc Security Force/Ammo/Ammo_Polaris.xml b/ModPatches/Polarisbloc Security Force/Defs/Polarisbloc Security Force/Ammo/Ammo_Polaris.xml
new file mode 100644
index 0000000000..797ad67e5d
--- /dev/null
+++ b/ModPatches/Polarisbloc Security Force/Defs/Polarisbloc Security Force/Ammo/Ammo_Polaris.xml	
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_6x24mmPolarisSF</defName>
+		<label>6x24mm Charged Bullet (Canicula)</label>
+		<ammoTypes>
+			<Ammo_6x24mmCharged>Bullet_6x24mmPolarisSF</Ammo_6x24mmCharged>
+			<Ammo_6x24mmCharged_AP>Bullet_6x24mmPolarisSF_AP</Ammo_6x24mmCharged_AP>
+			<Ammo_6x24mmCharged_Ion>Bullet_6x24mmPolarisSF_Ion</Ammo_6x24mmCharged_Ion>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_6x24mmPolarisSF</defName>
+		<label>6x24mm Charged SF bullet</label>
+		<graphicData>
+			<texPath>PolarisblocSF/Projectile/Bullet_CaniculaRifle</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>192</speed>
+			<damageAmountBase>7</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>8</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>15</armorPenetrationSharp>
+			<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_6x24mmPolarisSF_AP</defName>
+		<label>6x24mm Charged SF bullet (Conc.)</label>
+		<graphicData>
+			<texPath>PolarisblocSF/Projectile/Bullet_CaniculaRifle</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>192</speed>
+			<damageAmountBase>5</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>4</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>30</armorPenetrationSharp>
+			<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_6x24mmPolarisSF_Ion</defName>
+		<label>6x24mm Charged SF bullet (Ion)</label>
+		<graphicData>
+			<texPath>PolarisblocSF/Projectile/Bullet_CaniculaRifle</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>192</speed>
+			<damageAmountBase>5</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>12</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>22.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_8x35mmPolarisSF</defName>
+		<label>8x35mm Charged Bullet (Canicula)</label>
+		<ammoTypes>
+			<Ammo_8x35mmCharged>Bullet_8x35mmPolarisSF</Ammo_8x35mmCharged>
+			<Ammo_8x35mmCharged_AP>Bullet_8x35mmPolarisSF_AP</Ammo_8x35mmCharged_AP>
+			<Ammo_8x35mmCharged_Ion>Bullet_8x35mmPolarisSF_Ion</Ammo_8x35mmCharged_Ion>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef ParentName="Base8x35mmChargedBullet">
+		<defName>Bullet_8x35mmPolarisSF</defName>
+		<label>8x35mm Charged SF bullet</label>
+		<graphicData>
+			<texPath>PolarisblocSF/Projectile/Bullet_CaniculaSniper</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>7</damageAmountBase>
+			<speed>192</speed>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>12</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>15</armorPenetrationSharp>
+			<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base8x35mmChargedBullet">
+		<defName>Bullet_8x35mmPolarisSF_AP</defName>
+		<label>8x35mm Charged SF bullet (Conc.)</label>
+		<graphicData>
+			<texPath>PolarisblocSF/Projectile/Bullet_CaniculaSniper</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>6</damageAmountBase>
+			<speed>192</speed>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>4</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>30</armorPenetrationSharp>
+			<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base8x35mmChargedBullet">
+		<defName>Bullet_8x35mmPolarisSF_Ion</defName>
+		<label>8x35mm Charged SF bullet (Ion)</label>
+		<graphicData>
+			<texPath>PolarisblocSF/Projectile/Bullet_CaniculaSniper</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>6</damageAmountBase>
+			<speed>192</speed>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>18</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>22.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Polarisbloc Security Force/Patches/Polarisbloc Security Force/PawnKindDefs/PawnKinds_SecuirityForce.xml b/ModPatches/Polarisbloc Security Force/Patches/Polarisbloc Security Force/PawnKindDefs/PawnKinds_SecuirityForce.xml
new file mode 100644
index 0000000000..1216fdf654
--- /dev/null
+++ b/ModPatches/Polarisbloc Security Force/Patches/Polarisbloc Security Force/PawnKindDefs/PawnKinds_SecuirityForce.xml	
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Polarisbloc_SFSoldier" or
+			defName="Polarisbloc_SFCaptain" or
+			defName="Polarisbloc_SFCommander"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>1</generateChance>
+						<sidearmMoney>
+							<min>200</min>
+							<max>400</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Polarisbloc_SFSoldier"]/combatPower</xpath>
+		<value>
+			<combatPower>185</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Polarisbloc_SFSoldier"]/combatPower</xpath>
+		<value>
+			<combatPower>256</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Polarisbloc_SFSoldier"]/combatPower</xpath>
+		<value>
+			<combatPower>270</combatPower>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Polarisbloc Security Force/Patches/Polarisbloc Security Force/Thingdefs_Misc/Apparel.xml b/ModPatches/Polarisbloc Security Force/Patches/Polarisbloc Security Force/Thingdefs_Misc/Apparel.xml
new file mode 100644
index 0000000000..83a173cefa
--- /dev/null
+++ b/ModPatches/Polarisbloc Security Force/Patches/Polarisbloc Security Force/Thingdefs_Misc/Apparel.xml	
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Std Armor, 1/3 protection of devilstrand flak-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Polarisbloc_CygnusStandardArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.35</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Polarisbloc_CygnusStandardArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Polarisbloc_CygnusStandardArmor"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<CarryBulk>20</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Polarisbloc_CygnusStandardArmor"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Cap Armor, 1/2 protection of devilstrand flak-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Polarisbloc_CygnusStandardArmorC"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Polarisbloc_CygnusStandardArmorC"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Polarisbloc_CygnusStandardArmorC"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<CarryBulk>20</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Polarisbloc_CygnusStandardArmorC"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Strategy Assistant-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Polarisbloc_AlkaidStrategyAssistant"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Polarisbloc_AlkaidStrategyAssistant"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>0.4</ShootingAccuracyPawn>
+			<AimingAccuracy>0.2</AimingAccuracy>
+			<Suppressability>-0.2</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Polarisbloc_AlkaidStrategyAssistant"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Tac Goggles-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Polarisbloc_ThubanTacticalGoggles"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Polarisbloc_ThubanTacticalGoggles"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Polarisbloc_ThubanTacticalGoggles"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>0.4</ShootingAccuracyPawn>
+			<AimingAccuracy>0.2</AimingAccuracy>
+			<MeleeCritChance>0.05</MeleeCritChance>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Polarisbloc Security Force/Patches/Polarisbloc Security Force/Thingdefs_Misc/Weapons.xml b/ModPatches/Polarisbloc Security Force/Patches/Polarisbloc Security Force/Thingdefs_Misc/Weapons.xml
new file mode 100644
index 0000000000..d3f565886b
--- /dev/null
+++ b/ModPatches/Polarisbloc Security Force/Patches/Polarisbloc Security Force/Thingdefs_Misc/Weapons.xml	
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Polarisbloc_CaniculaRifle" or
+			defName="Polarisbloc_CaniculaSniper"]/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="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Polarisbloc_CaniculaRifle</defName>
+		<statBases>
+			<Bulk>7.50</Bulk>
+			<Mass>2.7</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.15</SightsEfficiency>
+			<SwayFactor>1.05</SwayFactor>
+			<ShotSpread>0.05</ShotSpread>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.74</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmPolarisSF</defaultProjectile>
+			<warmupTime>1.225</warmupTime>
+			<range>62</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_6x24mmPolarisSF</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Polarisbloc_CaniculaSniper</defName>
+		<statBases>
+			<Bulk>19.00</Bulk>
+			<Mass>3.30</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.51</SightsEfficiency>
+			<SwayFactor>1.57</SwayFactor>
+			<ShotSpread>0.01</ShotSpread>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x35mmPolarisSF</defaultProjectile>
+			<warmupTime>1.525</warmupTime>
+			<range>78</range>
+			<soundCast>ChargeLance_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>9</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_8x35mmPolarisSF</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Poleepkwa Race/Defs/Poleepkwa Race/Pawnkinds_Prawns.xml b/ModPatches/Poleepkwa Race/Defs/Poleepkwa Race/Pawnkinds_Prawns.xml
new file mode 100644
index 0000000000..e4da1cb639
--- /dev/null
+++ b/ModPatches/Poleepkwa Race/Defs/Poleepkwa Race/Pawnkinds_Prawns.xml	
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ========== Tribals ========== -->
+
+	<PawnKindDef>
+		<defName>PpGrenadier</defName>
+		<race>Poleepkwa</race>
+		<label>boomer</label>
+		<initialWillRange>1~3</initialWillRange>
+		<initialResistanceRange>12~19</initialResistanceRange>
+		<combatPower>60</combatPower>
+		<defaultFactionType>PoleepkwaFaction</defaultFactionType>
+		<backstoryCategories>
+			<li>Tribal</li>
+		</backstoryCategories>
+		<maxGenerationAge>60</maxGenerationAge>
+		<chemicalAddictionChance>0.05</chemicalAddictionChance>
+		<invNutrition>2.55</invNutrition>
+		<invFoodDef>Pemmican</invFoodDef>
+		<canBeSapper>true</canBeSapper>
+		<gearHealthRange>
+			<min>0.5</min>
+			<max>1.8</max>
+		</gearHealthRange>
+		<apparelMoney>
+			<min>180</min>
+			<max>350</max>
+		</apparelMoney>
+		<apparelRequired>
+			<li>Apparel_WarVeil</li>
+			<li>CE_Apparel_TribalBackpack</li>
+		</apparelRequired>
+		<apparelTags>
+			<li>Tribal</li>
+		</apparelTags>
+		<weaponMoney>
+			<min>60</min>
+			<max>400</max>
+		</weaponMoney>
+		<weaponTags>
+			<li>CE_GrenadeNeolithic</li>
+		</weaponTags>
+		<techHediffsMoney>
+			<min>50</min>
+			<max>800</max>
+		</techHediffsMoney>
+		<techHediffsTags>
+			<li>Poor</li>
+			<li>Simple</li>
+		</techHediffsTags>
+		<techHediffsChance>0.33</techHediffsChance>
+		<modExtensions>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>14</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>80</min>
+						<max>160</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Tribal</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</modExtensions>
+	</PawnKindDef>
+
+	<PawnKindDef>
+		<defName>PpGunner</defName>
+		<race>Poleepkwa</race>
+		<label>thunderer</label>
+		<initialWillRange>3~5</initialWillRange>
+		<initialResistanceRange>20~34</initialResistanceRange>
+		<combatPower>60</combatPower>
+		<defaultFactionType>PoleepkwaFaction</defaultFactionType>
+		<backstoryCategories>
+			<li>Tribal</li>
+		</backstoryCategories>
+		<maxGenerationAge>60</maxGenerationAge>
+		<chemicalAddictionChance>0.05</chemicalAddictionChance>
+		<invNutrition>2.55</invNutrition>
+		<invFoodDef>Pemmican</invFoodDef>
+		<gearHealthRange>
+			<min>0.5</min>
+			<max>1.8</max>
+		</gearHealthRange>
+		<apparelMoney>
+			<min>180</min>
+			<max>350</max>
+		</apparelMoney>
+		<apparelTags>
+			<li>Tribal</li>
+		</apparelTags>
+		<apparelRequired>
+			<li>Apparel_WarMask</li>
+		</apparelRequired>
+		<weaponMoney>
+			<min>180</min>
+			<max>290</max>
+		</weaponMoney>
+		<weaponTags>
+			<li>Gun</li>
+		</weaponTags>
+		<techHediffsMoney>
+			<min>50</min>
+			<max>800</max>
+		</techHediffsMoney>
+		<techHediffsTags>
+			<li>Poor</li>
+			<li>Simple</li>
+		</techHediffsTags>
+		<techHediffsChance>0.20</techHediffsChance>
+		<modExtensions>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>120</min>
+					<max>160</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.9</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</modExtensions>
+	</PawnKindDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Poleepkwa Race/Patches/Poleepkwa Race/New_Prawns.xml b/ModPatches/Poleepkwa Race/Patches/Poleepkwa Race/New_Prawns.xml
new file mode 100644
index 0000000000..1174cbfaca
--- /dev/null
+++ b/ModPatches/Poleepkwa Race/Patches/Poleepkwa Race/New_Prawns.xml	
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Add tribal grenadies ========== -->
+
+	<Operation Class="PatchOperationAdd"><!-- Combat -->
+		<xpath>Defs/FactionDef[defName="PoleepkwaFaction"]/pawnGroupMakers/li[1]/options</xpath>
+		<value>
+			<PpGrenadier>5</PpGrenadier>
+			<PpGunner>10</PpGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Peaceful -->
+		<xpath>Defs/FactionDef[defName="PoleepkwaFaction"]/pawnGroupMakers/li[2]/options</xpath>
+		<value>
+			<PpGrenadier>6</PpGrenadier>
+			<PpGunner>6</PpGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Trader -->
+		<xpath>Defs/FactionDef[defName="PoleepkwaFaction"]/pawnGroupMakers/li[3]/guards</xpath>
+		<value>
+			<PpGrenadier>4</PpGrenadier>
+			<PpGunner>8</PpGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Settlement -->
+		<xpath>Defs/FactionDef[defName="PoleepkwaFaction"]/pawnGroupMakers/li[4]/options</xpath>
+		<value>
+			<PpGrenadier>8</PpGrenadier>
+			<PpGunner>12</PpGunner>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Poleepkwa Race/Patches/Poleepkwa Race/Patch_Bodies_Prawny.xml b/ModPatches/Poleepkwa Race/Patches/Poleepkwa Race/Patch_Bodies_Prawny.xml
new file mode 100644
index 0000000000..62305ce12e
--- /dev/null
+++ b/ModPatches/Poleepkwa Race/Patches/Poleepkwa Race/Patch_Bodies_Prawny.xml	
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Changing coverage of the bodyDef (should've done this sooner, but eh) -->
+	<!-- why yes dear explorer of this file, i did just literally copy and paste the PoleepkwaBody bodytype patches -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="PoleepkwaBody"]/corePart/parts/li[def="Ribcage"]/coverage</xpath>
+		<value>
+			<coverage>0.07</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="PoleepkwaBody"]/corePart/parts/li[def="Pelvis"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="PoleepkwaBody"]/corePart/parts/li[def="Stomach"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="PoleepkwaBody"]/corePart/parts/li[def="Heart"]/coverage</xpath>
+		<value>
+			<coverage>0.04</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="PoleepkwaBody"]/corePart/parts/li[def="Lung"]/coverage</xpath>
+		<value>
+			<coverage>0.055</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="PoleepkwaBody"]/corePart/parts/li[def="Kidney"]/coverage</xpath>
+		<value>
+			<coverage>0.03</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="PoleepkwaBody"]/corePart/parts/li[def="Liver"]/coverage</xpath>
+		<value>
+			<coverage>0.06</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="PoleepkwaBody"]/corePart/parts/li[def="Neck"]/coverage</xpath>
+		<value>
+			<coverage>0.055</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="PoleepkwaBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Skull"]/parts/li[def="Brain"]/coverage</xpath>
+		<value>
+			<coverage>0.9</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="PoleepkwaBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Eye"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="PoleepkwaBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="PoleepkwaBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/coverage</xpath>
+		<value>
+			<coverage>0.08</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="PoleepkwaBody"]/corePart/parts/li[def="Shoulder"]/coverage</xpath>
+		<value>
+			<coverage>0.085</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="PoleepkwaBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Clavicle"]/coverage</xpath>
+		<value>
+			<coverage>0.06</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="PoleepkwaBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Humerus"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="PoleepkwaBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Radius"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="PoleepkwaBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Femur"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="PoleepkwaBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Tibia"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+
+	<!-- Natural Armor -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="PoleepkwaBody"]//*[
+			def="Torso" or
+			def="Neck" or
+			def="Head" or
+			def="Jaw" or
+			def="Ear" or
+			def="Nose" or
+			def="Shoulder" or
+			def="Arm" or
+			def="Hand" or
+			def="Finger" or
+			def="Leg" or
+			def="Toe" or
+			def="Foot"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="PoleepkwaBody"]//*[
+			def="Nose" or
+			def="Jaw" or
+			def="Eye" ]/groups
+		</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Poleepkwa Race/Patches/Poleepkwa Race/Patch_PawnKinds_Prawn.xml b/ModPatches/Poleepkwa Race/Patches/Poleepkwa Race/Patch_PawnKinds_Prawn.xml
new file mode 100644
index 0000000000..41057a4dd7
--- /dev/null
+++ b/ModPatches/Poleepkwa Race/Patches/Poleepkwa Race/Patch_PawnKinds_Prawn.xml	
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Tribal -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Poleepkwa_Warrior" or defName="Poleepkwa_Worker" ]/combatPower</xpath>
+		<value>
+			<combatPower>30</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Poleepkwa_Archer"]/combatPower</xpath>
+		<value>
+			<combatPower>30</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Poleepkwa_CaravanSoldier"]/combatPower</xpath>
+		<value>
+			<combatPower>40</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Poleepkwa_Leader"]/combatPower</xpath>
+		<value>
+			<combatPower>75</combatPower>
+		</value>
+	</Operation>
+
+	<!-- Hive_Archer -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Poleepkwa_Archer" or defName="Poleepkwa_CaravanSoldier"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>20</min>
+					<max>40</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>100</min>
+					<max>140</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.6</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>40</min>
+							<max>80</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Hiver_Warrior -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Poleepkwa_Warrior" or defName="Poleepkwa_CaravanSoldier"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>100</min>
+					<max>200</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.75</shieldChance>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Poleepkwa Race/Patches/Poleepkwa Race/Patch_Race_Prawns.xml b/ModPatches/Poleepkwa Race/Patches/Poleepkwa Race/Patch_Race_Prawns.xml
new file mode 100644
index 0000000000..b640a45560
--- /dev/null
+++ b/ModPatches/Poleepkwa Race/Patches/Poleepkwa Race/Patch_Race_Prawns.xml	
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Poleepkwa"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Poleepkwa"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<Suppressability>1</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Poleepkwa"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.24</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.24</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationSharp>0.14</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.24</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationSharp>0.14</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.24</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>3.4</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Poleepkwa"]</xpath>
+		<value>
+			<comps/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Poleepkwa"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Possesed Weapons/Defs/Possesed Weapons/Projectiles_Possesed.xml b/ModPatches/Possesed Weapons/Defs/Possesed Weapons/Projectiles_Possesed.xml
new file mode 100644
index 0000000000..5bef4b1963
--- /dev/null
+++ b/ModPatches/Possesed Weapons/Defs/Possesed Weapons/Projectiles_Possesed.xml	
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+
+
+	<ThingDef ParentName="BaseStreamlinedArrowProjectile">
+		<defName>Projectile_EarthenGauntlet_RockBlast</defName>
+		<label>rock blast</label>
+		<graphicData>
+			<texPath>Things/Projectile/BotchJob_RockSmash</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>BotchJob_RockSmash</damageDef>
+			<speed>18</speed>
+			<damageAmountBase>15</damageAmountBase>
+			<armorPenetrationBlunt>60</armorPenetrationBlunt>
+			<explosionRadius>2.7</explosionRadius>
+			<arcHeightFactor>1.2</arcHeightFactor>
+		</projectile>
+	</ThingDef>
+
+	<!-- Shrouded Dagger -->
+	<ThingDef ParentName="BasePilumProjectile">
+		<defName>Projectile_ThrownShroudedDagger</defName>
+		<label>shrouded dagger</label>
+		<graphicData>
+			<texPath>Things/Projectile/ShroudedDaggerThrown</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>32</damageAmountBase>
+			<flyOverhead>false</flyOverhead>
+			<speed>26</speed>
+			<damageDef>RangedStab</damageDef>
+			<armorPenetrationBlunt>4.52</armorPenetrationBlunt>
+			<armorPenetrationSharp>7.52</armorPenetrationSharp>
+			<!--preExplosionSpawnChance>1</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>BotchJob_ShroudedDagger</preExplosionSpawnThingDef-->
+		</projectile>
+	</ThingDef>
+
+	<!-- Lightning Javelin -->
+	<ThingDef ParentName="BasePilumProjectile">
+		<defName>Projectile_ThrownPossessedLightningJavelin</defName>
+		<label>lightning javelin</label>
+		<graphicData>
+			<texPath>Things/Projectile/LightningJavelinThrown</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>36</damageAmountBase>
+			<flyOverhead>false</flyOverhead>
+			<speed>20</speed>
+			<damageDef>EMP</damageDef>
+			<armorPenetrationBlunt>10</armorPenetrationBlunt>
+			<armorPenetrationSharp>8.34</armorPenetrationSharp>
+			<!--preExplosionSpawnChance>1</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>BotchJob_LightningJavelin</preExplosionSpawnThingDef-->
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>30</damageAmountBase>
+				<explosiveDamageType>EMP</explosiveDamageType>
+				<explosiveRadius>4</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- Archmage Bolt -->
+	<ThingDef ParentName="BasePilumProjectile">
+		<defName>Projectile_ArchmageStaffBolt</defName>
+		<label>archmage staff bolt</label>
+		<graphicData>
+			<texPath>Things/Projectile/ArchmageStaffBolt</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<flyOverhead>false</flyOverhead>
+			<speed>20</speed>
+			<damageDef>BotchJob_ArchmageStaffBolt</damageDef>
+			<explosionRadius>1</explosionRadius>
+			<ai_IsIncendiary>true</ai_IsIncendiary>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<explosiveDamageType>Flame</explosiveDamageType>
+				<explosiveRadius>1</explosiveRadius>
+			</li>
+		</comps>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Possesed Weapons/Patches/Possesed Weapons/PossessedWeapons_Ammo.xml b/ModPatches/Possesed Weapons/Patches/Possesed Weapons/PossessedWeapons_Ammo.xml
new file mode 100644
index 0000000000..d3c67583a9
--- /dev/null
+++ b/ModPatches/Possesed Weapons/Patches/Possesed Weapons/PossessedWeapons_Ammo.xml	
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- Dragonfire Ammo Sets -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_DragonFireArrow</defName>
+		<label>great arrows</label>
+		<ammoTypes>
+			<Ammo_GreatArrow_Stone>Projectile_DragonFireArrow</Ammo_GreatArrow_Stone>
+			<Ammo_GreatArrow_Steel>Projectile_DragonFireArrow</Ammo_GreatArrow_Steel>
+			<Ammo_GreatArrow_Venom>Projectile_DragonFireArrow</Ammo_GreatArrow_Venom>
+			<Ammo_GreatArrow_Flame>Projectile_DragonFireArrow</Ammo_GreatArrow_Flame>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef ParentName="BaseGreatArrowProjectile">
+		<defName>Projectile_DragonFireArrow</defName>
+		<label>dragon fire arrow</label>
+		<graphicData>
+			<texPath>Things/Projectile/DragonfireArrow</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>30</speed>
+			<damageDef>BotchJob_DragonfireArrow</damageDef>
+			<damageAmountBase>15</damageAmountBase>
+			<explosionRadius>3</explosionRadius>
+			<ai_IsIncendiary>true</ai_IsIncendiary>
+			<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
+			<preExplosionSpawnChance>0.33</preExplosionSpawnChance>
+		</projectile>
+	</ThingDef>
+
+	<!-- Verdant Bow -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_VerdantArrow</defName>
+		<label>verdant arrows</label>
+		<ammoTypes>
+			<Ammo_Arrow_Stone>Projectile_VerdantArrow_Stone</Ammo_Arrow_Stone>
+			<Ammo_Arrow_Steel>Projectile_VerdantArrow_Steel</Ammo_Arrow_Steel>
+			<Ammo_Arrow_Plasteel>Projectile_VerdantArrow_Plasteel</Ammo_Arrow_Plasteel>
+			<Ammo_Arrow_Venom>Projectile_VerdantArrow_Venom</Ammo_Arrow_Venom>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_VerdantMOArrow</defName>
+		<label>verdant arrows</label>
+		<ammoTypes>
+			<Ammo_Arrow_Stone>Projectile_VerdantArrow_Stone</Ammo_Arrow_Stone>
+			<Ammo_Arrow_Steel>Projectile_VerdantArrow_Steel</Ammo_Arrow_Steel>
+			<Ammo_Arrow_Venom>Projectile_VerdantArrow_Venom</Ammo_Arrow_Venom>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef ParentName="BaseStreamlinedArrowProjectile">
+		<defName>Projectile_VerdantArrow_Stone</defName>
+		<label>verdant arrow (stone)</label>
+		<graphicData>
+			<texPath>Things/Projectile/VerdantBowArrow</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>40</speed>
+			<damageAmountBase>9</damageAmountBase>
+			<armorPenetrationSharp>0.6</armorPenetrationSharp>
+			<armorPenetrationBlunt>1.9</armorPenetrationBlunt>
+			<preExplosionSpawnChance>0.2</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>Ammo_Arrow_Stone</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseStreamlinedArrowProjectile">
+		<defName>Projectile_VerdantArrow_Steel</defName>
+		<label>verdant arrow (steel)</label>
+		<graphicData>
+			<texPath>Things/Projectile/VerdantBowArrow</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationSharp>1.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>6.4</armorPenetrationBlunt>
+			<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>Ammo_Arrow_Steel</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseStreamlinedArrowProjectile">
+		<defName>Projectile_VerdantArrow_Plasteel</defName>
+		<label>verdant arrow (plasteel)</label>
+		<graphicData>
+			<texPath>Things/Projectile/VerdantBowArrow</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>50</speed>
+			<damageAmountBase>9</damageAmountBase>
+			<armorPenetrationSharp>2</armorPenetrationSharp>
+			<armorPenetrationBlunt>5.54</armorPenetrationBlunt>
+			<preExplosionSpawnChance>0.75</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>Ammo_Arrow_Plasteel</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseStreamlinedArrowProjectile">
+		<defName>Projectile_VerdantArrow_Venom</defName>
+		<label>verdant arrow (venom)</label>
+		<graphicData>
+			<texPath>Things/Projectile/VerdantBowArrow</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>ArrowVenom</damageDef>
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationSharp>1.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>6.4</armorPenetrationBlunt>
+			<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>Ammo_Arrow_Steel</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+
+	<!-- Ammo for Ghostly Flintlock -->
+
+	<!-- Ghostly Flintlock -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_GhostFlintlock_MusketBall</defName>
+		<label>musket ball</label>
+		<ammoTypes>
+			<Ammo_MusketBall>Projectile_GhostFlintlock_MusketBall</Ammo_MusketBall>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef ParentName="BaseStreamlinedArrowProjectile">
+		<defName>Projectile_GhostFlintlock_MusketBall</defName>
+		<label>musket ball</label>
+		<graphicData>
+			<texPath>Things/Projectile/BotchJob_GhostBullet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>BotchJob_GhostBlast</damageDef>
+			<speed>35</speed>
+			<damageAmountBase>4</damageAmountBase>
+			<armorPenetrationSharp>3.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>20</armorPenetrationBlunt>
+			<explosionRadius>1</explosionRadius>
+		</projectile>
+	</ThingDef>
+
+
+	<!-- Ammo for Ghostly Flintlock -->
+
+	<!-- Ghostly Flintlock -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_GhostFlintlock_MusketBall</defName>
+		<label>musket ball</label>
+		<ammoTypes>
+			<Ammo_MusketBall>Projectile_GhostFlintlock_MusketBall</Ammo_MusketBall>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef ParentName="BaseStreamlinedArrowProjectile">
+		<defName>Projectile_GhostFlintlock_MusketBall</defName>
+		<label>musket ball</label>
+		<graphicData>
+			<texPath>Things/Projectile/BotchJob_GhostBullet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>BotchJob_GhostBlast</damageDef>
+			<speed>30</speed>
+			<damageAmountBase>6</damageAmountBase>
+			<pelletCount>6</pelletCount>
+			<armorPenetrationSharp>3.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>3.14</armorPenetrationBlunt>
+			<spreadMult>5</spreadMult>
+			<explosionRadius>1</explosionRadius>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Possesed Weapons/Patches/Possesed Weapons/PossessedWeapons_MeleePatch.xml b/ModPatches/Possesed Weapons/Patches/Possesed Weapons/PossessedWeapons_MeleePatch.xml
new file mode 100644
index 0000000000..b178fce085
--- /dev/null
+++ b/ModPatches/Possesed Weapons/Patches/Possesed Weapons/PossessedWeapons_MeleePatch.xml	
@@ -0,0 +1,617 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--=============================== Melee ================================-->
+
+	<!--=============================== Scourge Blade ================================-->
+
+	<!--li Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_ScourgeBlade"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<chanceFactor>0.1</chanceFactor>
+					<cooldownTime>1.69</cooldownTime>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>BotchJob_ToxicCut</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>2.06</cooldownTime>
+					<armorPenetrationBlunt>3.2</armorPenetrationBlunt>
+					<armorPenetrationSharp>16</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>BotchJob_ToxicStab</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>0.99</cooldownTime>
+					<armorPenetrationBlunt>3.24</armorPenetrationBlunt>
+					<armorPenetrationSharp>32.4</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</li>
+
+	<li Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_ScourgeBlade"]/statBases</xpath>
+		<value>
+			<Bulk>8.5</Bulk>
+			<MeleeCounterParryBonus>0.80</MeleeCounterParryBonus>
+		</value>
+	</li>
+
+	<li Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_ScourgeBlade"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>1.00</MeleeCritChance>
+			<MeleeParryChance>0.60</MeleeParryChance>
+			<MeleeDodgeChance>0.4</MeleeDodgeChance>
+		</value>
+	</li>
+
+	<li Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="BotchJob_ScourgeBlade"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="BotchJob_ScourgeBlade"]</xpath>
+			<value>
+				<weaponTags />
+			</value>
+		</nomatch>
+	</li>
+
+	<li Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_ScourgeBlade"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</li-->
+
+	<!--=============================== Possessed Scourge Blade ================================-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_PossessedScourgeBlade"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<chanceFactor>0.1</chanceFactor>
+					<cooldownTime>1.52</cooldownTime>
+					<armorPenetrationBlunt>0.97</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>BotchJob_ToxicCut</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>1.85</cooldownTime>
+					<armorPenetrationBlunt>3.87</armorPenetrationBlunt>
+					<armorPenetrationSharp>19.36</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>BotchJob_ToxicStab</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>0.89</cooldownTime>
+					<armorPenetrationBlunt>3.92</armorPenetrationBlunt>
+					<armorPenetrationSharp>39.2</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_PossessedScourgeBlade"]/statBases</xpath>
+		<value>
+			<Bulk>8.5</Bulk>
+			<MeleeCounterParryBonus>1.2</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_PossessedScourgeBlade"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>1.00</MeleeCritChance>
+			<MeleeParryChance>0.69</MeleeParryChance>
+			<MeleeDodgeChance>0.46</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!--=============================== Glacial Cleaver ================================-->
+	<!--li Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_GlacialCleaver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<chanceFactor>0.1</chanceFactor>
+					<cooldownTime>0.99</cooldownTime>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>BotchJob_FrostCut</li>
+					</capacities>
+					<power>46</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Frostbite</def>
+							<amount>8</amount>
+							<chance>0.3</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>1.92</cooldownTime>
+					<armorPenetrationBlunt>6.48</armorPenetrationBlunt>
+					<armorPenetrationSharp>19.24</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</li>
+
+	<li Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_GlacialCleaver"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>0.13</MeleeCounterParryBonus>
+		</value>
+	</li>
+
+	<li Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_GlacialCleaver"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+			<MeleeDodgeChance>0.20</MeleeDodgeChance>
+		</value>
+	</li-->
+
+	<!--=============================== Possessed Glaciar Cleaver ================================-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_PossessedGlacialCleaver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<chanceFactor>0.1</chanceFactor>
+					<cooldownTime>0.89</cooldownTime>
+					<armorPenetrationBlunt>7.26</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>BotchJob_FrostCut</li>
+					</capacities>
+					<power>46</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Frostbite</def>
+							<amount>9</amount>
+							<chance>0.3</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>1.73</cooldownTime>
+					<armorPenetrationBlunt>7.84</armorPenetrationBlunt>
+					<armorPenetrationSharp>23.28</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_PossessedGlacialCleaver"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_PossessedGlacialCleaver"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>0.12</MeleeParryChance>
+			<MeleeDodgeChance>0.23</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!--=============================== Sanctified Sword ================================-->
+	<!--li Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_SanctifiedSword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<chanceFactor>0.1</chanceFactor>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>2.4</cooldownTime>
+					<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
+					<armorPenetrationSharp>18</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>2.4</cooldownTime>
+					<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
+					<armorPenetrationSharp>25</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</li>
+
+	<li Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_SanctifiedSword"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>0.8</MeleeCounterParryBonus>
+		</value>
+	</li>
+
+	<li Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_SanctifiedSword"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>0.6</MeleeParryChance>
+			<MeleeDodgeChance>0.4</MeleeDodgeChance>
+		</value>
+	</li-->
+
+	<!--=============================== Possessed Sanctified Sword ================================-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_PossessedSanctifiedSword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<chanceFactor>0.1</chanceFactor>
+					<cooldownTime>1.44</cooldownTime>
+					<armorPenetrationBlunt>0.61</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>2.16</cooldownTime>
+					<armorPenetrationBlunt>3.48</armorPenetrationBlunt>
+					<armorPenetrationSharp>21.78</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>2.16</cooldownTime>
+					<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
+					<armorPenetrationSharp>30.25</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_PossessedSanctifiedSword"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>0.92</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_PossessedSanctifiedSword"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>0.69</MeleeParryChance>
+			<MeleeDodgeChance>0.46</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!--=============================== Volcanic Maul ================================-->
+	<!--li Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_VolcanicMaul"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>13</power>
+					<chanceFactor>0.1</chanceFactor>
+					<cooldownTime>2.67</cooldownTime>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>93</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>8</amount>
+							<chance>0.3</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>3.47</cooldownTime>
+					<armorPenetrationBlunt>45</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</li>
+
+	<li Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_VolcanicMaul"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
+		</value>
+	</li>
+
+	<li Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_VolcanicMaul"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.5</MeleeCritChance>
+				<MeleeParryChance>0.3</MeleeParryChance>
+				<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</li-->
+
+	<!--=============================== Possessed Volcanic Sword ================================-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_PossessedVolcanicMaul"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>13</power>
+					<chanceFactor>0.1</chanceFactor>
+					<cooldownTime>2.4</cooldownTime>
+					<armorPenetrationBlunt>6.05</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>93</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>8</amount>
+							<chance>0.3</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>3.12</cooldownTime>
+					<armorPenetrationBlunt>54.45</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_PossessedVolcanicMaul"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>0.46</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_PossessedVolcanicMaul"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>1.5</MeleeCritChance>
+			<MeleeParryChance>0.35</MeleeParryChance>
+			<MeleeDodgeChance>0.35</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!--=============================== Craghammer ================================-->
+	<!--li Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_Craghammer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>11</power>
+					<chanceFactor>0.1</chanceFactor>
+					<cooldownTime>2.52</cooldownTime>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Demolish</li>
+					</capacities>
+					<power>76</power>
+					<cooldownTime>3.28</cooldownTime>
+					<armorPenetrationBlunt>36</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</li>
+
+	<li Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_Craghammer"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
+		</value>
+	</li>
+
+	<li Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_Craghammer"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>1.5</MeleeCritChance>
+			<MeleeParryChance>0.3</MeleeParryChance>
+			<MeleeDodgeChance>0.3</MeleeDodgeChance>
+		</value>
+	</li-->
+
+	<!--=============================== Possessed Sanctified Sword ================================-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_PossessedCraghammer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>11</power>
+					<chanceFactor>0.1</chanceFactor>
+					<cooldownTime>2.27</cooldownTime>
+					<armorPenetrationBlunt>4.84</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Demolish</li>
+					</capacities>
+					<power>76</power>
+					<cooldownTime>2.95</cooldownTime>
+					<armorPenetrationBlunt>43.56</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_PossessedCraghammer"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>0.46</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_PossessedCraghammer"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>1.5</MeleeCritChance>
+			<MeleeParryChance>0.35</MeleeParryChance>
+			<MeleeDodgeChance>0.35</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!--=============================== Possessed Bloodstained Scythe ================================-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_PossessedBloodstainedScythe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.16</cooldownTime>
+					<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>BotchJob_BloodCut</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>4</cooldownTime>
+					<armorPenetrationSharp>24</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_PossessedBloodstainedScythe"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>1.71</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_PossessedBloodstainedScythe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.19</MeleeCritChance>
+				<MeleeParryChance>1.5</MeleeParryChance>
+				<MeleeDodgeChance>0.83</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Possesed Weapons/Patches/Possesed Weapons/PossessedWeapons_RangedPatch.xml b/ModPatches/Possesed Weapons/Patches/Possesed Weapons/PossessedWeapons_RangedPatch.xml
new file mode 100644
index 0000000000..5abb17687b
--- /dev/null
+++ b/ModPatches/Possesed Weapons/Patches/Possesed Weapons/PossessedWeapons_RangedPatch.xml	
@@ -0,0 +1,705 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--=============================== Ranged ================================-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/DamageDef[defName="BotchJob_RockSmash"]</xpath>
+		<value>
+			<buildingDamageFactor>3</buildingDamageFactor>
+		</value>
+	</Operation>
+
+	<!-- Possessed Dragonfire Bow -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BotchJob_PossessedDragonfireGreatbow</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>1</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>10.00</Bulk>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_DragonFireArrow</defaultProjectile>
+			<warmupTime>4</warmupTime>
+			<range>30</range>
+			<soundCast>Bow_Large</soundCast>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<ammoSet>AmmoSet_DragonFireArrow</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>BotchJob_PossessedDragonfireGreatbow</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="BotchJob_PossessedDragonfireGreatbow"]/equippedStatOffsets</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_PossessedDragonfireGreatbow"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.44</cooldownTime>
+					<armorPenetrationBlunt>0.79</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--=============================== Possessed Lightning Javelin ================================-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BotchJob_PossessedLightningJavelin</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<Bulk>8</Bulk>
+			<Mass>4</Mass>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_ThrownPossessedLightningJavelin</defaultProjectile>
+			<warmupTime>3</warmupTime>
+			<range>25</range>
+			<soundCast>Power_OnSmall</soundCast>
+			<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_PossessedLightningJavelin"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2.26</cooldownTime>
+					<armorPenetrationBlunt>4.84</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>2.26</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>4.84</armorPenetrationBlunt>
+					<armorPenetrationSharp>4.04</armorPenetrationSharp>
+					<extraMeleeDamages>
+						<li>
+							<def>EMP</def>
+							<amount>9</amount>
+						</li>
+					</extraMeleeDamages>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_PossessedLightningJavelin"]/description</xpath>
+		<value>
+			<description>A large, lightning infused spear that is deadly in close quarters but can also be thrown to produce an EMP burst on impact.\n\nThe electricity coursing through this weapon will energize its wielder, increasing their movement speed. The downside of this is that being constantly energized makes it difficult to sleep and as such, the wielder's rest rate will be slower.\n\nThis weapon is possessed by an ancient spirit and will exhibit some of their traits. The spirit will bond with the first person to wield it and thereafter, refuse to be wielded by anyone else.\n\nWhen wielded by the bonded person, the spirit will augment their combat abilities, allowing them to attack with greater ferocity, speed and accuracy than ever before. The spirit of the lightning javelin is temperamental and will depart once thrown.</description>
+		</value>
+	</Operation>
+
+	<!--=============================== Possessed Archmage Staff ================================-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BotchJob_PossessedArchmageStaff</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>3</ShotSpread>
+			<SwayFactor>1</SwayFactor>
+			<Bulk>10.00</Bulk>
+			<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_ArchmageStaffBolt</defaultProjectile>
+			<warmupTime>5.4</warmupTime>
+			<range>30</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundAiming>BotchJob_ArchmageStaffCharge</soundAiming>
+			<soundCast>BotchJob_ArchmageStaffCast</soundCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>BotchJob_PossessedArchmageStaff</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_PossessedArchmageStaff"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>limb</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.2</cooldownTime>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--=============================== Possessed Automaton Crossbow ================================-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BotchJob_PossessedAutomatonCrossbow</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1</SwayFactor>
+			<Bulk>8</Bulk>
+			<RangedWeapon_Cooldown>0.2</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.39</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_CrossbowBolt_Steel</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<burstShotCount>3</burstShotCount>
+			<range>26</range>
+			<soundCast>Bow_Large</soundCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>3</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>BotchJob_PossessedAutomatonCrossbow</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Patch to Make it Utilize Heavy Crossbow Ammo from MO when loaded -->
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Medieval Overhaul</li>
+		</mods>
+		<match Class="PatchOperationReplace">
+			<xpath>Defs/ThingDef[defName="BotchJob_PossessedAutomatonCrossbow"]/comps</xpath>
+			<value>
+				<comps>
+					<li Class="CombatExtended.CompProperties_AmmoUser">
+						<magazineSize>3</magazineSize>
+						<reloadTime>5</reloadTime>
+						<ammoSet>AmmoSet_ArbalestBolt</ammoSet>
+					</li>
+					<li Class="CombatExtended.CompProperties_FireModes">
+						<aiUseBurstMode>FALSE</aiUseBurstMode>
+						<aiAimMode>Snapshot</aiAimMode>
+						<aimedBurstShotCount>3</aimedBurstShotCount>
+					</li>
+				</comps>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_PossessedAutomatonCrossbow"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.44</cooldownTime>
+					<armorPenetrationBlunt>1.03</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--=============================== Possessed Verdant Bow ================================-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BotchJob_PossessedVerdantBow</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.8</ShotSpread>
+			<SwayFactor>1.</SwayFactor>
+			<Bulk>4.00</Bulk>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_VerdantArrow_Steel</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>22</range>
+			<soundCast>Bow_Recurve</soundCast>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<ammoSet>AmmoSet_VerdantArrow</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>BotchJob_PossessedVerdantBow</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- Patch to Make it Utilize Heavy Crossbow Ammo from MO when loaded -->
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Medieval Overhaul</li>
+		</mods>
+		<match Class="PatchOperationReplace">
+			<xpath>Defs/ThingDef[defName="BotchJob_PossessedVerdantBow"]/comps</xpath>
+			<value>
+				<comps>
+					<li Class="CombatExtended.CompProperties_AmmoUser">
+						<ammoSet>AmmoSet_VerdantMOArrow</ammoSet>
+					</li>
+				</comps>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_PossessedVerdantBow"]/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>
+	</Operation>
+
+	<!--=============================== Possessed Gilded Arquebus ================================-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BotchJob_PossessedGildedArquebus</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.85</SwayFactor>
+			<Mass>4.5</Mass>
+			<Bulk>14.00</Bulk>
+			<RangedWeapon_Cooldown>0.84</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_FastMusketBall</defaultProjectile>
+			<warmupTime>1.11</warmupTime>
+			<range>35</range>
+			<soundCast>Shot_CE_Musket</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>4</AmmoGenPerMagOverride>
+			<reloadTime>6.4</reloadTime>
+			<ammoSet>AmmoSet_FastMusketBall</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>BotchJob_GildedArquebus</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_PossessedGildedArquebus"]/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>Stab</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.55</cooldownTime>
+					<armorPenetrationSharp>1.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--=============================== Possessed Shrouded Dagger ================================-->
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="BotchJob_PossessedShroudedDagger"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>BaseWeapon</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_PossessedShroudedDagger"]/description</xpath>
+		<value>
+			<description>A deadly dagger favoured by assassins and rogues.\n\nIn skilled hands it can deliver a lightning fast flurry of stabs and slashes and can also be thrown short distances, ideal for finishing off fleeing opponents.\n\nIt allows the wielder to remain light on their feet, increasing their melee dodge chance and reducing the chances of them triggering hidden traps.\n\nThis weapon is possessed by an ancient spirit and will exhibit some of their traits. The spirit will bond with the first person to wield it and thereafter, refuse to be wielded by anyone else.\n\nWhen wielded by the bonded person, the spirit will augment their combat abilities, allowing them to attack with greater ferocity, speed and accuracy than ever before. When thrown the spirit will enhance the dagger one last time before departing.</description>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_PossessedShroudedDagger"]</xpath>
+		<value>
+			<thingClass>CombatExtended.AmmoThing</thingClass>
+			<stackLimit>5</stackLimit>
+			<resourceReadoutPriority>First</resourceReadoutPriority>
+			<techLevel>Medieval</techLevel>
+			<tradeNeverStack>true</tradeNeverStack>
+			<relicChance>3</relicChance>
+			<burnableByRecipe>true</burnableByRecipe>
+			<thingSetMakerTags>
+				<li>RewardStandardLowFreq</li>
+			</thingSetMakerTags>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="BotchJob_PossessedShroudedDagger"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BotchJob_PossessedShroudedDagger</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<Bulk>1</Bulk>
+			<Mass>1</Mass>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+			<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<label>Throw shrouded dagger</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Projectile_ThrownShroudedDagger</defaultProjectile>
+			<warmupTime>0.2</warmupTime>
+			<range>15</range>
+			<soundCast>ThrowGrenade</soundCast>
+			<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+		</Properties>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_PossessedShroudedDagger"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<PawnTrapSpringChance>-0.15</PawnTrapSpringChance>
+				<MeleeDodgeChance>0.15</MeleeDodgeChance>
+				<MeleeCritChance>0.5</MeleeCritChance>
+				<MeleeParryChance>0.15</MeleeParryChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!--=============================== Acolyte Staff ================================-->
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+	<!--=============================== Possessed Acolyte Staff ================================-->
+			<li Class="PatchOperationAdd">
+				<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/statBases</xpath>
+				<value>
+					<Bulk>10.00</Bulk>
+				</value>
+			</li>
+
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/statBases/RangedWeapon_Cooldown</xpath>
+				<value>
+					<RangedWeapon_Cooldown>1.53</RangedWeapon_Cooldown>
+				</value>
+			</li>
+
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/verbs/li/warmupTime</xpath>
+				<value>
+					<warmupTime>2.7</warmupTime>
+				</value>
+			</li>
+
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/verbs/li/range</xpath>
+				<value>
+					<range>30</range>
+				</value>
+			</li>
+
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/verbs/li/burstShotCount</xpath>
+				<value>
+					<burstShotCount>14</burstShotCount>
+				</value>
+			</li>
+
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/verbs/li/ticksBetweenBurstShots</xpath>
+				<value>
+					<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+				</value>
+			</li>
+
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/tools</xpath>
+				<value>
+					<tools>
+						<li Class="CombatExtended.ToolCE">
+							<label>limb</label>
+							<capacities>
+								<li>Blunt</li>
+								<li>Poke</li>
+							</capacities>
+							<power>6</power>
+							<cooldownTime>1.2</cooldownTime>
+							<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+						</li>
+					</tools>
+				</value>
+			</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+	<!--=============================== Ghostly Flintlock ================================-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BotchJob_PossessedGhostlyFlintlock</defName>
+		<statBases>
+			<SightsEfficiency>0.5</SightsEfficiency>
+			<ShotSpread>0.42</ShotSpread>
+			<SwayFactor>1.58</SwayFactor>
+			<Mass>1.25</Mass>
+			<Bulk>3.50</Bulk>
+			<RangedWeapon_Cooldown>1.06</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>3.59</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_GhostFlintlock_MusketBall</defaultProjectile>
+			<warmupTime>0.9</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_CE_Musket</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
+			<reloadTime>5.9</reloadTime>
+			<ammoSet>AmmoSet_GhostFlintlock_MusketBall</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>6</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>BotchJob_PossessedGhostlyFlintlock</li>
+			<li>CE_AI_BROOM</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_PossessedGhostlyFlintlock"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Crystal blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationSharp>1.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--=============================== Possessed Earthen Gauntlet ================================-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BotchJob_PossessedEarthenGauntlet</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.42</ShotSpread>
+			<SwayFactor>1.58</SwayFactor>
+			<Mass>3.5</Mass>
+			<Bulk>3</Bulk>
+			<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>3.59</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_EarthenGauntlet_RockBlast</defaultProjectile>
+			<warmupTime>4</warmupTime>
+			<range>18</range>
+			<soundCast>Interact_BeatFire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>BotchJob_PossessedEarthenGauntlet</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BotchJob_PossessedEarthenGauntlet"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Demolish</li>
+					</capacities>
+					<power>41</power>
+					<cooldownTime>4</cooldownTime>
+					<armorPenetrationBlunt>30</armorPenetrationBlunt>
+					<extraMeleeDamages>
+						<li>
+							<def>Stun</def>
+							<amount>310</amount>
+							<chance>0.5</chance>
+						</li>
+					</extraMeleeDamages>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_PossessedEarthenGauntlet"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BotchJob_PossessedEarthenGauntlet"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.5</MeleeCritChance>
+				<MeleeParryChance>0.15</MeleeParryChance>
+				<MeleeDodgeChance>0.83</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/PowerArmour T-45b/Patches/PowerArmour T-45b/T45b_CE_Patch.xml b/ModPatches/PowerArmour T-45b/Patches/PowerArmour T-45b/T45b_CE_Patch.xml
new file mode 100644
index 0000000000..40e8f478f1
--- /dev/null
+++ b/ModPatches/PowerArmour T-45b/Patches/PowerArmour T-45b/T45b_CE_Patch.xml	
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== T-45b helmet ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CPApparel_T45bHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CPApparel_T45bHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CPApparel_T45bHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>32</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CPApparel_T45bHelmet"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>1</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CPApparel_T45bHelmet"]/statBases</xpath>
+		<value>
+			<ArmorRating_Electric>0.06</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="CPApparel_T45bHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="CPApparel_T45bHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CPApparel_T45bHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CPApparel_T45bHelmet"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>55</Plasteel>
+		</value>
+	</Operation>
+
+	<!-- Deliberately omitted WearingGasMask ApparelHediffExtension, as we assume the T-45b Helmet is more comfortable than real-life gas masks -->
+
+	<!-- ========== T-45b armor ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CPApparel_T45bPowerArmor"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CPApparel_T45bPowerArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>15</CarryBulk>
+			<CarryWeight>90</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CPApparel_T45bPowerArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CPApparel_T45bPowerArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>40</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CPApparel_T45bPowerArmor"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.8</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CPApparel_T45bPowerArmor"]/statBases</xpath>
+		<value>
+			<ArmorRating_Electric>0.05</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CPApparel_T45bPowerArmor"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>160</Plasteel>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Pratt WWII Weapons Pack/Defs/Pratt WWII Weapons Pack/Recipes_Grenades.xml b/ModPatches/Pratt WWII Weapons Pack/Defs/Pratt WWII Weapons Pack/Recipes_Grenades.xml
new file mode 100644
index 0000000000..2e0a987806
--- /dev/null
+++ b/ModPatches/Pratt WWII Weapons Pack/Defs/Pratt WWII Weapons Pack/Recipes_Grenades.xml	
@@ -0,0 +1,277 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeMkIIGrenadeGNDE</defName>
+		<label>make MkII grenades x10</label>
+		<description>Craft 10 MkII grenades.</description>
+		<jobString>Making MkII grenades.</jobString>
+		<workAmount>3200</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Weapon_MkIIGrenadeGNDE>10</Weapon_MkIIGrenadeGNDE>
+		</products>
+	</RecipeDef>
+
+	<!-- Note: Costs were hand-balanced to account for the wooden handle -->
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeStielhandgranate24gnde</defName>
+		<label>make Stielhandgranate 24 grenades x10</label>
+		<description>Craft 10 Stielhandgranate 24 grenades.</description>
+		<jobString>Making Stielhandgranate 24 grenades.</jobString>
+		<workAmount>4200</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Weapon_Stielhandgranate24gnde>10</Weapon_Stielhandgranate24gnde>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeType97GNDE</defName>
+		<label>make Type 97 grenades x10</label>
+		<description>Craft 10 Type 97 grenades.</description>
+		<jobString>Making Type 97 grenades.</jobString>
+		<workAmount>3000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Weapon_Type97GNDE>10</Weapon_Type97GNDE>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeRGD-33GNDE</defName>
+		<label>make RGD-33 grenades x10</label>
+		<description>Craft 10 RGD-33 grenades.</description>
+		<jobString>Making RGD-33 grenades.</jobString>
+		<workAmount>3600</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>16</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Weapon_RGD-33GNDE>10</Weapon_RGD-33GNDE>
+		</products>
+
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeF1GrenadeGNDE</defName>
+		<label>make F1 grenades x10</label>
+		<description>Craft 10 F1 grenades.</description>
+		<jobString>Making F1 grenades.</jobString>
+		<workAmount>3200</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Weapon_F1GrenadeGNDE>10</Weapon_F1GrenadeGNDE>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeMillsGrenadeGNDE</defName>
+		<label>make Mills grenades x10</label>
+		<description>Craft 10 Mills grenades.</description>
+		<jobString>Making Mills grenades.</jobString>
+		<workAmount>3600</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>16</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Weapon_MillsGrenadeGNDE>10</Weapon_MillsGrenadeGNDE>
+		</products>
+	</RecipeDef>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Pratt WWII Weapons Pack/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Turrets.xml b/ModPatches/Pratt WWII Weapons Pack/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Turrets.xml
new file mode 100644
index 0000000000..2fba985b97
--- /dev/null
+++ b/ModPatches/Pratt WWII Weapons Pack/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Turrets.xml	
@@ -0,0 +1,638 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== (Turret FR) Hotchkiss M1914 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_HotchkissM1914HMG</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.16</SwayFactor>
+			<Bulk>14.70</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.80</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x50mmRLebel_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>250</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_8x50mmRLebel</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_HotchkissM1914HMG"]/statBases/Mass</xpath>
+		<value>
+			<Mass>23.60</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_HotchkissM1914HMG"]/statBases/WorkToBuild</xpath>
+		<value>
+			<WorkToBuild>47000</WorkToBuild>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_HotchkissM1914HMG"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>170</Steel>
+				<ComponentIndustrial>6</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_HotchkissM1914HMG"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>75</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<!-- ========== (Turret GER) MG 34 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MG34MG</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.28</SwayFactor>
+			<Bulk>14.19</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.64</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>86</range>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>250</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_MG34MG"]/statBases/Mass</xpath>
+		<value>
+			<Mass>32.00</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_MG34MG"]/statBases/WorkToBuild</xpath>
+		<value>
+			<WorkToBuild>48500</WorkToBuild>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_MG34MG"]/costList</xpath>
+		<value>
+			<costList>
+				<WoodLog>20</WoodLog>
+				<Steel>175</Steel>
+				<ComponentIndustrial>6</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_MG34MG"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>86</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<!-- ========== (Turret GER) MG 42 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MG42MG</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>14.20</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.63</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>86</range>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>250</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_MG42MG"]/statBases/Mass</xpath>
+		<value>
+			<Mass>31.65</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_MG42MG"]/statBases/WorkToBuild</xpath>
+		<value>
+			<WorkToBuild>48500</WorkToBuild>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_MG42MG"]/costList</xpath>
+		<value>
+			<costList>
+				<WoodLog>20</WoodLog>
+				<Steel>175</Steel>
+				<ComponentIndustrial>6</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_MG42MG"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>86</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<!-- ========== (Turret JPN) Type 92 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Type92HMG</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.57</SwayFactor>
+			<Bulk>13.56</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.37</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_77x58mmArisaka_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_77x58mmArisaka</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_Type92HMG"]/statBases/Mass</xpath>
+		<value>
+			<Mass>55.30</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_Type92HMG"]/statBases/WorkToBuild</xpath>
+		<value>
+			<WorkToBuild>59500</WorkToBuild>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_Type92HMG"]/costList</xpath>
+		<value>
+			<costList>
+				<WoodLog>5</WoodLog>
+				<Steel>270</Steel>
+				<ComponentIndustrial>6</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_Type92HMG"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>75</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<!-- ========== (Turret UK) Vickers ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_VickersHMG</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.34</SwayFactor>
+			<Bulk>13.20</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.54</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>86</range>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>250</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_303British</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_VickersHMG"]/statBases/Mass</xpath>
+		<value>
+			<Mass>37.00</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_VickersHMG"]/statBases/WorkToBuild</xpath>
+		<value>
+			<WorkToBuild>52000</WorkToBuild>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_VickersHMG"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>210</Steel>
+				<ComponentIndustrial>6</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_VickersHMG"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>86</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<!-- ========== (Turret US) M1917A1 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_M1917A1MG</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.35</SwayFactor>
+			<Bulk>11.80</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>250</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_3006Springfield</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_M1917A1MG"]/statBases/Mass</xpath>
+		<value>
+			<Mass>39.25</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_M1917A1MG"]/statBases/WorkToBuild</xpath>
+		<value>
+			<WorkToBuild>52500</WorkToBuild>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_M1917A1MG"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>215</Steel>
+				<ComponentIndustrial>6</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_M1917A1MG"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>75</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<!-- ========== (Turret US) M1919A4 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_M1919A4MG</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.05</SwayFactor>
+			<Bulk>11.64</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.83</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>86</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>250</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_3006Springfield</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_M1919A4MG"]/statBases/Mass</xpath>
+		<value>
+			<Mass>20.40</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_M1919A4MG"]/statBases/WorkToBuild</xpath>
+		<value>
+			<WorkToBuild>44500</WorkToBuild>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_M1919A4MG"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>150</Steel>
+				<ComponentIndustrial>6</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_M1919A4MG"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>86</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<!-- ========== (Turret USSR) Maxim M1910-30 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MaximM1910-30HMG</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.67</SwayFactor>
+			<Bulk>12.67</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.28</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>86</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>250</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_MaximM1910-30HMG"]/statBases/Mass</xpath>
+		<value>
+			<Mass>64.30</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_MaximM1910-30HMG"]/statBases/WorkToBuild</xpath>
+		<value>
+			<WorkToBuild>63000</WorkToBuild>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_MaximM1910-30HMG"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>300</Steel>
+				<ComponentIndustrial>6</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_MaximM1910-30HMG"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>86</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<!-- ========== Common to all Turrets ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Turret_HotchkissM1914HMG" or
+			defName="Turret_MG34MG" or
+			defName="Turret_MG42MG" or
+			defName="Turret_Type92HMG" or
+			defName="Turret_VickersHMG" or
+			defName="Turret_M1917A1MG" or
+			defName="Turret_M1919A4MG" or
+			defName="Turret_MaximM1910-30HMG"
+			]/thingClass </xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="Turret_HotchkissM1914HMG" or
+			defName="Turret_MG34MG" or
+			defName="Turret_MG42MG" or
+			defName="Turret_Type92HMG" or
+			defName="Turret_VickersHMG" or
+			defName="Turret_M1917A1MG" or
+			defName="Turret_M1919A4MG" or
+			defName="Turret_MaximM1910-30HMG"
+			]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
+	</Operation>
+
+	<!-- All Pratt WWII Turrets already have their fillPercent set to 0.85, making them automatically compatible with CE embrasures -->
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Pratt WWII Weapons Pack/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Grenades.xml b/ModPatches/Pratt WWII Weapons Pack/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Grenades.xml
new file mode 100644
index 0000000000..03cf3ac1c2
--- /dev/null
+++ b/ModPatches/Pratt WWII Weapons Pack/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Grenades.xml	
@@ -0,0 +1,653 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Core patches already cover the BaseGrenadeProjectile abstract class -->
+
+	<!-- ========== Common ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="Weapon_MkIIGrenadeGNDE" or
+			defName="Weapon_Stielhandgranate24gnde" or
+			defName="Weapon_Type97GNDE" or
+			defName="Weapon_RGD-33GNDE" or
+			defName="Weapon_F1GrenadeGNDE" or
+			defName="Weapon_MillsGrenadeGNDE"
+			] </xpath>
+		<value>
+			<thingClass>CombatExtended.AmmoThing</thingClass>
+			<stackLimit>75</stackLimit>
+			<resourceReadoutPriority>First</resourceReadoutPriority>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="Weapon_MkIIGrenadeGNDE" or
+			defName="Weapon_Stielhandgranate24gnde" or
+			defName="Weapon_Type97GNDE" or
+			defName="Weapon_RGD-33GNDE" or
+			defName="Weapon_F1GrenadeGNDE" or
+			defName="Weapon_MillsGrenadeGNDE"
+			]/graphicData </xpath>
+		<value>
+			<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[
+			defName="Weapon_MkIIGrenadeGNDE" or
+			defName="Weapon_Stielhandgranate24gnde" or
+			defName="Weapon_Type97GNDE" or
+			defName="Weapon_RGD-33GNDE" or
+			defName="Weapon_F1GrenadeGNDE" or
+			defName="Weapon_MillsGrenadeGNDE"
+			] </xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[
+			defName="Weapon_MkIIGrenadeGNDE" or
+			defName="Weapon_Stielhandgranate24gnde" or
+			defName="Weapon_Type97GNDE" or
+			defName="Weapon_RGD-33GNDE" or
+			defName="Weapon_F1GrenadeGNDE" or
+			defName="Weapon_MillsGrenadeGNDE"
+			]/comps </xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[
+				defName="Weapon_MkIIGrenadeGNDE" or
+				defName="Weapon_Stielhandgranate24gnde" or
+				defName="Weapon_Type97GNDE" or
+				defName="Weapon_RGD-33GNDE" or
+				defName="Weapon_F1GrenadeGNDE" or
+				defName="Weapon_MillsGrenadeGNDE"
+				] </xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<!-- Remove original recipe maker -->
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[
+			defName="Weapon_MkIIGrenadeGNDE" or
+			defName="Weapon_Stielhandgranate24gnde" or
+			defName="Weapon_Type97GNDE" or
+			defName="Weapon_RGD-33GNDE" or
+			defName="Weapon_F1GrenadeGNDE" or
+			defName="Weapon_MillsGrenadeGNDE"
+			] </xpath>
+		<attribute>ParentName</attribute>
+		<value>BaseWeapon</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="Weapon_MkIIGrenadeGNDE" or
+			defName="Weapon_Stielhandgranate24gnde" or
+			defName="Weapon_Type97GNDE" or
+			defName="Weapon_RGD-33GNDE" or
+			defName="Weapon_F1GrenadeGNDE" or
+			defName="Weapon_MillsGrenadeGNDE"
+			]/costList </xpath>
+	</Operation>
+
+	<!-- Remove original recipe maker (END) -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Proj_MkIIGrenadeGNDE" or
+			defName="Proj_Stielhandgranate24gnde" or
+			defName="Proj_Type97GNDE" or
+			defName="Proj_RGD-33GNDE" or
+			defName="Proj_F1GrenadeGNDE" or
+			defName="Proj_MillsGrenadeGNDE"
+			]/thingClass </xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[
+			defName="Proj_MkIIGrenadeGNDE" or
+			defName="Proj_Stielhandgranate24gnde" or
+			defName="Proj_Type97GNDE" or
+			defName="Proj_RGD-33GNDE" or
+			defName="Proj_F1GrenadeGNDE" or
+			defName="Proj_MillsGrenadeGNDE"
+			]/comps </xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[
+				defName="Proj_MkIIGrenadeGNDE" or
+				defName="Proj_Stielhandgranate24gnde" or
+				defName="Proj_Type97GNDE" or
+				defName="Proj_RGD-33GNDE" or
+				defName="Proj_F1GrenadeGNDE" or
+				defName="Proj_MillsGrenadeGNDE"
+				] </xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<!-- ========== (US) MkII Grenade ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Weapon_MkIIGrenadeGNDE</defName>
+		<statBases>
+			<Mass>0.595</Mass>
+			<Bulk>0.91</Bulk>
+			<MarketValue>9.95</MarketValue>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<label>throw frag grenade</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<range>10.0</range>
+			<minRange>4</minRange>
+			<warmupTime>0.8</warmupTime>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<soundCast>ThrowGrenade</soundCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<defaultProjectile>Proj_MkIIGrenadeGNDE</defaultProjectile>
+			<onlyManualCast>true</onlyManualCast>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<weaponTags>
+			<li>CE_AI_Grenade</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Weapon_MkIIGrenadeGNDE"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>22</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1</explosiveRadius>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Weapon_MkIIGrenadeGNDE"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>60</Fragment_Small>
+				</fragments>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Proj_MkIIGrenadeGNDE"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<explosionRadius>1</explosionRadius>
+				<damageDef>Bomb</damageDef>
+				<damageAmountBase>22</damageAmountBase>
+				<explosionDelay>60</explosionDelay>
+				<dropsCasings>true</dropsCasings>
+				<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+				<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<speed>12</speed>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+				<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Proj_MkIIGrenadeGNDE"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>60</Fragment_Small>
+				</fragments>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== (GER) Stielhandgranate 24 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Weapon_Stielhandgranate24gnde</defName>
+		<statBases>
+			<Mass>0.595</Mass>
+			<Bulk>4.22</Bulk>
+			<MarketValue>12.41</MarketValue>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<label>throw frag grenade</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<range>10.0</range>
+			<minRange>4</minRange>
+			<warmupTime>0.8</warmupTime>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<soundCast>ThrowGrenade</soundCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<defaultProjectile>Proj_Stielhandgranate24gnde</defaultProjectile>
+			<onlyManualCast>true</onlyManualCast>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<weaponTags>
+			<li>CE_AI_Grenade</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Weapon_Stielhandgranate24gnde"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>45</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1.5</explosiveRadius>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>1</Fragment_Large>
+					<Fragment_Small>13</Fragment_Small>
+				</fragments>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Proj_Stielhandgranate24gnde"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<explosionRadius>1.5</explosionRadius>
+				<damageDef>Bomb</damageDef>
+				<damageAmountBase>45</damageAmountBase>
+				<explosionDelay>60</explosionDelay>
+				<dropsCasings>true</dropsCasings>
+				<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+				<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<speed>12</speed>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+				<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Proj_Stielhandgranate24gnde"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>1</Fragment_Large>
+					<Fragment_Small>13</Fragment_Small>
+				</fragments>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== (JPN) Type 97 Grenade ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Weapon_Type97GNDE</defName>
+		<statBases>
+			<Mass>0.45</Mass>
+			<Bulk>0.57</Bulk>
+			<MarketValue>9.55</MarketValue>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<label>throw frag grenade</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<range>10.0</range>
+			<minRange>4</minRange>
+			<warmupTime>0.8</warmupTime>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<soundCast>ThrowGrenade</soundCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<defaultProjectile>Proj_Type97GNDE</defaultProjectile>
+			<onlyManualCast>true</onlyManualCast>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<weaponTags>
+			<li>CE_AI_Grenade</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Weapon_Type97GNDE"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>26</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1</explosiveRadius>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Weapon_Type97GNDE"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>45</Fragment_Small>
+				</fragments>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Proj_Type97GNDE"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<explosionRadius>1</explosionRadius>
+				<damageDef>Bomb</damageDef>
+				<damageAmountBase>26</damageAmountBase>
+				<explosionDelay>60</explosionDelay>
+				<dropsCasings>true</dropsCasings>
+				<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+				<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<speed>12</speed>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+				<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Proj_Type97GNDE"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>45</Fragment_Small>
+				</fragments>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== (USSR) RGD-33 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Weapon_RGD-33GNDE</defName>
+		<statBases>
+			<Mass>0.75</Mass>
+			<Bulk>1.31</Bulk>
+			<MarketValue>10.74</MarketValue>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<label>throw frag grenade</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<range>10.0</range>
+			<minRange>4</minRange>
+			<warmupTime>0.8</warmupTime>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<soundCast>ThrowGrenade</soundCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<defaultProjectile>Proj_RGD-33GNDE</defaultProjectile>
+			<onlyManualCast>true</onlyManualCast>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<weaponTags>
+			<li>CE_AI_Grenade</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Weapon_RGD-33GNDE"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>30</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1</explosiveRadius>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Weapon_RGD-33GNDE"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>9</Fragment_Small>
+				</fragments>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Proj_RGD-33GNDE"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<explosionRadius>1</explosionRadius>
+				<damageDef>Bomb</damageDef>
+				<damageAmountBase>30</damageAmountBase>
+				<explosionDelay>60</explosionDelay>
+				<dropsCasings>true</dropsCasings>
+				<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+				<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<speed>12</speed>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+				<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Proj_RGD-33GNDE"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>9</Fragment_Small>
+				</fragments>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== (FR) Grenade F1 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Weapon_F1GrenadeGNDE</defName>
+		<statBases>
+			<Mass>0.55</Mass>
+			<Bulk>0.65</Bulk>
+			<MarketValue>9.95</MarketValue>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<label>throw frag grenade</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<range>10.0</range>
+			<minRange>4</minRange>
+			<warmupTime>0.8</warmupTime>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<soundCast>ThrowGrenade</soundCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<defaultProjectile>Proj_F1GrenadeGNDE</defaultProjectile>
+			<onlyManualCast>true</onlyManualCast>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<weaponTags>
+			<li>CE_AI_Grenade</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Weapon_F1GrenadeGNDE"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>24</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1</explosiveRadius>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Weapon_F1GrenadeGNDE"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>55</Fragment_Small>
+				</fragments>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Proj_F1GrenadeGNDE"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<explosionRadius>1</explosionRadius>
+				<damageDef>Bomb</damageDef>
+				<damageAmountBase>24</damageAmountBase>
+				<explosionDelay>60</explosionDelay>
+				<dropsCasings>true</dropsCasings>
+				<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+				<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<speed>12</speed>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+				<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Proj_F1GrenadeGNDE"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>55</Fragment_Small>
+				</fragments>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== (UK) Mills Grenade ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Weapon_MillsGrenadeGNDE</defName>
+		<statBases>
+			<Mass>0.765</Mass>
+			<Bulk>0.84</Bulk>
+			<MarketValue>10.74</MarketValue>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<label>throw frag grenade</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<range>10.0</range>
+			<minRange>4</minRange>
+			<warmupTime>0.8</warmupTime>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<soundCast>ThrowGrenade</soundCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<defaultProjectile>Proj_MillsGrenadeGNDE</defaultProjectile>
+			<onlyManualCast>true</onlyManualCast>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<weaponTags>
+			<li>CE_AI_Grenade</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Weapon_MillsGrenadeGNDE"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>27</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1</explosiveRadius>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Weapon_MillsGrenadeGNDE"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>77</Fragment_Small>
+				</fragments>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Proj_MillsGrenadeGNDE"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<explosionRadius>1</explosionRadius>
+				<damageDef>Bomb</damageDef>
+				<damageAmountBase>27</damageAmountBase>
+				<explosionDelay>60</explosionDelay>
+				<dropsCasings>true</dropsCasings>
+				<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+				<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<speed>12</speed>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+				<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Proj_MillsGrenadeGNDE"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>77</Fragment_Small>
+				</fragments>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Pratt WWII Weapons Pack/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Melee_JPN.xml b/ModPatches/Pratt WWII Weapons Pack/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Melee_JPN.xml
new file mode 100644
index 0000000000..cb979c2ccc
--- /dev/null
+++ b/ModPatches/Pratt WWII Weapons Pack/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Melee_JPN.xml	
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Longsword / Katana ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Katana"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.57</cooldownTime>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.57</cooldownTime>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.2</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>1.21</cooldownTime>
+					<armorPenetrationBlunt>1.944</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.44</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Katana"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>0.78</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Katana"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.56</MeleeCritChance>
+				<MeleeParryChance>0.58</MeleeParryChance>
+				<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Pratt WWII Weapons Pack/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_FR.xml b/ModPatches/Pratt WWII Weapons Pack/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_FR.xml
new file mode 100644
index 0000000000..afef20a13a
--- /dev/null
+++ b/ModPatches/Pratt WWII Weapons Pack/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_FR.xml	
@@ -0,0 +1,733 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== (FR) MAS 36 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MAS36R</defName>
+		<statBases>
+			<Mass>3.72</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.39</SwayFactor>
+			<Bulk>10.20</Bulk>
+			<WorkToMake>11000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_75x54mmFrench_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_75x54mmFrench</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_MAS36R"]/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>
+
+	<!-- ========== (FR) Lebel M1886 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_LebelM1886R</defName>
+		<statBases>
+			<Mass>4.18</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.72</SwayFactor>
+			<Bulk>13.00</Bulk>
+			<WorkToMake>12000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>65</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x50mmRLebel_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>6.8</reloadTime>
+			<ammoSet>AmmoSet_8x50mmRLebel</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_LebelM1886R"]/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>
+
+	<!-- ========== (FR) Mousqueton Berthier M1916 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MousquetonBerthierM1916R</defName>
+		<statBases>
+			<Mass>3.25</Mass>
+			<RangedWeapon_Cooldown>1.18</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>9.45</Bulk>
+			<WorkToMake>14500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x50mmRLebel_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_8x50mmRLebel</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_MousquetonBerthierM1916R"]/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>
+
+	<!-- ========== (FR) Sawed-off Double-barel Shotgun ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Sawed-offDouble-barelShotgunSG</defName>
+		<statBases>
+			<Mass>1.90</Mass>
+			<RangedWeapon_Cooldown>0.93</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>2.73</SwayFactor>
+			<Bulk>6.29</Bulk>
+			<WorkToMake>8500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>40</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>11</range>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>2</magazineSize>
+			<reloadTime>1.7</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_Sawed-offDouble-barelShotgunSG"]/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>
+
+	<!-- ========== (FR) FM M24-29 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_FMM24-29LMG</defName>
+		<statBases>
+			<Mass>8.90</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.38</SwayFactor>
+			<Bulk>11.80</Bulk>
+			<WorkToMake>30500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>70</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.26</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_75x54mmFrench_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_75x54mmFrench</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_FMM24-29LMG"]/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>
+
+	<!-- ========== (FR) Chauchat LMG ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_ChauchatLMG</defName>
+		<statBases>
+			<Mass>9.07</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.44</SwayFactor>
+			<Bulk>12.43</Bulk>
+			<WorkToMake>31500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>80</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.30</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x50mmRLebel_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>19</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_8x50mmRLebel</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<noSingleShot>TRUE</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_ChauchatLMG"]/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>
+
+	<!-- ========== (FR) PM MAS 38 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PMMAS38SMG</defName>
+		<statBases>
+			<Mass>4.34</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.06</SwayFactor>
+			<Bulk>6.30</Bulk>
+			<WorkToMake>26500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>45</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>0.90</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_765x20mmLongue_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_765x20mmLongue</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_PMMAS38SMG"]/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>
+
+	<!-- ========== (FR) Sten MkII ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_StenMkII</defName>
+		<statBases>
+			<Mass>3.20</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.08</SwayFactor>
+			<Bulk>7.62</Bulk>
+			<WorkToMake>27000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.35</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_StenMkII"]/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>
+
+	<!-- ========== (FR) PA MAS 35 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PAMAS35P</defName>
+		<statBases>
+			<Mass>0.73</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.90</SwayFactor>
+			<Bulk>1.97</Bulk>
+			<WorkToMake>7000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_765x20mmLongue_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_765x20mmLongue</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_PAMAS35P"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Pratt WWII Weapons Pack/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_GER.xml b/ModPatches/Pratt WWII Weapons Pack/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_GER.xml
new file mode 100644
index 0000000000..3b83d3021a
--- /dev/null
+++ b/ModPatches/Pratt WWII Weapons Pack/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_GER.xml	
@@ -0,0 +1,1117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== (GER) Mauser 98k ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Mauser98kR</defName>
+		<statBases>
+			<Mass>3.70</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.48</SwayFactor>
+			<Bulk>11.10</Bulk>
+			<WorkToMake>11500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_Mauser98kR"]/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>
+
+	<!-- ========== (GER) Gewehr 43 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Gewer43R</defName>
+		<statBases>
+			<Mass>4.40</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.57</SwayFactor>
+			<Bulk>11.30</Bulk>
+			<WorkToMake>19000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>55</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_SniperRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_Gewer43R"]/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>
+
+	<!-- ========== (GER) Mauser 98k scoped ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Mauser98kscopedSR</defName>
+		<statBases>
+			<Mass>4.10</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.56</SwayFactor>
+			<Bulk>11.10</Bulk>
+			<WorkToMake>15000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>86</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_Mauser98kscopedSR"]/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>
+
+	<!-- ========== (GER) STG 44 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Stg44AR</defName>
+		<statBases>
+			<Mass>4.60</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.40</SwayFactor>
+			<Bulk>9.40</Bulk>
+			<WorkToMake>28500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>60</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.54</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_792x33mmKurz_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>51</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_792x33mmKurz</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_Stg44AR"]/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>
+
+	<!-- ========== (GER) VG1-5 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_VG5-1C</defName>
+		<statBases>
+			<Mass>4.60</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.35</SwayFactor>
+			<Bulk>8.85</Bulk>
+			<WorkToMake>18000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_792x33mmKurz_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>40</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_792x33mmKurz</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_VG5-1C"]/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>
+
+	<!-- ========== (GER) MG 34 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MG34MG</defName>
+		<statBases>
+			<Mass>12.10</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.70</SwayFactor>
+			<Bulk>15.19</Bulk>
+			<WorkToMake>38500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>100</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.17</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>86</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>250</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_MG34MG"]/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>
+
+	<!-- ========== (GER) MG 42 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MG42MG</defName>
+		<statBases>
+			<Mass>11.60</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.67</SwayFactor>
+			<Bulk>15.20</Bulk>
+			<WorkToMake>38000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>95</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.18</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>86</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>250</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_MG42MG"]/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>
+
+	<!-- ========== (GER) FG 42 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_FG42FM</defName>
+		<statBases>
+			<Mass>4.20</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.37</SwayFactor>
+			<Bulk>9.45</Bulk>
+			<WorkToMake>27500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.03</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>62</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_FG42FM"]/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>
+
+	<!-- ========== (GER) MP 28 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MP28SMG</defName>
+		<statBases>
+			<Mass>4.18</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.25</SwayFactor>
+			<Bulk>9.32</Bulk>
+			<WorkToMake>27500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.21</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>26</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_MP28SMG"]/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>
+
+	<!-- ========== (GER) MP 40 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MP40SMG</defName>
+		<statBases>
+			<Mass>3.97</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<Bulk>6.30</Bulk>
+			<WorkToMake>30000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.27</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>31</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_MP40SMG"]/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>
+
+	<!-- ========== (GER) MP 3008 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MP3008SMG</defName>
+		<statBases>
+			<Mass>3.20</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.08</SwayFactor>
+			<Bulk>7.60</Bulk>
+			<WorkToMake>27000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.35</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_MP3008SMG"]/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>
+
+	<!-- ========== (GER) Luger P 08 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_LugerP08P</defName>
+		<statBases>
+			<Mass>0.87</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>1.03</SwayFactor>
+			<Bulk>2.22</Bulk>
+			<WorkToMake>7000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_LugerP08P"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== (GER) Walter P 38 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_WalterP38P</defName>
+		<statBases>
+			<Mass>0.84</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.00</SwayFactor>
+			<Bulk>2.16</Bulk>
+			<WorkToMake>7000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_WalterP38P"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== (GER) Panzerschreck ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PanzerschreckRL</defName>
+		<statBases>
+			<Mass>11.00</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>2.74</SwayFactor>
+			<Bulk>17.40</Bulk>
+			<WorkToMake>27000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>110</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_88mmRPzB_HEAT</defaultProjectile>
+			<warmupTime>1.9</warmupTime>
+			<range>25</range>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>5.6</reloadTime>
+			<ammoSet>AmmoSet_88mmRPzBRocket</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_PanzerschreckRL"]/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>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Pratt WWII Weapons Pack/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_JPN.xml b/ModPatches/Pratt WWII Weapons Pack/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_JPN.xml
new file mode 100644
index 0000000000..01c16e57ee
--- /dev/null
+++ b/ModPatches/Pratt WWII Weapons Pack/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_JPN.xml	
@@ -0,0 +1,487 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== (JPN) Type 99 Arisaka ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Type99ArisakaR</defName>
+		<statBases>
+			<Mass>3.79</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.50</SwayFactor>
+			<Bulk>11.18</Bulk>
+			<WorkToMake>11500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_77x58mmArisaka_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>62</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_77x58mmArisaka</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_Type99ArisakaR"]/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>
+
+	<!-- ========== (JPN) Type 99 Arisaka scoped ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Type99ArisakascopedSR</defName>
+		<statBases>
+			<Mass>4.04</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.56</SwayFactor>
+			<Bulk>11.18</Bulk>
+			<WorkToMake>15000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_77x58mmArisaka_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_77x58mmArisaka</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_Type99ArisakascopedSR"]/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>
+
+	<!-- ========== (JPN) Type 11 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Type11LMG</defName>
+		<statBases>
+			<Mass>10.20</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.48</SwayFactor>
+			<Bulk>13.00</Bulk>
+			<WorkToMake>32000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>85</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.09</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_65x50mmSRArisaka_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>62</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_65x50mmSRArisaka</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_Type11LMG"]/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>
+
+	<!-- ========== (JPN) Type 99 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Type99LMG</defName>
+		<statBases>
+			<Mass>10.40</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.55</SwayFactor>
+			<Bulk>12.81</Bulk>
+			<WorkToMake>32000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>85</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.19</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_77x58mmArisaka_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_77x58mmArisaka</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_Type99LMG"]/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>
+
+	<!-- ========== (JPN) Type 100 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Type100SMG</defName>
+		<statBases>
+			<Mass>3.70</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.26</SwayFactor>
+			<Bulk>8.90</Bulk>
+			<WorkToMake>27500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.13</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x22mmNambu_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_8x22mmNambu</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_Type100SMG"]/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>
+
+	<!-- ========== (JPN) Type 14 Nambu ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Type14NambuP</defName>
+		<statBases>
+			<Mass>0.65</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.19</ShotSpread>
+			<SwayFactor>0.97</SwayFactor>
+			<Bulk>1.71</Bulk>
+			<WorkToMake>7000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x22mmNambu_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_8x22mmNambu</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_Type14NambuP"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Pratt WWII Weapons Pack/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_UK.xml b/ModPatches/Pratt WWII Weapons Pack/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_UK.xml
new file mode 100644
index 0000000000..2f77def070
--- /dev/null
+++ b/ModPatches/Pratt WWII Weapons Pack/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_UK.xml	
@@ -0,0 +1,634 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== (UK) Lee Enfield N°4 MkI ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_LeeEnfieldN4MkIR</defName>
+		<statBases>
+			<Mass>4.11</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.54</SwayFactor>
+			<Bulk>11.29</Bulk>
+			<WorkToMake>11500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_303British</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_LeeEnfieldN4MkIR"]/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>
+
+	<!-- ========== (UK) LeeEnfield N°4 MkI (T) ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_LeeEnfieldN4MkI-TSR</defName>
+		<statBases>
+			<Mass>4.84</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.21</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.65</SwayFactor>
+			<Bulk>11.29</Bulk>
+			<WorkToMake>15500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>55</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
+			<warmupTime>1.275</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_303British</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_LeeEnfieldN4MkI-TSR"]/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>
+
+	<!-- ========== (UK) Bren MkII ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_BrenMkIILMG</defName>
+		<statBases>
+			<Mass>10.35</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.53</SwayFactor>
+			<Bulk>12.56</Bulk>
+			<WorkToMake>32000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>85</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.22</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>59</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_303British</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_BrenMkIILMG"]/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>
+
+	<!-- ========== (UK) Sten MkIII ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_StenMkIII</defName>
+		<statBases>
+			<Mass>3.20</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.08</SwayFactor>
+			<Bulk>7.62</Bulk>
+			<WorkToMake>27000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.35</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_StenMkIII"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.79</cooldownTime>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>3.02</cooldownTime>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.63</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.55</cooldownTime>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== (UK) Sten MkVI ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_StenMkVI</defName>
+		<statBases>
+			<Mass>4.50</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.36</SwayFactor>
+			<Bulk>9.08</Bulk>
+			<WorkToMake>27500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.04</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_StenMkVI"]/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>
+
+	<!-- ========== (UK) Thompson M1928 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_ThompsonM1928UKSMG</defName>
+		<statBases>
+			<Mass>4.90</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.35</SwayFactor>
+			<Bulk>8.60</Bulk>
+			<WorkToMake>27500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.32</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>25</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_ThompsonM1928UKSMG"]/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>
+
+	<!-- ========== (UK) Webley ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_WebleyP</defName>
+		<statBases>
+			<Mass>1.10</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.32</SwayFactor>
+			<Bulk>2.86</Bulk>
+			<WorkToMake>5000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_455Webley_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Revolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_455Webley</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_WebleyP"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== (UK) PIAT ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PIAT</defName>
+		<statBases>
+			<Mass>15.00</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>2.49</SwayFactor>
+			<Bulk>10.90</Bulk>
+			<WorkToMake>26500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>105</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_83mmPIATGrenade_HEAT</defaultProjectile>
+			<warmupTime>1.9</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_IncendiaryLauncher</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>5.6</reloadTime>
+			<ammoSet>AmmoSet_83mmPIATGrenade</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_PIAT"]/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>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Pratt WWII Weapons Pack/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_US.xml b/ModPatches/Pratt WWII Weapons Pack/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_US.xml
new file mode 100644
index 0000000000..b7e7411e2a
--- /dev/null
+++ b/ModPatches/Pratt WWII Weapons Pack/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_US.xml	
@@ -0,0 +1,1211 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== (US) M1 Garand ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_M1GarandR</defName>
+		<statBases>
+			<Mass>4.31</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.53</SwayFactor>
+			<Bulk>11.00</Bulk>
+			<WorkToMake>15000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>52</range>
+			<soundCast>Shot_SniperRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_3006Springfield</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_M1GarandR"]/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>
+
+	<!-- ========== (US) Springfield 1903 scoped ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Springfield1903scopedSR</defName>
+		<statBases>
+			<Mass>4.14</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.15</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.54</SwayFactor>
+			<Bulk>11.00</Bulk>
+			<WorkToMake>14500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
+			<warmupTime>1.225</warmupTime>
+			<range>63</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_3006Springfield</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_Springfield1903scopedSR"]/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>
+
+	<!-- ========== (US) Springfield 1903 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Springfield1903R</defName>
+		<statBases>
+			<Mass>3.90</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.49</SwayFactor>
+			<Bulk>11.00</Bulk>
+			<WorkToMake>11500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>63</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_3006Springfield</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_Springfield1903R"]/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>
+
+	<!-- ========== (US) M1897 Trench Gun ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_M1897trenchgunSG</defName>
+		<statBases>
+			<Mass>3.60</Mass>
+			<RangedWeapon_Cooldown>0.99</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.36</SwayFactor>
+			<Bulk>10.00</Bulk>
+			<WorkToMake>10000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>7</range>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.25</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_M1897trenchgunSG"]/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>
+
+	<!-- ========== (US} M1919A6 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_M1919A6LMG</defName>
+		<statBases>
+			<Mass>14.70</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.97</SwayFactor>
+			<Bulk>16.46</Bulk>
+			<WorkToMake>40500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>120</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.03</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>70</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>250</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_3006Springfield</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_M1919A6LMG"]/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>
+
+	<!-- ========== (US) BAR ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_BarFM</defName>
+		<statBases>
+			<Mass>7.25</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.34</SwayFactor>
+			<Bulk>12.94</Bulk>
+			<WorkToMake>30500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>70</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.51</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_3006Springfield</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_BarFM"]/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>
+
+	<!-- ========== (US) M1 Carbine ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_USM1C</defName>
+		<statBases>
+			<Mass>2.40</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.14</SwayFactor>
+			<Bulk>9.00</Bulk>
+			<WorkToMake>17500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>45</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_30Carbine_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>37</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_30Carbine</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_USM1C"]/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>
+
+	<!-- ========== (US) M2 Carbine ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_USM2C</defName>
+		<statBases>
+			<Mass>2.40</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.14</SwayFactor>
+			<Bulk>9.00</Bulk>
+			<WorkToMake>27000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>45</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.88</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_30Carbine_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>37</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_30Carbine</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_USM2C"]/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>
+
+	<!-- ========== (US) Thompson M1928 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_ThompsonM1928SMG</defName>
+		<statBases>
+			<Mass>4.90</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.35</SwayFactor>
+			<Bulk>9.60</Bulk>
+			<WorkToMake>28000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>55</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.32</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>25</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_ThompsonM1928SMG"]/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>
+
+	<!-- ========== (US) Thompson M1928A1 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_ThompsonM1928A1SMG</defName>
+		<statBases>
+			<Mass>4.90</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.35</SwayFactor>
+			<Bulk>9.60</Bulk>
+			<WorkToMake>28000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>55</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.32</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>25</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_ThompsonM1928A1SMG"]/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>
+
+	<!-- ========== (US) Thompson M1A1 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_ThompsonM1A1SMG</defName>
+		<statBases>
+			<Mass>4.50</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.26</SwayFactor>
+			<Bulk>8.10</Bulk>
+			<WorkToMake>27500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.38</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>25</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_ThompsonM1A1SMG"]/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>
+
+	<!-- ========== (US) M3 Grease Gun ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_M3greasegunSMG</defName>
+		<statBases>
+			<Mass>3.70</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.11</SwayFactor>
+			<Bulk>5.56</Bulk>
+			<WorkToMake>29500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>45</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.51</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<soundCast>Shot_HeavySMG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_M3greasegunSMG"]/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>
+
+	<!-- ========== (US) M3A1 Grease Gun ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_M3a1greasegunSMG</defName>
+		<statBases>
+			<Mass>3.61</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.10</SwayFactor>
+			<Bulk>5.56</Bulk>
+			<WorkToMake>29500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>45</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<soundCast>Shot_HeavySMG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_M3a1greasegunSMG"]/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>
+
+	<!-- ========== (US) Colt 1911 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Colt1911P</defName>
+		<statBases>
+			<Mass>1.10</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.07</SwayFactor>
+			<Bulk>2.10</Bulk>
+			<WorkToMake>7000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_Colt1911P"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== (US) M9A1 Bazooka ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_M9A1BazookaRL</defName>
+		<statBases>
+			<Mass>7.20</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>2.27</SwayFactor>
+			<Bulk>16.50</Bulk>
+			<WorkToMake>25000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>95</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_M6A3_HEAT</defaultProjectile>
+			<warmupTime>1.9</warmupTime>
+			<range>40</range>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>5.6</reloadTime>
+			<ammoSet>AmmoSet_M6A3Rocket</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_M9A1BazookaRL"]/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>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Pratt WWII Weapons Pack/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_USSR.xml b/ModPatches/Pratt WWII Weapons Pack/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_USSR.xml
new file mode 100644
index 0000000000..88377cd0ce
--- /dev/null
+++ b/ModPatches/Pratt WWII Weapons Pack/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_USSR.xml	
@@ -0,0 +1,652 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== (USSR) Mosin-Nagant M91-30 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Mosin-NagantM91-30R</defName>
+		<statBases>
+			<Mass>4.00</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.63</SwayFactor>
+			<Bulk>12.32</Bulk>
+			<WorkToMake>12000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>55</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_Mosin-NagantM91-30R"]/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>
+
+	<!-- ========== (USSR) Mosin-Nagant M91-30 scoped ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MosinNagantM91-30scopedSR</defName>
+		<statBases>
+			<Mass>4.27</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.21</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.69</SwayFactor>
+			<Bulk>12.32</Bulk>
+			<WorkToMake>15500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>55</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1.275</warmupTime>
+			<range>75</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_MosinNagantM91-30scopedSR"]/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>
+
+	<!-- ========== (USSR) SVT 40 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SVT40R</defName>
+		<statBases>
+			<Mass>3.85</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.61</SwayFactor>
+			<Bulk>12.26</Bulk>
+			<WorkToMake>19000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>55</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_SniperRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_SVT40R"]/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>
+
+	<!-- ========== (USSR) DP 28 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_DP28LMG</defName>
+		<statBases>
+			<Mass>9.12</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.53</SwayFactor>
+			<Bulk>14.70</Bulk>
+			<WorkToMake>32000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>85</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.32</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>62</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>47</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_DP28LMG"]/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>
+
+	<!-- ========== (USSR) PPSH 41 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PPSH41SMG</defName>
+		<statBases>
+			<Mass>3.63</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.21</SwayFactor>
+			<Bulk>9.43</Bulk>
+			<WorkToMake>27500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.22</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>23</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>71</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_PPSH41SMG"]/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>
+
+	<!-- ========== (USSR) PPS 43 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PPS43SMG</defName>
+		<statBases>
+			<Mass>3.04</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.12</SwayFactor>
+			<Bulk>6.15</Bulk>
+			<WorkToMake>29500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>45</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.35</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>23</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>35</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_PPS43SMG"]/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>
+
+	<!-- ========== (USSR) PPSH 41 (stick mag) ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PPSH41stickSMG</defName>
+		<statBases>
+			<Mass>3.63</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.21</SwayFactor>
+			<Bulk>8.43</Bulk>
+			<WorkToMake>27000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>45</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.22</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>23</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>35</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_PPSH41stickSMG"]/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>
+
+	<!-- ========== (USSR) TT-33 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_TT-33P</defName>
+		<statBases>
+			<Mass>0.85</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.93</SwayFactor>
+			<Bulk>1.94</Bulk>
+			<WorkToMake>7000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_TT-33P"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Prestige Specialist Armor/Patches/Prestige Specialist Armor/Apparel_Armor.xml b/ModPatches/Prestige Specialist Armor/Patches/Prestige Specialist Armor/Apparel_Armor.xml
new file mode 100644
index 0000000000..0fb0aa8b4a
--- /dev/null
+++ b/ModPatches/Prestige Specialist Armor/Patches/Prestige Specialist Armor/Apparel_Armor.xml	
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Grenadier armor -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ArmorGrenadierPrestige"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ArmorGrenadierPrestige"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>41</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_ArmorGrenadierPrestige"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>50</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ArmorGrenadierPrestige"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<label>launch 30x29mm grenade</label>
+					<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<onlyManualCast>True</onlyManualCast>
+					<warmupTime>1.5</warmupTime>
+					<range>40</range>
+					<minRange>5</minRange>
+					<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+					<soundCast>Shot_IncendiaryLauncher</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>14</muzzleFlashScale>
+					<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+					<defaultProjectile>Bullet_30x29mmGrenade_HE</defaultProjectile>
+					<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ArmorGrenadierPrestige"]/comps/li[@Class="CompProperties_Reloadable"]/ammoDef</xpath>
+		<value>
+			<ammoDef>Ammo_30x29mmGrenade_HE</ammoDef>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ArmorGrenadierPrestige"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountPerCharge</xpath>
+		<value>
+			<ammoCountPerCharge>1</ammoCountPerCharge>
+		</value>
+	</Operation>
+
+	<!-- Phoenix armor -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_ArmorPhoenixPrestige"]/statBases</xpath>
+		<value>
+			<Bulk>110</Bulk>
+			<WornBulk>18</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ArmorPhoenixPrestige"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ArmorPhoenixPrestige"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>26</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ArmorPhoenixPrestige"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>55</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_ArmorPhoenixPrestige"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>60</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ArmorPhoenixPrestige"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<label>launch 30x64mm incendiary</label>
+					<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<onlyManualCast>True</onlyManualCast>
+					<warmupTime>1.5</warmupTime>
+					<range>40</range>
+					<minRange>5</minRange>
+					<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+					<soundCast>Shot_IncendiaryLauncher</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>14</muzzleFlashScale>
+					<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+					<defaultProjectile>Bullet_30x64mmFuel_Incendiary</defaultProjectile>
+					<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ArmorPhoenixPrestige"]/comps/li[@Class="CompProperties_Reloadable"]/ammoDef</xpath>
+		<value>
+			<ammoDef>Ammo_30x64mmFuel_Incendiary</ammoDef>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ArmorPhoenixPrestige"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountPerCharge</xpath>
+		<value>
+			<ammoCountPerCharge>1</ammoCountPerCharge>
+		</value>
+	</Operation>
+
+	<!-- ========== Locust Armor ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_ArmorLocustPrestige"]/statBases</xpath>
+		<value>
+			<Bulk>85</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ArmorLocustPrestige"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ArmorLocustPrestige"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>38</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_ArmorLocustPrestige"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>40</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ArmorLocustPrestige"]/statBases/JumpRange</xpath>
+		<value>
+			<JumpRange>30</JumpRange>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Project RimFactory - Materials/Defs/Project RimFactory - Materials/Ammo_IronArrows.xml b/ModPatches/Project RimFactory - Materials/Defs/Project RimFactory - Materials/Ammo_IronArrows.xml
new file mode 100644
index 0000000000..3b0faf6594
--- /dev/null
+++ b/ModPatches/Project RimFactory - Materials/Defs/Project RimFactory - Materials/Ammo_IronArrows.xml	
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ==================== Arrows & Streamlined Arrows ========================== -->
+
+	<!-- ==================== Ammo Category ========================== -->
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>IronArrow</defName>
+		<label>iron arrow</label>
+		<labelShort>iron</labelShort>
+		<description>The arrow head is made from iron, capable of punching through shields and leather armor.</description>
+		<advanced>true</advanced>
+	</CombatExtended.AmmoCategoryDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoArrowBase">
+		<defName>Ammo_Arrow_Iron</defName>
+		<label>arrow (iron)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Neolithic/Arrow/Steel</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<Mass>0.034</Mass>
+			<MarketValue>0.53</MarketValue>
+		</statBases>
+		<ammoClass>IronArrow</ammoClass>
+	</ThingDef>
+
+	<!-- ================== Projectiles (short bow) ================== -->
+
+	<ThingDef ParentName="BaseArrowProjectile">
+		<defName>Projectile_Arrow_Iron</defName>
+		<label>arrow (iron)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>24</speed>
+			<damageAmountBase>7</damageAmountBase>
+			<armorPenetrationSharp>0.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>3.02</armorPenetrationBlunt>
+			<preExplosionSpawnChance>0.666</preExplosionSpawnChance><!-- 29.94 arrows per resource -->
+			<preExplosionSpawnThingDef>Ammo_Arrow_Iron</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles (Recurve Bow) ================== -->
+
+	<ThingDef ParentName="BaseStreamlinedArrowProjectile">
+		<defName>Projectile_StreamlinedArrow_Iron</defName>
+		<label>streamlined arrow (iron)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>33</speed>
+			<damageAmountBase>9</damageAmountBase>
+			<armorPenetrationSharp>1.0</armorPenetrationSharp>
+			<armorPenetrationBlunt>5.9</armorPenetrationBlunt>
+			<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>Ammo_Arrow_Iron</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>MakeAmmo_Arrow_Iron</defName>
+		<label>make iron arrows x10</label>
+		<description>Craft 10 iron arrows.</description>
+		<jobString>Making iron arrows.</jobString>
+		<workAmount>300</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>PRF_Iron</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+				<li>PRF_Iron</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Arrow_Iron>10</Ammo_Arrow_Iron>
+		</products>
+	</RecipeDef>
+
+	<!-- ==================== Great Arrows ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoGreatArrowBase">
+		<defName>Ammo_GreatArrow_Iron</defName>
+		<label>great arrow (iron)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Neolithic/Arrow/Steel</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<Mass>0.115</Mass>
+			<MarketValue>0.66</MarketValue>
+		</statBases>
+		<ammoClass>IronArrow</ammoClass>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseGreatArrowProjectile">
+		<defName>Projectile_GreatArrow_Iron</defName>
+		<label>great arrow (iron)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>7</damageAmountBase>
+			<armorPenetrationBlunt>2.340</armorPenetrationBlunt>
+			<armorPenetrationSharp>2</armorPenetrationSharp>
+			<preExplosionSpawnChance>0.6</preExplosionSpawnChance><!-- 25 arrows per resource -->
+			<preExplosionSpawnThingDef>Ammo_GreatArrow_Iron</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>MakeAmmo_GreatArrow_Iron</defName>
+		<label>make iron great arrows x10</label>
+		<description>Craft 10 iron great arrows.</description>
+		<jobString>Making iron great arrows.</jobString>
+		<workAmount>400</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>PRF_Iron</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+				<li>PRF_Iron</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_GreatArrow_Iron>10</Ammo_GreatArrow_Iron>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Project RimFactory - Materials/Patches/Project RimFactory - Materials/Ammo_PRFM.xml b/ModPatches/Project RimFactory - Materials/Patches/Project RimFactory - Materials/Ammo_PRFM.xml
new file mode 100644
index 0000000000..f905bd05c7
--- /dev/null
+++ b/ModPatches/Project RimFactory - Materials/Patches/Project RimFactory - Materials/Ammo_PRFM.xml	
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_Arrow"]/ammoTypes</xpath>
+		<value>
+			<Ammo_Arrow_Iron>Projectile_Arrow_Iron</Ammo_Arrow_Iron>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_StreamlinedArrow"]/ammoTypes</xpath>
+		<value>
+			<Ammo_Arrow_Iron>Projectile_StreamlinedArrow_Iron</Ammo_Arrow_Iron>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_GreatArrow"]/ammoTypes</xpath>
+		<value>
+			<Ammo_GreatArrow_Iron>Projectile_GreatArrow_Iron</Ammo_GreatArrow_Iron>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Project RimFactory - Materials/Patches/Project RimFactory - Materials/Items_Fossil.xml b/ModPatches/Project RimFactory - Materials/Patches/Project RimFactory - Materials/Items_Fossil.xml
new file mode 100644
index 0000000000..3a2efbf719
--- /dev/null
+++ b/ModPatches/Project RimFactory - Materials/Patches/Project RimFactory - Materials/Items_Fossil.xml	
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Copied Values from Expanded Materials - Metals patch since it Project RimFactory merges it -->
+	<!-- Combining the Bulk Values -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PRF_Fossil"]/statBases</xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Project RimFactory - Materials/Patches/Project RimFactory - Materials/Items_Resource_Carbon.xml b/ModPatches/Project RimFactory - Materials/Patches/Project RimFactory - Materials/Items_Resource_Carbon.xml
new file mode 100644
index 0000000000..462e5d9c19
--- /dev/null
+++ b/ModPatches/Project RimFactory - Materials/Patches/Project RimFactory - Materials/Items_Resource_Carbon.xml	
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Copied Values from Expanded Materials - Plastics patch -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PRF_Carbon" or defName="PRF_CarbonFiber" or defName="PRF_CarbonKevlarComposite" or
+			defName="PRF_CarbonPlate" or defName="PRF_RawDiamond" or defName="PRF_SyntheticDiamond"]/statBases </xpath>
+		<value>
+			<Bulk>0.02</Bulk>
+		</value>
+	</Operation>
+
+	<!-- Carbon Fiber -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PRF_CarbonFiber"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.95</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PRF_CarbonFiber"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>1.4</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PRF_CarbonFiber"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.08</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PRF_CarbonFiber"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>0.4</Mass>
+			<MeleePenetrationFactor>0.8</MeleePenetrationFactor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PRF_CarbonFiber"]/stuffProps/categories</xpath>
+		<value>
+			<li>Metallic_Weapon</li>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<!-- carbon-kevlar composite -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PRF_CarbonKevlarComposite"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.9</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PRF_CarbonKevlarComposite"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>1.55</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Carbon fiber plate -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PRF_CarbonPlate"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.5</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PRF_CarbonPlate"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>1.6</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Synthetic Diamond -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PRF_CarbonPlate"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.45</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PRF_CarbonPlate"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>1.8</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Project RimFactory - Materials/Patches/Project RimFactory - Materials/Items_Resource_Coal.xml b/ModPatches/Project RimFactory - Materials/Patches/Project RimFactory - Materials/Items_Resource_Coal.xml
new file mode 100644
index 0000000000..556d7eec9e
--- /dev/null
+++ b/ModPatches/Project RimFactory - Materials/Patches/Project RimFactory - Materials/Items_Resource_Coal.xml	
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Copied Values from Expanded Materials - Metals patch since it Project RimFactory merges it -->
+	<!-- Combining the Bulk Values -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PRF_Coal"]/statBases</xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Project RimFactory - Materials/Patches/Project RimFactory - Materials/Items_Resource_Coke.xml b/ModPatches/Project RimFactory - Materials/Patches/Project RimFactory - Materials/Items_Resource_Coke.xml
new file mode 100644
index 0000000000..4eab03c014
--- /dev/null
+++ b/ModPatches/Project RimFactory - Materials/Patches/Project RimFactory - Materials/Items_Resource_Coke.xml	
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Copied Values from Expanded Materials - Metals patch since it Project RimFactory merges it -->
+	<!-- Combining the Bulk Values -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PRF_Coke"]/statBases</xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Project RimFactory - Materials/Patches/Project RimFactory - Materials/Items_Resource_Glasswork.xml b/ModPatches/Project RimFactory - Materials/Patches/Project RimFactory - Materials/Items_Resource_Glasswork.xml
new file mode 100644
index 0000000000..1f4a7d8c7f
--- /dev/null
+++ b/ModPatches/Project RimFactory - Materials/Patches/Project RimFactory - Materials/Items_Resource_Glasswork.xml	
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Copied Values from Expanded Materials - Metals patch since it Project RimFactory merges it -->
+	<!-- Combining the Bulk Values -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PRF_Glass" or defName="PRF_RGlass"]/statBases</xpath>
+		<value>
+			<Bulk>0.02</Bulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Project RimFactory - Materials/Patches/Project RimFactory - Materials/Items_Resource_Masonry.xml b/ModPatches/Project RimFactory - Materials/Patches/Project RimFactory - Materials/Items_Resource_Masonry.xml
new file mode 100644
index 0000000000..88544399e3
--- /dev/null
+++ b/ModPatches/Project RimFactory - Materials/Patches/Project RimFactory - Materials/Items_Resource_Masonry.xml	
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Copied Values from Expanded Materials - Metals patch since it Project RimFactory merges it -->
+	<!-- Combining the Bulk Values -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PRF_Brick" or defName="PRF_Concrete" or defName="PRF_RefConcrete"]/statBases</xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Project RimFactory - Materials/Patches/Project RimFactory - Materials/Items_Resource_Metal.xml b/ModPatches/Project RimFactory - Materials/Patches/Project RimFactory - Materials/Items_Resource_Metal.xml
new file mode 100644
index 0000000000..36161ff34f
--- /dev/null
+++ b/ModPatches/Project RimFactory - Materials/Patches/Project RimFactory - Materials/Items_Resource_Metal.xml	
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Copied Values from Expanded Materials - Metals patch since it Project RimFactory merges it -->
+	<!-- Combining the Bulk Values -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PRF_Iron" or defName="PRF_Copper" or defName="PRF_StainlessSteel"]/statBases</xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+
+	<!-- Iron -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PRF_Iron"]/stuffProps/categories</xpath>
+		<value>
+			<li>Metallic_Weapon</li>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PRF_Iron"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.8</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PRF_Iron"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>1.2</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Copper -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PRF_Copper"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.25</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PRF_Copper"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.32</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Stainless Steel -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PRF_StainlessSteel"]/stuffProps/categories</xpath>
+		<value>
+			<li>Metallic_Weapon</li>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PRF_StainlessSteel"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>1.1</MeleePenetrationFactor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PRF_StainlessSteel"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.2</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PRF_StainlessSteel"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>1.7</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Project RimFactory - Materials/Patches/Project RimFactory - Materials/Items_Resource_Plastics.xml b/ModPatches/Project RimFactory - Materials/Patches/Project RimFactory - Materials/Items_Resource_Plastics.xml
new file mode 100644
index 0000000000..af89bb23f5
--- /dev/null
+++ b/ModPatches/Project RimFactory - Materials/Patches/Project RimFactory - Materials/Items_Resource_Plastics.xml	
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Copied Values from Expanded Materials - Plastics patch since it Project RimFactory merges it -->
+	<!-- Plastic -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PRF_MixedPlastic"]/statBases</xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PRF_MixedPlastic"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.02</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PRF_MixedPlastic"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.05</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Polyester -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PRF_Polyester"]/statBases</xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PRF_Polyester"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.012</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PRF_Polyester"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.015</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Kevlar -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PRF_Kevlar"]/statBases</xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PRF_Kevlar"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.5</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PRF_Kevlar"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.04</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Project RimFactory - Materials/Patches/Project RimFactory - Materials/Items_Resource_Quartz.xml b/ModPatches/Project RimFactory - Materials/Patches/Project RimFactory - Materials/Items_Resource_Quartz.xml
new file mode 100644
index 0000000000..aa2cd48cb7
--- /dev/null
+++ b/ModPatches/Project RimFactory - Materials/Patches/Project RimFactory - Materials/Items_Resource_Quartz.xml	
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Quartz -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PRF_quartz"]/statBases</xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+	<!-- Crystal Powder -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PRF_CrystalPowder"]/statBases</xpath>
+		<value>
+			<Bulk>0.02</Bulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PRF_CrystalPowder"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.01</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PRF_CrystalPowder"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.004</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Project RimFactory - Materials/Patches/Project RimFactory - Materials/Items_Resource_Raw.xml b/ModPatches/Project RimFactory - Materials/Patches/Project RimFactory - Materials/Items_Resource_Raw.xml
new file mode 100644
index 0000000000..e8a9d23e4e
--- /dev/null
+++ b/ModPatches/Project RimFactory - Materials/Patches/Project RimFactory - Materials/Items_Resource_Raw.xml	
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Combined Bulk -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PRF_RawClay" or defName="PRF_Cement" or defName="PRF_RawSand"]/statBases</xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Prostheses+/Patches/Prostheses+/Patch_Implants.xml b/ModPatches/Prostheses+/Patches/Prostheses+/Patch_Implants.xml
new file mode 100644
index 0000000000..2d75d62947
--- /dev/null
+++ b/ModPatches/Prostheses+/Patches/Prostheses+/Patch_Implants.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Combat_Mechanites_TwoA"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Combat_Mechanites_TwoA"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Combat_Mechanites_ThreeA"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Combat_Mechanites_ThreeA"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Protective_Mechanites"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Protective_Mechanites"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Prostheses+/Patches/Prostheses+/Patch_Prostheses.xml b/ModPatches/Prostheses+/Patches/Prostheses+/Patch_Prostheses.xml
new file mode 100644
index 0000000000..d8f10a3939
--- /dev/null
+++ b/ModPatches/Prostheses+/Patches/Prostheses+/Patch_Prostheses.xml
@@ -0,0 +1,637 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Reinforced_Wooden_Arm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>reinforced wooden arm</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.48</cooldownTime>
+					<armorPenetrationBlunt>0.350</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Hydraulic_Wooden_Arm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>hydraulic wooden arm</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.48</cooldownTime>
+					<armorPenetrationBlunt>0.550</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Simple_Mechanical_Arm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>simple mechanical arm</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.68</cooldownTime>
+					<armorPenetrationBlunt>0.650</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Reinforced_Mechanical_Arm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>reinforced mechanical arm</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.88</cooldownTime>
+					<armorPenetrationBlunt>0.850</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Metal_Blade"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.18</cooldownTime>
+					<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.32</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Advanced_Hand_Prosthesis"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>advanced arm prosthesis</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.48</cooldownTime>
+					<armorPenetrationBlunt>0.950</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Mechanical_Arm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mechanical arm</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.68</cooldownTime>
+					<armorPenetrationBlunt>0.850</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Hydraulic_Reinforced_Arm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>hydraulic reinforced arm</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.78</cooldownTime>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Energy_Spear"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>energy spear</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.64</cooldownTime>
+					<armorPenetrationBlunt>0.415</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.44</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Energy_Spear_A"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Energy spear MK 1A</label>
+					<capacities>
+						<li>TP_Energy_Spear_A_Scratch</li>
+					</capacities>
+					<power>17</power>
+					<hediff>TP_Poisoning_Chemicals</hediff>
+					<cooldownTime>2.64</cooldownTime>
+					<armorPenetrationBlunt>0.415</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.44</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Energy_Spear_B"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Energy spear MK 1B</label>
+					<capacities>
+						<li>TP_Energy_Spear_B_Scratch</li>
+					</capacities>
+					<power>17</power>
+					<hediff>TP_Disorienting_Gases</hediff>
+					<cooldownTime>2.64</cooldownTime>
+					<armorPenetrationBlunt>0.415</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.44</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Energy_Spear_C"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Energy spear MK 1C</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>1.64</cooldownTime>
+					<armorPenetrationBlunt>0.415</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.55</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Electromechanical_Arm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>electromechanical arm</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.48</cooldownTime>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Sensory_Active_Hand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>sensory active hand</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.42</cooldownTime>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Reinforced_Electrochemical_Arm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>reinforced electrochemical arm</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.52</cooldownTime>
+					<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Bionic_Blades"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>bionic blades</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.18</cooldownTime>
+					<armorPenetrationBlunt>0.48</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.88</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Bionic_Blades_A"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>bionic blades MK 1A</label>
+					<capacities>
+						<li>TP_Energy_Spear_A_Scratch</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.18</cooldownTime>
+					<armorPenetrationBlunt>0.48</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.88</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Bionic_Blades_B"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>bionic blades MK 1B</label>
+					<capacities>
+						<li>TP_Energy_Spear_B_Scratch</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.18</cooldownTime>
+					<armorPenetrationBlunt>0.48</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.88</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Bionic_Blades_C"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>bionic blades MK 1C</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>2.18</cooldownTime>
+					<armorPenetrationBlunt>0.58</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.08</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Mechanized_Arm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mechanized arm</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2.48</cooldownTime>
+					<armorPenetrationBlunt>7.450</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Hydromechanical_Arm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>hydromechanical arm</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2.48</cooldownTime>
+					<armorPenetrationBlunt>8.650</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Bioelectric_Hand_Prosthesis"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>bioelectric arm prosthesis</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2.48</cooldownTime>
+					<armorPenetrationBlunt>8.650</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Myoelectric_Hand_Prosthesis"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>bioelectric arm prosthesis</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2.48</cooldownTime>
+					<armorPenetrationBlunt>8.50</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Programmable_Hand_Prosthesis"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>programmable arm prosthesis</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11.4</power>
+					<cooldownTime>2.48</cooldownTime>
+					<armorPenetrationBlunt>8.70</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Cybernetic_Hand_MK_One"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>programmable arm prosthesis</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12.4</power>
+					<cooldownTime>2.48</cooldownTime>
+					<armorPenetrationBlunt>9.40</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Cyber_blades"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>cyber ​​blades MK Basic</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>2.18</cooldownTime>
+					<armorPenetrationBlunt>1.4</armorPenetrationBlunt>
+					<armorPenetrationSharp>4.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Cyber_blades_A"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>cyber ​​blades MK 1A</label>
+					<capacities>
+						<li>TP_Energy_Spear_A_Scratch</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>2.18</cooldownTime>
+					<armorPenetrationBlunt>1.4</armorPenetrationBlunt>
+					<armorPenetrationSharp>4.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Cyber_blades_B"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>cyber ​​blades MK 1B</label>
+					<capacities>
+						<li>TP_Energy_Spear_B_Scratch</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>2.18</cooldownTime>
+					<armorPenetrationBlunt>1.4</armorPenetrationBlunt>
+					<armorPenetrationSharp>4.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Cyber_blades_C"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>cyber ​​blades MK 1C</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>2.38</cooldownTime>
+					<armorPenetrationBlunt>1.4</armorPenetrationBlunt>
+					<armorPenetrationSharp>4.95</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Cybernetic_Arm_MK_Medicine"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>cybernetic arm MK medicine</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12.4</power>
+					<cooldownTime>2.48</cooldownTime>
+					<armorPenetrationBlunt>9.40</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Cybernetic_Arm_MK_Construction"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>cybernetic arm MK construction</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12.4</power>
+					<cooldownTime>2.48</cooldownTime>
+					<armorPenetrationBlunt>9.40</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Cybernetic_Arm_MK_Sniper"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>cybernetic arm MK Sniper</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12.4</power>
+					<cooldownTime>2.48</cooldownTime>
+					<armorPenetrationBlunt>9.40</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Cybernetic_Arm_MK_Two"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>cybernetic arm MK 2</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14.4</power>
+					<cooldownTime>2.68</cooldownTime>
+					<armorPenetrationBlunt>11.40</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Cybernetic_Arm_MK_Three"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>cybernetic arm MK 3</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14.4</power>
+					<cooldownTime>2.68</cooldownTime>
+					<armorPenetrationBlunt>11.40</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Unstable_Shield_Generator"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Unstable_Shield_Generator"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Shield_Generator"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Shield_Generator"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Prostheses+/Patches/Prostheses+/Patch_Utility.xml b/ModPatches/Prostheses+/Patches/Prostheses+/Patch_Utility.xml
new file mode 100644
index 0000000000..f05d7b87d5
--- /dev/null
+++ b/ModPatches/Prostheses+/Patches/Prostheses+/Patch_Utility.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Shockproof_Plates"]/stages/li[1]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Shockproof_Plates"]/stages/li[2]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Shockproof_Plates"]/stages/li[3]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Shockproof_Plates"]/stages/li[4]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>7</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Shockproof_Plates"]/stages/li[5]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Ablation_Plates"]/stages/li[1]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Ablation_Plates"]/stages/li[2]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Ablation_Plates"]/stages/li[3]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.50</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Ablation_Plates"]/stages/li[4]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2.50</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Ablation_Plates"]/stages/li[5]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5.00</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Combat_Exosuit"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5.00</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Combat_Exosuit"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>5.00</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Combat_Exohelmet"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2.50</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "TP_Combat_Exohelmet"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2.50</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName= "TP_Bioelectric_Exoskeleton"]/stages/li/statOffsets/CarryingCapacity</xpath>
+		<value>
+			<CarryWeight>5</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName= "TP_Myoelectric_Exoskeleton"]/stages/li/statOffsets/CarryingCapacity</xpath>
+		<value>
+			<CarryWeight>10</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName= "TP_Programmable_Exoskeleton"]/stages/li/statOffsets/CarryingCapacity</xpath>
+		<value>
+			<CarryWeight>15</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName= "TP_Cybernetic_Exoskeleton_MK_OneA"]/stages/li/statOffsets/CarryingCapacity</xpath>
+		<value>
+			<CarryWeight>30</CarryWeight>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Protoswords/Patches/Protoswords/Proto_CE.xml b/ModPatches/Protoswords/Patches/Protoswords/Proto_CE.xml
new file mode 100644
index 0000000000..fbc598bf5f
--- /dev/null
+++ b/ModPatches/Protoswords/Patches/Protoswords/Proto_CE.xml
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Protosword-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BON_Protosword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<chanceFactor>0.1</chanceFactor>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>26</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Bomb</def>
+							<amount>6</amount>
+							<chance>0.3</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>1.3</cooldownTime>
+					<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
+					<armorPenetrationSharp>15</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>13</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Bomb</def>
+							<amount>6</amount>
+							<chance>0.3</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>1.35</cooldownTime>
+					<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
+					<armorPenetrationSharp>18</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BON_Protosword"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>0.36</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BON_Protosword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.45</MeleeCritChance>
+				<MeleeParryChance>0.32</MeleeParryChance>
+				<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="BON_Protosword"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="BON_Protosword"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BON_Protosword"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- Patch sear tool capacity & damage type -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ToolCapacityDef[defName="BON_SearStab"]</xpath>
+		<value>
+			<li Class="CombatExtended.ModExtensionMeleeToolPenetration">
+				<canHitInternal>true</canHitInternal>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/DamageDef[defName="BON_SearDamage"]</xpath>
+		<value>
+			<li Class="CombatExtended.DamageDefExtensionCE">
+				<isAmbientDamage>true</isAmbientDamage>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Phase Sword -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BON_Phasesword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>hilt</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<chanceFactor>0.1</chanceFactor>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.65</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>BON_SearCut</li>
+					</capacities>
+					<power>36</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>4</amount>
+							<chance>0.3</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>1.19</cooldownTime>
+					<armorPenetrationBlunt>3.16</armorPenetrationBlunt>
+					<armorPenetrationSharp>20</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>BON_SearStab</li>
+					</capacities>
+					<power>18</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>4</amount>
+							<chance>0.3</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>1.32</cooldownTime>
+					<armorPenetrationBlunt>1.68</armorPenetrationBlunt>
+					<armorPenetrationSharp>26</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BON_Phasesword"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.45</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BON_Phasesword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.71</MeleeCritChance>
+				<MeleeParryChance>0.45</MeleeParryChance>
+				<MeleeDodgeChance>0.29</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="BON_Phasesword"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="BON_Phasesword"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BON_Phasesword"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/PsiTech/Patches/PsiTech/AutocastProfileDefs/PsiTechAutocastProfileDefs.xml b/ModPatches/PsiTech/Patches/PsiTech/AutocastProfileDefs/PsiTechAutocastProfileDefs.xml
new file mode 100644
index 0000000000..a2a0afead4
--- /dev/null
+++ b/ModPatches/PsiTech/Patches/PsiTech/AutocastProfileDefs/PsiTechAutocastProfileDefs.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- == Mindfray == -->
+	<!-- PTAutocastProfile_Mindfray_1 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Def[defName="PTAutocastProfile_Mindfray_1"]/TargetRange</xpath>
+		<value>
+			<TargetRange>0~18</TargetRange>
+		</value>
+	</Operation>
+	<!-- PTAutocastProfile_Mindfray_2 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Def[defName="PTAutocastProfile_Mindfray_2"]/TargetRange</xpath>
+		<value>
+			<TargetRange>0~18</TargetRange>
+		</value>
+	</Operation>
+
+	<!-- == Inspire == -->
+	<!-- PTAutocastProfile_Inspire_1 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Def[defName="PTAutocastProfile_Inspire_1"]/TargetRange</xpath>
+		<value>
+			<TargetRange>0~18</TargetRange>
+		</value>
+	</Operation>
+
+	<!-- == Mindsoothe == -->
+	<!-- PTAutocastProfile_Mindsoothe_1 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Def[defName="PTAutocastProfile_Mindsoothe_1"]/TargetRange</xpath>
+		<value>
+			<TargetRange>0~24</TargetRange>
+		</value>
+	</Operation>
+
+	<!-- == Insanity == -->
+	<!-- PTAutocastProfile_Insanity_1 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Def[defName="PTAutocastProfile_Insanity_1"]/TargetRange</xpath>
+		<value>
+			<TargetRange>0~36</TargetRange>
+		</value>
+	</Operation>
+	<!-- PTAutocastProfile_Insanity_2 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Def[defName="PTAutocastProfile_Insanity_2"]/TargetRange</xpath>
+		<value>
+			<TargetRange>0~36</TargetRange>
+		</value>
+	</Operation>
+	<!-- PTAutocastProfile_Insanity_3 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Def[defName="PTAutocastProfile_Insanity_3"]/TargetRange</xpath>
+		<value>
+			<TargetRange>0~36</TargetRange>
+		</value>
+	</Operation>
+
+	<!-- == Mindmelt == -->
+	<!-- PTAutocastProfile_Mindmelt_1 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Def[defName="PTAutocastProfile_Mindmelt_1"]/TargetRange</xpath>
+		<value>
+			<TargetRange>0~36</TargetRange>
+		</value>
+	</Operation>
+	<!-- PTAutocastProfile_Mindmelt_2 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Def[defName="PTAutocastProfile_Mindmelt_2"]/TargetRange</xpath>
+		<value>
+			<TargetRange>0~36</TargetRange>
+		</value>
+	</Operation>
+	<!-- PTAutocastProfile_Mindmelt_3 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Def[defName="PTAutocastProfile_Mindmelt_3"]/TargetRange</xpath>
+		<value>
+			<TargetRange>0~36</TargetRange>
+		</value>
+	</Operation>
+	<!-- PTAutocastProfile_Mindmelt_4 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Def[defName="PTAutocastProfile_Mindmelt_4"]/TargetRange</xpath>
+		<value>
+			<TargetRange>0~36</TargetRange>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/PsiTech/Patches/PsiTech/EquipmentEnhancementDef/EquipmentEnhancementDef.xml b/ModPatches/PsiTech/Patches/PsiTech/EquipmentEnhancementDef/EquipmentEnhancementDef.xml
new file mode 100644
index 0000000000..4288f7115a
--- /dev/null
+++ b/ModPatches/PsiTech/Patches/PsiTech/EquipmentEnhancementDef/EquipmentEnhancementDef.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- == EquipmentEnhancementDef == -->
+	<!-- RangedMods -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Def[defName="EquipmentEnhancementDef"]/RangedMods</xpath>
+		<value>
+			<RangedMods>
+				<ShotSpread>-0.1</ShotSpread>
+				<SwayFactor>-0.25</SwayFactor>
+				<SightsEfficiency>0.2</SightsEfficiency>
+				<RangedWeapon_Cooldown>-0.25</RangedWeapon_Cooldown>
+			</RangedMods>
+		</value>
+	</Operation>
+	<!-- MeleeMods -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Def[defName="EquipmentEnhancementDef"]/MeleeMods</xpath>
+		<value>
+			<MeleeMods>
+				<MeleeWeapon_DamageMultiplier>0.25</MeleeWeapon_DamageMultiplier>
+				<MeleePenetrationFactor>0.5</MeleePenetrationFactor>
+				<MeleeCounterParryBonus>0.25</MeleeCounterParryBonus>
+			</MeleeMods>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/PsiTech/Patches/PsiTech/HediffDefs/PsiTechBuffs.xml b/ModPatches/PsiTech/Patches/PsiTech/HediffDefs/PsiTechBuffs.xml
new file mode 100644
index 0000000000..084dbfbae9
--- /dev/null
+++ b/ModPatches/PsiTech/Patches/PsiTech/HediffDefs/PsiTechBuffs.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- == PTMeleeMastery == -->
+	<!-- statOffsets -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="PTMeleeMastery"]/stages/li/statOffsets[MeleeDodgeChance="30"]</xpath>
+		<value>
+			<statOffsets>
+				<MeleeDodgeChance>1</MeleeDodgeChance>
+				<MeleePenetrationFactor>0.5</MeleePenetrationFactor>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<!-- == PTRangedMastery == -->
+	<!-- statFactors -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="PTRangedMastery"]/stages/li[statOffsets/ShootingAccuracyPawn="10"]</xpath>
+		<value>
+			<statFactors>
+				<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
+				<AimingAccuracy>1.25</AimingAccuracy>
+			</statFactors>
+		</value>
+	</Operation>
+	<!-- statOffsets -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/HediffDef[defName="PTRangedMastery"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/PsiTech/Patches/PsiTech/PawnKindDefs/PawnKinds_PsiTech.xml b/ModPatches/PsiTech/Patches/PsiTech/PawnKindDefs/PawnKinds_PsiTech.xml
new file mode 100644
index 0000000000..a8508f161c
--- /dev/null
+++ b/ModPatches/PsiTech/Patches/PsiTech/PawnKindDefs/PawnKinds_PsiTech.xml
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==== Psion_Penitent ==== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Psion_Penitent"]/combatPower</xpath>
+		<value>
+			<combatPower>20</combatPower>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Psion_Penitent"]/weaponMoney</xpath>
+		<value>
+			<weaponMoney>80~150</weaponMoney>
+		</value>
+	</Operation>
+
+	<!-- ==== Psion_Uninitiated ==== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Psion_Uninitiated"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>1</min>
+					<max>3</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>10</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ==== Psion_Initiate and Psion_Acolyte ==== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Psion_Initiate" or defName="Psion_Acolyte"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.6</generateChance>
+						<sidearmMoney>
+							<min>20</min>
+							<max>180</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ==== Psion_Ascendant ==== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Psion_Ascendant"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.7</generateChance>
+						<sidearmMoney>
+							<min>20</min>
+							<max>180</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ==== Every elite tier pawn is forced to wear a tactical vest for bulk capacity ==== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="Psion_Commando" or defName="Psion_Warrior" or defName="Psion_Conduit" or defName="Psion_Transcendent"]</xpath>
+		<value>
+			<specificApparelRequirements>
+				<li>
+					<bodyPartGroup>Shoulders</bodyPartGroup>
+					<apparelLayer>Webbing</apparelLayer>
+					<requiredTag>IndustrialMilitaryBasic</requiredTag>
+				</li>
+			</specificApparelRequirements>
+		</value>
+	</Operation>
+
+	<!-- ==== Psion_Commando ==== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Psion_Commando"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>200</min>
+					<max>600</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.8</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.8</generateChance>
+						<sidearmMoney>
+							<min>60</min>
+							<max>360</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ==== Psion_Warrior ==== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Psion_Warrior"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.8</generateChance>
+						<sidearmMoney>
+							<min>120</min>
+							<max>720</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ==== Psion_Conduit ==== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Psion_Conduit"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.8</generateChance>
+						<sidearmMoney>
+							<min>30</min>
+							<max>180</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ==== Psion_Transcendent ==== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Psion_Transcendent"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>999999</min>
+					<max>999999</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>1</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>1</generateChance>
+						<sidearmMoney>
+							<min>999999</min>
+							<max>999999</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm</li>
+						</weaponTags>
+						<magazineCount>
+							<min>0</min>
+							<max>3</max>
+						</magazineCount>
+					</li>
+					<li>
+						<generateChance>1</generateChance>
+						<sidearmMoney>
+							<min>999999</min>
+							<max>999999</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/PsiTech/Patches/PsiTech/PsiTechAbilityDefs/PsiTechAbilitiyDefs_Tier1.xml b/ModPatches/PsiTech/Patches/PsiTech/PsiTechAbilityDefs/PsiTechAbilitiyDefs_Tier1.xml
new file mode 100644
index 0000000000..93c24ee1e6
--- /dev/null
+++ b/ModPatches/PsiTech/Patches/PsiTech/PsiTechAbilityDefs/PsiTechAbilitiyDefs_Tier1.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- == PTCombatPrecognition == -->
+	<!-- StatOffsets -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Def[defName="PTCombatPrecognition"]/StatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			<MeleeParryChance>0.5</MeleeParryChance>
+		</value>
+	</Operation>
+	<!-- description -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Def[defName="PTCombatPrecognition"]/description</xpath>
+		<value>
+			<description>Combat precognition is a technique that allows a psion to predict an adversary's movement before it happens, making them better at evading and blocking attacks.</description>
+		</value>
+	</Operation>
+
+	<!-- == PTCombatInsight == -->
+	<!-- StatOffsets -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/Def[defName="PTCombatInsight"]</xpath>
+		<value>
+			<StatOffsets>
+				<MeleeCritChance>0.5</MeleeCritChance>
+				<MeleePenetrationFactor>0.5</MeleePenetrationFactor>
+			</StatOffsets>
+		</value>
+	</Operation>
+	<!-- StatFactors -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/Def[defName="PTCombatInsight"]/StatFactors</xpath>
+	</Operation>
+	<!-- description -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Def[defName="PTCombatInsight"]/description</xpath>
+		<value>
+			<description>Combat insight is a technique that allows a psion to more easily see an adversary's weaknesses, making them more effective at penetrating armor and dealing critical blows.</description>
+		</value>
+	</Operation>
+
+	<!-- == PTCombatPrecision == -->
+	<!-- StatOffsets -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Def[defName="PTCombatPrecision"]/StatOffsets</xpath>
+		<value>
+			<StatFactors>
+				<AimingAccuracy>1.5</AimingAccuracy>
+			</StatFactors>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/PsiTech/Patches/PsiTech/PsiTechAbilityDefs/PsiTechAbilitiyDefs_Tier2.xml b/ModPatches/PsiTech/Patches/PsiTech/PsiTechAbilityDefs/PsiTechAbilitiyDefs_Tier2.xml
new file mode 100644
index 0000000000..f699f3de4e
--- /dev/null
+++ b/ModPatches/PsiTech/Patches/PsiTech/PsiTechAbilityDefs/PsiTechAbilitiyDefs_Tier2.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- == PTMindfray == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Def[defName="PTMindfray"]/Range</xpath>
+		<value>
+			<Range>18</Range>
+		</value>
+	</Operation>
+	<!-- == PTMindSuppression == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Def[defName="PTMindSuppression"]/Range</xpath>
+		<value>
+			<Range>42</Range>
+		</value>
+	</Operation>
+	<!-- == PTInspire == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Def[defName="PTInspire"]/Range</xpath>
+		<value>
+			<Range>18</Range>
+		</value>
+	</Operation>
+	<!-- == PTMindlink == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Def[defName="PTMindlink"]/Range</xpath>
+		<value>
+			<Range>24</Range>
+		</value>
+	</Operation>
+	<!-- == PTPsiHeal == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Def[defName="PTPsiHeal"]/Range</xpath>
+		<value>
+			<Range>24</Range>
+		</value>
+	</Operation>
+	<!-- == PTMindsoothe == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Def[defName="PTMindsoothe"]/Range</xpath>
+		<value>
+			<Range>24</Range>
+		</value>
+	</Operation>
+	<!-- == PTInsanity == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Def[defName="PTInsanity"]/Range</xpath>
+		<value>
+			<Range>36</Range>
+		</value>
+	</Operation>
+	<!-- == PTMindmelt == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Def[defName="PTMindmelt"]/Range</xpath>
+		<value>
+			<Range>36</Range>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/PsiTech/Patches/PsiTech/PsiTechAbilityDefs/PsiTechAbilityDefs_Tier3.xml b/ModPatches/PsiTech/Patches/PsiTech/PsiTechAbilityDefs/PsiTechAbilityDefs_Tier3.xml
new file mode 100644
index 0000000000..7beef4c1b1
--- /dev/null
+++ b/ModPatches/PsiTech/Patches/PsiTech/PsiTechAbilityDefs/PsiTechAbilityDefs_Tier3.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- == PTMindfray == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Def[defName="PTMindDomination"]/Range</xpath>
+		<value>
+			<Range>66</Range>
+		</value>
+	</Operation>
+	<!-- == PTMindSuppression == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Def[defName="PTPsiRally"]/Range</xpath>
+		<value>
+			<Range>48</Range>
+		</value>
+	</Operation>
+	<!-- == PTInspire == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Def[defName="PTPsiStorm"]/Range</xpath>
+		<value>
+			<Range>48</Range>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/PsiTech/Patches/PsiTech/ThingDefs/Equipment/PsiTechAdvancedApparel.xml b/ModPatches/PsiTech/Patches/PsiTech/ThingDefs/Equipment/PsiTechAdvancedApparel.xml
new file mode 100644
index 0000000000..5055ff9479
--- /dev/null
+++ b/ModPatches/PsiTech/Patches/PsiTech/ThingDefs/Equipment/PsiTechAdvancedApparel.xml
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- == PTPsionicCommandoArmor == -->
+	<!-- Basing all of these armor patches off marine/power armor. -->
+	<!-- statBases -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTPsionicCommandoArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>22</ArmorRating_Sharp>
+			<Bulk>150</Bulk>
+			<WornBulk>18</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTPsionicCommandoArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>50</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTPsionicCommandoArmor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTPsionicCommandoArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>625</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTPsionicCommandoArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>80</Mass>
+		</value>
+	</Operation>
+	<!-- equippedStatOffsets -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PTPsionicCommandoArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>80</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+			<ShootingAccuracyPawn>0.2</ShootingAccuracyPawn>
+			<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="PTPsionicCommandoArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+	<!-- costList -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTPsionicCommandoArmor"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>180</Plasteel>
+			<DevilstrandCloth>60</DevilstrandCloth>
+		</value>
+	</Operation>
+	<!-- apparel -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PTPsionicCommandoArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<!-- == PTPsionicCommandoHelmet == -->
+	<!-- statBases -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTPsionicCommandoHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+			<Bulk>7.5</Bulk>
+			<WornBulk>1.2</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTPsionicCommandoHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>40</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTPsionicCommandoHelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTPsionicCommandoHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>300</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTPsionicCommandoHelmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>5.2</Mass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="PTPsionicCommandoHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="PTPsionicCommandoHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+	<!-- equippedStatOffsets -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PTPsionicCommandoHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingAccuracy>0.2</AimingAccuracy>
+			<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+	<!-- costList -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTPsionicCommandoHelmet"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>70</Plasteel>
+			<DevilstrandCloth>30</DevilstrandCloth>
+		</value>
+	</Operation>
+	<!-- apparel -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PTPsionicCommandoHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!-- == PTPsionicWarriorArmor == -->
+	<!-- statBases -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTPsionicWarriorArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+			<Bulk>120</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTPsionicWarriorArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTPsionicWarriorArmor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTPsionicWarriorArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>500</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTPsionicWarriorArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>60</Mass>
+		</value>
+	</Operation>
+	<!-- equippedStatOffsets -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PTPsionicWarriorArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>80</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+			<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+			<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="PTPsionicWarriorArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+	<!-- costList -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTPsionicWarriorArmor"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>180</Plasteel>
+			<DevilstrandCloth>60</DevilstrandCloth>
+		</value>
+	</Operation>
+	<!-- apparel -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PTPsionicWarriorArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<!-- == PTPsionicWarriorHelmet == -->
+	<!-- statBases -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTPsionicWarriorHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+			<Bulk>6</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTPsionicWarriorHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTPsionicWarriorHelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTPsionicWarriorHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>240</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTPsionicWarriorHelmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>4.8</Mass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="PTPsionicWarriorHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="PTPsionicWarriorHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+	<!-- equippedStatOffsets -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PTPsionicWarriorHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingAccuracy>0.15</AimingAccuracy>
+			<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+	<!-- costList -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTPsionicWarriorHelmet"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>60</Plasteel>
+			<DevilstrandCloth>20</DevilstrandCloth>
+		</value>
+	</Operation>
+	<!-- apparel -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PTPsionicWarriorHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!-- == PTPsionicConduitArmor == -->
+	<!-- statBases -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTPsionicConduitArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTPsionicConduitArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>41</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTPsionicConduitArmor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTPsionicConduitArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>400</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTPsionicConduitArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>40</Mass>
+		</value>
+	</Operation>
+	<!-- equippedStatOffsets -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PTPsionicConduitArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>60</CarryWeight>
+			<CarryBulk>8</CarryBulk>
+			<ShootingAccuracyPawn>0.05</ShootingAccuracyPawn>
+			<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+	<!-- costList -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTPsionicConduitArmor"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>140</Plasteel>
+			<DevilstrandCloth>50</DevilstrandCloth>
+		</value>
+	</Operation>
+	<!-- apparel -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PTPsionicConduitArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<!-- == PTPsionicConduitHelmet == -->
+	<!-- statBases -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTPsionicConduitHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTPsionicConduitHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>32</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTPsionicConduitHelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTPsionicConduitHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>200</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTPsionicConduitHelmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>1</Mass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="PTPsionicConduitHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="PTPsionicConduitHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+	<!-- equippedStatOffsets -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PTPsionicConduitHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingAccuracy>0.05</AimingAccuracy>
+			<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+	<!-- costList -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTPsionicConduitHelmet"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>50</Plasteel>
+			<DevilstrandCloth>15</DevilstrandCloth>
+		</value>
+	</Operation>
+	<!-- apparel -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PTPsionicConduitHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/PsiTech/Patches/PsiTech/ThingDefs/Equipment/PsiTechBasicApparel.xml b/ModPatches/PsiTech/Patches/PsiTech/ThingDefs/Equipment/PsiTechBasicApparel.xml
new file mode 100644
index 0000000000..ed9adf144e
--- /dev/null
+++ b/ModPatches/PsiTech/Patches/PsiTech/ThingDefs/Equipment/PsiTechBasicApparel.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- == PTRobeBase == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="PTRobeBase"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+			<Bulk>7.5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+	<!-- == PTPsiHood == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTPsiHood"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/PsiTech/Patches/PsiTech/ThingDefs/Items/PsiTechResources.xml b/ModPatches/PsiTech/Patches/PsiTech/ThingDefs/Items/PsiTechResources.xml
new file mode 100644
index 0000000000..b0b7460e8f
--- /dev/null
+++ b/ModPatches/PsiTech/Patches/PsiTech/ThingDefs/Items/PsiTechResources.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- == PTAthenium == -->
+	<!-- statBases -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTAthenium"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.8</StuffPower_Armor_Sharp>
+			<Bulk>0.05</Bulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTAthenium"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>1.2</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PTAthenium"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+	<!-- stuffProps -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PTAthenium"]/stuffProps/categories</xpath>
+		<value>
+			<li>Metallic_Weapon</li>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Pulse Weaponry/Defs/Pulse Weaponry/Ammo.xml b/ModPatches/Pulse Weaponry/Defs/Pulse Weaponry/Ammo.xml
new file mode 100644
index 0000000000..7dbe4ec69c
--- /dev/null
+++ b/ModPatches/Pulse Weaponry/Defs/Pulse Weaponry/Ammo.xml	
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>AmmoDEpulsePack</defName>
+		<label>combine pulse pack</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberChargeLarge</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== Ammo ========================== -->
+	<ThingDef Class="CombatExtended.AmmoDef" Name="DEpulsePackBase" ParentName="SpacerSmallAmmoBase" Abstract="True">
+		<description>A dark energy charge pack for combine pulse weapons.</description>
+		<statBases>
+			<Mass>0.008</Mass>
+			<Bulk>0.01</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoDEpulsePack</li>
+		</thingCategories>
+		<stackLimit>5000</stackLimit>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="LaserChargePackBase">
+		<defName>Ammo_DEpulsePack</defName>
+		<label>combine pulse pack</label>
+		<graphicData>
+			<texPath>ThirdParty/Pulse Weaponry/DE Pulse</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<ammoClass>Charged</ammoClass>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_DEpulsePack</defName>
+		<label>make combine pulse pack x500</label>
+		<description>Craft 500 combine pulse pack.</description>
+		<jobString>Making combine pulse pack.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>16</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentSpacer</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Plasteel</li>
+				<li>Steel</li>
+				<li>ComponentSpacer</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_DEpulsePack>500</Ammo_DEpulsePack>
+		</products>
+		<workAmount>12600</workAmount><!-- === 1.5 times 8400 === -->
+	</RecipeDef>
+
+	<!-- === Ammo Sets === -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_DV_PulseSMG</defName>
+		<label>pulse pack</label>
+		<ammoTypes>
+			<Ammo_DEpulsePack>Bullet_DV_PulseSMG_CE</Ammo_DEpulsePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_DV_PulseRifle</defName>
+		<label>pulse pack</label>
+		<ammoTypes>
+			<Ammo_DEpulsePack>Bullet_DV_PulseRifle_CE</Ammo_DEpulsePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_DV_PulseSuppressor</defName>
+		<label>pulse pack</label>
+		<ammoTypes>
+			<Ammo_DEpulsePack>Bullet_DV_PulseSuppressor_CE</Ammo_DEpulsePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>Bullet_DV_PulseRifle_UBGL_CE</defName>
+		<label>pulse pack</label>
+		<ammoTypes>
+			<Ammo_DEpulsePack>Bullet_DV_PulseRifle_UBGL_CE</Ammo_DEpulsePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- === Projectiles === -->
+	<ThingDef ParentName="BaseBulletCE">
+		<defName>Bullet_DV_PulseSMG_CE</defName>
+		<label>Pulse projectile</label>
+		<graphicData>
+			<texPath>Things/PulseBullet</texPath>
+			<shaderType>TransparentPostLight</shaderType>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>122</speed>
+			<damageAmountBase>8</damageAmountBase>
+			<secondaryDamage><!-- === 50% of base damage === -->
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>4</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>12</armorPenetrationSharp>
+			<armorPenetrationBlunt>43.2</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="AthenaFramework.CompProperties_ProjectileImpactEffect">
+				<mote>PulseBulletImpact</mote>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBulletCE">
+		<defName>Bullet_DV_PulseRifle_CE</defName>
+		<label>Pulse projectile</label>
+		<graphicData>
+			<texPath>Things/PulseBullet</texPath>
+			<shaderType>TransparentPostLight</shaderType>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>151</speed>
+			<damageAmountBase>13</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>6</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>15</armorPenetrationSharp>
+			<armorPenetrationBlunt>128</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="AthenaFramework.CompProperties_ProjectileImpactEffect">
+				<mote>PulseBulletImpact</mote>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBulletCE">
+		<defName>Bullet_DV_PulseSuppressor_CE</defName>
+		<label>Pulse projectile</label>
+		<graphicData>
+			<texPath>Things/PulseBullet</texPath>
+			<shaderType>TransparentPostLight</shaderType>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>151</speed>
+			<damageAmountBase>19</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>9</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>16</armorPenetrationSharp>
+			<armorPenetrationBlunt>345.6</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="AthenaFramework.CompProperties_ProjectileImpactEffect">
+				<mote>PulseBulletImpact</mote>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseExplosiveBullet">
+		<defName>Bullet_DV_PulseRifle_UBGL_CE</defName>
+		<label>Pulse projectile</label>
+		<graphicData>
+			<texPath>Things/Projectiles/CombineBall</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>81</speed>
+			<damageDef>EMP</damageDef>
+			<damageAmountBase>20</damageAmountBase>
+			<explosionRadius>0.6</explosionRadius>
+			<empShieldBreakChance>1</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/Apparel_Hats.xml b/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/Apparel_Hats.xml
new file mode 100644
index 0000000000..e17ddd6edb
--- /dev/null
+++ b/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/Apparel_Hats.xml	
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Enforcer Mask ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DV_Apparel_SuppressorMask"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DV_Apparel_SuppressorMask"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DV_Apparel_SuppressorMask"]/statBases/Mass</xpath>
+		<value>
+			<Mass>4.8</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DV_Apparel_SuppressorMask"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>240</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DV_Apparel_SuppressorMask"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DV_Apparel_SuppressorMask"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DV_Apparel_SuppressorMask"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
+		<value>
+			<ToxicEnvironmentResistance>1</ToxicEnvironmentResistance>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DV_Apparel_SuppressorMask"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>60</Plasteel>
+			<DevilstrandCloth>20</DevilstrandCloth>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DV_Apparel_SuppressorMask"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<AimingAccuracy>0.6</AimingAccuracy>
+			<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DV_Apparel_SuppressorMask"]/apparel</xpath>
+		<value>
+			<immuneToToxGasExposure>true</immuneToToxGasExposure>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DV_Apparel_SuppressorMask"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="DV_Apparel_SuppressorMask"]/comps/li[@Class="AthenaFramework.CompProperties_CustomApparelBody"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="DV_Apparel_SuppressorMask"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml b/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml
new file mode 100644
index 0000000000..3a8aa23aac
--- /dev/null
+++ b/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml	
@@ -0,0 +1,322 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DV_MeleeWeapon_Stunstick"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<chanceFactor>0.33</chanceFactor>
+					<cooldownTime>1.52</cooldownTime>
+					<armorPenetrationBlunt>0.500</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Stun</def>
+							<amount>32</amount>
+							<chance>0.20</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="DV_MeleeWeapon_Stunstick"]/statBases</xpath>
+		<value>
+			<Bulk>2.75</Bulk>
+			<MeleeCounterParryBonus>0.9</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DV_MeleeWeapon_Stunstick"]/equippedAngleOffset</xpath>
+		<value>
+			<equippedAngleOffset>-65</equippedAngleOffset>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DV_MeleeWeapon_Stunstick"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.17</MeleeCritChance>
+				<MeleeParryChance>0.9</MeleeParryChance>
+				<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "DV_PulseSMG" or defName = "DV_PulseSuppressor"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "DV_PulseRifle"]/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>
+
+	<!-- === HL:A SMG === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DV_PulseSMG</defName>
+		<statBases>
+			<WorkToMake>40000</WorkToMake>
+			<Mass>2.80</Mass>
+			<Bulk>5.00</Bulk>
+			<SwayFactor>0.75</SwayFactor>
+			<ShotSpread>0.16</ShotSpread>
+			<SightsEfficiency>1.15</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>45</Steel>
+			<Plasteel>15</Plasteel>
+			<Chemfuel>5</Chemfuel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+			<ComponentSpacer>1</ComponentSpacer>
+		</costList>
+		<Properties>
+			<recoilAmount>1.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_DV_PulseSMG_CE</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>31</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>Shot_PulseLight</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>2.5</reloadTime>
+			<ammoSet>AmmoSet_DV_PulseSMG</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === HL2 rifle === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DV_PulseRifle</defName>
+		<statBases>
+			<Mass>3.0</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.20</SwayFactor>
+			<Bulk>7.00</Bulk>
+			<WorkToMake>49000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>45</Steel>
+			<Plasteel>25</Plasteel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+			<ComponentSpacer>2</ComponentSpacer>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>1.20</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_DV_PulseRifle_CE</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>Shot_PulseMedium</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>60</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_DV_PulseRifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AR</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DV_PulseRifle"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<propsUnderBarrel>
+					<magazineSize>30</magazineSize>
+					<reloadTime>3.5</reloadTime>
+					<ammoSet>Bullet_DV_PulseRifle_UBGL_CE</ammoSet>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_DV_PulseRifle_UBGL_CE</defaultProjectile>
+					<warmupTime>1.05</warmupTime>
+					<range>55</range>
+					<ammoConsumedPerShotCount>10</ammoConsumedPerShotCount>
+					<recoilAmount>1.20</recoilAmount>
+					<soundCast>Shot_Shotgun</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>12</muzzleFlashScale>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aiAimMode>AimedShot</aiAimMode>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Pulse Suppressor === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DV_PulseSuppressor</defName>
+		<statBases>
+			<WorkToMake>60000</WorkToMake>
+			<Mass>20.0</Mass>
+			<Bulk>12.0</Bulk>
+			<SwayFactor>1.35</SwayFactor>
+			<ShotSpread>0.10</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>120</Steel>
+			<Plasteel>40</Plasteel>
+			<Chemfuel>15</Chemfuel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+			<ComponentSpacer>3</ComponentSpacer>
+		</costList>
+		<Properties>
+			<recoilAmount>1.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_DV_PulseSuppressor_CE</defaultProjectile>
+			<burstShotCount>50</burstShotCount>
+			<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<warmupTime>2.5</warmupTime>
+			<range>62</range>
+			<soundCast>Shot_PulseMedium</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>450</magazineSize>
+			<reloadTime>6.2</reloadTime>
+			<ammoSet>AmmoSet_DV_PulseSuppressor</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>25</aimedBurstShotCount>
+		</FireModes>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[
+			defName = "DV_PulseSMG" or
+			defName = "DV_PulseRifle" or
+			defName = "DV_PulseSuppressor"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.05,1.05</DrawSize>
+				<DrawOffset>0.0,0.0</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName = "DV_PulseRifle"]/comps/li[@Class="AthenaFramework.CompProperties_EquippableAbility"]</xpath>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/ThingDefs_Sentry.xml b/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/ThingDefs_Sentry.xml
new file mode 100644
index 0000000000..25ba152d59
--- /dev/null
+++ b/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/ThingDefs_Sentry.xml	
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Remove refuelable property -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName = "DV_Turret_PulseAutogun"]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
+	</Operation>
+
+	<!-- Replace vanilla thingClass -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "DV_Turret_PulseAutogun"]/thingClass </xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<!-- Make turrets taller -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "DV_Turret_PulseAutogun"]/fillPercent </xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "DV_Turret_PulseAutogun"]/statBases </xpath>
+		<value>
+			<AimingAccuracy>0.5</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "DV_Turret_PulseAutogun"]/statBases </xpath>
+		<value>
+			<NightVisionEfficiency>0.5</NightVisionEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "DV_Turret_PulseAutogun"]/statBases/ShootingAccuracyTurret </xpath>
+		<value>
+			<ShootingAccuracyTurret>1.25</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "DV_Turret_PulseAutogun"]/building/turretBurstCooldownTime </xpath>
+		<value>
+			<turretBurstCooldownTime>1.1</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<!-- Pulse Turret -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PulseTurret</defName>
+		<statBases>
+			<SightsEfficiency>1.15</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>0.72</SwayFactor>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<NightVisionEfficiency_Weapon>0.5</NightVisionEfficiency_Weapon>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.85</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_DV_PulseRifle_CE</defaultProjectile>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<warmupTime>1.3</warmupTime>
+			<range>55</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>Shot_PulseMedium</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_DV_PulseRifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags Inherit="False">
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Pulsefire Turret/Patches/Pulsefire Turret/PulsefireTurret_CombatExtendedPatch.xml b/ModPatches/Pulsefire Turret/Patches/Pulsefire Turret/PulsefireTurret_CombatExtendedPatch.xml
new file mode 100644
index 0000000000..c13fac2da9
--- /dev/null
+++ b/ModPatches/Pulsefire Turret/Patches/Pulsefire Turret/PulsefireTurret_CombatExtendedPatch.xml	
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Compatibility for Turret #1 -->
+
+	<!-- Remove Explosive comp -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName = "PulsefireTurretGun" or
+			defName = "PulsefireTwinCannon"
+			]/comps/li[@Class = "CompProperties_Explosive"] </xpath>
+	</Operation>
+
+	<!-- Replace vanilla thingClass -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "PulsefireTurretGun" or
+			defName = "PulsefireTwinCannon"
+			]/thingClass </xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "PulsefireTurretGun" or
+			defName = "PulsefireTwinCannon"
+			]/fillPercent </xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "PulsefireTurretGun" or defName = "PulsefireTwinCannon"]/statBases/ShootingAccuracyTurret</xpath>
+		<value>
+			<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PulsefireTurret</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.25</ShotSpread>
+			<SwayFactor>0.45</SwayFactor>
+			<RangedWeapon_Cooldown>0.1</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.79</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12x72mmCharged</defaultProjectile>
+			<warmupTime>1.25</warmupTime>
+			<range>75</range>
+			<soundCast>ChargeLance_Fire</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>false</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>5.9</reloadTime>
+			<ammoSet>AmmoSet_12x72mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PulsefireTurretEnhanced</defName>
+		<statBases>
+			<SightsEfficiency>2.4</SightsEfficiency>
+			<ShotSpread>0.25</ShotSpread>
+			<SwayFactor>0.45</SwayFactor>
+			<RangedWeapon_Cooldown>0.1</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.79</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12x72mmCharged</defaultProjectile>
+			<warmupTime>1.25</warmupTime>
+			<range>75</range>
+			<soundCast>ChargeLance_Fire</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>false</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>80</magazineSize>
+			<reloadTime>5.9</reloadTime>
+			<ammoSet>AmmoSet_12x72mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PulsefireTwinCannon</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>0.15</SwayFactor>
+			<Bulk>18.05</Bulk>
+			<RangedWeapon_Cooldown>3</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.69</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
+			<warmupTime>1.25</warmupTime>
+			<range>65</range>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<burstShotCount>15</burstShotCount>
+			<soundCast>Shot_ChargeBlaster</soundCast>
+			<muzzleFlashScale>18</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>false</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>150</magazineSize>
+			<reloadTime>7.9</reloadTime>
+			<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PulsefireTwinCannonEnhanced</defName>
+		<statBases>
+			<SightsEfficiency>1.4</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>0.15</SwayFactor>
+			<Bulk>18.05</Bulk>
+			<RangedWeapon_Cooldown>3</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.69</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
+			<warmupTime>1.25</warmupTime>
+			<range>65</range>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<burstShotCount>15</burstShotCount>
+			<soundCast>Shot_ChargeBlaster</soundCast>
+			<muzzleFlashScale>18</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>false</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>150</magazineSize>
+			<reloadTime>7.9</reloadTime>
+			<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RBSE/Defs/RBSE/Cure CE Scars.xml b/ModPatches/RBSE/Defs/RBSE/Cure CE Scars.xml
new file mode 100644
index 0000000000..814a77b79d
--- /dev/null
+++ b/ModPatches/RBSE/Defs/RBSE/Cure CE Scars.xml	
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<RecipeDef ParentName="SurgeryOld">
+		<defName>CureInjuryBlast</defName>
+		<label>cure blast</label>
+		<description>Cure blast.</description>
+		<workerClass>ScarRemoving.Recipe_RemoveHediff_noBrain</workerClass>
+		<jobString>Curing blast.</jobString>
+		<workAmount>2000</workAmount>
+		<surgerySuccessChanceFactor>1.55</surgerySuccessChanceFactor>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>MedicineUltratech</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>MedicineUltratech</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<skillRequirements>
+			<Medicine>10</Medicine>
+		</skillRequirements>
+		<removesHediff>Blast</removesHediff>
+		<researchPrerequisite>RegenerativeMedicine</researchPrerequisite>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/RBSE/Patches/RBSE/Bionics.xml b/ModPatches/RBSE/Patches/RBSE/Bionics.xml
new file mode 100644
index 0000000000..240ee11b40
--- /dev/null
+++ b/ModPatches/RBSE/Patches/RBSE/Bionics.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/HediffDef[defName="SimpleProstheticHand" or defName="SimpleProstheticArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]</xpath>
+	</Operation>
+
+	<!-- ========== Bionics ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BionicHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>bionic fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+					<cooldownTime>1.66</cooldownTime>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="PowerArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>bionic fist</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>9</power>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<cooldownTime>1.66</cooldownTime>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Advanced Bionics ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AdvancedPowerArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>bionic fist</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>22</power>
+					<armorPenetrationBlunt>4.75</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.96</armorPenetrationSharp>
+					<cooldownTime>0.76</cooldownTime>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AdvancedBionicArm" or defName="AdvancedBionicHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>bionic fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<cooldownTime>0.83</cooldownTime>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 DOOM/Defs/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_12Gauge_Dual.xml b/ModPatches/RH2 DOOM/Defs/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_12Gauge_Dual.xml
new file mode 100644
index 0000000000..b88ee7207e
--- /dev/null
+++ b/ModPatches/RH2 DOOM/Defs/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_12Gauge_Dual.xml	
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- ========== Custom variants of the standard 12 Gauge shotgun projectiles, emulating the effect of two ordinary 12 Gauge shotgun shells being fired side-by-side simultaneously ========== -->
+
+	<ThingDef ParentName="Base12GaugeBullet">
+		<defName>Bullet_12Gauge_DoubleBarreled_Buck</defName>
+		<label>buckshot pellet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shotgun_Pellet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>18</damageAmountBase>
+			<pelletCount>18</pelletCount><!-- Twice the usual number of buckshot pellets -->
+			<armorPenetrationSharp>4</armorPenetrationSharp>
+			<armorPenetrationBlunt>5.7</armorPenetrationBlunt>
+			<spreadMult>17.8</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base12GaugeBullet">
+		<defName>Bullet_12Gauge_DoubleBarreled_Slug</defName>
+		<label>shotgun slug</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>92</speed>
+			<damageAmountBase>46</damageAmountBase>
+			<pelletCount>2</pelletCount><!-- Double slugs -->
+			<armorPenetrationSharp>6</armorPenetrationSharp>
+			<armorPenetrationBlunt>48.04</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base12GaugeBullet">
+		<defName>Bullet_12Gauge_DoubleBarreled_Beanbag</defName>
+		<label>beanbag</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>30</speed>
+			<damageDef>Beanbag</damageDef>
+			<damageAmountBase>18</damageAmountBase>
+			<pelletCount>2</pelletCount><!-- Double beanbags -->
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>3.240</armorPenetrationBlunt>
+			<spreadMult>2</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base12GaugeBullet">
+		<defName>Bullet_12Gauge_DoubleBarreled_ElectroSlug</defName>
+		<label>EMP slug</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>43</speed>
+			<damageDef>EMP</damageDef>
+			<damageAmountBase>24</damageAmountBase>
+			<pelletCount>2</pelletCount><!-- Double EMP slugs -->
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>8.509</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<!-- ========== Custom AmmoSet for the double-barreled Super Shotgun, which maps the custom 12 Gauge shotgun projectiles to standard versions of their craftable ammo ========== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_12Gauge_CP_DOOM_SuperShotgun</defName>
+		<label>12 Gauge</label>
+		<ammoTypes>
+			<Ammo_12Gauge_Buck>Bullet_12Gauge_DoubleBarreled_Buck</Ammo_12Gauge_Buck>
+			<Ammo_12Gauge_Slug>Bullet_12Gauge_DoubleBarreled_Slug</Ammo_12Gauge_Slug>
+			<Ammo_12Gauge_Beanbag>Bullet_12Gauge_DoubleBarreled_Beanbag</Ammo_12Gauge_Beanbag>
+			<Ammo_12Gauge_ElectroSlug>Bullet_12Gauge_DoubleBarreled_ElectroSlug</Ammo_12Gauge_ElectroSlug>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/RH2 DOOM/Defs/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_BfgCell.xml b/ModPatches/RH2 DOOM/Defs/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_BfgCell.xml
new file mode 100644
index 0000000000..08180b27b6
--- /dev/null
+++ b/ModPatches/RH2 DOOM/Defs/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_BfgCell.xml	
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- There is only one type of UAC BFG Cell for CE, no subcategory for variants required -->
+
+	<!-- ==================== AmmoSets ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Doom2016Bfg9000Gun</defName>
+		<label>UAC BFG Cell</label>
+		<ammoTypes>
+			<Ammo_Doom2016BfgCell>Bullet_Doom2016Bfg9000Gun</Ammo_Doom2016BfgCell>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerAmmoBase">
+		<defName>Ammo_Doom2016BfgCell</defName>
+		<label>UAC BFG Cell</label>
+		<description>Plasma containment power cell developed by the Union Aerospace Corporation for the BFG 9000, utilizing the compression of Argent energy</description>
+		<statBases>
+			<Mass>0.5</Mass>
+			<Bulk>1.21</Bulk>
+			<MarketValue>31.92</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+			<!-- Plasma ammo can't be handloaded, and the containment cell must be precision-machined anyway -->
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoAdvanced</li>
+		</thingCategories>
+		<stackLimit>25</stackLimit>
+		<graphicData>
+			<texPath>ThirdParty/CP DOOM and DOOM Kit Classic/Doom2016BfgCell</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<ammoClass>Plasma</ammoClass>
+		<comps>
+			<!-- Arbitarily defined cookoff explosive stats; represents a plasma containment system failing -->
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>20</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>2</Fragment_Large>
+					<Fragment_Small>10</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<!-- Workaround for conditionally-patched projectiles: use an existing abstract class from the generic ammo library (In this case, Base6x24mmChargedBullet) -->
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_Doom2016Bfg9000Gun</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>BFG Plasma Shot</label>
+		<graphicData>
+			<texPath>Things/Projectile/BFGPLAZMA</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>200</speed>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>500</damageAmountBase>
+			<explosionRadius>2.5</explosionRadius>
+			<suppressionFactor>3.0</suppressionFactor>
+			<dangerFactor>2.0</dangerFactor>
+			<soundExplode>RHHit_DOOMBFG</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>600</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_Doom2016BfgCell</defName>
+		<label>make UAC BFG Cells x25</label>
+		<description>Craft 25 UAC BFG Cells.</description>
+		<jobString>Making UAC BFG Cells.</jobString>
+		<workAmount>33000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>26</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>73</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Plasteel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Doom2016BfgCell>25</Ammo_Doom2016BfgCell>
+		</products>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/RH2 DOOM/Defs/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_EmgPistol.xml b/ModPatches/RH2 DOOM/Defs/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_EmgPistol.xml
new file mode 100644
index 0000000000..92ecf44bc6
--- /dev/null
+++ b/ModPatches/RH2 DOOM/Defs/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_EmgPistol.xml	
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- Projectile-only definition for the weaker infinite-ammo EMG Pistol; uses same stats as the generic Plasma Pistol projectile -->
+
+	<!-- ================== Projectiles ================== -->
+
+	<!-- Workaround for conditionally-patched projectiles: use an existing abstract class from the generic ammo library (In this case, Base6x24mmChargedBullet) -->
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_Doom2016EmgPistol</defName>
+		<label>EMG Bolt</label>
+		<graphicData>
+			<texPath>Things/Projectile/Charged/ChargeShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>140</speed>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>2</damageAmountBase>
+			<explosionRadius>0.5</explosionRadius>
+			<suppressionFactor>3.0</suppressionFactor>
+			<dangerFactor>2.0</dangerFactor>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>9</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/RH2 DOOM/Defs/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_GaussCannonFlechette.xml b/ModPatches/RH2 DOOM/Defs/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_GaussCannonFlechette.xml
new file mode 100644
index 0000000000..79cf70e4cd
--- /dev/null
+++ b/ModPatches/RH2 DOOM/Defs/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_GaussCannonFlechette.xml	
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- DOOM 2016 specifies that the Guass Cannon uses Plasma Cells as ammo, but fires steel (railgun) flechettes instead -->
+
+	<!-- ==================== AmmoSets ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Doom2016GaussCannon</defName>
+		<label>UAC Plasma Cell</label>
+		<ammoTypes>
+			<Ammo_Doom2016PlasmaCell>Bullet_Doom2016GaussCannonFlechette</Ammo_Doom2016PlasmaCell>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<!-- Workaround for conditionally-patched projectiles: use an existing abstract class from the generic ammo library (In this case, Base6x24mmChargedBullet) -->
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_Doom2016GaussCannonFlechette</defName>
+		<label>UAC Gauss Cannon Flechette</label>
+		<graphicData>
+			<texPath>Things/Projectile/GAUSSBeam</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>121</damageAmountBase>
+			<armorPenetrationSharp>160</armorPenetrationSharp>
+			<armorPenetrationBlunt>11348.10</armorPenetrationBlunt>
+			<speed>500</speed>
+		</projectile>
+	</ThingDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/RH2 DOOM/Defs/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_PlasmaCell.xml b/ModPatches/RH2 DOOM/Defs/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_PlasmaCell.xml
new file mode 100644
index 0000000000..1a943bba34
--- /dev/null
+++ b/ModPatches/RH2 DOOM/Defs/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_PlasmaCell.xml	
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- There is only one type of UAC Plasma Cell for CE, no subcategory for variants required -->
+
+	<!-- ==================== AmmoSets ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Doom2016PlasmaGun</defName>
+		<label>UAC Plasma Cell</label>
+		<ammoTypes>
+			<Ammo_Doom2016PlasmaCell>Bullet_Doom2016PlasmaGun</Ammo_Doom2016PlasmaCell>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Doom2016VortexRifle</defName>
+		<label>UAC Plasma Cell</label>
+		<ammoTypes>
+			<Ammo_Doom2016PlasmaCell>Bullet_Doom2016VortexRifle</Ammo_Doom2016PlasmaCell>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!--<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Doom2016Hellshot</defName>
+		<label>UAC Plasma Cell</label>
+		<ammoTypes>
+			<Ammo_Doom2016PlasmaCell>Bullet_Doom2016Hellshot</Ammo_Doom2016PlasmaCell>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>-->
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_Doom2016PlasmaCell</defName>
+		<label>UAC Plasma Cell</label>
+		<description>Plasma containment power cell developed by the Union Aerospace Corporation for heavy energy weapons, utilizing the compression of Argent energy</description>
+		<statBases>
+			<Mass>0.002</Mass>
+			<Bulk>0.01</Bulk>
+			<MarketValue>0.84</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+			<!-- Plasma ammo can't be handloaded, and the containment cell must be precision-machined anyway -->
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoAdvanced</li>
+		</thingCategories>
+		<stackLimit>450</stackLimit>
+		<graphicData>
+			<texPath>ThirdParty/CP DOOM and DOOM Kit Classic/Doom2016PlasmaCell</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>Plasma</ammoClass>
+		<comps>
+			<!-- Arbitarily defined cookoff explosive stats; represents a plasma containment system failing -->
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>80</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>2</Fragment_Large>
+					<Fragment_Small>10</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<!-- Workaround for conditionally-patched projectiles: use an existing abstract class from the generic ammo library (In this case, Base6x24mmChargedBullet) -->
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_Doom2016PlasmaGun</defName>
+		<label>Plasma Shot</label>
+		<graphicData>
+			<texPath>Things/Projectile/Charged/ChargeShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>200</speed>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>12</damageAmountBase>
+			<explosionRadius>0.5</explosionRadius>
+			<suppressionFactor>3.0</suppressionFactor>
+			<dangerFactor>2.0</dangerFactor>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>22</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_Doom2016VortexRifle</defName>
+		<label>Plasma Shot</label>
+		<graphicData>
+			<texPath>Things/Projectile/Charged/ChargeShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>200</speed>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>12</damageAmountBase>
+			<explosionRadius>0.5</explosionRadius>
+			<suppressionFactor>3.0</suppressionFactor>
+			<dangerFactor>2.0</dangerFactor>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>22</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<!--<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_Doom2016Hellshot</defName>
+		<label>Plasma Shot</label>
+		<graphicData>
+			<texPath>Things/Projectile/HellshotPlasma</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>200</speed>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>12</damageAmountBase>
+			<explosionRadius>0.5</explosionRadius>
+			<suppressionFactor>3.0</suppressionFactor>
+			<dangerFactor>2.0</dangerFactor>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>22</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef> -->
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_Doom2016PlasmaCell</defName>
+		<label>make UAC Plasma Cells x450 shots</label>
+		<description>Craft 450 shots' worth of UAC Plasma Cells.</description>
+		<jobString>Making UAC Plasma Cells.</jobString>
+		<workAmount>12600</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>33</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Plasteel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Doom2016PlasmaCell>450</Ammo_Doom2016PlasmaCell>
+		</products>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/RH2 DOOM/Defs/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_Rocket.xml b/ModPatches/RH2 DOOM/Defs/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_Rocket.xml
new file mode 100644
index 0000000000..9e18127ed6
--- /dev/null
+++ b/ModPatches/RH2 DOOM/Defs/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_Rocket.xml	
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoDoom2016Rockets</defName>
+		<label>UAC Rocket Mk VI</label>
+		<parent>AmmoRockets</parent>
+		<iconPath>ThirdParty/CP DOOM and DOOM Kit Classic/Doom2016Rocket/Doom2016Rocket_c</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Doom2016Rocket</defName>
+		<label>UAC Rocket Mk VI</label>
+		<ammoTypes>
+			<Ammo_Doom2016Rocket_HEAT>Bullet_Doom2016Rocket_HEAT</Ammo_Doom2016Rocket_HEAT>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="Doom2016RocketBase" ParentName="MediumAmmoBase" Abstract="True">
+		<description>Compact 60mm rocket developed by the Union Aerospace Corporation for infantry rocket launchers.</description>
+		<statBases>
+			<MaxHitPoints>150</MaxHitPoints>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoDoom2016Rockets</li>
+		</thingCategories>
+		<stackLimit>9</stackLimit>
+		<cookOffFlashScale>40</cookOffFlashScale>
+		<cookOffSound>MortarBomb_Explode</cookOffSound>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Doom2016RocketBase">
+		<defName>Ammo_Doom2016Rocket_HEAT</defName>
+		<label>UAC Rocket Mk VI (HEAT)</label>
+		<graphicData>
+			<texPath>ThirdParty/CP DOOM and DOOM Kit Classic/Doom2016Rocket</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>22.42</MarketValue>
+			<Mass>0.75</Mass>
+			<Bulk>1.53</Bulk>
+		</statBases>
+		<ammoClass>RocketHEAT</ammoClass>
+		<detonateProjectile>Bullet_Doom2016Rocket_HEAT</detonateProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<!-- Workaround for conditionally-patched projectiles: use an existing abstract class from the generic ammo library (In this case, BaseM6Rocket) -->
+
+	<ThingDef ParentName="BaseM6Rocket">
+		<defName>Bullet_Doom2016Rocket_HEAT</defName>
+		<label>UAC Rocket Mk VI (HEAT)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Dart/Dart</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>225</damageAmountBase>
+			<armorPenetrationSharp>76</armorPenetrationSharp>
+			<armorPenetrationBlunt>19.178</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>64</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1</explosiveRadius>
+				<explosionSound>RHHit_DOOMRocketLauncher</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>1</Fragment_Large>
+					<Fragment_Small>12</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_Doom2016Rocket_HEAT</defName>
+		<label>make UAC Rocket Mk VI (HEAT) rockets x9</label>
+		<description>Craft 9 UAC Rocket Mk VI (HEAT) rockets.</description>
+		<jobString>Making UAC Rocket Mk VI (HEAT) rockets.</jobString>
+		<workAmount>6200</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>14</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Doom2016Rocket_HEAT>9</Ammo_Doom2016Rocket_HEAT>
+		</products>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/RH2 DOOM/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Apparel_Armor.xml b/ModPatches/RH2 DOOM/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Apparel_Armor.xml
new file mode 100644
index 0000000000..d2ec69b1dc
--- /dev/null
+++ b/ModPatches/RH2 DOOM/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Apparel_Armor.xml	
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Praetor Suit ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_PraetorSuit_PowerArmor"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_PraetorSuit_PowerArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>40</CarryBulk>
+			<CarryWeight>90</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_PraetorSuit_PowerArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_PraetorSuit_PowerArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>40</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_PraetorSuit_PowerArmor"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>1.0</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_PraetorSuit_PowerArmor"]/statBases</xpath>
+		<value>
+			<ArmorRating_Electric>0.975</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_PraetorSuit_PowerArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 DOOM/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Apparel_Armor_Headgear.xml b/ModPatches/RH2 DOOM/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Apparel_Armor_Headgear.xml
new file mode 100644
index 0000000000..97800aba3a
--- /dev/null
+++ b/ModPatches/RH2 DOOM/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Apparel_Armor_Headgear.xml	
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Praetor Suit helmet ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_PraetorSuitHelmet_PowerArmor"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_PraetorSuitHelmet_PowerArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_PraetorSuitHelmet_PowerArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>40</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_PraetorSuitHelmet_PowerArmor"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>1.0</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_PraetorSuitHelmet_PowerArmor"]/statBases</xpath>
+		<value>
+			<ArmorRating_Electric>0.975</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="RHApparel_PraetorSuitHelmet_PowerArmor"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="RHApparel_PraetorSuitHelmet_PowerArmor"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_PraetorSuitHelmet_PowerArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!-- WearingGasMask Hediff not applicable -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_PraetorSuitHelmet_PowerArmor"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 DOOM/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_LauncherDOOM_Weapons.xml b/ModPatches/RH2 DOOM/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_LauncherDOOM_Weapons.xml
new file mode 100644
index 0000000000..5510b463fc
--- /dev/null
+++ b/ModPatches/RH2 DOOM/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_LauncherDOOM_Weapons.xml	
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== UAC Gauss Cannon ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHEx_DOOM_GAUSSCannon</defName>
+		<statBases>
+			<Mass>12.50</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.20</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.78</SwayFactor>
+			<Bulk>12</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Doom2016GaussCannonFlechette</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<ammoConsumedPerShotCount>30</ammoConsumedPerShotCount>
+			<range>126</range>
+			<soundCast>RHShot_DOOMGAUSS</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<muzzleFlashScale>15</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>150</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_Doom2016GaussCannon</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== BFG 9000 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHEx_DOOM_BFG9000Gun</defName>
+		<statBases>
+			<Mass>10.00</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>0.88</SwayFactor>
+			<Bulk>13.00</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Doom2016Bfg9000Gun</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<soundAiming>RHGun_DOOMBFGAiming</soundAiming>
+			<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+			<range>62</range>
+			<soundCast>RHShot_DOOMBFG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>false</onlyManualCast>
+			<muzzleFlashScale>20</muzzleFlashScale>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>3</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_Doom2016Bfg9000Gun</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== UAC Rocket Launcher ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHEx_DOOM_RocketLauncher</defName>
+		<statBases>
+			<Mass>8.00</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.82</SwayFactor>
+			<Bulk>11.20</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Doom2016Rocket_HEAT</defaultProjectile>
+			<warmupTime>1.9</warmupTime>
+			<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+			<range>40</range>
+			<soundCast>RHShot_DOOMRocketLauncher</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>15</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>5.1</reloadTime>
+			<ammoSet>AmmoSet_Doom2016Rocket</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+	</Operation>
+
+	<!-- ========== UAC Grenade Launcher ========== 
+
+	<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHEx_UACGrenadeLauncher</defName>
+		<statBases>
+			<Mass>5.30</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>1.31</SwayFactor>
+			<Bulk>7.67</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>40</range>
+			<soundCast>RHShot_DOOMGrenadeLauncher</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>15</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>5.1</reloadTime>
+			<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+
+	</li>-->
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RHEx_DOOM_GAUSSCannon" or
+			defName="RHEx_UACGrenadeLauncher"
+			]/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="RHEx_DOOM_BFG9000Gun" or
+			defName="RHEx_DOOM_RocketLauncher"
+			]/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>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 DOOM/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_MeleeDOOM_Weapons.xml b/ModPatches/RH2 DOOM/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_MeleeDOOM_Weapons.xml
new file mode 100644
index 0000000000..52c82484c4
--- /dev/null
+++ b/ModPatches/RH2 DOOM/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_MeleeDOOM_Weapons.xml	
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Mixom Beavertooth Painsaw (Chainsaw) ========== 
+	<li Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHMelee_DOOM_Chainsaw"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>RHMelee_ChainsawSlash</li>
+					</capacities>
+					<power>38</power>
+					<cooldownTime>4.36</cooldownTime>
+					<armorPenetrationBlunt>3.7</armorPenetrationBlunt>
+					<armorPenetrationSharp>14.8</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>RHMelee_ChainsawStab</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>2.47</cooldownTime>
+					<armorPenetrationBlunt>3.7</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.65</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</li>
+
+	<li Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHMelee_DOOM_Chainsaw"]/statBases</xpath>
+		<value>
+			<Bulk>9</Bulk>
+			<MeleeCounterParryBonus>0.14</MeleeCounterParryBonus>
+		</value>
+	</li>
+
+	<li Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHMelee_DOOM_Chainsaw"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.04</MeleeCritChance>
+				<MeleeParryChance>0.1</MeleeParryChance>
+				<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</li>-->
+
+	<!-- ========== Crucible Blade ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHMelee_DOOMCrucible"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.69</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.80</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>40</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>5</amount>
+							<chance>0.3</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>2.06</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>3.20</armorPenetrationBlunt>
+					<armorPenetrationSharp>16</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>17</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>3</amount>
+							<chance>0.2</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>0.99</cooldownTime>
+					<armorPenetrationBlunt>3.24</armorPenetrationBlunt>
+					<armorPenetrationSharp>32.4</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHMelee_DOOMCrucible"]/statBases</xpath>
+		<value>
+			<Bulk>8.5</Bulk>
+			<MeleeCounterParryBonus>0.80</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHMelee_DOOMCrucible"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.00</MeleeCritChance>
+				<MeleeParryChance>0.60</MeleeParryChance>
+				<MeleeDodgeChance>0.40</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 DOOM/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_RangedDOOM_Weapons.xml b/ModPatches/RH2 DOOM/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_RangedDOOM_Weapons.xml
new file mode 100644
index 0000000000..4b9312f331
--- /dev/null
+++ b/ModPatches/RH2 DOOM/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_RangedDOOM_Weapons.xml	
@@ -0,0 +1,547 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== UAC EMG Sidearm ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHGun_DOOM_UACEMGPistol</defName>
+		<statBases>
+			<Mass>1.35</Mass>
+			<RangedWeapon_Cooldown>0.05</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.176</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>2.45</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.57</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Doom2016EmgPistol</defaultProjectile>
+			<warmupTime>0.0</warmupTime>
+			<range>12</range>
+			<soundCast>RHShot_DOOMEMGPistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<!-- Infinite ammo -->
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+	</Operation>
+
+	<!-- ========== UAC EMG Mk V Pistol ========== 
+
+	<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHGun_DOOM_UACEMGMarkVPistol</defName>
+		<statBases>
+			<Mass>1.35</Mass>
+			<RangedWeapon_Cooldown>0.05</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.176</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>2.45</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Doom2016EmgMkVPistol</defaultProjectile>
+			<warmupTime>0.0</warmupTime>
+			<range>12</range>
+			<soundCast>RHShot_DOOMEMGMarkVPistol</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_Doom2016EmgMkVPistol</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</li> -->
+
+	<!-- ========== UAC Combat Shotgun ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHGun_DOOM_CombatShotgun</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.49</SwayFactor>
+			<Bulk>7.67</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.26</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>RHShot_DOOMCombatShotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+	</Operation> 
+
+	<!-- ========== UAC Combat Shotgun - Eternal ========== 
+
+	<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHGun_DOOM_CombatShotgunEternal</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.68</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.49</SwayFactor>
+			<Bulk>7.67</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.26</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.7</warmupTime>
+			<range>26</range>
+			<soundCast>RHShot_DOOMCombatShotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+	</li> -->
+
+	<!-- ========== Super Shotgun ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHGun_DOOM_SuperShotgun</defName>
+		<statBases>
+			<Mass>1.90</Mass>
+			<RangedWeapon_Cooldown>0.93</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>2.73</SwayFactor>
+			<Bulk>6.29</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_DoubleBarreled_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<range>11</range>
+			<soundCast>RHShot_DOOMSuperShotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>2</magazineSize>
+			<reloadTime>1.7</reloadTime>
+			<ammoSet>AmmoSet_12Gauge_CP_DOOM_SuperShotgun</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== UAC Heavy Assault Rifle ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHGun_DOOM_HeavyAssaultRifle</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>9.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.48</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>6</burstShotCount>
+			<soundCast>RHShot_DOOMHeavyAssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>90</magazineSize>
+			<reloadTime>7.80</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== UAC Heavy Assault Rifle ========== 
+
+	<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHGun_DOOM_HeavyCannon</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.01</SwayFactor>
+			<Bulk>10.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.45</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>82</range>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>RHShot_EternalHeavyCannon</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.80</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</li> -->
+
+	<!-- ========== UAC D12 Chaingun ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHGun_DOOM_Chaingun</defName>
+		<statBases>
+			<Mass>39.00</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.32</SwayFactor>
+			<Bulk>9.5</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.58</recoilAmount>
+			<recoilPattern>Mounted</recoilPattern>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>2.3</warmupTime>
+			<range>62</range>
+			<burstShotCount>150</burstShotCount>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<soundCast>RHFire_DOOMChaingun</soundCast>
+			<soundAiming>RHGun_DOOMChaingunAiming</soundAiming>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>150</magazineSize>
+			<reloadTime>9.2</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== UAC Plasma Rifle ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHGun_DOOM_PlasmaRifle</defName>
+		<statBases>
+			<Mass>8.20</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>13.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.48</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Doom2016PlasmaGun</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>RHShot_DOOMPlasmaRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>150</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_Doom2016PlasmaGun</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== UAC Plasma Gun ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHGun_DOOM_PlasmaGun</defName>
+		<statBases>
+			<Mass>8.20</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>10.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.48</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Doom2016PlasmaGun</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>RHShot_DOOMPlasmaGun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>150</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_Doom2016PlasmaGun</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== UAC Vortex Rifle ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHGun_DOOM_VortexRifle</defName>
+		<statBases>
+			<Mass>7.51</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.60</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.76</SwayFactor>
+			<Bulk>9.05</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Doom2016VortexRifle</defaultProjectile>
+			<warmupTime>1.6</warmupTime>
+			<range>68</range>
+			<soundCast>RHFire_DOOMVortexRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_Doom2016VortexRifle</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== UAC Hellshot ========== 
+
+	<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHGun_DOOM_Hellshot</defName>
+		<statBases>
+			<Mass>6.35</Mass>
+			<RangedWeapon_Cooldown>0.05</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.42</SwayFactor>
+			<Bulk>7.49</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Doom2016Hellshot</defaultProjectile>
+			<warmupTime>0.0</warmupTime>
+			<range>48</range>
+			<soundCast>RHFire_DOOMHellshot</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>60</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_Doom2016Hellshot</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+	</li>-->
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RHGun_DOOM_UACEMGPistol" or
+			defName="RHGun_DOOM_UACEMGMarkVPistol"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RHGun_DOOM_CombatShotgun" or
+			defName="RHGun_DOOM_CombatShotgunEternal" or
+			defName="RHGun_DOOM_SuperShotgun" or
+			defName="RHGun_DOOM_HeavyAssaultRifle" or
+			defName="RHGun_DOOM_PlasmaRifle" or
+			defName="RHGun_DOOM_PlasmaGun" or
+			defName="RHGun_DOOM_VortexRifle" or
+			defName="RHGun_DOOM_HeavyCannon" or
+			defName="RHGun_DOOM_Hellshot"
+			]/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="RHGun_DOOM_Chaingun"
+			]/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>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - Bounty Hunters/Patches/RH2 Faction - Bounty Hunters/BountyHunters_Apparel.xml b/ModPatches/RH2 Faction - Bounty Hunters/Patches/RH2 Faction - Bounty Hunters/BountyHunters_Apparel.xml
new file mode 100644
index 0000000000..73de558416
--- /dev/null
+++ b/ModPatches/RH2 Faction - Bounty Hunters/Patches/RH2 Faction - Bounty Hunters/BountyHunters_Apparel.xml	
@@ -0,0 +1,294 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Ranged Shield Belt -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_RangedShieldBelt_S1_UAC"]/statBases/EnergyShieldRechargeRate</xpath>
+		<value>
+			<EnergyShieldRechargeRate>0.168</EnergyShieldRechargeRate>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_RangedShieldBelt_S1_UAC"]/statBases/EnergyShieldEnergyMax</xpath>
+		<value>
+			<EnergyShieldEnergyMax>1.125</EnergyShieldEnergyMax>
+		</value>
+	</Operation>
+
+	<!-- Power Armor Helmets -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_WardenHelmet_BH1PowerArmor" or
+			defName="RHApparel_JusticeHelmet_BH2PowerArmor" or
+			defName="RHApparel_BloodhoundHelmet_BH3PowerArmor" or
+			defName="RHApparel_OutlawHelmet_BH4PowerArmor"]/statBases </xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_WardenHelmet_BH1PowerArmor" or
+			defName="RHApparel_JusticeHelmet_BH2PowerArmor" or
+			defName="RHApparel_BloodhoundHelmet_BH3PowerArmor" or
+			defName="RHApparel_OutlawHelmet_BH4PowerArmor"]/statBases/Flammability </xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_WardenHelmet_BH1PowerArmor" or
+			defName="RHApparel_JusticeHelmet_BH2PowerArmor" or
+			defName="RHApparel_BloodhoundHelmet_BH3PowerArmor" or
+			defName="RHApparel_OutlawHelmet_BH4PowerArmor"]/statBases/Mass </xpath>
+		<value>
+			<Mass>6.6</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_WardenHelmet_BH1PowerArmor" or
+			defName="RHApparel_JusticeHelmet_BH2PowerArmor" or
+			defName="RHApparel_BloodhoundHelmet_BH3PowerArmor" or
+			defName="RHApparel_OutlawHelmet_BH4PowerArmor"]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>22</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_WardenHelmet_BH1PowerArmor" or
+			defName="RHApparel_JusticeHelmet_BH2PowerArmor" or
+			defName="RHApparel_BloodhoundHelmet_BH3PowerArmor" or
+			defName="RHApparel_OutlawHelmet_BH4PowerArmor"]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>50</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_WardenHelmet_BH1PowerArmor" or
+			defName="RHApparel_JusticeHelmet_BH2PowerArmor" or
+			defName="RHApparel_BloodhoundHelmet_BH3PowerArmor" or
+			defName="RHApparel_OutlawHelmet_BH4PowerArmor"]/equippedStatOffsets/ShootingAccuracyPawn </xpath>
+		<value>
+			<AimingAccuracy>0.15</AimingAccuracy>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_WardenHelmet_BH1PowerArmor" or
+			defName="RHApparel_JusticeHelmet_BH2PowerArmor" or
+			defName="RHApparel_BloodhoundHelmet_BH3PowerArmor" or
+			defName="RHApparel_OutlawHelmet_BH4PowerArmor"]/costList/Plasteel </xpath>
+		<value>
+			<Plasteel>120</Plasteel>
+			<DevilstrandCloth>25</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_WardenHelmet_BH1PowerArmor" or
+			defName="RHApparel_JusticeHelmet_BH2PowerArmor" or
+			defName="RHApparel_BloodhoundHelmet_BH3PowerArmor" or
+			defName="RHApparel_OutlawHelmet_BH4PowerArmor"]/apparel/layers </xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_WardenHelmet_BH1PowerArmor" or
+			defName="RHApparel_JusticeHelmet_BH2PowerArmor" or
+			defName="RHApparel_BloodhoundHelmet_BH3PowerArmor" or
+			defName="RHApparel_OutlawHelmet_BH4PowerArmor"] </xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Power Armor Suits -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_Warden_BH1PowerArmor" or
+			defName="RHApparel_Justice_BH2PowerArmor" or
+			defName="RHApparel_Bloodhound_BH3PowerArmor" or
+			defName="RHApparel_Outlaw_BH4PowerArmor"]/statBases </xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_Warden_BH1PowerArmor" or
+			defName="RHApparel_Justice_BH2PowerArmor" or
+			defName="RHApparel_Bloodhound_BH3PowerArmor" or
+			defName="RHApparel_Outlaw_BH4PowerArmor"]/statBases/MaxHitPoints </xpath>
+		<value>
+			<MaxHitPoints>600</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_Warden_BH1PowerArmor" or
+			defName="RHApparel_Justice_BH2PowerArmor" or
+			defName="RHApparel_Bloodhound_BH3PowerArmor" or
+			defName="RHApparel_Outlaw_BH4PowerArmor"]/statBases/Mass </xpath>
+		<value>
+			<Mass>80</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_Warden_BH1PowerArmor" or
+			defName="RHApparel_Justice_BH2PowerArmor" or
+			defName="RHApparel_Bloodhound_BH3PowerArmor" or
+			defName="RHApparel_Outlaw_BH4PowerArmor"]/statBases/Flammability </xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_Warden_BH1PowerArmor" or
+			defName="RHApparel_Justice_BH2PowerArmor" or
+			defName="RHApparel_Bloodhound_BH3PowerArmor" or
+			defName="RHApparel_Outlaw_BH4PowerArmor"]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>26</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_Warden_BH1PowerArmor" or
+			defName="RHApparel_Justice_BH2PowerArmor" or
+			defName="RHApparel_Bloodhound_BH3PowerArmor" or
+			defName="RHApparel_Outlaw_BH4PowerArmor"]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>56</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_Warden_BH1PowerArmor" or
+			defName="RHApparel_Justice_BH2PowerArmor" or
+			defName="RHApparel_Bloodhound_BH3PowerArmor" or
+			defName="RHApparel_Outlaw_BH4PowerArmor"]/costList </xpath>
+		<value>
+			<DevilstrandCloth>50</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_Warden_BH1PowerArmor" or
+			defName="RHApparel_Justice_BH2PowerArmor" or
+			defName="RHApparel_Bloodhound_BH3PowerArmor" or
+			defName="RHApparel_Outlaw_BH4PowerArmor"]/equippedStatOffsets </xpath>
+		<value>
+			<CarryWeight>100</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+			<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_Warden_BH1PowerArmor" or
+			defName="RHApparel_Justice_BH2PowerArmor" or
+			defName="RHApparel_Bloodhound_BH3PowerArmor" or
+			defName="RHApparel_Outlaw_BH4PowerArmor"]/apparel/bodyPartGroups </xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_Warden_BH1PowerArmor" or
+			defName="RHApparel_Justice_BH2PowerArmor" or
+			defName="RHApparel_Bloodhound_BH3PowerArmor" or
+			defName="RHApparel_Outlaw_BH4PowerArmor"]/costList/Plasteel </xpath>
+		<value>
+			<Plasteel>220</Plasteel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_Warden_BH1PowerArmor" or
+			defName="RHApparel_Justice_BH2PowerArmor" or
+			defName="RHApparel_Bloodhound_BH3PowerArmor" or
+			defName="RHApparel_Outlaw_BH4PowerArmor"]/costList/Uranium </xpath>
+		<value>
+			<Uranium>60</Uranium>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_Warden_BH1PowerArmor" or
+			defName="RHApparel_Justice_BH2PowerArmor" or
+			defName="RHApparel_Bloodhound_BH3PowerArmor" or
+			defName="RHApparel_Outlaw_BH4PowerArmor"] </xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - Bounty Hunters/Patches/RH2 Faction - Bounty Hunters/BountyHunters_Drink.xml b/ModPatches/RH2 Faction - Bounty Hunters/Patches/RH2 Faction - Bounty Hunters/BountyHunters_Drink.xml
new file mode 100644
index 0000000000..1ddb71413f
--- /dev/null
+++ b/ModPatches/RH2 Faction - Bounty Hunters/Patches/RH2 Faction - Bounty Hunters/BountyHunters_Drink.xml	
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RH2_SoftDrinkResourceBase"]/statBases</xpath>
+		<value>
+			<Bulk>0.33</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RH2_SmokeleafSotoxi_Cigarette"]/statBases</xpath>
+		<value>
+			<Bulk>0.05</Bulk>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - Bounty Hunters/Patches/RH2 Faction - Bounty Hunters/BountyHunters_Gun.xml b/ModPatches/RH2 Faction - Bounty Hunters/Patches/RH2 Faction - Bounty Hunters/BountyHunters_Gun.xml
new file mode 100644
index 0000000000..a5486de2a7
--- /dev/null
+++ b/ModPatches/RH2 Faction - Bounty Hunters/Patches/RH2 Faction - Bounty Hunters/BountyHunters_Gun.xml	
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHGun_DOOM3_PlasmaGun"]/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="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RHGun_DOOM3_PlasmaGun</defName>
+		<statBases>
+			<Bulk>7.5</Bulk>
+			<SwayFactor>1.27</SwayFactor>
+			<ShotSpread>0.07</ShotSpread>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.25</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_PlasmaCellRifle</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<warmupTime>1.2</warmupTime>
+			<range>62</range>
+			<soundCast>RHShot_DOOM3_PlasmaGunShot</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>60</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_PlasmaCellRifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - Bounty Hunters/Patches/RH2 Faction - Bounty Hunters/BountyHunters_Pawnkinds.xml b/ModPatches/RH2 Faction - Bounty Hunters/Patches/RH2 Faction - Bounty Hunters/BountyHunters_Pawnkinds.xml
new file mode 100644
index 0000000000..b517460c2c
--- /dev/null
+++ b/ModPatches/RH2 Faction - Bounty Hunters/Patches/RH2 Faction - Bounty Hunters/BountyHunters_Pawnkinds.xml	
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			@Name="RH2_DOOMBountyHunters_Base" or
+			@Name="RH2_BountyHunters_SpecialBase" or
+			@Name="RH2_BountyHunters_FNGBase" or
+			@Name="RH2_BountyHunters_BossBase"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - Task Force 141/Patches/RH2 Faction - Task Force 141/TaskForce141_Apparel.xml b/ModPatches/RH2 Faction - Task Force 141/Patches/RH2 Faction - Task Force 141/TaskForce141_Apparel.xml
new file mode 100644
index 0000000000..4f5dc6248d
--- /dev/null
+++ b/ModPatches/RH2 Faction - Task Force 141/Patches/RH2 Faction - Task Force 141/TaskForce141_Apparel.xml	
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Shirts, pants, hats, earpro-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_TacticalJacket_141Fleece" or
+			defName="RNApparel_Pants_CryeG3MultiCam" or
+			defName="RNApparel_Pants_BDUDCU" or
+			defName="RNApparel_BoonieHat_Price" or
+			defName="RNApparel_EarDefs_PeltorComtacII"]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_EarDefs_PeltorComtacII"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>20</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_TacticalJacket_141Fleece" or
+			defName="RNApparel_Pants_CryeG3MultiCam" or
+			defName="RNApparel_Pants_BDUDCU"]/statBases </xpath>
+		<value>
+			<Bulk>2</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_TacticalJacket_141Fleece"]/statBases/Mass</xpath>
+		<value>
+			<Mass>0.75</Mass>
+		</value>
+	</Operation>
+
+	<!--Masks-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_Balaclava_Helikon" or
+			defName="RNApparel_Balaclava_Ghost"]/apparel/layers </xpath>
+		<value>
+			<layers>
+				<li>OnHead</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_Balaclava_Helikon" or
+			defName="RNApparel_Balaclava_Ghost"]/apparel/bodyPartGroups </xpath>
+		<value>
+			<bodyPartGroups>
+				<li>UpperHead</li>
+				<li>Teeth</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<!--Eyepros-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_EyePros_SIBallistic" or
+			defName="RNApparel_EyePros_PILLAPantherX"]/apparel/layers </xpath>
+		<value>
+			<layers>
+				<li>StrappedHead</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_EyePros_SIBallistic"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_EyePros_PILLAPantherX"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!--Armor-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_CryeCAGE_Tan"]/statBases/Mass</xpath>
+		<value>
+			<Mass>9</Mass>
+			<Bulk>6</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_CryeCAGE_Tan"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>75</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_CryeCAGE_Tan"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_CryeCAGE_Tan"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RNApparel_CryeCAGE_Tan"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<!--Helmets-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_MICH2000_141Rook" or
+			defName="RNApparel_MICH2000_141Roach"]/stuffCategories </xpath>
+		<value>
+			<stuffCategories>
+				<li>Steeled</li>
+			</stuffCategories>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_MICH2000_141Rook" or
+			defName="RNApparel_MICH2000_141Roach"]/statBases </xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.54</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!--Webbing, packs-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name = "RHApparel_141HarnessBase"]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>Webbing</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name = "RHApparel_141HarnessBase"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>Shoulders</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			@Name = "RHApparel_141HarnessBase" or
+			defName="RNApparel_Backpack_CamelbakMULE" or
+			defName="RNApparel_Backpack_MaxpeditionFalconIII" or
+			defName="RNApparel_Backpack_MFH"]/statBases
+
+		</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationreplace">
+		<xpath>Defs/ThingDef[@Name = "RHApparel_141HarnessBase"]/equippedStatOffsets
+		</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>30</CarryBulk>
+				<ReloadSpeed>0.1</ReloadSpeed>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationreplace">
+		<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_MaxpeditionFalconIII"]/equippedStatOffsets
+		</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>35</CarryBulk>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationreplace">
+		<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_CamelbakMULE"]/equippedStatOffsets
+		</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>25</CarryBulk>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationreplace">
+		<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_MFH"]/equippedStatOffsets
+		</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>15</CarryBulk>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - Task Force 141/Patches/RH2 Faction - Task Force 141/TaskForce141_Guns.xml b/ModPatches/RH2 Faction - Task Force 141/Patches/RH2 Faction - Task Force 141/TaskForce141_Guns.xml
new file mode 100644
index 0000000000..9022947207
--- /dev/null
+++ b/ModPatches/RH2 Faction - Task Force 141/Patches/RH2 Faction - Task Force 141/TaskForce141_Guns.xml	
@@ -0,0 +1,294 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName="RNGun_HK433_Rifle" or
+			defName="RNGun_M4A1TaskForce_Rifle" or
+			defName="RNGun_FNMinimi762MG" or
+			defName="RNGun_RSASS_DMR" or
+			defName="RNGun_THORM408AMR"
+			]/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>
+
+	<!-- HK 443 -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_HK433_Rifle</defName>
+		<statBases>
+			<Mass>3.8</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.5</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.35</SwayFactor>
+			<Bulk>8.5</Bulk>
+			<WorkToMake>37000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>55</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>1.45</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>58</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AR</li>
+			<li>RN_Coalition_AR</li>
+			<li>RN_HK433</li>
+		</weaponTags>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!-- M4A1 -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M4A1TaskForce_Rifle</defName>
+		<statBases>
+			<WorkToMake>32000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.28</SwayFactor>
+			<Bulk>7.5</Bulk>
+			<Mass>2.9</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>1.58</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_MWARRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AR</li>
+			<li>RN_Coalition_CQB</li>
+			<li>RN_Coalition_AR</li>
+			<li>RN_M4A1_TaskForce</li>
+		</weaponTags>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!--FN Minimi 7.62-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_FNMinimi762MG</defName>
+		<statBases>
+			<WorkToMake>40500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.45</SwayFactor>
+			<Bulk>12.55</Bulk>
+			<Mass>8.8</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>80</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+			<Chemfuel>15</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>1.3</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>58</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>RNShot_GenericDMR_II</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>Bipod_LMG</li>
+			<li>CE_AI_AR</li>
+			<li>RN_Coalition_MG</li>
+			<li>RNGun_FNMinimi762</li>
+		</weaponTags>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!--RSASS-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_RSASS_DMR</defName>
+		<statBases>
+			<WorkToMake>33500</WorkToMake>
+			<Mass>7.50</Mass>
+			<Bulk>11.20</Bulk>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.70</SwayFactor>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>75</Steel>
+			<Chemfuel>5</Chemfuel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<soundCast>RNShot_GenericDMR</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SniperRifle</li>
+			<li>RN_Coalition_DMR</li>
+			<li>RN_RSASS</li>
+		</weaponTags>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!--THOR M408 AMR-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_THORM408AMR</defName>
+		<statBases>
+			<WorkToMake>44500</WorkToMake>
+			<SightsEfficiency>3.5</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.92</SwayFactor>
+			<Bulk>15.48</Bulk>
+			<Mass>11.80</Mass>
+			<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>85</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+			<Chemfuel>20</Chemfuel>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_408CheyenneTactical_FMJ</defaultProjectile>
+			<warmupTime>2.8</warmupTime>
+			<range>86</range>
+			<soundCast>RNShotIntervention</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_408CheyenneTactical</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SniperRifle</li>
+			<li>RN_Coalition_AMR</li>
+			<li>RN_Coalition_Sniper</li>
+			<li>RN_THOR_M408</li>
+		</weaponTags>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - Task Force 141/Patches/RH2 Faction - Task Force 141/TaskForce141_Pawnkinds.xml b/ModPatches/RH2 Faction - Task Force 141/Patches/RH2 Faction - Task Force 141/TaskForce141_Pawnkinds.xml
new file mode 100644
index 0000000000..f499d672e2
--- /dev/null
+++ b/ModPatches/RH2 Faction - Task Force 141/Patches/RH2 Faction - Task Force 141/TaskForce141_Pawnkinds.xml	
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Traders ammo stock ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[
+			defName="RHVisitor_141_Standard" or
+			defName="RHBase_141_Standard" or
+			defName="RHCaravan_141_MilitiaSupplier"
+			]/stockGenerators </xpath>
+		<value>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Ammo</tradeTag>
+				<countRange>
+					<min>1000</min>
+					<max>3000</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>5</min>
+					<max>12</max>
+				</thingDefCountRange>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Weapon money ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[
+			defName="RH2_141_FNG" or
+			defName="RH2_141_Gunner" or
+			defName="RH2_141_Assault" or
+			defName="RH2_141_Trader"
+			]/weaponMoney/min </xpath>
+		<value>
+			<min>550</min>
+		</value>
+	</Operation>
+
+	<!-- ========== Apparel, Webbing ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[@Name="RH2_141_SpecialBase"]/specificApparelRequirements/li[1]</xpath>
+		<value>
+			<li>
+				<bodyPartGroup>Eyes</bodyPartGroup>
+				<apparelLayer>StrappedHead</apparelLayer>
+				<stuff>Plasteel</stuff>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[
+			@Name="RH2_Operator_NonEliteTierBase" or
+			@Name="RH2_141_EliteTierBase" or
+			@Name="RH2_141_BossTierBase" or
+			@Name="RH2_141_SoapTierBase" or
+			defName="RH2_141_Trader"
+			]/apparelTags </xpath>
+		<value>
+			<li>RH2_XBelt_141</li>
+			<li>RH2_Backpack_141</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Ammo ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RH2_141_EliteGunner"]/weaponTags</xpath>
+		<value>
+			<weaponTags>
+				<li>RN_Coalition_MG</li>
+				<li>RNGun_FNMinimi762</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="RH2_141_EliteGunner" or
+			defName="RH2_141_Gunner"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>3</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="RH2_141_Trader" or
+			defName="RH2_141_FNG" or
+			defName="RH2_141_Assault" or
+			defName="RH2_141_Sharpshooter" or
+			defName="RH2_141_Boss" or
+			defName="RH2_141_Elite"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>7</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.15</generateChance>
+						<sidearmMoney>
+							<min>10</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>GrenadeSmoke</li>
+						</weaponTags>
+						<magazineCount>
+							<min>1</min>
+							<max>2</max>
+						</magazineCount>
+					</li>
+					<li>
+						<generateChance>0.075</generateChance>
+						<sidearmMoney>
+							<min>50</min>
+							<max>200</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_FlareLauncher</li>
+						</weaponTags>
+						<magazineCount>
+							<min>2</min>
+							<max>4</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - The Rangers/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Apparel.xml b/ModPatches/RH2 Faction - The Rangers/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Apparel.xml
new file mode 100644
index 0000000000..5ca4128f13
--- /dev/null
+++ b/ModPatches/RH2 Faction - The Rangers/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Apparel.xml	
@@ -0,0 +1,420 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== In-built Shield Patch ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@ParentName="RHApparel_Armor_VigilanteBase"]/statBases/EnergyShieldRechargeRate</xpath>
+		<value>
+			<EnergyShieldRechargeRate>0.075</EnergyShieldRechargeRate>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@ParentName="RHApparel_Armor_VigilanteBase"]/statBases/EnergyShieldEnergyMax</xpath>
+		<value>
+			<EnergyShieldEnergyMax>0.75</EnergyShieldEnergyMax>
+		</value>
+	</Operation>
+
+	<!-- Add Partial Armor to Helmet -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="RHApparel_ArmorHelmetPower_VigilanteBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.50</ArmorRating_Sharp>
+						<parts>
+							<li>Nose</li>
+							<li>Jaw</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.50</ArmorRating_Blunt>
+						<parts>
+							<li>Nose</li>
+							<li>Jaw</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Add partial armor to Ranger Armors -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="RHApparel_Armor_VigilanteBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Ranger Helmet ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RHApparel_ArmorHelmetPower_VigilanteBase"]/statBases/Mass</xpath>
+		<value>
+			<Mass>5.0</Mass>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RHApparel_ArmorHelmetPower_VigilanteBase"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RHApparel_ArmorHelmetPower_VigilanteBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RHApparel_ArmorHelmetPower_VigilanteBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RHApparel_ArmorHelmetPower_VigilanteBase"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>0.15</AimingAccuracy>
+				<ToxicResistance>0.50</ToxicResistance>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RHApparel_ArmorHelmetPower_VigilanteBase"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>60</Plasteel>
+			<DevilstrandCloth>20</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RHApparel_ArmorHelmetPower_VigilanteBase"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="RHApparel_ArmorHelmetPower_VigilanteBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Ranger armor ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RHApparel_Armor_VigilanteBase"]/statBases</xpath>
+		<value>
+			<Bulk>90</Bulk>
+			<WornBulk>13</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RHApparel_Armor_VigilanteBase"]/statBases/Mass</xpath>
+		<value>
+			<Mass>40</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RHApparel_Armor_VigilanteBase"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RHApparel_Armor_VigilanteBase"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>450</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RHApparel_Armor_VigilanteBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>19</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RHApparel_Armor_VigilanteBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>42</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RHApparel_Armor_VigilanteBase"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>40</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RHApparel_Armor_VigilanteBase"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>70</CarryWeight>
+				<CarryBulk>10</CarryBulk>
+				<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+				<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RHApparel_Armor_VigilanteBase"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>160</Plasteel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RHApparel_Armor_VigilanteBase"]/costList/Uranium</xpath>
+		<value>
+			<Uranium>20</Uranium>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="RHApparel_Armor_VigilanteBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Poncho & Duster-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_Duster_Ranger" or defName="RHApparel_Poncho_Western"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_Duster_Ranger" or defName="RHApparel_Poncho_Western"]/statBases</xpath>
+		<value>
+			<Bulk>7.5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Packs-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "RHApparel_M56Webbing_Ranger" or
+			defName = "RHApparel_Bandolier_Ranger"
+			]/apparel/layers </xpath>
+		<value>
+			<layers>
+				<li>Webbing</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "RHApparel_M56Webbing_Ranger" or
+			defName = "RHApparel_Bandolier_Ranger"
+			]/apparel/bodyPartGroups </xpath>
+		<value>
+			<bodyPartGroups>
+				<li>Shoulders</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName = "RHApparel_M56Webbing_Ranger" or
+			defName = "RHApparel_Bandolier_Ranger" or
+			defName = "RNApparel_Backpack_AUGURDaypack" or
+			defName = "RNApparel_Backpack_AUGURSling" or
+			defName = "RNApparel_Backpack_AUGURHaversack"]/statBases
+		</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationreplace">
+		<xpath>Defs/ThingDef[defName = "RHApparel_M56Webbing_Ranger"]/equippedStatOffsets
+		</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>30</CarryBulk>
+				<ReloadSpeed>0.1</ReloadSpeed>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationreplace">
+		<xpath>Defs/ThingDef[defName = "RHApparel_Bandolier_Ranger"]/equippedStatOffsets
+		</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>18</CarryBulk>
+				<ReloadSpeed>0.1</ReloadSpeed>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationreplace">
+		<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_AUGURDaypack"]/equippedStatOffsets
+		</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>38</CarryBulk>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationreplace">
+		<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_AUGURDaypack"]/statBases/Mass
+		</xpath>
+		<value>
+			<Mass>1.2</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationreplace">
+		<xpath>Defs/ThingDef[
+			defName = "RNApparel_Backpack_AUGURSling" or
+			defName = "RNApparel_Backpack_AUGURHaversack"]/equippedStatOffsets
+		</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>25</CarryBulk>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - The Rangers/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Handgun.xml b/ModPatches/RH2 Faction - The Rangers/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Handgun.xml
new file mode 100644
index 0000000000..b1c9bf8e7f
--- /dev/null
+++ b/ModPatches/RH2 Faction - The Rangers/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Handgun.xml	
@@ -0,0 +1,318 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Colt Peacemaker ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Revolver_ColtPeacemaker</defName>
+		<statBases>
+			<Mass>1.19</Mass>
+			<RangedWeapon_Cooldown>0.89</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>2.79</Bulk>
+			<WorkToMake>3500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.84</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45Colt_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShot_GenericRevolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_45Colt</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Colt Walker ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Revolver_ColtWalker</defName>
+		<statBases>
+			<Mass>1.79</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.36</ShotSpread>
+			<SwayFactor>1.22</SwayFactor>
+			<Bulk>3.56</Bulk>
+			<WorkToMake>5000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>35</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.58</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_SlowMusketBall</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShot_GenericRevolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>15</reloadTime>
+			<ammoSet>AmmoSet_SlowMusketBall</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_Sidearm</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Remington 1875 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Revolver_RemingtonSingleActionArmy</defName>
+		<statBases>
+			<Mass>1.18</Mass>
+			<RangedWeapon_Cooldown>0.90</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.56</SwayFactor>
+			<Bulk>3.51</Bulk>
+			<WorkToMake>3500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>3.28</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45Colt_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>15</range>
+			<soundCast>RNShot_GenericRevolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_45Colt</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Smith & Wesson Model 3R ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Revolver_SWModel3R</defName>
+		<statBases>
+			<Mass>1.35</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.47</SwayFactor>
+			<Bulk>3.05</Bulk>
+			<WorkToMake>5000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.93</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_44Magnum_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>RNShotColtPython</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_44Magnum</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Smith & Wesson Model 29 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Revolver_SWModel29R</defName>
+		<statBases>
+			<Mass>1.35</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.47</SwayFactor>
+			<Bulk>3.05</Bulk>
+			<WorkToMake>5000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.93</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_44Magnum_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShotColtPython</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_44Magnum</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Browning HiPower ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_BrowningHiPower_Pistol</defName>
+		<statBases>
+			<WorkToMake>5000</WorkToMake>
+			<Mass>1.11</Mass>
+			<Bulk>2.00</Bulk>
+			<SwayFactor>1.07</SwayFactor>
+			<ShotSpread>0.15</ShotSpread>
+			<SightsEfficiency>0.80</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.3</warmupTime>
+			<range>18</range>
+			<soundCast>RNShot_CZ75B</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>13</magazineSize>
+			<reloadTime>1.7</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNGun_Revolver_RemingtonSingleActionArmy" or
+			defName="RNGun_Revolver_ColtPeacemaker" or
+			defName="RNGun_Revolver_ColtWalker" or
+			defName="RNGun_Revolver_SWModel3R" or
+			defName="RNGun_Revolver_SWModel29R" or
+			defName="RNGun_BrowningHiPower_Pistol"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - The Rangers/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Melee.xml b/ModPatches/RH2 Faction - The Rangers/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Melee.xml
new file mode 100644
index 0000000000..e4d0d9b472
--- /dev/null
+++ b/ModPatches/RH2 Faction - The Rangers/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Melee.xml	
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Vintage KABAR_Knife === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_VintageKABAR_Knife"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_VintageKABAR_Knife"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.05</MeleeCritChance>
+				<MeleeParryChance>0.15</MeleeParryChance>
+				<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_VintageKABAR_Knife"]/weaponTags</xpath>
+		<value>
+			<li>CE_Sidearm_Melee</li>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_VintageKABAR_Knife"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.22</cooldownTime>
+					<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.34</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.29</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.44</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - The Rangers/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Pawns.xml b/ModPatches/RH2 Faction - The Rangers/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Pawns.xml
new file mode 100644
index 0000000000..6d8bd444be
--- /dev/null
+++ b/ModPatches/RH2 Faction - The Rangers/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Pawns.xml	
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="RH2_Ranger_NonEliteTierBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="RH2_Rangers_EliteTierBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>7</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.075</generateChance>
+						<sidearmMoney>
+							<min>50</min>
+							<max>200</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_FlareLauncher</li>
+						</weaponTags>
+						<magazineCount>
+							<min>2</min>
+							<max>4</max>
+						</magazineCount>
+					</li>
+					<li>
+						<generateChance>0.125</generateChance>
+						<sidearmMoney>
+							<min>10</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>GrenadeSmoke</li>
+							<li>GrenadeDestructive</li>
+						</weaponTags>
+						<magazineCount>
+							<min>0</min>
+							<max>1</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - The Rangers/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Rifle.xml b/ModPatches/RH2 Faction - The Rangers/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Rifle.xml
new file mode 100644
index 0000000000..cec41d25cd
--- /dev/null
+++ b/ModPatches/RH2 Faction - The Rangers/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Rifle.xml	
@@ -0,0 +1,259 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Longgun Melee Tools =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNGun_AR10_Rifle" or
+			defName="RNGun_T48_Rifle" or
+			defName="RNGun_BattleRifle_M1Garand" or
+			defName="RNGun_BattleRifle_M1Carbine" or
+			defName="RNGun_HenryRepeatingRifle_Rifle"]/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>
+
+	<!-- ========== AR10 =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_AR10_Rifle</defName>
+		<statBases>
+			<WorkToMake>32500</WorkToMake>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.44</SwayFactor>
+			<Bulk>10.25</Bulk>
+			<Mass>4.05</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>55</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>2.07</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<range>55</range>
+			<soundCast>RNShot_GenericDMR_II</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== T48 FAL thing =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_T48_Rifle</defName>
+		<statBases>
+			<WorkToMake>28000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.52</SwayFactor>
+			<Bulk>10.90</Bulk>
+			<Mass>4.30</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>55</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.07</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<soundCast>RNShot_GenericDMR</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</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>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== M1 Garand ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_BattleRifle_M1Garand</defName>
+		<statBases>
+			<Mass>4.31</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.53</SwayFactor>
+			<Bulk>11.00</Bulk>
+			<WorkToMake>15000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>RNShot_GenericDMR</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_3006Springfield</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+		<researchPrerequisite>GasOperation</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== M1 Carbine ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_BattleRifle_M1Carbine</defName>
+		<statBases>
+			<Mass>2.40</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.14</SwayFactor>
+			<Bulk>6.00</Bulk>
+			<WorkToMake>17500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>45</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_30Carbine_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>37</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_30Carbine</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<researchPrerequisite>GasOperation</researchPrerequisite>
+	</Operation>
+
+	<!-- Henry -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_HenryRepeatingRifle_Rifle</defName>
+		<statBases>
+			<WorkToMake>12000</WorkToMake>
+			<Mass>3.2</Mass>
+			<Bulk>12.50</Bulk>
+			<SwayFactor>1.30</SwayFactor>
+			<ShotSpread>0.02</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.65</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>60</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_45Colt_FMJ</defaultProjectile>
+			<warmupTime>0.9</warmupTime>
+			<range>48</range>
+			<soundCast>RNShotModel1866LA</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>16</magazineSize>
+			<reloadTime>0.5</reloadTime>
+			<ammoSet>AmmoSet_45Colt</ammoSet>
+			<reloadOneAtATime>true</reloadOneAtATime>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - The Rangers/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Sharpshooter.xml b/ModPatches/RH2 Faction - The Rangers/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Sharpshooter.xml
new file mode 100644
index 0000000000..f4f773322c
--- /dev/null
+++ b/ModPatches/RH2 Faction - The Rangers/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Sharpshooter.xml	
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== HelcateII AMR ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_PGMHelcateII_AMR</defName>
+		<statBases>
+			<Mass>13.8</Mass>
+			<RangedWeapon_Cooldown>1.10</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.72</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.7</SwayFactor>
+			<Bulk>14.52</Bulk>
+			<WorkToMake>40000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>80</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>2.8</warmupTime>
+			<range>100</range>
+			<soundCast>RNShot_Generic50Bolt</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>Bipod_AMR</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== WinchesterModel70_Sniper ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_WinchesterModel70_Sniper</defName>
+		<statBases>
+			<Mass>3.6</Mass>
+			<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.60</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.57</SwayFactor>
+			<Bulk>12</Bulk>
+			<WorkToMake>32500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>20</Chemfuel>
+			<Steel>70</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
+			<warmupTime>1.8</warmupTime>
+			<range>75</range>
+			<soundCast>RNShot_GenericBoltSniper_II</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_303British</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+		<researchPrerequisite>Gunsmithing</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== Ruger M77 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_RugerM77_BoltAction</defName>
+		<statBases>
+			<Mass>3.74</Mass>
+			<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.60</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>11.92</Bulk>
+			<WorkToMake>30500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>65</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
+			<warmupTime>1.8</warmupTime>
+			<range>75</range>
+			<soundCast>RNShot_GenericBoltSniper</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_3006Springfield</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+		<researchPrerequisite>Gunsmithing</researchPrerequisite>
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNGun_PGMHelcateII_AMR" or
+			defName="RNGun_WinchesterModel70_Sniper" or
+			defName="RNGun_RugerM77_BoltAction"
+			]/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>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - The Rangers/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Shotgun.xml b/ModPatches/RH2 Faction - The Rangers/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Shotgun.xml
new file mode 100644
index 0000000000..d2e2a46c07
--- /dev/null
+++ b/ModPatches/RH2 Faction - The Rangers/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Shotgun.xml	
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Rhotgun Shotgun ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_RugerRedLabel_Shotgun</defName>
+		<statBases>
+			<Mass>2.90</Mass>
+			<RangedWeapon_Cooldown>0.9</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>9.97</Bulk>
+			<WorkToMake>9500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>40</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>18</range>
+			<soundCast>RNShotSawnOff</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>2</magazineSize>
+			<reloadTime>1.9</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<!-- shotguns with stocks -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNGun_RugerRedLabel_Shotgun"
+			]/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>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - The Rangers/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Spacer.xml b/ModPatches/RH2 Faction - The Rangers/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Spacer.xml
new file mode 100644
index 0000000000..3254e715f6
--- /dev/null
+++ b/ModPatches/RH2 Faction - The Rangers/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Spacer.xml	
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Mr Shorty ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_MrShorty_ChargeRifle</defName>
+		<statBases>
+			<SightsEfficiency>1.05</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.3</SwayFactor>
+			<Bulk>6.5</Bulk>
+		</statBases>
+		<costList>
+			<Steel>45</Steel>
+			<Plasteel>25</Plasteel>
+			<ComponentIndustrial>10</ComponentIndustrial>
+			<Chemfuel>15</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>1.7</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
+			<warmupTime>0.9</warmupTime>
+			<range>46</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<soundCast>RN2Shot_GenericCharge</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>2.40</reloadTime>
+			<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<researchPrerequisite>ChargedShot</researchPrerequisite>
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Railgun ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_KBARailgun_BoltAction</defName>
+		<statBases>
+			<Mass>5.05</Mass>
+			<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.20</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.53</SwayFactor>
+			<Bulk>11.00</Bulk>
+			<WorkToMake>40000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>60</Steel>
+			<Plasteel>10</Plasteel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+			<ComponentSpacer>1</ComponentSpacer>
+			<WoodLog>15</WoodLog>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6mmRailgun_Sabot</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>62</range>
+			<soundCast>RN2Shot_ChargeSniper</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_6mmRailgun</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+		<researchPrerequisite>ChargedShot</researchPrerequisite>
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNGun_MrShorty_ChargeRifle" or
+			defName="RNGun_KBARailgun_BoltAction"
+			]/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>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - Utilitarian/Patches/RH2 Faction - Utilitarian/Utilitarian_Apparel.xml b/ModPatches/RH2 Faction - Utilitarian/Patches/RH2 Faction - Utilitarian/Utilitarian_Apparel.xml
new file mode 100644
index 0000000000..71b3094193
--- /dev/null
+++ b/ModPatches/RH2 Faction - Utilitarian/Patches/RH2 Faction - Utilitarian/Utilitarian_Apparel.xml	
@@ -0,0 +1,294 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Ranged Shield Belt -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_RangedShieldBelt_TitanCorp"]/statBases/EnergyShieldRechargeRate</xpath>
+		<value>
+			<EnergyShieldRechargeRate>0.15</EnergyShieldRechargeRate>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_RangedShieldBelt_TitanCorp"]/statBases/EnergyShieldEnergyMax</xpath>
+		<value>
+			<EnergyShieldEnergyMax>0.75</EnergyShieldEnergyMax>
+		</value>
+	</Operation>
+
+	<!-- Power Armor Helmets -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_VectorHelmet_UTIL1PowerArmor" or
+			defName="RHApparel_PrimeHelmet_UTIL2PowerArmor" or
+			defName="RHApparel_OmicronHelmet_UTIL3PowerArmor" or
+			defName="RHApparel_HelixHelmet_UTIL4PowerArmor"]/statBases </xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_VectorHelmet_UTIL1PowerArmor" or
+			defName="RHApparel_PrimeHelmet_UTIL2PowerArmor" or
+			defName="RHApparel_OmicronHelmet_UTIL3PowerArmor" or
+			defName="RHApparel_HelixHelmet_UTIL4PowerArmor"]/statBases/Flammability </xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_VectorHelmet_UTIL1PowerArmor" or
+			defName="RHApparel_PrimeHelmet_UTIL2PowerArmor" or
+			defName="RHApparel_OmicronHelmet_UTIL3PowerArmor" or
+			defName="RHApparel_HelixHelmet_UTIL4PowerArmor"]/statBases/Mass </xpath>
+		<value>
+			<Mass>6.6</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_VectorHelmet_UTIL1PowerArmor" or
+			defName="RHApparel_PrimeHelmet_UTIL2PowerArmor" or
+			defName="RHApparel_OmicronHelmet_UTIL3PowerArmor" or
+			defName="RHApparel_HelixHelmet_UTIL4PowerArmor"]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>22</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_VectorHelmet_UTIL1PowerArmor" or
+			defName="RHApparel_PrimeHelmet_UTIL2PowerArmor" or
+			defName="RHApparel_OmicronHelmet_UTIL3PowerArmor" or
+			defName="RHApparel_HelixHelmet_UTIL4PowerArmor"]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>50</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_VectorHelmet_UTIL1PowerArmor" or
+			defName="RHApparel_PrimeHelmet_UTIL2PowerArmor" or
+			defName="RHApparel_OmicronHelmet_UTIL3PowerArmor" or
+			defName="RHApparel_HelixHelmet_UTIL4PowerArmor"]/equippedStatOffsets/ShootingAccuracyPawn </xpath>
+		<value>
+			<AimingAccuracy>0.15</AimingAccuracy>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_VectorHelmet_UTIL1PowerArmor" or
+			defName="RHApparel_PrimeHelmet_UTIL2PowerArmor" or
+			defName="RHApparel_OmicronHelmet_UTIL3PowerArmor" or
+			defName="RHApparel_HelixHelmet_UTIL4PowerArmor"]/costList/Plasteel </xpath>
+		<value>
+			<Plasteel>120</Plasteel>
+			<DevilstrandCloth>25</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_VectorHelmet_UTIL1PowerArmor" or
+			defName="RHApparel_PrimeHelmet_UTIL2PowerArmor" or
+			defName="RHApparel_OmicronHelmet_UTIL3PowerArmor" or
+			defName="RHApparel_HelixHelmet_UTIL4PowerArmor"]/apparel/layers </xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_VectorHelmet_UTIL1PowerArmor" or
+			defName="RHApparel_PrimeHelmet_UTIL2PowerArmor" or
+			defName="RHApparel_OmicronHelmet_UTIL3PowerArmor" or
+			defName="RHApparel_HelixHelmet_UTIL4PowerArmor"] </xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Power Armor Suits -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_Vector_UTIL1PowerArmor" or
+			defName="RHApparel_Prime_UTIL2PowerArmor" or
+			defName="RHApparel_Omicron_UTIL3PowerArmor" or
+			defName="RHApparel_Helix_UTIL4PowerArmor"]/statBases </xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_Vector_UTIL1PowerArmor" or
+			defName="RHApparel_Prime_UTIL2PowerArmor" or
+			defName="RHApparel_Omicron_UTIL3PowerArmor" or
+			defName="RHApparel_Helix_UTIL4PowerArmor"]/statBases/MaxHitPoints </xpath>
+		<value>
+			<MaxHitPoints>600</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_Vector_UTIL1PowerArmor" or
+			defName="RHApparel_Prime_UTIL2PowerArmor" or
+			defName="RHApparel_Omicron_UTIL3PowerArmor" or
+			defName="RHApparel_Helix_UTIL4PowerArmor"]/statBases/Mass </xpath>
+		<value>
+			<Mass>80</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_Vector_UTIL1PowerArmor" or
+			defName="RHApparel_Prime_UTIL2PowerArmor" or
+			defName="RHApparel_Omicron_UTIL3PowerArmor" or
+			defName="RHApparel_Helix_UTIL4PowerArmor"]/statBases/Flammability </xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_Vector_UTIL1PowerArmor" or
+			defName="RHApparel_Prime_UTIL2PowerArmor" or
+			defName="RHApparel_Omicron_UTIL3PowerArmor" or
+			defName="RHApparel_Helix_UTIL4PowerArmor"]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>26</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_Vector_UTIL1PowerArmor" or
+			defName="RHApparel_Prime_UTIL2PowerArmor" or
+			defName="RHApparel_Omicron_UTIL3PowerArmor" or
+			defName="RHApparel_Helix_UTIL4PowerArmor"]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>56</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_Vector_UTIL1PowerArmor" or
+			defName="RHApparel_Prime_UTIL2PowerArmor" or
+			defName="RHApparel_Omicron_UTIL3PowerArmor" or
+			defName="RHApparel_Helix_UTIL4PowerArmor"]/costList </xpath>
+		<value>
+			<DevilstrandCloth>50</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_Vector_UTIL1PowerArmor" or
+			defName="RHApparel_Prime_UTIL2PowerArmor" or
+			defName="RHApparel_Omicron_UTIL3PowerArmor" or
+			defName="RHApparel_Helix_UTIL4PowerArmor"]/equippedStatOffsets </xpath>
+		<value>
+			<CarryWeight>100</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+			<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_Vector_UTIL1PowerArmor" or
+			defName="RHApparel_Prime_UTIL2PowerArmor" or
+			defName="RHApparel_Omicron_UTIL3PowerArmor" or
+			defName="RHApparel_Helix_UTIL4PowerArmor"]/apparel/bodyPartGroups </xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_Vector_UTIL1PowerArmor" or
+			defName="RHApparel_Prime_UTIL2PowerArmor" or
+			defName="RHApparel_Omicron_UTIL3PowerArmor" or
+			defName="RHApparel_Helix_UTIL4PowerArmor"]/costList/Plasteel </xpath>
+		<value>
+			<Plasteel>220</Plasteel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_Vector_UTIL1PowerArmor" or
+			defName="RHApparel_Prime_UTIL2PowerArmor" or
+			defName="RHApparel_Omicron_UTIL3PowerArmor" or
+			defName="RHApparel_Helix_UTIL4PowerArmor"]/costList/Uranium </xpath>
+		<value>
+			<Uranium>60</Uranium>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_Vector_UTIL1PowerArmor" or
+			defName="RHApparel_Prime_UTIL2PowerArmor" or
+			defName="RHApparel_Omicron_UTIL3PowerArmor" or
+			defName="RHApparel_Helix_UTIL4PowerArmor"] </xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - Utilitarian/Patches/RH2 Faction - Utilitarian/Utilitarian_Drink.xml b/ModPatches/RH2 Faction - Utilitarian/Patches/RH2 Faction - Utilitarian/Utilitarian_Drink.xml
new file mode 100644
index 0000000000..73dbfaa4b3
--- /dev/null
+++ b/ModPatches/RH2 Faction - Utilitarian/Patches/RH2 Faction - Utilitarian/Utilitarian_Drink.xml	
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RH2_Soda_ThirstyBurst"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>0.33</Bulk>
+			</statBases>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - Utilitarian/Patches/RH2 Faction - Utilitarian/Utilitarian_Gun.xml b/ModPatches/RH2 Faction - Utilitarian/Patches/RH2 Faction - Utilitarian/Utilitarian_Gun.xml
new file mode 100644
index 0000000000..9569e616c8
--- /dev/null
+++ b/ModPatches/RH2 Faction - Utilitarian/Patches/RH2 Faction - Utilitarian/Utilitarian_Gun.xml	
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNGun_DOOM3_MG88Enforcer"]/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="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_DOOM3_MG88Enforcer</defName>
+		<statBases>
+			<Bulk>7.0</Bulk>
+			<SwayFactor>1.15</SwayFactor>
+			<ShotSpread>0.05</ShotSpread>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.25</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>51</range>
+			<soundCast>RHShot_DOOM3_MG88EnforcerShot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>60</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - Utilitarian/Patches/RH2 Faction - Utilitarian/Utilitarian_Pawnkinds.xml b/ModPatches/RH2 Faction - Utilitarian/Patches/RH2 Faction - Utilitarian/Utilitarian_Pawnkinds.xml
new file mode 100644
index 0000000000..f6812b2534
--- /dev/null
+++ b/ModPatches/RH2 Faction - Utilitarian/Patches/RH2 Faction - Utilitarian/Utilitarian_Pawnkinds.xml	
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			@Name="RH2_DOOMUtilitarian_Base" or
+			@Name="RH2_Utilitarian_SpecialBase" or
+			@Name="RH2_Utilitarian_FNGBase" or
+			@Name="RH2_Utilitarian_BossBase"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - VOID/Patches/RH2 Faction - VOID/FoodDefs/Caviar_Food.xml b/ModPatches/RH2 Faction - VOID/Patches/RH2 Faction - VOID/FoodDefs/Caviar_Food.xml
new file mode 100644
index 0000000000..78d99c5c50
--- /dev/null
+++ b/ModPatches/RH2 Faction - VOID/Patches/RH2 Faction - VOID/FoodDefs/Caviar_Food.xml	
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RH2_Ration_Caviar"]/statBases</xpath>
+		<value>
+			<Bulk>0.1</Bulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - VOID/Patches/RH2 Faction - VOID/HediffDefs/Hediffs_BodyParts_VOIDArchotech.xml b/ModPatches/RH2 Faction - VOID/Patches/RH2 Faction - VOID/HediffDefs/Hediffs_BodyParts_VOIDArchotech.xml
new file mode 100644
index 0000000000..c75cc3bc0e
--- /dev/null
+++ b/ModPatches/RH2 Faction - VOID/Patches/RH2 Faction - VOID/HediffDefs/Hediffs_BodyParts_VOIDArchotech.xml	
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="RH2_VOIDArchotechArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>0.75</cooldownTime>
+					<armorPenetrationBlunt>5.00</armorPenetrationBlunt>
+					<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
+					<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - VOID/Patches/RH2 Faction - VOID/Items_Drugs/Alcohol_RedWine.xml b/ModPatches/RH2 Faction - VOID/Patches/RH2 Faction - VOID/Items_Drugs/Alcohol_RedWine.xml
new file mode 100644
index 0000000000..a4c23ec83e
--- /dev/null
+++ b/ModPatches/RH2 Faction - VOID/Patches/RH2 Faction - VOID/Items_Drugs/Alcohol_RedWine.xml	
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RH_RedWine"]/statBases</xpath>
+		<value>
+			<Bulk>1.5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_RedWine"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2.22</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>neck</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>3.33</cooldownTime>
+					<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Neck</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RH_RedWine"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.33</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RH_RedWine"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.1</MeleeCritChance>
+				<MeleeParryChance>0.33</MeleeParryChance>
+				<MeleeDodgeChance>0.07</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="RH_RedWine"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="RH_RedWine"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RH_RedWine"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - VOID/Patches/RH2 Faction - VOID/Items_Drugs/Items_Exotic.xml b/ModPatches/RH2 Faction - VOID/Patches/RH2 Faction - VOID/Items_Drugs/Items_Exotic.xml
new file mode 100644
index 0000000000..dd76177d7c
--- /dev/null
+++ b/ModPatches/RH2 Faction - VOID/Patches/RH2 Faction - VOID/Items_Drugs/Items_Exotic.xml	
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RH_Nerotonin8B"]/statBases</xpath>
+		<value>
+			<Bulk>0.01</Bulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - VOID/Patches/RH2 Faction - VOID/Monsters/Bodies.xml b/ModPatches/RH2 Faction - VOID/Patches/RH2 Faction - VOID/Monsters/Bodies.xml
new file mode 100644
index 0000000000..92bbffe451
--- /dev/null
+++ b/ModPatches/RH2 Faction - VOID/Patches/RH2 Faction - VOID/Monsters/Bodies.xml	
@@ -0,0 +1,433 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant"]/corePart/parts/li[def = "RH_N4Mutant_Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant"]/corePart/parts/li[def = "RH_N4Mutant_Neck"]/parts/li[def = "RH_N4Mutant_Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/parts/li[def = "RH_N4Mutant_Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/parts/li[def = "RH_N4Mutant_Arm"]/parts/li[def = "RH_N4Mutant_Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/parts/li[def = "RH_N4Mutant_Arm"]/parts/li[def = "RH_N4Mutant_Hand"]/parts/li[def = "RH_N4Mutant_Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant"]/corePart/parts/li[def = "RH_N4Mutant_Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant"]/corePart/parts/li[def = "RH_N4Mutant_Leg"]/parts/li[def = "RH_N4Mutant_Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant"]/corePart/parts/li[def = "RH_N4Mutant_Leg"]/parts/li[def = "RH_N4Mutant_Foot"]/parts/li[def = "RH_N4Mutant_Toe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Humanlike (ArmBlade) ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_ArmBlade"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_ArmBlade"]/corePart/parts/li[def = "RH_N4Mutant_Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_ArmBlade"]/corePart/parts/li[def = "RH_N4Mutant_Neck"]/parts/li[def = "RH_N4Mutant_Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_ArmBlade"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_ArmBlade"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/parts/li[def = "RH_N4Mutant_Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_ArmBlade"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/parts/li[def = "RH_N4Mutant_Arm"]/parts/li[def = "RH_N4Mutant_Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_ArmBlade"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/parts/li[def = "RH_N4Mutant_Arm"]/parts/li[def = "RH_N4Mutant_Hand"]/parts/li[def = "RH_N4Mutant_Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_ArmBlade"]/corePart/parts/li[def = "RH_N4Mutant_Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_ArmBlade"]/corePart/parts/li[def = "RH_N4Mutant_Leg"]/parts/li[def = "RH_N4Mutant_Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_ArmBlade"]/corePart/parts/li[def = "RH_N4Mutant_Leg"]/parts/li[def = "RH_N4Mutant_Foot"]/parts/li[def = "RH_N4Mutant_Toe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Humanlike (BlackLeaper) ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_BlackLeaper"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_BlackLeaper"]/corePart/parts/li[def = "RH_N4Mutant_Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_BlackLeaper"]/corePart/parts/li[def = "RH_N4Mutant_Neck"]/parts/li[def = "RH_N4Mutant_Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_BlackLeaper"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_BlackLeaper"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/parts/li[def = "RH_N4Mutant_Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_BlackLeaper"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/parts/li[def = "RH_N4Mutant_Arm"]/parts/li[def = "RH_N4Mutant_Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_BlackLeaper"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/parts/li[def = "RH_N4Mutant_Arm"]/parts/li[def = "RH_N4Mutant_Hand"]/parts/li[def = "RH_N4Mutant_Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_BlackLeaper"]/corePart/parts/li[def = "RH_N4Mutant_Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_BlackLeaper"]/corePart/parts/li[def = "RH_N4Mutant_Leg"]/parts/li[def = "RH_N4Mutant_Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_BlackLeaper"]/corePart/parts/li[def = "RH_N4Mutant_Leg"]/parts/li[def = "RH_N4Mutant_Foot"]/parts/li[def = "RH_N4Mutant_Toe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Giant Spider ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_GiantSpider"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_GiantSpider"]/corePart/parts/li[def = "RH_N4Mutant_Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_GiantSpider"]/corePart/parts/li[def = "RH_N4Mutant_Neck"]/parts/li[def = "RH_N4Mutant_Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_GiantSpider"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_GiantSpider"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/parts/li[def = "RH_N4Mutant_Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_GiantSpider"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/parts/li[def = "RH_N4Mutant_Arm"]/parts/li[def = "RH_N4Mutant_Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_GiantSpider"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/parts/li[def = "RH_N4Mutant_Arm"]/parts/li[def = "RH_N4Mutant_Hand"]/parts/li[def = "RH_N4Mutant_Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_GiantSpider"]/corePart/parts/li[def = "RH_N4Mutant_Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_GiantSpider"]/corePart/parts/li[def = "RH_N4Mutant_Leg"]/parts/li[def = "RH_N4Mutant_Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_GiantSpider"]/corePart/parts/li[def = "RH_N4Mutant_Leg"]/parts/li[def = "RH_N4Mutant_Foot"]/parts/li[def = "RH_N4Mutant_Toe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Mother ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_Mother"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_Mother"]/corePart/parts/li[def = "RH_N4Mutant_Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_Mother"]/corePart/parts/li[def = "RH_N4Mutant_Neck"]/parts/li[def = "RH_N4Mutant_Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_Mother"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_Mother"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/parts/li[def = "RH_N4Mutant_Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_Mother"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/parts/li[def = "RH_N4Mutant_Arm"]/parts/li[def = "RH_N4Mutant_Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_Mother"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/parts/li[def = "RH_N4Mutant_Arm"]/parts/li[def = "RH_N4Mutant_Hand"]/parts/li[def = "RH_N4Mutant_Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_Mother"]/corePart/parts/li[def = "RH_N4Mutant_Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_Mother"]/corePart/parts/li[def = "RH_N4Mutant_Leg"]/parts/li[def = "RH_N4Mutant_Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_Mother"]/corePart/parts/li[def = "RH_N4Mutant_Leg"]/parts/li[def = "RH_N4Mutant_Foot"]/parts/li[def = "RH_N4Mutant_Toe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Wraith ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_Wraith"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_Wraith"]/corePart/parts/li[def = "RH_N4Mutant_Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_Wraith"]/corePart/parts/li[def = "RH_N4Mutant_Neck"]/parts/li[def = "RH_N4Mutant_Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_Wraith"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_Wraith"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/parts/li[def = "RH_N4Mutant_Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_Wraith"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/parts/li[def = "RH_N4Mutant_Arm"]/parts/li[def = "RH_N4Mutant_Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_Wraith"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/parts/li[def = "RH_N4Mutant_Arm"]/parts/li[def = "RH_N4Mutant_Hand"]/parts/li[def = "RH_N4Mutant_Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_Wraith"]/corePart/parts/li[def = "RH_N4Mutant_Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_Wraith"]/corePart/parts/li[def = "RH_N4Mutant_Leg"]/parts/li[def = "RH_N4Mutant_Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RH_N4Mutant_Wraith"]/corePart/parts/li[def = "RH_N4Mutant_Leg"]/parts/li[def = "RH_N4Mutant_Foot"]/parts/li[def = "RH_N4Mutant_Toe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - VOID/Patches/RH2 Faction - VOID/Monsters/Races.xml b/ModPatches/RH2 Faction - VOID/Patches/RH2 Faction - VOID/Monsters/Races.xml
new file mode 100644
index 0000000000..ae5e4675e6
--- /dev/null
+++ b/ModPatches/RH2 Faction - VOID/Patches/RH2 Faction - VOID/Monsters/Races.xml	
@@ -0,0 +1,517 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Base Mutant pawn ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="Base_RHN4Mutant"]/statBases</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!-- ========== Mother ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RH_DF_Mother"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RH_DF_Mother"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.08</MeleeDodgeChance>
+			<MeleeCritChance>0.8</MeleeCritChance>
+			<MeleeParryChance>1.33</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_Mother"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>23</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>30</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>5</cooldownTime>
+					<linkedBodyPartsGroup>RH_LeftClaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>25</armorPenetrationBlunt>
+					<armorPenetrationSharp>5</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>27</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>30</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>4.5</cooldownTime>
+					<linkedBodyPartsGroup>RH_RightClaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>30</armorPenetrationBlunt>
+					<armorPenetrationSharp>6</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>14</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_Mother"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_Mother"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RH_DF_Mother"]/combatPower</xpath>
+		<value>
+			<combatPower>600</combatPower>
+		</value>
+	</Operation>
+
+	<!-- ========== Titan ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RH_DF_Titan"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RH_DF_Titan"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>2.0</MeleeCritChance>
+			<MeleeParryChance>1.4</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_Titan"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>52</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>45</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>4.2</cooldownTime>
+					<linkedBodyPartsGroup>RH_N4LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>57</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>45</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>4</cooldownTime>
+					<linkedBodyPartsGroup>RH_N4RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>27</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>60</power>
+					<cooldownTime>15</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_Titan"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>9</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_Titan"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RH_Titan"]/combatPower</xpath>
+		<value>
+			<combatPower>600</combatPower>
+		</value>
+	</Operation>
+
+	<!-- ========== Wraith ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RH_DF_Wraith"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RH_DF_Wraith"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.33</MeleeDodgeChance>
+			<MeleeCritChance>2.0</MeleeCritChance>
+			<MeleeParryChance>1.11</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_Wraith"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tentacle</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>48</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>85</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>3.7</cooldownTime>
+					<linkedBodyPartsGroup>RH_LeftTentacle</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>50</armorPenetrationBlunt>
+					<armorPenetrationSharp>18</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>tentacle</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>52</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>85</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>3.9</cooldownTime>
+					<linkedBodyPartsGroup>RH_RightTentacle</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>50</armorPenetrationBlunt>
+					<armorPenetrationSharp>20</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>45</power>
+					<cooldownTime>13</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_Wraith"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>7</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_Wraith"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>13</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RH_Wraith"]/combatPower</xpath>
+		<value>
+			<combatPower>540</combatPower>
+		</value>
+	</Operation>
+
+	<!-- ========== Giant Spider ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RH_DF_GiantSpider"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RH_DF_GiantSpider"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.36</MeleeDodgeChance>
+			<MeleeCritChance>2.0</MeleeCritChance>
+			<MeleeParryChance>1.4</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_GiantSpider"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>23</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>3.7</cooldownTime>
+					<linkedBodyPartsGroup>RH_LeftClaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>25</armorPenetrationBlunt>
+					<armorPenetrationSharp>5</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>27</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>3.3</cooldownTime>
+					<linkedBodyPartsGroup>RH_RightClaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>30</armorPenetrationBlunt>
+					<armorPenetrationSharp>6</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>40</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>50</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>9.7</cooldownTime>
+					<linkedBodyPartsGroup>RH_GSTeeth</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.95</chanceFactor>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_GiantSpider"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>7</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_GiantSpider"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>13</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RH_DFGiantSpider"]/combatPower</xpath>
+		<value>
+			<combatPower>600</combatPower>
+		</value>
+	</Operation>
+
+	<!-- ========== Stalker ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RH_DF2_Stalker"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RH_DF2_Stalker"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.08</MeleeDodgeChance>
+			<MeleeCritChance>0.48</MeleeCritChance>
+			<MeleeParryChance>0.37</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF2_Stalker"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>16</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>30</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>4.9</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>30</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>3.1</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>17.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>3.5</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>6.0</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF2_Stalker"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>7.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF2_Stalker"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RH_DF2_Stalker"]/combatPower</xpath>
+		<value>
+			<combatPower>600</combatPower>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - VOID/Patches/RH2 Faction - VOID/Monsters/Races_Evolved.xml b/ModPatches/RH2 Faction - VOID/Patches/RH2 Faction - VOID/Monsters/Races_Evolved.xml
new file mode 100644
index 0000000000..ebf9fe22ea
--- /dev/null
+++ b/ModPatches/RH2 Faction - VOID/Patches/RH2 Faction - VOID/Monsters/Races_Evolved.xml	
@@ -0,0 +1,1199 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== EV Rumbler ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RH_DF_EvolvedRumbler"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RH_DF_EvolvedRumbler"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>1.82</MeleeCritChance>
+			<MeleeParryChance>0.37</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_EvolvedRumbler"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>12</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>3.8</cooldownTime>
+					<linkedBodyPartsGroup>RH_LeftClaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>12.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>13</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>3.5</cooldownTime>
+					<linkedBodyPartsGroup>RH_RightClaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>12.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>5.2</cooldownTime>
+					<linkedBodyPartsGroup>RH_N4Teeth</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_EvolvedRumbler"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_EvolvedRumbler"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RH_DF_EvolvedRumbler"]/combatPower</xpath>
+		<value>
+			<combatPower>225</combatPower>
+		</value>
+	</Operation>
+
+	<!-- ========== Evolved long arm ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RH_DF_EvolvedLongArms"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RH_DF_EvolvedLongArms"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>2.0</MeleeCritChance>
+			<MeleeParryChance>0.37</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_EvolvedLongArms"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left arm blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>14</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>8</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>3.8</cooldownTime>
+					<linkedBodyPartsGroup>RH_LeftArmBlade</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right arm blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>15</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>45</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>3</cooldownTime>
+					<linkedBodyPartsGroup>RH_RightBlade</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>5.2</cooldownTime>
+					<linkedBodyPartsGroup>RH_N4Teeth</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_EvolvedLongArms"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>7</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_EvolvedLongArms"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>14</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RH_DF_EvolvedLongArms"]/combatPower</xpath>
+		<value>
+			<combatPower>225</combatPower>
+		</value>
+	</Operation>
+
+	<!-- ========== Volatile long arm ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RH_DF_IrridiatedLongArms"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RH_DF_IrridiatedLongArms"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			<MeleeCritChance>2.0</MeleeCritChance>
+			<MeleeParryChance>0.37</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_IrridiatedLongArms"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left arm blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>67</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>50</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>4.0</cooldownTime>
+					<linkedBodyPartsGroup>RH_LeftArmBlade</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>12.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right arm blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>71</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>60</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>4.4</cooldownTime>
+					<linkedBodyPartsGroup>RH_RightBlade</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>87</power>
+					<cooldownTime>8.2</cooldownTime>
+					<linkedBodyPartsGroup>RH_N4Teeth</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>25.0</armorPenetrationBlunt>
+					<armorPenetrationSharp>5.0</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_IrridiatedLongArms"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>7.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_IrridiatedLongArms"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RH_DF_IrridiatedLongArms"]/combatPower</xpath>
+		<value>
+			<combatPower>900</combatPower>
+		</value>
+	</Operation>
+
+	<!-- ========== Volatile Leaper ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RH_DF_VolatileLeaper"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RH_DF_VolatileLeaper"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.59</MeleeDodgeChance>
+			<MeleeCritChance>2.0</MeleeCritChance>
+			<MeleeParryChance>2.0</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_VolatileLeaper"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>38</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>30</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>3.7</cooldownTime>
+					<linkedBodyPartsGroup>RH_N4LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>40</armorPenetrationBlunt>
+					<armorPenetrationSharp>8</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>42</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>30</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>3.5</cooldownTime>
+					<linkedBodyPartsGroup>RH_N4RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>40</armorPenetrationBlunt>
+					<armorPenetrationSharp>8</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>tongue</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>700</power>
+					<cooldownTime>4.2</cooldownTime>
+					<linkedBodyPartsGroup>RH_LeaperTongue</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>100</armorPenetrationBlunt>
+					<armorPenetrationSharp>30</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_VolatileLeaper"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_VolatileLeaper"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RH_DF_VolatileLeaper"]/combatPower</xpath>
+		<value>
+			<combatPower>2100</combatPower>
+		</value>
+	</Operation>
+
+	<!-- ========== BLACK TITAN ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RH_DF_BlackTitan"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RH_DF_BlackTitan"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.56</MeleeDodgeChance>
+			<MeleeCritChance>2.0</MeleeCritChance>
+			<MeleeParryChance>1.87</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_BlackTitan"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>80</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>70</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>4.8</cooldownTime>
+					<linkedBodyPartsGroup>RH_N4LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>45</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>85</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>70</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>3.4</cooldownTime>
+					<linkedBodyPartsGroup>RH_N4RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>50</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>100</power>
+					<cooldownTime>4.2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_BlackTitan"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>13</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_BlackTitan"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>21</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RH_BlackTitan"]/combatPower</xpath>
+		<value>
+			<combatPower>1200</combatPower>
+		</value>
+	</Operation>
+
+	<!-- ========== Black Wraith ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RH_DF_BlackWraith"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RH_DF_BlackWraith"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.66</MeleeDodgeChance>
+			<MeleeCritChance>2.0</MeleeCritChance>
+			<MeleeParryChance>1.11</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_BlackWraith"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tentacle</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>97</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>85</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>3.5</cooldownTime>
+					<linkedBodyPartsGroup>RH_LeftTentacle</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>100</armorPenetrationBlunt>
+					<armorPenetrationSharp>36</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>tentacle</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>110</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>85</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>3.8</cooldownTime>
+					<linkedBodyPartsGroup>RH_RightTentacle</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>110</armorPenetrationBlunt>
+					<armorPenetrationSharp>38</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>90</power>
+					<cooldownTime>3.5</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>30</armorPenetrationBlunt>
+					<armorPenetrationSharp>6</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_BlackWraith"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>13</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_BlackWraith"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RH_BlackWraith"]/combatPower</xpath>
+		<value>
+			<combatPower>900</combatPower>
+		</value>
+	</Operation>
+
+	<!-- ========== BLACK LEAPER ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RH_DF_BlackLeaper"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RH_DF_BlackLeaper"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			<MeleeCritChance>0.56</MeleeCritChance>
+			<MeleeParryChance>1.87</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_BlackLeaper"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>35</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>30</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>5.5</cooldownTime>
+					<linkedBodyPartsGroup>RH_N4LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>30</armorPenetrationBlunt>
+					<armorPenetrationSharp>6</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>37</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>30</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>5.4</cooldownTime>
+					<linkedBodyPartsGroup>RH_N4RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>32.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>6.5</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>tongue</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>600</power>
+					<cooldownTime>6.7</cooldownTime>
+					<linkedBodyPartsGroup>RH_LeaperTongue</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>100</armorPenetrationBlunt>
+					<armorPenetrationSharp>30</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_BlackLeaper"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_BlackLeaper"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>21</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RH_DF_BlackLeaper"]/combatPower</xpath>
+		<value>
+			<combatPower>1500</combatPower>
+		</value>
+	</Operation>
+
+	<!-- ========== Devil Hound ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RH_DF_DevilHound"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RH_DF_DevilHound"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.67</MeleeDodgeChance>
+			<MeleeCritChance>2.0</MeleeCritChance>
+			<MeleeParryChance>2.0</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_DevilHound"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>72</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>85</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>3.6</cooldownTime>
+					<linkedBodyPartsGroup>RH_LeftClaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>75</armorPenetrationBlunt>
+					<armorPenetrationSharp>15</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>77</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>85</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>3.1</cooldownTime>
+					<linkedBodyPartsGroup>RH_RightClaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>75</armorPenetrationBlunt>
+					<armorPenetrationSharp>15</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>125</power>
+					<cooldownTime>4.7</cooldownTime>
+					<linkedBodyPartsGroup>RH_N4Teeth</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>40</armorPenetrationBlunt>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_DevilHound"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_DevilHound"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>23</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RH_DF_DevilHound"]/combatPower</xpath>
+		<value>
+			<combatPower>2700</combatPower>
+		</value>
+	</Operation>
+
+	<!-- ========== Tendril ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RH_DF_Tendril"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RH_DF_Tendril"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.21</MeleeCritChance>
+			<MeleeParryChance>1.16</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_Tendril"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tentacles</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>9</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>5</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>RH_LeftTentacle</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>tentacles</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>13</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>5</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>2.3</cooldownTime>
+					<linkedBodyPartsGroup>RH_RightTentacle</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>11.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>4.5</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>4.0</cooldownTime>
+					<linkedBodyPartsGroup>RH_N4Teeth</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_Tendril"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_Tendril"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>7</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RH_DF_Tendril"]/combatPower</xpath>
+		<value>
+			<combatPower>75</combatPower>
+		</value>
+	</Operation>
+
+	<!-- ========== Bone ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RH_DF_Bone"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RH_DF_Bone"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.09</MeleeDodgeChance>
+			<MeleeCritChance>0.07</MeleeCritChance>
+			<MeleeParryChance>0.16</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_Bone"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>5</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>2.5</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>5</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>2.7</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>11.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>4.5</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>10.0</cooldownTime>
+					<linkedBodyPartsGroup>RH_N4Teeth</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_Bone"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_Bone"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RH_DF_Bone"]/combatPower</xpath>
+		<value>
+			<combatPower>80</combatPower>
+		</value>
+	</Operation>
+
+	<!-- ========== Roid Hulk ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RH_DF2_RoidHulk"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RH_DF2_RoidHulk"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.29</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF2_RoidHulk"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>14</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>13</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>3.0</cooldownTime>
+					<linkedBodyPartsGroup>RH_LeftClaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>16</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>2.8</cooldownTime>
+					<linkedBodyPartsGroup>RH_RightClaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>12.0</cooldownTime>
+					<linkedBodyPartsGroup>RH_N4Teeth</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF2_RoidHulk"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF2_RoidHulk"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RH_DF2_RoidHulk"]/combatPower</xpath>
+		<value>
+			<combatPower>200</combatPower>
+		</value>
+	</Operation>
+
+	<!-- ========== Reaper ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RH_DF_Reaper"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RH_DF_Reaper"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.08</MeleeDodgeChance>
+			<MeleeCritChance>0.09</MeleeCritChance>
+			<MeleeParryChance>0.32</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_Reaper"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>11</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>13</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>2.2</cooldownTime>
+					<linkedBodyPartsGroup>RH_LeftClawAB</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>12.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>arm blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>21</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>2.6</cooldownTime>
+					<chanceFactor>0.9</chanceFactor>
+					<linkedBodyPartsGroup>RH_RightBlade</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>11.0</cooldownTime>
+					<linkedBodyPartsGroup>RH_N4Teeth</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_Reaper"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RH_DF_Reaper"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>7</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RH_DF_Reaper"]/combatPower</xpath>
+		<value>
+			<combatPower>100</combatPower>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - VOID/Patches/RH2 Faction - VOID/PawnKindDefs_Humanlike/PawnKinds.xml b/ModPatches/RH2 Faction - VOID/Patches/RH2 Faction - VOID/PawnKindDefs_Humanlike/PawnKinds.xml
new file mode 100644
index 0000000000..d4ba253b1f
--- /dev/null
+++ b/ModPatches/RH2 Faction - VOID/Patches/RH2 Faction - VOID/PawnKindDefs_Humanlike/PawnKinds.xml	
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Ammo ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="RH_VOID_Base" or @Name="RH_VOID_BB_Base"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Backpacks ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[@Name="RH_VOID_Base" or @Name="RH_VOID_BB_Base"]</xpath>
+		<value>
+			<apparelRequired>
+				<li>CE_Apparel_Backpack</li>
+			</apparelRequired>
+		</value>
+	</Operation>
+
+	<!-- ========== CombatPower Patches ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RH_VOID_Undying"]/combatPower</xpath>
+		<value>
+			<combatPower>900</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RH_VOID_Collaborator"]/combatPower</xpath>
+		<value>
+			<combatPower>270</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[@Name="RH_VOIDAdvMemberBase"]/combatPower</xpath>
+		<value>
+			<combatPower>300</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RH_VOID_Associate"]/combatPower</xpath>
+		<value>
+			<combatPower>300</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RH_VOID_Destroyer"]/combatPower</xpath>
+		<value>
+			<combatPower>360</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RH_VOID_Grinder"]/combatPower</xpath>
+		<value>
+			<combatPower>360</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[@Name="RH_VOIDEliteBase"]/combatPower</xpath>
+		<value>
+			<combatPower>600</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[@Name="RH_VOIDEliteCloakedBase"]/combatPower</xpath>
+		<value>
+			<combatPower>600</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RH_VOID_Boss"]/combatPower</xpath>
+		<value>
+			<combatPower>750</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RH_VOID_Negotiator"]/combatPower</xpath>
+		<value>
+			<combatPower>240</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RH_VOID_Bodyguard"]/combatPower</xpath>
+		<value>
+			<combatPower>240</combatPower>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - VOID/Patches/RH2 Faction - VOID/ThingDefs_Apparel/Apparel_Various.xml b/ModPatches/RH2 Faction - VOID/Patches/RH2 Faction - VOID/ThingDefs_Apparel/Apparel_Various.xml
new file mode 100644
index 0000000000..10ac3b1a21
--- /dev/null
+++ b/ModPatches/RH2 Faction - VOID/Patches/RH2 Faction - VOID/ThingDefs_Apparel/Apparel_Various.xml	
@@ -0,0 +1,532 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== RH Apparel Base ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RHApparelBase"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- ========== Cloak and Hood ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_DFCloak_Hood"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_DFCloak_Poncho"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_DFCloak_Poncho"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Business Suit ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_VOID_BusinessSuit"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_VOID_BusinessSuit"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>30</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_VOID_BusinessSuit"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_VOID_BusinessSuit"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>30</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_VOID_BusinessSuit"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Speed Skin ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_VOID_SpeedSkin"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_VOID_SpeedSkin"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_VOID_SpeedSkin"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<!-- ========== VOID Reactive Armor ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RH_VOIDReactiveBase"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RH_VOIDReactiveBase"]/statBases/Mass</xpath>
+		<value>
+			<Mass>50</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RH_VOIDReactiveBase"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>550</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RH_VOIDReactiveBase"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>220</Plasteel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RH_VOIDReactiveBase"]/costList/Uranium</xpath>
+		<value>
+			<Uranium>50</Uranium>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RH_VOIDReactiveBase"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>50</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RH_VOIDReactiveBase"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>60</CarryBulk>
+			<CarryWeight>80</CarryWeight>
+			<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RH_VOIDReactiveBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>28</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RH_VOIDReactiveBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>60</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RH_VOIDReactiveBase"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="RH_VOIDReactiveBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_VOIDReactive_PowerArmor"]/statBases/EnergyShieldRechargeRate</xpath>
+		<value>
+			<EnergyShieldRechargeRate>1.68</EnergyShieldRechargeRate>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_VOIDReactive_PowerArmor"]/statBases/EnergyShieldRechargeRate</xpath>
+		<value>
+			<EnergyShieldRechargeRate>3.0</EnergyShieldRechargeRate>
+		</value>
+	</Operation>
+
+	<!-- ========== VOID Guard ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RH_VengeanceGuardBase"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RH_VengeanceGuardBase"]/statBases/Mass</xpath>
+		<value>
+			<Mass>60</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RH_VengeanceGuardBase"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>650</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RH_VengeanceGuardBase"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>260</Plasteel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RH_VengeanceGuardBase"]/costList/Uranium</xpath>
+		<value>
+			<Uranium>50</Uranium>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RH_VengeanceGuardBase"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>60</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RH_VengeanceGuardBase"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>70</CarryBulk>
+			<CarryWeight>90</CarryWeight>
+			<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RH_VengeanceGuardBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>36</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RH_VengeanceGuardBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>78</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RH_VengeanceGuardBase"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="RH_VengeanceGuardBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_VengeanceGuard_PowerArmor"]/statBases/EnergyShieldRechargeRate</xpath>
+		<value>
+			<EnergyShieldRechargeRate>1.2</EnergyShieldRechargeRate>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_VengeanceGuard_PowerArmor"]/statBases/EnergyShieldRechargeRate</xpath>
+		<value>
+			<EnergyShieldRechargeRate>4.5</EnergyShieldRechargeRate>
+		</value>
+	</Operation>
+
+	<!-- ========== VOID Reactive Armor - Helmet ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_VOIDBase"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_VOIDBase"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_VOIDBase"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_VOIDBase"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingAccuracy>0.15</AimingAccuracy>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_VOIDBase"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_VOIDBase"]/statBases/Mass</xpath>
+		<value>
+			<Mass>5.0</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_VOIDBase"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>230</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_VOIDBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>22</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_VOIDBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>50</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_VOIDBase"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>100</Plasteel>
+			<DevilstrandCloth>25</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_VOIDBase"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_VOIDBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Dusk Helmet ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_DuskBase"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_DuskBase"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_DuskBase"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_DuskBase"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingAccuracy>0.15</AimingAccuracy>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_DuskBase"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_DuskBase"]/statBases/Mass</xpath>
+		<value>
+			<Mass>5.0</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_DuskBase"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>230</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_DuskBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>27</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_DuskBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>65</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_DuskBase"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>110</Plasteel>
+			<DevilstrandCloth>25</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_DuskBase"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_DuskBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - VOID/Patches/RH2 Faction - VOID/ThingDefs_Weapons/MeleeWeapons.xml b/ModPatches/RH2 Faction - VOID/Patches/RH2 Faction - VOID/ThingDefs_Weapons/MeleeWeapons.xml
new file mode 100644
index 0000000000..1745275c8f
--- /dev/null
+++ b/ModPatches/RH2 Faction - VOID/Patches/RH2 Faction - VOID/ThingDefs_Weapons/MeleeWeapons.xml	
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Dusk Blade -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMelee_DFDuskBlade_Sword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.68</MeleeCritChance>
+				<MeleeParryChance>0.8</MeleeParryChance>
+				<MeleeDodgeChance>0.45</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMelee_DFDuskBlade_Sword"]/statBases</xpath>
+		<value>
+			<Bulk>9</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNMelee_DFDuskBlade_Sword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>pommel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.8</cooldownTime>
+					<chanceFactor>0.33</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>RHMelee_DFBladeStab</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>2.1</cooldownTime>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+					<armorPenetrationSharp>20</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>serrated blade</label>
+					<capacities>
+						<li>RHMelee_DFBladeSlash</li>
+					</capacities>
+					<power>42</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+					<armorPenetrationSharp>8</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Amputator -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMelee_DFAmputator_Blade"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.63</MeleeCritChance>
+				<MeleeParryChance>0.75</MeleeParryChance>
+				<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMelee_DFAmputator_Blade"]/statBases</xpath>
+		<value>
+			<Bulk>9</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNMelee_DFAmputator_Blade"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>pommel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.8</cooldownTime>
+					<chanceFactor>0.33</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>RHMelee_AmputatorStab</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+					<armorPenetrationSharp>18</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>RHMelee_AmputatorSlash</li>
+					</capacities>
+					<power>52</power>
+					<cooldownTime>2.1</cooldownTime>
+					<armorPenetrationBlunt>9</armorPenetrationBlunt>
+					<armorPenetrationSharp>7</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Grinder (Chainsaw) -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMelee_DFGrinder_Chainsaw"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.3</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMelee_DFGrinder_Chainsaw"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>3</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNMelee_DFGrinder_Chainsaw"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>RHMelee_ChainsawStab</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>0.8</cooldownTime>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+					<armorPenetrationSharp>12</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>RHMelee_ChainsawSlash</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.0</cooldownTime>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<armorPenetrationSharp>6</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Dual Blade -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMelee_DFDual_Blade"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.0</MeleeCritChance>
+				<MeleeParryChance>0.5</MeleeParryChance>
+				<MeleeDodgeChance>0.45</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMelee_DFDual_Blade"]/statBases</xpath>
+		<value>
+			<Bulk>9</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNMelee_DFDual_Blade"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>pommel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.8</cooldownTime>
+					<chanceFactor>0.33</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>RHMelee_DFBladeStab</li>
+					</capacities>
+					<power>32</power>
+					<cooldownTime>2.1</cooldownTime>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<armorPenetrationSharp>25</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>RHMelee_DFBladeSlash</li>
+					</capacities>
+					<power>65</power>
+					<cooldownTime>2.7</cooldownTime>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<armorPenetrationSharp>12</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - VOID/Patches/RH2 Faction - VOID/ThingDefs_Weapons/RangedWeapons.xml b/ModPatches/RH2 Faction - VOID/Patches/RH2 Faction - VOID/ThingDefs_Weapons/RangedWeapons.xml
new file mode 100644
index 0000000000..a8194629f1
--- /dev/null
+++ b/ModPatches/RH2 Faction - VOID/Patches/RH2 Faction - VOID/ThingDefs_Weapons/RangedWeapons.xml	
@@ -0,0 +1,517 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Remove MoveSpeed Penalties ========== -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RNGun_WraithCannon_HMG" or defName="RNGun_GAU19_HMG" or defName="RNGun_DuskMAG_HMG"]/equippedStatOffsets</xpath>
+	</Operation>
+
+	<!-- ========== Shared Melee Tools ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNGun_GAU19_HMG"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrels</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>2.44</cooldownTime>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrels</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNGun_Longshot_PP10AMR"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.55</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Cut</li>
+						<li>Stab</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2.0</cooldownTime>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.55</cooldownTime>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNGun_WraithCannon_HMG"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel spikes</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>2.0</cooldownTime>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Barrels</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>heavy barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>2.44</cooldownTime>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrels</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNGun_DuskMAG_HMG" or
+			defName="RNGun_CorpseBlaster_Shotgun" or
+			defName="RNGun_DuskStriker_Shotgun" or
+			defName="RNGun_CorpseDestroyer_GPMG" or
+			defName="RNGun_DuskCarbine_DMR" or
+			defName="RNGun_DFGAUSSRifle_AMR"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.55</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2.02</cooldownTime>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.55</cooldownTime>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNGun_DuskEnforcer_Revolver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Longshot PP-10 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Longshot_PP10AMR</defName>
+		<statBases>
+			<Mass>20.00</Mass>
+			<RangedWeapon_Cooldown>0.58</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>2.0</SwayFactor>
+			<Bulk>20</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_145x114mm_FMJ</defaultProjectile>
+			<warmupTime>2.8</warmupTime>
+			<range>86</range>
+			<soundCast>RNShot_DFGAUSSRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_145x114mm</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Wraith Cannon ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_WraithCannon_HMG</defName>
+		<statBases>
+			<Mass>66.00</Mass>
+			<RangedWeapon_Cooldown>0.58</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.52</SwayFactor>
+			<Bulk>25</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.0</recoilAmount>
+			<recoilPattern>Mounted</recoilPattern>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_145x114mm_AP</defaultProjectile>
+			<warmupTime>2.8</warmupTime>
+			<range>75</range>
+			<burstShotCount>50</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>RNShot_GAU19HMG</soundCast>
+			<soundAiming>RHGun_DOOMChaingunAiming</soundAiming>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aimedBurstShotCount>25</aimedBurstShotCount>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== GAU-19 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_GAU19_HMG</defName>
+		<statBases>
+			<Mass>55.00</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.32</SwayFactor>
+			<Bulk>18</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.70</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>2.3</warmupTime>
+			<range>68</range>
+			<burstShotCount>50</burstShotCount>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<soundCast>RNShot_GAU19HMG</soundCast>
+			<soundAiming>RHGun_DOOMChaingunAiming</soundAiming>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>9.2</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>25</aimedBurstShotCount>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Dusk MAG Machine Gun ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_DuskMAG_HMG</defName>
+		<statBases>
+			<Mass>9.12</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.53</SwayFactor>
+			<Bulk>15</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.32</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>62</range>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>RNShot_DuskMag</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>80</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Corpse Blaster Shotgun ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_CorpseBlaster_Shotgun</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.20</SwayFactor>
+			<Bulk>9.0</Bulk>
+			<SightsEfficiency>1.1</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_10Gauge_Buck</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>20</range>
+			<soundCast>RNShot_CorpseBlaster</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_10Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Dusk Striker Shotgun ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_DuskStriker_Shotgun</defName>
+		<statBases>
+			<Mass>5.20</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.49</SwayFactor>
+			<Bulk>10.66</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.8</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_10Gauge_Buck</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>20</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+			<soundCast>RNShot_DuskStriker</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_10Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Dusk Enforcer ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_DuskEnforcer_Revolver</defName>
+		<statBases>
+			<Mass>3.00</Mass>
+			<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.58</SwayFactor>
+			<Bulk>2.73</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_500SWMagnum_AP</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>18</range>
+			<soundCast>RNShot_DuskEnforcer</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Corpse Destroyer ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_CorpseDestroyer_GPMG</defName>
+		<statBases>
+			<Mass>10.50</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.51</SwayFactor>
+			<Bulk>14.05</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.30</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>RNShot_CorpseDestroyer</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Dusk Carbine ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_DuskCarbine_DMR</defName>
+		<statBases>
+			<Mass>5</Mass>
+			<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.68</SwayFactor>
+			<Bulk>8</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.30</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>60</range>
+			<soundCast>RNShot_DuskCarbine</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Gauss Rifle ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_DFGAUSSRifle_AMR</defName>
+		<statBases>
+			<Mass>5</Mass>
+			<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.68</SwayFactor>
+			<Bulk>8</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6mmRailgun_Sabot</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>60</range>
+			<soundCast>RNShot_DFGAUSSRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_6mmRailgun</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 Metal Gear Solid/Defs/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Ammo_NonLethal.xml b/ModPatches/RH2 Metal Gear Solid/Defs/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Ammo_NonLethal.xml
new file mode 100644
index 0000000000..53415662ac
--- /dev/null
+++ b/ModPatches/RH2 Metal Gear Solid/Defs/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Ammo_NonLethal.xml	
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- Non-lethal tranquilizer 9x19mm Parabellum pistol cartridge and ammoset for non-lethal pistols -->
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_9x19mmPara_NonLethal</defName>
+		<label>9x19mm Para (Tranq)</label>
+		<ammoTypes>
+			<Ammo_9x19mmPara_NL>Bullet_9x19mmPara_NL</Ammo_9x19mmPara_NL>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="9x19mmParaBase">
+		<defName>Ammo_9x19mmPara_NL</defName>
+		<label>9x19mm Para cartridge (Tranq)</label>
+		<graphicData>
+			<texPath>ThirdParty/CP Metal Gear Solid/Pistol/NL</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.31</MarketValue>
+		</statBases>
+		<ammoClass>TranqNonLethal</ammoClass>
+		<cookOffProjectile>Bullet_9x19mmPara_NL</cookOffProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<!-- Workaround for conditionally-patched projectiles: use an existing abstract class from the generic ammo library (In this case, Base9x19mmParaBullet) -->
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base9x19mmParaBullet">
+		<defName>Bullet_9x19mmPara_NL</defName>
+		<label>9mm Para bullet (Tranq)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Tranquilizer</damageDef>
+			<damageAmountBase>1</damageAmountBase>
+			<armorPenetrationSharp>2</armorPenetrationSharp>
+			<armorPenetrationBlunt>10.820</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_9x19mmPara_NL</defName>
+		<label>make 9x19mm Parabellum (Tranq) cartridge x500</label>
+		<description>Craft 500 9x19mm Parabellum (Tranq) cartridges.</description>
+		<jobString>Making 9x19mm Parabellum (Tranq) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>14</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>MedicineHerbal</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>MedicineHerbal</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_9x19mmPara_NL>500</Ammo_9x19mmPara_NL>
+		</products>
+		<workAmount>5000</workAmount>
+	</RecipeDef>
+
+	<!-- Non-lethal tranquilizer 7.62x51mm NATO rifle cartridge and ammoset for non-lethal rifles -->
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_762x51mmNATO_NonLethal</defName>
+		<label>7.62x51mm NATO (Tranq)</label>
+		<ammoTypes>
+			<Ammo_762x51mmNATO_NL>Bullet_762x51mmNATO_NL</Ammo_762x51mmNATO_NL>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x51mmNATOBase">
+		<defName>Ammo_762x51mmNATO_NL</defName>
+		<label>7.62x51mm NATO cartridge (Tranq)</label>
+		<graphicData>
+			<texPath>ThirdParty/CP Metal Gear Solid/Rifle/NL</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.5</MarketValue>
+		</statBases>
+		<ammoClass>TranqNonLethal</ammoClass>
+		<cookOffProjectile>Bullet_762x51mmNATO_NL</cookOffProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<!-- Workaround for conditionally-patched projectiles: use an existing abstract class from the generic ammo library (In this case, Base762x51mmNATOBullet) -->
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base762x51mmNATOBullet">
+		<defName>Bullet_762x51mmNATO_NL</defName>
+		<label>7.62mm NATO bullet (Tranq)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Tranquilizer</damageDef>
+			<damageAmountBase>1</damageAmountBase>
+			<armorPenetrationSharp>21</armorPenetrationSharp>
+			<armorPenetrationBlunt>86.28</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_762x51mmNATO_NL</defName>
+		<label>make 7.62x51mm NATO (Tranq) cartridge x500</label>
+		<description>Craft 500 7.62x51mm NATO (Tranq) cartridges.</description>
+		<jobString>Making 7.62x51mm NATO (Tranq) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>MedicineHerbal</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>MedicineHerbal</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_762x51mmNATO_NL>500</Ammo_762x51mmNATO_NL>
+		</products>
+		<workAmount>8200</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/RH2 Metal Gear Solid/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Apparel_Armor.xml b/ModPatches/RH2 Metal Gear Solid/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Apparel_Armor.xml
new file mode 100644
index 0000000000..5ac84e6aed
--- /dev/null
+++ b/ModPatches/RH2 Metal Gear Solid/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Apparel_Armor.xml	
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Exo Suit THI ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_ExoSuit_GrayFox"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_ExoSuit_GrayFox"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_ExoSuit_GrayFox"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>30</CarryWeight>
+			<!-- Essentially cancel out the added bulk of the exosuit -->
+			<CarryBulk>10</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_ExoSuit_GrayFox"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_ExoSuit_GrayFox"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>40</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_ExoSuit_GrayFox"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.8</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!-- ========== Exo Body ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_ExoSuit_Raiden"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_ExoSuit_Raiden"]/statBases</xpath>
+		<value>
+			<Bulk>25</Bulk>
+			<WornBulk>20</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_ExoSuit_Raiden"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>50</CarryWeight>
+			<!-- Essentially cancel out the added bulk of the exosuit -->
+			<CarryBulk>30</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_ExoSuit_Raiden"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>22</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_ExoSuit_Raiden"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>44</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_ExoSuit_Raiden"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.9</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_ExoSuit_Raiden" or defName="RHApparel_ExoSuit_GrayFox"]/equippedStatOffsets</xpath>
+		<value>
+			<Suppressability>-3.0</Suppressability>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 Metal Gear Solid/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Apparel_Armor_Headgear.xml b/ModPatches/RH2 Metal Gear Solid/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Apparel_Armor_Headgear.xml
new file mode 100644
index 0000000000..6b89837ac3
--- /dev/null
+++ b/ModPatches/RH2 Metal Gear Solid/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Apparel_Armor_Headgear.xml	
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== PASGT helmet FOXHOUND ========== 
+
+	<li Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_PASGTFOXHOUNDHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+			<ArmorRating_Blunt>13</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.54</ArmorRating_Heat>
+		</value>
+	</li>
+
+	<li Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_PASGTFOXHOUNDHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.20</StuffEffectMultiplierArmor>
+		</value>
+	</li>-->
+
+	<!-- ========== Exo Suit Helmet THI ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_ExoHelmet_GrayFox"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_ExoHelmet_GrayFox"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_ExoHelmet_GrayFox"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>32</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_ExoHelmet_GrayFox"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>1</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!-- ========== Exo Suit THI Helmet ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHApparel_ExoHelmet_Raiden"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_ExoHelmet_Raiden"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>17</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_ExoHelmet_Raiden"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>34</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHApparel_ExoHelmet_Raiden"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>1</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 Metal Gear Solid/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Apparel_Headgear.xml b/ModPatches/RH2 Metal Gear Solid/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Apparel_Headgear.xml
new file mode 100644
index 0000000000..545f8e7370
--- /dev/null
+++ b/ModPatches/RH2 Metal Gear Solid/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Apparel_Headgear.xml	
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== bandana FOX & bandana FOXHOUND ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_MGS_Bandana"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<!-- Equivalent to vanilla pants, T-shirt and button-down shirt -->
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== beret (FOXHOUND) ========== 
+
+	<li Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_Beret_FOXHOUND"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</li>
+
+	<li Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_Beret_FOXHOUND"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			 Equivalent to vanilla fabric hats 
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</li>-->
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 Metal Gear Solid/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Apparel_OnSkin.xml b/ModPatches/RH2 Metal Gear Solid/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Apparel_OnSkin.xml
new file mode 100644
index 0000000000..6f725c73cd
--- /dev/null
+++ b/ModPatches/RH2 Metal Gear Solid/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Apparel_OnSkin.xml	
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== sneaking suit FOX & sneaking suit FOXHOUND ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_SneakingSuit_A" or
+			defName="RNApparel_SneakingSuit_B"
+			]/apparel/bodyPartGroups </xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_SneakingSuit_A" or
+			defName="RNApparel_SneakingSuit_B"
+			]/equippedStatOffsets </xpath>
+		<value>
+			<CarryBulk>15</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_SneakingSuit_A" or
+			defName="RNApparel_SneakingSuit_B"
+			]/statBases </xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_SneakingSuit_A" or
+			defName="RNApparel_SneakingSuit_B"
+			]/statBases </xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_SneakingSuit_A" or
+			defName="RNApparel_SneakingSuit_B"
+			]/statBases </xpath>
+		<value>
+			<ArmorRating_Blunt>13</ArmorRating_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 Metal Gear Solid/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_MeleeWeapon.xml b/ModPatches/RH2 Metal Gear Solid/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_MeleeWeapon.xml
new file mode 100644
index 0000000000..03320f4e4b
--- /dev/null
+++ b/ModPatches/RH2 Metal Gear Solid/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_MeleeWeapon.xml	
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Longsword / Katana ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHMelee_HF_Katana"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<chanceFactor>0.33</chanceFactor>
+					<cooldownTime>1.52</cooldownTime>
+					<armorPenetrationBlunt>0.500</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>RHMelee_HFBladeStab</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1</cooldownTime>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+					<armorPenetrationSharp>85</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>RHMelee_HFBladeSlash</li>
+					</capacities>
+					<power>42</power>
+					<cooldownTime>0.5</cooldownTime>
+					<armorPenetrationBlunt>40</armorPenetrationBlunt>
+					<armorPenetrationSharp>75</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHMelee_HF_Katana"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>0.78</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHMelee_HF_Katana"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>4</MeleeCritChance>
+			<MeleeParryChance>1.2</MeleeParryChance>
+			<MeleeDodgeChance>0.4</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- ========== Longsword / Katana ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHMelee_HF_Blade"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<chanceFactor>0.38</chanceFactor>
+					<cooldownTime>1.57</cooldownTime>
+					<armorPenetrationBlunt>0.500</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>RHMelee_HFBladeStab</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1</cooldownTime>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<armorPenetrationSharp>90</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>RHMelee_HFBladeSlash</li>
+					</capacities>
+					<power>45</power>
+					<cooldownTime>0.5</cooldownTime>
+					<armorPenetrationBlunt>45</armorPenetrationBlunt>
+					<armorPenetrationSharp>80</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHMelee_HF_Blade"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>0.83</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHMelee_HF_Blade"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>4.5</MeleeCritChance>
+			<MeleeParryChance>1.7</MeleeParryChance>
+			<MeleeDodgeChance>0.9</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 Metal Gear Solid/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_PawnKindDefs.xml b/ModPatches/RH2 Metal Gear Solid/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_PawnKindDefs.xml
new file mode 100644
index 0000000000..4ed1837c4a
--- /dev/null
+++ b/ModPatches/RH2 Metal Gear Solid/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_PawnKindDefs.xml	
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Reduce meals and medicine carried by all pawns ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[@Name="RH_MGS_SoldierBase"]/invNutrition</xpath>
+		<value>
+			<invNutrition>1</invNutrition>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[
+			defName="RH_FOX_Infiltrator" or
+			defName="RH_MGS_GenomeSoldierBase" or
+			defName="RH_MGS_Infiltrator_Elite" or
+			defname="RH_MGS_CyborgNinja"
+			]/inventoryOptions/subOptionsChooseOne/li/countRange </xpath>
+		<value>
+			<countRange>
+				<min>0</min>
+				<max>1</max>
+			</countRange>
+		</value>
+	</Operation>
+
+	<!-- ========== FOX / FOXHOUND QRF Operator pawns should spawn with ammo appropriate to their primary weapon, as well as a sidearm (and its own ammo) ========== -->
+
+	<!-- First remove redundant MK23 from pawn's existing primary weaponTags -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/PawnKindDef[defName="RH_MGS_Infiltrator_Elite"]/weaponTags/li[.="RH2_FOXHOUND"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RH_MGS_Infiltrator_Elite"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>1</generateChance>
+						<magazineCount>
+							<min>2</min>
+							<max>3</max>
+						</magazineCount>
+						<weaponTags>
+							<li>RN_MK23_Loud</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 Metal Gear Solid/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_RangedIndustrial_Pistols.xml b/ModPatches/RH2 Metal Gear Solid/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_RangedIndustrial_Pistols.xml
new file mode 100644
index 0000000000..b575aae3e6
--- /dev/null
+++ b/ModPatches/RH2 Metal Gear Solid/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_RangedIndustrial_Pistols.xml	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== M9A1-S Tranq ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M9A1STranq_Pistol</defName>
+		<statBases>
+			<Mass>1.13</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.64</SwayFactor>
+			<Bulk>3.80</Bulk>
+			<WorkToMake>7500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_NL</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShotWUSPistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>2</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara_NonLethal</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== SOCOM Mk 23 MOD 0 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_MK23SOCOM_Pistol</defName>
+		<statBases>
+			<Mass>1.35</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.176</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>2.45</Bulk>
+			<WorkToMake>7500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShot_1911Hellfighter</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNGun_M9A1STranq_Pistol" or
+			defName="RNGun_MK23SOCOM_Pistol"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RH2 Metal Gear Solid/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Scenario.xml b/ModPatches/RH2 Metal Gear Solid/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Scenario.xml
new file mode 100644
index 0000000000..57bdb6c25a
--- /dev/null
+++ b/ModPatches/RH2 Metal Gear Solid/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Scenario.xml	
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="RH_Scenario_MGS_Infiltration"]/scenario/parts</xpath>
+		<value>
+
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_9x19mmPara_NL</thingDef>
+				<count>500</count>
+			</li>
+
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_45ACP_FMJ</thingDef>
+				<count>500</count>
+			</li>
+
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git "a/ModPatches/RH2 Rimmu-Nation\302\262 - Clothing/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Armors_CE.xml" "b/ModPatches/RH2 Rimmu-Nation\302\262 - Clothing/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Armors_CE.xml"
new file mode 100644
index 0000000000..947482ca9b
--- /dev/null
+++ "b/ModPatches/RH2 Rimmu-Nation\302\262 - Clothing/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Armors_CE.xml"	
@@ -0,0 +1,818 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--=============== Eye and Ear Pro ====================-->
+
+	<!--layer fix-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_EyePros_8X10BallisticGoggles" or
+			defName="RNApparel_EyePros_RB3025AviatorGlasses" or
+			defName="RNApparel_EyePros_SIBallisticMFrame" or
+			defName="RNApparel_EyePros_TerminatorGlasses"
+			]/apparel/layers </xpath>
+		<value>
+			<layers>
+				<li>StrappedHead</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<!--Ballistic Goggles + Ear Pro-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_EyePros_8X10BallisticGoggles" or
+			defName="RNApparel_EarDefs_PeltorOptimeII"]/statBases </xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>0.1</WornBulk>
+			<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_EyePros_8X10BallisticGoggles"]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+	<!--SI Ballistic M frame-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_EyePros_SIBallisticMFrame"]/statBases </xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>0.1</WornBulk>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+			<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_EyePros_SIBallisticMFrame"]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[
+			defName = "RNApparel_EyePros_SIBallisticMFrame" or
+			defName="RNApparel_EyePros_8X10BallisticGoggles"] </xpath>
+		<value>
+			<li Class="CombatExtended.ApperalRenderingExtension">
+				<HideHair>false</HideHair>
+				<HideBeard>false</HideBeard>
+			</li>
+		</value>
+	</Operation>
+
+	<!--========================= Helmets ========================-->
+	<!--Material-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_M1Helmet_Vietnam" or
+			defName="RNApparel_ProTecPrime_PizzaTime" or
+			defName="RNApparel_EXFILBallisticHelmet_Tan" or
+			defName="RNApparel_3MF70HighCut_Tan" or
+			defName="RNApparel_FLUXBallisticHelmet_Raid" or
+			defName="RNApparel_UaRmsTORD_Tan" or
+			defName="RNApparel_VestGuardFAST_Black" or
+			defName="RNApparel_OpsCoreFAST_Tan" or
+			defName="RNApparel_OpsCoreFASTBUMP_Multicam" or
+			defName="RNApparel_OpsCoreFASTCarbon_Grey" or
+			defName="RNApparel_OpsCoreFAST_SF" or
+			defName="RNApparel_MICH2000_CAG" or
+			defName="RNApparel_MICH2000_AmericanSniper" or
+			defName="RNApparel_Mk6BallisticHelmet_DDPM" or
+			defName="RNApparel_Mk6BallisticHelmet_Olive" or
+			defName="RNApparel_Mk6ABallisticHelmet_Black" or
+			defName="RNApparel_Mk7BallisticHelmet_Tan" or
+			defName="RNApparel_VestGuardPASGT_Black" or
+			defName="RNApparel_VestGuardPASGT_PRESS" or
+			defName="RNApparel_PASGT_Tan" or
+			defName="RNApparel_PASGT_ENVO" or
+			defName="RNApparel_LWH_DMARPAT" or
+			defName="RNApparel_ACH_UCP" or
+			defName="RNApparel_LZSH2DTM_Olive" or
+			defName="RNApparel_STSh81_Helmet" or
+			defName="RNApparel_6B48_Helmet"]/stuffCategories </xpath>
+		<value>
+			<stuffCategories>
+				<li>Steeled</li>
+			</stuffCategories>
+		</value>
+	</Operation>
+
+	<!--Wendy Exfil Ballistic-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_EXFILBallisticHelmet_Tan"]/statBases </xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.54</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!--FLUX Helmet-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_FLUXBallisticHelmet_Raid"]/statBases </xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.54</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!--M1 Helmet-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_M1Helmet_Vietnam"]/statBases </xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>0.375</ArmorRating_Sharp>
+			<ArmorRating_Blunt>0.143</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.386</ArmorRating_Heat>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_M1Helmet_Vietnam"]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_M1Helmet_Vietnam"]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!--Epic Pizzatime Helmet-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_ProTecPrime_PizzaTime"]/statBases </xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>0.375</ArmorRating_Sharp>
+			<ArmorRating_Blunt>0.143</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.386</ArmorRating_Heat>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_ProTecPrime_PizzaTime"]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_ProTecPrime_PizzaTime"]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!--3M F70-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_3MF70HighCut_Tan"]/statBases </xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.54</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!--TOR-D-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_UaRmsTORD_Tan"]/statBases </xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.54</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!--SF151-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_VestGuardFAST_Black"]/statBases </xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.54</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!--Ops Core FAST Helmets-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_OpsCoreFAST_Tan" or
+			defName="RNApparel_OpsCoreFASTBUMP_Multicam" or
+			defName="RNApparel_OpsCoreFASTCarbon_Grey" or
+			defName="RNApparel_OpsCoreFAST_SF"]/statBases </xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.54</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!--MICH 2000-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_MICH2000_CAG" or
+			defName="RNApparel_MICH2000_AmericanSniper" or
+			defName="RNApparel_ACH_UCP"]/statBases </xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.54</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!--Mk Series-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_Mk6BallisticHelmet_DDPM" or
+			defName="RNApparel_Mk6BallisticHelmet_Olive" or
+			defName="RNApparel_Mk6ABallisticHelmet_Black" or
+			defName="RNApparel_Mk7BallisticHelmet_Tan"]/statBases </xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+			<ArmorRating_Blunt>14</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.54</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!--PASGT Helmets-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_VestGuardPASGT_Black" or
+			defName="RNApparel_PASGT_Tan" or
+			defName="RNApparel_PASGT_ENVO" or
+			defName="RNApparel_LWH_DMARPAT" or
+			defName="RNApparel_VestGuardPASGT_PRESS"]/statBases </xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.54</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!--LZSH 2DTM-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_LZSH2DTM_Olive"]/statBases </xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.54</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!--STSh-81-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_STSh81_Helmet"]/statBases </xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.54</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!--6B48-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_6B48_Helmet"]/statBases </xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.54</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!--EOD-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_MedEngHelmet_EOD9A"]/statBases </xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>10</WornBulk>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.90</ArmorRating_Heat>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_MedEngHelmet_EOD9A"]/apparel/bodyPartGroups </xpath>
+		<value>
+			<bodyPartGroups>
+				<li>FullHead</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_MedEngHelmet_EOD9A"]/costList </xpath>
+		<value>
+			<costList>
+				<Plasteel>10</Plasteel>
+				<DevilstrandCloth>5</DevilstrandCloth>
+				<ComponentIndustrial>2</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<!--Juggernaut-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_Helmet_Juggernaut"]/statBases </xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1.5</WornBulk>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+			<ArmorRating_Blunt>28</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.90</ArmorRating_Heat>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_Helmet_Juggernaut"]/apparel/bodyPartGroups </xpath>
+		<value>
+			<bodyPartGroups>
+				<li>FullHead</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_Helmet_Juggernaut"]/costList </xpath>
+		<value>
+			<costList>
+				<Plasteel>15</Plasteel>
+				<ComponentIndustrial>5</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<!--Riot Helmet-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_SecProHelmet_Riot"]/statBases </xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+			<ArmorRating_Blunt>24</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.54</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!--Galac-Tac Helmet (Fast Helmet?)-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_GalacTacFAST_Tan"]/statBases </xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.54</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!--OpsCoreFAST SF with Night Vision-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_OpsCoreFAST_SF"]/statBases </xpath>
+		<value>
+			<NightVisionEfficiency_Apparel>0.7</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_OpsCoreFAST_SF"]/recipeMaker/researchPrerequisite</xpath>
+		<value>
+         				<researchPrerequisites>
+				<li>Smithing</li>
+				<li>CE_AdvancedNV</li>
+			</researchPrerequisites>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_OpsCoreFAST_SF"]/costList </xpath>
+		<value>
+			<costList>
+				<Plasteel>15</Plasteel>
+				<ComponentIndustrial>5</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<!--========================== Body Armors =====================================-->
+	<!--EOD-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_MedEng_EOD9Suit"]/statBases </xpath>
+		<value>
+			<Bulk>60</Bulk>
+			<WornBulk>20</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_MedEng_EOD9Suit"]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_MedEng_EOD9Suit"]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<!--Stats-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_MedEng_EOD9Suit"]/equippedStatOffsets/MoveSpeed </xpath>
+		<value>
+			<MoveSpeed>-0.75</MoveSpeed>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_MedEng_EOD9Suit"]/equippedStatOffsets </xpath>
+		<value>
+			<WorkSpeedGlobal>-0.25</WorkSpeedGlobal>
+			<MeleeHitChance>-0.25</MeleeHitChance>
+			<AimingDelayFactor>0.15</AimingDelayFactor>
+		</value>
+	</Operation>
+	<!--Costs-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_MedEng_EOD9Suit"]/costList </xpath>
+		<value>
+			<costList>
+				<Plasteel>120</Plasteel>
+				<Uranium>20</Uranium>
+				<DevilstrandCloth>50</DevilstrandCloth>
+				<ComponentIndustrial>10</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<!--Juggernaut Suit-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_MedEng_JuggernautSuit"]/statBases </xpath>
+		<value>
+			<Bulk>50</Bulk>
+			<WornBulk>20</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_MedEng_JuggernautSuit"]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_MedEng_JuggernautSuit"]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>28</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<!--Stats-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_MedEng_JuggernautSuit"]/statBases/Mass </xpath>
+		<value>
+			<Mass>30</Mass>
+			<WorkSpeedGlobal>-0.25</WorkSpeedGlobal>
+			<MeleeHitChance>-0.25</MeleeHitChance>
+			<AimingDelayFactor>0.15</AimingDelayFactor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_MedEng_JuggernautSuit"]/equippedStatOffsets/MoveSpeed </xpath>
+		<value>
+			<MoveSpeed>-1.0</MoveSpeed>
+		</value>
+	</Operation>
+	<!--Costs-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_MedEng_JuggernautSuit"]/costList </xpath>
+		<value>
+			<costList>
+				<Plasteel>120</Plasteel>
+				<Uranium>50</Uranium>
+				<DevilstrandCloth>30</DevilstrandCloth>
+				<ComponentIndustrial>12</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<!--Riot Suit-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_RiotSuit_SecPro"]/statBases/Mass </xpath>
+		<value>
+			<Mass>18</Mass>
+			<Bulk>40</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_RiotSuit_SecPro"]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_RiotSuit_SecPro"]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>26</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_RiotSuit_SecPro"]/apparel/layers </xpath>
+		<value>
+			<layers>
+				<li>Middle</li>
+				<li>Shell</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<!--14mm armors (same sharp value 1.01)-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_FlyyeFCPC_Multicam" or
+			defName="RNApparel_511TacTec_Tan" or
+			defName="RNApparel_DDTGhost_ODGreen" or
+			defName="RNApparel_WarriorDCS_ODGreen" or
+			defName="RNApparel_ENVOVestSystem_Grey" or
+			defName="RNApparel_ViperLazerSOPC_Tan" or
+			defName="RNApparel_PointBlankASPC_Black" or
+			defName="RNApparel_PointBlankFASTC_CoyoteBrown" or
+			defName="RNApparel_LBTMPC_Tan" or
+			defName="RNApparel_LBTG3_Multicam" or
+			defName="RNApparel_AR500Veritas_Brown" or
+			defName="RNApparel_MBCFantom_Black" or
+			defName="RNApparel_PACALVC_Tan" or
+			defName="RNApparel_BristolBodyArmor_Olive" or
+			defName="RNApparel_FirstSpearAACV2_Multicam"]/statBases/Mass </xpath>
+		<value>
+			<Mass>11</Mass>
+			<Bulk>6</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_FlyyeFCPC_Multicam" or
+			defName="RNApparel_511TacTec_Tan" or
+			defName="RNApparel_DDTGhost_ODGreen" or
+			defName="RNApparel_WarriorDCS_ODGreen" or
+			defName="RNApparel_ENVOVestSystem_Grey" or
+			defName="RNApparel_ViperLazerSOPC_Tan" or
+			defName="RNApparel_PointBlankASPC_Black" or
+			defName="RNApparel_PointBlankFASTC_CoyoteBrown" or
+			defName="RNApparel_LBTMPC_Tan" or
+			defName="RNApparel_LBTG3_Multicam" or
+			defName="RNApparel_AR500Veritas_Brown" or
+			defName="RNApparel_MBCFantom_Black" or
+			defName="RNApparel_PACALVC_Tan" or
+			defName="RNApparel_BristolBodyArmor_Olive" or
+			defName="RNApparel_FirstSpearAACV2_Multicam"]/statBases/MaxHitPoints </xpath>
+		<value>
+			<MaxHitPoints>75</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_FlyyeFCPC_Multicam" or
+			defName="RNApparel_511TacTec_Tan" or
+			defName="RNApparel_DDTGhost_ODGreen" or
+			defName="RNApparel_WarriorDCS_ODGreen" or
+			defName="RNApparel_ENVOVestSystem_Grey" or
+			defName="RNApparel_ViperLazerSOPC_Tan" or
+			defName="RNApparel_PointBlankASPC_Black" or
+			defName="RNApparel_PointBlankFASTC_CoyoteBrown" or
+			defName="RNApparel_LBTMPC_Tan" or
+			defName="RNApparel_LBTG3_Multicam" or
+			defName="RNApparel_AR500Veritas_Brown" or
+			defName="RNApparel_MBCFantom_Black" or
+			defName="RNApparel_PACALVC_Tan" or
+			defName="RNApparel_BristolBodyArmor_Olive" or
+			defName="RNApparel_FirstSpearAACV2_Multicam"]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_FlyyeFCPC_Multicam" or
+			defName="RNApparel_511TacTec_Tan" or
+			defName="RNApparel_DDTGhost_ODGreen" or
+			defName="RNApparel_WarriorDCS_ODGreen" or
+			defName="RNApparel_ENVOVestSystem_Grey" or
+			defName="RNApparel_ViperLazerSOPC_Tan" or
+			defName="RNApparel_PointBlankASPC_Black" or
+			defName="RNApparel_PointBlankFASTC_CoyoteBrown" or
+			defName="RNApparel_LBTMPC_Tan" or
+			defName="RNApparel_LBTG3_Multicam" or
+			defName="RNApparel_AR500Veritas_Brown" or
+			defName="RNApparel_MBCFantom_Black" or
+			defName="RNApparel_PACALVC_Tan" or
+			defName="RNApparel_BristolBodyArmor_Olive" or
+			defName="RNApparel_FirstSpearAACV2_Multicam"]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_FlyyeFCPC_Multicam" or
+			defName="RNApparel_511TacTec_Tan" or
+			defName="RNApparel_DDTGhost_ODGreen" or
+			defName="RNApparel_WarriorDCS_ODGreen" or
+			defName="RNApparel_ENVOVestSystem_Grey" or
+			defName="RNApparel_ViperLazerSOPC_Tan" or
+			defName="RNApparel_PointBlankASPC_Black" or
+			defName="RNApparel_PointBlankFASTC_CoyoteBrown" or
+			defName="RNApparel_LBTMPC_Tan" or
+			defName="RNApparel_LBTG3_Multicam" or
+			defName="RNApparel_AR500Veritas_Brown" or
+			defName="RNApparel_MBCFantom_Black" or
+			defName="RNApparel_PACALVC_Tan" or
+			defName="RNApparel_BristolBodyArmor_Olive" or
+			defName="RNApparel_FirstSpearAACV2_Multicam"]/equippedStatOffsets/MoveSpeed </xpath>
+	</Operation>
+
+	<!--16mm (sharp 1.05)-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_OTV_Tan" or
+			defName="RNApparel_IOTV_UCP" or
+			defName="RNApparel_MTV_Tan" or
+			defName="RNApparel_VestguardCT101_Navy" or
+			defName="RNApparel_VestguardQRA_Black" or
+			defName="RNApparel_VestguardQRX_Black" or
+			defName="RNApparel_PASGTVest_Olive" or
+			defName="RNApparel_Defender2_Tan" or
+			defName="RNApparel_GalacTecBodyArmour_Tan" or
+			defName="RNApparel_OspreyMk3_DDPM" or
+			defName="RNApparel_VestguardOT103_Navy"]/statBases/MaxHitPoints </xpath>
+		<value>
+			<MaxHitPoints>115</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_OTV_Tan" or
+			defName="RNApparel_IOTV_UCP" or
+			defName="RNApparel_MTV_Tan" or
+			defName="RNApparel_VestguardCT101_Navy" or
+			defName="RNApparel_VestguardQRA_Black" or
+			defName="RNApparel_VestguardQRX_Black" or
+			defName="RNApparel_PASGTVest_Olive" or
+			defName="RNApparel_Defender2_Tan" or
+			defName="RNApparel_GalacTecBodyArmour_Tan" or
+			defName="RNApparel_OspreyMk3_DDPM" or
+			defName="RNApparel_VestguardOT103_Navy"]/statBases/Mass </xpath>
+		<value>
+			<Mass>13</Mass>
+			<Bulk>6</Bulk>
+			<WornBulk>4</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_OTV_Tan" or
+			defName="RNApparel_IOTV_UCP" or
+			defName="RNApparel_MTV_Tan" or
+			defName="RNApparel_VestguardCT101_Navy" or
+			defName="RNApparel_VestguardQRA_Black" or
+			defName="RNApparel_VestguardQRX_Black" or
+			defName="RNApparel_PASGTVest_Olive" or
+			defName="RNApparel_Defender2_Tan" or
+			defName="RNApparel_GalacTecBodyArmour_Tan" or
+			defName="RNApparel_OspreyMk3_DDPM" or
+			defName="RNApparel_VestguardOT103_Navy"]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_OTV_Tan" or
+			defName="RNApparel_IOTV_UCP" or
+			defName="RNApparel_MTV_Tan" or
+			defName="RNApparel_VestguardCT101_Navy" or
+			defName="RNApparel_VestguardQRA_Black" or
+			defName="RNApparel_VestguardQRX_Black" or
+			defName="RNApparel_PASGTVest_Olive" or
+			defName="RNApparel_Defender2_Tan" or
+			defName="RNApparel_GalacTecBodyArmour_Tan" or
+			defName="RNApparel_OspreyMk3_DDPM" or
+			defName="RNApparel_VestguardOT103_Navy"]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>23</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_OTV_Tan" or
+			defName="RNApparel_IOTV_UCP" or
+			defName="RNApparel_MTV_Tan" or
+			defName="RNApparel_VestguardCT101_Navy" or
+			defName="RNApparel_VestguardQRA_Black" or
+			defName="RNApparel_VestguardQRX_Black" or
+			defName="RNApparel_PASGTVest_Olive" or
+			defName="RNApparel_Defender2_Tan" or
+			defName="RNApparel_GalacTecBodyArmour_Tan" or
+			defName="RNApparel_OspreyMk3_DDPM" or
+			defName="RNApparel_VestguardOT103_Navy"]/equippedStatOffsets/MoveSpeed </xpath>
+	</Operation>
+	<!--18mm (sharp 1.1)-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_PinnacleArmor_DragonSkin"]/statBases/MaxHitPoints </xpath>
+		<value>
+			<MaxHitPoints>160</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_PinnacleArmor_DragonSkin"]/statBases/Mass </xpath>
+		<value>
+			<Mass>20.7</Mass>
+			<Bulk>8</Bulk>
+			<WornBulk>4</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_PinnacleArmor_DragonSkin"]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_PinnacleArmor_DragonSkin"]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>24</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_PinnacleArmor_DragonSkin"]/equippedStatOffsets/MoveSpeed </xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git "a/ModPatches/RH2 Rimmu-Nation\302\262 - Clothing/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Backpacks_CE.xml" "b/ModPatches/RH2 Rimmu-Nation\302\262 - Clothing/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Backpacks_CE.xml"
new file mode 100644
index 0000000000..add3361d47
--- /dev/null
+++ "b/ModPatches/RH2 Rimmu-Nation\302\262 - Clothing/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Backpacks_CE.xml"	
@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RH2_BackpackBase" or @Name="RH2_BackpackMakeableBase"]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>Backpack</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<!-- RemoveCarryCapacity -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName = "RNApparel_Backpack_MOLLE2UCP"
+			or defName = "RNApparel_Backpack_NorthFaceTerra65L"
+			or defName = "RNApparel_Backpack_BerghausVulcanIV"
+			or defName = "RNApparel_Backpack_AzimutSSKangaroo"
+			or defName = "RNApparel_Backpack_LBT0101JJ"
+			or defName = "RNApparel_Backpack_RUSH24BP"
+			or defName = "RNApparel_Backpack_FASTPack"
+			or defName = "RNApparel_Backpack_KeltyRaven2500Pack"
+			or defName = "RNApparel_Backpack_WarriorPegasus"
+			or defName = "RNApparel_Backpack_Motherlode"
+			or defName = "RNApparel_Backpack_Gootium"
+			or defName = "RNApparel_Backpack_OutdoorMaster"
+			or defName = "RNApparel_Backpack_TactixHalfday"
+			or defName = "RNApparel_Backpack_RUSH12BP"
+			or defName = "RNApparel_Backpack_AssaultPack"
+			or defName = "RNApparel_Backpack_NitecoreBP20Pack"
+			or defName = "RNApparel_Backpack_WarriorHelmetCarrier"
+			or defName = "RNApparel_Backpack_BearGryllsBearpac"
+			or defName = "RNApparel_Backpack_WENGERSyngery"
+			or defName = "RNApparel_Backpack_MountainWarehouseMerlin"
+			or defName = "RNApparel_Backpack_AMAPIII"
+			or defName = "RNApparel_Backpack_Tomahawk"
+			or defName = "RNApparel_Backpack_HelloKitty"
+			or defName = "RNApparel_Backpack_TarpBackpack"
+			or defName = "RNApparel_Backpack_AnCHero"
+			or defName = "RNApparel_Backpack_HelikonBailOutBag"
+			or defName = "RNApparel_Backpack_StudentBackpack"
+			or defName = "RNApparel_Backpack_Naotak"
+			or defName = "RNApparel_Backpack_Wasing"
+			or defName = "RNApparel_Backpack_FANDARESling"
+			or defName = "RNApparel_Backpack_Level1PUBG"
+			]/equippedStatOffsets/CarryingCapacity </xpath>
+	</Operation>
+
+	<!-- Sling / Ultralight Pack -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_Wasing"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+		</value>
+	</Operation>
+
+	<!-- Light Pack -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_StudentBackpack" or defName ="RNApparel_Backpack_Naotak" or defName ="RNApparel_Backpack_FANDARESling" or defName ="RNApparel_Backpack_Level1PUBG"]/statBases</xpath>
+		<value>
+			<Bulk>2.5</Bulk>
+		</value>
+	</Operation>
+
+	<!-- Medium Light Pack -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName = "RNApparel_Backpack_BearGryllsBearpac"
+			or defName = "RNApparel_Backpack_WENGERSyngery"
+			or defName = "RNApparel_Backpack_MountainWarehouseMerlin"
+			or defName = "RNApparel_Backpack_AMAPIII"
+			or defName = "RNApparel_Backpack_Tomahawk"
+			or defName = "RNApparel_Backpack_HelloKitty"
+			or defName = "RNApparel_Backpack_TarpBackpack"
+			or defName = "RNApparel_Backpack_AnCHero"
+			or defName = "RNApparel_RNApparel_Backpack_HelikonBailOutBag"
+			]/statBases </xpath>
+		<value>
+			<Bulk>3</Bulk>
+		</value>
+	</Operation>
+
+	<!-- Medium Pack -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName = "RNApparel_Backpack_Motherlode"
+			or defName = "RNApparel_Backpack_Gootium"
+			or defName = "RNApparel_Backpack_OutdoorMaster"
+			or defName = "RNApparel_Backpack_TactixHalfday"
+			or defName = "RNApparel_Backpack_RUSH12BP"
+			or defName = "RNApparel_Backpack_AssaultPack"
+			or defName = "RNApparel_Backpack_NitecoreBP20Pack"
+			or defName = "RNApparel_Backpack_WarriorHelmetCarrier"
+			]/statBases </xpath>
+		<value>
+			<Bulk>4</Bulk>
+		</value>
+	</Operation>
+
+	<!-- Medium Heavy Pack -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName = "RNApparel_Backpack_RUSH24BP"
+			or defName = "RNApparel_Backpack_FASTPack"
+			or defName = "RNApparel_Backpack_KeltyRaven2500Pack"
+			or defName = "RNApparel_Backpack_WarriorPegasus"
+			]/statBases </xpath>
+		<value>
+			<Bulk>10</Bulk>
+		</value>
+	</Operation>
+
+	<!-- Heavy Light Pack -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_LBT0101JJ"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+		</value>
+	</Operation>
+
+	<!-- Heavy Pack -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName = "RNApparel_Backpack_MOLLE2UCP"
+			or defName = "RNApparel_Backpack_NorthFaceTerra65L"
+			or defName = "RNApparel_Backpack_BerghausVulcanIV"
+			or defName = "RNApparel_Backpack_AzimutSSKangaroo"
+			]/statBases </xpath>
+		<value>
+			<Bulk>20</Bulk>
+		</value>
+	</Operation>
+
+	<!-- == CarryBulk == -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_Wasing"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>20</CarryBulk>
+		</value>
+	</Operation>
+
+	<!-- Light Pack -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_StudentBackpack"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>25</CarryBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_Naotak"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>27.5</CarryBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_FANDARESling"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>30</CarryBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_Level1PUBG"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>32.5</CarryBulk>
+		</value>
+	</Operation>
+
+	<!-- Medium Light Pack -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName = "RNApparel_Backpack_BearGryllsBearpac"
+			or defName = "RNApparel_Backpack_WENGERSyngery"
+			or defName = "RNApparel_Backpack_MountainWarehouseMerlin"
+			]/equippedStatOffsets </xpath>
+		<value>
+			<CarryBulk>34</CarryBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_AMAPIII" or defName = "RNApparel_Backpack_Tomahawk"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>33</CarryBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_HelloKitty" or defName = "RNApparel_Backpack_TarpBackpack"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>32</CarryBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_AnCHero" or defName = "RNApparel_Backpack_HelikonBailOutBag"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>30</CarryBulk>
+		</value>
+	</Operation>
+
+	<!-- Medium Pack -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName = "RNApparel_Backpack_Motherlode"
+			or defName = "RNApparel_Backpack_OutdoorMaster"
+			or defName = "RNApparel_Backpack_RUSH12BP"
+			or defName = "RNApparel_Backpack_AssaultPack"
+			or defName = "RNApparel_Backpack_NitecoreBP20Pack"
+			or defName = "RNApparel_Backpack_WarriorHelmetCarrier"
+			]/equippedStatOffsets </xpath>
+		<value>
+			<CarryBulk>35</CarryBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_Gootium" or defName = "RNApparel_Backpack_TactixHalfday"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>37.5</CarryBulk>
+		</value>
+	</Operation>
+
+	<!-- Medium Heavy Pack -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName = "RNApparel_Backpack_RUSH24BP"
+			or defName = "RNApparel_Backpack_FASTPack"
+			or defName = "RNApparel_Backpack_KeltyRaven2500Pack"
+			or defName = "RNApparel_Backpack_WarriorPegasus"
+			]/equippedStatOffsets </xpath>
+		<value>
+			<CarryingCapacity>5</CarryingCapacity>
+			<CarryBulk>40</CarryBulk>
+		</value>
+	</Operation>
+
+	<!-- Heavy Light Pack -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_LBT0101JJ"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryingCapacity>10</CarryingCapacity>
+			<CarryBulk>47.5</CarryBulk>
+		</value>
+	</Operation>
+
+	<!-- Heavy Pack -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_MOLLE2UCP"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryingCapacity>30</CarryingCapacity>
+			<CarryBulk>60</CarryBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_AzimutSSKangaroo" or defName = "RNApparel_Backpack_BerghausVulcanIV"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryingCapacity>25</CarryingCapacity>
+			<CarryBulk>60</CarryBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_NorthFaceTerra65L"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryingCapacity>20</CarryingCapacity>
+			<CarryBulk>55</CarryBulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git "a/ModPatches/RH2 Rimmu-Nation\302\262 - Clothing/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Bandana_Balaclava_Scarf.xml" "b/ModPatches/RH2 Rimmu-Nation\302\262 - Clothing/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Bandana_Balaclava_Scarf.xml"
new file mode 100644
index 0000000000..bee47fcf62
--- /dev/null
+++ "b/ModPatches/RH2 Rimmu-Nation\302\262 - Clothing/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Bandana_Balaclava_Scarf.xml"	
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === Bandana === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_ColdWar_Bandana" or
+			defName="RNApparel_Shemagh_Bandana"]/costStuffCount </xpath>
+		<value>
+			<costStuffCount>20</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_Shemagh_511BlazeWrap"]/costStuffCount </xpath>
+		<value>
+			<costStuffCount>20</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_PUBG_Bandana"]/costStuffCount </xpath>
+		<value>
+			<costStuffCount>20</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_ColdWar_Bandana" or
+			defName="RNApparel_Shemagh_Bandana"]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+			<Bulk>0.5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_Shemagh_511BlazeWrap"]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+			<Bulk>0.5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_PUBG_Bandana"]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+			<Bulk>0.5</Bulk>
+		</value>
+	</Operation>
+
+	<!-- === Balaclava === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_Balaclava_EXF"
+			or defName="RNApparel_Balaclava_511M"
+			or defName="RNApparel_Balaclava_AikuerSkull"
+			or defName="RNApparel_Balaclava_Highlander"
+			or defName="RNApparel_Balaclava_CheekiBreeki"
+			or defName="RNApparel_Balaclava_Reaper"
+			or defName="RNApparel_Balaclava_Clown"
+			]/costStuffCount </xpath>
+		<value>
+			<costStuffCount>20</costStuffCount>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_Balaclava_EXF"
+			or defName="RNApparel_Balaclava_511M"
+			or defName="RNApparel_Balaclava_AikuerSkull"
+			or defName="RNApparel_Balaclava_Highlander"
+			or defName="RNApparel_Balaclava_CheekiBreeki"
+			or defName="RNApparel_Balaclava_Reaper"
+			or defName="RNApparel_Balaclava_Clown"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<Bulk>0.5</Bulk>
+			<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_Balaclava_EXF"
+			or defName="RNApparel_Balaclava_511M"
+			or defName="RNApparel_Balaclava_AikuerSkull"
+			or defName="RNApparel_Balaclava_Highlander"
+			or defName="RNApparel_Balaclava_CheekiBreeki"
+			or defName="RNApparel_Balaclava_Reaper"
+			or defName="RNApparel_Balaclava_Clown"]/apparel/layers </xpath>
+		<value>
+			<layers>
+				<li>OnHead</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_Balaclava_EXF"
+			or defName="RNApparel_Balaclava_511M"
+			or defName="RNApparel_Balaclava_AikuerSkull"
+			or defName="RNApparel_Balaclava_Highlander"
+			or defName="RNApparel_Balaclava_CheekiBreeki"
+			or defName="RNApparel_Balaclava_Reaper"
+			or defName="RNApparel_Balaclava_Clown"
+			]/apparel/bodyPartGroups </xpath>
+		<value>
+			<bodyPartGroups>
+				<li>UpperHead</li>
+				<li>Teeth</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<!--Hats-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_Beanie_Beechfield"
+			or defName="RNApparel_BaseballCap_511Tactical"
+			or defName="RNApparel_BoonieHat_Bushmaster"
+			or defName="RNApparel_BoonieHat_MILTEC"
+			or defName="RNApparel_TrenchCoatHood_PUBG"
+			or defName="RNApparel_Beanie_Skullcap"
+			or defName="RNApparel_FedoraHat_Generic"
+			or defName="RNApparel_Beret_RUMilitary"
+			or defName="RNApparel_GunslingerHat_Generic"]/apparel/layers </xpath>
+		<value>
+			<layers>
+				<li>Overhead</li>
+			</layers>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git "a/ModPatches/RH2 Rimmu-Nation\302\262 - Clothing/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Jacket_Rimmu.xml" "b/ModPatches/RH2 Rimmu-Nation\302\262 - Clothing/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Jacket_Rimmu.xml"
new file mode 100644
index 0000000000..01b30876b9
--- /dev/null
+++ "b/ModPatches/RH2 Rimmu-Nation\302\262 - Clothing/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Jacket_Rimmu.xml"	
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_Overcoat_Generic"
+			or defName="RNApparel_SuitJacket_Generic"
+			or defName="RNApparel_TrenchCoat_Detective"
+			or defName="RNApparel_VestJacket_Generic"
+			or defName="RNApparel_BikerJacket_Generic"
+			or defName="RNApparel_SuedeJacket_Generic"
+			or defName="RNApparel_CombatJacket_Generic"
+			or defName="RNApparel_GunslingerJacket_Generic"
+			]/costStuffCount </xpath>
+		<value>
+			<costStuffCount>50</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_Overcoat_Generic"
+			or defName="RNApparel_SuitJacket_Generic"
+			or defName="RNApparel_TrenchCoat_Detective"
+			or defName="RNApparel_VestJacket_Generic"
+			or defName="RNApparel_BikerJacket_Generic"
+			or defName="RNApparel_SuedeJacket_Generic"
+			or defName="RNApparel_CombatJacket_Generic"
+			or defName="RNApparel_GunslingerJacket_Generic"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RHApparel_PUTrenchCoat_PUBG"
+			or defName="RHApparel_TrenchCoat_Vigilante"
+			or defName="RHApparel_TrenchCoat_PUBG"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
+			<Bulk>7.5</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_FieldParka_Generic"
+			or defName="RNApparel_VintageParka_Generic"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5.5</StuffEffectMultiplierArmor>
+			<Bulk>6.5</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git "a/ModPatches/RH2 Rimmu-Nation\302\262 - Clothing/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Pantsu_Rimmu.xml" "b/ModPatches/RH2 Rimmu-Nation\302\262 - Clothing/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Pantsu_Rimmu.xml"
new file mode 100644
index 0000000000..c762449ffe
--- /dev/null
+++ "b/ModPatches/RH2 Rimmu-Nation\302\262 - Clothing/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Pantsu_Rimmu.xml"	
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_Pants_511Stryke"
+			or defName="RNApparel_Pants_BlackhawkPursuit"
+			or defName="RNApparel_Pants_HelikonPilgrim"
+			or defName="RNApparel_Pants_511StrykeMulticam"
+			or defName="RNApparel_Pants_FjallravenKeb"
+			or defName="RNApparel_Pants_BearGryllsSurvivor"
+			or defName="RNApparel_Pants_GORKA3Pants"
+			or defName="RNApparel_Jeans_Generic"
+			or defName="RNApparel_Pants_ACUUCP"
+			or defName="RNApparel_Pants_BDUDMARPAT"
+			or defName="RNApparel_Pants_CombatsDDPM"
+			or defName="RNApparel_Pants_SuitBrioni"
+			]/statBases/Flammability </xpath>
+		<value>
+			<Flammability>0.6</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_Pants_511Stryke"
+			or defName="RNApparel_Pants_BlackhawkPursuit"
+			or defName="RNApparel_Pants_HelikonPilgrim"
+			or defName="RNApparel_Pants_511StrykeMulticam"
+			or defName="RNApparel_Pants_FjallravenKeb"
+			or defName="RNApparel_Pants_BearGryllsSurvivor"
+			or defName="RNApparel_Pants_GORKA3Pants"
+			or defName="RNApparel_Jeans_Generic"
+			or defName="RNApparel_Pants_ACUUCP"
+			or defName="RNApparel_Pants_BDUDMARPAT"
+			or defName="RNApparel_Pants_CombatsDDPM"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_Pants_SuitBrioni"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.75</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_Pants_511Stryke"
+			or defName="RNApparel_Pants_BlackhawkPursuit"
+			or defName="RNApparel_Pants_HelikonPilgrim"
+			or defName="RNApparel_Pants_511StrykeMulticam"
+			or defName="RNApparel_Pants_FjallravenKeb"
+			or defName="RNApparel_Pants_BearGryllsSurvivor"
+			or defName="RNApparel_Pants_GORKA3Pants"
+			or defName="RNApparel_Jeans_Generic"
+			or defName="RNApparel_Pants_ACUUCP"
+			or defName="RNApparel_Pants_BDUDMARPAT"
+			or defName="RNApparel_Pants_CombatsDDPM"
+			]/costStuffCount </xpath>
+		<value>
+			<costStuffCount>45</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_Pants_SuitBrioni"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>35</costStuffCount>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git "a/ModPatches/RH2 Rimmu-Nation\302\262 - Clothing/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Respirators_Rimmu.xml" "b/ModPatches/RH2 Rimmu-Nation\302\262 - Clothing/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Respirators_Rimmu.xml"
new file mode 100644
index 0000000000..cfc77a0a80
--- /dev/null
+++ "b/ModPatches/RH2 Rimmu-Nation\302\262 - Clothing/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Respirators_Rimmu.xml"	
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName = "RNApparel_Gasmask_P1944WWI"
+			or defName = "RNApparel_Gasmask_S6NBC"
+			or defName = "RNApparel_Gasmask_S10NBC"
+			or defName = "RNApparel_Gasmask_GP5Soviet"
+			or defName = "RNApparel_Gasmask_M1Yugoslavian"
+			or defName = "RNApparel_Gasmask_MSAMillenium"
+			]/statBases </xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "RNApparel_Gasmask_P1944WWI"
+			or defName = "RNApparel_Gasmask_S6NBC"
+			or defName = "RNApparel_Gasmask_S10NBC"
+			or defName = "RNApparel_Gasmask_GP5Soviet"
+			or defName = "RNApparel_Gasmask_M1Yugoslavian"
+			or defName = "RNApparel_Gasmask_MSAMillenium"
+			]/equippedStatOffsets </xpath>
+		<value>
+			<equippedStatOffsets>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "RNApparel_Gasmask_P1944WWI"
+			or defName = "RNApparel_Gasmask_S6NBC"
+			or defName = "RNApparel_Gasmask_S10NBC"
+			or defName = "RNApparel_Gasmask_GP5Soviet"
+			or defName = "RNApparel_Gasmask_M1Yugoslavian"
+			or defName = "RNApparel_Gasmask_MSAMillenium"
+			]/apparel/layers </xpath>
+		<value>
+			<layers>
+				<li>StrappedHead</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[
+			defName = "RNApparel_Gasmask_P1944WWI"
+			or defName = "RNApparel_Gasmask_S6NBC"
+			or defName = "RNApparel_Gasmask_S10NBC"
+			or defName = "RNApparel_Gasmask_M1Yugoslavian"
+			or defName = "RNApparel_Gasmask_MSAMillenium"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.ApparelHediffExtension">
+				<hediff>WearingGasMask</hediff>
+			</li>
+			<li Class="CombatExtended.ApperalRenderingExtension">
+				<HideHair>false</HideHair>
+				<HideBeard>true</HideBeard>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName = "RNApparel_Gasmask_GP5Soviet"]</xpath>
+		<value>
+			<li Class="CombatExtended.ApparelHediffExtension">
+				<hediff>WearingGasMask</hediff>
+			</li>
+			<li Class="CombatExtended.ApperalRenderingExtension">
+				<HideHair>true</HideHair>
+				<HideBeard>true</HideBeard>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "RNApparel_Gasmask_P1944WWI"
+			or defName = "RNApparel_Gasmask_S6NBC"
+			or defName = "RNApparel_Gasmask_S10NBC"
+			or defName = "RNApparel_Gasmask_GP5Soviet"
+			or defName = "RNApparel_Gasmask_M1Yugoslavian"
+			or defName = "RNApparel_Gasmask_MSAMillenium"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName = "RNApparel_Gasmask_P1944WWI"
+			or defName = "RNApparel_Gasmask_S6NBC"
+			or defName = "RNApparel_Gasmask_S10NBC"
+			or defName = "RNApparel_Gasmask_GP5Soviet"
+			or defName = "RNApparel_Gasmask_M1Yugoslavian"
+			or defName = "RNApparel_Gasmask_MSAMillenium"
+			]/recipeMaker </xpath>
+		<value>
+			<skillRequirements>
+				<Crafting>8</Crafting>
+			</skillRequirements>
+			<unfinishedThingDef>UnfinishedTechArmor</unfinishedThingDef>
+			<recipeUsers>
+				<li>TableMachining</li>
+			</recipeUsers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "RNApparel_Gasmask_P1944WWI"
+			or defName = "RNApparel_Gasmask_S6NBC"
+			or defName = "RNApparel_Gasmask_S10NBC"
+			or defName = "RNApparel_Gasmask_GP5Soviet"
+			or defName = "RNApparel_Gasmask_M1Yugoslavian"
+			or defName = "RNApparel_Gasmask_MSAMillenium"
+			]/costList </xpath>
+		<value>
+			<costList>
+				<ComponentIndustrial>2</ComponentIndustrial>
+				<Chemfuel>10</Chemfuel>
+			</costList>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git "a/ModPatches/RH2 Rimmu-Nation\302\262 - Clothing/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Shirt_Rimmu.xml" "b/ModPatches/RH2 Rimmu-Nation\302\262 - Clothing/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Shirt_Rimmu.xml"
new file mode 100644
index 0000000000..47f2ec1317
--- /dev/null
+++ "b/ModPatches/RH2 Rimmu-Nation\302\262 - Clothing/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Shirt_Rimmu.xml"	
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_UBACShirt_511RapidAssault"
+			or defName="RNApparel_Jacket_GORKA3Jacket"
+			or defName="RNApparel_Shirt_BlackhawkPursuit"
+			or defName="RNApparel_FlightSuit_Brandit"
+			or defName="RNApparel_UBACShirt_DDPM"
+			or defName="RNApparel_UBACShirt_CryeG2Uniform"
+			]/statBases/Flammability </xpath>
+		<value>
+			<Flammability>0.6</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_TankTop_Generic"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>16</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_ButtonShirt_Generic" or defName="RNApparel_HawaiianShirt_Generic"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>25</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_TankTop_Generic"
+			or defName="RNApparel_ButtonShirt_Generic"
+			or defName="RNApparel_HawaiianShirt_Generic"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_TacticalJacket_TACVASEN"
+			or defName="RNApparel_NorweiganShirt_Pullover"
+			or defName="RNApparel_PoloShirt_511Tactical"
+			or defName="RNApparel_DesignerShirt_Boss"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.25</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_Hoodie_FruitOfTheLoom"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_UBACShirt_511RapidAssault"
+			or defName="RNApparel_Jacket_GORKA3Jacket"
+			or defName="RNApparel_FlightSuit_Brandit"
+			or defName="RNApparel_ACU_UCP"
+			or defName="RNApparel_BDU_DMARPAT"
+			or defName="RNApparel_UBACShirt_DDPM"
+			or defName="RNApparel_UBACShirt_CryeG2Uniform"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_Shirt_BlackhawkPursuit"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.3</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git "a/ModPatches/RH2 Rimmu-Nation\302\262 - Clothing/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Vests_CE.xml" "b/ModPatches/RH2 Rimmu-Nation\302\262 - Clothing/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Vests_CE.xml"
new file mode 100644
index 0000000000..26635676e3
--- /dev/null
+++ "b/ModPatches/RH2 Rimmu-Nation\302\262 - Clothing/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Vests_CE.xml"	
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "RHApparel_M56Webbing_Vietnam" or
+			defName = "RHApparel_ALICEWebbing_ColdWar" or
+			defName = "RHApparel_RRV_ChestRig" or
+			defName = "RHApparel_USMC_ChestRig" or
+			defName = "RHApparel_CondorRecon_ChestRig" or
+			defName = "RHApparel_CryeAVSTan_ChestRig" or
+			defName = "RHApparel_MilTec_ChestRig" or
+			defName = "RHApparel_WarriorFalcon_ChestRig" or
+			defName = "RHApparel_Type56Webbing_ColdWar" or
+			defName = "RHApparel_Type63Webbing_ColdWar" or
+			defName = "RHApparel_M23_ChestRig" or
+			defName = "RHApparel_KulaMongoose_ChestRig" or
+			defName = "RHApparel_Arktis_TacticalVest"
+			]/apparel/layers </xpath>
+		<value>
+			<layers>
+				<li>Webbing</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "RHApparel_M56Webbing_Vietnam" or
+			defName = "RHApparel_ALICEWebbing_ColdWar" or
+			defName = "RHApparel_RRV_ChestRig" or
+			defName = "RHApparel_USMC_ChestRig" or
+			defName = "RHApparel_CondorRecon_ChestRig" or
+			defName = "RHApparel_CryeAVSTan_ChestRig" or
+			defName = "RHApparel_MilTec_ChestRig" or
+			defName = "RHApparel_WarriorFalcon_ChestRig" or
+			defName = "RHApparel_Type56Webbing_ColdWar" or
+			defName = "RHApparel_Type63Webbing_ColdWar" or
+			defName = "RHApparel_M23_ChestRig" or
+			defName = "RHApparel_KulaMongoose_ChestRig" or
+			defName = "RHApparel_Arktis_TacticalVest"
+			]/apparel/bodyPartGroups </xpath>
+		<value>
+			<bodyPartGroups>
+				<li>Shoulders</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<!-- In case of body group change for belts I guess -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "RHApparel_SuperBelt_Tan" or
+			defName = "RHApparel_VTACBattleBelt_Tan" or
+			defName = "RHApparel_CondorBattleBelt_Tan" or
+			defName = "RHApparel_TexShoemakerPoliceBelt_Python" or
+			defName = "RHApparel_SafarilandPoliceBelt_Beretta" or
+			defName = "RHApparel_SafarilandPoliceBelt_Glock" or
+			defName = "RHApparel_MaxpeditionBattleBelt_Olive"
+			]/apparel/layers
+		</xpath>
+		<value>
+			<layers>
+				<li>Webbing</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<!-- Bulk -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName = "RHApparel_M56Webbing_Vietnam" or
+			defName = "RHApparel_ALICEWebbing_ColdWar" or
+			defName = "RHApparel_RRV_ChestRig" or
+			defName = "RHApparel_USMC_ChestRig" or
+			defName = "RHApparel_CondorRecon_ChestRig" or
+			defName = "RHApparel_CryeAVSTan_ChestRig" or
+			defName = "RHApparel_MilTec_ChestRig" or
+			defName = "RHApparel_WarriorFalcon_ChestRig" or
+			defName = "RHApparel_CondorBattleBelt_Tan" or
+			defName = "RHApparel_VTACBattleBelt_Tan" or
+			defName = "RHApparel_Type56Webbing_ColdWar" or
+			defName = "RHApparel_Type63Webbing_ColdWar" or
+			defName = "RHApparel_M23_ChestRig" or
+			defName = "RHApparel_KulaMongoose_ChestRig" or
+			defName = "RHApparel_Arktis_TacticalVest" or
+			defName = "RHApparel_TexShoemakerPoliceBelt_Python" or
+			defName = "RHApparel_SafarilandPoliceBelt_Beretta" or
+			defName = "RHApparel_SafarilandPoliceBelt_Glock" or
+			defName = "RHApparel_MaxpeditionBattleBelt_Olive"
+			]/statBases
+		</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/ThingDef[
+			defName = "RHApparel_SuperBelt_Tan"]/statBases
+		</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- == Equipped Offsets == -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName = "RHApparel_M56Webbing_Vietnam" or
+			defName = "RHApparel_ALICEWebbing_ColdWar" or
+			defName = "RHApparel_RRV_ChestRig" or
+			defName = "RHApparel_USMC_ChestRig" or
+			defName = "RHApparel_CondorRecon_ChestRig" or
+			defName = "RHApparel_CryeAVSTan_ChestRig" or
+			defName = "RHApparel_MilTec_ChestRig" or
+			defName = "RHApparel_WarriorFalcon_ChestRig" or
+			defName = "RHApparel_CondorBattleBelt_Tan" or
+			defName = "RHApparel_VTACBattleBelt_Tan" or
+			defName = "RHApparel_Type56Webbing_ColdWar" or
+			defName = "RHApparel_Type63Webbing_ColdWar" or
+			defName = "RHApparel_M23_ChestRig" or
+			defName = "RHApparel_KulaMongoose_ChestRig" or
+			defName = "RHApparel_Arktis_TacticalVest" or
+			defName = "RHApparel_TexShoemakerPoliceBelt_Python" or
+			defName = "RHApparel_SafarilandPoliceBelt_Beretta" or
+			defName = "RHApparel_SafarilandPoliceBelt_Glock" or
+			defName = "RHApparel_MaxpeditionBattleBelt_Olive"
+			]/equippedStatOffsets
+		</xpath>
+		<value>
+			<CarryBulk>25</CarryBulk>
+			<ReloadSpeed>0.1</ReloadSpeed>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "RHApparel_SuperBelt_Tan"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>15</CarryBulk>
+			<ReloadSpeed>0.1</ReloadSpeed>
+		</value>
+	</Operation>
+
+	<!-- RemoveCarryWeight -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName = "RHApparel_M56Webbing_Vietnam" or
+			defName = "RHApparel_ALICEWebbing_ColdWar" or
+			defName = "RHApparel_RRV_ChestRig" or
+			defName = "RHApparel_USMC_ChestRig" or
+			defName = "RHApparel_CondorRecon_ChestRig" or
+			defName = "RHApparel_CryeAVSTan_ChestRig" or
+			defName = "RHApparel_MilTec_ChestRig" or
+			defName = "RHApparel_WarriorFalcon_ChestRig" or
+			defName = "RHApparel_Type56Webbing_ColdWar" or
+			defName = "RHApparel_Type63Webbing_ColdWar" or
+			defName = "RHApparel_M23_ChestRig" or
+			defName = "RHApparel_KulaMongoose_ChestRig" or
+			defName = "RHApparel_Arktis_TacticalVest"
+			]/equippedStatOffsets/CarryingCapacity </xpath>
+	</Operation>
+
+	<!-- RemoveFlamm -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName = "RHApparel_M56Webbing_Vietnam" or
+			defName = "RHApparel_ALICEWebbing_ColdWar" or
+			defName = "RHApparel_RRV_ChestRig" or
+			defName = "RHApparel_USMC_ChestRig" or
+			defName = "RHApparel_CondorRecon_ChestRig" or
+			defName = "RHApparel_CryeAVSTan_ChestRig" or
+			defName = "RHApparel_MilTec_ChestRig" or
+			defName = "RHApparel_WarriorFalcon_ChestRig" or
+			defName = "RHApparel_Type56Webbing_ColdWar" or
+			defName = "RHApparel_Type63Webbing_ColdWar" or
+			defName = "RHApparel_M23_ChestRig" or
+			defName = "RHApparel_KulaMongoose_ChestRig" or
+			defName = "RHApparel_Arktis_TacticalVest"
+			]/statBases/Flammability </xpath>
+	</Operation>
+
+	<!-- RemoveAim -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName = "RHApparel_M56Webbing_Vietnam" or
+			defName = "RHApparel_ALICEWebbing_ColdWar" or
+			defName = "RHApparel_RRV_ChestRig" or
+			defName = "RHApparel_USMC_ChestRig" or
+			defName = "RHApparel_CondorRecon_ChestRig" or
+			defName = "RHApparel_CryeAVSTan_ChestRig" or
+			defName = "RHApparel_MilTec_ChestRig" or
+			defName = "RHApparel_WarriorFalcon_ChestRig" or
+			defName = "RHApparel_Type56Webbing_ColdWar" or
+			defName = "RHApparel_Type63Webbing_ColdWar" or
+			defName = "RHApparel_M23_ChestRig" or
+			defName = "RHApparel_KulaMongoose_ChestRig" or
+			defName = "RHApparel_Arktis_TacticalVest"
+			]/equippedStatOffsets/AimingDelayFactor </xpath>
+	</Operation>
+
+	<!-- RemoveSpeed -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName = "RHApparel_M56Webbing_Vietnam" or
+			defName = "RHApparel_ALICEWebbing_ColdWar" or
+			defName = "RHApparel_RRV_ChestRig" or
+			defName = "RHApparel_USMC_ChestRig" or
+			defName = "RHApparel_CondorRecon_ChestRig" or
+			defName = "RHApparel_CryeAVSTan_ChestRig" or
+			defName = "RHApparel_MilTec_ChestRig" or
+			defName = "RHApparel_WarriorFalcon_ChestRig" or
+			defName = "RHApparel_Type56Webbing_ColdWar" or
+			defName = "RHApparel_Type63Webbing_ColdWar" or
+			defName = "RHApparel_M23_ChestRig" or
+			defName = "RHApparel_KulaMongoose_ChestRig" or
+			defName = "RHApparel_Arktis_TacticalVest"
+			]/equippedStatOffsets/MoveSpeed </xpath>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git "a/ModPatches/RH2 Rimmu-Nation\302\262 - Security/Defs/RH2 Rimmu-Nation\302\262 - Security/152mmBGM71.xml" "b/ModPatches/RH2 Rimmu-Nation\302\262 - Security/Defs/RH2 Rimmu-Nation\302\262 - Security/152mmBGM71.xml"
new file mode 100644
index 0000000000..a94f8822a2
--- /dev/null
+++ "b/ModPatches/RH2 Rimmu-Nation\302\262 - Security/Defs/RH2 Rimmu-Nation\302\262 - Security/152mmBGM71.xml"	
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>AmmoBGM71</defName>
+		<label>BGM-71 Missile</label>
+		<parent>AmmoRockets</parent>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_BGM71</defName>
+		<label>BGM-71D Missiles</label>
+		<ammoTypes>
+			<Ammo_BGM71_HEAT>Bullet_BGM71_HEAT</Ammo_BGM71_HEAT>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="BGM71Base" ParentName="HeavyAmmoBase" Abstract="True">
+		<description>152mm Anti-tank guided missiles, typically reserved for destroying armoured targets due to its rarity, but can be used for engaging soft targets should a mysterious foreign benefactor supply you with thousands of these free of charge.</description>
+		<statBases>
+			<MaxHitPoints>200</MaxHitPoints>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade_Sellable</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoBGM71</li>
+		</thingCategories>
+		<stackLimit>10</stackLimit>
+		<cookOffFlashScale>30</cookOffFlashScale>
+		<cookOffSound>MortarBomb_Explode</cookOffSound>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BGM71Base">
+		<defName>Ammo_BGM71_HEAT</defName>
+		<label>BGM-71D Missile (HEAT)</label>
+		<graphicData>
+			<texPath>Things/Ammo/RPG/RPG32_Thermobaric</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<drawSize>1.65</drawSize>
+		</graphicData>
+		<statBases>
+			<MarketValue>232.27</MarketValue>
+			<Mass>21.5</Mass>
+			<Bulk>36.17</Bulk>
+		</statBases>
+		<ammoClass>RocketHEAT</ammoClass>
+		<detonateProjectile>Bullet_BGM71_HEAT</detonateProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="BaseRPG7Grenade">
+		<defName>Bullet_BGM71_HEAT</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>BGM-71D Missile (HEAT)</label>
+		<graphicData>
+			<texPath>Things/Building/Security/TOW_MissileLauncher/TOW_2B</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>69</speed>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>400</damageAmountBase>
+			<armorPenetrationSharp>900</armorPenetrationSharp>
+			<armorPenetrationBlunt>151.584</armorPenetrationBlunt>
+			<soundAmbient>RocketPropelledLoop_Small</soundAmbient>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>300</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>2.5</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>20</Fragment_Large>
+					<Fragment_Small>50</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_BGM71_HEAT</defName>
+		<label>make BGM-71 HEAT Missile</label>
+		<description>Craft 1 BGM-71 HEAT Missiles.</description>
+		<jobString>Making BGM-71 HEAT Missiles.</jobString>
+		<workAmount>11000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>64</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>FSX</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_BGM71_HEAT>1</Ammo_BGM71_HEAT>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git "a/ModPatches/RH2 Rimmu-Nation\302\262 - Security/Patches/RH2 Rimmu-Nation\302\262 - Security/Rimmu2_CE_Security_MG.xml" "b/ModPatches/RH2 Rimmu-Nation\302\262 - Security/Patches/RH2 Rimmu-Nation\302\262 - Security/Rimmu2_CE_Security_MG.xml"
new file mode 100644
index 0000000000..fe634a389c
--- /dev/null
+++ "b/ModPatches/RH2 Rimmu-Nation\302\262 - Security/Patches/RH2 Rimmu-Nation\302\262 - Security/Rimmu2_CE_Security_MG.xml"	
@@ -0,0 +1,483 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Mounted M60 Gun ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RN2Gun_M60Mounted_GPMG</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.19</SwayFactor>
+			<Bulk>13.70</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.11</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>65</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>RNShotM60LMG</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>6.8</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RN2Gun_M60Mounted_MG"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>66</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RN2Gun_M60Mounted_MG"]/statBases</xpath>
+		<value>
+			<statBases>
+				<Mass>12</Mass>
+				<MaxHitPoints>120</MaxHitPoints>
+				<Flammability>0.5</Flammability>
+				<WorkToBuild>40000</WorkToBuild>
+				<Beauty>-20</Beauty>
+			</statBases>
+		</value>
+	</Operation>
+
+	<!-- ========== Mounted M2HB Gun ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RN2Gun_M2Browning</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.59</SwayFactor>
+			<Bulk>18.54</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.25</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>RNShot_M2Browning</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RN2Gun_M2Browning_MG"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>75</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RN2Gun_M2Browning_MG"]/statBases</xpath>
+		<value>
+			<statBases>
+				<Mass>58</Mass>
+				<MaxHitPoints>150</MaxHitPoints>
+				<Flammability>0.5</Flammability>
+				<WorkToBuild>60000</WorkToBuild>
+				<Beauty>-30</Beauty>
+			</statBases>
+		</value>
+	</Operation>
+
+	<!-- ========== Mounted M134 Gun ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RN2Gun_M134Minigun</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<Bulk>8.02</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.58</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.6</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<burstShotCount>300</burstShotCount>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<muzzleFlashScale>10</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1500</magazineSize>
+			<reloadTime>9.2</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>150</aimedBurstShotCount>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RN2Gun_M134Minigun_MG"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>75</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RN2Gun_M134Minigun_MG"]/statBases</xpath>
+		<value>
+			<statBases>
+				<Mass>39</Mass>
+				<MaxHitPoints>150</MaxHitPoints>
+				<Flammability>0.5</Flammability>
+				<WorkToBuild>65000</WorkToBuild>
+				<Beauty>-30</Beauty>
+			</statBases>
+		</value>
+	</Operation>
+
+	<!-- ========== Mounted Mk 19 Turret ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RN2Gun_MK19_GrenadeLauncher</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.49</SwayFactor>
+			<Bulk>12.90</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.67</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_40x53mmGrenade_HE</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<minRange>6</minRange>
+			<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
+			<burstShotCount>6</burstShotCount>
+			<soundCast>RNShot_MK19GrenadeLauncher</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<muzzleFlashScale>16</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>48</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_40x53mmGrenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RN2Gun_MK19_GL"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>75</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RN2Gun_MK19_GL"]/statBases</xpath>
+		<value>
+			<statBases>
+				<Mass>35.2</Mass>
+				<MaxHitPoints>150</MaxHitPoints>
+				<Flammability>0.5</Flammability>
+				<WorkToBuild>62000</WorkToBuild>
+				<Beauty>-30</Beauty>
+			</statBases>
+		</value>
+	</Operation>
+
+	<!-- ========== TOW launcher ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RN2Gun_TOW_MissileLauncher</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>2.5</RangedWeapon_Cooldown>
+			<SightsEfficiency>4.50</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>2.0</SwayFactor>
+			<Bulk>12.90</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BGM71_HEAT</defaultProjectile>
+			<warmupTime>4.0</warmupTime>
+			<ai_AvoidFriendlyFireRadius>3</ai_AvoidFriendlyFireRadius>
+			<range>120</range>
+			<minRange>6</minRange>
+			<soundCast>RNShot_TOWLauncher</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<muzzleFlashScale>16</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>9.9</reloadTime>
+			<ammoSet>AmmoSet_BGM71</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RN2Gun_TOW_Launcher"]/statBases</xpath>
+		<value>
+			<statBases>
+				<Mass>41</Mass>
+				<MaxHitPoints>150</MaxHitPoints>
+				<Flammability>0.5</Flammability>
+				<WorkToBuild>60000</WorkToBuild>
+				<Beauty>-20</Beauty>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RN2Gun_TOW_Launcher"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>150</Steel>
+				<ComponentIndustrial>10</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<!-- ========== M134 Sentry Gun ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RN2Gun_SentryGun</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.31</SwayFactor>
+			<Bulk>8.02</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.59</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>2.1</warmupTime>
+			<range>65</range>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<burstShotCount>300</burstShotCount>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1500</magazineSize>
+			<reloadTime>9.2</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RN2Turret_SentryGun"]</xpath>
+		<value>
+			<specialDisplayRadius>65</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RN2Turret_SentryGun"]/statBases</xpath>
+		<value>
+			<statBases>
+				<MaxHitPoints>150</MaxHitPoints>
+				<Flammability>0.7</Flammability>
+				<WorkToBuild>75500</WorkToBuild>
+				<Mass>50</Mass>
+				<Beauty>-20</Beauty>
+				<AimingAccuracy>0.30</AimingAccuracy>
+				<ShootingAccuracyTurret>0.6</ShootingAccuracyTurret>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "RN2Turret_SentryGun"]/comps/li[@Class="CompProperties_Power"]</xpath>
+		<value>
+			<li Class="CompProperties_Power">
+				<compClass>CompPowerTrader</compClass>
+				<basePowerConsumption>900</basePowerConsumption>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "RN2Turret_SentryGun"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>0.56</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<!-- == Shared patches == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "RN2Turret_SentryGun" or
+			defName = "RN2Gun_M60Mounted_MG" or
+			defName = "RN2Gun_M134Minigun_MG" or
+			defName = "RN2Gun_MK19_GL" or
+			defName = "RN2Gun_TOW_Launcher" or
+			defName = "RN2Gun_M2Browning_MG"]/fillPercent </xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RN2Gun_M60Mounted_MG"
+			or defName="RN2Gun_M2Browning_MG"
+			or defName="RN2Gun_M134Minigun_MG"
+			or defName="RN2Gun_MK19_GL"
+			or defName="RN2Gun_TOW_Launcher"]/statBases </xpath>
+		<value>
+			<ShootingAccuracyTurret>2.0</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RN2Turret_SentryGun"
+			or defName="RN2Gun_M60Mounted_MG"
+			or defName="RN2Gun_M2Browning_MG"
+			or defName="RN2Gun_M134Minigun_MG"
+			or defName="RN2Gun_MK19_GL"
+			or defName="RN2Gun_TOW_Launcher"]/thingClass </xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="RN2Turret_SentryGun" or
+			defName="RN2Gun_M60Mounted_MG" or
+			defName="RN2Gun_M2Browning_MG" or
+			defName="RN2Gun_M134Minigun_MG" or
+			defName="RN2Gun_MK19_GL" or
+			defName="RN2Gun_TOW_Launcher"
+			]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RN2Gun_M2Browning_MG" or
+			defName="RN2Gun_M134Minigun_MG" or
+			defName="RN2Gun_MK19_GL"
+			]/researchPrerequisites </xpath>
+		<value>
+			<researchPrerequisites>
+				<li>CE_TurretHeavyWeapons</li>
+			</researchPrerequisites>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RN2Gun_TOW_Launcher"]/researchPrerequisites</xpath>
+		<value>
+			<researchPrerequisites>
+				<li>CE_TurretHeavyWeapons</li>
+				<li>CE_Launchers</li>
+			</researchPrerequisites>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RN2Turret_SentryGun"
+			]/researchPrerequisites </xpath>
+		<value>
+			<researchPrerequisites>
+				<li>CE_TurretHeavyWeapons</li>
+				<li>CE_HeavyTurret</li>
+			</researchPrerequisites>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git "a/ModPatches/RH2 Rimmu-Nation\302\262 - Security/Patches/RH2 Rimmu-Nation\302\262 - Security/Rimmu2_CE_mortars.xml" "b/ModPatches/RH2 Rimmu-Nation\302\262 - Security/Patches/RH2 Rimmu-Nation\302\262 - Security/Rimmu2_CE_mortars.xml"
new file mode 100644
index 0000000000..8fc9b269f1
--- /dev/null
+++ "b/ModPatches/RH2 Rimmu-Nation\302\262 - Security/Patches/RH2 Rimmu-Nation\302\262 - Security/Rimmu2_CE_mortars.xml"	
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Remove RH2 60mm Mortar Shell === -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RN2Shell_60mmShell_HighExplosive"]</xpath>
+	</Operation>
+
+	<!-- === Patch Base === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name = "RN2_BaseArtilleryBuilding"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name = "RN2_BaseArtilleryBuilding"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>2.0</turretBurstCooldownTime>
+			<spawnedConceptLearnOpportunity>CE_MortarDirectFire</spawnedConceptLearnOpportunity>
+		</value>
+	</Operation>
+
+	<!-- === Mortar === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RN2Artillery_M2Mortar"]</xpath>
+		<value>
+			<statBases>
+				<SightsEfficiency>0.5</SightsEfficiency>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RN2Artillery_M2Mortar"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>30</li>
+					<li>50</li>
+					<li>70</li>
+					<li>90</li>
+				</chargeSpeeds>
+			</li>
+			<li Class="CombatExtended.CompProperties_AmmoUser">
+				<magazineSize>1</magazineSize>
+				<reloadTime>3.8</reloadTime>
+				<ammoSet>AmmoSet_60mmMortarShell</ammoSet>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RN2Artillery_M2Mortar"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+					<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_60mmMortarShell_HE</defaultProjectile>
+					<warmupTime>4.0</warmupTime>
+					<minRange>16</minRange>
+					<range>500</range>
+					<burstShotCount>1</burstShotCount>
+					<soundCast>RNShot_M224Mortar</soundCast>
+					<muzzleFlashScale>16</muzzleFlashScale>
+					<circularError>1</circularError>
+					<indirectFirePenalty>0.2</indirectFirePenalty>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RN2Artillery_M2Mortar"]/weaponTags</xpath>
+		<value>
+			<weaponTags>
+				<li>TurretGun</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+	<!-- === Turret === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RN2Turret_M2Mortar"]</xpath>
+		<value>
+			<tradeTags>
+				<li>CE_Turret</li>
+			</tradeTags>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git "a/ModPatches/RH2 Rimmu-Nation\302\262 - Security/Patches/RH2 Rimmu-Nation\302\262 - Security/ThingDefs_CE_IED.xml" "b/ModPatches/RH2 Rimmu-Nation\302\262 - Security/Patches/RH2 Rimmu-Nation\302\262 - Security/ThingDefs_CE_IED.xml"
new file mode 100644
index 0000000000..75c38dc393
--- /dev/null
+++ "b/ModPatches/RH2 Rimmu-Nation\302\262 - Security/Patches/RH2 Rimmu-Nation\302\262 - Security/ThingDefs_CE_IED.xml"	
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- C4 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "RN2Explosive_C4Charge"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>2</Steel>
+				<ComponentIndustrial>2</ComponentIndustrial>
+				<FSX>6</FSX>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RN2Explosive_C4Charge"]/comps/li[@Class="CompProperties_Explosive"]</xpath>
+		<value>
+			<li Class="CompProperties_Explosive">
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>5.5</explosiveRadius>
+				<wickTicks>
+					<min>5</min>
+					<max>30</max>
+				</wickTicks>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "RN2Explosive_C4IED"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>2</Steel>
+				<ComponentIndustrial>2</ComponentIndustrial>
+				<FSX>9</FSX>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RN2Explosive_C4IED"]/comps/li[@Class="CompProperties_Explosive"]</xpath>
+		<value>
+			<li Class="CompProperties_Explosive">
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>7.5</explosiveRadius>
+				<wickTicks>
+					<min>5</min>
+					<max>30</max>
+				</wickTicks>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- 155mm IED -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "RN2Explosive_155mmIED"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>40</Steel>
+				<ComponentIndustrial>2</ComponentIndustrial>
+				<FSX>8</FSX>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RN2Explosive_155mmIED"]/comps/li[@Class="CompProperties_Explosive"]</xpath>
+		<value>
+			<li Class="CompProperties_Explosive">
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>6.5</explosiveRadius>
+				<wickTicks>
+					<min>5</min>
+					<max>30</max>
+				</wickTicks>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>40</Fragment_Large>
+					<Fragment_Small>80</Fragment_Small>
+				</fragments>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Claymore -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "RN2Explosive_M18Claymore"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>30</Steel>
+				<ComponentIndustrial>1</ComponentIndustrial>
+				<FSX>4</FSX>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RN2Explosive_M18Claymore"]/comps/li[@Class="CompProperties_Explosive"]</xpath>
+		<value>
+			<li Class="CompProperties_Explosive">
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>3</explosiveRadius>
+				<wickTicks>
+					<min>5</min>
+					<max>30</max>
+				</wickTicks>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>100</Fragment_Small>
+				</fragments>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RN2Explosive_M18Claymore"]/comps/li[@Class="ChickenExplosives.CompProperties_ProjectileSprayer"]</xpath>
+	</Operation>
+
+	<!--  Mines -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "RN2Explosive_YM1B_APMine"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>20</Steel>
+				<ComponentIndustrial>1</ComponentIndustrial>
+				<FSX>2</FSX>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RN2Explosive_YM1B_APMine"]/comps/li[@Class="CompProperties_Explosive"]</xpath>
+		<value>
+			<li Class="CompProperties_Explosive">
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>3.5</explosiveRadius>
+				<startWickHitPointsPercent>0.2</startWickHitPointsPercent>
+				<wickTicks>5</wickTicks>
+				<startWickOnDamageTaken>
+					<li>Bullet</li>
+					<li>Arrow</li>
+					<li>ArrowHighVelocity</li>
+				</startWickOnDamageTaken>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>4</Fragment_Large>
+					<Fragment_Small>40</Fragment_Small>
+				</fragments>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git "a/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_Axes_CE.xml" "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_Axes_CE.xml"
new file mode 100644
index 0000000000..a61c27025f
--- /dev/null
+++ "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_Axes_CE.xml"	
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- RimmuNaysh Y'all -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_USMC_Tomahawk"
+			or defName="RNMeleeWeapon_Gerber_Tomahawk"
+			or defName="RNMeleeWeapon_Roughneck_Handaxe"
+			or defName="RNMeleeWeapon_GerberSurvival_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>20</power>
+					<cooldownTime>1.64</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.72</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_USMC_Tomahawk"
+			or defName="RNMeleeWeapon_Gerber_Tomahawk"
+			or defName="RNMeleeWeapon_Roughneck_Handaxe"
+			or defName="RNMeleeWeapon_GerberSurvival_Axe"]/statBases </xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_USMC_Tomahawk"
+			or defName="RNMeleeWeapon_Gerber_Tomahawk"
+			or defName="RNMeleeWeapon_Roughneck_Handaxe"
+			or defName="RNMeleeWeapon_GerberSurvival_Axe"]/equippedStatOffsets </xpath>
+		<value>
+			<MeleeCritChance>0.10</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+			<MeleeDodgeChance>0.20</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_USMC_Tomahawk"
+			or defName="RNMeleeWeapon_Gerber_Tomahawk"
+			or defName="RNMeleeWeapon_Roughneck_Handaxe"
+			or defName="RNMeleeWeapon_GerberSurvival_Axe"]/weaponTags </xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- Shitty ax -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Fire_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>22</power>
+					<cooldownTime>2.1</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.64</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_DMMFly_IceAxe"]/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>1.7</cooldownTime>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.48</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.78</cooldownTime>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.08</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Felling_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>24</power>
+					<cooldownTime>2.5</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.7</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Fire_Axe" or defName="RNMeleeWeapon_Felling_Axe"or defName="RNMeleeWeapon_DMMFly_IceAxe"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Fire_Axe" or defName="RNMeleeWeapon_Felling_Axe"or defName="RNMeleeWeapon_DMMFly_IceAxe"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.10</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+			<MeleeDodgeChance>0.20</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Fire_Axe" or defName="RNMeleeWeapon_Felling_Axe"or defName="RNMeleeWeapon_DMMFly_IceAxe"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git "a/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_BoltAction.xml" "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_BoltAction.xml"
new file mode 100644
index 0000000000..9a57b83b28
--- /dev/null
+++ "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_BoltAction.xml"	
@@ -0,0 +1,707 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== C14 Timberwolf ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_C14Timberwolf_Sniper</defName>
+		<statBases>
+			<Mass>7.10</Mass>
+			<RangedWeapon_Cooldown>1.24</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.96</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.64</SwayFactor>
+			<Bulk>13.00</Bulk>
+			<WorkToMake>36000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>70</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
+			<warmupTime>1.75</warmupTime>
+			<range>80</range>
+			<soundCast>RNShot_GenericBoltSniper_II</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_338Lapua</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Desert Tech HTI ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_DesertTechHTI_AMR</defName>
+		<statBases>
+			<Mass>9.09</Mass>
+			<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.72</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.86</SwayFactor>
+			<Bulk>12.52</Bulk>
+			<WorkToMake>40000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>80</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>3.6</warmupTime>
+			<range>86</range>
+			<soundCast>RNShot_Generic50Bolt</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== GOL Magnum ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_GOLMagnum_Sniper</defName>
+		<statBases>
+			<Mass>6.00</Mass>
+			<RangedWeapon_Cooldown>1.24</RangedWeapon_Cooldown>
+			<SightsEfficiency>3.20</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.67</SwayFactor>
+			<Bulk>13.30</Bulk>
+			<WorkToMake>33500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>65</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_300WinchesterMagnum_FMJ</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>75</range>
+			<soundCast>RNShotGOL</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_300WinchesterMagnum</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== L96A1 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_L96A1_Sniper</defName>
+		<statBases>
+			<Mass>6.50</Mass>
+			<RangedWeapon_Cooldown>1.24</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.6</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.32</SwayFactor>
+			<Bulk>12.80</Bulk>
+			<WorkToMake>30500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>65</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.4</warmupTime>
+			<range>75</range>
+			<soundCast>RNShot_L96A1Sn</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Lee Enfield ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_LeeEnfield_BoltAction</defName>
+		<statBases>
+			<Mass>4.19</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.62</SwayFactor>
+			<Bulk>12.60</Bulk>
+			<WorkToMake>12000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>55</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>RNShot_BoltActionOldie</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_303British</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Ultra ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_MannlicherUltraLight_Sniper</defName>
+		<statBases>
+			<Mass>2.7</Mass>
+			<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.60</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.29</SwayFactor>
+			<Bulk>11.92</Bulk>
+			<WorkToMake>29000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>55</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<soundCast>RNShot_BoltGenericSD</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>6</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>4</magazineSize>
+			<reloadTime>3.8</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Mannlicher Schoenauer ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_MannlicherSchoenauer_Sniper</defName>
+		<statBases>
+			<Mass>4</Mass>
+			<RangedWeapon_Cooldown>1.26</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.60</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.56</SwayFactor>
+			<Bulk>12.26</Bulk>
+			<WorkToMake>25000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>55</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.4</warmupTime>
+			<range>75</range>
+			<soundCast>RNShot_GenericBoltSniper</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== M24A2 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M24A2_Sniper</defName>
+		<statBases>
+			<Mass>7.10</Mass>
+			<RangedWeapon_Cooldown>1.24</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.60</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.35</SwayFactor>
+			<Bulk>11.92</Bulk>
+			<WorkToMake>30000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>65</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.4</warmupTime>
+			<range>75</range>
+			<soundCast>RNShot_GenericBoltSniper</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== M40A5 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M40A5_Sniper</defName>
+		<statBases>
+			<Mass>7.50</Mass>
+			<RangedWeapon_Cooldown>1.24</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.72</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.40</SwayFactor>
+			<Bulk>12.24</Bulk>
+			<WorkToMake>30000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>65</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.4</warmupTime>
+			<range>75</range>
+			<soundCast>RNShotM40Sniper</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== SV-98 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_SV98_Sniper</defName>
+		<statBases>
+			<Mass>6.80</Mass>
+			<RangedWeapon_Cooldown>1.24</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.60</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.39</SwayFactor>
+			<Bulk>13.00</Bulk>
+			<WorkToMake>29000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>65</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1.4</warmupTime>
+			<range>75</range>
+			<soundCast>RNShotSV98</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Intervention AMR ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M200Intervention_AMR</defName>
+		<statBases>
+			<Mass>15.20</Mass>
+			<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>3.32</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>2.06</SwayFactor>
+			<Bulk>12.87</Bulk>
+			<WorkToMake>42500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>110</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_408CheyenneTactical_FMJ</defaultProjectile>
+			<warmupTime>2.4</warmupTime>
+			<range>86</range>
+			<soundCast>RNShotIntervention</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_408CheyenneTactical</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>Bipod_AMR</li>
+			<li>CE_AI_SR</li>
+		</weaponTags>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Kar98k ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Kar98k</defName>
+		<statBases>
+			<Mass>4.10</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.56</SwayFactor>
+			<Bulk>11.10</Bulk>
+			<WorkToMake>15000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>86</range>
+			<soundCast>RNShot_BoltActionOldie</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== M700 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M700SAICS_Sniper</defName>
+		<statBases>
+			<Mass>7.50</Mass>
+			<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.72</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.40</SwayFactor>
+			<Bulk>12.24</Bulk>
+			<WorkToMake>31500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>65</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.9</warmupTime>
+			<range>75</range>
+			<soundCast>RNShot_SRSSD</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Mosin Nagant ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_MosinNagant</defName>
+		<statBases>
+			<Mass>4.00</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.21</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.67</SwayFactor>
+			<Bulk>12.32</Bulk>
+			<WorkToMake>15500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>55</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1.275</warmupTime>
+			<range>75</range>
+			<soundCast>RNShot_BoltActionOldie</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNGun_C14Timberwolf_Sniper" or
+			defName="RNGun_DesertTechHTI_AMR" or
+			defName="RNGun_GOLMagnum_Sniper" or
+			defName="RNGun_MannlicherUltraLight_Sniper" or
+			defName="RNGun_MannlicherSchoenauer_Sniper" or
+			defName="RNGun_L96A1_Sniper" or
+			defName="RNGun_LeeEnfield_BoltAction" or
+			defName="RNGun_M24A2_Sniper" or
+			defName="RNGun_M40A5_Sniper" or
+			defName="RNGun_SV98_Sniper" or
+			defName="RNGun_M200Intervention_AMR" or
+			defName="RNGun_Kar98k" or
+			defName="RNGun_MosinNagant" or
+			defName="RNGun_M700SAICS_Sniper"
+			]/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>
+</Patch>
\ No newline at end of file
diff --git "a/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_BullpupAR.xml" "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_BullpupAR.xml"
new file mode 100644
index 0000000000..78508e9477
--- /dev/null
+++ "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_BullpupAR.xml"	
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Steyr AUG A2 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_AUGA1_Rifle</defName>
+		<statBases>
+			<Mass>3.60</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.5</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.31</SwayFactor>
+			<Bulk>7.90</Bulk>
+			<WorkToMake>35000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>45</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.41</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>48</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShotAUG</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.0</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== FAMAS ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_FAMAS_Rifle</defName>
+		<statBases>
+			<Mass>3.61</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.31</SwayFactor>
+			<Bulk>7.57</Bulk>
+			<WorkToMake>30000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>45</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.44</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericBullpup_II</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>4.0</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>Bipod_Rifle</li>
+		</weaponTags>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== L85A2 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_SA80A2_Rifle</defName>
+		<statBases>
+			<Mass>3.82</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.5</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.29</SwayFactor>
+			<Bulk>7.85</Bulk>
+			<WorkToMake>35000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.41</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>48</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericBullpup</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.0</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNGun_AUGA1_Rifle" or
+			defName="RNGun_FAMAS_Rifle" or
+			defName="RNGun_SA80A2_Rifle"
+			]/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>
+</Patch>
\ No newline at end of file
diff --git "a/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_DMR.xml" "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_DMR.xml"
new file mode 100644
index 0000000000..486a55040f
--- /dev/null
+++ "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_DMR.xml"	
@@ -0,0 +1,709 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Dragunov SVD ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_DragunovSVD_DMR</defName>
+		<statBases>
+			<Mass>4.30</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.70</SwayFactor>
+			<Bulk>12.25</Bulk>
+			<WorkToMake>23000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>60</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<soundCast>RNShotDragunov</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== OTs-03 SVU ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_SVU_DMR</defName>
+		<statBases>
+			<Mass>4.10</Mass>
+			<RangedWeapon_Cooldown>0.57</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>0.92</SwayFactor>
+			<Bulk>9.70</Bulk>
+			<WorkToMake>31000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>97</range>
+			<soundCast>RNShot_DMRSDGeneric_II</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== SKS DMR ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_SKSModern_DMR</defName>
+		<statBases>
+			<Mass>3.85</Mass>
+			<RangedWeapon_Cooldown>0.57</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.01</SwayFactor>
+			<Bulk>10.18</Bulk>
+			<WorkToMake>29000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>48</range>
+			<soundCast>RNShotSKS</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== PSL54 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_PSL54_DMR</defName>
+		<statBases>
+			<Mass>4.30</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.70</SwayFactor>
+			<Bulk>12.25</Bulk>
+			<WorkToMake>23000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>60</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<soundCast>RNShotDragunov</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Heckler & Koch G28 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_G28_DMR</defName>
+		<statBases>
+			<Mass>5.80</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.48</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.47</SwayFactor>
+			<Bulk>10.65</Bulk>
+			<WorkToMake>29000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>60</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<soundCast>RNShot_GenericDMR</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>Bipod_DMR</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== L129A1 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_L129A1_DMR</defName>
+		<statBases>
+			<Mass>4.50</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.36</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.50</SwayFactor>
+			<Bulk>9.00</Bulk>
+			<WorkToMake>29000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>55</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<soundCast>RNShot_GenericDMR</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>Bipod_DMR</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== M14 DMR ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M14_DMR</defName>
+		<statBases>
+			<Mass>6.10</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.57</SwayFactor>
+			<Bulk>12.18</Bulk>
+			<WorkToMake>24000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>60</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<soundCast>RNShot_EBRGeneric</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>Bipod_DMR</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Barrett M82A1 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M82A1_AMR</defName>
+		<statBases>
+			<Mass>13.50</Mass>
+			<RangedWeapon_Cooldown>0.68</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.84</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.92</SwayFactor>
+			<Bulk>13.00</Bulk>
+			<WorkToMake>38500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>105</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>3.6</warmupTime>
+			<range>86</range>
+			<soundCast>RNShot50Cal</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>Bipod_ATR</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Mk 14 EBR ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Mk14Mod0_DMR</defName>
+		<statBases>
+			<Mass>6.75</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.60</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.89</SwayFactor>
+			<Bulk>8.89</Bulk>
+			<WorkToMake>33500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>70</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.6</warmupTime>
+			<range>75</range>
+			<soundCast>RNShot_EBRGeneric</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Desert Tech SRS ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_DesertTechSRS_DMR</defName>
+		<statBases>
+			<Mass>5.6</Mass>
+			<RangedWeapon_Cooldown>1.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>3.50</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.14</SwayFactor>
+			<Bulk>10.52</Bulk>
+			<WorkToMake>47000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>60</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
+			<warmupTime>2.55</warmupTime>
+			<range>86</range>
+			<soundCast>RNShot_SRSSD</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_338Lapua</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>Bipod_DMR</li>
+			<li>CE_AI_SR</li>
+		</weaponTags>
+
+		<!-- No additional CE weaponTags needed -->
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Heckler & Koch PSG-1 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_PSG1_DMR</defName>
+		<statBases>
+			<Mass>7.20</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.36</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.7</SwayFactor>
+			<Bulk>12.30</Bulk>
+			<WorkToMake>31000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>65</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<soundCast>RNShotPSG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>Bipod_DMR</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== VSS Vintorez ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_VSSVintorez_DMR</defName>
+		<statBases>
+			<Mass>2.60</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.29</SwayFactor>
+			<Bulk>8.94</Bulk>
+			<WorkToMake>25500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Chemfuel>5</Chemfuel>
+			<Steel>45</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.94</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>40</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShotVSSVintorez</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Walther WA 2000 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_WA2000_DMR</defName>
+		<statBases>
+			<Mass>7.51</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.70</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.47</SwayFactor>
+			<Bulk>9.05</Bulk>
+			<WorkToMake>42000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>60</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_300WinchesterMagnum_FMJ</defaultProjectile>
+			<warmupTime>1.4</warmupTime>
+			<range>75</range>
+			<soundCast>RNShotPSG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_300WinchesterMagnum</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>Bipod_DMR</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Mk 14 EBR ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Mk14EBRSD_DMR</defName>
+		<statBases>
+			<Mass>6.75</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.60</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.89</SwayFactor>
+			<Bulk>8.89</Bulk>
+			<WorkToMake>33500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>70</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.6</warmupTime>
+			<range>75</range>
+			<soundCast>RNShot_DMRSDGeneric_II</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNGun_DragunovSVD_DMR" or
+			defName="RNGun_PSL54_DMR" or
+			defName="RNGun_G28_DMR" or
+			defName="RNGun_L129A1_DMR" or
+			defName="RNGun_M14_DMR" or
+			defName="RNGun_M82A1_AMR" or
+			defName="RNGun_PSG1_DMR" or
+			defName="RNGun_VSSVintorez_DMR" or
+			defName="RNGun_WA2000_DMR" or
+			defName="RNGun_SVU_DMR" or
+			defName="RNGun_Mk14Mod0_DMR" or
+			defName="RNGun_SKSModern_DMR" or
+			defName="RNGun_DesertTechSRS_DMR" or
+			defName="RNGun_Mk14EBRSD_DMR"
+			]/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>
+</Patch>
\ No newline at end of file
diff --git "a/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_GrenadeDeletus.xml" "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_GrenadeDeletus.xml"
new file mode 100644
index 0000000000..3afc0ab91c
--- /dev/null
+++ "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_GrenadeDeletus.xml"	
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Remove Grenades and their projectiles ========== -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RNThrown_M84Stun_Grenade" or defName="RNThrown_RGD5HEGrenade"]</xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git "a/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_LMG.xml" "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_LMG.xml"
new file mode 100644
index 0000000000..f905e69582
--- /dev/null
+++ "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_LMG.xml"	
@@ -0,0 +1,500 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== FN MAG ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_FNMAG_GPMG</defName>
+		<statBases>
+			<Mass>11.80</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.72</SwayFactor>
+			<Bulk>15.63</Bulk>
+			<WorkToMake>41000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>100</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.21</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.45</warmupTime>
+			<range>67</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>RNShotM240B</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>Bipod_LMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Ksp 58 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Ksp58B_GPMG</defName>
+		<statBases>
+			<Mass>11.80</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.71</SwayFactor>
+			<Bulk>15.63</Bulk>
+			<WorkToMake>41000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>100</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.21</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>67</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>RNShotM240B</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>Bipod_LMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== M60 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M60_GPMG</defName>
+		<statBases>
+			<Mass>10.50</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.51</SwayFactor>
+			<Bulk>14.05</Bulk>
+			<WorkToMake>40500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>85</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.30</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>62</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>RNShotM60LMG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_MachineGun</li>
+			<li>Bipod_LMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== M249 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M249_LMG</defName>
+		<statBases>
+			<Mass>7.50</Mass>
+			<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.34</SwayFactor>
+			<Bulk>13.35</Bulk>
+			<WorkToMake>42000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>70</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>60</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNShotL86LMG</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>Bipod_LMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== PKM ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_PKM_GPMG</defName>
+		<statBases>
+			<Mass>7.50</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.37</SwayFactor>
+			<Bulk>14.92</Bulk>
+			<WorkToMake>36000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>80</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.45</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<soundCast>RNShotM240B</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_MachineGun</li>
+			<li>Bipod_LMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== RPD ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_RPD_LMG</defName>
+		<statBases>
+			<Mass>7.40</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.24</SwayFactor>
+			<Bulk>13.37</Bulk>
+			<WorkToMake>35000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>70</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.24</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>48</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShotRPD</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_MachineGun</li>
+			<li>Bipod_SAW</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== T81 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Type81_LMG</defName>
+		<statBases>
+			<Mass>7.40</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.24</SwayFactor>
+			<Bulk>13.37</Bulk>
+			<WorkToMake>35000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>70</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.24</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>48</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShotRPD</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_MachineGun</li>
+			<li>Bipod_SAW</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== RPK-74 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_RPK_LMG</defName>
+		<statBases>
+			<Mass>4.80</Mass>
+			<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.2</SwayFactor>
+			<Bulk>12.40</Bulk>
+			<WorkToMake>29500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>65</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.11</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>55</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNShotRPK</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>75</magazineSize>
+			<reloadTime>4.8</reloadTime>
+			<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_MachineGun</li>
+			<li>Bipod_SAW</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- MG-42 -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_MG42_GPMG</defName>
+		<statBases>
+			<Mass>11.6</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.67</SwayFactor>
+			<Bulk>12.20</Bulk>
+			<WorkToMake>41000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>120</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+			<WoodLog>5</WoodLog>
+		</costList>
+		<Properties>
+			<recoilAmount>1.47</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>62</range>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<burstShotCount>12</burstShotCount>
+			<soundCast>RNShot_AN94</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>250</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>6</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_MachineGun</li>
+			<li>Bipod_LMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNGun_FNMAG_GPMG" or
+			defName="RNGun_Ksp58B_GPMG" or
+			defName="RNGun_M60_GPMG" or
+			defName="RNGun_M249_LMG" or
+			defName="RNGun_PKM_GPMG" or
+			defName="RNGun_RPD_LMG" or
+			defName="RNGun_Type81_LMG" or
+			defName="RNGun_MG42_GPMG" or
+			defName="RNGun_RPK_LMG"
+			]/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>
+</Patch>
\ No newline at end of file
diff --git "a/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Launchers.xml" "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Launchers.xml"
new file mode 100644
index 0000000000..7f457e8e0a
--- /dev/null
+++ "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Launchers.xml"	
@@ -0,0 +1,364 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Heckler & Koch HK69A1 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_HK69A1_GrenadeLauncher</defName>
+		<statBases>
+			<Mass>2.60</Mass>
+			<RangedWeapon_Cooldown>0.94</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.94</SwayFactor>
+			<Bulk>4.63</Bulk>
+			<WorkToMake>11500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>44</range>
+			<minRange>5</minRange>
+			<soundCast>RNShotGL</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== M79 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M79_GrenadeLauncher</defName>
+		<statBases>
+			<Mass>2.70</Mass>
+			<RangedWeapon_Cooldown>0.93</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.00</SwayFactor>
+			<Bulk>7.31</Bulk>
+			<WorkToMake>9000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+			<WoodLog>10</WoodLog>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>44</range>
+			<minRange>5</minRange>
+			<soundCast>RNShotGL</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== M72 LAW ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M72LAW_RocketLauncher</defName>
+		<statBases>
+			<MarketValue>35.72</MarketValue>
+			<Mass>2.50</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.24</SwayFactor>
+			<Bulk>7.30</Bulk>
+			<WorkToMake>12000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+			<FSX>3</FSX>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_M72LAW</defaultProjectile>
+			<warmupTime>1.9</warmupTime>
+			<range>31</range>
+			<minRange>2</minRange>
+			<soundCast>RNShotLauncher</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>15</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== RPG-7 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_RPG7_RocketLauncher</defName>
+		<statBases>
+			<Mass>7.00</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.16</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.68</SwayFactor>
+			<Bulk>10.50</Bulk>
+			<WorkToMake>25500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>70</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_RPG7Grenade_HEAT</defaultProjectile>
+			<warmupTime>2.035</warmupTime>
+			<range>40</range>
+			<minRange>3</minRange>
+			<soundCast>RNShotRPG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>15</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>8.6</reloadTime>
+			<ammoSet>AmmoSet_RPG7Grenade</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== MBT LAW / NLAW ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_NLAW_RocketLauncher</defName>
+		<statBases>
+			<Mass>12.50</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>2.27</SwayFactor>
+			<Bulk>11.16</Bulk>
+			<WorkToMake>30500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>20</Chemfuel>
+			<Steel>75</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+			<FSX>9</FSX>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_150mmMBTLAWMissile</defaultProjectile>
+			<warmupTime>1.8</warmupTime>
+			<range>48</range>
+			<ticksBetweenBurstShots>20</ticksBetweenBurstShots>
+			<soundCast>RNShotLauncher</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>15</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== FGM-148 Javelin ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_FGM148Javelin_RocketLauncher</defName>
+		<statBases>
+			<Mass>22.30</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.72</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>3.55</SwayFactor>
+			<Bulk>13.00</Bulk>
+			<WorkToMake>41500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>135</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+			<FSX>15</FSX>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_127mmJavelinMissile</defaultProjectile>
+			<warmupTime>2.5</warmupTime>
+			<range>156</range>
+			<soundCast>RNShotLauncher</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>15</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<!-- RH2 Weapons version of FGM-148 Javelin is single-use only -->
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNGun_HK69A1_GrenadeLauncher" or
+			defName="RNGun_M79_GrenadeLauncher"
+			]/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="RNGun_M72LAW_RocketLauncher" or
+			defName="RNGun_RPG7_RocketLauncher" or
+			defName="RNGun_NLAW_RocketLauncher" or
+			defName="RNGun_FGM148Javelin_RocketLauncher"
+			]/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>
+</Patch>
\ No newline at end of file
diff --git "a/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Pistols.xml" "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Pistols.xml"
new file mode 100644
index 0000000000..6c7297ae5e
--- /dev/null
+++ "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Pistols.xml"	
@@ -0,0 +1,965 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== FuckiN Five-seveN ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_FiveSeven_Pistol</defName>
+		<statBases>
+			<Mass>0.61</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.90</SwayFactor>
+			<Bulk>2.08</Bulk>
+			<WorkToMake>7500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>20</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShotFiveSeven</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_FN57x28mm</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== STK100 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_STK100_Pistol</defName>
+		<statBases>
+			<Mass>0.81</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>0.83</SwayFactor>
+			<Bulk>1.86</Bulk>
+			<WorkToMake>7500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>20</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShotGlock17</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>17</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Glock 17 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Glock17_Pistol</defName>
+		<statBases>
+			<Mass>0.63</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.83</SwayFactor>
+			<Bulk>1.86</Bulk>
+			<WorkToMake>7500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>20</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShotGlock17</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>17</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Glock 18 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Glock18_Pistol</defName>
+		<statBases>
+			<Mass>0.63</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>1.86</Bulk>
+			<WorkToMake>13000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>20</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<recoilAmount>1.94</recoilAmount>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>RNShotGlock17</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>17</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Glock 34 Combat Master ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Glock34CombatMaster_Pistol</defName>
+		<statBases>
+			<Mass>0.66</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>0.96</SwayFactor>
+			<Bulk>2.23</Bulk>
+			<WorkToMake>7500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>20</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>13</range>
+			<soundCast>RNShotPistol_II</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>17</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+
+	</Operation>
+
+	<!-- ========== HS2000 / XD / XDM / XD-S ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_SpringfieldXD_Pistol</defName>
+		<statBases>
+			<Mass>0.65</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>0.8</SwayFactor>
+			<Bulk>1.60</Bulk>
+			<WorkToMake>7500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>20</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShot_SpringfieldXD</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>13</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+
+	</Operation>
+
+	<!-- ========== M1911A1 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M1911_Pistol</defName>
+		<statBases>
+			<Mass>1.14</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.11</SwayFactor>
+			<Bulk>2.19</Bulk>
+			<WorkToMake>7000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShot1911P</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== STI 2011 Combat Master ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_STI2011CombatMaster_Pistol</defName>
+		<statBases>
+			<Mass>1.14</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.11</SwayFactor>
+			<Bulk>2.19</Bulk>
+			<WorkToMake>7000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShot1911P</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== M9A1 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M9A1_Pistol</defName>
+		<statBases>
+			<Mass>0.97</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.05</SwayFactor>
+			<Bulk>2.17</Bulk>
+			<WorkToMake>7000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNPistolShot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Makarov (PM) ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Makarov_Pistol</defName>
+		<statBases>
+			<Mass>0.73</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>0.78</SwayFactor>
+			<Bulk>1.62</Bulk>
+			<WorkToMake>7000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x18mmMakarov_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNPistolShot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<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>
+	<!-- ========== SIG Sauer P226 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_P226_Pistol</defName>
+		<statBases>
+			<Mass>0.96</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.97</SwayFactor>
+			<Bulk>1.96</Bulk>
+			<WorkToMake>7000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_40SW_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShotPistol_II</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_40SW</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== SIG Sauer P320 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_P320_Pistol</defName>
+		<statBases>
+			<Mass>0.84</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.96</SwayFactor>
+			<Bulk>2.03</Bulk>
+			<WorkToMake>7500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>20</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShotPistol_II</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>17</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== USP45  ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_USP45_Pistol</defName>
+		<statBases>
+			<Mass>0.78</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.08</SwayFactor>
+			<Bulk>2.01</Bulk>
+			<WorkToMake>7500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>25</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShot_1911Hellfighter</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+	<!-- ========== FN Five-seven ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_FiveSevenSD_Pistol</defName>
+		<statBases>
+			<Mass>0.7</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.90</SwayFactor>
+			<Bulk>2.2</Bulk>
+			<WorkToMake>7500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>20</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShotSupressed_II</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_FN57x28mm</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Glock 17 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Glock17SD_Pistol</defName>
+		<statBases>
+			<Mass>0.67</Mass>
+			<RangedWeapon_Cooldown>0.40</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.83</SwayFactor>
+			<Bulk>1.86</Bulk>
+			<WorkToMake>7500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>20</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShotSupressed_II</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>17</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== M1911 Silverballer ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M1911Silverballer_Pistol</defName>
+		<statBases>
+			<Mass>1.2</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.11</SwayFactor>
+			<Bulk>2.25</Bulk>
+			<WorkToMake>7000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShotSupressed_III</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== P226-SD ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_P226SD_Pistol</defName>
+		<statBases>
+			<Mass>1.1</Mass>
+			<RangedWeapon_Cooldown>0.40</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.97</SwayFactor>
+			<Bulk>1.96</Bulk>
+			<WorkToMake>7000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_40SW_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShotSupressed_II</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_40SW</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== USP45 SD ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_USPS45_Pistol</defName>
+		<statBases>
+			<Mass>1.23</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.71</SwayFactor>
+			<Bulk>3.92</Bulk>
+			<WorkToMake>8000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>25</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShotSupressed_III</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Juan Deag ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_DesertEagle_Pistol</defName>
+		<statBases>
+			<Mass>2.00</Mass>
+			<RangedWeapon_Cooldown>0.43</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.58</SwayFactor>
+			<Bulk>2.73</Bulk>
+			<WorkToMake>11000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50AE_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNDeagleShot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_50AE</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Taurus PT92 "Luison" ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_PT92SF_Pistol</defName>
+		<statBases>
+			<Mass>1.12</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.63</SwayFactor>
+			<Bulk>3.79</Bulk>
+			<WorkToMake>7500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShotSupressed_II</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>17</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNGun_FiveSeven_Pistol" or
+			defName="RNGun_STK100_Pistol" or
+			defName="RNGun_Glock17_Pistol" or
+			defName="RNGun_Glock18_Pistol" or
+			defName="RNGun_Glock34CombatMaster_Pistol" or
+			defName="RNGun_SpringfieldXD_Pistol" or
+			defName="RNGun_M1911_Pistol" or
+			defName="RNGun_STI2011CombatMaster_Pistol" or
+			defName="RNGun_M9A1_Pistol" or
+			defName="RNGun_Makarov_Pistol" or
+			defName="RNGun_P226_Pistol" or
+			defName="RNGun_P320_Pistol" or
+			defName="RNGun_DesertEagle_Pistol" or
+			defName="RNGun_PT92SF_Pistol" or
+			defName="RNGun_USP45_Pistol" or
+			defName="RNGun_FiveSevenSD_Pistol" or
+			defName="RNGun_Glock17SD_Pistol" or
+			defName="RNGun_M1911Silverballer_Pistol" or
+			defName="RNGun_P226SD_Pistol" or
+			defName="RNGun_USPS45_Pistol"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git "a/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Revolvers.xml" "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Revolvers.xml"
new file mode 100644
index 0000000000..f3b8bbe0d7
--- /dev/null
+++ "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Revolvers.xml"	
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Colt Cobra ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_ColtCobra_Revolver</defName>
+		<statBases>
+			<Mass>0.43</Mass>
+			<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.22</ShotSpread>
+			<SwayFactor>0.87</SwayFactor>
+			<Bulk>1.71</Bulk>
+			<WorkToMake>4500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>20</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>3.35</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_38Special_FMJ</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>10</range>
+			<soundCast>RNShotColtPython</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_38Special</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Colt Python ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_ColtPython_Revolver</defName>
+		<statBases>
+			<Mass>1.23</Mass>
+			<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.38</SwayFactor>
+			<Bulk>2.92</Bulk>
+			<WorkToMake>5000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.15</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_357Magnum_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShotColtPython</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_357Magnum</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== MP-412 REX ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_MP412REX_Revolver</defName>
+		<statBases>
+			<Mass>0.90</Mass>
+			<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>1.07</SwayFactor>
+			<Bulk>2.32</Bulk>
+			<WorkToMake>4500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.51</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_357Magnum_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShotRevolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_357Magnum</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== S&W Model 36 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Model36_Revolver</defName>
+		<statBases>
+			<Mass>0.55</Mass>
+			<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.22</ShotSpread>
+			<SwayFactor>0.87</SwayFactor>
+			<Bulk>1.71</Bulk>
+			<WorkToMake>4500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>20</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>3.35</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_38Special_FMJ</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>10</range>
+			<soundCast>RNShotColtPython</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_38Special</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNGun_ColtCobra_Revolver" or
+			defName="RNGun_ColtPython_Revolver" or
+			defName="RNGun_MP412REX_Revolver" or
+			defName="RNGun_Model36_Revolver"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git "a/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Rifle1_Style.xml" "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Rifle1_Style.xml"
new file mode 100644
index 0000000000..770e9f86ff
--- /dev/null
+++ "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Rifle1_Style.xml"	
@@ -0,0 +1,296 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== 56 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Type56_Rifle</defName>
+		<statBases>
+			<Mass>3.47</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<Bulk>8.80</Bulk>
+			<WorkToMake>27000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>45</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.82</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>44</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNShot_AK47Rifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== AK-47 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_AK47_Rifle</defName>
+		<statBases>
+			<Mass>3.47</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<Bulk>8.80</Bulk>
+			<WorkToMake>27000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>45</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.82</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>44</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNShot_AK47Rifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== AK-74 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_AK74_Rifle</defName>
+		<statBases>
+			<Mass>3.07</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.25</SwayFactor>
+			<Bulk>9.43</Bulk>
+			<WorkToMake>27500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.43</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNShotAK74USMG</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== AK-103 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_AK103_Rifle</defName>
+		<statBases>
+			<Mass>3.60</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.06</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<Bulk>9.43</Bulk>
+			<WorkToMake>32000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>45</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.64</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>44</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNShot_AK47Rifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- AS Val -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_ASVAL_Rifle</defName>
+		<statBases>
+			<Mass>2.50</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.17</SwayFactor>
+			<Bulk>6.15</Bulk>
+			<WorkToMake>37500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>45</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.94</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>31</range>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShotVSSVintorez</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>1</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNGun_AK47_Rifle" or
+			defName="RNGun_AK74_Rifle" or
+			defName="RNGun_AK103_Rifle" or
+			defName="RNGun_ASVAL_Rifle" or
+			defName="RNGun_Type56_Rifle"
+			]/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>
+</Patch>
\ No newline at end of file
diff --git "a/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Rifle2_Style.xml" "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Rifle2_Style.xml"
new file mode 100644
index 0000000000..6e84da8cef
--- /dev/null
+++ "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Rifle2_Style.xml"	
@@ -0,0 +1,1292 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Daniel Defense DDM4 V1 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_DDM4V11_Rifle</defName>
+		<statBases>
+			<Mass>3.04</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.5</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.26</SwayFactor>
+			<Bulk>8.19</Bulk>
+			<WorkToMake>36000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>45</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.51</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>57</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR_II</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Heckler & Koch HK416 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_HK416_Rifle</defName>
+		<statBases>
+			<Mass>3.56</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.5</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.30</SwayFactor>
+			<Bulk>8.48</Bulk>
+			<WorkToMake>35000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.41</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== War Sport Industries LVOA-C ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_LVOAC_Rifle</defName>
+		<statBases>
+			<Mass>3.20</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.5</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.35</SwayFactor>
+			<Bulk>9</Bulk>
+			<WorkToMake>35500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.39</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>48</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR_II</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>6</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== M16A2 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M16A2_Rifle</defName>
+		<statBases>
+			<Mass>3.26</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>10.03</Bulk>
+			<WorkToMake>30000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR_IV</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== M4A1 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M4A1_Rifle</defName>
+		<statBases>
+			<Mass>2.90</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.06</SightsEfficiency>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>1.13</SwayFactor>
+			<Bulk>7.56</Bulk>
+			<WorkToMake>32000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>1.58</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_MWARRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== F2000 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_F2000_Rifle</defName>
+		<statBases>
+			<Mass>3.60</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.05</SwayFactor>
+			<Bulk>6.88</Bulk>
+			<WorkToMake>36500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.41</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericBullpup_III</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== ACR ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_ACR_Rifle</defName>
+		<statBases>
+			<Mass>3.30</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.32</SwayFactor>
+			<Bulk>7.16</Bulk>
+			<WorkToMake>35500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.55</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_TAR-21_Rifle</defName>
+		<statBases>
+			<Mass>3.27</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.05</SwayFactor>
+			<Bulk>7.20</Bulk>
+			<WorkToMake>38500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.49</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>59</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericBullpup_III</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== L119A2 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_C8CQB_Carbine</defName>
+		<statBases>
+			<Mass>2.91</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.5</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>8.76</Bulk>
+			<WorkToMake>35000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.51</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>48</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== CQ ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_TypeCQ_Rifle</defName>
+		<statBases>
+			<Mass>3.26</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.5</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>10.03</Bulk>
+			<WorkToMake>30000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR_IV</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== C7A1 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_C7A1_Rifle</defName>
+		<statBases>
+			<Mass>3.4</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.5</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>10.06</Bulk>
+			<WorkToMake>34000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR_IV</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== IWI ACE ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_IWIACE52_Rifle</defName>
+		<statBases>
+			<Mass>3.60</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.4</SwayFactor>
+			<Bulk>9.54</Bulk>
+			<WorkToMake>33000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.08</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>50</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericDMR_II</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== MD97 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_MD97_Rifle</defName>
+		<statBases>
+			<Mass>3.7</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>10.1</Bulk>
+			<WorkToMake>30000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR_IV</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== AK5 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_AK5C_Carbine</defName>
+		<statBases>
+			<Mass>4.08</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.5</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>9.14</Bulk>
+			<WorkToMake>34000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR_IV</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+	<!-- ========== CZ 805 BREN A2 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_CZ805BrenA2_Rifle</defName>
+		<statBases>
+			<Mass>3.60</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>7.92</Bulk>
+			<WorkToMake>31000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>48</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Heckler & Koch G36K ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_G36K_Rifle</defName>
+		<statBases>
+			<Mass>3.5</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.5</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>8.60</Bulk>
+			<WorkToMake>34000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>45</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.43</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShotG36C</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Beryl ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_FBBeryl_Rifle</defName>
+		<statBases>
+			<Mass>3.35</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>9.43</Bulk>
+			<WorkToMake>30000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.43</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>48</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== FAL Para ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_R1Para_Rifle</defName>
+		<statBases>
+			<Mass>4.20</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.52</SwayFactor>
+			<Bulk>10.14</Bulk>
+			<WorkToMake>29000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>55</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.08</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShotSCARH</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</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>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== FN FAL ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_FNFAL_Rifle</defName>
+		<statBases>
+			<Mass>4.30</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.52</SwayFactor>
+			<Bulk>10.90</Bulk>
+			<WorkToMake>29000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>55</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.08</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShotSCARH</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</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>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Romat FAL ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_RomatFAL_Rifle</defName>
+		<statBases>
+			<Mass>4.30</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.52</SwayFactor>
+			<Bulk>10.90</Bulk>
+			<WorkToMake>29000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>55</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.08</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShotSCARH</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</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>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_G3A2_Rifle</defName>
+		<statBases>
+			<WorkToMake>29000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.46</SwayFactor>
+			<Bulk>10.23</Bulk>
+			<Mass>4.40</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>65</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<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>
+			<soundCast>RNShot_GenericDMR_II</soundCast>
+			<soundCastTail>GunTail_Heavy</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>
+
+	<!-- ========== Heckler & Koch HK416 SD DEVGRU ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M4A1DEVGRU_Rifle</defName>
+		<statBases>
+			<Mass>4.44</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.06</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.62</SwayFactor>
+			<Bulk>10.39</Bulk>
+			<WorkToMake>37500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>55</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.27</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>62</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_SDAR</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== AKM ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_AKMSD_Rifle</defName>
+		<statBases>
+			<Mass>3.10</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.19</SwayFactor>
+			<Bulk>8.80</Bulk>
+			<WorkToMake>27000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>45</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.92</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>44</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNShot_SDAR</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Remington ACR ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_ACRSD_Rifle</defName>
+		<statBases>
+			<Mass>3.30</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.06</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.32</SwayFactor>
+			<Bulk>7.16</Bulk>
+			<WorkToMake>35500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.55</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShot_SDAR</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== FN FAL ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_FNFALTatiana_Rifle</defName>
+		<statBases>
+			<Mass>3.30</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.52</SwayFactor>
+			<Bulk>10.90</Bulk>
+			<WorkToMake>29000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>55</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.08</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShot_DMRSDGeneric</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</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>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== FN SCAR-L ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_SCARLSD_Rifle</defName>
+		<statBases>
+			<Mass>3.29</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.06</SightsEfficiency>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>1.26</SwayFactor>
+			<Bulk>6.35</Bulk>
+			<WorkToMake>35500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.45</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNShot_SDAR</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNGun_DDM4V11_Rifle" or
+			defName="RNGun_HK416_Rifle" or
+			defName="RNGun_LVOAC_Rifle" or
+			defName="RNGun_M16A2_Rifle" or
+			defName="RNGun_C8CQB_Carbine" or
+			defName="RNGun_TypeCQ_Rifle" or
+			defName="RNGun_IWIACE52_Rifle" or
+			defName="RNGun_C7A1_Rifle" or
+			defName="RNGun_MD97_Rifle" or
+			defName="RNGun_AK5C_Carbine" or
+			defName="RNGun_CZ805BrenA2_Rifle" or
+			defName="RNGun_FBBeryl_Rifle" or
+			defName="RNGun_R1Para_Rifle" or
+			defName="RNGun_FNFAL_Rifle" or
+			defName="RNGun_RomatFAL_Rifle" or
+			defName="RNGun_G36K_Rifle" or
+			defName="RNGun_M4A1_Rifle" or
+			defName="RNGun_F2000_Rifle" or
+			defName="RNGun_G3A2_Rifle" or
+			defName="RNGun_ACR_Rifle" or
+			defName="RNGun_TAR-21_Rifle" or
+			defName="RNGun_M4A1DEVGRU_Rifle" or
+			defName="RNGun_AKMSD_Rifle" or
+			defName="RNGun_ACRSD_Rifle" or
+			defName="RNGun_FNFALTatiana_Rifle" or
+			defName="RNGun_SCARLSD_Rifle"
+			]/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>
+</Patch>
\ No newline at end of file
diff --git "a/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_SMG.xml" "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_SMG.xml"
new file mode 100644
index 0000000000..1b20371b79
--- /dev/null
+++ "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_SMG.xml"	
@@ -0,0 +1,790 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== AK-74U ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_AK74U_SMG</defName>
+		<statBases>
+			<Mass>2.85</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.02</SwayFactor>
+			<Bulk>4.90</Bulk>
+			<WorkToMake>29000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>0.66</warmupTime>
+			<range>40</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNShotAK74USMG</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== MAC-10 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_MAC11_SMG</defName>
+		<statBases>
+			<Mass>1.59</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>1.89</SwayFactor>
+			<Bulk>2.48</Bulk>
+			<WorkToMake>24500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.99</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>RNShotMAC11SMG</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== KRISS Vector ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_KrissVector_PDW</defName>
+		<statBases>
+			<Mass>3.20</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>1.14</SwayFactor>
+			<Bulk>6.06</Bulk>
+			<WorkToMake>32000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.47</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>12</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>RNShotMP7SMG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== MP5A2 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_MP5A2_SMG</defName>
+		<statBases>
+			<Mass>2.50</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>0.93</SwayFactor>
+			<Bulk>6.80</Bulk>
+			<WorkToMake>27500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>26</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShotMP5SMG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== MP7A2 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_MP7A1_PDW</defName>
+		<statBases>
+			<Mass>1.96</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>0.87</SwayFactor>
+			<Bulk>4.15</Bulk>
+			<WorkToMake>29000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>30</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.37</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_46x30mm_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>25</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShotMP7SMG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_46x30mm</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== P90 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_P90_PDW</defName>
+		<statBases>
+			<Mass>2.60</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>0.8</SwayFactor>
+			<Bulk>5.05</Bulk>
+			<WorkToMake>37000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>30</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.05</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>31</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNP90Shot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_FN57x28mm</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== PPSh-41 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_PPSh41_SMG</defName>
+		<statBases>
+			<Mass>3.63</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.21</SwayFactor>
+			<Bulk>9.43</Bulk>
+			<WorkToMake>27500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.46</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>28</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShotAK74USMG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>71</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Skorpion vz. 61 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_SkorpionVZ61_SMG</defName>
+		<statBases>
+			<Mass>1.30</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.65</SwayFactor>
+			<Bulk>2.70</Bulk>
+			<WorkToMake>24500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.89</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_32ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>25</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShotSkorpionVZ</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_32ACP</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Thompson SMG ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_ThompsonSubmachineGun_SMG</defName>
+		<statBases>
+			<Mass>4.90</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.35</SwayFactor>
+			<Bulk>8.60</Bulk>
+			<WorkToMake>27500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.32</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>25</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShotMP7SMG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== UMP45 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_UMP45_SMG</defName>
+		<statBases>
+			<Mass>2.50</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.94</SwayFactor>
+			<Bulk>4.50</Bulk>
+			<WorkToMake>30500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>30</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.85</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>25</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNUMP45Shot</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Uzi ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Uzi_SMG</defName>
+		<statBases>
+			<Mass>3.50</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>3.30</SwayFactor>
+			<Bulk>4.70</Bulk>
+			<WorkToMake>29500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>45</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.39</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>31</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNShotMAC11SMG</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Pepe-19 Bizon ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_PP19_SMG</defName>
+		<statBases>
+			<Mass>2.10</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>0.91</SwayFactor>
+			<Bulk>4.25</Bulk>
+			<WorkToMake>28000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>30</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.35</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x18mmMakarov_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShotSMG_II</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>64</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== AK-74U ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_AK7S4U_SMG</defName>
+		<statBases>
+			<Mass>2.85</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.02</SwayFactor>
+			<Bulk>4.90</Bulk>
+			<WorkToMake>29000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>0.66</warmupTime>
+			<range>40</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNShot_SDAR</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== P90-SD ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_P90SD_PDW</defName>
+		<statBases>
+			<Mass>2.60</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>0.8</SwayFactor>
+			<Bulk>5.05</Bulk>
+			<WorkToMake>37000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>30</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.05</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>31</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShotSMG2SD</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_FN57x28mm</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== MP5SD ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_MP5SD_SMG</defName>
+		<statBases>
+			<Mass>2.50</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>0.93</SwayFactor>
+			<Bulk>6.80</Bulk>
+			<WorkToMake>27500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.60</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>31</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShotSMGSD</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNGun_AK74U_SMG" or
+			defName="RNGun_MAC11_SMG" or
+			defName="RNGun_MP5A2_SMG" or
+			defName="RNGun_MP7A1_PDW" or
+			defName="RNGun_P90_PDW" or
+			defName="RNGun_PPSh41_SMG" or
+			defName="RNGun_SkorpionVZ61_SMG" or
+			defName="RNGun_ThompsonSubmachineGun_SMG" or
+			defName="RNGun_UMP45_SMG" or
+			defName="RNGun_PP19_SMG" or
+			defName="RNGun_Uzi_SMG" or
+			defName="RNGun_KrissVector_PDW" or
+			defName="RNGun_AK7S4U_SMG" or
+			defName="RNGun_P90SD_PDW" or
+			defName="RNGun_MP5SD_SMG"
+			]/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>
+</Patch>
\ No newline at end of file
diff --git "a/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Shotguns.xml" "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Shotguns.xml"
new file mode 100644
index 0000000000..57d0e75539
--- /dev/null
+++ "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Shotguns.xml"	
@@ -0,0 +1,711 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== AA12 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_AA12_Shotgun</defName>
+		<statBases>
+			<Mass>5.20</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.49</SwayFactor>
+			<Bulk>10.66</Bulk>
+			<WorkToMake>33000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>55</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.26</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+			<soundCast>RNShotUSAS</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Remington 870 Magnum ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Remington870MCS_Shotgun</defName>
+		<statBases>
+			<Mass>3.40</Mass>
+			<RangedWeapon_Cooldown>1.00</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.32</SwayFactor>
+			<Bulk>9.78</Bulk>
+			<WorkToMake>19500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>RN870Shot</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Model 1897 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Model1897_Shotgun</defName>
+		<statBases>
+			<Mass>3.60</Mass>
+			<RangedWeapon_Cooldown>0.99</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.36</SwayFactor>
+			<Bulk>10.00</Bulk>
+			<WorkToMake>10000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>RNShotPumpShot</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== IZh43 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_IZh43_Shotgun</defName>
+		<statBases>
+			<Mass>3.30</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.36</SwayFactor>
+			<Bulk>8.25</Bulk>
+			<WorkToMake>7500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>RNShotSawnOff</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>2</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>1</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== StoegerCoachGun ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_StoegerCoachGun_Shotgun</defName>
+		<statBases>
+			<Mass>2.95</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.36</SwayFactor>
+			<Bulk>9.27</Bulk>
+			<WorkToMake>7500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>RNShotSawnOff</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>2</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>1</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Benelli Montefeltro ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_BenelliMontefeltro_Shotgun</defName>
+		<statBases>
+			<Mass>3.12</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.36</SwayFactor>
+			<Bulk>12.00</Bulk>
+			<WorkToMake>17500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>RNShotM1014S</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Mossberg 500 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Mossberg500_Shotgun</defName>
+		<statBases>
+			<Mass>3.40</Mass>
+			<RangedWeapon_Cooldown>1.00</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.45</SwayFactor>
+			<Bulk>12.07</Bulk>
+			<WorkToMake>11500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>55</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>RN870Shot</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Saiga-12 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Saiga12_Shotgun</defName>
+		<statBases>
+			<Mass>3.60</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>10.60</Bulk>
+			<WorkToMake>22500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>RNShotSAIGA</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== SPAS-12 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_SPAS12_Shotgun</defName>
+		<statBases>
+			<Mass>4.40</Mass>
+			<RangedWeapon_Cooldown>0.44</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.48</SwayFactor>
+			<Bulk>8.20</Bulk>
+			<WorkToMake>17500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>55</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>RNShotSPAS</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>9</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.8</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== USAS-12 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_USAS12_Shotgun</defName>
+		<statBases>
+			<Mass>5.45</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.51</SwayFactor>
+			<Bulk>9.60</Bulk>
+			<WorkToMake>30500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>55</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.36</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<soundCast>RNShotUSAS</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Spartan Marine ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_SpartanMarine_Shotgun</defName>
+		<statBases>
+			<Mass>3.30</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<Bulk>10.13</Bulk>
+			<WorkToMake>12000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>RNShotM1014S</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>3</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== M1014 / Benelli M4 Super 90 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M1014_Shotgun</defName>
+		<statBases>
+			<Mass>3.82</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>10.10</Bulk>
+			<WorkToMake>18000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>55</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>RNShotM1014S</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.8</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Pancor Jackhammer ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_PancorJackhammer_Shotgun</defName>
+		<statBases>
+			<Mass>7.90</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.58</SwayFactor>
+			<Bulk>7.87</Bulk>
+			<WorkToMake>33000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>60</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.94</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
+			<soundCast>RNShotUSAS</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== M1014 / Benelli M4 Super 90 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M1014SD_Shotgun</defName>
+		<statBases>
+			<Mass>3.82</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>10.10</Bulk>
+			<WorkToMake>18000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>55</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>RNShotM1014SD</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.8</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<!-- shotguns with stocks -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNGun_AA12_Shotgun" or
+			defName="RNGun_Remington870MCS_Shotgun" or
+			defName="RNGun_Model1897_Shotgun" or
+			defName="RNGun_IZh43_Shotgun" or
+			defName="RNGun_StoegerCoachGun_Shotgun" or
+			defName="RNGun_BenelliMontefeltro_Shotgun" or
+			defName="RNGun_Mossberg500_Shotgun" or
+			defName="RNGun_Saiga12_Shotgun" or
+			defName="RNGun_SPAS12_Shotgun" or
+			defName="RNGun_USAS12_Shotgun" or
+			defName="RNGun_M1014_Shotgun" or
+			defName="RNGun_SpartanMarine_Shotgun" or
+			defName="RNGun_PancorJackhammer_Shotgun" or
+			defName="RNGun_M1014SD_Shotgun"
+			]/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>
+</Patch>
\ No newline at end of file
diff --git "a/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Spacers.xml" "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Spacers.xml"
new file mode 100644
index 0000000000..db0e25aef3
--- /dev/null
+++ "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Spacers.xml"	
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Auger Mk II ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNSci_AugerMkII</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.05</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.2</SwayFactor>
+			<Bulk>8.07</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.13</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>30.9</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<soundCast>RNAugerMkIIShot</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>2.40</reloadTime>
+			<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== BM003 Razor ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNSci_BM003Razor</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.05</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.2</SwayFactor>
+			<Bulk>8.07</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.03</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
+			<warmupTime>0.9</warmupTime>
+			<range>35.9</range>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<soundCast>RNRazorShot</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>2.40</reloadTime>
+			<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Longbow 1S-1K ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNSci_Longbow1S1K</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.45</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.0</SwayFactor>
+			<Bulk>11.07</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12x64mmCharged</defaultProjectile>
+			<warmupTime>0.9</warmupTime>
+			<range>40.9</range>
+			<burstShotCount>1</burstShotCount>
+			<ticksBetweenBurstShots>22</ticksBetweenBurstShots>
+			<soundCast>RNLongbowShot</soundCast>
+			<soundAiming>RNLongbowCharge</soundAiming>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>2.4</reloadTime>
+			<ammoSet>AmmoSet_12x64mmCharged</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>1</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNSci_AugerMkII" or
+			defName="RNSci_BM003Razor" or
+			defName="RNSci_Longbow1S1K"
+			]/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>
+
+</Patch>
\ No newline at end of file
diff --git "a/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_Industrial.xml" "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_Industrial.xml"
new file mode 100644
index 0000000000..f03ad1343b
--- /dev/null
+++ "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_Industrial.xml"	
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- You can find the spreadsheet here https://drive.google.com/open?id=1JZAjvzealI189OofkxwUCif3yA4-u6yP3DilsmIEQJA -->
+
+	<!-- Chainsaw -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RHMelee_ECHO_Chainsaw"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>RHMelee_GenericChainsawStab</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>0.5</cooldownTime>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>RHMelee_GenericChainsawSlash</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>0.6</cooldownTime>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHMelee_ECHO_Chainsaw"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>0.20</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RHMelee_ECHO_Chainsaw"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.33</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- Bat -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Baseball_Bat"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.46</cooldownTime>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>6.0</armorPenetrationBlunt>
+					<chanceFactor>2</chanceFactor>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_BrooklynSmasher_Bat"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.46</cooldownTime>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>6.0</armorPenetrationBlunt>
+					<chanceFactor>2</chanceFactor>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Baseball_Bat"]/statBases</xpath>
+		<value>
+			<Bulk>7.5</Bulk>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_BrooklynSmasher_Bat"]/statBases</xpath>
+		<value>
+			<Bulk>7.5</Bulk>
+			<MeleeCounterParryBonus>0.2</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Baseball_Bat"
+			or defName="RNMeleeWeapon_BrooklynSmasher_Bat"] </xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.5</MeleeCritChance>
+				<MeleeParryChance>0.15</MeleeParryChance>
+				<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git "a/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_Machete_CE.xml" "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_Machete_CE.xml"
new file mode 100644
index 0000000000..946e558b02
--- /dev/null
+++ "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_Machete_CE.xml"	
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- You can find the spreadsheet here https://drive.google.com/open?id=1JZAjvzealI189OofkxwUCif3yA4-u6yP3DilsmIEQJA -->
+
+	<!-- Machetey WARRIOR -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Spetsnaz_Machete"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.37</cooldownTime>
+					<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.37</cooldownTime>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.24</armorPenetrationSharp>
+					<chanceFactor>0.25</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>1.17</cooldownTime>
+					<armorPenetrationBlunt>1.512</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.55</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Spetsnaz_Machete"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Spetsnaz_Machete"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.29</MeleeCritChance>
+			<MeleeParryChance>0.35</MeleeParryChance>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Spetsnaz_Machete"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_TOPS_Machete" or defName="RNMeleeWeapon_GerberGator_Machete"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.37</cooldownTime>
+					<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.37</cooldownTime>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.24</armorPenetrationSharp>
+					<chanceFactor>0.25</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>1.33</cooldownTime>
+					<armorPenetrationBlunt>1.512</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.55</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_TOPS_Machete" or defName="RNMeleeWeapon_GerberGator_Machete"]/statBases</xpath>
+		<value>
+			<Bulk>4.5</Bulk>
+			<MeleeCounterParryBonus>0.43</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_TOPS_Machete" or defName="RNMeleeWeapon_GerberGator_Machete"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.29</MeleeCritChance>
+			<MeleeParryChance>0.4</MeleeParryChance>
+			<MeleeDodgeChance>0.3</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_TOPS_Machete" or defName="RNMeleeWeapon_GerberGator_Machete"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- Kukri -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Kukri_Machete"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.37</cooldownTime>
+					<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>1.37</cooldownTime>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.24</armorPenetrationSharp>
+					<chanceFactor>0.25</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>1.27</cooldownTime>
+					<armorPenetrationBlunt>1.512</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.55</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Kukri_Machete"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Kukri_Machete"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.29</MeleeCritChance>
+			<MeleeParryChance>0.35</MeleeParryChance>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Kukri_Machete"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git "a/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_Research.xml" "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_Research.xml"
new file mode 100644
index 0000000000..be4fa1587f
--- /dev/null
+++ "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_Research.xml"	
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==================== Weapons research prerequisite patches ==================== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+		defName="RNGun_RPG7_RocketLauncher" or
+		defName="RNGun_M79_GrenadeLauncher" or
+		defName="RNGun_HK69A1_GrenadeLauncher"
+		]/recipeMaker/researchPrerequisite</xpath>
+		<value>
+			<researchPrerequisite>CE_Launchers</researchPrerequisite>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNGun_M72LAW_RocketLauncher"]/recipeMaker/skillRequirements</xpath>
+		<value>
+			<skillRequirements>
+				<Crafting>6</Crafting>
+			</skillRequirements>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNGun_M72LAW_RocketLauncher"]/recipeMaker/researchPrerequisite</xpath>
+		<value>
+			<researchPrerequisite>CE_Launchers</researchPrerequisite>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNGun_M72LAW_RocketLauncher"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>50</Steel>
+				<ComponentIndustrial>3</ComponentIndustrial>
+				<FSX>3</FSX>
+			</costList>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git "a/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_SmolKnifes_CE.xml" "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_SmolKnifes_CE.xml"
new file mode 100644
index 0000000000..37d558c5a6
--- /dev/null
+++ "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_SmolKnifes_CE.xml"	
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- RimmuNaysh Y'all -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_EickhornRecondoIV_Knife"
+			or defName="RNMeleeWeapon_KABAR_Knife"
+			or defName="RNMeleeWeapon_M3Trench_Knife"
+			or defName="RNMeleeWeapon_FirstBlood_Knife"
+			or defName="RNMeleeWeapon_GerberSurvival_Knife"
+			or defName="RNMeleeWeapon_Karambit_Knife"
+			or defName="RNMeleeWeapon_M9Bayonet_Knife"]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.18</cooldownTime>
+					<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.32</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.26</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.42</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_EickhornRecondoIV_Knife"
+			or defName="RNMeleeWeapon_KABAR_Knife"
+			or defName="RNMeleeWeapon_M3Trench_Knife"
+			or defName="RNMeleeWeapon_FirstBlood_Knife"
+			or defName="RNMeleeWeapon_GerberSurvival_Knife"
+			or defName="RNMeleeWeapon_Karambit_Knife"
+			or defName="RNMeleeWeapon_M9Bayonet_Knife"]/statBases </xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_EickhornRecondoIV_Knife"
+			or defName="RNMeleeWeapon_KABAR_Knife"
+			or defName="RNMeleeWeapon_M3Trench_Knife"
+			or defName="RNMeleeWeapon_FirstBlood_Knife"
+			or defName="RNMeleeWeapon_GerberSurvival_Knife"
+			or defName="RNMeleeWeapon_Karambit_Knife"
+			or defName="RNMeleeWeapon_M9Bayonet_Knife"] </xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.5</MeleeCritChance>
+				<MeleeParryChance>0.15</MeleeParryChance>
+				<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_EickhornRecondoIV_Knife"
+			or defName="RNMeleeWeapon_KABAR_Knife"
+			or defName="RNMeleeWeapon_M3Trench_Knife"
+			or defName="RNMeleeWeapon_FirstBlood_Knife"
+			or defName="RNMeleeWeapon_GerberSurvival_Knife"
+			or defName="RNMeleeWeapon_Karambit_Knife"
+			or defName="RNMeleeWeapon_M9Bayonet_Knife"]/weaponTags </xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Tanto_Sword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.22</cooldownTime>
+					<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.34</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.29</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.44</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Tanto_Sword"]/statBases</xpath>
+		<value>
+			<Bulk>1.5</Bulk>
+			<MeleeCounterParryBonus>0.18</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Tanto_Sword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.4</MeleeCritChance>
+				<MeleeParryChance>0.2</MeleeParryChance>
+				<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Tanto_Sword"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git "a/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_Swords_CE.xml" "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_Swords_CE.xml"
new file mode 100644
index 0000000000..c2f9065721
--- /dev/null
+++ "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_Swords_CE.xml"	
@@ -0,0 +1,258 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === One-handed Tags === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "RNMeleeWeapon_Maximus_Spatha"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- === Katana === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Mizutori_Katana" or defName="RNMeleeWeapon_Fudoshin_Katana" or defName="RNMeleeWeapon_Yanmaodao_Saber" or defName="RNMeleeWeapon_Manganese_Wakizashi"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.33</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.936</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.33</cooldownTime>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>0.936</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.88</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>31</power>
+					<cooldownTime>1.28</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>2.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.65</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Mizutori_Katana" or defName="RNMeleeWeapon_Fudoshin_Katana" or defName="RNMeleeWeapon_Yanmaodao_Saber" or defName="RNMeleeWeapon_Manganese_Wakizashi"]/statBases</xpath>
+		<value>
+			<Bulk>7.85</Bulk>
+			<MeleeCounterParryBonus>1.38</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Mizutori_Katana" or defName="RNMeleeWeapon_Fudoshin_Katana" or defName="RNMeleeWeapon_Yanmaodao_Saber" or defName="RNMeleeWeapon_Manganese_Wakizashi"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.86</MeleeCritChance>
+				<MeleeParryChance>0.69</MeleeParryChance>
+				<MeleeDodgeChance>0.37</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- === I Hanjo === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Hanzo_Katana"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.33</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.936</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>1.33</cooldownTime>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>0.936</armorPenetrationBlunt>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>32</power>
+					<cooldownTime>1.28</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>2.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Hanzo_Katana"]/statBases</xpath>
+		<value>
+			<Bulk>7.85</Bulk>
+			<MeleeCounterParryBonus>1.56</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Hanzo_Katana"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.44</MeleeCritChance>
+				<MeleeParryChance>0.69</MeleeParryChance>
+				<MeleeDodgeChance>0.37</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- === Spatha === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Maximus_Spatha"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.18</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.339</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>1.39</cooldownTime>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>0.339</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.48</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.33</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>0.717</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.36</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Maximus_Spatha"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>0.43</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Maximus_Spatha"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.30</MeleeCritChance>
+				<MeleeParryChance>0.35</MeleeParryChance>
+				<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- === Z-Killer Sword === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_ZKiller_Sword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.18</cooldownTime>
+					<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.32</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.26</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.42</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_ZKiller_Sword"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<MeleeCounterParryBonus>0.23</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_ZKiller_Sword"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.30</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+			<MeleeDodgeChance>0.08</MeleeDodgeChance>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git "a/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/Rm2_CE_AirSupport.xml" "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/Rm2_CE_AirSupport.xml"
new file mode 100644
index 0000000000..ac15b94f02
--- /dev/null
+++ "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/Rm2_CE_AirSupport.xml"	
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RN_SOFLAM_AirSupport"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li>
+					<verbClass>Verb_Bombardment</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<warmupTime>3</warmupTime>
+					<ai_AvoidFriendlyFireRadius>20</ai_AvoidFriendlyFireRadius>
+					<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+					<range>69.9</range>
+					<burstShotCount>1</burstShotCount>
+					<soundAiming>OrbitalTargeter_Aiming</soundAiming>
+					<soundCast>OrbitalTargeter_Fire</soundCast>
+					<onlyManualCast>true</onlyManualCast>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RN_OrbitalUtilityBase"]/statBases</xpath>
+		<value>
+			<Bulk>1.5</Bulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RW Pilas and Bows/Defs/RW Pilas and Bows/Arrows.xml b/ModPatches/RW Pilas and Bows/Defs/RW Pilas and Bows/Arrows.xml
new file mode 100644
index 0000000000..afa3693826
--- /dev/null
+++ b/ModPatches/RW Pilas and Bows/Defs/RW Pilas and Bows/Arrows.xml	
@@ -0,0 +1,717 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- Ammo Categories-->
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>ArrowGrenade</defName>
+		<label>Bownade</label>
+		<description>Pull the pin and immediately shoot the arrow, or else.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>ArrowMolotov</defName>
+		<label>Bowlotov</label>
+		<description>No need for accuracy when your arrows explode.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>ArrowEMP</defName>
+		<label>BowMP</label>
+		<description>Demonic servants of a sleeping god, meet 'demonic servant of a sleeping god'-stopper.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>ArrowBattery</defName>
+		<label>Bowttery</label>
+		<description>When the guns are gone and you can't go on.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+
+	<!--Arrows (Ammunition)-->
+	<!--Regular & Streamlined Arrows-->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoArrowBase">
+		<defName>Ammo_Arrow_Grenade</defName>
+		<label>arrow (grenade)</label>
+		<graphicData>
+			<texPath>Bownade</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<ammoClass>ArrowGrenade</ammoClass>
+		<statBases>
+			<MarketValue>12.35</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableCrafting_CraftingSpot</li>
+		</tradeTags>
+		<generateAllowChance>0.1</generateAllowChance><!-- Should be a bit rarer than Plasteel -->
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoArrowBase">
+		<defName>Ammo_Arrow_Molotov</defName>
+		<label>arrow (molotov)</label>
+		<graphicData>
+			<texPath>Bowlotov</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<ammoClass>ArrowMolotov</ammoClass>
+		<statBases>
+			<MarketValue>7.18</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableCrafting_CraftingSpot</li>
+		</tradeTags>
+		<generateAllowChance>0.1</generateAllowChance><!-- Should be a bit rarer than a flame arrow -->
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoArrowBase">
+		<defName>Ammo_Arrow_EMP</defName>
+		<label>arrow (EMP)</label>
+		<graphicData>
+			<texPath>BowMP</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<ammoClass>ArrowEMP</ammoClass>
+		<statBases>
+			<MarketValue>21.22</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableCrafting_CraftingSpot</li>
+		</tradeTags>
+		<generateAllowChance>0.05</generateAllowChance><!-- Very rare? -->
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoArrowBase">
+		<defName>Ammo_Arrow_Battery</defName>
+		<label>arrow (battery)</label>
+		<graphicData>
+			<texPath>Bowttery</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<ammoClass>ArrowBattery</ammoClass>
+		<statBases>
+			<MarketValue>26.04</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableCrafting_CraftingSpot</li>
+		</tradeTags>
+		<generateAllowChance>0.05</generateAllowChance><!-- Very rare? -->
+	</ThingDef>
+
+
+	<!--Great Arrows-->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoGreatArrowBase">
+		<defName>Ammo_GreatArrow_Grenade</defName>
+		<label>great arrow (grenade)</label>
+		<graphicData>
+			<texPath>Bownade</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<ammoClass>ArrowGrenade</ammoClass>
+		<statBases>
+			<MarketValue>12.61</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableCrafting_CraftingSpot</li>
+		</tradeTags>
+		<generateAllowChance>0.1</generateAllowChance><!-- Should be a bit rarer than a plasteel arrow -->
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoGreatArrowBase">
+		<defName>Ammo_GreatArrow_Molotov</defName>
+		<label>great arrow (molotov)</label>
+		<graphicData>
+			<texPath>Bowlotov</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<ammoClass>ArrowMolotov</ammoClass>
+		<statBases>
+			<MarketValue>7.44</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableCrafting_CraftingSpot</li>
+		</tradeTags>
+		<generateAllowChance>0.1</generateAllowChance><!-- Should be a bit rarer than a flame arrow -->
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoGreatArrowBase">
+		<defName>Ammo_GreatArrow_EMP</defName>
+		<label>great arrow (EMP)</label>
+		<graphicData>
+			<texPath>BowMP</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<ammoClass>ArrowEMP</ammoClass>
+		<statBases>
+			<MarketValue>21.48</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableCrafting_CraftingSpot</li>
+		</tradeTags>
+		<generateAllowChance>0.05</generateAllowChance><!-- Very rare? -->
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoGreatArrowBase">
+		<defName>Ammo_GreatArrow_Battery</defName>
+		<label>great arrow (battery)</label>
+		<graphicData>
+			<texPath>Bowttery</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<ammoClass>ArrowBattery</ammoClass>
+		<statBases>
+			<MarketValue>26.3</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableCrafting_CraftingSpot</li>
+		</tradeTags>
+		<generateAllowChance>0.05</generateAllowChance><!-- Very rare? -->
+	</ThingDef>
+
+	<!--Arrow Projectiles-->
+	<!--Regular Arrows-->
+
+	<ThingDef ParentName="BaseArrowProjectile">
+		<defName>Projectile_Arrow_Grenade</defName>
+		<label>arrow (bownade)</label>
+		<graphicData>
+			<texPath>BownadeP</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>1.5</explosionRadius>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>56</damageAmountBase>
+			<explosionDelay>60</explosionDelay>
+			<dropsCasings>true</dropsCasings>
+			<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+			<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<speed>30</speed>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>40</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseArrowProjectile">
+		<defName>Projectile_Arrow_Molotov</defName>
+		<label>arrow (bowlotov)</label>
+		<graphicData>
+			<texPath>BowlotovP</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>1.1</explosionRadius>
+			<damageDef>PrometheumFlame</damageDef>
+			<damageAmountBase>10</damageAmountBase>
+			<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
+			<preExplosionSpawnChance>1</preExplosionSpawnChance>
+			<speed>30</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseArrowProjectile">
+		<defName>Projectile_Arrow_EMP</defName>
+		<label>arrow (bowMP)</label>
+		<graphicData>
+			<texPath>BowMPP</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>3</explosionRadius>
+			<damageDef>EMP</damageDef>
+			<damageAmountBase>56</damageAmountBase>
+			<explosionDelay>60</explosionDelay>
+			<dropsCasings>true</dropsCasings>
+			<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+			<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+			<speed>30</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseArrowProjectile">
+		<defName>Projectile_Arrow_Battery</defName>
+		<label>arrow (bowttery)</label>
+		<graphicData>
+			<texPath>BowtteryP</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>1.1</explosionRadius>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>200</damageAmountBase>
+			<speed>30</speed>
+		</projectile>
+	</ThingDef>
+
+	<!--Streamlined Arrows-->
+
+	<ThingDef ParentName="BaseArrowProjectile">
+		<defName>Projectile_StreamlinedArrow_Grenade</defName>
+		<label>streamlined arrow (bownade)</label>
+		<graphicData>
+			<texPath>BownadeP</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>1.5</explosionRadius>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>56</damageAmountBase>
+			<explosionDelay>60</explosionDelay>
+			<dropsCasings>true</dropsCasings>
+			<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+			<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<speed>32</speed>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>40</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseArrowProjectile">
+		<defName>Projectile_StreamlinedArrow_Molotov</defName>
+		<label>streamlined arrow (bowlotov)</label>
+		<graphicData>
+			<texPath>BowlotovP</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>1.1</explosionRadius>
+			<damageDef>PrometheumFlame</damageDef>
+			<damageAmountBase>10</damageAmountBase>
+			<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
+			<preExplosionSpawnChance>1</preExplosionSpawnChance>
+			<speed>32</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseArrowProjectile">
+		<defName>Projectile_StreamlinedArrow_EMP</defName>
+		<label>streamlined arrow (bowMP)</label>
+		<graphicData>
+			<texPath>BowMPP</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>3</explosionRadius>
+			<damageDef>EMP</damageDef>
+			<damageAmountBase>56</damageAmountBase>
+			<explosionDelay>60</explosionDelay>
+			<dropsCasings>true</dropsCasings>
+			<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+			<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+			<speed>32</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseArrowProjectile">
+		<defName>Projectile_StreamlinedArrow_Battery</defName>
+		<label>streamlined arrow (bowttery)</label>
+		<graphicData>
+			<texPath>BowtteryP</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>1.1</explosionRadius>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>200</damageAmountBase>
+			<speed>32</speed>
+		</projectile>
+	</ThingDef>
+
+	<!--Great Arrows-->
+
+	<ThingDef ParentName="BaseArrowProjectile">
+		<defName>Projectile_GreatArrow_Grenade</defName>
+		<label>great arrow (bownade)</label>
+		<graphicData>
+			<texPath>BownadeP</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>1.5</explosionRadius>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>56</damageAmountBase>
+			<explosionDelay>60</explosionDelay>
+			<dropsCasings>true</dropsCasings>
+			<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+			<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<speed>30</speed>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>40</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseArrowProjectile">
+		<defName>Projectile_GreatArrow_Molotov</defName>
+		<label>great arrow (bowlotov)</label>
+		<graphicData>
+			<texPath>BowlotovP</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>1.1</explosionRadius>
+			<damageDef>PrometheumFlame</damageDef>
+			<damageAmountBase>10</damageAmountBase>
+			<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
+			<preExplosionSpawnChance>1</preExplosionSpawnChance>
+			<speed>30</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseArrowProjectile">
+		<defName>Projectile_GreatArrow_EMP</defName>
+		<label>great arrow (bowMP)</label>
+		<graphicData>
+			<texPath>BowMPP</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>3</explosionRadius>
+			<damageDef>EMP</damageDef>
+			<damageAmountBase>56</damageAmountBase>
+			<explosionDelay>60</explosionDelay>
+			<dropsCasings>true</dropsCasings>
+			<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+			<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+			<speed>32</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseArrowProjectile">
+		<defName>Projectile_GreatArrow_Battery</defName>
+		<label>great arrow (bowttery)</label>
+		<graphicData>
+			<texPath>BowtteryP</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>1.1</explosionRadius>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>200</damageAmountBase>
+			<speed>30</speed>
+		</projectile>
+	</ThingDef>
+
+	<!--Arrow Recipes-->
+	<!--Normal Arrows-->
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>MakeAmmo_Arrow_Grenade</defName>
+		<label>make bownade arrows x10</label>
+		<description>Craft 10 bownade arrows.</description>
+		<jobString>Making bownade arrows.</jobString>
+		<workAmount>100</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Weapon_GrenadeFrag</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+				<li>Weapon_GrenadeFrag</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Arrow_Grenade>10</Ammo_Arrow_Grenade>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>MakeAmmo_Arrow_Molotov</defName>
+		<label>make bowlotov arrows x10</label>
+		<description>Craft 10 bowlotov arrows.</description>
+		<jobString>Making bowlotov arrows.</jobString>
+		<workAmount>100</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Weapon_GrenadeMolotov</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+				<li>Weapon_GrenadeMolotov</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Arrow_Molotov>10</Ammo_Arrow_Molotov>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>MakeAmmo_Arrow_EMP</defName>
+		<label>make bowMP arrows x10</label>
+		<description>Craft 10 bowMP arrows.</description>
+		<jobString>Making bowMP arrows.</jobString>
+		<workAmount>100</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Weapon_GrenadeEMP</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+				<li>Weapon_GrenadeEMP</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Arrow_EMP>10</Ammo_Arrow_EMP>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>MakeAmmo_Arrow_Battery</defName>
+		<label>make bowttery arrows x10</label>
+		<description>Craft 10 bowttery arrows.</description>
+		<jobString>Making bowttery arrows.</jobString>
+		<workAmount>100</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Arrow_Battery>10</Ammo_Arrow_Battery>
+		</products>
+	</RecipeDef>
+
+	<!--Great Arrows-->
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>MakeAmmo_GreatArrow_Grenade</defName>
+		<label>make bownade great arrows x10</label>
+		<description>Craft 10 bownade great arrows.</description>
+		<jobString>Making bownade great arrows.</jobString>
+		<workAmount>300</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Weapon_GrenadeFrag</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+				<li>Weapon_GrenadeFrag</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_GreatArrow_Grenade>10</Ammo_GreatArrow_Grenade>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>MakeAmmo_GreatArrow_Molotov</defName>
+		<label>make bowlotov great arrows x10</label>
+		<description>Craft 10 bowlotov great arrows.</description>
+		<jobString>Making bowlotov great arrows.</jobString>
+		<workAmount>100</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Weapon_GrenadeMolotov</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+				<li>Weapon_GrenadeMolotov</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_GreatArrow_Molotov>10</Ammo_GreatArrow_Molotov>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>MakeAmmo_GreatArrow_EMP</defName>
+		<label>make bowMP great arrows x10</label>
+		<description>Craft 10 bowMP great arrows.</description>
+		<jobString>Making bowMP great arrows.</jobString>
+		<workAmount>100</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Weapon_GrenadeEMP</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+				<li>Weapon_GrenadeEMP</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_GreatArrow_EMP>10</Ammo_GreatArrow_EMP>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>MakeAmmo_GreatArrow_Battery</defName>
+		<label>make bowttery great arrows x10</label>
+		<description>Craft 10 bowttery great arrows.</description>
+		<jobString>Making bowttery great arrows.</jobString>
+		<workAmount>100</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_GreatArrow_Battery>10</Ammo_GreatArrow_Battery>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/RW Pilas and Bows/Defs/RW Pilas and Bows/Javelin.xml b/ModPatches/RW Pilas and Bows/Defs/RW Pilas and Bows/Javelin.xml
new file mode 100644
index 0000000000..9e65e206ad
--- /dev/null
+++ b/ModPatches/RW Pilas and Bows/Defs/RW Pilas and Bows/Javelin.xml	
@@ -0,0 +1,697 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!--PILA/PILUM/JAVELIN-->
+	<!--Add the ammo to the AmmoSet (for javelin/Pila launchers like atlatl)-->
+	<!--li Class="PatchOperationAdd">
+		<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_Javelins"]/ammoTypes</xpath>
+		<value>
+			<PilaHighExplosive>PilumHE_Fired</PilaHighExplosive>
+			<PilaHighIncendiary>PilumHI_Fired</PilaHighIncendiary>
+			<PilaEMP>PilumEMP_Fired</PilaEMP>
+			<PilaSmoke>PilumSmoke_Fired</PilaSmoke>
+			<PilaFirefoam>PilumFirefoam_Fired</PilaFirefoam>
+			<PilaAntigrain>PilumAntigrain_Fired</PilaAntigrain>
+		</value>
+    </li-->
+
+	<!--Overwrite the Pilas added by the mod-->
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseWeaponAndAmmoNeolithic" Name="PilaStrappedBased">
+		<defName>PilaHighExplosive</defName>
+		<label>HEla</label>
+		<description>This shell won't miss 9 tiles away from its target (It might miss 2 but that's still valid).</description>
+		<graphicData>
+			<texPath>HEla</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<soundInteract>Interact_BeatFire</soundInteract>
+		<statBases>
+			<MarketValue>62.35</MarketValue>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>1.5</ShotSpread>
+			<SwayFactor>2.5</SwayFactor>
+			<Bulk>3.5</Bulk>
+			<Mass>2.00</Mass>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<!--equippedAngleOffset>30</equippedAngleOffset-->
+		<stackLimit>25</stackLimit>
+		<weaponTags Inherit="False">
+			<!--li>NeolithicRangedHeavy</li>
+                     <li>CE_Pila</li--><!-- tribal tags -->
+			<li>CE_OneHandedWeapon</li>
+			<li>IndustrialRangedHeavy</li>
+			<li>GrenadeDestructive</li>
+			<li>EmpireGrenadeDestructive</li><!-- Base tags from the mod -->
+		</weaponTags>
+		<tradeability>All</tradeability>
+		<verbs>
+			<li Class="CombatExtended.VerbPropertiesCE">
+				<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+				<hasStandardCommand>true</hasStandardCommand>
+				<defaultProjectile>PilumHE_Thrown</defaultProjectile>
+				<warmupTime>0.8</warmupTime>
+				<range>9</range>
+				<targetParams>
+					<canTargetLocations>true</canTargetLocations>
+				</targetParams>
+				<soundCast>Interact_BeatFire</soundCast>
+			</li>
+		</verbs>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>shaft</label>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<power>7</power>
+				<cooldownTime>1.35</cooldownTime>
+				<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>point</label>
+				<capacities>
+					<li>Stab</li>
+				</capacities>
+				<power>15</power>
+				<cooldownTime>1.37</cooldownTime>
+				<chanceFactor>1.5</chanceFactor>
+				<armorPenetrationBlunt>1.69</armorPenetrationBlunt>
+				<armorPenetrationSharp>0.34</armorPenetrationSharp>
+				<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+			</li>
+		</tools>
+		<ammoClass>Javelin</ammoClass>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="PilaStrappedBased">
+		<defName>PilaHighIncendiary</defName>
+		<label>HIla</label>
+		<description>No, there is no baby to reveal its gender with.</description>
+		<graphicData>
+			<texPath>HIla</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<soundInteract>Interact_BeatFire</soundInteract>
+		<statBases>
+			<MarketValue>49.6</MarketValue>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>1.5</ShotSpread>
+			<SwayFactor>2.5</SwayFactor>
+			<Bulk>3.5</Bulk>
+			<Mass>2.00</Mass>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<verbs Inherit="False">
+			<li Class="CombatExtended.VerbPropertiesCE">
+				<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+				<hasStandardCommand>true</hasStandardCommand>
+				<defaultProjectile>PilumHI_Thrown</defaultProjectile>
+				<warmupTime>0.8</warmupTime>
+				<range>9</range>
+				<targetParams>
+					<canTargetLocations>true</canTargetLocations>
+				</targetParams>
+				<soundCast>Interact_BeatFire</soundCast>
+			</li>
+		</verbs>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="PilaStrappedBased">
+		<defName>PilaEMP</defName>
+		<label>MPila</label>
+		<description>Five feet apart from mechanoids (or whatever it is you're aiming at).</description>
+		<graphicData>
+			<texPath>MPila</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<soundInteract>Interact_BeatFire</soundInteract>
+		<statBases>
+			<MarketValue>119.68</MarketValue>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>1.5</ShotSpread>
+			<SwayFactor>2.5</SwayFactor>
+			<Bulk>3.5</Bulk>
+			<Mass>2.00</Mass>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<verbs Inherit="False">
+			<li Class="CombatExtended.VerbPropertiesCE">
+				<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+				<hasStandardCommand>true</hasStandardCommand>
+				<defaultProjectile>PilumEMP_Thrown</defaultProjectile>
+				<warmupTime>0.8</warmupTime>
+				<range>9</range>
+				<targetParams>
+					<canTargetLocations>true</canTargetLocations>
+				</targetParams>
+				<soundCast>Interact_BeatFire</soundCast>
+			</li>
+		</verbs>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="PilaStrappedBased">
+		<defName>PilaSmoke</defName>
+		<label>Smola</label>
+		<description>Unfortunately, it is not, in fact, smokeleaf.</description>
+		<graphicData>
+			<texPath>Smola</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<soundInteract>Interact_BeatFire</soundInteract>
+		<statBases>
+			<MarketValue>44.29</MarketValue>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>1.5</ShotSpread>
+			<SwayFactor>2.5</SwayFactor>
+			<Bulk>3.5</Bulk>
+			<Mass>2.00</Mass>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<generateAllowChance>0</generateAllowChance>
+		<verbs Inherit="False">
+			<li Class="CombatExtended.VerbPropertiesCE">
+				<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+				<hasStandardCommand>true</hasStandardCommand>
+				<defaultProjectile>PilumSmoke_Thrown</defaultProjectile>
+				<warmupTime>0.8</warmupTime>
+				<range>9</range>
+				<targetParams>
+					<canTargetLocations>true</canTargetLocations>
+				</targetParams>
+				<soundCast>Interact_BeatFire</soundCast>
+			</li>
+		</verbs>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="PilaStrappedBased">
+		<defName>PilaFirefoam</defName>
+		<label>Fola</label>
+		<description>"Only you can prevent forest fires!"</description>
+		<graphicData>
+			<texPath>Fola</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<soundInteract>Interact_BeatFire</soundInteract>
+		<statBases>
+			<MarketValue>44.29</MarketValue>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>1.5</ShotSpread>
+			<SwayFactor>2.5</SwayFactor>
+			<Bulk>3.5</Bulk>
+			<Mass>2.00</Mass>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<generateAllowChance>0</generateAllowChance>
+		<verbs Inherit="False">
+			<li Class="CombatExtended.VerbPropertiesCE">
+				<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+				<hasStandardCommand>true</hasStandardCommand>
+				<defaultProjectile>PilumFirefoam_Thrown</defaultProjectile>
+				<warmupTime>0.8</warmupTime>
+				<range>9</range>
+				<targetParams>
+					<canTargetLocations>true</canTargetLocations>
+				</targetParams>
+				<soundCast>Interact_BeatFire</soundCast>
+			</li>
+		</verbs>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="PilaStrappedBased">
+		<defName>PilaAntigrain</defName>
+		<label>Sayonala</label>
+		<description>You can barely feel the singe.</description>
+		<graphicData>
+			<texPath>Fola</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<soundInteract>Interact_BeatFire</soundInteract>
+		<statBases>
+			<MarketValue>1507.26</MarketValue>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>1.5</ShotSpread>
+			<SwayFactor>2.5</SwayFactor>
+			<Bulk>3.5</Bulk>
+			<Mass>2.00</Mass>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<generateAllowChance>0.1</generateAllowChance><!-- carried over from base mod, generate commonality 0.1 -->
+		<verbs Inherit="False">
+			<li Class="CombatExtended.VerbPropertiesCE">
+				<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+				<hasStandardCommand>true</hasStandardCommand>
+				<defaultProjectile>PilumAntigrain_Thrown</defaultProjectile>
+				<warmupTime>0.8</warmupTime>
+				<range>9</range>
+				<targetParams>
+					<canTargetLocations>true</canTargetLocations>
+				</targetParams>
+				<soundCast>Interact_BeatFire</soundCast>
+			</li>
+		</verbs>
+	</ThingDef>
+
+	<!--Add Projectiles-->
+	<ThingDef ParentName="BasePilumProjectile">
+		<defName>PilumHE_Thrown</defName>
+		<label>pilum with HE shell on the tip</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>14</damageAmountBase>
+			<speed>27</speed>
+			<armorPenetrationBlunt>5.44</armorPenetrationBlunt>
+			<armorPenetrationSharp>4</armorPenetrationSharp>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>156</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>2.5</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>27</Fragment_Large>
+					<Fragment_Small>100</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BasePilumProjectile">
+		<defName>PilumHI_Thrown</defName>
+		<label>pilum with incendiary shell on the tip</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>14</damageAmountBase>
+			<speed>27</speed>
+			<armorPenetrationBlunt>5.44</armorPenetrationBlunt>
+			<armorPenetrationSharp>4</armorPenetrationSharp>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>5</damageAmountBase>
+				<explosiveDamageType>PrometheumFlame</explosiveDamageType>
+				<explosiveRadius>6.5</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
+				<preExplosionSpawnChance>0.20</preExplosionSpawnChance>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BasePilumProjectile">
+		<defName>PilumEMP_Thrown</defName>
+		<label>pilum with EMP shell on the tip</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>14</damageAmountBase>
+			<speed>27</speed>
+			<armorPenetrationBlunt>5.44</armorPenetrationBlunt>
+			<armorPenetrationSharp>4</armorPenetrationSharp>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>156</damageAmountBase>
+				<explosiveDamageType>EMP</explosiveDamageType>
+				<explosiveRadius>5.5</explosiveRadius>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BasePilumProjectile">
+		<defName>PilumSmoke_Thrown</defName>
+		<label>pilum with smoke shell on the tip</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>14</damageAmountBase>
+			<speed>27</speed>
+			<armorPenetrationBlunt>5.44</armorPenetrationBlunt>
+			<armorPenetrationSharp>4</armorPenetrationSharp>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<explosiveDamageType>Smoke</explosiveDamageType>
+				<explosiveRadius>6</explosiveRadius>
+				<explosionSound>Explosion_EMP</explosionSound>
+				<postExplosionGasType>BlindSmoke</postExplosionGasType>
+				<preExplosionSpawnChance>1</preExplosionSpawnChance>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BasePilumProjectile">
+		<defName>PilumFirefoam_Thrown</defName>
+		<label>pilum with smoke shell on the tip</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>14</damageAmountBase>
+			<speed>27</speed>
+			<armorPenetrationBlunt>5.44</armorPenetrationBlunt>
+			<armorPenetrationSharp>4</armorPenetrationSharp>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<explosiveDamageType>Extinguish</explosiveDamageType>
+				<explosiveRadius>9.5</explosiveRadius>
+				<explosionSound>Explosion_EMP</explosionSound>
+				<postExplosionSpawnThingDef>Filth_FireFoam</postExplosionSpawnThingDef>
+				<postExplosionSpawnChance>1</postExplosionSpawnChance>
+				<postExplosionSpawnThingCount>3</postExplosionSpawnThingCount>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BasePilumProjectile">
+		<defName>PilumAntigrain_Thrown</defName>
+		<label>pilum with antigrain shell on the tip</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>800</damageAmountBase>
+			<speed>27</speed>
+			<explosionRadius>50</explosionRadius>
+			<explosionChanceToStartFire>0.22</explosionChanceToStartFire>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<explosionEffect>GiantExplosion</explosionEffect>
+			<soundExplode>Explosion_GiantBomb</soundExplode>
+		</projectile>
+	</ThingDef>
+
+	<!--Add Recipes-->
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>MakeAmmo_PilaHighExplosive</defName>
+		<label>make HEla x5</label>
+		<description>Craft 5 HEla.</description>
+		<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+		<workSkill>Crafting</workSkill>
+		<recipeUsers>
+			<li>ElectricSmithy</li>
+			<li>FueledSmithy</li>
+			<li>CraftingSpot</li>
+		</recipeUsers>
+		<effectWorking>Smelt</effectWorking>
+		<unfinishedThingDef>UnfinishedAmmo</unfinishedThingDef>
+		<workAmount>2500</workAmount>
+		<jobString>Making HEla.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>19</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Shell_HighExplosive</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+				<li>Steel</li>
+				<li>Shell_HighExplosive</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<PilaHighExplosive>5</PilaHighExplosive>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>MakeAmmo_PilaHighIncendiary</defName>
+		<label>make HIla x5</label>
+		<description>Craft 5 HIla.</description>
+		<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+		<workSkill>Crafting</workSkill>
+		<recipeUsers>
+			<li>ElectricSmithy</li>
+			<li>FueledSmithy</li>
+			<li>CraftingSpot</li>
+		</recipeUsers>
+		<effectWorking>Smelt</effectWorking>
+		<unfinishedThingDef>UnfinishedAmmo</unfinishedThingDef>
+		<workAmount>2500</workAmount>
+		<jobString>Making HIla.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>19</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Shell_Incendiary</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+				<li>Steel</li>
+				<li>Shell_Incendiary</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<PilaHighIncendiary>5</PilaHighIncendiary>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>MakeAmmo_PilaEMP</defName>
+		<label>make MPila x5</label>
+		<description>Craft 5 MPila.</description>
+		<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+		<workSkill>Crafting</workSkill>
+		<recipeUsers>
+			<li>ElectricSmithy</li>
+			<li>FueledSmithy</li>
+			<li>CraftingSpot</li>
+		</recipeUsers>
+		<effectWorking>Smelt</effectWorking>
+		<unfinishedThingDef>UnfinishedAmmo</unfinishedThingDef>
+		<workAmount>2500</workAmount>
+		<jobString>Making MPila.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>19</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Shell_EMP</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+				<li>Steel</li>
+				<li>Shell_EMP</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<PilaEMP>5</PilaEMP>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>MakeAmmo_PilaSmoke</defName>
+		<label>make Smola x5</label>
+		<description>Craft 5 Smola.</description>
+		<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+		<workSkill>Crafting</workSkill>
+		<recipeUsers>
+			<li>ElectricSmithy</li>
+			<li>FueledSmithy</li>
+			<li>CraftingSpot</li>
+		</recipeUsers>
+		<effectWorking>Smelt</effectWorking>
+		<unfinishedThingDef>UnfinishedAmmo</unfinishedThingDef>
+		<workAmount>2500</workAmount>
+		<jobString>Making Smola.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>19</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Shell_Smoke</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+				<li>Steel</li>
+				<li>Shell_Smoke</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<PilaSmoke>5</PilaSmoke>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>MakeAmmo_PilaFirefoam</defName>
+		<label>make Fola x5</label>
+		<description>Craft 5 Fola.</description>
+		<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+		<workSkill>Crafting</workSkill>
+		<recipeUsers>
+			<li>ElectricSmithy</li>
+			<li>FueledSmithy</li>
+			<li>CraftingSpot</li>
+		</recipeUsers>
+		<effectWorking>Smelt</effectWorking>
+		<unfinishedThingDef>UnfinishedAmmo</unfinishedThingDef>
+		<workAmount>2500</workAmount>
+		<jobString>Making Fola.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>19</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Shell_Firefoam</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+				<li>Steel</li>
+				<li>Shell_Firefoam</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<PilaFirefoam>5</PilaFirefoam>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>MakeAmmo_PilaAntigrain</defName>
+		<label>make Sayonala</label>
+		<description>Craft a Sayonala.</description>
+		<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+		<workSkill>Crafting</workSkill>
+		<recipeUsers>
+			<li>ElectricSmithy</li>
+			<li>FueledSmithy</li>
+			<li>CraftingSpot</li>
+		</recipeUsers>
+		<effectWorking>Smelt</effectWorking>
+		<unfinishedThingDef>UnfinishedAmmo</unfinishedThingDef>
+		<workAmount>500</workAmount>
+		<jobString>Making Sayonala.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Shell_AntigrainWarhead</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+				<li>Steel</li>
+				<li>Shell_AntigrainWarhead</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<PilaAntigrain>1</PilaAntigrain>
+		</products>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/RW Pilas and Bows/Patches/RW Pilas and Bows/Arrows.xml b/ModPatches/RW Pilas and Bows/Patches/RW Pilas and Bows/Arrows.xml
new file mode 100644
index 0000000000..00df56a9b5
--- /dev/null
+++ b/ModPatches/RW Pilas and Bows/Patches/RW Pilas and Bows/Arrows.xml	
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--ARROWS-->
+
+	<!--Remove the bows and their projectiles-->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Bow_Grenade"] |
+			Defs/ThingDef[defName="Arrow_Grenade"] |
+			Defs/ThingDef[defName="Bow_Molotov"] |
+			Defs/ThingDef[defName="Arrow_Molotov"] |
+			Defs/ThingDef[defName="Bow_EMP"] |
+			Defs/ThingDef[defName="Arrow_EMP"] |
+			Defs/ThingDef[defName="Bow_Battery"] |
+			Defs/ThingDef[defName="Arrow_Battery"]
+		</xpath>
+	</Operation>
+
+	<!-- Ammo Set -->
+	<!--Regular Arrows-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_Arrow"]/ammoTypes</xpath>
+		<value>
+			<Ammo_Arrow_Grenade>Projectile_Arrow_Grenade</Ammo_Arrow_Grenade>
+			<Ammo_Arrow_Molotov>Projectile_Arrow_Molotov</Ammo_Arrow_Molotov>
+			<Ammo_Arrow_EMP>Projectile_Arrow_EMP</Ammo_Arrow_EMP>
+			<Ammo_Arrow_Battery>Projectile_Arrow_Battery</Ammo_Arrow_Battery>
+		</value>
+	</Operation>
+
+	<!--Streamlined Arrows-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_StreamlinedArrow"]/ammoTypes</xpath>
+		<value>
+			<Ammo_Arrow_Grenade>Projectile_StreamlinedArrow_Grenade</Ammo_Arrow_Grenade>
+			<Ammo_Arrow_Molotov>Projectile_StreamlinedArrow_Molotov</Ammo_Arrow_Molotov>
+			<Ammo_Arrow_EMP>Projectile_StreamlinedArrow_EMP</Ammo_Arrow_EMP>
+			<Ammo_Arrow_Battery>Projectile_StreamlinedArrow_Battery</Ammo_Arrow_Battery>
+		</value>
+	</Operation>
+
+	<!--Great Arrows-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_GreatArrow"]/ammoTypes</xpath>
+		<value>
+			<Ammo_GreatArrow_Grenade>Projectile_GreatArrow_Grenade</Ammo_GreatArrow_Grenade>
+			<Ammo_GreatArrow_Molotov>Projectile_GreatArrow_Molotov</Ammo_GreatArrow_Molotov>
+			<Ammo_GreatArrow_EMP>Projectile_GreatArrow_EMP</Ammo_GreatArrow_EMP>
+			<Ammo_GreatArrow_Battery>Projectile_GreatArrow_Battery</Ammo_GreatArrow_Battery>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RWY Dragon's Descent Void Dwellers/Defs/RWY Dragon's Descent Void Dwellers/DamageDefs/Void_DamageDefs.xml b/ModPatches/RWY Dragon's Descent Void Dwellers/Defs/RWY Dragon's Descent Void Dwellers/DamageDefs/Void_DamageDefs.xml
new file mode 100644
index 0000000000..e7fff4187c
--- /dev/null
+++ b/ModPatches/RWY Dragon's Descent Void Dwellers/Defs/RWY Dragon's Descent Void Dwellers/DamageDefs/Void_DamageDefs.xml	
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<DamageDef>
+		<defName>Void_Bomb</defName>
+		<label>The void</label>
+		<workerClass>DamageWorker_AddInjury</workerClass>
+		<externalViolence>true</externalViolence>
+		<isExplosive>true</isExplosive>
+		<deathMessage>{0} is consumed by the void.</deathMessage>
+		<hediff>Shredded</hediff>
+		<hediffSolid>Crack</hediffSolid>
+		<harmAllLayersUntilOutside>true</harmAllLayersUntilOutside>
+		<canUseDeflectMetalEffect>false</canUseDeflectMetalEffect>
+		<armorCategory>Blunt</armorCategory>
+		<minDamageToFragment>15</minDamageToFragment>
+		<defaultDamage>36</defaultDamage>
+		<defaultStoppingPower>2.0</defaultStoppingPower>
+		<defaultArmorPenetration>90</defaultArmorPenetration>
+		<buildingDamageFactor>4</buildingDamageFactor>
+		<plantDamageFactor>4</plantDamageFactor>
+		<explosionAffectOutsidePartsOnly>false</explosionAffectOutsidePartsOnly>
+		<explosionHeatEnergyPerCell>1</explosionHeatEnergyPerCell>
+		<explosionCellFleck>Mote_VoidExplosion</explosionCellFleck>
+		<explosionColorCenter>(1, 0.5, 0.3)</explosionColorCenter>
+		<explosionColorEdge>(0.6, 0.5, 0.4)</explosionColorEdge>
+		<soundExplosion>Explosion_Bomb</soundExplosion>
+		<combatLogRules>Damage_Bomb</combatLogRules>
+	</DamageDef>
+
+	<DamageDef>
+		<defName>Void_Arururu</defName>
+		<label>Molten</label>
+		<workerClass>DamageWorker_AddInjury</workerClass>
+		<externalViolence>true</externalViolence>
+		<isExplosive>true</isExplosive>
+		<deathMessage>{0} is moltened.</deathMessage>
+		<hediff>Shredded</hediff>
+		<hediffSolid>Crack</hediffSolid>
+		<harmAllLayersUntilOutside>true</harmAllLayersUntilOutside>
+		<canUseDeflectMetalEffect>false</canUseDeflectMetalEffect>
+		<armorCategory>Blunt</armorCategory>
+		<minDamageToFragment>15</minDamageToFragment>
+		<defaultDamage>58</defaultDamage>
+		<defaultStoppingPower>3.0</defaultStoppingPower>
+		<defaultArmorPenetration>140</defaultArmorPenetration>
+		<buildingDamageFactor>4</buildingDamageFactor>
+		<plantDamageFactor>4</plantDamageFactor>
+		<explosionAffectOutsidePartsOnly>false</explosionAffectOutsidePartsOnly>
+		<explosionHeatEnergyPerCell>1</explosionHeatEnergyPerCell>
+		<explosionCellFleck>Mote_StarExplosion</explosionCellFleck>
+		<explosionColorCenter>(1, 0.5, 0.3)</explosionColorCenter>
+		<explosionColorEdge>(0.6, 0.5, 0.4)</explosionColorEdge>
+		<soundExplosion>Explosion_Bomb</soundExplosion>
+		<combatLogRules>Damage_Bomb</combatLogRules>
+	</DamageDef>
+
+	<DamageDef>
+		<defName>Void_Molten</defName>
+		<label>Molten</label>
+		<workerClass>DamageWorker_AddInjury</workerClass>
+		<externalViolence>true</externalViolence>
+		<isExplosive>true</isExplosive>
+		<deathMessage>{0} is moltened.</deathMessage>
+		<hediff>Shredded</hediff>
+		<hediffSolid>Crack</hediffSolid>
+		<harmAllLayersUntilOutside>true</harmAllLayersUntilOutside>
+		<canUseDeflectMetalEffect>false</canUseDeflectMetalEffect>
+		<armorCategory>Blunt</armorCategory>
+		<minDamageToFragment>15</minDamageToFragment>
+		<defaultDamage>40</defaultDamage>
+		<defaultStoppingPower>3.0</defaultStoppingPower>
+		<defaultArmorPenetration>140</defaultArmorPenetration>
+		<buildingDamageFactor>4</buildingDamageFactor>
+		<plantDamageFactor>4</plantDamageFactor>
+		<explosionAffectOutsidePartsOnly>false</explosionAffectOutsidePartsOnly>
+		<explosionHeatEnergyPerCell>1</explosionHeatEnergyPerCell>
+		<explosionCellFleck>Mote_MoltenExplosion</explosionCellFleck>
+		<explosionColorCenter>(1, 0.5, 0.3)</explosionColorCenter>
+		<explosionColorEdge>(0.6, 0.5, 0.4)</explosionColorEdge>
+		<soundExplosion>Explosion_Bomb</soundExplosion>
+		<combatLogRules>Damage_Bomb</combatLogRules>
+	</DamageDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/RWY Dragon's Descent Void Dwellers/Patches/RWY Dragon's Descent Void Dwellers/Ability Defs/Shoot_Breath_SpaceDragons.xml b/ModPatches/RWY Dragon's Descent Void Dwellers/Patches/RWY Dragon's Descent Void Dwellers/Ability Defs/Shoot_Breath_SpaceDragons.xml
new file mode 100644
index 0000000000..3acf4c2ed6
--- /dev/null
+++ b/ModPatches/RWY Dragon's Descent Void Dwellers/Patches/RWY Dragon's Descent Void Dwellers/Ability Defs/Shoot_Breath_SpaceDragons.xml	
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Void Dragon Breath -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_Void_Breath"]/range</xpath>
+		<value>
+			<range>60</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_Void_Breath"]/castTime</xpath>
+		<value>
+			<castTime>1.6</castTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_Void_Breath"]</xpath>
+		<value>
+			<minRange>4</minRange>
+		</value>
+	</Operation>
+
+	<!-- Nebula dragon Breath -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_Nebula_Breath"]/range</xpath>
+		<value>
+			<range>55</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_Nebula_Breath"]</xpath>
+		<value>
+			<minRange>8</minRange>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_Nebula_Breath"]/castTime</xpath>
+		<value>
+			<castTime>2.5</castTime>
+		</value>
+	</Operation>
+
+	<!-- Aurelion Dragon Breath -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_Aurelion_Breath"]/range</xpath>
+		<value>
+			<range>60</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_Aurelion_Breath"]</xpath>
+		<value>
+			<minRange>9</minRange>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_Aurelion_Breath"]/castTime</xpath>
+		<value>
+			<castTime>2.0</castTime>
+		</value>
+	</Operation>
+
+	<!-- Star Dust Breath -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_Stardust_Breath"]/range</xpath>
+		<value>
+			<range>43</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_Stardust_Breath"]</xpath>
+		<value>
+			<minRange>3</minRange>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_Stardust_Breath"]/castTime</xpath>
+		<value>
+			<castTime>2.5</castTime>
+		</value>
+	</Operation>
+
+	<!-- Molten Breath -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_Molten_Breath"]/range</xpath>
+		<value>
+			<range>36</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_Molten_Breath"]</xpath>
+		<value>
+			<minRange>5</minRange>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_Molten_Breath"]/castTime</xpath>
+		<value>
+			<castTime>3.0</castTime>
+		</value>
+	</Operation>
+
+	<!-- Surge Breath -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_DD_Surge_Breath"]/range</xpath>
+		<value>
+			<range>36</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_DD_Surge_Breath"]/castTime</xpath>
+		<value>
+			<castTime>1.5</castTime>
+		</value>
+	</Operation>
+
+	<!-- Mind Flay Breath -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_DD_Mind_Flay"]/range</xpath>
+		<value>
+			<range>36</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_DD_Mind_Flay"]</xpath>
+		<value>
+			<minRange>6</minRange>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_DD_Mind_Flay"]/castTime</xpath>
+		<value>
+			<castTime>3.0</castTime>
+		</value>
+	</Operation>
+
+	<!-- Hellfire Breath -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_DD_Hellfire"]/range</xpath>
+		<value>
+			<range>36</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_DD_Hellfire"]</xpath>
+		<value>
+			<minRange>3</minRange>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_DD_Hellfire"]/castTime</xpath>
+		<value>
+			<castTime>2.5</castTime>
+		</value>
+	</Operation>
+
+	<!-- Eclipse Breath -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_DD_Eclipse"]/range</xpath>
+		<value>
+			<range>60</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_DD_Eclipse"]</xpath>
+		<value>
+			<minRange>6</minRange>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_DD_Eclipse"]/castTime</xpath>
+		<value>
+			<castTime>3.5</castTime>
+		</value>
+	</Operation>
+
+	<!-- Constrain Breath -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_DD_Constrain"]/range</xpath>
+		<value>
+			<range>30</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_DD_Constrain"]</xpath>
+		<value>
+			<minRange>3</minRange>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_DD_Constrain"]/castTime</xpath>
+		<value>
+			<castTime>2</castTime>
+		</value>
+	</Operation>
+
+	<!-- Constrain Breath -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_DD_Rend"]/range</xpath>
+		<value>
+			<range>48</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_DD_Rend"]</xpath>
+		<value>
+			<minRange>5</minRange>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_DD_Rend"]/castTime</xpath>
+		<value>
+			<castTime>1.5</castTime>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RWY Dragon's Descent Void Dwellers/Patches/RWY Dragon's Descent Void Dwellers/Bodies/Bodies_SpaceDragons.xml b/ModPatches/RWY Dragon's Descent Void Dwellers/Patches/RWY Dragon's Descent Void Dwellers/Bodies/Bodies_SpaceDragons.xml
new file mode 100644
index 0000000000..159f2f6583
--- /dev/null
+++ b/ModPatches/RWY Dragon's Descent Void Dwellers/Patches/RWY Dragon's Descent Void Dwellers/Bodies/Bodies_SpaceDragons.xml	
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Natural Armor -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="BipedAnimalWithoutWingsDragon"]//*[
+			def="Body" or
+			def="MiddleBodySegment"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="BipedAnimalWithoutWingsDragon"]//*[
+			def="Body" or
+			def="Tail" or
+			def="Neck" or
+			def="Head" or
+			def="Ear" or
+			def="Nose" or
+			def="Horn" or
+			def="Shoulder" or
+			def="AnimalJaw" or
+			def="Arm" or
+			def="MiddleBodySegment" or
+			def="FrontClaw" or
+			def="Paw"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="BipedAnimalWithWingsDragon"]//*[
+			def="Body" or
+			def="MiddleBodySegment"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="BipedAnimalWithWingsDragon"]//*[
+			def="Body" or
+			def="Wing" or
+			def="Tail" or
+			def="Neck" or
+			def="Head" or
+			def="Ear" or
+			def="Nose" or
+			def="Horn" or
+			def="Shoulder" or
+			def="AnimalJaw" or
+			def="Arm" or
+			def="MiddleBodySegment" or
+			def="FrontClaw" or
+			def="Paw"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RWY Dragon's Descent Void Dwellers/Patches/RWY Dragon's Descent Void Dwellers/Projectiles/Projectile_SpaceDragon.xml b/ModPatches/RWY Dragon's Descent Void Dwellers/Patches/RWY Dragon's Descent Void Dwellers/Projectiles/Projectile_SpaceDragon.xml
new file mode 100644
index 0000000000..b180974c6e
--- /dev/null
+++ b/ModPatches/RWY Dragon's Descent Void Dwellers/Patches/RWY Dragon's Descent Void Dwellers/Projectiles/Projectile_SpaceDragon.xml	
@@ -0,0 +1,257 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Void Breath -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Projectile_Void_Breath"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Projectile_Void_Breath"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>36</speed>
+				<flyOverhead>false</flyOverhead>
+				<damageDef>Void_Bomb</damageDef>
+				<soundExplode>DD_Void_DarkExplosion</soundExplode>
+				<explosionRadius>3.3</explosionRadius>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+			</projectile>
+		</value>
+	</Operation>
+
+	<!-- Nebula Breath -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Projectile_Nebula_Breath"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Projectile_Nebula_Breath"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>44</speed>
+				<flyOverhead>false</flyOverhead>
+				<damageDef>NebulaFlame</damageDef>
+				<damageAmountBase>19</damageAmountBase>
+				<soundExplode>DD_Void_DarkExplosion</soundExplode>
+				<explosionRadius>2.1</explosionRadius>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+			</projectile>
+		</value>
+	</Operation>
+
+	<!-- Arururulion Breath -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Projectile_Aurelion_Breath"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Projectile_Aurelion_Breath"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>58</speed>
+				<flyOverhead>false</flyOverhead>
+				<damageDef>Void_Arururu</damageDef>
+				<soundExplode>DD_Void_DarkExplosion</soundExplode>
+				<explosionRadius>3.3</explosionRadius>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+			</projectile>
+		</value>
+	</Operation>
+
+	<!-- Stardust Breath -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Projectile_Stardust_Breath"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Projectile_Stardust_Breath"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>42</speed>
+				<flyOverhead>false</flyOverhead>
+				<damageDef>EMP</damageDef>
+				<damageAmountBase>9</damageAmountBase>
+				<soundExplode>DD_Void_DarkExplosion</soundExplode>
+				<explosionRadius>3.3</explosionRadius>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+			</projectile>
+		</value>
+	</Operation>
+
+	<!-- Molten Breath -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Projectile_Molten_Breath"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Projectile_Molten_Breath"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>48</speed>
+				<flyOverhead>false</flyOverhead>
+				<damageDef>Void_Molten</damageDef>
+				<soundExplode>DD_Void_DarkExplosion</soundExplode>
+				<explosionRadius>4.1</explosionRadius>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+			</projectile>
+		</value>
+	</Operation>
+
+	<!-- Surge Breath -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Projectile_DD_Surge_Breath"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Projectile_DD_Surge_Breath"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>48</speed>
+				<flyOverhead>false</flyOverhead>
+				<damageDef>DD_Void_Surge</damageDef>
+				<soundExplode>DD_Void_DarkExplosion</soundExplode>
+				<explosionRadius>1.5</explosionRadius>
+				<damageAmountBase>1</damageAmountBase>
+				<armorPenetrationBase>20.0</armorPenetrationBase>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+			</projectile>
+		</value>
+	</Operation>
+
+	<!-- Mind Flay Breath -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Projectile_DD_Mind_Flay"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Projectile_DD_Mind_Flay"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>48</speed>
+				<flyOverhead>false</flyOverhead>
+				<damageDef>DD_Mind_Flay</damageDef>
+				<soundExplode>DD_Void_DarkExplosion</soundExplode>
+				<damageAmountBase>1</damageAmountBase>
+				<armorPenetrationBase>20.0</armorPenetrationBase>
+				<explosionRadius>2</explosionRadius>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+			</projectile>
+		</value>
+	</Operation>
+
+	<!-- Hellfire Breath -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Projectile_DD_Hellfire"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Projectile_DD_Hellfire"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>34</speed>
+				<flyOverhead>false</flyOverhead>
+				<damageDef>DD_Hellfire</damageDef>
+				<soundExplode>DD_Void_DarkExplosion</soundExplode>
+				<ai_IsIncendiary>false</ai_IsIncendiary>
+				<explosionRadius>3</explosionRadius>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+			</projectile>
+		</value>
+	</Operation>
+
+	<!-- Eclipse Breath -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Projectile_DD_Eclipse"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Projectile_DD_Eclipse"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>88</speed>
+				<flyOverhead>false</flyOverhead>
+				<damageDef>DD_Eclipse</damageDef>
+				<soundExplode>DD_Void_DarkExplosion</soundExplode>
+				<explosionRadius>2</explosionRadius>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+			</projectile>
+		</value>
+	</Operation>
+
+	<!-- Rend Breath -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Projectile_DD_Rend"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Projectile_DD_Rend"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>34</speed>
+				<flyOverhead>false</flyOverhead>
+				<damageDef>DD_Rend</damageDef>
+				<soundExplode>DD_Void_DarkExplosion</soundExplode>
+				<explosionRadius>5</explosionRadius>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+			</projectile>
+		</value>
+	</Operation>
+
+	<!-- Constrain Breath -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Projectile_DD_Constrain"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Projectile_DD_Constrain"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>48</speed>
+				<flyOverhead>false</flyOverhead>
+				<damageDef>DD_Constrain</damageDef>
+				<soundExplode>DD_Void_DarkExplosion</soundExplode>
+				<damageAmountBase>1</damageAmountBase>
+				<armorPenetrationBase>20.0</armorPenetrationBase>
+				<explosionRadius>2.5</explosionRadius>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+			</projectile>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RWY Dragon's Descent Void Dwellers/Patches/RWY Dragon's Descent Void Dwellers/ThingDefs_Items/Items_Resource_SpaceDragon.xml b/ModPatches/RWY Dragon's Descent Void Dwellers/Patches/RWY Dragon's Descent Void Dwellers/ThingDefs_Items/Items_Resource_SpaceDragon.xml
new file mode 100644
index 0000000000..e1dc06761f
--- /dev/null
+++ b/ModPatches/RWY Dragon's Descent Void Dwellers/Patches/RWY Dragon's Descent Void Dwellers/ThingDefs_Items/Items_Resource_SpaceDragon.xml	
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Dragon_Leather === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DD_AbyssalPearl"]/statBases/StuffPower_Armor_Sharp</xpath>
+
+		<value>
+			<StuffPower_Armor_Sharp>0.807</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DD_AbyssalPearl"]/statBases/StuffPower_Armor_Blunt</xpath>
+
+		<value>
+			<StuffPower_Armor_Blunt>0.42</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DD_AbyssalPearl"]/statBases/StuffPower_Armor_Heat</xpath>
+
+		<value>
+			<StuffPower_Armor_Heat>0.16</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DD_AbyssalPearl"]/statBases/BluntDamageMultiplier</xpath>
+
+		<value>
+			<BluntDamageMultiplier>1.4</BluntDamageMultiplier>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DD_AbyssalPearl"]/stuffProps/statFactors</xpath>
+
+		<value>
+			<MeleePenetrationFactor>1.5</MeleePenetrationFactor>
+		</value>
+	</Operation>
+
+	<!-- === Rich_Dragon_Leather === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DD_BrittleStar"]/statBases/StuffPower_Armor_Sharp</xpath>
+
+		<value>
+			<StuffPower_Armor_Sharp>0.03</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DD_BrittleStar"]/statBases/StuffPower_Armor_Blunt</xpath>
+
+		<value>
+			<StuffPower_Armor_Blunt>0.02</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DD_BrittleStar"]/statBases/StuffPower_Armor_Heat</xpath>
+
+		<value>
+			<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RWY Dragon's Descent Void Dwellers/Patches/RWY Dragon's Descent Void Dwellers/ThingDefs_Races/Races_Animal_SpaceDragon_Base.xml b/ModPatches/RWY Dragon's Descent Void Dwellers/Patches/RWY Dragon's Descent Void Dwellers/ThingDefs_Races/Races_Animal_SpaceDragon_Base.xml
new file mode 100644
index 0000000000..e7111a66a5
--- /dev/null
+++ b/ModPatches/RWY Dragon's Descent Void Dwellers/Patches/RWY Dragon's Descent Void Dwellers/ThingDefs_Races/Races_Animal_SpaceDragon_Base.xml	
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ======== BaseDragon (Dragon Base) ======== -->
+	<!-- ====== ModExtension ====== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="VoidDragonRaceBase" or @Name="NebulaDragonRaceBase" or @Name="AurelionDragonRaceBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ======== Void Base ======== -->
+	<!-- ====== statBases ====== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="VoidDragonRaceBase" or @Name="VoidDragonWWRaceBase"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.24</MeleeDodgeChance>
+			<MeleeCritChance>2</MeleeCritChance>
+			<MeleeParryChance>0.64</MeleeParryChance>
+			<SightsEfficiency>1</SightsEfficiency>
+			<AimingAccuracy>1</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="VoidDragonRaceBase" or @Name="VoidDragonWWRaceBase" or @Name="NebulaDragonRaceBase" or @Name="StarDragonRaceBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>50</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="VoidDragonRaceBase" or @Name="VoidDragonWWRaceBase" or @Name="NebulaDragonRaceBase" or @Name="StarDragonRaceBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="NebulaDragonRaceBase"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.57</MeleeDodgeChance>
+			<MeleeCritChance>1.1</MeleeCritChance>
+			<MeleeParryChance>0.36</MeleeParryChance>
+			<SightsEfficiency>1</SightsEfficiency>
+			<AimingAccuracy>1</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="StarDragonRaceBase"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.66</MeleeDodgeChance>
+			<MeleeCritChance>1.56</MeleeCritChance>
+			<MeleeParryChance>0.64</MeleeParryChance>
+			<SightsEfficiency>1</SightsEfficiency>
+			<AimingAccuracy>1</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+		</value>
+	</Operation>
+
+	<!-- Natural Armor Comp -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="VoidDragonRaceBase" or @Name="VoidDragonWWRaceBase"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>16500</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="NebulaDragonRaceBase"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>15250</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="StarDragonRaceBase"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>14000</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ====== race (Race Properties) ====== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="VoidDragonRaceBase"]/race/manhunterOnTameFailChance</xpath>
+		<value>
+			<manhunterOnTameFailChance>0.6</manhunterOnTameFailChance>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RWY Dragon's Descent Void Dwellers/Patches/RWY Dragon's Descent Void Dwellers/ThingDefs_Races/Races_SpaceDragon_Attacks.xml b/ModPatches/RWY Dragon's Descent Void Dwellers/Patches/RWY Dragon's Descent Void Dwellers/ThingDefs_Races/Races_SpaceDragon_Attacks.xml
new file mode 100644
index 0000000000..1d2bc9b446
--- /dev/null
+++ b/ModPatches/RWY Dragon's Descent Void Dwellers/Patches/RWY Dragon's Descent Void Dwellers/ThingDefs_Races/Races_SpaceDragon_Attacks.xml	
@@ -0,0 +1,813 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ====== Tools ====== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Purple_Nebula_Dragon" or
+			defName="Blue_Nebula_Dragon" or
+			defName="Red_Nebula_Dragon" or
+			defName="EH_Void_Dragon" or
+			defName="Destroyer_Void_Dragon" or
+			defName="Eater_Void_Dragon" or
+			defName="Harbinger_Void_Dragon" or
+			defName="Rurelion_Zol_Dragon"]/tools
+		</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>DD_Knockback</label>
+					<capacities>
+						<li>DD_Knockback</li>
+					</capacities>
+					<power>110</power>
+					<armorPenetrationBlunt>115</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+					<cooldownTime>4.0</cooldownTime>
+					<linkedBodyPartsGroup>Tail</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ====== Tools ====== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/ThingDef[
+			defName="Purple_Nebula_Dragon" or
+			defName="Blue_Nebula_Dragon" or
+			defName="Red_Nebula_Dragon" or
+			defName="EH_Void_Dragon" or
+			defName="Destroyer_Void_Dragon" or
+			defName="Eater_Void_Dragon" or
+			defName="Harbinger_Void_Dragon" or
+			defName="Rurelion_Zol_Dragon"]/tools
+		</xpath>
+		<value>
+			<li Class="CombatExtended.ToolCE">
+				<cooldownTime>4.66</cooldownTime>
+				<power>107</power>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<surpriseAttack>
+					<extraMeleeDamages>
+						<li>
+							<def>Stun</def>
+							<amount>20</amount>
+						</li>
+					</extraMeleeDamages>
+				</surpriseAttack>
+				<linkedBodyPartsGroup>Tail</linkedBodyPartsGroup>
+				<label>tail</label>
+				<armorPenetrationBlunt>54.611</armorPenetrationBlunt>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ====== Tools ====== -->
+	<!-- ====== Purple Neb====== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Purple_Nebula_Dragon"]/tools</xpath>
+		<value>
+			<li Class="CombatExtended.ToolCE">
+				<label>left dragonclaw</label>
+				<capacities>
+					<li>Scratch</li>
+					<li>Stab</li>
+					<li>Cut</li>
+				</capacities>
+				<power>30</power>
+				<extraMeleeDamages>
+					<li>
+						<def>NebulaFlame</def>
+						<amount>8</amount>
+						<chance>0.33</chance>
+					</li>
+				</extraMeleeDamages>
+				<cooldownTime>1.3</cooldownTime>
+				<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+				<armorPenetrationSharp>16</armorPenetrationSharp>
+				<armorPenetrationBlunt>40</armorPenetrationBlunt>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>right dragonclaw</label>
+				<capacities>
+					<li>Scratch</li>
+					<li>Stab</li>
+					<li>Cut</li>
+				</capacities>
+				<power>30</power>
+				<extraMeleeDamages>
+					<li>
+						<def>NebulaFlame</def>
+						<amount>8</amount>
+						<chance>0.33</chance>
+					</li>
+				</extraMeleeDamages>
+				<cooldownTime>1.3</cooldownTime>
+				<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+				<armorPenetrationSharp>16</armorPenetrationSharp>
+				<armorPenetrationBlunt>40</armorPenetrationBlunt>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>razorfangs</label>
+				<capacities>
+					<li>Bite</li>
+					<li>Stab</li>
+				</capacities>
+				<power>56</power>
+				<extraMeleeDamages>
+					<li>
+						<def>NebulaFlame</def>
+						<amount>12</amount>
+						<chance>0.33</chance>
+					</li>
+				</extraMeleeDamages>
+				<cooldownTime>2.4</cooldownTime>
+				<armorPenetrationSharp>28</armorPenetrationSharp>
+				<armorPenetrationBlunt>80</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+				<chanceFactor>0.75</chanceFactor>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>head</label>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<power>24</power>
+				<extraMeleeDamages>
+					<li>
+						<def>NebulaFlame</def>
+						<amount>12</amount>
+						<chance>0.33</chance>
+					</li>
+				</extraMeleeDamages>
+				<cooldownTime>3</cooldownTime>
+				<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+				<armorPenetrationBlunt>30.55</armorPenetrationBlunt>
+				<chanceFactor>0.6</chanceFactor>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ====== Blue Neb Neb====== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Blue_Nebula_Dragon" or defName="Red_Nebula_Dragon"]/tools</xpath>
+		<value>
+			<li Class="CombatExtended.ToolCE">
+				<label>left dragonclaw</label>
+				<capacities>
+					<li>Scratch</li>
+					<li>Stab</li>
+					<li>Cut</li>
+				</capacities>
+				<power>36</power>
+				<extraMeleeDamages>
+					<li>
+						<def>NebulaFlame</def>
+						<amount>9</amount>
+						<chance>0.33</chance>
+					</li>
+				</extraMeleeDamages>
+				<cooldownTime>1.3</cooldownTime>
+				<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+				<armorPenetrationSharp>16</armorPenetrationSharp>
+				<armorPenetrationBlunt>40</armorPenetrationBlunt>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>right dragonclaw</label>
+				<capacities>
+					<li>Scratch</li>
+					<li>Stab</li>
+					<li>Cut</li>
+				</capacities>
+				<power>36</power>
+				<extraMeleeDamages>
+					<li>
+						<def>NebulaFlame</def>
+						<amount>9</amount>
+						<chance>0.33</chance>
+					</li>
+				</extraMeleeDamages>
+				<cooldownTime>1.3</cooldownTime>
+				<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+				<armorPenetrationSharp>16</armorPenetrationSharp>
+				<armorPenetrationBlunt>40</armorPenetrationBlunt>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>razorfangs</label>
+				<capacities>
+					<li>Bite</li>
+					<li>Stab</li>
+				</capacities>
+				<power>64</power>
+				<extraMeleeDamages>
+					<li>
+						<def>NebulaFlame</def>
+						<amount>15</amount>
+						<chance>0.33</chance>
+					</li>
+				</extraMeleeDamages>
+				<cooldownTime>2.4</cooldownTime>
+				<armorPenetrationSharp>28</armorPenetrationSharp>
+				<armorPenetrationBlunt>80</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+				<chanceFactor>0.75</chanceFactor>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>head</label>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<power>24</power>
+				<extraMeleeDamages>
+					<li>
+						<def>NebulaFlame</def>
+						<amount>15</amount>
+						<chance>0.33</chance>
+					</li>
+				</extraMeleeDamages>
+				<cooldownTime>3</cooldownTime>
+				<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+				<armorPenetrationBlunt>30.55</armorPenetrationBlunt>
+				<chanceFactor>0.6</chanceFactor>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ====== Void====== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="EH_Void_Dragon"]/tools</xpath>
+		<value>
+			<li Class="CombatExtended.ToolCE">
+				<label>left dragonclaw</label>
+				<capacities>
+					<li>Scratch</li>
+					<li>Stab</li>
+					<li>Cut</li>
+				</capacities>
+				<power>64</power>
+				<cooldownTime>1.64</cooldownTime>
+				<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+				<armorPenetrationSharp>24</armorPenetrationSharp>
+				<armorPenetrationBlunt>80</armorPenetrationBlunt>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>right dragonclaw</label>
+				<capacities>
+					<li>Scratch</li>
+					<li>Stab</li>
+					<li>Cut</li>
+				</capacities>
+				<power>64</power>
+				<cooldownTime>1.64</cooldownTime>
+				<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+				<armorPenetrationSharp>24</armorPenetrationSharp>
+				<armorPenetrationBlunt>80</armorPenetrationBlunt>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>razorfangs</label>
+				<capacities>
+					<li>Bite</li>
+					<li>Stab</li>
+				</capacities>
+				<power>148</power>
+				<cooldownTime>3.4</cooldownTime>
+				<armorPenetrationSharp>32</armorPenetrationSharp>
+				<armorPenetrationBlunt>80</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+				<chanceFactor>0.75</chanceFactor>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>head</label>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<power>43</power>
+				<cooldownTime>3</cooldownTime>
+				<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+				<armorPenetrationBlunt>80.55</armorPenetrationBlunt>
+				<chanceFactor>0.6</chanceFactor>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ======Supah Destroya====== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Destroyer_Void_Dragon" or defName="Eater_Void_Dragon"]/tools</xpath>
+		<value>
+			<li Class="CombatExtended.ToolCE">
+				<label>left dragonclaw</label>
+				<capacities>
+					<li>Scratch</li>
+					<li>Stab</li>
+					<li>Cut</li>
+				</capacities>
+				<power>101</power>
+				<cooldownTime>1.64</cooldownTime>
+				<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+				<armorPenetrationSharp>36</armorPenetrationSharp>
+				<armorPenetrationBlunt>136</armorPenetrationBlunt>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>right dragonclaw</label>
+				<capacities>
+					<li>Scratch</li>
+					<li>Stab</li>
+					<li>Cut</li>
+				</capacities>
+				<power>101</power>
+				<cooldownTime>1.64</cooldownTime>
+				<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+				<armorPenetrationSharp>36</armorPenetrationSharp>
+				<armorPenetrationBlunt>136</armorPenetrationBlunt>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>razorfangs</label>
+				<capacities>
+					<li>Bite</li>
+					<li>Stab</li>
+				</capacities>
+				<power>208</power>
+				<cooldownTime>3.4</cooldownTime>
+				<armorPenetrationSharp>60</armorPenetrationSharp>
+				<armorPenetrationBlunt>300</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+				<chanceFactor>0.75</chanceFactor>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>head</label>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<power>60</power>
+				<cooldownTime>3</cooldownTime>
+				<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+				<armorPenetrationBlunt>150.55</armorPenetrationBlunt>
+				<chanceFactor>0.6</chanceFactor>
+			</li>
+		</value>
+	</Operation>
+	<!-- ======The End====== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Harbinger_Void_Dragon"]/tools</xpath>
+		<value>
+			<li Class="CombatExtended.ToolCE">
+				<label>left dragonclaw</label>
+				<capacities>
+					<li>Scratch</li>
+					<li>Stab</li>
+					<li>Cut</li>
+				</capacities>
+				<power>144</power>
+				<cooldownTime>1.64</cooldownTime>
+				<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+				<armorPenetrationSharp>44</armorPenetrationSharp>
+				<armorPenetrationBlunt>200</armorPenetrationBlunt>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>right dragonclaw</label>
+				<capacities>
+					<li>Scratch</li>
+					<li>Stab</li>
+					<li>Cut</li>
+				</capacities>
+				<power>144</power>
+				<cooldownTime>1.64</cooldownTime>
+				<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+				<armorPenetrationSharp>44</armorPenetrationSharp>
+				<armorPenetrationBlunt>200</armorPenetrationBlunt>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>razorfangs</label>
+				<capacities>
+					<li>Bite</li>
+					<li>Stab</li>
+				</capacities>
+				<power>288</power>
+				<cooldownTime>3.4</cooldownTime>
+				<armorPenetrationSharp>80</armorPenetrationSharp>
+				<armorPenetrationBlunt>600</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+				<chanceFactor>0.75</chanceFactor>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>head</label>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<power>80</power>
+				<cooldownTime>3</cooldownTime>
+				<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+				<armorPenetrationBlunt>240.55</armorPenetrationBlunt>
+				<chanceFactor>0.6</chanceFactor>
+			</li>
+		</value>
+	</Operation>
+	<!-- ======Zol====== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Rurelion_Zol_Dragon"]/tools</xpath>
+		<value>
+			<li Class="CombatExtended.ToolCE">
+				<label>left dragonclaw</label>
+				<capacities>
+					<li>Scratch</li>
+					<li>Stab</li>
+					<li>Cut</li>
+				</capacities>
+				<power>88</power>
+				<cooldownTime>1.44</cooldownTime>
+				<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+				<armorPenetrationSharp>32</armorPenetrationSharp>
+				<armorPenetrationBlunt>120</armorPenetrationBlunt>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>right dragonclaw</label>
+				<capacities>
+					<li>Scratch</li>
+					<li>Stab</li>
+					<li>Cut</li>
+				</capacities>
+				<power>88</power>
+				<cooldownTime>1.44</cooldownTime>
+				<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+				<armorPenetrationSharp>32</armorPenetrationSharp>
+				<armorPenetrationBlunt>120</armorPenetrationBlunt>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>razorfangs</label>
+				<capacities>
+					<li>Bite</li>
+					<li>Stab</li>
+				</capacities>
+				<power>188</power>
+				<cooldownTime>3.0</cooldownTime>
+				<armorPenetrationSharp>55</armorPenetrationSharp>
+				<armorPenetrationBlunt>248</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+				<chanceFactor>0.75</chanceFactor>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>head</label>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<power>43</power>
+				<cooldownTime>3</cooldownTime>
+				<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+				<armorPenetrationBlunt>100.55</armorPenetrationBlunt>
+				<chanceFactor>0.6</chanceFactor>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ====== Verbs ====== -->
+	<!-- Purple, Blue, and Red Nebula Dragons -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName="Purple_Nebula_Dragon" or
+			defName="Blue_Nebula_Dragon" or
+			defName="Red_Nebula_Dragon"]/verbs
+		</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Projectile_Nebula_Breath</defaultProjectile>
+					<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+					<warmupTime>2.5</warmupTime>
+					<burstShotCount>33</burstShotCount>
+					<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+					<minRange>8</minRange>
+					<range>55</range>
+					<soundCast>DD_Void_FireBreath</soundCast>
+					<muzzleFlashScale>4</muzzleFlashScale>
+					<label>Nebula breath</label>
+					<commonality>0.7</commonality>
+					<recoilAmount>0.48</recoilAmount>
+					<recoilPattern>Mounted</recoilPattern>
+				</li>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+					<defaultProjectile>Projectile_Stardust_Breath</defaultProjectile>
+					<warmupTime>2.5</warmupTime>
+					<burstShotCount>5</burstShotCount>
+					<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+					<minRange>3</minRange>
+					<range>43</range>
+					<soundCast>DD_Void_FireBreath</soundCast>
+					<muzzleFlashScale>9</muzzleFlashScale>
+					<label>Stardust breath</label>
+					<commonality>0.7</commonality>
+					<recoilAmount>0.4</recoilAmount>
+					<recoilPattern>Mounted</recoilPattern>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Event Horizon Void Dragons -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="EH_Void_Dragon"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Projectile_Void_Breath</defaultProjectile>
+					<warmupTime>1.6</warmupTime>
+					<burstShotCount>15</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>4</minRange>
+					<range>60</range>
+					<soundCast>DD_Void_FireBreath</soundCast>
+					<muzzleFlashScale>5</muzzleFlashScale>
+					<label>Void Breath</label>
+					<commonality>0.7</commonality>
+					<recoilPattern>Mounted</recoilPattern>
+				</li>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Projectile_Molten_Breath</defaultProjectile>
+					<warmupTime>3.0</warmupTime>
+					<burstShotCount>8</burstShotCount>
+					<ticksBetweenBurstShots>11</ticksBetweenBurstShots>
+					<minRange>5</minRange>
+					<range>36</range>
+					<soundCast>DD_Void_FireBreath</soundCast>
+					<muzzleFlashScale>16</muzzleFlashScale>
+					<label>Molten Spit</label>
+					<commonality>0.3</commonality>
+					<recoilAmount>1</recoilAmount>
+					<recoilPattern>Mounted</recoilPattern>
+				</li>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Projectile_DD_Eclipse</defaultProjectile>
+					<warmupTime>3.5</warmupTime>
+					<minRange>6</minRange>
+					<range>60</range>
+					<burstShotCount>8</burstShotCount>
+					<ticksBetweenBurstShots>11</ticksBetweenBurstShots>
+					<soundCast>DD_Void_FireBreath</soundCast>
+					<muzzleFlashScale>9</muzzleFlashScale>
+					<label>Eclipse</label>
+					<commonality>0.13</commonality>
+					<recoilAmount>1</recoilAmount>
+					<recoilPattern>Mounted</recoilPattern>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Destroyer Void Dragons -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Destroyer_Void_Dragon"]/verbs
+		</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Projectile_Void_Breath</defaultProjectile>
+					<warmupTime>1.6</warmupTime>
+					<burstShotCount>15</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>4</minRange>
+					<range>60</range>
+					<soundCast>DD_Void_FireBreath</soundCast>
+					<muzzleFlashScale>5</muzzleFlashScale>
+					<label>Void Breath</label>
+					<commonality>0.7</commonality>
+					<recoilPattern>Mounted</recoilPattern>
+				</li>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Projectile_Molten_Breath</defaultProjectile>
+					<warmupTime>3.0</warmupTime>
+					<burstShotCount>8</burstShotCount>
+					<ticksBetweenBurstShots>11</ticksBetweenBurstShots>
+					<minRange>5</minRange>
+					<range>36</range>
+					<soundCast>DD_Void_FireBreath</soundCast>
+					<muzzleFlashScale>16</muzzleFlashScale>
+					<label>Molten Spit</label>
+					<commonality>0.3</commonality>
+					<recoilAmount>1</recoilAmount>
+					<recoilPattern>Mounted</recoilPattern>
+				</li>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Projectile_DD_Hellfire</defaultProjectile>
+					<warmupTime>2.5</warmupTime>
+					<minRange>3</minRange>
+					<range>36</range>
+					<burstShotCount>10</burstShotCount>
+					<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+					<soundCast>DD_Void_FireBreath</soundCast>
+					<muzzleFlashScale>16</muzzleFlashScale>
+					<label>Hellfire</label>
+					<commonality>0.33</commonality>
+					<recoilAmount>1</recoilAmount>
+					<recoilPattern>Mounted</recoilPattern>
+				</li>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Projectile_DD_Rend</defaultProjectile>
+					<warmupTime>1.5</warmupTime>
+					<minRange>5</minRange>
+					<range>48</range>
+					<burstShotCount>14</burstShotCount>
+					<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+					<soundCast>DD_Void_FireBreath</soundCast>
+					<muzzleFlashScale>2</muzzleFlashScale>
+					<label>Rend</label>
+					<commonality>0.15</commonality>
+					<recoilAmount>1.2</recoilAmount>
+					<recoilPattern>Mounted</recoilPattern>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Eater Void Dragons -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Eater_Void_Dragon"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Projectile_Void_Breath</defaultProjectile>
+					<warmupTime>1.6</warmupTime>
+					<burstShotCount>15</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>4</minRange>
+					<range>60</range>
+					<soundCast>DD_Void_FireBreath</soundCast>
+					<muzzleFlashScale>5</muzzleFlashScale>
+					<label>Void Breath</label>
+					<commonality>0.7</commonality>
+					<recoilPattern>Mounted</recoilPattern>
+				</li>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Projectile_DD_Rend</defaultProjectile>
+					<warmupTime>1.5</warmupTime>
+					<minRange>5</minRange>
+					<range>48</range>
+					<burstShotCount>14</burstShotCount>
+					<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+					<soundCast>DD_Void_FireBreath</soundCast>
+					<muzzleFlashScale>6</muzzleFlashScale>
+					<label>Rend</label>
+					<commonality>0.15</commonality>
+					<recoilAmount>1.2</recoilAmount>
+					<recoilPattern>Mounted</recoilPattern>
+				</li>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Projectile_DD_Constrain</defaultProjectile>
+					<warmupTime>2</warmupTime>
+					<minRange>3</minRange>
+					<range>30</range>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+					<soundCast>DD_Void_FireBreath</soundCast>
+					<muzzleFlashScale>6</muzzleFlashScale>
+					<label>Constrain</label>
+					<commonality>0.11</commonality>
+					<recoilAmount>0.6</recoilAmount>
+					<recoilPattern>Mounted</recoilPattern>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Harbinger Void Dragons -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Harbinger_Void_Dragon"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Projectile_Void_Breath</defaultProjectile>
+					<warmupTime>1.6</warmupTime>
+					<burstShotCount>15</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>4</minRange>
+					<range>60</range>
+					<soundCast>DD_Void_FireBreath</soundCast>
+					<muzzleFlashScale>5</muzzleFlashScale>
+					<label>Void Breath</label>
+					<commonality>0.7</commonality>
+					<recoilPattern>Mounted</recoilPattern>
+				</li>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Projectile_DD_Surge_Breath</defaultProjectile>
+					<warmupTime>1.5</warmupTime>
+					<burstShotCount>3</burstShotCount>
+					<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+					<range>36</range>
+					<soundCast>DD_Void_FireBreath</soundCast>
+					<muzzleFlashScale>5</muzzleFlashScale>
+					<label>Void Surge</label>
+					<commonality>0.01</commonality>
+					<recoilAmount>0.3</recoilAmount>
+					<recoilPattern>Mounted</recoilPattern>
+				</li>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Projectile_DD_Mind_Flay</defaultProjectile>
+					<warmupTime>3</warmupTime>
+					<burstShotCount>3</burstShotCount>
+					<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+					<minRange>6</minRange>
+					<range>36</range>
+					<soundCast>DD_Void_FireBreath</soundCast>
+					<muzzleFlashScale>5</muzzleFlashScale>
+					<label>Mind Flay</label>
+					<commonality>0.33</commonality>
+					<recoilAmount>0.3</recoilAmount>
+					<recoilPattern>Mounted</recoilPattern>
+				</li>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Projectile_DD_Constrain</defaultProjectile>
+					<warmupTime>2</warmupTime>
+					<minRange>3</minRange>
+					<range>30</range>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+					<soundCast>DD_Void_FireBreath</soundCast>
+					<muzzleFlashScale>6</muzzleFlashScale>
+					<label>Constrain</label>
+					<commonality>0.11</commonality>
+					<recoilAmount>0.6</recoilAmount>
+					<recoilPattern>Mounted</recoilPattern>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Aurelion Sol Dragons -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Rurelion_Zol_Dragon"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+					<defaultProjectile>Projectile_Stardust_Breath</defaultProjectile>
+					<warmupTime>2.5</warmupTime>
+					<burstShotCount>5</burstShotCount>
+					<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+					<minRange>3</minRange>
+					<range>43</range>
+					<soundCast>DD_Void_FireBreath</soundCast>
+					<muzzleFlashScale>9</muzzleFlashScale>
+					<label>Stardust breath</label>
+					<commonality>0.7</commonality>
+					<recoilAmount>0.4</recoilAmount>
+					<recoilPattern>Mounted</recoilPattern>
+				</li>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+					<defaultProjectile>Projectile_Aurelion_Breath</defaultProjectile>
+					<warmupTime>2.0</warmupTime>
+					<burstShotCount>5</burstShotCount>
+					<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+					<minRange>9</minRange>
+					<range>60</range>
+					<soundCast>DD_Void_FireBreath</soundCast>
+					<muzzleFlashScale>11</muzzleFlashScale>
+					<label>Rurelion breath</label>
+					<commonality>0.3</commonality>
+					<recoilAmount>0.76</recoilAmount>
+					<recoilPattern>Mounted</recoilPattern>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rabbie The Moonrabbit/Patches/Rabbie The Moonrabbit/Bodies/Rabbie_Bodytype.xml b/ModPatches/Rabbie The Moonrabbit/Patches/Rabbie The Moonrabbit/Bodies/Rabbie_Bodytype.xml
new file mode 100644
index 0000000000..e6274e12b6
--- /dev/null
+++ b/ModPatches/Rabbie The Moonrabbit/Patches/Rabbie The Moonrabbit/Bodies/Rabbie_Bodytype.xml	
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Arm Groups-->
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Rabbie"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
+	<value>
+		<li>LeftArm</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Rabbie"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
+	<value>
+		<li>RightArm</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Rabbie"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
+	<value>
+		<li>LeftShoulder</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Rabbie"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
+	<value>
+		<li>RightShoulder</li>
+	</value>
+</Operation>
+
+<!--Natural Armor-->
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Rabbie"]/corePart/groups</xpath>
+	<value>
+		<li>CoveredByNaturalArmor</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Rabbie"]/corePart/parts/li[def="RB_RabbitTail"]/groups</xpath>
+	<value>
+		<li>CoveredByNaturalArmor</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Rabbie"]/corePart/parts/li[def="Neck"]/groups</xpath>
+	<value>
+		<li>CoveredByNaturalArmor</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Rabbie"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+	<value>
+		<li>CoveredByNaturalArmor</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Rabbie"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
+	<value>
+		<li>CoveredByNaturalArmor</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Rabbie"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
+	<value>
+		<li>CoveredByNaturalArmor</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Rabbie"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
+	<value>
+		<li>CoveredByNaturalArmor</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Rabbie"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
+	<value>
+		<li>CoveredByNaturalArmor</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Rabbie"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
+	<value>
+		<li>CoveredByNaturalArmor</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Rabbie"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
+	<value>
+		<li>CoveredByNaturalArmor</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Rabbie"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
+	<value>
+		<li>CoveredByNaturalArmor</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Rabbie"]/corePart/parts/li[def="Leg"]/groups</xpath>
+	<value>
+		<li>CoveredByNaturalArmor</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Rabbie"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
+	<value>
+		<li>CoveredByNaturalArmor</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Rabbie"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
+	<value>
+		<li>CoveredByNaturalArmor</li>
+	</value>
+</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rabbie The Moonrabbit/Patches/Rabbie The Moonrabbit/PawnKindDefs/RB_PawnKind.xml b/ModPatches/Rabbie The Moonrabbit/Patches/Rabbie The Moonrabbit/PawnKindDefs/RB_PawnKind.xml
new file mode 100644
index 0000000000..49cc8bef9d
--- /dev/null
+++ b/ModPatches/Rabbie The Moonrabbit/Patches/Rabbie The Moonrabbit/PawnKindDefs/RB_PawnKind.xml	
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Backpack-->
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/PawnKindDef[
+		defName="RB_Wanderer" or
+		defName="RB_SubOfficer" or
+		defName="RB_EliteOfficer" or
+		defName="RB_FSniper" or
+		defName="RB_FMachinegunner"
+		]/apparelRequired </xpath>
+	<value>
+		<li>CE_Apparel_Backpack</li>
+	</value>
+</Operation>
+
+<!--Regular-->
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/PawnKindDef[defName="RB_EnergySupply" or
+		defName="RB_Technician" or
+		defName="RB_Worker" or
+		defName="RB_Wanderer" or
+		defName="RB_SubOfficer" or
+		defName="RB_EliteOfficer"
+		] </xpath>
+	<value>
+		<li Class="CombatExtended.LoadoutPropertiesExtension">
+			<primaryMagazineCount>
+				<min>2</min>
+				<max>3</max>
+			</primaryMagazineCount>
+			<sidearms>
+				<li>
+					<generateChance>0.2</generateChance>
+					<sidearmMoney>
+						<min>20</min>
+						<max>120</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Melee</li>
+					</weaponTags>
+				</li>
+			</sidearms>
+		</li>
+	</value>
+</Operation>
+
+<!--Military-->
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/PawnKindDef[defName="RB_FRifle"]</xpath>
+	<value>
+		<li Class="CombatExtended.LoadoutPropertiesExtension">
+			<primaryMagazineCount>
+				<min>6</min>
+				<max>8</max>
+			</primaryMagazineCount>
+			<sidearms>
+				<li>
+					<generateChance>1</generateChance>
+					<sidearmMoney>
+						<min>50</min>
+						<max>200</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Melee</li>
+					</weaponTags>
+				</li>
+			</sidearms>
+		</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/PawnKindDef[defName="RB_FSniper"]</xpath>
+	<value>
+		<li Class="CombatExtended.LoadoutPropertiesExtension">
+			<primaryMagazineCount>
+				<min>3</min>
+				<max>5</max>
+			</primaryMagazineCount>
+			<sidearms>
+				<li>
+					<generateChance>1</generateChance>
+					<sidearmMoney>
+						<min>60</min>
+						<max>150</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Melee</li>
+					</weaponTags>
+				</li>
+				<li>
+					<generateChance>0.5</generateChance>
+					<sidearmMoney>
+						<min>50</min>
+						<max>250</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm</li>
+					</weaponTags>
+				</li>
+			</sidearms>
+		</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/PawnKindDef[defName="RB_FMachinegunner"]</xpath>
+	<value>
+		<li Class="CombatExtended.LoadoutPropertiesExtension">
+			<primaryMagazineCount>
+				<min>4</min>
+				<max>6</max>
+			</primaryMagazineCount>
+			<sidearms>
+				<li>
+					<generateChance>1</generateChance>
+					<sidearmMoney>
+						<min>50</min>
+						<max>200</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Melee</li>
+					</weaponTags>
+				</li>
+			</sidearms>
+		</li>
+	</value>
+</Operation>
+
+<!--Replace minigun with MG Catergory-->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/PawnKindDef[defName="RB_FMachinegunner"]/weaponTags</xpath>
+	<value>
+		<weaponTags>
+			<li>CE_MachineGun</li>
+		</weaponTags>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/PawnKindDef[defName="RB_FMachinegunner"]/weaponMoney</xpath>
+	<value>
+		<weaponMoney>
+			<min>500</min>
+			<max>600</max>
+		</weaponMoney>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/PawnKindDef[defName="RB_FSapper"]</xpath>
+	<value>
+		<li Class="CombatExtended.LoadoutPropertiesExtension">
+			<primaryMagazineCount>
+				<min>10</min>
+				<max>30</max>
+			</primaryMagazineCount>
+			<shieldMoney>
+				<min>200</min>
+				<max>600</max>
+			</shieldMoney>
+			<shieldTags>
+				<li>OutlanderShield</li>
+			</shieldTags>
+			<shieldChance>0.5</shieldChance>
+			<forcedSidearm>
+				<sidearmMoney>
+					<min>150</min>
+					<max>350</max>
+				</sidearmMoney>
+				<weaponTags>
+					<li>CE_Sidearm</li>
+				</weaponTags>
+				<magazineCount>
+					<min>0</min>
+					<max>1</max>
+				</magazineCount>
+			</forcedSidearm>
+		</li>
+	</value>
+</Operation>
+
+<!--Advanced-->
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/PawnKindDef[defName="RB_RGunner"]</xpath>
+	<value>
+		<li Class="CombatExtended.LoadoutPropertiesExtension">
+			<primaryMagazineCount>
+				<min>6</min>
+				<max>8</max>
+			</primaryMagazineCount>
+			<sidearms>
+				<li>
+					<generateChance>0.5</generateChance>
+					<sidearmMoney>
+						<min>120</min>
+						<max>500</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Melee</li>
+					</weaponTags>
+				</li>
+			</sidearms>
+		</li>
+	</value>
+</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rabbie The Moonrabbit/Patches/Rabbie The Moonrabbit/Scenario/RB_Scenario.xml b/ModPatches/Rabbie The Moonrabbit/Patches/Rabbie The Moonrabbit/Scenario/RB_Scenario.xml
new file mode 100644
index 0000000000..642d143763
--- /dev/null
+++ b/ModPatches/Rabbie The Moonrabbit/Patches/Rabbie The Moonrabbit/Scenario/RB_Scenario.xml	
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ScenarioDef[defName="RB_Scenario"]/scenario/parts</xpath>
+	<value>
+		<li Class="ScenPart_StartingThing_Defined">
+			<def>StartingThing_Defined</def>
+			<thingDef>Ammo_46x30mm_FMJ</thingDef>
+			<count>90</count>
+		</li>
+		<li Class="ScenPart_StartingThing_Defined">
+			<def>StartingThing_Defined</def>
+			<thingDef>Ammo_303British_FMJ</thingDef>
+			<count>100</count>
+		</li>
+		<li Class="ScenPart_StartingThing_Defined">
+			<def>StartingThing_Defined</def>
+			<thingDef>Ammo_44Magnum_FMJ</thingDef>
+			<count>60</count>
+		</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ScenarioDef[defName="RB_Scenario"]/scenario/parts/li[thingDef="Apparel_FlakVest"]</xpath>
+	<value>
+		<li Class="ScenPart_StartingThing_Defined">
+			<def>StartingThing_Defined</def>
+			<thingDef>Apparel_FlakVest</thingDef>
+			<stuff>Steel</stuff>
+			<count>1</count>
+		</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ScenarioDef[defName="RB_Scenario"]/scenario/parts/li[thingDef="Apparel_AdvancedHelmet"]</xpath>
+	<value>
+		<li Class="ScenPart_StartingThing_Defined">
+			<def>StartingThing_Defined</def>
+			<thingDef>Apparel_AdvancedHelmet</thingDef>
+			<count>1</count>
+		</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationConditional">
+	<xpath>Defs/FactionDef[@Name="RB_PlayerFactionBase"]/apparelStuffFilter</xpath>
+	<match Class="PatchOperationConditional">
+		<xpath>Defs/FactionDef[@Name="RB_PlayerFactionBase"]/apparelStuffFilter/thingDefs</xpath>
+		<match Class="PatchOperationConditional">
+			<xpath>Defs/FactionDef[@Name="RB_PlayerFactionBase"]/apparelStuffFilter/thingDefs/li["Steel"]</xpath>
+			<match Class="PatchOperationReplace">
+				<xpath>Defs/FactionDef[@Name="RB_PlayerFactionBase"]/apparelStuffFilter/thingDefs/li["Steel"]</xpath>
+				<value>
+					<li>Steel</li>
+				</value>
+			</match>
+			<nomatch Class="PatchOperationAdd">
+				<xpath>Defs/FactionDef[@Name="RB_PlayerFactionBase"]/apparelStuffFilter/thingDefs</xpath>
+				<value>
+					<li>Steel</li>
+				</value>
+			</nomatch>
+		</match>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/FactionDef[@Name="RB_PlayerFactionBase"]/apparelStuffFilter</xpath>
+			<value>
+				<thingDefs>
+					<li>Steel</li>
+				</thingDefs>
+			</value>
+		</nomatch>
+	</match>
+	<nomatch Class="PatchOperationAdd">
+		<xpath>Defs/FactionDef[@Name="RB_PlayerFactionBase"]</xpath>
+		<value>
+			<apparelStuffFilter>
+				<thingDefs>
+					<li>Steel</li>
+				</thingDefs>
+			</apparelStuffFilter>
+		</value>
+	</nomatch>
+</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rabbie The Moonrabbit/Patches/Rabbie The Moonrabbit/ThingDefs_Items/Items_Resource_Stuff.xml b/ModPatches/Rabbie The Moonrabbit/Patches/Rabbie The Moonrabbit/ThingDefs_Items/Items_Resource_Stuff.xml
new file mode 100644
index 0000000000..377f6f5980
--- /dev/null
+++ b/ModPatches/Rabbie The Moonrabbit/Patches/Rabbie The Moonrabbit/ThingDefs_Items/Items_Resource_Stuff.xml	
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Moonthread"]/statBases/StuffPower_Armor_Sharp</xpath>
+	<value>
+		<StuffPower_Armor_Sharp>0.2</StuffPower_Armor_Sharp>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Moonthread"]/statBases/StuffPower_Armor_Blunt</xpath>
+	<value>
+		<StuffPower_Armor_Blunt>0.05</StuffPower_Armor_Blunt>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Moonthread"]/statBases/StuffPower_Armor_Heat</xpath>
+	<value>
+		<StuffPower_Armor_Heat>0.008</StuffPower_Armor_Heat>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Moonsilk"]/statBases/StuffPower_Armor_Sharp</xpath>
+	<value>
+		<StuffPower_Armor_Sharp>1</StuffPower_Armor_Sharp>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Moonsilk"]/statBases/StuffPower_Armor_Blunt</xpath>
+	<value>
+		<StuffPower_Armor_Blunt>1.5</StuffPower_Armor_Blunt>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="Moonsilk"]/statBases/StuffPower_Armor_Heat</xpath>
+	<value>
+		<StuffPower_Armor_Heat>0.5</StuffPower_Armor_Heat>
+		<StuffPower_Armor_Electric>0.08</StuffPower_Armor_Electric>
+		<Bulk>0.2</Bulk>
+		<WornBulk>0.5</WornBulk>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="Moonsilk"]/stuffProps/statFactors</xpath>
+	<value>
+		<Mass>1.3</Mass>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="Moonsilk"]/stuffProps/categories</xpath>
+	<value>
+		<li>SoftArmor</li>
+	</value>
+</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rabbie The Moonrabbit/Patches/Rabbie The Moonrabbit/ThingDefs_Misc/RB_Apparel.xml b/ModPatches/Rabbie The Moonrabbit/Patches/Rabbie The Moonrabbit/ThingDefs_Misc/RB_Apparel.xml
new file mode 100644
index 0000000000..fb36fa20e9
--- /dev/null
+++ b/ModPatches/Rabbie The Moonrabbit/Patches/Rabbie The Moonrabbit/ThingDefs_Misc/RB_Apparel.xml	
@@ -0,0 +1,448 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--========= Regular =========-->
+
+<!--Stuffable Thin-->
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="RB_Camisole"]/statBases</xpath>
+	<value>
+		<Bulk>0.5</Bulk>
+		<WornBulk>0.25</WornBulk>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RB_CasualTshirt" or
+		defName="RB_Casualribbonshirt" or
+		defName="RB_Summerfit" or
+		defName="RB_Casualtieshirt" or
+		defName="RB_Fashionhat"
+		]/statBases/StuffEffectMultiplierArmor </xpath>
+	<value>
+		<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
+	</value>
+</Operation>
+
+<!--Mid-->
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="RB_Apron" or
+		defName="RB_Winterknit" or
+		defName="RB_Winterhat" or
+		defName="RB_Metalpot" or
+		defName="RB_Neckscarf"
+		]/statBases </xpath>
+	<value>
+		<Bulk>3</Bulk>
+		<WornBulk>1</WornBulk>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RB_Apron" or
+		defName="RB_Winterknit" or
+		defName="RB_Winterhat" or
+		defName="RB_Metalpot" or
+		defName="RB_Neckscarf"
+		]/statBases/StuffEffectMultiplierArmor </xpath>
+	<value>
+		<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+	</value>
+</Operation>
+
+<!--Thick-->
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="RB_Earjacket" or
+		defName="RB_Starjacket" or
+		defName="RB_Blazer" or
+		defName="RB_Winterouter"
+		]/statBases </xpath>
+	<value>
+		<Bulk>5</Bulk>
+		<WornBulk>1</WornBulk>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RB_Earjacket" or
+		defName="RB_Starjacket" or
+		defName="RB_Blazer" or
+		defName="RB_Winterouter"
+		]/statBases/StuffEffectMultiplierArmor </xpath>
+	<value>
+		<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+	</value>
+</Operation>
+
+<!--========= Moonthread Only =========-->
+
+<!--Thin 1.5mm Moonthread-->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RB_Subofficer" or
+		defName="RB_Subofficerhat" or
+		defName="RB_Summerouter" or
+		defName="RB_Summerhat" or
+		defName="RB_Energymanager" or
+		defName="RB_Cookwear" or
+		defName="RB_Cookhat" or
+		defName="RB_Technician" or
+		defName="RB_Handygirl"
+		]/statBases/ArmorRating_Sharp </xpath>
+	<value>
+		<ArmorRating_Sharp>0.3</ArmorRating_Sharp>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RB_Subofficer" or
+		defName="RB_Subofficerhat" or
+		defName="RB_Summerouter" or
+		defName="RB_Summerhat" or
+		defName="RB_Energymanager" or
+		defName="RB_Cookwear" or
+		defName="RB_Cookhat" or
+		defName="RB_Technician" or
+		defName="RB_Handygirl"
+		]/statBases/ArmorRating_Blunt </xpath>
+	<value>
+		<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RB_Subofficer" or
+		defName="RB_Subofficerhat" or
+		defName="RB_Summerouter" or
+		defName="RB_Summerhat" or
+		defName="RB_Energymanager" or
+		defName="RB_Cookwear" or
+		defName="RB_Cookhat" or
+		defName="RB_Technician" or
+		defName="RB_Handygirl"
+		]/statBases/ArmorRating_Heat </xpath>
+	<value>
+		<ArmorRating_Heat>0.012</ArmorRating_Heat>
+	</value>
+</Operation>
+
+<!--Thick 5mm Moonthread-->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RB_SeniorOfficer" or
+		defName="RB_HighCloak" or
+		defName="RB_SeniorOfficerhat" or
+		defName="RB_Energygown" or
+		defName="RB_Inteligown"
+		]/statBases/ArmorRating_Sharp </xpath>
+	<value>
+		<ArmorRating_Sharp>1</ArmorRating_Sharp>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RB_SeniorOfficer" or
+		defName="RB_HighCloak" or
+		defName="RB_SeniorOfficerhat" or
+		defName="RB_Energygown" or
+		defName="RB_Inteligown"
+		]/statBases/ArmorRating_Blunt </xpath>
+	<value>
+		<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RB_SeniorOfficer" or
+		defName="RB_HighCloak" or
+		defName="RB_SeniorOfficerhat" or
+		defName="RB_Energygown" or
+		defName="RB_Inteligown"
+		]/statBases/ArmorRating_Heat </xpath>
+	<value>
+		<ArmorRating_Heat>0.04</ArmorRating_Heat>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="RB_SeniorOfficer" or
+		defName="RB_HighCloak" or
+		defName="RB_SeniorOfficerhat" or
+		defName="RB_Energygown" or
+		defName="RB_Inteligown"
+		]/statBases </xpath>
+	<value>
+		<Bulk>5</Bulk>
+		<WornBulk>1</WornBulk>
+	</value>
+</Operation>
+
+<!--========= Other =========-->
+
+<!--Safehat. 3mm Steel; 4mm Blunt resistance-->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RB_Safehelmet"]/statBases/ArmorRating_Sharp</xpath>
+	<value>
+		<ArmorRating_Sharp>3</ArmorRating_Sharp>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RB_Safehelmet"]/statBases/ArmorRating_Blunt</xpath>
+	<value>
+		<ArmorRating_Blunt>6</ArmorRating_Blunt>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RB_Safehelmet"]/statBases/ArmorRating_Heat</xpath>
+	<value>
+		<ArmorRating_Heat>0</ArmorRating_Heat>
+	</value>
+</Operation>
+
+<!--Infantry Uniform 2.5mm Moonthread/1mm Composite-->
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="RB_Safehelmet"]/statBases</xpath>
+	<value>
+		<Bulk>12</Bulk>
+		<WornBulk>5</WornBulk>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RB_Infantryuniform" or defName="RB_Infantrynewuniform"]/statBases/ArmorRating_Sharp</xpath>
+	<value>
+		<ArmorRating_Sharp>2.25</ArmorRating_Sharp>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RB_Infantryuniform" or defName="RB_Infantrynewuniform"]/statBases/ArmorRating_Blunt</xpath>
+	<value>
+		<ArmorRating_Blunt>2.75</ArmorRating_Blunt>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RB_Infantryuniform" or defName="RB_Infantrynewuniform"]/statBases/ArmorRating_Heat</xpath>
+	<value>
+		<ArmorRating_Heat>0.02</ArmorRating_Heat>
+	</value>
+</Operation>
+
+<!--Infantry Helmet 6mm Steel/1.5mm Plasteel. Composite heat protection.-->
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="RB_Infantryhelmet"]/statBases</xpath>
+	<value>
+		<Bulk>3</Bulk>
+		<WornBulk>1</WornBulk>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RB_Infantryhelmet"]/statBases/ArmorRating_Sharp</xpath>
+	<value>
+		<ArmorRating_Sharp>9</ArmorRating_Sharp>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RB_Infantryhelmet"]/statBases/ArmorRating_Blunt</xpath>
+	<value>
+		<ArmorRating_Blunt>12</ArmorRating_Blunt>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RB_Infantryhelmet"]/statBases/ArmorRating_Heat</xpath>
+	<value>
+		<ArmorRating_Heat>0.56</ArmorRating_Heat>
+	</value>
+</Operation>
+
+<!--Infantry Vest, Composite Protection-->
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="RB_Infantryvest"]/statBases</xpath>
+	<value>
+		<Bulk>12</Bulk>
+		<WornBulk>6</WornBulk>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RB_Infantryvest"]/statBases/ArmorRating_Sharp</xpath>
+	<value>
+		<ArmorRating_Sharp>14</ArmorRating_Sharp>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RB_Infantryvest"]/statBases/ArmorRating_Blunt</xpath>
+	<value>
+		<ArmorRating_Blunt>21</ArmorRating_Blunt>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RB_Infantryvest"]/statBases/ArmorRating_Heat</xpath>
+	<value>
+		<ArmorRating_Heat>0.56</ArmorRating_Heat>
+	</value>
+</Operation>
+
+<!--Increase Mass, remove movespeed offset-->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RB_Infantryvest"]/statBases/Mass</xpath>
+	<value>
+		<Mass>10</Mass>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationRemove">
+	<xpath>Defs/ThingDef[defName="RB_Infantryvest"]/equippedStatOffsets/MoveSpeed</xpath>
+</Operation>
+
+<!--Replace ranged cooldown with tacvest function-->
+
+<Operation Class="PatchOperationRemove">
+	<xpath>Defs/ThingDef[defName="RB_Infantryvest"]/equippedStatOffsets/RangedCooldownFactor</xpath>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="RB_Infantryvest"]/equippedStatOffsets</xpath>
+	<value>
+		<CarryBulk>30</CarryBulk>
+		<ReloadSpeed>0.1</ReloadSpeed>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="RB_Infantryvest"]/apparel/layers</xpath>
+	<value>
+		<li>Webbing</li>
+	</value>
+</Operation>
+
+<!--Regular Army Powerarmor, 12mm Power Armor-->
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="RB_RegularInfantrySuit"]/statBases</xpath>
+	<value>
+		<Bulk>12</Bulk>
+		<WornBulk>6</WornBulk>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RB_RegularInfantrySuit"]/statBases/Mass</xpath>
+	<value>
+		<Mass>50</Mass>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RB_RegularInfantrySuit"]/statBases/ArmorRating_Sharp</xpath>
+	<value>
+		<ArmorRating_Sharp>24</ArmorRating_Sharp>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RB_RegularInfantrySuit"]/statBases/ArmorRating_Blunt</xpath>
+	<value>
+		<ArmorRating_Blunt>54</ArmorRating_Blunt>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationRemove">
+	<xpath>Defs/ThingDef[defName="RB_RegularInfantrySuit"]/equippedStatOffsets/MoveSpeed</xpath>
+</Operation>
+
+<!--Replace Ranged Cooldown with Power armor functions-->
+
+<Operation Class="PatchOperationRemove">
+	<xpath>Defs/ThingDef[defName="RB_RegularInfantrySuit"]/equippedStatOffsets/RangedCooldownFactor</xpath>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="RB_RegularInfantrySuit"]/equippedStatOffsets</xpath>
+	<value>
+		<CarryBulk>10</CarryBulk>
+		<ReloadSpeed>0.10</ReloadSpeed>
+		<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+		<CarryWeight>60</CarryWeight>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RB_RegularInfantrySuit"]/costList/Plasteel</xpath>
+	<value>
+		<Plasteel>190</Plasteel>
+		<DevilstrandCloth>50</DevilstrandCloth>
+	</value>
+</Operation>
+
+<!--Regular Army Helmet, 10mm Power Armor-->
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="RB_RegularInfantryhelmet"]/statBases</xpath>
+	<value>
+		<Bulk>5</Bulk>
+		<WornBulk>2</WornBulk>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RB_RegularInfantryhelmet"]/statBases/ArmorRating_Sharp</xpath>
+	<value>
+		<ArmorRating_Sharp>20</ArmorRating_Sharp>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RB_RegularInfantryhelmet"]/statBases/ArmorRating_Blunt</xpath>
+	<value>
+		<ArmorRating_Blunt>45</ArmorRating_Blunt>
+	</value>
+</Operation>
+
+<!--Replace handling bonus with power armor helmet functions-->
+
+<Operation Class="PatchOperationConditional">
+	<xpath>Defs/ThingDef[defName="RB_RegularInfantryhelmet"]/apparel/immuneToToxGasExposure</xpath>
+	<nomatch Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RB_RegularInfantryhelmet"]/apparel</xpath>
+		<value>
+			<immuneToToxGasExposure>true</immuneToToxGasExposure>
+		</value>
+	</nomatch>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RB_RegularInfantryhelmet"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+	<value>
+		<AimingAccuracy>0.15</AimingAccuracy>
+		<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		<SmokeSensitivity>-1</SmokeSensitivity>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RB_RegularInfantryhelmet"]/costList/Plasteel</xpath>
+	<value>
+		<Plasteel>80</Plasteel>
+		<DevilstrandCloth>25</DevilstrandCloth>
+	</value>
+</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rabbie The Moonrabbit/Patches/Rabbie The Moonrabbit/ThingDefs_Misc/Weapons_Guns.xml b/ModPatches/Rabbie The Moonrabbit/Patches/Rabbie The Moonrabbit/ThingDefs_Misc/Weapons_Guns.xml
new file mode 100644
index 0000000000..75d7e50dad
--- /dev/null
+++ b/ModPatches/Rabbie The Moonrabbit/Patches/Rabbie The Moonrabbit/ThingDefs_Misc/Weapons_Guns.xml	
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ==========  PDW - MP7  =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RB_F_PDW</defName>
+		<statBases>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>0.83</SwayFactor>
+			<Bulk>4.15</Bulk>
+			<Mass>1.90</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>1.31</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_46x30mm_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<range>31</range>
+			<soundCast>ShotRBPDW</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_46x30mm</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RB_F_PDW"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rabbie The Moonrabbit/Patches/Rabbie The Moonrabbit/ThingDefs_Races/AlienRace_Rabbielike.xml b/ModPatches/Rabbie The Moonrabbit/Patches/Rabbie The Moonrabbit/ThingDefs_Races/AlienRace_Rabbielike.xml
new file mode 100644
index 0000000000..5f7db32df0
--- /dev/null
+++ b/ModPatches/Rabbie The Moonrabbit/Patches/Rabbie The Moonrabbit/ThingDefs_Races/AlienRace_Rabbielike.xml	
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationConditional">
+	<xpath>Defs/ThingDef[@Name="RB_PawnBase"]/comps</xpath>
+	<nomatch Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RB_PawnBase"]</xpath>
+		<value>
+			<comps/>
+		</value>
+	</nomatch>
+	<match Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RB_PawnBase"]</xpath>
+		<value>
+		</value>
+	</match>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[@Name="RB_PawnBase"]/comps</xpath>
+	<value>
+		<li>
+			<compClass>CombatExtended.CompPawnGizmo</compClass>
+		</li>
+		<li Class="CombatExtended.CompProperties_Suppressable"/>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Rabbie"]</xpath>
+	<value>
+		<li Class="CombatExtended.RacePropertiesExtensionCE">
+			<bodyShape>Humanoid</bodyShape>
+		</li>
+	</value>
+</Operation>
+
+<!--Better shooting, Worse melee-->
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Rabbie"]/statBases</xpath>
+	<value>
+		<!--Same as shooting offset-->
+		<AimingAccuracy>1.2</AimingAccuracy>
+		<!--Same as hit offset-->
+		<MeleeCritChance>0.9</MeleeCritChance>
+		<!--Same as dodge offset-->
+		<MeleeParryChance>0.8</MeleeParryChance>
+		<Suppressability>1</Suppressability>
+		<SmokeSensitivity>1</SmokeSensitivity>
+	</value>
+</Operation>
+
+<!--Base has no headbut, only bite-->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Rabbie"]/tools</xpath>
+	<value>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>left fist</label>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<power>1</power>
+				<cooldownTime>1.33</cooldownTime>
+				<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+				<armorPenetrationBlunt>0.162</armorPenetrationBlunt>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>right fist</label>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<power>1</power>
+				<cooldownTime>1.33</cooldownTime>
+				<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+				<armorPenetrationBlunt>0.162</armorPenetrationBlunt>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>teeth</label>
+				<capacities>
+					<li>Bite</li>
+				</capacities>
+				<power>2</power>
+				<cooldownTime>2.52</cooldownTime>
+				<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+				<chanceFactor>0.2</chanceFactor>
+				<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				<armorPenetrationBlunt>0.245</armorPenetrationBlunt>
+			</li>
+		</tools>
+	</value>
+</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Racc/Patches/Racc/PawnKinds_Racc.xml b/ModPatches/Racc/Patches/Racc/PawnKinds_Racc.xml
new file mode 100644
index 0000000000..668988db4c
--- /dev/null
+++ b/ModPatches/Racc/Patches/Racc/PawnKinds_Racc.xml
@@ -0,0 +1,314 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Scoot ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RaccColonist"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RaccArchivist"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RaccTrader"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RaccSlave"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RaccRefugee"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RaccSecurityGuard"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RaccTheif"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RaccHunter"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RaccSpy"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RaccNinja"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Racc/Patches/Racc/Racc_Weapons.xml b/ModPatches/Racc/Patches/Racc/Racc_Weapons.xml
new file mode 100644
index 0000000000..919bc7a89c
--- /dev/null
+++ b/ModPatches/Racc/Patches/Racc/Racc_Weapons.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Walthracc PPK -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Racc_WPPK</defName>
+		<statBases>
+			<Mass>0.45</Mass>
+			<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.30</ShotSpread>
+			<SwayFactor>1</SwayFactor>
+			<Bulk>1</Bulk>
+			<WorkToMake>15000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_22LR_FMJ</defaultProjectile>
+			<warmupTime>0.2</warmupTime>
+			<range>12</range>
+			<soundCast>Xen_SD</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>1</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>2</reloadTime>
+			<ammoSet>AmmoSet_22LR</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_Pistol</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Racc_WPPK"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.5</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.5</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- etc.. -->
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Racc/Patches/Racc/Race_Racc.xml b/ModPatches/Racc/Patches/Racc/Race_Racc.xml
new file mode 100644
index 0000000000..693c4f07f1
--- /dev/null
+++ b/ModPatches/Racc/Patches/Racc/Race_Racc.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Found Bandit. Rabies. ========== -->
+
+	<!-- ========== Turn our lotor boys into lotor *boys* ========== -->
+	<!-- ========== To be human is to be a tall brick 	  ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<!-- === Note to future furball compatibility nerds: 		=== -->
+		<!-- === Paste the defName of your horrible alien there   |	=== -->
+		<!-- === 												  V	=== -->
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Racc"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Gives Gun Gizmos to Racc HUD thing ========== -->
+	<!-- ========== Also Makes Em Suppressable		   ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<!-- === Shouldn't need to change this at all		  === -->
+		<!-- === Unless you changed the name of your BaseRaccPawn === -->
+		<!-- === In which case change "BaseRaccPawn" to that name === -->
+		<xpath>Defs/ThingDef[@Name="BaseRaccPawn"]</xpath>
+		<value>
+			<comps>
+				<li>
+					<compClass>CombatExtended.CompPawnGizmo</compClass>
+				</li>
+				<li Class="CombatExtended.CompProperties_Suppressable"/>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- === Patch Racc default melee attacks === -->
+	<!-- === Mightve made them kinda OP 	=== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Racc"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1.2</AimingAccuracy>
+			<MeleeDodgeChance>1.5</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<ReloadSpeed>1.25</ReloadSpeed>
+			<Suppressability>0.85</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Racc"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.690</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Race to the Rim/Defs/Race to the Rim/Patch_AnimalProjectiles.xml b/ModPatches/Race to the Rim/Defs/Race to the Rim/Patch_AnimalProjectiles.xml
new file mode 100644
index 0000000000..0c3cb5f5fe
--- /dev/null
+++ b/ModPatches/Race to the Rim/Defs/Race to the Rim/Patch_AnimalProjectiles.xml	
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingDef Name="RttRFlameCEBase" ParentName="RttR_BaseAnimalProjectile" Abstract="True">
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>40</speed>
+			<damageDef>Flame</damageDef>
+			<damageAmountBase>2</damageAmountBase>
+			<explosionRadius>1.1</explosionRadius>
+			<suppressionFactor>3.0</suppressionFactor>
+			<dangerFactor>2.0</dangerFactor>
+			<ai_IsIncendiary>true</ai_IsIncendiary>
+			<soundExplode>Interact_Ignite</soundExplode>
+			<flyOverhead>false</flyOverhead>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="RttRFlameCEBase">
+		<defName>RttR_NightmareBreathCE</defName>
+		<label>nightmare breath</label>
+		<graphicData>
+			<texPath>Things/Projectiles/FireEffects/Proj_NightmareFire/Proj_NightmareFireA</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef ParentName="RttRFlameCEBase">
+		<defName>RttR_RazorwhipBreathCE</defName>
+		<label>razorwhip breath</label>
+		<graphicData>
+			<texPath>Things/Projectiles/FireEffects/Proj_RazorwhipFire/Proj_RazorwhipFireA</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef ParentName="RttRFlameCEBase">
+		<defName>RttR_TripleStrykeBreathCE</defName>
+		<label>triple stryke breath</label>
+		<graphicData>
+			<texPath>Things/Projectiles/FireEffects/Proj_TripleStrykeFire/Proj_TripleStrykeFireA</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef ParentName="RttRFlameCEBase">
+		<defName>RttR_StormcutterBreathCE</defName>
+		<label>stormcutter breath</label>
+		<graphicData>
+			<texPath>Things/Projectiles/FireEffects/Proj_StormcutterFire/Proj_StormcutterFireA</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef ParentName="RttRFlameCEBase">
+		<defName>RttR_TerribleTerrorBreathCE</defName>
+		<label>terrible terror breath</label>
+		<graphicData>
+			<texPath>Things/Projectiles/FireEffects/Proj_TerribleTerrorFire/Proj_TerribleTerrorA</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef ParentName="RttRFlameCEBase">
+		<defName>RttR_NadderBreathCE</defName>
+		<label>nadder breath</label>
+		<graphicData>
+			<texPath>Things/Projectiles/FireEffects/Proj_NadderFire/Proj_NadderFireA</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Race to the Rim/Patches/Race to the Rim/Patch_AnimalProjectiles.xml b/ModPatches/Race to the Rim/Patches/Race to the Rim/Patch_AnimalProjectiles.xml
new file mode 100644
index 0000000000..e6e7eccfa9
--- /dev/null
+++ b/ModPatches/Race to the Rim/Patches/Race to the Rim/Patch_AnimalProjectiles.xml	
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Projectile Base === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			@Name="RttR_BaseAnimalProjectile" or
+			defName="RttR_FlameBreath" or
+			defName="RttR_TinyFlameBreath" or
+			defName="RttR_FlightmareBreath" or
+			defName="RttR_GronckleBreath" or
+			defName="RttR_StreamFlameBreath" or
+			defName="RttR_Furybreath" or
+			defName="RttR_StreamFlameBreath" or
+			defName="RttR_GasBall" or
+			defName="RttR_WaterBreath"
+			]/thingClass
+		</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeAdd">
+		<xpath>
+			Defs/ThingDef[
+			@Name="RttR_BaseAnimalProjectile" or
+			defName="RttR_FlameBreath" or
+			defName="RttR_TinyFlameBreath" or
+			defName="RttR_FlightmareBreath" or
+			defName="RttR_GronckleBreath" or
+			defName="RttR_StreamFlameBreath" or
+			defName="RttR_Furybreath" or
+			defName="RttR_StreamFlameBreath" or
+			defName="RttR_GasBall" or
+			defName="RttR_WaterBreath"
+			]/projectile
+		</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.ProjectilePropertiesCE</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RttR_BaseAnimalProjectile"]/projectile/speed</xpath>
+		<value>
+			<speed>40</speed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RttR_BaseAnimalProjectile"]/projectile/flyOverhead</xpath>
+		<value>
+			<flyOverhead>false</flyOverhead>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Race to the Rim/Patches/Race to the Rim/Patch_Leathers.xml b/ModPatches/Race to the Rim/Patches/Race to the Rim/Patch_Leathers.xml
new file mode 100644
index 0000000000..5c2d2ac6bb
--- /dev/null
+++ b/ModPatches/Race to the Rim/Patches/Race to the Rim/Patch_Leathers.xml	
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Flightmare Scales === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_FlightmareDragonScales"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.5</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_FlightmareDragonScales"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.75</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Fury Scales === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_FuryDragonScales"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.55</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_FuryDragonScales"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.80</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Gronckle Scales === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_GronckleDragonScales"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.65</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_GronckleDragonScales"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.90</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Hotburple Scales === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_HotburpleDragonScales"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.65</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_HotburpleDragonScales"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.90</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Nadder Scales === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_NadderDragonScales"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.1</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_NadderDragonScales"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>1.75</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Nightmare Scales === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_NightmareDragonScales"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.05</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_NightmareDragonScales"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>1.65</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Rumblehorn Scales === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_RumblehornDragonScales"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.3</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_RumblehornDragonScales"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>2.7</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Scauldron Scales === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_ScauldronDragonScales"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_ScauldronDragonScales"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>1.40</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Stormcutter Scales === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_StormcutterDragonScales"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.15</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_StormcutterDragonScales"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>1.95</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Terrible Terror Scales === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_TerribleTerrorDragonScales"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_TerribleTerrorDragonScales"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>1.5</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Zippleback Scales === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_ZipplebackDragonScales"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.90</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_ZipplebackDragonScales"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>1.35</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Razorwhip Scales === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_RazorwhipDragonScales"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.35</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_RazorwhipDragonScales"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>2.2</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Triple Stryke Scales === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_TripleStrykeDragonScales"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.45</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_TripleStrykeDragonScales"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>2.4</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Patched Dragon Scales === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_PatchedDragonScales"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.45</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_PatchedDragonScales"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.60</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Race to the Rim/Patches/Race to the Rim/Patch_Resources.xml b/ModPatches/Race to the Rim/Patches/Race to the Rim/Patch_Resources.xml
new file mode 100644
index 0000000000..d992e4d5ca
--- /dev/null
+++ b/ModPatches/Race to the Rim/Patches/Race to the Rim/Patch_Resources.xml	
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Gronckle Iron === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RttR_GronckleIron"]/statBases</xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RttR_GronckleIron"]/stuffProps/categories</xpath>
+		<value>
+			<li>Metallic_Weapon</li>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RttR_GronckleIron"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>0.9</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_GronckleIron"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.05</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_GronckleIron"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>1.60</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_GronckleIron"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RttR_GronckleIron"]/statBases/StuffPower_Armor_Heat</xpath>
+	</Operation>
+
+	<!-- === Nadder Spike === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_WoodLog"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.99</cooldownTime>
+					<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RttR_WoodLog"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.2</MeleeCritChance>
+				<MeleeParryChance>1</MeleeParryChance>
+				<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RttR_WoodLog"]/statBases</xpath>
+		<value>
+			<Bulk>0.07</Bulk>
+			<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_WoodLog"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.1</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_WoodLog"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.2</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_WoodLog"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.025</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_WoodLog"]/statBases/SharpDamageMultiplier</xpath>
+		<value>
+			<SharpDamageMultiplier>0.7</SharpDamageMultiplier>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_WoodLog"]/statBases/BluntDamageMultiplier</xpath>
+		<value>
+			<BluntDamageMultiplier>0.5</BluntDamageMultiplier>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RttR_WoodLog"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>0.3</Mass>
+			<MeleePenetrationFactor>0.3</MeleePenetrationFactor>
+		</value>
+	</Operation>
+
+	<!-- === Flightmare Algae === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RttR_FlightmareAlgae"]/statBases</xpath>
+		<value>
+			<Bulk>0.07</Bulk>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_Flightmare.xml b/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_Flightmare.xml
new file mode 100644
index 0000000000..4e8a002e58
--- /dev/null
+++ b/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_Flightmare.xml	
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RttR_Flightmare"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RttR_Flightmare"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.20</MeleeDodgeChance>
+			<MeleeCritChance>0.45</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
+			<SightsEfficiency>1</SightsEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_Flightmare"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.08</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.08</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.24</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_Flightmare"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>RttR_FlightmareBreath</defaultProjectile>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+					<warmupTime>1.75</warmupTime>
+					<range>23</range>
+					<minRange>2</minRange>
+					<soundCast>RttR_FireBreathSound</soundCast>
+					<muzzleFlashScale>1</muzzleFlashScale>
+					<commonality>1</commonality>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<recoilAmount>0.4</recoilAmount>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_Fury.xml b/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_Fury.xml
new file mode 100644
index 0000000000..82177527ce
--- /dev/null
+++ b/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_Fury.xml	
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RttR_Fury"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RttR_Fury"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			<MeleeCritChance>0.20</MeleeCritChance>
+			<MeleeParryChance>0.08</MeleeParryChance>
+			<SightsEfficiency>1</SightsEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_Fury"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.24</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_Fury"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>RttR_Furybreath</defaultProjectile>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+					<warmupTime>2</warmupTime>
+					<range>22</range>
+					<minRange>2</minRange>
+					<soundCast>RttR_FireBreathSound</soundCast>
+					<muzzleFlashScale>1</muzzleFlashScale>
+					<commonality>0.9</commonality>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<recoilAmount>0.4</recoilAmount>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_Gronckle.xml b/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_Gronckle.xml
new file mode 100644
index 0000000000..331500d654
--- /dev/null
+++ b/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_Gronckle.xml	
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RttR_Gronckle"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RttR_Gronckle"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.08</MeleeDodgeChance>
+			<MeleeCritChance>0.23</MeleeCritChance>
+			<MeleeParryChance>0.06</MeleeParryChance>
+			<SightsEfficiency>1</SightsEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_Gronckle"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.623</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_Gronckle"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>RttR_GronckleBreath</defaultProjectile>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+					<warmupTime>3.75</warmupTime>
+					<range>25</range>
+					<minRange>24</minRange>
+					<soundCast>RttR_FireBreathSound</soundCast>
+					<muzzleFlashScale>1</muzzleFlashScale>
+					<commonality>1</commonality>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<recoilAmount>0.4</recoilAmount>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_Hotburple.xml b/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_Hotburple.xml
new file mode 100644
index 0000000000..5b74f540ec
--- /dev/null
+++ b/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_Hotburple.xml	
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RttR_Hotburple"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RttR_Hotburple"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.08</MeleeDodgeChance>
+			<MeleeCritChance>0.23</MeleeCritChance>
+			<MeleeParryChance>0.06</MeleeParryChance>
+			<SightsEfficiency>1</SightsEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_Hotburple"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.623</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_Hotburple"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>RttR_StreamFlameBreath</defaultProjectile>
+					<burstShotCount>10</burstShotCount>
+					<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+					<warmupTime>2.85</warmupTime>
+					<range>24</range>
+					<minRange>2</minRange>
+					<soundCast>RttR_FireBreathSound</soundCast>
+					<muzzleFlashScale>1</muzzleFlashScale>
+					<commonality>1</commonality>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<recoilAmount>0.4</recoilAmount>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_Nadder.xml b/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_Nadder.xml
new file mode 100644
index 0000000000..9ed9c528f1
--- /dev/null
+++ b/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_Nadder.xml	
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RttR_Nadder"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RttR_Nadder"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.20</MeleeDodgeChance>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.08</MeleeParryChance>
+			<SightsEfficiency>1</SightsEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_Nadder"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_Nadder"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>RttR_NadderBreathCE</defaultProjectile>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+					<warmupTime>2.25</warmupTime>
+					<range>16</range>
+					<minRange>2</minRange>
+					<soundCast>RttR_FireBreathSound</soundCast>
+					<muzzleFlashScale>1</muzzleFlashScale>
+					<commonality>1</commonality>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<recoilAmount>0.4</recoilAmount>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_Nightmare.xml b/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_Nightmare.xml
new file mode 100644
index 0000000000..a5b3b953dc
--- /dev/null
+++ b/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_Nightmare.xml	
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RttR_Nightmare"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RttR_Nightmare"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.38</MeleeCritChance>
+			<MeleeParryChance>0.02</MeleeParryChance>
+			<SightsEfficiency>1</SightsEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_Nightmare"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_Nightmare"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>RttR_NightmareBreathCE</defaultProjectile>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+					<warmupTime>1.25</warmupTime>
+					<range>12</range>
+					<minRange>1</minRange>
+					<soundCast>RttR_FireBreathSound</soundCast>
+					<muzzleFlashScale>1</muzzleFlashScale>
+					<commonality>1</commonality>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<recoilAmount>0.4</recoilAmount>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_Razorwhip.xml b/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_Razorwhip.xml
new file mode 100644
index 0000000000..fa6a05340f
--- /dev/null
+++ b/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_Razorwhip.xml	
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RttR_Razorwhip"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RttR_Razorwhip"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.20</MeleeDodgeChance>
+			<MeleeCritChance>0.26</MeleeCritChance>
+			<MeleeParryChance>0.12</MeleeParryChance>
+			<SightsEfficiency>1</SightsEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_Razorwhip"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_Razorwhip"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>RttR_RazorwhipBreathCE</defaultProjectile>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+					<warmupTime>5</warmupTime>
+					<range>32</range>
+					<minRange>5</minRange>
+					<soundCast>RttR_FireBreathSound</soundCast>
+					<muzzleFlashScale>1</muzzleFlashScale>
+					<commonality>1</commonality>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<recoilAmount>0.4</recoilAmount>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_Rumblehorn.xml b/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_Rumblehorn.xml
new file mode 100644
index 0000000000..871664274f
--- /dev/null
+++ b/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_Rumblehorn.xml	
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RttR_Rumblehorn"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RttR_Rumblehorn"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.09</MeleeDodgeChance>
+			<MeleeCritChance>0.28</MeleeCritChance>
+			<MeleeParryChance>0.06</MeleeParryChance>
+			<SightsEfficiency>1</SightsEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_Rumblehorn"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_Rumblehorn"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>RttR_FlameBreath</defaultProjectile>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+					<warmupTime>1</warmupTime>
+					<range>16</range>
+					<minRange>1</minRange>
+					<soundCast>RttR_FireBreathSound</soundCast>
+					<muzzleFlashScale>1</muzzleFlashScale>
+					<commonality>1</commonality>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<recoilAmount>0.4</recoilAmount>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_Scauldron.xml b/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_Scauldron.xml
new file mode 100644
index 0000000000..ba32cebcc5
--- /dev/null
+++ b/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_Scauldron.xml	
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RttR_Scauldron"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RttR_Scauldron"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.20</MeleeDodgeChance>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.08</MeleeParryChance>
+			<SightsEfficiency>1</SightsEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_Scauldron"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_Scauldron"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>RttR_WaterBreath</defaultProjectile>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+					<warmupTime>1.75</warmupTime>
+					<range>20</range>
+					<minRange>2</minRange>
+					<soundCast>RttR_FireBreathSound</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<commonality>1</commonality>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<recoilAmount>0.4</recoilAmount>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_Stormcutter.xml b/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_Stormcutter.xml
new file mode 100644
index 0000000000..c4358f72bb
--- /dev/null
+++ b/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_Stormcutter.xml	
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RttR_Stormcutter"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RttR_Stormcutter"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.28</MeleeDodgeChance>
+			<MeleeCritChance>0.17</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+			<SightsEfficiency>1</SightsEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_Stormcutter"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_Stormcutter"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>RttR_StormcutterBreathCE</defaultProjectile>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+					<warmupTime>1.25</warmupTime>
+					<range>12</range>
+					<minRange>1</minRange>
+					<soundCast>RttR_FireBreathSound</soundCast>
+					<muzzleFlashScale>1</muzzleFlashScale>
+					<commonality>1</commonality>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<recoilAmount>0.4</recoilAmount>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_TerribleTerror.xml b/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_TerribleTerror.xml
new file mode 100644
index 0000000000..0c1944245c
--- /dev/null
+++ b/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_TerribleTerror.xml	
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RttR_TerribleTerror"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RttR_TerribleTerror"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.14</MeleeDodgeChance>
+			<MeleeCritChance>0.37</MeleeCritChance>
+			<MeleeParryChance>0.17</MeleeParryChance>
+			<SightsEfficiency>1</SightsEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_TerribleTerror"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_TerribleTerror"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>RttR_TerribleTerrorBreathCE</defaultProjectile>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+					<warmupTime>1</warmupTime>
+					<range>8</range>
+					<minRange>2</minRange>
+					<soundCast>RttR_FireBreathSound</soundCast>
+					<muzzleFlashScale>1</muzzleFlashScale>
+					<commonality>1</commonality>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<recoilAmount>0.4</recoilAmount>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_TripleStryke.xml b/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_TripleStryke.xml
new file mode 100644
index 0000000000..abf77f1248
--- /dev/null
+++ b/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_TripleStryke.xml	
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RttR_TripleStryke"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RttR_TripleStryke"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.23</MeleeCritChance>
+			<MeleeParryChance>0.06</MeleeParryChance>
+			<SightsEfficiency>1</SightsEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_TripleStryke"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>first tail</label>
+					<capacities>
+						<li>RttR_Anesthesia</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>RttR_FirstTailAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>second tail</label>
+					<capacities>
+						<li>RttR_Dazing</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>RttR_SecondTailAttackTool</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>third tail</label>
+					<capacities>
+						<li>RttR_Toxic</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>RttR_ThirdTailAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.05</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.05</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_TripleStryke"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_Flamethrower_Napalm</defaultProjectile>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+					<warmupTime>5</warmupTime>
+					<range>25</range>
+					<minRange>2</minRange>
+					<soundCast>RttR_FireBreathSound</soundCast>
+					<muzzleFlashScale>1</muzzleFlashScale>
+					<commonality>0.9</commonality>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<recoilAmount>0.4</recoilAmount>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_Zippleback.xml b/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_Zippleback.xml
new file mode 100644
index 0000000000..56480ce805
--- /dev/null
+++ b/ModPatches/Race to the Rim/Patches/Race to the Rim/Races_Zippleback.xml	
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RttR_Zippleback"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RttR_Zippleback"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			<MeleeCritChance>0.28</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+			<SightsEfficiency>1</SightsEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_Zippleback"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RttR_Zippleback"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>RttR_GasBall</defaultProjectile>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+					<warmupTime>5</warmupTime>
+					<range>35</range>
+					<minRange>5</minRange>
+					<soundCast>RttR_FireBreathSound</soundCast>
+					<muzzleFlashScale>1</muzzleFlashScale>
+					<commonality>1</commonality>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<recoilAmount>0.4</recoilAmount>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RadWorld/Patches/RadWorld/PawnKinds_RadWorld.xml b/ModPatches/RadWorld/Patches/RadWorld/PawnKinds_RadWorld.xml
new file mode 100644
index 0000000000..5a9d99231f
--- /dev/null
+++ b/ModPatches/RadWorld/Patches/RadWorld/PawnKinds_RadWorld.xml
@@ -0,0 +1,374 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Give ammo to Mutant ranged PawnKinds. ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="Mutant_Archer" or
+			defName="Mutant_Hunter" or
+			defName="Mutant_HeavyArcher" or
+			defName="Mutant_ChiefRanged"]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>14</min>
+					<max>26</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>150</min>
+						<max>350</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>NeolithicMeleeBasic</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Vaulter ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RW_Vault_Villager" or defName="RW_Vault_Town_Trader" or defName="RW_Vault_Town_Councilman"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>1</min>
+					<max>2</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>20</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RW_Vault_Town_Guard"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>20</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Vaulter Mercenary ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RW_Vault_Grenadier_Destructive"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>10</min>
+					<max>30</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>200</min>
+					<max>600</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>150</min>
+						<max>350</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Melee</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RW_Vault_Grenadier_EMP"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>10</min>
+					<max>30</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>100</min>
+						<max>250</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm</li>
+					</weaponTags>
+					<magazineCount>
+						<min>2</min>
+						<max>5</max>
+					</magazineCount>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RW_Vault_Grenadier_EMP"]/label</xpath>
+		<value>
+			<label>vault advanced grenadier</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="RW_Vault_Grenadier_EMP"]/weaponTags</xpath>
+		<value>
+			<li>CE_GrenadeFlashbang</li>
+			<li>GrenadeSmoke</li>
+			<li>GrenadeDestructive</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RW_Vault_Grenadier_Smoke"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>10</min>
+					<max>30</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>100</min>
+						<max>250</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm</li>
+					</weaponTags>
+					<magazineCount>
+						<min>2</min>
+						<max>5</max>
+					</magazineCount>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RW_Vault_Grenadier_Smoke"]/label</xpath>
+		<value>
+			<label>vault advanced grenadier</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="RW_Vault_Grenadier_Smoke"]/weaponTags</xpath>
+		<value>
+			<li>CE_GrenadeFlashbang</li>
+			<li>GrenadeSmoke</li>
+			<li>GrenadeDestructive</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RW_Vault_Mercenary_Gunner" or defName="RW_Vault_Mercenary_Gunner_Acidifier"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>200</min>
+					<max>600</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.8</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>20</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RW_Vault_Mercenary_Sniper" or defName="RW_Vault_Mercenary_Sniper_Acidifier"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>1</generateChance>
+						<sidearmMoney>
+							<min>60</min>
+							<max>150</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>80</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RW_Vault_Mercenary_Heavy"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>14</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>150</min>
+						<max>350</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_SMG</li>
+					</weaponTags>
+					<magazineCount>
+						<min>0</min>
+						<max>1</max>
+					</magazineCount>
+				</forcedSidearm>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>60</min>
+							<max>150</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName = "RW_Vault_Mercenary_Slasher" or defName="RW_Vault_Mercenary_Slasher_Acidifier"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.9</shieldChance>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RW_Vault_PirateBoss"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>1300</min>
+					<max>1700</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.9</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>400</min>
+							<max>800</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name = "MercenaryEliteTierBase" or defName="RW_Vault_Mercenary_Elite" or defName="RW_Vault_Mercenary_Elite_Acidifier"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>1000</min>
+					<max>1600</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.9</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>400</min>
+							<max>800</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RadWorld/Patches/RadWorld/ThingDefs_Apparel.xml b/ModPatches/RadWorld/Patches/RadWorld/ThingDefs_Apparel.xml
new file mode 100644
index 0000000000..7973637a83
--- /dev/null
+++ b/ModPatches/RadWorld/Patches/RadWorld/ThingDefs_Apparel.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Hazard Suits -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "RW_Apparel_PatchWork_HazardSuit" or defName="RW_Apparel_HazardSuit_Black" or defName="RW_Apparel_HazardSuit_Yellow"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "RW_Apparel_PatchWork_HazardSuit" or defName="RW_Apparel_HazardSuit_Black" or defName="RW_Apparel_HazardSuit_Yellow"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.08</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "RW_Apparel_PatchWork_HazardSuit" or defName="RW_Apparel_HazardSuit_Black" or defName="RW_Apparel_HazardSuit_Yellow"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Armored Hazard Suits -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RW_Apparel_ArmoredHazardSuit_Black" or defName="RW_Apparel_ArmoredHazardSuit_Yellow"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- Stated to have added plasteel plates for protection. We'll say they're 3mm thick.-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RW_Apparel_ArmoredHazardSuit_Black" or defName="RW_Apparel_ArmoredHazardSuit_Yellow"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RW_Apparel_ArmoredHazardSuit_Black" or defName="RW_Apparel_ArmoredHazardSuit_Yellow"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>9</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Environment Shield -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "RW_Apparel_ArchotechEnvironmentShield"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RadWorld/Patches/RadWorld/ThingDefs_Misc.xml b/ModPatches/RadWorld/Patches/RadWorld/ThingDefs_Misc.xml
new file mode 100644
index 0000000000..fbcd86ac41
--- /dev/null
+++ b/ModPatches/RadWorld/Patches/RadWorld/ThingDefs_Misc.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Give the gas mask filter appropriate bulk. -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "RW_GasMaskFilter"]/statBases</xpath>
+		<value>
+			<Bulk>0.65</Bulk>
+		</value>
+	</Operation>
+
+	<!-- Make RadWorld gas masks work like CE gas masks. -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName = "RW_Apparel_DuctTapedGasMask" or defName="RW_Apparel_GasMask_Black" or defName="RW_Apparel_GasMask_Yellow"]</xpath>
+		<value>
+			<li Class="CombatExtended.ApparelHediffExtension">
+				<hediff>WearingGasMask</hediff>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RW_Apparel_GasMask_Black" or defName="RW_Apparel_GasMask_Yellow"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RW_Apparel_DuctTapedGasMask" or defName="RW_Apparel_ArchotechGasMask"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!-- Make CE gas masks work like RadWorld gas masks. -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparel_GasMask"]/statBases</xpath>
+		<value>
+			<RW_RadiationResistanceOffset>0.15</RW_RadiationResistanceOffset>
+			<RW_RadiationResistancePoweredOffset>0.35</RW_RadiationResistancePoweredOffset>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparel_GasMask"]</xpath>
+		<value>
+			<comps>
+				<li Class="CompProperties_Reloadable">
+					<compClass>RadWorld.CompGasMaskReloadable</compClass>
+					<maxCharges>2</maxCharges>
+					<ammoDef>RW_GasMaskFilter</ammoDef>
+					<ammoCountToRefill>2</ammoCountToRefill>
+					<baseReloadTicks>60</baseReloadTicks>
+					<soundReload>Standard_Reload</soundReload>
+					<hotKey>Misc4</hotKey>
+					<chargeNoun>smokepop</chargeNoun>
+					<displayGizmoWhileUndrafted>false</displayGizmoWhileUndrafted>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RadWorld/Patches/RadWorld/ThingDefs_Races.xml b/ModPatches/RadWorld/Patches/RadWorld/ThingDefs_Races.xml
new file mode 100644
index 0000000000..91a68cd4da
--- /dev/null
+++ b/ModPatches/RadWorld/Patches/RadWorld/ThingDefs_Races.xml
@@ -0,0 +1,310 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Irradiated Bear ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RW_IrradiatedBear"]</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.41</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.41</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>31</power>
+					<cooldownTime>2.05</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.85</armorPenetrationSharp>
+					<armorPenetrationBlunt>8.450</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.22</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>4.235</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Irradiated Megaspider ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RW_IrradiatedMegaspider"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4.5</MoveSpeed>
+			<MeleeDodgeChance>0.07</MeleeDodgeChance>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.17</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RW_IrradiatedMegaspider"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>43</power>
+					<cooldownTime>2.48</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.750</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RW_IrradiatedMegaspider"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RW_IrradiatedMegaspider"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RW_IrradiatedMegaspider"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>1.8</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RW_IrradiatedMegaspider"]/combatPower</xpath>
+		<value>
+			<combatPower>130</combatPower>
+		</value>
+	</Operation>
+
+	<!-- ========== Irradiated Rat ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RW_IrradiatedRat"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RW_IrradiatedRat"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>2.3</MoveSpeed>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.0</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RW_IrradiatedRat"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.69</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.013</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.69</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.013</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.95</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>3</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Mole ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RW_Mole"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RW_Mole"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>2.0</MoveSpeed>
+			<MeleeDodgeChance>0.10</MeleeDodgeChance>
+			<MeleeCritChance>0.0</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RW_Mole"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.69</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.013</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.69</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.013</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.95</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>3</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RW_Mole"]/combatPower</xpath>
+		<value>
+			<combatPower>12</combatPower>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rah's Vanilla Turrets Expansion/Defs/Rah's Vanilla Turrets Expansion/Ammo_Shells.xml b/ModPatches/Rah's Vanilla Turrets Expansion/Defs/Rah's Vanilla Turrets Expansion/Ammo_Shells.xml
new file mode 100644
index 0000000000..6a04aeb69d
--- /dev/null
+++ b/ModPatches/Rah's Vanilla Turrets Expansion/Defs/Rah's Vanilla Turrets Expansion/Ammo_Shells.xml	
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_81mmMortarShell_Plasma</defName>
+		<label>plasma power cell</label>
+		<ammoTypes>
+			<PlasmaPowerCell>Bullet_81mmMortarShell_Plasma</PlasmaPowerCell>
+		</ammoTypes>
+		<isMortarAmmoSet>true</isMortarAmmoSet>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base81mmMortarShell">
+		<defName>Bullet_81mmMortarShell_Plasma</defName>
+		<label>81mm mortar shell (Plasma)</label>
+		<graphicData>
+			<texPath>ThirdParty/More Vanilla Turrets/PlasmaMortarProj</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>524</damageAmountBase>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+			<explosionRadius>5</explosionRadius>
+			<flyOverhead>true</flyOverhead>
+			<explosionChanceToStartFire>0.75</explosionChanceToStartFire>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<explosionEffect>GiantExplosion</explosionEffect>
+			<soundExplode>Explosion_GiantBomb</soundExplode>
+			<dropsCasings>true</dropsCasings>
+		</projectile>
+	</ThingDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakePlasmaPowerCell</defName>
+		<label>make devastator plasma power cell</label>
+		<description>Craft 1 devastator plasma power cell.</description>
+		<jobString>Making devastator plasma power cell.</jobString>
+		<workAmount>40000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Shell_HighExplosive</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Shell_EMP</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Plasteel</li>
+				<li>Shell_EMP</li>
+				<li>Shell_HighExplosive</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<PlasmaPowerCell>1</PlasmaPowerCell>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Rah's Vanilla Turrets Expansion/Patches/Rah's Vanilla Turrets Expansion/Patch_Ammo_Shells.xml b/ModPatches/Rah's Vanilla Turrets Expansion/Patches/Rah's Vanilla Turrets Expansion/Patch_Ammo_Shells.xml
new file mode 100644
index 0000000000..636ee36a98
--- /dev/null
+++ b/ModPatches/Rah's Vanilla Turrets Expansion/Patches/Rah's Vanilla Turrets Expansion/Patch_Ammo_Shells.xml	
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="PlasmaPowerCell"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>81mmMortarShellBaseCraftableBase</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="PlasmaPowerCell"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PlasmaPowerCell"]</xpath>
+		<value>
+			<ammoClass>Plasma</ammoClass>
+			<destroyOnDrop>False</destroyOnDrop>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="PlasmaPowerCell"]/costList</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="PlasmaPowerCell"]/recipeMaker</xpath>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rah's Vanilla Turrets Expansion/Patches/Rah's Vanilla Turrets Expansion/Patch_Buildings_Security.xml b/ModPatches/Rah's Vanilla Turrets Expansion/Patches/Rah's Vanilla Turrets Expansion/Patch_Buildings_Security.xml
new file mode 100644
index 0000000000..41b18fbd89
--- /dev/null
+++ b/ModPatches/Rah's Vanilla Turrets Expansion/Patches/Rah's Vanilla Turrets Expansion/Patch_Buildings_Security.xml	
@@ -0,0 +1,790 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Gun Complex ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_GunComplex</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.59</SwayFactor>
+			<Bulk>18.54</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.08</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>86</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<muzzleFlashScale>18</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_303British</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GunComplex"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>86</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<!-- ========== Rocket Complex ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_RocketComplex</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.23</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>2.16</SwayFactor>
+			<Bulk>14.71</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_83mmSMAW_HEAT</defaultProjectile>
+			<warmupTime>2.09</warmupTime>
+			<range>58</range>
+			<minRange>3</minRange>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>30</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>3</magazineSize>
+			<reloadTime>8.6</reloadTime>
+			<ammoSet>AmmoSet_83mmSMAW</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RocketComplex"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>48</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RocketComplex"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>200</Steel>
+				<ComponentIndustrial>5</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<!-- ========== Military Grade Turret ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_TurretMilitary</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>2.13</SwayFactor>
+			<Bulk>37.08</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.09</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>54</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>20</burstShotCount>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>15.6</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MilitaryTurretGun"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>86</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<!-- ========== Manned Military Grade Turret ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_TurretMilitaryManned</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>2.13</SwayFactor>
+			<Bulk>37.08</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.09</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>54</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>20</burstShotCount>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>15.6</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>10</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MilitaryTurretGunManned"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>86</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<!-- ========== Shredder Turret ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_TurretShredder</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>2.02</SwayFactor>
+			<Bulk>10.66</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.34</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<burstShotCount>5</burstShotCount>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>18</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<requireLineOfSight>false</requireLineOfSight>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ShredderTurretGun"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>20</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<!-- ========== Manned Shredder Turret ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_TurretShredderManned</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>2.02</SwayFactor>
+			<Bulk>10.66</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.34</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<burstShotCount>5</burstShotCount>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>18</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<requireLineOfSight>false</requireLineOfSight>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ShredderTurretGunManned"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>20</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<!-- ========== Precision Turret ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_TurretPrecision</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.2</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.32</SwayFactor>
+			<Bulk>28.72</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.80</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_145x114mm_FMJ</defaultProjectile>
+			<warmupTime>1.4</warmupTime>
+			<range>89</range>
+			<soundCast>Shot_SniperRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<muzzleFlashScale>45</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_145x114mm</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PrecisionTurretGun"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>89</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<!-- ========== Manned Precision Turret ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_TurretPrecisionManned</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.32</SwayFactor>
+			<Bulk>28.72</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.80</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_145x114mm_FMJ</defaultProjectile>
+			<warmupTime>1.4</warmupTime>
+			<range>89</range>
+			<soundCast>Shot_SniperRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<muzzleFlashScale>45</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_145x114mm</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PrecisionTurretGunManned"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>89</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<!-- ========== Blast Turret ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_BlastCharge</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>0.99</SwayFactor>
+			<Bulk>12.9</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.58</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_40x53mmGrenade_HE</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>40</range>
+			<minRange>5</minRange>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>3</burstShotCount>
+			<soundCast>Mortar_LaunchA</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>20</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>48</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_40x53mmGrenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BlastTurretGun"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>40</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BlastTurretGun"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>200</Steel>
+				<Plasteel>20</Plasteel>
+				<ComponentIndustrial>5</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<!-- ========== Manned Blast Turret ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_BlastChargeManned</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>0.99</SwayFactor>
+			<Bulk>12.9</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.58</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_40x53mmGrenade_HE</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>40</range>
+			<minRange>5</minRange>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>4</burstShotCount>
+			<soundCast>Mortar_LaunchA</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>20</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>48</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_40x53mmGrenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BlastTurretGunManned"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>40</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BlastTurretGunManned"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>200</Steel>
+				<Plasteel>20</Plasteel>
+				<ComponentIndustrial>5</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<!-- ========== Vulcan Cannon ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_VulcanCannon</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.20</SwayFactor>
+			<Bulk>20.27</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.80</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_20x102mmNATO_Sabot</defaultProjectile>
+			<warmupTime>4.1</warmupTime>
+			<range>62</range>
+			<minRange>6</minRange>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<burstShotCount>40</burstShotCount>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>6</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>375</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_20x102mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VulcanCannon"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>62</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<!-- ========== Manned Vulcan Cannon ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_VulcanCannonManned</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.20</SwayFactor>
+			<Bulk>20.27</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.80</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_20x102mmNATO_Sabot</defaultProjectile>
+			<warmupTime>4.1</warmupTime>
+			<range>62</range>
+			<minRange>4</minRange>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<burstShotCount>40</burstShotCount>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>6</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>375</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_20x102mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>20</aimedBurstShotCount>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VulcanCannonManned"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>62</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="VulcanCannon" or
+			defName="VulcanCannonManned" or
+			defName="ChargeCannon"
+			]/passability </xpath>
+		<value>
+			<!-- Turrets must be passable to allow reloading -->
+			<passability>PassThroughOnly</passability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="VulcanCannon" or
+			defName="VulcanCannonManned" or
+			defName="ChargeCannon"
+			] </xpath>
+		<value>
+			<!-- Workaround to replace passability=Impassable -->
+			<pathCost>200</pathCost>
+		</value>
+	</Operation>
+
+	<!-- ========== Devastator Mortar ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Artillery_DevastatorBomb</defName>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+			<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_81mmMortarShell_Plasma</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<minRange>20</minRange>
+			<range>500</range>
+			<burstShotCount>5</burstShotCount>
+			<soundCast>ChargeLance_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>55</muzzleFlashScale>
+			<circularError>1.45</circularError>
+			<requireLineOfSight>false</requireLineOfSight>
+			<indirectFirePenalty>0.5</indirectFirePenalty>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_81mmMortarShell_Plasma</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Artillery_DevastatorBomb"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>30</li>
+					<li>50</li>
+					<li>70</li>
+					<li>90</li>
+				</chargeSpeeds>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_DevastatorMortarBomb"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>15</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_81mmMortarShell_Plasma"]/graphicData/texPath</xpath>
+		<value>
+			<texPath>Things/Building/Security/DevastatorShell</texPath>
+		</value>
+	</Operation>
+
+	<!--<li Class="PatchOperationAdd">
+	<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_81mmMortarShell"]/ammoTypes</xpath>
+	<value>
+		<Shell_Plasma>Bullet_81mmMortarShell_Plasma</Shell_Plasma>
+	</value>
+</li>-->
+
+	<!-- ========== Charge Cannon ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_ChargeCannon</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>4.8</RangedWeapon_Cooldown>
+			<SightsEfficiency>2</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.89</SwayFactor>
+			<Bulk>40.00</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12mmRailgun_Sabot</defaultProjectile>
+			<warmupTime>1.8</warmupTime>
+			<range>78</range>
+			<soundCast>Shot_TurretSniper</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>8</reloadTime>
+			<ammoSet>AmmoSet_12mmRailgun</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Common to many or all Turrets ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="GunComplex" or
+			defName="RocketComplex" or
+			defName="MilitaryTurretGun" or
+			defName="MilitaryTurretGunManned" or
+			defName="ShredderTurretGun" or
+			defName="ShredderTurretGunManned" or
+			defName="PrecisionTurretGun" or
+			defName="PrecisionTurretGunManned" or
+			defName="BlastTurretGun" or
+			defName="BlastTurretGunManned" or
+			defName="VulcanCannon" or
+			defName="VulcanCannonManned" or
+			defName="ChargeCannon" or
+			defName="Turret_DevastatorMortarBomb"
+			]/thingClass </xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="MilitaryTurretGun" or
+			defName="MilitaryTurretGunManned" or
+			defName="ShredderTurretGun" or
+			defName="ShredderTurretGunManned" or
+			defName="PrecisionTurretGun" or
+			defName="PrecisionTurretGunManned" or
+			defName="BlastTurretGun" or
+			defName="BlastTurretGunManned"
+			]/fillPercent </xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="GunComplex" or
+			defName="RocketComplex" or
+			defName="MilitaryTurretGun" or
+			defName="MilitaryTurretGunManned" or
+			defName="ShredderTurretGun" or
+			defName="ShredderTurretGunManned" or
+			defName="PrecisionTurretGun" or
+			defName="PrecisionTurretGunManned" or
+			defName="BlastTurretGun" or
+			defName="BlastTurretGunManned" or
+			defName="VulcanCannon" or
+			defName="VulcanCannonManned" or
+			defName="ChargeCannon" or
+			defName="Turret_DevastatorMortarBomb"
+			]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="GunComplex" or
+			defName="RocketComplex" or
+			defName="MilitaryTurretGun" or
+			defName="MilitaryTurretGunManned" or
+			defName="ShredderTurretGun" or
+			defName="ShredderTurretGunManned" or
+			defName="PrecisionTurretGun" or
+			defName="PrecisionTurretGunManned" or
+			defName="BlastTurretGun" or
+			defName="BlastTurretGunManned" or
+			defName="VulcanCannon" or
+			defName="VulcanCannonManned" or
+			defName="ChargeCannon"
+			]/statBases/ShootingAccuracyTurret </xpath>
+		<value>
+			<AimingAccuracy>1</AimingAccuracy>
+			<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rakkle the Rattlesnake/Patches/Rakkle the Rattlesnake/Bodies/Rakkle_Bodyparts.xml b/ModPatches/Rakkle the Rattlesnake/Patches/Rakkle the Rattlesnake/Bodies/Rakkle_Bodyparts.xml
new file mode 100644
index 0000000000..a0aabffbc2
--- /dev/null
+++ b/ModPatches/Rakkle the Rattlesnake/Patches/Rakkle the Rattlesnake/Bodies/Rakkle_Bodyparts.xml	
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Bleed Rate === -->
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyPartDef[
+		defName="RS_UpperTail" or
+		defName="RS_LowerTail" or
+		defName="RS_Rattle" or
+		defName="Lower_BellyScale"
+		] </xpath>
+	<value>
+		<bleedRate>1.5</bleedRate>
+	</value>
+</Operation>
+
+<!-- === Sholder/Arm Groups === -->
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Rakkle"]//*[customLabel="right shoulder"]/groups</xpath>
+	<value>
+		<li>RightShoulder</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Rakkle"]//*[customLabel="left shoulder"]/groups</xpath>
+	<value>
+		<li>LeftShoulder</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Rakkle"]//*[customLabel="right arm"]/groups</xpath>
+	<value>
+		<li>RightArm</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Rakkle"]//*[customLabel="left arm"]/groups</xpath>
+	<value>
+		<li>LeftArm</li>
+	</value>
+</Operation>
+
+<!-- === Natural Armor === -->
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/BodyDef[defName="Rakkle"]//*[
+		def="Torso" or
+		def="Neck" or
+		def="Head" or
+		def="Ear" or
+		def="Nose" or
+		def="Jaw" or
+		def="Shoulder" or
+		def="Arm" or
+		def="Hand" or
+		def="Finger" or
+		def="RS_UpperTail" or
+		def="RS_LowerTail" or
+		def="Lower_BellyScale" or
+		def="RS_Rattle"]/groups </xpath>
+	<value>
+		<li>CoveredByNaturalArmor</li>
+	</value>
+</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rakkle the Rattlesnake/Patches/Rakkle the Rattlesnake/PawnKindDefs/Rakkle_PawnKind.xml b/ModPatches/Rakkle the Rattlesnake/Patches/Rakkle the Rattlesnake/PawnKindDefs/Rakkle_PawnKind.xml
new file mode 100644
index 0000000000..0a22201ee6
--- /dev/null
+++ b/ModPatches/Rakkle the Rattlesnake/Patches/Rakkle the Rattlesnake/PawnKindDefs/Rakkle_PawnKind.xml	
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Regular-->
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/PawnKindDef[@Name="FRUBasePawnKind"]</xpath>
+	<value>
+		<li Class="CombatExtended.LoadoutPropertiesExtension">
+			<primaryMagazineCount>
+				<min>1</min>
+				<max>3</max>
+			</primaryMagazineCount>
+			<sidearms>
+				<li>
+					<generateChance>0.15</generateChance>
+					<sidearmMoney>
+						<min>20</min>
+						<max>120</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Melee</li>
+					</weaponTags>
+				</li>
+			</sidearms>
+		</li>
+	</value>
+</Operation>
+
+<!--Cradle-->
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/PawnKindDef[defName="CRD_Kidnapper"]</xpath>
+	<value>
+		<li Class="CombatExtended.LoadoutPropertiesExtension">
+			<primaryMagazineCount>
+				<min>2</min>
+				<max>3</max>
+			</primaryMagazineCount>
+			<sidearms>
+				<li>
+					<generateChance>0.2</generateChance>
+					<sidearmMoney>
+						<min>20</min>
+						<max>120</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Melee</li>
+					</weaponTags>
+				</li>
+			</sidearms>
+		</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/PawnKindDef[defName="CRD_Gunner"]</xpath>
+	<value>
+		<li Class="CombatExtended.LoadoutPropertiesExtension">
+			<primaryMagazineCount>
+				<min>6</min>
+				<max>8</max>
+			</primaryMagazineCount>
+			<sidearms>
+				<li>
+					<generateChance>0.2</generateChance>
+					<sidearmMoney>
+						<min>50</min>
+						<max>200</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Melee</li>
+					</weaponTags>
+				</li>
+			</sidearms>
+		</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/PawnKindDef[defName="CRD_Sapper"]</xpath>
+	<value>
+		<li Class="CombatExtended.LoadoutPropertiesExtension">
+			<primaryMagazineCount>
+				<min>10</min>
+				<max>30</max>
+			</primaryMagazineCount>
+			<forcedSidearm>
+				<sidearmMoney>
+					<min>250</min>
+					<max>100</max>
+				</sidearmMoney>
+				<weaponTags>
+					<li>CE_Sidearm</li>
+				</weaponTags>
+				<magazineCount>
+					<min>2</min>
+					<max>5</max>
+				</magazineCount>
+			</forcedSidearm>
+		</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/PawnKindDef[defName="CRD_HeavyGunner"]</xpath>
+	<value>
+		<li Class="CombatExtended.LoadoutPropertiesExtension">
+			<primaryMagazineCount>
+				<min>1</min>
+				<max>4</max>
+			</primaryMagazineCount>
+			<forcedSidearm>
+				<sidearmMoney>
+					<min>150</min>
+					<max>350</max>
+				</sidearmMoney>
+				<weaponTags>
+					<li>CE_SMG</li>
+				</weaponTags>
+				<magazineCount>
+					<min>0</min>
+					<max>1</max>
+				</magazineCount>
+			</forcedSidearm>
+			<sidearms>
+				<li>
+					<generateChance>0.5</generateChance>
+					<sidearmMoney>
+						<min>60</min>
+						<max>150</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Melee</li>
+					</weaponTags>
+				</li>
+			</sidearms>
+		</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/PawnKindDef[
+		defName="CradleLeader" or
+		defName="CRD_EliteGunner"
+		] </xpath>
+	<value>
+		<li Class="CombatExtended.LoadoutPropertiesExtension">
+			<primaryMagazineCount>
+				<min>6</min>
+				<max>8</max>
+			</primaryMagazineCount>
+			<sidearms>
+				<li>
+					<generateChance>0.2</generateChance>
+					<sidearmMoney>
+						<min>50</min>
+						<max>200</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Melee</li>
+					</weaponTags>
+				</li>
+			</sidearms>
+		</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/PawnKindDef[defName="CRD_Slasher"]</xpath>
+	<value>
+		<li Class="CombatExtended.LoadoutPropertiesExtension">
+			<shieldMoney>
+				<min>500</min>
+				<max>800</max>
+			</shieldMoney>
+			<shieldTags>
+				<li>OutlanderShield</li>
+			</shieldTags>
+			<shieldChance>0.9</shieldChance>
+		</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/PawnKindDef[defName="CRD_EliteSlasher"]</xpath>
+	<value>
+		<li Class="CombatExtended.LoadoutPropertiesExtension">
+			<shieldMoney>
+				<min>800</min>
+				<max>1400</max>
+			</shieldMoney>
+			<shieldTags>
+				<li>OutlanderShield</li>
+			</shieldTags>
+			<shieldChance>0.9</shieldChance>
+		</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/PawnKindDef[
+		defName="CradleLeader"
+		]/weaponTags </xpath>
+	<value>
+		<li>SpacerGun</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/PawnKindDef[
+		defName="CRD_EliteGunner"
+		]/weaponTags </xpath>
+	<value>
+		<li>SpacerGun</li>
+	</value>
+</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rakkle the Rattlesnake/Patches/Rakkle the Rattlesnake/Scenario/Rakkle_Scenario.xml b/ModPatches/Rakkle the Rattlesnake/Patches/Rakkle the Rattlesnake/Scenario/Rakkle_Scenario.xml
new file mode 100644
index 0000000000..e0264523b3
--- /dev/null
+++ b/ModPatches/Rakkle the Rattlesnake/Patches/Rakkle the Rattlesnake/Scenario/Rakkle_Scenario.xml	
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ScenarioDef[defName="RS_Scenario"]/scenario/parts</xpath>
+	<value>
+		<li Class="ScenPart_StartingThing_Defined">
+			<def>StartingThing_Defined</def>
+			<thingDef>Ammo_303British_FMJ</thingDef>
+			<count>200</count>
+		</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ScenarioDef[defName="RS_Scenario"]/scenario/parts/li[thingDef="Apparel_FlakPants"]</xpath>
+	<value>
+		<li Class="ScenPart_StartingThing_Defined">
+			<def>StartingThing_Defined</def>
+			<thingDef>Apparel_FlakPants</thingDef>
+			<stuff>Cloth</stuff>
+			<count>1</count>
+		</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ScenarioDef[defName="RS_Scenario"]/scenario/parts/li[thingDef="Apparel_FlakVest"]</xpath>
+	<value>
+		<li Class="ScenPart_StartingThing_Defined">
+			<def>StartingThing_Defined</def>
+			<thingDef>Apparel_FlakVest</thingDef>
+			<stuff>Steel</stuff>
+			<count>1</count>
+		</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ScenarioDef[defName="RS_Scenario"]/scenario/parts/li[thingDef="Apparel_AdvancedHelmet"]</xpath>
+	<value>
+		<li Class="ScenPart_StartingThing_Defined">
+			<def>StartingThing_Defined</def>
+			<thingDef>Apparel_AdvancedHelmet</thingDef>
+			<count>1</count>
+		</li>
+	</value>
+</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rakkle the Rattlesnake/Patches/Rakkle the Rattlesnake/ThingDefs_Misc/Rakkle_Apparel.xml b/ModPatches/Rakkle the Rattlesnake/Patches/Rakkle the Rattlesnake/ThingDefs_Misc/Rakkle_Apparel.xml
new file mode 100644
index 0000000000..beaec354f0
--- /dev/null
+++ b/ModPatches/Rakkle the Rattlesnake/Patches/Rakkle the Rattlesnake/ThingDefs_Misc/Rakkle_Apparel.xml	
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--========= Regular =========-->
+
+<!--Thin-->
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[
+		defName="RS_ChestWrap"
+		]/statBases </xpath>
+	<value>
+		<Bulk>0.5</Bulk>
+		<WornBulk>0.25</WornBulk>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="RS_IdolCostume" or
+		defName="RS_StarIdol"
+		]/statBases </xpath>
+	<value>
+		<Bulk>2</Bulk>
+		<WornBulk>1</WornBulk>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RS_IdolCostume"]/statBases/StuffEffectMultiplierArmor</xpath>
+	<value>
+		<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RS_StarIdol"]/statBases/StuffEffectMultiplierArmor</xpath>
+	<value>
+		<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+	</value>
+</Operation>
+
+<!--Mid-->
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="RS_MaidCostume" or
+		defName="RS_KnitSweater"
+		]/statBases </xpath>
+	<value>
+		<Bulk>5</Bulk>
+		<WornBulk>2</WornBulk>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RS_MaidCostume"]/statBases/StuffEffectMultiplierArmor</xpath>
+	<value>
+		<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RS_KnitSweater"]/statBases/StuffEffectMultiplierArmor</xpath>
+	<value>
+		<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
+	</value>
+</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rakkle the Rattlesnake/Patches/Rakkle the Rattlesnake/ThingDefs_Races/AlienRace_Rakklelike.xml b/ModPatches/Rakkle the Rattlesnake/Patches/Rakkle the Rattlesnake/ThingDefs_Races/AlienRace_Rakklelike.xml
new file mode 100644
index 0000000000..d6592028d9
--- /dev/null
+++ b/ModPatches/Rakkle the Rattlesnake/Patches/Rakkle the Rattlesnake/ThingDefs_Races/AlienRace_Rakklelike.xml	
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Rakkle"]</xpath>
+	<value>
+		<li Class="CombatExtended.RacePropertiesExtensionCE">
+			<bodyShape>Humanoid</bodyShape>
+		</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Rakkle"]/statBases</xpath>
+	<value>
+		<MeleeCritChance>1</MeleeCritChance>
+		<MeleeParryChance>1</MeleeParryChance>
+		<Suppressability>1</Suppressability>
+		<SmokeSensitivity>1</SmokeSensitivity>
+	</value>
+</Operation>
+
+<!--Powerful Bite, slightly faster regular attacks-->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Rakkle"]/tools</xpath>
+	<value>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>left fist</label>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<power>2</power>
+				<cooldownTime>1.33</cooldownTime>
+				<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+				<armorPenetrationBlunt>0.456</armorPenetrationBlunt>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>right fist</label>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<power>2</power>
+				<cooldownTime>1.33</cooldownTime>
+				<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+				<armorPenetrationBlunt>0.456</armorPenetrationBlunt>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>snake tail</label>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<power>4</power>
+				<cooldownTime>1.16</cooldownTime>
+				<linkedBodyPartsGroup>tail</linkedBodyPartsGroup>
+				<armorPenetrationBlunt>1.094</armorPenetrationBlunt>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>fangs</label>
+				<capacities>
+					<li>Bite</li>
+				</capacities>
+				<power>4</power>
+				<cooldownTime>1.4</cooldownTime>
+				<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+				<armorPenetrationSharp>1.52</armorPenetrationSharp>
+				<armorPenetrationBlunt>2.278</armorPenetrationBlunt>
+				<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+			</li>
+		</tools>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/HediffDef[defName="Hediff_VenomGlands"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+	<value>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>venom fangs</label>
+				<capacities>
+					<li>ToxicBite</li>
+				</capacities>
+				<power>7</power>
+				<cooldownTime>1.4</cooldownTime>
+				<chanceFactor>1.5</chanceFactor>
+				<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+				<armorPenetrationSharp>1.52</armorPenetrationSharp>
+				<armorPenetrationBlunt>2.278</armorPenetrationBlunt>
+			</li>
+		</tools>
+	</value>
+</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rambo Weapons Pack/Defs/Rambo Weapons Pack/Ammo_Rambo.xml b/ModPatches/Rambo Weapons Pack/Defs/Rambo Weapons Pack/Ammo_Rambo.xml
new file mode 100644
index 0000000000..8520003d0e
--- /dev/null
+++ b/ModPatches/Rambo Weapons Pack/Defs/Rambo Weapons Pack/Ammo_Rambo.xml	
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Medusa_M-47</defName>
+		<label>9mm up to .357 Magnum</label>
+		<ammoTypes>
+			<Ammo_357Magnum_FMJ>Bullet_357Magnum_FMJ</Ammo_357Magnum_FMJ>
+			<Ammo_357Magnum_AP>Bullet_357Magnum_AP</Ammo_357Magnum_AP>
+			<Ammo_357Magnum_HP>Bullet_357Magnum_HP</Ammo_357Magnum_HP>
+			<Ammo_38Special_FMJ>Bullet_38Special_FMJ</Ammo_38Special_FMJ>
+			<Ammo_38Special_AP>Bullet_38Special_AP</Ammo_38Special_AP>
+			<Ammo_38Special_HP>Bullet_38Special_HP</Ammo_38Special_HP>
+			<Ammo_9x19mmPara_FMJ>Bullet_9x19mmPara_FMJ</Ammo_9x19mmPara_FMJ>
+			<Ammo_9x19mmPara_AP>Bullet_9x19mmPara_AP</Ammo_9x19mmPara_AP>
+			<Ammo_9x19mmPara_HP>Bullet_9x19mmPara_HP</Ammo_9x19mmPara_HP>
+			<Ammo_380ACP_FMJ>Bullet_380ACP_FMJ</Ammo_380ACP_FMJ>
+			<Ammo_380ACP_AP>Bullet_380ACP_AP</Ammo_380ACP_AP>
+			<Ammo_380ACP_HP>Bullet_380ACP_HP</Ammo_380ACP_HP>
+			<Ammo_38ACP_FMJ>Bullet_38ACP_FMJ</Ammo_38ACP_FMJ>
+			<Ammo_762x25mmTokarev_FMJ>Bullet_762x25mmTokarev_FMJ</Ammo_762x25mmTokarev_FMJ>
+			<Ammo_762x25mmTokarev_AP>Bullet_762x25mmTokarev_AP</Ammo_762x25mmTokarev_AP>
+			<Ammo_762x25mmTokarev_HP>Bullet_762x25mmTokarev_HP</Ammo_762x25mmTokarev_HP>
+			<Ammo_763x25mmMauser_FMJ>Bullet_763x25mmMauser_FMJ</Ammo_763x25mmMauser_FMJ>
+			<Ammo_9x21mmGyurza_FMJ>Bullet_9x21mmGyurza_FMJ</Ammo_9x21mmGyurza_FMJ>
+			<Ammo_9x21mmGyurza_AP>Bullet_9x21mmGyurza_AP</Ammo_9x21mmGyurza_AP>
+			<Ammo_9x21mmGyurza_HP>Bullet_9x21mmGyurza_HP</Ammo_9x21mmGyurza_HP>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Rambo Weapons Pack/Patches/Rambo Weapons Pack/RamboWeaponsPack_amrifles.xml b/ModPatches/Rambo Weapons Pack/Patches/Rambo Weapons Pack/RamboWeaponsPack_amrifles.xml
new file mode 100644
index 0000000000..336e9cecac
--- /dev/null
+++ b/ModPatches/Rambo Weapons Pack/Patches/Rambo Weapons Pack/RamboWeaponsPack_amrifles.xml	
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Barret_M82A1_RWP</defName>
+		<statBases>
+			<WorkToMake>96200</WorkToMake>
+			<SightsEfficiency>2.34</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>2.08</SwayFactor>
+			<Bulk>15.47</Bulk>
+			<Mass>14.00</Mass>
+			<RangedWeapon_Cooldown>3.51</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>275</Steel>
+			<ComponentIndustrial>12</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>6.01</warmupTime>
+			<range>46</range>
+			<soundCast>ShotAMRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>15</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SniperRifle</li>
+			<li>Bipod_AMR</li>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_OSV-96_RWP</defName>
+		<statBases>
+			<WorkToMake>98500</WorkToMake>
+			<SightsEfficiency>2.28</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>2.21</SwayFactor>
+			<Bulk>12.51</Bulk>
+			<Mass>12.90</Mass>
+			<RangedWeapon_Cooldown>3.55</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>205</Steel>
+			<ComponentIndustrial>12</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_127x108mm_FMJ</defaultProjectile>
+			<warmupTime>6.09</warmupTime>
+			<range>47</range>
+			<soundCast>ShotAMRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>15</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_127x108mm</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SniperRifle</li>
+			<li>Bipod_AMR</li>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PTRS-41_RWP</defName>
+		<statBases>
+			<WorkToMake>72000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>2.63</SwayFactor>
+			<Bulk>21.20</Bulk>
+			<Mass>17.30</Mass>
+			<RangedWeapon_Cooldown>4.05</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>250</Steel>
+			<ComponentIndustrial>10</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_145x114mm_FMJ</defaultProjectile>
+			<warmupTime>6.63</warmupTime>
+			<range>40</range>
+			<soundCast>ShotAMRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>15</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>4</AmmoGenPerMagOverride>
+			<reloadTime>1.6</reloadTime>
+			<ammoSet>AmmoSet_145x114mm</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SniperRifle</li>
+			<li>Bipod_AMR</li>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PTRD-41_RWP</defName>
+		<statBases>
+			<WorkToMake>68000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>2.89</SwayFactor>
+			<Bulk>22.00</Bulk>
+			<Mass>20.30</Mass>
+			<RangedWeapon_Cooldown>4.05</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>240</Steel>
+			<ComponentIndustrial>9</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_145x114mm_FMJ</defaultProjectile>
+			<warmupTime>6.42</warmupTime>
+			<range>40</range>
+			<soundCast>ShotAMRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>15</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_145x114mm</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SniperRifle</li>
+			<li>Bipod_AMR</li>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rambo Weapons Pack/Patches/Rambo Weapons Pack/RamboWeaponsPack_assaultrifles.xml b/ModPatches/Rambo Weapons Pack/Patches/Rambo Weapons Pack/RamboWeaponsPack_assaultrifles.xml
new file mode 100644
index 0000000000..84e0f5ab23
--- /dev/null
+++ b/ModPatches/Rambo Weapons Pack/Patches/Rambo Weapons Pack/RamboWeaponsPack_assaultrifles.xml	
@@ -0,0 +1,2782 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AssaultRifle</defName>
+		<statBases>
+			<WorkToMake>43000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.35</SwayFactor>
+			<Bulk>10.03</Bulk>
+			<Mass>3.44</Mass>
+			<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>65</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.49</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>0.9</warmupTime>
+			<range>31</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_ChargeRifle</defName>
+		<statBases>
+			<WorkToMake>70000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.35</SwayFactor>
+			<Bulk>10.03</Bulk>
+			<Mass>3.44</Mass>
+			<RangedWeapon_Cooldown>2.00</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Plasteel>50</Plasteel>
+			<ComponentSpacer>2</ComponentSpacer>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_PlasmaCellRifle</defaultProjectile>
+			<recoilAmount>1</recoilAmount>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+			<warmupTime>1.0</warmupTime>
+			<range>25.9</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_PlasmaCellRifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AK-47_RWP</defName>
+		<statBases>
+			<WorkToMake>37000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<Bulk>9.43</Bulk>
+			<Mass>3.47</Mass>
+			<RangedWeapon_Cooldown>1.59</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>85</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<recoilAmount>1.82</recoilAmount>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>1.0</warmupTime>
+			<range>25.9</range>
+			<soundCast>Shot762x39</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AK-74_RWP</defName>
+		<statBases>
+			<WorkToMake>36500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.25</SwayFactor>
+			<Bulk>9.43</Bulk>
+			<Mass>3.07</Mass>
+			<RangedWeapon_Cooldown>1.29</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>70</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
+			<recoilAmount>1.46</recoilAmount>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>0.9</warmupTime>
+			<range>30</range>
+			<soundCast>Shot545x39</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AK-74M_RWP</defName>
+		<statBases>
+			<WorkToMake>38500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.28</SwayFactor>
+			<Bulk>7.00</Bulk>
+			<Mass>3.40</Mass>
+			<RangedWeapon_Cooldown>1.27</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>72</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
+			<recoilAmount>1.38</recoilAmount>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>0.9</warmupTime>
+			<range>31</range>
+			<soundCast>Shot545x39</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AK-101_RWP</defName>
+		<statBases>
+			<WorkToMake>39000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.30</SwayFactor>
+			<Bulk>7.00</Bulk>
+			<Mass>3.60</Mass>
+			<RangedWeapon_Cooldown>1.27</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>72</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.42</recoilAmount>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>0.91</warmupTime>
+			<range>31</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AK-102_RWP</defName>
+		<statBases>
+			<WorkToMake>38500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.22</SwayFactor>
+			<Bulk>5.86</Bulk>
+			<Mass>3.00</Mass>
+			<RangedWeapon_Cooldown>1.31</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>73</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.51</recoilAmount>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>0.85</warmupTime>
+			<range>30</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AK-103_RWP</defName>
+		<statBases>
+			<WorkToMake>38700</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.28</SwayFactor>
+			<Bulk>7.05</Bulk>
+			<Mass>3.40</Mass>
+			<RangedWeapon_Cooldown>1.57</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>78</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<recoilAmount>1.83</recoilAmount>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>0.91</warmupTime>
+			<range>29</range>
+			<soundCast>Shot762x39</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AK-104_RWP</defName>
+		<statBases>
+			<WorkToMake>38200</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.12</SwayFactor>
+			<Bulk>5.86</Bulk>
+			<Mass>3.20</Mass>
+			<RangedWeapon_Cooldown>1.61</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>78</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<recoilAmount>1.89</recoilAmount>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>0.85</warmupTime>
+			<range>28</range>
+			<soundCast>Shot762x39</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AK-105_RWP</defName>
+		<statBases>
+			<WorkToMake>38000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.14</SwayFactor>
+			<Bulk>5.86</Bulk>
+			<Mass>3.20</Mass>
+			<RangedWeapon_Cooldown>1.31</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>78</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
+			<recoilAmount>1.38</recoilAmount>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>0.85</warmupTime>
+			<range>30</range>
+			<soundCast>Shot545x39</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AKM_RWP</defName>
+		<statBases>
+			<WorkToMake>36000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.19</SwayFactor>
+			<Bulk>8.80</Bulk>
+			<Mass>3.10</Mass>
+			<RangedWeapon_Cooldown>1.58</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>77</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<recoilAmount>1.92</recoilAmount>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>0.91</warmupTime>
+			<range>28</range>
+			<soundCast>Shot762x39</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AKMS_RWP</defName>
+		<statBases>
+			<WorkToMake>36500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.25</SwayFactor>
+			<Bulk>6.55</Bulk>
+			<Mass>3.30</Mass>
+			<RangedWeapon_Cooldown>1.61</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>76</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<recoilAmount>1.86</recoilAmount>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>0.86</warmupTime>
+			<range>28</range>
+			<soundCast>Shot762x39</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AKS-47_RWP</defName>
+		<statBases>
+			<WorkToMake>37500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.24</SwayFactor>
+			<Bulk>6.45</Bulk>
+			<Mass>3.67</Mass>
+			<RangedWeapon_Cooldown>1.61</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>75</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<recoilAmount>1.77</recoilAmount>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>0.86</warmupTime>
+			<range>27</range>
+			<soundCast>Shot762x39</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AKS-74_RWP</defName>
+		<statBases>
+			<WorkToMake>37100</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.24</SwayFactor>
+			<Bulk>6.90</Bulk>
+			<Mass>2.97</Mass>
+			<RangedWeapon_Cooldown>1.32</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>81</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
+			<recoilAmount>1.48</recoilAmount>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>0.86</warmupTime>
+			<range>30</range>
+			<soundCast>Shot545x39</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AKS-74U_RWP</defName>
+		<statBases>
+			<WorkToMake>32800</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.01</SwayFactor>
+			<Bulk>4.90</Bulk>
+			<Mass>2.70</Mass>
+			<RangedWeapon_Cooldown>1.19</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>52</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
+			<recoilAmount>1.40</recoilAmount>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>0.53</warmupTime>
+			<range>26</range>
+			<soundCast>Shot545x39</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AKS-74UB_RWP</defName>
+		<statBases>
+			<WorkToMake>32800</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.01</SwayFactor>
+			<Bulk>6.95</Bulk>
+			<Mass>3.00</Mass>
+			<RangedWeapon_Cooldown>1.19</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>52</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
+			<recoilAmount>1.33</recoilAmount>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>0.53</warmupTime>
+			<range>26</range>
+			<soundCast>ShotASVal</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AN-94_RWP</defName>
+		<statBases>
+			<WorkToMake>56100</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.25</SwayFactor>
+			<Bulk>7.28</Bulk>
+			<Mass>3.85</Mass>
+			<RangedWeapon_Cooldown>0.80</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>80</Steel>
+			<ComponentIndustrial>8</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
+			<recoilAmount>1.04</recoilAmount>
+			<burstShotCount>2</burstShotCount>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<warmupTime>0.57</warmupTime>
+			<range>30</range>
+			<soundCast>Shot545x39</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AS_Val_RWP</defName>
+		<statBases>
+			<WorkToMake>61500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.25</SwayFactor>
+			<Bulk>7.28</Bulk>
+			<Mass>3.85</Mass>
+			<RangedWeapon_Cooldown>1.20</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>102</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_9x39mmSoviet_FMJ</defaultProjectile>
+			<recoilAmount>1.94</recoilAmount>
+			<warmupTime>0.95</warmupTime>
+			<range>27</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>ShotASVal</soundCast>
+			<muzzleFlashScale>11</muzzleFlashScale>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_ASh-127_RWP</defName>
+		<statBases>
+			<WorkToMake>85000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.62</SwayFactor>
+			<Bulk>10.20</Bulk>
+			<Mass>6.00</Mass>
+			<RangedWeapon_Cooldown>2.55</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>100</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_127x55mm_FMJ</defaultProjectile>
+			<recoilAmount>2.68</recoilAmount>
+			<warmupTime>1.20</warmupTime>
+			<range>22</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>Shot762x39</soundCast>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_127x55mm</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AUG_A1_RWP</defName>
+		<statBases>
+			<WorkToMake>49900</WorkToMake>
+			<SightsEfficiency>1.59</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.18</SwayFactor>
+			<Bulk>8.05</Bulk>
+			<Mass>3.60</Mass>
+			<RangedWeapon_Cooldown>1.28</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>20</Chemfuel>
+			<Steel>65</Steel>
+			<ComponentIndustrial>9</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.47</recoilAmount>
+			<warmupTime>0.97</warmupTime>
+			<range>34</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AUG_A1_Carbine_RWP</defName>
+		<statBases>
+			<WorkToMake>49900</WorkToMake>
+			<SightsEfficiency>1.59</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.04</SwayFactor>
+			<Bulk>6.90</Bulk>
+			<Mass>3.30</Mass>
+			<RangedWeapon_Cooldown>1.33</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>68</Steel>
+			<ComponentIndustrial>9</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.49</recoilAmount>
+			<warmupTime>0.85</warmupTime>
+			<range>34</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AUG_A3_Carbine_RWP</defName>
+		<statBases>
+			<WorkToMake>47000</WorkToMake>
+			<SightsEfficiency>1.59</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.03</SwayFactor>
+			<Bulk>6.90</Bulk>
+			<Mass>3.20</Mass>
+			<RangedWeapon_Cooldown>1.30</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>65</Steel>
+			<ComponentIndustrial>8</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.51</recoilAmount>
+			<warmupTime>0.80</warmupTime>
+			<range>30</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Daewoo_K2_RWP</defName>
+		<statBases>
+			<WorkToMake>39800</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.31</SwayFactor>
+			<Bulk>7.30</Bulk>
+			<Mass>3.26</Mass>
+			<RangedWeapon_Cooldown>1.30</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>64</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.44</recoilAmount>
+			<warmupTime>0.92</warmupTime>
+			<range>30</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_F2000_RWP</defName>
+		<statBases>
+			<WorkToMake>56500</WorkToMake>
+			<SightsEfficiency>1.60</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.19</SwayFactor>
+			<Bulk>9.13</Bulk>
+			<Mass>3.60</Mass>
+			<RangedWeapon_Cooldown>1.23</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>59</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.41</recoilAmount>
+			<warmupTime>1.05</warmupTime>
+			<range>35</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_F2000_Tactical_RWP</defName>
+		<statBases>
+			<WorkToMake>54500</WorkToMake>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.17</SwayFactor>
+			<Bulk>9.13</Bulk>
+			<Mass>3.39</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>85</Steel>
+			<ComponentIndustrial>9</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.46</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_FAMAS_F1_RWP</defName>
+		<statBases>
+			<WorkToMake>45500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.12</SwayFactor>
+			<Bulk>7.57</Bulk>
+			<Mass>3.61</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>53</Steel>
+			<ComponentIndustrial>8</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.44</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>40</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>Bipod_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_FAMAS_G1_RWP</defName>
+		<statBases>
+			<WorkToMake>46000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.14</SwayFactor>
+			<Bulk>7.57</Bulk>
+			<Mass>3.80</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>53</Steel>
+			<ComponentIndustrial>8</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.40</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>40</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>Bipod_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_FAMAS_G2_RWP</defName>
+		<statBases>
+			<WorkToMake>46200</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.14</SwayFactor>
+			<Bulk>7.57</Bulk>
+			<Mass>3.80</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>56</Steel>
+			<ComponentIndustrial>8</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.40</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>51</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>Bipod_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_G11_K2_RWP</defName>
+		<statBases>
+			<WorkToMake>66000</WorkToMake>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.11</SwayFactor>
+			<Bulk>8.50</Bulk>
+			<Mass>3.60</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>95</Steel>
+			<ComponentIndustrial>10</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_473x33mmCaseless_FMJ</defaultProjectile>
+			<recoilAmount>1.30</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<warmupTime>1</warmupTime>
+			<range>48</range>
+			<soundCast>ShotG11</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>45</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_473x33mmCaseless</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_G36_RWP</defName>
+		<statBases>
+			<WorkToMake>53500</WorkToMake>
+			<SightsEfficiency>1.68</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.39</SwayFactor>
+			<Bulk>7.58</Bulk>
+			<Mass>3.63</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>70</Steel>
+			<ComponentIndustrial>8</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.42</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>1.4</warmupTime>
+			<range>48</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_G36C_RWP</defName>
+		<statBases>
+			<WorkToMake>49500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.00</SwayFactor>
+			<Bulk>5.00</Bulk>
+			<Mass>2.82</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>64</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.43</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>0.9</warmupTime>
+			<range>31</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_G36K_RWP</defName>
+		<statBases>
+			<WorkToMake>52500</WorkToMake>
+			<SightsEfficiency>1.68</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.22</SwayFactor>
+			<Bulk>6.15</Bulk>
+			<Mass>3.30</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>77</Steel>
+			<ComponentIndustrial>8</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.44</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>1.4</warmupTime>
+			<range>40</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Galil_AR_556mm_RWP</defName>
+		<statBases>
+			<WorkToMake>41500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.37</SwayFactor>
+			<Bulk>7.42</Bulk>
+			<Mass>3.95</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>8</Chemfuel>
+			<Steel>78</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.39</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>51</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>35</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Galil_MAR_556mm_RWP</defName>
+		<statBases>
+			<WorkToMake>36800</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.99</SwayFactor>
+			<Bulk>4.45</Bulk>
+			<Mass>2.95</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>8</Chemfuel>
+			<Steel>58</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.39</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>40</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>35</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Galil_SAR_556mm_RWP</defName>
+		<statBases>
+			<WorkToMake>41000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.10</ShotSpread>
+			<SwayFactor>1.22</SwayFactor>
+			<Bulk>6.14</Bulk>
+			<Mass>3.75</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>8</Chemfuel>
+			<Steel>74</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.39</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>40</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>35</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_HK416_D10RS_RWP</defName>
+		<statBases>
+			<WorkToMake>54000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.10</SwayFactor>
+			<Bulk>7.01</Bulk>
+			<Mass>3.02</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>82</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.44</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>40</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_HK416_D145RS_RWP</defName>
+		<statBases>
+			<WorkToMake>54500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.10</ShotSpread>
+			<SwayFactor>1.25</SwayFactor>
+			<Bulk>8.04</Bulk>
+			<Mass>3.49</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>79</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.42</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Howa_Type_89_RWP</defName>
+		<statBases>
+			<WorkToMake>45200</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>0.89</SwayFactor>
+			<Bulk>10.16</Bulk>
+			<Mass>3.50</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>70</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.42</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>Bipod_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_L85A1_RWP</defName>
+		<statBases>
+			<WorkToMake>40000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.17</SwayFactor>
+			<Bulk>7.85</Bulk>
+			<Mass>3.82</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>70</Steel>
+			<ComponentIndustrial>8</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.37</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_L85A2_RWP</defName>
+		<statBases>
+			<WorkToMake>44500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.17</SwayFactor>
+			<Bulk>7.85</Bulk>
+			<Mass>3.82</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>68</Steel>
+			<ComponentIndustrial>8</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.37</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_LR-300-ML_RWP</defName>
+		<statBases>
+			<WorkToMake>46500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.13</SwayFactor>
+			<Bulk>5.79</Bulk>
+			<Mass>3.10</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>62</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.54</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>40</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_M4_RWP</defName>
+		<statBases>
+			<WorkToMake>45200</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.10</ShotSpread>
+			<SwayFactor>1.11</SwayFactor>
+			<Bulk>7.57</Bulk>
+			<Mass>2.68</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>69</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.62</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_M16A1_RWP</defName>
+		<statBases>
+			<WorkToMake>44500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.30</SwayFactor>
+			<Bulk>9.86</Bulk>
+			<Mass>3.18</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>68</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.58</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_M16A2_RWP</defName>
+		<statBases>
+			<WorkToMake>45000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.35</SwayFactor>
+			<Bulk>10.06</Bulk>
+			<Mass>3.40</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>68</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.49</recoilAmount>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_M16A2_RWP</defName>
+		<statBases>
+			<WorkToMake>45500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.35</SwayFactor>
+			<Bulk>10.06</Bulk>
+			<Mass>3.40</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>71</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.49</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MKb42_H_RWP</defName>
+		<statBases>
+			<WorkToMake>34500</WorkToMake>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.10</ShotSpread>
+			<SwayFactor>1.43</SwayFactor>
+			<Bulk>9.40</Bulk>
+			<Mass>4.90</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>8</WoodLog>
+			<Steel>62</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_792x33mmKurz_FMJ</defaultProjectile>
+			<recoilAmount>1.50</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>40</range>
+			<soundCast>Shot792x33</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_792x33mmKurz</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_OTs-14-1A-01_Groza-1_RWP</defName>
+		<statBases>
+			<WorkToMake>43500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.88</SwayFactor>
+			<Bulk>6.10</Bulk>
+			<Mass>2.70</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>8</Chemfuel>
+			<WoodLog>10</WoodLog>
+			<Steel>78</Steel>
+			<ComponentIndustrial>8</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<recoilAmount>2.07</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>40</range>
+			<soundCast>Shot762x39</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_OTs-14-4A-01_Groza-4_RWP</defName>
+		<statBases>
+			<WorkToMake>55300</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>0.88</SwayFactor>
+			<Bulk>6.10</Bulk>
+			<Mass>2.70</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>8</Chemfuel>
+			<WoodLog>10</WoodLog>
+			<Steel>83</Steel>
+			<ComponentIndustrial>8</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_9x39mmSoviet_FMJ</defaultProjectile>
+			<recoilAmount>1.89</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>31</range>
+			<soundCast>Shot545x39</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_9x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SA_vz58P_RWP</defName>
+		<statBases>
+			<WorkToMake>38000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.14</SwayFactor>
+			<Bulk>8.45</Bulk>
+			<Mass>2.91</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>80</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<recoilAmount>1.97</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<soundCast>Shot762x39</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SA_vz58V_RWP</defName>
+		<statBases>
+			<WorkToMake>38800</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.14</SwayFactor>
+			<Bulk>6.36</Bulk>
+			<Mass>2.91</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>8</Chemfuel>
+			<Steel>81</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<recoilAmount>1.97</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<soundCast>Shot762x39</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SCAR-L_CQC_RWP</defName>
+		<statBases>
+			<WorkToMake>53000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.09</SwayFactor>
+			<Bulk>5.33</Bulk>
+			<Mass>3.04</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>78</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.41</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>40</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SCAR-L_LB_RWP</defName>
+		<statBases>
+			<WorkToMake>55000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.34</SwayFactor>
+			<Bulk>7.36</Bulk>
+			<Mass>3.49</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>81</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.47</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SCAR-L_STD_RWP</defName>
+		<statBases>
+			<WorkToMake>53800</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.10</ShotSpread>
+			<SwayFactor>1.22</SwayFactor>
+			<Bulk>6.35</Bulk>
+			<Mass>3.29</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>79</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.47</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SG_550_RWP</defName>
+		<statBases>
+			<WorkToMake>47500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.40</SwayFactor>
+			<Bulk>7.72</Bulk>
+			<Mass>4.10</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>73</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.33</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>Bipod_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SG_551_RWP</defName>
+		<statBases>
+			<WorkToMake>47000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.10</ShotSpread>
+			<SwayFactor>1.17</SwayFactor>
+			<Bulk>6.07</Bulk>
+			<Mass>3.40</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>72</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.41</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SG_552_RWP</defName>
+		<statBases>
+			<WorkToMake>46300</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.05</SwayFactor>
+			<Bulk>5.04</Bulk>
+			<Mass>3.20</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>70</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.35</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>40</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_StG44_RWP</defName>
+		<statBases>
+			<WorkToMake>35000</WorkToMake>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.40</SwayFactor>
+			<Bulk>9.40</Bulk>
+			<Mass>4.60</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>8</WoodLog>
+			<Steel>63</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_792x33mmKurz_FMJ</defaultProjectile>
+			<recoilAmount>1.51</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>40</range>
+			<soundCast>Shot792x33</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_792x33mmKurz</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Tavor_CTAR-21_RWP</defName>
+		<statBases>
+			<WorkToMake>45700</WorkToMake>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>0.96</SwayFactor>
+			<Bulk>6.40</Bulk>
+			<Mass>3.18</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>68</Steel>
+			<ComponentIndustrial>8</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.50</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>1</warmupTime>
+			<range>48</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Tavor_TAR-21_RWP</defName>
+		<statBases>
+			<WorkToMake>46200</WorkToMake>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.05</SwayFactor>
+			<Bulk>7.20</Bulk>
+			<Mass>3.27</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>70</Steel>
+			<ComponentIndustrial>8</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.49</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_TKB-022PM_RWP</defName>
+		<statBases>
+			<WorkToMake>42000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.10</ShotSpread>
+			<SwayFactor>0.80</SwayFactor>
+			<Bulk>5.25</Bulk>
+			<Mass>2.80</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>70</Steel>
+			<ComponentIndustrial>8</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<recoilAmount>2.02</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>44</range>
+			<soundCast>Shot762x39</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_VSS_Vintorez_RWP</defName>
+		<statBases>
+			<WorkToMake>65000</WorkToMake>
+			<SightsEfficiency>1.75</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.19</SwayFactor>
+			<Bulk>8.94</Bulk>
+			<Mass>2.60</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>8</Chemfuel>
+			<WoodLog>10</WoodLog>
+			<Steel>100</Steel>
+			<ComponentIndustrial>10</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_9x39mmSoviet_FMJ</defaultProjectile>
+			<recoilAmount>1.90</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>1.5</warmupTime>
+			<range>40</range>
+			<soundCast>ShotASVal</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>0</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Zastava_M70_RWP</defName>
+		<statBases>
+			<WorkToMake>37000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.29</SwayFactor>
+			<Bulk>9.20</Bulk>
+			<Mass>3.70</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>82</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<recoilAmount>1.76</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>44</range>
+			<soundCast>Shot762x39</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Zastava_M70A_RWP</defName>
+		<statBases>
+			<WorkToMake>37500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>6.70</Bulk>
+			<Mass>3.50</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>81</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<recoilAmount>1.81</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>44</range>
+			<soundCast>Shot762x39</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rambo Weapons Pack/Patches/Rambo Weapons Pack/RamboWeaponsPack_base.xml b/ModPatches/Rambo Weapons Pack/Patches/Rambo Weapons Pack/RamboWeaponsPack_base.xml
new file mode 100644
index 0000000000..c972462294
--- /dev/null
+++ b/ModPatches/Rambo Weapons Pack/Patches/Rambo Weapons Pack/RamboWeaponsPack_base.xml	
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@ParentName = "BaseRamboGun"]/tools</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name = "BaseRamboGun"]</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.8</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.9</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Mercenary_Sniper" or defName="Mercenary_Sniper_Acidifier"]/weaponMoney</xpath>
+		<value>
+			<weaponMoney>475~600</weaponMoney>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rambo Weapons Pack/Patches/Rambo Weapons Pack/RamboWeaponsPack_battlerifles.xml b/ModPatches/Rambo Weapons Pack/Patches/Rambo Weapons Pack/RamboWeaponsPack_battlerifles.xml
new file mode 100644
index 0000000000..7feae8ca19
--- /dev/null
+++ b/ModPatches/Rambo Weapons Pack/Patches/Rambo Weapons Pack/RamboWeaponsPack_battlerifles.xml	
@@ -0,0 +1,613 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AVT-40_RWP</defName>
+		<statBases>
+			<WorkToMake>32000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.61</SwayFactor>
+			<Bulk>12.26</Bulk>
+			<Mass>3.85</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>57</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<recoilAmount>2.09</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>ShotSemiAutoRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_C1A1_SLR_RWP</defName>
+		<statBases>
+			<WorkToMake>40000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.58</SwayFactor>
+			<Bulk>11.43</Bulk>
+			<Mass>4.34</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>80</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>ShotBattleRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</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>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Fal_50_00_RWP</defName>
+		<statBases>
+			<WorkToMake>67000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.52</SwayFactor>
+			<Bulk>10.90</Bulk>
+			<Mass>4.30</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>106</Steel>
+			<ComponentIndustrial>8</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>2.07</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>ShotBattleRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</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>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Fal_50_61_RWP</defName>
+		<statBases>
+			<WorkToMake>67400</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.49</SwayFactor>
+			<Bulk>8.45</Bulk>
+			<Mass>3.90</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>113</Steel>
+			<ComponentIndustrial>8</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>2.18</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>ShotBattleRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</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>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_G3_RWP</defName>
+		<statBases>
+			<WorkToMake>66500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.46</SwayFactor>
+			<Bulk>10.23</Bulk>
+			<Mass>4.40</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>110</Steel>
+			<ComponentIndustrial>8</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<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>
+			<soundCast>ShotBattleRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</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>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_G3A3_RWP</defName>
+		<statBases>
+			<WorkToMake>67500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.46</SwayFactor>
+			<Bulk>10.23</Bulk>
+			<Mass>4.40</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>115</Steel>
+			<ComponentIndustrial>8</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<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>
+			<soundCast>ShotBattleRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</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>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_G3A4_RWP</defName>
+		<statBases>
+			<WorkToMake>67200</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.50</SwayFactor>
+			<Bulk>8.40</Bulk>
+			<Mass>4.70</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>8</Chemfuel>
+			<Steel>117</Steel>
+			<ComponentIndustrial>8</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.94</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>ShotBattleRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</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>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_G3KA4_RWP</defName>
+		<statBases>
+			<WorkToMake>67200</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.31</SwayFactor>
+			<Bulk>7.11</Bulk>
+			<Mass>4.10</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>8</Chemfuel>
+			<Steel>117</Steel>
+			<ComponentIndustrial>8</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>2.05</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>ShotBattleRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</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>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Howa_Type_64_RWP</defName>
+		<statBases>
+			<WorkToMake>65000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.00</SwayFactor>
+			<Bulk>10.90</Bulk>
+			<Mass>4.40</Mass>
+			<RangedWeapon_Cooldown>0.57</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>8</WoodLog>
+			<Steel>104</Steel>
+			<ComponentIndustrial>8</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.84</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<soundCast>ShotBattleRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</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>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>Bipod_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_L1A1_SLR_RWP</defName>
+		<statBases>
+			<WorkToMake>40000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.58</SwayFactor>
+			<Bulk>11.43</Bulk>
+			<Mass>4.34</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>75</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>ShotBattleRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</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>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_M14_RWP</defName>
+		<statBases>
+			<WorkToMake>35000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.53</SwayFactor>
+			<Bulk>11.20</Bulk>
+			<Mass>4.10</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>60</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>2.14</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>52</range>
+			<soundCast>ShotBattleRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</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>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SCAR-H_CQC_RWP</defName>
+		<statBases>
+			<WorkToMake>69000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.24</SwayFactor>
+			<Bulk>6.35</Bulk>
+			<Mass>3.49</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>12</Chemfuel>
+			<Steel>102</Steel>
+			<ComponentIndustrial>8</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>2.12</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>40</range>
+			<soundCast>ShotBattleRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</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>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SCAR-H_LB_RWP</defName>
+		<statBases>
+			<WorkToMake>73000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.44</SwayFactor>
+			<Bulk>8.13</Bulk>
+			<Mass>3.72</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>12</Chemfuel>
+			<Steel>104</Steel>
+			<ComponentIndustrial>8</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>2.05</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>ShotBattleRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</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>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SCAR-H_STD_RWP</defName>
+		<statBases>
+			<WorkToMake>70000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.32</SwayFactor>
+			<Bulk>7.11</Bulk>
+			<Mass>3.58</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>12</Chemfuel>
+			<Steel>103</Steel>
+			<ComponentIndustrial>8</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>2.09</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<soundCast>ShotBattleRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</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>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rambo Weapons Pack/Patches/Rambo Weapons Pack/RamboWeaponsPack_heavy.xml b/ModPatches/Rambo Weapons Pack/Patches/Rambo Weapons Pack/RamboWeaponsPack_heavy.xml
new file mode 100644
index 0000000000..e7d696f155
--- /dev/null
+++ b/ModPatches/Rambo Weapons Pack/Patches/Rambo Weapons Pack/RamboWeaponsPack_heavy.xml	
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_China_Lake_RWP</defName>
+		<statBases>
+			<WorkToMake>45600</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.25</SwayFactor>
+			<Bulk>8.75</Bulk>
+			<Mass>3.72</Mass>
+			<RangedWeapon_Cooldown>1.01</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>90</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<warmupTime>1.1</warmupTime>
+			<range>40</range>
+			<minRange>5</minRange>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<soundCast>ShotPumpGrenadeLauncher</soundCast>
+			<muzzleFlashScale>14</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>3</magazineSize>
+			<reloadTime>6.00</reloadTime>
+			<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>GrenadeDestructive</li>
+			<li>CE_AI_Launcher</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_M79_RWP</defName>
+		<statBases>
+			<WorkToMake>39500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.00</SwayFactor>
+			<Bulk>7.31</Bulk>
+			<Mass>2.70</Mass>
+			<RangedWeapon_Cooldown>0.43</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>75</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<warmupTime>1.1</warmupTime>
+			<range>40</range>
+			<minRange>5</minRange>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<muzzleFlashScale>14</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
+			<reloadTime>2.6</reloadTime>
+			<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>GrenadeDestructive</li>
+			<li>CE_AI_Launcher</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_XM25_CDTE_RWP</defName>
+		<statBases>
+			<WorkToMake>55000</WorkToMake>
+			<SightsEfficiency>1.62</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.40</SwayFactor>
+			<Bulk>7.49</Bulk>
+			<Mass>6.35</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>115</Steel>
+			<ComponentIndustrial>8</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_25x40mmGrenade_HE</defaultProjectile>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<warmupTime>1.3</warmupTime>
+			<range>55</range>
+			<minRange>5</minRange>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<muzzleFlashScale>14</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_25x40mmGrenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>GrenadeDestructive</li>
+			<li>CE_AI_Launcher</li>
+		</weaponTags>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rambo Weapons Pack/Patches/Rambo Weapons Pack/RamboWeaponsPack_machineguns.xml b/ModPatches/Rambo Weapons Pack/Patches/Rambo Weapons Pack/RamboWeaponsPack_machineguns.xml
new file mode 100644
index 0000000000..09a22bd89f
--- /dev/null
+++ b/ModPatches/Rambo Weapons Pack/Patches/Rambo Weapons Pack/RamboWeaponsPack_machineguns.xml	
@@ -0,0 +1,1224 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Bren_Mk1_RWP</defName>
+		<statBases>
+			<WorkToMake>68000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.51</SwayFactor>
+			<Bulk>13.56</Bulk>
+			<Mass>10.04</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>8</WoodLog>
+			<Steel>147</Steel>
+			<ComponentIndustrial>9</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
+			<recoilAmount>1.24</recoilAmount>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>59</range>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_303British</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>CE_MachineGun</li>
+			<li>Bipod_LMG</li>
+			<li>CE_AI_Suppressive</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Chauchat_Mle_1915_RWP</defName>
+		<statBases>
+			<WorkToMake>52000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.44</SwayFactor>
+			<Bulk>11.43</Bulk>
+			<Mass>9.07</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>8</WoodLog>
+			<Steel>147</Steel>
+			<ComponentIndustrial>9</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_8x50mmRLebel_FMJ</defaultProjectile>
+			<recoilAmount>1.30</recoilAmount>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>31</range>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_8x50mmRLebel</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>CE_MachineGun</li>
+			<li>Bipod_LMG</li>
+			<li>CE_AI_Suppressive</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_DP-28_RWP</defName>
+		<statBases>
+			<WorkToMake>74500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.53</SwayFactor>
+			<Bulk>14.70</Bulk>
+			<Mass>9.12</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>8</WoodLog>
+			<Steel>173</Steel>
+			<ComponentIndustrial>12</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<recoilAmount>1.32</recoilAmount>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>75</range>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>47</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>CE_MachineGun</li>
+			<li>Bipod_LMG</li>
+			<li>CE_AI_Suppressive</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_DPM_RWP</defName>
+		<statBases>
+			<WorkToMake>76000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.53</SwayFactor>
+			<Bulk>14.70</Bulk>
+			<Mass>9.12</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>8</WoodLog>
+			<Steel>175</Steel>
+			<ComponentIndustrial>12</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<recoilAmount>1.32</recoilAmount>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>75</range>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>47</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>CE_MachineGun</li>
+			<li>Bipod_LMG</li>
+			<li>CE_AI_Suppressive</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Galil_ARM_556mm_RWP</defName>
+		<statBases>
+			<WorkToMake>48500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>0.99</SwayFactor>
+			<Bulk>8.42</Bulk>
+			<Mass>4.35</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>8</WoodLog>
+			<Steel>83</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<recoilAmount>1.28</recoilAmount>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>51</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>CE_MachineGun</li>
+			<li>Bipod_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_HK21_RWP</defName>
+		<statBases>
+			<WorkToMake>82200</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>13.21</Bulk>
+			<Mass>7.92</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>178</Steel>
+			<ComponentIndustrial>12</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.46</recoilAmount>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>75</range>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>CE_MachineGun</li>
+			<li>Bipod_LMG</li>
+			<li>CE_AI_Suppressive</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Lewis_Gun_RWP</defName>
+		<statBases>
+			<WorkToMake>70000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.72</SwayFactor>
+			<Bulk>14.83</Bulk>
+			<Mass>11.80</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>8</WoodLog>
+			<Steel>175</Steel>
+			<ComponentIndustrial>12</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
+			<recoilAmount>1.13</recoilAmount>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>75</range>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>47</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_303British</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>CE_MachineGun</li>
+			<li>Bipod_LMG</li>
+			<li>CE_AI_Suppressive</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_M60_RWP</defName>
+		<statBases>
+			<WorkToMake>81000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.47</SwayFactor>
+			<Bulk>13.67</Bulk>
+			<Mass>10.40</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>175</Steel>
+			<ComponentIndustrial>12</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.31</recoilAmount>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>75</range>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>CE_MachineGun</li>
+			<li>Bipod_LMG</li>
+			<li>CE_AI_Suppressive</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_M240B_RWP</defName>
+		<statBases>
+			<WorkToMake>83000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.26</SwayFactor>
+			<Bulk>18.35</Bulk>
+			<Mass>12.70</Mass>
+			<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>179</Steel>
+			<ComponentIndustrial>12</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.31</recoilAmount>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>75</range>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>CE_MachineGun</li>
+			<li>Bipod_LMG</li>
+			<li>CE_AI_Suppressive</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_M249_RWP</defName>
+		<statBases>
+			<WorkToMake>75000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.26</SwayFactor>
+			<Bulk>13.35</Bulk>
+			<Mass>7.70</Mass>
+			<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>167</Steel>
+			<ComponentIndustrial>12</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>0.92</recoilAmount>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>75</range>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>CE_MachineGun</li>
+			<li>Bipod_SAW</li>
+			<li>CE_AI_Suppressive</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_M1918_BAR_RWP</defName>
+		<statBases>
+			<WorkToMake>69000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.92</SwayFactor>
+			<Bulk>11.94</Bulk>
+			<Mass>7.25</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>155</Steel>
+			<ComponentIndustrial>9</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
+			<recoilAmount>1.52</recoilAmount>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>51</range>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_3006Springfield</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>CE_MachineGun</li>
+			<li>CE_AI_Suppressive</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MG3_RWP</defName>
+		<statBases>
+			<WorkToMake>84500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.59</SwayFactor>
+			<Bulk>15.25</Bulk>
+			<Mass>10.50</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>172</Steel>
+			<ComponentIndustrial>13</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>1.27</recoilAmount>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>75</range>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>CE_MachineGun</li>
+			<li>Bipod_LMG</li>
+			<li>CE_AI_Suppressive</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MG34_RWP</defName>
+		<statBases>
+			<WorkToMake>80000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.59</SwayFactor>
+			<Bulk>15.20</Bulk>
+			<Mass>10.50</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>177</Steel>
+			<ComponentIndustrial>12</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+			<recoilAmount>1.32</recoilAmount>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>75</range>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>CE_MachineGun</li>
+			<li>Bipod_LMG</li>
+			<li>CE_AI_Suppressive</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MG42_RWP</defName>
+		<statBases>
+			<WorkToMake>82000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.66</SwayFactor>
+			<Bulk>15.20</Bulk>
+			<Mass>11.57</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>175</Steel>
+			<ComponentIndustrial>13</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+			<recoilAmount>1.24</recoilAmount>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>75</range>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>CE_MachineGun</li>
+			<li>Bipod_LMG</li>
+			<li>CE_AI_Suppressive</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PK_RWP</defName>
+		<statBases>
+			<WorkToMake>83000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.45</SwayFactor>
+			<Bulk>14.73</Bulk>
+			<Mass>9.00</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>8</WoodLog>
+			<Steel>179</Steel>
+			<ComponentIndustrial>12</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<recoilAmount>1.32</recoilAmount>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>75</range>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>CE_MachineGun</li>
+			<li>Bipod_LMG</li>
+			<li>CE_AI_Suppressive</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PKM_RWP</defName>
+		<statBases>
+			<WorkToMake>84500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.34</SwayFactor>
+			<Bulk>14.60</Bulk>
+			<Mass>7.50</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>182</Steel>
+			<ComponentIndustrial>12</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<recoilAmount>1.45</recoilAmount>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>75</range>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>CE_MachineGun</li>
+			<li>Bipod_LMG</li>
+			<li>CE_AI_Suppressive</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PKP_Pecheneg_RWP</defName>
+		<statBases>
+			<WorkToMake>86800</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.42</SwayFactor>
+			<Bulk>14.55</Bulk>
+			<Mass>8.70</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>187</Steel>
+			<ComponentIndustrial>12</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<recoilAmount>1.34</recoilAmount>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>75</range>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>CE_MachineGun</li>
+			<li>Bipod_LMG</li>
+			<li>CE_AI_Suppressive</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_RPD_RWP</defName>
+		<statBases>
+			<WorkToMake>71500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.24</SwayFactor>
+			<Bulk>13.37</Bulk>
+			<Mass>7.40</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>160</Steel>
+			<ComponentIndustrial>12</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<recoilAmount>1.22</recoilAmount>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>62</range>
+			<soundCast>Shot762x39</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>CE_MachineGun</li>
+			<li>Bipod_SAW</li>
+			<li>CE_AI_Suppressive</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_RPK_RWP</defName>
+		<statBases>
+			<WorkToMake>70000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.06</SwayFactor>
+			<Bulk>12.40</Bulk>
+			<Mass>4.80</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>162</Steel>
+			<ComponentIndustrial>11</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<recoilAmount>1.54</recoilAmount>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>62</range>
+			<soundCast>Shot762x39</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>75</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>CE_MachineGun</li>
+			<li>Bipod_SAW</li>
+			<li>CE_AI_Suppressive</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_RPK-74_RWP</defName>
+		<statBases>
+			<WorkToMake>69000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.07</SwayFactor>
+			<Bulk>11.60</Bulk>
+			<Mass>4.70</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>160</Steel>
+			<ComponentIndustrial>10</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
+			<recoilAmount>1.17</recoilAmount>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>75</range>
+			<soundCast>Shot545x39</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>45</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>CE_MachineGun</li>
+			<li>Bipod_SAW</li>
+			<li>CE_AI_Suppressive</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_RPKS_RWP</defName>
+		<statBases>
+			<WorkToMake>68000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.09</SwayFactor>
+			<Bulk>9.20</Bulk>
+			<Mass>5.10</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>165</Steel>
+			<ComponentIndustrial>10</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<recoilAmount>1.50</recoilAmount>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>62</range>
+			<soundCast>Shot762x39</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>CE_MachineGun</li>
+			<li>Bipod_SAW</li>
+			<li>CE_AI_Suppressive</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_RPKS-74_RWP</defName>
+		<statBases>
+			<WorkToMake>69800</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.08</SwayFactor>
+			<Bulk>9.45</Bulk>
+			<Mass>4.85</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>163</Steel>
+			<ComponentIndustrial>10</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
+			<recoilAmount>1.15</recoilAmount>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>75</range>
+			<soundCast>Shot545x39</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>45</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>CE_MachineGun</li>
+			<li>Bipod_SAW</li>
+			<li>CE_AI_Suppressive</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Zastava_M53_RWP</defName>
+		<statBases>
+			<WorkToMake>81500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.66</SwayFactor>
+			<Bulk>15.20</Bulk>
+			<Mass>11.50</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>8</WoodLog>
+			<Steel>175</Steel>
+			<ComponentIndustrial>13</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+			<recoilAmount>1.24</recoilAmount>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>75</range>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>CE_MachineGun</li>
+			<li>Bipod_LMG</li>
+			<li>CE_AI_Suppressive</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Zastava_M72_RWP</defName>
+		<statBases>
+			<WorkToMake>45400</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.09</SwayFactor>
+			<Bulk>11.25</Bulk>
+			<Mass>5.37</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>135</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<recoilAmount>1.46</recoilAmount>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>59</range>
+			<soundCast>Shot762x39</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>CE_MachineGun</li>
+			<li>Bipod_SAW</li>
+			<li>CE_AI_Suppressive</li>
+		</weaponTags>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rambo Weapons Pack/Patches/Rambo Weapons Pack/RamboWeaponsPack_pistols.xml b/ModPatches/Rambo Weapons Pack/Patches/Rambo Weapons Pack/RamboWeaponsPack_pistols.xml
new file mode 100644
index 0000000000..b521d7568a
--- /dev/null
+++ b/ModPatches/Rambo Weapons Pack/Patches/Rambo Weapons Pack/RamboWeaponsPack_pistols.xml	
@@ -0,0 +1,1771 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Autopistol</defName>
+		<statBases>
+			<WorkToMake>15000</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.07</SwayFactor>
+			<Bulk>2.10</Bulk>
+			<Mass>1.11</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Beretta_92f_RWP</defName>
+		<statBases>
+			<WorkToMake>15800</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.04</SwayFactor>
+			<Bulk>2.17</Bulk>
+			<Mass>0.95</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>28</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Beretta_92fs_Inox_RWP</defName>
+		<statBases>
+			<WorkToMake>16200</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.04</SwayFactor>
+			<Bulk>2.17</Bulk>
+			<Mass>0.95</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>29</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Browning_Hi-Power_P35_RWP</defName>
+		<statBases>
+			<WorkToMake>15000</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.99</SwayFactor>
+			<Bulk>1.97</Bulk>
+			<Mass>1.00</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>27</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>13</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Colt_Anaconda_RWP</defName>
+		<statBases>
+			<WorkToMake>28000</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.48</SwayFactor>
+			<Bulk>2.95</Bulk>
+			<Mass>1.50</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>44</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_44Magnum_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Revolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_44Magnum</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>Revolver</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Colt_Python_RWP</defName>
+		<statBases>
+			<WorkToMake>24200</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.38</SwayFactor>
+			<Bulk>2.92</Bulk>
+			<Mass>1.22</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>38</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_357Magnum_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Revolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_357Magnum_Revolver</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>Revolver</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_CZ_75B_RWP</defName>
+		<statBases>
+			<WorkToMake>15400</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.02</SwayFactor>
+			<Bulk>2.06</Bulk>
+			<Mass>1.00</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>29</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>16</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_CZ_75B_Full_Auto_RWP</defName>
+		<statBases>
+			<WorkToMake>15400</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.18</SwayFactor>
+			<Bulk>2.40</Bulk>
+			<Mass>1.15</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>34</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<recoilAmount>2.19</recoilAmount>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Desert_Eagle_44_RWP</defName>
+		<statBases>
+			<WorkToMake>30500</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.58</SwayFactor>
+			<Bulk>2.73</Bulk>
+			<Mass>2.00</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>46</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_44Magnum_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>ShotHeavyPistol</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_44Magnum</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Desert_Eagle_50AE_RWP</defName>
+		<statBases>
+			<WorkToMake>34200</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.58</SwayFactor>
+			<Bulk>2.73</Bulk>
+			<Mass>2.00</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>52</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_50AE_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>ShotHeavyPistol</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_50AE</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Desert_Eagle_357_RWP</defName>
+		<statBases>
+			<WorkToMake>25000</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.58</SwayFactor>
+			<Bulk>2.73</Bulk>
+			<Mass>2.00</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_357Magnum_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>ShotHeavyPistol</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>9</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_357Magnum_Revolver</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Fort-12_RWP</defName>
+		<statBases>
+			<WorkToMake>15500</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>0.88</SwayFactor>
+			<Bulk>1.80</Bulk>
+			<Mass>0.83</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>28</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<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>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_FP-45_Liberator_RWP</defName>
+		<statBases>
+			<WorkToMake>4000</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>0.62</SwayFactor>
+			<Bulk>1.41</Bulk>
+			<Mass>0.45</Mass>
+			<RangedWeapon_Cooldown>0.93</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>18</Steel>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>6</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>5</AmmoGenPerMagOverride>
+			<reloadTime>7.5</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Glock_17_RWP</defName>
+		<statBases>
+			<WorkToMake>15500</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.92</SwayFactor>
+			<Bulk>2.04</Bulk>
+			<Mass>0.71</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>6</Chemfuel>
+			<Steel>23</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>17</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Glock_17L_RWP</defName>
+		<statBases>
+			<WorkToMake>16700</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.06</SwayFactor>
+			<Bulk>2.43</Bulk>
+			<Mass>0.75</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>6</Chemfuel>
+			<Steel>30</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>17</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Glock_18_RWP</defName>
+		<statBases>
+			<WorkToMake>23200</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.98</SwayFactor>
+			<Bulk>2.04</Bulk>
+			<Mass>0.90</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>6</Chemfuel>
+			<Steel>31</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<recoilAmount>2.52</recoilAmount>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>33</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Glock_19_RWP</defName>
+		<statBases>
+			<WorkToMake>15000</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>0.85</SwayFactor>
+			<Bulk>1.87</Bulk>
+			<Mass>0.67</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>6</Chemfuel>
+			<Steel>21</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Glock_26_RWP</defName>
+		<statBases>
+			<WorkToMake>14800</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>0.76</SwayFactor>
+			<Bulk>1.65</Bulk>
+			<Mass>0.62</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>6</Chemfuel>
+			<Steel>20</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Jericho_941R_RWP</defName>
+		<statBases>
+			<WorkToMake>16200</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.05</SwayFactor>
+			<Bulk>2.07</Bulk>
+			<Mass>1.09</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>27</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>16</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Luger_P08_RWP</defName>
+		<statBases>
+			<WorkToMake>13500</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>1.03</SwayFactor>
+			<Bulk>2.22</Bulk>
+			<Mass>0.87</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>27</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Mauser_C96_RWP</defName>
+		<statBases>
+			<WorkToMake>12500</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.46</SwayFactor>
+			<Bulk>3.12</Bulk>
+			<Mass>1.25</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>33</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_763x25mmMauser_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>6</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_763x25mmMauser</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MCM_RWP</defName>
+		<statBases>
+			<WorkToMake>19000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.12</SwayFactor>
+			<Bulk>2.45</Bulk>
+			<Mass>0.91</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>38</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_22LR_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>5</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_22LR</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Medusa_M-47_RWP</defName>
+		<statBases>
+			<WorkToMake>26700</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>0.97</SwayFactor>
+			<Bulk>1.82</Bulk>
+			<Mass>1.08</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>35</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_357Magnum_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Revolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_Medusa_M-47</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>Revolver</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MG2R_RWP</defName>
+		<statBases>
+			<WorkToMake>22200</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.39</SwayFactor>
+			<Bulk>3.00</Bulk>
+			<Mass>1.16</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>35</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_22LR_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>5</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.75</reloadTime>
+			<ammoSet>AmmoSet_22LR</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MP-443_Grach_RWP</defName>
+		<statBases>
+			<WorkToMake>16500</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.98</SwayFactor>
+			<Bulk>1.98</Bulk>
+			<Mass>0.95</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>31</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>18</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Nagant_M1895_RWP</defName>
+		<statBases>
+			<WorkToMake>11800</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.06</SwayFactor>
+			<Bulk>2.35</Bulk>
+			<Mass>0.82</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>24</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x38mmR_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>ShotHeavyPistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>5.95</reloadTime>
+			<ammoSet>AmmoSet_762x38mmR</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>Revolver</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_P38_RWP</defName>
+		<statBases>
+			<WorkToMake>12500</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.99</SwayFactor>
+			<Bulk>2.16</Bulk>
+			<Mass>0.80</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>26</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_P38K_RWP</defName>
+		<statBases>
+			<WorkToMake>12000</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.19</ShotSpread>
+			<SwayFactor>0.79</SwayFactor>
+			<Bulk>1.61</Bulk>
+			<Mass>0.75</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Pardini_SP_RWP</defName>
+		<statBases>
+			<WorkToMake>21000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.35</SwayFactor>
+			<Bulk>2.95</Bulk>
+			<Mass>1.10</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>35</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_22LR_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>5</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_22LR</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PB_RWP</defName>
+		<statBases>
+			<WorkToMake>14800</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>1.35</SwayFactor>
+			<Bulk>3.10</Bulk>
+			<Mass>0.95</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_9x18mmMakarov_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>ShotSuppressedPistol</soundCast>
+			<muzzleFlashScale>3</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PM_RWP</defName>
+		<statBases>
+			<WorkToMake>13500</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>0.78</SwayFactor>
+			<Bulk>1.62</Bulk>
+			<Mass>0.73</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<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>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PMM_RWP</defName>
+		<statBases>
+			<WorkToMake>14000</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>0.82</SwayFactor>
+			<Bulk>1.69</Bulk>
+			<Mass>0.76</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>27</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<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>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Raging_Judge_RWP</defName>
+		<statBases>
+			<WorkToMake>36300</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.84</SwayFactor>
+			<Bulk>3.45</Bulk>
+			<Mass>2.07</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>54</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_454Casull_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Revolver</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_454Casull</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>Revolver</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Remington_Model_95_RWP</defName>
+		<statBases>
+			<WorkToMake>5500</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.20</ShotSpread>
+			<SwayFactor>0.52</SwayFactor>
+			<Bulk>1.24</Bulk>
+			<Mass>0.31</Mass>
+			<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>17</Steel>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_41Rimfire_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>6</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>5</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>2</magazineSize>
+			<reloadTime>1.6</reloadTime>
+			<ammoSet>AmmoSet_41Rimfire</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SP89_RWP</defName>
+		<statBases>
+			<WorkToMake>14800</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.53</SwayFactor>
+			<Bulk>3.30</Bulk>
+			<Mass>2.00</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>6</Chemfuel>
+			<Steel>37</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SW_Model_500_RWP</defName>
+		<statBases>
+			<WorkToMake>41000</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.94</SwayFactor>
+			<Bulk>3.81</Bulk>
+			<Mass>2.02</Mass>
+			<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>58</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_500SWMagnum_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Revolver</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_500SWMagnum</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Tec-9_RWP</defName>
+		<statBases>
+			<WorkToMake>16500</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.52</SwayFactor>
+			<Bulk>3.17</Bulk>
+			<Mass>1.40</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>6</Chemfuel>
+			<Steel>32</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_TT-33_RWP</defName>
+		<statBases>
+			<WorkToMake>11000</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.93</SwayFactor>
+			<Bulk>1.94</Bulk>
+			<Mass>0.84</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>6</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_USP9_RWP</defName>
+		<statBases>
+			<WorkToMake>16300</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.90</SwayFactor>
+			<Bulk>1.94</Bulk>
+			<Mass>0.75</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>6</Chemfuel>
+			<Steel>32</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_USP45_RWP</defName>
+		<statBases>
+			<WorkToMake>16700</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.93</SwayFactor>
+			<Bulk>2.01</Bulk>
+			<Mass>0.79</Mass>
+			<RangedWeapon_Cooldown>0.40</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>6</Chemfuel>
+			<Steel>35</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_UZI_Pistol_RWP</defName>
+		<statBases>
+			<WorkToMake>15500</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.37</SwayFactor>
+			<Bulk>2.40</Bulk>
+			<Mass>1.70</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>33</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PP_RWP</defName>
+		<statBases>
+			<WorkToMake>12800</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>0.79</SwayFactor>
+			<Bulk>1.70</Bulk>
+			<Mass>0.67</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>26</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_380ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_380ACP</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PPK_RWP</defName>
+		<statBases>
+			<WorkToMake>12300</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.19</ShotSpread>
+			<SwayFactor>0.71</SwayFactor>
+			<Bulk>1.55</Bulk>
+			<Mass>0.59</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_380ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_380ACP</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Welrod_Mk1_RWP</defName>
+		<statBases>
+			<WorkToMake>8000</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>1.70</SwayFactor>
+			<Bulk>2.33</Bulk>
+			<Mass>1.50</Mass>
+			<RangedWeapon_Cooldown>1.16</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>29</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>8</range>
+			<soundCast>ShotSuppressedPistol</soundCast>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Welrod_Mk2_RWP</defName>
+		<statBases>
+			<WorkToMake>7600</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>1.40</SwayFactor>
+			<Bulk>3.10</Bulk>
+			<Mass>1.09</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>28</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_32ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>8</range>
+			<soundCast>ShotSuppressedPistol</soundCast>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_32ACP</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_Pistol</li>
+		</weaponTags>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rambo Weapons Pack/Patches/Rambo Weapons Pack/RamboWeaponsPack_rifles.xml b/ModPatches/Rambo Weapons Pack/Patches/Rambo Weapons Pack/RamboWeaponsPack_rifles.xml
new file mode 100644
index 0000000000..2d62b6d4ed
--- /dev/null
+++ b/ModPatches/Rambo Weapons Pack/Patches/Rambo Weapons Pack/RamboWeaponsPack_rifles.xml	
@@ -0,0 +1,755 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_BoltActionRifle</defName>
+		<statBases>
+			<WorkToMake>25000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.68</SwayFactor>
+			<Bulk>12.60</Bulk>
+			<Mass>4.19</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_303British</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Arisaka_Type_38_RWP</defName>
+		<statBases>
+			<WorkToMake>23000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.69</SwayFactor>
+			<Bulk>12.75</Bulk>
+			<Mass>4.19</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>46</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_65x50mmSRArisaka_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>51</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_65x50mmSRArisaka</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Arisaka_Type_99_Long_RWP</defName>
+		<statBases>
+			<WorkToMake>23500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.64</SwayFactor>
+			<Bulk>12.58</Bulk>
+			<Mass>3.80</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>49</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_77x58mmArisaka_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_77x58mmArisaka</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Cx4_Storm_RWP</defName>
+		<statBases>
+			<WorkToMake>20000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.01</SwayFactor>
+			<Bulk>7.55</Bulk>
+			<Mass>2.58</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>45</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>20</range>
+			<soundCast>ShotLightSemiAutoRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>8</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_De_Lisle_Commando_Carbine_RWP</defName>
+		<statBases>
+			<WorkToMake>17500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>8.94</Bulk>
+			<Mass>3.74</Mass>
+			<RangedWeapon_Cooldown>1.16</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>20</range>
+			<soundCast>ShotSuppressedPistol</soundCast>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_G43_RWP</defName>
+		<statBases>
+			<WorkToMake>31000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.57</SwayFactor>
+			<Bulk>11.30</Bulk>
+			<Mass>4.40</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>59</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>ShotSemiAutoRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Kar_98k_RWP</defName>
+		<statBases>
+			<WorkToMake>24000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.48</SwayFactor>
+			<Bulk>11.10</Bulk>
+			<Mass>3.70</Mass>
+			<RangedWeapon_Cooldown>1.18</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>48</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_M1_Carbine_RWP</defName>
+		<statBases>
+			<WorkToMake>21500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.15</SwayFactor>
+			<Bulk>9.04</Bulk>
+			<Mass>2.49</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>43</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_30Carbine_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>37</range>
+			<soundCast>ShotLightSemiAutoRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>8</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_30Carbine</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_M1_Garand_RWP</defName>
+		<statBases>
+			<WorkToMake>28000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.34</SwayFactor>
+			<Bulk>9.05</Bulk>
+			<Mass>4.31</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>53</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>52</range>
+			<soundCast>ShotSemiAutoRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_3006Springfield</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_M1A1_Carbine_RWP</defName>
+		<statBases>
+			<WorkToMake>22500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.19</SwayFactor>
+			<Bulk>6.48</Bulk>
+			<Mass>2.81</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_30Carbine_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>37</range>
+			<soundCast>ShotLightSemiAutoRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>8</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_30Carbine</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_M2_Carbine_RWP</defName>
+		<statBases>
+			<WorkToMake>28000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.15</SwayFactor>
+			<Bulk>9.05</Bulk>
+			<Mass>2.49</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>45</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_30Carbine_FMJ</defaultProjectile>
+			<recoilAmount>1.85</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>37</range>
+			<soundCast>ShotLightSemiAutoRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>8</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_30Carbine</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MAS-36_RWP</defName>
+		<statBases>
+			<WorkToMake>24800</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.39</SwayFactor>
+			<Bulk>10.20</Bulk>
+			<Mass>3.72</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>49</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_75x54mmFrench_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_75x54mmFrench</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Mle_1886_RWP</defName>
+		<statBases>
+			<WorkToMake>22700</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.72</SwayFactor>
+			<Bulk>13.00</Bulk>
+			<Mass>4.18</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>45</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_8x50mmRLebel_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>8.5</reloadTime>
+			<ammoSet>AmmoSet_8x50mmRLebel</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MN91-30_RWP</defName>
+		<statBases>
+			<WorkToMake>21000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.63</SwayFactor>
+			<Bulk>12.32</Bulk>
+			<Mass>4.00</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>52</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SKS-45_RWP</defName>
+		<statBases>
+			<WorkToMake>24000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.41</SwayFactor>
+			<Bulk>10.20</Bulk>
+			<Mass>3.85</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>45</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<soundCast>Shot762x39</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Springfield_M1903_RWP</defName>
+		<statBases>
+			<WorkToMake>24500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.49</SwayFactor>
+			<Bulk>10.97</Bulk>
+			<Mass>3.94</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>49</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_3006Springfield</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Springfield_M1903A1_RWP</defName>
+		<statBases>
+			<WorkToMake>25500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.49</SwayFactor>
+			<Bulk>10.97</Bulk>
+			<Mass>3.94</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>51</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_3006Springfield</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Springfield_M1903A3_RWP</defName>
+		<statBases>
+			<WorkToMake>24000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.49</SwayFactor>
+			<Bulk>10.97</Bulk>
+			<Mass>3.94</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>47</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_3006Springfield</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SVT-40_RWP</defName>
+		<statBases>
+			<WorkToMake>29000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.61</SwayFactor>
+			<Bulk>12.26</Bulk>
+			<Mass>3.85</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>56</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>ShotSemiAutoRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Winchester_M1873_RWP</defName>
+		<statBases>
+			<WorkToMake>24500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.68</SwayFactor>
+			<Bulk>12.52</Bulk>
+			<Mass>4.30</Mass>
+			<RangedWeapon_Cooldown>0.76</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_44-40Winchester_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>12.75</reloadTime>
+			<ammoSet>AmmoSet_44-40Winchester</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rambo Weapons Pack/Patches/Rambo Weapons Pack/RamboWeaponsPack_shotguns.xml b/ModPatches/Rambo Weapons Pack/Patches/Rambo Weapons Pack/RamboWeaponsPack_shotguns.xml
new file mode 100644
index 0000000000..c1d49ab304
--- /dev/null
+++ b/ModPatches/Rambo Weapons Pack/Patches/Rambo Weapons Pack/RamboWeaponsPack_shotguns.xml	
@@ -0,0 +1,885 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_ChainShotgun</defName>
+		<statBases>
+			<WorkToMake>45000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.44</SwayFactor>
+			<Bulk>9.66</Bulk>
+			<Mass>4.76</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>60</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>2.36</recoilAmount>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>ShotAutoShotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PumpShotgun</defName>
+		<statBases>
+			<WorkToMake>30000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.39</SwayFactor>
+			<Bulk>10.28</Bulk>
+			<Mass>3.60</Mass>
+			<RangedWeapon_Cooldown>0.99</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>55</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.25</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AA-12_RWP</defName>
+		<statBases>
+			<WorkToMake>45500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.44</SwayFactor>
+			<Bulk>9.66</Bulk>
+			<Mass>4.76</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>63</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>2.36</recoilAmount>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>ShotAutoShotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Browning_Auto-5_RWP</defName>
+		<statBases>
+			<WorkToMake>33000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.68</SwayFactor>
+			<Bulk>12.70</Bulk>
+			<Mass>4.10</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>60</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>ShotAutoShotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.25</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Fort-500_RWP</defName>
+		<statBases>
+			<WorkToMake>29500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.42</SwayFactor>
+			<Bulk>10.42</Bulk>
+			<Mass>3.80</Mass>
+			<RangedWeapon_Cooldown>0.99</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>54</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>5.95</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Fort-500FS_RWP</defName>
+		<statBases>
+			<WorkToMake>30500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.41</SwayFactor>
+			<Bulk>7.55</Bulk>
+			<Mass>3.90</Mass>
+			<RangedWeapon_Cooldown>0.99</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>3</WoodLog>
+			<Steel>54</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>5.95</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Fort-500P_RWP</defName>
+		<statBases>
+			<WorkToMake>28000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.06</SwayFactor>
+			<Bulk>7.55</Bulk>
+			<Mass>3.00</Mass>
+			<RangedWeapon_Cooldown>1.00</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>3</WoodLog>
+			<Steel>54</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>5.95</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Ithaca_37_Riot_RWP</defName>
+		<statBases>
+			<WorkToMake>29800</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.46</SwayFactor>
+			<Bulk>10.06</Bulk>
+			<Mass>4.50</Mass>
+			<RangedWeapon_Cooldown>0.98</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>55</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.25</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Ithaca_37_Stakeout_RWP</defName>
+		<statBases>
+			<WorkToMake>26000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>0.81</SwayFactor>
+			<Bulk>5.08</Bulk>
+			<Mass>3.00</Mass>
+			<RangedWeapon_Cooldown>0.99</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>6</Chemfuel>
+			<Steel>51</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.25</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Ithaca_37_Trench_RWP</defName>
+		<statBases>
+			<WorkToMake>30800</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.46</SwayFactor>
+			<Bulk>10.06</Bulk>
+			<Mass>4.50</Mass>
+			<RangedWeapon_Cooldown>0.98</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>56</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.25</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_KS-23_RWP</defName>
+		<statBases>
+			<WorkToMake>36000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.43</SwayFactor>
+			<Bulk>10.40</Bulk>
+			<Mass>3.85</Mass>
+			<RangedWeapon_Cooldown>1.01</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>3</WoodLog>
+			<Chemfuel>2</Chemfuel>
+			<Steel>83</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_23x75mmR_Slug</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>16</range>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>4</magazineSize>
+			<reloadTime>3.4</reloadTime>
+			<ammoSet>AmmoSet_23x75mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_KS-23M_RWP</defName>
+		<statBases>
+			<WorkToMake>36500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<Bulk>6.50</Bulk>
+			<Mass>3.50</Mass>
+			<RangedWeapon_Cooldown>1.01</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>6</Chemfuel>
+			<Steel>83</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_23x75mmR_Slug</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>16</range>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>4</magazineSize>
+			<reloadTime>3.4</reloadTime>
+			<ammoSet>AmmoSet_23x75mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Saiga-12K_RWP</defName>
+		<statBases>
+			<WorkToMake>38000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<Bulk>6.50</Bulk>
+			<Mass>3.50</Mass>
+			<RangedWeapon_Cooldown>1.01</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>67</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>ShotAutoShotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.25</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SPAS-12_RWP</defName>
+		<statBases>
+			<WorkToMake>39000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.48</SwayFactor>
+			<Bulk>8.05</Bulk>
+			<Mass>4.36</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>6</Chemfuel>
+			<Steel>69</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>ShotAutoShotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>9</magazineSize>
+			<reloadTime>7.65</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_TOZ-34_RWP</defName>
+		<statBases>
+			<WorkToMake>20000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.49</SwayFactor>
+			<Bulk>11.60</Bulk>
+			<Mass>3.30</Mass>
+			<RangedWeapon_Cooldown>0.41</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>40</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<recoilAmount>0.75</recoilAmount>
+			<burstShotCount>2</burstShotCount>
+			<ticksBetweenBurstShots>0</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>ShotAutoShotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>2</magazineSize>
+			<reloadTime>2.2</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_TOZ-34_Sawed-off_RWP</defName>
+		<statBases>
+			<WorkToMake>15000</WorkToMake>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.19</ShotSpread>
+			<SwayFactor>0.76</SwayFactor>
+			<Bulk>5.80</Bulk>
+			<Mass>1.80</Mass>
+			<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>3</WoodLog>
+			<Steel>27</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<recoilAmount>0.75</recoilAmount>
+			<burstShotCount>2</burstShotCount>
+			<ticksBetweenBurstShots>0</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>ShotAutoShotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>2</magazineSize>
+			<reloadTime>1.7</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_TOZ-66_RWP</defName>
+		<statBases>
+			<WorkToMake>20000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.45</SwayFactor>
+			<Bulk>11.30</Bulk>
+			<Mass>3.20</Mass>
+			<RangedWeapon_Cooldown>0.41</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>40</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>0.75</recoilAmount>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<burstShotCount>2</burstShotCount>
+			<ticksBetweenBurstShots>0</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>ShotAutoShotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>2</magazineSize>
+			<reloadTime>2.2</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_TOZ-66_Sawed-off_RWP</defName>
+		<statBases>
+			<WorkToMake>15000</WorkToMake>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.20</ShotSpread>
+			<SwayFactor>0.68</SwayFactor>
+			<Bulk>5.09</Bulk>
+			<Mass>1.70</Mass>
+			<RangedWeapon_Cooldown>0.43</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>3</WoodLog>
+			<Steel>27</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>0.75</recoilAmount>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<burstShotCount>2</burstShotCount>
+			<ticksBetweenBurstShots>0</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>ShotAutoShotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>2</magazineSize>
+			<reloadTime>1.7</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Winchester_M1897_Riot_RWP</defName>
+		<statBases>
+			<WorkToMake>27800</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.36</SwayFactor>
+			<Bulk>10.00</Bulk>
+			<Mass>3.60</Mass>
+			<RangedWeapon_Cooldown>0.99</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>51</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>5.1</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Winchester_M1897_Trench_RWP</defName>
+		<statBases>
+			<WorkToMake>28500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.35</SwayFactor>
+			<Bulk>10.00</Bulk>
+			<Mass>3.50</Mass>
+			<RangedWeapon_Cooldown>0.99</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>52</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>5.1</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Winchester_M1912_Riot_RWP</defName>
+		<statBases>
+			<WorkToMake>28300</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.30</SwayFactor>
+			<Bulk>10.00</Bulk>
+			<Mass>2.95</Mass>
+			<RangedWeapon_Cooldown>1.00</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>52</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>5.1</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Winchester_M1912_Trench_RWP</defName>
+		<statBases>
+			<WorkToMake>29500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.32</SwayFactor>
+			<Bulk>10.28</Bulk>
+			<Mass>2.95</Mass>
+			<RangedWeapon_Cooldown>1.00</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>52</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>5.1</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rambo Weapons Pack/Patches/Rambo Weapons Pack/RamboWeaponsPack_sniperrifles.xml b/ModPatches/Rambo Weapons Pack/Patches/Rambo Weapons Pack/RamboWeaponsPack_sniperrifles.xml
new file mode 100644
index 0000000000..9cdd0f4241
--- /dev/null
+++ b/ModPatches/Rambo Weapons Pack/Patches/Rambo Weapons Pack/RamboWeaponsPack_sniperrifles.xml	
@@ -0,0 +1,672 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SniperRifle</defName>
+		<statBases>
+			<WorkToMake>89000</WorkToMake>
+			<SightsEfficiency>2.82</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>2.05</SwayFactor>
+			<Bulk>12.87</Bulk>
+			<Mass>15.07</Mass>
+			<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>162</Steel>
+			<ComponentIndustrial>11</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
+			<warmupTime>2.1</warmupTime>
+			<range>75</range>
+			<soundCast>Shot_SniperRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_338Lapua</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SniperRifle</li>
+			<li>Bipod_DMR</li>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AWSM_RWP</defName>
+		<statBases>
+			<WorkToMake>102500</WorkToMake>
+			<SightsEfficiency>2.1</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.41</SwayFactor>
+			<Bulk>11.16</Bulk>
+			<Mass>6.90</Mass>
+			<RangedWeapon_Cooldown>1.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>190</Steel>
+			<ComponentIndustrial>12</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
+			<warmupTime>2.1</warmupTime>
+			<range>75</range>
+			<soundCast>Shot_SniperRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_338Lapua</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SniperRifle</li>
+			<li>Bipod_DMR</li>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_M21_RWP</defName>
+		<statBases>
+			<WorkToMake>69500</WorkToMake>
+			<SightsEfficiency>2.04</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.74</SwayFactor>
+			<Bulk>11.18</Bulk>
+			<Mass>5.27</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>147</Steel>
+			<ComponentIndustrial>11</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>2</warmupTime>
+			<range>75</range>
+			<soundCast>ShotSemiAutoRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SniperRifle</li>
+			<li>Bipod_DMR</li>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_M40_RWP</defName>
+		<statBases>
+			<WorkToMake>78000</WorkToMake>
+			<SightsEfficiency>2.04</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.63</SwayFactor>
+			<Bulk>11.17</Bulk>
+			<Mass>4.20</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>155</Steel>
+			<ComponentIndustrial>10</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>2</warmupTime>
+			<range>75</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.25</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SniperRifle</li>
+			<li>Bipod_DMR</li>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Orsis_T-5000_338_RWP</defName>
+		<statBases>
+			<WorkToMake>99500</WorkToMake>
+			<SightsEfficiency>2.7</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.43</SwayFactor>
+			<Bulk>11.20</Bulk>
+			<Mass>6.50</Mass>
+			<RangedWeapon_Cooldown>1.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>3</Chemfuel>
+			<Steel>192</Steel>
+			<ComponentIndustrial>12</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
+			<warmupTime>3.1</warmupTime>
+			<range>75</range>
+			<soundCast>Shot_SniperRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_338Lapua</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SniperRifle</li>
+			<li>Bipod_DMR</li>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PSG1_RWP</defName>
+		<statBases>
+			<WorkToMake>100500</WorkToMake>
+			<SightsEfficiency>1.86</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>2.01</SwayFactor>
+			<Bulk>12.30</Bulk>
+			<Mass>7.20</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>189</Steel>
+			<ComponentIndustrial>14</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.7</warmupTime>
+			<range>75</range>
+			<soundCast>ShotSemiAutoRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SniperRifle</li>
+			<li>Bipod_DMR</li>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Steyr_Scout_RWP</defName>
+		<statBases>
+			<WorkToMake>71000</WorkToMake>
+			<SightsEfficiency>1.64</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>0.93</SwayFactor>
+			<Bulk>10.80</Bulk>
+			<Mass>3.20</Mass>
+			<RangedWeapon_Cooldown>1.38</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>140</Steel>
+			<ComponentIndustrial>9</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.33</warmupTime>
+			<range>48</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SniperRifle</li>
+			<li>Bipod_DMR</li>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SV-98_RWP</defName>
+		<statBases>
+			<WorkToMake>81500</WorkToMake>
+			<SightsEfficiency>2.10</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.32</SwayFactor>
+			<Bulk>13.00</Bulk>
+			<Mass>5.80</Mass>
+			<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>167</Steel>
+			<ComponentIndustrial>10</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>2.1</warmupTime>
+			<range>75</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SniperRifle</li>
+			<li>Bipod_DMR</li>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SVD_RWP</defName>
+		<statBases>
+			<WorkToMake>75000</WorkToMake>
+			<SightsEfficiency>1.74</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.70</SwayFactor>
+			<Bulk>12.25</Bulk>
+			<Mass>4.30</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>158</Steel>
+			<ComponentIndustrial>11</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>75</range>
+			<soundCast>ShotSemiAutoRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SniperRifle</li>
+			<li>Bipod_DMR</li>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SVU_RWP</defName>
+		<statBases>
+			<WorkToMake>78500</WorkToMake>
+			<SightsEfficiency>1.74</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.38</SwayFactor>
+			<Bulk>9.00</Bulk>
+			<Mass>4.40</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>155</Steel>
+			<ComponentIndustrial>12</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>75</range>
+			<soundCast>ShotSuppressedSniper</soundCast>
+			<muzzleFlashScale>3</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SniperRifle</li>
+			<li>Bipod_DMR</li>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_TRG-21_RWP</defName>
+		<statBases>
+			<WorkToMake>81000</WorkToMake>
+			<SightsEfficiency>2.10</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.24</SwayFactor>
+			<Bulk>13.00</Bulk>
+			<Mass>4.70</Mass>
+			<RangedWeapon_Cooldown>1.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>165</Steel>
+			<ComponentIndustrial>10</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>2.1</warmupTime>
+			<range>75</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SniperRifle</li>
+			<li>Bipod_DMR</li>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_TRG-22_RWP</defName>
+		<statBases>
+			<WorkToMake>82000</WorkToMake>
+			<SightsEfficiency>2.10</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.22</SwayFactor>
+			<Bulk>12.50</Bulk>
+			<Mass>4.90</Mass>
+			<RangedWeapon_Cooldown>1.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>170</Steel>
+			<ComponentIndustrial>10</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>2.1</warmupTime>
+			<range>75</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SniperRifle</li>
+			<li>Bipod_DMR</li>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_TRG-41_RWP</defName>
+		<statBases>
+			<WorkToMake>94000</WorkToMake>
+			<SightsEfficiency>2.10</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>13.00</Bulk>
+			<Mass>5.10</Mass>
+			<RangedWeapon_Cooldown>1.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>175</Steel>
+			<ComponentIndustrial>11</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_300WinchesterMagnum_FMJ</defaultProjectile>
+			<warmupTime>2.1</warmupTime>
+			<range>75</range>
+			<soundCast>Shot_SniperRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_300WinchesterMagnum</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SniperRifle</li>
+			<li>Bipod_DMR</li>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_TRG-42_RWP</defName>
+		<statBases>
+			<WorkToMake>97500</WorkToMake>
+			<SightsEfficiency>2.10</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.28</SwayFactor>
+			<Bulk>13.00</Bulk>
+			<Mass>5.30</Mass>
+			<RangedWeapon_Cooldown>1.38</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>185</Steel>
+			<ComponentIndustrial>12</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
+			<warmupTime>2.1</warmupTime>
+			<range>75</range>
+			<soundCast>Shot_SniperRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_338Lapua</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SniperRifle</li>
+			<li>Bipod_DMR</li>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_VSSK_Vykhlop_RWP</defName>
+		<statBases>
+			<WorkToMake>93000</WorkToMake>
+			<SightsEfficiency>1.98</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>12.20</Bulk>
+			<Mass>7.00</Mass>
+			<RangedWeapon_Cooldown>1.38</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>180</Steel>
+			<ComponentIndustrial>13</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_127x55mm_FMJ</defaultProjectile>
+			<warmupTime>1.9</warmupTime>
+			<range>62</range>
+			<soundCast>ShotSuppressedSniper</soundCast>
+			<muzzleFlashScale>3</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_127x55mm</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SniperRifle</li>
+			<li>Bipod_DMR</li>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_WA_2000_RWP</defName>
+		<statBases>
+			<WorkToMake>98000</WorkToMake>
+			<SightsEfficiency>2.10</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<Bulk>10.05</Bulk>
+			<Mass>7.51</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>190</Steel>
+			<ComponentIndustrial>12</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_300WinchesterMagnum_FMJ</defaultProjectile>
+			<warmupTime>2.1</warmupTime>
+			<range>68</range>
+			<soundCast>Shot_SniperRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_300WinchesterMagnum</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SniperRifle</li>
+			<li>Bipod_DMR</li>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rambo Weapons Pack/Patches/Rambo Weapons Pack/RamboWeaponsPack_submachineguns.xml b/ModPatches/Rambo Weapons Pack/Patches/Rambo Weapons Pack/RamboWeaponsPack_submachineguns.xml
new file mode 100644
index 0000000000..b4c6793cfc
--- /dev/null
+++ b/ModPatches/Rambo Weapons Pack/Patches/Rambo Weapons Pack/RamboWeaponsPack_submachineguns.xml	
@@ -0,0 +1,2661 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_HeavySMG</defName>
+		<statBases>
+			<WorkToMake>28000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>0.88</SwayFactor>
+			<Bulk>5.30</Bulk>
+			<Mass>3.50</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>75</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>2.00</recoilAmount>
+			<defaultProjectile>Bullet_44Magnum_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>11</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_HeavySMG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_44Magnum</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MachinePistol</defName>
+		<statBases>
+			<WorkToMake>26000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.02</SwayFactor>
+			<Bulk>4.70</Bulk>
+			<Mass>3.70</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>6</Chemfuel>
+			<Steel>42</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.27</recoilAmount>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_American-180_RWP</defName>
+		<statBases>
+			<WorkToMake>25000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.16</SwayFactor>
+			<Bulk>10.00</Bulk>
+			<Mass>2.60</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>45</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>0.84</recoilAmount>
+			<defaultProjectile>Bullet_22LR_FMJ</defaultProjectile>
+			<burstShotCount>16</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>6</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>165</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_22LR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>8</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Carl_Gustav_M45_RWP</defName>
+		<statBases>
+			<WorkToMake>22800</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.14</SwayFactor>
+			<Bulk>5.50</Bulk>
+			<Mass>3.35</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>37</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.38</recoilAmount>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>36</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_KP_M44_RWP</defName>
+		<statBases>
+			<WorkToMake>22700</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.13</SwayFactor>
+			<Bulk>6.20</Bulk>
+			<Mass>2.95</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>42</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.43</recoilAmount>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>36</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_KRISS_Vector_Gen1_RWP</defName>
+		<statBases>
+			<WorkToMake>35800</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.89</SwayFactor>
+			<Bulk>4.10</Bulk>
+			<Mass>2.72</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>42</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.43</recoilAmount>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>14</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_M3_RWP</defName>
+		<statBases>
+			<WorkToMake>21800</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.13</SwayFactor>
+			<Bulk>5.79</Bulk>
+			<Mass>3.70</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>37</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.50</recoilAmount>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_M3A1_RWP</defName>
+		<statBases>
+			<WorkToMake>21500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.12</SwayFactor>
+			<Bulk>5.79</Bulk>
+			<Mass>3.61</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>38</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.50</recoilAmount>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MAC-10_RWP</defName>
+		<statBases>
+			<WorkToMake>25000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>0.83</SwayFactor>
+			<Bulk>2.95</Bulk>
+			<Mass>2.84</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>45</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.71</recoilAmount>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MAC-11_RWP</defName>
+		<statBases>
+			<WorkToMake>24500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.69</SwayFactor>
+			<Bulk>2.48</Bulk>
+			<Mass>1.59</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>44</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.71</recoilAmount>
+			<defaultProjectile>Bullet_32ACP_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>6</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_32ACP</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MAT-49_9x19mm_RWP</defName>
+		<statBases>
+			<WorkToMake>23100</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.02</SwayFactor>
+			<Bulk>4.04</Bulk>
+			<Mass>3.60</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>39</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.71</recoilAmount>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MAT-49_762x25mm_RWP</defName>
+		<statBases>
+			<WorkToMake>23500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.07</SwayFactor>
+			<Bulk>4.51</Bulk>
+			<Mass>3.65</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.22</recoilAmount>
+			<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>35</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Micro-UZI_RWP</defName>
+		<statBases>
+			<WorkToMake>22000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>0.71</SwayFactor>
+			<Bulk>2.82</Bulk>
+			<Mass>2.20</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>38</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.54</recoilAmount>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Mini-UZI_RWP</defName>
+		<statBases>
+			<WorkToMake>25300</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.89</SwayFactor>
+			<Bulk>3.60</Bulk>
+			<Mass>2.85</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>43</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.40</recoilAmount>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MP5-10A2_RWP</defName>
+		<statBases>
+			<WorkToMake>23500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>0.95</SwayFactor>
+			<Bulk>6.80</Bulk>
+			<Mass>2.70</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>53</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.94</recoilAmount>
+			<defaultProjectile>Bullet_10mmAuto_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_10mmAuto</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MP5-40A2_RWP</defName>
+		<statBases>
+			<WorkToMake>29800</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>0.97</SwayFactor>
+			<Bulk>6.80</Bulk>
+			<Mass>2.85</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>49</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.54</recoilAmount>
+			<defaultProjectile>Bullet_40SW_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_40SW</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MP5A1_RWP</defName>
+		<statBases>
+			<WorkToMake>26600</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>0.65</SwayFactor>
+			<Bulk>4.40</Bulk>
+			<Mass>2.10</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>41</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.69</recoilAmount>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MP5A2_RWP</defName>
+		<statBases>
+			<WorkToMake>27700</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>0.93</SwayFactor>
+			<Bulk>6.80</Bulk>
+			<Mass>2.50</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>46</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.55</recoilAmount>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MP5A3_RWP</defName>
+		<statBases>
+			<WorkToMake>28200</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.01</SwayFactor>
+			<Bulk>5.50</Bulk>
+			<Mass>3.10</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>6</Chemfuel>
+			<Steel>46</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.39</recoilAmount>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MP5K_RWP</defName>
+		<statBases>
+			<WorkToMake>25800</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.53</SwayFactor>
+			<Bulk>3.25</Bulk>
+			<Mass>2.00</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>6</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.68</recoilAmount>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>15</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MP5KA1_RWP</defName>
+		<statBases>
+			<WorkToMake>25500</WorkToMake>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.53</SwayFactor>
+			<Bulk>3.25</Bulk>
+			<Mass>2.00</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>6</Chemfuel>
+			<Steel>39</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.68</recoilAmount>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>15</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MP5K-PDW_RWP</defName>
+		<statBases>
+			<WorkToMake>27500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>0.85</SwayFactor>
+			<Bulk>3.68</Bulk>
+			<Mass>2.50</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>44</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.50</recoilAmount>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>15</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MP5SD1_RWP</defName>
+		<statBases>
+			<WorkToMake>31900</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>0.82</SwayFactor>
+			<Bulk>5.50</Bulk>
+			<Mass>2.70</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>6</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.26</recoilAmount>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>ShotSuppressedPistol</soundCast>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MP5SD2_RWP</defName>
+		<statBases>
+			<WorkToMake>33000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.10</SwayFactor>
+			<Bulk>7.90</Bulk>
+			<Mass>3.10</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>53</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.17</recoilAmount>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>ShotSuppressedPistol</soundCast>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MP5SD3_RWP</defName>
+		<statBases>
+			<WorkToMake>33500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.17</SwayFactor>
+			<Bulk>6.70</Bulk>
+			<Mass>3.60</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>6</Chemfuel>
+			<Steel>53</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.09</recoilAmount>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>ShotSuppressedPistol</soundCast>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MP7_RWP</defName>
+		<statBases>
+			<WorkToMake>33800</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>0.83</SwayFactor>
+			<Bulk>4.15</Bulk>
+			<Mass>1.90</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>6</Chemfuel>
+			<Steel>54</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.11</recoilAmount>
+			<defaultProjectile>Bullet_46x30mm_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>23</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_46x30mm</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MP-18_RWP</defName>
+		<statBases>
+			<WorkToMake>20000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.24</SwayFactor>
+			<Bulk>8.23</Bulk>
+			<Mass>4.18</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>26</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.17</recoilAmount>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MP-28_RWP</defName>
+		<statBases>
+			<WorkToMake>20700</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.22</SwayFactor>
+			<Bulk>8.20</Bulk>
+			<Mass>4.00</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>28</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.19</recoilAmount>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MP-38_RWP</defName>
+		<statBases>
+			<WorkToMake>23500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.25</SwayFactor>
+			<Bulk>6.30</Bulk>
+			<Mass>4.14</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.20</recoilAmount>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MP-40_RWP</defName>
+		<statBases>
+			<WorkToMake>22500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<Bulk>6.30</Bulk>
+			<Mass>3.97</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>38</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.23</recoilAmount>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MP-41_RWP</defName>
+		<statBases>
+			<WorkToMake>23600</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.22</SwayFactor>
+			<Bulk>8.35</Bulk>
+			<Mass>3.87</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>37</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.25</recoilAmount>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MP-3008_RWP</defName>
+		<statBases>
+			<WorkToMake>18000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.08</SwayFactor>
+			<Bulk>7.60</Bulk>
+			<Mass>3.20</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>37</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.19</recoilAmount>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_P90_RWP</defName>
+		<statBases>
+			<WorkToMake>36700</WorkToMake>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>0.77</SwayFactor>
+			<Bulk>5.05</Bulk>
+			<Mass>2.60</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.20</recoilAmount>
+			<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>0.5</warmupTime>
+			<range>23</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_FN57x28mm</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PP-9_Klin_RWP</defName>
+		<statBases>
+			<WorkToMake>25800</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.69</SwayFactor>
+			<Bulk>3.05</Bulk>
+			<Mass>1.54</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>43</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.83</recoilAmount>
+			<defaultProjectile>Bullet_9x18mmMakarov_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>17</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PP-19_Bizon-1_RWP</defName>
+		<statBases>
+			<WorkToMake>27000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.87</SwayFactor>
+			<Bulk>5.25</Bulk>
+			<Mass>2.10</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>6</Chemfuel>
+			<Steel>53</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.35</recoilAmount>
+			<defaultProjectile>Bullet_9x18mmMakarov_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>17</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>64</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PP-19_Bizon-2_RWP</defName>
+		<statBases>
+			<WorkToMake>27500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>0.90</SwayFactor>
+			<Bulk>5.60</Bulk>
+			<Mass>2.10</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>6</Chemfuel>
+			<Steel>53</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.35</recoilAmount>
+			<defaultProjectile>Bullet_9x18mmMakarov_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>17</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>64</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PP-19_Bizon-2-01_RWP</defName>
+		<statBases>
+			<WorkToMake>27500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>0.90</SwayFactor>
+			<Bulk>5.60</Bulk>
+			<Mass>2.10</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>6</Chemfuel>
+			<Steel>52</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.65</recoilAmount>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>53</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PP-91_Kedr_RWP</defName>
+		<statBases>
+			<WorkToMake>25000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.70</SwayFactor>
+			<Bulk>3.05</Bulk>
+			<Mass>1.57</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>42</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.54</recoilAmount>
+			<defaultProjectile>Bullet_9x18mmMakarov_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>14</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PP-91-01_Kedr-B_RWP</defName>
+		<statBases>
+			<WorkToMake>28000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.88</SwayFactor>
+			<Bulk>4.43</Bulk>
+			<Mass>2.10</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>46</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.33</recoilAmount>
+			<defaultProjectile>Bullet_9x18mmMakarov_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>14</range>
+			<soundCast>ShotSuppressedPistol</soundCast>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PP-2000_RWP</defName>
+		<statBases>
+			<WorkToMake>26500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>0.70</SwayFactor>
+			<Bulk>3.40</Bulk>
+			<Mass>1.40</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>41</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>2.00</recoilAmount>
+			<defaultProjectile>Bullet_9x18mmMakarov_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PPD-34_RWP</defName>
+		<statBases>
+			<WorkToMake>21000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.16</SwayFactor>
+			<Bulk>7.77</Bulk>
+			<Mass>3.79</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>29</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.19</recoilAmount>
+			<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>6</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PPD-34-38_RWP</defName>
+		<statBases>
+			<WorkToMake>22500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<Bulk>8.77</Bulk>
+			<Mass>4.56</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>35</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.09</recoilAmount>
+			<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>6</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>71</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PPD-40_RWP</defName>
+		<statBases>
+			<WorkToMake>22300</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.22</SwayFactor>
+			<Bulk>8.88</Bulk>
+			<Mass>4.30</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>33</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.12</recoilAmount>
+			<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>6</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>71</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PPS-43_RWP</defName>
+		<statBases>
+			<WorkToMake>22400</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.12</SwayFactor>
+			<Bulk>6.15</Bulk>
+			<Mass>3.04</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>41</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.35</recoilAmount>
+			<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>6</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>35</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PPSh-41d_RWP</defName>
+		<statBases>
+			<WorkToMake>23500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.38</SwayFactor>
+			<Bulk>9.43</Bulk>
+			<Mass>5.32</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>42</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.00</recoilAmount>
+			<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>6</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>71</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PPSh-41s_RWP</defName>
+		<statBases>
+			<WorkToMake>22800</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.25</SwayFactor>
+			<Bulk>8.43</Bulk>
+			<Mass>4.11</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>40</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.14</recoilAmount>
+			<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>6</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>35</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Skorpion_SA_Vz61_RWP</defName>
+		<statBases>
+			<WorkToMake>21000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.65</SwayFactor>
+			<Bulk>2.70</Bulk>
+			<Mass>1.30</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>32</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.39</recoilAmount>
+			<defaultProjectile>Bullet_32ACP_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>6</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_32ACP</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Skorpion_SA_Vz82_RWP</defName>
+		<statBases>
+			<WorkToMake>21400</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.66</SwayFactor>
+			<Bulk>2.70</Bulk>
+			<Mass>1.44</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>32</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.63</recoilAmount>
+			<defaultProjectile>Bullet_9x18mmMakarov_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>6</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Sten_Mk_I_RWP</defName>
+		<statBases>
+			<WorkToMake>19900</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.17</SwayFactor>
+			<Bulk>8.45</Bulk>
+			<Mass>3.27</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>3</WoodLog>
+			<Steel>34</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.29</recoilAmount>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Sten_Mk_II_RWP</defName>
+		<statBases>
+			<WorkToMake>19400</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.18</SwayFactor>
+			<Bulk>8.95</Bulk>
+			<Mass>2.80</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>35</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.40</recoilAmount>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Sten_Mk_III_RWP</defName>
+		<statBases>
+			<WorkToMake>19000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.08</SwayFactor>
+			<Bulk>7.62</Bulk>
+			<Mass>3.18</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>35</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.31</recoilAmount>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Sten_Mk_V_RWP</defName>
+		<statBases>
+			<WorkToMake>19600</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.15</SwayFactor>
+			<Bulk>7.62</Bulk>
+			<Mass>3.86</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>3</WoodLog>
+			<Steel>34</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.19</recoilAmount>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Sterling_L2A3_RWP</defName>
+		<statBases>
+			<WorkToMake>24700</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.96</SwayFactor>
+			<Bulk>4.81</Bulk>
+			<Mass>2.70</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.29</recoilAmount>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>34</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SW_M76_RWP</defName>
+		<statBases>
+			<WorkToMake>22500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.10</SwayFactor>
+			<Bulk>5.70</Bulk>
+			<Mass>3.29</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>37</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.39</recoilAmount>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>36</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Thompson_M1_RWP</defName>
+		<statBases>
+			<WorkToMake>24300</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.29</SwayFactor>
+			<Bulk>8.13</Bulk>
+			<Mass>4.80</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>49</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.33</recoilAmount>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>14</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Thompson_M1A1_RWP</defName>
+		<statBases>
+			<WorkToMake>24500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.29</SwayFactor>
+			<Bulk>8.13</Bulk>
+			<Mass>4.80</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.33</recoilAmount>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>14</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Thompson_M1921_RWP</defName>
+		<statBases>
+			<WorkToMake>26400</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.30</SwayFactor>
+			<Bulk>9.30</Bulk>
+			<Mass>4.70</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>53</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.34</recoilAmount>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>14</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Thompson_M1928_RWP</defName>
+		<statBases>
+			<WorkToMake>26000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.34</SwayFactor>
+			<Bulk>9.51</Bulk>
+			<Mass>4.90</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>55</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.32</recoilAmount>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>14</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Thompson_M1928A1_RWP</defName>
+		<statBases>
+			<WorkToMake>25100</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.34</SwayFactor>
+			<Bulk>8.51</Bulk>
+			<Mass>4.90</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>51</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.32</recoilAmount>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>14</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Thompson_UMP9_RWP</defName>
+		<statBases>
+			<WorkToMake>29000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.94</SwayFactor>
+			<Bulk>4.50</Bulk>
+			<Mass>2.50</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>48</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.55</recoilAmount>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Thompson_UMP40_RWP</defName>
+		<statBases>
+			<WorkToMake>30500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.95</SwayFactor>
+			<Bulk>4.50</Bulk>
+			<Mass>2.55</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.79</recoilAmount>
+			<defaultProjectile>Bullet_40SW_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>17</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_40SW</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Thompson_UMP45_RWP</defName>
+		<statBases>
+			<WorkToMake>30800</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.96</SwayFactor>
+			<Bulk>4.50</Bulk>
+			<Mass>2.65</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>51</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<recoilAmount>1.79</recoilAmount>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>15</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Ratkin Apparel+/Patches/Ratkin Apparel+/Apparel_Ratkin.xml b/ModPatches/Ratkin Apparel+/Patches/Ratkin Apparel+/Apparel_Ratkin.xml
new file mode 100644
index 0000000000..dceb74f80a
--- /dev/null
+++ b/ModPatches/Ratkin Apparel+/Patches/Ratkin Apparel+/Apparel_Ratkin.xml	
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- == Crusader == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_Crusader"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>40</Bulk>
+			<WornBulk>10</WornBulk>
+			<StuffEffectMultiplierArmor>1.85</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_Crusader"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_Crusader"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Gambeson === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_Gambeson"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_Gambeson"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_Gambeson"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.06</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_Gambeson"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.09</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Gambeson B === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_GambesonB"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_GambesonB"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_GambesonB"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_GambesonB"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.18</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Outer Plate === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RK_OuterPlate"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_OuterPlate"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_OuterPlate"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_OuterPlate"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2.65</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- == Military Uniform == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_MilUniform"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>2.25</WornBulk>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_Crusader"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_Crusader"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- == Rifleman == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_Rifleman"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>2.5</WornBulk>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_Rifleman"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_Rifleman"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2.75</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- == Oriental Dress == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_Oriental"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1.5</WornBulk>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_Rifleman"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- == Scarf & Sleeves == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RK_Scarf" or defName="RK_Sleeves"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>0.5</Bulk>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Ratnik-3 Prototype Armor/Patches/Ratnik-3 Prototype Armor/Bits_N_Bobs_CE.xml b/ModPatches/Ratnik-3 Prototype Armor/Patches/Ratnik-3 Prototype Armor/Bits_N_Bobs_CE.xml
new file mode 100644
index 0000000000..bfddf08aad
--- /dev/null
+++ b/ModPatches/Ratnik-3 Prototype Armor/Patches/Ratnik-3 Prototype Armor/Bits_N_Bobs_CE.xml	
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Camo === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Helix-Camo"]/statBases/WorkToMake</xpath>
+		<value>
+			<WorkToMake>5000</WorkToMake>
+			<Bulk>2</Bulk>
+			<Flammability>0.6</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Helix-Camo"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Helix-Camo"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.06</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Helix-Camo"]/costList/Cloth</xpath>
+		<value>
+			<Cloth>50</Cloth>
+		</value>
+	</Operation>
+
+	<!-- === Helmet === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_6b47_Helmet_Black"]/statBases/WorkToMake</xpath>
+		<value>
+			<WorkToMake>8000</WorkToMake>
+			<Bulk>4</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_6b47_Helmet_Black"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_6b47_Helmet_Black"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_6b47_Helmet_Black"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.54</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_6b47_Helmet_Black"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>75</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_6b47_Helmet_Black"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>30</Steel>
+				<DevilstrandCloth>15</DevilstrandCloth>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_6b47_Helmet_Black"]/apparel</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>UpperHead</li>
+			</bodyPartGroups>
+			<layers>
+				<li>Overhead</li>
+			</layers>
+			<defaultOutfitTags>
+				<li>Soldier</li>
+			</defaultOutfitTags>
+			<useDeflectMetalEffect>true</useDeflectMetalEffect>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Altyn_Helmet_Black"]/statBases/WorkToMake</xpath>
+		<value>
+			<WorkToMake>12500</WorkToMake>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Altyn_Helmet_Black"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>120</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_Altyn_Helmet_Black"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>2</WornBulk>
+			<Flammability>0.6</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Altyn_Helmet_Black"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Altyn_Helmet_Black"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Altyn_Helmet_Black"]/costList</xpath>
+		<value>
+			<costList>
+				<Plasteel>50</Plasteel>
+				<DevilstrandCloth>15</DevilstrandCloth>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_Altyn_Helmet_Black"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingAccuracy>-0.25</AimingAccuracy>
+			<MeleeHitChance>-1</MeleeHitChance>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Ratnik-3 Prototype Armor/Patches/Ratnik-3 Prototype Armor/Ratnik_CE.xml b/ModPatches/Ratnik-3 Prototype Armor/Patches/Ratnik-3 Prototype Armor/Ratnik_CE.xml
new file mode 100644
index 0000000000..4a0efc98bd
--- /dev/null
+++ b/ModPatches/Ratnik-3 Prototype Armor/Patches/Ratnik-3 Prototype Armor/Ratnik_CE.xml	
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Helmet === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Ratnik-3_Helmet"]/statBases/WorkToMake</xpath>
+		<value>
+			<WorkToMake>12000</WorkToMake>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+			<Flammability>0.25</Flammability>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Ratnik-3_Helmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>100</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Ratnik-3_Helmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Ratnik-3_Helmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>18</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Ratnik-3_Helmet"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<ToxicEnvironmentResistance>0.33</ToxicEnvironmentResistance>
+				<SmokeSensitivity>-0.66</SmokeSensitivity>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Ratnik-3_Helmet"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>20</Steel>
+				<Plasteel>25</Plasteel>
+				<DevilstrandCloth>15</DevilstrandCloth>
+				<ComponentIndustrial>5</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="Ratnik_HelmetBase"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!-- === Armor === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Ratnik-3_Armor"]/statBases/WorkToMake</xpath>
+		<value>
+			<WorkToMake>41000</WorkToMake>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Ratnik-3_Armor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>270</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Ratnik-3_Armor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>24</Mass>
+			<Bulk>40</Bulk>
+			<WornBulk>5</WornBulk>
+			<Flammability>0.3</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Ratnik-3_Armor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Ratnik-3_Armor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>24</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Ratnik-3_Armor"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.46</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Ratnik-3_Armor"]/costList</xpath>
+		<value>
+			<costList>
+				<Plasteel>80</Plasteel>
+				<Steel>100</Steel>
+				<DevilstrandCloth>30</DevilstrandCloth>
+				<ComponentIndustrial>8</ComponentIndustrial>
+				<ComponentSpacer>1</ComponentSpacer>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Ratnik-3_Armor"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>25</CarryWeight>
+				<CarryBulk>20</CarryBulk>
+				<ToxicEnvironmentResistance>0.30</ToxicEnvironmentResistance>
+				<MoveSpeed>0.1</MoveSpeed>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ReGrowth - Core/Patches/ReGrowth - Core/Animals_Biotech.xml b/ModPatches/ReGrowth - Core/Patches/ReGrowth - Core/Animals_Biotech.xml
new file mode 100644
index 0000000000..9ea548025b
--- /dev/null
+++ b/ModPatches/ReGrowth - Core/Patches/ReGrowth - Core/Animals_Biotech.xml	
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!-- ========== Hemolope ========== -->
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="RG_Hemolope"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Quadruped</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="RG_Hemolope"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.05</MeleeDodgeChance>
+						<MeleeCritChance>0.07</MeleeCritChance>
+						<MeleeParryChance>0.16</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="RG_Hemolope"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>14</power>
+								<cooldownTime>2.0</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>5.0</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>left hoof</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>8</power>
+								<cooldownTime>1.2</cooldownTime>
+								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>left hoof</label>
+								<capacities>
+									<li>Poke</li>
+								</capacities>
+								<power>8</power>
+								<cooldownTime>1.2</cooldownTime>
+								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>right hoof</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>8</power>
+								<cooldownTime>1.2</cooldownTime>
+								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>right hoof</label>
+								<capacities>
+									<li>Poke</li>
+								</capacities>
+								<power>8</power>
+								<cooldownTime>1.2</cooldownTime>
+								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<capacities>
+									<li>Bite</li>
+								</capacities>
+								<power>5</power>
+								<cooldownTime>0.8</cooldownTime>
+								<chanceFactor>0.5</chanceFactor>
+								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ReGrowth - Core/Patches/ReGrowth - Core/Animals_Core.xml b/ModPatches/ReGrowth - Core/Patches/ReGrowth - Core/Animals_Core.xml
new file mode 100644
index 0000000000..5e8928b636
--- /dev/null
+++ b/ModPatches/ReGrowth - Core/Patches/ReGrowth - Core/Animals_Core.xml	
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Moa === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RG_Moa"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.20</MeleeDodgeChance>
+			<MeleeCritChance>0.06</MeleeCritChance>
+			<MeleeParryChance>0.06</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RG_Moa"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.42</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.08</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>beak</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.89</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.78</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Neutrolope ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RG_Neutrolope"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RG_Neutrolope"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			<MeleeCritChance>0.07</MeleeCritChance>
+			<MeleeParryChance>0.16</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RG_Neutrolope"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5.0</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.2</cooldownTime>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.2</cooldownTime>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.2</cooldownTime>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.2</cooldownTime>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.8</cooldownTime>
+					<chanceFactor>0.5</chanceFactor>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ReGrowth - Extinct Animals/Patches/ReGrowth - Extinct Animals/Extinct_Birdlike.xml b/ModPatches/ReGrowth - Extinct Animals/Patches/ReGrowth - Extinct Animals/Extinct_Birdlike.xml
new file mode 100644
index 0000000000..b2ded89d73
--- /dev/null
+++ b/ModPatches/ReGrowth - Extinct Animals/Patches/ReGrowth - Extinct Animals/Extinct_Birdlike.xml	
@@ -0,0 +1,342 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ===== Body Type ===== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RG_Dodo" or defName="RG_TerrorBird" or defName="RG_ArcticDrak" or defName="RG_Velociraptor"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Dodo === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RG_Dodo"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.07</MeleeDodgeChance>
+			<MeleeCritChance>0.03</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RG_Dodo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.55</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.08</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.16</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RG_Dodo"]/combatPower</xpath>
+		<value>
+			<combatPower>30</combatPower>
+		</value>
+	</Operation>
+
+	<!-- === Terror Bird === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RG_TerrorBird"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.20</MeleeDodgeChance>
+			<MeleeCritChance>0.06</MeleeCritChance>
+			<MeleeParryChance>0.06</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RG_TerrorBird"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.42</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.08</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.89</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.78</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RG_TerrorBird"]/combatPower</xpath>
+		<value>
+			<combatPower>80</combatPower>
+		</value>
+	</Operation>
+
+	<!-- === Arctic Drak === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RG_ArcticDrak"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.37</MeleeDodgeChance>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>0.08</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RG_ArcticDrak"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>RG_FootClawAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.37</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>RG_FootClawAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.37</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.75</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>tail</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.78</cooldownTime>
+					<linkedBodyPartsGroup>RG_TailAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RG_ArcticDrak"]/combatPower</xpath>
+		<value>
+			<combatPower>120</combatPower>
+		</value>
+	</Operation>
+
+	<!-- === Velociraptor === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RG_Velociraptor"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.31</MeleeDodgeChance>
+			<MeleeCritChance>0.07</MeleeCritChance>
+			<MeleeParryChance>0.03</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RG_Velociraptor"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Stab</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.7</cooldownTime>
+					<linkedBodyPartsGroup>RG_FootClawAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.281</armorPenetrationBlunt>
+					<chanceFactor>0.3</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Stab</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.7</cooldownTime>
+					<linkedBodyPartsGroup>RG_FootClawAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.281</armorPenetrationBlunt>
+					<chanceFactor>0.3</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>0.7</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+					<chanceFactor>0.7</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RG_Velociraptor"]/race/manhunterOnDamageChance</xpath>
+		<value>
+			<manhunterOnDamageChance>0.75</manhunterOnDamageChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RG_Velociraptor"]/combatPower</xpath>
+		<value>
+			<combatPower>85</combatPower>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RG_Velociraptor"]/wildGroupSize</xpath>
+		<value>
+			<wildGroupSize>4~6</wildGroupSize>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ReGrowth - Extinct Animals/Patches/ReGrowth - Extinct Animals/Extinct_Bodies.xml b/ModPatches/ReGrowth - Extinct Animals/Patches/ReGrowth - Extinct Animals/Extinct_Bodies.xml
new file mode 100644
index 0000000000..ad4494ec6e
--- /dev/null
+++ b/ModPatches/ReGrowth - Extinct Animals/Patches/ReGrowth - Extinct Animals/Extinct_Bodies.xml	
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Natural Armor === -->
+
+	<!-- === Theropod === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RG_TheropodWithClaws"]//*[def="Body" or def="Neck" or def="Leg"]</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RG_TheropodWithClaws"]//*[def="Body" or def="Tail" or def="Neck" or def="Head" or def="AnimalJaw" or def="RG_FootClaw" or def="Leg" or def="Foot"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- === Sauropod === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RG_SauropodWithTailSpikes"]//*[def="Body" or def="Neck"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RG_SauropodWithTailSpikes"]//*[def="Body" or def="Tail" or def="Neck" or def="Head" or def="AnimalJaw" or def="Leg" or def="Foot"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ReGrowth - Extinct Animals/Patches/ReGrowth - Extinct Animals/Extinct_Mammals.xml b/ModPatches/ReGrowth - Extinct Animals/Patches/ReGrowth - Extinct Animals/Extinct_Mammals.xml
new file mode 100644
index 0000000000..a7ce85affd
--- /dev/null
+++ b/ModPatches/ReGrowth - Extinct Animals/Patches/ReGrowth - Extinct Animals/Extinct_Mammals.xml	
@@ -0,0 +1,338 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ===== Body Type ===== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RG_WoollyMammoth" or defName="RG_WoollyRhinoceros" or defName="RG_WoollyStegosaurus" or defName="RG_Synthetion"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Wooly Mammoth === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RG_WoollyMammoth"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.90</MeleeCritChance>
+			<MeleeParryChance>0.33</MeleeParryChance>
+			<ArmorRating_Blunt>5</ArmorRating_Blunt>
+			<ArmorRating_Sharp>0.22</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RG_WoollyMammoth"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tusk</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>68</power>
+					<cooldownTime>3.37</cooldownTime>
+					<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>46.226</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>2.47</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>28.96</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>2.47</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>28.960</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>56</power>
+					<cooldownTime>3.69</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>40</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RG_WoollyMammoth"]/combatPower</xpath>
+		<value>
+			<combatPower>280</combatPower>
+		</value>
+	</Operation>
+
+	<!-- === Wooly Rhino === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RG_WoollyRhinoceros"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>5.1</MoveSpeed>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.62</MeleeCritChance>
+			<MeleeParryChance>0.3</MeleeParryChance>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+			<ArmorRating_Sharp>0.4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RG_WoollyRhinoceros"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>2.37</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>21</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Poke</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>2.37</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<armorPenetrationBlunt>21</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>2.7</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>24</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RG_WoollyRhinoceros"]/combatPower</xpath>
+		<value>
+			<combatPower>240</combatPower>
+		</value>
+	</Operation>
+
+	<!-- === Woolly Stegosaurus === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RG_WoollyStegosaurus"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>3</MoveSpeed>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.22</MeleeCritChance>
+			<MeleeParryChance>0.57</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RG_WoollyStegosaurus"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3.8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RG_WoollyStegosaurus"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RG_WoollyStegosaurus"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>2.5</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.7</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.700</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.255</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>tail spikes</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Stab</li>
+						<li>Blunt</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2.8</cooldownTime>
+					<linkedBodyPartsGroup>RG_TailAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>5</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>4.235</armorPenetrationBlunt>
+					<chanceFactor>1.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RG_WoollyStegosaurus"]/combatPower</xpath>
+		<value>
+			<combatPower>240</combatPower>
+		</value>
+	</Operation>
+
+	<!-- === Synthetion === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RG_Synthetion"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>6.8</MoveSpeed>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>0.07</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RG_Synthetion"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.27</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.700</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RG_Synthetion"]/combatPower</xpath>
+		<value>
+			<combatPower>50</combatPower>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ReGrowth - Extinct Animals/Patches/ReGrowth - Extinct Animals/Extinct_Resources.xml b/ModPatches/ReGrowth - Extinct Animals/Patches/ReGrowth - Extinct Animals/Extinct_Resources.xml
new file mode 100644
index 0000000000..9d1a3cf4a1
--- /dev/null
+++ b/ModPatches/ReGrowth - Extinct Animals/Patches/ReGrowth - Extinct Animals/Extinct_Resources.xml	
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Remove tusk as a weapon === -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RG_MammothTusk"]/tools</xpath>
+	</Operation>
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="RG_MammothTusk"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>ResourceBase</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RG_MammothTusk"]/statBases/MarketValue</xpath>
+		<value>
+			<MarketValue>120</MarketValue>
+		</value>
+	</Operation>
+
+	<!-- === Dinosaur Hides === -->
+
+	<!-- Thin -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RG_DinosaursHideThin"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.05</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RG_DinosaursHideThin"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.02</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Medium -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RG_DinosaursHideMedium"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.26</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RG_DinosaursHideMedium"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.04</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Heavy -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RG_DinosaursHideHeavy"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.52</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RG_DinosaursHideHeavy"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.08</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Wooly Wool === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RG_WoolRhinoceros" or defName="RG_WoolStegosaurus"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.036</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ReGrowth - Extinct Animals/Patches/ReGrowth - Extinct Animals/Extinct_Rodentlikes.xml b/ModPatches/ReGrowth - Extinct Animals/Patches/ReGrowth - Extinct Animals/Extinct_Rodentlikes.xml
new file mode 100644
index 0000000000..ca7ff6cb19
--- /dev/null
+++ b/ModPatches/ReGrowth - Extinct Animals/Patches/ReGrowth - Extinct Animals/Extinct_Rodentlikes.xml	
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ===== Body Type ===== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RG_SabertoothSquirrel" or defName="RG_Thrinaxodon" or defName="RG_Megalenhydris"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Sabertooth Squirrel === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RG_SabertoothSquirrel"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0.02</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RG_SabertoothSquirrel"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.67</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.67</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>0.88</cooldownTime>
+					<chanceFactor>0.7</chanceFactor>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.825</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.14</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>3.00</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RG_SabertoothSquirrel"]/combatPower</xpath>
+		<value>
+			<combatPower>30</combatPower>
+		</value>
+	</Operation>
+
+	<!-- === Thrinaxodon === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RG_Thrinaxodon"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.12</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RG_Thrinaxodon"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.87</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+					<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.16</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.325</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RG_Thrinaxodon"]/combatPower</xpath>
+		<value>
+			<combatPower>55</combatPower>
+		</value>
+	</Operation>
+
+	<!-- === Megalenhydris === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RG_Megalenhydris"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.27</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.02</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RG_Megalenhydris"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.67</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.67</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>0.88</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+					<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>3.00</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>tail</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>3.00</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.6</chanceFactor>
+					<armorPenetrationBlunt>0.145</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.06</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RG_Megalenhydris"]/combatPower</xpath>
+		<value>
+			<combatPower>45</combatPower>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ReGrowth - Wastelands/Patches/ReGrowth - Wastelands/Bodies.xml b/ModPatches/ReGrowth - Wastelands/Patches/ReGrowth - Wastelands/Bodies.xml
new file mode 100644
index 0000000000..fec6824419
--- /dev/null
+++ b/ModPatches/ReGrowth - Wastelands/Patches/ReGrowth - Wastelands/Bodies.xml	
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Natural Armor -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="RG_HumanoidWithHornsAndClaws"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Leg" or
+			def="Paw" or
+			def="Arm"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="RG_HumanoidWithHornsAndClaws"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Head" or
+			def="Horn" or
+			def="Arm" or
+			def="FrontClaw" or
+			def="Leg" or
+			def="Paw"
+			]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ReGrowth - Wastelands/Patches/ReGrowth - Wastelands/Mutant_Beaver.xml b/ModPatches/ReGrowth - Wastelands/Patches/ReGrowth - Wastelands/Mutant_Beaver.xml
new file mode 100644
index 0000000000..817704aac5
--- /dev/null
+++ b/ModPatches/ReGrowth - Wastelands/Patches/ReGrowth - Wastelands/Mutant_Beaver.xml	
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RG_Toxbeaver"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RG_Toxbeaver"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.36</MeleeDodgeChance>
+			<MeleeCritChance>0.03</MeleeCritChance>
+			<MeleeParryChance>0.00</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RG_Toxbeaver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.03</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.03</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ReGrowth - Wastelands/Patches/ReGrowth - Wastelands/Mutant_Rat.xml b/ModPatches/ReGrowth - Wastelands/Patches/ReGrowth - Wastelands/Mutant_Rat.xml
new file mode 100644
index 0000000000..956c5bc5e0
--- /dev/null
+++ b/ModPatches/ReGrowth - Wastelands/Patches/ReGrowth - Wastelands/Mutant_Rat.xml	
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RG_Toxirrel"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RG_Toxirrel"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.52</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.00</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RG_Toxirrel"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.03</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.03</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ReGrowth - Wastelands/Patches/ReGrowth - Wastelands/Rimclaw.xml b/ModPatches/ReGrowth - Wastelands/Patches/ReGrowth - Wastelands/Rimclaw.xml
new file mode 100644
index 0000000000..ea9ace41cf
--- /dev/null
+++ b/ModPatches/ReGrowth - Wastelands/Patches/ReGrowth - Wastelands/Rimclaw.xml	
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RG_Rimclaw"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RG_Rimclaw"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RG_Rimclaw"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>9</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RG_Rimclaw"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			<MeleeCritChance>0.46</MeleeCritChance>
+			<MeleeParryChance>0.78</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RG_Rimclaw"]/race/baseBodySize</xpath>
+		<value>
+			<baseBodySize>2.5</baseBodySize>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RG_Rimclaw"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>6.75</MoveSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RG_Rimclaw"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Stab</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>7.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>16</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right blade</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Stab</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>7.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>16</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>6.750</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Horn</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Stab</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>12</armorPenetrationSharp>
+					<armorPenetrationBlunt>8.750</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.750</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Recon Mechanoid/Patches/Recon Mechanoid/Mech_PawnKinds.xml b/ModPatches/Recon Mechanoid/Patches/Recon Mechanoid/Mech_PawnKinds.xml
new file mode 100644
index 0000000000..7fe7268953
--- /dev/null
+++ b/ModPatches/Recon Mechanoid/Patches/Recon Mechanoid/Mech_PawnKinds.xml	
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="Mech_Recon" or
+			defName="Mech_ReconBlaster" or
+			defName="Mech_Scout" or
+			defName="Mech_ScoutBlaster"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Recon Mechanoid/Patches/Recon Mechanoid/Races_Mechanoid.xml b/ModPatches/Recon Mechanoid/Patches/Recon Mechanoid/Races_Mechanoid.xml
new file mode 100644
index 0000000000..1b68833315
--- /dev/null
+++ b/ModPatches/Recon Mechanoid/Patches/Recon Mechanoid/Races_Mechanoid.xml	
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[
+			defName="Mech_Recon" or
+			defName="Mech_ReconBlaster" or
+			defName="Mech_Scout" or
+			defName="Mech_ScoutBlaster"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Mech_Recon" or
+			defName="Mech_ReconBlaster" or
+			defName="Mech_Scout" or
+			defName="Mech_ScoutBlaster"
+			]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Mech_Recon" or
+			defName="Mech_ReconBlaster" or
+			defName="Mech_Scout" or
+			defName="Mech_ScoutBlaster"
+			]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="Mech_Recon" or
+			defName="Mech_ReconBlaster" or
+			defName="Mech_Scout" or
+			defName="Mech_ScoutBlaster"
+			]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1.1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.075</MeleeCritChance>
+			<MeleeParryChance>0.075</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Mech_Recon" or
+			defName="Mech_ReconBlaster" or
+			defName="Mech_Scout" or
+			defName="Mech_ScoutBlaster"
+			]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.11</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.11</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Recon Mechanoid/Patches/Recon Mechanoid/RangedRecon.xml b/ModPatches/Recon Mechanoid/Patches/Recon Mechanoid/RangedRecon.xml
new file mode 100644
index 0000000000..0f4e8467da
--- /dev/null
+++ b/ModPatches/Recon Mechanoid/Patches/Recon Mechanoid/RangedRecon.xml	
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Melee Tools -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName="Gun_ReconSMG" or
+			defName="Gun_MechScoutGun" or
+			defName="Gun_ReconBlaster" or
+			defName="Gun_ScoutLancer"
+			]/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>
+
+	<!-- Recon SMG -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_ReconSMG</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.19</ShotSpread>
+			<SwayFactor>0.98</SwayFactor>
+			<Bulk>3</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.79</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20.9</range>
+			<burstShotCount>4</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<soundCast>Shot_Slugthrower</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Recon Blaster  -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_ReconBlaster</defName>
+		<statBases>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>0.78</SwayFactor>
+			<Bulk>4.50</Bulk>
+			<Mass>2.0</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.42</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
+			<burstShotCount>4</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>0.5</warmupTime>
+			<range>28</range>
+			<soundCast>Shot_ChargeBlaster</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>28</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- Scout Gun -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MechScoutGun</defName>
+		<statBases>
+			<Mass>3.26</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.35</SwayFactor>
+			<Bulk>5</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.54</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>46</range>
+			<soundCast>Shot_Slugthrower</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AR</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Scout Lancer -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_ScoutLancer</defName>
+		<statBases>
+			<Mass>3.26</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.35</SwayFactor>
+			<Bulk>5</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.54</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>52</range>
+			<soundCast>Shot_ChargeBlaster</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AR</li>
+		</weaponTags>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Red Army/Patches/Red Army/RedArmy_PM_M1910.xml b/ModPatches/Red Army/Patches/Red Army/RedArmy_PM_M1910.xml
new file mode 100644
index 0000000000..b41428fb90
--- /dev/null
+++ b/ModPatches/Red Army/Patches/Red Army/RedArmy_PM_M1910.xml	
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="MaximRounds"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/RecipeDef[defName="MakeMaximCrate"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="BaseSovietEmplacedMG"]/building/fixedStorageSettings</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="BaseSovietEmplacedMG"]/building/defaultStorageSettings</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationInsert">
+		<xpath>Defs/ThingDef[defName="Maxim_HMG"]</xpath>
+		<value>
+			<ThingDef Name="BaseArtilleryWeaponPMM1910" Abstract="True">
+				<category>Item</category>
+				<thingClass>ThingWithComps</thingClass>
+				<label>artillery error</label>
+				<useHitPoints>false</useHitPoints>
+				<equipmentType>Primary</equipmentType>
+				<tickerType>Never</tickerType>
+				<techLevel>Industrial</techLevel>
+				<destroyOnDrop>True</destroyOnDrop>
+				<generateCommonality>0</generateCommonality>
+				<menuHidden>True</menuHidden>
+				<tradeability>None</tradeability>
+				<weaponTags>
+					<li>Turret</li>
+				</weaponTags>
+				<comps>
+					<li>
+						<compClass>CompEquippable</compClass>
+					</li>
+				</comps>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Maxim_HMG</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>0.82</SwayFactor>
+			<Bulk>10.0</Bulk>
+			<WorkToMake>14000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>35</range>
+			<minRange>2</minRange>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<burstShotCount>6</burstShotCount>
+			<soundCast>Maxim_Fire1</soundCast>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<recoilAmount>0.78</recoilAmount>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>250</magazineSize>
+			<reloadTime>6.25</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Turret</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_Maxim"]/label</xpath>
+		<value>
+			<label>PM M1910</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Maxim_HMG"]/label</xpath>
+		<value>
+			<label>PM M1910</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Turret_Maxim"]</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Turret_Maxim"]</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Red Army/Patches/Red Army/RedArmy_PawnKinds.xml b/ModPatches/Red Army/Patches/Red Army/RedArmy_PawnKinds.xml
new file mode 100644
index 0000000000..8bcbae1831
--- /dev/null
+++ b/ModPatches/Red Army/Patches/Red Army/RedArmy_PawnKinds.xml	
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="SovietInfantry"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.1</generateChance>
+						<sidearmMoney>
+							<min>80</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm</li>
+						</weaponTags>
+					</li>
+					<li>
+						<generateChance>0.4</generateChance>
+						<sidearmMoney>
+							<min>60</min>
+							<max>150</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="SovietScoutInfantry"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.3</generateChance>
+						<sidearmMoney>
+							<min>80</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm</li>
+						</weaponTags>
+					</li>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>60</min>
+							<max>150</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="SovietAssaultInfantry"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.3</generateChance>
+						<sidearmMoney>
+							<min>80</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm</li>
+						</weaponTags>
+					</li>
+					<li>
+						<generateChance>0.6</generateChance>
+						<sidearmMoney>
+							<min>60</min>
+							<max>150</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="SovietGrenadier"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.4</generateChance>
+						<sidearmMoney>
+							<min>80</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm</li>
+						</weaponTags>
+					</li>
+					<li>
+						<generateChance>1</generateChance>
+						<sidearmMoney>
+							<min>60</min>
+							<max>150</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="SovietGuardsInfantry"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.7</generateChance>
+						<sidearmMoney>
+							<min>80</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm</li>
+						</weaponTags>
+					</li>
+					<li>
+						<generateChance>1</generateChance>
+						<sidearmMoney>
+							<min>60</min>
+							<max>150</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="SovietBannerman"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>1</generateChance>
+						<sidearmMoney>
+							<min>60</min>
+							<max>150</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="SovietFactionCommander"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.9</generateChance>
+						<sidearmMoney>
+							<min>80</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="SovietMG"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.6</generateChance>
+						<sidearmMoney>
+							<min>80</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Red Army/Patches/Red Army/RedArmy_Weapons.xml b/ModPatches/Red Army/Patches/Red Army/RedArmy_Weapons.xml
new file mode 100644
index 0000000000..eeb7334f4d
--- /dev/null
+++ b/ModPatches/Red Army/Patches/Red Army/RedArmy_Weapons.xml	
@@ -0,0 +1,577 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- SovietFlag -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SovietBanner"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.2</cooldownTime>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>11.3</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SovietBanner"]/statBases</xpath>
+		<value>
+			<Bulk>7</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SovietBanner"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.25</MeleeCritChance>
+				<MeleeParryChance>0.25</MeleeParryChance>
+				<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Add tags -->
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="SovietBanner"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="SovietBanner"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SovietBanner"]/weaponTags</xpath>
+		<value>
+			<li>CE_Sidearm_Melee</li>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- Mosin IronSight Rifle -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>MosinNagant</defName>
+		<statBases>
+			<Mass>4.20</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.24</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.05</SwayFactor>
+			<Bulk>8.7</Bulk>
+			<WorkToMake>18000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>50</range>
+			<soundCast>Mosin_Fire1</soundCast>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>SovietInfantry</li>
+			<li>SovietAssaultInfantry</li>
+		</weaponTags>
+		<researchPrerequisite>
+			<researchPrerequisite>SovietEarlyWarTech</researchPrerequisite>
+		</researchPrerequisite>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MosinNagant"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.9</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Mosin Sniper Rifle Var1 -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>MosinSniper</defName>
+		<statBases>
+			<Mass>5.20</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.24</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>0.93</SwayFactor>
+			<Bulk>8.7</Bulk>
+			<WorkToMake>18000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>100</range>
+			<soundCast>Mosin_Fire1</soundCast>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>6.5</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>SovietScoutInfantry</li>
+		</weaponTags>
+		<researchPrerequisite>
+			<researchPrerequisite>SovietMidWarTech</researchPrerequisite>
+		</researchPrerequisite>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MosinSniper"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.9</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Mosin Sniper Rifle Var2 -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>MosinSniperVariant</defName>
+		<statBases>
+			<Mass>5.20</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.24</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>0.90</SwayFactor>
+			<Bulk>8.7</Bulk>
+			<WorkToMake>18000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>100</range>
+			<soundCast>Mosin_Fire1</soundCast>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>6.8</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>SovietScoutInfantry</li>
+		</weaponTags>
+		<researchPrerequisite>
+			<researchPrerequisite>SovietMidWarTech</researchPrerequisite>
+		</researchPrerequisite>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MosinSniperVariant"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.9</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Nagant M1895 -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Nagant1895Pistol</defName>
+		<statBases>
+			<Mass>3.20</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.24</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>0.94</SwayFactor>
+			<Bulk>3.7</Bulk>
+			<WorkToMake>9000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x38mmR_FMJ</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>12</range>
+			<soundCast>NagantPistol_Fire1</soundCast>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>3.8</reloadTime>
+			<ammoSet>AmmoSet_762x38mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>SovietFactionCommander</li>
+			<li>CE_Sidearm</li>
+		</weaponTags>
+		<researchPrerequisite>
+			<researchPrerequisite>SovietEarlyWarTech</researchPrerequisite>
+		</researchPrerequisite>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Nagant1895Pistol"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- PPSh 41 Drum -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>PPSh</defName>
+		<statBases>
+			<Mass>4.20</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.50</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.06</SwayFactor>
+			<Bulk>3.7</Bulk>
+			<WorkToMake>7500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>65</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
+			<warmupTime>1.25</warmupTime>
+			<range>19</range>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<burstShotCount>7</burstShotCount>
+			<soundCast>PPSh_Fire1</soundCast>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>71</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_SMG</li>
+			<li>SovietInfantry</li>
+			<li>SovietAssaultInfantry</li>
+			<li>SovietFactionCommander</li>
+		</weaponTags>
+		<researchPrerequisite>
+			<researchPrerequisite>SovietEarlyWarTech</researchPrerequisite>
+		</researchPrerequisite>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PPSh"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- DP27 LMG -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>DPTwentySeven</defName>
+		<statBases>
+			<Mass>10.50</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.50</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.51</SwayFactor>
+			<Bulk>14.05</Bulk>
+			<WorkToMake>13000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>65</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>3</warmupTime>
+			<range>32</range>
+			<ticksBetweenBurstShots>14</ticksBetweenBurstShots>
+			<burstShotCount>8</burstShotCount>
+			<soundCast>DP27_Fire1</soundCast>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>47</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_MachineGun</li>
+			<li>SovietMG</li>
+		</weaponTags>
+		<researchPrerequisite>
+			<researchPrerequisite>SovietMidWarTech</researchPrerequisite>
+		</researchPrerequisite>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DPTwentySeven"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- SVTForty -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>SVTForty</defName>
+		<statBases>
+			<Mass>8.50</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.50</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>0.93</SwayFactor>
+			<Bulk>7.05</Bulk>
+			<WorkToMake>16000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>65</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>2</warmupTime>
+			<range>33</range>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<burstShotCount>2</burstShotCount>
+			<soundCast>SVT_Fire1</soundCast>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>3.8</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>SovietScoutInfantry</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+		<researchPrerequisite>
+			<researchPrerequisite>SovietMidWarTech</researchPrerequisite>
+		</researchPrerequisite>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SVTForty"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>bayonet</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>2.14</cooldownTime>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>bayonet</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.49</cooldownTime>
+					<armorPenetrationBlunt>2.16</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.44</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- TankLightGun -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>SovietTankLightGun</defName>
+		<statBases>
+			<SightsEfficiency>1.4</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>0.82</SwayFactor>
+			<Bulk>13.0</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_90mmCannonShell_HEAT</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>82</range>
+			<minRange>3</minRange>
+			<ticksBetweenBurstShots>20</ticksBetweenBurstShots>
+			<burstShotCount>1</burstShotCount>
+			<soundCast>Tank_Fire1</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<recoilAmount>0.78</recoilAmount>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>6.75</reloadTime>
+			<ammoSet>AmmoSet_90mmCannonShell</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>1</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+		</weaponTags>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Red Army/Patches/Red Army/RedArmy_ZIS2_Cannon.xml b/ModPatches/Red Army/Patches/Red Army/RedArmy_ZIS2_Cannon.xml
new file mode 100644
index 0000000000..d341d1397a
--- /dev/null
+++ b/ModPatches/Red Army/Patches/Red Army/RedArmy_ZIS2_Cannon.xml	
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationInsert">
+		<xpath>Defs/ThingDef[defName="Artillery_zis"]</xpath>
+		<value>
+			<ThingDef Name="BaseArtilleryWeaponZIS" Abstract="True">
+				<category>Item</category>
+				<thingClass>ThingWithComps</thingClass>
+				<label>artillery error</label>
+				<useHitPoints>false</useHitPoints>
+				<equipmentType>Primary</equipmentType>
+				<tickerType>Never</tickerType>
+				<techLevel>Industrial</techLevel>
+				<destroyOnDrop>True</destroyOnDrop>
+				<generateCommonality>0</generateCommonality>
+				<menuHidden>True</menuHidden>
+				<tradeability>None</tradeability>
+				<weaponTags>
+					<li>Artillery</li>
+				</weaponTags>
+				<comps>
+					<li>
+						<compClass>CompEquippable</compClass>
+					</li>
+				</comps>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Artillery_zis</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>0.82</SwayFactor>
+			<Bulk>13.0</Bulk>
+			<WorkToMake>18000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_90mmCannonShell_HE</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<minRange>5</minRange>
+			<range>75</range>
+			<ticksBetweenBurstShots>45</ticksBetweenBurstShots>
+			<soundCast>Zis_Fire1</soundCast>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<recoilAmount>0.78</recoilAmount>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>4.75</reloadTime>
+			<ammoSet>AmmoSet_90mmCannonShell</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Turret</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="BaseSovietArtillery"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Turret_Zis"]</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Redcoat Apparel/Patches/Redcoat Apparel/Apparel_Redcoat.xml b/ModPatches/Redcoat Apparel/Patches/Redcoat Apparel/Apparel_Redcoat.xml
new file mode 100644
index 0000000000..2cc8cc6dde
--- /dev/null
+++ b/ModPatches/Redcoat Apparel/Patches/Redcoat Apparel/Apparel_Redcoat.xml	
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Redcoat -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RCA_plainshirtvest" or
+			defName="RCA_breeches"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			@Name="RCA_coat_base" or
+			@Name="RCA_regcoat_base"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+			<Bulk>2.5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RCA_watchcloak" or
+			defName="RCA_capote"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+			<Bulk>7.5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			@Name="CockedHatBase" or
+			defName="RCA_bearskin" or
+			defName="RCA_beaverhat" or
+			@Name="ForageCapBase"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+			<Bulk>0.5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="RCA_beltcbox"]/equippedStatOffsets</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="RCA_beltcbox"]</xpath>
+			<value>
+				<equippedStatOffsets>
+					<CarryBulk>10</CarryBulk>
+				</equippedStatOffsets>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="RCA_beltcbox"]/equippedStatOffsets</xpath>
+			<value>
+				<CarryBulk>10</CarryBulk>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Remote Detonator/Patches/Remote Detonator/Remote_Detonator_CEpatch.xml b/ModPatches/Remote Detonator/Patches/Remote Detonator/Remote_Detonator_CEpatch.xml
new file mode 100644
index 0000000000..a748ae7086
--- /dev/null
+++ b/ModPatches/Remote Detonator/Patches/Remote Detonator/Remote_Detonator_CEpatch.xml	
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_IED_HighExplosive"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>10</Steel>
+				<FSX>3</FSX>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_IED_Incendiary"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>10</Steel>
+				<Prometheum>2</Prometheum>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_IED_HighExplosive"]/comps/li[@Class="CompProperties_Explosive"]</xpath>
+		<value>
+			<li Class="CompProperties_Explosive">
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<damageAmountBase>270</damageAmountBase>
+				<explosiveRadius>4.5</explosiveRadius>
+				<wickTicks>
+					<min>5</min>
+					<max>30</max>
+				</wickTicks>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>16</Fragment_Large>
+					<Fragment_Small>100</Fragment_Small>
+				</fragments>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RD_IED_Incendiary"]/comps/li[@Class="CompProperties_Explosive"]</xpath>
+		<value>
+			<li Class="CompProperties_Explosive">
+				<explosiveDamageType>PrometheumFlame</explosiveDamageType>
+				<explosiveRadius>5</explosiveRadius>
+				<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
+				<preExplosionSpawnChance>0.75</preExplosionSpawnChance>
+				<wickTicks>
+					<min>5</min>
+					<max>20</max>
+				</wickTicks>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git "a/ModPatches/Revia Race \342\200\224 biotech/Defs/Revia Race \342\200\224 biotech/Recipes_Revia.xml" "b/ModPatches/Revia Race \342\200\224 biotech/Defs/Revia Race \342\200\224 biotech/Recipes_Revia.xml"
new file mode 100644
index 0000000000..7be3e715af
--- /dev/null
+++ "b/ModPatches/Revia Race \342\200\224 biotech/Defs/Revia Race \342\200\224 biotech/Recipes_Revia.xml"	
@@ -0,0 +1,34 @@
+
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- == Recipe == -->
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeReviaThrowingKnife</defName>
+		<label>make throwing knives x10</label>
+		<description>Craft 10 throwing knives.</description>
+		<jobString>Making throwing knives.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<ReviaThrowingKnife>10</ReviaThrowingKnife>
+		</products>
+		<recipeUsers>
+			<li>CraftingSpot</li>
+		</recipeUsers>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git "a/ModPatches/Revia Race \342\200\224 biotech/Patches/Revia Race \342\200\224 biotech/PawnKindDefs/ReviaPawnKindDefs.xml" "b/ModPatches/Revia Race \342\200\224 biotech/Patches/Revia Race \342\200\224 biotech/PawnKindDefs/ReviaPawnKindDefs.xml"
new file mode 100644
index 0000000000..85960ce356
--- /dev/null
+++ "b/ModPatches/Revia Race \342\200\224 biotech/Patches/Revia Race \342\200\224 biotech/PawnKindDefs/ReviaPawnKindDefs.xml"	
@@ -0,0 +1,269 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Revia Marauder-->
+	<!--Berserker-->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/PawnKindDef[defName="ReviaRaceBerserker"]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<sidearms>
+					<li>
+						<weaponTags>
+							<li>ReviaMeleeAdvanced</li>
+							<li>ReviaMeleeLegendary</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="ReviaRaceBerserker"]/apparelTags</xpath>
+		<value>
+			<li>CE_Apparel_TacVest</li>
+			<li>CE_Apparel_Backpack</li>
+			<li>CE_Apparel_TribalBackpack</li>
+		</value>
+	</Operation>
+	<!--Marauder-->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/PawnKindDef[defName="ReviaRaceMarauder"]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>10</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.2</generateChance>
+						<sidearmMoney>
+							<min>40</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>ReviaMeleeBasic</li>
+							<li>ReviaMeleeIntermediate</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="ReviaRaceMarauder"]/apparelTags</xpath>
+		<value>
+			<li>CE_Apparel_TacVest</li>
+			<li>CE_Apparel_Backpack</li>
+			<li>CE_Apparel_TribalBackpack</li>
+		</value>
+	</Operation>
+	<!--Raider-->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/PawnKindDef[defName="ReviaRaceRaider"]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<sidearms>
+					<li>
+						<generateChance>0.2</generateChance>
+						<sidearmMoney>
+							<min>10</min>
+							<max>20</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+							<li>ReviaMeleeBasic</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="ReviaRaceRaider"]/apparelTags</xpath>
+		<value>
+			<li>CE_Apparel_TacVest</li>
+			<li>CE_Apparel_Backpack</li>
+			<li>CE_Apparel_TribalBackpack</li>
+		</value>
+	</Operation>
+	<!--Skullshatterer-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="ReviaRaceSkullshatterer"]/apparelTags</xpath>
+		<value>
+			<li>CE_Apparel_TacVest</li>
+			<li>CE_Apparel_Backpack</li>
+			<li>CE_Apparel_TribalBackpack</li>
+		</value>
+	</Operation>
+	<!--Revia Templar-->
+	<!--High Templar-->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/PawnKindDef[defName="ReviaRaceHighTemplar"]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<magazineCount>
+							<min>1</min>
+							<max>3</max>
+						</magazineCount>
+						<generateChance>0.6</generateChance>
+						<weaponTags>
+							<li>ReviaMeleeLegendary</li>
+							<li>ReviaRangedAdvanced</li>
+							<li>CE_Sidearm</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="ReviaRaceHighTemplar"]/apparelRequired</xpath>
+		<value>
+			<li>CE_Apparel_TacVest</li>
+			<li>CE_Apparel_Backpack</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="ReviaRaceHighTemplar"]/apparelTags</xpath>
+		<value>
+			<li>CE_Apparel_TacVest</li>
+			<li>CE_Apparel_Backpack</li>
+			<li>CE_Apparel_TribalBackpack</li>
+		</value>
+	</Operation>
+	<!--Initiate-->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/PawnKindDef[defName="ReviaRaceInitiate"]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<magazineCount>
+							<min>1</min>
+							<max>3</max>
+						</magazineCount>
+						<generateChance>0.5</generateChance>
+						<weaponTags>
+							<li>ReviaRangedAdvanced</li>
+							<li>CE_Sidearm</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="ReviaRaceInitiate"]/apparelTags</xpath>
+		<value>
+			<li>CE_Apparel_TacVest</li>
+			<li>CE_Apparel_Backpack</li>
+			<li>CE_Apparel_TribalBackpack</li>
+		</value>
+	</Operation>
+	<!--Quartermaster-->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/PawnKindDef[defName="ReviaRaceQuartermaster"]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<magazineCount>
+							<min>1</min>
+							<max>3</max>
+						</magazineCount>
+						<generateChance>0.5</generateChance>
+						<weaponTags>
+							<li>ReviaMeleeAdvanced</li>
+							<li>CE_Sidearm</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="ReviaRaceQuartermaster"]/apparelRequired</xpath>
+		<value>
+			<li>CE_Apparel_TacVest</li>
+			<li>CE_Apparel_Backpack</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="ReviaRaceQuartermaster"]/apparelTags</xpath>
+		<value>
+			<li>CE_Apparel_TacVest</li>
+			<li>CE_Apparel_Backpack</li>
+			<li>CE_Apparel_TribalBackpack</li>
+		</value>
+	</Operation>
+	<!--Templar-->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/PawnKindDef[defName="ReviaRaceTemplar"]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<magazineCount>
+							<min>1</min>
+							<max>3</max>
+						</magazineCount>
+						<generateChance>0.5</generateChance>
+						<weaponTags>
+							<li>ReviaMeleeAdvanced</li>
+							<li>ReviaMeleeLegendary</li>
+							<li>CE_Sidearm</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="ReviaRaceTemplar"]/apparelRequired</xpath>
+		<value>
+			<li>CE_Apparel_TacVest</li>
+			<li>CE_Apparel_Backpack</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="ReviaRaceTemplar"]/apparelTags</xpath>
+		<value>
+			<li>CE_Apparel_TacVest</li>
+			<li>CE_Apparel_Backpack</li>
+			<li>CE_Apparel_TribalBackpack</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git "a/ModPatches/Revia Race \342\200\224 biotech/Patches/Revia Race \342\200\224 biotech/Scenario/Revia_Scenario.xml" "b/ModPatches/Revia Race \342\200\224 biotech/Patches/Revia Race \342\200\224 biotech/Scenario/Revia_Scenario.xml"
new file mode 100644
index 0000000000..86f1039deb
--- /dev/null
+++ "b/ModPatches/Revia Race \342\200\224 biotech/Patches/Revia Race \342\200\224 biotech/Scenario/Revia_Scenario.xml"	
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ScenarioDef[defName="ReviaExclave"]/scenario/parts/li[thingDef="ReviaThrowingKnife" and @Class="ScenPart_StartingThing_Defined"]</xpath>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="ReviaExclave"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>ReviaThrowingKnife</thingDef>
+				<count>20</count>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git "a/ModPatches/Revia Race \342\200\224 biotech/Patches/Revia Race \342\200\224 biotech/ThingDefs_Misc/Weapons_Guns.xml" "b/ModPatches/Revia Race \342\200\224 biotech/Patches/Revia Race \342\200\224 biotech/ThingDefs_Misc/Weapons_Guns.xml"
new file mode 100644
index 0000000000..b7b5b7f3fc
--- /dev/null
+++ "b/ModPatches/Revia Race \342\200\224 biotech/Patches/Revia Race \342\200\224 biotech/ThingDefs_Misc/Weapons_Guns.xml"	
@@ -0,0 +1,649 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==========  Ranged  =========== -->
+	<!-- ==========  Throwing knife  =========== -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="ReviaThrowingKnife"]/costStuffCount</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="ReviaThrowingKnife"]/stuffCategories</xpath>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ReviaThrowingKnifeThrown"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<damageDef>RangedStab</damageDef>
+				<damageAmountBase>14</damageAmountBase>
+				<flyOverhead>false</flyOverhead>
+				<speed>16</speed>
+				<armorPenetrationBlunt>0.12</armorPenetrationBlunt>
+				<armorPenetrationSharp>0.18</armorPenetrationSharp>
+				<preExplosionSpawnChance>0.80</preExplosionSpawnChance>
+				<preExplosionSpawnThingDef>ReviaThrowingKnife</preExplosionSpawnThingDef>
+			</projectile>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ReviaThrowingKnife"]</xpath>
+		<value>
+			<thingClass>CombatExtended.AmmoThing</thingClass>
+			<stackLimit>75</stackLimit>
+			<resourceReadoutPriority>First</resourceReadoutPriority>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="ReviaThrowingKnife"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ReviaThrowingKnife</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<Bulk>0.35</Bulk>
+			<Mass>0.15</Mass>
+			<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>10</Steel>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>ReviaThrowingKnifeThrown</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>16</range>
+			<soundCast>Interact_BeatFire</soundCast>
+			<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+		</Properties>
+		<weaponTags>
+			<li>ReviaRangedBasic</li>
+		</weaponTags>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ReviaThrowingKnife"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.28</cooldownTime>
+					<chanceFactor>1.12</chanceFactor>
+					<armorPenetrationBlunt>0.14</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.12</cooldownTime>
+					<chanceFactor>1.88</chanceFactor>
+					<armorPenetrationBlunt>0.12</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.24</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ==========  Repeating crossbow  =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ReviaRepeatingCrossbow"]/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>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ReviaRepeatingCrossbow</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<Bulk>4.0</Bulk>
+			<Mass>2.55</Mass>
+			<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>10</Steel>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Projectile_CrossbowBolt_Steel</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>22</range>
+			<burstShotCount>6</burstShotCount>
+			<soundCast>Bow_Small</soundCast>
+			<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+		</Properties>
+		<weaponTags>
+			<li>ReviaRangedAdvanced</li>
+		</weaponTags>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>6.6</reloadTime>
+			<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+	<!-- ==========  Shard cannon  =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ReviaFlechetteCannon"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetrationBlunt>0.24</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Gash</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.9</cooldownTime>
+					<armorPenetrationBlunt>0.85</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.74</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ReviaFlechetteCannon</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<Bulk>10.0</Bulk>
+			<Mass>8.0</Mass>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>1.45</SwayFactor>
+			<RangedWeapon_Cooldown>1.15</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>10</Steel>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>21</range>
+			<recoilAmount>2.35</recoilAmount>
+			<burstShotCount>3</burstShotCount>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+		</Properties>
+		<weaponTags>
+			<li>ReviaRangedAdvanced</li>
+		</weaponTags>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4.8</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+	<!-- ==========  Melee  =========== -->
+	<!-- ==========  Eviscerator  =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ReviaSerratedDagger"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.38</cooldownTime>
+					<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.38</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.6</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Gash</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.3</cooldownTime>
+					<chanceFactor>1.243</chanceFactor>
+					<armorPenetrationBlunt>0.518</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.47</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ReviaSerratedDagger"]/statBases</xpath>
+		<value>
+			<Bulk>1.5</Bulk>
+			<MeleeCounterParryBonus>0.36</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ReviaSerratedDagger"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.43</MeleeCritChance>
+				<MeleeParryChance>0.14</MeleeParryChance>
+				<MeleeDodgeChance>0.11</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<!-- ==========  Crimson Blossom  =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ReviaBlessedSerratedDagger"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.07</cooldownTime>
+					<armorPenetrationBlunt>0.98</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.07</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>0.98</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.64</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Gash</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.03</cooldownTime>
+					<chanceFactor>1.243</chanceFactor>
+					<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.14</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ReviaBlessedSerratedDagger"]/statBases</xpath>
+		<value>
+			<Bulk>1.5</Bulk>
+			<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ReviaBlessedSerratedDagger"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.5</MeleeCritChance>
+				<MeleeParryChance>0.19</MeleeParryChance>
+				<MeleeDodgeChance>0.14</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<!-- ==========  Scourge  =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ReviaSerratedSword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.66</cooldownTime>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Gash</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>1.66</cooldownTime>
+					<chanceFactor>1.062</chanceFactor>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.84</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Gash</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.7</cooldownTime>
+					<chanceFactor>1.322</chanceFactor>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ReviaSerratedSword"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ReviaSerratedSword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.31</MeleeCritChance>
+				<MeleeParryChance>0.4</MeleeParryChance>
+				<MeleeDodgeChance>0.27</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<!-- ==========  Red Inquisitor  =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ReviaBlessedSerratedSword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.38</cooldownTime>
+					<armorPenetrationBlunt>1.08</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Gash</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.44</cooldownTime>
+					<chanceFactor>1.062</chanceFactor>
+					<armorPenetrationBlunt>2.168</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.97</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Gash</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>1.38</cooldownTime>
+					<chanceFactor>1.322</chanceFactor>
+					<armorPenetrationBlunt>1.08</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.2</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ReviaBlessedSerratedSword"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<MeleeCounterParryBonus>0.44</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ReviaBlessedSerratedSword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.37</MeleeCritChance>
+				<MeleeParryChance>0.44</MeleeParryChance>
+				<MeleeDodgeChance>0.27</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<!-- ==========  Harvester  =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ReviaSerratedScythe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2.46</cooldownTime>
+					<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Gash</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.63</cooldownTime>
+					<chanceFactor>1.122</chanceFactor>
+					<armorPenetrationBlunt>5.058</armorPenetrationBlunt>
+					<armorPenetrationSharp>3.38</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ReviaSerratedScythe"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>0.69</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ReviaSerratedScythe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.1</MeleeCritChance>
+				<MeleeParryChance>0.63</MeleeParryChance>
+				<MeleeDodgeChance>0.67</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<!-- ==========  Shatterer  =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ReviaWarPick"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2.46</cooldownTime>
+					<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Demolish</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>2.56</cooldownTime>
+					<chanceFactor>0.3</chanceFactor>
+					<armorPenetrationBlunt>16.76</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Gash</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2.83</cooldownTime>
+					<chanceFactor>0.55</chanceFactor>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<armorPenetrationSharp>4</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ReviaWarPick"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>0.69</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ReviaWarPick"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeHitChance>-8</MeleeHitChance>
+				<MeleeCritChance>0.1</MeleeCritChance>
+				<MeleeParryChance>0.63</MeleeParryChance>
+				<MeleeDodgeChance>0.67</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<!-- ========== Vermillion Tide  =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ReviaBlessedSerratedScythe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.67</cooldownTime>
+					<armorPenetrationBlunt>3.44</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Gash</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.87</cooldownTime>
+					<armorPenetrationBlunt>8.47</armorPenetrationBlunt>
+					<armorPenetrationSharp>5.65</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ReviaBlessedSerratedScythe"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>0.77</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ReviaBlessedSerratedScythe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.1</MeleeCritChance>
+				<MeleeParryChance>0.69</MeleeParryChance>
+				<MeleeDodgeChance>0.73</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<!-- ==========  Shredder  =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ReviaChainSword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2.65</cooldownTime>
+					<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Gash</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.96</cooldownTime>
+					<chanceFactor>1.2</chanceFactor>
+					<armorPenetrationBlunt>6.48</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.44</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ReviaChainSword"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ReviaChainSword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.08</MeleeCritChance>
+				<MeleeParryChance>0.3</MeleeParryChance>
+				<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git "a/ModPatches/Revia Race \342\200\224 biotech/Patches/Revia Race \342\200\224 biotech/ThingDefs_Races/Race_Revia.xml" "b/ModPatches/Revia Race \342\200\224 biotech/Patches/Revia Race \342\200\224 biotech/ThingDefs_Races/Race_Revia.xml"
new file mode 100644
index 0000000000..f4700a9f3c
--- /dev/null
+++ "b/ModPatches/Revia Race \342\200\224 biotech/Patches/Revia Race \342\200\224 biotech/ThingDefs_Races/Race_Revia.xml"	
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--      
+	Making them less suppressible the more tails they get (See mod page for what that means, for comparison it takes 100 corpses sacrificed to get to tier 9)
+	Soulreap tier 1 is their base state, weaker than a normal human so not adding any for that. -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ReviaRaceSoulreapTier2"]/stages/li/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.05</Suppressability>
+			<!-- Once they got their first upgrade they become a bit more fearless -->
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ReviaRaceSoulreapTier3"]/stages/li</xpath>
+		<value>
+			<statOffsets>
+				<Suppressability>-0.1</Suppressability>
+			</statOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ReviaRaceSoulreapTier4"]/stages/li/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.20</Suppressability>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ReviaRaceSoulreapTier5"]/stages/li/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.30</Suppressability>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ReviaRaceSoulreapTier6"]/stages/li/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.4</Suppressability>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ReviaRaceSoulreapTier7"]/stages/li/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.5</Suppressability>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ReviaRaceSoulreapTier8"]/stages/li/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.7</Suppressability>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ReviaRaceSoulreapTier9"]/stages/li/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.9</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ReviaClaws"]/comps/li/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.350</armorPenetrationBlunt>
+
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ReviaTeeth"]/comps/li/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.75</cooldownTime>
+					<armorPenetrationSharp>0.180</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.350</armorPenetrationBlunt>
+
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Revia Race/Defs/Revia Race/Recipes_Revia.xml b/ModPatches/Revia Race/Defs/Revia Race/Recipes_Revia.xml
new file mode 100644
index 0000000000..7be3e715af
--- /dev/null
+++ b/ModPatches/Revia Race/Defs/Revia Race/Recipes_Revia.xml	
@@ -0,0 +1,34 @@
+
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- == Recipe == -->
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeReviaThrowingKnife</defName>
+		<label>make throwing knives x10</label>
+		<description>Craft 10 throwing knives.</description>
+		<jobString>Making throwing knives.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<ReviaThrowingKnife>10</ReviaThrowingKnife>
+		</products>
+		<recipeUsers>
+			<li>CraftingSpot</li>
+		</recipeUsers>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Revia Race/Patches/Revia Race/PawnKindDefs/ReviaPawnKindDefs.xml b/ModPatches/Revia Race/Patches/Revia Race/PawnKindDefs/ReviaPawnKindDefs.xml
new file mode 100644
index 0000000000..85960ce356
--- /dev/null
+++ b/ModPatches/Revia Race/Patches/Revia Race/PawnKindDefs/ReviaPawnKindDefs.xml	
@@ -0,0 +1,269 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Revia Marauder-->
+	<!--Berserker-->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/PawnKindDef[defName="ReviaRaceBerserker"]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<sidearms>
+					<li>
+						<weaponTags>
+							<li>ReviaMeleeAdvanced</li>
+							<li>ReviaMeleeLegendary</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="ReviaRaceBerserker"]/apparelTags</xpath>
+		<value>
+			<li>CE_Apparel_TacVest</li>
+			<li>CE_Apparel_Backpack</li>
+			<li>CE_Apparel_TribalBackpack</li>
+		</value>
+	</Operation>
+	<!--Marauder-->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/PawnKindDef[defName="ReviaRaceMarauder"]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>10</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.2</generateChance>
+						<sidearmMoney>
+							<min>40</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>ReviaMeleeBasic</li>
+							<li>ReviaMeleeIntermediate</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="ReviaRaceMarauder"]/apparelTags</xpath>
+		<value>
+			<li>CE_Apparel_TacVest</li>
+			<li>CE_Apparel_Backpack</li>
+			<li>CE_Apparel_TribalBackpack</li>
+		</value>
+	</Operation>
+	<!--Raider-->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/PawnKindDef[defName="ReviaRaceRaider"]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<sidearms>
+					<li>
+						<generateChance>0.2</generateChance>
+						<sidearmMoney>
+							<min>10</min>
+							<max>20</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+							<li>ReviaMeleeBasic</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="ReviaRaceRaider"]/apparelTags</xpath>
+		<value>
+			<li>CE_Apparel_TacVest</li>
+			<li>CE_Apparel_Backpack</li>
+			<li>CE_Apparel_TribalBackpack</li>
+		</value>
+	</Operation>
+	<!--Skullshatterer-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="ReviaRaceSkullshatterer"]/apparelTags</xpath>
+		<value>
+			<li>CE_Apparel_TacVest</li>
+			<li>CE_Apparel_Backpack</li>
+			<li>CE_Apparel_TribalBackpack</li>
+		</value>
+	</Operation>
+	<!--Revia Templar-->
+	<!--High Templar-->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/PawnKindDef[defName="ReviaRaceHighTemplar"]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<magazineCount>
+							<min>1</min>
+							<max>3</max>
+						</magazineCount>
+						<generateChance>0.6</generateChance>
+						<weaponTags>
+							<li>ReviaMeleeLegendary</li>
+							<li>ReviaRangedAdvanced</li>
+							<li>CE_Sidearm</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="ReviaRaceHighTemplar"]/apparelRequired</xpath>
+		<value>
+			<li>CE_Apparel_TacVest</li>
+			<li>CE_Apparel_Backpack</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="ReviaRaceHighTemplar"]/apparelTags</xpath>
+		<value>
+			<li>CE_Apparel_TacVest</li>
+			<li>CE_Apparel_Backpack</li>
+			<li>CE_Apparel_TribalBackpack</li>
+		</value>
+	</Operation>
+	<!--Initiate-->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/PawnKindDef[defName="ReviaRaceInitiate"]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<magazineCount>
+							<min>1</min>
+							<max>3</max>
+						</magazineCount>
+						<generateChance>0.5</generateChance>
+						<weaponTags>
+							<li>ReviaRangedAdvanced</li>
+							<li>CE_Sidearm</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="ReviaRaceInitiate"]/apparelTags</xpath>
+		<value>
+			<li>CE_Apparel_TacVest</li>
+			<li>CE_Apparel_Backpack</li>
+			<li>CE_Apparel_TribalBackpack</li>
+		</value>
+	</Operation>
+	<!--Quartermaster-->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/PawnKindDef[defName="ReviaRaceQuartermaster"]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<magazineCount>
+							<min>1</min>
+							<max>3</max>
+						</magazineCount>
+						<generateChance>0.5</generateChance>
+						<weaponTags>
+							<li>ReviaMeleeAdvanced</li>
+							<li>CE_Sidearm</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="ReviaRaceQuartermaster"]/apparelRequired</xpath>
+		<value>
+			<li>CE_Apparel_TacVest</li>
+			<li>CE_Apparel_Backpack</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="ReviaRaceQuartermaster"]/apparelTags</xpath>
+		<value>
+			<li>CE_Apparel_TacVest</li>
+			<li>CE_Apparel_Backpack</li>
+			<li>CE_Apparel_TribalBackpack</li>
+		</value>
+	</Operation>
+	<!--Templar-->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/PawnKindDef[defName="ReviaRaceTemplar"]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<magazineCount>
+							<min>1</min>
+							<max>3</max>
+						</magazineCount>
+						<generateChance>0.5</generateChance>
+						<weaponTags>
+							<li>ReviaMeleeAdvanced</li>
+							<li>ReviaMeleeLegendary</li>
+							<li>CE_Sidearm</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="ReviaRaceTemplar"]/apparelRequired</xpath>
+		<value>
+			<li>CE_Apparel_TacVest</li>
+			<li>CE_Apparel_Backpack</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="ReviaRaceTemplar"]/apparelTags</xpath>
+		<value>
+			<li>CE_Apparel_TacVest</li>
+			<li>CE_Apparel_Backpack</li>
+			<li>CE_Apparel_TribalBackpack</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Revia Race/Patches/Revia Race/Scenario/Revia_Scenario.xml b/ModPatches/Revia Race/Patches/Revia Race/Scenario/Revia_Scenario.xml
new file mode 100644
index 0000000000..86f1039deb
--- /dev/null
+++ b/ModPatches/Revia Race/Patches/Revia Race/Scenario/Revia_Scenario.xml	
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ScenarioDef[defName="ReviaExclave"]/scenario/parts/li[thingDef="ReviaThrowingKnife" and @Class="ScenPart_StartingThing_Defined"]</xpath>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="ReviaExclave"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>ReviaThrowingKnife</thingDef>
+				<count>20</count>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Revia Race/Patches/Revia Race/ThingDefs_Bodies/Revia_Bodytype.xml b/ModPatches/Revia Race/Patches/Revia Race/ThingDefs_Bodies/Revia_Bodytype.xml
new file mode 100644
index 0000000000..af45e21886
--- /dev/null
+++ b/ModPatches/Revia Race/Patches/Revia Race/ThingDefs_Bodies/Revia_Bodytype.xml	
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Patch Revian Bodytype-->
+
+	<!-- Changing coverage of the bodyDef (should've done this sooner, but eh) -->
+	<!-- why yes dear explorer of this file, i did just literally copy and paste the ShekBody bodytype patches -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Ribcage"]/coverage</xpath>
+		<value>
+			<coverage>0.07</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Pelvis"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Stomach"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Heart"]/coverage</xpath>
+		<value>
+			<coverage>0.04</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Lung"]/coverage</xpath>
+		<value>
+			<coverage>0.055</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Kidney"]/coverage</xpath>
+		<value>
+			<coverage>0.03</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Liver"]/coverage</xpath>
+		<value>
+			<coverage>0.06</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Neck"]/coverage</xpath>
+		<value>
+			<coverage>0.055</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Skull"]/parts/li[def="Brain"]/coverage</xpath>
+		<value>
+			<coverage>0.9</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Eye"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/coverage</xpath>
+		<value>
+			<coverage>0.08</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Shoulder"]/coverage</xpath>
+		<value>
+			<coverage>0.085</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Clavicle"]/coverage</xpath>
+		<value>
+			<coverage>0.06</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Humerus"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Radius"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="ReviaRaceTail"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Femur"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Tibia"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="ReviaRaceBody"]//*[
+			def="Torso" or
+			def="Neck" or
+			def="Head" or
+			def="Jaw" or
+			def="Ear" or
+			def="Nose" or
+			def="Shoulder" or
+			def="Arm" or
+			def="Hand" or
+			def="Finger" or
+			def="Foot" or
+			def="Toe" or
+			def="Leg"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="ReviaRaceBody"]//*[
+			def="Jaw" or
+			def="Nose" or
+			def="Eye"]/groups
+		</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<!--Arm Groups-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Revia Race/Patches/Revia Race/ThingDefs_Misc/Weapons_Guns.xml b/ModPatches/Revia Race/Patches/Revia Race/ThingDefs_Misc/Weapons_Guns.xml
new file mode 100644
index 0000000000..b7b5b7f3fc
--- /dev/null
+++ b/ModPatches/Revia Race/Patches/Revia Race/ThingDefs_Misc/Weapons_Guns.xml	
@@ -0,0 +1,649 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==========  Ranged  =========== -->
+	<!-- ==========  Throwing knife  =========== -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="ReviaThrowingKnife"]/costStuffCount</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="ReviaThrowingKnife"]/stuffCategories</xpath>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ReviaThrowingKnifeThrown"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<damageDef>RangedStab</damageDef>
+				<damageAmountBase>14</damageAmountBase>
+				<flyOverhead>false</flyOverhead>
+				<speed>16</speed>
+				<armorPenetrationBlunt>0.12</armorPenetrationBlunt>
+				<armorPenetrationSharp>0.18</armorPenetrationSharp>
+				<preExplosionSpawnChance>0.80</preExplosionSpawnChance>
+				<preExplosionSpawnThingDef>ReviaThrowingKnife</preExplosionSpawnThingDef>
+			</projectile>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ReviaThrowingKnife"]</xpath>
+		<value>
+			<thingClass>CombatExtended.AmmoThing</thingClass>
+			<stackLimit>75</stackLimit>
+			<resourceReadoutPriority>First</resourceReadoutPriority>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="ReviaThrowingKnife"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ReviaThrowingKnife</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<Bulk>0.35</Bulk>
+			<Mass>0.15</Mass>
+			<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>10</Steel>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>ReviaThrowingKnifeThrown</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>16</range>
+			<soundCast>Interact_BeatFire</soundCast>
+			<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+		</Properties>
+		<weaponTags>
+			<li>ReviaRangedBasic</li>
+		</weaponTags>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ReviaThrowingKnife"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.28</cooldownTime>
+					<chanceFactor>1.12</chanceFactor>
+					<armorPenetrationBlunt>0.14</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.12</cooldownTime>
+					<chanceFactor>1.88</chanceFactor>
+					<armorPenetrationBlunt>0.12</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.24</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ==========  Repeating crossbow  =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ReviaRepeatingCrossbow"]/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>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ReviaRepeatingCrossbow</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<Bulk>4.0</Bulk>
+			<Mass>2.55</Mass>
+			<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>10</Steel>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Projectile_CrossbowBolt_Steel</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>22</range>
+			<burstShotCount>6</burstShotCount>
+			<soundCast>Bow_Small</soundCast>
+			<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+		</Properties>
+		<weaponTags>
+			<li>ReviaRangedAdvanced</li>
+		</weaponTags>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>6.6</reloadTime>
+			<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+	<!-- ==========  Shard cannon  =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ReviaFlechetteCannon"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetrationBlunt>0.24</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Gash</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.9</cooldownTime>
+					<armorPenetrationBlunt>0.85</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.74</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ReviaFlechetteCannon</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<Bulk>10.0</Bulk>
+			<Mass>8.0</Mass>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>1.45</SwayFactor>
+			<RangedWeapon_Cooldown>1.15</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>10</Steel>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>21</range>
+			<recoilAmount>2.35</recoilAmount>
+			<burstShotCount>3</burstShotCount>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+		</Properties>
+		<weaponTags>
+			<li>ReviaRangedAdvanced</li>
+		</weaponTags>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4.8</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+	<!-- ==========  Melee  =========== -->
+	<!-- ==========  Eviscerator  =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ReviaSerratedDagger"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.38</cooldownTime>
+					<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.38</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.6</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Gash</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.3</cooldownTime>
+					<chanceFactor>1.243</chanceFactor>
+					<armorPenetrationBlunt>0.518</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.47</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ReviaSerratedDagger"]/statBases</xpath>
+		<value>
+			<Bulk>1.5</Bulk>
+			<MeleeCounterParryBonus>0.36</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ReviaSerratedDagger"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.43</MeleeCritChance>
+				<MeleeParryChance>0.14</MeleeParryChance>
+				<MeleeDodgeChance>0.11</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<!-- ==========  Crimson Blossom  =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ReviaBlessedSerratedDagger"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.07</cooldownTime>
+					<armorPenetrationBlunt>0.98</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.07</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>0.98</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.64</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Gash</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.03</cooldownTime>
+					<chanceFactor>1.243</chanceFactor>
+					<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.14</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ReviaBlessedSerratedDagger"]/statBases</xpath>
+		<value>
+			<Bulk>1.5</Bulk>
+			<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ReviaBlessedSerratedDagger"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.5</MeleeCritChance>
+				<MeleeParryChance>0.19</MeleeParryChance>
+				<MeleeDodgeChance>0.14</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<!-- ==========  Scourge  =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ReviaSerratedSword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.66</cooldownTime>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Gash</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>1.66</cooldownTime>
+					<chanceFactor>1.062</chanceFactor>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.84</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Gash</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.7</cooldownTime>
+					<chanceFactor>1.322</chanceFactor>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ReviaSerratedSword"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ReviaSerratedSword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.31</MeleeCritChance>
+				<MeleeParryChance>0.4</MeleeParryChance>
+				<MeleeDodgeChance>0.27</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<!-- ==========  Red Inquisitor  =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ReviaBlessedSerratedSword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.38</cooldownTime>
+					<armorPenetrationBlunt>1.08</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Gash</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.44</cooldownTime>
+					<chanceFactor>1.062</chanceFactor>
+					<armorPenetrationBlunt>2.168</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.97</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Gash</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>1.38</cooldownTime>
+					<chanceFactor>1.322</chanceFactor>
+					<armorPenetrationBlunt>1.08</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.2</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ReviaBlessedSerratedSword"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<MeleeCounterParryBonus>0.44</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ReviaBlessedSerratedSword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.37</MeleeCritChance>
+				<MeleeParryChance>0.44</MeleeParryChance>
+				<MeleeDodgeChance>0.27</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<!-- ==========  Harvester  =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ReviaSerratedScythe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2.46</cooldownTime>
+					<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Gash</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.63</cooldownTime>
+					<chanceFactor>1.122</chanceFactor>
+					<armorPenetrationBlunt>5.058</armorPenetrationBlunt>
+					<armorPenetrationSharp>3.38</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ReviaSerratedScythe"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>0.69</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ReviaSerratedScythe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.1</MeleeCritChance>
+				<MeleeParryChance>0.63</MeleeParryChance>
+				<MeleeDodgeChance>0.67</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<!-- ==========  Shatterer  =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ReviaWarPick"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2.46</cooldownTime>
+					<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Demolish</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>2.56</cooldownTime>
+					<chanceFactor>0.3</chanceFactor>
+					<armorPenetrationBlunt>16.76</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Gash</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2.83</cooldownTime>
+					<chanceFactor>0.55</chanceFactor>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<armorPenetrationSharp>4</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ReviaWarPick"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>0.69</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ReviaWarPick"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeHitChance>-8</MeleeHitChance>
+				<MeleeCritChance>0.1</MeleeCritChance>
+				<MeleeParryChance>0.63</MeleeParryChance>
+				<MeleeDodgeChance>0.67</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<!-- ========== Vermillion Tide  =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ReviaBlessedSerratedScythe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.67</cooldownTime>
+					<armorPenetrationBlunt>3.44</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Gash</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.87</cooldownTime>
+					<armorPenetrationBlunt>8.47</armorPenetrationBlunt>
+					<armorPenetrationSharp>5.65</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ReviaBlessedSerratedScythe"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>0.77</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ReviaBlessedSerratedScythe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.1</MeleeCritChance>
+				<MeleeParryChance>0.69</MeleeParryChance>
+				<MeleeDodgeChance>0.73</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<!-- ==========  Shredder  =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ReviaChainSword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2.65</cooldownTime>
+					<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Gash</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.96</cooldownTime>
+					<chanceFactor>1.2</chanceFactor>
+					<armorPenetrationBlunt>6.48</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.44</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ReviaChainSword"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ReviaChainSword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.08</MeleeCritChance>
+				<MeleeParryChance>0.3</MeleeParryChance>
+				<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Revia Race/Patches/Revia Race/ThingDefs_Races/Race_Revia.xml b/ModPatches/Revia Race/Patches/Revia Race/ThingDefs_Races/Race_Revia.xml
new file mode 100644
index 0000000000..cd74a8617a
--- /dev/null
+++ b/ModPatches/Revia Race/Patches/Revia Race/ThingDefs_Races/Race_Revia.xml	
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ReviaRaceAlien"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ReviaRaceAlien"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ReviaRaceAlien"]</xpath>
+			<value>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ReviaRaceAlien"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!--
+      Juanfrank
+      https://github.com/Juanfrank/Revia4Nalesh-and-someoneinapt/
+      
+Making them less suppressible the more tails they get (See mod page for what that means, for comparison it takes 100 corpses sacrificed to get to tier 9)
+Soulreap tier 1 is their base state, weaker than a normal human so not adding any for that. -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ReviaRaceSoulreapTier2"]/stages/li/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.05</Suppressability>
+			<!-- Once they got their first upgrade they become a bit more fearless -->
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ReviaRaceSoulreapTier3"]/stages/li</xpath>
+		<value>
+			<statOffsets>
+				<Suppressability>-0.1</Suppressability>
+			</statOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ReviaRaceSoulreapTier4"]/stages/li/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.20</Suppressability>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ReviaRaceSoulreapTier5"]/stages/li/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.30</Suppressability>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ReviaRaceSoulreapTier6"]/stages/li/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.4</Suppressability>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ReviaRaceSoulreapTier7"]/stages/li/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.5</Suppressability>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ReviaRaceSoulreapTier8"]/stages/li/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.7</Suppressability>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ReviaRaceSoulreapTier9"]/stages/li/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.9</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ReviaRaceAlien"]/statBases</xpath>
+		<value>
+			<MeleeCritChance>1.1</MeleeCritChance>
+			<MeleeParryChance>1.15</MeleeParryChance>
+			<Suppressability>1</Suppressability>
+			<SmokeSensitivity>0.85</SmokeSensitivity>
+			<CarryBulk>25</CarryBulk>
+			<CarryWeight>40</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ReviaRaceAlien"]/alienRace/generalSettings/forcedRaceTraitEntries</xpath>
+		<value>
+			<li>
+				<defName>Bravery</defName>
+				<degree>-1</degree>
+				<chance>0</chance>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ReviaRaceAlien"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>1.20</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ReviaRaceAlien"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.350</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.350</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Bite</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.75</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.180</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.350</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim Contractors Arsenal/Patches/Rim Contractors Arsenal/PawnKindDefs/PawnKinds_Contractor.xml b/ModPatches/Rim Contractors Arsenal/Patches/Rim Contractors Arsenal/PawnKindDefs/PawnKinds_Contractor.xml
new file mode 100644
index 0000000000..1b57608f86
--- /dev/null
+++ b/ModPatches/Rim Contractors Arsenal/Patches/Rim Contractors Arsenal/PawnKindDefs/PawnKinds_Contractor.xml	
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="Contractor_Rifleman" or
+			defName="Contractor_Medic" or
+			defName="Contractor_Marksman" or
+			defName="Contractor_Assault" or
+			defName="Contractor_Gunner" or
+			defName="Contractor_Officer" or
+			defName="Contract_Militia"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.25</generateChance>
+						<sidearmMoney>
+							<min>500</min>
+							<max>800</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>ContractorMisc</li>
+						</weaponTags>
+					</li>
+					<li>
+						<generateChance>0.2</generateChance>
+						<sidearmMoney>
+							<min>10</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>GrenadeSmoke</li>
+							<li>GrenadeDestructive</li>
+							<li>CE_GrenadeFlashbang</li>
+						</weaponTags>
+						<magazineCount>
+							<min>0</min>
+							<max>1</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="Contractor_Explosives"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>550</min>
+						<max>1750</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>ContractorMisc</li>
+					</weaponTags>
+					<magazineCount>
+						<min>2</min>
+						<max>4</max>
+					</magazineCount>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim Contractors Arsenal/Patches/Rim Contractors Arsenal/ThingDefs_Misc/ApparelBodyArmour.xml b/ModPatches/Rim Contractors Arsenal/Patches/Rim Contractors Arsenal/ThingDefs_Misc/ApparelBodyArmour.xml
new file mode 100644
index 0000000000..782ad071f8
--- /dev/null
+++ b/ModPatches/Rim Contractors Arsenal/Patches/Rim Contractors Arsenal/ThingDefs_Misc/ApparelBodyArmour.xml	
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ContractorBodyArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>50</Mass>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ContractorBodyArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>21</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.45</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ContractorBodyArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>47.25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_ContractorBodyArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<ShootingAccuracyPawn>0.10</ShootingAccuracyPawn>
+			<CarryWeight>85</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ContractorBodyArmor"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>200</Plasteel>
+			<DevilstrandCloth>50</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_ContractorBodyArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim Contractors Arsenal/Patches/Rim Contractors Arsenal/ThingDefs_Misc/ApparelHeadgear.xml b/ModPatches/Rim Contractors Arsenal/Patches/Rim Contractors Arsenal/ThingDefs_Misc/ApparelHeadgear.xml
new file mode 100644
index 0000000000..7be90d1129
--- /dev/null
+++ b/ModPatches/Rim Contractors Arsenal/Patches/Rim Contractors Arsenal/ThingDefs_Misc/ApparelHeadgear.xml	
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ContractorArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>19</ArmorRating_Sharp>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ContractorArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>42.75</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Apparel_ContractorArmorHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Apparel_ContractorArmorHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_ContractorArmorHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+			<AimingAccuracy>0.10</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ContractorArmorHelmet"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>70</Plasteel>
+			<DevilstrandCloth>20</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_ContractorArmorHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim Contractors Arsenal/Patches/Rim Contractors Arsenal/ThingDefs_Misc/MeleeContractors.xml b/ModPatches/Rim Contractors Arsenal/Patches/Rim Contractors Arsenal/ThingDefs_Misc/MeleeContractors.xml
new file mode 100644
index 0000000000..f1747ff1bc
--- /dev/null
+++ b/ModPatches/Rim Contractors Arsenal/Patches/Rim Contractors Arsenal/ThingDefs_Misc/MeleeContractors.xml	
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Melee_ContractorsCombatKnife"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.18</cooldownTime>
+					<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
+					<armorPenetrationSharp>7.32</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.26</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>7.42</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Melee_ContractorsCombatKnife"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Melee_ContractorsCombatKnife"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.5</MeleeCritChance>
+				<MeleeParryChance>0.15</MeleeParryChance>
+				<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim Contractors Arsenal/Patches/Rim Contractors Arsenal/ThingDefs_Misc/RangedContractors.xml b/ModPatches/Rim Contractors Arsenal/Patches/Rim Contractors Arsenal/ThingDefs_Misc/RangedContractors.xml
new file mode 100644
index 0000000000..477685d809
--- /dev/null
+++ b/ModPatches/Rim Contractors Arsenal/Patches/Rim Contractors Arsenal/ThingDefs_Misc/RangedContractors.xml	
@@ -0,0 +1,823 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Gun_LNF35L" or
+			defName="Gun_B3500A" or
+			defName="Gun_M34A" or
+			defName="Gun_M168B" or
+			defName="Gun_M340V" or
+			defName="Gun_MS700G" or
+			defName="Gun_SLZ556S" or
+			defName="Gun_SCR" or
+			defName="Gun_AUGS" or
+			defName="Gun_HKCAS42A" or
+			defName="Gun_FAL450A" or
+			defName="Gun_M870C" or
+			defName="Gun_ML237S"
+			]/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_AT45A"]/tools</xpath>
+		<value>
+			<tools>
+				<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>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Gun_L45E" or
+			defName="Gun_RHSC120P"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--LNF35L - SCAR L, 6x24mm-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_LNF35L</defName>
+		<statBases>
+			<Bulk>6.35</Bulk>
+			<Mass>3.29</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.40</SightsEfficiency>
+			<SwayFactor>1.23</SwayFactor>
+			<ShotSpread>0.1</ShotSpread>
+			<WorkToMake>51500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<Plasteel>25</Plasteel>
+			<ComponentIndustrial>10</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.44</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
+			<warmupTime>1.25</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>Shot_LightRifleContractors</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!--B3500 - Mossberg 500, Charge 12 Gauge-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_B3500A</defName>
+		<statBases>
+			<Bulk>9.00</Bulk>
+			<Mass>3.00</Mass>
+			<RangedWeapon_Cooldown>1.00</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<SwayFactor>1.20</SwayFactor>
+			<ShotSpread>0.14</ShotSpread>
+			<WorkToMake>30500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>45</Steel>
+			<Plasteel>25</Plasteel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12GaugeCharged</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>29</range>
+			<soundCast>Shot_ShotgunPumpContractors</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_12GaugeCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!--L45E - M45, 6x18mm-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_L45E</defName>
+		<statBases>
+			<Bulk>2.10</Bulk>
+			<Mass>1.11</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<SwayFactor>1.07</SwayFactor>
+			<ShotSpread>0.17</ShotSpread>
+			<WorkToMake>16000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>20</Steel>
+			<Plasteel>20</Plasteel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>Shot_PistolContractors</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!--M34 A - M24, 8x35mm-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_M34A</defName>
+		<statBases>
+			<Bulk>11.92</Bulk>
+			<Mass>7.30</Mass>
+			<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.72</SightsEfficiency>
+			<SwayFactor>1.35</SwayFactor>
+			<ShotSpread>0.05</ShotSpread>
+			<WorkToMake>48500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>65</Steel>
+			<Plasteel>30</Plasteel>
+			<ComponentIndustrial>9</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
+			<warmupTime>1.9</warmupTime>
+			<range>75</range>
+			<soundCast>Shot_SniperBoltContractors</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!--M168B - M14 EBR, 8x35mm-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_M168B</defName>
+		<statBases>
+			<Bulk>8.89</Bulk>
+			<Mass>5.1</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.56</SightsEfficiency>
+			<SwayFactor>1.42</SwayFactor>
+			<ShotSpread>0.08</ShotSpread>
+			<WorkToMake>51500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>50</Steel>
+			<Plasteel>30</Plasteel>
+			<ComponentIndustrial>10</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.41</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>65</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>Shot_HeavyRifleContractors</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!--M340V - M240, 8x35mm-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_M340V</defName>
+		<statBases>
+			<Bulk>13.60</Bulk>
+			<Mass>12.50</Mass>
+			<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.20</SightsEfficiency>
+			<SwayFactor>1.77</SwayFactor>
+			<ShotSpread>0.04</ShotSpread>
+			<WorkToMake>57000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>20</Chemfuel>
+			<Steel>85</Steel>
+			<Plasteel>40</Plasteel>
+			<ComponentIndustrial>10</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>0.85</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
+			<warmupTime>1.3875</warmupTime>
+			<range>55</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>Shot_GPMGContractors</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!--MS700G - MP7, 6x18mm-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MS700G</defName>
+		<statBases>
+			<Bulk>4.15</Bulk>
+			<Mass>1.90</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<SwayFactor>0.83</SwayFactor>
+			<ShotSpread>0.15</ShotSpread>
+			<WorkToMake>46000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>30</Steel>
+			<Plasteel>20</Plasteel>
+			<ComponentIndustrial>9</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.89</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>31</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>Shot_SMGContractors</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!--RHSC120P, 8x35mm-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_RHSC120P</defName>
+		<statBases>
+			<Bulk>3.57</Bulk>
+			<Mass>2.20</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<SwayFactor>0.58</SwayFactor>
+			<ShotSpread>0.15</ShotSpread>
+			<WorkToMake>14000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>30</Steel>
+			<Plasteel>20</Plasteel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>Shot_PistolContractors</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!--SLZ556 - Steyr 556, 6x24mm-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SLZ556S</defName>
+		<statBases>
+			<Bulk>8.60</Bulk>
+			<Mass>3.70</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<SwayFactor>1.35</SwayFactor>
+			<ShotSpread>0.09</ShotSpread>
+			<WorkToMake>51000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>45</Steel>
+			<Plasteel>25</Plasteel>
+			<ComponentIndustrial>10</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.36</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>Shot_LightRifleContractors</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!--AUGS - Steyr AUG, 6x24mm-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AUGS</defName>
+		<statBases>
+			<Bulk>7.90</Bulk>
+			<Mass>3.60</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<SwayFactor>1.15</SwayFactor>
+			<ShotSpread>0.07</ShotSpread>
+			<WorkToMake>60000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>45</Steel>
+			<Plasteel>25</Plasteel>
+			<ComponentIndustrial>11</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.43</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>Shot_LightRifleContractors</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!--Divider - FN FAL, 8x35mm-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_FAL450A</defName>
+		<statBases>
+			<Bulk>11.90</Bulk>
+			<Mass>4.75</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.56</SightsEfficiency>
+			<SwayFactor>1.12</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<WorkToMake>53000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>55</Steel>
+			<Plasteel>30</Plasteel>
+			<ComponentIndustrial>10</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.43</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>62</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>Shot_HeavyRifleContractors</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!--ML2375 Devastator, 12x64mech-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_ML237S</defName>
+		<statBases>
+			<Bulk>12</Bulk>
+			<Mass>13.50</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>3.51</SightsEfficiency>
+			<SwayFactor>2.36</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<WorkToMake>59000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>20</Chemfuel>
+			<Steel>80</Steel>
+			<Plasteel>40</Plasteel>
+			<ComponentIndustrial>11</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12x72mmCharged</defaultProjectile>
+			<warmupTime>3.2</warmupTime>
+			<range>86</range>
+			<soundCast>Shot_HeavySniperContractors</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_12x72mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!--Phoenix - Charge 12 Gauge-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_HKCAS42A</defName>
+		<statBases>
+			<Bulk>7.62</Bulk>
+			<Mass>3.70</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<SwayFactor>1.13</SwayFactor>
+			<ShotSpread>0.08</ShotSpread>
+			<WorkToMake>48000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>45</Steel>
+			<Plasteel>25</Plasteel>
+			<ComponentIndustrial>10</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.88</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12GaugeCharged</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>25</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>13</ticksBetweenBurstShots>
+			<soundCast>Shot_ShotgunContractors</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_12GaugeCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!--SCR Survival Rifle-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SCR</defName>
+		<statBases>
+			<Bulk>11.55</Bulk>
+			<Mass>7.26</Mass>
+			<RangedWeapon_Cooldown>1.16</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<SwayFactor>1.88</SwayFactor>
+			<ShotSpread>0.04</ShotSpread>
+			<WorkToMake>51500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>65</Steel>
+			<Plasteel>30</Plasteel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+			<ComponentSpacer>1</ComponentSpacer>
+		</costList>
+		<Properties>
+			<recoilAmount>1.43</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>55</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>21</ticksBetweenBurstShots>
+			<soundCast>Shot_HeavyRifleContractors</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!--M870C , Fuel Cell-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_M870C</defName>
+		<statBases>
+			<Bulk>3.50</Bulk>
+			<Mass>1.50</Mass>
+			<RangedWeapon_Cooldown>0.69</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<SwayFactor>0.65</SwayFactor>
+			<ShotSpread>0.18</ShotSpread>
+			<WorkToMake>33500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>25</Steel>
+			<Plasteel>20</Plasteel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_30x64mmFuel_Incendiary</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>25</range>
+			<soundCast>Shot_GrenadeLauncherContractors</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
+			<reloadTime>1.6</reloadTime>
+			<ammoSet>AmmoSet_30x64mmFuel</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!--AT 45A Disintergrator-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AT45A</defName>
+		<statBases>
+			<Bulk>14.50</Bulk>
+			<Mass>13.45</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<SwayFactor>1.69</SwayFactor>
+			<ShotSpread>0.05</ShotSpread>
+			<WorkToMake>43500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>55</Steel>
+			<Plasteel>30</Plasteel>
+			<ComponentIndustrial>8</ComponentIndustrial>
+			<FSX>2</FSX>
+			<Chemfuel>5</Chemfuel>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_ContractorATRocket</defaultProjectile>
+			<warmupTime>1.8</warmupTime>
+			<range>40</range>
+			<burstShotCount>1</burstShotCount>
+			<soundCast>Shot_RPGContractors</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<muzzleFlashScale>14</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_ContractorATRocket"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.BulletCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_ContractorATRocket"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<damageDef>Bullet</damageDef>
+				<damageAmountBase>350</damageAmountBase>
+				<armorPenetrationSharp>600</armorPenetrationSharp>
+				<armorPenetrationBlunt>50</armorPenetrationBlunt>
+				<speed>77</speed>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Bullet_ContractorATRocket"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Bullet_ContractorATRocket"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Bullet_ContractorATRocket"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>160</damageAmountBase>
+				<explosiveDamageType>EMP</explosiveDamageType>
+				<explosiveRadius>2.5</explosiveRadius>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim Flood/Defs/Rim Flood/Projectiles_RimFlood.xml b/ModPatches/Rim Flood/Defs/Rim Flood/Projectiles_RimFlood.xml
new file mode 100644
index 0000000000..ef66c8348b
--- /dev/null
+++ b/ModPatches/Rim Flood/Defs/Rim Flood/Projectiles_RimFlood.xml	
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- Sentinels -->
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletRed">
+		<defName>Bullet_Laser_Sentinel</defName>
+		<label>laser beam</label>
+		<textures>
+			<li>Pawn/Forerunner/Sentinel_laser</li>
+		</textures>
+		<seam>0</seam>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>15</damageAmountBase>
+			<armorPenetrationSharp>15.75</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletBlue">
+		<defName>Bullet_Laser_SentinelChungus</defName>
+		<label>laser beam</label>
+		<textures>
+			<li>Pawn/Forerunner/Major_laser</li>
+		</textures>
+		<seam>0</seam>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>20</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<!-- Flood -->
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>FloodSpitfire_CE</defName>
+		<label>flood spore</label>
+		<thingClass>CombatExtended.BulletCE</thingClass>
+		<graphicData>
+			<texPath>Pawn/Flood/Body/spore_fire</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<flyOverhead>false</flyOverhead>
+			<speed>40</speed>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>15</damageAmountBase>
+			<armorPenetrationSharp>7</armorPenetrationSharp>
+			<armorPenetrationBlunt>16</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>FloodRangedfire_CE</defName>
+		<label>flood spore</label>
+		<thingClass>CombatExtended.BulletCE</thingClass>
+		<graphicData>
+			<texPath>Pawn/Flood/Body/spore_fire</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<flyOverhead>false</flyOverhead>
+			<speed>50</speed>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>11</damageAmountBase>
+			<armorPenetrationSharp>6</armorPenetrationSharp>
+			<armorPenetrationBlunt>12</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Rim Flood/Patches/Rim Flood/CE_FloodForms.xml b/ModPatches/Rim Flood/Patches/Rim Flood/CE_FloodForms.xml
new file mode 100644
index 0000000000..7bd337b9b3
--- /dev/null
+++ b/ModPatches/Rim Flood/Patches/Rim Flood/CE_FloodForms.xml	
@@ -0,0 +1,381 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="BaseFlood"]/statBases</xpath>
+		<value>
+			<SmokeSensitivity>0.05</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="BaseFlood"]/statBases</xpath>
+		<value>
+			<PainShockThreshold>0.99</PainShockThreshold>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="InfestForm" or defName="Combatform" or defName="FloodCarrier" or defName="Tankform"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Houndform" or defName="Pureform"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Stalkerform"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Houndform"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>6.2</MoveSpeed>
+			<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			<MeleeCritChance>0.17</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Combatform"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4.0</MoveSpeed>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.37</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FloodCarrier"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>2</MoveSpeed>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.31</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tankform"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>3.0</MoveSpeed>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.7</MeleeCritChance>
+			<MeleeParryChance>0.4</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Combatform"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Combatform"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Houndform"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Houndform"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tankform"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tankform"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>7</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="InfestForm"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Pureform"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.47</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Stalkerform"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.33</MeleeDodgeChance>
+			<MeleeCritChance>0.24</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="InfestForm"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>FloodMouth</label>
+					<capacities>
+						<li>FloodBite</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Combatform"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>18</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Houndform"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>7</armorPenetrationSharp>
+					<armorPenetrationBlunt>14</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tankform"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>20</armorPenetrationSharp>
+					<armorPenetrationBlunt>36</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>2.8</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>65</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FloodCarrier"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.75</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>8</armorPenetrationSharp>
+					<armorPenetrationBlunt>16</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>9</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Pureform"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>FloodMouth</label>
+					<capacities>
+						<li>FloodBite</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationSharp>22</armorPenetrationSharp>
+					<armorPenetrationBlunt>30</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Stalkerform"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>FloodMouth</label>
+					<capacities>
+						<li>FloodBite</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim Flood/Patches/Rim Flood/CE_Flood_Bodies.xml b/ModPatches/Rim Flood/Patches/Rim Flood/CE_Flood_Bodies.xml
new file mode 100644
index 0000000000..d32b6cbdac
--- /dev/null
+++ b/ModPatches/Rim Flood/Patches/Rim Flood/CE_Flood_Bodies.xml	
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Sentinel -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Sentinel"]//*[
+			def="Sentinelbody"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Sentinel"]//*[
+			def="Sentinelbody" or
+			def="ForerunnerHead"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- Flood -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Flood"]//*[
+			def="FloodBody" or
+			def="Nose"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Flood"]//*[
+			def="FloodBody" or
+			def="FloodHead" or
+			def="Nose" or
+			def="FloodMouth"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Flood"]//*[
+			def="Nose" or
+			def="FloodMouth"]/groups
+		</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim Flood/Patches/Rim Flood/CE_Flood_Bodyparts.xml b/ModPatches/Rim Flood/Patches/Rim Flood/CE_Flood_Bodyparts.xml
new file mode 100644
index 0000000000..32376506e3
--- /dev/null
+++ b/ModPatches/Rim Flood/Patches/Rim Flood/CE_Flood_Bodyparts.xml	
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyPartDef[defName="FloodBody"]/hitPoints</xpath>
+		<value>
+			<hitPoints>40</hitPoints>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim Flood/Patches/Rim Flood/CE_Forerunnermetal.xml b/ModPatches/Rim Flood/Patches/Rim Flood/CE_Forerunnermetal.xml
new file mode 100644
index 0000000000..6c0446147f
--- /dev/null
+++ b/ModPatches/Rim Flood/Patches/Rim Flood/CE_Forerunnermetal.xml	
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Forerunner -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Forerunner_Metal"]/statBases</xpath>
+		<value>
+			<Bulk>0.025</Bulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Forerunner_Metal"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>0.9</Mass>
+			<MeleePenetrationFactor>2.25</MeleePenetrationFactor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Forerunner_Metal"]/statBases/SharpDamageMultiplier</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Forerunner_Metal"]/statBases/BluntDamageMultiplier</xpath>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Forerunner_Metal"]/stuffProps/categories</xpath>
+		<value>
+			<li>Metallic_Weapon</li>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Forerunner_Metal"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>2.4</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Forerunner_Metal"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>3.6</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Forerunner_Metal"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.15</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim Flood/Patches/Rim Flood/CE_Forerunners.xml b/ModPatches/Rim Flood/Patches/Rim Flood/CE_Forerunners.xml
new file mode 100644
index 0000000000..d6f9525df1
--- /dev/null
+++ b/ModPatches/Rim Flood/Patches/Rim Flood/CE_Forerunners.xml	
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="BaseForerunner"]/statBases</xpath>
+		<value>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="BaseForerunner"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>1</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Sentinel" or defName="SentinelMajor" or defName="Forerunnerspawn" or defName="Constructor"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Sentinel"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Sentinel"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SentinelMajor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SentinelMajor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Forerunnerspawn"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Forerunnerspawn"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Constructor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Constructor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Sentinel" or defName="SentinelMajor" or defName="Forerunnerspawn" or defName="Constructor"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>0.37</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Sentinel" or defName="SentinelMajor" or defName="Forerunnerspawn" or defName="Constructor"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Sentinel blast</label>
+					<capacities>
+						<li>Sentinelblast</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>ForerunnerHeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationSharp>20</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim Flood/Patches/Rim Flood/Flood_Turrets.xml b/ModPatches/Rim Flood/Patches/Rim Flood/Flood_Turrets.xml
new file mode 100644
index 0000000000..711508594b
--- /dev/null
+++ b/ModPatches/Rim Flood/Patches/Rim Flood/Flood_Turrets.xml	
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Replace vanilla thingClass -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Rangedform" or defName = "Flood_Spitter"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<!-- Make turrets taller -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Rangedform" or defName = "Flood_Spitter"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Rangedform" or defName = "Flood_Spitter"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.25</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "Rangedform" or defName = "Flood_Spitter"]/statBases/ShootingAccuracyTurret </xpath>
+		<value>
+			<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Rangedform" or defName = "Flood_Spitter" ]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>1.25</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<!-- Make the Turret usable -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Spitterbulb</defName>
+		<statBases>
+			<Mass>10.00</Mass>
+			<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>1.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.37</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>FloodSpitfire_CE</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>44</range>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<burstShotCount>2</burstShotCount>
+			<minRange>1.5</minRange>
+			<soundCast>BulletImpact_Flesh</soundCast>
+			<muzzleFlashScale>0</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Rangedtop</defName>
+		<statBases>
+			<Mass>10.00</Mass>
+			<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>1.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.27</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>FloodRangedfire_CE</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>50</range>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<burstShotCount>6</burstShotCount>
+			<minRange>1.5</minRange>
+			<soundCast>BulletImpact_Flesh</soundCast>
+			<muzzleFlashScale>0</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>6</aimedBurstShotCount>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim Flood/Patches/Rim Flood/Melee_Flood_CE.xml b/ModPatches/Rim Flood/Patches/Rim Flood/Melee_Flood_CE.xml
new file mode 100644
index 0000000000..aa191909e8
--- /dev/null
+++ b/ModPatches/Rim Flood/Patches/Rim Flood/Melee_Flood_CE.xml	
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- TENTACLES -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_flood"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.55</cooldownTime>
+					<armorPenetrationBlunt>17</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.55</cooldownTime>
+					<armorPenetrationBlunt>34</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_flood"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>0.25</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_flood"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.5</MeleeCritChance>
+				<MeleeParryChance>0.3</MeleeParryChance>
+				<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim Flood/Patches/Rim Flood/Pawnkind_Ammo_CE.xml b/ModPatches/Rim Flood/Patches/Rim Flood/Pawnkind_Ammo_CE.xml
new file mode 100644
index 0000000000..d066073115
--- /dev/null
+++ b/ModPatches/Rim Flood/Patches/Rim Flood/Pawnkind_Ammo_CE.xml	
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Flood Combat-->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="CombatformG"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>1</min>
+					<max>2</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim Flood/Patches/Rim Flood/Sentinel_Laser_CE.xml b/ModPatches/Rim Flood/Patches/Rim Flood/Sentinel_Laser_CE.xml
new file mode 100644
index 0000000000..afabbd141b
--- /dev/null
+++ b/ModPatches/Rim Flood/Patches/Rim Flood/Sentinel_Laser_CE.xml	
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Tools ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Sentinelbeam" or
+			defName="SentinelMajorbeam"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Patch Sentinel Laser -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Sentinelbeam</defName>
+		<statBases>
+			<Mass>10.00</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>1.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.37</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Laser_Sentinel</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>40</range>
+			<burstShotCount>1</burstShotCount>
+			<minRange>1.5</minRange>
+			<soundCast>Shot_Sentinelbeam</soundCast>
+			<muzzleFlashScale>3</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>SentinelMajorbeam</defName>
+		<statBases>
+			<Mass>10.00</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>1.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.27</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Laser_SentinelChungus</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>50</range>
+			<burstShotCount>1</burstShotCount>
+			<minRange>1.5</minRange>
+			<soundCast>Shot_SentinelMajor</soundCast>
+			<muzzleFlashScale>3</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim Gnoblins/Defs/Rim Gnoblins/Recipe_Toxpot.xml b/ModPatches/Rim Gnoblins/Defs/Rim Gnoblins/Recipe_Toxpot.xml
new file mode 100644
index 0000000000..17746d59f7
--- /dev/null
+++ b/ModPatches/Rim Gnoblins/Defs/Rim Gnoblins/Recipe_Toxpot.xml	
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- Recipe -->
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeToxPot</defName>
+		<label>make toxic grenade x10</label>
+		<description>Craft 10 toxic grenade.</description>
+		<jobString>Making toxic grenade.</jobString>
+		<researchPrerequisite>RG_ShardDistilleryAndWeaponry</researchPrerequisite>
+		<workAmount>4400</workAmount>
+		<recipeUsers>
+			<li>ElectricSmithy</li>
+			<li>FueledSmithy</li>
+			<li>CraftingSpot</li>
+		</recipeUsers>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>DregMethamphetamine</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>DregMethamphetamine</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<RGWeapon_Toxpot>10</RGWeapon_Toxpot>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Rim Gnoblins/Patches/Rim Gnoblins/Gnoblins_Drugs.xml b/ModPatches/Rim Gnoblins/Patches/Rim Gnoblins/Gnoblins_Drugs.xml
new file mode 100644
index 0000000000..669639e5ef
--- /dev/null
+++ b/ModPatches/Rim Gnoblins/Patches/Rim Gnoblins/Gnoblins_Drugs.xml	
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Patch statOffsets ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ShardHigh"]/stages/li/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.5</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="DregHigh"]/stages/li</xpath>
+		<value>
+			<statFactors>
+				<Suppressability>0.75</Suppressability>
+			</statFactors>
+		</value>
+	</Operation>
+
+	<!-- ========== Patch item bulk ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ShardMethamphetamine"]/statBases</xpath>
+		<value>
+			<Bulk>0.05</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DregMethamphetamine"]/statBases</xpath>
+		<value>
+			<Bulk>0.05</Bulk>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim Gnoblins/Patches/Rim Gnoblins/Gnoblins_Grenade.xml b/ModPatches/Rim Gnoblins/Patches/Rim Gnoblins/Gnoblins_Grenade.xml
new file mode 100644
index 0000000000..dcad88231f
--- /dev/null
+++ b/ModPatches/Rim Gnoblins/Patches/Rim Gnoblins/Gnoblins_Grenade.xml	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Kill recipe maker ========== -->
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="RGWeapon_Toxpot"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>BaseWeapon</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RGWeapon_Toxpot"]/recipeMaker</xpath>
+	</Operation>
+
+	<!-- ========== Melee tools ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RGWeapon_Toxpot"]</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Body</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.75</cooldownTime>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Projectile -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RGProj_ToxPot"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RGProj_ToxPot"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<explosionRadius>1.9</explosionRadius>
+				<damageDef>ToxGas</damageDef>
+				<explosionDelay>100</explosionDelay>
+				<postExplosionGasType>ToxGas</postExplosionGasType>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<speed>12</speed>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+				<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
+			</projectile>
+		</value>
+	</Operation>
+
+	<!-- Grenade -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RGWeapon_Toxpot"]/costList</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RGWeapon_Toxpot"]/graphicData/texPath</xpath>
+		<value>
+			<texPath>Items/Weapons/Toxpots/Toxpot_Flying</texPath>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RGWeapon_Toxpot"]</xpath>
+		<value>
+			<thingClass>CombatExtended.AmmoThing</thingClass>
+			<stackLimit>50</stackLimit>
+			<resourceReadoutPriority>First</resourceReadoutPriority>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="RGWeapon_Toxpot"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RGWeapon_Toxpot</defName>
+		<statBases>
+			<Mass>0.7</Mass>
+			<Bulk>1.05</Bulk>
+			<MarketValue>7.05</MarketValue>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<label>throw grenade</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<range>10</range>
+			<minRange>1.9</minRange>
+			<warmupTime>0.8</warmupTime>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<soundCast>ThrowMolotovCocktail</soundCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<defaultProjectile>RGProj_ToxPot</defaultProjectile>
+			<onlyManualCast>true</onlyManualCast>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+			<ai_AvoidFriendlyFireRadius>2</ai_AvoidFriendlyFireRadius>
+		</Properties>
+		<weaponTags>
+			<li>CE_AI_Grenade</li>
+			<li>CE_AI_AOE</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim Gnoblins/Patches/Rim Gnoblins/Gnoblins_Melee.xml b/ModPatches/Rim Gnoblins/Patches/Rim Gnoblins/Gnoblins_Melee.xml
new file mode 100644
index 0000000000..9d1863e7bf
--- /dev/null
+++ b/ModPatches/Rim Gnoblins/Patches/Rim Gnoblins/Gnoblins_Melee.xml	
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Patch stats -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RG_MeleeWeapon_ToxSpear"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.35</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.78</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>ScratchToxic</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.19</cooldownTime>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.25</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RG_MeleeWeapon_ToxSpear"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RG_MeleeWeapon_ToxSpear"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.17</MeleeCritChance>
+				<MeleeParryChance>1.45</MeleeParryChance>
+				<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim Gnoblins/Patches/Rim Gnoblins/Gnoblins_Pawnkind.xml b/ModPatches/Rim Gnoblins/Patches/Rim Gnoblins/Gnoblins_Pawnkind.xml
new file mode 100644
index 0000000000..a349e57e54
--- /dev/null
+++ b/ModPatches/Rim Gnoblins/Patches/Rim Gnoblins/Gnoblins_Pawnkind.xml	
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Give ammo to crosbowman-->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Gnoblin_Scout"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>20</min>
+					<max>30</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>50</min>
+						<max>100</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>NeolithicMeleeBasic</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Gnoblin_Ranger"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>20</min>
+					<max>30</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>100</min>
+						<max>200</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>NeolithicMeleeBasic</li>
+						<li>MedievalMeleeDecent</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Gnoblin_Lobber"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>12</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>100</min>
+						<max>200</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>NeolithicMeleeBasic</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Gnoblin_HeavyRanger"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>30</min>
+					<max>40</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>150</min>
+						<max>300</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>MedievalMeleeDecent</li>
+						<li>MedievalMeleeAdvanced</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[
+			defName="Gnoblin_Scout" or
+			defName="Gnoblin_Ranger" or
+			defname="Gnoblin_Lobber" or
+			defName="Gnoblin_HeavyRanger"]/apparelRequired</xpath>
+		<value>
+			<li>CE_Apparel_TribalBackpack</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="Gnoblin_Scout" or defName="Gnoblin_Ranger" or defName="Gnoblin_HeavyRanger"]/weaponTags</xpath>
+		<value>
+			<li>CE_Bow</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim Gnoblins/Patches/Rim Gnoblins/Gnoblins_Scenario.xml b/ModPatches/Rim Gnoblins/Patches/Rim Gnoblins/Gnoblins_Scenario.xml
new file mode 100644
index 0000000000..4749233c9f
--- /dev/null
+++ b/ModPatches/Rim Gnoblins/Patches/Rim Gnoblins/Gnoblins_Scenario.xml	
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="LostGnoblins"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_Arrow_Stone</thingDef>
+				<count>100</count>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="LostGnoblins"]/scenario/parts/li[@Class="ScenPart_StartingThing_Defined" and (thingDef="RGWeapon_Toxpot")]</xpath>
+		<value>
+			<count>10</count>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim of Madness - Bones/Patches/Rim of Madness - Bones/ThingDefs_Items/Patch_Items_Apparel_BoneMasks.xml b/ModPatches/Rim of Madness - Bones/Patches/Rim of Madness - Bones/ThingDefs_Items/Patch_Items_Apparel_BoneMasks.xml
new file mode 100644
index 0000000000..57746ea568
--- /dev/null
+++ b/ModPatches/Rim of Madness - Bones/Patches/Rim of Madness - Bones/ThingDefs_Items/Patch_Items_Apparel_BoneMasks.xml	
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ======== ROMB_Apparel_SkullMask ======== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ROMB_Apparel_SkullMask"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>0.5</WornBulk>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ROMB_Apparel_SkullMask"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ROMB_Apparel_SkullMask"]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>OnHead</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<!-- ======== Sihv_Apparel_BoneArmor ======== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Sihv_Apparel_BoneArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>2.5</WornBulk>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Sihv_Apparel_BoneArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim of Madness - Bones/Patches/Rim of Madness - Bones/ThingDefs_Items/Patch_Items_Resources_Bones.xml b/ModPatches/Rim of Madness - Bones/Patches/Rim of Madness - Bones/ThingDefs_Items/Patch_Items_Resources_Bones.xml
new file mode 100644
index 0000000000..3b61106a6e
--- /dev/null
+++ b/ModPatches/Rim of Madness - Bones/Patches/Rim of Madness - Bones/ThingDefs_Items/Patch_Items_Resources_Bones.xml	
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ======== BoneItem ======== -->
+	<!-- ==== As material ==== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BoneItem"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>0.6</MeleePenetrationFactor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BoneItem"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.25</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BoneItem"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<!-- ==== As a weapon ==== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BoneItem"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.99</cooldownTime>
+					<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ======== BonePlastic ======== -->
+	<!-- ==== As material ==== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BonePlastic"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.5</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim of Madness - Vampires/Patches/Rim of Madness - Vampires/Patch_ROMV_Animals.xml b/ModPatches/Rim of Madness - Vampires/Patches/Rim of Madness - Vampires/Patch_ROMV_Animals.xml
new file mode 100644
index 0000000000..f75a3d6891
--- /dev/null
+++ b/ModPatches/Rim of Madness - Vampires/Patches/Rim of Madness - Vampires/Patch_ROMV_Animals.xml	
@@ -0,0 +1,345 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ROMV_BatRace"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ROMV_BatRace"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.0</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="ROMV_BatRace"]/verbs</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ROMV_BatRace"]</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.88</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.28</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>3.00</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ROMV_BatSpectralRace"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ROMV_BatSpectralRace"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.2</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ROMV_BatSpectralRace"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.67</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.67</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>fangs</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>0.88</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>3.00</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="ROMV_ThingBaseWolf"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="ROMV_ThingBaseWolf"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.21</MeleeDodgeChance>
+			<MeleeCritChance>0.20</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="ROMV_ThingBaseWolf"]/verbs</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="ROMV_ThingBaseWolf"]</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.19</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>12.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>18.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.19</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>12.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>18.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.46</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<chanceFactor>2</chanceFactor>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>3.2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.225</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="ROMV_ThingBaseMonstrosity"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="ROMV_ThingBaseMonstrosity"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.06</MeleeDodgeChance>
+			<MeleeCritChance>0.41</MeleeCritChance>
+			<MeleeParryChance>0.48</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="ROMV_ThingBaseMonstrosity"]/tools</xpath>
+		<value>
+			<tools>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>Monstrous Arm</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>17.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>33.5</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>Monstrous Arm</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>17.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>33.5</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>Monstrous Teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>18</armorPenetrationSharp>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>Head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+				</li>
+
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="ROMV_ThingBaseAbyssalArm"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Plane</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="ROMV_ThingBaseAbyssalArm"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.06</MeleeDodgeChance>
+			<MeleeCritChance>0.41</MeleeCritChance>
+			<MeleeParryChance>0.48</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="ROMV_ThingBaseAbyssalArm"]/tools</xpath>
+		<value>
+			<tools>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>Tentacle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>36</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim of Madness - Vampires/Patches/Rim of Madness - Vampires/Patch_ROMV_Human.xml b/ModPatches/Rim of Madness - Vampires/Patches/Rim of Madness - Vampires/Patch_ROMV_Human.xml
new file mode 100644
index 0000000000..778483a5a6
--- /dev/null
+++ b/ModPatches/Rim of Madness - Vampires/Patches/Rim of Madness - Vampires/Patch_ROMV_Human.xml	
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ROMV_Fangs"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fangs</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ROMV_FeralClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>feral claw</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
+					<armorPenetrationSharp>12.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>18.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="ROMV_ThingBaseAbyssalArm"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tentacle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="ROMV_ThingBaseBloodMist"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>viscera</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>15</armorPenetrationSharp>
+					<armorPenetrationBlunt>0</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="ROMV_ThingBaseMist"]/verbs</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="ROMV_ThingBaseMist"]</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>viscera</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>15</armorPenetrationSharp>
+					<armorPenetrationBlunt>0</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ROM_Generations_Caine" or defName="ROM_Generations_TheThree"]/stages/li</xpath>
+		<value>
+			<statOffsets>
+				<Suppressability>-10</Suppressability>
+				<NightVisionEfficiency>5</NightVisionEfficiency>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ROM_Generations_Antediluvian" or defName="ROM_Generations_Methuselah" or defName="ROM_Generations_Elder"]/stages/li</xpath>
+		<value>
+			<statOffsets>
+				<Suppressability>-2</Suppressability>
+				<NightVisionEfficiency>2</NightVisionEfficiency>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ROM_Generations_Ancillae"]/stages/li</xpath>
+		<value>
+			<statOffsets>
+				<Suppressability>-1</Suppressability>
+				<NightVisionEfficiency>1</NightVisionEfficiency>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ROM_Generations_Neonate"]/stages/li</xpath>
+		<value>
+			<statOffsets>
+				<Suppressability>-0.8</Suppressability>
+				<NightVisionEfficiency>1</NightVisionEfficiency>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ROM_Generations_Thinblood"]/stages/li</xpath>
+		<value>
+			<statOffsets>
+				<Suppressability>-0.5</Suppressability>
+				<NightVisionEfficiency>0.6</NightVisionEfficiency>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ROM_GhoulHediff"]/stages/li[1]</xpath>
+		<value>
+			<statOffsets>
+				<Suppressability>-0.2</Suppressability>
+				<NightVisionEfficiency>0.15</NightVisionEfficiency>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ROM_GhoulHediff"]/stages/li[2]</xpath>
+		<value>
+			<statOffsets>
+				<Suppressability>-0.4</Suppressability>
+				<NightVisionEfficiency>0.3</NightVisionEfficiency>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ROM_GhoulHediff"]/stages/li[3]</xpath>
+		<value>
+			<statOffsets>
+				<Suppressability>-0.6</Suppressability>
+				<NightVisionEfficiency>0.5</NightVisionEfficiency>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ROM_GhoulHediff"]/stages/li[4]</xpath>
+		<value>
+			<statOffsets>
+				<Suppressability>-0.8</Suppressability>
+				<NightVisionEfficiency>0.6</NightVisionEfficiency>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="ROMV_ScenStrangeCargo"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_303British_FMJ</thingDef>
+				<count>100</count>
+			</li>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_44Magnum_FMJ</thingDef>
+				<count>60</count>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim of Madness - Werewolves/Patches/Rim of Madness - Werewolves/Patch_ROM_Werewolves.xml b/ModPatches/Rim of Madness - Werewolves/Patches/Rim of Madness - Werewolves/Patch_ROM_Werewolves.xml
new file mode 100644
index 0000000000..54faeacdc4
--- /dev/null
+++ b/ModPatches/Rim of Madness - Werewolves/Patches/Rim of Madness - Werewolves/Patch_ROM_Werewolves.xml	
@@ -0,0 +1,248 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Glabro -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ROM_GlabroClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetrationSharp>6</armorPenetrationSharp>
+					<armorPenetrationBlunt>36</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ROM_GlabroJaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2.1</cooldownTime>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>18</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Crinos -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ROM_CrinosClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>50</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
+					<armorPenetrationBlunt>60</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ROM_CrinosJaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>2.1</cooldownTime>
+					<armorPenetrationSharp>8</armorPenetrationSharp>
+					<armorPenetrationBlunt>48</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Hispo -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ROM_HispoClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetrationSharp>6</armorPenetrationSharp>
+					<armorPenetrationBlunt>36</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ROM_HispoJaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>2.4</cooldownTime>
+					<armorPenetrationSharp>5</armorPenetrationSharp>
+					<armorPenetrationBlunt>30</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Lupus -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ROM_LupusClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>2.2</cooldownTime>
+					<armorPenetrationSharp>5</armorPenetrationSharp>
+					<armorPenetrationBlunt>30</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ROM_LupusJaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>2.4</cooldownTime>
+					<armorPenetrationSharp>5</armorPenetrationSharp>
+					<armorPenetrationBlunt>30</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Metis -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ROM_MetisClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>1.65</cooldownTime>
+					<armorPenetrationSharp>6</armorPenetrationSharp>
+					<armorPenetrationBlunt>36</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ROM_MetisJaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationSharp>4</armorPenetrationSharp>
+					<armorPenetrationBlunt>24</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[
+			defName="ROM_GlabroHediff" or
+			defName="ROM_CrinosHediff" or
+			defName="ROM_HispoHediff" or
+			defName="ROM_LupusHediff" or
+			defName="ROM_MetisHediff"
+			]/stages/li/statOffsets </xpath>
+		<value>
+			<Suppressability>-0.9</Suppressability>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Asari and Reapers/Defs/Rim-Effect Asari and Reapers/Ammo_Projectile_Asari.xml b/ModPatches/Rim-Effect Asari and Reapers/Defs/Rim-Effect Asari and Reapers/Ammo_Projectile_Asari.xml
new file mode 100644
index 0000000000..ff0e35e381
--- /dev/null
+++ b/ModPatches/Rim-Effect Asari and Reapers/Defs/Rim-Effect Asari and Reapers/Ammo_Projectile_Asari.xml	
@@ -0,0 +1,682 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<DamageDef ParentName="Bullet">
+		<defName>Micromunition</defName>
+		<label>Micromunition</label>
+		<minDamageToFragment>6</minDamageToFragment>
+		<buildingDamageFactor>0.2</buildingDamageFactor>
+		<plantDamageFactor>0.2</plantDamageFactor>
+	</DamageDef>
+
+	<DamageDef ParentName="Bullet">
+		<defName>MicromunitionD</defName>
+		<label>Micromunition</label>
+		<minDamageToFragment>4</minDamageToFragment>
+		<buildingDamageFactor>0.2</buildingDamageFactor>
+		<plantDamageFactor>0.2</plantDamageFactor>
+	</DamageDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_AAR</defName>
+		<label>Thermal Clip</label>
+		<ammoTypes>
+			<Ammo_ME>Bullet_AAR</Ammo_ME>
+			<Ammo_ME_AP>Bullet_AAR_AP</Ammo_ME_AP>
+			<Ammo_ME_Cryo>Bullet_AAR_Cryo</Ammo_ME_Cryo>
+			<Ammo_ME_HE>Bullet_AAR_HE</Ammo_ME_HE>
+			<Ammo_ME_FI>Bullet_AAR_FI</Ammo_ME_FI>
+			<Ammo_ME_Ion>Bullet_AAR_Ion</Ammo_ME_Ion>
+			<Ammo_ME_Toxic>Bullet_AAR_Toxic</Ammo_ME_Toxic>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_ASR</defName>
+		<label>Thermal Clip</label>
+		<ammoTypes>
+			<Ammo_ME>Bullet_ASR</Ammo_ME>
+			<Ammo_ME_AP>Bullet_ASR_AP</Ammo_ME_AP>
+			<Ammo_ME_Cryo>Bullet_ASR_Cryo</Ammo_ME_Cryo>
+			<Ammo_ME_HE>Bullet_ASR_HE</Ammo_ME_HE>
+			<Ammo_ME_FI>Bullet_ASR_FI</Ammo_ME_FI>
+			<Ammo_ME_Ion>Bullet_ASR_Ion</Ammo_ME_Ion>
+			<Ammo_ME_Toxic>Bullet_ASR_Toxic</Ammo_ME_Toxic>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Disciple</defName>
+		<label>Thermal Clip</label>
+		<ammoTypes>
+			<Ammo_ME>Bullet_Disciple</Ammo_ME>
+			<Ammo_ME_AP>Bullet_Disciple_AP</Ammo_ME_AP>
+			<Ammo_ME_Cryo>Bullet_Disciple_Cryo</Ammo_ME_Cryo>
+			<Ammo_ME_HE>Bullet_Disciple_HE</Ammo_ME_HE>
+			<Ammo_ME_FI>Bullet_Disciple_FI</Ammo_ME_FI>
+			<Ammo_ME_Ion>Bullet_Disciple_Ion</Ammo_ME_Ion>
+			<Ammo_ME_Toxic>Bullet_Disciple_Toxic</Ammo_ME_Toxic>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Acolyte</defName>
+		<label>Thermal Clip</label>
+		<ammoTypes>
+			<Ammo_ME>Bullet_Acolyte</Ammo_ME>
+			<Ammo_ME_AP>Bullet_Acolyte_AP</Ammo_ME_AP>
+			<Ammo_ME_Cryo>Bullet_Acolyte_Cryo</Ammo_ME_Cryo>
+			<Ammo_ME_HE>Bullet_Acolyte_HE</Ammo_ME_HE>
+			<Ammo_ME_FI>Bullet_Acolyte_FI</Ammo_ME_FI>
+			<Ammo_ME_Ion>Bullet_Acolyte_Ion</Ammo_ME_Ion>
+			<Ammo_ME_Toxic>Bullet_Acolyte_Toxic</Ammo_ME_Toxic>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ================== Projectiles ================== -->
+	<!-- ================== AAR ================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="BaseAARBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectiles/Shot_BioticSharp_Large</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>400</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseAARBullet">
+		<defName>Bullet_AAR</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>13</damageAmountBase>
+			<armorPenetrationSharp>18</armorPenetrationSharp>
+			<armorPenetrationBlunt>46</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Stun</def>
+					<amount>8</amount>
+					<chance>0.05</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseAARBullet">
+		<defName>Bullet_AAR_AP</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>9</damageAmountBase>
+			<armorPenetrationSharp>36</armorPenetrationSharp>
+			<armorPenetrationBlunt>46</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Stun</def>
+					<amount>8</amount>
+					<chance>0.04</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseAARBullet">
+		<defName>Bullet_AAR_HE</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>13</damageAmountBase>
+			<armorPenetrationSharp>18</armorPenetrationSharp>
+			<armorPenetrationBlunt>46</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>6</amount>
+				</li>
+				<li>
+					<def>Stun</def>
+					<amount>8</amount>
+					<chance>0.05</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseAARBullet">
+		<defName>Bullet_AAR_Cryo</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>18</armorPenetrationSharp>
+			<armorPenetrationBlunt>46</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Cryo</def>
+					<amount>3</amount>
+				</li>
+				<li>
+					<def>Stun</def>
+					<amount>8</amount>
+					<chance>0.05</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseAARBullet">
+		<defName>Bullet_AAR_Toxic</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>18</armorPenetrationSharp>
+			<armorPenetrationBlunt>46</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Toxin</def>
+					<amount>3</amount>
+				</li>
+				<li>
+					<def>Stun</def>
+					<amount>8</amount>
+					<chance>0.05</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseAARBullet">
+		<defName>Bullet_AAR_Ion</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>9</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>5</amount>
+				</li>
+				<li>
+					<def>Stun</def>
+					<amount>8</amount>
+					<chance>0.04</chance>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>20</armorPenetrationSharp>
+			<armorPenetrationBlunt>46</armorPenetrationBlunt>
+			<empShieldBreakChance>0.225</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseAARBullet">
+		<defName>Bullet_AAR_FI</defName>
+		<label>accelerated incendiary shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>17</armorPenetrationSharp>
+			<armorPenetrationBlunt>59</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_SickBurn</def>
+					<amount>2</amount>
+				</li>
+				<li>
+					<def>Flame</def>
+					<amount>1</amount>
+					<chance>0.2</chance>
+				</li>
+				<li>
+					<def>Stun</def>
+					<amount>8</amount>
+					<chance>0.03</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== Acolyte ================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="BaseAcolyteBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
+		<label>warp bomb</label>
+		<graphicData>
+			<texPath>Things/Projectiles/Shot_BioticBlunt_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>1.1</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Blunt</damageDef>
+			<speed>50</speed>
+		</projectile>
+	</ThingDef>
+
+	<!-- DO NOT REMOVE THE SHARP PENETRATION -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseAcolyteBullet">
+		<defName>Bullet_Acolyte</defName>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>15</damageAmountBase>
+			<armorPenetrationSharp>30</armorPenetrationSharp>
+			<armorPenetrationBlunt>50</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Stun</def>
+					<amount>8</amount>
+					<chance>0.3</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>90</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.9</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseAcolyteBullet">
+		<defName>Bullet_Acolyte_AP</defName>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>9</damageAmountBase>
+			<armorPenetrationSharp>40</armorPenetrationSharp>
+			<armorPenetrationBlunt>100</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Stun</def>
+					<amount>8</amount>
+					<chance>0.3</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>90</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.9</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseAcolyteBullet">
+		<defName>Bullet_Acolyte_Cryo</defName>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>20</armorPenetrationSharp>
+			<armorPenetrationBlunt>50</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Stun</def>
+					<amount>8</amount>
+					<chance>0.3</chance>
+				</li>
+				<li>
+					<def>ME_Cryo</def>
+					<amount>3</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseAcolyteBullet">
+		<defName>Bullet_Acolyte_Toxic</defName>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+			<armorPenetrationBlunt>28</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Stun</def>
+					<amount>8</amount>
+					<chance>0.3</chance>
+				</li>
+				<li>
+					<def>ME_Toxin</def>
+					<amount>3</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseAcolyteBullet">
+		<defName>Bullet_Acolyte_HE</defName>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>13</damageAmountBase>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+			<armorPenetrationBlunt>28</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Stun</def>
+					<amount>8</amount>
+					<chance>0.3</chance>
+				</li>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>6</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseAcolyteBullet">
+		<defName>Bullet_Acolyte_FI</defName>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>13</damageAmountBase>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+			<armorPenetrationBlunt>28</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_SickBurn</def>
+					<amount>3</amount>
+				</li>
+				<li>
+					<def>Flame</def>
+					<amount>1</amount>
+					<chance>0.275</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseAcolyteBullet">
+		<defName>Bullet_Acolyte_Ion</defName>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>8</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>5</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>9</armorPenetrationSharp>
+			<armorPenetrationBlunt>23</armorPenetrationBlunt>
+			<empShieldBreakChance>0.25</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== ASR ================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="BaseASRBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
+		<label>accelerated shot</label>
+		<graphicData>
+			<texPath>Things/Projectiles/Shot_BioticBlunt_Large</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>1.0</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>500</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseASRBullet">
+		<defName>Bullet_ASR</defName>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>29</damageAmountBase>
+			<armorPenetrationSharp>24</armorPenetrationSharp>
+			<armorPenetrationBlunt>96</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseASRBullet">
+		<defName>Bullet_ASR_AP</defName>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>19</damageAmountBase>
+			<armorPenetrationSharp>48</armorPenetrationSharp>
+			<armorPenetrationBlunt>96</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseASRBullet">
+		<defName>Bullet_ASR_Cryo</defName>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>27</damageAmountBase>
+			<armorPenetrationSharp>24</armorPenetrationSharp>
+			<armorPenetrationBlunt>96</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Cryo</def>
+					<amount>7</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseASRBullet">
+		<defName>Bullet_ASR_HE</defName>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>29</damageAmountBase>
+			<armorPenetrationSharp>24</armorPenetrationSharp>
+			<armorPenetrationBlunt>96</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>14</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseASRBullet">
+		<defName>Bullet_ASR_Toxic</defName>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>27</damageAmountBase>
+			<armorPenetrationSharp>24</armorPenetrationSharp>
+			<armorPenetrationBlunt>96</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Toxin</def>
+					<amount>7</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseASRBullet">
+		<defName>Bullet_ASR_FI</defName>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>29</damageAmountBase>
+			<armorPenetrationSharp>24</armorPenetrationSharp>
+			<armorPenetrationBlunt>96</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_SickBurn</def>
+					<amount>6</amount>
+				</li>
+				<li>
+					<def>Flame</def>
+					<amount>1</amount>
+					<chance>0.55</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseASRBullet">
+		<defName>Bullet_ASR_Ion</defName>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>19</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>10</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>27</armorPenetrationSharp>
+			<armorPenetrationBlunt>96</armorPenetrationBlunt>
+			<empShieldBreakChance>0.6</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== Disciple ================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="BaseDiscipleBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
+		<label>accelerated blast</label>
+		<graphicData>
+			<texPath>Things/Projectiles/Shot_BioticBlunt_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>0.6</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>MicromunitionD</damageDef>
+			<speed>200</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseDiscipleBullet">
+		<defName>Bullet_Disciple</defName>
+		<graphicData>
+			<texPath>Things/Projectiles/Shot_BioticBlunt_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>0.6</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>8</damageAmountBase>
+			<armorPenetrationSharp>10</armorPenetrationSharp>
+			<armorPenetrationBlunt>21</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Stun</def>
+					<amount>5</amount>
+					<chance>0.045</chance>
+				</li>
+			</secondaryDamage>
+			<pelletCount>9</pelletCount>
+			<spreadMult>9.2</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseDiscipleBullet">
+		<defName>Bullet_Disciple_AP</defName>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>6</damageAmountBase>
+			<armorPenetrationSharp>20</armorPenetrationSharp>
+			<armorPenetrationBlunt>21</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Stun</def>
+					<amount>5</amount>
+					<chance>0.045</chance>
+				</li>
+			</secondaryDamage>
+			<pelletCount>9</pelletCount>
+			<spreadMult>9.2</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseDiscipleBullet">
+		<defName>Bullet_Disciple_HE</defName>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>8</damageAmountBase>
+			<armorPenetrationSharp>10</armorPenetrationSharp>
+			<armorPenetrationBlunt>21</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>4</amount>
+				</li>
+				<li>
+					<def>Stun</def>
+					<amount>5</amount>
+					<chance>0.045</chance>
+				</li>
+			</secondaryDamage>
+			<pelletCount>9</pelletCount>
+			<spreadMult>9.2</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseDiscipleBullet">
+		<defName>Bullet_Disciple_Cryo</defName>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>7</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>ME_Cryo</def>
+					<amount>3</amount>
+				</li>
+				<li>
+					<def>Stun</def>
+					<amount>5</amount>
+					<chance>0.045</chance>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>10</armorPenetrationSharp>
+			<armorPenetrationBlunt>21</armorPenetrationBlunt>
+			<pelletCount>9</pelletCount>
+			<spreadMult>9.2</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseDiscipleBullet">
+		<defName>Bullet_Disciple_Toxic</defName>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>7</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>ME_Toxin</def>
+					<amount>3</amount>
+				</li>
+				<li>
+					<def>Stun</def>
+					<amount>5</amount>
+					<chance>0.045</chance>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>10</armorPenetrationSharp>
+			<armorPenetrationBlunt>21</armorPenetrationBlunt>
+			<pelletCount>9</pelletCount>
+			<spreadMult>9.2</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseDiscipleBullet">
+		<defName>Bullet_Disciple_FI</defName>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>8</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>ME_SickBurn</def>
+					<amount>1</amount>
+				</li>
+				<li>
+					<def>Flame</def>
+					<amount>1</amount>
+					<chance>0.065</chance>
+				</li>
+				<li>
+					<def>Stun</def>
+					<amount>5</amount>
+					<chance>0.045</chance>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>10</armorPenetrationSharp>
+			<armorPenetrationBlunt>21</armorPenetrationBlunt>
+			<pelletCount>8</pelletCount>
+			<spreadMult>9.2</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseDiscipleBullet">
+		<defName>Bullet_Disciple_Ion</defName>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>5</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>3</amount>
+				</li>
+				<li>
+					<def>Stun</def>
+					<amount>5</amount>
+					<chance>0.045</chance>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>10</armorPenetrationSharp>
+			<armorPenetrationBlunt>21</armorPenetrationBlunt>
+			<pelletCount>8</pelletCount>
+			<spreadMult>9.2</spreadMult>
+			<empShieldBreakChance>0.075</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Asari and Reapers/Defs/Rim-Effect Asari and Reapers/Ammo_Projectile_Reapers.xml b/ModPatches/Rim-Effect Asari and Reapers/Defs/Rim-Effect Asari and Reapers/Ammo_Projectile_Reapers.xml
new file mode 100644
index 0000000000..2f1a34bfac
--- /dev/null
+++ b/ModPatches/Rim-Effect Asari and Reapers/Defs/Rim-Effect Asari and Reapers/Ammo_Projectile_Reapers.xml	
@@ -0,0 +1,470 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- ==================== Ammo Type ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_Reapers</defName>
+		<label>Reaper powercell</label>
+		<description>Mysterious reaper tech, might be of some value to collectors and researchers.</description>
+		<statBases>
+			<Mass>0.01</Mass>
+			<Bulk>0.01</Bulk>
+			<MarketValue>0.1</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade_Sellable</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoME</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>ThirdParty/MassEffect/Heatsink</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>ME_FMJ</ammoClass>
+		<generateAllowChance>0.1</generateAllowChance>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_Reapers_AP</defName>
+		<label>Reaper powercell AP</label>
+		<description>Mysterious reaper tech, might be of some value to collectors and researchers.</description>
+		<statBases>
+			<Mass>0.015</Mass>
+			<Bulk>0.012</Bulk>
+			<MarketValue>0.14</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade_Sellable</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoME</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>ThirdParty/MassEffect/ME_AP</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>ME_AP</ammoClass>
+		<generateAllowChance>0.06</generateAllowChance>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_Reapers_HE</defName>
+		<label>Reaper powercell HE</label>
+		<description>Mysterious reaper tech, might be of some value to collectors and researchers.</description>
+		<statBases>
+			<Mass>0.01</Mass>
+			<Bulk>0.01</Bulk>
+			<MarketValue>0.2</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade_Sellable</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoME</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>ThirdParty/MassEffect/ME_HE</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>ME_HE</ammoClass>
+		<generateAllowChance>0.03</generateAllowChance>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_Reapers_FI</defName>
+		<label>Reaper powercell FI</label>
+		<description>Mysterious reaper tech, might be of some value to collectors and researchers.</description>
+		<statBases>
+			<Mass>0.01</Mass>
+			<Bulk>0.01</Bulk>
+			<MarketValue>0.2</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade_Sellable</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoME</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>ThirdParty/MassEffect/ME_FI</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>ME_FI</ammoClass>
+		<generateAllowChance>0.03</generateAllowChance>
+	</ThingDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Goliath</defName>
+		<label>Reaper tech</label>
+		<ammoTypes>
+			<Ammo_Reapers>Bullet_Goliath</Ammo_Reapers>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Cannibal</defName>
+		<label>Reaper tech</label>
+		<ammoTypes>
+			<Ammo_Reapers>Bullet_Cannibal_Basic</Ammo_Reapers>
+			<Ammo_Reapers_AP>Bullet_Cannibal_AP</Ammo_Reapers_AP>
+			<Ammo_Reapers_HE>Bullet_Cannibal_HE</Ammo_Reapers_HE>
+			<Ammo_Reapers_FI>Bullet_Cannibal_FI</Ammo_Reapers_FI>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Marauder</defName>
+		<label>Reaper tech</label>
+		<ammoTypes>
+			<Ammo_Reapers>Bullet_Marauder</Ammo_Reapers>
+			<Ammo_Reapers_AP>Bullet_Marauder_AP</Ammo_Reapers_AP>
+			<Ammo_Reapers_HE>Bullet_Marauder_HE</Ammo_Reapers_HE>
+			<Ammo_Reapers_FI>Bullet_Marauder_FI</Ammo_Reapers_FI>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Ravager</defName>
+		<label>Reaper tech</label>
+		<ammoTypes>
+			<Ammo_Reapers>Bullet_Ravager</Ammo_Reapers>
+			<Ammo_Reapers_HE>Bullet_Ravager_HE</Ammo_Reapers_HE>
+			<Ammo_Reapers_FI>Bullet_Ravager_FI</Ammo_Reapers_FI>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Collossus</defName>
+		<label>Reaper tech</label>
+		<ammoTypes>
+			<Ammo_Reapers>Bullet_Collosus</Ammo_Reapers>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<!-- ================== Goliath ================== -->
+
+	<ThingDef ParentName="Base12x64mmChargedBullet">
+		<defName>Bullet_Goliath</defName>
+		<label>goliath cannon shot</label>
+		<graphicData>
+			<texPath>Things/Projectiles/Shot_GoliathCannon</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<!-- ================== Cannibal ================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="BaseCannibalBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
+		<label>cannibal shot</label>
+		<graphicData>
+			<texPath>Things/Projectiles/Shot_CannibalCaster</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>300</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseCannibalBullet">
+		<defName>Bullet_Cannibal_Basic</defName>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>16</armorPenetrationSharp>
+			<armorPenetrationBlunt>56</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseCannibalBullet">
+		<defName>Bullet_Cannibal_AP</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>13</damageAmountBase>
+			<armorPenetrationSharp>32</armorPenetrationSharp>
+			<armorPenetrationBlunt>56</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseCannibalBullet">
+		<defName>Bullet_Cannibal_HE</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>16</armorPenetrationSharp>
+			<armorPenetrationBlunt>56</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>10</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseAARBullet">
+		<defName>Bullet_Cannibal_FI</defName>
+		<label>accelerated incendiary shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>19</damageAmountBase>
+			<armorPenetrationSharp>16</armorPenetrationSharp>
+			<armorPenetrationBlunt>56</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_SickBurn</def>
+					<amount>4</amount>
+				</li>
+				<li>
+					<def>Flame</def>
+					<amount>1</amount>
+					<chance>0.2</chance>
+				</li>
+				<li>
+					<def>Stun</def>
+					<amount>8</amount>
+					<chance>0.03</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== Marauder ================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="BaseMarauderBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
+		<label>maruader shot</label>
+		<graphicData>
+			<texPath>Things/Projectiles/Shot_MarauderRifle</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>1.0</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>400</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseMarauderBullet">
+		<defName>Bullet_Marauder</defName>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>16</damageAmountBase>
+			<armorPenetrationSharp>20</armorPenetrationSharp>
+			<armorPenetrationBlunt>44</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseMarauderBullet">
+		<defName>Bullet_Marauder_AP</defName>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>11</damageAmountBase>
+			<armorPenetrationSharp>40</armorPenetrationSharp>
+			<armorPenetrationBlunt>44</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseMarauderBullet">
+		<defName>Bullet_Marauder_HE</defName>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>16</damageAmountBase>
+			<armorPenetrationSharp>20</armorPenetrationSharp>
+			<armorPenetrationBlunt>44</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>8</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseMarauderBullet">
+		<defName>Bullet_Marauder_FI</defName>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>15</damageAmountBase>
+			<armorPenetrationSharp>20</armorPenetrationSharp>
+			<armorPenetrationBlunt>44</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_SickBurn</def>
+					<amount>4</amount>
+				</li>
+				<li>
+					<def>Flame</def>
+					<amount>1</amount>
+					<chance>0.15</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== Ravager ================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="BaseRavagerBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
+		<label>ravager cannon shot</label>
+		<graphicData>
+			<texPath>Things/Projectiles/Shot_RavagerCannon</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>2</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>160</speed>
+			<suppressionFactor>3.0</suppressionFactor>
+			<dangerFactor>2.0</dangerFactor>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseRavagerBullet">
+		<defName>Bullet_Ravager</defName>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>50</damageAmountBase>
+			<armorPenetrationSharp>100</armorPenetrationSharp>
+			<armorPenetrationBlunt>700</armorPenetrationBlunt>
+			<pelletCount>2</pelletCount>
+			<spreadMult>2</spreadMult>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>32</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.9</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_ME>5</Fragment_ME>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- DO NOT REMOVE THE SHARP PENETRATION -->
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseRavagerBullet">
+		<defName>Bullet_Ravager_HE</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>1.5</explosionRadius>
+			<damageDef>Bomb</damageDef>
+			<armorPenetrationSharp>200</armorPenetrationSharp>
+			<damageAmountBase>90</damageAmountBase>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<pelletCount>2</pelletCount>
+			<spreadMult>2.0</spreadMult>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_ME>15</Fragment_ME>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseRavagerBullet">
+		<defName>Bullet_Ravager_FI</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>1.5</explosionRadius>
+			<damageDef>Bomb</damageDef>
+			<armorPenetrationSharp>300</armorPenetrationSharp>
+			<damageAmountBase>100</damageAmountBase>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<pelletCount>2</pelletCount>
+			<spreadMult>2.0</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== Collossus ================== -->
+
+	<ThingDef ParentName="Base80x256mmFuelIncendiaryBullet">
+		<defName>Bullet_Collosus</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>colossus artillery shot</label>
+		<graphicData>
+			<texPath>Things/Projectiles/Shot_ColossusArtillery</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>1.5</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<ai_IsIncendiary>false</ai_IsIncendiary>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== Bolter ================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseMarauderBullet">
+		<defName>Bullet_ReaperBolter</defName>
+		<label>reaper bolter shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>16</damageAmountBase>
+			<armorPenetrationSharp>20</armorPenetrationSharp>
+			<armorPenetrationBlunt>44</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== Heavy Bolter ================== -->
+
+	<ThingDef ParentName="Base12x64mmChargedBullet">
+		<defName>Bullet_ReaperHeavyBolter</defName>
+		<label>reaper heavy bolter shot</label>
+		<graphicData>
+			<texPath>Things/Projectiles/Shot_MarauderRifle</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+	</ThingDef>
+
+	<!-- ================== Reaper Missile Launcher ================== -->
+
+	<ThingDef ParentName="Base80x256mmFuelIncendiaryBullet">
+		<defName>Bullet_ReaperMissile</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>reaper missile launcher rocket</label>
+		<graphicData>
+			<texPath>Things/Projectiles/ReaperMissileLauncher_Shot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>2.5</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>0</speed>
+			<damageDef>Bomb</damageDef>
+			<explosionRadius>7.5</explosionRadius>
+			<ai_IsIncendiary>false</ai_IsIncendiary>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== Reaper Kinetic Artillery ================== -->
+
+	<ThingDef ParentName="Base105mmHowitzerShell">
+		<defName>Bullet_ReaperKineticArtillery</defName>
+		<label>reaper kinetic artillery shot</label>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<graphicData>
+			<texPath>Things/Projectiles/KineticArtillery_Shot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>2.5</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>350</damageAmountBase>
+			<explosionRadius>5</explosionRadius>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<shellingProps>
+				<tilesPerTick>0.15</tilesPerTick>
+				<range>80</range>
+			</shellingProps>								
+		</projectile>
+	</ThingDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Asari and Reapers/Defs/Rim-Effect Asari and Reapers/ShellingResponse_Reapers.xml b/ModPatches/Rim-Effect Asari and Reapers/Defs/Rim-Effect Asari and Reapers/ShellingResponse_Reapers.xml
new file mode 100644
index 0000000000..457a648070
--- /dev/null
+++ b/ModPatches/Rim-Effect Asari and Reapers/Defs/Rim-Effect Asari and Reapers/ShellingResponse_Reapers.xml	
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- Let the Reapers respond to anyone stupid enough to shell their landing site. -->
+
+	<CombatExtended.ShellingResponseDef ParentName="ShellingPreset_UltraBase">
+		<defName>CE_ShellingPreset_Reapers</defName>
+		<projectiles Inherit="false">
+			<li>
+				<projectile>Bullet_ReaperKineticArtillery</projectile>
+				<points>250</points>
+				<weight>0.001</weight>
+			</li>
+		</projectiles>
+		<worldObjects>
+			<li>
+				<worldObject>Site</worldObject>
+				<shellingPropability>0.75</shellingPropability>
+				<raidPropability>0.5</raidPropability>
+				<raidMTBDays>2</raidMTBDays>
+			</li>				
+		</worldObjects>					
+	</CombatExtended.ShellingResponseDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/Asari_Abilities.xml b/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/Asari_Abilities.xml
new file mode 100644
index 0000000000..3e2584fbc5
--- /dev/null
+++ b/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/Asari_Abilities.xml	
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Biotics -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="RE_Biotic_Lance"]/range</xpath>
+		<value>
+			<range>62</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="RE_Biotic_Warp" or defName="RE_Biotic_Stasis"]/range</xpath>
+		<value>
+			<range>40</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Biotic_LanceProjectile"]/projectile/armorPenetrationBase</xpath>
+		<value>
+			<armorPenetrationBase>1000</armorPenetrationBase>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/Asari_Trader.xml b/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/Asari_Trader.xml
new file mode 100644
index 0000000000..4461bcde4b
--- /dev/null
+++ b/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/Asari_Trader.xml	
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Traders ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="RE_Base_Asari_Standard"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>FSX</thingDef>
+				<countRange>
+					<min>25</min>
+					<max>90</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>Prometheum</thingDef>
+				<countRange>
+					<min>25</min>
+					<max>90</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>ME_Ammo</tradeTag>
+				<countRange>
+					<min>500</min>
+					<max>1800</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>1</min>
+					<max>4</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_MediumAmmo</tradeTag>
+				<countRange>
+					<min>20</min>
+					<max>80</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>4</min>
+					<max>8</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_HeavyAmmo</tradeTag>
+				<countRange>
+					<min>5</min>
+					<max>20</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>4</min>
+					<max>6</max>
+				</thingDefCountRange>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="RE_Caravan_Asari_CombatSupplier"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>FSX</thingDef>
+				<countRange>
+					<min>12</min>
+					<max>36</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>Prometheum</thingDef>
+				<countRange>
+					<min>12</min>
+					<max>36</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>ME_Ammo</tradeTag>
+				<countRange>
+					<min>300</min>
+					<max>1200</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>2</min>
+					<max>4</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_MediumAmmo</tradeTag>
+				<countRange>
+					<min>20</min>
+					<max>60</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>3</min>
+					<max>6</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_HeavyAmmo</tradeTag>
+				<countRange>
+					<min>5</min>
+					<max>20</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>3</max>
+				</thingDefCountRange>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="RE_Caravan_Asari_Exotic" or
+			defName="RE_Caravan_Asari_BulkGoods"]/stockGenerators </xpath>
+		<value>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>FSX</thingDef>
+				<countRange>
+					<min>15</min>
+					<max>45</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>Prometheum</thingDef>
+				<countRange>
+					<min>15</min>
+					<max>45</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>ME_Ammo</tradeTag>
+				<countRange>
+					<min>120</min>
+					<max>400</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>1</min>
+					<max>2</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_MediumAmmo</tradeTag>
+				<countRange>
+					<min>10</min>
+					<max>20</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>2</min>
+					<max>4</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_HeavyAmmo</tradeTag>
+				<countRange>
+					<min>1</min>
+					<max>5</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>-1</min>
+					<max>3</max>
+				</thingDefCountRange>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="RE_Visitor_Asari_Standard"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>ME_Ammo</tradeTag>
+				<countRange>
+					<min>10</min>
+					<max>60</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>-1</min>
+					<max>1</max>
+				</thingDefCountRange>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/Bodies/Bodies_Asari.xml b/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/Bodies/Bodies_Asari.xml
new file mode 100644
index 0000000000..da621d0275
--- /dev/null
+++ b/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/Bodies/Bodies_Asari.xml	
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="RE_Asari"]/corePart/parts/li[def="Ribcage"]/coverage</xpath>
+		<value>
+			<coverage>0.07</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="RE_Asari"]/corePart/parts/li[def="Pelvis"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="RE_Asari"]/corePart/parts/li[def="Stomach"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="RE_Asari"]/corePart/parts/li[def="Heart"]/coverage</xpath>
+		<value>
+			<coverage>0.04</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="RE_Asari"]/corePart/parts/li[def="Lung"]/coverage</xpath>
+		<value>
+			<coverage>0.055</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="RE_Asari"]/corePart/parts/li[def="Kidney"]/coverage</xpath>
+		<value>
+			<coverage>0.03</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="RE_Asari"]/corePart/parts/li[def="Liver"]/coverage</xpath>
+		<value>
+			<coverage>0.06</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="RE_Asari"]/corePart/parts/li[def="Neck"]/coverage</xpath>
+		<value>
+			<coverage>0.055</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="RE_Asari"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Skull"]/parts/li[def="Brain"]/coverage</xpath>
+		<value>
+			<coverage>0.9</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="RE_Asari"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Eye"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="RE_Asari"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="RE_Asari"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/coverage</xpath>
+		<value>
+			<coverage>0.08</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="RE_Asari"]/corePart/parts/li[def="Shoulder"]/coverage</xpath>
+		<value>
+			<coverage>0.085</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="RE_Asari"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Clavicle"]/coverage</xpath>
+		<value>
+			<coverage>0.06</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="RE_Asari"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Humerus"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="RE_Asari"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Radius"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="RE_Asari"]/corePart/parts/li[def="Leg"]/parts/li[def="Femur"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="RE_Asari"]/corePart/parts/li[def="Leg"]/parts/li[def="Tibia"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="RE_Asari"]//*[
+			def="Torso" or
+			def="Neck" or
+			def="Head" or
+			def="Jaw" or
+			def="Ear" or
+			def="Nose" or
+			def="Shoulder" or
+			def="Arm" or
+			def="Hand" or
+			def="Finger" or
+			def="Foot" or
+			def="Toe" or
+			def="Leg"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="RE_Asari"]//*[
+			def="Jaw" or
+			def="Nose" or
+			def="Eye"]/groups
+		</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/Bodies/Bodies_Reapers.xml b/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/Bodies/Bodies_Reapers.xml
new file mode 100644
index 0000000000..edfe5b8e2f
--- /dev/null
+++ b/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/Bodies/Bodies_Reapers.xml	
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyPartDef[defName="RE_HuskTorso" or defName="RE_HuskBody"]/hitPoints</xpath>
+		<value>
+			<hitPoints>50</hitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyPartDef[defName="RE_HuskLeg"]/hitPoints</xpath>
+		<value>
+			<hitPoints>40</hitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="RE_RachniLike"]//*[
+			def="MechanicalThoraxCanManipulate" or
+			def="Pronotum" or
+			def="RE_HuskHead" or
+			def="MechanicalLeg"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="RE_Swarmer"]//*[
+			def="Shell" or
+			def="Pronotum" or
+			def="RE_HuskHead" or
+			def="MechanicalLeg"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="RE_Banshee" or defName="RE_Husk" or defName="RE_Marauder" or defName="RE_Brute"]//*[
+			def="RE_HuskTorso" or
+			def="RE_HuskNeck" or
+			def="RE_HuskHead" or
+			def="RE_HuskShoulder" or
+			def="RE_HuskArm" or
+			def="RE_HuskHand" or
+			def="RE_HuskFoot" or
+			def="RE_HuskLeg"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="RE_Colossus"]//*[
+			def="RE_HuskBodyCanManipulate" or
+			def="RE_HuskNeck" or
+			def="RE_HuskHead" or
+			def="Nose" or
+			def="Horn" or
+			def="Hoof" or
+			def="RE_HuskLeg"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="RE_Colossus"]//*[
+			def="SightSensor" or def="Nose"]
+		</xpath>
+		<value>
+			<groups>
+				<li>OutsideSquishy</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RE_RachniLike"]//*[def="SightSensor"]</xpath>
+		<value>
+			<groups>
+				<li>OutsideSquishy</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RE_Banshee"]//*[def="SightSensor" or def="Nose" or def="Jaw"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RE_Husk"]//*[def="SightSensor" or def="Nose" or def="Jaw"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RE_Marauder"]//*[def="SightSensor" or def="Nose" or def="Jaw"]/groups</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="RE_Brute"]//*[def="SightSensor" or def="Nose" or def="Jaw"]/groups
+		</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="RE_Swarmer"]//*[def="SightSensor"]
+		</xpath>
+		<value>
+			<groups>
+				<li>OutsideSquishy</li>
+			</groups>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/Buildings_Reapers.xml b/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/Buildings_Reapers.xml
new file mode 100644
index 0000000000..5608a939e8
--- /dev/null
+++ b/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/Buildings_Reapers.xml	
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Light Bolter ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Turret_ReaperBolter" or defName="RE_Turret_ReaperHeavyBolter"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Turret_ReaperBolter" or defName="RE_Turret_ReaperHeavyBolter"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.75</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Turret_ReaperBolter" or defName="RE_Turret_ReaperHeavyBolter"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>1</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RE_Gun_ReaperBolter</defName>
+		<statBases>
+			<Mass>35.00</Mass>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>0.72</SwayFactor>
+			<RangedWeapon_Cooldown>0.66</RangedWeapon_Cooldown>
+			<Bulk>13.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.28</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_ReaperBolter</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>55</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>9</burstShotCount>
+			<soundCast>RE_Shot_ReaperBolter</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Suppressive</li>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RE_Gun_ReaperHeavyBolter</defName>
+		<statBases>
+			<Mass>35.00</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>13.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.28</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_ReaperHeavyBolter</defaultProjectile>
+			<warmupTime>1.30</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<burstShotCount>9</burstShotCount>
+			<soundCast>RE_Shot_HeavyBolter</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Suppressive</li>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Reaper Missile Launcher ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Turret_ReaperMissileLauncher"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Turret_ReaperMissileLauncher"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>10</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RE_Gun_ReaperMissileLauncher</defName>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+			<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_ReaperMissile</defaultProjectile>
+			<warmupTime>3.2</warmupTime>
+			<minRange>10</minRange>
+			<range>100</range>
+			<burstShotCount>1</burstShotCount>
+			<soundCast>RE_Shot_ReaperKineticArtillery</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>55</muzzleFlashScale>
+			<circularError>1.2</circularError>
+			<requireLineOfSight>true</requireLineOfSight>
+			<indirectFirePenalty>0.4</indirectFirePenalty>
+			<targetParams>
+				<canTargetLocations>false</canTargetLocations>
+			</targetParams>
+		</Properties>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "RE_Gun_ReaperMissileLauncher"]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_Charges">
+					<chargeSpeeds>
+						<li>90</li>
+						<li>100</li>
+						<li>150</li>
+					</chargeSpeeds>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ========== Reaper Beam ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Bullet_ReaperBeam"]/projectile/armorPenetrationBase</xpath>
+		<value>
+			<armorPenetrationBase>1000</armorPenetrationBase>
+		</value>
+	</Operation>
+
+	<!-- ========== Kinetic Artillery ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Turret_ReaperKineticArtillery"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Turret_ReaperKineticArtillery"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>10</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RE_Gun_ReaperKineticArtillery</defName>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+			<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_ReaperKineticArtillery</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<minRange>20</minRange>
+			<range>500</range>
+			<burstShotCount>1</burstShotCount>
+			<soundCast>RE_Shot_ReaperKineticArtillery</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>55</muzzleFlashScale>
+			<circularError>2.5</circularError>
+			<requireLineOfSight>false</requireLineOfSight>
+			<indirectFirePenalty>0.6</indirectFirePenalty>
+			<targetParams>
+				<canTargetLocations>false</canTargetLocations>
+			</targetParams>
+		</Properties>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "RE_Gun_ReaperKineticArtillery"]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_Charges">
+					<chargeSpeeds>
+						<li>50</li>
+						<li>70</li>
+						<li>90</li>
+					</chargeSpeeds>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/PawnKindDefs/Asari_Pawns.xml b/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/PawnKindDefs/Asari_Pawns.xml
new file mode 100644
index 0000000000..c924fa5d35
--- /dev/null
+++ b/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/PawnKindDefs/Asari_Pawns.xml	
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="RE_AsariExplorer" or
+			defName="RE_AsariDancer" or
+			defName="RE_AsariOfficial" or
+			defName="RE_AsariTrader" or
+			defName="RE_Matriarch" or
+			defName="RE_AsariScientist" or
+			defName="RE_AsariTraveller"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>3</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.25</generateChance>
+						<sidearmMoney>
+							<min>20</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+					<li>
+						<generateChance>0.075</generateChance>
+						<sidearmMoney>
+							<min>80</min>
+							<max>160</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_FlareLauncher</li>
+						</weaponTags>
+						<magazineCount>
+							<min>1</min>
+							<max>1</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="RE_AsariAdept" or
+			defName="RE_AsariJusticar" or
+			defName="RE_Alliance_AsariMarine" or
+			defName="RE_AsariCommando" or
+			defName="RE_AsariCommandoSpecialist" or
+			defName="RE_ArdatYakshi"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.05</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+					<li>
+						<generateChance>0.125</generateChance>
+						<sidearmMoney>
+							<min>10</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>GrenadeSmoke</li>
+							<li>GrenadeDestructive</li>
+						</weaponTags>
+						<magazineCount>
+							<min>0</min>
+							<max>1</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RE_AsariMarineSniper"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>12</min>
+					<max>21</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/PawnKindDefs/Reaper_Pawns.xml b/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/PawnKindDefs/Reaper_Pawns.xml
new file mode 100644
index 0000000000..eff59ecf70
--- /dev/null
+++ b/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/PawnKindDefs/Reaper_Pawns.xml	
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ======= Combat Power ======= -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RE_Husk_Banshee" or defName="RE_Husk_Brute"]/combatPower</xpath>
+		<value>
+			<combatPower>360</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RE_Husk_Ravager"]/combatPower</xpath>
+		<value>
+			<combatPower>180</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RE_Husk_Cannibal"]/combatPower</xpath>
+		<value>
+			<combatPower>75</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="RE_Husk_Husk" or defName="RE_Husk_Swarmer"]/combatPower</xpath>
+		<value>
+			<combatPower>15</combatPower>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/Reaper_Hediff.xml b/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/Reaper_Hediff.xml
new file mode 100644
index 0000000000..199cfbc69b
--- /dev/null
+++ b/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/Reaper_Hediff.xml	
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName = "RER_DirectControl"]/stages/li[1]/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>2</ShootingAccuracyPawn>
+			<MeleeCritChance>0.50</MeleeCritChance>
+			<MeleeParryChance>0.50</MeleeParryChance>
+			<MeleeDodgeChance>0.50</MeleeDodgeChance>
+			<Suppressability>-10</Suppressability>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/Scenarios_Asari.xml b/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/Scenarios_Asari.xml
new file mode 100644
index 0000000000..5d0c29d77e
--- /dev/null
+++ b/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/Scenarios_Asari.xml	
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Add ammo to scenario === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="RE_LoneAsariExplorer"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_ME</thingDef>
+				<count>120</count>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/ShellingResponse_Reapers.xml b/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/ShellingResponse_Reapers.xml
new file mode 100644
index 0000000000..d31a7b716c
--- /dev/null
+++ b/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/ShellingResponse_Reapers.xml	
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Let the Reapers respond to anyone stupid enough to shell their landing site. -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/FactionDef[defName="RE_Reapers"]</xpath>
+		<value>
+			<li Class="CombatExtended.FactionDefExtensionCE">
+				<shellingResponse>CE_ShellingPreset_Reapers</shellingResponse>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Increase Reaper landing site health and negation chance. -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/WorldObjectDef[defName="RE_Reaper"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.WorldObjects.WorldObjectCompProperties_Health">
+				<healthModifier>8</healthModifier>
+				<techLevelNoImpact>true</techLevelNoImpact>
+				<chanceToNegateDamage>0.33</chanceToNegateDamage>
+			</li>
+			<li Class="CombatExtended.WorldObjects.WorldObjectCompProperties_Hostility"/>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/ThingDefs_Misc/Apparel_Asari.xml b/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/ThingDefs_Misc/Apparel_Asari.xml
new file mode 100644
index 0000000000..b7ae0820fa
--- /dev/null
+++ b/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/ThingDefs_Misc/Apparel_Asari.xml	
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_DancerBodysuit"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AmbassadorOutfit"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AsariDress"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_MatriarchDress"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/ThingDefs_Misc/Armor_Asari.xml b/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/ThingDefs_Misc/Armor_Asari.xml
new file mode 100644
index 0000000000..611978dcab
--- /dev/null
+++ b/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/ThingDefs_Misc/Armor_Asari.xml	
@@ -0,0 +1,254 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Armor Layers === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AsariJusticarArmor" or defName="RE_Apparel_AsariCommandoArmor"]/apparel/layers</xpath>
+		<value>
+			<li>Webbing</li>
+		</value>
+	</Operation>
+
+	<!-- === Justicar Crown === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AsariJusticarCrown"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<NightVisionEfficiency_Apparel>0.7</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AsariJusticarCrown"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AsariJusticarCrown"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AsariJusticarCrown"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0.1</Flammability>
+		</value>
+	</Operation>
+
+	<!-- === Commando Armor (Middle layer only) === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AsariCommandoArmor"]/statBases/Mass</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>2</WornBulk>
+			<Mass>5.5</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AsariCommandoArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>9</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AsariCommandoArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>14</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AsariCommandoArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>260</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AsariCommandoArmor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0.2</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AsariCommandoArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>10</CarryWeight>
+			<CarryBulk>30</CarryBulk>
+			<ShootingAccuracyPawn>0.1</ShootingAccuracyPawn>
+			<AimingDelayFactor>-0.075</AimingDelayFactor>
+			<ToxicEnvironmentResistance>0.3</ToxicEnvironmentResistance>
+			<MoveSpeed>0.4</MoveSpeed>
+			<ReloadSpeed>0.15</ReloadSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AsariCommandoArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AsariCommandoArmor"]/costList</xpath>
+		<value>
+			<costList>
+				<ComponentSpacer>3</ComponentSpacer>
+				<Plasteel>50</Plasteel>
+				<RE_ElementZero>10</RE_ElementZero>
+				<DevilstrandCloth>25</DevilstrandCloth>
+			</costList>
+		</value>
+	</Operation>
+
+	<!-- === Justicar Armor === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AsariJusticarArmor"]</xpath>
+		<value>
+			<thingClass>RimEffect.ShieldBeltApparel</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AsariJusticarArmor"]/statBases/Mass</xpath>
+		<value>
+			<Bulk>30</Bulk>
+			<WornBulk>5</WornBulk>
+			<Mass>12</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AsariJusticarArmor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0.1</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AsariJusticarArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AsariJusticarArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>32</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AsariJusticarArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>400</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AsariJusticarArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>20</CarryWeight>
+			<CarryBulk>40</CarryBulk>
+			<ShootingAccuracyPawn>0.05</ShootingAccuracyPawn>
+			<ToxicEnvironmentResistance>0.3</ToxicEnvironmentResistance>
+			<ReloadSpeed>0.1</ReloadSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AsariJusticarArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AsariJusticarArmor"]/costList</xpath>
+		<value>
+			<costList>
+				<ComponentSpacer>5</ComponentSpacer>
+				<Plasteel>80</Plasteel>
+				<RE_ElementZero>35</RE_ElementZero>
+				<DevilstrandCloth>50</DevilstrandCloth>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AsariJusticarArmor"]/comps</xpath>
+		<value>
+			<li Class="VFECore.CompProperties_ShieldBubble">
+				<blockRangedAttack>true</blockRangedAttack>
+				<blockMeleeAttack>false</blockMeleeAttack>
+				<showWhenDrafted>true</showWhenDrafted>
+				<showOnHostiles>true</showOnHostiles>
+				<showOnNeutralInCombat>true</showOnNeutralInCombat>
+				<shieldTexPath>UI/AbilityShields/ShieldTech</shieldTexPath>
+				<EnergyShieldRechargeRate>0.2</EnergyShieldRechargeRate>
+				<EnergyShieldEnergyMax>100</EnergyShieldEnergyMax>
+				<minShieldSize>1</minShieldSize>
+				<maxShieldSize>1.5</maxShieldSize>
+				<disableRotation>true</disableRotation>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AsariJusticarArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/ThingDefs_Misc/Weapons_Asari.xml b/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/ThingDefs_Misc/Weapons_Asari.xml
new file mode 100644
index 0000000000..71cf0462d3
--- /dev/null
+++ b/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/ThingDefs_Misc/Weapons_Asari.xml	
@@ -0,0 +1,297 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Asari Blade === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_MeleeWeapon_AsariSword"]/statBases/Mass</xpath>
+		<value>
+			<Mass>0.25</Mass>
+			<Bulk>6.25</Bulk>
+			<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_MeleeWeapon_AsariSword"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>1.1</MeleeCritChance>
+			<MeleeParryChance>0.24</MeleeParryChance>
+			<MeleeDodgeChance>0.4</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_MeleeWeapon_AsariSword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>1.1</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.18</cooldownTime>
+					<chanceFactor>2</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<armorPenetrationSharp>20</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Melee Tools ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Gun_AsariPistol"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Gun_AsariAssaultRifle" or defName="RE_Gun_AsariShotgun" or defName="RE_Gun_AsariSniperRifle"]/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>
+
+	<!-- ========== Priestess ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RE_Gun_AsariAssaultRifle</defName>
+		<statBases>
+			<SightsEfficiency>1.15</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.3</SwayFactor>
+			<Bulk>6.4</Bulk>
+			<Mass>1.8</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_AAR</defaultProjectile>
+			<warmupTime>0.75</warmupTime>
+			<range>50</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RE_Shot_AsariAssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>8</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+			<recoilAmount>1.26</recoilAmount>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>36</magazineSize>
+			<reloadTime>3.6</reloadTime>
+			<ammoSet>AmmoSet_AAR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- Name -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='RE_Gun_AsariAssaultRifle']/label</xpath>
+		<value>
+			<label>Priestess</label>
+		</value>
+	</Operation>
+
+	<!-- ========== Huntress ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RE_Gun_AsariSniperRifle</defName>
+		<statBases>
+			<SightsEfficiency>2.8</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.43</SwayFactor>
+			<Bulk>9.0</Bulk>
+			<Mass>3.60</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_ASR</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<soundCast>RE_Shot_AsariSniperRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>18</magazineSize>
+			<reloadTime>3.6</reloadTime>
+			<ammoSet>AmmoSet_ASR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- Name -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='RE_Gun_AsariSniperRifle']/label</xpath>
+		<value>
+			<label>Huntress</label>
+		</value>
+	</Operation>
+
+	<!-- ========== Disciple ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RE_Gun_AsariShotgun</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.20</SwayFactor>
+			<Bulk>5</Bulk>
+			<Mass>1.5</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Disciple</defaultProjectile>
+			<warmupTime>0.55</warmupTime>
+			<range>25</range>
+			<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
+			<soundCast>RE_Shot_AsariShotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>18</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_Disciple</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>False</aiUseBurstMode>
+		</FireModes>
+	</Operation>
+
+	<!-- Name -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='RE_Gun_AsariShotgun']/label</xpath>
+		<value>
+			<label>Disciple</label>
+		</value>
+	</Operation>
+
+	<!-- ========== Acolyte ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RE_Gun_AsariPistol</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.19</SwayFactor>
+			<Bulk>1.5</Bulk>
+			<Mass>0.6</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Acolyte</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>18</range>
+			<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
+			<soundCast>RE_Shot_AsariPistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+				<canTargetPawns>true</canTargetPawns>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>3.0</reloadTime>
+			<ammoSet>AmmoSet_Acolyte</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Name -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='RE_Gun_AsariPistol']/label</xpath>
+		<value>
+			<label>Acolyte</label>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/ThingDefs_Misc/Weapons_Reapers.xml b/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/ThingDefs_Misc/Weapons_Reapers.xml
new file mode 100644
index 0000000000..b171e4036b
--- /dev/null
+++ b/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/ThingDefs_Misc/Weapons_Reapers.xml	
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Melee Tools ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Gun_CannibalCaster" or defName="RE_Gun_MarauderRifle"]/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="RE_Gun_GoliathCannon" or
+			defName="RE_Gun_ColossusArtillery"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>3.44</cooldownTime>
+					<armorPenetrationBlunt>8.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Goliath Cannnon ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RE_Gun_GoliathCannon</defName>
+		<statBases>
+			<Mass>35.00</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>13.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.28</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Goliath</defaultProjectile>
+			<warmupTime>1.30</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>25</burstShotCount>
+			<soundCast>RE_Shot_GoliathCannon</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>9.1</reloadTime>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>12</aimedBurstShotCount>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Suppressive</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Cannibal Caster ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RE_Gun_CannibalCaster</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.30</SwayFactor>
+			<Bulk>8</Bulk>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Cannibal_Basic</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>50</range>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<soundCast>RE_Shot_CannibalCaster</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+			<recoilAmount>1.68</recoilAmount>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>35</magazineSize>
+			<reloadTime>4.0</reloadTime>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Marauder ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RE_Gun_MarauderRifle</defName>
+		<statBases>
+			<SightsEfficiency>1.25</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.20</SwayFactor>
+			<Bulk>10</Bulk>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Marauder</defaultProjectile>
+			<burstShotCount>8</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>1.0</warmupTime>
+			<range>55</range>
+			<soundCast>RE_Shot_MarauderRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilAmount>1.24</recoilAmount>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>3.5</reloadTime>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>4</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Colossus Artillery ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RE_Gun_ColossusArtillery</defName>
+		<statBases>
+			<Mass>50.00</Mass>
+			<RangedWeapon_Cooldown>2.53</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>0.82</SwayFactor>
+			<Bulk>20.00</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Collosus</defaultProjectile>
+			<burstShotCount>1</burstShotCount>
+			<warmupTime>5.5</warmupTime>
+			<ai_AvoidFriendlyFireRadius>5.9</ai_AvoidFriendlyFireRadius>
+			<requireLineOfSight>false</requireLineOfSight>
+			<range>92</range>
+			<minRange>5.9</minRange>
+			<soundCast>RE_Shot_ColossusArtillery</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>40</muzzleFlashScale>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>7.6</reloadTime>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/ThingDefs_Races/Race_Asari.xml b/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/ThingDefs_Races/Race_Asari.xml
new file mode 100644
index 0000000000..be3c6c72fb
--- /dev/null
+++ b/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/ThingDefs_Races/Race_Asari.xml	
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="RE_Asari"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="RE_Asari"]/statBases</xpath>
+		<value>
+			<MeleeCritChance>1.0</MeleeCritChance>
+			<MeleeParryChance>1.0</MeleeParryChance>
+			<Suppressability>1</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="RE_Asari"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="RE_Asari"]</xpath>
+		<value>
+			<comps/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="RE_Asari"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/ThingDefs_Races/Races_Reapers.xml b/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/ThingDefs_Races/Races_Reapers.xml
new file mode 100644
index 0000000000..f6ffd9b9e0
--- /dev/null
+++ b/ModPatches/Rim-Effect Asari and Reapers/Patches/Rim-Effect Asari and Reapers/ThingDefs_Races/Races_Reapers.xml	
@@ -0,0 +1,582 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Body Shapes ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[
+			defName="RE_Husk_Banshee" or
+			defName="RE_Husk_Husk" or
+			defName="RE_Husk_Marauder"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[
+			defName="RE_Husk_Goliath" or
+			defName="RE_Husk_Ravager" or
+			defName="RE_Husk_Brute"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RE_Husk_Swarmer"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RE_Husk_Cannibal"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>HumanoidWide</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RE_Husk_Colossus"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Stat Bases ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="BaseHusk"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency>0.8</NightVisionEfficiency>
+			<SmokeSensitivity>0</SmokeSensitivity>
+			<PainShockThreshold>1</PainShockThreshold>
+			<Suppressability>0</Suppressability>
+		</value>
+	</Operation>
+
+	<!-- ========== Banshee ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Husk_Banshee"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3.0</ArmorRating_Sharp>
+			<ShootingAccuracyPawn>3.0</ShootingAccuracyPawn>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>0.9</MeleeCritChance>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Husk_Banshee"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Husk_Banshee"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>3.0</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Cut</li>
+						<li>Stab</li>
+					</capacities>
+					<power>43</power>
+					<cooldownTime>2.3</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Cut</li>
+						<li>Stab</li>
+					</capacities>
+					<power>43</power>
+					<cooldownTime>2.3</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Husk_Banshee"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyLossPerDamage</xpath>
+		<value>
+			<EnergyLossPerDamage>0.5</EnergyLossPerDamage>
+		</value>
+	</Operation>
+
+	<!-- ========== Cannibal ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Husk_Cannibal"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1.0</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.33</MeleeDodgeChance>
+			<MeleeCritChance>0.33</MeleeCritChance>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Husk_Cannibal"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Husk_Cannibal"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.4</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.76</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<armorPenetrationSharp>4.5</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.76</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<armorPenetrationSharp>4.5</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Marauder ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Husk_Marauder"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>15</ArmorRating_Sharp>
+			<AimingAccuracy>1.3</AimingAccuracy>
+			<ShootingAccuracyPawn>1.3</ShootingAccuracyPawn>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>0.33</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Husk_Marauder"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>28</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Husk_Marauder"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>135</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<armorPenetrationSharp>4.5</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<armorPenetrationSharp>4.5</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Goliath ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Husk_Goliath"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>28</ArmorRating_Sharp>
+			<CarryWeight>550</CarryWeight>
+			<CarryBulk>140</CarryBulk>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>1.25</MeleeCritChance>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Husk_Goliath"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>80</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Husk_Goliath"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>3.51</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Ravager ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Husk_Ravager"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.40</MeleeCritChance>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Husk_Ravager"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Husk_Ravager"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>3.0</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Husk ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Husk_Husk"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+			<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			<MeleeCritChance>0.3</MeleeCritChance>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Husk_Husk"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Husk_Husk"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.0</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.0</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>bite</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>2.8</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<soundMeleeHit>Pawn_Melee_HumanBite_Hit</soundMeleeHit>
+					<soundMeleeMiss>Pawn_Melee_HumanBite_Miss</soundMeleeMiss>
+					<armorPenetrationBlunt>14</armorPenetrationBlunt>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>3.0</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Brute ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Husk_Brute"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>23</ArmorRating_Sharp>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>2</MeleeCritChance>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Husk_Brute"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>75</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Husk_Brute"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Cut</li>
+						<li>Scratch</li>
+					</capacities>
+					<power>56</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Stun</def>
+							<amount>15</amount>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>3.3</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>500</armorPenetrationBlunt>
+					<armorPenetrationSharp>60</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Cut</li>
+						<li>Scratch</li>
+					</capacities>
+					<power>56</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Stun</def>
+							<amount>15</amount>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>3.3</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>500</armorPenetrationBlunt>
+					<armorPenetrationSharp>60</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>3.51</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>18</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Swarmer ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Husk_Swarmer"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+			<MeleeDodgeChance>0.35</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Husk_Swarmer"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Husk_Swarmer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.33</cooldownTime>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>3.0</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Colossus ========== -->
+        
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Husk_Colossus"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			<MeleeCritChance>0.75</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Husk_Colossus"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>48</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Husk_Colossus"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Husk_Colossus"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>56</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>20</armorPenetrationSharp>
+					<armorPenetrationBlunt>50</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>50</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Core/Defs/Rim-Effect Core/ME_Ammo_Recipe.xml b/ModPatches/Rim-Effect Core/Defs/Rim-Effect Core/ME_Ammo_Recipe.xml
new file mode 100644
index 0000000000..11065b2c3c
--- /dev/null
+++ b/ModPatches/Rim-Effect Core/Defs/Rim-Effect Core/ME_Ammo_Recipe.xml	
@@ -0,0 +1,379 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_ME</defName>
+		<label>make thermal clips</label>
+		<description>Craft 200 shots' worth of thermal clips.</description>
+		<jobString>Making thermal clips.</jobString>
+		<workAmount>6000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Plasteel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_ME>200</Ammo_ME>
+		</products>
+		<researchPrerequisite>RE_AllianceWeaponry</researchPrerequisite>
+		<recipeUsers>
+			<li>RE_ManufacturingBench</li>
+		</recipeUsers>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_ME_AP</defName>
+		<label>make thermal clips</label>
+		<description>Craft 200 shots' worth of AP thermal clips.</description>
+		<jobString>Making AP thermal clips.</jobString>
+		<workAmount>7500</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Uranium</li>
+				<li>Steel</li>
+				<li>Plasteel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_ME_AP>200</Ammo_ME_AP>
+		</products>
+		<researchPrerequisite>RE_AllianceWeaponry</researchPrerequisite>
+		<recipeUsers>
+			<li>RE_ManufacturingBench</li>
+		</recipeUsers>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_ME_Cryo</defName>
+		<label>make thermal clips</label>
+		<description>Craft 200 shots' worth of Cryo thermal clips.</description>
+		<jobString>Making Cryo thermal clips.</jobString>
+		<workAmount>10000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>RE_ElementZero</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>RE_ElementZero</li>
+				<li>Steel</li>
+				<li>Plasteel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_ME_Cryo>200</Ammo_ME_Cryo>
+		</products>
+		<researchPrerequisite>RE_AmmunitionModification</researchPrerequisite>
+		<recipeUsers>
+			<li>RE_ManufacturingBench</li>
+		</recipeUsers>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_ME_HE</defName>
+		<label>make thermal clips</label>
+		<description>Craft 200 shots' worth of high explosive thermal clips.</description>
+		<jobString>Making HE thermal clips.</jobString>
+		<workAmount>10000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>RE_ElementZero</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>RE_ElementZero</li>
+				<li>Steel</li>
+				<li>Plasteel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_ME_HE>200</Ammo_ME_HE>
+		</products>
+		<researchPrerequisite>RE_AmmunitionModification</researchPrerequisite>
+		<recipeUsers>
+			<li>RE_ManufacturingBench</li>
+		</recipeUsers>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_ME_FI</defName>
+		<label>make thermal clips</label>
+		<description>Craft 200 shots' worth of FI thermal clips.</description>
+		<jobString>Making incendiary thermal clips.</jobString>
+		<workAmount>10000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>RE_ElementZero</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>RE_ElementZero</li>
+				<li>Steel</li>
+				<li>Plasteel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_ME_FI>200</Ammo_ME_FI>
+		</products>
+		<researchPrerequisite>RE_AmmunitionModification</researchPrerequisite>
+		<recipeUsers>
+			<li>RE_ManufacturingBench</li>
+		</recipeUsers>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_ME_Ion</defName>
+		<label>make thermal clips</label>
+		<description>Craft 200 shots' worth of disruptor thermal clips.</description>
+		<jobString>Making disruptor thermal clips.</jobString>
+		<workAmount>10000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>RE_ElementZero</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>RE_ElementZero</li>
+				<li>Steel</li>
+				<li>Plasteel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_ME_Ion>200</Ammo_ME_Ion>
+		</products>
+		<researchPrerequisite>RE_AmmunitionModification</researchPrerequisite>
+		<recipeUsers>
+			<li>RE_ManufacturingBench</li>
+		</recipeUsers>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_ME_Toxic</defName>
+		<label>make thermal clips</label>
+		<description>Craft 200 shots' worth of toxin thermal clips.</description>
+		<jobString>Making toxin thermal clips.</jobString>
+		<workAmount>10000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>RE_ElementZero</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>RE_ElementZero</li>
+				<li>Steel</li>
+				<li>Plasteel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_ME_Toxic>200</Ammo_ME_Toxic>
+		</products>
+		<researchPrerequisite>RE_AmmunitionModification</researchPrerequisite>
+		<recipeUsers>
+			<li>RE_ManufacturingBench</li>
+		</recipeUsers>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Core/Defs/Rim-Effect Core/ME_Projectile_Damage_Ammoclass.xml b/ModPatches/Rim-Effect Core/Defs/Rim-Effect Core/ME_Projectile_Damage_Ammoclass.xml
new file mode 100644
index 0000000000..d5911067c6
--- /dev/null
+++ b/ModPatches/Rim-Effect Core/Defs/Rim-Effect Core/ME_Projectile_Damage_Ammoclass.xml	
@@ -0,0 +1,2035 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ==================== Hediff Type ========================== -->
+
+	<HediffDef>
+		<defName>ME_Toxic</defName>
+		<label>toxin round</label>
+		<description>Neurotoxin in the bloodstream. Causes nausea and severe degradation of neuromotor functions.
+			\nAt high doses, toxic buildup can have severe health effects. Even at low doses, it can generate cancers.
+			\nCreatures who die with toxic buildup cannot be eaten. </description>
+		<hediffClass>HediffWithComps</hediffClass>
+		<defaultLabelColor>(0.7, 1.0, 0.7)</defaultLabelColor>
+		<makesSickThought>true</makesSickThought>
+		<scenarioCanAdd>false</scenarioCanAdd>
+		<taleOnVisible>ToxicityRevealed</taleOnVisible>
+		<comps>
+			<li Class="HediffCompProperties_Immunizable">
+				<severityPerDayNotImmune>-0.2</severityPerDayNotImmune>
+			</li>
+		</comps>
+		<stages>
+			<li>
+				<label>initial</label>
+				<becomeVisible>false</becomeVisible>
+			</li>
+			<li>
+				<label>initial</label>
+				<minSeverity>0.01</minSeverity>
+				<vomitMtbDays>0.8</vomitMtbDays>
+				<capMods>
+					<li>
+						<capacity>Consciousness</capacity>
+						<offset>-0.05</offset>
+					</li>
+				</capMods>
+			</li>
+			<li>
+				<label>minor</label>
+				<minSeverity>0.15</minSeverity>
+				<vomitMtbDays>0.33</vomitMtbDays>
+				<capMods>
+					<li>
+						<capacity>Consciousness</capacity>
+						<offset>-0.10</offset>
+					</li>
+				</capMods>
+			</li>
+			<li>
+				<label>moderate</label>
+				<minSeverity>0.35</minSeverity>
+				<vomitMtbDays>0.2</vomitMtbDays>
+				<capMods>
+					<li>
+						<capacity>Consciousness</capacity>
+						<offset>-0.175</offset>
+					</li>
+				</capMods>
+				<hediffGivers>
+					<li Class="HediffGiver_Random">
+						<hediff>Dementia</hediff>
+						<mtbDays>146</mtbDays>
+						<partsToAffect>
+							<li>Brain</li>
+						</partsToAffect>
+					</li>
+					<li Class="HediffGiver_Random">
+						<hediff>Carcinoma</hediff>
+						<mtbDays>300</mtbDays>
+						<canAffectAnyLivePart>true</canAffectAnyLivePart>
+					</li>
+				</hediffGivers>
+			</li>
+			<li>
+				<label>serious</label>
+				<minSeverity>0.65</minSeverity>
+				<vomitMtbDays>0.1</vomitMtbDays>
+				<capMods>
+					<li>
+						<capacity>Consciousness</capacity>
+						<offset>-0.25</offset>
+					</li>
+				</capMods>
+				<hediffGivers>
+					<li Class="HediffGiver_Random">
+						<hediff>Dementia</hediff>
+						<mtbDays>25</mtbDays>
+						<partsToAffect>
+							<li>Brain</li>
+						</partsToAffect>
+					</li>
+					<li Class="HediffGiver_Random">
+						<hediff>Carcinoma</hediff>
+						<mtbDays>60</mtbDays>
+						<canAffectAnyLivePart>true</canAffectAnyLivePart>
+					</li>
+				</hediffGivers>
+			</li>
+			<li>
+				<label>extreme</label>
+				<minSeverity>0.85</minSeverity>
+				<vomitMtbDays>0.06</vomitMtbDays>
+				<capMods>
+					<li>
+						<capacity>Consciousness</capacity>
+						<setMax>0.10</setMax>
+					</li>
+				</capMods>
+				<hediffGivers>
+					<li Class="HediffGiver_Random">
+						<hediff>Dementia</hediff>
+						<mtbDays>10</mtbDays>
+						<partsToAffect>
+							<li>Brain</li>
+						</partsToAffect>
+					</li>
+					<li Class="HediffGiver_Random">
+						<hediff>Carcinoma</hediff>
+						<mtbDays>30</mtbDays>
+						<canAffectAnyLivePart>true</canAffectAnyLivePart>
+					</li>
+				</hediffGivers>
+			</li>
+		</stages>
+	</HediffDef>
+
+	<HediffDef>
+		<defName>ME_Freeze</defName>
+		<label>Freeze</label>
+		<description>Dangerously low core body temperature. Unless re-warmed, hypothermia gets worse and ends in death. Recovery is quick once the victim is re-warmed. Avoid hypothermia by wearing warm clothes in cold environments.</description>
+		<defaultLabelColor>(0.8, 0.8, 1)</defaultLabelColor>
+		<hediffClass>HediffWithComps</hediffClass>
+		<taleOnVisible>HypothermiaRevealed</taleOnVisible>
+		<comps>
+			<li Class="HediffCompProperties_Immunizable">
+				<severityPerDayNotImmune>-0.5</severityPerDayNotImmune>
+			</li>
+		</comps>
+		<stages>
+			<li>
+				<label>shivering</label>
+				<becomeVisible>false</becomeVisible>
+			</li>
+			<li>
+				<label>shivering</label>
+				<minSeverity>0.03</minSeverity>
+				<capMods>
+					<li>
+						<capacity>Manipulation</capacity>
+						<offset>-0.1</offset>
+					</li>
+					<li>
+						<capacity>Moving</capacity>
+						<offset>-0.1</offset>
+					</li>
+					<li>
+						<capacity>Consciousness</capacity>
+						<offset>-0.01</offset>
+					</li>
+				</capMods>
+			</li>
+			<li>
+				<label>minor</label>
+				<minSeverity>0.2</minSeverity>
+				<capMods>
+					<li>
+						<capacity>Moving</capacity>
+						<offset>-0.2</offset>
+					</li>
+					<li>
+						<capacity>Manipulation</capacity>
+						<offset>-0.2</offset>
+					</li>
+					<li>
+						<capacity>Consciousness</capacity>
+						<offset>-0.05</offset>
+					</li>
+				</capMods>
+			</li>
+			<li>
+				<label>serious</label>
+				<minSeverity>0.35</minSeverity>
+				<painOffset>0.1</painOffset>
+				<capMods>
+					<li>
+						<capacity>Moving</capacity>
+						<offset>-0.35</offset>
+					</li>
+					<li>
+						<capacity>Manipulation</capacity>
+						<offset>-0.5</offset>
+					</li>
+					<li>
+						<capacity>Consciousness</capacity>
+						<offset>-0.1</offset>
+					</li>
+				</capMods>
+			</li>
+			<li>
+				<label>extreme</label>
+				<minSeverity>0.65</minSeverity>
+				<painOffset>0.15</painOffset>
+				<capMods>
+					<li>
+						<capacity>Moving</capacity>
+						<offset>-0.5</offset>
+					</li>
+					<li>
+						<capacity>Manipulation</capacity>
+						<offset>-0.66</offset>
+					</li>
+					<li>
+						<capacity>Consciousness</capacity>
+						<offset>-0.15</offset>
+					</li>
+				</capMods>
+			</li>
+			<li>
+				<label>Frozen</label>
+				<minSeverity>0.85</minSeverity>
+				<lifeThreatening>true</lifeThreatening>
+				<painOffset>0.2</painOffset>
+				<capMods>
+					<li>
+						<capacity>Moving</capacity>
+						<offset>-0.9</offset>
+					</li>
+					<li>
+						<capacity>Manipulation</capacity>
+						<offset>-0.9</offset>
+					</li>
+					<li>
+						<capacity>Consciousness</capacity>
+						<offset>-0.15</offset>
+					</li>
+				</capMods>
+			</li>
+		</stages>
+	</HediffDef>
+
+	<!-- ==================== Damage Type ========================== -->
+
+	<DamageDef ParentName="Bullet">
+		<defName>ME_BigBullet</defName>
+		<buildingDamageFactor>0.7</buildingDamageFactor>
+		<plantDamageFactor>0.7</plantDamageFactor>
+	</DamageDef>
+
+	<DamageDef ParentName="Flame">
+		<defName>ME_SickBurn</defName>
+		<label>prometheum burn</label>
+		<workerClass>DamageWorker_AddInjury</workerClass>
+		<harmAllLayersUntilOutside>false</harmAllLayersUntilOutside>
+		<minDamageToFragment>99999</minDamageToFragment>
+		<hediff>BurnSecondary</hediff>
+		<additionalHediffs>
+			<li>
+				<hediff>PrometheumSoaked</hediff>
+				<severityPerDamageDealt>0.03</severityPerDamageDealt>
+				<victimSeverityScalingByInvBodySize>true</victimSeverityScalingByInvBodySize>
+			</li>
+		</additionalHediffs>
+	</DamageDef>
+
+	<DamageDef ParentName="Bullet">
+		<defName>ME_Cryo</defName>
+		<label>Cryo shot</label>
+		<externalViolence>false</externalViolence>
+		<deathMessage>{0} has succumbed to frostbite.</deathMessage>
+		<additionalHediffs>
+			<li>
+				<hediff>ME_Freeze</hediff>
+				<severityPerDamageDealt>0.05</severityPerDamageDealt>
+				<victimSeverityScalingByInvBodySize>true</victimSeverityScalingByInvBodySize>
+			</li>
+		</additionalHediffs>
+	</DamageDef>
+
+	<DamageDef ParentName="Bullet">
+		<defName>ME_Toxin</defName>
+		<label>Toxin shot</label>
+		<externalViolence>false</externalViolence>
+		<deathMessage>{0} has succumbed to bullet poisoning.</deathMessage>
+		<additionalHediffs>
+			<li>
+				<hediff>ME_Toxic</hediff>
+				<severityPerDamageDealt>0.05</severityPerDamageDealt>
+				<victimSeverityScalingByInvBodySize>true</victimSeverityScalingByInvBodySize>
+			</li>
+		</additionalHediffs>
+	</DamageDef>
+
+	<HediffDef>
+		<defName>ME_PrometheumSoaked</defName>
+		<label>Incendiary agent</label>
+		<description>Shot by incendiary slug</description>
+		<hediffClass>HediffWithComps</hediffClass>
+		<comps>
+			<li Class="HediffCompProperties_SeverityPerDay">
+				<severityPerDay>-30</severityPerDay>
+			</li>
+			<li Class="CombatExtended.HediffCompProperties_Prometheum"/>
+		</comps>
+		<stages>
+			<li>
+				<minSeverity>0.2</minSeverity>
+				<label>minor</label>
+				<statOffsets>
+					<Flammability>0.15</Flammability>
+				</statOffsets>
+			</li>
+			<li>
+				<minSeverity>0.40</minSeverity>
+				<label>dripping</label>
+				<statOffsets>
+					<Flammability>0.25</Flammability>
+				</statOffsets>
+			</li>
+			<li>
+				<minSeverity>0.6</minSeverity>
+				<label>soaked</label>
+				<statOffsets>
+					<Flammability>0.33</Flammability>
+				</statOffsets>
+			</li>
+			<li>
+				<minSeverity>0.8</minSeverity>
+				<label>drenched</label>
+				<statOffsets>
+					<Flammability>0.5</Flammability>
+				</statOffsets>
+			</li>
+		</stages>
+	</HediffDef>
+
+	<!-- ==================== Ammo Cat========================== -->
+
+	<ThingCategoryDef>
+		<defName>AmmoME</defName>
+		<label>Thermal clips</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberPlasmaMedium</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Ymir</defName>
+		<label>Thermal Clip</label>
+		<ammoTypes>
+			<Ammo_ME>RE_YmirBullet</Ammo_ME>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_ME_Cannon</defName>
+		<label>Thermal Clip</label>
+		<ammoTypes>
+			<Ammo_ME>ME_Bullet_Cannon</Ammo_ME>
+			<Ammo_ME_HE>ME_Bullet_Cannon_HE</Ammo_ME_HE>
+			<Ammo_ME_FI>ME_Bullet_Cannon_FI</Ammo_ME_FI>
+			<Ammo_ME_Ion>ME_Bullet_Cannon_Ion</Ammo_ME_Ion>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_M8</defName>
+		<label>Thermal Clip</label>
+		<ammoTypes>
+			<Ammo_ME>Bullet_M8_Basic</Ammo_ME>
+			<Ammo_ME_AP>Bullet_M8_AP</Ammo_ME_AP>
+			<Ammo_ME_Cryo>Bullet_M8_Cryo</Ammo_ME_Cryo>
+			<Ammo_ME_HE>Bullet_M8_HE</Ammo_ME_HE>
+			<Ammo_ME_FI>Bullet_M8_FI</Ammo_ME_FI>
+			<Ammo_ME_Ion>Bullet_M8_Ion</Ammo_ME_Ion>
+			<Ammo_ME_Toxic>Bullet_M8_Toxic</Ammo_ME_Toxic>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_M15</defName>
+		<label>Thermal Clip</label>
+		<ammoTypes>
+			<Ammo_ME>Bullet_M15_Basic</Ammo_ME>
+			<Ammo_ME_AP>Bullet_M15_AP</Ammo_ME_AP>
+			<Ammo_ME_Cryo>Bullet_M15_Cryo</Ammo_ME_Cryo>
+			<Ammo_ME_HE>Bullet_M15_HE</Ammo_ME_HE>
+			<Ammo_ME_FI>Bullet_M15_FI</Ammo_ME_FI>
+			<Ammo_ME_Ion>Bullet_M15_Ion</Ammo_ME_Ion>
+			<Ammo_ME_Toxic>Bullet_M15_Toxic</Ammo_ME_Toxic>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Katana</defName>
+		<label>Thermal Clip</label>
+		<ammoTypes>
+			<Ammo_ME>Bullet_Katana</Ammo_ME>
+			<Ammo_ME_AP>Bullet_Katana_AP</Ammo_ME_AP>
+			<Ammo_ME_Cryo>Bullet_Katana_Cryo</Ammo_ME_Cryo>
+			<Ammo_ME_HE>Bullet_Katana_HE</Ammo_ME_HE>
+			<Ammo_ME_FI>Bullet_Katana_FI</Ammo_ME_FI>
+			<Ammo_ME_Ion>Bullet_Katana_Ion</Ammo_ME_Ion>
+			<Ammo_ME_Toxic>Bullet_Katana_Toxic</Ammo_ME_Toxic>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Hydrashotty</defName>
+		<label>Thermal Clip</label>
+		<ammoTypes>
+			<Ammo_ME>Bullet_Hydra</Ammo_ME>
+			<Ammo_ME_AP>Bullet_Hydra_AP</Ammo_ME_AP>
+			<Ammo_ME_Cryo>Bullet_Hydra_Cryo</Ammo_ME_Cryo>
+			<Ammo_ME_HE>Bullet_Hydra_HE</Ammo_ME_HE>
+			<Ammo_ME_FI>Bullet_Hydra_FI</Ammo_ME_FI>
+			<Ammo_ME_Ion>Bullet_Hydra_Ion</Ammo_ME_Ion>
+			<Ammo_ME_Toxic>Bullet_Hydra_Toxic</Ammo_ME_Toxic>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_M98</defName>
+		<label>Thermal Clip</label>
+		<ammoTypes>
+			<Ammo_ME>Bullet_M98_Basic</Ammo_ME>
+			<Ammo_ME_AP>Bullet_M98_AP</Ammo_ME_AP>
+			<Ammo_ME_Cryo>Bullet_M98_Cryo</Ammo_ME_Cryo>
+			<Ammo_ME_HE>Bullet_M98_HE</Ammo_ME_HE>
+			<Ammo_ME_FI>Bullet_M98_FI</Ammo_ME_FI>
+			<Ammo_ME_Ion>Bullet_M98_Ion</Ammo_ME_Ion>
+			<Ammo_ME_Toxic>Bullet_M98_Toxic</Ammo_ME_Toxic>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Mantis</defName>
+		<label>Thermal Clip</label>
+		<ammoTypes>
+			<Ammo_ME>Bullet_Mantis</Ammo_ME>
+			<Ammo_ME_AP>Bullet_Mantis_AP</Ammo_ME_AP>
+			<Ammo_ME_Cryo>Bullet_Mantis_Cryo</Ammo_ME_Cryo>
+			<Ammo_ME_HE>Bullet_Mantis_HE</Ammo_ME_HE>
+			<Ammo_ME_FI>Bullet_Mantis_FI</Ammo_ME_FI>
+			<Ammo_ME_Ion>Bullet_Mantis_Ion</Ammo_ME_Ion>
+			<Ammo_ME_Toxic>Bullet_Mantis_Toxic</Ammo_ME_Toxic>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Tempest</defName>
+		<label>Thermal Clip</label>
+		<ammoTypes>
+			<Ammo_ME>Bullet_Tempest</Ammo_ME>
+			<Ammo_ME_AP>Bullet_Tempest_AP</Ammo_ME_AP>
+			<Ammo_ME_Cryo>Bullet_Tempest_Cryo</Ammo_ME_Cryo>
+			<Ammo_ME_HE>Bullet_Tempest_HE</Ammo_ME_HE>
+			<Ammo_ME_FI>Bullet_Tempest_FI</Ammo_ME_FI>
+			<Ammo_ME_Ion>Bullet_Tempest_Ion</Ammo_ME_Ion>
+			<Ammo_ME_Toxic>Bullet_Tempest_Toxic</Ammo_ME_Toxic>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Predator</defName>
+		<label>Thermal Clip</label>
+		<ammoTypes>
+			<Ammo_ME>Bullet_Predator</Ammo_ME>
+			<Ammo_ME_AP>Bullet_Predator_AP</Ammo_ME_AP>
+			<Ammo_ME_Cryo>Bullet_Predator_Cryo</Ammo_ME_Cryo>
+			<Ammo_ME_HE>Bullet_Predator_HE</Ammo_ME_HE>
+			<Ammo_ME_FI>Bullet_Predator_FI</Ammo_ME_FI>
+			<Ammo_ME_Ion>Bullet_Predator_Ion</Ammo_ME_Ion>
+			<Ammo_ME_Toxic>Bullet_Predator_Toxic</Ammo_ME_Toxic>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Phalanx</defName>
+		<label>Thermal Clip</label>
+		<ammoTypes>
+			<Ammo_ME>Bullet_Phalanx</Ammo_ME>
+			<Ammo_ME_AP>Bullet_Predator_AP</Ammo_ME_AP>
+			<Ammo_ME_Cryo>Bullet_Predator_Cryo</Ammo_ME_Cryo>
+			<Ammo_ME_HE>Bullet_Predator_HE</Ammo_ME_HE>
+			<Ammo_ME_FI>Bullet_Predator_FI</Ammo_ME_FI>
+			<Ammo_ME_Ion>Bullet_Predator_Ion</Ammo_ME_Ion>
+			<Ammo_ME_Toxic>Bullet_Predator_Toxic</Ammo_ME_Toxic>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== AmmoClass========================== -->
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>ME_FMJ</defName>
+		<label>Acccelerator slug</label>
+		<labelShort>Accelerator slug</labelShort>
+		<description>Minature pellets generated from a weapon's internal ammunition block, which are first reduced to near weightlessness by a mass effect field and then propelled to lethal speed by magnetic forces.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>ME_AP</defName>
+		<label>Armor-Piercing acccelerator slug</label>
+		<labelShort>AP</labelShort>
+		<description>Features a hardened tungsten carbide penetrator core for increased armor penetration. Causes less internal tissue damage.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>ME_Cryo</defName>
+		<label>Cryo acccelerator slug</label>
+		<labelShort>Cryo</labelShort>
+		<description>Filled with cryogenic agents that freezes your enemies in place upon impact.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>ME_HE</defName>
+		<label>High Explosive acccelerator slug</label>
+		<labelShort>HE</labelShort>
+		<description>Filled with high explosive agent that detonate upon impact.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>ME_FI</defName>
+		<label>Incendiary</label>
+		<description>Filled with incendiary agent that ignites after impact.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>ME_Ion</defName>
+		<label>Disruptor</label>
+		<labelShort>Disruptor</labelShort>
+		<description>Designed to combat mechanoids and shielding, the round creates an electrical current on impact, disrupting electronic systems temporarily.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>ME_Toxic</defName>
+		<label>Toxin</label>
+		<labelShort>Toxin</labelShort>
+		<description>Designed to combat organic targets, injects the target with a painful neuratoxin upon penetration. Inflicts extreme nausea and neuro paralysis to the victim.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<!-- ==================== Ammo Type ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_ME</defName>
+		<label>Basic Thermal clip</label>
+		<description>Thermal clips designed to fit almost all mass accelerator weapons. It allows mass accelerator weapons to fire continuously without needing to slow down in order to cool. It is best not to question where the projectile itself comes from.</description>
+		<statBases>
+			<Mass>0.01</Mass>
+			<Bulk>0.01</Bulk>
+			<MarketValue>0.24</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>ME_Ammo</li>
+			<li>CE_AutoEnableTrade</li>
+			<!-- Plasma ammo can't be handloaded, and the containment cell must be precision-machined anyway -->
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoME</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>ThirdParty/MassEffect/Heatsink</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>ME_FMJ</ammoClass>
+		<generateAllowChance>0.5</generateAllowChance>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_ME_AP</defName>
+		<label>AP Thermal clip</label>
+		<description>Thermal clips designed to fit almost all mass accelerator weapons. This one penetrates armour better.</description>
+		<statBases>
+			<Mass>0.015</Mass>
+			<Bulk>0.012</Bulk>
+			<MarketValue>0.35</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<!-- Plasma ammo can't be handloaded, and the containment cell must be precision-machined anyway -->
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoME</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>ThirdParty/MassEffect/ME_AP</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>ME_AP</ammoClass>
+		<generateAllowChance>0.33</generateAllowChance>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_ME_Cryo</defName>
+		<label>Cryo Thermal clip</label>
+		<description>Thermal clips designed to fit almost all mass accelerator weapons. This one makes your enemy slow and cumberson.</description>
+		<statBases>
+			<Mass>0.01</Mass>
+			<Bulk>0.01</Bulk>
+			<MarketValue>0.5</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>ME_Ammo</li>
+			<li>CE_AutoEnableTrade</li>
+			<!-- Plasma ammo can't be handloaded, and the containment cell must be precision-machined anyway -->
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoME</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>ThirdParty/MassEffect/ME_Cryo</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>ME_Cryo</ammoClass>
+		<generateAllowChance>0.15</generateAllowChance>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_ME_HE</defName>
+		<label>HE Thermal clip</label>
+		<description>Thermal clips designed to fit almost all mass accelerator weapons.</description>
+		<statBases>
+			<Mass>0.01</Mass>
+			<Bulk>0.01</Bulk>
+			<MarketValue>0.64</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>ME_Ammo</li>
+			<li>CE_AutoEnableTrade</li>
+			<!-- Plasma ammo can't be handloaded, and the containment cell must be precision-machined anyway -->
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoME</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>ThirdParty/MassEffect/ME_HE</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>ME_HE</ammoClass>
+		<generateAllowChance>0.125</generateAllowChance>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_ME_FI</defName>
+		<label>incendiary Thermal clip</label>
+		<description>Thermal clips designed to fit almost all mass accelerator weapons. Set enemy on fire.</description>
+		<statBases>
+			<Mass>0.01</Mass>
+			<Bulk>0.01</Bulk>
+			<MarketValue>0.6</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>ME_Ammo</li>
+			<li>CE_AutoEnableTrade</li>
+			<!-- Plasma ammo can't be handloaded, and the containment cell must be precision-machined anyway -->
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoME</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>ThirdParty/MassEffect/ME_FI</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>ME_FI</ammoClass>
+		<generateAllowChance>0.15</generateAllowChance>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_ME_Ion</defName>
+		<label>Disruptor Thermal clip</label>
+		<description>Thermal clips designed to fit almost all mass accelerator weapons. This one makes your enemy combust.</description>
+		<statBases>
+			<Mass>0.01</Mass>
+			<Bulk>0.01</Bulk>
+			<MarketValue>0.6</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>ME_Ammo</li>
+			<li>CE_AutoEnableTrade</li>
+			<!-- Plasma ammo can't be handloaded, and the containment cell must be precision-machined anyway -->
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoME</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>ThirdParty/MassEffect/ME_EMP</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>ME_Ion</ammoClass>
+		<generateAllowChance>0.1</generateAllowChance>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_ME_Toxic</defName>
+		<label>Toxin Thermal clip</label>
+		<description>Thermal clips designed to fit almost all mass accelerator weapons.</description>
+		<statBases>
+			<Mass>0.01</Mass>
+			<Bulk>0.01</Bulk>
+			<MarketValue>0.5</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>ME_Ammo</li>
+			<li>CE_AutoEnableTrade</li>
+			<!-- Plasma ammo can't be handloaded, and the containment cell must be precision-machined anyway -->
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoME</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>ThirdParty/MassEffect/ME_Toxic</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>ME_Toxic</ammoClass>
+		<generateAllowChance>0.15</generateAllowChance>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+	<!-- ================== Fragments ================== -->
+
+	<ThingDef ParentName="BaseFragment">
+		<defName>Fragment_ME</defName>
+		<label>small fragments</label>
+		<graphicData>
+			<texPath>Things/Projectile/Fragments/Fragment_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Fragment</damageDef>
+			<damageAmountBase>8</damageAmountBase>
+			<speed>56</speed>
+			<armorPenetrationSharp>7</armorPenetrationSharp>
+			<armorPenetrationBlunt>18</armorPenetrationBlunt>
+			<gravityFactor>15</gravityFactor>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== ML77 ================== -->
+	<ThingDef ParentName="BaseRPG7Grenade">
+		<defName>VFE_Bullet_ML77CE</defName>
+		<label>ML77 Missile</label>
+		<graphicData>
+			<texPath>Things/Projectile/Rocket/M72LAW</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>88</speed>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>200</damageAmountBase>
+			<armorPenetrationSharp>300</armorPenetrationSharp>
+			<armorPenetrationBlunt>31.584</armorPenetrationBlunt>
+			<soundAmbient>RocketPropelledLoop_Small</soundAmbient>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>200</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>2</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>7</Fragment_Large>
+					<Fragment_Small>20</Fragment_Small>
+					<Fragment_ME>20</Fragment_ME>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+	<!-- ================== Ymir Mech ================== -->
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>RE_YmirBullet</defName>
+		<thingClass>CombatExtended.BulletCE</thingClass>
+		<label>Mass accelerator cannon</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shot_MassAccelerated_Large</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<flyOverhead>false</flyOverhead>
+			<speed>368</speed>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>43</damageAmountBase>
+			<armorPenetrationSharp>30</armorPenetrationSharp>
+			<armorPenetrationBlunt>348</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== Heavy CANNON ================== -->
+
+	<ThingDef ParentName="BaseRPG7Grenade">
+		<defName>ME_Bullet_Cannon</defName>
+		<label>Cannon Slug</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shot_MassAcceleratorTurret_Heavy</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>400</speed>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>100</damageAmountBase>
+			<armorPenetrationSharp>100</armorPenetrationSharp>
+			<armorPenetrationBlunt>800.584</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>36</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.9</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_ME>6</Fragment_ME>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseRPG7Grenade">
+		<defName>ME_Bullet_Cannon_FI</defName>
+		<label>Cannon Slug</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shot_MassAcceleratorTurret_Heavy</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>400</speed>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>100</damageAmountBase>
+			<armorPenetrationSharp>100</armorPenetrationSharp>
+			<armorPenetrationBlunt>800.584</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>36</damageAmountBase>
+				<explosiveDamageType>Flame</explosiveDamageType>
+				<explosiveRadius>1.1</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_ME>6</Fragment_ME>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseRPG7Grenade">
+		<defName>ME_Bullet_Cannon_HE</defName>
+		<label>HE Cannon Slug</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shot_MassAcceleratorTurret_Heavy</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>400</speed>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>100</damageAmountBase>
+			<armorPenetrationSharp>100</armorPenetrationSharp>
+			<armorPenetrationBlunt>800.584</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>36</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>58</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1.5</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_ME>12</Fragment_ME>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseRPG7Grenade">
+		<defName>ME_Bullet_Cannon_Ion</defName>
+		<label>Disruptor Cannon Slug</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shot_MassAcceleratorTurret_Heavy</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>400</speed>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>100</damageAmountBase>
+			<armorPenetrationSharp>100</armorPenetrationSharp>
+			<armorPenetrationBlunt>800.584</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>35</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>36</damageAmountBase>
+				<explosiveDamageType>EMP</explosiveDamageType>
+				<explosiveRadius>2</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_ME>6</Fragment_ME>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ================== Projectiles M8================== -->
+
+	<ThingDef Name="BaseM8Bullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Shot_MassAccelerated_Large</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>400</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseM8Bullet">
+		<defName>Bullet_M8_Basic</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>15</damageAmountBase>
+			<armorPenetrationSharp>15</armorPenetrationSharp>
+			<armorPenetrationBlunt>48</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseM8Bullet">
+		<defName>Bullet_M8_AP</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationSharp>30</armorPenetrationSharp>
+			<armorPenetrationBlunt>48</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseM8Bullet">
+		<defName>Bullet_M8_HE</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>15</damageAmountBase>
+			<armorPenetrationSharp>15</armorPenetrationSharp>
+			<armorPenetrationBlunt>48</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>7</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseM8Bullet">
+		<defName>Bullet_M8_FI</defName>
+		<label>accelerated incendiary shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>15</damageAmountBase>
+			<armorPenetrationSharp>15</armorPenetrationSharp>
+			<armorPenetrationBlunt>48</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_SickBurn</def>
+					<amount>3</amount>
+				</li>
+				<li>
+					<def>Flame</def>
+					<amount>1</amount>
+					<chance>0.3</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseM8Bullet">
+		<defName>Bullet_M8_Cryo</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>14</damageAmountBase>
+			<armorPenetrationSharp>15</armorPenetrationSharp>
+			<armorPenetrationBlunt>48</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Cryo</def>
+					<amount>4</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseM8Bullet">
+		<defName>Bullet_M8_Toxic</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>15</damageAmountBase>
+			<armorPenetrationSharp>15</armorPenetrationSharp>
+			<armorPenetrationBlunt>48</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Toxin</def>
+					<amount>4</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseM8Bullet">
+		<defName>Bullet_M8_Ion</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>11</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>5</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>18</armorPenetrationSharp>
+			<armorPenetrationBlunt>40</armorPenetrationBlunt>
+			<empShieldBreakChance>0.25</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== 
+ ================== -->
+
+	<ThingDef Name="BaseM15Bullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Shot_MassAccelerated_Large</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>400</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseM15Bullet">
+		<defName>Bullet_M15_Basic</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>21</damageAmountBase>
+			<armorPenetrationSharp>18</armorPenetrationSharp>
+			<armorPenetrationBlunt>64</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseM15Bullet">
+		<defName>Bullet_M15_AP</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>15</damageAmountBase>
+			<armorPenetrationSharp>36</armorPenetrationSharp>
+			<armorPenetrationBlunt>64</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseM15Bullet">
+		<defName>Bullet_M15_HE</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>21</damageAmountBase>
+			<armorPenetrationSharp>18</armorPenetrationSharp>
+			<armorPenetrationBlunt>64</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>10</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseM15Bullet">
+		<defName>Bullet_M15_Cryo</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>18</armorPenetrationSharp>
+			<armorPenetrationBlunt>64</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Cryo</def>
+					<amount>5</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseM15Bullet">
+		<defName>Bullet_M15_Toxic</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>18</armorPenetrationSharp>
+			<armorPenetrationBlunt>64</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Toxin</def>
+					<amount>5</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseM15Bullet">
+		<defName>Bullet_M15_Ion</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>14</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>8</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>21</armorPenetrationSharp>
+			<armorPenetrationBlunt>64</armorPenetrationBlunt>
+			<empShieldBreakChance>0.33</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseM15Bullet">
+		<defName>Bullet_M15_FI</defName>
+		<label>accelerated incendiary shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>18</armorPenetrationSharp>
+			<armorPenetrationBlunt>64</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_SickBurn</def>
+					<amount>3</amount>
+				</li>
+				<li>
+					<def>Flame</def>
+					<amount>1</amount>
+					<chance>0.33</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== Katana ================== -->
+
+	<ThingDef Name="BaseKatanaBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Shot_MassAccelerated_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>0.75</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>200</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseKatanaBullet">
+		<defName>Bullet_Katana</defName>
+		<label>accelerated blast</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>11</damageAmountBase>
+			<armorPenetrationSharp>11</armorPenetrationSharp>
+			<armorPenetrationBlunt>30</armorPenetrationBlunt>
+			<pelletCount>8</pelletCount>
+			<spreadMult>15.8</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseKatanaBullet">
+		<defName>Bullet_Katana_AP</defName>
+		<label>accelerated blast</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>7</damageAmountBase>
+			<armorPenetrationSharp>22</armorPenetrationSharp>
+			<armorPenetrationBlunt>30</armorPenetrationBlunt>
+			<pelletCount>8</pelletCount>
+			<spreadMult>15.8</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseKatanaBullet">
+		<defName>Bullet_Katana_HE</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>11</damageAmountBase>
+			<armorPenetrationSharp>11</armorPenetrationSharp>
+			<armorPenetrationBlunt>30</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>5</amount>
+				</li>
+			</secondaryDamage>
+			<pelletCount>8</pelletCount>
+			<spreadMult>15.8</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseKatanaBullet">
+		<defName>Bullet_Katana_Ion</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>8</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>3</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>13</armorPenetrationSharp>
+			<armorPenetrationBlunt>30</armorPenetrationBlunt>
+			<pelletCount>8</pelletCount>
+			<spreadMult>15.8</spreadMult>
+			<empShieldBreakChance>0.1</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseKatanaBullet">
+		<defName>Bullet_Katana_Cryo</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>10</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>ME_Cryo</def>
+					<amount>3</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>11</armorPenetrationSharp>
+			<armorPenetrationBlunt>30</armorPenetrationBlunt>
+			<pelletCount>8</pelletCount>
+			<spreadMult>15.8</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseKatanaBullet">
+		<defName>Bullet_Katana_Toxic</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>10</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>ME_Toxin</def>
+					<amount>3</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>11</armorPenetrationSharp>
+			<armorPenetrationBlunt>30</armorPenetrationBlunt>
+			<pelletCount>8</pelletCount>
+			<spreadMult>15.8</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseKatanaBullet">
+		<defName>Bullet_Katana_FI</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>11</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>ME_SickBurn</def>
+					<amount>1</amount>
+				</li>
+				<li>
+					<def>Flame</def>
+					<amount>1</amount>
+					<chance>0.08</chance>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>11</armorPenetrationSharp>
+			<armorPenetrationBlunt>30</armorPenetrationBlunt>
+			<pelletCount>8</pelletCount>
+			<spreadMult>15.8</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== Hydra ================== -->
+
+	<ThingDef ParentName="BaseKatanaBullet">
+		<defName>Bullet_Hydra</defName>
+		<label>accelerated blast</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>9</damageAmountBase>
+			<armorPenetrationSharp>10</armorPenetrationSharp>
+			<armorPenetrationBlunt>24</armorPenetrationBlunt>
+			<pelletCount>8</pelletCount>
+			<spreadMult>16.8</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseKatanaBullet">
+		<defName>Bullet_Hydra_AP</defName>
+		<label>accelerated blast</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>6</damageAmountBase>
+			<armorPenetrationSharp>20</armorPenetrationSharp>
+			<armorPenetrationBlunt>24</armorPenetrationBlunt>
+			<pelletCount>8</pelletCount>
+			<spreadMult>16.8</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseKatanaBullet">
+		<defName>Bullet_Hydra_HE</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>9</damageAmountBase>
+			<armorPenetrationSharp>10</armorPenetrationSharp>
+			<armorPenetrationBlunt>24</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>4</amount>
+				</li>
+			</secondaryDamage>
+			<pelletCount>8</pelletCount>
+			<spreadMult>16.8</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseKatanaBullet">
+		<defName>Bullet_Hydra_Cryo</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>8</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>ME_Cryo</def>
+					<amount>3</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>10</armorPenetrationSharp>
+			<armorPenetrationBlunt>24</armorPenetrationBlunt>
+			<pelletCount>8</pelletCount>
+			<spreadMult>16.8</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseKatanaBullet">
+		<defName>Bullet_Hydra_Toxic</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>8</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>ME_Toxin</def>
+					<amount>3</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>10</armorPenetrationSharp>
+			<armorPenetrationBlunt>24</armorPenetrationBlunt>
+			<pelletCount>8</pelletCount>
+			<spreadMult>16.8</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseKatanaBullet">
+		<defName>Bullet_Hydra_FI</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>9</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>ME_SickBurn</def>
+					<amount>1</amount>
+				</li>
+				<li>
+					<def>Flame</def>
+					<amount>1</amount>
+					<chance>0.075</chance>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>10</armorPenetrationSharp>
+			<armorPenetrationBlunt>24</armorPenetrationBlunt>
+			<pelletCount>8</pelletCount>
+			<spreadMult>16.8</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseKatanaBullet">
+		<defName>Bullet_Hydra_Ion</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>6</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>3</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>12</armorPenetrationSharp>
+			<armorPenetrationBlunt>24</armorPenetrationBlunt>
+			<pelletCount>8</pelletCount>
+			<spreadMult>16.8</spreadMult>
+			<empShieldBreakChance>0.08</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== M98 ================== -->
+	<ThingDef Name="BaseM98Bullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Shot_MassAccelerated_Sniper</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>1.6</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>ME_BigBullet</damageDef>
+			<speed>500</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseM98Bullet">
+		<defName>Bullet_M98_Basic</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>74</damageAmountBase>
+			<armorPenetrationSharp>48</armorPenetrationSharp>
+			<armorPenetrationBlunt>600</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseM98Bullet">
+		<defName>Bullet_M98_AP</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>49</damageAmountBase>
+			<armorPenetrationSharp>96</armorPenetrationSharp>
+			<armorPenetrationBlunt>600</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseM98Bullet">
+		<defName>Bullet_M98_HE</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>74</damageAmountBase>
+			<armorPenetrationSharp>48</armorPenetrationSharp>
+			<armorPenetrationBlunt>600</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>26</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>26</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.9</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseM98Bullet">
+		<defName>Bullet_M98_Cryo</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>70</damageAmountBase>
+			<armorPenetrationSharp>48</armorPenetrationSharp>
+			<armorPenetrationBlunt>600</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Cryo</def>
+					<amount>20</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseM98Bullet">
+		<defName>Bullet_M98_Toxic</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>70</damageAmountBase>
+			<armorPenetrationSharp>48</armorPenetrationSharp>
+			<armorPenetrationBlunt>600</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Toxin</def>
+					<amount>20</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseM98Bullet">
+		<defName>Bullet_M98_FI</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>72</damageAmountBase>
+			<armorPenetrationSharp>48</armorPenetrationSharp>
+			<armorPenetrationBlunt>600</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_SickBurn</def>
+					<amount>11</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>6</damageAmountBase>
+				<explosiveDamageType>Flame</explosiveDamageType>
+				<explosiveRadius>0.9</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseM98Bullet">
+		<defName>Bullet_M98_Ion</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>46</damageAmountBase>
+			<armorPenetrationSharp>55</armorPenetrationSharp>
+			<armorPenetrationBlunt>600</armorPenetrationBlunt>
+			<empShieldBreakChance>1</empShieldBreakChance>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>32</damageAmountBase>
+				<explosiveDamageType>EMP</explosiveDamageType>
+				<explosiveRadius>0.9</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ================== Mantis ================== -->
+
+	<ThingDef Name="BaseMantisBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Shot_MassAccelerated_Sniper</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>1.1</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>500</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseMantisBullet">
+		<defName>Bullet_Mantis</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>40</damageAmountBase>
+			<armorPenetrationSharp>30</armorPenetrationSharp>
+			<armorPenetrationBlunt>200</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseMantisBullet">
+		<defName>Bullet_Mantis_AP</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>27</damageAmountBase>
+			<armorPenetrationSharp>60</armorPenetrationSharp>
+			<armorPenetrationBlunt>200</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseMantisBullet">
+		<defName>Bullet_Mantis_Cryo</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>38</damageAmountBase>
+			<armorPenetrationSharp>30</armorPenetrationSharp>
+			<armorPenetrationBlunt>200</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Cryo</def>
+					<amount>9</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseMantisBullet">
+		<defName>Bullet_Mantis_HE</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>40</damageAmountBase>
+			<armorPenetrationSharp>30</armorPenetrationSharp>
+			<armorPenetrationBlunt>200</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>20</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseMantisBullet">
+		<defName>Bullet_Mantis_Toxic</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>38</damageAmountBase>
+			<armorPenetrationSharp>30</armorPenetrationSharp>
+			<armorPenetrationBlunt>200</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Toxin</def>
+					<amount>9</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseMantisBullet">
+		<defName>Bullet_Mantis_FI</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>40</damageAmountBase>
+			<armorPenetrationSharp>30</armorPenetrationSharp>
+			<armorPenetrationBlunt>200</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_SickBurn</def>
+					<amount>7</amount>
+				</li>
+				<li>
+					<def>Flame</def>
+					<amount>1</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseMantisBullet">
+		<defName>Bullet_Mantis_Ion</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>30</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>11</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>34</armorPenetrationSharp>
+			<armorPenetrationBlunt>200</armorPenetrationBlunt>
+			<empShieldBreakChance>1</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== Tempest ================== -->
+
+	<ThingDef Name="BaseTempestBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Shot_MassAccelerated_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>1.1</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>200</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseTempestBullet">
+		<defName>Bullet_Tempest</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>9</armorPenetrationSharp>
+			<armorPenetrationBlunt>30</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseTempestBullet">
+		<defName>Bullet_Tempest_AP</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>8</damageAmountBase>
+			<armorPenetrationSharp>18</armorPenetrationSharp>
+			<armorPenetrationBlunt>30</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseTempestBullet">
+		<defName>Bullet_Tempest_HE</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>9</armorPenetrationSharp>
+			<armorPenetrationBlunt>30</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>6</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseTempestBullet">
+		<defName>Bullet_Tempest_Cryo</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>9</armorPenetrationSharp>
+			<armorPenetrationBlunt>30</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Cryo</def>
+					<amount>3</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseTempestBullet">
+		<defName>Bullet_Tempest_Toxic</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>9</armorPenetrationSharp>
+			<armorPenetrationBlunt>30</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Toxin</def>
+					<amount>3</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseTempestBullet">
+		<defName>Bullet_Tempest_FI</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>9</armorPenetrationSharp>
+			<armorPenetrationBlunt>30</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_SickBurn</def>
+					<amount>2</amount>
+				</li>
+				<li>
+					<def>Flame</def>
+					<amount>1</amount>
+					<chance>0.25</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseTempestBullet">
+		<defName>Bullet_Tempest_Ion</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>8</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>4</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>11</armorPenetrationSharp>
+			<armorPenetrationBlunt>30</armorPenetrationBlunt>
+			<empShieldBreakChance>0.25</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== Predator ================== -->
+
+	<ThingDef Name="BasePredatorBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Shot_MassAccelerated_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>1.2</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>188</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BasePredatorBullet">
+		<defName>Bullet_Predator</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>14</damageAmountBase>
+			<armorPenetrationSharp>9</armorPenetrationSharp>
+			<armorPenetrationBlunt>27</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BasePredatorBullet">
+		<defName>Bullet_Predator_AP</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>100</speed>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>9</damageAmountBase>
+			<armorPenetrationSharp>18</armorPenetrationSharp>
+			<armorPenetrationBlunt>27</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BasePredatorBullet">
+		<defName>Bullet_Predator_HE</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>14</damageAmountBase>
+			<armorPenetrationSharp>9</armorPenetrationSharp>
+			<armorPenetrationBlunt>27</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>7</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BasePredatorBullet">
+		<defName>Bullet_Predator_Cryo</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>13</damageAmountBase>
+			<armorPenetrationSharp>9</armorPenetrationSharp>
+			<armorPenetrationBlunt>27</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Cryo</def>
+					<amount>4</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BasePredatorBullet">
+		<defName>Bullet_Predator_Toxic</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>13</damageAmountBase>
+			<armorPenetrationSharp>9</armorPenetrationSharp>
+			<armorPenetrationBlunt>27</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Toxin</def>
+					<amount>4</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BasePredatorBullet">
+		<defName>Bullet_Predator_FI</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>14</damageAmountBase>
+			<armorPenetrationSharp>9</armorPenetrationSharp>
+			<armorPenetrationBlunt>27</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_SickBurn</def>
+					<amount>3</amount>
+				</li>
+				<li>
+					<def>Flame</def>
+					<amount>1</amount>
+					<chance>0.25</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BasePredatorBullet">
+		<defName>Bullet_Predator_Ion</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>9</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>5</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>11</armorPenetrationSharp>
+			<armorPenetrationBlunt>27</armorPenetrationBlunt>
+			<empShieldBreakChance>0.25</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== Phalanx ================== -->
+
+	<ThingDef Name="BasePhalanxBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Shot_MassAccelerated_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>1.3</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>200</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BasePhalanxBullet">
+		<defName>Bullet_Phalanx</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>18</damageAmountBase>
+			<armorPenetrationSharp>11</armorPenetrationSharp>
+			<armorPenetrationBlunt>38</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BasePhalanxBullet">
+		<defName>Bullet_Phalanx_AP</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>22</armorPenetrationSharp>
+			<armorPenetrationBlunt>38</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BasePhalanxBullet">
+		<defName>Bullet_Phalanx_HE</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>18</damageAmountBase>
+			<armorPenetrationSharp>11</armorPenetrationSharp>
+			<armorPenetrationBlunt>38</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>9</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BasePhalanxBullet">
+		<defName>Bullet_Phalanx_Cryo</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>17</damageAmountBase>
+			<armorPenetrationSharp>11</armorPenetrationSharp>
+			<armorPenetrationBlunt>38</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Cryo</def>
+					<amount>5</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BasePhalanxBullet">
+		<defName>Bullet_Phalanx_Toxic</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>17</damageAmountBase>
+			<armorPenetrationSharp>11</armorPenetrationSharp>
+			<armorPenetrationBlunt>38</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Toxin</def>
+					<amount>5</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BasePhalanxBullet">
+		<defName>Bullet_Phalanx_FI</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>18</damageAmountBase>
+			<armorPenetrationSharp>11</armorPenetrationSharp>
+			<armorPenetrationBlunt>38</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_SickBurn</def>
+					<amount>3</amount>
+				</li>
+				<li>
+					<def>Flame</def>
+					<amount>1</amount>
+					<chance>0.3</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BasePhalanxBullet">
+		<defName>Bullet_Phalanx_Ion</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>6</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>12</armorPenetrationSharp>
+			<armorPenetrationBlunt>38</armorPenetrationBlunt>
+			<empShieldBreakChance>0.3</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/Alliance_Pawns.xml b/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/Alliance_Pawns.xml
new file mode 100644
index 0000000000..cff5a4b415
--- /dev/null
+++ b/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/Alliance_Pawns.xml	
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="RE_Merchant" or
+			defName="RE_Colonist" or
+			defName="RE_Farmer" or
+			defName="RE_AllianceOfficer" or
+			defName="RE_AllianceRecruit" or
+			defName="RE_AllianceMilitia" or
+			defName="RE_Official" or
+			defName="RE_Ranger" or
+			defName="RE_Scientist" or
+			defName="RE_Medic" or
+			defName="RE_Scientist" or
+			defName="RE_PrimeMinister"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>3</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.25</generateChance>
+						<sidearmMoney>
+							<min>20</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+					<li>
+						<generateChance>0.075</generateChance>
+						<sidearmMoney>
+							<min>80</min>
+							<max>160</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_FlareLauncher</li>
+						</weaponTags>
+						<magazineCount>
+							<min>1</min>
+							<max>1</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="RE_Alliance_Adept" or
+			defName="RE_Alliance_Marine" or
+			defName="RE_Spectre" or
+			defName="RE_Alliance_Engineer"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.25</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+					<li>
+						<generateChance>0.125</generateChance>
+						<sidearmMoney>
+							<min>10</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>GrenadeSmoke</li>
+							<li>GrenadeDestructive</li>
+						</weaponTags>
+						<magazineCount>
+							<min>0</min>
+							<max>1</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RE_Alliance_MarineHeavy"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>12</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.75</generateChance>
+						<sidearmMoney>
+							<min>200</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>RE_Bullet_AlliancePistol</li>
+						</weaponTags>
+						<magazineCount>
+							<min>2</min>
+							<max>3</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="RE_Alliance_MarineSniper"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>12</min>
+					<max>21</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ======= Combat Power ======= -->
+
+	<!-- Trooper -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[
+			defName="RE_Alliance_Marine"
+			]/combatPower </xpath>
+		<value>
+			<combatPower>200</combatPower>
+		</value>
+	</Operation>
+
+	<!-- Infiltrator -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[
+			defName="RE_Ranger" or
+			defName="RE_AllianceMilitia"
+			]/combatPower </xpath>
+		<value>
+			<combatPower>80</combatPower>
+		</value>
+	</Operation>
+
+	<!-- Special -->
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/Apparel_ME.xml b/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/Apparel_ME.xml
new file mode 100644
index 0000000000..6b41f00e9b
--- /dev/null
+++ b/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/Apparel_ME.xml	
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_Fatigues"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+			<Bulk>5</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceDressJacket"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+			<ArmorRating_Sharp>0.04</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceDressJacket"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.04</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_FormalShirt"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>40</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_FormalShirt"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_FormalJacket"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_BattleUniform"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+			<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_BattleUniform"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>0.4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceOfficerHat"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>0</WornBulk>
+			<ArmorRating_Sharp>0.02</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceOfficerHat"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.03</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_ScienceUniform"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+			<ArmorRating_Sharp>0.08</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_ScienceUniform"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/Armor_ME.xml b/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/Armor_ME.xml
new file mode 100644
index 0000000000..53d0c680ea
--- /dev/null
+++ b/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/Armor_ME.xml	
@@ -0,0 +1,777 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceArmor" or defName="RE_Apparel_AllianceArmor" or defName="RE_Apparel_HeavyAllianceArmor" or defName="RE_Apparel_SpectreArmor"]/apparel/layers</xpath>
+		<value>
+			<li>Webbing</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='RE_Apparel_LightAllianceArmor' or defName='RE_Apparel_LightAllianceHelmet']/recipeMaker/skillRequirements</xpath>
+		<value>
+			<skillRequirements>
+				<Crafting>6</Crafting>
+			</skillRequirements>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='RE_Apparel_AllianceArmor' or defName='RE_Apparel_AllianceHelmet']/recipeMaker/skillRequirements</xpath>
+		<value>
+			<skillRequirements>
+				<Crafting>8</Crafting>
+			</skillRequirements>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='RE_Apparel_HeavyAllianceArmor' or defName='RE_Apparel_HeavyAllianceHelmet']/recipeMaker/skillRequirements</xpath>
+		<value>
+			<skillRequirements>
+				<Crafting>10</Crafting>
+			</skillRequirements>
+		</value>
+	</Operation>
+
+	<!-- === Light Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>0.5</WornBulk>
+			<NightVisionEfficiency_Apparel>0.7</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>11</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>180</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceHelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0.1</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceHelmet"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingDelayFactor>-0.05</AimingDelayFactor>
+				<ToxicEnvironmentResistance>0.10</ToxicEnvironmentResistance>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceHelmet"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>40</Plasteel>
+			<DevilstrandCloth>10</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceHelmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.50</ArmorRating_Sharp>
+						<parts>
+							<li>Nose</li>
+							<li>Jaw</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.50</ArmorRating_Blunt>
+						<parts>
+							<li>Nose</li>
+							<li>Jaw</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Trooper Armor === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceArmor"]/statBases/Mass</xpath>
+		<value>
+			<Bulk>35</Bulk>
+			<WornBulk>6</WornBulk>
+			<Mass>12</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>13</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>26</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>400</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceArmor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0.1</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceArmor"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>12</CarryWeight>
+				<CarryBulk>35</CarryBulk>
+				<ShootingAccuracyPawn>0.05</ShootingAccuracyPawn>
+				<ToxicEnvironmentResistance>0.3</ToxicEnvironmentResistance>
+				<MoveSpeed>0.3</MoveSpeed>
+				<ReloadSpeed>0.1</ReloadSpeed>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceArmor"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>25</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Medium Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>0.5</WornBulk>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceHelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0.1</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>13</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>24</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>200</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceHelmet"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<PsychicSensitivity>-0.1</PsychicSensitivity>
+				<AimingDelayFactor>-0.05</AimingDelayFactor>
+				<ToxicEnvironmentResistance>0.25</ToxicEnvironmentResistance>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceHelmet"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>50</Plasteel>
+			<DevilstrandCloth>10</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceHelmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Medium Armor === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceArmor"]/statBases/Mass</xpath>
+		<value>
+			<Bulk>50</Bulk>
+			<WornBulk>8</WornBulk>
+			<Mass>22</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceArmor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0.1</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>17</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>32</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>450</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<CarryWeight>20</CarryWeight>
+			<CarryBulk>40</CarryBulk>
+			<ShootingAccuracyPawn>0.05</ShootingAccuracyPawn>
+			<ToxicEnvironmentResistance>0.3</ToxicEnvironmentResistance>
+			<ReloadSpeed>0.1</ReloadSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceArmor"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>35</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Heavy Alliance Helmet === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceHelmet"]/statBases/Mass</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>2.5</WornBulk>
+			<Mass>6</Mass>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceHelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0.1</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>17</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>34</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>240</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceHelmet"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<PsychicSensitivity>-0.3</PsychicSensitivity>
+				<AimingAccuracy>0.3</AimingAccuracy>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+				<CarryWeight>5.4</CarryWeight>
+				<CarryBulk>1</CarryBulk>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+				<PainShockThreshold>0.05</PainShockThreshold>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceHelmet"]/costList</xpath>
+		<value>
+			<costList>
+				<Plasteel>65</Plasteel>
+				<DevilstrandCloth>15</DevilstrandCloth>
+				<ComponentSpacer>3</ComponentSpacer>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceHelmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Heavy Alliance Armor === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceArmor"]/statBases/Mass</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>20</WornBulk>
+			<Mass>60</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceArmor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0.1</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>22</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>60</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>520</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>75</CarryWeight>
+				<CarryBulk>60</CarryBulk>
+				<ShootingAccuracyPawn>0.2</ShootingAccuracyPawn>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+				<PainShockThreshold>0.05</PainShockThreshold>
+				<MoveSpeed>-0.4</MoveSpeed>
+				<ReloadSpeed>0.1</ReloadSpeed>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceArmor"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>50</DevilstrandCloth>
+			<Hyperweave>10</Hyperweave>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Spectre Armor === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_SpectreArmor"]/statBases/Mass</xpath>
+		<value>
+			<Bulk>80</Bulk>
+			<WornBulk>15</WornBulk>
+			<Mass>30</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_SpectreArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_SpectreArmor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0.1</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_SpectreArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>44</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_SpectreArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>500</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_SpectreArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>40</CarryWeight>
+				<CarryBulk>50</CarryBulk>
+				<ShootingAccuracyPawn>0.3</ShootingAccuracyPawn>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+				<PainShockThreshold>0.1</PainShockThreshold>
+				<MoveSpeed>0.5</MoveSpeed>
+				<ReloadSpeed>0.1</ReloadSpeed>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_SpectreArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_SpectreArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_SpectreVisor"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+			<Bulk>1</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_SpectreVisor"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<ShootingAccuracyPawn>0.8</ShootingAccuracyPawn>
+				<AimingAccuracy>0.4</AimingAccuracy>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_SpectreVisor"]/apparel</xpath>
+		<value>
+			<layers>
+				<li>StrappedHead</li>
+			</layers>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/ME_Abilities.xml b/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/ME_Abilities.xml
new file mode 100644
index 0000000000..e734582894
--- /dev/null
+++ b/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/ME_Abilities.xml	
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Biotic -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="RE_Biotic_Throw" or defName="RE_Biotic_Pull" ]/range</xpath>
+		<value>
+			<range>34</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="RE_Biotic_Annihilation" or defName="RE_Biotic_Dominate" or defName="RE_Biotic_Singularity" or defName="RE_Biotic_Flare" ]/range</xpath>
+		<value>
+			<range>40</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="RE_Biotic_Charge"]/range</xpath>
+		<value>
+			<range>46</range>
+		</value>
+	</Operation>
+
+	<!-- Spectre -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="RE_SpectreArmor_AdrenalineRushHediff"]/stages/li[1]</xpath>
+		<value>
+			<statOffsets>
+				<Suppressability>-0.5</Suppressability>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="RE_SpectreArmor_CombatMasteryHediff"]/stages/li[1]/statFactors</xpath>
+		<value>
+			<statOffsets>
+				<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+				<AimingAccuracy>0.4</AimingAccuracy>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<!-- Tech -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "RE_Tech_CombatDroneTurret"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.9</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="RE_Tech_CryoBlast" or defName="RE_Tech_Incinerate"]/range</xpath>
+		<value>
+			<range>36</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="RE_Tech_CombatDrone"]/range</xpath>
+		<value>
+			<range>24</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="RE_Tech_HexShield" or defName="RE_Tech_Overload" or defName="RE_Tech_Sabotage"]/range</xpath>
+		<value>
+			<range>26</range>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/ME_Animals.xml b/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/ME_Animals.xml
new file mode 100644
index 0000000000..2fa9e662ef
--- /dev/null
+++ b/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/ME_Animals.xml	
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RE_SpaceCow" or
+			defName="RE_Pyjak" or
+			defName="RE_Varren" ] </xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_SpaceCow"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.04</MeleeDodgeChance>
+			<MeleeCritChance>0.34</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_SpaceCow"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2.84</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Pyjak"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+			<MeleeParryChance>0.03</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Pyjak"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+					<armorPenetrationSharp>0.08</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.12</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Varren"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.38</MeleeDodgeChance>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>0.08</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Varren"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.16</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.16</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.9</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/ME_Machine.xml b/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/ME_Machine.xml
new file mode 100644
index 0000000000..f2e0b97245
--- /dev/null
+++ b/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/ME_Machine.xml	
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs</xpath>
+		<value>
+
+			<ThingDef ParentName="BaseGunWithQuality">
+				<defName>ME_LokiPistol</defName>
+				<label>Loki Pistol</label>
+				<description>A specialised M3 predator pistol used by LOKI mechs, does not appear to use thermal clips. Do not under any circumstance tell your mech to drop its weapon.</description>
+				<graphicData>
+					<texPath>Things/Item/Equipment/WeaponRanged/AlliancePistol</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<soundInteract>RE_Interact_Predator</soundInteract>
+				<statBases>
+					<SightsEfficiency>1</SightsEfficiency>
+					<ShotSpread>0.13</ShotSpread>
+					<SwayFactor>0.88</SwayFactor>
+					<Bulk>1.75</Bulk>
+					<Mass>0.8</Mass>
+					<RangedWeapon_Cooldown>0.1</RangedWeapon_Cooldown>
+				</statBases>
+				<techLevel>Ultra</techLevel>
+				<relicChance>0</relicChance>
+				<tradeability>None</tradeability>
+				<destroyOnDrop>true</destroyOnDrop>
+				<weaponTags>
+					<li>LokiGun</li>
+				</weaponTags>
+				<verbs>
+					<li Class="CombatExtended.VerbPropertiesCE">
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_Predator</defaultProjectile>
+						<warmupTime>0.5</warmupTime>
+						<range>18</range>
+						<burstShotCount>1</burstShotCount>
+						<soundCast>RE_Shot_Predator</soundCast>
+						<soundCastTail>GunTail_Light</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</li>
+				</verbs>
+				<comps>
+					<li Class="CombatExtended.CompProperties_AmmoUser">
+						<magazineSize>15</magazineSize>
+						<reloadTime>2.5</reloadTime>
+					</li>
+					<li Class="CombatExtended.CompProperties_FireModes">
+						<aiUseBurstMode>FALSE</aiUseBurstMode>
+					</li>
+				</comps>
+				<tools>
+					<li Class="CombatExtended.ToolCE">
+						<label>grip</label>
+						<capacities>
+							<li>Blunt</li>
+						</capacities>
+						<power>4</power>
+						<cooldownTime>1.54</cooldownTime>
+						<chanceFactor>1.5</chanceFactor>
+						<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+						<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+					</li>
+					<li Class="CombatExtended.ToolCE">
+						<label>muzzle</label>
+						<capacities>
+							<li>Poke</li>
+						</capacities>
+						<power>3</power>
+						<cooldownTime>1.54</cooldownTime>
+						<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+						<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+					</li>
+				</tools>
+				<modExtensions>
+					<li Class="CombatExtended.GunDrawExtension">
+						<DrawSize>1.0,1.0</DrawSize>
+						<DrawOffset>0.0,0.0</DrawOffset>
+					</li>
+				</modExtensions>
+			</ThingDef>
+
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Mechanoids_LOKIBase"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>40</Steel>
+				<Plasteel>40</Plasteel>
+				<RE_PrefabComponent>7</RE_PrefabComponent>
+				<ComponentSpacer>4</ComponentSpacer>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Mechanoids_LOKIBase"]/comps/li[@Class ="VFE.Mechanoids.CompProperties_MachineChargingStation"]/spawnWithWeapon</xpath>
+		<value>
+			<spawnWithWeapon>ME_LokiPistol</spawnWithWeapon>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Mechanoids_YMIRBase"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>300</Steel>
+				<Plasteel>300</Plasteel>
+				<Uranium>60</Uranium>
+				<RE_PrefabComponent>25</RE_PrefabComponent>
+				<ComponentSpacer>16</ComponentSpacer>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Mechanoids_YMIRBase"]/constructionSkillPrerequisite</xpath>
+		<value>
+			<constructionSkillPrerequisite>12</constructionSkillPrerequisite>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Mechanoids_YMIRBase"]/comps/li[@Class ="VFE.Mechanoids.CompProperties_MachineChargingStation"]/spawnWithWeapon</xpath>
+		<value>
+			<spawnWithWeapon>RE_YMIRMassAccelerator</spawnWithWeapon>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/ME_Trader.xml b/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/ME_Trader.xml
new file mode 100644
index 0000000000..d7053ac092
--- /dev/null
+++ b/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/ME_Trader.xml	
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==========  ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="RE_Base_Alliance_Standard"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>FSX</thingDef>
+				<countRange>
+					<min>25</min>
+					<max>90</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>Prometheum</thingDef>
+				<countRange>
+					<min>25</min>
+					<max>90</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>ME_Ammo</tradeTag>
+				<countRange>
+					<min>500</min>
+					<max>1800</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>2</min>
+					<max>4</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_MediumAmmo</tradeTag>
+				<countRange>
+					<min>20</min>
+					<max>80</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>4</min>
+					<max>7</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_HeavyAmmo</tradeTag>
+				<countRange>
+					<min>5</min>
+					<max>20</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>4</min>
+					<max>6</max>
+				</thingDefCountRange>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="RE_Caravan_Alliance_CombatSupplier"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>FSX</thingDef>
+				<countRange>
+					<min>12</min>
+					<max>36</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>Prometheum</thingDef>
+				<countRange>
+					<min>12</min>
+					<max>36</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>ME_Ammo</tradeTag>
+				<countRange>
+					<min>300</min>
+					<max>1200</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>2</min>
+					<max>4</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_MediumAmmo</tradeTag>
+				<countRange>
+					<min>20</min>
+					<max>60</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>3</min>
+					<max>6</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_HeavyAmmo</tradeTag>
+				<countRange>
+					<min>5</min>
+					<max>20</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>3</max>
+				</thingDefCountRange>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="RE_Caravan_Alliance_Exotic" or
+			defName="RE_Caravan_Alliance_BulkGoods"]/stockGenerators </xpath>
+		<value>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>FSX</thingDef>
+				<countRange>
+					<min>15</min>
+					<max>45</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>Prometheum</thingDef>
+				<countRange>
+					<min>15</min>
+					<max>45</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>ME_Ammo</tradeTag>
+				<countRange>
+					<min>120</min>
+					<max>400</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>1</min>
+					<max>3</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_MediumAmmo</tradeTag>
+				<countRange>
+					<min>10</min>
+					<max>20</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>2</min>
+					<max>5</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_HeavyAmmo</tradeTag>
+				<countRange>
+					<min>1</min>
+					<max>5</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>-1</min>
+					<max>3</max>
+				</thingDefCountRange>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="RE_Visitor_Alliance_Standard"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>ME_Ammo</tradeTag>
+				<countRange>
+					<min>10</min>
+					<max>60</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>-1</min>
+					<max>1</max>
+				</thingDefCountRange>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/Mech_Weapons.xml b/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/Mech_Weapons.xml
new file mode 100644
index 0000000000..5c57de08c5
--- /dev/null
+++ b/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/Mech_Weapons.xml	
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Make the YMIR usable -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RE_Gun_MechHeavyMassAccelerator"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>3</cooldownTime>
+					<armorPenetrationBlunt>148</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>43</power>
+					<cooldownTime>2.88</cooldownTime>
+					<armorPenetrationBlunt>100</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>38</power>
+					<cooldownTime>2.48</cooldownTime>
+					<armorPenetrationBlunt>90</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RE_YMIRMassAccelerator</defName>
+		<statBases>
+			<Mass>20.00</Mass>
+			<RangedWeapon_Cooldown>0.65</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>1.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.33</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>RE_YmirBullet</defaultProjectile>
+			<warmupTime>1.4</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<burstShotCount>16</burstShotCount>
+			<minRange>1.5</minRange>
+			<soundCast>RE_Shot_YMIRCannon</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>5</reloadTime>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>8</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/Mechpawn_ME.xml b/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/Mechpawn_ME.xml
new file mode 100644
index 0000000000..60373d9d71
--- /dev/null
+++ b/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/Mechpawn_ME.xml	
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RE_Mechanoids_FENRIS" ]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RE_Mechanoids_LOKI" ]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RE_Mechanoids_YMIR" ]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Vehicle</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Mechanoids_YMIR"]/race/baseBodySize</xpath>
+		<value>
+			<baseBodySize>2</baseBodySize>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Mechanoids_FENRIS"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1.0</ShootingAccuracyPawn>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>0.28</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Mechanoids_LOKI"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1.0</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			<MeleeCritChance>0.21</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Mechanoids_YMIR"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1.1</AimingAccuracy>
+			<ShootingAccuracyPawn>1.1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.8</MeleeCritChance>
+			<MeleeParryChance>0.5</MeleeParryChance>
+			<CarryWeight>400</CarryWeight>
+			<CarryBulk>1000</CarryBulk>
+			<MaxHitPoints>500</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Mechanoids_LOKI"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>13</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Mechanoids_LOKI"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>9</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Mechanoids_FENRIS"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Mechanoids_FENRIS"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Mechanoids_YMIR"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>75</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Mechanoids_YMIR"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>22</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Mechanoids_FENRIS"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<extraMeleeDamages>
+						<li>
+							<def>Taser</def>
+							<amount>4</amount>
+						</li>
+					</extraMeleeDamages>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Mechanoids_LOKI"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Mechanoids_YMIR"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>43</power>
+					<cooldownTime>2.68</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>124.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Mechs-->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RE_Mechanoids_FENRIS"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Fireworm-->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RE_Mechanoids_LOKI"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>4</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Goliath-->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RE_Mechanoids_YMIR"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>8</min>
+					<max>10</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/Scenarios_ME.xml b/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/Scenarios_ME.xml
new file mode 100644
index 0000000000..34a1e42249
--- /dev/null
+++ b/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/Scenarios_ME.xml	
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Add ammo to scenario === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="RE_AllianceColony"]/scenario/parts</xpath>
+
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_ME</thingDef>
+				<count>500</count>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/Turrets_and_Misc_ME.xml b/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/Turrets_and_Misc_ME.xml
new file mode 100644
index 0000000000..f6dd16fa2f
--- /dev/null
+++ b/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/Turrets_and_Misc_ME.xml	
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Remove refuelable property -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName = "RE_Turret_MassAccelerator" or
+			defName = "RE_Turret_HeavyMassAccelerator"]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
+	</Operation>
+
+	<!-- Replace vanilla thingClass -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "RE_Turret_MassAccelerator"]/thingClass </xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "RE_Turret_HeavyMassAccelerator"]</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<!-- Make turrets taller -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "RE_Turret_MassAccelerator"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "RE_Turret_HeavyMassAccelerator"]</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName = "RE_Turret_MassAccelerator" or
+			defName = "RE_Turret_HeavyMassAccelerator"
+			]/statBases </xpath>
+		<value>
+			<AimingAccuracy>0.25</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "RE_Turret_MassAccelerator" or
+			defName = "RE_Turret_HeavyMassAccelerator"
+			]/statBases/ShootingAccuracyTurret </xpath>
+		<value>
+			<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "RE_Turret_MassAccelerator" or
+			defName = "RE_Turret_HeavyMassAccelerator"
+			]/building/turretBurstCooldownTime </xpath>
+		<value>
+			<turretBurstCooldownTime>1.1</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "RE_Turret_MassAccelerator"]/comps/li[@Class="CompProperties_Power"]</xpath>
+		<value>
+			<li Class="CompProperties_Power">
+				<compClass>CompPowerTrader</compClass>
+				<basePowerConsumption>200</basePowerConsumption>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "RE_Turret_HeavyMassAccelerator"]/comps/li[@Class="CompProperties_Power"]</xpath>
+		<value>
+			<li Class="CompProperties_Power">
+				<compClass>CompPowerTrader</compClass>
+				<basePowerConsumption>800</basePowerConsumption>
+			</li>
+		</value>
+	</Operation>
+	<!-- Make the Turret usable -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RE_Gun_MassAccelerator</defName>
+		<statBases>
+			<Mass>10.00</Mass>
+			<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.1</SwayFactor>
+			<Bulk>1.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.27</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_M8_Basic</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>50</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<minRange>1.5</minRange>
+			<soundCast>RE_Shot_Turret</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_M8</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- Make the Cannon usable -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RE_Gun_HeavyMassAcceleratorTurret</defName>
+		<statBases>
+			<Mass>50.00</Mass>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.36</SwayFactor>
+			<Bulk>1.00</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>ME_Bullet_Cannon</defaultProjectile>
+			<recoilAmount>1.48</recoilAmount>
+			<warmupTime>2</warmupTime>
+			<range>78</range>
+			<minRange>5.9</minRange>
+			<ammoConsumedPerShotCount>10</ammoConsumedPerShotCount>
+			<ticksBetweenBurstShots>30</ticksBetweenBurstShots>
+			<burstShotCount>3</burstShotCount>
+			<soundCast>RE_Shot_HeavyTurret</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>400</magazineSize>
+			<reloadTime>6.0</reloadTime>
+			<ammoSet>AmmoSet_ME_Cannon</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_PrefabBarricade"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.64</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="RE_AmmoBelts"]/recipeMaker</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="RE_AmmoBelts"]/tradeTags</xpath>
+	</Operation>
+
+	<!-- Implant Hediffs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="RE_AdrenalineModule"]/stages/li[1]</xpath>
+		<value>
+			<statOffsets>
+				<Suppressability>-0.15</Suppressability>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/HediffDef[defName="RE_TargetingVI"]/hediffClass</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="RE_TargetingVI"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<statOffsets>
+						<AimingDelayFactor>-0.08</AimingDelayFactor>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_TargetingVI"]/description</xpath>
+		<value>
+			<description>A small capsule with a VI system, increasing the combat abilities of the user. Decreases the aiming time of the user.</description>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/Weapons_MEcore.xml b/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/Weapons_MEcore.xml
new file mode 100644
index 0000000000..3180b8dc59
--- /dev/null
+++ b/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/Weapons_MEcore.xml	
@@ -0,0 +1,663 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Melee Tools ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Gun_AlliancePistol" or defName="RE_Gun_AllianceSMG" or defName="RE_Gun_AllianceHandcannon"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Gun_AllianceAssaultRifle" or defName="RE_Gun_AllianceBattleRifle" or defName="RE_Gun_AllianceShotgun"
+			or defName="RE_Gun_AllianceSniperRifle" or defName="RE_Gun_AllianceAntimaterielRifle" or defName="RE_Gun_AllianceRocketLauncher" or defName="RE_Gun_AllianceChainShotgun"]/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='RE_Gun_AlliancePistol']/recipeMaker/skillRequirements</xpath>
+		<value>
+			<skillRequirements>
+				<Crafting>5</Crafting>
+			</skillRequirements>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='RE_Gun_AllianceShotgun' or defName='RE_Gun_AllianceSMG' or defName='RE_Gun_AllianceHandcannon']/recipeMaker/skillRequirements</xpath>
+		<value>
+			<skillRequirements>
+				<Crafting>6</Crafting>
+			</skillRequirements>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='RE_Gun_AllianceSniperRifle'or defName='RE_Gun_AllianceRocketLauncher' or defName='RE_Gun_AllianceAssaultRifle']/recipeMaker/skillRequirements</xpath>
+		<value>
+			<skillRequirements>
+				<Crafting>7</Crafting>
+			</skillRequirements>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='RE_Gun_AllianceAntimaterielRifle' or defName='RE_Gun_AllianceBattleRifle']/recipeMaker/skillRequirements</xpath>
+		<value>
+			<skillRequirements>
+				<Crafting>8</Crafting>
+			</skillRequirements>
+		</value>
+	</Operation>
+
+	<!-- ========== M8 Avenger ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RE_Gun_AllianceAssaultRifle</defName>
+		<statBases>
+			<WorkToMake>34000</WorkToMake>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.3</SwayFactor>
+			<Bulk>8</Bulk>
+			<Mass>3.3</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_M8_Basic</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RE_Shot_Avenger</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+			<recoilAmount>1.36</recoilAmount>
+		</Properties>
+		<costList>
+			<Steel>30</Steel>
+			<Plasteel>35</Plasteel>
+			<ComponentSpacer>1</ComponentSpacer>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_M8</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- Name -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='RE_Gun_AllianceAssaultRifle']/label</xpath>
+		<value>
+			<label>M-8 Avenger</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Gun_AllianceAssaultRifle"]/description</xpath>
+		<value>
+			<description>The Avenger is a common, versatile, military-grade assault rifle manufactured by the Elkoss Combine. It's accurate when fired in short bursts, and deadly when fired on full auto. The modular design and inexpensive components of the Avenger make it a favorite of military groups and mercenaries alike. The rifle has a reputation for being tough, reliable, easy to use, and easy to upgrade. This might be the most generic assualt rifle to have ever existed in this corner of the milky way.</description>
+		</value>
+	</Operation>
+
+	<!-- ========== M-15 ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RE_Gun_AllianceBattleRifle</defName>
+		<statBases>
+			<WorkToMake>38000</WorkToMake>
+			<SightsEfficiency>1.25</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.38</SwayFactor>
+			<Bulk>8</Bulk>
+			<Mass>3.7</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_M15_Basic</defaultProjectile>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>1</warmupTime>
+			<range>57</range>
+			<soundCast>RE_Shot_Vindicator</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilAmount>1.08</recoilAmount>
+		</Properties>
+		<costList>
+			<Steel>30</Steel>
+			<Plasteel>35</Plasteel>
+			<ComponentSpacer>1</ComponentSpacer>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<AmmoUser>
+			<magazineSize>24</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_M15</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- Name -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='RE_Gun_AllianceBattleRifle']/label</xpath>
+		<value>
+			<label>M-15 Vindicator</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Gun_AllianceBattleRifle"]/description</xpath>
+		<value>
+			<description>A low recoil battle rifle that fires in three-round bursts. The Vindicator is favored by assassins and elite mercenaries, and deadly at medium to long ranges. Its effectiveness might be outclassed by faster firing weapons at short ranges.</description>
+		</value>
+	</Operation>
+
+	<!-- ========== M-9 Tempest ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RE_Gun_AllianceSMG</defName>
+		<statBases>
+			<WorkToMake>23000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.18</SwayFactor>
+			<Bulk>3.75</Bulk>
+			<Mass>1.8</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Tempest</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>28</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RE_Shot_Tempest</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+			<recoilAmount>1.64</recoilAmount>
+		</Properties>
+		<costList>
+			<Steel>15</Steel>
+			<Plasteel>15</Plasteel>
+			<ComponentSpacer>1</ComponentSpacer>
+			<Chemfuel>5</Chemfuel>
+		</costList>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_Tempest</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- Name -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='RE_Gun_AllianceSMG']/label</xpath>
+		<value>
+			<label>M-9 Tempest</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Gun_AllianceSMG"]/description</xpath>
+		<value>
+			<description>The Tempest is an expensive but deadly addition to anyone's personal arsenal. This fully automatic submachine gun is punishing up close, but becomes less accurate at long range.</description>
+		</value>
+	</Operation>
+	<!-- ========== Mantis ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RE_Gun_AllianceSniperRifle</defName>
+		<statBases>
+			<WorkToMake>37500</WorkToMake>
+			<SightsEfficiency>2.8</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.46</SwayFactor>
+			<Bulk>10.0</Bulk>
+			<Mass>4.20</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Mantis</defaultProjectile>
+			<warmupTime>1.45</warmupTime>
+			<range>80</range>
+			<ammoConsumedPerShotCount>4</ammoConsumedPerShotCount>
+			<soundCast>RE_Shot_Mantis</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<costList>
+			<Steel>40</Steel>
+			<Plasteel>30</Plasteel>
+			<ComponentSpacer>1</ComponentSpacer>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<AmmoUser>
+			<magazineSize>4</magazineSize>
+			<reloadTime>1.1</reloadTime>
+			<ammoSet>AmmoSet_Mantis</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- Name -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='RE_Gun_AllianceSniperRifle']/label</xpath>
+		<value>
+			<label>M-92 Mantis</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Gun_AllianceSniperRifle"]/description</xpath>
+		<value>
+			<description>The Mantis is a powerful sniper rifle able to take out most targets in a single shot. It's incredibly accurate at long range, but rate of fire is slow due to the need to load a new thermal clip after every shot.</description>
+		</value>
+	</Operation>
+	<!-- ========== M-98 ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RE_Gun_AllianceAntimaterielRifle</defName>
+		<statBases>
+			<WorkToMake>52500</WorkToMake>
+			<SightsEfficiency>3.75</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.85</SwayFactor>
+			<Bulk>15</Bulk>
+			<Mass>10</Mass>
+			<RangedWeapon_Cooldown>0.64</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_M98_Basic</defaultProjectile>
+			<warmupTime>2</warmupTime>
+			<range>90</range>
+			<ammoConsumedPerShotCount>10</ammoConsumedPerShotCount>
+			<soundCast>RE_Shot_Widow</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+		</Properties>
+		<costList>
+			<Steel>60</Steel>
+			<Plasteel>60</Plasteel>
+			<ComponentSpacer>2</ComponentSpacer>
+			<Chemfuel>20</Chemfuel>
+		</costList>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>1.8</reloadTime>
+			<ammoSet>AmmoSet_M98</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- Name -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='RE_Gun_AllianceAntimaterielRifle']/label</xpath>
+		<value>
+			<label>M-98 Widow</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Gun_AllianceAntimaterielRifle"]/description</xpath>
+		<value>
+			<description>A very heavy anti-material rifle, the Widow is primarily used by sniper teams in assault missions against armored vehicles, mechanoids or krogan. It is very slow to fire but packs a massive punch, any humanoid target is likely to be instantly turned into a bloody pulp upon hit.</description>
+		</value>
+	</Operation>
+	<!-- ========== AllianceShotgun ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RE_Gun_AllianceShotgun</defName>
+		<statBases>
+			<WorkToMake>28000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.2</SwayFactor>
+			<Bulk>7.5</Bulk>
+			<Mass>3</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Katana</defaultProjectile>
+			<warmupTime>0.7</warmupTime>
+			<range>20</range>
+			<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
+			<soundCast>RE_Shot_Katana</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<costList>
+			<Steel>30</Steel>
+			<Plasteel>25</Plasteel>
+			<ComponentSpacer>1</ComponentSpacer>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_Katana</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>False</aiUseBurstMode>
+		</FireModes>
+	</Operation>
+
+	<!-- Name -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='RE_Gun_AllianceShotgun']/label</xpath>
+		<value>
+			<label>M-23 Katana</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Gun_AllianceShotgun"]/description</xpath>
+		<value>
+			<description>The Katana is a common mercenary weapon, and is also popular on colonies with varren infestations. It's deadly at short range, but ineffective at long range. Being a shotgun, it sacrifices its long range and armour piercing capabilities for short range firepower.</description>
+		</value>
+	</Operation>
+
+	<!-- ==========Hydra Shotgun ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RE_Gun_AllianceChainShotgun</defName>
+		<statBases>
+			<WorkToMake>45000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.38</SwayFactor>
+			<Bulk>7.5</Bulk>
+			<Mass>3</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Hydra</defaultProjectile>
+			<warmupTime>0.7</warmupTime>
+			<range>20</range>
+			<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>18</ticksBetweenBurstShots>
+			<recoilAmount>1.57</recoilAmount>
+			<soundCast>RE_Shot_Katana</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<costList>
+			<Steel>20</Steel>
+			<Plasteel>35</Plasteel>
+			<ComponentSpacer>2</ComponentSpacer>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_Hydrashotty</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- Name -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='RE_Gun_AllianceChainShotgun']/label</xpath>
+		<value>
+			<label>Hydra Shotgun</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Gun_AllianceChainShotgun"]/description</xpath>
+		<value>
+			<description>A curious weapon not given any given any formal alliance designation, the Hydra is an automatic shotgun that is nearly doubles the firepower of a regular semi-automatic shotgun.</description>
+		</value>
+	</Operation>
+	<!-- ========== Predator ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RE_Gun_AlliancePistol</defName>
+		<statBases>
+			<WorkToMake>13500</WorkToMake>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.88</SwayFactor>
+			<Bulk>1.75</Bulk>
+			<Mass>0.8</Mass>
+			<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Predator</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>18</range>
+			<soundCast>RE_Shot_Predator</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<costList>
+			<Steel>15</Steel>
+			<Plasteel>15</Plasteel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+			<Chemfuel>4</Chemfuel>
+		</costList>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_Predator</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>False</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Name -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='RE_Gun_AlliancePistol']/label</xpath>
+		<value>
+			<label>M-3 Predator</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Gun_AlliancePistol"]/description</xpath>
+		<value>
+			<description>A reliable, accurate sidearm. Manufactured by Elanus Risk Control, the Predator is valued as a powerful, deadly, and relatively inexpensive weapon.</description>
+		</value>
+	</Operation>
+	<!-- ========== Phalanx ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RE_Gun_AllianceHandcannon</defName>
+		<statBases>
+			<WorkToMake>19000</WorkToMake>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>1.08</SwayFactor>
+			<Bulk>2.1</Bulk>
+			<Mass>1</Mass>
+			<RangedWeapon_Cooldown>0.46</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Phalanx</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>RE_Shot_Phalanx</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<costList>
+			<Steel>15</Steel>
+			<Plasteel>20</Plasteel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+			<Chemfuel>8</Chemfuel>
+		</costList>
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_Phalanx</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+		<!--    <researchPrerequisite>BlowbackOperation</researchPrerequisite> -->
+	</Operation>
+
+	<!-- Name -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='RE_Gun_AllianceHandcannon']/label</xpath>
+		<value>
+			<label>M-5 Phalanx</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Gun_AllianceHandcannon"]/description</xpath>
+		<value>
+			<description>The M-5 Phalanx is the product of the Alliance's Offensive Handgun Project, a close-in weapon to be used with no loss of stopping power in comparison with a soldier's assault rifle. The Phalanx enjoys a ballistics advantage over most heavy pistols. Civilian variants are often purchased by colonists on planets that have particularly dangerous big-game animals.</description>
+		</value>
+	</Operation>
+	<!-- === Rocket Launcher === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RE_Gun_AllianceRocketLauncher</defName>
+		<statBases>
+			<WorkToMake>20000</WorkToMake>
+			<Mass>5.0</Mass>
+			<Bulk>8.0</Bulk>
+			<SwayFactor>1.5</SwayFactor>
+			<ShotSpread>0.03</ShotSpread>
+			<SightsEfficiency>2</SightsEfficiency>
+			<RangedWeapon_Cooldown>1.0</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>60</Steel>
+			<FSX>4</FSX>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>VFE_Bullet_ML77CE</defaultProjectile>
+			<burstShotCount>1</burstShotCount>
+			<warmupTime>1.5</warmupTime>
+			<range>62</range>
+			<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+			<minRange>5</minRange>
+			<soundCast>RE_Shot_MissileLauncher</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<onlyManualCast>True</onlyManualCast>
+			<ignorePartialLoSBlocker>True</ignorePartialLoSBlocker>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+				<canTargetPawns>true</canTargetPawns>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- Name -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='RE_Gun_AllianceRocketLauncher']/label</xpath>
+		<value>
+			<label>ML-77 (single use)</label>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Drell/Defs/Rim-Effect Drell/Projectiles_Drell.xml b/ModPatches/Rim-Effect Drell/Defs/Rim-Effect Drell/Projectiles_Drell.xml
new file mode 100644
index 0000000000..c53107cb60
--- /dev/null
+++ b/ModPatches/Rim-Effect Drell/Defs/Rim-Effect Drell/Projectiles_Drell.xml	
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Viper</defName>
+		<label>Thermal Clip</label>
+		<ammoTypes>
+			<Ammo_ME>Bullet_Viper</Ammo_ME>
+			<Ammo_ME_AP>Bullet_Viper_AP</Ammo_ME_AP>
+			<Ammo_ME_Cryo>Bullet_Viper_Cryo</Ammo_ME_Cryo>
+			<Ammo_ME_HE>Bullet_Viper_HE</Ammo_ME_HE>
+			<Ammo_ME_FI>Bullet_Viper_FI</Ammo_ME_FI>
+			<Ammo_ME_Ion>Bullet_Viper_Ion</Ammo_ME_Ion>
+			<Ammo_ME_Toxic>Bullet_Viper_Toxic</Ammo_ME_Toxic>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Locust</defName>
+		<label>Thermal Clip</label>
+		<ammoTypes>
+			<Ammo_ME>Bullet_Locust</Ammo_ME>
+			<Ammo_ME_AP>Bullet_Locust_AP</Ammo_ME_AP>
+			<Ammo_ME_Cryo>Bullet_Locust_Cryo</Ammo_ME_Cryo>
+			<Ammo_ME_HE>Bullet_Locust_HE</Ammo_ME_HE>
+			<Ammo_ME_FI>Bullet_Locust_FI</Ammo_ME_FI>
+			<Ammo_ME_Ion>Bullet_Locust_Ion</Ammo_ME_Ion>
+			<Ammo_ME_Toxic>Bullet_Locust_Toxic</Ammo_ME_Toxic>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ================== Viper ================== -->
+
+	<ThingDef Name="BaseViperBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Shot_MassAccelerated_Sniper</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>1.1</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>500</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseViperBullet">
+		<defName>Bullet_Viper</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>36</damageAmountBase>
+			<armorPenetrationSharp>28</armorPenetrationSharp>
+			<armorPenetrationBlunt>180</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseViperBullet">
+		<defName>Bullet_Viper_AP</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>24</damageAmountBase>
+			<armorPenetrationSharp>56</armorPenetrationSharp>
+			<armorPenetrationBlunt>180</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseViperBullet">
+		<defName>Bullet_Viper_Cryo</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>34</damageAmountBase>
+			<armorPenetrationSharp>30</armorPenetrationSharp>
+			<armorPenetrationBlunt>180</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Cryo</def>
+					<amount>7</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseViperBullet">
+		<defName>Bullet_Viper_HE</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>36</damageAmountBase>
+			<armorPenetrationSharp>28</armorPenetrationSharp>
+			<armorPenetrationBlunt>180</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>20</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseViperBullet">
+		<defName>Bullet_Viper_Toxic</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>34</damageAmountBase>
+			<armorPenetrationSharp>28</armorPenetrationSharp>
+			<armorPenetrationBlunt>180</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Toxin</def>
+					<amount>7</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseViperBullet">
+		<defName>Bullet_Viper_FI</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>36</damageAmountBase>
+			<armorPenetrationSharp>28</armorPenetrationSharp>
+			<armorPenetrationBlunt>180</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_SickBurn</def>
+					<amount>5</amount>
+				</li>
+				<li>
+					<def>Flame</def>
+					<amount>1</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseViperBullet">
+		<defName>Bullet_Viper_Ion</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>27</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>9</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>30</armorPenetrationSharp>
+			<armorPenetrationBlunt>180</armorPenetrationBlunt>
+			<empShieldBreakChance>1</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== Locust ================== -->
+
+	<ThingDef Name="BaseLocustBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Shot_MassAccelerated_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>1.1</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>180</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseLocustBullet">
+		<defName>Bullet_Locust</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>11</damageAmountBase>
+			<armorPenetrationSharp>10</armorPenetrationSharp>
+			<armorPenetrationBlunt>30</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseLocustBullet">
+		<defName>Bullet_Locust_AP</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>8</damageAmountBase>
+			<armorPenetrationSharp>20</armorPenetrationSharp>
+			<armorPenetrationBlunt>30</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseLocustBullet">
+		<defName>Bullet_Locust_HE</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>11</damageAmountBase>
+			<armorPenetrationSharp>10</armorPenetrationSharp>
+			<armorPenetrationBlunt>30</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>5</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseLocustBullet">
+		<defName>Bullet_Locust_Cryo</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>11</damageAmountBase>
+			<armorPenetrationSharp>10</armorPenetrationSharp>
+			<armorPenetrationBlunt>30</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Cryo</def>
+					<amount>2</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseLocustBullet">
+		<defName>Bullet_Locust_Toxic</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>10</armorPenetrationSharp>
+			<armorPenetrationBlunt>30</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Toxin</def>
+					<amount>2</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseLocustBullet">
+		<defName>Bullet_Locust_FI</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>11</damageAmountBase>
+			<armorPenetrationSharp>10</armorPenetrationSharp>
+			<armorPenetrationBlunt>30</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_SickBurn</def>
+					<amount>2</amount>
+				</li>
+				<li>
+					<def>Flame</def>
+					<amount>1</amount>
+					<chance>0.25</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseLocustBullet">
+		<defName>Bullet_Locust_Ion</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>7</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>3</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>12</armorPenetrationSharp>
+			<armorPenetrationBlunt>30</armorPenetrationBlunt>
+			<empShieldBreakChance>0.30</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Drell/Patches/Rim-Effect Drell/Apparel_Drell.xml b/ModPatches/Rim-Effect Drell/Patches/Rim-Effect Drell/Apparel_Drell.xml
new file mode 100644
index 0000000000..11e561a539
--- /dev/null
+++ b/ModPatches/Rim-Effect Drell/Patches/Rim-Effect Drell/Apparel_Drell.xml	
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Assassin's Hood -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_AssassinsHood"]/apparel/layers</xpath>
+		<value>
+			<layers Inherit="False">
+				<li>OnHead</li>
+				<li>Overhead</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_AssassinsHood"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_AssassinsHood"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-0.6</SmokeSensitivity>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_AssassinsHood"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_AssassinsHood"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>9</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Assassin's Jacket -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_AssassinsJacket"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>7.5</Bulk>
+			<WornBulk>1.75</WornBulk>
+			<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Drell/Patches/Rim-Effect Drell/Drell_Race.xml b/ModPatches/Rim-Effect Drell/Patches/Rim-Effect Drell/Drell_Race.xml
new file mode 100644
index 0000000000..bf0391d85e
--- /dev/null
+++ b/ModPatches/Rim-Effect Drell/Patches/Rim-Effect Drell/Drell_Race.xml	
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="RE_Drell"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="RE_Drell"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="RE_Drell"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Checking if "RE_Drell" has a <comps> node and adding it if it doesn't exist -->
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="RE_Drell"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="RE_Drell"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="RE_Drell"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Drell/Patches/Rim-Effect Drell/PawnKinds_Drell.xml b/ModPatches/Rim-Effect Drell/Patches/Rim-Effect Drell/PawnKinds_Drell.xml
new file mode 100644
index 0000000000..012ac6bf00
--- /dev/null
+++ b/ModPatches/Rim-Effect Drell/Patches/Rim-Effect Drell/PawnKinds_Drell.xml	
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RE_DrellTraveller"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RE_DrellMercenary"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>7</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<magazineCount>
+							<min>1</min>
+							<max>5</max>
+						</magazineCount>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>450</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+							<li>CE_Sidearm</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Drell/Patches/Rim-Effect Drell/Scenarios_Drell.xml b/ModPatches/Rim-Effect Drell/Patches/Rim-Effect Drell/Scenarios_Drell.xml
new file mode 100644
index 0000000000..28086bde8b
--- /dev/null
+++ b/ModPatches/Rim-Effect Drell/Patches/Rim-Effect Drell/Scenarios_Drell.xml	
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Add ammo to scenario === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="RE_LoneDrellAssassin"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_ME</thingDef>
+				<count>500</count>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Drell/Patches/Rim-Effect Drell/Weapons_Drell.xml b/ModPatches/Rim-Effect Drell/Patches/Rim-Effect Drell/Weapons_Drell.xml
new file mode 100644
index 0000000000..dddb69567d
--- /dev/null
+++ b/ModPatches/Rim-Effect Drell/Patches/Rim-Effect Drell/Weapons_Drell.xml	
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Melee Tools ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Gun_AllianceCompactSMG"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Gun_AllianceRapidSniperRifle"]/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>
+
+	<!-- ========== M-12 Locust ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RE_Gun_AllianceCompactSMG</defName>
+		<statBases>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.18</SwayFactor>
+			<Bulk>3.75</Bulk>
+			<Mass>1.8</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Locust</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>32</range>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>RE_Shot_Locust</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+			<recoilAmount>1.34</recoilAmount>
+		</Properties>
+		<costList>
+			<Steel>10</Steel>
+			<Plasteel>25</Plasteel>
+			<ComponentSpacer>1</ComponentSpacer>
+			<Chemfuel>5</Chemfuel>
+		</costList>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_Locust</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aimedBurstShotCount>4</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- Name -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='RE_Gun_AllianceCompactSMG']/label</xpath>
+		<value>
+			<label>M-12 Locust</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Gun_AllianceCompactSMG"]/description</xpath>
+		<value>
+			<description>The Locust is an expensive but deadly addition to anyone's personal arsenal. This fully automatic submachine gun is punishing up close, while still capable of precise fire at long range.</description>
+		</value>
+	</Operation>
+
+	<!-- ========== M-97 Viper ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RE_Gun_AllianceRapidSniperRifle</defName>
+		<statBases>
+			<SightsEfficiency>2.5</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.46</SwayFactor>
+			<Bulk>10.0</Bulk>
+			<Mass>4.20</Mass>
+			<RangedWeapon_Cooldown>0.27</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Viper</defaultProjectile>
+			<warmupTime>1.45</warmupTime>
+			<range>78</range>
+			<ammoConsumedPerShotCount>4</ammoConsumedPerShotCount>
+			<soundCast>RE_Shot_Viper</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>24</magazineSize>
+			<reloadTime>1.1</reloadTime>
+			<ammoSet>AmmoSet_Viper</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- Name -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='RE_Gun_AllianceRapidSniperRifle']/label</xpath>
+		<value>
+			<label>M-97 Viper</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Gun_AllianceRapidSniperRifle"]/description</xpath>
+		<value>
+			<description>The Viper is a semi-automatic, rapid-fire sniper rifle capable of quickly engaging targets with follow-up shots.</description>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Extended Cut/Defs/Rim-Effect Extended Cut/ME_Plasma_Recipe_ExtendedCut.xml b/ModPatches/Rim-Effect Extended Cut/Defs/Rim-Effect Extended Cut/ME_Plasma_Recipe_ExtendedCut.xml
new file mode 100644
index 0000000000..f5e49e2582
--- /dev/null
+++ b/ModPatches/Rim-Effect Extended Cut/Defs/Rim-Effect Extended Cut/ME_Plasma_Recipe_ExtendedCut.xml	
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_ME_Plasma</defName>
+		<label>Plasma Power Cell</label>
+		<description>Plasma containment power cell optimized for M-19 Ballista rifle.</description>
+		<statBases>
+			<Mass>0.02</Mass>
+			<Bulk>0.015</Bulk>
+			<MarketValue>0.25</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade_Sellable</li>
+			<!-- Plasma ammo can't be handloaded, and the containment cell must be precision-machined anyway -->
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoPlasmaCellRifle</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>Things/Ammo/PlasmaCell/Rifle</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>Plasma</ammoClass>
+		<comps>
+			<!-- Arbitarily defined cookoff explosive stats; represents a plasma containment system failing -->
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>4</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.4</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_ME_Plasma</defName>
+		<label>make plasma cells</label>
+		<description>Craft 50 shots' worth of plasma cells.</description>
+		<jobString>Making plasma cells.</jobString>
+		<workAmount>2500</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Plasteel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_ME_Plasma>50</Ammo_ME_Plasma>
+		</products>
+		<researchPrerequisite>RE_AllianceWeaponry</researchPrerequisite>
+		<recipeUsers>
+			<li>RE_ManufacturingBench</li>
+		</recipeUsers>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Extended Cut/Defs/Rim-Effect Extended Cut/ME_Projectile_ExtendedCut.xml b/ModPatches/Rim-Effect Extended Cut/Defs/Rim-Effect Extended Cut/ME_Projectile_ExtendedCut.xml
new file mode 100644
index 0000000000..9f917f20d9
--- /dev/null
+++ b/ModPatches/Rim-Effect Extended Cut/Defs/Rim-Effect Extended Cut/ME_Projectile_ExtendedCut.xml	
@@ -0,0 +1,537 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_L89</defName>
+		<label>Thermal Clip</label>
+		<ammoTypes>
+			<Ammo_ME>Bullet_L89_Basic</Ammo_ME>
+			<Ammo_ME_AP>Bullet_L89_AP</Ammo_ME_AP>
+			<Ammo_ME_Cryo>Bullet_L89_Cryo</Ammo_ME_Cryo>
+			<Ammo_ME_HE>Bullet_L89_HE</Ammo_ME_HE>
+			<Ammo_ME_FI>Bullet_L89_FI</Ammo_ME_FI>
+			<Ammo_ME_Ion>Bullet_L89_Ion</Ammo_ME_Ion>
+			<Ammo_ME_Toxic>Bullet_L89_Toxic</Ammo_ME_Toxic>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_M29</defName>
+		<label>Thermal Clip</label>
+		<ammoTypes>
+			<Ammo_ME>Bullet_M29_Basic</Ammo_ME>
+			<Ammo_ME_AP>Bullet_M29_AP</Ammo_ME_AP>
+			<Ammo_ME_Cryo>Bullet_M29_Cryo</Ammo_ME_Cryo>
+			<Ammo_ME_HE>Bullet_M29_HE</Ammo_ME_HE>
+			<Ammo_ME_FI>Bullet_M29_FI</Ammo_ME_FI>
+			<Ammo_ME_Ion>Bullet_M29_Ion</Ammo_ME_Ion>
+			<Ammo_ME_Toxic>Bullet_M29_Toxic</Ammo_ME_Toxic>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Chakram</defName>
+		<label>Thermal Clip</label>
+		<ammoTypes>
+			<Ammo_ME>Bullet_Chakram_Basic</Ammo_ME>
+			<Ammo_ME_AP>Bullet_Chakram_AP</Ammo_ME_AP>
+			<Ammo_ME_Cryo>Bullet_Chakram_Cryo</Ammo_ME_Cryo>
+			<Ammo_ME_HE>Bullet_Chakram_HE</Ammo_ME_HE>
+			<Ammo_ME_FI>Bullet_Chakram_FI</Ammo_ME_FI>
+			<Ammo_ME_Ion>Bullet_Chakram_Ion</Ammo_ME_Ion>
+			<Ammo_ME_Toxic>Bullet_Chakram_Toxic</Ammo_ME_Toxic>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_M19</defName>
+		<label>Plasma Canister</label>
+		<ammoTypes>
+			<Ammo_ME_Plasma>Bullet_M19_Basic</Ammo_ME_Plasma>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<!-- ==================Chakram ================== -->
+
+	<ThingDef Name="BaseChakramBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Shot_ChakramDisc</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>208</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseChakramBullet">
+		<defName>Bullet_Chakram_Basic</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>24</damageAmountBase>
+			<armorPenetrationSharp>20</armorPenetrationSharp>
+			<armorPenetrationBlunt>90</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>48</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1.5</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>5</Fragment_Small>
+					<Fragment_ME>4</Fragment_ME>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseChakramBullet">
+		<defName>Bullet_Chakram_AP</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>19</damageAmountBase>
+			<armorPenetrationSharp>40</armorPenetrationSharp>
+			<armorPenetrationBlunt>90</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>25</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.9</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>4</Fragment_Small>
+					<Fragment_ME>2</Fragment_ME>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseChakramBullet">
+		<defName>Bullet_Chakram_HE</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>24</damageAmountBase>
+			<armorPenetrationSharp>20</armorPenetrationSharp>
+			<armorPenetrationBlunt>90</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>7</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>75</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1.9</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>5</Fragment_Small>
+					<Fragment_ME>4</Fragment_ME>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseChakramBullet">
+		<defName>Bullet_Chakram_Cryo</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>22</damageAmountBase>
+			<armorPenetrationSharp>20</armorPenetrationSharp>
+			<armorPenetrationBlunt>90</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Cryo</def>
+					<amount>7</amount>
+				</li>
+			</secondaryDamage>
+			<explosionEffect>ExtinguisherExplosion</explosionEffect>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>20</damageAmountBase>
+				<explosiveDamageType>ME_Cryo</explosiveDamageType>
+				<explosiveRadius>1.5</explosiveRadius>
+				<explosionSound>Explosion_EMP</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>5</Fragment_Small>
+					<Fragment_ME>4</Fragment_ME>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseChakramBullet">
+		<defName>Bullet_Chakram_Toxic</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>22</damageAmountBase>
+			<armorPenetrationSharp>20</armorPenetrationSharp>
+			<armorPenetrationBlunt>90</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Toxin</def>
+					<amount>7</amount>
+				</li>
+			</secondaryDamage>
+			<explosionEffect>ExtinguisherExplosion</explosionEffect>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>20</damageAmountBase>
+				<explosiveDamageType>ME_Toxin</explosiveDamageType>
+				<explosiveRadius>1.5</explosiveRadius>
+				<explosionSound>Explosion_EMP</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>5</Fragment_Small>
+					<Fragment_ME>4</Fragment_ME>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseChakramBullet">
+		<defName>Bullet_Chakram_Ion</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>17</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>8</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>22</armorPenetrationSharp>
+			<armorPenetrationBlunt>90</armorPenetrationBlunt>
+			<empShieldBreakChance>0.7</empShieldBreakChance>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>36</damageAmountBase>
+				<explosiveDamageType>EMP</explosiveDamageType>
+				<explosiveRadius>2</explosiveRadius>
+				<explosionSound>Explosion_EMP</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>4</Fragment_Small>
+					<Fragment_ME>2</Fragment_ME>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseChakramBullet">
+		<defName>Bullet_Chakram_FI</defName>
+		<label>accelerated incendiary shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>22</damageAmountBase>
+			<armorPenetrationSharp>20</armorPenetrationSharp>
+			<armorPenetrationBlunt>90</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_SickBurn</def>
+					<amount>5</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>18</damageAmountBase>
+				<explosiveDamageType>Flame</explosiveDamageType>
+				<explosiveRadius>1.5</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>5</Fragment_Small>
+					<Fragment_ME>4</Fragment_ME>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ================== L89 ================== -->
+
+	<ThingDef Name="BaseL89Bullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Shot_MassAccelerated_Large</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>400</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseL89Bullet">
+		<defName>Bullet_L89_Basic</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>24</damageAmountBase>
+			<armorPenetrationSharp>21</armorPenetrationSharp>
+			<armorPenetrationBlunt>84</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseL89Bullet">
+		<defName>Bullet_L89_AP</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>16</damageAmountBase>
+			<armorPenetrationSharp>42</armorPenetrationSharp>
+			<armorPenetrationBlunt>84</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseL89Bullet">
+		<defName>Bullet_L89_HE</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>24</damageAmountBase>
+			<armorPenetrationSharp>21</armorPenetrationSharp>
+			<armorPenetrationBlunt>84</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>12</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseL89Bullet">
+		<defName>Bullet_L89_Cryo</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>23</damageAmountBase>
+			<armorPenetrationSharp>21</armorPenetrationSharp>
+			<armorPenetrationBlunt>84</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Cryo</def>
+					<amount>6</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseL89Bullet">
+		<defName>Bullet_L89_Toxic</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>23</damageAmountBase>
+			<armorPenetrationSharp>21</armorPenetrationSharp>
+			<armorPenetrationBlunt>84</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Toxin</def>
+					<amount>6</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseL89Bullet">
+		<defName>Bullet_L89_Ion</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>16</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>8</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>24</armorPenetrationSharp>
+			<armorPenetrationBlunt>84</armorPenetrationBlunt>
+			<empShieldBreakChance>0.4</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseL89Bullet">
+		<defName>Bullet_L89_FI</defName>
+		<label>accelerated incendiary shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>24</damageAmountBase>
+			<armorPenetrationSharp>21</armorPenetrationSharp>
+			<armorPenetrationBlunt>84</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_SickBurn</def>
+					<amount>5</amount>
+				</li>
+				<li>
+					<def>Flame</def>
+					<amount>1</amount>
+					<chance>0.4</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== M29 ================== -->
+
+	<ThingDef Name="BaseM29Bullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Shot_MassAccelerated_Sniper</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>1.0</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>480</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseM29Bullet">
+		<defName>Bullet_M29_Basic</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>17</damageAmountBase>
+			<armorPenetrationSharp>17</armorPenetrationSharp>
+			<armorPenetrationBlunt>50</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseM29Bullet">
+		<defName>Bullet_M29_AP</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>34</armorPenetrationSharp>
+			<armorPenetrationBlunt>50</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseM29Bullet">
+		<defName>Bullet_M29_Cryo</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>16</damageAmountBase>
+			<armorPenetrationSharp>17</armorPenetrationSharp>
+			<armorPenetrationBlunt>50</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Cryo</def>
+					<amount>4</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseM29Bullet">
+		<defName>Bullet_M29_Toxic</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>16</damageAmountBase>
+			<armorPenetrationSharp>17</armorPenetrationSharp>
+			<armorPenetrationBlunt>50</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Toxin</def>
+					<amount>4</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseM29Bullet">
+		<defName>Bullet_M29_HE</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>17</damageAmountBase>
+			<armorPenetrationSharp>17</armorPenetrationSharp>
+			<armorPenetrationBlunt>50</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>8</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseM29Bullet">
+		<defName>Bullet_M29_FI</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>17</damageAmountBase>
+			<armorPenetrationSharp>17</armorPenetrationSharp>
+			<armorPenetrationBlunt>50</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_SickBurn</def>
+					<amount>3</amount>
+				</li>
+				<li>
+					<def>Flame</def>
+					<amount>1</amount>
+					<chance>0.3</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseM29Bullet">
+		<defName>Bullet_M29_Ion</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>5</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>20</armorPenetrationSharp>
+			<armorPenetrationBlunt>50</armorPenetrationBlunt>
+			<empShieldBreakChance>0.3</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================M19 Plasma ================== -->
+
+	<ThingDef ParentName="BaseM29Bullet">
+		<defName>Bullet_M19_Basic</defName>
+		<label>Plasma shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationSharp>24</armorPenetrationSharp>
+			<armorPenetrationBlunt>36</armorPenetrationBlunt>
+			<speed>250</speed>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>20</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Extended Cut/Patches/Rim-Effect Extended Cut/Headgear_ExtendedCut.xml b/ModPatches/Rim-Effect Extended Cut/Patches/Rim-Effect Extended Cut/Headgear_ExtendedCut.xml
new file mode 100644
index 0000000000..ef27f08993
--- /dev/null
+++ b/ModPatches/Rim-Effect Extended Cut/Patches/Rim-Effect Extended Cut/Headgear_ExtendedCut.xml	
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Light Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_CapacitorHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>0.5</WornBulk>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_CapacitorHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_CapacitorHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_CapacitorHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>150</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_CapacitorHelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0.1</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_CapacitorHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<ShootingAccuracyPawn>-0.4</ShootingAccuracyPawn>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_CapacitorHelmet"]/apparel</xpath>
+		<value>
+			<layers Inherit="False">
+				<li>Overhead</li>
+				<li>StrappedHead</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_ArchonVisor"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_ArchonVisor"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<ShootingAccuracyPawn>0.5</ShootingAccuracyPawn>
+				<AimingAccuracy>0.2</AimingAccuracy>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_ArchonVisor"]/apparel</xpath>
+		<value>
+			<layers Inherit="False">
+				<li>StrappedHead</li>
+			</layers>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect Extended Cut/Patches/Rim-Effect Extended Cut/Weapons_ME_ExtendedCut.xml b/ModPatches/Rim-Effect Extended Cut/Patches/Rim-Effect Extended Cut/Weapons_ME_ExtendedCut.xml
new file mode 100644
index 0000000000..fdd940eb51
--- /dev/null
+++ b/ModPatches/Rim-Effect Extended Cut/Patches/Rim-Effect Extended Cut/Weapons_ME_ExtendedCut.xml	
@@ -0,0 +1,337 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Melee Tools ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Gun_SpacerBattleRifle" or defName="RE_Gun_SpacerMarksmanRifle" or defName="RE_Gun_SpacerAssaultRifle" or defName="RE_Gun_AlliancePrecisionRifle" or defName="RE_Gun_ChakramLauncher"]/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>
+
+	<!-- Value -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='RE_Gun_SpacerAssaultRifle' or defName='RE_Gun_SpacerMarksmanRifle']/statBases/MarketValue</xpath>
+		<value>
+			<MarketValue>600</MarketValue>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='RE_Gun_SpacerBattleRifle']/statBases/MarketValue</xpath>
+		<value>
+			<MarketValue>700</MarketValue>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='RE_Gun_SpacerChakramLauncher']/statBases/MarketValue</xpath>
+		<value>
+			<MarketValue>1000</MarketValue>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='RE_Gun_AlliancePrecisionRifle']/recipeMaker/skillRequirements</xpath>
+		<value>
+			<skillRequirements>
+				<Crafting>8</Crafting>
+			</skillRequirements>
+		</value>
+	</Operation>
+
+	<!-- ========== M7 Lancer ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RE_Gun_SpacerAssaultRifle</defName>
+		<statBases>
+			<WorkToMake>40000</WorkToMake>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.37</SwayFactor>
+			<Bulk>8</Bulk>
+			<Mass>4</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_M8_Basic</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<ammoConsumedPerShotCount>0</ammoConsumedPerShotCount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+			<soundCast>RE_Shot_Avenger</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+			<recoilAmount>1.37</recoilAmount>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>38</magazineSize>
+			<reloadTime>4.8</reloadTime>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- Name -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='RE_Gun_SpacerAssaultRifle']/label</xpath>
+		<value>
+			<label>M7 Lancer</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Gun_SpacerAssaultRifle"]/description</xpath>
+		<value>
+			<description>The M7-Lancer is a rare collector's item that was introduced shortly after the First Contact War. The Lancer has been refurbished by an unknown master weaponsmith, and it now uses the higher velocity rounds of today's weaponry. It does not need heat sinks, instead utilizing weapon heat-generation from an earlier era. Few of these finely crafted weapons are in existence.</description>
+		</value>
+	</Operation>
+
+	<!-- ========== Not Mattock ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RE_Gun_SpacerBattleRifle</defName>
+		<statBases>
+			<WorkToMake>40000</WorkToMake>
+			<SightsEfficiency>1.35</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.29</SwayFactor>
+			<Bulk>8.8</Bulk>
+			<Mass>4.5</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_L89_Basic</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>60</range>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>28</ticksBetweenBurstShots>
+			<soundCast>RE_Shot_Halberd</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+			<recoilAmount>1.54</recoilAmount>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>36</magazineSize>
+			<reloadTime>3.8</reloadTime>
+			<ammoSet>AmmoSet_L89</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- Name -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='RE_Gun_SpacerBattleRifle']/label</xpath>
+		<value>
+			<label>L-89 Halberd</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Gun_SpacerBattleRifle"]/description</xpath>
+		<value>
+			<description>The sleek L-89 Halberd favors power and precision. The semi-automatic rifle was the Andromeda Initiative's attempt to make a weapon on par with the reliable M-96 Mattock that also used Initiative breakthroughs in materials science. Only a few were made, but their effectiveness in the field is unquestioned.</description>
+		</value>
+	</Operation>
+
+	<!-- ========== M-29 ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RE_Gun_SpacerMarksmanRifle</defName>
+		<statBases>
+			<WorkToMake>40000</WorkToMake>
+			<SightsEfficiency>2.5</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.45</SwayFactor>
+			<Bulk>10</Bulk>
+			<Mass>3.4</Mass>
+			<RangedWeapon_Cooldown>0.44</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_M29_Basic</defaultProjectile>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>1.45</warmupTime>
+			<range>75</range>
+			<soundCast>RE_Shot_Incisor</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilAmount>0.94</recoilAmount>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>3.6</reloadTime>
+			<ammoSet>AmmoSet_M29</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- Name -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='RE_Gun_SpacerMarksmanRifle']/label</xpath>
+		<value>
+			<label>M-29 Incisor</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Gun_SpacerMarksmanRifle"]/description</xpath>
+		<value>
+			<description>The Incisor is one of a new wave of military and police sniper rifles designed to overload active defenses such as shields. the Incisor was initially advertised as having negligible recoil, although under real combat conditions the second and third rounds frequently climb in difficulty.</description>
+		</value>
+	</Operation>
+
+	<!-- ========== M-19 ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RE_Gun_AlliancePrecisionRifle</defName>
+		<statBases>
+			<WorkToMake>50000</WorkToMake>
+			<SightsEfficiency>2.4</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.42</SwayFactor>
+			<Bulk>10</Bulk>
+			<Mass>4.4</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_M19_Basic</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>72</range>
+			<soundCast>RE_Shot_Ballista</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<costList>
+			<Steel>30</Steel>
+			<Plasteel>35</Plasteel>
+			<ComponentSpacer>2</ComponentSpacer>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>5.9</reloadTime>
+			<ammoSet>AmmoSet_M19</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- Name -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='RE_Gun_AlliancePrecisionRifle']/label</xpath>
+		<value>
+			<label>M-19 Ballista</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Gun_AlliancePrecisionRifle"]/description</xpath>
+		<value>
+			<description>the M-Series Ballista is an extremely versatile medium-to-long range combat weapon. Harnessing the exhaustive resources of synthetic plasma, the Ballista meets the critical requirements of low-cost abundant ammunition for today's highly mobile snipers, Each projectile contains a small, but very powerful, nanite core that detonates approximately 0.33 seconds after impact. The detonation stage of the projectile is devastating, targets hit by the bullet are not likely to survive.</description>
+		</value>
+	</Operation>
+
+	<!-- ========== ChakramLauncher ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RE_Gun_SpacerChakramLauncher</defName>
+		<statBases>
+			<WorkToMake>52000</WorkToMake>
+			<SightsEfficiency>1.25</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.56</SwayFactor>
+			<Bulk>12</Bulk>
+			<Mass>6</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Chakram_Basic</defaultProjectile>
+			<warmupTime>1.25</warmupTime>
+			<range>62</range>
+			<ammoConsumedPerShotCount>10</ammoConsumedPerShotCount>
+			<soundCast>RE_Shot_Chakram</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>4.0</reloadTime>
+			<ammoSet>AmmoSet_Chakram</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- Name -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='RE_Gun_SpacerChakramLauncher']/label</xpath>
+		<value>
+			<label>Chakram Launcher</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Gun_SpacerChakramLauncher"]/description</xpath>
+		<value>
+			<description>The fancifully named Chakram Launcher uses an internal fabricator to manufacture lightweight ammunition discs wrapped in holographic tracers. The discs explode on impact, sending shrapnel tearing through the enemy.</description>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect N7/Defs/Rim-Effect N7/ME_DamageDef.xml b/ModPatches/Rim-Effect N7/Defs/Rim-Effect N7/ME_DamageDef.xml
new file mode 100644
index 0000000000..ae4607924f
--- /dev/null
+++ b/ModPatches/Rim-Effect N7/Defs/Rim-Effect N7/ME_DamageDef.xml	
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<DamageDef>
+		<defName>ME_Blacked</defName>
+		<label>Blackholed</label>
+		<workerClass>DamageWorker_AddInjury</workerClass>
+		<externalViolence>true</externalViolence>
+		<isExplosive>true</isExplosive>
+		<deathMessage>{0} is consumed by the void.</deathMessage>
+		<hediff>Blast</hediff>
+		<hediffSolid>Crack</hediffSolid>
+		<harmAllLayersUntilOutside>true</harmAllLayersUntilOutside>
+		<impactSoundType>Blunt</impactSoundType>
+		<armorCategory>Blunt</armorCategory>
+		<minDamageToFragment>20</minDamageToFragment>
+		<defaultDamage>200</defaultDamage>
+		<defaultStoppingPower>3.0</defaultStoppingPower>
+		<defaultArmorPenetration>120000</defaultArmorPenetration>
+		<buildingDamageFactor>4</buildingDamageFactor>
+		<buildingDamageFactorPassable>2</buildingDamageFactorPassable>
+		<plantDamageFactor>4</plantDamageFactor>
+		<explosionAffectOutsidePartsOnly>false</explosionAffectOutsidePartsOnly>
+		<explosionHeatEnergyPerCell>-5</explosionHeatEnergyPerCell>
+		<explosionCellFleck>BlastDry</explosionCellFleck>
+		<explosionColorCenter>(1, 0.5, 0.3)</explosionColorCenter>
+		<explosionColorEdge>(0.6, 0.5, 0.4)</explosionColorEdge>
+		<soundExplosion>Explosion_Bomb</soundExplosion>
+		<combatLogRules>Damage_Bomb</combatLogRules>
+	</DamageDef>
+
+	<DamageDef>
+		<defName>ME_BigKill</defName>
+		<label>Carnage</label>
+		<workerClass>DamageWorker_AddInjury</workerClass>
+		<externalViolence>true</externalViolence>
+		<isExplosive>true</isExplosive>
+		<deathMessage>{0} is carnaged.</deathMessage>
+		<hediff>Blast</hediff>
+		<hediffSolid>Crack</hediffSolid>
+		<harmAllLayersUntilOutside>true</harmAllLayersUntilOutside>
+		<impactSoundType>Blunt</impactSoundType>
+		<armorCategory>Blunt</armorCategory>
+		<minDamageToFragment>10</minDamageToFragment>
+		<defaultDamage>43</defaultDamage>
+		<defaultStoppingPower>1.0</defaultStoppingPower>
+		<defaultArmorPenetration>150</defaultArmorPenetration>
+		<buildingDamageFactor>4</buildingDamageFactor>
+		<buildingDamageFactorPassable>2</buildingDamageFactorPassable>
+		<plantDamageFactor>4</plantDamageFactor>
+		<explosionAffectOutsidePartsOnly>false</explosionAffectOutsidePartsOnly>
+		<explosionHeatEnergyPerCell>5</explosionHeatEnergyPerCell>
+		<explosionCellFleck>BlastDry</explosionCellFleck>
+		<explosionColorCenter>(1, 0.5, 0.3)</explosionColorCenter>
+		<explosionColorEdge>(0.6, 0.5, 0.4)</explosionColorEdge>
+		<soundExplosion>Explosion_Bomb</soundExplosion>
+		<combatLogRules>Damage_Bomb</combatLogRules>
+	</DamageDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect N7/Defs/Rim-Effect N7/ME_Projectile_N7.xml b/ModPatches/Rim-Effect N7/Defs/Rim-Effect N7/ME_Projectile_N7.xml
new file mode 100644
index 0000000000..7a6c33bceb
--- /dev/null
+++ b/ModPatches/Rim-Effect N7/Defs/Rim-Effect N7/ME_Projectile_N7.xml	
@@ -0,0 +1,1094 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Valkyrie</defName>
+		<label>Thermal Clip</label>
+		<ammoTypes>
+			<Ammo_ME>Bullet_Valkyrie</Ammo_ME>
+			<Ammo_ME_AP>Bullet_Valkyrie_AP</Ammo_ME_AP>
+			<Ammo_ME_Cryo>Bullet_Valkyrie_Cryo</Ammo_ME_Cryo>
+			<Ammo_ME_HE>Bullet_Valkyrie_HE</Ammo_ME_HE>
+			<Ammo_ME_FI>Bullet_Valkyrie_FI</Ammo_ME_FI>
+			<Ammo_ME_Ion>Bullet_Valkyrie_Ion</Ammo_ME_Ion>
+			<Ammo_ME_Toxic>Bullet_Valkyrie_Toxic</Ammo_ME_Toxic>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Typhoon</defName>
+		<label>Thermal Clip</label>
+		<ammoTypes>
+			<Ammo_ME>Bullet_Typhoon</Ammo_ME>
+			<Ammo_ME_AP>Bullet_Typhoon_AP</Ammo_ME_AP>
+			<Ammo_ME_Cryo>Bullet_Typhoon_Cryo</Ammo_ME_Cryo>
+			<Ammo_ME_HE>Bullet_Typhoon_HE</Ammo_ME_HE>
+			<Ammo_ME_FI>Bullet_Typhoon_FI</Ammo_ME_FI>
+			<Ammo_ME_Ion>Bullet_Typhoon_Ion</Ammo_ME_Ion>
+			<Ammo_ME_Toxic>Bullet_Typhoon_Toxic</Ammo_ME_Toxic>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Eagle</defName>
+		<label>Thermal Clip</label>
+		<ammoTypes>
+			<Ammo_ME>Bullet_Eagle</Ammo_ME>
+			<Ammo_ME_AP>Bullet_Eagle_AP</Ammo_ME_AP>
+			<Ammo_ME_Cryo>Bullet_Eagle_Cryo</Ammo_ME_Cryo>
+			<Ammo_ME_HE>Bullet_Eagle_HE</Ammo_ME_HE>
+			<Ammo_ME_FI>Bullet_Eagle_FI</Ammo_ME_FI>
+			<Ammo_ME_Ion>Bullet_Eagle_Ion</Ammo_ME_Ion>
+			<Ammo_ME_Toxic>Bullet_Eagle_Toxic</Ammo_ME_Toxic>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Valiant</defName>
+		<label>Thermal Clip</label>
+		<ammoTypes>
+			<Ammo_ME>Bullet_Valiant</Ammo_ME>
+			<Ammo_ME_AP>Bullet_Valiant_AP</Ammo_ME_AP>
+			<Ammo_ME_Cryo>Bullet_Valiant_Cryo</Ammo_ME_Cryo>
+			<Ammo_ME_HE>Bullet_Valiant_HE</Ammo_ME_HE>
+			<Ammo_ME_FI>Bullet_Valiant_FI</Ammo_ME_FI>
+			<Ammo_ME_Ion>Bullet_Valiant_Ion</Ammo_ME_Ion>
+			<Ammo_ME_Toxic>Bullet_Valiant_Toxic</Ammo_ME_Toxic>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Hurricane</defName>
+		<label>Thermal Clip</label>
+		<ammoTypes>
+			<Ammo_ME>Bullet_Hurricane</Ammo_ME>
+			<Ammo_ME_AP>Bullet_Hurricane_AP</Ammo_ME_AP>
+			<Ammo_ME_Cryo>Bullet_Hurricane_Cryo</Ammo_ME_Cryo>
+			<Ammo_ME_HE>Bullet_Hurricane_HE</Ammo_ME_HE>
+			<Ammo_ME_FI>Bullet_Hurricane_FI</Ammo_ME_FI>
+			<Ammo_ME_Ion>Bullet_Hurricane_Ion</Ammo_ME_Ion>
+			<Ammo_ME_Toxic>Bullet_Hurricane_Toxic</Ammo_ME_Toxic>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_BlackWidow</defName>
+		<label>Thermal Clip</label>
+		<ammoTypes>
+			<Ammo_ME>Bullet_BlackWidow</Ammo_ME>
+			<Ammo_ME_AP>Bullet_BlackWidow_AP</Ammo_ME_AP>
+			<Ammo_ME_Cryo>Bullet_BlackWidow_Cryo</Ammo_ME_Cryo>
+			<Ammo_ME_HE>Bullet_BlackWidow_HE</Ammo_ME_HE>
+			<Ammo_ME_FI>Bullet_BlackWidow_FI</Ammo_ME_FI>
+			<Ammo_ME_Ion>Bullet_BlackWidow_Ion</Ammo_ME_Ion>
+			<Ammo_ME_Toxic>Bullet_BlackWidow_Toxic</Ammo_ME_Toxic>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Crusader</defName>
+		<label>Thermal Clip</label>
+		<ammoTypes>
+			<Ammo_ME>Bullet_Crusader</Ammo_ME>
+			<Ammo_ME_AP>Bullet_Crusader_AP</Ammo_ME_AP>
+			<Ammo_ME_Cryo>Bullet_Crusader_Cryo</Ammo_ME_Cryo>
+			<Ammo_ME_HE>Bullet_Crusader_HE</Ammo_ME_HE>
+			<Ammo_ME_FI>Bullet_Crusader_FI</Ammo_ME_FI>
+			<Ammo_ME_Ion>Bullet_Crusader_Ion</Ammo_ME_Ion>
+			<Ammo_ME_Toxic>Bullet_Crusader_Toxic</Ammo_ME_Toxic>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Piranha</defName>
+		<label>Thermal Clip</label>
+		<ammoTypes>
+			<Ammo_ME>Bullet_Piranha</Ammo_ME>
+			<Ammo_ME_AP>Bullet_Piranha_AP</Ammo_ME_AP>
+			<Ammo_ME_Cryo>Bullet_Piranha_Cryo</Ammo_ME_Cryo>
+			<Ammo_ME_HE>Bullet_Piranha_HE</Ammo_ME_HE>
+			<Ammo_ME_FI>Bullet_Piranha_FI</Ammo_ME_FI>
+			<Ammo_ME_Ion>Bullet_Piranha_Ion</Ammo_ME_Ion>
+			<Ammo_ME_Toxic>Bullet_Piranha_Toxic</Ammo_ME_Toxic>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<!-- ================== Valkyrie ================== -->
+
+	<ThingDef Name="BaseValkyrieBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Shot_MassAccelerated_Large</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>400</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseValkyrieBullet">
+		<defName>Bullet_Valkyrie</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>19</damageAmountBase>
+			<armorPenetrationSharp>17</armorPenetrationSharp>
+			<armorPenetrationBlunt>58</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseValkyrieBullet">
+		<defName>Bullet_Valkyrie_AP</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>13</damageAmountBase>
+			<armorPenetrationSharp>34</armorPenetrationSharp>
+			<armorPenetrationBlunt>58</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseValkyrieBullet">
+		<defName>Bullet_Valkyrie_HE</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>19</damageAmountBase>
+			<armorPenetrationSharp>17</armorPenetrationSharp>
+			<armorPenetrationBlunt>58</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>8</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseValkyrieBullet">
+		<defName>Bullet_Valkyrie_Cryo</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>18</damageAmountBase>
+			<armorPenetrationSharp>17</armorPenetrationSharp>
+			<armorPenetrationBlunt>58</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Cryo</def>
+					<amount>4</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseValkyrieBullet">
+		<defName>Bullet_Valkyrie_Toxic</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>18</damageAmountBase>
+			<armorPenetrationSharp>17</armorPenetrationSharp>
+			<armorPenetrationBlunt>58</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Toxin</def>
+					<amount>4</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseValkyrieBullet">
+		<defName>Bullet_Valkyrie_Ion</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>11</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>7</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>19</armorPenetrationSharp>
+			<armorPenetrationBlunt>58</armorPenetrationBlunt>
+			<empShieldBreakChance>0.35</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseValkyrieBullet">
+		<defName>Bullet_Valkyrie_FI</defName>
+		<label>accelerated incendiary shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>18</damageAmountBase>
+			<armorPenetrationSharp>17</armorPenetrationSharp>
+			<armorPenetrationBlunt>58</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_SickBurn</def>
+					<amount>4</amount>
+				</li>
+				<li>
+					<def>Flame</def>
+					<amount>1</amount>
+					<chance>0.3</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== Typhoon ================== -->
+
+	<ThingDef Name="BaseTyphoonBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Shot_MassAccelerated_Large</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>1.0</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>420</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseTyphoonBullet">
+		<defName>Bullet_Typhoon</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>19</armorPenetrationSharp>
+			<armorPenetrationBlunt>71</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseTyphoonBullet">
+		<defName>Bullet_Typhoon_AP</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>14</damageAmountBase>
+			<armorPenetrationSharp>38</armorPenetrationSharp>
+			<armorPenetrationBlunt>71</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseTyphoonBullet">
+		<defName>Bullet_Typhoon_Cryo</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>19</damageAmountBase>
+			<armorPenetrationSharp>19</armorPenetrationSharp>
+			<armorPenetrationBlunt>71</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Cryo</def>
+					<amount>6</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseTyphoonBullet">
+		<defName>Bullet_Typhoon_Toxic</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>19</damageAmountBase>
+			<armorPenetrationSharp>19</armorPenetrationSharp>
+			<armorPenetrationBlunt>71</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Toxin</def>
+					<amount>6</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseTyphoonBullet">
+		<defName>Bullet_Typhoon_HE</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>19</armorPenetrationSharp>
+			<armorPenetrationBlunt>71</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>10</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseTyphoonBullet">
+		<defName>Bullet_Typhoon_FI</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>19</armorPenetrationSharp>
+			<armorPenetrationBlunt>71</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_SickBurn</def>
+					<amount>4</amount>
+				</li>
+				<li>
+					<def>Flame</def>
+					<amount>1</amount>
+					<chance>0.3</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseTyphoonBullet">
+		<defName>Bullet_Typhoon_Ion</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>13</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>8</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>22</armorPenetrationSharp>
+			<armorPenetrationBlunt>71</armorPenetrationBlunt>
+			<empShieldBreakChance>0.35</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== Eagle ================== -->
+
+	<ThingDef Name="BaseEagleBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Shot_MassAccelerated_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>1.2</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>200</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseEagleBullet">
+		<defName>Bullet_Eagle</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>13</damageAmountBase>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+			<armorPenetrationBlunt>28</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseEagleBullet">
+		<defName>Bullet_Eagle_AP</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>9</damageAmountBase>
+			<armorPenetrationSharp>16</armorPenetrationSharp>
+			<armorPenetrationBlunt>28</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseEagleBullet">
+		<defName>Bullet_Eagle_Cryo</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+			<armorPenetrationBlunt>28</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Cryo</def>
+					<amount>3</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseEagleBullet">
+		<defName>Bullet_Eagle_Toxic</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+			<armorPenetrationBlunt>28</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Toxin</def>
+					<amount>3</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseEagleBullet">
+		<defName>Bullet_Eagle_HE</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>13</damageAmountBase>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+			<armorPenetrationBlunt>28</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>6</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseEagleBullet">
+		<defName>Bullet_Eagle_FI</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>13</damageAmountBase>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+			<armorPenetrationBlunt>28</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_SickBurn</def>
+					<amount>3</amount>
+				</li>
+				<li>
+					<def>Flame</def>
+					<amount>1</amount>
+					<chance>0.275</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseEagleBullet">
+		<defName>Bullet_Eagle_Ion</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>8</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>5</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>9</armorPenetrationSharp>
+			<armorPenetrationBlunt>23</armorPenetrationBlunt>
+			<empShieldBreakChance>0.25</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== Hurricane ================== -->
+
+	<ThingDef Name="BaseHurricaneBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Shot_MassAccelerated_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>1.2</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>240</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseHurricaneBullet">
+		<defName>Bullet_Hurricane</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>9</armorPenetrationSharp>
+			<armorPenetrationBlunt>29</armorPenetrationBlunt>
+			<pelletCount>2</pelletCount>
+			<spreadMult>2</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseHurricaneBullet">
+		<defName>Bullet_Hurricane_AP</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>8</damageAmountBase>
+			<armorPenetrationSharp>18</armorPenetrationSharp>
+			<armorPenetrationBlunt>29</armorPenetrationBlunt>
+			<pelletCount>2</pelletCount>
+			<spreadMult>2</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseHurricaneBullet">
+		<defName>Bullet_Hurricane_Cryo</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>11</damageAmountBase>
+			<armorPenetrationSharp>9</armorPenetrationSharp>
+			<armorPenetrationBlunt>29</armorPenetrationBlunt>
+			<pelletCount>8</pelletCount>
+			<spreadMult>2</spreadMult>
+			<secondaryDamage>
+				<li>
+					<def>ME_Cryo</def>
+					<amount>3</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseHurricaneBullet">
+		<defName>Bullet_Hurricane_Toxic</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>11</damageAmountBase>
+			<armorPenetrationSharp>9</armorPenetrationSharp>
+			<armorPenetrationBlunt>29</armorPenetrationBlunt>
+			<pelletCount>2</pelletCount>
+			<spreadMult>2</spreadMult>
+			<secondaryDamage>
+				<li>
+					<def>ME_Toxin</def>
+					<amount>3</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseHurricaneBullet">
+		<defName>Bullet_Hurricane_HE</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>9</armorPenetrationSharp>
+			<armorPenetrationBlunt>29</armorPenetrationBlunt>
+			<pelletCount>2</pelletCount>
+			<spreadMult>2</spreadMult>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>6</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseHurricaneBullet">
+		<defName>Bullet_Hurricane_FI</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>9</armorPenetrationSharp>
+			<armorPenetrationBlunt>29</armorPenetrationBlunt>
+			<pelletCount>2</pelletCount>
+			<spreadMult>2</spreadMult>
+			<secondaryDamage>
+				<li>
+					<def>ME_SickBurn</def>
+					<amount>2</amount>
+				</li>
+				<li>
+					<def>Flame</def>
+					<amount>1</amount>
+					<chance>0.25</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseHurricaneBullet">
+		<defName>Bullet_Hurricane_Ion</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>8</damageAmountBase>
+			<pelletCount>2</pelletCount>
+			<spreadMult>2</spreadMult>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>4</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>10</armorPenetrationSharp>
+			<armorPenetrationBlunt>29</armorPenetrationBlunt>
+			<empShieldBreakChance>0.25</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== Valiant ================== -->
+
+	<ThingDef Name="BaseValiantBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Shot_MassAccelerated_Sniper</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>1.0</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>500</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseValiantBullet">
+		<defName>Bullet_Valiant</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>29</damageAmountBase>
+			<armorPenetrationSharp>24</armorPenetrationSharp>
+			<armorPenetrationBlunt>88</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseValiantBullet">
+		<defName>Bullet_Valiant_AP</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>19</damageAmountBase>
+			<armorPenetrationSharp>48</armorPenetrationSharp>
+			<armorPenetrationBlunt>88</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseValiantBullet">
+		<defName>Bullet_Valiant_Cryo</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>27</damageAmountBase>
+			<armorPenetrationSharp>24</armorPenetrationSharp>
+			<armorPenetrationBlunt>88</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Cryo</def>
+					<amount>7</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseValiantBullet">
+		<defName>Bullet_Valiant_HE</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>29</damageAmountBase>
+			<armorPenetrationSharp>24</armorPenetrationSharp>
+			<armorPenetrationBlunt>88</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>14</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseValiantBullet">
+		<defName>Bullet_Valiant_Toxic</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>27</damageAmountBase>
+			<armorPenetrationSharp>24</armorPenetrationSharp>
+			<armorPenetrationBlunt>88</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Toxin</def>
+					<amount>7</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseValiantBullet">
+		<defName>Bullet_Valiant_FI</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>29</damageAmountBase>
+			<armorPenetrationSharp>24</armorPenetrationSharp>
+			<armorPenetrationBlunt>88</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_SickBurn</def>
+					<amount>6</amount>
+				</li>
+				<li>
+					<def>Flame</def>
+					<amount>1</amount>
+					<chance>0.55</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseValiantBullet">
+		<defName>Bullet_Valiant_Ion</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>19</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>10</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>27</armorPenetrationSharp>
+			<armorPenetrationBlunt>88</armorPenetrationBlunt>
+			<empShieldBreakChance>0.6</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== Black Widow ================== -->
+
+	<ThingDef Name="BaseBlackWidowBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Shot_MassAccelerated_Sniper</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>1.4</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>ME_BigBullet</damageDef>
+			<speed>500</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlackWidowBullet">
+		<defName>Bullet_BlackWidow</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>43</damageAmountBase>
+			<armorPenetrationSharp>34</armorPenetrationSharp>
+			<armorPenetrationBlunt>288</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlackWidowBullet">
+		<defName>Bullet_BlackWidow_AP</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>28</damageAmountBase>
+			<armorPenetrationSharp>68</armorPenetrationSharp>
+			<armorPenetrationBlunt>288</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlackWidowBullet">
+		<defName>Bullet_BlackWidow_Cryo</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>41</damageAmountBase>
+			<armorPenetrationSharp>34</armorPenetrationSharp>
+			<armorPenetrationBlunt>288</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Cryo</def>
+					<amount>10</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlackWidowBullet">
+		<defName>Bullet_BlackWidow_HE</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>43</damageAmountBase>
+			<armorPenetrationSharp>34</armorPenetrationSharp>
+			<armorPenetrationBlunt>288</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>21</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlackWidowBullet">
+		<defName>Bullet_BlackWidow_Toxic</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>41</damageAmountBase>
+			<armorPenetrationSharp>34</armorPenetrationSharp>
+			<armorPenetrationBlunt>288</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Toxin</def>
+					<amount>10</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlackWidowBullet">
+		<defName>Bullet_BlackWidow_FI</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>43</damageAmountBase>
+			<armorPenetrationSharp>34</armorPenetrationSharp>
+			<armorPenetrationBlunt>288</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_SickBurn</def>
+					<amount>7</amount>
+				</li>
+				<li>
+					<def>Flame</def>
+					<amount>1</amount>
+					<chance>0.95</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlackWidowBullet">
+		<defName>Bullet_BlackWidow_Ion</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>27</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>17</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>38</armorPenetrationSharp>
+			<armorPenetrationBlunt>288</armorPenetrationBlunt>
+			<empShieldBreakChance>1</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== Crusader ================== -->
+
+	<ThingDef Name="BaseCrusaderBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Shot_MassAccelerated_Sniper</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>1.2</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>400</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseCrusaderBullet">
+		<defName>Bullet_Crusader</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>38</damageAmountBase>
+			<armorPenetrationSharp>27</armorPenetrationSharp>
+			<armorPenetrationBlunt>136</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseCrusaderBullet">
+		<defName>Bullet_Crusader_AP</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>25</damageAmountBase>
+			<armorPenetrationSharp>54</armorPenetrationSharp>
+			<armorPenetrationBlunt>136</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseCrusaderBullet">
+		<defName>Bullet_Crusader_Cryo</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>36</damageAmountBase>
+			<armorPenetrationSharp>27</armorPenetrationSharp>
+			<armorPenetrationBlunt>136</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Cryo</def>
+					<amount>9</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseCrusaderBullet">
+		<defName>Bullet_Crusader_HE</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>38</damageAmountBase>
+			<armorPenetrationSharp>27</armorPenetrationSharp>
+			<armorPenetrationBlunt>136</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>19</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseCrusaderBullet">
+		<defName>Bullet_Crusader_Toxic</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>36</damageAmountBase>
+			<armorPenetrationSharp>27</armorPenetrationSharp>
+			<armorPenetrationBlunt>136</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_Toxin</def>
+					<amount>9</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseCrusaderBullet">
+		<defName>Bullet_Crusader_FI</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>38</damageAmountBase>
+			<armorPenetrationSharp>27</armorPenetrationSharp>
+			<armorPenetrationBlunt>136</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>ME_SickBurn</def>
+					<amount>7</amount>
+				</li>
+				<li>
+					<def>Flame</def>
+					<amount>1</amount>
+					<chance>0.9</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseCrusaderBullet">
+		<defName>Bullet_Crusader_Ion</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>27</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>12</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>30</armorPenetrationSharp>
+			<armorPenetrationBlunt>136</armorPenetrationBlunt>
+			<empShieldBreakChance>0.9</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== Piranha ================== -->
+
+	<ThingDef ParentName="BaseKatanaBullet">
+		<defName>Bullet_Piranha</defName>
+		<label>accelerated blast</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>9</damageAmountBase>
+			<armorPenetrationSharp>7</armorPenetrationSharp>
+			<armorPenetrationBlunt>16</armorPenetrationBlunt>
+			<pelletCount>8</pelletCount>
+			<spreadMult>21.8</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseKatanaBullet">
+		<defName>Bullet_Piranha_AP</defName>
+		<label>accelerated blast</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>6</damageAmountBase>
+			<armorPenetrationSharp>14</armorPenetrationSharp>
+			<armorPenetrationBlunt>18</armorPenetrationBlunt>
+			<pelletCount>8</pelletCount>
+			<spreadMult>21.8</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseKatanaBullet">
+		<defName>Bullet_Piranha_HE</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>9</damageAmountBase>
+			<armorPenetrationSharp>7</armorPenetrationSharp>
+			<armorPenetrationBlunt>18</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>4</amount>
+				</li>
+			</secondaryDamage>
+			<pelletCount>8</pelletCount>
+			<spreadMult>21.8</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseKatanaBullet">
+		<defName>Bullet_Piranha_Cryo</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>8</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>ME_Cryo</def>
+					<amount>3</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>7</armorPenetrationSharp>
+			<armorPenetrationBlunt>18</armorPenetrationBlunt>
+			<pelletCount>8</pelletCount>
+			<spreadMult>21.8</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseKatanaBullet">
+		<defName>Bullet_Piranha_Toxic</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>8</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>ME_Toxin</def>
+					<amount>3</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>7</armorPenetrationSharp>
+			<armorPenetrationBlunt>18</armorPenetrationBlunt>
+			<pelletCount>8</pelletCount>
+			<spreadMult>21.8</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseKatanaBullet">
+		<defName>Bullet_Piranha_FI</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>9</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>ME_SickBurn</def>
+					<amount>1</amount>
+				</li>
+				<li>
+					<def>Flame</def>
+					<amount>1</amount>
+					<chance>0.065</chance>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>7</armorPenetrationSharp>
+			<armorPenetrationBlunt>18</armorPenetrationBlunt>
+			<pelletCount>8</pelletCount>
+			<spreadMult>21.8</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseKatanaBullet">
+		<defName>Bullet_Piranha_Ion</defName>
+		<label>accelerated shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>6</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>3</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+			<armorPenetrationBlunt>18</armorPenetrationBlunt>
+			<pelletCount>8</pelletCount>
+			<spreadMult>20.8</spreadMult>
+			<empShieldBreakChance>0.075</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect N7/Patches/Rim-Effect N7/Abilities_N7.xml b/ModPatches/Rim-Effect N7/Patches/Rim-Effect N7/Abilities_N7.xml
new file mode 100644
index 0000000000..b6d9b8f134
--- /dev/null
+++ b/ModPatches/Rim-Effect N7/Patches/Rim-Effect N7/Abilities_N7.xml	
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Biotic -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="REN7_DarkChannel"]/range</xpath>
+		<value>
+			<range>48</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="REN7_Carnage"]/range</xpath>
+		<value>
+			<range>60</range>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect N7/Patches/Rim-Effect N7/Armor_N7.xml b/ModPatches/Rim-Effect N7/Patches/Rim-Effect N7/Armor_N7.xml
new file mode 100644
index 0000000000..55894370c3
--- /dev/null
+++ b/ModPatches/Rim-Effect N7/Patches/Rim-Effect N7/Armor_N7.xml	
@@ -0,0 +1,705 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7AdeptSuit" or defName="REN7_Apparel_N7Armor" or defName="REN7_Apparel_N7HeavyArmor"]/apparel/layers</xpath>
+		<value>
+			<li>Webbing</li>
+		</value>
+	</Operation>
+
+	<!-- === Mask === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_N7AdeptMask"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>0.5</WornBulk>
+			<NightVisionEfficiency_Apparel>0.7</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_N7AdeptMask"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_N7AdeptMask"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>24</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_N7AdeptMask"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>180</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_N7AdeptMask"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0.1</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_N7AdeptMask"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="RE_Apparel_N7AdeptMask"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_N7AdeptMask"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingDelayFactor>-0.075</AimingDelayFactor>
+			<ToxicEnvironmentResistance>0.20</ToxicEnvironmentResistance>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_N7AdeptMask"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>45</Plasteel>
+			<DevilstrandCloth>12</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_N7AdeptMask"]/apparel/layers</xpath>
+		<value>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RE_Apparel_N7AdeptMask"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.50</ArmorRating_Sharp>
+						<parts>
+							<li>Nose</li>
+							<li>Jaw</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.50</ArmorRating_Blunt>
+						<parts>
+							<li>Nose</li>
+							<li>Jaw</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Adept suit === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7AdeptSuit"]/statBases/Mass</xpath>
+		<value>
+			<Bulk>40</Bulk>
+			<WornBulk>6</WornBulk>
+			<Mass>12</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7AdeptSuit"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7AdeptSuit"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>28</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7AdeptSuit"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>400</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7AdeptSuit"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0.1</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7AdeptSuit"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>12</CarryWeight>
+			<CarryBulk>40</CarryBulk>
+			<ShootingAccuracyPawn>0.05</ShootingAccuracyPawn>
+			<ToxicEnvironmentResistance>0.3</ToxicEnvironmentResistance>
+			<MoveSpeed>0.6</MoveSpeed>
+			<Suppressability>-0.1</Suppressability>
+			<ReloadSpeed>0.15</ReloadSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7AdeptSuit"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7AdeptSuit"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>30</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7AdeptSuit"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Medium Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7Helmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>0.5</WornBulk>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7Helmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0.1</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7Helmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>13</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7Helmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>24</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7Helmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>200</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7Helmet"]/equippedStatOffsets/ToxicResistance</xpath>
+		<value>
+			<AimingDelayFactor>-0.075</AimingDelayFactor>
+			<ToxicEnvironmentResistance>1</ToxicEnvironmentResistance>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7Helmet"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>55</Plasteel>
+			<DevilstrandCloth>15</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7Helmet"]/apparel/layers</xpath>
+		<value>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7Helmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Medium Armor === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7Armor"]/statBases/Mass</xpath>
+		<value>
+			<Bulk>60</Bulk>
+			<WornBulk>8</WornBulk>
+			<Mass>22</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7Armor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0.1</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7Armor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7Armor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7Armor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>450</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7Armor"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<CarryWeight>22</CarryWeight>
+			<CarryBulk>45</CarryBulk>
+			<ShootingAccuracyPawn>0.05</ShootingAccuracyPawn>
+			<ToxicEnvironmentResistance>0.3</ToxicEnvironmentResistance>
+			<MoveSpeed>0.2</MoveSpeed>
+			<Suppressability>-0.1</Suppressability>
+			<ReloadSpeed>0.15</ReloadSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7Armor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7Armor"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>40</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7Armor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Heavy Alliance Helmet === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyHelmet"]/statBases/Mass</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>2.5</WornBulk>
+			<Mass>6</Mass>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyHelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0.1</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>17</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>34</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>250</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyHelmet"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<PsychicSensitivity>-0.3</PsychicSensitivity>
+				<AimingAccuracy>0.25</AimingAccuracy>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+				<CarryWeight>5</CarryWeight>
+				<CarryBulk>1</CarryBulk>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+				<PainShockThreshold>0.05</PainShockThreshold>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyHelmet"]/costList</xpath>
+		<value>
+			<costList>
+				<Plasteel>75</Plasteel>
+				<DevilstrandCloth>16</DevilstrandCloth>
+				<RE_ElementZero>10</RE_ElementZero>
+				<ComponentSpacer>3</ComponentSpacer>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyHelmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Heavy Alliance Armor === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyArmor"]/statBases/Mass</xpath>
+		<value>
+			<Bulk>80</Bulk>
+			<WornBulk>20</WornBulk>
+			<Mass>60</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyArmor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0.1</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>22</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>60</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>550</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>75</CarryWeight>
+				<CarryBulk>60</CarryBulk>
+				<ShootingAccuracyPawn>0.2</ShootingAccuracyPawn>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+				<PainShockThreshold>0.1</PainShockThreshold>
+				<MoveSpeed>-0.25</MoveSpeed>
+				<Suppressability>-0.15</Suppressability>
+				<ReloadSpeed>0.15</ReloadSpeed>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyArmor"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>55</DevilstrandCloth>
+			<Hyperweave>10</Hyperweave>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Omni Shield -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Omnishield"]</xpath>
+		<value>
+			<ThingDef ParentName="ShieldBase">
+				<defName>REN7_Omnishield</defName>
+				<label>Omni shield</label>
+				<description>An omni shield capable of intercepting a majority of ranged and melee attacks.</description>
+				<techLevel>Ultra</techLevel>
+				<graphicData>
+					<texPath>Things/Item/Equipment/Shield/OmniShield/OmniShield</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+					<shaderType>Transparent</shaderType>
+					<drawSize>0.83</drawSize>
+				</graphicData>
+				<costList>
+					<RE_ElementZero>40</RE_ElementZero>
+					<Plasteel>40</Plasteel>
+				</costList>
+				<thingCategories Inherit="False">
+					<li>Shields</li>
+				</thingCategories>
+				<recipeMaker>
+					<researchPrerequisite>RE_OmniTool</researchPrerequisite>
+					<recipeUsers>
+						<li>RE_ManufacturingBench</li>
+					</recipeUsers>
+				</recipeMaker>
+				<statBases>
+					<WorkToMake>40000</WorkToMake>
+					<MaxHitPoints>220</MaxHitPoints>
+					<ArmorRating_Blunt>22</ArmorRating_Blunt>
+					<ArmorRating_Sharp>12</ArmorRating_Sharp>
+					<Mass>4</Mass>
+					<Bulk>9</Bulk>
+					<WornBulk>6</WornBulk>
+				</statBases>
+				<equippedStatOffsets>
+					<ReloadSpeed>-0.1</ReloadSpeed>
+					<MeleeHitChance>-1</MeleeHitChance>
+					<ShootingAccuracyPawn>-0.2</ShootingAccuracyPawn>
+					<AimingAccuracy>-0.08</AimingAccuracy>
+					<Suppressability>-0.5</Suppressability>
+					<MeleeCritChance>-0.1</MeleeCritChance>
+					<MeleeParryChance>1.0</MeleeParryChance>
+				</equippedStatOffsets>
+				<apparel>
+					<careIfWornByCorpse>false</careIfWornByCorpse>
+					<careIfDamaged>false</careIfDamaged>
+					<wearPerDay>0</wearPerDay>
+					<tags>
+						<li>UltratechN7</li>
+					</tags>
+				</apparel>
+				<tradeTags>
+					<li>RE_OmniShield</li>
+				</tradeTags>
+				<modExtensions>
+					<li Class="CombatExtended.ShieldDefExtension">
+						<shieldCoverage>
+							<li>Hands</li>
+							<li>Arms</li>
+							<li>Shoulders</li>
+							<li>Torso</li>
+							<li>Neck</li>
+							<li>Teeth</li>
+						</shieldCoverage>
+						<crouchCoverage>
+							<li>Legs</li>
+							<li>FullHead</li>
+						</crouchCoverage>
+						<drawAsTall>false</drawAsTall>
+					</li>
+				</modExtensions>
+			</ThingDef>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect N7/Patches/Rim-Effect N7/ME_SpecialsExplosives.xml b/ModPatches/Rim-Effect N7/Patches/Rim-Effect N7/ME_SpecialsExplosives.xml
new file mode 100644
index 0000000000..9c68d722f7
--- /dev/null
+++ b/ModPatches/Rim-Effect N7/Patches/Rim-Effect N7/ME_SpecialsExplosives.xml	
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Rocket_BlackHole"]/projectile</xpath>
+		<value>
+			<projectile>
+				<damageDef>ME_Blacked</damageDef>
+				<explosionRadius>9.5</explosionRadius>
+				<flyOverhead>true</flyOverhead>
+				<speed>27</speed>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_CarnageProjectile"]/projectile</xpath>
+		<value>
+			<projectile>
+				<damageDef>ME_BigKill</damageDef>
+				<speed>60</speed>
+				<explosionRadius>2</explosionRadius>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_DarkChannelProjectile"]/projectile/armorPenetrationBase</xpath>
+		<value>
+			<armorPenetrationBase>1000</armorPenetrationBase>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect N7/Patches/Rim-Effect N7/Pawns_N7.xml b/ModPatches/Rim-Effect N7/Patches/Rim-Effect N7/Pawns_N7.xml
new file mode 100644
index 0000000000..c06e59d3cd
--- /dev/null
+++ b/ModPatches/Rim-Effect N7/Patches/Rim-Effect N7/Pawns_N7.xml	
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="REN7_N7AgentAdept" or
+			defName="REN7_N7AgentEngineer"] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>9</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+					<li>
+						<generateChance>0.2</generateChance>
+						<sidearmMoney>
+							<min>10</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>GrenadeSmoke</li>
+							<li>GrenadeDestructive</li>
+							<li>CE_GrenadeFlashbang</li>
+						</weaponTags>
+						<magazineCount>
+							<min>0</min>
+							<max>1</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ======= Combat Power ======= -->
+
+	<!-- N7 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[
+			defName="REN7_N7AgentAdept" or
+			defName="REN7_N7AgentEngineer"
+			]/combatPower </xpath>
+		<value>
+			<combatPower>400</combatPower>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Effect N7/Patches/Rim-Effect N7/Weapons_N7.xml b/ModPatches/Rim-Effect N7/Patches/Rim-Effect N7/Weapons_N7.xml
new file mode 100644
index 0000000000..8093102fdc
--- /dev/null
+++ b/ModPatches/Rim-Effect N7/Patches/Rim-Effect N7/Weapons_N7.xml	
@@ -0,0 +1,688 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Melee Tools ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Gun_N7Pistol" or defName="REN7_Gun_N7SMG"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Gun_N7BattleRifle" or defName="REN7_Gun_N7Shotgun" or defName="REN7_Gun_N7DMR"
+			or defName="REN7_Gun_N7AntimaterielRifle" or defName="REN7_Gun_N7BlackHoleGenerator" or defName="REN7_Gun_N7ChainShotgun" or defName="REN7_Gun_N7LMG"]/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>
+
+	<!-- === N7Blade === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="REN7_MeleeWeapon_N7Blade"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="REN7_MeleeWeapon_N7Blade"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.8</MeleeCritChance>
+				<MeleeParryChance>0.33</MeleeParryChance>
+				<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_MeleeWeapon_N7Blade"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+					<armorPenetrationSharp>5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.1</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<armorPenetrationSharp>12</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='RE_Gun_N7Pistol']/recipeMaker/skillRequirements</xpath>
+		<value>
+			<skillRequirements>
+				<Crafting>7</Crafting>
+			</skillRequirements>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='REN7_Gun_N7BattleRifle' or defName='REN7_Gun_N7DMR' or defName='REN7_Gun_N7Shotgun']/recipeMaker/skillRequirements</xpath>
+		<value>
+			<skillRequirements>
+				<Crafting>9</Crafting>
+			</skillRequirements>
+		</value>
+	</Operation>
+
+	<!-- ========== Blackstorm ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Gun_N7BlackHoleGenerator"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li>
+					<verbClass>Verb_ShootOneUse</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>REN7_Rocket_BlackHole</defaultProjectile>
+					<burstShotCount>1</burstShotCount>
+					<forcedMissRadius>1.9</forcedMissRadius>
+					<warmupTime>3</warmupTime>
+					<range>70</range>
+					<soundCast>REN7_Shot_N7BlackHoleGenerator</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<onlyManualCast>true</onlyManualCast>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+						<canTargetPawns>true</canTargetPawns>
+					</targetParams>
+					<muzzleFlashScale>30</muzzleFlashScale>
+					<ai_AvoidFriendlyFireRadius>7</ai_AvoidFriendlyFireRadius>
+					<minRange>7</minRange>
+					<requireLineOfSight>true</requireLineOfSight>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Gun_N7BlackHoleGenerator"]/statBases</xpath>
+		<value>
+			<statBases>
+				<WorkToMake>80000</WorkToMake>
+				<MarketValue>8000</MarketValue>
+				<Mass>12</Mass>
+				<RangedWeapon_Cooldown>0.65</RangedWeapon_Cooldown>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Gun_N7BlackHoleGenerator"]/costList</xpath>
+		<value>
+			<costList>
+				<Plasteel>50</Plasteel>
+				<Uranium>10</Uranium>
+				<ComponentSpacer>3</ComponentSpacer>
+				<RE_ElementZero>30</RE_ElementZero>
+			</costList>
+		</value>
+	</Operation>
+
+	<!-- Name -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='REN7_Gun_N7BlackHoleGenerator']/label</xpath>
+		<value>
+			<label>M-490 Blackstorm</label>
+		</value>
+	</Operation>
+
+	<!-- ========== Valkyrie ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>REN7_Gun_N7BattleRifle</defName>
+		<statBases>
+			<WorkToMake>39000</WorkToMake>
+			<SightsEfficiency>1.2</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.22</SwayFactor>
+			<Bulk>7.6</Bulk>
+			<Mass>4.7</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Valkyrie</defaultProjectile>
+			<burstShotCount>4</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>0.8</warmupTime>
+			<range>56</range>
+			<soundCast>REN7_Shot_N7BattleRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilAmount>1.31</recoilAmount>
+		</Properties>
+		<costList>
+			<Steel>25</Steel>
+			<Plasteel>35</Plasteel>
+			<ComponentSpacer>2</ComponentSpacer>
+			<Chemfuel>10</Chemfuel>
+			<RE_ElementZero>6</RE_ElementZero>
+		</costList>
+		<AmmoUser>
+			<magazineSize>16</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_Valkyrie</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- Name -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='REN7_Gun_N7BattleRifle']/label</xpath>
+		<value>
+			<label>N7 Valkyrie</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Gun_N7BattleRifle"]/description</xpath>
+		<value>
+			<description>Based on the popular M8 Avenger, the Valkyrie is an accurate and deadly rifle that fires powerful slugs in 2 round bursts, it quickly became a hot black-market item when it surfaces.</description>
+		</value>
+	</Operation>
+
+	<!-- ========== N7 Typhoon ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>REN7_Gun_N7LMG</defName>
+		<statBases>
+			<WorkToMake>65000</WorkToMake>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.57</SwayFactor>
+			<Bulk>14</Bulk>
+			<Mass>9</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Typhoon</defaultProjectile>
+			<warmupTime>1.35</warmupTime>
+			<range>62</range>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>REN7_Shot_N7LMG</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<recoilAmount>1.39</recoilAmount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<costList>
+			<Steel>50</Steel>
+			<Plasteel>50</Plasteel>
+			<ComponentSpacer>4</ComponentSpacer>
+			<Chemfuel>20</Chemfuel>
+			<RE_ElementZero>15</RE_ElementZero>
+		</costList>
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>6</reloadTime>
+			<ammoSet>AmmoSet_Typhoon</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- Name -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='REN7_Gun_N7LMG']/label</xpath>
+		<value>
+			<label>N7 Typhoon</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Gun_N7LMG"]/description</xpath>
+		<value>
+			<description>The Typhoon is a distinctive light machine gun featuring a face shield to protect the shooter from stray shots. It is heavy, clumsy and highly ammo intentsive to fire, but it more than made up for it through the sheer firepower it could put down range.(Has a 10% chance to deflect any incoming projectile)</description>
+		</value>
+	</Operation>
+
+	<!-- ========== Eagle ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RE_Gun_N7Pistol</defName>
+		<statBases>
+			<WorkToMake>20000</WorkToMake>
+			<SightsEfficiency>0.85</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.09</SwayFactor>
+			<Bulk>2.2</Bulk>
+			<Mass>1.1</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Eagle</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>18</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>REN7_Shot_N7Pistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+			<recoilAmount>1.49</recoilAmount>
+		</Properties>
+		<costList>
+			<Steel>15</Steel>
+			<Plasteel>15</Plasteel>
+			<ComponentSpacer>1</ComponentSpacer>
+			<Chemfuel>4</Chemfuel>
+			<RE_ElementZero>3</RE_ElementZero>
+		</costList>
+		<AmmoUser>
+			<magazineSize>18</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_Eagle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Name -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='RE_Gun_N7Pistol']/label</xpath>
+		<value>
+			<label>N7 Eagle</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RE_Gun_N7Pistol"]/description</xpath>
+		<value>
+			<description>The latest result of the Alliance's offensive handgun project, the Eagle is a compact, fully automatic pistol that delivers unprecedented accuracy and punch with a rapid firing rate.</description>
+		</value>
+	</Operation>
+	<!-- ========== Hurricane ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>REN7_Gun_N7SMG</defName>
+		<statBases>
+			<WorkToMake>45000</WorkToMake>
+			<SightsEfficiency>0.95</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>4</Bulk>
+			<Mass>2.25</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Hurricane</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>REN7_Shot_N7SMG</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+			<recoilAmount>2.3</recoilAmount>
+		</Properties>
+		<costList>
+			<Steel>20</Steel>
+			<Plasteel>20</Plasteel>
+			<ComponentSpacer>2</ComponentSpacer>
+			<Chemfuel>8</Chemfuel>
+			<RE_ElementZero>10</RE_ElementZero>
+		</costList>
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_Hurricane</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- Name -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='REN7_Gun_N7SMG']/label</xpath>
+		<value>
+			<label>N7 Hurricane</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Gun_N7SMG"]/description</xpath>
+		<value>
+			<description>A submachine gun with an unpleasantly high rate of fire for both its user and its target. While some militaries pass on the Hurricane because of its lower accuracy and high recoil, its frightening ability to chew thorugh targets at close range makes it a favourite amongst close quarter specialists.</description>
+		</value>
+	</Operation>
+
+	<!-- ========== Valiant ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>REN7_Gun_N7DMR</defName>
+		<statBases>
+			<WorkToMake>48000</WorkToMake>
+			<SightsEfficiency>2.8</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.37</SwayFactor>
+			<Bulk>9.0</Bulk>
+			<Mass>3.70</Mass>
+			<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Valiant</defaultProjectile>
+			<warmupTime>1.45</warmupTime>
+			<range>77</range>
+			<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
+			<soundCast>REN7_Shot_N7DMR</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<costList>
+			<Steel>35</Steel>
+			<Plasteel>40</Plasteel>
+			<ComponentSpacer>2</ComponentSpacer>
+			<Chemfuel>10</Chemfuel>
+			<RE_ElementZero>12</RE_ElementZero>
+		</costList>
+		<AmmoUser>
+			<magazineSize>9</magazineSize>
+			<reloadTime>2.5</reloadTime>
+			<ammoSet>AmmoSet_Valiant</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<!-- Required research rework -->
+		<!--    <researchPrerequisite>PrecisionRifling</researchPrerequisite> -->
+	</Operation>
+
+	<!-- Name -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='REN7_Gun_N7DMR']/label</xpath>
+		<value>
+			<label>N7 Valiant</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Gun_N7DMR"]/description</xpath>
+		<value>
+			<description>The Valiant is a streamlined sniper rifle noted for its sophisticated fire-control system which makes it easy to use and quick to reload, it is a good balance of single shot stopping power, accuracy and rate of fire. Proven to be reliable even in harsh environments, it is popular among alliance N7 recon and scout troopers.</description>
+		</value>
+	</Operation>
+
+	<!-- ========== Black Widow ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>REN7_Gun_N7AntimaterielRifle</defName>
+		<statBases>
+			<WorkToMake>70000</WorkToMake>
+			<SightsEfficiency>3.75</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.88</SwayFactor>
+			<Bulk>15</Bulk>
+			<Mass>10</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_BlackWidow</defaultProjectile>
+			<warmupTime>2.0</warmupTime>
+			<range>86</range>
+			<ammoConsumedPerShotCount>10</ammoConsumedPerShotCount>
+			<soundCast>REN7_Shot_N7AntiMaterielRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+		</Properties>
+		<costList>
+			<Steel>50</Steel>
+			<Plasteel>70</Plasteel>
+			<ComponentSpacer>4</ComponentSpacer>
+			<Chemfuel>20</Chemfuel>
+			<RE_ElementZero>16</RE_ElementZero>
+		</costList>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>3.9</reloadTime>
+			<ammoSet>AmmoSet_BlackWidow</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SniperRifle</li>
+		</weaponTags>
+		<!-- Required research rework -->
+		<!--    <researchPrerequisite>PrecisionRifling</researchPrerequisite> -->
+	</Operation>
+
+	<!-- Name -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='REN7_Gun_N7AntimaterielRifle']/label</xpath>
+		<value>
+			<label>Black Widow</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Gun_N7AntimaterielRifle"]/description</xpath>
+		<value>
+			<description>A development aimed at improving on the original M98 Widow, the Black Widow is a heavy anti-material rifle aimed at recifying the slow fire rate of the original widow by allowing for multiple shot before needing to load another thermal clip. While it does have a noticeably lower per-shot stopping power, the Black Widow's ability to make quick follow up shots makes it superior in most combat situations.</description>
+		</value>
+	</Operation>
+
+	<!-- ========== Crusader ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>REN7_Gun_N7Shotgun</defName>
+		<statBases>
+			<WorkToMake>34000</WorkToMake>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.52</SwayFactor>
+			<Bulk>8</Bulk>
+			<Mass>5.8</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Crusader</defaultProjectile>
+			<warmupTime>0.75</warmupTime>
+			<range>48</range>
+			<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
+			<soundCast>REN7_Shot_N7Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<costList>
+			<Steel>30</Steel>
+			<Plasteel>30</Plasteel>
+			<ComponentSpacer>2</ComponentSpacer>
+			<Chemfuel>10</Chemfuel>
+			<RE_ElementZero>8</RE_ElementZero>
+		</costList>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_Crusader</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<!-- Required research rework -->
+		<!--    <researchPrerequisite>PrecisionRifling</researchPrerequisite> -->
+	</Operation>
+
+	<!-- Name -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='REN7_Gun_N7Shotgun']/label</xpath>
+		<value>
+			<label>N7 Crusader</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Gun_N7Shotgun"]/description</xpath>
+		<value>
+			<description>While frequently referred to as a "shotgun", the Crusader has nothing in common with other shotgun other than its patterned design. Instead of firing multiple small projectiles with every pull of the trigger, it fires a single heavy slug with high precision, careful aiming should be employed when using this deadly weapon.</description>
+		</value>
+	</Operation>
+
+	<!-- ==========Piranha ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>REN7_Gun_N7ChainShotgun</defName>
+		<statBases>
+			<WorkToMake>45000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<Bulk>8</Bulk>
+			<Mass>4</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Piranha</defaultProjectile>
+			<warmupTime>0.7</warmupTime>
+			<range>18</range>
+			<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<soundCast>REN7_Shot_N7ChainShotgun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+			<recoilAmount>1.47</recoilAmount>
+		</Properties>
+		<costList>
+			<Steel>20</Steel>
+			<Plasteel>35</Plasteel>
+			<ComponentSpacer>3</ComponentSpacer>
+			<Chemfuel>10</Chemfuel>
+			<RE_ElementZero>10</RE_ElementZero>
+		</costList>
+		<AmmoUser>
+			<magazineSize>24</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_Piranha</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<!-- Required research rework -->
+		<!--    <researchPrerequisite>PrecisionRifling</researchPrerequisite> -->
+	</Operation>
+
+	<!-- Name -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName='REN7_Gun_N7ChainShotgun']/label</xpath>
+		<value>
+			<label>N7 Piranha</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="REN7_Gun_N7ChainShotgun"]/description</xpath>
+		<value>
+			<description>The N7 Piranha is a light assault shotgun that features an impressive fire rate, the relatively large spread of its submunitions is a deliberate feature to combat hordes of charging melee enemies. It is popular among lighter frame alien species and widely distributed by the Alliance amongst its alien clients in order to fight a common foe.</description>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Elves/Defs/Rim-Elves/Ammo_Elves.xml b/ModPatches/Rim-Elves/Defs/Rim-Elves/Ammo_Elves.xml
new file mode 100644
index 0000000000..98d1b4e6ff
--- /dev/null
+++ b/ModPatches/Rim-Elves/Defs/Rim-Elves/Ammo_Elves.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- Custom Ammoset -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_ChargedGreatArrow</defName>
+		<label>plasteel great arrows</label>
+		<ammoTypes>
+			<Ammo_GreatArrow_Plasteel>Projectile_ChargedGreatArrow_Plasteel</Ammo_GreatArrow_Plasteel>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- Custom Projectile -->
+	<ThingDef ParentName="BaseGreatArrowProjectile">
+		<defName>Projectile_ChargedGreatArrow_Plasteel</defName>
+		<label>charged great arrow</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Plasteel</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>19</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>6</amount>
+				</li>
+			</secondaryDamage>
+			<speed>151</speed>
+			<armorPenetrationSharp>16</armorPenetrationSharp>
+			<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
+			<preExplosionSpawnChance>0.25</preExplosionSpawnChance><!-- 40 arrows per resource -->
+			<preExplosionSpawnThingDef>Ammo_GreatArrow_Plasteel</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Rim-Elves/Patches/Rim-Elves/GeneDefs_Elves.xml b/ModPatches/Rim-Elves/Patches/Rim-Elves/GeneDefs_Elves.xml
new file mode 100644
index 0000000000..6116336a76
--- /dev/null
+++ b/ModPatches/Rim-Elves/Patches/Rim-Elves/GeneDefs_Elves.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/GeneDef[defName="Size_Gigantism"]/statOffsets/CarryingCapacity</xpath>
+		<value>
+			<CarryWeight>15</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Elves/Patches/Rim-Elves/PawnKinds_Elves.xml b/ModPatches/Rim-Elves/Patches/Rim-Elves/PawnKinds_Elves.xml
new file mode 100644
index 0000000000..c7e6a45c28
--- /dev/null
+++ b/ModPatches/Rim-Elves/Patches/Rim-Elves/PawnKinds_Elves.xml
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Medieval Pawnkinds -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RE_Elven_Archer"] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>14</min>
+					<max>24</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>80</min>
+							<max>160</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>NeolithicMeleeBasic</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RE_Elven_Levy"] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>80</min>
+					<max>110</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.25</shieldChance>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RE_Elven_Swordsman"] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>100</min>
+					<max>140</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.25</shieldChance>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RE_Elven_Ranger"] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>20</min>
+					<max>40</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>120</min>
+							<max>180</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>MedievalMeleeBasic</li>
+							<li>NeolithicMeleeDecent</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RE_Elven_Knight"] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>120</min>
+					<max>180</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.4</shieldChance>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Elven_Supreme_NobleRanged"] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>20</min>
+					<max>40</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>150</min>
+							<max>240</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>ElvenMedievalMelee</li>
+							<li>MedievalMeleeAdvanced</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Spacer Pawnkinds -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="ElvenSoldierBase" or @Name="ElvenKnightBase"] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>10</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Elven_Soldier_Grenadier"] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>12</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.8</generateChance>
+						<sidearmMoney>
+							<min>10</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm</li>
+						</weaponTags>
+						<magazineCount>
+							<min>3</min>
+							<max>6</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Elven_Soldier_Lancer"] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>20</min>
+					<max>40</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Elves/Patches/Rim-Elves/Weapons_Elves.xml b/ModPatches/Rim-Elves/Patches/Rim-Elves/Weapons_Elves.xml
new file mode 100644
index 0000000000..827b2272d1
--- /dev/null
+++ b/ModPatches/Rim-Elves/Patches/Rim-Elves/Weapons_Elves.xml
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Elven Longbow ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Bow_ElvenLong</defName>
+		<statBases>
+			<SightsEfficiency>0.85</SightsEfficiency>
+			<ShotSpread>0.8</ShotSpread>
+			<SwayFactor>1.8</SwayFactor>
+			<Bulk>4.00</Bulk>
+			<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_GreatArrow_Stone</defaultProjectile>
+			<warmupTime>1.9</warmupTime>
+			<range>33</range>
+			<soundCast>Bow_Large</soundCast>
+		</Properties>
+		<AmmoUser>
+			<ammoSet>AmmoSet_GreatArrow</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bow_ElvenLong"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Elven Scimitar ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_ElvenScimitar"]/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>20</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.28</armorPenetrationSharp>
+					<chanceFactor>0.33</chanceFactor>
+					<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="MeleeWeapon_ElvenScimitar"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.38</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_ElvenScimitar"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.24</MeleeCritChance>
+				<MeleeParryChance>0.38</MeleeParryChance>
+				<MeleeDodgeChance>0.28</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_ElvenScimitar"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Elven Chargebow ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Bow_ElvenCharge</defName>
+		<statBases>
+			<SightsEfficiency>1.2</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.8</SwayFactor>
+			<Bulk>3.5</Bulk>
+			<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_ChargedGreatArrow_Plasteel</defaultProjectile>
+			<warmupTime>0.85</warmupTime>
+			<range>55</range>
+			<soundCast>ChargeBowElven_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+		</Properties>
+		<AmmoUser>
+			<ammoSet>AmmoSet_ChargedGreatArrow</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bow_ElvenCharge"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Elven Banebrand ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_BaneBrand"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<chanceFactor>0.1</chanceFactor>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>33</power>
+					<cooldownTime>0.78</cooldownTime>
+					<armorPenetrationBlunt>2.84</armorPenetrationBlunt>
+					<armorPenetrationSharp>16</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>0.94</cooldownTime>
+					<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
+					<armorPenetrationSharp>16</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_BaneBrand"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>3</Bulk>
+				<MeleeCounterParryBonus>0.40</MeleeCounterParryBonus>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_BaneBrand"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.90</MeleeCritChance>
+				<MeleeParryChance>0.40</MeleeParryChance>
+				<MeleeDodgeChance>0.32</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_BaneBrand"]</xpath>
+		<value>
+			<weaponTags>
+				<li>CE_OneHandedWeapon</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Hivers!/Defs/Rim-Hivers!/Pawnkinds_Hivers.xml b/ModPatches/Rim-Hivers!/Defs/Rim-Hivers!/Pawnkinds_Hivers.xml
new file mode 100644
index 0000000000..7f972cd476
--- /dev/null
+++ b/ModPatches/Rim-Hivers!/Defs/Rim-Hivers!/Pawnkinds_Hivers.xml
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ========== Tribals ========== -->
+
+	<PawnKindDef ParentName="CivilHiverBase">
+		<defName>HiveGrenadier</defName>
+		<race>Hiver_Soldier</race>
+		<label>Hive boomer</label>
+		<initialWillRange>1~3</initialWillRange>
+		<initialResistanceRange>12~19</initialResistanceRange>
+		<combatPower>60</combatPower>
+		<maxGenerationAge>60</maxGenerationAge>
+		<canBeSapper>true</canBeSapper>
+		<gearHealthRange>
+			<min>0.5</min>
+			<max>1.8</max>
+		</gearHealthRange>
+		<apparelMoney>
+			<min>180</min>
+			<max>350</max>
+		</apparelMoney>
+		<apparelRequired>
+			<li>Apparel_WarVeil</li>
+			<li>CE_Apparel_TribalBackpack</li>
+		</apparelRequired>
+		<apparelTags>
+			<li>Tribal</li>
+		</apparelTags>
+		<weaponMoney>
+			<min>60</min>
+			<max>400</max>
+		</weaponMoney>
+		<weaponTags>
+			<li>CE_GrenadeNeolithic</li>
+		</weaponTags>
+		<modExtensions>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>15</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>80</min>
+						<max>160</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Tribal</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</modExtensions>
+	</PawnKindDef>
+
+	<PawnKindDef ParentName="CivilHiverBase">
+		<defName>HiveGunner</defName>
+		<race>Hiver_Soldier</race>
+		<label>Hive thunderer</label>
+		<initialWillRange>3~5</initialWillRange>
+		<initialResistanceRange>20~34</initialResistanceRange>
+		<combatPower>60</combatPower>
+		<maxGenerationAge>60</maxGenerationAge>
+		<gearHealthRange>
+			<min>0.5</min>
+			<max>1.8</max>
+		</gearHealthRange>
+		<apparelMoney>
+			<min>180</min>
+			<max>350</max>
+		</apparelMoney>
+		<apparelTags>
+			<li>Tribal</li>
+		</apparelTags>
+		<apparelRequired>
+			<li>Apparel_WarMask</li>
+		</apparelRequired>
+		<weaponMoney>
+			<min>180</min>
+			<max>290</max>
+		</weaponMoney>
+		<weaponTags>
+			<li>Gun</li>
+		</weaponTags>
+		<modExtensions>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>120</min>
+					<max>160</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.9</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</modExtensions>
+	</PawnKindDef>
+
+	<PawnKindDef ParentName="SavageHiverBase">
+		<defName>HiveGrenadierS</defName>
+		<label>Hive boomer</label>
+		<race>Hiver_Soldier_South</race>
+		<combatPower>60</combatPower>
+		<maxGenerationAge>60</maxGenerationAge>
+		<canBeSapper>true</canBeSapper>
+		<initialWillRange>1~3</initialWillRange>
+		<initialResistanceRange>12~19</initialResistanceRange>
+		<gearHealthRange>
+			<min>0.5</min>
+			<max>1.8</max>
+		</gearHealthRange>
+		<apparelMoney>
+			<min>180</min>
+			<max>350</max>
+		</apparelMoney>
+		<apparelRequired>
+			<li>Apparel_WarVeil</li>
+		</apparelRequired>
+		<apparelTags>
+			<li>Tribal</li>
+		</apparelTags>
+		<weaponMoney>
+			<min>60</min>
+			<max>400</max>
+		</weaponMoney>
+		<weaponTags>
+			<li>CE_GrenadeNeolithic</li>
+		</weaponTags>
+		<modExtensions>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>8</min>
+					<max>20</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>80</min>
+						<max>160</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Tribal</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</modExtensions>
+	</PawnKindDef>
+
+	<PawnKindDef ParentName="SavageHiverBase">
+		<defName>HiveGunnerS</defName>
+		<label>Hive thunderer</label>
+		<race>Hiver_Soldier_South</race>
+		<combatPower>60</combatPower>
+		<maxGenerationAge>60</maxGenerationAge>
+		<initialWillRange>1~3</initialWillRange>
+		<initialResistanceRange>12~19</initialResistanceRange>
+		<gearHealthRange>
+			<min>0.5</min>
+			<max>1.8</max>
+		</gearHealthRange>
+		<apparelMoney>
+			<min>180</min>
+			<max>350</max>
+		</apparelMoney>
+		<apparelTags>
+			<li>Tribal</li>
+		</apparelTags>
+		<apparelRequired>
+			<li>Apparel_WarMask</li>
+		</apparelRequired>
+		<weaponMoney>
+			<min>180</min>
+			<max>290</max>
+		</weaponMoney>
+		<weaponTags>
+			<li>Gun</li>
+		</weaponTags>
+		<modExtensions>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>120</min>
+					<max>160</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.9</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</modExtensions>
+	</PawnKindDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Rim-Hivers!/Patches/Rim-Hivers!/New_Hivers.xml b/ModPatches/Rim-Hivers!/Patches/Rim-Hivers!/New_Hivers.xml
new file mode 100644
index 0000000000..9e42d07f8c
--- /dev/null
+++ b/ModPatches/Rim-Hivers!/Patches/Rim-Hivers!/New_Hivers.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Add tribal grenadies ========== -->
+
+	<!-- ========== Civil ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/FactionDef[defName="HiverCivil"]/pawnGroupMakers/li[1]/options</xpath>
+		<value>
+			<HiveGrenadier>3</HiveGrenadier>
+			<HiveGunner>7</HiveGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/FactionDef[defName="HiverCivil"]/pawnGroupMakers/li[3]/options</xpath>
+		<value>
+			<HiveGrenadier>4</HiveGrenadier>
+			<HiveGunner>6</HiveGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/FactionDef[defName="HiverCivil"]/pawnGroupMakers/li[4]/options</xpath>
+		<value>
+			<HiveGrenadier>4</HiveGrenadier>
+			<HiveGunner>6</HiveGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/FactionDef[defName="HiverCivil"]/pawnGroupMakers/li[5]/options</xpath>
+		<value>
+			<HiveGrenadier>5</HiveGrenadier>
+			<HiveGunner>5</HiveGunner>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/FactionDef[defName="HiverCivil"]/pawnGroupMakers/li[8]/options</xpath>
+		<value>
+			<HiveGrenadier>8</HiveGrenadier>
+			<HiveGunner>12</HiveGunner>
+		</value>
+	</Operation>
+
+	<!-- ========== Savage ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/FactionDef[defName="HiverSavage"]/pawnGroupMakers/li[1]/options</xpath>
+		<value>
+			<HiveGrenadierS>5</HiveGrenadierS>
+			<HiveGunnerS>8</HiveGunnerS>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/FactionDef[defName="HiverSavage"]/pawnGroupMakers/li[3]/options</xpath>
+		<value>
+			<HiveGrenadierS>5</HiveGrenadierS>
+			<HiveGunnerS>8</HiveGunnerS>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/FactionDef[defName="HiverSavage"]/pawnGroupMakers/li[4]/options</xpath>
+		<value>
+			<HiveGrenadierS>5</HiveGrenadierS>
+			<HiveGunnerS>8</HiveGunnerS>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/FactionDef[defName="HiverSavage"]/pawnGroupMakers/li[5]/options</xpath>
+		<value>
+			<HiveGrenadierS>5</HiveGrenadierS>
+			<HiveGunnerS>8</HiveGunnerS>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/FactionDef[defName="HiverSavage"]/pawnGroupMakers/li[6]/options</xpath>
+		<value>
+			<HiveGrenadierS>8</HiveGrenadierS>
+			<HiveGunnerS>12</HiveGunnerS>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Hivers!/Patches/Rim-Hivers!/Patch_Bodies_Hivers.xml b/ModPatches/Rim-Hivers!/Patches/Rim-Hivers!/Patch_Bodies_Hivers.xml
new file mode 100644
index 0000000000..cae3077761
--- /dev/null
+++ b/ModPatches/Rim-Hivers!/Patches/Rim-Hivers!/Patch_Bodies_Hivers.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Changing coverage of the bodyDef (should've done this sooner, but eh) -->
+	<!-- why yes dear explorer of this file, i did just literally copy and paste the HiverBody bodytype patches -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="HiverBody"]/corePart/parts/li[def="Ribcage"]/coverage</xpath>
+		<value>
+			<coverage>0.07</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="HiverBody"]/corePart/parts/li[def="Pelvis"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="HiverBody"]/corePart/parts/li[def="Stomach"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="HiverBody"]/corePart/parts/li[def="Heart"]/coverage</xpath>
+		<value>
+			<coverage>0.04</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="HiverBody"]/corePart/parts/li[def="Lung"]/coverage</xpath>
+		<value>
+			<coverage>0.055</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="HiverBody"]/corePart/parts/li[def="Kidney"]/coverage</xpath>
+		<value>
+			<coverage>0.03</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="HiverBody"]/corePart/parts/li[def="Liver"]/coverage</xpath>
+		<value>
+			<coverage>0.06</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="HiverBody"]/corePart/parts/li[def="Neck"]/coverage</xpath>
+		<value>
+			<coverage>0.055</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="HiverBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Skull"]/parts/li[def="Brain"]/coverage</xpath>
+		<value>
+			<coverage>0.9</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="HiverBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Eye"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="HiverBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Antenna"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="HiverBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="InsectNostril"]/coverage</xpath>
+		<value>
+			<coverage>0.08</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="HiverBody"]/corePart/parts/li[def="Shoulder"]/coverage</xpath>
+		<value>
+			<coverage>0.085</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="HiverBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Clavicle"]/coverage</xpath>
+		<value>
+			<coverage>0.06</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="HiverBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Humerus"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="HiverBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Radius"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="HiverBody"]//*[
+			def="Torso" or
+			def="Neck" or
+			def="Head" or
+			def="Jaw" or
+			def="Antenna" or
+			def="InsectNostril" or
+			def="Shoulder" or
+			def="Arm" or
+			def="Hand" or
+			def="Finger" or
+			def="Leg"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="HiverBody"]//*[
+			def="Jaw" or
+			def="InsectNostril" or
+			def="Eye"]/groups
+		</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Hivers!/Patches/Rim-Hivers!/Patch_PawnKinds_Hivers.xml b/ModPatches/Rim-Hivers!/Patches/Rim-Hivers!/Patch_PawnKinds_Hivers.xml
new file mode 100644
index 0000000000..356d03328b
--- /dev/null
+++ b/ModPatches/Rim-Hivers!/Patches/Rim-Hivers!/Patch_PawnKinds_Hivers.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Techless -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Hiver_Worker" or defName="Hiver_Worker_South"]/combatPower</xpath>
+		<value>
+			<combatPower>20</combatPower>
+		</value>
+	</Operation>
+
+	<!-- Tribal -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Hiver_Soldier" or defName="Hiver_Soldier_South"]/combatPower</xpath>
+		<value>
+			<combatPower>26</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Hiver_Prince" or defName="Hiver_Prince_South"]/combatPower</xpath>
+		<value>
+			<combatPower>32</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Hiver_Soldier_Heavy" or defName="Hiver_Soldier_Heavy_South"]/combatPower</xpath>
+		<value>
+			<combatPower>60</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Hiver_Caravan_Guard"]/combatPower</xpath>
+		<value>
+			<combatPower>35</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Hiver_Caravan_Prince"]/combatPower</xpath>
+		<value>
+			<combatPower>40</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Hiver_Civil_Queen" or defName="Hiver_Faction_Queen_South"]/combatPower</xpath>
+		<value>
+			<combatPower>70</combatPower>
+		</value>
+	</Operation>
+
+	<!-- Hive_Archer -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Hiver_Soldier_Archer" or defName="Hiver_Civil_Queen" or defName="Hiver_Faction_Queen_South"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>14</min>
+					<max>40</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>100</min>
+					<max>140</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.6</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>40</min>
+							<max>80</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Hiver_Warrior -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Hiver_Soldier" or defName="Hiver_Prince" or defName="Hiver_Caravan_Guard" or defName="Hiver_Caravan_Prince" or defName="Hiver_Soldier_South" or defName="Hiver_Prince_South"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>100</min>
+					<max>200</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.75</shieldChance>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Hivers!/Patches/Rim-Hivers!/Patch_Race_Hivers.xml b/ModPatches/Rim-Hivers!/Patches/Rim-Hivers!/Patch_Race_Hivers.xml
new file mode 100644
index 0000000000..930fdb779e
--- /dev/null
+++ b/ModPatches/Rim-Hivers!/Patches/Rim-Hivers!/Patch_Race_Hivers.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Hiver_Prince" or defName="Hiver_Soldier" or defName="Hiver_Worker" or defName="Hiver_Prince_South" or defName="Hiver_Queen" or defName="Hiver_Worker_South" or defName="Hiver_Soldier_South" or defName="Hiver_Queen_South"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Hiver_Prince" or defName="Hiver_Prince_South" or defName="Hiver_Queen" or defName="Hiver_Queen_South"]/statBases</xpath>
+		<value>
+			<MeleeCritChance>1.1</MeleeCritChance>
+			<MeleeParryChance>1.1</MeleeParryChance>
+			<MeleeDodgeChance>1.1</MeleeDodgeChance>
+			<Suppressability>0.8</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Hiver_Worker" or defName="Hiver_Worker_South"]/statBases</xpath>
+		<value>
+			<MeleeCritChance>0.88</MeleeCritChance>
+			<MeleeParryChance>0.88</MeleeParryChance>
+			<MeleeDodgeChance>0.88</MeleeDodgeChance>
+			<AimingAccuracy>0.88</AimingAccuracy>
+			<Suppressability>0.66</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Hiver_Soldier" or defName="Hiver_Soldier_South"]/statBases</xpath>
+		<value>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<Suppressability>0.66</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Hiver_Prince" or defName="Hiver_Soldier" or defName="Hiver_Worker" or defName="Hiver_Prince_South" or defName="Hiver_Queen" or defName="Hiver_Worker_South" or defName="Hiver_Soldier_South" or defName="Hiver_Queen_South"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.22</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.22</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>3.4</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Hiver_Prince" or defName="Hiver_Soldier" or defName="Hiver_Worker" or defName="Hiver_Prince_South" or defName="Hiver_Worker_South" or defName="Hiver_Soldier_South"]</xpath>
+		<value>
+			<comps/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Hiver_Prince" or defName="Hiver_Soldier" or defName="Hiver_Worker" or defName="Hiver_Prince_South" or defName="Hiver_Queen" or defName="Hiver_Worker_South" or defName="Hiver_Soldier_South" or defName="Hiver_Queen_South"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Robots!/Patches/Rim-Robots!/Implants_Patch.xml b/ModPatches/Rim-Robots!/Patches/Rim-Robots!/Implants_Patch.xml
new file mode 100644
index 0000000000..718df6b272
--- /dev/null
+++ b/ModPatches/Rim-Robots!/Patches/Rim-Robots!/Implants_Patch.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==============================              Implants       ====================== -->
+	<!-- Self-Alloyed Plating -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="RR_SelfAlloyingPlating"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="RR_SelfAlloyingPlating"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="RR_SelfAlloyingPlating"]/stages/li/statOffsets</xpath>
+		<value>
+			<MoveSpeed>-0.25</MoveSpeed>
+			<MeleeDodgeChance>-0.07</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/HediffDef[defName="RR_SelfAlloyingPlating"]/stages/li/capMods</xpath>
+	</Operation>
+	<!-- Self-Alloyed Helm -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="RR_SelfAlloyingHelm"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="RR_SelfAlloyingHelm"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="RR_SelfAlloyingHelm"]/stages/li/statOffsets/PawnBeauty</xpath>
+		<value>
+			<PawnBeauty>-1</PawnBeauty>
+		</value>
+	</Operation>
+	<!-- Plasteel Scythe -->
+	<!-- the original had -49% manipulation to "simulate" loss of Work speed but turns out you need manipulation to actually hit someone in Melee, so these changes make the scythe not a meme"-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="RR_AddedScythes"]/stages/li/capMods</xpath>
+		<value>
+			<capMods>
+				<li>
+					<capacity>Manipulation</capacity>
+					<offset>0.15</offset>
+				</li>
+			</capMods>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="RR_AddedScythes"]/stages/li/statOffsets</xpath>
+		<value>
+			<!-- had to lower each work stat individually because WorkSpeedGlobal has a minimum value of 30% for some reason -->
+			<statOffsets>
+				<WorkSpeedGlobal>-0.35</WorkSpeedGlobal>
+				<MiningSpeed>-0.49</MiningSpeed>
+				<DeepDrillingSpeed>-0.49</DeepDrillingSpeed>
+				<MiningYield>-0.49</MiningYield>
+				<SmoothingSpeed>-0.49</SmoothingSpeed>
+				<ResearchSpeed>-0.25</ResearchSpeed>
+				<AnimalGatherSpeed>-0.49</AnimalGatherSpeed>
+				<AnimalGatherYield>-0.49</AnimalGatherYield>
+				<PlantWorkSpeed>-0.25</PlantWorkSpeed>
+				<PlantHarvestYield>-0.25</PlantHarvestYield>
+				<ConstructionSpeed>-0.25</ConstructionSpeed>
+				<ConstructSuccessChance>-0.25</ConstructSuccessChance>
+				<FixBrokenDownBuildingSuccessChance>-0.25</FixBrokenDownBuildingSuccessChance>
+				<MedicalTendSpeed>-0.49</MedicalTendSpeed>
+				<MedicalTendQuality>-0.49</MedicalTendQuality>
+				<MedicalOperationSpeed>0.15</MedicalOperationSpeed>
+				<MedicalSurgerySuccessChance>-0.15</MedicalSurgerySuccessChance>
+				<SmeltingSpeed>-0.49</SmeltingSpeed>
+				<GeneralLaborSpeed>-0.4</GeneralLaborSpeed>
+				<DrugSynthesisSpeed>-0.49</DrugSynthesisSpeed>
+				<CookSpeed>-0.1</CookSpeed>
+				<DrugCookingSpeed>-0.49</DrugCookingSpeed>
+			</statOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="RR_AddedScythes"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>scythe</label>
+					<capacities>
+						<li>Cut</li>
+						<li>Stab</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationSharp>5</armorPenetrationSharp>
+					<armorPenetrationBlunt>9</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Robots!/Patches/Rim-Robots!/Mechanent_Body.xml b/ModPatches/Rim-Robots!/Patches/Rim-Robots!/Mechanent_Body.xml
new file mode 100644
index 0000000000..f29ea845d4
--- /dev/null
+++ b/ModPatches/Rim-Robots!/Patches/Rim-Robots!/Mechanent_Body.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName ="CasteBody"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<!-- Head -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="CasteBody"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="CasteBody"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="CasteBody"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="HearingSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="CasteBody"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalJaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="CasteBody"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="SmellSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<!-- Shoulders-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="CasteBody"]/corePart/parts/li[def="MechShoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="CasteBody"]/corePart/parts/li[def="MechShoulder"]/parts/li[def="MechArm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="CasteBody"]/corePart/parts/li[def="MechShoulder"]/parts/li[def="MechArm"]/parts/li[def="MechanicalHand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="CasteBody"]/corePart/parts/li[def="MechShoulder"]/parts/li[def="MechArm"]/parts/li[def="MechanicalHand"]/parts/li[def="MechanicalFinger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<!-- Waist and Legs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="CasteBody"]/corePart/parts/li[def="MechWaist"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="CasteBody"]/corePart/parts/li[def="MechLeg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="CasteBody"]/corePart/parts/li[def="MechLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Robots!/Patches/Rim-Robots!/Pawnkind_Patch.xml b/ModPatches/Rim-Robots!/Patches/Rim-Robots!/Pawnkind_Patch.xml
new file mode 100644
index 0000000000..38cee763ee
--- /dev/null
+++ b/ModPatches/Rim-Robots!/Patches/Rim-Robots!/Pawnkind_Patch.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ================= Pawnkinds ================== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[ @Name="MechanentBase" or @Name="PersonaBase" or@Name="MechanentPirateTierBase"]</xpath>
+		<value>
+			<apparelRequired>
+				<li>CE_Apparel_Backpack</li>
+			</apparelRequired>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[ @Name="MechanentBase"]</xpath>
+		<value>
+			<invFoodDef>Chemfuel</invFoodDef>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[ defName="Mechanent_Villager" or defName="Persona_Villager" or defName="Mechanent_Guard" or defName="Mechanent_Trader" or @Name="MechanentGunnerBase" or @Name="MechanentSniperBase" or defName="Mechanent_Heavy" or defName="Mechanent_Spacer_Trooper" or defName="Mechanent_Scavenger" or defName="Mechanent_Pirate" or defName="Persona_Spacer_Trooper" or defName="Persona_Pirate" ]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>3</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>100</min>
+						<max>150</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>MedievalMeleeBasic</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[ @Name="MechanentEliteBase" or defName="Mechanent_Spacer_Marine" or defName="Persona_Spacer_Marine" or defName="Personae_Nexus"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>200</min>
+						<max>350</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>MedievalMeleeAdvanced</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Mechanent_Grenadier_EMP"]/label</xpath>
+		<value>
+			<label>advanced grenadier</label>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="Mechanent_Grenadier_EMP"]/weaponTags</xpath>
+		<value>
+			<li>CE_GrenadeFlashbang</li>
+			<li>GrenadeSmoke</li>
+			<li>GrenadeDestructive</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Mechanent_Grenadier_EMP"]/combatPower</xpath>
+		<value>
+			<combatPower>85</combatPower>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Robots!/Patches/Rim-Robots!/Personae_Body.xml b/ModPatches/Rim-Robots!/Patches/Rim-Robots!/Personae_Body.xml
new file mode 100644
index 0000000000..40cbd33ab9
--- /dev/null
+++ b/ModPatches/Rim-Robots!/Patches/Rim-Robots!/Personae_Body.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName ="PersonaeBody"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<!-- Head -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="PersonaeBody"]/corePart/parts/li[def="SyntheticNeck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="PersonaeBody"]/corePart/parts/li[def="SyntheticNeck"]/parts/li[def="SyntheticHead"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="PersonaeBody"]/corePart/parts/li[def="SyntheticNeck"]/parts/li[def="SyntheticHead"]/parts/li[def="SyntheticEar"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="PersonaeBody"]/corePart/parts/li[def="SyntheticNeck"]/parts/li[def="SyntheticHead"]/parts/li[def="SyntheticNose"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="PersonaeBody"]/corePart/parts/li[def="SyntheticNeck"]/parts/li[def="SyntheticHead"]/parts/li[def="SyntheticJaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<!-- Shoulders-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="PersonaeBody"]/corePart/parts/li[def="SyntheticShoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="PersonaeBody"]/corePart/parts/li[def="SyntheticShoulder"]/parts/li[def="SyntheticArm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="PersonaeBody"]/corePart/parts/li[def="SyntheticShoulder"]/parts/li[def="SyntheticArm"]/parts/li[def="SyntheticHand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="PersonaeBody"]/corePart/parts/li[def="SyntheticShoulder"]/parts/li[def="SyntheticArm"]/parts/li[def="SyntheticHand"]/parts/li[def="SyntheticFinger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<!-- Waist and Legs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="PersonaeBody"]/corePart/parts/li[def="Waist"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="PersonaeBody"]/corePart/parts/li[def="SyntheticLeg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="PersonaeBody"]/corePart/parts/li[def="SyntheticLeg"]/parts/li[def="SyntheticFoot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="PersonaeBody"]/corePart/parts/li[def="SyntheticLeg"]/parts/li[def="SyntheticFoot"]/parts/li[def="SyntheticToe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Robots!/Patches/Rim-Robots!/Race_Patch.xml b/ModPatches/Rim-Robots!/Patches/Rim-Robots!/Race_Patch.xml
new file mode 100644
index 0000000000..5b7caf9f7c
--- /dev/null
+++ b/ModPatches/Rim-Robots!/Patches/Rim-Robots!/Race_Patch.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ================ Mechanent Race ================== -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Mechanent"]/statBases/MeleeDodgeChance</xpath>
+	</Operation>
+	<!--  duplicate node on their end -->
+	<!-- the rest was done already on their side -->
+
+	<!-- ================= Personae Race  ================== -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Personae_"]/statBases/MeleeDodgeChance</xpath>
+	</Operation>
+
+	<!--  duplicate node on their end -->
+	<!-- the rest was done already on their side -->
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Sheks!/Patches/Rim-Sheks!/Patch_Bodies_Sheks.xml b/ModPatches/Rim-Sheks!/Patches/Rim-Sheks!/Patch_Bodies_Sheks.xml
new file mode 100644
index 0000000000..12c8de43f8
--- /dev/null
+++ b/ModPatches/Rim-Sheks!/Patches/Rim-Sheks!/Patch_Bodies_Sheks.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Changing coverage of the bodyDef (should've done this sooner, but eh) -->
+	<!-- why yes dear explorer of this file, i did just literally copy and paste the ShekBody bodytype patches -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ShekBody"]/corePart/parts/li[def="Ribcage"]/coverage</xpath>
+		<value>
+			<coverage>0.07</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ShekBody"]/corePart/parts/li[def="Pelvis"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ShekBody"]/corePart/parts/li[def="Stomach"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ShekBody"]/corePart/parts/li[def="Heart"]/coverage</xpath>
+		<value>
+			<coverage>0.04</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ShekBody"]/corePart/parts/li[def="Lung"]/coverage</xpath>
+		<value>
+			<coverage>0.055</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ShekBody"]/corePart/parts/li[def="Kidney"]/coverage</xpath>
+		<value>
+			<coverage>0.03</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ShekBody"]/corePart/parts/li[def="Liver"]/coverage</xpath>
+		<value>
+			<coverage>0.06</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ShekBody"]/corePart/parts/li[def="Neck"]/coverage</xpath>
+		<value>
+			<coverage>0.055</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ShekBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Skull"]/parts/li[def="Brain"]/coverage</xpath>
+		<value>
+			<coverage>0.9</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ShekBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Eye"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ShekBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ShekBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/coverage</xpath>
+		<value>
+			<coverage>0.08</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ShekBody"]/corePart/parts/li[def="Shoulder"]/coverage</xpath>
+		<value>
+			<coverage>0.085</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ShekBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Clavicle"]/coverage</xpath>
+		<value>
+			<coverage>0.06</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ShekBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Humerus"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ShekBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Radius"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ShekBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Femur"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ShekBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Tibia"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="ShekBody"]//*[
+			def="Torso" or
+			def="Neck" or
+			def="Head" or
+			def="Jaw" or
+			def="Ear" or
+			def="Nose" or
+			def="Shoulder" or
+			def="Arm" or
+			def="Hand" or
+			def="Finger" or
+			def="Foot" or
+			def="Toe" or
+			def="Leg"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="ShekBody"]//*[
+			def="Jaw" or
+			def="Nose" or
+			def="Eye"]/groups
+		</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Sheks!/Patches/Rim-Sheks!/Patch_PawnKinds_Sheks.xml b/ModPatches/Rim-Sheks!/Patches/Rim-Sheks!/Patch_PawnKinds_Sheks.xml
new file mode 100644
index 0000000000..c831ff9071
--- /dev/null
+++ b/ModPatches/Rim-Sheks!/Patches/Rim-Sheks!/Patch_PawnKinds_Sheks.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- SHEK Neutrals (Non-Combatants) -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="NeutralShekBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>1</min>
+					<max>3</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.15</generateChance>
+						<sidearmMoney>
+							<min>40</min>
+							<max>160</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- SHEK WARRIOR -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Shek_Warrior" or defName="Shek_Vassal"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>100</min>
+					<max>150</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.25</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.35</generateChance>
+						<sidearmMoney>
+							<min>40</min>
+							<max>160</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- SHEK PYRO -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Shek_Pyrotechnician"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>10</min>
+					<max>21</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>100</min>
+					<max>150</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>40</min>
+							<max>160</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- SHEK GUNNERS -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Shek_Guardian" or defName="Heavy_Shek_Guardian"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.35</generateChance>
+						<sidearmMoney>
+							<min>40</min>
+							<max>160</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Sheks!/Patches/Rim-Sheks!/Patch_Race_Shek.xml b/ModPatches/Rim-Sheks!/Patches/Rim-Sheks!/Patch_Race_Shek.xml
new file mode 100644
index 0000000000..970eee0247
--- /dev/null
+++ b/ModPatches/Rim-Sheks!/Patches/Rim-Sheks!/Patch_Race_Shek.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Shek_"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Shek_"]/statBases</xpath>
+		<value>
+			<MeleeCritChance>1.2</MeleeCritChance>
+			<MeleeParryChance>1.2</MeleeParryChance>
+			<Suppressability>0.7</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Shek_"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Shek_"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>3.6</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Shek_"]</xpath>
+		<value>
+			<comps/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Shek_"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Skeletons/Patches/Rim-Skeletons/Patch_Bodies_Skellingtons.xml b/ModPatches/Rim-Skeletons/Patches/Rim-Skeletons/Patch_Bodies_Skellingtons.xml
new file mode 100644
index 0000000000..9f4d192afd
--- /dev/null
+++ b/ModPatches/Rim-Skeletons/Patches/Rim-Skeletons/Patch_Bodies_Skellingtons.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="SkeletonBody"]//*[
+			def="MechanicalThorax" or
+			def="MechanicalNeck" or
+			def="MechanicalHead" or
+			def="MechanicalJaw" or
+			def="HearingSensor" or
+			def="SmellSensor" or
+			def="MechShoulder" or
+			def="MechArm" or
+			def="MechanicalHand" or
+			def="MechanicalFinger" or
+			def="MechanicalFoot" or
+			def="MechLeg"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="SkeletonBody"]//*[
+			def="MechanicalJaw" or
+			def="SmellSensor" or
+			def="SightSensor"]/groups
+		</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rim-Skeletons/Patches/Rim-Skeletons/Patch_PawnKinds_Skellingtons.xml b/ModPatches/Rim-Skeletons/Patches/Rim-Skeletons/Patch_PawnKinds_Skellingtons.xml
new file mode 100644
index 0000000000..63fe893212
--- /dev/null
+++ b/ModPatches/Rim-Skeletons/Patches/Rim-Skeletons/Patch_PawnKinds_Skellingtons.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- SHEK Outlander-->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Skeleton_Drifter" or defName="Town_Guard_Skele"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>1</min>
+					<max>3</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.35</generateChance>
+						<sidearmMoney>
+							<min>40</min>
+							<max>160</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Pirate_Skele"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.35</generateChance>
+						<sidearmMoney>
+							<min>40</min>
+							<max>160</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Tribal_Skeleton"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>20</min>
+					<max>30</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.35</generateChance>
+						<sidearmMoney>
+							<min>40</min>
+							<max>160</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+				<shieldMoney>
+					<min>120</min>
+					<max>160</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.9</shieldChance>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Tribal_Skeleton"]/combatPower</xpath>
+		<value>
+			<combatPower>60</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="Tribal_Skeleton"]</xpath>
+		<value>
+			<apparelRequired>
+				<li>CE_Apparel_TribalBackpack</li>
+			</apparelRequired>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimCities/Patches/RimCities/Scenarios/Scenarios.xml b/ModPatches/RimCities/Patches/RimCities/Scenarios/Scenarios.xml
new file mode 100644
index 0000000000..6293264dcb
--- /dev/null
+++ b/ModPatches/RimCities/Patches/RimCities/Scenarios/Scenarios.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Add ammunition to RimCities starting scenarios -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[@Name="Crashlanded_City"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_303British_FMJ</thingDef>
+				<count>100</count>
+			</li>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_44Magnum_FMJ</thingDef>
+				<count>60</count>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Remove apparel from RimCities starting scenarios -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ScenarioDef[@Name="Crashlanded_City"]/scenario/parts/li[thingDef="Apparel_AdvancedHelmet"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ScenarioDef[@Name="Crashlanded_City"]/scenario/parts/li[thingDef="Apparel_FlakVest"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ScenarioDef[@Name="Crashlanded_City"]/scenario/parts/li[thingDef="Apparel_FlakPants"]</xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimFantasy - House Doyle/Patches/RimFantasy - House Doyle/Patch_RFDoyle_ArcaneWeapon.xml b/ModPatches/RimFantasy - House Doyle/Patches/RimFantasy - House Doyle/Patch_RFDoyle_ArcaneWeapon.xml
new file mode 100644
index 0000000000..a1f0c99e8f
--- /dev/null
+++ b/ModPatches/RimFantasy - House Doyle/Patches/RimFantasy - House Doyle/Patch_RFDoyle_ArcaneWeapon.xml	
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ======= Amethyst Wand ======= -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RF_AmethystWand</defName>
+		<costList>
+			<RF_Amethyst>55</RF_Amethyst>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>RF_MagicBolt_Wand_Amethyst</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>40</range>
+			<recoilAmount>1.53</recoilAmount>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>5</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ======= Amethyst Staff ======= -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RF_AmethystStaff</defName>
+		<costList>
+			<RF_Amethyst>55</RF_Amethyst>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>RF_MagicBolt_Staff_Amethyst</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>45</range>
+			<recoilAmount>1.53</recoilAmount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>5</burstShotCount>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ======= Amethyst Ring ======= -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RF_AmethystRing</defName>
+		<costList>
+			<RF_Amethyst>55</RF_Amethyst>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>RF_MagicBolt_Ring_Amethyst</defaultProjectile>
+			<warmupTime>0.25</warmupTime>
+			<range>35</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>5</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ======= Amethyst Bow ======= -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RF_AmethystBow</defName>
+		<costList>
+			<RF_Amethyst>55</RF_Amethyst>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>RF_MagicArrow_Amethyst</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>32</range>
+			<soundCast>ChargeLance_Fire</soundCast>
+		</Properties>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_Bow</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimFantasy - House Doyle/Patches/RimFantasy - House Doyle/Patch_RFDoyle_Armor.xml b/ModPatches/RimFantasy - House Doyle/Patches/RimFantasy - House Doyle/Patch_RFDoyle_Armor.xml
new file mode 100644
index 0000000000..5d117ab6b1
--- /dev/null
+++ b/ModPatches/RimFantasy - House Doyle/Patches/RimFantasy - House Doyle/Patch_RFDoyle_Armor.xml	
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ======= House Doyle Armor ======= -->
+
+	<!-- ===== Heavy Hauberk ===== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_Apparel_HeraldicHeavyHauberk_Doyle"]/statBases</xpath>
+		<value>
+			<Bulk>30</Bulk>
+			<WornBulk>12</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_Apparel_HeraldicHeavyHauberk_Doyle"]/statBases/Mass</xpath>
+		<value>
+			<Mass>9</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_Apparel_HeraldicHeavyHauberk_Doyle"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_Apparel_HeraldicHeavyHauberk_Doyle"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<MeleeDodgeChance>-0.10</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- ===== Full-Plate Gilded ===== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_Apparel_HeraldicGildedFullPlate_Doyle"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_Apparel_HeraldicGildedFullPlate_Doyle"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_Apparel_HeraldicGildedFullPlate_Doyle"]/statBases/Mass</xpath>
+		<value>
+			<Mass>15</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_Apparel_HeraldicGildedFullPlate_Doyle"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<MeleeDodgeChance>-0.15</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RF_Apparel_HeraldicGildedFullPlate_Doyle"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ===== Heraldic Great Helm ===== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_Apparel_HeraldicGreatHelm_Doyle"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RF_Apparel_HeraldicGreatHelm_Doyle"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_Apparel_HeraldicGreatHelm_Doyle"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingAccuracy>-0.4</AimingAccuracy>
+			<MeleeHitChance>-2</MeleeHitChance>
+			<Suppressability>-0.20</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_Apparel_HeraldicGreatHelm_Doyle"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.75</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimFantasy - House Doyle/Patches/RimFantasy - House Doyle/Patch_RFDoyle_Jewelry.xml b/ModPatches/RimFantasy - House Doyle/Patches/RimFantasy - House Doyle/Patch_RFDoyle_Jewelry.xml
new file mode 100644
index 0000000000..bb436bc20f
--- /dev/null
+++ b/ModPatches/RimFantasy - House Doyle/Patches/RimFantasy - House Doyle/Patch_RFDoyle_Jewelry.xml	
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ======= House Doyle Jewelry ======= -->
+
+	<!-- ===== Necklace ===== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_Apparel_Necklace_Amethyst"]/statBases</xpath>
+		<value>
+			<Bulk>0.25</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- ===== Ring ===== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_Apparel_Ring_Amethyst"]/statBases</xpath>
+		<value>
+			<Bulk>0.25</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimFantasy - House Doyle/Patches/RimFantasy - House Doyle/Patch_RFDoyle_Melee.xml b/ModPatches/RimFantasy - House Doyle/Patches/RimFantasy - House Doyle/Patch_RFDoyle_Melee.xml
new file mode 100644
index 0000000000..f6e7f0a5df
--- /dev/null
+++ b/ModPatches/RimFantasy - House Doyle/Patches/RimFantasy - House Doyle/Patch_RFDoyle_Melee.xml	
@@ -0,0 +1,639 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ======= Hoose Doyle Melee Weapon ======= -->
+
+	<!-- ===== Arming Sword ===== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_ArmingSword_Doyle"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_ArmingSword_Doyle"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.40</MeleeCritChance>
+				<MeleeParryChance>0.60</MeleeParryChance>
+				<MeleeDodgeChance>0.30</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_ArmingSword_Doyle"]</xpath>
+		<value>
+			<weaponTags>
+				<li>CE_OneHandedWeapon</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_ArmingSword_Doyle"]/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.05</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.46</cooldownTime>
+					<chanceFactor>0.50</chanceFactor>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.40</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.45</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.58</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ===== Greatsword ===== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_Greatsword_Doyle"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<MeleeCounterParryBonus>0.70</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_Greatsword_Doyle"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.30</MeleeCritChance>
+				<MeleeParryChance>1.20</MeleeParryChance>
+				<MeleeDodgeChance>0.50</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_Greatsword_Doyle"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.69</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.98</cooldownTime>
+					<chanceFactor>0.50</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.90</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>48</power>
+					<cooldownTime>2.86</cooldownTime>
+					<chanceFactor>0.45</chanceFactor>
+					<armorPenetrationBlunt>3.592</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.58</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ===== Fighting Axe ===== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_FightingAxe_Doyle"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<MeleeCounterParryBonus>0.22</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_FightingAxe_Doyle"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.31</MeleeCritChance>
+				<MeleeParryChance>0.22</MeleeParryChance>
+				<MeleeDodgeChance>0.22</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_FightingAxe_Doyle"]</xpath>
+		<value>
+			<weaponTags>
+				<li>CE_OneHandedWeapon</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_FightingAxe_Doyle"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>0.95</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>15</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.25</chanceFactor>
+					<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.32</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.58</cooldownTime>
+					<chanceFactor>0.70</chanceFactor>
+					<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ===== Longaxe ===== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_Longaxe_Doyle"]/statBases</xpath>
+		<value>
+			<Bulk>7</Bulk>
+			<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_Longaxe_Doyle"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.30</MeleeCritChance>
+				<MeleeParryChance>0.50</MeleeParryChance>
+				<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_Longaxe_Doyle"]/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>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2.05</cooldownTime>
+					<chanceFactor>0.25</chanceFactor>
+					<armorPenetrationBlunt>9.6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>32</power>
+					<cooldownTime>2.05</cooldownTime>
+					<chanceFactor>0.70</chanceFactor>
+					<armorPenetrationBlunt>9.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.32</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ===== Morning Star ===== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_MorningStar_Doyle"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_MorningStar_Doyle"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.42</MeleeCritChance>
+				<MeleeParryChance>0.24</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_MorningStar_Doyle"]</xpath>
+		<value>
+			<weaponTags>
+				<li>CE_OneHandedWeapon</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_MorningStar_Doyle"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.1</cooldownTime>
+					<chanceFactor>0.90</chanceFactor>
+					<armorPenetrationBlunt>6.925</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ===== Two-Handed Flanged Mace ===== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_TwoHandedFlangedMace_Doyle"]/statBases</xpath>
+		<value>
+			<Bulk>9</Bulk>
+			<MeleeCounterParryBonus>0.54</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_TwoHandedFlangedMace_Doyle"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>2.30</MeleeCritChance>
+				<MeleeParryChance>0.40</MeleeParryChance>
+				<MeleeDodgeChance>0.30</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_TwoHandedFlangedMace_Doyle"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>3.30</cooldownTime>
+					<chanceFactor>0.90</chanceFactor>
+					<armorPenetrationBlunt>14.225</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ===== Warhammer ===== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_Warhammer_Doyle"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>0.22</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_Warhammer_Doyle"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.06</MeleeCritChance>
+				<MeleeParryChance>0.22</MeleeParryChance>
+				<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_Warhammer_Doyle"]</xpath>
+		<value>
+			<weaponTags>
+				<li>CE_OneHandedWeapon</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_Warhammer_Doyle"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.69</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.85</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>6.7</armorPenetrationBlunt>
+					<armorPenetrationSharp>3.0</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>1.90</cooldownTime>
+					<chanceFactor>0.80</chanceFactor>
+					<armorPenetrationBlunt>8.2</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ===== Polehammer ===== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_Polehammer_Doyle"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>0.54</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_Polehammer_Doyle"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>2.40</MeleeCritChance>
+				<MeleeParryChance>1.30</MeleeParryChance>
+				<MeleeDodgeChance>0.30</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_Polehammer_Doyle"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>2.7</cooldownTime>
+					<chanceFactor>0.25</chanceFactor>
+					<armorPenetrationBlunt>9.225</armorPenetrationBlunt>
+					<armorPenetrationSharp>4.3</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>2.7</cooldownTime>
+					<chanceFactor>0.70</chanceFactor>
+					<armorPenetrationBlunt>11.825</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ===== Fighting Spear ===== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_FightingSpear_Doyle"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_FightingSpear_Doyle"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.17</MeleeCritChance>
+				<MeleeParryChance>0.5</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_FightingSpear_Doyle"]</xpath>
+		<value>
+			<weaponTags>
+				<li>CE_OneHandedWeapon</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_FightingSpear_Doyle"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.50</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.6</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.6</cooldownTime>
+					<chanceFactor>0.90</chanceFactor>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.75</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ===== Pike ===== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_Pike_Doyle"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<MeleeCounterParryBonus>1.27</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_Pike_Doyle"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.08</MeleeCritChance>
+				<MeleeParryChance>0.95</MeleeParryChance>
+				<MeleeDodgeChance>1.27</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_Pike_Doyle"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.3</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>1.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.5</cooldownTime>
+					<chanceFactor>0.95</chanceFactor>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimFantasy - House Doyle/Patches/RimFantasy - House Doyle/Patch_RFDoyle_Projectiles.xml b/ModPatches/RimFantasy - House Doyle/Patches/RimFantasy - House Doyle/Patch_RFDoyle_Projectiles.xml
new file mode 100644
index 0000000000..d1b2279f92
--- /dev/null
+++ b/ModPatches/RimFantasy - House Doyle/Patches/RimFantasy - House Doyle/Patch_RFDoyle_Projectiles.xml	
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ======= Magic Projectiles ======= -->
+
+	<!-- ===== Magic Bolts Wand ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_MagicBolt_Wand_Amethyst"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>70</speed>
+				<damageAmountBase>17</damageAmountBase>
+				<armorPenetrationBlunt>30</armorPenetrationBlunt>
+				<armorPenetrationSharp>9</armorPenetrationSharp>
+				<damageDef>RF_MagicBolt</damageDef>
+				<dropsCasings>false</dropsCasings>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_MagicBolt_Wand_Amethyst"]</xpath>
+		<value>
+			<thingClass>CombatExtended.BulletCE</thingClass>
+		</value>
+	</Operation>
+
+	<!-- ===== Magic Bolts Staff ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_MagicBolt_Staff_Amethyst"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>65</speed>
+				<damageAmountBase>16</damageAmountBase>
+				<armorPenetrationBlunt>30</armorPenetrationBlunt>
+				<armorPenetrationSharp>9</armorPenetrationSharp>
+				<damageDef>RF_MagicBolt</damageDef>
+				<dropsCasings>false</dropsCasings>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_MagicBolt_Staff_Amethyst"]</xpath>
+		<value>
+			<thingClass>CombatExtended.BulletCE</thingClass>
+		</value>
+	</Operation>
+
+	<!-- ===== Magic Bolts Ring ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_MagicBolt_Ring_Amethyst"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>60</speed>
+				<damageAmountBase>14</damageAmountBase>
+				<armorPenetrationBlunt>26</armorPenetrationBlunt>
+				<armorPenetrationSharp>8</armorPenetrationSharp>
+				<damageDef>RF_MagicBolt_AmethystRing</damageDef>
+				<dropsCasings>false</dropsCasings>
+				<ai_IsIncendiary>true</ai_IsIncendiary>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_MagicBolt_Ring_Amethyst"]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_ExplosiveCE">
+					<damageAmountBase>4</damageAmountBase>
+					<explosiveDamageType>Bomb</explosiveDamageType>
+					<explosiveRadius>1.2</explosiveRadius>
+					<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+					<preExplosionSpawnChance>0.06</preExplosionSpawnChance>
+					<preExplosionSpawnThingDef>RF_RubbleShardsRF_Amethyst</preExplosionSpawnThingDef>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_MagicBolt_Ring_Amethyst"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.BulletCE</thingClass>
+		</value>
+	</Operation>
+
+	<!-- ===== Magic Arrows ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_MagicArrow_Amethyst"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>33</speed>
+				<damageAmountBase>14</damageAmountBase>
+				<armorPenetrationBlunt>7</armorPenetrationBlunt>
+				<armorPenetrationSharp>2</armorPenetrationSharp>
+				<damageDef>Arrow</damageDef>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_MagicArrow_Amethyst"]</xpath>
+		<value>
+			<thingClass>CombatExtended.BulletCE</thingClass>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimFantasy - House Doyle/Patches/RimFantasy - House Doyle/Patch_RFDoyle_Ranged.xml b/ModPatches/RimFantasy - House Doyle/Patches/RimFantasy - House Doyle/Patch_RFDoyle_Ranged.xml
new file mode 100644
index 0000000000..3d160f51b9
--- /dev/null
+++ b/ModPatches/RimFantasy - House Doyle/Patches/RimFantasy - House Doyle/Patch_RFDoyle_Ranged.xml	
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ======= House Doyle Ranged Weapon ======= -->
+
+	<!-- ===== Tools ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_RangedWeapon_Greatbow_Doyle" or defName="RF_RangedWeapon_WarBow_Doyle"]/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>
+	</Operation>
+
+	<!-- ===== Bows ===== -->
+
+	<!-- === Great Bow === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RF_RangedWeapon_Greatbow_Doyle</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>1</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>5.00</Bulk>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>40</WoodLog>
+			<RF_Amethyst>1</RF_Amethyst>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_GreatArrow_Stone</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>30</range>
+			<soundCast>Bow_Large</soundCast>
+		</Properties>
+		<AmmoUser>
+			<ammoSet>AmmoSet_GreatArrow</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_Bow</li>
+		</weaponTags>
+		<researchPrerequisite>Greatbow</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- === War Bow === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RF_RangedWeapon_WarBow_Doyle</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>1</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>5.00</Bulk>
+			<RangedWeapon_Cooldown>0.7</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>20</WoodLog>
+			<RF_Amethyst>1</RF_Amethyst>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_WarArrow_Stone</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>32</range>
+			<soundCast>Bow_Large</soundCast>
+		</Properties>
+		<AmmoUser>
+			<ammoSet>AmmoSet_WarArrow</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_Bow</li>
+		</weaponTags>
+		<researchPrerequisite>DankPyon_WarBow</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimFantasy - House Doyle/Patches/RimFantasy - House Doyle/Patch_RFDoyle_Shield.xml b/ModPatches/RimFantasy - House Doyle/Patches/RimFantasy - House Doyle/Patch_RFDoyle_Shield.xml
new file mode 100644
index 0000000000..10b3d5bc90
--- /dev/null
+++ b/ModPatches/RimFantasy - House Doyle/Patches/RimFantasy - House Doyle/Patch_RFDoyle_Shield.xml	
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ======= House Doyle Shield ======= -->
+
+	<!-- === Replace Apparel Layer & BodyPart Group === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_HeraldicHeaterShield_Doyle"]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>Shield</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_HeraldicHeaterShield_Doyle"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>LeftShoulder</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RF_HeraldicHeaterShield_Doyle"]/comps/li[@Class="VFECore.CompProperties_Shield"]</xpath>
+	</Operation>
+
+	<!-- === Add Bulk === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_HeraldicHeaterShield_Doyle"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- === Replace Stuff Thickness === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_HeraldicHeaterShield_Doyle"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.85</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimFantasy - Medieval Overhaul Edition/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Arcane_Bows.xml b/ModPatches/RimFantasy - Medieval Overhaul Edition/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Arcane_Bows.xml
new file mode 100644
index 0000000000..4a697640f7
--- /dev/null
+++ b/ModPatches/RimFantasy - Medieval Overhaul Edition/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Arcane_Bows.xml	
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ===== Tools ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneBows"]/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>
+	</Operation>
+
+	<!-- ===== Statbases ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneBows"]/statBases</xpath>
+		<value>
+			<statBases>
+				<WorkToMake>18000</WorkToMake>
+				<Mass>2.75</Mass>
+				<Bulk>5.00</Bulk>
+				<SightsEfficiency>0.8</SightsEfficiency>
+				<ShotSpread>1</ShotSpread>
+				<SwayFactor>2</SwayFactor>
+				<RangedWeapon_Cooldown>0.7</RangedWeapon_Cooldown>
+			</statBases>
+		</value>
+	</Operation>
+
+	<!-- ======= Emerald Bow ======= -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RF_EmeraldBow</defName>
+		<costList>
+			<DankPyon_Emerald>55</DankPyon_Emerald>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>RF_MagicArrow_Emerald</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>32</range>
+			<soundCast>ChargeLance_Fire</soundCast>
+		</Properties>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_Bow</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ======= Sapphire Bow ======= -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RF_SapphireBow</defName>
+		<costList>
+			<DankPyon_Sapphire>55</DankPyon_Sapphire>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>RF_MagicArrow_Sapphire</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>32</range>
+			<soundCast>ChargeLance_Fire</soundCast>
+		</Properties>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_Bow</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ======= Ruby Bow ======= -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RF_RubyBow</defName>
+		<costList>
+			<DankPyon_Ruby>55</DankPyon_Ruby>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>RF_MagicArrow_Ruby</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>32</range>
+			<soundCast>ChargeLance_Fire</soundCast>
+		</Properties>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_Bow</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimFantasy - Medieval Overhaul Edition/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Arcane_Melee.xml b/ModPatches/RimFantasy - Medieval Overhaul Edition/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Arcane_Melee.xml
new file mode 100644
index 0000000000..405d105dcb
--- /dev/null
+++ b/ModPatches/RimFantasy - Medieval Overhaul Edition/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Arcane_Melee.xml	
@@ -0,0 +1,386 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ======= Arcane Melee Weapon ======= -->
+
+	<!-- ===== Battle Axes ===== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneBattleAxes"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<MeleeCounterParryBonus>0.22</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneBattleAxes"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.31</MeleeCritChance>
+				<MeleeParryChance>0.22</MeleeParryChance>
+				<MeleeDodgeChance>0.22</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneBattleAxes"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneBattleAxes"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.95</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>29</power>
+					<cooldownTime>1.58</cooldownTime>
+					<chanceFactor>0.85</chanceFactor>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.935</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ===== Daggers ===== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneDaggers"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>0.3</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneDaggers"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.40</MeleeCritChance>
+				<MeleeParryChance>0.60</MeleeParryChance>
+				<MeleeDodgeChance>0.30</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneDaggers"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneDaggers"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>1.46</cooldownTime>
+					<chanceFactor>0.50</chanceFactor>
+					<armorPenetrationBlunt>0.685</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.75</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.45</chanceFactor>
+					<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.725</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ===== Longswords ===== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneLongswords"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>0.9</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneLongswords"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.60</MeleeCritChance>
+				<MeleeParryChance>0.75</MeleeParryChance>
+				<MeleeDodgeChance>0.40</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneLongswords"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.78</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.78</cooldownTime>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.0</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>45</power>
+					<cooldownTime>1.64</cooldownTime>
+					<chanceFactor>0.35</chanceFactor>
+					<armorPenetrationBlunt>3.24</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.725</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ===== Spears ===== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneSpears"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneSpears"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.17</MeleeCritChance>
+				<MeleeParryChance>0.5</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneSpears"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneSpears"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.6</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.685</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.6</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.685</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.6</cooldownTime>
+					<chanceFactor>0.90</chanceFactor>
+					<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.185</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ===== Warhammers ===== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneWarHammers"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>0.22</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneWarHammers"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.06</MeleeCritChance>
+				<MeleeParryChance>0.22</MeleeParryChance>
+				<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneWarHammers"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneWarHammers"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.69</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.90</cooldownTime>
+					<chanceFactor>0.85</chanceFactor>
+					<armorPenetrationBlunt>10.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ===== Halberds ===== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneHalberds"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>1.08</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneHalberds"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.22</MeleeCritChance>
+				<MeleeParryChance>1.53</MeleeParryChance>
+				<MeleeDodgeChance>0.67</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneHalberds"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.31</cooldownTime>
+					<armorPenetrationBlunt>2.535</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>55</power>
+					<cooldownTime>2.9</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>10.125</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.025</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>47</power>
+					<cooldownTime>1.16</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>2.535</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.54</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimFantasy - Medieval Overhaul Edition/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Arcane_Ring.xml b/ModPatches/RimFantasy - Medieval Overhaul Edition/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Arcane_Ring.xml
new file mode 100644
index 0000000000..86142c61d9
--- /dev/null
+++ b/ModPatches/RimFantasy - Medieval Overhaul Edition/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Arcane_Ring.xml	
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ===== Tools ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneRings"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>band</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.5</cooldownTime>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ===== Statbases ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneRings"]/statBases</xpath>
+		<value>
+			<statBases>
+				<WorkToMake>18000</WorkToMake>
+				<Mass>1.25</Mass>
+				<Bulk>0.6</Bulk>
+				<SightsEfficiency>1.0</SightsEfficiency>
+				<ShotSpread>0.14</ShotSpread>
+				<SwayFactor>0.10</SwayFactor>
+				<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
+			</statBases>
+		</value>
+	</Operation>
+
+	<!-- ======= Emerald Ring ======= -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RF_EmeraldRing</defName>
+		<costList>
+			<DankPyon_Emerald>55</DankPyon_Emerald>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>RF_MagicBolt_Ring_Emerald</defaultProjectile>
+			<warmupTime>0.25</warmupTime>
+			<range>35</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>5</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ======= Sapphire Ring ======= -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RF_SapphireRing</defName>
+		<costList>
+			<DankPyon_Sapphire>55</DankPyon_Sapphire>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>RF_MagicBolt_Ring_Sapphire</defaultProjectile>
+			<warmupTime>0.25</warmupTime>
+			<range>35</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>5</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ======= Ruby Ring ======= -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RF_RubyRing</defName>
+		<costList>
+			<DankPyon_Ruby>55</DankPyon_Ruby>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>RF_MagicBolt_Ring_Ruby</defaultProjectile>
+			<warmupTime>0.25</warmupTime>
+			<range>35</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>5</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimFantasy - Medieval Overhaul Edition/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Arcane_Staff.xml b/ModPatches/RimFantasy - Medieval Overhaul Edition/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Arcane_Staff.xml
new file mode 100644
index 0000000000..47e530617e
--- /dev/null
+++ b/ModPatches/RimFantasy - Medieval Overhaul Edition/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Arcane_Staff.xml	
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ===== Tools ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneStaffs"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>limb</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.2</cooldownTime>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ===== Statbases ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneStaffs"]/statBases</xpath>
+		<value>
+			<statBases>
+				<WorkToMake>18000</WorkToMake>
+				<Mass>3</Mass>
+				<Bulk>3</Bulk>
+				<SightsEfficiency>1.0</SightsEfficiency>
+				<ShotSpread>0.14</ShotSpread>
+				<SwayFactor>1.01</SwayFactor>
+				<RangedWeapon_Cooldown>2.6</RangedWeapon_Cooldown>
+			</statBases>
+		</value>
+	</Operation>
+
+	<!-- ======= Emerald Staff ======= -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RF_EmeraldStaff</defName>
+		<costList>
+			<DankPyon_Emerald>55</DankPyon_Emerald>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>RF_MagicBolt_Staff_Emerald</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>45</range>
+			<recoilAmount>1.53</recoilAmount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>5</burstShotCount>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ======= Sapphire Staff ======= -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RF_SapphireStaff</defName>
+		<costList>
+			<DankPyon_Sapphire>55</DankPyon_Sapphire>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>RF_MagicBolt_Staff_Sapphire</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>45</range>
+			<recoilAmount>1.53</recoilAmount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>5</burstShotCount>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ======= Ruby Staff ======= -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RF_RubyStaff</defName>
+		<costList>
+			<DankPyon_Ruby>55</DankPyon_Ruby>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>RF_MagicBolt_Staff_Ruby</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>45</range>
+			<recoilAmount>1.53</recoilAmount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>5</burstShotCount>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimFantasy - Medieval Overhaul Edition/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Arcane_Wand.xml b/ModPatches/RimFantasy - Medieval Overhaul Edition/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Arcane_Wand.xml
new file mode 100644
index 0000000000..1168706b5c
--- /dev/null
+++ b/ModPatches/RimFantasy - Medieval Overhaul Edition/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Arcane_Wand.xml	
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ===== Tools ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneWands"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>limb</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.2</cooldownTime>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ===== Statbases ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneWands"]/statBases</xpath>
+		<value>
+			<statBases>
+				<WorkToMake>18000</WorkToMake>
+				<Mass>2</Mass>
+				<Bulk>2</Bulk>
+				<SightsEfficiency>1.0</SightsEfficiency>
+				<ShotSpread>0.14</ShotSpread>
+				<SwayFactor>1.01</SwayFactor>
+				<RangedWeapon_Cooldown>1.6</RangedWeapon_Cooldown>
+			</statBases>
+		</value>
+	</Operation>
+
+	<!-- ======= Emerald Wand ======= -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RF_EmeraldWand</defName>
+		<costList>
+			<DankPyon_Emerald>55</DankPyon_Emerald>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>RF_MagicBolt_Wand_Emerald</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>40</range>
+			<recoilAmount>1.53</recoilAmount>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>5</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ======= Sapphire Wand ======= -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RF_SapphireWand</defName>
+		<costList>
+			<DankPyon_Sapphire>55</DankPyon_Sapphire>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>RF_MagicBolt_Wand_Sapphire</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>40</range>
+			<recoilAmount>1.53</recoilAmount>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>5</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ======= Ruby Wand ======= -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RF_RubyWand</defName>
+		<costList>
+			<DankPyon_Ruby>55</DankPyon_Ruby>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>RF_MagicBolt_Wand_Ruby</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>40</range>
+			<recoilAmount>1.53</recoilAmount>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>5</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimFantasy - Medieval Overhaul Edition/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Projectiles.xml b/ModPatches/RimFantasy - Medieval Overhaul Edition/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Projectiles.xml
new file mode 100644
index 0000000000..1c82c0191b
--- /dev/null
+++ b/ModPatches/RimFantasy - Medieval Overhaul Edition/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Projectiles.xml	
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ======= Magic Projectiles ======= -->
+
+	<!-- ===== Magic Arrows ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_MagicArrow_Emerald" or defName="RF_MagicArrow_Sapphire" or defName="RF_MagicArrow_Ruby"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>33</speed>
+				<damageAmountBase>14</damageAmountBase>
+				<armorPenetrationBlunt>7</armorPenetrationBlunt>
+				<armorPenetrationSharp>2</armorPenetrationSharp>
+				<damageDef>Arrow</damageDef>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_MagicArrow_Emerald" or defName="RF_MagicArrow_Sapphire" or defName="RF_MagicArrow_Ruby"]</xpath>
+		<value>
+			<thingClass>CombatExtended.BulletCE</thingClass>
+		</value>
+	</Operation>
+
+	<!-- ===== Magic Bolts Ring ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_MagicBolt_Ring_Emerald"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>60</speed>
+				<damageAmountBase>14</damageAmountBase>
+				<armorPenetrationBlunt>26</armorPenetrationBlunt>
+				<armorPenetrationSharp>8</armorPenetrationSharp>
+				<damageDef>RF_MagicBolt_EmeraldRing</damageDef>
+				<dropsCasings>false</dropsCasings>
+				<ai_IsIncendiary>true</ai_IsIncendiary>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_MagicBolt_Ring_Emerald"]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_ExplosiveCE">
+					<damageAmountBase>4</damageAmountBase>
+					<explosiveDamageType>Bomb</explosiveDamageType>
+					<explosiveRadius>1.2</explosiveRadius>
+					<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+					<preExplosionSpawnChance>0.06</preExplosionSpawnChance>
+					<preExplosionSpawnThingDef>RF_RubbleShardsRF_Emerald</preExplosionSpawnThingDef>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_MagicBolt_Ring_Sapphire"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>60</speed>
+				<damageAmountBase>14</damageAmountBase>
+				<armorPenetrationBlunt>26</armorPenetrationBlunt>
+				<armorPenetrationSharp>8</armorPenetrationSharp>
+				<damageDef>RF_MagicBolt_SapphireRing</damageDef>
+				<dropsCasings>false</dropsCasings>
+				<ai_IsIncendiary>true</ai_IsIncendiary>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_MagicBolt_Ring_Sapphire"]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_ExplosiveCE">
+					<damageAmountBase>4</damageAmountBase>
+					<explosiveDamageType>Bomb</explosiveDamageType>
+					<explosiveRadius>1.2</explosiveRadius>
+					<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+					<preExplosionSpawnChance>0.06</preExplosionSpawnChance>
+					<preExplosionSpawnThingDef>RF_RubbleShardsRF_Sapphire</preExplosionSpawnThingDef>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_MagicBolt_Ring_Ruby"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>60</speed>
+				<damageAmountBase>14</damageAmountBase>
+				<armorPenetrationBlunt>26</armorPenetrationBlunt>
+				<armorPenetrationSharp>8</armorPenetrationSharp>
+				<damageDef>RF_MagicBolt_RubyRing</damageDef>
+				<dropsCasings>false</dropsCasings>
+				<ai_IsIncendiary>true</ai_IsIncendiary>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_MagicBolt_Ring_Sapphire"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>4</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1.2</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<preExplosionSpawnChance>0.06</preExplosionSpawnChance>
+				<preExplosionSpawnThingDef>RF_RubbleShardsRF_Ruby</preExplosionSpawnThingDef>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_MagicBolt_Ring_Emerald" or defName="RF_MagicBolt_Ring_Sapphire" or defName="RF_MagicBolt_Ring_Ruby"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.BulletCE</thingClass>
+		</value>
+	</Operation>
+
+	<!-- ===== Magic Bolts Staff ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_MagicBolt_Staff_Emerald" or defName="RF_MagicBolt_Staff_Sapphire" or defName="RF_MagicBolt_Staff_Ruby"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>65</speed>
+				<damageAmountBase>16</damageAmountBase>
+				<armorPenetrationBlunt>30</armorPenetrationBlunt>
+				<armorPenetrationSharp>9</armorPenetrationSharp>
+				<damageDef>RF_MagicBolt</damageDef>
+				<dropsCasings>false</dropsCasings>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_MagicBolt_Staff_Emerald" or defName="RF_MagicBolt_Staff_Sapphire" or defName="RF_MagicBolt_Staff_Ruby"]</xpath>
+		<value>
+			<thingClass>CombatExtended.BulletCE</thingClass>
+		</value>
+	</Operation>
+
+	<!-- ===== Magic Bolts Wand ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_MagicBolt_Wand_Emerald" or defName="RF_MagicBolt_Wand_Sapphire" or defName="RF_MagicBolt_Wand_Ruby"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>70</speed>
+				<damageAmountBase>17</damageAmountBase>
+				<armorPenetrationBlunt>30</armorPenetrationBlunt>
+				<armorPenetrationSharp>9</armorPenetrationSharp>
+				<damageDef>RF_MagicBolt</damageDef>
+				<dropsCasings>false</dropsCasings>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_MagicBolt_Wand_Emerald" or defName="RF_MagicBolt_Wand_Sapphire" or defName="RF_MagicBolt_Wand_Ruby"]</xpath>
+		<value>
+			<thingClass>CombatExtended.BulletCE</thingClass>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimFantasy - Medieval Overhaul Edition/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Turrets.xml b/ModPatches/RimFantasy - Medieval Overhaul Edition/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Turrets.xml
new file mode 100644
index 0000000000..938d0e7d20
--- /dev/null
+++ b/ModPatches/RimFantasy - Medieval Overhaul Edition/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Turrets.xml	
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ======= Pylons ======= -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RF_BombardPylon" or defName="RF_LancePylon" or defName="RF_SprayPylon"]/comps/li[@Class="CompProperties_Refuelable"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_BombardPylon" or defName="RF_LancePylon" or defName="RF_SprayPylon"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_BombardPylon" or defName="RF_LancePylon" or defName="RF_SprayPylon"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_BombardPylon" or defName="RF_LancePylon" or defName="RF_SprayPylon"]/costList</xpath>
+		<value>
+			<DankPyon_Onyx>100</DankPyon_Onyx>
+		</value>
+	</Operation>
+
+	<!-- ===== Bombard Pylon ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_BombardPylon_MagicBolt"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<armorPenetrationBlunt>25</armorPenetrationBlunt>
+				<armorPenetrationSharp>6</armorPenetrationSharp>
+				<dropsCasings>false</dropsCasings>
+				<damageDef>RF_BombardPylon_MagicBolt</damageDef>
+				<damageAmountBase>8</damageAmountBase>
+				<speed>50</speed>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_BombardPylon_MagicBolt"]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_ExplosiveCE">
+					<damageAmountBase>3</damageAmountBase>
+					<explosiveDamageType>Bomb</explosiveDamageType>
+					<explosiveRadius>3</explosiveRadius>
+					<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+					<preExplosionSpawnChance>0.03</preExplosionSpawnChance>
+					<preExplosionSpawnThingDef>RF_RubbleShardsRF_Ruby</preExplosionSpawnThingDef>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_BombardPylon_MagicBolt"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.BulletCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RF_BombardPylonTurret_Invisible</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.10</ShotSpread>
+			<SwayFactor>1.00</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.19</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>RF_BombardPylon_MagicBolt</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>45</range>
+			<ticksBetweenBurstShots>36</ticksBetweenBurstShots>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ===== Lance Pylon ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_LancePylon_MagicBolt"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<armorPenetrationBlunt>30</armorPenetrationBlunt>
+				<armorPenetrationSharp>6.5</armorPenetrationSharp>
+				<dropsCasings>false</dropsCasings>
+				<damageDef>RF_LancePylon_MagicBolt</damageDef>
+				<damageAmountBase>10</damageAmountBase>
+				<speed>55</speed>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_LancePylon_MagicBolt"]</xpath>
+		<value>
+			<thingClass>CombatExtended.BulletCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RF_LancePylonTurret_Invisible</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.10</ShotSpread>
+			<SwayFactor>1.00</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.19</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>RF_LancePylon_MagicBolt</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>50</range>
+			<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+			<burstShotCount>2</burstShotCount>
+			<soundCast>ChargeLance_Fire</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ===== Spray Pylon ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RF_SprayPylon_MagicBolt"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<armorPenetrationBlunt>20</armorPenetrationBlunt>
+				<armorPenetrationSharp>5</armorPenetrationSharp>
+				<dropsCasings>false</dropsCasings>
+				<damageDef>RF_SprayPylon_MagicBolt</damageDef>
+				<damageAmountBase>10</damageAmountBase>
+				<speed>60</speed>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RF_SprayPylon_MagicBolt"]</xpath>
+		<value>
+			<thingClass>CombatExtended.BulletCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RF_SprayPylonTurret_Invisible</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.10</ShotSpread>
+			<SwayFactor>1.00</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.19</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>RF_SprayPylon_MagicBolt</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>40</range>
+			<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+			<burstShotCount>6</burstShotCount>
+			<soundCast>ChargeLance_Fire</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimHammer40k -Dreadnought/Patches/RimHammer40k -Dreadnought/Apparel_Dreadnought.xml b/ModPatches/RimHammer40k -Dreadnought/Patches/RimHammer40k -Dreadnought/Apparel_Dreadnought.xml
new file mode 100644
index 0000000000..15700f4a81
--- /dev/null
+++ b/ModPatches/RimHammer40k -Dreadnought/Patches/RimHammer40k -Dreadnought/Apparel_Dreadnought.xml	
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Remove Vanilla Carry Capacity ========== -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/VFEPirates.WarcasketDef[
+			defName="Warcasket_Dreadnought"
+			]/modExtensions/li/carryingCapacity </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Dreadnought"]/statBases</xpath>
+		<value>
+			<Bulk>350</Bulk>
+			<WornBulk>40</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Dreadnought"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>75</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Dreadnought"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>187.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Dreadnought"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>450</CarryWeight>
+			<CarryBulk>300</CarryBulk>
+			<Suppressability>-100</Suppressability>
+		</value>
+	</Operation>
+
+	<!-- ========== Shoulders ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Dreadnought"]/statBases</xpath>
+		<value>
+			<Bulk>45</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Dreadnought"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>75</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Dreadnought"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>187.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Dreadnought"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>8</WornBulk>
+			<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Dreadnought"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Dreadnought"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>80</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Dreadnought"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>200</ArmorRating_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimNauts 2/Patches/RimNauts 2/ThingDefs_Items/SpaceSuit_CEpatch.xml b/ModPatches/RimNauts 2/Patches/RimNauts 2/ThingDefs_Items/SpaceSuit_CEpatch.xml
new file mode 100644
index 0000000000..1cf1b8031c
--- /dev/null
+++ b/ModPatches/RimNauts 2/Patches/RimNauts 2/ThingDefs_Items/SpaceSuit_CEpatch.xml	
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--  spacesuite armor -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RimNauts2_Apparel_SpaceSuit_Body"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>4</WornBulk>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RimNauts2_Apparel_SpaceSuit_Body"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RimNauts2_Apparel_SpaceSuit_Body"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<!--  spacesuit helmet -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RimNauts2_Apparel_SpaceSuit_Head"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RimNauts2_Apparel_SpaceSuit_Head"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>7.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RimNauts2_Apparel_SpaceSuit_Head"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="RimNauts2_Apparel_SpaceSuit_Head"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="RimNauts2_Apparel_SpaceSuit_Head"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+			<li Class="PatchOperationConditional">
+				<xpath>Defs/ThingDef[defName="RimNauts2_Apparel_SpaceSuit_Head"]/apparel/immuneToToxGasExposure</xpath>
+				<nomatch Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="RimNauts2_Apparel_SpaceSuit_Head"]/apparel</xpath>
+					<value>
+						<immuneToToxGasExposure>true</immuneToToxGasExposure>
+					</value>
+				</nomatch>
+			</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RimNauts2_Apparel_SpaceSuit_Head"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RimNauts2_Apparel_SpaceSuit_Head"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimSec-Security/Defs/RimSec-Security/Ammo/SRS Ammo.xml b/ModPatches/RimSec-Security/Defs/RimSec-Security/Ammo/SRS Ammo.xml
new file mode 100644
index 0000000000..955b8508f2
--- /dev/null
+++ b/ModPatches/RimSec-Security/Defs/RimSec-Security/Ammo/SRS Ammo.xml	
@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- ======== 6x24mm SRS ======== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_6x24mmSRS</defName>
+		<label>6x24mm Charged Bullet (DLG)</label>
+		<ammoTypes>
+			<Ammo_6x24mmCharged>Bullet_6x24mmSRS</Ammo_6x24mmCharged>
+			<Ammo_6x24mmCharged_AP>Bullet_6x24mmSRS_AP</Ammo_6x24mmCharged_AP>
+			<Ammo_6x24mmCharged_Ion>Bullet_6x24mmSRS_Ion</Ammo_6x24mmCharged_Ion>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_6x24mmSRS</defName>
+		<label>6x24mm Charged SRS bullet</label>
+		<graphicData>
+			<texPath>Things/laserbolt</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>151</speed>
+			<damageAmountBase>13</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>4</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>15</armorPenetrationSharp>
+			<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_6x24mmSRS_AP</defName>
+		<label>6x24mm Charged SRS bullet (Conc.)</label>
+		<graphicData>
+			<texPath>Things/laserbolt</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>151</speed>
+			<damageAmountBase>10</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>2</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>30</armorPenetrationSharp>
+			<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_6x24mmSRS_Ion</defName>
+		<label>6x24mm Charged SRS bullet (Ion)</label>
+		<graphicData>
+			<texPath>Things/laserbolt</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>151</speed>
+			<damageAmountBase>10</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>6</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>22.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
+			<empShieldBreakChance>0.2</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<!-- ======== 6x18mm SRS ======== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_6x18mmSRS</defName>
+		<label>6x18mm Charged Bullet (EHG)</label>
+		<ammoTypes>
+			<Ammo_6x18mmCharged>Bullet_6x18mmSRS</Ammo_6x18mmCharged>
+			<Ammo_6x18mmCharged_AP>Bullet_6x18mmSRS_AP</Ammo_6x18mmCharged_AP>
+			<Ammo_6x18mmCharged_Ion>Bullet_6x18mmSRS_Ion</Ammo_6x18mmCharged_Ion>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef ParentName="Base6x18mmChargedBullet">
+		<defName>Bullet_6x18mmSRS</defName>
+		<label>6x18mm Charged SRS bullet</label>
+		<graphicData>
+			<texPath>Things/purplelaserbolt</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>122</speed>
+			<damageAmountBase>10</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>3</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>12</armorPenetrationSharp>
+			<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base6x18mmChargedBullet">
+		<defName>Bullet_6x18mmSRS_AP</defName>
+		<label>6x18mm Charged SRS bullet (Conc.)</label>
+		<graphicData>
+			<texPath>Things/purplelaserbolt</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>122</speed>
+			<damageAmountBase>8</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>1</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>24</armorPenetrationSharp>
+			<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base6x18mmChargedBullet">
+		<defName>Bullet_6x18mmSRS_Ion</defName>
+		<label>6x18mm Charged SRS bullet (Ion)</label>
+		<graphicData>
+			<texPath>Things/purplelaserbolt</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>122</speed>
+			<damageAmountBase>8</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>5</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>18</armorPenetrationSharp>
+			<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
+			<empShieldBreakChance>1</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<!-- ======== 8x35mm SRS ======== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_8x35mmSRS</defName>
+		<label>8x35mm Charged Bullet (HLT)</label>
+		<ammoTypes>
+			<Ammo_8x35mmCharged>Bullet_8x35mmSRS</Ammo_8x35mmCharged>
+			<Ammo_8x35mmCharged_AP>Bullet_8x35mmSRS_AP</Ammo_8x35mmCharged_AP>
+			<Ammo_8x35mmCharged_Ion>Bullet_8x35mmSRS_Ion</Ammo_8x35mmCharged_Ion>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef ParentName="Base8x35mmChargedBullet">
+		<defName>Bullet_8x35mmSRS</defName>
+		<label>8x35mm Charged SRS bullet</label>
+		<graphicData>
+			<texPath>Things/Building/Turrets/HLT/HLT_projectile</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>19</damageAmountBase>
+			<speed>151</speed>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>6</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>15</armorPenetrationSharp>
+			<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base8x35mmChargedBullet">
+		<defName>Bullet_8x35mmSRS_AP</defName>
+		<label>8x35mm Charged SRS bullet (Conc.)</label>
+		<graphicData>
+			<texPath>Things/Building/Turrets/HLT/HLT_projectile</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>15</damageAmountBase>
+			<speed>151</speed>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>2</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>30</armorPenetrationSharp>
+			<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base8x35mmChargedBullet">
+		<defName>Bullet_8x35mmSRS_Ion</defName>
+		<label>8x35mm Charged SRS bullet (Ion)</label>
+		<graphicData>
+			<texPath>Things/Building/Turrets/HLT/HLT_projectile</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>15</damageAmountBase>
+			<speed>151</speed>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>9</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>22.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
+			<empShieldBreakChance>0.2</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/RimSec-Security/Patches/RimSec-Security/AlienBase.xml b/ModPatches/RimSec-Security/Patches/RimSec-Security/AlienBase.xml
new file mode 100644
index 0000000000..9219c8e05e
--- /dev/null
+++ b/ModPatches/RimSec-Security/Patches/RimSec-Security/AlienBase.xml
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Body Shape -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="RSPeacekeeperDefenderBase" or @Name="RSPeacekeeperEnforcerBase" or @Name="RSPeacekeeperSentinelBase"
+			]/modExtensions </xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Gizmos -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="RSPeacekeeperDefenderBase" or @Name="RSPeacekeeperEnforcerBase" or @Name="RSPeacekeeperSentinelBase"
+			]/comps </xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Defender Series-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="RSPeacekeeperDefenderBase"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1.2</MeleeCritChance>
+			<MeleeParryChance>1.2</MeleeParryChance>
+			<SmokeSensitivity>0</SmokeSensitivity>
+			<CarryBulk>60</CarryBulk>
+			<CarryWeight>60</CarryWeight>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="RSPeacekeeperDefenderBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="RSPeacekeeperDefenderBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>26</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="RSPeacekeeperDefenderBase"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.11</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.11</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Enforcer Series-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="RSPeacekeeperEnforcerBase"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1.2</MeleeDodgeChance>
+			<MeleeCritChance>1.3</MeleeCritChance>
+			<MeleeParryChance>1.3</MeleeParryChance>
+			<SmokeSensitivity>0</SmokeSensitivity>
+			<CarryBulk>60</CarryBulk>
+			<CarryWeight>60</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="RSPeacekeeperEnforcerBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="RSPeacekeeperEnforcerBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>34</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="RSPeacekeeperEnforcerBase"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.11</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.11</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Reduce health scale since they have adequate armor-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="RSPeacekeeperEnforcerBase"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>1.6</baseHealthScale>
+		</value>
+	</Operation>
+
+	<!--Sentinel Series-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="RSPeacekeeperSentinelBase"]/statBases</xpath>
+		<value>
+			<MeleeCritChance>1.6</MeleeCritChance>
+			<MeleeParryChance>1.6</MeleeParryChance>
+			<SmokeSensitivity>0</SmokeSensitivity>
+			<CarryBulk>60</CarryBulk>
+			<CarryWeight>60</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="RSPeacekeeperSentinelBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="RSPeacekeeperSentinelBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>42</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="RSPeacekeeperSentinelBase"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.42</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>24</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.42</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>24</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>3.52</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Reduce health scale since they have adequate armor-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="RSPeacekeeperSentinelBase"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>2.5</baseHealthScale>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimSec-Security/Patches/RimSec-Security/Bodies.xml b/ModPatches/RimSec-Security/Patches/RimSec-Security/Bodies.xml
new file mode 100644
index 0000000000..336c4e987d
--- /dev/null
+++ b/ModPatches/RimSec-Security/Patches/RimSec-Security/Bodies.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Add missing group nodes -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="RSPeacekeeperBody"]//*[
+			def="MechanicalShoulder" or
+			def="MechanicalArm" or
+			def="MechanicalHand"
+			]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<!-- Shoulder & Arm Groups -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RSPeacekeeperBody"]//*[customLabel="right shoulder"]/groups</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RSPeacekeeperBody"]//*[customLabel="left shoulder"]/groups</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RSPeacekeeperBody"]//*[customLabel="right arm"]/groups</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="RSPeacekeeperBody"]//*[customLabel="left arm"]/groups</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+
+	<!-- Natural Armor -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="RSPeacekeeperBody"]//*[
+			def="MechanicalThorax" or
+			def="MechanicalNeck" or
+			def="RSPeacekeeperHead" or
+			def="MechanicalShoulder" or
+			def="MechanicalArm" or
+			def="MechanicalHand" or
+			def="MechanicalFinger" or
+			def="MechanicalLeg" or
+			def="MechanicalFoot"
+			]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimSec-Security/Patches/RimSec-Security/Buildings.xml b/ModPatches/RimSec-Security/Patches/RimSec-Security/Buildings.xml
new file mode 100644
index 0000000000..1ec413c1e5
--- /dev/null
+++ b/ModPatches/RimSec-Security/Patches/RimSec-Security/Buildings.xml
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Light Laser Turret ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RSTurretLLTGun</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>2</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>0.65</SwayFactor>
+			<Bulk>13.70</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.70</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmSRS</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>62</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>15</burstShotCount>
+			<soundCast>RSLLTProjectileLaunch</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>150</magazineSize>
+			<reloadTime>6.0</reloadTime>
+			<ammoSet>AmmoSet_6x24mmSRS</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Heavy Laser Turret ========== -->
+
+	<!-- Replace the custom verb with the a common vanilla one, since custom verbs are not patchable -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RSTurretHLTGun"]/verbs/li[1]/verbClass</xpath>
+		<value>
+			<verbClass>Verb_Shoot</verbClass>
+		</value>
+	</Operation>
+
+	<!-- Replace the custom place worker with the vanilla one -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RSTurretHLTBase"]/placeWorkers/li[2]</xpath>
+		<value>
+			<li>PlaceWorker_ShowTurretRadius</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RSTurretHLTGun</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.8</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>0.95</SwayFactor>
+			<Bulk>40</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.90</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x35mmSRS</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>78</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>15</burstShotCount>
+			<soundCast>RSHLTProjectileLaunch</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>350</magazineSize>
+			<reloadTime>9.5</reloadTime>
+			<ammoSet>AmmoSet_8x35mmSRS</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>8</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== HAAC ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RSTurretHAACGun</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.95</RangedWeapon_Cooldown>
+			<SightsEfficiency>3.2</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>0.40</SwayFactor>
+			<Bulk>62</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.70</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12mmRailgun_Sabot</defaultProjectile>
+			<warmupTime>2.3</warmupTime>
+			<range>116</range>
+			<minRange>5</minRange>
+			<soundCast>RSHAACProjectileLaunch</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<muzzleFlashScale>18</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>9.5</reloadTime>
+			<ammoSet>AmmoSet_12mmRailgun</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Common to all Turrets ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RSTurretLLTBase" or @Name="RSTurretHLTBase" or @Name="RSTurretHAACBase"
+			]/thingClass </xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RSTurretLLTBase" or @Name="RSTurretHLTBase" or @Name="RSTurretHAACBase"
+			]/fillPercent </xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RSTurretLLT" or defName="RSTurretHLT" or defName="RSTurretHAAC"
+			]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RSTurretLLT" or defName="RSTurretHLT" or defName="RSTurretHAAC"
+			]/statBases </xpath>
+		<value>
+			<AimingAccuracy>1</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RSTurretLLT" or defName="RSTurretHLT" or defName="RSTurretHAAC"
+			]/statBases/ShootingAccuracyTurret </xpath>
+		<value>
+			<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimSec-Security/Patches/RimSec-Security/PawnKinds.xml b/ModPatches/RimSec-Security/Patches/RimSec-Security/PawnKinds.xml
new file mode 100644
index 0000000000..b36ca9151b
--- /dev/null
+++ b/ModPatches/RimSec-Security/Patches/RimSec-Security/PawnKinds.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ======= Ammo ======= -->
+
+	<!-- Defender Series -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			@Name="RSPeacekeeperDefenderPawnKindBase"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Enforcer Series -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			@Name="RSPeacekeeperEnforcerPawnKindBase"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>3</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Sentinel Series -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			@Name="RSPeacekeeperSentinelPawnKindBase"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>8</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ======= Combat Power ======= -->
+
+	<!-- Defender Series -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[
+			defName="RSPeacekeeperDefenderPawnKind" or
+			defName="RSPeacekeeperDefenderForestPawnKind" or
+			defName="RSPeacekeeperDefenderDesertPawnKind" or
+			defName="RSPeacekeeperDefenderWinterPawnKind"
+			]/combatPower </xpath>
+		<value>
+			<combatPower>180</combatPower>
+		</value>
+	</Operation>
+
+	<!-- Enforcer Series -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[
+			defName="RSPeacekeeperEnforcerPawnKind" or
+			defName="RSPeacekeeperEnforcerForestPawnKind" or
+			defName="RSPeacekeeperEnforcerDesertPawnKind" or
+			defName="RSPeacekeeperEnforcerWinterPawnKind"
+			]/combatPower </xpath>
+		<value>
+			<combatPower>225</combatPower>
+		</value>
+	</Operation>
+
+	<!-- Defender Series -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[
+			defName="RSPeacekeeperSentinelPawnKind" or
+			defName="RSPeacekeeperSentinelForestPawnKind" or
+			defName="RSPeacekeeperSentinelDesertPawnKind" or
+			defName="RSPeacekeeperSentinelWinterPawnKind"
+			]/combatPower </xpath>
+		<value>
+			<combatPower>400</combatPower>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimSec-Security/Patches/RimSec-Security/Traits.xml b/ModPatches/RimSec-Security/Patches/RimSec-Security/Traits.xml
new file mode 100644
index 0000000000..6ca59ac48c
--- /dev/null
+++ b/ModPatches/RimSec-Security/Patches/RimSec-Security/Traits.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Security Model -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="RSTraitSecurity"]/degreeDatas/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="RSTraitSecurity"]/degreeDatas/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Forest Model -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="RSTraitForest"]/degreeDatas/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+				<MeleeCritChance>0.2</MeleeCritChance>
+				<MeleeParryChance>0.1</MeleeParryChance>
+				<MoveSpeed>1</MoveSpeed>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<!-- Winter Model-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="RSTraitWinter"]/degreeDatas/li/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<AimingAccuracy>1.2</AimingAccuracy>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimSec-Security/Patches/RimSec-Security/WeaponDefs.xml b/ModPatches/RimSec-Security/Patches/RimSec-Security/WeaponDefs.xml
new file mode 100644
index 0000000000..441c3270a2
--- /dev/null
+++ b/ModPatches/RimSec-Security/Patches/RimSec-Security/WeaponDefs.xml
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RSWeaponDLG" or defName="RSWeaponEHG" or defName="RSWeaponSHAG"
+			]/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>
+
+	<!-- === DLG-20 === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RSWeaponDLG</defName>
+
+		<statBases>
+			<Mass>3.5</Mass>
+			<Bulk>6.2</Bulk>
+			<SwayFactor>1.04</SwayFactor>
+			<ShotSpread>0.09</ShotSpread>
+			<SightsEfficiency>1.2</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+
+		<Properties>
+			<recoilAmount>1.30</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmSRS</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_HeavySMG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_6x24mmSRS</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>RSDLG20</li>
+			<li>RSPeacekeeperGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === EHG-22 === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RSWeaponEHG</defName>
+
+		<statBases>
+			<WorkToMake>75500</WorkToMake>
+			<Mass>32.0</Mass>
+			<Bulk>28.0</Bulk>
+			<SwayFactor>1.35</SwayFactor>
+			<ShotSpread>0.10</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>150</Steel>
+			<Plasteel>15</Plasteel>
+			<Chemfuel>20</Chemfuel>
+			<ComponentIndustrial>10</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_6x18mmSRS</defaultProjectile>
+			<burstShotCount>50</burstShotCount>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<warmupTime>2.5</warmupTime>
+			<range>62</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilAmount>1.24</recoilAmount>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>500</magazineSize>
+			<reloadTime>9.2</reloadTime>
+			<ammoSet>AmmoSet_6x18mmSRS</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>20</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>RSEHG22</li>
+			<li>RSPeacekeeperGun</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- === SHAG-1 === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RSWeaponSHAG</defName>
+
+		<statBases>
+			<WorkToMake>80000</WorkToMake>
+			<Mass>48.0</Mass>
+			<Bulk>42.0</Bulk>
+			<SwayFactor>1.40</SwayFactor>
+			<ShotSpread>0.10</ShotSpread>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.66</RangedWeapon_Cooldown>
+		</statBases>
+
+		<costList>
+			<Steel>350</Steel>
+			<Plasteel>20</Plasteel>
+			<Chemfuel>20</Chemfuel>
+			<ComponentIndustrial>25</ComponentIndustrial>
+		</costList>
+
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_8mmRailgun_Sabot</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<warmupTime>1.5</warmupTime>
+			<range>90</range>
+			<soundCast>RSShot_Shag</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilAmount>1.75</recoilAmount>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>60</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_8mmRailgun</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>RSSHAG1</li>
+			<li>RSPeacekeeperGun</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimTraits - General Traits/Patches/RimTraits - General Traits/RT_General_Traits.xml b/ModPatches/RimTraits - General Traits/Patches/RimTraits - General Traits/RT_General_Traits.xml
new file mode 100644
index 0000000000..a38db989bf
--- /dev/null
+++ b/ModPatches/RimTraits - General Traits/Patches/RimTraits - General Traits/RT_General_Traits.xml	
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ======= General Traits ======= -->
+
+	<!-- ===== RT Trait: Nearsighted ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName = "RT_Nearsighted"]/degreeDatas/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ShootingAccuracyPawn>-0.4</ShootingAccuracyPawn>
+				<AimingDelayFactor>0.15</AimingDelayFactor>
+				<MeleeHitChance>1</MeleeHitChance>
+				<MeleeDodgeChance>0.10</MeleeDodgeChance>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<!-- ===== RT Trait: Farsighted ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName = "RT_Farsighted"]/degreeDatas/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ShootingAccuracyPawn>0.5</ShootingAccuracyPawn>
+				<AimingDelayFactor>-0.15</AimingDelayFactor>
+				<MeleeHitChance>-1</MeleeHitChance>
+				<MeleeDodgeChance>-0.10</MeleeDodgeChance>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<!-- ===== RT Trait: Athletic ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName = "RT_Athletic"]/degreeDatas/li/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.10</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- ===== RT Trait: Stiff ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName = "RT_Stiff"]/degreeDatas/li/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>-0.10</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- ===== RT Trait: Muscular ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName = "RT_Muscular"]/degreeDatas/li/statOffsets/CarryingCapacity</xpath>
+		<value>
+			<CarryWeight>5</CarryWeight>
+			<CarryBulk>5</CarryBulk>
+		</value>
+	</Operation>
+
+	<!-- ===== RT Trait: Frail ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName = "RT_Frail"]/degreeDatas/li/statOffsets/CarryingCapacity</xpath>
+		<value>
+			<CarryWeight>-3</CarryWeight>
+			<CarryBulk>-3</CarryBulk>
+		</value>
+	</Operation>
+
+	<!-- ======= General Traits Uncommon ======= -->
+
+	<!-- ===== RT Trait: Coordinated ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName = "RT_Coordinated"]/degreeDatas/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ShootingAccuracyPawn>0.5</ShootingAccuracyPawn>
+				<MeleeHitChance>1</MeleeHitChance>
+				<MeleeDodgeChance>0.10</MeleeDodgeChance>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<!-- ===== RT Trait: Clumsy ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName = "RT_Clumsy"]/degreeDatas/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ShootingAccuracyPawn>-0.4</ShootingAccuracyPawn>
+				<MeleeHitChance>-1</MeleeHitChance>
+				<MeleeDodgeChance>-0.10</MeleeDodgeChance>
+			</statOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimTraits - Medieval Talents/Patches/RimTraits - Medieval Talents/RT_Traits.xml b/ModPatches/RimTraits - Medieval Talents/Patches/RimTraits - Medieval Talents/RT_Traits.xml
new file mode 100644
index 0000000000..dc50a21262
--- /dev/null
+++ b/ModPatches/RimTraits - Medieval Talents/Patches/RimTraits - Medieval Talents/RT_Traits.xml	
@@ -0,0 +1,257 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Tier 1 -->
+	<!-- Talent Bowman -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="RT_TalentBowman"]/degreeDatas/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
+				<AimingDelayFactor>-0.1</AimingDelayFactor>
+				<MeleeHitChance>1</MeleeHitChance>
+				<MeleeCritChance>0.05</MeleeCritChance>
+				<MeleeParryChance>0.05</MeleeParryChance>
+				<MeleeDodgeChance>0.1</MeleeDodgeChance>
+				<RestRateMultiplier>0.05</RestRateMultiplier>
+				<MentalBreakThreshold>-0.10</MentalBreakThreshold>
+				<PainShockThreshold>0.10</PainShockThreshold>
+				<Suppressability>-0.10</Suppressability>
+				<ComfyTemperatureMax>5</ComfyTemperatureMax>
+				<ComfyTemperatureMin>-5</ComfyTemperatureMin>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<!-- Talent Swordsman -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="RT_TalentSwordsman"]/degreeDatas/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+				<AimingDelayFactor>-0.1</AimingDelayFactor>
+				<MeleeHitChance>2</MeleeHitChance>
+				<MeleeCritChance>0.10</MeleeCritChance>
+				<MeleeParryChance>0.10</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+				<RestRateMultiplier>0.05</RestRateMultiplier>
+				<MentalBreakThreshold>-0.10</MentalBreakThreshold>
+				<PainShockThreshold>0.10</PainShockThreshold>
+				<Suppressability>-0.10</Suppressability>
+				<ComfyTemperatureMax>5</ComfyTemperatureMax>
+				<ComfyTemperatureMin>-5</ComfyTemperatureMin>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<!-- Tier 2 -->
+	<!-- Talent Weapons Master -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="RT_TalentWeaponsMaster"]/degreeDatas/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
+				<AimingDelayFactor>-0.1</AimingDelayFactor>
+				<MeleeHitChance>3</MeleeHitChance>
+				<MeleeCritChance>0.15</MeleeCritChance>
+				<MeleeParryChance>0.15</MeleeParryChance>
+				<MeleeDodgeChance>0.3</MeleeDodgeChance>
+				<RestRateMultiplier>0.05</RestRateMultiplier>
+				<MentalBreakThreshold>-0.10</MentalBreakThreshold>
+				<PainShockThreshold>0.10</PainShockThreshold>
+				<Suppressability>-0.15</Suppressability>
+				<ComfyTemperatureMax>5</ComfyTemperatureMax>
+				<ComfyTemperatureMin>-5</ComfyTemperatureMin>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<!-- Talent Hunter -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="RT_TalentHunter"]/degreeDatas/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+				<AimingDelayFactor>-0.1</AimingDelayFactor>
+				<MeleeHitChance>2</MeleeHitChance>
+				<MeleeCritChance>0.10</MeleeCritChance>
+				<MeleeParryChance>0.10</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+				<MedicalTendQuality>0.05</MedicalTendQuality>
+				<RestRateMultiplier>0.1</RestRateMultiplier>
+				<MentalBreakThreshold>-0.10</MentalBreakThreshold>
+				<PainShockThreshold>0.10</PainShockThreshold>
+				<Suppressability>-0.15</Suppressability>
+				<ComfyTemperatureMax>5</ComfyTemperatureMax>
+				<ComfyTemperatureMin>-5</ComfyTemperatureMin>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<!-- Talent Fletcher -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="RT_TalentFletcher"]/degreeDatas/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
+				<AimingDelayFactor>-0.1</AimingDelayFactor>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+				<SmithingSpeed>0.1</SmithingSpeed>
+				<RestRateMultiplier>0.05</RestRateMultiplier>
+				<MentalBreakThreshold>-0.10</MentalBreakThreshold>
+				<PainShockThreshold>0.10</PainShockThreshold>
+				<Suppressability>-0.15</Suppressability>
+				<ComfyTemperatureMax>3</ComfyTemperatureMax>
+				<ComfyTemperatureMin>-3</ComfyTemperatureMin>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<!-- Tier 3 -->
+	<!-- Talent Adventurer -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="RT_TalentAdventurer"]/degreeDatas/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
+				<AimingDelayFactor>-0.15</AimingDelayFactor>
+				<MeleeHitChance>3</MeleeHitChance>
+				<MeleeCritChance>0.15</MeleeCritChance>
+				<MeleeParryChance>0.15</MeleeParryChance>
+				<MeleeDodgeChance>0.3</MeleeDodgeChance>
+				<MedicalTendQuality>0.10</MedicalTendQuality>
+				<CarryWeight>2</CarryWeight>
+				<CarryBulk>3</CarryBulk>
+				<RestRateMultiplier>0.15</RestRateMultiplier>
+				<PawnTrapSpringChance>0.2</PawnTrapSpringChance>
+				<MentalBreakThreshold>-0.15</MentalBreakThreshold>
+				<PainShockThreshold>0.10</PainShockThreshold>
+				<Suppressability>-0.15</Suppressability>
+				<ComfyTemperatureMax>5</ComfyTemperatureMax>
+				<ComfyTemperatureMin>-5</ComfyTemperatureMin>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<!-- Talent Architect -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="RT_TalentArchitect"]/degreeDatas/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ConstructionSpeed>0.15</ConstructionSpeed>
+				<FixBrokenDownBuildingSuccessChance>0.15</FixBrokenDownBuildingSuccessChance>
+				<MiningSpeed>0.15</MiningSpeed>
+				<MiningYield>0.15</MiningYield>
+				<SculptingSpeed>0.15</SculptingSpeed>
+				<MeleeDodgeChance>0.5</MeleeDodgeChance>
+				<CarryWeight>2</CarryWeight>
+				<CarryBulk>3</CarryBulk>
+				<MentalBreakThreshold>-0.10</MentalBreakThreshold>
+				<PainShockThreshold>0.10</PainShockThreshold>
+				<ComfyTemperatureMax>3</ComfyTemperatureMax>
+				<ComfyTemperatureMin>-3</ComfyTemperatureMin>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<!-- Tier 4 -->
+	<!-- Talent Scout -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="RT_TalentScout"]/degreeDatas/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
+				<AimingDelayFactor>-0.1</AimingDelayFactor>
+				<MeleeHitChance>3</MeleeHitChance>
+				<MeleeCritChance>0.15</MeleeCritChance>
+				<MeleeParryChance>0.15</MeleeParryChance>
+				<MeleeDodgeChance>0.3</MeleeDodgeChance>
+				<PlantHarvestYield>0.1</PlantHarvestYield>
+				<MedicalTendSpeed>0.10</MedicalTendSpeed>
+				<MedicalTendQuality>0.10</MedicalTendQuality>
+				<CarryWeight>-1</CarryWeight>
+				<CarryBulk>-2</CarryBulk>
+				<PawnTrapSpringChance>0.1</PawnTrapSpringChance>
+				<RestRateMultiplier>0.25</RestRateMultiplier>
+				<MentalBreakThreshold>-0.20</MentalBreakThreshold>
+				<PainShockThreshold>0.20</PainShockThreshold>
+				<Suppressability>-0.20</Suppressability>
+				<ComfyTemperatureMax>5</ComfyTemperatureMax>
+				<ComfyTemperatureMin>-5</ComfyTemperatureMin>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<!-- Tier 5 -->
+	<!-- Talent Hero -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="RT_TalentHero"]/degreeDatas/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ShootingAccuracyPawn>3</ShootingAccuracyPawn>
+				<AimingDelayFactor>-0.25</AimingDelayFactor>
+				<MeleeHitChance>6</MeleeHitChance>
+				<MeleeCritChance>0.30</MeleeCritChance>
+				<MeleeParryChance>0.30</MeleeParryChance>
+				<MeleeDodgeChance>0.6</MeleeDodgeChance>
+				<MedicalTendQuality>0.15</MedicalTendQuality>
+				<CarryWeight>5</CarryWeight>
+				<CarryBulk>5</CarryBulk>
+				<PawnTrapSpringChance>0.1</PawnTrapSpringChance>
+				<RestRateMultiplier>0.5</RestRateMultiplier>
+				<MentalBreakThreshold>-0.15</MentalBreakThreshold>
+				<PainShockThreshold>0.15</PainShockThreshold>
+				<Suppressability>-0.25</Suppressability>
+				<ComfyTemperatureMax>5</ComfyTemperatureMax>
+				<ComfyTemperatureMin>-5</ComfyTemperatureMin>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<!-- Talent Herald -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="RT_TalentHerald"]/degreeDatas/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ShootingAccuracyPawn>2</ShootingAccuracyPawn>
+				<AimingDelayFactor>-0.20</AimingDelayFactor>
+				<MeleeHitChance>4</MeleeHitChance>
+				<MeleeCritChance>0.25</MeleeCritChance>
+				<MeleeParryChance>0.25</MeleeParryChance>
+				<MeleeDodgeChance>0.5</MeleeDodgeChance>
+				<MedicalTendQuality>0.10</MedicalTendQuality>
+				<CarryWeight>4</CarryWeight>
+				<CarryBulk>4</CarryBulk>
+				<RestRateMultiplier>0.45</RestRateMultiplier>
+				<PawnTrapSpringChance>0.2</PawnTrapSpringChance>
+				<MentalBreakThreshold>-0.10</MentalBreakThreshold>
+				<PainShockThreshold>0.15</PainShockThreshold>
+				<Suppressability>-0.25</Suppressability>
+				<ComfyTemperatureMax>5</ComfyTemperatureMax>
+				<ComfyTemperatureMin>-5</ComfyTemperatureMin>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<!-- Any Tier -->
+	<!-- Replacing Carry Capacity to Carry Weight or Bulk Bonus -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="RT_TalentBuilder" or defName="RT_TalentMiner" or defName="RT_TalentTrader" or defName="RT_TalentHerbalist" or defName="RT_TalentJackOfAllTrades"]/degreeDatas/li/statOffsets/CarryingCapacity</xpath>
+		<value>
+			<CarryWeight>1</CarryWeight>
+			<CarryBulk>2</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/TraitDef[defName="RT_TalentGroundskeeper" or defName="RT_TalentEngineer"]/degreeDatas/li/statOffsets/CarryingCapacity</xpath>
+		<value>
+			<CarryWeight>2</CarryWeight>
+			<CarryBulk>3</CarryBulk>
+		</value>
+	</Operation>
+
+	<!-- Remove Movespeed Bonus -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/TraitDef[defName="RT_TalentPhysician" or defName="RT_TalentGroundskeeper" or defName="RT_TalentEngineer" or defName="RT_TalentCook" or defName="RT_TalentHerbalist" or defName="RT_TalentArmourer" or defName="RT_TalentVeterinarian" or defName="RT_TalentChef" or defName="RT_TalentSurgeon" or defName="RT_TalentPhilosopher" or defName="RT_TalentRecruiter" or defName="RT_TalentJackOfAllTrades"]/degreeDatas/li/statOffsets/MoveSpeed</xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Bodies_WMH-CE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Bodies_WMH-CE.xml
new file mode 100644
index 0000000000..6be06bfaf9
--- /dev/null
+++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Bodies_WMH-CE.xml	
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- SingleEyedHumanoid (Cyclops) -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="WMH_SingleEyedHumanoid"]//*[def="Torso" or def="Ribcage" or def="Sternum" or def="Pelvis" or def="Neck" or def="Head" or def="Skull" or def="Nose" or def="Jaw" or def="Shoulder" or def="Clavicle" or def="Arm" or def="Humerus" or def="Radius" or def="Hand" or def="Finger" or def="Waist" or def="Leg" or def="Femur" or def="Tibia" or def="Foot" or def="Toe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- JellyFish -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="WMH_JellyfishBody"]//*[def="WMH_JellyfishMainBody" or def="WMH_HydrogenSac" or def="AnimalJaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- WingedBird / Bird -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="WMH_Bird"]//*[def="Body" or def="Tail" or def="Neck" or def="Head" or def="Skull" or def="Beak" or def="Leg" or def="Foot"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="WMH_Bird"]//*[def="Body" or def="Tail" or def="Neck" or def="Head" or def="Skull" or def="Beak" or def="Leg" or def="Foot"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Then add natural armor -->
+		<xpath>Defs/BodyDef[defName="WMH_Bird"]//*[def="Body" or def="Tail" or def="Neck" or def="Head" or def="Skull" or def="Beak" or def="Leg" or def="Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- WingedReptile / Reptile (Literal copy-paste of the above lines except instead of Beak it's AnimalJaw) -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="WMH_Reptile"]//*[def="Body" or def="Tail" or def="Neck" or def="Head" or def="Skull" or def="AnimalJaw" or def="Leg" or def="Foot"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="WMH_Reptile"]//*[def="Body" or def="Tail" or def="Neck" or def="Head" or def="Skull" or def="AnimalJaw" or def="Leg" or def="Foot"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Then add natural armor -->
+		<xpath>Defs/BodyDef[defName="WMH_Reptile"]//*[def="Body" or def="Tail" or def="Neck" or def="Head" or def="Skull" or def="AnimalJaw" or def="Leg" or def="Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- WMH_RockHumanoid -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="WMH_RockHumanoid"]//*[def="Torso" or def="WMH_RockHead" or def="WMH_RockArm" or def="WMH_RockLeg"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="WMH_RockHumanoid"]//*[def="Torso" or def="WMH_RockHead" or def="WMH_RockArm" or def="WMH_RockLeg"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Then add natural armor -->
+		<xpath>Defs/BodyDef[defName="WMH_RockHumanoid"]//*[def="Torso" or def="WMH_RockHead" or def="WMH_RockArm" or def="WMH_RockLeg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Projectile_WH.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Projectile_WH.xml
new file mode 100644
index 0000000000..eb7ce14eb3
--- /dev/null
+++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Projectile_WH.xml	
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WMH_LeshyWave" or
+			defName="WMH_WyvernAcidSpit" or
+			defName="WMH_WispProjectile"
+			] </xpath>
+		<value>
+			<thingClass>CombatExtended.BulletCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="WMH_Rock"
+			]/thingClass </xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_LeshyWave"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>WMH_VeryToxicBite</damageDef>
+				<damageAmountBase>40</damageAmountBase>
+				<speed>28</speed>
+				<armorPenetrationSharp>10</armorPenetrationSharp>
+				<armorPenetrationBlunt>20.660</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_WyvernAcidSpit"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>WMH_AcidSpit</damageDef>
+				<damageAmountBase>40</damageAmountBase>
+				<speed>22</speed>
+				<armorPenetrationSharp>10</armorPenetrationSharp>
+				<armorPenetrationBlunt>1.660</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_WispProjectile"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>Flame</damageDef>
+				<damageAmountBase>6</damageAmountBase>
+				<speed>13</speed>
+				<armorPenetrationSharp>16</armorPenetrationSharp>
+				<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Rock"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<explosionRadius>1.5</explosionRadius>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+				<damageDef>Bomb</damageDef>
+				<damageAmountBase>40</damageAmountBase>
+				<soundExplode>MortarBomb_Explode</soundExplode>
+				<speed>13</speed>
+				<armorPenetrationSharp>5</armorPenetrationSharp>
+				<armorPenetrationBlunt>25</armorPenetrationBlunt>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</projectile>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_BasiliskCE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_BasiliskCE.xml
new file mode 100644
index 0000000000..801b3f34c1
--- /dev/null
+++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_BasiliskCE.xml	
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="WMH_Basilisk"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WMH_Basilisk"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.3</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Basilisk"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WMH_Basilisk"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>0.2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Basilisk"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>0.65</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Right claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>0.65</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>razor beak</label>
+					<capacities>
+						<li>WMH_VeryToxicBite</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>1.2</cooldownTime>
+					<armorPenetrationSharp>6</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<chanceFactor>0.9</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4.55</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>25</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="WMH_Basilisk"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="WMH_Basilisk"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WMH_Basilisk"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>3250</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_BearofleetCE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_BearofleetCE.xml
new file mode 100644
index 0000000000..e756da1e1d
--- /dev/null
+++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_BearofleetCE.xml	
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="WMH_Bearofleet"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WMH_Bearofleet"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			<MeleeCritChance>0.75</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Bearofleet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Bearofleet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Bearofleet"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fangs</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>50</power>
+					<cooldownTime>1.25</cooldownTime>
+					<armorPenetrationSharp>12</armorPenetrationSharp>
+					<armorPenetrationBlunt>24</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>tentacles</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>Arms</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="WMH_Bearofleet"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="WMH_Bearofleet"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WMH_Bearofleet"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>5250</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_ChortCE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_ChortCE.xml
new file mode 100644
index 0000000000..b018e70c23
--- /dev/null
+++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_ChortCE.xml	
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="WMH_Chort"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WMH_Chort"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.08</MeleeDodgeChance>
+			<MeleeCritChance>0.5</MeleeCritChance>
+			<MeleeParryChance>0.4</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Chort"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>45</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>6</armorPenetrationSharp>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Chewy</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>1.45</cooldownTime>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.6</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_CyclopsCE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_CyclopsCE.xml
new file mode 100644
index 0000000000..a36a27a0ba
--- /dev/null
+++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_CyclopsCE.xml	
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="WMH_Cyclops"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WMH_Cyclops"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.75</MeleeCritChance>
+			<MeleeParryChance>0.3</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Cyclops"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Cyclops"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Cyclops"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>54</power>
+					<cooldownTime>2.9</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>30</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>54</power>
+					<cooldownTime>2.9</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>30</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>15.55</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="WMH_Cyclops"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="WMH_Cyclops"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WMH_Cyclops"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>7250</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>300</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_DjinCE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_DjinCE.xml
new file mode 100644
index 0000000000..b53a67b28b
--- /dev/null
+++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_DjinCE.xml	
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="WMH_Djinn"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WMH_Djinn"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.25</AimingAccuracy>
+			<ShootingAccuracyPawn>0.25</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.8</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Djinn"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>pseudopod</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.88</cooldownTime>
+					<linkedBodyPartsGroup>WMH_Pseudopods</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_EkimmaraCE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_EkimmaraCE.xml
new file mode 100644
index 0000000000..0bf8615dd4
--- /dev/null
+++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_EkimmaraCE.xml	
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="WMH_Ekimmara"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WMH_Ekimmara"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.33</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Ekimmara"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3.75</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Ekimmara"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Ekimmara"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>0.5</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Right claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>0.5</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>fangs</label>
+					<capacities>
+						<li>WMH_EkimmaraBite</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetrationSharp>5</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>3</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4.55</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="WMH_Ekimmara"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="WMH_Ekimmara"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WMH_Ekimmara"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>2750</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>500</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_FiendCE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_FiendCE.xml
new file mode 100644
index 0000000000..3117ecc273
--- /dev/null
+++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_FiendCE.xml	
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="WMH_Fiend"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WMH_Fiend"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>0.55</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Fiend"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>38</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
+					<armorPenetrationBlunt>25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>38</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
+					<armorPenetrationBlunt>25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>1.88</cooldownTime>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.6</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Horn</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_FlederCE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_FlederCE.xml
new file mode 100644
index 0000000000..9153a60c6d
--- /dev/null
+++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_FlederCE.xml	
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="WMH_Fleder"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WMH_Fleder"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.35</MeleeDodgeChance>
+			<MeleeCritChance>0.36</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Fleder"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Fleder"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Fleder"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.02</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>6</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Right claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.02</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>6</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>fangs</label>
+					<capacities>
+						<li>WMH_FlederBite</li>
+					</capacities>
+					<power>33</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>3</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4.55</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="WMH_Fleder"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="WMH_Fleder"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WMH_Fleder"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>2800</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>400</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_FoglerCE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_FoglerCE.xml
new file mode 100644
index 0000000000..a38c8e11dd
--- /dev/null
+++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_FoglerCE.xml	
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="WMH_Fogler"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WMH_Fogler"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.35</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Fogler"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2.4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Fogler"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.65</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Fogler"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>WMH_InfectedClaws</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>WMH_InfectedClaws</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="WMH_Fogler"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="WMH_Fogler"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WMH_Fogler"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>2000</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_GhoulCE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_GhoulCE.xml
new file mode 100644
index 0000000000..90578725cb
--- /dev/null
+++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_GhoulCE.xml	
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="WMH_Ghoul"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WMH_Ghoul"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.12</MeleeDodgeChance>
+			<MeleeCritChance>0.03</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Ghoul"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>WMH_InfectedClaws</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>WMH_InfectedClaws</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationSharp>0.35</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_GolemCE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_GolemCE.xml
new file mode 100644
index 0000000000..ea8d6b5e70
--- /dev/null
+++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_GolemCE.xml	
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="WMH_Golem"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WMH_Golem"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.85</MeleeCritChance>
+			<MeleeParryChance>0.6</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Golem"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Golem"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Golem"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claws</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>44</power>
+					<cooldownTime>2.33</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>50</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Right claws</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>44</power>
+					<cooldownTime>2.33</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>50</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>30</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="WMH_Golem"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="WMH_Golem"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WMH_Golem"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>4500</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.25</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_HymCE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_HymCE.xml
new file mode 100644
index 0000000000..59fdab68f6
--- /dev/null
+++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_HymCE.xml	
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="WMH_Hym"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WMH_Hym"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Hym"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>WMH_HymPunch</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>2.2</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+					<armorPenetrationBlunt>60</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>WMH_HymPunch</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>2.2</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+					<armorPenetrationBlunt>60</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>WMH_HymPunch</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+					<armorPenetrationBlunt>60</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_KikimoreCE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_KikimoreCE.xml
new file mode 100644
index 0000000000..1cdd10a2ab
--- /dev/null
+++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_KikimoreCE.xml	
@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="WMH_InsectoidMonsterBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<useStatic>false</useStatic>
+						<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+						<parts>
+							<li>InsectLeg</li>
+						</parts>
+					</li>
+					<li>
+						<useStatic>false</useStatic>
+						<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
+						<parts>
+							<li>InsectLeg</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="WMH_InsectoidMonsterBase"]/statBases</xpath>
+		<value>
+			<PartialArmorBody>0</PartialArmorBody>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="WMAux_KikimoreWorker"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WMAux_KikimoreWorker"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.07</MeleeCritChance>
+			<MeleeParryChance>0.08</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMAux_KikimoreWorker"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.1</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.65</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="WMAux_KikimoreWorker"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="WMAux_KikimoreWorker"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WMAux_KikimoreWorker"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>375</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="WMAux_KikimoreWarrior"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WMAux_KikimoreWarrior"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMAux_KikimoreWarrior"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMAux_KikimoreWarrior"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMAux_KikimoreWarrior"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.55</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="WMAux_KikimoreWorker"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="WMAux_KikimoreWorker"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WMAux_KikimoreWorker"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>750</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="WMH_KikimoreQueen"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WMH_KikimoreQueen"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.01</MeleeDodgeChance>
+			<MeleeCritChance>0.65</MeleeCritChance>
+			<MeleeParryChance>0.3</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_KikimoreQueen"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_KikimoreQueen"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_KikimoreQueen"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>WMH_ParalysingBite</li>
+					</capacities>
+					<power>50</power>
+					<cooldownTime>2.33</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>12</armorPenetrationSharp>
+					<armorPenetrationBlunt>36</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="WMH_KikimoreQueen"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="WMH_KikimoreQueen"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WMH_KikimoreQueen"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>2500</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_LeshyCE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_LeshyCE.xml
new file mode 100644
index 0000000000..6fb0c95fb3
--- /dev/null
+++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_LeshyCE.xml	
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="WMH_Leshy"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WMH_Leshy"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.22</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Leshy"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Horn</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>0.85</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Horn</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.85</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Left Claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>0.85</cooldownTime>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Right Claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1</cooldownTime>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>2.67</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>6.55</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_NekkerCE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_NekkerCE.xml
new file mode 100644
index 0000000000..93a5a61bc1
--- /dev/null
+++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_NekkerCE.xml	
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="WMH_Nekker"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WMH_Nekker"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.22</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Nekker"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_WerewolfCE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_WerewolfCE.xml
new file mode 100644
index 0000000000..c28693a23e
--- /dev/null
+++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_WerewolfCE.xml	
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="WMH_Werewolf"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WMH_Werewolf"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.45</MeleeDodgeChance>
+			<MeleeCritChance>0.3</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Werewolf"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Werewolf"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.65</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Werewolf"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>0.9</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>0.9</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>WMH_WerewolfBite</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.85</cooldownTime>
+					<armorPenetrationSharp>6</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="WMH_Werewolf"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="WMH_Werewolf"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WMH_Werewolf"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>2375</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>300</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_WraithCE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_WraithCE.xml
new file mode 100644
index 0000000000..8ab6f72759
--- /dev/null
+++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_WraithCE.xml	
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="WMH_Wraith"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WMH_Wraith"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.45</MeleeDodgeChance>
+			<MeleeCritChance>0.2</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Wraith"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>3.2</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>20</armorPenetrationSharp>
+					<armorPenetrationBlunt>40</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>3.2</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>20</armorPenetrationSharp>
+					<armorPenetrationBlunt>40</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_WyvernCE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_WyvernCE.xml
new file mode 100644
index 0000000000..e33d546fcb
--- /dev/null
+++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_WyvernCE.xml	
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="WMH_Wyvern"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WMH_Wyvern"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.33</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Wyvern"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>24</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Wyvern"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Wyvern"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Right claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>razor beak</label>
+					<capacities>
+						<li>WMH_VeryToxicBite</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>1.33</cooldownTime>
+					<armorPenetrationSharp>6</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.8</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>tail</label>
+					<capacities>
+						<li>WMH_VeryToxicBite</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+					<chanceFactor>0.75</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>25</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="WMH_Wyvern"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="WMH_Wyvern"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WMH_Wyvern"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>4500</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/WH_ProjectileShoot.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/WH_ProjectileShoot.xml
new file mode 100644
index 0000000000..08f3316413
--- /dev/null
+++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/WH_ProjectileShoot.xml	
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Wyvern -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Wyvern"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>WMH_WyvernAcidSpit</defaultProjectile>
+					<warmupTime>1.5</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>1</minRange>
+					<range>30</range>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<commonality>0.5</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Leshy -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Leshy"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>WMH_LeshyWave</defaultProjectile>
+					<warmupTime>1</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>2</minRange>
+					<range>50</range>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<commonality>1</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Wisp -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Djinn"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>WMH_WispProjectile</defaultProjectile>
+					<warmupTime>0.3</warmupTime>
+					<burstShotCount>50</burstShotCount>
+					<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+					<minRange>1</minRange>
+					<range>36</range>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<commonality>1</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Cyclop -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WMH_Cyclops"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>WMH_Rock</defaultProjectile>
+					<warmupTime>3</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>6</minRange>
+					<range>32</range>
+					<soundCast>WMH_RockThrow</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+					<commonality>0.4</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimcraft Allied Races/Patches/Rimcraft Allied Races/AlienRace_AllHumanoids.xml b/ModPatches/Rimcraft Allied Races/Patches/Rimcraft Allied Races/AlienRace_AllHumanoids.xml
new file mode 100644
index 0000000000..1604d33f0b
--- /dev/null
+++ b/ModPatches/Rimcraft Allied Races/Patches/Rimcraft Allied Races/AlienRace_AllHumanoids.xml	
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_MagharOrc"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.8</MeleeDodgeChance>
+			<MeleeCritChance>1.33</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>0.66</Suppressability>
+			<SmokeSensitivity>1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_Nightborne"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>1.33</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>1</Suppressability>
+			<SmokeSensitivity>1</SmokeSensitivity>
+			<NightVisionEfficiency>0.66</NightVisionEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_VoidElf"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>1.33</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>1</Suppressability>
+			<SmokeSensitivity>1</SmokeSensitivity>
+			<NightVisionEfficiency>0.33</NightVisionEfficiency>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimcraft Allied Races/Patches/Rimcraft Allied Races/RimCraft_AlliedHumanoidLeather_CE.xml b/ModPatches/Rimcraft Allied Races/Patches/Rimcraft Allied Races/RimCraft_AlliedHumanoidLeather_CE.xml
new file mode 100644
index 0000000000..ba167e25c5
--- /dev/null
+++ b/ModPatches/Rimcraft Allied Races/Patches/Rimcraft Allied Races/RimCraft_AlliedHumanoidLeather_CE.xml	
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--========== Humanoid leather ============-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_WoWMagharOrc"
+			or defName="Leather_WoWNightborne"
+			or defName="Leather_WoWVoidElf"]/statBases/StuffPower_Armor_Sharp </xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.05</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/Animal_base_CE.xml b/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/Animal_base_CE.xml
new file mode 100644
index 0000000000..a3a27ff7c4
--- /dev/null
+++ b/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/Animal_base_CE.xml	
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="BaseWoWDirewolf"
+			or @Name="BaseWoWElekk"
+			or @Name="BaseWoWForsakenhorse"
+			or @Name="BaseWoWHorse"
+			or @Name="BaseWoWKodo"
+			or @Name="BaseWoWNightsaber"
+			or @Name="BaseWoWRam"] </xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="BaseWoWDragonhawk"
+			or @Name="BaseWoWFairyDragon"
+			or @Name="BaseWoWHawkstrider"
+			or @Name="BaseWoWMurloc"
+			or @Name="BaseWoWRaptor"] </xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/CE_BigBirb.xml b/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/CE_BigBirb.xml
new file mode 100644
index 0000000000..7b2ff7a94f
--- /dev/null
+++ b/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/CE_BigBirb.xml	
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoW_Animal_Hawkstrider" or defName="WoW_Animal_Voidstrider"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>0.07</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoW_Animal_Hawkstrider" or defName="WoW_Animal_Voidstrider"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Cut</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.28</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+						<li>Stab</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.68</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>13</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/CE_Gargantuan.xml b/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/CE_Gargantuan.xml
new file mode 100644
index 0000000000..875543e89b
--- /dev/null
+++ b/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/CE_Gargantuan.xml	
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === Kodo === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoW_Animal_Kodo"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.62</MeleeCritChance>
+			<MeleeParryChance>0.3</MeleeParryChance>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+			<ArmorRating_Sharp>0.4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoW_Animal_Kodo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>2.47</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>32.96</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>2.47</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>32.960</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>51</power>
+					<cooldownTime>3</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationBlunt>48</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Elekk === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoW_Animal_Elekk"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.90</MeleeCritChance>
+			<MeleeParryChance>0.33</MeleeParryChance>
+			<ArmorRating_Blunt>4</ArmorRating_Blunt>
+			<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoW_Animal_Elekk"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tusk</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>58</power>
+					<cooldownTime>3.37</cooldownTime>
+					<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>46.226</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>2.47</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>28.96</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>2.47</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>28.960</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>56</power>
+					<cooldownTime>3.69</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>40</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/CE_Horses.xml b/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/CE_Horses.xml
new file mode 100644
index 0000000000..ec3c54bf05
--- /dev/null
+++ b/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/CE_Horses.xml	
@@ -0,0 +1,311 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoW_Animal_Horse" or defName="WoW_Animal_Forsakenhorse"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.11</MeleeDodgeChance>
+			<MeleeCritChance>0.30</MeleeCritChance>
+			<MeleeParryChance>0.19</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoW_Animal_EpicForsakenhorse"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.36</MeleeCritChance>
+			<MeleeParryChance>0.19</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoW_Animal_Unicorn"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			<MeleeCritChance>0.30</MeleeCritChance>
+			<MeleeParryChance>0.3</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoW_Animal_Talbuk"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.11</MeleeDodgeChance>
+			<MeleeCritChance>0.4</MeleeCritChance>
+			<MeleeParryChance>0.3</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoW_Animal_Horse" or defName="WoW_Animal_Forsakenhorse"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.97</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoW_Animal_EpicForsakenhorse"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.47</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5.538</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.47</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5.538</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.43</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5.538</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.43</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5.538</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.97</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoW_Animal_Unicorn"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horny</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>1.46</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.97</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoW_Animal_Talbuk"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4.538</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4.538</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4.538</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4.538</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.97</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>horny</label>
+					<capacities>
+						<li>Poke</li>
+						<li>Blunt</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.46</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/CE_Hound.xml b/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/CE_Hound.xml
new file mode 100644
index 0000000000..e533041077
--- /dev/null
+++ b/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/CE_Hound.xml	
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoW_Animal_Mastiff"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.18</MeleeCritChance>
+			<MeleeParryChance>0.08</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoW_Animal_Mastiff"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.044</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/CE_Murloc.xml b/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/CE_Murloc.xml
new file mode 100644
index 0000000000..51bb079329
--- /dev/null
+++ b/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/CE_Murloc.xml	
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoW_Animal_Murloc"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.33</MeleeDodgeChance>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>0.6</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoW_Animal_Murloc"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.24</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>25</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.24</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/CE_Ram.xml b/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/CE_Ram.xml
new file mode 100644
index 0000000000..5452cb0ce4
--- /dev/null
+++ b/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/CE_Ram.xml	
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoW_Animal_Ram"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.38</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoW_Animal_Ram"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Poke</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.64</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/CE_Raptor.xml b/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/CE_Raptor.xml
new file mode 100644
index 0000000000..d397a5a382
--- /dev/null
+++ b/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/CE_Raptor.xml	
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoW_Animal_Raptor"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			<MeleeCritChance>0.24</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoW_Animal_Raptor"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.12</cooldownTime>
+					<linkedBodyPartsGroup>FootClawAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.64</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.12</cooldownTime>
+					<linkedBodyPartsGroup>FootClawAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.64</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>6.65</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/CE_Sabercat.xml b/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/CE_Sabercat.xml
new file mode 100644
index 0000000000..44618bc298
--- /dev/null
+++ b/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/CE_Sabercat.xml	
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoW_Animal_Frostsaber" or defName="WoW_Animal_Nightsaber" or defName="WoW_Animal_Manasaber"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.34</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoW_Animal_Frostsaber" or defName="WoW_Animal_Nightsaber" or defName="WoW_Animal_Manasaber"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>0.95</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.743</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>0.95</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.743</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+						<li>Stab</li>
+					</capacities>
+					<power>33</power>
+					<cooldownTime>1.7</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>3.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>10.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5.423</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/CE_Wolves.xml b/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/CE_Wolves.xml
new file mode 100644
index 0000000000..fb77b6471f
--- /dev/null
+++ b/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/CE_Wolves.xml	
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoW_Animal_Direwolf" or defName="WoW_Animal_Frostwolf"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.34</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoW_Animal_Direwolf" or defName="WoW_Animal_Frostwolf"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.66</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.023</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.66</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.023</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+						<li>Stab</li>
+					</capacities>
+					<power>33</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>3.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>12.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5.423</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/CE_wowDragons.xml b/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/CE_wowDragons.xml
new file mode 100644
index 0000000000..fdbc415c65
--- /dev/null
+++ b/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/CE_wowDragons.xml	
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoW_Animal_Dragonhawk"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.66</MeleeDodgeChance>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.27</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoW_Animal_Dragonhawk"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>beak</label>
+					<capacities>
+						<li>Bite</li>
+						<li>Stab</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoW_Animal_FairyDragon"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			<MeleeCritChance>0.16</MeleeCritChance>
+			<MeleeParryChance>0.3</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoW_Animal_FairyDragon"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>beak</label>
+					<capacities>
+						<li>Bite</li>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/RimCraft_Leather_CE.xml b/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/RimCraft_Leather_CE.xml
new file mode 100644
index 0000000000..0d3637e71c
--- /dev/null
+++ b/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/RimCraft_Leather_CE.xml	
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--========== Unicum leather ============-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_WoWUnicorn"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.05</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<!--========== Forsaken zorse leathers ============-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_WoWForsakenhorse"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.03</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_WoWFairyDragon"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.08</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_WoWFairyDragon"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.052</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimcraft Factions/Patches/Rimcraft Factions/Patch_PawnKinds_Wow.xml b/ModPatches/Rimcraft Factions/Patches/Rimcraft Factions/Patch_PawnKinds_Wow.xml
new file mode 100644
index 0000000000..165b246c02
--- /dev/null
+++ b/ModPatches/Rimcraft Factions/Patches/Rimcraft Factions/Patch_PawnKinds_Wow.xml	
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Archer -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="WoW_BloodElf_Guardian"
+			or defName="WoW_BloodElf_Farstrider"
+			or defName="WoW_Draenei_Peacekeeper"
+			or defName="WoW_Draenei_Vindictator"
+			or defName="WoW_Dwarf_Guard"
+			or defName="WoW_Dwarf_Mountaineer"
+			or defName="WoW_Dwarf_Officer"
+			or defName="WoW_Forsaken_Plaguebringer"
+			or defName="WoW_Forsaken_DarkrangerNE"
+			or defName="WoW_Forsaken_DarkrangerHE"
+			or defName="WoW_Gnome_Engineer"
+			or defName="WoW_Gnome_Tinker"
+			or defName="WoW_Goblin_Tinker"
+			or defName="WoW_HighElf_Scout"
+			or defName="WoW_HighElf_Ranger"
+			or defName="WoW_Human_Private"
+			or defName="WoW_Human_Sergeant"
+			or defName="WoW_Human_Marshal"
+			or defName="WoW_NightElf_Archer"
+			or defName="WoW_Human_Sergeant"
+			or defName="WoW_Human_Marshal"
+			or defName="WoW_NightElf_Archer"
+			or defName="WoW_NightElf_Hunter"
+			or defName="WoW_NightElf_Watcher"
+			or defName="WoW_Troll_ThroatSlicer"
+			or defName="WoW_Troll_HeadHunter"] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>20</min>
+					<max>40</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>20</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Warrior shield -->
+	<!--<li Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FR_MinotaurTribes_Fighter" or defName="FR_MinotaurTribes_Warrior"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>100</min>
+					<max>200</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.75</shieldChance>
+			</li>
+		</value>
+	</li>-->
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimcraft Metals/Patches/Rimcraft Metals/WOW_Metals_CE.xml b/ModPatches/Rimcraft Metals/Patches/Rimcraft Metals/WOW_Metals_CE.xml
new file mode 100644
index 0000000000..bc30715edb
--- /dev/null
+++ b/ModPatches/Rimcraft Metals/Patches/Rimcraft Metals/WOW_Metals_CE.xml	
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Add Bulk and thingCategories -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="WoW_MetalBase"]/statBases</xpath>
+		<value>
+			<Bulk>0.04</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="WoW_thorium" or
+			defName="WoW_darkiron" or
+			defName="WoW_mithril" or
+			defName="WoW_adamantite" or
+			defName="WoW_hardened_adamantite" or
+			defName="WoW_truesilver"
+			]/stuffProps/categories </xpath>
+		<value>
+			<li>Metallic_Weapon</li>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<!-- Thorium -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoW_thorium"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.75</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoW_thorium"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>2.6</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoW_thorium"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.1</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoW_thorium"]/statBases/BluntDamageMultiplier</xpath>
+		<value>
+			<BluntDamageMultiplier>1.1</BluntDamageMultiplier>
+		</value>
+	</Operation>
+
+	<!-- Dark Iron -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoW_darkiron"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.75</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoW_darkiron"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>2.6</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoW_darkiron"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.3</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="WoW_darkiron"]/statBases/SharpDamageMultiplier</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoW_darkiron"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>1.2</MeleePenetrationFactor>
+		</value>
+	</Operation>
+
+	<!-- Mithril -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoW_mithril"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.2</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoW_mithril"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>1.9</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoW_mithril"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.08</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="WoW_mithril"]/statBases/SharpDamageMultiplier</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoW_mithril"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>0.7</Mass>
+			<MeleePenetrationFactor>1.1</MeleePenetrationFactor>
+			<MeleeWeapon_CooldownMultiplier>0.9</MeleeWeapon_CooldownMultiplier>
+		</value>
+	</Operation>
+
+	<!-- Adamantite -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoW_adamantite"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.6</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoW_adamantite"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>2.75</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoW_adamantite"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.1</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="WoW_adamantite"]/statBases/SharpDamageMultiplier</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="WoW_adamantite"]/statBases/BluntDamageMultiplier</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoW_adamantite"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>1.5</MeleePenetrationFactor>
+		</value>
+	</Operation>
+
+	<!-- Hardened Adamantite -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoW_hardened_adamantite"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>2.5</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoW_hardened_adamantite"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>4</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoW_hardened_adamantite"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.12</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="WoW_hardened_adamantite"]/statBases/SharpDamageMultiplier</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="WoW_hardened_adamantite"]/statBases/BluntDamageMultiplier</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoW_hardened_adamantite"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>2</MeleePenetrationFactor>
+		</value>
+	</Operation>
+
+	<!-- True Silvah -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoW_truesilver"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.18</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoW_truesilver"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>1.68</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoW_truesilver"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.03</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoW_truesilver"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>1.07</MeleePenetrationFactor>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimcraft Scenario/Patches/Rimcraft Scenario/Scenarios_Patch_Wow _Allies.xml b/ModPatches/Rimcraft Scenario/Patches/Rimcraft Scenario/Scenarios_Patch_Wow _Allies.xml
new file mode 100644
index 0000000000..9b1fc5e77c
--- /dev/null
+++ b/ModPatches/Rimcraft Scenario/Patches/Rimcraft Scenario/Scenarios_Patch_Wow _Allies.xml	
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>[Ry]Rimcraft Allied Races</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!-- === Add ammo to scenario === -->
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ScenarioDef[defName="NightborneScenario"]/scenario/parts</xpath>
+
+					<value>
+						<li Class="ScenPart_StartingThing_Defined">
+							<def>StartingThing_Defined</def>
+							<thingDef>Ammo_Arrow_Steel</thingDef>
+							<count>120</count>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimcraft Scenario/Patches/Rimcraft Scenario/Scenarios_Patch_Wow.xml b/ModPatches/Rimcraft Scenario/Patches/Rimcraft Scenario/Scenarios_Patch_Wow.xml
new file mode 100644
index 0000000000..48c6a7ba47
--- /dev/null
+++ b/ModPatches/Rimcraft Scenario/Patches/Rimcraft Scenario/Scenarios_Patch_Wow.xml	
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Add ammo to scenario === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="AllianceScenario"
+			or defName="BloodElfScenario"
+			or defName="DraeneiScenario"
+			or defName="ForsakenScenario"
+			or defName="HighElfScenario"
+			or defName="HordeScenario"
+			or defName="DwarfScenario"
+			or defName="NightElfScenario"
+			or defName="TrollScenario"]/scenario/parts </xpath>
+
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_Arrow_Steel</thingDef>
+				<count>120</count>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimcraft Weaponry/Defs/Rimcraft Weaponry/Ammo_WOW.xml b/ModPatches/Rimcraft Weaponry/Defs/Rimcraft Weaponry/Ammo_WOW.xml
new file mode 100644
index 0000000000..4fb5d698e2
--- /dev/null
+++ b/ModPatches/Rimcraft Weaponry/Defs/Rimcraft Weaponry/Ammo_WOW.xml	
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- Ammoset -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_GreatArrowWOW</defName>
+		<label>great arrows</label>
+		<ammoTypes>
+			<Ammo_GreatArrow_Stone>Projectile_GreatArrowWOW_Stone</Ammo_GreatArrow_Stone>
+			<Ammo_GreatArrow_Steel>Projectile_GreatArrowWOW_Steel</Ammo_GreatArrow_Steel>
+			<Ammo_GreatArrow_Plasteel>Projectile_GreatArrowWOW_Plasteel</Ammo_GreatArrow_Plasteel>
+			<Ammo_GreatArrow_Venom>Projectile_GreatArrowWOW_Venom</Ammo_GreatArrow_Venom>
+			<Ammo_GreatArrow_Flame>Projectile_GreatArrowWOW_Flame</Ammo_GreatArrow_Flame>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- Projectiles -->
+	<ThingDef ParentName="BaseGreatArrowProjectile">
+		<defName>Projectile_GreatArrowWOW_Stone</defName>
+		<label>great arrow (stone)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Stone</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>33</speed>
+			<damageAmountBase>28</damageAmountBase>
+			<armorPenetrationBlunt>14.98</armorPenetrationBlunt>
+			<armorPenetrationSharp>4</armorPenetrationSharp>
+			<preExplosionSpawnChance>0.1</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>Ammo_GreatArrow_Stone</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseGreatArrowProjectile">
+		<defName>Projectile_GreatArrowWOW_Steel</defName>
+		<label>great arrow (steel)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>36</speed>
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationBlunt>21.06</armorPenetrationBlunt>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+			<preExplosionSpawnChance>0.3</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>Ammo_GreatArrow_Steel</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseGreatArrowProjectile">
+		<defName>Projectile_GreatArrowWOW_Plasteel</defName>
+		<label>great arrow (plasteel)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Plasteel</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>37</speed>
+			<damageAmountBase>15</damageAmountBase>
+			<armorPenetrationBlunt>19.26</armorPenetrationBlunt>
+			<armorPenetrationSharp>12</armorPenetrationSharp>
+			<preExplosionSpawnChance>0.375</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>Ammo_GreatArrow_Plasteel</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseGreatArrowProjectile">
+		<defName>Projectile_GreatArrowWOW_Venom</defName>
+		<label>great arrow (venom)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Venom</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>36</speed>
+			<damageDef>Arrow</damageDef>
+			<damageAmountBase>14</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>ArrowVenom</def>
+					<amount>6</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationBlunt>21.06</armorPenetrationBlunt>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+			<preExplosionSpawnChance>0.3</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>Ammo_GreatArrow_Steel</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseGreatArrowProjectile">
+		<defName>Projectile_GreatArrowWOW_Flame</defName>
+		<label>great arrow (flame)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Flame</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>36</speed>
+			<damageDef>Arrow</damageDef>
+			<damageAmountBase>6</damageAmountBase>
+			<armorPenetrationBlunt>10.54</armorPenetrationBlunt>
+			<armorPenetrationSharp>4</armorPenetrationSharp>
+			<secondaryDamage>
+				<li>
+					<def>Flame</def>
+					<amount>1</amount>
+					<chance>0.33</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Rimcraft Weaponry/Patches/Rimcraft Weaponry/Patch_WOW_Ranged.xml b/ModPatches/Rimcraft Weaponry/Patches/Rimcraft Weaponry/Patch_WOW_Ranged.xml
new file mode 100644
index 0000000000..7bcfc50dbd
--- /dev/null
+++ b/ModPatches/Rimcraft Weaponry/Patches/Rimcraft Weaponry/Patch_WOW_Ranged.xml	
@@ -0,0 +1,287 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWR_NightElf_RecurveBow"
+			or defName="WoWR_BloodElf_Bow"
+			or defName="WoWR_Alliance_Longbow"
+			or defName="WoWR_BloodElf_HawkBow"
+			or defName="WoWR_HighElf_Longbow"
+			or defName="WoWR_HighElf_RecurveBow"
+			or defName="WoWR_Forsaken_DarkBow"]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWR_Draenei__Crossbow"
+			or defName="WoWR_Draenei_Longbow"]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>WoWR_Alliance_Longbow</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.8</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>6.00</Bulk>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_GreatArrow_Stone</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>32</range>
+			<soundCast>Bow_Large</soundCast>
+		</Properties>
+		<AmmoUser>
+			<ammoSet>AmmoSet_GreatArrow</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_Bow</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>WoWR_NightElf_RecurveBow</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.8</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>4.00</Bulk>
+			<RangedWeapon_Cooldown>0.8</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_StreamlinedArrow_Stone</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>26</range>
+			<soundCast>Bow_Recurve</soundCast>
+		</Properties>
+		<AmmoUser>
+			<ammoSet>AmmoSet_StreamlinedArrow</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_Bow</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>WoWR_BloodElf_Bow</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.8</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>4.00</Bulk>
+			<RangedWeapon_Cooldown>0.8</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_StreamlinedArrow_Stone</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>26</range>
+			<soundCast>Bow_Recurve</soundCast>
+		</Properties>
+		<AmmoUser>
+			<ammoSet>AmmoSet_StreamlinedArrow</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_Bow</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>WoWR_BloodElf_HawkBow</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.8</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>4.00</Bulk>
+			<RangedWeapon_Cooldown>0.8</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_StreamlinedArrow_Stone</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>26</range>
+			<soundCast>Bow_Recurve</soundCast>
+		</Properties>
+		<AmmoUser>
+			<ammoSet>AmmoSet_StreamlinedArrow</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_Bow</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>WoWR_HighElf_Longbow</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.8</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>6.00</Bulk>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_GreatArrow_Stone</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>32</range>
+			<soundCast>Bow_Large</soundCast>
+		</Properties>
+		<AmmoUser>
+			<ammoSet>AmmoSet_GreatArrow</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_Bow</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>WoWR_HighElf_RecurveBow</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.8</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>4.00</Bulk>
+			<RangedWeapon_Cooldown>0.8</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_StreamlinedArrow_Stone</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>26</range>
+			<soundCast>Bow_Recurve</soundCast>
+		</Properties>
+		<AmmoUser>
+			<ammoSet>AmmoSet_StreamlinedArrow</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_Bow</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>WoWR_Forsaken_DarkBow</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.8</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>4.00</Bulk>
+			<RangedWeapon_Cooldown>0.8</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_StreamlinedArrow_Stone</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>26</range>
+			<soundCast>Bow_Recurve</soundCast>
+		</Properties>
+		<AmmoUser>
+			<ammoSet>AmmoSet_StreamlinedArrow</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_Bow</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>WoWR_Draenei__Crossbow</defName>
+		<statBases>
+			<Bulk>6</Bulk>
+			<SwayFactor>1.2</SwayFactor>
+			<ShotSpread>0.4</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Projectile_CrossbowBolt_Steel</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>28</range>
+			<soundCast>Bow_Large</soundCast>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>WoWR_Draenei_Longbow</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.8</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>6.00</Bulk>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_GreatArrow_Stone</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>32</range>
+			<soundCast>Bow_Large</soundCast>
+		</Properties>
+		<AmmoUser>
+			<ammoSet>AmmoSet_GreatArrow</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_Bow</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimcraft Weaponry/Patches/Rimcraft Weaponry/WOW_AAWeaponsBase_CE.xml b/ModPatches/Rimcraft Weaponry/Patches/Rimcraft Weaponry/WOW_AAWeaponsBase_CE.xml
new file mode 100644
index 0000000000..d62221df44
--- /dev/null
+++ b/ModPatches/Rimcraft Weaponry/Patches/Rimcraft Weaponry/WOW_AAWeaponsBase_CE.xml	
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="WoWM_Alliance_Halberd"
+			or defName="WoWM_Alliance_Polearm"
+			or defName="WoWM_Alliance_BattleHammer"
+			or defName="WoWM_Alliance_Claymore"
+			or defName="WoWM_Bloodelf_Ranseur"
+			or defName="WoWM_Bloodelf_Glaive"
+			or defName="WoWM_Bloodelf_GreatSword"
+			or defName="WoWM_Draenei_Mace"
+			or defName="WoWM_Draenei_Hammer"
+			or defName="WoWM_Draenei_Claymore"
+			or defName="WoWM_Draenei_GreatHammer"
+			or defName="WoWM_Forsaken_Halberd"
+			or defName="WoWM_Forsaken_Greatsword"
+			or defName="WoWM_HighElf_Warhammer"
+			or defName="WoWM_HighElf_Glaive"
+			or defName="WoWM_HighElf_Greatsword"
+			or defName="WoWM_Horde_Maul"
+			or defName="WoWM_Horde_GreatSpear"
+			or defName="WoWM_Horde_Greataxe"
+			or defName="WoWM_NightElf_Mooncleaver"
+			or defName="WoWM_NightElf_Halberd"
+			or defName="WoWM_Horde_Maul"
+			or defName="WoWM_Horde_Maul"]/equippedStatOffsets </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WoW_AllianceT1_BaseWeapon"
+			or @Name="WoW_NightElfT1_BaseWeapon"
+			or @Name="WoW_HighElfT1_BaseWeapon"
+			or @Name="WoW_DraeneiT1_BaseWeapon"
+			or @Name="WoW_HordeT1_BaseWeapon"
+			or @Name="WoW_BloodElfT1_BaseWeapon"
+			or @Name="WoW_ForsakenT1_BaseWeapon"]/recipeMaker/skillRequirements </xpath>
+		<value>
+			<skillRequirements>
+				<Crafting>6</Crafting>
+			</skillRequirements>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="WoW_AllianceT2_BaseWeapon"
+			or @Name="WoW_NightElfT2_BaseWeapon"
+			or @Name="WoW_HighElfT2_BaseWeapon"
+			or @Name="WoW_DraeneiT2_BaseWeapon"
+			or @Name="WoW_HordeT2_BaseWeapon"
+			or @Name="WoW_BloodElfT2_BaseWeapon"
+			or @Name="WoW_ForsakenT2_BaseWeapon"]/recipeMaker/skillRequirements </xpath>
+		<value>
+			<skillRequirements>
+				<Crafting>10</Crafting>
+			</skillRequirements>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimcraft Weaponry/Patches/Rimcraft Weaponry/WOW_Alliance_CE.xml b/ModPatches/Rimcraft Weaponry/Patches/Rimcraft Weaponry/WOW_Alliance_CE.xml
new file mode 100644
index 0000000000..39832580d9
--- /dev/null
+++ b/ModPatches/Rimcraft Weaponry/Patches/Rimcraft Weaponry/WOW_Alliance_CE.xml	
@@ -0,0 +1,437 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- You can find the spreadsheet here https://drive.google.com/open?id=1JZAjvzealI189OofkxwUCif3yA4-u6yP3DilsmIEQJA -->
+
+	<!-- Fencing -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_Alliance_BastardSword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.37</cooldownTime>
+					<armorPenetrationBlunt>0.35</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.37</cooldownTime>
+					<armorPenetrationBlunt>0.56</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.8</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>1.21</cooldownTime>
+					<armorPenetrationBlunt>1.512</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.64</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Alliance_BastardSword"]/statBases</xpath>
+		<value>
+			<Bulk>4.5</Bulk>
+			<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_Alliance_BastardSword"]/statBases/Mass</xpath>
+		<value>
+			<Mass>1</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Alliance_BastardSword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.36</MeleeCritChance>
+				<MeleeParryChance>0.4</MeleeParryChance>
+				<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Alliance_BastardSword"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Nobz sword ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_Alliance_LongSword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.69</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.56</cooldownTime>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.6</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.43</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>2.592</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.58</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Alliance_LongSword"]/statBases</xpath>
+		<value>
+			<Bulk>7</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Alliance_LongSword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.63</MeleeCritChance>
+				<MeleeParryChance>0.75</MeleeParryChance>
+				<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Greatboy -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_Alliance_Greatsword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.99</cooldownTime>
+					<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.88</cooldownTime>
+					<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.8</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>1.88</cooldownTime>
+					<armorPenetrationBlunt>3.088</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.0</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Alliance_Greatsword"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>0.64</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Alliance_Greatsword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.4</MeleeCritChance>
+				<MeleeParryChance>0.64</MeleeParryChance>
+				<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Claymore -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_Alliance_Claymore"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.99</cooldownTime>
+					<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>32</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>48</power>
+					<cooldownTime>2.2</cooldownTime>
+					<armorPenetrationBlunt>4.2</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.33</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Alliance_Claymore"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>0.64</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Alliance_Claymore"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.23</MeleeCritChance>
+				<MeleeParryChance>0.64</MeleeParryChance>
+				<MeleeDodgeChance>0.44</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Halberd -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_Alliance_Halberd"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.35</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.78</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.39</cooldownTime>
+					<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.65</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.96</cooldownTime>
+					<armorPenetrationBlunt>5.488</armorPenetrationBlunt>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Alliance_Halberd"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>1.28</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Alliance_Halberd"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.24</MeleeCritChance>
+				<MeleeParryChance>1.08</MeleeParryChance>
+				<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Polearm -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_Alliance_Polearm"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.11</cooldownTime>
+					<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.64</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.0</cooldownTime>
+					<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.9</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Alliance_Polearm"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Alliance_Polearm"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.17</MeleeCritChance>
+				<MeleeParryChance>1.18</MeleeParryChance>
+				<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Definitely a warhammer -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_Alliance_BattleHammer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.87</cooldownTime>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>2.18</cooldownTime>
+					<armorPenetrationBlunt>12.76</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Alliance_BattleHammer"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>0.33</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Alliance_BattleHammer"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>2.4</MeleeCritChance>
+				<MeleeParryChance>0.3</MeleeParryChance>
+				<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimcraft Weaponry/Patches/Rimcraft Weaponry/WOW_BluddElves_CE.xml b/ModPatches/Rimcraft Weaponry/Patches/Rimcraft Weaponry/WOW_BluddElves_CE.xml
new file mode 100644
index 0000000000..862e8ed47e
--- /dev/null
+++ b/ModPatches/Rimcraft Weaponry/Patches/Rimcraft Weaponry/WOW_BluddElves_CE.xml	
@@ -0,0 +1,308 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- You can find the spreadsheet here https://drive.google.com/open?id=1JZAjvzealI189OofkxwUCif3yA4-u6yP3DilsmIEQJA -->
+
+	<!-- T1 sword -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_Bloodelf_Warblade"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.37</cooldownTime>
+					<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.23</cooldownTime>
+					<armorPenetrationBlunt>0.56</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.8</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>1.18</cooldownTime>
+					<armorPenetrationBlunt>1.512</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.64</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Bloodelf_Warblade"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_Bloodelf_Warblade"]/statBases/Mass</xpath>
+		<value>
+			<Mass>1</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Bloodelf_Warblade"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.33</MeleeCritChance>
+				<MeleeParryChance>0.4</MeleeParryChance>
+				<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Bloodelf_Warblade"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!--T3 Greatboy -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_Bloodelf_GreatSword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.99</cooldownTime>
+					<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.8</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>1.37</cooldownTime>
+					<armorPenetrationBlunt>2.488</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.0</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Bloodelf_GreatSword"]/statBases</xpath>
+		<value>
+			<Bulk>9</Bulk>
+			<MeleeCounterParryBonus>0.64</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Bloodelf_GreatSword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.48</MeleeCritChance>
+				<MeleeParryChance>0.64</MeleeParryChance>
+				<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Ranseur -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_Bloodelf_Ranseur"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.35</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.78</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.3</cooldownTime>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Bloodelf_Ranseur"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Bloodelf_Ranseur"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.17</MeleeCritChance>
+				<MeleeParryChance>1.18</MeleeParryChance>
+				<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Polearm -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_Bloodelf_Glaive"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>1.08</cooldownTime>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.78</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.18</cooldownTime>
+					<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.6</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Bloodelf_Glaive"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Bloodelf_Glaive"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.17</MeleeCritChance>
+				<MeleeParryChance>1.45</MeleeParryChance>
+				<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!--T1 Mace-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_Bloodelf_Warmace"]/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>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.64</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>5.025</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Bloodelf_Warmace"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<MeleeCounterParryBonus>0.33</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Bloodelf_Warmace"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.33</MeleeCritChance>
+				<MeleeParryChance>0.33</MeleeParryChance>
+				<MeleeDodgeChance>0.33</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Bloodelf_Warmace"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimcraft Weaponry/Patches/Rimcraft Weaponry/WOW_Draenei_CE - Copy.xml b/ModPatches/Rimcraft Weaponry/Patches/Rimcraft Weaponry/WOW_Draenei_CE - Copy.xml
new file mode 100644
index 0000000000..9cbaa4b108
--- /dev/null
+++ b/ModPatches/Rimcraft Weaponry/Patches/Rimcraft Weaponry/WOW_Draenei_CE - Copy.xml	
@@ -0,0 +1,277 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--T1 Mace-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_Draenei_Gavel"]/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>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.08</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>6.45</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Draenei_Gavel"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Draenei_Gavel"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.56</MeleeCritChance>
+				<MeleeParryChance>0.24</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Draenei_Gavel"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!--T2 Mace-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_Draenei_Mace"]/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>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>7.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Draenei_Mace"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.3</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Draenei_Mace"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.66</MeleeCritChance>
+				<MeleeParryChance>0.33</MeleeParryChance>
+				<MeleeDodgeChance>0.33</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Draenei_Mace"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- Definitely a T2 warhammer -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_Draenei_Hammer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.87</cooldownTime>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>2.36</cooldownTime>
+					<armorPenetrationBlunt>15.76</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Draenei_Hammer"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>0.33</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Draenei_Hammer"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>2.8</MeleeCritChance>
+				<MeleeParryChance>0.24</MeleeParryChance>
+				<MeleeDodgeChance>0.33</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Definitely a T3 warhammer -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_Draenei_GreatHammer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.87</cooldownTime>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>34</power>
+					<cooldownTime>2.78</cooldownTime>
+					<armorPenetrationBlunt>20.76</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Draenei_GreatHammer"]/statBases</xpath>
+		<value>
+			<Bulk>9</Bulk>
+			<MeleeCounterParryBonus>0.3</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Draenei_GreatHammer"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>2.8</MeleeCritChance>
+				<MeleeParryChance>0.24</MeleeParryChance>
+				<MeleeDodgeChance>0.33</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!--T3 Claymore -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_Draenei_Claymore"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.99</cooldownTime>
+					<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>31</power>
+					<cooldownTime>1.99</cooldownTime>
+					<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>48</power>
+					<cooldownTime>2.4</cooldownTime>
+					<armorPenetrationBlunt>5.488</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.6</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Draenei_Claymore"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>0.54</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Draenei_Claymore"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.33</MeleeCritChance>
+				<MeleeParryChance>0.64</MeleeParryChance>
+				<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimcraft Weaponry/Patches/Rimcraft Weaponry/WOW_Forsaken_CE.xml b/ModPatches/Rimcraft Weaponry/Patches/Rimcraft Weaponry/WOW_Forsaken_CE.xml
new file mode 100644
index 0000000000..6f212e5fb9
--- /dev/null
+++ b/ModPatches/Rimcraft Weaponry/Patches/Rimcraft Weaponry/WOW_Forsaken_CE.xml	
@@ -0,0 +1,409 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- You can find the spreadsheet here https://drive.google.com/open?id=1JZAjvzealI189OofkxwUCif3yA4-u6yP3DilsmIEQJA -->
+	<!-- T1 Meat cleaver -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_Forsaken_Cleaver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.37</cooldownTime>
+					<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.36</cooldownTime>
+					<armorPenetrationBlunt>1.812</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.56</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Forsaken_Cleaver"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<MeleeCounterParryBonus>0.3</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_Forsaken_Cleaver"]/statBases/Mass</xpath>
+		<value>
+			<Mass>1</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Forsaken_Cleaver"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.27</MeleeCritChance>
+				<MeleeParryChance>0.35</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Forsaken_Cleaver"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- T1 drik -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_Forsaken_Dirk"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.37</cooldownTime>
+					<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.18</cooldownTime>
+					<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.54</armorPenetrationSharp>
+					<chanceFactor>0.25</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.08</cooldownTime>
+					<armorPenetrationBlunt>1.012</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.36</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Forsaken_Dirk"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_Forsaken_Dirk"]/statBases/Mass</xpath>
+		<value>
+			<Mass>0.7</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Forsaken_Dirk"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.29</MeleeCritChance>
+				<MeleeParryChance>0.35</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Forsaken_Dirk"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- ========== T2 Sword ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_Forsaken_Blade"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.69</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.69</cooldownTime>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.25</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>31</power>
+					<cooldownTime>1.44</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>3.392</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.55</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Forsaken_Blade"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Forsaken_Blade"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.63</MeleeCritChance>
+				<MeleeParryChance>0.75</MeleeParryChance>
+				<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- T3 Greatsword -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_Forsaken_Greatsword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.99</cooldownTime>
+					<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>34</power>
+					<cooldownTime>1.99</cooldownTime>
+					<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>48</power>
+					<cooldownTime>2.4</cooldownTime>
+					<armorPenetrationBlunt>5.488</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.2</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Forsaken_Greatsword"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>0.64</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Forsaken_Greatsword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.24</MeleeCritChance>
+				<MeleeParryChance>0.64</MeleeParryChance>
+				<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- T2 Halberd -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_Forsaken_Halberd"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.35</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.78</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.39</cooldownTime>
+					<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.65</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.96</cooldownTime>
+					<armorPenetrationBlunt>5.488</armorPenetrationBlunt>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Forsaken_Halberd"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>1.28</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Forsaken_Halberd"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.24</MeleeCritChance>
+				<MeleeParryChance>1.08</MeleeParryChance>
+				<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- T2 blade -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_Forsaken_CrescentBlade"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.99</cooldownTime>
+					<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>1.39</cooldownTime>
+					<armorPenetrationBlunt>1.05</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.18</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2.4</cooldownTime>
+					<armorPenetrationBlunt>2.488</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.44</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Forsaken_CrescentBlade"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>0.44</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Forsaken_CrescentBlade"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.24</MeleeCritChance>
+				<MeleeParryChance>0.4</MeleeParryChance>
+				<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Forsaken_CrescentBlade"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimcraft Weaponry/Patches/Rimcraft Weaponry/WOW_HiElves_CE.xml b/ModPatches/Rimcraft Weaponry/Patches/Rimcraft Weaponry/WOW_HiElves_CE.xml
new file mode 100644
index 0000000000..65086c40f6
--- /dev/null
+++ b/ModPatches/Rimcraft Weaponry/Patches/Rimcraft Weaponry/WOW_HiElves_CE.xml	
@@ -0,0 +1,338 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- You can find the spreadsheet here https://drive.google.com/open?id=1JZAjvzealI189OofkxwUCif3yA4-u6yP3DilsmIEQJA -->
+
+	<!-- T1 Daggah -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_HighElf_Dagger"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.0</cooldownTime>
+					<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.08</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.32</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.62</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_HighElf_Dagger"]/statBases</xpath>
+		<value>
+			<Bulk>1.5</Bulk>
+			<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_HighElf_Dagger"]/statBases/Mass</xpath>
+		<value>
+			<Mass>0.5</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_HighElf_Dagger"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.66</MeleeCritChance>
+				<MeleeParryChance>0.33</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_HighElf_Dagger"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- T2 saber -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_HighElf_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>Cut</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>1.37</cooldownTime>
+					<armorPenetrationBlunt>0.925</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.43</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.34</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.556</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.58</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_HighElf_Sabre"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_HighElf_Sabre"]/statBases/Mass</xpath>
+		<value>
+			<Mass>1</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_HighElf_Sabre"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.33</MeleeCritChance>
+				<MeleeParryChance>0.4</MeleeParryChance>
+				<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_HighElf_Sabre"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!--T3 Greatboy -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_HighElf_Greatsword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.99</cooldownTime>
+					<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>1.64</cooldownTime>
+					<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.8</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>2.0</cooldownTime>
+					<armorPenetrationBlunt>5.488</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.2</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_HighElf_Greatsword"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>0.64</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_HighElf_Greatsword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.24</MeleeCritChance>
+				<MeleeParryChance>0.64</MeleeParryChance>
+				<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- T2 polearm -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_HighElf_Glaive"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.35</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.78</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.39</cooldownTime>
+					<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.65</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.96</cooldownTime>
+					<armorPenetrationBlunt>5.488</armorPenetrationBlunt>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_HighElf_Glaive"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>1.28</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_HighElf_Glaive"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.24</MeleeCritChance>
+				<MeleeParryChance>1.08</MeleeParryChance>
+				<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- T2 warhammer -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_HighElf_Warhammer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.87</cooldownTime>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>2.18</cooldownTime>
+					<armorPenetrationBlunt>12.76</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_HighElf_Warhammer"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_HighElf_Warhammer"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>2.4</MeleeCritChance>
+				<MeleeParryChance>0.24</MeleeParryChance>
+				<MeleeDodgeChance>0.33</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimcraft Weaponry/Patches/Rimcraft Weaponry/WOW_Horde_CE.xml b/ModPatches/Rimcraft Weaponry/Patches/Rimcraft Weaponry/WOW_Horde_CE.xml
new file mode 100644
index 0000000000..7fd1b9f26b
--- /dev/null
+++ b/ModPatches/Rimcraft Weaponry/Patches/Rimcraft Weaponry/WOW_Horde_CE.xml	
@@ -0,0 +1,297 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- You can find the spreadsheet here https://drive.google.com/open?id=1JZAjvzealI189OofkxwUCif3yA4-u6yP3DilsmIEQJA -->
+	<!-- T1 Cleaver -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_Horde_WarCleaver"]/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>18</power>
+					<cooldownTime>1.44</cooldownTime>
+					<armorPenetrationBlunt>0.725</armorPenetrationBlunt>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.34</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>2.056</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Horde_WarCleaver"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Horde_WarCleaver"]</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="WoWM_Horde_WarCleaver"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+	<!-- T1 Gladius -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_Horde_Gladius"]/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.58</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.34</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.956</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.46</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Horde_Gladius"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Horde_Gladius"]</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="WoWM_Horde_Gladius"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- T3 Greataxe -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_Horde_Greataxe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.99</cooldownTime>
+					<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>51</power>
+					<cooldownTime>2.44</cooldownTime>
+					<armorPenetrationBlunt>6.488</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.6</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Horde_Greataxe"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Horde_Greataxe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.33</MeleeCritChance>
+				<MeleeParryChance>0.44</MeleeParryChance>
+				<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- T2 Spear -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_Horde_GreatSpear"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.35</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.78</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>1.56</cooldownTime>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Horde_GreatSpear"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>0.8</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Horde_GreatSpear"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.12</MeleeCritChance>
+				<MeleeParryChance>1.18</MeleeParryChance>
+				<MeleeDodgeChance>1.0</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- T2 Maul -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_Horde_Maul"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.87</cooldownTime>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>2.36</cooldownTime>
+					<armorPenetrationBlunt>14.76</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Horde_Maul"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_Horde_Maul"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>2.4</MeleeCritChance>
+				<MeleeParryChance>0.24</MeleeParryChance>
+				<MeleeDodgeChance>0.33</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimcraft Weaponry/Patches/Rimcraft Weaponry/WOW_NightElves_CE.xml b/ModPatches/Rimcraft Weaponry/Patches/Rimcraft Weaponry/WOW_NightElves_CE.xml
new file mode 100644
index 0000000000..ce270767d2
--- /dev/null
+++ b/ModPatches/Rimcraft Weaponry/Patches/Rimcraft Weaponry/WOW_NightElves_CE.xml	
@@ -0,0 +1,259 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- T1  -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_NightElf_Tomahawk"]/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>16</power>
+					<cooldownTime>1.34</cooldownTime>
+					<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.66</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.56</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.78</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_NightElf_Tomahawk"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_NightElf_Tomahawk"]</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="WoWM_NightElf_Tomahawk"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- T1 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_NightElf_Mooncleaver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.99</cooldownTime>
+					<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.23</cooldownTime>
+					<armorPenetrationBlunt>0.888</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.46</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.34</cooldownTime>
+					<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.64</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_NightElf_Mooncleaver"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>0.44</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_NightElf_Mooncleaver"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.27</MeleeCritChance>
+				<MeleeParryChance>0.44</MeleeParryChance>
+				<MeleeDodgeChance>0.33</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_NightElf_Mooncleaver"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- T2 Spear -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_NightElf_Moonglaive"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.18</cooldownTime>
+					<armorPenetrationBlunt>1.68</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.68</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.18</cooldownTime>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.6</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_NightElf_Moonglaive"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_NightElf_Moonglaive"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.08</MeleeCritChance>
+				<MeleeParryChance>0.65</MeleeParryChance>
+				<MeleeDodgeChance>1.0</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- T2 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoWM_NightElf_Halberd"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.35</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.78</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.39</cooldownTime>
+					<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.65</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.96</cooldownTime>
+					<armorPenetrationBlunt>5.488</armorPenetrationBlunt>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_NightElf_Halberd"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>1.28</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoWM_NightElf_Halberd"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.24</MeleeCritChance>
+				<MeleeParryChance>1.08</MeleeParryChance>
+				<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimcraft/Patches/Rimcraft/AlienRace_AllHumanoids.xml b/ModPatches/Rimcraft/Patches/Rimcraft/AlienRace_AllHumanoids.xml
new file mode 100644
index 0000000000..e876d6d372
--- /dev/null
+++ b/ModPatches/Rimcraft/Patches/Rimcraft/AlienRace_AllHumanoids.xml
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_BloodElf"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>1.33</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>1</Suppressability>
+			<SmokeSensitivity>1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_Draenei"]/statBases</xpath>
+		<value>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>1</Suppressability>
+			<SmokeSensitivity>1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_Draenei"]/race/baseBodySize</xpath>
+		<value>
+			<baseBodySize>1.24</baseBodySize>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_Dwarf"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.75</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>0.8</Suppressability>
+			<SmokeSensitivity>1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_Forsaken"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>0.1</Suppressability>
+			<SmokeSensitivity>0.2</SmokeSensitivity>
+			<NightVisionEfficiency>0.5</NightVisionEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_ForsakenHighElf" or defName="WoW_ForsakenNightElf"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>1.33</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>0.2</Suppressability>
+			<SmokeSensitivity>0.1</SmokeSensitivity>
+			<NightVisionEfficiency>0.5</NightVisionEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_Gnome"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>1.5</MeleeDodgeChance>
+			<MeleeCritChance>0.8</MeleeCritChance>
+			<MeleeParryChance>0.8</MeleeParryChance>
+			<Suppressability>1</Suppressability>
+			<SmokeSensitivity>1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_Goblin"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>1.33</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>1</Suppressability>
+			<SmokeSensitivity>1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_HighElf"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>1.33</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>1</Suppressability>
+			<SmokeSensitivity>1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_Human"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4.6</MoveSpeed>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>1</Suppressability>
+			<SmokeSensitivity>1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_NightElf"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>1.33</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>1</Suppressability>
+			<SmokeSensitivity>1</SmokeSensitivity>
+			<NightVisionEfficiency>0.66</NightVisionEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_Orc"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.8</MeleeDodgeChance>
+			<MeleeCritChance>1.33</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>0.66</Suppressability>
+			<SmokeSensitivity>1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_Skeleton"]/statBases</xpath>
+		<value>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>0</Suppressability>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_Skeleton"]/statBases/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>0.5</ShootingAccuracyPawn>
+			<AimingAccuracy>0.5</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_Tauren"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.75</MeleeDodgeChance>
+			<MeleeCritChance>1.5</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>0.66</Suppressability>
+			<SmokeSensitivity>1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_Troll"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>1</Suppressability>
+			<SmokeSensitivity>1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_Worgen"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>1.25</MeleeDodgeChance>
+			<MeleeCritChance>1.5</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>0.5</Suppressability>
+			<SmokeSensitivity>1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_Worgen"]/statBases/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>0.75</ShootingAccuracyPawn>
+			<AimingAccuracy>0.75</AimingAccuracy>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimcraft/Patches/Rimcraft/Base_Race_CE.xml b/ModPatches/Rimcraft/Patches/Rimcraft/Base_Race_CE.xml
new file mode 100644
index 0000000000..b86fabb5e0
--- /dev/null
+++ b/ModPatches/Rimcraft/Patches/Rimcraft/Base_Race_CE.xml
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="WoW_Race_Base"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="WoW_Race_Base"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="WoW_Draenei_Base"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.825</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="WoW_Orc_Base"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.47</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.47</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>4.89</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.225</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="WoW_Troll_Base"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.33</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.33</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.825</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_BloodElf"
+			or defName="WoW_Draenei"
+			or defName="WoW_Dwarf"
+			or defName="WoW_Forsaken"
+			or defName="WoW_ForsakenHighElf"
+			or defName="WoW_ForsakenNightElf"
+			or defName="WoW_Gnome"
+			or defName="WoW_Goblin"
+			or defName="WoW_HighElf"
+			or defName="WoW_Human"
+			or defName="WoW_NightElf"
+			or defName="WoW_Orc"
+			or defName="WoW_Skeleton"
+			or defName="WoW_Tauren"
+			or defName="WoW_Troll"
+			or defName="WoW_Worgen"] </xpath>
+		<value>
+			<comps/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_BloodElf"
+			or defName="WoW_Draenei"
+			or defName="WoW_Dwarf"
+			or defName="WoW_Forsaken"
+			or defName="WoW_ForsakenHighElf"
+			or defName="WoW_ForsakenNightElf"
+			or defName="WoW_Gnome"
+			or defName="WoW_Goblin"
+			or defName="WoW_HighElf"
+			or defName="WoW_Human"
+			or defName="WoW_NightElf"
+			or defName="WoW_Orc"
+			or defName="WoW_Skeleton"
+			or defName="WoW_Tauren"
+			or defName="WoW_Troll"
+			or defName="WoW_Worgen"]/comps </xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimcraft/Patches/Rimcraft/Patch_Bodies_WOW.xml b/ModPatches/Rimcraft/Patches/Rimcraft/Patch_Bodies_WOW.xml
new file mode 100644
index 0000000000..b34545875b
--- /dev/null
+++ b/ModPatches/Rimcraft/Patches/Rimcraft/Patch_Bodies_WOW.xml
@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- why yes dear explorer of this file, i did just literally copy and paste the ShekBody bodytype patches -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Tauren"]/corePart/parts/li[def="Ribcage"]/coverage</xpath>
+		<value>
+			<coverage>0.07</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Tauren"]/corePart/parts/li[def="Pelvis"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Tauren"]/corePart/parts/li[def="Stomach"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Tauren"]/corePart/parts/li[def="Heart"]/coverage</xpath>
+		<value>
+			<coverage>0.04</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Tauren"]/corePart/parts/li[def="Lung"]/coverage</xpath>
+		<value>
+			<coverage>0.055</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Tauren"]/corePart/parts/li[def="Kidney"]/coverage</xpath>
+		<value>
+			<coverage>0.03</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Tauren"]/corePart/parts/li[def="Liver"]/coverage</xpath>
+		<value>
+			<coverage>0.06</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Tauren"]/corePart/parts/li[def="Neck"]/coverage</xpath>
+		<value>
+			<coverage>0.055</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Tauren"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Skull"]/parts/li[def="Brain"]/coverage</xpath>
+		<value>
+			<coverage>0.7</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Tauren"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Eye"]/coverage</xpath>
+		<value>
+			<coverage>0.04</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Tauren"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Tauren"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/coverage</xpath>
+		<value>
+			<coverage>0.08</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Tauren"]/corePart/parts/li[def="Shoulder"]/coverage</xpath>
+		<value>
+			<coverage>0.085</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Tauren"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Clavicle"]/coverage</xpath>
+		<value>
+			<coverage>0.06</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Tauren"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Humerus"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Tauren"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Radius"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Tauren"]/corePart/parts/li[def="Leg"]/parts/li[def="Femur"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Tauren"]/corePart/parts/li[def="Leg"]/parts/li[def="Tibia"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+
+	<!-- why yes dear explorer of this file, i did just literally copy and paste the Skellington bodytype patches -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="WoWScourgeSkeleton_Body"]/corePart/parts/li[def="Ribcage"]/coverage</xpath>
+		<value>
+			<coverage>0.012</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="WoWScourgeSkeleton_Body"]/corePart/parts/li[def="Pelvis"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="WoWScourgeSkeleton_Body"]/corePart/parts/li[def="WoWScourgeSkeleton_Neck"]/coverage</xpath>
+		<value>
+			<coverage>0.055</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="WoWScourgeSkeleton_Body"]/corePart/parts/li[def="WoWScourgeSkeleton_Shoulder"]/coverage</xpath>
+		<value>
+			<coverage>0.085</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="WoWScourgeSkeleton_Body"]/corePart/parts/li[def="WoWScourgeSkeleton_Shoulder"]/parts/li[def="Clavicle"]/coverage</xpath>
+		<value>
+			<coverage>0.06</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="WoWScourgeSkeleton_Body"]/corePart/parts/li[def="WoWScourgeSkeleton_Shoulder"]/parts/li[def="WoWScourgeSkeleton_Arm"]/parts/li[def="Humerus"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="WoWScourgeSkeleton_Body"]/corePart/parts/li[def="WoWScourgeSkeleton_Shoulder"]/parts/li[def="WoWScourgeSkeleton_Arm"]/parts/li[def="Radius"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="WoWScourgeSkeleton_Body"]/corePart/parts/li[def="WoWScourgeSkeleton_Leg"]/coverage</xpath>
+		<value>
+			<coverage>0.1</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="WoWScourgeSkeleton_Body"]/corePart/parts/li[def="WoWScourgeSkeleton_Leg"]/parts/li[def="Femur"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="WoWScourgeSkeleton_Body"]/corePart/parts/li[def="WoWScourgeSkeleton_Leg"]/parts/li[def="Tibia"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyPartDef[defName="WoWScourgeSkeleton_Torso"]/hitPoints</xpath>
+		<value>
+			<hitPoints>50</hitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyPartDef[defName="WoWScourgeSkeleton_Leg"]/hitPoints</xpath>
+		<value>
+			<hitPoints>38</hitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="WoWScourgeSkeleton_Body"]//*[
+			def="WoWScourgeSkeleton_Torso" or
+			def="WoWScourgeSkeleton_Neck" or
+			def="Head" or
+			def="Jaw" or
+			def="WoWScourgeSkeleton_Shoulder" or
+			def="WoWScourgeSkeleton_Arm" or
+			def="WoWScourgeSkeleton_Hand" or
+			def="WoWScourgeSkeleton_Finger" or
+			def="WoWScourgeSkeleton_Toe" or
+			def="WoWScourgeSkeleton_Foot" or
+			def="WoWScourgeSkeleton_Leg"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="WoWScourgeSkeleton_Body"]//*[
+			def="Jaw"]/groups
+		</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Tauren"]//*[
+			def="Torso" or
+			def="Neck" or
+			def="Head" or
+			def="Jaw" or
+			def="Ear" or
+			def="Nose" or
+			def="Shoulder" or
+			def="Arm" or
+			def="Hand" or
+			def="Finger" or
+			def="Toe" or
+			def="Foot" or
+			def="Leg"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Tauren"]//*[
+			def="Jaw" or
+			def="Nose" or
+			def="Eye"]/groups
+		</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimcraft/Patches/Rimcraft/RimCraft_HumanoidLeather_CE.xml b/ModPatches/Rimcraft/Patches/Rimcraft/RimCraft_HumanoidLeather_CE.xml
new file mode 100644
index 0000000000..571d0c3757
--- /dev/null
+++ b/ModPatches/Rimcraft/Patches/Rimcraft/RimCraft_HumanoidLeather_CE.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--========== Humanoid leather ============-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_WoWBloodElf"
+			or defName="Leather_WoWDraenei"
+			or defName="Leather_WoWDwarf"
+			or defName="Leather_WoWGnome"
+			or defName="Leather_WoWGoblin"
+			or defName="Leather_WoWHighElf"
+			or defName="Leather_WoWNightElf"
+			or defName="Leather_WoWOrc"
+			or defName="Leather_WoWTroll"
+			or defName="Leather_WoWWorgen"]/statBases/StuffPower_Armor_Sharp </xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.05</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<!--========== Forsaken leathers ============-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_WoWForsaken"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.03</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimedieval - Medieval Royalty/Defs/Rimedieval - Medieval Royalty/Ammo_FirepotBomb.xml b/ModPatches/Rimedieval - Medieval Royalty/Defs/Rimedieval - Medieval Royalty/Ammo_FirepotBomb.xml
new file mode 100644
index 0000000000..7c964fa89c
--- /dev/null
+++ b/ModPatches/Rimedieval - Medieval Royalty/Defs/Rimedieval - Medieval Royalty/Ammo_FirepotBomb.xml	
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_MedievalFlamethrower</defName>
+		<label>Medieval Flamethrower Grenades</label>
+		<ammoTypes>
+			<BZT_Weapon_FirepotBomb>BZT_Proj_FirepotBomb_Fired</BZT_Weapon_FirepotBomb>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="BaseGrenadeProjectile">
+		<defName>BZT_Proj_FirepotBomb_Fired</defName>
+		<label>firepot bomb</label>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<graphicData>
+			<texPath>Things/Item/Equipment/WeaponRanged/FirepotBomb</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>0.5</explosionRadius>
+			<damageDef>Flame</damageDef>
+			<damageAmountBase>10</damageAmountBase>
+			<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
+			<preExplosionSpawnChance>1</preExplosionSpawnChance>
+			<speed>20</speed>
+			<ai_IsIncendiary>true</ai_IsIncendiary>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== Recipes ================== -->
+	
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeFirePotBomb</defName>
+		<label>make firepot bombs x10</label>
+		<description>Craft 10 fire bombs.</description>
+		<jobString>Making fire bombs.</jobString>
+		<workAmount>1600</workAmount>
+		<recipeUsers>
+			<li>CraftingSpot</li>
+		</recipeUsers>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Chemfuel</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Chemfuel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<BZT_Weapon_FirepotBomb>10</BZT_Weapon_FirepotBomb>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Rimedieval - Medieval Royalty/Patches/Rimedieval - Medieval Royalty/Apparel_MedievalRoyalty.xml b/ModPatches/Rimedieval - Medieval Royalty/Patches/Rimedieval - Medieval Royalty/Apparel_MedievalRoyalty.xml
new file mode 100644
index 0000000000..e2a807d6bd
--- /dev/null
+++ b/ModPatches/Rimedieval - Medieval Royalty/Patches/Rimedieval - Medieval Royalty/Apparel_MedievalRoyalty.xml	
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Varangian Armor -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BZT_VarangianArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2.75</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BZT_VarangianArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4.25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="BZT_VarangianArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BZT_VarangianArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeDodgeChance>-0.20</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BZT_VarangianArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<!-- Varangian Helmet -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BZN_VarangianHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BZN_VarangianHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BZN_VarangianHelmet"]/stuffCategories</xpath>
+		<value>
+			<stuffCategories>
+				<li>Steeled</li>
+			</stuffCategories>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BZN_VarangianHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>-0.4</AimingAccuracy>
+				<MeleeHitChance>-2</MeleeHitChance>
+				<PainShockThreshold>0.15</PainShockThreshold>
+				<SocialImpact>0.35</SocialImpact>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Footman / Scout Armor -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BZT_ScoutArmor" or defName="BZT_FootmanArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.65</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BZT_ScoutArmor" or defName="BZT_FootmanArmor"]/stuffCategories</xpath>
+		<value>
+			<stuffCategories>
+				<li>Steeled</li>
+			</stuffCategories>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BZT_ScoutArmor" or defName="BZT_FootmanArmor"]/statBases</xpath>
+		<value>
+			<Bulk>25</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BZT_ScoutArmor" or defName="BZT_FootmanArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<!-- Footman / Scout Helmet -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BZN_ScoutHelmet" or defName="BZN_FootmanHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BZN_ScoutHelmet" or defName="BZN_FootmanHelmet"]/stuffCategories</xpath>
+		<value>
+			<stuffCategories>
+				<li>Steeled</li>
+			</stuffCategories>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BZN_ScoutHelmet" or defName="BZN_FootmanHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BZN_ScoutHelmet" or defName="BZN_FootmanHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>-0.3</AimingAccuracy>
+				<MeleeHitChance>-1.5</MeleeHitChance>
+				<PainShockThreshold>0.10</PainShockThreshold>
+				<SocialImpact>0.3</SocialImpact>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimedieval - Medieval Royalty/Patches/Rimedieval - Medieval Royalty/Ranged_Medieval.xml b/ModPatches/Rimedieval - Medieval Royalty/Patches/Rimedieval - Medieval Royalty/Ranged_Medieval.xml
new file mode 100644
index 0000000000..7d192b3fad
--- /dev/null
+++ b/ModPatches/Rimedieval - Medieval Royalty/Patches/Rimedieval - Medieval Royalty/Ranged_Medieval.xml	
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Flamethrower ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BZT_Gun_Firethrower</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.43</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.8</SwayFactor>
+			<Bulk>12</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>BZT_Proj_FirepotBomb_Fired</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>20</range>
+			<burstShotCount>0</burstShotCount>
+			<soundCast>Shot_IncendiaryLauncher</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_MedievalFlamethrower</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Firepot Bomb ========== -->
+
+	<!-- Projectile -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BZT_Proj_FirepotBomb"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<explosionRadius>0.5</explosionRadius>
+				<damageDef>Flame</damageDef>
+				<damageAmountBase>10</damageAmountBase>
+				<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
+				<preExplosionSpawnChance>1</preExplosionSpawnChance>
+				<speed>12</speed>
+				<ai_IsIncendiary>true</ai_IsIncendiary>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BZT_Proj_FirepotBomb"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Projectile_FireTrail</thingClass>
+		</value>
+	</Operation>
+
+	<!-- Grenade -->
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="BZT_Weapon_FirepotBomb"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BZT_Weapon_FirepotBomb"]/graphicData</xpath>
+		<value>
+			<graphicData>
+				<texPath>Things/Item/Equipment/WeaponRanged/FirepotBomb</texPath>
+				<graphicClass>Graphic_Single</graphicClass>
+			</graphicData>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BZT_Weapon_FirepotBomb"]</xpath>
+		<value>
+			<thingClass>CombatExtended.AmmoThing</thingClass>
+			<stackLimit>50</stackLimit>
+			<resourceReadoutPriority>First</resourceReadoutPriority>
+			<ammoClass>IncendiaryFuel</ammoClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="BZT_Weapon_FirepotBomb"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BZT_Weapon_FirepotBomb"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>1</damageAmountBase>
+				<explosiveDamageType>Flame</explosiveDamageType>
+				<explosiveRadius>0.5</explosiveRadius>
+				<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
+				<preExplosionSpawnChance>1</preExplosionSpawnChance>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>BZT_Weapon_FirepotBomb</defName>
+		<statBases>
+			<Mass>0.6</Mass>
+			<Bulk>1.8</Bulk>
+			<MarketValue>3</MarketValue>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<label>throw firebomb</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<range>12</range>
+			<minRange>3</minRange>
+			<warmupTime>1.8</warmupTime>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<soundCast>ThrowMolotovCocktail</soundCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<defaultProjectile>BZT_Proj_FirepotBomb</defaultProjectile>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BZT_Weapon_FirepotBomb"]</xpath>
+		<value>
+			<recipeMaker/>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimedieval - Medieval Royalty/Patches/Rimedieval - Medieval Royalty/Weapons_Medieval.xml b/ModPatches/Rimedieval - Medieval Royalty/Patches/Rimedieval - Medieval Royalty/Weapons_Medieval.xml
new file mode 100644
index 0000000000..9526e3cc0d
--- /dev/null
+++ b/ModPatches/Rimedieval - Medieval Royalty/Patches/Rimedieval - Medieval Royalty/Weapons_Medieval.xml	
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === Varangian Axe === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BZT_MeleeWeapon_VarangianAxe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.78</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>31</power>
+					<cooldownTime>4.09</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>4.84</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.97</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BZT_MeleeWeapon_VarangianAxe"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>8</Bulk>
+				<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BZT_MeleeWeapon_VarangianAxe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.06</MeleeCritChance>
+				<MeleeParryChance>0.75</MeleeParryChance>
+				<MeleeDodgeChance>0.50</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- === Imperial Saber === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BZT_MeleeWeapon_ImperialSabre"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>3.5</Bulk>
+				<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BZT_MeleeWeapon_ImperialSabre"]</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="BZT_MeleeWeapon_ImperialSabre"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BZT_MeleeWeapon_ImperialSabre"]/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>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimefeller/Patches/Rimefeller/Items_Resource_Stuff.xml b/ModPatches/Rimefeller/Patches/Rimefeller/Items_Resource_Stuff.xml
new file mode 100644
index 0000000000..f7791a9f32
--- /dev/null
+++ b/ModPatches/Rimefeller/Patches/Rimefeller/Items_Resource_Stuff.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Synthamide === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Synthamide"]/statBases</xpath>
+		<value>
+			<Bulk>0.05</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Synthamide"]/statBases</xpath>
+		<value>
+			<WornBulk>0.25</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Synthamide"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>0.9</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Synthamide"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.6</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Synthamide"]/stuffProps/categories</xpath>
+		<value>
+			<li>SoftArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Synthamide"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.12</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Synthamide"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.1</StuffPower_Armor_Heat>
+			<StuffPower_Armor_Electric>0.05</StuffPower_Armor_Electric>
+		</value>
+	</Operation>
+
+	<!-- === Fiber Composite === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FiberComposite"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>2.2</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FiberComposite"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>3.1</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FiberComposite"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.2</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="FiberComposite"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>0.75</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="FiberComposite"]/stuffProps/categories</xpath>
+		<value>
+			<li>Metallic_Weapon</li>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<!-- === Synthylene === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="SynthyleneBase"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.08</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="SynthyleneBase"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="SynthyleneBase"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.01</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="SynthyleneBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.StuffToughnessMultiplierExtensionCE">
+				<toughnessMultiplier>4</toughnessMultiplier>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimefeller/Patches/Rimefeller/Napalm_Tweaks.xml b/ModPatches/Rimefeller/Patches/Rimefeller/Napalm_Tweaks.xml
new file mode 100644
index 0000000000..35016f37ad
--- /dev/null
+++ b/ModPatches/Rimefeller/Patches/Rimefeller/Napalm_Tweaks.xml
@@ -0,0 +1,260 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Vanilla Fishing Expanded - Fishing Treasures AddOn -->
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Fishing Expanded - Fishing Treasures AddOn</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+				<li Class="PatchOperationRemove">
+					<xpath>Defs/VCE_Fishing.FishDef[defName="VCEF_SpecialShell_Napalm" or defName="VCEF_SpecialNapalm"]</xpath>
+				</li>
+			</operations>
+		</match>
+	</Operation>
+
+	<!-- Research -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ResearchProjectDef[defName="Napalm"]/label</xpath>
+		<value>
+			<label>Prometheum Refining</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ResearchProjectDef[defName="Napalm"]/description</xpath>
+		<value>
+			<description>Produce Prometheum from stored chemfuel, used for making incendiary explosives and specialty ammunition.</description>
+		</value>
+	</Operation>
+
+	<!-- Refinery Loading Bay -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RefineryLoadingBay"]/building/fixedStorageSettings/filter/thingDefs/li[.="Napalm"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RefineryLoadingBay"]/building/defaultStorageSettings/filter/thingDefs/li[.="Napalm"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RefineryLoadingBay"]/building/fixedStorageSettings/filter/thingDefs</xpath>
+		<value>
+			<li>Prometheum</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RefineryLoadingBay"]/building/defaultStorageSettings/filter/thingDefs</xpath>
+		<value>
+			<li>Prometheum</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RefineryLoadingBay"]/building/defaultStorageSettings/filter/thingDefs</xpath>
+		<value>
+			<li>FSX</li>
+		</value>
+	</Operation>
+
+	<!-- Napalm Refiner -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NapalmRefiner"]/label</xpath>
+		<value>
+			<label>Prometheum Refiner</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NapalmRefiner"]/description</xpath>
+		<value>
+			<description>Processes chemfuel into prometheum, a military-grade incendiary agent which ignites on contact with oxygen. The raw resource is used to craft incendiary ammo of all kinds.</description>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NapalmRefiner"]/comps/li[2]/Product</xpath>
+		<value>
+			<Product>Prometheum</Product>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NapalmRefiner"]/comps/li[2]/StackSize</xpath>
+		<value>
+			<StackSize>1</StackSize>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NapalmRefiner"]/comps/li[2]/BufferSize</xpath>
+		<value>
+			<BufferSize>4</BufferSize>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NapalmRefiner"]/comps/li[2]/ConsumeRate</xpath>
+		<value>
+			<ConsumeRate>0.1</ConsumeRate>
+		</value>
+	</Operation>
+
+	<!-- Napalm Trails -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Filth_NapalmTrail"]/label</xpath>
+		<value>
+			<label>Chemfuel trail</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Filth_NapalmTrail"]/description</xpath>
+		<value>
+			<description>Chemfuel trail</description>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Filth_NapalmTrail"]/costList</xpath>
+		<value>
+			<costList>
+				<Chemfuel>1</Chemfuel>
+			</costList>
+		</value>
+	</Operation>
+
+	<!-- Napalm Bombs -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NapalmBomb"]/label</xpath>
+		<value>
+			<label>Prometheum bomb</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NapalmBomb"]/description</xpath>
+		<value>
+			<description>Prometheum bomb</description>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NapalmBomb"]/costList</xpath>
+		<value>
+			<costList>
+				<Prometheum>5</Prometheum>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NapalmBomb"]/graphicData/texPath</xpath>
+		<value>
+			<texPath>ThirdParty/Rimefeller/Things/Resource/NapalmBomb</texPath>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NapalmBomb"]/uiIconPath</xpath>
+		<value>
+			<uiIconPath>ThirdParty/Rimefeller/UI/NapalmBomb</uiIconPath>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NapalmBomb"]/comps/li[2]</xpath>
+		<value>
+			<li Class="CompProperties_Explosive">
+				<explosiveRadius>3</explosiveRadius>
+				<explosiveDamageType>PrometheumFlame</explosiveDamageType>
+				<startWickHitPointsPercent>0.8</startWickHitPointsPercent>
+				<destroyThingOnExplosionSize>1</destroyThingOnExplosionSize>
+				<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
+				<preExplosionSpawnChance>1</preExplosionSpawnChance>
+				<wickTicks>
+					<min>0</min>
+					<max>1</max>
+				</wickTicks>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="NapalmBomb"]</xpath>
+		<value>
+			<specialDisplayRadius>3</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="NapalmBomb"]</xpath>
+		<value>
+			<fillPercent>0.5</fillPercent>
+		</value>
+	</Operation>
+
+	<!-- Napalm Shell -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Shell_Napalm" or defName="Bullet_Shell_Napalm"]</xpath>
+	</Operation>
+
+	<!-- Napalm Recipes -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/RecipeDef[defName="Make_Napalm"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Napalm"]</xpath>
+		<value>
+			<generateCommonality>0</generateCommonality>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Napalm"]</xpath>
+		<value>
+			<generateAllowChance>0</generateAllowChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Napalm"]/graphicData/texPath</xpath>
+		<value>
+			<texPath>ThirdParty/Rimefeller/Things/Resource/NapalmBomb</texPath>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="OilBarrel"]/graphicData/texPath</xpath>
+		<value>
+			<texPath>ThirdParty/Rimefeller/Things/Resource/OilBarrel</texPath>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Filth_OilSlick"]/graphicData/texPath</xpath>
+		<value>
+			<texPath>ThirdParty/Rimefeller/Things/Resource/OilBarrel</texPath>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Filth_NapalmTrail"]/graphicData/texPath</xpath>
+		<value>
+			<texPath>ThirdParty/Rimefeller/UI/NapalmSpill</texPath>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Filth_NapalmTrail"]/building/blueprintGraphicData/texPath</xpath>
+		<value>
+			<texPath>ThirdParty/Rimefeller/UI/NapalmSpill_bp</texPath>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimmu-Nation - Clothing/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Armor.xml b/ModPatches/Rimmu-Nation - Clothing/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Armor.xml
new file mode 100644
index 0000000000..0888c456a8
--- /dev/null
+++ b/ModPatches/Rimmu-Nation - Clothing/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Armor.xml	
@@ -0,0 +1,258 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== 6B23-1 body armor ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_6B23Vest"]/statBases</xpath>
+		<value>
+			<Bulk>9</Bulk>
+			<WornBulk>6</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_6B23Vest"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>10</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_6B23Vest"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_6B23Vest"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>28</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_6B23Vest"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.36</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!-- ========== 5.11 Tactec body armor ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_511TacTecVest"]/statBases</xpath>
+		<value>
+			<Bulk>7.5</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_511TacTecVest"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>10</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_511TacTecVest"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_511TacTecVest"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_511TacTecVest"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.36</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!-- ========== Crye CAGE body armor ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_CryeCAGE_Tan"]/statBases</xpath>
+		<value>
+			<Bulk>7.5</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_CryeCAGE_Tan"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>10</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_CryeCAGE_Tan"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_CryeCAGE_Tan"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_CryeCAGE_Tan"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.36</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!-- ========== AR500 armor (standard, PMC, Warrior variants) ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_AR500Vest" or
+			defName="RNApparel_AR500PMCVest" or
+			defName="RNApparel_AR500WarriorVest"
+			]/statBases </xpath>
+		<value>
+			<Bulk>7.5</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_AR500Vest" or
+			defName="RNApparel_AR500PMCVest" or
+			defName="RNApparel_AR500WarriorVest"
+			]/equippedStatOffsets </xpath>
+		<value>
+			<CarryBulk>10</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_AR500Vest" or
+			defName="RNApparel_AR500PMCVest" or
+			defName="RNApparel_AR500WarriorVest"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_AR500Vest" or
+			defName="RNApparel_AR500PMCVest" or
+			defName="RNApparel_AR500WarriorVest"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>28</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_AR500Vest" or
+			defName="RNApparel_AR500PMCVest" or
+			defName="RNApparel_AR500WarriorVest"
+			]/statBases/ArmorRating_Heat </xpath>
+		<value>
+			<ArmorRating_Heat>0.36</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!-- ========== Hunter Reactive ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_HunterReactiveArmor"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_HunterReactiveArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>15</CarryBulk>
+			<CarryWeight>90</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_HunterReactiveArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_HunterReactiveArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>40</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_HunterReactiveArmor"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.8</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_HunterReactiveArmor"]/statBases</xpath>
+		<value>
+			<ArmorRating_Electric>0.05</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<!-- ========== Interceptor body armor (M81) ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_IBAM81Vest"]/statBases</xpath>
+		<value>
+			<Bulk>9</Bulk>
+			<WornBulk>6</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_IBAM81Vest"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>10</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_IBAM81Vest"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_IBAM81Vest"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>28</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_IBAM81Vest"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.36</ArmorRating_Heat>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimmu-Nation - Clothing/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Armor_Headgear.xml b/ModPatches/Rimmu-Nation - Clothing/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Armor_Headgear.xml
new file mode 100644
index 0000000000..02a9c50a6a
--- /dev/null
+++ b/ModPatches/Rimmu-Nation - Clothing/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Armor_Headgear.xml	
@@ -0,0 +1,314 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Chicken hat ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_ChickenHatMGSV"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- ========== FAST helmet black ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_FASTHelmetBlack"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.54</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_FASTHelmetBlack"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.20</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== FAST helmet Multicam ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_FASTHelmetMulticam"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.54</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_FASTHelmetMulticam"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.20</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== FAST helmet PMC ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_FASTHelmetPMC"]/statBases</xpath>
+		<value>
+			<Bulk>4.5</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.54</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_FASTHelmetPMC"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.20</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Hunter Reactive helmet ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_HunterReactiveHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_HunterReactiveHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_HunterReactiveHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>32</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_HunterReactiveHelmet"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>1</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_HunterReactiveHelmet"]/statBases</xpath>
+		<value>
+			<ArmorRating_Electric>0.06</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<!-- ========== K6-3 helmet (closed, open variants) ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_K63Helmet" or
+			defName="RNApparel_K63HelmetOpen"
+			]/statBases </xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+			<ArmorRating_Blunt>22</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.54</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_K63Helmet" or
+			defName="RNApparel_K63HelmetOpen"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.30</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Lynx-T helmet (closed, open variants) ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_LynxTHelmet" or
+			defName="RNApparel_LynxTHelmetOpen"
+			]/statBases </xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+			<ArmorRating_Blunt>22</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.54</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_LynxTHelmet" or
+			defName="RNApparel_LynxTHelmetOpen"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.30</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== M1 helmet ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_M1Helmet"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>0.375</ArmorRating_Sharp>
+			<ArmorRating_Blunt>0.143</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.386</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_M1Helmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== MASKA-1 helmet ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_MASKA1Helmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+			<ArmorRating_Blunt>22</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.54</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_MASKA1Helmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.30</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== PASGT helmet (DCU, M81 variants) ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_PASGTDCUHelmet" or
+			defName="RNApparel_PASGTM81Helmet"
+			]/statBases </xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+			<ArmorRating_Blunt>13</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.54</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_PASGTDCUHelmet" or
+			defName="RNApparel_PASGTM81Helmet"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.15</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== PT A-Bravo helmet black ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_PTABravoHelmetBlack"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.54</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_PTABravoHelmetBlack"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.20</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== PT A-Bravo helmet Operator ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_PTABravoHelmetOperator"]/statBases</xpath>
+		<value>
+			<Bulk>4.5</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.54</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_PTABravoHelmetOperator"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.20</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== MICH helmet (DPM, Tan variants) ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_MICHHelmet_DPM" or
+			defName="RNApparel_MICHHelmet_Tan"
+			]/statBases </xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.54</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_MICHHelmet_DPM" or
+			defName="RNApparel_MICHHelmet_Tan"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.20</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Crye Airframe helmet ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_CryeAirframeHelmet_Tan"]/statBases</xpath>
+		<value>
+			<Bulk>4.5</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.54</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_CryeAirframeHelmet_Tan"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.20</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimmu-Nation - Clothing/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Armor_Headgear_Crafting_Rimfeller.xml b/ModPatches/Rimmu-Nation - Clothing/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Armor_Headgear_Crafting_Rimfeller.xml
new file mode 100644
index 0000000000..296709f347
--- /dev/null
+++ b/ModPatches/Rimmu-Nation - Clothing/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Armor_Headgear_Crafting_Rimfeller.xml	
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Rimefeller</li>
+		</mods>
+
+		<!-- If Rimefeller is also installed, have the PASGT helmets require Synthamide for crafting -->
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[
+						defName="RNApparel_PASGTDCUHelmet" or
+						defName="RNApparel_PASGTM81Helmet"
+						]/costList </xpath>
+					<value>
+						<costList>
+							<Synthamide>10</Synthamide>
+						</costList>
+					</value>
+				</li>
+			</operations>
+		</match>
+
+		<!-- Otherwise, default to Devilstrand -->
+		<nomatch Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[
+						defName="RNApparel_PASGTDCUHelmet" or
+						defName="RNApparel_PASGTM81Helmet"
+						]/costList </xpath>
+					<value>
+						<costList>
+							<DevilstrandCloth>10</DevilstrandCloth>
+						</costList>
+					</value>
+				</li>
+			</operations>
+
+		</nomatch>
+
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimmu-Nation - Clothing/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Backpacks.xml b/ModPatches/Rimmu-Nation - Clothing/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Backpacks.xml
new file mode 100644
index 0000000000..75777d1adf
--- /dev/null
+++ b/ModPatches/Rimmu-Nation - Clothing/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Backpacks.xml	
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Backpack civilian ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_Backpack_Civilian"]/statBases</xpath>
+		<value>
+			<Bulk>2.5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_Backpack_Civilian"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>25</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_Backpack_Civilian"]/apparel
+		</xpath>
+		<value>
+			<apparel>
+				<careIfWornByCorpse>false</careIfWornByCorpse>
+				<bodyPartGroups>
+					<li>Shoulders</li>
+				</bodyPartGroups>
+				<layers>
+					<li>Backpack</li>
+				</layers>
+				<tags>
+					<li>IndustrialAdvanced</li>
+				</tags>
+				<wornGraphicPath>Things/Apparel/Belt/CivilianBackpack</wornGraphicPath>
+			</apparel>
+		</value>
+	</Operation>
+
+	<!-- ========== Backpack military ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_Backpack_Military"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_Backpack_Military"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>35</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_Backpack_Military"]/apparel
+		</xpath>
+		<value>
+			<apparel>
+				<careIfWornByCorpse>false</careIfWornByCorpse>
+				<bodyPartGroups>
+					<li>Shoulders</li>
+				</bodyPartGroups>
+				<layers>
+					<li>Backpack</li>
+				</layers>
+				<tags>
+					<li>RN_Backpack</li>
+				</tags>
+				<defaultOutfitTags>
+					<li>Soldier</li>
+				</defaultOutfitTags>
+				<wornGraphicPath>Things/Apparel/Belt/MilitaryBackpack</wornGraphicPath>
+			</apparel>
+		</value>
+	</Operation>
+
+	<!-- ========== Backpack tactical ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_Backpack_Tactical"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_Backpack_Tactical"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>30</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_Backpack_Tactical"]/apparel
+		</xpath>
+		<value>
+			<apparel>
+				<careIfWornByCorpse>false</careIfWornByCorpse>
+				<bodyPartGroups>
+					<li>Shoulders</li>
+				</bodyPartGroups>
+				<layers>
+					<li>Backpack</li>
+				</layers>
+				<tags>
+					<li>IndustrialAdvanced</li>
+				</tags>
+				<defaultOutfitTags>
+					<li>Soldier</li>
+				</defaultOutfitTags>
+				<wornGraphicPath>Things/Apparel/Belt/AssaultBackpack</wornGraphicPath>
+			</apparel>
+		</value>
+	</Operation>
+
+	<!-- ========== Backpack tactical sling ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_Backpack_Tactical_Sling"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_Backpack_Tactical_Sling"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>15</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_Backpack_Tactical_Sling"]/apparel
+		</xpath>
+		<value>
+			<apparel>
+				<careIfWornByCorpse>false</careIfWornByCorpse>
+				<bodyPartGroups>
+					<li>Shoulders</li>
+				</bodyPartGroups>
+				<layers>
+					<li>Backpack</li>
+				</layers>
+				<tags>
+					<li>IndustrialAdvanced</li>
+				</tags>
+				<defaultOutfitTags>
+					<li>Soldier</li>
+				</defaultOutfitTags>
+				<wornGraphicPath>Things/Apparel/Belt/Tactical_SlingBackpack</wornGraphicPath>
+			</apparel>
+		</value>
+	</Operation>
+
+	<!-- ========== Backpack pegasus elite ops ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_Backpack_PegasusEliteOps"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_Backpack_PegasusEliteOps"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>30</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_Backpack_PegasusEliteOps"]/apparel
+		</xpath>
+		<value>
+			<apparel>
+				<careIfWornByCorpse>false</careIfWornByCorpse>
+				<bodyPartGroups>
+					<li>Shoulders</li>
+				</bodyPartGroups>
+				<layers>
+					<li>Backpack</li>
+				</layers>
+				<tags>
+					<li>IndustrialAdvanced</li>
+				</tags>
+				<defaultOutfitTags>
+					<li>Soldier</li>
+				</defaultOutfitTags>
+				<wornGraphicPath>Things/Apparel/Belt/EliteOpsBackpack</wornGraphicPath>
+			</apparel>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimmu-Nation - Clothing/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Belts.xml b/ModPatches/Rimmu-Nation - Clothing/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Belts.xml
new file mode 100644
index 0000000000..6bcadb21ea
--- /dev/null
+++ b/ModPatches/Rimmu-Nation - Clothing/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Belts.xml	
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== MOLLE ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_Harness_MOLLE"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_Harness_MOLLE"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>20</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_Harness_MOLLE"]/apparel
+		</xpath>
+		<value>
+			<apparel>
+				<bodyPartGroups>
+					<li>Shoulders</li>
+				</bodyPartGroups>
+				<layers>
+					<li>Webbing</li>
+				</layers>
+				<tags>
+					<li>IndustrialMilitaryBasic</li>
+				</tags>
+				<defaultOutfitTags>
+					<li>Soldier</li>
+				</defaultOutfitTags>
+				<wornGraphicPath>Things/Apparel/Belt/TacticalHarness</wornGraphicPath>
+			</apparel>
+		</value>
+	</Operation>
+
+	<!-- ========== ALICE ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_Harness_ALICE"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_Harness_ALICE"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>10</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_Harness_ALICE"]/apparel
+		</xpath>
+		<value>
+			<apparel>
+				<bodyPartGroups>
+					<li>Shoulders</li>
+				</bodyPartGroups>
+				<layers>
+					<li>Webbing</li>
+				</layers>
+				<tags>
+					<li>IndustrialMilitaryBasic</li>
+				</tags>
+				<defaultOutfitTags>
+					<li>Soldier</li>
+				</defaultOutfitTags>
+				<wornGraphicPath>Things/Apparel/Belt/ALICE_Harness</wornGraphicPath>
+			</apparel>
+		</value>
+	</Operation>
+
+	<!-- ========== Handgun holsters ========== -->
+
+	<!-- Shared with other CP / RH / RN mods - make sure not to apply redundant patches and cause duplicate XML node errors -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="RNApparel_Holsters_Shoulder"]/statBases/Bulk</xpath>
+		<nomatch Class="PatchOperationSequence">
+			<operations>
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="RNApparel_Holsters_Shoulder"]/statBases</xpath>
+					<value>
+						<Bulk>2.5</Bulk>
+						<WornBulk>1</WornBulk>
+					</value>
+				</li>
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="RNApparel_Holsters_Shoulder"]/equippedStatOffsets</xpath>
+					<value>
+						<CarryBulk>2.5</CarryBulk>
+					</value>
+				</li>
+			</operations>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_Holsters_Shoulder"]/apparel
+		</xpath>
+		<value>
+			<apparel>
+				<bodyPartGroups>
+					<li>Shoulders</li>
+				</bodyPartGroups>
+				<layers>
+					<li>Webbing</li>
+				</layers>
+				<tags>
+					<li>IndustrialMilitaryBasic</li>
+				</tags>
+				<defaultOutfitTags>
+					<li>Soldier</li>
+				</defaultOutfitTags>
+				<wornGraphicPath>Things/Apparel/Belt/ShoulderHolster</wornGraphicPath>
+			</apparel>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimmu-Nation - Clothing/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Headgear.xml b/ModPatches/Rimmu-Nation - Clothing/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Headgear.xml
new file mode 100644
index 0000000000..5fa99a992b
--- /dev/null
+++ b/ModPatches/Rimmu-Nation - Clothing/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Headgear.xml	
@@ -0,0 +1,328 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Berets ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_Beret" or
+			defName="RNApparel_BeretSOG"
+			]/statBases </xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_Beret" or
+			defName="RNApparel_BeretSOG"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<!-- Equivalent to vanilla fabric hats -->
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Baseball Caps ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_PatchCap" or
+			defName="RNApparel_BackwardsCap" or
+			defName="RNApparel_AceCap" or
+			defName="RNApparel_LegendCap" or
+			defName="RNApparel_PunisherCap" or
+			defName="RNApparel_MAGACap" or
+			defName="RNApparel_M81Cap" or
+			defName="RNApparel_MulticamCap" or
+			defName="RNApparel_BrownCap" or
+			defName="RNApparel_NomadCap"
+			]/statBases </xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_PatchCap" or
+			defName="RNApparel_BackwardsCap" or
+			defName="RNApparel_AceCap" or
+			defName="RNApparel_LegendCap" or
+			defName="RNApparel_PunisherCap" or
+			defName="RNApparel_MAGACap" or
+			defName="RNApparel_M81Cap" or
+			defName="RNApparel_MulticamCap" or
+			defName="RNApparel_BrownCap" or
+			defName="RNApparel_NomadCap"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<!-- Equivalent to vanilla fabric hats -->
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Boonie Hats ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_PlainBoonie" or
+			defName="RNApparel_M81Boonie" or
+			defName="RNApparel_MulticamBoonie"
+			]/statBases </xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_PlainBoonie" or
+			defName="RNApparel_M81Boonie" or
+			defName="RNApparel_MulticamBoonie"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<!-- Equivalent to vanilla fabric hats -->
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Bandanas ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_BandanaRed" or
+			defName="RNApparel_BandanaTan"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<!-- Equivalent to vanilla pants, T-shirt and button-down shirt -->
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Balaclavas ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_Balaclava" or
+			defName="RNApparel_BalaclavaSkully" or
+			defName="RNApparel_BalaclavaRiley" or
+			defName="RNApparel_BalaclavaKeegan"
+			]/statBases </xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_Balaclava" or
+			defName="RNApparel_BalaclavaSkully" or
+			defName="RNApparel_BalaclavaRiley" or
+			defName="RNApparel_BalaclavaKeegan"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<!-- Equivalent to vanilla tuque -->
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Ghillie Suit Hood ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_NewGhillieHood"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- ========== Tuques / Beanies ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_Beanie" or
+			defName="RNApparel_M81Tuque" or
+			defName="RNApparel_MulticamTuque"
+			]/statBases </xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_Beanie" or
+			defName="RNApparel_M81Tuque" or
+			defName="RNApparel_MulticamTuque"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<!-- Equivalent to vanilla tuque -->
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Beanie Division ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_BeanieDivision"]/statBases</xpath>
+		<value>
+			<Bulk>1.5</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_BeanieDivision"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<!-- Equivalent to vanilla tuque -->
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_BeanieDivision"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RNApparel_BeanieDivision"]</xpath>
+		<value>
+			<li Class="CombatExtended.ApparelHediffExtension">
+				<hediff>WearingGasMask</hediff>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== 4A1 gasmask ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_4A1Gasmask"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_4A1Gasmask"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_4A1Gasmask"]/apparel/layers</xpath>
+		<value>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RNApparel_4A1Gasmask"]</xpath>
+		<value>
+			<li Class="CombatExtended.ApparelHediffExtension">
+				<hediff>WearingGasMask</hediff>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== GP-5 gasmask ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_GP5Gasmask"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_GP5Gasmask"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_GP5Gasmask"]/apparel/layers</xpath>
+		<value>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RNApparel_GP5Gasmask"]</xpath>
+		<value>
+			<li Class="CombatExtended.ApparelHediffExtension">
+				<hediff>WearingGasMask</hediff>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Halfmask (GTA) ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_GTAHalfMask"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_GTAHalfMask"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_GTAHalfMask"]/apparel/layers</xpath>
+		<value>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RNApparel_GTAHalfMask"]</xpath>
+		<value>
+			<li Class="CombatExtended.ApparelHediffExtension">
+				<hediff>WearingGasMask</hediff>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Field Caps ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_MilitaryCap_DCU" or
+			defName="RNApparel_MilitaryCap_M81cam" or
+			defName="RNApparel_MilitaryCap_Multicam"
+			]/statBases </xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_MilitaryCap_DCU" or
+			defName="RNApparel_MilitaryCap_M81cam" or
+			defName="RNApparel_MilitaryCap_Multicam"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<!-- Equivalent to vanilla fabric hats -->
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimmu-Nation - Clothing/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_OnSkin.xml b/ModPatches/Rimmu-Nation - Clothing/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_OnSkin.xml
new file mode 100644
index 0000000000..ade8762393
--- /dev/null
+++ b/ModPatches/Rimmu-Nation - Clothing/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_OnSkin.xml	
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Combat Fleece / Hoodie ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_combats_Fleece" or
+			defName="RNApparel_combats_FleeceBlack"
+			]/statBases </xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>3</WornBulk>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+			<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_combats_Fleece" or
+			defName="RNApparel_combats_FleeceBlack"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<!-- Slightly tougher than vanilla pants, T-shirt and button-down shirt -->
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== GORKA 4 ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_combats_GORKA4C"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>4</WornBulk>
+			<ArmorRating_Sharp>0.075</ArmorRating_Sharp>
+			<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_combats_GORKA4C"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<!-- Slightly tougher than vanilla pants, T-shirt and button-down shirt -->
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Combat Uniforms ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_combats_DCU" or
+			defName="RNApparel_combats_DPM" or
+			defName="RNApparel_combats_M81C" or
+			defName="RNApparel_combats_Multicam"
+			]/statBases </xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>3</WornBulk>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+			<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_combats_DCU" or
+			defName="RNApparel_combats_DPM" or
+			defName="RNApparel_combats_M81C" or
+			defName="RNApparel_combats_Multicam"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<!-- Slightly tougher than vanilla pants, T-shirt and button-down shirt -->
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Combat Uniform C&C Red Alert Tanya ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_Combats_Tanya"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>3</WornBulk>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+			<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_Combats_Tanya"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<!-- Slightly tougher than vanilla pants, T-shirt and button-down shirt -->
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Plaid Collar Shirts with Jeans ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_Plaid_Black" or
+			defName="RNApparel_Plaid_Blue" or
+			defName="RNApparel_Plaid_Green" or
+			defName="RNApparel_Plaid_Red" or
+			defName="RNApparel_Plaid_Tan"
+			]/statBases </xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>3</WornBulk>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+			<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_Plaid_Black" or
+			defName="RNApparel_Plaid_Blue" or
+			defName="RNApparel_Plaid_Green" or
+			defName="RNApparel_Plaid_Red" or
+			defName="RNApparel_Plaid_Tan"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<!-- Equivalent to vanilla pants, T-shirt and button-down shirt -->
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Tank Tops with Trousers ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel__Tank_ExplorerA" or
+			defName="RNApparel_Tank_ExplorerB" or
+			defName="RNApparel_GymOutfit_Blank" or
+			defName="RNApparel_Tank_Tenlyashka"
+			]/statBases </xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>3</WornBulk>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+			<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel__Tank_ExplorerA" or
+			defName="RNApparel_Tank_ExplorerB" or
+			defName="RNApparel_GymOutfit_Blank" or
+			defName="RNApparel_Tank_Tenlyashka"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<!-- Equivalent to vanilla pants, T-shirt and button-down shirt -->
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Button Shirts with Trousers ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_Shirt_PUBGGray" or
+			defName="RNApparel_Shirt_PUBGNavy" or
+			defName="RNApparel_Shirt_Office" or
+			defName="RNApparel_Shirt_OffDuty" or
+			defName="RNApparel_Shirt_Spy" or
+			defName="RNApparel_Shirt_Wick"
+			]/statBases </xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>3</WornBulk>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+			<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_Shirt_PUBGGray" or
+			defName="RNApparel_Shirt_PUBGNavy" or
+			defName="RNApparel_Shirt_Office" or
+			defName="RNApparel_Shirt_OffDuty" or
+			defName="RNApparel_Shirt_Spy" or
+			defName="RNApparel_Shirt_Wick"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<!-- Equivalent to vanilla pants, T-shirt and button-down shirt -->
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Light Shirts with Trousers ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_Shirt_LiteDDPM" or
+			defName="RNApparel_Shirt_EllieShirt" or
+			defName="RNApparel_Shirt_NomadShirt" or
+			defName="RNApparel_Polo_WPSRed" or
+			defName="RNApparel_Shirt_ButSarge"
+			]/statBases </xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>3</WornBulk>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+			<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_Shirt_LiteDDPM" or
+			defName="RNApparel_Shirt_EllieShirt" or
+			defName="RNApparel_Shirt_NomadShirt" or
+			defName="RNApparel_Polo_WPSRed" or
+			defName="RNApparel_Shirt_ButSarge"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<!-- Equivalent to vanilla pants, T-shirt and button-down shirt -->
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Causals Division ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_Hoodie_Ryan"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>3</WornBulk>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+			<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_Hoodie_Ryan"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<!-- Equivalent to vanilla pants, T-shirt and button-down shirt -->
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Ada Wong outfit (Resident Evil) ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_Shirt_AdaREmake"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>3</WornBulk>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+			<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNApparel_Shirt_AdaREmake"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<!-- Equivalent to vanilla pants, T-shirt and button-down shirt -->
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimmu-Nation - Clothing/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Shell.xml b/ModPatches/Rimmu-Nation - Clothing/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Shell.xml
new file mode 100644
index 0000000000..cf89f8f060
--- /dev/null
+++ b/ModPatches/Rimmu-Nation - Clothing/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Shell.xml	
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Smocks / Parkas ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_Parka" or
+			defName="RNApparel_Parka_M65Blank"
+			]/statBases </xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_Parka" or
+			defName="RNApparel_Parka_M65Blank"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Ghillie suit ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNApparel_GhillieSuit"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>7.5</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- ========== Trench Coats ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_TrenchCoat_Brown" or
+			defName="RNApparel_TrenchCoat_Gray" or
+			defName="RNApparel_TrenchCoat_PUBG"
+			]/statBases </xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<WornBulk>7</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_TrenchCoat_Brown" or
+			defName="RNApparel_TrenchCoat_Gray" or
+			defName="RNApparel_TrenchCoat_PUBG"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Suit Jackets ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_Blazer_Black" or
+			defName="RNApparel_Blazer_Blue"
+			]/statBases </xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_Blazer_Black" or
+			defName="RNApparel_Blazer_Blue"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Tracksuit Jackets ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_Tracksuit_Blue" or
+			defName="RNApparel_Tracksuit_Red"
+			]/statBases </xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_Tracksuit_Blue" or
+			defName="RNApparel_Tracksuit_Red"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Leather Jackets ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_Jacket_Bomber" or
+			defName="RNApparel_Jacket_Division" or
+			defName="RNApparel_Jacket_LeatherBlank"
+			]/statBases </xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_Jacket_Bomber" or
+			defName="RNApparel_Jacket_Division" or
+			defName="RNApparel_Jacket_LeatherBlank"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Combat Jackets ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_CombatJacket_Urban" or
+			defName="RNApparel_CombatJacket_Olive" or
+			defName="RNApparel_CombatJacket_DCU" or
+			defName="RNApparel_CombatJacket_DPM" or
+			defName="RNApparel_CombatJacket_M81C" or
+			defName="RNApparel_CombatJacket_Multicam"
+			]/statBases </xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_CombatJacket_Urban" or
+			defName="RNApparel_CombatJacket_Olive" or
+			defName="RNApparel_CombatJacket_DCU" or
+			defName="RNApparel_CombatJacket_DPM" or
+			defName="RNApparel_CombatJacket_M81C" or
+			defName="RNApparel_CombatJacket_Multicam"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Tactical Jackets ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_TacticalJacket" or
+			defName="RNApparel_TacticalJacket_M81C" or
+			defName="RNApparel_TacticalJacket_Multicam"
+			]/statBases </xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNApparel_TacticalJacket" or
+			defName="RNApparel_TacticalJacket_M81C" or
+			defName="RNApparel_TacticalJacket_Multicam"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimmu-Nation - Security/Defs/Rimmu-Nation - Security/Ammo_SSM.xml b/ModPatches/Rimmu-Nation - Security/Defs/Rimmu-Nation - Security/Ammo_SSM.xml
new file mode 100644
index 0000000000..a3247cb01d
--- /dev/null
+++ b/ModPatches/Rimmu-Nation - Security/Defs/Rimmu-Nation - Security/Ammo_SSM.xml	
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ========== SSM Missile ========== -->
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_130mmType63_SSM</defName>
+		<label>130mm Type 63 Rockets</label>
+		<ammoTypes>
+			<Ammo_130mmType63_HE>Bullet_130mmType63_SSM</Ammo_130mmType63_HE>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base130mmType63">
+		<defName>Bullet_130mmType63_SSM</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>130mm Type 63 Rocket (HE)</label>
+
+		<graphicData>
+			<texPath>Things/Projectile/Rocket/130mmType63</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>254</damageAmountBase>
+			<explosionRadius>3.5</explosionRadius>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<speed>0</speed>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>80</Fragment_Large>
+					<Fragment_Small>100</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Rimmu-Nation - Security/Patches/Rimmu-Nation - Security/ThingDefs_Security.xml b/ModPatches/Rimmu-Nation - Security/Patches/Rimmu-Nation - Security/ThingDefs_Security.xml
new file mode 100644
index 0000000000..a1efd390b7
--- /dev/null
+++ b/ModPatches/Rimmu-Nation - Security/Patches/Rimmu-Nation - Security/ThingDefs_Security.xml	
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- C4 -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "RNTrap_C4Charge"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>2</Steel>
+				<ComponentIndustrial>2</ComponentIndustrial>
+				<FSX>12</FSX>
+			</costList>
+		</value>
+	</Operation>
+
+	<!-- Claymore -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName = "RNTrap_Claymore"]</xpath>
+	</Operation>
+
+	<!-- AT Mine -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "RNTrap_ATMine"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>20</Steel>
+				<ComponentIndustrial>1</ComponentIndustrial>
+				<FSX>8</FSX>
+			</costList>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimmu-Nation - Security/Patches/Rimmu-Nation - Security/ThingDefs_Turrets.xml b/ModPatches/Rimmu-Nation - Security/Patches/Rimmu-Nation - Security/ThingDefs_Turrets.xml
new file mode 100644
index 0000000000..474c4aa454
--- /dev/null
+++ b/ModPatches/Rimmu-Nation - Security/Patches/Rimmu-Nation - Security/ThingDefs_Turrets.xml	
@@ -0,0 +1,362 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName = "RNTurret_SentryGun" or
+			defName = "RNTurret_SentrySMG" or
+			defName = "RNTurret_SentrySniper" or
+			defName = "RNTurret_SentryNLAR"
+			]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "RNTurret_SentryGun" or
+			defName = "RNTurret_SentrySMG" or
+			defName = "RNTurret_SentrySniper" or
+			defName = "RNTurret_SSMTurret" or
+			defName = "RNTurret_SentryNLAR"
+			]/thingClass </xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "RNTurret_SentryGun" or
+			defName = "RNTurret_SentrySniper" or
+			defName = "RNTurret_SentryNLAR"
+			]/fillPercent </xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName = "RNTurret_SentryGun" or
+			defName = "RNTurret_SentryNLAR"
+			]/statBases </xpath>
+		<value>
+			<AimingAccuracy>0.25</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName = "RNTurret_SentryGun" or
+			defName = "RNTurret_SentrySMG" or
+			defName = "RNTurret_SentrySniper" or
+			defName = "RNTurret_SSMTurret" or
+			defName = "RNTurret_SentryNLAR"
+			]/comps/li[@Class="CompProperties_Explosive"] </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "RNTurret_SentrySniper"
+			]/statBases/ShootingAccuracyTurret </xpath>
+		<value>
+			<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<!-- ========== Sentry Gun ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "RNTurret_SentryGun"]/comps/li[@Class="CompProperties_Power"]</xpath>
+		<value>
+			<li Class="CompProperties_Power">
+				<compClass>CompPowerTrader</compClass>
+				<basePowerConsumption>1500</basePowerConsumption>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_SentryGun</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.31</SwayFactor>
+			<Bulk>8.02</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.59</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>2.3</warmupTime>
+			<range>62</range>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<burstShotCount>100</burstShotCount>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>500</magazineSize>
+			<reloadTime>9.2</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== SMG Sentry Gun ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_SentrySMG</defName>
+		<statBases>
+			<Mass>2.60</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>0.77</SwayFactor>
+			<Bulk>10</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.05</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>31</range>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNP90Shot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_FN57x28mm</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Sniper Turret ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "RNTurret_SentrySniper"]/comps/li[@Class="CompProperties_Power"]</xpath>
+		<value>
+			<li Class="CompProperties_Power">
+				<compClass>CompPowerTrader</compClass>
+				<basePowerConsumption>1500</basePowerConsumption>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_SentrySniper</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>5</RangedWeapon_Cooldown>
+			<SightsEfficiency>2</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<Bulk>11.90</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>4.1</warmupTime>
+			<range>86</range>
+			<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
+			<soundCast>RNShot50Cal</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>18</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== NL Turret ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "RNTurret_SentryNLAR"]/comps/li[@Class="CompProperties_Power"]</xpath>
+		<value>
+			<li Class="CompProperties_Power">
+				<compClass>CompPowerTrader</compClass>
+				<basePowerConsumption>1250</basePowerConsumption>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNTurret_SentryNLAR"]/label</xpath>
+		<value>
+			<label>sentry shotgun turret</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNTurret_SentryNLAR"]/description</xpath>
+		<value>
+			<description>A versatile turret capable of firing a variety of different munitions, including buckshot, EMP slugs, and non-lethal beanbag projectiles, though the bulky shells mean the ammo capacity is somewhat limited. Its dumb AI brain can't be directly controlled, so beware of friendly fire.</description>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNGun_SentryNLAR"]/label</xpath>
+		<value>
+			<label>sentry shotgun</label>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_SentryNLAR</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>0.82</SwayFactor>
+			<Bulk>20.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.76</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Beanbag</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>22</range>
+			<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+			<burstShotCount>5</burstShotCount>
+			<soundCast>GunShotA</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>6</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== SSM ========== -->
+
+	<!-- SSM Base -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNTurret_SSM"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNTurret_SSM"]/statBases</xpath>
+		<value>
+			<ShootingAccuracyTurret>0.75</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<!-- SSM Top -->
+
+	<!-- Glitter Tech Fix -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "RNArtillery_SSMTurret"]/statBases</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "RNArtillery_SSMTurret"]</xpath>
+			<value>
+				<statBases>
+					<SightsEfficiency>1</SightsEfficiency>
+				</statBases>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "RNArtillery_SSMTurret"]/statBases</xpath>
+			<value>
+				<SightsEfficiency>1</SightsEfficiency>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "RNArtillery_SSMTurret"]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_Charges">
+					<chargeSpeeds>
+						<li>30</li>
+						<li>50</li>
+						<li>70</li>
+						<li>90</li>
+					</chargeSpeeds>
+				</li>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>3</magazineSize>
+					<reloadTime>8</reloadTime>
+					<ammoSet>AmmoSet_130mmType63_SSM</ammoSet>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "RNArtillery_SSMTurret"]/weaponTags</xpath>
+		<value>
+			<li>TurretGun</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "RNArtillery_SSMTurret"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+					<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_130mmType63_SSM</defaultProjectile>
+					<warmupTime>11</warmupTime>
+					<minRange>32</minRange>
+					<range>700</range>
+					<burstShotCount>1</burstShotCount>
+					<soundCast>InfernoCannon_Fire</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>16</muzzleFlashScale>
+					<circularError>0.1</circularError>
+					<indirectFirePenalty>0.1</indirectFirePenalty>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimmu-Nation - Weapons/Defs/Rimmu-Nation - Weapons/RNW_CE_Patch_Proj_BallisticKnifeBlade.xml b/ModPatches/Rimmu-Nation - Weapons/Defs/Rimmu-Nation - Weapons/RNW_CE_Patch_Proj_BallisticKnifeBlade.xml
new file mode 100644
index 0000000000..22ca1ac484
--- /dev/null
+++ b/ModPatches/Rimmu-Nation - Weapons/Defs/Rimmu-Nation - Weapons/RNW_CE_Patch_Proj_BallisticKnifeBlade.xml	
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- ================== Projectile - Ballistic Knife Blade ================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BasePilumProjectile">
+		<defName>Projectile_BallisticKnifeBlade</defName>
+		<label>Ballistic knife blade</label>
+		<graphicData>
+			<texPath>ThirdParty/Rimmu-Nation - Weapons/BallisticKnifeBlade</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Stab</damageDef>
+			<damageAmountBase>4</damageAmountBase>
+			<armorPenetrationBlunt>0.38</armorPenetrationBlunt>
+			<armorPenetrationSharp>1</armorPenetrationSharp>
+			<speed>6</speed>
+		</projectile>
+	</ThingDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_BigGuns.xml b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_BigGuns.xml
new file mode 100644
index 0000000000..6f5032da46
--- /dev/null
+++ b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_BigGuns.xml	
@@ -0,0 +1,860 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== AT4 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNEx_AT4RL</defName>
+		<statBases>
+			<Mass>8.00</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.82</SwayFactor>
+			<Bulk>11.20</Bulk>
+			<WorkToMake>26000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>65</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+			<FSX>6</FSX>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_84mmAT4_HEAT</defaultProjectile>
+			<warmupTime>1.9</warmupTime>
+			<range>40</range>
+			<soundCast>RNShotLauncher</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>15</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<FireModes>
+			<aiUseBurstMode>false</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Carl Gustaf Recoiless Rifle ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNEx_CarlGustafRL</defName>
+		<statBases>
+			<Mass>14.20</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.18</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>2.58</SwayFactor>
+			<Bulk>12.30</Bulk>
+			<WorkToMake>29500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>105</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_84x246mmR_HEAT</defaultProjectile>
+			<warmupTime>2.05</warmupTime>
+			<range>48</range>
+			<soundCast>RNShotLauncher</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>15</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>5.6</reloadTime>
+			<ammoSet>AmmoSet_84x246mmR</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>FALSE</noSnapshot>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== China Lake Grenade Launcher ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNEx_ChinaLakeGL</defName>
+		<statBases>
+			<Mass>3.72</Mass>
+			<RangedWeapon_Cooldown>1.01</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.25</SwayFactor>
+			<Bulk>8.75</Bulk>
+			<WorkToMake>9500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>45</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>44</range>
+			<ticksBetweenBurstShots>120</ticksBetweenBurstShots>
+			<soundCast>RNShot_ChinaLakeGL</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>15</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>3</magazineSize>
+			<reloadTime>2.55</reloadTime>
+			<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Heckler & Koch HK69A1 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNEx_HK69A1GL</defName>
+		<statBases>
+			<Mass>2.60</Mass>
+			<RangedWeapon_Cooldown>0.94</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.94</SwayFactor>
+			<Bulk>4.63</Bulk>
+			<WorkToMake>11500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>44</range>
+			<soundCast>RNShotGL</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>15</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== FGM-148 Javelin ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNEx_JavelinRL</defName>
+		<statBases>
+			<Mass>22.30</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.72</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>3.55</SwayFactor>
+			<Bulk>13.00</Bulk>
+			<WorkToMake>41500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>135</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+			<FSX>17</FSX>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_127mmJavelinMissile</defaultProjectile>
+			<warmupTime>2.5</warmupTime>
+			<range>156</range>
+			<soundCast>RNShotLauncher</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>15</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<!-- RN Weapons version of FGM-148 Javelin is single-use only -->
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== M72 LAW ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNEx_M72LAW</defName>
+		<statBases>
+			<Mass>3.60</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.24</SwayFactor>
+			<Bulk>7.30</Bulk>
+			<WorkToMake>22500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+			<FSX>3</FSX>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_M72LAW</defaultProjectile>
+			<warmupTime>1.9</warmupTime>
+			<range>31</range>
+			<soundCast>RNShotLauncher</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>15</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== M202 FLASH ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNEx_M202FLASH</defName>
+		<statBases>
+			<Mass>5.22</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.41</SwayFactor>
+			<Bulk>10.86</Bulk>
+			<WorkToMake>27000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>70</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_M74_Incendiary</defaultProjectile>
+			<warmupTime>1.8</warmupTime>
+			<range>31</range>
+			<soundCast>RNShotLauncher</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>15</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>4</magazineSize>
+			<reloadTime>5.6</reloadTime>
+			<ammoSet>AmmoSet_M74</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== M320 Grenade Launcher Module ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNEx_M320GL</defName>
+		<statBases>
+			<Mass>1.27</Mass>
+			<RangedWeapon_Cooldown>0.53</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>0.48</SwayFactor>
+			<Bulk>2.85</Bulk>
+			<WorkToMake>13500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>25</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>44</range>
+			<burstShotCount>1</burstShotCount>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<soundCast>RNShotGL</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>15</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== MATADOR ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNEx_MATADORRL</defName>
+		<statBases>
+			<Mass>8.90</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.89</SwayFactor>
+			<Bulk>11.00</Bulk>
+			<WorkToMake>28500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>70</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+			<FSX>7</FSX>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_90mmMATADOR</defaultProjectile>
+			<warmupTime>1.8</warmupTime>
+			<range>48</range>
+			<soundCast>RNShotLauncher</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>15</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== MBT LAW / NLAW ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNEx_MBTLAWRL</defName>
+		<statBases>
+			<Mass>12.50</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>2.27</SwayFactor>
+			<Bulk>11.16</Bulk>
+			<WorkToMake>30500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>20</Chemfuel>
+			<Steel>75</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+			<FSX>9</FSX>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_150mmMBTLAWMissile</defaultProjectile>
+			<warmupTime>1.8</warmupTime>
+			<range>48</range>
+			<ticksBetweenBurstShots>20</ticksBetweenBurstShots>
+			<soundCast>RNShotLauncher</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>15</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Milkor MGL ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNEx_MilkorMGL</defName>
+		<statBases>
+			<Mass>5.30</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>1.31</SwayFactor>
+			<Bulk>5.65</Bulk>
+			<WorkToMake>19000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>40</range>
+			<soundCast>RNShot_ChinaLakeGL</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>15</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>5.1</reloadTime>
+			<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== RPG-7V2 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNEx_RPG7V2RL</defName>
+		<statBases>
+			<Mass>7.00</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.16</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.68</SwayFactor>
+			<Bulk>10.50</Bulk>
+			<WorkToMake>25500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>70</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_RPG7Grenade_HEAT</defaultProjectile>
+			<warmupTime>2.035</warmupTime>
+			<range>40</range>
+			<soundCast>RNShotRPG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>15</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>5.6</reloadTime>
+			<ammoSet>AmmoSet_RPG7Grenade</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== RPG-28 Klyukva ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNEx_RPG28RL</defName>
+		<statBases>
+			<Mass>13.00</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>2.50</SwayFactor>
+			<Bulk>13.00</Bulk>
+			<WorkToMake>29000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>90</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+			<FSX>10</FSX>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_RPG28Klyukva</defaultProjectile>
+			<warmupTime>1.9</warmupTime>
+			<range>40</range>
+			<soundCast>RNShotRPG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>15</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== RPG-32 Barkas ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNEx_RPG32RL</defName>
+		<statBases>
+			<Mass>3.00</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.12</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.52</SwayFactor>
+			<Bulk>13.00</Bulk>
+			<WorkToMake>26500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>60</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_RPG32Rocket_HEAT</defaultProjectile>
+			<warmupTime>2</warmupTime>
+			<range>44</range>
+			<soundCast>RNShotRPG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>15</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>5.6</reloadTime>
+			<ammoSet>AmmoSet_RPG32Rocket</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== SMAW ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNEx_SMAWRL</defName>
+		<statBases>
+			<Mass>7.54</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.23</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>2.16</SwayFactor>
+			<Bulk>14.71</Bulk>
+			<WorkToMake>31500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>20</Chemfuel>
+			<Steel>70</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_83mmSMAW_HEAT</defaultProjectile>
+			<warmupTime>2.09</warmupTime>
+			<range>48</range>
+			<soundCast>RNShotLauncher</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>15</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>5.6</reloadTime>
+			<ammoSet>AmmoSet_83mmSMAW</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== XM25 CDTE ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNEx_XM25GL</defName>
+		<statBases>
+			<Mass>6.35</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.42</SwayFactor>
+			<Bulk>7.49</Bulk>
+			<WorkToMake>31000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_25x40mmGrenade_HE</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>48</range>
+			<soundCast>RNShotXM25</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>15</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_25x40mmGrenade</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNEx_ChinaLakeGL" or
+			defName="RNEx_HK69A1GL" or
+			defName="RNEx_M320GL" or
+			defName="RNEx_MilkorMGL" or
+			defName="RNEx_XM25GL"
+			]/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="RNEx_AT4RL" or
+			defName="RNEx_CarlGustafRL" or
+			defName="RNEx_JavelinRL" or
+			defName="RNEx_M72LAW" or
+			defName="RNEx_M202FLASH" or
+			defName="RNEx_MATADORRL" or
+			defName="RNEx_MBTLAWRL" or
+			defName="RNEx_RPG7V2RL" or
+			defName="RNEx_RPG28RL" or
+			defName="RNEx_RPG32RL" or
+			defName="RNEx_SMAWRL"
+			]/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>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_Grenades.xml b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_Grenades.xml
new file mode 100644
index 0000000000..f82271bb21
--- /dev/null
+++ b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_Grenades.xml	
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Remove Grenades and their projectiles ========== -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RNThrown_HeNade"]</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RNProj_HEGrenade"]</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RNThrown_Vodka"]</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RNProj_Molotov"]</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RNThrown_Flashbang"]</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RNProj_Flash"]</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RNThrown_Incendiary"]</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RNProj_Incendiary"]</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RNThrown_Smoke"]</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RNProj_Smoke"]</xpath>
+	</Operation>
+
+	<!-- ========== Patch C4 ========== -->
+
+	<!-- Projectile def -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNProj_C4CSGO"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNProj_C4CSGO"]/graphicData/texPath</xpath>
+		<value>
+			<texPath>Things/Projectile/Proj_CSGOC4</texPath>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNProj_C4CSGO"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<explosionRadius>4</explosionRadius>
+				<damageDef>Bomb</damageDef>
+				<damageAmountBase>328</damageAmountBase>
+				<explosionDelay>500</explosionDelay>
+				<dropsCasings>true</dropsCasings>
+				<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+				<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<speed>6</speed>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="RNProj_C4CSGO"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="RNProj_C4CSGO"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNProj_C4CSGO"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>345</Fragment_Small>
+				</fragments>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Weapon def -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RNThrown_C4CSGO"]</xpath>
+		<value>
+			<thingClass>CombatExtended.AmmoThing</thingClass>
+			<stackLimit>25</stackLimit>
+			<resourceReadoutPriority>First</resourceReadoutPriority>
+			<drawGUIOverlay>true</drawGUIOverlay>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="RNThrown_C4CSGO"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="RNThrown_C4CSGO"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="RNThrown_C4CSGO"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<!-- Unthrown C4 does not have CombatExtended.CompProperties_ExplosiveCE, as C4 does not explode if dropped, shot at or set on fire -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNThrown_C4CSGO</defName>
+		<statBases>
+			<Mass>2.92</Mass>
+			<Bulk>6.8</Bulk>
+			<MarketValue>184.2</MarketValue>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<WorkToMake>6000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>8</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+			<FSX>7</FSX>
+		</costList>
+		<Properties>
+			<label>arm and throw C4</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<range>3</range>
+			<warmupTime>2.5</warmupTime>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<soundCast>CSGOC4Shot</soundCast>
+			<soundAiming>CSGOC4_Aiming</soundAiming>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<defaultProjectile>RNProj_C4CSGO</defaultProjectile>
+			<onlyManualCast>true</onlyManualCast>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<weaponTags>
+			<li>RN_CSGOC4</li>
+		</weaponTags>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_HRT_Pack.xml b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_HRT_Pack.xml
new file mode 100644
index 0000000000..ed61d5c72e
--- /dev/null
+++ b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_HRT_Pack.xml	
@@ -0,0 +1,489 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Heckler & Koch G36C - Hostage Rescue Team variant ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_G36CHRT</defName>
+		<statBases>
+			<Mass>2.82</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.18</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.03</SwayFactor>
+			<Bulk>5.00</Bulk>
+			<WorkToMake>34000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>30</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.43</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>0.9</warmupTime>
+			<range>31</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShotG36C</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Glock 17 - Hostage Rescue Team variant ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Glock17_HRT</defName>
+		<statBases>
+			<Mass>0.66</Mass>
+			<RangedWeapon_Cooldown>0.40</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.84</SwayFactor>
+			<Bulk>1.86</Bulk>
+			<WorkToMake>7500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>20</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShotGlock17</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>17</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Heckler & Koch HK417 - Hostage Rescue Team variant ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_HK417HRTDMR</defName>
+		<statBases>
+			<Mass>4.23</Mass>
+			<RangedWeapon_Cooldown>0.57</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.36</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.10</SwayFactor>
+			<Bulk>11.05</Bulk>
+			<WorkToMake>30000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>60</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.6</warmupTime>
+			<range>75</range>
+			<soundCast>RNShot_GenericDMR</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== M4A1 - Hostage Rescue Team variant ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M4A1HRT</defName>
+		<statBases>
+			<Mass>2.90</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>1.17</SwayFactor>
+			<Bulk>7.56</Bulk>
+			<WorkToMake>35500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.58</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR_II</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== M9A1 - Hostage Rescue Team variant ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M9A1_HRT</defName>
+		<statBases>
+			<Mass>1.01</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.06</SwayFactor>
+			<Bulk>2.17</Bulk>
+			<WorkToMake>7000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNPistolShot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== M24A2 - Hostage Rescue Team variant ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M24A2HRTSn</defName>
+		<statBases>
+			<Mass>7.10</Mass>
+			<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.60</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>11.92</Bulk>
+			<WorkToMake>30500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>65</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.8</warmupTime>
+			<range>75</range>
+			<soundCast>RNShot_GenericBoltSniper</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== MP5A2 SD - Hostage Rescue Team variant ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_MP5A2SDHRT_PDW</defName>
+		<statBases>
+			<Mass>2.50</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>0.93</SwayFactor>
+			<Bulk>6.80</Bulk>
+			<WorkToMake>29000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.60</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>31</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShotSMG2SD</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Remington 870 - Hostage Rescue Team variant ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Remington870HRT</defName>
+		<statBases>
+			<Mass>2.72</Mass>
+			<RangedWeapon_Cooldown>1.02</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.12</SwayFactor>
+			<Bulk>7.67</Bulk>
+			<WorkToMake>14500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RN870Shot</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>5.1</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== UMP 45 - Hostage Rescue Team variant ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_UMP45HRT_PDW</defName>
+		<statBases>
+			<Mass>2.54</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.94</SwayFactor>
+			<Bulk>4.50</Bulk>
+			<WorkToMake>30500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>30</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.84</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>15</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNUMP45Shot</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNGun_Glock17_HRT" or
+			defName="RNGun_M9A1_HRT"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNGun_G36CHRT" or
+			defName="RNGun_HK417HRTDMR" or
+			defName="RNGun_M4A1HRT" or
+			defName="RNGun_M24A2HRTSn" or
+			defName="RNGun_MP5A2SDHRT_PDW" or
+			defName="RNGun_Remington870HRT" or
+			defName="RNGun_UMP45HRT_PDW"
+			]/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>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_LMG.xml b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_LMG.xml
new file mode 100644
index 0000000000..857d7e81c9
--- /dev/null
+++ b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_LMG.xml	
@@ -0,0 +1,776 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== DP-27 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_DP27LMG</defName>
+		<statBases>
+			<Mass>9.12</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.53</SwayFactor>
+			<Bulk>14.70</Bulk>
+			<WorkToMake>32000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>85</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.32</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<soundCast>RNShotDP28LMG</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>47</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_MachineGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== FN Minimi ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_FNMinimi</defName>
+		<statBases>
+			<Mass>8.00</Mass>
+			<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>1.25</SwayFactor>
+			<Bulk>11.63</Bulk>
+			<WorkToMake>45000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>65</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>0.91</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>75</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShotL86LMG</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== FN Minimi C9A1 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_C9A1Minimi</defName>
+		<statBases>
+			<Mass>7.12</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.20</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.25</SwayFactor>
+			<Bulk>13.40</Bulk>
+			<WorkToMake>40500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>80</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>0.97</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.47</warmupTime>
+			<range>75</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShotL86LMG</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== FN MAG ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_FNMAG</defName>
+		<statBases>
+			<Mass>11.80</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.71</SwayFactor>
+			<Bulk>15.63</Bulk>
+			<WorkToMake>41000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>100</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.21</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>RNShotM240B</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== HK MG4 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_HKMG4LMG</defName>
+		<statBases>
+			<Mass>8.15</Mass>
+			<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.18</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.31</SwayFactor>
+			<Bulk>11.30</Bulk>
+			<WorkToMake>44500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>65</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>0.90</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.45</warmupTime>
+			<range>75</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShotL86LMG</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== HK MG5 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_HKMG5LMG</defName>
+		<statBases>
+			<Mass>11.20</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.62</SwayFactor>
+			<Bulk>12.60</Bulk>
+			<WorkToMake>47000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>80</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.24</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>RNShotM240B</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>120</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== IMI Negev ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_NegevLMG</defName>
+		<statBases>
+			<Mass>7.60</Mass>
+			<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.25</SwayFactor>
+			<Bulk>11.10</Bulk>
+			<WorkToMake>39500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>75</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>0.93</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShotL86LMG</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>150</magazineSize>
+			<reloadTime>7.80</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== M60 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M60LMG</defName>
+		<statBases>
+			<Mass>10.50</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.51</SwayFactor>
+			<Bulk>14.05</Bulk>
+			<WorkToMake>40500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>85</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.30</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>RNShotM60LMG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_MachineGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== M240B ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M240B</defName>
+		<statBases>
+			<Mass>12.50</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.20</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.78</SwayFactor>
+			<Bulk>15.63</Bulk>
+			<WorkToMake>46000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>20</Chemfuel>
+			<Steel>90</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.18</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.47</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>RNShotM240B</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== M249 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M249LMG</defName>
+		<statBases>
+			<Mass>7.50</Mass>
+			<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.21</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>13.35</Bulk>
+			<WorkToMake>42500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>70</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>0.94</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.475</warmupTime>
+			<range>75</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNShotL86LMG</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Mk 48 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_MK48LMG</defName>
+		<statBases>
+			<Mass>8.20</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>13.00</Bulk>
+			<WorkToMake>40500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>70</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.48</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>RNShotM240B</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.80</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== PKM ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_PKMLMG</defName>
+		<statBases>
+			<Mass>7.50</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.36</SwayFactor>
+			<Bulk>14.92</Bulk>
+			<WorkToMake>36000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>80</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.45</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<soundCast>RNShotM240B</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_MachineGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== RPD ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_RPD</defName>
+		<statBases>
+			<Mass>7.40</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.24</SwayFactor>
+			<Bulk>13.37</Bulk>
+			<WorkToMake>35000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>70</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.22</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>62</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShotRPD</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_MachineGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== RPK-74 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_RPK74LMG</defName>
+		<statBases>
+			<Mass>4.80</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.06</SwayFactor>
+			<Bulk>12.40</Bulk>
+			<WorkToMake>29500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>65</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.54</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNShotRPK</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>75</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_MachineGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Zastava M84 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_ZastavaM84LMG</defName>
+		<statBases>
+			<Mass>8.80</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.44</SwayFactor>
+			<Bulk>14.75</Bulk>
+			<WorkToMake>36500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>85</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.33</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<soundCast>RNShotM240B</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_MachineGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNGun_DP27LMG" or
+			defName="RNGun_FNMinimi" or
+			defName="RNGun_C9A1Minimi" or
+			defName="RNGun_FNMAG" or
+			defName="RNGun_HKMG4LMG" or
+			defName="RNGun_HKMG5LMG" or
+			defName="RNGun_NegevLMG" or
+			defName="RNGun_M60LMG" or
+			defName="RNGun_M240B" or
+			defName="RNGun_M249LMG" or
+			defName="RNGun_MK48LMG" or
+			defName="RNGun_PKMLMG" or
+			defName="RNGun_RPD" or
+			defName="RNGun_RPK74LMG" or
+			defName="RNGun_ZastavaM84LMG"
+			]/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>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_M_BoltAction.xml b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_M_BoltAction.xml
new file mode 100644
index 0000000000..1c0cb5f56d
--- /dev/null
+++ b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_M_BoltAction.xml	
@@ -0,0 +1,1251 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Accuracy International AW50 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_AW50Sn</defName>
+		<statBases>
+			<Mass>13.50</Mass>
+			<RangedWeapon_Cooldown>1.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.72</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>2.02</SwayFactor>
+			<Bulk>15.20</Bulk>
+			<WorkToMake>36500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>20</Chemfuel>
+			<Steel>95</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>3.4</warmupTime>
+			<range>112</range>
+			<soundCast>RNShot_AWP</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== C14 Timberwolf ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_C14TimberwolfSn</defName>
+		<statBases>
+			<Mass>7.10</Mass>
+			<RangedWeapon_Cooldown>1.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.96</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.42</SwayFactor>
+			<Bulk>13.00</Bulk>
+			<WorkToMake>36000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>70</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
+			<warmupTime>2.1</warmupTime>
+			<range>112</range>
+			<soundCast>RNShot_GenericBoltSniper_II</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_338Lapua</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== C3A1 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_C3A1Sn</defName>
+		<statBases>
+			<Mass>7.20</Mass>
+			<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.60</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.50</SwayFactor>
+			<Bulk>14.21</Bulk>
+			<WorkToMake>23500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>20</WoodLog>
+			<Steel>70</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.8</warmupTime>
+			<range>97</range>
+			<soundCast>RNShot_GenericBoltSniper_II</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>10</AmmoGenPerMagOverride>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== CDX-33 Patriot Lite ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_CDX33PatriotLiteSn</defName>
+		<statBases>
+			<Mass>6.58</Mass>
+			<RangedWeapon_Cooldown>1.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>3.50</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.42</SwayFactor>
+			<Bulk>11.32</Bulk>
+			<WorkToMake>39500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>75</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
+			<warmupTime>2.55</warmupTime>
+			<range>117</range>
+			<soundCast>RNShot_GenericBoltSniper_II</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_338Lapua</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== CS-LR4 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_CSLR4Sn</defName>
+		<statBases>
+			<Mass>6.50</Mass>
+			<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>3.92</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.31</SwayFactor>
+			<Bulk>12.00</Bulk>
+			<WorkToMake>43000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>65</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>2.9</warmupTime>
+			<range>62</range>
+			<soundCast>RNShot_CSLR4Sn</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Desert Tech HTI ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_DesertTechHTISn</defName>
+		<statBases>
+			<Mass>9.09</Mass>
+			<RangedWeapon_Cooldown>1.40</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.72</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.53</SwayFactor>
+			<Bulk>12.52</Bulk>
+			<WorkToMake>40000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>80</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>3.4</warmupTime>
+			<range>126</range>
+			<soundCast>RNShot_SRSSD</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Desert Tech SRS ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_DesertTechSRS</defName>
+		<statBases>
+			<Mass>5.6</Mass>
+			<RangedWeapon_Cooldown>1.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>3.50</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.14</SwayFactor>
+			<Bulk>10.52</Bulk>
+			<WorkToMake>47000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>60</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
+			<warmupTime>2.55</warmupTime>
+			<range>119</range>
+			<soundCast>RNShot_SRSSD</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_338Lapua</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== FN Ballista ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_FNBallista</defName>
+		<statBases>
+			<Mass>7.54</Mass>
+			<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>3.92</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.51</SwayFactor>
+			<Bulk>10.91</Bulk>
+			<WorkToMake>44500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>75</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>2.9</warmupTime>
+			<range>112</range>
+			<soundCast>RNShotBallista</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== GOL Magnum ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_GOLMagnumSn</defName>
+		<statBases>
+			<Mass>6.00</Mass>
+			<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>3.20</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.37</SwayFactor>
+			<Bulk>13.30</Bulk>
+			<WorkToMake>33500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>65</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>2.3</warmupTime>
+			<range>112</range>
+			<soundCast>RNShotGOL</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Haenel RS9 / G29 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_HaenelRS9Sn</defName>
+		<statBases>
+			<Mass>8.00</Mass>
+			<RangedWeapon_Cooldown>1.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>3.50</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.54</SwayFactor>
+			<Bulk>11.20</Bulk>
+			<WorkToMake>40000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>80</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
+			<warmupTime>2.55</warmupTime>
+			<range>112</range>
+			<soundCast>RNShot_G29Sn</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_338Lapua</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== CheyTac Intervention ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_InterventionSn</defName>
+		<statBases>
+			<Mass>15.20</Mass>
+			<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>3.32</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>2.06</SwayFactor>
+			<Bulk>12.87</Bulk>
+			<WorkToMake>42500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>110</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_408CheyenneTactical_FMJ</defaultProjectile>
+			<warmupTime>2.4</warmupTime>
+			<range>156</range>
+			<soundCast>RNShotIntervention</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_408CheyenneTactical</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Kar98k ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Kar98k</defName>
+		<statBases>
+			<Mass>4.10</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.56</SwayFactor>
+			<Bulk>11.10</Bulk>
+			<WorkToMake>15000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>86</range>
+			<soundCast>RNShot_BoltActionOldie</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== L115A3 SD / Accuracy International AWM ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_L115A3Sn</defName>
+		<statBases>
+			<Mass>7.18</Mass>
+			<RangedWeapon_Cooldown>1.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>3.50</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.61</SwayFactor>
+			<Bulk>15.60</Bulk>
+			<WorkToMake>42000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>20</Chemfuel>
+			<Steel>70</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
+			<warmupTime>2.55</warmupTime>
+			<range>107</range>
+			<soundCast>RNShot_BoltGenericSD</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_338Lapua</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== L96A1 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_L96A1Sn</defName>
+		<statBases>
+			<Mass>6.50</Mass>
+			<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.36</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.32</SwayFactor>
+			<Bulk>12.80</Bulk>
+			<WorkToMake>26500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>65</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.6</warmupTime>
+			<range>75</range>
+			<soundCast>RNShot_L96A1Sn</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Lee Enfield ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_LeeEnfield</defName>
+		<statBases>
+			<Mass>4.19</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.21</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.71</SwayFactor>
+			<Bulk>12.60</Bulk>
+			<WorkToMake>15500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>55</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
+			<warmupTime>1.275</warmupTime>
+			<range>55</range>
+			<soundCast>RNShot_BoltActionOldie</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_303British</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== M24A2 SD ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M24A2SDSn</defName>
+		<statBases>
+			<Mass>7.82</Mass>
+			<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.60</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.57</SwayFactor>
+			<Bulk>14.59</Bulk>
+			<WorkToMake>32500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>20</Chemfuel>
+			<Steel>70</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.8</warmupTime>
+			<range>75</range>
+			<soundCast>RNShot_BoltGenericSD</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== M24A2 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M24A2Sn</defName>
+		<statBases>
+			<Mass>7.10</Mass>
+			<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.60</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>11.92</Bulk>
+			<WorkToMake>30500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>65</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.8</warmupTime>
+			<range>75</range>
+			<soundCast>RNShot_GenericBoltSniper</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== M40A5 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M40A3Sn</defName>
+		<statBases>
+			<Mass>7.50</Mass>
+			<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.72</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.40</SwayFactor>
+			<Bulk>12.24</Bulk>
+			<WorkToMake>31500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>65</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.9</warmupTime>
+			<range>75</range>
+			<soundCast>RNShotM40Sniper</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Mosin Nagant ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_MosinNagant</defName>
+		<statBases>
+			<Mass>4.00</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.21</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.67</SwayFactor>
+			<Bulk>12.32</Bulk>
+			<WorkToMake>15500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>55</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1.275</warmupTime>
+			<range>75</range>
+			<soundCast>RNShot_BoltActionOldie</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Remington 700 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_R700Sn</defName>
+		<statBases>
+			<Mass>4.08</Mass>
+			<RangedWeapon_Cooldown>1.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.72</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.15</SwayFactor>
+			<Bulk>12.08</Bulk>
+			<WorkToMake>26000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>55</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.9</warmupTime>
+			<range>75</range>
+			<soundCast>RNShotM40Sniper</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.25</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Remington MSR ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_RemingtonMSR</defName>
+		<statBases>
+			<Mass>7.70</Mass>
+			<RangedWeapon_Cooldown>1.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>3.50</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.46</SwayFactor>
+			<Bulk>13.00</Bulk>
+			<WorkToMake>37500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>85</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
+			<warmupTime>2.55</warmupTime>
+			<range>112</range>
+			<soundCast>RNShot_MSR</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_338Lapua</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== SNIPEX M75 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_SNIPEXM75Sn</defName>
+		<statBases>
+			<Mass>13.50</Mass>
+			<RangedWeapon_Cooldown>1.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>3.80</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.88</SwayFactor>
+			<Bulk>13.20</Bulk>
+			<WorkToMake>48000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>105</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_127x108mm_FMJ</defaultProjectile>
+			<warmupTime>4.3</warmupTime>
+			<range>112</range>
+			<soundCast>RNShot_SNIPEX</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>5</AmmoGenPerMagOverride>
+			<reloadTime>1.35</reloadTime>
+			<ammoSet>AmmoSet_127x108mm</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Steyr SSG 08 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_SSG08Sn</defName>
+		<statBases>
+			<Mass>6.50</Mass>
+			<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.72</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.37</SwayFactor>
+			<Bulk>10.60</Bulk>
+			<WorkToMake>31000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>75</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.9</warmupTime>
+			<range>112</range>
+			<soundCast>RNShotM40Sniper</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== SV-98 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_SV98Sn</defName>
+		<statBases>
+			<Mass>6.80</Mass>
+			<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.60</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.39</SwayFactor>
+			<Bulk>13.00</Bulk>
+			<WorkToMake>26500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>65</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1.8</warmupTime>
+			<range>86</range>
+			<soundCast>RNShotSV98</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== McMillan TAC-50 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_TAC50Sn</defName>
+		<statBases>
+			<Mass>11.80</Mass>
+			<RangedWeapon_Cooldown>1.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>3.50</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.92</SwayFactor>
+			<Bulk>15.48</Bulk>
+			<WorkToMake>44500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>20</Chemfuel>
+			<Steel>90</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>4.05</warmupTime>
+			<range>126</range>
+			<soundCast>RNTac50Shot</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Zastava M07 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_ZastavaM07Sn</defName>
+		<statBases>
+			<Mass>5.40</Mass>
+			<RangedWeapon_Cooldown>1.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.72</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.30</SwayFactor>
+			<Bulk>12.91</Bulk>
+			<WorkToMake>27000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>60</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.9</warmupTime>
+			<range>86</range>
+			<soundCast>RNShot_GenericBoltSniper</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNGun_AW50Sn" or
+			defName="RNGun_C14TimberwolfSn" or
+			defName="RNGun_C3A1Sn" or
+			defName="RNGun_CDX33PatriotLiteSn" or
+			defName="RNGun_CSLR4Sn" or
+			defName="RNGun_DesertTechHTISn" or
+			defName="RNGun_DesertTechSRS" or
+			defName="RNGun_FNBallista" or
+			defName="RNGun_GOLMagnumSn" or
+			defName="RNGun_HaenelRS9Sn" or
+			defName="RNGun_InterventionSn" or
+			defName="RNGun_Kar98k" or
+			defName="RNGun_L115A3Sn" or
+			defName="RNGun_L96A1Sn" or
+			defName="RNGun_LeeEnfield" or
+			defName="RNGun_M24A2SDSn" or
+			defName="RNGun_M24A2Sn" or
+			defName="RNGun_M40A3Sn" or
+			defName="RNGun_MosinNagant" or
+			defName="RNGun_R700Sn" or
+			defName="RNGun_RemingtonMSR" or
+			defName="RNGun_SNIPEXM75Sn" or
+			defName="RNGun_SSG08Sn" or
+			defName="RNGun_SV98Sn" or
+			defName="RNGun_TAC50Sn" or
+			defName="RNGun_ZastavaM07Sn"
+			]/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>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_M_DMR.xml b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_M_DMR.xml
new file mode 100644
index 0000000000..20526c946b
--- /dev/null
+++ b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_M_DMR.xml	
@@ -0,0 +1,1632 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== ArmaLite AR-10 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_AR10DMR</defName>
+		<statBases>
+			<Mass>5.35</Mass>
+			<RangedWeapon_Cooldown>0.57</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.22</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.15</SwayFactor>
+			<Bulk>11.41</Bulk>
+			<WorkToMake>28500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>60</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.48</warmupTime>
+			<range>68</range>
+			<soundCast>RNShot_GenericDMR</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Accuracy International AS50 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_AS50AMR</defName>
+		<statBases>
+			<Mass>14.10</Mass>
+			<RangedWeapon_Cooldown>0.58</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.72</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>2.03</SwayFactor>
+			<Bulk>14.69</Bulk>
+			<WorkToMake>37000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>115</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>3.4</warmupTime>
+			<range>126</range>
+			<soundCast>RNShot50Cal</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Dragunov SVD ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_DragunovDMR</defName>
+		<statBases>
+			<Mass>4.30</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.70</SwayFactor>
+			<Bulk>12.25</Bulk>
+			<WorkToMake>23000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>60</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<soundCast>RNShotDragunov</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Heckler & Koch G28 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_G28DMR</defName>
+		<statBases>
+			<Mass>5.80</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.48</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.22</SwayFactor>
+			<Bulk>10.65</Bulk>
+			<WorkToMake>32500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>60</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.7</warmupTime>
+			<range>62</range>
+			<soundCast>RNShot_GenericDMR</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Heckler & Koch G3SG/1 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_G3SGDMR</defName>
+		<statBases>
+			<Mass>5.50</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.36</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.63</SwayFactor>
+			<Bulk>10.23</Bulk>
+			<WorkToMake>28500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>60</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.4</warmupTime>
+			<range>62</range>
+			<soundCast>RNShot_GenericDMR_III</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Heckler & Koch HK417 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_HK417DMR</defName>
+		<statBases>
+			<Mass>4.23</Mass>
+			<RangedWeapon_Cooldown>0.57</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.36</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.10</SwayFactor>
+			<Bulk>11.05</Bulk>
+			<WorkToMake>30000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>60</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.6</warmupTime>
+			<range>75</range>
+			<soundCast>RNShot_GenericDMR</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== L129A1 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_L129A1DMR</defName>
+		<statBases>
+			<Mass>4.50</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.36</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.50</SwayFactor>
+			<Bulk>9.00</Bulk>
+			<WorkToMake>29000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>55</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.4</warmupTime>
+			<range>75</range>
+			<soundCast>RNShot_GenericDMR</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Barrett M107 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M107AMR</defName>
+		<statBases>
+			<Mass>14.00</Mass>
+			<RangedWeapon_Cooldown>0.58</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.84</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>2.04</SwayFactor>
+			<Bulk>15.00</Bulk>
+			<WorkToMake>39500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>115</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>3.5</warmupTime>
+			<range>126</range>
+			<soundCast>RNShot50Cal</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== M110 SASS ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M110SASSDMR</defName>
+		<statBases>
+			<Mass>6.54</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.60</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>11.29</Bulk>
+			<WorkToMake>35500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>65</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.8</warmupTime>
+			<range>75</range>
+			<soundCast>RNShot_GenericDMR</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== M110 SASS SD ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M110SASSSDDMR</defName>
+		<statBases>
+			<Mass>7.45</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.60</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.44</SwayFactor>
+			<Bulk>12.81</Bulk>
+			<WorkToMake>37000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>75</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.8</warmupTime>
+			<range>75</range>
+			<soundCast>RNShot_DMRSDGeneric</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== M14 DMR ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M14DMR</defName>
+		<statBases>
+			<Mass>6.10</Mass>
+			<RangedWeapon_Cooldown>0.57</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.84</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.29</SwayFactor>
+			<Bulk>12.18</Bulk>
+			<WorkToMake>37500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>60</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>2</warmupTime>
+			<range>75</range>
+			<soundCast>RNShot_M14DMR</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== M14 EBR ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M14EBR</defName>
+		<statBases>
+			<Mass>6.75</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.60</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>9.89</Bulk>
+			<WorkToMake>33500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>70</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.8</warmupTime>
+			<range>75</range>
+			<soundCast>RNShot_EBRGeneric</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== M14 EBR MIL-SPEC ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M14EBRMilSpec</defName>
+		<statBases>
+			<Mass>6.75</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.60</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>9.89</Bulk>
+			<WorkToMake>33500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>70</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.8</warmupTime>
+			<range>75</range>
+			<soundCast>RNShot_EBRGeneric</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Springfield Armory M1A VLTOR ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M14VLTOR</defName>
+		<statBases>
+			<Mass>5.26</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.60</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.75</SwayFactor>
+			<Bulk>10.43</Bulk>
+			<WorkToMake>36000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>55</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.6</warmupTime>
+			<range>75</range>
+			<soundCast>RNShot_EBRGeneric</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== M21 SWS ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M21DMR</defName>
+		<statBases>
+			<Mass>5.27</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.60</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.75</SwayFactor>
+			<Bulk>11.18</Bulk>
+			<WorkToMake>29000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>55</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.6</warmupTime>
+			<range>76</range>
+			<soundCast>RNShot_M14DMR</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== M39 EMR ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M39EMR</defName>
+		<statBases>
+			<Mass>7.50</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.72</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.99</SwayFactor>
+			<Bulk>10.37</Bulk>
+			<WorkToMake>35000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>75</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.7</warmupTime>
+			<range>73</range>
+			<soundCast>RNShot_EBRGeneric</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== M39 EMR MIL-SPEC ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M39EMRMilSpec</defName>
+		<statBases>
+			<Mass>7.50</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.72</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.39</SwayFactor>
+			<Bulk>11.37</Bulk>
+			<WorkToMake>35500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>80</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.9</warmupTime>
+			<range>73</range>
+			<soundCast>RNShot_EBRGeneric</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Barrett M82A1 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M82A1AMR</defName>
+		<statBases>
+			<Mass>13.50</Mass>
+			<RangedWeapon_Cooldown>0.58</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.84</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.87</SwayFactor>
+			<Bulk>13.00</Bulk>
+			<WorkToMake>38500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>105</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>3.5</warmupTime>
+			<range>126</range>
+			<soundCast>RNShot50Cal</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Zijiang M99 / Type 99 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M99AMR</defName>
+		<statBases>
+			<Mass>12.00</Mass>
+			<RangedWeapon_Cooldown>0.58</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.72</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.96</SwayFactor>
+			<Bulk>15.80</Bulk>
+			<WorkToMake>36500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>110</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_127x108mm_FMJ</defaultProjectile>
+			<warmupTime>3.4</warmupTime>
+			<range>112</range>
+			<soundCast>RNShot50Cal</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_127x108mm</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== MK11 Mod 0 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_MK11DMR</defName>
+		<statBases>
+			<Mass>6.90</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.48</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.93</SwayFactor>
+			<Bulk>11.58</Bulk>
+			<WorkToMake>30500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>70</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>75</range>
+			<soundCast>RNShot_GenericDMR</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Mk 14 EBR ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Mk14EBR</defName>
+		<statBases>
+			<Mass>6.75</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.60</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.89</SwayFactor>
+			<Bulk>8.89</Bulk>
+			<WorkToMake>33500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>70</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.6</warmupTime>
+			<range>75</range>
+			<soundCast>RNShot_EBRGeneric</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Heckler & Koch PSG-1 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_PSG1DMR</defName>
+		<statBases>
+			<Mass>7.20</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.36</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>2.01</SwayFactor>
+			<Bulk>12.30</Bulk>
+			<WorkToMake>30500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>65</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.4</warmupTime>
+			<range>86</range>
+			<soundCast>RNShotPSG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== QBU-88 (Type 88) ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_QBU88DMR</defName>
+		<statBases>
+			<Mass>4.10</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.54</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>0.99</SwayFactor>
+			<Bulk>10.20</Bulk>
+			<WorkToMake>39000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>55</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_58x42mmDBP10_FMJ</defaultProjectile>
+			<warmupTime>1.75</warmupTime>
+			<range>75</range>
+			<soundCast>RNShot_GenericDMR_II</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_58x42mmDBP10</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Kel-Tec RFB DMR ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_RFBDMR</defName>
+		<statBases>
+			<Mass>5.10</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.60</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.61</SwayFactor>
+			<Bulk>10.00</Bulk>
+			<WorkToMake>41000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.6</warmupTime>
+			<range>55</range>
+			<soundCast>RNShot_M14DMR</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== FN SCAR Mk20 SSR ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_SCARMk20DMR</defName>
+		<statBases>
+			<Mass>4.85</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.60</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.67</SwayFactor>
+			<Bulk>10.29</Bulk>
+			<WorkToMake>35500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.6</warmupTime>
+			<range>86</range>
+			<soundCast>RNShot_GenericDMR_III</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== SKS DMR ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_SKSDMR</defName>
+		<statBases>
+			<Mass>3.85</Mass>
+			<RangedWeapon_Cooldown>0.57</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.01</SwayFactor>
+			<Bulk>10.18</Bulk>
+			<WorkToMake>29000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>48</range>
+			<soundCast>RNShotSKS</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== SKS DMR-SD ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_SKSSDDMR</defName>
+		<statBases>
+			<Mass>4.31</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.25</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.19</SwayFactor>
+			<Bulk>12.20</Bulk>
+			<WorkToMake>29500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>55</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>48</range>
+			<soundCast>RNShot_DMRSDGeneric</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== SR-25 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_SR25DMR</defName>
+		<statBases>
+			<Mass>5.30</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.48</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.73</SwayFactor>
+			<Bulk>10.10</Bulk>
+			<WorkToMake>31000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>60</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>75</range>
+			<soundCast>RNShot_GenericDMR</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Kalashnikov SVK ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_SVKDMR</defName>
+		<statBases>
+			<Mass>5.20</Mass>
+			<RangedWeapon_Cooldown>0.57</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.06</SwayFactor>
+			<Bulk>8.40</Bulk>
+			<WorkToMake>27500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>75</range>
+			<soundCast>RNShot_DMRSDGeneric_II</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== OTs-03 SVU-A ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_SVUADMR</defName>
+		<statBases>
+			<Mass>4.10</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.32</SwayFactor>
+			<Bulk>8.70</Bulk>
+			<WorkToMake>42500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.01</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>97</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNShot_DMRSDGeneric_II</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== OTs-03 SVU ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_SVUDMR</defName>
+		<statBases>
+			<Mass>4.10</Mass>
+			<RangedWeapon_Cooldown>0.57</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>0.92</SwayFactor>
+			<Bulk>9.70</Bulk>
+			<WorkToMake>31000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>97</range>
+			<soundCast>RNShot_DMRSDGeneric_II</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== VSS Vintorez ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_VSSDMR</defName>
+		<statBases>
+			<Mass>2.60</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.19</SwayFactor>
+			<Bulk>8.94</Bulk>
+			<WorkToMake>22500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Chemfuel>5</Chemfuel>
+			<Steel>45</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.94</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>48</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShotVSSVintorez</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Walther WA 2000 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_WA2000DMR</defName>
+		<statBases>
+			<Mass>7.51</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.60</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.76</SwayFactor>
+			<Bulk>9.05</Bulk>
+			<WorkToMake>37500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>60</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.6</warmupTime>
+			<range>68</range>
+			<soundCast>RNShotPSG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Zastava M76 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_ZastavaM76DMR</defName>
+		<statBases>
+			<Mass>4.60</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.64</SwayFactor>
+			<Bulk>11.35</Bulk>
+			<WorkToMake>23000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>60</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<soundCast>RNShotDragunov</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNGun_AR10DMR" or
+			defName="RNGun_AS50AMR" or
+			defName="RNGun_DragunovDMR" or
+			defName="RNGun_G28DMR" or
+			defName="RNGun_G3SGDMR" or
+			defName="RNGun_HK417DMR" or
+			defName="RNGun_L129A1DMR" or
+			defName="RNGun_M107AMR" or
+			defName="RNGun_M110SASSDMR" or
+			defName="RNGun_M110SASSSDDMR" or
+			defName="RNGun_M14DMR" or
+			defName="RNGun_M14EBR" or
+			defName="RNGun_M14EBRMilSpec" or
+			defName="RNGun_M14VLTOR" or
+			defName="RNGun_M21DMR" or
+			defName="RNGun_M39EMR" or
+			defName="RNGun_M39EMRMilSpec" or
+			defName="RNGun_M82A1AMR" or
+			defName="RNGun_M99AMR" or
+			defName="RNGun_MK11DMR" or
+			defName="RNGun_Mk14EBR" or
+			defName="RNGun_PSG1DMR" or
+			defName="RNGun_QBU88DMR" or
+			defName="RNGun_RFBDMR" or
+			defName="RNGun_SCARMk20DMR" or
+			defName="RNGun_SKSDMR" or
+			defName="RNGun_SKSSDDMR" or
+			defName="RNGun_SR25DMR" or
+			defName="RNGun_SVKDMR" or
+			defName="RNGun_SVUADMR" or
+			defName="RNGun_SVUDMR" or
+			defName="RNGun_VSSDMR" or
+			defName="RNGun_WA2000DMR" or
+			defName="RNGun_ZastavaM76DMR"
+			]/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>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_Pistols.xml b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_Pistols.xml
new file mode 100644
index 0000000000..4eab18a22d
--- /dev/null
+++ b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_Pistols.xml	
@@ -0,0 +1,1071 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== CZ 75B ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_CZ75B</defName>
+		<statBases>
+			<Mass>1.12</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.06</SwayFactor>
+			<Bulk>2.06</Bulk>
+			<WorkToMake>7000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>8</range>
+			<soundCast>RNShot_CZ75B</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>16</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Desert Eagle ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_DesertEagle</defName>
+		<statBases>
+			<Mass>2.00</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.58</SwayFactor>
+			<Bulk>2.73</Bulk>
+			<WorkToMake>7500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50AE_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNDeagleShot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_50AE</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Desert Eagle Gold ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_DesertEagleGold</defName>
+		<statBases>
+			<Mass>2.00</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.58</SwayFactor>
+			<Bulk>2.73</Bulk>
+			<WorkToMake>7500</WorkToMake>
+		</statBases>
+		<costList>
+			<Gold>5</Gold>
+			<Steel>30</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50AE_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNDeagleShot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_50AE</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+
+	</Operation>
+
+	<!-- ========== FN Five-seven ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_FiveSeven</defName>
+		<statBases>
+			<Mass>0.61</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.90</SwayFactor>
+			<Bulk>2.08</Bulk>
+			<WorkToMake>7500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>20</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShotFiveSeven</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_FN57x28mm</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Glock 17 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Glock17P</defName>
+		<statBases>
+			<Mass>0.63</Mass>
+			<RangedWeapon_Cooldown>0.40</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.83</SwayFactor>
+			<Bulk>1.86</Bulk>
+			<WorkToMake>7500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>20</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShotGlock17</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>17</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Glock 34 Combat Master ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Glock34CM</defName>
+		<statBases>
+			<Mass>0.66</Mass>
+			<RangedWeapon_Cooldown>0.40</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>0.96</SwayFactor>
+			<Bulk>2.23</Bulk>
+			<WorkToMake>7500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>20</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>13</range>
+			<soundCast>RNShotPistol_II</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>17</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+
+	</Operation>
+
+	<!-- ========== HS2000 / XD / XDM / XD-S ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_HS2000P</defName>
+		<statBases>
+			<Mass>0.65</Mass>
+			<RangedWeapon_Cooldown>0.41</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>0.75</SwayFactor>
+			<Bulk>1.60</Bulk>
+			<WorkToMake>7500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>20</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShot_SpringfieldXD</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>13</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+
+	</Operation>
+
+	<!-- ========== M1911A1 Hellfighter ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M1911_Hellfighter</defName>
+		<statBases>
+			<Mass>1.14</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.11</SwayFactor>
+			<Bulk>2.19</Bulk>
+			<WorkToMake>7000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShot_1911Hellfighter</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== M1911A1 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M1911A1P</defName>
+		<statBases>
+			<Mass>1.14</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.11</SwayFactor>
+			<Bulk>2.19</Bulk>
+			<WorkToMake>7000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShot1911P</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== M1911A2 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M1911A2P</defName>
+		<statBases>
+			<Mass>1.14</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.11</SwayFactor>
+			<Bulk>2.19</Bulk>
+			<WorkToMake>7000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShot_1911Hellfighter</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== M45A1 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M45A1_Pistol</defName>
+		<statBases>
+			<Mass>1.11</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.07</SwayFactor>
+			<Bulk>2.10</Bulk>
+			<WorkToMake>7000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>RNShot1911P</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== M9A1 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M9A1P</defName>
+		<statBases>
+			<Mass>0.97</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.05</SwayFactor>
+			<Bulk>2.17</Bulk>
+			<WorkToMake>7000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNPistolShot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Makarov (PM) ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Makarov</defName>
+		<statBases>
+			<Mass>0.73</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>0.78</SwayFactor>
+			<Bulk>1.62</Bulk>
+			<WorkToMake>7000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x18mmMakarov_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNPistolShot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== USSOCOM MK23 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_MK23P</defName>
+		<statBases>
+			<Mass>2.02</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>2.08</SwayFactor>
+			<Bulk>4.21</Bulk>
+			<WorkToMake>8500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>30</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShotSupressed_III</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== MP445 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_MP445P</defName>
+		<statBases>
+			<Mass>0.90</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.97</SwayFactor>
+			<Bulk>2.00</Bulk>
+			<WorkToMake>7500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>20</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_40SW_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>9</range>
+			<soundCast>RNShotMP445Ruski</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_40SW</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== SIG Sauer P226 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_P226P</defName>
+		<statBases>
+			<Mass>0.96</Mass>
+			<RangedWeapon_Cooldown>0.40</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.97</SwayFactor>
+			<Bulk>1.96</Bulk>
+			<WorkToMake>7000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_40SW_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShotP226P</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_40SW</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== SIG Sauer P320 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_P320P</defName>
+		<statBases>
+			<Mass>0.84</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.96</SwayFactor>
+			<Bulk>2.03</Bulk>
+			<WorkToMake>7500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>20</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShotPistol_II</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>17</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Taurus PT92 "Luison" ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_PT92Luison</defName>
+		<statBases>
+			<Mass>1.12</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.63</SwayFactor>
+			<Bulk>3.79</Bulk>
+			<WorkToMake>7500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShotSupressed_II</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>17</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== TEC-9 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_TEC-9P</defName>
+		<statBases>
+			<Mass>1.23</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.19</ShotSpread>
+			<SwayFactor>1.21</SwayFactor>
+			<Bulk>2.41</Bulk>
+			<WorkToMake>7500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>20</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShotTec9</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== TT-30 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_TT30P</defName>
+		<statBases>
+			<Mass>0.85</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.93</SwayFactor>
+			<Bulk>1.94</Bulk>
+			<WorkToMake>7000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNPistolShot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== USP45 SD ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_USP45SD</defName>
+		<statBases>
+			<Mass>1.23</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.71</SwayFactor>
+			<Bulk>3.92</Bulk>
+			<WorkToMake>8000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>25</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNPistolSupressed</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Walther PPK ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_WaltherPPK</defName>
+		<statBases>
+			<Mass>0.59</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.19</ShotSpread>
+			<SwayFactor>0.71</SwayFactor>
+			<Bulk>1.55</Bulk>
+			<WorkToMake>7000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>20</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_380ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>8</range>
+			<soundCast>RNShotGlock17</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_380ACP</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNGun_CZ75B" or
+			defName="RNGun_DesertEagle" or
+			defName="RNGun_DesertEagleGold" or
+			defName="RNGun_FiveSeven" or
+			defName="RNGun_Glock17P" or
+			defName="RNGun_Glock34CM" or
+			defName="RNGun_HS2000P" or
+			defName="RNGun_M1911_Hellfighter" or
+			defName="RNGun_M1911A1P" or
+			defName="RNGun_M1911A2P" or
+			defName="RNGun_M45A1_Pistol" or
+			defName="RNGun_M9A1P" or
+			defName="RNGun_Makarov" or
+			defName="RNGun_MK23P" or
+			defName="RNGun_MP445P" or
+			defName="RNGun_P226P" or
+			defName="RNGun_P320P" or
+			defName="RNGun_PT92Luison" or
+			defName="RNGun_TEC-9P" or
+			defName="RNGun_TT30P" or
+			defName="RNGun_USP45SD" or
+			defName="RNGun_WaltherPPK"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_R_AK_Style.xml b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_R_AK_Style.xml
new file mode 100644
index 0000000000..efb2134758
--- /dev/null
+++ b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_R_AK_Style.xml	
@@ -0,0 +1,949 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== AEK-971 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_AEK971AR</defName>
+		<statBases>
+			<Mass>3.30</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.29</SwayFactor>
+			<Bulk>7.20</Bulk>
+			<WorkToMake>32000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.37</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_AEK971</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== AK-103 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_AK103AR</defName>
+		<statBases>
+			<Mass>3.40</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.28</SwayFactor>
+			<Bulk>7.05</Bulk>
+			<WorkToMake>33500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.83</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNShot_AKM</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== AK-104 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_AK104AR</defName>
+		<statBases>
+			<Mass>3.00</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.21</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.16</SwayFactor>
+			<Bulk>5.86</Bulk>
+			<WorkToMake>34000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.89</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.275</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNShot_AKM</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== AK-12 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_AK12AR</defName>
+		<statBases>
+			<Mass>3.30</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.21</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.31</SwayFactor>
+			<Bulk>7.25</Bulk>
+			<WorkToMake>35500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.38</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.275</warmupTime>
+			<range>51</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShot_AK12AR</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== AK-15 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_AK15AR</defName>
+		<statBases>
+			<Mass>3.30</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.28</SwayFactor>
+			<Bulk>7.25</Bulk>
+			<WorkToMake>33500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.86</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>51</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShot_AKM</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== AK-47 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_AK47AR</defName>
+		<statBases>
+			<Mass>3.47</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<Bulk>8.80</Bulk>
+			<WorkToMake>27000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>45</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.82</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>44</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNShot_AK47Rifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== AK-47 Gold ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_AK47GoldAR</defName>
+		<statBases>
+			<Mass>3.47</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<Bulk>8.80</Bulk>
+			<WorkToMake>27000</WorkToMake>
+		</statBases>
+		<costList>
+			<Gold>10</Gold>
+			<WoodLog>10</WoodLog>
+			<Steel>45</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.82</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>44</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNShot_AK47Rifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== AK-47 Modern ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_AK47ModernAR</defName>
+		<statBases>
+			<Mass>3.47</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<Bulk>8.80</Bulk>
+			<WorkToMake>29500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>45</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.82</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>44</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNShot_AK47Rifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== AK-74 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_AK74AR</defName>
+		<statBases>
+			<Mass>3.07</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.25</SwayFactor>
+			<Bulk>9.43</Bulk>
+			<WorkToMake>27500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.43</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNShotAK74USMG</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== AK-74 Tactical ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_AK74TacticalAR</defName>
+		<statBases>
+			<Mass>3.07</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.21</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.29</SwayFactor>
+			<Bulk>9.43</Bulk>
+			<WorkToMake>33500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.43</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.275</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNShotAK74USMG</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== AKM ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_AKMAR</defName>
+		<statBases>
+			<Mass>3.10</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.19</SwayFactor>
+			<Bulk>8.80</Bulk>
+			<WorkToMake>27000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>45</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.92</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>44</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNShot_AKM</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== AKM Tactical ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_AKMTacticalAR</defName>
+		<statBases>
+			<Mass>3.10</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.21</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<Bulk>8.80</Bulk>
+			<WorkToMake>33000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>45</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.92</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.275</warmupTime>
+			<range>44</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNShot_AKM</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== AKS-47 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_AKS47AR</defName>
+		<statBases>
+			<Mass>3.90</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.26</SwayFactor>
+			<Bulk>6.45</Bulk>
+			<WorkToMake>29500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>45</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.71</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>44</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNShot_AK47Rifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== AN-94 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_AN94AR</defName>
+		<statBases>
+			<Mass>3.85</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>7.28</Bulk>
+			<WorkToMake>32500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>45</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.28</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>68</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNShot_AN94</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Type 56 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Type56AR</defName>
+		<statBases>
+			<Mass>3.70</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.24</SwayFactor>
+			<Bulk>6.54</Bulk>
+			<WorkToMake>29500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>45</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.78</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>44</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNShot_AKM</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Zastava M21 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_ZastavaM21AR</defName>
+		<statBases>
+			<Mass>4.15</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.42</SwayFactor>
+			<Bulk>7.50</Bulk>
+			<WorkToMake>34000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>45</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.34</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>62</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShot_AEK971</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Zastava M70AB2 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_ZastavaM70AB2AR</defName>
+		<statBases>
+			<Mass>3.70</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.29</SwayFactor>
+			<Bulk>6.70</Bulk>
+			<WorkToMake>29500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>45</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.76</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNShot_AK47Rifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Zastava M70 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_ZastavaM70AR</defName>
+		<statBases>
+			<Mass>3.70</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.31</SwayFactor>
+			<Bulk>9.40</Bulk>
+			<WorkToMake>27500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.76</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNShot_AK47Rifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNGun_AEK971AR" or
+			defName="RNGun_AK103AR" or
+			defName="RNGun_AK104AR" or
+			defName="RNGun_AK12AR" or
+			defName="RNGun_AK15AR" or
+			defName="RNGun_AK47AR" or
+			defName="RNGun_AK47GoldAR" or
+			defName="RNGun_AK47ModernAR" or
+			defName="RNGun_AK74AR" or
+			defName="RNGun_AK74TacticalAR" or
+			defName="RNGun_AKMAR" or
+			defName="RNGun_AKMTacticalAR" or
+			defName="RNGun_AKS47AR" or
+			defName="RNGun_AN94AR" or
+			defName="RNGun_Type56AR" or
+			defName="RNGun_ZastavaM21AR" or
+			defName="RNGun_ZastavaM70AB2AR" or
+			defName="RNGun_ZastavaM70AR"
+			]/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>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_R_AR_Style.xml b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_R_AR_Style.xml
new file mode 100644
index 0000000000..8674adf9c4
--- /dev/null
+++ b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_R_AR_Style.xml	
@@ -0,0 +1,1668 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Daniel Defense DDM4 V1 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_DDM4AR</defName>
+		<statBases>
+			<Mass>3.04</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.26</SwayFactor>
+			<Bulk>8.19</Bulk>
+			<WorkToMake>36000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>45</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.55</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>59</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR_II</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Heckler & Koch HK416 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_HK416Bare</defName>
+		<statBases>
+			<Mass>3.56</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.30</SwayFactor>
+			<Bulk>8.48</Bulk>
+			<WorkToMake>31500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.41</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>62</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Heckler & Koch HK416 Elite ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_HK416Elite</defName>
+		<statBases>
+			<Mass>3.84</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.37</SwayFactor>
+			<Bulk>8.48</Bulk>
+			<WorkToMake>35500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.36</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>62</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Heckler & Koch HK416 Nomad ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_HK416Nomad</defName>
+		<statBases>
+			<Mass>3.84</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.37</SwayFactor>
+			<Bulk>8.48</Bulk>
+			<WorkToMake>36000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>45</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.36</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>62</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Heckler & Koch HK416 SD Predator ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_HK416SD_Predator</defName>
+		<statBases>
+			<Mass>4.38</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.58</SwayFactor>
+			<Bulk>10.10</Bulk>
+			<WorkToMake>37500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>55</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.27</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>62</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_SDAR</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Heckler & Koch HK416 SD DEVGRU ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_HK416SD_DEVGRU</defName>
+		<statBases>
+			<Mass>4.44</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.62</SwayFactor>
+			<Bulk>10.39</Bulk>
+			<WorkToMake>37500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>55</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.27</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>62</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_SDAR</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Heckler & Koch HK416 SD Punisher ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_HK416PunisherSD</defName>
+		<statBases>
+			<Mass>4.38</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.54</SwayFactor>
+			<Bulk>10.10</Bulk>
+			<WorkToMake>35500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>55</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.27</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>62</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_SDAR</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== War Sport Industries LVOA-C ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_LVOACAR</defName>
+		<statBases>
+			<Mass>3.20</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.26</SwayFactor>
+			<Bulk>8.32</Bulk>
+			<WorkToMake>35500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.49</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR_II</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== M16A1 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M16A1Bare</defName>
+		<statBases>
+			<Mass>2.89</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.29</SwayFactor>
+			<Bulk>10.03</Bulk>
+			<WorkToMake>30000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.63</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>59</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR_IV</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== M16A4 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M16A4AR</defName>
+		<statBases>
+			<Mass>2.89</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>10.03</Bulk>
+			<WorkToMake>34000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.63</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>59</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR_IV</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== M16A4 MIL-SPEC ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M16A4MilSpec</defName>
+		<statBases>
+			<Mass>2.89</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>10.03</Bulk>
+			<WorkToMake>34000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.63</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>59</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR_IV</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Heckler & Koch M27 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M27AR</defName>
+		<statBases>
+			<Mass>3.60</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.21</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<Bulk>9.37</Bulk>
+			<WorkToMake>35500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>55</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.31</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.275</warmupTime>
+			<range>59</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR_IV</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Heckler & Koch M27 IAR ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M27IAR</defName>
+		<statBases>
+			<Mass>3.60</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.21</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<Bulk>9.37</Bulk>
+			<WorkToMake>36500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.31</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.275</warmupTime>
+			<range>59</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR_IV</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Heckler & Koch M27 IAR SD ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M27IAR_SD</defName>
+		<statBases>
+			<Mass>4.11</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.21</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.37</SwayFactor>
+			<Bulk>10.26</Bulk>
+			<WorkToMake>37000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>55</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.23</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.275</warmupTime>
+			<range>59</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_SDAR_III</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== M4A1 Kandahar ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M4A1AR</defName>
+		<statBases>
+			<Mass>2.90</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>1.17</SwayFactor>
+			<Bulk>7.56</Bulk>
+			<WorkToMake>33500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.58</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR_IV</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== M4A1 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M4A1Bare</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>
+			<WorkToMake>32000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.58</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR_II</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== M4A1 SD ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M4A1BareSD</defName>
+		<statBases>
+			<Mass>3.52</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.28</SwayFactor>
+			<Bulk>8.45</Bulk>
+			<WorkToMake>32500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>45</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.44</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_SDAR_III</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== M4A1 Benghazi ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M4A1Benghazi</defName>
+		<statBases>
+			<Mass>2.90</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>1.13</SwayFactor>
+			<Bulk>7.56</Bulk>
+			<WorkToMake>33500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.58</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR_II</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== M4A1 Blackout ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M4A1Black</defName>
+		<statBases>
+			<Mass>2.90</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>1.17</SwayFactor>
+			<Bulk>7.56</Bulk>
+			<WorkToMake>35500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.73</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_300AACBlackout_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR_II</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_300AACBlackout</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== M4A1 Fallujah ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M4A1Fallujah</defName>
+		<statBases>
+			<Mass>2.90</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>1.17</SwayFactor>
+			<Bulk>7.56</Bulk>
+			<WorkToMake>33500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.58</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR_II</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== M4A1 Ghost ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M4A1Ghost</defName>
+		<statBases>
+			<Mass>2.90</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>1.17</SwayFactor>
+			<Bulk>7.56</Bulk>
+			<WorkToMake>33500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.58</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR_II</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== M4A1 Hunter ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M4A1Hunter</defName>
+		<statBases>
+			<Mass>2.90</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>1.17</SwayFactor>
+			<Bulk>7.56</Bulk>
+			<WorkToMake>33500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.58</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR_II</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== M4A1 MIL-SPEC ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M4A1MilSpec</defName>
+		<statBases>
+			<Mass>2.90</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>1.17</SwayFactor>
+			<Bulk>7.56</Bulk>
+			<WorkToMake>33500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.58</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR_II</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== M4A1 SD MIL-SPEC ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M4A1MilSpecSD</defName>
+		<statBases>
+			<Mass>3.52</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.40</SwayFactor>
+			<Bulk>9.21</Bulk>
+			<WorkToMake>37000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.44</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_SDAR_III</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== M4A1 SD Ramadi ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M4A1RamadiSD</defName>
+		<statBases>
+			<Mass>2.90</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>1.17</SwayFactor>
+			<Bulk>7.56</Bulk>
+			<WorkToMake>35500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.58</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_SDAR_III</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== M4A1 Roach ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M4A1RoachAR</defName>
+		<statBases>
+			<Mass>2.90</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>1.17</SwayFactor>
+			<Bulk>7.56</Bulk>
+			<WorkToMake>33500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.58</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR_II</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== M4A1 SD Banshee ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M4A1SD_Banshee</defName>
+		<statBases>
+			<Mass>3.52</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.28</SwayFactor>
+			<Bulk>8.45</Bulk>
+			<WorkToMake>34000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>45</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.44</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_SDAR_III</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== M4A1 SD Commando ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M4A1SD_Commando</defName>
+		<statBases>
+			<Mass>3.52</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.40</SwayFactor>
+			<Bulk>9.21</Bulk>
+			<WorkToMake>37000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.44</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_SDAR_III</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== M4A1 SD VLTOR ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M4A1SD_VLTOR</defName>
+		<statBases>
+			<Mass>3.52</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.32</SwayFactor>
+			<Bulk>8.45</Bulk>
+			<WorkToMake>36000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>45</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.44</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_SDAR_III</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== M4A1 Warfighter ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M4A1Warfighter</defName>
+		<statBases>
+			<Mass>2.90</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>1.17</SwayFactor>
+			<Bulk>7.56</Bulk>
+			<WorkToMake>35500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.58</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR_II</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Patriot Ordinance Factory P416 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_P416Bare</defName>
+		<statBases>
+			<Mass>3.06</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.09</SwayFactor>
+			<Bulk>6.86</Bulk>
+			<WorkToMake>32500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>45</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.35</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR_II</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== SIG Sauer SIGM400 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_SIGM400Tread</defName>
+		<statBases>
+			<Mass>3.16</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>8.28</Bulk>
+			<WorkToMake>26000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>59</range>
+			<soundCast>RNShot_GenericAR_IV</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Smith & Wesson MP15 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_SWMP15AR</defName>
+		<statBases>
+			<Mass>3.06</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.24</SwayFactor>
+			<Bulk>8.13</Bulk>
+			<WorkToMake>26500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>45</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>59</range>
+			<soundCast>RNShot_GenericAR_IV</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Bushmaster XM-15 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_XM15AR</defName>
+		<statBases>
+			<Mass>2.95</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.22</SwayFactor>
+			<Bulk>8.26</Bulk>
+			<WorkToMake>26500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>45</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>59</range>
+			<soundCast>RNShot_GenericAR_IV</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNGun_DDM4AR" or
+			defName="RNGun_HK416Bare" or
+			defName="RNGun_HK416Elite" or
+			defName="RNGun_HK416Nomad" or
+			defName="RNGun_HK416SD_Predator" or
+			defName="RNGun_HK416SD_DEVGRU" or
+			defName="RNGun_HK416PunisherSD" or
+			defName="RNGun_LVOACAR" or
+			defName="RNGun_M16A1Bare" or
+			defName="RNGun_M16A4AR" or
+			defName="RNGun_M16A4MilSpec" or
+			defName="RNGun_M27AR" or
+			defName="RNGun_M27IAR" or
+			defName="RNGun_M27IAR_SD" or
+			defName="RNGun_M4A1AR" or
+			defName="RNGun_M4A1Bare" or
+			defName="RNGun_M4A1BareSD" or
+			defName="RNGun_M4A1Benghazi" or
+			defName="RNGun_M4A1Black" or
+			defName="RNGun_M4A1Fallujah" or
+			defName="RNGun_M4A1Ghost" or
+			defName="RNGun_M4A1Hunter" or
+			defName="RNGun_M4A1MilSpec" or
+			defName="RNGun_M4A1MilSpecSD" or
+			defName="RNGun_M4A1RamadiSD" or
+			defName="RNGun_M4A1RoachAR" or
+			defName="RNGun_M4A1SD_Banshee" or
+			defName="RNGun_M4A1SD_Commando" or
+			defName="RNGun_M4A1SD_VLTOR" or
+			defName="RNGun_M4A1Warfighter" or
+			defName="RNGun_P416Bare" or
+			defName="RNGun_SIGM400Tread" or
+			defName="RNGun_SWMP15AR" or
+			defName="RNGun_XM15AR"
+			]/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>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_R_Bullpup_Style.xml b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_R_Bullpup_Style.xml
new file mode 100644
index 0000000000..ee30fc8739
--- /dev/null
+++ b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_R_Bullpup_Style.xml	
@@ -0,0 +1,380 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Steyr AUG A2 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_AUGA2AR</defName>
+		<statBases>
+			<Mass>3.60</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.09</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.17</SwayFactor>
+			<Bulk>7.90</Bulk>
+			<WorkToMake>40500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>45</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.47</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.175</warmupTime>
+			<range>40</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShotAUG</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Steyr AUG A3 SD ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_AUGA3SDAR</defName>
+		<statBases>
+			<Mass>3.20</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.11</SwayFactor>
+			<Bulk>7.90</Bulk>
+			<WorkToMake>39500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>45</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.56</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>40</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShot_SDAR_III</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== F2000 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_F2000AR</defName>
+		<statBases>
+			<Mass>3.60</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.05</SwayFactor>
+			<Bulk>6.88</Bulk>
+			<WorkToMake>36500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.41</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericBullpup_III</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== FAMAS ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_FAMASAR</defName>
+		<statBases>
+			<Mass>3.61</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.12</SwayFactor>
+			<Bulk>7.57</Bulk>
+			<WorkToMake>37500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>45</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.44</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>40</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericBullpup_II</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Groza-4 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Groza4AR</defName>
+		<statBases>
+			<Mass>3.60</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.08</SwayFactor>
+			<Bulk>7.20</Bulk>
+			<WorkToMake>35500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>45</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.67</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>31</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShot_Groza4</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_9x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== L85A2 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_L85A2MILSPEC</defName>
+		<statBases>
+			<Mass>3.82</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.21</SwayFactor>
+			<Bulk>7.85</Bulk>
+			<WorkToMake>41000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.40</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>48</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericBullpup</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>6</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Type 97 / QBZ-95 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Type97AR</defName>
+		<statBases>
+			<Mass>3.35</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.09</SwayFactor>
+			<Bulk>7.58</Bulk>
+			<WorkToMake>36500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.49</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericBullpup_III</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNGun_AUGA2AR" or
+			defName="RNGun_AUGA3SDAR" or
+			defName="RNGun_F2000AR" or
+			defName="RNGun_FAMASAR" or
+			defName="RNGun_Groza4AR" or
+			defName="RNGun_L85A2MILSPEC" or
+			defName="RNGun_Type97AR"
+			]/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>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_R_Colt_Canada.xml b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_R_Colt_Canada.xml
new file mode 100644
index 0000000000..c2fa2607b7
--- /dev/null
+++ b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_R_Colt_Canada.xml	
@@ -0,0 +1,332 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Colt Canada C7A1 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_C7A1AR</defName>
+		<statBases>
+			<Mass>3.30</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.20</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.37</SwayFactor>
+			<Bulk>10.06</Bulk>
+			<WorkToMake>33500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.48</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.27</warmupTime>
+			<range>48</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Colt Canada C7A2 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_C7A2AR</defName>
+		<statBases>
+			<Mass>3.30</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.20</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.37</SwayFactor>
+			<Bulk>9.30</Bulk>
+			<WorkToMake>33500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.48</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.27</warmupTime>
+			<range>48</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Colt Canada C8A2 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_C8A2AR</defName>
+		<statBases>
+			<Mass>3.20</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.20</SightsEfficiency>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>1.19</SwayFactor>
+			<Bulk>7.60</Bulk>
+			<WorkToMake>35000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.50</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.27</warmupTime>
+			<range>48</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR_II</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Colt Canada C8A3 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_C8A3AR</defName>
+		<statBases>
+			<Mass>3.20</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.20</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<Bulk>8.00</Bulk>
+			<WorkToMake>36000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>45</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.50</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.27</warmupTime>
+			<range>48</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR_II</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Colt Canada C8SFW ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_C8SFWAR</defName>
+		<statBases>
+			<Mass>3.40</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.20</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.25</SwayFactor>
+			<Bulk>8.00</Bulk>
+			<WorkToMake>36000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>45</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.46</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.27</warmupTime>
+			<range>48</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR_II</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Colt Canada C8SFW SD ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_C8SFWSDAR</defName>
+		<statBases>
+			<Mass>3.85</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.20</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.40</SwayFactor>
+			<Bulk>9.02</Bulk>
+			<WorkToMake>36500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.37</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.27</warmupTime>
+			<range>48</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShot_SDAR_III</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNGun_C7A1AR" or
+			defName="RNGun_C7A2AR" or
+			defName="RNGun_C8A2AR" or
+			defName="RNGun_C8A3AR" or
+			defName="RNGun_C8SFWAR" or
+			defName="RNGun_C8SFWSDAR"
+			]/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>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_R_Others.xml b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_R_Others.xml
new file mode 100644
index 0000000000..fe02aded64
--- /dev/null
+++ b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_R_Others.xml	
@@ -0,0 +1,626 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Remington ACR ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_ACRAR</defName>
+		<statBases>
+			<Mass>3.30</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.32</SwayFactor>
+			<Bulk>7.16</Bulk>
+			<WorkToMake>35500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.55</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== CZ 805 BREN A2 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_CZ805A2AR</defName>
+		<statBases>
+			<Mass>3.60</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.18</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.24</SwayFactor>
+			<Bulk>5.82</Bulk>
+			<WorkToMake>34500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>35</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.30</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.25</warmupTime>
+			<range>48</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== FB Beryl ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_FBBerylAR</defName>
+		<statBases>
+			<Mass>3.35</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.28</SwayFactor>
+			<Bulk>7.42</Bulk>
+			<WorkToMake>32500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>45</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.48</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>62</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR_III</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== FN FAL ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_FNFALAR</defName>
+		<statBases>
+			<Mass>4.30</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.52</SwayFactor>
+			<Bulk>10.90</Bulk>
+			<WorkToMake>30500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>55</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.07</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>62</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShotSCARH</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== FN FNC ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_FNFNCAR</defName>
+		<statBases>
+			<Mass>3.84</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.38</SwayFactor>
+			<Bulk>7.66</Bulk>
+			<WorkToMake>31500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.42</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericBullpup_IV</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Heckler & Koch G36C ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_G36CAR</defName>
+		<statBases>
+			<Mass>2.82</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.18</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.03</SwayFactor>
+			<Bulk>5.00</Bulk>
+			<WorkToMake>34000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>30</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.43</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>0.9</warmupTime>
+			<range>31</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShotG36C</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Heckler & Koch G36C SD ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_G36CSDAR</defName>
+		<statBases>
+			<Mass>3.42</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.18</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.28</SwayFactor>
+			<Bulk>6.91</Bulk>
+			<WorkToMake>35000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.30</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>0.9</warmupTime>
+			<range>31</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShot_SDAR</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Daewoo K2C ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_K2CAR</defName>
+		<statBases>
+			<Mass>3.77</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.29</SwayFactor>
+			<Bulk>7.77</Bulk>
+			<WorkToMake>36000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>45</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.32</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>40</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== WAT-FB MSBS-5.56 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_MSBS556AR</defName>
+		<statBases>
+			<Mass>3.70</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.31</SwayFactor>
+			<Bulk>8.43</Bulk>
+			<WorkToMake>36000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>45</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.39</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== FN SCAR-H ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_SCARHAR</defName>
+		<statBases>
+			<Mass>3.58</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.36</SwayFactor>
+			<Bulk>7.11</Bulk>
+			<WorkToMake>35500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.09</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>62</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNShotSCARH</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</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>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== FN SCAR-L ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_SCARLAR</defName>
+		<statBases>
+			<Mass>3.29</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>1.26</SwayFactor>
+			<Bulk>6.35</Bulk>
+			<WorkToMake>35500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.45</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Heckler & Koch XM8 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_XM8AR</defName>
+		<statBases>
+			<Mass>3.40</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.18</SwayFactor>
+			<Bulk>8.40</Bulk>
+			<WorkToMake>31000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>45</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.38</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShot_GenericAR_IV</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNGun_ACRAR" or
+			defName="RNGun_CZ805A2AR" or
+			defName="RNGun_FBBerylAR" or
+			defName="RNGun_FNFALAR" or
+			defName="RNGun_FNFNCAR" or
+			defName="RNGun_G36CAR" or
+			defName="RNGun_G36CSDAR" or
+			defName="RNGun_K2CAR" or
+			defName="RNGun_MSBS556AR" or
+			defName="RNGun_SCARHAR" or
+			defName="RNGun_SCARLAR" or
+			defName="RNGun_XM8AR"
+			]/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>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_Revolvers.xml b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_Revolvers.xml
new file mode 100644
index 0000000000..4f6d2d1703
--- /dev/null
+++ b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_Revolvers.xml	
@@ -0,0 +1,515 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Colt Cobra ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_ColtCobra</defName>
+		<statBases>
+			<Mass>0.43</Mass>
+			<RangedWeapon_Cooldown>0.41</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>0.71</SwayFactor>
+			<Bulk>1.71</Bulk>
+			<WorkToMake>4500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>20</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>3.35</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_38Special_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShotColtPython</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_38Special</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Colt Peacemaker ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_ColtPeacemaker</defName>
+		<statBases>
+			<Mass>1.19</Mass>
+			<RangedWeapon_Cooldown>0.89</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>2.79</Bulk>
+			<WorkToMake>3500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.84</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45Colt_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShot_GenericRevolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_45Colt</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Colt Peacemaker II ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_ColtPeacemaker_II</defName>
+		<statBases>
+			<Mass>1.19</Mass>
+			<RangedWeapon_Cooldown>0.89</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.46</SwayFactor>
+			<Bulk>3.18</Bulk>
+			<WorkToMake>3500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.84</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45Colt_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShot_GenericRevolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_45Colt</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Colt Python ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_ColtPython</defName>
+		<statBases>
+			<Mass>1.23</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.38</SwayFactor>
+			<Bulk>2.92</Bulk>
+			<WorkToMake>5000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.15</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_357Magnum_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShotColtPython</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_357Magnum</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Mateba Model 6 Unica ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Mateba</defName>
+		<statBases>
+			<Mass>1.25</Mass>
+			<RangedWeapon_Cooldown>0.41</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>2.75</Bulk>
+			<WorkToMake>5500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>3.37</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_454Casull_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShotRevolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_454Casull</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== MP-412 REX ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_MP412REX</defName>
+		<statBases>
+			<Mass>0.90</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>1.07</SwayFactor>
+			<Bulk>2.32</Bulk>
+			<WorkToMake>4500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.51</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_357Magnum_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShotRevolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_357Magnum</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Nagant M1895 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_NagantRevolver</defName>
+		<statBases>
+			<Mass>0.80</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.05</SwayFactor>
+			<Bulk>2.35</Bulk>
+			<WorkToMake>4500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.09</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x38mmR_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Revolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_762x38mmR</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Taurus Raging Bull ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_RagingBull</defName>
+		<statBases>
+			<Mass>1.79</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.78</SwayFactor>
+			<Bulk>3.56</Bulk>
+			<WorkToMake>5000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>35</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.58</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_454Casull_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShotRevolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_454Casull</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Remington 1858 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Remington1858P</defName>
+		<statBases>
+			<Mass>1.18</Mass>
+			<RangedWeapon_Cooldown>0.90</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.56</SwayFactor>
+			<Bulk>3.51</Bulk>
+			<WorkToMake>3500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>3.28</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45Colt_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>15</range>
+			<soundCast>RNShot_GenericRevolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_45Colt</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Smith & Wesson Model 29 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_SWModel29P</defName>
+		<statBases>
+			<Mass>1.35</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.47</SwayFactor>
+			<Bulk>3.05</Bulk>
+			<WorkToMake>5000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.93</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_44Magnum_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShotRevolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_44Magnum</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNGun_ColtCobra" or
+			defName="RNGun_ColtPeacemaker" or
+			defName="RNGun_ColtPeacemaker_II" or
+			defName="RNGun_ColtPython" or
+			defName="RNGun_Mateba" or
+			defName="RNGun_MP412REX" or
+			defName="RNGun_NagantRevolver" or
+			defName="RNGun_RagingBull" or
+			defName="RNGun_Remington1858P" or
+			defName="RNGun_SWModel29P"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_SMG.xml b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_SMG.xml
new file mode 100644
index 0000000000..d794cc445b
--- /dev/null
+++ b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_SMG.xml	
@@ -0,0 +1,1671 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== AK-74U ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_AK74U_PDW</defName>
+		<statBases>
+			<Mass>2.85</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.02</SwayFactor>
+			<Bulk>4.90</Bulk>
+			<WorkToMake>29000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.34</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>0.9</warmupTime>
+			<range>31</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNShotAK74USMG</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== AKMS-U ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_AKMSU_PDW</defName>
+		<statBases>
+			<Mass>2.85</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.03</SwayFactor>
+			<Bulk>4.80</Bulk>
+			<WorkToMake>29000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.95</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>0.9</warmupTime>
+			<range>31</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShot_AKM</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== AKS-74U ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_AKS74U_PDW</defName>
+		<statBases>
+			<Mass>2.70</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.00</SwayFactor>
+			<Bulk>4.90</Bulk>
+			<WorkToMake>29000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.38</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>0.9</warmupTime>
+			<range>31</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShotAK74USMG</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== CZ Scorpion EVO 3 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_CZScorpion_PDW</defName>
+		<statBases>
+			<Mass>2.10</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>0.86</SwayFactor>
+			<Bulk>4.00</Bulk>
+			<WorkToMake>29000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>30</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.68</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>35</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>RNShotCZ</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Honey Badger ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_HoneyBadger_PDW</defName>
+		<statBases>
+			<Mass>2.60</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.05</SwayFactor>
+			<Bulk>6.60</Bulk>
+			<WorkToMake>32000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.72</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>0.8</warmupTime>
+			<range>40</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShotSMG2SD</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== KRISS Vector ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_KrissVector_PDW</defName>
+		<statBases>
+			<Mass>2.70</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>0.89</SwayFactor>
+			<Bulk>4.10</Bulk>
+			<WorkToMake>30500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.60</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>12</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>RNShotSMG2SD</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>13</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== KRISS Vector Contractor ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_KrissVectorContractor_PDW</defName>
+		<statBases>
+			<Mass>3.20</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>1.14</SwayFactor>
+			<Bulk>6.06</Bulk>
+			<WorkToMake>32000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.47</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>12</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>RNShotMP7SMG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== MAC-11 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_MAC11_PDW</defName>
+		<statBases>
+			<Mass>1.59</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.69</SwayFactor>
+			<Bulk>2.48</Bulk>
+			<WorkToMake>27500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.50</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_380ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20.9</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>RNShotMAC11SMG</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_380ACP</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== MAC-11 SD ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_MAC11SD_PDW</defName>
+		<statBases>
+			<Mass>2.04</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>0.96</SwayFactor>
+			<Bulk>4.72</Bulk>
+			<WorkToMake>29000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.33</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_380ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>RNShotSMGSDMAC</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>6</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_380ACP</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== MP 40 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_MP40_PDW</defName>
+		<statBases>
+			<Mass>3.97</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<Bulk>6.30</Bulk>
+			<WorkToMake>31000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>45</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.27</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>31</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<soundCast>RNShotSMG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== MP5A2 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_MP5A2_PDW</defName>
+		<statBases>
+			<Mass>2.50</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>0.93</SwayFactor>
+			<Bulk>6.80</Bulk>
+			<WorkToMake>27500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.60</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>31</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShotMP5SMG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== MP5SD2 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_MP5A2SD_PDW</defName>
+		<statBases>
+			<Mass>3.10</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>1.10</SwayFactor>
+			<Bulk>7.90</Bulk>
+			<WorkToMake>28000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>45</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.44</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmParaSD_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>26</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShotSMG2SD</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>1</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmParaSD</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== MP5A3 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_MP5A3_PDW</defName>
+		<statBases>
+			<Mass>3.10</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.01</SwayFactor>
+			<Bulk>5.50</Bulk>
+			<WorkToMake>30500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.44</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>31</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShotMP5SMG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== MP5SD3 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_MP5A3SD_PDW</defName>
+		<statBases>
+			<Mass>2.80</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>1.09</SwayFactor>
+			<Bulk>6.70</Bulk>
+			<WorkToMake>29500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>45</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.51</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmParaSD_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>26</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShotSMG2SD</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>1</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmParaSD</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== MP5K-PDW ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_MP5KPDW_PDW</defName>
+		<statBases>
+			<Mass>2.50</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>0.85</SwayFactor>
+			<Bulk>3.68</Bulk>
+			<WorkToMake>29000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>30</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.55</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShotMP5K</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== MP5K-A3 SD ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_MP5KPDWSD_PDW</defName>
+		<statBases>
+			<Mass>2.86</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>1.10</SwayFactor>
+			<Bulk>5.76</Bulk>
+			<WorkToMake>30500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.45</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmParaSD_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>18</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShotSMG2SD</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>1</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmParaSD</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== MP7A2 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_MP7_PDW</defName>
+		<statBases>
+			<Mass>1.96</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>0.83</SwayFactor>
+			<Bulk>4.15</Bulk>
+			<WorkToMake>29000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>30</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.42</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_46x30mm_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>31</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShotMP7SMG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_46x30mm</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== MP9 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_MP9_PDW</defName>
+		<statBases>
+			<Mass>1.40</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.66</SwayFactor>
+			<Bulk>3.03</Bulk>
+			<WorkToMake>28500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>25</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.14</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNMP9Shot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== MPX ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_MPX_PDW</defName>
+		<statBases>
+			<Mass>2.70</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.88</SwayFactor>
+			<Bulk>4.25</Bulk>
+			<WorkToMake>29500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>35</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.61</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_40SW_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShotMPX</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_40SW</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== P90 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_P90_PDW</defName>
+		<statBases>
+			<Mass>2.60</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>0.77</SwayFactor>
+			<Bulk>5.05</Bulk>
+			<WorkToMake>37000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>30</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.05</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>31</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNP90Shot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_FN57x28mm</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== P90 SD ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_P90SD_PDW</defName>
+		<statBases>
+			<Mass>2.94</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>0.99</SwayFactor>
+			<Bulk>6.96</Bulk>
+			<WorkToMake>38500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>0.99</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>31</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShotSMG2SD</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>6</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_FN57x28mm</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== PP-19 Bizon ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_PP19_PDW</defName>
+		<statBases>
+			<Mass>2.10</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.87</SwayFactor>
+			<Bulk>4.25</Bulk>
+			<WorkToMake>28000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>35</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.35</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x18mmMakarov_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNShotSMG_II</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>64</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== PP-2000 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_PP2000_PDW</defName>
+		<statBases>
+			<Mass>1.40</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>0.70</SwayFactor>
+			<Bulk>3.40</Bulk>
+			<WorkToMake>28500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>25</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.62</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RNMP9Shot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== PPSh-41 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_PPSh41_PDW</defName>
+		<statBases>
+			<Mass>3.63</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.21</SwayFactor>
+			<Bulk>9.43</Bulk>
+			<WorkToMake>27500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.22</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>25</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShotAK74USMG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>71</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Skorpion vz. 61 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_SkorpionVZ61_PDW</defName>
+		<statBases>
+			<Mass>1.30</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.65</SwayFactor>
+			<Bulk>2.70</Bulk>
+			<WorkToMake>27500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.57</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_32ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>25</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShotSkorpionVZ</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_32ACP</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Skorpion vz. 61 SD ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_SkorpionVZ61SD_PDW</defName>
+		<statBases>
+			<Mass>1.65</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>0.91</SwayFactor>
+			<Bulk>4.99</Bulk>
+			<WorkToMake>29000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.39</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_32ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>25</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShotSMG2SD</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>6</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_32ACP</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Thompson SMG ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_ThompsonSMG_PDW</defName>
+		<statBases>
+			<Mass>4.90</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.35</SwayFactor>
+			<Bulk>8.60</Bulk>
+			<WorkToMake>27500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.32</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>25</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RNShotMP7SMG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== UMP45 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_UMP45_PDW</defName>
+		<statBases>
+			<Mass>2.50</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.94</SwayFactor>
+			<Bulk>4.50</Bulk>
+			<WorkToMake>30500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>30</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.85</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>15</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNUMP45Shot</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== UMP45 SD ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_UMP45SD_PDW</defName>
+		<statBases>
+			<Mass>2.98</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.20</SwayFactor>
+			<Bulk>6.63</Bulk>
+			<WorkToMake>32000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.69</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>15</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNShotSupressed_III</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>6</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Uzi ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Uzi_PDW</defName>
+		<statBases>
+			<Mass>3.50</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>3.30</SwayFactor>
+			<Bulk>4.70</Bulk>
+			<WorkToMake>29500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>45</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.39</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>31</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNShotMAC11SMG</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Uzi SD ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_UziSD_PDW</defName>
+		<statBases>
+			<Mass>4.11</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<Bulk>6.45</Bulk>
+			<WorkToMake>30000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.25</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>31</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNShotSMGSDMAC</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>6</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Walther MPL ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_WaltherMPL_PDW</defName>
+		<statBases>
+			<Mass>3.00</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.05</SwayFactor>
+			<Bulk>4.62</Bulk>
+			<WorkToMake>29000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.45</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>31</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<soundCast>RNShotMAC11SMG</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Zastava M92 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_ZastavaM92_PDW</defName>
+		<statBases>
+			<Mass>3.57</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.15</SwayFactor>
+			<Bulk>5.50</Bulk>
+			<WorkToMake>29500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>45</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.74</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>0.9</warmupTime>
+			<range>31</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>RNShot_AK47Rifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNGun_AK74U_PDW" or
+			defName="RNGun_AKMSU_PDW" or
+			defName="RNGun_AKS74U_PDW" or
+			defName="RNGun_CZScorpion_PDW" or
+			defName="RNGun_HoneyBadger_PDW" or
+			defName="RNGun_KrissVector_PDW" or
+			defName="RNGun_KrissVectorContractor_PDW" or
+			defName="RNGun_MAC11_PDW" or
+			defName="RNGun_MAC11SD_PDW" or
+			defName="RNGun_MP40_PDW" or
+			defName="RNGun_MP5A2_PDW" or
+			defName="RNGun_MP5A2SD_PDW" or
+			defName="RNGun_MP5A3_PDW" or
+			defName="RNGun_MP5A3SD_PDW" or
+			defName="RNGun_MP5KPDW_PDW" or
+			defName="RNGun_MP5KPDWSD_PDW" or
+			defName="RNGun_MP7_PDW" or
+			defName="RNGun_MP9_PDW" or
+			defName="RNGun_MPX_PDW" or
+			defName="RNGun_P90_PDW" or
+			defName="RNGun_P90SD_PDW" or
+			defName="RNGun_PP19_PDW" or
+			defName="RNGun_PP2000_PDW" or
+			defName="RNGun_PPSh41_PDW" or
+			defName="RNGun_SkorpionVZ61_PDW" or
+			defName="RNGun_SkorpionVZ61SD_PDW" or
+			defName="RNGun_ThompsonSMG_PDW" or
+			defName="RNGun_UMP45_PDW" or
+			defName="RNGun_UMP45SD_PDW" or
+			defName="RNGun_Uzi_PDW" or
+			defName="RNGun_UziSD_PDW" or
+			defName="RNGun_WaltherMPL_PDW" or
+			defName="RNGun_ZastavaM92_PDW"
+			]/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>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_Shotguns.xml b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_Shotguns.xml
new file mode 100644
index 0000000000..a2eead886e
--- /dev/null
+++ b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_Shotguns.xml	
@@ -0,0 +1,921 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== AA12 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_AA12S</defName>
+		<statBases>
+			<Mass>5.20</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.49</SwayFactor>
+			<Bulk>10.66</Bulk>
+			<WorkToMake>32000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>15</Chemfuel>
+			<Steel>55</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.26</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+			<soundCast>RNShotAutoShotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== KS-23 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_KS23S</defName>
+		<statBases>
+			<Mass>3.85</Mass>
+			<RangedWeapon_Cooldown>1.02</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.43</SwayFactor>
+			<Bulk>10.40</Bulk>
+			<WorkToMake>12000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Chemfuel>5</Chemfuel>
+			<Steel>55</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_23x75mmR_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>RNShotPumpShot</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>4</magazineSize>
+			<reloadTime>3.4</reloadTime>
+			<ammoSet>AmmoSet_23x75mmR</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Kel-Tec KSG ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_KSGS</defName>
+		<statBases>
+			<Mass>6.90</Mass>
+			<RangedWeapon_Cooldown>0.97</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.35</SwayFactor>
+			<Bulk>6.60</Bulk>
+			<WorkToMake>17000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>RNShotPumpShot</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>13.25</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== M1014 / Benelli M4 Super 90 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_M1014S</defName>
+		<statBases>
+			<Mass>3.82</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>6.82</Bulk>
+			<WorkToMake>18000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShotM1014S</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>6.8</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Model 1887 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Model1887LA</defName>
+		<statBases>
+			<Mass>3.60</Mass>
+			<RangedWeapon_Cooldown>0.79</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.36</SwayFactor>
+			<Bulk>9.97</Bulk>
+			<WorkToMake>10000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>RNShotModel1887LA</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>5.1</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Model 1897 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Model1897S</defName>
+		<statBases>
+			<Mass>3.60</Mass>
+			<RangedWeapon_Cooldown>0.99</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.36</SwayFactor>
+			<Bulk>10.00</Bulk>
+			<WorkToMake>10000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShotPumpShot</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.25</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Mossberg 500 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Mossberg500S</defName>
+		<statBases>
+			<Mass>3.40</Mass>
+			<RangedWeapon_Cooldown>1.00</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.55</SwayFactor>
+			<Bulk>12.07</Bulk>
+			<WorkToMake>11500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>60</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RN870Shot</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>5.1</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Mossberg 500 Tactical ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Mossberg500TacticalS</defName>
+		<statBases>
+			<Mass>3.06</Mass>
+			<RangedWeapon_Cooldown>1.00</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<Bulk>8.35</Bulk>
+			<WorkToMake>16500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>45</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>12</range>
+			<soundCast>RN870Shot</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>5.1</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Remington 870 Magnum ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Remington870MagnumS</defName>
+		<statBases>
+			<Mass>3.40</Mass>
+			<RangedWeapon_Cooldown>1.00</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.32</SwayFactor>
+			<Bulk>9.78</Bulk>
+			<WorkToMake>12500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RN870Shot</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>5.1</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Remington 870 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Remington870S</defName>
+		<statBases>
+			<Mass>2.54</Mass>
+			<RangedWeapon_Cooldown>1.02</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>0.92</SwayFactor>
+			<Bulk>6.68</Bulk>
+			<WorkToMake>10000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RN870Shot</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.25</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Remington 870 Tactical ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Remington870TacticalS</defName>
+		<statBases>
+			<Mass>2.72</Mass>
+			<RangedWeapon_Cooldown>1.02</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.12</SwayFactor>
+			<Bulk>7.67</Bulk>
+			<WorkToMake>16000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>12</range>
+			<soundCast>RN870Shot</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>5.1</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Saiga-12 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Saiga12S</defName>
+		<statBases>
+			<Mass>3.50</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.26</SwayFactor>
+			<Bulk>9.10</Bulk>
+			<WorkToMake>20500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>RNShotSAIGA</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Sawed-Off Shotgun ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_SawedOff</defName>
+		<statBases>
+			<Mass>1.90</Mass>
+			<RangedWeapon_Cooldown>0.93</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>2.73</SwayFactor>
+			<Bulk>6.29</Bulk>
+			<WorkToMake>8500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>40</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>11</range>
+			<soundCast>RNShotSawnOff</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>2</magazineSize>
+			<reloadTime>1.7</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== SPAS-12 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_SPAS12S</defName>
+		<statBases>
+			<Mass>4.40</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.48</SwayFactor>
+			<Bulk>8.20</Bulk>
+			<WorkToMake>18500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>55</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShotSPAS</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>9</magazineSize>
+			<reloadTime>7.65</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Supernova ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_Supernova</defName>
+		<statBases>
+			<Mass>3.45</Mass>
+			<RangedWeapon_Cooldown>0.99</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.36</SwayFactor>
+			<Bulk>10.16</Bulk>
+			<WorkToMake>12500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>50</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNNovaShot</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.25</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Super-Shorty / Mossberg Maverick 88 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_SuperShorty</defName>
+		<statBases>
+			<Mass>1.80</Mass>
+			<RangedWeapon_Cooldown>1.03</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>0.60</SwayFactor>
+			<Bulk>4.19</Bulk>
+			<WorkToMake>8500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>5</Chemfuel>
+			<Steel>30</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RNShortShot</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>3</magazineSize>
+			<reloadTime>2.55</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== USAS-12 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_USAS12S</defName>
+		<statBases>
+			<Mass>5.45</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.51</SwayFactor>
+			<Bulk>9.60</Bulk>
+			<WorkToMake>30500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>55</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.36</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>11</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<soundCast>RNShotUSAS</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== UTAS UTS-15 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNGun_UTS15S</defName>
+		<statBases>
+			<Mass>3.10</Mass>
+			<RangedWeapon_Cooldown>1.00</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.03</SwayFactor>
+			<Bulk>7.20</Bulk>
+			<WorkToMake>15500</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>10</Chemfuel>
+			<Steel>40</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>RNShotPumpShot</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>13.25</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<!-- shotguns with stocks -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNGun_AA12S" or
+			defName="RNGun_KS23S" or
+			defName="RNGun_KSGS" or
+			defName="RNGun_M1014S" or
+			defName="RNGun_Mossberg500S" or
+			defName="RNGun_Mossberg500TacticalS" or
+			defName="RNGun_Remington870MagnumS" or
+			defName="RNGun_Remington870TacticalS" or
+			defName="RNGun_Saiga12S" or
+			defName="RNGun_SPAS12S" or
+			defName="RNGun_Supernova" or
+			defName="RNGun_USAS12S" or
+			defName="RNGun_UTS15S"
+			]/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>
+
+	<!-- shotguns without stocks -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNGun_Model1887LA" or
+			defName="RNGun_Model1897S" or
+			defName="RNGun_Remington870S" or
+			defName="RNGun_SawedOff" or
+			defName="RNGun_SuperShorty"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</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>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_Spacer.xml b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_Spacer.xml
new file mode 100644
index 0000000000..deb4d5ae57
--- /dev/null
+++ b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_Spacer.xml	
@@ -0,0 +1,384 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Auger Mk II ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNSci_AugerMkII</defName>
+		<statBases>
+
+			<SightsEfficiency>1.05</SightsEfficiency>
+			<ShotSpread>0.065</ShotSpread>
+			<SwayFactor>1.2</SwayFactor>
+			<Bulk>8.07</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.13</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>30.9</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<soundCast>RNAugerMkIIShot</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>2.40</reloadTime>
+			<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Auger WS ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNSci_AugerWS</defName>
+		<statBases>
+
+			<SightsEfficiency>1.05</SightsEfficiency>
+			<ShotSpread>0.065</ShotSpread>
+			<SwayFactor>1.2</SwayFactor>
+			<Bulk>8.07</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.13</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>30.9</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<soundCast>RNAugerShot</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>2.40</reloadTime>
+			<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== BM001 Razor ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNSci_BM001Razor</defName>
+		<statBases>
+
+			<SightsEfficiency>1.05</SightsEfficiency>
+			<ShotSpread>0.065</ShotSpread>
+			<SwayFactor>1.2</SwayFactor>
+			<Bulk>8.07</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.03</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
+			<warmupTime>0.9</warmupTime>
+			<range>30.9</range>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<soundCast>RNRazorShot</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>2.40</reloadTime>
+			<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== BM003 Razor ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNSci_BM003Razor</defName>
+		<statBases>
+
+			<SightsEfficiency>1.05</SightsEfficiency>
+			<ShotSpread>0.065</ShotSpread>
+			<SwayFactor>1.2</SwayFactor>
+			<Bulk>8.07</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.03</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
+			<warmupTime>0.9</warmupTime>
+			<range>35.9</range>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<soundCast>RNBlueDeathShot</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>2.40</reloadTime>
+			<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Bullseye Mk I ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNSci_BullseyeMkI</defName>
+		<statBases>
+
+			<SightsEfficiency>1.05</SightsEfficiency>
+			<ShotSpread>0.065</ShotSpread>
+			<SwayFactor>1.2</SwayFactor>
+			<Bulk>8.07</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.03</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
+			<warmupTime>0.9</warmupTime>
+			<range>35.9</range>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<soundCast>RNRazorShot</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>2.40</reloadTime>
+			<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Bullseye Mk II ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNSci_BullseyeMkII</defName>
+		<statBases>
+
+			<SightsEfficiency>1.05</SightsEfficiency>
+			<ShotSpread>0.065</ShotSpread>
+			<SwayFactor>1.2</SwayFactor>
+			<Bulk>8.07</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.03</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
+			<warmupTime>0.9</warmupTime>
+			<range>35.9</range>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<soundCast>RNBlueDeathShot</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>2.40</reloadTime>
+			<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Longbow 1S-1K ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNSci_Longbow1S1K</defName>
+		<statBases>
+
+			<SightsEfficiency>1.45</SightsEfficiency>
+			<ShotSpread>0.025</ShotSpread>
+			<SwayFactor>1.0</SwayFactor>
+			<Bulk>11.07</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12x64mmCharged</defaultProjectile>
+			<warmupTime>0.9</warmupTime>
+			<range>40.9</range>
+			<burstShotCount>1</burstShotCount>
+			<ticksBetweenBurstShots>22</ticksBetweenBurstShots>
+			<soundCast>RNLongbowShot</soundCast>
+			<soundAiming>RNLongbowCharge</soundAiming>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>2.40</reloadTime>
+			<ammoSet>AmmoSet_12x64mmCharged</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+	</Operation>
+
+	<!-- ========== Railgun ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RNSci_Railgun</defName>
+		<statBases>
+			<SightsEfficiency>1.45</SightsEfficiency>
+			<ShotSpread>0.025</ShotSpread>
+			<SwayFactor>1.0</SwayFactor>
+			<Bulk>11.07</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
+			<warmupTime>2.2</warmupTime>
+			<range>40.9</range>
+			<burstShotCount>1</burstShotCount>
+			<ticksBetweenBurstShots>22</ticksBetweenBurstShots>
+			<soundCast>RNRailgunShot</soundCast>
+			<soundAiming>RNLongbowCharge</soundAiming>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>2.40</reloadTime>
+			<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="RNSci_AugerMkII" or
+			defName="RNSci_AugerWS" or
+			defName="RNSci_BM001Razor" or
+			defName="RNSci_BM003Razor" or
+			defName="RNSci_BullseyeMkI" or
+			defName="RNSci_BullseyeMkII" or
+			defName="RNSci_Longbow1S1K" or
+			defName="RNSci_Railgun"
+			]/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>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedSpecial_AirSupport.xml b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedSpecial_AirSupport.xml
new file mode 100644
index 0000000000..661c337734
--- /dev/null
+++ b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedSpecial_AirSupport.xml	
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Patch EMP to use CE EMP projectile defs ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RNAir_EMPBlast"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<damageDef>EMP</damageDef>
+				<damageAmountBase>9001</damageAmountBase>
+				<explosionRadius>15.9</explosionRadius>
+				<flyOverhead>true</flyOverhead>
+				<preExplosionSpawnThingDef>Spark</preExplosionSpawnThingDef>
+				<speed>70</speed>
+			</projectile>
+		</value>
+	</Operation>
+
+	<!-- ========== All other air support defs do not require CE patches ========== -->
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_Ranged_Misc.xml b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_Ranged_Misc.xml
new file mode 100644
index 0000000000..3db23cd098
--- /dev/null
+++ b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_Ranged_Misc.xml	
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Ballistic Knife ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RN_BallisticKnife</defName>
+		<statBases>
+			<Mass>0.560</Mass>
+			<RangedWeapon_Cooldown>1.07</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>0.85</SwayFactor>
+			<Bulk>1.00</Bulk>
+			<WorkToMake>3000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_BallisticKnifeBlade</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>3</range>
+			<burstShotCount>1</burstShotCount>
+			<ticksBetweenBurstShots>0</ticksBetweenBurstShots>
+			<soundCast>RNShotBallistic</soundCast>
+			<muzzleFlashScale>0</muzzleFlashScale>
+		</Properties>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RN_BallisticKnife"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.18</cooldownTime>
+					<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.32</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.26</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.42</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RN_BallisticKnife"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RN_BallisticKnife"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.5</MeleeCritChance>
+				<MeleeParryChance>0.15</MeleeParryChance>
+				<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- ========== Compound Bow ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RN_CompoundBow</defName>
+		<statBases>
+			<SightsEfficiency>0.95</SightsEfficiency>
+			<ShotSpread>1</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>3</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_StreamlinedArrow_Steel</defaultProjectile>
+			<warmupTime>1.25</warmupTime>
+			<range>24</range>
+			<soundCast>Bow_Recurve</soundCast>
+		</Properties>
+		<AmmoUser>
+			<ammoSet>AmmoSet_StreamlinedArrow</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RN_CompoundBow"]/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>
+	</Operation>
+
+	<!-- ========== Compound Crossbow ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>RN_CompoundCrossbow</defName>
+		<statBases>
+			<SightsEfficiency>0.95</SightsEfficiency>
+			<ShotSpread>1</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>3</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_CrossbowBolt_Steel</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>26</range>
+			<soundCast>RNCrossbow</soundCast>
+		</Properties>
+		<AmmoUser>
+			<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<!-- No additional CE weaponTags needed -->
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RN_CompoundCrossbow"]/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>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal - Spacer Faction Pack/Defs/Rimsenal - Spacer Faction Pack/Recipes_Grenades.xml b/ModPatches/Rimsenal - Spacer Faction Pack/Defs/Rimsenal - Spacer Faction Pack/Recipes_Grenades.xml
new file mode 100644
index 0000000000..1b543c3693
--- /dev/null
+++ b/ModPatches/Rimsenal - Spacer Faction Pack/Defs/Rimsenal - Spacer Faction Pack/Recipes_Grenades.xml	
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- Rimsenal Explosive Recipe Base -->
+	<RecipeDef Name="RSExplosive_RecipeBase" Abstract="true">
+		<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+		<effectWorking>Cook</effectWorking>
+		<soundWorking>Recipe_Smith</soundWorking>
+		<workSkill>Crafting</workSkill>
+		<unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Plasteel</li>
+				<li>ComponentIndustrial</li>
+				<li>FSX</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+	</RecipeDef>
+
+	<!-- YP BaegYa Microwave Grenades -->
+	<RecipeDef ParentName="RSExplosive_RecipeBase">
+		<defName>Craft_10_Smartgrenade</defName>
+		<label>Craft 10 smart grenades</label>
+		<description>Craft 10 smart grenades.</description>
+		<jobString>Crafting smart grenades</jobString>
+		<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+		<effectWorking>Cook</effectWorking>
+		<soundWorking>Recipe_Smith</soundWorking>
+		<workSkill>Crafting</workSkill>
+		<unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Plasteel</li>
+				<li>SubcoreBasic</li>
+				<li>FSX</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>SubcoreBasic</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<researchPrerequisite>SmartWeapons</researchPrerequisite>
+		<skillRequirements>
+			<Crafting>7</Crafting>
+		</skillRequirements>
+		<products>
+			<Weapon_GrenadeSmart>10</Weapon_GrenadeSmart>
+		</products>
+		<workAmount>20000</workAmount>
+		<recipeUsers>
+			<li>FabricationBench</li>
+		</recipeUsers>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal - Spacer Faction Pack/Patches/Rimsenal - Spacer Faction Pack/Apparel_Spacer_CE.xml b/ModPatches/Rimsenal - Spacer Faction Pack/Patches/Rimsenal - Spacer Faction Pack/Apparel_Spacer_CE.xml
new file mode 100644
index 0000000000..b85d6c7362
--- /dev/null
+++ b/ModPatches/Rimsenal - Spacer Faction Pack/Patches/Rimsenal - Spacer Faction Pack/Apparel_Spacer_CE.xml	
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ==========  Unisuit =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_Unisuit"]/statBases</xpath>
+		<value>
+			<Bulk>0</Bulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Unisuit"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_Unisuit"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Apparel_Unisuit"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.625</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.625</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ==========  Smart Visor =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SmartVisor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.01</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_SmartVisor"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency_Apparel>0.80</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SmartVisor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.01</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_SmartVisor"]/costList</xpath>
+		<attribute>Inherit</attribute>
+		<value>false</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SmartVisor"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets Inherit="False">
+				<AimingAccuracy>0.3</AimingAccuracy>
+				<AimingDelayFactor>-0.25</AimingDelayFactor>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_SmartVisor"]/apparel</xpath>
+		<value>
+			<layers Inherit="False">
+				<li>StrappedHead</li>
+			</layers>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal - Spacer Faction Pack/Patches/Rimsenal - Spacer Faction Pack/Explosives_Smart_CE.xml b/ModPatches/Rimsenal - Spacer Faction Pack/Patches/Rimsenal - Spacer Faction Pack/Explosives_Smart_CE.xml
new file mode 100644
index 0000000000..d9cea153c3
--- /dev/null
+++ b/ModPatches/Rimsenal - Spacer Faction Pack/Patches/Rimsenal - Spacer Faction Pack/Explosives_Smart_CE.xml	
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Remove Recipe Maker & Verbs ========== -->
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="Weapon_GrenadeSmart"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>BaseWeapon</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Weapon_GrenadeSmart"]/smeltable</xpath>
+		<value>
+			<smeltable>false</smeltable>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Weapon_GrenadeSmart"]/recipeMaker </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Weapon_GrenadeSmart"]/costList </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Weapon_GrenadeSmart"]/verbs </xpath>
+	</Operation>
+
+	<!-- ========== Projectile ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Proj_GrenadeSmart"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<explosionRadius>1.5</explosionRadius>
+				<damageDef>Bomb</damageDef>
+				<damageAmountBase>56</damageAmountBase>
+				<explosionDelay>60</explosionDelay>
+				<dropsCasings>true</dropsCasings>
+				<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+				<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<speed>12</speed>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+				<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
+			</projectile>
+		</value>
+	</Operation>
+
+	<!-- ========== Check Comp ========== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Proj_GrenadeSmart"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Proj_GrenadeSmart"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<!-- ========== Add Fragmentation ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Proj_GrenadeSmart"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>40</Fragment_Small>
+				</fragments>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Weapon Stack and Appearance -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Weapon_GrenadeSmart"]/graphicData </xpath>
+		<value>
+			<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Weapon_GrenadeSmart"] </xpath>
+		<value>
+			<thingClass>CombatExtended.AmmoThing</thingClass>
+			<stackLimit>75</stackLimit>
+			<resourceReadoutPriority>First</resourceReadoutPriority>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="Weapon_GrenadeSmart"] </xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<!-- Weapon Check Comps -->
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Weapon_GrenadeSmart"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Weapon_GrenadeSmart"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<!-- Weapon Values -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Weapon_GrenadeSmart"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>40</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1.5</explosiveRadius>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>20</Fragment_Small>
+				</fragments>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Weapon_GrenadeSmart</defName>
+		<statBases>
+			<Mass>0.4</Mass>
+			<Bulk>0.87</Bulk>
+			<MarketValue>15.22</MarketValue>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<SightsEfficiency>10</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<label>throw frag grenade</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<range>14.0</range>
+			<minRange>4</minRange>
+			<warmupTime>0.8</warmupTime>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<soundCast>ThrowGrenade</soundCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<defaultProjectile>Proj_GrenadeSmart</defaultProjectile>
+			<onlyManualCast>true</onlyManualCast>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+			<ai_AvoidFriendlyFireRadius>7</ai_AvoidFriendlyFireRadius>
+		</Properties>
+		<weaponTags>
+			<li>CE_AI_Grenade</li>
+			<li>CE_AI_AOE</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Weapon_GrenadeSmart"]/graphicData</xpath>
+		<value>
+			<graphicData>
+				<texPath>Things/Projectile/SmartGrenade</texPath>
+				<graphicClass>Graphic_Single</graphicClass>
+				<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
+			</graphicData>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal - Spacer Faction Pack/Patches/Rimsenal - Spacer Faction Pack/Mechs_Body_CE.xml b/ModPatches/Rimsenal - Spacer Faction Pack/Patches/Rimsenal - Spacer Faction Pack/Mechs_Body_CE.xml
new file mode 100644
index 0000000000..7a9098afaf
--- /dev/null
+++ b/ModPatches/Rimsenal - Spacer Faction Pack/Patches/Rimsenal - Spacer Faction Pack/Mechs_Body_CE.xml	
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Natural Armor-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Tagmaton" or defName="Omniservant"]//*[
+			def="MechanicalThorax" or
+			def="MechanicalNeck" or
+			def="MechanicalShoulder" or
+			def="MechanicalArm" or
+			def="MechanicalHand" or
+			def="MechanicalLeg" or
+			def="MechanicalFoot"
+			]
+		</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Tagmaton" or defName="Omniservant"]//*[
+			def="MechanicalFinger" or
+			def="MechanicalHead"
+			]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal - Spacer Faction Pack/Patches/Rimsenal - Spacer Faction Pack/Mechs_Smart_CE.xml b/ModPatches/Rimsenal - Spacer Faction Pack/Patches/Rimsenal - Spacer Faction Pack/Mechs_Smart_CE.xml
new file mode 100644
index 0000000000..5784fb16c8
--- /dev/null
+++ b/ModPatches/Rimsenal - Spacer Faction Pack/Patches/Rimsenal - Spacer Faction Pack/Mechs_Smart_CE.xml	
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Tagma =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="BaseMechanoidTagma"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>7</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="BaseMechanoidTagma"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Tagmaton"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.11</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.11</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.1</chanceFactor>
+					<armorPenetrationBlunt>0.7</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Omniservant =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RSMechanoid"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RSMechanoid"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="RSMechanoid"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.11</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.11</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.1</chanceFactor>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Borer =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Borer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>drill</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Stab</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.5</cooldownTime>
+					<armorPenetrationSharp>0.85</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Psiloid =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Psiloid"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Psiloid"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal - Spacer Faction Pack/Patches/Rimsenal - Spacer Faction Pack/Weapons_Smart_CE.xml b/ModPatches/Rimsenal - Spacer Faction Pack/Patches/Rimsenal - Spacer Faction Pack/Weapons_Smart_CE.xml
new file mode 100644
index 0000000000..f8577dc125
--- /dev/null
+++ b/ModPatches/Rimsenal - Spacer Faction Pack/Patches/Rimsenal - Spacer Faction Pack/Weapons_Smart_CE.xml	
@@ -0,0 +1,830 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Melee Tools =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Gun_SmartRevolver" or
+			defName="Gun_SmartAutoPistol" or
+			defName="Gun_SmartMachinePistol"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Gun_SmartBoltActionRifle" or
+			defName="Gun_SmartPumpShotgun" or
+			defName="Gun_SmartChainShotgun" or
+			defName="Gun_SmartHeavySMG" or
+			defName="Gun_SmartLMG" or
+			defName="Gun_SmartAssaultRifle" or
+			defName="Gun_SniperRifleSmart" or
+			defName="Gun_SmartChargeRifle" or
+			defName="Gun_SmartChargeLance"]/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_SmartMinigun"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrels</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2.44</cooldownTime>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrels</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Stats =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="Gun_SmartRevolver" or
+			defName="Gun_SmartAutoPistol" or
+			defName="Gun_SmartMachinePistol" or
+			defName="Gun_SmartBoltActionRifle" or
+			defName="Gun_SmartPumpShotgun" or
+			defName="Gun_SmartChainShotgun" or
+			defName="Gun_SmartHeavySMG" or
+			defName="Gun_SmartLMG" or
+			defName="Gun_SmartAssaultRifle" or
+			defName="Gun_SniperRifleSmart" or
+			defName="Gun_SmartChargeRifle" or
+			defName="Gun_SmartChargeLance" or
+			defName="Gun_SmartMinigun"
+			]/statBases </xpath>
+		<value>
+			<NightVisionEfficiency_Weapon>0.50</NightVisionEfficiency_Weapon>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="Gun_SmartRevolver" or
+			defName="Gun_SmartAutoPistol" or
+			defName="Gun_SmartMachinePistol" or
+			defName="Gun_SmartBoltActionRifle" or
+			defName="Gun_SmartPumpShotgun" or
+			defName="Gun_SmartChainShotgun" or
+			defName="Gun_SmartHeavySMG" or
+			defName="Gun_SmartLMG" or
+			defName="Gun_SmartAssaultRifle" or
+			defName="Gun_SniperRifleSmart" or
+			defName="Gun_SmartChargeRifle" or
+			defName="Gun_SmartChargeLance" or
+			defName="Gun_SmartMinigun"
+			]/equippedStatOffsets </xpath>
+		<value>
+			<AimingAccuracy>0.5</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!-- ========== Smart Revolver =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SmartRevolver</defName>
+		<statBases>
+			<SightsEfficiency>0.9</SightsEfficiency>
+			<ShotSpread>0.135</ShotSpread><!--25% reduction-->
+			<SwayFactor>0.635</SwayFactor><!--25% reduction-->
+			<Bulk>2.41</Bulk>
+			<Mass>1.39</Mass>
+			<RangedWeapon_Cooldown>0.51</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.76</recoilAmount><!--50% reduction-->
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_44Magnum_HV_FMJ</defaultProjectile>
+			<warmupTime>0.4</warmupTime>
+			<range>23</range>
+			<soundCast>Shot_Revolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>3.6</reloadTime>
+			<ammoSet>AmmoSet_44Magnum_HV</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_Pistol</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>AdvancedGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Smart Pistol =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SmartAutoPistol</defName>
+		<statBases>
+			<SightsEfficiency>0.9</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>0.80</SwayFactor>
+			<Bulk>2.10</Bulk>
+			<Mass>1.11</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.89</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
+			<warmupTime>0.4</warmupTime>
+			<range>23</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>14</magazineSize>
+			<reloadTime>3.0</reloadTime>
+			<ammoSet>AmmoSet_FN57x28mm</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_Pistol</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>AdvancedGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Smart Bolt Action =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SmartBoltActionRifle</defName>
+		<statBases>
+			<SightsEfficiency>1.2</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.26</SwayFactor>
+			<Bulk>9.50</Bulk>
+			<Mass>4.19</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.97</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_277Fury_FMJ</defaultProjectile>
+			<warmupTime>0.9</warmupTime>
+			<range>68</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>3.0</reloadTime>
+			<ammoSet>AmmoSet_277Fury</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_Pistol</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>AdvancedGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Smart MP =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SmartMachinePistol</defName>
+		<statBases>
+			<SightsEfficiency>0.9</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.45</SwayFactor>
+			<Bulk>2.95</Bulk>
+			<Mass>2.84</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.57</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
+			<warmupTime>0.4</warmupTime>
+			<range>21</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>3.0</reloadTime>
+			<ammoSet>AmmoSet_FN57x28mm</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_Pistol</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>AdvancedGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Smart Pump =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SmartPumpShotgun</defName>
+		<statBases>
+			<SightsEfficiency>1.2</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>0.90</SwayFactor>
+			<Bulk>9.00</Bulk>
+			<Mass>3.00</Mass>
+			<RangedWeapon_Cooldown>1.00</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.58</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.4</warmupTime>
+			<range>18</range>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.45</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>AdvancedGun</li>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Smart Chain =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SmartChainShotgun</defName>
+		<statBases>
+			<SightsEfficiency>1.2</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>0.95</SwayFactor>
+			<Bulk>6.70</Bulk>
+			<Mass>3.50</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.46</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.4</warmupTime>
+			<range>18</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>9</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>AdvancedGun</li>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Smart SMG =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SmartHeavySMG</defName>
+		<statBases>
+			<SightsEfficiency>1.2</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>0.71</SwayFactor>
+			<Bulk>4.50</Bulk>
+			<Mass>2.5</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.58</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
+			<warmupTime>0.4</warmupTime>
+			<range>31</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>3.0</reloadTime>
+			<ammoSet>AmmoSet_FN57x28mm</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>AdvancedGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Smart MG =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SmartLMG</defName>
+		<statBases>
+			<SightsEfficiency>1.2</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.60</SwayFactor>
+			<Bulk>12.90</Bulk>
+			<Mass>8.70</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.66</recoilAmount><!--Halved from 1.33-->
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_277Fury_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>68</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>5.1</reloadTime>
+			<ammoSet>AmmoSet_277Fury</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_MachineGun</li>
+			<li>CE_AI_Suppressive</li>
+			<li>AdvancedGun</li>
+			<li>Bipod_LMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Smart Rifle =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SmartAssaultRifle</defName>
+		<statBases>
+			<WorkToMake>39500</WorkToMake>
+			<SightsEfficiency>1.20</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.00</SwayFactor>
+			<Bulk>9.00</Bulk>
+			<Mass>3.40</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.11</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_277Fury_FMJ</defaultProjectile>
+			<warmupTime>0.9</warmupTime>
+			<range>62</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>3.0</reloadTime>
+			<ammoSet>AmmoSet_277Fury</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Rifle</li>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>AdvancedGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Smart Sniper Rifle =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SniperRifleSmart</defName>
+		<statBases>
+			<SightsEfficiency>4</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>0.98</SwayFactor>
+			<Bulk>11.92</Bulk>
+			<Mass>6.8</Mass>
+			<RangedWeapon_Cooldown>1.38</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
+			<warmupTime>1.6</warmupTime>
+			<range>86</range>
+			<soundCast>Shot_SniperRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>3.0</reloadTime>
+			<ammoSet>AmmoSet_338Lapua</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Rifle</li>
+			<li>AdvancedGun</li>
+			<li>Bipod_DMR</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Minigun =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SmartMinigun</defName>
+		<statBases>
+			<SightsEfficiency>1.20</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>2.42</SwayFactor>
+			<Bulk>8.02</Bulk>
+			<Mass>20.00</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.49</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_277Fury_FMJ</defaultProjectile>
+			<warmupTime>1.9</warmupTime>
+			<range>68</range>
+			<burstShotCount>50</burstShotCount>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>250</magazineSize>
+			<reloadTime>7.1</reloadTime>
+			<ammoSet>AmmoSet_277Fury</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>25</aimedBurstShotCount>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Suppressive</li>
+			<li>AdvancedGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Smart Rifle (Charge) =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SmartChargeRifle</defName>
+		<statBases>
+			<SightsEfficiency>1.20</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>0.90</SwayFactor>
+			<Bulk>7.00</Bulk>
+			<Mass>3.00</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.73</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
+			<warmupTime>0.9</warmupTime>
+			<range>62</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>3.0</reloadTime>
+			<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AR</li>
+			<li>CE_Rifle</li>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>AdvancedGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Smart Lance (Charge Sniper) =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SmartChargeLance</defName>
+		<statBases>
+			<SightsEfficiency>1.2</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.43</SwayFactor>
+			<Bulk>12.00</Bulk>
+			<Mass>8.00</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.75</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x50mmCharged</defaultProjectile>
+			<warmupTime>0.95</warmupTime>
+			<range>75</range>
+			<soundCast>ChargeLance_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>3.0</reloadTime>
+			<ammoSet>AmmoSet_8x50mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Rifle</li>
+			<li>AdvancedGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Slug Spitter =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SlugSpitter</defName>
+		<statBases>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>0.88</SwayFactor>
+			<Bulk>13.00</Bulk>
+			<Mass>8.00</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.89</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_5x100mmCaseless_Sabot_LV</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>44</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>24</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_5x100mmCaseless_LV</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AR</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Gun_SlugSpitterBase"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>bayonet</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.38</cooldownTime>
+					<armorPenetrationBlunt>1.15</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.50</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Smart Sword =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_SmartSword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.69</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.80</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>47</power>
+					<cooldownTime>1.17</cooldownTime>
+					<armorPenetrationBlunt>4.06</armorPenetrationBlunt>
+					<armorPenetrationSharp>12</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>1.05</cooldownTime>
+					<armorPenetrationBlunt>2.048</armorPenetrationBlunt>
+					<armorPenetrationSharp>16</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_SmartSword"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>1.5</MeleeCounterParryBonus>
+			<Bulk>8.5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_SmartSword"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeCritChance>1.1</MeleeCritChance>
+			<MeleeParryChance>0.7</MeleeParryChance>
+			<MeleeDodgeChance>0.6</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- ========== Stun Prod =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_StunProd"]/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>head</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Stun</def>
+							<amount>8</amount>
+							<chance>0.50</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="MeleeWeapon_StunProd"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.9</MeleeCounterParryBonus>
+			<Bulk>5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_StunProd"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.17</MeleeCritChance>
+				<MeleeParryChance>0.9</MeleeParryChance>
+				<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Core/Defs/Rimsenal Core/Ammo_GD.xml b/ModPatches/Rimsenal Core/Defs/Rimsenal Core/Ammo_GD.xml
new file mode 100644
index 0000000000..a5f9474561
--- /dev/null
+++ b/ModPatches/Rimsenal Core/Defs/Rimsenal Core/Ammo_GD.xml	
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ==================== Pistol - AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_473x33mmCaseless_GDPistol</defName>
+		<label>4.73x33mm Caseless</label>
+		<ammoTypes>
+			<Ammo_473x33mmCaseless_FMJ>Bullet_473x33mmGDPistol_FMJ</Ammo_473x33mmCaseless_FMJ>
+			<Ammo_473x33mmCaseless_AP>Bullet_473x33mmGDPistol_AP</Ammo_473x33mmCaseless_AP>
+			<Ammo_473x33mmCaseless_HP>Bullet_473x33mmGDPistol_HP</Ammo_473x33mmCaseless_HP>
+			<Ammo_473x33mmCaseless_Incendiary>Bullet_473x33mmGDPistol_Incendiary</Ammo_473x33mmCaseless_Incendiary>
+			<Ammo_473x33mmCaseless_HE>Bullet_473x33mmGDPistol_HE</Ammo_473x33mmCaseless_HE>
+			<Ammo_473x33mmCaseless_Sabot>Bullet_473x33mmGDPistol_Sabot</Ammo_473x33mmCaseless_Sabot>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base473x33mmCaselessBullet">
+		<defName>Bullet_473x33mmGDPistol_FMJ</defName>
+		<label>4.73mm Caseless bullet (FMJ)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationSharp>5</armorPenetrationSharp>
+			<armorPenetrationBlunt>14.06</armorPenetrationBlunt>
+			<speed>129</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base473x33mmCaselessBullet">
+		<defName>Bullet_473x33mmGDPistol_AP</defName>
+		<label>4.73mm Caseless bullet (AP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>6</damageAmountBase>
+			<armorPenetrationSharp>12</armorPenetrationSharp>
+			<armorPenetrationBlunt>14.06</armorPenetrationBlunt>
+			<speed>129</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base473x33mmCaselessBullet">
+		<defName>Bullet_473x33mmGDPistol_HP</defName>
+		<label>4.73mm Caseless bullet (HP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>3</armorPenetrationSharp>
+			<armorPenetrationBlunt>14.06</armorPenetrationBlunt>
+			<speed>129</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base473x33mmCaselessBullet">
+		<defName>Bullet_473x33mmGDPistol_Incendiary</defName>
+		<label>4.73mm Caseless bullet (AP-I)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>6</damageAmountBase>
+			<armorPenetrationSharp>10</armorPenetrationSharp>
+			<armorPenetrationBlunt>14.06</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>4</amount>
+				</li>
+			</secondaryDamage>
+			<speed>129</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base473x33mmCaselessBullet">
+		<defName>Bullet_473x33mmGDPistol_HE</defName>
+		<label>4.73mm Caseless bullet (HE)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationSharp>5</armorPenetrationSharp>
+			<armorPenetrationBlunt>14.06</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>6</amount>
+				</li>
+			</secondaryDamage>
+			<speed>129</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base473x33mmCaselessBullet">
+		<defName>Bullet_473x33mmGDPistol_Sabot</defName>
+		<label>4.73mm Caseless bullet (Sabot)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>5</damageAmountBase>
+			<armorPenetrationSharp>18</armorPenetrationSharp>
+			<armorPenetrationBlunt>18.06</armorPenetrationBlunt>
+			<speed>175</speed>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Hybrid - AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_473x33mmCaseless_GDHybrid</defName>
+		<label>4.73x33mm Caseless</label>
+		<ammoTypes>
+			<Ammo_473x33mmCaseless_FMJ>Bullet_473x33mmGDHybrid_FMJ</Ammo_473x33mmCaseless_FMJ>
+			<Ammo_473x33mmCaseless_AP>Bullet_473x33mmGDHybrid_AP</Ammo_473x33mmCaseless_AP>
+			<Ammo_473x33mmCaseless_HP>Bullet_473x33mmGDHybrid_HP</Ammo_473x33mmCaseless_HP>
+			<Ammo_473x33mmCaseless_Incendiary>Bullet_473x33mmGDHybrid_Incendiary</Ammo_473x33mmCaseless_Incendiary>
+			<Ammo_473x33mmCaseless_HE>Bullet_473x33mmGDHybrid_HE</Ammo_473x33mmCaseless_HE>
+			<Ammo_473x33mmCaseless_Sabot>Bullet_473x33mmGDHybrid_Sabot</Ammo_473x33mmCaseless_Sabot>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base473x33mmCaselessBullet">
+		<defName>Bullet_473x33mmGDHybrid_FMJ</defName>
+		<label>4.73mm Caseless bullet (FMJ)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>15</damageAmountBase>
+			<armorPenetrationSharp>9</armorPenetrationSharp>
+			<armorPenetrationBlunt>47.96</armorPenetrationBlunt>
+			<speed>129</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base473x33mmCaselessBullet">
+		<defName>Bullet_473x33mmGDHybrid_AP</defName>
+		<label>4.73mm Caseless bullet (AP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>9</damageAmountBase>
+			<armorPenetrationSharp>16</armorPenetrationSharp>
+			<armorPenetrationBlunt>47.96</armorPenetrationBlunt>
+			<speed>129</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base473x33mmCaselessBullet">
+		<defName>Bullet_473x33mmGDHybrid_HP</defName>
+		<label>4.73mm Caseless bullet (HP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>19</damageAmountBase>
+			<armorPenetrationSharp>5</armorPenetrationSharp>
+			<armorPenetrationBlunt>47.96</armorPenetrationBlunt>
+			<speed>129</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base473x33mmCaselessBullet">
+		<defName>Bullet_473x33mmGDHybrid_Incendiary</defName>
+		<label>4.73mm Caseless bullet (AP-I)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>9</damageAmountBase>
+			<armorPenetrationSharp>18</armorPenetrationSharp>
+			<armorPenetrationBlunt>47.96</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>6</amount>
+				</li>
+			</secondaryDamage>
+			<speed>129</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base473x33mmCaselessBullet">
+		<defName>Bullet_473x33mmGDHybrid_HE</defName>
+		<label>4.73mm Caseless bullet (HE)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>15</damageAmountBase>
+			<armorPenetrationSharp>9</armorPenetrationSharp>
+			<armorPenetrationBlunt>47.96</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>9</amount>
+				</li>
+			</secondaryDamage>
+			<speed>129</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base473x33mmCaselessBullet">
+		<defName>Bullet_473x33mmGDHybrid_Sabot</defName>
+		<label>4.73mm Caseless bullet (Sabot)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>7</damageAmountBase>
+			<armorPenetrationSharp>31.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>52.68</armorPenetrationBlunt>
+			<speed>175</speed>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Core/Defs/Rimsenal Core/Ammo_GDGrenades.xml b/ModPatches/Rimsenal Core/Defs/Rimsenal Core/Ammo_GDGrenades.xml
new file mode 100644
index 0000000000..48680ab2f4
--- /dev/null
+++ b/ModPatches/Rimsenal Core/Defs/Rimsenal Core/Ammo_GDGrenades.xml	
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="25x40mmGrenadeBase">
+		<defName>Ammo_25x40mmGrenade_Buck</defName>
+		<label>25x40mm grenade (Buck)</label>
+		<graphicData>
+			<texPath>ThirdParty/Rimsenal/GrenadeLauncher/BS</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.96</MarketValue>
+		</statBases>
+		<ammoClass>BuckShot</ammoClass>
+		<cookOffProjectile>Bullet_25mmGauge_Buck</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="25x40mmGrenadeBase">
+		<defName>Ammo_25x40mmGrenade_INC</defName>
+		<label>25x40mm grenade (Incendiary)</label>
+		<graphicData>
+			<texPath>ThirdParty/Rimsenal/GrenadeLauncher/INC</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.96</MarketValue>
+		</statBases>
+		<ammoClass>ThermobaricFuel</ammoClass>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>1</damageAmountBase>
+				<explosiveDamageType>PrometheumFlame</explosiveDamageType>
+				<explosiveRadius>0.5</explosiveRadius>
+				<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
+				<preExplosionSpawnChance>1</preExplosionSpawnChance>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base12GaugeBullet">
+		<defName>Bullet_25mmGauge_Buck</defName>
+		<label>buckshot pellet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shotgun_Pellet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>9</damageAmountBase>
+			<pelletCount>16</pelletCount>
+			<armorPenetrationSharp>4</armorPenetrationSharp>
+			<armorPenetrationBlunt>5.7</armorPenetrationBlunt>
+			<spreadMult>40</spreadMult>
+			<dropsCasings>false</dropsCasings>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base25x40mmGrenadeBullet">
+		<defName>Bullet_25x40mmGrenade_INC</defName>
+		<label>25x40mm grenade (Incendiary)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>1</explosionRadius>
+			<damageDef>PrometheumFlame</damageDef>
+			<damageAmountBase>4</damageAmountBase>
+			<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
+			<preExplosionSpawnChance>1</preExplosionSpawnChance>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_25x40mmGrenade_Buck</defName>
+		<label>make 25x40mm buckshot rounds x100</label>
+		<description>Craft 100 25x40mm buckshot rounds.</description>
+		<jobString>Making 25x40mm buckshot rounds.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>32</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_25x40mmGrenade_Buck>100</Ammo_25x40mmGrenade_Buck>
+		</products>
+		<workAmount>3200</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_25x40mmGrenade_INC</defName>
+		<label>make 25x40mm Incendiary grenades x100</label>
+		<description>Craft 100 25x40mm Incendiary grenades.</description>
+		<jobString>Making 25x40mm Incendiary grenades.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>32</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Prometheum</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_25x40mmGrenade_INC>100</Ammo_25x40mmGrenade_INC>
+		</products>
+		<workAmount>600</workAmount>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Core/Defs/Rimsenal Core/Ammo_JI.xml b/ModPatches/Rimsenal Core/Defs/Rimsenal Core/Ammo_JI.xml
new file mode 100644
index 0000000000..fa08332d4b
--- /dev/null
+++ b/ModPatches/Rimsenal Core/Defs/Rimsenal Core/Ammo_JI.xml	
@@ -0,0 +1,468 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ==================== JI Molten Fragmentation (Old) ========================== -->
+
+	<ThingDef ParentName="BaseFragment">
+		<defName>Fragment_Molten</defName>
+		<label>molten splatter</label>
+		<graphicData>
+			<texPath>Things/Projectile/Fragments/Fragment_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Burn</damageDef>
+			<damageAmountBase>5</damageAmountBase>
+			<speed>30</speed>
+			<armorPenetrationSharp>1</armorPenetrationSharp>
+			<armorPenetrationBlunt>3</armorPenetrationBlunt>
+			<gravityFactor>25</gravityFactor>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== JI Rocket Shells (Old/Security) ========================== -->
+
+	<ThingCategoryDef>
+		<defName>AmmoJIRockets</defName>
+		<label>JI Siege Rockets</label>
+		<parent>AmmoRockets</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRocket</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_JIRocket</defName>
+		<label>Siege rocket</label>
+		<ammoTypes>
+			<Ammo_JIRocket>Bullet_JISiegeRocket</Ammo_JIRocket>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="88mmRPzBRocketBase" ParentName="MediumAmmoBase" Abstract="True">
+		<description>Bulky siege rockets, fired by the heaviest of Jotun Interstellar weaponry. An outer casing of high explosives around a shaped-charge core makes it capable of engaging both hard and soft targets.</description>
+		<statBases>
+			<MaxHitPoints>150</MaxHitPoints>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoJIRockets</li>
+		</thingCategories>
+		<stackLimit>25</stackLimit>
+		<cookOffFlashScale>40</cookOffFlashScale>
+		<cookOffSound>MortarBomb_Explode</cookOffSound>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="88mmRPzBRocketBase">
+		<defName>Ammo_JIRocket</defName>
+		<label>Siege rocket</label>
+		<graphicData>
+			<texPath>ThirdParty/Rimsenal/JI/JI_Shell</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>40</MarketValue>
+			<Mass>4</Mass>
+			<Bulk>9</Bulk>
+		</statBases>
+		<ammoClass>RocketHE</ammoClass>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>50</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>4</explosiveRadius>
+				<explosionSound>Explosion_GiantBomb</explosionSound>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>3</Fragment_Large>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="BaseRPG7Grenade">
+		<defName>Bullet_JISiegeRocket</defName>
+		<label>Siege rocket</label>
+		<graphicData>
+			<texPath>Things/Projectile/Rocket</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>90</speed>
+			<soundAmbient>RocketPropelledLoop_Small</soundAmbient>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>210</damageAmountBase>
+			<armorPenetrationBlunt>25</armorPenetrationBlunt>
+			<armorPenetrationSharp>500</armorPenetrationSharp>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>98</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>2.5</explosiveRadius>
+				<explosionSound>Explosion_GiantBomb</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Recipe: JI Rocket Shells ========================== -->
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_JIRocket</defName>
+		<label>make siege rockets x5</label>
+		<description>Craft 5 JI siege rockets rockets.</description>
+		<jobString>Making JI siege rockets rockets.</jobString>
+		<workAmount>7500</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<researchPrerequisite>SiegeTech</researchPrerequisite>
+		<recipeUsers Inherit="False">
+			<li>JITable</li>
+		</recipeUsers>
+		<products>
+			<Ammo_JIRocket>5</Ammo_JIRocket>
+		</products>
+	</RecipeDef>
+
+	<!-- ==================== JI Siege Shells ========================== -->
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_JISiege</defName>
+		<label>Siege Cannon</label>
+		<ammoTypes>
+			<Ammo_JI_Alloy>Bullet_JISiegeRound</Ammo_JI_Alloy>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="BaseRPG7Grenade">
+		<defName>Bullet_JISiegeRound</defName>
+		<label>grendel shell</label>
+		<graphicData>
+			<texPath>Things/Projectile/SCM</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>90</speed>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>80</damageAmountBase>
+			<armorPenetrationBlunt>51200</armorPenetrationBlunt>
+			<armorPenetrationSharp>100</armorPenetrationSharp>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>20</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.5</explosiveRadius>
+				<explosionSound>Explosion_GiantBomb</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragSpeedFactor>0.5</fragSpeedFactor>
+				<fragments>
+					<Fragment_Large>325</Fragment_Large>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="Base81mmMortarShell">
+		<defName>Bullet_JICrowFeeder</defName>
+		<label>crow feeder</label>
+		<graphicData>
+			<texPath>Things/Projectile/SCM</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+			<explosionRadius>0.5</explosionRadius>
+			<flyOverhead>true</flyOverhead>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<ai_IsIncendiary>false</ai_IsIncendiary>
+			<speed>49</speed>
+			<gravityFactor>10</gravityFactor>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragSpeedFactor>0.5</fragSpeedFactor>
+				<fragments>
+					<Fragment_Large>325</Fragment_Large>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== JI Alloy ========================== -->
+
+	<ThingCategoryDef>
+		<defName>AmmoAlloy</defName>
+		<label>Semi-molten Alloy Round</label>
+		<parent>AmmoRifles</parent>
+		<iconPath>ThirdParty/Rimsenal/JI/JI_Molten/MoltenCartridge_c</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_JISlag</defName>
+		<label>Semi-molten round</label>
+		<ammoTypes>
+			<Ammo_JI_Alloy>Bullet_JI_Slag</Ammo_JI_Alloy>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="BaseJIAlloy" ParentName="SmallAmmoBase" Abstract="True">
+		<description>A ultra dense, strong alloy with extremely high thermal conductivity, specially manufactured for use by Jotun Interstellar weaponry.</description>
+		<statBases>
+			<Mass>0.075</Mass>
+			<Bulk>0.01</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoAlloy</li>
+		</thingCategories>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseJIAlloy">
+		<defName>Ammo_JI_Alloy</defName>
+		<label>Ultra-density alloy</label>
+		<graphicData>
+			<texPath>ThirdParty/Rimsenal/JI/JI_Molten</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>3</MarketValue>
+		</statBases>
+		<ammoClass>Slag</ammoClass>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base556x45mmNATOBullet">
+		<defName>Bullet_JI_Slag</defName>
+		<label>Semi-molten alloy</label>
+		<graphicData>
+			<texPath>Things/Projectile/Slug</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>122</speed>
+			<dropsCasings>false</dropsCasings>
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationBlunt>60</armorPenetrationBlunt>
+			<armorPenetrationSharp>12</armorPenetrationSharp>
+			<pelletCount>10</pelletCount>
+			<spreadMult>25</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipe: JI Alloy ========================== -->
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_JI_Alloy</defName>
+		<label>make alloy x250</label>
+		<description>Craft 250 ultra dense alloy.</description>
+		<jobString>Making ultra dense alloy.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>18</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>18</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Plasteel</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<researchPrerequisite>MoltenTech</researchPrerequisite>
+		<recipeUsers Inherit="False">
+			<li>JITable</li>
+		</recipeUsers>
+		<products>
+			<Ammo_JI_Alloy>250</Ammo_JI_Alloy>
+		</products>
+		<workAmount>19000</workAmount>
+	</RecipeDef>
+
+	<!-- ==================== JI Molten Slug ========================== -->
+
+	<ThingCategoryDef>
+		<defName>AmmoMoltenSlug</defName>
+		<label>Semi-molten alloy</label>
+		<parent>AmmoRifles</parent>
+		<iconPath>ThirdParty/Rimsenal/JI/JI_Molten/MoltenCartridge_c</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_JIStandard</defName>
+		<label>molten slug</label>
+		<ammoTypes>
+			<Ammo_JI_Alloy>Bullet_JI_Molten</Ammo_JI_Alloy>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base556x45mmNATOBullet">
+		<defName>Bullet_JI_Molten</defName>
+		<label>Semi-molten alloy</label>
+		<graphicData>
+			<texPath>Things/Projectile/Slug</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>137</speed>
+			<dropsCasings>false</dropsCasings>
+			<damageAmountBase>28</damageAmountBase>
+			<armorPenetrationBlunt>490</armorPenetrationBlunt>
+			<armorPenetrationSharp>18</armorPenetrationSharp>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_JI_AMR</defName>
+		<label>High-density alloy slug</label>
+		<ammoTypes>
+			<Ammo_JI_Alloy>Bullet_JI_AMR</Ammo_JI_Alloy>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base556x45mmNATOBullet">
+		<defName>Bullet_JI_AMR</defName>
+		<label>Semi-molten alloy</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shell</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>178</speed>
+			<dropsCasings>false</dropsCasings>
+			<damageAmountBase>128</damageAmountBase>
+			<armorPenetrationBlunt>20000</armorPenetrationBlunt>
+			<armorPenetrationSharp>200</armorPenetrationSharp>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>6</Fragment_Large>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== JI Suppressor Shot ========================== -->
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_JISuppressor</defName>
+		<label>molten slug</label>
+		<ammoTypes>
+			<Ammo_JI_Alloy>Bullet_JI_Suppressor</Ammo_JI_Alloy>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base556x45mmNATOBullet">
+		<defName>Bullet_JI_Suppressor</defName>
+		<label>Semi-molten alloy</label>
+		<graphicData>
+			<texPath>Things/Projectile/Slug</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>137</speed>
+			<dropsCasings>false</dropsCasings>
+			<damageAmountBase>22</damageAmountBase>
+			<armorPenetrationBlunt>245</armorPenetrationBlunt>
+			<armorPenetrationSharp>15</armorPenetrationSharp>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Core/Defs/Rimsenal Core/Ammo_TE.xml b/ModPatches/Rimsenal Core/Defs/Rimsenal Core/Ammo_TE.xml
new file mode 100644
index 0000000000..2c4d0adaec
--- /dev/null
+++ b/ModPatches/Rimsenal Core/Defs/Rimsenal Core/Ammo_TE.xml	
@@ -0,0 +1,276 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- TE Universal Power Cell -->
+
+	<ThingCategoryDef>
+		<defName>AmmoTEUniversalPowerCell</defName>
+		<label>TE Universal Power Cell</label>
+		<parent>AmmoRifles</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="TEPowerCoreBase" ParentName="SmallAmmoBase" Abstract="True">
+		<description>A power cell used by the Tisiphone Enterprise kinetic force family of weaponry weaponry.</description>
+		<statBases>
+			<Mass>0.005</Mass>
+			<Bulk>0.01</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoTEPowerCore</li>
+		</thingCategories>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="TEPowerCoreBase">
+		<defName>Ammo_TEPowerCell</defName>
+		<label>TE Universal Power Cell (KE)</label>
+		<graphicData>
+			<texPath>ThirdParty/Rimsenal/TE</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>1.5</MarketValue>
+		</statBases>
+		<ammoClass>KineticEnergy</ammoClass>
+	</ThingDef>
+
+	<!-- ==================== Recipe: TE Universal Power Cell ========================== -->
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_TEPowerCell</defName>
+		<label>make TE Universal Power Cell x500</label>
+		<description>Craft 500 TE Universal Power Cell.</description>
+		<jobString>Making TE Universal Power Cell.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>18</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>18</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Plasteel</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<researchPrerequisite>KineticTech</researchPrerequisite>
+		<recipeUsers Inherit="False">
+			<li>TETable</li>
+		</recipeUsers>
+		<products>
+			<Ammo_TEPowerCell>500</Ammo_TEPowerCell>
+		</products>
+		<workAmount>19000</workAmount>
+	</RecipeDef>
+
+	<!-- ==================== TE Power Core ========================== -->
+
+	<ThingCategoryDef>
+		<defName>AmmoTEPowerCore</defName>
+		<label>TE Power Core</label>
+		<parent>AmmoRifles</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_TEPowerCore</defName>
+		<label>TE Power Core</label>
+		<ammoTypes>
+			<Ammo_TEPowerCell>Bullet_TEPowerCore_KE</Ammo_TEPowerCell>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base556x45mmNATOBullet">
+		<defName>Bullet_TEPowerCore_KE</defName>
+		<label>TE energy blast (KE)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Harrower</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>		
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>400</speed>
+			<damageDef>KineticImpact</damageDef>
+			<damageAmountBase>8</damageAmountBase>
+			<armorPenetrationSharp>70</armorPenetrationSharp>
+			<armorPenetrationBlunt>160</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+			<damageAmountBase>10</damageAmountBase>
+			<explosiveDamageType>KineticImpact</explosiveDamageType>
+			<explosiveRadius>0.5</explosiveRadius>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletPurple">
+		<defName>Bullet_TEPowerCore_KE</defName>
+		<label>TE energy blast (KE)</label>
+		<graphicData>
+			<texPath>Things/Projectile/ImpactL</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>KineticImpact</damageDef>
+			<dropsCasings>false</dropsCasings>
+			<damageAmountBase>16</damageAmountBase>
+			<armorPenetrationBlunt>2000</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>1</damageAmountBase>
+				<explosiveDamageType>KineticImpact</explosiveDamageType>
+				<explosiveRadius>0.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>false</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== TE Power Charge ========================== -->
+
+	<ThingCategoryDef>
+		<defName>AmmoTEPowerCharge</defName>
+		<label>TE Power Charge</label>
+		<parent>AmmoRifles</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_TEPowerCharge</defName>
+		<label>TE Power Charge</label>
+		<ammoTypes>
+			<Ammo_TEPowerCell>Bullet_TEPowerCharge_KE</Ammo_TEPowerCell>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base556x45mmNATOBullet">
+		<defName>Bullet_TEPowerCharge_KE</defName>
+		<label>TE energy blast (KE)</label>
+		<graphicData>
+			<texPath>Things/Projectile/ImpactM</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>KineticImpact</damageDef>
+			<speed>61</speed>
+			<dropsCasings>false</dropsCasings>
+			<damageAmountBase>30</damageAmountBase>
+			<armorPenetrationBlunt>24</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== TE Energy Canister ========================== -->
+
+	<ThingCategoryDef>
+		<defName>AmmoTEEnergyCanister</defName>
+		<label>TE Energy Canister</label>
+		<parent>AmmoRifles</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_TEEnergyCanister</defName>
+		<label>TE Energy Canister</label>
+		<ammoTypes>
+			<Ammo_TEPowerCell>Bullet_TEEnergyCanister_KE</Ammo_TEPowerCell>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base30x29mmGrenadeBullet">
+		<defName>Bullet_TEEnergyCanister_KE</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>TE energy blast (KE)</label>
+		<graphicData>
+			<texPath>Things/Projectile/ImpactB</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>KineticImpact</damageDef>
+			<speed>54</speed>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<explosiveDamageType>KineticImpact</explosiveDamageType>
+				<explosiveRadius>1.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>false</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== TE Concentrated Power Charge ========================== -->
+
+	<ThingCategoryDef>
+		<defName>AmmoTEConcentratedPowerCharge</defName>
+		<label>TE Concentrated Power Charge</label>
+		<parent>AmmoRifles</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_TEConcentratedPowerCharge</defName>
+		<label>TE Concentrated Power Charge</label>
+		<ammoTypes>
+			<Ammo_TEPowerCell>Bullet_TEConcentratedPowerCharge_KE</Ammo_TEPowerCell>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base556x45mmNATOBullet">
+		<defName>Bullet_TEConcentratedPowerCharge_KE</defName>
+		<label>TE energy blast (KE)</label>
+		<graphicData>
+			<texPath>Things/Projectile/ImpactL</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>KineticImpact</damageDef>
+			<speed>83</speed>
+			<dropsCasings>false</dropsCasings>
+			<damageAmountBase>40</damageAmountBase>
+			<armorPenetrationBlunt>54</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Core/Defs/Rimsenal Core/Ammo_YP.xml b/ModPatches/Rimsenal Core/Defs/Rimsenal Core/Ammo_YP.xml
new file mode 100644
index 0000000000..156a2a72ad
--- /dev/null
+++ b/ModPatches/Rimsenal Core/Defs/Rimsenal Core/Ammo_YP.xml	
@@ -0,0 +1,352 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ==================== YP Pistol ========================== -->
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_PistolYP</defName>
+		<label>Small YP</label>
+		<ammoTypes>
+			<Ammo_RifleYP>Bullet_PistolYP</Ammo_RifleYP>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base45ACPBullet">
+		<defName>Bullet_PistolYP</defName>
+		<label>Carbon crystal</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shard</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Shredder</damageDef>
+			<speed>83</speed>
+			<dropsCasings>false</dropsCasings>
+			<pelletCount>2</pelletCount>
+			<spreadMult>2</spreadMult>
+			<damageAmountBase>4</damageAmountBase>
+			<armorPenetrationBlunt>6.4</armorPenetrationBlunt>
+			<armorPenetrationSharp>24</armorPenetrationSharp>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== YP Rifle ========================== -->
+
+	<ThingCategoryDef>
+		<defName>AmmoRifleYP</defName>
+		<label>Light YP</label>
+		<parent>AmmoRifles</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_RifleYP</defName>
+		<label>Light YP</label>
+		<ammoTypes>
+			<Ammo_RifleYP>Bullet_RifleYP</Ammo_RifleYP>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_SwarmerYP</defName>
+		<label>Light YP</label>
+		<ammoTypes>
+			<Ammo_RifleYP>Bullet_SwarmerYP</Ammo_RifleYP>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="RifleYPBase" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Small, high-velocity crystal bullet used in Yunhwa Precision arms.</description>
+		<statBases>
+			<Mass>0.01</Mass>
+			<Bulk>0.02</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoRifleYP</li>
+		</thingCategories>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="RifleYPBase">
+		<defName>Ammo_RifleYP</defName>
+		<label>Light YP cartridge</label>
+		<graphicData>
+			<texPath>ThirdParty/Rimsenal/YP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>1</MarketValue>
+		</statBases>
+		<ammoClass>CarbonCrystal</ammoClass>
+		<cookOffProjectile>Bullet_RifleYP</cookOffProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base556x45mmNATOBullet">
+		<defName>Bullet_RifleYP</defName>
+		<label>Carbon crystal</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shard</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Shredder</damageDef>
+			<speed>158</speed>
+			<dropsCasings>false</dropsCasings>
+			<damageAmountBase>5</damageAmountBase>
+			<armorPenetrationBlunt>10</armorPenetrationBlunt>
+			<armorPenetrationSharp>30</armorPenetrationSharp>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base556x45mmNATOBullet">
+		<defName>Bullet_SwarmerYP</defName>
+		<label>sagpung swarm</label>
+		<graphicData>
+			<texPath>Things/Projectile/Swarm</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Shredder</damageDef>
+			<speed>68</speed>
+			<dropsCasings>false</dropsCasings>
+			<damageAmountBase>6</damageAmountBase>
+			<armorPenetrationBlunt>1</armorPenetrationBlunt>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+			<pelletCount>12</pelletCount>
+			<spreadMult>1</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipe: YP Rifle ========================== -->
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_RifleYP</defName>
+		<label>make Light YP cartridge x750</label>
+		<description>Craft 750 Light YP cartridges.</description>
+		<jobString>Making Light YP cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>18</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>18</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Plasteel</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<researchPrerequisite>ShardTech</researchPrerequisite>
+		<recipeUsers Inherit="False">
+			<li>YPTable</li>
+		</recipeUsers>
+		<products>
+			<Ammo_RifleYP>750</Ammo_RifleYP>
+		</products>
+		<workAmount>19000</workAmount>
+	</RecipeDef>
+
+	<!-- ==================== YP Spike ========================== -->
+
+	<ThingCategoryDef>
+		<defName>AmmoSpikeYP</defName>
+		<label>Heavy YP</label>
+		<parent>AmmoRifles</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_SpikeYP</defName>
+		<label>Heavy YP</label>
+		<ammoTypes>
+			<Ammo_SpikeYP>Bullet_SpikeYP</Ammo_SpikeYP>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_VectorYP</defName>
+		<label>Heavy YP</label>
+		<ammoTypes>
+			<Ammo_SpikeYP>Bullet_VectorYP</Ammo_SpikeYP>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="SpikeYPBase" ParentName="SmallAmmoBase" Abstract="True">
+		<description>High-velocity spike made of synthesized crystals, fired by Yunhwa Precision equipment. While more effective against armor, the spikes' tendency to remain intact after striking a target decreases thier stopping power.</description>
+		<statBases>
+			<Mass>0.015</Mass>
+			<Bulk>0.02</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoSpikeYP</li>
+		</thingCategories>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpikeYPBase">
+		<defName>Ammo_SpikeYP</defName>
+		<label>Heavy YP cartridge</label>
+		<graphicData>
+			<texPath>ThirdParty/Rimsenal/YP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>1.5</MarketValue>
+		</statBases>
+		<ammoClass>CarbonCrystal</ammoClass>
+		<cookOffProjectile>Bullet_SpikeYP</cookOffProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base556x45mmNATOBullet">
+		<defName>Bullet_SpikeYP</defName>
+		<label>Heavy carbon crystal</label>
+		<graphicData>
+			<texPath>Things/Projectile/Spike</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Shredder</damageDef>
+			<speed>204</speed>
+			<dropsCasings>false</dropsCasings>
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationBlunt>36</armorPenetrationBlunt>
+			<armorPenetrationSharp>36</armorPenetrationSharp>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base556x45mmNATOBullet">
+		<defName>Bullet_VectorYP</defName>
+		<label>Vector shot</label>
+		<graphicData>
+			<texPath>Things/Projectile/Spike</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Shredder</damageDef>
+			<speed>165</speed>
+			<soundHitThickRoof>RS_ShotShard</soundHitThickRoof>
+			<flyOverhead>true</flyOverhead>
+			<gravityFactor>450</gravityFactor>
+			<dropsCasings>false</dropsCasings>
+			<damageAmountBase>5</damageAmountBase>
+			<armorPenetrationBlunt>30</armorPenetrationBlunt>
+			<armorPenetrationSharp>10</armorPenetrationSharp>
+			<pelletCount>2</pelletCount>
+			<spreadMult>40</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipe: YP Spike ========================== -->
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_SpikeYP</defName>
+		<label>make Heavy YP cartridge x500</label>
+		<description>Craft 500 Heavy YP cartridges.</description>
+		<jobString>Making Heavy YP cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>18</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>18</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Plasteel</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<researchPrerequisite>ShardTech</researchPrerequisite>
+		<recipeUsers Inherit="False">
+			<li>YPTable</li>
+		</recipeUsers>
+		<products>
+			<Ammo_SpikeYP>500</Ammo_SpikeYP>
+		</products>
+		<workAmount>19000</workAmount>
+	</RecipeDef>
+
+	<!-- ================== YP Microwave - Projectiles ================== -->
+
+	<ThingDef ParentName="Base556x45mmNATOBullet">
+		<defName>Bullet_GeugGwang_CE</defName>
+		<label>microwave pulse</label>
+		<graphicData>
+			<texPath>Things/Projectile/Microwave</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Microwave</damageDef>
+			<speed>999</speed>
+			<dropsCasings>false</dropsCasings>
+			<explosionRadius>1.5</explosionRadius>
+			<damageAmountBase>1</damageAmountBase>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<ai_IsIncendiary>true</ai_IsIncendiary>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Core/Defs/Rimsenal Core/Rimsenal_AmmoCategories.xml b/ModPatches/Rimsenal Core/Defs/Rimsenal Core/Rimsenal_AmmoCategories.xml
new file mode 100644
index 0000000000..0109e05e66
--- /dev/null
+++ b/ModPatches/Rimsenal Core/Defs/Rimsenal Core/Rimsenal_AmmoCategories.xml	
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>MoltenSlug</defName>
+		<label>molten slug</label>
+		<labelShort>MS</labelShort>
+		<description>An alloy slug heated nearly to the melting point.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>HDSlug</defName>
+		<label>high-density alloy slug</label>
+		<labelShort>HDS</labelShort>
+		<description>A dense alloy slug heated nearly to the melting point. intended to defeat heavy armor.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>Slag</defName>
+		<label>slag round</label>
+		<labelShort>SG</labelShort>
+		<description>Loose, white-hot alloy pelts.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>KineticEnergy</defName>
+		<label>kinetic energy</label>
+		<labelShort>KE</labelShort>
+		<description>Special ionized electricity from the power core gets turned into a hard energy amalgam in the gun breech, the amalgam doesn't burn like normal energy projectiles, instead it deals blunt damage, hence the name kinetic energy.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>CarbonCrystal</defName>
+		<label>carbon crystal</label>
+		<labelShort>CC</labelShort>
+		<description>The carbon crystal core shatters into sharp splinter that maximize flesh damage but produces less armor penetration.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>FeralNail</defName>
+		<label>nail</label>
+		<labelShort>Nail</labelShort>
+		<description>A pointy, slightly rusted metal nail. Try not to step on it.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>MoltenShell</defName>
+		<label>molten shell</label>
+		<labelShort>MS</labelShort>
+		<description>An alloy shell heated nearly to the melting point.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Core/Defs/Rimsenal Core/Rimsenal_ExplosivesRecipeBase.xml b/ModPatches/Rimsenal Core/Defs/Rimsenal Core/Rimsenal_ExplosivesRecipeBase.xml
new file mode 100644
index 0000000000..44dd80afbd
--- /dev/null
+++ b/ModPatches/Rimsenal Core/Defs/Rimsenal Core/Rimsenal_ExplosivesRecipeBase.xml	
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<RecipeDef Name="RSExplosive_RecipeBase" Abstract="true">
+		<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+		<effectWorking>Cook</effectWorking>
+		<soundWorking>Recipe_Smith</soundWorking>
+		<workSkill>Crafting</workSkill>
+		<unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Plasteel</li>
+				<li>ComponentIndustrial</li>
+				<li>FSX</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Core/Defs/Rimsenal Core/Rimsenal_GrenadeRecipes.xml b/ModPatches/Rimsenal Core/Defs/Rimsenal Core/Rimsenal_GrenadeRecipes.xml
new file mode 100644
index 0000000000..39bd3363c8
--- /dev/null
+++ b/ModPatches/Rimsenal Core/Defs/Rimsenal Core/Rimsenal_GrenadeRecipes.xml	
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- YP BaegYa Microwave Grenades -->
+	<RecipeDef ParentName="RSExplosive_RecipeBase">
+		<defName>Craft_10_BaegYa</defName>
+		<label>Craft 10 microwave grenades</label>
+		<description>Craft 10 BaegYa microwave grenades.</description>
+		<jobString>Crafting microwave grenades</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<researchPrerequisite>ShardTech</researchPrerequisite>
+		<skillRequirements>
+			<Crafting>9</Crafting>
+		</skillRequirements>
+		<products>
+			<YP_BaegYa>10</YP_BaegYa>
+		</products>
+		<workAmount>20000</workAmount>
+		<recipeUsers>
+			<li>YPTable</li>
+		</recipeUsers>
+	</RecipeDef>
+
+	<!-- JI Dunder Satchel Charge -->
+	<RecipeDef ParentName="RSExplosive_RecipeBase">
+		<defName>Craft_10_Dunder</defName>
+		<label>Craft 10 satchel charges</label>
+		<description>Craft 10 Dunder satchel charges.</description>
+		<jobString>Crafting satchel charges</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>30</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+		</ingredients>
+		<researchPrerequisite>MoltenTech</researchPrerequisite>
+		<skillRequirements>
+			<Crafting>9</Crafting>
+		</skillRequirements>
+		<products>
+			<JI_Dunder>10</JI_Dunder>
+		</products>
+		<workAmount>20000</workAmount>
+		<recipeUsers>
+			<li>JITable</li>
+		</recipeUsers>
+	</RecipeDef>
+
+	<!-- GD Bobcat Micro Grenades -->
+	<RecipeDef ParentName="RSExplosive_RecipeBase">
+		<defName>Craft_10_Bobcat</defName>
+		<label>Craft 10 micro grenades</label>
+		<description>Craft 10 Bobcat micro grenades.</description>
+		<jobString>Crafting micro grenades</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<researchPrerequisite>DefenceTech</researchPrerequisite>
+		<products>
+			<GD_Bobcat>10</GD_Bobcat>
+		</products>
+		<workAmount>20000</workAmount>
+		<recipeUsers>
+			<li>GDTable</li>
+		</recipeUsers>
+	</RecipeDef>
+
+	<!-- TE Grief Impact Grenades -->
+	<RecipeDef ParentName="RSExplosive_RecipeBase">
+		<defName>Craft_10_Grief</defName>
+		<label>Craft 10 impact grenades</label>
+		<description>Craft 10 Grief impact grenades.</description>
+		<jobString>Crafting impact grenades</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>25</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<researchPrerequisite>KineticTech</researchPrerequisite>
+		<skillRequirements>
+			<Crafting>9</Crafting>
+		</skillRequirements>
+		<products>
+			<TE_Grief>10</TE_Grief>
+		</products>
+		<workAmount>20000</workAmount>
+		<recipeUsers>
+			<li>TETable</li>
+		</recipeUsers>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Core/Patches/Rimsenal Core/Ammo_GDGrenades.xml b/ModPatches/Rimsenal Core/Patches/Rimsenal Core/Ammo_GDGrenades.xml
new file mode 100644
index 0000000000..fd7aed97d3
--- /dev/null
+++ b/ModPatches/Rimsenal Core/Patches/Rimsenal Core/Ammo_GDGrenades.xml	
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_25x40mmGrenade"]/ammoTypes</xpath>
+		<value>
+			<Ammo_25x40mmGrenade_Buck>Bullet_25mmGauge_Buck</Ammo_25x40mmGrenade_Buck>
+			<Ammo_25x40mmGrenade_INC>Bullet_25x40mmGrenade_INC</Ammo_25x40mmGrenade_INC>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Core/Patches/Rimsenal Core/Ammo_TE.xml b/ModPatches/Rimsenal Core/Patches/Rimsenal Core/Ammo_TE.xml
new file mode 100644
index 0000000000..3191cbc9ef
--- /dev/null
+++ b/ModPatches/Rimsenal Core/Patches/Rimsenal Core/Ammo_TE.xml	
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="KineticImpact"]/defaultDamage</xpath>
+		<value>
+			<defaultDamage>25</defaultDamage>
+			<defaultArmorPenetration>50</defaultArmorPenetration>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Core/Patches/Rimsenal Core/Apparel_RS_CE.xml b/ModPatches/Rimsenal Core/Patches/Rimsenal Core/Apparel_RS_CE.xml
new file mode 100644
index 0000000000..9f2e19b633
--- /dev/null
+++ b/ModPatches/Rimsenal Core/Patches/Rimsenal Core/Apparel_RS_CE.xml	
@@ -0,0 +1,2124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==========  Carbon Jumpsuit =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Carbonsuit"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Carbonsuit"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Carbonsuit"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Carbonsuit"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.5</ArmorRating_Heat>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Carbonsuit"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Security Armor =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_SecurityArmor"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SecurityArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>25</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SecurityArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SecurityArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>24</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_SecurityArmor"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>35</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SecurityArmor"]/costList/Steel</xpath>
+		<value>
+			<Steel>130</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SecurityArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<CarryWeight>10</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_SecurityArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Apparel_SecurityArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>1.25</ArmorRating_Sharp>
+						<parts>
+							<li>Torso</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>1.25</ArmorRating_Blunt>
+						<parts>
+							<li>Torso</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.875</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.875</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.625</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.625</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Security Helmet =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_SecurityHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SecurityHelmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>3.6</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SecurityHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SecurityHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>24</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SecurityHelmet"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>25</Plasteel>
+			<DevilstrandCloth>10</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_SecurityHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Apparel_SecurityHelmet"]</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>
+
+	<!-- ========== Pioneer Armor =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_PioneerArmor"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>25</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PioneerArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>45</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PioneerArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PioneerArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>42</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PioneerArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<CarryWeight>80</CarryWeight>
+			<CarryBulk>45</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_PioneerArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Apparel_PioneerArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Pioneer Helmet =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_PioneerH"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PioneerH"]/statBases/Mass</xpath>
+		<value>
+			<Mass>4.5</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PioneerH"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PioneerH"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>40</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Apparel_PioneerH"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Apparel_PioneerH"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_PioneerH"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PioneerH"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>40</Plasteel>
+			<DevilstrandCloth>10</DevilstrandCloth>
+			<ComponentSpacer>1</ComponentSpacer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_PioneerH"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Apparel_PioneerH"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.85</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Nomad Armor =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_NomadArmor"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_NomadArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>35</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_NomadArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_NomadArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>40</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_NomadArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_NomadArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Apparel_NomadArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Nomad Helmet =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_NomadH"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>1</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_NomadH"]/statBases/Mass</xpath>
+		<value>
+			<Mass>2.8</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_NomadH"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_NomadH"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>30</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Apparel_NomadH"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Apparel_NomadH"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_NomadH"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+			<AimingAccuracy>0.15</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_NomadH"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>40</Plasteel>
+			<DevilstrandCloth>10</DevilstrandCloth>
+			<ComponentSpacer>1</ComponentSpacer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_NomadH"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Medic Armor =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_MedicArmor"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MedicArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>45</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MedicArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MedicArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>30</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MedicArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<CarryWeight>60</CarryWeight>
+			<CarryBulk>25</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_MedicArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Apparel_MedicArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Medic Helmet =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_MedicH"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.4</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MedicH"]/statBases/Mass</xpath>
+		<value>
+			<Mass>3.2</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MedicH"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MedicH"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>30</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MedicH"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>40</Plasteel>
+			<DevilstrandCloth>10</DevilstrandCloth>
+			<ComponentSpacer>1</ComponentSpacer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_MedicH"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Apparel_MedicH"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.75</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+							<li>Jaw</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.50</ArmorRating_Sharp>
+						<parts>
+							<li>Nose</li>
+							<li>Jaw</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Upgrade Kit =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/thingDef[defName="MBPSKit"]/statBases/Mass</xpath>
+		<value>
+			<Mass>25</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/thingDef[defName="MBPSKit"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>60</Plasteel>
+			<DevilstrandCloth>10</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<!-- ========== Drop Suit =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Dropsuit"]/statBases/Mass</xpath>
+		<value>
+			<Mass>60</Mass>
+			<Bulk>90</Bulk>
+			<WornBulk>18</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Dropsuit"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>180</Plasteel>
+			<DevilstrandCloth>40</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_Dropsuit"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Dropsuit"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<CarryWeight>90</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Dropsuit"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>17</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Dropsuit"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>51</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Apparel_Dropsuit"]/verbs</xpath>
+		<match Class="PatchOperationSequence">
+			<operations>
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Apparel_Dropsuit"]/statBases/JumpRange</xpath>
+					<value>
+						<JumpRange>47</JumpRange>
+					</value>
+				</li>
+			</operations>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Apparel_Dropsuit"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+							<li>Arm</li>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+							<li>Arm</li>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Dropsuit Helmet =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_DropsuitH"]/statBases/Mass</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<Mass>5</Mass>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.65</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_DropsuitH"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_DropsuitH"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>42</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Apparel_DropsuitH"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Apparel_DropsuitH"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_DropsuitH"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_DropsuitH"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>60</Plasteel>
+			<DevilstrandCloth>20</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_DropsuitH"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Nervesuit =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Strikesuit"]/statBases/Mass</xpath>
+		<value>
+			<Bulk>75</Bulk>
+			<Mass>20</Mass>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_Strikesuit"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_Strikesuit"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Strikesuit"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>120</Plasteel>
+			<DevilstrandCloth>40</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Strikesuit"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Strikesuit"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>22.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Apparel_Strikesuit"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>1.2</ArmorRating_Sharp>
+						<parts>
+							<li>Torso</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>1.2</ArmorRating_Blunt>
+						<parts>
+							<li>Torso</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+							<li>Leg</li>
+							<li>Foot</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+							<li>Leg</li>
+							<li>Foot</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Nervesuit helmet =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_StrikesuitH"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.9</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_StrikesuitH"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>9.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_StrikesuitH"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>22.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Apparel_StrikesuitH"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Apparel_StrikesuitH"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_StrikesuitH"]/equippedStatOffsets</xpath>
+		<value>
+			<Suppressability>-0.25</Suppressability>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_StrikesuitH"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>35</Plasteel>
+			<DevilstrandCloth>10</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_StrikesuitH"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Assault Armor =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_AssaultArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>100</Mass>
+			<Bulk>120</Bulk>
+			<WornBulk>18</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_AssaultArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>28</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_AssaultArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>70</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_AssaultArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<CarryWeight>115</CarryWeight>
+			<CarryBulk>15</CarryBulk>
+			<MoveSpeed>-0.55</MoveSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_AssaultArmor"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>225</Plasteel>
+			<DevilstrandCloth>60</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_AssaultArmor"]/costList/Uranium</xpath>
+		<value>
+			<Uranium>70</Uranium>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_AssaultArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Apparel_AssaultArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Apparel_AssaultArmor"]/verbs</xpath>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Apparel_AssaultArmor"]/verbs</xpath>
+					<value>
+						<verbs>
+							<li Class="CombatExtended.VerbPropertiesCE">
+								<label>launch EMP grenade</label>
+								<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
+								<hasStandardCommand>true</hasStandardCommand>
+								<onlyManualCast>True</onlyManualCast>
+								<warmupTime>1.5</warmupTime>
+								<range>40</range>
+								<minRange>5</minRange>
+								<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+								<soundCast>Shot_IncendiaryLauncher</soundCast>
+								<soundCastTail>GunTail_Medium</soundCastTail>
+								<muzzleFlashScale>14</muzzleFlashScale>
+								<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
+								<targetParams>
+									<canTargetLocations>true</canTargetLocations>
+								</targetParams>
+								<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+								<defaultProjectile>Bullet_30x29mmGrenade_EMP</defaultProjectile>
+								<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
+							</li>
+						</verbs>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Apparel_AssaultArmor"]/comps/li[@Class="CompProperties_Reloadable"]/ammoDef</xpath>
+					<value>
+						<ammoDef>Ammo_30x29mmGrenade_EMP</ammoDef>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Apparel_AssaultArmor"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountPerCharge</xpath>
+					<value>
+						<ammoCountPerCharge>1</ammoCountPerCharge>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+	<!-- ========== Assault Helmet =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_AssaultArmorH"]/statBases/Mass</xpath>
+		<value>
+			<Mass>10</Mass>
+			<Bulk>20</Bulk>
+			<WornBulk>2</WornBulk>
+			<NightVisionEfficiency_Apparel>0.3</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_AssaultArmorH"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_AssaultArmorH"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>62.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Apparel_AssaultArmorH"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Apparel_AssaultArmorH"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_AssaultArmorH"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>-0.25</MoveSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_AssaultArmorH"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_AssaultArmorH"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>70</Plasteel>
+			<Uranium>15</Uranium>
+			<DevilstrandCloth>30</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_AssaultArmorH"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Fire Support Armor =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_FSArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>70</Mass>
+			<Bulk>80</Bulk>
+			<WornBulk>20</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_FSArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_FSArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>37.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_FSArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<CarryWeight>120</CarryWeight>
+			<CarryBulk>50</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_FSArmor"]/equippedStatOffsets/AimingDelayFactor</xpath>
+		<value>
+			<AimingDelayFactor>-0.25</AimingDelayFactor>
+			<ReloadSpeed>0.5</ReloadSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_FSArmor"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>175</Plasteel>
+			<DevilstrandCloth>50</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_FSArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Apparel_FSArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Fire Support Helmet =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_FSArmorH"]/statBases/Mass</xpath>
+		<value>
+			<Mass>5</Mass>
+			<Bulk>7</Bulk>
+			<WornBulk>1.5</WornBulk>
+			<NightVisionEfficiency_Apparel>0.9</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_FSArmorH"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_FSArmorH"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>35</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Apparel_FSArmorH"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Apparel_FSArmorH"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_FSArmorH"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_FSArmorH"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>55</Plasteel>
+			<DevilstrandCloth>20</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_FSArmorH"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Apparel_FSArmorH"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Korp Armor =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Korp"]/statBases/Mass</xpath>
+		<value>
+			<Mass>85</Mass>
+			<Bulk>80</Bulk>
+			<WornBulk>20</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Korp"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Korp"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>37.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Korp"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<CarryWeight>100</CarryWeight>
+			<CarryBulk>30</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Korp"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>175</Plasteel>
+			<DevilstrandCloth>50</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_Korp"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Apparel_Korp"]/verbs</xpath>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Apparel_Korp"]/verbs</xpath>
+					<value>
+						<verbs>
+							<li Class="CombatExtended.VerbPropertiesCE">
+								<label>launch crow feeder</label>
+								<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
+								<hasStandardCommand>true</hasStandardCommand>
+								<onlyManualCast>True</onlyManualCast>
+								<warmupTime>1.5</warmupTime>
+								<range>55</range>
+								<minRange>5</minRange>
+								<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+								<soundCast>RS_ShotGrendel</soundCast>
+								<soundCastTail>GunTail_Medium</soundCastTail>
+								<muzzleFlashScale>16</muzzleFlashScale>
+								<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
+								<targetParams>
+									<canTargetLocations>true</canTargetLocations>
+								</targetParams>
+								<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+								<defaultProjectile>Bullet_JICrowFeeder</defaultProjectile>
+								<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
+							</li>
+						</verbs>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Apparel_Korp"]/comps/li[@Class="CompProperties_Reloadable"]/ammoDef</xpath>
+					<value>
+						<ammoDef>Ammo_JI_Alloy</ammoDef>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Apparel_Korp"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountPerCharge</xpath>
+					<value>
+						<ammoCountPerCharge>80</ammoCountPerCharge>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Apparel_Korp"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Reflactor Carapace =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ReflactorArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>60</Mass>
+			<Bulk>100</Bulk>
+			<WornBulk>18</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ReflactorArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ReflactorArmor"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>10</ArmorRating_Heat>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ReflactorArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>54</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ReflactorArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<CarryWeight>90</CarryWeight>
+			<CarryBulk>15</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ReflactorArmor"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>160</Plasteel>
+			<DevilstrandCloth>75</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ReflactorArmor"]/costList/Uranium</xpath>
+		<value>
+			<Uranium>60</Uranium>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_ReflactorArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Apparel_ReflactorArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.85</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.85</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Reflactor Helmet =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ReflactorArmorH"]/statBases/Mass</xpath>
+		<value>
+			<Mass>5.2</Mass>
+			<Bulk>6</Bulk>
+			<WornBulk>1.5</WornBulk>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ReflactorArmorH"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ReflactorArmorH"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>10</ArmorRating_Heat>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ReflactorArmorH"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>37.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Apparel_ReflactorArmorH"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Apparel_ReflactorArmorH"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_ReflactorArmorH"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ReflactorArmorH"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>60</Plasteel>
+			<DevilstrandCloth>30</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ReflactorArmorH"]/costList/Uranium</xpath>
+		<value>
+			<Uranium>20</Uranium>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_ReflactorArmorH"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Hazard Carapace =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_HazardCarapace"]/statBases/Mass</xpath>
+		<value>
+			<Mass>45</Mass>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_HazardCarapace"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_HazardCarapace"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_HazardCarapace"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>1</ArmorRating_Heat>
+			<ArmorRating_Electric>1</ArmorRating_Electric>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_HazardCarapace"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<CarryWeight>80</CarryWeight>
+			<CarryBulk>25</CarryBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_HazardCarapace"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>145</Plasteel>
+			<DevilstrandCloth>50</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_HazardCarapace"]/costList/Uranium</xpath>
+		<value>
+			<Uranium>65</Uranium>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_HazardCarapace"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Apparel_HazardCarapace"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.95</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.95</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Hazard Helmet =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_HazardCarapaceH"]/statBases/Mass</xpath>
+		<value>
+			<Mass>6</Mass>
+			<Bulk>6</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.7</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_HazardCarapaceH"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_HazardCarapaceH"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>31.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_HazardCarapaceH"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>1.5</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Apparel_HazardCarapaceH"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Apparel_HazardCarapaceH"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_HazardCarapaceH"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_HazardCarapaceH"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>50</Plasteel>
+			<DevilstrandCloth>10</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_HazardCarapaceH"]/costList/Uranium</xpath>
+		<value>
+			<Uranium>25</Uranium>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_HazardCarapaceH"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!-- ========== CQ Armor =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_CloseCombatArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>60</Mass>
+			<Bulk>65</Bulk>
+			<WornBulk>20</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_CloseCombatArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_CloseCombatArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>60</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_CloseCombatArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>80</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_CloseCombatArmor"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>145</Plasteel>
+			<DevilstrandCloth>50</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_CloseCombatArmor"]/costList/Uranium</xpath>
+		<value>
+			<Uranium>110</Uranium>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_CloseCombatArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Apparel_CloseCombatArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_CloseCombatArmor"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.55</MeleeDodgeChance>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<!-- ========== CQ Helmet =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_CloseCombatHelmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>5</Mass>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_CloseCombatHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_CloseCombatHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>54</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Apparel_CloseCombatHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Apparel_CloseCombatHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_CloseCombatHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_CloseCombatHelmet"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>65</Plasteel>
+			<DevilstrandCloth>20</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_CloseCombatHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Apparel_CloseCombatHelmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Core/Patches/Rimsenal Core/Rimsenal_DamageDefs.xml b/ModPatches/Rimsenal Core/Patches/Rimsenal Core/Rimsenal_DamageDefs.xml
new file mode 100644
index 0000000000..92df044520
--- /dev/null
+++ b/ModPatches/Rimsenal Core/Patches/Rimsenal Core/Rimsenal_DamageDefs.xml	
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/DamageDef[defName="Microwave"]</xpath>
+		<value>
+			<li Class="CombatExtended.DamageDefExtensionCE">
+				<isAmbientDamage>true</isAmbientDamage>
+			</li>
+		</value>
+
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Core/Patches/Rimsenal Core/Rimsenal_Melee.xml b/ModPatches/Rimsenal Core/Patches/Rimsenal Core/Rimsenal_Melee.xml
new file mode 100644
index 0000000000..ae1a3d3b71
--- /dev/null
+++ b/ModPatches/Rimsenal Core/Patches/Rimsenal Core/Rimsenal_Melee.xml	
@@ -0,0 +1,308 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Torch Sword-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_TorchSword"]/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.5</cooldownTime>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.3</cooldownTime>
+					<armorPenetrationBlunt>1.352</armorPenetrationBlunt>
+					<armorPenetrationSharp>18</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>41</power>
+					<cooldownTime>1.52</cooldownTime>
+					<armorPenetrationBlunt>3.2</armorPenetrationBlunt>
+					<armorPenetrationSharp>12.8</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_TorchSword"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.8</MeleeCounterParryBonus>
+			<Bulk>6.5</Bulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_TorchSword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1</MeleeCritChance>
+				<MeleeParryChance>0.6</MeleeParryChance>
+				<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<!--			
+<li Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="MeleeWeapon_TorchSword"]/weaponTags</xpath>
+	<value>
+		<li>CE_OneHandedWeapon</li>
+	</value>
+</li>
+-->
+	<!-- GD - Sabertooth -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GD_Sabertooth"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<chanceFactor>0.33</chanceFactor>
+					<cooldownTime>1.65</cooldownTime>
+					<armorPenetrationBlunt>0.71</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>31</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationSharp>3.63</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.174</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GD_Sabertooth"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.25</MeleeCounterParryBonus>
+			<Bulk>3.5</Bulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="GD_Sabertooth"]/equippedStatOffsets</xpath>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GD_Sabertooth"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.28</MeleeCritChance>
+				<MeleeParryChance>0.25</MeleeParryChance>
+				<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GD_Sabertooth"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- YP Vibroknife -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="YP_BingJu"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<chanceFactor>0.33</chanceFactor>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>0.6</cooldownTime>
+					<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
+					<armorPenetrationSharp>6</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>0.6</cooldownTime>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>15</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="YP_BingJu"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>1.2</MeleeCounterParryBonus>
+			<Bulk>2.5</Bulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="YP_BingJu"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.75</MeleeCritChance>
+				<MeleeParryChance>0.94</MeleeParryChance>
+				<MeleeDodgeChance>0.20</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="YP_BingJu"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="YP_BingJu"]</xpath>
+			<value>
+				<weaponTags>
+					<li>CE_OneHandedWeapon</li>
+				</weaponTags>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="YP_BingJu"]/weaponTags</xpath>
+			<value>
+				<li>CE_OneHandedWeapon</li>
+			</value>
+		</match>
+	</Operation>
+
+	<!-- JI Assault Hammer -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JI_Ormbane"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<chanceFactor>0.33</chanceFactor>
+					<cooldownTime>1.97</cooldownTime>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>32</power>
+					<cooldownTime>3.2</cooldownTime>
+					<armorPenetrationBlunt>250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="JI_Ormbane"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>1.21</MeleeCounterParryBonus>
+			<Bulk>9</Bulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="JI_Ormbane"]/equippedStatOffsets</xpath>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="JI_Ormbane"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>2.5</MeleeCritChance>
+				<MeleeParryChance>0.16</MeleeParryChance>
+				<MeleeDodgeChance>0.27</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- TE - Impact Knuckle -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TE_Eris"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>knuckle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>0.7</cooldownTime>
+					<armorPenetrationBlunt>25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>discharger</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Stun</def>
+							<amount>4</amount>
+							<chance>0.5</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>1.00</cooldownTime>
+					<armorPenetrationBlunt>45</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TE_Eris"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TE_Eris"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.5</MeleeCritChance>
+				<MeleeParryChance>0.15</MeleeParryChance>
+				<MeleeDodgeChance>0.45</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TE_Eris"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Core/Patches/Rimsenal Core/Weapons_Explosives.xml b/ModPatches/Rimsenal Core/Patches/Rimsenal Core/Weapons_Explosives.xml
new file mode 100644
index 0000000000..84d5928632
--- /dev/null
+++ b/ModPatches/Rimsenal Core/Patches/Rimsenal Core/Weapons_Explosives.xml	
@@ -0,0 +1,484 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Remove Recipe Maker & Verbs ========== -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="YP_BaegYa" or
+			defName="JI_Dunder" or
+			defName="GD_Bobcat" or
+			defName="TE_Grief" or
+			@Name="BaseRSGrenade"
+			]/recipeMaker </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="YP_BaegYa" or
+			defName="JI_Dunder" or
+			defName="GD_Bobcat" or
+			defName="TE_Grief"
+			]/costList </xpath>
+	</Operation>
+
+	<!-- Without this mod, Grief and Bobcat don't work, and it logs at ForcedMissRadius error.-->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="YP_BaegYa" or
+			defName="JI_Dunder" or
+			defName="GD_Bobcat" or
+			defName="TE_Grief"
+			]/verbs </xpath>
+	</Operation>
+
+	<!-- Change TickerType.-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="YP_BaegYa" or
+			defName="JI_Dunder" or
+			defName="GD_Bobcat" or
+			defName="TE_Grief"
+			] </xpath>
+		<value>
+			<tickerType>Normal</tickerType>
+		</value>
+	</Operation>
+
+	<!-- ========== Projectile thingClass ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Proj_BaegYa" or
+			defName="Proj_Dunder" or
+			defName="Proj_Bobcat" or
+			defName="Proj_Grief"
+			]/thingClass </xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+
+	<!-- ========== Projectile ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Proj_BaegYa"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<explosionRadius>5</explosionRadius>
+				<damageDef>Microwave</damageDef>
+				<damageAmountBase>1</damageAmountBase>
+				<explosionDelay>50</explosionDelay>
+				<dropsCasings>false</dropsCasings>
+				<speed>12</speed>
+				<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+				<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Proj_Dunder"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<explosionRadius>4.5</explosionRadius>
+				<damageDef>Bomb</damageDef>
+				<damageAmountBase>200</damageAmountBase>
+				<explosionDelay>500</explosionDelay>
+				<dropsCasings>false</dropsCasings>
+				<speed>10</speed>
+				<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+				<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Proj_Bobcat"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<explosionRadius>1</explosionRadius>
+				<damageDef>Bomb</damageDef>
+				<damageAmountBase>10</damageAmountBase>
+				<explosionDelay>80</explosionDelay>
+				<dropsCasings>true</dropsCasings>
+				<speed>12</speed>
+				<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+				<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Proj_Grief"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<explosionRadius>4</explosionRadius>
+				<damageDef>KineticImpact</damageDef>
+				<explosionDelay>80</explosionDelay>
+				<dropsCasings>false</dropsCasings>
+				<speed>12</speed>
+				<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+				<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</projectile>
+		</value>
+	</Operation>
+
+	<!-- ========== Check Comp ========== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Proj_BaegYa"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Proj_BaegYa"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Proj_Dunder"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Proj_Dunder"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Proj_Bobcat"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Proj_Bobcat"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Proj_Grief"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Proj_Grief"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<!-- ========== Add Fragmentation ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Proj_BaegYa"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>0</Fragment_Small>
+				</fragments>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Proj_Dunder"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>0</Fragment_Small>
+				</fragments>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Proj_Bobcat"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>27</Fragment_Small>
+				</fragments>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Proj_Grief"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>0</Fragment_Small>
+				</fragments>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Weapon Stack and Appearance -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="YP_BaegYa" or
+			defName="JI_Dunder" or
+			defName="GD_Bobcat" or
+			defName="TE_Grief"
+			]/graphicData </xpath>
+		<value>
+			<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="YP_BaegYa" or
+			defName="JI_Dunder" or
+			defName="GD_Bobcat" or
+			defName="TE_Grief"
+			] </xpath>
+		<value>
+			<thingClass>CombatExtended.AmmoThing</thingClass>
+			<stackLimit>75</stackLimit>
+			<resourceReadoutPriority>First</resourceReadoutPriority>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="YP_BaegYa" or
+			defName="JI_Dunder" or
+			defName="GD_Bobcat" or
+			defName="TE_Grief"
+			] </xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<!-- Weapon Check Comps -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="YP_BaegYa"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="YP_BaegYa"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="JI_Dunder"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="JI_Dunder"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="GD_Bobcat"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="GD_Bobcat"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="TE_Grief"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="TE_Grief"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<!-- Weapon Values -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="YP_BaegYa"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>40</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1.5</explosiveRadius>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>20</Fragment_Small>
+				</fragments>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>YP_BaegYa</defName>
+		<statBases>
+			<Mass>0.4</Mass>
+			<MarketValue>4.75</MarketValue>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<label>throw microwave grenade</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<range>10.0</range>
+			<minRange>4</minRange>
+			<warmupTime>0.8</warmupTime>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<soundCast>ThrowGrenade</soundCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<defaultProjectile>Proj_BaegYa</defaultProjectile>
+			<onlyManualCast>true</onlyManualCast>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<weaponTags>
+			<li>CE_AI_Grenade</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="JI_Dunder"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>40</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1.5</explosiveRadius>
+
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>50</Fragment_Small>
+				</fragments>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>JI_Dunder</defName>
+		<statBases>
+			<Mass>2.5</Mass>
+			<MarketValue>7.25</MarketValue>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<label>throw satchel charge</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<range>10.0</range>
+			<minRange>4</minRange>
+			<warmupTime>0.8</warmupTime>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<soundCast>ThrowGrenade</soundCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<defaultProjectile>Proj_Dunder</defaultProjectile>
+			<onlyManualCast>true</onlyManualCast>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<weaponTags>
+			<li>CE_AI_Grenade</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GD_Bobcat"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>40</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1.5</explosiveRadius>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>50</Fragment_Small>
+				</fragments>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GD_Bobcat</defName>
+		<statBases>
+			<Mass>0.4</Mass>
+			<MarketValue>4.75</MarketValue>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>1.0</ShotSpread>
+		</statBases>
+		<Properties>
+			<label>throw mini grenades</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<range>11.0</range>
+			<minRange>4</minRange>
+			<warmupTime>0.8</warmupTime>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<soundCast>ThrowGrenade</soundCast>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<defaultProjectile>Proj_Bobcat</defaultProjectile>
+			<onlyManualCast>true</onlyManualCast>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<weaponTags>
+			<li>CE_AI_Grenade</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TE_Grief"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>40</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1.5</explosiveRadius>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>20</Fragment_Small>
+				</fragments>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>TE_Grief</defName>
+		<statBases>
+			<Mass>0.4</Mass>
+			<MarketValue>4.75</MarketValue>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<label>throw impact grenade</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<range>10.0</range>
+			<minRange>4</minRange>
+			<warmupTime>0.8</warmupTime>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<soundCast>ThrowGrenade</soundCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<defaultProjectile>Proj_Grief</defaultProjectile>
+			<onlyManualCast>true</onlyManualCast>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<weaponTags>
+			<li>CE_AI_Grenade</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Core/Patches/Rimsenal Core/Weapons_GD_CE.xml b/ModPatches/Rimsenal Core/Patches/Rimsenal Core/Weapons_GD_CE.xml
new file mode 100644
index 0000000000..02d4bc1592
--- /dev/null
+++ b/ModPatches/Rimsenal Core/Patches/Rimsenal Core/Weapons_GD_CE.xml	
@@ -0,0 +1,676 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==========  Cost Change =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/thingDef[defName="MRSKitR"]/recipeMaker/researchPrerequisite</xpath>
+		<value>
+			<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+		</value>
+	</Operation>
+
+	<!-- ==========  Melee Tools =========== -->
+
+	<!-- Pistols -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GD_MSSH" or
+			defName="GD_MSST" or
+			defName="GD_MSSF" or
+			defName="GD_TacticalPistol"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- Long guns-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GD_HybridRifle" or
+			defName="GD_ModularCarbine" or
+			defName="GD_ModularRifle" or
+			defName="GD_ModularDMR" or
+			defName="GD_ModularLMG" or
+			defName="GD_GrenadeLauncher"
+			]/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>
+	<!-- Carcal -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/thingDef[defName="GD_HVSMG"]</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>
+
+	<!-- ==========  "Black Panther" Hybrid Rifle =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GD_HybridRifle</defName>
+		<statBases>
+			<Mass>4.4</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.75</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.4</SwayFactor>
+			<Bulk>9.6</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.34</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_473x33mmGDHybrid_FMJ</defaultProjectile>
+			<warmupTime>1.05</warmupTime>
+			<range>58</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>ShotGRH</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>45</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_473x33mmCaseless_GDHybrid</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ==========  Hybrid Ocelot =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GD_MSSH</defName>
+		<statBases>
+			<WorkToMake>50</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.48</SwayFactor>
+			<Bulk>2.35</Bulk>
+			<Mass>2.1</Mass>
+			<RangedWeapon_Cooldown>0.33</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_473x33mmGDHybrid_FMJ</defaultProjectile>
+			<warmupTime>0.65</warmupTime>
+			<range>23</range>
+			<soundCast>ShotGRH</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_473x33mmCaseless_GDHybrid</ammoSet>
+		</AmmoUser>
+		<FireModes>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_Pistol</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ==========  Modular Triple-shot =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GD_MSST</defName>
+		<statBases>
+			<WorkToMake>50</WorkToMake>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.17</SwayFactor>
+			<Bulk>2.20</Bulk>
+			<Mass>1.25</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.12</recoilAmount><!--Halved from base-->
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_473x33mmGDPistol_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<range>18</range>
+			<soundCast>ShotLynx</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_473x33mmCaseless_GDPistol</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_Pistol</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ==========  Modular Spitfire =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/thingDef[defName="GD_MSSS"]/statBases</xpath>
+		<value>
+			<statBases>
+				<WorkToMake>50</WorkToMake>
+				<SightsEfficiency>0.8</SightsEfficiency>
+				<ShotSpread>0.2</ShotSpread>
+				<SwayFactor>1.45</SwayFactor>
+				<Bulk>2.85</Bulk>
+				<Mass>1.51</Mass>
+				<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			</statBases>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/thingDef[defName="GD_MSSS"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.04</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_473x33mmGDPistol_FMJ</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<burstShotCount>5</burstShotCount>
+					<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+					<range>12</range>
+					<soundCast>ShotLynx</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/thingDef[defName="GD_MSSS"]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>45</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_473x33mmCaseless_GDPistol</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aimedBurstShotCount>3</aimedBurstShotCount>
+				</li>
+			</comps>
+			<weaponTags>
+				<li>CE_Sidearm</li>
+				<li>CE_AI_Pistol</li>
+				<li>CE_OneHandedWeapon</li>
+			</weaponTags>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/thingDef[defName="GD_MSSS"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ==========  Modular Flakker =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GD_MSSF</defName>
+		<statBases>
+			<WorkToMake>50</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.36</ShotSpread>
+			<SwayFactor>1.22</SwayFactor>
+			<Bulk>1.90</Bulk>
+			<Mass>1.75</Mass>
+			<RangedWeapon_Cooldown>1.06</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_25x40mmGrenade_HE</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>18</range>
+			<soundCast>ShotLynx</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>4</AmmoGenPerMagOverride>
+			<reloadTime>2.6</reloadTime>
+			<ammoSet>AmmoSet_25x40mmGrenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ==========  Tactical Pistol =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GD_TacticalPistol</defName>
+		<statBases>
+			<Mass>1.25</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>1.02</SwayFactor>
+			<Bulk>1.25</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>ShotLynx</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>14</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+		<FireModes>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ==========  Modular Carbine =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GD_ModularCarbine</defName>
+		<statBases>
+			<Mass>2.5</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.04</SwayFactor>
+			<Bulk>6.4</Bulk>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>1.56</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_473x33mmCaseless_FMJ</defaultProjectile>
+			<warmupTime>0.85</warmupTime>
+			<range>40</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>ShotGRC</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>45</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_473x33mmCaseless</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>false</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- ==========  Modular Rifle =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GD_ModularRifle</defName>
+		<statBases>
+			<Mass>3.5</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.75</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.34</SwayFactor>
+			<Bulk>9.45</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.32</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_473x33mmCaseless_FMJ</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>62</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>ShotGRC</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>45</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_473x33mmCaseless</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ==========  Modular DMR =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GD_ModularDMR</defName>
+		<statBases>
+			<Mass>3.91</Mass>
+			<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.60</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.12</SwayFactor>
+			<Bulk>11.85</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.12</recoilAmount><!--Further reduction of the recoil from 0.2x to 0.1x to facilitate aimed shots a bit better-->
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_473x33mmCaseless_FMJ</defaultProjectile>
+			<warmupTime>1.9</warmupTime>
+			<range>81</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<soundCast>ShotGRM</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>45</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_473x33mmCaseless</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SniperRifle</li>
+			<li>Bipod_DMR</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ==========  Modular LMG =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GD_ModularLMG</defName>
+		<statBases>
+			<Mass>6.8</Mass>
+			<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<Bulk>11.75</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.87</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_473x33mmCaseless_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>67</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>ShotGRS</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>150</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_473x33mmCaseless</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_MachineGun</li>
+			<li>Bipod_LMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ==========  Caracal SMG =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/thingDef[defName="GD_HVSMG"]/statBases</xpath>
+		<value>
+			<statBases>
+				<WorkToMake>50</WorkToMake>
+				<SightsEfficiency>1</SightsEfficiency>
+				<ShotSpread>0.17</ShotSpread>
+				<SwayFactor>0.55</SwayFactor>
+				<Bulk>2.31</Bulk>
+				<Mass>3.2</Mass>
+				<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			</statBases>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/thingDef[defName="GD_HVSMG"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.58</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<burstShotCount>6</burstShotCount>
+					<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+					<range>16</range>
+					<soundCast>ShotCaracal</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/thingDef[defName="GD_HVSMG"]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>36</magazineSize>
+					<reloadTime>4.5</reloadTime>
+					<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aimedBurstShotCount>3</aimedBurstShotCount>
+				</li>
+			</comps>
+			<weaponTags>
+				<li>CE_SMG</li>
+				<li>CE_AI_AssaultWeapon</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+	<!-- ==========  GD Multi Launcher =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GD_GrenadeLauncher</defName>
+		<statBases>
+			<WorkToMake>55000</WorkToMake>
+			<Mass>5.5</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>1.15</SwayFactor>
+			<Bulk>6.0</Bulk>
+		</statBases>
+		<costList>
+			<Steel>45</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>2.58</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_25x40mmGrenade_HE</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>45</range>
+			<minRange>2</minRange>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<soundCast>ShotGdgrenade</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>5.1</reloadTime>
+			<ammoSet>AmmoSet_25x40mmGrenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<researchPrerequisite>CE_Launchers</researchPrerequisite>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/thingDef[defName="GD_BSLauncher"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/thingDef[defName="GD_INGrenadeLauncher"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/thingDef[defName="GD_SKGrenadeLauncher"]</xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Core/Patches/Rimsenal Core/Weapons_JI_CE.xml b/ModPatches/Rimsenal Core/Patches/Rimsenal Core/Weapons_JI_CE.xml
new file mode 100644
index 0000000000..1cc71c0706
--- /dev/null
+++ b/ModPatches/Rimsenal Core/Patches/Rimsenal Core/Weapons_JI_CE.xml	
@@ -0,0 +1,476 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==========  Melee Tools =========== -->
+
+	<!-- Pistols -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/thingDef[defName="JI_Trollsverd"]</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- Long guns-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/thingDef[defName="JI_Hrunting" or
+			defName="JI_Gramr" or
+			defName="JI_Muspell"
+			] </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>
+	<!-- Heavy Weapons -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/thingDef[defName="JI_Grendel" or
+			defName="JI_Fafnir"
+			] </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>
+
+	<!-- ==========  Trollsverd Pistol =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/thingDef[defName="JI_Trollsverd"]/statBases</xpath>
+		<value>
+			<statBases>
+				<WorkToMake>35500</WorkToMake>
+				<SightsEfficiency>0.7</SightsEfficiency>
+				<ShotSpread>0.17</ShotSpread>
+				<SwayFactor>1.83</SwayFactor>
+				<Bulk>2.90</Bulk>
+				<Mass>2.81</Mass>
+				<RangedWeapon_Cooldown>0.47</RangedWeapon_Cooldown>
+			</statBases>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/thingDef[defName="JI_Trollsverd"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.2</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_JI_Molten</defaultProjectile>
+					<warmupTime>1.0</warmupTime>
+					<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+					<range>12</range>
+					<soundCast>RS_ShotJI</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>12</muzzleFlashScale>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/thingDef[defName="JI_Trollsverd"]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>8</magazineSize>
+					<reloadTime>4.8</reloadTime>
+					<ammoSet>AmmoSet_JIStandard</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+				</li>
+			</comps>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/thingDef[defName="JI_Trollsverd"]/weaponTags</xpath>
+		<value>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_Pistol</li>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+	<!-- ==========  Hrunting Rifle =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/thingDef[defName="JI_Hrunting"]/statBases</xpath>
+		<value>
+			<statBases>
+				<WorkToMake>45500</WorkToMake>
+				<SightsEfficiency>1</SightsEfficiency>
+				<ShotSpread>0.05</ShotSpread>
+				<SwayFactor>1.72</SwayFactor>
+				<Bulk>11.40</Bulk>
+				<Mass>5.81</Mass>
+				<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
+			</statBases>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/thingDef[defName="JI_Hrunting"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.25</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_JI_Molten</defaultProjectile>
+					<warmupTime>1.4</warmupTime>
+					<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+					<burstShotCount>3</burstShotCount>
+					<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+					<range>52</range>
+					<soundCast>RS_ShotJI</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>11</muzzleFlashScale>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/thingDef[defName="JI_Hrunting"]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>40</magazineSize>
+					<reloadTime>4.3</reloadTime>
+					<ammoSet>AmmoSet_JIStandard</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiUseBurstMode>false</aiUseBurstMode>
+					<aiAimMode>AimedShot</aiAimMode>
+					<aimedBurstShotCount>2</aimedBurstShotCount>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/thingDef[defName="JI_Hrunting"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1,1</DrawSize>
+				<DrawOffset>0,0</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Gramr AMR =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/thingDef[defName="JI_Gramr"]/statBases</xpath>
+		<value>
+			<statBases>
+				<WorkToMake>50500</WorkToMake>
+				<SightsEfficiency>1.6</SightsEfficiency>
+				<ShotSpread>0.01</ShotSpread>
+				<SwayFactor>3.43</SwayFactor>
+				<Bulk>25</Bulk>
+				<Mass>15.50</Mass>
+				<RangedWeapon_Cooldown>2.45</RangedWeapon_Cooldown>
+			</statBases>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/thingDef[defName="JI_Gramr"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>12.77</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_JI_AMR</defaultProjectile>
+					<warmupTime>3.525</warmupTime>
+					<ammoConsumedPerShotCount>30</ammoConsumedPerShotCount>
+					<range>58</range>
+					<soundCast>RS_ShotJI</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>15</muzzleFlashScale>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/thingDef[defName="JI_Gramr"]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>90</magazineSize>
+					<reloadTime>6</reloadTime>
+					<ammoSet>AmmoSet_JI_AMR</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+			<weaponTags>
+			</weaponTags>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/thingDef[defName="JI_Gramr"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.1,1.1</DrawSize>
+				<DrawOffset>0,0</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/thingDef[defName="JI_Gramr"]/weaponTags</xpath>
+		<value>
+			<li>Bipod_AMR</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Grendel Rocket Launcher =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/thingDef[defName="JI_Grendel"]/statBases</xpath>
+		<value>
+			<statBases>
+				<WorkToMake>90500</WorkToMake>
+				<SightsEfficiency>1.6</SightsEfficiency>
+				<ShotSpread>0.1</ShotSpread>
+				<SwayFactor>2.99</SwayFactor>
+				<Bulk>18.50</Bulk>
+				<Mass>15</Mass>
+				<RangedWeapon_Cooldown>3.63</RangedWeapon_Cooldown>
+			</statBases>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/thingDef[defName="JI_Grendel"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>4.5</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_JISiegeRound</defaultProjectile>
+					<warmupTime>2.075</warmupTime>
+					<range>48</range>
+					<ammoConsumedPerShotCount>80</ammoConsumedPerShotCount>
+					<soundCast>RS_ShotJI</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>15</muzzleFlashScale>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/thingDef[defName="JI_Grendel"]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>240</magazineSize>
+					<reloadTime>8</reloadTime>
+					<ammoSet>AmmoSet_JISiege</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+			<weaponTags>
+			</weaponTags>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/thingDef[defName="JI_Grendel"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.1,1.1</DrawSize>
+				<DrawOffset>0,0</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ==========  Suppression Cannon =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/thingDef[defName="JI_Muspell"]/statBases</xpath>
+		<value>
+			<statBases>
+				<WorkToMake>62500</WorkToMake>
+				<SightsEfficiency>1.1</SightsEfficiency>
+				<ShotSpread>0.1</ShotSpread>
+				<SwayFactor>2.06</SwayFactor>
+				<Bulk>12.5</Bulk>
+				<Mass>8.1</Mass>
+				<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
+			</statBases>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/thingDef[defName="JI_Muspell"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.85</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_JI_Suppressor</defaultProjectile>
+					<warmupTime>2.25</warmupTime>
+					<range>62</range>
+					<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+					<burstShotCount>20</burstShotCount>
+					<soundCast>RS_ShotMuspell</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>12</muzzleFlashScale>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<recoilPattern>Mounted</recoilPattern>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/thingDef[defName="JI_Muspell"]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>200</magazineSize>
+					<reloadTime>7.8</reloadTime>
+					<ammoSet>AmmoSet_JISuppressor</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aimedBurstShotCount>10</aimedBurstShotCount>
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>SuppressFire</aiAimMode>
+				</li>
+			</comps>
+			<weaponTags>
+			</weaponTags>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/thingDef[defName="JI_Muspell"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.1,1.1</DrawSize>
+				<DrawOffset>0,0</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Siege Shotgun -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/thingDef[defName="JI_Fafnir"]/statBases</xpath>
+		<value>
+			<statBases>
+				<WorkToMake>54500</WorkToMake>
+				<SightsEfficiency>1.0</SightsEfficiency>
+				<ShotSpread>0.2</ShotSpread>
+				<SwayFactor>1.75</SwayFactor>
+				<Bulk>11.5</Bulk>
+				<Mass>6.03</Mass>
+				<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+			</statBases>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/thingDef[defName="JI_Fafnir"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_JI_Slag</defaultProjectile>
+					<warmupTime>1.0</warmupTime>
+					<range>14</range>
+					<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
+					<soundCast>RS_ShotFafnir</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+					<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/thingDef[defName="JI_Fafnir"]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>21</magazineSize>
+					<reloadTime>4.3</reloadTime>
+					<ammoSet>AmmoSet_JISlag</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes"/>
+			</comps>
+			<weaponTags>
+			</weaponTags>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/thingDef[defName="JI_Fafnir"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.1,1.1</DrawSize>
+				<DrawOffset>0,0</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Core/Patches/Rimsenal Core/Weapons_TE_CE.xml b/ModPatches/Rimsenal Core/Patches/Rimsenal Core/Weapons_TE_CE.xml
new file mode 100644
index 0000000000..12b24ee1c6
--- /dev/null
+++ b/ModPatches/Rimsenal Core/Patches/Rimsenal Core/Weapons_TE_CE.xml	
@@ -0,0 +1,407 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==========  Melee Tools =========== -->
+
+	<!-- Pistols -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/thingDef[defName="TE_KineticPistol"]</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- Long guns-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/thingDef[defName="TE_KineticRifle" or
+			defName="TE_ThuddGun" or
+			defName="TE_KineticLongRifle" or
+			defName="TE_StormCannon"
+			] </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>
+	<!-- Heavy Weapons -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/thingDef[defName="TE_KineticLance"]</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>
+
+	<!-- ==========  TE Kinetic Rifle  =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/thingDef[defName="TE_KineticRifle"]/statBases</xpath>
+		<value>
+			<statBases>
+				<WorkToMake>50800</WorkToMake>
+				<SightsEfficiency>1.0</SightsEfficiency>
+				<ShotSpread>0.08</ShotSpread>
+				<SwayFactor>1.25</SwayFactor>
+				<Bulk>9.20</Bulk>
+				<Mass>3.30</Mass>
+				<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			</statBases>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/thingDef[defName="TE_KineticRifle"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.56</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_TEPowerCharge_KE</defaultProjectile>
+					<warmupTime>0.9</warmupTime>
+					<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+					<burstShotCount>5</burstShotCount>
+					<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+					<range>44</range>
+					<soundCast>ImpactM</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>8</muzzleFlashScale>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/thingDef[defName="TE_KineticRifle"]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>60</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_TEPowerCharge</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aimedBurstShotCount>3</aimedBurstShotCount>
+					<aiUseBurstMode>TRUE</aiUseBurstMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ==========  TE Kinetic Pistol  =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/thingDef[defName="TE_KineticPistol"]/statBases</xpath>
+		<value>
+			<statBases>
+				<WorkToMake>30800</WorkToMake>
+				<SightsEfficiency>0.7</SightsEfficiency>
+				<ShotSpread>0.17</ShotSpread>
+				<SwayFactor>0.93</SwayFactor>
+				<Bulk>1.70</Bulk>
+				<Mass>1.10</Mass>
+				<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			</statBases>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/thingDef[defName="TE_KineticPistol"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.8</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_TEPowerCharge_KE</defaultProjectile>
+					<warmupTime>0.4</warmupTime>
+					<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+					<range>12</range>
+					<soundCast>ImpactM</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>8</muzzleFlashScale>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/thingDef[defName="TE_KineticPistol"]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>18</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_TEPowerCharge</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ==========  TE Thudd Gun  =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/thingDef[defName="TE_ThuddGun"]/statBases</xpath>
+		<value>
+			<statBases>
+				<WorkToMake>46800</WorkToMake>
+				<SightsEfficiency>1.0</SightsEfficiency>
+				<ShotSpread>0.21</ShotSpread>
+				<SwayFactor>1.37</SwayFactor>
+				<Bulk>9.60</Bulk>
+				<Mass>4.11</Mass>
+				<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			</statBases>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/thingDef[defName="TE_ThuddGun"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.48</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_TEEnergyCanister_KE</defaultProjectile>
+					<ammoConsumedPerShotCount>10</ammoConsumedPerShotCount>
+					<warmupTime>0.9</warmupTime>
+					<range>32</range>
+					<soundCast>ImpactB</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>12</muzzleFlashScale>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/thingDef[defName="TE_ThuddGun"]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>100</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_TEEnergyCanister</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ==========  TE Kinetic Long Rifle  =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/thingDef[defName="TE_KineticLongRifle"]/statBases</xpath>
+		<value>
+			<statBases>
+				<WorkToMake>46800</WorkToMake>
+				<SightsEfficiency>2.60</SightsEfficiency>
+				<ShotSpread>0.04</ShotSpread>
+				<SwayFactor>1.74</SwayFactor>
+				<Bulk>12.10</Bulk>
+				<Mass>4.50</Mass>
+				<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+			</statBases>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/thingDef[defName="TE_KineticLongRifle"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.01</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_TEConcentratedPowerCharge_KE</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<ammoConsumedPerShotCount>6</ammoConsumedPerShotCount>
+					<range>75</range>
+					<soundCast>ImpactB</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>12</muzzleFlashScale>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/thingDef[defName="TE_KineticLongRifle"]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>60</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_TEConcentratedPowerCharge</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ==========  TE Storm Cannon  =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/thingDef[defName="TE_StormCannon"]/statBases</xpath>
+		<value>
+			<statBases>
+				<WorkToMake>65800</WorkToMake>
+				<SightsEfficiency>1.0</SightsEfficiency>
+				<ShotSpread>0.18</ShotSpread>
+				<SwayFactor>1.34</SwayFactor>
+				<Bulk>12.60</Bulk>
+				<Mass>6.85</Mass>
+				<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
+			</statBases>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/thingDef[defName="TE_StormCannon"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.25</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_TEEnergyCanister_KE</defaultProjectile>
+					<warmupTime>1.75</warmupTime>
+					<burstShotCount>6</burstShotCount>
+					<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+					<ammoConsumedPerShotCount>10</ammoConsumedPerShotCount>
+					<range>62</range>
+					<soundCast>ImpactB</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>12</muzzleFlashScale>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/thingDef[defName="TE_StormCannon"]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>240</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_TEEnergyCanister</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aimedBurstShotCount>3</aimedBurstShotCount>
+					<aiUseBurstMode>TRUE</aiUseBurstMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ==========  TE Kinetic Lance  =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/thingDef[defName="TE_KineticLance"]/statBases</xpath>
+		<value>
+			<statBases>
+				<WorkToMake>65800</WorkToMake>
+				<SightsEfficiency>2.1</SightsEfficiency>
+				<ShotSpread>0.12</ShotSpread>
+				<SwayFactor>1.82</SwayFactor>
+				<Bulk>18.00</Bulk>
+				<Mass>10</Mass>
+				<RangedWeapon_Cooldown>1.1</RangedWeapon_Cooldown>
+			</statBases>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/thingDef[defName="TE_KineticLance"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>0.22</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_TEPowerCore_KE</defaultProjectile>
+					<warmupTime>2.5</warmupTime>
+					<burstShotCount>50</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
+					<range>44</range>
+					<soundCast>ImpactB</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>12</muzzleFlashScale>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/thingDef[defName="TE_KineticLance"]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>150</magazineSize>
+					<reloadTime>8</reloadTime>
+					<ammoSet>AmmoSet_TEPowerCore</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aimedBurstShotCount>25</aimedBurstShotCount>
+					<noSingleShot>true</noSingleShot>
+					<aiUseBurstMode>TRUE</aiUseBurstMode>
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Core/Patches/Rimsenal Core/Weapons_YP_CE.xml b/ModPatches/Rimsenal Core/Patches/Rimsenal Core/Weapons_YP_CE.xml
new file mode 100644
index 0000000000..f03ad38cf7
--- /dev/null
+++ b/ModPatches/Rimsenal Core/Patches/Rimsenal Core/Weapons_YP_CE.xml	
@@ -0,0 +1,431 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==========  Melee Tools =========== -->
+
+	<!-- Pistols -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="YP_SeolHwa"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Long guns-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="YP_SeoLi" or
+			defName="YP_SagPung" or
+			defName="YP_SangAe" or
+			defName="YP_VectorShot"
+			]/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>
+
+	<!-- Heavy Weapons -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="YP_GeugGwang"]/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>
+
+	<!-- ==========  YP Shard Rifle =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="YP_SeoLi"]/statBases</xpath>
+		<value>
+			<statBases>
+				<WorkToMake>48500</WorkToMake>
+				<SightsEfficiency>1.1</SightsEfficiency>
+				<ShotSpread>0.14</ShotSpread>
+				<SwayFactor>1.15</SwayFactor>
+				<Bulk>8.20</Bulk>
+				<Mass>3.12</Mass>
+				<RangedWeapon_Cooldown>0.2</RangedWeapon_Cooldown>
+			</statBases>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="YP_SeoLi"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>0.80</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_RifleYP</defaultProjectile>
+					<warmupTime>1.0</warmupTime>
+					<burstShotCount>10</burstShotCount>
+					<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+					<range>38</range>
+					<soundCast>RS_ShotShard</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>4</muzzleFlashScale>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="YP_SeoLi"]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>60</magazineSize>
+					<reloadTime>3</reloadTime>
+					<ammoSet>AmmoSet_RifleYP</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aimedBurstShotCount>5</aimedBurstShotCount>
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ==========  YP Swarmer =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="YP_SagPung"]/statBases</xpath>
+		<value>
+			<statBases>
+				<WorkToMake>42500</WorkToMake>
+				<SightsEfficiency>1.1</SightsEfficiency>
+				<ShotSpread>0.40</ShotSpread>
+				<SwayFactor>0.20</SwayFactor>
+				<Bulk>9.70</Bulk>
+				<Mass>2.85</Mass>
+				<RangedWeapon_Cooldown>0.22</RangedWeapon_Cooldown>
+			</statBases>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="YP_SagPung"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>0.25</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_SwarmerYP</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<ammoConsumedPerShotCount>4</ammoConsumedPerShotCount>
+					<burstShotCount>3</burstShotCount>
+					<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+					<range>15</range>
+					<soundCast>RS_ShotSwarm</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="YP_SagPung"]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>60</magazineSize>
+					<reloadTime>3</reloadTime>
+					<ammoSet>AmmoSet_SwarmerYP</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aimedBurstShotCount>2</aimedBurstShotCount>
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ==========  YP Spike Rifle =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="YP_SangAe"]/statBases</xpath>
+		<value>
+			<statBases>
+				<WorkToMake>55500</WorkToMake>
+				<SightsEfficiency>1.86</SightsEfficiency>
+				<ShotSpread>0.04</ShotSpread>
+				<SwayFactor>1.52</SwayFactor>
+				<Bulk>12.20</Bulk>
+				<Mass>3.30</Mass>
+				<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+			</statBases>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="YP_SangAe"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.33</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_SpikeYP</defaultProjectile>
+					<warmupTime>1.3</warmupTime>
+					<range>68</range>
+					<burstShotCount>6</burstShotCount>
+					<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+					<soundCast>RS_ShotSpike</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>8</muzzleFlashScale>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="YP_SangAe"]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>24</magazineSize>
+					<reloadTime>3.5</reloadTime>
+					<ammoSet>AmmoSet_SpikeYP</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiUseBurstMode>TRUE</aiUseBurstMode>
+					<aimedBurstShotCount>3</aimedBurstShotCount>
+					<aiAimMode>AimedShot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ==========  YP Dual Wield Shard Pistols =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="YP_SeolHwa"]/statBases</xpath>
+		<value>
+			<statBases>
+				<WorkToMake>50500</WorkToMake>
+				<SightsEfficiency>0.7</SightsEfficiency>
+				<ShotSpread>0.2</ShotSpread>
+				<SwayFactor>1.5</SwayFactor>
+				<Bulk>4.7</Bulk>
+				<Mass>4.32</Mass>
+				<RangedWeapon_Cooldown>0.2</RangedWeapon_Cooldown>
+			</statBases>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="YP_SeolHwa"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>0.32</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_PistolYP</defaultProjectile>
+					<warmupTime>0.5</warmupTime>
+					<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+					<burstShotCount>8</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<range>12</range>
+					<soundCast>RS_ShotShard</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>3</muzzleFlashScale>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="YP_SeolHwa"]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>32</magazineSize>
+					<reloadTime>4.5</reloadTime>
+					<ammoSet>AmmoSet_PistolYP</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aimedBurstShotCount>4</aimedBurstShotCount>
+					<aiUseBurstMode>True</aiUseBurstMode>
+					<aiAimMode>Snapshot</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="YP_SeolHwa"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="YP_SeolHwa"]</xpath>
+			<value>
+				<weaponTags>
+					<li>CE_Sidearm</li>
+					<li>CE_AI_Pistol</li>
+				</weaponTags>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="YP_SeolHwa"]/weaponTags</xpath>
+			<value>
+				<li>CE_Sidearm</li>
+				<li>CE_AI_Pistol</li>
+			</value>
+		</match>
+	</Operation>
+
+	<!-- ==========  YP Microwave Emmiter =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="YP_GeugGwang"]/statBases</xpath>
+		<value>
+			<statBases>
+				<WorkToMake>42500</WorkToMake>
+				<SightsEfficiency>1.0</SightsEfficiency>
+				<ShotSpread>0.0</ShotSpread>
+				<SwayFactor>1.21</SwayFactor>
+				<Bulk>8.70</Bulk>
+				<Mass>4.32</Mass>
+				<RangedWeapon_Cooldown>2.5</RangedWeapon_Cooldown>
+			</statBases>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="YP_GeugGwang"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.17</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_GeugGwang_CE</defaultProjectile>
+					<warmupTime>1</warmupTime>
+					<ticksBetweenBurstShots>0</ticksBetweenBurstShots>
+					<range>62</range>
+					<soundCast>RS_ShotBoreas</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>14</muzzleFlashScale>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="YP_GeugGwang"]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_FireModes"/>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- ==========  YP Vector Shot =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="YP_VectorShot"]/statBases</xpath>
+		<value>
+			<statBases>
+				<WorkToMake>58500</WorkToMake>
+				<SightsEfficiency>3.0</SightsEfficiency>
+				<ShotSpread>0.02</ShotSpread>
+				<SwayFactor>0.25</SwayFactor>
+				<Bulk>6.20</Bulk>
+				<Mass>3.06</Mass>
+				<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			</statBases>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="YP_VectorShot"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.25</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_VectorYP</defaultProjectile>
+					<warmupTime>1.4</warmupTime>
+					<burstShotCount>3</burstShotCount>
+					<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+					<range>14</range>
+					<soundCast>RS_ShotShard</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>10</muzzleFlashScale>
+					<circularError>0</circularError>
+					<indirectFirePenalty>0</indirectFirePenalty>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="YP_VectorShot"]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>16</magazineSize>
+					<reloadTime>3.5</reloadTime>
+					<ammoSet>AmmoSet_VectorYP</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aimedBurstShotCount>2</aimedBurstShotCount>
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Enhanced Vanilla/Defs/Rimsenal Enhanced Vanilla/Ammo_EnhancedVanilla.xml b/ModPatches/Rimsenal Enhanced Vanilla/Defs/Rimsenal Enhanced Vanilla/Ammo_EnhancedVanilla.xml
new file mode 100644
index 0000000000..000e3c0440
--- /dev/null
+++ b/ModPatches/Rimsenal Enhanced Vanilla/Defs/Rimsenal Enhanced Vanilla/Ammo_EnhancedVanilla.xml	
@@ -0,0 +1,280 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- ================== EMP Blast - Projectiles ================== -->
+
+	<ThingDef ParentName="BaseExplosiveBullet">
+		<defName>EMP_Blast</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>emp blast</label>
+		<graphicData>
+			<texPath>Things/Projectile/EMPBlast</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>EMP</damageDef>
+			<damageAmountBase>25</damageAmountBase>
+			<speed>60</speed>
+			<flyOverhead>false</flyOverhead>
+			<explosionRadius>1</explosionRadius>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+		</projectile>
+	</ThingDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_LaserEMP_Rimsenal</defName>
+		<label>Charge Pack (EMP)</label>
+		<ammoTypes>
+			<Ammo_LaserChargePack>EMP_Blast</Ammo_LaserChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<!-- The amount of arrows usable over the ammo lifetime for each resource cost is equal to
+	[r / (1 - x)];
+	x = preExplosionSpawnChance,
+	r = resource cost. -->
+
+	<ThingDef ParentName="BasePilumProjectile">
+		<defName>Club_Thrown</defName>
+		<label>club</label>
+		<graphicData>
+			<texPath>Things/A16/ThrowingClubs</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Blunt</damageDef>
+			<damageAmountBase>15</damageAmountBase>
+			<speed>22</speed>
+			<armorPenetrationBlunt>0.18</armorPenetrationBlunt>
+			<preExplosionSpawnChance>0.50</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>Gun_ThrowingClubs</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<!-- The amount of arrows usable over the ammo lifetime for each resource cost is equal to
+	[r / (1 - x)];
+	x = preExplosionSpawnChance,
+	r = resource cost. -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BasePilumProjectile">
+		<defName>Axe_Thrown</defName>
+		<label>axe</label>
+		<graphicData>
+			<texPath>Things/A16/ThrowingAxes</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Cut</damageDef>
+			<damageAmountBase>16</damageAmountBase>
+			<speed>22</speed>
+			<armorPenetrationSharp>1.4</armorPenetrationSharp>
+			<armorPenetrationBlunt>27</armorPenetrationBlunt>
+			<preExplosionSpawnChance>0.80</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>Gun_ThrowingAxes</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Compound Arrows ========================== -->
+
+	<ThingCategoryDef>
+		<defName>AmmoCompoundArrows</defName>
+		<label>compound arrows</label>
+		<parent>AmmoNeolithic</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberArrow</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_CompoundArrow</defName>
+		<label>compound arrows</label>
+		<ammoTypes>
+			<Ammo_CompoundArrow_Broadhead>Projectile_CompoundArrow_Broadhead</Ammo_CompoundArrow_Broadhead>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="AmmoCompoundArrowBase" ParentName="NeolithicAmmoBase" Abstract="True">
+		<description>Modern arrows with a strong carbon shaft, designed to be fired from a powerful compound bow.</description>
+		<statBases>
+			<Mass>0.034</Mass>
+			<Bulk>0.08</Bulk>
+			<Flammability>0</Flammability>
+		</statBases>
+		<thingCategories>
+			<li>AmmoArrows</li>
+		</thingCategories>
+		<stackLimit>200</stackLimit>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_FueledSmithy</li>
+			<li>CE_AutoEnableCrafting_ElectricSmithy</li>
+		</tradeTags>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoCompoundArrowBase">
+		<defName>Ammo_CompoundArrow_Broadhead</defName>
+		<label>compound arrow</label>
+		<graphicData>
+			<texPath>ThirdParty/Rimsenal/CompoundArrows</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>1.20</MarketValue>
+		</statBases>
+		<ammoClass>SteelArrow</ammoClass>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<!-- The amount of arrows usable over the ammo lifetime for each resource cost is equal to
+[r / (1 - x)];
+x = preExplosionSpawnChance,
+r = resource cost. -->
+
+	<ThingDef ParentName="BaseArrowProjectile">
+		<defName>Projectile_CompoundArrow_Broadhead</defName>
+		<label>compound arrow</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Plasteel</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Arrow</damageDef>
+			<speed>50</speed>
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationBlunt>2.34</armorPenetrationBlunt>
+			<armorPenetrationSharp>2.5</armorPenetrationSharp>
+			<preExplosionSpawnChance>0.5</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>Ammo_CompoundArrow_Broadhead</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>MakeAmmo_CompoundArrow_Broadhead</defName>
+		<label>make compound arrows x10</label>
+		<description>Craft 10 compound arrows.</description>
+		<jobString>Making compound arrows.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Chemfuel</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Chemfuel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_CompoundArrow_Broadhead>10</Ammo_CompoundArrow_Broadhead>
+		</products>
+		<workAmount>900</workAmount>
+	</RecipeDef>
+
+	<!-- ==================== Thumper Fuel Cell ammoset ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_30x64mmFuel_RSThump</defName>
+		<label>30x64mm Fuel Cell (Thumper)</label>
+		<ammoTypes>
+			<Ammo_30x64mmFuel_Thermobaric>Bullet_30x64mmFuel_RSThump</Ammo_30x64mmFuel_Thermobaric>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base30x64mmFuelBullet">
+		<defName>Bullet_30x64mmFuel_RSThump</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>concussion bolt</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>2.0</explosionRadius>
+			<damageDef>Thump</damageDef>
+			<damageAmountBase>24</damageAmountBase>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+			<soundExplode>ThumpCannon_Impact</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<ai_IsIncendiary>true</ai_IsIncendiary>
+		</projectile>
+	</ThingDef>
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>MakeAmmo_Gun_ThrowingClub</defName>
+		<label>make throwing club x5</label>
+		<description>Craft 5 throwing clubs.</description>
+		<jobString>Making throwing clubs.</jobString>
+		<workAmount>400</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<recipeUsers>
+			<li>CraftingSpot</li>
+		</recipeUsers>
+		<products>
+			<Gun_ThrowingClubs>5</Gun_ThrowingClubs>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>MakeAmmo_Gun_ThrowingAxes</defName>
+		<label>make throwing axe x5</label>
+		<description>Craft 5 throwing axes.</description>
+		<jobString>Making throwing axes.</jobString>
+		<workAmount>900</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<recipeUsers>
+			<li>ElectricSmithy</li>
+			<li>FueledSmithy</li>
+		</recipeUsers>
+		<products>
+			<Gun_ThrowingAxes>5</Gun_ThrowingAxes>
+		</products>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Enhanced Vanilla/Patches/Rimsenal Enhanced Vanilla/Apparel_RS_CE.xml b/ModPatches/Rimsenal Enhanced Vanilla/Patches/Rimsenal Enhanced Vanilla/Apparel_RS_CE.xml
new file mode 100644
index 0000000000..7715c5ef26
--- /dev/null
+++ b/ModPatches/Rimsenal Enhanced Vanilla/Patches/Rimsenal Enhanced Vanilla/Apparel_RS_CE.xml	
@@ -0,0 +1,421 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Tactical "Armor" =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_TacVest" and techLevel="Spacer"]</xpath>
+		<value>
+			<ThingDef ParentName="ApparelMakeableBase">
+				<defName>Apparel_TacArmor</defName>
+				<label>tactical armor</label>
+				<description>An ergonomically designed body armor. This type of armor increase wearer's combat efficiency.</description>
+				<techLevel>Spacer</techLevel>
+				<graphicData>
+					<texPath>Things/Apparel/TacVest</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<statBases>
+					<Mass>6</Mass>
+					<Bulk>6</Bulk>
+					<WornBulk>0</WornBulk>
+					<WorkToMake>15000</WorkToMake>
+					<MaxHitPoints>290</MaxHitPoints>
+					<ArmorRating_Blunt>24</ArmorRating_Blunt>
+					<ArmorRating_Sharp>12</ArmorRating_Sharp>
+					<ArmorRating_Heat>0.25</ArmorRating_Heat>
+					<Insulation_Cold>1</Insulation_Cold>
+					<EquipDelay>4</EquipDelay>
+				</statBases>
+				<equippedStatOffsets>
+					<CarryBulk>10</CarryBulk>
+					<ReloadSpeed>0.10</ReloadSpeed>
+				</equippedStatOffsets>
+				<thingCategories>
+					<li>Apparel</li>
+				</thingCategories>
+				<recipeMaker>
+					<unfinishedThingDef>UnfinishedTechArmor</unfinishedThingDef>
+					<researchPrerequisite>ComplexClothing</researchPrerequisite>
+					<recipeUsers Inherit="False">
+						<li>FabricationBench</li>
+					</recipeUsers>
+					<skillRequirements>
+						<Crafting>7</Crafting>
+					</skillRequirements>
+				</recipeMaker>
+				<costList>
+					<ComponentSpacer>1</ComponentSpacer>
+					<Plasteel>50</Plasteel>
+					<DevilstrandCloth>25</DevilstrandCloth>
+				</costList>
+				<generateCommonality>0.5</generateCommonality>
+				<apparel>
+					<defaultOutfitTags>
+						<li>Soldier</li>
+					</defaultOutfitTags>
+					<bodyPartGroups>
+						<li>Torso</li>
+						<li>Shoulders</li>
+						<li>Neck</li>
+					</bodyPartGroups>
+					<wornGraphicPath>Things/Apparel/TacVest</wornGraphicPath>
+					<layers>
+						<li>Middle</li>
+					</layers>
+					<tags>
+						<li>SpacerMilitary</li>
+					</tags>
+				</apparel>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Apparel_TacArmor"]</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>
+	</Operation>
+
+	<!-- ========== Tactical Helmet =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_TacHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_TacHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_TacHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_TacHelmet"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.50</ArmorRating_Heat>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_TacHelmet"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>15</DevilstrandCloth>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_TacHelmet"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>25</Plasteel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Apparel_TacHelmet"]/apparel/bodyPartGroups/li[.="Neck"]</xpath>
+	</Operation>
+
+	<!-- ========== Exoframe =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_Exoframe"]/statBases</xpath>
+		<value>
+			<Bulk>35</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Exoframe"]/statBases/Mass</xpath>
+		<value>
+			<Mass>10</Mass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Exoframe"]/statBases/WorkToMake</xpath>
+		<value>
+			<WorkToMake>38000</WorkToMake>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Exoframe"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>300</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_Exoframe"]/costList</xpath>
+		<value>
+			<Uranium>10</Uranium>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_Exoframe"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+		</value>
+	</Operation>
+
+	<!-- ========== Protective Gear =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_ProtectiveGear"]/statBases</xpath>
+		<value>
+			<Bulk>80</Bulk>
+			<WornBulk>18</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ProtectiveGear"]/statBases/WorkToMake</xpath>
+		<value>
+			<WorkToMake>42000</WorkToMake>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ProtectiveGear"]/statBases/Mass</xpath>
+		<value>
+			<Mass>18.5</Mass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ProtectiveGear"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ProtectiveGear"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Apparel_ProtectiveGear"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_ProtectiveGear"]/equippedStatOffsets</xpath>
+		<value>
+			<ToxicEnvironmentResistance>0.30</ToxicEnvironmentResistance>
+			<MeleeDodgeChance>-0.25</MeleeDodgeChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_ProtectiveGear"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Apparel_ProtectiveGear"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>1.2</ArmorRating_Sharp>
+						<parts>
+							<li>Torso</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>1.2</ArmorRating_Blunt>
+						<parts>
+							<li>Torso</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.96</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.96</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.96</ArmorRating_Sharp>
+						<parts>
+							<li>Shoulder</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.96</ArmorRating_Blunt>
+						<parts>
+							<li>Shoulder</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.30</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.24</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.12</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Foot</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.30</ArmorRating_Blunt>
+						<parts>
+							<li>Foot</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Protective Helmet =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_ProtectiveHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ProtectiveHelmet"]/statBases/WorkToMake</xpath>
+		<value>
+			<WorkToMake>14000</WorkToMake>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ProtectiveHelmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>4.5</Mass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ProtectiveHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ProtectiveHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>22.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Apparel_ProtectiveHelmet"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Apparel_ProtectiveHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Apparel_ProtectiveHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_ProtectiveHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<ToxicEnvironmentResistance>0.20</ToxicEnvironmentResistance>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+			<AimingAccuracy>-0.2</AimingAccuracy>
+			<MeleeHitChance>-1</MeleeHitChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_ProtectiveHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Apparel_ProtectiveHelmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.85</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.95</ArmorRating_Sharp>
+						<parts>
+							<li>Nose</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.95</ArmorRating_Blunt>
+						<parts>
+							<li>Nose</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Enhanced Vanilla/Patches/Rimsenal Enhanced Vanilla/Weapons_Charge_CE.xml b/ModPatches/Rimsenal Enhanced Vanilla/Patches/Rimsenal Enhanced Vanilla/Weapons_Charge_CE.xml
new file mode 100644
index 0000000000..6024f9c867
--- /dev/null
+++ b/ModPatches/Rimsenal Enhanced Vanilla/Patches/Rimsenal Enhanced Vanilla/Weapons_Charge_CE.xml	
@@ -0,0 +1,424 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Charge Sidearm =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_ChargeSidearm</defName>
+		<statBases>
+			<WorkToMake>17500</WorkToMake>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.37</SwayFactor>
+			<Bulk>2.60</Bulk>
+			<Mass>1.50</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<Plasteel>20</Plasteel>
+			<ComponentIndustrial>8</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_Pistol</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>AdvancedGun</li>
+		</weaponTags>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_ChargeSidearm"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Longgun Melee Tools =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_ScatterCharger" or defName="Gun_ChargeDriver" or defName="Gun_EMPRifle" or defName="Gun_AssaultCharger" or defName="Gun_BurstCharger"]/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>
+
+	<!-- ========== Scatter Charger	=========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_ScatterCharger</defName>
+		<statBases>
+			<WorkToMake>31000</WorkToMake>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.46</SwayFactor>
+			<Bulk>9.60</Bulk>
+			<Mass>5.00</Mass>
+			<RangedWeapon_Cooldown>0.99</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>60</Steel>
+			<Plasteel>30</Plasteel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+			<Chemfuel>5</Chemfuel>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12GaugeCharged</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>16</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>0.85</reloadTime>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<ammoSet>AmmoSet_12GaugeCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>AdvancedGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Charge Driver	=========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_ChargeDriver</defName>
+		<statBases>
+			<WorkToMake>59000</WorkToMake>
+			<SightsEfficiency>2.5</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>2.08</SwayFactor>
+			<Bulk>12.00</Bulk>
+			<Mass>8.00</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>80</Steel>
+			<Plasteel>35</Plasteel>
+			<ComponentIndustrial>10</ComponentIndustrial>
+			<Chemfuel>5</Chemfuel>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12x72mmCharged</defaultProjectile>
+			<warmupTime>2.8</warmupTime>
+			<range>86</range>
+			<soundCast>ChargeLance_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_12x72mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>SniperRifle</li>
+			<li>AdvancedGun</li>
+			<li>Bipod_AMR</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== EMP Rifle	=========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_EMPRifle</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.32</SwayFactor>
+			<Bulk>9.85</Bulk>
+			<Mass>4.80</Mass>
+			<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.44</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>EMP_Blast</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>40</range>
+			<burstShotCount>4</burstShotCount>
+			<ammoConsumedPerShotCount>5</ammoConsumedPerShotCount>
+			<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_LaserEMP_Rimsenal</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>AdvancedGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Assault Charger =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AssaultCharger</defName>
+		<statBases>
+			<WorkToMake>50500</WorkToMake>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.18</SwayFactor>
+			<Bulk>11.00</Bulk>
+			<Mass>6.80</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>75</Steel>
+			<Plasteel>35</Plasteel>
+			<ComponentIndustrial>10</ComponentIndustrial>
+			<Chemfuel>5</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>1.18</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>75</range>
+			<burstShotCount>20</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>ChargeLance_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>15</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_MachineGun</li>
+			<li>CE_AI_Suppressive</li>
+			<li>AdvancedGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Burst Charger =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_BurstCharger</defName>
+		<statBases>
+			<WorkToMake>60500</WorkToMake>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.49</SwayFactor>
+			<Bulk>9.60</Bulk>
+			<Mass>5.30</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>60</Steel>
+			<Plasteel>30</Plasteel>
+			<ComponentIndustrial>11</ComponentIndustrial>
+			<Chemfuel>5</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>1.39</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>ChargeLance_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>AdvancedGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Charge Longgun =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_CFR</defName>
+		<statBases>
+			<WorkToMake>81000</WorkToMake>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.61</SwayFactor>
+			<Bulk>11.45</Bulk>
+			<Mass>4.60</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>60</Steel>
+			<Plasteel>80</Plasteel>
+			<ComponentIndustrial>14</ComponentIndustrial>
+			<Chemfuel>10</Chemfuel>
+			<ComponentSpacer>1</ComponentSpacer>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x50mmCharged</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>62</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_8x50mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>AdvancedGun</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_CFR"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.55</cooldownTime>
+					<chanceFactor>0.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>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>bayonet</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.55</cooldownTime>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<armorPenetrationSharp>24.01</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Enhanced Vanilla/Patches/Rimsenal Enhanced Vanilla/Weapons_RSGuns_CE.xml b/ModPatches/Rimsenal Enhanced Vanilla/Patches/Rimsenal Enhanced Vanilla/Weapons_RSGuns_CE.xml
new file mode 100644
index 0000000000..e16e905197
--- /dev/null
+++ b/ModPatches/Rimsenal Enhanced Vanilla/Patches/Rimsenal Enhanced Vanilla/Weapons_RSGuns_CE.xml	
@@ -0,0 +1,550 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Longgun Melee Tools =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_RSBattleRifle" or defName="Gun_RSCarbine" or defName="Gun_RSAMRifle" or defName="Gun_AutomaticRifle" or defName="Gun_Repeater" or defName="Gun_MilitiaRifle" or defName="Gun_MarksmanRifle" or defName="Gun_RSThumper"]/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>
+
+	<!-- ========== Battle Rifle =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_RSBattleRifle</defName>
+		<statBases>
+			<WorkToMake>32500</WorkToMake>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.44</SwayFactor>
+			<Bulk>10.25</Bulk>
+			<Mass>4.10</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>55</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>2.07</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<range>55</range>
+			<soundCast>RS_ShotBattleRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Carbine =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_RSCarbine</defName>
+		<statBases>
+			<WorkToMake>29000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.03</SwayFactor>
+			<Bulk>6.8</Bulk>
+			<Mass>2.95</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+			<Chemfuel>5</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>1.61</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>0.85</warmupTime>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<range>44</range>
+			<soundCast>RS_ShotCarbine</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>3.8</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Heavy Revolver =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PistolHeavyRevolver</defName>
+		<statBases>
+			<WorkToMake>6000</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.94</SwayFactor>
+			<Bulk>3.81</Bulk>
+			<Mass>2.0</Mass>
+			<RangedWeapon_Cooldown>0.41</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>35</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_500SWMagnum_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>RS_ShotRevolver</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_500SWMagnum</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_Pistol</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_PistolHeavyRevolver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== AM Rifle =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_RSAMRifle</defName>
+		<statBases>
+			<WorkToMake>35000</WorkToMake>
+			<SightsEfficiency>3.0</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.84</SwayFactor>
+			<Bulk>13</Bulk>
+			<Mass>13.5</Mass>
+			<RangedWeapon_Cooldown>0.58</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>105</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>3</warmupTime>
+			<range>86</range>
+			<soundCast>RS_ShotAMRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>15</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>Bipod_AMR</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Gun_RSAMRifle"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<!-- ========== Automatic Rfile =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AutomaticRifle</defName>
+		<statBases>
+			<WorkToMake>39000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>2.11</SwayFactor>
+			<Bulk>12.15</Bulk>
+			<Mass>8.80</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>75</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+			<WoodLog>10</WoodLog>
+		</costList>
+		<Properties>
+			<recoilAmount>1.38</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
+			<warmupTime>1.55</warmupTime>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<range>55</range>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_3006Springfield</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>Tag</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Repeater =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Repeater</defName>
+		<statBases>
+			<WorkToMake>11500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.68</SwayFactor>
+			<Bulk>12.50</Bulk>
+			<Mass>4.30</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>60</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+			<WoodLog>10</WoodLog>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_44-40Winchester_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_Revolver</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_44-40Winchester</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Militia Rifle =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MilitiaRifle</defName>
+		<statBases>
+			<WorkToMake>27000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<Bulk>8.80</Bulk>
+			<Mass>3.47</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>45</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+			<WoodLog>10</WoodLog>
+		</costList>
+		<Properties>
+			<recoilAmount>1.82</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<range>44</range>
+			<soundCast>RS_ShotMilitiaRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Frontier Rifle =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_FR</defName>
+		<statBases>
+			<WorkToMake>17500</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.14</SwayFactor>
+			<Bulk>9.50</Bulk>
+			<Mass>2.70</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>45</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+			<WoodLog>10</WoodLog>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>51</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_FR"]/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>bayonet</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.38</cooldownTime>
+					<armorPenetrationBlunt>1.08</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.72</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Marksman Rifle : NATO SVD=========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MarksmanRifle</defName>
+		<statBases>
+			<WorkToMake>23000</WorkToMake>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.70</SwayFactor>
+			<Bulk>12.25</Bulk>
+			<Mass>4.30</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>60</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+			<WoodLog>10</WoodLog>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<soundCast>Shot_SniperRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_SR</li>
+		</weaponTags>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_RSThumper</defName>
+		<statBases>
+			<Mass>8</Mass>
+			<RangedWeapon_Cooldown>0.43</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.8</SwayFactor>
+			<Bulk>10</Bulk>
+			<WorkToMake>39500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>65</Steel>
+			<Plasteel>30</Plasteel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_30x64mmFuel_RSThump</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>40</range>
+			<burstShotCount>0</burstShotCount>
+			<soundCast>ThumpCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_30x64mmFuel_RSThump</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AOE</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Enhanced Vanilla/Patches/Rimsenal Enhanced Vanilla/Weapons_Ranged_CE.xml b/ModPatches/Rimsenal Enhanced Vanilla/Patches/Rimsenal Enhanced Vanilla/Weapons_Ranged_CE.xml
new file mode 100644
index 0000000000..fb8ae2ee31
--- /dev/null
+++ b/ModPatches/Rimsenal Enhanced Vanilla/Patches/Rimsenal Enhanced Vanilla/Weapons_Ranged_CE.xml	
@@ -0,0 +1,283 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Remove Duplicate Rimsenal Smoke Grenade =========== -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Proj_GrenadeSmoke" and graphicData/texPath="Things/Projectile/SmokeGrenade"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Weapon_GrenadeSmoke" and graphicData/texPath="Things/A16/SmokeGrenades"]</xpath>
+	</Operation>
+
+	<!-- ========== Compound Bow =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Bow_Compound</defName>
+		<statBases>
+			<WorkToMake>22000</WorkToMake>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.6</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>4.5</Bulk>
+			<Mass>1.6</Mass>
+			<RangedWeapon_Cooldown>1.15</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>5</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+			<Chemfuel>15</Chemfuel>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_CompoundArrow_Broadhead</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>26</range>
+			<soundCast>Bow_Large</soundCast>
+		</Properties>
+		<AmmoUser>
+			<ammoSet>AmmoSet_CompoundArrow</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Bow</li>
+		</weaponTags>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bow_Compound"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.76</cooldownTime>
+					<armorPenetrationBlunt>1.76</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Throwing Axe =========== -->
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="Gun_ThrowingAxes"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>BaseWeapon</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Gun_ThrowingAxes"]/costList</xpath>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Gun_ThrowingAxes"]</xpath>
+		<value>
+			<thingCategories>
+				<li>WeaponsRanged</li>
+			</thingCategories>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Gun_ThrowingAxes"]/recipeMaker</xpath>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_ThrowingAxes"]/label</xpath>
+		<value>
+			<label>Throwing axe</label>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_ThrowingAxes"]/statBases</xpath>
+		<value>
+			<statBases>
+				<SightsEfficiency>1.0</SightsEfficiency>
+				<ShotSpread>0.6</ShotSpread>
+				<SwayFactor>2</SwayFactor>
+				<Bulk>1.25</Bulk>
+				<Mass>0.75</Mass>
+				<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
+			</statBases>
+			<stackLimit>25</stackLimit>
+			<tradeTags>
+				<li>CE_AutoEnableTrade</li>
+				<li>CE_AutoEnableCrafting</li>
+			</tradeTags>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_ThrowingAxes"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Axe_Thrown</defaultProjectile>
+					<warmupTime>1.5</warmupTime>
+					<range>16</range>
+					<soundCast>Interact_BeatFire</soundCast>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_ThrowingAxes"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.4</cooldownTime>
+					<armorPenetrationBlunt>0.375</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.62</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.25</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Throwing Club =========== -->
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="Gun_ThrowingClubs"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>BaseWeapon</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Gun_ThrowingClubs"]/costList</xpath>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Gun_ThrowingClubs"]/recipeMaker</xpath>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Gun_ThrowingClubs"]</xpath>
+		<value>
+			<techLevel>Neolithic</techLevel>
+			<thingCategories>
+				<li>WeaponsRanged</li>
+			</thingCategories>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_ThrowingClubs"]/label</xpath>
+		<value>
+			<label>Throwing club</label>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_ThrowingClubs"]/statBases</xpath>
+		<value>
+			<statBases>
+				<SightsEfficiency>1.0</SightsEfficiency>
+				<ShotSpread>0.6</ShotSpread>
+				<SwayFactor>2</SwayFactor>
+				<Bulk>1</Bulk>
+				<Mass>0.5</Mass>
+				<RangedWeapon_Cooldown>1.3</RangedWeapon_Cooldown>
+			</statBases>
+			<stackLimit>25</stackLimit>
+			<tradeTags>
+				<li>CE_AutoEnableTrade</li>
+				<li>CE_AutoEnableCrafting_CraftingSpot</li>
+			</tradeTags>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_ThrowingClubs"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Club_Thrown</defaultProjectile>
+					<warmupTime>1.5</warmupTime>
+					<range>16</range>
+					<soundCast>Interact_BeatFire</soundCast>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_ThrowingClubs"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.69</cooldownTime>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>3.29</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>3.2</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== No Blowgun (Yet) =========== -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Gun_Blowgun"]</xpath>
+	</Operation>
+
+	<!--			
+<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>Gun_Blowgun</defName>
+	<statBases>
+		<WorkToMake>600</WorkToMake>
+		<SightsEfficiency>0.7</SightsEfficiency>
+		<ShotSpread>0.6</ShotSpread>
+		<SwayFactor>2.5</SwayFactor>
+		<Bulk>2</Bulk>
+		<Mass>1</Mass>
+		<RangedWeapon_Cooldown>4</RangedWeapon_Cooldown>
+	</statBases>
+	<costList>
+		<Wood>20</Wood>
+	</costList>
+	<Properties>				
+		<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+		<hasStandardCommand>true</hasStandardCommand>
+		<defaultProjectile>Projectile_Blowdart</defaultProjectile>
+		<warmupTime>1</warmupTime>
+		<range>22</range>
+		<soundCast>Beat_Fire</soundCast>
+	</Properties>
+	<AmmoUser>
+		<ammoSet>AmmoSet_Blowdart</ammoSet>
+	</AmmoUser>
+	<FireModes>
+		<aiAimMode>AimedShot</aiAimMode>
+	</FireModes>
+	<weaponTags>
+	<li>CE_Bow</li>
+	</weaponTags>
+</li>
+
+-->
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Enhanced Vanilla/Patches/Rimsenal Enhanced Vanilla/Weapons_Smart_CE.xml b/ModPatches/Rimsenal Enhanced Vanilla/Patches/Rimsenal Enhanced Vanilla/Weapons_Smart_CE.xml
new file mode 100644
index 0000000000..a98332c6bf
--- /dev/null
+++ b/ModPatches/Rimsenal Enhanced Vanilla/Patches/Rimsenal Enhanced Vanilla/Weapons_Smart_CE.xml	
@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Melee Tools =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_SmartRifle" or defName="Gun_SMG" or defName="SmartMG" or defName="Gun_SmartSniperRifle"]/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>
+
+	<!-- ========== Stats =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="Gun_SmartPistol" or
+			defName="Gun_SmartRifle" or
+			defName="Gun_SMG" or
+			defName="SmartMG" or
+			defName="Gun_SmartSniperRifle"
+			]/statBases </xpath>
+		<value>
+			<NightVisionEfficiency_Weapon>1</NightVisionEfficiency_Weapon>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="Gun_SmartPistol" or
+			defName="Gun_SmartRifle" or
+			defName="Gun_SMG" or
+			defName="SmartMG" or
+			defName="Gun_SmartSniperRifle"
+			]/equippedStatOffsets </xpath>
+		<value>
+			<AimingAccuracy>0.5</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!-- ========== Smart Rifle =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SmartRifle</defName>
+		<statBases>
+			<WorkToMake>39500</WorkToMake>
+			<SightsEfficiency>1.8</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.34</SwayFactor>
+			<Bulk>9.00</Bulk>
+			<Mass>3.40</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.97</recoilAmount><!--Halved from 1.93-->
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>0.9</warmupTime>
+			<range>62</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>RS_ShotSmartRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>24</magazineSize>
+			<reloadTime>3.0</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_Rifle</li>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>AdvancedGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Smart Pistol =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SmartPistol</defName>
+		<statBases>
+			<WorkToMake>11500</WorkToMake>
+			<SightsEfficiency>0.9</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>0.61</SwayFactor><!--50% reduction from 1.12-->
+			<Bulk>2.10</Bulk>
+			<Mass>1.25</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
+			<warmupTime>0.4</warmupTime>
+			<range>21</range>
+			<soundCast>RS_ShotSmartPistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>18</magazineSize>
+			<reloadTime>3.0</reloadTime>
+			<ammoSet>AmmoSet_FN57x28mm</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_Pistol</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>AdvancedGun</li>
+		</weaponTags>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_SmartPistol"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Smart SMG =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SMG</defName>
+		<statBases>
+			<WorkToMake>37000</WorkToMake>
+			<SightsEfficiency>1.2</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.72</SwayFactor>
+			<Bulk>4.20</Bulk>
+			<Mass>3.0</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.7</recoilAmount><!--Halved from 1.40-->
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
+			<warmupTime>0.4</warmupTime>
+			<range>28</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<soundCast>RS_ShotSmartSMG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>36</magazineSize>
+			<reloadTime>3.0</reloadTime>
+			<ammoSet>AmmoSet_FN57x28mm</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>AdvancedGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Smart MG =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>SmartMG</defName>
+		<statBases>
+			<WorkToMake>44000</WorkToMake>
+			<SightsEfficiency>1.2</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.60</SwayFactor>
+			<Bulk>14.05</Bulk>
+			<Mass>10.50</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.67</recoilAmount><!--Halved from 1.33-->
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>68</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>RS_ShotSmartMG</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>6.8</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_MachineGun</li>
+			<li>CE_AI_Suppressive</li>
+			<li>AdvancedGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Smart Sniper Rifle =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SmartSniperRifle</defName>
+		<statBases>
+			<WorkToMake>42500</WorkToMake>
+			<SightsEfficiency>5</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.41</SwayFactor><!--25% reduction from 1.88-->
+			<Bulk>10.20</Bulk>
+			<Mass>7.6</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
+			<warmupTime>1.6</warmupTime>
+			<range>86</range>
+			<soundCast>RS_ShotSSR</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>3.0</reloadTime>
+			<ammoSet>AmmoSet_338Lapua</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Rifle</li>
+			<li>AdvancedGun</li>
+		</weaponTags>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Factions/Patches/Rimsenal Factions/PawnKinds.xml b/ModPatches/Rimsenal Factions/Patches/Rimsenal Factions/PawnKinds.xml
new file mode 100644
index 0000000000..f6557e9dcd
--- /dev/null
+++ b/ModPatches/Rimsenal Factions/Patches/Rimsenal Factions/PawnKinds.xml	
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === Deserters === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="CD_Recruit" or
+			defName="CD_Soldier" or
+			defName="CD_Elite" or
+			defName="CD_Officer" or
+			defName="CD_Leader"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Greydale === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="GD_Grunt_Pistol"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="GD_Defender_Rifle" or
+			defName="GD_Defender_Scout" or
+			@Name="GD_ProtectorBase"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="GD_EliteBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>7</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>200</min>
+							<max>800</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>GD_Knife</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="GD_Defender_Grenadier" or
+			defName="GD_Protector_Grenadier" or
+			defName="GD_Defender_Scout" or
+			defName="GD_Protector_Sapper"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>12</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Jotun === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="JI_Recruit"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="JI_Soldier" or
+			defName="JI_Elite" or
+			defName="JI_Officer" or
+			defName="JI_Leader"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="JI_Sapper"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>12</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Tisiphone === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="TE_Recruit"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="TE_Soldier" or
+			defName="TE_Elite" or
+			defName="TE_Officer" or
+			defName="TE_Leader"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>7</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === YeonHwa === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="YP_Recruit"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>4</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="YP_Soldier" or
+			defName="YP_Elite" or
+			defName="YP_Officer" or
+			defName="YP_Leader"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="YP_Microwave"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>12</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml b/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml
new file mode 100644
index 0000000000..93e0e21e48
--- /dev/null
+++ b/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml	
@@ -0,0 +1,313 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ==========  Harvester Cannon =========== -->
+
+	<ThingDef ParentName="Base40x365mmBoforsBullet">
+		<defName>Bullet_HarvesterCannon</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>energy bolt</label>
+		<graphicData>
+			<texPath>Things/Projectile/Laser</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Optic</damageDef>
+			<speed>106</speed>
+			<dropsCasings>false</dropsCasings>
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationBlunt>5</armorPenetrationBlunt>
+			<armorPenetrationSharp>14</armorPenetrationSharp>
+			<explosionRadius>1</explosionRadius>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==========  Plasma Bombard Projectile =========== -->
+
+	<ThingDef ParentName="BaseExplosiveBullet">
+		<defName>Bullet_PlasmaTurretBombard</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>energy bolt</label>
+		<graphicData>
+			<texPath>Things/Projectile/Plasma</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Plasma</damageDef>
+			<speed>0</speed>
+			<flyOverhead>true</flyOverhead>
+			<dropsCasings>false</dropsCasings>
+			<damageAmountBase>25</damageAmountBase>
+			<armorPenetrationBlunt>5</armorPenetrationBlunt>
+			<armorPenetrationSharp>14</armorPenetrationSharp>
+			<explosionRadius>2.5</explosionRadius>
+			<gravityFactor>5</gravityFactor>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==========  Crucible Cannon Projectile =========== -->
+
+	<ThingDef ParentName="Base40x365mmBoforsBullet">
+		<defName>Bullet_CrucibleCannon</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>energy bolt</label>
+		<graphicData>
+			<texPath>Things/Projectile/Mlaser</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Optic</damageDef>
+			<speed>98</speed>
+			<dropsCasings>false</dropsCasings>
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationBlunt>5</armorPenetrationBlunt>
+			<armorPenetrationSharp>20</armorPenetrationSharp>
+			<explosionRadius>1</explosionRadius>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==========  Mech Plasma Bombard Projectile =========== -->
+
+	<ThingDef ParentName="BaseExplosiveBullet">
+		<defName>Bullet_PlasmaMechBombard</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>energy bolt</label>
+		<graphicData>
+			<texPath>Things/Projectile/MFlux</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Plasma</damageDef>
+			<speed>63</speed>
+			<dropsCasings>false</dropsCasings>
+			<damageAmountBase>50</damageAmountBase>
+			<armorPenetrationBlunt>5</armorPenetrationBlunt>
+			<armorPenetrationSharp>14</armorPenetrationSharp>
+			<explosionRadius>4</explosionRadius>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==========  Plasma Rifle Projectile =========== -->
+
+	<ThingDef ParentName="Base556x45mmNATOBullet">
+		<defName>Bullet_PlasmaRifle</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>plasma sphere</label>
+		<graphicData>
+			<texPath>Things/Projectile/Plasma</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Plasma</damageDef>
+			<speed>54</speed>
+			<dropsCasings>false</dropsCasings>
+			<damageAmountBase>25</damageAmountBase>
+			<armorPenetrationBlunt>5</armorPenetrationBlunt>
+			<armorPenetrationSharp>16</armorPenetrationSharp>
+			<explosionRadius>1.5</explosionRadius>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==========  EMP Bomb Projectile =========== -->
+
+	<ThingDef ParentName="BaseExplosiveBullet">
+		<defName>Bullet_EMPBomb</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>EMP</label>
+		<graphicData>
+			<texPath>Things/A16/MechPlasma</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>EMP</damageDef>
+			<speed>43</speed>
+			<dropsCasings>false</dropsCasings>
+			<damageAmountBase>100</damageAmountBase>
+			<armorPenetrationBase>0.5</armorPenetrationBase>
+			<explosionRadius>5.5</explosionRadius>
+			<explosionDelay>20</explosionDelay>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==========  Auxiliary Pistol Projectile =========== -->
+
+	<ThingDef ParentName="Base45ACPBullet">
+		<defName>Bullet_AuxiliaryPistol</defName>
+		<label>energy bolt</label>
+		<graphicData>
+			<texPath>Things/Projectile/Laser</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Optic</damageDef>
+			<speed>90</speed>
+			<dropsCasings>false</dropsCasings>
+			<damageAmountBase>8</damageAmountBase>
+			<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==========  Makeshift Crucible Rifle Projectile =========== -->
+
+	<ThingDef ParentName="Base556x45mmNATOBullet">
+		<defName>Bullet_MakeshiftCrucibleRifle</defName>
+		<label>energy bolt</label>
+		<graphicData>
+			<texPath>Things/Projectile/Laser</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Optic</damageDef>
+			<speed>90</speed>
+			<dropsCasings>false</dropsCasings>
+			<damageAmountBase>13</damageAmountBase>
+			<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+			<armorPenetrationSharp>10</armorPenetrationSharp>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==========  Crucible Rifle Projectile =========== -->
+
+	<ThingDef ParentName="Base556x45mmNATOBullet">
+		<defName>Bullet_CrucibleRifle</defName>
+		<label>energy bolt</label>
+		<graphicData>
+			<texPath>Things/Projectile/Laser</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Optic</damageDef>
+			<speed>90</speed>
+			<dropsCasings>false</dropsCasings>
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationBlunt>3</armorPenetrationBlunt>
+			<armorPenetrationSharp>12</armorPenetrationSharp>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==========  Crucible Pistol Projectile =========== -->
+
+	<ThingDef ParentName="Base45ACPBullet">
+		<defName>Bullet_CruciblePistol</defName>
+		<label>energy bolt</label>
+		<graphicData>
+			<texPath>Things/Projectile/Laser</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Optic</damageDef>
+			<speed>90</speed>
+			<dropsCasings>false</dropsCasings>
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+			<armorPenetrationSharp>10</armorPenetrationSharp>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==========  Heat Cannon Projectile =========== -->
+
+	<ThingDef ParentName="Base40x365mmBoforsBullet">
+		<defName>Bullet_HeatCannon</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>heat bolt</label>
+		<graphicData>
+			<texPath>Things/Projectile/Pulse</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Flame</damageDef>
+			<speed>90</speed>
+			<dropsCasings>false</dropsCasings>
+			<damageAmountBase>5</damageAmountBase>
+			<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+			<armorPenetrationSharp>9</armorPenetrationSharp>
+			<explosionRadius>0.5</explosionRadius>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==========  Crucible Precision Rifle Projectile =========== -->
+
+	<ThingDef ParentName="Base556x45mmNATOBullet">
+		<defName>Bullet_CruciblePrecisionRifle</defName>
+		<label>energy bolt</label>
+		<graphicData>
+			<texPath>Things/Projectile/Laser</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Optic</damageDef>
+			<speed>90</speed>
+			<dropsCasings>false</dropsCasings>
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+			<armorPenetrationSharp>10</armorPenetrationSharp>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==========  Plasma Caster Projectile =========== -->
+
+	<ThingDef ParentName="Base40x365mmBoforsBullet">
+		<defName>Bullet_PlasmaCaster</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>plasma sphere</label>
+		<graphicData>
+			<texPath>Things/Projectile/Flux</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Plasma</damageDef>
+			<speed>32</speed>
+			<dropsCasings>false</dropsCasings>
+			<damageAmountBase>25</damageAmountBase>
+			<armorPenetrationBlunt>30</armorPenetrationBlunt>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+			<explosionRadius>2.5</explosionRadius>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==========  Plasma Bomb Projectile =========== -->
+
+	<ThingDef ParentName="Base40x365mmBoforsBullet">
+		<defName>Bullet_PlasmaBomb</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>plasma bomb</label>
+		<graphicData>
+			<texPath>Things/Projectile/Flux</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Plasma</damageDef>
+			<speed>43</speed>
+			<dropsCasings>false</dropsCasings>
+			<damageAmountBase>100</damageAmountBase>
+			<armorPenetrationBase>0.5</armorPenetrationBase>
+			<explosionRadius>4</explosionRadius>
+			<explosionDelay>20</explosionDelay>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==========  Crucible Carbine Projectile =========== -->
+
+	<ThingDef ParentName="Base556x45mmNATOBullet">
+		<defName>Bullet_CrucibleCarbine</defName>
+		<label>energy bolt</label>
+		<graphicData>
+			<texPath>Things/Projectile/Laser</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Optic</damageDef>
+			<speed>90</speed>
+			<dropsCasings>false</dropsCasings>
+			<damageAmountBase>8</damageAmountBase>
+			<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+			<armorPenetrationSharp>9</armorPenetrationSharp>
+		</projectile>
+	</ThingDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/Bodies/Bodies_FederatorMech.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/Bodies/Bodies_FederatorMech.xml
new file mode 100644
index 0000000000..6b674fecb6
--- /dev/null
+++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/Bodies/Bodies_FederatorMech.xml	
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Mechsuit-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Mechsuit"]/corePart</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<!--Neck Parts-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Mechsuit"]/corePart/parts/li[def = "MechNeck"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Mechsuit"]/corePart/parts/li[def = "MechNeck"]/parts/li[def = "MechHead"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!--Arm Parts-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Mechsuit"]/corePart/parts/li[def = "MechShoulder"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Mechsuit"]/corePart/parts/li[def = "MechShoulder"]/parts/li[def = "MechArm"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Mechsuit"]/corePart/parts/li[def = "MechShoulder"]/parts/li[def = "MechArm"]/parts/li[def="MechHand"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Mechsuit"]/corePart/parts/li[def = "MechShoulder"]/parts/li[def = "MechArm"]/parts/li[def="MechHand"]/parts/li[def="MechFinger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!--Leg Parts-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Mechsuit"]/corePart/parts/li[def = "MechLeg"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Mechsuit"]/corePart/parts/li[def = "MechLeg"]/parts/li[def="MechFoot"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/Bodies/Bodies_SeekerMech.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/Bodies/Bodies_SeekerMech.xml
new file mode 100644
index 0000000000..cff42def62
--- /dev/null
+++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/Bodies/Bodies_SeekerMech.xml	
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Mechsuit-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Biodrone"]/corePart</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<!--Neck Parts-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Biodrone"]/corePart/parts/li[def = "MechNeck"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Biodrone"]/corePart/parts/li[def = "MechNeck"]/parts/li[def = "MechHead"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!--Arm Parts-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Biodrone"]/corePart/parts/li[def = "MechShoulder"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Biodrone"]/corePart/parts/li[def = "MechShoulder"]/parts/li[def = "MechArm"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Biodrone"]/corePart/parts/li[def = "MechShoulder"]/parts/li[def = "MechArm"]/parts/li[def="MechHand"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Biodrone"]/corePart/parts/li[def = "MechShoulder"]/parts/li[def = "MechArm"]/parts/li[def="MechHand"]/parts/li[def="MechFinger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!--Leg Parts-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Biodrone"]/corePart/parts/li[def = "MechEngine"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Biodrone"]/corePart/parts/li[def = "MechEngine"]/parts/li[def="MechThruster"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/PawnKindDefs/PawnKinds_Federation.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/PawnKindDefs/PawnKinds_Federation.xml
new file mode 100644
index 0000000000..8c54355cee
--- /dev/null
+++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/PawnKindDefs/PawnKinds_Federation.xml	
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Auxiliary ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FPCAuxiliary"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Commander ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FPCCommander"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Assassin ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FPCAssassin"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<magazineCount>
+							<min>1</min>
+							<max>5</max>
+						</magazineCount>
+						<generateChance>0.7</generateChance>
+						<sidearmMoney>
+							<min>275</min>
+							<max>525</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>FedCC</li>
+							<li>AuxPistol</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Unity Guard ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FPCUnityGuard"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<magazineCount>
+							<min>2</min>
+							<max>5</max>
+						</magazineCount>
+						<generateChance>0.7</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>450</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>FedCC</li>
+							<li>AuxPistol</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_Apparel.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_Apparel.xml
new file mode 100644
index 0000000000..9ee7cb3d9d
--- /dev/null
+++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_Apparel.xml	
@@ -0,0 +1,539 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==========  Federation Undersuit =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="FedSuit"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="FedSuit"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>5</CarryBulk>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="FedSuit"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Feet</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FedSuit"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="FedSuit"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>0.8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ========== Riot Armor =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Judicator"]/statBases/Mass</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<Mass>60</Mass>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_Judicator"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>80</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_Judicator"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Judicator"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>28</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.75</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Judicator"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>28</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Judicator"]/costList/Foerum</xpath>
+		<value>
+			<Foerum>190</Foerum>
+			<DevilstrandCloth>30</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Apparel_Judicator"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Riot Helmet =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_JudicatorH"]/statBases/Mass</xpath>
+		<value>
+			<Mass>5</Mass>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_JudicatorH"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>28</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.70</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_JudicatorH"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>28</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Apparel_JudicatorH"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Apparel_JudicatorH"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_JudicatorH"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_JudicatorH"]/costList/Foerum</xpath>
+		<value>
+			<Foerum>70</Foerum>
+			<DevilstrandCloth>10</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_JudicatorH"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Apparel_JudicatorH"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.7</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+							<li>Jaw</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.7</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+							<li>Jaw</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Marksman Armor =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MarksmanGear"]/statBases/Mass</xpath>
+		<value>
+			<Mass>15</Mass>
+			<Bulk>40</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_MarksmanGear"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>20</CarryWeight>
+			<CarryBulk>15</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_MarksmanGear"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MarksmanGear"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.30</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MarksmanGear"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Apparel_MarksmanGear"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>1.80</ArmorRating_Sharp>
+						<parts>
+							<li>Torso</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>2.0</ArmorRating_Blunt>
+						<parts>
+							<li>Torso</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.50</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.50</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Foot</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Foot</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Marksman Helmet =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_MarksmanGearH"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.9</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MarksmanGearH"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.20</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_MarksmanGearH"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_MarksmanGearH"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-0.75</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_MarksmanGearH"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Unity Guard Armor =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_UGCuirass"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_UGCuirass"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<CarryBulk>10</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_UGCuirass"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_UGCuirass"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.30</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_UGCuirass"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Apparel_UGCuirass"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+							<li>Shoulder</li>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+							<li>Shoulder</li>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Unity Guard Helmet =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_UGHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1.6</WornBulk>
+			<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_UGHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>11</ArmorRating_Sharp>
+			<ArmorRating_Electric>0.30</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_UGHelmet"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_UGHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Unity Guard Cloak =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_UGCloak"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- ========== Foerum Material =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Foerum"]/statBases</xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Foerum"]/stuffProps/categories</xpath>
+		<value>
+			<li>Metallic_Weapon</li>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Foerum"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>2</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Foerum"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.8</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Foerum"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
+			<StuffPower_Armor_Electric>0.05</StuffPower_Armor_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Foerum"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>0.8</Mass>
+			<MeleePenetrationFactor>1.3</MeleePenetrationFactor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Foerum"]/statBases/SharpDamageMultiplier</xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_DamageDefs.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_DamageDefs.xml
new file mode 100644
index 0000000000..27e11b6c05
--- /dev/null
+++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_DamageDefs.xml	
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/DamageDef[defName="Optic"]</xpath>
+		<value>
+			<li Class="CombatExtended.DamageDefExtensionCE">
+				<isAmbientDamage>true</isAmbientDamage>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/DamageDef[defName="Plasma"]</xpath>
+		<value>
+			<li Class="CombatExtended.DamageDefExtensionCE">
+				<isAmbientDamage>true</isAmbientDamage>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_Explosives.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_Explosives.xml
new file mode 100644
index 0000000000..6b49ef3d95
--- /dev/null
+++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_Explosives.xml	
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === Repose Plasma Grenade === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Proj_Repose"]</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Proj_Repose"]/graphicData/texPath</xpath>
+		<value>
+			<texPath>Things/Projectile/Repose</texPath>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Proj_Repose"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<explosionRadius>1</explosionRadius>
+				<damageDef>Plasma</damageDef>
+				<damageAmountBase>65</damageAmountBase>
+				<explosionDelay>100</explosionDelay>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Proj_Repose"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Proj_Repose"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Proj_Repose"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AD_FedPlasmaGrenades"]/label</xpath>
+		<value>
+			<label>plasma grenade</label>
+		</value>
+	</Operation>
+
+	<!-- Change TickerType.-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AD_FedPlasmaGrenades"]</xpath>
+		<value>
+			<tickerType>Normal</tickerType>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AD_FedPlasmaGrenades"]/graphicData</xpath>
+		<value>
+			<graphicData>
+				<texPath>Things/Projectile/Repose</texPath>
+				<graphicClass>Graphic_Single</graphicClass>
+				<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
+			</graphicData>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AD_FedPlasmaGrenades"]</xpath>
+		<value>
+			<thingClass>CombatExtended.AmmoThing</thingClass>
+			<stackLimit>75</stackLimit>
+			<resourceReadoutPriority>First</resourceReadoutPriority>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AD_FedPlasmaGrenades"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AD_FedPlasmaGrenades"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AD_FedPlasmaGrenades"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>40</damageAmountBase>
+				<explosiveDamageType>Plasma</explosiveDamageType>
+				<explosiveRadius>1</explosiveRadius>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AD_FedPlasmaGrenades</defName>
+		<statBases>
+			<Mass>0.45</Mass>
+			<MarketValue>8.25</MarketValue>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<label>throw plasma grenade</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<range>12.0</range>
+			<minRange>3</minRange>
+			<warmupTime>0.8</warmupTime>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<soundCast>ThrowGrenade</soundCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<defaultProjectile>Proj_Repose</defaultProjectile>
+			<onlyManualCast>true</onlyManualCast>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<weaponTags>
+			<li>FedGrenade</li>
+			<li>CE_AI_Grenade</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Plasma Bomb Vest === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_PBomb"]</xpath>
+		<value>
+			<ThingDef ParentName="BaseGrenadeProjectile">
+				<defName>Bullet_PBomb</defName>
+				<label>fusion device</label>
+				<graphicData>
+					<texPath>Things/A16/MechPlasma</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<projectile Class="CombatExtended.ProjectilePropertiesCE">
+					<explosionRadius>12</explosionRadius>
+					<damageDef>Plasma</damageDef>
+					<explosionDamageFalloff>true</explosionDamageFalloff>
+					<damageAmountBase>100</damageAmountBase>
+					<explosionDelay>0</explosionDelay>
+					<soundExplode>Explosion_GiantBomb</soundExplode>
+					<dropsCasings>false</dropsCasings>
+				</projectile>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AD_PBomb"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<Suppressability>-10.00</Suppressability>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AD_PBomb"]</xpath>
+		<value>
+			<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGrenadeEquipment">
+				<defName>AD_PBomb</defName>
+				<equipmentType>Primary</equipmentType>
+				<label>plasma bomb</label>
+				<techLevel>Spacer</techLevel>
+				<description>A portable plasma reactor converted to suicide bombing.</description>
+				<graphicData>
+					<texPath>Things/A16/PBomb</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<soundInteract>Interact_Grenade</soundInteract>
+				<statBases>
+					<MarketValue>400</MarketValue>
+					<SightsEfficiency>1</SightsEfficiency>
+					<RangedWeapon_Cooldown>0.1</RangedWeapon_Cooldown>
+				</statBases>
+				<weaponTags>
+					<li>FedBomb</li>
+				</weaponTags>
+				<thingCategories>
+					<li>Grenades</li>
+				</thingCategories>
+				<verbs>
+					<li Class="CombatExtended.VerbPropertiesCE">
+						<label>detonate suicide vest</label>
+						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<range>2</range>
+						<warmupTime>0.1</warmupTime>
+						<noiseRadius>4</noiseRadius>
+						<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+						<soundCast>ThrowGrenade</soundCast>
+						<targetParams>
+							<canTargetLocations>true</canTargetLocations>
+						</targetParams>
+						<defaultProjectile>Bullet_PBomb</defaultProjectile>
+						<onlyManualCast>true</onlyManualCast>
+						<ignorePartialLoSBlocker>false</ignorePartialLoSBlocker>
+					</li>
+				</verbs>
+				<comps>
+					<li Class="CombatExtended.CompProperties_ExplosiveCE">
+						<damageAmountBase>400</damageAmountBase>
+						<explosiveDamageType>Plasma</explosiveDamageType>
+						<explosiveRadius>12</explosiveRadius>
+						<explosionSound>Explosion_GiantBomb</explosionSound>
+					</li>
+				</comps>
+			</ThingDef>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_MechWeapons.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_MechWeapons.xml
new file mode 100644
index 0000000000..a4d99127aa
--- /dev/null
+++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_MechWeapons.xml	
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==========  AD Plasma Bombard  =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AD_PlasmaBombard</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.10</ShotSpread>
+			<SwayFactor>0.91</SwayFactor>
+			<Bulk>30</Bulk>
+			<Mass>25</Mass>
+			<RangedWeapon_Cooldown>5</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_PlasmaMechBombard</defaultProjectile>
+			<warmupTime>4</warmupTime>
+			<range>56</range>
+			<soundCast>RS_ShotHarmonizer</soundCast>
+			<muzzleFlashScale>17</muzzleFlashScale>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ==========  AD Crucible Cannon  =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AD_CrucibleCannon</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.21</SwayFactor>
+			<Bulk>28.00</Bulk>
+			<Mass>24.00</Mass>
+			<RangedWeapon_Cooldown>8</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.18</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_CrucibleCannon</defaultProjectile>
+			<warmupTime>2.6</warmupTime>
+			<burstShotCount>13</burstShotCount>
+			<ticksBetweenBurstShots>22</ticksBetweenBurstShots>
+			<range>75</range>
+			<soundCast>RS_ShotCR</soundCast>
+		</Properties>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_MeleeWeapons.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_MeleeWeapons.xml
new file mode 100644
index 0000000000..8542a5f8ba
--- /dev/null
+++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_MeleeWeapons.xml	
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- 'Verdict' Concussion Baton -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AD_ConcussionBaton" or defName="AD_FedConcussionBaton"]/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>shaft</label>
+					<labelUsedInLogging>false</labelUsedInLogging>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>0.63</cooldownTime>
+					<armorPenetrationBlunt>5.625</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AD_ConcussionBaton"]/statBases</xpath>
+		<value>
+			<Bulk>2.5</Bulk>
+			<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AD_ConcussionBaton"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.42</MeleeCritChance>
+				<MeleeParryChance>0.24</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<!--Since both bions are the same race, we'll buff the AI only weapon to boost the melee stats, since the melee one does visibly have a shield-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AD_FedConcussionBaton"]/statBases</xpath>
+		<value>
+			<Bulk>2.5</Bulk>
+			<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AD_FedConcussionBaton"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.4</MeleeCritChance>
+				<MeleeParryChance>1.2</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AD_ConcussionBaton"]/weaponTags</xpath>
+		<value>
+			<li>CE_OnehandedWeapon</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_RangedWeapons.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_RangedWeapons.xml
new file mode 100644
index 0000000000..ada89a9e17
--- /dev/null
+++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_RangedWeapons.xml	
@@ -0,0 +1,507 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Remove EMP Device  =========== -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="AD_EMB"]</xpath>
+	</Operation>
+
+	<!-- ========== Melee Tools  =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="AD_CruciblePistol" or
+			defName="AD_FedPistol" or
+			defName="AD_AuxPistol"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="AD_HeatProjector" or
+			defName="AD_FedHeatCannon" or
+			defName="AD_CruciblePresicionRifle" or
+			defName="AD_FedSniperRifle" or
+			defName="AD_CrucibleRifle" or
+			defName="AD_FedRifle" or
+			defName="AD_PlasmaCaliver" or
+			defName="AD_FedPlasmaCaster" or
+			defName="AD_CrucibleCarbine" or
+			defName="Gun_MCrucibleRifle" or
+			defName="AD_Sentinel"
+			]/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>
+
+	<!-- Aux Weapons -->
+
+	<!-- ==========  Aux Plasma Rifle  =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AD_Sentinel</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.34</SwayFactor>
+			<Bulk>10.80</Bulk>
+			<Mass>5.60</Mass>
+			<RangedWeapon_Cooldown>0.75</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.48</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_PlasmaRifle</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>RS_ShotCR</soundCast>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+		</Properties>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ==========  Aux Pistol  =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AD_AuxPistol</defName>
+		<statBases>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<Bulk>2.50</Bulk>
+			<Mass>1.60</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_AuxiliaryPistol</defaultProjectile>
+			<warmupTime>0.55</warmupTime>
+			<burstShotCount>2</burstShotCount>
+			<ticksBetweenBurstShots>25</ticksBetweenBurstShots>
+			<range>18</range>
+			<soundCast>RS_ShotCP</soundCast>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ==========  Makeshift Crucible Rifle  =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_MCrucibleRifle</defName>
+		<statBases>
+			<WorkToMake>20000</WorkToMake>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.34</SwayFactor>
+			<Bulk>9.90</Bulk>
+			<Mass>4.20</Mass>
+			<RangedWeapon_Cooldown>1.15</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.56</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_MakeshiftCrucibleRifle</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>RS_ShotCP</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<FireModes/>
+	</Operation>
+
+	<!-- ==========  AD Crucible Rifle  =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AD_CrucibleRifle</defName>
+		<statBases>
+			<WorkToMake>52000</WorkToMake>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.44</SwayFactor>
+			<Bulk>9.50</Bulk>
+			<Mass>4.80</Mass>
+			<RangedWeapon_Cooldown>0.95</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.56</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_CrucibleRifle</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>25</ticksBetweenBurstShots>
+			<range>55</range>
+			<soundCast>RS_ShotCR</soundCast>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AD_FedRifle</defName>
+		<statBases>
+			<WorkToMake>52000</WorkToMake>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.44</SwayFactor>
+			<Bulk>9.50</Bulk>
+			<Mass>4.80</Mass>
+			<RangedWeapon_Cooldown>0.95</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.56</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_CrucibleRifle</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>18</ticksBetweenBurstShots>
+			<range>55</range>
+			<soundCast>RS_ShotCR</soundCast>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ==========  AD Crucible Pistol  =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AD_CruciblePistol</defName>
+		<statBases>
+			<WorkToMake>30500</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>1.08</SwayFactor>
+			<Bulk>3.90</Bulk>
+			<Mass>2.40</Mass>
+			<RangedWeapon_Cooldown>0.75</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.78</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_CruciblePistol</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>20</ticksBetweenBurstShots>
+			<range>12</range>
+			<soundCast>RS_ShotCP</soundCast>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AD_FedPistol</defName>
+		<statBases>
+			<WorkToMake>30500</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>1.08</SwayFactor>
+			<Bulk>3.90</Bulk>
+			<Mass>2.40</Mass>
+			<RangedWeapon_Cooldown>0.75</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.78</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_CruciblePistol</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>20</ticksBetweenBurstShots>
+			<range>12</range>
+			<soundCast>RS_ShotCP</soundCast>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ==========  AD Heat Cannon  =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AD_HeatProjector</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.24</ShotSpread>
+			<SwayFactor>1.48</SwayFactor>
+			<Bulk>12.70</Bulk>
+			<Mass>7.50</Mass>
+			<RangedWeapon_Cooldown>0.90</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.58</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_HeatCannon</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>50</ticksBetweenBurstShots>
+			<range>55</range>
+			<soundCast>RS_ShotHC</soundCast>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AD_FedHeatCannon</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.24</ShotSpread>
+			<SwayFactor>1.48</SwayFactor>
+			<Bulk>12.70</Bulk>
+			<Mass>7.50</Mass>
+			<RangedWeapon_Cooldown>0.90</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.58</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_HeatCannon</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>50</ticksBetweenBurstShots>
+			<range>55</range>
+			<soundCast>RS_ShotHC</soundCast>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ==========  AD Crucible Precision Rifle  =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AD_CruciblePresicionRifle</defName>
+		<statBases>
+			<SightsEfficiency>2.60</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.46</SwayFactor>
+			<Bulk>12.40</Bulk>
+			<Mass>5.20</Mass>
+			<RangedWeapon_Cooldown>0.95</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.06</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_CruciblePrecisionRifle</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>75</range>
+			<soundCast>RS_ShotCPR</soundCast>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AD_FedSniperRifle</defName>
+		<statBases>
+			<SightsEfficiency>2.60</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.46</SwayFactor>
+			<Bulk>12.40</Bulk>
+			<Mass>5.20</Mass>
+			<RangedWeapon_Cooldown>0.95</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.06</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_CruciblePrecisionRifle</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>75</range>
+			<soundCast>RS_ShotCPR</soundCast>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ==========  AD Plasma Caster  =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AD_PlasmaCaliver</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.25</ShotSpread>
+			<SwayFactor>1.96</SwayFactor>
+			<Bulk>18.20</Bulk>
+			<Mass>10.00</Mass>
+			<RangedWeapon_Cooldown>1.75</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_PlasmaCaster</defaultProjectile>
+			<warmupTime>3.25</warmupTime>
+			<minRange>3</minRange>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<range>40</range>
+			<soundCast>RS_ShotHarmonizer</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>18</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes/>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AD_FedPlasmaCaster</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.25</ShotSpread>
+			<SwayFactor>1.96</SwayFactor>
+			<Bulk>18.20</Bulk>
+			<Mass>10.00</Mass>
+			<RangedWeapon_Cooldown>1.75</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_PlasmaCaster</defaultProjectile>
+			<warmupTime>4.25</warmupTime>
+			<minRange>3</minRange>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<range>40</range>
+			<soundCast>RS_ShotHarmonizer</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>18</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes/>
+	</Operation>
+
+	<!-- ==========  AD Crucible Carbine  =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AD_CrucibleCarbine</defName>
+		<statBases>
+			<WorkToMake>50000</WorkToMake>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.11</SwayFactor>
+			<Bulk>8.20</Bulk>
+			<Mass>4.10</Mass>
+			<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.38</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_CrucibleCarbine</defaultProjectile>
+			<warmupTime>0.85</warmupTime>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>22</ticksBetweenBurstShots>
+			<range>32</range>
+			<soundCast>RS_ShotCR</soundCast>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_Security.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_Security.xml
new file mode 100644
index 0000000000..8ca8f74d63
--- /dev/null
+++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_Security.xml	
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			@Name="FedHarvester" or
+			@Name="Harmonizer"
+			]/thingClass </xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<!-- ==========  Harvester Cannon  =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_FedHarvester</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>0.80</SwayFactor>
+			<Bulk>22.00</Bulk>
+			<Mass>18.50</Mass>
+			<RangedWeapon_Cooldown>1.55</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.12</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_HarvesterCannon</defaultProjectile>
+			<warmupTime>1.55</warmupTime>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<range>55</range>
+			<soundCast>RS_ShotCR</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ==========  Plasma Bombard  =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Gun_PB"]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_Charges">
+					<chargeSpeeds>
+						<li>30</li>
+						<li>50</li>
+						<li>70</li>
+						<li>90</li>
+					</chargeSpeeds>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Gun_PB"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+					<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_PlasmaTurretBombard</defaultProjectile>
+					<warmupTime>3.55</warmupTime>
+					<range>500</range>
+					<minRange>25</minRange>
+					<burstShotCount>10</burstShotCount>
+					<soundCast>RS_ShotHarmonizer</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>26</muzzleFlashScale>
+					<circularError>1.5</circularError>
+					<indirectFirePenalty>0.3</indirectFirePenalty>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Gun_PB"]</xpath>
+		<value>
+			<weaponTags>
+				<li>Artillery</li>
+				<li>TurretGun</li>
+			</weaponTags>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Bion.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Bion.xml
new file mode 100644
index 0000000000..8dd01f19e3
--- /dev/null
+++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Bion.xml	
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Bion Base & Stalker ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="BaseBion"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bion_Base"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bion_Base"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.70</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bion_Base"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>22</ArmorRating_Sharp>
+			<NightVisionEfficiency>0.70</NightVisionEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bion_Stalker"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+			<NightVisionEfficiency>0.90</NightVisionEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bion_Stalker"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.70</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Bion_Base" or defName="Bion_Stalker"]/statBases</xpath>
+		<value>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>50</CarryBulk>
+			<AimingAccuracy>1.2</AimingAccuracy>
+			<ShootingAccuracyPawn>1.2</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bion_Base" or defName="Bion_Stalker"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>5.05</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[@Name="BaseBion"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[@Name="BaseBion"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="BaseBion"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<!--<li Class="CombatExtended.CompProperties_Suppressable" />-->
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[@Name="BaseBion"]/damageMultipliers</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[@Name="BaseBion"]</xpath>
+			<value>
+				<damageMultipliers/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="BaseBion"]/damageMultipliers</xpath>
+		<value>
+			<li>
+				<damageDef>Blunt</damageDef>
+				<multiplier>0.75</multiplier>
+			</li>
+			<li>
+				<damageDef>Bomb_Secondary</damageDef>
+				<multiplier>0.25</multiplier>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_FederatorMech.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_FederatorMech.xml
new file mode 100644
index 0000000000..fb7c6dbb04
--- /dev/null
+++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_FederatorMech.xml	
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Mech - Federator ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Mech_Federator"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Federator"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>40</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Federator"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>35</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Federator"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.95</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Mech_Federator"]/statBases</xpath>
+		<value>
+			<CarryWeight>60</CarryWeight>
+			<CarryBulk>60</CarryBulk>
+			<AimingAccuracy>1.1</AimingAccuracy>
+			<ShootingAccuracyPawn>1.1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			<MeleeCritChance>0.4</MeleeCritChance>
+			<MeleeParryChance>0.3</MeleeParryChance>
+			<SmokeSensitivity>0</SmokeSensitivity>
+			<NightVisionEfficiency>0.80</NightVisionEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Federator"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>3.67</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>2.67</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>2.67</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Hulk.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Hulk.xml
new file mode 100644
index 0000000000..bf7a9c4625
--- /dev/null
+++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Hulk.xml	
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Hulk ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Bion_Hulk"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bion_Hulk"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bion_Hulk"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bion_Stalker"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.85</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Bion_Hulk"]/statBases</xpath>
+		<value>
+			<CarryWeight>60</CarryWeight>
+			<CarryBulk>60</CarryBulk>
+			<AimingAccuracy>1.2</AimingAccuracy>
+			<ShootingAccuracyPawn>1.2</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.10</MeleeDodgeChance>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>0.10</MeleeParryChance>
+			<SmokeSensitivity>0</SmokeSensitivity>
+			<NightVisionEfficiency>0.80</NightVisionEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bion_Hulk"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>5.58</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2.24</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.24</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_SeekerMech.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_SeekerMech.xml
new file mode 100644
index 0000000000..3735f915c9
--- /dev/null
+++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_SeekerMech.xml	
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Mech - Seeker ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Mech_Seeker"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Mech_Seeker"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Seeker"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Mech_Seeker"]/statBases</xpath>
+		<value>
+			<CarryWeight>20</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+			<AimingAccuracy>0.3</AimingAccuracy>
+			<ShootingAccuracyPawn>0.3</ShootingAccuracyPawn>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0.025</MeleeParryChance>
+			<SmokeSensitivity>0</SmokeSensitivity>
+			<NightVisionEfficiency>1</NightVisionEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Seeker"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Feral/Defs/Rimsenal Feral/ThingDefs_Misc/Ammo_Feral.xml b/ModPatches/Rimsenal Feral/Defs/Rimsenal Feral/ThingDefs_Misc/Ammo_Feral.xml
new file mode 100644
index 0000000000..335e6d24f9
--- /dev/null
+++ b/ModPatches/Rimsenal Feral/Defs/Rimsenal Feral/ThingDefs_Misc/Ammo_Feral.xml	
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ==================== Scrap Metal ========================== -->
+
+	<ThingCategoryDef>
+		<defName>AmmoFeralScrap</defName>
+		<label>scrap metal</label>
+		<parent>AmmoRifles</parent>
+		<iconPath>ThirdParty/Rimsenal/Nail/Nail_c</iconPath>
+	</ThingCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>FeralScrap</defName>
+		<label>scrap</label>
+		<labelShort>scrap</labelShort>
+		<description>Bits of metal scraps</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Feral_Scrap</defName>
+		<label>scrap</label>
+		<ammoTypes>
+			<Ammo_Feral_Scrap>Bullet_Feral_Scrap</Ammo_Feral_Scrap>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="BaseScrap" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Bits of jagged scrap metal.</description>
+		<statBases>
+			<Mass>0.04</Mass>
+			<Bulk>0.1</Bulk>
+		</statBases>
+		<destroyOnDrop>True</destroyOnDrop>
+		<thingCategories>
+			<li>AmmoFeralScrap</li>
+		</thingCategories>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseScrap">
+		<defName>Ammo_Feral_Scrap</defName>
+		<label>bits of jagged scrap metal</label>
+		<graphicData>
+			<texPath>ThirdParty/Rimsenal/Nail</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.01</MarketValue>
+		</statBases>
+		<ammoClass>FeralScrap</ammoClass>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base556x45mmNATOBullet">
+		<defName>Bullet_Feral_Scrap</defName>
+		<label>scrap metal</label>
+		<graphicData>
+			<texPath>Projectile/Scrap</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationBlunt>15</armorPenetrationBlunt>
+			<armorPenetrationSharp>2</armorPenetrationSharp>
+			<pelletCount>20</pelletCount>
+			<spreadMult>17.8</spreadMult>
+			<damageDef>Bullet</damageDef>
+			<speed>63</speed>
+			<dropsCasings>false</dropsCasings>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Nails ========================== -->
+
+	<ThingCategoryDef>
+		<defName>AmmoFeralNail</defName>
+		<label>nail</label>
+		<parent>AmmoRifles</parent>
+		<iconPath>ThirdParty/Rimsenal/Nail/Nail_c</iconPath>
+	</ThingCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>FeralNail</defName>
+		<label>nail</label>
+		<labelShort>nail</labelShort>
+		<description>Rusty, pointy nails arranged in strips.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Feral_Nail</defName>
+		<label>nail</label>
+		<ammoTypes>
+			<Ammo_Feral_Nail>Bullet_Feral_Nail</Ammo_Feral_Nail>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="BaseFeralNail" ParentName="SmallAmmoBase" Abstract="True">
+		<description>A pointed, slightly rusty carpentry nail a few inches long. While an extremely inaccurate projectile at best, its shape means it tends to tumble when it strikes a target, leaving large wounds.</description>
+		<statBases>
+			<Mass>0.02</Mass>
+			<Bulk>0.02</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoFeralNail</li>
+		</thingCategories>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseFeralNail">
+		<defName>Ammo_Feral_Nail</defName>
+		<label>nail</label>
+		<graphicData>
+			<texPath>ThirdParty/Rimsenal/Nail</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.02</MarketValue>
+		</statBases>
+		<ammoClass>FeralNail</ammoClass>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base556x45mmNATOBullet">
+		<defName>Bullet_Feral_Nail</defName>
+		<label>nail</label>
+		<graphicData>
+			<texPath>Projectile/Nail</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>73</speed>
+			<dropsCasings>false</dropsCasings>
+			<damageAmountBase>8</damageAmountBase>
+			<armorPenetrationBlunt>10</armorPenetrationBlunt>
+			<armorPenetrationSharp>2.5</armorPenetrationSharp>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_Feral_Nail</defName>
+		<label>make nails x500</label>
+		<description>Craft 500 steel nails.</description>
+		<jobString>Making nails.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>15</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Feral_Nail>500</Ammo_Feral_Nail>
+		</products>
+	</RecipeDef>
+
+	<!-- ==================== Twin 9x19mm Para ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_9x19mmParaTwin_Feral</defName>
+		<label>Twin 9x19mm Para</label>
+		<ammoTypes>
+			<Ammo_9x19mmPara_FMJ>Bullet_9x19mmParaTwin_Feral_FMJ</Ammo_9x19mmPara_FMJ>
+			<Ammo_9x19mmPara_AP>Bullet_9x19mmParaTwin_Feral_AP</Ammo_9x19mmPara_AP>
+			<Ammo_9x19mmPara_HP>Bullet_9x19mmParaTwin_Feral_HP</Ammo_9x19mmPara_HP>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef ParentName="Base9x19mmParaBullet">
+		<defName>Bullet_9x19mmParaTwin_Feral_FMJ</defName>
+		<label>9mm Para bullet (FMJ)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>11</damageAmountBase>
+			<pelletCount>2</pelletCount>
+			<spreadMult>2</spreadMult>
+			<armorPenetrationSharp>4</armorPenetrationSharp>
+			<armorPenetrationBlunt>9.66</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base9x19mmParaBullet">
+		<defName>Bullet_9x19mmParaTwin_Feral_AP</defName>
+		<label>9mm Para bullet (AP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>7</damageAmountBase>
+			<pelletCount>2</pelletCount>
+			<spreadMult>2</spreadMult>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+			<armorPenetrationBlunt>9.66</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base9x19mmParaBullet">
+		<defName>Bullet_9x19mmParaTwin_Feral_HP</defName>
+		<label>9mm Para bullet (HP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>13</damageAmountBase>
+			<pelletCount>2</pelletCount>
+			<spreadMult>2</spreadMult>
+			<armorPenetrationSharp>2</armorPenetrationSharp>
+			<armorPenetrationBlunt>9.66</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/PawnKindDefs/PawnKinds_Feral.xml b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/PawnKindDefs/PawnKinds_Feral.xml
new file mode 100644
index 0000000000..89f7b99596
--- /dev/null
+++ b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/PawnKindDefs/PawnKinds_Feral.xml	
@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Husker ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FeralHusker"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>8</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Mangler ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FeralMangler"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Scorcher ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FeralScorcher"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<magazineCount>
+							<min>1</min>
+							<max>5</max>
+						</magazineCount>
+						<generateChance>0.7</generateChance>
+						<sidearmMoney>
+							<min>75</min>
+							<max>325</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>FeralPistol</li>
+							<li>FeralMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Boomer ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FeralBoomer"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>12</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<magazineCount>
+							<min>2</min>
+							<max>5</max>
+						</magazineCount>
+						<generateChance>0.7</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>450</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>FeralPistol</li>
+							<li>FeralMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Thumper ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FeralThumper"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<magazineCount>
+							<min>1</min>
+							<max>5</max>
+						</magazineCount>
+						<generateChance>0.7</generateChance>
+						<sidearmMoney>
+							<min>200</min>
+							<max>550</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>FeralPistol</li>
+							<li>FeralMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Skulker ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FeralSkulker"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<magazineCount>
+							<min>2</min>
+							<max>5</max>
+						</magazineCount>
+						<generateChance>0.7</generateChance>
+						<sidearmMoney>
+							<min>200</min>
+							<max>550</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>FeralPistol</li>
+							<li>FeralMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Elite Base ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="FeralEliteBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<magazineCount>
+							<min>2</min>
+							<max>5</max>
+						</magazineCount>
+						<generateChance>0.7</generateChance>
+						<sidearmMoney>
+							<min>1800</min>
+							<max>2500</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>FeralPistol</li>
+							<li>FeralMelee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Ogrenaut ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FeralOgrenaut"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>10</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Hellmaker ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FeralHellmaker"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>10</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Backpacks ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[
+			defName="FeralHusker" or
+			defName="FeralMangler" or
+			defName="FeralScorcher" or
+			defName="FeralBoomer"
+			]/apparelRequired </xpath>
+		<value>
+			<li>CE_Apparel_TribalBackpack</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[
+			@Name="FeralEliteBase" or
+			defName="FeralSkulker" or
+			defName="FeralThumper"
+			]/apparelRequired </xpath>
+		<value>
+			<li>CE_Apparel_Backpack</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Misc/Feral_Apparel.xml b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Misc/Feral_Apparel.xml
new file mode 100644
index 0000000000..a27467cc19
--- /dev/null
+++ b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Misc/Feral_Apparel.xml	
@@ -0,0 +1,458 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==========  Patched Shirt =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_PatchedShirt"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PatchedShirt"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.03</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_PatchedShirt"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.024</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ==========  Hoods =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="Apparel_HuskerHood" or
+			defName="Apparel_SkulkerHood" or
+			defName="Apparel_ThumperHood" or
+			defName="Apparel_FeralHood"
+			]/statBases </xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- ==========  Grinder Helmet =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_GrinderHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_GrinderHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_GrinderHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_GrinderHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-0.3</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_GrinderHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!-- ==========  Scorcher Helmet =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_ScorcherHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<WornBulk>1.8</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_ScorcherHelmet"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_ScorcherHelmet"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Apparel_ScorcherHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Apparel_ScorcherHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_ScorcherHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_ScorcherHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!-- ==========  Feral Exo Helmet =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_FeralExoH"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1.5</WornBulk>
+			<NightVisionEfficiency_Apparel>0.25</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_FeralExoH"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>28</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_FeralExoH"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Apparel_FeralExoH"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Apparel_FeralExoH"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_FeralExoH"]/equippedStatOffsets</xpath>
+		<value>
+			<ToxicEnvironmentResistance>0.80</ToxicEnvironmentResistance>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_FeralExoH"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>36</Plasteel>
+			<DevilstrandCloth>10</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_FeralExoH"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!-- ==========  Scrap Armor =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_ScrapArmor"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ScrapArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>13</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ScrapArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_ScrapArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Apparel_ScrapArmor"]</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>
+	</Operation>
+
+	<!-- ==========  Feral Mail =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_FeralMail"]/statBases</xpath>
+		<value>
+			<Bulk>60</Bulk>
+			<WornBulk>8</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_FeralMail"]/statBases/Mass</xpath>
+		<value>
+			<Mass>15</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_FeralMail"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_FeralMail"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Apparel_FeralMail"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Blunt>1.50</ArmorRating_Blunt>
+						<parts>
+							<li>Torso</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+							<li>Shoulder</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+							<li>Shoulder</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.40</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.40</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.375</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.50</ArmorRating_Sharp>
+						<parts>
+							<li>Foot</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.75</ArmorRating_Blunt>
+						<parts>
+							<li>Foot</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ==========  Feral Exosuit =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_FeralExo"]/statBases</xpath>
+		<value>
+			<Bulk>110</Bulk>
+			<WornBulk>25</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_FeralExo"]/statBases/Mass</xpath>
+		<value>
+			<Mass>75</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_FeralExo"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>70</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+			<ToxicEnvironmentResistance>0.45</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_FeralExo"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>83</Plasteel>
+			<DevilstrandCloth>30</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_FeralExo"]/costList/Steel</xpath>
+		<value>
+			<Steel>204</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_FeralExo"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>32</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_FeralExo"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_FeralExo"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Apparel_FeralExo"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Misc/Feral_Explosives.xml b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Misc/Feral_Explosives.xml
new file mode 100644
index 0000000000..7251c0e467
--- /dev/null
+++ b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Misc/Feral_Explosives.xml	
@@ -0,0 +1,280 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === Thumper Rocket Launcher === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Gun_Thumper"]</xpath>
+		<value>
+			<stackLimit>5</stackLimit>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_Thumper"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<damageDef>Bullet</damageDef>
+				<damageAmountBase>100</damageAmountBase>
+				<armorPenetrationBlunt>2.2</armorPenetrationBlunt>
+				<armorPenetrationSharp>20</armorPenetrationSharp>
+				<speed>40</speed>
+				<soundAmbient>RocketPropelledLoop_Small</soundAmbient>
+			</projectile>
+			<comps>
+				<li Class="CombatExtended.CompProperties_ExplosiveCE">
+					<damageAmountBase>35</damageAmountBase>
+					<explosiveDamageType>Bomb</explosiveDamageType>
+					<explosiveRadius>2.5</explosiveRadius>
+					<explosionSound>MortarBomb_Explode</explosionSound>
+					<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				</li>
+				<li Class="CombatExtended.CompProperties_Fragments">
+					<fragments>
+						<Fragment_Large>40</Fragment_Large>
+					</fragments>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_Thumper"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Thumper</defName>
+		<statBases>
+			<Mass>6</Mass>
+			<RangedWeapon_Cooldown>4.8</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.46</SwayFactor>
+			<Bulk>10</Bulk>
+			<WorkToMake>29500</WorkToMake>
+		</statBases>
+		<costList>
+			<ChunkSlagSteel>1</ChunkSlagSteel>
+			<Steel>30</Steel>
+			<FSX>3</FSX>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Thumper</defaultProjectile>
+			<warmupTime>3.5</warmupTime>
+			<range>34</range>
+			<minRange>5</minRange>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<muzzleFlashScale>14</muzzleFlashScale>
+		</Properties>
+		<weaponTags>
+			<li>FeralGun</li>
+			<li>FeralGunHeavy</li>
+		</weaponTags>
+		<researchPrerequisite>CE_Launchers</researchPrerequisite>
+		<FireModes/>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_Thumper"]/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>
+
+	<!-- === Madness Fusion Device === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Proj_MADness"]</xpath>
+		<value>
+			<ThingDef ParentName="BaseGrenadeProjectile">
+				<defName>Proj_MADness</defName>
+				<label>fusion device</label>
+				<graphicData>
+					<texPath>Projectile/MADness</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<projectile Class="CombatExtended.ProjectilePropertiesCE">
+					<explosionRadius>29.5</explosionRadius>
+					<damageDef>BombSuper</damageDef>
+					<explosionDamageFalloff>true</explosionDamageFalloff>
+					<damageAmountBase>400</damageAmountBase>
+					<explosionDelay>600</explosionDelay>
+					<soundExplode>Explosion_GiantBomb</soundExplode>
+					<dropsCasings>false</dropsCasings>
+				</projectile>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Weapon_MADness"]</xpath>
+		<value>
+			<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGrenadeEquipment">
+				<defName>Weapon_MADness</defName>
+				<equipmentType>Primary</equipmentType>
+				<label>fusion device</label>
+				<techLevel>Spacer</techLevel>
+				<description>Modified portable fusion reactor, used for rimworld scale Mutual Assured Destruction strategy.</description>
+				<graphicData>
+					<texPath>Things/A13/MADness</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<soundInteract>Interact_Grenade</soundInteract>
+				<statBases>
+					<MarketValue>2500</MarketValue>
+					<SightsEfficiency>1</SightsEfficiency>
+					<RangedWeapon_Cooldown>3</RangedWeapon_Cooldown>
+				</statBases>
+				<thingCategories>
+					<li>Grenades</li>
+				</thingCategories>
+				<verbs>
+					<li Class="CombatExtended.VerbPropertiesCE">
+						<label>deploy fusion device</label>
+						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<range>2.9</range>
+						<warmupTime>8.95</warmupTime>
+						<noiseRadius>4</noiseRadius>
+						<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+						<soundCast>ThrowGrenade</soundCast>
+						<targetParams>
+							<canTargetLocations>true</canTargetLocations>
+						</targetParams>
+						<defaultProjectile>Proj_MADness</defaultProjectile>
+						<onlyManualCast>true</onlyManualCast>
+						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+					</li>
+				</verbs>
+				<comps>
+					<li Class="CombatExtended.CompProperties_ExplosiveCE">
+						<damageAmountBase>400</damageAmountBase>
+						<explosiveDamageType>BombSuper</explosiveDamageType>
+						<explosiveRadius>12</explosiveRadius>
+						<explosionSound>Explosion_GiantBomb</explosionSound>
+					</li>
+				</comps>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<!-- === Rat Stick Grenade === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_RatStick"]</xpath>
+		<value>
+			<ThingDef ParentName="BaseGrenadeProjectile">
+				<defName>Bullet_RatStick</defName>
+				<label>rat stick</label>
+				<graphicData>
+					<texPath>Projectile/BoomStick</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+					<shaderType>TransparentPostLight</shaderType>
+				</graphicData>
+				<projectile Class="CombatExtended.ProjectilePropertiesCE">
+					<explosionRadius>1.8</explosionRadius>
+					<damageDef>PrometheumFlame</damageDef>
+					<damageAmountBase>15</damageAmountBase>
+					<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
+					<preExplosionSpawnChance>1</preExplosionSpawnChance>
+				</projectile>
+			</ThingDef>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_RatStick"]</xpath>
+		<value>
+			<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGrenadeEquipment">
+				<defName>Gun_RatStick</defName>
+				<label>feral rat sticks</label>
+				<description>Javelins tied with explosive boomrat tumor.</description>
+				<graphicData>
+					<texPath>Things/A13/BoomStick</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+					<onGroundRandomRotateAngle>35</onGroundRandomRotateAngle>
+				</graphicData>
+				<thingCategories>
+					<li>FeralWeapons</li>
+				</thingCategories>
+				<generateCommonality>0.1</generateCommonality>
+				<soundInteract>Interact_BeatFire</soundInteract>
+				<statBases>
+					<MarketValue>200</MarketValue>
+					<SightsEfficiency>1.0</SightsEfficiency>
+					<ShotSpread>1.5</ShotSpread>
+					<SwayFactor>2.5</SwayFactor>
+					<Bulk>5.00</Bulk>
+					<Mass>4.00</Mass>
+					<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+				</statBases>
+				<altitudeLayer>Item</altitudeLayer>
+				<alwaysHaulable>True</alwaysHaulable>
+				<tickerType>Normal</tickerType>
+				<techLevel>Neolithic</techLevel>
+				<equippedAngleOffset>30</equippedAngleOffset>
+				<stackLimit>75</stackLimit>
+				<weaponTags>
+					<li>GrenadeDestructive</li>
+					<li>FeralGun</li>
+					<li>FeralGrenade</li>
+				</weaponTags>
+				<verbs>
+					<li Class="CombatExtended.VerbPropertiesCE">
+						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+						<targetParams>
+							<canTargetLocations>true</canTargetLocations>
+						</targetParams>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_RatStick</defaultProjectile>
+						<warmupTime>1.5</warmupTime>
+						<range>11</range>
+						<soundCast>Interact_BeatFire</soundCast>
+					</li>
+				</verbs>
+				<tools>
+					<li Class="CombatExtended.ToolCE">
+						<label>shaft</label>
+						<capacities>
+							<li>Blunt</li>
+						</capacities>
+						<power>7</power>
+						<cooldownTime>1.40</cooldownTime>
+						<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+						<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+					</li>
+					<li Class="CombatExtended.ToolCE">
+						<label>point</label>
+						<capacities>
+							<li>Stab</li>
+						</capacities>
+						<power>15</power>
+						<cooldownTime>1.43</cooldownTime>
+						<chanceFactor>1.5</chanceFactor>
+						<armorPenetrationBlunt>1.69</armorPenetrationBlunt>
+						<armorPenetrationSharp>0.30</armorPenetrationSharp>
+						<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+					</li>
+				</tools>
+			</ThingDef>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Misc/Feral_MeleeWeapons.xml b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Misc/Feral_MeleeWeapons.xml
new file mode 100644
index 0000000000..2a46db8c01
--- /dev/null
+++ b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Misc/Feral_MeleeWeapons.xml	
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Feral Glaive-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_FeralGlaive"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<chanceFactor>0.33</chanceFactor>
+					<cooldownTime>1.31</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>2.9</cooldownTime>
+					<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>
+					<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.03</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_FeralGlaive"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_FeralGlaive"]</xpath>
+		<value>
+			<modExtensions>
+				<li Class="CombatExtended.GunDrawExtension">
+					<DrawSize>1.6,1.5</DrawSize>
+					<DrawOffset>0.35,0.30</DrawOffset>
+				</li>
+			</modExtensions>
+		</value>
+	</Operation>
+
+	<!-- Feral Knife -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_FeralCleaver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<chanceFactor>0.33</chanceFactor>
+					<cooldownTime>1.89</cooldownTime>
+					<armorPenetrationBlunt>0.65</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetrationBlunt>0.612</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.39</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.44</cooldownTime>
+					<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.43</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_FeralCleaver"]/statBases</xpath>
+		<value>
+			<Bulk>4.5</Bulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_FeralCleaver"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!--=== Mutant Weapons ===-->
+	<!-- Carver Axes -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Carver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>47</power>
+					<cooldownTime>2.9</cooldownTime>
+					<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>
+					<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.03</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Carver"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Carver"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- Sunderer -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Sunderer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<chanceFactor>0.33</chanceFactor>
+					<cooldownTime>2.42</cooldownTime>
+					<armorPenetrationBlunt>3.125</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<chanceFactor>0.33</chanceFactor>
+					<cooldownTime>2.37</cooldownTime>
+					<armorPenetrationBlunt>3.125</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>55</power>
+					<cooldownTime>3.71</cooldownTime>
+					<armorPenetrationBlunt>16</armorPenetrationBlunt>
+					<armorPenetrationSharp>3.6</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Sunderer"]/statBases</xpath>
+		<value>
+			<Bulk>14</Bulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Misc/Feral_MutantWeapons.xml b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Misc/Feral_MutantWeapons.xml
new file mode 100644
index 0000000000..55af93956d
--- /dev/null
+++ b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Misc/Feral_MutantWeapons.xml	
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Melee Tools -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Feral_ScatterCannon" or
+			defName="Feral_RivetCannon" or
+			defName="Feral_DMG"
+			] </xpath>
+		<value>
+			<tools Inherit="False">
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>4</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.55</cooldownTime>
+					<armorPenetrationBlunt>8.45</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ==========  Mutant DMG =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Feral_DMG</defName>
+		<statBases>
+			<Mass>10</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.8</ShotSpread>
+			<SwayFactor>2.53</SwayFactor>
+			<Bulk>12</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
+			<warmupTime>1.4</warmupTime>
+			<range>60</range>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>ShotCrucifier</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>20</reloadTime>
+			<ammoSet>AmmoSet_303British</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>20</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>Hellmaker</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Scatterstick Shotgun ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Feral_ScatterCannon</defName>
+		<statBases>
+			<Mass>8</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<ShotSpread>0.25</ShotSpread>
+			<SwayFactor>1.26</SwayFactor>
+			<Bulk>10</Bulk>
+			<SightsEfficiency>0.8</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Feral_Scrap</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>24</range>
+			<soundCast>ShotScatterStick</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>10</reloadTime>
+			<ammoSet>AmmoSet_Feral_Scrap</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>4</aimedBurstShotCount>
+			<aiUseBurstMode>true</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>Ogrenaut</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Rivet Gun ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Feral_RivetCannon</defName>
+		<statBases>
+			<Mass>5.3</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.89</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.7</SwayFactor>
+			<Bulk>11.03</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.83</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Feral_Nail</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<burstShotCount>8</burstShotCount>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<soundCast>ShotCrucifier</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>80</magazineSize>
+			<reloadTime>6.7</reloadTime>
+			<ammoSet>AmmoSet_Feral_Nail</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>8</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>Ogrenaut</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ==========  Smoke Spore =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_SporeSmoker"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_SporeSmoker"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<damageDef>Spore</damageDef>
+				<damageAmountBase>5</damageAmountBase>
+				<explosionRadius>3.2</explosionRadius>
+				<speed>54</speed>
+				<postExplosionGasType>BlindSmoke</postExplosionGasType>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Feral_SporeSmoker</defName>
+		<statBases>
+			<Mass>1</Mass>
+			<RangedWeapon_Cooldown>6.5</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.8</ShotSpread>
+			<SwayFactor>1.53</SwayFactor>
+			<Bulk>1</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_SporeSmoker</defaultProjectile>
+			<warmupTime>2</warmupTime>
+			<range>36</range>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<burstShotCount>1</burstShotCount>
+			<soundCast>Shriker</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>0</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SmokeSpore</li>
+		</weaponTags>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Misc/Feral_RangedWeapons.xml b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Misc/Feral_RangedWeapons.xml
new file mode 100644
index 0000000000..255a69f570
--- /dev/null
+++ b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Misc/Feral_RangedWeapons.xml	
@@ -0,0 +1,451 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Pistols -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_Scraptooth"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- Long guns-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_Gnasher" or
+			defName="Gun_Deathdealer" or
+			defName="Gun_ScatterStick" or
+			defName="Gun_Thrasher" or
+			defName="Gun_Crucifier"
+			]/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>
+	<!-- Heavy Weapons -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_SkullBuster" or defName="Gun_Scorcher"]/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>
+
+	<!-- ==========  Skullbuster Crank Gun =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SkullBuster</defName>
+		<statBases>
+			<Mass>9.12</Mass>
+			<RangedWeapon_Cooldown>0.93</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.9</SightsEfficiency>
+			<ShotSpread>0.21</ShotSpread>
+			<SwayFactor>2.53</SwayFactor>
+			<Bulk>13.7</Bulk>
+			<WorkToMake>32000</WorkToMake>
+		</statBases>
+		<costList>
+			<ChunkSlagSteel>3</ChunkSlagSteel>
+			<Steel>60</Steel>
+			<ComponentIndustrial>8</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.32</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
+			<warmupTime>1.25</warmupTime>
+			<range>62</range>
+			<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+			<burstShotCount>25</burstShotCount>
+			<soundCast>ShotCrucifier</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_303British</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>10</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_MachineGun</li>
+			<li>CE_AI_Suppressive</li>
+		</weaponTags>
+		<researchPrerequisite>Gunsmithing</researchPrerequisite>
+	</Operation>
+
+	<!-- ==========  Scraptooth Pistols =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Scraptooth</defName>
+		<statBases>
+			<WorkToMake>35500</WorkToMake>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.7</SwayFactor>
+			<Bulk>5</Bulk>
+			<Mass>4.8</Mass>
+			<RangedWeapon_Cooldown>0.65</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.8</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmParaTwin_Feral_FMJ</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>11</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<muzzleFlashScale>7</muzzleFlashScale>
+			<soundCast>ShotScraptooth</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>16</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_9x19mmParaTwin_Feral</ammoSet>
+		</AmmoUser>
+		<FireModes>
+		</FireModes>
+		<weaponTags>
+			<li>FeralPistol</li>
+			<li>FeralGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ==========  Gnasher SMG =========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Gnasher</defName>
+		<statBases>
+			<Mass>5.50</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.60</SightsEfficiency>
+			<ShotSpread>0.54</ShotSpread>
+			<SwayFactor>1.64</SwayFactor>
+			<Bulk>4.90</Bulk>
+			<WorkToMake>24500</WorkToMake>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.25</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Feral_Nail</defaultProjectile>
+			<warmupTime>0.9</warmupTime>
+			<range>14</range>
+			<burstShotCount>8</burstShotCount>
+			<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+			<soundCast>ShotGnasher</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>8</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>48</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_Feral_Nail</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>6</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>FeralPistol</li>
+			<li>FeralGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Deathdealer Machinepistols ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Deathdealer</defName>
+		<statBases>
+			<Mass>4.20</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.67</ShotSpread>
+			<SwayFactor>1.95</SwayFactor>
+			<Bulk>5.8</Bulk>
+			<WorkToMake>24500</WorkToMake>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.65</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmParaTwin_Feral_FMJ</defaultProjectile>
+			<warmupTime>0.8</warmupTime>
+			<range>16</range>
+			<burstShotCount>4</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<soundCast>ShotDeathdealer</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>4.8</reloadTime>
+			<ammoSet>AmmoSet_9x19mmParaTwin_Feral</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>FeralGun</li>
+			<li>FeralRifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Scatterstick Shotgun ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_ScatterStick</defName>
+		<statBases>
+			<Mass>3.50</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.26</SwayFactor>
+			<Bulk>6.7</Bulk>
+			<SightsEfficiency>0.9</SightsEfficiency>
+			<WorkToMake>22500</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>ShotScatterStick</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>3</magazineSize>
+			<reloadTime>6.8</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Thrasher Assault Rifle ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Thrasher</defName>
+		<statBases>
+			<Mass>5.3</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.90</SightsEfficiency>
+			<ShotSpread>0.37</ShotSpread>
+			<SwayFactor>1.7</SwayFactor>
+			<Bulk>11.03</Bulk>
+			<WorkToMake>30000</WorkToMake>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.83</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<burstShotCount>4</burstShotCount>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<soundCast>ShotThrasher</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>26</magazineSize>
+			<reloadTime>4.7</reloadTime>
+			<ammoSet>AmmoSet_303British</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>FeralGun</li>
+			<li>FeralRifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Crucible Anti-Material Rifle ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Crucifier</defName>
+		<statBases>
+			<WorkToMake>44500</WorkToMake>
+			<SightsEfficiency>2.2</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>2.4</SwayFactor>
+			<Bulk>17.5</Bulk>
+			<Mass>13.80</Mass>
+			<RangedWeapon_Cooldown>1.38</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.83</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>4.2</warmupTime>
+			<range>76</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>15</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>FeralSniperRifle</li>
+			<li>Bipod_AMR</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Scorcher Flamethrower ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_Scorcher"]/statBases</xpath>
+		<value>
+			<statBases>
+				<Mass>4.2</Mass>
+				<RangedWeapon_Cooldown>0.44</RangedWeapon_Cooldown>
+				<SightsEfficiency>0.90</SightsEfficiency>
+				<ShotSpread>0.18</ShotSpread>
+				<SwayFactor>1.4</SwayFactor>
+				<Bulk>5</Bulk>
+				<WorkToMake>31500</WorkToMake>
+			</statBases>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_Scorcher"]/costList</xpath>
+		<value>
+			<costList>
+				<ChunkSlagSteel>1</ChunkSlagSteel>
+				<Steel>35</Steel>
+				<ComponentIndustrial>2</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Gun_Scorcher"]</xpath>
+		<value>
+			<recipeMaker>
+				<researchPrerequisite>CE_Launchers</researchPrerequisite>
+			</recipeMaker>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_Scorcher"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<recoilAmount>0.95</recoilAmount>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_Flamethrower_Prometheum</defaultProjectile>
+					<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+					<warmupTime>1.1</warmupTime>
+					<range>11</range>
+					<minRange>3</minRange>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<soundCast>HissFlamethrower</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+					<burstShotCount>20</burstShotCount>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Gun_Scorcher"]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>40</magazineSize>
+					<reloadTime>5</reloadTime>
+					<ammoSet>AmmoSet_Flamethrower</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
+					<aiUseBurstMode>true</aiUseBurstMode>
+					<aimedBurstShotCount>10</aimedBurstShotCount>
+					<aiAimMode>SuppressFire</aiAimMode>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Ogrons.xml b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Ogrons.xml
new file mode 100644
index 0000000000..fc5b7148b0
--- /dev/null
+++ b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Ogrons.xml	
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Ogron ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Mutant_Ogron"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Mutant_Ogron"]/statBases</xpath>
+		<value>
+			<CarryWeight>100</CarryWeight>
+			<CarryBulk>80</CarryBulk>
+			<AimingAccuracy>0.85</AimingAccuracy>
+			<ShootingAccuracyPawn>0.85</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.02</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.35</MeleeParryChance>
+			<SmokeSensitivity>0.1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mutant_Ogron"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mutant_Ogron"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mutant_Ogron"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>3.67</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>2.67</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>2.67</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Razortooth.xml b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Razortooth.xml
new file mode 100644
index 0000000000..da9ee0ab00
--- /dev/null
+++ b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Razortooth.xml	
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Mutant_Razortooth ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Mutant_Razortooth"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Mutant_Razortooth"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>0.18</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+			<SmokeSensitivity>0.4</SmokeSensitivity>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mutant_Razortooth"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.19</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.19</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.46</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>16</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<chanceFactor>2</chanceFactor>
+					<armorPenetrationBlunt>5.063</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.8</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>3.2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.225</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Shadark.xml b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Shadark.xml
new file mode 100644
index 0000000000..66f3be6eee
--- /dev/null
+++ b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Shadark.xml	
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Shadark ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Mutant_Shadark"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Mutant_Shadark"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mutant_Shadark"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>5</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>5</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Twisted.xml b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Twisted.xml
new file mode 100644
index 0000000000..a9f75c3d2d
--- /dev/null
+++ b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Twisted.xml	
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Twisted ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Mutant_Twisted"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Mutant_Twisted"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>0.5</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mutant_Twisted"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>5</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>5</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Security/Defs/Rimsenal Security/Ammo_Security.xml b/ModPatches/Rimsenal Security/Defs/Rimsenal Security/Ammo_Security.xml
new file mode 100644
index 0000000000..e0477d57e5
--- /dev/null
+++ b/ModPatches/Rimsenal Security/Defs/Rimsenal Security/Ammo_Security.xml	
@@ -0,0 +1,577 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ==================== Fake Bullet ========================== -->
+
+	<ThingDef ParentName="Base556x45mmNATOBullet">
+		<defName>Bullet_FakeBullet_CE</defName>
+		<label>dummy round</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>120</speed>
+			<dropsCasings>false</dropsCasings>
+			<damageAmountBase>0</damageAmountBase>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== Molten Shell ================== -->
+
+	<ThingCategoryDef>
+		<defName>AmmoMoltenShells</defName>
+		<label>Molten shell</label>
+		<parent>AmmoRockets</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRocket</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_MoltenShell</defName>
+		<label>molten shells</label>
+		<ammoTypes>
+			<Ammo_MoltenShell>Bullet_MoltenShell</Ammo_MoltenShell>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="MoltenShellBase" ParentName="MediumAmmoBase" Abstract="True">
+		<description>Relatively small diameter cannon shell, fired at high velocity to defeat heavy armor.</description>
+		<thingCategories>
+			<li>AmmoMoltenShells</li>
+		</thingCategories>
+		<stackLimit>25</stackLimit>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+		</tradeTags>
+		<statBases>
+			<MaxHitPoints>200</MaxHitPoints>
+			<Mass>8</Mass>
+			<Bulk>12</Bulk>
+		</statBases>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="MoltenShellBase">
+		<defName>Ammo_MoltenShell</defName>
+		<label>molten shell</label>
+		<graphicData>
+			<texPath>Things/Item/MoltenShell</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>150</MarketValue>
+		</statBases>
+		<ammoClass>MoltenShell</ammoClass>
+		<comps>
+		</comps>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base90mmCannonShell">
+		<defName>Bullet_MoltenShell</defName>
+		<label>molten shell</label>
+		<graphicData>
+			<texPath>Things/Projectile/Cannon/HEAT</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>151</speed>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<flyOverhead>false</flyOverhead>
+			<dropsCasings>false</dropsCasings>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>400</damageAmountBase>
+			<armorPenetrationSharp>700</armorPenetrationSharp>
+			<armorPenetrationBlunt>80000</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>5</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragSpeedFactor>0.5</fragSpeedFactor>
+				<fragments>
+					<Fragment_Large>325</Fragment_Large>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Recipe: Molten Shell ========================== -->
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeAmmo_MoltenShells</defName>
+		<label>make molten shells x5</label>
+		<description>Craft 5 molten shells.</description>
+		<jobString>Making molten shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>18</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>18</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Plasteel</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_MoltenShell>5</Ammo_MoltenShell>
+		</products>
+		<workAmount>19000</workAmount>
+	</RecipeDef>
+
+	<!-- ================== ATGMs ================== -->
+
+	<ThingCategoryDef>
+		<defName>Missile_ATGM</defName>
+		<label>Grey Dale ATGM</label>
+		<parent>AmmoRockets</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRocket</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_ATGM</defName>
+		<label>Anti-tank guided missile</label>
+		<ammoTypes>
+			<Missile_ATGM_HE>Bullet_ATGM_HE</Missile_ATGM_HE>
+			<Missile_ATGM_AP>Bullet_ATGM_AP</Missile_ATGM_AP>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="ATGMBase" ParentName="HeavyAmmoBase" Abstract="True">
+		<description>Equipped with a large warhead and originally designed to penetrate the thick armor of tanks with a shaped charge, this missile is fired from a specialized launcher and guided by wire to the target.</description>
+		<statBases>
+			<MaxHitPoints>150</MaxHitPoints>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Missile_ATGM</li>
+		</thingCategories>
+		<stackLimit>15</stackLimit>
+		<cookOffFlashScale>40</cookOffFlashScale>
+		<cookOffSound>MortarBomb_Explode</cookOffSound>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="ATGMBase">
+		<defName>Missile_ATGM_HE</defName>
+		<label>Anti-tank guided missile (HE)</label>
+		<graphicData>
+			<texPath>Things/Item/Missile_HE</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>65</MarketValue>
+			<Mass>10</Mass>
+			<Bulk>10</Bulk>
+		</statBases>
+		<ammoClass>GrenadeHE</ammoClass>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>100</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>2</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>12</Fragment_Large>
+					<Fragment_Small>80</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="ATGMBase">
+		<defName>Missile_ATGM_AP</defName>
+		<label>Anti-tank guided missile (HEAT)</label>
+		<graphicData>
+			<texPath>Things/Item/Missile_AP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>65</MarketValue>
+			<Mass>10</Mass>
+			<Bulk>10</Bulk>
+		</statBases>
+		<ammoClass>RocketHEAT</ammoClass>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>100</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>8</Fragment_Large>
+					<Fragment_Small>20</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="BaseExplosiveBullet">
+		<defName>Bullet_ATGM_HE</defName>
+		<label>Anti-tank guided missile (HE)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Missile_HE</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>152</damageAmountBase>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>40</armorPenetrationBlunt>
+			<explosionRadius>3.5</explosionRadius>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<speed>76</speed>
+			<soundAmbient>RocketPropelledLoop_Small</soundAmbient>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>20</Fragment_Large>
+					<Fragment_Small>50</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseExplosiveBullet">
+		<defName>Bullet_ATGM_AP</defName>
+		<label>Anti-tank guided missile (HEAT)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Missile_AP</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>304</damageAmountBase>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<armorPenetrationSharp>600</armorPenetrationSharp>
+			<armorPenetrationBlunt>38.687</armorPenetrationBlunt>
+			<speed>76</speed>
+			<soundAmbient>RocketPropelledLoop_Small</soundAmbient>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>127</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>4</Fragment_Large>
+					<Fragment_Small>8</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- ==================== Recipe: ATGM (HE) ========================== -->
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeMissile_ATGM_HE</defName>
+		<label>make HE anti-tank guided missile x5</label>
+		<description>Craft 5 12x64mm Grey Dale anti-tank guided missiles with high explosive warheads.</description>
+		<jobString>Making 5 HE ATGMs.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>50</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>FSX</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<researchPrerequisite Inherit="False">
+			<li>DefenceEmplacementTech</li>
+		</researchPrerequisite>
+		<recipeUsers Inherit="False">
+			<li>GDTable</li>
+		</recipeUsers>
+		<products>
+			<Missile_ATGM_HE>5</Missile_ATGM_HE>
+		</products>
+	</RecipeDef>
+
+	<!-- ==================== Recipe: ATGM (HEAT) ========================== -->
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeMissile_ATGM_AP</defName>
+		<label>make HEAT anti-tank guided missile x5</label>
+		<description>Craft 5 12x64mm Grey Dale anti-tank guided missiles with high explosive anti-tank warheads.</description>
+		<jobString>Making 5 HEAT ATGMs.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>70</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>FSX</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<researchPrerequisite Inherit="False">
+			<li>DefenceEmplacementTech</li>
+		</researchPrerequisite>
+		<recipeUsers Inherit="False">
+			<li>GDTable</li>
+		</recipeUsers>
+		<products>
+			<Missile_ATGM_AP>5</Missile_ATGM_AP>
+		</products>
+	</RecipeDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_81mmMortarShellRimsenal</defName>
+		<label>81mm mortar shells</label>
+		<ammoTypes>
+			<Shell_HighExplosive>Bullet_81mmMortarShellRimsenal_HE</Shell_HighExplosive>
+			<Shell_Incendiary>Bullet_81mmMortarShellRimsenal_Incendiary</Shell_Incendiary>
+			<Shell_EMP>Bullet_81mmMortarShellRimsenal_EMP</Shell_EMP>
+			<Shell_Firefoam>Bullet_81mmMortarShellRimsenal_Firefoam</Shell_Firefoam>
+			<Shell_Smoke>Bullet_81mmMortarShellRimsenal_Smoke</Shell_Smoke>
+			<Shell_AntigrainWarhead>Bullet_81mmMortarShellRimsenal_Antigrain</Shell_AntigrainWarhead>
+		</ammoTypes>
+		<isMortarAmmoSet>true</isMortarAmmoSet>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base81mmMortarShell">
+		<defName>Bullet_81mmMortarShellRimsenal_HE</defName>
+		<label>81mm mortar shell (HE)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Mortar/HE</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>45</speed>
+			<gravityFactor>2</gravityFactor>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>156</damageAmountBase>
+			<explosionRadius>2.5</explosionRadius>
+			<flyOverhead>false</flyOverhead>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<ai_IsIncendiary>true</ai_IsIncendiary>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>16</Fragment_Large>
+					<Fragment_Small>100</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="Base81mmMortarShell">
+		<defName>Bullet_81mmMortarShellRimsenal_Incendiary</defName>
+		<label>81mm mortar shell (Incendiary)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Mortar/Incendiary</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>45</speed>
+			<gravityFactor>2</gravityFactor>
+			<damageDef>PrometheumFlame</damageDef>
+			<damageAmountBase>6</damageAmountBase>
+			<explosionRadius>6.5</explosionRadius>
+			<flyOverhead>false</flyOverhead>
+			<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
+			<preExplosionSpawnChance>0.15</preExplosionSpawnChance>
+			<soundExplode>MortarIncendiary_Explode</soundExplode>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base81mmMortarShell">
+		<defName>Bullet_81mmMortarShellRimsenal_EMP</defName>
+		<label>81mm mortar shell (EMP)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Mortar/EMP</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>45</speed>
+			<gravityFactor>2</gravityFactor>
+			<damageDef>EMP</damageDef>
+			<damageAmountBase>156</damageAmountBase>
+			<flyOverhead>false</flyOverhead>
+			<explosionRadius>5.5</explosionRadius>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base81mmMortarShell">
+		<defName>Bullet_81mmMortarShellRimsenal_Firefoam</defName>
+		<label>81mm mortar shell (Foam)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Mortar/Firefoam</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>45</speed>
+			<gravityFactor>2</gravityFactor>
+			<damageDef>Extinguish</damageDef>
+			<suppressionFactor>0.0</suppressionFactor>
+			<dangerFactor>0.0</dangerFactor>
+			<explosionRadius>5</explosionRadius>
+			<flyOverhead>false</flyOverhead>
+			<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+			<soundExplode>Explosion_EMP</soundExplode>
+			<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+			<soundAmbient>MortarRound_Ambient</soundAmbient>
+			<postExplosionSpawnThingDef>Filth_FireFoam</postExplosionSpawnThingDef>
+			<postExplosionSpawnChance>1</postExplosionSpawnChance>
+			<postExplosionSpawnThingCount>3</postExplosionSpawnThingCount>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<explosionEffect>ExtinguisherExplosion</explosionEffect>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base81mmMortarShell">
+		<defName>Bullet_81mmMortarShellRimsenal_Smoke</defName>
+		<label>81mm mortar shell (Smoke)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Mortar/Smoke</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>45</speed>
+			<gravityFactor>2</gravityFactor>
+			<damageDef>Smoke</damageDef>
+			<suppressionFactor>0.0</suppressionFactor>
+			<dangerFactor>0.0</dangerFactor>
+			<explosionRadius>6</explosionRadius>
+			<flyOverhead>false</flyOverhead>
+			<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+			<soundExplode>Explosion_EMP</soundExplode>
+			<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+			<soundAmbient>MortarRound_Ambient</soundAmbient>
+			<postExplosionGasType>BlindSmoke</postExplosionGasType>
+			<preExplosionSpawnChance>1</preExplosionSpawnChance>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<explosionEffect>ExtinguisherExplosion</explosionEffect>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base81mmMortarShell">
+		<defName>Bullet_81mmMortarShellRimsenal_Antigrain</defName>
+		<label>81mm mortar shell (Anti)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Mortar/Antigrain</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>45</speed>
+			<gravityFactor>2</gravityFactor>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>800</damageAmountBase>
+			<explosionRadius>50</explosionRadius>
+			<explosionChanceToStartFire>0.22</explosionChanceToStartFire>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<flyOverhead>false</flyOverhead>
+			<explosionEffect>GiantExplosion</explosionEffect>
+			<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+			<soundExplode>Explosion_GiantBomb</soundExplode>
+			<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+			<soundAmbient>MortarRound_Ambient</soundAmbient>
+		</projectile>
+	</ThingDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Security/Patches/Rimsenal Security/Patch_Security.xml b/ModPatches/Rimsenal Security/Patches/Rimsenal Security/Patch_Security.xml
new file mode 100644
index 0000000000..cf54d96dd0
--- /dev/null
+++ b/ModPatches/Rimsenal Security/Patches/Rimsenal Security/Patch_Security.xml	
@@ -0,0 +1,658 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Shard Sentry ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_ShardSentry</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>0.63</SwayFactor>
+			<Bulk>8.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.78</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_RifleYP</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>55</range>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>RS_ShotShard</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>6</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>5.8</reloadTime>
+			<ammoSet>AmmoSet_RifleYP</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Wave Emitter ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_WaveEmitter</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>2.6</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>0.63</SwayFactor>
+			<Bulk>8.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.01</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_GeugGwang_CE</defaultProjectile>
+			<warmupTime>2.8</warmupTime>
+			<range>40</range>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<burstShotCount>5</burstShotCount>
+			<soundCast>RS_ShotBoreas</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>0</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>20</aimedBurstShotCount>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Nest HMG ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_NestHMG</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.89</SwayFactor>
+			<Bulk>40.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.13</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>86</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>20</burstShotCount>
+			<soundCast>HeavyMG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>250</magazineSize>
+			<reloadTime>10</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>10</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Portable MMG ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_NestMMG</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>0.92</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.06</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>62</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>ShotGRS</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>8</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== AGS ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AGS</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.20</SwayFactor>
+			<Bulk>8.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.83</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_25x40mmGrenade_HE</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>62</range>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<burstShotCount>6</burstShotCount>
+			<soundCast>ShotGdgrenade</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>42</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_25x40mmGrenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Fake Rifle ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_FakeRifle</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.00</ShotSpread>
+			<SwayFactor>0.00</SwayFactor>
+			<Bulk>7.90</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.00</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_FakeBullet_CE</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>40</range>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<burstShotCount>5</burstShotCount>
+			<soundCast>GunShotA</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Suv Turret ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SuvTurret</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>2.40</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.6</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<Bulk>11.90</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.25</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_TEConcentratedPowerCharge_KE</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
+			<burstShotCount>3</burstShotCount>
+			<soundCast>ImpactL</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>18</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Nest Missile ========== -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName = "Turret_NestMissile"]/inspectorTabs</xpath>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_NestMissile</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
+			<SightsEfficiency>3</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.25</SwayFactor>
+			<Bulk>20</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.13</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_ATGM_HE</defaultProjectile>
+			<warmupTime>2.1</warmupTime>
+			<range>86</range>
+			<soundCast>RS_ShotGrendel</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>10</reloadTime>
+			<ammoSet>AmmoSet_ATGM</ammoSet>
+		</AmmoUser>
+		<FireModes>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Molten Cannon ========== -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="MoltenShell"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Artillery_MC"]</xpath>
+		<value>
+			<ThingDef ParentName="BaseTurretGun">
+				<defName>Artillery_MC</defName>
+				<label>molten cannon</label>
+				<graphicData>
+					<texPath>Things/Building/MC</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<description>An enormous cannon that fires a projectile of molten metal. Though less useful against soft targets than conventional artillery and limited to a direct fire role, but definitely more powerful, it is nevertheless the ideal anti-mechanoid cannon, and is extensively employed in the ongoing mechanoid war on Jotunheim Prime. Fires molten shells.</description>
+				<statBases>
+					<Flammability>1.0</Flammability>
+					<WorkToMake>31500</WorkToMake>
+					<Mass>16.5</Mass>
+					<Bulk>20</Bulk>
+					<MarketValue>2000</MarketValue>
+					<SightsEfficiency>2.6</SightsEfficiency>
+					<ShotSpread>0.04</ShotSpread>
+					<SwayFactor>0.96</SwayFactor>
+					<RangedWeapon_Cooldown>2.0</RangedWeapon_Cooldown>
+				</statBases>
+				<verbs>
+					<li Class="CombatExtended.VerbPropertiesCE">
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_MoltenShell</defaultProjectile>
+						<warmupTime>4.5</warmupTime>
+						<range>86</range>
+						<soundCast>RS_ShotJI</soundCast>
+						<muzzleFlashScale>16</muzzleFlashScale>
+						<recoilPattern>Mounted</recoilPattern>
+						<targetParams>
+							<canTargetLocations>true</canTargetLocations>
+						</targetParams>
+					</li>
+				</verbs>
+				<comps>
+					<li Class="CombatExtended.CompProperties_AmmoUser">
+						<magazineSize>1</magazineSize>
+						<reloadTime>8</reloadTime>
+						<ammoSet>AmmoSet_MoltenShell</ammoSet>
+					</li>
+					<li Class="CombatExtended.CompProperties_FireModes">
+						<aiAimMode>AimedShot</aiAimMode>
+					</li>
+				</comps>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<!-- ========== Rocket Turret ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_RocketTurret</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>2.3</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.5</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>1.38</SwayFactor>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_JISiegeRocket</defaultProjectile>
+			<warmupTime>3.7</warmupTime>
+			<range>86</range>
+			<burstShotCount>4</burstShotCount>
+			<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+			<soundCast>RS_ShotGrendel</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>12</reloadTime>
+			<ammoSet>AmmoSet_JIRocket</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Cannon ========== -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName = "Turret_RSCannon"]/inspectorTabs</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Turret_RSCannon"
+			]/building/turretBurstCooldownTime </xpath>
+		<value>
+			<turretBurstCooldownTime>5</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Artillery_RSCannon</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
+			<SightsEfficiency>3</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.89</SwayFactor>
+			<Bulk>20</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.13</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_ATGM_HE</defaultProjectile>
+			<warmupTime>5</warmupTime>
+			<range>62</range>
+			<soundCast>Mortar_LaunchA</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_81mmMortarShellRimsenal</ammoSet>
+		</AmmoUser>
+		<FireModes>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Common to all Defensive Turrets ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			@Name="BaseMCBuilding" or
+			@Name="NestMissile" or
+			@Name="NestHMG" or
+			@Name="NestAGS" or
+			@Name="NestMMG" or
+			defName="Turret_RSCannon"
+			]/thingClass </xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="Turret_NestHMG" or
+			defName="Turret_NestAGS" or
+			defName="RocketTurret"or
+			defName="Turret_RSCannon"
+			]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="Turret_NestHMG" or
+			defName="Turret_NestAGS" or
+			defName="Turret_NestMMG" or
+			defName="Turret_RSCannon"
+			]/statBases </xpath>
+		<value>
+			<AimingAccuracy>0.5</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!--========== Common to all Sentry Turrets ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			@Name="ShardSentry" or
+			@Name="SuvTurret" or
+			@Name="WaveEmitter" or
+			defName="RSDummy" or
+			defName="Turret_Smartmine"
+			]/thingClass </xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="Turret_ShardSentry" or
+			defName="Turret_SuvTurret" or
+			defName="Turret_Smartmine"
+			]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="Turret_ShardSentry" or
+			defName="Turret_SuvTurret" or
+			defName="Turret_WaveEmitter" or
+			defName="RSDummy" or
+			defName="Turret_Smartmine"
+			]/statBases </xpath>
+		<value>
+			<AimingAccuracy>1.0</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="Turret_ShardSentry" or
+			defName="Turret_SuvTurret" or
+			defName="Turret_WaveEmitter" or
+			defName="RocketTurret"
+			]/statBases </xpath>
+		<value>
+			<NightVisionEfficiency>0.5</NightVisionEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="Gun_SuvTurret" or
+			defName="Gun_RocketTurret" or
+			defName="Gun_WaveEmitter" or
+			defName="Gun_ShardSentry"
+			]/statBases </xpath>
+		<value>
+			<NightVisionEfficiency_Weapon>0.5</NightVisionEfficiency_Weapon>
+		</value>
+	</Operation>
+
+	<!--========== fillpercent replacement ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			@Name="NestMissile" or
+			@Name="NestHMG" or
+			@Name="NestAGS" or
+			@Name="NestMMG" or
+			@Name="ShardSentry" or
+			@Name="SuvTurret" or
+			@Name="WaveEmitter" or
+			defName="RSDummy" or
+			defName="Turret_RSCannon"
+			]/fillPercent </xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name = "BaseMCBuilding"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Missile_HE"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Missile_AP"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			@Name = "BaseMCBuilding"]/thingClass </xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name = "BaseMCBuilding"]/inspectorTabs</xpath>
+	</Operation>
+
+	<!-- ========== Impact Mine ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ImpactMine"]/comps/li[@Class="CompProperties_Explosive"]</xpath>
+		<value>
+			<li Class="CompProperties_Explosive">
+				<explosiveDamageType>KineticImpact</explosiveDamageType>
+				<explosiveRadius>3.5</explosiveRadius>
+				<wickTicks>
+					<min>10</min>
+					<max>15</max>
+				</wickTicks>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Explosive Barrel ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FuelBarrel"]/comps/li[@Class="CompProperties_Explosive"]</xpath>
+		<value>
+			<li Class="CompProperties_Explosive">
+				<explosiveDamageType>PrometheumFlame</explosiveDamageType>
+				<explosiveRadius>3</explosiveRadius>
+				<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
+				<preExplosionSpawnChance>1</preExplosionSpawnChance>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Smart Mine ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Smartmine</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>5</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.25</ShotSpread>
+			<SwayFactor>0</SwayFactor>
+			<Bulk>10</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_RifleYP</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>5</range>
+			<soundCast>Mortar_LaunchA</soundCast>
+			<muzzleFlashScale>20</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>12</reloadTime>
+			<ammoSet>AmmoSet_81mmMortarShellRimsenal</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Xenotype Pack - Askbarn/Defs/Rimsenal Xenotype Pack - Askbarn/Ammo_Askbarn.xml b/ModPatches/Rimsenal Xenotype Pack - Askbarn/Defs/Rimsenal Xenotype Pack - Askbarn/Ammo_Askbarn.xml
new file mode 100644
index 0000000000..adc3b3eeb6
--- /dev/null
+++ b/ModPatches/Rimsenal Xenotype Pack - Askbarn/Defs/Rimsenal Xenotype Pack - Askbarn/Ammo_Askbarn.xml	
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ==================== JI Carbine ========================== -->
+
+	<CombatExtended.AmmoSetDef MayRequire="rimsenal.core">
+		<defName>AmmoSet_JICarbine</defName>
+		<label>molten slug</label>
+		<ammoTypes>
+			<Ammo_JI_Alloy>Bullet_JI_Carbine</Ammo_JI_Alloy>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base556x45mmNATOBullet" MayRequire="rimsenal.core">
+		<defName>Bullet_JI_Carbine</defName>
+		<label>Semi-molten alloy</label>
+		<graphicData>
+			<texPath>Things/Projectile/Slug</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>106</speed>
+			<dropsCasings>false</dropsCasings>
+			<damageAmountBase>14</damageAmountBase>
+			<armorPenetrationBlunt>125</armorPenetrationBlunt>
+			<armorPenetrationSharp>13</armorPenetrationSharp>
+		</projectile>
+	</ThingDef>
+
+	<!-- ====================  EMP ========================== -->
+
+	<CombatExtended.AmmoSetDef MayRequire="rimsenal.EVP">
+		<defName>AmmoSet_LaserEMP_FusterClucker</defName>
+		<label>Charge Pack (EMP)</label>
+		<ammoTypes>
+			<Ammo_LaserChargePack>EMP_FusterClucker</Ammo_LaserChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="BaseExplosiveBullet" MayRequire="rimsenal.EVP">
+		<defName>EMP_FusterClucker</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>emp blast</label>
+		<graphicData>
+			<texPath>Things/Projectile/RaceBallLightning</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>EMP</damageDef>
+			<damageAmountBase>75</damageAmountBase>
+			<speed>73</speed>
+			<flyOverhead>false</flyOverhead>
+			<explosionRadius>2</explosionRadius>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Xenotype Pack - Askbarn/Patches/Rimsenal Xenotype Pack - Askbarn/Gene_Askbarn_CE.xml b/ModPatches/Rimsenal Xenotype Pack - Askbarn/Patches/Rimsenal Xenotype Pack - Askbarn/Gene_Askbarn_CE.xml
new file mode 100644
index 0000000000..8df8bcfe28
--- /dev/null
+++ b/ModPatches/Rimsenal Xenotype Pack - Askbarn/Patches/Rimsenal Xenotype Pack - Askbarn/Gene_Askbarn_CE.xml	
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/GeneDef[defName="RSLongshot"]/statFactors</xpath>
+		<value>
+			<statFactors>
+				<AimingAccuracy>1.5</AimingAccuracy>
+			</statFactors>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Xenotype Pack - Askbarn/Patches/Rimsenal Xenotype Pack - Askbarn/Weapons_Askbarn_CE.xml b/ModPatches/Rimsenal Xenotype Pack - Askbarn/Patches/Rimsenal Xenotype Pack - Askbarn/Weapons_Askbarn_CE.xml
new file mode 100644
index 0000000000..64c2f7bd31
--- /dev/null
+++ b/ModPatches/Rimsenal Xenotype Pack - Askbarn/Patches/Rimsenal Xenotype Pack - Askbarn/Weapons_Askbarn_CE.xml	
@@ -0,0 +1,257 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Rimsenal - Core</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!-- ==========  Molten Carbine =========== -->
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/thingDef[defName="JI_Sigrun"]/statBases</xpath>
+					<value>
+						<statBases>
+							<SightsEfficiency>1.1</SightsEfficiency>
+							<ShotSpread>0.1</ShotSpread>
+							<SwayFactor>1.14</SwayFactor>
+							<Bulk>6.5</Bulk>
+							<Mass>3.4</Mass>
+							<RangedWeapon_Cooldown>0.41</RangedWeapon_Cooldown>
+						</statBases>
+					</value>
+				</li>
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/thingDef[defName="JI_Sigrun"]/verbs</xpath>
+					<value>
+						<verbs>
+							<li Class="CombatExtended.VerbPropertiesCE">
+								<recoilAmount>3.43</recoilAmount>
+								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+								<hasStandardCommand>true</hasStandardCommand>
+								<defaultProjectile>Bullet_JI_Carbine</defaultProjectile>
+								<warmupTime>1.2</warmupTime>
+								<range>35</range>
+								<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+								<burstShotCount>3</burstShotCount>
+								<soundCast>RS_ShotJI</soundCast>
+								<soundCastTail>GunTail_Medium</soundCastTail>
+								<muzzleFlashScale>12</muzzleFlashScale>
+							</li>
+						</verbs>
+					</value>
+				</li>
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/thingDef[defName="JI_Sigrun"]</xpath>
+					<value>
+						<comps>
+							<li Class="CombatExtended.CompProperties_AmmoUser">
+								<magazineSize>24</magazineSize>
+								<reloadTime>4</reloadTime>
+								<ammoSet>AmmoSet_JICarbine</ammoSet>
+							</li>
+							<li Class="CombatExtended.CompProperties_FireModes">
+								<aimedBurstShotCount>2</aimedBurstShotCount>
+								<aiUseBurstMode>TRUE</aiUseBurstMode>
+								<aiAimMode>Snapshot</aiAimMode>
+							</li>
+						</comps>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/thingDef[
+						defName="JI_Sigrun"
+						] </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>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Rimsenal - Augmented Vanilla Pack</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!-- ========== EMP Sidearm =========== -->
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>Gun_DisruptionPistol</defName>
+					<statBases>
+						<SightsEfficiency>0.7</SightsEfficiency>
+						<ShotSpread>0.15</ShotSpread>
+						<SwayFactor>1.53</SwayFactor>
+						<Bulk>2.50</Bulk>
+						<Mass>2.10</Mass>
+						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+					</statBases>
+					<Properties>
+						<recoilAmount>2.20</recoilAmount>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
+						<warmupTime>0.6</warmupTime>
+						<range>12</range>
+						<ammoConsumedPerShotCount>5</ammoConsumedPerShotCount>
+						<soundCast>Shot_ChargeRifle</soundCast>
+						<soundCastTail>GunTail_Light</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>35</magazineSize>
+						<reloadTime>4.5</reloadTime>
+						<ammoSet>AmmoSet_LaserEMP_Rimsenal</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aiAimMode>Snapshot</aiAimMode>
+					</FireModes>
+					<weaponTags>
+						<li>CE_Sidearm</li>
+						<li>CE_AI_Pistol</li>
+						<li>CE_OneHandedWeapon</li>
+						<li>AdvancedGun</li>
+					</weaponTags>
+				</li>
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Gun_DisruptionPistol"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>grip</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>2</power>
+								<cooldownTime>1.54</cooldownTime>
+								<chanceFactor>1.5</chanceFactor>
+								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>muzzle</label>
+								<capacities>
+									<li>Poke</li>
+								</capacities>
+								<power>2</power>
+								<cooldownTime>1.54</cooldownTime>
+								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<!-- ========== EMP Heavy	=========== -->
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>Gun_FusterClucker</defName>
+					<statBases>
+						<SightsEfficiency>1</SightsEfficiency>
+						<ShotSpread>0.01</ShotSpread>
+						<SwayFactor>2.18</SwayFactor>
+						<Bulk>13.00</Bulk>
+						<Mass>8.80</Mass>
+						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>EMP_FusterClucker</defaultProjectile>
+						<warmupTime>2.6</warmupTime>
+						<range>75</range>
+						<ammoConsumedPerShotCount>100</ammoConsumedPerShotCount>
+						<soundCast>Shot_ChargeRifle</soundCast>
+						<soundCastTail>GunTail_Heavy</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>100</magazineSize>
+						<reloadTime>5</reloadTime>
+						<ammoSet>AmmoSet_LaserEMP_FusterClucker</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aiAimMode>AimedShot</aiAimMode>
+					</FireModes>
+					<weaponTags>
+						<li>AdvancedGun</li>
+					</weaponTags>
+				</li>
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Gun_FusterClucker"]/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>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimworld - The Dark Descent/Patches/Rimworld - The Dark Descent/Patch_Items.xml b/ModPatches/Rimworld - The Dark Descent/Patches/Rimworld - The Dark Descent/Patch_Items.xml
new file mode 100644
index 0000000000..32d1263edb
--- /dev/null
+++ b/ModPatches/Rimworld - The Dark Descent/Patches/Rimworld - The Dark Descent/Patch_Items.xml	
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "DarkDescent_Orb"]/statBases</xpath>
+		<value>
+			<Bulk>1.5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "DarkDescent_Vitae" or defName = "DarkDescent_Orgone"]/statBases</xpath>
+		<value>
+			<Bulk>0.5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name = "DarkDescent_InactiveBase"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimworld - The Dark Descent/Patches/Rimworld - The Dark Descent/Patch_Races.xml b/ModPatches/Rimworld - The Dark Descent/Patches/Rimworld - The Dark Descent/Patch_Races.xml
new file mode 100644
index 0000000000..566f8471ff
--- /dev/null
+++ b/ModPatches/Rimworld - The Dark Descent/Patches/Rimworld - The Dark Descent/Patch_Races.xml	
@@ -0,0 +1,541 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="DarkDescent_CreationBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="DarkDescent_CreationBase"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!-- Grunt -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DarkDescent_Grunt"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.14</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0.07</MeleeParryChance>
+			<PainShockThreshold>0.85</PainShockThreshold>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DarkDescent_Grunt"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.9</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.50</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.203</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.406</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>4.60</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.825</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Brute -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DarkDescent_Brute"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.10</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
+			<PainShockThreshold>0.90</PainShockThreshold>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DarkDescent_Brute"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DarkDescent_Brute"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DarkDescent_Brute"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grafted blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2.2</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.40</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.96</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.9</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.706</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>4.80</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.825</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Goliath -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DarkDescent_Goliath"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.10</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
+			<PainShockThreshold>0.90</PainShockThreshold>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DarkDescent_Goliath"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DarkDescent_Goliath"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DarkDescent_Goliath"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grafted blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.2</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.65</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.9</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>4.80</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Tesla -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DarkDescent_Tesla"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.12</MeleeDodgeChance>
+			<MeleeCritChance>0.06</MeleeCritChance>
+			<MeleeParryChance>0.08</MeleeParryChance>
+			<PainShockThreshold>0.99</PainShockThreshold>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DarkDescent_Tesla"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DarkDescent_Tesla"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>14</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DarkDescent_Tesla"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<extraMeleeDamages>
+						<li>
+							<def>EMP</def>
+							<amount>5</amount>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>2.3</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.203</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<extraMeleeDamages>
+						<li>
+							<def>EMP</def>
+							<amount>5</amount>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>2.3</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.203</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.70</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Wretch -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DarkDescent_Wretch"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.14</MeleeDodgeChance>
+			<MeleeCritChance>0.06</MeleeCritChance>
+			<MeleeParryChance>0.07</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DarkDescent_Wretch"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.58</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.58</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.96</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Engineer -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DarkDescent_Engineer"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.10</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0.03</MeleeParryChance>
+			<PainShockThreshold>0.80</PainShockThreshold>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DarkDescent_Engineer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.4</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.406</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.4</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.406</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>4.60</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.825</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Harvester -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DarkDescent_Harvester"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.10</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0.03</MeleeParryChance>
+			<PainShockThreshold>0.80</PainShockThreshold>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DarkDescent_Harvester"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hand</label>
+					<capacities>
+						<li>DarkDescent_HarvesterScratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.9</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.50</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.203</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hand</label>
+					<capacities>
+						<li>DarkDescent_HarvesterScratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.9</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.50</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.203</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>4.60</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.825</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Hound -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="DarkDescent_Hound"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DarkDescent_Hound"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>6.25</MoveSpeed>
+			<MeleeDodgeChance>0.26</MeleeDodgeChance>
+			<MeleeCritChance>0.09</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DarkDescent_Hound"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.73</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.55</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.225</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimworld - The Dark Descent/Patches/Rimworld - The Dark Descent/Patch_Scenarios.xml b/ModPatches/Rimworld - The Dark Descent/Patches/Rimworld - The Dark Descent/Patch_Scenarios.xml
new file mode 100644
index 0000000000..8f62d976f2
--- /dev/null
+++ b/ModPatches/Rimworld - The Dark Descent/Patches/Rimworld - The Dark Descent/Patch_Scenarios.xml	
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="DarkDescent_TheDarkDescent"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_303British_FMJ</thingDef>
+				<count>200</count>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Risk of Rain UES Contact Light Armory/Patches/Risk of Rain UES Contact Light Armory/Risk_Of_Rain_Armor_Patches.xml b/ModPatches/Risk of Rain UES Contact Light Armory/Patches/Risk of Rain UES Contact Light Armory/Risk_Of_Rain_Armor_Patches.xml
new file mode 100644
index 0000000000..e5885174a3
--- /dev/null
+++ b/ModPatches/Risk of Rain UES Contact Light Armory/Patches/Risk of Rain UES Contact Light Armory/Risk_Of_Rain_Armor_Patches.xml	
@@ -0,0 +1,721 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Add new layer coverage to all Helmets -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_BladeMarine_Helmet" or defName="RoRA_Conscript_Helmet" or defName="RoRA_Enforcer_Helmet" or defName="RoRA_Miner_Helmet" or defName="RoRA_Engineer_Helmet" or defName="RoRA_Ranger_Helmet" or defName="RoRA_Specialist_Helmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+	<!-- Add SmokeSensitivity to all Helmets -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_BladeMarine_Helmet" or defName="RoRA_Conscript_Helmet" or defName="RoRA_Enforcer_Helmet" or defName="RoRA_Miner_Helmet" or defName="RoRA_Engineer_Helmet" or defName="RoRA_Ranger_Helmet" or defName="RoRA_Specialist_Helmet"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+	<!-- Add Partial Armor to Helmets -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RoRA_BladeMarine_Helmet" or defName="RoRA_Conscript_Helmet" or defName="RoRA_Enforcer_Helmet" or defName="RoRA_Miner_Helmet" or defName="RoRA_Engineer_Helmet" or defName="RoRA_Ranger_Helmet" or defName="RoRA_Specialist_Helmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+	<!-- Add partial armor for all armors-->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="RoRA_BladeMarine_Armor" or defName="RoRA_Conscript_Armor" or defName="RoRA_Enforcer_Armor" or defName="RoRA_Miner_Armor" or defName="RoRA_Engineer_Armor" or defName="RoRA_Ranger_Armor" or defName="RoRA_Specialist_Armor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+	<!-- ================================ BLADEMARINE  ================================ -->
+	<Operation Class="PatchOperationReplace">
+		<!-- Blademarine Helmet -->
+		<xpath>Defs/ThingDef[defName="RoRA_BladeMarine_Helmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>260</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_BladeMarine_Helmet"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>0.25</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoRA_BladeMarine_Helmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>23</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoRA_BladeMarine_Helmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>48</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_BladeMarine_Helmet"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.20</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+			<ToxicEnvironmentResistance>0.80</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<!-- Blademarine Armor -->
+		<xpath>Defs/ThingDef[defName="RoRA_BladeMarine_Armor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>490</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoRA_BladeMarine_Armor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>45</Mass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_BladeMarine_Armor"]/statBases</xpath>
+		<value>
+			<Bulk>90</Bulk>
+			<WornBulk>12</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoRA_BladeMarine_Armor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoRA_BladeMarine_Armor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>48</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_BladeMarine_Armor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>75</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+			<ToxicEnvironmentResistance>0.20</ToxicEnvironmentResistance>
+			<MeleeCritChance>0.55</MeleeCritChance>
+			<MeleeParryChance>0.5</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_BladeMarine_Armor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_BladeMarine_Armor"]/apparel/layers</xpath>
+		<value>
+			<li>Middle</li>
+		</value>
+	</Operation>
+	<!-- ================================ CONSCRIPT  ================================ -->
+	<Operation Class="PatchOperationReplace">
+		<!-- Conscript Helmet -->
+		<xpath>Defs/ThingDef[defName="RoRA_Conscript_Helmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>200</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_Conscript_Helmet"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>0.25</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoRA_Conscript_Helmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>17</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoRA_Conscript_Helmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>39</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_Conscript_Helmet"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingAccuracy>0.08</AimingAccuracy>
+			<ToxicEnvironmentResistance>0.9</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<!-- Conscript Armor -->
+		<xpath>Defs/ThingDef[defName="RoRA_Conscript_Armor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>440</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoRA_Conscript_Armor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>40</Mass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_Conscript_Armor"]/statBases</xpath>
+		<value>
+			<Bulk>70</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RoRA_Conscript_Armor"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_Conscript_Armor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>60</CarryWeight>
+			<CarryBulk>15</CarryBulk>
+			<ToxicEnvironmentResistance>0.10</ToxicEnvironmentResistance>
+			<ReloadSpeed>0.5</ReloadSpeed>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoRA_Conscript_Armor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoRA_Conscript_Armor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>40</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_Conscript_Armor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_Conscript_Armor"]/apparel/layers</xpath>
+		<value>
+			<li>Middle</li>
+		</value>
+	</Operation>
+	<!-- ================================ ENFORCER helmet  ================================ -->
+	<Operation Class="PatchOperationReplace">
+		<!-- Enforcer Helmet -->
+		<xpath>Defs/ThingDef[defName="RoRA_Enforcer_Helmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>260</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_Enforcer_Helmet"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoRA_Enforcer_Helmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoRA_Enforcer_Helmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>50</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_Enforcer_Helmet"]/equippedStatOffsets</xpath>
+		<value>
+			<Suppressability>-0.25</Suppressability>
+			<ToxicEnvironmentResistance>0.80</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<!-- Emforcer Armor -->
+		<xpath>Defs/ThingDef[defName="RoRA_Enforcer_Armor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>560</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoRA_Enforcer_Armor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>60</Mass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_Enforcer_Armor"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoRA_Enforcer_Armor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>29</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoRA_Enforcer_Armor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>52</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RoRA_Enforcer_Armor"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_Enforcer_Armor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>90</CarryWeight>
+			<CarryBulk>15</CarryBulk>
+			<ToxicEnvironmentResistance>0.20</ToxicEnvironmentResistance>
+			<Suppressability>-0.50</Suppressability>
+			<ReloadSpeed>0.25</ReloadSpeed>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_Enforcer_Armor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_Enforcer_Armor"]/apparel/layers</xpath>
+		<value>
+			<li>Middle</li>
+		</value>
+	</Operation>
+	<!-- ================================ ENGINEER  ================================ -->
+	<!-- Engineer Helmet -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoRA_Engineer_Helmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>220</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_Engineer_Helmet"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>0.25</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoRA_Engineer_Helmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>17</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoRA_Engineer_Helmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>42</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_Engineer_Helmet"]/equippedStatOffsets</xpath>
+		<value>
+			<ToxicEnvironmentResistance>0.70</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<!-- Engineer Armor -->
+		<xpath>Defs/ThingDef[defName="RoRA_Engineer_Armor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>440</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoRA_Engineer_Armor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>40</Mass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_Engineer_Armor"]/statBases</xpath>
+		<value>
+			<Bulk>80</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoRA_Engineer_Armor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>19</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoRA_Engineer_Armor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>48</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RoRA_Engineer_Armor"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_Engineer_Armor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>85</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_Engineer_Armor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_Engineer_Armor"]/apparel/layers</xpath>
+		<value>
+			<li>Middle</li>
+		</value>
+	</Operation>
+	<!-- ================================ SPECIALIST  ================================ -->
+	<!-- Specialist Helmet -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoRA_Specialist_Helmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>220</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_Specialist_Helmet"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoRA_Specialist_Helmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>22</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoRA_Specialist_Helmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>48</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_Specialist_Helmet"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingAccuracy>0.25</AimingAccuracy>
+			<Suppressability>-0.15</Suppressability>
+			<ToxicEnvironmentResistance>0.60</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<!-- Specialist Armor -->
+		<xpath>Defs/ThingDef[defName="RoRA_Specialist_Armor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>520</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoRA_Specialist_Armor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>55</Mass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoRA_Specialist_Armor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoRA_Specialist_Armor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>48</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_Specialist_Armor"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RoRA_Specialist_Armor"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_Specialist_Armor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>100</CarryWeight>
+			<CarryBulk>25</CarryBulk>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			<Suppressability>-0.35</Suppressability>
+			<ReloadSpeed>0.25</ReloadSpeed>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_Specialist_Armor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_Specialist_Armor"]/apparel/layers</xpath>
+		<value>
+			<li>Middle</li>
+		</value>
+	</Operation>
+	<!-- ================================ RANGER  ================================ -->
+	<Operation Class="PatchOperationReplace">
+		<!-- Ranger Helmet -->
+		<xpath>Defs/ThingDef[defName="RoRA_Ranger_Helmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>200</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_Ranger_Helmet"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingAccuracy>0.25</AimingAccuracy>
+			<ToxicEnvironmentResistance>0.60</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoRA_Ranger_Helmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>19</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoRA_Ranger_Helmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>40</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_Ranger_Helmet"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>0.25</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<!-- Ranger Armor -->
+		<xpath>Defs/ThingDef[defName="RoRA_Ranger_Armor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>480</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoRA_Ranger_Armor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>40</Mass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoRA_Ranger_Armor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoRA_Ranger_Armor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>42</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_Ranger_Armor"]/statBases</xpath>
+		<value>
+			<Bulk>70</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_Ranger_Armor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>75</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_Ranger_Armor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_Ranger_Armor"]/apparel/layers</xpath>
+		<value>
+			<li>Middle</li>
+		</value>
+	</Operation>
+	<!-- ================================ MINER  ================================ -->
+	<Operation Class="PatchOperationReplace">
+		<!-- Miner Helmet -->
+		<xpath>Defs/ThingDef[defName="RoRA_Miner_Helmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>200</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoRA_Miner_Helmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>22</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoRA_Miner_Helmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_Miner_Helmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_Miner_Helmet"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingAccuracy>0.10</AimingAccuracy>
+			<ToxicEnvironmentResistance>0.60</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<!-- Miner Armor -->
+		<xpath>Defs/ThingDef[defName="RoRA_Miner_Armor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>510</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoRA_Miner_Armor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>50</Mass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoRA_Miner_Armor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>23</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RoRA_Miner_Armor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_Miner_Armor"]/statBases</xpath>
+		<value>
+			<Bulk>95</Bulk>
+			<WornBulk>12</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RoRA_Miner_Armor"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_Miner_Armor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>90</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_Miner_Armor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RoRA_Miner_Armor"]/apparel/layers</xpath>
+		<value>
+			<li>Middle</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rockmen Race/Patches/Rockmen Race/PawnKinds_Rockmen.xml b/ModPatches/Rockmen Race/Patches/Rockmen Race/PawnKinds_Rockmen.xml
new file mode 100644
index 0000000000..59e77adeda
--- /dev/null
+++ b/ModPatches/Rockmen Race/Patches/Rockmen Race/PawnKinds_Rockmen.xml	
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="RockmanBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>18</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="RockmanCivBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RockmanGuard"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="RockmanMilBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>8</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="RockmanGrenadier"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>12</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rockmen Race/Patches/Rockmen Race/Rockmen_Race.xml b/ModPatches/Rockmen Race/Patches/Rockmen Race/Rockmen_Race.xml
new file mode 100644
index 0000000000..dfcc4681f1
--- /dev/null
+++ b/ModPatches/Rockmen Race/Patches/Rockmen Race/Rockmen_Race.xml	
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Rockman"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Rockman"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<CarryWeight>40</CarryWeight>
+			<CarryBulk>30</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Rockman"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.75</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Rockman"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Rockman"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.07</chanceFactor>
+					<soundMeleeHit>Pawn_Melee_HumanBite_Hit</soundMeleeHit>
+					<soundMeleeMiss>Pawn_Melee_HumanBite_Miss</soundMeleeMiss>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Checking if "Alien_Rockman" has a <comps> node and adding it if it doesn't exist -->
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Rockman"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Rockman"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Rockman"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<!-- === Rockman Leather === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Rockman"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.08</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Rockman"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.055</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Rockman"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.15</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Leather_Rockman"]/stuffProps</xpath>
+		<value>
+			<categories>
+				<li>SoftArmor</li>
+			</categories>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Rockmen Race/Patches/Rockmen Race/Rockmen_Scenario.xml b/ModPatches/Rockmen Race/Patches/Rockmen Race/Rockmen_Scenario.xml
new file mode 100644
index 0000000000..53ebaef89f
--- /dev/null
+++ b/ModPatches/Rockmen Race/Patches/Rockmen Race/Rockmen_Scenario.xml	
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="RockmansTribeScenario"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_Arrow_Stone</thingDef>
+				<count>100</count>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="RockmansTribeScenario"]/scenario/parts/li[thingDef="Pila"]</xpath>
+		<value>
+			<count>10</count>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Royal Arsenal - Speciality Weapons/Defs/Royal Arsenal - Speciality Weapons/Ammo_6x28Spark.xml b/ModPatches/Royal Arsenal - Speciality Weapons/Defs/Royal Arsenal - Speciality Weapons/Ammo_6x28Spark.xml
new file mode 100644
index 0000000000..bda70c428b
--- /dev/null
+++ b/ModPatches/Royal Arsenal - Speciality Weapons/Defs/Royal Arsenal - Speciality Weapons/Ammo_6x28Spark.xml	
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+<ThingCategoryDef>
+<defName>Ammo6x28mmRoyalSpark</defName>
+<label>6x28mm Royal spark</label>
+<parent>AmmoAdvanced</parent>
+<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
+</ThingCategoryDef>
+
+<!-- ==================== AmmoSet ========================== -->
+
+<CombatExtended.AmmoSetDef>
+<defName>AmmoSet_6x28mmSpark</defName>
+<label>6x28mm Royal Spark</label>
+<ammoTypes>
+	<Ammo_6x28mmSpark>Bullet_6x28mmSpark</Ammo_6x28mmSpark>
+</ammoTypes>
+</CombatExtended.AmmoSetDef>
+
+<!-- ==================== Ammo ========================== -->
+
+<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+<defName>Ammo_6x28mmSpark</defName>
+<label>6x28mm Royal spark cartridge</label>
+<description>Specialty ionized royal charged ammo designed by the Empire during its prime. Can be used by zeusrifles.</description>
+<statBases>
+	<Mass>0.01</Mass>
+	<Bulk>0.01</Bulk>
+	<MarketValue>1.5</MarketValue>
+</statBases>
+<tradeTags>
+	<li>CE_AutoEnableTrade</li>
+	<li>CE_AutoEnableCrafting_FabricationBench</li>
+</tradeTags>
+<thingCategories>
+	<li>Ammo6x28mmRoyalSpark</li>
+</thingCategories>
+<stackLimit>5000</stackLimit>	
+
+<graphicData>
+	<texPath>Things/Ammo/Charged/MediumIon</texPath>
+	<graphicClass>Graphic_StackCount</graphicClass>
+</graphicData>
+<ammoClass>Ionized</ammoClass>
+</ThingDef>
+
+<!-- ================== Projectiles ================== -->
+
+<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseBulletCE">
+<defName>Bullet_6x28mmSpark</defName>
+<label>6x28mm Royal Charged bullet</label>
+<graphicData>
+	<texPath>Things/Projectiles/ZeusShot</texPath>
+	<graphicClass>Graphic_Single</graphicClass>
+</graphicData>
+<projectile Class="CombatExtended.ProjectilePropertiesCE">
+	<damageDef>Bullet</damageDef>
+	<speed>160</speed>
+	<damageAmountBase>22</damageAmountBase>
+	<secondaryDamage>
+		<li>
+			<def>EMP</def>
+			<amount>12</amount>
+		</li>
+	</secondaryDamage>
+	<empShieldBreakChance>0.5</empShieldBreakChance>
+	<armorPenetrationSharp>36</armorPenetrationSharp>
+	<armorPenetrationBlunt>32</armorPenetrationBlunt>
+</projectile>
+</ThingDef>
+
+<!-- ==================== Recipes ========================== -->
+
+<RecipeDef ParentName="AmmoRecipeBase">
+<defName>MakeAmmo_6x28mmSpark</defName>
+<label>make 6x28mm Royal spark cartridge x500</label>
+<description>Craft 500 6x28mm Royal spark cartridges.</description>
+<researchPrerequisite>RA_ExperimentalRoyal</researchPrerequisite>
+<jobString>Making 6x28mm Royal spark cartridges.</jobString>
+<ingredients>
+<li>
+	<filter>
+	<thingDefs>
+		<li>Plasteel</li>
+	</thingDefs>
+	</filter>
+	<count>8</count>
+</li>
+<li>
+	<filter>
+	<thingDefs>
+		<li>Uranium</li>
+	</thingDefs>
+	</filter>
+	<count>6</count>
+</li>	    
+<li>
+	<filter>
+	<thingDefs>
+		<li>ComponentIndustrial</li>
+	</thingDefs>
+	</filter>
+	<count>8</count>
+</li>
+</ingredients>
+<fixedIngredientFilter>
+<thingDefs>
+	<li>Plasteel</li>
+	<li>Uranium</li>				
+	<li>ComponentIndustrial</li>
+</thingDefs>
+</fixedIngredientFilter>
+<products>
+<Ammo_6x28mmSpark>500</Ammo_6x28mmSpark>
+</products>
+<workAmount>8600</workAmount>		
+</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Royal Arsenal - Speciality Weapons/Defs/Royal Arsenal - Speciality Weapons/Ammo_ThunderJavelins.xml b/ModPatches/Royal Arsenal - Speciality Weapons/Defs/Royal Arsenal - Speciality Weapons/Ammo_ThunderJavelins.xml
new file mode 100644
index 0000000000..e36fcf2899
--- /dev/null
+++ b/ModPatches/Royal Arsenal - Speciality Weapons/Defs/Royal Arsenal - Speciality Weapons/Ammo_ThunderJavelins.xml	
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- ================== Projectiles ================== -->
+
+<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseProjectileNeolithic">
+	<defName>ThunderJavelin_Thrown</defName>
+	<graphicData>
+		<texPath>Things/Projectiles/ThunderJavelinProjectile</texPath>
+		<graphicClass>Graphic_Single</graphicClass>
+	</graphicData>
+	<label>thunder javelin (thrown)</label>
+	<projectile Class="CombatExtended.ProjectilePropertiesCE">
+		<damageDef>Bomb</damageDef>
+		<damageAmountBase>80</damageAmountBase>
+		<speed>16</speed>
+		<explosionRadius>1</explosionRadius>
+		<soundExplode>MortarBomb_Explode</soundExplode>
+	</projectile>
+</ThingDef>
+
+
+<!-- ==================== Recipes ========================== -->
+<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+	<defName>MakeAmmo_ThunderJavelins</defName>
+	<label>make thunder javelin x5</label>
+	<description>Craft 5 thunder javelins.</description>
+	<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+	<workSkill>Crafting</workSkill>
+	<recipeUsers>
+		<li>FabricationBench</li>
+	</recipeUsers>
+	<researchPrerequisite>RA_ExperimentalRoyal</researchPrerequisite>
+	<effectWorking>Smelt</effectWorking>
+	<unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
+	<workAmount>7500</workAmount>	
+	<jobString>Making thunder javelins.</jobString>
+	<ingredients>
+	<li>
+		<filter>
+			<thingDefs>
+				<li>Plasteel</li>
+			</thingDefs>
+		</filter>
+		<count>25</count>
+	</li>
+	<li>
+		<filter>
+			<thingDefs>
+				<li>Uranium</li>
+			</thingDefs>
+		</filter>
+		<count>20</count>
+	</li>
+	<li>
+		<filter>
+			<thingDefs>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</filter>
+		<count>10</count>
+	</li>
+	</ingredients>
+	<fixedIngredientFilter>
+		<thingDefs>
+			<li>Plasteel</li>
+			<li>Uranium</li>
+				<li>ComponentIndustrial</li>
+		</thingDefs>
+	</fixedIngredientFilter>
+	<products>
+		<RA_ThunderJavelins>5</RA_ThunderJavelins>
+	</products>
+</RecipeDef>
+  
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Royal Arsenal - Speciality Weapons/Patches/Royal Arsenal - Speciality Weapons/RangedWeapons.xml b/ModPatches/Royal Arsenal - Speciality Weapons/Patches/Royal Arsenal - Speciality Weapons/RangedWeapons.xml
new file mode 100644
index 0000000000..f83c6864a3
--- /dev/null
+++ b/ModPatches/Royal Arsenal - Speciality Weapons/Patches/Royal Arsenal - Speciality Weapons/RangedWeapons.xml	
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Thunder Javelins -->
+
+<Operation Class="PatchOperationAttributeSet">
+	<xpath>Defs/ThingDef[defName="RA_ThunderJavelins"]</xpath>
+	<attribute>ParentName</attribute>
+	<value>BaseWeapon</value>
+</Operation>
+
+<Operation Class="PatchOperationRemove">
+	<xpath>Defs/ThingDef[defName="RA_ThunderJavelins"]/costList</xpath>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RA_ThunderJavelins"]/graphicData</xpath>
+	<value>
+		<graphicData>
+			<texPath>ThirdParty/RoyalArsenal/ThunderJavelin</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="RA_ThunderJavelins"]</xpath>
+	<value>
+		<thingCategories>
+			<li>WeaponsRanged</li>
+		</thingCategories>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationAdd">
+	<xpath>Defs/ThingDef[defName="RA_ThunderJavelins"]/weaponTags</xpath>
+	<value>
+		<li>CE_OneHandedWeapon</li>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationRemove">
+	<xpath>Defs/ThingDef[defName="RA_ThunderJavelins"]/recipeMaker</xpath>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RA_ThunderJavelins"]/statBases</xpath>
+	<value>
+		<statBases>
+			<MarketValue>7.26</MarketValue>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>1.5</ShotSpread>
+			<SwayFactor>2.5</SwayFactor>
+			<Bulk>3</Bulk>
+			<Mass>1.75</Mass>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<stackLimit>25</stackLimit>
+		<techLevel>Ultra</techLevel>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RA_ThunderJavelins"]/verbs</xpath>
+	<value>
+		<verbs>
+			<li Class="CombatExtended.VerbPropertiesCE">
+				<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+				<hasStandardCommand>true</hasStandardCommand>
+				<defaultProjectile>ThunderJavelin_Thrown</defaultProjectile>
+				<warmupTime>0.8</warmupTime>
+				<range>20</range>
+				<soundCast>Interact_BeatFire</soundCast>
+				<targetParams>
+					<canTargetLocations>true</canTargetLocations>
+				</targetParams>									
+			</li>
+		</verbs>
+	</value>
+</Operation>
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RA_ThunderJavelins"]/tools</xpath>
+	<value>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>shaft</label>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<power>7</power>
+				<cooldownTime>1.35</cooldownTime>
+				<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+			</li>
+		</tools>
+	</value>
+</Operation>
+	
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Royal Arsenal/Defs/Royal Arsenal/Ammo/Ammo_5x35RoyalCharged.xml b/ModPatches/Royal Arsenal/Defs/Royal Arsenal/Ammo/Ammo_5x35RoyalCharged.xml
new file mode 100644
index 0000000000..377c59da2b
--- /dev/null
+++ b/ModPatches/Royal Arsenal/Defs/Royal Arsenal/Ammo/Ammo_5x35RoyalCharged.xml	
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_5x35mmRoyal</defName>
+		<label>5x35mm Charged</label>
+		<ammoTypes>
+			<Ammo_5x35mmCharged>Bullet_5x35mmRoyal</Ammo_5x35mmCharged>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseBulletCE">
+		<defName>Bullet_5x35mmRoyal</defName>
+		<label>5x35mm Royal charged bullet</label>
+		<graphicData>
+			<texPath>Things/Projectiles/RoyalLanceShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>(3,3)</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>16</damageAmountBase>
+			<speed>200</speed>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>5</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>40</armorPenetrationSharp>
+			<armorPenetrationBlunt>70</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Royal Arsenal/Defs/Royal Arsenal/Ammo/Ammo_6x24RoyalCharged.xml b/ModPatches/Royal Arsenal/Defs/Royal Arsenal/Ammo/Ammo_6x24RoyalCharged.xml
new file mode 100644
index 0000000000..c7150fcf58
--- /dev/null
+++ b/ModPatches/Royal Arsenal/Defs/Royal Arsenal/Ammo/Ammo_6x24RoyalCharged.xml	
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- ==================== AmmoSet ========================== -->
+
+<CombatExtended.AmmoSetDef>
+	<defName>AmmoSet_6x24mmRoyal</defName>
+	<label>6x24mm Charged</label>
+	<ammoTypes>
+		<Ammo_6x24mmCharged>Bullet_6x24mmRoyal</Ammo_6x24mmCharged>
+		<Ammo_6x24mmCharged_AP>Bullet_6x24mmRoyal_AP</Ammo_6x24mmCharged_AP>
+		<Ammo_6x24mmCharged_Ion>Bullet_6x24mmRoyal_Ion</Ammo_6x24mmCharged_Ion>
+	</ammoTypes>
+	<similarTo>AmmoSet_ChargedRifle</similarTo>
+</CombatExtended.AmmoSetDef>
+
+<!-- ================== Projectiles ================== -->
+
+<ThingDef Class="CombatExtended.AmmoDef" Name="Base6x24mmRoyalBullet" ParentName="BaseBulletCE" Abstract="true">
+	<graphicData>
+		<texPath>Things/Projectiles/RoyalChargeShot</texPath>
+		<graphicClass>Graphic_Single</graphicClass>
+	</graphicData>
+	<projectile Class="CombatExtended.ProjectilePropertiesCE">
+		<damageDef>Bullet</damageDef>
+		<speed>160</speed>
+	</projectile>
+</ThingDef>
+
+<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmRoyalBullet">
+	<defName>Bullet_6x24mmRoyal</defName>
+	<label>6x24mm Royal Charged bullet</label>
+	<projectile Class="CombatExtended.ProjectilePropertiesCE">
+		<damageAmountBase>15</damageAmountBase>
+		<secondaryDamage>
+		<li>
+			<def>Bomb_Secondary</def>
+			<amount>5</amount>
+		</li>
+		</secondaryDamage>
+		<armorPenetrationSharp>16</armorPenetrationSharp>
+		<armorPenetrationBlunt>28</armorPenetrationBlunt>
+	</projectile>
+</ThingDef>
+
+<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmRoyalBullet">
+	<defName>Bullet_6x24mmRoyal_AP</defName>
+	<label>6x24mm Royal Charged bullet (Conc.)</label>
+	<projectile Class="CombatExtended.ProjectilePropertiesCE">
+		<damageAmountBase>12</damageAmountBase>
+		<secondaryDamage>
+		<li>
+			<def>Bomb_Secondary</def>
+			<amount>3</amount>
+		</li>
+		</secondaryDamage>
+		<armorPenetrationSharp>35</armorPenetrationSharp>
+		<armorPenetrationBlunt>30</armorPenetrationBlunt>
+	</projectile>
+</ThingDef>
+
+<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmRoyalBullet">
+	<defName>Bullet_6x24mmRoyal_Ion</defName>
+	<label>6x24mm Royal Charged bullet (Ion)</label>
+	<projectile Class="CombatExtended.ProjectilePropertiesCE">
+		<damageAmountBase>10</damageAmountBase>
+		<secondaryDamage>
+		<li>
+			<def>EMP</def>
+			<amount>6</amount>
+		</li>
+		</secondaryDamage>
+		<armorPenetrationSharp>25</armorPenetrationSharp>
+		<armorPenetrationBlunt>27</armorPenetrationBlunt>
+		<empShieldBreakChance>0.3</empShieldBreakChance>
+	</projectile>
+</ThingDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Royal Arsenal/Defs/Royal Arsenal/Ammo/Ammo_MonoArrow.xml b/ModPatches/Royal Arsenal/Defs/Royal Arsenal/Ammo/Ammo_MonoArrow.xml
new file mode 100644
index 0000000000..16292d7609
--- /dev/null
+++ b/ModPatches/Royal Arsenal/Defs/Royal Arsenal/Ammo/Ammo_MonoArrow.xml	
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- ==================== Ammo Classes ========================== -->
+
+<CombatExtended.AmmoCategoryDef>
+	<defName>Mono-AP</defName>
+	<label>Mono-bodkin</label>
+	<labelShort>bodkin</labelShort>
+	<description>Mono-sharpened bodkin arrows that can penetrate thick armor.</description>
+	<advanced>true</advanced>
+</CombatExtended.AmmoCategoryDef>
+
+<CombatExtended.AmmoCategoryDef>
+	<defName>Mono-Heavy</defName>
+	<label>Mono-broadhead</label>
+	<labelShort>broadhead</labelShort>
+	<description>Mono-sharpened broadhead arrows that have less penetrative power, but will cause more damage when they can penetrate.</description>
+	<advanced>true</advanced>
+</CombatExtended.AmmoCategoryDef>
+
+<!-- ==================== AmmoSet ========================== -->
+
+<ThingCategoryDef>
+	<defName>AmmoMonoArrow</defName>
+	<label>Mono arrow</label>
+	<parent>AmmoAdvanced</parent>
+	<iconPath>UI/Icons/ThingCategories/CaliberArrow</iconPath>
+</ThingCategoryDef>
+	
+<CombatExtended.AmmoSetDef>
+	<defName>AmmoSet_MonoArrow</defName>
+	<label>Mono arrow</label>
+	<ammoTypes>
+		<Ammo_MonoArrow>Projectile_MonoArrow</Ammo_MonoArrow>
+		<Ammo_MonoArrow_Broad>Projectile_MonoArrow_Broad</Ammo_MonoArrow_Broad>
+	</ammoTypes>
+</CombatExtended.AmmoSetDef>
+
+<!-- ==================== Ammo ========================== -->
+
+<ThingDef Class="CombatExtended.AmmoDef" Name="MonoArrowBase" ParentName="SpacerSmallAmmoBase" Abstract="True">
+	<description>Specilized plasteel arrows that can be sharpened to a mono-molecular edge before being fired by a mono-longbow.</description>
+	<statBases>
+		<Mass>0.012</Mass>
+		<Bulk>0.01</Bulk>
+	</statBases>
+	<tradeTags>
+		<li>CE_AutoEnableTrade</li>
+		<li>CE_AutoEnableCrafting_FabricationBench</li>
+	</tradeTags>
+	<thingCategories>
+		<li>AmmoMonoArrow</li>
+	</thingCategories>
+	<stackLimit>1000</stackLimit>	
+</ThingDef>
+
+<ThingDef Class="CombatExtended.AmmoDef" ParentName="MonoArrowBase">
+	<defName>Ammo_MonoArrow</defName>
+	<label>Mono Arrow (Bodkin)</label>
+	<graphicData>
+		<texPath>ThirdParty/RoyalArsenal/MonoBodkin</texPath>
+		<graphicClass>Graphic_StackCount</graphicClass>
+	</graphicData>
+	<statBases>
+		<MarketValue>1.2</MarketValue>
+	</statBases>
+	<ammoClass>Mono-AP</ammoClass>
+</ThingDef>
+
+<ThingDef Class="CombatExtended.AmmoDef" ParentName="MonoArrowBase">
+	<defName>Ammo_MonoArrow_Broad</defName>
+	<label>Mono Arrow (Broadhead)</label>
+	<graphicData>
+		<texPath>ThirdParty/RoyalArsenal/MonoBroadhead</texPath>
+		<graphicClass>Graphic_StackCount</graphicClass>
+	</graphicData>
+	<statBases>
+		<MarketValue>1.2</MarketValue>
+	</statBases>
+	<ammoClass>Mono-Heavy</ammoClass>
+</ThingDef>
+
+<!-- ================== Projectiles ================== -->
+
+<ThingDef Class="CombatExtended.AmmoDef" Name="BaseMonoArrowProjectile" ParentName="BaseBulletCE" Abstract="true">
+	<graphicData>
+		<texPath>Things/Projectiles/Arrow_Mono</texPath>
+		<graphicClass>Graphic_Single</graphicClass>
+	</graphicData>
+	<projectile Class="CombatExtended.ProjectilePropertiesCE">
+		<damageDef>Arrow</damageDef>
+		<speed>200</speed>
+	</projectile>
+</ThingDef>
+
+<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseMonoArrowProjectile">
+	<defName>Projectile_MonoArrow</defName>
+	<label>mono-bodkin arrow</label>
+	<graphicData>
+		<texPath>Things/Projectiles/Arrow_Mono</texPath>
+		<graphicClass>Graphic_Single</graphicClass>
+	</graphicData>
+	<projectile Class="CombatExtended.ProjectilePropertiesCE">
+		<damageAmountBase>12</damageAmountBase>
+		<armorPenetrationSharp>50</armorPenetrationSharp>
+		<armorPenetrationBlunt>60</armorPenetrationBlunt>
+		<preExplosionSpawnChance>0.333</preExplosionSpawnChance>
+		<preExplosionSpawnThingDef>Ammo_MonoArrow</preExplosionSpawnThingDef>
+	</projectile>
+</ThingDef>
+
+<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseMonoArrowProjectile">
+	<defName>Projectile_MonoArrow_Broad</defName>
+	<label>mono-broadhead arrow</label>
+	<graphicData>
+		<texPath>Things/Projectiles/Arrow_Mono</texPath>
+		<graphicClass>Graphic_Single</graphicClass>
+	</graphicData>
+	<projectile Class="CombatExtended.ProjectilePropertiesCE">
+		<damageAmountBase>18</damageAmountBase>
+		<armorPenetrationSharp>25</armorPenetrationSharp>
+		<armorPenetrationBlunt>30</armorPenetrationBlunt>
+		<preExplosionSpawnChance>0.333</preExplosionSpawnChance>
+		<preExplosionSpawnThingDef>Ammo_MonoArrow</preExplosionSpawnThingDef>
+	</projectile>
+</ThingDef>
+
+<!-- ================== Recipes ================== -->
+
+<RecipeDef ParentName="AmmoRecipeBase">
+	<defName>MakeAmmo_MonoArrow</defName>
+	<label>make mono arrow (bodkin) x100</label>
+	<description>Craft 100 mono-bodkin arrows.</description>
+	<jobString>Making mono-bodkin arrows.</jobString>
+	<workAmount>10000</workAmount>
+	<researchPrerequisite>RA_MonoBowResearch</researchPrerequisite>
+	<ingredients>
+		<li>
+			<filter>
+				<thingDefs>
+					<li>Plasteel</li>
+				</thingDefs>
+			</filter>
+			<count>10</count>
+		</li>
+		<li>
+			<filter>
+				<thingDefs>
+					<li>ComponentIndustrial</li>
+				</thingDefs>
+			</filter>
+			<count>2</count>
+		</li>
+	</ingredients>
+	<fixedIngredientFilter>
+		<thingDefs>
+			<li>Plasteel</li>
+			<li>ComponentIndustrial</li>
+		</thingDefs>
+	</fixedIngredientFilter>
+	<products>
+		<Ammo_MonoArrow>100</Ammo_MonoArrow>
+	</products>
+</RecipeDef>
+
+<RecipeDef ParentName="AmmoRecipeBase">
+	<defName>MakeAmmo_MonoArrow_Broad</defName>
+	<label>make mono arrow (broadhead) x100</label>
+	<description>Craft 100 mono-broadhead arrows.</description>
+	<jobString>Making mono-broadhead arrows.</jobString>
+	<workAmount>10000</workAmount>
+	<researchPrerequisite>RA_MonoBowResearch</researchPrerequisite>
+	<ingredients>
+		<li>
+			<filter>
+				<thingDefs>
+					<li>Plasteel</li>
+				</thingDefs>
+			</filter>
+			<count>10</count>
+		</li>
+		<li>
+			<filter>
+				<thingDefs>
+					<li>ComponentIndustrial</li>
+				</thingDefs>
+			</filter>
+			<count>2</count>
+		</li>
+	</ingredients>
+	<fixedIngredientFilter>
+		<thingDefs>
+			<li>Plasteel</li>
+			<li>ComponentIndustrial</li>
+		</thingDefs>
+	</fixedIngredientFilter>
+	<products>
+		<Ammo_MonoArrow_Broad>100</Ammo_MonoArrow_Broad>
+	</products>
+</RecipeDef>
+  
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Royal Arsenal/Patches/Royal Arsenal/Things/RoyalArsenal_Armors.xml b/ModPatches/Royal Arsenal/Patches/Royal Arsenal/Things/RoyalArsenal_Armors.xml
new file mode 100644
index 0000000000..af723a17d7
--- /dev/null
+++ b/ModPatches/Royal Arsenal/Patches/Royal Arsenal/Things/RoyalArsenal_Armors.xml	
@@ -0,0 +1,524 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Ranseur Armor -->
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmor"]/statBases</xpath>
+		<value>
+			<Bulk>80</Bulk>
+			<WornBulk>12</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>400</MaxHitPoints>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>30</Mass>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>35</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmor"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>60</DevilstrandCloth>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>8</CarryBulk>
+			<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmor"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>120</Plasteel>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmor"]/costList/Uranium</xpath>
+		<value>
+			<Uranium>70</Uranium>
+		</value>
+	</Operation>
+	
+	<!-- Ranseur Helmet -->
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.9</NightVisionEfficiency_Apparel> 
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>190</MaxHitPoints>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>3</Mass>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>9</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>24</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>20</DevilstrandCloth>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<ToxicEnvironmentResistance>0.4</ToxicEnvironmentResistance>
+			<PsychicSensitivity>-0.2</PsychicSensitivity>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>40</Plasteel>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	
+	<!-- Guardian Armor -->
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>500</MaxHitPoints>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase"]/statBases/Mass</xpath>
+		<value>
+			<Mass>55</Mass>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>29</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>60</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>50</DevilstrandCloth>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>80</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+			<ToxicEnvironmentResistance>0.4</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>200</Plasteel>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase"]/costList/Uranium</xpath>
+		<value>
+			<Uranium>40</Uranium>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RA_GuardianArmorBase"]/verbs</xpath>
+			<value>
+				<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<label>launch 30x29mm EMP grenade</label>
+					<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<onlyManualCast>True</onlyManualCast>
+					<warmupTime>1.5</warmupTime>
+					<range>40</range>
+					<minRange>5</minRange>
+					<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+					<soundCast>Shot_IncendiaryLauncher</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>14</muzzleFlashScale>
+					<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+					<defaultProjectile>Bullet_30x29mmGrenade_EMP</defaultProjectile>
+					<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RA_GuardianArmorBase"]/comps/li[@Class="CompProperties_Reloadable"]/ammoDef</xpath>
+		<value>
+			<ammoDef>Ammo_30x29mmGrenade_EMP</ammoDef>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RA_GuardianArmorBase"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountPerCharge</xpath>
+		<value>
+			<ammoCountPerCharge>1</ammoCountPerCharge>
+		</value>
+	</Operation>
+	
+	<!-- Guardian Helmet -->
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel> 
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>240</MaxHitPoints>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>5.2</Mass>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>21</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>50</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>20</DevilstrandCloth>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+			<PsychicSensitivity>-0.2</PsychicSensitivity>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>90</Plasteel>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+	
+	<!-- Phalanx Armor -->
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>20</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>650</MaxHitPoints>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>80</Mass>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>24</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>50</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>80</DevilstrandCloth>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>80</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+			<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>220</Plasteel>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor"]/costList/Uranium</xpath>
+		<value>
+			<Uranium>100</Uranium>
+		</value>
+	</Operation>
+	
+	<!-- Phalanx Helmet -->
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel> 
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>320</MaxHitPoints>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>6</Mass>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>50</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>30</DevilstrandCloth>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<PsychicSensitivity>-0.2</PsychicSensitivity>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>100</Plasteel>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Royal Arsenal/Patches/Royal Arsenal/Things/RoyalArsenal_Melee.xml b/ModPatches/Royal Arsenal/Patches/Royal Arsenal/Things/RoyalArsenal_Melee.xml
new file mode 100644
index 0000000000..bdb475991f
--- /dev/null
+++ b/ModPatches/Royal Arsenal/Patches/Royal Arsenal/Things/RoyalArsenal_Melee.xml	
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Mono Greatsword, Persona Mono Greatsword -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+		defName="RA_MonoGreatsword" or 
+		defName="RA_MonoGreatswordBladelink"
+		]/tools</xpath>
+		<value>
+		  <tools>
+			  <li Class="CombatExtended.ToolCE">
+				<label>handle</label>
+				<capacities>
+				  <li>Poke</li>
+				</capacities>
+				<power>9</power>
+				<cooldownTime>1.32</cooldownTime>
+				<chanceFactor>0.2</chanceFactor>
+				<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+			  </li>
+			  <li Class="CombatExtended.ToolCE">
+				<label>point</label>
+				<capacities>
+				  <li>Stab</li>
+				</capacities>
+				<power>70</power>
+				<cooldownTime>2</cooldownTime>
+				<chanceFactor>1.2</chanceFactor>
+				<armorPenetrationBlunt>2.0</armorPenetrationBlunt>
+				<armorPenetrationSharp>30.0</armorPenetrationSharp>
+				<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+			  </li>
+			  <li Class="CombatExtended.ToolCE">
+				<label>edge</label>
+				<capacities>
+				  <li>Cut</li>
+				</capacities>
+				<power>105</power>
+				<cooldownTime>2.4</cooldownTime>
+				<chanceFactor>1</chanceFactor>
+				<armorPenetrationBlunt>4.0</armorPenetrationBlunt>
+				<armorPenetrationSharp>24.0</armorPenetrationSharp>
+				<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+			  </li>
+		  </tools>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RA_MonoGreatsword"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.10</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RA_MonoGreatsword"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+			  <MeleeCritChance>1</MeleeCritChance>
+			  <MeleeParryChance>0.60</MeleeParryChance>
+			  <MeleeDodgeChance>0.25</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RA_MonoGreatswordBladelink"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.25</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RA_MonoGreatswordBladelink"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+			  <MeleeCritChance>1.20</MeleeCritChance>
+			  <MeleeParryChance>0.75</MeleeParryChance>
+			  <MeleeDodgeChance>0.35</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+		defName="RA_MonoGreatsword" or 
+		defName="RA_MonoGreatswordBladelink"
+		]/statBases/Mass</xpath>
+		<value>
+			<Mass>10</Mass>
+			<Bulk>12</Bulk>
+		</value>
+	</Operation>
+	
+	<!-- Plasma Greatsword, Persona Plasma Greatsword -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+		defName="RA_PlasmaGreatsword" or 
+		defName="RA_PlasmaGreatswordBladelink"
+		]/tools</xpath>
+		<value>
+		  <tools>
+			  <li Class="CombatExtended.ToolCE">
+				<label>handle</label>
+				<capacities>
+				  <li>Poke</li>
+				</capacities>
+				<power>9</power>
+				<cooldownTime>1.32</cooldownTime>
+				<chanceFactor>0.2</chanceFactor>
+				<armorPenetrationBlunt>3.375</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+			  </li>
+			  <li Class="CombatExtended.ToolCE">
+				<label>point</label>
+				<capacities>
+				  <li>Stab</li>
+				</capacities>
+				<power>60</power>
+				<extraMeleeDamages>
+				<li>
+					<def>Flame</def>
+					<amount>5</amount>
+					<chance>0.3</chance>
+				</li>
+				</extraMeleeDamages>
+				<cooldownTime>2</cooldownTime>
+				<chanceFactor>1.2</chanceFactor>
+				<armorPenetrationBlunt>5.5</armorPenetrationBlunt>
+				<armorPenetrationSharp>36</armorPenetrationSharp>
+				<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+			  </li>
+			  <li Class="CombatExtended.ToolCE">
+				<label>edge</label>
+				<capacities>
+				  <li>Cut</li>
+				</capacities>
+				<power>120</power>
+				<extraMeleeDamages>
+				<li>
+					<def>Flame</def>
+					<amount>8</amount>
+					<chance>0.3</chance>
+				</li>
+				</extraMeleeDamages>
+				<cooldownTime>2.4</cooldownTime>
+				<chanceFactor>1</chanceFactor>
+				<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				<armorPenetrationSharp>30</armorPenetrationSharp>
+				<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+			  </li>
+		  </tools>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RA_PlasmaGreatsword"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.10</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RA_PlasmaGreatsword"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+			  <MeleeCritChance>1</MeleeCritChance>
+			  <MeleeParryChance>0.60</MeleeParryChance>
+			  <MeleeDodgeChance>0.25</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RA_PlasmaGreatswordBladelink"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.25</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RA_PlasmaGreatswordBladelink"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+			  <MeleeCritChance>1.20</MeleeCritChance>
+			  <MeleeParryChance>0.75</MeleeParryChance>
+			  <MeleeDodgeChance>0.35</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+		defName="RA_PlasmaGreatsword" or 
+		defName="RA_PlasmaGreatswordBladelink"
+		]/statBases/Mass</xpath>
+		<value>
+			<Mass>16</Mass>
+			<Bulk>12</Bulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Royal Arsenal/Patches/Royal Arsenal/Things/RoyalArsenal_PrestigeArmors.xml b/ModPatches/Royal Arsenal/Patches/Royal Arsenal/Things/RoyalArsenal_PrestigeArmors.xml
new file mode 100644
index 0000000000..58c98b8308
--- /dev/null
+++ b/ModPatches/Royal Arsenal/Patches/Royal Arsenal/Things/RoyalArsenal_PrestigeArmors.xml	
@@ -0,0 +1,520 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Ranseur Armor -->
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmor_Prestige"]/statBases</xpath>
+		<value>
+			<Bulk>80</Bulk>
+			<WornBulk>12</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmor_Prestige"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>400</MaxHitPoints>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmor_Prestige"]/statBases/Mass</xpath>
+		<value>
+			<Mass>30</Mass>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmor_Prestige"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmor_Prestige"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmor_Prestige"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>35</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmor_Prestige"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>60</DevilstrandCloth>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmor_Prestige"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>8</CarryBulk>
+			<ToxicEnvironmentResistance>0.3</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmor_Prestige"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmor_Prestige"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>120</Plasteel>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmor_Prestige"]/costList/Uranium</xpath>
+		<value>
+			<Uranium>70</Uranium>
+		</value>
+	</Operation>
+	
+	<!-- Ranseur Helmet -->
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet_Prestige"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.9</NightVisionEfficiency_Apparel> 
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet_Prestige"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>190</MaxHitPoints>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet_Prestige"]/statBases/Mass</xpath>
+		<value>
+			<Mass>3</Mass>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet_Prestige"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet_Prestige"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>9</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet_Prestige"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>24</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet_Prestige"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>20</DevilstrandCloth>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet_Prestige"]/equippedStatOffsets</xpath>
+		<value>
+			<ToxicEnvironmentResistance>0.4</ToxicEnvironmentResistance>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet_Prestige"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>40</Plasteel>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet_Prestige"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+	
+	<!-- Guardian Armor -->
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase_Prestige"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase_Prestige"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>500</MaxHitPoints>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase_Prestige"]/statBases/Mass</xpath>
+		<value>
+			<Mass>55</Mass>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase_Prestige"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase_Prestige"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>29</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase_Prestige"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>60</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase_Prestige"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>50</DevilstrandCloth>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase_Prestige"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>80</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+			<ToxicEnvironmentResistance>0.4</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase_Prestige"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase_Prestige"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>200</Plasteel>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase_Prestige"]/costList/Uranium</xpath>
+		<value>
+			<Uranium>40</Uranium>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RA_GuardianArmorBase_Prestige"]/verbs</xpath>
+			<value>
+				<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<label>launch 30x29mm EMP grenade</label>
+					<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<onlyManualCast>True</onlyManualCast>
+					<warmupTime>1.5</warmupTime>
+					<range>45</range>
+					<minRange>5</minRange>
+					<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+					<soundCast>Shot_IncendiaryLauncher</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>14</muzzleFlashScale>
+					<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+					<defaultProjectile>Bullet_30x29mmGrenade_EMP</defaultProjectile>
+					<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RA_GuardianArmorBase_Prestige"]/comps/li[@Class="CompProperties_Reloadable"]/ammoDef</xpath>
+		<value>
+			<ammoDef>Ammo_30x29mmGrenade_EMP</ammoDef>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RA_GuardianArmorBase_Prestige"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountPerCharge</xpath>
+		<value>
+			<ammoCountPerCharge>1</ammoCountPerCharge>
+		</value>
+	</Operation>
+	
+	<!-- Guardian Helmet -->
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet_Prestige"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel> 
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet_Prestige"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>240</MaxHitPoints>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet_Prestige"]/statBases/Mass</xpath>
+		<value>
+			<Mass>5.2</Mass>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet_Prestige"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet_Prestige"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>21</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet_Prestige"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>50</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet_Prestige"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>20</DevilstrandCloth>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet_Prestige"]/equippedStatOffsets</xpath>
+		<value>
+			<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet_Prestige"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>90</Plasteel>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet_Prestige"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+	
+	<!-- Phalanx Armor -->
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor_Prestige"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>20</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor_Prestige"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>650</MaxHitPoints>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor_Prestige"]/statBases/Mass</xpath>
+		<value>
+			<Mass>80</Mass>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor_Prestige"]/statBases/Flammability</xpath>
+			<value>
+				<Flammability>0</Flammability>
+			</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor_Prestige"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>24</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor_Prestige"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>50</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor_Prestige"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>80</DevilstrandCloth>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor_Prestige"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>80</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+			<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor_Prestige"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor_Prestige"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>220</Plasteel>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor_Prestige"]/costList/Uranium</xpath>
+		<value>
+			<Uranium>100</Uranium>
+		</value>
+	</Operation>
+	
+	<!-- Phalanx Helmet -->
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet_Prestige"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel> 
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet_Prestige"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>320</MaxHitPoints>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet_Prestige"]/statBases/Mass</xpath>
+		<value>
+			<Mass>6</Mass>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet_Prestige"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet_Prestige"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet_Prestige"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>50</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet_Prestige"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>30</DevilstrandCloth>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet_Prestige"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet_Prestige"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>100</Plasteel>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet_Prestige"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Royal Arsenal/Patches/Royal Arsenal/Things/RoyalArsenal_Ranged.xml b/ModPatches/Royal Arsenal/Patches/Royal Arsenal/Things/RoyalArsenal_Ranged.xml
new file mode 100644
index 0000000000..fde7aee94c
--- /dev/null
+++ b/ModPatches/Royal Arsenal/Patches/Royal Arsenal/Things/RoyalArsenal_Ranged.xml	
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Ranged Weapon Melee Attacks -->
+
+<Operation Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[defName="RA_RoyalChargeRifle" or defName="RA_RoyalChargeLance"]/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="RA_MonoBow"]/tools</xpath>
+	<value>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<power>8</power>
+				<cooldownTime>1.6</cooldownTime>
+			<armorPenetrationBlunt>0.65</armorPenetrationBlunt>
+			</li>
+		</tools>
+	</value>
+</Operation>
+
+
+<!-- Mono Longbow -->
+
+<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>RA_MonoBow</defName>
+	<statBases>
+		<Mass>8</Mass>
+		<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		<SightsEfficiency>2</SightsEfficiency>
+		<ShotSpread>0.01</ShotSpread>
+		<SwayFactor>1</SwayFactor>
+		<Bulk>13.0</Bulk>
+	</statBases>
+	<costList>
+		<Plasteel>60</Plasteel>
+		<Uranium>20</Uranium>
+		<ComponentSpacer>6</ComponentSpacer>
+	</costList>
+	<Properties>
+		<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+		<hasStandardCommand>true</hasStandardCommand>
+		<defaultProjectile>Projectile_MonoArrow</defaultProjectile>
+		<warmupTime>1.8</warmupTime>
+		<range>80</range>
+		<soundCast>ChargeLance_Fire</soundCast>
+		<muzzleFlashScale>0</muzzleFlashScale>
+		<recoilAmount>1.0</recoilAmount>
+	</Properties>
+	<AmmoUser>
+		<ammoSet>AmmoSet_MonoArrow</ammoSet>
+	</AmmoUser>
+	<FireModes/>
+	<weaponTags/>
+	<researchPrerequisite>RA_MonoBowResearch</researchPrerequisite>
+	<AllowWithRunAndGun>false</AllowWithRunAndGun>
+</Operation>
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/ThingDef[defName="RA_MonoBow"]</xpath>
+	<value>
+		<li Class="CombatExtended.GunDrawExtension">
+		<DrawSize>1,1</DrawSize>
+		<DrawOffset>0.15,-0.05</DrawOffset>
+		</li>
+	</value>
+</Operation>
+
+
+<!-- Royal Charge Rifle -->
+
+<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>RA_RoyalChargeRifle</defName>
+	<statBases>
+		<Mass>5</Mass>
+		<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
+		<SightsEfficiency>1.4</SightsEfficiency>
+		<ShotSpread>0.08</ShotSpread>
+		<SwayFactor>1</SwayFactor>
+		<Bulk>10.0</Bulk>
+	</statBases>
+	<costList>
+		<Plasteel>60</Plasteel>
+		<Gold>2</Gold>
+		<ComponentSpacer>6</ComponentSpacer>
+		<Chemfuel>10</Chemfuel>
+	</costList>
+	<Properties>
+		<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+		<hasStandardCommand>true</hasStandardCommand>
+		<defaultProjectile>Bullet_6x24mmRoyal</defaultProjectile>
+		<warmupTime>1.0</warmupTime>
+		<range>55</range>
+		<burstShotCount>5</burstShotCount>
+		<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+		<soundCast>Shot_ChargeRifle</soundCast>
+		<soundCastTail>GunTail_Medium</soundCastTail>
+		<muzzleFlashScale>9</muzzleFlashScale>
+		<recoilAmount>1.0</recoilAmount>
+	</Properties>
+	<AmmoUser>
+		<magazineSize>40</magazineSize>
+		<reloadTime>4</reloadTime>
+		<ammoSet>AmmoSet_6x24mmRoyal</ammoSet>
+	</AmmoUser>
+	<FireModes>
+		<aimedBurstShotCount>4</aimedBurstShotCount>
+		<aiUseBurstMode>TRUE</aiUseBurstMode>
+		<aiAimMode>AimedShot</aiAimMode>
+	</FireModes>
+	<weaponTags/>
+	<researchPrerequisite>RA_RoyalChargedShot</researchPrerequisite>
+	<AllowWithRunAndGun>false</AllowWithRunAndGun>
+</Operation>
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/ThingDef[defName="RA_RoyalChargeRifle"]</xpath>
+	<value>
+		<li Class="CombatExtended.GunDrawExtension">
+		<DrawSize>1,1</DrawSize>
+		<DrawOffset>0.15,-0.05</DrawOffset>
+		</li>
+	</value>
+</Operation>
+
+
+<!-- Royal Charge Lance -->
+
+<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+	<defName>RA_RoyalChargeLance</defName>
+	<statBases>
+		<Mass>5</Mass>
+		<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
+		<SightsEfficiency>2.2</SightsEfficiency>
+		<ShotSpread>0.01</ShotSpread>
+		<SwayFactor>1</SwayFactor>
+		<Bulk>10.0</Bulk>
+	</statBases>
+	<costList>
+		<Plasteel>60</Plasteel>
+		<Gold>2</Gold>
+		<ComponentSpacer>6</ComponentSpacer>
+		<Chemfuel>10</Chemfuel>
+	</costList>
+	<Properties>
+		<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+		<hasStandardCommand>true</hasStandardCommand>
+		<defaultProjectile>Bullet_5x35mmRoyal</defaultProjectile>
+		<warmupTime>1.0</warmupTime>
+		<range>75</range>
+		<soundCast>ChargeLance_Fire</soundCast>
+		<soundCastTail>GunTail_Medium</soundCastTail>
+		<muzzleFlashScale>9</muzzleFlashScale>
+		<recoilAmount>1.0</recoilAmount>
+	</Properties>
+	<AmmoUser>
+		<magazineSize>6</magazineSize>
+		<reloadTime>3</reloadTime>
+		<ammoSet>AmmoSet_5x35mmRoyal</ammoSet>
+	</AmmoUser>
+	<FireModes>
+		<aiAimMode>AimedShot</aiAimMode>
+	</FireModes>
+	<weaponTags/>
+	<researchPrerequisite>RA_RoyalChargedShot</researchPrerequisite>
+	<AllowWithRunAndGun>false</AllowWithRunAndGun>
+</Operation>
+
+<Operation Class="PatchOperationAddModExtension">
+	<xpath>Defs/ThingDef[defName="RA_RoyalChargeLance"]</xpath>
+	<value>
+		<li Class="CombatExtended.GunDrawExtension">
+		<DrawSize>1,1</DrawSize>
+		<DrawOffset>0.15,-0.05</DrawOffset>
+		</li>
+	</value>
+</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Royal Warcaskets/Patches/Royal Warcaskets/Apparel_Royal_Warcaskets.xml b/ModPatches/Royal Warcaskets/Patches/Royal Warcaskets/Apparel_Royal_Warcaskets.xml
new file mode 100644
index 0000000000..b0c85d6d39
--- /dev/null
+++ b/ModPatches/Royal Warcaskets/Patches/Royal Warcaskets/Apparel_Royal_Warcaskets.xml	
@@ -0,0 +1,469 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Prestige Marine Warcasket ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Marine"]/statBases</xpath>
+		<value>
+			<Bulk>200</Bulk>
+			<WornBulk>20</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Marine"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>23</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Marine"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>57</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Marine"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>250</CarryWeight>
+			<CarryBulk>200</CarryBulk>
+			<Suppressability>-100</Suppressability>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Marine"]/costList/Steel</xpath>
+		<value>
+			<Steel>260</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Marine"]/costList/Gold</xpath>
+		<value>
+			<Gold>40</Gold>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Marine"]/costList/ComponentIndustrial</xpath>
+		<value>
+			<ComponentIndustrial>8</ComponentIndustrial>
+		</value>
+	</Operation>
+
+	<!-- ========== Prestige Marine Warcasket - Shoulders ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketShoulders_Marine"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketShoulders_Marine"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>23</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketShoulders_Marine"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>57</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketShoulders_Marine"]/costList/Steel</xpath>
+		<value>
+			<Steel>110</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketShoulders_Marine"]/costList/Gold</xpath>
+		<value>
+			<Gold>10</Gold>
+		</value>
+	</Operation>
+
+	<!-- === Prestige Marine Warcasket Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Marine"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+			<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Marine"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Marine"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Marine"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!-- Armor values scaled by vanilla stat ratios compared to basic warcasket helmet [e.g (1.20/1.06)*16 = ~18 ]. -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Marine"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Marine"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Marine"]/costList/Steel</xpath>
+		<value>
+			<Steel>130</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Marine"]/costList/Gold</xpath>
+		<value>
+			<Gold>20</Gold>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Marine"]/costList/ComponentIndustrial</xpath>
+		<value>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</value>
+	</Operation>
+
+	<!-- ========== Prestige Recon Warcasket ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Recon"]/statBases</xpath>
+		<value>
+			<Bulk>175</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Recon"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Recon"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>46</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Recon"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>225</CarryWeight>
+			<CarryBulk>175</CarryBulk>
+			<Suppressability>-100</Suppressability>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Recon"]/costList/Steel</xpath>
+		<value>
+			<Steel>160</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Recon"]/costList/Gold</xpath>
+		<value>
+			<Gold>30</Gold>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Recon"]/costList/ComponentIndustrial</xpath>
+		<value>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</value>
+	</Operation>
+
+	<!-- ========== Prestige Recon Warcasket - Shoulders ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketShoulders_Recon"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketShoulders_Recon"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketShoulders_Recon"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>46</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketShoulders_Recon"]/costList/Steel</xpath>
+		<value>
+			<Steel>80</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketShoulders_Recon"]/costList/Gold</xpath>
+		<value>
+			<Gold>10</Gold>
+		</value>
+	</Operation>
+
+	<!-- === Prestige Recon Warcasket Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Recon"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>4</WornBulk>
+			<NightVisionEfficiency_Apparel>0.65</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Recon"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Recon"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Recon"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Recon"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Recon"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>37</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Recon"]/costList/Steel</xpath>
+		<value>
+			<Steel>80</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Recon"]/costList/Gold</xpath>
+		<value>
+			<Gold>20</Gold>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Recon"]/costList/ComponentIndustrial</xpath>
+		<value>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</value>
+	</Operation>
+
+	<!-- ========== Prestige Cataphract Warcasket ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Cataphract"]/statBases</xpath>
+		<value>
+			<Bulk>250</Bulk>
+			<WornBulk>25</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Cataphract"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>32</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Cataphract"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>80</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Cataphract"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>250</CarryWeight>
+			<CarryBulk>200</CarryBulk>
+			<Suppressability>-100</Suppressability>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Cataphract"]/costList/Steel</xpath>
+		<value>
+			<Steel>350</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Cataphract"]/costList/Gold</xpath>
+		<value>
+			<Gold>40</Gold>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Cataphract"]/costList/ComponentIndustrial</xpath>
+		<value>
+			<ComponentIndustrial>10</ComponentIndustrial>
+		</value>
+	</Operation>
+
+	<!-- ========== Prestige Cataphract Warcasket - Shoulders ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketShoulders_Cataphract"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketShoulders_Cataphract"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>32</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketShoulders_Cataphract"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>80</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketShoulders_Cataphract"]/costList/Steel</xpath>
+		<value>
+			<Steel>150</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketShoulders_Cataphract"]/costList/Gold</xpath>
+		<value>
+			<Gold>10</Gold>
+		</value>
+	</Operation>
+
+	<!-- === Prestige Cataphract Warcasket Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Cataphract"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>8</WornBulk>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Cataphract"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Cataphract"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Cataphract"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Cataphract"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>28</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Cataphract"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>63</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Cataphract"]/costList/Steel</xpath>
+		<value>
+			<Steel>150</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Cataphract"]/costList/Gold</xpath>
+		<value>
+			<Gold>20</Gold>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Cataphract"]/costList/ComponentIndustrial</xpath>
+		<value>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/SCP/Patches/SCP/Apparel_SCP.xml b/ModPatches/SCP/Patches/SCP/Apparel_SCP.xml
new file mode 100644
index 0000000000..c117f2254f
--- /dev/null
+++ b/ModPatches/SCP/Patches/SCP/Apparel_SCP.xml
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Clothing -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SCPDClassJumpsuit"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>2</WornBulk>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SCPStaffShirt" or defName="Apparel_GOCStaffShirt"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SCPLabcoat"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1.5</WornBulk>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SCPFormalSuit" or defName="Apparel_GOCFormalSuit"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+			<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SCPGuardJumpsuit" or defName="Apparel_GOCSecurityFatigues" or defName="Apparel_CIInsurgentJumpsuit"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>2</WornBulk>
+			<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SCPSecurityTaskForceJacket"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SCPMobileTaskForceUbac" or defName="Apparel_GOCStrikeTeamUbac"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SCPParka" or defName="Apparel_GOCParka" or defName="Apparel_CIInsurgentParka"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- SCP Guard/GOC Security Armor -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_SCPGuardArmor" or defName="Apparel_GOCSecurityArmor"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SCPGuardArmor" or defName="Apparel_GOCSecurityArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SCPGuardArmor" or defName="Apparel_GOCSecurityArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>21</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- MTF Crye CAGE Armor -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_SCPMobileTaskForceCryeCage"]/statBases</xpath>
+		<value>
+			<Bulk>7.5</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_SCPMobileTaskForceCryeCage"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>10</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SCPMobileTaskForceCryeCage"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SCPMobileTaskForceCryeCage"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>31</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SCPMobileTaskForceCryeCage"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.36</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!-- MBAV Armor -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_GOCStrikeTeamMBAV" or defName="Apparel_CIInsurgentMBAV"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>5.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_GOCStrikeTeamMBAV" or defName="Apparel_CIInsurgentMBAV"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>10</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_GOCStrikeTeamMBAV" or defName="Apparel_CIInsurgentMBAV"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_GOCStrikeTeamMBAV" or defName="Apparel_CIInsurgentMBAV"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>28</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- LCE Carrier -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_CIInsurgentLCE"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_CIInsurgentLCE"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>30</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_CIInsurgentLCE"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_CIInsurgentLCE"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/SCP/Patches/SCP/Headgear_SCP.xml b/ModPatches/SCP/Patches/SCP/Headgear_SCP.xml
new file mode 100644
index 0000000000..73cc10d5ad
--- /dev/null
+++ b/ModPatches/SCP/Patches/SCP/Headgear_SCP.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Hats-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_GOCStrikeTeamBoonie" or
+			defName="Apparel_SCPSecurityTaskForceCap" or
+			defName="Apparel_CIInsurgentCap" or
+			defName="Apparel_CIInsurgentBoonie" or
+			defName="Apparel_CIInsurgentBeret"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_CIInsurgentBalaclava"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>0.5</Bulk>
+			<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_CIInsurgentBalaclava"]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>OnHead</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<!-- FAST Helmet -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_SCPMobileTaskForceHelmet" or
+			defName="Apparel_SCPMobileTaskForceHelmetMask" or
+			defName="Apparel_SCPMobileTaskForceHelmetGasmask"
+			]/statBases </xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.54</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SCPMobileTaskForceHelmet" or
+			defName="Apparel_SCPMobileTaskForceHelmetMask" or
+			defName="Apparel_SCPMobileTaskForceHelmetGasmask"]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.20</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ACH Helmet -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_CIInsurgentHelmet" or
+			defName="Apparel_CIInsurgentHelmetMask" or
+			defName="Apparel_CIInsurgentHelmetGasmask" or
+			defName="Apparel_SCPGuardHelmet" or
+			defName="Apparel_GOCSecurityHelmet"
+			]/statBases </xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>7</ArmorRating_Sharp>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.54</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_CIInsurgentHelmet" or
+			defName="Apparel_CIInsurgentHelmetMask" or
+			defName="Apparel_CIInsurgentHelmetGasmask" or
+			defName="Apparel_SCPGuardHelmet" or
+			defName="Apparel_GOCSecurityHelmet"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.20</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Felin Helmet -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_GOCStrikeTeamHelmet" or
+			defName="Apparel_GOCStrikeTeamHelmetMask" or
+			defName="Apparel_GOCStrikeTeamHelmetGasmask"
+			]/statBases </xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+			<ArmorRating_Blunt>14</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.5</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_GOCStrikeTeamHelmet" or
+			defName="Apparel_GOCStrikeTeamHelmetMask" or
+			defName="Apparel_GOCStrikeTeamHelmetGasmask"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.20</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Gas Mask -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Apparel_SCPMobileTaskForceHelmetGasmask" or
+			defName="Apparel_GOCStrikeTeamHelmetGasmask" or
+			defName="Apparel_CIInsurgentHelmetGasmask"] </xpath>
+		<value>
+			<li Class="CombatExtended.ApparelHediffExtension">
+				<hediff>WearingGasMask</hediff>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/SS Maid Project/Patches/SS Maid Project/ThingDefs_Misc/Apparel.xml b/ModPatches/SS Maid Project/Patches/SS Maid Project/ThingDefs_Misc/Apparel.xml
new file mode 100644
index 0000000000..6a89677b2e
--- /dev/null
+++ b/ModPatches/SS Maid Project/Patches/SS Maid Project/ThingDefs_Misc/Apparel.xml	
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Combat Type-->
+
+	<!--Fight Maid-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FightMaid"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>7.2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FightMaid"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>8.25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FightMaid"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="FightMaid"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FightMaid"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>0.2</ShootingAccuracyPawn>
+			<AimingAccuracy>0.1</AimingAccuracy>
+			<MeleeCritChance>0.05</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<!--Header Maid-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HeaderMaid"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HeaderMaid"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.9</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HeaderMaid"]/statBases</xpath>
+		<value>
+			<Bulk>7</Bulk>
+			<WornBulk>6</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Healer Maid-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NurseMaid"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="NurseMaid"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.9</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="NurseMaid"]/statBases</xpath>
+		<value>
+			<Bulk>7</Bulk>
+			<WornBulk>6</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Non-combat Type-->
+
+	<!--Crafter-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CrafterMaid"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2.2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CrafterMaid"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.24</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CrafterMaid"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Cook-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ChefMaid"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ChefMaid"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ChefMaid"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Cleaner-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CleanerMaid"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.9</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CleanerMaid"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.18</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CleanerMaid"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CleanerMaid"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>15</CarryWeight>
+			<CarryBulk>25</CarryBulk>
+		</value>
+	</Operation>
+
+	<!--Hats-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MaidHatNA"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>7.8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MaidHatNA"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MaidHatNA" or
+			defName="MaidHatNB" or
+			defName="MaidHatNC"
+			]/statBases </xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MaidHatNB" or defName="MaidHatNC"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3.6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MaidHatNB" or defName="MaidHatNC"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2.25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/SYR Harpy/Patches/SYR Harpy/Patch_Bodies_Harpy.xml b/ModPatches/SYR Harpy/Patches/SYR Harpy/Patch_Bodies_Harpy.xml
new file mode 100644
index 0000000000..85926ee175
--- /dev/null
+++ b/ModPatches/SYR Harpy/Patches/SYR Harpy/Patch_Bodies_Harpy.xml	
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- New Bodyparts -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel = "left arm"]/groups</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel = "right arm"]/groups</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[customLabel = "left shoulder"]/groups</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[customLabel = "right shoulder"]/groups</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<!-- Adjustment of coverage -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Ribcage"]/coverage</xpath>
+		<value>
+			<coverage>0.07</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Pelvis"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Stomach"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Heart"]/coverage</xpath>
+		<value>
+			<coverage>0.04</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Lung"]/coverage</xpath>
+		<value>
+			<coverage>0.055</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Kidney"]/coverage</xpath>
+		<value>
+			<coverage>0.03</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Liver"]/coverage</xpath>
+		<value>
+			<coverage>0.06</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Neck"]/coverage</xpath>
+		<value>
+			<coverage>0.055</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Skull"]/parts/li[def="Brain"]/coverage</xpath>
+		<value>
+			<coverage>0.9</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Eye"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/coverage</xpath>
+		<value>
+			<coverage>0.08</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Shoulder"]/coverage</xpath>
+		<value>
+			<coverage>0.085</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Clavicle"]/coverage</xpath>
+		<value>
+			<coverage>0.06</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="ArmHarpy"]/parts/li[def="WingHarpy"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="ArmHarpy"]/parts/li[def="Humerus"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="ArmHarpy"]/parts/li[def="Radius"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Femur"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Tibia"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/SYR Harpy/Patches/SYR Harpy/Patch_Prosthetics_Harpy.xml b/ModPatches/SYR Harpy/Patches/SYR Harpy/Patch_Prosthetics_Harpy.xml
new file mode 100644
index 0000000000..c5b143b345
--- /dev/null
+++ b/ModPatches/SYR Harpy/Patches/SYR Harpy/Patch_Prosthetics_Harpy.xml	
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Steel Claw -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="SteelHarpyClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>steel harpy claw</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>0.87</cooldownTime>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>steel harpy claw</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>0.87</cooldownTime>
+					<armorPenetrationSharp>5</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Plasteel Claw -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="PlasteelHarpyClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>plasteel harpy claw</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>0.93</cooldownTime>
+					<armorPenetrationSharp>5.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>plasteel harpy claw</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>0.93</cooldownTime>
+					<armorPenetrationSharp>7.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Mono Claw -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="HarpyMonoClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>harpy monoclaw</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>0.78</cooldownTime>
+					<armorPenetrationSharp>12</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>harpy monoclaw</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>0.78</cooldownTime>
+					<armorPenetrationSharp>16</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Venom Claw -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="HarpyVenomClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>harpy venonmclaw</label>
+					<capacities>
+						<li>ScratchToxic</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>0.76</cooldownTime>
+					<armorPenetrationSharp>5.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>harpy venonmclaw</label>
+					<capacities>
+						<li>ScratchToxic</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>0.76</cooldownTime>
+					<armorPenetrationSharp>7.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Work Claw -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="HarpyWorkClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>harpy work claw</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>0.87</cooldownTime>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>harpy work claw</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>0.87</cooldownTime>
+					<armorPenetrationSharp>4.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/SYR Harpy/Patches/SYR Harpy/Patch_Race_Harpy.xml b/ModPatches/SYR Harpy/Patches/SYR Harpy/Patch_Race_Harpy.xml
new file mode 100644
index 0000000000..74a46f3388
--- /dev/null
+++ b/ModPatches/SYR Harpy/Patches/SYR Harpy/Patch_Race_Harpy.xml	
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Harpy"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Speed: 8/BBS: 0.91/Mass: 40 -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Harpy"]/statBases</xpath>
+		<value>
+			<MeleeCritChance>1.14</MeleeCritChance>
+			<MeleeParryChance>1.06</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Harpy"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>1.31</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Harpy"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>0.84</cooldownTime>
+					<linkedBodyPartsGroup>LeftClawsHarpy</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>4</armorPenetrationSharp>
+
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>0.84</cooldownTime>
+					<linkedBodyPartsGroup>LeftClawsHarpy</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>4</armorPenetrationSharp>
+
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>0.84</cooldownTime>
+					<linkedBodyPartsGroup>RightClawsHarpy</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>0.84</cooldownTime>
+					<linkedBodyPartsGroup>RightClawsHarpy</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>4</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.32</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.1</chanceFactor>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Harpy"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/SYR Naga/Defs/SYR Naga/Patch_Ammo_44Magnum_Naga.xml b/ModPatches/SYR Naga/Defs/SYR Naga/Patch_Ammo_44Magnum_Naga.xml
new file mode 100644
index 0000000000..9413e1de56
--- /dev/null
+++ b/ModPatches/SYR Naga/Defs/SYR Naga/Patch_Ammo_44Magnum_Naga.xml	
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- ========== .44 Magnum Charged for Naga Revolver ========== -->
+
+	<ThingCategoryDef>
+		<defName>Ammo44MagnumCharged</defName>
+		<label>.44 Magnum Charged</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_44MagnumCharged</defName>
+		<label>.44 Magnum Charged</label>
+		<ammoTypes>
+			<Ammo_44MagnumCharged>Bullet_44MagnumCharged</Ammo_44MagnumCharged>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="44MagnumChargedBase" ParentName="SpacerSmallAmmoBase" Abstract="True">
+		<description>Charged shot ammo used by low velocity, high power charge weapons.</description>
+		<statBases>
+			<Mass>0.023</Mass>
+			<Bulk>0.02</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo44MagnumCharged</li>
+		</thingCategories>
+		<stackLimit>5000</stackLimit>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="44MagnumChargedBase">
+		<defName>Ammo_44MagnumCharged</defName>
+		<label>.44 Magnum Charged cartridge</label>
+		<graphicData>
+			<texPath>Things/Ammo/Charged/SmallRegular</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.67</MarketValue>
+		</statBases>
+		<ammoClass>Charged</ammoClass>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base6x18mmChargedBullet">
+		<defName>Bullet_44MagnumCharged</defName>
+		<label>.44 Magnum Charged bullet</label>
+		<graphicData>
+			<texPath>Things/Weapon/Bullet_Plasma</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>13</damageAmountBase>
+			<speed>160</speed>
+			<armorPenetrationSharp>20</armorPenetrationSharp>
+			<armorPenetrationBlunt>30</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_44MagnumCharged</defName>
+		<label>make .44 Magnum Charged cartridge x500</label>
+		<description>Craft 500 .44 Magnum Charged cartridges.</description>
+		<jobString>Making .44 Magnum Charged cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Plasteel</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_44MagnumCharged>500</Ammo_44MagnumCharged>
+		</products>
+		<workAmount>7000</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/SYR Naga/Defs/SYR Naga/Patch_Ammo_Naga.xml b/ModPatches/SYR Naga/Defs/SYR Naga/Patch_Ammo_Naga.xml
new file mode 100644
index 0000000000..e2afc9f4ca
--- /dev/null
+++ b/ModPatches/SYR Naga/Defs/SYR Naga/Patch_Ammo_Naga.xml	
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- ========== 6x18mm Charged for Naga SMG ========== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_6x18mmCharged_NagaSMG</defName>
+		<label>6x18mm Charged</label>
+		<ammoTypes>
+			<Ammo_6x18mmCharged>Bullet_6x18mmCharged_NagaSMG</Ammo_6x18mmCharged>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef ParentName="Base6x18mmChargedBullet">
+		<defName>Bullet_6x18mmCharged_NagaSMG</defName>
+		<label>6x18mm Charged bullet</label>
+		<graphicData>
+			<texPath>Things/Weapon/Bullet_Plasma</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>10</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>3</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+			<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<!-- ========== 12 Gauge Charged for Naga Shotgun ========== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_12GaugeCharged_NagaShotgun</defName>
+		<label>12 Gauge Charged</label>
+		<ammoTypes>
+			<Ammo_12GaugeCharged>Bullet_12GaugeCharged_NagaShotgun</Ammo_12GaugeCharged>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef ParentName="Base12GaugeChargedBullet">
+		<defName>Bullet_12GaugeCharged_NagaShotgun</defName>
+		<label>charge shot pellet</label>
+		<graphicData>
+			<texPath>Things/Weapon/Bullet_PlasmaBlast</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>15</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>5</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+			<armorPenetrationBlunt>32.4</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<!-- ========== 5x35mm Charged for Naga Rifle ========== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_5x35mmCharged_NagaRifle</defName>
+		<label>5x35mm Charged</label>
+		<ammoTypes>
+			<Ammo_5x35mmCharged>Bullet_5x35mmCharged_NagaRifle</Ammo_5x35mmCharged>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- Workaround for conditionally-patched projectiles: use an existing abstract class from the generic ammo library (In this case, Base8x35mmChargedBullet) -->
+	<ThingDef ParentName="Base8x35mmChargedBullet">
+		<defName>Bullet_5x35mmCharged_NagaRifle</defName>
+		<label>5x35mm Charged bullet</label>
+		<graphicData>
+			<texPath>Things/Weapon/Bullet_Plasma</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>13</damageAmountBase>
+			<speed>200</speed>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>2</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>30</armorPenetrationSharp>
+			<armorPenetrationBlunt>60</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<!-- ========== 8x35mm Charged for Naga Sniper Rifle ========== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_8x35mmCharged_NagaSniper</defName>
+		<label>8x35mm Charged</label>
+		<ammoTypes>
+			<Ammo_8x35mmCharged>Bullet_8x35mmCharged_NagaSniper</Ammo_8x35mmCharged>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef ParentName="Base8x35mmChargedBullet">
+		<defName>Bullet_8x35mmCharged_NagaSniper</defName>
+		<label>8x35mm Charged bullet</label>
+		<graphicData>
+			<texPath>Things/Weapon/Bullet_Plasma</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>19</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>6</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>14</armorPenetrationSharp>
+			<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/SYR Naga/Patches/SYR Naga/Patch_Bodies_Naga.xml b/ModPatches/SYR Naga/Patches/SYR Naga/Patch_Bodies_Naga.xml
new file mode 100644
index 0000000000..1c9d87d7cb
--- /dev/null
+++ b/ModPatches/SYR Naga/Patches/SYR Naga/Patch_Bodies_Naga.xml	
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Naga bodyDef -->
+	<!-- ========== Add new parts ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel = "left arm"]/groups</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel = "right arm"]/groups</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[customLabel = "left shoulder"]/groups</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[customLabel = "right shoulder"]/groups</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Adjust Coverages ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[def="Ribcage"]/coverage</xpath>
+		<value>
+			<coverage>0.07</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[def="Pelvis"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[def="Stomach"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[def="Heart"]/coverage</xpath>
+		<value>
+			<coverage>0.04</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[def="Lung"]/coverage</xpath>
+		<value>
+			<coverage>0.055</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[def="Kidney"]/coverage</xpath>
+		<value>
+			<coverage>0.03</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[def="Liver"]/coverage</xpath>
+		<value>
+			<coverage>0.06</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[def="Neck"]/coverage</xpath>
+		<value>
+			<coverage>0.055</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Skull"]/parts/li[def="Brain"]/coverage</xpath>
+		<value>
+			<coverage>0.9</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Eye"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/coverage</xpath>
+		<value>
+			<coverage>0.08</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[def="Shoulder"]/coverage</xpath>
+		<value>
+			<coverage>0.085</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Clavicle"]/coverage</xpath>
+		<value>
+			<coverage>0.06</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Humerus"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Radius"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/SYR Naga/Patches/SYR Naga/Patch_PawnKinds_Naga.xml b/ModPatches/SYR Naga/Patches/SYR Naga/Patch_PawnKinds_Naga.xml
new file mode 100644
index 0000000000..172312120a
--- /dev/null
+++ b/ModPatches/SYR Naga/Patches/SYR Naga/Patch_PawnKinds_Naga.xml	
@@ -0,0 +1,369 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Naga Pawn Kinds -->
+	<!-- Naga_Colonist -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Naga_Colonist"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>3</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>200</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Naga_Refugee -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Naga_Refugee"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>3</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>200</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Naga_Wanderer -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Naga_Wanderer"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>3</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>200</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Naga_Trader -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Naga_Trader"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>200</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Naga_Drifter -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Naga_Drifter"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>200</min>
+					<max>400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.9</shieldChance>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Naga_Grenadier_Destructive -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Naga_Grenadier_Destructive"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>150</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Naga_Mercenary_Gunner -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Naga_Mercenary_Gunner"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>200</min>
+							<max>400</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Naga_Mercenary_Sniper -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Naga_Mercenary_Sniper"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>3</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>200</min>
+							<max>400</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Naga_Mercenary_Heavy -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Naga_Mercenary_Heavy"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>3</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>200</min>
+							<max>400</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Naga_Boss -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Naga_Boss"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>400</min>
+							<max>500</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Naga_Mercenary_Elite -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Naga_Mercenary_Elite"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>400</min>
+							<max>500</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Naga_Archer -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Naga_Archer"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>10</min>
+					<max>40</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>100</min>
+					<max>140</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.6</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>40</min>
+							<max>80</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Naga_Hunter -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Naga_Hunter"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>10</min>
+					<max>60</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>100</min>
+					<max>180</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.6</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>80</min>
+							<max>160</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Naga_HeavyArcher -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Naga_HeavyArcher"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>10</min>
+					<max>80</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>100</min>
+					<max>200</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.6</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>200</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Naga_Warrior -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Naga_Warrior"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>100</min>
+					<max>200</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.9</shieldChance>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/SYR Naga/Patches/SYR Naga/Patch_Race_Naga.xml b/ModPatches/SYR Naga/Patches/SYR Naga/Patch_Race_Naga.xml
new file mode 100644
index 0000000000..bc732a2ba6
--- /dev/null
+++ b/ModPatches/SYR Naga/Patches/SYR Naga/Patch_Race_Naga.xml	
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Naga"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Naga"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Naga"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Naga"]/statBases/Mass</xpath>
+		<!-- Nagas are too light in the original mod, only 80kg for a 5.5m THICC snake -->
+		<value>
+			<Mass>100</Mass>
+		</value>
+	</Operation>
+
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Naga"]/statBases</xpath>
+		<!-- Stats are calculated for a 5.5m long, 340kg Naga -->
+		<value>
+			<UnarmedDamage>0.9</UnarmedDamage>
+			<MeleeCritChance>1.23</MeleeCritChance>
+			<MeleeParryChance>1.21</MeleeParryChance>
+			<MeleeDodgeChance>1.24</MeleeDodgeChance>
+			<AimingAccuracy>1.1</AimingAccuracy>
+			<Suppressability>1.2</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Naga"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<chanceFactor>0.25</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<chanceFactor>0.25</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>fangs</label>
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.11</cooldownTime>
+					<linkedBodyPartsGroup>Fangs</linkedBodyPartsGroup>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>tail</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>3.17</cooldownTime>
+					<linkedBodyPartsGroup>TailAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Naga"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/SYR Naga/Patches/SYR Naga/Patch_Scenarios_Naga.xml b/ModPatches/SYR Naga/Patches/SYR Naga/Patch_Scenarios_Naga.xml
new file mode 100644
index 0000000000..444aa0fba2
--- /dev/null
+++ b/ModPatches/SYR Naga/Patches/SYR Naga/Patch_Scenarios_Naga.xml	
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="NagaScenario"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_44MagnumCharged</thingDef>
+				<count>60</count>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/SYR Naga/Patches/SYR Naga/Patch_ThingsMachining_Naga.xml b/ModPatches/SYR Naga/Patches/SYR Naga/Patch_ThingsMachining_Naga.xml
new file mode 100644
index 0000000000..11db56467d
--- /dev/null
+++ b/ModPatches/SYR Naga/Patches/SYR Naga/Patch_ThingsMachining_Naga.xml	
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Naga Things -->
+	<!-- ========== Flak Tail Armor ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_FlakTailArmor"]/statBases</xpath>
+		<value>
+			<Bulk>7</Bulk>
+			<WornBulk>4</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_FlakTailArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_FlakTailArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>21</ArmorRating_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/SYR Naga/Patches/SYR Naga/Patch_ThingsMisc_Naga.xml b/ModPatches/SYR Naga/Patches/SYR Naga/Patch_ThingsMisc_Naga.xml
new file mode 100644
index 0000000000..a3ee369802
--- /dev/null
+++ b/ModPatches/SYR Naga/Patches/SYR Naga/Patch_ThingsMisc_Naga.xml	
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Naga Prosthetics -->
+	<!-- ========== Bionic Naga Tail ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BionicNagaTail"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>bionic naga tail</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2.64</cooldownTime>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Archotech Naga Tail ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ArchotechNagaTail"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>archotech naga tail</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>1.76</cooldownTime>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/SYR Naga/Patches/SYR Naga/Patch_ThingsWeapons_Naga.xml b/ModPatches/SYR Naga/Patches/SYR Naga/Patch_ThingsWeapons_Naga.xml
new file mode 100644
index 0000000000..f8e379fcaf
--- /dev/null
+++ b/ModPatches/SYR Naga/Patches/SYR Naga/Patch_ThingsWeapons_Naga.xml	
@@ -0,0 +1,314 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Naga Weapons -->
+	<!-- ========== Naga Revolver ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_NagaRevolver</defName>
+		<statBases>
+			<Mass>1.45</Mass>
+			<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>2.41</Bulk>
+			<WorkToMake>4000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<Jade>10</Jade>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_44MagnumCharged</defaultProjectile>
+			<warmupTime>0.7</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_44MagnumCharged</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>SimpleNagaGun</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>true</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Naga SMG ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_NagaSMG</defName>
+		<statBases>
+			<Mass>2.5</Mass>
+			<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>0.75</SwayFactor>
+			<Bulk>4.50</Bulk>
+			<WorkToMake>11000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>75</Steel>
+			<Jade>20</Jade>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
+			<warmupTime>0.7</warmupTime>
+			<range>12</range>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_6x18mmCharged_NagaSMG</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>SimpleNagaGun</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>true</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Naga Shotgun ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_NagaShotgun</defName>
+		<statBases>
+			<Mass>3.4</Mass>
+			<RangedWeapon_Cooldown>1.1</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.20</SwayFactor>
+			<Bulk>9.00</Bulk>
+			<WorkToMake>12000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>60</Steel>
+			<Jade>20</Jade>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12GaugeCharged</defaultProjectile>
+			<warmupTime>0.9</warmupTime>
+			<range>16</range>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>15</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4.25</reloadTime>
+			<ammoSet>AmmoSet_12GaugeCharged_NagaShotgun</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>SimpleNagaGun</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>true</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Naga Rifle ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_NagaRifle</defName>
+		<statBases>
+			<Mass>3.5</Mass>
+			<RangedWeapon_Cooldown>1.4</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.20</SwayFactor>
+			<Bulk>8.00</Bulk>
+			<WorkToMake>40000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>60</Steel>
+			<Jade>35</Jade>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_5x35mmCharged</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>55</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_5x35mmCharged_NagaRifle</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>AdvancedNagaGun</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>true</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Naga Sniper Rifle ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_NagaSniper</defName>
+		<statBases>
+			<Mass>4</Mass>
+			<RangedWeapon_Cooldown>2.3</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.60</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.90</SwayFactor>
+			<Bulk>12.00</Bulk>
+			<WorkToMake>45000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>60</Steel>
+			<Jade>35</Jade>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
+			<warmupTime>2.0</warmupTime>
+			<range>75</range>
+			<soundCast>NagaSniperShot</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>15</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_8x35mmCharged_NagaSniper</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>NagaSniper</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Gun_NagaSMG" or
+			defName="Gun_NagaShotgun" or
+			defName="Gun_NagaRifle" or
+			defName="Gun_NagaSniper"
+			]/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_NagaRevolver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Saclean Race/Patches/Saclean Race/Bodies/Saclean_Bodytype.xml b/ModPatches/Saclean Race/Patches/Saclean Race/Bodies/Saclean_Bodytype.xml
new file mode 100644
index 0000000000..b017272967
--- /dev/null
+++ b/ModPatches/Saclean Race/Patches/Saclean Race/Bodies/Saclean_Bodytype.xml	
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Saclean Bodytype-->
+
+	<!--Arm Groups-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Saclean_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Saclean_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Saclean_Body"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Saclean_Body"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<!--Natural Armor-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Saclean_Body"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Saclean_Body"]/corePart/parts/li[def="Saclean_Wing"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Saclean_Body"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Saclean_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Saclean_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Saclean_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Saclean_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Saclean_Body"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Saclean_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Saclean_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Saclean_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Saclean_Body"]/corePart/parts/li[def="Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Saclean_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Saclean_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Saclean Race/Patches/Saclean Race/PawnKindDefs/Saclean_PawnKind.xml b/ModPatches/Saclean Race/Patches/Saclean Race/PawnKindDefs/Saclean_PawnKind.xml
new file mode 100644
index 0000000000..f9a149012b
--- /dev/null
+++ b/ModPatches/Saclean Race/Patches/Saclean Race/PawnKindDefs/Saclean_PawnKind.xml	
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Ammo-->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			@Name="HAR_Saclean_KindBase_NPC"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Backpack-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CE_Apparel_Backpack"]/apparel/tags</xpath>
+		<value>
+			<li>HAR_SL_Apparel</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Saclean Race/Patches/Saclean Race/ThingDefs_Misc/Saclean_Apparel.xml b/ModPatches/Saclean Race/Patches/Saclean Race/ThingDefs_Misc/Saclean_Apparel.xml
new file mode 100644
index 0000000000..478bfe6a27
--- /dev/null
+++ b/ModPatches/Saclean Race/Patches/Saclean Race/ThingDefs_Misc/Saclean_Apparel.xml	
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HAR_SL_O_a"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.25</StuffEffectMultiplierArmor>
+			<Bulk>0.5</Bulk>
+			<WornBulk>0.25</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_SL_Tops_a" or
+			defName="HAR_SL_Tops_b" or
+			defName="HAR_SL_Tops_c"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.5</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Shell-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_SL_Shell_a" or
+			defName="HAR_SL_Shell_b" or
+			defName="HAR_SL_Shell_c"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Overhead-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_SL_Heads_a" or
+			defName="HAR_SL_Heads_b" or
+			defName="HAR_SL_Heads_c"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Saclean Race/Patches/Saclean Race/ThingDefs_Races/AlienRace_Saclean.xml b/ModPatches/Saclean Race/Patches/Saclean Race/ThingDefs_Races/AlienRace_Saclean.xml
new file mode 100644
index 0000000000..0eabdefd54
--- /dev/null
+++ b/ModPatches/Saclean Race/Patches/Saclean Race/ThingDefs_Races/AlienRace_Saclean.xml	
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="HAR_Saclean_BaseNRPawn"]/inspectorTabs/li[.="ITab_Pawn_Gear"]</xpath>
+		<value>
+			<li>CombatExtended.ITab_Inventory</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="HAR_Saclean_BaseNRPawn"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Inventory"/>
+			<li Class="CombatExtended.CompProperties_TacticalManager"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="HAR_Saclean_BaseNRPawn"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Saclean"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Saclean"]/statBases</xpath>
+		<value>
+			<Suppressability>1</Suppressability>
+			<SmokeSensitivity>1.2</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Saclean"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.162</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.162</armorPenetrationBlunt>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Saclean"]/alienRace/raceRestriction/whiteApparelList</xpath>
+		<value>
+			<li>CE_Apparel_TacVest</li>
+			<li>CE_Apparel_Backpack</li>
+			<li>CE_Apparel_TribalBackpack</li>
+			<li>CE_Apparel_BallisticShield</li>
+			<li>CE_Apparel_MeleeShield</li>
+			<li>CE_Apparel_GasMask</li>
+			<li>CE_Apparel_ImprovGasMask</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Saclean Race/Patches/Saclean Race/ThingDes_Items/WoolDef.xml b/ModPatches/Saclean Race/Patches/Saclean Race/ThingDes_Items/WoolDef.xml
new file mode 100644
index 0000000000..e69d7d4d79
--- /dev/null
+++ b/ModPatches/Saclean Race/Patches/Saclean Race/ThingDes_Items/WoolDef.xml	
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_SL_Wool"
+			]/statBases/StuffPower_Armor_Sharp </xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.28</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_SL_Wool"
+			]/statBases/StuffPower_Armor_Blunt </xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.07</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_SL_Wool"
+			]/statBases/StuffPower_Armor_Heat </xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.20</StuffPower_Armor_Heat>
+			<StuffPower_Armor_Electric>0.10</StuffPower_Armor_Electric>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Salted Meat 2.0/Patches/Salted Meat 2.0/Items_Meat.xml b/ModPatches/Salted Meat 2.0/Patches/Salted Meat 2.0/Items_Meat.xml
new file mode 100644
index 0000000000..c3cfdedc57
--- /dev/null
+++ b/ModPatches/Salted Meat 2.0/Patches/Salted Meat 2.0/Items_Meat.xml	
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Give meat products appropriate bulk. -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SM_Sausage_Raw" or defName="SM_Sausage" or defName="SM_SaltedMeat"]/statBases</xpath>
+		<value>
+			<Bulk>0.20</Bulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Save Our Ship 2/Defs/Save Our Ship 2/Holograms_Projectiles.xml b/ModPatches/Save Our Ship 2/Defs/Save Our Ship 2/Holograms_Projectiles.xml
new file mode 100644
index 0000000000..3611a58182
--- /dev/null
+++ b/ModPatches/Save Our Ship 2/Defs/Save Our Ship 2/Holograms_Projectiles.xml	
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- === Projectiles === -->
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletBlue">
+		<defName>Bullet_Laser_Hologram</defName>
+		<label>hologram laser</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>12.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt><!-- The overall pressure exerted by a laser beam striking something is, unsuprisingly, negligable. -->
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base40x46mmGrenadeBullet">
+		<defName>Bullet_Archoblast</defName>
+		<label>archoblast</label>
+		<graphicData>
+			<texPath>Things/Building/Ship/HullPlateTransparent</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>3</explosionRadius>
+			<speed>999</speed>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>20</damageAmountBase>
+			<extraDamages>
+				<li>
+					<def>EMP</def>
+					<amount>5</amount>
+					<chance>1</chance>
+				</li>
+				<li>
+					<def>Flame</def>
+					<amount>5</amount>
+					<chance>1</chance>
+				</li>
+			</extraDamages>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Apparel_SOS2.xml b/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Apparel_SOS2.xml
new file mode 100644
index 0000000000..6b566f0a02
--- /dev/null
+++ b/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Apparel_SOS2.xml	
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--  Survival Belt -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_SpaceSurvivalBelt"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<!--  EVA Suit -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitBody"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>4</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitBody"]/equippedStatOffsets</xpath>
+		<value>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<!--  EVA Helmet -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!--  Heavy EVA Helmet -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmetHeavy"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmetHeavy"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmetHeavy"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmetHeavy"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmetHeavy"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmetHeavy"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmetHeavy"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>65</Plasteel>
+			<DevilstrandCloth>20</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmetHeavy"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmetHeavy"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmetHeavy"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>200</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<!--  Heavy EVA Suit -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitBodyHeavy"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>230</Plasteel>
+			<DevilstrandCloth>20</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitBodyHeavy"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitBodyHeavy"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitBodyHeavy"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitBodyHeavy"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>400</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitBodyHeavy"]/statBases/Mass</xpath>
+		<value>
+			<Mass>50</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitBodyHeavy"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>10</CarryBulk>
+			<CarryWeight>80</CarryWeight>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/ArchoCreatures_SOS2.xml b/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/ArchoCreatures_SOS2.xml
new file mode 100644
index 0000000000..b081b19646
--- /dev/null
+++ b/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/ArchoCreatures_SOS2.xml	
@@ -0,0 +1,741 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Archocat"]</xpath>
+		<match Class="PatchOperationSequence">
+			<operations>
+				<!-- ========== Archocat : Non-combat Type ========== -->
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="Archocat"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.23</MeleeDodgeChance>
+						<MeleeCritChance>0.02</MeleeCritChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Archocat"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>left claw</label>
+								<capacities>
+									<li>Scratch</li>
+								</capacities>
+								<power>2</power>
+								<cooldownTime>0.55</cooldownTime>
+								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>20</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
+								<armorPenetrationSharp>0.01</armorPenetrationSharp>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>right claw</label>
+								<capacities>
+									<li>Scratch</li>
+								</capacities>
+								<power>2</power>
+								<cooldownTime>0.55</cooldownTime>
+								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>20</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
+								<armorPenetrationSharp>0.01</armorPenetrationSharp>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<capacities>
+									<li>Bite</li>
+								</capacities>
+								<power>5</power>
+								<cooldownTime>0.85</cooldownTime>
+								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>20</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationBlunt>0.254</armorPenetrationBlunt>
+								<armorPenetrationSharp>0.03</armorPenetrationSharp>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>1</power>
+								<cooldownTime>0.55</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<chanceFactor>0.2</chanceFactor>
+								<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="Archocat"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Quadruped</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<!-- ========== Archomutt : Combat Type ========== -->
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="Archomutt"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.22</MeleeDodgeChance>
+						<MeleeCritChance>0.05</MeleeCritChance>
+						<MeleeParryChance>0.04</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Archomutt"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>left claw</label>
+								<capacities>
+									<li>Scratch</li>
+								</capacities>
+								<power>16</power>
+								<cooldownTime>0.52</cooldownTime>
+								<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
+								<armorPenetrationSharp>2.16</armorPenetrationSharp>
+								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>right claw</label>
+								<capacities>
+									<li>Scratch</li>
+								</capacities>
+								<power>16</power>
+								<cooldownTime>0.52</cooldownTime>
+								<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
+								<armorPenetrationSharp>2.16</armorPenetrationSharp>
+								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<capacities>
+									<li>Bite</li>
+								</capacities>
+								<power>47</power>
+								<cooldownTime>0.97</cooldownTime>
+								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+								<armorPenetrationSharp>0.68</armorPenetrationSharp>
+								<armorPenetrationBlunt>27.04</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>6</power>
+								<cooldownTime>0.75</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<chanceFactor>0.2</chanceFactor>
+								<armorPenetrationBlunt>2</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="Archomutt"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Quadruped</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<!-- ========== Archostrich : Combat Type ========== -->
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="Archostrich"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.19</MeleeDodgeChance>
+						<MeleeCritChance>0.16</MeleeCritChance>
+						<MeleeParryChance>0.10</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Archostrich"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>claws</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>26</power>
+								<cooldownTime>0.89</cooldownTime>
+								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>20</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>16</armorPenetrationSharp>
+								<armorPenetrationBlunt>4</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<capacities>
+									<li>Bite</li>
+								</capacities>
+								<power>19</power>
+								<cooldownTime>1.97</cooldownTime>
+								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+								<chanceFactor>0.5</chanceFactor>
+								<armorPenetrationSharp>0.08</armorPenetrationSharp>
+								<armorPenetrationBlunt>12</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>20</power>
+								<cooldownTime>1.78</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<chanceFactor>0.2</chanceFactor>
+								<armorPenetrationBlunt>8</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<!-- ========== Archoffalo : Non-Combat ========== -->
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="Archoffalo"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.12</MeleeDodgeChance>
+						<MeleeCritChance>0.27</MeleeCritChance>
+						<MeleeParryChance>0.20</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Archoffalo"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>24</power>
+								<cooldownTime>3.17</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<chanceFactor>0.2</chanceFactor>
+								<armorPenetrationBlunt>10</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="Archoffalo"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Quadruped</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<!-- ========== Megaspider : Combat Type ========== -->
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Archospider"]/statBases/MoveSpeed</xpath>
+					<value>
+						<MoveSpeed>5</MoveSpeed>
+						<MeleeDodgeChance>0.07</MeleeDodgeChance>
+						<MeleeCritChance>0.25</MeleeCritChance>
+						<MeleeParryChance>0.17</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Archospider"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<capacities>
+									<li>Stab</li>
+								</capacities>
+								<power>25</power>
+								<cooldownTime>1.48</cooldownTime>
+								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+								<chanceFactor>1.5</chanceFactor>
+								<armorPenetrationSharp>60</armorPenetrationSharp>
+								<armorPenetrationBlunt>30</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>61</power>
+								<cooldownTime>1.65</cooldownTime>
+								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+								<armorPenetrationSharp>11.25</armorPenetrationSharp>
+								<armorPenetrationBlunt>8.438</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>10</power>
+								<cooldownTime>2.48</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<chanceFactor>0.2</chanceFactor>
+								<armorPenetrationSharp>40</armorPenetrationSharp>
+								<armorPenetrationBlunt>20</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Archospider"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>48</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Archospider"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>16</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Archospider"]/race/body</xpath>
+					<value>
+						<body>CE_ArmoredBeetleLikeWithClaw</body>
+					</value>
+				</li>
+
+				<!-- ========== Archolope : Non-Combat ========== -->
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="Archolope"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Quadruped</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="Archolope"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.05</MeleeDodgeChance>
+						<MeleeCritChance>0.07</MeleeCritChance>
+						<MeleeParryChance>0.16</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Archolope"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>5</power>
+								<cooldownTime>1.97</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<!-- ========== Archotortoise : Combat Type ========== -->
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="Tortoise"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>QuadrupedLow</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Archotortoise"]/statBases/MoveSpeed</xpath>
+					<value>
+						<MoveSpeed>3.0</MoveSpeed>
+						<MeleeDodgeChance>0.02</MeleeDodgeChance>
+						<MeleeCritChance>0.01</MeleeCritChance>
+						<MeleeParryChance>0.05</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Archotortoise"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>45</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Archotortoise"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>20</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Archotortoise"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<capacities>
+									<li>Bite</li>
+								</capacities>
+								<power>19</power>
+								<cooldownTime>1.33</cooldownTime>
+								<linkedBodyPartsGroup>TurtleBeakAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationSharp>0.21</armorPenetrationSharp>
+								<armorPenetrationBlunt>5.12</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>3</power>
+								<cooldownTime>0.83</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<chanceFactor>0.2</chanceFactor>
+								<armorPenetrationBlunt>0.768</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<!-- ========== Archeopanda : Non-Combat ========== -->
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="Archopanda"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Quadruped</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="Archopanda"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.15</MeleeDodgeChance>
+						<MeleeCritChance>0.19</MeleeCritChance>
+						<MeleeParryChance>0.11</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Archopanda"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>left claw</label>
+								<capacities>
+									<li>Scratch</li>
+								</capacities>
+								<power>21</power>
+								<cooldownTime>1.41</cooldownTime>
+								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>21</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>0.15</armorPenetrationSharp>
+								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>right claw</label>
+								<capacities>
+									<li>Scratch</li>
+								</capacities>
+								<power>21</power>
+								<cooldownTime>1.41</cooldownTime>
+								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>21</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>0.15</armorPenetrationSharp>
+								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<capacities>
+									<li>Bite</li>
+								</capacities>
+								<power>31</power>
+								<cooldownTime>2.05</cooldownTime>
+								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>21</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>0.85</armorPenetrationSharp>
+								<armorPenetrationBlunt>8.450</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>12</power>
+								<cooldownTime>2.22</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<chanceFactor>0.2</chanceFactor>
+								<armorPenetrationBlunt>4.235</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<!-- ========== Archojerboa : Non-Combat ========== -->
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="Archojerboa"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>QuadrupedLow</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Archojerboa"]/statBases/MoveSpeed</xpath>
+					<value>
+						<MeleeDodgeChance>0.2</MeleeDodgeChance>
+						<MeleeCritChance>0.01</MeleeCritChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Archojerboa"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>left claw</label>
+								<capacities>
+									<li>Scratch</li>
+								</capacities>
+								<power>1</power>
+								<cooldownTime>1.69</cooldownTime>
+								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>0.013</armorPenetrationBlunt>
+								<armorPenetrationSharp>0.01</armorPenetrationSharp>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>right claw</label>
+								<capacities>
+									<li>Scratch</li>
+								</capacities>
+								<power>1</power>
+								<cooldownTime>1.69</cooldownTime>
+								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>0.013</armorPenetrationBlunt>
+								<armorPenetrationSharp>0.01</armorPenetrationSharp>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<capacities>
+									<li>Bite</li>
+								</capacities>
+								<power>4</power>
+								<cooldownTime>0.95</cooldownTime>
+								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+								<armorPenetrationSharp>0.09</armorPenetrationSharp>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>1</power>
+								<cooldownTime>3.00</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<chanceFactor>0.2</chanceFactor>
+								<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
+								<armorPenetrationSharp>0</armorPenetrationSharp>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<!-- ========== Archothrumbo : Combat Type ========== -->
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="Archothrumbo"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.09</MeleeDodgeChance>
+						<MeleeCritChance>0.76</MeleeCritChance>
+						<MeleeParryChance>0.45</MeleeParryChance>
+						<Flammability>0.6</Flammability>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Archothrumbo"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>63</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Archothrumbo"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>28</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<!--Heavy Plasma sword as horn, Zeushammers as feet-->
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Archothrumbo"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>horn</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>66</power>
+								<extraMeleeDamages>
+									<li>
+										<def>Flame</def>
+										<amount>5</amount>
+										<chance>0.3</chance>
+									</li>
+								</extraMeleeDamages>
+								<cooldownTime>2.76</cooldownTime>
+								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationSharp>51.2</armorPenetrationSharp>
+								<armorPenetrationBlunt>10.24</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>horn</label>
+								<capacities>
+									<li>Stab</li>
+								</capacities>
+								<power>30</power>
+								<extraMeleeDamages>
+									<li>
+										<def>Flame</def>
+										<amount>3</amount>
+										<chance>0.2</chance>
+									</li>
+								</extraMeleeDamages>
+								<cooldownTime>1.4</cooldownTime>
+								<chanceFactor>0.65</chanceFactor>
+								<linkedBodyPartsGroup>HornAttackTool_2</linkedBodyPartsGroup>
+								<armorPenetrationSharp>129.6</armorPenetrationSharp>
+								<armorPenetrationBlunt>12.96</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>left foot</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>41</power>
+								<extraMeleeDamages>
+									<li>
+										<def>EMP</def>
+										<amount>5</amount>
+									</li>
+								</extraMeleeDamages>
+								<cooldownTime>2.76</cooldownTime>
+								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>157.5</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>right foot</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>41</power>
+								<extraMeleeDamages>
+									<li>
+										<def>EMP</def>
+										<amount>5</amount>
+									</li>
+								</extraMeleeDamages>
+								<cooldownTime>2.76</cooldownTime>
+								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>157.5</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>37</power>
+								<cooldownTime>1.26</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<chanceFactor>0.2</chanceFactor>
+								<armorPenetrationBlunt>16</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="Archothrumbo"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Birdlike</bodyShape>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Creatures_SOS2.xml b/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Creatures_SOS2.xml
new file mode 100644
index 0000000000..a9ea7deb26
--- /dev/null
+++ b/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Creatures_SOS2.xml	
@@ -0,0 +1,298 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Base Space Insect ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="BaseInsectSpace"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="BaseInsectSpace"]/statBases</xpath>
+		<value>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!-- ========== Astromite ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Astromite"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4.7</MoveSpeed>
+			<MeleeDodgeChance>0.14</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Astromite"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Astromite"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Astromite"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Astromite"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>0.3</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Astromite"]/combatPower</xpath>
+		<value>
+			<combatPower>20</combatPower>
+		</value>
+	</Operation>
+
+	<!-- ========== Stellapede ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Stellapede"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4.3</MoveSpeed>
+			<MeleeDodgeChance>0.08</MeleeDodgeChance>
+			<MeleeCritChance>0.12</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Stellapede"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.78</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.14</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Stellapede"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Stellapede"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Stellapede"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>1.2</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Stellapede"]/combatPower</xpath>
+		<value>
+			<combatPower>80</combatPower>
+		</value>
+	</Operation>
+
+	<!-- ========== Cosmopillar ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Cosmopillar"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4.5</MoveSpeed>
+			<MeleeDodgeChance>0.07</MeleeDodgeChance>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.17</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Cosmopillar"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>43</power>
+					<cooldownTime>2.48</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.750</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Cosmopillar"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Cosmopillar"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Cosmopillar"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>1.8</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Cosmopillar"]/combatPower</xpath>
+		<value>
+			<combatPower>130</combatPower>
+		</value>
+	</Operation>
+
+	<!-- ========== Base Shuttle ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="BaseShuttle"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Vehicle</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="BaseShuttle"]/statBases</xpath>
+		<value>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!-- ========== Shuttles Armor & Melee ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ShuttlePersonalRace" or
+			defName="ShuttleCargoRace" or
+			defName="ShuttleHeavyRace"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ShuttlePersonalRace" or
+			defName="ShuttleCargoRace" or
+			defName="ShuttleHeavyRace"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>13</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="ShuttlePersonalRace" or
+			defName="ShuttleCargoRace" or
+			defName="ShuttleHeavyRace"
+			]/verbs </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ShuttlePersonalRace" or
+			defName="ShuttleCargoRace" or
+			defName="ShuttleHeavyRace"
+			] </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>hull</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>3.51</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Hediffs_SOS2.xml b/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Hediffs_SOS2.xml
new file mode 100644
index 0000000000..40bab833b4
--- /dev/null
+++ b/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Hediffs_SOS2.xml	
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="SoSPsychicPredictor"]</xpath>
+		<match Class="PatchOperationSequence">
+			<operations>
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[defName="SoSPsychicPredictor"]/stages/li/statOffsets</xpath>
+					<value>
+						<statOffsets>
+							<ShootingAccuracyPawn>+1</ShootingAccuracyPawn>
+							<AimingAccuracy>+0.5</AimingAccuracy>
+							<MeleeDodgeChance>1</MeleeDodgeChance>
+							<MeleeCritChance>0.4</MeleeCritChance>
+							<MeleeParryChance>0.5</MeleeParryChance>
+							<Suppressability>-0.50</Suppressability>
+						</statOffsets>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[defName="SoSArchotechSkin"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>3</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[defName="SoSArchotechSkin"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>4.5</ArmorRating_Blunt>
+						<ArmorRating_Electric>0.4</ArmorRating_Electric>
+					</value>
+				</li>
+			</operations>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/HediffDef[defName="SoSHologramArchotech"]</xpath>
+		<match Class="PatchOperationSequence">
+			<operations>
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[defName="SoSHologramArchotech"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>12.0</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[defName="SoSHologramArchotech"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>16.0</ArmorRating_Blunt>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/HologramRace_SOS2.xml b/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/HologramRace_SOS2.xml
new file mode 100644
index 0000000000..e4de28e3f1
--- /dev/null
+++ b/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/HologramRace_SOS2.xml	
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="SoSHologramRace"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SoSHologramRace"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<SmokeSensitivity>0</SmokeSensitivity>
+			<Suppressability>0</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SoSHologramRace"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="SoSHologramRace"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="SoSHologramRace"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SoSHologramRace"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Hologram Laser === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>HologramLaser</defName>
+		<statBases>
+			<Bulk>0.01</Bulk>
+			<SwayFactor>1.17</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>2.6</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Laser_Hologram</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>16</range>
+			<soundCast>ShipCombatLaser</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>4</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Hologram Sword === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HologramSword"]/tools</xpath>
+		<value>
+			<tools>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.1</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>6</amount>
+							<chance>0.4</chance>
+						</li>
+					</extraMeleeDamages>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.1</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>10</amount>
+							<chance>0.6</chance>
+						</li>
+					</extraMeleeDamages>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HologramSword"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.8</MeleeCounterParryBonus>
+			<Bulk>0.01</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HologramSword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.00</MeleeCritChance>
+				<MeleeParryChance>0.60</MeleeParryChance>
+				<MeleeDodgeChance>0.40</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- === Archo Hologram Blast === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>HologramLaserArchotech</defName>
+		<statBases>
+			<Bulk>0.01</Bulk>
+			<SwayFactor>1.17</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>2.85</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Archoblast</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>26</range>
+			<soundCast>ShipCombatLaser</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>0</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Patch_DamageDefs_SOS2.xml b/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Patch_DamageDefs_SOS2.xml
new file mode 100644
index 0000000000..09f748f5c0
--- /dev/null
+++ b/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Patch_DamageDefs_SOS2.xml	
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[
+			defName="ShipPlasmaSmall" or
+			defName="BombKinetic"
+			]/defaultArmorPenetration </xpath>
+		<value>
+			<defaultArmorPenetration>150</defaultArmorPenetration>
+		</value>
+	</Operation>
+
+	<!-- Small lasers do low damage and are unlikely to kill -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[
+			defName="ShipLaserSmall" or
+			defName="ShipLaserTwo" or
+			defName="BombKineticLarge" or
+			defName="ShipPlasmaLarge"
+			]/defaultArmorPenetration </xpath>
+		<value>
+			<defaultArmorPenetration>500</defaultArmorPenetration>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/PawnKindsDefs_SOS2.xml b/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/PawnKindsDefs_SOS2.xml
new file mode 100644
index 0000000000..5948b3ea0a
--- /dev/null
+++ b/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/PawnKindsDefs_SOS2.xml	
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="SpaceCannibal"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>4</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="SpaceCrew"]/apparelMoney</xpath>
+		<value>
+			<apparelMoney>
+				<min>400</min>
+				<max>800</max>
+			</apparelMoney>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="SpaceCrew"]/weaponMoney</xpath>
+		<value>
+			<weaponMoney>
+				<min>150</min>
+				<max>300</max>
+			</weaponMoney>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="SpaceCrew"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>2</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="SpaceCrewMarine"]/weaponMoney</xpath>
+		<value>
+			<weaponMoney>
+				<min>500</min>
+				<max>900</max>
+			</weaponMoney>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="SpaceCrewMarine"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>4</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="SpaceCrewMarineHeavy"]/weaponMoney</xpath>
+		<value>
+			<weaponMoney>
+				<min>600</min>
+				<max>1300</max>
+			</weaponMoney>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="SpaceCrewMarineHeavy"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>400</min>
+							<max>800</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="SpaceCrewMarineHeavy"]/combatPower</xpath>
+		<value>
+			<combatPower>280</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Empire_Fighter_Marine_Space"]</xpath>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/PawnKindDef[defName="Empire_Fighter_Marine_Space"]</xpath>
+					<value>
+						<li Class="CombatExtended.LoadoutPropertiesExtension">
+							<primaryMagazineCount>
+								<min>4</min>
+								<max>8</max>
+							</primaryMagazineCount>
+							<sidearms>
+								<li>
+									<generateChance>0.5</generateChance>
+									<sidearmMoney>
+										<min>150</min>
+										<max>350</max>
+									</sidearmMoney>
+									<weaponTags>
+										<li>CE_Sidearm_Melee</li>
+									</weaponTags>
+								</li>
+							</sidearms>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/PawnKindDef[defName="Empire_Fighter_Cataphract_Space"]</xpath>
+					<value>
+						<li Class="CombatExtended.LoadoutPropertiesExtension">
+							<primaryMagazineCount>
+								<min>5</min>
+								<max>9</max>
+							</primaryMagazineCount>
+							<sidearms>
+								<li>
+									<generateChance>0.5</generateChance>
+									<sidearmMoney>
+										<min>300</min>
+										<max>500</max>
+									</sidearmMoney>
+									<weaponTags>
+										<li>CE_Sidearm_Melee</li>
+									</weaponTags>
+								</li>
+							</sidearms>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Scenarios_SOS2.xml b/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Scenarios_SOS2.xml
new file mode 100644
index 0000000000..bf250f2f31
--- /dev/null
+++ b/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Scenarios_SOS2.xml	
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="SoSDerelict"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_303British_FMJ</thingDef>
+				<count>100</count>
+			</li>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_44Magnum_FMJ</thingDef>
+				<count>60</count>
+			</li>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_6x24mmCharged</thingDef>
+				<count>180</count>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="SoSDungeon"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_303British_FMJ</thingDef>
+				<count>100</count>
+			</li>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_44Magnum_FMJ</thingDef>
+				<count>60</count>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Ships_SOS2.xml b/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Ships_SOS2.xml
new file mode 100644
index 0000000000..3f45f9aeae
--- /dev/null
+++ b/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Ships_SOS2.xml	
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Because the starting ships can generate with charge rifles, they should really generate with ammo for them, too. -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/EnemyShipDef[defName="StartShipA"]/symbolTable</xpath>
+		<value>
+			<li>
+				<key>/</key>
+				<value>
+					<shapeOrDef>Ammo_6x24mmCharged</shapeOrDef>
+				</value>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/EnemyShipDef[defName="StartShipB"]/symbolTable</xpath>
+		<value>
+			<li>
+				<key>*</key>
+				<value>
+					<shapeOrDef>Ammo_6x24mmCharged</shapeOrDef>
+				</value>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/EnemyShipDef[defName="StartShipC"]/symbolTable</xpath>
+		<value>
+			<li>
+				<key>*</key>
+				<value>
+					<shapeOrDef>Ammo_6x24mmCharged</shapeOrDef>
+				</value>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/EnemyShipDef[defName="StartShipD"]/symbolTable</xpath>
+		<value>
+			<li>
+				<key>*</key>
+				<value>
+					<shapeOrDef>Ammo_6x24mmCharged</shapeOrDef>
+				</value>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/EnemyShipDef[defName="StartShipE"]/symbolTable</xpath>
+		<value>
+			<li>
+				<key>*</key>
+				<value>
+					<shapeOrDef>Ammo_6x24mmCharged</shapeOrDef>
+				</value>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/EnemyShipDef[defName="StartShipF"]/symbolTable</xpath>
+		<value>
+			<li>
+				<key>*</key>
+				<value>
+					<shapeOrDef>Ammo_6x24mmCharged</shapeOrDef>
+				</value>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/EnemyShipDef[defName="StartShipK_Infested"]/symbolTable</xpath>
+		<value>
+			<li>
+				<key>*</key>
+				<value>
+					<shapeOrDef>Ammo_6x24mmCharged</shapeOrDef>
+				</value>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Weapons_Grenades.xml b/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Weapons_Grenades.xml
new file mode 100644
index 0000000000..5391efc4f8
--- /dev/null
+++ b/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Weapons_Grenades.xml	
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Proj_GrenadeMechanite"]</xpath>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!-- ========== Molotov cocktail ========== -->
+
+				<!-- Projectile -->
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Proj_GrenadeMechanite"]/graphicData/texPath</xpath>
+					<value>
+						<texPath>Things/Projectile/Grenades/Molotov</texPath>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="Proj_GrenadeMechanite"]</xpath>
+					<value>
+						<projectile Class="CombatExtended.ProjectilePropertiesCE">
+							<explosionRadius>0.5</explosionRadius>
+							<damageDef>BombMechanite</damageDef>
+							<damageAmountBase>10</damageAmountBase>
+							<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
+							<preExplosionSpawnChance>1</preExplosionSpawnChance>
+							<speed>12</speed>
+							<ai_IsIncendiary>true</ai_IsIncendiary>
+						</projectile>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="Proj_GrenadeMechanite"]</xpath>
+					<value>
+						<thingClass>CombatExtended.Projectile_FireTrail</thingClass>
+					</value>
+				</li>
+
+				<!-- Grenade -->
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Weapon_GrenadeMechanite"]/label</xpath>
+					<value>
+						<label>mechanite cocktail</label>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Weapon_GrenadeMechanite"]/graphicData</xpath>
+					<value>
+						<graphicData>
+							<texPath>Things/Ammo/HandGrenades/Molotov</texPath>
+							<graphicClass>Graphic_StackCount</graphicClass>
+							<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
+						</graphicData>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="Weapon_GrenadeMechanite"]</xpath>
+					<value>
+						<thingClass>CombatExtended.AmmoThing</thingClass>
+						<stackLimit>50</stackLimit>
+						<resourceReadoutPriority>First</resourceReadoutPriority>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAttributeSet">
+					<xpath>Defs/ThingDef[defName="Weapon_GrenadeMechanite"]</xpath>
+					<attribute>Class</attribute>
+					<value>CombatExtended.AmmoDef</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="Weapon_GrenadeMechanite"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="Weapon_GrenadeMechanite"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="Weapon_GrenadeMechanite"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ExplosiveCE">
+							<damageAmountBase>1</damageAmountBase>
+							<explosiveDamageType>Flame</explosiveDamageType>
+							<explosiveRadius>0.5</explosiveRadius>
+							<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
+							<preExplosionSpawnChance>1</preExplosionSpawnChance>
+						</li>
+					</value>
+				</li>
+
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>Weapon_GrenadeMechanite</defName>
+					<statBases>
+						<Mass>0.6</Mass>
+						<Bulk>2.55</Bulk>
+						<MarketValue>7.05</MarketValue>
+						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+						<SightsEfficiency>1.0</SightsEfficiency>
+					</statBases>
+					<Properties>
+						<label>throw molotov</label>
+						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<range>10</range>
+						<minRange>4</minRange>
+						<warmupTime>0.8</warmupTime>
+						<noiseRadius>4</noiseRadius>
+						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+						<soundCast>ThrowMolotovCocktail</soundCast>
+						<targetParams>
+							<canTargetLocations>true</canTargetLocations>
+						</targetParams>
+						<defaultProjectile>Proj_GrenadeMechanite</defaultProjectile>
+						<onlyManualCast>true</onlyManualCast>
+						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+					</Properties>
+					<weaponTags>
+						<li>CE_OneHandedWeapon</li>
+					</weaponTags>
+				</li>
+
+				<!--Vanilla Textures Expanded - Save Our Ship 2-->
+
+				<li Class="PatchOperationFindMod">
+					<mods>
+						<li>Vanilla Textures Expanded - Save Our Ship 2</li>
+					</mods>
+					<match Class="PatchOperationSequence">
+						<operations>
+							<li Class="PatchOperationReplace">
+								<xpath>Defs/ThingDef[defName="Proj_GrenadeMechanite"]/graphicData/texPath</xpath>
+								<value>
+									<texPath>Things/Item/GrenadeMechanite_Thrown</texPath>
+								</value>
+							</li>
+
+							<li Class="PatchOperationReplace">
+								<xpath>Defs/ThingDef[defName="Weapon_GrenadeMechanite"]/graphicData</xpath>
+								<value>
+									<graphicData>
+										<texPath>Things/Ammo/HandGrenades/GrenadeMechanite</texPath>
+										<graphicClass>Graphic_StackCount</graphicClass>
+										<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
+									</graphicData>
+								</value>
+							</li>
+
+							<li Class="PatchOperationReplace">
+								<xpath>Defs/ThingDef[defName="Weapon_GrenadeMechanite"]/label</xpath>
+								<value>
+									<label>mechanite grenade</label>
+								</value>
+							</li>
+						</operations>
+					</match>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Seren from Stardust/Patches/Seren from Stardust/Bodies_Seren.xml b/ModPatches/Seren from Stardust/Patches/Seren from Stardust/Bodies_Seren.xml
new file mode 100644
index 0000000000..21e7d85d0e
--- /dev/null
+++ b/ModPatches/Seren from Stardust/Patches/Seren from Stardust/Bodies_Seren.xml	
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Seren_Body"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Seren_Body"]/corePart/parts/li[def = "Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Seren_Body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Seren_Body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Seren_Body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Seren_Body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Ear"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Seren_Body"]/corePart/parts/li[def = "Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Seren_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Seren_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Seren_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/parts/li[def = "Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Seren_Body"]/corePart/parts/li[def = "Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Seren_Body"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Seren_Body"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/parts/li[def = "Toe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Seren from Stardust/Patches/Seren from Stardust/PawnKinds_Seren.xml b/ModPatches/Seren from Stardust/Patches/Seren from Stardust/PawnKinds_Seren.xml
new file mode 100644
index 0000000000..fbdf12b0f3
--- /dev/null
+++ b/ModPatches/Seren from Stardust/Patches/Seren from Stardust/PawnKinds_Seren.xml	
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="SerenModel"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="SerenRoughModel"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>7</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Seren from Stardust/Patches/Seren from Stardust/Scenarios.xml b/ModPatches/Seren from Stardust/Patches/Seren from Stardust/Scenarios.xml
new file mode 100644
index 0000000000..972d984a91
--- /dev/null
+++ b/ModPatches/Seren from Stardust/Patches/Seren from Stardust/Scenarios.xml	
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Add ammunition to RimCities starting scenarios -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="SerenRelocated"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_303British_FMJ</thingDef>
+				<count>100</count>
+			</li>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_44Magnum_FMJ</thingDef>
+				<count>60</count>
+			</li>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_45ACP_FMJ</thingDef>
+				<count>70</count>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Seren from Stardust/Patches/Seren from Stardust/Seren_Race.xml b/ModPatches/Seren from Stardust/Patches/Seren from Stardust/Seren_Race.xml
new file mode 100644
index 0000000000..f0838ed01e
--- /dev/null
+++ b/ModPatches/Seren from Stardust/Patches/Seren from Stardust/Seren_Race.xml	
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Seren"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Seren"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>1.1</MeleeDodgeChance>
+			<MeleeCritChance>0.9</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Seren"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.193</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>16</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.193</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>16</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.07</chanceFactor>
+					<soundMeleeHit>Pawn_Melee_HumanBite_Hit</soundMeleeHit>
+					<soundMeleeMiss>Pawn_Melee_HumanBite_Miss</soundMeleeMiss>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Checking if "Seren" has a <comps> node and adding it if it doesn't exist -->
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Seren"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Seren"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Seren"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Sergal/Defs/Sergal/Ammo_Sergal_LeadBall.xml b/ModPatches/Sergal/Defs/Sergal/Ammo_Sergal_LeadBall.xml
new file mode 100644
index 0000000000..84a1acff10
--- /dev/null
+++ b/ModPatches/Sergal/Defs/Sergal/Ammo_Sergal_LeadBall.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- ==================== AmmoCategory and ThingCategory ==================== -->
+
+	<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>AmmoSergalLeadBall</defName>
+		<label>lead ball</label>
+		<parent>AmmoNeolithic</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Sergal_LeadBall</defName>
+		<label>lead ball</label>
+		<ammoTypes>
+			<Ammo_Sergal_LeadBall>Bullet_Sergal_LeadBall</Ammo_Sergal_LeadBall>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="NeolithicAmmoBase">
+		<defName>Ammo_Sergal_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>AmmoSergalLeadBall</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>
+
+	<!-- ================== Projectiles ================== -->
+
+	<!-- Workaround for conditionally-patched projectiles: use an existing abstract class from the generic ammo library (In this case, BaseSlingBullet) -->
+
+	<ThingDef ParentName="BaseSlingBullet">
+		<defName>Bullet_Sergal_LeadBall</defName>
+		<label>lead ball</label>
+		<graphicData>
+			<texPath>Things/Projectile/Sling/Steel</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>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_Sergal_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_Sergal_LeadBall>500</Ammo_Sergal_LeadBall>
+		</products>
+		<workAmount>2000</workAmount>
+		<recipeUsers>
+			<li>FueledSmithy</li>
+			<li>ElectricSmithy</li>
+		</recipeUsers>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Sergal/Patches/Sergal/Drugs.xml b/ModPatches/Sergal/Patches/Sergal/Drugs.xml
new file mode 100644
index 0000000000..2d40f11b28
--- /dev/null
+++ b/ModPatches/Sergal/Patches/Sergal/Drugs.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Patch item bulk ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Beamers"]/statBases</xpath>
+		<value>
+			<!-- Equivalent to vanilla pill drugs -->
+			<Bulk>0.01</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="FrogleafJoint"]/statBases</xpath>
+		<value>
+			<!-- Equivalent to vanilla Smokeleaf Joints -->
+			<Bulk>0.05</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GodsBlood"]/statBases</xpath>
+		<value>
+			<!-- Equivalent to a 12.7mm diameter syringe or .50 BMG cartridge -->
+			<Bulk>0.14</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Sniff"]/statBases</xpath>
+		<value>
+			<!-- Equivalent to vanilla Yayo -->
+			<Bulk>0.05</Bulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Sergal/Patches/Sergal/Gnoll_Weps.xml b/ModPatches/Sergal/Patches/Sergal/Gnoll_Weps.xml
new file mode 100644
index 0000000000..acd1e61a1c
--- /dev/null
+++ b/ModPatches/Sergal/Patches/Sergal/Gnoll_Weps.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Gnoll Scythe ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gnythe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.35</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.7</cooldownTime>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.6</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>29</power>
+					<cooldownTime>1.7</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>2.592</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.58</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Gnythe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1</MeleeCritChance>
+				<MeleeParryChance>1.5</MeleeParryChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Gnythe"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>2.25</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<!-- ========== War Gnythe ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gnythewar"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.35</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.6</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>1.5</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>2.592</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.58</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Gnythewar"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1</MeleeCritChance>
+				<MeleeParryChance>1.5</MeleeParryChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Gnythewar"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>2.25</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Sergal/Patches/Sergal/Lion_Weps_Ranged.xml b/ModPatches/Sergal/Patches/Sergal/Lion_Weps_Ranged.xml
new file mode 100644
index 0000000000..3e06c39bba
--- /dev/null
+++ b/ModPatches/Sergal/Patches/Sergal/Lion_Weps_Ranged.xml
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Pride Gauss Rifle (CE implementation based on MRG-5 Rifle from Glitter Tech) ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>LionWep_Gauss</defName>
+		<statBases>
+			<Bulk>6.88</Bulk>
+			<Mass>3.60</Mass>
+			<SwayFactor>1.05</SwayFactor>
+			<ShotSpread>0.09</ShotSpread>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<WorkToMake>72000</WorkToMake>
+		</statBases>
+		<costList>
+			<Plasteel>60</Plasteel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+			<ComponentSpacer>3</ComponentSpacer>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6mmRailgun_Sabot</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>86</range>
+			<soundCast>LionGauss</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_6mmRailgun</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+	</Operation>
+
+	<!-- ========== Pride Machinegun (CE implementation based on M249 LMG, rechambered for 6mm Railgun sabots) ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>LionWep_Chaingauss</defName>
+		<statBases>
+			<Bulk>13.35</Bulk>
+			<Mass>7.50</Mass>
+			<SwayFactor>1.27</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<SightsEfficiency>2.21</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
+			<WorkToMake>82000</WorkToMake>
+		</statBases>
+		<costList>
+			<Plasteel>120</Plasteel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+			<ComponentSpacer>4</ComponentSpacer>
+		</costList>
+		<Properties>
+			<recoilAmount>0.94</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6mmRailgun_Sabot</defaultProjectile>
+			<warmupTime>1.475</warmupTime>
+			<range>75</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>LionGauss</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_6mmRailgun</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+
+	</Operation>
+
+	<!-- ========== Pride Pistol (CE implementation based on Desert Eagle, rechambered for the Sergal mod's own "prothene acid" bullet) ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>LionWep_HandyGun</defName>
+		<statBases>
+			<Bulk>2.73</Bulk>
+			<Mass>2.00</Mass>
+			<SwayFactor>1.58</SwayFactor>
+			<ShotSpread>0.16</ShotSpread>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<WorkToMake>32000</WorkToMake>
+		</statBases>
+		<costList>
+			<Plasteel>80</Plasteel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+			<ComponentSpacer>2</ComponentSpacer>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Lion_Wet_Bullet</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>LionPistol</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+		</Properties>
+
+		<!-- Treat this as an infinite-ammo weapon, as "prothene acid" bullets are too weird to warrant defining a mod-unique ammo item -->
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="LionWep_HandyGun"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Patch prothene acid bullet -->
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="Lion_Wet_Bullet"]/projectile</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.ProjectilePropertiesCE</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Lion_Wet_Bullet"]/projectile</xpath>
+		<value>
+			<!-- Sharp/blunt penetration equivalent to .50 AE (AP), so that the acid has a chance to eat through armor and clothing  -->
+			<armorPenetrationSharp>16</armorPenetrationSharp>
+			<armorPenetrationBlunt>38.480</armorPenetrationBlunt>
+		</value>
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="LionWep_Gauss" or
+			defName="LionWep_Chaingauss"
+			]/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>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Sergal/Patches/Sergal/PawnKinds_Frog.xml b/ModPatches/Sergal/Patches/Sergal/PawnKinds_Frog.xml
new file mode 100644
index 0000000000..974c814059
--- /dev/null
+++ b/ModPatches/Sergal/Patches/Sergal/PawnKinds_Frog.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="FrogRefugee" or
+			defName="FrogSlave"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>20</min>
+					<max>40</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="FrogTracker" or
+			defName="FrogTrader"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>20</min>
+					<max>40</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="FrogHunter" or
+			defName="FrogPackLeader" or
+			defName="FrogRanger" or
+			defName="FrogRecruit" or
+			defName="FrogScavenger" or
+			defName="FrogSentinel"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>30</min>
+					<max>50</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>120</min>
+					<max>160</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.6</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Sergal/Patches/Sergal/PawnKinds_Gnoll.xml b/ModPatches/Sergal/Patches/Sergal/PawnKinds_Gnoll.xml
new file mode 100644
index 0000000000..b934daa894
--- /dev/null
+++ b/ModPatches/Sergal/Patches/Sergal/PawnKinds_Gnoll.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="GnollRefugee" or
+			defName="GnollSlave"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>20</min>
+					<max>40</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="GnollTracker" or
+			defName="GnollTrader"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>20</min>
+					<max>40</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="GnollHunter" or
+			defName="GnollPackLeader" or
+			defName="GnollRanger" or
+			defName="GnollRecruit" or
+			defName="GnollScavenger" or
+			defName="GnollSentinel"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>30</min>
+					<max>50</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>120</min>
+					<max>160</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.6</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Sergal/Patches/Sergal/PawnKinds_GnollTribe.xml b/ModPatches/Sergal/Patches/Sergal/PawnKinds_GnollTribe.xml
new file mode 100644
index 0000000000..555f988bbf
--- /dev/null
+++ b/ModPatches/Sergal/Patches/Sergal/PawnKinds_GnollTribe.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[@Name="GnollTribalBase"]</xpath>
+		<value>
+			<apparelRequired>
+				<li>CE_Apparel_TribalBackpack</li>
+			</apparelRequired>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="Gnoll_Archer" or
+			defName="Gnoll_ChiefRanged" or
+			defName="Gnoll_HeavyArcher" or
+			defName="Gnoll_Hunter"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>20</min>
+					<max>40</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Sergal/Patches/Sergal/PawnKinds_Lions.xml b/ModPatches/Sergal/Patches/Sergal/PawnKinds_Lions.xml
new file mode 100644
index 0000000000..3daad863c0
--- /dev/null
+++ b/ModPatches/Sergal/Patches/Sergal/PawnKinds_Lions.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Add backpacks to list of allowed apparel for Lion race -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Lion"]/alienRace/raceRestriction/whiteApparelList</xpath>
+		<value>
+			<li>CE_Apparel_Backpack</li>
+		</value>
+	</Operation>
+
+	<!-- Spawn backpacks for selected Lion pawntypes -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[
+			defName="LionColonist" or
+			defName="LionCommando" or
+			defName="LionCommandoElite" or
+			defName="LionHunter" or
+			defName="LionPackLeader" or
+			defName="LionRecruit" or
+			defName="LionSecurityGuard" or
+			defName="LionTrader"
+			] </xpath>
+		<value>
+			<apparelRequired>
+				<li>CE_Apparel_Backpack</li>
+			</apparelRequired>
+		</value>
+	</Operation>
+
+	<!-- Spawn different combinations of primary ammo, secondary weapon and ammo for various Lion pawntypes -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="LionCivBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="LionMilBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>7</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<magazineCount>
+							<min>2</min>
+							<max>3</max>
+						</magazineCount>
+						<weaponTags>
+							<li>CE_Sidearm</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Sergal/Patches/Sergal/PawnKinds_Sergal.xml b/ModPatches/Sergal/Patches/Sergal/PawnKinds_Sergal.xml
new file mode 100644
index 0000000000..d562d45976
--- /dev/null
+++ b/ModPatches/Sergal/Patches/Sergal/PawnKinds_Sergal.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Spawn backpacks for selected Sergal pawntypes -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[
+			defName="SergalColonist" or
+			defName="SergalCommando" or
+			defName="SergalCommandoElite" or
+			defName="SergalHunter" or
+			defName="SergalPackLeader" or
+			defName="SergalRecruit" or
+			defName="SergalSecurityGuard" or
+			defName="SergalTrader"
+			] </xpath>
+		<value>
+			<apparelRequired>
+				<li>CE_Apparel_Backpack</li>
+			</apparelRequired>
+		</value>
+	</Operation>
+
+	<!-- Spawn different combinations of primary ammo, secondary weapon and ammo for various Sergal pawntypes -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="SergalRefugee" or
+			defName="SergalSlave"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="SergalColonist" or
+			defName="SergalCommando" or
+			defName="SergalCommandoElite" or
+			defName="SergalHunter" or
+			defName="SergalPackLeader" or
+			defName="SergalRecruit" or
+			defName="SergalSecurityGuard" or
+			defName="SergalTrader"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>1</generateChance>
+						<magazineCount>
+							<min>2</min>
+							<max>3</max>
+						</magazineCount>
+						<weaponTags>
+							<li>CE_Sidearm</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Sergal/Patches/Sergal/PawnKinds_SergalNME.xml b/ModPatches/Sergal/Patches/Sergal/PawnKinds_SergalNME.xml
new file mode 100644
index 0000000000..175dc9e4f3
--- /dev/null
+++ b/ModPatches/Sergal/Patches/Sergal/PawnKinds_SergalNME.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Spawn backpacks for selected Sergal NME pawntypes -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[
+			defName="SergalColonistNME" or
+			defName="SergalCommandoNME" or
+			defName="SergalCommandoEliteNME" or
+			defName="SergalHunterNME" or
+			defName="SergalPackLeaderNME" or
+			defName="SergalRecruitNME" or
+			defName="SergalSecurityGuardNME" or
+			defName="SergalTraderNME"
+			] </xpath>
+		<value>
+			<apparelRequired>
+				<li>CE_Apparel_Backpack</li>
+			</apparelRequired>
+		</value>
+	</Operation>
+
+	<!-- Spawn different combinations of primary ammo, secondary weapon and ammo for various Sergal NME pawntypes -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="SergalRefugeeNME" or
+			defName="SergalSlaveNME"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="SergalColonistNME" or
+			defName="SergalCommandoNME" or
+			defName="SergalCommandoEliteNME" or
+			defName="SergalHunterNME" or
+			defName="SergalPackLeaderNME" or
+			defName="SergalRecruitNME" or
+			defName="SergalSecurityGuardNME" or
+			defName="SergalTraderNME"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>1</generateChance>
+						<magazineCount>
+							<min>2</min>
+							<max>3</max>
+						</magazineCount>
+						<weaponTags>
+							<li>CE_Sidearm</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Sergal/Patches/Sergal/PawnKinds_SergalTribe.xml b/ModPatches/Sergal/Patches/Sergal/PawnKinds_SergalTribe.xml
new file mode 100644
index 0000000000..af380794e2
--- /dev/null
+++ b/ModPatches/Sergal/Patches/Sergal/PawnKinds_SergalTribe.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[@Name="SergalTribalBase"]</xpath>
+		<value>
+			<apparelRequired>
+				<li>CE_Apparel_TribalBackpack</li>
+			</apparelRequired>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="Sergal_Tribal_Archer" or
+			defName="Sergal_Tribal_ChiefRanged" or
+			defName="Sergal_Tribal_HeavyArcher" or
+			defName="Sergal_Tribal_Hunter"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>20</min>
+					<max>40</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Sergal/Patches/Sergal/PawnKinds_StripedGnoll.xml b/ModPatches/Sergal/Patches/Sergal/PawnKinds_StripedGnoll.xml
new file mode 100644
index 0000000000..e9083e6f35
--- /dev/null
+++ b/ModPatches/Sergal/Patches/Sergal/PawnKinds_StripedGnoll.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="StripedGnollRefugee" or
+			defName="StripedGnollSlave"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>20</min>
+					<max>40</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="StripedGnollTracker" or
+			defName="StripedGnollTrader"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>20</min>
+					<max>40</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="StripedGnollHunter" or
+			defName="StripedGnollPackLeader" or
+			defName="StripedGnollRanger" or
+			defName="StripedGnollRecruit" or
+			defName="StripedGnollScavenger" or
+			defName="StripedGnollSentinel"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>30</min>
+					<max>50</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>120</min>
+					<max>160</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.6</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Sergal/Patches/Sergal/PawnKinds_StripedGnollTribe.xml b/ModPatches/Sergal/Patches/Sergal/PawnKinds_StripedGnollTribe.xml
new file mode 100644
index 0000000000..050870c146
--- /dev/null
+++ b/ModPatches/Sergal/Patches/Sergal/PawnKinds_StripedGnollTribe.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[@Name="StripedGnollTribalBase"]</xpath>
+		<value>
+			<apparelRequired>
+				<li>CE_Apparel_TribalBackpack</li>
+			</apparelRequired>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="StripedGnoll_Archer" or
+			defName="StripedGnoll_ChiefRanged" or
+			defName="StripedGnoll_HeavyArcher" or
+			defName="StripedGnoll_Hunter"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>20</min>
+					<max>40</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Sergal/Patches/Sergal/Race_Frog.xml b/ModPatches/Sergal/Patches/Sergal/Race_Frog.xml
new file mode 100644
index 0000000000..53891302c3
--- /dev/null
+++ b/ModPatches/Sergal/Patches/Sergal/Race_Frog.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Frog"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Frog"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.9</AimingAccuracy>
+			<MeleeDodgeChance>2.5</MeleeDodgeChance>
+			<MeleeCritChance>1.25</MeleeCritChance>
+			<MeleeParryChance>1.75</MeleeParryChance>
+			<ReloadSpeed>0.85</ReloadSpeed>
+			<Suppressability>0.25</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Frog"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>0.95</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetration>0.16</armorPenetration>
+					<armorPenetrationBlunt>1.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Frog"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Frog"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Frog"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Sergal/Patches/Sergal/Race_Gnoll.xml b/ModPatches/Sergal/Patches/Sergal/Race_Gnoll.xml
new file mode 100644
index 0000000000..ab179ad523
--- /dev/null
+++ b/ModPatches/Sergal/Patches/Sergal/Race_Gnoll.xml
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_SGnoll"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_SGnoll"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.9</AimingAccuracy>
+			<MeleeDodgeChance>2.5</MeleeDodgeChance>
+			<MeleeCritChance>1.25</MeleeCritChance>
+			<MeleeParryChance>1.75</MeleeParryChance>
+			<ReloadSpeed>0.85</ReloadSpeed>
+			<Suppressability>0.25</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_SGnoll"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.73</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.43</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.225</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_SGnoll"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_SGnoll"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_SGnoll"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Sergal/Patches/Sergal/Race_Lion.xml b/ModPatches/Sergal/Patches/Sergal/Race_Lion.xml
new file mode 100644
index 0000000000..34f588c47b
--- /dev/null
+++ b/ModPatches/Sergal/Patches/Sergal/Race_Lion.xml
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Lion"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Lion"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.9</AimingAccuracy>
+			<MeleeDodgeChance>2.5</MeleeDodgeChance>
+			<MeleeCritChance>1.25</MeleeCritChance>
+			<MeleeParryChance>1.75</MeleeParryChance>
+			<ReloadSpeed>0.85</ReloadSpeed>
+			<Suppressability>0.25</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Lion"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Lion"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Lion"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Lion"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Sergal/Patches/Sergal/Race_Sergal.xml b/ModPatches/Sergal/Patches/Sergal/Race_Sergal.xml
new file mode 100644
index 0000000000..e1ef32f32f
--- /dev/null
+++ b/ModPatches/Sergal/Patches/Sergal/Race_Sergal.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[
+			defName="Alien_Sergal" or
+			defName="Alien_SergalNME"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[
+			defName="Alien_Sergal" or
+			defName="Alien_SergalNME"
+			]/statBases </xpath>
+		<value>
+			<AimingAccuracy>0.9</AimingAccuracy>
+			<MeleeDodgeChance>2.5</MeleeDodgeChance>
+			<MeleeCritChance>1.25</MeleeCritChance>
+			<MeleeParryChance>1.75</MeleeParryChance>
+			<ReloadSpeed>1.5</ReloadSpeed>
+			<Suppressability>0.25</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[
+			defName="Alien_Sergal" or
+			defName="Alien_SergalNME"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Sergal" or defName="Alien_SergalNME"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Sergal" or defName="Alien_SergalNME"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[
+			defName="Alien_Sergal" or
+			defName="Alien_SergalNME"
+			]/comps </xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Sergal/Patches/Sergal/Race_StripedGnoll.xml b/ModPatches/Sergal/Patches/Sergal/Race_StripedGnoll.xml
new file mode 100644
index 0000000000..bc5a34ee9a
--- /dev/null
+++ b/ModPatches/Sergal/Patches/Sergal/Race_StripedGnoll.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_StripedGnoll"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_StripedGnoll"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.9</AimingAccuracy>
+			<MeleeDodgeChance>2.5</MeleeDodgeChance>
+			<MeleeCritChance>1.25</MeleeCritChance>
+			<MeleeParryChance>1.75</MeleeParryChance>
+			<ReloadSpeed>1.85</ReloadSpeed>
+			<Suppressability>0.25</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_StripedGnoll"]/tools</xpath>
+		<value>
+			<tools>
+				<!-- Striped Gnolls don't have claws, as per original mod -->
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.73</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.43</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.225</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_StripedGnoll"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_StripedGnoll"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_StripedGnoll"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Sergal/Patches/Sergal/Scenarios.xml b/ModPatches/Sergal/Patches/Sergal/Scenarios.xml
new file mode 100644
index 0000000000..f90be0f3b2
--- /dev/null
+++ b/ModPatches/Sergal/Patches/Sergal/Scenarios.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Add ammo to various starting scenarios -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[
+			defName="ExiledLions_Scenario" or
+			defName="LostCommandoSergal_Scenario"
+			]/scenario/parts </xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_45ACP_FMJ</thingDef>
+				<count>100</count>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[
+			defName="LostCommandoSergal_Scenario" or
+			defName="Frog_Scenario"
+			]/scenario/parts </xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_303British_FMJ</thingDef>
+				<count>100</count>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="Frog_Scenario"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_44Magnum_FMJ</thingDef>
+				<count>100</count>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Remove starting apparel items from Frog scenario -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ScenarioDef[defName="Frog_Scenario"]/scenario/parts/li[thingDef="Apparel_AdvancedHelmet"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ScenarioDef[defName="Frog_Scenario"]/scenario/parts/li[thingDef="Apparel_FlakVest"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ScenarioDef[defName="Frog_Scenario"]/scenario/parts/li[thingDef="Apparel_FlakPants"]</xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Sergal/Patches/Sergal/Sergal_Apparel.xml b/ModPatches/Sergal/Patches/Sergal/Sergal_Apparel.xml
new file mode 100644
index 0000000000..b75c97d187
--- /dev/null
+++ b/ModPatches/Sergal/Patches/Sergal/Sergal_Apparel.xml
@@ -0,0 +1,368 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Lion_Apparel_TribalA"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Cargo pants, Tucked-in button shirt and Suit pants ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Lion_Apparel_Cheap_Pants" or
+			defName="Lion_Apparel_CollarShirt" or
+			defName="Lion_Apparel_Pants"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Duster and Jacket ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Lion_Apparel_Duster" or
+			defName="Lion_Apparel_Jacket"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Lion_Apparel_Duster"]/statBases</xpath>
+		<value>
+			<Bulk>7.5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Lion_Apparel_Jacket"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- ========== Lion armor vest ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakVest"]/label</xpath>
+		<value>
+			<label>lion armor vest</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakVest"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>3</WornBulk>
+			<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakVest"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>125</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakVest"]/statBases/Mass</xpath>
+		<value>
+			<Mass>13</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakVest"]/statBases/ArmorRating_Sharp</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakVest"]/statBases/ArmorRating_Blunt</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakVest"]/statBases/ArmorRating_Heat</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakVest"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<!-- Change recipe to stuffed -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakVest"]</xpath>
+		<value>
+			<costStuffCount>90</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakVest"]</xpath>
+		<value>
+			<stuffCategories>
+				<li>Steeled</li>
+			</stuffCategories>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakVest"]/recipeMaker/unfinishedThingDef</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakVest"]/costList/Steel</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakVest"]/costList/ComponentIndustrial</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakVest"]/colorGenerator</xpath>
+	</Operation>
+
+	<!-- ========== Lion flak pants ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakPants"]/description</xpath>
+		<value>
+			<description>Padded pants made from bullet-resistant materials. Provides limited protection against shrapnel and gunfire at relatively low weight.</description>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakPants"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>4</WornBulk>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakPants"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakPants"]/statBases/ArmorRating_Heat</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakPants"]/statBases/Insulation_Cold</xpath>
+		<value>
+			<StuffEffectMultiplierInsulation_Cold>0.2</StuffEffectMultiplierInsulation_Cold>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakPants"]/statBases/Insulation_Heat</xpath>
+		<value>
+			<StuffEffectMultiplierInsulation_Heat>0.08</StuffEffectMultiplierInsulation_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakPants"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>15</Steel>
+			</costList>
+			<stuffCategories>
+				<li>Fabric</li>
+			</stuffCategories>
+			<costStuffCount>50</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakPants"]/equippedStatOffsets</xpath>
+	</Operation>
+
+	<!-- ========== Cheap power armor ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Lion_Apparel_CheapPowerArmor"]/statBases</xpath>
+		<value>
+			<Bulk>80</Bulk>
+			<WornBulk>12</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Lion_Apparel_CheapPowerArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>400</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Lion_Apparel_CheapPowerArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>40</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Lion_Apparel_CheapPowerArmor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Lion_Apparel_CheapPowerArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Lion_Apparel_CheapPowerArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>40</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Lion_Apparel_CheapPowerArmor"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>40</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Lion_Apparel_CheapPowerArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>50</CarryWeight>
+				<CarryBulk>8</CarryBulk>
+				<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Lion_Apparel_CheapPowerArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Lion honor guard armor and Lion elite armor ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="Lion_Apparel_PowerArmor" or
+			defName="Lion_Apparel_ExpensivePowerArmor"
+			]/statBases </xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Lion_Apparel_PowerArmor" or
+			defName="Lion_Apparel_ExpensivePowerArmor"
+			]/statBases/MaxHitPoints </xpath>
+		<value>
+			<MaxHitPoints>500</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Lion_Apparel_PowerArmor" or
+			defName="Lion_Apparel_ExpensivePowerArmor"
+			]/statBases/Mass </xpath>
+		<value>
+			<Mass>50</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Lion_Apparel_PowerArmor" or
+			defName="Lion_Apparel_ExpensivePowerArmor"
+			]/statBases/Flammability </xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Lion_Apparel_PowerArmor" or
+			defName="Lion_Apparel_ExpensivePowerArmor"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Lion_Apparel_PowerArmor" or
+			defName="Lion_Apparel_ExpensivePowerArmor"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="Lion_Apparel_PowerArmor" or
+			defName="Lion_Apparel_ExpensivePowerArmor"
+			]/costList </xpath>
+		<value>
+			<DevilstrandCloth>50</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="Lion_Apparel_PowerArmor" or
+			defName="Lion_Apparel_ExpensivePowerArmor"
+			]/equippedStatOffsets/MoveSpeed </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="Lion_Apparel_PowerArmor" or
+			defName="Lion_Apparel_ExpensivePowerArmor"
+			]/equippedStatOffsets </xpath>
+		<value>
+			<CarryWeight>80</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+			<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="Lion_Apparel_PowerArmor" or
+			defName="Lion_Apparel_ExpensivePowerArmor"
+			]/apparel/bodyPartGroups </xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Sergal/Patches/Sergal/Sergal_Weps.xml b/ModPatches/Sergal/Patches/Sergal/Sergal_Weps.xml
new file mode 100644
index 0000000000..8d866700b5
--- /dev/null
+++ b/ModPatches/Sergal/Patches/Sergal/Sergal_Weps.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Sergal Musket (CE implementation based on Musket from Vanilla Weapons Expanded) ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>SergalBurnCannon</defName>
+		<statBases>
+			<Bulk>14.9</Bulk>
+			<Mass>4.8</Mass>
+			<SwayFactor>1.92</SwayFactor>
+			<ShotSpread>0.10</ShotSpread>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>1.35</RangedWeapon_Cooldown>
+			<WorkToMake>20000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>65</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Sergal_LeadBall</defaultProjectile>
+			<warmupTime>2.5</warmupTime>
+			<range>45</range>
+			<soundCast>Sergalgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
+			<reloadTime>10</reloadTime>
+			<ammoSet>AmmoSet_Sergal_LeadBall</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>MedievalShields_ValidSidearm</li>
+			<li>SergalRifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Sergal Early Rifle (CE implementation based on Lee Enfield N°4 MkI) ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>SergalFrostCannon</defName>
+		<statBases>
+			<Mass>4.11</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.54</SwayFactor>
+			<Bulk>11.29</Bulk>
+			<WorkToMake>11500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Sergalgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_303British</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>MedievalShields_ValidSidearm</li>
+			<li>SergalRifle</li>
+		</weaponTags>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="SergalBurnCannon" or
+			defName="SergalFrostCannon"
+			]/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>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Seventh Seraph/Patches/Seventh Seraph/7S_Weapon.xml b/ModPatches/Seventh Seraph/Patches/Seventh Seraph/7S_Weapon.xml
new file mode 100644
index 0000000000..1f5d124dbc
--- /dev/null
+++ b/ModPatches/Seventh Seraph/Patches/Seventh Seraph/7S_Weapon.xml	
@@ -0,0 +1,363 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "SI_SeventhSeraphSI" or
+			defName = "SMG_SeventhSeraphVY" or
+			defName = "HC_SeventhSeraphOfficerRevolver"]/tools
+		</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "SG_SeventhSeraphCQC" or
+			defName = "AR_seventhseraphcarbine" or
+			defName = "MG_SevethSeraphSAW"
+			]/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>
+
+	<!-- === SI-2 === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>SI_SeventhSeraphSI</defName>
+		<statBases>
+			<WorkToMake>20000</WorkToMake>
+			<Mass>0.78</Mass>
+			<Bulk>1.86</Bulk>
+			<SwayFactor>0.88</SwayFactor>
+			<ShotSpread>0.16</ShotSpread>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>10</Steel>
+			<Plasteel>30</Plasteel>
+			<Chemfuel>5</Chemfuel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>14</range>
+			<soundCast>shot_seventhseraphsi2</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+		<researchPrerequisite>ChargedShot</researchPrerequisite>
+	</Operation>
+
+	<!-- === VY-7 === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>SMG_SeventhSeraphVY</defName>
+		<statBases>
+			<WorkToMake>38000</WorkToMake>
+			<Mass>2.80</Mass>
+			<Bulk>4.50</Bulk>
+			<SwayFactor>0.75</SwayFactor>
+			<ShotSpread>0.16</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>45</Steel>
+			<Plasteel>35</Plasteel>
+			<Chemfuel>15</Chemfuel>
+			<ComponentIndustrial>10</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
+			<burstShotCount>4</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>0.5</warmupTime>
+			<range>35</range>
+			<soundCast>shot_seventhseraphvy7</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilAmount>1.20</recoilAmount>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>27</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+		</weaponTags>
+		<researchPrerequisite>ChargedShot</researchPrerequisite>
+	</Operation>
+
+	<!-- === CQC-12 === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>SG_SeventhSeraphCQC</defName>
+		<statBases>
+			<WorkToMake>47500</WorkToMake>
+			<Mass>3.0</Mass>
+			<Bulk>8.8</Bulk>
+			<SwayFactor>1.25</SwayFactor>
+			<ShotSpread>0.12</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<Plasteel>40</Plasteel>
+			<Chemfuel>15</Chemfuel>
+			<ComponentIndustrial>10</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_12GaugeCharged</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>20</range>
+			<soundCast>shot_seventhseraphcqc</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.7</reloadTime>
+			<ammoSet>AmmoSet_12GaugeCharged</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+		<researchPrerequisite>ChargedShot</researchPrerequisite>
+	</Operation>
+
+	<!-- === 7S-SAW === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>MG_SevethSeraphSAW</defName>
+		<statBases>
+			<WorkToMake>60000</WorkToMake>
+			<Mass>8.0</Mass>
+			<Bulk>13.00</Bulk>
+			<SwayFactor>1.26</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>45</Steel>
+			<Plasteel>50</Plasteel>
+			<Chemfuel>15</Chemfuel>
+			<ComponentIndustrial>10</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>1.2</warmupTime>
+			<range>62</range>
+			<soundCast>shot_seventhseraphsaw</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilAmount>1.10</recoilAmount>
+			<recoilPattern>Mounted</recoilPattern>
+			<targetParams>
+				<canTargetLocations>True</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>60</magazineSize>
+			<reloadTime>5.8</reloadTime>
+			<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>CE_MachineGun</li>
+		</weaponTags>
+		<researchPrerequisite>ChargedShot</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Officer Revolver ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>HC_SeventhSeraphOfficerRevolver</defName>
+		<statBases>
+			<Mass>1.25</Mass>
+			<RangedWeapon_Cooldown>0.41</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>2.75</Bulk>
+			<WorkToMake>5500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>20</Steel>
+			<Plasteel>10</Plasteel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.00</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_454Casull_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>shot_seventhseraphofficerrevolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>11</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_454Casull</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+		</weaponTags>
+	</Operation>
+
+	<!--===== Carbine =====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AR_seventhseraphcarbine</defName>
+		<statBases>
+			<Mass>3.0</Mass>
+			<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.2</SightsEfficiency>
+			<ShotSpread>0.10</ShotSpread>
+			<SwayFactor>1.10</SwayFactor>
+			<Bulk>8.90</Bulk>
+			<WorkToMake>35000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>45</Steel>
+			<Plasteel>10</Plasteel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>1.3</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>50</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<soundCast>shot_seventhseraphcarbine</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>34</magazineSize>
+			<reloadTime>3.6</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Silkiera Race/Defs/Silkiera Race/Ammo/Ammo_Silkiera.xml b/ModPatches/Silkiera Race/Defs/Silkiera Race/Ammo/Ammo_Silkiera.xml
new file mode 100644
index 0000000000..77c6adf60b
--- /dev/null
+++ b/ModPatches/Silkiera Race/Defs/Silkiera Race/Ammo/Ammo_Silkiera.xml	
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- ==================== Fire Rifle Thing ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_AssaultRifle_SK</defName>
+		<label>Silkiera Rifle</label>
+		<ammoTypes>
+			<Ammo_Flamethrower_Napalm>Bullet_SK_AR_Napalm</Ammo_Flamethrower_Napalm>
+			<Ammo_Flamethrower_Prometheum>Bullet_SK_AR_Prometheum</Ammo_Flamethrower_Prometheum>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef ParentName="Base6x18mmChargedBullet">
+		<defName>Bullet_SK_AR_Napalm</defName>
+		<label>ブレイズガン</label>
+		<graphicData>
+			<texPath>HAR_SK/Weapons/SK_W_c_b</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>120</speed>
+			<damageDef>Flame</damageDef>
+			<damageAmountBase>6</damageAmountBase>
+			<armorPenetrationSharp>6</armorPenetrationSharp>
+			<armorPenetrationBlunt>25</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+	<ThingDef ParentName="Base6x18mmChargedBullet">
+		<defName>Bullet_SK_AR_Prometheum</defName>
+		<label>ブレイズガン</label>
+		<graphicData>
+			<texPath>HAR_SK/Weapons/SK_W_c_b</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>120</speed>
+			<damageDef>PrometheumFlame</damageDef>
+			<damageAmountBase>6</damageAmountBase>
+			<armorPenetrationSharp>6</armorPenetrationSharp>
+			<armorPenetrationBlunt>25</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Silkiera Race/Patches/Silkiera Race/Bodies/Bodies_Mech.xml b/ModPatches/Silkiera Race/Patches/Silkiera Race/Bodies/Bodies_Mech.xml
new file mode 100644
index 0000000000..4b3ffe92db
--- /dev/null
+++ b/ModPatches/Silkiera Race/Patches/Silkiera Race/Bodies/Bodies_Mech.xml	
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Nearmare Summon === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="HAR_SK_Mechanoid_Bodies"]//*[
+			def="MechanicalThorax" or
+			def="MechanicalNeck" or
+			def="MechanicalShoulder" or
+			def="MechanicalArm" or
+			def="MechanicalHand" or
+			def="MechanicalLeg" or
+			def="MechanicalFoot"]
+		</xpath>
+
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="HAR_SK_Mechanoid_Bodies"]//*[
+			def="MechanicalThorax" or
+			def="MechanicalNeck" or
+			def="MechanicalHead" or
+			def="MechanicalShoulder" or
+			def="MechanicalArm" or
+			def="Blade" or
+			def="MechanicalHand" or
+			def="MechanicalFinger" or
+			def="MechanicalLeg" or
+			def="MechanicalFoot"
+			]/groups
+		</xpath>
+
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Silkiera Race/Patches/Silkiera Race/Bodies/Silkiera_Bodytype.xml b/ModPatches/Silkiera Race/Patches/Silkiera Race/Bodies/Silkiera_Bodytype.xml
new file mode 100644
index 0000000000..59c73e1b52
--- /dev/null
+++ b/ModPatches/Silkiera Race/Patches/Silkiera Race/Bodies/Silkiera_Bodytype.xml	
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Nearmare Bodytype-->
+
+	<!--Arm Groups-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Silkiera_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Silkiera_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Silkiera_Body"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Silkiera_Body"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<!--Natural Armor-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Silkiera_Body"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Silkiera_Body"]/corePart/parts/li[def="Silkiera_Tail"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Silkiera_Body"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Silkiera_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Silkiera_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Silkiera_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Silkiera_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Silkiera_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Silkiera_Ear"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Silkiera_Body"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Silkiera_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Silkiera_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Silkiera_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Silkiera_Body"]/corePart/parts/li[def="Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Silkiera_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Silkiera_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Silkiera Race/Patches/Silkiera Race/PawnKindDefs/Silkiera_PawnKind.xml b/ModPatches/Silkiera Race/Patches/Silkiera Race/PawnKindDefs/Silkiera_PawnKind.xml
new file mode 100644
index 0000000000..f714132ff8
--- /dev/null
+++ b/ModPatches/Silkiera Race/Patches/Silkiera Race/PawnKindDefs/Silkiera_PawnKind.xml	
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Ammo-->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="HAR_Silkiera_Player"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>0</min>
+					<max>2</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="HAR_Silkiera_KindBase_NPC"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="HAR_SK_Mechanoid_Kind_Base"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>10</min>
+					<max>10</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Backpack-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CE_Apparel_Backpack"]/apparel/tags</xpath>
+		<value>
+			<li>HAR_SK_Apparel</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/PawnKindDef[@Name="HAR_Silkiera_KindBase"]/apparelRequired</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/PawnKindDef[@Name="HAR_Silkiera_KindBase"]</xpath>
+			<value>
+				<apparelRequired>
+					<li>CE_Apparel_Backpack</li>
+				</apparelRequired>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/PawnKindDef[@Name="HAR_Silkiera_KindBase"]/apparelRequired</xpath>
+			<value>
+			</value>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Silkiera Race/Patches/Silkiera Race/Scenario/Silkiera_Scenario.xml b/ModPatches/Silkiera Race/Patches/Silkiera Race/Scenario/Silkiera_Scenario.xml
new file mode 100644
index 0000000000..4dfde061e3
--- /dev/null
+++ b/ModPatches/Silkiera Race/Patches/Silkiera Race/Scenario/Silkiera_Scenario.xml	
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="Silkiera_Scenario"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_303British_FMJ</thingDef>
+				<count>100</count>
+			</li>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_44Magnum_FMJ</thingDef>
+				<count>60</count>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ScenarioDef[defName="Silkiera_Scenario"]/scenario/parts/li[thingDef="Apparel_AdvancedHelmet"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ScenarioDef[defName="Silkiera_Scenario"]/scenario/parts/li[thingDef="Apparel_FlakVest"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ScenarioDef[defName="Silkiera_Scenario"]/scenario/parts/li[thingDef="Apparel_FlakPants"]</xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Silkiera Race/Patches/Silkiera Race/ThingDefs_Misc/Silkiera_Apparel.xml b/ModPatches/Silkiera Race/Patches/Silkiera Race/ThingDefs_Misc/Silkiera_Apparel.xml
new file mode 100644
index 0000000000..6f99b87653
--- /dev/null
+++ b/ModPatches/Silkiera Race/Patches/Silkiera Race/ThingDefs_Misc/Silkiera_Apparel.xml	
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--========= Stuffable =========-->
+
+	<!--Skin Layer minimum protection-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_SK_AO_a"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.25</StuffEffectMultiplierArmor>
+			<Bulk>0.5</Bulk>
+			<WornBulk>0.25</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Middle Mid-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_SK_AT_a" or
+			defName="HAR_SK_AT_b" or
+			defName="HAR_SK_AT_c" or
+			defName="HAR_SK_AT_d" or
+			defName="HAR_SK_AT_e"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Shell-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_SK_AS_a" or
+			defName="HAR_SK_AS_c"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_SK_AS_b"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_SK_AS_b"
+			]/statBases/MaxHitPoints </xpath>
+		<value>
+			<MaxHitPoints>300</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_SK_AS_b"
+			]/statBases/MaxHitPoints </xpath>
+		<value>
+			<MaxHitPoints>300</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="HAR_SK_AS_b"
+			]/statBases/ArmorRating_Blunt </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="HAR_SK_AS_b"
+			]/statBases/ArmorRating_Heat </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="HAR_SK_AS_b" or
+			defName="HAR_SK_AS_c"
+			]/equippedStatOffsets/MoveSpeed </xpath>
+	</Operation>
+
+	<!--Overhead-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_SK_AH_a" or
+			defName="HAR_SK_AH_b" or
+			defName="HAR_SK_AH_c" or
+			defName="HAR_SK_AH_d" or
+			defName="HAR_SK_AH_e"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Silkiera Race/Patches/Silkiera Race/ThingDefs_Misc/Weapons.xml b/ModPatches/Silkiera Race/Patches/Silkiera Race/ThingDefs_Misc/Weapons.xml
new file mode 100644
index 0000000000..4763c32e0b
--- /dev/null
+++ b/ModPatches/Silkiera Race/Patches/Silkiera Race/ThingDefs_Misc/Weapons.xml	
@@ -0,0 +1,295 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HAR_SK_Weapon_a"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.31</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>2.9</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="HAR_SK_Weapon_a"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>1.08</MeleeCounterParryBonus>
+			<Bulk>10</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HAR_SK_Weapon_a"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.22</MeleeCritChance>
+			<MeleeParryChance>1.53</MeleeParryChance>
+			<MeleeDodgeChance>0.67</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HAR_SK_Weapon_b"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.35</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.78</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.19</cooldownTime>
+					<chanceFactor>1.00</chanceFactor>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HAR_SK_Weapon_b"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HAR_SK_Weapon_b"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.17</MeleeCritChance>
+			<MeleeParryChance>1.45</MeleeParryChance>
+			<MeleeDodgeChance>0.9</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Gun_AssaultRifle_SK" or
+			defName="Gun_IncendiaryLauncher_SK"
+			]/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="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AssaultRifle_SK</defName>
+		<statBases>
+			<Mass>3.26</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>10.03</Bulk>
+			<WorkToMake>30000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>65</Steel>
+			<Plasteel>30</Plasteel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_SK_AR_Napalm</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>Shot_Revolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_AssaultRifle_SK</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_IncendiaryLauncher_SK</defName>
+		<statBases>
+			<Mass>8</Mass>
+			<RangedWeapon_Cooldown>0.43</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.8</SwayFactor>
+			<Bulk>10</Bulk>
+			<WorkToMake>39500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>65</Steel>
+			<Plasteel>30</Plasteel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_30x64mmFuel_Incendiary</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>40</range>
+			<burstShotCount>0</burstShotCount>
+			<soundCast>Shot_IncendiaryLauncher</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_30x64mmFuel</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!--Bottle-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HAR_SK_Meal_c"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2.22</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>neck</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>3.33</cooldownTime>
+					<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Neck</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HAR_SK_Meal_c"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.33</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HAR_SK_Meal_c"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.1</MeleeCritChance>
+				<MeleeParryChance>0.33</MeleeParryChance>
+				<MeleeDodgeChance>0.07</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Silkiera Race/Patches/Silkiera Race/ThingDefs_Races/AlienRace_Silkiera.xml b/ModPatches/Silkiera Race/Patches/Silkiera Race/ThingDefs_Races/AlienRace_Silkiera.xml
new file mode 100644
index 0000000000..3382b28d69
--- /dev/null
+++ b/ModPatches/Silkiera Race/Patches/Silkiera Race/ThingDefs_Races/AlienRace_Silkiera.xml	
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="HAR_Silkiera_BaseNRPawn"]/inspectorTabs/li[.="ITab_Pawn_Gear"]</xpath>
+		<value>
+			<li>CombatExtended.ITab_Inventory</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="HAR_Silkiera_BaseNRPawn"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+			<li Class="CombatExtended.CompProperties_Inventory"/>
+			<li Class="CombatExtended.CompProperties_TacticalManager"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="HAR_Silkiera_BaseNRPawn_b"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="HAR_Silkiera_BaseNRPawn_b"]/statBases</xpath>
+		<value>
+			<Suppressability>1</Suppressability>
+			<SmokeSensitivity>1.2</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[
+			defName="HAR_Silkiera" or
+			defName="HAR_Silkiera_b" or
+			defName="HAR_Silkiera_c"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="HAR_Silkiera_BaseNRPawn_b"]/alienRace/raceRestriction/whiteApparelList</xpath>
+		<value>
+			<li>CE_Apparel_TacVest</li>
+			<li>CE_Apparel_Backpack</li>
+			<li>CE_Apparel_TribalBackpack</li>
+			<li>CE_Apparel_BallisticShield</li>
+			<li>CE_Apparel_MeleeShield</li>
+			<li>CE_Apparel_GasMask</li>
+			<li>CE_Apparel_ImprovGasMask</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Silkiera Race/Patches/Silkiera Race/ThingDefs_Races/Race_Mech.xml b/ModPatches/Silkiera Race/Patches/Silkiera Race/ThingDefs_Races/Race_Mech.xml
new file mode 100644
index 0000000000..f4fb96ef50
--- /dev/null
+++ b/ModPatches/Silkiera Race/Patches/Silkiera Race/ThingDefs_Races/Race_Mech.xml	
@@ -0,0 +1,349 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="HAR_SK_Mechanoid_race_Base"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!-- Scyther Type -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="HAR_SK_Mechanoid_Kind_a"]/combatPower</xpath>
+		<value>
+			<combatPower>100</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_a"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_a"]/statBases</xpath>
+		<value>
+			<Suppressability>0</Suppressability>
+			<SmokeSensitivity>0</SmokeSensitivity>
+			<MeleeDodgeChance>0.19</MeleeDodgeChance>
+			<MeleeCritChance>0.22</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_a"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_a"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_a"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
+					<armorPenetrationSharp>2.07</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left blade</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>2.07</cooldownTime>
+					<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
+					<armorPenetrationSharp>2.16</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right blade</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>5.9</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.875</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Centipede Type -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="HAR_SK_Mechanoid_Kind_b"]/combatPower</xpath>
+		<value>
+			<combatPower>130</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_b"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_b"]/statBases</xpath>
+		<value>
+			<Suppressability>0</Suppressability>
+			<SmokeSensitivity>0</SmokeSensitivity>
+			<MeleeDodgeChance>0.02</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.41</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_b"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_b"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>9</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_b"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>65</power>
+					<cooldownTime>3.97</cooldownTime>
+					<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
+					<armorPenetrationSharp>6.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>14.5</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>65</power>
+					<cooldownTime>3.97</cooldownTime>
+					<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
+					<armorPenetrationSharp>6.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>14.5</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>3.51</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Bomb Drone -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_c"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_c"]/statBases</xpath>
+		<value>
+			<Suppressability>0</Suppressability>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_c"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_c"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_c"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.25</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.875</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Trooper Type -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="HAR_SK_Mechanoid_Kind_e"]/combatPower</xpath>
+		<value>
+			<combatPower>140</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_e"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_e"]/statBases</xpath>
+		<value>
+			<Suppressability>0</Suppressability>
+			<SmokeSensitivity>0</SmokeSensitivity>
+			<MeleeDodgeChance>0.19</MeleeDodgeChance>
+			<MeleeCritChance>0.22</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_e"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_e"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_e"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
+					<armorPenetrationSharp>2.07</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.07</cooldownTime>
+					<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
+					<armorPenetrationSharp>2.16</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>5.9</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.875</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Simple Ogre Race/Defs/Simple Ogre Race/Ammo_Ogre.xml b/ModPatches/Simple Ogre Race/Defs/Simple Ogre Race/Ammo_Ogre.xml
new file mode 100644
index 0000000000..fdbede7b30
--- /dev/null
+++ b/ModPatches/Simple Ogre Race/Defs/Simple Ogre Race/Ammo_Ogre.xml	
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingDef ParentName="BasePilumProjectile">
+		<defName>FPOGRE_RockFlying</defName>
+		<label>thrown rock</label>
+		<graphicData>
+			<texPath>Things/FPOGRE/rangeone</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Blunt</damageDef>
+			<damageAmountBase>46</damageAmountBase>
+			<speed>9</speed>
+			<armorPenetrationBlunt>27.1</armorPenetrationBlunt>
+			<preExplosionSpawnChance>0.75</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>FPOGRE_Rock</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Simple Ogre Race/Patches/Simple Ogre Race/CE_OgreSkin.xml b/ModPatches/Simple Ogre Race/Patches/Simple Ogre Race/CE_OgreSkin.xml
new file mode 100644
index 0000000000..6730105e38
--- /dev/null
+++ b/ModPatches/Simple Ogre Race/Patches/Simple Ogre Race/CE_OgreSkin.xml	
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Ogre Leather -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FP_OGRE_Leather"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.1</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FP_OGRE_Leather"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.05</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FP_OGRE_Leather"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.02</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Simple Ogre Race/Patches/Simple Ogre Race/CE_Ogre_Race.xml b/ModPatches/Simple Ogre Race/Patches/Simple Ogre Race/CE_Ogre_Race.xml
new file mode 100644
index 0000000000..713c2b857c
--- /dev/null
+++ b/ModPatches/Simple Ogre Race/Patches/Simple Ogre Race/CE_Ogre_Race.xml	
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- It's all Ogre now -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FP_OgreRace"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Melee Tool & Basestats Defs -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FP_OgreRace"]/statBases/Mass</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1.5</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>0.75</Suppressability>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>40</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FP_OgreRace"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4.0</MoveSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FP_OgreRace"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FP_OgreRace"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FP_OgreRace"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.1</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FP_OgreRace"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>2</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FP_OgreRace"]/race/baseBodySize</xpath>
+		<value>
+			<baseBodySize>1.5</baseBodySize>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FP_OgreRace"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.78</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.44</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.78</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>4.22</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3.675</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FP_OgreRace"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="FP_OGRE_hediff"]/stages/li[1]</xpath>
+		<value>
+			<totalBleedFactor>0.75</totalBleedFactor>
+			<painFactor>0.8</painFactor>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Simple Ogre Race/Patches/Simple Ogre Race/CE_Ogre_Race_Pawn.xml b/ModPatches/Simple Ogre Race/Patches/Simple Ogre Race/CE_Ogre_Race_Pawn.xml
new file mode 100644
index 0000000000..d6b30b8bc8
--- /dev/null
+++ b/ModPatches/Simple Ogre Race/Patches/Simple Ogre Race/CE_Ogre_Race_Pawn.xml	
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Tribal -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="FP_OGRE_Tribal_Berserker"]/combatPower</xpath>
+		<value>
+			<combatPower>60</combatPower>
+		</value>
+	</Operation>
+
+	<!-- Pirate -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="FP_OGRE_Pirate_Berserker"]/combatPower</xpath>
+		<value>
+			<combatPower>120</combatPower>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Simple Ogre Race/Patches/Simple Ogre Race/CE_Ogre_Race_Wep.xml b/ModPatches/Simple Ogre Race/Patches/Simple Ogre Race/CE_Ogre_Race_Wep.xml
new file mode 100644
index 0000000000..1c17d5ed13
--- /dev/null
+++ b/ModPatches/Simple Ogre Race/Patches/Simple Ogre Race/CE_Ogre_Race_Wep.xml	
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FP_OGRE_meleeone" or defName="FP_OGRE_meleetwo"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>100</costStuffCount>
+		</value>
+	</Operation>
+
+	<!-- Very High damage and Blunt penetration as it can only be made of woody material -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FP_OGRE_meleeone"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>60</power>
+					<chanceFactor>4</chanceFactor>
+					<cooldownTime>2.7</cooldownTime>
+					<armorPenetrationBlunt>68</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>31</power>
+					<chanceFactor>1</chanceFactor>
+					<cooldownTime>2.4</cooldownTime>
+					<armorPenetrationBlunt>36</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="FP_OGRE_meleeone"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>2.0</MeleeCritChance>
+				<MeleeParryChance>1</MeleeParryChance>
+				<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="FP_OGRE_meleeone"]/statBases</xpath>
+		<value>
+			<Bulk>16</Bulk>
+			<MeleeCounterParryBonus>0.33</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<!-- Spiked Club -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FP_OGRE_meleetwo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>54</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Cut</def>
+							<amount>18</amount>
+						</li>
+					</extraMeleeDamages>
+					<chanceFactor>4</chanceFactor>
+					<cooldownTime>2.88</cooldownTime>
+					<armorPenetrationBlunt>68</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>26</power>
+					<chanceFactor>1</chanceFactor>
+					<cooldownTime>2.55</cooldownTime>
+					<armorPenetrationBlunt>24</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="FP_OGRE_meleetwo"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>2.0</MeleeCritChance>
+				<MeleeParryChance>1</MeleeParryChance>
+				<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FP_OGRE_meleetwo"]/statBases/Mass</xpath>
+		<value>
+			<Mass>9.8</Mass>
+			<Bulk>18</Bulk>
+			<MeleeCounterParryBonus>0.33</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<!-- === The Rock === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FPOGRE_Rock"]/statBases</xpath>
+		<value>
+			<statBases>
+				<MarketValue>0.1</MarketValue>
+				<SightsEfficiency>0.7</SightsEfficiency>
+				<ShotSpread>1.4</ShotSpread>
+				<SwayFactor>2.4</SwayFactor>
+				<Bulk>7</Bulk>
+				<Mass>14</Mass>
+				<RangedWeapon_Cooldown>2.1</RangedWeapon_Cooldown>
+			</statBases>
+			<stackLimit>12</stackLimit>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FPOGRE_Rock"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>FPOGRE_RockFlying</defaultProjectile>
+					<warmupTime>1.4</warmupTime>
+					<range>13</range>
+					<soundCast>ThrowGrenade</soundCast>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FPOGRE_Rock"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>rock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.9</cooldownTime>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="Make_FP_OGRE_rock"]/products</xpath>
+		<value>
+			<products>
+				<FPOGRE_Rock>3</FPOGRE_Rock>
+			</products>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Simple Ogre Race/Patches/Simple Ogre Race/Ogre_Resources.xml b/ModPatches/Simple Ogre Race/Patches/Simple Ogre Race/Ogre_Resources.xml
new file mode 100644
index 0000000000..d678bf6842
--- /dev/null
+++ b/ModPatches/Simple Ogre Race/Patches/Simple Ogre Race/Ogre_Resources.xml	
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Bahlrin -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FP_OGRE_Leather"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.08</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FP_OGRE_Leather"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.04</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FP_OGRE_Leather"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.01</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Simply More Melee/Patches/Simply More Melee/SMM_MeleeWeapons_CE.xml b/ModPatches/Simply More Melee/Patches/Simply More Melee/SMM_MeleeWeapons_CE.xml
new file mode 100644
index 0000000000..f031c03c06
--- /dev/null
+++ b/ModPatches/Simply More Melee/Patches/Simply More Melee/SMM_MeleeWeapons_CE.xml	
@@ -0,0 +1,2177 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- You can find the spreadsheet here https://drive.google.com/open?id=1JZAjvzealI189OofkxwUCif3yA4-u6yP3DilsmIEQJA -->
+
+	<!-- SMM_Bardiche -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Bardiche"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.27</cooldownTime>
+					<armorPenetrationBlunt>2.925</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>42</power>
+					<cooldownTime>1.9</cooldownTime>
+					<armorPenetrationBlunt>1.3</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.3</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>51</power>
+					<cooldownTime>2.29</cooldownTime>
+					<armorPenetrationBlunt>8.125</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.63</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Bardiche"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<MeleeCounterParryBonus>0.54</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Bardiche"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.15</MeleeCritChance>
+				<MeleeParryChance>0.62</MeleeParryChance>
+				<MeleeDodgeChance>0.43</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- SMM_Bat -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Bat"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.46</cooldownTime>
+					<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.1</cooldownTime>
+					<armorPenetrationBlunt>1.8</armorPenetrationBlunt>
+					<chanceFactor>1.33</chanceFactor>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Bat"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<MeleeCounterParryBonus>0.56</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Bat"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.3</MeleeCritChance>
+				<MeleeParryChance>0.56</MeleeParryChance>
+				<MeleeDodgeChance>0.33</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- SMM_BatChained -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_BatChained"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.63</cooldownTime>
+					<armorPenetrationBlunt>0.7</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.22</cooldownTime>
+					<armorPenetrationBlunt>2.8</armorPenetrationBlunt>
+					<chanceFactor>1.33</chanceFactor>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_BatChained"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<MeleeCounterParryBonus>0.36</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_BatChained"]/statBases/Mass</xpath>
+		<value>
+			<Mass>1.4</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_BatChained"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.47</MeleeCritChance>
+				<MeleeParryChance>0.36</MeleeParryChance>
+				<MeleeDodgeChance>0.33</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- SMM_BatSpiked -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_BatSpiked"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.13</cooldownTime>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<chanceFactor>1.33</chanceFactor>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_BatSpiked"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_BatSpiked"]/statBases/Mass</xpath>
+		<value>
+			<Mass>1</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_BatSpiked"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.67</MeleeCritChance>
+				<MeleeParryChance>0.5</MeleeParryChance>
+				<MeleeDodgeChance>0.33</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- SMM_Baton -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Baton"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.91</cooldownTime>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Baton"]/statBases</xpath>
+		<value>
+			<Bulk>2.5</Bulk>
+			<MeleeCounterParryBonus>0.9</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_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="SMM_Baton"]/weaponTags</xpath>
+		<value>
+			<li>CE_Sidearm_Melee</li>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- SMM_Billhook -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Billhook"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.375</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.16</cooldownTime>
+					<armorPenetrationBlunt>0.54</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.54</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.18</cooldownTime>
+					<armorPenetrationBlunt>0.844</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.38</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Billhook"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<MeleeCounterParryBonus>0.2</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Billhook"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.33</MeleeCritChance>
+				<MeleeParryChance>0.2</MeleeParryChance>
+				<MeleeDodgeChance>0.1</MeleeDodgeChance>
+				<PlantWorkSpeed>0.15</PlantWorkSpeed>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Billhook"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- SMM_Cleaver -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Cleaver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.23</cooldownTime>
+					<armorPenetrationBlunt>0.225</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.05</cooldownTime>
+					<armorPenetrationBlunt>0.38</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.34</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Cleaver"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<MeleeCounterParryBonus>0.25</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Cleaver"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.28</MeleeCritChance>
+				<MeleeParryChance>0.11</MeleeParryChance>
+				<MeleeDodgeChance>0.05</MeleeDodgeChance>
+				<ButcheryFleshEfficiency>0.05</ButcheryFleshEfficiency>
+				<ButcheryFleshSpeed>0.10</ButcheryFleshSpeed>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Cleaver"]/weaponTags</xpath>
+		<value>
+			<li>CE_Sidearm_Melee</li>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- SMM_Crowbar -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Crowbar"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.32</cooldownTime>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>0.63</cooldownTime>
+					<armorPenetrationBlunt>5.625</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Crowbar"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Crowbar"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.42</MeleeCritChance>
+				<MeleeParryChance>0.24</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Crowbar"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- SMM_Fireaxe -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Fireaxe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.3</cooldownTime>
+					<armorPenetrationBlunt>3.263</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>pick</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.96</cooldownTime>
+					<armorPenetrationBlunt>13.05</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.31</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>41</power>
+					<cooldownTime>2.41</cooldownTime>
+					<armorPenetrationBlunt>13.05</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.16</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Fireaxe"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.28</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Fireaxe"]/statBases/Mass</xpath>
+		<value>
+			<Mass>2.9</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Fireaxe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.11</MeleeCritChance>
+				<MeleeParryChance>0.28</MeleeParryChance>
+				<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- SMM_Glaive -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Glaive"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.36</cooldownTime>
+					<armorPenetrationBlunt>2.363</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>1.2</cooldownTime>
+					<armorPenetrationBlunt>2.363</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.37</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>51</power>
+					<cooldownTime>3.01</cooldownTime>
+					<armorPenetrationBlunt>9.45</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.89</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Glaive"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<MeleeCounterParryBonus>1.02</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Glaive"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.19</MeleeCritChance>
+				<MeleeParryChance>1.19</MeleeParryChance>
+				<MeleeDodgeChance>0.67</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- SMM_Halberd -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Halberd"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.52</cooldownTime>
+					<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>38</power>
+					<cooldownTime>1.34</cooldownTime>
+					<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>3.6</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>50</power>
+					<cooldownTime>3.34</cooldownTime>
+					<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.88</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Halberd"]/statBases</xpath>
+		<value>
+			<Bulk>13</Bulk>
+			<MeleeCounterParryBonus>0.67</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Halberd"]/statBases/Mass</xpath>
+		<value>
+			<Mass>3.2</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Halberd"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.13</MeleeCritChance>
+				<MeleeParryChance>0.78</MeleeParryChance>
+				<MeleeDodgeChance>0.67</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- SMM_Hatchet -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Hatchet"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>0.95</cooldownTime>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>hammerhead</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.58</cooldownTime>
+					<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.58</cooldownTime>
+					<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.32</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Hatchet"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<MeleeCounterParryBonus>0.22</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Hatchet"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.31</MeleeCritChance>
+				<MeleeParryChance>0.22</MeleeParryChance>
+				<MeleeDodgeChance>0.12</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Hatchet"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- SMM_Hooksword -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Hooksword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.4</cooldownTime>
+					<armorPenetrationBlunt>0.375</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.4</cooldownTime>
+					<armorPenetrationBlunt>0.375</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.42</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>1.3</cooldownTime>
+					<armorPenetrationBlunt>0.844</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.38</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Hooksword"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Hooksword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.67</MeleeCritChance>
+				<MeleeParryChance>0.4</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Hooksword"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- SMM_Karambit -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Karambit"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>knuckle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.53</cooldownTime>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.14</cooldownTime>
+					<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.36</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.42</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Karambit"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<MeleeCounterParryBonus>0.1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Karambit"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1</MeleeCritChance>
+				<MeleeParryChance>0.1</MeleeParryChance>
+				<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Karambit"]/weaponTags</xpath>
+		<value>
+			<li>CE_Sidearm_Melee</li>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- SMM_Kukri -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Kukri"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.4</cooldownTime>
+					<armorPenetrationBlunt>0.375</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>0.84</cooldownTime>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.67</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.4</cooldownTime>
+					<armorPenetrationBlunt>0.375</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.38</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Kukri"]/statBases</xpath>
+		<value>
+			<Bulk>2.5</Bulk>
+			<MeleeCounterParryBonus>0.27</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Kukri"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.27</MeleeCritChance>
+				<MeleeParryChance>0.27</MeleeParryChance>
+				<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Kukri"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- SMM_Machete -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Machete"]/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>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>1.25</cooldownTime>
+					<armorPenetrationBlunt>0.956</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.43</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.44</cooldownTime>
+					<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.43</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Machete"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<MeleeCounterParryBonus>0.26</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Machete"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.29</MeleeCritChance>
+				<MeleeParryChance>0.26</MeleeParryChance>
+				<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Machete"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- SMM_Mallet -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Mallet"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2.12</cooldownTime>
+					<armorPenetrationBlunt>3.125</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Mallet"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<MeleeCounterParryBonus>0.23</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Mallet"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.33</MeleeCritChance>
+				<MeleeParryChance>0.23</MeleeParryChance>
+				<MeleeDodgeChance>0.15</MeleeDodgeChance>
+				<GeneralLaborSpeed>0.08</GeneralLaborSpeed>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Mallet"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- SMM_Maul -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Maul"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>sledge</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>2.52</cooldownTime>
+					<armorPenetrationBlunt>12.6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>axe</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>42</power>
+					<cooldownTime>2.52</cooldownTime>
+					<armorPenetrationBlunt>12.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Maul"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>0.32</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Maul"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.4</MeleeCritChance>
+				<MeleeParryChance>0.43</MeleeParryChance>
+				<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- SMM_Pickaxe -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Pickaxe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.69</cooldownTime>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.69</cooldownTime>
+					<armorPenetrationBlunt>7.2</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.72</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Pickaxe"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>0.22</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Pickaxe"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.06</MeleeCritChance>
+				<MeleeParryChance>0.22</MeleeParryChance>
+				<MeleeDodgeChance>0.23</MeleeDodgeChance>
+				<MiningSpeed>0.15</MiningSpeed>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- SMM_Pitchfork -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Pitchfork"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.69</cooldownTime>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.11</cooldownTime>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Pitchfork"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Pitchfork"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.44</MeleeCritChance>
+				<MeleeParryChance>1.33</MeleeParryChance>
+				<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- SMM_Pollaxe -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Pollaxe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.44</cooldownTime>
+					<armorPenetrationBlunt>2.925</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>37</power>
+					<cooldownTime>1.27</cooldownTime>
+					<armorPenetrationBlunt>2.925</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.93</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>39</power>
+					<cooldownTime>3.66</cooldownTime>
+					<armorPenetrationBlunt>8.125</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.63</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>hammer</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>2.86</cooldownTime>
+					<armorPenetrationBlunt>11.7</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Pollaxe"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>0.58</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Pollaxe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.13</MeleeCritChance>
+				<MeleeParryChance>0.77</MeleeParryChance>
+				<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- SMM_Sickle -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Sickle"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.4</cooldownTime>
+					<armorPenetrationBlunt>0.375</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.4</cooldownTime>
+					<armorPenetrationBlunt>0.375</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.31</cooldownTime>
+					<armorPenetrationBlunt>0.54</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.48</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Sickle"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<MeleeCounterParryBonus>0.1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Sickle"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.44</MeleeCritChance>
+				<MeleeParryChance>0.1</MeleeParryChance>
+				<MeleeDodgeChance>0.05</MeleeDodgeChance>
+				<PlantHarvestYield>0.15</PlantHarvestYield>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Sickle"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- SMM_Sledgehammer -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Sledgehammer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.87</cooldownTime>
+					<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>2.43</cooldownTime>
+					<armorPenetrationBlunt>10.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Sledgehammer"]/statBases</xpath>
+		<value>
+			<Bulk>7</Bulk>
+			<MeleeCounterParryBonus>0.38</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Sledgehammer"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.2</MeleeCritChance>
+				<MeleeParryChance>0.5</MeleeParryChance>
+				<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- SMM_TrenchKnife -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_TrenchKnife"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>knuckle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.62</cooldownTime>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.31</cooldownTime>
+					<armorPenetrationBlunt>0.54</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.48</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.4</cooldownTime>
+					<armorPenetrationBlunt>0.375</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.63</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_TrenchKnife"]/statBases</xpath>
+		<value>
+			<Bulk>1.5</Bulk>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_TrenchKnife"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.33</MeleeCritChance>
+				<MeleeParryChance>0.15</MeleeParryChance>
+				<MeleeDodgeChance>0.07</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_TrenchKnife"]/weaponTags</xpath>
+		<value>
+			<li>CE_Sidearm_Melee</li>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- SMM_TrenchClub -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_TrenchClub"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.7</cooldownTime>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_TrenchClub"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.18</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_TrenchClub"]/statBases/Mass</xpath>
+		<value>
+			<Mass>1</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_TrenchClub"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.33</MeleeCritChance>
+				<MeleeParryChance>0.23</MeleeParryChance>
+				<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_TrenchClub"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- SMM_Zweihander -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Zweihander"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.99</cooldownTime>
+					<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>60</power>
+					<cooldownTime>1.99</cooldownTime>
+					<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.87</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>47</power>
+					<cooldownTime>3.1</cooldownTime>
+					<armorPenetrationBlunt>3.488</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.39</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Zweihander"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Zweihander"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.08</MeleeCritChance>
+				<MeleeParryChance>0.52</MeleeParryChance>
+				<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- SMM_Claymore -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Claymore"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.89</cooldownTime>
+					<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>34</power>
+					<cooldownTime>1.89</cooldownTime>
+					<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.39</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>44</power>
+					<cooldownTime>2.02</cooldownTime>
+					<armorPenetrationBlunt>3.613</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.73</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Claymore"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>0.75</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Claymore"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.18</MeleeCritChance>
+				<MeleeParryChance>0.56</MeleeParryChance>
+				<MeleeDodgeChance>0.47</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- SMM_Pike -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Pike"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.41</cooldownTime>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Pike"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<MeleeCounterParryBonus>1.27</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Pike"]/statBases/Mass</xpath>
+		<value>
+			<Mass>4</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Pike"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.08</MeleeCritChance>
+				<MeleeParryChance>0.95</MeleeParryChance>
+				<MeleeDodgeChance>1.27</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- SMM_Scythe -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Scythe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.74</cooldownTime>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>1.74</cooldownTime>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.36</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>6.79</cooldownTime>
+					<armorPenetrationBlunt>0.576</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.52</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Scythe"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>1.26</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Scythe"]/statBases/Mass</xpath>
+		<value>
+			<Mass>1.8</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Scythe"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.28</MeleeCritChance>
+				<MeleeParryChance>0.94</MeleeParryChance>
+				<MeleeDodgeChance>0.57</MeleeDodgeChance>
+				<PlantWorkSpeed>0.15</PlantWorkSpeed>
+				<PlantHarvestYield>0.15</PlantHarvestYield>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- SMM_Warclub -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Warclub"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.66</cooldownTime>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>2.47</cooldownTime>
+					<armorPenetrationBlunt>4.688</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Warclub"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<MeleeCounterParryBonus>0.2</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Warclub"]/statBases/Mass</xpath>
+		<value>
+			<Mass>1.5</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Warclub"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.5</MeleeCritChance>
+				<MeleeParryChance>0.2</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Warclub"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_Sidearm_Tribal</li>
+		</value>
+	</Operation>
+
+	<!-- SMM_Dagger -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Dagger"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.32</cooldownTime>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.52</cooldownTime>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.27</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.1</cooldownTime>
+					<armorPenetrationBlunt>0.432</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.72</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Dagger"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Dagger"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.5</MeleeCritChance>
+				<MeleeParryChance>0.15</MeleeParryChance>
+				<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Dagger"]/weaponTags</xpath>
+		<value>
+			<li>CE_Sidearm_Melee</li>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- SMM_Quarterstaff -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Quarterstaff"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.37</cooldownTime>
+					<armorPenetrationBlunt>5.313</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>0.86</cooldownTime>
+					<armorPenetrationBlunt>3.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Quarterstaff"]/statBases</xpath>
+		<value>
+			<Bulk>9</Bulk>
+			<MeleeCounterParryBonus>1.96</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Quarterstaff"]/statBases/Mass</xpath>
+		<value>
+			<Mass>1.7</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Quarterstaff"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>70</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Quarterstaff"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.85</MeleeCritChance>
+				<MeleeParryChance>1.47</MeleeParryChance>
+				<MeleeDodgeChance>0.83</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- SMM_Khopesh -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Khopesh"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.37</cooldownTime>
+					<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.37</cooldownTime>
+					<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.18</armorPenetrationSharp>
+					<chanceFactor>0.25</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.09</cooldownTime>
+					<armorPenetrationBlunt>1.012</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Khopesh"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Khopesh"]/statBases/Mass</xpath>
+		<value>
+			<Mass>0.7</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Khopesh"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>40</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Khopesh"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.29</MeleeCritChance>
+				<MeleeParryChance>0.35</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Khopesh"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- SMM_Scimitar -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_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="SMM_Scimitar"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.38</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SMM_Scimitar"]/statBases/Mass</xpath>
+		<value>
+			<Mass>1.1</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Scimitar"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.24</MeleeCritChance>
+				<MeleeParryChance>0.38</MeleeParryChance>
+				<MeleeDodgeChance>0.28</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SMM_Scimitar"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Slime Rancher/Defs/Slime Rancher/Recipes_Slime.xml b/ModPatches/Slime Rancher/Defs/Slime Rancher/Recipes_Slime.xml
new file mode 100644
index 0000000000..43db24412d
--- /dev/null
+++ b/ModPatches/Slime Rancher/Defs/Slime Rancher/Recipes_Slime.xml	
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef>
+		<defName>PressFirePlortCE</defName>
+		<label>press fire plort</label>
+		<description>Concentrate fire plorts into highly flammable compounds.</description>
+		<jobString>Pressing fire plort</jobString>
+		<workAmount>100</workAmount>
+		<products>
+			<Prometheum>1</Prometheum>
+		</products>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FirePlort</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>FirePlort</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Slime Rancher/Patches/Slime Rancher/Slime_Recipe.xml b/ModPatches/Slime Rancher/Patches/Slime Rancher/Slime_Recipe.xml
new file mode 100644
index 0000000000..df5ede5a27
--- /dev/null
+++ b/ModPatches/Slime Rancher/Patches/Slime Rancher/Slime_Recipe.xml	
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	
+	<!-- ==================== Recipes ========================== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="PressBoomPlort"]/products</xpath>
+		<value>
+			<products>
+				<FSX>5</FSX>
+			</products>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PlortPress"]/recipes</xpath>
+		<value>
+			<li>PressFirePlortCE</li>
+		</value>
+	</Operation>
+	
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Slime Rancher/Patches/Slime Rancher/SlimeyBois.xml b/ModPatches/Slime Rancher/Patches/Slime Rancher/SlimeyBois.xml
new file mode 100644
index 0000000000..62c03262e0
--- /dev/null
+++ b/ModPatches/Slime Rancher/Patches/Slime Rancher/SlimeyBois.xml	
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[
+			defName="GreenSlime" or
+			defName="PuddleSlime" or
+			defName="FireSlime" or
+			defName="BoomSlime" or
+			defName="TarrSlime" or
+			defName="QuicksilverSlime"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="GreenSlime" or
+			defName="PuddleSlime" or
+			defName="FireSlime" or
+			defName="BoomSlime"
+			]/statBases </xpath>
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.07</MeleeCritChance>
+			<MeleeParryChance>0.00</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="QuicksilverSlime"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>0.07</MeleeCritChance>
+			<MeleeParryChance>0.00</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TarrSlime"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.33</MeleeCritChance>
+			<MeleeParryChance>0.00</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="GreenSlime" or
+			defName="PuddleSlime" or
+			defName="BoomSlime"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>body</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Slimebody</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>2</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="FireSlime"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>body</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Slimebody</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Flame</def>
+								<amount>1</amount>
+								<chance>0.33</chance>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TarrSlime"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>body</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Slimebody</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>2</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>razorfangs</label>
+					<capacities>
+						<li>Bite</li>
+						<li>Stab</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>Slimebody</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+					<chanceFactor>0.9</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="QuicksilverSlime"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>body</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>0.1</cooldownTime>
+					<linkedBodyPartsGroup>Slimebody</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Flame</def>
+								<amount>1</amount>
+								<chance>0.33</chance>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Slice</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Cut</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>0.4</cooldownTime>
+					<linkedBodyPartsGroup>Slimebody</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<chanceFactor>0.9</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>1</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Solark Race/Defs/Solark Race/Damage_Solark.xml b/ModPatches/Solark Race/Defs/Solark Race/Damage_Solark.xml
new file mode 100644
index 0000000000..4d6f48f934
--- /dev/null
+++ b/ModPatches/Solark Race/Defs/Solark Race/Damage_Solark.xml	
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<DamageDef ParentName="Bomb">
+		<defName>Bomb_Solark</defName>
+		<defaultDamage>550</defaultDamage>
+		<defaultStoppingPower>2.0</defaultStoppingPower>
+		<defaultArmorPenetration>55</defaultArmorPenetration>
+	</DamageDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Solark Race/Patches/Solark Race/Bodies/Solark_Bodytype.xml b/ModPatches/Solark Race/Patches/Solark Race/Bodies/Solark_Bodytype.xml
new file mode 100644
index 0000000000..693a48f02b
--- /dev/null
+++ b/ModPatches/Solark Race/Patches/Solark Race/Bodies/Solark_Bodytype.xml	
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Nearmare Bodytype-->
+
+	<!--Arm Groups-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Solark_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Solark_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Solark_Body"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Solark_Body"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<!--Natural Armor-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Solark_Body"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Solark_Body"]/corePart/parts/li[def="Solark_Wing"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Solark_Body"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Solark_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Solark_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Solark_Horn"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Solark_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Solark_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Solark_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Solark_Body"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Solark_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Solark_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Solark_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Solark_Body"]/corePart/parts/li[def="Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Solark_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Solark_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Solark Race/Patches/Solark Race/Hediffs/Hediffs.xml b/ModPatches/Solark Race/Patches/Solark Race/Hediffs/Hediffs.xml
new file mode 100644
index 0000000000..9861a6286f
--- /dev/null
+++ b/ModPatches/Solark Race/Patches/Solark Race/Hediffs/Hediffs.xml	
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv1"]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv1"]/statOffsets/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0</ArmorRating_Heat>
+			<ArmorRating_Electric>0.2</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv1"]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv1"]/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv2"]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv2"]/statOffsets/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.05</ArmorRating_Heat>
+			<ArmorRating_Electric>0.2</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv2"]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv2"]/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv3"]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv3"]/statOffsets/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.10</ArmorRating_Heat>
+			<ArmorRating_Electric>0.4</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv3"]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv3"]/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv4"]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv4"]/statOffsets/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.15</ArmorRating_Heat>
+			<ArmorRating_Electric>0.6</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv4"]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv4"]/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv5"]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv5"]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv5"]/statOffsets/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.2</ArmorRating_Heat>
+			<ArmorRating_Electric>0.8</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv5"]/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			<MeleeCritChance>0.3</MeleeCritChance>
+			<MeleeParryChance>0.3</MeleeParryChance>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Solark Race/Patches/Solark Race/PawnKindDefs/Solark_PawnKind.xml b/ModPatches/Solark Race/Patches/Solark Race/PawnKindDefs/Solark_PawnKind.xml
new file mode 100644
index 0000000000..8a0a31880a
--- /dev/null
+++ b/ModPatches/Solark Race/Patches/Solark Race/PawnKindDefs/Solark_PawnKind.xml	
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Ammo-->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			@Name="HAR_Solark_KindBase"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Backpack-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CE_Apparel_Backpack"]/apparel/tags</xpath>
+		<value>
+			<li>HAR_Solark_NPC_Resident</li>
+		</value>
+	</Operation>
+
+	<!--combatPower-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[@Name="HAR_Solark_KindBase"]/combatPower</xpath>
+		<value>
+			<combatPower>200</combatPower>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Solark Race/Patches/Solark Race/ThingDefs_Misc/Solark_Apparel.xml b/ModPatches/Solark Race/Patches/Solark Race/ThingDefs_Misc/Solark_Apparel.xml
new file mode 100644
index 0000000000..7e5e930557
--- /dev/null
+++ b/ModPatches/Solark Race/Patches/Solark Race/ThingDefs_Misc/Solark_Apparel.xml	
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--========= Stuffable =========-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_SA_Tops_a" or
+			defName="HAR_SA_Tops_b" or
+			defName="HAR_SA_Tops_c"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Middle PA-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_SA_Armor_a"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+			<Bulk>80</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_SA_Armor_a"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>40</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_SA_Armor_a"
+			]/statBases/Mass </xpath>
+		<value>
+			<Mass>60</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_SA_Armor_a"
+			]/equippedStatOffsets/MoveSpeed </xpath>
+		<value>
+			<CarryWeight>80</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+			<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="HAR_SA_Armor_Base"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="HAR_SA_Armor_Base"]/costList/ComponentSpacer</xpath>
+		<value>
+			<ComponentSpacer>3</ComponentSpacer>
+			<DevilstrandCloth>50</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<!--Shell-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_SA_Shell_a" or
+			defName="HAR_SA_Shell_b"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_SA_Shell_c"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_SA_Shell_c"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Overhead-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_SA_Heads_a" or
+			defName="HAR_SA_Heads_b" or
+			defName="HAR_SA_Heads_c"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Overhead Armor-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_SA_Heads_d"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_SA_Heads_d"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>40.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_SA_Heads_d"
+			]/equippedStatOffsets/MoveSpeed </xpath>
+		<value>
+			<AimingAccuracy>0.15</AimingAccuracy>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HAR_SA_Heads_d"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>20</DevilstrandCloth>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Solark Race/Patches/Solark Race/ThingDefs_Races/AlienRace_Solark.xml b/ModPatches/Solark Race/Patches/Solark Race/ThingDefs_Races/AlienRace_Solark.xml
new file mode 100644
index 0000000000..2760435734
--- /dev/null
+++ b/ModPatches/Solark Race/Patches/Solark Race/ThingDefs_Races/AlienRace_Solark.xml	
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="HAR_Solark_BaseNRPawn"]/inspectorTabs/li[.="ITab_Pawn_Gear"]</xpath>
+		<value>
+			<li>CombatExtended.ITab_Inventory</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="HAR_Solark_BaseNRPawn"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Inventory"/>
+			<li Class="CombatExtended.CompProperties_TacticalManager"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="HAR_Solark_BaseNRPawn"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Solark"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Solark"]/statBases</xpath>
+		<value>
+			<Suppressability>0.2</Suppressability>
+			<SmokeSensitivity>0.2</SmokeSensitivity>
+			<MeleeCritChance>1.0</MeleeCritChance>
+			<MeleeParryChance>1.0</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Solark"]/race/baseBodySize</xpath>
+		<value>
+			<baseBodySize>1</baseBodySize>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="HAR_Solark_BaseNRPawn"]/comps/li[@Class="Solark_Dll.Solark_CompProperties_CommandExplosive"]/explosiveDamageType</xpath>
+		<value>
+			<explosiveDamageType>Bomb_Solark</explosiveDamageType>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Solark"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>1.30</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Solark"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Solark"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Solark"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Solark"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>HAR_SA_Damage_a</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.66</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>60</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>HAR_SA_Damage_a</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.66</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>60</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>3.05</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Solark"]/alienRace/raceRestriction/whiteApparelList</xpath>
+		<value>
+			<li>CE_Apparel_TacVest</li>
+			<li>CE_Apparel_Backpack</li>
+			<li>CE_Apparel_TribalBackpack</li>
+			<li>CE_Apparel_BallisticShield</li>
+			<li>CE_Apparel_MeleeShield</li>
+			<li>CE_Apparel_GasMask</li>
+			<li>CE_Apparel_ImprovGasMask</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Solark"]/damageMultipliers</xpath>
+		<value>
+			<li>
+				<damageDef>Bomb_Solark</damageDef><!--■反物質 -->
+				<multiplier>0</multiplier>
+			</li>
+			<li>
+				<damageDef>Fragment</damageDef><!--■反物質 -->
+				<multiplier>0.3</multiplier>
+			</li>
+			<li>
+				<damageDef>Bomb_Secondary</damageDef><!--■反物質 -->
+				<multiplier>0.2</multiplier>
+			</li>
+			<li>
+				<damageDef>Thermobaric</damageDef><!--■反物質 -->
+				<multiplier>0.3</multiplier>
+			</li>
+			<li>
+				<damageDef>Flame_Secondary</damageDef><!--■反物質 -->
+				<multiplier>2</multiplier>
+			</li>
+			<li>
+				<damageDef>PrometheumFlame</damageDef><!--■反物質 -->
+				<multiplier>2</multiplier>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Spaceworm/Patches/Spaceworm/Spaceworm.xml b/ModPatches/Spaceworm/Patches/Spaceworm/Spaceworm.xml
new file mode 100644
index 0000000000..29e3717c30
--- /dev/null
+++ b/ModPatches/Spaceworm/Patches/Spaceworm/Spaceworm.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Scuttlebug"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Serpentine</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Scuttlebug"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.36</MeleeDodgeChance>
+			<MeleeCritChance>0</MeleeCritChance>
+			<MeleeParryChance>0</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Scuttlebug"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>face teeth</label>
+					<capacities>
+						<li>ScuttlebugCapacity</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1</cooldownTime>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.844</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Spartan Foundry/Patches/Spartan Foundry/Apparel_Armors.xml b/ModPatches/Spartan Foundry/Patches/Spartan Foundry/Apparel_Armors.xml
new file mode 100644
index 0000000000..c32326821b
--- /dev/null
+++ b/ModPatches/Spartan Foundry/Patches/Spartan Foundry/Apparel_Armors.xml	
@@ -0,0 +1,639 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==================================== Powered Assault Armor =====================================-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_PoweredAssaultArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<Bulk>120</Bulk>
+			<WornBulk>18</WornBulk>
+			<MaxHitPoints>1200</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_PoweredAssaultArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>60</Mass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_PoweredAssaultArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>93.7</CarryWeight>
+				<CarryBulk>10.8</CarryBulk>
+				<ShootingAccuracyPawn>0.2</ShootingAccuracyPawn>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SF_PoweredAssaultArmor"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>100</DevilstrandCloth>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_PoweredAssaultArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>26</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_PoweredAssaultArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>59</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_PoweredAssaultArmor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<!-- ==================================== Engineer Power Armor =====================================-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_EngineerPowerArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<Bulk>108</Bulk>
+			<WornBulk>16.2</WornBulk>
+			<MaxHitPoints>1200</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_EngineerPowerArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>60</Mass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_EngineerPowerArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>82.3</CarryWeight>
+				<CarryBulk>12</CarryBulk>
+				<ShootingAccuracyPawn>0.05</ShootingAccuracyPawn>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+				<ConstructionSpeed>0.15</ConstructionSpeed>
+				<FixBrokenDownBuildingSuccessChance>0.10</FixBrokenDownBuildingSuccessChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SF_EngineerPowerArmor"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>100</DevilstrandCloth>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_EngineerPowerArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_EngineerPowerArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>65</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_EngineerPowerArmor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<!-- ==================================== Explorer Power Armor =====================================-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ExplorerPowerArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+			<MaxHitPoints>1200</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ExplorerPowerArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>50</Mass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ExplorerPowerArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>83.5</CarryWeight>
+				<CarryBulk>11.1</CarryBulk>
+				<ShootingAccuracyPawn>0.05</ShootingAccuracyPawn>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+				<PlantWorkSpeed>0.12</PlantWorkSpeed>
+				<ResearchSpeedFactor>0.2</ResearchSpeedFactor>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SF_ExplorerPowerArmor"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>100</DevilstrandCloth>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ExplorerPowerArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ExplorerPowerArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ExplorerPowerArmor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<!-- ==================================== Grenadier Power Armor =====================================-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_GrenadierPowerArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<Bulk>177.8</Bulk>
+			<WornBulk>26.7</WornBulk>
+			<MaxHitPoints>1200</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_GrenadierPowerArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>80</Mass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_GrenadierPowerArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>90.4</CarryWeight>
+				<CarryBulk>16</CarryBulk>
+				<ShootingAccuracyPawn>0.2</ShootingAccuracyPawn>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+				<ReloadSpeed>-0.3</ReloadSpeed>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SF_GrenadierPowerArmor"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>100</DevilstrandCloth>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_GrenadierPowerArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>28</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_GrenadierPowerArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>91</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_GrenadierPowerArmor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<!-- ==================================== Commando Armor =====================================-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_CommandoArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<Bulk>120</Bulk>
+			<WornBulk>18</WornBulk>
+			<MaxHitPoints>1200</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_CommandoArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>60</Mass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_CommandoArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>110.5</CarryWeight>
+				<CarryBulk>17.1</CarryBulk>
+				<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SF_CommandoArmor"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>100</DevilstrandCloth>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_CommandoArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>22</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_CommandoArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>50</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_CommandoArmor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<!-- ==================================== Hazard Operations Armor =====================================-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_HazardOperationsArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<Bulk>155.6</Bulk>
+			<WornBulk>23.3</WornBulk>
+			<MaxHitPoints>1200</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_HazardOperationsArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>70</Mass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_HazardOperationsArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>89.7</CarryWeight>
+				<CarryBulk>14</CarryBulk>
+				<ShootingAccuracyPawn>0.05</ShootingAccuracyPawn>
+				<MiningSpeed>0.2</MiningSpeed>
+				<Flammability>-1</Flammability>
+				<ToxicEnvironmentResistance>1</ToxicEnvironmentResistance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SF_HazardOperationsArmor"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>100</DevilstrandCloth>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_HazardOperationsArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_HazardOperationsArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_HazardOperationsArmor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<!-- ==================================== Diplomat Power Armor =====================================-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_DiplomatPowerArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<Bulk>120</Bulk>
+			<WornBulk>18</WornBulk>
+			<MaxHitPoints>1200</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_DiplomatPowerArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>60</Mass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_DiplomatPowerArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>82.3</CarryWeight>
+				<CarryBulk>12</CarryBulk>
+				<ShootingAccuracyPawn>0.05</ShootingAccuracyPawn>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+				<NegotiationAbility>0.15</NegotiationAbility>
+				<GlobalLearningFactor>0.3</GlobalLearningFactor>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SF_DiplomatPowerArmor"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>100</DevilstrandCloth>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_DiplomatPowerArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>22</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_DiplomatPowerArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>55</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_DiplomatPowerArmor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<!-- ==================================== Defender Power Armor =====================================-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_DefenderPowerArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<Bulk>132</Bulk>
+			<WornBulk>19.8</WornBulk>
+			<MaxHitPoints>1200</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_DefenderPowerArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>73.3</Mass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_DefenderPowerArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>82.3</CarryWeight>
+				<CarryBulk>12</CarryBulk>
+				<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+				<MedicalPotency>0.1</MedicalPotency>
+				<MedicalTendQuality>0.15</MedicalTendQuality>
+				<MedicalTendSpeed>0.6</MedicalTendSpeed>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SF_DefenderPowerArmor"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>100</DevilstrandCloth>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_DefenderPowerArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_DefenderPowerArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>55</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_DefenderPowerArmor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<!-- ==================================== Scout Power Armor =====================================-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ScoutPowerArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<Bulk>106.67</Bulk>
+			<WornBulk>16</WornBulk>
+			<MaxHitPoints>1200</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ScoutPowerArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>53.33</Mass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ScoutPowerArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>87.3</CarryWeight>
+				<CarryBulk>11.20</CarryBulk>
+				<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+				<MoveSpeed>0.4</MoveSpeed>
+				<TrapSpringChance>-1</TrapSpringChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SF_ScoutPowerArmor"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>100</DevilstrandCloth>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ScoutPowerArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ScoutPowerArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ScoutPowerArmor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<!-- ==================================== Samurai Power Armor =====================================-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_SamuraiPowerArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<Bulk>106.7</Bulk>
+			<WornBulk>16</WornBulk>
+			<MaxHitPoints>1200</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_SamuraiPowerArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>53.3</Mass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_SamuraiPowerArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>88.1</CarryWeight>
+				<CarryBulk>10.7</CarryBulk>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+				<MeleeHitChance>0.05</MeleeHitChance>
+				<MeleeCritChance>0.1</MeleeCritChance>
+				<MeleeDodgeChance>0.15</MeleeDodgeChance>
+				<MeleeParryChance>0.3</MeleeParryChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SF_SamuraiPowerArmor"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>100</DevilstrandCloth>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_SamuraiPowerArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_SamuraiPowerArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_SamuraiPowerArmor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<!-- ==================================== Shock Trooper Armor =====================================-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ShockTrooperArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<Bulk>106.7</Bulk>
+			<WornBulk>16</WornBulk>
+			<MaxHitPoints>1200</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ShockTrooperArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>53.33</Mass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ShockTrooperArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>82.7</CarryWeight>
+				<CarryBulk>10.7</CarryBulk>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+				<MeleeHitChance>0.025</MeleeHitChance>
+				<MeleeCritChance>0.5</MeleeCritChance>
+				<MeleeDodgeChance>0.075</MeleeDodgeChance>
+				<MeleeParryChance>0.15</MeleeParryChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SF_ShockTrooperArmor"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>100</DevilstrandCloth>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ShockTrooperArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>19</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ShockTrooperArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>52</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ShockTrooperArmor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<!-- ==================================== Recon Power Armor =====================================-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ReconPowerArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<Bulk>84</Bulk>
+			<WornBulk>12.6</WornBulk>
+			<MaxHitPoints>1200</MaxHitPoints>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ReconPowerArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>46.7</Mass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ReconPowerArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>72.6</CarryWeight>
+				<CarryBulk>8.2</CarryBulk>
+				<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+				<MoveSpeed>0.4</MoveSpeed>
+				<WorkSpeedGlobal>0.1</WorkSpeedGlobal>
+				<CarryingCapacity>30</CarryingCapacity>
+				<HuntingStealth>1</HuntingStealth>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SF_ReconPowerArmor"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>100</DevilstrandCloth>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ReconPowerArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ReconPowerArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>55</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ReconPowerArmor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Spartan Foundry/Patches/Spartan Foundry/Apparel_Headgear.xml b/ModPatches/Spartan Foundry/Patches/Spartan Foundry/Apparel_Headgear.xml
new file mode 100644
index 0000000000..82ad5a7d47
--- /dev/null
+++ b/ModPatches/Spartan Foundry/Patches/Spartan Foundry/Apparel_Headgear.xml	
@@ -0,0 +1,754 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==================================== Powered Assault Armor Helmet =====================================-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_PoweredAssaultArmorHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<MaxHitPoints>240</MaxHitPoints>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="SF_PoweredAssaultArmorHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="SF_PoweredAssaultArmorHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_PoweredAssaultArmorHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>0.2</AimingAccuracy>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+				<PainShockThreshold>0.2</PainShockThreshold>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SF_PoweredAssaultArmorHelmet"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>40</DevilstrandCloth>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_PoweredAssaultArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_PoweredAssaultArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_PoweredAssaultArmorHelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SF_PoweredAssaultArmorHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!-- ==================================== Engineer Power Armor Helmet =====================================-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_EngineerPowerArmorHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<Bulk>4.5</Bulk>
+			<WornBulk>0.9</WornBulk>
+			<MaxHitPoints>240</MaxHitPoints>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="SF_EngineerPowerArmorHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="SF_EngineerPowerArmorHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_EngineerPowerArmorHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>0.05</AimingAccuracy>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+				<ConstructSuccessChance>0.2</ConstructSuccessChance>
+				<FixBrokenDownBuildingSuccessChance>0.1</FixBrokenDownBuildingSuccessChance>
+				<ConstructionSpeed>0.1</ConstructionSpeed>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SF_EngineerPowerArmorHelmet"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>40</DevilstrandCloth>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_EngineerPowerArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_EngineerPowerArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>44</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_EngineerPowerArmorHelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SF_EngineerPowerArmorHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!-- ==================================== Explorer Power Armor Helmet =====================================-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ExplorerPowerArmorHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<MaxHitPoints>240</MaxHitPoints>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="SF_ExplorerPowerArmorHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="SF_ExplorerPowerArmorHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ExplorerPowerArmorHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<PsychicSensitivity>-0.3</PsychicSensitivity>
+				<AimingAccuracy>0.05</AimingAccuracy>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+				<PlantHarvestYield>0.1</PlantHarvestYield>
+				<TameAnimalChance>0.1</TameAnimalChance>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SF_ExplorerPowerArmorHelmet"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>40</DevilstrandCloth>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ExplorerPowerArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ExplorerPowerArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>35</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ExplorerPowerArmorHelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SF_ExplorerPowerArmorHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!-- ==================================== Grenadier Power Armor Helmet =====================================-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_GrenadierPowerArmorHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<Bulk>5.6</Bulk>
+			<WornBulk>1.1</WornBulk>
+			<MaxHitPoints>240</MaxHitPoints>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="SF_GrenadierPowerArmorHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="SF_GrenadierPowerArmorHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_GrenadierPowerArmorHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>0.35</AimingAccuracy>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SF_GrenadierPowerArmorHelmet"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>40</DevilstrandCloth>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_GrenadierPowerArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>22</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_GrenadierPowerArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>71</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_GrenadierPowerArmorHelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SF_GrenadierPowerArmorHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!-- ==================================== Commando Armor Helmet =====================================-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_CommandoArmorHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<MaxHitPoints>240</MaxHitPoints>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="SF_CommandoArmorHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="SF_CommandoArmorHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_CommandoArmorHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>0.45</AimingAccuracy>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+				<AimingDelayFactor>-0.15</AimingDelayFactor>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SF_CommandoArmorHelmet"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>40</DevilstrandCloth>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_CommandoArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_CommandoArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_CommandoArmorHelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SF_CommandoArmorHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!-- ==================================== Hazard Operations Armor Helmet =====================================-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_HazardOperationsArmorHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<Bulk>5.6</Bulk>
+			<WornBulk>1.1</WornBulk>
+			<MaxHitPoints>240</MaxHitPoints>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="SF_HazardOperationsArmorHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="SF_HazardOperationsArmorHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_HazardOperationsArmorHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<PsychicSensitivity>-1</PsychicSensitivity>
+				<AimingAccuracy>0.05</AimingAccuracy>
+				<ToxicEnvironmentResistance>1</ToxicEnvironmentResistance>
+				<ImmunityGainSpeed>0.1</ImmunityGainSpeed>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SF_HazardOperationsArmorHelmet"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>40</DevilstrandCloth>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_HazardOperationsArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_HazardOperationsArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>35</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_HazardOperationsArmorHelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SF_HazardOperationsArmorHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!-- ==================================== Diplomat Power Armor Helmet =====================================-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_DiplomatPowerArmorHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<MaxHitPoints>240</MaxHitPoints>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="SF_DiplomatPowerArmorHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="SF_DiplomatPowerArmorHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_DiplomatPowerArmorHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>0.05</AimingAccuracy>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+				<GlobalLearningFactor>0.1</GlobalLearningFactor>
+				<NegotiationAbility>0.15</NegotiationAbility>
+				<SocialImpact>0.25</SocialImpact>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SF_DiplomatPowerArmorHelmet"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>40</DevilstrandCloth>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_DiplomatPowerArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_DiplomatPowerArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>40</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_DiplomatPowerArmorHelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SF_DiplomatPowerArmorHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!-- ==================================== Defender Power Armor Helmet =====================================-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_DefenderPowerArmorHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<Bulk>4.5</Bulk>
+			<WornBulk>0.9</WornBulk>
+			<MaxHitPoints>240</MaxHitPoints>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="SF_DefenderPowerArmorHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="SF_DefenderPowerArmorHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_DefenderPowerArmorHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>0.15</AimingAccuracy>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+				<MedicalTendQuality>0.10</MedicalTendQuality>
+				<MedicalOperationSpeed>0.15</MedicalOperationSpeed>
+				<SurgerySuccessChanceFactor>0.15</SurgerySuccessChanceFactor>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SF_DefenderPowerArmorHelmet"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>40</DevilstrandCloth>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_DefenderPowerArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>21</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_DefenderPowerArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>58</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_DefenderPowerArmorHelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SF_DefenderPowerArmorHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!-- ==================================== Scout Power Armor Helmet =====================================-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ScoutPowerArmorHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<MaxHitPoints>240</MaxHitPoints>
+			<NightVisionEfficiency_Apparel>0.7</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="SF_ScoutPowerArmorHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="SF_ScoutPowerArmorHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ScoutPowerArmorHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>0.5</AimingAccuracy>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+				<AimingDelayFactor>0.2</AimingDelayFactor>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SF_ScoutPowerArmorHelmet"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>40</DevilstrandCloth>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ScoutPowerArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ScoutPowerArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ScoutPowerArmorHelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SF_ScoutPowerArmorHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!-- ==================================== Samurai Power Armor Helmet =====================================-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_SamuraiPowerArmorHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<MaxHitPoints>240</MaxHitPoints>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="SF_SamuraiPowerArmorHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="SF_SamuraiPowerArmorHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_SamuraiPowerArmorHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<PsychicSensitivity>-0.08</PsychicSensitivity>
+				<ToxicEnvironmentResistance>0.20</ToxicEnvironmentResistance>
+				<MeleeHitChance>0.15</MeleeHitChance>
+				<MeleeCritChance>0.35</MeleeCritChance>
+				<MeleeDodgeChance>0.05</MeleeDodgeChance>
+				<MeleeParryChance>0.1</MeleeParryChance>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SF_SamuraiPowerArmorHelmet"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>40</DevilstrandCloth>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_SamuraiPowerArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_SamuraiPowerArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_SamuraiPowerArmorHelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SF_SamuraiPowerArmorHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!-- ==================================== Shock Trooper Armor Helmet =====================================-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ShockTrooperArmorHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<MaxHitPoints>240</MaxHitPoints>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="SF_ShockTrooperArmorHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="SF_ShockTrooperArmorHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ShockTrooperArmorHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<PsychicSensitivity>-0.08</PsychicSensitivity>
+				<ToxicEnvironmentResistance>0.20</ToxicEnvironmentResistance>
+				<MeleeHitChance>0.075</MeleeHitChance>
+				<MeleeCritChance>0.15</MeleeCritChance>
+				<MeleeDodgeChance>0.025</MeleeDodgeChance>
+				<MeleeParryChance>0.05</MeleeParryChance>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SF_ShockTrooperArmorHelmet"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>40</DevilstrandCloth>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ShockTrooperArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ShockTrooperArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>44</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ShockTrooperArmorHelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SF_ShockTrooperArmorHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!-- ==================================== Recon Power Armor Helmet =====================================-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ReconPowerArmorHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<Bulk>4.5</Bulk>
+			<WornBulk>0.9</WornBulk>
+			<MaxHitPoints>240</MaxHitPoints>
+			<NightVisionEfficiency_Apparel>0.7</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ReconPowerArmorHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>0.15</AimingAccuracy>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+				<GeneralLaborSpeed>0.15</GeneralLaborSpeed>
+				<SmeltingSpeed>0.20</SmeltingSpeed>
+				<SmoothingSpeed>0.05</SmoothingSpeed>
+				<ForagedNutritionPerDay>6</ForagedNutritionPerDay>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SF_ReconPowerArmorHelmet"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>40</DevilstrandCloth>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ReconPowerArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ReconPowerArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>33</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SF_ReconPowerArmorHelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SF_ReconPowerArmorHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Spidercamp's Horses/Patches/Spidercamp's Horses/SpidercampsHorses_Races_Animal_Horse.xml b/ModPatches/Spidercamp's Horses/Patches/Spidercamp's Horses/SpidercampsHorses_Races_Animal_Horse.xml
new file mode 100644
index 0000000000..9614b91f29
--- /dev/null
+++ b/ModPatches/Spidercamp's Horses/Patches/Spidercamp's Horses/SpidercampsHorses_Races_Animal_Horse.xml	
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Horse Melee ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[
+			defName="SCQuarterHorse" or
+			defName="SCBlackHorse" or
+			defName="SCWhiteHorse" or
+			defName="SCPalomino"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="SCQuarterHorse" or
+			defName="SCBlackHorse" or
+			defName="SCWhiteHorse" or
+			defName="SCPalomino"
+			]/statBases </xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.39</MeleeCritChance>
+			<MeleeParryChance>0.24</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="SCQuarterHorse" or
+			defName="SCBlackHorse" or
+			defName="SCWhiteHorse" or
+			defName="SCPalomino"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.97</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Star Crafter's Armory/Patches/Star Crafter's Armory/CMC300.xml b/ModPatches/Star Crafter's Armory/Patches/Star Crafter's Armory/CMC300.xml
new file mode 100644
index 0000000000..f06387d049
--- /dev/null
+++ b/ModPatches/Star Crafter's Armory/Patches/Star Crafter's Armory/CMC300.xml	
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==================== CMC300a Armor =====================-->
+
+	<!--Clumbersome armor with a carbon fiber helmet? for real?-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CMC300a"]/statBases</xpath>
+		<value>
+			<Bulk>200</Bulk>
+			<WornBulk>30</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- Mass Produced...I guess?-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMC300a"]/statBases/WorkToMake</xpath>
+		<value>
+			<WorkToMake>65000</WorkToMake>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMC300a"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>1000</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMC300a"]/statBases/Mass</xpath>
+		<value>
+			<Mass>175</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMC300a"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMC300a"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>32</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMC300a"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>150</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMC300a"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>200</Plasteel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CMC300a"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>80</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CMC300a"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>175</CarryWeight>
+			<CarryBulk>30</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="CMC300a"]/equippedStatOffsets/ToxicSensitivity</xpath>
+		<match Class="PatchOperationRemove">
+			<xpath>Defs/ThingDef[defName="CMC300a"]/equippedStatOffsets/ToxicSensitivity</xpath>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="CMC300a"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
+		<match Class="PatchOperationReplace">
+			<xpath>Defs/ThingDef[defName="CMC300a"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
+			<value>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+			</value>
+		</match>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="CMC300a"]/equippedStatOffsets</xpath>
+			<value>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<!-- ==================== CMC300 helmet =====================-->
+
+	<!-- Carbon fiber, so lightweight but low HP and flammable-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CMC300H" or defName="CMC300Ha" or defName="CMC300Hb"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMC300H" or defName="CMC300Ha" or defName="CMC300Hb"]/statBases/Mass</xpath>
+		<value>
+			<Mass>5</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMC300H" or defName="CMC300Ha" or defName="CMC300Hb"]/statBases/WorkToMake</xpath>
+		<value>
+			<WorkToMake>20000</WorkToMake>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMC300H" or defName="CMC300Ha" or defName="CMC300Hb"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>220</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMC300H" or defName="CMC300Ha" or defName="CMC300Hb"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>24</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMC300H" or defName="CMC300Ha" or defName="CMC300Hb"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>60</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CMC300H" or defName="CMC300Ha" or defName="CMC300Hb"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingAccuracy>0.15</AimingAccuracy>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="CMC300H" or defName="CMC300Ha" or defName="CMC300Hb"]/equippedStatOffsets/ToxicSensitivity</xpath>
+		<match Class="PatchOperationRemove">
+			<xpath>Defs/ThingDef[defName="CMC300H" or defName="CMC300Ha" or defName="CMC300Hb"]/equippedStatOffsets/ToxicSensitivity</xpath>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="CMC300H" or defName="CMC300Ha" or defName="CMC300Hb"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
+		<match Class="PatchOperationReplace">
+			<xpath>Defs/ThingDef[defName="CMC300H" or defName="CMC300Ha" or defName="CMC300Hb"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
+			<value>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+			</value>
+		</match>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="CMC300H" or defName="CMC300Ha" or defName="CMC300Hb"]/equippedStatOffsets</xpath>
+			<value>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMC300H" or defName="CMC300Ha" or defName="CMC300Hb"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>60</Plasteel>
+			<Steel>60</Steel>
+			<DevilstrandCloth>25</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CMC300H" or defName="CMC300Ha" or defName="CMC300Hb"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="CMC300H" or defName="CMC300Ha" or defName="CMC300Hb"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Star Crafter's Armory/Patches/Star Crafter's Armory/CMC405.xml b/ModPatches/Star Crafter's Armory/Patches/Star Crafter's Armory/CMC405.xml
new file mode 100644
index 0000000000..8dfe1f8e1e
--- /dev/null
+++ b/ModPatches/Star Crafter's Armory/Patches/Star Crafter's Armory/CMC405.xml	
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==================== CMC405a Armor =====================-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CMC405a"]/statBases</xpath>
+		<value>
+			<Bulk>135</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PPSa"]/statBases/WorkToMake</xpath>
+		<value>
+			<WorkToMake>95000</WorkToMake>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMC405a"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>750</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMC405a"]/statBases/Mass</xpath>
+		<value>
+			<Mass>125</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMC405a"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMC405a"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>24</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMC405a"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>90</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CMC405a"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>80</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMC405a"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>200</Plasteel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMC405a"]/costList/ComponentIndustrial</xpath>
+		<value>
+			<ComponentSpacer>6</ComponentSpacer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CMC405a"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>150</CarryWeight>
+			<CarryBulk>30</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="CMC405a"]/equippedStatOffsets/ToxicSensitivity</xpath>
+		<match Class="PatchOperationRemove">
+			<xpath>Defs/ThingDef[defName="CMC405a"]/equippedStatOffsets/ToxicSensitivity</xpath>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="CMC405a"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
+		<match Class="PatchOperationReplace">
+			<xpath>Defs/ThingDef[defName="CMC405a"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
+			<value>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+			</value>
+		</match>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="CMC405a"]/equippedStatOffsets</xpath>
+			<value>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<!-- ==================== CMC-405 helmet =====================-->
+
+	<!--100% night vision because of "integrated x ray"-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CMC405H"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>1</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMC405H"]/statBases/WorkToMake</xpath>
+		<value>
+			<WorkToMake>30000</WorkToMake>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMC405H"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMC405H"]/statBases/Mass</xpath>
+		<value>
+			<Mass>8.5</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMC405H"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>320</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMC405H"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>21</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMC405H"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>70</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CMC405H"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingAccuracy>0.15</AimingAccuracy>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="CMC405H"]/equippedStatOffsets/ToxicSensitivity</xpath>
+		<match Class="PatchOperationRemove">
+			<xpath>Defs/ThingDef[defName="CMC405H"]/equippedStatOffsets/ToxicSensitivity</xpath>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="CMC405H"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
+		<match Class="PatchOperationReplace">
+			<xpath>Defs/ThingDef[defName="CMC405H"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
+			<value>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+			</value>
+		</match>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="CMC405H"]/equippedStatOffsets</xpath>
+			<value>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CMC405H"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>90</Plasteel>
+			<DevilstrandCloth>25</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CMC405H"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="CMC405H"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Star Crafter's Armory/Patches/Star Crafter's Armory/PPS.xml b/ModPatches/Star Crafter's Armory/Patches/Star Crafter's Armory/PPS.xml
new file mode 100644
index 0000000000..12f45ae96b
--- /dev/null
+++ b/ModPatches/Star Crafter's Armory/Patches/Star Crafter's Armory/PPS.xml	
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==================== PPS Armor =====================-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PPSa"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PPSa"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>1000</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PPSa"]/statBases/WorkToMake</xpath>
+		<value>
+			<WorkToMake>95000</WorkToMake>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PPSa"]/statBases/Mass</xpath>
+		<value>
+			<Mass>150</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PPSa"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="PPSa"]/equippedStatOffsets/ToxicSensitivity</xpath>
+		<match Class="PatchOperationRemove">
+			<xpath>Defs/ThingDef[defName="PPSa"]/equippedStatOffsets/ToxicSensitivity</xpath>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="PPSa"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
+		<match Class="PatchOperationReplace">
+			<xpath>Defs/ThingDef[defName="PPSa"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
+			<value>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+			</value>
+		</match>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="PPSa"]/equippedStatOffsets</xpath>
+			<value>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PPSa"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>28</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PPSa"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>120</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PPSa"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>325</Plasteel>
+			<DevilstrandCloth>80</DevilstrandCloth>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PPSa"]/costList/Uranium</xpath>
+		<value>
+			<Uranium>100</Uranium>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PPSa"]/costList/Steel</xpath>
+		<value>
+			<ComponentIndustrial>20</ComponentIndustrial>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PPSa"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>225</CarryWeight>
+			<CarryBulk>50</CarryBulk>
+		</value>
+	</Operation>
+
+	<!-- ==================== PPS helmet =====================-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PPSH"]/statBases</xpath>
+		<value>
+			<Bulk>25</Bulk>
+			<WornBulk>5</WornBulk>
+			<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PPSH"]/statBases/WorkToMake</xpath>
+		<value>
+			<WorkToMake>30000</WorkToMake>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PPSH"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PPSH"]/statBases/Mass</xpath>
+		<value>
+			<Mass>15</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PPSH"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>320</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PPSH"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PPSH"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>70</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PPSH"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingAccuracy>0.15</AimingAccuracy>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PPSH"]/equippedStatOffsets/ToxicSensitivity</xpath>
+		<value>
+			<ToxicEnvironmentResistance>-0.5</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="PPSH"]/equippedStatOffsets/ToxicSensitivity</xpath>
+		<match Class="PatchOperationRemove">
+			<xpath>Defs/ThingDef[defName="PPSH"]/equippedStatOffsets/ToxicSensitivity</xpath>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="PPSH"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
+		<match Class="PatchOperationReplace">
+			<xpath>Defs/ThingDef[defName="PPSH"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
+			<value>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+			</value>
+		</match>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="PPSH"]/equippedStatOffsets</xpath>
+			<value>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PPSH"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>150</Plasteel>
+			<DevilstrandCloth>35</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PPSH"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="PPSH"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Star Crafter's Armory/Patches/Star Crafter's Armory/Weapons.xml b/ModPatches/Star Crafter's Armory/Patches/Star Crafter's Armory/Weapons.xml
new file mode 100644
index 0000000000..18772e4de8
--- /dev/null
+++ b/ModPatches/Star Crafter's Armory/Patches/Star Crafter's Armory/Weapons.xml	
@@ -0,0 +1,522 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CoS_C14_D_Gun" or defName="CoS_C14_Gun" or defName="CoS_C20_Gun" or defName="CoS_P45_Gun" or defName="CoS_Perdition_Flamethrower"]/recipeMaker/recipeUsers</xpath>
+		<value>
+			<recipeUsers>
+				<li>FabricationBench</li>
+			</recipeUsers>
+		</value>
+	</Operation>
+
+	<!-- ========== C14D ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CoS_C14_D_Gun</defName>
+		<statBases>
+			<Mass>20</Mass>
+			<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.3</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.34</SwayFactor>
+			<Bulk>25.5</Bulk>
+			<WorkToMake>65000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>240</Steel>
+			<Plasteel>150</Plasteel>
+			<ComponentIndustrial>10</ComponentIndustrial>
+			<ComponentSpacer>3</ComponentSpacer>
+		</costList>
+		<Properties>
+			<recoilAmount>2.25</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8mmRailgun_Sabot</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>65</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>Shot_C14</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_8mmRailgun</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CoS_C14_D_Gun"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</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>12</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>12</power>
+					<cooldownTime>1.55</cooldownTime>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</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>
+
+	<!-- ========== C14 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CoS_C14_Gun</defName>
+		<statBases>
+			<Mass>20</Mass>
+			<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.3</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.34</SwayFactor>
+			<Bulk>25.5</Bulk>
+			<WorkToMake>65000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>220</Steel>
+			<Plasteel>150</Plasteel>
+			<ComponentIndustrial>10</ComponentIndustrial>
+			<ComponentSpacer>3</ComponentSpacer>
+		</costList>
+		<Properties>
+			<recoilAmount>2.25</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8mmRailgun_Sabot</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>65</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>Shot_C14</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_8mmRailgun</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CoS_C14_Gun"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</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>12</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>12</power>
+					<cooldownTime>1.55</cooldownTime>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== C20A ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CoS_C20_Gun</defName>
+		<statBases>
+			<Mass>9.45</Mass>
+			<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+			<SwayFactor>2.40</SwayFactor>
+			<ShotSpread>0.1</ShotSpread>
+			<SightsEfficiency>2.45</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.86</RangedWeapon_Cooldown>
+			<Bulk>11.55</Bulk>
+			<WorkToMake>58000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>150</Steel>
+			<Plasteel>100</Plasteel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+			<ComponentSpacer>5</ComponentSpacer>
+		</costList>
+		<Properties>
+			<recoilAmount>2.25</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8mmRailgun_Sabot</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>86</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
+			<soundCast>Shot_TurretSniper</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>20</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_8mmRailgun</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>False</aiUseBurstMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>CE_AI_SR</li>
+			<li>Bipod_AMR</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CoS_C20_Gun"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</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>12</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>12</power>
+					<cooldownTime>1.55</cooldownTime>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== P45 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CoS_P45_Gun</defName>
+		<statBases>
+			<Mass>10.5</Mass>
+			<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.12</SwayFactor>
+			<Bulk>8.5</Bulk>
+			<WorkToMake>35000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>55</Steel>
+			<Plasteel>50</Plasteel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+			<ComponentSpacer>2</ComponentSpacer>
+		</costList>
+		<Properties>
+			<recoilAmount>1.25</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6mmRailgun_Sabot</defaultProjectile>
+			<warmupTime>0.8</warmupTime>
+			<range>18</range>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>Shot_Revolver</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>45</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_6mmRailgun</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CoS_P45_Gun"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>CoS_Perdition_Flamethrower</defName>
+		<statBases>
+			<Mass>8.00</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.5</ShotSpread>
+			<SwayFactor>4</SwayFactor>
+			<Bulk>13.00</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<recoilAmount>0.85</recoilAmount>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Flamethrower_Prometheum</defaultProjectile>
+			<burstShotCount>30</burstShotCount>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<warmupTime>1</warmupTime>
+			<range>20</range>
+			<minRange>3</minRange>
+			<soundCast>Shot_PERDITION</soundCast>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>120</magazineSize>
+			<reloadTime>8</reloadTime>
+			<ammoSet>AmmoSet_Flamethrower</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>15</aimedBurstShotCount>
+			<noSingleShot>True</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CoS_Perdition_Flamethrower"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.49</cooldownTime>
+					<chanceFactor>0.3</chanceFactor>
+					<armorPenetrationBlunt>15.375</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--
+	<li Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CoS_CombatMedicShield"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shield face</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.49</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>5.375</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shield corner</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.30</cooldownTime>
+					<armorPenetrationBlunt>10.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</li>
+	-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="CoS_CombatMedicShield"]</xpath>
+		<value>
+			<ThingDef ParentName="ShieldBase">
+				<defName>CoS_CombatMedicShield</defName>
+				<label>Combat Medic Shield</label>
+				<description>A plasteel alloy combat shield designed for medical staff to carry during battle. Tough and bulky, it will straight out reduce incoming damage in a percentage and can be used as a bash weapon.</description>
+				<graphicData>
+					<texPath>Things/Shield/CombatMedicShield</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<techLevel>Spacer</techLevel>
+				<costStuffCount>50</costStuffCount>
+				<stuffCategories>
+					<li>Steeled</li>
+				</stuffCategories>
+				<recipeMaker>
+					<researchPrerequisite>Fabrication</researchPrerequisite>
+					<recipeUsers Inherit="False">
+						<li>FabricationBench</li>
+					</recipeUsers>
+				</recipeMaker>
+				<costList>
+					<Plasteel>100</Plasteel>
+					<ComponentSpacer>5</ComponentSpacer>
+				</costList>
+				<statBases>
+					<WorkToMake>25000</WorkToMake>
+					<MaxHitPoints>125</MaxHitPoints>
+					<StuffEffectMultiplierArmor>10</StuffEffectMultiplierArmor>
+					<Mass>13</Mass>
+					<Bulk>15</Bulk>
+					<WornBulk>10</WornBulk>
+				</statBases>
+				<equippedStatOffsets>
+					<IncomingDamageFactor>-0.35</IncomingDamageFactor>
+					<ReloadSpeed>-0.3</ReloadSpeed>
+					<MeleeHitChance>-4</MeleeHitChance>
+					<ShootingAccuracyPawn>-0.4</ShootingAccuracyPawn>
+					<AimingAccuracy>-0.2</AimingAccuracy>
+					<Suppressability>-0.5</Suppressability>
+					<MeleeCritChance>-0.2</MeleeCritChance>
+					<MeleeParryChance>1.0</MeleeParryChance>
+				</equippedStatOffsets>
+				<modExtensions>
+					<li Class="CombatExtended.ShieldDefExtension">
+						<shieldCoverage>
+							<li>Hands</li>
+							<li>Arms</li>
+							<li>Shoulders</li>
+							<li>Torso</li>
+							<li>Neck</li>
+							<li>FullHead</li>
+						</shieldCoverage>
+						<crouchCoverage>
+							<li>Legs</li>
+						</crouchCoverage>
+						<drawAsTall>true</drawAsTall>
+					</li>
+				</modExtensions>
+			</ThingDef>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Star Wars - Factions/Defs/Star Wars - Factions/Patch_DamageDefs.xml b/ModPatches/Star Wars - Factions/Defs/Star Wars - Factions/Patch_DamageDefs.xml
new file mode 100644
index 0000000000..706cef7e95
--- /dev/null
+++ b/ModPatches/Star Wars - Factions/Defs/Star Wars - Factions/Patch_DamageDefs.xml	
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<DamageDef>
+		<defName>PJ_BlasterDam</defName>
+		<label>Blaster bolt</label>
+		<workerClass>DamageWorker_AddInjury</workerClass>
+		<externalViolence>true</externalViolence>
+		<isExplosive>true</isExplosive>
+		<deathMessage>{0} has been blasted!</deathMessage>
+		<hediff>Burn</hediff>
+		<harmAllLayersUntilOutside>true</harmAllLayersUntilOutside>
+		<impactSoundType>Blunt</impactSoundType>
+		<armorCategory>Sharp</armorCategory>
+		<minDamageToFragment>15</minDamageToFragment>
+		<defaultDamage>3</defaultDamage>
+		<buildingDamageFactor>3</buildingDamageFactor>
+		<plantDamageFactor>3</plantDamageFactor>
+		<explosionAffectOutsidePartsOnly>false</explosionAffectOutsidePartsOnly>
+		<explosionHeatEnergyPerCell>5</explosionHeatEnergyPerCell>
+		<explosionCellFleck>BlastFlame</explosionCellFleck>
+		<explosionColorCenter>(1, 0.5, 0.3)</explosionColorCenter>
+		<explosionColorEdge>(0.6, 0.5, 0.4)</explosionColorEdge>
+		<soundExplosion>Explosion_Flame</soundExplosion>
+		<combatLogRules>Damage_Flame</combatLogRules>
+		<canUseDeflectMetalEffect>false</canUseDeflectMetalEffect>
+	</DamageDef>
+
+	<DamageDef>
+		<defName>SW_Stun_Damage</defName>
+		<label>stun</label>
+		<workerClass>DamageWorker_AddInjury</workerClass>
+		<externalViolence>true</externalViolence>
+		<deathMessage>{0} has been shocked to death.</deathMessage>
+		<hediff>Burn</hediff>
+		<hediffSolid>Burn</hediffSolid>
+		<harmAllLayersUntilOutside>true</harmAllLayersUntilOutside>
+		<impactSoundType>Slice</impactSoundType>
+		<armorCategory>Sharp</armorCategory>
+		<additionalHediffs>
+			<li>
+				<hediff>SW_Stun</hediff>
+			</li>
+		</additionalHediffs>
+	</DamageDef>
+
+	<HediffDef>
+		<defName>SW_Stun</defName>
+		<label>stunned</label>
+		<description>Stunned</description>
+		<hediffClass>HediffWithComps</hediffClass>
+		<defaultLabelColor>(1, 0.2, 0.2)</defaultLabelColor>
+		<comps>
+			<li Class="CombatExtended.HediffCompProperties_FleshOnly"/>
+			<li Class="HediffCompProperties_Disappears">
+				<disappearsAfterTicks>
+					<min>1200</min>
+					<max>2100</max>
+				</disappearsAfterTicks>
+			</li>
+		</comps>
+		<stages>
+			<li>
+				<label>trivial</label>
+			</li>
+			<li>
+				<minSeverity>0.2</minSeverity>
+				<label>minor</label>
+				<capMods>
+					<li>
+						<capacity>Consciousness</capacity>
+						<offset>-0.25</offset>
+					</li>
+
+				</capMods>
+			</li>
+			<li>
+				<minSeverity>0.40</minSeverity>
+				<label>moderate</label>
+				<capMods>
+					<li>
+						<capacity>Consciousness</capacity>
+						<offset>-0.5</offset>
+					</li>
+
+				</capMods>
+			</li>
+			<li>
+				<minSeverity>0.6</minSeverity>
+				<label>severe</label>
+				<capMods>
+					<li>
+						<capacity>Consciousness</capacity>
+						<setMax>0.1</setMax>
+					</li>
+
+				</capMods>
+			</li>
+			<li>
+				<minSeverity>0.8</minSeverity>
+				<label>extreme</label>
+				<lifeThreatening>true</lifeThreatening>
+				<capMods>
+					<li>
+						<capacity>Consciousness</capacity>
+						<setMax>0.1</setMax>
+					</li>
+
+				</capMods>
+			</li>
+		</stages>
+	</HediffDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Star Wars - Factions/Defs/Star Wars - Factions/PlasmaGasCartridge.xml b/ModPatches/Star Wars - Factions/Defs/Star Wars - Factions/PlasmaGasCartridge.xml
new file mode 100644
index 0000000000..c611cb2542
--- /dev/null
+++ b/ModPatches/Star Wars - Factions/Defs/Star Wars - Factions/PlasmaGasCartridge.xml	
@@ -0,0 +1,358 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>AmmoSWPlasmaGasCartridge</defName>
+		<label>Plasma Gas Cartridges</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_SWPlasmaGasCartridge</defName>
+		<label>Plasma Gas Cartridges</label>
+		<ammoTypes>
+			<Ammo_SWPlasmaGasCartridge>Bullet_SWPlasmaGasCartridge</Ammo_SWPlasmaGasCartridge>
+			<Ammo_SWPlasmaGasCartridge_AP>Bullet_SWPlasmaGasCartridge_AP</Ammo_SWPlasmaGasCartridge_AP>
+			<Ammo_SWPlasmaGasCartridge_Ion>Bullet_SWPlasmaGasCartridge_Ion</Ammo_SWPlasmaGasCartridge_Ion>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_SWPlasmaGasCartridgeBlue</defName>
+		<label>Plasma Gas Cartridges</label>
+		<ammoTypes>
+			<Ammo_SWPlasmaGasCartridge>Bullet_SWPlasmaGasCartridgeBlue</Ammo_SWPlasmaGasCartridge>
+			<Ammo_SWPlasmaGasCartridge_AP>Bullet_SWPlasmaGasCartridge_AP</Ammo_SWPlasmaGasCartridge_AP>
+			<Ammo_SWPlasmaGasCartridge_Ion>Bullet_SWPlasmaGasCartridge_Ion</Ammo_SWPlasmaGasCartridge_Ion>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_SWPlasmaGasCartridgeJawa</defName>
+		<label>Plasma Gas Cartridges</label>
+		<ammoTypes>
+			<Ammo_SWPlasmaGasCartridge_Ion>Bullet_SWPlasmaGasCartridge_Ion</Ammo_SWPlasmaGasCartridge_Ion>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Nym</defName>
+		<label>12 Gauge</label>
+		<ammoTypes>
+			<Ammo_12Gauge_Slug>Bullet_12Gauge_Slug</Ammo_12Gauge_Slug>
+			<Ammo_12Gauge_Beanbag>Bullet_12Gauge_Beanbag</Ammo_12Gauge_Beanbag>
+			<Ammo_12Gauge_ElectroSlug>Bullet_12Gauge_ElectroSlug</Ammo_12Gauge_ElectroSlug>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_SWBigPlasmaGasCartridge</defName>
+		<label>Big Plasma Gas Cartridges</label>
+		<ammoTypes>
+			<Ammo_SWPlasmaGasCartridge>Bullet_SWBigPlasmaGasCartridge</Ammo_SWPlasmaGasCartridge>
+			<Ammo_SWPlasmaGasCartridge_AP>Bullet_SWBigPlasmaGasCartridge_AP</Ammo_SWPlasmaGasCartridge_AP>
+			<Ammo_SWPlasmaGasCartridge_Ion>Bullet_SWBigPlasmaGasCartridge_Ion</Ammo_SWPlasmaGasCartridge_Ion>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="SWPlasmaGasCartridgeBase" ParentName="SpacerSmallAmmoBase" Abstract="True">
+		<description>Plasma gas cartridge ammo used by advanced assault rifle designs.</description>
+		<statBases>
+			<Mass>0.01</Mass>
+			<Bulk>0.03</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoSWPlasmaGasCartridge</li>
+		</thingCategories>
+		<stackLimit>500</stackLimit>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SWPlasmaGasCartridgeBase">
+		<defName>Ammo_SWPlasmaGasCartridge</defName>
+		<label>Plasma Gas Cartridges</label>
+		<graphicData>
+			<texPath>Things/Ammo/PlasmaCell/Heavy</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>1.38</MarketValue>
+		</statBases>
+		<ammoClass>Charged</ammoClass>
+		<generateAllowChance>1</generateAllowChance>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SWPlasmaGasCartridgeBase">
+		<defName>Ammo_SWPlasmaGasCartridge_AP</defName>
+		<label>Plasma Gas Cartridges (Imp)</label>
+		<graphicData>
+			<texPath>Things/Ammo/PlasmaCell/Heavy</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>2.32</MarketValue>
+		</statBases>
+		<ammoClass>ChargedAP</ammoClass>
+		<generateAllowChance>0.2</generateAllowChance>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SWPlasmaGasCartridgeBase">
+		<defName>Ammo_SWPlasmaGasCartridge_Ion</defName>
+		<label>Plasma Gas Cartridges (Stun)</label>
+		<graphicData>
+			<texPath>Things/Ammo/PlasmaCell/Heavy</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>1.78</MarketValue>
+		</statBases>
+		<ammoClass>Ionized</ammoClass>
+		<generateAllowChance>0</generateAllowChance>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef Name="BaseSWPlasmaGasCartridgeBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>PJ_BlasterDam</damageDef>
+			<speed>135</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseSWPlasmaGasCartridgeBullet">
+		<defName>Bullet_SWPlasmaGasCartridge</defName>
+		<label>Blaster Bolt</label>
+		<graphicData>
+			<texPath>Projectile/Blasterbolt</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>18</damageAmountBase>
+			<armorPenetrationBlunt>3</armorPenetrationBlunt>
+			<armorPenetrationSharp>16</armorPenetrationSharp>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseSWPlasmaGasCartridgeBullet">
+		<defName>Bullet_SWPlasmaGasCartridgeBlue</defName>
+		<label>Blaster Bolt</label>
+		<graphicData>
+			<texPath>Projectile/BlasterboltB</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>18</damageAmountBase>
+			<armorPenetrationBlunt>3</armorPenetrationBlunt>
+			<armorPenetrationSharp>16</armorPenetrationSharp>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseSWPlasmaGasCartridgeBullet">
+		<defName>Bullet_SWPlasmaGasCartridge_AP</defName>
+		<label>Blaster Bolt (Imp)</label>
+		<graphicData>
+			<texPath>Projectile/BlasterboltG</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationBlunt>3</armorPenetrationBlunt>
+			<armorPenetrationSharp>23</armorPenetrationSharp>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseSWPlasmaGasCartridgeBullet">
+		<defName>Bullet_SWPlasmaGasCartridge_Ion</defName>
+		<label>Blaster Bolt(Stun)</label>
+		<graphicData>
+			<texPath>Projectile/IonP</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>SW_Stun_Damage</damageDef>
+			<damageAmountBase>3</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>7</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationBlunt>3</armorPenetrationBlunt>
+			<armorPenetrationSharp>3</armorPenetrationSharp>
+			<speed>35</speed>
+			<gravityFactor>0.5</gravityFactor>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseSWPlasmaGasCartridgeBullet">
+		<defName>Bullet_SWBigPlasmaGasCartridge</defName>
+		<label>Big Blaster Bolt</label>
+		<graphicData>
+			<texPath>Projectile/BlasterboltBig</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationBlunt>3</armorPenetrationBlunt>
+			<armorPenetrationSharp>14</armorPenetrationSharp>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseSWPlasmaGasCartridgeBullet">
+		<defName>Bullet_SWBigPlasmaGasCartridge_AP</defName>
+		<label>Big Blaster Bolt (Conc.)</label>
+		<graphicData>
+			<texPath>Projectile/BlasterboltBigG</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>15</damageAmountBase>
+			<armorPenetrationBlunt>3</armorPenetrationBlunt>
+			<armorPenetrationSharp>22</armorPenetrationSharp>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseSWPlasmaGasCartridgeBullet">
+		<defName>Bullet_SWBigPlasmaGasCartridge_Ion</defName>
+		<label>Big Blaster Bolt(Ion)</label>
+		<graphicData>
+			<texPath>Projectile/IonP</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>SW_Stun_Damage</damageDef>
+			<damageAmountBase>3</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>7</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationBlunt>6</armorPenetrationBlunt>
+			<armorPenetrationSharp>6</armorPenetrationSharp>
+			<speed>35</speed>
+			<gravityFactor>0.5</gravityFactor>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_SWPlasmaGasCartridge</defName>
+		<label>make Plasma Gas Cartridges x100</label>
+		<description>Craft 100 Plasma Gas Cartridges .</description>
+		<jobString>Making Plasma Gas Cartridges .</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Plasteel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_SWPlasmaGasCartridge>100</Ammo_SWPlasmaGasCartridge>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_SWPlasmaGasCartridge_AP</defName>
+		<label>make Plasma Gas Cartridges (Conc.) x100</label>
+		<description>Craft 100 Plasma Gas Cartridges (Conc.) .</description>
+		<jobString>Making Plasma Gas Cartridges (Conc.) .</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Plasteel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_SWPlasmaGasCartridge_AP>100</Ammo_SWPlasmaGasCartridge_AP>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_SWPlasmaGasCartridge_Ion</defName>
+		<label>make Plasma Gas Cartridges (Ion) x100</label>
+		<description>Craft 100 SWPlasmaGas Cartridges (Ion) .</description>
+		<jobString>Making Plasma Gas Cartridges (Ion) .</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Plasteel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_SWPlasmaGasCartridge_Ion>100</Ammo_SWPlasmaGasCartridge_Ion>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Star Wars - Factions/Patches/Star Wars - Factions/Patch_Apparel.xml b/ModPatches/Star Wars - Factions/Patches/Star Wars - Factions/Patch_Apparel.xml
new file mode 100644
index 0000000000..394ebb668c
--- /dev/null
+++ b/ModPatches/Star Wars - Factions/Patches/Star Wars - Factions/Patch_Apparel.xml	
@@ -0,0 +1,823 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="PJ_ImpUniform" or
+			defName="PJ_ImpNAVYSHELL" or
+			defName="PJ_ImpUniformBrownSHELL" or
+			defName="PJ_STOffUniform" or
+			defName="PJ_ImpUniformISBSHELL" or
+			defName="PJ_ImpUniformGrnSHELL" or
+			defName="PJ_ImpUniformBlackSHELL" or
+			defName="PJ_ImpUniformBlack"
+			]/statBases </xpath>
+		<value>
+			<Bulk>4</Bulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PJ_ImpUniform" or
+			defName="PJ_ImpNAVYSHELL" or
+			defName="PJ_ImpUniformBrownSHELL" or
+			defName="PJ_STOffUniform" or
+			defName="PJ_ImpUniformISBSHELL" or
+			defName="PJ_ImpUniformGrnSHELL" or
+			defName="PJ_ImpUniformBlackSHELL" or
+			defName="PJ_ImpUniformBlack"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PJ_ImpUniform" or
+			defName="PJ_ImpNAVYSHELL" or
+			defName="PJ_ImpUniformBrownSHELL" or
+			defName="PJ_STOffUniform" or
+			defName="PJ_ImpUniformISBSHELL" or
+			defName="PJ_ImpUniformGrnSHELL" or
+			defName="PJ_ImpUniformBlackSHELL" or
+			defName="PJ_ImpUniformBlack"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PJ_ImpUniform" or
+			defName="PJ_ImpNAVYSHELL" or
+			defName="PJ_ImpUniformBrownSHELL" or
+			defName="PJ_STOffUniform" or
+			defName="PJ_ImpUniformISBSHELL" or
+			defName="PJ_ImpUniformGrnSHELL" or
+			defName="PJ_ImpUniformBlackSHELL" or
+			defName="PJ_ImpUniformBlack"
+			]/statBases/ArmorRating_Heat </xpath>
+		<value>
+			<ArmorRating_Heat>0.15</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="PJ_TroopArmor" or
+			defName="PJ_TroopArmorJO" or
+			defName="PJ_TroopArmorNCO" or
+			defName="PJ_TroopArmorSO" or
+			defName="PJ_TroopArmorSh" or
+			defName="PJ_TroopArmorShC" or
+			defName="PJ_TroopArmorShSL" or
+			defName="PJ_TroopArmorDT" or
+			defName="PJ_TroopArmorDTC"
+			]/statBases </xpath>
+		<value>
+			<Bulk>80</Bulk>
+			<WornBulk>12</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PJ_TroopArmor" or
+			defName="PJ_TroopArmorJO" or
+			defName="PJ_TroopArmorNCO" or
+			defName="PJ_TroopArmorSO" or
+			defName="PJ_TroopArmorSh" or
+			defName="PJ_TroopArmorShC" or
+			defName="PJ_TroopArmorShSL" or
+			defName="PJ_TroopArmorDT" or
+			defName="PJ_TroopArmorDTC"
+			]/statBases/MaxHitPoints </xpath>
+		<value>
+			<MaxHitPoints>400</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PJ_TroopArmor" or
+			defName="PJ_TroopArmorJO" or
+			defName="PJ_TroopArmorNCO" or
+			defName="PJ_TroopArmorSO" or
+			defName="PJ_TroopArmorSh" or
+			defName="PJ_TroopArmorShC" or
+			defName="PJ_TroopArmorShSL" or
+			defName="PJ_TroopArmorDT" or
+			defName="PJ_TroopArmorDTC"
+			]/statBases/Mass </xpath>
+		<value>
+			<Mass>30</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PJ_TroopArmor" or
+			defName="PJ_TroopArmorJO" or
+			defName="PJ_TroopArmorNCO" or
+			defName="PJ_TroopArmorSO" or
+			defName="PJ_TroopArmorSh" or
+			defName="PJ_TroopArmorShC" or
+			defName="PJ_TroopArmorShSL" or
+			defName="PJ_TroopArmorDT" or
+			defName="PJ_TroopArmorDTC"
+			]/costList </xpath>
+		<value>
+			<costList>
+				<Steel>24</Steel>
+				<Plasteel>80</Plasteel>
+				<ComponentIndustrial>6</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PJ_TroopArmor" or
+			defName="PJ_TroopArmorJO" or
+			defName="PJ_TroopArmorNCO" or
+			defName="PJ_TroopArmorSO" or
+			defName="PJ_TroopArmorSh" or
+			defName="PJ_TroopArmorShC" or
+			defName="PJ_TroopArmorShSL" or
+			defName="PJ_TroopArmorDT" or
+			defName="PJ_TroopArmorDTC"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PJ_TroopArmor" or
+			defName="PJ_TroopArmorJO" or
+			defName="PJ_TroopArmorNCO" or
+			defName="PJ_TroopArmorSO" or
+			defName="PJ_TroopArmorSh" or
+			defName="PJ_TroopArmorShC" or
+			defName="PJ_TroopArmorShSL" or
+			defName="PJ_TroopArmorDT" or
+			defName="PJ_TroopArmorDTC"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<!--
+<li Class="PatchOperationReplace">
+	<xpath>Defs/ThingDef[
+	defName="PJ_TroopArmor" or
+	defName="PJ_TroopArmorJO" or
+	defName="PJ_TroopArmorNCO" or
+	defName="PJ_TroopArmorSO" or
+	defName="PJ_TroopArmorSh" or
+	defName="PJ_TroopArmorShC" or
+	defName="PJ_TroopArmorShSL" or
+	defName="PJ_TroopArmorDT" or
+	defName="PJ_TroopArmorDTC"
+	]/statBases/ArmorRating_Sharp</xpath>
+	<value>
+		<ArmorRating_Heat>0.54</ArmorRating_Heat>
+	</value>
+</li>
+-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="PJ_TroopArmor" or
+			defName="PJ_TroopArmorJO" or
+			defName="PJ_TroopArmorNCO" or
+			defName="PJ_TroopArmorSO" or
+			defName="PJ_TroopArmorSh" or
+			defName="PJ_TroopArmorShC" or
+			defName="PJ_TroopArmorShSL" or
+			defName="PJ_TroopArmorDT" or
+			defName="PJ_TroopArmorDTC"
+			]/costList </xpath>
+		<value>
+			<DevilstrandCloth>40</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="PJ_TroopArmor" or
+			defName="PJ_TroopArmorJO" or
+			defName="PJ_TroopArmorNCO" or
+			defName="PJ_TroopArmorSO" or
+			defName="PJ_TroopArmorSh" or
+			defName="PJ_TroopArmorShC" or
+			defName="PJ_TroopArmorShSL" or
+			defName="PJ_TroopArmorDT" or
+			defName="PJ_TroopArmorDTC"
+			] </xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>15</CarryWeight>
+				<CarryBulk>22</CarryBulk>
+				<ToxicEnvironmentResistance>0.40</ToxicEnvironmentResistance>
+				<MoveSpeed>0.1</MoveSpeed>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="PJ_TroopArmor" or
+			defName="PJ_TroopArmorJO" or
+			defName="PJ_TroopArmorNCO" or
+			defName="PJ_TroopArmorSO" or
+			defName="PJ_TroopArmorSh" or
+			defName="PJ_TroopArmorShC" or
+			defName="PJ_TroopArmorShSL" or
+			defName="PJ_TroopArmorDT" or
+			defName="PJ_TroopArmorDTC"
+			]/apparel/bodyPartGroups </xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="PJ_STHelm" or
+			defName="PJ_SHHelm" or
+			defName="PJ_DTHelm" or
+			defName="PJ_SCTHelm" or
+			defName="PJ_RebHat" or
+			defName="PJ_RebLAVHat" or
+			defName="PJ_RebSnowHat" or
+			defName="PJ_RebScoutHat" or
+			defName="PJ_RebPilot_H_Blue" or
+			defName="PJ_RebPilot_H_Red" or
+			defName="PJ_ImpNavyH" or
+			defName="PJ_TIEHelm"
+			]/statBases </xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PJ_STHelm" or
+			defName="PJ_SHHelm" or
+			defName="PJ_DTHelm" or
+			defName="PJ_SCTHelm" or
+			defName="PJ_RebHat" or
+			defName="PJ_RebLAVHat" or
+			defName="PJ_RebSnowHat" or
+			defName="PJ_RebScoutHat" or
+			defName="PJ_RebPilot_H_Blue" or
+			defName="PJ_RebPilot_H_Red" or
+			defName="PJ_ImpNavyH" or
+			defName="PJ_TIEHelm"
+			]/statBases/MaxHitPoints </xpath>
+		<value>
+			<MaxHitPoints>190</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PJ_STHelm" or
+			defName="PJ_SHHelm" or
+			defName="PJ_DTHelm" or
+			defName="PJ_SCTHelm" or
+			defName="PJ_RebHat" or
+			defName="PJ_RebLAVHat" or
+			defName="PJ_RebSnowHat" or
+			defName="PJ_RebScoutHat" or
+			defName="PJ_RebPilot_H_Blue" or
+			defName="PJ_RebPilot_H_Red" or
+			defName="PJ_ImpNavyH" or
+			defName="PJ_TIEHelm"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PJ_STHelm" or
+			defName="PJ_SHHelm" or
+			defName="PJ_DTHelm" or
+			defName="PJ_SCTHelm" or
+			defName="PJ_RebHat" or
+			defName="PJ_RebLAVHat" or
+			defName="PJ_RebSnowHat" or
+			defName="PJ_RebScoutHat" or
+			defName="PJ_RebPilot_H_Blue" or
+			defName="PJ_RebPilot_H_Red" or
+			defName="PJ_ImpNavyH" or
+			defName="PJ_TIEHelm"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="PJ_STHelm" or defName="PJ_SHHelm"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="PJ_STHelm" or defName="PJ_SHHelm"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="PJ_STHelm" or
+			defName="PJ_SHHelm"
+			] </xpath>
+		<value>
+			<equippedStatOffsets>
+				<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="PJ_DTHelm" or
+			defName="PJ_SCTHelm" or
+			defName="PJ_TIEHelm"
+			] </xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>0.1</AimingAccuracy>
+				<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="PJ_STHelm" or
+			defName="PJ_SHHelm" or
+			defName="PJ_DTHelm" or
+			defName="PJ_SCTHelm" or
+			defName="PJ_RebHat" or
+			defName="PJ_RebLAVHat" or
+			defName="PJ_RebSnowHat" or
+			defName="PJ_RebScoutHat" or
+			defName="PJ_RebPilot_H_Blue" or
+			defName="PJ_RebPilot_H_Red" or
+			defName="PJ_ImpNavyH" or
+			defName="PJ_TIEHelm"
+			]/costList </xpath>
+		<value>
+			<DevilstrandCloth>15</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="PJ_STHelm" or
+			defName="PJ_SHHelm" or
+			defName="PJ_DTHelm" or
+			defName="PJ_SCTHelm" or
+			defName="PJ_RebHat" or
+			defName="PJ_RebLAVHat" or
+			defName="PJ_RebSnowHat" or
+			defName="PJ_RebScoutHat" or
+			defName="PJ_RebPilot_H_Blue" or
+			defName="PJ_RebPilot_H_Red" or
+			defName="PJ_ImpNavyH" or
+			defName="PJ_TIEHelm"
+			]/apparel/layers </xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!-- Mando -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="PJ_MandoArmor" or
+			defName="PJ_VetMandoArmor" or
+			defName="PJ_BarkMandoArmor"
+			]/statBases </xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PJ_MandoArmor" or
+			defName="PJ_VetMandoArmor" or
+			defName="PJ_BarkMandoArmor"
+			]/statBases/MaxHitPoints </xpath>
+		<value>
+			<MaxHitPoints>500</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PJ_MandoArmor" or
+			defName="PJ_VetMandoArmor" or
+			defName="PJ_BarkMandoArmor"
+			]/statBases/Mass </xpath>
+		<value>
+			<Mass>50</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PJ_MandoArmor" or
+			defName="PJ_VetMandoArmor" or
+			defName="PJ_BarkMandoArmor"
+			]/costList </xpath>
+		<value>
+			<costList>
+				<Steel>8</Steel>
+				<Plasteel>120</Plasteel>
+				<ComponentIndustrial>12</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PJ_MandoArmor" or
+			defName="PJ_VetMandoArmor" or
+			defName="PJ_BarkMandoArmor"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>22</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PJ_MandoArmor" or
+			defName="PJ_VetMandoArmor"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>35</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PJ_BarkMandoArmor"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>40</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="PJ_MandoArmor" or
+			defName="PJ_VetMandoArmor" or
+			defName="PJ_BarkMandoArmor"
+			]/costList </xpath>
+		<value>
+			<DevilstrandCloth>50</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="PJ_MandoArmor" or
+			defName="PJ_VetMandoArmor" or
+			defName="PJ_BarkMandoArmor"
+			] </xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>80</CarryWeight>
+				<CarryBulk>10</CarryBulk>
+				<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+				<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="PJ_MandoArmor" or
+			defName="PJ_VetMandoArmor" or
+			defName="PJ_BarkMandoArmor"
+			]/apparel/bodyPartGroups </xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="PJ_MandoHelm"
+			]/statBases </xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PJ_MandoHelm"
+			]/statBases/MaxHitPoints </xpath>
+		<value>
+			<MaxHitPoints>240</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PJ_MandoHelm"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>15.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PJ_MandoHelm"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>30</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="PJ_MandoHelm"
+			] </xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>0.15</AimingAccuracy>
+				<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="PJ_MandoHelm"
+			]/costList </xpath>
+		<value>
+			<DevilstrandCloth>20</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="PJ_MandoHelm"
+			]/apparel/layers </xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PJ_Apparel_XVestPlate"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PJ_Apparel_XVestPlate"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>125</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PJ_Apparel_XVestPlate"]/statBases/Mass</xpath>
+		<value>
+			<Mass>13</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="PJ_Apparel_XVestPlate"]/statBases/ArmorRating_Heat</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="PJ_Apparel_XVestPlate"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PJ_Apparel_XVestPlate"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PJ_Apparel_XVestPlate"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Vests -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PJ_Reb_CamoJacket" or
+			defName="PJ_Reb_ScoutLAVJacket" or
+			defName="PJ_Reb_ScoutJacket" or
+			defName="PJ_Reb_TroopJacket"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>5</WornBulk>
+			<!--<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>-->
+			<ArmorRating_Sharp>3</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PJ_Reb_CamoJacket" or
+			defName="PJ_Reb_ScoutLAVJacket" or
+			defName="PJ_Reb_ScoutJacket" or
+			defName="PJ_Reb_TroopJacket"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="PJ_Reb_CamoJacket" or
+			defName="PJ_Reb_ScoutLAVJacket" or
+			defName="PJ_Reb_ScoutJacket" or
+			defName="PJ_Reb_TroopJacket"
+			]/statBases/ArmorRating_Heat </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PJ_Reb_CamoJacket" or
+			defName="PJ_Reb_ScoutLAVJacket" or
+			defName="PJ_Reb_ScoutJacket" or
+			defName="PJ_Reb_TroopJacket"
+			]/statBases/Mass </xpath>
+		<value>
+			<Mass>4</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PJ_RebBFlight" or
+			defName="PJ_RebOfficer" or
+			defName="PJ_GenFlight_Y" or
+			defName="PJ_RebFlight"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>5</WornBulk>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PJ_RebBFlight" or
+			defName="PJ_RebOfficer" or
+			defName="PJ_GenFlight_Y" or
+			defName="PJ_RebFlight"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>3.75</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PJ_RebBFlight" or
+			defName="PJ_RebOfficer" or
+			defName="PJ_GenFlight_Y" or
+			defName="PJ_RebFlight"
+			]/statBases/Mass </xpath>
+		<value>
+			<Mass>4</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="PJ_CompArmor"
+			]/statBases </xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PJ_CompArmor"
+			]/statBases/MaxHitPoints </xpath>
+		<value>
+			<MaxHitPoints>500</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PJ_CompArmor"
+			]/statBases/Mass </xpath>
+		<value>
+			<Mass>50</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PJ_CompArmor"
+			]/costList </xpath>
+		<value>
+			<costList>
+				<Steel>8</Steel>
+				<Plasteel>120</Plasteel>
+				<ComponentIndustrial>12</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PJ_CompArmor"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>24</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PJ_CompArmor"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>32</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="PJ_CompArmor"
+			]/costList </xpath>
+		<value>
+			<DevilstrandCloth>50</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="PJ_CompArmor"
+			] </xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>80</CarryWeight>
+				<CarryBulk>10</CarryBulk>
+				<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+				<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="PJ_CompArmor"
+			]/apparel/bodyPartGroups </xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Star Wars - Factions/Patches/Star Wars - Factions/Patch_Melee.xml b/ModPatches/Star Wars - Factions/Patches/Star Wars - Factions/Patch_Melee.xml
new file mode 100644
index 0000000000..2d8257f954
--- /dev/null
+++ b/ModPatches/Star Wars - Factions/Patches/Star Wars - Factions/Patch_Melee.xml	
@@ -0,0 +1,424 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PJ_Vibrosword"]/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>12</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>9</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PJ_Vibrosword"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PJ_Vibrosword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.2</MeleeCritChance>
+				<MeleeParryChance>0.35</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PJ_Vibroaxe"]/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>37</power>
+					<cooldownTime>2.54</cooldownTime>
+					<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
+					<armorPenetrationSharp>12</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>2.34</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.956</armorPenetrationBlunt>
+					<armorPenetrationSharp>9</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PJ_Vibroaxe"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PJ_Vibroaxe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.4</MeleeCritChance>
+				<MeleeParryChance>0.35</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PJ_TStaff"]/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>37</power>
+					<cooldownTime>2.44</cooldownTime>
+					<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
+					<armorPenetrationSharp>12</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>32</power>
+					<cooldownTime>2.32</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.956</armorPenetrationBlunt>
+					<armorPenetrationSharp>9</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PJ_TStaff"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PJ_TStaff"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.4</MeleeCritChance>
+				<MeleeParryChance>0.7</MeleeParryChance>
+				<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PJ_StaffX"]/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>37</power>
+					<cooldownTime>2.88</cooldownTime>
+					<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
+					<armorPenetrationSharp>12</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>32</power>
+					<cooldownTime>2.64</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.956</armorPenetrationBlunt>
+					<armorPenetrationSharp>9</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PJ_StaffX"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PJ_StaffX"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.4</MeleeCritChance>
+				<MeleeParryChance>0.7</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PJ_Vibrodouble"]/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>second edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.44</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.956</armorPenetrationBlunt>
+					<armorPenetrationSharp>9</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>1.24</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.956</armorPenetrationBlunt>
+					<armorPenetrationSharp>9</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PJ_Vibrodouble"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PJ_Vibrodouble"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.2</MeleeCritChance>
+				<MeleeParryChance>0.7</MeleeParryChance>
+				<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PJ_VScythe"]/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>23</power>
+					<cooldownTime>1</cooldownTime>
+					<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
+					<armorPenetrationSharp>12</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.956</armorPenetrationBlunt>
+					<armorPenetrationSharp>9</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PJ_VScythe"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PJ_VScythe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.2</MeleeCritChance>
+				<MeleeParryChance>0.16</MeleeParryChance>
+				<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="PJ_Vibrocleaver"]/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>37</power>
+					<cooldownTime>2.54</cooldownTime>
+					<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
+					<armorPenetrationSharp>12</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>2.34</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.956</armorPenetrationBlunt>
+					<armorPenetrationSharp>9</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PJ_Vibrocleaver"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PJ_Vibrocleaver"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.2</MeleeCritChance>
+				<MeleeParryChance>0.35</MeleeParryChance>
+				<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Star Wars - Factions/Patches/Star Wars - Factions/Patch_Ranged.xml b/ModPatches/Star Wars - Factions/Patches/Star Wars - Factions/Patch_Ranged.xml
new file mode 100644
index 0000000000..613cf2671a
--- /dev/null
+++ b/ModPatches/Star Wars - Factions/Patches/Star Wars - Factions/Patch_Ranged.xml	
@@ -0,0 +1,526 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Melee Tools  =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PJ_DH17Blaster" or
+			defName="PJ_SE14blaster" or
+			defName="PJ_DL44blaster" or
+			defName="PJ_LauncherP" or
+			defName="PJ_Scoutblaster"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="PJ_E11Blaster" or
+			defName="PJ_DXR6Carb" or
+			defName="PJ_JawaIon" or
+			defName="PJ_NymSlug" or
+			defName="PJ_DC15Rifle" or
+			defName="PJ_DLT19Rifle" or
+			defName="PJ_EE3Carbine" or
+			defName="PJ_T21Rifle"
+			]/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="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>PJ_E11Blaster</defName>
+		<statBases>
+			<Mass>6.85</Mass>
+			<Bulk>6.50</Bulk>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.30</SwayFactor>
+			<RangedWeapon_Cooldown>0.62</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.63</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_SWPlasmaGasCartridge</defaultProjectile>
+			<warmupTime>0.53</warmupTime>
+			<range>42</range>
+			<soundCast>PJ_E11B</soundCast>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>24</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_SWPlasmaGasCartridge</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>PJ_DXR6Carb</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.21</ShotSpread>
+			<SwayFactor>1.32</SwayFactor>
+			<Bulk>3.00</Bulk>
+			<Mass>4.10</Mass>
+			<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.63</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_SWPlasmaGasCartridge</defaultProjectile>
+			<warmupTime>0.63</warmupTime>
+			<range>55</range>
+			<soundCast>PJ_DXRS</soundCast>
+			<burstShotCount>2</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>14</magazineSize>
+			<reloadTime>3.2</reloadTime>
+			<ammoSet>AmmoSet_SWPlasmaGasCartridge</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>PJ_JawaIon</defName>
+		<statBases>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.21</ShotSpread>
+			<SwayFactor>1.32</SwayFactor>
+			<Bulk>3.00</Bulk>
+			<Mass>4.10</Mass>
+			<RangedWeapon_Cooldown>1.92</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_SWPlasmaGasCartridge_Ion</defaultProjectile>
+			<warmupTime>1.83</warmupTime>
+			<range>40</range>
+			<soundCast>PJ_BPistolB</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>18</magazineSize>
+			<reloadTime>3.7</reloadTime>
+			<ammoSet>AmmoSet_SWPlasmaGasCartridge</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>PJ_NymSlug</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.26</ShotSpread>
+			<SwayFactor>1.64</SwayFactor>
+			<Bulk>3.00</Bulk>
+			<Mass>4.10</Mass>
+			<RangedWeapon_Cooldown>0.32</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Slug</defaultProjectile>
+			<warmupTime>0.33</warmupTime>
+			<range>40</range>
+			<soundCast>PJ_SlugSnd</soundCast>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>16</magazineSize>
+			<reloadTime>4.0</reloadTime>
+			<ammoSet>AmmoSet_Nym</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>PJ_T21Rifle</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.02</SwayFactor>
+			<Bulk>13.00</Bulk>
+			<Mass>10.85</Mass>
+			<RangedWeapon_Cooldown>0.62</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.73</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_SWPlasmaGasCartridge_AP</defaultProjectile>
+			<warmupTime>0.63</warmupTime>
+			<range>84</range>
+			<soundCast>PJ_T21R</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>18</magazineSize>
+			<reloadTime>2.4</reloadTime>
+			<ammoSet>AmmoSet_SWPlasmaGasCartridge</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>PJ_DC15Rifle</defName>
+		<statBases>
+			<Mass>6.85</Mass>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.31</ShotSpread>
+			<SwayFactor>1.22</SwayFactor>
+			<Bulk>9.00</Bulk>
+			<RangedWeapon_Cooldown>0.32</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.73</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_SWPlasmaGasCartridge</defaultProjectile>
+			<warmupTime>0.63</warmupTime>
+			<range>55</range>
+			<soundCast>PJ_T21R</soundCast>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>2.4</reloadTime>
+			<ammoSet>AmmoSet_SWPlasmaGasCartridge</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>PJ_DLT19Rifle</defName>
+		<statBases>
+			<Mass>9.85</Mass>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.31</ShotSpread>
+			<SwayFactor>1.22</SwayFactor>
+			<Bulk>10.00</Bulk>
+			<RangedWeapon_Cooldown>0.32</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.73</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_SWPlasmaGasCartridge</defaultProjectile>
+			<warmupTime>0.63</warmupTime>
+			<range>55</range>
+			<soundCast>PJ_T21R</soundCast>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>24</magazineSize>
+			<reloadTime>2.4</reloadTime>
+			<ammoSet>AmmoSet_SWPlasmaGasCartridge</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>PJ_EE3Carbine</defName>
+		<statBases>
+			<Mass>6.85</Mass>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>0.82</SwayFactor>
+			<Bulk>4.00</Bulk>
+			<RangedWeapon_Cooldown>0.32</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_SWPlasmaGasCartridge</defaultProjectile>
+			<warmupTime>1.23</warmupTime>
+			<range>45</range>
+			<soundCast>PJ_T21R</soundCast>
+			<burstShotCount>2</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>1.9</reloadTime>
+			<ammoSet>AmmoSet_SWPlasmaGasCartridge</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>PJ_DH17Blaster</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.02</SwayFactor>
+			<Bulk>2.17</Bulk>
+			<Mass>3.95</Mass>
+			<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.48</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_SWPlasmaGasCartridge</defaultProjectile>
+			<warmupTime>0.53</warmupTime>
+			<range>20</range>
+			<soundCast>PJ_E11B</soundCast>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiUseBurstMode>False</aiUseBurstMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_SWPlasmaGasCartridge</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>PJ_Scoutblaster</defName>
+		<statBases>
+			<SightsEfficiency>0.85</SightsEfficiency>
+			<ShotSpread>0.21</ShotSpread>
+			<SwayFactor>1.32</SwayFactor>
+			<Bulk>2.17</Bulk>
+			<Mass>4.85</Mass>
+			<RangedWeapon_Cooldown>0.46</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.48</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_SWPlasmaGasCartridge</defaultProjectile>
+			<warmupTime>0.53</warmupTime>
+			<range>15</range>
+			<soundCast>PJ_BPistol</soundCast>
+			<burstShotCount>4</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>16</magazineSize>
+			<reloadTime>2</reloadTime>
+			<ammoSet>AmmoSet_SWPlasmaGasCartridge</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>PJ_SE14blaster</defName>
+		<statBases>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.11</ShotSpread>
+			<SwayFactor>1.02</SwayFactor>
+			<Bulk>2.17</Bulk>
+			<Mass>3.85</Mass>
+			<RangedWeapon_Cooldown>0.52</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.48</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_SWPlasmaGasCartridge</defaultProjectile>
+			<warmupTime>0.43</warmupTime>
+			<range>18</range>
+			<soundCast>PJ_BPistol</soundCast>
+			<burstShotCount>4</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_SWPlasmaGasCartridge</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>PJ_DL44blaster</defName>
+		<statBases>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.21</ShotSpread>
+			<SwayFactor>1.32</SwayFactor>
+			<Bulk>3.00</Bulk>
+			<Mass>4.10</Mass>
+			<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.48</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_SWPlasmaGasCartridge</defaultProjectile>
+			<warmupTime>0.83</warmupTime>
+			<range>15</range>
+			<soundCast>PJ_BPistolB</soundCast>
+			<burstShotCount>2</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_SWPlasmaGasCartridge</ammoSet>
+		</AmmoUser>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>PJ_LauncherP</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>1.34</ShotSpread>
+			<SwayFactor>4.64</SwayFactor>
+			<Bulk>5.50</Bulk>
+			<Mass>5.10</Mass>
+			<RangedWeapon_Cooldown>1.92</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.48</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_20x42mmGrenade_HE</defaultProjectile>
+			<warmupTime>2.83</warmupTime>
+			<range>26</range>
+			<soundCast>Shot_IncendiaryLauncher</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>4</AmmoGenPerMagOverride>
+			<reloadTime>2</reloadTime>
+			<ammoSet>AmmoSet_20x42mmGrenade</ammoSet>
+		</AmmoUser>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Star Wars - Factions/Patches/Star Wars - Factions/PawnKinds.xml b/ModPatches/Star Wars - Factions/Patches/Star Wars - Factions/PawnKinds.xml
new file mode 100644
index 0000000000..29d99be271
--- /dev/null
+++ b/ModPatches/Star Wars - Factions/Patches/Star Wars - Factions/PawnKinds.xml	
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="PJ_RebVillager" or
+			defName="PJ_RebCouncilman" or
+			defName="PJ_RebSoldier" or
+			defName="PJ_RebLAVSoldier" or
+			defName="PJ_RebNadeSoldier" or
+			defName="PJ_RebPilot" or
+			defName="PJ_RebMerc"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="PJ_ImpInspector" or
+			defName="PJ_ImpTaxOfficer" or
+			defName="PJ_ImpSoldier" or
+			defName="PJ_ImpTrader" or
+			defName="PJ_Stormtrooper" or
+			defName="PJ_StormtrooperSO" or
+			defName="PJ_ImpCommander" or
+			defName="PJ_ScoutTrooper"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="PJ_ScumSoldier" or
+			defName="PJ_Ruffian" or
+			defName="PJ_ScumBoss" or
+			defName="PJ_BountyHunter"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CE_Apparel_Backpack"]/apparel/tags</xpath>
+		<value>
+			<li>PJ_Imp</li>
+			<li>PJ_Rebel</li>
+			<li>PJ_Scum</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="PJ_ImperialCredit"]/statBases</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="PJ_ImperialCredit"]</xpath>
+			<value>
+				<statBases/>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="PJ_ImperialCredit"]</xpath>
+			<value>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="PJ_ImperialCredit"]/statBases</xpath>
+		<value>
+			<Bulk>0.001</Bulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Starship Troopers Arachnids/Defs/Starship Troopers Arachnids/Projectiles_Bugs.xml b/ModPatches/Starship Troopers Arachnids/Defs/Starship Troopers Arachnids/Projectiles_Bugs.xml
new file mode 100644
index 0000000000..a1d1368b4e
--- /dev/null
+++ b/ModPatches/Starship Troopers Arachnids/Defs/Starship Troopers Arachnids/Projectiles_Bugs.xml	
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- Projectiles -->
+	<!-- Tanker -->
+	<ThingDef ParentName="BaseFlamethrowerBullet">
+		<defName>Bullet_TankerInfernoCannon</defName>
+		<label>flame stream</label>
+		<thingClass>CombatExtended.BulletCE</thingClass>
+		<graphicData>
+			<texPath>Bugs_Fireball</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>2.5</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>PrometheumFlame</damageDef>
+			<damageAmountBase>10</damageAmountBase>
+			<speed>20</speed>
+			<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
+			<preExplosionSpawnChance>0.33</preExplosionSpawnChance>
+			<soundExplode>CE_FlamethrowerExplosion</soundExplode>
+			<explosionRadius>1.5</explosionRadius>
+			<ai_IsIncendiary>true</ai_IsIncendiary>
+		</projectile>
+	</ThingDef>
+
+	<!-- Firefly -->
+	<ThingDef ParentName="BaseFlamethrowerBullet">
+		<defName>Bullet_FireFlyInfernoCannon</defName>
+		<label>flame stream</label>
+		<thingClass>CombatExtended.BulletCE</thingClass>
+		<graphicData>
+			<texPath>Bugs_Fireball</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>1</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>PrometheumFlame</damageDef>
+			<damageAmountBase>5</damageAmountBase>
+			<speed>20</speed>
+			<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
+			<preExplosionSpawnChance>0.33</preExplosionSpawnChance>
+			<soundExplode>CE_FlamethrowerExplosion</soundExplode>
+			<explosionRadius>1.0</explosionRadius>
+			<ai_IsIncendiary>true</ai_IsIncendiary>
+		</projectile>
+	</ThingDef>
+
+	<!-- Bombardier -->
+	<ThingDef ParentName="BaseFlamethrowerBullet">
+		<defName>Bullet_BombardierBugTrigger</defName>
+		<label>Bombardier Suicide</label>
+		<thingClass>CombatExtended.BulletCE</thingClass>
+		<graphicData>
+			<texPath>Bugs_Plasma</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>MoteGlow</shaderType>
+			<drawSize>0</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>120</damageAmountBase>
+			<speed>200</speed>
+			<explosionRadius>8.0</explosionRadius>
+			<ai_IsIncendiary>true</ai_IsIncendiary>
+		</projectile>
+	</ThingDef>
+
+	<!-- Plasma Grenadier -->
+	<ThingDef ParentName="BaseFlamethrowerBullet">
+		<defName>Bullet_PlasmaGrenadierBugPlasma</defName>
+		<label>plasma burst</label>
+		<thingClass>CombatExtended.BulletCE</thingClass>
+		<graphicData>
+			<texPath>Bugs_Plasma</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>MoteGlow</shaderType>
+			<drawSize>3</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>90</damageAmountBase>
+			<speed>20</speed>
+			<soundExplode>Explosion_EMP</soundExplode>
+			<explosionRadius>1.5</explosionRadius>
+			<ai_IsIncendiary>true</ai_IsIncendiary>
+		</projectile>
+	</ThingDef>
+
+	<!-- Scorpion Plasma -->
+	<ThingDef ParentName="BaseFlamethrowerBullet">
+		<defName>Bullet_ScorpionBugPlasma</defName>
+		<label>plasma burst</label>
+		<thingClass>CombatExtended.BulletCE</thingClass>
+		<graphicData>
+			<texPath>Bugs_Plasma</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>MoteGlow</shaderType>
+			<drawSize>3</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>90</damageAmountBase>
+			<speed>30</speed>
+			<soundExplode>Explosion_EMP</soundExplode>
+			<explosionRadius>2.4</explosionRadius>
+			<ai_IsIncendiary>true</ai_IsIncendiary>
+		</projectile>
+	</ThingDef>
+
+	<!-- Plasma Bug -->
+	<ThingDef ParentName="Base81mmMortarShell">
+		<defName>Bullet_PlasmaBugPlasma</defName>
+		<label>plasma burst</label>
+		<thingClass>CombatExtended.BulletCE</thingClass>
+		<graphicData>
+			<texPath>Bugs_Plasma</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>MoteGlow</shaderType>
+			<drawSize>10</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Flame</damageDef>
+			<damageAmountBase>40</damageAmountBase>
+			<speed>1</speed>
+			<gravityFactor>5</gravityFactor>
+			<flyOverhead>true</flyOverhead>
+			<dropsCasings>false</dropsCasings>
+			<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
+			<preExplosionSpawnChance>0.33</preExplosionSpawnChance>
+			<soundExplode>Explosion_EMP</soundExplode>
+			<explosionRadius>8.0</explosionRadius>
+			<ai_IsIncendiary>true</ai_IsIncendiary>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>120</damageAmountBase>
+				<explosiveDamageType>Thermobaric</explosiveDamageType>
+				<explosiveRadius>4.4</explosiveRadius>
+				<explosionSound>MortarIncendiary_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Starship Troopers Arachnids/Patches/Starship Troopers Arachnids/Bodies_Bugs.xml b/ModPatches/Starship Troopers Arachnids/Patches/Starship Troopers Arachnids/Bodies_Bugs.xml
new file mode 100644
index 0000000000..2ee74ca4a7
--- /dev/null
+++ b/ModPatches/Starship Troopers Arachnids/Patches/Starship Troopers Arachnids/Bodies_Bugs.xml	
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="Arachnid"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="Arachnid"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="Arachnid"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="Arachnid"]/corePart/parts/li[def="Elytra"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="Arachnid"]/corePart/parts/li[def="Elytra"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="Arachnid"]/corePart/parts/li[def="Elytra"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="Arachnid"]/corePart/parts/li[def="Pronotum"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="Arachnid"]/corePart/parts/li[def="Pronotum"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="Arachnid"]/corePart/parts/li[def="Pronotum"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="Arachnid"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="Arachnid"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="Arachnid"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="Arachnid"]/corePart/parts/li[def="InsectLeg"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="Arachnid"]/corePart/parts/li[def="InsectLeg"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="Arachnid"]/corePart/parts/li[def="InsectLeg"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<!-- -->
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="ArachnidScorpion"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="ArachnidScorpion"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="ArachnidScorpion"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="ArachnidScorpion"]/corePart/parts/li[def="Elytra"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="ArachnidScorpion"]/corePart/parts/li[def="Elytra"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="ArachnidScorpion"]/corePart/parts/li[def="Elytra"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="ArachnidScorpion"]/corePart/parts/li[def="Pronotum"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="ArachnidScorpion"]/corePart/parts/li[def="Pronotum"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="ArachnidScorpion"]/corePart/parts/li[def="Pronotum"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="ArachnidScorpion"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="ArachnidScorpion"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="ArachnidScorpion"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="ArachnidScorpion"]/corePart/parts/li[def="InsectLeg"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="ArachnidScorpion"]/corePart/parts/li[def="InsectLeg"]</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="ArachnidScorpion"]/corePart/parts/li[def="InsectLeg"]/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Starship Troopers Arachnids/Patches/Starship Troopers Arachnids/Races.xml b/ModPatches/Starship Troopers Arachnids/Patches/Starship Troopers Arachnids/Races.xml
new file mode 100644
index 0000000000..13b7c3b499
--- /dev/null
+++ b/ModPatches/Starship Troopers Arachnids/Patches/Starship Troopers Arachnids/Races.xml	
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- BASE -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="BugsThingBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="BugsThingBase"]/statBases</xpath>
+		<value>
+			<PainShockThreshold>5</PainShockThreshold>
+		</value>
+	</Operation>
+
+	<!-- Basic Warrior -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Arachnid_WarriorBug" or defName="Arachnid_WarriorBugHive"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Arachnid_WarriorBug" or defName="Arachnid_WarriorBugHive" or defName="Arachnid_FireFlyBug" or defName="Arachnid_HopperBug"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.09</MeleeDodgeChance>
+			<MeleeCritChance>0.53</MeleeCritChance>
+			<MeleeParryChance>0.02</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachnid_WarriorBug" or defName="Arachnid_WarriorBugHive" or defName="Arachnid_FireFlyBug" or defName="Arachnid_HopperBug"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>front left leg</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.0</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftInsectLeg</linkedBodyPartsGroup>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+					<armorPenetrationBlunt>24</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>front right leg</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.0</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightInsectLeg</linkedBodyPartsGroup>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationSharp>20</armorPenetrationSharp>
+					<armorPenetrationBlunt>68</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Bombardier -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachnid_BombardierBug"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationSharp>0.24</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Plasma Grenadier -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Arachnid_PlasmaGrenadierBug"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Arachnid_PlasmaGrenadierBug"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.09</MeleeDodgeChance>
+			<MeleeCritChance>0.31</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachnid_PlasmaGrenadierBug"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>front left leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>2.13</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftInsectLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>14.640</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>front right leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>2.13</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightInsectLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>14.640</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Large-class -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachnid_TankerBug"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>22</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachnid_TankerBug"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>33</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachnid_ScorpionBug"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachnid_ScorpionBug"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>38</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Arachnid_TankerBug" or defName="Arachnid_ScorpionBug" or defName="Arachnid_PlasmaBug"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.09</MeleeDodgeChance>
+			<MeleeCritChance>0.76</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Arachnid_TankerBug" or defName="Arachnid_ScorpionBug" or defName="Arachnid_PlasmaBug"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>front left leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>33</power>
+					<cooldownTime>2.13</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftInsectLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>14.640</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>front right leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>33</power>
+					<cooldownTime>2.13</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightInsectLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>14.640</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Starship Troopers Arachnids/Patches/Starship Troopers Arachnids/Resources.xml b/ModPatches/Starship Troopers Arachnids/Patches/Starship Troopers Arachnids/Resources.xml
new file mode 100644
index 0000000000..77c16ff626
--- /dev/null
+++ b/ModPatches/Starship Troopers Arachnids/Patches/Starship Troopers Arachnids/Resources.xml	
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Arachnid Leg -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ArachnidLeg"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ArachnidLeg"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Stab</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2.6</cooldownTime>
+					<armorPenetrationSharp>5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Arachnid Carapace -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ArachnidCarapace"]/statBases</xpath>
+		<value>
+			<Bulk>0.05</Bulk>
+			<WornBulk>0.75</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ArachnidCarapace"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.25</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ArachnidCarapace"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>1.75</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ArachnidCarapace"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.02</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ArachnidCarapace"]/stuffProps</xpath>
+		<value>
+			<statOffsets>
+				<Mass>0.5</Mass>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="ArachnidCarapace"]/statBases/SharpDamageMultiplier</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ArachnidCarapace"]/statBases/BluntDamageMultiplier</xpath>
+		<value>
+			<BluntDamageMultiplier>1.25</BluntDamageMultiplier>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ArachnidCarapace"]/stuffProps/categories</xpath>
+		<value>
+			<li>Metallic_Weapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ArachnidCarapace"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>2.45</Mass>
+			<MeleePenetrationFactor>1.2</MeleePenetrationFactor>
+		</value>
+	</Operation>
+
+	<!-- Arachnid Leather, made a bit worse than thrumbofur -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Leather_Arachnids"]/statBases</xpath>
+		<value>
+			<Bulk>0.05</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Leather_Arachnids"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.55</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Leather_Arachnids"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.4</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Leather_Arachnids"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.015</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Leather_Arachnids"]/stuffProps/categories</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Leather_Arachnids"]/stuffProps</xpath>
+			<value>
+				<categories>
+					<li>SoftArmor</li>
+				</categories>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Leather_Arachnids"]/stuffProps/categories</xpath>
+			<value>
+				<li>SoftArmor</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Starship Troopers Arachnids/Patches/Starship Troopers Arachnids/Weapons_Bugs.xml b/ModPatches/Starship Troopers Arachnids/Patches/Starship Troopers Arachnids/Weapons_Bugs.xml
new file mode 100644
index 0000000000..e3f8470413
--- /dev/null
+++ b/ModPatches/Starship Troopers Arachnids/Patches/Starship Troopers Arachnids/Weapons_Bugs.xml	
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Tanker -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_TankerInfernoCannon</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>3.0</ShotSpread>
+			<SwayFactor>1.52</SwayFactor>
+			<Bulk>36</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_TankerInfernoCannon</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>27</range>
+			<burstShotCount>50</burstShotCount>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>0</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+	</Operation>
+
+	<!-- Firefly -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_FireFlyInfernoCannon</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>3.0</ShotSpread>
+			<SwayFactor>1.52</SwayFactor>
+			<Bulk>36</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_FireFlyInfernoCannon</defaultProjectile>
+			<warmupTime>0.36</warmupTime>
+			<range>20</range>
+			<burstShotCount>15</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>0</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+	</Operation>
+
+	<!-- Plasma Bug -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PlasmaBugPlasma</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>4.5</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.5</SightsEfficiency>
+			<Bulk>36</Bulk>
+		</statBases>
+		<Properties>
+			<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_PlasmaBugPlasma</defaultProjectile>
+			<warmupTime>4.5</warmupTime>
+			<range>700</range>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>100</muzzleFlashScale>
+			<indirectFirePenalty>0.2</indirectFirePenalty>
+			<requireLineOfSight>false</requireLineOfSight>
+		</Properties>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Gun_PlasmaBugPlasma"]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_Charges">
+					<chargeSpeeds>
+						<li>30</li>
+						<li>50</li>
+						<li>70</li>
+						<li>90</li>
+					</chargeSpeeds>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- Bombardier Bug -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_BombardierBugTrigger</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.52</SwayFactor>
+			<Bulk>36</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_BombardierBugTrigger</defaultProjectile>
+			<warmupTime>0.1</warmupTime>
+			<range>3</range>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>50</muzzleFlashScale>
+		</Properties>
+	</Operation>
+
+	<!-- Plasma Grenadier Bug -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PlasmaGrenadierBugPlasma</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.52</SwayFactor>
+			<Bulk>36</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.85</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_PlasmaGrenadierBugPlasma</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>40</range>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+	</Operation>
+
+	<!-- Scorpion Bug -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_ScorpionBugPlasma</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.52</SwayFactor>
+			<Bulk>36</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.85</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_ScorpionBugPlasma</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>40</range>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Steamworld Uniforms/Patches/Steamworld Uniforms/Apparel_Various.xml b/ModPatches/Steamworld Uniforms/Patches/Steamworld Uniforms/Apparel_Various.xml
new file mode 100644
index 0000000000..2b480e50d8
--- /dev/null
+++ b/ModPatches/Steamworld Uniforms/Patches/Steamworld Uniforms/Apparel_Various.xml	
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Headgear -->
+	<!-- Caps -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="SteamworldUniforms_Caps_Base"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Helmets -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="Steamworld_Helmet_Base"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<WornBulk>1</WornBulk>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Pith Helmets (Armor based upon roughly material thickness in cloth/wood.)-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="SteamworldUniforms_PithHelm"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>0.95</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="SteamworldUniforms_PithHelm"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Jackets -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="SteamworldUniforms_UniformJacketBase"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SteamworldUniforms_ZouaveJacket"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Rolled-up Bedroll -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SteamworldUniforms_BedRoll"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1.5</WornBulk>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Decorations -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="SteamworldUniforms_Gold"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<Bulk>0.25</Bulk>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="SteamworldUniforms_Gold"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.05</ArmorRating_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Steves Animals/Patches/Steves Animals/Bast_Resources.xml b/ModPatches/Steves Animals/Patches/Steves Animals/Bast_Resources.xml
new file mode 100644
index 0000000000..dc39979281
--- /dev/null
+++ b/ModPatches/Steves Animals/Patches/Steves Animals/Bast_Resources.xml	
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Remove tusk as a weapon -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Bast_CeratokHorn"]/tools</xpath>
+	</Operation>
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="Bast_CeratokHorn"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>ResourceBase</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_CeratokHorn"]/statBases/MarketValue</xpath>
+		<value>
+			<MarketValue>500</MarketValue>
+		</value>
+	</Operation>
+
+	<!--Bahlrin -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Bahlrin"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.09</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Bahlrin"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.04</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Bahlrin"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.02</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<!--Steves Animals -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Bastyon"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.08</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Bastyon"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.04</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!--Leather_Blazing_Felidae -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Blazing_Felidae"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.09</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<!--Tegu -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Chem_Tegu"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.06</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Chem_Tegu"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.03</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!--Leather_Scire -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Scire"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.046</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Scire"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.02</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Scire"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.07</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<!--Leather_Ethereal_Lion -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Ethereal_Lion"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.07</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Ethereal_Lion"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.036</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!--Leather_Ceratok -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Ceratok"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.12</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Ceratok"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.064</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Ceratok"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.04</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<!--Leather_Soul_Eater -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Soul_Eater"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.03</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Soul_Eater"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.2</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!--Leather_Soul_Eater -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Vorpal_Bunny"
+			or defName="Leather_Vorpal_Bunny_Enraged"
+			or defName="Leather_Vorpal_Bunny_Iridescent"
+			or defName="Leather_Vorpal_Bunny_Pragmatic"
+			or defName="Leather_Vorpal_Bunny_Befouled"]/statBases/StuffPower_Armor_Sharp </xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.03</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Leather_Vorpal_Bunny"
+			or defName="Leather_Vorpal_Bunny_Enraged"
+			or defName="Leather_Vorpal_Bunny_Iridescent"
+			or defName="Leather_Vorpal_Bunny_Pragmatic"
+			or defName="Leather_Vorpal_Bunny_Befouled"]/statBases/StuffPower_Armor_Blunt </xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.2</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Steves Animals/Patches/Steves Animals/Basty_Bodies.xml b/ModPatches/Steves Animals/Patches/Steves Animals/Basty_Bodies.xml
new file mode 100644
index 0000000000..324ae3f1f5
--- /dev/null
+++ b/ModPatches/Steves Animals/Patches/Steves Animals/Basty_Bodies.xml	
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Natural Armor -->
+	<!-- Bast_Critter -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Bast_Critter"]//*[
+			def="Body" or
+			def="Leg" or
+			def="Neck"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Bast_Critter"]//*[
+			def="Body" or
+			def="Neck" or
+			def="AnimalJaw" or
+			def="Leg" or
+			def="Foot" or
+			def="Head"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- Natural Armor -->
+	<!-- Bast_SnippingSnail -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Bast_SnippingSnail"]//*[
+			def="Bast_SnailBody" or
+			def="Bast_GastropodShell"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Bast_SnippingSnail"]//*[
+			def="Bast_GastropodShell" or
+			def="Bast_BladedRightLeg" or
+			def="Bast_BladedLeftLeg"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- Natural Armor -->
+	<!-- Anty the vore ant -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Bast_Ant"]//*[
+			def="Body" or
+			def="Bast_Thorax" or
+			def="Pronotum" or
+			def="InsectNostril" or
+			def="Bast_Abdomen" or
+			def="Bast_Antennae"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Bast_Ant"]//*[
+			def="Body" or
+			def="Bast_Thorax" or
+			def="Pronotum" or
+			def="InsectNostril" or
+			def="InsectHead" or
+			def="Bast_InsectMouth" or
+			def="Bast_Antennae" or
+			def="Bast_Abdomen" or
+			def="Bast_SmallInsectLeg"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- Bahlrin -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Bast_BahlrinBody"]//*[
+			def="Body" or
+			def="Tail" or
+			def="Neck" or
+			def="Bast_Wing"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Bast_BahlrinBody"]//*[
+			def="Body" or
+			def="Tail" or
+			def="Neck" or
+			def="AnimalJaw" or
+			def="Head" or
+			def="Bast_Wing"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- BastLimblessGelatinous -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Bast_LimblessGelatinous"]//*[def="Body"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- Bast_LimblessHovering -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Bast_LimblessHovering"]//*[
+			def="Bast_WispMainBody"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Bast_LimblessHovering"]//*[
+			def="Bast_WispMainBody" or
+			def="Head"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- Bast_Spider -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Bast_Spider"]//*[
+			def="Body" or
+			def="Bast_Thorax" or
+			def="Pronotum" or
+			def="InsectNostril"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Bast_Spider"]//*[
+			def="Body" or
+			def="Bast_Thorax" or
+			def="Pronotum" or
+			def="InsectNostril" or
+			def="InsectHead" or
+			def="Bast_InsectMouth" or
+			def="InsectLeg"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Bast_SvarogBody"]//*[
+			def="Bast_SavrogMainBody" or
+			def="Bast_SmolderingFist"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="Bast_LightningElementalBody"]//*[
+			def="Bast_LightningElementalMainBody" or
+			def="Bast_GalvanizedFist"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Steves Animals/Patches/Steves Animals/BetaAnimals_CE_Patch_Projectiles.xml b/ModPatches/Steves Animals/Patches/Steves Animals/BetaAnimals_CE_Patch_Projectiles.xml
new file mode 100644
index 0000000000..984a2d18a4
--- /dev/null
+++ b/ModPatches/Steves Animals/Patches/Steves Animals/BetaAnimals_CE_Patch_Projectiles.xml	
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ============== Changing Projectile's thingClass to CE ones ================ -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Bast_ScireFireBall" or
+			defName="Bast_Web" or
+			defName="Bast_AlluviumGoo" or
+			defName="Bast_CritterSpike" or
+			defName="Bast_BlisteringWind" or
+			defName="Bast_LightningBolt" or
+			defName="Bast_SnippingSnailAcid"] </xpath>
+		<value>
+			<thingClass>CombatExtended.BulletCE</thingClass>
+		</value>
+	</Operation>
+
+	<!-- ============== Adding 'Standard' AimingAccuracy node to creatures' that use ranged attack statBases. =============== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Bast_Scire" or
+			defName="Bast_Alluvium" or defName="Bast_Snipping_Snail" or defName="Bast_Soul_Eater" or defName="Bast_LightningBolt"]/statBases </xpath>
+		<value>
+			<AimingAccuracy>0.7</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Bast_Critter" or defName="Bast_Gray_Terror"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.3</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Bast_Steves Animals" or defName="Bast_Blazing_Felidae" or defName="Bast_Svarog"]/statBases</xpath>
+		<value>
+			<ShootingAccuracyPawn>2</ShootingAccuracyPawn>
+			<AimingAccuracy>1</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!-- =============== Now defining Projectiles in CE Procedure ============= -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_LightningBolt"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>Bast_Electric</damageDef>
+				<damageAmountBase>8</damageAmountBase>
+				<stoppingPower>0.5</stoppingPower>
+				<speed>30</speed>
+				<armorPenetrationSharp>50</armorPenetrationSharp>
+				<armorPenetrationBlunt>0.01</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_SnippingSnailAcid"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>Bast_AcidStream</damageDef>
+				<damageAmountBase>3</damageAmountBase>
+				<speed>12</speed>
+				<armorPenetrationSharp>2</armorPenetrationSharp>
+				<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_CritterSpike"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>Cut</damageDef>
+				<damageAmountBase>6</damageAmountBase>
+				<speed>14</speed>
+				<armorPenetrationSharp>0.4</armorPenetrationSharp>
+				<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_AlluviumGoo"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>Blunt</damageDef>
+				<damageAmountBase>2</damageAmountBase>
+				<speed>8</speed>
+				<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				<secondaryDamage>
+					<li>
+						<def>Stun</def>
+						<amount>10</amount>
+					</li>
+				</secondaryDamage>
+			</projectile>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_ScireFireBall"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>Flame</damageDef>
+				<damageAmountBase>1</damageAmountBase>
+				<armorPenetrationSharp>3</armorPenetrationSharp>
+				<speed>16</speed>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Web"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>Blunt</damageDef>
+				<damageAmountBase>2</damageAmountBase>
+				<speed>14</speed>
+				<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				<secondaryDamage>
+					<li>
+						<def>Stun</def>
+						<amount>8</amount>
+					</li>
+				</secondaryDamage>
+			</projectile>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Steves Animals/Patches/Steves Animals/BetaAnimals_CE_Patch_VerbShootCE.xml b/ModPatches/Steves Animals/Patches/Steves Animals/BetaAnimals_CE_Patch_VerbShootCE.xml
new file mode 100644
index 0000000000..b7fc666a98
--- /dev/null
+++ b/ModPatches/Steves Animals/Patches/Steves Animals/BetaAnimals_CE_Patch_VerbShootCE.xml	
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Alluvium"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bast_AlluviumGoo</defaultProjectile>
+					<warmupTime>1.5</warmupTime>
+					<burstShotCount>2</burstShotCount>
+					<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
+					<minRange>2</minRange>
+					<range>12</range>
+					<soundCast>Bast_AlluviumGoo</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<commonality>0.8</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Critter"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bast_CritterSpike</defaultProjectile>
+					<warmupTime>2</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>1.9</minRange>
+					<range>10</range>
+					<soundCast>Bast_CritterSpike</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>critter spike</label>
+					<commonality>0.8</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Grey spider -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Gray_Terror"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bast_Web</defaultProjectile>
+					<warmupTime>2</warmupTime>
+					<burstShotCount>2</burstShotCount>
+					<ticksBetweenBurstShots>25</ticksBetweenBurstShots>
+					<minRange>2</minRange>
+					<range>15</range>
+					<soundCast>Bast_Web</soundCast>
+					<label>spider web</label>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<commonality>0.5</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Scire -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Scire"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bast_ScireFireBall</defaultProjectile>
+					<warmupTime>2.5</warmupTime>
+					<burstShotCount>3</burstShotCount>
+					<ticksBetweenBurstShots>18</ticksBetweenBurstShots>
+					<minRange>2</minRange>
+					<range>16</range>
+					<soundCast>Bast_ScireFireBall</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>eternal fire</label>
+					<commonality>0.75</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Snipping_Snail"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bast_SnippingSnailAcid</defaultProjectile>
+					<warmupTime>2.5</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<minRange>2</minRange>
+					<range>8</range>
+					<soundCast>Bast_SnippingSnailAcid</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>acid stream</label>
+					<commonality>0.8</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Soul_Eater"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bast_BlisteringWind</defaultProjectile>
+					<warmupTime>3</warmupTime>
+					<burstShotCount>4</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>1.9</minRange>
+					<range>12</range>
+					<soundCast>Bast_BlisteringWind</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>blistering wind</label>
+					<commonality>0.8</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Lightning_Elemental"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bast_LightningBolt</defaultProjectile>
+					<warmupTime>3</warmupTime>
+					<burstShotCount>3</burstShotCount>
+					<minRange>1.1</minRange>
+					<range>36</range>
+					<soundCast>Thunder_OnMap</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>lightning bolt</label>
+					<commonality>.5</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Svarog"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li>
+					<verbClass>Verb_Shoot</verbClass>
+					<accuracyTouch>1</accuracyTouch>
+					<accuracyShort>1</accuracyShort>
+					<accuracyMedium>.85</accuracyMedium>
+					<accuracyLong>.75</accuracyLong>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bast_SvarogFireStream</defaultProjectile>
+					<warmupTime>3.5</warmupTime>
+					<burstShotCount>2</burstShotCount>
+					<minRange>3</minRange>
+					<range>12</range>
+					<soundCast>Bast_FireStream</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>searing fire</label>
+					<commonality>1</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Steves Animals/Patches/Steves Animals/CE_Patch_BastRace_All.xml b/ModPatches/Steves Animals/Patches/Steves Animals/CE_Patch_BastRace_All.xml
new file mode 100644
index 0000000000..b7044db7f4
--- /dev/null
+++ b/ModPatches/Steves Animals/Patches/Steves Animals/CE_Patch_BastRace_All.xml	
@@ -0,0 +1,652 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === Anty the vore ant === -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Bast_Abatanica_Ant"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Bast_Abatanica_Ant"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.01</MeleeDodgeChance>
+			<MeleeCritChance>0.24</MeleeCritChance>
+			<MeleeParryChance>0.35</MeleeParryChance>
+			<ArmorRating_Sharp>0.12</ArmorRating_Sharp>
+			<ArmorRating_Blunt>0.2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Abatanica_Ant"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandible</label>
+					<capacities>
+						<li>Cut</li>
+						<li>Scratch</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2.64</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>3</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Abatanica_Ant"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>0.6</baseHealthScale>
+		</value>
+	</Operation>
+
+	<!-- === Alluvium === -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Bast_Alluvium"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Bast_Alluvium"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.00</MeleeCritChance>
+			<MeleeParryChance>0.00</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Alluvium"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Bast_Nucleoplasm</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>5</cooldownTime>
+					<linkedBodyPartsGroup>Bast_Body</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>false</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Alluvium"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>1.5</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Bast_Alluvium"]/statBases/ArmorRating_Blunt</xpath>
+	</Operation>
+
+	<!-- === Bahlrin === -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Bast_Bahlrin"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Bast_Bahlrin"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.8</MeleeDodgeChance>
+			<MeleeCritChance>0.18</MeleeCritChance>
+			<MeleeParryChance>0.03</MeleeParryChance>
+			<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
+			<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Bahlrin"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>jagged teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>12</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>16</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Bahlrin"]/race/baseBodySize</xpath>
+		<value>
+			<baseBodySize>1.1</baseBodySize>
+		</value>
+	</Operation>
+
+	<!-- === Steves Animals === -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Bast_Bastyon"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Bast_Bastyon"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.33</MeleeDodgeChance>
+			<MeleeCritChance>0.24</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Bastyon"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>0.84</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.43</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>0.84</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.43</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>1.64</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2.0</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.75</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Felidae === -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Bast_Blazing_Felidae"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Bast_Blazing_Felidae"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.33</MeleeDodgeChance>
+			<MeleeCritChance>0.16</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Blazing_Felidae"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>0.9</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<extraMeleeDamages>
+						<li>
+							<def>Burn</def>
+							<amount>4</amount>
+							<chance>0.5</chance>
+						</li>
+					</extraMeleeDamages>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.36</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>0.9</cooldownTime>
+					<extraMeleeDamages>
+						<li>
+							<def>Burn</def>
+							<amount>4</amount>
+							<chance>0.5</chance>
+						</li>
+					</extraMeleeDamages>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.36</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.6</cooldownTime>
+					<extraMeleeDamages>
+						<li>
+							<def>Burn</def>
+							<amount>6</amount>
+							<chance>0.5</chance>
+						</li>
+					</extraMeleeDamages>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Ceratok === -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Bast_Ceratok"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Ceratok"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>5.2</MoveSpeed>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.67</MeleeCritChance>
+			<MeleeParryChance>0.3</MeleeParryChance>
+			<ArmorRating_Blunt>4</ArmorRating_Blunt>
+			<ArmorRating_Sharp>0.35</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Ceratok"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horns</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>24</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Poke</def>
+							<amount>14</amount>
+							<chance>0.5</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>2.18</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>21</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>horns</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>24</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Stab</def>
+							<amount>20</amount>
+							<chance>0.5</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>2.18</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>21</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>2.7</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>24</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Ceratok"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>3.0</baseHealthScale>
+		</value>
+	</Operation>
+
+	<!-- === Tegu === -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Bast_Chem_Tegu"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Bast_Chem_Tegu"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.12</MeleeDodgeChance>
+			<MeleeCritChance>0.16</MeleeCritChance>
+			<MeleeParryChance>0.18</MeleeParryChance>
+			<ArmorRating_Blunt>0.15</ArmorRating_Blunt>
+			<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Chem_Tegu"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>2.7</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.6</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2.4</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Bast_Chem_Tegu"]</xpath>
+		<value>
+			<butcherProducts>
+				<Chemfuel>40</Chemfuel>
+			</butcherProducts>
+		</value>
+	</Operation>
+
+	<!-- === Snippy === -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Bast_Snipping_Snail"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Bast_Snipping_Snail"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.01</MeleeDodgeChance>
+			<MeleeCritChance>0.24</MeleeCritChance>
+			<MeleeParryChance>0.35</MeleeParryChance>
+			<ArmorRating_Sharp>0.6</ArmorRating_Sharp>
+			<ArmorRating_Blunt>1.0</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Snipping_Snail"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left blade arm</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Cut</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>3</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right blade arm</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Cut</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>3</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>2.4</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Snipping_Snail"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>1</baseHealthScale>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Steves Animals/Patches/Steves Animals/CE_Patch_BastRace_All2.xml b/ModPatches/Steves Animals/Patches/Steves Animals/CE_Patch_BastRace_All2.xml
new file mode 100644
index 0000000000..6704643869
--- /dev/null
+++ b/ModPatches/Steves Animals/Patches/Steves Animals/CE_Patch_BastRace_All2.xml	
@@ -0,0 +1,466 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === Bast_Critter === -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Bast_Critter"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Bast_Critter"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.33</MeleeDodgeChance>
+			<MeleeCritChance>0.13</MeleeCritChance>
+			<MeleeParryChance>0.24</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Critter"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Bast_Ethereal_Lion === -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Bast_Ethereal_Lion"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Bast_Ethereal_Lion"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			<MeleeCritChance>0.27</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Ethereal_Lion"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>0.88</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.66</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>0.88</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.66</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>33</power>
+					<cooldownTime>1.64</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.75</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Gnomaclu === -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Bast_Hazey_Gnomaclu" or defName="Bast_Midnight_Gnomaclu" or defName="Bast_Sunburst_Gnomaclu"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Vehicle</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Bast_Hazey_Gnomaclu" or defName="Bast_Midnight_Gnomaclu" or defName="Bast_Sunburst_Gnomaclu"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.21</MeleeCritChance>
+			<MeleeParryChance>0.00</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Hazey_Gnomaclu" or defName="Bast_Midnight_Gnomaclu" or defName="Bast_Sunburst_Gnomaclu"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Bast_Nucleoplasm</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>4</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>false</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Soul Eater === -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Bast_Soul_Eater"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Soul_Eater"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>7.8</MoveSpeed>
+			<MeleeDodgeChance>0.6</MeleeDodgeChance>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>0.4</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Soul_Eater"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.32</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.32</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>1.64</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.75</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Scire === -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Bast_Scire"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Scire"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>8.1</MoveSpeed>
+			<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			<MeleeCritChance>0.17</MeleeCritChance>
+			<MeleeParryChance>0.4</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Scire"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.66</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.750</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.97</cooldownTime>
+					<restrictedGender>Female</restrictedGender>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>antlers</label>
+					<capacities>
+						<li>Poke</li>
+						<li>Scratch</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.88</cooldownTime>
+					<restrictedGender>Male</restrictedGender>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Gray Terror === -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Bast_Gray_Terror"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Gray_Terror"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Gray_Terror"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.33</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Bast_Gray_Terror"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.24</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Gray_Terror"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left front metatarsus</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right front metatarsus</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>2.2</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Steves Animals/Patches/Steves Animals/CE_Patch_BastRace_All3.xml b/ModPatches/Steves Animals/Patches/Steves Animals/CE_Patch_BastRace_All3.xml
new file mode 100644
index 0000000000..18f777e468
--- /dev/null
+++ b/ModPatches/Steves Animals/Patches/Steves Animals/CE_Patch_BastRace_All3.xml	
@@ -0,0 +1,333 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === Cervus === -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Bast_Gleaming_Cervus"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Gleaming_Cervus"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>6.9</MoveSpeed>
+			<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			<MeleeCritChance>0.17</MeleeCritChance>
+			<MeleeParryChance>0.4</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Gleaming_Cervus"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.66</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.750</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.97</cooldownTime>
+					<restrictedGender>Female</restrictedGender>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>daunting antlers</label>
+					<capacities>
+						<li>Poke</li>
+						<li>Scratch</li>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>2</cooldownTime>
+					<restrictedGender>Male</restrictedGender>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Bunnies === -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Bast_Vorpal_Bunny"
+			or defName="Bast_Vorpal_Bunny_Befouled"
+			or defName="Bast_Vorpal_Bunny_Enduring"
+			or defName="Bast_Vorpal_Bunny_Enraged"
+			or defName="Bast_Vorpal_Bunny_Gilded"
+			or defName="Bast_Vorpal_Bunny_Iridescent"
+			or defName="Bast_Vorpal_Bunny_Pragmatic"] </xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Giving them non stupid stats === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Vorpal_Bunny"
+			or defName="Bast_Vorpal_Bunny_Befouled"
+			or defName="Bast_Vorpal_Bunny_Enduring"
+			or defName="Bast_Vorpal_Bunny_Enraged"
+			or defName="Bast_Vorpal_Bunny_Gilded"
+			or defName="Bast_Vorpal_Bunny_Iridescent"
+			or defName="Bast_Vorpal_Bunny_Pragmatic"]/statBases </xpath>
+		<value>
+			<statBases>
+				<MoveSpeed>6.00</MoveSpeed>
+				<ComfyTemperatureMin>0</ComfyTemperatureMin>
+				<ComfyTemperatureMax>35</ComfyTemperatureMax>
+				<MarketValue>250</MarketValue>
+				<MeatAmount>30</MeatAmount>
+				<MeleeDodgeChance>0.33</MeleeDodgeChance>
+				<MeleeCritChance>0.07</MeleeCritChance>
+				<MeleeParryChance>0.00</MeleeParryChance>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Vorpal_Bunny"
+			or defName="Bast_Vorpal_Bunny_Befouled"
+			or defName="Bast_Vorpal_Bunny_Enduring"
+			or defName="Bast_Vorpal_Bunny_Enraged"
+			or defName="Bast_Vorpal_Bunny_Gilded"
+			or defName="Bast_Vorpal_Bunny_Iridescent"
+			or defName="Bast_Vorpal_Bunny_Pragmatic"]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Vorpal_Bunny"
+			or defName="Bast_Vorpal_Bunny_Befouled"
+			or defName="Bast_Vorpal_Bunny_Enduring"
+			or defName="Bast_Vorpal_Bunny_Enraged"
+			or defName="Bast_Vorpal_Bunny_Gilded"
+			or defName="Bast_Vorpal_Bunny_Iridescent"
+			or defName="Bast_Vorpal_Bunny_Pragmatic"]/race/baseHealthScale </xpath>
+		<value>
+			<baseHealthScale>0.5</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Bast_Vorpal_Bunny"
+			or defName="Bast_Vorpal_Bunny_Befouled"
+			or defName="Bast_Vorpal_Bunny_Enduring"
+			or defName="Bast_Vorpal_Bunny_Enraged"
+			or defName="Bast_Vorpal_Bunny_Gilded"
+			or defName="Bast_Vorpal_Bunny_Iridescent"
+			or defName="Bast_Vorpal_Bunny_Pragmatic"]/combatPower </xpath>
+		<value>
+			<combatPower>20</combatPower>
+		</value>
+	</Operation>
+
+	<!-- === Svarog === -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Bast_Svarog"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Svarog"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>3</MoveSpeed>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>0.5</MeleeCritChance>
+			<MeleeParryChance>0.4</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Svarog"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Svarog"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Svarog"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left smoldering fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.5</cooldownTime>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>8</amount>
+							<chance>0.75</chance>
+						</li>
+					</extraMeleeDamages>
+					<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right smoldering fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.5</cooldownTime>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>8</amount>
+							<chance>0.75</chance>
+						</li>
+					</extraMeleeDamages>
+					<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Lightning === -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Bast_Lightning_Elemental"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Lightning_Elemental"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>3</MoveSpeed>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>0.5</MeleeCritChance>
+			<MeleeParryChance>0.4</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Lightning_Elemental"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Lightning_Elemental"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bast_Lightning_Elemental"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left galvanized fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.5</cooldownTime>
+					<extraMeleeDamages>
+						<li>
+							<def>Bast_Electric</def>
+							<amount>8</amount>
+							<chance>0.75</chance>
+						</li>
+					</extraMeleeDamages>
+					<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right galvanized fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.5</cooldownTime>
+					<extraMeleeDamages>
+						<li>
+							<def>Bast_Electric</def>
+							<amount>8</amount>
+							<chance>0.75</chance>
+						</li>
+					</extraMeleeDamages>
+					<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Stoneborn - Delights/Patches/Stoneborn - Delights/Stoneborn_Animal.xml b/ModPatches/Stoneborn - Delights/Patches/Stoneborn - Delights/Stoneborn_Animal.xml
new file mode 100644
index 0000000000..e2785f4be6
--- /dev/null
+++ b/ModPatches/Stoneborn - Delights/Patches/Stoneborn - Delights/Stoneborn_Animal.xml	
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Patch Fey ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SD_Fey"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.21</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SD_Fey"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.24</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SD_Fey"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2.25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SD_Fey"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.7</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="SD_Fey"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>0.3</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="SD_Fey"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="SD_Fey"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Stoneborn - Delights/Patches/Stoneborn - Delights/Stoneborn_Drugs.xml b/ModPatches/Stoneborn - Delights/Patches/Stoneborn - Delights/Stoneborn_Drugs.xml
new file mode 100644
index 0000000000..5f8d475550
--- /dev/null
+++ b/ModPatches/Stoneborn - Delights/Patches/Stoneborn - Delights/Stoneborn_Drugs.xml	
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Patch item bulk ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="SD_BladerootCigar" or
+			defName="SD_Feywing" or
+			defName="SD_FeywingJoint" or
+			defName="SD_MinersDelight"
+			]/statBases</xpath>
+		<value>
+			<Bulk>0.05</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SD_Alkahest" or defName="SD_Glimmerquartz"]/statBases</xpath>
+		<value>
+			<Bulk>0.2</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SD_BeardWax"]/statBases</xpath>
+		<value>
+			<Bulk>0.5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="SD_RawShatterbrew" or defName="SD_FermentedShatterbrew"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+		</value>
+	</Operation>
+
+	<!-- ========== Patch statOffsets ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="SD_ElixirHigh"]/stages/li[1]</xpath>
+		<value>
+			<statOffsets>
+				<Suppressability>-0.1</Suppressability>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="SD_ElixirHigh"]/stages/li[2]</xpath>
+		<value>
+			<statOffsets>
+				<Suppressability>-0.25</Suppressability>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="SD_ElixirHigh"]/stages/li[3]</xpath>
+		<value>
+			<statOffsets>
+				<Suppressability>-0.5</Suppressability>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="SD_ElixirHigh"]/stages/li[4]</xpath>
+		<value>
+			<statOffsets>
+				<Suppressability>-10</Suppressability>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="SD_MDHigh"]/stages/li[1]</xpath>
+		<value>
+			<statFactors>
+				<Suppressability>0.75</Suppressability>
+			</statFactors>
+		</value>
+	</Operation>
+
+	<!-- ========== Patch Bottles ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="SD_ForgeLiquor" or
+			defName="SD_HiveMead" or
+			defName="SD_ShroomAle" or
+			defName="SD_Sweetwine"
+			]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2.22</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>neck</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>3.33</cooldownTime>
+					<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Neck</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="SD_ForgeLiquor" or
+			defName="SD_HiveMead" or
+			defName="SD_ShroomAle" or
+			defName="SD_Sweetwine"
+			]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.33</MeleeCounterParryBonus>
+			<Bulk>0.35</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="SD_ForgeLiquor" or
+			defName="SD_HiveMead" or
+			defName="SD_ShroomAle" or
+			defName="SD_Sweetwine"
+			]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.1</MeleeCritChance>
+				<MeleeParryChance>0.33</MeleeParryChance>
+				<MeleeDodgeChance>0.07</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="SD_ForgeLiquor" or
+			defName="SD_HiveMead" or
+			defName="SD_ShroomAle" or
+			defName="SD_Sweetwine"
+			]</xpath>
+		<value>
+			<weaponTags>
+				<li>CE_OneHandedWeapon</li>
+			</weaponTags>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Swords/Patches/Swords/Swords_CE_Compatbility.xml b/ModPatches/Swords/Patches/Swords/Swords_CE_Compatbility.xml
new file mode 100644
index 0000000000..9f71d529a6
--- /dev/null
+++ b/ModPatches/Swords/Patches/Swords/Swords_CE_Compatbility.xml
@@ -0,0 +1,666 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Mod Support for Combat Extended -->
+	<!-- Cloud Sword -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="LS_CloudSword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>3.5</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<armorPenetrationSharp>35</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>cleave</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>3.5</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<armorPenetrationSharp>35</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>maw</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>3.5</cooldownTime>
+					<chanceFactor>1.25</chanceFactor>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<armorPenetrationSharp>35</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>tornado</label>
+					<capacities>
+						<li>LS_DarkClouds</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>3.5</cooldownTime>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<armorPenetrationSharp>35</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>storm</label>
+					<capacities>
+						<li>LS_GatheringStorm</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>3.5</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<armorPenetrationSharp>35</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>3.5</cooldownTime>
+					<armorPenetrationBlunt>35</armorPenetrationBlunt>
+					<armorPenetrationSharp>65</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>trinity</label>
+					<capacities>
+						<li>LS_GatheringStorm</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>3.5</cooldownTime>
+					<armorPenetrationBlunt>55</armorPenetrationBlunt>
+					<armorPenetrationSharp>85</armorPenetrationSharp>
+					<chanceFactor>1.5</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>assault</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>3.5</cooldownTime>
+					<armorPenetrationBlunt>35</armorPenetrationBlunt>
+					<armorPenetrationSharp>65</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>flashback</label>
+					<capacities>
+						<li>LS_DarkClouds</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>3.5</cooldownTime>
+					<armorPenetrationBlunt>35</armorPenetrationBlunt>
+					<armorPenetrationSharp>65</armorPenetrationSharp>
+					<chanceFactor>1.5</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>strife</label>
+					<capacities>
+						<li>LS_DarkClouds</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>3.5</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>25</armorPenetrationBlunt>
+					<armorPenetrationSharp>45</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="LS_CloudSword"]/statBases</xpath>
+		<value>
+			<Bulk>9</Bulk>
+			<MeleeCounterParryBonus>1.5</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="LS_CloudSword"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.75</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="LS_CloudSword"]/weaponTags</xpath>
+		<value>
+			<weaponTags>
+				<li>CE_Sidearm_Melee</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+	<!-- Nightfall -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="LS_Nightfall"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>4.0</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<armorPenetrationSharp>35</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>cleave</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>4.0</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>35</armorPenetrationBlunt>
+					<armorPenetrationSharp>65</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>maw</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>4.0</cooldownTime>
+					<chanceFactor>1.25</chanceFactor>
+					<armorPenetrationBlunt>35</armorPenetrationBlunt>
+					<armorPenetrationSharp>65</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>vanish</label>
+					<capacities>
+						<li>LS_BlackWidow</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>4.0</cooldownTime>
+					<chanceFactor>1.75</chanceFactor>
+					<armorPenetrationBlunt>35</armorPenetrationBlunt>
+					<armorPenetrationSharp>65</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>venom</label>
+					<capacities>
+						<li>LS_BlackWidow</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>4.0</cooldownTime>
+					<chanceFactor>2</chanceFactor>
+					<armorPenetrationBlunt>35</armorPenetrationBlunt>
+					<armorPenetrationSharp>65</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shadows</label>
+					<capacities>
+						<li>LS_DarkVeil</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>4.0</cooldownTime>
+					<chanceFactor>2</chanceFactor>
+					<armorPenetrationBlunt>35</armorPenetrationBlunt>
+					<armorPenetrationSharp>65</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>4.0</cooldownTime>
+					<armorPenetrationBlunt>35</armorPenetrationBlunt>
+					<armorPenetrationSharp>65</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>impale</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>4.0</cooldownTime>
+					<armorPenetrationBlunt>35</armorPenetrationBlunt>
+					<armorPenetrationSharp>65</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>void</label>
+					<capacities>
+						<li>LS_DarkVeil</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>4.0</cooldownTime>
+					<armorPenetrationBlunt>35</armorPenetrationBlunt>
+					<armorPenetrationSharp>65</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="LS_Nightfall"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>1.75</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="LS_Nightfall"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.5</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="LS_Nightfall"]/weaponTags</xpath>
+		<value>
+			<weaponTags>
+				<li>CE_Sidearm_Melee</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+	<!-- Executioner -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="LS_Executioner"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>4.0</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<armorPenetrationSharp>35</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>cleave</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>4.0</cooldownTime>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<armorPenetrationSharp>35</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>maw</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>4.0</cooldownTime>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<armorPenetrationSharp>35</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>freeze</label>
+					<capacities>
+						<li>LS_FrozenHeart</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>4.0</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>35</armorPenetrationBlunt>
+					<armorPenetrationSharp>65</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>wind</label>
+					<capacities>
+						<li>LS_FrozenHeart</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>3.0</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>55</armorPenetrationBlunt>
+					<armorPenetrationSharp>85</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>slide</label>
+					<capacities>
+						<li>LS_FrozenHeart</li>
+					</capacities>
+					<power>32</power>
+					<cooldownTime>4.0</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>55</armorPenetrationBlunt>
+					<armorPenetrationSharp>85</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>2.0</cooldownTime>
+					<armorPenetrationBlunt>35</armorPenetrationBlunt>
+					<armorPenetrationSharp>65</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>throatcutter</label>
+					<capacities>
+						<li>LS_ExecutionersCalling</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>4.0</cooldownTime>
+					<chanceFactor>0.25</chanceFactor>
+					<armorPenetrationBlunt>55</armorPenetrationBlunt>
+					<armorPenetrationSharp>85</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>behead</label>
+					<capacities>
+						<li>LS_ExecutionersCalling</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>4.0</cooldownTime>
+					<chanceFactor>0.1</chanceFactor>
+					<armorPenetrationBlunt>55</armorPenetrationBlunt>
+					<armorPenetrationSharp>85</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="LS_Executioner"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>1.25</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="LS_Executioner"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.33</MeleeCritChance>
+			<MeleeParryChance>0.33</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="LS_Executioner"]/weaponTags</xpath>
+		<value>
+			<weaponTags>
+				<li>CE_Sidearm_Melee</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+	<!-- Deathbringer -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="LS_Deathbringer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>4.0</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<armorPenetrationSharp>35</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>cleave</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>4.0</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>25</armorPenetrationBlunt>
+					<armorPenetrationSharp>45</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>maw</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>4.0</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>25</armorPenetrationBlunt>
+					<armorPenetrationSharp>45</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>strike</label>
+					<capacities>
+						<li>LS_BloodLust</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>4.0</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>35</armorPenetrationBlunt>
+					<armorPenetrationSharp>65</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>dismantle</label>
+					<capacities>
+						<li>LS_MoonLight</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>4.0</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>25</armorPenetrationBlunt>
+					<armorPenetrationSharp>45</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>counter</label>
+					<capacities>
+						<li>LS_MoonLight</li>
+					</capacities>
+					<power>32</power>
+					<cooldownTime>3.0</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>25</armorPenetrationBlunt>
+					<armorPenetrationSharp>45</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>4.0</cooldownTime>
+					<armorPenetrationBlunt>25</armorPenetrationBlunt>
+					<armorPenetrationSharp>45</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>riposte</label>
+					<capacities>
+						<li>LS_MoonLight</li>
+					</capacities>
+					<power>32</power>
+					<cooldownTime>4.0</cooldownTime>
+					<armorPenetrationBlunt>35</armorPenetrationBlunt>
+					<armorPenetrationSharp>65</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blood rain</label>
+					<capacities>
+						<li>LS_BloodLust</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>3.0</cooldownTime>
+					<armorPenetrationBlunt>35</armorPenetrationBlunt>
+					<armorPenetrationSharp>65</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="LS_Deathbringer"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="LS_Deathbringer"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.5</MeleeCritChance>
+			<MeleeParryChance>0.33</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="LS_Deathbringer"]/weaponTags</xpath>
+		<value>
+			<weaponTags>
+				<li>CE_Sidearm_Melee</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+	<!-- Red Queen -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="LS_RedQueen"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>4.0</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<armorPenetrationSharp>35</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>cleave</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>4.0</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>25</armorPenetrationBlunt>
+					<armorPenetrationSharp>45</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>maw</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>4.0</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>25</armorPenetrationBlunt>
+					<armorPenetrationSharp>45</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>strike</label>
+					<capacities>
+						<li>LS_BloodLust</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>4.0</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>35</armorPenetrationBlunt>
+					<armorPenetrationSharp>65</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>dismantle</label>
+					<capacities>
+						<li>LS_MoonLight</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>4.0</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>25</armorPenetrationBlunt>
+					<armorPenetrationSharp>45</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>counter</label>
+					<capacities>
+						<li>LS_MoonLight</li>
+					</capacities>
+					<power>32</power>
+					<cooldownTime>3.0</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<armorPenetrationSharp>35</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>4.0</cooldownTime>
+					<armorPenetrationBlunt>25</armorPenetrationBlunt>
+					<armorPenetrationSharp>45</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>riposte</label>
+					<capacities>
+						<li>LS_MoonLight</li>
+					</capacities>
+					<power>32</power>
+					<cooldownTime>4.0</cooldownTime>
+					<armorPenetrationBlunt>35</armorPenetrationBlunt>
+					<armorPenetrationSharp>65</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blood rain</label>
+					<capacities>
+						<li>LS_BloodLust</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>3.0</cooldownTime>
+					<armorPenetrationBlunt>35</armorPenetrationBlunt>
+					<armorPenetrationSharp>65</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="LS_RedQueen"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>1.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="LS_RedQueen"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.33</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="LS_RedQueen"]/weaponTags</xpath>
+		<value>
+			<weaponTags>
+				<li>CE_OneHandedWeapon</li>
+				<li>CE_Sidearm_Melee</li>
+			</weaponTags>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/T's Conversion Staff/Patches/T's Conversion Staff/Patch_TCS_Staff.xml b/ModPatches/T's Conversion Staff/Patches/T's Conversion Staff/Patch_TCS_Staff.xml
new file mode 100644
index 0000000000..cdfa17e0a9
--- /dev/null
+++ b/ModPatches/T's Conversion Staff/Patches/T's Conversion Staff/Patch_TCS_Staff.xml	
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TCS_ConversionStaff"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.69</cooldownTime>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.85</cooldownTime>
+					<armorPenetrationBlunt>1.69</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TCS_ConversionStaff"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>0.93</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TCS_ConversionStaff"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>1.00</MeleeCritChance>
+			<MeleeParryChance>0.70</MeleeParryChance>
+			<MeleeDodgeChance>0.47</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/T's Samurai Faction/Defs/Recipes_Samurai.xml b/ModPatches/T's Samurai Faction/Defs/Recipes_Samurai.xml
new file mode 100644
index 0000000000..04ffca07d9
--- /dev/null
+++ b/ModPatches/T's Samurai Faction/Defs/Recipes_Samurai.xml	
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeTSF_Shuriken</defName>
+		<label>make shurikens x10</label>
+		<description>Craft 10 shurikens.</description>
+		<jobString>Making shurikens.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<workAmount>500</workAmount>
+		<products>
+			<TSF_Shuriken>10</TSF_Shuriken>
+		</products>
+		<recipeUsers>
+			<li>FueledSmithy</li>
+			<li>ElectricSmithy</li>
+		</recipeUsers>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/T's Samurai Faction/Patches/T's Samurai Faction/T_Samurai_Apparel.xml b/ModPatches/T's Samurai Faction/Patches/T's Samurai Faction/T_Samurai_Apparel.xml
new file mode 100644
index 0000000000..96558b8d07
--- /dev/null
+++ b/ModPatches/T's Samurai Faction/Patches/T's Samurai Faction/T_Samurai_Apparel.xml	
@@ -0,0 +1,403 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Utility-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSFApparel_SmokeBomb"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>5</Steel>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TSFApparel_SashimonoBanner"]/equippedStatOffsets</xpath>
+		<value>
+			<Suppressability>-0.25</Suppressability>
+		</value>
+	</Operation>
+
+	<!--Clothes-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TSFApparel_StrawCoat" or
+			defName="TSFApparel_StrawHat"]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>0.10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TSFApparel_NinjaMask" or
+			defName="TSFApparel_StrawCoat"]/equippedStatOffsets/MeleeDodgeChance </xpath>
+		<value>
+			<MeleeDodgeChance>0.3</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSFApparel_NinjaMask"]/stuffCategories</xpath>
+		<value>
+			<stuffCategories>
+				<li>Steeled</li>
+			</stuffCategories>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSFApparel_NinjaMask"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TSFApparel_NinjaMask" or
+			defName="TSFApparel_Gi" or
+			defName="TSFApparel_Kimono"]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TSFApparel_Gi" or
+			defName="TSFApparel_Kimono"]/statBases/Mass </xpath>
+		<value>
+			<Mass>1.2</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TSFApparel_Yukata" or
+			defName="TSFApparel_HaoriJacket"]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TSFApparel_HaoriJacket" or
+			defName="TSFApparel_Yukata"]/costStuffCount </xpath>
+		<value>
+			<costStuffCount>60</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSFApparel_Kimono"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>80</costStuffCount>
+		</value>
+	</Operation>
+
+	<!-- ======= Armor ======= -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TSFApparel_AshigaruArmor" or
+			defName="TSFApparel_AshigaruHelmet" or
+			defName="TSFApparel_SamuraiArmor" or
+			defName="TSFApparel_SamuraiHelmet" or
+			defName="TSFApparel_DaimyoHelmet"]/stuffCategories </xpath>
+		<value>
+			<stuffCategories>
+				<li>Steeled</li>
+			</stuffCategories>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TSFApparel_AshigaruArmor" or
+			defName="TSFApparel_SamuraiArmor"]/apparel/layers </xpath>
+		<value>
+			<layers>
+				<li>Shell</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<!-- === Ashigaru === -->
+	<!-- == Armor == -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TSFApparel_AshigaruArmor"]/statBases</xpath>
+		<value>
+			<Bulk>40</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSFApparel_AshigaruArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.6</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSFApparel_AshigaruArmor"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>110</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSFApparel_AshigaruArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>9</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="TSFApparel_AshigaruArmor"]/equippedStatOffsets</xpath>
+	</Operation>
+
+	<!-- == Helmet == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSFApparel_AshigaruHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.8</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TSFApparel_AshigaruHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSFApparel_AshigaruHelmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>1.75</Mass>
+		</value>
+	</Operation>
+
+	<!-- === Samurai === -->
+	<!-- == Armor == -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TSFApparel_SamuraiArmor"]/statBases</xpath>
+		<value>
+			<Bulk>60</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSFApparel_SamuraiArmor"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>160</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSFApparel_SamuraiArmor"]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>Shell</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSFApparel_SamuraiArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.00</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSFApparel_SamuraiArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>13</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSFApparel_SamuraiArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeDodgeChance>-0.10</MeleeDodgeChance>
+				<Suppressability>-0.20</Suppressability>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- == Helmet == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TSFApparel_SamuraiHelmet" or
+			defName="TSFApparel_DaimyoHelmet"]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="TSFApparel_SamuraiHelmet" or
+			defName="TSFApparel_DaimyoHelmet"]/statBases </xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="TSFApparel_SamuraiHelmet" or
+			defName="TSFApparel_DaimyoHelmet"]/equippedStatOffsets </xpath>
+		<value>
+			<Suppressability>-0.10</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TSFApparel_SamuraiHelmet" or
+			defName="TSFApparel_DaimyoHelmet"]/apparel/bodyPartGroups </xpath>
+		<value>
+			<bodyPartGroups>
+				<li>UpperHead</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSFApparel_DaimyoHelmet"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>55</costStuffCount>
+		</value>
+	</Operation>
+
+	<!-- === Oni Gear Armor === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TSFApparel_OniHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TSFApparel_OniArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TSFApparel_OniHelmet"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>30</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TSFApparel_OniArmor"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>60</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<!-- == Helmet == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSFApparel_OniHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<MaxHitPoints>240</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSFApparel_OniHelmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>3.5</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="TSFApparel_OniHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="TSFApparel_OniHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TSFApparel_OniHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingAccuracy>0.15</AimingAccuracy>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSFApparel_OniHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>17</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSFApparel_OniHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>38</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- == Armor == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSFApparel_OniArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+			<MaxHitPoints>500</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSFApparel_OniArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>50</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSFApparel_OniArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<CarryWeight>80</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+			<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSFApparel_OniArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>21</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSFApparel_OniArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>48</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/T's Samurai Faction/Patches/T's Samurai Faction/T_Samurai_Legendary_Melee.xml b/ModPatches/T's Samurai Faction/Patches/T's Samurai Faction/T_Samurai_Legendary_Melee.xml
new file mode 100644
index 0000000000..2b59113534
--- /dev/null
+++ b/ModPatches/T's Samurai Faction/Patches/T's Samurai Faction/T_Samurai_Legendary_Melee.xml	
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Masamune ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TSF_Masamune"]/statBases</xpath>
+		<value>
+			<Bulk>7</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSF_Masamune"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeCritChance>0.68</MeleeCritChance>
+			<MeleeParryChance>0.75</MeleeParryChance>
+			<MeleeDodgeChance>0.4</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSF_Masamune"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.69</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>31</power>
+					<cooldownTime>1.69</cooldownTime>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<armorPenetrationSharp>3.375</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>43</power>
+					<cooldownTime>1.56</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>6.48</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.625</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Muramasa ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TSF_Muramasa"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<MeleeCounterParryBonus>0.70</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSF_Muramasa"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeCritChance>0.85</MeleeCritChance>
+			<MeleeParryChance>0.60</MeleeParryChance>
+			<MeleeDodgeChance>0.30</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSF_Muramasa"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.69</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>38</power>
+					<cooldownTime>1.98</cooldownTime>
+					<chanceFactor>0.50</chanceFactor>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<armorPenetrationSharp>3.625</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>48</power>
+					<cooldownTime>2.86</cooldownTime>
+					<chanceFactor>0.45</chanceFactor>
+					<armorPenetrationBlunt>8.98</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.75</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/T's Samurai Faction/Patches/T's Samurai Faction/T_Samurai_Pawnkinds.xml b/ModPatches/T's Samurai Faction/Patches/T's Samurai Faction/T_Samurai_Pawnkinds.xml
new file mode 100644
index 0000000000..f235af2c8b
--- /dev/null
+++ b/ModPatches/T's Samurai Faction/Patches/T's Samurai Faction/T_Samurai_Pawnkinds.xml	
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="TSF_TownGaurd" or
+			defName="TSF_AshigaruYumi"] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>20</min>
+					<max>30</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>200</min>
+						<max>300</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>NeolithicMeleeBasic</li>
+						<li>MedievalMeleeDecent</li>
+						<li>SamuraiMeleeBasic</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="TSF_AshigaruMortar"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>8</min>
+					<max>12</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>200</min>
+						<max>300</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>SamuraiMeleeSidearm</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="TSF_SamuraiWarriorYumi" or
+			defName="TSF_Noble"] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>25</min>
+					<max>35</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>200</min>
+						<max>300</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>SamuraiMeleeSidearm</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="TSF_AshigaruMatchlock" or
+			defName="TSF_SamuraiWarriorMatchlock" or
+			defName="TSF_NinjaMatchlock"] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>15</min>
+					<max>20</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>200</min>
+						<max>300</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>SamuraiMeleeSidearm</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[
+			defName="TSF_TownGaurd" or
+			@Name="TSF_AshigaruBase" or
+			defName="TSF_SamuraiWarriorYumi" or
+			defName="TSF_SamuraiWarriorMatchlock" or
+			defName="TSF_Noble" or
+			@Name="TSF_Ninjabase"]/apparelRequired </xpath>
+		<value>
+			<li>CE_Apparel_TribalBackpack</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[@Name="TSF_Ninjabase"]/weaponMoney</xpath>
+		<value>
+			<weaponMoney>250~600</weaponMoney>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="TSF_SamuraiWarriorHeavy"]/weaponMoney</xpath>
+		<value>
+			<weaponMoney>370~700</weaponMoney>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/PawnKindDef[
+			defName="TSF_TownGaurd" or
+			defName="TSF_Peasant" or
+			@Name="TSF_Ninjabase" or
+			@Name="TSF_AshigaruBase"]/itemQuality </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[
+			defName="TSF_SamuraiDaimyo" or
+			defName="TSF_Noble"]/itemQuality </xpath>
+		<value>
+			<itemQuality>Excellent</itemQuality>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="WanderingRonin"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_Arrow_Steel</thingDef>
+				<count>80</count>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/T's Samurai Faction/Patches/T's Samurai Faction/T_Samurai_Spacer_Weapons.xml b/ModPatches/T's Samurai Faction/Patches/T's Samurai Faction/T_Samurai_Spacer_Weapons.xml
new file mode 100644
index 0000000000..a3d8f031d0
--- /dev/null
+++ b/ModPatches/T's Samurai Faction/Patches/T's Samurai Faction/T_Samurai_Spacer_Weapons.xml	
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ======= Oni cannon ======= -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>TSF_OniCannon</defName>
+		<statBases>
+			<Mass>7</Mass>
+			<Bulk>13.0</Bulk>
+			<SwayFactor>1.9</SwayFactor>
+			<ShotSpread>0.03</ShotSpread>
+			<SightsEfficiency>2.6</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
+			<NightVisionEfficiency_Weapon>0.4</NightVisionEfficiency_Weapon>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_8x50mmCharged</defaultProjectile>
+			<warmupTime>1.6</warmupTime>
+			<range>78</range>
+			<soundCast>ChargeLance_Fire</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_8x50mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>SniperRifle</li>
+			<li>OniWeapon</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ======= Oni Kanabo ======= -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TSF_OniKanabo"]/statBases</xpath>
+		<value>
+			<Bulk>13</Bulk>
+			<MeleeCounterParryBonus>0.26</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TSF_OniKanabo"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.75</MeleeCritChance>
+				<MeleeParryChance>0.34</MeleeParryChance>
+				<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSF_OniKanabo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.85</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>38</power>
+					<cooldownTime>1.85</cooldownTime>
+					<armorPenetrationBlunt>152.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/T's Samurai Faction/Patches/T's Samurai Faction/T_Samurai_Weapons_Melee.xml b/ModPatches/T's Samurai Faction/Patches/T's Samurai Faction/T_Samurai_Weapons_Melee.xml
new file mode 100644
index 0000000000..88086befa7
--- /dev/null
+++ b/ModPatches/T's Samurai Faction/Patches/T's Samurai Faction/T_Samurai_Weapons_Melee.xml	
@@ -0,0 +1,296 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSF_Sake"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2.22</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>neck</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>3.33</cooldownTime>
+					<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Neck</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Katana ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TSF_Katana"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSF_Katana"]/statBases/Mass</xpath>
+		<value>
+			<Mass>1.3</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TSF_Katana"]/weaponTags</xpath>
+		<value>
+			<li>SamuraiMeleeSidearm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSF_Katana"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeCritChance>0.63</MeleeCritChance>
+			<MeleeParryChance>0.75</MeleeParryChance>
+			<MeleeDodgeChance>0.4</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSF_Katana"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.69</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.69</cooldownTime>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.35</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>1.56</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>2.592</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.65</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Odachi ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TSF_Odachi"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>0.70</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSF_Odachi"]/statBases/Mass</xpath>
+		<value>
+			<Mass>2.6</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSF_Odachi"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeCritChance>0.80</MeleeCritChance>
+			<MeleeParryChance>0.60</MeleeParryChance>
+			<MeleeDodgeChance>0.30</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSF_Odachi"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.69</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.98</cooldownTime>
+					<chanceFactor>0.50</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.45</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>42</power>
+					<cooldownTime>2.86</cooldownTime>
+					<chanceFactor>0.45</chanceFactor>
+					<armorPenetrationBlunt>3.592</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.70</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Naginata ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TSF_Naginata"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<MeleeCounterParryBonus>1.27</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TSF_Naginata"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.08</MeleeCritChance>
+			<MeleeParryChance>0.95</MeleeParryChance>
+			<MeleeDodgeChance>1.27</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSF_Naginata"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.3</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.8</cooldownTime>
+					<chanceFactor>0.20</chanceFactor>
+					<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.6</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>2.3</cooldownTime>
+					<chanceFactor>0.75</chanceFactor>
+					<armorPenetrationBlunt>4.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Yari ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TSF_Yari"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TSF_Yari"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.17</MeleeCritChance>
+			<MeleeParryChance>1.45</MeleeParryChance>
+			<MeleeDodgeChance>0.9</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSF_Yari"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2.20</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.79</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>1.8</cooldownTime>
+					<chanceFactor>0.90</chanceFactor>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/T's Samurai Faction/Patches/T's Samurai Faction/T_Samurai_Weapons_Ranged.xml b/ModPatches/T's Samurai Faction/Patches/T's Samurai Faction/T_Samurai_Weapons_Ranged.xml
new file mode 100644
index 0000000000..be04e6fc4e
--- /dev/null
+++ b/ModPatches/T's Samurai Faction/Patches/T's Samurai Faction/T_Samurai_Weapons_Ranged.xml	
@@ -0,0 +1,337 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TSF_Tanegashima_Short" or
+			defName="TSF_Tanegashima_Matchlock" or
+			defName="TSF_Hand_Mortar"
+			]/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>
+
+	<!-- Short Gun -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>TSF_Tanegashima_Short</defName>
+		<statBases>
+			<WorkToMake>12000</WorkToMake>
+			<Bulk>4.75</Bulk>
+			<Mass>2.5</Mass>
+			<SwayFactor>1.22</SwayFactor>
+			<ShotSpread>0.30</ShotSpread>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>35</Steel>
+			<WoodLog>8</WoodLog>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_SlowMusketBall</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>28</range>
+			<soundCast>Shot_Musket</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>5.5</reloadTime>
+			<ammoSet>AmmoSet_SlowMusketBall</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>NeolithicRangedHeavy</li>
+			<li>NeolithicRangedChief</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Long Gun -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>TSF_Tanegashima_Matchlock</defName>
+		<statBases>
+			<WorkToMake>20000</WorkToMake>
+			<Mass>4.8</Mass>
+			<Bulk>14.9</Bulk>
+			<SwayFactor>1.92</SwayFactor>
+			<ShotSpread>0.25</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>1.35</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>65</Steel>
+			<WoodLog>15</WoodLog>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_FastMusketBall</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>40</range>
+			<soundCast>Shot_Musket</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>7.5</reloadTime>
+			<ammoSet>AmmoSet_FastMusketBall</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>NeolithicRangedHeavy</li>
+			<li>NeolithicRangedChief</li>
+		</weaponTags>
+	</Operation>
+
+	<!--Hand Mortar-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>TSF_Hand_Mortar</defName>
+		<statBases>
+			<Mass>7.5</Mass>
+			<Bulk>12.9</Bulk>
+			<SwayFactor>1.92</SwayFactor>
+			<ShotSpread>0.8</ShotSpread>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_MortarGrenade</defaultProjectile>
+			<warmupTime>1.6</warmupTime>
+			<range>37</range>
+			<soundCast>Shot_IncendiaryLauncher</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>True</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>8</reloadTime>
+			<ammoSet>AmmoSet_MortarGrenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AOE</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Yumi ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>TSF_Yumi</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>1</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>8.00</Bulk>
+			<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_StreamlinedArrow_Steel</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>20</range>
+			<soundCast>Bow_Recurve</soundCast>
+		</Properties>
+		<AmmoUser>
+			<ammoSet>AmmoSet_StreamlinedArrow</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_Bow</li>
+		</weaponTags>
+		<researchPrerequisite>RecurveBow</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSF_Yumi"]/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>
+	</Operation>
+
+	<!--Shuriken (removed because I can't make it not hurt internal organs too often)-->
+
+	<!--disable this disabler part in case of fix for above problem
+          <li Class="PatchOperationRemove">
+            <xpath>Defs/ThingDef[
+              defName="TSF_Star_Thrown" or
+              defName="TSF_Shuriken"]</xpath>
+          </li>
+          
+          <li Class="PatchOperationRemove">
+            <xpath>Defs/PawnKindDef[
+              @Name="TSF_Ninjabase"]/weaponTags</xpath>
+          </li>
+
+-->
+
+	<!-- == Projectile == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSF_Star_Thrown"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<damageDef>Cut</damageDef>
+				<damageAmountBase>5</damageAmountBase>
+				<flyOverhead>false</flyOverhead>
+				<speed>30</speed>
+				<armorPenetrationSharp>0.16</armorPenetrationSharp>
+				<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				<preExplosionSpawnChance>0.15</preExplosionSpawnChance>
+				<preExplosionSpawnThingDef>TSF_Shuriken</preExplosionSpawnThingDef>
+			</projectile>
+		</value>
+	</Operation>
+
+	<!-- == Weapon == -->
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="TSF_Shuriken"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>BaseWeapon</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TSF_Shuriken"]</xpath>
+		<value>
+			<thingCategories>
+				<li>WeaponsRanged</li>
+			</thingCategories>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="TSF_Shuriken"]/recipeMaker</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="TSF_Shuriken"]/costList</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TSF_Shuriken"]</xpath>
+		<value>
+			<thingClass>CombatExtended.AmmoThing</thingClass>
+			<stackLimit>75</stackLimit>
+			<resourceReadoutPriority>First</resourceReadoutPriority>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="TSF_Shuriken"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>TSF_Shuriken</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<Bulk>0.20</Bulk>
+			<Mass>0.30</Mass>
+			<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<label>Throw shuriken</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>TSF_Star_Thrown</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>8</range>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<burstShotCount>3</burstShotCount>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<soundCast>Interact_BeatFire</soundCast>
+			<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TSF_Shuriken"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.26</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Tactical Extremity Protection [BAL]/Patches/Tactical Extremity Protection [BAL]/Armor_Industrial.xml b/ModPatches/Tactical Extremity Protection [BAL]/Patches/Tactical Extremity Protection [BAL]/Armor_Industrial.xml
new file mode 100644
index 0000000000..da8780ceba
--- /dev/null
+++ b/ModPatches/Tactical Extremity Protection [BAL]/Patches/Tactical Extremity Protection [BAL]/Armor_Industrial.xml	
@@ -0,0 +1,379 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Assault Rig === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TEP_AssaultRig"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TEP_AssaultRig"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>6.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TEP_AssaultRig"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="TEP_AssaultRig"]/equippedStatOffsets</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TEP_AssaultRig"]/stuffCategories/li[.="Metallic"]</xpath>
+		<value>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<!-- === Frontier Carapace === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TEP_FrontierCarapace"]/statBases</xpath>
+		<value>
+			<Bulk>80</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TEP_FrontierCarapace"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TEP_FrontierCarapace"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TEP_FrontierCarapace"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>7</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TEP_FrontierCarapace"]/equippedStatOffsets/CarryingCapacity</xpath>
+		<value>
+			<CarryBulk>35</CarryBulk>
+			<CarryWeight>5</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TEP_FrontierCarapace"]/stuffCategories/li[.="Metallic"]</xpath>
+		<value>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<!-- === Light Arm Protectors === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TEP_LightArmProtectors"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TEP_LightArmProtectors"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.85</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="TEP_LightArmProtectors"]/statBases/ArmorRating_Sharp</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TEP_LightArmProtectors"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeDodgeChance>-0.05</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TEP_LightArmProtectors"]/stuffCategories/li[.="Metallic"]</xpath>
+		<value>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<!-- === Light Leg Protectors === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TEP_LightLegProtectors"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TEP_LightLegProtectors"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="TEP_LightLegProtectors"]/statBases/ArmorRating_Sharp</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="TEP_LightLegProtectors"]/equippedStatOffsets</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TEP_LightLegProtectors"]/stuffCategories/li[.="Metallic"]</xpath>
+		<value>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<!-- === Heavy Arm Protectors === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TEP_HeavyArmProtectors"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TEP_HeavyArmProtectors"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.25</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="TEP_HeavyArmProtectors"]/statBases/ArmorRating_Sharp</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TEP_HeavyArmProtectors"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeDodgeChance>-0.10</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TEP_HeavyArmProtectors"]/stuffCategories/li[.="Metallic"]</xpath>
+		<value>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<!-- === Heavy Leg Protectors === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TEP_HeavyLegProtectors"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TEP_HeavyLegProtectors"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.85</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="TEP_HeavyLegProtectors"]/statBases/ArmorRating_Sharp</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TEP_HeavyLegProtectors"]/stuffCategories/li[.="Metallic"]</xpath>
+		<value>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<!-- === Light Faceshield === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TEP_LightFaceshield"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TEP_LightFaceshield"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="TEP_LightFaceshield"]/statBases/ArmorRating_Blunt</xpath>
+	</Operation>
+
+	<!-- === Heavy Faceshield === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TEP_HeavyFaceshield"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TEP_HeavyFaceshield"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TEP_HeavyFaceshield"]/stuffCategories/li[.="Metallic"]</xpath>
+		<value>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<!-- === Flak Duster === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TEP_FlakDuster"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>4</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TEP_FlakDuster"]/statBases/Mass</xpath>
+		<value>
+			<Mass>8</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TEP_FlakDuster"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TEP_FlakDuster"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TEP_FlakDuster"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="TEP_FlakDuster"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<!-- === Flak Parka === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TEP_FlakParka"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<WornBulk>7</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TEP_FlakParka"]/statBases/Mass</xpath>
+		<value>
+			<Mass>6</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TEP_FlakParka"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TEP_FlakParka"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TEP_FlakParka"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="TEP_FlakParka"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<!-- === Frontier Longcoat === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TEP_FrontierLongcoat"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TEP_FrontierLongcoat"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TEP_FrontierLongcoat"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>9</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TEP_FrontierLongcoat"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Textiles+/Patches/Textiles+/Items_Resource_Stuff.xml b/ModPatches/Textiles+/Patches/Textiles+/Items_Resource_Stuff.xml
new file mode 100644
index 0000000000..61399fd1f9
--- /dev/null
+++ b/ModPatches/Textiles+/Patches/Textiles+/Items_Resource_Stuff.xml
@@ -0,0 +1,365 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--===============  Denim.  ====================-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Denim"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.02</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Denim"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.04</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Denim"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.044</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Denim"]/statBases</xpath>
+		<value>
+			<Bulk>0.05</Bulk>
+		</value>
+	</Operation>
+
+	<!--===============  Silk  ====================-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Silk"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.008</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Silk"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.010</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Silk"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.022</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Silk"]/statBases</xpath>
+		<value>
+			<Bulk>0.05</Bulk>
+		</value>
+	</Operation>
+
+	<!--===============  Linen  ====================-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Linen"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.012</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Linen"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.020</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Linen"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.044</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Linen"]/statBases</xpath>
+		<value>
+			<Bulk>0.05</Bulk>
+		</value>
+	</Operation>
+
+	<!--===============  Furstain. ====================-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Fustian"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.015</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Fustian"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.030</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Fustian"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.044</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Fustian"]/statBases</xpath>
+		<value>
+			<Bulk>0.05</Bulk>
+		</value>
+	</Operation>
+
+	<!--===============  Corduroy  ====================-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Corduroy"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.03</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Corduroy"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.06</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Corduroy"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.044</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Corduroy"]/statBases</xpath>
+		<value>
+			<Bulk>0.05</Bulk>
+		</value>
+	</Operation>
+
+	<!--===============  Hemp  ====================-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Hemp"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.01</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Hemp"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.015</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Hemp"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.044</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Hemp"]/statBases</xpath>
+		<value>
+			<Bulk>0.05</Bulk>
+		</value>
+	</Operation>
+
+	<!--===============  Velvet  ====================-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Velvet"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.009</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Velvet"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.012</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Velvet"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.033</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Velvet"]/statBases</xpath>
+		<value>
+			<Bulk>0.05</Bulk>
+		</value>
+	</Operation>
+
+	<!--===============  Kevlar  ====================-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="Make_Kevlar"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Synthread</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>DevilstrandCloth</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kevlar"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.6</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kevlar"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.12</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kevlar"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.10</StuffPower_Armor_Heat>
+			<StuffPower_Armor_Electric>0.05</StuffPower_Armor_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Kevlar"]/statBases</xpath>
+		<value>
+			<Bulk>0.075</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Kevlar"]/stuffProps/categories</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Kevlar"]/stuffProps</xpath>
+			<value>
+				<categories>
+					<li>SoftArmor</li>
+				</categories>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Kevlar"]/stuffProps/categories</xpath>
+			<value>
+				<li>SoftArmor</li>
+			</value>
+		</match>
+	</Operation>
+	<!--===============  Sinstrand  ====================-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/RecipeDef[defName="Make_Sinstrand"]/ingredients</xpath>
+		<value>
+			<ingredients>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>Fustian</li>
+						</thingDefs>
+					</filter>
+					<count>20</count>
+				</li>
+				<li>
+					<filter>
+						<thingDefs>
+							<li>DevilstrandCloth</li>
+						</thingDefs>
+					</filter>
+					<count>10</count>
+				</li>
+			</ingredients>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Sinstrand"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.55</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Sinstrand"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.11</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Sinstrand"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
+			<StuffPower_Armor_Electric>0.025</StuffPower_Armor_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Sinstrand"]/statBases</xpath>
+		<value>
+			<Bulk>0.75</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Sinstrand"]/stuffProps/statFactors/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Sinstrand"]/stuffProps/categories</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Sinstrand"]/stuffProps</xpath>
+			<value>
+				<categories>
+					<li>SoftArmor</li>
+				</categories>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Sinstrand"]/stuffProps/categories</xpath>
+			<value>
+				<li>SoftArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/The Corporation - Mort's Factions/Patches/The Corporation - Mort's Factions/Corporation_TraderKinds.xml b/ModPatches/The Corporation - Mort's Factions/Patches/The Corporation - Mort's Factions/Corporation_TraderKinds.xml
new file mode 100644
index 0000000000..e804cf38ca
--- /dev/null
+++ b/ModPatches/The Corporation - Mort's Factions/Patches/The Corporation - Mort's Factions/Corporation_TraderKinds.xml	
@@ -0,0 +1,386 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Corpo Base ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="MF_Base_Corporate_Standard"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>FSX</thingDef>
+				<countRange>
+					<min>25</min>
+					<max>100</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>Prometheum</thingDef>
+				<countRange>
+					<min>25</min>
+					<max>100</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Ammo</tradeTag>
+				<countRange>
+					<min>500</min>
+					<max>2000</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>5</min>
+					<max>9</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_MediumAmmo</tradeTag>
+				<countRange>
+					<min>30</min>
+					<max>100</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>5</min>
+					<max>8</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_HeavyAmmo</tradeTag>
+				<countRange>
+					<min>10</min>
+					<max>50</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>4</min>
+					<max>6</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Category">
+				<categoryDef>Ammo</categoryDef>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>0</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Turret</tradeTag>
+				<thingDefCountRange>
+					<min>-2</min>
+					<max>4</max>
+				</thingDefCountRange>
+				<countRange>
+					<min>1</min>
+					<max>2</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_Category">
+				<categoryDef>WeaponsTurrets</categoryDef>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>0</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Animals">
+				<tradeTagsSell>
+					<li>CE_AnimalBoom</li>
+				</tradeTagsSell>
+				<tradeTagsBuy>
+					<li>CE_AnimalBoom</li>
+				</tradeTagsBuy>
+				<kindCountRange>
+					<min>1</min>
+					<max>2</max>
+				</kindCountRange>
+				<countRange>
+					<min>-2</min>
+					<max>4</max>
+				</countRange>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Corpo Caravan ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="MF_Corporate_Caravan_BulkGoods"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Ammo</tradeTag>
+				<countRange>
+					<min>200</min>
+					<max>400</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>1</min>
+					<max>4</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_MediumAmmo</tradeTag>
+				<countRange>
+					<min>20</min>
+					<max>40</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>2</min>
+					<max>6</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_HeavyAmmo</tradeTag>
+				<countRange>
+					<min>5</min>
+					<max>10</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>2</min>
+					<max>4</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Category">
+				<categoryDef>Ammo</categoryDef>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>0</max>
+				</thingDefCountRange>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="MF_Corporate_Caravan_BulkGoods"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>FSX</thingDef>
+				<countRange>
+					<min>25</min>
+					<max>65</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>Prometheum</thingDef>
+				<countRange>
+					<min>25</min>
+					<max>65</max>
+				</countRange>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="MF_Corporate_Caravan_Slaver"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Ammo</tradeTag>
+				<countRange>
+					<min>100</min>
+					<max>300</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>1</min>
+					<max>3</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_MediumAmmo</tradeTag>
+				<countRange>
+					<min>5</min>
+					<max>20</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>1</min>
+					<max>4</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_HeavyAmmo</tradeTag>
+				<countRange>
+					<min>5</min>
+					<max>10</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>1</min>
+					<max>2</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Category">
+				<categoryDef>Ammo</categoryDef>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>0</max>
+				</thingDefCountRange>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Combat Supplier -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="MF_Corporate_Caravan_CombatSupplier"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>FSX</thingDef>
+				<countRange>
+					<min>15</min>
+					<max>40</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>Prometheum</thingDef>
+				<countRange>
+					<min>15</min>
+					<max>40</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Ammo</tradeTag>
+				<countRange>
+					<min>400</min>
+					<max>1000</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>3</min>
+					<max>8</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_MediumAmmo</tradeTag>
+				<countRange>
+					<min>30</min>
+					<max>60</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>3</min>
+					<max>6</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_HeavyAmmo</tradeTag>
+				<countRange>
+					<min>10</min>
+					<max>15</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>4</min>
+					<max>6</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Category">
+				<categoryDef>Ammo</categoryDef>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>0</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Turret</tradeTag>
+				<thingDefCountRange>
+					<min>-4</min>
+					<max>2</max>
+				</thingDefCountRange>
+				<countRange>
+					<min>1</min>
+					<max>1</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_Category">
+				<categoryDef>WeaponsTurrets</categoryDef>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>0</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Animals">
+				<tradeTagsSell>
+					<li>CE_AnimalBoom</li>
+				</tradeTagsSell>
+				<tradeTagsBuy>
+					<li>CE_AnimalBoom</li>
+				</tradeTagsBuy>
+				<kindCountRange>
+					<min>1</min>
+					<max>1</max>
+				</kindCountRange>
+				<countRange>
+					<min>-1</min>
+					<max>2</max>
+				</countRange>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="MF_Corporate_Caravan_Exotic"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_Animals">
+				<tradeTagsSell>
+					<li>CE_AnimalBoom</li>
+				</tradeTagsSell>
+				<tradeTagsBuy>
+					<li>CE_AnimalBoom</li>
+				</tradeTagsBuy>
+				<kindCountRange>
+					<min>1</min>
+					<max>2</max>
+				</kindCountRange>
+				<countRange>
+					<min>-2</min>
+					<max>4</max>
+				</countRange>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Orbital Corpo Trader -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="MF_Orbital_Corporate"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Ammo</tradeTag>
+				<countRange>
+					<min>200</min>
+					<max>800</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>3</min>
+					<max>6</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_MediumAmmo</tradeTag>
+				<countRange>
+					<min>60</min>
+					<max>120</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>4</min>
+					<max>7</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_HeavyAmmo</tradeTag>
+				<countRange>
+					<min>15</min>
+					<max>50</max>
+				</countRange>
+				<price>Cheap</price>
+				<thingDefCountRange>
+					<min>2</min>
+					<max>4</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Category">
+				<categoryDef>Ammo</categoryDef>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>0</max>
+				</thingDefCountRange>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/The Corporation - Mort's Factions/Patches/The Corporation - Mort's Factions/Pawnkinds_Corporation.xml b/ModPatches/The Corporation - Mort's Factions/Patches/The Corporation - Mort's Factions/Pawnkinds_Corporation.xml
new file mode 100644
index 0000000000..0b8e5dc4fe
--- /dev/null
+++ b/ModPatches/The Corporation - Mort's Factions/Patches/The Corporation - Mort's Factions/Pawnkinds_Corporation.xml	
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="MF_CorporatePunk"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.35</generateChance>
+						<sidearmMoney>
+							<min>10</min>
+							<max>150</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="MF_CorporatePunkMechanitor"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[
+			@Name="MF_CorporateSecurityBase" or
+			@Name="MF_CorporatePunkBase"
+			]/apparelRequired </xpath>
+		<value>
+			<li>CE_Apparel_Backpack</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			@Name="MF_CorporateEmployeeBase" or
+			@Name="MF_CorporateBase"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="MF_Corporate_Fighter_Security" or
+			defName="MF_Corporate_Fighter_AugmentMarine"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="MF_CorporateMercenaryBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>25</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+					<li>
+						<generateChance>0.05</generateChance>
+						<sidearmMoney>
+							<min>80</min>
+							<max>160</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_FlareLauncher</li>
+						</weaponTags>
+						<magazineCount>
+							<min>2</min>
+							<max>5</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/The GiantRace/Defs/Ammo_Giant.xml b/ModPatches/The GiantRace/Defs/Ammo_Giant.xml
new file mode 100644
index 0000000000..cd0f05c686
--- /dev/null
+++ b/ModPatches/The GiantRace/Defs/Ammo_Giant.xml	
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- == Projectiles == -->
+
+	<ThingDef ParentName="Base81mmMortarShell">
+		<defName>Bullet_81mmMortarShell_GiantArmor</defName>
+		<label>81mm mortar shell (HE)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Mortar/HE</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>156</damageAmountBase>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+			<explosionRadius>2.5</explosionRadius>
+			<flyOverhead>true</flyOverhead>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<ai_IsIncendiary>true</ai_IsIncendiary>
+			<speed>35</speed>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>16</Fragment_Large>
+					<Fragment_Small>100</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- == Recipes == -->
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>Make_GI_Jackstones_limestone</defName>
+		<label>make limestone jackstones x10</label>
+		<description>Craft 10 limestone jackstones.</description>
+		<jobString>Making limestone jackstones.</jobString>
+		<workAmount>500</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>BlocksLimestone</li>
+					</thingDefs>
+				</filter>
+				<count>25</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>BlocksLimestone</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<recipeUsers>
+			<li>CraftingSpot</li>
+			<li>ElectricSmithy</li>
+			<li>FueledSmithy</li>
+		</recipeUsers>
+		<products>
+			<GI_Jackstones_limestone>10</GI_Jackstones_limestone>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>Make_GI_Jackstones_granite</defName>
+		<label>make granite jackstones x10</label>
+		<description>Craft 10 granite jackstones.</description>
+		<jobString>Making granite jackstones.</jobString>
+		<workAmount>500</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>BlocksGranite</li>
+					</thingDefs>
+				</filter>
+				<count>25</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>BlocksGranite</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<recipeUsers>
+			<li>CraftingSpot</li>
+			<li>ElectricSmithy</li>
+			<li>FueledSmithy</li>
+		</recipeUsers>
+		<products>
+			<GI_Jackstones_granite>10</GI_Jackstones_granite>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>Make_GI_Javelin</defName>
+		<label>make giant javelin x10</label>
+		<description>Craft 10 giant javelins.</description>
+		<jobString>Making giant javelins.</jobString>
+		<workAmount>8500</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>120</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ElephantTusk</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+				<li>ElephantTusk</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<recipeUsers>
+			<li>CraftingSpot</li>
+			<li>ElectricSmithy</li>
+			<li>FueledSmithy</li>
+		</recipeUsers>
+		<products>
+			<GI_Javelin>10</GI_Javelin>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>Make_GI_Scrapmetal</defName>
+		<label>make scrapmetal bundle x25</label>
+		<description>Craft 10 scrapmetal bundles.</description>
+		<jobString>Making scrapmetal bundles.</jobString>
+		<workAmount>3800</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>120</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>BlocksGranite</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<recipeUsers>
+			<li>ElectricSmithy</li>
+			<li>FueledSmithy</li>
+		</recipeUsers>
+		<products>
+			<GI_Scrapmetal>25</GI_Scrapmetal>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>Make_Rockpillar_granite</defName>
+		<label>make granite rockpillar x25</label>
+		<description>Craft 10 granite rockpillars.</description>
+		<jobString>Making granite rockpillars.</jobString>
+		<workAmount>18500</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>BlocksGranite</li>
+					</thingDefs>
+				</filter>
+				<count>250</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>BlocksGranite</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<recipeUsers>
+			<li>ElectricSmithy</li>
+			<li>FueledSmithy</li>
+		</recipeUsers>
+		<products>
+			<GI_Rockpillar_granite>25</GI_Rockpillar_granite>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>Make_Rockpillar_marble</defName>
+		<label>make marble rockpillar x25</label>
+		<description>Craft 25 marble rockpillars.</description>
+		<jobString>Making marble rockpillars.</jobString>
+		<workAmount>18500</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>BlocksMarble</li>
+					</thingDefs>
+				</filter>
+				<count>250</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>BlocksGranite</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<recipeUsers>
+			<li>ElectricSmithy</li>
+			<li>FueledSmithy</li>
+		</recipeUsers>
+		<products>
+			<GI_Rockpillar_Marble>25</GI_Rockpillar_Marble>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>Make_GI_Lightningjavelin</defName>
+		<label>make lightning javelin x10</label>
+		<description>Craft 10 lightning javelins.</description>
+		<jobString>Making lightning javelins.</jobString>
+		<workAmount>28500</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>200</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<recipeUsers>
+		</recipeUsers>
+		<products>
+			<GI_Javelin>10</GI_Javelin>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/The GiantRace/Patches/The GiantRace/PawnKindDefs/Giant_PawnKind.xml b/ModPatches/The GiantRace/Patches/The GiantRace/PawnKindDefs/Giant_PawnKind.xml
new file mode 100644
index 0000000000..c4ede030a7
--- /dev/null
+++ b/ModPatches/The GiantRace/Patches/The GiantRace/PawnKindDefs/Giant_PawnKind.xml	
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Ammo-->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			@Name="GIBasePawnKind"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>20</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Points reductions across the board, along the same lines as tribals-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Gi_Warrior"]/combatPower</xpath>
+		<value>
+			<combatPower>210</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Gi_Thrower"]/combatPower</xpath>
+		<value>
+			<combatPower>240</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Gi_ExpertWarrior"]/combatPower</xpath>
+		<value>
+			<combatPower>285</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Gi_ExpertThrower"]/combatPower</xpath>
+		<value>
+			<combatPower>300</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Gi_Champion"]/combatPower</xpath>
+		<value>
+			<combatPower>375</combatPower>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/The GiantRace/Patches/The GiantRace/Scenario/Giant_Scenario.xml b/ModPatches/The GiantRace/Patches/The GiantRace/Scenario/Giant_Scenario.xml
new file mode 100644
index 0000000000..9b63ca6223
--- /dev/null
+++ b/ModPatches/The GiantRace/Patches/The GiantRace/Scenario/Giant_Scenario.xml	
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="GI_Scenario"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_Arrow_Stone</thingDef>
+				<count>100</count>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/The GiantRace/Patches/The GiantRace/ThingDefs_Misc/GiantApparel.xml b/ModPatches/The GiantRace/Patches/The GiantRace/ThingDefs_Misc/GiantApparel.xml
new file mode 100644
index 0000000000..7cf4f00465
--- /dev/null
+++ b/ModPatches/The GiantRace/Patches/The GiantRace/ThingDefs_Misc/GiantApparel.xml	
@@ -0,0 +1,305 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_GiantRags"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+			<Bulk>6</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Clothes"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
+			<Bulk>8</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Coverall"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
+			<Bulk>12</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GI_Coverall"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="GI_Coverall"]/equippedStatOffsets</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="GI_Coverall"]</xpath>
+			<value>
+				<equippedStatOffsets>
+					<CarryBulk>2.5</CarryBulk>
+				</equippedStatOffsets>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="GI_Coverall"]/equippedStatOffsets</xpath>
+			<value>
+				<CarryBulk>2.5</CarryBulk>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Brigandine"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
+			<Bulk>140</Bulk>
+			<WornBulk>25</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Brigandine"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Brigandine"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.50</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Brigandine"]/statBases/Mass</xpath>
+		<value>
+			<Mass>35</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="GI_Brigandine"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Shadehat"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Potlid"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+			<Bulk>8</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Note, techincally a thrumbohorn weighs like, 50kg, but we're not going to bother changing the mass for this-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Thrumboskull"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+			<Bulk>8</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Thrumboskull"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>9</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_MaskandhelmF" or defName="GI_MaskandhelmM"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+			<Bulk>25</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_MaskandhelmF" or defName="GI_MaskandhelmM"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_MaskandhelmF" or defName="GI_MaskandhelmM"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.50</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Insignia"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+			<Bulk>8</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Bonepauldron"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+			<Bulk>18</Bulk>
+			<WornBulk>6</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Bonepauldron"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Booty"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+			<Bulk>8</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Pauldron"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+			<Bulk>140</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Powerarmour"]/statBases/Mass</xpath>
+		<value>
+			<Mass>130</Mass>
+			<Bulk>300</Bulk>
+			<WornBulk>80</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Powerarmour"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>36</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Powerarmour"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>81</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GI_Powerarmour"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>15</CarryBulk>
+			<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+			<CarryWeight>35</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GI_Powerarmour"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Powerhelmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>8</Mass>
+			<Bulk>20</Bulk>
+			<WornBulk>4</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Powerhelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>32</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Powerhelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>72</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="GI_Powerhelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="GI_Powerhelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GI_Powerhelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingAccuracy>0.15</AimingAccuracy>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!-- Armor launched mortar Projectile -->>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="GI_Powerarmour"]/verbs</xpath>
+		<match Class="PatchOperationReplace">
+			<xpath>Defs/ThingDef[defName="GI_Powerarmour"]/verbs</xpath>
+			<value>
+				<verbs>
+					<li Class="CombatExtended.VerbPropertiesCE">
+						<label>launch 81mm shell</label>
+						<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<onlyManualCast>True</onlyManualCast>
+						<warmupTime>2.1</warmupTime>
+						<range>75</range>
+						<minRange>10</minRange>
+						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+						<soundCast>Mortar_LaunchA</soundCast>
+						<soundCastTail>GunTail_Medium</soundCastTail>
+						<muzzleFlashScale>14</muzzleFlashScale>
+						<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
+						<targetParams>
+							<canTargetLocations>true</canTargetLocations>
+						</targetParams>
+						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+						<defaultProjectile>Bullet_81mmMortarShell_GiantArmor</defaultProjectile>
+						<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
+					</li>
+				</verbs>
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/The GiantRace/Patches/The GiantRace/ThingDefs_Misc/GiantWeapons_Melee.xml b/ModPatches/The GiantRace/Patches/The GiantRace/ThingDefs_Misc/GiantWeapons_Melee.xml
new file mode 100644
index 0000000000..f2659c6b6d
--- /dev/null
+++ b/ModPatches/The GiantRace/Patches/The GiantRace/ThingDefs_Misc/GiantWeapons_Melee.xml	
@@ -0,0 +1,472 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--========= Melee =========-->
+
+	<!--Log Club-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_GiantClub"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2.51</cooldownTime>
+					<armorPenetrationBlunt>3.76</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>3.76</cooldownTime>
+					<chanceFactor>2</chanceFactor>
+					<armorPenetrationBlunt>15.6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GI_GiantClub"]/statBases</xpath>
+		<value>
+			<Bulk>15.5</Bulk>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GI_GiantClub"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.65</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!--Ivory Pick-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_IvoryClub"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>2.51</cooldownTime>
+					<armorPenetrationBlunt>5.1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+						<li>Scratch</li>
+					</capacities>
+					<power>44</power>
+					<cooldownTime>4.02</cooldownTime>
+					<chanceFactor>2</chanceFactor>
+					<armorPenetrationSharp>0.91</armorPenetrationSharp>
+					<armorPenetrationBlunt>20.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GI_IvoryClub"]/statBases</xpath>
+		<value>
+			<Bulk>15.5</Bulk>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GI_IvoryClub"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.65</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!--Mammoth Hammer-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_MammothHammer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>2.79</cooldownTime>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+						<li>Scratch</li>
+					</capacities>
+					<power>46</power>
+					<cooldownTime>4.19</cooldownTime>
+					<chanceFactor>2</chanceFactor>
+					<armorPenetrationSharp>2.29</armorPenetrationSharp>
+					<armorPenetrationBlunt>24</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GI_MammothHammer"]/statBases</xpath>
+		<value>
+			<Bulk>18.5</Bulk>
+			<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GI_MammothHammer"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.67</MeleeCritChance>
+			<MeleeParryChance>0.24</MeleeParryChance>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!--Thrumbo Blade-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_ThrumboSpineBlade"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>base</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2.98</cooldownTime>
+					<armorPenetrationBlunt>7.8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>108</power>
+					<cooldownTime>1.75</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>22.542</armorPenetrationBlunt>
+					<armorPenetrationSharp>3.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>45</power>
+					<cooldownTime>2.98</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>7.8</armorPenetrationBlunt>
+					<armorPenetrationSharp>15.6</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GI_ThrumboSpineBlade"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.8</MeleeCounterParryBonus>
+			<Bulk>22.5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GI_ThrumboSpineBlade"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>0.6</MeleeParryChance>
+			<MeleeDodgeChance>0.4</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!--Cleaver-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Cleaver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>base</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>2.72</cooldownTime>
+					<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>97</power>
+					<cooldownTime>2.53</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>17.496</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.7</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>45</power>
+					<cooldownTime>2.72</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
+					<armorPenetrationSharp>6.75</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GI_Cleaver"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+			<Bulk>17.75</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GI_Cleaver"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.63</MeleeCritChance>
+			<MeleeParryChance>0.75</MeleeParryChance>
+			<MeleeDodgeChance>0.4</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!--Warhammer-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Hammer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.93</cooldownTime>
+					<armorPenetrationBlunt>7.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>74</power>
+					<cooldownTime>3.99</cooldownTime>
+					<chanceFactor>2</chanceFactor>
+					<armorPenetrationBlunt>35.09</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GI_Hammer"]/statBases</xpath>
+		<value>
+			<Bulk>18.25</Bulk>
+			<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GI_Hammer"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>2.5</MeleeCritChance>
+			<MeleeParryChance>0.18</MeleeParryChance>
+			<MeleeDodgeChance>0.3</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!--War Ram-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Ram"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>31</power>
+					<cooldownTime>3.39</cooldownTime>
+					<armorPenetrationBlunt>13</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>105</power>
+					<cooldownTime>5.95</cooldownTime>
+					<chanceFactor>2</chanceFactor>
+					<armorPenetrationBlunt>51.84</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GI_Ram"]/statBases</xpath>
+		<value>
+			<Bulk>25.25</Bulk>
+			<MeleeCounterParryBonus>0.05</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GI_Ram"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>1.5</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<!--Drill-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Drill"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>drill bit</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>0.2</cooldownTime>
+					<chanceFactor>2</chanceFactor>
+					<armorPenetrationSharp>18</armorPenetrationSharp>
+					<armorPenetrationBlunt>50</armorPenetrationBlunt>
+					<extraMeleeDamages>
+						<li>
+							<def>EMP</def>
+							<amount>4</amount>
+							<chance>0.3</chance>
+						</li>
+					</extraMeleeDamages>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GI_Drill"]/statBases</xpath>
+		<value>
+			<Bulk>36</Bulk>
+			<MeleeCounterParryBonus>0</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GI_Drill"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0</MeleeCritChance>
+			<MeleeParryChance>4</MeleeParryChance>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!--Titan Blade-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Titansword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>3.75</cooldownTime>
+					<armorPenetrationBlunt>11</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>173</power>
+					<cooldownTime>6.64</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>48</armorPenetrationBlunt>
+					<armorPenetrationSharp>8</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>78</power>
+					<cooldownTime>3.25</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>11</armorPenetrationBlunt>
+					<armorPenetrationSharp>13.75</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GI_Titansword"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
+			<Bulk>24</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GI_Titansword"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.8</MeleeCritChance>
+			<MeleeParryChance>0.6</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Titansword"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.8</MeleeDodgeChance>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/The GiantRace/Patches/The GiantRace/ThingDefs_Misc/GiantWeapons_Ranged.xml b/ModPatches/The GiantRace/Patches/The GiantRace/ThingDefs_Misc/GiantWeapons_Ranged.xml
new file mode 100644
index 0000000000..039fd8a47f
--- /dev/null
+++ b/ModPatches/The GiantRace/Patches/The GiantRace/ThingDefs_Misc/GiantWeapons_Ranged.xml	
@@ -0,0 +1,851 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--========= Ranged =========-->
+	<!-- Comps and Classes -->
+
+	<Operation Class="PatchOperationAttributeRemove">
+		<xpath>Defs/ThingDef[@Name="GiantBaseRange"]</xpath>
+		<attribute>ParentName</attribute>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="GiantBaseRange"]</xpath>
+		<value>
+			<equipmentType>Primary</equipmentType>
+			<pathCost>10</pathCost>
+			<graphicData>
+				<onGroundRandomRotateAngle>35</onGroundRandomRotateAngle>
+			</graphicData>
+			<menuHidden>False</menuHidden>
+			<destroyOnDrop>False</destroyOnDrop>
+			<thingClass>CombatExtended.AmmoThing</thingClass>
+			<label>unspecified ammunition</label>
+			<category>Item</category>
+			<resourceReadoutPriority>Middle</resourceReadoutPriority>
+			<useHitPoints>true</useHitPoints>
+			<statBases>
+				<MaxHitPoints>100</MaxHitPoints>
+				<Beauty>-5</Beauty>
+				<Flammability>1</Flammability>
+				<DeteriorationRate>2</DeteriorationRate>
+				<SellPriceFactor>0.5</SellPriceFactor>
+			</statBases>
+			<selectable>true</selectable>
+			<altitudeLayer>Item</altitudeLayer>
+			<stackLimit>5000</stackLimit>
+			<soundInteract>Metal_Drop</soundInteract>
+			<soundDrop>Metal_Drop</soundDrop>
+			<alwaysHaulable>true</alwaysHaulable>
+			<drawGUIOverlay>true</drawGUIOverlay>
+			<rotatable>false</rotatable>
+			<tradeTags>
+				<li>CE_Ammo</li>
+			</tradeTags>
+			<tradeability>None</tradeability>
+			<tickerType>Normal</tickerType>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="GiantBaseRange"]/comps</xpath>
+		<value>
+			<li Class="CompProperties_Forbiddable"/>
+			<li>
+				<compClass>CompEquippable</compClass>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="GI_Jackstones_granite"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="GI_Jackstones_limestone"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="GI_Jackstones_limestone"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="GI_Jackstones_limestone"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="GI_Jackstones_granite"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="GI_Jackstones_granite"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="GI_Jackstones_granite"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="GI_Javelin"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="GI_Javelin"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="GI_Javelin"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="GI_Scrapmetal"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="GI_Scrapmetal"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="GI_Scrapmetal"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="GI_Rockpillar_granite"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="GI_Rockpillar_granite"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="GI_Rockpillar_granite"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="GI_Rockpillar_Marble"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="GI_Rockpillar_Marble"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="GI_Rockpillar_Marble"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="GI_Lightningjavelin"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="GI_Lightningjavelin"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="GI_Lightningjavelin"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="GI_Jackstones_limestone" or
+			defName="GI_Jackstones_granite" or
+			defName="GI_Javelin" or
+			defName="GI_Lightningjavelin" or
+			defName="GI_Scrapmetal" or
+			defName="GI_Rockpillar_granite" or
+			defName="GI_Rockpillar_Marble"
+			] </xpath>
+		<value>
+			<stackLimit>25</stackLimit>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="GI_Jackstones_limestone" or
+			defName="GI_Jackstones_granite" or
+			defName="GI_Javelin" or
+			defName="GI_Lightningjavelin" or
+			defName="GI_Scrapmetal" or
+			defName="GI_Rockpillar_granite" or
+			defName="GI_Rockpillar_Marble"
+			]/costList </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="GI_Jackstones_limestone" or
+			defName="GI_Jackstones_granite" or
+			defName="GI_Javelin" or
+			defName="GI_Lightningjavelin" or
+			defName="GI_Scrapmetal" or
+			defName="GI_Rockpillar_granite" or
+			defName="GI_Rockpillar_Marble"
+			]/statBases/WorkToMake </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="GI_Jackstones_limestone" or
+			defName="GI_Jackstones_granite" or
+			defName="GI_Javelin" or
+			defName="GI_Lightningjavelin" or
+			defName="GI_Scrapmetal" or
+			defName="GI_Rockpillar_granite" or
+			defName="GI_Rockpillar_Marble"
+			]/recipeMaker </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="GI_Jackstones_limestone" or
+			defName="GI_Jackstones_granite" or
+			defName="GI_Javelin" or
+			defName="GI_Scrapmetal" or
+			defName="GI_Rockpillar_granite" or
+			defName="GI_Rockpillar_Marble"
+			]/statBases </xpath>
+		<value>
+			<MarketValue>0.05</MarketValue>
+			<MarketValue>0.18</MarketValue>
+			<MarketValue>0.09</MarketValue>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="GI_Jackstones_limestone" or
+			defName="GI_Jackstones_granite"
+			]/statBases </xpath>
+		<value>
+			<MarketValue>0.05</MarketValue>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="GI_Javelin" or
+			defName="GI_Scrapmetal"
+			]/statBases </xpath>
+		<value>
+			<MarketValue>0.18</MarketValue>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="GI_Rockpillar_granite" or
+			defName="GI_Rockpillar_Marble"
+			]/statBases </xpath>
+		<value>
+			<MarketValue>0.09</MarketValue>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="GI_Lightningjavelin"
+			]/statBases </xpath>
+		<value>
+			<MarketValue>75</MarketValue>
+		</value>
+	</Operation>
+
+	<!-- Compat -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GI_Jackstones_granite</defName>
+		<statBases>
+			<Mass>8</Mass>
+			<Bulk>5</Bulk>
+			<MarketValue>0.09</MarketValue>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<ShotSpread>1.5</ShotSpread>
+			<SwayFactor>2.5</SwayFactor>
+		</statBases>
+		<Properties>
+			<label>throw jackstone</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>GI_Jackstones_granite_Thrown</defaultProjectile>
+			<range>12</range>
+			<warmupTime>1.8</warmupTime>
+			<soundCast>Interact_BeatFire</soundCast>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Jackstones_granite"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stone fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>2.25</cooldownTime>
+					<armorPenetrationBlunt>7.56</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GI_Jackstones_limestone</defName>
+		<statBases>
+			<Mass>8</Mass>
+			<Bulk>5</Bulk>
+			<MarketValue>0.09</MarketValue>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<ShotSpread>1.5</ShotSpread>
+			<SwayFactor>2.5</SwayFactor>
+		</statBases>
+		<Properties>
+			<label>throw jackstone</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>GI_Jackstones_granite_Thrown</defaultProjectile>
+			<range>12</range>
+			<warmupTime>1.8</warmupTime>
+			<soundCast>Interact_BeatFire</soundCast>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+		</Properties>
+		<FireModes/>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Jackstones_limestone"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stone fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>2.25</cooldownTime>
+					<armorPenetrationBlunt>7.56</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GI_Javelin</defName>
+		<statBases>
+			<Mass>10.2</Mass>
+			<Bulk>12</Bulk>
+			<MarketValue>0.09</MarketValue>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<ShotSpread>1.5</ShotSpread>
+			<SwayFactor>2.5</SwayFactor>
+		</statBases>
+		<Properties>
+			<label>throw javelin</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>GI_Javelin_Thrown</defaultProjectile>
+			<range>16</range>
+			<warmupTime>1.8</warmupTime>
+			<soundCast>Interact_BeatFire</soundCast>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+		</Properties>
+		<FireModes/>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Javelin"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>2.79</cooldownTime>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>46</power>
+					<cooldownTime>4.19</cooldownTime>
+					<chanceFactor>2</chanceFactor>
+					<armorPenetrationSharp>2.29</armorPenetrationSharp>
+					<armorPenetrationBlunt>24</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GI_Scrapmetal</defName>
+		<statBases>
+			<Mass>6.6</Mass>
+			<Bulk>5</Bulk>
+			<MarketValue>0.09</MarketValue>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<ShotSpread>10</ShotSpread>
+			<SwayFactor>2.5</SwayFactor>
+		</statBases>
+		<Properties>
+			<label>throw jackstone</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>GI_Scrapmetal_Thrown</defaultProjectile>
+			<range>12</range>
+			<warmupTime>1.8</warmupTime>
+			<soundCast>Interact_BeatFire</soundCast>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+		</Properties>
+		<FireModes/>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Scrapmetal"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>scrap fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>2.25</cooldownTime>
+					<armorPenetrationBlunt>7.56</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GI_Rockpillar_granite</defName>
+		<statBases>
+			<Mass>18</Mass>
+			<Bulk>14</Bulk>
+			<MarketValue>0.09</MarketValue>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<ShotSpread>1.5</ShotSpread>
+			<SwayFactor>2.5</SwayFactor>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>GI_Rockpillar_Marble_Thrown</defaultProjectile>
+			<range>8</range>
+			<warmupTime>1.8</warmupTime>
+			<soundCast>Interact_BeatFire</soundCast>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+		</Properties>
+		<FireModes/>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Rockpillar_granite"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>pillar</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.93</cooldownTime>
+					<armorPenetrationBlunt>7.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GI_Rockpillar_Marble</defName>
+		<statBases>
+			<Mass>18</Mass>
+			<Bulk>14</Bulk>
+			<MarketValue>0.09</MarketValue>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<ShotSpread>1.5</ShotSpread>
+			<SwayFactor>2.5</SwayFactor>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>GI_Rockpillar_Marble_Thrown</defaultProjectile>
+			<range>8</range>
+			<warmupTime>1.8</warmupTime>
+			<soundCast>Interact_BeatFire</soundCast>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+		</Properties>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+		<FireModes/>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Rockpillar_Marble"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>pillar</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.93</cooldownTime>
+					<armorPenetrationBlunt>7.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GI_Javelin</defName>
+		<statBases>
+			<Mass>10.2</Mass>
+			<Bulk>12</Bulk>
+			<MarketValue>0.09</MarketValue>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<ShotSpread>1.5</ShotSpread>
+			<SwayFactor>2.5</SwayFactor>
+		</statBases>
+		<Properties>
+			<label>throw javelin</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>GI_Javelin_Thrown</defaultProjectile>
+			<range>16</range>
+			<warmupTime>1.8</warmupTime>
+			<soundCast>Interact_BeatFire</soundCast>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+		</Properties>
+		<FireModes/>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Javelin"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>2.79</cooldownTime>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>46</power>
+					<cooldownTime>4.19</cooldownTime>
+					<chanceFactor>2</chanceFactor>
+					<armorPenetrationSharp>2.29</armorPenetrationSharp>
+					<armorPenetrationBlunt>24</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GI_Lightningjavelin</defName>
+		<statBases>
+			<Mass>8.6</Mass>
+			<Bulk>12</Bulk>
+			<MarketValue>0.09</MarketValue>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<ShotSpread>1.5</ShotSpread>
+			<SwayFactor>1.5</SwayFactor>
+		</statBases>
+		<Properties>
+			<label>throw javelin</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>GI_Lightningjavelin_Thrown</defaultProjectile>
+			<range>22</range>
+			<warmupTime>1.8</warmupTime>
+			<soundCast>Interact_BeatFire</soundCast>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+		</Properties>
+		<FireModes/>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Lightningjavelin"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>3.75</cooldownTime>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>42</power>
+					<cooldownTime>3.85</cooldownTime>
+					<chanceFactor>2</chanceFactor>
+					<armorPenetrationSharp>28</armorPenetrationSharp>
+					<armorPenetrationBlunt>40</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+					<extraMeleeDamages>
+						<li>
+							<def>EMP</def>
+							<amount>4</amount>
+							<chance>0.5</chance>
+						</li>
+					</extraMeleeDamages>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Ammo-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Jackstones_granite_Thrown"]</xpath>
+		<value>
+			<ThingDef ParentName="BasePilumProjectile">
+				<defName>GI_Jackstones_granite_Thrown</defName>
+				<label>Jackstones</label>
+				<graphicData>
+					<texPath>Giant/Weapons/Neolithic/GI_Jackstones_Thrown</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+					<drawSize>1.0</drawSize>
+					<color>(155,145,147)</color>
+				</graphicData>
+				<projectile Class="CombatExtended.ProjectilePropertiesCE">
+					<damageDef>RangedBlunt</damageDef>
+					<damageAmountBase>39</damageAmountBase>
+					<speed>8</speed>
+					<armorPenetrationBlunt>24</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<preExplosionSpawnChance>0.75</preExplosionSpawnChance><!-- 4 javelins per resource -->
+					<preExplosionSpawnThingDef>GI_Jackstones_granite</preExplosionSpawnThingDef>
+				</projectile>
+			</ThingDef>
+		</value>
+
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Jackstones_limestone_Thrown"]</xpath>
+		<value>
+			<ThingDef ParentName="BasePilumProjectile">
+				<defName>GI_Jackstones_limestone_Thrown</defName>
+				<label>Jackstones</label>
+				<graphicData>
+					<texPath>Giant/Weapons/Neolithic/GI_Jackstones_Thrown</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+					<drawSize>1.0</drawSize>
+					<color>(208,203,185)</color>
+				</graphicData>
+				<projectile Class="CombatExtended.ProjectilePropertiesCE">
+					<damageDef>RangedBlunt</damageDef>
+					<damageAmountBase>39</damageAmountBase>
+					<speed>8</speed>
+					<armorPenetrationBlunt>24</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<preExplosionSpawnChance>0.75</preExplosionSpawnChance><!-- 4 javelins per resource -->
+					<preExplosionSpawnThingDef>GI_Jackstones_granite</preExplosionSpawnThingDef>
+				</projectile>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Javelin_Thrown"]</xpath>
+		<value>
+			<ThingDef ParentName="BasePilumProjectile">
+				<defName>GI_Javelin_Thrown</defName>
+				<label>Javelin</label>
+				<graphicData>
+					<texPath>Giant/Weapons/Neolithic/GI_Javelin_Thrown</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+					<drawSize>2.6</drawSize>
+				</graphicData>
+				<projectile Class="CombatExtended.ProjectilePropertiesCE">
+					<damageAmountBase>45</damageAmountBase>
+					<speed>8</speed>
+					<armorPenetrationBlunt>67.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>5</armorPenetrationSharp>
+					<preExplosionSpawnChance>0.50</preExplosionSpawnChance><!-- 4 javelins per resource -->
+					<preExplosionSpawnThingDef>GI_Javelin</preExplosionSpawnThingDef>
+				</projectile>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Scrapmetal_Thrown"]</xpath>
+		<value>
+			<ThingDef ParentName="BasePilumProjectile">
+				<defName>GI_Scrapmetal_Thrown</defName>
+				<label>Scrapmetal</label>
+				<graphicData>
+					<texPath>Giant/Weapons/Neolithic/GI_Scrapmetal_Thrown</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+					<drawSize>1.2</drawSize>
+				</graphicData>
+				<projectile Class="CombatExtended.ProjectilePropertiesCE">
+					<pelletCount>12</pelletCount>
+					<spreadMult>2</spreadMult>
+					<damageAmountBase>12</damageAmountBase>
+					<speed>8</speed>
+					<armorPenetrationBlunt>3.12</armorPenetrationBlunt>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+				</projectile>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Rockpillar_granite_Thrown"]</xpath>
+		<value>
+			<ThingDef ParentName="BasePilumProjectile">
+				<defName>GI_Rockpillar_granite_Thrown</defName>
+				<label>Jackstones</label>
+				<graphicData>
+					<texPath>Giant/Weapons/Medieval/GI_Rockpillar_Thrown</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+					<drawSize>3.2</drawSize>
+					<color>(155,145,147)</color>
+				</graphicData>
+				<projectile Class="CombatExtended.ProjectilePropertiesCE">
+					<damageDef>RangedBlunt</damageDef>
+					<damageAmountBase>57</damageAmountBase>
+					<speed>8</speed>
+					<armorPenetrationBlunt>72</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<preExplosionSpawnChance>0.25</preExplosionSpawnChance><!-- 4 javelins per resource -->
+					<preExplosionSpawnThingDef>GI_Rockpillar_granite</preExplosionSpawnThingDef>
+				</projectile>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Rockpillar_Marble_Thrown"]</xpath>
+		<value>
+			<ThingDef ParentName="BasePilumProjectile">
+				<defName>GI_Rockpillar_Marble_Thrown</defName>
+				<label>Rockpillar</label>
+				<graphicData>
+					<texPath>Giant/Weapons/Medieval/GI_Rockpillar_Thrown</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+					<drawSize>3.2</drawSize>
+					<color>(132,135,132)</color>
+				</graphicData>
+				<projectile Class="CombatExtended.ProjectilePropertiesCE">
+					<damageDef>RangedBlunt</damageDef>
+					<damageAmountBase>57</damageAmountBase>
+					<speed>8</speed>
+					<armorPenetrationBlunt>72</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<preExplosionSpawnChance>0.25</preExplosionSpawnChance><!-- 4 javelins per resource -->
+					<preExplosionSpawnThingDef>GI_Rockpillar_Marble</preExplosionSpawnThingDef>
+				</projectile>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GI_Lightningjavelin_Thrown"]</xpath>
+		<value>
+			<ThingDef ParentName="BasePilumProjectile">
+				<defName>GI_Lightningjavelin_Thrown</defName>
+				<label>Lightningjavelin</label>
+				<graphicData>
+					<texPath>Giant/Weapons/Industrial/GI_Lightningjavelin_Thrown</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+					<drawSize>2.6</drawSize>
+				</graphicData>
+				<projectile Class="CombatExtended.ProjectilePropertiesCE">
+					<damageAmountBase>45</damageAmountBase>
+					<speed>8</speed>
+					<armorPenetrationBlunt>40</armorPenetrationBlunt>
+					<armorPenetrationSharp>28</armorPenetrationSharp>
+				</projectile>
+				<comps>
+					<li Class="CombatExtended.CompProperties_ExplosiveCE">
+						<damageAmountBase>56</damageAmountBase>
+						<explosiveDamageType>EMP</explosiveDamageType>
+						<explosiveRadius>2</explosiveRadius>
+						<applyDamageToExplosionCellsNeighbors>false</applyDamageToExplosionCellsNeighbors>
+					</li>
+				</comps>
+			</ThingDef>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/The GiantRace/Patches/The GiantRace/ThingDefs_Races/AlienRace_Giantlike.xml b/ModPatches/The GiantRace/Patches/The GiantRace/ThingDefs_Races/AlienRace_Giantlike.xml
new file mode 100644
index 0000000000..2c98bf1a7e
--- /dev/null
+++ b/ModPatches/The GiantRace/Patches/The GiantRace/ThingDefs_Races/AlienRace_Giantlike.xml	
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HC_Giant"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HC_Giant"]/statBases</xpath>
+		<value>
+			<!--Significant size results in ease of powerful strikes and difficulty in parrying their blows-->
+			<MeleeCritChance>1.6</MeleeCritChance>
+			<MeleeParryChance>1.8</MeleeParryChance>
+			<!--Mentally simpler and also generally just less attendant to most small arms shooting them-->
+			<Suppressability>0.5</Suppressability>
+			<SmokeSensitivity>1</SmokeSensitivity>
+			<CarryBulk>25</CarryBulk>
+		</value>
+	</Operation>
+
+	<!--Very heavy blows-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HC_Giant"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>2.25</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>7.56</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>2.25</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>7.56</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>6.66</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>9.045</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--Giant size prevents use of loadbearing gear, and reasonably, shields.-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="GI_PawnBase"]/inspectorTabs/li[.="ITab_Pawn_Gear"]</xpath>
+		<value>
+			<li>CombatExtended.ITab_Inventory</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="GI_PawnBase"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Inventory"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="GI_PawnBase"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/The GiantRace/Patches/The GiantRace/ThingDefs_Races/Giant_Mammoth.xml b/ModPatches/The GiantRace/Patches/The GiantRace/ThingDefs_Races/Giant_Mammoth.xml
new file mode 100644
index 0000000000..e2503cc21d
--- /dev/null
+++ b/ModPatches/The GiantRace/Patches/The GiantRace/ThingDefs_Races/Giant_Mammoth.xml	
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HC_WoollyMammoth"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>5</MoveSpeed>
+			<MeleeDodgeChance>0.08</MeleeDodgeChance>
+			<MeleeCritChance>0.79</MeleeCritChance>
+			<MeleeParryChance>0.51</MeleeParryChance>
+			<ArmorRating_Blunt>0.325</ArmorRating_Blunt>
+			<ArmorRating_Sharp>0.17</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HC_WoollyMammoth"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tusk</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>67</power>
+					<cooldownTime>3.57</cooldownTime>
+					<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>31.226</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>31</power>
+					<cooldownTime>2.57</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>12.960</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>31</power>
+					<cooldownTime>2.57</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>12.960</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>55</power>
+					<cooldownTime>3.99</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="HC_WoollyMammoth"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="HC_WoollyMammoth"]/combatPower</xpath>
+		<value>
+			<combatPower>250</combatPower>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/The Joris Experience/Defs/HediffDefs.xml b/ModPatches/The Joris Experience/Defs/HediffDefs.xml
new file mode 100644
index 0000000000..4f1a6d099c
--- /dev/null
+++ b/ModPatches/The Joris Experience/Defs/HediffDefs.xml	
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<HediffDef>
+		<defName>JJ_LowBleed</defName>
+		<description>This creature bleeds very little.</description>
+		<label>Regen factor</label>
+		<defaultLabelColor>(.8,0,0)</defaultLabelColor>
+		<scenarioCanAdd>false</scenarioCanAdd>
+		<maxSeverity>1.0</maxSeverity>
+		<stages>
+			<li>
+				<totalBleedFactor>0.1</totalBleedFactor>
+				<painFactor>0.25</painFactor>
+			</li>
+		</stages>
+	</HediffDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/The Joris Experience/Patches/The Joris Experience/Bear_Bodies.xml b/ModPatches/The Joris Experience/Patches/The Joris Experience/Bear_Bodies.xml
new file mode 100644
index 0000000000..6c455ed3e0
--- /dev/null
+++ b/ModPatches/The Joris Experience/Patches/The Joris Experience/Bear_Bodies.xml	
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Natural Armor -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="JE_BiblicallyAccurateJoris"]//*[
+			def="Body" or
+			def="Nose"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="JE_BiblicallyAccurateJoris"]//*[
+			def="Body" or
+			def="Head" or
+			def="Nose" or
+			def="AnimalJaw"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/The Joris Experience/Patches/The Joris Experience/Bear_Resources.xml b/ModPatches/The Joris Experience/Patches/The Joris Experience/Bear_Resources.xml
new file mode 100644
index 0000000000..209ae7cb51
--- /dev/null
+++ b/ModPatches/The Joris Experience/Patches/The Joris Experience/Bear_Resources.xml	
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Remove tusk as a weapon -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="JE_GoldenUniJorisHorn"]/tools</xpath>
+	</Operation>
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="JE_GoldenUniJorisHorn"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>ResourceBase</value>
+	</Operation>
+
+	<!--wooly wool -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JE_JorisHair"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.03</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/The Joris Experience/Patches/The Joris Experience/JorisShootCE.xml b/ModPatches/The Joris Experience/Patches/The Joris Experience/JorisShootCE.xml
new file mode 100644
index 0000000000..094bf2ac72
--- /dev/null
+++ b/ModPatches/The Joris Experience/Patches/The Joris Experience/JorisShootCE.xml	
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JE_BiblicallyAccurateJoris"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li>
+					<verbClass>Verb_Shoot</verbClass>
+					<accuracyTouch>1</accuracyTouch>
+					<accuracyShort>1</accuracyShort>
+					<accuracyMedium>1</accuracyMedium>
+					<accuracyLong>1</accuracyLong>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>JE_HolyBolt</defaultProjectile>
+					<warmupTime>7</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<minRange>2</minRange>
+					<range>36</range>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>holy fire</label>
+					<commonality>.8</commonality>
+				</li>
+
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JECom_IsaacJoris"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>JE_Tears</defaultProjectile>
+					<warmupTime>2</warmupTime>
+					<burstShotCount>8</burstShotCount>
+					<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+					<minRange>1</minRange>
+					<range>18</range>
+					<label>tears</label>
+					<soundCast>JE_TearsSound</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<commonality>1</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JE_NoitaJoris"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>JE_NoitaFireball</defaultProjectile>
+					<warmupTime>2</warmupTime>
+					<minRange>1.9</minRange>
+					<range>24</range>
+					<label>noita fireball</label>
+					<soundCast>JE_FireSpit</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<commonality>1</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/The Joris Experience/Patches/The Joris Experience/Joris_Extended.xml b/ModPatches/The Joris Experience/Patches/The Joris Experience/Joris_Extended.xml
new file mode 100644
index 0000000000..94458a0fba
--- /dev/null
+++ b/ModPatches/The Joris Experience/Patches/The Joris Experience/Joris_Extended.xml	
@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === BEARS=== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="JE_AnimeMascotJoris"
+			or defName="JE_BeefeaterJoris"
+			or defName="JE_BiblicallyAccurateJoris"
+			or defName="JECom_BlockJoris"
+			or defName="JECom_Cerberjoris"
+			or defName="JE_ChainsawJoris"
+			or defName="JE_ChiefOBonson"
+			or defName="JECom_ColonistJoris"
+			or defName="JE_DracoJoris"
+			or defName="JE_EmoJoris"
+			or defName="JECom_FamousDevilJoris"
+			or defName="JE_FatJorry"
+			or defName="JECom_IsaacJoris"
+			or defName="JE_JagothGrr"
+			or defName="JECom_JJorisJameson"
+			or defName="JE_JockExcellente"
+			or defName="JE_Joku"
+			or defName="JE_JoneralGrievous"
+			or defName="JE_JonerysBonbearean"
+			or defName="JE_JonicTheHedgehog"
+			or defName="JE_JoobyDoo"
+			or defName="JE_JoraltOfRivia"
+			or defName="JE_JordonFreeman"
+			or defName="JECom_JorisAstley"
+			or defName="JECom_JorisSiroj"
+			or defName="JECom_JorisThePooh"
+			or defName="JE_JorisWhatLivesInASociety"
+			or defName="JE_Joromir"
+			or defName="JE_JorrickLorge"
+			or defName="JE_Joruto"
+			or defName="JE_JovidBowie"
+			or defName="JE_PerfectlyNormalJoris"
+			or defName="JECom_PickleJoris"
+			or defName="JE_QueenJorisTheSecond"
+			or defName="JE_SpongejorisSquarebonson"
+			or defName="JECom_SuperJoris"
+			or defName="JE_FourLeggedUniJoris"
+			or defName="JECom_VoidJoris"
+			or defName="JE_XorismorphQueen"
+			or defName="JE_YugiJohris"
+			or defName="JE_ZombieJoris"
+			or defName="JE_JoskarBontocki"
+			or defName="JE_NoitaJoris"] </xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="JECom_RoundJoris"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Vehicle</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="JE_AnimeMascotJoris"
+			or defName="JE_BeefeaterJoris"
+			or defName="JE_BiblicallyAccurateJoris"
+			or defName="JECom_BlockJoris"
+			or defName="JECom_ColonistJoris"
+			or defName="JE_DracoJoris"
+			or defName="JE_EmoJoris"
+			or defName="JECom_FamousDevilJoris"
+			or defName="JE_FatJorry"
+			or defName="JECom_IsaacJoris"
+			or defName="JECom_JJorisJameson"
+			or defName="JE_JonerysBonbearean"
+			or defName="JE_JonicTheHedgehog"
+			or defName="JE_JordonFreeman"
+			or defName="JECom_JorisAstley"
+			or defName="JECom_JorisSiroj"
+			or defName="JECom_JorisThePooh"
+			or defName="JE_JorisWhatLivesInASociety"
+			or defName="JE_Joromir"
+			or defName="JE_Joruto"
+			or defName="JE_JovidBowie"
+			or defName="JE_PerfectlyNormalJoris"
+			or defName="JECom_PickleJoris"
+			or defName="JE_QueenJorisTheSecond"
+			or defName="JE_SpongejorisSquarebonson"
+			or defName="JECom_SuperJoris"
+			or defName="JE_YugiJohris"
+			or defName="JE_JoskarBontocki"
+			or defName="JE_NoitaJoris"]/combatPower </xpath>
+		<value>
+			<combatPower>150</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="JECom_Cerberjoris"
+			or defName="JE_ChainsawJoris"
+			or defName="JE_ChiefOBonson"
+			or defName="JE_JagothGrr"
+			or defName="JE_JockExcellente"
+			or defName="JE_Joku"
+			or defName="JE_JoneralGrievous"
+			or defName="JE_JoraltOfRivia"
+			or defName="JE_JorrickLorge"
+			or defName="JECom_RoundJoris"
+			or defName="JE_FourLeggedUniJoris"
+			or defName="JE_ZombieJoris"]/combatPower </xpath>
+		<value>
+			<combatPower>225</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="JE_XorismorphQueen"]/combatPower</xpath>
+		<value>
+			<combatPower>650</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="JE_AnimeMascotJoris"
+			or defName="JE_BeefeaterJoris"
+			or defName="JECom_BlockJoris"
+			or defName="JECom_Cerberjoris"
+			or defName="JE_ChainsawJoris"
+			or defName="JE_ChiefOBonson"
+			or defName="JECom_ColonistJoris"
+			or defName="JE_DracoJoris"
+			or defName="JE_EmoJoris"
+			or defName="JECom_FamousDevilJoris"
+			or defName="JE_FatJorry"
+			or defName="JECom_IsaacJoris"
+			or defName="JE_JagothGrr"
+			or defName="JECom_JJorisJameson"
+			or defName="JE_JockExcellente"
+			or defName="JE_Joku"
+			or defName="JE_JoneralGrievous"
+			or defName="JE_JonerysBonbearean"
+			or defName="JE_JordonFreeman"
+			or defName="JECom_JorisAstley"
+			or defName="JECom_JorisSiroj"
+			or defName="JECom_JorisThePooh"
+			or defName="JE_JorisWhatLivesInASociety"
+			or defName="JE_Joromir"
+			or defName="JE_Joruto"
+			or defName="JE_JovidBowie"
+			or defName="JE_PerfectlyNormalJoris"
+			or defName="JECom_PickleJoris"
+			or defName="JE_QueenJorisTheSecond"
+			or defName="JECom_RoundJoris"
+			or defName="JE_SpongejorisSquarebonson"
+			or defName="JECom_SuperJoris"
+			or defName="JE_FourLeggedUniJoris"
+			or defName="JE_YugiJohris"
+			or defName="JE_ZombieJoris"
+			or defName="JE_JoskarBontocki"
+			or defName="JE_NoitaJoris"]/statBases </xpath>
+		<value>
+			<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			<MeleeCritChance>0.32</MeleeCritChance>
+			<MeleeParryChance>0.26</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JE_AnimeMascotJoris"
+			or defName="JE_BeefeaterJoris"
+			or defName="JE_ChiefOBonson"
+			or defName="JECom_ColonistJoris"
+			or defName="JE_EmoJoris"
+			or defName="JECom_FamousDevilJoris"
+			or defName="JE_FatJorry"
+			or defName="JECom_IsaacJoris"
+			or defName="JE_JagothGrr"
+			or defName="JECom_JJorisJameson"
+			or defName="JE_JockExcellente"
+			or defName="JE_Joku"
+			or defName="JE_JonerysBonbearean"
+			or defName="JECom_JorisAstley"
+			or defName="JECom_JorisThePooh"
+			or defName="JE_JorisWhatLivesInASociety"
+			or defName="JE_Joromir"
+			or defName="JE_Joruto"
+			or defName="JE_JovidBowie"
+			or defName="JE_PerfectlyNormalJoris"
+			or defName="JECom_PickleJoris"
+			or defName="JE_QueenJorisTheSecond"
+			or defName="JECom_RoundJoris"
+			or defName="JE_SpongejorisSquarebonson"
+			or defName="JE_NoitaJoris"]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.32</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.32</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.44</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/The Joris Experience/Patches/The Joris Experience/Joris_Hediffs.xml b/ModPatches/The Joris Experience/Patches/The Joris Experience/Joris_Hediffs.xml
new file mode 100644
index 0000000000..f4399b80b1
--- /dev/null
+++ b/ModPatches/The Joris Experience/Patches/The Joris Experience/Joris_Hediffs.xml	
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="JE_TorsoMinigun"]/comps/li[@Class="MVCF.Comps.HediffCompProperties_ExtendedVerbGiver"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>JE_Bullet_GoldenShower</defaultProjectile>
+					<warmupTime>2.4</warmupTime>
+					<burstShotCount>50</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<range>60</range>
+					<minRange>1.5</minRange>
+					<soundCast>Shot_Minigun</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>7</muzzleFlashScale>
+					<label>Fat Jorry's Golden Shower</label>
+					<commonality>.8</commonality>
+					<commandIcon>Things/Weapons/GoldenShower</commandIcon>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/The Joris Experience/Patches/The Joris Experience/Projectiles_Joris.xml b/ModPatches/The Joris Experience/Patches/The Joris Experience/Projectiles_Joris.xml
new file mode 100644
index 0000000000..86e39883f0
--- /dev/null
+++ b/ModPatches/The Joris Experience/Patches/The Joris Experience/Projectiles_Joris.xml	
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ============== Changing Projectile's thingClass to CE ones ================ -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="JE_Bullet_GoldenShower" or
+			defName="JE_Tears"] </xpath>
+		<value>
+			<thingClass>CombatExtended.BulletCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JE_NoitaFireball"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+
+	<!-- ============== Adding 'Standard' AimingAccuracy node to creatures' that use ranged attack statBases. =============== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="JE_FatJorry" or defName="JECom_IsaacJoris" or defName="JE_NoitaJoris"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.6</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="JE_Joku"]/statBases</xpath>
+		<value>
+			<ShootingAccuracyPawn>2.5</ShootingAccuracyPawn>
+			<AimingAccuracy>1</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="JE_BiblicallyAccurateJoris"]/statBases</xpath>
+		<value>
+			<ShootingAccuracyPawn>10</ShootingAccuracyPawn>
+			<AimingAccuracy>1</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!-- =============== Now defining Projectiles in CE Procedure ============= -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JE_Bullet_GoldenShower"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>Bullet</damageDef>
+				<damageAmountBase>7</damageAmountBase>
+				<speed>90</speed>
+				<armorPenetrationSharp>4</armorPenetrationSharp>
+				<armorPenetrationBlunt>12</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JE_Tears"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>Bullet</damageDef>
+				<damageAmountBase>8</damageAmountBase>
+				<speed>24</speed>
+				<armorPenetrationSharp>1</armorPenetrationSharp>
+				<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JE_NoitaFireball"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>Flame</damageDef>
+				<damageAmountBase>18</damageAmountBase>
+				<explosionRadius>1.1</explosionRadius>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+				<speed>27</speed>
+				<armorPenetrationSharp>50</armorPenetrationSharp>
+				<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
+				<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
+				<ai_IsIncendiary>true</ai_IsIncendiary>
+				<soundExplode>Interact_Ignite</soundExplode>
+			</projectile>
+		</value>
+	</Operation>
+
+	<!--				<li Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.ExpandableProjectileDef[defName="FF_FlameBreathAnimated"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>40</speed>
+				<flyOverhead>false</flyOverhead>
+				<damageDef>Flame</damageDef>
+				<damageAmountBase>16</damageAmountBase>
+				<explosionRadius>2.5</explosionRadius>
+<suppressionFactor>3.0</suppressionFactor>
+<dangerFactor>2.0</dangerFactor>
+				<ai_IsIncendiary>true</ai_IsIncendiary>
+			</projectile>
+		</value>
+	</li> -->
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/The Joris Experience/Patches/The Joris Experience/Unique_Joris_Extended.xml b/ModPatches/The Joris Experience/Patches/The Joris Experience/Unique_Joris_Extended.xml
new file mode 100644
index 0000000000..8560bc121e
--- /dev/null
+++ b/ModPatches/The Joris Experience/Patches/The Joris Experience/Unique_Joris_Extended.xml	
@@ -0,0 +1,787 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Blocky=== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JECom_BlockJoris"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.32</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.32</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>32</power>
+					<cooldownTime>1.72</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2.44</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Chainsawbear=== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JE_ChainsawJoris"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left chainsaw</label>
+					<capacities>
+						<li>JE_BleedingWound</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>0.9</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right chainsaw</label>
+					<capacities>
+						<li>JE_BleedingWound</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>0.9</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.72</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.44</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Bible thumper=== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JE_BiblicallyAccurateJoris"]/statBases</xpath>
+		<value>
+			<statBases>
+				<MoveSpeed>6</MoveSpeed>
+				<ComfyTemperatureMin>-55</ComfyTemperatureMin>
+				<MarketValue>1500</MarketValue>
+				<MeleeDodgeChance>1</MeleeDodgeChance>
+				<MeleeCritChance>0.75</MeleeCritChance>
+				<MeleeParryChance>1</MeleeParryChance>
+				<Flammability>0</Flammability>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JE_BiblicallyAccurateJoris"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+						<li>Stab</li>
+					</capacities>
+					<power>38</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>24</armorPenetrationSharp>
+					<armorPenetrationBlunt>40</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>30</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="JE_BiblicallyAccurateJoris"]/comps</xpath>
+		<value>
+			<li Class="AnimalBehaviours.CompProperties_InitialHediff">
+				<hediffname>JJ_LowBleed</hediffname>
+				<hediffseverity>1</hediffseverity>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Cerb=== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JECom_Cerberjoris"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.32</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.32</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.68</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.44</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Draco=== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JE_DracoJoris"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>12</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>6.375</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>6.375</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>fangs</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>1.62</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>16</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2.44</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === JoneralGrievous=== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JE_JoneralGrievous"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left weapon from a more civilized age</label>
+					<capacities>
+						<li>JE_BurningStab</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.08</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>50</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right weapon from a more civilized age</label>
+					<capacities>
+						<li>JE_BurningStab</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.08</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>50</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Uncivilised method from a more barbaric age</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2.44</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Sanic=== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JE_JonicTheHedgehog"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>12</MoveSpeed>
+			<MeleeDodgeChance>0.78</MeleeDodgeChance>
+			<MeleeCritChance>0.14</MeleeCritChance>
+			<MeleeParryChance>0.17</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JE_JonicTheHedgehog"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2.44</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Jooby Doo=== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JE_JoobyDoo"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>5.6</MoveSpeed>
+			<MeleeDodgeChance>0.21</MeleeDodgeChance>
+			<MeleeCritChance>0.12</MeleeCritChance>
+			<MeleeParryChance>0.12</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JE_JoobyDoo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2.44</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Jeralto=== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JE_JoraltOfRivia"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4.25</MoveSpeed>
+			<MeleeDodgeChance>0.8</MeleeDodgeChance>
+			<MeleeCritChance>0.36</MeleeCritChance>
+			<MeleeParryChance>0.66</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JE_JoraltOfRivia"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>JE_ExtraDamageAnimalsClaws</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>JE_ExtraDamageAnimalsClaws</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.92</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2.44</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Jorden Freeman=== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JE_JordonFreeman"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>crowbar</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.24</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.32</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<chanceFactor>0.5</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.5</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.44</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/The Joris Experience/Patches/The Joris Experience/Unique_Joris_Extended2.xml b/ModPatches/The Joris Experience/Patches/The Joris Experience/Unique_Joris_Extended2.xml
new file mode 100644
index 0000000000..0d352b850c
--- /dev/null
+++ b/ModPatches/The Joris Experience/Patches/The Joris Experience/Unique_Joris_Extended2.xml	
@@ -0,0 +1,814 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === JorisSiroj=== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JECom_JorisSiroj"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.32</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.32</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>front teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.75</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>rear teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.75</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>front head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>rear head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Jorrick Lorge=== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="JE_JorrickLorge"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.06</MeleeDodgeChance>
+			<MeleeCritChance>0.41</MeleeCritChance>
+			<MeleeParryChance>0.48</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JE_JorrickLorge"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>56</power>
+					<cooldownTime>2.34</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>56</power>
+					<cooldownTime>2.34</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>3.07</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>16</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Supa Joris=== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JECom_SuperJoris"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>1.32</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>1.31</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2.44</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Uni Joris=== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JE_FourLeggedUniJoris"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Horn</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>0.9</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Horn</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Stab</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>0.9</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.32</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.31</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.44</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Void=== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JECom_VoidJoris"]/statBases</xpath>
+		<value>
+			<statBases>
+				<MoveSpeed>8</MoveSpeed>
+				<ArmorRating_Blunt>50</ArmorRating_Blunt>
+				<ArmorRating_Sharp>22</ArmorRating_Sharp>
+				<ArmorRating_Heat>1.8</ArmorRating_Heat>
+				<MeatAmount>115</MeatAmount>
+				<LeatherAmount>200</LeatherAmount>
+				<PsychicSensitivity>0.1</PsychicSensitivity>
+				<ToxicEnvironmentResistance>1</ToxicEnvironmentResistance>
+				<ComfyTemperatureMin>-250</ComfyTemperatureMin>
+				<ComfyTemperatureMax>250</ComfyTemperatureMax>
+				<MarketValue>2500</MarketValue>
+				<MeleeDodgeChance>1</MeleeDodgeChance>
+				<MeleeCritChance>1</MeleeCritChance>
+				<MeleeParryChance>1</MeleeParryChance>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JECom_VoidJoris"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.31</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>24</armorPenetrationSharp>
+					<armorPenetrationBlunt>50</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.31</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>24</armorPenetrationSharp>
+					<armorPenetrationBlunt>50</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>43</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>32</armorPenetrationSharp>
+					<armorPenetrationBlunt>80</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.34</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === XenoMorph=== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JE_XorismorphQueen"]/statBases</xpath>
+		<value>
+			<statBases>
+				<MoveSpeed>5.75</MoveSpeed>
+				<ArmorRating_Blunt>26</ArmorRating_Blunt>
+				<ArmorRating_Sharp>15</ArmorRating_Sharp>
+				<ArmorRating_Heat>1.0</ArmorRating_Heat>
+				<MeatAmount>115</MeatAmount>
+				<LeatherAmount>90</LeatherAmount>
+				<PsychicSensitivity>0.25</PsychicSensitivity>
+				<ToxicResistance>0.75</ToxicResistance>
+				<ComfyTemperatureMin>-55</ComfyTemperatureMin>
+				<MarketValue>1500</MarketValue>
+				<MeleeDodgeChance>0.35</MeleeDodgeChance>
+				<MeleeCritChance>0.97</MeleeCritChance>
+				<MeleeParryChance>0.3</MeleeParryChance>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JE_XorismorphQueen"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Cut</li>
+					</capacities>
+					<power>38</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>6</armorPenetrationSharp>
+					<armorPenetrationBlunt>18</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Cut</li>
+					</capacities>
+					<power>38</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>6</armorPenetrationSharp>
+					<armorPenetrationBlunt>18</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+						<li>Cut</li>
+					</capacities>
+					<power>54</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>14</armorPenetrationSharp>
+					<armorPenetrationBlunt>42</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>inner teeth</label>
+					<capacities>
+						<li>Bite</li>
+						<li>Stab</li>
+					</capacities>
+					<power>58</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.33</chanceFactor>
+					<armorPenetrationSharp>18</armorPenetrationSharp>
+					<armorPenetrationBlunt>48</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>2.33</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>24</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Yughi Joris=== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JE_YugiJohris"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.68</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.68</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>32</power>
+					<cooldownTime>2.55</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.44</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Zombie Jorry=== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="JE_ZombieJoris"]/comps</xpath>
+		<value>
+			<li Class="AnimalBehaviours.CompProperties_InitialHediff">
+				<hediffname>JJ_LowBleed</hediffname>
+				<hediffseverity>1</hediffseverity>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JE_ZombieJoris"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>JE_InfectedClaws</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>JE_InfectedClaws</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>2.45</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.44</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Joskar=== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="JE_JoskarBontocki"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>paintbrush</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.32</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>paintbrush</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.32</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>2.45</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationSharp>1.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.44</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/The Tuffalo/Patches/The Tuffalo/Animal_Tuffalo.xml b/ModPatches/The Tuffalo/Patches/The Tuffalo/Animal_Tuffalo.xml
new file mode 100644
index 0000000000..e3b0f2f4ff
--- /dev/null
+++ b/ModPatches/The Tuffalo/Patches/The Tuffalo/Animal_Tuffalo.xml	
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ===== Tuffalo Body Class ===== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Tuffalo"]</xpath>
+
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ===== Tuffalo Combat Stats ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tuffalo"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4.85</MoveSpeed>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.30</MeleeCritChance>
+			<MeleeParryChance>0.20</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tuffalo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>3.17</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationSharp>0.64</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.68</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.68</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationSharp>0.54</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.89</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Tuffalo"]/combatPower</xpath>
+		<value>
+			<combatPower>135</combatPower>
+		</value>
+	</Operation>
+
+	<!-- ===== Tuffalo Wool ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TuffaloWool"]/statBases/StuffPower_Armor_Sharp</xpath>
+
+		<value>
+			<StuffPower_Armor_Sharp>0.02</StuffPower_Armor_Sharp>
+			<StuffPower_Armor_Blunt>0.056</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/The Vanity Project - Shiba Inu/Patches/The Vanity Project - Shiba Inu/Vanity_Project_Shiba_Inu_Patch.xml b/ModPatches/The Vanity Project - Shiba Inu/Patches/The Vanity Project - Shiba Inu/Vanity_Project_Shiba_Inu_Patch.xml
new file mode 100644
index 0000000000..bbff5338be
--- /dev/null
+++ b/ModPatches/The Vanity Project - Shiba Inu/Patches/The Vanity Project - Shiba Inu/Vanity_Project_Shiba_Inu_Patch.xml	
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TVP_ShibaInu"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.04</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TVP_ShibaInu"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.62</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.21</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.62</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.21</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.66</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.76</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="TVP_ShibaInu"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="TVP_ShibaInu"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TVP_ShibaInu"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>437</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="TVP_ShibaInu"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="TVP_ShibaInu"]/combatPower</xpath>
+		<value>
+			<combatPower>30</combatPower>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/The Wild Fields/Patches/The Wild Fields/ThingDefs_Apparel.xml b/ModPatches/The Wild Fields/Patches/The Wild Fields/ThingDefs_Apparel.xml
new file mode 100644
index 0000000000..9b519133ab
--- /dev/null
+++ b/ModPatches/The Wild Fields/Patches/The Wild Fields/ThingDefs_Apparel.xml	
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Apparels-->
+
+	<!-- Fur Vest - balancing MO leather tunic -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Serek_Apparel_CommonerVest"]/statBases</xpath>
+		<value>
+			<Bulk>8.5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- mass stuff -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Serek_Apparel_CommonerVest"]/statBases/Mass</xpath>
+		<value>
+			<Mass>2.8</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Serek_Apparel_CommonerVest"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Noble cape - Warm, thick and luxurious cape -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Serek_Apparel_NobleCape"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Serek_Apparel_NobleCape"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Serek_Apparel_NobleCape"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>90</costStuffCount>
+		</value>
+	</Operation>
+
+	<!--  Vyshyvanka - noble thick shirt -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Serek_Apparel_NobleShirt" or defName="Serek_Apparel_Vyshyvanka"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Serek_Apparel_Vyshyvanka"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Serek_Apparel_Vyshyvanka"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>25</costStuffCount>
+		</value>
+	</Operation>
+
+	<!--- Hats -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="Serek_Apparel_Birka" or
+			defName="Serek_Apparel_NobleFurCap" or
+			defName="Serek_Apparel_NobleCap"
+			]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Serek_Apparel_Birka" or
+			defName="Serek_Apparel_NobleFurCap" or
+			defName="Serek_Apparel_NobleCap"
+			]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Serek_Apparel_Birka"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>30</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Serek_Apparel_NobleFurCap" or defName="Serek_Apparel_NobleCap"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>40</costStuffCount>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/The Wild Fields/Patches/The Wild Fields/ThingDefs_Weapons.xml b/ModPatches/The Wild Fields/Patches/The Wild Fields/ThingDefs_Weapons.xml
new file mode 100644
index 0000000000..6e5a56d549
--- /dev/null
+++ b/ModPatches/The Wild Fields/Patches/The Wild Fields/ThingDefs_Weapons.xml	
@@ -0,0 +1,314 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Serek_MeleeWeapon_WarScythe"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.12</MeleeCritChance>
+			<MeleeParryChance>1.18</MeleeParryChance>
+			<MeleeDodgeChance>0.7</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Serek_MeleeWeapon_WarScythe"]/statBases</xpath>
+		<value>
+			<statBases>
+				<Mass>1.8</Mass>
+				<Bulk>10</Bulk>
+				<MeleeCounterParryBonus>1.53</MeleeCounterParryBonus>
+				<WorkToMake>10500</WorkToMake>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Serek_MeleeWeapon_WarScythe"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>70</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Serek_MeleeWeapon_WarScythe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<chanceFactor>0.15</chanceFactor>
+					<cooldownTime>1.16</cooldownTime>
+					<armorPenetrationBlunt>1.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>33</power>
+					<cooldownTime>1.79</cooldownTime>
+					<armorPenetrationBlunt>4.3</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.87</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>1.7</armorPenetrationBlunt>
+					<armorPenetrationSharp>5.6</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Noble Sabre - Elite Stuff - CE armory sabre with social buff and slight better stats -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Serek_MeleeWeapon_NobleSabre"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.25</MeleeCritChance>
+				<MeleeParryChance>0.75</MeleeParryChance>
+				<MeleeDodgeChance>0.40</MeleeDodgeChance>
+				<SocialImpact>0.2</SocialImpact>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<!-- Replace stats -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Serek_MeleeWeapon_NobleSabre"]/statBases</xpath>
+		<value>
+			<statBases>
+				<WorkToMake>16000</WorkToMake>
+				<Mass>1</Mass>
+				<Bulk>6</Bulk>
+				<MeleeCounterParryBonus>0.63</MeleeCounterParryBonus>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Serek_MeleeWeapon_NobleSabre"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.5</cooldownTime>
+					<chanceFactor>0.1</chanceFactor>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.27</cooldownTime>
+					<armorPenetrationBlunt>1.96</armorPenetrationBlunt>
+					<armorPenetrationSharp>3.92</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2.73</cooldownTime>
+					<armorPenetrationBlunt>7.84</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>29</power>
+					<cooldownTime>2.37</cooldownTime>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>3.24</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.72</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Sabre, same as Noble but weaker, CE Armory Sabre clone    -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Serek_MeleeWeapon_Sabre"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1</MeleeCritChance>
+				<MeleeParryChance>0.65</MeleeParryChance>
+				<MeleeDodgeChance>0.35</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Replace stats -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Serek_MeleeWeapon_Sabre"]/statBases</xpath>
+		<value>
+			<statBases>
+				<WorkToMake>10000</WorkToMake>
+				<Mass>1</Mass>
+				<Bulk>6</Bulk>
+				<MeleeCounterParryBonus>0.45</MeleeCounterParryBonus>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Serek_MeleeWeapon_Sabre"]/recipeMaker</xpath>
+		<value>
+			<recipeMaker>
+				<researchPrerequisite>Smithing</researchPrerequisite>
+				<skillRequirements>
+					<Crafting>5</Crafting>
+				</skillRequirements>
+			</recipeMaker>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Serek_MeleeWeapon_Sabre"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.5</cooldownTime>
+					<chanceFactor>0.1</chanceFactor>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.27</cooldownTime>
+					<armorPenetrationBlunt>1.96</armorPenetrationBlunt>
+					<armorPenetrationSharp>3.92</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2.73</cooldownTime>
+					<armorPenetrationBlunt>7.84</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>29</power>
+					<cooldownTime>2.37</cooldownTime>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>3.24</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.72</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Weapon tags for ordinary sabre -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Serek_MeleeWeapon_Sabre"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- Bulava - high pen one handed mace with buffs -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Serek_MeleeWeapon_Bulava"]/statBases</xpath>
+		<value>
+			<statBases>
+				<WorkToMake>14000</WorkToMake>
+				<Mass>1.12</Mass>
+				<Bulk>3.5</Bulk>
+				<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Serek_MeleeWeapon_Bulava"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.42</MeleeCritChance>
+				<MeleeParryChance>0.24</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+				<SocialImpact>0.1</SocialImpact>
+				<PainShockThreshold>0.12</PainShockThreshold>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Serek_MeleeWeapon_Bulava"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.70</cooldownTime>
+					<chanceFactor>0.33</chanceFactor>
+					<armorPenetrationBlunt>0.825</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18.50</power>
+					<cooldownTime>2.1</cooldownTime>
+					<chanceFactor>0.33</chanceFactor>
+					<armorPenetrationBlunt>6.625</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Serek_MeleeWeapon_Bulava"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Thog's Armor/Patches/Thog's Armor/Armor_Thogs.xml b/ModPatches/Thog's Armor/Patches/Thog's Armor/Armor_Thogs.xml
new file mode 100644
index 0000000000..5a91c5ddf8
--- /dev/null
+++ b/ModPatches/Thog's Armor/Patches/Thog's Armor/Armor_Thogs.xml	
@@ -0,0 +1,257 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ===== Flak & Simple Armor ===== -->
+
+	<!-- === Flak Shoulderpads === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_FlakShoulderpads"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_FlakShoulderpads"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4.8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_FlakShoulderpads"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>7.2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_FlakShoulderpads"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<!-- === Simple Chestplate === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_SimpleChestplate"]/statBases</xpath>
+		<value>
+			<Bulk>20</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_SimpleChestplate"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.85</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_SimpleChestplate"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_SimpleChestplate"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<!-- === Simple Pauldrons === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_SimplePauldrons"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_SimplePauldrons"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_SimplePauldrons"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<!-- === Simple Chausses === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_SimpleChausses"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SimpleChausses"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Apparel_SimpleChausses"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<!-- ===== Visors ===== -->
+
+	<!-- === Wooden Visor === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_WoodenVisor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>10</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+		</value>
+	</Operation>
+
+	<!-- === Simple Visor === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_SimpleVisor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+			<WornBulk>0.75</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- === Flak Visor === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_FlakVisor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+			<WornBulk>0.75</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- === Ablative Visor === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_AblativeVisor"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_AblativeVisor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_AblativeVisor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ===== Wooden Armor ===== -->
+
+	<!-- === Wooden Chestplate === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_WoodenChestplate"]/statBases</xpath>
+		<value>
+			<Bulk>20</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_WoodenChestplate"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_WoodenChestplate"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_WoodenChestplate"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<!-- === Wooden Arm Guards === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_WoodenArmGuards"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_WoodenArmGuards"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_WoodenArmGuards"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<!-- === Wooden Chausses === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_WoodenChausses"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_WoodenChausses"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_WoodenChausses"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Thog's Armor/Patches/Thog's Armor/Armor_ThogsChild.xml b/ModPatches/Thog's Armor/Patches/Thog's Armor/Armor_ThogsChild.xml
new file mode 100644
index 0000000000..a2151a0192
--- /dev/null
+++ b/ModPatches/Thog's Armor/Patches/Thog's Armor/Armor_ThogsChild.xml	
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Child Flak Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_FlakHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>0.75</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_FlakHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_FlakHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Child Squire Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_SquireHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>0.75</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_SquireHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.65</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_SquireHelmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Jaw</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Jaw</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Child Wooden Chestplate === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_WoodenChestplate"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>3.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_WoodenChestplate"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.75</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_WoodenChestplate"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_WoodenChestplate"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<!-- === Child Wooden Arm Guards === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_WoodenArmGuards"]/statBases</xpath>
+		<value>
+			<Bulk>2.5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_WoodenArmGuards"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.7</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_WoodenArmGuards"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<!-- === Child Simple Chestplate === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_SimpleChestplate"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>3.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_SimpleChestplate"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.20</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_SimpleChestplate"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Child Plate Gorget === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_Neckguard"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>0.75</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_Neckguard"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.0</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_Neckguard"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<!-- === Child Flak Shoulderpads === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_FlakShoulderpads"]/statBases</xpath>
+		<value>
+			<Bulk>2.5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_FlakShoulderpads"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2.9</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_FlakShoulderpads"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4.6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_FlakShoulderpads"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Thog's Guns - More Brukka Pack/Patches/Thog's Guns - More Brukka Pack/Ranged_Industrial.xml b/ModPatches/Thog's Guns - More Brukka Pack/Patches/Thog's Guns - More Brukka Pack/Ranged_Industrial.xml
new file mode 100644
index 0000000000..08d20b7738
--- /dev/null
+++ b/ModPatches/Thog's Guns - More Brukka Pack/Patches/Thog's Guns - More Brukka Pack/Ranged_Industrial.xml	
@@ -0,0 +1,1723 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--===== Melee Tools =====-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Gun_LightSMG" or
+			defName="Gun_LightAutopistol" or
+			defName="Gun_HeavyAutopistol" or
+			defName="Gun_VarmitPistol" or
+			defName="Gun_AdvancedRevolver" or
+			defName="Gun_Snubby" or
+			defName="Gun_Magnum" or
+			defName="Gun_SawnoffPumpShotgun" or
+			defName="Gun_BreacherShotgun" or
+			defName="Gun_BreacherShotgunSemi" or
+			defName="Gun_AdvancedAutopistol"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Gun_ServiceRifle" or
+			defName="Gun_BattleRifle" or
+			defName="Gun_BattleDMR" or
+			defName="Gun_HeavySniperRifle" or
+			defName="Gun_VarmitRifle" or
+			defName="Gun_DMR" or
+			defName="Gun_CombatShotgun" or
+			defName="Gun_CrudeRifle" or
+			defName="Gun_EBR" or
+			defName="Gun_AdvancedShotgun" or
+			defName="ThogsGun_AdvancedAssaultRifle" or
+			defName="Gun_AutomaticShotgun" or
+			defName="Gun_ServiceSAW" or
+			defName="Gun_PDW" or
+			defName="Gun_ServiceDMR" or
+			defName="Gun_ServiceCarbine" or
+			defName="Gun_SMG" or
+			defName="Gun_BattleCarbine" or
+			defName="Gun_CrudeSMG" or
+			defName="Gun_Carbine" or
+			defName="Gun_AdvancedPDW" or
+			defName="Gun_HMG" or
+			defName="Gun_SAW" or
+			defName="Gun_LightMinigun" or
+			defName="Gun_CrudeLMG" or
+			defName="Gun_ServiceHMG" or
+			defName="Gun_ThogsAntiMaterialRifle"
+			]/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>
+
+	<!--===== Bayonet =====-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_CarbineBayonet" or defName="Gun_ServiceCarbineBayonet" or defName="Gun_CrudeCarbine"]/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>bayonet</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>2.14</cooldownTime>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>bayonet</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.49</cooldownTime>
+					<armorPenetrationBlunt>2.16</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.44</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!--== Combat Extended duplicate removal on mods part ==-->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Gun_IAW"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Gun_GrenadeLauncher"]</xpath>
+	</Operation>
+
+	<!--=== Removing dart rifles entirely until properly patched ===-->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Gun_AnestheticDartRifle" or defName="Gun_ToxicDartRifle"]</xpath>
+	</Operation>
+
+	<!--==== Varmit Rifle ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_VarmitRifle</defName>
+		<statBases>
+			<SightsEfficiency>1.24</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.17</SwayFactor>
+			<Bulk>9.40</Bulk>
+			<Mass>2.30</Mass>
+			<RangedWeapon_Cooldown>0.67</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_22LR_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>21</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_22LR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!--==== Varmit Pistol ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_VarmitPistol</defName>
+		<statBases>
+			<WorkToMake>6000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.10</ShotSpread>
+			<SwayFactor>1.10</SwayFactor>
+			<Bulk>0.75</Bulk>
+			<Mass>0.80</Mass>
+			<RangedWeapon_Cooldown>0.47</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_22LR_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>22</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_22LR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!--==== .38 Snubby Revolver ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Snubby</defName>
+		<statBases>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.20</ShotSpread>
+			<SwayFactor>0.56</SwayFactor>
+			<Bulk>1.70</Bulk>
+			<Mass>0.79</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_38Special_FMJ</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>11</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_38Special</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!--==== SMG ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SMG</defName>
+		<statBases>
+			<Mass>3.00</Mass>
+			<RangedWeapon_Cooldown>0.26</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.95</SwayFactor>
+			<Bulk>4.20</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.34</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>21</range>
+			<burstShotCount>8</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>4</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!--==== SAW ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_ServiceSAW</defName>
+		<statBases>
+			<Mass>4.80</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.06</SwayFactor>
+			<Bulk>11.40</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.51</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<soundCast>Shot_HeavySMG</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>75</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_MachineGun</li>
+			<li>CE_AI_Suppressive</li>
+		</weaponTags>
+	</Operation>
+
+	<!--==== Service Rifle ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_ServiceRifle</defName>
+		<statBases>
+			<Mass>3.30</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.21</SwayFactor>
+			<Bulk>8.80</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.87</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>0.8</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!--==== Service HMG ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_ServiceHMG</defName>
+		<statBases>
+			<Mass>10.72</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.06</SwayFactor>
+			<Bulk>11.40</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.88</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1.75</warmupTime>
+			<range>49</range>
+			<burstShotCount>20</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<soundCast>Shot_HeavySMG</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>10</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_MachineGun</li>
+			<li>CE_AI_Suppressive</li>
+		</weaponTags>
+	</Operation>
+
+	<!--==== Service DMR ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_ServiceDMR</defName>
+		<statBases>
+			<Mass>4.72</Mass>
+			<RangedWeapon_Cooldown>0.66</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.86</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.76</SwayFactor>
+			<Bulk>10.87</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1.4</warmupTime>
+			<range>67</range>
+			<soundCast>Shot_SniperRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!--==== Service Carbine w/ Bayonet ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_ServiceCarbineBayonet</defName>
+		<statBases>
+			<Mass>3.16</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.9</SightsEfficiency>
+			<ShotSpread>0.13</ShotSpread>
+			<SwayFactor>0.73</SwayFactor>
+			<Bulk>8.03</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.37</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>45</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<soundCast>Shot_HeavySMG</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>4</aimedBurstShotCount>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<!--==== Service Carbine ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_ServiceCarbine</defName>
+		<statBases>
+			<Mass>3.12</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.9</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.70</SwayFactor>
+			<Bulk>7.98</Bulk>
+			<WorkToMake>3000</WorkToMake>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.37</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>45</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<soundCast>Shot_HeavySMG</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>4</aimedBurstShotCount>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!--==== SAW ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SAW</defName>
+		<statBases>
+			<Mass>6.23</Mass>
+			<RangedWeapon_Cooldown>2.75</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>1.29</SwayFactor>
+			<Bulk>11.42</Bulk>
+			<WorkToMake>40000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.8</warmupTime>
+			<range>55</range>
+			<burstShotCount>15</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>10</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Suppressive</li>
+			<li>CE_MachineGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!--==== PDW ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PDW</defName>
+		<statBases>
+			<Mass>2.15</Mass>
+			<RangedWeapon_Cooldown>1.75</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.67</ShotSpread>
+			<SwayFactor>0.79</SwayFactor>
+			<Bulk>4.57</Bulk>
+			<WorkToMake>9000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.3</warmupTime>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<range>22</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+			<li>CE_Sidearm</li>
+		</weaponTags>
+	</Operation>
+
+	<!--==== S&W 500 ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Magnum</defName>
+		<statBases>
+			<Mass>2.4</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.12</SwayFactor>
+			<Bulk>1.08</Bulk>
+			<WorkToMake>5000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_44Magnum_FMJ</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>24</range>
+			<soundCast>Shot_Revolver</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_44Magnum</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!--==== Light SMG ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_LightSMG</defName>
+		<statBases>
+			<Mass>2.67</Mass>
+			<RangedWeapon_Cooldown>1.3</RangedWeapon_Cooldown>
+			<SightsEfficiency>.8</SightsEfficiency>
+			<ShotSpread>1.66</ShotSpread>
+			<SwayFactor>0.76</SwayFactor>
+			<Bulk>3.89</Bulk>
+			<WorkToMake>6000</WorkToMake>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.11</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.8</warmupTime>
+			<range>20</range>
+			<burstShotCount>8</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>4</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!--==== Light Minigun ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_LightMinigun</defName>
+		<statBases>
+			<Mass>12.57</Mass>
+			<RangedWeapon_Cooldown>3.7</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>1.67</ShotSpread>
+			<SwayFactor>2.43</SwayFactor>
+			<Bulk>13.23</Bulk>
+			<WorkToMake>12500</WorkToMake>
+		</statBases>
+		<Properties>
+			<burstShotCount>20</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>2</warmupTime>
+			<range>59</range>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>250</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>15</aimedBurstShotCount>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Suppressive</li>
+			<li>CE_MachineGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!--==== HMG ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_HMG</defName>
+		<statBases>
+			<Mass>17</Mass>
+			<RangedWeapon_Cooldown>5.4</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>.23</ShotSpread>
+			<SwayFactor>1.67</SwayFactor>
+			<Bulk>12.24</Bulk>
+			<WorkToMake>38000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_145x114mm_FMJ</defaultProjectile>
+			<warmupTime>2.8</warmupTime>
+			<range>57</range>
+			<minRange>2</minRange>
+			<burstShotCount>20</burstShotCount>
+			<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_145x114mm</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>10</aimedBurstShotCount>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Suppressive</li>
+			<li>CE_MachineGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!--==== AWP ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_HeavySniperRifle</defName>
+		<statBases>
+			<Mass>6.22</Mass>
+			<RangedWeapon_Cooldown>3.2</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.6</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.75</SwayFactor>
+			<Bulk>11.64</Bulk>
+			<WorkToMake>50000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
+			<warmupTime>3.8</warmupTime>
+			<range>75</range>
+			<minRange>3</minRange>
+			<soundCast>Shot_SniperRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_338Lapua</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!--==== Desert Eagle ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_HeavyAutopistol</defName>
+		<statBases>
+			<Mass>2.6</Mass>
+			<RangedWeapon_Cooldown>0.78</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.19</ShotSpread>
+			<SwayFactor>1.12</SwayFactor>
+			<Bulk>1.03</Bulk>
+			<WorkToMake>6000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_44Magnum_FMJ</defaultProjectile>
+			<warmupTime>0.425</warmupTime>
+			<range>23</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_44Magnum</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!--==== EBR ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_EBR</defName>
+		<statBases>
+			<Mass>5.36</Mass>
+			<RangedWeapon_Cooldown>0.7</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.7</SightsEfficiency>
+			<ShotSpread>0.32</ShotSpread>
+			<SwayFactor>0.49</SwayFactor>
+			<Bulk>7.21</Bulk>
+			<WorkToMake>46000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>64</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!--==== Crude SMG ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_CrudeSMG</defName>
+		<statBases>
+			<Mass>4.26</Mass>
+			<RangedWeapon_Cooldown>0.65</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.20</ShotSpread>
+			<SwayFactor>0.43</SwayFactor>
+			<Bulk>3.54</Bulk>
+			<WorkToMake>8000</WorkToMake>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.78</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>11</ticksBetweenBurstShots>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.9</warmupTime>
+			<range>24</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!--==== DMR ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_DMR</defName>
+		<statBases>
+			<Mass>3.85</Mass>
+			<RangedWeapon_Cooldown>0.7</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.5</SightsEfficiency>
+			<ShotSpread>0.54</ShotSpread>
+			<SwayFactor>0.36</SwayFactor>
+			<Bulk>6.43</Bulk>
+			<WorkToMake>46000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
+			<warmupTime>1.4</warmupTime>
+			<range>60</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_3006Springfield</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!--==== Crude Rifle ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_CrudeRifle</defName>
+		<statBases>
+			<Mass>3.24</Mass>
+			<RangedWeapon_Cooldown>2.1</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>0.24</SwayFactor>
+			<Bulk>6.89</Bulk>
+			<WorkToMake>6000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1.7</warmupTime>
+			<range>45</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>0.90</reloadTime>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!--==== Crude LMG ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_CrudeLMG</defName>
+		<statBases>
+			<Mass>8.89</Mass>
+			<RangedWeapon_Cooldown>2.7</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.21</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<Bulk>12.76</Bulk>
+			<WorkToMake>32000</WorkToMake>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.78</recoilAmount>
+			<burstShotCount>12</burstShotCount>
+			<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>2.2</warmupTime>
+			<range>47</range>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Suppressive</li>
+			<li>CE_Machinegun</li>
+		</weaponTags>
+	</Operation>
+
+	<!--==== Crude Carbine ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_CrudeCarbine</defName>
+		<statBases>
+			<Mass>3.85</Mass>
+			<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.35</ShotSpread>
+			<SwayFactor>0.23</SwayFactor>
+			<Bulk>9.78</Bulk>
+			<WorkToMake>8500</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>57</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<!--==== Combat Shotgun ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_CombatShotgun</defName>
+		<statBases>
+			<Mass>4.99</Mass>
+			<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.22</SwayFactor>
+			<Bulk>10.75</Bulk>
+			<WorkToMake>15000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>26</range>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!--==== Carbine w/ bayonet ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_CarbineBayonet</defName>
+		<statBases>
+			<Mass>2.75</Mass>
+			<RangedWeapon_Cooldown>1.6</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.13</SwayFactor>
+			<Bulk>7.67</Bulk>
+			<WorkToMake>40000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<recoilAmount>1.53</recoilAmount>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>0.8</warmupTime>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<range>45</range>
+			<soundCast>GunShotA</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<!--==== Carbine ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Carbine</defName>
+		<statBases>
+			<Mass>2.70</Mass>
+			<RangedWeapon_Cooldown>1.6</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.13</SwayFactor>
+			<Bulk>7.62</Bulk>
+			<WorkToMake>40000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<recoilAmount>1.53</recoilAmount>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>0.8</warmupTime>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<range>45</range>
+			<soundCast>GunShotA</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!--==== Shorty Shotgun ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SawnoffPumpShotgun</defName>
+		<statBases>
+			<Mass>2.84</Mass>
+			<RangedWeapon_Cooldown>1.25</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>0.34</SwayFactor>
+			<Bulk>6.10</Bulk>
+			<WorkToMake>2000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>14</range>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!--==== Light Autopistol ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_LightAutopistol</defName>
+		<statBases>
+			<Mass>0.7</Mass>
+			<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.10</ShotSpread>
+			<SwayFactor>0.89</SwayFactor>
+			<Bulk>1</Bulk>
+			<WorkToMake>50000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.25</warmupTime>
+			<range>11</range>
+			<soundCast>Shot_MachinePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>17</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!--==== Breaching Shotgun ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_BreacherShotgunSemi</defName>
+		<statBases>
+			<Mass>2.87</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<ShotSpread>0.19</ShotSpread>
+			<SwayFactor>0.96</SwayFactor>
+			<Bulk>5.75</Bulk>
+			<SightsEfficiency>1</SightsEfficiency>
+			<WorkToMake>15000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.75</warmupTime>
+			<range>11</range>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!--==== Battle Rifle ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_BattleRifle</defName>
+		<statBases>
+			<Mass>4.45</Mass>
+			<RangedWeapon_Cooldown>2.25</RangedWeapon_Cooldown>
+			<ShotSpread>0.10</ShotSpread>
+			<SwayFactor>1.47</SwayFactor>
+			<Bulk>11.67</Bulk>
+			<SightsEfficiency>1</SightsEfficiency>
+			<WorkToMake>44000</WorkToMake>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.67</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>61</range>
+			<burstShotCount>4</burstShotCount>
+			<ticksBetweenBurstShots>11</ticksBetweenBurstShots>
+			<soundCast>Shot_HeavySMG</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!--==== Breacher Shotgun ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_BreacherShotgun</defName>
+		<statBases>
+			<Mass>3.50</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.26</SwayFactor>
+			<Bulk>6.7</Bulk>
+			<SightsEfficiency>1</SightsEfficiency>
+			<WorkToMake>2500</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!--==== DMR ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_BattleDMR</defName>
+		<statBases>
+			<Mass>4.70</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.51</SwayFactor>
+			<Bulk>11.79</Bulk>
+			<SightsEfficiency>1.9</SightsEfficiency>
+			<WorkToMake>50000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>72</range>
+			<soundCast>Shot_HeavySMG</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!--==== Battle Carbine ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_BattleCarbine</defName>
+		<statBases>
+			<Mass>3.90</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.89</SwayFactor>
+			<Bulk>9.76</Bulk>
+			<SightsEfficiency>1</SightsEfficiency>
+			<WorkToMake>41000</WorkToMake>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.87</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>54</range>
+			<burstShotCount>4</burstShotCount>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<soundCast>Shot_HeavySMG</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+
+	<!--==== Auto Shotgun ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AutomaticShotgun</defName>
+		<statBases>
+			<Mass>3.90</Mass>
+			<RangedWeapon_Cooldown>2.39</RangedWeapon_Cooldown>
+			<ShotSpread>0.19</ShotSpread>
+			<SwayFactor>1.29</SwayFactor>
+			<Bulk>9.7</Bulk>
+			<SightsEfficiency>1</SightsEfficiency>
+			<WorkToMake>15000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>17</range>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>9</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!--==== Advanced Shotgun ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AdvancedShotgun</defName>
+		<statBases>
+			<Mass>4.70</Mass>
+			<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
+			<ShotSpread>0.19</ShotSpread>
+			<SwayFactor>1.08</SwayFactor>
+			<Bulk>8.7</Bulk>
+			<SightsEfficiency>1</SightsEfficiency>
+			<WorkToMake>20000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<recoilAmount>2.16</recoilAmount>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>21</range>
+			<burstShotCount>2</burstShotCount>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>14</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.50</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!--==== Advanced Revolver ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AdvancedRevolver</defName>
+		<statBases>
+			<Mass>1.6</Mass>
+			<RangedWeapon_Cooldown>1.4</RangedWeapon_Cooldown>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.31</SwayFactor>
+			<Bulk>2.7</Bulk>
+			<SightsEfficiency>1</SightsEfficiency>
+			<WorkToMake>5800</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_357Magnum_FMJ</defaultProjectile>
+			<warmupTime>0.2</warmupTime>
+			<range>19</range>
+			<soundCast>Shot_Revolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_357Magnum</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!--==== Advanced PDW ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AdvancedPDW</defName>
+		<statBases>
+			<Mass>2.5</Mass>
+			<RangedWeapon_Cooldown>2.3</RangedWeapon_Cooldown>
+			<ShotSpread>0.19</ShotSpread>
+			<SwayFactor>0.89</SwayFactor>
+			<Bulk>7.7</Bulk>
+			<SightsEfficiency>1.2</SightsEfficiency>
+			<WorkToMake>25000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<recoilAmount>0.97</recoilAmount>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>19</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Advanced Auto Pistol ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AdvancedAutopistol</defName>
+		<statBases>
+			<WorkToMake>7000</WorkToMake>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.88</SwayFactor>
+			<Bulk>1.86</Bulk>
+			<Mass>0.78</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.74</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>12</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>17</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Anti-Material Rifle ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_ThogsAntiMaterialRifle</defName>
+		<statBases>
+			<Mass>13.50</Mass>
+			<RangedWeapon_Cooldown>0.58</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.84</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.87</SwayFactor>
+			<Bulk>13.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.49</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>3.3</warmupTime>
+			<range>126</range>
+			<soundCast>RNShot50Cal</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!--==== Advanced Assault Rifle ====-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ThogsGun_AdvancedAssaultRifle</defName>
+		<statBases>
+			<Mass>3.67</Mass>
+			<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.79</SwayFactor>
+			<Bulk>9.7</Bulk>
+			<SightsEfficiency>1</SightsEfficiency>
+			<WorkToMake>42000</WorkToMake>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<recoilAmount>1.23</recoilAmount>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>58</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Thrumbo Plushie/Patches/Thrumbo Plushie/ThrumboPlushie.xml b/ModPatches/Thrumbo Plushie/Patches/Thrumbo Plushie/ThrumboPlushie.xml
new file mode 100644
index 0000000000..c1c7e5c59c
--- /dev/null
+++ b/ModPatches/Thrumbo Plushie/Patches/Thrumbo Plushie/ThrumboPlushie.xml	
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Thrumbo Plushie ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ThrumboPlushie"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>base</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.05</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ThrumboPlushie"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="ThrumboPlushie"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="ThrumboPlushie"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ThrumboPlushie"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Thrumkin/Patches/Thrumkin/Patch_Bodies_Thrumkin.xml b/ModPatches/Thrumkin/Patches/Thrumkin/Patch_Bodies_Thrumkin.xml
new file mode 100644
index 0000000000..ffe56e647e
--- /dev/null
+++ b/ModPatches/Thrumkin/Patches/Thrumkin/Patch_Bodies_Thrumkin.xml
@@ -0,0 +1,232 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Let's teach them which is which arm -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel = "left arm"]/groups</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel = "right arm"]/groups</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[customLabel = "left shoulder"]/groups</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[customLabel = "right shoulder"]/groups</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<!-- Changing coverage of the bodyDef (should've done this sooner, but eh) -->
+	<!-- why yes dear explorer of this file, i did just literally copy and paste the Thrumkin_Body bodytype patches -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Ribcage"]/coverage</xpath>
+		<value>
+			<coverage>0.07</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Pelvis"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Stomach"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Heart"]/coverage</xpath>
+		<value>
+			<coverage>0.04</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Lung"]/coverage</xpath>
+		<value>
+			<coverage>0.055</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Kidney"]/coverage</xpath>
+		<value>
+			<coverage>0.03</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Liver"]/coverage</xpath>
+		<value>
+			<coverage>0.06</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Neck"]/coverage</xpath>
+		<value>
+			<coverage>0.055</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Skull"]/parts/li[def="Brain"]/coverage</xpath>
+		<value>
+			<coverage>0.9</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Eye"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/coverage</xpath>
+		<value>
+			<coverage>0.08</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Shoulder"]/coverage</xpath>
+		<value>
+			<coverage>0.085</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Clavicle"]/coverage</xpath>
+		<value>
+			<coverage>0.06</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Humerus"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Radius"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Femur"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Tibia"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+
+	<!-- Adding natural armor coverage -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Tail"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="HornThrumkin"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Hoof"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+				<li>Feet</li>
+			</groups>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Thrumkin/Patches/Thrumkin/Patch_ImplantsProsthetics_Thrumkin.xml b/ModPatches/Thrumkin/Patches/Thrumkin/Patch_ImplantsProsthetics_Thrumkin.xml
new file mode 100644
index 0000000000..2933938414
--- /dev/null
+++ b/ModPatches/Thrumkin/Patches/Thrumkin/Patch_ImplantsProsthetics_Thrumkin.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- SteelThrumkinHorn -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="SteelThrumkinHorn"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>steel horn</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>2.6</cooldownTime>
+					<armorPenetrationSharp>0.06</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.332</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>steel horn</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>3.12</cooldownTime>
+					<armorPenetrationSharp>0.42</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.925</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- EnhancementThrumkinHorn -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="EnhancementThrumkinHorn"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>enhanced horn</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>53</power>
+					<cooldownTime>1.15</cooldownTime>
+					<armorPenetrationSharp>0.69</armorPenetrationSharp>
+					<armorPenetrationBlunt>6.83</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>enhanced horn</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>34</power>
+					<cooldownTime>1.38</cooldownTime>
+					<armorPenetrationSharp>4.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.743</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Thrumkin/Patches/Thrumkin/Patch_PawnKinds_Thrumkin.xml b/ModPatches/Thrumkin/Patches/Thrumkin/Patch_PawnKinds_Thrumkin.xml
new file mode 100644
index 0000000000..cd316fb138
--- /dev/null
+++ b/ModPatches/Thrumkin/Patches/Thrumkin/Patch_PawnKinds_Thrumkin.xml
@@ -0,0 +1,387 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Techless -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Thrumkin_Slave"]/combatPower</xpath>
+		<value>
+			<combatPower>20</combatPower>
+		</value>
+	</Operation>
+
+	<!-- Tribal -->
+	<!-- Thrumkin_Penitent -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Thrumkin_Penitent"]/combatPower</xpath>
+		<value>
+			<combatPower>30</combatPower>
+		</value>
+	</Operation>
+
+	<!-- Thrumkin_Archer -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Thrumkin_Archer"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>10</min>
+					<max>40</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>100</min>
+					<max>140</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.6</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>40</min>
+							<max>80</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Thrumkin_Archer"]/combatPower</xpath>
+		<value>
+			<combatPower>50</combatPower>
+		</value>
+	</Operation>
+
+	<!-- Thrumkin_Warrior -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Thrumkin_Warrior"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>100</min>
+					<max>200</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.9</shieldChance>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Thrumkin_Warrior"]/combatPower</xpath>
+		<value>
+			<combatPower>42</combatPower>
+		</value>
+	</Operation>
+
+	<!-- Thrumkin_Hunter -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Thrumkin_Hunter"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>10</min>
+					<max>60</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>100</min>
+					<max>180</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.6</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>80</min>
+							<max>160</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Thrumkin_Hunter"]/combatPower</xpath>
+		<value>
+			<combatPower>70</combatPower>
+		</value>
+	</Operation>
+
+	<!-- Thrumkin_Berserker -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Thrumkin_Berserker"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>100</min>
+					<max>300</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.9</shieldChance>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Thrumkin_Berserker"]/combatPower</xpath>
+		<value>
+			<combatPower>90</combatPower>
+		</value>
+	</Operation>
+
+	<!-- Thrumkin_HeavyArcher -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Thrumkin_HeavyArcher"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>10</min>
+					<max>80</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>100</min>
+					<max>200</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.6</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>100</min>
+							<max>200</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Thrumkin_HeavyArcher"]/combatPower</xpath>
+		<value>
+			<combatPower>90</combatPower>
+		</value>
+	</Operation>
+
+	<!-- Thrumkin_ElderMelee -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Thrumkin_ElderMelee"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>200</min>
+					<max>400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.9</shieldChance>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Thrumkin_ElderRanged -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Thrumkin_ElderRanged"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>10</min>
+					<max>80</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>100</min>
+					<max>300</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.6</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>150</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Thrumkin_GrandElder -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Thrumkin_GrandElder"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>10</min>
+					<max>40</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>300</min>
+					<max>600</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.6</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>200</min>
+							<max>400</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Industrial -->
+	<!-- Thrumkin_Villager -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Thrumkin_Villager"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>1</min>
+					<max>2</max>
+				</primaryMagazineCount>
+				<shieldChance>0.6</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>20</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Thrumkin_Villager"]/combatPower</xpath>
+		<value>
+			<combatPower>45</combatPower>
+		</value>
+	</Operation>
+
+	<!-- Thrumkin_Guard -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Thrumkin_Guard"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<shieldChance>0.6</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>20</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Thrumkin_Guard"]/combatPower</xpath>
+		<value>
+			<combatPower>65</combatPower>
+		</value>
+	</Operation>
+
+	<!-- Thrumkin_Gunner -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Thrumkin_Gunner"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>200</min>
+					<max>600</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.8</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>20</min>
+							<max>120</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Thrumkin_Gunner"]/combatPower</xpath>
+		<value>
+			<combatPower>100</combatPower>
+		</value>
+	</Operation>
+
+	<!-- Thrumkin_Slasher -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Thrumkin_Slasher"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.9</shieldChance>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Thrumkin_Slasher"]/combatPower</xpath>
+		<value>
+			<combatPower>160</combatPower>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Thrumkin/Patches/Thrumkin/Patch_Race_Thrumkin.xml b/ModPatches/Thrumkin/Patches/Thrumkin/Patch_Race_Thrumkin.xml
new file mode 100644
index 0000000000..7cbb55505a
--- /dev/null
+++ b/ModPatches/Thrumkin/Patches/Thrumkin/Patch_Race_Thrumkin.xml
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Combat -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Thrumkin"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Thrumkin"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+	<!-- thrumkin rebalances -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Thrumkin"]/statBases</xpath>
+		<value>
+			<!-- combat stats -->
+			<AimingAccuracy>0.9</AimingAccuracy>
+			<MeleeCritChance>1.34</MeleeCritChance>
+			<MeleeParryChance>1.27</MeleeParryChance>
+			<Suppressability>0.8</Suppressability>
+			<ReloadSpeed>0.9</ReloadSpeed>
+			<MeleeDodgeChance>1.06</MeleeDodgeChance>
+			<!-- other stats -->
+			<CarryWeight>50</CarryWeight>
+		</value>
+	</Operation>
+	<!-- should've modified the values sooner -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Thrumkin"]/statBases/Mass</xpath>
+		<value>
+			<Mass>120</Mass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Thrumkin"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Thrumkin"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Thrumkin"]/statBases/LeatherAmount</xpath>
+		<value>
+			<LeatherAmount>20</LeatherAmount>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Thrumkin"]/comps/li[@Class="CompProperties_Shearable"]/woolAmount</xpath>
+		<value>
+			<woolAmount>10</woolAmount>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Thrumkin"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>1.5</baseHealthScale>
+		</value>
+	</Operation>
+	<!-- Unarmed -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Thrumkin"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>1.73</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.4</chanceFactor>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.996</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>2.08</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.4</chanceFactor>
+					<armorPenetrationSharp>1.39</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.081</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.16</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.595</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.16</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.595</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.94</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.561</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>3.12</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.3</chanceFactor>
+					<armorPenetrationBlunt>0.925</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Thrumkin/Patches/Thrumkin/Patch_Things_Thrumkin.xml b/ModPatches/Thrumkin/Patches/Thrumkin/Patch_Things_Thrumkin.xml
new file mode 100644
index 0000000000..2d8540709b
--- /dev/null
+++ b/ModPatches/Thrumkin/Patches/Thrumkin/Patch_Things_Thrumkin.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- WoodLog_GhostAsh -->
+	<!-- As a weapon -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoodLog_GhostAsh"]</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.99</cooldownTime>
+					<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoodLog_GhostAsh"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.2</MeleeCritChance>
+				<MeleeParryChance>1</MeleeParryChance>
+				<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoodLog_GhostAsh"]/statBases</xpath>
+		<value>
+			<Bulk>0.07</Bulk>
+			<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+	<!-- As a material -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoodLog_GhostAsh"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.2</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoodLog_GhostAsh"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.4</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoodLog_GhostAsh"]/statBases/SharpDamageMultiplier</xpath>
+		<value>
+			<SharpDamageMultiplier>0.8</SharpDamageMultiplier>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WoodLog_GhostAsh"]/statBases/BluntDamageMultiplier</xpath>
+		<value>
+			<BluntDamageMultiplier>0.6</BluntDamageMultiplier>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WoodLog_GhostAsh"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>0.5</Mass>
+			<MeleePenetrationFactor>0.4</MeleePenetrationFactor>
+		</value>
+	</Operation>
+
+	<!-- Thrumkin_Crossbow -->
+	<!-- as a gun -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Thrumkin_Crossbow</defName>
+		<statBases>
+			<Mass>5.44</Mass><!-- bolt-action rfile has mass of 4.19. since this is supposed to be used by thrumkin, it should be a bit more heavier -->
+			<RangedWeapon_Cooldown>1.404</RangedWeapon_Cooldown><!-- a bit slower than the bolt-action rifle -->
+			<SightsEfficiency>0.9</SightsEfficiency><!-- worse than the bolt-action rifle -->
+			<ShotSpread>0.2</ShotSpread><!-- not a gun, but better than a bow -->
+			<SwayFactor>1.58</SwayFactor><!-- a bit more unwieldy than the bolt-action rifle -->
+			<Bulk>6.40</Bulk><!-- similar bulk to a great bow -->
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_CrossbowBolt_Stone</defaultProjectile>
+			<warmupTime>3.0</warmupTime>
+			<range>50</range>
+			<soundCast>Bow_Large</soundCast>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>6</AmmoGenPerMagOverride>
+			<reloadTime>3.8</reloadTime>
+			<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>NeolithicThrumkinRanged</li>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+		<researchPrerequisite>Greatbow</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+	<!-- in melee -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Thrumkin_Crossbow"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.55</cooldownTime>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Thrumkin_Sword -->
+	<!-- Used as a weapon -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Thrumkin_Sword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.12</cooldownTime>
+					<chanceFactor>0.1</chanceFactor>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>2.12</cooldownTime>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationSharp>8</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>56</power>
+					<cooldownTime>2.1</cooldownTime>
+					<chanceFactor>0.4</chanceFactor>
+					<armorPenetrationSharp>2.88</armorPenetrationSharp>
+					<armorPenetrationBlunt>6.48</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Thrumkin_Sword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.17</MeleeCritChance>
+				<MeleeParryChance>0.35</MeleeParryChance>
+				<MeleeDodgeChance>0.47</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Thrumkin_Sword"]/statBases/Mass</xpath>
+		<value>
+			<Mass>4</Mass>
+			<Bulk>12</Bulk>
+			<MeleeCounterParryBonus>0.47</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Toolmetrics Redux/Patches/Toolmetrics Redux/ToolmetricsRedux_ToolsDef.xml b/ModPatches/Toolmetrics Redux/Patches/Toolmetrics Redux/ToolmetricsRedux_ToolsDef.xml
new file mode 100644
index 0000000000..4c971ffdd0
--- /dev/null
+++ b/ModPatches/Toolmetrics Redux/Patches/Toolmetrics Redux/ToolmetricsRedux_ToolsDef.xml	
@@ -0,0 +1,2025 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_Chisel"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5.0</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1.1</chanceFactor>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>7.0</power>
+					<cooldownTime>1.8</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationSharp>0.13</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Chisel"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>1.0</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Chisel"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.20</MeleeCritChance>
+			<MeleeParryChance>0.20</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "Tool_Chisel"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "Tool_Chisel"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Chisel"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_Chefs_Knife"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5.0</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1.1</chanceFactor>
+					<armorPenetrationBlunt>0.09</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>8.0</power>
+					<cooldownTime>2.0</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationSharp>1.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.936</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>11.0</power>
+					<cooldownTime>2.0</cooldownTime>
+					<chanceFactor>1.34</chanceFactor>
+					<armorPenetrationSharp>1.34</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Chefs_Knife"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>1.0</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Chefs_Knife"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.20</MeleeCritChance>
+			<MeleeParryChance>0.20</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "Tool_Chefs_Knife"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "Tool_Chefs_Knife"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Chefs_Knife"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_Pillow"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>side</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1.0</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.01</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Pillow"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_Blanket"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>side</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1.0</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.01</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Blanket"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_Leash"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>collar</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.85</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.09</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Leash"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<MeleeCounterParryBonus>1.1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Leash"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "Tool_Leash"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "Tool_Leash"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Leash"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_Bandage"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>wraps</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.85</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.09</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Bandage"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Bandage"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "Tool_Bandage"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "Tool_Bandage"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Bandage"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_Walking_Cane"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7.0</power>
+					<cooldownTime>1.4</cooldownTime>
+					<chanceFactor>1.1</chanceFactor>
+					<armorPenetrationBlunt>0.10</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Walking_Cane"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Walking_Cane"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>0.30</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "Tool_Walking_Cane"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "Tool_Walking_Cane"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Walking_Cane"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_Whip"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>14.0</power>
+					<cooldownTime>2.0</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.06</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Whip"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>1.4</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Whip"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.60</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "Tool_Whip"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "Tool_Whip"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Whip"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_First_Aid_Kit"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>case</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7.0</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.08</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_First_Aid_Kit"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.8</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "Tool_First_Aid_Kit"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "Tool_First_Aid_Kit"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_First_Aid_Kit"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_Flowers"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1.0</power>
+					<cooldownTime>1.0</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Flowers"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "Tool_Flowers"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "Tool_Flowers"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Flowers"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_Fan"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>6.0</power>
+					<cooldownTime>1.1</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.05</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Fan"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<MeleeCounterParryBonus>1.0</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "Tool_Fan"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "Tool_Fan"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Fan"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_Encyclopedia"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>cover</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6.0</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.08</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Encyclopedia"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>1.0</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "Tool_Encyclopedia"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "Tool_Encyclopedia"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Encyclopedia"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_How_To"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>cover</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6.0</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.08</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_How_To"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>1.0</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "Tool_How_To"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "Tool_How_To"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_How_To"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_Coupon_Book"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>cover</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6.0</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.08</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Coupon_Book"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>1.0</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "Tool_Coupon_Book"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "Tool_Coupon_Book"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Coupon_Book"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_Laptop"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Side</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7.0</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.09</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Laptop"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_Saw"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5.0</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1.1</chanceFactor>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>10.0</power>
+					<cooldownTime>2.2</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationSharp>0.7</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Saw"]/statBases</xpath>
+		<value>
+			<Bulk>7</Bulk>
+			<MeleeCounterParryBonus>1.1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Saw"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "Tool_Saw"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "Tool_Saw"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Saw"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_Brick_Saw"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5.0</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1.1</chanceFactor>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>saw</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>32.0</power>
+					<cooldownTime>5.0</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Brick_Saw"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<MeleeCounterParryBonus>1.2</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Brick_Saw"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.60</MeleeCritChance>
+			<MeleeParryChance>-0.20</MeleeParryChance>
+			<MeleeDodgeChance>-0.20</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_Power_Drill"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5.0</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1.1</chanceFactor>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>drill</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>26.0</power>
+					<cooldownTime>5.5</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationSharp>1.34</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Power_Drill"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>1.2</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Power_Drill"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.50</MeleeCritChance>
+			<MeleeParryChance>0.20</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "Tool_Power_Drill"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "Tool_Power_Drill"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Power_Drill"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_Jackhammer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5.0</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1.1</chanceFactor>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>52.0</power>
+					<cooldownTime>8</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationSharp>1.34</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Jackhammer"]/statBases</xpath>
+		<value>
+			<Bulk>14</Bulk>
+			<MeleeCounterParryBonus>1.0</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Jackhammer"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.50</MeleeCritChance>
+			<MeleeParryChance>-0.20</MeleeParryChance>
+			<MeleeDodgeChance>-0.20</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_Toolkit"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>case</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7.0</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Toolkit"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.8</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "Tool_Toolkit"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "Tool_Toolkit"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Toolkit"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_Thimble"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>body</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.85</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.09</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Thimble"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<MeleeCounterParryBonus>1.0</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Thimble"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "Tool_Thimble"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "Tool_Thimble"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Thimble"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_Whistle"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>body</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.85</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.09</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Whistle"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<MeleeCounterParryBonus>1.0</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Whistle"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.05</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "Tool_Whistle"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "Tool_Whistle"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Whistle"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_Screwdriver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5.0</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1.1</chanceFactor>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>7.0</power>
+					<cooldownTime>1.8</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationSharp>0.74</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Screwdriver"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>1.0</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Screwdriver"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "Tool_Screwdriver"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "Tool_Screwdriver"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Screwdriver"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_Axe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6.0</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1.1</chanceFactor>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>16.0</power>
+					<cooldownTime>2.5</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Axe"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>1.0</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Axe"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.30</MeleeCritChance>
+			<MeleeParryChance>0.20</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_Skill_Saw"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6.0</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1.1</chanceFactor>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>34.0</power>
+					<cooldownTime>5.0</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationSharp>0.84</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Skill_Saw"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>1.2</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Skill_Saw"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.60</MeleeCritChance>
+			<MeleeParryChance>-0.20</MeleeParryChance>
+			<MeleeDodgeChance>-0.20</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_Fork"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>7.0</power>
+					<cooldownTime>1.8</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Fork"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "Tool_Fork"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "Tool_Fork"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Fork"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_Cleaver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5.0</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1.1</chanceFactor>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>12.0</power>
+					<cooldownTime>2.2</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationSharp>1.34</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Cleaver"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>1.1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Cleaver"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.20</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "Tool_Cleaver"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "Tool_Cleaver"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Cleaver"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_Skinning_Knife"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>8.0</power>
+					<cooldownTime>1.8</cooldownTime>
+					<chanceFactor>1.11</chanceFactor>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>9.0</power>
+					<cooldownTime>1.9</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationSharp>1.04</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Skinning_Knife"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<MeleeCounterParryBonus>1.0</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Skinning_Knife"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.30</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "Tool_Skinning_Knife"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "Tool_Skinning_Knife"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Skinning_Knife"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_Pickaxe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5.0</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1.1</chanceFactor>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>14.0</power>
+					<cooldownTime>2.3</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationSharp>1.14</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Pickaxe"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>1.2</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Pickaxe"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.40</MeleeCritChance>
+			<MeleeParryChance>0.20</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_Scapel"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>5.0</power>
+					<cooldownTime>1</cooldownTime>
+					<chanceFactor>1.11</chanceFactor>
+					<armorPenetrationBlunt>0.08</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>6.0</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationSharp>1.04</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Scapel"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<MeleeCounterParryBonus>0.8</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Scapel"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.40</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "Tool_Scapel"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "Tool_Scapel"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Scapel"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_Sickle"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5.0</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1.1</chanceFactor>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>11.0</power>
+					<cooldownTime>2.1</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationSharp>0.74</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Sickle"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Sickle"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.20</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "Tool_Sickle"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "Tool_Sickle"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Sickle"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_Scythe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5.0</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1.1</chanceFactor>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>13.0</power>
+					<cooldownTime>2.1</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationSharp>1.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.936</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>15.0</power>
+					<cooldownTime>2.5</cooldownTime>
+					<chanceFactor>1.26</chanceFactor>
+					<armorPenetrationSharp>1.14</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Scythe"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>1.2</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Scythe"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.40</MeleeCritChance>
+			<MeleeParryChance>0.20</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_Crowbar"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9.0</power>
+					<cooldownTime>1.7</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>1.936</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Crowbar"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Crowbar"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "Tool_Crowbar"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "Tool_Crowbar"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Crowbar"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_Forge_Hammer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5.0</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1.1</chanceFactor>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18.0</power>
+					<cooldownTime>2.9</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>1.936</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Forge_Hammer"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>1.4</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Forge_Hammer"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.40</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_Spoon"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1.0</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.01</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Spoon"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<MeleeCounterParryBonus>0.8</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "Tool_Spoon"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "Tool_Spoon"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Spoon"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_Trowel"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5.0</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1.1</chanceFactor>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>4.0</power>
+					<cooldownTime>1.3</cooldownTime>
+					<chanceFactor>1.2</chanceFactor>
+					<armorPenetrationSharp>1.04</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>4.0</power>
+					<cooldownTime>1.3</cooldownTime>
+					<chanceFactor>1.3</chanceFactor>
+					<armorPenetrationSharp>1.04</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6.0</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1.34</chanceFactor>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Trowel"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "Tool_Trowel"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "Tool_Trowel"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Chefs_Knife"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_Shovel"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5.0</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1.1</chanceFactor>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>9.0</power>
+					<cooldownTime>1.8</cooldownTime>
+					<chanceFactor>1.2</chanceFactor>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.05</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>11.0</power>
+					<cooldownTime>2.0</cooldownTime>
+					<chanceFactor>1.3</chanceFactor>
+					<armorPenetrationSharp>0.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.936</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14.0</power>
+					<cooldownTime>2.5</cooldownTime>
+					<chanceFactor>1.34</chanceFactor>
+					<armorPenetrationBlunt>0.7</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Shovel"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>1.1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Shovel"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.20</MeleeCritChance>
+			<MeleeParryChance>0.20</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_Hammer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5.0</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1.1</chanceFactor>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9.0</power>
+					<cooldownTime>2.0</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Hammer"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Hammer"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.20</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "Tool_Hammer"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "Tool_Hammer"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Hammer"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Tool_Animal_Husbandry"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>weight</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7.0</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.08</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Animal_Husbandry"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>0.7</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "Tool_Animal_Husbandry"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "Tool_Animal_Husbandry"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tool_Animal_Husbandry"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/TouhouStyle/Patches/TouhouStyle/ThingDefs_Misc/Apparel_TouHou.xml b/ModPatches/TouhouStyle/Patches/TouhouStyle/ThingDefs_Misc/Apparel_TouHou.xml
new file mode 100644
index 0000000000..d025191fe0
--- /dev/null
+++ b/ModPatches/TouhouStyle/Patches/TouhouStyle/ThingDefs_Misc/Apparel_TouHou.xml
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Outifts-->
+
+	<!--Flandre Outfit-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNdressFL"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10.8</ArmorRating_Sharp>
+			<Bulk>7</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNdressFL"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>21.6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNdressFL"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>0.08</ShootingAccuracyPawn>
+			<AimingAccuracy>0.04</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!--Remilia Outfit-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNdressRM"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>9.6</ArmorRating_Sharp>
+			<Bulk>7</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNdressRM"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>18.9</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Patchouli Outfit-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNdressMQ"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.25</ArmorRating_Sharp>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNdressMQ"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.24</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Izayoi Outfit-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNdressPAD"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10.8</ArmorRating_Sharp>
+			<Bulk>7</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNdressPAD"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>13.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Meirin Outfit-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNdressHMR"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14.4</ArmorRating_Sharp>
+			<Bulk>7</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNdressHMR"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>29.7</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNdressHMR"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.04</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!--Koakuma Outfit-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNdressLD"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNdressLD"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.42</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Cirno Outfit-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_TH_Cirno"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2.2</ArmorRating_Sharp>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_TH_Cirno"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.54</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Rumia Outfit-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_TH_Rumia"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4.7</ArmorRating_Sharp>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_TH_Rumia"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.72</ArmorRating_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/TouhouStyle/Patches/TouhouStyle/ThingDefs_Misc/Headgear_TouHou.xml b/ModPatches/TouhouStyle/Patches/TouhouStyle/ThingDefs_Misc/Headgear_TouHou.xml
new file mode 100644
index 0000000000..099cb35d12
--- /dev/null
+++ b/ModPatches/TouhouStyle/Patches/TouhouStyle/ThingDefs_Misc/Headgear_TouHou.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Hats-->
+
+	<!--Flandre Hat-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNhatFL"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNhatFL"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>10.8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNhatFL"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>0.04</ShootingAccuracyPawn>
+			<AimingAccuracy>0.02</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!--Remilia Hat-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNhatRM"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3.6</ArmorRating_Sharp>
+			<Bulk>7</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNhatRM"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!--Meirin Hat-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNhatHMR"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4.8</ArmorRating_Sharp>
+			<Bulk>7</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNhatHMR"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>13.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNhatHMR"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.07</MeleeDodgeChance>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Tribal Warrior Set/Patches/Tribal Warrior Set/TribalWarrior_Apparel.xml b/ModPatches/Tribal Warrior Set/Patches/Tribal Warrior Set/TribalWarrior_Apparel.xml
new file mode 100644
index 0000000000..a4e36f42ce
--- /dev/null
+++ b/ModPatches/Tribal Warrior Set/Patches/Tribal Warrior Set/TribalWarrior_Apparel.xml	
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Tribalwear -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Gunmar_Apparel_Tribal"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName= "Gunmar_Apparel_Tribal"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Thick Pelt Armor -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Gunmar_Apparel_ThickPeltArmor"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName= "Gunmar_Apparel_ThickPeltArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+			<ArmorRating_Sharp>0.30</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Pelt Cap / Pelt Mantle -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Gunmar_Apparel_PeltMantle" or defName="Gunmar_Apparel_SunshadePeltMantle" or defName = "Gunmar_Apparel_WovenMantle"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gunmar_Apparel_PeltMantle" or defName="Gunmar_Apparel_SunshadePeltMantle"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Sunshade Pelt Cap -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName= "Gunmar_Apparel_PeltCap" or defName = "Gunmar_Apparel_SunshadePeltCap" or defName = "Gunmar_Apparel_WovenCap"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName= "Gunmar_Apparel_PeltCap" or defName= "Gunmar_Apparel_SunshadePeltCap" or defName = "Gunmar_Apparel_WovenCap"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.25</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Pelt Leggings -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Gunmar_Apparel_PeltLeggings" or defName="Gunmar_Apparel_PeltBoots"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName= "Gunmar_Apparel_PeltLeggings" or defName="Gunmar_Apparel_PeltBoots"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Wraps -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Gunmar_Apparel_WovenHandWraps" or defName = "Gunmar_Apparel_WovenLeggings" or defName = "Gunmar_Apparel_WovenFootWraps"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName= "Gunmar_Apparel_WovenHandWraps" or defName = "Gunmar_Apparel_WovenLeggings" or defName = "Gunmar_Apparel_WovenFootWraps"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- War Bow -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gunmar_War_Bow</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>1</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>5.00</Bulk>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_GreatArrow_Stone</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>30</range>
+			<soundCast>Bow_Large</soundCast>
+		</Properties>
+		<AmmoUser>
+			<ammoSet>AmmoSet_GreatArrow</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_Bow</li>
+		</weaponTags>
+		<researchPrerequisite>Greatbow</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gunmar_War_Bow"]/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>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Tsar Armory/Patches/Tsar Armory/TsarArmory_Guns.xml b/ModPatches/Tsar Armory/Patches/Tsar Armory/TsarArmory_Guns.xml
new file mode 100644
index 0000000000..dccded1b42
--- /dev/null
+++ b/ModPatches/Tsar Armory/Patches/Tsar Armory/TsarArmory_Guns.xml	
@@ -0,0 +1,386 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Tools ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_Nagant_TA"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_Fedorov_TA" or defName="Gun_Mosin_TA" or defName="Gun_M1895_TA"]/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>
+
+	<!-- ========== Fedorov Avtomat ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Fedorov_TA</defName>
+		<statBases>
+			<Mass>4.40</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.49</SwayFactor>
+			<Bulk>10.45</Bulk>
+			<WorkToMake>18000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>80</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+			<WoodLog>10</WoodLog>
+		</costList>
+		<Properties>
+			<recoilAmount>1.78</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_65x50mmSRArisaka_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>51</range>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<soundCast>Shot_Fedorov</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_65x50mmSRArisaka</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<researchPrerequisite>Stage2b_TA</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== Nagant 1895 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Nagant_TA</defName>
+		<statBases>
+			<Mass>0.80</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.05</SwayFactor>
+			<Bulk>2.35</Bulk>
+			<WorkToMake>10000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>45</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+			<WoodLog>5</WoodLog>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x38mmR_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Nagant</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_762x38mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>Gun</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+		<researchPrerequisite>Stage0b_TA</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== Mosin 1891 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Mosin_TA</defName>
+		<statBases>
+			<Mass>4.00</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.63</SwayFactor>
+			<Bulk>12.32</Bulk>
+			<WorkToMake>6000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+			<WoodLog>20</WoodLog>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_Mosin</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<researchPrerequisite>Stage0b_TA</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== Winchester M1895 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_M1895_TA</defName>
+		<statBases>
+			<Mass>4.20</Mass>
+			<RangedWeapon_Cooldown>0.77</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.60</SwayFactor>
+			<Bulk>11.75</Bulk>
+			<WorkToMake>12000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+			<WoodLog>20</WoodLog>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_M1895</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<researchPrerequisite>Stage0b_TA</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== M1914 Concussion Grenade ========== -->
+
+	<!-- Projectile -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Proj_M1914_TA"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Proj_M1914_TA"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<explosionRadius>1.5</explosionRadius>
+				<damageDef>Bomb</damageDef>
+				<damageAmountBase>60</damageAmountBase>
+				<explosionDelay>100</explosionDelay>
+				<dropsCasings>true</dropsCasings>
+				<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+				<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<speed>12</speed>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+				<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "Proj_M1914_TA"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "Proj_M1914_TA"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<!-- M1914 Concussion Grenade -->
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="Weapon_M1914_TA"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>BaseWeapon</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Weapon_M1914_TA"]/recipeMaker</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Weapon_M1914_TA"]/costList</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Weapon_M1914_TA"]/label</xpath>
+		<value>
+			<label>Model 1914 grenade</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Weapon_M1914_TA"]</xpath>
+		<value>
+			<equippedAngleOffset>90</equippedAngleOffset>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Weapon_M1914_TA"]</xpath>
+		<value>
+			<thingClass>CombatExtended.AmmoThing</thingClass>
+			<stackLimit>75</stackLimit>
+			<resourceReadoutPriority>First</resourceReadoutPriority>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="Weapon_M1914_TA"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "Weapon_M1914_TA"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "Weapon_M1914_TA"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Weapon_M1914_TA"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>60</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>1.5</explosiveRadius>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Weapon_M1914_TA</defName>
+		<statBases>
+			<Mass>0.5</Mass>
+			<Bulk>0.235</Bulk>
+			<MarketValue>12.22</MarketValue>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<label>throw concussion grenade</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<range>13.0</range>
+			<minRange>2</minRange>
+			<warmupTime>0.8</warmupTime>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<soundCast>ThrowGrenade</soundCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<defaultProjectile>Proj_M1914_TA</defaultProjectile>
+			<onlyManualCast>true</onlyManualCast>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<weaponTags>
+			<li>CE_AI_Grenade</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Tsar Armory/Patches/Tsar Armory/TsarArmory_Recipes.xml b/ModPatches/Tsar Armory/Patches/Tsar Armory/TsarArmory_Recipes.xml
new file mode 100644
index 0000000000..1a46b7bdca
--- /dev/null
+++ b/ModPatches/Tsar Armory/Patches/Tsar Armory/TsarArmory_Recipes.xml	
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Remove Useless Recipes ========== -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/RecipeDef[defName="Make_PM1910_Ammo_TA"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="TableMachining"]/recipes/li[text()="Make_PM1910_Ammo_TA"]</xpath>
+		<match Class="PatchOperationRemove">
+			<xpath>Defs/ThingDef[defName="TableMachining"]/recipes/li[text()="Make_PM1910_Ammo_TA"]</xpath>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Tsar Armory/Patches/Tsar Armory/TsarArmory_Turrets.xml b/ModPatches/Tsar Armory/Patches/Tsar Armory/TsarArmory_Turrets.xml
new file mode 100644
index 0000000000..f579762ef8
--- /dev/null
+++ b/ModPatches/Tsar Armory/Patches/Tsar Armory/TsarArmory_Turrets.xml	
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== PM 1910 ========== -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="PM1910_Ammo_TA"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_PM1910_TA"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PM1910_TA</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.65</SwayFactor>
+			<Bulk>62.66</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.33</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>62</range>
+			<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>Shot_Maxim</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>250</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Turret_PM1910_TA"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Turret Collection/Defs/Turret Collection/Ammo_M74.xml b/ModPatches/Turret Collection/Defs/Turret Collection/Ammo_M74.xml
new file mode 100644
index 0000000000..d666addb24
--- /dev/null
+++ b/ModPatches/Turret Collection/Defs/Turret Collection/Ammo_M74.xml	
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- ========== Ammo: Indirect-fire variant of M74 Incendiary rocket ========== -->
+	<!-- This allows the same craftable M74 ammo to be used by both direct and indirect fire weapons -->
+
+	<!--== AmmoSet ==-->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_M74_TC</defName>
+		<label>M74 Rockets</label>
+		<ammoTypes>
+			<Ammo_M74_Incendiary>Bullet_M74_Incendiary_TC</Ammo_M74_Incendiary>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!--== Projectiles ==-->
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseM74">
+		<defName>Bullet_M74_Incendiary_TC</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>M74 Rocket (Incendiary)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Rocket/M74</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>PrometheumFlame</damageDef>
+			<damageAmountBase>10</damageAmountBase>
+			<explosionRadius>8</explosionRadius>
+			<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
+			<preExplosionSpawnChance>0.5</preExplosionSpawnChance>
+			<soundExplode>MortarIncendiary_Explode</soundExplode>
+			<!-- This is the key to indirect-fire projectiles -->
+			<flyOverhead>true</flyOverhead>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Turret Collection/Patches/Turret Collection/TurretCollection_CE_Patch_Turrets.xml b/ModPatches/Turret Collection/Patches/Turret Collection/TurretCollection_CE_Patch_Turrets.xml
new file mode 100644
index 0000000000..1dfa3efe0a
--- /dev/null
+++ b/ModPatches/Turret Collection/Patches/Turret Collection/TurretCollection_CE_Patch_Turrets.xml	
@@ -0,0 +1,937 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Advanced Naval Gun Turret ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>TC_AdvancedNavalGun_Gun</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>3.31</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>4.44</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_57x483mmBofors_HE</defaultProjectile>
+			<warmupTime>4.3</warmupTime>
+			<range>86</range>
+			<minRange>15</minRange>
+			<ticksBetweenBurstShots>16</ticksBetweenBurstShots>
+			<burstShotCount>5</burstShotCount>
+			<soundCast>TC_ShotAdvancedNavalGun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>16</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>9.8</reloadTime>
+			<ammoSet>AmmoSet_57x483mmBofors</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TC_AdvancedNavalGun"]/statBases/WorkToBuild</xpath>
+		<value>
+			<WorkToBuild>165500</WorkToBuild>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TC_AdvancedNavalGun"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>1045</Steel>
+				<ComponentIndustrial>9</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TC_AdvancedNavalGun"]</xpath>
+		<value>
+			<specialDisplayRadius>86</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TC_AdvancedNavalGun"]/statBases</xpath>
+		<value>
+			<ShootingAccuracyTurret>0.999</ShootingAccuracyTurret>
+			<AimingAccuracy>1.0</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!-- ========== Anti-Materiel Turret ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>TC_AntiMaterielTurret_Gun</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>2.08</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.61</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_20x128mmOerlikon_HE</defaultProjectile>
+			<warmupTime>4.3</warmupTime>
+			<range>86</range>
+			<minRange>8</minRange>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<burstShotCount>5</burstShotCount>
+			<soundCast>TC_ShotAntiMaterielTurret</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>60</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_20x128mmOerlikon</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TC_AntiMaterielTurret"]/statBases/WorkToBuild</xpath>
+		<value>
+			<WorkToBuild>83000</WorkToBuild>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TC_AntiMaterielTurret"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>440</Steel>
+				<ComponentIndustrial>9</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TC_AntiMaterielTurret"]</xpath>
+		<value>
+			<specialDisplayRadius>86</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TC_AntiMaterielTurret"]/statBases/ShootingAccuracyTurret</xpath>
+		<value>
+			<ShootingAccuracyTurret>0.999</ShootingAccuracyTurret>
+			<AimingAccuracy>1.0</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!-- ========== Avenger Turret ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>TC_AvengerTurret_Gun</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>3.55</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.58</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_30x173mmNATO_Sabot</defaultProjectile>
+			<warmupTime>2.3</warmupTime>
+			<range>86</range>
+			<minRange>12</minRange>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<burstShotCount>100</burstShotCount>
+			<soundCast>TC_ShotAvengerTurret</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>16</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1350</magazineSize>
+			<reloadTime>9.2</reloadTime>
+			<ammoSet>AmmoSet_30x173mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>50</aimedBurstShotCount>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TC_AvengerTurret"]/statBases/WorkToBuild</xpath>
+		<value>
+			<WorkToBuild>180500</WorkToBuild>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TC_AvengerTurret"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>1195</Steel>
+				<ComponentIndustrial>7</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TC_AvengerTurret"]</xpath>
+		<value>
+			<specialDisplayRadius>86</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TC_AvengerTurret"]/statBases</xpath>
+		<value>
+			<ShootingAccuracyTurret>0.999</ShootingAccuracyTurret>
+			<AimingAccuracy>1.0</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!-- ========== Cannon Turret ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>TC_CannonTurret_Gun</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>2.65</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>3.23</SwayFactor>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_120mmCannonShell_HEAT</defaultProjectile>
+			<warmupTime>4.3</warmupTime>
+			<range>270</range>
+			<minRange>12</minRange>
+			<soundCast>TC_ShotCannonTurret</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>18</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>9.8</reloadTime>
+			<ammoSet>AmmoSet_120mmCannonShell</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TC_CannonTurret"]/statBases/WorkToBuild</xpath>
+		<value>
+			<WorkToBuild>94500</WorkToBuild>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TC_CannonTurret"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>535</Steel>
+				<ComponentIndustrial>5</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TC_CannonTurret"]</xpath>
+		<value>
+			<!-- Set to 0 as CE cannot draw range circles with radiuses larger than 90 cells -->
+			<specialDisplayRadius>0</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TC_CannonTurret"]/statBases/ShootingAccuracyTurret</xpath>
+		<value>
+			<ShootingAccuracyTurret>0.999</ShootingAccuracyTurret>
+			<AimingAccuracy>1.0</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!-- ========== Howitzer ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>TC_Howitzer_Gun</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>2.59</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>11.38</SwayFactor>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_155mmHowitzerShell_HE</defaultProjectile>
+			<warmupTime>4.3</warmupTime>
+			<range>700</range>
+			<!-- Same as CE 81mm mortar -->
+			<minRange>33</minRange>
+			<requireLineOfSight>false</requireLineOfSight>
+			<soundCast>TC_ShotHowitzer</soundCast>
+			<muzzleFlashScale>16</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>9.8</reloadTime>
+			<ammoSet>AmmoSet_155mmHowitzerShell</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TC_Howitzer"]/statBases/WorkToBuild</xpath>
+		<value>
+			<WorkToBuild>257000</WorkToBuild>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TC_Howitzer"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>1835</Steel>
+				<ComponentIndustrial>5</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<!-- Do not draw max range display circle (as it is larger than the upper limit of 90 cells) -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TC_Howitzer"]/statBases</xpath>
+		<value>
+			<ShootingAccuracyTurret>0.999</ShootingAccuracyTurret>
+			<AimingAccuracy>1.0</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!-- ========== Incendiary Launcher ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>TC_IncendiaryLauncher_Gun</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>0.72</SwayFactor>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_M74_Incendiary_TC</defaultProjectile>
+			<warmupTime>2.1</warmupTime>
+			<range>72</range>
+			<minRange>15</minRange>
+			<requireLineOfSight>false</requireLineOfSight>
+			<burstShotCount>4</burstShotCount>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<soundCast>TC_ShotIncendiaryLauncher</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>4</magazineSize>
+			<reloadTime>8.6</reloadTime>
+			<ammoSet>AmmoSet_M74_TC</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>1</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TC_IncendiaryLauncher"]/statBases/WorkToBuild</xpath>
+		<value>
+			<WorkToBuild>26000</WorkToBuild>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TC_IncendiaryLauncher"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>100</Steel>
+				<ComponentIndustrial>3</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TC_IncendiaryLauncher"]</xpath>
+		<value>
+			<specialDisplayRadius>72</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TC_IncendiaryLauncher"]/statBases</xpath>
+		<value>
+			<ShootingAccuracyTurret>0.999</ShootingAccuracyTurret>
+			<AimingAccuracy>1.0</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!-- ========== Multi-Barrel Rocket Launcher ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>TC_RocketLauncher_Gun</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>14.47</SwayFactor>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_130mmType63_HE</defaultProjectile>
+			<warmupTime>2.1</warmupTime>
+			<range>700</range>
+			<!-- Same as CE 81mm mortar -->
+			<minRange>37</minRange>
+			<requireLineOfSight>false</requireLineOfSight>
+			<burstShotCount>19</burstShotCount>
+			<ticksBetweenBurstShots>60</ticksBetweenBurstShots>
+			<soundCast>TC_ShotRocketLauncher</soundCast>
+			<muzzleFlashScale>16</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>19</magazineSize>
+			<reloadTime>8.6</reloadTime>
+			<ammoSet>AmmoSet_130mmType63</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>6</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TC_RocketLauncher"]/statBases/WorkToBuild</xpath>
+		<value>
+			<WorkToBuild>2429500</WorkToBuild>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TC_RocketLauncher"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>19330</Steel>
+				<ComponentIndustrial>3</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<!-- Do not draw max range display circle (as it is larger than the upper limit of 90 cells) -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TC_RocketLauncher"]/statBases</xpath>
+		<value>
+			<ShootingAccuracyTurret>0.999</ShootingAccuracyTurret>
+			<AimingAccuracy>1.0</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!-- ========== Pre-charged Mini-Turret (Removed as CE currently does not support preloaded turrets) ========== -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="TCEE_ChargedMiniTurret" or
+			defName="TCEE_ChargedMiniTurret_Crate"
+			] </xpath>
+	</Operation>
+
+	<!-- ========== Gatling Gun Turret ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>TCEE_GatlingGunTurret_Gun</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.23</SwayFactor>
+			<Bulk>8.02</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.65</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>2.3</warmupTime>
+			<range>86</range>
+			<minRange>15</minRange>
+			<burstShotCount>300</burstShotCount>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<soundCast>GunShotA</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1500</magazineSize>
+			<reloadTime>9.2</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>150</aimedBurstShotCount>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TCEE_GatlingGunTurret"]/statBases/WorkToBuild</xpath>
+		<value>
+			<WorkToBuild>54000</WorkToBuild>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TCEE_GatlingGunTurret"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>180</Steel>
+				<ComponentIndustrial>7</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TCEE_GatlingGunTurret"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>86</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TCEE_GatlingGunTurret"]/statBases/ShootingAccuracyTurret</xpath>
+		<value>
+			<ShootingAccuracyTurret>0.999</ShootingAccuracyTurret>
+			<AimingAccuracy>1.0</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!-- ========== Machine Gun Turret ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>TCEE_MachineGunTurret_Gun</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.59</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.25</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>86</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<requireLineOfSight>false</requireLineOfSight>
+			<soundCast>GunShotA</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TCEE_MachineGunTurret"]/statBases/WorkToBuild</xpath>
+		<value>
+			<WorkToBuild>60500</WorkToBuild>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TCEE_MachineGunTurret"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>280</Steel>
+				<ComponentIndustrial>6</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TCEE_MachineGunTurret"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>86</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TCEE_MachineGunTurret"]/statBases/ShootingAccuracyTurret</xpath>
+		<value>
+			<ShootingAccuracyTurret>0.999</ShootingAccuracyTurret>
+			<AimingAccuracy>1.0</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!-- ========== Naval Gun Turret ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>TCEE_NavalGunTurret_Gun</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>2.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.0</ShotSpread>
+			<SwayFactor>13.03</SwayFactor>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_28cmSpgrShell_HE</defaultProjectile>
+			<warmupTime>4.3</warmupTime>
+			<range>700</range>
+			<!-- Same as CE 81mm mortar -->
+			<minRange>35</minRange>
+			<requireLineOfSight>false</requireLineOfSight>
+			<burstShotCount>3</burstShotCount>
+			<soundCast>TCEE_ShotNavalGunTurret</soundCast>
+			<muzzleFlashScale>20</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>24</magazineSize>
+			<reloadTime>9.8</reloadTime>
+			<ammoSet>AmmoSet_28cmSpgrShell</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TCEE_NavalGunTurret"]/statBases/WorkToBuild</xpath>
+		<value>
+			<WorkToBuild>2597000</WorkToBuild>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="TCEE_NavalGunTurret"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>20555</Steel>
+				<ComponentIndustrial>5</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<!-- Do not draw max range display circle (as it is larger than the upper limit of 90 cells) -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="TCEE_NavalGunTurret"]/statBases</xpath>
+		<value>
+			<ShootingAccuracyTurret>1.0</ShootingAccuracyTurret>
+			<AimingAccuracy>1.0</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!-- ========== Common to all Turrets ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			@Name="TC_BaseArtilleryBuilding" or
+			@Name="TC_BaseAutoBuilding" or
+			@Name="TC_BaseMannedBuilding"
+			]/thingClass </xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			@Name="TC_BaseArtilleryBuilding" or
+			@Name="TC_BaseAutoBuilding" or
+			@Name="TC_BaseMannedBuilding"
+			]/fillPercent </xpath>
+		<value>
+			<!-- Needs to be at least 0.85 in order to shoot out from CE embrasures -->
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="TC_AdvancedNavalGun" or
+			defName="TC_AntiMaterielTurret" or
+			defName="TC_AvengerTurret" or
+			defName="TC_IncendiaryLauncher" or
+			defName="TC_RocketLauncher" or
+			defName="TCEE_GatlingGunTurret" or
+			defName="TCEE_MachineGunTurret" or
+			defName="TCEE_NavalGunTurret"
+			]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="TC_AvengerTurret" or
+			defName="TC_CannonTurret" or
+			defName="TC_Howitzer" or
+			defName="TC_IncendiaryLauncher" or
+			defName="TC_RocketLauncher" or
+			defName="TCEE_NavalGunTurret" or
+			@Name="TC_BaseAutoBuilding"
+			]/comps/li[@Class = "CompProperties_Explosive"] </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="TC_CannonTurret" or
+			defName="TC_Howitzer"
+			]/inspectorTabs </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="TC_CannonTurret_Gun" or
+			defName="TC_Howitzer_Gun"
+			]/comps/li[@Class = "CompProperties_ChangeableProjectile"] </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="TC_BaseArtilleryWeapon"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>0</li>
+					<li>5</li>
+					<li>10</li>
+					<li>15</li>
+					<li>20</li>
+					<li>25</li>
+					<li>30</li>
+					<li>35</li>
+					<li>40</li>
+					<li>45</li>
+					<li>50</li>
+					<li>55</li>
+					<li>60</li>
+					<li>65</li>
+					<li>70</li>
+					<li>75</li>
+					<li>80</li>
+					<li>85</li>
+				</chargeSpeeds>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="TC_CannonTurret_Gun" or
+			defName="TC_Howitzer_Gun"
+			]/building </xpath>
+	</Operation>
+
+	<!-- ========== Remove original non-CE ammo and projectiles ========== -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="TC_Bullet_AntiMaterielTurret" or
+			defName="TC_Bullet_AvengerTurret" or
+			defName="TC_Bullet_Shell_AdvancedNavalGun" or
+			defName="TC_Bullet_Shell_CannonTurret_HEAT" or
+			defName="TC_Bullet_Shell_CannonTurret_HighExplosive" or
+			defName="TC_Bullet_Shell_Howitzer_EMP" or
+			defName="TC_Bullet_Shell_Howitzer_HighExplosive" or
+			defName="TC_Bullet_Shell_Howitzer_Incendiary" or
+			defName="TC_Bullet_Shell_IncendiaryLauncher_Incendiary" or
+			defName="TC_Bullet_Shell_RocketLauncher_HighExplosive" or
+			defName="TC_Shell_CannonTurret_HEAT" or
+			defName="TC_Shell_CannonTurret_HighExplosive" or
+			defName="TC_Shell_EMP" or
+			defName="TC_Shell_Howitzer_HighExplosive" or
+			defName="TC_Shell_Howitzer_Incendiary" or
+			defName="TC_Shell_IncendiaryLauncher_Incendiary" or
+			defName="TC_Shell_RocketLauncher_HighExplosive" or
+			defName="TCEE_Bullet_GatlingGunTurret" or
+			defName="TCEE_Bullet_MachineGunTurret" or
+			defName="TCEE_Bullet_Shell_Howitzer_ClusterBomb" or
+			defName="TCEE_Bullet_Shell_NavalGunTurret_HighExplosive" or
+			defName="TCEE_Shell_Howitzer_ClusterBomb" or
+			defName="TCEE_Shell_NavalGunTurret_HighExplosive" or
+			defName="TCEE_Submunition"
+			] </xpath>
+	</Operation>
+
+	<!-- ========== Replace research projects with CE equivalents ========== -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ResearchProjectDef[
+			defName="TC_AvengerTurret"
+			]/prerequisites </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ResearchProjectDef[defName="TC_Artillery"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ResearchProjectDef[defName="TC_AutoTurret"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ResearchProjectDef[defName="TC_AvengerTurret"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ResearchProjectDef[defName="TCEE_ClusterMunition"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName="TCEE_Shell_Howitzer_ClusterBomb" or
+			@Name="TC_MakeableShellBase"
+			]/recipeMaker/researchPrerequisite </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="TC_AvengerTurret" or
+			defName="TC_CannonTurret" or
+			defName="TCEE_GatlingGunTurret" or
+			defName="TCEE_MachineGunTurret" or
+			@Name="TC_BaseArtilleryBuilding"
+			]/researchPrerequisites </xpath>
+		<value>
+			<researchPrerequisites>
+				<li>CE_TurretHeavyWeapons</li>
+			</researchPrerequisites>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			@Name="TC_BaseAutoBuilding"
+			]/researchPrerequisites </xpath>
+		<value>
+			<researchPrerequisites>
+				<li>CE_HeavyTurret</li>
+				<li>CE_TurretHeavyWeapons</li>
+			</researchPrerequisites>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Twi'lek Race/Patches/Twi'lek Race/Patch_Bodies.xml b/ModPatches/Twi'lek Race/Patches/Twi'lek Race/Patch_Bodies.xml
new file mode 100644
index 0000000000..583748acbd
--- /dev/null
+++ b/ModPatches/Twi'lek Race/Patches/Twi'lek Race/Patch_Bodies.xml	
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Add armor coverage (for pawns with non-zero armor that use human body) ========== -->
+
+	<!-- Illithid -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Twilek_body"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Twilek_body"]/corePart/parts/li[def = "Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Twilek_body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Twilek_body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Twilek_body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Twilek_body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Ear"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Twilek_body"]/corePart/parts/li[def = "Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Twilek_body"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Twilek_body"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Twilek_body"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/parts/li[def = "Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Twilek_body"]/corePart/parts/li[def = "Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Twilek_body"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "Twilek_body"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/parts/li[def = "Toe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Twi'lek Race/Patches/Twi'lek Race/PawnKinds_Twilek.xml b/ModPatches/Twi'lek Race/Patches/Twi'lek Race/PawnKinds_Twilek.xml
new file mode 100644
index 0000000000..b9c65ff3fe
--- /dev/null
+++ b/ModPatches/Twi'lek Race/Patches/Twi'lek Race/PawnKinds_Twilek.xml	
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Give ammo to pawns with ranged weapons. ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="TwilekMilBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>7</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.15</generateChance>
+						<sidearmMoney>
+							<min>150</min>
+							<max>350</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>NeolithicMeleeBasic</li>
+							<li>MedievalMeleeDecent</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Twi'lek Race/Patches/Twi'lek Race/Race_Twilek.xml b/ModPatches/Twi'lek Race/Patches/Twi'lek Race/Race_Twilek.xml
new file mode 100644
index 0000000000..c180ac8411
--- /dev/null
+++ b/ModPatches/Twi'lek Race/Patches/Twi'lek Race/Race_Twilek.xml	
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Twilek"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Twilek"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Twilek"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Twilek"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency>0.4</NightVisionEfficiency>
+			<MeleeDodgeChance>1.1</MeleeDodgeChance>
+			<MeleeCritChance>0.8</MeleeCritChance>
+			<MeleeParryChance>0.85</MeleeParryChance>
+			<CarryWeight>35</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Twilek"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Twilek"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Twi'lek Race/Patches/Twi'lek Race/ScenarioDefs.xml b/ModPatches/Twi'lek Race/Patches/Twi'lek Race/ScenarioDefs.xml
new file mode 100644
index 0000000000..21f7f1dbff
--- /dev/null
+++ b/ModPatches/Twi'lek Race/Patches/Twi'lek Race/ScenarioDefs.xml	
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Add ammo to scenarioes-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="TwilekScenariox"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_Arrow_Stone</thingDef>
+				<count>100</count>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="TwilekScenariox"]/scenario/parts/li[thingDef="Pila"]</xpath>
+		<value>
+			<count>20</count>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/UEM More Mechanitor Mechs/Patches/UEM More Mechanitor Mechs/Defs/ThingDefs_Races/Races_Mechanoid_Light.xml b/ModPatches/UEM More Mechanitor Mechs/Patches/UEM More Mechanitor Mechs/Defs/ThingDefs_Races/Races_Mechanoid_Light.xml
new file mode 100644
index 0000000000..a14342e829
--- /dev/null
+++ b/ModPatches/UEM More Mechanitor Mechs/Patches/UEM More Mechanitor Mechs/Defs/ThingDefs_Races/Races_Mechanoid_Light.xml	
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Gastromech ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Mech_Gastromech"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Gastromech"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>chef knife</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>2.07</cooldownTime>
+					<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.6</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.4</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>chef knife</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
+					<armorPenetrationSharp>8</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>spatula</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>RightSpatula</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.715</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Decorator ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Mech_Decorator"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Decorator"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Left Pick</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.0</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.4</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Right Pick</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.0</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.4</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Scavoid ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Mech_Scavoid"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Scavoid"]/tools</xpath>
+		<value>
+			<tools Inherit="False">
+				<li Class="CombatExtended.ToolCE">
+					<label>Leg Spikes</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>SmallLegSpike</linkedBodyPartsGroup>
+					<armorPenetrationSharp>6</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Leg Spikes</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>2.07</cooldownTime>
+					<linkedBodyPartsGroup>SmallLegSpike</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.6</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.4</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Urbworld Weaponry - Caseless/Defs/Urbworld Weaponry - Caseless/6.5x21mmCaseless.xml b/ModPatches/Urbworld Weaponry - Caseless/Defs/Urbworld Weaponry - Caseless/6.5x21mmCaseless.xml
new file mode 100644
index 0000000000..003939758b
--- /dev/null
+++ b/ModPatches/Urbworld Weaponry - Caseless/Defs/Urbworld Weaponry - Caseless/6.5x21mmCaseless.xml	
@@ -0,0 +1,276 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>Ammo65x21mmCaseless</defName>
+		<label>6.5x21mm Caseless</label>
+		<parent>AmmoPistols</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_65x21mmCaseless</defName>
+		<label>6.5x21mm Caseless</label>
+		<ammoTypes>
+			<Ammo_65x21mmCaseless_FMJ>Bullet_65x21mmCaseless_FMJ</Ammo_65x21mmCaseless_FMJ>
+			<Ammo_65x21mmCaseless_AP>Bullet_65x21mmCaseless_AP</Ammo_65x21mmCaseless_AP>
+			<Ammo_65x21mmCaseless_HP>Bullet_65x21mmCaseless_HP</Ammo_65x21mmCaseless_HP>
+			<Ammo_65x21mmCaseless_Sabot>Bullet_65x21mmCaseless_Sabot</Ammo_65x21mmCaseless_Sabot>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="65x21mmCaselessBase" ParentName="SmallAmmoBase" Abstract="True">
+		<description>A high-velocity handgun cartridge enveloped in a solid propellant.</description>
+		<statBases>
+			<Mass>0.006</Mass>
+			<Bulk>0.01</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo65x21mmCaseless</li>
+		</thingCategories>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="65x21mmCaselessBase">
+		<defName>Ammo_65x21mmCaseless_FMJ</defName>
+		<label>6.5x21mm Caseless cartridge (FMJ)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Pistol/FMJ</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.04</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_65x21mmCaseless_FMJ</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="65x21mmCaselessBase">
+		<defName>Ammo_65x21mmCaseless_AP</defName>
+		<label>6.5x21mm Caseless cartridge (AP)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Pistol/AP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.04</MarketValue>
+		</statBases>
+		<ammoClass>ArmorPiercing</ammoClass>
+		<cookOffProjectile>Bullet_65x21mmCaseless_AP</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="65x21mmCaselessBase">
+		<defName>Ammo_65x21mmCaseless_HP</defName>
+		<label>6.5x21mm Caseless cartridge (HP)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Pistol/HP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.04</MarketValue>
+		</statBases>
+		<ammoClass>HollowPoint</ammoClass>
+		<cookOffProjectile>Bullet_65x21mmCaseless_HP</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="65x21mmCaselessBase">
+		<defName>Ammo_65x21mmCaseless_Sabot</defName>
+		<label>6.5x21mm Caseless cartridge (Sabot)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/Sabot</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.06</MarketValue>
+		</statBases>
+		<ammoClass>Sabot</ammoClass>
+		<cookOffProjectile>Bullet_65x21mmCaseless_Sabot</cookOffProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="Base65x21mmCaselessBullet" ParentName="BaseBulletCE" Abstract="true">
+		<thingClass>CombatExtended.BulletCE</thingClass>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>141</speed>
+			<dropsCasings>false</dropsCasings>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base65x21mmCaselessBullet">
+		<defName>Bullet_65x21mmCaseless_FMJ</defName>
+		<label>6.5x21mm Caseless bullet (FMJ)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>9</damageAmountBase>
+			<armorPenetrationSharp>5</armorPenetrationSharp>
+			<armorPenetrationBlunt>14.22</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base65x21mmCaselessBullet">
+		<defName>Bullet_65x21mmCaseless_AP</defName>
+		<label>6.5x21mm Caseless bullet (AP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>6</damageAmountBase>
+			<armorPenetrationSharp>9</armorPenetrationSharp>
+			<armorPenetrationBlunt>14.22</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base65x21mmCaselessBullet">
+		<defName>Bullet_65x21mmCaseless_HP</defName>
+		<label>6.5x21mm Caseless bullet (HP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>3</armorPenetrationSharp>
+			<armorPenetrationBlunt>14.22</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base65x21mmCaselessBullet">
+		<defName>Bullet_65x21mmCaseless_Sabot</defName>
+		<label>6.5x21mm Caseless bullet (Sabot)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>6</damageAmountBase>
+			<armorPenetrationSharp>12</armorPenetrationSharp>
+			<armorPenetrationBlunt>20.26</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_65x21mmCaseless_FMJ</defName>
+		<label>make 6.5x21mm caseless (FMJ) cartridge x500</label>
+		<description>Craft 500 6.5x21mm caseless (FMJ) cartridges.</description>
+		<jobString>Making 6.5x21mm caseless (FMJ) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_65x21mmCaseless_FMJ>500</Ammo_65x21mmCaseless_FMJ>
+		</products>
+		<workAmount>800</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_65x21mmCaseless_AP</defName>
+		<label>make 6.5x21mm caseless (AP) cartridge x500</label>
+		<description>Craft 500 6.5x21mm caseless (AP) cartridges.</description>
+		<jobString>Making 6.5x21mm caseless (AP) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_65x21mmCaseless_AP>500</Ammo_65x21mmCaseless_AP>
+		</products>
+		<workAmount>800</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_65x21mmCaseless_HP</defName>
+		<label>make 6.5x21mm caseless (HP) cartridge x500</label>
+		<description>Craft 500 6.5x21mm caseless (HP) cartridges.</description>
+		<jobString>Making 6.5x21mm caseless (HP) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_65x21mmCaseless_HP>500</Ammo_65x21mmCaseless_HP>
+		</products>
+		<workAmount>800</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AdvancedAmmoRecipeBase">
+		<defName>MakeAmmo_65x21mmCaseless_Sabot</defName>
+		<label>make 6.5x21mm caseless (Sabot) cartridge x500</label>
+		<description>Craft 500 6.5x21mm caseless (Sabot) cartridges.</description>
+		<jobString>Making 6.5x21mm caseless (Sabot) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Chemfuel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Uranium</li>
+				<li>Chemfuel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_65x21mmCaseless_Sabot>500</Ammo_65x21mmCaseless_Sabot>
+		</products>
+		<workAmount>1800</workAmount>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Urbworld Weaponry - Caseless/Defs/Urbworld Weaponry - Caseless/7.7mmPC.xml b/ModPatches/Urbworld Weaponry - Caseless/Defs/Urbworld Weaponry - Caseless/7.7mmPC.xml
new file mode 100644
index 0000000000..0aec839a0c
--- /dev/null
+++ b/ModPatches/Urbworld Weaponry - Caseless/Defs/Urbworld Weaponry - Caseless/7.7mmPC.xml	
@@ -0,0 +1,410 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>Ammo77x49mmPC</defName>
+		<label>7.7x49mm PC</label>
+		<parent>AmmoRifles</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_77x49mmPC</defName>
+		<label>7.7x49mm Proprietary Caseless</label>
+		<ammoTypes>
+			<Ammo_77x49mmPC_FMJ>Bullet_77x49mmPC_FMJ</Ammo_77x49mmPC_FMJ>
+			<Ammo_77x49mmPC_AP>Bullet_77x49mmPC_AP</Ammo_77x49mmPC_AP>
+			<Ammo_77x49mmPC_HP>Bullet_77x49mmPC_HP</Ammo_77x49mmPC_HP>
+			<Ammo_77x49mmPC_Incendiary>Bullet_77x49mmPC_Incendiary</Ammo_77x49mmPC_Incendiary>
+			<Ammo_77x49mmPC_HE>Bullet_77x49mmPC_HE</Ammo_77x49mmPC_HE>
+			<Ammo_77x49mmPC_Sabot>Bullet_77x49mmPC_Sabot</Ammo_77x49mmPC_Sabot>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="77x49mmPCBase" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Heavy caseless rifle cartridge used in battle rifles, machine guns and sniper rifles.</description>
+		<statBases>
+			<Mass>0.023</Mass>
+			<Bulk>0.02</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo77x49mmPC</li>
+		</thingCategories>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="77x49mmPCBase">
+		<defName>Ammo_77x49mmPC_FMJ</defName>
+		<label>7.7x49mmPC cartridge (FMJ)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/FMJ</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.10</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_77x49mmPC_FMJ</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="77x49mmPCBase">
+		<defName>Ammo_77x49mmPC_AP</defName>
+		<label>7.7x49mmPC cartridge (AP)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/AP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.1</MarketValue>
+		</statBases>
+		<ammoClass>ArmorPiercing</ammoClass>
+		<cookOffProjectile>Bullet_77x49mmPC_AP</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="77x49mmPCBase">
+		<defName>Ammo_77x49mmPC_HP</defName>
+		<label>7.7x49mmPC cartridge (HP)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/HP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.1</MarketValue>
+		</statBases>
+		<ammoClass>HollowPoint</ammoClass>
+		<cookOffProjectile>Bullet_77x49mmPC_HP</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="77x49mmPCBase">
+		<defName>Ammo_77x49mmPC_Incendiary</defName>
+		<label>7.7x49mmPC cartridge (AP-I)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/Incendiary</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.22</MarketValue>
+		</statBases>
+		<ammoClass>IncendiaryAP</ammoClass>
+		<cookOffProjectile>Bullet_77x49mmPC_Incendiary</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="77x49mmPCBase">
+		<defName>Ammo_77x49mmPC_HE</defName>
+		<label>7.7x49mmPC cartridge (HE)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/HE</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.15</MarketValue>
+		</statBases>
+		<ammoClass>ExplosiveAP</ammoClass>
+		<cookOffProjectile>Bullet_77x49mmPC_HE</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="77x49mmPCBase">
+		<defName>Ammo_77x49mmPC_Sabot</defName>
+		<label>7.7x49mmPC cartridge (Sabot)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/Sabot</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.12</MarketValue>
+			<Mass>0.022</Mass>
+		</statBases>
+		<ammoClass>Sabot</ammoClass>
+		<cookOffProjectile>Bullet_77x49mmPC_Sabot</cookOffProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="Base77x49mmPCBullet" ParentName="BaseBulletCE" Abstract="true">
+		<thingClass>CombatExtended.BulletCE</thingClass>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>154</speed>
+			<dropsCasings>false</dropsCasings>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base77x49mmPCBullet">
+		<defName>Bullet_77x49mmPC_FMJ</defName>
+		<label>7.7mmPC bullet (FMJ)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>21</damageAmountBase>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+			<armorPenetrationBlunt>69.28</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base77x49mmPCBullet">
+		<defName>Bullet_77x49mmPC_AP</defName>
+		<label>7.7mmPC bullet (AP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>13</damageAmountBase>
+			<armorPenetrationSharp>15</armorPenetrationSharp>
+			<armorPenetrationBlunt>87.42</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base77x49mmPCBullet">
+		<defName>Bullet_77x49mmPC_HP</defName>
+		<label>7.7mmPC bullet (HP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>27</damageAmountBase>
+			<armorPenetrationSharp>4</armorPenetrationSharp>
+			<armorPenetrationBlunt>87.42</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base77x49mmPCBullet">
+		<defName>Bullet_77x49mmPC_Incendiary</defName>
+		<label>7.7mmPC bullet (AP-I)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>13</damageAmountBase>
+			<armorPenetrationSharp>15</armorPenetrationSharp>
+			<armorPenetrationBlunt>87.42</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>8</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base77x49mmPCBullet">
+		<defName>Bullet_77x49mmPC_HE</defName>
+		<label>7.7mmPC bullet (HE)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>21</damageAmountBase>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+			<armorPenetrationBlunt>87.42</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>13</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base77x49mmPCBullet">
+		<defName>Bullet_77x49mmPC_Sabot</defName>
+		<label>7.7mmPC bullet (Sabot)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationSharp>26</armorPenetrationSharp>
+			<armorPenetrationBlunt>114.98</armorPenetrationBlunt>
+			<speed>208</speed>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_77x49mmPC_FMJ</defName>
+		<label>make 7.7x49mmPC (FMJ) cartridge x500</label>
+		<description>Craft 500 7.7x49mmPC (FMJ) cartridges.</description>
+		<jobString>Making 7.7x49mmPC (FMJ) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>24</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_77x49mmPC_FMJ>500</Ammo_77x49mmPC_FMJ>
+		</products>
+		<workAmount>2400</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_77x49mmPC_AP</defName>
+		<label>make 7.7x49mmPC (AP) cartridge x500</label>
+		<description>Craft 500 7.7x49mmPC (AP) cartridges.</description>
+		<jobString>Making 7.7x49mmPC (AP) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>24</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_77x49mmPC_AP>500</Ammo_77x49mmPC_AP>
+		</products>
+		<workAmount>2400</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_77x49mmPC_HP</defName>
+		<label>make 7.7x49mmPC (HP) cartridge x500</label>
+		<description>Craft 500 7.7x49mmPC (HP) cartridges.</description>
+		<jobString>Making 7.7x49mmPC (HP) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>24</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_77x49mmPC_HP>500</Ammo_77x49mmPC_HP>
+		</products>
+		<workAmount>2400</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AdvancedAmmoRecipeBase">
+		<defName>MakeAmmo_77x49mmPC_Incendiary</defName>
+		<label>make 7.7x49mmPC (AP-I) cartridge x500</label>
+		<description>Craft 500 7.7x49mmPC (AP-I) cartridges.</description>
+		<jobString>Making 7.7x49mmPC (AP-I) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>24</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Prometheum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_77x49mmPC_Incendiary>500</Ammo_77x49mmPC_Incendiary>
+		</products>
+		<workAmount>4000</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AdvancedAmmoRecipeBase">
+		<defName>MakeAmmo_77x49mmPC_HE</defName>
+		<label>make 7.7x49mmPC (HE) cartridge x500</label>
+		<description>Craft 500 7.7x49mmPC (HE) cartridges.</description>
+		<jobString>Making 7.7x49mmPC (HE) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>24</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>7</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_77x49mmPC_HE>500</Ammo_77x49mmPC_HE>
+		</products>
+		<workAmount>5200</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AdvancedAmmoRecipeBase">
+		<defName>MakeAmmo_77x49mmPC_Sabot</defName>
+		<label>make 7.7x49mmPC (Sabot) cartridge x500</label>
+		<description>Craft 500 7.7x49mmPC (Sabot) cartridges.</description>
+		<jobString>Making 7.7x49mmPC (Sabot) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Chemfuel</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Uranium</li>
+				<li>Chemfuel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_77x49mmPC_Sabot>500</Ammo_77x49mmPC_Sabot>
+		</products>
+		<workAmount>3400</workAmount>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Urbworld Weaponry - Caseless/Defs/Urbworld Weaponry - Caseless/CaselessWeapons.xml b/ModPatches/Urbworld Weaponry - Caseless/Defs/Urbworld Weaponry - Caseless/CaselessWeapons.xml
new file mode 100644
index 0000000000..8a2753bec6
--- /dev/null
+++ b/ModPatches/Urbworld Weaponry - Caseless/Defs/Urbworld Weaponry - Caseless/CaselessWeapons.xml	
@@ -0,0 +1,365 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ==== UBX-320 ==== -->
+
+	<ThingDef ParentName="CaselessGunBase">
+		<defName>Gun_Caseless_LMG_Heavy</defName>
+		<label>C-21</label>
+		<description>Caseless LMG fed from a box and fired from an open bolt. This one of Orbital General Industry's most popular products due to the weight-saving ammunition and familiar design.\n\nThe original production run LMGs were manufactured orbitally, it's said that their quality is nearly unmatched even several centuries later.</description>
+		<graphicData>
+			<texPath>CaselessBonus/UBX320</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<soundInteract>Interact_CBox</soundInteract>
+		<statBases>
+			<WorkToMake>38000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.66</SwayFactor>
+			<Bulk>9</Bulk>
+			<Mass>7.85</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<verbs>
+			<li Class="CombatExtended.VerbPropertiesCE">
+				<recoilAmount>1.65</recoilAmount>
+				<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+				<hasStandardCommand>true</hasStandardCommand>
+				<defaultProjectile>Bullet_77x49mmPC_FMJ</defaultProjectile>
+				<burstShotCount>10</burstShotCount>
+				<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+				<warmupTime>1.1</warmupTime>
+				<range>72</range>
+				<soundCast>Shot_Minigun</soundCast>
+				<soundCastTail>GunTail_Heavy</soundCastTail>
+				<muzzleFlashScale>8</muzzleFlashScale>
+				<targetParams>
+					<canTargetLocations>true</canTargetLocations>
+				</targetParams>
+				<recoilPattern>Mounted</recoilPattern>
+			</li>
+		</verbs>
+		<comps>
+			<li Class="CombatExtended.CompProperties_AmmoUser">
+				<magazineSize>125</magazineSize>
+				<reloadTime>7.4</reloadTime>
+				<ammoSet>AmmoSet_77x49mmPC</ammoSet>
+			</li>
+			<li Class="CombatExtended.CompProperties_FireModes">
+				<aiUseBurstMode>TRUE</aiUseBurstMode>
+				<aiAimMode>AimedShot</aiAimMode>
+				<aimedBurstShotCount>5</aimedBurstShotCount>
+			</li>
+		</comps>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>CE_MachineGun</li>
+			<li>CE_AI_LMG</li>
+			<li>Bipod_LMG</li>
+		</weaponTags>
+		<weaponClasses>
+			<li>RangedHeavy</li>
+		</weaponClasses>
+		<recipeMaker>
+			<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+		</recipeMaker>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>stock</label>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<power>9</power>
+				<cooldownTime>1.8</cooldownTime>
+				<chanceFactor>1.5</chanceFactor>
+				<armorPenetration>0.11</armorPenetration>
+				<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>barrel</label>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<power>10</power>
+				<cooldownTime>1.9</cooldownTime>
+				<armorPenetration>0.118</armorPenetration>
+				<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>muzzle</label>
+				<capacities>
+					<li>Poke</li>
+				</capacities>
+				<power>10</power>
+				<cooldownTime>1.9</cooldownTime>
+				<armorPenetration>0.086</armorPenetration>
+				<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+			</li>
+		</tools>
+	</ThingDef>
+
+	<!-- ===== Carbine GL ===== -->
+
+	<ThingDef ParentName="CaselessGunBase">
+		<defName>Gun_Caseless_Carbine_GL</defName>
+		<label>BZ-4 + I2 Knight</label>
+		<description>With a touch of spacer ingenuity this weapon is significantly more effective than its midworld counterparts.\n\nThe Smart Defense Systems "I2 Knight" was a package for the CBZ-4 that attempted to extend the rifle's service life with the addition of a 30mm grenade launcher and advanced optics suite. Both the caliber and size of the grenades were quickly deemed ineffective for combat seen on most urbworlds. Corporate security on midworlds and the rim however find the weapon very useful.</description>
+		<graphicData>
+			<texPath>CaselessBonus/CARGL</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<soundInteract>Interact_CRifle</soundInteract>
+		<statBases>
+			<Mass>8.84</Mass>
+			<MaxHitPoints>75</MaxHitPoints>
+			<RangedWeapon_Cooldown>0.33</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.17</SightsEfficiency>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>1.0</SwayFactor>
+			<Bulk>12.89</Bulk>
+			<WorkToMake>48500</WorkToMake><!--52500-->
+			<NightVisionEfficiency_Weapon>0.5</NightVisionEfficiency_Weapon>
+		</statBases>
+		<costList>
+			<Steel>75</Steel>
+			<ComponentIndustrial>11</ComponentIndustrial>
+			<Chemfuel>20</Chemfuel>
+			<Plasteel>25</Plasteel>
+		</costList>
+		<verbs>
+			<li Class="CombatExtended.VerbPropertiesCE">
+				<recoilAmount>1.5</recoilAmount>
+				<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+				<hasStandardCommand>true</hasStandardCommand>
+				<defaultProjectile>Bullet_473x33mmCaseless_FMJ</defaultProjectile>
+				<warmupTime>1.1</warmupTime>
+				<range>55</range>
+				<burstShotCount>6</burstShotCount>
+				<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+				<soundCast>Shot_SilencedA</soundCast>
+				<soundCastTail>GunTail_Medium</soundCastTail>
+				<muzzleFlashScale>2</muzzleFlashScale>
+				<recoilPattern>Regular</recoilPattern>
+			</li>
+		</verbs>
+		<weaponTags>
+			<li>CE_AI_AR</li>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+		<weaponClasses>
+			<li>RangedLight</li>
+			<li>ShortShots</li>
+		</weaponClasses>
+		<comps>
+			<li Class="CombatExtended.CompProperties_AmmoUser">
+				<magazineSize>50</magazineSize>
+				<reloadTime>5.5</reloadTime>
+				<ammoSet>AmmoSet_473x33mmCaseless</ammoSet>
+			</li>
+			<li Class="CombatExtended.CompProperties_FireModes">
+				<aiUseBurstMode>TRUE</aiUseBurstMode>
+				<aiAimMode>AimedShot</aiAimMode>
+				<aimedBurstShotCount>3</aimedBurstShotCount>
+			</li>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<propsUnderBarrel>
+					<magazineSize>3</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_20x42mmGrenade</ammoSet>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_20x42mmGrenade_HE</defaultProjectile>
+					<warmupTime>1.5</warmupTime>
+					<range>70</range>
+					<soundCast>Shot_GLA</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>0</muzzleFlashScale>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>AimedShot</aiAimMode>
+					<aimedBurstShotCount>1</aimedBurstShotCount>
+				</propsFireModesUnderBarrel>
+			</li>
+		</comps>
+		<recipeMaker>
+			<skillRequirements>
+				<Crafting>6</Crafting>
+			</skillRequirements>
+			<researchPrerequisite>MultiAnalyzer</researchPrerequisite>
+		</recipeMaker>
+		<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>
+		<modExtensions>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.16,1.25</DrawSize>
+				<DrawOffset>0.05,-0.07</DrawOffset>
+			</li>
+		</modExtensions>
+	</ThingDef>
+
+	<!-- ==== EM-72 + 40mm grenade launcher ==== -->
+
+	<ThingDef ParentName="CaselessGunBase">
+		<defName>Gun_Caseless_BattleRifle_Sixmm_GL</defName>
+		<label>EM72 + I9 Halberd</label>
+		<description>The EM72 with an advanced combat suite, what it lacks in style it makes up for in firepower.\n\n The realized vision of a convoluted urbworld infantry weapons program. Likely issued to cybernetically enhanced soldiers due to this weapon's weight and bulk.</description>
+		<graphicData>
+			<texPath>CaselessBonus/HBRGL/Standard</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<soundInteract>Interact_CRifle</soundInteract>
+		<statBases>
+			<WorkToMake>52500</WorkToMake>
+			<MaxHitPoints>75</MaxHitPoints>
+			<SightsEfficiency>2.5</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.42</SwayFactor>
+			<Bulk>16.8</Bulk>
+			<Mass>7.2</Mass>
+			<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>80</Steel>
+			<ComponentIndustrial>12</ComponentIndustrial>
+			<Chemfuel>25</Chemfuel>
+			<Plasteel>25</Plasteel>
+		</costList>
+		<verbs>
+			<li Class="CombatExtended.VerbPropertiesCE">
+				<recoilAmount>2.17</recoilAmount>
+				<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+				<hasStandardCommand>true</hasStandardCommand>
+				<defaultProjectile>Bullet_77x49mmPC_FMJ</defaultProjectile>
+				<burstShotCount>4</burstShotCount>
+				<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+				<warmupTime>1.01</warmupTime>
+				<range>65</range>
+				<soundCast>Shot_csniper</soundCast>
+				<soundCastTail>GunTail_Heavy</soundCastTail>
+				<muzzleFlashScale>8</muzzleFlashScale>
+			</li>
+		</verbs>
+		<comps>
+			<li Class="CombatExtended.CompProperties_AmmoUser">
+				<magazineSize>20</magazineSize>
+				<reloadTime>4</reloadTime>
+				<ammoSet>AmmoSet_77x49mmPC</ammoSet>
+			</li>
+			<li Class="CombatExtended.CompProperties_FireModes">
+				<aiUseBurstMode>TRUE</aiUseBurstMode>
+				<aiAimMode>AimedShot</aiAimMode>
+				<aimedBurstShotCount>2</aimedBurstShotCount>
+			</li>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<propsUnderBarrel>
+					<magazineSize>4</magazineSize>
+					<reloadTime>4.5</reloadTime>
+					<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
+					<warmupTime>1.01</warmupTime>
+					<range>45</range>
+					<soundCast>Shot_GLA</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>5</muzzleFlashScale>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>AimedShot</aiAimMode>
+					<aimedBurstShotCount>1</aimedBurstShotCount>
+				</propsFireModesUnderBarrel>
+			</li>
+		</comps>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>CE_AI_AR</li>
+			<li>Bipod_Rifle</li>
+		</weaponTags>
+		<weaponClasses>
+			<li>RangedHeavy</li>
+		</weaponClasses>
+		<recipeMaker>
+			<skillRequirements>
+				<Crafting>6</Crafting>
+			</skillRequirements>
+			<researchPrerequisite>MultiAnalyzer</researchPrerequisite>
+		</recipeMaker>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>stock</label>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<power>9</power>
+				<cooldownTime>1.8</cooldownTime>
+				<chanceFactor>1.5</chanceFactor>
+				<armorPenetration>0.11</armorPenetration>
+				<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>barrel</label>
+				<capacities>
+					<li>Blunt</li>
+				</capacities>
+				<power>10</power>
+				<cooldownTime>1.9</cooldownTime>
+				<armorPenetration>0.118</armorPenetration>
+				<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>muzzle</label>
+				<capacities>
+					<li>Poke</li>
+				</capacities>
+				<power>10</power>
+				<cooldownTime>1.9</cooldownTime>
+				<armorPenetration>0.086</armorPenetration>
+				<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+			</li>
+		</tools>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Urbworld Weaponry - Caseless/Patches/Urbworld Weaponry - Caseless/CaselessWeapons_CE.xml b/ModPatches/Urbworld Weaponry - Caseless/Patches/Urbworld Weaponry - Caseless/CaselessWeapons_CE.xml
new file mode 100644
index 0000000000..61f0da5c67
--- /dev/null
+++ b/ModPatches/Urbworld Weaponry - Caseless/Patches/Urbworld Weaponry - Caseless/CaselessWeapons_CE.xml	
@@ -0,0 +1,520 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Tools ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_Caseless_Pistol"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="CaselessGunMMeleeBase"]/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>
+
+	<!-- ========== K-5 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Caseless_Pistol</defName>
+		<statBases>
+			<Mass>0.61</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.92</SwayFactor>
+			<Bulk>2.15</Bulk>
+			<WorkToMake>13000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>20</Steel>
+			<Chemfuel>10</Chemfuel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.78</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_65x21mmCaseless_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>Shot_kpistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>4</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>21</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_65x21mmCaseless</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_BROOM</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+		<researchPrerequisite>BlowbackOperation</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== CSG-3 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Caseless_SMG</defName>
+		<statBases>
+			<Mass>2.4</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.69</SwayFactor>
+			<Bulk>4.53</Bulk>
+			<WorkToMake>30000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>1.39</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_65x21mmCaseless_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>17</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>Shot_CSG</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>5</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_65x21mmCaseless</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+		<researchPrerequisite>BlowbackOperation</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== LMG11k ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Caseless_LMG</defName>
+		<statBases>
+			<Mass>5.53</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.31</SwayFactor>
+			<Bulk>7.53</Bulk>
+			<WorkToMake>29000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>55</Steel>
+			<Chemfuel>5</Chemfuel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.06</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_473x33mmCaseless_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>68</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>Shot_CLMG</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>6</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>300</magazineSize>
+			<reloadTime>9.2</reloadTime>
+			<ammoSet>AmmoSet_473x33mmCaseless</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_MachineGun</li>
+			<li>CE_AI_LMG</li>
+			<li>Bipod_LMG</li>
+		</weaponTags>
+		<researchPrerequisite>GasOperation</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== Burst Rifle ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Caseless_BurstRifle</defName>
+		<statBases>
+			<Mass>7.44</Mass>
+			<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.18</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.13</SwayFactor>
+			<Bulk>7.44</Bulk>
+			<WorkToMake>49000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<Chemfuel>10</Chemfuel>
+			<Plasteel>25</Plasteel>
+			<ComponentIndustrial>10</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.29</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_473x33mmCaseless_FMJ</defaultProjectile>
+			<warmupTime>1.25</warmupTime>
+			<range>58</range>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<burstShotCount>3</burstShotCount>
+			<soundCast>Shot_Burst</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>6</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>5.5</reloadTime>
+			<ammoSet>AmmoSet_473x33mmCaseless</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>CE_AI_AR</li>
+		</weaponTags>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Carbine ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Caseless_Carbine</defName>
+		<statBases>
+			<Mass>2.74</Mass>
+			<RangedWeapon_Cooldown>0.33</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>1.0</SwayFactor>
+			<Bulk>6.47</Bulk>
+			<WorkToMake>29500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>35</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>1.5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_473x33mmCaseless_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>46</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>Shot_CAR</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_473x33mmCaseless</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AR</li>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+		<researchPrerequisite>GasOperation</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== GMA M901 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Caseless_SniperRifle</defName>
+		<statBases>
+			<Mass>8.75</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.54</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.65</SwayFactor>
+			<Bulk>8.75</Bulk>
+			<WorkToMake>59000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>55</Steel>
+			<Chemfuel>15</Chemfuel>
+			<Plasteel>30</Plasteel>
+			<ComponentIndustrial>12</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>0.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_77x49mmPC_FMJ</defaultProjectile>
+			<burstShotCount>2</burstShotCount>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<warmupTime>1.65</warmupTime>
+			<range>72</range>
+			<soundCast>Shot_csniper</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_77x49mmPC</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_SR</li>
+			<li>Bipod_DMR</li>
+		</weaponTags>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== bolty ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Caseless_BoltAction</defName>
+		<statBases>
+			<Mass>3.3</Mass>
+			<RangedWeapon_Cooldown>1.31</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.31</SwayFactor>
+			<Bulk>6.3</Bulk>
+			<WorkToMake>22000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>55</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+			<Chemfuel>12</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>2.54</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_77x49mmPC_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_Bolty</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>8</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_77x49mmPC</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_SR</li>
+		</weaponTags>
+		<researchPrerequisite>Gunsmithing</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== battle rifle ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Caseless_BattleRifle</defName>
+		<statBases>
+			<Mass>3.8</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.15</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.32</SwayFactor>
+			<Bulk>9.2</Bulk>
+			<WorkToMake>32500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+			<Chemfuel>12</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>2.37</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_77x49mmPC_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<range>65</range>
+			<soundCast>Shot_csniper</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>8</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_77x49mmPC</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>CE_AI_AR</li>
+			<li>Bipod_Rifle</li>
+		</weaponTags>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!-- ===== Names ==== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_Caseless_Pistol"]/label</xpath>
+		<value>
+			<label>K5</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_Caseless_SMG"]/label</xpath>
+		<value>
+			<label>CS-8</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_Caseless_Carbine"]/label</xpath>
+		<value>
+			<label>BZ-4</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_Caseless_BurstRifle"]/label</xpath>
+		<value>
+			<label>G530</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_Caseless_LMG"]/label</xpath>
+		<value>
+			<label>LMG11</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_Caseless_SniperRifle"]/label</xpath>
+		<value>
+			<label>MX91</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_Caseless_BoltAction"]/label</xpath>
+		<value>
+			<label>RimWarrior</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_Caseless_BattleRifle"]/label</xpath>
+		<value>
+			<label>EM72</label>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Urbworld Weaponry SDS/Defs/Urbworld Weaponry SDS/18mmSSR.xml b/ModPatches/Urbworld Weaponry SDS/Defs/Urbworld Weaponry SDS/18mmSSR.xml
new file mode 100644
index 0000000000..5c9b927ded
--- /dev/null
+++ b/ModPatches/Urbworld Weaponry SDS/Defs/Urbworld Weaponry SDS/18mmSSR.xml	
@@ -0,0 +1,511 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>Ammo18mmSmart</defName>
+		<label>18mm Semi-smart rocket</label>
+		<parent>AmmoPistols</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_18mmSmart</defName>
+		<label>18mm Semi-smart rocket</label>
+		<ammoTypes>
+			<Ammo_18mmSmart_FMJ>Bullet_18mmSmart_FMJ</Ammo_18mmSmart_FMJ>
+			<Ammo_18mmSmart_AP>Bullet_18mmSmart_AP</Ammo_18mmSmart_AP>
+			<Ammo_18mmSmart_Sabot>Bullet_18mmSmart_Sabot</Ammo_18mmSmart_Sabot>
+			<Ammo_18mmSmart_HE>Bullet_18mmSmart_HE</Ammo_18mmSmart_HE>
+			<Ammo_18mmSmart_Incendiary>Bullet_18mmSmart_Incendiary</Ammo_18mmSmart_Incendiary>
+			<Ammo_18mmSmart_EMP>Bullet_18mmSmart_EMP</Ammo_18mmSmart_EMP>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="18mmSmartBase" ParentName="AmmoBase" Abstract="True">
+		<description>Rare urbworld ammunition that guides itself using micro rocket propulsion. An electric igniter fires the cartridge as well as flash-programs the bullet with flight data. An antiquted design that introduces more problems than it solves.</description>
+		<statBases>
+			<Mass>0.0051</Mass>
+			<Bulk>0.09</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo18mmSmart</li>
+		</thingCategories>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="18mmSmartBase">
+		<defName>Ammo_18mmSmart_FMJ</defName>
+		<label>18mm Smart rocket (FMJ)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Pistol/FMJ</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.55</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_18mmSmart_FMJ</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="18mmSmartBase">
+		<defName>Ammo_18mmSmart_AP</defName>
+		<label>18mm Smart rocket (AP)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Pistol/AP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.55</MarketValue>
+		</statBases>
+		<ammoClass>ArmorPiercing</ammoClass>
+		<cookOffProjectile>Bullet_18mmSmart_AP</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="18mmSmartBase">
+		<defName>Ammo_18mmSmart_Sabot</defName>
+		<label>18mm Smart rocket (Sabot)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/Sabot</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.69</MarketValue>
+		</statBases>
+		<ammoClass>Sabot</ammoClass>
+		<cookOffProjectile>Bullet_18mmSmart_Sabot</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="18mmSmartBase">
+		<defName>Ammo_18mmSmart_HE</defName>
+		<label>18mm Smart rocket (HE)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/HE</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>1.03</MarketValue>
+		</statBases>
+		<ammoClass>ExplosiveAP</ammoClass>
+		<cookOffProjectile>Bullet_18mmSmart_HE</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="18mmSmartBase">
+		<defName>Ammo_18mmSmart_Incendiary</defName>
+		<label>18mm Smart rocket (Incendiary)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/Incendiary</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.96</MarketValue>
+		</statBases>
+		<ammoClass>IncendiaryFuel</ammoClass>
+		<cookOffProjectile>Bullet_18mmSmart_Incendiary</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="18mmSmartBase">
+		<defName>Ammo_18mmSmart_EMP</defName>
+		<label>18mm Smart rocket (EMP)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Shotgun/EMP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>1.1</MarketValue>
+		</statBases>
+		<ammoClass>ElectroSlug</ammoClass>
+		<cookOffProjectile>Bullet_18mmSmart_EMP</cookOffProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef Name="Base18mmSmartBullet" ParentName="BaseBulletCE" Abstract="true">
+		<graphicData>
+			<texPath>Projectiles/SSR_Rocket_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>110</speed> <!--40-->
+			<dropsCasings>true</dropsCasings>
+			<casingMoteDefname>Mote_SDSShell</casingMoteDefname>
+			<casingFilthDefname>Filth_SDSCasings</casingFilthDefname>
+			<gravityFactor>75</gravityFactor> <!--15-->
+			<soundAmbient>SSR_Loop_Multi</soundAmbient>
+			<screenShakeFactor>0</screenShakeFactor>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base18mmSmartBullet">
+		<defName>Bullet_18mmSmart_FMJ</defName>
+		<label>18mm Smart rocket (FMJ)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>28</damageAmountBase>
+			<armorPenetrationSharp>6</armorPenetrationSharp>
+			<armorPenetrationBlunt>84.7</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base18mmSmartBullet">
+		<defName>Bullet_18mmSmart_AP</defName>
+		<label>18mm Smart rocket (AP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>22</damageAmountBase>
+			<armorPenetrationSharp>12</armorPenetrationSharp>
+			<armorPenetrationBlunt>84.7</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base18mmSmartBullet">
+		<defName>Bullet_18mmSmart_Sabot</defName>
+		<label>18mm Smart rocket (Sabot)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>21</damageAmountBase>
+			<speed>165</speed>
+			<armorPenetrationSharp>21</armorPenetrationSharp>
+			<armorPenetrationBlunt>190.58</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base18mmSmartBullet">
+		<defName>Bullet_18mmSmart_HE</defName>
+		<label>18mm Smart rocket (HE)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>17</damageAmountBase>
+			<armorPenetrationSharp>4.125</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.799</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>14</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base18mmSmartBullet">
+		<defName>Bullet_18mmSmart_Incendiary</defName>
+		<label>18mm Smart rocket (Incendiary)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>PrometheumFlame</damageDef>
+			<damageAmountBase>3</damageAmountBase>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+			<explosionRadius>1</explosionRadius>
+			<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
+			<preExplosionSpawnChance>0.15</preExplosionSpawnChance>
+			<ai_IsIncendiary>true</ai_IsIncendiary>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base18mmSmartBullet">
+		<defName>Bullet_18mmSmart_EMP</defName>
+		<label>18mm Smart rocket (EMP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>EMP</damageDef>
+			<damageAmountBase>8</damageAmountBase>
+			<explosionRadius>1</explosionRadius>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_18mmSmart_FMJ</defName>
+		<label>make 18mm Smart (FMJ) rocket x200</label>
+		<description>Craft 500 18mm Smart (FMJ) rockets.</description>
+		<jobString>Making 18mm Smart (FMJ) rockets.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Prometheum</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_18mmSmart_FMJ>200</Ammo_18mmSmart_FMJ>
+		</products>
+		<workAmount>3400</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_18mmSmart_AP</defName>
+		<label>make 18mm Smart (AP) rocket x200</label>
+		<description>Craft 500 18mm Smart (AP) rockets.</description>
+		<jobString>Making 18mm Smart (AP) rockets.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Prometheum</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_18mmSmart_AP>200</Ammo_18mmSmart_AP>
+		</products>
+		<workAmount>4080</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AdvancedAmmoRecipeBase">
+		<defName>MakeAmmo_18mmSmart_Sabot</defName>
+		<label>make 18mm Smart (Sabot) rocket x200</label>
+		<description>Craft 500 18mm Smart (Sabot) rockets.</description>
+		<jobString>Making 18mm Smart (Sabot) rockets.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Chemfuel</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Prometheum</li>
+				<li>ComponentIndustrial</li>
+				<li>Uranium</li>
+				<li>Chemfuel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_18mmSmart_Sabot>200</Ammo_18mmSmart_Sabot>
+		</products>
+		<workAmount>5800</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AdvancedAmmoRecipeBase">
+		<defName>MakeAmmo_18mmSmart_HE</defName>
+		<label>make 18mm Smart (HE) rocket x200</label>
+		<description>Craft 500 18mm Smart (HE) rockets.</description>
+		<jobString>Making 18mm Smart (HE) rockets.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>28</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Prometheum</li>
+				<li>ComponentIndustrial</li>
+				<li>FSX</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_18mmSmart_HE>200</Ammo_18mmSmart_HE>
+		</products>
+		<workAmount>8640</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AdvancedAmmoRecipeBase">
+		<defName>MakeAmmo_18mmSmart_Incendiary</defName>
+		<label>make 18mm Smart (Incendiary) rocket x200</label>
+		<description>Craft 500 18mm Smart (Incendiary) rockets.</description>
+		<jobString>Making 18mm Smart (Incendiary) rockets.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>28</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Prometheum</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_18mmSmart_Incendiary>200</Ammo_18mmSmart_Incendiary>
+		</products>
+		<workAmount>5600</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AdvancedAmmoRecipeBase">
+		<defName>MakeAmmo_18mmSmart_EMP</defName>
+		<label>make 18mm Smart (EMP) rocket x200</label>
+		<description>Craft 500 18mm Smart (EMP) rockets.</description>
+		<jobString>Making 18mm Smart (EMP) rockets.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>28</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Prometheum</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_18mmSmart_EMP>200</Ammo_18mmSmart_EMP>
+		</products>
+		<workAmount>5800</workAmount>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Urbworld Weaponry SDS/Defs/Urbworld Weaponry SDS/50ISM.xml b/ModPatches/Urbworld Weaponry SDS/Defs/Urbworld Weaponry SDS/50ISM.xml
new file mode 100644
index 0000000000..07e096714a
--- /dev/null
+++ b/ModPatches/Urbworld Weaponry SDS/Defs/Urbworld Weaponry SDS/50ISM.xml	
@@ -0,0 +1,361 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ==== .50 ==== -->
+
+	<ThingCategoryDef>
+		<defName>Ammo50ISM</defName>
+		<label>.50 ISM</label>
+		<parent>AmmoHighCaliber</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberHighCaliber</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_50ISM</defName>
+		<label>.50 caliber Indirect Smart Munition</label>
+		<ammoTypes>
+			<Ammo_50ISM_FMJ>Bullet_50ISM_FMJ</Ammo_50ISM_FMJ>
+			<Ammo_50ISM_Incendiary>Bullet_50ISM_Incendiary</Ammo_50ISM_Incendiary>
+			<Ammo_50ISM_HE>Bullet_50ISM_HE</Ammo_50ISM_HE>
+			<Ammo_50ISM_Sabot>Bullet_50ISM_Sabot</Ammo_50ISM_Sabot>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="Ammo50ISMBase" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Large caliber guided rocket used by precision smartrifles and heavy emplacements.</description>
+		<statBases>
+			<Mass>0.036</Mass>
+			<Bulk>0.04</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo50ISM</li>
+		</thingCategories>
+		<stackLimit>5000</stackLimit>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo50ISMBase">
+		<defName>Ammo_50ISM_FMJ</defName>
+		<label>.50 ISM cartridge (FMJ)</label>
+		<graphicData>
+			<texPath>Things/Ammo/HighCaliber/FMJ</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.49</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_50ISM_FMJ</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo50ISMBase">
+		<defName>Ammo_50ISM_Incendiary</defName>
+		<label>.50 ISM cartridge (AP-I)</label>
+		<graphicData>
+			<texPath>Things/Ammo/HighCaliber/Incendiary</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.62</MarketValue>
+			<Mass>0.112</Mass>
+		</statBases>
+		<ammoClass>IncendiaryAP</ammoClass>
+		<cookOffProjectile>Bullet_50ISM_Incendiary</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo50ISMBase">
+		<defName>Ammo_50ISM_HE</defName>
+		<label>.50 ISM cartridge (AP-HE)</label>
+		<graphicData>
+			<texPath>Things/Ammo/HighCaliber/HE</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.91</MarketValue>
+		</statBases>
+		<ammoClass>ExplosiveAP</ammoClass>
+		<cookOffProjectile>Bullet_50ISM_HE</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo50ISMBase">
+		<defName>Ammo_50ISM_Sabot</defName>
+		<label>.50 ISM cartridge (Sabot)</label>
+		<graphicData>
+			<texPath>Things/Ammo/HighCaliber/Sabot</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.59</MarketValue>
+			<Mass>0.029</Mass>
+		</statBases>
+		<ammoClass>Sabot</ammoClass>
+		<cookOffProjectile>Bullet_50ISM_Sabot</cookOffProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef Name="Base50ISMBullet" ParentName="BaseBulletCE" Abstract="true">
+		<graphicData>
+			<texPath>Projectiles/SSR_Rocket_Big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>180</speed> <!--180-->
+			<gravityFactor>150</gravityFactor> <!--210-->
+			<dropsCasings>true</dropsCasings>
+			<casingMoteDefname>Mote_FiftyISMShell</casingMoteDefname>
+			<casingFilthDefname>Filth_FiftyISM</casingFilthDefname>
+			<flyOverhead>false</flyOverhead>
+			<soundAmbient>SSR_Loop_Multi</soundAmbient>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base50ISMBullet">
+		<defName>Bullet_50ISM_FMJ</defName>
+		<label>.50 ISM bullet (FMJ)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>43</damageAmountBase>
+			<armorPenetrationSharp>15</armorPenetrationSharp>
+			<armorPenetrationBlunt>291.6</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base50ISMBullet">
+		<defName>Bullet_50ISM_Incendiary</defName>
+		<label>.50 ISM bullet (AP-I)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>31</damageAmountBase>
+			<armorPenetrationSharp>30</armorPenetrationSharp>
+			<armorPenetrationBlunt>291.6</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>15</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base50ISMBullet">
+		<defName>Bullet_50ISM_HE</defName>
+		<label>.50 ISM bullet (AP-HE)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>31</damageAmountBase>
+			<armorPenetrationSharp>15</armorPenetrationSharp>
+			<armorPenetrationBlunt>291.6</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>23</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base50ISMBullet">
+		<defName>Bullet_50ISM_Sabot</defName>
+		<label>.50 ISM bullet (Sabot)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>37</damageAmountBase>
+			<speed>270</speed> <!--270-->
+			<armorPenetrationSharp>52</armorPenetrationSharp>
+			<armorPenetrationBlunt>528.52</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_50ISM_FMJ</defName>
+		<label>make .50 ISM (FMJ) cartridge x200</label>
+		<description>Craft 200 .50 ISM (FMJ) cartridges.</description>
+		<jobString>Making .50 ISM (FMJ) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>16</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>Prometheum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_50ISM_FMJ>200</Ammo_50ISM_FMJ>
+		</products>
+		<workAmount>2800</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AdvancedAmmoRecipeBase">
+		<defName>MakeAmmo_50ISM_Incendiary</defName>
+		<label>make .50 ISM (AP-I) cartridge x200</label>
+		<description>Craft 200 .50 ISM (AP-I) cartridges.</description>
+		<jobString>Making .50 ISM (AP-I) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>16</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>Prometheum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_50ISM_Incendiary>200</Ammo_50ISM_Incendiary>
+		</products>
+		<workAmount>5280</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AdvancedAmmoRecipeBase">
+		<defName>MakeAmmo_50ISM_HE</defName>
+		<label>make .50 ISM (AP-HE) cartridge x200</label>
+		<description>Craft 200 .50 ISM (HE) cartridges.</description>
+		<jobString>Making .50 ISM (HE) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>16</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+				<li>Prometheum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_50ISM_HE>200</Ammo_50ISM_HE>
+		</products>
+		<workAmount>7200</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AdvancedAmmoRecipeBase">
+		<defName>MakeAmmo_50ISM_Sabot</defName>
+		<label>make .50 ISM (Sabot) cartridge x200</label>
+		<description>Craft 200 .50 ISM (Sabot) cartridges.</description>
+		<jobString>Making .50 ISM (Sabot) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Chemfuel</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Uranium</li>
+				<li>Chemfuel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_50ISM_Sabot>200</Ammo_50ISM_Sabot>
+		</products>
+		<workAmount>4800</workAmount>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Urbworld Weaponry SDS/Defs/Urbworld Weaponry SDS/556mmISM.xml b/ModPatches/Urbworld Weaponry SDS/Defs/Urbworld Weaponry SDS/556mmISM.xml
new file mode 100644
index 0000000000..35b6967d4f
--- /dev/null
+++ b/ModPatches/Urbworld Weaponry SDS/Defs/Urbworld Weaponry SDS/556mmISM.xml	
@@ -0,0 +1,380 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>Ammo556x31mmISM</defName>
+		<label>5.56x31mm indirect smart munition</label>
+		<parent>AmmoRifles</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_556x31mmISM</defName>
+		<label>5.56x31mm indirect smart munition</label>
+		<ammoTypes>
+			<Ammo_556x31mmISM_AP>Bullet_556x31mmISM_AP</Ammo_556x31mmISM_AP>
+			<Ammo_556x31mmISM_API>Bullet_556x31mmISM_API</Ammo_556x31mmISM_API>
+			<Ammo_556x31mmISM_HE>Bullet_556x31mmISM_HE</Ammo_556x31mmISM_HE>
+			<Ammo_556x31mmISM_Sabot>Bullet_556x31mmISM_Sabot</Ammo_556x31mmISM_Sabot>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="556x31mmISMBase" ParentName="AmmoBase" Abstract="True">
+		<description>5.56mm Indirect Smart Munition, based off of the 5.56mm NATO cartridge. This proprietary caseless ammunition was created for SDS' Sentinel smart machine gun.</description>
+		<statBases>
+			<Mass>0.011</Mass>
+			<Bulk>0.01</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo556x31mmISM</li>
+		</thingCategories>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="556x31mmISMBase">
+		<defName>Ammo_556x31mmISM_AP</defName>
+		<label>5.56x31mm ISM cartridge (AP)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/AP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.18</MarketValue>
+		</statBases>
+		<ammoClass>ArmorPiercing</ammoClass>
+		<cookOffProjectile>Bullet_556x31mmISM_AP</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="556x31mmISMBase">
+		<defName>Ammo_556x31mmISM_API</defName>
+		<label>5.56x31mm ISM cartridge (AP-I)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/Incendiary</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.21</MarketValue>
+		</statBases>
+		<ammoClass>IncendiaryAP</ammoClass>
+		<cookOffProjectile>Bullet_556x31mmISM_API</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="556x31mmISMBase">
+		<defName>Ammo_556x31mmISM_HE</defName>
+		<label>5.56x31mm ISM cartridge (HE)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/HE</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.27</MarketValue>
+		</statBases>
+		<ammoClass>ExplosiveAP</ammoClass>
+		<cookOffProjectile>Bullet_556x31mmISM_HE</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="556x31mmISMBase">
+		<defName>Ammo_556x31mmISM_Sabot</defName>
+		<label>5.56x31mm ISM cartridge (Sabot)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/Sabot</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.19</MarketValue>
+		</statBases>
+		<ammoClass>Sabot</ammoClass>
+		<cookOffProjectile>Bullet_556x31mmISM_Sabot</cookOffProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef Name="Base556mmISMBullet" ParentName="BaseBulletCE" Abstract="True">
+		<graphicData>
+			<texPath>Projectiles/SSR_Rocket_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>166</speed> <!--old:95-->
+			<gravityFactor>250</gravityFactor> <!--old:75-->
+			<dropsCasings>false</dropsCasings>
+			<soundAmbient>SSR_Loop_Short</soundAmbient>
+		</projectile>
+	</ThingDef>
+
+	<!--ThingDefParentName="Base556mmISMBullet">
+<defName>Bullet_556x31mmISM_FMJ</defName>
+<label>5.56mm Indirect smart munition (FMJ)</label>
+<projectile Class="CombatExtended.ProjectilePropertiesCE">
+<damageAmountBase>10</damageAmountBase>
+<armorPenetrationSharp>7.5</armorPenetrationSharp>
+<armorPenetrationBlunt>29.44</armorPenetrationBlunt>
+</projectile>
+</ThingDef-->
+
+	<ThingDef ParentName="Base556mmISMBullet">
+		<defName>Bullet_556x31mmISM_AP</defName>
+		<label>5.56mm Indirect smart munition (AP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationSharp>15</armorPenetrationSharp>
+			<armorPenetrationBlunt>29.44</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base556mmISMBullet">
+		<defName>Bullet_556x31mmISM_API</defName>
+		<label>5.56mm Indirect smart munition (AP-I)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationSharp>15</armorPenetrationSharp>
+			<armorPenetrationBlunt>29.44</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>5</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base556mmISMBullet">
+		<defName>Bullet_556x31mmISM_HE</defName>
+		<label>5.56mm Indirect smart munition (HE)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>11</damageAmountBase>
+			<armorPenetrationSharp>7.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>29.44</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>8</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base556mmISMBullet">
+		<defName>Bullet_556x31mmISM_Sabot</defName>
+		<label>5.56mm Indirect smart munition (Sabot)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>26.25</armorPenetrationSharp>
+			<armorPenetrationBlunt>46.34</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_556x31mmISM_AP</defName>
+		<label>make 5.56x31mm ISM (AP) cartridge x500</label>
+		<description>Craft 500 5.56x31mm ISM (AP) rockets.</description>
+		<jobString>Making 5.56x31mm ISM (AP) rockets.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>Prometheum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_556x31mmISM_AP>500</Ammo_556x31mmISM_AP>
+		</products>
+		<workAmount>2880</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_556x31mmISM_API</defName>
+		<label>make 5.56x31mm ISM (AP-I) cartridge x500</label>
+		<description>Craft 500 5.56x31mm ISM (AP-I) rockets.</description>
+		<jobString>Making 5.56x31mm ISM (AP-I) rockets.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>Prometheum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_556x31mmISM_API>500</Ammo_556x31mmISM_API>
+		</products>
+		<workAmount>3840</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_556x31mmISM_HE</defName>
+		<label>make 5.56x31mm ISM (HE) cartridge x500</label>
+		<description>Craft 500 5.56x31mm ISM (HE) rockets.</description>
+		<jobString>Making 5.56x31mm ISM (HE) rockets.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+				<li>Prometheum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_556x31mmISM_HE>500</Ammo_556x31mmISM_HE>
+		</products>
+		<workAmount>4800</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_556x31mmISM_Sabot</defName>
+		<label>make 5.56x31mm ISM (Sabot) cartridge x500</label>
+		<description>Craft 500 5.56x31mm ISM (Sabot) rockets.</description>
+		<jobString>Making 5.56x31mm ISM (Sabot) rockets.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Chemfuel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>Chemfuel</li>
+				<li>ComponentIndustrial</li>
+				<li>Prometheum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_556x31mmISM_Sabot>500</Ammo_556x31mmISM_Sabot>
+		</products>
+		<workAmount>3000</workAmount>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Urbworld Weaponry SDS/Defs/Urbworld Weaponry SDS/9x35mmSSR.xml b/ModPatches/Urbworld Weaponry SDS/Defs/Urbworld Weaponry SDS/9x35mmSSR.xml
new file mode 100644
index 0000000000..07f8d3c590
--- /dev/null
+++ b/ModPatches/Urbworld Weaponry SDS/Defs/Urbworld Weaponry SDS/9x35mmSSR.xml	
@@ -0,0 +1,510 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>Ammo9x35mmSSR</defName>
+		<label>9x35mm semi smart rocket</label>
+		<parent>AmmoRifles</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_9x35mmSSR</defName>
+		<label>9x35mmSSR</label>
+		<ammoTypes>
+			<Ammo_9x35mmSSR_FMJ>Bullet_9x35mmSSR_FMJ</Ammo_9x35mmSSR_FMJ>
+			<Ammo_9x35mmSSR_AP>Bullet_9x35mmSSR_AP</Ammo_9x35mmSSR_AP>
+			<Ammo_9x35mmSSR_HP>Bullet_9x35mmSSR_HP</Ammo_9x35mmSSR_HP>
+			<Ammo_9x35mmSSR_Incendiary>Bullet_9x35mmSSR_Incendiary</Ammo_9x35mmSSR_Incendiary>
+			<Ammo_9x35mmSSR_HE>Bullet_9x35mmSSR_HE</Ammo_9x35mmSSR_HE>
+			<Ammo_9x35mmSSR_Sabot>Bullet_9x35mmSSR_Sabot</Ammo_9x35mmSSR_Sabot>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="9x35mmSSRBase" ParentName="SmallAmmoBase" Abstract="True">
+		<description>Caseless semi-guided rocket used by early smartgun designs. Instead of actively tracking a target each bullet is programmed with flight data given to it by the weapon and/or user agumentations.</description>
+		<statBases>
+			<Mass>0.026</Mass>
+			<Bulk>0.02</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo9x35mmSSR</li>
+		</thingCategories>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="9x35mmSSRBase">
+		<defName>Ammo_9x35mmSSR_FMJ</defName>
+		<label>9x35mmSSR cartridge (FMJ)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/FMJ</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.24</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+		<cookOffProjectile>Bullet_9x35mmSSR_FMJ</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="9x35mmSSRBase">
+		<defName>Ammo_9x35mmSSR_AP</defName>
+		<label>9x35mmSSR cartridge (AP)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/AP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.24</MarketValue>
+		</statBases>
+		<ammoClass>ArmorPiercing</ammoClass>
+		<cookOffProjectile>Bullet_9x35mmSSR_AP</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="9x35mmSSRBase">
+		<defName>Ammo_9x35mmSSR_HP</defName>
+		<label>9x35mmSSR cartridge (HP)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/HP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.24</MarketValue>
+		</statBases>
+		<ammoClass>HollowPoint</ammoClass>
+		<cookOffProjectile>Bullet_9x35mmSSR_HP</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="9x35mmSSRBase">
+		<defName>Ammo_9x35mmSSR_Incendiary</defName>
+		<label>9x35mmSSR cartridge (AP-I)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/Incendiary</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.3</MarketValue>
+		</statBases>
+		<ammoClass>IncendiaryAP</ammoClass>
+		<cookOffProjectile>Bullet_9x35mmSSR_Incendiary</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="9x35mmSSRBase">
+		<defName>Ammo_9x35mmSSR_HE</defName>
+		<label>9x35mmSSR cartridge (HE)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/HE</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.45</MarketValue>
+		</statBases>
+		<ammoClass>ExplosiveAP</ammoClass>
+		<cookOffProjectile>Bullet_9x35mmSSR_HE</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="9x35mmSSRBase">
+		<defName>Ammo_9x35mmSSR_Sabot</defName>
+		<label>9x35mmSSR cartridge (Sabot)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Rifle/Sabot</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.26</MarketValue>
+			<Mass>0.018</Mass>
+		</statBases>
+		<ammoClass>Sabot</ammoClass>
+		<cookOffProjectile>Bullet_9x35mmSSR_Sabot</cookOffProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef Name="Base9x35mmSSRBullet" ParentName="BaseBulletCE" Abstract="True">
+		<graphicData>
+			<texPath>Projectiles/SSR_Rocket_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>84</speed>
+			<gravityFactor>50</gravityFactor>
+			<dropsCasings>false</dropsCasings>
+			<soundAmbient>SSR_Loop_Short</soundAmbient>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base9x35mmSSRBullet">
+		<defName>Bullet_9x35mmSSR_FMJ</defName>
+		<label>9x35mmSSR (FMJ)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>11</damageAmountBase>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+			<armorPenetrationBlunt>35.28</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base9x35mmSSRBullet">
+		<defName>Bullet_9x35mmSSR_AP</defName>
+		<label>9x35mmSSR (AP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>9</damageAmountBase>
+			<armorPenetrationSharp>16</armorPenetrationSharp>
+			<armorPenetrationBlunt>35.28</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base9x35mmSSRBullet">
+		<defName>Bullet_9x35mmSSR_HP</defName>
+		<label>9x35mmSSR (HP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>21</damageAmountBase>
+			<armorPenetrationSharp>4</armorPenetrationSharp>
+			<armorPenetrationBlunt>35.28</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base9x35mmSSRBullet">
+		<defName>Bullet_9x35mmSSR_Incendiary</defName>
+		<label>9x35mmSSR (AP-I)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>11</damageAmountBase>
+			<armorPenetrationSharp>16</armorPenetrationSharp>
+			<armorPenetrationBlunt>35.28</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>7</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base9x35mmSSRBullet">
+		<defName>Bullet_9x35mmSSR_HE</defName>
+		<label>9x35mmSSR (HE)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>19</damageAmountBase>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+			<armorPenetrationBlunt>47.62</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>11</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base9x35mmSSRBullet">
+		<defName>Bullet_9x35mmSSR_Sabot</defName>
+		<label>9x35mmSSR (Sabot)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>15</damageAmountBase>
+			<armorPenetrationSharp>28</armorPenetrationSharp>
+			<armorPenetrationBlunt>47.62</armorPenetrationBlunt>
+			<speed>126</speed>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_9x35mmSSR_FMJ</defName>
+		<label>make 9x35mmSSR (FMJ) cartridge x500</label>
+		<description>Craft 500 9x35mmSSR (FMJ) rockets.</description>
+		<jobString>Making 9x35mmSSR (FMJ) rockets.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>26</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>Prometheum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_9x35mmSSR_FMJ>500</Ammo_9x35mmSSR_FMJ>
+		</products>
+		<workAmount>3800</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_9x35mmSSR_AP</defName>
+		<label>make 9x35mmSSR (AP) cartridge x500</label>
+		<description>Craft 500 9x35mmSSR (AP) rockets.</description>
+		<jobString>Making 9x35mmSSR (AP) rockets.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>26</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>Prometheum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_9x35mmSSR_AP>500</Ammo_9x35mmSSR_AP>
+		</products>
+		<workAmount>4560</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_9x35mmSSR_HP</defName>
+		<label>make 9x35mmSSR (HP) cartridge x500</label>
+		<description>Craft 500 9x35mmSSR (HP) rockets.</description>
+		<jobString>Making 9x35mmSSR (HP) rockets.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>26</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>Prometheum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_9x35mmSSR_HP>500</Ammo_9x35mmSSR_HP>
+		</products>
+		<workAmount>3800</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AdvancedAmmoRecipeBase">
+		<defName>MakeAmmo_9x35mmSSR_Incendiary</defName>
+		<label>make 9x35mmSSR (AP-I) cartridge x500</label>
+		<description>Craft 500 9x35mmSSR (AP-I) rockets.</description>
+		<jobString>Making 9x35mmSSR (AP-I) rockets.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>26</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>7</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>Prometheum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_9x35mmSSR_Incendiary>500</Ammo_9x35mmSSR_Incendiary>
+		</products>
+		<workAmount>6960</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AdvancedAmmoRecipeBase">
+		<defName>MakeAmmo_9x35mmSSR_HE</defName>
+		<label>make 9x35mmSSR (HE) cartridge x500</label>
+		<description>Craft 500 9x35mmSSR (HE) rockets.</description>
+		<jobString>Making 9x35mmSSR (HE) rockets.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>26</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+				<li>Prometheum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_9x35mmSSR_HE>500</Ammo_9x35mmSSR_HE>
+		</products>
+		<workAmount>9360</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AdvancedAmmoRecipeBase">
+		<defName>MakeAmmo_9x35mmSSR_Sabot</defName>
+		<label>make 9x35mmSSR (Sabot) cartridge x500</label>
+		<description>Craft 500 9x35mmSSR (Sabot) rockets.</description>
+		<jobString>Making 9x35mmSSR (Sabot) rockets.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Chemfuel</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Uranium</li>
+				<li>Chemfuel</li>
+				<li>ComponentIndustrial</li>
+				<li>Prometheum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_9x35mmSSR_Sabot>500</Ammo_9x35mmSSR_Sabot>
+		</products>
+		<workAmount>5400</workAmount>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Urbworld Weaponry SDS/Patches/Urbworld Weaponry SDS/CE-UWSDS.xml b/ModPatches/Urbworld Weaponry SDS/Patches/Urbworld Weaponry SDS/CE-UWSDS.xml
new file mode 100644
index 0000000000..0fbd86191d
--- /dev/null
+++ b/ModPatches/Urbworld Weaponry SDS/Patches/Urbworld Weaponry SDS/CE-UWSDS.xml	
@@ -0,0 +1,521 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Reload sounds, Night vision -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_SemiSmart_Carbine"]/soundInteract</xpath>
+		<value>
+			<soundInteract>SSR_Warden_Int</soundInteract>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Gun_SemiSmart_Pistol"
+			or defName="Gun_SemiSmart_SMG"
+			or defName="Gun_SemiSmart_Carbine"
+			]/equippedStatOffsets
+		</xpath>
+		<value>
+			<NightVisionEfficiency_Weapon>0.75</NightVisionEfficiency_Weapon>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Gun_SemiSmart_LMG"
+			or defName="Gun_SemiSmart_Rifle"
+			or defName="Gun_SemiSmart_Sniper"
+			or defName="Gun_SemiSmart_BattleRifle"
+			]/equippedStatOffsets
+		</xpath>
+		<value>
+			<NightVisionEfficiency_Weapon>0.9</NightVisionEfficiency_Weapon>
+		</value>
+	</Operation>
+
+	<!-- ==== Tools ==== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[@Name="SSR_Basegun"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.5</cooldownTime>
+					<chanceFactor>1.65</chanceFactor>
+					<armorPenetrationBlunt>2.27</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.35</cooldownTime>
+					<armorPenetrationBlunt>1.15</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>2.27</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>/Defs/ThingDef[defName="Gun_SemiSmart_Pistol"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.5</cooldownTime>
+					<chanceFactor>1.65</chanceFactor>
+					<armorPenetrationBlunt>2.27</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.35</cooldownTime>
+					<armorPenetrationBlunt>1.15</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ==== Guardian ==== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SemiSmart_Pistol</defName>
+		<statBases>
+			<WorkToMake>9000</WorkToMake>
+			<SightsEfficiency>1.86</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>0.96</SwayFactor>
+			<Bulk>1.96</Bulk>
+			<Mass>0.96</Mass>
+			<RangedWeapon_Cooldown>0.51</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>20</Steel>
+			<Chemfuel>5</Chemfuel>
+			<SimpleBC>1</SimpleBC>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_18mmSmart_FMJ</defaultProjectile>
+			<warmupTime>0.735</warmupTime>
+			<range>21</range> <!--+5-->
+			<soundCast>SSR_Small_Fire</soundCast>
+			<soundAiming>SSR_Basic_Aim_Short</soundAiming>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>4</muzzleFlashScale>
+			<requireLineOfSight>false</requireLineOfSight>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>4</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_18mmSmart</ammoSet>
+		</AmmoUser>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_Sidearm</li>
+		</weaponTags>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ==== Vanguard ==== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SemiSmart_SMG</defName>
+		<statBases>
+			<WorkToMake>29000</WorkToMake>
+			<SightsEfficiency>1.86</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>2.05</SwayFactor>
+			<Bulk>4.46</Bulk>
+			<Mass>3.6</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+			<Chemfuel>5</Chemfuel>
+			<SimpleBC>1</SimpleBC>
+		</costList>
+		<Properties>
+			<recoilAmount>2.94</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_18mmSmart_FMJ</defaultProjectile>
+			<burstShotCount>4</burstShotCount>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<warmupTime>0.735</warmupTime>
+			<soundCast>SSR_Small_Fire</soundCast>
+			<soundAiming>SSR_Basic_Aim_Short</soundAiming>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<range>30</range> <!--+5-->
+			<requireLineOfSight>false</requireLineOfSight>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_18mmSmart</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ==== Warden ==== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SemiSmart_Carbine</defName>
+		<statBases>
+			<WorkToMake>32000</WorkToMake>
+			<SightsEfficiency>1.86</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>2.36</SwayFactor>
+			<Bulk>4.19</Bulk>
+			<Mass>2.8</Mass>
+			<RangedWeapon_Cooldown>1.01</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+			<Chemfuel>10</Chemfuel>
+			<SimpleBC>1</SimpleBC>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_18mmSmart_FMJ</defaultProjectile>
+			<warmupTime>0.735</warmupTime>
+			<range>45</range> <!--+5-->
+			<soundCast>SSR_Warden_Fire</soundCast>
+			<soundAiming>SSR_Basic_Aim</soundAiming>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>4</muzzleFlashScale>
+			<requireLineOfSight>false</requireLineOfSight>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>4</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_18mmSmart</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ==== Watchman ==== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SemiSmart_Rifle</defName>
+		<statBases>
+			<WorkToMake>62500</WorkToMake>
+			<SightsEfficiency>2.78</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.36</SwayFactor>
+			<Bulk>7.1</Bulk>
+			<Mass>3.1</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>8</ComponentIndustrial>
+			<Plasteel>25</Plasteel>
+			<Chemfuel>10</Chemfuel>
+			<AdvancedBC>1</AdvancedBC>
+		</costList>
+		<Properties>
+			<recoilAmount>2.33</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x35mmSSR_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>1.75</warmupTime>
+			<range>58</range> <!--+10-->
+			<soundCast>SSR_Watchman_Fire</soundCast>
+			<soundAiming>SSR_Adv_Aim</soundAiming>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>5</muzzleFlashScale>
+			<requireLineOfSight>false</requireLineOfSight>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>25</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x35mmSSR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ==== Enforcer ==== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SemiSmart_BattleRifle</defName>
+		<statBases>
+			<WorkToMake>52000</WorkToMake>
+			<SightsEfficiency>2.16</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.3</SwayFactor>
+			<Bulk>6.35</Bulk>
+			<Mass>3.8</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>8</ComponentIndustrial>
+			<Plasteel>25</Plasteel>
+			<Chemfuel>10</Chemfuel>
+			<AdvancedBC>1</AdvancedBC>
+		</costList>
+		<Properties>
+			<recoilAmount>2.85</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_18mmSmart_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>1.235</warmupTime>
+			<range>58</range> <!--+10-->
+			<soundCast>SSR_Enforcer_Fire</soundCast>
+			<soundAiming>SSR_Adv_Aim</soundAiming>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>4</muzzleFlashScale>
+			<requireLineOfSight>false</requireLineOfSight>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>16</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_18mmSmart</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ==== Sentinel ==== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SemiSmart_LMG</defName>
+		<statBases>
+			<WorkToMake>65000</WorkToMake>
+			<SightsEfficiency>2.78</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.16</SwayFactor>
+			<Bulk>8.3</Bulk>
+			<Mass>6.6</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<ComponentIndustrial>9</ComponentIndustrial>
+			<AdvancedBC>1</AdvancedBC>
+			<Plasteel>30</Plasteel>
+			<Chemfuel>15</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>1.05</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x31mmISM_AP</defaultProjectile>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<warmupTime>1.95</warmupTime>
+			<range>58</range> <!--+10-->
+			<soundCast>SSR_Sentinel_Fire</soundCast>
+			<soundAiming>SSR_Adv_Aim</soundAiming>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>5</muzzleFlashScale>
+			<circularError>0</circularError>
+			<indirectFirePenalty>0.3</indirectFirePenalty>
+			<requireLineOfSight>false</requireLineOfSight>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_556x31mmISM</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_MachineGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ==== Panopticon ==== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SemiSmart_Sniper</defName>
+		<statBases>
+			<WorkToMake>60000</WorkToMake>
+			<SightsEfficiency>2.78</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.82</SwayFactor>
+			<Bulk>9.2</Bulk>
+			<Mass>14.8</Mass>
+			<RangedWeapon_Cooldown>0.57</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>75</Steel>
+			<Plasteel>35</Plasteel>
+			<ComponentIndustrial>7</ComponentIndustrial>
+			<AdvancedBC>1</AdvancedBC>
+			<Chemfuel>20</Chemfuel>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50ISM_FMJ</defaultProjectile>
+			<warmupTime>1.95</warmupTime>
+			<range>96</range> <!--+10-->
+			<soundCast>SSR_Panopticon_Fire</soundCast>
+			<soundAiming>SSR_Adv_Aim</soundAiming>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<circularError>0</circularError>
+			<indirectFirePenalty>0</indirectFirePenalty>
+			<requireLineOfSight>false</requireLineOfSight>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_50ISM</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Gun_SemiSmart_Barricade"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<!-- ==== Barricade ==== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SemiSmart_Barricade</defName>
+		<statBases>
+			<WorkToMake>80500</WorkToMake>
+			<SightsEfficiency>2.78</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>3.46</SwayFactor>
+			<Bulk>8.89</Bulk>
+			<Mass>20</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>90</Steel>
+			<Plasteel>40</Plasteel>
+			<AdvancedBC>1</AdvancedBC>
+			<Chemfuel>25</Chemfuel>
+			<ComponentIndustrial>11</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>0.99</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x35mmSSR_FMJ</defaultProjectile>
+			<burstShotCount>50</burstShotCount>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<warmupTime>2.75</warmupTime>
+			<range>72</range> <!--+10-->
+			<soundCast>SSR_Barricade_Fire</soundCast>
+			<soundAiming>SSR_Adv_Aim</soundAiming>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>5</muzzleFlashScale>
+			<circularError>0</circularError>
+			<indirectFirePenalty>0.5</indirectFirePenalty>
+			<requireLineOfSight>false</requireLineOfSight>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>9.2</reloadTime>
+			<ammoSet>AmmoSet_9x35mmSSR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>25</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Suppressive</li>
+		</weaponTags>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Useless Clothes/Patches/Useless Clothes/ThingDefs_Apparel.xml b/ModPatches/Useless Clothes/Patches/Useless Clothes/ThingDefs_Apparel.xml
new file mode 100644
index 0000000000..7df9fd4b90
--- /dev/null
+++ b/ModPatches/Useless Clothes/Patches/Useless Clothes/ThingDefs_Apparel.xml	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="woola" or defName="woolschoolpants" or defName="woolschoolskirt" or defName="woolshirtpants" or defName="wooluniform"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- == Useless nooses == -->
+	<!-- statBases -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="woolnecktie" or defName="woolbow"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>0.1</Bulk>
+			<StuffEffectMultiplierArmor>0.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- == useless SuitJacket == -->
+	<!-- statBases -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="woolsuitpants"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+	<!-- == useless school uniform == -->
+	<!-- statBases -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="woolschooluniform_Thin"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Ushankas Glitterworld Uprising/Patches/Ushankas Glitterworld Uprising/Hediff_Glitter.xml b/ModPatches/Ushankas Glitterworld Uprising/Patches/Ushankas Glitterworld Uprising/Hediff_Glitter.xml
new file mode 100644
index 0000000000..8eb4414bd1
--- /dev/null
+++ b/ModPatches/Ushankas Glitterworld Uprising/Patches/Ushankas Glitterworld Uprising/Hediff_Glitter.xml	
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ===== Glitterworld Golden Skin ===== -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/HediffDef[defName="USH_InstalledGoldenSkinReplacement"]/stages/li/capMods</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="USH_InstalledGoldenSkinReplacement"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="USH_InstalledGoldenSkinReplacement"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="USH_InstalledGoldenSkinReplacement"]/stages/li/statOffsets</xpath>
+		<value>
+			<MoveSpeed>-0.15</MoveSpeed>
+			<MeleeDodgeChance>-0.01</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<!-- ===== Glitterworld Plasteel Skin ===== -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/HediffDef[defName="USH_InstalledPlasteelSkinReplacement"]/stages/li/capMods</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="USH_InstalledPlasteelSkinReplacement"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="USH_InstalledPlasteelSkinReplacement"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>5.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="USH_InstalledPlasteelSkinReplacement"]/stages/li/statOffsets</xpath>
+		<value>
+			<MoveSpeed>0.10</MoveSpeed>
+			<MeleeDodgeChance>0.01</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/VFAS/Patches/VFAS/HediffDefs/BionicArm.xml b/ModPatches/VFAS/Patches/VFAS/HediffDefs/BionicArm.xml
new file mode 100644
index 0000000000..7e054d604d
--- /dev/null
+++ b/ModPatches/VFAS/Patches/VFAS/HediffDefs/BionicArm.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- tiny -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BionicAnimalArmTiny"]/comps/li/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.25</cooldownTime>
+					<armorPenetration>0.071</armorPenetration>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- small -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BionicAnimalArmSmall"]/comps/li/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.45</cooldownTime>
+					<armorPenetration>0.087</armorPenetration>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- medium -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BionicAnimalArmMedium"]/comps/li/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.65</cooldownTime>
+					<armorPenetration>0.125</armorPenetration>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- large -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BionicAnimalArmLarge"]/comps/li/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.85</cooldownTime>
+					<armorPenetration>0.163</armorPenetration>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- huge -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BionicAnimalArmHuge"]/comps/li/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>2.05</cooldownTime>
+					<armorPenetration>0.207</armorPenetration>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/VFAS/Patches/VFAS/HediffDefs/BionicLeg.xml b/ModPatches/VFAS/Patches/VFAS/HediffDefs/BionicLeg.xml
new file mode 100644
index 0000000000..69c561cf7f
--- /dev/null
+++ b/ModPatches/VFAS/Patches/VFAS/HediffDefs/BionicLeg.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- tiny -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BionicAnimalLegTinyFront"]/comps/li/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>leg</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetration>0.107</armorPenetration>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- small -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BionicAnimalLegSmallFront"]/comps/li/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>leg</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.65</cooldownTime>
+					<armorPenetration>0.143</armorPenetration>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- medium -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BionicAnimalLegMediumFront"]/comps/li/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>leg</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.65</cooldownTime>
+					<armorPenetration>0.169</armorPenetration>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- large -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BionicAnimalLegLargeFront"]/comps/li/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>leg</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.85</cooldownTime>
+					<armorPenetration>0.211</armorPenetration>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- huge -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BionicAnimalLegHugeFront"]/comps//li/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>leg</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>2.05</cooldownTime>
+					<armorPenetration>0.267</armorPenetration>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/VFAS/Patches/VFAS/HediffDefs/Denture.xml b/ModPatches/VFAS/Patches/VFAS/HediffDefs/Denture.xml
new file mode 100644
index 0000000000..8e559bb751
--- /dev/null
+++ b/ModPatches/VFAS/Patches/VFAS/HediffDefs/Denture.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- tiny -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AnimalDentureTiny"]/comps/li/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.65</cooldownTime>
+					<armorPenetration>0.106</armorPenetration>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- small -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AnimalDentureSmall"]/comps/li/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.75</cooldownTime>
+					<armorPenetration>0.128</armorPenetration>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- medium -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AnimalDentureMedium"]/comps/li/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.85</cooldownTime>
+					<armorPenetration>0.15</armorPenetration>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- large -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AnimalDentureLarge"]/comps/li/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.95</cooldownTime>
+					<armorPenetration>0.192</armorPenetration>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- huge -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AnimalDentureHuge"]/comps/li/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>2.05</cooldownTime>
+					<armorPenetration>0.233</armorPenetration>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/VFAS/Patches/VFAS/HediffDefs/SimpleProstheticArm.xml b/ModPatches/VFAS/Patches/VFAS/HediffDefs/SimpleProstheticArm.xml
new file mode 100644
index 0000000000..214375ba29
--- /dev/null
+++ b/ModPatches/VFAS/Patches/VFAS/HediffDefs/SimpleProstheticArm.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- tiny -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="SimpleProstheticAnimalArmTiny"]/comps/li/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3.6</power>
+					<cooldownTime>1.25</cooldownTime>
+					<armorPenetration>0.68</armorPenetration>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- small -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="SimpleProstheticAnimalArmSmall"]/comps/li/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5.4</power>
+					<cooldownTime>1.45</cooldownTime>
+					<armorPenetration>0.082</armorPenetration>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- medium -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="SimpleProstheticAnimalArmMedium"]/comps/li/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.65</cooldownTime>
+					<armorPenetration>0.118</armorPenetration>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- large -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="SimpleProstheticAnimalArmLarge"]/comps/li/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14.4</power>
+					<cooldownTime>1.85</cooldownTime>
+					<armorPenetration>0.151</armorPenetration>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- huge -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="SimpleProstheticAnimalArmHuge"]/comps/li/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2.05</cooldownTime>
+					<armorPenetration>0.192</armorPenetration>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/VFAS/Patches/VFAS/HediffDefs/SimpleProstheticLeg.xml b/ModPatches/VFAS/Patches/VFAS/HediffDefs/SimpleProstheticLeg.xml
new file mode 100644
index 0000000000..487ae366de
--- /dev/null
+++ b/ModPatches/VFAS/Patches/VFAS/HediffDefs/SimpleProstheticLeg.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- tiny -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="SimpleProstheticAnimalLegTinyFront"]/comps/li/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>leg</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>5.4</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetration>0.081</armorPenetration>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- small -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="SimpleProstheticAnimalLegSmallFront"]/comps/li/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>leg</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.65</cooldownTime>
+					<armorPenetration>0.107</armorPenetration>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- medium -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="SimpleProstheticAnimalLegMediumFront"]/comps/li/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>leg</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.65</cooldownTime>
+					<armorPenetration>0.128</armorPenetration>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- large -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="SimpleProstheticAnimalLegLargeFront"]/comps/li/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>leg</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>16.2</power>
+					<cooldownTime>1.85</cooldownTime>
+					<armorPenetration>0.196</armorPenetration>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- huge -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="SimpleProstheticAnimalLegHugeFront"]/comps/li/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>leg</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>2.05</cooldownTime>
+					<armorPenetration>0.251</armorPenetration>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/VFE - Mechanoids Drones/Patches/VFE - Mechanoids Drones/Race_Machines.xml b/ModPatches/VFE - Mechanoids Drones/Patches/VFE - Mechanoids Drones/Race_Machines.xml
new file mode 100644
index 0000000000..6215c62dfb
--- /dev/null
+++ b/ModPatches/VFE - Mechanoids Drones/Patches/VFE - Mechanoids Drones/Race_Machines.xml	
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFEMA_Mechanoids_Farmer" or defName="VFEMA_Mechanoids_Kitchen"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEMA_Mechanoids_Farmer" or defName="VFEMA_Mechanoids_Kitchen"]/statBases</xpath>
+		<value>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+			<MeleeDodgeChance>0</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEMA_Mechanoids_Farmer" or defName="VFEMA_Mechanoids_Kitchen"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEMA_Mechanoids_Farmer" or defName="VFEMA_Mechanoids_Kitchen"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEMA_Mechanoids_Farmer" or defName="VFEMA_Mechanoids_Kitchen"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.825</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/VFE Pirates unofficial add-on - Warcasket Melee Armory Continued/Patches/VFE Pirates unofficial add-on - Warcasket Melee Armory Continued/Weapons.xml b/ModPatches/VFE Pirates unofficial add-on - Warcasket Melee Armory Continued/Patches/VFE Pirates unofficial add-on - Warcasket Melee Armory Continued/Weapons.xml
new file mode 100644
index 0000000000..c72dfa81d9
--- /dev/null
+++ b/ModPatches/VFE Pirates unofficial add-on - Warcasket Melee Armory Continued/Patches/VFE Pirates unofficial add-on - Warcasket Melee Armory Continued/Weapons.xml	
@@ -0,0 +1,720 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Spear -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_Spear"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>16</power>
+					<chanceFactor>0.1</chanceFactor>
+					<cooldownTime>2.1</cooldownTime>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>65</power>
+					<cooldownTime>2.4</cooldownTime>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<armorPenetrationSharp>12</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_Spear"]/statBases</xpath>
+		<value>
+			<Bulk>18</Bulk>
+			<MeleeCounterParryBonus>1.75</MeleeCounterParryBonus>
+			<ToughnessRating>10</ToughnessRating>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_Spear"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.75</MeleeCritChance>
+				<MeleeParryChance>1.25</MeleeParryChance>
+				<MeleeDodgeChance>0.8</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	
+	<!-- Axe -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_Axe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>12</power>
+					<chanceFactor>0.1</chanceFactor>
+					<cooldownTime>2.5</cooldownTime>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>60</power>
+					<cooldownTime>5</cooldownTime>
+					<armorPenetrationBlunt>32</armorPenetrationBlunt>
+					<armorPenetrationSharp>6</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_Axe"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<MeleeCounterParryBonus>0.1</MeleeCounterParryBonus>
+			<ToughnessRating>10</ToughnessRating>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_Axe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.2</MeleeCritChance>
+				<MeleeParryChance>0.1</MeleeParryChance>
+				<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	
+	<!-- Baton -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_Baton"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>6</power>
+					<chanceFactor>0.1</chanceFactor>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<extraMeleeDamages>
+						<li>
+							<def>EMP</def>
+							<amount>12</amount>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>4.5</cooldownTime>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_Baton"]/statBases</xpath>
+		<value>
+			<Bulk>14</Bulk>
+			<MeleeCounterParryBonus>0.2</MeleeCounterParryBonus>
+			<ToughnessRating>10</ToughnessRating>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_Baton"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.75</MeleeCritChance>
+				<MeleeParryChance>0.25</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	
+	<!-- Knuckle -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_Knuckle"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>22</power>
+					<extraMeleeDamages>
+						<li>
+							<def>EMP</def>
+							<amount>4</amount>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_Knuckle"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+			<ToughnessRating>10</ToughnessRating>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_Knuckle"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.25</MeleeCritChance>
+				<MeleeParryChance>0.15</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	
+	<!-- Glaive -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_Glaive"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>80</power>
+					<cooldownTime>3.8</cooldownTime>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<armorPenetrationSharp>8</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>65</power>
+					<cooldownTime>2.4</cooldownTime>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+					<armorPenetrationSharp>12</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_Glaive"]/statBases</xpath>
+		<value>
+			<Bulk>18</Bulk>
+			<MeleeCounterParryBonus>1.75</MeleeCounterParryBonus>
+			<ToughnessRating>10</ToughnessRating>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_Glaive"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.75</MeleeCritChance>
+				<MeleeParryChance>1.25</MeleeParryChance>
+				<MeleeDodgeChance>0.8</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	
+	<!-- Hammer -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_Hammer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<chanceFactor>0.1</chanceFactor>
+					<cooldownTime>2.11</cooldownTime>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Demolish</li>
+					</capacities>
+					<power>50</power>
+					<cooldownTime>5.73</cooldownTime>
+					<armorPenetrationBlunt>200</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_Hammer"]/statBases</xpath>
+		<value>
+			<Bulk>24</Bulk>
+			<MeleeCounterParryBonus>1.5</MeleeCounterParryBonus>
+			<ToughnessRating>10</ToughnessRating>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_Hammer"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.8</MeleeCritChance>
+				<MeleeParryChance>0.1</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	
+	<!-- Kinetic Gauntlet -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_KineticGauntlet"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>48</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>120</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_KineticGauntlet"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+			<ToughnessRating>20</ToughnessRating>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_KineticGauntlet"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.5</MeleeCritChance>
+				<MeleeParryChance>0.15</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	
+	<!-- Monospear -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_MonoSpear"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>16</power>
+					<chanceFactor>0.1</chanceFactor>
+					<cooldownTime>2.1</cooldownTime>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>70</power>
+					<cooldownTime>2.4</cooldownTime>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+					<armorPenetrationSharp>28</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_MonoSpear"]/statBases</xpath>
+		<value>
+			<Bulk>18</Bulk>
+			<MeleeCounterParryBonus>1.75</MeleeCounterParryBonus>
+			<ToughnessRating>20</ToughnessRating>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_MonoSpear"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.25</MeleeCritChance>
+				<MeleeParryChance>1.25</MeleeParryChance>
+				<MeleeDodgeChance>0.8</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	
+	<!-- Monoknife -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_MonoKnife"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.75</cooldownTime>
+					<armorPenetrationBlunt>16</armorPenetrationBlunt>
+					<armorPenetrationSharp>22</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>60</power>
+					<cooldownTime>2.4</cooldownTime>
+					<armorPenetrationBlunt>14</armorPenetrationBlunt>
+					<armorPenetrationSharp>15</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_MonoKnife"]/statBases</xpath>
+		<value>
+			<Bulk>7</Bulk>
+			<MeleeCounterParryBonus>0.3</MeleeCounterParryBonus>
+			<ToughnessRating>10</ToughnessRating>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_MonoKnife"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1</MeleeCritChance>
+				<MeleeParryChance>0.75</MeleeParryChance>
+				<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Factions Expanded - Insectoids</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+			<!-- Plasma Glaive -->
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_PlasmaGlaive"]/tools</xpath>
+				<value>
+					<tools>
+						<li Class="CombatExtended.ToolCE">
+							<label>edge</label>
+							<capacities>
+								<li>Cut</li>
+							</capacities>
+							<power>85</power>
+							<extraMeleeDamages>
+								<li>
+									<def>Flame</def>
+									<amount>35</amount>
+									<chance>0.45</chance>
+								</li>
+							</extraMeleeDamages>
+							<cooldownTime>4.25</cooldownTime>
+							<armorPenetrationBlunt>12</armorPenetrationBlunt>
+							<armorPenetrationSharp>34</armorPenetrationSharp>
+							<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+						</li>
+						<li Class="CombatExtended.ToolCE">
+							<label>point</label>
+							<capacities>
+								<li>Stab</li>
+							</capacities>
+							<power>30</power>
+							<extraMeleeDamages>
+								<li>
+									<def>Flame</def>
+									<amount>25</amount>
+									<chance>0.45</chance>
+								</li>
+							</extraMeleeDamages>
+							<cooldownTime>2.4</cooldownTime>
+							<armorPenetrationBlunt>6</armorPenetrationBlunt>
+							<armorPenetrationSharp>40</armorPenetrationSharp>
+						</li>
+					</tools>
+				</value>
+			</li>
+
+			<li Class="PatchOperationAdd">
+				<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_PlasmaGlaive"]/statBases</xpath>
+				<value>
+					<Bulk>20</Bulk>
+					<MeleeCounterParryBonus>1.75</MeleeCounterParryBonus>
+					<ToughnessRating>25</ToughnessRating>
+				</value>
+			</li>
+
+			<li Class="PatchOperationAdd">
+				<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_PlasmaGlaive"]</xpath>
+				<value>
+					<equippedStatOffsets>
+						<MeleeCritChance>1.25</MeleeCritChance>
+						<MeleeParryChance>1.25</MeleeParryChance>
+						<MeleeDodgeChance>0.8</MeleeDodgeChance>
+					</equippedStatOffsets>
+				</value>
+			</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Factions Expanded - Vikings</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+			<!-- Crypto Axe -->
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_CryptoAxe"]/tools</xpath>
+				<value>
+					<tools>
+						<li Class="CombatExtended.ToolCE">
+							<label>handle</label>
+							<capacities>
+								<li>Poke</li>
+							</capacities>
+							<power>12</power>
+							<chanceFactor>0.1</chanceFactor>
+							<cooldownTime>2.5</cooldownTime>
+							<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+							<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+						</li>
+						<li Class="CombatExtended.ToolCE">
+							<label>edge</label>
+							<capacities>
+								<li>VFEV_Cut</li>
+							</capacities>
+							<power>50</power>
+							<cooldownTime>4.5</cooldownTime>
+							<armorPenetrationBlunt>38</armorPenetrationBlunt>
+							<armorPenetrationSharp>8</armorPenetrationSharp>
+							<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+						</li>
+					</tools>
+				</value>
+			</li>
+
+			<li Class="PatchOperationAdd">
+				<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_CryptoAxe"]/statBases</xpath>
+				<value>
+					<Bulk>17</Bulk>
+					<MeleeCounterParryBonus>0.1</MeleeCounterParryBonus>
+					<ToughnessRating>20</ToughnessRating>
+				</value>
+			</li>
+
+			<li Class="PatchOperationAdd">
+				<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_CryptoAxe"]</xpath>
+				<value>
+					<equippedStatOffsets>
+						<MeleeCritChance>0.4</MeleeCritChance>
+						<MeleeParryChance>0.2</MeleeParryChance>
+						<MeleeDodgeChance>0.2</MeleeDodgeChance>
+					</equippedStatOffsets>
+				</value>
+			</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Factions Expanded - Mechanoids</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+			<!-- Mechanoid Hammer -->
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_MechaHammer"]/tools</xpath>
+				<value>
+					<tools>
+						<li Class="CombatExtended.ToolCE">
+							<label>handle</label>
+							<capacities>
+								<li>Poke</li>
+							</capacities>
+							<power>15</power>
+							<chanceFactor>0.1</chanceFactor>
+							<cooldownTime>2.11</cooldownTime>
+							<armorPenetrationBlunt>20</armorPenetrationBlunt>
+							<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+						</li>
+						<li Class="CombatExtended.ToolCE">
+							<label>head</label>
+							<capacities>
+								<li>Demolish</li>
+							</capacities>
+							<power>65</power>
+							<cooldownTime>5.73</cooldownTime>
+							<armorPenetrationBlunt>320</armorPenetrationBlunt>
+						</li>
+					</tools>
+				</value>
+			</li>
+
+			<li Class="PatchOperationAdd">
+				<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_MechaHammer"]/statBases</xpath>
+				<value>
+					<Bulk>24</Bulk>
+					<MeleeCounterParryBonus>2</MeleeCounterParryBonus>
+					<ToughnessRating>20</ToughnessRating>
+				</value>
+			</li>
+
+			<li Class="PatchOperationAdd">
+				<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_MechaHammer"]/equippedStatOffsets</xpath>
+				<value>
+					<MeleeCritChance>0.8</MeleeCritChance>
+					<MeleeParryChance>0.1</MeleeParryChance>
+					<MeleeDodgeChance>0.18</MeleeDodgeChance>
+				</value>
+			</li>
+			
+			<!-- Mechanoid Gauntlet -->
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_MechaGauntlet"]/tools</xpath>
+				<value>
+					<tools>
+						<li Class="CombatExtended.ToolCE">
+							<label>fist</label>
+							<capacities>
+								<li>Blunt</li>
+							</capacities>
+							<power>26</power>
+							<cooldownTime>1.54</cooldownTime>
+							<armorPenetrationBlunt>24</armorPenetrationBlunt>
+						</li>
+					</tools>
+				</value>
+			</li>
+
+			<li Class="PatchOperationAdd">
+				<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_MechaGauntlet"]/statBases</xpath>
+				<value>
+					<Bulk>5</Bulk>
+					<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+					<ToughnessRating>15</ToughnessRating>
+				</value>
+			</li>
+
+			<li Class="PatchOperationAdd">
+				<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_MechaGauntlet"]/equippedStatOffsets</xpath>
+				<value>
+					<MeleeCritChance>0.5</MeleeCritChance>
+					<MeleeParryChance>0.15</MeleeParryChance>
+					<MeleeDodgeChance>0.2</MeleeDodgeChance>
+				</value>
+			</li>
+			
+			<!-- Mechanoid Baton -->
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_MechaBaton"]/tools</xpath>
+				<value>
+					<tools>
+						<li Class="CombatExtended.ToolCE">
+							<label>handle</label>
+							<capacities>
+								<li>Poke</li>
+							</capacities>
+							<power/>
+							<chanceFactor>0.1</chanceFactor>
+							<cooldownTime>2</cooldownTime>
+							<armorPenetrationBlunt>4</armorPenetrationBlunt>
+							<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+						</li>
+						<li Class="CombatExtended.ToolCE">
+							<label>head</label>
+							<capacities>
+								<li>Blunt</li>
+							</capacities>
+							<power>30</power>
+							<cooldownTime>4.5</cooldownTime>
+							<armorPenetrationBlunt>16</armorPenetrationBlunt>
+						</li>
+					</tools>
+				</value>
+			</li>
+
+			<li Class="PatchOperationAdd">
+				<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_MechaBaton"]/statBases</xpath>
+				<value>
+					<Bulk>14</Bulk>
+					<MeleeCounterParryBonus>0.2</MeleeCounterParryBonus>
+					<ToughnessRating>15</ToughnessRating>
+				</value>
+			</li>
+
+			<li Class="PatchOperationAdd">
+				<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_MechaBaton"]/equippedStatOffsets</xpath>
+				<value>
+					<MeleeCritChance>0.75</MeleeCritChance>
+					<MeleeParryChance>0.25</MeleeParryChance>
+					<MeleeDodgeChance>0.2</MeleeDodgeChance>
+				</value>
+			</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/VGP Drinks/Patches/VGP Drinks/VGP_Drinks_CE_Patch.xml b/ModPatches/VGP Drinks/Patches/VGP Drinks/VGP_Drinks_CE_Patch.xml
new file mode 100644
index 0000000000..0d32874470
--- /dev/null
+++ b/ModPatches/VGP Drinks/Patches/VGP Drinks/VGP_Drinks_CE_Patch.xml	
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ====================== Liquor Closet ===================== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="LiquorCloset"]/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>neck</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>0.255</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/VGP Garden Fabrics/Patches/VGP Garden Fabrics/VGP Garden Fabrics.xml b/ModPatches/VGP Garden Fabrics/Patches/VGP Garden Fabrics/VGP Garden Fabrics.xml
new file mode 100644
index 0000000000..c068eab7fb
--- /dev/null
+++ b/ModPatches/VGP Garden Fabrics/Patches/VGP Garden Fabrics/VGP Garden Fabrics.xml	
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- LinenCloth -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Flaxcloth"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.013</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Flaxcloth"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.019</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Flaxcloth"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.044</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<!-- Hemp -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HempCloth"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.012</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HempCloth"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.023</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HempCloth"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.044</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<!-- Blended Wool -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VG_BlendedWool"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.01</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VG_BlendedWool"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.022</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VG_BlendedWool"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.044</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/VRE Android Factions/Patches/VRE Android Factions/Factions_Misc.xml b/ModPatches/VRE Android Factions/Patches/VRE Android Factions/Factions_Misc.xml
new file mode 100644
index 0000000000..efba0e9b78
--- /dev/null
+++ b/ModPatches/VRE Android Factions/Patches/VRE Android Factions/Factions_Misc.xml	
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="R_AndroidTrader"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Ammo</tradeTag>
+				<countRange>
+					<min>200</min>
+					<max>500</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>2</min>
+					<max>4</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_MediumAmmo</tradeTag>
+				<countRange>
+					<min>20</min>
+					<max>50</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>2</min>
+					<max>6</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_HeavyAmmo</tradeTag>
+				<countRange>
+					<min>5</min>
+					<max>10</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>2</min>
+					<max>4</max>
+				</thingDefCountRange>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vampire, Demons, and the Undead/Patches/Vampire, Demons, and the Undead/HediffDefs/VU_Hediff_Patch.xml b/ModPatches/Vampire, Demons, and the Undead/Patches/Vampire, Demons, and the Undead/HediffDefs/VU_Hediff_Patch.xml
new file mode 100644
index 0000000000..50baed98ad
--- /dev/null
+++ b/ModPatches/Vampire, Demons, and the Undead/Patches/Vampire, Demons, and the Undead/HediffDefs/VU_Hediff_Patch.xml	
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="VU_DraculTeeth"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>vampire bite</label>
+					<capacities>
+						<li>VU_DraculBiteCap</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2.0</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>12</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.0</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="VU_WerewolfFangs"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>werewolf bite</label>
+					<capacities>
+						<li>VU_WerewolfBiteCap</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2.0</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>12</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.0</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded - Endangered/Patches/Vanilla Animals Expanded - Endangered/Bodies/Patch_Bodies_Animals.xml b/ModPatches/Vanilla Animals Expanded - Endangered/Patches/Vanilla Animals Expanded - Endangered/Bodies/Patch_Bodies_Animals.xml
new file mode 100644
index 0000000000..8b53e92d79
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded - Endangered/Patches/Vanilla Animals Expanded - Endangered/Bodies/Patch_Bodies_Animals.xml	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Great Ape -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="AEXP_GreatApe_Bonobo"]//*[
+			def="Torso" or
+			def="Neck" or
+			def="Shoulder" or
+			def="Arm" or
+			def="Hand" or
+			def="Leg" or
+			def="Foot" or
+			def="Toe"
+			] </xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="AEXP_GreatApe_Bonobo"]//*[
+			def="Torso" or
+			def="Neck" or
+			def="Head" or
+			def="AnimalJaw" or
+			def="Shoulder" or
+			def="Arm" or
+			def="Hand" or
+			def="Finger" or
+			def="Leg" or
+			def="Foot" or
+			def="Toe"
+			]/groups </xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded - Endangered/Patches/Vanilla Animals Expanded - Endangered/ThingDefs_Races/Endangered_AddClass.xml b/ModPatches/Vanilla Animals Expanded - Endangered/Patches/Vanilla Animals Expanded - Endangered/ThingDefs_Races/Endangered_AddClass.xml
new file mode 100644
index 0000000000..c6d94aa691
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded - Endangered/Patches/Vanilla Animals Expanded - Endangered/ThingDefs_Races/Endangered_AddClass.xml	
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Quadruped === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/ThingDef[
+			defName="AEXP_BlackRhino" or
+			defName="AEXP_Quagga" or
+			defName="AEXP_Panda" or
+			defName="AEXP_Bonobo"
+			]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Quadruped Low === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/ThingDef[
+			defName="AEXP_BlackFootedFerret"
+			]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Humanoid === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/ThingDef[
+			defName="AEXP_RockhopperPenguin"
+			]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded - Endangered/Patches/Vanilla Animals Expanded - Endangered/ThingDefs_Races/Endangered_Animals.xml b/ModPatches/Vanilla Animals Expanded - Endangered/Patches/Vanilla Animals Expanded - Endangered/ThingDefs_Races/Endangered_Animals.xml
new file mode 100644
index 0000000000..480ddecff3
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded - Endangered/Patches/Vanilla Animals Expanded - Endangered/ThingDefs_Races/Endangered_Animals.xml	
@@ -0,0 +1,751 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Black-Footed Ferret === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_BlackFootedFerret"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.27</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.02</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_BlackFootedFerret"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.67</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.67</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.88</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>3.00</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Black Rhino === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_BlackRhino"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.52</MeleeCritChance>
+			<MeleeParryChance>0.27</MeleeParryChance>
+			<ArmorRating_Blunt>8</ArmorRating_Blunt>
+			<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_BlackRhino"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>3.17</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>3.17</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool_2</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2.44</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>2.95</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Panda === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Panda"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.19</MeleeCritChance>
+			<MeleeParryChance>0.11</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Panda"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.9</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.9</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.11</armorPenetrationSharp>
+					<armorPenetrationBlunt>6.5</armorPenetrationBlunt>
+					<chanceFactor>0.7</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4.2</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Quagga === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Quagga"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.14</MeleeCritChance>
+			<MeleeParryChance>0.13</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Quagga"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>bite</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.06</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.9</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Moa === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Moa"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.20</MeleeDodgeChance>
+			<MeleeCritChance>0.06</MeleeCritChance>
+			<MeleeParryChance>0.06</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Moa"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.42</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.08</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.89</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.78</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Rockhopper Penguin === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_RockhopperPenguin"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.08</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_RockhopperPenguin"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>4</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.162</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>6</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.162</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.284</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Tasmanian Devil === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_TasmanianDevil"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.21</MeleeDodgeChance>
+			<MeleeCritChance>0.31</MeleeCritChance>
+			<MeleeParryChance>0.08</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_TasmanianDevil"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === African Wild Dog === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_AfricanWildDog"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.22</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0.04</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_AfricanWildDog"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.8</cooldownTime>
+					<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.8</cooldownTime>
+					<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>1.63</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.380</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Thylacine === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Thylacine"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.22</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0.04</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Thylacine"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.8</cooldownTime>
+					<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.8</cooldownTime>
+					<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>1.63</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.380</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Pangolin === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Pangolin"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.17</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0.13</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Pangolin"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.32</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Pangolin"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.26</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Pangolin"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.55</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.55</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.85</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>8</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.254</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.55</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Bonobo === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Bonobo"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.10</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Bonobo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.56</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.550</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.56</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.550</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.05</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.65</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.95</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded - Royal Animals/Patches/Vanilla Animals Expanded - Royal Animals/ThingDefs_Races/Royal_Animals.xml b/ModPatches/Vanilla Animals Expanded - Royal Animals/Patches/Vanilla Animals Expanded - Royal Animals/ThingDefs_Races/Royal_Animals.xml
new file mode 100644
index 0000000000..7b0541904b
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded - Royal Animals/Patches/Vanilla Animals Expanded - Royal Animals/ThingDefs_Races/Royal_Animals.xml	
@@ -0,0 +1,602 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Angora Rabbit === -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VAERoy_AngoraRabbit"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAERoy_AngoraRabbit"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.24</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAERoy_AngoraRabbit"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Crane === -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VAERoy_Crane"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAERoy_Crane"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+			<MeleeParryChance>0.03</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAERoy_Crane"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.95</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.0</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.75</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Megachicken === -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VAERoy_Megachicken"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAERoy_Megachicken"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.16</MeleeDodgeChance>
+			<MeleeCritChance>0.00</MeleeCritChance>
+			<MeleeParryChance>0.00</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAERoy_Megachicken"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.39</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.096</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.39</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.096</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.192</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Orangutan === -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VAERoy_Orangutan"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAERoy_Orangutan"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.20</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAERoy_Orangutan"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.9</cooldownTime>
+					<chanceFactor>0.7</chanceFactor>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.0</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2</cooldownTime>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3.0</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Peacock === -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VAERoy_Peacock"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAERoy_Peacock"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+			<MeleeParryChance>0.03</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAERoy_Peacock"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2.0</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2.08</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Pheasant === -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VAERoy_Pheasant"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAERoy_Pheasant"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.16</MeleeDodgeChance>
+			<MeleeCritChance>0.00</MeleeCritChance>
+			<MeleeParryChance>0.00</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAERoy_Pheasant"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Quail === -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VAERoy_Quail"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAERoy_Quail"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.16</MeleeDodgeChance>
+			<MeleeCritChance>0.00</MeleeCritChance>
+			<MeleeParryChance>0.00</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAERoy_Quail"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.39</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.096</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.39</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.096</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.192</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Royal tiger === -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VAERoy_RoyalTiger"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAERoy_RoyalTiger"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.09</MeleeCritChance>
+			<MeleeParryChance>0.07</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAERoy_RoyalTiger"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>0.9</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>24</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>0.84</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>24</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>28</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Swan === -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VAERoy_Swan"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAERoy_Swan"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+			<MeleeParryChance>0.03</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAERoy_Swan"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>7.5</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2.08</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/Bodies/Patch_Bodies_Animals.xml b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/Bodies/Patch_Bodies_Animals.xml
new file mode 100644
index 0000000000..16dcc0e581
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/Bodies/Patch_Bodies_Animals.xml	
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- bipedal lizard -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="VAEWaste_BipedalLizard"]//*[
+			def="Body" or
+			def="Tail" or
+			def="Neck" or
+			def="Arm" or
+			def="Leg"
+			] </xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="VAEWaste_BipedalLizard"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Head" or
+			def="AnimalJaw" or
+			def="Leg" or
+			def="Arm"
+			]/groups </xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- hydra -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="VAEWaste_Hydra"]//*[
+			def="SnakeBody"
+			] </xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="VAEWaste_Hydra"]//*[
+			def="SnakeBody" or
+			def="SnakeHead" or
+			def="SnakeMouth"
+			]/groups </xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- large lizardlike -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="VAEWaste_LargeLizardlike"]//*[
+			def="Body" or
+			def="Tail" or
+			def="Neck" or
+			def="Leg"
+			] </xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="VAEWaste_LargeLizardlike"]//*[
+			def="Body" or
+			def="Tail" or
+			def="Neck" or
+			def="Head" or
+			def="AnimalJaw" or
+			def="Leg"
+			]/groups </xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- megatardi -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="VAEWaste_Megatardi"]//*[
+			def="Shell" or
+			def="Elytra" or
+			def="Pronotum" or
+			def="InsectNostril" or
+			def="Antenna" or
+			def="InsectLeg"
+			] </xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="VAEWaste_Megatardi"]//*[
+			def="InsectMouth" or
+			def="InsectNostril"
+			]/groups </xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="VAEWaste_Megatardi"]//*[
+			def="Shell" or
+			def="Elytra" or
+			def="Pronotum" or
+			def="InsectHead" or
+			def="InsectNostril" or
+			def="InsectMouth" or
+			def="Antenna" or
+			def="InsectLeg"
+			]/groups </xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- double headed quadruped animal -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="VAEWaste_Wasteffalo_Body"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Hoof"
+			] </xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="VAEWaste_Wasteffalo_Body"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Head" or
+			def="AnimalJaw" or
+			def="Leg" or
+			def="Hoof"
+			]/groups </xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- wasteboar -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="VAEWaste_Wasteboar"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Hoof"
+			] </xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="VAEWaste_Wasteboar"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Head" or
+			def="AnimalJaw" or
+			def="Leg" or
+			def="Hoof"
+			]/groups </xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- scorpionlike body -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="VAEWaste_ScorpionLike"]//*[
+			def="Shell" or
+			def="VAEWaste_Thorax" or
+			def="Pronotum" or
+			def="VAEWaste_InsectTail"
+			] </xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="VAEWaste_ScorpionLike"]//*[
+			def="Shell" or
+			def="VAEWaste_Thorax" or
+			def="Pronotum" or
+			def="InsectHead" or
+			def="VAEWaste_InsectMouth" or
+			def="VAEWaste_InsectSting" or
+			def="VAEWaste_InsectTail"
+			]/groups </xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Items/WasteAnimals_Items.xml b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Items/WasteAnimals_Items.xml
new file mode 100644
index 0000000000..4e716d5285
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Items/WasteAnimals_Items.xml	
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAEWaste_ToxicLeather"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.045</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAEWaste_ToxicLeather"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.02</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAEWaste_ToxicLeather"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.009</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Misc/WasteAnimals_Projectiles.xml b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Misc/WasteAnimals_Projectiles.xml
new file mode 100644
index 0000000000..ef6a232c65
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Misc/WasteAnimals_Projectiles.xml	
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ============== Changing Projectile's thingClass to CE ones ================ -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAEWaste_AcidBolt"]</xpath>
+		<value>
+			<thingClass>CombatExtended.BulletCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAEWaste_AcidBolt"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>VAEWaste_AcidBolt</damageDef>
+				<damageAmountBase>10</damageAmountBase>
+				<speed>40</speed>
+				<armorPenetrationSharp>2.5</armorPenetrationSharp>
+				<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+
+	<!-- ============== Adding 'Standard' AimingAccuracy node to creatures' that use ranged attack statBases. =============== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Toxiguana"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.6</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Toxiguana"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>VAEWaste_AcidBolt</defaultProjectile>
+					<warmupTime>2</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<minRange>2</minRange>
+					<range>25</range>
+					<soundCast>VAEWaste_PoisonBolt</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>acid spit</label>
+					<commonality>0.8</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Base.xml b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Base.xml
new file mode 100644
index 0000000000..aa2383d794
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Base.xml	
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="VAEWaste_BaseInsect"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<useStatic>false</useStatic>
+						<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+						<parts>
+							<li>InsectLeg</li>
+						</parts>
+					</li>
+					<li>
+						<useStatic>false</useStatic>
+						<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
+						<parts>
+							<li>InsectLeg</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="VAEWaste_BaseInsect"]/statBases</xpath>
+		<value>
+			<PartialArmorBody>0</PartialArmorBody>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Hydra.xml b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Hydra.xml
new file mode 100644
index 0000000000..de28374017
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Hydra.xml	
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Hydra"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Serpentine</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Hydra"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.17</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Hydra"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>venom-fangs</label>
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<cooldownTime>0.5</cooldownTime>
+					<power>6</power>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>0.67</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.225</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Megatardi.xml b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Megatardi.xml
new file mode 100644
index 0000000000..abdaca88f8
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Megatardi.xml	
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Megatardi"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Megatardi"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Megatardi"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Megatardi"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.06</MeleeDodgeChance>
+			<MeleeCritChance>0.21</MeleeCritChance>
+			<MeleeParryChance>0.20</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Megatardi"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<cooldownTime>1.0</cooldownTime>
+					<power>3</power>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.0</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.1</chanceFactor>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Megatardi"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VAEWaste_Megatardi"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Megatardi"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1125</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Pestigator.xml b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Pestigator.xml
new file mode 100644
index 0000000000..765a14575b
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Pestigator.xml	
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Pestigator"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Pestigator"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>21</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Pestigator"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Pestigator"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.3</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Pestigator"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>VAEWaste_RippingBite</li>
+					</capacities>
+					<cooldownTime>1.5</cooldownTime>
+					<power>20</power>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>3.0</armorPenetrationSharp>
+					<armorPenetrationBlunt>15.0</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Pestigator"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VAEWaste_Pestigator"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Pestigator"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1500</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxafox.xml b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxafox.xml
new file mode 100644
index 0000000000..c79a45f738
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxafox.xml	
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Toxafox"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Toxafox"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.28</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+			<MeleeParryChance>0.02</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Toxafox"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.91</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.198</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.91</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.198</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.49</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>1.440</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxbear.xml b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxbear.xml
new file mode 100644
index 0000000000..c028ead569
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxbear.xml	
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Toxbear"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Toxbear"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>2.5</MoveSpeed>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.3</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Toxbear"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.32</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationSharp>1.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.44</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxiguana.xml b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxiguana.xml
new file mode 100644
index 0000000000..b001bed013
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxiguana.xml	
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Toxiguana"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Serpentine</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Toxiguana"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.14</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+			<MeleeParryChance>0.06</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Toxiguana"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.89</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.24</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxlion.xml b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxlion.xml
new file mode 100644
index 0000000000..afca1f15a2
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxlion.xml	
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Toxlion"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Toxlion"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.19</MeleeDodgeChance>
+			<MeleeCritChance>0.18</MeleeCritChance>
+			<MeleeParryChance>0.17</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Toxlion"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>VAEWaste_FluClaws</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1</cooldownTime>
+					<chanceFactor>0.3</chanceFactor>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>16</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.06</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.22</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>VAEWaste_FluClaws</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1</cooldownTime>
+					<chanceFactor>0.3</chanceFactor>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>16</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.06</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.22</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>VAEWaste_FluBite</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>16</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<chanceFactor>0.3</chanceFactor>
+					<armorPenetrationSharp>1.66</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.35</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.5</cooldownTime>
+					<chanceFactor>0.7</chanceFactor>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.66</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.35</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxscorpion.xml b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxscorpion.xml
new file mode 100644
index 0000000000..db3fc6340a
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxscorpion.xml	
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Toxscorpion"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Toxscorpion"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4.8</MoveSpeed>
+			<MeleeDodgeChance>0.07</MeleeDodgeChance>
+			<MeleeCritChance>0.5</MeleeCritChance>
+			<MeleeParryChance>0.39</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Toxscorpion"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>14</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Toxscorpion"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>7</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Toxscorpion"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left pincer</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>37</power>
+					<cooldownTime>2.72</cooldownTime>
+					<linkedBodyPartsGroup>VAEWaste_PincerAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>3.54</armorPenetrationSharp>
+					<armorPenetrationBlunt>61.875</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right pincer</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>37</power>
+					<cooldownTime>2.72</cooldownTime>
+					<linkedBodyPartsGroup>VAEWaste_PincerAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>3.54</armorPenetrationSharp>
+					<armorPenetrationBlunt>61.875</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>VAEWaste_Sting</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>VAEWaste_Sting</linkedBodyPartsGroup>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>2.46</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.1</chanceFactor>
+					<armorPenetrationBlunt>10.8</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Toxscorpion"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<useStatic>false</useStatic>
+						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+						<parts>
+							<li>VAEWaste_LeftPincer</li>
+							<li>VAEWaste_RightPincer</li>
+						</parts>
+					</li>
+					<li>
+						<useStatic>false</useStatic>
+						<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
+						<parts>
+							<li>VAEWaste_LeftPincer</li>
+							<li>VAEWaste_RightPincer</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Toxscorpion"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VAEWaste_Toxscorpion"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Toxscorpion"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1125</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Wasteboar.xml b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Wasteboar.xml
new file mode 100644
index 0000000000..5d986941d4
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Wasteboar.xml	
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Wasteboar"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Wasteboar"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.16</MeleeDodgeChance>
+			<MeleeCritChance>0.09</MeleeCritChance>
+			<MeleeParryChance>0.07</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Wasteboar"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tusk</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.89</cooldownTime>
+					<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.0</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>tusk</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.41</cooldownTime>
+					<chanceFactor>0.65</chanceFactor>
+					<linkedBodyPartsGroup>TuskAttackTool_2</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.0</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.57</cooldownTime>
+					<chanceFactor>0.6</chanceFactor>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Wastedeer.xml b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Wastedeer.xml
new file mode 100644
index 0000000000..88fef4ffbd
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Wastedeer.xml	
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Wastedeer"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Wastedeer"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.26</MeleeDodgeChance>
+			<MeleeCritChance>0.14</MeleeCritChance>
+			<MeleeParryChance>0.08</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Wastedeer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.66</cooldownTime>
+					<chanceFactor>0.7</chanceFactor>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.750</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.97</cooldownTime>
+					<restrictedGender>Female</restrictedGender>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Wasteffalo.xml b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Wasteffalo.xml
new file mode 100644
index 0000000000..d29219ef56
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Wasteffalo.xml	
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Wasteffalo"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Wasteffalo"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>5</MoveSpeed>
+			<MeleeDodgeChance>0.14</MeleeDodgeChance>
+			<MeleeCritChance>0.32</MeleeCritChance>
+			<MeleeParryChance>0.24</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAEWaste_Wasteffalo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.2</cooldownTime>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.2</cooldownTime>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.2</cooldownTime>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.2</cooldownTime>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.8</cooldownTime>
+					<chanceFactor>0.5</chanceFactor>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_AddClass.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_AddClass.xml
new file mode 100644
index 0000000000..ec45eb6c87
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_AddClass.xml	
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Quadruped === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/ThingDef[
+			defName="AEXP_Coyote" or
+			defName="AEXP_Hippopotamus" or
+			defName="AEXP_Zebra" or
+			defName="AEXP_Wildebeest" or
+			defName="AEXP_Cheetah"]
+		</xpath>
+
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Quadruped Low === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AEXP_Crocodile"]</xpath>
+
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Birdlike === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AEXP_Giraffe"]</xpath>
+
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_Animals.xml
new file mode 100644
index 0000000000..6acc72b8d0
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_Animals.xml	
@@ -0,0 +1,453 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Cheetah === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Cheetah"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.46</MeleeDodgeChance>
+			<MeleeCritChance>0.27</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Cheetah"]</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>0.7</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.17</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.81</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>0.7</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.17</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.81</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>bite</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>6.64</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.46</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Coyote === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Coyote"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.27</MeleeDodgeChance>
+			<MeleeCritChance>0.06</MeleeCritChance>
+			<MeleeParryChance>0.03</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Coyote"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.9</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.06</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.22</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.9</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.06</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.22</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>bite</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.13</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Crocodile === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Crocodile"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.24</MeleeCritChance>
+			<MeleeParryChance>0.31</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Crocodile"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>bite</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>33</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.7</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Giraffe === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Giraffe"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.45</MeleeCritChance>
+			<MeleeParryChance>0.39</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Giraffe"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>bite</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2.2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Hippo === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Hippopotamus"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.07</MeleeDodgeChance>
+			<MeleeCritChance>0.6</MeleeCritChance>
+			<MeleeParryChance>0.35</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Hippopotamus"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>45</power>
+					<cooldownTime>3.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>45</power>
+					<cooldownTime>3.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>bite</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2.7</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<armorPenetrationBlunt>8.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>4</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>6.4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Wildebeest === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Wildebeest"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>0.13</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Wildebeest"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.72</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.72</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>bite</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Zebra === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Zebra"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.14</MeleeCritChance>
+			<MeleeParryChance>0.13</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Zebra"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>bite</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.06</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.9</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_Resources.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_Resources.xml
new file mode 100644
index 0000000000..d7de5a2526
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_Resources.xml	
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Hippo Leather === -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="AEXP_Leather_Hippopotamus"]/statBases/StuffPower_Armor_Sharp</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Leather_Hippopotamus"]/statBases</xpath>
+
+		<value>
+			<StuffPower_Armor_Sharp>0.1</StuffPower_Armor_Sharp>
+			<StuffPower_Armor_Blunt>0.08</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Wildebeest Leather === -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="AEXP_Leather_Wildebeest"]/statBases/StuffPower_Armor_Sharp</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Leather_Wildebeest"]/statBases</xpath>
+
+		<value>
+			<StuffPower_Armor_Sharp>0.08</StuffPower_Armor_Sharp>
+			<StuffPower_Armor_Blunt>0.064</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Australia_AddClass.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Australia_AddClass.xml
new file mode 100644
index 0000000000..618d4cf858
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Australia_AddClass.xml	
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Quadruped === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AEXP_Kangaroo"]</xpath>
+
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === QuadrupedLow === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AEXP_Boombat" or defName="AEXP_Koala" or defName="AEXP_Platypus"]</xpath>
+
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Australia_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Australia_Animals.xml
new file mode 100644
index 0000000000..8a9026034b
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Australia_Animals.xml	
@@ -0,0 +1,310 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Boombat === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Boombat"]/tradeTags</xpath>
+
+		<value>
+			<li>CE_AnimalBoom</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Boombat"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.10</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Boombat"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>0.95</cooldownTime>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>0.95</cooldownTime>
+					<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.2</cooldownTime>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "AEXP_Boombat"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "AEXP_Boombat"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Boombat"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ShearableRenameable">
+				<compClass>CombatExtended.CompShearableRenameable</compClass>
+				<growthLabel>Secretion level</growthLabel>
+				<shearIntervalDays>3</shearIntervalDays>
+				<woolAmount>1</woolAmount>
+				<woolDef>FSX</woolDef>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Boombat"]</xpath>
+		<value>
+			<butcherProducts>
+				<FSX>2</FSX>
+			</butcherProducts>
+		</value>
+	</Operation>
+
+	<!-- === Kangaroo === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Kangaroo"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.27</MeleeDodgeChance>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.20</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Kangaroo"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Scratch</li>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>0.95</cooldownTime>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<linkedBodyPartsGroup>AEXP_RearLeftClaws</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Scratch</li>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>0.95</cooldownTime>
+					<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<linkedBodyPartsGroup>AEXP_RearRightClaws</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Koala === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Koala"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Koala"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.95</cooldownTime>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.95</cooldownTime>
+					<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.2</cooldownTime>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Platypus === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Platypus"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.12</MeleeDodgeChance>
+			<MeleeCritChance>0.11</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Platypus"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.95</cooldownTime>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.95</cooldownTime>
+					<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.33</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.06</armorPenetrationSharp>
+					<linkedBodyPartsGroup>AEXP_RearLeftSpur</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.33</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.06</armorPenetrationSharp>
+					<linkedBodyPartsGroup>AEXP_RearRightSpur</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.2</cooldownTime>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Australia_Resources.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Australia_Resources.xml
new file mode 100644
index 0000000000..783d8a1461
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Australia_Resources.xml	
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Platypus Leather === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Leather_Platypus"]/statBases</xpath>
+
+		<value>
+			<StuffPower_Armor_Blunt>0.06</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/BorealForest_AddClass.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/BorealForest_AddClass.xml
new file mode 100644
index 0000000000..dce8688cd6
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/BorealForest_AddClass.xml	
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Quadruped === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AEXP_ArcticCoyote" or defName="AEXP_BlackBear"]</xpath>
+
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Serpentine === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AEXP_Otter"]</xpath>
+
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/BorealForest_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/BorealForest_Animals.xml
new file mode 100644
index 0000000000..63bf1982af
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/BorealForest_Animals.xml	
@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Artic Coyote === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_ArcticCoyote"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.26</MeleeDodgeChance>
+			<MeleeCritChance>0.08</MeleeCritChance>
+			<MeleeParryChance>0.04</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_ArcticCoyote"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.056</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.216</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.056</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.216</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>2</cooldownTime>
+					<chanceFactor>0.7</chanceFactor>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.10</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.13</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Black Bear === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_BlackBear"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_BlackBear"]</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.9</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.9</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.11</armorPenetrationSharp>
+					<armorPenetrationBlunt>6.5</armorPenetrationBlunt>
+					<chanceFactor>0.7</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4.2</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Otter === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Otter"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.24</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+			<MeleeParryChance>0.03</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Otter"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.02</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.02</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.01</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.2</cooldownTime>
+					<chanceFactor>0.2</chanceFactor>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.03</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/CatsAndDogs_AddClass.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/CatsAndDogs_AddClass.xml
new file mode 100644
index 0000000000..e73470ddcc
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/CatsAndDogs_AddClass.xml	
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Quadruped === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/ThingDef[
+			defName="AEXP_Rottweiler" or
+			defName="AEXP_GermanShepherd" or
+			defName="AEXP_GreatDane" or
+			defName="AEXP_Poodle" or
+			defName="AEXP_Beagle" or
+			defName="AEXP_Chihuahua" or
+			defName="AEXP_Corgi" or
+			defName="AEXP_FrenchBulldog" or
+			defName="AEXP_Pug" or
+			defName="AEXP_Shih-Tzu" or
+			defName="AEXP_WelshTerrier" or
+			defName="AEXP_CatAbyssinian" or
+			defName="AEXP_CatBengal" or
+			defName="AEXP_CatBritishShorthair" or
+			defName="AEXP_CatMaineCoon" or
+			defName="AEXP_CatMunchkin" or
+			defName="AEXP_CatNorwegianForest" or
+			defName="AEXP_CatPersian" or
+			defName="AEXP_CatSiamese" or
+			defName="AEXP_CatSomali" or
+			defName="AEXP_CatSphynx"]
+		</xpath>
+
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/CatsAndDogs_Cats.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/CatsAndDogs_Cats.xml
new file mode 100644
index 0000000000..b274b466a1
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/CatsAndDogs_Cats.xml	
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/ThingDef[
+			defName="AEXP_CatAbyssinian" or
+			defName="AEXP_CatBengal" or
+			defName="AEXP_CatBritishShorthair" or
+			defName="AEXP_CatMaineCoon" or
+			defName="AEXP_CatMunchkin" or
+			defName="AEXP_CatNorwegianForest" or
+			defName="AEXP_CatPersian" or
+			defName="AEXP_CatSiamese" or
+			defName="AEXP_CatSomali" or
+			defName="AEXP_CatSphynx"]/statBases
+		</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName="AEXP_CatAbyssinian" or
+			defName="AEXP_CatBengal" or
+			defName="AEXP_CatBritishShorthair" or
+			defName="AEXP_CatMaineCoon" or
+			defName="AEXP_CatMunchkin" or
+			defName="AEXP_CatNorwegianForest" or
+			defName="AEXP_CatPersian" or
+			defName="AEXP_CatSiamese" or
+			defName="AEXP_CatSomali" or
+			defName="AEXP_CatSphynx"]/tools
+		</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.55</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.55</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.85</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.254</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>0.55</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/CatsAndDogs_Dogs.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/CatsAndDogs_Dogs.xml
new file mode 100644
index 0000000000..7799d421fa
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/CatsAndDogs_Dogs.xml	
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Small Dogs === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/ThingDef[
+			defName="AEXP_Beagle" or
+			defName="AEXP_Chihuahua" or
+			defName="AEXP_Corgi" or
+			defName="AEXP_FrenchBulldog" or
+			defName="AEXP_Pug" or
+			defName="AEXP_Shih-Tzu" or
+			defName="AEXP_WelshTerrier"]/statBases
+		</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.17</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName="AEXP_Beagle" or
+			defName="AEXP_Chihuahua" or
+			defName="AEXP_Corgi" or
+			defName="AEXP_FrenchBulldog" or
+			defName="AEXP_Pug" or
+			defName="AEXP_Shih-Tzu" or
+			defName="AEXP_WelshTerrier"]/tools
+		</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.62</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.62</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.66</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>0.62</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Big Dogs (Labrador) === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_GreatDane" or defName="AEXP_Poodle"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.20</MeleeDodgeChance>
+			<MeleeCritChance>0.06</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_GreatDane" or defName="AEXP_Poodle"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.99</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.99</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.77</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.880</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.19</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Rottweiler / German Shepherd (Husky) === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Rottweiler" or defName="AEXP_GermanShepherd"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Rottweiler" or defName="AEXP_GermanShepherd"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.8</cooldownTime>
+					<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.8</cooldownTime>
+					<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>1.63</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.380</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_AddClass.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_AddClass.xml
new file mode 100644
index 0000000000..c56b0beeeb
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_AddClass.xml	
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Quadruped === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AEXP_Hyena" or defName="AEXP_Lion"]</xpath>
+
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Quadruped Low === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AEXP_DesertTortoise" or defName="AEXP_GilaMonster"]</xpath>
+
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_Animals.xml
new file mode 100644
index 0000000000..61bf0c93ba
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_Animals.xml	
@@ -0,0 +1,297 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Desert Tortoise === -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AEXP_DesertTortoise"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<useStatic>false</useStatic>
+						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<useStatic>false</useStatic>
+						<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_DesertTortoise"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.02</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_DesertTortoise"]/statBases/ArmorRating_Blunt</xpath>
+
+		<value>
+			<ArmorRating_Blunt>10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_DesertTortoise"]/statBases/ArmorRating_Sharp</xpath>
+
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_DesertTortoise"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>beak</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>TurtleBeakAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.700</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Gila Monster === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_GilaMonster"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0</MeleeCritChance>
+			<MeleeParryChance>0</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_GilaMonster"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>ToxicBite</label>
+					<capacities>
+						<li>AEXP_GilaVenomousBite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Hyena === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Hyena"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.21</MeleeDodgeChance>
+			<MeleeCritChance>0.11</MeleeCritChance>
+			<MeleeParryChance>0.07</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Hyena"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.06</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.22</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.06</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.22</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>bite</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.66</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.35</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.13</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Lion === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Lion"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.19</MeleeDodgeChance>
+			<MeleeCritChance>0.18</MeleeCritChance>
+			<MeleeParryChance>0.17</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Lion"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>17</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>17</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.2</armorPenetrationBlunt>
+					<chanceFactor>0.7</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_Resources.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_Resources.xml
new file mode 100644
index 0000000000..4e9dce5b06
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_Resources.xml	
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Lion Leather === -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="AEXP_Leather_Lion"]/statBases/StuffPower_Armor_Sharp</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Leather_Lion"]/statBases</xpath>
+
+		<value>
+			<StuffPower_Armor_Sharp>0.07</StuffPower_Armor_Sharp>
+			<StuffPower_Armor_Blunt>0.056</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/ExtremeDesert_AddClass.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/ExtremeDesert_AddClass.xml
new file mode 100644
index 0000000000..d8dfcf1aca
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/ExtremeDesert_AddClass.xml	
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Quadruped === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AEXP_Camel"]</xpath>
+
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Quadruped Low === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AEXP_Megascorpion"]</xpath>
+
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Serpentine === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AEXP_Rattlesnake"]</xpath>
+
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Serpentine</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/ExtremeDesert_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/ExtremeDesert_Animals.xml
new file mode 100644
index 0000000000..ee4d22e2bd
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/ExtremeDesert_Animals.xml	
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Camel === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Camel"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.38</MeleeCritChance>
+			<MeleeParryChance>0.18</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Camel"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.7</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.7</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Megarscorpion === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Megascorpion"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.19</MeleeDodgeChance>
+			<MeleeCritChance>0.33</MeleeCritChance>
+			<MeleeParryChance>0.17</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Megascorpion"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stinger</label>
+					<capacities>
+						<li>AEXP_MegascorpionVenomousBite</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.13</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.11</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Rattlesnake === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Rattlesnake"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.19</MeleeDodgeChance>
+			<MeleeCritChance>0.18</MeleeCritChance>
+			<MeleeParryChance>0.17</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Rattlesnake"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fangs</label>
+					<capacities>
+						<li>AEXP_RattleSnakeVenomousBite</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.4</cooldownTime>
+					<armorPenetrationSharp>1.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2</cooldownTime>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_AddClass.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_AddClass.xml
new file mode 100644
index 0000000000..7e03875584
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_AddClass.xml	
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Quadruped Low === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AEXP_Seal" or defNAme="AEXP_Walrus"]
+		</xpath>
+
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Birdlike === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AEXP_Penguin"]</xpath>
+
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_Animals.xml
new file mode 100644
index 0000000000..c1329a4064
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_Animals.xml	
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Penguin === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Penguin"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.10</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Penguin"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.48</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>beak</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.5</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Seal === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Seal"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.08</MeleeDodgeChance>
+			<MeleeCritChance>0.41</MeleeCritChance>
+			<MeleeParryChance>0.3</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Seal"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fore-flipper</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>AEXP_ForeFlipers</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fore-flipper</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>AEXP_ForeFlipers</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.3</cooldownTime>
+					<chanceFactor>1.7</chanceFactor>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>3</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Walrus === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Walrus"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.06</MeleeDodgeChance>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.23</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Walrus"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tusks</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>32</power>
+					<cooldownTime>1.6</cooldownTime>
+					<chanceFactor>1.2</chanceFactor>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.19</armorPenetrationSharp>
+					<armorPenetrationBlunt>14.45</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.7</cooldownTime>
+					<chanceFactor>0.2</chanceFactor>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>9</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_Resources.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_Resources.xml
new file mode 100644
index 0000000000..3e5abb546a
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_Resources.xml	
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Walrus Tusk === -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="AEXP_WalrusTusk"]/tools</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="AEXP_WalrusTusk"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>ResourceBase</value>
+	</Operation>
+
+	<!-- === Pinniped Leather === -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="AEXP_Leather_Pinniped"]/statBases/StuffPower_Armor_Sharp</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Leather_Pinniped"]/statBases</xpath>
+
+		<value>
+			<StuffPower_Armor_Sharp>0.07</StuffPower_Armor_Sharp>
+			<StuffPower_Armor_Blunt>0.056</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TemperateForest_AddClass.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TemperateForest_AddClass.xml
new file mode 100644
index 0000000000..a5c2be2d7e
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TemperateForest_AddClass.xml	
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Quadruped Low === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AEXP_RedPanda" or defName="AEXP_Hedgehog" or defName="AEXP_Badger" or defName="AEXP_Beaver"]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/ThingDef[
+			defName="AEXP_WildGoose"]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TemperateForest_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TemperateForest_Animals.xml
new file mode 100644
index 0000000000..d16248d773
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TemperateForest_Animals.xml	
@@ -0,0 +1,358 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Red Panda === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_RedPanda"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.16</MeleeDodgeChance>
+			<MeleeCritChance>0.03</MeleeCritChance>
+			<MeleeParryChance>0.02</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_RedPanda"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.55</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>7</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.55</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>7</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.85</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>8</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.254</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.55</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Badger === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Badger"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.21</MeleeDodgeChance>
+			<MeleeCritChance>0.31</MeleeCritChance>
+			<MeleeParryChance>0.08</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Badger"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Wild Goose ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_WildGoose"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.03</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_WildGoose"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.92</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.08</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.352</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.58</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.16</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.92</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.352</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AEXP_WildGoose"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Beaver === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Beaver"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.22</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Beaver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.18</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.18</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.65</cooldownTime>
+					<armorPenetrationBlunt>3.375</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.35</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.65</cooldownTime>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Hedgehog === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Hedgehog"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.19</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Hedgehog"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.67</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.67</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.88</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>3.00</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_AddClass.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_AddClass.xml
new file mode 100644
index 0000000000..f4eb4f28ca
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_AddClass.xml	
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Quadruped === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/ThingDef[
+			defName="AEXP_Gorilla" or
+			defName="AEXP_Jaguar" or
+			defName="AEXP_Tiger" or
+			defName="AEXP_Tapir"]
+		</xpath>
+
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Quadruped Low === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AEXP_Lemur"]</xpath>
+
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Humanoid === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AEXP_Mandrill"]
+		</xpath>
+
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_Animals.xml
new file mode 100644
index 0000000000..9d8a8d8c53
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_Animals.xml	
@@ -0,0 +1,350 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Gorilla === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Gorilla"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.20</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Gorilla"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1</cooldownTime>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>17</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1</cooldownTime>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>17</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>33</power>
+					<cooldownTime>1.9</cooldownTime>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>9.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2</cooldownTime>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>4.32</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Jaguar === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Jaguar"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.26</MeleeDodgeChance>
+			<MeleeCritChance>0.20</MeleeCritChance>
+			<MeleeParryChance>0.07</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<!-- === Lemur === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Lemur"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Lemur"]/tools</xpath>
+		<value>
+			<tools>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Mandrill === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Mandrill"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.04</MeleeCritChance>
+			<MeleeParryChance>0.02</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Mandrill"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.7</chanceFactor>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.576</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Tapir === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Tapir"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.11</MeleeDodgeChance>
+			<MeleeCritChance>0.16</MeleeCritChance>
+			<MeleeParryChance>0.08</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Tapir"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.1</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Tiger === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Tiger"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.27</MeleeDodgeChance>
+			<MeleeCritChance>0.50</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Tiger"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>17</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>17</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.35</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.46</armorPenetrationBlunt>
+					<chanceFactor>0.7</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_Resources.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_Resources.xml
new file mode 100644
index 0000000000..d79c60c1fa
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_Resources.xml	
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tiger Leather === -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>
+			Defs/ThingDef[defName="AEXP_Leather_Tiger"]/statBases/StuffPower_Armor_Sharp |
+			Defs/ThingDef[defName="AEXP_Leather_Tiger"]/statBases/StuffPower_Armor_Blunt
+		</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Leather_Tiger"]/statBases</xpath>
+
+		<value>
+			<StuffPower_Armor_Sharp>0.07</StuffPower_Armor_Sharp>
+			<StuffPower_Armor_Blunt>0.056</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalSwamp_AddClass.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalSwamp_AddClass.xml
new file mode 100644
index 0000000000..1d88376a2a
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalSwamp_AddClass.xml	
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === QuadrupedLow === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AEXP_Alligator"]</xpath>
+
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Serpentine === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AEXP_Anaconda"]</xpath>
+
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Serpentine</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Quadruped === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AEXP_IndianElephant"]</xpath>
+
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalSwamp_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalSwamp_Animals.xml
new file mode 100644
index 0000000000..5b19f5d505
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalSwamp_Animals.xml	
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Alligator === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Alligator"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.24</MeleeCritChance>
+			<MeleeParryChance>0.31</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Alligator"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>bite</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.2</cooldownTime>
+					<armorPenetrationSharp>3.15</armorPenetrationSharp>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Anaconda === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Anaconda"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.19</MeleeDodgeChance>
+			<MeleeCritChance>0.18</MeleeCritChance>
+			<MeleeParryChance>0.17</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Anaconda"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>bite</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.10</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>25</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2</cooldownTime>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Indian Elephant === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_IndianElephant"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.10</MeleeDodgeChance>
+			<MeleeCritChance>0.50</MeleeCritChance>
+			<MeleeParryChance>0.30</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_IndianElephant"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.4</cooldownTime>
+					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Tundra_AddClass.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Tundra_AddClass.xml
new file mode 100644
index 0000000000..e7acedf5e5
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Tundra_AddClass.xml	
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Quadruped === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AEXP_Muskox" or defName="AEXP_Moose" or defName="AEXP_MegaWolverine"]</xpath>
+
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Quadruped Low === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AEXP_Porcupine"]</xpath>
+
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Tundra_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Tundra_Animals.xml
new file mode 100644
index 0000000000..9d865bc28f
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Tundra_Animals.xml	
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Mega Wolverine === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_MegaWolverine"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.07</MeleeDodgeChance>
+			<MeleeCritChance>0.59</MeleeCritChance>
+			<MeleeParryChance>0.29</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_MegaWolverine"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>29</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.33</armorPenetrationSharp>
+					<armorPenetrationBlunt>11.25</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>29</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.33</armorPenetrationSharp>
+					<armorPenetrationBlunt>11.25</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>44</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>3.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>38</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>2.8</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Moose === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Moose"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.07</MeleeDodgeChance>
+			<MeleeCritChance>0.14</MeleeCritChance>
+			<MeleeParryChance>0.14</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Moose"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>bite</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.44</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.69</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.7</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Musk Ox === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Muskox"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.17</MeleeDodgeChance>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Muskox"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.44</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.69</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Porcupine === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_Porcupine"]/statBases</xpath>
+
+		<value>
+			<MeleeDodgeChance>0.01</MeleeDodgeChance>
+			<MeleeCritChance>0</MeleeCritChance>
+			<MeleeParryChance>0.02</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AEXP_Porcupine"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.7</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.22</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.7</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.22</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>bite</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.08</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.16</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Tundra_Resources.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Tundra_Resources.xml
new file mode 100644
index 0000000000..0aa81d6678
--- /dev/null
+++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Tundra_Resources.xml	
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Musk Ox Wool === -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="AEXP_MuskOxWool"]/statBases/StuffPower_Armor_Sharp</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_MuskOxWool"]/statBases</xpath>
+
+		<value>
+			<StuffPower_Armor_Sharp>0.02</StuffPower_Armor_Sharp>
+			<StuffPower_Armor_Blunt>0.03</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Apparel Expanded - Accessories/Patches/Vanilla Apparel Expanded - Accessories/Apparel_Utility.xml b/ModPatches/Vanilla Apparel Expanded - Accessories/Patches/Vanilla Apparel Expanded - Accessories/Apparel_Utility.xml
new file mode 100644
index 0000000000..67542028b8
--- /dev/null
+++ b/ModPatches/Vanilla Apparel Expanded - Accessories/Patches/Vanilla Apparel Expanded - Accessories/Apparel_Utility.xml	
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- == Backpack == -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VAE_Accessories.CaravanCapacityApparelDef[defName="VAEA_Apparel_Backpack"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VAE_Accessories.CaravanCapacityApparelDef[defName="VAEA_Apparel_Backpack"]/carryingCapacity</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>30</CarryBulk>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VAE_Accessories.CaravanCapacityApparelDef[defName="VAEA_Apparel_Backpack"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>Shoulders</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VAE_Accessories.CaravanCapacityApparelDef[defName="VAEA_Apparel_Backpack"]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>Backpack</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<!-- == Banner == -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAEA_Apparel_BattleBanner"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAEA_Apparel_BattleBanner"]/equippedStatOffsets</xpath>
+		<value>
+			<Suppressability>-0.25</Suppressability>
+		</value>
+	</Operation>
+
+	<!-- == Medbag, Toolbelt == -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAEA_Apparel_MedicBag" or defName="VAEA_Apparel_ToolBelt"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAEA_Apparel_MedicBag" or defName="VAEA_Apparel_ToolBelt"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>5</CarryBulk>
+		</value>
+	</Operation>
+
+	<!-- == Quiver, Ammobag == -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAEA_Apparel_Quiver" or defName="VAEA_Apparel_AmmoPack"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAEA_Apparel_Quiver"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>2.5</CarryBulk>
+				<ReloadSpeed>0.1</ReloadSpeed>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAEA_Apparel_AmmoPack"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>3.5</CarryBulk>
+				<ReloadSpeed>0.1</ReloadSpeed>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- == Explosive Belt == -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAEA_Apparel_ExplosiveBelt"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAEA_Apparel_ExplosiveBelt"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>5</Steel>
+				<FSX>2</FSX>
+				<ComponentIndustrial>1</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<!-- == Ranged Shield Pack == -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAEA_Apparel_RangedShieldBelt"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAEA_Apparel_RangedShieldBelt"]/statBases/EnergyShieldRechargeRate</xpath>
+		<value>
+			<EnergyShieldRechargeRate>0.195</EnergyShieldRechargeRate>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAEA_Apparel_RangedShieldBelt"]/statBases/EnergyShieldEnergyMax</xpath>
+		<value>
+			<EnergyShieldEnergyMax>1.35</EnergyShieldEnergyMax>
+		</value>
+	</Operation>
+
+	<!-- == Mini-Turret Pack == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAEA_Apparel_MiniTurretPack"]/statBases/RangedWeapon_Cooldown</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+			<RangedWeapon_Cooldown>0.8</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>0.82</SwayFactor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAEA_Apparel_MiniTurretPack"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<label>Gun</label>
+					<recoilAmount>0.76</recoilAmount>
+					<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<onlyManualCast>True</onlyManualCast>
+					<warmupTime>0.5</warmupTime>
+					<range>40</range>
+					<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+					<burstShotCount>10</burstShotCount>
+					<minRange>1</minRange>
+					<soundCast>GunShotA</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>14</muzzleFlashScale>
+					<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
+					<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+					<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAEA_Apparel_MiniTurretPack"]/comps</xpath>
+		<value>
+			<li Class="CompProperties_Reloadable">
+				<maxCharges>25</maxCharges>
+				<ammoDef>Ammo_556x45mmNATO_FMJ</ammoDef>
+				<ammoCountPerCharge>1</ammoCountPerCharge>
+				<baseReloadTicks>60</baseReloadTicks>
+				<soundReload>Standard_Reload</soundReload>
+				<hotKey>Misc4</hotKey>
+				<chargeNoun>turret</chargeNoun>
+				<displayGizmoWhileUndrafted>false</displayGizmoWhileUndrafted>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Apparel Expanded/Patches/Vanilla Apparel Expanded/ThingDefs_Misc/Apparel_Footwear.xml b/ModPatches/Vanilla Apparel Expanded/Patches/Vanilla Apparel Expanded/ThingDefs_Misc/Apparel_Footwear.xml
new file mode 100644
index 0000000000..63022d678b
--- /dev/null
+++ b/ModPatches/Vanilla Apparel Expanded/Patches/Vanilla Apparel Expanded/ThingDefs_Misc/Apparel_Footwear.xml	
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- == VAE_Footwear_Boots == -->
+	<!-- statBases -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Footwear_Boots"]/statBases/Mass</xpath>
+		<value>
+			<WornBulk>0.5</WornBulk>
+			<Mass>0.8</Mass>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Footwear_Boots"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+	<!-- Miscellaneous -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VAE_Footwear_Boots"]/equippedStatOffsets</xpath>
+	</Operation>
+
+	<!-- == VAE_Footwear_Shoes == -->
+	<!-- statBases -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Footwear_Shoes"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+	<!-- Miscellaneous -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Footwear_Shoes"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>20</costStuffCount>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Apparel Expanded/Patches/Vanilla Apparel Expanded/ThingDefs_Misc/Apparel_Handwear.xml b/ModPatches/Vanilla Apparel Expanded/Patches/Vanilla Apparel Expanded/ThingDefs_Misc/Apparel_Handwear.xml
new file mode 100644
index 0000000000..08dda2328f
--- /dev/null
+++ b/ModPatches/Vanilla Apparel Expanded/Patches/Vanilla Apparel Expanded/ThingDefs_Misc/Apparel_Handwear.xml	
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- == VAE_Handwear_Gloves == -->
+	<!-- statBases -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Handwear_Gloves"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+	<!-- Miscellaneous -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Handwear_Gloves"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>15</costStuffCount>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Apparel Expanded/Patches/Vanilla Apparel Expanded/ThingDefs_Misc/Apparel_Industrial.xml b/ModPatches/Vanilla Apparel Expanded/Patches/Vanilla Apparel Expanded/ThingDefs_Misc/Apparel_Industrial.xml
new file mode 100644
index 0000000000..5dfcf123af
--- /dev/null
+++ b/ModPatches/Vanilla Apparel Expanded/Patches/Vanilla Apparel Expanded/ThingDefs_Misc/Apparel_Industrial.xml	
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- == VAE_Apparel_CasualTShirt, VAE_Apparel_ShirtandTie, VAE_Apparel_Trousers, VAE_Headgear_Fedora, VAE_Apparel_Overalls, VAE_Apparel_Hoodie and VAE_Apparel_FleeceShirt == -->
+	<!-- statBases -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_CasualTShirt" or defName="VAE_Apparel_ShirtandTie" or defName="VAE_Apparel_Trousers" or defName="VAE_Headgear_Fedora" or defName="VAE_Apparel_Overalls" or defName="VAE_Apparel_Hoodie" or defName="VAE_Apparel_FleeceShirt"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+		</value>
+	</Operation>
+
+	<!-- == VAE_Apparel_Shorts, VAE_Apparel_Skirt and VAE_Apparel_TankTop == -->
+	<!-- statBases -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_Shorts" or defName="VAE_Apparel_Skirt" or defName="VAE_Apparel_TankTop"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>0.5</Bulk>
+			<StuffEffectMultiplierArmor>0.8</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- == VAE_Apparel_SuitJacket == -->
+	<!-- statBases -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_SuitJacket"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- == VAE_Apparel_Jeans and VAE_Apparel_Jumpsuit == -->
+	<!-- statBases -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_Jeans" or defName="VAE_Apparel_Jumpsuit"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>1.5</Bulk>
+			<WornBulk>0.5</WornBulk>
+			<StuffEffectMultiplierArmor>1.3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- == VAE_Apparel_ChefsUniform == -->
+	<!-- statBases -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_ChefsUniform"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- == VAE_Apparel_MilitaryJacket == -->
+	<!-- statBases -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_MilitaryJacket"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- == VAE_Apparel_MilitaryUniform == -->
+	<!-- statBases -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_MilitaryUniform"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>0.5</WornBulk>
+			<StuffEffectMultiplierArmor>1.4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_MilitaryUniform"]/costList/Steel</xpath>
+		<value>
+			<Steel>10</Steel>
+		</value>
+	</Operation>
+
+	<!-- == VAE_Apparel_BuildersJacket == -->
+	<!-- statBases -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_BuildersJacket"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>0.2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_BuildersJacket"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<!-- material cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_BuildersJacket"]/costList/Cloth</xpath>
+		<value>
+			<Cloth>60</Cloth>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_BuildersJacket"]/costList/Silver</xpath>
+		<value>
+			<Silver>10</Silver>
+		</value>
+	</Operation>
+
+	<!-- == VAE_Apparel_DoctorScrubs == -->
+	<!-- cloth cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_DoctorScrubs"]/costList/Cloth</xpath>
+		<value>
+			<Cloth>50</Cloth>
+		</value>
+	</Operation>
+
+	<!-- == VAE_Apparel_LabCoat == -->
+	<!-- statBases -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_LabCoat"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<Bulk>7.5</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- == VAE_Apparel_SheriffShirt == -->
+	<!-- statBases -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_SheriffShirt"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- == costStuffCounts == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_TankTop"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>15</costStuffCount>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_CasualTShirt" or defName="VAE_Apparel_Shorts" or defName="VAE_Apparel_Skirt"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>20</costStuffCount>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_ShirtandTie" or defName="VAE_Apparel_Overalls" or defName="VAE_Apparel_FleeceShirt" or defName="VAE_Apparel_SheriffShirt" or defName="VAE_Apparel_Trousers"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>25</costStuffCount>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_Hoodie" or defName="VAE_Apparel_Jeans" or defName="VAE_Apparel_ChefsUniform"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>30</costStuffCount>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_MilitaryUniform" or defName="VAE_Apparel_Jumpsuit" or defName="VAE_Apparel_MilitaryJacket" or defName="VAE_Apparel_SuitJacket"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>60</costStuffCount>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Apparel Expanded/Patches/Vanilla Apparel Expanded/ThingDefs_Misc/Apparel_Medieval.xml b/ModPatches/Vanilla Apparel Expanded/Patches/Vanilla Apparel Expanded/ThingDefs_Misc/Apparel_Medieval.xml
new file mode 100644
index 0000000000..cf505eea50
--- /dev/null
+++ b/ModPatches/Vanilla Apparel Expanded/Patches/Vanilla Apparel Expanded/ThingDefs_Misc/Apparel_Medieval.xml	
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- == VAE_Apparel_Tunic == -->
+	<!-- statBases -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_Tunic"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>1.5</Bulk>
+			<WornBulk>0.5</WornBulk>
+			<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- == VAE_Apparel_Blouse == -->
+	<!-- statBases -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_Blouse"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>0.8</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- == VAE_Apparel_Apron == -->
+	<!-- statBases -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_Apron"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- == costStuffCounts == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_Blouse" or defName="VAE_Apparel_Apron"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>20</costStuffCount>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_Tunic"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>25</costStuffCount>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Apparel Expanded/Patches/Vanilla Apparel Expanded/ThingDefs_Misc/Apparel_Neolithic.xml b/ModPatches/Vanilla Apparel Expanded/Patches/Vanilla Apparel Expanded/ThingDefs_Misc/Apparel_Neolithic.xml
new file mode 100644
index 0000000000..5c3204cac9
--- /dev/null
+++ b/ModPatches/Vanilla Apparel Expanded/Patches/Vanilla Apparel Expanded/ThingDefs_Misc/Apparel_Neolithic.xml	
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- == VAE_Apparel_PeltCoat == -->
+	<!-- statBases -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_PeltCoat"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>7.5</Bulk>
+			<WornBulk>3</WornBulk>
+			<StuffEffectMultiplierArmor>7.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- == VAE_Apparel_TribalPoncho == -->
+	<!-- statBases -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_TribalPoncho"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- == VAE_Apparel_TribalKilt == -->
+	<!-- statBases -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_TribalKilt"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Apparel Expanded/Patches/Vanilla Apparel Expanded/ThingDefs_Misc/Headgear_Industrial.xml b/ModPatches/Vanilla Apparel Expanded/Patches/Vanilla Apparel Expanded/ThingDefs_Misc/Headgear_Industrial.xml
new file mode 100644
index 0000000000..6614ca47dd
--- /dev/null
+++ b/ModPatches/Vanilla Apparel Expanded/Patches/Vanilla Apparel Expanded/ThingDefs_Misc/Headgear_Industrial.xml	
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- == VAE_Headgear_Scarf == -->
+	<!-- statBases -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_Scarf"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>0.5</Bulk>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+	<!-- Miscellaneous -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_Scarf"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<SmokeSensitivity>-0.2</SmokeSensitivity>
+				<ToxicEnvironmentResistance>0.10</ToxicEnvironmentResistance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_Scarf"]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>StrappedHead</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<!-- == VAE_Headgear_Beret, VAE_Headgear_BaseballCap and VAE_Headgear_ChefsToque == -->
+	<!-- statBases -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_Beret" or defName="VAE_Headgear_BaseballCap" or defName="VAE_Headgear_ChefsToque"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+		</value>
+	</Operation>
+	<!-- Miscellaneous -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_Beret" or defName="VAE_Headgear_BaseballCap"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>0.05</AimingAccuracy>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- == VAE_Headgear_Hardhat == -->
+	<!-- statBases -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_Hardhat"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.8</ArmorRating_Blunt>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_Hardhat"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- == VAE_Headgear_SurgicalMask == -->
+	<!-- statBases -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_SurgicalMask"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.02</ArmorRating_Blunt>
+			<Bulk>1</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_SurgicalMask"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.03</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- == VAE_Headgear_Sunglasses and VAE_Headgear_Glasses == -->
+	<!-- statBases -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_Sunglasses" or defName="VAE_Headgear_Glasses"]/statBases</xpath>
+		<value>
+			<Bulk>0.5</Bulk>
+		</value>
+	</Operation>
+	<!-- Miscellaneous -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_Sunglasses" or defName="VAE_Headgear_Glasses"]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>StrappedHead</li>
+			</layers>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Armour Expanded/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Armor_Footwear.xml b/ModPatches/Vanilla Armour Expanded/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Armor_Footwear.xml
new file mode 100644
index 0000000000..7ac6ca94e9
--- /dev/null
+++ b/ModPatches/Vanilla Armour Expanded/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Armor_Footwear.xml	
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Plate Boots === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Footwear_PlateBoots"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1.5</WornBulk>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Footwear_PlateBoots"]/statBases/Mass</xpath>
+		<value>
+			<Mass>2.5</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Footwear_PlateBoots"]/statBases/EquipDelay</xpath>
+		<value>
+			<EquipDelay>3.5</EquipDelay>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Footwear_PlateBoots"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<MeleeDodgeChance>-0.05</MeleeDodgeChance>
+			<MoveSpeed>-0.46</MoveSpeed><!-- 10% of 4.6 -->
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Footwear_PlateBoots"]/description</xpath>
+		<value>
+			<description>A pair of plate boots which resemble sabatons. Because of the construction and weight of the boots, the wearer is somewhat slower and less nimble.</description>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAE_Footwear_PlateBoots"]/apparel/layers</xpath>
+		<value>
+			<li>Shell</li>
+		</value>
+	</Operation>
+
+	<!-- === Marine Boots === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Footwear_MarineBoots"]/statBases/Mass</xpath>
+		<value>
+			<Bulk>6.75</Bulk>
+			<WornBulk>1.5</WornBulk>
+			<Mass>3.6</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Footwear_MarineBoots"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>240</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Footwear_MarineBoots"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Footwear_MarineBoots"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>40.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Footwear_MarineBoots"]/label</xpath>
+		<value>
+			<label>power armor boots</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAE_Footwear_MarineBoots"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>5</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Footwear_MarineBoots"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>15</Plasteel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Footwear_MarineBoots"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>6</CarryWeight>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAE_Footwear_MarineBoots"]/apparel/layers</xpath>
+		<value>
+			<li>Shell</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Armour Expanded/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Armor_Handwear.xml b/ModPatches/Vanilla Armour Expanded/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Armor_Handwear.xml
new file mode 100644
index 0000000000..059918a1d9
--- /dev/null
+++ b/ModPatches/Vanilla Armour Expanded/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Armor_Handwear.xml	
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Plate Gloves === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Handwear_PlateGloves"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Handwear_PlateGloves"]/statBases/Mass</xpath>
+		<value>
+			<Mass>1.5</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Handwear_PlateGloves"]/statBases/EquipDelay</xpath>
+		<value>
+			<EquipDelay>2</EquipDelay>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAE_Handwear_PlateGloves"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeHitChance>-0.05</MeleeHitChance>
+			<AimingAccuracy>-0.05</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Handwear_PlateGloves"]/description</xpath>
+		<value>
+			<description>A pair of plate gloves which resemble gauntlets. Because of the construction of the gloves and the thickness of the material, the wearer is somewhat less capable of manipulation work.</description>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAE_Handwear_PlateGloves"]/apparel/layers</xpath>
+		<value>
+			<li>Shell</li>
+		</value>
+	</Operation>
+
+	<!-- === Marine Gloves === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Handwear_MarineGloves"]/statBases/Mass</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+			<Mass>3</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Handwear_MarineGloves"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>240</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Handwear_MarineGloves"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Handwear_MarineGloves"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>40.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Handwear_MarineGloves"]/label</xpath>
+		<value>
+			<label>power armor gloves</label>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAE_Handwear_MarineGloves"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>10</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Handwear_MarineGloves"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>10</Plasteel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAE_Handwear_MarineGloves"]/apparel/layers</xpath>
+		<value>
+			<li>Shell</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Armour Expanded/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Armor_Industrial.xml b/ModPatches/Vanilla Armour Expanded/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Armor_Industrial.xml
new file mode 100644
index 0000000000..9cdf05d914
--- /dev/null
+++ b/ModPatches/Vanilla Armour Expanded/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Armor_Industrial.xml	
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Ghillie Suit === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_GhillieSuit"]/statBases</xpath>
+		<value>
+			<Bulk>31</Bulk>
+			<WornBulk>4.7</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_GhillieSuit"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<AimingAccuracy>0.05</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!-- === HAZMAT Suit === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_HAZMATSuit"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>4</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_HAZMATSuit"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>10</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_HAZMATSuit"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_HAZMATSuit"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Armour Expanded/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Armor_Medieval.xml b/ModPatches/Vanilla Armour Expanded/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Armor_Medieval.xml
new file mode 100644
index 0000000000..284c345739
--- /dev/null
+++ b/ModPatches/Vanilla Armour Expanded/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Armor_Medieval.xml	
@@ -0,0 +1,317 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Gambeson === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_Gambeson"]/statBases</xpath>
+		<value>
+			<Bulk>2.5</Bulk>
+			<WornBulk>1</WornBulk>
+			<ArmorRating_Sharp>0.06</ArmorRating_Sharp>
+			<ArmorRating_Blunt>0.09</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_Gambeson"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_Gambeson"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>30</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_Gambeson"]</xpath>
+		<value>
+			<costList>
+				<Cloth>40</Cloth>
+			</costList>
+		</value>
+	</Operation>
+
+	<!-- === Quilted Vest === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_QuiltedVest"]/statBases</xpath>
+		<value>
+			<Bulk>1.5</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_QuiltedVest"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_QuiltedVest"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>0.07</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_QuiltedVest"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>0.105</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_QuiltedVest"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>20</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_QuiltedVest"]</xpath>
+		<value>
+			<costList>
+				<Cloth>30</Cloth>
+			</costList>
+		</value>
+	</Operation>
+
+	<!-- === Light Plate Armor === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_LightPlateArmor"]/statBases/Mass</xpath>
+		<value>
+			<Bulk>52.5</Bulk>
+			<WornBulk>6</WornBulk>
+			<Mass>8</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_LightPlateArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_LightPlateArmor"]/statBases/StuffEffectMultiplierInsulation_Cold</xpath>
+		<value>
+			<StuffEffectMultiplierInsulation_Cold>0.1</StuffEffectMultiplierInsulation_Cold>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_LightPlateArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeDodgeChance>-0.08</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_LightPlateArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Plate Shoulderpads === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_PlateShoulderpads"]/statBases/Mass</xpath>
+		<value>
+			<Bulk>4.5</Bulk>
+			<WornBulk>1.5</WornBulk>
+			<Mass>1.5</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_PlateShoulderpads"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_PlateShoulderpads"]/statBases/StuffEffectMultiplierInsulation_Cold</xpath>
+		<value>
+			<StuffEffectMultiplierInsulation_Cold>0</StuffEffectMultiplierInsulation_Cold>
+		</value>
+	</Operation>
+
+	<!-- === Chestplate === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_Chestplate"]/statBases/Mass</xpath>
+		<value>
+			<Bulk>30</Bulk>
+			<WornBulk>4.5</WornBulk>
+			<Mass>4.5</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_Chestplate"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_Chestplate"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeDodgeChance>-0.045</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_Chestplate"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.40</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.40</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Chainmail === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_Chainmail"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_Chainmail"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.341</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_Chainmail"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeDodgeChance>-0.1</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- === Plate Helmet === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_PlateHelmet"]/statBases/Mass</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<Mass>3</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_PlateHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_PlateHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>-0.1</AimingAccuracy>
+				<MeleeHitChance>-0.5</MeleeHitChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_PlateHelmet"]/stuffCategories</xpath>
+		<value>
+			<stuffCategories>
+				<li>Steeled</li>
+			</stuffCategories>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_PlateHelmet"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>UpperHead</li>
+				<li>Eyes</li>
+				<li>Teeth</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_PlateHelmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Jaw</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Jaw</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Armour Expanded/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Armor_Neolithic.xml b/ModPatches/Vanilla Armour Expanded/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Armor_Neolithic.xml
new file mode 100644
index 0000000000..536a6009d1
--- /dev/null
+++ b/ModPatches/Vanilla Armour Expanded/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Armor_Neolithic.xml	
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Wooden Armor === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_WoodenArmor"]/statBases/Mass</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>5</WornBulk>
+			<Mass>12</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_WoodenArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.9</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_WoodenArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_WoodenArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>75</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_WoodenArmor"]/statBases/ArmorRating_Heat</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_WoodenArmor"]/description</xpath>
+		<value>
+			<description>A vest with wooden logs and planks covering the front and back. No one should be using this in an actual firefight, but anything is better than nothing.</description>
+		</value>
+	</Operation>
+
+	<!-- === Stone War Mask === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_StoneWarMask"]/statBases/Mass</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>1.5</WornBulk>
+			<Mass>5.1</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_StoneWarMask"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_StoneWarMask"]/statBases/ArmorRating_Blunt</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_StoneWarMask"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<Suppressability>-0.1</Suppressability>
+			<AimingAccuracy>-0.2</AimingAccuracy>
+			<MeleeHitChance>-1</MeleeHitChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_StoneWarMask"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Armour Expanded/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Armor_Spacer.xml b/ModPatches/Vanilla Armour Expanded/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Armor_Spacer.xml
new file mode 100644
index 0000000000..01fd411c87
--- /dev/null
+++ b/ModPatches/Vanilla Armour Expanded/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Armor_Spacer.xml	
@@ -0,0 +1,495 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Trooper Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_TrooperHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk><!-- Changed bulk to 4 since advanced helmet is 4 bulk and recon power armor helmet is 4 bulk. -->
+			<WornBulk>0.5</WornBulk>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_TrooperHelmet" or defName="VAE_Headgear_RoyalTrooperHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_TrooperHelmet" or defName="VAE_Headgear_RoyalTrooperHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt><!-- Blunt armor is based off it being 9mm RHA worth of sharp armor. -->
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_TrooperHelmet" or defName="VAE_Headgear_RoyalTrooperHelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0.25</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_TrooperHelmet" or defName="VAE_Headgear_RoyalTrooperHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>190</MaxHitPoints><!-- Same health as recon power armor helmet. -->
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_TrooperHelmet"]/equippedStatOffsets/MentalBreakThreshold</xpath>
+		<value>
+			<PsychicSensitivity>-0.1</PsychicSensitivity>
+			<AimingAccuracy>0.1</AimingAccuracy>
+			<ToxicEnvironmentResistance>0.10</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_TrooperHelmet" or defName="VAE_Headgear_RoyalTrooperHelmet"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>10</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<!-- It has no visor... -->
+	<!--<li Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_TrooperHelmet"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Eyes</li>
+		</value>
+	</li>-->
+
+	<!-- === Trooper Armor === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_TrooperArmor" or defName="VAE_Apparel_RoyalTrooperArmor"]/statBases/Mass</xpath>
+		<value>
+			<Bulk>40</Bulk><!-- It's supposed to be just small enough to be able to wear something on the shell layer, I think dropping it to this is good enough. -->
+			<WornBulk>6</WornBulk>
+			<Mass>20</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_TrooperArmor" or defName="VAE_Apparel_RoyalTrooperArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp><!-- Just a bit better than a plasteel armor vest, enough to deflect 7.62mm NATO and 7.62mmR. -->
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_TrooperArmor" or defName="VAE_Apparel_RoyalTrooperArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>28</ArmorRating_Blunt><!-- Blunt armor is based off it being 12mm RHA worth of sharp armor. -->
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_TrooperArmor" or defName="VAE_Apparel_RoyalTrooperArmor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0.25</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_TrooperArmor" or defName="VAE_Apparel_RoyalTrooperArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>400</MaxHitPoints><!-- Same health as recon power armor. -->
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_TrooperArmor" or defName="VAE_Apparel_RoyalTrooperArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>0.50</MoveSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_TrooperArmor" or defName="VAE_Apparel_RoyalTrooperArmor"]/equippedStatOffsets/MentalBreakThreshold</xpath>
+		<value>
+			<CarryWeight>25</CarryWeight>
+			<CarryBulk>7.5</CarryBulk>
+			<ShootingAccuracyPawn>0.05</ShootingAccuracyPawn>
+			<ToxicEnvironmentResistance>0.3</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_TrooperArmor" or defName="VAE_Apparel_RoyalTrooperArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_TrooperArmor" or defName="VAE_Apparel_RoyalTrooperArmor"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>30</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_TrooperArmor" or defName="VAE_Apparel_RoyalTrooperArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Siegebreaker Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_HeavyMarineHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>2</WornBulk>
+			<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_HeavyMarineHelmet" or defName="VAE_Headgear_RoyalSiegeHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20.4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_HeavyMarineHelmet" or defName="VAE_Headgear_RoyalSiegeHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>50</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_HeavyMarineHelmet" or defName="VAE_Headgear_RoyalSiegeHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>260</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_HeavyMarineHelmet" or defName="VAE_Headgear_RoyalSiegeHelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_HeavyMarineHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VAE_Headgear_HeavyMarineHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_HeavyMarineHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>0.15</AimingAccuracy>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+				<MeleeDodgeChance>-0.15</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_HeavyMarineHelmet"]/costList</xpath>
+		<value>
+			<costList>
+				<Plasteel>40</Plasteel>
+				<DevilstrandCloth>25</DevilstrandCloth>
+				<Hyperweave>5</Hyperweave>
+				<ComponentSpacer>2</ComponentSpacer>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_HeavyMarineHelmet" or defName="VAE_Headgear_RoyalSiegeHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!-- === Siegebreaker Armor === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_HeavyMarineArmor" or defName="VAE_Apparel_RoyalSiegeArmor"]/statBases/Mass</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>20</WornBulk>
+			<Mass>80</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_HeavyMarineArmor" or defName="VAE_Apparel_RoyalSiegeArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>26</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_HeavyMarineArmor" or defName="VAE_Apparel_RoyalSiegeArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>60</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_HeavyMarineArmor" or defName="VAE_Apparel_RoyalSiegeArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>600</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_HeavyMarineArmor" or defName="VAE_Apparel_RoyalSiegeArmor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_HeavyMarineArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>100</CarryWeight>
+				<CarryBulk>20</CarryBulk>
+				<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+				<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_HeavyMarineArmor" or defName="VAE_Apparel_RoyalSiegeArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_HeavyMarineArmor"]/costList</xpath>
+		<value>
+			<costList>
+				<Plasteel>140</Plasteel>
+				<DevilstrandCloth>50</DevilstrandCloth>
+				<Hyperweave>10</Hyperweave>
+				<Uranium>100</Uranium>
+				<ComponentSpacer>8</ComponentSpacer>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_HeavyMarineArmor" or defName="VAE_Apparel_RoyalSiegeArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Energy shields === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_HeavyMarineArmor" or defName="VAE_Apparel_RoyalSiegeArmor"]/statBases/EnergyShieldRechargeRate</xpath>
+		<value>
+			<EnergyShieldRechargeRate>0.03</EnergyShieldRechargeRate>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_HeavyMarineArmor" or defName="VAE_Apparel_RoyalSiegeArmor"]/statBases/EnergyShieldEnergyMax</xpath>
+		<value>
+			<EnergyShieldEnergyMax>0.6</EnergyShieldEnergyMax>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_HeavyMarineArmor"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldRechargeRate</xpath>
+		<value>
+			<EnergyShieldRechargeRate>0.15</EnergyShieldRechargeRate>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Apparel_HeavyMarineArmor" or defName="VAE_Apparel_RoyalSiegeArmor"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldEnergyMax</xpath>
+		<value>
+			<EnergyShieldEnergyMax>150</EnergyShieldEnergyMax>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Royalty</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+			<li Class="PatchOperationAdd">
+				<xpath>Defs/ThingDef[defName="VAE_Headgear_RoyalTrooperHelmet"]/statBases</xpath>
+				<value>
+					<Bulk>4</Bulk>
+					<WornBulk>0.5</WornBulk>
+					<NightVisionEfficiency_Apparel>0.7</NightVisionEfficiency_Apparel>
+				</value>
+			</li>
+
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/ThingDef[defName="VAE_Headgear_RoyalTrooperHelmet"]/equippedStatOffsets/MentalBreakThreshold</xpath>
+				<value>
+					<AimingAccuracy>0.1</AimingAccuracy>
+					<ToxicEnvironmentResistance>0.10</ToxicEnvironmentResistance>
+				</value>
+			</li>
+
+			<li Class="PatchOperationAdd">
+				<xpath>Defs/ThingDef[defName="VAE_Headgear_RoyalSiegeHelmet"]/statBases</xpath>
+				<value>
+					<Bulk>6</Bulk>
+					<WornBulk>2</WornBulk>
+					<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
+				</value>
+			</li>
+
+			<li Class="PatchOperationConditional">
+				<xpath>Defs/ThingDef[defName="VAE_Headgear_RoyalSiegeHelmet"]/apparel/immuneToToxGasExposure</xpath>
+				<nomatch Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VAE_Headgear_RoyalSiegeHelmet"]/apparel</xpath>
+					<value>
+						<immuneToToxGasExposure>true</immuneToToxGasExposure>
+					</value>
+				</nomatch>
+			</li>
+
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/ThingDef[defName="VAE_Headgear_RoyalSiegeHelmet"]/equippedStatOffsets</xpath>
+				<value>
+					<equippedStatOffsets>
+						<AimingAccuracy>0.15</AimingAccuracy>
+						<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+						<SmokeSensitivity>-1</SmokeSensitivity>
+						<PsychicSensitivity>0.05</PsychicSensitivity>
+						<PsychicEntropyRecoveryRate>0.033</PsychicEntropyRecoveryRate>
+						<MeleeDodgeChance>-0.15</MeleeDodgeChance>
+					</equippedStatOffsets>
+				</value>
+			</li>
+
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/ThingDef[defName="VAE_Headgear_RoyalSiegeHelmet"]/costList</xpath>
+				<value>
+					<costList>
+						<Plasteel>60</Plasteel>
+						<DevilstrandCloth>25</DevilstrandCloth>
+						<Hyperweave>5</Hyperweave>
+						<ComponentSpacer>2</ComponentSpacer>
+						<Gold>10</Gold>
+					</costList>
+				</value>
+			</li>
+
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/ThingDef[defName="VAE_Apparel_RoyalSiegeArmor"]/equippedStatOffsets</xpath>
+				<value>
+					<equippedStatOffsets>
+						<CarryWeight>100</CarryWeight>
+						<CarryBulk>20</CarryBulk>
+						<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+						<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+						<PsychicSensitivity>0.05</PsychicSensitivity>
+						<PsychicEntropyRecoveryRate>0.033</PsychicEntropyRecoveryRate>
+					</equippedStatOffsets>
+				</value>
+			</li>
+
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/ThingDef[defName="VAE_Apparel_RoyalSiegeArmor"]/costList</xpath>
+				<value>
+					<costList>
+						<Plasteel>180</Plasteel>
+						<DevilstrandCloth>50</DevilstrandCloth>
+						<Hyperweave>10</Hyperweave>
+						<Uranium>100</Uranium>
+						<ComponentSpacer>8</ComponentSpacer>
+						<Gold>18</Gold>
+					</costList>
+				</value>
+			</li>
+
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/ThingDef[defName="VAE_Apparel_RoyalSiegeArmor"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldRechargeRate</xpath>
+				<value>
+					<EnergyShieldRechargeRate>0.3</EnergyShieldRechargeRate>
+				</value>
+			</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Armour Expanded/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Headgear_Industrial.xml b/ModPatches/Vanilla Armour Expanded/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Headgear_Industrial.xml
new file mode 100644
index 0000000000..95bca88e63
--- /dev/null
+++ b/ModPatches/Vanilla Armour Expanded/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Headgear_Industrial.xml	
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Balaclava === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_Balaclava"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>0.5</Bulk>
+			<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_Balaclava"]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>OnHead</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_Balaclava"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>UpperHead</li>
+				<li>Teeth</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<!-- === Ghillie Hood === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_GhillieHood"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_GhillieHood"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<AimingAccuracy>0.1</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!-- === HAZMAT Mask === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_HAZMATMask"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+			<Bulk>6</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_HAZMATMask"]/equippedStatOffsets/WorkSpeedGlobal</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VAE_Headgear_HAZMATMask"]/apparel/layers</xpath>
+		<value>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Base Generation Expanded/Patches/Vanilla Base Generation Expanded/SettlementDefs.xml b/ModPatches/Vanilla Base Generation Expanded/Patches/Vanilla Base Generation Expanded/SettlementDefs.xml
new file mode 100644
index 0000000000..f0a507a06d
--- /dev/null
+++ b/ModPatches/Vanilla Base Generation Expanded/Patches/Vanilla Base Generation Expanded/SettlementDefs.xml	
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Remove the patched-out weapons === -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/KCSG.SettlementLayoutDef[
+			defName="VBGE_OutlanderDefence" or
+			defName="VBGE_PiratesDefence" or
+			defName="VBGE_EmpireDefence"
+			]/stockpileOptions/fillWithDefs/li[.="Gun_SmokeLauncher"] </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/KCSG.SettlementLayoutDef[
+			defName="VBGE_OutlanderDefence" or
+			defName="VBGE_PiratesDefence" or
+			defName="VBGE_EmpireDefence"
+			]/stockpileOptions/fillWithDefs/li[.="Gun_EmpLauncher"] </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/KCSG.SettlementLayoutDef[defName="VBGE_TribalDefence"]/stockpileOptions/fillWithDefs/li[.="ThrumboHorn"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/KCSG.SettlementLayoutDef[defName="VBGE_TribalDefence"]/stockpileOptions/fillWithDefs/li[.="ElephantTusk"]</xpath>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Brewing Expanded/Patches/Vanilla Brewing Expanded/Alcohol.xml b/ModPatches/Vanilla Brewing Expanded/Patches/Vanilla Brewing Expanded/Alcohol.xml
new file mode 100644
index 0000000000..2409891cde
--- /dev/null
+++ b/ModPatches/Vanilla Brewing Expanded/Patches/Vanilla Brewing Expanded/Alcohol.xml	
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Beverages === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="VBE_DrugToolBase"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.1</MeleeCritChance>
+				<MeleeParryChance>0.33</MeleeParryChance>
+				<MeleeDodgeChance>0.07</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="VBE_DrugToolBase"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2.22</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>neck</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>3.33</cooldownTime>
+					<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Neck</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Mixing === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="VBE_WhiskeyAsIngredient"]/stages/li[1]/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>3</ShootingAccuracyPawn>
+			<AimingAccuracy>1.5</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="VBE_VodkaAsIngredient"]/stages/li[1]/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>2</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="VBE_ConsumedGoStock"]/stages/li[1]</xpath>
+		<value>
+			<statOffsets>
+				<Suppressability>-0.10</Suppressability>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="VBE_RBMeadAsIngredient"]/stages/li[1]/statOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-0.10</SmokeSensitivity>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Brewing Expanded/Patches/Vanilla Brewing Expanded/ThingDefs_Items.xml b/ModPatches/Vanilla Brewing Expanded/Patches/Vanilla Brewing Expanded/ThingDefs_Items.xml
new file mode 100644
index 0000000000..69fccbf8af
--- /dev/null
+++ b/ModPatches/Vanilla Brewing Expanded/Patches/Vanilla Brewing Expanded/ThingDefs_Items.xml	
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VBE_Cigarettes"]/statBases</xpath>
+		<value>
+			<Bulk>0.01</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VBE_Cigars"]/statBases</xpath>
+		<value>
+			<Bulk>0.05</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VBE_Tea"]/statBases</xpath>
+		<value>
+			<Bulk>0.20</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VBE_Soda"]/statBases</xpath>
+		<value>
+			<Bulk>0.25</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VBE_Juice"]/statBases</xpath>
+		<value>
+			<Bulk>1.75</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VBE_EnergyDrink"]/statBases</xpath>
+		<value>
+			<Bulk>0.70</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VBE_HotCoffee" or defName="VBE_IcedCoffee"]/statBases</xpath>
+		<value>
+			<Bulk>0.40</Bulk>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Chemfuel Expanded/Patches/Vanilla Chemfuel Expanded/Items_Chemfuel.xml b/ModPatches/Vanilla Chemfuel Expanded/Patches/Vanilla Chemfuel Expanded/Items_Chemfuel.xml
new file mode 100644
index 0000000000..996ba39231
--- /dev/null
+++ b/ModPatches/Vanilla Chemfuel Expanded/Patches/Vanilla Chemfuel Expanded/Items_Chemfuel.xml	
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Give chemfuel-like product appropriate bulk. -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VCHE_Deepchem"]/statBases</xpath>
+		<value>
+			<Bulk>0.05</Bulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Ancients/Defs/Vanilla Factions Expanded - Ancients/SymbolDefs.xml b/ModPatches/Vanilla Factions Expanded - Ancients/Defs/Vanilla Factions Expanded - Ancients/SymbolDefs.xml
new file mode 100644
index 0000000000..496db68b9f
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Ancients/Defs/Vanilla Factions Expanded - Ancients/SymbolDefs.xml	
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<KCSG.SymbolDef>
+		<defName>Ammo_556x45mmNATO_Incendiary</defName>
+		<thing>Ammo_556x45mmNATO_Incendiary</thing>
+	</KCSG.SymbolDef>
+
+	<KCSG.SymbolDef>
+		<defName>Ammo_12Gauge_Buck</defName>
+		<thing>Ammo_12Gauge_Buck</thing>
+	</KCSG.SymbolDef>
+
+	<KCSG.SymbolDef>
+		<defName>Ammo_45ACP_AP</defName>
+		<thing>Ammo_45ACP_AP</thing>
+	</KCSG.SymbolDef>
+
+	<KCSG.SymbolDef>
+		<defName>Ammo_762x51mmNATO_Incendiary</defName>
+		<thing>Ammo_762x51mmNATO_Incendiary</thing>
+	</KCSG.SymbolDef>
+
+	<KCSG.SymbolDef>
+		<defName>Ammo_762x54mmR_HE</defName>
+		<thing>Ammo_762x54mmR_HE</thing>
+	</KCSG.SymbolDef>
+
+	<KCSG.SymbolDef>
+		<defName>Ammo_6x24mmCharged</defName>
+		<thing>Ammo_6x24mmCharged</thing>
+	</KCSG.SymbolDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Ancients/Patches/Vanilla Factions Expanded - Ancients/CustomGenDefs_Vaults.xml b/ModPatches/Vanilla Factions Expanded - Ancients/Patches/Vanilla Factions Expanded - Ancients/CustomGenDefs_Vaults.xml
new file mode 100644
index 0000000000..e3a209ddf2
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Ancients/Patches/Vanilla Factions Expanded - Ancients/CustomGenDefs_Vaults.xml	
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- I'm not sure if this works, and it's probably very fragile. -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultAlpha"]/layouts/li[1]/li[66]</xpath>
+		<value>
+			<li>.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Gun_AssaultRifle,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Apparel_PowerArmor,Ammo_556x45mmNATO_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultBravo"]/layouts/li[1]/li[14]</xpath>
+		<value>
+			<li>.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_556x45mmNATO_Incendiary,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Apparel_PowerArmor,.,.,.,.,.,.,.,.,.,.,.</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultCharlie"]/layouts/li[1]/li[10]</xpath>
+		<value>
+			<li>.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_556x45mmNATO_Incendiary,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Apparel_PowerArmor,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultDelta"]/layouts/li[1]/li[19]</xpath>
+		<value>
+			<li>.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Gun_AssaultRifle,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultF"]/layouts/li[1]/li[35]</xpath>
+		<value>
+			<li>.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_556x45mmNATO_Incendiary,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultG"]/layouts/li[1]/li[23]</xpath>
+		<value>
+			<li>.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,MealSurvivalPack,MealSurvivalPack,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Ammo_12Gauge_Buck,Gun_ChainShotgun,Ammo_12Gauge_Buck,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultH"]/layouts/li[1]/li[31]</xpath>
+		<value>
+			<li>.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_762x51mmNATO_Incendiary,Ammo_762x54mmR_HE,Ammo_762x54mmR_HE,Gun_LMG,Ammo_45ACP_AP,Gun_Minigun,Gun_Autopistol,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultH"]/layouts/li[1]/li[35]</xpath>
+		<value>
+			<li>.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,MealSurvivalPack,Ammo_762x51mmNATO_Incendiary,Ammo_762x51mmNATO_Incendiary,Ammo_762x51mmNATO_Incendiary,Ammo_762x51mmNATO_Incendiary,.,.,.,.,.,MealSurvivalPack,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_45ACP_AP,Ammo_45ACP_AP,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Apparel_PowerArmor,Gun_Autopistol,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultI"]/layouts/li[1]/li[19]</xpath>
+		<value>
+			<li>.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Gun_ChargeRifle,Ammo_6x24mmCharged,Ammo_6x24mmCharged,Gun_HeavySMG,Ammo_45ACP_AP,Ammo_45ACP_AP,Apparel_PowerArmorHelmet,Ammo_556x45mmNATO_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultJ"]/layouts/li[1]/li[35]</xpath>
+		<value>
+			<li>.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Gun_MachinePistol,Ammo_45ACP_AP,Apparel_PowerArmorHelmet,Ammo_45ACP_AP,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultJ"]/layouts/li[1]/li[36]</xpath>
+		<value>
+			<li>.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_762x54mmR_HE,Gun_LMG,Ammo_762x54mmR_HE,Apparel_PowerArmor,Ammo_556x45mmNATO_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultJ"]/layouts/li[1]/li[36]</xpath>
+		<value>
+			<li>.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_556x45mmNATO_Incendiary,Gun_MachinePistol,Ammo_45ACP_AP,Ammo_45ACP_AP,Ammo_762x54mmR_HE,Gun_LMG,Ammo_762x54mmR_HE,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Ancients/Patches/Vanilla Factions Expanded - Ancients/Hediffs_Powers.xml b/ModPatches/Vanilla Factions Expanded - Ancients/Patches/Vanilla Factions Expanded - Ancients/Hediffs_Powers.xml
new file mode 100644
index 0000000000..9af9de5313
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Ancients/Patches/Vanilla Factions Expanded - Ancients/Hediffs_Powers.xml	
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="VFEA_PlasteelClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>plasteel claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.35</cooldownTime>
+					<armorPenetrationSharp>1.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<soundMeleeHit>Pawn_Melee_PowerClaw_Hit</soundMeleeHit>
+					<soundMeleeMiss>Pawn_Melee_PowerClaw_Miss</soundMeleeMiss>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Ancients/Patches/Vanilla Factions Expanded - Ancients/Patch_Abilities.xml b/ModPatches/Vanilla Factions Expanded - Ancients/Patches/Vanilla Factions Expanded - Ancients/Patch_Abilities.xml
new file mode 100644
index 0000000000..37c2dc8d46
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Ancients/Patches/Vanilla Factions Expanded - Ancients/Patch_Abilities.xml	
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Super Jump -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VFEA_SuperJump"]/range</xpath>
+		<value>
+			<range>20</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VFEA_SuperJump"]/description</xpath>
+		<value>
+			<description>Jump over a medium distance (20 cells) within line of sight to close the distance to the enemy.</description>
+		</value>
+	</Operation>
+
+	<!-- Weapon Expert -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEAncients.PowerDef[defName="WeaponExpert"]/statFactors</xpath>
+		<value>
+			<ReloadSpeed>2</ReloadSpeed>
+			<ShootingAccuracyPawn>2</ShootingAccuracyPawn>
+		</value>
+	</Operation>
+
+	<!-- Marksmanship -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEAncients.PowerDef[defName="Marksmanship"]/setStats/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>20</ShootingAccuracyPawn>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEAncients.PowerDef[defName="Marksmanship"]</xpath>
+		<value>
+			<statFactors>
+				<AimingAccuracy>5</AimingAccuracy>
+			</statFactors>
+		</value>
+	</Operation>
+
+	<!-- Assassin -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEAncients.PowerDef[defName="Assassin"]</xpath>
+		<value>
+			<statOffsets>
+				<MeleeCritChance>100</MeleeCritChance>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<!-- Super Strength -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEAncients.PowerDef[defName="SuperStrength"]/statFactors</xpath>
+		<value>
+			<CarryWeight>2</CarryWeight>
+			<CarryBulk>2</CarryBulk>
+		</value>
+	</Operation>
+
+	<!-- Darkvision -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEAncients.PowerDef[defName="Darkvision"]</xpath>
+		<value>
+			<statOffsets>
+				<NightVisionEfficiency>1</NightVisionEfficiency>
+			</statOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Ancients/Patches/Vanilla Factions Expanded - Ancients/PawnKinds_Spacer.xml b/ModPatches/Vanilla Factions Expanded - Ancients/Patches/Vanilla Factions Expanded - Ancients/PawnKinds_Spacer.xml
new file mode 100644
index 0000000000..b088f5352c
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Ancients/Patches/Vanilla Factions Expanded - Ancients/PawnKinds_Spacer.xml	
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="VFEA_AncientSoldierOneAbility" or defName="VFEA_AncientSoldierTwoAbilities" or defName="VFEA_PlayerAncientSoldierOneAbility"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>7</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>175</min>
+						<max>375</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Melee</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/PawnKindDef[defName="VFEA_AncientSoldierOneAbility" or defName="VFEA_AncientSoldierTwoAbilities" or defName="VFEA_PlayerAncientSoldierOneAbility"]/skills</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/PawnKindDef[defName="VFEA_AncientSoldierOneAbility" or defName="VFEA_AncientSoldierTwoAbilities" or defName="VFEA_PlayerAncientSoldierOneAbility"]</xpath>
+			<value>
+				<skills>
+					<li>
+						<skill>Shooting</skill>
+						<range>8~14</range>
+					</li>
+					<li>
+						<skill>Melee</skill>
+						<range>6~14</range>
+					</li>
+				</skills>
+			</value>
+		</nomatch>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Ancients/Patches/Vanilla Factions Expanded - Ancients/ThingDefs_Sentry.xml b/ModPatches/Vanilla Factions Expanded - Ancients/Patches/Vanilla Factions Expanded - Ancients/ThingDefs_Sentry.xml
new file mode 100644
index 0000000000..6b2089279b
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Ancients/Patches/Vanilla Factions Expanded - Ancients/ThingDefs_Sentry.xml	
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Remove refuelable property -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName = "VFEA_Turret_AncientSecurityTurret" or
+			defName = "VFEA_Turret_AncientPointDefense"
+			]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
+	</Operation>
+
+	<!-- Replace vanilla thingClass -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "VFEA_Turret_AncientSecurityTurret" or
+			@Name = "AncientPointDefenseTurretBase"
+			]/thingClass </xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<!-- Make turrets taller -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VFEA_Turret_AncientSecurityTurret"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEA_Turret_AncientPointDefense"]</xpath>
+		<value>
+			<fillPercent>0.95</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName = "VFEA_Turret_AncientSecurityTurret" or
+			defName = "VFEA_Turret_AncientPointDefense"
+			]/statBases </xpath>
+		<value>
+			<AimingAccuracy>0.75</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VFEA_Turret_AncientSecurityTurret"]/statBases/ShootingAccuracyTurret</xpath>
+		<value>
+			<ShootingAccuracyTurret>1.1</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VFEA_Turret_AncientPointDefense"]/statBases/ShootingAccuracyTurret</xpath>
+		<value>
+			<ShootingAccuracyTurret>1.25</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "VFEA_Turret_AncientSecurityTurret" or
+			defName = "VFEA_Turret_AncientPointDefense"
+			]/building/turretBurstCooldownTime </xpath>
+		<value>
+			<turretBurstCooldownTime>1.1</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFEA_Turret_AncientSecurityTurret" or defName="VFEA_Turret_AncientPointDefense"]/comps/li[@Class = "CompProperties_Explosive"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEA_Turret_AncientSecurityTurret"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<!-- Make turrets taller -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VFEA_Turret_AncientSecurityTurret"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>125</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<!-- Ancient Security Turret -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFEA_Gun_AncientSecurityTurret</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>0.78</SwayFactor>
+			<Bulk>10.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.71</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>54</range>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>GunShotA</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>300</magazineSize>
+			<reloadTime>9.5</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- Ancient Point Defense Gun -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFEA_Gun_AncientPointDefenseTurret</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.32</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.25</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>2.3</warmupTime>
+			<range>62</range>
+			<burstShotCount>50</burstShotCount>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<targetParams>
+				<canTargetLocations>True</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1000</magazineSize>
+			<reloadTime>9.2</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<weaponTags Inherit="False">
+			<li>TurretGun</li>
+		</weaponTags>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Classical/Defs/Vanilla Factions Expanded - Classical/Ammo_Javelin.xml b/ModPatches/Vanilla Factions Expanded - Classical/Defs/Vanilla Factions Expanded - Classical/Ammo_Javelin.xml
new file mode 100644
index 0000000000..e23cad24bc
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Classical/Defs/Vanilla Factions Expanded - Classical/Ammo_Javelin.xml	
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- === Ammo Category === -->
+	<CombatExtended.AmmoCategoryDef>
+		<defName>HeavyJavelin</defName>
+		<label>Heavy Javelin</label>
+		<description>A heavy javelin with an extended shank, making it ideal for punching through shields and armor.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<!-- === Projectiles === -->
+	<ThingDef ParentName="BasePilumProjectile">
+		<defName>Classical_Javelin_Thrown</defName>
+		<label>javelin</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>14</damageAmountBase>
+			<speed>14</speed>
+			<armorPenetrationBlunt>6.44</armorPenetrationBlunt>
+			<armorPenetrationSharp>3.5</armorPenetrationSharp>
+			<secondaryDamage>
+				<li>
+					<def>VFEC_ApparelDamage</def>
+					<amount>20</amount>
+				</li>
+			</secondaryDamage>
+			<preExplosionSpawnChance>0.40</preExplosionSpawnChance><!-- Roman javelins/pila were designed to break or bend on impact, to prevent them being thrown back. -->
+			<preExplosionSpawnThingDef>VFEC_Javelin</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BasePilumProjectile">
+		<defName>Classical_Javelin_Fired</defName>
+		<label>pilum (fired)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>29</damageAmountBase>
+			<speed>30</speed>
+			<armorPenetrationBlunt>48.12</armorPenetrationBlunt>
+			<armorPenetrationSharp>10</armorPenetrationSharp>
+			<secondaryDamage>
+				<li>
+					<def>VFEC_ApparelDamage</def>
+					<amount>20</amount>
+				</li>
+			</secondaryDamage>
+			<preExplosionSpawnChance>0.25</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>VFEC_Javelin</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<!-- === Recipe === -->
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>MakeAmmo_VFEC_Javelin</defName>
+		<label>make javelins x5</label>
+		<description>Craft 5 javelins.</description>
+		<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+		<workSkill>Crafting</workSkill>
+		<recipeUsers>
+			<li>ElectricSmithy</li>
+			<li>FueledSmithy</li>
+			<li>CraftingSpot</li>
+		</recipeUsers>
+		<effectWorking>Smelt</effectWorking>
+		<unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
+		<workAmount>2700</workAmount>
+		<jobString>Making javelins.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<VFEC_Javelin>5</VFEC_Javelin>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Classical/Defs/Vanilla Factions Expanded - Classical/Ammo_Scorpion.xml b/ModPatches/Vanilla Factions Expanded - Classical/Defs/Vanilla Factions Expanded - Classical/Ammo_Scorpion.xml
new file mode 100644
index 0000000000..f1172f7855
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Classical/Defs/Vanilla Factions Expanded - Classical/Ammo_Scorpion.xml	
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- === Ammo === -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_ScorpionBolt</defName>
+		<label>scorpion bolts</label>
+		<ammoTypes>
+			<Ammo_CrossbowBolt_Stone>Projectile_ScorpionBolt_Stone</Ammo_CrossbowBolt_Stone>
+			<Ammo_CrossbowBolt_Steel>Projectile_ScorpionBolt_Steel</Ammo_CrossbowBolt_Steel>
+			<Ammo_CrossbowBolt_Plasteel>Projectile_ScorpionBolt_Plasteel</Ammo_CrossbowBolt_Plasteel>
+			<Ammo_CrossbowBolt_Venom>Projectile_ScorpionBolt_Venom</Ammo_CrossbowBolt_Venom>
+			<Ammo_CrossbowBolt_Flame>Projectile_ScorpionBolt_Flame</Ammo_CrossbowBolt_Flame>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef ParentName="BaseCrossbowBoltProjectile">
+		<defName>Projectile_ScorpionBolt_Stone</defName>
+		<label>scorpion bolt (stone)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Stone</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>11</damageAmountBase>
+			<armorPenetrationBlunt>3.65</armorPenetrationBlunt>
+			<armorPenetrationSharp>1.95</armorPenetrationSharp>
+			<preExplosionSpawnChance>0.05</preExplosionSpawnChance><!-- 11.11 bolts per resource -->
+			<preExplosionSpawnThingDef>Ammo_CrossbowBolt_Stone</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseCrossbowBoltProjectile">
+		<defName>Projectile_ScorpionBolt_Steel</defName>
+		<label>scorpion bolt (steel)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>14</damageAmountBase>
+			<armorPenetrationBlunt>6.85</armorPenetrationBlunt>
+			<armorPenetrationSharp>3.45</armorPenetrationSharp>
+			<speed>34</speed>
+			<preExplosionSpawnChance>0.233</preExplosionSpawnChance><!-- 14.99 bolts per resource -->
+			<preExplosionSpawnThingDef>Ammo_CrossbowBolt_Steel</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseCrossbowBoltProjectile">
+		<defName>Projectile_ScorpionBolt_Plasteel</defName>
+		<label>scorpion bolt (plasteel)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Plasteel</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationBlunt>8.82</armorPenetrationBlunt>
+			<armorPenetrationSharp>4.75</armorPenetrationSharp>
+			<speed>37</speed>
+			<preExplosionSpawnChance>0.5</preExplosionSpawnChance><!-- 25 bolts per resource -->
+			<preExplosionSpawnThingDef>Ammo_CrossbowBolt_Plasteel</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseCrossbowBoltProjectile">
+		<defName>Projectile_ScorpionBolt_Venom</defName>
+		<label>scorpion bolt (venom)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Venom</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>ArrowVenom</damageDef>
+			<damageAmountBase>14</damageAmountBase>
+			<armorPenetrationBlunt>6.85</armorPenetrationBlunt>
+			<armorPenetrationSharp>3.25</armorPenetrationSharp>
+			<speed>34</speed>
+			<preExplosionSpawnChance>0.4</preExplosionSpawnChance><!-- 25 arrows per resource -->
+			<preExplosionSpawnThingDef>Ammo_CrossbowBolt_Steel</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseCrossbowBoltProjectile">
+		<defName>Projectile_ScorpionBolt_Flame</defName>
+		<label>scorpion bolt (flame)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Flame</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Flame</damageDef>
+			<damageAmountBase>7</damageAmountBase>
+			<armorPenetrationBlunt>3.68</armorPenetrationBlunt>
+			<armorPenetrationSharp>2.25</armorPenetrationSharp>
+			<speed>34</speed>
+		</projectile>
+	</ThingDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Classical/Patches/Vanilla Factions Expanded - Classical/Apparel_Classical.xml b/ModPatches/Vanilla Factions Expanded - Classical/Patches/Vanilla Factions Expanded - Classical/Apparel_Classical.xml
new file mode 100644
index 0000000000..c539dd3a2e
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Classical/Patches/Vanilla Factions Expanded - Classical/Apparel_Classical.xml	
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Toga -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEC_Toga"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>2</WornBulk>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Legionaire Armor -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEC_Apparel_LegionnaireArmor"]/statBases</xpath>
+		<value>
+			<Bulk>60</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEC_Apparel_LegionnaireArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFEC_Apparel_LegionnaireArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEC_Apparel_LegionnaireArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeDodgeChance>-0.05</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFEC_Apparel_LegionnaireArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Centurion Armor -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEC_Apparel_CenturionArmor"]/statBases</xpath>
+		<value>
+			<Bulk>80</Bulk>
+			<WornBulk>12</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEC_Apparel_CenturionArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.35</StuffEffectMultiplierArmor><!-- Almost same thickness as plate armor. -->
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFEC_Apparel_CenturionArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEC_Apparel_CenturionArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeDodgeChance>-0.10</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFEC_Apparel_CenturionArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+							<li>Arm</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Classical/Patches/Vanilla Factions Expanded - Classical/Apparel_Headgear.xml b/ModPatches/Vanilla Factions Expanded - Classical/Patches/Vanilla Factions Expanded - Classical/Apparel_Headgear.xml
new file mode 100644
index 0000000000..8fc031fef8
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Classical/Patches/Vanilla Factions Expanded - Classical/Apparel_Headgear.xml	
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Wreath -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEC_Wreath"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- Legionnaire Helmet -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEC_Apparel_LegionnaireHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor><!-- Most sources I can find put Roman helmets around this thickness. -->
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEC_Apparel_LegionnaireHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFEC_Apparel_LegionnaireHelmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.50</ArmorRating_Sharp>
+						<parts>
+							<li>Jaw</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.50</ArmorRating_Blunt>
+						<parts>
+							<li>Jaw</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Centurion Helmet - 'Cedo Alterum!'  -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEC_Apparel_CenturionHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.25</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEC_Apparel_CenturionHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFEC_Apparel_CenturionHelmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Jaw</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Jaw</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Classical/Patches/Vanilla Factions Expanded - Classical/Items_Resource_Stuff.xml b/ModPatches/Vanilla Factions Expanded - Classical/Patches/Vanilla Factions Expanded - Classical/Items_Resource_Stuff.xml
new file mode 100644
index 0000000000..8eb915553f
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Classical/Patches/Vanilla Factions Expanded - Classical/Items_Resource_Stuff.xml	
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Opium -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName = "VFEC_OpiumHigh"]/stages/li</xpath>
+		<value>
+			<statFactors>
+				<Suppressability>0.50</Suppressability>
+			</statFactors>
+		</value>
+	</Operation>
+
+	<!-- Bronze -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEC_Bronze"]/statBases</xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEC_Bronze"]/stuffProps/categories</xpath>
+		<value>
+			<li>Metallic_Weapon</li>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEC_Bronze"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.83</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEC_Bronze"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>1.24</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEC_Bronze"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEC_Bronze"]/stuffProps/statFactors</xpath>
+		<value>
+			<MeleePenetrationFactor>0.80</MeleePenetrationFactor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEC_Bronze"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>1.1</Mass>
+		</value>
+	</Operation>
+
+	<!-- Tyrian -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEC_Tyrian"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.01</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEC_Tyrian"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.015</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEC_Tyrian"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.044</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEC_Tyrian"]/statBases</xpath>
+		<value>
+			<Bulk>0.05</Bulk>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Classical/Patches/Vanilla Factions Expanded - Classical/PawnKinds_Misc.xml b/ModPatches/Vanilla Factions Expanded - Classical/Patches/Vanilla Factions Expanded - Classical/PawnKinds_Misc.xml
new file mode 100644
index 0000000000..1e6ab67291
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Classical/Patches/Vanilla Factions Expanded - Classical/PawnKinds_Misc.xml	
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Increase Legionaire weapon money slightly. -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="VFEC_Legionnaire"]/weaponMoney</xpath>
+		<value>
+			<weaponMoney>140~300</weaponMoney>
+		</value>
+	</Operation>
+
+	<!-- Give Auxilaries some javelins. -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="VFEC_RepublicAuxilia"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.70</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>250</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>NeolithicMeleeBasic</li>
+							<li>ClassicalSimple</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Give Archers some arrows. -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="VFEC_RepublicArcher"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>12</min>
+					<max>20</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.50</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>250</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>NeolithicMeleeBasic</li>
+							<li>ClassicalSimple</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Give pawns some packs. -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="VFEC_RepublicArcher" or defName="VFEC_RepublicAuxilia"]/apparelRequired</xpath>
+		<value>
+			<li>CE_Apparel_TribalBackpack</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Classical/Patches/Vanilla Factions Expanded - Classical/ThingDefs_Manned.xml b/ModPatches/Vanilla Factions Expanded - Classical/Patches/Vanilla Factions Expanded - Classical/ThingDefs_Manned.xml
new file mode 100644
index 0000000000..05d57bb7e4
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Classical/Patches/Vanilla Factions Expanded - Classical/ThingDefs_Manned.xml	
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName = "VFEC_Turret_Scorpion"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VFEC_Turret_Scorpion"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VFEC_Turret_Scorpion"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VFEC_Turret_Scorpion"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>1.8</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<!-- ========== Scorpion - Weapon ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFEC_TurretGun_Scorpion</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>1</ShotSpread>
+			<SwayFactor>1</SwayFactor>
+			<Bulk>4.00</Bulk>
+			<RangedWeapon_Cooldown>1.8</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Projectile_ScorpionBolt_Steel</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>42</range>
+			<soundCast>Bow_Large</soundCast>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_ScorpionBolt</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>false</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "VFEC_TurretGun_Scorpion"]</xpath>
+		<value>
+			<weaponTags>
+				<li>TurretGun</li>
+			</weaponTags>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Classical/Patches/Vanilla Factions Expanded - Classical/ThingDefs_Shields.xml b/ModPatches/Vanilla Factions Expanded - Classical/Patches/Vanilla Factions Expanded - Classical/ThingDefs_Shields.xml
new file mode 100644
index 0000000000..0f0435ae65
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Classical/Patches/Vanilla Factions Expanded - Classical/ThingDefs_Shields.xml	
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Roman Shield (Scutum) -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEC_Shield_Heavy"]</xpath>
+		<value>
+			<ThingDef ParentName="ShieldBase">
+				<defName>VFEC_Shield_Heavy</defName>
+				<label>kite shield</label>
+				<description>A heavily fortified square shield that covers one's body from shin to shoulder, heavy enough to slow those weidling it at the benefit of incredible protection.</description>
+				<techLevel>Neolithic</techLevel>
+				<graphicData>
+					<texPath>Things/Item/Equipment/Shield/HeavyShield/HeavyShield</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+					<drawSize>0.88</drawSize>
+				</graphicData>
+				<thingCategories Inherit="False">
+					<li>Shields</li>
+				</thingCategories>
+				<costStuffCount>25</costStuffCount>
+				<costList>
+					<WoodLog>60</WoodLog>
+					<Steel>35</Steel>
+				</costList>
+				<stuffCategories>
+					<li>Leathery</li>
+				</stuffCategories>
+				<recipeMaker>
+					<researchPrerequisite>VFEC_HeavyShieldMaking</researchPrerequisite>
+					<recipeUsers>
+						<li>FueledSmithy</li>
+						<li>ElectricSmithy</li>
+					</recipeUsers>
+				</recipeMaker>
+				<statBases>
+					<WorkToMake>3000</WorkToMake>
+					<MaxHitPoints>145</MaxHitPoints>
+					<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+					<ArmorRating_Sharp>1.75</ArmorRating_Sharp>
+					<ArmorRating_Blunt>6</ArmorRating_Blunt>
+					<Mass>8</Mass>
+					<Bulk>8</Bulk>
+					<WornBulk>6</WornBulk>
+				</statBases>
+				<equippedStatOffsets>
+					<ReloadSpeed>-0.1</ReloadSpeed>
+					<MeleeHitChance>-1</MeleeHitChance>
+					<ShootingAccuracyPawn>-0.2</ShootingAccuracyPawn>
+					<AimingAccuracy>-0.05</AimingAccuracy>
+					<Suppressability>-0.25</Suppressability>
+					<MeleeCritChance>-0.08</MeleeCritChance>
+					<MeleeParryChance>1.0</MeleeParryChance>
+				</equippedStatOffsets>
+				<comps>
+					<li>
+						<compClass>CompColorable</compClass>
+					</li>
+				</comps>
+				<modExtensions>
+					<li Class="CombatExtended.ShieldDefExtension">
+						<shieldCoverage>
+							<li>Hands</li>
+							<li>Arms</li>
+							<li>Shoulders</li>
+							<li>Torso</li>
+							<li>Neck</li>
+							<li>Legs</li>
+						</shieldCoverage>
+						<drawAsTall>false</drawAsTall>
+					</li>
+				</modExtensions>
+			</ThingDef>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Classical/Patches/Vanilla Factions Expanded - Classical/ThingDefs_WeaponsMelee.xml b/ModPatches/Vanilla Factions Expanded - Classical/Patches/Vanilla Factions Expanded - Classical/ThingDefs_WeaponsMelee.xml
new file mode 100644
index 0000000000..a2be89ce11
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Classical/Patches/Vanilla Factions Expanded - Classical/ThingDefs_WeaponsMelee.xml	
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--One-handed Tags -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "VFEC_MeleeWeapon_Spatha" or defName="VFEC_MeleeWeapon_Dagger"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- Spatha -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEC_MeleeWeapon_Spatha"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.57</cooldownTime>
+					<chanceFactor>0.33</chanceFactor>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>1.57</cooldownTime>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.2</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>31</power>
+					<cooldownTime>1.45</cooldownTime>
+					<armorPenetrationBlunt>1.944</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.44</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEC_MeleeWeapon_Spatha"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>0.42</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEC_MeleeWeapon_Spatha"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.21</MeleeCritChance>
+				<MeleeParryChance>0.42</MeleeParryChance>
+				<MeleeDodgeChance>0.33</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Dagger (Pugio) -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEC_MeleeWeapon_Dagger"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<chanceFactor>0.33</chanceFactor>
+					<cooldownTime>1.29</cooldownTime>
+					<armorPenetrationBlunt>0.275</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.42</cooldownTime>
+					<armorPenetrationBlunt>0.396</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.35</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.29</cooldownTime>
+					<armorPenetrationBlunt>0.275</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.31</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEC_MeleeWeapon_Dagger"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEC_MeleeWeapon_Dagger"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.63</MeleeCritChance>
+				<MeleeParryChance>0.5</MeleeParryChance>
+				<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Classical/Patches/Vanilla Factions Expanded - Classical/ThingDefs_WeaponsRanged.xml b/ModPatches/Vanilla Factions Expanded - Classical/Patches/Vanilla Factions Expanded - Classical/ThingDefs_WeaponsRanged.xml
new file mode 100644
index 0000000000..6c219210f4
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Classical/Patches/Vanilla Factions Expanded - Classical/ThingDefs_WeaponsRanged.xml	
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Javelin === -->
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="VFEC_Javelin"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>BaseWeaponAndAmmoNeolithic</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeAdd">
+		<xpath>Defs/ThingDef[defName="VFEC_Javelin"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFEC_Javelin"]/costList</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEC_Javelin"]</xpath>
+		<value>
+			<techLevel>Neolithic</techLevel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFEC_Javelin"]/recipeMaker</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEC_Javelin"]/statBases</xpath>
+		<value>
+			<statBases>
+				<MarketValue>7.26</MarketValue>
+				<SightsEfficiency>1.0</SightsEfficiency>
+				<ShotSpread>1.5</ShotSpread>
+				<SwayFactor>2.5</SwayFactor>
+				<Bulk>3.5</Bulk>
+				<Mass>2</Mass>
+				<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			</statBases>
+			<stackLimit>25</stackLimit>
+			<ammoClass>HeavyJavelin</ammoClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEC_Javelin"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Classical_Javelin_Thrown</defaultProjectile>
+					<warmupTime>0.8</warmupTime>
+					<range>12</range>
+					<soundCast>Interact_BeatFire</soundCast>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEC_Javelin"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.35</cooldownTime>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.37</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>1.69</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.34</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_Javelins"]/ammoTypes</xpath>
+		<value>
+			<VFEC_Javelin>Classical_Javelin_Fired</VFEC_Javelin>
+		</value>
+	</Operation>
+
+	<!-- === Can't remove it entirely without causing errors, but make the mobile "Scorpion" weapon inaccessible. === -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFEC_Weapon_Scorpion"]/weaponTags</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEC_Turret_Scorpion"]/minifiedDef</xpath>
+		<value>
+			<minifiedDef>MinifiedThing</minifiedDef>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEC_Turret_Scorpion" or defName="VFEC_TurretGun_Scorpion"]/description</xpath>
+		<value>
+			<description>A ballista-like turret capable of firing rapidly when set up and manned. Very effective against enemy infantry.</description>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Deserters/Defs/Vanilla Factions Expanded - Deserters/Ammo_Fletchling.xml b/ModPatches/Vanilla Factions Expanded - Deserters/Defs/Vanilla Factions Expanded - Deserters/Ammo_Fletchling.xml
new file mode 100644
index 0000000000..9d9e8e65cf
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Deserters/Defs/Vanilla Factions Expanded - Deserters/Ammo_Fletchling.xml	
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- === Fletchling === -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_FletchlingDart</defName>
+		<label>Fletchling Dart</label>
+		<ammoTypes>
+			<Ammo_FletcherDart>Bullet_FletchlingDart</Ammo_FletcherDart>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef ParentName="BaseBulletCE">
+		<defName>Bullet_FletchlingDart</defName>
+		<label>fletchling dart</label>
+		<graphicData>
+			<texPath>Projectile/Bullet_Fletcher</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>2</damageAmountBase>
+			<speed>62</speed>
+			<damageDef>VFED_Fletchling</damageDef>
+			<pelletCount>3</pelletCount>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+			<armorPenetrationBlunt>18</armorPenetrationBlunt>
+			<spreadMult>8.9</spreadMult>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Deserters/Patches/Vanilla Factions Expanded - Deserters/Apparel_Belts.xml b/ModPatches/Vanilla Factions Expanded - Deserters/Patches/Vanilla Factions Expanded - Deserters/Apparel_Belts.xml
new file mode 100644
index 0000000000..541d7da894
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Deserters/Patches/Vanilla Factions Expanded - Deserters/Apparel_Belts.xml	
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFED_Apparel_BombPack" or defName="VFED_Apparel_InvisibilityEngulfer" or defName="VFED_DeserterDeclassifier"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Deserters/Patches/Vanilla Factions Expanded - Deserters/Buildings_Security_Turrets.xml b/ModPatches/Vanilla Factions Expanded - Deserters/Patches/Vanilla Factions Expanded - Deserters/Buildings_Security_Turrets.xml
new file mode 100644
index 0000000000..2e5b574328
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Deserters/Patches/Vanilla Factions Expanded - Deserters/Buildings_Security_Turrets.xml	
@@ -0,0 +1,333 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="VFED_ImperialTurretBase" or defName="VFED_Turret_StrikerTurret"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="VFED_ImperialTurretBase"]/comps/li[@Class="CompProperties_Explosive"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="VFED_ImperialTurretBase" or defName="VFED_Turret_StrikerTurret"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="VFED_ImperialTurretBase"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>800</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="VFED_ImperialTurretBase"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0.4</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="VFED_ImperialTurretBase"]/comps/li[@Class="CompProperties_Power"]</xpath>
+		<value>
+			<li Class="CompProperties_Power">
+				<compClass>CompPowerTrader</compClass>
+				<basePowerConsumption>750</basePowerConsumption>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="VFED_ImperialTurretBase"]/placeWorkers/li[.="PlaceWorker_ShowTurretRadius"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFED_Turret_Kontarion"]/comps/li[@Class="CompProperties_Refuelable"]
+			| Defs/ThingDef[defName="VFED_Turret_Palintone"]/comps/li[@Class="CompProperties_Refuelable"]
+			| Defs/ThingDef[defName="VFED_Turret_Onager"]/comps/li[@Class="CompProperties_Refuelable"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFED_Turret_Kontarion"]/comps/li[@Class="VFED.CompProperties_BoxRefuel"]
+			| Defs/ThingDef[defName="VFED_Turret_Palintone"]/comps/li[@Class="VFED.CompProperties_BoxRefuel"]
+			| Defs/ThingDef[defName="VFED_Turret_Onager"]/comps/li[@Class="VFED.CompProperties_BoxRefuel"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFED_Turret_Kontarion"]/modExtensions/li[@Class="VFED.TurretExtension_Barrels"]
+			| Defs/ThingDef[defName="VFED_Turret_Palintone"]/modExtensions/li[@Class="VFED.TurretExtension_Barrels"]
+			| Defs/ThingDef[defName="VFED_Turret_Onager"]/modExtensions/li[@Class="VFED.TurretExtension_Barrels"]</xpath>
+	</Operation>
+
+	<!-- Kontarion -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFED_Turret_Kontarion"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.75</AimingAccuracy>
+			<NightVisionEfficiency>0.5</NightVisionEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFED_Turret_Kontarion"]/statBases/ShootingAccuracyTurret</xpath>
+		<value>
+			<ShootingAccuracyTurret>1.5</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFED_Turret_Kontarion"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>1.0</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFED_Turret_Kontarion"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>550</Steel>
+				<Plasteel>100</Plasteel>
+				<Uranium>60</Uranium>
+				<ComponentIndustrial>14</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFED_Gun_Kontarion</defName>
+		<statBases>
+			<SightsEfficiency>2.36</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.0</SwayFactor>
+			<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+			<Mass>150</Mass>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_40x311mmR_AP</defaultProjectile>
+			<warmupTime>4.6</warmupTime>
+			<minRange>12</minRange>
+			<range>500</range>
+			<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+			<burstShotCount>6</burstShotCount>
+			<soundCast>Shot_TurretSniper</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>20</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>60</magazineSize>
+			<reloadTime>13.6</reloadTime>
+			<ammoSet>AmmoSet_40x311mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- Palintone -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFED_Turret_Palintone"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.75</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFED_Turret_Palintone"]/statBases/ShootingAccuracyTurret</xpath>
+		<value>
+			<ShootingAccuracyTurret>1.25</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFED_Turret_Palintone"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>1.0</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFED_Turret_Palintone"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>550</Steel>
+				<Plasteel>80</Plasteel>
+				<ComponentIndustrial>12</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFED_Gun_Palintone</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.0</SwayFactor>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<Mass>150</Mass>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_20x102mmNATO_AP</defaultProjectile>
+			<warmupTime>2.3</warmupTime>
+			<minRange>14</minRange>
+			<range>500</range>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<burstShotCount>20</burstShotCount>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>16</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>15.6</reloadTime>
+			<ammoSet>AmmoSet_20x102mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- Onager -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFED_Turret_Onager"]/statBases/ShootingAccuracyTurret</xpath>
+		<value>
+			<ShootingAccuracyTurret>1.25</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFED_Turret_Onager"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1.0</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFED_Turret_Onager"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>4.2</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFED_Turret_Onager"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>600</Steel>
+				<Plasteel>90</Plasteel>
+				<ComponentIndustrial>15</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFED_Gun_Onager"]/statBases/AccuracyTouch
+			| Defs/ThingDef[defName="VFED_Gun_Onager"]/statBases/AccuracyShort
+			| Defs/ThingDef[defName="VFED_Gun_Onager"]/statBases/AccuracyMedium
+			| Defs/ThingDef[defName="VFED_Gun_Onager"]/statBases/AccuracyLong </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFED_Gun_Onager"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFED_Gun_Onager"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFED_Gun_Onager"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>20</li>
+					<li>30</li>
+					<li>40</li>
+					<li>50</li>
+					<li>60</li>
+				</chargeSpeeds>
+			</li>
+			<li Class="CombatExtended.CompProperties_AmmoUser">
+				<magazineSize>24</magazineSize>
+				<reloadTime>13</reloadTime>
+				<ammoSet>AmmoSet_50mmRocket</ammoSet>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFED_Gun_Onager"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.0</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+					<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+					<hasStandardCommand>true</hasStandardCommand>
+					<requireLineOfSight>false</requireLineOfSight>
+					<defaultProjectile>Bullet_50mmRocket_HE</defaultProjectile>
+					<warmupTime>3.6</warmupTime>
+					<range>86</range>
+					<minRange>14</minRange>
+					<burstShotCount>6</burstShotCount>
+					<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+					<soundCast>RocketswarmLauncher_Fire</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>39</muzzleFlashScale>
+					<circularError>1</circularError>
+					<indirectFirePenalty>0.25</indirectFirePenalty>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Striker -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFED_Turret_StrikerTurret"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.25</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFED_Turret_StrikerTurret"]/statBases/ShootingAccuracyTurret</xpath>
+		<value>
+			<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFED_Turret_StrikerTurret"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>1.0</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Deserters/Patches/Vanilla Factions Expanded - Deserters/Buildings_Special.xml b/ModPatches/Vanilla Factions Expanded - Deserters/Patches/Vanilla Factions Expanded - Deserters/Buildings_Special.xml
new file mode 100644
index 0000000000..22178459b8
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Deserters/Patches/Vanilla Factions Expanded - Deserters/Buildings_Special.xml	
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- VFED Ammo Box Base -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="VFED_AmmoBoxBase"]</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_AutoLoaderCE</thingClass>
+			<drawerType>MapMeshAndRealTime</drawerType>
+		</value>
+	</Operation>
+
+	<!-- Uranium Slug Turret -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFED_AmmoBox_UraniumSlug"]</xpath>
+		<value>
+			<comps>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
+					<magazineSize>180</magazineSize>
+					<reloadTime>7.8</reloadTime>
+					<ammoSet>AmmoSet_40x311mmR</ammoSet>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFED_AmmoBox_UraniumSlug"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>40</Steel>
+				<ComponentIndustrial>2</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFED_AmmoBox_UraniumSlug"]</xpath>
+		<value>
+			<li Class="CombatExtended.ModExtension_AutoLoaderGraphics">
+				<allowedTurrets>
+					<li>Turret_Sniper</li>
+					<li>VFED_Turret_Kontarion</li>
+				</allowedTurrets>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Autocannon Turret -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFED_AmmoBox_Autocannon"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_AmmoUser">
+				<magazineSize>600</magazineSize>
+				<reloadTime>7.8</reloadTime>
+				<ammoSet>AmmoSet_20x102mmNATO</ammoSet>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFED_AmmoBox_Autocannon"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>40</Steel>
+				<ComponentIndustrial>2</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFED_AmmoBox_Autocannon"]</xpath>
+		<value>
+			<li Class="CombatExtended.ModExtension_AutoLoaderGraphics">
+				<allowedTurrets>
+					<li>Turret_Autocannon</li>
+					<li>VFED_Turret_Palintone</li>
+				</allowedTurrets>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Missile Turret -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFED_AmmoBox_Missile"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_AmmoUser">
+				<magazineSize>72</magazineSize>
+				<reloadTime>7.8</reloadTime>
+				<ammoSet>AmmoSet_50mmRocket</ammoSet>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFED_AmmoBox_Missile"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>40</Steel>
+				<ComponentIndustrial>2</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFED_AmmoBox_Missile"]</xpath>
+		<value>
+			<li Class="CombatExtended.ModExtension_AutoLoaderGraphics">
+				<allowedTurrets>
+					<li>Turret_RocketswarmLauncher</li>
+					<li>VFED_Turret_Onager</li>
+				</allowedTurrets>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Aerodrone Munition Crate -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFED_AerodroneMunitionsCrate"]/comps/li[@Class="VFED.CompProperties_Explosive_Shells"]</xpath>
+		<value>
+			<li Class="CompProperties_Explosive">
+				<wickTicks>1000</wickTicks>
+				<explosiveRadius>4</explosiveRadius>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<chanceNeverExplodeFromDamage>0.2</chanceNeverExplodeFromDamage>
+				<startWickHitPointsPercent>0.25</startWickHitPointsPercent>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Bomblet>6</Fragment_Bomblet>
+				</fragments>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Deserters/Patches/Vanilla Factions Expanded - Deserters/Contraband.xml b/ModPatches/Vanilla Factions Expanded - Deserters/Patches/Vanilla Factions Expanded - Deserters/Contraband.xml
new file mode 100644
index 0000000000..a6314c6bf8
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Deserters/Patches/Vanilla Factions Expanded - Deserters/Contraband.xml	
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Allow ammo for Empire/Deserter weapons to be purchased using intel. -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Ammo_6x24mmCharged"]</xpath>
+		<value>
+			<li Class="VFED.ContrabandExtension">
+				<category>VFED_Imperial</category>
+				<intelCost>5</intelCost>
+				<useCriticalIntel>false</useCriticalIntel>
+				<countMult>100</countMult>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Ammo_6x24mmCharged_AP"]</xpath>
+		<value>
+			<li Class="VFED.ContrabandExtension">
+				<category>VFED_Imperial</category>
+				<intelCost>5</intelCost>
+				<useCriticalIntel>false</useCriticalIntel>
+				<countMult>100</countMult>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Ammo_6x24mmCharged_Ion"]</xpath>
+		<value>
+			<li Class="VFED.ContrabandExtension">
+				<category>VFED_Imperial</category>
+				<intelCost>5</intelCost>
+				<useCriticalIntel>false</useCriticalIntel>
+				<countMult>100</countMult>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Combat Extended: Guns -->
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Combat Extended Guns</li>
+		</mods>
+		<match Class="PatchOperationReplace">
+			<xpath>Defs/ThingDef[defName="CE_Gun_ChargeSniperRifle"]</xpath>
+			<value>
+				<li Class="VFED.ContrabandExtension">
+					<category>VFED_Imperial</category>
+					<intelCost>13</intelCost>
+					<useCriticalIntel>false</useCriticalIntel>
+				</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Ammo_8x50mmCharged"]</xpath>
+		<value>
+			<li Class="VFED.ContrabandExtension">
+				<category>VFED_Imperial</category>
+				<intelCost>6</intelCost>
+				<useCriticalIntel>false</useCriticalIntel>
+				<countMult>100</countMult>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Ammo_8x50mmCharged_AP"]</xpath>
+		<value>
+			<li Class="VFED.ContrabandExtension">
+				<category>VFED_Imperial</category>
+				<intelCost>6</intelCost>
+				<useCriticalIntel>false</useCriticalIntel>
+				<countMult>100</countMult>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Ammo_8x50mmCharged_Ion"]</xpath>
+		<value>
+			<li Class="VFED.ContrabandExtension">
+				<category>VFED_Imperial</category>
+				<intelCost>6</intelCost>
+				<useCriticalIntel>false</useCriticalIntel>
+				<countMult>100</countMult>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Remove Charge Lance from available contraband. -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Gun_ChargeLance"]/modExtensions/li[@Class="VFED.ContrabandExtension"]</xpath>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Deserters/Patches/Vanilla Factions Expanded - Deserters/Damages_Empire.xml b/ModPatches/Vanilla Factions Expanded - Deserters/Patches/Vanilla Factions Expanded - Deserters/Damages_Empire.xml
new file mode 100644
index 0000000000..e8478c8da0
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Deserters/Patches/Vanilla Factions Expanded - Deserters/Damages_Empire.xml	
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/DamageDef[defName="VFED_Fletchling"]</xpath>
+		<value>
+			<buildingDamageFactor>0.05</buildingDamageFactor>
+			<plantDamageFactor>0.05</plantDamageFactor>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Deserters/Patches/Vanilla Factions Expanded - Deserters/RangedSpacer.xml b/ModPatches/Vanilla Factions Expanded - Deserters/Patches/Vanilla Factions Expanded - Deserters/RangedSpacer.xml
new file mode 100644
index 0000000000..018f425af1
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Deserters/Patches/Vanilla Factions Expanded - Deserters/RangedSpacer.xml	
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VFED_Gun_ChargeCycler"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VFED_Gun_Fletchling"]/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 Cycler === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFED_Gun_ChargeCycler</defName>
+		<statBases>
+			<Mass>2.0</Mass>
+			<Bulk>3.0</Bulk>
+			<SwayFactor>1.15</SwayFactor>
+			<ShotSpread>0.15</ShotSpread>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.41</RangedWeapon_Cooldown>
+		</statBases>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFED_Gun_ChargeCycler"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>3.0</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>True</hasStandardCommand>
+					<defaultProjectile>Bullet_10x18mmCharged</defaultProjectile>
+					<warmupTime>0.5</warmupTime>
+					<range>12</range>
+					<soundCast>VFED_Shot_ChargeCycler</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFED_Gun_ChargeCycler"]/comps/li[@Class="MVCF.Comps.CompProperties_VerbProps"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "VFED_Gun_ChargeCycler"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_AmmoUser">
+				<magazineSize>8</magazineSize>
+				<reloadTime>4.6</reloadTime>
+				<ammoSet>AmmoSet_10x18mmCharged</ammoSet>
+			</li>
+			<li Class="CombatExtended.CompProperties_FireModes">
+				<aiAimMode>Snapshot</aiAimMode>
+			</li>
+			<!--li>
+				<compClass>CompEquippable</compClass>
+			</li-->
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<propsUnderBarrel>
+					<magazineSize>1</magazineSize>
+					<reloadTime>3</reloadTime>
+					<ammoSet>AmmoSet_40x68mmDemo</ammoSet>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<recoilAmount>2.0</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_40x68mmDemo_Thump</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>25</range>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<soundCast>ThumpCannon_Fire</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>5</muzzleFlashScale>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>SuppressFire</aiAimMode>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Fletchling === -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFED_Gun_Fletchling</defName>
+		<statBases>
+			<Mass>8</Mass>
+			<RangedWeapon_Cooldown>0.79</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.8</SwayFactor>
+			<Bulk>9</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_FletchlingDart</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>25</range>
+			<soundCast>VFED_Shot_Fletchling</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>4</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_FletchlingDart</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Deserters/Patches/Vanilla Factions Expanded - Deserters/Scenario_Deserters.xml b/ModPatches/Vanilla Factions Expanded - Deserters/Patches/Vanilla Factions Expanded - Deserters/Scenario_Deserters.xml
new file mode 100644
index 0000000000..69c6dc1378
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Deserters/Patches/Vanilla Factions Expanded - Deserters/Scenario_Deserters.xml	
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Adds ammo to the scenario === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="VFED_NewSafehaven"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>ScatterThingsAnywhere</def>
+				<thingDef>Ammo_10x18mmCharged</thingDef>
+				<count>240</count>
+			</li>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>ScatterThingsAnywhere</def>
+				<thingDef>Ammo_40x68mmDemo_Thump</thingDef>
+				<count>20</count>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Deserters/Patches/Vanilla Factions Expanded - Deserters/Things_Security.xml b/ModPatches/Vanilla Factions Expanded - Deserters/Patches/Vanilla Factions Expanded - Deserters/Things_Security.xml
new file mode 100644
index 0000000000..30966ce8ef
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Deserters/Patches/Vanilla Factions Expanded - Deserters/Things_Security.xml	
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Turret_Autocannon"]/comps/li[@Class="VFED.CompProperties_BoxRefuel"]
+			| Defs/ThingDef[defName="Turret_Sniper"]/comps/li[@Class="VFED.CompProperties_BoxRefuel"]
+			| Defs/ThingDef[defName="Turret_RocketswarmLauncher"]/comps/li[@Class="VFED.CompProperties_BoxRefuel"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFED_RemoteTrapIED_HighExplosive"]/comps/li[@Class="CompProperties_Explosive"]</xpath>
+		<value>
+			<li Class="CompProperties_Explosive">
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<damageAmountBase>270</damageAmountBase>
+				<explosiveRadius>4.5</explosiveRadius>
+				<startWickOnDamageTaken>
+					<li>Bullet</li>
+					<li>Arrow</li>
+					<li>ArrowHighVelocity</li>
+				</startWickOnDamageTaken>
+				<wickTicks>
+					<min>5</min>
+					<max>30</max>
+				</wickTicks>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>16</Fragment_Large>
+					<Fragment_Small>100</Fragment_Small>
+				</fragments>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFED_RemoteTrapIED_Incendiary"]/comps/li[@Class="CompProperties_Explosive"]</xpath>
+		<value>
+			<li Class="CompProperties_Explosive">
+				<damageAmountBase>15</damageAmountBase>
+				<explosiveDamageType>PrometheumFlame</explosiveDamageType>
+				<explosiveRadius>5</explosiveRadius>
+				<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
+				<preExplosionSpawnChance>0.75</preExplosionSpawnChance>
+				<startWickOnDamageTaken>
+					<li>Bullet</li>
+					<li>Arrow</li>
+					<li>ArrowHighVelocity</li>
+				</startWickOnDamageTaken>
+				<wickTicks>
+					<min>5</min>
+					<max>20</max>
+				</wickTicks>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFED_Shell_Shrapnel" or defName="VFED_Shell_ArmorPiercing" or defName="VFED_Shell_Cluster"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFED_TrapIED_Shrapnel" or defName="VFED_TrapIED_ArmorPiercing" or defName="VFED_TrapIED_Cluster"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFED_RemoteTrapIED_Shrapnel" or defName="VFED_RemoteTrapIED_ArmorPiercing" or defName="VFED_RemoteTrapIED_Cluster"]</xpath>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Empire/Defs/Vanilla Factions Expanded - Empire/Ammo/ChargeThumperRound.xml b/ModPatches/Vanilla Factions Expanded - Empire/Defs/Vanilla Factions Expanded - Empire/Ammo/ChargeThumperRound.xml
new file mode 100644
index 0000000000..b63e514a27
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Empire/Defs/Vanilla Factions Expanded - Empire/Ammo/ChargeThumperRound.xml	
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>Ammo40x68mmDemoCell</defName>
+		<label>40x68mm Demo Cell</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberFuel</iconPath>
+	</ThingCategoryDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_40x68mmDemo</defName>
+		<label>40x68mm Charged Cell</label>
+		<ammoTypes>
+			<Ammo_40x68mmDemo_Thump>Bullet_40x68mmDemo_Thump</Ammo_40x68mmDemo_Thump>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="30x64mmFuelBase">
+		<defName>Ammo_40x68mmDemo_Thump</defName>
+		<label>40x68mm charge cell (Demolition)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Mortar/Charged</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+			<drawSize>0.6</drawSize>
+		</graphicData>
+		<statBases>
+			<MarketValue>4.6</MarketValue>
+		</statBases>
+		<thingCategories>
+			<li>Ammo40x68mmDemoCell</li>
+		</thingCategories>
+		<ammoClass>Demolition</ammoClass>
+		<modExtensions>
+			<li Class="VFED.ContrabandExtension" MayRequire="OskarPotocki.VFE.Deserters">
+				<category>VFED_Imperial</category>
+				<intelCost>5</intelCost>
+				<useCriticalIntel>false</useCriticalIntel>
+				<countMult>30</countMult>
+			</li>
+		</modExtensions>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBulletCE">
+		<defName>Bullet_40x68mmDemo_Thump</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>demolition bolt</label>
+		<graphicData>
+			<texPath>Things/Projectile/LauncherShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>(0.5,0.5)</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Thump</damageDef>
+			<damageAmountBase>8</damageAmountBase>
+			<speed>73</speed>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+			<explosionRadius>1.5</explosionRadius>
+		</projectile>
+	</ThingDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_40x68mmDemo_Thump</defName>
+		<label>make 40x68mm charge cell (Demolition) x50</label>
+		<description>Craft 50 40x68mm demolition charge cells.</description>
+		<jobString>Making demolition charge cell.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>14</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>ComponentIndustrial</li>
+				<li>Steel</li>
+				<li>Prometheum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_40x68mmDemo_Thump>50</Ammo_40x68mmDemo_Thump>
+		</products>
+		<workAmount>7600</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Empire/Defs/Vanilla Factions Expanded - Empire/Ammo/FletcherRifleRound.xml b/ModPatches/Vanilla Factions Expanded - Empire/Defs/Vanilla Factions Expanded - Empire/Ammo/FletcherRifleRound.xml
new file mode 100644
index 0000000000..bbe1223793
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Empire/Defs/Vanilla Factions Expanded - Empire/Ammo/FletcherRifleRound.xml	
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>Fletcher</defName>
+		<label>fletcher</label>
+		<description>Dissolves the target from the inside. Lethal to organics and almost useless against non-organics, such as mechanoids.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<ThingCategoryDef>
+		<defName>AmmoFletcherDart</defName>
+		<label>Fletcher Dart</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
+	</ThingCategoryDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_FletcherDart</defName>
+		<label>Fletcher Dart</label>
+		<ammoTypes>
+			<Ammo_FletcherDart>Bullet_FletcherDart</Ammo_FletcherDart>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="12x64mmChargedBase">
+		<description>Fin-stabilized flechettes with acidifier injectors. Lethal to organics and almost useless against non-organics.\n\nTargets hit by these flechettes will be inflicted with an unstable variant of acidifier fluids, designed to dissolve the target from the inside rather than destroy their equipment.</description>
+		<defName>Ammo_FletcherDart</defName>
+		<label>fletcher cartridge</label>
+		<thingCategories>
+			<li>AmmoFletcherDart</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>Things/Ammo/Charged/LargeRegular</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>6.78</MarketValue>
+		</statBases>
+		<ammoClass>Fletcher</ammoClass>
+		<modExtensions>
+			<li Class="VFED.ContrabandExtension" MayRequire="OskarPotocki.VFE.Deserters">
+				<category>VFED_Imperial</category>
+				<intelCost>5</intelCost>
+				<useCriticalIntel>true</useCriticalIntel>
+				<countMult>50</countMult>
+			</li>
+		</modExtensions>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBulletCE">
+		<defName>Bullet_FletcherDart</defName>
+		<label>fletcher dart</label>
+		<graphicData>
+			<texPath>Projectile/Bullet_Fletcher</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>1.5</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>6</damageAmountBase>
+			<speed>144</speed>
+			<damageDef>VFEE_Fletcher</damageDef>
+			<armorPenetrationSharp>16</armorPenetrationSharp>
+			<armorPenetrationBlunt>36</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_FletcherDart</defName>
+		<label>make fletcher dart cartridge x50</label>
+		<description>Craft 50 fletcher dart cartridges.</description>
+		<jobString>Making fletcher dart cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>32</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>16</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Plasteel</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_FletcherDart>50</Ammo_FletcherDart>
+		</products>
+		<workAmount>32800</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Empire/Patches/Vanilla Factions Expanded - Empire/Apparel_Headgear.xml b/ModPatches/Vanilla Factions Expanded - Empire/Patches/Vanilla Factions Expanded - Empire/Apparel_Headgear.xml
new file mode 100644
index 0000000000..9790d8a4fc
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Empire/Patches/Vanilla Factions Expanded - Empire/Apparel_Headgear.xml	
@@ -0,0 +1,317 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Techfriar Crown -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_TechfriarCrown"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2.25</ArmorRating_Blunt>
+			<Bulk>1</Bulk>
+			<WornBulk>0.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_TechfriarCrown"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Absolver Helmet -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_AbsolverHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_AbsolverHelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_AbsolverHelmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>5.4</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_AbsolverHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>200</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_AbsolverHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_AbsolverHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_AbsolverHelmet"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<AimingAccuracy>1.2</AimingAccuracy>
+			<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_AbsolverHelmet"]/apparel</xpath>
+		<value>
+			<immuneToToxGasExposure>true</immuneToToxGasExposure>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_AbsolverHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_AbsolverHelmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Deserter Helmet -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_DeserterHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_DeserterHelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_DeserterHelmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>4.8</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_DeserterHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>240</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_DeserterHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_DeserterHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_DeserterHelmet"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<AimingAccuracy>0.6</AimingAccuracy>
+			<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_DeserterHelmet"]/apparel</xpath>
+		<value>
+			<immuneToToxGasExposure>true</immuneToToxGasExposure>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_DeserterHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_DeserterHelmet"]</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>
+
+	<!-- Janissary Helmet -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_JanissaryHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.7</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_JanissaryHelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0.25</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_JanissaryHelmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>3.4</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_JanissaryHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>190</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_JanissaryHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_JanissaryHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>26</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_JanissaryHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>0.15</AimingAccuracy>
+				<ToxicEnvironmentResistance>1.0</ToxicEnvironmentResistance>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_JanissaryHelmet"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>50</Plasteel>
+			<DevilstrandCloth>15</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_JanissaryHelmet"]/apparel</xpath>
+		<value>
+			<immuneToToxGasExposure>true</immuneToToxGasExposure>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_JanissaryHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_JanissaryHelmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+							<li>Jaw</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+							<li>Jaw</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Empire/Patches/Vanilla Factions Expanded - Empire/Apparel_Royal.xml b/ModPatches/Vanilla Factions Expanded - Empire/Patches/Vanilla Factions Expanded - Empire/Apparel_Royal.xml
new file mode 100644
index 0000000000..c3afb1f9aa
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Empire/Patches/Vanilla Factions Expanded - Empire/Apparel_Royal.xml	
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Stellic Robe -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Apparel_StellicRobe"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Empire/Patches/Vanilla Factions Expanded - Empire/Apparel_Various.xml b/ModPatches/Vanilla Factions Expanded - Empire/Patches/Vanilla Factions Expanded - Empire/Apparel_Various.xml
new file mode 100644
index 0000000000..522d67c52c
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Empire/Patches/Vanilla Factions Expanded - Empire/Apparel_Various.xml	
@@ -0,0 +1,294 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Deserter Armor -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_ArmorDeserter"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_ArmorDeserter"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>540</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_ArmorDeserter"]/statBases/Mass</xpath>
+		<value>
+			<Mass>54</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_ArmorDeserter"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_ArmorDeserter"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>21</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_ArmorDeserter"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>46</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_ArmorDeserter"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>80</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+			<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_ArmorDeserter"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_ArmorDeserter"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Absolver Armor -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_ArmorAbsolver"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_ArmorAbsolver"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>500</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_ArmorAbsolver"]/statBases/Mass</xpath>
+		<value>
+			<Mass>50</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_ArmorAbsolver"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_ArmorAbsolver"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_ArmorAbsolver"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_ArmorAbsolver"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>80</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+			<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_ArmorAbsolver"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_ArmorAbsolver"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Janissary Cuirass -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_JanissaryCuirass"]/statBases</xpath>
+		<value>
+			<Bulk>25</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_JanissaryCuirass"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>400</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_JanissaryCuirass"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0.2</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_JanissaryCuirass"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_JanissaryCuirass"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>34</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_JanissaryCuirass"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>40</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_JanissaryCuirass"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>14</CarryWeight>
+				<CarryBulk>10</CarryBulk>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFEE_Apparel_JanissaryCuirass"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Empire/Patches/Vanilla Factions Expanded - Empire/Buildings_Security_Turrets.xml b/ModPatches/Vanilla Factions Expanded - Empire/Patches/Vanilla Factions Expanded - Empire/Buildings_Security_Turrets.xml
new file mode 100644
index 0000000000..211de10d67
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Empire/Patches/Vanilla Factions Expanded - Empire/Buildings_Security_Turrets.xml	
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Striker Turret -->
+	<!-- Remove refuelable property -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName = "VFEE_Turret_StrikerTurret"]/comps/li[@Class="CompProperties_Refuelable"]</xpath>
+	</Operation>
+
+	<!-- Replace vanilla thingClass -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VFEE_Turret_StrikerTurret"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEE_Turret_StrikerTurret"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.5</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VFEE_Turret_StrikerTurret"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>1.1</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<!-- Striker Turret Gun - Identical to the vanilla mini-turret. -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFEE_Gun_StrikerTurret</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>0.69</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.91</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>48</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>GunShotA</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- Armored Shuttle Turret -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "VFEI_ArmoredShuttle"]/statBases</xpath>
+		<value>
+			<ShootingAccuracyTurret>0.99</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VFEI_ArmoredShuttle"]/building/turretGunDef</xpath>
+		<value>
+			<turretGunDef>VFEI_TurretArmoredShuttle_CE</turretGunDef>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VFEI_ArmoredShuttle"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>1.0</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "VFEI_ArmoredShuttle"]/building</xpath>
+		<value>
+			<turretBurstWarmupTime>2.3</turretBurstWarmupTime>
+		</value>
+	</Operation>
+
+	<!-- Vanilla Gauntlet Charge Cannnon -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs</xpath>
+		<value>
+
+			<ThingDef ParentName="BaseWeaponTurret">
+				<defName>VFEI_TurretArmoredShuttle_CE</defName>
+				<label>double autocannon</label>
+				<description>A powerful, twin-linked autocannon.</description>
+				<graphicData>
+					<texPath>Shuttle/ImperialArmoredShuttle/ImperialArmoredShuttle_Autocannon</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+					<drawSize>(2,2)</drawSize>
+				</graphicData>
+				<soundInteract>Interact_Rifle</soundInteract>
+				<statBases>
+					<AccuracyTouch>0.4</AccuracyTouch>
+					<AccuracyShort>0.65</AccuracyShort>
+					<AccuracyMedium>0.70</AccuracyMedium>
+					<AccuracyLong>0.60</AccuracyLong>
+					<RangedWeapon_Cooldown>1.6</RangedWeapon_Cooldown>
+					<DeteriorationRate>0</DeteriorationRate>
+					<Mass>80</Mass>
+					<Flammability>0</Flammability>
+				</statBases>
+				<verbs>
+					<li>
+						<verbClass>Verb_Shoot</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_ArmoredShuttleTurret_CE</defaultProjectile>
+						<minRange>8.9</minRange>
+						<warmupTime>2.3</warmupTime>
+						<range>55</range>
+						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+						<burstShotCount>6</burstShotCount>
+						<soundCast>Shot_Autocannon</soundCast>
+						<soundCastTail>GunTail_Heavy</soundCastTail>
+						<muzzleFlashScale>12</muzzleFlashScale>
+					</li>
+				</verbs>
+			</ThingDef>
+
+			<ThingDef ParentName="BaseBullet">
+				<defName>Bullet_ArmoredShuttleTurret_CE</defName>
+				<label>autocannon shell</label>
+				<graphicData>
+					<texPath>Things/Projectile/Bullet_Big</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<projectile>
+					<damageDef>Bullet</damageDef>
+					<damageAmountBase>15</damageAmountBase>
+					<speed>158</speed>
+					<armorPenetrationBase>25</armorPenetrationBase>
+				</projectile>
+			</ThingDef>
+
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Empire/Patches/Vanilla Factions Expanded - Empire/Damages_Empire.xml b/ModPatches/Vanilla Factions Expanded - Empire/Patches/Vanilla Factions Expanded - Empire/Damages_Empire.xml
new file mode 100644
index 0000000000..86ccc0fea5
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Empire/Patches/Vanilla Factions Expanded - Empire/Damages_Empire.xml	
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/DamageDef[defName="VFEE_Fletcher"]</xpath>
+		<value>
+			<buildingDamageFactor>0.05</buildingDamageFactor>
+			<plantDamageFactor>0.05</plantDamageFactor>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Empire/Patches/Vanilla Factions Expanded - Empire/MeleeUltratech.xml b/ModPatches/Vanilla Factions Expanded - Empire/Patches/Vanilla Factions Expanded - Empire/MeleeUltratech.xml
new file mode 100644
index 0000000000..cb4e405013
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Empire/Patches/Vanilla Factions Expanded - Empire/MeleeUltratech.xml	
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Toxblade === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEE_MeleeWeapon_Toxblade"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<chanceFactor>0.33</chanceFactor>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>VFEE_CutToxblade</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.18</cooldownTime>
+					<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
+					<armorPenetrationSharp>12</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>VFEE_StabToxblade</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.2</cooldownTime>
+					<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
+					<armorPenetrationSharp>18</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEE_MeleeWeapon_Toxblade"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEE_MeleeWeapon_Toxblade"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.5</MeleeCritChance>
+				<MeleeParryChance>0.15</MeleeParryChance>
+				<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Add tags -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFEE_MeleeWeapon_Toxblade"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFEE_MeleeWeapon_Toxblade"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEE_MeleeWeapon_Toxblade"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- === Toxblade (Bladelink) === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEE_MeleeWeapon_ToxbladeBladelink"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1.5</power>
+					<chanceFactor>0.33</chanceFactor>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.275</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>VFEE_CutToxblade</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.18</cooldownTime>
+					<armorPenetrationBlunt>3.28</armorPenetrationBlunt>
+					<armorPenetrationSharp>14</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>VFEE_StabToxblade</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.2</cooldownTime>
+					<armorPenetrationBlunt>1.48</armorPenetrationBlunt>
+					<armorPenetrationSharp>20</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEE_MeleeWeapon_ToxbladeBladelink"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<MeleeCounterParryBonus>0.20</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEE_MeleeWeapon_ToxbladeBladelink"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.55</MeleeCritChance>
+				<MeleeParryChance>0.20</MeleeParryChance>
+				<MeleeDodgeChance>0.10</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Add tags -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFEE_MeleeWeapon_ToxbladeBladelink"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFEE_MeleeWeapon_ToxbladeBladelink"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEE_MeleeWeapon_ToxbladeBladelink"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Empire/Patches/Vanilla Factions Expanded - Empire/PawnKinds.xml b/ModPatches/Vanilla Factions Expanded - Empire/Patches/Vanilla Factions Expanded - Empire/PawnKinds.xml
new file mode 100644
index 0000000000..f380167cec
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Empire/Patches/Vanilla Factions Expanded - Empire/PawnKinds.xml	
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="VFEE_DeserterBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>300</min>
+							<max>500</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+					<li>
+						<generateChance>0.15</generateChance>
+						<sidearmMoney>
+							<min>10</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>GrenadeSmoke</li>
+						</weaponTags>
+						<magazineCount>
+							<min>1</min>
+							<max>2</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="VFEE_Empire_Fighter_Absolver"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>300</min>
+							<max>500</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+					<li>
+						<generateChance>0.1</generateChance>
+						<sidearmMoney>
+							<min>10</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>GrenadeSmoke</li>
+						</weaponTags>
+						<magazineCount>
+							<min>1</min>
+							<max>2</max>
+						</magazineCount>
+					</li>
+					<li>
+						<generateChance>0.1</generateChance>
+						<sidearmMoney>
+							<min>80</min>
+							<max>160</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_FlareLauncher</li>
+						</weaponTags>
+						<magazineCount>
+							<min>1</min>
+							<max>3</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="VFEE_Empire_Fighter_Absolver"]/specificApparelRequirements</xpath>
+		<value>
+			<li>
+				<bodyPartGroup>Shoulders</bodyPartGroup>
+				<apparelLayer>Backpack</apparelLayer>
+				<stuff>Synthread</stuff>
+				<color>(10, 10, 10)</color>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Empire/Patches/Vanilla Factions Expanded - Empire/RangedSpacer.xml b/ModPatches/Vanilla Factions Expanded - Empire/Patches/Vanilla Factions Expanded - Empire/RangedSpacer.xml
new file mode 100644
index 0000000000..604c41edd3
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Empire/Patches/Vanilla Factions Expanded - Empire/RangedSpacer.xml	
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "VEE_Gun_Fletcher" or
+			defName = "VFEE_Gun_ChargeThumper"
+			]/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>
+
+	<!-- === Fletcher === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VEE_Gun_Fletcher</defName>
+		<statBases>
+			<Mass>7.30</Mass>
+			<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.6</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.35</SwayFactor>
+			<Bulk>11.92</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.50</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_FletcherDart</defaultProjectile>
+			<warmupTime>1.8</warmupTime>
+			<range>150</range>
+			<soundCast>ChargeLance_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>4</AmmoGenPerMagOverride>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_FletcherDart</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_SR</li>
+			<li>Bipod_AMR</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- === Charge Thumper === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFEE_Gun_ChargeThumper</defName>
+		<statBases>
+			<Mass>8</Mass>
+			<RangedWeapon_Cooldown>0.43</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.8</SwayFactor>
+			<Bulk>10</Bulk>
+			<WorkToMake>39500</WorkToMake>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_40x68mmDemo_Thump</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>40</range>
+			<burstShotCount>0</burstShotCount>
+			<soundCast>ThumpCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_40x68mmDemo</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Empire/Patches/Vanilla Factions Expanded - Empire/Scenario_Empire.xml b/ModPatches/Vanilla Factions Expanded - Empire/Patches/Vanilla Factions Expanded - Empire/Scenario_Empire.xml
new file mode 100644
index 0000000000..f98432e9a8
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Empire/Patches/Vanilla Factions Expanded - Empire/Scenario_Empire.xml	
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === Adds ammo to the scenario === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="VFEE_NewFamily"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_ScatterThingsAnywhere">
+				<def>ScatterThingsAnywhere</def>
+				<thingDef>Ammo_556x45mmNATO_Incendiary</thingDef>
+				<count>300</count>
+			</li>
+			<li Class="ScenPart_ScatterThingsAnywhere">
+				<def>ScatterThingsAnywhere</def>
+				<thingDef>Ammo_40x68mmDemo_Thump</thingDef>
+				<count>60</count>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids/Defs/Vanilla Factions Expanded - Insectoids/Ammo/AmmoCategories.xml b/ModPatches/Vanilla Factions Expanded - Insectoids/Defs/Vanilla Factions Expanded - Insectoids/Ammo/AmmoCategories.xml
new file mode 100644
index 0000000000..a1d5e54b7d
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Insectoids/Defs/Vanilla Factions Expanded - Insectoids/Ammo/AmmoCategories.xml	
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- === AmmoCategoryDef === -->
+	<CombatExtended.AmmoCategoryDef>
+		<defName>GrenadePsyMadness</defName>
+		<label>madness</label>
+		<description>Uses psychic technology to induce a berserk range against targets in range.</description>
+		<advanced>true</advanced>
+	</CombatExtended.AmmoCategoryDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids/Defs/Vanilla Factions Expanded - Insectoids/Ammo/PlasmaCells.xml b/ModPatches/Vanilla Factions Expanded - Insectoids/Defs/Vanilla Factions Expanded - Insectoids/Ammo/PlasmaCells.xml
new file mode 100644
index 0000000000..778ec700c5
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Insectoids/Defs/Vanilla Factions Expanded - Insectoids/Ammo/PlasmaCells.xml	
@@ -0,0 +1,426 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- === ThingCategoryDef === -->
+	<ThingCategoryDef>
+		<defName>AmmoVFEIPlasmaCells</defName>
+		<label>plasma cells</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberPlasmaMedium</iconPath>
+	</ThingCategoryDef>
+
+	<!-- === AmmoSetDef === -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_VFEI_PlasmaCutter</defName>
+		<label>plasma cells</label>
+		<ammoTypes>
+			<Ammo_VFEI_PlasmaCutter>Bullet_VFEI_PlasmaCutter</Ammo_VFEI_PlasmaCutter>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_VFEI_PlasmaScatter</defName>
+		<label>plasma cells</label>
+		<ammoTypes>
+			<Ammo_VFEI_PlasmaScatter>Bullet_VFEI_PlasmaScatter</Ammo_VFEI_PlasmaScatter>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_VFEI_PlasmaRifle</defName>
+		<label>plasma cells</label>
+		<ammoTypes>
+			<Ammo_VFEI_PlasmaRifle>Bullet_VFEI_PlasmaRifle</Ammo_VFEI_PlasmaRifle>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_VFEI_PlasmaPiercer</defName>
+		<label>plasma cells</label>
+		<ammoTypes>
+			<Ammo_VFEI_PlasmaPiercer>Bullet_VFEI_PlasmaPiercer</Ammo_VFEI_PlasmaPiercer>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- === Ammo === -->
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase" Name="VFEPlasmaCellsBase" Abstract="True">
+		<description>Plasma containment power cells</description>
+		<statBases>
+			<Mass>0.017</Mass>
+			<Bulk>0.01</Bulk>
+			<MarketValue>0.24</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoVFEIPlasmaCells</li>
+		</thingCategories>
+		<ammoClass>Plasma</ammoClass>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>20</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>2</Fragment_Large>
+					<Fragment_Small>10</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="VFEPlasmaCellsBase">
+		<defName>Ammo_VFEI_PlasmaCutter</defName>
+		<label>plasma cutter cell</label>
+		<graphicData>
+			<texPath>Things/Ammo/PlasmaCell/Pistol</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="VFEPlasmaCellsBase">
+		<defName>Ammo_VFEI_PlasmaScatter</defName>
+		<label>plasma scattergun cell</label>
+		<graphicData>
+			<texPath>Things/Ammo/PlasmaCell/Heavy</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="VFEPlasmaCellsBase">
+		<defName>Ammo_VFEI_PlasmaRifle</defName>
+		<label>plasma beam rifle cell</label>
+		<graphicData>
+			<texPath>Things/Ammo/PlasmaCell/Rifle</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="VFEPlasmaCellsBase">
+		<defName>Ammo_VFEI_PlasmaPiercer</defName>
+		<label>plasma piercer cell</label>
+		<graphicData>
+			<texPath>Things/Ammo/PlasmaCell/Rifle</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+	</ThingDef>
+
+	<!-- === Projectiles === -->
+	<ThingDef Name="BaseVFEIPlasmaBullet" ParentName="BaseBulletCE" Abstract="true">
+		<thingClass>CombatExtended.BulletCE</thingClass><!-- If i don't add this the ammo won't work -->
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Burn</damageDef>
+			<speed>151</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseVFEIPlasmaBullet">
+		<defName>Bullet_VFEI_PlasmaCutter</defName>
+		<label>plasma shot</label>
+		<graphicData>
+			<texPath>Things/Item/Weapons/Plasma_Cutter</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>8</damageAmountBase>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+			<armorPenetrationBlunt>8</armorPenetrationBlunt>
+			<empShieldBreakChance>0.2</empShieldBreakChance>
+			<secondaryDamage>
+				<li>
+					<def>Cut</def>
+					<amount>3</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseVFEIPlasmaBullet">
+		<defName>Bullet_VFEI_PlasmaScatter</defName>
+		<label>plasma shot</label>
+		<graphicData>
+			<texPath>Things/Item/Weapons/Plasma_Scatter</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>129</speed>
+			<damageAmountBase>6</damageAmountBase>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+			<armorPenetrationBlunt>8</armorPenetrationBlunt>
+			<pelletCount>9</pelletCount>
+			<spreadMult>17.8</spreadMult>
+			<empShieldBreakChance>0.2</empShieldBreakChance>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>3</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseVFEIPlasmaBullet">
+		<defName>Bullet_VFEI_PlasmaRifle</defName>
+		<label>plasma beam</label>
+		<graphicData>
+			<texPath>Things/Item/Weapons/Plasma_Beam</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>15</damageAmountBase>
+			<armorPenetrationSharp>10</armorPenetrationSharp>
+			<armorPenetrationBlunt>10</armorPenetrationBlunt>
+			<empShieldBreakChance>0.2</empShieldBreakChance>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>3</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseVFEIPlasmaBullet">
+		<defName>Bullet_VFEI_PlasmaPiercer</defName>
+		<label>plasma bolt</label>
+		<graphicData>
+			<texPath>Things/Item/Weapons/Plasma_Nail</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>22</damageAmountBase>
+			<armorPenetrationSharp>18</armorPenetrationSharp>
+			<armorPenetrationBlunt>25</armorPenetrationBlunt>
+			<empShieldBreakChance>0.2</empShieldBreakChance>
+			<secondaryDamage>
+				<li>
+					<def>Stun</def>
+					<amount>3</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<!-- === Recipes === -->
+	<!-- == Plasma Cutter == -->
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_VFEI_PlasmaCutter</defName>
+		<label>make Plasma Cutter Power Cells</label>
+		<description>Craft 500 shots worth of Plasma Cutter Power Cells.</description>
+		<jobString>Making Plasma Cutter Power Cells.</jobString>
+		<workAmount>3800</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>18</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Plasteel</li>
+				<li>Prometheum</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_VFEI_PlasmaCutter>500</Ammo_VFEI_PlasmaCutter>
+		</products>
+	</RecipeDef>
+
+	<!-- == Plasma Scattergun == -->
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_VFEI_PlasmaScatter</defName>
+		<label>make Plasma Scattergun Power Cells</label>
+		<description>Craft 500 shots worth of Plasma Scattergun Power Cells.</description>
+		<jobString>Making Plasma Scattergun Power Cells.</jobString>
+		<workAmount>3800</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>18</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Plasteel</li>
+				<li>Prometheum</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_VFEI_PlasmaScatter>500</Ammo_VFEI_PlasmaScatter>
+		</products>
+	</RecipeDef>
+
+	<!-- == Plasma Rifle == -->
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_VFEI_PlasmaRifle</defName>
+		<label>make Plasma Rifle Power Cells</label>
+		<description>Craft 500 shots worth of Plasma Rifle Power Cells.</description>
+		<jobString>Making Plasma Rifle Power Cells.</jobString>
+		<workAmount>3800</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>18</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Plasteel</li>
+				<li>Prometheum</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_VFEI_PlasmaRifle>500</Ammo_VFEI_PlasmaRifle>
+		</products>
+	</RecipeDef>
+
+	<!-- == Plasma Piercer == -->
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_VFEI_PlasmaPiercer</defName>
+		<label>make Plasma Piercer Power Cells</label>
+		<description>Craft 500 shots worth of Plasma Piercer Power Cells.</description>
+		<jobString>Making Plasma Piercer Power Cells.</jobString>
+		<workAmount>3800</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>18</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Plasteel</li>
+				<li>Prometheum</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_VFEI_PlasmaPiercer>500</Ammo_VFEI_PlasmaPiercer>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids/Defs/Vanilla Factions Expanded - Insectoids/Hediffs/Hediffs_Berserk.xml b/ModPatches/Vanilla Factions Expanded - Insectoids/Defs/Vanilla Factions Expanded - Insectoids/Hediffs/Hediffs_Berserk.xml
new file mode 100644
index 0000000000..9a424bb714
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Insectoids/Defs/Vanilla Factions Expanded - Insectoids/Hediffs/Hediffs_Berserk.xml	
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- === Berserk Hediff === -->
+	<HediffDef>
+		<hediffClass>HediffWithComps</hediffClass>
+		<defName>VFEI_Berserk</defName>
+		<label>berserk</label>
+		<description>.</description>
+		<defaultLabelColor>(0.9, 1.0, 0.35)</defaultLabelColor>
+		<initialSeverity>1</initialSeverity>
+		<comps>
+			<li Class="HediffCompProperties_CauseMentalState">
+				<animalMentalState>ManhunterPermanent</animalMentalState>
+				<animalMentalStateAlias>Manhunter</animalMentalStateAlias>
+				<humanMentalState>Berserk</humanMentalState>
+				<letterDef>ThreatSmall</letterDef>
+				<mtbDaysToCauseMentalState>0.001</mtbDaysToCauseMentalState>
+			</li>
+		</comps>
+	</HediffDef>
+
+	<!-- === Berserk Damage === -->
+	<DamageDef>
+		<workerClass>DamageWorker_AddGlobal</workerClass>
+		<defName>VFEI_PsychicDamage</defName>
+		<label>psychic</label>
+		<hediff>VFEI_Berserk</hediff>
+		<canInterruptJobs>true</canInterruptJobs>
+		<makesBlood>false</makesBlood>
+		<harmsHealth>false</harmsHealth>
+		<defaultDamage>0</defaultDamage>
+		<explosionCellMote>Mote_ExtinguisherPuff</explosionCellMote>
+		<explosionColorEdge>(1, 1, 1, 0.05)</explosionColorEdge>
+		<soundExplosion>Explosion_Smoke</soundExplosion>
+		<combatLogRules>Damage_Smoke</combatLogRules>
+	</DamageDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/Ammo/MadnessShell.xml b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/Ammo/MadnessShell.xml
new file mode 100644
index 0000000000..9b55d2bb0d
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/Ammo/MadnessShell.xml	
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_Shell_PsychicWarhead"]</xpath>
+
+		<value>
+			<ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBase">
+				<defName>VFEI_Shell_PsychicWarhead</defName>
+				<label>81mm mortar shell (Psychic warhead)</label>
+				<graphicData>
+					<texPath>Things/Item/VFEI_PsychicWarhead</texPath>
+					<graphicClass>Graphic_StackCount</graphicClass>
+				</graphicData>
+				<statBases>
+					<MarketValue>1000</MarketValue>
+					<Mass>4.1</Mass>
+					<Bulk>13.34</Bulk>
+				</statBases>
+				<ammoClass>GrenadePsyMadness</ammoClass>
+				<comps>
+					<li Class="CompProperties_Explosive">
+						<explosiveRadius>2.9</explosiveRadius>
+						<explosiveDamageType>VFEI_PsychicNoDamage</explosiveDamageType>
+						<damageAmountBase>50</damageAmountBase>
+						<!--<explosiveExpandPerStackcount>0.4</explosiveExpandPerStackcount>-->
+						<startWickHitPointsPercent>0.7</startWickHitPointsPercent>
+						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+						<explodeOnKilled>True</explodeOnKilled>
+						<wickTicks>30~60</wickTicks>
+					</li>
+				</comps>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_Bullet_Shell_PsychicWarhead"]</xpath>
+
+		<value>
+			<ThingDef ParentName="Base81mmMortarShell">
+				<defName>VFEI_Bullet_Shell_PsychicWarhead</defName>
+				<label>81mm mortar shell (Psychic Warhead)</label>
+				<graphicData>
+					<texPath>Things/Projectile/ShellArchotechInsanity</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<projectile Class="CombatExtended.ProjectilePropertiesCE">
+					<damageDef>VFEI_PsychicDamage</damageDef>
+					<damageAmountBase>50</damageAmountBase>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>0</armorPenetrationBlunt>
+					<flyOverhead>true</flyOverhead>
+					<explosionRadius>5.5</explosionRadius>
+				</projectile>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_81mmMortarShell"]/ammoTypes</xpath>
+
+		<value>
+			<VFEI_Shell_PsychicWarhead>VFEI_Bullet_Shell_PsychicWarhead</VFEI_Shell_PsychicWarhead>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/Bodies/Bodies_Boomtick.xml b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/Bodies/Bodies_Boomtick.xml
new file mode 100644
index 0000000000..b819ee11d2
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/Bodies/Bodies_Boomtick.xml	
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Boomtick === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="VFEI_Boomtick"]//*[
+			def="Shell" or
+			def="Elytra" or
+			def="Pronotum"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="VFEI_Boomtick"]//*[
+			def="Shell" or
+			def="Elytra" or
+			def="Pronotum" or
+			def="InsectMouth" or
+			def="InsectHead"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/Bodies/Bodies_Scorpionlike.xml b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/Bodies/Bodies_Scorpionlike.xml
new file mode 100644
index 0000000000..600db8df7f
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/Bodies/Bodies_Scorpionlike.xml	
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Scorpion === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="VFEI_ScorpionLike"]//*[
+			def="Shell" or
+			def="VFEI_Thorax" or
+			def="Pronotum" or
+			def="VFEI_InsectTail"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="VFEI_ScorpionLike"]//*[
+			def="Shell" or
+			def="VFEI_Thorax" or
+			def="Pronotum" or
+			def="VFEI_InsectTail" or
+			def="VFEI_InsectSting" or
+			def="InsectMouth" or
+			def="InsectHead"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/Bodies/Bodies_Wargling.xml b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/Bodies/Bodies_Wargling.xml
new file mode 100644
index 0000000000..799a7c83e0
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/Bodies/Bodies_Wargling.xml	
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Wargling === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="VFEI_Wargling"]//*[
+			def="Shell" or
+			def="Elytra" or
+			def="Pronotum"]
+		</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/BodyDef[defName="VFEI_Wargling"]//*[
+			def="Shell" or
+			def="Elytra" or
+			def="Pronotum" or
+			def="VFEI_FrontClaw" or
+			def="InsectMouth" or
+			def="InsectHead"]/groups
+		</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/Hediffs/Hediffs_Mutations.xml b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/Hediffs/Hediffs_Mutations.xml
new file mode 100644
index 0000000000..b45da630ed
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/Hediffs/Hediffs_Mutations.xml	
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="VFEI_VenomGland"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>venom gland</label>
+					<capacities>
+						<li>SpittingOnPawn</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4</cooldownTime>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="VFEI_PneumaticClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claw</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>3.6</cooldownTime>
+					<armorPenetrationBlunt>22.05</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/PawnKindDefs_Humanlikes/PawnKinds_Pirate.xml b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/PawnKindDefs_Humanlikes/PawnKinds_Pirate.xml
new file mode 100644
index 0000000000..f3951905dc
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/PawnKindDefs_Humanlikes/PawnKinds_Pirate.xml	
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/PawnKindDef[defName="VFEI_RiotUnit"]/modExtensions/li[@Class="VFECore.PawnKindDefExtension"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="VFEI_RiotUnit"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>250</min>
+					<max>700</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>VFE_RiotShield</li>
+				</shieldTags>
+				<shieldChance>1</shieldChance>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>150</min>
+						<max>350</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Melee</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/Scenario/Scenario.xml b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/Scenario/Scenario.xml
new file mode 100644
index 0000000000..26d6cf3858
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/Scenario/Scenario.xml	
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Removes Charge Lance from scenario === -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ScenarioDef[defName="VFEI_MercenarySquad"]/scenario/parts/li[thingDef="Gun_ChargeLance"]</xpath>
+	</Operation>
+
+	<!-- === Increases Charge Rifle count to 3 to replace the CL === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ScenarioDef[defName="VFEI_MercenarySquad"]/scenario/parts/li[thingDef="Gun_ChargeRifle"]/count</xpath>
+
+		<value>
+			<count>3</count>
+		</value>
+	</Operation>
+
+	<!-- === Adds ammo to the scenario === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="VFEI_MercenarySquad"]/scenario/parts</xpath>
+
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_6x24mmCharged</thingDef>
+				<count>600</count>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Items/Items_Resource_Leathers.xml b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Items/Items_Resource_Leathers.xml
new file mode 100644
index 0000000000..9869e8f75e
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Items/Items_Resource_Leathers.xml	
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Chitin === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEI_Chitin"]/statBases</xpath>
+		<value>
+			<Bulk>0.3</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_Chitin"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>1.1</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_Chitin"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.60</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_Chitin"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.005</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEI_Chitin"]/stuffProps/categories</xpath>
+		<value>
+			<li>Metallic_Weapon</li>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEI_Chitin"]/stuffProps/statFactors</xpath>
+		<value>
+			<Mass>0.7</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_Chitin"]/statBases/BluntDamageMultiplier</xpath>
+		<value>
+			<BluntDamageMultiplier>0.65</BluntDamageMultiplier>
+		</value>
+	</Operation>
+
+	<!-- === Spidersilk === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_Spidersilk"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.01</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_Spidersilk"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.05</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_Spidersilk"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.001</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Misc/Apparel_Various.xml b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Misc/Apparel_Various.xml
new file mode 100644
index 0000000000..c686b1783e
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Misc/Apparel_Various.xml	
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Riot Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Apparel_RiotHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Apparel_RiotHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Apparel_RiotHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>28</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Apparel_RiotHelmet"]/costList/Steel</xpath>
+		<value>
+			<Steel>55</Steel>
+			<DevilstrandCloth>10</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFE_Apparel_RiotHelmet"]/costList/ComponentIndustrial</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFE_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>
+
+	<!-- === Riot Armor === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Apparel_RiotArmor"]/statBases</xpath>
+		<value>
+			<Bulk>40</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Apparel_RiotArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>20</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Apparel_RiotArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Apparel_RiotArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Apparel_RiotArmor"]/costList/Cloth</xpath>
+		<value>
+			<Cloth>80</Cloth>
+			<DevilstrandCloth>40</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Apparel_RiotArmor"]/costList/Steel</xpath>
+		<value>
+			<Steel>80</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFE_Apparel_RiotArmor"]/costList/ComponentIndustrial</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Apparel_RiotArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<MeleeDodgeChance>-0.15</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Apparel_RiotArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFE_Apparel_RiotArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Riot Shield : Replaced as CE type shield === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_Shield_Riot"]</xpath>
+		<value>
+			<ThingDef ParentName="ShieldBase">
+				<defName>VFEI_Shield_Riot</defName>
+				<label>riot shield</label>
+				<description>An industrial heavy shield made out of reinforced steel. Provides a lot of protection against blunt damage, which makes it ideal for urbworld riot police.</description>
+				<techLevel>Industrial</techLevel>
+				<graphicData>
+					<texPath>Things/Pawn/Humanlike/RiotShield/RiotShield</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<costList>
+					<Steel>60</Steel>
+					<DevilstrandCloth>20</DevilstrandCloth>
+				</costList>
+				<statBases>
+					<WorkToMake>7500</WorkToMake>
+					<MaxHitPoints>125</MaxHitPoints>
+					<ArmorRating_Sharp>3.5</ArmorRating_Sharp>
+					<ArmorRating_Blunt>5.25</ArmorRating_Blunt>
+					<ArmorRating_Heat>0.25</ArmorRating_Heat>
+					<Mass>6</Mass>
+					<Bulk>15</Bulk>
+					<WornBulk>10</WornBulk>
+					<Flammability>0.1</Flammability>
+				</statBases>
+				<equippedStatOffsets>
+					<ReloadSpeed>-0.15</ReloadSpeed>
+					<MeleeHitChance>-2</MeleeHitChance>
+					<ShootingAccuracyPawn>-0.4</ShootingAccuracyPawn>
+					<AimingAccuracy>-0.1</AimingAccuracy>
+					<Suppressability>-0.25</Suppressability>
+					<MeleeCritChance>-0.1</MeleeCritChance>
+					<MeleeParryChance>1.0</MeleeParryChance>
+				</equippedStatOffsets>
+				<apparel>
+					<tags>
+						<li>VFE_RiotShield</li>
+					</tags>
+				</apparel>
+				<modExtensions>
+					<li Class="CombatExtended.ShieldDefExtension">
+						<shieldCoverage>
+							<li>Hands</li>
+							<li>Arms</li>
+							<li>Shoulders</li>
+							<li>Torso</li>
+							<li>Neck</li>
+							<li>FullHead</li>
+						</shieldCoverage>
+						<crouchCoverage>
+							<li>Legs</li>
+						</crouchCoverage>
+						<drawAsTall>true</drawAsTall>
+					</li>
+				</modExtensions>
+			</ThingDef>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Misc/Weapons_Spacer.xml b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Misc/Weapons_Spacer.xml
new file mode 100644
index 0000000000..0d09718b02
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Misc/Weapons_Spacer.xml	
@@ -0,0 +1,246 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Gun_Plasmacutter"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Gun_PlasmaScattergun" or defName="VFE_Gun_Plasmapiercer" or defName="VFE_Gun_PlasmabeamRifle"]/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>
+
+	<!-- === Plasma Saw === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Plasmasaw"]/statBases/Mass</xpath>
+		<value>
+			<Mass>2.8</Mass>
+			<Bulk>6.5</Bulk>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Plasmasaw"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>plasma chain</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.1</cooldownTime>
+					<armorPenetrationSharp>3.68</armorPenetrationSharp>
+					<!-- <linkedBodyPartsGroup>Chain</linkedBodyPartsGroup> -->
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>2</amount>
+							<chance>0.3</chance>
+						</li>
+					</extraMeleeDamages>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Plasma Cutter === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFE_Gun_Plasmacutter</defName>
+		<statBases>
+			<WorkToMake>18000</WorkToMake>
+			<Mass>2</Mass>
+			<Bulk>2.15</Bulk>
+			<SwayFactor>1.00</SwayFactor>
+			<ShotSpread>0.15</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_VFEI_PlasmaCutter</defaultProjectile>
+			<!-- <burstShotCount>3</burstShotCount> -->
+			<!-- <ticksBetweenBurstShots>5</ticksBetweenBurstShots> -->
+			<warmupTime>0.5</warmupTime>
+			<range>15</range>
+			<soundCast>VFE_PlasmaShot_Cutter</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_VFEI_PlasmaCutter</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- === Plasma Scattergun === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFE_Gun_PlasmaScattergun</defName>
+		<statBases>
+			<WorkToMake>26000</WorkToMake>
+			<Mass>4.11</Mass>
+			<Bulk>5.15</Bulk>
+			<SwayFactor>1.10</SwayFactor>
+			<ShotSpread>0.20</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_VFEI_PlasmaScatter</defaultProjectile>
+			<!-- <burstShotCount>3</burstShotCount> -->
+			<!-- <ticksBetweenBurstShots>5</ticksBetweenBurstShots> -->
+			<warmupTime>0.5</warmupTime>
+			<range>20</range>
+			<soundCast>VFE_PlasmaShot_Scattergun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_VFEI_PlasmaScatter</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- === Plasma Beam Rifle === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFE_Gun_PlasmabeamRifle</defName>
+		<statBases>
+			<WorkToMake>36800</WorkToMake>
+			<Mass>4.36</Mass>
+			<Bulk>6.15</Bulk>
+			<SwayFactor>1.00</SwayFactor>
+			<ShotSpread>0.15</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<NightVisionEfficiency_Weapon>0.4</NightVisionEfficiency_Weapon>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.31</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_VFEI_PlasmaRifle</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>1.0</warmupTime>
+			<range>55</range>
+			<soundCast>VFE_PlasmaShot_Beam</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_VFEI_PlasmaRifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- === Plasma Piercer === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFE_Gun_Plasmapiercer</defName>
+		<statBases>
+			<WorkToMake>36800</WorkToMake>
+			<Mass>5.20</Mass>
+			<Bulk>7.15</Bulk>
+			<SwayFactor>1.00</SwayFactor>
+			<ShotSpread>0.15</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_VFEI_PlasmaPiercer</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>44</range>
+			<soundCast>VFE_PlasmaShot_Piercer</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_VFEI_PlasmaPiercer</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races/Races_Animal_Insect.xml b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races/Races_Animal_Insect.xml
new file mode 100644
index 0000000000..af4ccdea59
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races/Races_Animal_Insect.xml	
@@ -0,0 +1,466 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Queen === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Queen"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>2.6</MoveSpeed>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.30</MeleeCritChance>
+			<MeleeParryChance>0.57</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Queen"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Queen"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Queen"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head claw</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>37</power>
+					<cooldownTime>1.48</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>50</armorPenetrationSharp>
+					<armorPenetrationBlunt>30</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head claw</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>65</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>3.38</armorPenetrationSharp>
+					<armorPenetrationBlunt>8.438</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>34</power>
+					<cooldownTime>2.64</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Queen"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Queen"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Queen"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>3000</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Royal Megaspider === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_Insectoid_RoyalMegaspider"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4.4</MoveSpeed>
+			<MeleeDodgeChance>0.06</MeleeDodgeChance>
+			<MeleeCritChance>0.33</MeleeCritChance>
+			<MeleeParryChance>0.23</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_Insectoid_RoyalMegaspider"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>14</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_Insectoid_RoyalMegaspider"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_Insectoid_RoyalMegaspider"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>2.5</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_Insectoid_RoyalMegaspider"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head claw</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>48</armorPenetrationSharp>
+					<armorPenetrationBlunt>24</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head claw</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>49</power>
+					<cooldownTime>2.6</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>12.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>2.17</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>6.48</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFEI_Insectoid_RoyalMegaspider"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFEI_Insectoid_RoyalMegaspider"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEI_Insectoid_RoyalMegaspider"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1075</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Gigalocust === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Gigalocust"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4.8</MoveSpeed>
+			<MeleeDodgeChance>0.07</MeleeDodgeChance>
+			<MeleeCritChance>0.41</MeleeCritChance>
+			<MeleeParryChance>0.19</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Gigalocust"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>28</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Gigalocust"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>11</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Gigalocust"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>2.1</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Gigalocust"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head claw</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>29</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head claw</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>52</power>
+					<cooldownTime>2.6</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>12.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>2.17</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>6.48</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Gigalocust"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Gigalocust"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Gigalocust"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>950</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="VFEI_Insectoid_Gigalocust"]/combatPower</xpath>
+		<value>
+			<combatPower>300</combatPower>
+		</value>
+	</Operation>
+
+	<!-- === Royal Megapede === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Megapede"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>3.3</MoveSpeed>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.36</MeleeCritChance>
+			<MeleeParryChance>0.38</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Megapede"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Megapede"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Megapede"]/race/body</xpath>
+		<value>
+			<body>CE_ArmoredBeetleLikeWithClaw</body>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Megapede"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>3.5</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Megapede"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head claw</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>63</power>
+					<cooldownTime>3.28</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2.43</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>32</power>
+					<cooldownTime>3.4</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>10.56</armorPenetrationSharp>
+					<armorPenetrationBlunt>39.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>3.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.8</chanceFactor>
+					<armorPenetrationBlunt>17.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Megapede"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Megapede"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Megapede"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1325</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="VFEI_Insectoid_Megapede"]/combatPower</xpath>
+		<value>
+			<combatPower>250</combatPower>
+		</value>
+	</Operation>
+
+	<!-- === Larvae === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Larvae"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>1.5</MoveSpeed>
+			<MeleeDodgeChance>0.06</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+			<MeleeParryChance>0.04</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Larvae"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>0.2</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Larvae"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.031</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.031</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Boomtick.xml b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Boomtick.xml
new file mode 100644
index 0000000000..90d3dc747d
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Boomtick.xml	
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatgrownBoomtick"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4.35</MoveSpeed>
+			<MeleeDodgeChance>0.11</MeleeDodgeChance>
+			<MeleeCritChance>0.11</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatgrownBoomtick"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.65</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatgrownBoomtick"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatgrownBoomtick"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>0.4</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatgrownBoomtick"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFEI_VatgrownBoomtick"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFEI_VatgrownBoomtick"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEI_VatgrownBoomtick"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>312</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Cuterpillar.xml b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Cuterpillar.xml
new file mode 100644
index 0000000000..11c1edf7db
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Cuterpillar.xml	
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownCuterpillar"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>2.3</MoveSpeed>
+			<MeleeDodgeChance>0.11</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.0</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownCuterpillar"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>0.2</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownCuterpillar"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.031</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Gigascorpion.xml b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Gigascorpion.xml
new file mode 100644
index 0000000000..682bb1a409
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Gigascorpion.xml	
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigascorpion"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4.8</MoveSpeed>
+			<MeleeDodgeChance>0.07</MeleeDodgeChance>
+			<MeleeCritChance>0.5</MeleeCritChance>
+			<MeleeParryChance>0.39</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigascorpion"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigascorpion"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigascorpion"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left pincer</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>37</power>
+					<cooldownTime>2.72</cooldownTime>
+					<linkedBodyPartsGroup>VFEI_PincerAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>3.54</armorPenetrationSharp>
+					<armorPenetrationBlunt>61.875</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right pincer</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>37</power>
+					<cooldownTime>2.72</cooldownTime>
+					<linkedBodyPartsGroup>VFEI_PincerAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>3.54</armorPenetrationSharp>
+					<armorPenetrationBlunt>61.875</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>VFEI_ToxicSting</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>VFEI_Sting</linkedBodyPartsGroup>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>2.46</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>10.8</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigascorpion"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<useStatic>false</useStatic>
+						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+						<parts>
+							<li>VFEI_LeftPincer</li>
+							<li>VFEI_RightPincer</li>
+						</parts>
+					</li>
+					<li>
+						<useStatic>false</useStatic>
+						<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
+						<parts>
+							<li>VFEI_LeftPincer</li>
+							<li>VFEI_RightPincer</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigascorpion"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigascorpion"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigascorpion"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1125</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Gigawig.xml b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Gigawig.xml
new file mode 100644
index 0000000000..c7aae13936
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Gigawig.xml	
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigawig"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>2.6</MoveSpeed>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.23</MeleeCritChance>
+			<MeleeParryChance>0.33</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigawig"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigawig"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigawig"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.97</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>4.79</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.32</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigawig"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigawig"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigawig"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1000</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Megacricket.xml b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Megacricket.xml
new file mode 100644
index 0000000000..cdc96b8c3e
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Megacricket.xml	
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegacricket"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>5.75</MoveSpeed>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.23</MeleeCritChance>
+			<MeleeParryChance>0.12</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegacricket"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegacricket"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegacricket"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2.23</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.64</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.88</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.32</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegacricket"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegacricket"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegacricket"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>712</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Milkbeetle.xml b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Milkbeetle.xml
new file mode 100644
index 0000000000..c4f5f5269d
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Milkbeetle.xml	
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownMilkbeetle"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>2.5</MoveSpeed>
+			<MeleeDodgeChance>0.04</MeleeDodgeChance>
+			<MeleeCritChance>0.10</MeleeCritChance>
+			<MeleeParryChance>0.24</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownMilkbeetle"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4.65</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownMilkbeetle"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownMilkbeetle"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.97</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>4.79</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.32</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownMilkbeetle"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFEI_VatGrownMilkbeetle"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownMilkbeetle"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1475</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Monstrosity.xml b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Monstrosity.xml
new file mode 100644
index 0000000000..2110239452
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Monstrosity.xml	
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownMonstrosity"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>5.75</MoveSpeed>
+			<MeleeDodgeChance>0.10</MeleeDodgeChance>
+			<MeleeCritChance>0.62</MeleeCritChance>
+			<MeleeParryChance>0.26</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownMonstrosity"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>60</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownMonstrosity"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownMonstrosity"]/race/body</xpath>
+		<value>
+			<body>CE_ArmoredBeetleLikeWithClaw</body>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownMonstrosity"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head claw</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>0.99</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>46.88</armorPenetrationSharp>
+					<armorPenetrationBlunt>23.438</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>52</power>
+					<cooldownTime>0.85</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
+					<armorPenetrationBlunt>12.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>43</power>
+					<cooldownTime>0.94</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>18.75</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownMonstrosity"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFEI_VatGrownMonstrosity"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownMonstrosity"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>2200</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Princess.xml b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Princess.xml
new file mode 100644
index 0000000000..d21d46df5d
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Princess.xml	
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownPrincess"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>2.1</MoveSpeed>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.18</MeleeCritChance>
+			<MeleeParryChance>0.51</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownPrincess"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownPrincess"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownPrincess"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>33</power>
+					<cooldownTime>2.48</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2.48</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownPrincess"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFEI_VatGrownPrincess"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownPrincess"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1900</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_RoyalLarva.xml b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_RoyalLarva.xml
new file mode 100644
index 0000000000..8fff2bfe25
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_RoyalLarva.xml	
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatgrownRoyalLarva"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>1.15</MoveSpeed>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			<MeleeCritChance>0.0</MeleeCritChance>
+			<MeleeParryChance>0.0</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatgrownRoyalLarva"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.031</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.031</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_RoyalMaggot.xml b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_RoyalMaggot.xml
new file mode 100644
index 0000000000..38971afa73
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_RoyalMaggot.xml	
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownRoyalMaggot"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>1.15</MoveSpeed>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.03</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownRoyalMaggot"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownRoyalMaggot"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownRoyalMaggot"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownRoyalMaggot"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFEI_VatGrownRoyalMaggot"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownRoyalMaggot"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>475</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Spiderweaver.xml b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Spiderweaver.xml
new file mode 100644
index 0000000000..40026b5c20
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Spiderweaver.xml	
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownSpiderweaver"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>3.6</MoveSpeed>
+			<MeleeDodgeChance>0.06</MeleeDodgeChance>
+			<MeleeCritChance>0.20</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownSpiderweaver"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownSpiderweaver"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownSpiderweaver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>32</power>
+					<cooldownTime>2.52</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.6</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2.35</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownSpiderweaver"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFEI_VatGrownSpiderweaver"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownSpiderweaver"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>687</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Titanbeetle.xml b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Titanbeetle.xml
new file mode 100644
index 0000000000..7b07d615b7
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Titanbeetle.xml	
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownTitanbeetle"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>2.85</MoveSpeed>
+			<MeleeDodgeChance>0.04</MeleeDodgeChance>
+			<MeleeCritChance>0.37</MeleeCritChance>
+			<MeleeParryChance>0.41</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownTitanbeetle"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>26</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownTitanbeetle"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownTitanbeetle"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>2.75</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownTitanbeetle"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head claw</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>76</power>
+					<cooldownTime>3.32</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>36</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>33</power>
+					<cooldownTime>2.72</cooldownTime>
+					<chanceFactor>0.8</chanceFactor>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>3.51</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.6</chanceFactor>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownTitanbeetle"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFEI_VatGrownTitanbeetle"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownTitanbeetle"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1312</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_VatGigalocust.xml b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_VatGigalocust.xml
new file mode 100644
index 0000000000..dd2a0bc3af
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_VatGigalocust.xml	
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigalocust"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>5.2</MoveSpeed>
+			<MeleeDodgeChance>0.07</MeleeDodgeChance>
+			<MeleeCritChance>0.38</MeleeCritChance>
+			<MeleeParryChance>0.19</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigalocust"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>22</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigalocust"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>9</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigalocust"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>2.1</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigalocust"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head claw</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head claw</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>50</power>
+					<cooldownTime>2.6</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>12.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>2.17</cooldownTime>
+					<chanceFactor>0.2</chanceFactor>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>6.48</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigalocust"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigalocust"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigalocust"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>950</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_VatMegapede.xml b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_VatMegapede.xml
new file mode 100644
index 0000000000..52f519e2e9
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_VatMegapede.xml	
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegapede"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>2.8</MoveSpeed>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.35</MeleeCritChance>
+			<MeleeParryChance>0.37</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegapede"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>14</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegapede"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4.65</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegapede"]/race/body</xpath>
+		<value>
+			<body>CE_ArmoredBeetleLikeWithClaw</body>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegapede"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>3.45</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegapede"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head claw</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>60</power>
+					<cooldownTime>3.28</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2.43</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>ToxicBite</li>
+					</capacities>
+					<power>31</power>
+					<cooldownTime>3.4</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>10.56</armorPenetrationSharp>
+					<armorPenetrationBlunt>39.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>33</power>
+					<cooldownTime>3.51</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.8</chanceFactor>
+					<armorPenetrationBlunt>14.175</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegapede"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegapede"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegapede"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1312</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_VatMegascarab.xml b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_VatMegascarab.xml
new file mode 100644
index 0000000000..6a619708dc
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_VatMegascarab.xml	
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegascarab"]/statBases/MoveSpeed</xpath>
+
+		<value>
+			<MoveSpeed>4.7</MoveSpeed>
+			<MeleeDodgeChance>0.30</MeleeDodgeChance>
+			<MeleeCritChance>0.03</MeleeCritChance>
+			<MeleeParryChance>0.0</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegascarab"]/statBases/ArmorRating_Blunt</xpath>
+
+		<value>
+			<ArmorRating_Blunt>2.25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegascarab"]/statBases/ArmorRating_Sharp</xpath>
+
+		<value>
+			<ArmorRating_Sharp>0.7</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegascarab"]/race/baseHealthScale</xpath>
+
+		<value>
+			<baseHealthScale>0.3</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegascarab"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegascarab"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegascarab"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegascarab"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>450</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_VatMegaspider.xml b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_VatMegaspider.xml
new file mode 100644
index 0000000000..e8c34a857a
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_VatMegaspider.xml	
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatgrownMegaspider"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4.4</MoveSpeed>
+			<MeleeDodgeChance>0.09</MeleeDodgeChance>
+			<MeleeCritChance>0.31</MeleeCritChance>
+			<MeleeParryChance>0.17</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatgrownMegaspider"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatgrownMegaspider"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatgrownMegaspider"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>1.8</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatgrownMegaspider"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head claw</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head claw</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>41</power>
+					<cooldownTime>2.48</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>6.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2.48</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFEI_VatgrownMegaspider"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFEI_VatgrownMegaspider"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEI_VatgrownMegaspider"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>737</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_VatSpelopede.xml b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_VatSpelopede.xml
new file mode 100644
index 0000000000..93f9fd8cea
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_VatSpelopede.xml	
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownSpelopede"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4.5</MoveSpeed>
+			<MeleeDodgeChance>0.11</MeleeDodgeChance>
+			<MeleeCritChance>0.17</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownSpelopede"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownSpelopede"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownSpelopede"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>1.2</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownSpelopede"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head claw</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>1.78</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.24</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.67</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head claw</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.78</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>4</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownSpelopede"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFEI_VatGrownSpelopede"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownSpelopede"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>487</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Wargling.xml b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Wargling.xml
new file mode 100644
index 0000000000..b5ed8058c9
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Wargling.xml	
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownWargling"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>6.0</MoveSpeed>
+			<MeleeDodgeChance>0.11</MeleeDodgeChance>
+			<MeleeCritChance>0.21</MeleeCritChance>
+			<MeleeParryChance>0.18</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownWargling"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>10.8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownWargling"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3.65</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownWargling"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>2</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownWargling"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.24</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>30</armorPenetrationSharp>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>33</power>
+					<cooldownTime>1.71</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.0</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.0</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.24</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>30</armorPenetrationSharp>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>33</power>
+					<cooldownTime>1.71</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.0</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.0</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.49</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.0</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.44</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownWorkerAnt"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFEI_VatGrownWorkerAnt"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownWorkerAnt"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>937</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_WorkerAnt.xml b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_WorkerAnt.xml
new file mode 100644
index 0000000000..b513c04e31
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Insectoids/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_WorkerAnt.xml	
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownWorkerAnt"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4.6</MoveSpeed>
+			<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			<MeleeCritChance>0.16</MeleeCritChance>
+			<MeleeParryChance>0.14</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownWorkerAnt"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownWorkerAnt"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownWorkerAnt"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>1.3</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownWorkerAnt"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2.23</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.64</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.88</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.32</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownWorkerAnt"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFEI_VatGrownWorkerAnt"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEI_VatGrownWorkerAnt"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>700</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Mechanoids/Defs/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/Ammo_Mechanoid.xml b/ModPatches/Vanilla Factions Expanded - Mechanoids/Defs/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/Ammo_Mechanoid.xml
new file mode 100644
index 0000000000..8916c0d7e5
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Mechanoids/Defs/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/Ammo_Mechanoid.xml	
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- ==================== Advanced Charge Lance ========================== -->
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base5x35mmChargedBullet">
+		<defName>VFE_Bullet_5x35mmHyper</defName>
+		<label>5x35mm Hyper bullet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Charged/ChargeLanceShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>(2,2)</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE" Inherit="False">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>16</damageAmountBase>
+			<speed>229</speed>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>2</amount>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationSharp>36</armorPenetrationSharp>
+			<armorPenetrationBlunt>117.6</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base90mmCannonShell">
+		<defName>VFE_Bullet_ChargeRailgun_CE</defName>
+		<label>charge railgun shot</label>
+		<graphicData>
+			<texPath>Things/Projectile/ChargeRailgunShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>4</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>242</speed>
+			<flyOverhead>false</flyOverhead>
+			<dropsCasings>false</dropsCasings>
+			<casingMoteDefname>Fleck_BigShell</casingMoteDefname>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>500</damageAmountBase>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<armorPenetrationSharp>200</armorPenetrationSharp>
+			<armorPenetrationBlunt>20000</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>300</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>8</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>50</Fragment_Large>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBulletCE">
+		<defName>VFE_Bullet_TeslaProjectileCE</defName>
+		<label>lightning bolt</label>
+		<graphicData>
+			<texPath>Projectile/Lightning</texPath>
+			<graphicClass>Graphic_Flicker</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>EMP</damageDef>
+			<damageAmountBase>21</damageAmountBase>
+			<explosionRadius>2.5</explosionRadius>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<speed>242</speed>
+			<flyOverhead>false</flyOverhead>
+			<dropsCasings>false</dropsCasings>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+		</projectile>
+	</ThingDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Mechanoids/Defs/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/CombinationDefs.xml b/ModPatches/Vanilla Factions Expanded - Mechanoids/Defs/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/CombinationDefs.xml
new file mode 100644
index 0000000000..7438e975af
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Mechanoids/Defs/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/CombinationDefs.xml	
@@ -0,0 +1,357 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!--60mm-->
+
+	<ItemProcessor.CombinationDef>
+		<defName>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Shell_60mmMortar_HE</defName>
+		<building>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry</building>
+		<items>
+			<li>Steel</li>
+		</items>
+		<secondItems>
+			<li>FSX</li>
+		</secondItems>
+		<thirdItems>
+			<li>ComponentIndustrial</li>
+		</thirdItems>
+		<amount>
+			<li>20</li>
+			<li>4</li>
+			<li>2</li>
+		</amount>
+		<outputLimitControlled>true</outputLimitControlled>
+		<maxTotalOutput>100</maxTotalOutput>
+		<result>Shell_60mmMortar_HE</result>
+		<yield>5</yield>
+		<useQualityIncreasing>false</useQualityIncreasing>
+		<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
+	</ItemProcessor.CombinationDef>
+
+	<ItemProcessor.CombinationDef>
+		<defName>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Shell_60mmMortar_Incendiary</defName>
+		<building>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry</building>
+		<items>
+			<li>Steel</li>
+		</items>
+		<secondItems>
+			<li>Prometheum</li>
+		</secondItems>
+		<thirdItems>
+			<li>ComponentIndustrial</li>
+		</thirdItems>
+		<amount>
+			<li>20</li>
+			<li>2</li>
+			<li>2</li>
+		</amount>
+		<outputLimitControlled>true</outputLimitControlled>
+		<maxTotalOutput>100</maxTotalOutput>
+		<result>Shell_60mmMortar_Incendiary</result>
+		<yield>5</yield>
+		<useQualityIncreasing>false</useQualityIncreasing>
+		<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
+	</ItemProcessor.CombinationDef>
+
+	<ItemProcessor.CombinationDef>
+		<defName>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Shell_60mmMortar_EMP</defName>
+		<building>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry</building>
+		<items>
+			<li>Steel</li>
+		</items>
+		<secondItems>
+			<li>Chemfuel</li>
+		</secondItems>
+		<thirdItems>
+			<li>ComponentIndustrial</li>
+		</thirdItems>
+		<amount>
+			<li>20</li>
+			<li>20</li>
+			<li>4</li>
+		</amount>
+		<outputLimitControlled>true</outputLimitControlled>
+		<maxTotalOutput>100</maxTotalOutput>
+		<result>Shell_60mmMortar_EMP</result>
+		<yield>5</yield>
+		<useQualityIncreasing>false</useQualityIncreasing>
+		<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
+	</ItemProcessor.CombinationDef>
+
+	<!-- ========== 90mm ========== -->
+
+	<ItemProcessor.CombinationDef>
+		<defName>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Ammo_90mmCannonShell_HE</defName>
+		<building>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry</building>
+		<items>
+			<li>Steel</li>
+		</items>
+		<secondItems>
+			<li>FSX</li>
+		</secondItems>
+		<thirdItems>
+			<li>ComponentIndustrial</li>
+		</thirdItems>
+		<amount>
+			<li>192</li>
+			<li>10</li>
+			<li>2</li>
+		</amount>
+		<outputLimitControlled>true</outputLimitControlled>
+		<maxTotalOutput>100</maxTotalOutput>
+		<result>Ammo_90mmCannonShell_HE</result>
+		<yield>5</yield>
+		<useQualityIncreasing>false</useQualityIncreasing>
+		<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
+	</ItemProcessor.CombinationDef>
+
+	<ItemProcessor.CombinationDef>
+		<defName>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Ammo_90mmCannonShell_HEAT</defName>
+		<building>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry</building>
+		<items>
+			<li>Steel</li>
+		</items>
+		<secondItems>
+			<li>FSX</li>
+		</secondItems>
+		<thirdItems>
+			<li>ComponentIndustrial</li>
+		</thirdItems>
+		<amount>
+			<li>160</li>
+			<li>8</li>
+			<li>2</li>
+		</amount>
+		<outputLimitControlled>true</outputLimitControlled>
+		<maxTotalOutput>100</maxTotalOutput>
+		<result>Ammo_90mmCannonShell_HEAT</result>
+		<yield>5</yield>
+		<useQualityIncreasing>false</useQualityIncreasing>
+		<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
+	</ItemProcessor.CombinationDef>
+
+	<ItemProcessor.CombinationDef>
+		<defName>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Ammo_90mmCannonShell_EMP</defName>
+		<building>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry</building>
+		<items>
+			<li>Steel</li>
+		</items>
+		<secondItems>
+			<li>Chemfuel</li>
+		</secondItems>
+		<thirdItems>
+			<li>ComponentIndustrial</li>
+		</thirdItems>
+		<amount>
+			<li>192</li>
+			<li>20</li>
+			<li>11</li>
+		</amount>
+		<outputLimitControlled>true</outputLimitControlled>
+		<maxTotalOutput>100</maxTotalOutput>
+		<result>Ammo_90mmCannonShell_EMP</result>
+		<yield>5</yield>
+		<useQualityIncreasing>false</useQualityIncreasing>
+		<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
+	</ItemProcessor.CombinationDef>
+
+	<!-- ========== Mechanoid ammo production ========== -->
+
+	<ItemProcessor.CombinationDef>
+		<defName>VFEM_VersatileAssembler_Ammo_80x256mmFuel</defName>
+		<building>VFEM_VersatileAssembler</building>
+		<items>
+			<li>Steel</li>
+		</items>
+		<secondItems>
+			<li>Prometheum</li>
+		</secondItems>
+		<thirdItems>
+			<li>ComponentIndustrial</li>
+		</thirdItems>
+		<amount>
+			<li>10</li>
+			<li>3</li>
+			<li>2</li>
+		</amount>
+		<outputLimitControlled>true</outputLimitControlled>
+		<maxTotalOutput>25</maxTotalOutput>
+		<result>Ammo_80x256mmFuel_Incendiary</result>
+		<yield>5</yield>
+		<useQualityIncreasing>false</useQualityIncreasing>
+		<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
+	</ItemProcessor.CombinationDef>
+	<ItemProcessor.CombinationDef>
+		<defName>VFEM_VersatileAssembler_Ammo_12x64mmCharged</defName>
+		<building>VFEM_VersatileAssembler</building>
+		<items>
+			<li>Plasteel</li>
+		</items>
+		<secondItems>
+			<li>Steel</li>
+		</secondItems>
+		<thirdItems>
+			<li>ComponentIndustrial</li>
+		</thirdItems>
+		<amount>
+			<li>32</li>
+			<li>8</li>
+			<li>14</li>
+		</amount>
+		<outputLimitControlled>true</outputLimitControlled>
+		<maxTotalOutput>2000</maxTotalOutput>
+		<result>Ammo_12x64mmCharged</result>
+		<yield>200</yield>
+		<useQualityIncreasing>false</useQualityIncreasing>
+		<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
+	</ItemProcessor.CombinationDef>
+	<ItemProcessor.CombinationDef>
+		<defName>VFEM_VersatileAssembler_Ammo_5x35mmCharged</defName>
+		<building>VFEM_VersatileAssembler</building>
+		<items>
+			<li>Plasteel</li>
+		</items>
+		<secondItems>
+			<li>Steel</li>
+		</secondItems>
+		<thirdItems>
+			<li>ComponentIndustrial</li>
+		</thirdItems>
+		<amount>
+			<li>12</li>
+			<li>10</li>
+			<li>7</li>
+		</amount>
+		<outputLimitControlled>true</outputLimitControlled>
+		<maxTotalOutput>2000</maxTotalOutput>
+		<result>Ammo_5x35mmCharged</result>
+		<yield>500</yield>
+		<useQualityIncreasing>false</useQualityIncreasing>
+		<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
+	</ItemProcessor.CombinationDef>
+
+	<ItemProcessor.CombinationDef>
+		<defName>VFEM_VersatileAssembler_Ammo_6x22mmCharged</defName>
+		<building>VFEM_VersatileAssembler</building>
+		<items>
+			<li>Plasteel</li>
+		</items>
+		<secondItems>
+			<li>Steel</li>
+		</secondItems>
+		<thirdItems>
+			<li>ComponentIndustrial</li>
+		</thirdItems>
+		<amount>
+			<li>8</li>
+			<li>6</li>
+			<li>5</li>
+		</amount>
+		<outputLimitControlled>true</outputLimitControlled>
+		<maxTotalOutput>2000</maxTotalOutput>
+		<result>Ammo_6x22mmCharged</result>
+		<yield>500</yield>
+		<useQualityIncreasing>false</useQualityIncreasing>
+		<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
+	</ItemProcessor.CombinationDef>
+
+	<ItemProcessor.CombinationDef>
+		<defName>VFEM_VersatileAssembler_Ammo_164x284mmDemo</defName>
+		<building>VFEM_VersatileAssembler</building>
+		<items>
+			<li>Steel</li>
+		</items>
+		<secondItems>
+			<li>FSX</li>
+		</secondItems>
+		<thirdItems>
+			<li>ComponentIndustrial</li>
+		</thirdItems>
+		<amount>
+			<li>16</li>
+			<li>5</li>
+			<li>4</li>
+		</amount>
+		<outputLimitControlled>true</outputLimitControlled>
+		<maxTotalOutput>25</maxTotalOutput>
+		<result>Ammo_164x284mmDemo</result>
+		<yield>5</yield>
+		<useQualityIncreasing>false</useQualityIncreasing>
+		<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
+	</ItemProcessor.CombinationDef>
+
+	<ItemProcessor.CombinationDef>
+		<defName>VFEM_VersatileAssembler_Ammo_66mmThermalBolt</defName>
+		<building>VFEM_VersatileAssembler</building>
+		<items>
+			<li>Steel</li>
+		</items>
+		<secondItems>
+			<li>Prometheum</li>
+		</secondItems>
+		<thirdItems>
+			<li>ComponentIndustrial</li>
+		</thirdItems>
+		<amount>
+			<li>22</li>
+			<li>2</li>
+			<li>2</li>
+		</amount>
+		<outputLimitControlled>true</outputLimitControlled>
+		<maxTotalOutput>25</maxTotalOutput>
+		<result>Ammo_66mmThermalBolt_Incendiary</result>
+		<yield>5</yield>
+		<useQualityIncreasing>false</useQualityIncreasing>
+		<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
+	</ItemProcessor.CombinationDef>
+
+	<ItemProcessor.CombinationDef>
+		<defName>VFEM_VersatileAssembler_Ammo_5x16mmCharged</defName>
+		<building>VFEM_VersatileAssembler</building>
+		<items>
+			<li>Plasteel</li>
+		</items>
+		<secondItems>
+			<li>Steel</li>
+		</secondItems>
+		<thirdItems>
+			<li>ComponentIndustrial</li>
+		</thirdItems>
+		<amount>
+			<li>6</li>
+			<li>4</li>
+			<li>6</li>
+		</amount>
+		<outputLimitControlled>true</outputLimitControlled>
+		<maxTotalOutput>2000</maxTotalOutput>
+		<result>Ammo_5x16mmCharged</result>
+		<yield>500</yield>
+		<useQualityIncreasing>false</useQualityIncreasing>
+		<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
+	</ItemProcessor.CombinationDef>
+	
+	<ItemProcessor.CombinationDef>
+		<defName>VFEM_VersatileAssembler_Ammo_8x40mmCharged</defName>
+		<building>VFEM_VersatileAssembler</building>
+		<items>
+			<li>Plasteel</li>
+		</items>
+		<secondItems>
+			<li>Steel</li>
+		</secondItems>
+		<thirdItems>
+			<li>ComponentIndustrial</li>
+		</thirdItems>
+		<amount>
+			<li>18</li>
+			<li>12</li>
+			<li>9</li>
+		</amount>
+		<outputLimitControlled>true</outputLimitControlled>
+		<maxTotalOutput>2000</maxTotalOutput>
+		<result>Ammo_8x40mmCharged</result>
+		<yield>500</yield>
+		<useQualityIncreasing>false</useQualityIncreasing>
+		<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
+	</ItemProcessor.CombinationDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Mechanoids/Defs/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/CombinationDefs_Mods.xml b/ModPatches/Vanilla Factions Expanded - Mechanoids/Defs/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/CombinationDefs_Mods.xml
new file mode 100644
index 0000000000..102f89d6c8
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Mechanoids/Defs/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/CombinationDefs_Mods.xml	
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- 76.2mm -->
+
+	<ItemProcessor.CombinationDef MayRequireAnyOf="OskarPotocki.VFE.Pirates,zal.WWIISovietFaction,Ravvy.AMW">
+		<defName>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Ammo_762x385mmRCannonShell_HE</defName>
+		<building>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry</building>
+		<items>
+			<li>Steel</li>
+		</items>
+		<secondItems>
+			<li>FSX</li>
+		</secondItems>
+		<thirdItems>
+			<li>ComponentIndustrial</li>
+		</thirdItems>
+		<amount>
+			<li>90</li>
+			<li>5</li>
+			<li>2</li>
+		</amount>
+		<outputLimitControlled>true</outputLimitControlled>
+		<maxTotalOutput>100</maxTotalOutput>
+		<result>Ammo_762x385mmRCannonShell_HE</result>
+		<yield>5</yield>
+		<useQualityIncreasing>false</useQualityIncreasing>
+		<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
+	</ItemProcessor.CombinationDef>
+
+	<ItemProcessor.CombinationDef MayRequireAnyOf="OskarPotocki.VFE.Pirates,zal.WWIISovietFaction,Ravvy.AMW">
+		<defName>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Ammo_762x385mmRCannonShell_HEAT</defName>
+		<building>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry</building>
+		<items>
+			<li>Steel</li>
+		</items>
+		<secondItems>
+			<li>FSX</li>
+		</secondItems>
+		<thirdItems>
+			<li>ComponentIndustrial</li>
+		</thirdItems>
+		<amount>
+			<li>108</li>
+			<li>3</li>
+			<li>2</li>
+		</amount>
+		<outputLimitControlled>true</outputLimitControlled>
+		<maxTotalOutput>100</maxTotalOutput>
+		<result>Ammo_762x385mmRCannonShell_HEAT</result>
+		<yield>5</yield>
+		<useQualityIncreasing>false</useQualityIncreasing>
+		<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
+	</ItemProcessor.CombinationDef>
+
+	<ItemProcessor.CombinationDef MayRequireAnyOf="OskarPotocki.VFE.Pirates,zal.WWIISovietFaction,Ravvy.AMW">
+		<defName>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Ammo_762x385mmRCannonShell_EMP</defName>
+		<building>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry</building>
+		<items>
+			<li>Steel</li>
+		</items>
+		<secondItems>
+			<li>Chemfuel</li>
+		</secondItems>
+		<thirdItems>
+			<li>ComponentIndustrial</li>
+		</thirdItems>
+		<amount>
+			<li>90</li>
+			<li>20</li>
+			<li>6</li>
+		</amount>
+		<outputLimitControlled>true</outputLimitControlled>
+		<maxTotalOutput>100</maxTotalOutput>
+		<result>Ammo_762x385mmRCannonShell_EMP</result>
+		<yield>5</yield>
+		<useQualityIncreasing>false</useQualityIncreasing>
+		<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
+	</ItemProcessor.CombinationDef>
+
+
+	<!-- 105mm -->
+
+	<ItemProcessor.CombinationDef MayRequireAnyOf="CETeam.CombatExtendedGuns">
+		<defName>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Ammo_105mmHowitzerShell_HE</defName>
+		<building>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry</building>
+		<items>
+			<li>Steel</li>
+		</items>
+		<secondItems>
+			<li>FSX</li>
+		</secondItems>
+		<thirdItems>
+			<li>ComponentIndustrial</li>
+		</thirdItems>
+		<amount>
+			<li>60</li>
+			<li>7</li>
+			<li>2</li>
+		</amount>
+		<outputLimitControlled>true</outputLimitControlled>
+		<maxTotalOutput>25</maxTotalOutput>
+		<result>Ammo_105mmHowitzerShell_HE</result>
+		<yield>2</yield>
+		<useQualityIncreasing>false</useQualityIncreasing>
+		<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
+	</ItemProcessor.CombinationDef>
+
+	<ItemProcessor.CombinationDef MayRequireAnyOf="CETeam.CombatExtendedGuns">
+		<defName>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Ammo_105mmHowitzerShell_HEAT</defName>
+		<building>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry</building>
+		<items>
+			<li>Steel</li>
+		</items>
+		<secondItems>
+			<li>FSX</li>
+		</secondItems>
+		<thirdItems>
+			<li>ComponentIndustrial</li>
+		</thirdItems>
+		<amount>
+			<li>76</li>
+			<li>4</li>
+			<li>2</li>
+		</amount>
+		<outputLimitControlled>true</outputLimitControlled>
+		<maxTotalOutput>25</maxTotalOutput>
+		<result>Ammo_105mmHowitzerShell_HEAT</result>
+		<yield>2</yield>
+		<useQualityIncreasing>false</useQualityIncreasing>
+		<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
+	</ItemProcessor.CombinationDef>
+
+	<ItemProcessor.CombinationDef MayRequireAnyOf="CETeam.CombatExtendedGuns">
+		<defName>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Ammo_105mmHowitzerShell_Incendiary</defName>
+		<building>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry</building>
+		<items>
+			<li>Steel</li>
+		</items>
+		<secondItems>
+			<li>Prometheum</li>
+		</secondItems>
+		<thirdItems>
+			<li>ComponentIndustrial</li>
+		</thirdItems>
+		<amount>
+			<li>60</li>
+			<li>3</li>
+			<li>2</li>
+		</amount>
+		<outputLimitControlled>true</outputLimitControlled>
+		<maxTotalOutput>25</maxTotalOutput>
+		<result>Ammo_105mmHowitzerShell_Incendiary</result>
+		<yield>2</yield>
+		<useQualityIncreasing>false</useQualityIncreasing>
+		<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
+	</ItemProcessor.CombinationDef>
+
+	<ItemProcessor.CombinationDef MayRequireAnyOf="CETeam.CombatExtendedGuns">
+		<defName>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Ammo_105mmHowitzerShell_EMP</defName>
+		<building>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry</building>
+		<items>
+			<li>Steel</li>
+		</items>
+		<secondItems>
+			<li>Chemfuel</li>
+		</secondItems>
+		<thirdItems>
+			<li>ComponentIndustrial</li>
+		</thirdItems>
+		<amount>
+			<li>76</li>
+			<li>20</li>
+			<li>7</li>
+		</amount>
+		<outputLimitControlled>true</outputLimitControlled>
+		<maxTotalOutput>25</maxTotalOutput>
+		<result>Ammo_105mmHowitzerShell_EMP</result>
+		<yield>2</yield>
+		<useQualityIncreasing>false</useQualityIncreasing>
+		<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
+	</ItemProcessor.CombinationDef>
+
+	<!-- 155mm -->
+
+	<ItemProcessor.CombinationDef MayRequireAnyOf="Aoba.Fortress.Industrial,VanillaExpanded.VFESecurity,eatKenny.leafzxg.TurretCollection,OskarPotocki.VanillaVehiclesExpandedTier3">
+		<defName>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Ammo_155mmHowitzerShell_HE</defName>
+		<building>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry</building>
+		<items>
+			<li>Steel</li>
+		</items>
+		<secondItems>
+			<li>FSX</li>
+		</secondItems>
+		<thirdItems>
+			<li>ComponentIndustrial</li>
+		</thirdItems>
+		<amount>
+			<li>94</li>
+			<li>17</li>
+			<li>2</li>
+		</amount>
+		<outputLimitControlled>true</outputLimitControlled>
+		<maxTotalOutput>25</maxTotalOutput>
+		<result>Ammo_155mmHowitzerShell_HE</result>
+		<yield>1</yield>
+		<useQualityIncreasing>false</useQualityIncreasing>
+		<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
+	</ItemProcessor.CombinationDef>
+
+	<ItemProcessor.CombinationDef MayRequireAnyOf="Aoba.Fortress.Industrial,VanillaExpanded.VFESecurity,eatKenny.leafzxg.TurretCollection,OskarPotocki.VanillaVehiclesExpandedTier3">
+		<defName>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Ammo_155mmHowitzerShell_Incendiary</defName>
+		<building>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry</building>
+		<items>
+			<li>Steel</li>
+		</items>
+		<secondItems>
+			<li>Prometheum</li>
+		</secondItems>
+		<thirdItems>
+			<li>ComponentIndustrial</li>
+		</thirdItems>
+		<amount>
+			<li>94</li>
+			<li>5</li>
+			<li>2</li>
+		</amount>
+		<outputLimitControlled>true</outputLimitControlled>
+		<maxTotalOutput>25</maxTotalOutput>
+		<result>Ammo_155mmHowitzerShell_Incendiary</result>
+		<yield>1</yield>
+		<useQualityIncreasing>false</useQualityIncreasing>
+		<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
+	</ItemProcessor.CombinationDef>
+
+	<ItemProcessor.CombinationDef MayRequireAnyOf="Aoba.Fortress.Industrial,VanillaExpanded.VFESecurity,eatKenny.leafzxg.TurretCollection,OskarPotocki.VanillaVehiclesExpandedTier3">
+		<defName>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Ammo_155mmHowitzerShell_EMP</defName>
+		<building>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry</building>
+		<items>
+			<li>Steel</li>
+		</items>
+		<secondItems>
+			<li>Chemfuel</li>
+		</secondItems>
+		<thirdItems>
+			<li>ComponentIndustrial</li>
+		</thirdItems>
+		<amount>
+			<li>94</li>
+			<li>20</li>
+			<li>12</li>
+		</amount>
+		<outputLimitControlled>true</outputLimitControlled>
+		<maxTotalOutput>25</maxTotalOutput>
+		<result>Ammo_155mmHowitzerShell_EMP</result>
+		<yield>1</yield>
+		<useQualityIncreasing>false</useQualityIncreasing>
+		<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
+	</ItemProcessor.CombinationDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/CombinationDefs/CombinationDefs.xml b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/CombinationDefs/CombinationDefs.xml
new file mode 100644
index 0000000000..741ad58ff0
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/CombinationDefs/CombinationDefs.xml	
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Shell Production ========== -->
+	<!--Patch Artillery Foundry to use 3 inputs-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry"]/comps/li[@Class="ItemProcessor.CompProperties_ItemProcessor"]/numberOfInputs</xpath>
+		<value>
+			<numberOfInputs>3</numberOfInputs>
+		</value>
+	</Operation>
+
+	<!--HE-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ItemProcessor.CombinationDef[defName="VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Shell_HighExplosive"]</xpath>
+		<value>
+			<thirdItems>
+				<li>ComponentIndustrial</li>
+			</thirdItems>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ItemProcessor.CombinationDef[defName="VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Shell_HighExplosive"]/secondItems/li</xpath>
+		<value>
+			<li>FSX</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ItemProcessor.CombinationDef[defName="VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Shell_HighExplosive"]/amount</xpath>
+		<value>
+			<amount>
+				<li>54</li>
+				<li>10</li>
+				<li>2</li>
+			</amount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ItemProcessor.CombinationDef[defName="VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Shell_HighExplosive"]/yield</xpath>
+		<value>
+			<yield>5</yield>
+		</value>
+	</Operation>
+
+	<!--Incendiary-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ItemProcessor.CombinationDef[defName="VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Shell_Incendiary"]</xpath>
+		<value>
+			<thirdItems>
+				<li>ComponentIndustrial</li>
+			</thirdItems>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ItemProcessor.CombinationDef[defName="VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Shell_Incendiary"]/secondItems/li</xpath>
+		<value>
+			<li>Prometheum</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ItemProcessor.CombinationDef[defName="VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Shell_Incendiary"]/amount</xpath>
+		<value>
+			<amount>
+				<li>58</li>
+				<li>4</li>
+				<li>2</li>
+			</amount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ItemProcessor.CombinationDef[defName="VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Shell_Incendiary"]/yield</xpath>
+		<value>
+			<yield>5</yield>
+		</value>
+	</Operation>
+
+	<!--EMP : The factory stuff is very sensitive about input count. 20 chemfuel is a nice discount compared to the 2 extra components-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ItemProcessor.CombinationDef[defName="VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Shell_EMP"]</xpath>
+		<value>
+			<thirdItems>
+				<li>ComponentIndustrial</li>
+			</thirdItems>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ItemProcessor.CombinationDef[defName="VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Shell_EMP"]/amount</xpath>
+		<value>
+			<amount>
+				<li>54</li>
+				<li>20</li>
+				<li>12</li>
+			</amount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ItemProcessor.CombinationDef[defName="VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Shell_EMP"]/yield</xpath>
+		<value>
+			<yield>5</yield>
+		</value>
+	</Operation>
+
+	<!-- Alpha Biomes -->
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Alpha Biomes</li>
+		</mods>
+		<match Class="PatchOperationReplace">
+			<xpath>Defs/ItemProcessor.CombinationDef[defName="VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_AB_Shell_Tar"]/result</xpath>
+			<value>
+				<result>AB_Shell_Tar</result>
+			</value>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/PawnKindDefs/Pawnkinds_Mech.xml b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/PawnKindDefs/Pawnkinds_Mech.xml
new file mode 100644
index 0000000000..3042ff6d8c
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/PawnKindDefs/Pawnkinds_Mech.xml	
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="VFE_Mech_Centipede" or defName="VFE_Mech_AdvancedCentipede"]/combatPower</xpath>
+		<value>
+			<combatPower>580</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="VFE_Mech_Pikeman" or defName="VFE_Mech_AdvancedPikeman"]/combatPower</xpath>
+		<value>
+			<combatPower>180</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="VFE_Mech_Knight" or
+			defName="VFE_Mech_AdvancedKnight"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>4</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="VFE_Mech_Inquisitor" or
+			defName="VFE_Mech_AdvancedInquisitor"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>3</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="VFE_Mech_AdvancedLancer" or
+			defName="VFE_Mech_Lancer" or
+			defName="VFE_Mech_Pikeman" or
+			defName="VFE_Mech_AdvancedPikeman" or
+			defName="VFE_Mech_Centipede" or
+			defName="VFE_Mech_AdvancedCentipede" or
+			defName="VFE_Mech_Termite" or
+			defName="VFE_Mech_AdvTermite"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+		<nomatch Class="PatchOperationReplace">
+			<xpath>Defs/PawnKindDef[defName="VFE_Mech_Pikeman"]/weaponTags</xpath>
+			<value>
+				<weaponTags>
+					<li>MechanoidGunIndirect</li>
+				</weaponTags>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+		<nomatch Class="PatchOperationReplace">
+			<xpath>Defs/PawnKindDef[defName="VFE_Mech_AdvancedPikeman"]/weaponTags</xpath>
+			<value>
+				<weaponTags>
+					<li>VFE_AdvMechanoidGunIndirect</li>
+				</weaponTags>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/PawnKindDef[defName="VFE_Mech_AdvancedCentipede_PlayerControlled"]/combatPower</xpath>
+					<value>
+						<combatPower>580</combatPower>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/PawnKindDef[defName="VFE_Mech_AdvancedPikeman_PlayerControlled"]/combatPower</xpath>
+					<value>
+						<combatPower>180</combatPower>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/PawnKindDef[
+						defName="VFE_Mech_AdvancedLancer_PlayerControlled" or
+						defName="VFE_Mech_AdvancedPikeman_PlayerControlled"
+						] </xpath>
+					<value>
+						<li Class="CombatExtended.LoadoutPropertiesExtension">
+							<primaryMagazineCount>
+								<min>8</min>
+								<max>10</max>
+							</primaryMagazineCount>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/PawnKindDef[
+						defName="VFE_Mech_Knight_PlayerControlled" or
+						defName="VFE_Mech_AdvancedKnight_PlayerControlled"
+						] </xpath>
+					<value>
+						<li Class="CombatExtended.LoadoutPropertiesExtension">
+							<primaryMagazineCount>
+								<min>3</min>
+								<max>4</max>
+							</primaryMagazineCount>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/PawnKindDef[
+						defName="VFE_Mech_Inquisitor_PlayerControlled" or
+						defName="VFE_Mech_AdvancedInquisitor_PlayerControlled"
+						] </xpath>
+					<value>
+						<li Class="CombatExtended.LoadoutPropertiesExtension">
+							<primaryMagazineCount>
+								<min>2</min>
+								<max>3</max>
+							</primaryMagazineCount>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/PawnKindDef[
+						defName="VFE_Mech_AdvancedCentipede_PlayerControlled" or
+						defName="VFE_Mech_Termite_PlayerControlled" or
+						defName="VFE_Mech_AdvTermite_PlayerControlled"
+						] </xpath>
+					<value>
+						<li Class="CombatExtended.LoadoutPropertiesExtension">
+							<primaryMagazineCount>
+								<min>4</min>
+								<max>6</max>
+							</primaryMagazineCount>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/Scenario/Scenario.xml b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/Scenario/Scenario.xml
new file mode 100644
index 0000000000..f3f2ea2c14
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/Scenario/Scenario.xml	
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>
+			Defs/ScenarioDef[defName="VFE_TheLoneScavenger"]/scenario/parts
+		</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_303British_FMJ</thingDef>
+				<count>100</count>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/Apparel_Mechanite.xml b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/Apparel_Mechanite.xml
new file mode 100644
index 0000000000..87c6816544
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/Apparel_Mechanite.xml	
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_MechaniteUnderArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_MechaniteUnderArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_MechanitePants"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_MechanitePants"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/Buildings_Mech.xml b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/Buildings_Mech.xml
new file mode 100644
index 0000000000..f8c64c4a00
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/Buildings_Mech.xml	
@@ -0,0 +1,442 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Ship Charge Blaster ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeBlasterCannon"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeBlasterCannon"]/statBases/ShootingAccuracyTurret</xpath>
+		<value>
+			<ShootingAccuracyTurret>0.75</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeBlasterCannon"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.5</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeBlasterCannon"]/statBases/Mass</xpath>
+		<value>
+			<Mass>300</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeBlasterCannon"]/comps/li[@Class = "CompProperties_Explosive"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeBlasterCannon"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeBlasterCannon"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>2.0</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFE_Gun_ChargeBlasterCannon</defName>
+		<statBases>
+			<Mass>200.00</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.45</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12x64mmCharged</defaultProjectile>
+			<warmupTime>3.0</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>20</burstShotCount>
+			<soundCast>Shot_ChargeBlaster</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Ship Charge Lance ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeLanceCannon"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeLanceCannon"]/statBases/ShootingAccuracyTurret</xpath>
+		<value>
+			<ShootingAccuracyTurret>1.5</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeLanceCannon"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeLanceCannon"]/statBases/Mass</xpath>
+		<value>
+			<Mass>85</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeLanceCannon"]/comps/li[@Class = "CompProperties_Explosive"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeLanceCannon"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeLanceCannon"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>1</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFE_Gun_ChargeLanceCannon</defName>
+		<statBases>
+			<Mass>35.00</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>0.44</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.44</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>VFE_Bullet_5x35mmHyper</defaultProjectile>
+			<warmupTime>2.0</warmupTime>
+			<range>86</range>
+			<burstShotCount>1</burstShotCount>
+			<soundCast>ChargeLance_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<minRange>1.9</minRange>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Auto Inferno Cannon ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_InfernoLauncherArtillery"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_InfernoLauncherArtillery"]/statBases/ShootingAccuracyTurret</xpath>
+		<value>
+			<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_InfernoLauncherArtillery"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.5</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_InfernoLauncherArtillery"]/statBases/Mass</xpath>
+		<value>
+			<Mass>600</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_InfernoLauncherArtillery"]/comps/li[@Class = "CompProperties_Explosive"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_InfernoLauncherArtillery"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_InfernoLauncherArtillery"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>12.0</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFE_Gun_InfernoArtillery</defName>
+		<statBases>
+			<Mass>300.00</Mass>
+			<RangedWeapon_Cooldown>2.51</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>0.82</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.82</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_80x256mmFuel_Incendiary</defaultProjectile>
+			<warmupTime>8.6</warmupTime>
+			<range>86</range>
+			<ticksBetweenBurstShots>60</ticksBetweenBurstShots>
+			<burstShotCount>3</burstShotCount>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+			<minRange>9.9</minRange>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Auto Mortar ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoMortarCannon"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoMortarCannon"]/statBases/ShootingAccuracyTurret</xpath>
+		<value>
+			<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoMortarCannon"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.25</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoMortarCannon"]/statBases/Mass</xpath>
+		<value>
+			<Mass>75</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoMortarCannon"]/comps/li[@Class = "CompProperties_Explosive"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoMortarCannon"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "VFE_Gun_AutoMortarCannon"]</xpath>
+		<value>
+			<statBases>
+				<SightsEfficiency>0.5</SightsEfficiency>
+			</statBases>
+		</value>
+	</Operation>
+
+	<!--Test for comps and add if not present-->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFE_Gun_AutoMortarCannon"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFE_Gun_AutoMortarCannon"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFE_Gun_AutoMortarCannon"]</xpath>
+			<value>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "VFE_Gun_AutoMortarCannon"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>30</li>
+					<li>50</li>
+					<li>70</li>
+					<li>90</li>
+				</chargeSpeeds>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Test for tags and add if not present-->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFE_Gun_AutoMortarCannon"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFE_Gun_AutoMortarCannon"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFE_Gun_AutoMortarCannon"]</xpath>
+			<value>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "VFE_Gun_AutoMortarCannon"]/weaponTags</xpath>
+		<value>
+			<li>TurretGun</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VFE_Gun_AutoMortarCannon"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+					<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_66mmThermalBolt_Incendiary</defaultProjectile>
+					<warmupTime>11</warmupTime>
+					<minRange>32</minRange>
+					<range>700</range>
+					<burstShotCount>1</burstShotCount>
+					<soundCast>Mortar_LaunchA</soundCast>
+					<muzzleFlashScale>16</muzzleFlashScale>
+					<circularError>1</circularError>
+					<indirectFirePenalty>0.2</indirectFirePenalty>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- ========== Ship Charge Railgun ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeRailgun"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeRailgun"]/statBases/ShootingAccuracyTurret</xpath>
+		<value>
+			<ShootingAccuracyTurret>1.5</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeRailgun"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>2</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeRailgun"]/statBases/Mass</xpath>
+		<value>
+			<Mass>800</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeRailgun"]/comps/li[@Class = "CompProperties_Explosive"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeRailgun"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.99</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeRailgun"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>18.0</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFE_Gun_ChargeRailgun</defName>
+		<statBases>
+			<Mass>300.00</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>4.5</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.92</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>VFE_Bullet_ChargeRailgun_CE</defaultProjectile>
+			<warmupTime>5.2</warmupTime>
+			<range>500</range>
+			<burstShotCount>1</burstShotCount>
+			<soundCast>VFE_Shot_ChargeRailgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>16</muzzleFlashScale>
+			<minRange>8.9</minRange>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+		</FireModes>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/Buildings_Security_Turrets.xml b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/Buildings_Security_Turrets.xml
new file mode 100644
index 0000000000..26426e6322
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/Buildings_Security_Turrets.xml	
@@ -0,0 +1,550 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Auto Charge Blaster ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoChargeBlaster"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoChargeBlaster"]/statBases/ShootingAccuracyTurret</xpath>
+		<value>
+			<ShootingAccuracyTurret>1.0</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoChargeBlaster"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.5</AimingAccuracy>
+			<NightVisionEfficiency>0.4</NightVisionEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoChargeBlaster"]/statBases/Mass</xpath>
+		<value>
+			<Mass>80</Mass>
+			<Bulk>80</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoChargeBlaster"]/comps/li[@Class = "CompProperties_Explosive"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoChargeBlaster"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoChargeBlaster"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoChargeBlaster"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>2.0</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<!-- Price increase because CE HCB is not an equivalent weapon to most other options-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoChargeBlaster"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>60</Plasteel>
+			<Steel>205</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoChargeBlaster"]/costList/ComponentIndustrial</xpath>
+		<value>
+			<ComponentIndustrial>15</ComponentIndustrial>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFE_Gun_AutoChargeBlaster</defName>
+		<statBases>
+			<Mass>35.00</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>13.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.08</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12x64mmCharged</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>Shot_ChargeBlaster</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>9.2</reloadTime>
+			<ammoSet>AmmoSet_12x64mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Auto Charge Lance ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoChargeLance"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoChargeLance"]/statBases/ShootingAccuracyTurret</xpath>
+		<value>
+			<ShootingAccuracyTurret>1.5</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoChargeLance"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.75</AimingAccuracy>
+			<NightVisionEfficiency>0.4</NightVisionEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoChargeLance"]/statBases/Mass</xpath>
+		<value>
+			<Mass>30</Mass>
+			<Bulk>40</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoChargeLance"]/comps/li[@Class = "CompProperties_Explosive"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoChargeLance"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoChargeLance"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoChargeLance"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>1.0</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<!--1 shot turret would be useless. Giving it a 50 round mag-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFE_Gun_AutoChargeLance</defName>
+		<statBases>
+			<Mass>8.00</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>0.44</SwayFactor>
+			<Bulk>13.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.92</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_5x35mmCharged</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>62</range>
+			<soundCast>ChargeLance_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_5x35mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Auto Inferno Cannon ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoInfernoCannon"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoInfernoCannon"]/statBases/ShootingAccuracyTurret</xpath>
+		<value>
+			<ShootingAccuracyTurret>1.25</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoInfernoCannon"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.75</AimingAccuracy>
+			<NightVisionEfficiency>0.4</NightVisionEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoInfernoCannon"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>2.5</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoInfernoCannon"]/statBases/Mass</xpath>
+		<value>
+			<Mass>100</Mass>
+			<Bulk>100</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoInfernoCannon"]/comps/li[@Class = "CompProperties_Explosive"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoInfernoCannon"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoInfernoCannon"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<!-- Price increase because CE Inferno cannon is not an equivalent weapon to most other options : Reduced compared to sheet inferno since it bloats the cost too much-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoInfernoCannon"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>90</Plasteel>
+			<Steel>140</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoInfernoCannon"]/costList/ComponentIndustrial</xpath>
+		<value>
+			<ComponentIndustrial>13</ComponentIndustrial>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFE_Gun_AutoInfernoCannon</defName>
+		<statBases>
+			<Mass>50.00</Mass>
+			<RangedWeapon_Cooldown>2.54</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>0.14</SwayFactor>
+			<Bulk>20.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.01</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_80x256mmFuel_Incendiary</defaultProjectile>
+			<warmupTime>3.5</warmupTime>
+			<range>86</range>
+			<burstShotCount>1</burstShotCount>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+			<minRange>4.9</minRange>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>9.8</reloadTime>
+			<ammoSet>AmmoSet_80x256mmFuel</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Auto Mortar ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="VFE_BaseAutomortarBuilding"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="VFE_BaseAutomortarBuilding"]/statBases</xpath>
+		<value>
+			<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="VFE_BaseAutomortarBuilding"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.25</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="VFE_BaseAutomortarBuilding"]/statBases/Mass</xpath>
+		<value>
+			<Mass>30</Mass>
+			<Bulk>200</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoMortar"]/comps/li[@Class = "CompProperties_Explosive"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoMortar"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="VFE_BaseAutomortarBuilding"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="VFE_BaseAutomortarBuilding"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>1</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoMortar"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>30</Plasteel>
+			<Steel>150</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoMortar"]/costList/ComponentIndustrial</xpath>
+		<value>
+			<ComponentIndustrial>8</ComponentIndustrial>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "VFE_AutoMortar"]</xpath>
+		<value>
+			<statBases>
+				<SightsEfficiency>0.5</SightsEfficiency>
+			</statBases>
+		</value>
+	</Operation>
+
+	<!--Test for comps and add if not present-->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFE_AutoMortar"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFE_AutoMortar"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFE_AutoMortar"]</xpath>
+			<value>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "VFE_AutoMortar"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>30</li>
+					<li>50</li>
+					<li>70</li>
+					<li>90</li>
+				</chargeSpeeds>
+			</li>
+			<li Class="CombatExtended.CompProperties_AmmoUser" Inherit="False">
+				<magazineSize>8</magazineSize>
+				<reloadTime>5</reloadTime>
+				<ammoSet>AmmoSet_66mmThermalBolt</ammoSet>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Test for tags and add if not present-->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFE_AutoMortar"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFE_AutoMortar"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFE_AutoMortar"]</xpath>
+			<value>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "VFE_AutoMortar"]/weaponTags</xpath>
+		<value>
+			<li>TurretGun</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VFE_AutoMortar"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+					<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_66mmThermalBolt_Incendiary</defaultProjectile>
+					<warmupTime>5.5</warmupTime>
+					<minRange>32</minRange>
+					<range>700</range>
+					<burstShotCount>1</burstShotCount>
+					<soundCast>Mortar_LaunchA</soundCast>
+					<muzzleFlashScale>16</muzzleFlashScale>
+					<circularError>1</circularError>
+					<indirectFirePenalty>0.2</indirectFirePenalty>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- ========== Auto Tesla Turret ========== -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoTesla"]/comps/li[@Class = "CompProperties_Explosive"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoTesla"]</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoTesla"]/building</xpath>
+		<value>
+			<turretBurstWarmupTime>4.0</turretBurstWarmupTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoTesla"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>2</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Gun_AutoTesla"]/statBases/RangedWeapon_Cooldown</xpath>
+		<value>
+			<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Gun_AutoTesla"]/verbs/li/warmupTime</xpath>
+		<value>
+			<warmupTime>4.0</warmupTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Gun_AutoTesla"]/verbs/li/range</xpath>
+		<value>
+			<range>45</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Gun_AutoTesla"]/verbs/li/minRange</xpath>
+		<value>
+			<minRange>6</minRange>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Bullet_TeslaProjectile"]/projectile/damageAmountBase</xpath>
+		<value>
+			<damageAmountBase>15</damageAmountBase>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Bullet_TeslaProjectile"]/modExtensions/li[@Class="VFEMech.TeslaChainingProps"]/damageDef</xpath>
+		<value>
+			<damageDef>EMP</damageDef>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Bullet_TeslaProjectile"]/modExtensions/li[@Class="VFEMech.TeslaChainingProps"]/maxLifetime</xpath>
+		<value>
+			<maxLifetime>10</maxLifetime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Turret_AutoTesla"]/comps/li[@Class="CompProperties_Power"]/basePowerConsumption</xpath>
+		<value>
+			<basePowerConsumption>600</basePowerConsumption>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/Items_Resource.xml b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/Items_Resource.xml
new file mode 100644
index 0000000000..7bde47e977
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/Items_Resource.xml	
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="VFEM_RawMeatBase"]/statBases</xpath>
+		<value>
+			<Bulk>0.20</Bulk>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/Weapons_Mech.xml b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/Weapons_Mech.xml
new file mode 100644
index 0000000000..107202adb2
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/Weapons_Mech.xml	
@@ -0,0 +1,752 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Forbid them from showing up in stockpiles ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="VFE_Gun_InfernoSpewerBase" or defName="VFE_Gun_AdvancedInfernoCannon"]</xpath>
+		<value>
+			<destroyOnDrop>true</destroyOnDrop>
+		</value>
+	</Operation>
+
+	<!-- ========== Inferno spewer description change ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="VFE_Gun_InfernoSpewerBase"]/description</xpath>
+		<value>
+			<description>A surprisingly lightweight flamethrower of mechanoid design, while idle the device seems cold as any other, but can immediately heat up to temperatures well above purely human technology. Two undermounted prometheum jelly tanks allow for an ammo capacity big enough for large plumes of liquid flame.</description>
+		</value>
+	</Operation>
+
+	<!-- ========== VFE Handheld Mini Turret ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFE_Gun_CombatMechanoidGun</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>0.82</SwayFactor>
+			<Bulk>8.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.76</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>48</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>6</burstShotCount>
+			<soundCast>GunShotA</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Gun_CombatMechanoidGun"]/tools</xpath>
+		<value>
+			<tools>
+				<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>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== VFE Handheld Autocannon ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFE_Gun_RaiderMechanoidGun</defName>
+		<statBases>
+			<Mass>12</Mass>
+			<Bulk>18</Bulk>
+			<SwayFactor>1.6</SwayFactor>
+			<ShotSpread>0.1</ShotSpread>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.75</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>1.6</warmupTime>
+			<range>62</range>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>HeavyMG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>80</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VFE_Gun_RaiderMechanoidGun"]/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>
+
+	<!-- ========== VFE Small inferno spewer ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFE_Gun_InfernoSpewerSmall</defName>
+		<statBases>
+			<Mass>5</Mass>
+			<Bulk>8</Bulk>
+			<SwayFactor>1.00</SwayFactor>
+			<ShotSpread>5.0</ShotSpread>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Flamethrower_Prometheum</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>15</range>
+			<minRange>2</minRange>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>3</burstShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<soundCast>HissFlamethrower</soundCast>
+			<muzzleFlashScale>2</muzzleFlashScale>
+			<ai_AvoidFriendlyFireRadius>3</ai_AvoidFriendlyFireRadius>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>60</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_Flamethrower</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name = "VFE_Gun_InfernoSpewerBase"]/tools
+		</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2.24</cooldownTime>
+					<armorPenetrationBlunt>2.7</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Light Charge Blaster ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="VFE_Gun_ChargeBlasterLightBase"]/statBases</xpath>
+		<value>
+			<statBases>
+				<Mass>3.0</Mass>
+				<MarketValue>1000</MarketValue>
+				<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+				<SightsEfficiency>1.10</SightsEfficiency>
+				<ShotSpread>0.08</ShotSpread>
+				<SwayFactor>1.20</SwayFactor>
+				<Bulk>7.00</Bulk>
+				<WorkToMake>10000</WorkToMake>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="VFE_Gun_ChargeBlasterLightBase"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2.74</cooldownTime>
+					<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFE_Gun_ChargeBlasterLight</defName>
+		<statBases>
+			<Mass>3.0</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.20</SwayFactor>
+			<Bulk>7.00</Bulk>
+			<WorkToMake>48000</WorkToMake>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.16</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x22mmCharged</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>31</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>6</burstShotCount>
+			<soundCast>Shot_ChargeBlaster</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_6x22mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<!--Increased burst count and 20% reduced recoil-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFE_Gun_AdvancedChargeBlasterLight</defName>
+		<statBases>
+			<Mass>3.0</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.20</SwayFactor>
+			<Bulk>7.00</Bulk>
+			<WorkToMake>48000</WorkToMake>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.93</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x22mmCharged</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>35</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>Shot_ChargeBlaster</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_6x22mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Inferno spewer ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFE_Gun_InfernoSpewer</defName>
+		<statBases>
+			<Mass>6</Mass>
+			<Bulk>10</Bulk>
+			<SwayFactor>1.00</SwayFactor>
+			<ShotSpread>5.0</ShotSpread>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Flamethrower_Prometheum</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>20</range>
+			<minRange>3</minRange>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<burstShotCount>5</burstShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<soundCast>HissFlamethrower</soundCast>
+			<muzzleFlashScale>3</muzzleFlashScale>
+			<ai_AvoidFriendlyFireRadius>3</ai_AvoidFriendlyFireRadius>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>80</magazineSize>
+			<reloadTime>8</reloadTime>
+			<ammoSet>AmmoSet_Flamethrower</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Advanced inferno spewer ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFE_Gun_AdvancedInfernoSpewer</defName>
+		<statBases>
+			<Mass>7</Mass>
+			<Bulk>12</Bulk>
+			<SwayFactor>1.00</SwayFactor>
+			<ShotSpread>5.0</ShotSpread>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Flamethrower_Prometheum</defaultProjectile>
+			<warmupTime>1.6</warmupTime>
+			<range>25</range>
+			<minRange>4</minRange>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<soundCast>HissFlamethrower</soundCast>
+			<muzzleFlashScale>5</muzzleFlashScale>
+			<ai_AvoidFriendlyFireRadius>3</ai_AvoidFriendlyFireRadius>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>8</reloadTime>
+			<ammoSet>AmmoSet_Flamethrower</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Advanced Needle Gun ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFE_Gun_AdvancedNeedle</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>0.81</SwayFactor>
+			<Bulk>15.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.80</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_5x100mmCaseless_Sabot</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>86</range>
+			<burstShotCount>1</burstShotCount>
+			<soundCast>Shot_NeedleGun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_5x100mmCaseless</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Gun_AdvancedNeedle"]/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>
+
+	<!-- ========== Add the Advanced Thermal Bolt Projector ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs</xpath>
+		<value>
+			<ThingDef ParentName="BaseGun">
+				<defName>VFE_AdvancedThermalBoltProjector</defName>
+				<label>advanced thermal bolt projector</label>
+				<description>A medium-velocity, low-trajectory fire support system deployed by mechanoids. The advanced variant features a triple shot system, permitting saturation bombardment.</description>
+				<relicChance>0</relicChance>
+				<graphicData>
+					<texPath>Things/Weapons/ExplosiveBoltProjector</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<equippedAngleOffset>-45</equippedAngleOffset>
+				<soundInteract>Interact_Rifle</soundInteract>
+				<statBases>
+					<SightsEfficiency>1</SightsEfficiency>
+					<ShotSpread>0.16</ShotSpread>
+					<SwayFactor>1.00</SwayFactor>
+					<Bulk>8.50</Bulk>
+					<Mass>12.00</Mass>
+					<RangedWeapon_Cooldown>3</RangedWeapon_Cooldown>
+					<MarketValue>1600</MarketValue>
+				</statBases>
+				<techLevel>Spacer</techLevel>
+				<tradeability>None</tradeability>
+				<destroyOnDrop>true</destroyOnDrop>
+				<weaponTags>
+					<li>VFE_AdvMechanoidGunIndirect</li>
+					<li>NoSwitch</li>
+				</weaponTags>
+				<verbs>
+					<li Class="CombatExtended.VerbPropertiesCE">
+						<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+						<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_66mmThermalBolt_Incendiary</defaultProjectile>
+						<warmupTime>3.3</warmupTime>
+						<minRange>10</minRange>
+						<range>62</range>
+						<burstShotCount>3</burstShotCount>
+						<soundCast>Mortar_LaunchA</soundCast>
+						<muzzleFlashScale>16</muzzleFlashScale>
+						<circularError>2.5</circularError>
+						<indirectFirePenalty>0.2</indirectFirePenalty>
+						<targetParams>
+							<canTargetLocations>true</canTargetLocations>
+						</targetParams>
+					</li>
+				</verbs>
+				<comps>
+					<li Class="CombatExtended.CompProperties_Charges">
+						<chargeSpeeds>
+							<li>30</li>
+							<li>50</li>
+							<li>70</li>
+							<li>90</li>
+						</chargeSpeeds>
+					</li>
+					<li Class="CombatExtended.CompProperties_AmmoUser">
+						<magazineSize>6</magazineSize>
+						<reloadTime>12</reloadTime>
+						<ammoSet>AmmoSet_66mmThermalBolt</ammoSet>
+					</li>
+					<li Class="CombatExtended.CompProperties_FireModes">
+						<aiUseBurstMode>FALSE</aiUseBurstMode>
+					</li>
+				</comps>
+				<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>
+				<modExtensions>
+					<li Class="CombatExtended.GunDrawExtension">
+						<DrawSize>1.05,1.05</DrawSize>
+						<DrawOffset>-0.3,0.0</DrawOffset>
+					</li>
+					<li Class="CombatExtended.ThingDefExtensionCE">
+						<MenuHidden>True</MenuHidden>
+					</li>
+				</modExtensions>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<!-- ========== VFE Advanced Charge Lance ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFE_Gun_AdvancedChargeLance</defName>
+		<statBases>
+			<Mass>8.80</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>0.9</SwayFactor>
+			<Bulk>14.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.88</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_5x35mmCharged</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>74</range>
+			<soundCast>ChargeLance_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_5x35mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>VFE_Gun_AdvancedChargeLance</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Gun_AdvancedChargeLance"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2.74</cooldownTime>
+					<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Advanced Heavy Charge Blaster ========== -->
+
+	<!--Increased burst count and 20% reduced recoil-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFE_Gun_AdvancedChargeBlasterHeavy</defName>
+		<statBases>
+			<Mass>40.00</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>13.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.01</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12x64mmCharged</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>75</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>20</burstShotCount>
+			<soundCast>Shot_ChargeBlaster</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>150</magazineSize>
+			<reloadTime>9.2</reloadTime>
+			<ammoSet>AmmoSet_12x64mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>10</aimedBurstShotCount>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>VFE_AdvMechanoidGunHeavy</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Advanced Inferno Cannon ========== -->
+
+	<!--Reduced Warm up, Give 3 round magazine-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFE_Gun_AdvancedInfernoCannon</defName>
+		<statBases>
+			<Mass>75.00</Mass>
+			<RangedWeapon_Cooldown>2.52</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>0.21</SwayFactor>
+			<Bulk>20.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.90</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_80x256mmFuel_Incendiary</defaultProjectile>
+			<warmupTime>3.0</warmupTime>
+			<range>86</range>
+			<burstShotCount>1</burstShotCount>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+			<minRange>5</minRange>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>3</magazineSize>
+			<reloadTime>9.8</reloadTime>
+			<ammoSet>AmmoSet_80x256mmFuel</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>VFE_AdvMechanoidGunHeavy</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Advanced Thump cannon ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFE_Gun_AdvancedThumpCannon</defName>
+		<statBases>
+			<Mass>100.00</Mass>
+			<RangedWeapon_Cooldown>2.22</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>0.26</SwayFactor>
+			<Bulk>20.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.05</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_164x284mmDemo</defaultProjectile>
+			<warmupTime>2.5</warmupTime>
+			<range>42</range>
+			<burstShotCount>1</burstShotCount>
+			<soundCast>ThumpCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<ai_AvoidFriendlyFireRadius>3</ai_AvoidFriendlyFireRadius>
+			<minRange>4</minRange>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>4</magazineSize>
+			<reloadTime>9.8</reloadTime>
+			<ammoSet>AmmoSet_164x284mmDemo</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Launcher</li>
+			<li>NoSwitch</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Gun_AdvancedThumpCannon"]/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>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_AdvancedMechanoid.xml b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_AdvancedMechanoid.xml
new file mode 100644
index 0000000000..9bb2ea53f6
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_AdvancedMechanoid.xml	
@@ -0,0 +1,890 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[@Name="VFE_AdvancedMechanoid"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[@Name="VFE_AdvancedMechanoid"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="VFE_AdvancedMechanoid"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li>
+				<compClass>CombatExtended.CompAmmoGiver</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_MechAmmo">
+				<gizmoIconSetMagCount>UI/Buttons/SetMagCount</gizmoIconSetMagCount>
+				<gizmoIconTakeAmmoNow>UI/Buttons/TakeAmmoNow</gizmoIconTakeAmmoNow>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Advanced mechs retain some heat armor to represent sealing of sensitive electronics. Minor improvement to EMP resistance as well-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="VFE_AdvancedMechanoid"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.5</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="VFE_AdvancedMechanoid"]/statBases</xpath>
+		<value>
+			<SmokeSensitivity>0</SmokeSensitivity>
+			<ArmorRating_Electric>0.10</ArmorRating_Electric>
+			<NightVisionEfficiency>0.85</NightVisionEfficiency>
+		</value>
+	</Operation>
+
+	<!-- ========== VFE Advanced Centipede ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCentipede"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCentipede"]/statBases</xpath>
+		<value>
+			<ArmorRating_Heat>0.75</ArmorRating_Heat>
+			<CarryWeight>160</CarryWeight>
+			<CarryBulk>70</CarryBulk>
+			<AimingAccuracy>1.05</AimingAccuracy>
+			<ShootingAccuracyPawn>1.05</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.30</MeleeCritChance>
+			<MeleeParryChance>0.52</MeleeParryChance>
+			<AimingDelayFactor>1.20</AimingDelayFactor>
+			<MaxHitPoints>500</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCentipede"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>48</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCentipede"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>22</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCentipede"]/race/baseBodySize</xpath>
+		<value>
+			<baseBodySize>3.0</baseBodySize>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCentipede"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>3.51</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCentipede"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCentipede"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCentipede"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>3660</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>366</MaxOverHeal>
+				<MinArmorPct>0.5</MinArmorPct>
+				<MinArmorValueSharp>12</MinArmorValueSharp>
+				<MinArmorValueBlunt>27</MinArmorValueBlunt>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== VFE Advanced Scyther/Lancer ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedScyther" or defName="VFE_Mech_AdvancedLancer"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="VFE_AdvancedMechanoidWalker"]/statBases</xpath>
+		<value>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+			<AimingAccuracy>1.1</AimingAccuracy>
+			<ShootingAccuracyPawn>1.6</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.14</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
+			<MaxHitPoints>200</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="VFE_AdvancedMechanoidWalker"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="VFE_AdvancedMechanoidWalker"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedScyther"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>43</power>
+					<cooldownTime>2.07</cooldownTime>
+					<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
+					<armorPenetrationSharp>2.16</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left blade</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>43</power>
+					<cooldownTime>2.07</cooldownTime>
+					<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
+					<armorPenetrationSharp>2.16</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right blade</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>5.9</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.875</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedLancer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.11</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.11</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedScyther"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedScyther"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedScyther"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1160</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>116</MaxOverHeal>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedLancer"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedLancer"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedLancer"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>860</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>86</MaxOverHeal>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== VFE Advanced Pikeman ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedPikeman"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedPikeman"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>7.5</ArmorRating_Sharp>
+			<ArmorRating_Blunt>18</ArmorRating_Blunt>
+			<CarryWeight>80</CarryWeight>
+			<CarryBulk>40</CarryBulk>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+			<MaxHitPoints>200</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedPikeman"]/race/baseHealthScale</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedPikeman"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>front left leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>2.67</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>front right leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>2.67</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>3.51</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedPikeman"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedPikeman"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedPikeman"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1000</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>100</MaxOverHeal>
+				<MinArmorPct>0.75</MinArmorPct>
+				<MinArmorValueSharp>4</MinArmorValueSharp>
+				<MinArmorValueBlunt>8</MinArmorValueBlunt>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== VFE Advanced Knight ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedKnight"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedKnight"]/statBases</xpath>
+		<value>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+			<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			<MeleeCritChance>0.12</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
+			<MaxHitPoints>200</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedKnight"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedKnight"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedKnight"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.11</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.11</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedKnight"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedKnight"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedKnight"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>860</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>86</MaxOverHeal>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== VFE Advanced Inquisitor ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedInquisitor"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedInquisitor"]/statBases</xpath>
+		<value>
+			<ArmorRating_Heat>1.0</ArmorRating_Heat>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>50</CarryBulk>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1.1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.07</MeleeDodgeChance>
+			<MeleeCritChance>0.04</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
+			<MaxHitPoints>200</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedInquisitor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedInquisitor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedInquisitor"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.11</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.11</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedInquisitor"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedInquisitor"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedInquisitor"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1200</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>120</MaxOverHeal>
+				<MinArmorPct>0.5</MinArmorPct>
+				<MinArmorValueSharp>5</MinArmorValueSharp>
+				<MinArmorValueBlunt>7.5</MinArmorValueBlunt>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== VFE Advanced Carpenter ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCarpenter"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCarpenter"]/statBases</xpath>
+		<value>
+			<ArmorRating_Heat>0.75</ArmorRating_Heat>
+			<CarryWeight>150</CarryWeight>
+			<CarryBulk>80</CarryBulk>
+			<MeleeDodgeChance>0.04</MeleeDodgeChance>
+			<MeleeCritChance>0.47</MeleeCritChance>
+			<MeleeParryChance>0.52</MeleeParryChance>
+			<MaxHitPoints>500</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCarpenter"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>48</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCarpenter"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>22</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCarpenter"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>3.51</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCarpenter"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCarpenter"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCarpenter"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>3560</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>356</MaxOverHeal>
+				<MinArmorPct>0.5</MinArmorPct>
+				<MinArmorValueSharp>12</MinArmorValueSharp>
+				<MinArmorValueBlunt>27</MinArmorValueBlunt>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ==========VFE Advanced Termite ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvTermite"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvTermite"]/statBases</xpath>
+		<value>
+			<statBases>
+				<ArmorRating_Heat>0.75</ArmorRating_Heat>
+				<CarryWeight>150</CarryWeight>
+				<CarryBulk>60</CarryBulk>
+				<AimingAccuracy>1.0</AimingAccuracy>
+				<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+				<MeleeDodgeChance>0.04</MeleeDodgeChance>
+				<MeleeCritChance>0.16</MeleeCritChance>
+				<MeleeParryChance>0.24</MeleeParryChance>
+				<AimingDelayFactor>1.25</AimingDelayFactor>
+				<MaxHitPoints>400</MaxHitPoints>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvTermite"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>48</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvTermite"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>22</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvTermite"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>3.01</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>13.5</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvTermite"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFE_Mech_AdvTermite"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvTermite"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1880</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>188</MaxOverHeal>
+				<MinArmorPct>0.5</MinArmorPct>
+				<MinArmorValueSharp>10</MinArmorValueSharp>
+				<MinArmorValueBlunt>22</MinArmorValueBlunt>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_AdvancedMechanoid_PlayerControlled.xml b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_AdvancedMechanoid_PlayerControlled.xml
new file mode 100644
index 0000000000..c93b1cf26b
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_AdvancedMechanoid_PlayerControlled.xml	
@@ -0,0 +1,775 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!-- ========== VFE Advanced Centipede ========== -->
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCentipede_PlayerControlled"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>QuadrupedLow</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCentipede_PlayerControlled"]/statBases</xpath>
+					<value>
+						<ArmorRating_Heat>0.75</ArmorRating_Heat>
+						<CarryWeight>160</CarryWeight>
+						<CarryBulk>70</CarryBulk>
+						<AimingAccuracy>1.05</AimingAccuracy>
+						<ShootingAccuracyPawn>1.05</ShootingAccuracyPawn>
+						<MeleeDodgeChance>0.03</MeleeDodgeChance>
+						<MeleeCritChance>0.30</MeleeCritChance>
+						<MeleeParryChance>0.52</MeleeParryChance>
+						<AimingDelayFactor>1.20</AimingDelayFactor>
+						<MaxHitPoints>500</MaxHitPoints>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCentipede_PlayerControlled"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>48</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCentipede_PlayerControlled"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>22</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCentipede_PlayerControlled"]/race/baseBodySize</xpath>
+					<value>
+						<baseBodySize>3.0</baseBodySize>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCentipede_PlayerControlled"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>35</power>
+								<cooldownTime>3.51</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationSharp>0</armorPenetrationSharp>
+								<armorPenetrationBlunt>15</armorPenetrationBlunt>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCentipede_PlayerControlled"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCentipede_PlayerControlled"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCentipede_PlayerControlled"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>3660</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>366</MaxOverHeal>
+							<MinArmorPct>0.5</MinArmorPct>
+							<MinArmorValueSharp>12</MinArmorValueSharp>
+							<MinArmorValueBlunt>27</MinArmorValueBlunt>
+						</li>
+					</value>
+				</li>
+
+				<!-- ========== VFE Advanced Scyther/Lancer ========== -->
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedScyther_PlayerControlled" or defName="VFE_Mech_AdvancedLancer_PlayerControlled" ]/statBases</xpath>
+					<value>
+						<CarryWeight>50</CarryWeight>
+						<CarryBulk>20</CarryBulk>
+						<AimingAccuracy>1.1</AimingAccuracy>
+						<ShootingAccuracyPawn>1.6</ShootingAccuracyPawn>
+						<MeleeDodgeChance>0.15</MeleeDodgeChance>
+						<MeleeCritChance>0.14</MeleeCritChance>
+						<MeleeParryChance>0.09</MeleeParryChance>
+						<MaxHitPoints>200</MaxHitPoints>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedScyther_PlayerControlled" or defName="VFE_Mech_AdvancedLancer_PlayerControlled"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedScyther_PlayerControlled" or defName="VFE_Mech_AdvancedLancer_PlayerControlled"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>5</ArmorRating_Sharp>
+					</value>
+				</li>
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedScyther_PlayerControlled" or defName="VFE_Mech_AdvancedLancer_PlayerControlled"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Humanoid</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedScyther_PlayerControlled"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>left blade</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>43</power>
+								<cooldownTime>2.07</cooldownTime>
+								<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
+								<armorPenetrationSharp>2.16</armorPenetrationSharp>
+								<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>left blade</label>
+								<capacities>
+									<li>Stab</li>
+								</capacities>
+								<power>24</power>
+								<cooldownTime>1.33</cooldownTime>
+								<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
+								<armorPenetrationSharp>40</armorPenetrationSharp>
+								<armorPenetrationBlunt>20</armorPenetrationBlunt>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>right blade</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>43</power>
+								<cooldownTime>2.07</cooldownTime>
+								<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
+								<armorPenetrationSharp>2.16</armorPenetrationSharp>
+								<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>right blade</label>
+								<capacities>
+									<li>Stab</li>
+								</capacities>
+								<power>24</power>
+								<cooldownTime>1.33</cooldownTime>
+								<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
+								<armorPenetrationSharp>40</armorPenetrationSharp>
+								<armorPenetrationBlunt>20</armorPenetrationBlunt>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>6</power>
+								<cooldownTime>5.9</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<chanceFactor>0.2</chanceFactor>
+								<armorPenetrationSharp>0</armorPenetrationSharp>
+								<armorPenetrationBlunt>1.875</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedLancer_PlayerControlled"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>left fist</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>5</power>
+								<cooldownTime>1.11</cooldownTime>
+								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+								<armorPenetrationSharp>0</armorPenetrationSharp>
+								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>right fist</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>5</power>
+								<cooldownTime>1.11</cooldownTime>
+								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+								<armorPenetrationSharp>0</armorPenetrationSharp>
+								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>5</power>
+								<cooldownTime>1.85</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<chanceFactor>0.2</chanceFactor>
+								<armorPenetrationSharp>0</armorPenetrationSharp>
+								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedScyther_PlayerControlled"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedScyther_PlayerControlled"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedScyther_PlayerControlled"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>1160</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>116</MaxOverHeal>
+							<MinArmorPct>0.75</MinArmorPct>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedLancer_PlayerControlled"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedLancer_PlayerControlled"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedLancer_PlayerControlled"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>860</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>86</MaxOverHeal>
+							<MinArmorPct>0.75</MinArmorPct>
+						</li>
+					</value>
+				</li>
+
+				<!-- ========== VFE Advanced Pikeman ========== -->
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedPikeman_PlayerControlled"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Quadruped</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedPikeman_PlayerControlled"]/statBases</xpath>
+					<value>
+						<CarryWeight>80</CarryWeight>
+						<CarryBulk>40</CarryBulk>
+						<MeleeDodgeChance>0.05</MeleeDodgeChance>
+						<MeleeCritChance>0.15</MeleeCritChance>
+						<MeleeParryChance>0.15</MeleeParryChance>
+						<MaxHitPoints>200</MaxHitPoints>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedPikeman_PlayerControlled"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>18</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedPikeman_PlayerControlled"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>7.5</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationRemove">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedPikeman_PlayerControlled"]/race/baseHealthScale</xpath>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedPikeman_PlayerControlled"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>front left leg</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>13</power>
+								<cooldownTime>2.67</cooldownTime>
+								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>5</armorPenetrationBlunt>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>front right leg</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>13</power>
+								<cooldownTime>2.67</cooldownTime>
+								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>5</armorPenetrationBlunt>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>15</power>
+								<cooldownTime>3.51</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>12</armorPenetrationBlunt>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+								<chanceFactor>0.2</chanceFactor>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedPikeman_PlayerControlled"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedPikeman_PlayerControlled"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedPikeman_PlayerControlled"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>1000</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>100</MaxOverHeal>
+							<MinArmorPct>0.75</MinArmorPct>
+							<MinArmorValueSharp>4</MinArmorValueSharp>
+							<MinArmorValueBlunt>8</MinArmorValueBlunt>
+						</li>
+					</value>
+				</li>
+
+				<!-- ========== VFE Advanced Knight ========== -->
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedKnight_PlayerControlled"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Humanoid</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedKnight_PlayerControlled"]/statBases</xpath>
+					<value>
+						<AimingAccuracy>1.1</AimingAccuracy>
+						<ShootingAccuracyPawn>1.6</ShootingAccuracyPawn>
+						<CarryWeight>50</CarryWeight>
+						<CarryBulk>20</CarryBulk>
+						<MeleeDodgeChance>0.13</MeleeDodgeChance>
+						<MeleeCritChance>0.12</MeleeCritChance>
+						<MeleeParryChance>0.09</MeleeParryChance>
+						<MaxHitPoints>200</MaxHitPoints>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedKnight_PlayerControlled"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>12</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedKnight_PlayerControlled"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>8</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedKnight_PlayerControlled"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>left fist</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>5</power>
+								<cooldownTime>1.11</cooldownTime>
+								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+								<armorPenetrationSharp>0</armorPenetrationSharp>
+								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>right fist</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>5</power>
+								<cooldownTime>1.11</cooldownTime>
+								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+								<armorPenetrationSharp>0</armorPenetrationSharp>
+								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>5</power>
+								<cooldownTime>1.85</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<chanceFactor>0.2</chanceFactor>
+								<armorPenetrationSharp>0</armorPenetrationSharp>
+								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedKnight_PlayerControlled"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedKnight_PlayerControlled"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedKnight_PlayerControlled"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>860</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>86</MaxOverHeal>
+							<MinArmorPct>0.75</MinArmorPct>
+						</li>
+					</value>
+				</li>
+
+				<!-- ========== VFE Advanced Inquisitor ========== -->
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedInquisitor_PlayerControlled"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Humanoid</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedInquisitor_PlayerControlled"]/statBases</xpath>
+					<value>
+						<ArmorRating_Heat>1.0</ArmorRating_Heat>
+						<CarryWeight>50</CarryWeight>
+						<CarryBulk>50</CarryBulk>
+						<AimingAccuracy>1.0</AimingAccuracy>
+						<ShootingAccuracyPawn>1.1</ShootingAccuracyPawn>
+						<MeleeDodgeChance>0.07</MeleeDodgeChance>
+						<MeleeCritChance>0.04</MeleeCritChance>
+						<MeleeParryChance>0.09</MeleeParryChance>
+						<MaxHitPoints>200</MaxHitPoints>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedInquisitor_PlayerControlled"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>15</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedInquisitor_PlayerControlled"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>10</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedInquisitor_PlayerControlled"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>left fist</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>5</power>
+								<cooldownTime>1.11</cooldownTime>
+								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+								<armorPenetrationSharp>0</armorPenetrationSharp>
+								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>right fist</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>5</power>
+								<cooldownTime>1.11</cooldownTime>
+								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+								<armorPenetrationSharp>0</armorPenetrationSharp>
+								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>5</power>
+								<cooldownTime>1.85</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<chanceFactor>0.2</chanceFactor>
+								<armorPenetrationSharp>0</armorPenetrationSharp>
+								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedInquisitor_PlayerControlled"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedInquisitor_PlayerControlled"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedInquisitor_PlayerControlled"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>1200</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>120</MaxOverHeal>
+							<MinArmorPct>0.5</MinArmorPct>
+							<MinArmorValueSharp>5</MinArmorValueSharp>
+							<MinArmorValueBlunt>7.5</MinArmorValueBlunt>
+						</li>
+					</value>
+				</li>
+
+				<!-- ==========VFE Advanced Termite ========== -->
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedTermite_PlayerControlled"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>QuadrupedLow</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedTermite_PlayerControlled"]/statBases</xpath>
+					<value>
+						<ArmorRating_Heat>0.75</ArmorRating_Heat>
+						<CarryWeight>150</CarryWeight>
+						<CarryBulk>60</CarryBulk>
+						<AimingAccuracy>1.0</AimingAccuracy>
+						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+						<MeleeDodgeChance>0.04</MeleeDodgeChance>
+						<MeleeCritChance>0.16</MeleeCritChance>
+						<MeleeParryChance>0.24</MeleeParryChance>
+						<AimingDelayFactor>1.25</AimingDelayFactor>
+						<MaxHitPoints>400</MaxHitPoints>
+					</value>
+				</li>
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedTermite_PlayerControlled"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>48</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedTermite_PlayerControlled"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>22</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedTermite_PlayerControlled"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>25</power>
+								<cooldownTime>3.01</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationSharp>0</armorPenetrationSharp>
+								<armorPenetrationBlunt>13.5</armorPenetrationBlunt>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedTermite_PlayerControlled"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedTermite_PlayerControlled"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedTermite_PlayerControlled"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>1880</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>188</MaxOverHeal>
+							<MinArmorPct>0.5</MinArmorPct>
+							<MinArmorValueSharp>10</MinArmorValueSharp>
+							<MinArmorValueBlunt>22</MinArmorValueBlunt>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Machines.xml b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Machines.xml
new file mode 100644
index 0000000000..0d78d006a0
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Machines.xml	
@@ -0,0 +1,656 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="BaseVFEMachine"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li>
+				<compClass>CombatExtended.CompAmmoGiver</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_MechAmmo">
+				<gizmoIconSetMagCount>UI/Buttons/SetMagCount</gizmoIconSetMagCount>
+				<gizmoIconTakeAmmoNow>UI/Buttons/TakeAmmoNow</gizmoIconTakeAmmoNow>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="BaseVFEMachine"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0</ArmorRating_Heat>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="BaseVFEMachine"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<useStatic>false</useStatic>
+						<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
+						<parts>
+							<li>SightSensor</li>
+						</parts>
+					</li>
+					<li>
+						<useStatic>false</useStatic>
+						<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
+						<parts>
+							<li>SightSensor</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="BaseVFEMachine"]/statBases</xpath>
+		<value>
+			<PartialArmorBody>0</PartialArmorBody>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="VFE_Mechanoids_Autocleaner" or
+			defName="VFE_Mechanoids_Autohauler" or
+			defName="VFE_Mechanoids_Autominer" or
+			defName="VFE_Mechanoids_Combat" or
+			defName="VFE_Mechanoids_Riot" or
+			defName="VFE_Mechanoids_Turret" or
+			defName="VFE_Mechanoids_Autostrider" or
+			defName="VFE_Mechanoids_AutoMedic" or
+			defName="VFE_Mechanoids_Autobroadcaster"
+			]/statBases/MoveSpeed </xpath>
+		<value>
+			<MoveSpeed>2.8</MoveSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Raider"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>3.2</MoveSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Pyro"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>2.2</MoveSpeed>
+		</value>
+	</Operation>
+
+	<!-- ========== VFE Autocleaner, VFE Autohauler, VFE Autominer, VFE Mobile Turret ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autocleaner"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autohauler" or defName="VFE_Mechanoids_Autominer" or defName="VFE_Mechanoids_Turret"or defName="VFE_Mechanoids_Autobroadcaster"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Vehicle</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autocleaner" or defName="VFE_Mechanoids_Autohauler" or defName="VFE_Mechanoids_Autominer" or defName="VFE_Mechanoids_Autobroadcaster"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Turret"]/statBases</xpath>
+		<value>
+			<CarryWeight>100</CarryWeight>
+			<CarryBulk>50</CarryBulk>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>2.6</ShootingAccuracyPawn>
+			<ReloadSpeed>1</ReloadSpeed>
+			<MeleeDodgeChance>0</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0</MeleeParryChance>
+			<NightVisionEfficiency>0.40</NightVisionEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autocleaner" or defName="VFE_Mechanoids_Autohauler" or defName="VFE_Mechanoids_Autominer" or defName="VFE_Mechanoids_Turret" or defName="VFE_Mechanoids_Autobroadcaster"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autocleaner" or defName="VFE_Mechanoids_Autohauler" or defName="VFE_Mechanoids_Autominer" or defName="VFE_Mechanoids_Turret" or defName="VFE_Mechanoids_Autobroadcaster"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autocleaner" or defName="VFE_Mechanoids_Autohauler" or defName="VFE_Mechanoids_Autominer" or defName="VFE_Mechanoids_Turret" or defName="VFE_Mechanoids_Autobroadcaster"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>body</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.05</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autocleaner"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autocleaner"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autohauler"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autohauler"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autominer"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autominer"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autobroadcaster"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autobroadcaster"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autocleaner" or defName="VFE_Mechanoids_Autohauler" or defName="VFE_Mechanoids_Autominer" or defName="VFE_Mechanoids_Autobroadcaster"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>750</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>2500</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>100</MaxOverHeal>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== VFE Combat, Riot and Raider Mechs ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Riot" or defName="VFE_Mechanoids_Combat" or defName="VFE_Mechanoids_Raider" or defName="VFE_Mechanoids_Pyro"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Riot" or defName="VFE_Mechanoids_Combat" or defName="VFE_Mechanoids_Raider" or defName="VFE_Mechanoids_Pyro"]/statBases</xpath>
+		<value>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>30</CarryBulk>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>2.6</ShootingAccuracyPawn>
+			<ReloadSpeed>1</ReloadSpeed>
+			<MeleeDodgeChance>0.19</MeleeDodgeChance>
+			<MeleeCritChance>0.22</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
+			<MaxHitPoints>200</MaxHitPoints>
+			<NightVisionEfficiency>0.60</NightVisionEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Riot"]/statBases</xpath>
+		<value>
+			<MeleeHitChance>6</MeleeHitChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Combat"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Combat"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Riot" or defName="VFE_Mechanoids_Pyro" or defName="VFE_Mechanoids_Raider"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Riot" or defName="VFE_Mechanoids_Pyro" or defName="VFE_Mechanoids_Raider"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Combat" or defName="VFE_Mechanoids_Raider" or defName="VFE_Mechanoids_Pyro"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Riot"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>20</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>2.16</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shield</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Stun</def>
+							<amount>10</amount>
+							<chance>0.25</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>3</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>11.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Combat"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Combat"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Riot"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Riot"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Turret"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Turret"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Pyro"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Pyro"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Combat" or defName="VFE_Mechanoids_Riot" or defName="VFE_Mechanoids_Turret" or defName="VFE_Mechanoids_Pyro"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>2500</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>2500</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>250</MaxOverHeal>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Raider"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Raider"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Raider"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>2750</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>2500</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>275</MaxOverHeal>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== VFE Strider ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autostrider"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autostrider"]/statBases</xpath>
+		<value>
+			<CarryWeight>100</CarryWeight>
+			<CarryBulk>25</CarryBulk>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.26</MeleeCritChance>
+			<MeleeParryChance>0.52</MeleeParryChance>
+			<MaxHitPoints>200</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autostrider"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autostrider"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autostrider"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>3.01</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autostrider"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autostrider"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autostrider"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>3500</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>2500</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>350</MaxOverHeal>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_AutoMedic"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_AutoMedic"]/statBases</xpath>
+		<value>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+			<MeleeDodgeChance>0.12</MeleeDodgeChance>
+			<MeleeCritChance>0.12</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_AutoMedic"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_AutoMedic"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_AutoMedic"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.825</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_AutoMedic"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFE_Mechanoids_AutoMedic"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mechanoids_AutoMedic"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>2500</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>2500</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>250</MaxOverHeal>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid.xml b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid.xml
new file mode 100644
index 0000000000..81626830f0
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid.xml	
@@ -0,0 +1,924 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[@Name="VFE_Mechanoid"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[@Name="VFE_Mechanoid"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="VFE_Mechanoid"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li>
+				<compClass>CombatExtended.CompAmmoGiver</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_MechAmmo">
+				<gizmoIconSetMagCount>UI/Buttons/SetMagCount</gizmoIconSetMagCount>
+				<gizmoIconTakeAmmoNow>UI/Buttons/TakeAmmoNow</gizmoIconTakeAmmoNow>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="VFE_Mechanoid"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<useStatic>false</useStatic>
+						<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
+						<parts>
+							<li>SightSensor</li>
+						</parts>
+					</li>
+					<li>
+						<useStatic>false</useStatic>
+						<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
+						<parts>
+							<li>SightSensor</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="VFE_Mechanoid"]/statBases</xpath>
+		<value>
+			<PartialArmorBody>0</PartialArmorBody>
+		</value>
+	</Operation>
+
+	<!--Consistency with vanilla mechs-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="VFE_Mechanoid"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0</ArmorRating_Heat>
+			<SmokeSensitivity>0</SmokeSensitivity>
+			<NightVisionEfficiency>0.80</NightVisionEfficiency>
+		</value>
+	</Operation>
+
+	<!-- ========== VFE Centipede ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Centipede"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Centipede"]/statBases</xpath>
+		<value>
+			<ArmorRating_Heat>0.25</ArmorRating_Heat>
+			<CarryWeight>150</CarryWeight>
+			<CarryBulk>60</CarryBulk>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.26</MeleeCritChance>
+			<MeleeParryChance>0.52</MeleeParryChance>
+			<AimingDelayFactor>1.25</AimingDelayFactor>
+			<MaxHitPoints>500</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Centipede"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Centipede"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Centipede"]/race/baseBodySize</xpath>
+		<value>
+			<baseBodySize>3.0</baseBodySize>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Centipede"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>3.51</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Centipede"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFE_Mech_Centipede"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Centipede"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>3660</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>366</MaxOverHeal>
+				<MinArmorPct>0.5</MinArmorPct>
+				<MinArmorValueSharp>12</MinArmorValueSharp>
+				<MinArmorValueBlunt>27</MinArmorValueBlunt>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== VFE Scyther/Lancer ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Scyther" or defName="VFE_Mech_Lancer"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="VFE_MechanoidWalker"]/statBases</xpath>
+		<value>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			<MeleeCritChance>0.12</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
+			<MaxHitPoints>200</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="VFE_MechanoidWalker"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="VFE_MechanoidWalker"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Scyther"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>43</power>
+					<cooldownTime>2.07</cooldownTime>
+					<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
+					<armorPenetrationSharp>2.16</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left blade</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>43</power>
+					<cooldownTime>2.07</cooldownTime>
+					<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
+					<armorPenetrationSharp>2.16</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right blade</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>5.9</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.875</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Lancer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.11</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.11</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Scyther"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFE_Mech_Scyther"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Scyther"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1160</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>116</MaxOverHeal>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Lancer"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFE_Mech_Lancer"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Lancer"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>860</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>86</MaxOverHeal>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== VFE Pikeman ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Pikeman"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Pikeman"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>7</ArmorRating_Sharp>
+			<ArmorRating_Blunt>15</ArmorRating_Blunt>
+			<CarryWeight>80</CarryWeight>
+			<CarryBulk>40</CarryBulk>
+			<MeleeDodgeChance>0.04</MeleeDodgeChance>
+			<MeleeCritChance>0.13</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+			<MaxHitPoints>200</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Pikeman"]/race/baseHealthScale</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Pikeman"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>front left leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>2.67</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>front right leg</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>2.67</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>3.51</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Pikeman"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFE_Mech_Pikeman"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Pikeman"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1000</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>100</MaxOverHeal>
+				<MinArmorPct>0.75</MinArmorPct>
+				<MinArmorValueSharp>4</MinArmorValueSharp>
+				<MinArmorValueBlunt>8</MinArmorValueBlunt>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Knight ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Knight"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Knight"]/statBases</xpath>
+		<value>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			<MeleeCritChance>0.11</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
+			<MaxHitPoints>200</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Knight"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>9</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Knight"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Knight"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.11</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.11</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Knight"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFE_Mech_Knight"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Knight"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>860</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>86</MaxOverHeal>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Inquisitor ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Inquisitor"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Inquisitor"]/statBases</xpath>
+		<value>
+			<ArmorRating_Heat>0.5</ArmorRating_Heat>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>50</CarryBulk>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1.0</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.06</MeleeDodgeChance>
+			<MeleeCritChance>0.03</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
+			<MaxHitPoints>200</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Inquisitor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Inquisitor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Inquisitor"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.11</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.11</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Inquisitor"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFE_Mech_Inquisitor"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Inquisitor"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1200</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>120</MaxOverHeal>
+				<MinArmorPct>0.5</MinArmorPct>
+				<MinArmorValueSharp>5</MinArmorValueSharp>
+				<MinArmorValueBlunt>7.5</MinArmorValueBlunt>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== VFE Carpenter and Ancient Carpenter ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Carpenter" or defName="VFE_AncientMech_AncientCarpenter"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Carpenter" or defName="VFE_AncientMech_AncientCarpenter"]/statBases</xpath>
+		<value>
+			<ArmorRating_Heat>0.25</ArmorRating_Heat>
+			<CarryWeight>150</CarryWeight>
+			<CarryBulk>80</CarryBulk>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.40</MeleeCritChance>
+			<MeleeParryChance>0.39</MeleeParryChance>
+			<MaxHitPoints>500</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Carpenter" or defName="VFE_AncientMech_AncientCarpenter"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Carpenter" or defName="VFE_AncientMech_AncientCarpenter"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Carpenter" or defName="VFE_AncientMech_AncientCarpenter"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>3.51</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Carpenter"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFE_Mech_Carpenter"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFE_AncientMech_AncientCarpenter"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFE_AncientMech_AncientCarpenter"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Carpenter" or defName="VFE_AncientMech_AncientCarpenter"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>3560</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>356</MaxOverHeal>
+				<MinArmorPct>0.5</MinArmorPct>
+				<MinArmorValueSharp>12</MinArmorValueSharp>
+				<MinArmorValueBlunt>27</MinArmorValueBlunt>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== VFE Termite ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Termite"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Termite"]/statBases</xpath>
+		<value>
+			<ArmorRating_Heat>0.25</ArmorRating_Heat>
+			<CarryWeight>150</CarryWeight>
+			<CarryBulk>60</CarryBulk>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.04</MeleeDodgeChance>
+			<MeleeCritChance>0.14</MeleeCritChance>
+			<MeleeParryChance>0.24</MeleeParryChance>
+			<AimingDelayFactor>1.25</AimingDelayFactor>
+			<MaxHitPoints>350</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Termite"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>40</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Termite"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Termite"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>3.01</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>13.5</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Termite"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFE_Mech_Termite"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Termite"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1880</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>188</MaxOverHeal>
+				<MinArmorPct>0.5</MinArmorPct>
+				<MinArmorValueSharp>10</MinArmorValueSharp>
+				<MinArmorValueBlunt>22</MinArmorValueBlunt>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid_PlayerControlled.xml b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid_PlayerControlled.xml
new file mode 100644
index 0000000000..8410e1f00a
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid_PlayerControlled.xml	
@@ -0,0 +1,342 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+				<!-- ========== Termite ========== -->
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Termite_PlayerControlled"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>QuadrupedLow</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Termite_PlayerControlled"]/statBases</xpath>
+					<value>
+						<ArmorRating_Heat>0.25</ArmorRating_Heat>
+						<CarryWeight>150</CarryWeight>
+						<CarryBulk>60</CarryBulk>
+						<AimingAccuracy>1.0</AimingAccuracy>
+						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+						<MeleeDodgeChance>0.04</MeleeDodgeChance>
+						<MeleeCritChance>0.14</MeleeCritChance>
+						<MeleeParryChance>0.24</MeleeParryChance>
+						<AimingDelayFactor>1.25</AimingDelayFactor>
+						<MaxHitPoints>350</MaxHitPoints>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Termite_PlayerControlled"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>40</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Termite_PlayerControlled"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>18</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Termite_PlayerControlled"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>25</power>
+								<cooldownTime>3.01</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>13.5</armorPenetrationBlunt>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Termite_PlayerControlled"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Termite_PlayerControlled"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Termite_PlayerControlled"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>1880</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>188</MaxOverHeal>
+							<MinArmorPct>0.5</MinArmorPct>
+							<MinArmorValueSharp>10</MinArmorValueSharp>
+							<MinArmorValueBlunt>22</MinArmorValueBlunt>
+						</li>
+					</value>
+				</li>
+
+				<!-- ========== Knight ========== -->
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Knight_PlayerControlled"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Humanoid</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Knight_PlayerControlled"]/statBases</xpath>
+					<value>
+						<CarryWeight>50</CarryWeight>
+						<CarryBulk>20</CarryBulk>
+						<AimingAccuracy>1.0</AimingAccuracy>
+						<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
+						<MeleeDodgeChance>0.13</MeleeDodgeChance>
+						<MeleeCritChance>0.11</MeleeCritChance>
+						<MeleeParryChance>0.09</MeleeParryChance>
+						<MaxHitPoints>200</MaxHitPoints>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Knight_PlayerControlled"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>9</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Knight_PlayerControlled"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>6</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Knight_PlayerControlled"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>left fist</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>5</power>
+								<cooldownTime>1.11</cooldownTime>
+								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+								<armorPenetrationSharp>0</armorPenetrationSharp>
+								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>right fist</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>5</power>
+								<cooldownTime>1.11</cooldownTime>
+								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+								<armorPenetrationSharp>0</armorPenetrationSharp>
+								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>5</power>
+								<cooldownTime>1.85</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<chanceFactor>0.2</chanceFactor>
+								<armorPenetrationSharp>0</armorPenetrationSharp>
+								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Knight_PlayerControlled"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Knight_PlayerControlled"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Knight_PlayerControlled"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>860</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>86</MaxOverHeal>
+							<MinArmorPct>0.75</MinArmorPct>
+						</li>
+					</value>
+				</li>
+
+				<!-- ========== Inquisitor ========== -->
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Inquisitor_PlayerControlled"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Humanoid</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Inquisitor_PlayerControlled"]/statBases</xpath>
+					<value>
+						<ArmorRating_Heat>0.5</ArmorRating_Heat>
+						<CarryWeight>50</CarryWeight>
+						<CarryBulk>50</CarryBulk>
+						<AimingAccuracy>1.0</AimingAccuracy>
+						<ShootingAccuracyPawn>1.0</ShootingAccuracyPawn>
+						<MeleeDodgeChance>0.06</MeleeDodgeChance>
+						<MeleeCritChance>0.03</MeleeCritChance>
+						<MeleeParryChance>0.09</MeleeParryChance>
+						<MaxHitPoints>200</MaxHitPoints>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Inquisitor_PlayerControlled"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>12</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Inquisitor_PlayerControlled"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>8</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Inquisitor_PlayerControlled"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>left fist</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>5</power>
+								<cooldownTime>1.11</cooldownTime>
+								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+								<armorPenetrationSharp>0</armorPenetrationSharp>
+								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>right fist</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>5</power>
+								<cooldownTime>1.11</cooldownTime>
+								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+								<armorPenetrationSharp>0</armorPenetrationSharp>
+								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>5</power>
+								<cooldownTime>1.85</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<chanceFactor>0.2</chanceFactor>
+								<armorPenetrationSharp>0</armorPenetrationSharp>
+								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Inquisitor_PlayerControlled"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFE_Mech_Inquisitor_PlayerControlled"]</xpath>
+						<value>
+							<comps/>
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Inquisitor_PlayerControlled"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>1200</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>1250</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<Repairable>true</Repairable>
+							<RepairIngredients>
+								<Steel>5</Steel>
+								<Plasteel>5</Plasteel>
+							</RepairIngredients>
+							<RepairTime>300</RepairTime>
+							<RepairValue>200</RepairValue>
+							<CanOverHeal>true</CanOverHeal>
+							<MaxOverHeal>120</MaxOverHeal>
+							<MinArmorPct>0.5</MinArmorPct>
+							<MinArmorValueSharp>5</MinArmorValueSharp>
+							<MinArmorValueBlunt>7.5</MinArmorValueBlunt>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/WorldObjects/WorldObjects.xml b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/WorldObjects/WorldObjects.xml
new file mode 100644
index 0000000000..7e0adff6a7
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/WorldObjects/WorldObjects.xml	
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--VFEM_Frigate-->
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/WorldObjectDef[defName="VFEM_Frigate"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/WorldObjectDef[defName="VFEM_Frigate"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/WorldObjectDef[defName="VFEM_Frigate"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.WorldObjects.WorldObjectCompProperties_Health">
+				<healthModifier>2.6</healthModifier>
+				<techLevelNoImpact>true</techLevelNoImpact>
+				<chanceToNegateDamage>0.12</chanceToNegateDamage>
+			</li>
+			<li Class="CombatExtended.WorldObjects.WorldObjectCompProperties_Hostility"/>
+		</value>
+	</Operation>
+
+	<!--VFEM_Destroyer-->
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/WorldObjectDef[defName="VFEM_Destroyer"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/WorldObjectDef[defName="VFEM_Destroyer"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/WorldObjectDef[defName="VFEM_Destroyer"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.WorldObjects.WorldObjectCompProperties_Health">
+				<healthModifier>3.6</healthModifier>
+				<techLevelNoImpact>true</techLevelNoImpact>
+				<chanceToNegateDamage>0.22</chanceToNegateDamage>
+			</li>
+			<li Class="CombatExtended.WorldObjects.WorldObjectCompProperties_Hostility"/>
+		</value>
+	</Operation>
+
+	<!--VFEM_Cruiser-->
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/WorldObjectDef[defName="VFEM_Cruiser"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/WorldObjectDef[defName="VFEM_Cruiser"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/WorldObjectDef[defName="VFEM_Cruiser"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.WorldObjects.WorldObjectCompProperties_Health">
+				<healthModifier>4.6</healthModifier>
+				<techLevelNoImpact>true</techLevelNoImpact>
+				<chanceToNegateDamage>0.3</chanceToNegateDamage>
+			</li>
+			<li Class="CombatExtended.WorldObjects.WorldObjectCompProperties_Hostility"/>
+		</value>
+	</Operation>
+
+	<!--VFEM_Troopship-->
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/WorldObjectDef[defName="VFEM_Troopship"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/WorldObjectDef[defName="VFEM_Troopship"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/WorldObjectDef[defName="VFEM_Troopship"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.WorldObjects.WorldObjectCompProperties_Health">
+				<healthModifier>5.2</healthModifier>
+				<techLevelNoImpact>true</techLevelNoImpact>
+				<chanceToNegateDamage>0.45</chanceToNegateDamage>
+			</li>
+			<li Class="CombatExtended.WorldObjects.WorldObjectCompProperties_Hostility"/>
+		</value>
+	</Operation>
+
+	<!--VFEM_Carrier-->
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/WorldObjectDef[defName="VFEM_Carrier"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/WorldObjectDef[defName="VFEM_Carrier"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/WorldObjectDef[defName="VFEM_Carrier"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.WorldObjects.WorldObjectCompProperties_Health">
+				<healthModifier>6.0</healthModifier>
+				<techLevelNoImpact>true</techLevelNoImpact>
+				<chanceToNegateDamage>0.75</chanceToNegateDamage>
+			</li>
+			<li Class="CombatExtended.WorldObjects.WorldObjectCompProperties_Hostility"/>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Medieval/Defs/Vanilla Factions Expanded - Medieval/Ammo_HeavyCrossbow.xml b/ModPatches/Vanilla Factions Expanded - Medieval/Defs/Vanilla Factions Expanded - Medieval/Ammo_HeavyCrossbow.xml
new file mode 100644
index 0000000000..927e768c4a
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Medieval/Defs/Vanilla Factions Expanded - Medieval/Ammo_HeavyCrossbow.xml	
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- === Ammo === -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_HeavyCrossbowBolt</defName>
+		<label>crossbow bolts</label>
+		<ammoTypes>
+			<Ammo_CrossbowBolt_Stone>Projectile_HeavyCrossbowBolt_Stone</Ammo_CrossbowBolt_Stone>
+			<Ammo_CrossbowBolt_Steel>Projectile_HeavyCrossbowBolt_Steel</Ammo_CrossbowBolt_Steel>
+			<Ammo_CrossbowBolt_Plasteel>Projectile_HeavyCrossbowBolt_Plasteel</Ammo_CrossbowBolt_Plasteel>
+			<Ammo_CrossbowBolt_Venom>Projectile_HeavyCrossbowBolt_Venom</Ammo_CrossbowBolt_Venom>
+			<Ammo_CrossbowBolt_Flame>Projectile_HeavyCrossbowBolt_Flame</Ammo_CrossbowBolt_Flame>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef ParentName="BaseCrossbowBoltProjectile">
+		<defName>Projectile_HeavyCrossbowBolt_Stone</defName>
+		<label>crossbow bolt (stone)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Stone</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>8</damageAmountBase>
+			<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+			<armorPenetrationSharp>1.85</armorPenetrationSharp>
+			<preExplosionSpawnChance>0.1</preExplosionSpawnChance><!-- 11.11 bolts per resource -->
+			<preExplosionSpawnThingDef>Ammo_CrossbowBolt_Stone</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseCrossbowBoltProjectile">
+		<defName>Projectile_HeavyCrossbowBolt_Steel</defName>
+		<label>crossbow bolt (steel)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationBlunt>6.5</armorPenetrationBlunt>
+			<armorPenetrationSharp>2.85</armorPenetrationSharp>
+			<speed>30</speed>
+			<preExplosionSpawnChance>0.333</preExplosionSpawnChance><!-- 14.99 bolts per resource -->
+			<preExplosionSpawnThingDef>Ammo_CrossbowBolt_Steel</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseCrossbowBoltProjectile">
+		<defName>Projectile_HeavyCrossbowBolt_Plasteel</defName>
+		<label>crossbow bolt (plasteel)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Plasteel</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationBlunt>8.12</armorPenetrationBlunt>
+			<armorPenetrationSharp>4</armorPenetrationSharp>
+			<speed>32</speed>
+			<preExplosionSpawnChance>0.6</preExplosionSpawnChance><!-- 25 bolts per resource -->
+			<preExplosionSpawnThingDef>Ammo_CrossbowBolt_Plasteel</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseCrossbowBoltProjectile">
+		<defName>Projectile_HeavyCrossbowBolt_Venom</defName>
+		<label>crossbow bolt (venom)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Venom</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>ArrowVenom</damageDef>
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationBlunt>6.5</armorPenetrationBlunt>
+			<armorPenetrationSharp>2.5</armorPenetrationSharp>
+			<speed>30</speed>
+			<preExplosionSpawnChance>0.6</preExplosionSpawnChance><!-- 25 arrows per resource -->
+			<preExplosionSpawnThingDef>Ammo_CrossbowBolt_Steel</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseCrossbowBoltProjectile">
+		<defName>Projectile_HeavyCrossbowBolt_Flame</defName>
+		<label>crossbow bolt (flame)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Arrows/Arrow_Flame</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Flame</damageDef>
+			<damageAmountBase>5</damageAmountBase>
+			<armorPenetrationBlunt>3.28</armorPenetrationBlunt>
+			<armorPenetrationSharp>1.5</armorPenetrationSharp>
+			<speed>30</speed>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Medieval/Patches/Vanilla Factions Expanded - Medieval/PawnKindDefs/VanillaMedieval_PawnKinds.xml b/ModPatches/Vanilla Factions Expanded - Medieval/Patches/Vanilla Factions Expanded - Medieval/PawnKindDefs/VanillaMedieval_PawnKinds.xml
new file mode 100644
index 0000000000..417c0728ff
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Medieval/Patches/Vanilla Factions Expanded - Medieval/PawnKindDefs/VanillaMedieval_PawnKinds.xml	
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Add Combat Extended Shields to pawns. =========== -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/PawnKindDef[defName="VFEM_Medieval_Footsoldier" or defName="VFEM_Medieval_Knight"]/modExtensions/li[@Class="VFECore.PawnKindDefExtension"]/shieldMoney</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/PawnKindDef[defName="VFEM_Medieval_Footsoldier" or defName="VFEM_Medieval_Knight"]/modExtensions/li[@Class="VFECore.PawnKindDefExtension"]/shieldTags</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="VFEM_Medieval_Footsoldier"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>100</min>
+					<max>350</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>KiteShield</li>
+					<li>HeaterShield</li>
+				</shieldTags>
+				<shieldChance>0.6</shieldChance>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="VFEM_Medieval_Knight"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>200</min>
+					<max>600</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>HeaterShield</li>
+					<li>KiteShield</li>
+				</shieldTags>
+				<shieldChance>0.8</shieldChance>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Give ammo to archer ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="VFEM_Medieval_Bowman"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>14</min>
+					<max>26</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>120</min>
+						<max>250</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>NeolithicMeleeBasic</li>
+						<li>MedievalMeleeDecent</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="VFEM_Medieval_Bowman"]</xpath>
+		<value>
+			<apparelRequired>
+				<li>CE_Apparel_TribalBackpack</li>
+			</apparelRequired>
+		</value>
+	</Operation>
+
+	<!-- ========== Tweak Squire weapon money. =========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="VFEM_Medieval_Squire"]/weaponMoney/min</xpath>
+		<value>
+			<min>120</min>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Medieval/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Apparel.xml b/ModPatches/Vanilla Factions Expanded - Medieval/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Apparel.xml
new file mode 100644
index 0000000000..47f6912cf6
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Medieval/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Apparel.xml	
@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Light Helmet =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEM_Apparel_PlateHelmetLight"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEM_Apparel_PlateHelmetLight"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.0</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFEM_Apparel_PlateHelmetLight"]/equippedStatOffsets</xpath>
+	</Operation>
+
+	<!-- ========== Heavy Helmet =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEM_Apparel_PlateHelmetHeavy"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEM_Apparel_PlateHelmetHeavy"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEM_Apparel_PlateHelmetHeavy"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>-0.5</AimingAccuracy>
+				<MeleeHitChance>-2.5</MeleeHitChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFEM_Apparel_PlateHelmetHeavy"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Jester Hat / Kings Crown / Plague Mask =========== -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>
+			Defs/ThingDef[defName="VFEM_Apparel_KingsCrown" or defName="VFEM_Apparel_PlagueMask"]/statBases/ArmorRating_Sharp |
+			Defs/ThingDef[defName="VFEM_Apparel_KingsCrown" or defName="VFEM_Apparel_PlagueMask"]/statBases/ArmorRating_Blunt
+		</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEM_Apparel_JesterHat" or defName="VFEM_Apparel_KingsCrown" or defName="VFEM_Apparel_PlagueMask" or defName="VFEM_Apparel_DameHat"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEM_Apparel_JesterHat" or defName="VFEM_Apparel_KingsCrown" or defName="VFEM_Apparel_PlagueMask" or defName="VFEM_Apparel_DameHat"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEM_Apparel_PlagueMask"]</xpath>
+		<value>
+			<costStuffCount>25</costStuffCount>
+			<stuffCategories>
+				<li>Leathery</li>
+			</stuffCategories>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEM_Apparel_PlagueMask"]/apparel/layers/li[.="Overhead"]</xpath>
+		<value>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Heavy Plate Armor =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEM_Apparel_PlateArmorHeavy"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>12</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEM_Apparel_PlateArmorHeavy"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFEM_Apparel_PlateArmorHeavy"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEM_Apparel_PlateArmorHeavy"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>-0.2</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEM_Apparel_PlateArmorHeavy"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFEM_Apparel_PlateArmorHeavy"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Tabard =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEM_Apparel_Tabard"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEM_Apparel_Tabard"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== Jester Outfit / Dame Dress =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEM_Apparel_JesterOutfit" or defName="VFEM_Apparel_DameDress"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEM_Apparel_JesterOutfit" or defName="VFEM_Apparel_DameDress"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- ========== King's Robes =========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEM_Apparel_KingsRobes"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEM_Apparel_KingsRobes"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Medieval/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Items.xml b/ModPatches/Vanilla Factions Expanded - Medieval/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Items.xml
new file mode 100644
index 0000000000..7232569025
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Medieval/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Items.xml	
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEM_RawGrapes"]/statBases</xpath>
+		<value>
+			<Bulk>0.014</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEM_Wine"]/statBases</xpath>
+		<value>
+			<Bulk>1.5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEM_Wine"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2.22</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>neck</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>3.33</cooldownTime>
+					<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Neck</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Medieval/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Ranged.xml b/ModPatches/Vanilla Factions Expanded - Medieval/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Ranged.xml
new file mode 100644
index 0000000000..63910fd413
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Medieval/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Ranged.xml	
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEM_Bow_HeavyCrossbow"]/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>
+	</Operation>
+
+	<!-- === Heavy Crossbow === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFEM_Bow_HeavyCrossbow</defName>
+		<statBases>
+			<Bulk>6</Bulk>
+			<SwayFactor>1.0</SwayFactor>
+			<ShotSpread>0.5</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>60</WoodLog>
+			<Steel>25</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Projectile_HeavyCrossbowBolt_Steel</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>34</range>
+			<soundCast>Bow_Large</soundCast>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>8</reloadTime>
+			<ammoSet>AmmoSet_HeavyCrossbowBolt</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>NeolithicRangedHeavy</li>
+			<li>NeolithicRangedChief</li>
+			<li>CE_Bow</li>
+		</weaponTags>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Medieval/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Shields.xml b/ModPatches/Vanilla Factions Expanded - Medieval/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Shields.xml
new file mode 100644
index 0000000000..b4464b7257
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Medieval/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Shields.xml	
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Kite Shield -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEM_Shield_Kite"]</xpath>
+		<value>
+			<ThingDef ParentName="ShieldBase">
+				<defName>VFEM_Shield_Kite</defName>
+				<label>kite shield</label>
+				<description>A large wooden shield, with the front decoratively covered by leather. Offers a moderate amount of protection against melee and ranged attacks.</description>
+				<techLevel>Medieval</techLevel>
+				<graphicData>
+					<texPath>Things/Item/Equipment/Shield/KiteShield/KiteShield</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+					<drawSize>0.88</drawSize>
+				</graphicData>
+				<thingCategories Inherit="False">
+					<li>Shields</li>
+				</thingCategories>
+				<costStuffCount>25</costStuffCount>
+				<costList>
+					<WoodLog>70</WoodLog>
+				</costList>
+				<stuffCategories>
+					<li>Leathery</li>
+				</stuffCategories>
+				<recipeMaker>
+					<researchPrerequisite>Smithing</researchPrerequisite>
+					<recipeUsers>
+						<li>FueledSmithy</li>
+						<li>ElectricSmithy</li>
+					</recipeUsers>
+				</recipeMaker>
+				<statBases>
+					<WorkToMake>3000</WorkToMake>
+					<MaxHitPoints>145</MaxHitPoints>
+					<ArmorRating_Blunt>3.5</ArmorRating_Blunt>
+					<ArmorRating_Sharp>2.2</ArmorRating_Sharp>
+					<Mass>7.5</Mass>
+					<Bulk>8</Bulk>
+					<WornBulk>5</WornBulk>
+				</statBases>
+				<equippedStatOffsets>
+					<ReloadSpeed>-0.1</ReloadSpeed>
+					<MeleeHitChance>-1</MeleeHitChance>
+					<ShootingAccuracyPawn>-0.2</ShootingAccuracyPawn>
+					<AimingAccuracy>-0.05</AimingAccuracy>
+					<Suppressability>-0.25</Suppressability>
+					<MeleeCritChance>-0.08</MeleeCritChance>
+					<MeleeParryChance>1.0</MeleeParryChance>
+				</equippedStatOffsets>
+				<apparel>
+					<tags>
+						<li>KiteShield</li>
+					</tags>
+				</apparel>
+				<comps>
+					<li>
+						<compClass>CompColorable</compClass>
+					</li>
+				</comps>
+				<modExtensions>
+					<li Class="CombatExtended.ShieldDefExtension">
+						<shieldCoverage>
+							<li>Hands</li>
+							<li>Arms</li>
+							<li>Shoulders</li>
+							<li>Torso</li>
+							<li>Neck</li>
+							<li>Legs</li>
+						</shieldCoverage>
+						<drawAsTall>false</drawAsTall>
+					</li>
+					<li Class="VFECore.ThingDefExtension">
+						<useFactionColourForPawnKinds>
+							<li>VFEM_Medieval_Footsoldier</li>
+							<li>VFEM_Medieval_Knight</li>
+							<li>VFEM_Medieval_Lord</li>
+						</useFactionColourForPawnKinds>
+					</li>
+				</modExtensions>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<!-- Heater Shield -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEM_Shield_Heater"]</xpath>
+		<value>
+			<ThingDef ParentName="ShieldBase">
+				<defName>VFEM_Shield_Heater</defName>
+				<label>heater shield</label>
+				<description>A heavy medium-sized steel shield, with the front decoratively covered by leather. Offers a significant amount of protection against melee and ranged attacks.</description>
+				<techLevel>Medieval</techLevel>
+				<graphicData>
+					<texPath>Things/Item/Equipment/Shield/HeaterShield/HeaterShield</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+					<drawSize>0.88</drawSize>
+				</graphicData>
+				<costStuffCount>20</costStuffCount>
+				<costList>
+					<Steel>80</Steel>
+				</costList>
+				<stuffCategories>
+					<li>Leathery</li>
+				</stuffCategories>
+				<thingCategories Inherit="False">
+					<li>Shields</li>
+				</thingCategories>
+				<recipeMaker>
+					<researchPrerequisite>Smithing</researchPrerequisite>
+					<recipeUsers>
+						<li>FueledSmithy</li>
+						<li>ElectricSmithy</li>
+					</recipeUsers>
+				</recipeMaker>
+				<statBases>
+					<WorkToMake>8000</WorkToMake>
+					<MaxHitPoints>145</MaxHitPoints>
+					<ArmorRating_Blunt>4.5</ArmorRating_Blunt>
+					<ArmorRating_Sharp>3</ArmorRating_Sharp>
+					<Mass>8</Mass>
+					<Bulk>9</Bulk>
+					<WornBulk>6</WornBulk>
+				</statBases>
+				<equippedStatOffsets>
+					<ReloadSpeed>-0.1</ReloadSpeed>
+					<MeleeHitChance>-1</MeleeHitChance>
+					<ShootingAccuracyPawn>-0.2</ShootingAccuracyPawn>
+					<AimingAccuracy>-0.05</AimingAccuracy>
+					<Suppressability>-0.25</Suppressability>
+					<MeleeCritChance>-0.08</MeleeCritChance>
+					<MeleeParryChance>1.0</MeleeParryChance>
+				</equippedStatOffsets>
+				<apparel>
+					<tags>
+						<li>HeaterShield</li>
+					</tags>
+				</apparel>
+				<comps>
+					<li>
+						<compClass>CompColorable</compClass>
+					</li>
+				</comps>
+				<modExtensions>
+					<li Class="CombatExtended.ShieldDefExtension">
+						<shieldCoverage>
+							<li>Hands</li>
+							<li>Arms</li>
+							<li>Shoulders</li>
+							<li>Torso</li>
+						</shieldCoverage>
+						<drawAsTall>false</drawAsTall>
+					</li>
+					<li Class="VFECore.ThingDefExtension">
+						<useFactionColourForPawnKinds>
+							<li>VFEM_Medieval_Footsoldier</li>
+							<li>VFEM_Medieval_Knight</li>
+							<li>VFEM_Medieval_Lord</li>
+						</useFactionColourForPawnKinds>
+					</li>
+				</modExtensions>
+			</ThingDef>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Medieval/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Weapons.xml b/ModPatches/Vanilla Factions Expanded - Medieval/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Weapons.xml
new file mode 100644
index 0000000000..f691e39d63
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Medieval/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Weapons.xml	
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Heavy Mace -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEM_MeleeWeapon_HeavyMace"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<chanceFactor>0.33</chanceFactor>
+					<cooldownTime>1.84</cooldownTime>
+					<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>3.51</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>9.375</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEM_MeleeWeapon_HeavyMace"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.5</MeleeCritChance>
+				<MeleeParryChance>0.4</MeleeParryChance>
+				<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEM_MeleeWeapon_HeavyMace"]/statBases</xpath>
+		<value>
+			<Bulk>4.5</Bulk>
+			<MeleeCounterParryBonus>.53</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEM_MeleeWeapon_HeavyMace"]/stuffCategories</xpath>
+		<value>
+			<stuffCategories>
+				<li>Steeled</li>
+			</stuffCategories>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Pirates/Defs/Vanilla Factions Expanded - Pirates/Ammo/Ammo_Mods.xml b/ModPatches/Vanilla Factions Expanded - Pirates/Defs/Vanilla Factions Expanded - Pirates/Ammo/Ammo_Mods.xml
new file mode 100644
index 0000000000..afce7a93c0
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Pirates/Defs/Vanilla Factions Expanded - Pirates/Ammo/Ammo_Mods.xml	
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!--
+	While these Defs are only used conditionally with other mods active,
+	they don't actually do anything by themselves, so there's no harm loading them.
+	 -->
+
+	<!-- ==================== Thing Categories ========================== -->
+
+	<!-- Vikings -->
+	<ThingCategoryDef>
+		<defName>AmmoCryptoCannon</defName>
+		<label>Crypto Fuel</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
+	</ThingCategoryDef>
+	
+	<!-- ==================== AmmoSet ========================== -->
+
+	<!-- Vikings -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_CryptoCannon</defName>
+		<label>Crypto Cannon</label>
+		<ammoTypes>
+			<Ammo_CryptoCannon>Bullet_Flamethrower_CryptoCannon</Ammo_CryptoCannon>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- Lasers -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_SalvagedLaserEradicatorCE</defName>
+		<label>laser charge</label>
+		<ammoTypes>
+			<Ammo_LaserChargePack>Bullet_Laser_SalvagedLaserEradicatorCE</Ammo_LaserChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<!-- Vikings -->
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_Flamethrower_CryptoCannon</defName>
+		<graphicData>
+			<texPath>Things/Projectile/CryptoBullet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>1.50</drawSize>
+		</graphicData>
+		<label>Crygenic stream</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Cryptofuel</damageDef>
+			<damageAmountBase>1</damageAmountBase>
+			<soundExplode>CE_FlamethrowerExplosion</soundExplode>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>4</damageAmountBase>
+				<explosiveDamageType>CE_Cryptofuel</explosiveDamageType>
+				<explosiveRadius>1.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- Lasers -->
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletRed">
+		<defName>Bullet_Laser_SalvagedLaserEradicatorCE</defName>
+		<label>eradicator laser beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>15.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+			<!-- The overall pressure exerted by a laser beam striking something is, unsuprisingly, negligable. -->
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>40</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>3.5</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Pirates/Defs/Vanilla Factions Expanded - Pirates/Ammo/Ammo_Vikings.xml b/ModPatches/Vanilla Factions Expanded - Pirates/Defs/Vanilla Factions Expanded - Pirates/Ammo/Ammo_Vikings.xml
new file mode 100644
index 0000000000..5a345eb9b6
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Pirates/Defs/Vanilla Factions Expanded - Pirates/Ammo/Ammo_Vikings.xml	
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="CryptoAmmoBase" MayRequire="OskarPotocki.VFE.Vikings">
+		<defName>Ammo_CryptoCannon</defName>
+		<label>Crypto Cannon Fuel</label>
+		<graphicData>
+			<drawSize>0.75</drawSize>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.7</MarketValue>
+			<Mass>0.01</Mass>
+			<Bulk>0.01</Bulk>
+		</statBases>
+		<thingCategories>
+			<li>AmmoCryptoCannon</li>
+		</thingCategories>
+		<detonateProjectile>Bullet_Flamethrower_CryptoCannon</detonateProjectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase" MayRequire="OskarPotocki.VFE.Vikings">
+		<defName>MakeAmmo_CryptoCannon</defName>
+		<label>make crypto cannon fuel x200</label>
+		<description>Craft 200 crypto cannon fuel.</description>
+		<jobString>Making crypto cannon fuel.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Chemfuel</li>
+					</thingDefs>
+				</filter>
+				<count>15</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Chemfuel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_CryptoCannon>200</Ammo_CryptoCannon>
+		</products>
+		<workAmount>8600</workAmount>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Pirates/Defs/Vanilla Factions Expanded - Pirates/Ammo/DamageDefs.xml b/ModPatches/Vanilla Factions Expanded - Pirates/Defs/Vanilla Factions Expanded - Pirates/Ammo/DamageDefs.xml
new file mode 100644
index 0000000000..c6ee03c1d0
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Pirates/Defs/Vanilla Factions Expanded - Pirates/Ammo/DamageDefs.xml	
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!--
+	While these Defs are only used conditionally with other mods active,
+	they don't actually do anything by themselves, so there's no harm loading them.
+	 -->
+
+	<DamageDef ParentName="Bullet">
+		<defName>CE_Cryptofuel</defName>
+		<label>Crypto Burn</label>
+		<hediff>Frostbite</hediff>
+		<workerClass>DamageWorker_AddInjury</workerClass>
+		<hasForcefulImpact>true</hasForcefulImpact>
+		<makesBlood>false</makesBlood>
+		<canInterruptJobs>true</canInterruptJobs>
+		<externalViolence>true</externalViolence>
+		<deathMessage>{0} has been frozen to death.</deathMessage>
+		<armorCategory>Heat</armorCategory>
+		<minDamageToFragment>15</minDamageToFragment>
+		<defaultArmorPenetration>0</defaultArmorPenetration>
+		<explosionHeatEnergyPerCell>-20</explosionHeatEnergyPerCell>
+		<soundExplosion>Explosion_Stun</soundExplosion>
+		<combatLogRules>Damage_Flame</combatLogRules>
+		<canUseDeflectMetalEffect>false</canUseDeflectMetalEffect>
+		<explosionColorCenter>(0,1,1,1)</explosionColorCenter>
+		<explosionColorEdge>(0,0.70,1,1)</explosionColorEdge>
+	</DamageDef>
+	
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Pirates/Defs/Vanilla Factions Expanded - Pirates/Ammo/SlughthrowerShell.xml b/ModPatches/Vanilla Factions Expanded - Pirates/Defs/Vanilla Factions Expanded - Pirates/Ammo/SlughthrowerShell.xml
new file mode 100644
index 0000000000..250c338875
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Pirates/Defs/Vanilla Factions Expanded - Pirates/Ammo/SlughthrowerShell.xml	
@@ -0,0 +1,305 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>AmmoSlugthrowerShell</defName>
+		<label>Slugthrower shell</label>
+		<parent>AmmoShotguns</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberShotgun</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_SlugthrowerShell</defName>
+		<label>Slugthrower shell</label>
+		<ammoTypes>
+			<Ammo_Slugthrower_Buck>Bullet_Slugthrower_Buck</Ammo_Slugthrower_Buck>
+			<Ammo_Slugthrower_Slug>Bullet_Slugthrower_Slug</Ammo_Slugthrower_Slug>
+			<Ammo_Slugthrower_Beanbag>Bullet_Slugthrower_Beanbag</Ammo_Slugthrower_Beanbag>
+			<Ammo_Slugthrower_ElectroSlug>Bullet_Slugthrower_ElectroSlug</Ammo_Slugthrower_ElectroSlug>
+		</ammoTypes>
+		<similarTo>AmmoSet_Shotgun</similarTo>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="SlugthrowerShellBase" ParentName="AmmoBase" Abstract="True">
+		<description>Large 40mm shotgun shells designed to be fired by the warcasket slugthrower shotgun.</description>
+		<statBases>
+			<Mass>0.17</Mass>
+			<Bulk>0.38</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoSlugthrowerShell</li>
+		</thingCategories>
+		<stackLimit>500</stackLimit>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SlugthrowerShellBase">
+		<defName>Ammo_Slugthrower_Buck</defName>
+		<label>Slugthrower shell (Buck)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Shotgun/Shot</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.64</MarketValue>
+		</statBases>
+		<ammoClass>BuckShot</ammoClass>
+		<cookOffProjectile>Bullet_Slugthrower_Buck</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SlugthrowerShellBase">
+		<defName>Ammo_Slugthrower_Slug</defName>
+		<label>Slugthrower shell (Slug)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Shotgun/Slug</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.6</MarketValue>
+			<Mass>0.16</Mass>
+		</statBases>
+		<ammoClass>Slug</ammoClass>
+		<cookOffProjectile>Bullet_Slugthrower_Slug</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SlugthrowerShellBase">
+		<defName>Ammo_Slugthrower_Beanbag</defName>
+		<label>Slugthrower shell (Bean)</label>
+		<generateAllowChance>0</generateAllowChance>
+		<graphicData>
+			<texPath>Things/Ammo/Shotgun/Beanbag</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>1.05</MarketValue>
+			<Mass>0.205</Mass>
+		</statBases>
+		<ammoClass>Beanbag</ammoClass>
+		<cookOffProjectile>Bullet_Slugthrower_Beanbag</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SlugthrowerShellBase">
+		<defName>Ammo_Slugthrower_ElectroSlug</defName>
+		<label>Slugthrower shell (EMP)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Shotgun/EMP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<Mass>0.186</Mass>
+			<MarketValue>4.62</MarketValue>
+		</statBases>
+		<ammoClass>ElectroSlug</ammoClass>
+		<generateAllowChance>0.5</generateAllowChance>
+		<cookOffProjectile>Bullet_Slugthrower_ElectroSlug</cookOffProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef Name="BaseSlugthrowerBullet" ParentName="BaseBulletCE" Abstract="true">
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>106</speed>
+			<dropsCasings>true</dropsCasings>
+			<casingMoteDefname>Fleck_ShotgunShell</casingMoteDefname>
+			<casingFilthDefname>Filth_ShotgunAmmoCasings</casingFilthDefname>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseSlugthrowerBullet">
+		<defName>Bullet_Slugthrower_Buck</defName>
+		<label>buckshot pellet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shotgun_Pellet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>27</damageAmountBase>
+			<pelletCount>4</pelletCount>
+			<armorPenetrationSharp>6</armorPenetrationSharp>
+			<armorPenetrationBlunt>75</armorPenetrationBlunt>
+			<spreadMult>7.9</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseSlugthrowerBullet">
+		<defName>Bullet_Slugthrower_Slug</defName>
+		<label>shotgun slug</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>146</speed>
+			<damageAmountBase>74</damageAmountBase>
+			<armorPenetrationSharp>10</armorPenetrationSharp>
+			<armorPenetrationBlunt>638.7</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseSlugthrowerBullet">
+		<defName>Bullet_Slugthrower_Beanbag</defName>
+		<label>beanbag</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>30</speed>
+			<damageDef>Beanbag</damageDef>
+			<damageAmountBase>19</damageAmountBase>
+			<armorPenetrationBlunt>12.56</armorPenetrationBlunt>
+			<spreadMult>2</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseSlugthrowerBullet">
+		<defName>Bullet_Slugthrower_ElectroSlug</defName>
+		<label>EMP slug</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>EMP</damageDef>
+			<damageAmountBase>40</damageAmountBase>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+			<empShieldBreakChance>0.75</empShieldBreakChance>
+			<speed>60</speed>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_Slugthrower_Buck</defName>
+		<label>make Slugthrower (Buck) shell x100</label>
+		<description>Craft 100 Slugthrower (Buck) shells.</description>
+		<jobString>Making Slugthrower (Buck) shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>34</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Slugthrower_Buck>100</Ammo_Slugthrower_Buck>
+		</products>
+		<workAmount>3400</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_Slugthrower_Slug</defName>
+		<label>make Slugthrower (Slug) shell x100</label>
+		<description>Craft 100 Slugthrower (Slug) shells.</description>
+		<jobString>Making Slugthrower (Slug) shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>32</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Slugthrower_Slug>100</Ammo_Slugthrower_Slug>
+		</products>
+		<workAmount>3200</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_Slugthrower_Beanbag</defName>
+		<label>make Slugthrower (Beanbag) shell x100</label>
+		<description>Craft 100 Slugthrower (Beanbag) shells.</description>
+		<jobString>Making Slugthrower (Beanbag) shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>42</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Cloth</li>
+					</thingDefs>
+				</filter>
+				<count>17</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Cloth</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Slugthrower_Beanbag>100</Ammo_Slugthrower_Beanbag>
+		</products>
+		<workAmount>5900</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_Slugthrower_ElectroSlug</defName>
+		<label>make Slugthrower (EMP) shell x100</label>
+		<description>Craft 100 Slugthrower (EMP) shells.</description>
+		<jobString>Making Slugthrower (EMP) shells.</jobString>
+		<researchPrerequisite>MicroelectronicsBasics</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>38</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Slugthrower_ElectroSlug>100</Ammo_Slugthrower_ElectroSlug>
+		</products>
+		<workAmount>11000</workAmount>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/AbilityDefs/Abilities.xml b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/AbilityDefs/Abilities.xml
new file mode 100644
index 0000000000..f1ee061760
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/AbilityDefs/Abilities.xml	
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Ideology</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+			<!-- Firing Frenzy -->
+
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/AbilityDef[@Name="VFEP_RoleAuraBuffBase"]/verbProperties/range</xpath>
+				<value>
+					<range>14.9</range>
+				</value>
+			</li>
+
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/AbilityDef[@Name="VFEP_RoleAuraBuffBase"]/statBases/Ability_EffectRadius</xpath>
+				<value>
+					<Ability_EffectRadius>14.9</Ability_EffectRadius>
+				</value>
+			</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/Drugs/Drug_Bases.xml b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/Drugs/Drug_Bases.xml
new file mode 100644
index 0000000000..f30d6c4563
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/Drugs/Drug_Bases.xml	
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Bulk === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEP_Rum"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+		</value>
+	</Operation>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="VFEP_DrugToolBase"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2.22</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>neck</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>3.33</cooldownTime>
+					<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Neck</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/Misc/Patch_Ideology.xml b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/Misc/Patch_Ideology.xml
new file mode 100644
index 0000000000..611638a53c
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/Misc/Patch_Ideology.xml	
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Ideology</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+			<!-- Firing Frenzy -->
+
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/HediffDef[defName="VFEP_FiringFrenzy"]/comps/li[@Class="HediffCompProperties_GiveHediffsInRange"]/range</xpath>
+				<value>
+					<range>14.9</range>
+				</value>
+			</li>
+
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/HediffDef[defName="VFEP_FiringFrenzyBuff"]/stages/li/statOffsets</xpath>
+				<value>
+					<statOffsets>
+						<Suppressability>-0.25</Suppressability>
+					</statOffsets>
+				</value>
+			</li>
+
+			<li Class="PatchOperationAdd">
+				<xpath>Defs/HediffDef[defName="VFEP_FiringFrenzyBuff"]/stages/li</xpath>
+				<value>
+					<statFactors>
+						<ReloadSpeed>1.20</ReloadSpeed>
+					</statFactors>
+				</value>
+			</li>
+
+			<!-- Pirate Captain -->
+
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/PreceptDef[defName="VFEP_IdeoRole_Captain"]/roleEffects/li[./statDef="ShootingAccuracyPawn"]/modifier</xpath>
+				<value>
+					<modifier>3</modifier>
+				</value>
+			</li>
+
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/PreceptDef[defName="VFEP_IdeoRole_Captain"]/roleEffects/li[./statDef="AimingDelayFactor"]</xpath>
+				<value>
+					<li Class="RoleEffect_PawnStatOffset">
+						<statDef>ReloadSpeed</statDef>
+						<modifier>0.15</modifier>
+					</li>
+				</value>
+			</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/PawnKindDefs/PawnKinds_Junkers.xml b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/PawnKindDefs/PawnKinds_Junkers.xml
new file mode 100644
index 0000000000..2e7b0eea09
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/PawnKindDefs/PawnKinds_Junkers.xml	
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Scrapper === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="VFEP_Scrapper"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Pyro === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="VFEP_Pyro"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Pyro, Hussar === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="VFEP_Footsoldier" or defName="VFEP_Veteran"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>7</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Heavy Weapons Platform, Artillery === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="VFEP_HeavyWeaponsPlatform" or defName="VFEP_Artillery"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Heavy Weapons Platform, Artillery === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="VFEP_HeavyWeaponsPlatform" or defName="VFEP_Artillery"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/PawnKindDefs/PawnKinds_Mercenaries.xml b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/PawnKindDefs/PawnKinds_Mercenaries.xml
new file mode 100644
index 0000000000..59d5817bbb
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/PawnKindDefs/PawnKinds_Mercenaries.xml	
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Private === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="VFEP_Private"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>4</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Corporal, Sergeant, Sergeant Major, Lieutenant, Captain  === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="VFEP_Corporal" or defName="VFEP_Sergeant" or defName="VFEP_SergeantMajor" or defName="VFEP_Lieutenant" or defName="VFEP_Captain"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>5</min>
+					<max>7</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.50</generateChance>
+						<sidearmMoney>
+							<min>125</min>
+							<max>215</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>MedievalMeleeDecent</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Major, General === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="VFEP_Major" or defName="VFEP_General"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === combatPower Patches === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="VFEP_Major"]/combatPower</xpath>
+		<value>
+			<combatPower>500</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="VFEP_General"]/combatPower</xpath>
+		<value>
+			<combatPower>550</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[@Name="VFEP_MercenariesBase"]/skills</xpath>
+		<value>
+			<skills>
+				<li>
+					<skill>Shooting</skill>
+					<range>6~18</range>
+				</li>
+				<li>
+					<skill>Melee</skill>
+					<range>6~16</range>
+				</li>
+			</skills>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/Scenario/Scenario.xml b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/Scenario/Scenario.xml
new file mode 100644
index 0000000000..0b5eba1dfd
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/Scenario/Scenario.xml	
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="VFEP_LowOrbitCrash"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_45ACP_FMJ</thingDef>
+				<count>210</count>
+			</li>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_6x24mmCharged</thingDef>
+				<count>120</count>
+			</li>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_12x72mmCharged</thingDef>
+				<count>200</count>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VFEIMeleeSpacer.xml b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VFEIMeleeSpacer.xml
new file mode 100644
index 0000000000..096e3880b7
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VFEIMeleeSpacer.xml	
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Factions Expanded - Insectoids</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!-- === Plasma Sword === -->
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFEP_WarcasketMeleeWeapon_PlasmaSword"]/statBases</xpath>
+					<value>
+						<Bulk>35</Bulk>
+						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+						<ToughnessRating>24</ToughnessRating>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFEP_WarcasketMeleeWeapon_PlasmaSword"]</xpath>
+					<value>
+						<equippedStatOffsets>
+							<MeleeCritChance>0.02</MeleeCritChance>
+							<MeleeParryChance>0.47</MeleeParryChance>
+							<MeleeDodgeChance>0.18</MeleeDodgeChance>
+						</equippedStatOffsets>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFEP_WarcasketMeleeWeapon_PlasmaSword"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>point</label>
+								<capacities>
+									<li>Stab</li>
+								</capacities>
+								<power>46</power>
+								<cooldownTime>2</cooldownTime>
+								<armorPenetrationBlunt>9</armorPenetrationBlunt>
+								<armorPenetrationSharp>64</armorPenetrationSharp>
+								<extraMeleeDamages>
+									<li>
+										<def>Flame</def>
+										<amount>10</amount>
+										<chance>0.15</chance>
+									</li>
+								</extraMeleeDamages>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>blade</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>58</power>
+								<cooldownTime>2.6</cooldownTime>
+								<armorPenetrationBlunt>17</armorPenetrationBlunt>
+								<armorPenetrationSharp>48</armorPenetrationSharp>
+								<extraMeleeDamages>
+									<li>
+										<def>Flame</def>
+										<amount>10</amount>
+										<chance>0.5</chance>
+									</li>
+								</extraMeleeDamages>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VFEVRangedWarcasket.xml b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VFEVRangedWarcasket.xml
new file mode 100644
index 0000000000..60460d8dba
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VFEVRangedWarcasket.xml	
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Factions Expanded - Vikings</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName = "VFEP_WarcasketGun_CryptoCannon"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>barrel</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>35</power>
+								<cooldownTime>2.44</cooldownTime>
+								<armorPenetrationBlunt>16</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>VFEP_WarcasketGun_CryptoCannon</defName>
+					<statBases>
+						<Bulk>20</Bulk>
+						<SwayFactor>2.10</SwayFactor>
+						<ShotSpread>3.00</ShotSpread>
+						<SightsEfficiency>1.0</SightsEfficiency>
+						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<recoilAmount>0.55</recoilAmount>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_Flamethrower_CryptoCannon</defaultProjectile>
+						<burstShotCount>15</burstShotCount>
+						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+						<warmupTime>1.3</warmupTime>
+						<range>30</range>
+						<minRange>3</minRange>
+						<soundCast>HissFlamethrower</soundCast>
+						<soundCastTail>GunTail_Light</soundCastTail>
+						<muzzleFlashScale>12</muzzleFlashScale>
+						<targetParams>
+							<canTargetLocations>true</canTargetLocations>
+						</targetParams>
+						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>200</magazineSize>
+						<reloadTime>5.6</reloadTime>
+						<ammoSet>AmmoSet_CryptoCannon</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aiAimMode>SuppressFire</aiAimMode>
+						<aimedBurstShotCount>5</aimedBurstShotCount>
+						<noSingleShot>True</noSingleShot>
+					</FireModes>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWECRangedWarcasket.xml b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWECRangedWarcasket.xml
new file mode 100644
index 0000000000..8eabcbd97d
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWECRangedWarcasket.xml	
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Weapons Expanded - Coilguns</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName = "VFEP_WarcasketGun_Railgun"]/tools
+					</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>barrel</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>35</power>
+								<cooldownTime>2.44</cooldownTime>
+								<armorPenetrationBlunt>16</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>VFEP_WarcasketGun_Railgun</defName>
+					<statBases>
+						<Bulk>55.0</Bulk>
+						<SwayFactor>2.40</SwayFactor>
+						<ShotSpread>0.66</ShotSpread>
+						<SightsEfficiency>1.25</SightsEfficiency>
+						<RangedWeapon_Cooldown>0.86</RangedWeapon_Cooldown>
+					</statBases>
+					<Properties>
+						<recoilAmount>1.26</recoilAmount>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>True</hasStandardCommand>
+						<defaultProjectile>Bullet_CoilGun_Lance</defaultProjectile>
+						<burstShotCount>3</burstShotCount>
+						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+						<warmupTime>2.4</warmupTime>
+						<range>85</range>
+						<soundCast>VWE_Shot_GaussLance</soundCast>
+						<soundCastTail>GunTail_Heavy</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+						<recoilPattern>Regular</recoilPattern>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>15</magazineSize>
+						<reloadTime>5.2</reloadTime>
+						<ammoSet>AmmoSet_8mmRailgun_GaussLance</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aiUseBurstMode>true</aiUseBurstMode>
+						<aiAimMode>AimedShot</aiAimMode>
+					</FireModes>
+					<weaponTags>
+						<li>SpacerGun</li>
+					</weaponTags>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWELRangedWarcasket.xml b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWELRangedWarcasket.xml
new file mode 100644
index 0000000000..8ff09b55e7
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWELRangedWarcasket.xml	
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Weapons Expanded - Laser</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName = "VFEP_WarcasketGun_SalvagedLaserEradicator" or defName = "VFEP_WarcasketGun_LaserBlaster"]/tools
+					</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>barrel</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>35</power>
+								<cooldownTime>2.44</cooldownTime>
+								<armorPenetrationBlunt>16</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationRemove">
+					<xpath>Defs/ThingDef[defName = "VFEP_WarcasketGun_SalvagedLaserEradicator" or defName = "VFEP_WarcasketGun_LaserBlaster"]/comps/li[@Class="VanillaWeaponsExpandedLaser.CompProperties_LaserCapacitor"]</xpath>
+				</li>
+
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>VFEP_WarcasketGun_SalvagedLaserEradicator</defName>
+					<statBases>
+						<Mass>30</Mass>
+						<Bulk>40</Bulk>
+						<SwayFactor>2.85</SwayFactor>
+						<ShotSpread>0.08</ShotSpread>
+						<SightsEfficiency>2.20</SightsEfficiency>
+						<RangedWeapon_Cooldown>0.60</RangedWeapon_Cooldown>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>True</hasStandardCommand>
+						<defaultProjectile>Bullet_Laser_SalvagedLaserEradicatorCE</defaultProjectile>
+						<ammoConsumedPerShotCount>15</ammoConsumedPerShotCount>
+						<warmupTime>4.6</warmupTime>
+						<range>68</range>
+						<minRange>3</minRange>
+						<soundCast>Shot_TurretSniper</soundCast>
+						<soundCastTail>GunTail_Heavy</soundCastTail>
+						<muzzleFlashScale>16</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>300</magazineSize>
+						<reloadTime>7.6</reloadTime>
+						<ammoSet>AmmoSet_SalvagedLaserEradicatorCE</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aiAimMode>AimedShot</aiAimMode>
+					</FireModes>
+				</li>
+
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>VFEP_WarcasketGun_LaserBlaster</defName>
+					<statBases>
+						<Mass>20</Mass>
+						<Bulk>25</Bulk>
+						<SwayFactor>2.64</SwayFactor>
+						<ShotSpread>0.06</ShotSpread>
+						<SightsEfficiency>1</SightsEfficiency>
+						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>True</hasStandardCommand>
+						<defaultProjectile>Bullet_Laser_LaserSniperRifle</defaultProjectile>
+						<burstShotCount>25</burstShotCount>
+						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+						<warmupTime>2</warmupTime>
+						<range>75</range>
+						<soundCast>VWE_LaserShot_Rifle</soundCast>
+						<soundCastTail>GunTail_Heavy</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+						<recoilAmount>0.01</recoilAmount>
+						<recoilPattern>Regular</recoilPattern>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>200</magazineSize>
+						<reloadTime>6</reloadTime>
+						<ammoSet>AmmoSet_LaserSniperRifle</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aiAimMode>SuppressFire</aiAimMode>
+						<aimedBurstShotCount>10</aimedBurstShotCount>
+						<noSingleShot>true</noSingleShot>
+					</FireModes>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWENLRangedWarcasket.xml b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWENLRangedWarcasket.xml
new file mode 100644
index 0000000000..c868e4e8ed
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWENLRangedWarcasket.xml	
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Weapons Expanded - Non-Lethal</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName = "VFEP_WarcasketGun_TearGasGrenadeLauncher"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>barrel</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>35</power>
+								<cooldownTime>2.44</cooldownTime>
+								<armorPenetrationBlunt>16</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>VFEP_WarcasketGun_TearGasGrenadeLauncher</defName>
+					<statBases>
+						<Bulk>25</Bulk>
+						<SwayFactor>1.31</SwayFactor>
+						<ShotSpread>0.18</ShotSpread>
+						<SightsEfficiency>1.0</SightsEfficiency>
+						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+					</statBases>
+					<Properties>
+						<recoilAmount>1.08</recoilAmount>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_40x46mmGrenade_CN</defaultProjectile>
+						<warmupTime>1</warmupTime>
+						<range>50</range>
+						<burstShotCount>2</burstShotCount>
+						<ticksBetweenBurstShots>20</ticksBetweenBurstShots>
+						<soundCast>VWENL_Shot_GrenadeLauncher</soundCast>
+						<soundCastTail>GunTail_Medium</soundCastTail>
+						<muzzleFlashScale>14</muzzleFlashScale>
+						<ai_IsBuildingDestroyer>True</ai_IsBuildingDestroyer>
+						<ignorePartialLoSBlocker>True</ignorePartialLoSBlocker>
+						<targetParams>
+							<canTargetLocations>True</canTargetLocations>
+						</targetParams>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>6</magazineSize>
+						<reloadTime>2.2</reloadTime>
+						<ammoSet>AmmoSet_40x46mmGrenadeNL</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aiAimMode>AimedShot</aiAimMode>
+						<aiUseBurstMode>False</aiUseBurstMode>
+					</FireModes>
+					<weaponTags>
+						<li>NonLethal</li>
+					</weaponTags>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWEQRangedWarcasket.xml b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWEQRangedWarcasket.xml
new file mode 100644
index 0000000000..e685cd4ca9
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWEQRangedWarcasket.xml	
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Weapons Expanded - Quickdraw</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName = "VFEP_WarcasketGun_FoldingGun"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>barrel</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>35</power>
+								<cooldownTime>2.44</cooldownTime>
+								<armorPenetrationBlunt>16</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>VFEP_WarcasketGun_FoldingGun</defName>
+					<statBases>
+						<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
+						<SightsEfficiency>1.0</SightsEfficiency>
+						<ShotSpread>0.10</ShotSpread>
+						<SwayFactor>2.32</SwayFactor>
+						<Bulk>15</Bulk>
+					</statBases>
+					<Properties>
+						<recoilAmount>1.45</recoilAmount>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_338Norma_FMJ</defaultProjectile>
+						<warmupTime>0.5</warmupTime>
+						<range>57</range>
+						<burstShotCount>10</burstShotCount>
+						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+						<soundCast>VFEP_Shot_Minigun</soundCast>
+						<soundCastTail>GunTail_Medium</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+						<targetParams>
+							<canTargetLocations>true</canTargetLocations>
+						</targetParams>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>100</magazineSize>
+						<reloadTime>9.2</reloadTime>
+						<ammoSet>AmmoSet_338Norma</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aimedBurstShotCount>5</aimedBurstShotCount>
+						<aiUseBurstMode>true</aiUseBurstMode>
+						<aiAimMode>Snapshot</aiAimMode>
+					</FireModes>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Apparel_Various.xml b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Apparel_Various.xml
new file mode 100644
index 0000000000..4abf260dd0
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Apparel_Various.xml	
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Body Suit ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Bodysuit"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>2</Bulk>
+				<WornBulk>0</WornBulk>
+			</statBases>
+		</value>
+	</Operation>
+
+	<!-- ========== Rum Suit ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEP_Apparel_Rumsuit"]/statBases</xpath>
+		<value>
+			<Bulk>50</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- ========== Privateer Armor ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEP_Apparel_Privateer"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEP_Apparel_Privateer"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>480</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEP_Apparel_Privateer"]/statBases/Mass</xpath>
+		<value>
+			<Mass>50</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEP_Apparel_Privateer"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEP_Apparel_Privateer"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>19</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEP_Apparel_Privateer"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>43</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEP_Apparel_Privateer"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>50</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFEP_Apparel_Privateer"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEP_Apparel_Privateer"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>80</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+			<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEP_Apparel_Privateer"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEP_Apparel_Privateer"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>170</Plasteel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEP_Apparel_Privateer"]/costList/Uranium</xpath>
+		<value>
+			<Uranium>40</Uranium>
+		</value>
+	</Operation>
+
+	<!-- Partial Armor -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFEP_Apparel_Privateer"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Apparel_Warcaskets.xml b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Apparel_Warcaskets.xml
new file mode 100644
index 0000000000..663202c0f9
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Apparel_Warcaskets.xml	
@@ -0,0 +1,1183 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Remove Warcasket Flammability ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[@Name="VFEP_WarcasketPartBase"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0.25</Flammability>
+		</value>
+	</Operation>
+
+	<!-- ========== Partial Armor ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/VFEPirates.WarcasketDef[@Name="VFEP_WarcasketHelmetBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.85</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/VFEPirates.WarcasketDef[@Name="VFEP_WarcasketShoulderPadBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Basic Warcasket ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Warcasket"]/statBases</xpath>
+		<value>
+			<Bulk>200</Bulk>
+			<WornBulk>20</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Warcasket"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!--2.5x sharp-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Warcasket"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Warcasket"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>250</CarryWeight>
+			<CarryBulk>200</CarryBulk>
+			<Suppressability>-100</Suppressability>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Warcasket"]/costList/Steel</xpath>
+		<value>
+			<Steel>160</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Warcasket"]/costList/ComponentIndustrial</xpath>
+		<value>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</value>
+	</Operation>
+
+	<!-- ========== Basic Warcasket - Shoulders ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Warcasket"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Warcasket"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Warcasket"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Warcasket"]/costList/Steel</xpath>
+		<value>
+			<Steel>80</Steel>
+		</value>
+	</Operation>
+
+	<!-- === Basic Warcasket Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Warcasket"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Warcasket"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Warcasket"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Warcasket"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!-- Proportionally a bit better armor because assumed better neck suport allows for heavier-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Warcasket"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!--2.25x sharp-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Warcasket"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Warcasket"]/costList/Steel</xpath>
+		<value>
+			<Steel>80</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Warcasket"]/costList/ComponentIndustrial</xpath>
+		<value>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</value>
+	</Operation>
+
+	<!-- ========== Marine Warcasket ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Marine"]/statBases</xpath>
+		<value>
+			<Bulk>200</Bulk>
+			<WornBulk>20</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Marine"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>23</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Marine"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>57</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Marine"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>250</CarryWeight>
+			<CarryBulk>200</CarryBulk>
+			<Suppressability>-100</Suppressability>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Marine"]/costList/Steel</xpath>
+		<value>
+			<Steel>260</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Marine"]/costList/ComponentIndustrial</xpath>
+		<value>
+			<ComponentIndustrial>8</ComponentIndustrial>
+		</value>
+	</Operation>
+
+	<!-- ========== Marine Warcasket - Shoulders ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Marine"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Marine"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>23</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Marine"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>57</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Marine"]/costList/Steel</xpath>
+		<value>
+			<Steel>110</Steel>
+		</value>
+	</Operation>
+
+	<!-- === Marine Warcasket Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Marine"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+			<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Marine"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Marine"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Marine"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!-- Armor values scaled by vanilla stat ratios compared to basic warcasket helmet [e.g (1.20/1.06)*16 = ~18 ]. -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Marine"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Marine"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Marine"]/costList/Steel</xpath>
+		<value>
+			<Steel>130</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Marine"]/costList/ComponentIndustrial</xpath>
+		<value>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</value>
+	</Operation>
+
+	<!-- ========== Recon Warcasket ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Recon"]/statBases</xpath>
+		<value>
+			<Bulk>175</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Recon"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Recon"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>46</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Recon"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>225</CarryWeight>
+			<CarryBulk>175</CarryBulk>
+			<Suppressability>-100</Suppressability>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Recon"]/costList/Steel</xpath>
+		<value>
+			<Steel>160</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Recon"]/costList/ComponentIndustrial</xpath>
+		<value>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</value>
+	</Operation>
+
+	<!-- ========== Recon Warcasket - Shoulders ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Recon"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Recon"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Recon"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>46</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Recon"]/costList/Steel</xpath>
+		<value>
+			<Steel>80</Steel>
+		</value>
+	</Operation>
+
+	<!-- === Recon Warcasket Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Recon"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>4</WornBulk>
+			<NightVisionEfficiency_Apparel>0.65</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Recon"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Recon"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Recon"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Recon"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Recon"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>37</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Recon"]/costList/Steel</xpath>
+		<value>
+			<Steel>80</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Recon"]/costList/ComponentIndustrial</xpath>
+		<value>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</value>
+	</Operation>
+
+	<!-- ========== Cataphract Warcasket ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Cataphract"]/statBases</xpath>
+		<value>
+			<Bulk>250</Bulk>
+			<WornBulk>25</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Cataphract"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>32</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Cataphract"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>80</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Cataphract"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>250</CarryWeight>
+			<CarryBulk>200</CarryBulk>
+			<Suppressability>-100</Suppressability>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Cataphract"]/costList/Steel</xpath>
+		<value>
+			<Steel>350</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Cataphract"]/costList/ComponentIndustrial</xpath>
+		<value>
+			<ComponentIndustrial>10</ComponentIndustrial>
+		</value>
+	</Operation>
+
+	<!-- ========== Cataphract Warcasket - Shoulders ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Cataphract"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Cataphract"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>32</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Cataphract"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>80</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Cataphract"]/costList/Steel</xpath>
+		<value>
+			<Steel>150</Steel>
+		</value>
+	</Operation>
+
+	<!-- === Cataphract Warcasket Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Cataphract"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>8</WornBulk>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Cataphract"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Cataphract"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Cataphract"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Cataphract"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>28</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Cataphract"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>63</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Cataphract"]/costList/Steel</xpath>
+		<value>
+			<Steel>150</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Cataphract"]/costList/ComponentIndustrial</xpath>
+		<value>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</value>
+	</Operation>
+
+	<!-- ========== Aerial Warcasket ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Aerial"]/statBases</xpath>
+		<value>
+			<Bulk>250</Bulk>
+			<WornBulk>25</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Aerial"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>28</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Aerial"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>70</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Aerial"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>250</CarryWeight>
+			<CarryBulk>200</CarryBulk>
+			<Suppressability>-100</Suppressability>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Aerial"]/costList/Steel</xpath>
+		<value>
+			<Steel>290</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Aerial"]/costList/ComponentIndustrial</xpath>
+		<value>
+			<ComponentIndustrial>16</ComponentIndustrial>
+		</value>
+	</Operation>
+
+	<!-- ========== Aerial Warcasket - Shoulders ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Aerial"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Aerial"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>28</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Aerial"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>70</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Aerial"]/costList/Steel</xpath>
+		<value>
+			<Steel>40</Steel>
+		</value>
+	</Operation>
+
+	<!-- === Aerial Warcasket Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Aerial"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>8</WornBulk>
+			<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Aerial"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Aerial"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Aerial"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Aerial"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Aerial"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>56</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Aerial"]/costList/Steel</xpath>
+		<value>
+			<Steel>90</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Aerial"]/costList/ComponentIndustrial</xpath>
+		<value>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</value>
+	</Operation>
+
+	<!-- ========== Barrage Warcasket ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Barrage"]/statBases</xpath>
+		<value>
+			<Bulk>275</Bulk>
+			<WornBulk>35</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Barrage"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>36</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Barrage"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>90</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Barrage"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>250</CarryWeight>
+			<CarryBulk>225</CarryBulk>
+			<Suppressability>-100</Suppressability>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Barrage"]/costList/Steel</xpath>
+		<value>
+			<Steel>480</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Barrage"]/costList/ComponentIndustrial</xpath>
+		<value>
+			<ComponentIndustrial>16</ComponentIndustrial>
+		</value>
+	</Operation>
+
+	<!-- ========== Barrage Warcasket - Shoulders ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Barrage"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Barrage"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>36</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Barrage"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>90</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Barrage"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<label>grenade barrage</label>
+					<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<onlyManualCast>True</onlyManualCast>
+					<warmupTime>0.6</warmupTime>
+					<range>40</range>
+					<minRange>5</minRange>
+					<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+					<soundCast>Shot_IncendiaryLauncher</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>14</muzzleFlashScale>
+					<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+					<defaultProjectile>Bullet_40x53mmGrenade_HE</defaultProjectile>
+					<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Barrage"]/comps/li[@Class="CompProperties_Reloadable"]/ammoDef</xpath>
+		<value>
+			<ammoDef>Ammo_40x53mmGrenade_HE</ammoDef>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Barrage"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountPerCharge</xpath>
+		<value>
+			<ammoCountPerCharge>1</ammoCountPerCharge>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Barrage"]/comps/li[@Class="CompProperties_Reloadable"]/maxCharges</xpath>
+		<value>
+			<maxCharges>8</maxCharges>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Barrage"]/costList/Steel</xpath>
+		<value>
+			<Steel>150</Steel>
+		</value>
+	</Operation>
+
+	<!-- === Barrage Warcasket Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Barrage"]/statBases</xpath>
+		<value>
+			<Bulk>20</Bulk>
+			<WornBulk>10</WornBulk>
+			<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Barrage"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Barrage"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Barrage"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Barrage"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>32</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Barrage"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>72</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Barrage"]/costList/Steel</xpath>
+		<value>
+			<Steel>90</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Barrage"]/costList/ComponentIndustrial</xpath>
+		<value>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</value>
+	</Operation>
+
+	<!-- ========== Hazard Warcasket ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Hazard"]/statBases</xpath>
+		<value>
+			<Bulk>200</Bulk>
+			<WornBulk>20</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Hazard"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Hazard"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>50</ArmorRating_Blunt>
+			<ArmorRating_Electric>1</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Hazard"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>250</CarryWeight>
+			<CarryBulk>200</CarryBulk>
+			<Suppressability>-100</Suppressability>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Hazard"]/costList/Steel</xpath>
+		<value>
+			<Steel>270</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Hazard"]/costList/ComponentIndustrial</xpath>
+		<value>
+			<ComponentIndustrial>8</ComponentIndustrial>
+		</value>
+	</Operation>
+
+	<!-- ========== Hazard Warcasket - Shoulders ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Hazard"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Hazard"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Hazard"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>50</ArmorRating_Blunt>
+			<ArmorRating_Electric>1</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Hazard"]/costList/Steel</xpath>
+		<value>
+			<Steel>110</Steel>
+		</value>
+	</Operation>
+
+	<!-- === Hazard Warcasket Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Hazard"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+			<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Hazard"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Hazard"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Hazard"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Hazard"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Hazard"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>40</ArmorRating_Blunt>
+			<ArmorRating_Electric>1</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Hazard"]/costList/Steel</xpath>
+		<value>
+			<Steel>70</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Hazard"]/costList/ComponentIndustrial</xpath>
+		<value>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</value>
+	</Operation>
+
+	<!-- ========== Shock Warcasket ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Shock"]/statBases</xpath>
+		<value>
+			<Bulk>250</Bulk>
+			<WornBulk>25</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Shock"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>28</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Shock"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>70</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Shock"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>250</CarryWeight>
+			<CarryBulk>200</CarryBulk>
+			<Suppressability>-100</Suppressability>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Shock"]/costList/Steel</xpath>
+		<value>
+			<Steel>240</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Shock"]/costList/ComponentIndustrial</xpath>
+		<value>
+			<ComponentIndustrial>20</ComponentIndustrial>
+		</value>
+	</Operation>
+
+	<!-- ========== Shock Warcasket - Shoulders ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Shock"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Shock"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>28</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Shock"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>70</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Shock"]/costList/Steel</xpath>
+		<value>
+			<Steel>120</Steel>
+		</value>
+	</Operation>
+
+	<!-- === Shock Warcasket Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Shock"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>8</WornBulk>
+			<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Shock"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Shock"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Shock"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Shock"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Shock"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>56</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Shock"]/costList/Steel</xpath>
+		<value>
+			<Steel>80</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Shock"]/costList/ComponentIndustrial</xpath>
+		<value>
+			<ComponentIndustrial>8</ComponentIndustrial>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Apparel_Warcaskets_Spacer.xml b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Apparel_Warcaskets_Spacer.xml
new file mode 100644
index 0000000000..1026e362e9
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Apparel_Warcaskets_Spacer.xml	
@@ -0,0 +1,772 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Siegebreaker Warcasket ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Siegebreaker"]/statBases</xpath>
+		<value>
+			<Bulk>275</Bulk>
+			<WornBulk>35</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Siegebreaker"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>36</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Siegebreaker"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>90</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Siegebreaker"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>250</CarryWeight>
+			<CarryBulk>225</CarryBulk>
+			<Suppressability>-100</Suppressability>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Siegebreaker"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>225</Plasteel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Siegebreaker"]/costList/ComponentSpacer</xpath>
+		<value>
+			<ComponentSpacer>8</ComponentSpacer>
+		</value>
+	</Operation>
+
+	<!-- === Energy Shield === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Siegebreaker"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldEnergyMax</xpath>
+		<value>
+			<EnergyShieldEnergyMax>375</EnergyShieldEnergyMax>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Siegebreaker"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldRechargeRate</xpath>
+		<value>
+			<EnergyShieldRechargeRate>1.5</EnergyShieldRechargeRate>
+		</value>
+	</Operation>
+
+	<!-- ========== Siegebreaker Warcasket - Shoulders ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Siegebreaker"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Siegebreaker"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>36</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Siegebreaker"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>90</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Siegebreaker"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>90</Plasteel>
+		</value>
+	</Operation>
+
+	<!-- === Siegebreaker Warcasket Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Siegebreaker"]/statBases</xpath>
+		<value>
+			<Bulk>20</Bulk>
+			<WornBulk>10</WornBulk>
+			<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Siegebreaker"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Siegebreaker"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Siegebreaker"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Siegebreaker"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>32</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Siegebreaker"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>72</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Siegebreaker"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>75</Plasteel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Siegebreaker"]/costList/ComponentSpacer</xpath>
+		<value>
+			<ComponentSpacer>4</ComponentSpacer>
+		</value>
+	</Operation>
+
+	<!-- ========== Guardian Warcasket ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Guardian"]/statBases</xpath>
+		<value>
+			<Bulk>275</Bulk>
+			<WornBulk>35</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Guardian"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>36</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Guardian"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>110</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Guardian"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>250</CarryWeight>
+			<CarryBulk>225</CarryBulk>
+			<Suppressability>-100</Suppressability>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Guardian"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>300</Plasteel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Guardian"]/costList/ComponentSpacer</xpath>
+		<value>
+			<ComponentSpacer>8</ComponentSpacer>
+		</value>
+	</Operation>
+
+	<!-- === Energy Shield === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Guardian"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldEnergyMax</xpath>
+		<value>
+			<EnergyShieldEnergyMax>225</EnergyShieldEnergyMax>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Guardian"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldRechargeRate</xpath>
+		<value>
+			<EnergyShieldRechargeRate>1.5</EnergyShieldRechargeRate>
+		</value>
+	</Operation>
+
+	<!-- ========== Guardian Warcasket - Shoulders ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Guardian"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Guardian"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>36</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Guardian"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>110</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Guardian"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>120</Plasteel>
+		</value>
+	</Operation>
+
+	<!-- === Guardian Warcasket Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Guardian"]/statBases</xpath>
+		<value>
+			<Bulk>20</Bulk>
+			<WornBulk>10</WornBulk>
+			<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Guardian"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Guardian"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Guardian"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Guardian"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>32</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Guardian"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>86</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Guardian"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>105</Plasteel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Guardian"]/costList/ComponentSpacer</xpath>
+		<value>
+			<ComponentSpacer>4</ComponentSpacer>
+		</value>
+	</Operation>
+
+	<!-- ========== Controller Warcasket ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Controller"]/statBases</xpath>
+		<value>
+			<Bulk>275</Bulk>
+			<WornBulk>35</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Controller"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>36</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Controller"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>90</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Controller"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>250</CarryWeight>
+			<CarryBulk>225</CarryBulk>
+			<Suppressability>-100</Suppressability>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Controller"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>225</Plasteel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Controller"]/costList/ComponentSpacer</xpath>
+		<value>
+			<ComponentSpacer>14</ComponentSpacer>
+		</value>
+	</Operation>
+
+	<!-- === Energy Shield === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Controller"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldEnergyMax</xpath>
+		<value>
+			<EnergyShieldEnergyMax>225</EnergyShieldEnergyMax>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Controller"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldRechargeRate</xpath>
+		<value>
+			<EnergyShieldRechargeRate>1.5</EnergyShieldRechargeRate>
+		</value>
+	</Operation>
+
+	<!-- ========== Controller Warcasket - Shoulders ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Controller"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Controller"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>36</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Controller"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>90</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Controller"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>90</Plasteel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Controller"]/costList/ComponentSpacer</xpath>
+		<value>
+			<ComponentSpacer>1</ComponentSpacer>
+		</value>
+	</Operation>
+
+	<!-- === Siegebreaker Warcasket Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Controller"]/statBases</xpath>
+		<value>
+			<Bulk>20</Bulk>
+			<WornBulk>10</WornBulk>
+			<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Controller"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Controller"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Controller"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Controller"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>32</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Controller"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>72</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Controller"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>90</Plasteel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Controller"]/costList/ComponentSpacer</xpath>
+		<value>
+			<ComponentSpacer>6</ComponentSpacer>
+		</value>
+	</Operation>
+
+	<!-- ========== Sarcophagus Warcasket ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Sarcophagus"]/statBases</xpath>
+		<value>
+			<Bulk>275</Bulk>
+			<WornBulk>35</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Sarcophagus"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>36</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Sarcophagus"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>90</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Sarcophagus"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>250</CarryWeight>
+			<CarryBulk>225</CarryBulk>
+			<Suppressability>-100</Suppressability>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Sarcophagus"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>225</Plasteel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Sarcophagus"]/costList/ComponentSpacer</xpath>
+		<value>
+			<ComponentSpacer>8</ComponentSpacer>
+		</value>
+	</Operation>
+
+	<!-- === Energy Shield === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Sarcophagus"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldEnergyMax</xpath>
+		<value>
+			<EnergyShieldEnergyMax>225</EnergyShieldEnergyMax>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Sarcophagus"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldRechargeRate</xpath>
+		<value>
+			<EnergyShieldRechargeRate>1.5</EnergyShieldRechargeRate>
+		</value>
+	</Operation>
+
+	<!-- ========== Sarcophagus Warcasket - Shoulders ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Sarcophagus"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Sarcophagus"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>36</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Sarcophagus"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>90</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Sarcophagus"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>90</Plasteel>
+		</value>
+	</Operation>
+
+	<!-- === Sarcophagus Warcasket Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Sarcophagus"]/statBases</xpath>
+		<value>
+			<Bulk>20</Bulk>
+			<WornBulk>10</WornBulk>
+			<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Sarcophagus"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Sarcophagus"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Sarcophagus"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Sarcophagus"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>32</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Sarcophagus"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>72</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Sarcophagus"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>90</Plasteel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Sarcophagus"]/costList/ComponentSpacer</xpath>
+		<value>
+			<ComponentSpacer>4</ComponentSpacer>
+		</value>
+	</Operation>
+
+	<!-- ========== Brute Warcasket ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Brute"]/statBases</xpath>
+		<value>
+			<Bulk>275</Bulk>
+			<WornBulk>35</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Brute"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>36</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Brute"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>110</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Brute"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>250</CarryWeight>
+			<CarryBulk>225</CarryBulk>
+			<Suppressability>-100</Suppressability>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Brute"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>240</Plasteel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Brute"]/costList/ComponentSpacer</xpath>
+		<value>
+			<ComponentSpacer>6</ComponentSpacer>
+		</value>
+	</Operation>
+
+	<!-- === Energy Shield === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Brute"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldEnergyMax</xpath>
+		<value>
+			<EnergyShieldEnergyMax>750</EnergyShieldEnergyMax>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Brute"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldRechargeRate</xpath>
+		<value>
+			<EnergyShieldRechargeRate>0.75</EnergyShieldRechargeRate>
+		</value>
+	</Operation>
+
+	<!-- ========== Brute Warcasket - Shoulders ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Brute"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Brute"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>36</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Brute"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>110</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Brute"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>90</Plasteel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Brute"]/costList/ComponentSpacer</xpath>
+		<value>
+			<ComponentSpacer>6</ComponentSpacer>
+		</value>
+	</Operation>
+
+	<!-- === Brute Warcasket Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Brute"]/statBases</xpath>
+		<value>
+			<Bulk>20</Bulk>
+			<WornBulk>10</WornBulk>
+			<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Brute"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Brute"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Brute"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Brute"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>32</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Brute"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>86</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Brute"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>90</Plasteel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Brute"]/costList/ComponentSpacer</xpath>
+		<value>
+			<ComponentSpacer>6</ComponentSpacer>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Melee_Warcaskets.xml b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Melee_Warcaskets.xml
new file mode 100644
index 0000000000..470e76c1a5
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Melee_Warcaskets.xml	
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Warcasket Combat Knife -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEP_WarcasketMeleeWeapon_CombatKnife"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>2.0</cooldownTime>
+					<armorPenetrationBlunt>14</armorPenetrationBlunt>
+					<armorPenetrationSharp>9</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>2.9</cooldownTime>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEP_WarcasketMeleeWeapon_CombatKnife"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.63</MeleeCritChance>
+				<MeleeParryChance>0.75</MeleeParryChance>
+				<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEP_WarcasketMeleeWeapon_CombatKnife"]/statBases</xpath>
+		<value>
+			<Bulk>7</Bulk>
+			<MeleeCounterParryBonus>0.23</MeleeCounterParryBonus>
+			<ToughnessRating>5</ToughnessRating>
+		</value>
+	</Operation>
+
+	<!-- Warcasket Broadsword -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEP_WarcasketMeleeWeapon_Broadsword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>56</power>
+					<cooldownTime>2.4</cooldownTime>
+					<armorPenetrationBlunt>18</armorPenetrationBlunt>
+					<armorPenetrationSharp>12</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>68</power>
+					<cooldownTime>3.35</cooldownTime>
+					<armorPenetrationBlunt>17</armorPenetrationBlunt>
+					<armorPenetrationSharp>7.2</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEP_WarcasketMeleeWeapon_Broadsword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.02</MeleeCritChance>
+				<MeleeParryChance>0.47</MeleeParryChance>
+				<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEP_WarcasketMeleeWeapon_Broadsword"]/statBases</xpath>
+		<value>
+			<Bulk>14</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+			<ToughnessRating>10</ToughnessRating>
+		</value>
+	</Operation>
+
+	<!-- Warcasket Gravity Hammer -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEP_WarcasketMeleeWeapon_GravityHammer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>VFEP_GravityHammerAttack</li>
+					</capacities>
+					<power>92</power>
+					<cooldownTime>5.73</cooldownTime>
+					<armorPenetrationBlunt>580</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>50</power>
+					<cooldownTime>2.11</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>22.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEP_WarcasketMeleeWeapon_GravityHammer"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.8</MeleeCritChance>
+				<MeleeParryChance>0.1</MeleeParryChance>
+				<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEP_WarcasketMeleeWeapon_GravityHammer"]/statBases</xpath>
+		<value>
+			<Bulk>18</Bulk>
+			<MeleeCounterParryBonus>2</MeleeCounterParryBonus>
+			<ToughnessRating>25</ToughnessRating>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Ranged_Warcaskets.xml b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Ranged_Warcaskets.xml
new file mode 100644
index 0000000000..f5eb149f8d
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Ranged_Warcaskets.xml	
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Ranged Weapon Draw Size -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[
+			defName = "VFEP_WarcasketGun_Autorifle" or
+			defName = "VFEP_WarcasketGun_UraniumSlugRifle" or
+			defName = "VFEP_WarcasketGun_Slugthrower" or
+			defName = "VFEP_WarcasketGun_Minigun" or
+			defName = "VFEP_WarcasketGun_GrenadeLauncher" or
+			defName = "VFEP_WarcasketGun_HeavyFlamer" or
+			defName = "VFEP_WarcasketGun_ChargeLance" or
+			defName = "VFEP_WarcasketGun_HandheldCannon" or
+			defName = "VFEP_WarcasketGun_ChargeBlaster"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.7,1.7</DrawSize>
+				<DrawOffset>0.0,0.0</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Remove the added weapon tag from the Charge Lance === -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Gun_ChargeLance"]/weaponTags/li[contains(.,"VFEP_Captain")]</xpath>
+	</Operation>
+
+	<!-- === Research === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ResearchProjectDef[defName="VFEP_WarcasketWeaponry"]/prerequisites/li[text()="MultibarrelWeapons"]</xpath>
+		<value>
+			<li>PrecisionRifling</li>
+		</value>
+	</Operation>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "VFEP_WarcasketGun_Autorifle" or
+			defName = "VFEP_WarcasketGun_UraniumSlugRifle" or
+			defName = "VFEP_WarcasketGun_Slugthrower" or
+			defName = "VFEP_WarcasketGun_Minigun" or
+			defName = "VFEP_WarcasketGun_GrenadeLauncher" or
+			defName = "VFEP_WarcasketGun_HeavyFlamer" or
+			defName = "VFEP_WarcasketGun_ChargeLance" or
+			defName = "VFEP_WarcasketGun_HandheldCannon" or
+			defName = "VFEP_WarcasketGun_ChargeBlaster"
+			]/tools
+		</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>2.44</cooldownTime>
+					<armorPenetrationBlunt>16</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Autorifle === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFEP_WarcasketGun_Autorifle</defName>
+		<statBases>
+			<Bulk>25</Bulk>
+			<SwayFactor>1.80</SwayFactor>
+			<ShotSpread>0.08</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.47</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.99</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_20x82mmMauser_AP</defaultProjectile>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>60</range>
+			<soundCast>Shot_Autocannon</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_20x82mmMauser</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>true</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- === Slug Rifle === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFEP_WarcasketGun_UraniumSlugRifle</defName>
+		<statBases>
+			<Bulk>25</Bulk>
+			<SwayFactor>2.85</SwayFactor>
+			<ShotSpread>0.08</ShotSpread>
+			<SightsEfficiency>2.20</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.60</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>3.19</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_25x137mmNATO_AP</defaultProjectile>
+			<warmupTime>1.6</warmupTime>
+			<range>68</range>
+			<soundCast>Shot_TurretSniper</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>16</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4.0</reloadTime>
+			<ammoSet>AmmoSet_25x137mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Warcasket Grenade Launcher ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFEP_WarcasketGun_GrenadeLauncher</defName>
+		<statBases>
+			<Bulk>25</Bulk>
+			<SwayFactor>1.75</SwayFactor>
+			<ShotSpread>0.20</ShotSpread>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.36</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_40x53mmGrenade_HE</defaultProjectile>
+			<warmupTime>1.8</warmupTime>
+			<range>50</range>
+			<minRange>4</minRange>
+			<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
+			<burstShotCount>4</burstShotCount>
+			<soundCast>VFEP_Shot_GrenadeLauncher</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>0.9</reloadTime>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<ammoSet>AmmoSet_40x53mmGrenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Warcasket Slug Thrower ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFEP_WarcasketGun_Slugthrower</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>1.0</RangedWeapon_Cooldown>
+			<ShotSpread>0.34</ShotSpread>
+			<SwayFactor>1.60</SwayFactor>
+			<Bulk>15</Bulk>
+			<SightsEfficiency>1</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.19</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Slugthrower_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>28</range>
+			<soundCast>VFEP_Shot_Slugthrower</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_SlugthrowerShell</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Warcasket Minigun ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFEP_WarcasketGun_Minigun</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>2.32</SwayFactor>
+			<Bulk>25</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.92</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_338Norma_FMJ</defaultProjectile>
+			<warmupTime>2.1</warmupTime>
+			<range>57</range>
+			<burstShotCount>50</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>VFEP_Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>500</magazineSize>
+			<reloadTime>9.2</reloadTime>
+			<ammoSet>AmmoSet_338Norma</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>true</aiUseBurstMode>
+			<aimedBurstShotCount>25</aimedBurstShotCount>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- === Warcasket Heavy Flamer === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFEP_WarcasketGun_HeavyFlamer</defName>
+		<statBases>
+			<Bulk>20</Bulk>
+			<SwayFactor>2.10</SwayFactor>
+			<ShotSpread>3.00</ShotSpread>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.55</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Flamethrower_Prometheum</defaultProjectile>
+			<burstShotCount>20</burstShotCount>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<warmupTime>1.3</warmupTime>
+			<range>30</range>
+			<minRange>3</minRange>
+			<soundCast>HissFlamethrower</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>6.6</reloadTime>
+			<ammoSet>AmmoSet_Flamethrower</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>true</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>10</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- === Warcasket Charge Lance === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFEP_WarcasketGun_ChargeLance</defName>
+		<statBases>
+			<SightsEfficiency>2.0</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>2.08</SwayFactor>
+			<Bulk>45.00</Bulk>
+			<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.26</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12x72mmCharged</defaultProjectile>
+			<warmupTime>2.1</warmupTime>
+			<range>80</range>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<burstShotCount>3</burstShotCount>
+			<soundCast>ChargeLance_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>18</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_12x72mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>true</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- === Warcasket Handheld Cannon === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFEP_WarcasketGun_HandheldCannon</defName>
+		<statBases>
+			<Bulk>20</Bulk>
+			<SwayFactor>1.24</SwayFactor>
+			<ShotSpread>0.10</ShotSpread>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>5.07</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_CannonBall_Bursting</defaultProjectile>
+			<warmupTime>2.1</warmupTime>
+			<range>62</range>
+			<minRange>5.9</minRange>
+			<soundCast>VFEP_Shot_Cannon</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>16</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>5.2</reloadTime>
+			<ammoSet>AmmoSet_CannonBall</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- === Warcasket Charge Blaster === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFEP_WarcasketGun_ChargeBlaster</defName>
+		<statBases>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.18</SwayFactor>
+			<Bulk>31.00</Bulk>
+			<RangedWeapon_Cooldown>1.56</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.77</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_8x50mmCharged</defaultProjectile>
+			<warmupTime>2.1</warmupTime>
+			<range>68</range>
+			<burstShotCount>50</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>ChargeLance_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>500</magazineSize>
+			<reloadTime>9.2</reloadTime>
+			<ammoSet>AmmoSet_8x50mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>25</aimedBurstShotCount>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_MachineGun</li>
+			<li>CE_AI_Suppressive</li>
+			<li>AdvancedGun</li>
+		</weaponTags>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/ThingDefs_Artillery.xml b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/ThingDefs_Artillery.xml
new file mode 100644
index 0000000000..12fc9c5d40
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/ThingDefs_Artillery.xml	
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Remove refuelable property -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName = "VFEP_Turret_FieldGun" or
+			defName = "VFEP_Turret_Cannon"
+			]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
+	</Operation>
+
+	<!-- Replace vanilla thingClass -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEP_Turret_Cannon" or defName="VFEP_Turret_FieldGun"]</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<!-- Field Gun -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEP_Turret_FieldGun"]</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEP_Turret_FieldGun"]/building/turretBurstWarmupTime</xpath>
+		<value>
+			<turretBurstWarmupTime>4.0</turretBurstWarmupTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEP_Turret_FieldGun"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>2.0</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEP_Turret_FieldGun"]</xpath>
+		<value>
+			<statBases>
+				<Mass>500</Mass>
+				<Bulk>250</Bulk>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEP_Turret_FieldGun"]</xpath>
+		<value>
+			<placeWorkers Inherit="False">
+				<li>PlaceWorker_TurretTop</li>
+				<li>PlaceWorker_PreventInteractionSpotOverlap</li>
+			</placeWorkers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEP_Artillery_FieldGun"]/statBases</xpath>
+		<value>
+			<Mass>250</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEP_Artillery_FieldGun"]/statBases/RangedWeapon_Cooldown</xpath>
+		<value>
+			<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEP_Artillery_FieldGun"]/statBases</xpath>
+		<value>
+			<SightsEfficiency>0.5</SightsEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEP_Artillery_FieldGun"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_AmmoUser">
+				<magazineSize>1</magazineSize>
+				<reloadTime>5</reloadTime>
+				<ammoSet>AmmoSet_762x385mmRCannonShell</ammoSet>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEP_Artillery_FieldGun"]/weaponTags</xpath>
+		<value>
+			<li>TurretGun</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEP_Artillery_FieldGun"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>4.36</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_762x385mmRCannonShell_HEAT</defaultProjectile>
+					<warmupTime>4</warmupTime>
+					<minRange>16</minRange>
+					<range>86</range>
+					<burstShotCount>1</burstShotCount>
+					<soundCast>VFEP_Shot_FieldCannon</soundCast>
+					<muzzleFlashScale>16</muzzleFlashScale>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<recoilPattern>Mounted</recoilPattern>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Cannon - Based on the M1897 12-pounder -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="VFEP_BaseCannonBuilding"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="VFEP_BaseCannonBuilding"]/building/turretBurstWarmupTime</xpath>
+		<value>
+			<turretBurstWarmupTime>3.3</turretBurstWarmupTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="VFEP_BaseCannonBuilding"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>2.7</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="VFEP_BaseCannonBuilding"]/placeWorkers/li[.="PlaceWorker_NotUnderRoof"]</xpath>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFEP_Artillery_Cannon</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>2.7</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.80</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>0.81</SwayFactor>
+			<Mass>125</Mass>
+		</statBases>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>10</reloadTime>
+			<ammoSet>AmmoSet_CannonBall</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEP_Artillery_Cannon"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.40</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_CannonBall_Round</defaultProjectile>
+					<warmupTime>3.3</warmupTime>
+					<range>64</range>
+					<minRange>16</minRange>
+					<soundCast>VFEP_Shot_Cannon</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>18</muzzleFlashScale>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<recoilPattern>Mounted</recoilPattern>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEP_Turret_Cannon"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>150</Bulk>
+				<Mass>250</Mass>
+			</statBases>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/ThingDefs_Turrets.xml b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/ThingDefs_Turrets.xml
new file mode 100644
index 0000000000..bfd1657c82
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/ThingDefs_Turrets.xml	
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Remove refuelable property -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName = "VFEP_ShipChunkGauntletTurret"]/comps/li[@Class = "VFEPirates.CompProperties_Fueled"]</xpath>
+	</Operation>
+
+	<!-- Replace vanilla thingClass -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VFEP_ShipChunkGauntletTurret"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "VFEP_ShipChunkGauntletTurret"]</xpath>
+		<value>
+			<thingCategories/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEP_ShipChunkGauntletTurret"]/statBases/ShootingAccuracyTurret</xpath>
+		<value>
+			<ShootingAccuracyTurret>1.25</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEP_ShipChunkGauntletTurret"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.75</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VFEP_ShipChunkGauntletTurret"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>0.5</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<!-- Make turrets taller -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "VFEP_ShipChunkGauntletTurret"]</xpath>
+		<value>
+			<fillPercent>0.95</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name = "VFEP_CrashedShip"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.95</fillPercent>
+		</value>
+	</Operation>
+
+	<!-- Gauntlet Charge Cannnon -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFEP_GauntletChargeCanon</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>0.26</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.08</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_12x72mmCharged</defaultProjectile>
+			<warmupTime>2.3</warmupTime>
+			<range>62</range>
+			<minRange>13</minRange>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<soundCast>VFEP_Shot_GauntletCannon</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_12x72mmCharged</ammoSet>
+		</AmmoUser>
+		<weaponTags Inherit="False">
+			<li>TurretGun</li>
+		</weaponTags>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- Make the crashed ships don't destroy each other upon crashing -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name = "VFEP_CrashedShip"]</xpath>
+		<value>
+			<damageMultipliers>
+				<li>
+					<damageDef>Bomb</damageDef>
+					<multiplier>0.1</multiplier>
+				</li>
+			</damageMultipliers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name = "VFEP_CrashedShip"]/statBases/ShootingAccuracyTurret</xpath>
+		<value>
+			<ShootingAccuracyTurret>0.99</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name = "VFEP_CrashedShip"]/building/turretGunDef</xpath>
+		<value>
+			<turretGunDef>VFEP_GauntletChargeCanon_CE</turretGunDef>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name = "VFEP_CrashedShip"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>0.5</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name = "VFEP_CrashedShip"]/building</xpath>
+		<value>
+			<turretBurstWarmupTime>2.3</turretBurstWarmupTime>
+		</value>
+	</Operation>
+
+	<!-- Vanilla Gauntlet Charge Cannnon -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs</xpath>
+		<value>
+			<ThingDef ParentName="BaseWeaponTurret">
+				<defName>VFEP_GauntletChargeCanon_CE</defName>
+				<label>gauntlet charge cannon</label>
+				<description>Ship mounted anti-armor charge cannon, often utilised in ship-to-ship combat in low atmosphere.</description>
+				<graphicData>
+					<texPath>Things/Building/Security/GauntletTurret_Top</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<statBases>
+					<AccuracyTouch>0.9</AccuracyTouch>
+					<AccuracyShort>0.85</AccuracyShort>
+					<AccuracyMedium>0.60</AccuracyMedium>
+					<AccuracyLong>0.40</AccuracyLong>
+					<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+					<DeteriorationRate>0</DeteriorationRate>
+					<Mass>5</Mass>
+					<Flammability>0</Flammability>
+				</statBases>
+				<verbs>
+					<li>
+						<verbClass>Verb_Shoot</verbClass>
+						<defaultProjectile>VFEP_Bullet_GauntletChargeCanon</defaultProjectile>
+						<warmupTime>2.3</warmupTime>
+						<range>62</range>
+						<minRange>8.9</minRange>
+						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+						<burstShotCount>3</burstShotCount>
+						<soundCast>VFEP_Shot_GauntletCannon</soundCast>
+						<soundCastTail>GunTail_Light</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</li>
+				</verbs>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VFEP_Bullet_GauntletChargeCanon"]/projectile/damageAmountBase</xpath>
+		<value>
+			<damageAmountBase>20</damageAmountBase>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VFEP_Bullet_GauntletChargeCanon"]/projectile/armorPenetrationBase</xpath>
+		<value>
+			<armorPenetrationBase>25</armorPenetrationBase>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VFEP_Bullet_GauntletChargeCanon"]/projectile/speed</xpath>
+		<value>
+			<speed>144</speed>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Weapons_Mech.xml b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Weapons_Mech.xml
new file mode 100644
index 0000000000..1ea27e357f
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Weapons_Mech.xml	
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== VFE Handheld Mini Turret ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFEPGun_MiniBlaster</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>0.82</SwayFactor>
+			<Bulk>5.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.76</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>42</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>6</burstShotCount>
+			<soundCast>GunShotA</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>7.8</reloadTime>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEPGun_MiniBlaster"]/tools</xpath>
+		<value>
+			<tools>
+				<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>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Races/Races_Mechanoid.xml b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Races/Races_Mechanoid.xml
new file mode 100644
index 0000000000..0d618958e5
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Races/Races_Mechanoid.xml	
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFEP_Mech_Wardrone" or defName="VFEP_Mech_Spidermine"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Vehicle</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEP_Mech_Wardrone" or defName="VFEP_Mech_Spidermine"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.26</MeleeDodgeChance>
+			<MeleeCritChance>0.12</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEP_Mech_Wardrone"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>2.0</ShootingAccuracyPawn>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEP_Mech_Wardrone" or defName="VFEP_Mech_Spidermine"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEP_Mech_Wardrone" or defName="VFEP_Mech_Spidermine"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.75</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEP_Mech_Wardrone"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>turret</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.02</cooldownTime>
+					<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEP_Mech_Spidermine"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>frame</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.02</cooldownTime>
+					<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Settlers/Defs/Vanilla Factions Expanded - Settlers/Recipes_Settlers.xml b/ModPatches/Vanilla Factions Expanded - Settlers/Defs/Vanilla Factions Expanded - Settlers/Recipes_Settlers.xml
new file mode 100644
index 0000000000..a2adb81b13
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Settlers/Defs/Vanilla Factions Expanded - Settlers/Recipes_Settlers.xml	
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+
+	<!-- == Recipes == -->
+
+	<!-- === Tomahawk === -->
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>Make_VFES_Tomahawk</defName>
+		<label>make tomahawk x10</label>
+		<description>Craft 10 tomahawks.</description>
+		<jobString>Making tomahawk.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>100</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<VFES_Tomahawk>10</VFES_Tomahawk>
+		</products>
+		<recipeUsers>
+			<li>FueledSmithy</li>
+			<li>ElectricSmithy</li>
+			<li>CraftingSpot</li>
+		</recipeUsers>
+		<researchPrerequisite>Smithing</researchPrerequisite>
+	</RecipeDef>
+
+	<!-- === Dynamite === -->
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>Make_VFES_Weapon_GrenadeDynamite</defName>
+		<label>make dynamite sticks x10</label>
+		<description>Craft 10 dynamite sticks.</description>
+		<jobString>Making dynamite sticks.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<stuffCategoriesToAllow>
+						<li>Woody</li>
+					</stuffCategoriesToAllow>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Chemfuel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<stuffCategoriesToAllow>
+				<li>Woody</li>
+			</stuffCategoriesToAllow>
+			<thingDefs>
+				<li>Chemfuel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<VFES_Weapon_GrenadeDynamite>10</VFES_Weapon_GrenadeDynamite>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/Drugs/Alcohol_Chemshine.xml b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/Drugs/Alcohol_Chemshine.xml
new file mode 100644
index 0000000000..c3ec359aa6
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/Drugs/Alcohol_Chemshine.xml	
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Bulk === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Chemshine"]/statBases</xpath>
+
+		<value>
+			<Bulk>1</Bulk>
+		</value>
+	</Operation>
+
+	<!-- === stafOffsets === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="Chemshined"]/stages/li[1]</xpath>
+
+		<value>
+			<statOffsets>
+				<Suppressability>-0.10</Suppressability>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<!-- === Addictivines === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Chemshine"]/comps/li[@Class="CompProperties_Drug"]/addictiveness</xpath>
+
+		<value>
+			<addictiveness>0.05</addictiveness>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Chemshine"]/comps/li[@Class="CompProperties_Drug"]/minToleranceToAddict</xpath>
+
+		<value>
+			<minToleranceToAddict>0.05</minToleranceToAddict>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/PawnKindDefs/PawnKinds_Bandits.xml b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/PawnKindDefs/PawnKinds_Bandits.xml
new file mode 100644
index 0000000000..2b55dc2cf0
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/PawnKindDefs/PawnKinds_Bandits.xml	
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Bandit === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Bandit"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<magazineCount>
+							<min>1</min>
+							<max>2</max>
+						</magazineCount>
+						<sidearmMoney>
+							<min>100</min>
+							<max>200</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>Revolver</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Bounty Hunter === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="BountyHunter"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>1</min>
+					<max>3</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.2</generateChance>
+						<magazineCount>
+							<min>1</min>
+							<max>2</max>
+						</magazineCount>
+						<sidearmMoney>
+							<min>100</min>
+							<max>200</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>Revolver</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Outlaw === -->
+	<!-- We'll add this as a secondary -->
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/PawnKindDef[defName="Outlaw"]/weaponTags/li[.="GrenadeDestructive"]</xpath>
+		<match Class="PatchOperationRemove">
+			<xpath>Defs/PawnKindDef[defName="Outlaw"]/weaponTags/li[.="GrenadeDestructive"]</xpath>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Outlaw"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>1</min>
+					<max>3</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>1</generateChance>
+						<magazineCount>
+							<min>1</min>
+							<max>3</max>
+						</magazineCount>
+						<sidearmMoney>
+							<min>100</min>
+							<max>200</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>GrenadeDynamite</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Gunslinger | Bandit Leader === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Gunslinger" or defName="BanditLeader"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/PawnKindDefs/PawnKinds_Settlers.xml b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/PawnKindDefs/PawnKinds_Settlers.xml
new file mode 100644
index 0000000000..d63ebc15d4
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/PawnKindDefs/PawnKinds_Settlers.xml	
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Settler === -->
+	<!-- We'll add this as a secondary -->
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/PawnKindDef[defName="Settler"]/weaponTags/li[.="GrenadeDestructive"]</xpath>
+		<match Class="PatchOperationRemove">
+			<xpath>Defs/PawnKindDef[defName="Settler"]/weaponTags/li[.="GrenadeDestructive"]</xpath>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Settler"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>1</min>
+					<max>3</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>1</generateChance>
+						<magazineCount>
+							<min>1</min>
+							<max>3</max>
+						</magazineCount>
+						<sidearmMoney>
+							<min>100</min>
+							<max>200</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>GrenadeDynamite</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Deputy | Militia | Frontier Trader === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Deputy" or defName="Militia" or defName="Frontier_Trader" or defName="Sheriff" or defName="Mayor"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/Scenarios/Scenarios_Classic.xml b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/Scenarios/Scenarios_Classic.xml
new file mode 100644
index 0000000000..c455d6e1ca
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/Scenarios/Scenarios_Classic.xml	
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Dynamine Count === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ScenarioDef[defName="VFES_Bandits"]/scenario/parts/li[thingDef="VFES_Weapon_GrenadeDynamite"]</xpath>
+
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>VFES_Weapon_GrenadeDynamite</thingDef>
+				<count>20</count>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Add ammo to scenario === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="VFES_Bandits"]/scenario/parts</xpath>
+
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_12Gauge_Buck</thingDef>
+				<count>60</count>
+			</li>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_44Magnum_FMJ</thingDef>
+				<count>60</count>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Buildings/TurretGatlingGun.xml b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Buildings/TurretGatlingGun.xml
new file mode 100644
index 0000000000..dd25ca9fcb
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Buildings/TurretGatlingGun.xml	
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Gun === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_GatlingGun</defName>
+		<statBases>
+			<Bulk>15.54</Bulk>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.16</SwayFactor>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.17</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_4570Gov_FMJ</defaultProjectile>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
+			<warmupTime>1.4</warmupTime>
+			<range>62</range>
+			<soundCast>VFE_Shot_GattlingGun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_4570Gov</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>false</aiUseBurstMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- === Turret === -->
+	<!-- == thingClass == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_GatlingGun"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<!-- == Remove stuff == -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Turret_GatlingGun"]/comps/li[@Class="CompProperties_Explosive"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Turret_GatlingGun"]/comps/li[@Class="CompProperties_Refuelable"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Turret_GatlingGun"]/comps/li[@Class="CompProperties_Flickable"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Turret_GatlingGun"]/stuffCategories</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Turret_GatlingGun"]/costStuffCount</xpath>
+	</Operation>
+
+	<!-- == costList == -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Turret_GatlingGun"]</xpath>
+		<value>
+			<costList>
+				<Steel>325</Steel>
+				<ComponentIndustrial>4</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<!-- == fillPercent == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_GatlingGun"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<!-- == turretBurstCooldownTime == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_GatlingGun"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>1.1</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<!-- == ShootingAccuracy === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_GatlingGun"]/statBases/ShootingAccuracyTurret</xpath>
+		<value>
+			<ShootingAccuracyTurret>0.35</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Apparel_Headgear.xml b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Apparel_Headgear.xml
new file mode 100644
index 0000000000..7ab27d14f1
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Apparel_Headgear.xml	
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Bandana === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFES_Headgear_Bandana"]/statBases</xpath>
+
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFES_Headgear_Bandana"]/statBases/StuffEffectMultiplierArmor</xpath>
+
+		<value>
+			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFES_Headgear_Bandana"]/apparel/layers</xpath>
+
+		<value>
+			<layers>
+				<li>StrappedHead</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFES_Headgear_Bandana"]/equippedStatOffsets</xpath>
+
+		<value>
+			<SmokeSensitivity>-0.1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!-- === Sombrero === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFES_Headgear_Sombrero"]/statBases</xpath>
+
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFES_Headgear_Sombrero"]/statBases/StuffEffectMultiplierArmor</xpath>
+
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- === Flat Cap === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFES_Headgear_FlatCap"]/statBases</xpath>
+
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFES_Headgear_FlatCap"]/statBases/StuffEffectMultiplierArmor</xpath>
+
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Apparel_Various.xml b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Apparel_Various.xml
new file mode 100644
index 0000000000..ac1acd3b6f
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Apparel_Various.xml	
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Vest === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Vest"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_Vest"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- === Great Dress === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_GreatDress"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_GreatDress"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Weapons/RangedIndustrial.xml b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Weapons/RangedIndustrial.xml
new file mode 100644
index 0000000000..ddae50034d
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Weapons/RangedIndustrial.xml	
@@ -0,0 +1,260 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName ="VFES_Gun_DoubleActionRevolver"]/tools</xpath>
+
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFES_Gun_DoubleBarreledShotgun" or defName="VFES_Gun_HuntingRifle"]/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>
+
+	<!-- === Double Action Revolver === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFES_Gun_DoubleActionRevolver</defName>
+
+		<statBases>
+			<WorkToMake>4500</WorkToMake>
+			<Mass>1.5</Mass>
+			<Bulk>1.39</Bulk>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+
+		<costList>
+			<Steel>35</Steel>
+			<WoodLog>5</WoodLog>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+
+		<Properties>
+			<recoilAmount>2.5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_44Magnum_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>VFE_Shot_DoubleactionRevolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>1</reloadTime>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<ammoSet>AmmoSet_44Magnum</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>Revolver</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFES_Gun_DoubleActionRevolver"]</xpath>
+
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>0.90,0.90</DrawSize>
+				<DrawOffset>0.05,0.01</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Double Barreled Shotgun === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFES_Gun_DoubleBarreledShotgun</defName>
+
+		<statBases>
+			<WorkToMake>7000</WorkToMake>
+			<Mass>3.8</Mass>
+			<Bulk>10</Bulk>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+
+		<costList>
+			<Steel>40</Steel>
+			<WoodLog>10</WoodLog>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+
+		<Properties>
+			<recoilAmount>3.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>Shot_Shotgun_NoRack</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>2</magazineSize>
+			<reloadTime>1.7</reloadTime>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFES_Gun_DoubleBarreledShotgun"]</xpath>
+
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.03,1.15</DrawSize>
+				<DrawOffset>0.05,0.0</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Hunting Rifle === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFES_Gun_HuntingRifle</defName>
+
+		<statBases>
+			<WorkToMake>12800</WorkToMake>
+			<Mass>7.30</Mass>
+			<Bulk>10.50</Bulk>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
+		</statBases>
+
+		<costList>
+			<Steel>45</Steel>
+			<WoodLog>10</WoodLog>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+
+		<Properties>
+			<recoilAmount>1.5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>75</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>1.2</reloadTime>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<ammoSet>AmmoSet_303British</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+
+		<!-- Disallow with Run and Gun -->
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFES_Gun_DoubleBarreledShotgun"]</xpath>
+
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.25,1.45</DrawSize>
+				<DrawOffset>0.10,0.1</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Weapons/RangedIndustrialGrenades.xml b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Weapons/RangedIndustrialGrenades.xml
new file mode 100644
index 0000000000..d3b1a2fbff
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Weapons/RangedIndustrialGrenades.xml	
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Dynamite === -->
+	<!-- == Projectile == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFES_Proj_Dynamite"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFES_Proj_Dynamite"]/graphicData</xpath>
+		<value>
+			<graphicData>
+				<texPath>Things/Projectile/DynamiteThrown/DynamiteThrownA</texPath>
+				<graphicClass>Graphic_Single</graphicClass>
+			</graphicData>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFES_Proj_Dynamite"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<damageDef>Bomb</damageDef>
+				<explosionDelay>60</explosionDelay>
+				<explosionRadius>2.5</explosionRadius>
+				<damageAmountBase>50</damageAmountBase>
+				<armorPenetrationSharp>0</armorPenetrationSharp>
+				<armorPenetrationBlunt>0</armorPenetrationBlunt>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+				<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
+			</projectile>
+		</value>
+	</Operation>
+
+	<!-- == Weapon == -->
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="VFES_Weapon_GrenadeDynamite"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>BaseWeapon</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFES_Weapon_GrenadeDynamite"]/costList</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFES_Weapon_GrenadeDynamite"]</xpath>
+		<value>
+			<thingClass>CombatExtended.AmmoThing</thingClass>
+			<stackLimit>75</stackLimit>
+			<resourceReadoutPriority>First</resourceReadoutPriority>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "VFES_Weapon_GrenadeDynamite"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "VFES_Weapon_GrenadeDynamite"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFES_Weapon_GrenadeDynamite"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>2.5</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="VFES_Weapon_GrenadeDynamite"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFES_Weapon_GrenadeDynamite</defName>
+		<statBases>
+			<WorkToMake>12000</WorkToMake>
+			<MarketValue>5.05</MarketValue>
+			<Mass>0.4</Mass>
+			<Bulk>0.87</Bulk>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<label>throw dynamite stick</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>VFES_Proj_Dynamite</defaultProjectile>
+			<range>12</range>
+			<minRange>3</minRange>
+			<warmupTime>1.8</warmupTime>
+			<soundCast>ThrowGrenade</soundCast>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<weaponTags>
+			<li>GrenadeDynamite</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Weapons/RangedMedieval.xml b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Weapons/RangedMedieval.xml
new file mode 100644
index 0000000000..b518b128e8
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Weapons/RangedMedieval.xml	
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tomahawk === -->
+	<!-- == Projectile == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFES_Tomahawk_Thrown"]/graphicData</xpath>
+
+		<value>
+			<graphicData>
+				<texPath>Things/Projectile/TomahawkThrown/TomahawkThrownC</texPath>
+				<graphicClass>Graphic_Single</graphicClass>
+			</graphicData>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFES_Tomahawk_Thrown"]/projectile</xpath>
+
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>12</speed>
+				<flyOverhead>false</flyOverhead>
+				<damageDef>Cut</damageDef>
+				<damageAmountBase>16</damageAmountBase>
+				<armorPenetrationSharp>1.562</armorPenetrationSharp>
+				<armorPenetrationBlunt>0.980</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+
+	<!-- == Weapon == -->
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="VFES_Tomahawk"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>BaseWeapon</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFES_Tomahawk"]</xpath>
+		<value>
+			<thingCategories>
+				<li>WeaponsRanged</li>
+			</thingCategories>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFES_Tomahawk"]/costStuffCount</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFES_Tomahawk"]/stuffCategories</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFES_Tomahawk"]/recipeMaker</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFES_Tomahawk"]/graphicData</xpath>
+		<value>
+			<color>(105,105,105)</color>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFES_Tomahawk"]</xpath>
+		<value>
+			<thingClass>CombatExtended.AmmoThing</thingClass>
+			<stackLimit>75</stackLimit>
+			<resourceReadoutPriority>First</resourceReadoutPriority>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="VFES_Tomahawk"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "VFES_Tomahawk"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "VFES_Tomahawk"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFES_Tomahawk</defName>
+		<statBases>
+			<Mass>1.2</Mass>
+			<Bulk>3.3</Bulk>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>1.5</ShotSpread>
+			<SwayFactor>2.5</SwayFactor>
+			<RangedWeapon_Cooldown>0.75</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<label>Throw tomahawk</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>VFES_Tomahawk_Thrown</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>10</range>
+			<soundCast>Interact_BeatFire</soundCast>
+		</Properties>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFES_Tomahawk"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.4</cooldownTime>
+					<armorPenetrationBlunt>0.375</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.62</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.25</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Tribals/Defs/Vanilla Factions Expanded - Tribals/Recipes_Tribals.xml b/ModPatches/Vanilla Factions Expanded - Tribals/Defs/Vanilla Factions Expanded - Tribals/Recipes_Tribals.xml
new file mode 100644
index 0000000000..88ed26cdbd
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Tribals/Defs/Vanilla Factions Expanded - Tribals/Recipes_Tribals.xml	
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!--== Projectile ==-->
+	<ThingDef ParentName="BasePilumProjectile">
+		<graphicData>
+			<texPath>Projectile/Projectile_Throwspikes</texPath>
+		</graphicData>
+		<defName>Tribal_Spike_Thrown</defName>
+		<label>throwspike</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>14</damageAmountBase>
+			<speed>10</speed>
+			<armorPenetrationBlunt>3.44</armorPenetrationBlunt>
+			<armorPenetrationSharp>0.45</armorPenetrationSharp>
+			<preExplosionSpawnChance>0.70</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>VFET_Throwspikes</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<!--== Recipe ==-->
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>MakeAmmo_VFET_Throwspikes</defName>
+		<label>make throwspikes x20</label>
+		<description>Craft 20 throwspikes.</description>
+		<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+		<workSkill>Crafting</workSkill>
+		<recipeUsers>
+			<li>CraftingSpot</li>
+		</recipeUsers>
+		<effectWorking>Smelt</effectWorking>
+		<unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
+		<workAmount>800</workAmount>
+		<jobString>Making throwspikes.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<VFET_Throwspikes>20</VFET_Throwspikes>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Tribals/Patches/Vanilla Factions Expanded - Tribals/Apparel_Tribals.xml b/ModPatches/Vanilla Factions Expanded - Tribals/Patches/Vanilla Factions Expanded - Tribals/Apparel_Tribals.xml
new file mode 100644
index 0000000000..29f1866b3d
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Tribals/Patches/Vanilla Factions Expanded - Tribals/Apparel_Tribals.xml	
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Light Tribalwear -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFET_Apparel_TribalLight"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+		</value>
+	</Operation>
+
+	<!-- Heavy Tribalwear -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFET_Apparel_TribalHeavy"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+		</value>
+	</Operation>
+
+	<!-- War Tribalwear -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFET_Apparel_TribalWar"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
+			<Bulk>5</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFET_Apparel_TribalWar"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Tribals/Patches/Vanilla Factions Expanded - Tribals/ThingDefs_WeaponsMelee.xml b/ModPatches/Vanilla Factions Expanded - Tribals/Patches/Vanilla Factions Expanded - Tribals/ThingDefs_WeaponsMelee.xml
new file mode 100644
index 0000000000..f2a4d5a63d
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Tribals/Patches/Vanilla Factions Expanded - Tribals/ThingDefs_WeaponsMelee.xml	
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- One-handed Tags -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "VFET_Stake" or defName="VFET_Chunk"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- Rock -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFET_Chunk"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>rock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.66</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFET_Chunk"]/statBases</xpath>
+		<value>
+			<Bulk>0.5</Bulk>
+			<MeleeCounterParryBonus>0.1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<!-- Stake -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFET_Stake"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<chanceFactor>0.33</chanceFactor>
+					<cooldownTime>1.4</cooldownTime>
+					<armorPenetrationBlunt>0.65</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>6.5</power>
+					<cooldownTime>1.4</cooldownTime>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.28</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFET_Stake"]/statBases</xpath>
+		<value>
+			<Bulk>0.25</Bulk>
+			<MeleeCounterParryBonus>0.1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFET_Stake"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.08</MeleeCritChance>
+				<MeleeParryChance>0.12</MeleeParryChance>
+				<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Tribals/Patches/Vanilla Factions Expanded - Tribals/ThingDefs_WeaponsRanged.xml b/ModPatches/Vanilla Factions Expanded - Tribals/Patches/Vanilla Factions Expanded - Tribals/ThingDefs_WeaponsRanged.xml
new file mode 100644
index 0000000000..a28106ad88
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Tribals/Patches/Vanilla Factions Expanded - Tribals/ThingDefs_WeaponsRanged.xml	
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- One-handed Tags -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "VFET_Throwspikes"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="VFET_Throwspikes"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>BaseWeaponAndAmmoNeolithic</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeAdd">
+		<xpath>Defs/ThingDef[defName="VFET_Throwspikes"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFET_Throwspikes"]/costList</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFET_Throwspikes"]</xpath>
+		<value>
+			<techLevel>Neolithic</techLevel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFET_Throwspikes"]/recipeMaker</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFET_Throwspikes"]/statBases</xpath>
+		<value>
+			<statBases>
+				<MarketValue>0.7</MarketValue>
+				<SightsEfficiency>1.0</SightsEfficiency>
+				<ShotSpread>1.5</ShotSpread>
+				<SwayFactor>2.5</SwayFactor>
+				<Bulk>1.5</Bulk>
+				<Mass>1</Mass>
+				<RangedWeapon_Cooldown>1.3</RangedWeapon_Cooldown>
+			</statBases>
+			<stackLimit>50</stackLimit>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFET_Throwspikes"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Tribal_Spike_Thrown</defaultProjectile>
+					<warmupTime>1</warmupTime>
+					<range>10</range>
+					<soundCast>Interact_BeatFire</soundCast>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFET_Throwspikes"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>limb</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.35</cooldownTime>
+					<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Vikings/Defs/Vanilla Factions Expanded - Vikings/Ammo_Vikings.xml b/ModPatches/Vanilla Factions Expanded - Vikings/Defs/Vanilla Factions Expanded - Vikings/Ammo_Vikings.xml
new file mode 100644
index 0000000000..08d991966e
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Vikings/Defs/Vanilla Factions Expanded - Vikings/Ammo_Vikings.xml	
@@ -0,0 +1,404 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- ==================== Ammo Categories ========================== -->
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>Crypto</defName>
+		<label>crypto</label>
+		<description>Metal-cored projectiles wrapped in an unstable crypto technology, capable of dealing both ballistic and cold damage.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<!-- ==================== Thing Categories ========================== -->
+
+	<ThingCategoryDef>
+		<defName>AmmoCryptoRifle</defName>
+		<label>crypto rifle</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
+	</ThingCategoryDef>
+
+	<ThingCategoryDef>
+		<defName>AmmoCryptoPistol</defName>
+		<label>crypto pistol</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
+	</ThingCategoryDef>
+
+	<ThingCategoryDef>
+		<defName>AmmoCryptoBolt</defName>
+		<label>crypto bolt</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
+	</ThingCategoryDef>
+
+	<ThingCategoryDef>
+		<defName>AmmoCryptoHeavyBolt</defName>
+		<label>crypto heavy bolt</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_CryptoRifle</defName>
+		<label>Crypto Rifle</label>
+		<ammoTypes>
+			<Ammo_CryptoRifle>Bullet_CryptoRifle</Ammo_CryptoRifle>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_CryptoPistol</defName>
+		<label>Crypto Pistol</label>
+		<ammoTypes>
+			<Ammo_CryptoPistol>Bullet_CryptoPistol</Ammo_CryptoPistol>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_CryptoBolt</defName>
+		<label>Crypto Bolt</label>
+		<ammoTypes>
+			<Ammo_CryptoBolt>Bullet_CryptoBolt</Ammo_CryptoBolt>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_CryptoHeavyBolt</defName>
+		<label>Crypto Bolt</label>
+		<ammoTypes>
+			<Ammo_CryptoHeavyBolt>Bullet_CryptoHeavyBolt</Ammo_CryptoHeavyBolt>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="CryptoAmmoBase" ParentName="SpacerSmallAmmoBase" Abstract="True">
+		<description>Metal-cored projectiles wrapped in unstable crypto technology contained with an energy field. Capable of dealing both ballistic damage and causing serious hypothermia.</description>
+		<graphicData>
+			<texPath>ThirdParty/VanillaExpanded/Crypto</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<ammoClass>Crypto</ammoClass>
+		<stackLimit>2500</stackLimit>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="CryptoPistolBase" ParentName="CryptoAmmoBase">
+		<defName>Ammo_CryptoRifle</defName>
+		<label>crypto rifle cartridge</label>
+		<graphicData>
+			<drawSize>0.75</drawSize>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.7</MarketValue>
+			<Mass>0.01</Mass>
+			<Bulk>0.01</Bulk>
+		</statBases>
+		<thingCategories>
+			<li>AmmoCryptoRifle</li>
+		</thingCategories>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="CryptoAmmoBase">
+		<defName>Ammo_CryptoPistol</defName>
+		<label>crypto pistol cartridge</label>
+		<graphicData>
+			<drawSize>0.70</drawSize>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.69</MarketValue>
+			<Mass>0.008</Mass>
+			<Bulk>0.01</Bulk>
+		</statBases>
+		<thingCategories>
+			<li>AmmoCryptoPistol</li>
+		</thingCategories>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="CryptoAmmoBase">
+		<defName>Ammo_CryptoBolt</defName>
+		<label>crypto bolt</label>
+		<graphicData>
+			<drawSize>0.8</drawSize>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.69</MarketValue>
+			<Mass>0.008</Mass>
+			<Bulk>0.01</Bulk>
+		</statBases>
+		<thingCategories>
+			<li>AmmoCryptoBolt</li>
+		</thingCategories>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="CryptoAmmoBase">
+		<defName>Ammo_CryptoHeavyBolt</defName>
+		<label>heavy crypto bolt</label>
+		<graphicData>
+			<drawSize>1</drawSize>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.69</MarketValue>
+			<Mass>0.10</Mass>
+			<Bulk>0.05</Bulk>
+		</statBases>
+		<thingCategories>
+			<li>AmmoCryptoHeavyBolt</li>
+		</thingCategories>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_CryptoRifle</defName>
+		<label>crypto bullet</label>
+		<!--	<thingClass>VFEV.CryptoBullet</thingClass> -->
+		<graphicData>
+			<texPath>Things/Projectile/CryptoBullet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>0.60</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Crypto</damageDef>
+			<damageAmountBase>11</damageAmountBase>
+			<speed>122</speed>
+			<armorPenetrationSharp>22.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>26</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base6x18mmChargedBullet">
+		<defName>Bullet_CryptoPistol</defName>
+		<label>crypto bullet</label>
+		<!--	<thingClass>VFEV.CryptoBullet</thingClass> -->
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Crypto</damageDef>
+			<damageAmountBase>9</damageAmountBase>
+			<speed>122</speed>
+			<armorPenetrationSharp>16</armorPenetrationSharp>
+			<armorPenetrationBlunt>18</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_CryptoBolt</defName>
+		<label>crypto bolt</label>
+		<!--	<thingClass>VFEV.CryptoBullet</thingClass> -->
+		<graphicData>
+			<texPath>Things/Projectile/CryptoBolt</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>1.00</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Crypto</damageDef>
+			<damageAmountBase>24</damageAmountBase>
+			<speed>122</speed>
+			<armorPenetrationSharp>14</armorPenetrationSharp>
+			<armorPenetrationBlunt>26</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base6x24mmChargedBullet">
+		<defName>Bullet_CryptoHeavyBolt</defName>
+		<label>heavy crypto bolt</label>
+		<!--	<thingClass>VFEV.CryptoBullet</thingClass> -->
+		<graphicData>
+			<texPath>Things/Projectile/CryptoBolt</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>1.0</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Crypto</damageDef>
+			<damageAmountBase>52</damageAmountBase>
+			<speed>122</speed>
+			<armorPenetrationSharp>24</armorPenetrationSharp>
+			<armorPenetrationBlunt>64</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_CryptoRifle</defName>
+		<label>make crypto rifle cartridge x500</label>
+		<description>Craft 500 crypto rifle cartridge cartridges.</description>
+		<jobString>Making crypto rifle cartridge cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Plasteel</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_CryptoRifle>500</Ammo_CryptoRifle>
+		</products>
+		<workAmount>8600</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_CryptoPistol</defName>
+		<label>make crypto pistol cartridge x500</label>
+		<description>Craft 500 crypto pistol cartridges.</description>
+		<jobString>Making crypto pistol cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>6</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Plasteel</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_CryptoPistol>500</Ammo_CryptoPistol>
+		</products>
+		<workAmount>9800</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_CryptoBolt</defName>
+		<label>make crypto bolt x50</label>
+		<description>Craft 50 crypto bolt.</description>
+		<jobString>Making crypto bolt.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Plasteel</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_CryptoBolt>50</Ammo_CryptoBolt>
+		</products>
+		<workAmount>10400</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_CryptoHeavyBolt</defName>
+		<label>make heavy crypto bolt x50</label>
+		<description>Craft 50 heavy crypto bolt.</description>
+		<jobString>Making heavy crypto bolt.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Plasteel</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_CryptoHeavyBolt>50</Ammo_CryptoHeavyBolt>
+		</products>
+		<workAmount>14400</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Vikings/Defs/Vanilla Factions Expanded - Vikings/DamageDefs_Vikings.xml b/ModPatches/Vanilla Factions Expanded - Vikings/Defs/Vanilla Factions Expanded - Vikings/DamageDefs_Vikings.xml
new file mode 100644
index 0000000000..8c3d5520c4
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Vikings/Defs/Vanilla Factions Expanded - Vikings/DamageDefs_Vikings.xml	
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ToolCapacityDef>
+		<defName>CE_CryptoCut</defName>
+		<label>cut</label>
+	</ToolCapacityDef>
+
+	<DamageDef ParentName="CutBase">
+		<defName>CE_CryptoCut</defName>
+		<label>the cutting and hypothermic damage of advanced crypto weaponry</label>
+		<additionalHediffs>
+			<li>
+				<hediff>Hypothermia</hediff>
+				<severityPerDamageDealt>0.01</severityPerDamageDealt>
+			</li>
+		</additionalHediffs>
+	</DamageDef>
+
+	<DamageDef ParentName="Bullet">
+		<defName>CE_Crypto</defName>
+		<label>the ballistic and hypothermic damage of advanced crypto munitions</label>
+		<additionalHediffs>
+			<li>
+				<hediff>Hypothermia</hediff>
+				<severityPerDamageDealt>0.01</severityPerDamageDealt>
+			</li>
+		</additionalHediffs>
+	</DamageDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Vikings/Defs/Vanilla Factions Expanded - Vikings/Recipes.xml b/ModPatches/Vanilla Factions Expanded - Vikings/Defs/Vanilla Factions Expanded - Vikings/Recipes.xml
new file mode 100644
index 0000000000..7698dd15d4
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Vikings/Defs/Vanilla Factions Expanded - Vikings/Recipes.xml	
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!--== Projectiles ==-->
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="BasePilumProjectile">
+		<defName>Vikings_ThrowingAxe_Thrown</defName>
+		<label>thrown axe</label>
+		<graphicData>
+			<texPath>Things/Projectile/AxeThrown</texPath>
+			<graphicClass>Graphic_Flicker</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Cut</damageDef>
+			<damageAmountBase>16</damageAmountBase>
+			<speed>25</speed>
+			<armorPenetrationSharp>1.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>3</armorPenetrationBlunt>
+			<preExplosionSpawnChance>0.60</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>VFE_ThrowingAxe</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BasePilumProjectile">
+		<defName>Vikings_Harpoon_Thrown</defName>
+		<label>thrown harpoon</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>13</damageAmountBase>
+			<speed>27</speed>
+			<armorPenetrationBlunt>4.54</armorPenetrationBlunt>
+			<armorPenetrationSharp>1.8</armorPenetrationSharp>
+			<secondaryDamage>
+				<li>
+					<def>Stun</def>
+					<amount>16</amount>
+				</li>
+			</secondaryDamage>
+			<preExplosionSpawnChance>0.40</preExplosionSpawnChance>
+			<preExplosionSpawnThingDef>VFE_Harpoon</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<!--== Recipes ==-->
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>MakeAmmo_VFE_Harpoon</defName>
+		<label>make harpoons x5</label>
+		<description>Craft 5 harpoons.</description>
+		<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+		<workSkill>Crafting</workSkill>
+		<recipeUsers>
+			<li>ElectricSmithy</li>
+			<li>FueledSmithy</li>
+			<li>CraftingSpot</li>
+		</recipeUsers>
+		<effectWorking>Smelt</effectWorking>
+		<unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
+		<workAmount>1700</workAmount>
+		<jobString>Making harpoons.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>13</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<VFE_Harpoon>5</VFE_Harpoon>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeNeolithicBase">
+		<defName>MakeAmmo_VFE_ThrowingAxe</defName>
+		<label>make throwing axe x5</label>
+		<description>Craft 5 throwing axes.</description>
+		<jobString>Making throwing axes.</jobString>
+		<workAmount>900</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>WoodLog</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>7</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>WoodLog</li>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<recipeUsers>
+			<li>ElectricSmithy</li>
+			<li>FueledSmithy</li>
+		</recipeUsers>
+		<products>
+			<VFE_ThrowingAxe>5</VFE_ThrowingAxe>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Apparel_Headgear.xml b/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Apparel_Headgear.xml
new file mode 100644
index 0000000000..fd405a1e74
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Apparel_Headgear.xml	
@@ -0,0 +1,297 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Guardian Helmet -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_Apparel_GuardianHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_Apparel_GuardianHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFEV_Apparel_GuardianHelmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Leather Helmet -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_Apparel_LeatherHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_Apparel_LeatherHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- Ravager Helmet -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_Apparel_RavagerHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_Apparel_RavagerHelmet"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<AimingAccuracy>-0.4</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_Apparel_RavagerHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- Moose Headdress -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_MooseHeaddress"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>10</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_MooseHeaddress"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>2.5</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- Bear Headdress -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_BearHeaddress"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>10</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_BearHeaddress"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>2.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_BearHeaddress"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<Suppressability>-10</Suppressability>
+				<PainShockThreshold>0.80</PainShockThreshold>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Jarl Crown -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_JarlCrown"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_JarlCrown"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- Crypto Helmet Base -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="VFEV_ApparelCryptoHelmetPowerBase"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<!-- Crypto Light Helmet -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_Apparel_CryptoLightHelmet"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>4</Bulk>
+				<WornBulk>1</WornBulk>
+				<Flammability>0</Flammability>
+				<MaxHitPoints>190</MaxHitPoints>
+				<ArmorRating_Sharp>12</ArmorRating_Sharp>
+				<ArmorRating_Blunt>28</ArmorRating_Blunt>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFEV_Apparel_CryptoLightHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFEV_Apparel_CryptoLightHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_Apparel_CryptoLightHelmet"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>0.1</AimingAccuracy>
+				<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFEV_Apparel_CryptoLightHelmet"]</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>
+
+	<!-- Crypto Heavy Helmet -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_Apparel_CryptoHeavyHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_Apparel_CryptoHeavyHelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_Apparel_CryptoHeavyHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>240</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_Apparel_CryptoHeavyHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_Apparel_CryptoHeavyHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFEV_Apparel_CryptoHeavyHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFEV_Apparel_CryptoHeavyHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_Apparel_CryptoHeavyHelmet"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<AimingAccuracy>0.15</AimingAccuracy>
+				<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFEV_Apparel_CryptoHeavyHelmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Apparel_Misc.xml b/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Apparel_Misc.xml
new file mode 100644
index 0000000000..e469f689b6
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Apparel_Misc.xml	
@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Torch Belt -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_Apparel_TorchBelt"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<label>throw torch</label>
+					<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<onlyManualCast>True</onlyManualCast>
+					<range>12.9</range>
+					<warmupTime>0.6</warmupTime>
+					<noiseRadius>2</noiseRadius>
+					<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+					<soundCast>ThrowMolotovCocktail</soundCast>
+					<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<defaultProjectile>VFEV_Proj_GrenadeTorch</defaultProjectile>
+					<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_Apparel_TorchBelt"]/statBases</xpath>
+		<value>
+			<Bulk>0</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_Proj_GrenadeTorch"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<explosionRadius>0.9</explosionRadius>
+				<damageDef>Flame</damageDef>
+				<speed>10</speed>
+				<ai_IsIncendiary>true</ai_IsIncendiary>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_Proj_GrenadeTorch"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Projectile_FireTrail</thingClass>
+		</value>
+	</Operation>
+
+	<!-- Shield Base -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="VFEV_BaseShield" or @Name="VFEV_BaseShieldCrypto"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Apparel_Shield</thingClass>
+		</value>
+	</Operation>
+
+	<!-- Round Shield -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_Shield_Round"]</xpath>
+		<value>
+
+			<ThingDef ParentName="ShieldBase">
+				<defName>VFEV_Shield_Round</defName>
+				<label>round shield</label>
+				<description>A wooden shield held together with a metal band, finished off with a leather inset to protect from rain. A leather strap and metal handle are also present on the back to allow for easy one-handed maneuvering during combat.</description>
+				<techLevel>Medieval</techLevel>
+				<graphicData>
+					<texPath>Things/Item/Equipment/Shield/RoundShield/RoundShield</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+					<shaderType>CutoutComplex</shaderType>
+					<drawSize>1</drawSize>
+				</graphicData>
+				<thingClass>CombatExtended.Apparel_Shield</thingClass>
+				<costStuffCount>25</costStuffCount>
+				<costList>
+					<WoodLog>50</WoodLog>
+					<Steel>20</Steel>
+				</costList>
+				<recipeMaker>
+					<researchPrerequisite Inherit="False">Smithing</researchPrerequisite>
+				</recipeMaker>
+				<stuffCategories>
+					<li>Leathery</li>
+				</stuffCategories>
+				<statBases>
+					<MaxHitPoints>120</MaxHitPoints>
+					<Flammability>1.0</Flammability>
+					<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+					<ArmorRating_Blunt>2.6</ArmorRating_Blunt>
+					<ArmorRating_Heat>0.55</ArmorRating_Heat>
+					<WorkToMake>2600</WorkToMake>
+					<Mass>1.7</Mass>
+					<StuffEffectMultiplierArmor>1.2</StuffEffectMultiplierArmor>
+					<Bulk>6</Bulk>
+					<WornBulk>5</WornBulk>
+				</statBases>
+				<equippedStatOffsets>
+					<ReloadSpeed>-0.1</ReloadSpeed>
+					<MeleeHitChance>-1</MeleeHitChance>
+					<ShootingAccuracyPawn>-0.2</ShootingAccuracyPawn>
+					<AimingAccuracy>-0.05</AimingAccuracy>
+					<Suppressability>-0.25</Suppressability>
+					<MeleeCritChance>-0.08</MeleeCritChance>
+					<MeleeParryChance>1.0</MeleeParryChance>
+				</equippedStatOffsets>
+				<apparel>
+					<tags>
+						<li>VikingShield_Basic</li>
+					</tags>
+				</apparel>
+				<comps>
+					<li>
+						<compClass>CompColorable</compClass>
+					</li>
+				</comps>
+				<modExtensions>
+					<li Class="CombatExtended.ShieldDefExtension">
+						<shieldCoverage>
+							<li>Hands</li>
+							<li>Arms</li>
+							<li>Shoulders</li>
+							<li>Torso</li>
+							<li>Neck</li>
+						</shieldCoverage>
+						<crouchCoverage>
+							<li>Legs</li>
+						</crouchCoverage>
+						<drawAsTall>false</drawAsTall>
+					</li>
+				</modExtensions>
+			</ThingDef>
+
+		</value>
+	</Operation>
+
+	<!-- Crypto Shield -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_Shield_Crypto"]</xpath>
+		<value>
+
+			<ThingDef ParentName="ShieldBase">
+				<defName>VFEV_Shield_Crypto</defName>
+				<label>crypto shield</label>
+				<description>A stabilized crypto-tech field wrapped around an advanced frame, capable of slowing the speed of the atoms of incoming projectiles to a halt. Does nothing to protect against heat and blunt trauma.</description>
+				<techLevel>Ultra</techLevel>
+				<graphicData>
+					<texPath>Things/Item/Equipment/Shield/CryptoShield/CryptoShield</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+					<drawSize>1</drawSize>
+				</graphicData>
+				<thingClass>CombatExtended.Apparel_Shield</thingClass>
+				<recipeMaker Inherit="False"/>
+				<costList>
+					<Plasteel>120</Plasteel>
+					<ComponentSpacer>6</ComponentSpacer>
+				</costList>
+				<statBases>
+					<MaxHitPoints>160</MaxHitPoints>
+					<Flammability>0</Flammability>
+					<ArmorRating_Sharp>75</ArmorRating_Sharp>
+					<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
+					<ArmorRating_Heat>0</ArmorRating_Heat>
+					<WorkToMake>2600</WorkToMake>
+					<Mass>2</Mass>
+					<Bulk>6</Bulk>
+					<WornBulk>5</WornBulk>
+				</statBases>
+				<equippedStatOffsets>
+					<ReloadSpeed>-0.1</ReloadSpeed>
+					<MeleeHitChance>-1</MeleeHitChance>
+					<ShootingAccuracyPawn>-0.2</ShootingAccuracyPawn>
+					<AimingAccuracy>-0.05</AimingAccuracy>
+					<Suppressability>-0.25</Suppressability>
+					<MeleeCritChance>-0.08</MeleeCritChance>
+					<MeleeParryChance>1.0</MeleeParryChance>
+				</equippedStatOffsets>
+				<apparel>
+					<tags>
+						<li>VikingShield_Basic</li>
+					</tags>
+				</apparel>
+				<comps>
+					<li>
+						<compClass>CompColorable</compClass>
+					</li>
+				</comps>
+				<modExtensions>
+					<li Class="CombatExtended.ShieldDefExtension">
+						<shieldCoverage>
+							<li>Hands</li>
+							<li>Arms</li>
+							<li>Shoulders</li>
+							<li>Torso</li>
+							<li>Neck</li>
+						</shieldCoverage>
+						<crouchCoverage>
+							<li>Legs</li>
+						</crouchCoverage>
+						<drawAsTall>false</drawAsTall>
+					</li>
+				</modExtensions>
+			</ThingDef>
+
+		</value>
+	</Operation>
+
+	<!-- Orbital Targeter - Mjollnir -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_OrbitalTargeterMjollnir"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>0</Bulk>
+			</statBases>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Apparel_Viking.xml b/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Apparel_Viking.xml
new file mode 100644
index 0000000000..9f1542f268
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Apparel_Viking.xml	
@@ -0,0 +1,330 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Guardian Armor -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_Apparel_GuardianArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_Apparel_GuardianArmor"]/statBases</xpath>
+		<value>
+			<Bulk>80</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFEV_Apparel_GuardianArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_Apparel_GuardianArmor"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>-0.15</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_Apparel_GuardianArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFEV_Apparel_GuardianArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Leather Armor -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_LeatherArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_LeatherArmor"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<WornBulk>4</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_LeatherArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<!-- Ravager Armor -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_Apparel_RavagerArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>10</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_Apparel_RavagerArmor"]/statBases</xpath>
+		<value>
+			<Bulk>14</Bulk>
+			<WornBulk>4</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_Apparel_RavagerArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFEV_Apparel_RavagerArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Jarl Cape -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_Apparel_JarlCape"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>7.75</Bulk>
+			<WornBulk>1.5</WornBulk>
+			<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Royal Fur Coat -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_Apparel_RoyalFurCoat"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>7.75</Bulk>
+			<WornBulk>1.5</WornBulk>
+			<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Crypto Armor Base -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="VFEV_ApparelArmorCryptoBase"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<!-- Crypto Armor -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_CryptoArmor"]/statBases</xpath>
+		<value>
+			<Bulk>80</Bulk>
+			<WornBulk>12</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_CryptoArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>350</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_CryptoArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>45</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_CryptoArmor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_CryptoArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_CryptoArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>46</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_CryptoArmor"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>25</CarryWeight>
+				<CarryBulk>15</CarryBulk>
+				<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Heavy Crypto Armor -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_CryptoHeavyArmor"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>100</Bulk>
+				<WornBulk>15</WornBulk>
+				<MaxHitPoints>475</MaxHitPoints>
+				<Mass>50</Mass>
+				<Flammability>0</Flammability>
+				<ArmorRating_Sharp>20</ArmorRating_Sharp>
+				<ArmorRating_Blunt>45</ArmorRating_Blunt>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_CryptoHeavyArmor"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>80</CarryWeight>
+				<CarryBulk>20</CarryBulk>
+				<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+				<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFEV_CryptoArmor" or defName="VFEV_CryptoHeavyArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/PawnKindDefs_Vikings.xml b/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/PawnKindDefs_Vikings.xml
new file mode 100644
index 0000000000..ebb95de17b
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/PawnKindDefs_Vikings.xml	
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Vikings -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="VFEV_Raider"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>8</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>150</min>
+						<max>350</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>VikingMeleeBasic</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="VFEV_Archer"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>10</min>
+					<max>28</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>150</min>
+						<max>350</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>VikingMeleeBasic</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Special -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="VFEV_VikingLegend"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>10</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Races_Animal_Domestic.xml b/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Races_Animal_Domestic.xml
new file mode 100644
index 0000000000..5dfd8fbc12
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Races_Animal_Domestic.xml	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Wooly Cow ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_WoolyCow"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.08</MeleeDodgeChance>
+			<MeleeCritChance>0.13</MeleeCritChance>
+			<MeleeParryChance>0.18</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_WoolyCow"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>horns</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>2.12</cooldownTime>
+					<chanceFactor>0.65</chanceFactor>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFEV_WoolyCow"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_Wolfhound"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.22</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0.04</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_Wolfhound"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.8</cooldownTime>
+					<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.8</cooldownTime>
+					<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>1.63</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.380</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFEV_Wolfhound"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Races_Animal_Giant.xml b/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Races_Animal_Giant.xml
new file mode 100644
index 0000000000..7f0cd47504
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Races_Animal_Giant.xml	
@@ -0,0 +1,367 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Lothurr ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_Lothurr"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.04</MeleeDodgeChance>
+			<MeleeCritChance>0.76</MeleeCritChance>
+			<MeleeParryChance>0.45</MeleeParryChance>
+			<Flammability>0.6</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_Lothurr"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>24</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_Lothurr"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_Lothurr"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.75</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_Lothurr"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>49</power>
+					<cooldownTime>2.72</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.64</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>45</power>
+					<cooldownTime>2.72</cooldownTime>
+					<chanceFactor>0.65</chanceFactor>
+					<linkedBodyPartsGroup>HornAttackTool_2</linkedBodyPartsGroup>
+					<armorPenetrationSharp>8</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>2.33</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>10.640</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>2.33</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>10.640</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.62</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.00</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.52</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFEV_Lothurr"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFEV_Lothurr"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFEV_Lothurr"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_Lothurr"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>4000</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Fenrir ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFEV_Fenrir"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_Fenrir"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_Fenrir"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_Fenrir"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.16</MeleeDodgeChance>
+			<MeleeCritChance>0.80</MeleeCritChance>
+			<MeleeParryChance>0.23</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_Fenrir"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>1.49</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>6.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>3.25</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>1.49</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>6.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>3.25</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>34</power>
+					<cooldownTime>1.86</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<chanceFactor>2</chanceFactor>
+					<armorPenetrationSharp>5.35</armorPenetrationSharp>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>4.6</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>6.225</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFEV_Fenrir"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFEV_Fenrir"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_Fenrir"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1962</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Njorun ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFEV_Njorun"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_Njorun"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>17</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_Njorun"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_Njorun"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.16</MeleeDodgeChance>
+			<MeleeCritChance>0.80</MeleeCritChance>
+			<MeleeParryChance>0.23</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_Njorun"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2.6</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>3.4</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFEV_Njorun"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFEV_Njorun"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_Njorun"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>4250</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Races_Mechanoid.xml b/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Races_Mechanoid.xml
new file mode 100644
index 0000000000..4207908b0f
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Races_Mechanoid.xml	
@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Odin Body ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "VFEV_Odin"]/corePart</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "VFEV_Odin"]/corePart/parts/li[def = "MechanicalNeck"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "VFEV_Odin"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def = "MechanicalHead"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "VFEV_Odin"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def = "MechanicalHead"]/parts/li[def="HearingSensor"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "VFEV_Odin"]/corePart/parts/li[def = "MechanicalShoulder"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "VFEV_Odin"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def = "MechanicalArm"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "VFEV_Odin"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def = "MechanicalArm"]/parts/li[def = "MechanicalHand"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "VFEV_Odin"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def = "MechanicalArm"]/parts/li[def = "MechanicalHand"]/parts/li[def = "MechanicalFinger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "VFEV_Odin"]/corePart/parts/li[def = "MechanicalLeg"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName = "VFEV_Odin"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def = "MechanicalFoot"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<!-- ========== Odin ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_Mech_Odin"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.04</MeleeDodgeChance>
+			<MeleeCritChance>0.76</MeleeCritChance>
+			<MeleeParryChance>0.45</MeleeParryChance>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_Mech_Odin"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_Mech_Odin"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_Mech_Odin"]/statBases</xpath>
+		<value>
+			<ArmorRating_Heat>2</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_Mech_Odin"]</xpath>
+		<value>
+			<damageMultipliers>
+				<li>
+					<damageDef>VFEV_Cut</damageDef>
+					<multiplier>2</multiplier>
+				</li>
+				<li>
+					<damageDef>Cut</damageDef>
+					<multiplier>2</multiplier>
+				</li>
+				<li>
+					<damageDef>Stab</damageDef>
+					<multiplier>2</multiplier>
+				</li>
+				<li>
+					<damageDef>Bullet</damageDef>
+					<multiplier>0.8</multiplier>
+				</li>
+				<li>
+					<damageDef>Flame</damageDef>
+					<multiplier>0</multiplier>
+				</li>
+			</damageMultipliers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_Mech_Odin"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>24.0</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<armorPenetrationSharp>8</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>24.0</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<armorPenetrationSharp>8</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>3.20</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VFEV_Mech_Odin"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFEV_Mech_Odin"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFEV_Mech_Odin"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_Mech_Odin"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>3000</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>300</MaxOverHeal>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="VFEV_Mech_Odin"]/combatPower</xpath>
+		<value>
+			<combatPower>600</combatPower>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Scenarios_Vikings.xml b/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Scenarios_Vikings.xml
new file mode 100644
index 0000000000..4a0aefdaef
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Scenarios_Vikings.xml	
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ScenarioDef[defName="VFEV_NewClan"]/scenario/parts/li[thingDef="VFE_Harpoon" and @Class="ScenPart_StartingThing_Defined"]/count</xpath>
+		<value>
+			<count>20</count>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="VFEV_NewClan"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_Arrow_Steel</thingDef>
+				<count>100</count>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/ThingDef_Items.xml b/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/ThingDef_Items.xml
new file mode 100644
index 0000000000..50c689bac8
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/ThingDef_Items.xml	
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Add Bulk to items. -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "VFEV_Honey"]/statBases</xpath>
+		<value>
+			<Bulk>0.05</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "VFEV_Sweetroll"]/statBases</xpath>
+		<value>
+			<Bulk>0.25</Bulk>
+		</value>
+	</Operation>
+
+	<!-- Give Mead Bulk and Melee tools. -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "VFEV_Mead"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_Mead"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2.22</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>neck</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>3.33</cooldownTime>
+					<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Neck</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_Mead"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.1</MeleeCritChance>
+				<MeleeParryChance>0.33</MeleeParryChance>
+				<MeleeDodgeChance>0.07</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Give Lothurr Antler Bulk and Melee tools. -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "VFEV_LothurrAntler"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VFEV_LothurrAntler"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Patch leathers. -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_Leather_Fenrir"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.75</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_Leather_Fenrir"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.09</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VFEV_Leather_Fenrir"]/stuffProps/categories</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFEV_Leather_Fenrir"]/stuffProps</xpath>
+			<value>
+				<categories>
+					<li>SoftArmor</li>
+				</categories>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VFEV_Leather_Fenrir"]/stuffProps/categories</xpath>
+			<value>
+				<li>SoftArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_Leather_Lothurr"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.6</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_Leather_Lothurr"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_Leather_Njorun"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.2</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_Leather_Njorun"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.08</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Weapons_Crypto.xml b/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Weapons_Crypto.xml
new file mode 100644
index 0000000000..8e2d50aaa1
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Weapons_Crypto.xml	
@@ -0,0 +1,337 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === Light Crypto Axe === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_CryptoLightAxe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.66</cooldownTime>
+					<chanceFactor>0.33</chanceFactor>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>VFEV_Cut</li>
+					</capacities>
+					<power>29</power>
+					<cooldownTime>2.63</cooldownTime>
+					<armorPenetrationBlunt>4.85</armorPenetrationBlunt>
+					<armorPenetrationSharp>8</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_CryptoLightAxe"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.20</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_CryptoLightAxe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.23</MeleeCritChance>
+				<MeleeParryChance>0.20</MeleeParryChance>
+				<MeleeDodgeChance>0.27</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_CryptoLightAxe"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- === Heavy Crypto Axe === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_CryptoHeavyAxe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.78</cooldownTime>
+					<chanceFactor>0.33</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>VFEV_Cut</li>
+					</capacities>
+					<power>39</power>
+					<cooldownTime>3.09</cooldownTime>
+					<armorPenetrationBlunt>4.84</armorPenetrationBlunt>
+					<armorPenetrationSharp>20</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_CryptoHeavyAxe"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEV_CryptoHeavyAxe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.26</MeleeCritChance>
+				<MeleeParryChance>0.75</MeleeParryChance>
+				<MeleeDodgeChance>0.50</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- === Melee Tools === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_CryptoPistol"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEV_CryptoLightCrossbow" or defName="VFEV_CryptoRifle"]/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="VFEV_CryptoHeavyCrossbow"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stirrup</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2.44</cooldownTime>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Heavy Crypto Crossbow === -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFEV_CryptoHeavyCrossbow</defName>
+		<statBases>
+			<Bulk>10</Bulk>
+			<SwayFactor>2.00</SwayFactor>
+			<ShotSpread>0.07</ShotSpread>
+			<SightsEfficiency>1.8</SightsEfficiency>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_CryptoHeavyBolt</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>42</range>
+			<soundCast>VFEV_CryptoLightCrossbowShot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>5.5</reloadTime>
+			<ammoSet>AmmoSet_CryptoHeavyBolt</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- === Light Crypto Crossbow === -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFEV_CryptoLightCrossbow</defName>
+		<statBases>
+			<Bulk>7</Bulk>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_CryptoBolt</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>28</range>
+			<soundCast>Bow_Large</soundCast>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_CryptoBolt</ammoSet>
+		</AmmoUser>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- === Crypto Pistol === -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFEV_CryptoPistol</defName>
+		<statBases>
+			<WorkToMake>17500</WorkToMake>
+			<Mass>1.50</Mass>
+			<Bulk>2.60</Bulk>
+			<SwayFactor>1.07</SwayFactor>
+			<ShotSpread>0.15</ShotSpread>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_CryptoPistol</defaultProjectile>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>0.5</warmupTime>
+			<range>20</range>
+			<soundCast>VFEV_CryptoPistolShot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>14</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_CryptoPistol</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Crypto Rifle === -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFEV_CryptoRifle</defName>
+		<statBases>
+			<Mass>3.0</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.20</SwayFactor>
+			<Bulk>7.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.51</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_CryptoRifle</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>55</range>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<burstShotCount>6</burstShotCount>
+			<soundCast>VFEV_CryptoRifleShot</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_CryptoRifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Weapons_Medieval.xml b/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Weapons_Medieval.xml
new file mode 100644
index 0000000000..a2076909d7
--- /dev/null
+++ b/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Weapons_Medieval.xml	
@@ -0,0 +1,372 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === Seax === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_MeleeWeapon_Seax"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<chanceFactor>0.33</chanceFactor>
+					<cooldownTime>1.19</cooldownTime>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.33</cooldownTime>
+					<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.26</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.34</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_MeleeWeapon_Seax"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_MeleeWeapon_Seax"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.63</MeleeCritChance>
+				<MeleeParryChance>0.5</MeleeParryChance>
+				<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_MeleeWeapon_Seax"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- === Bearded Axe === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_MeleeWeapon_BeardedAxe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.66</cooldownTime>
+					<chanceFactor>0.33</chanceFactor>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>2.3</cooldownTime>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.78</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_MeleeWeapon_BeardedAxe"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.20</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_MeleeWeapon_BeardedAxe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.03</MeleeCritChance>
+				<MeleeParryChance>0.20</MeleeParryChance>
+				<MeleeDodgeChance>0.27</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_MeleeWeapon_BeardedAxe"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- === Dane Axe === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_MeleeWeapon_DaneAxe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.78</cooldownTime>
+					<chanceFactor>0.33</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>31</power>
+					<cooldownTime>4.09</cooldownTime>
+					<armorPenetrationBlunt>4.84</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.97</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_MeleeWeapon_DaneAxe"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_MeleeWeapon_DaneAxe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.06</MeleeCritChance>
+				<MeleeParryChance>0.75</MeleeParryChance>
+				<MeleeDodgeChance>0.50</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- === Throwing Axe === -->
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="VFE_ThrowingAxe"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>BaseWeapon</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFE_ThrowingAxe"]/costStuffCount</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFE_ThrowingAxe"]/recipeMaker</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_ThrowingAxe"]</xpath>
+		<value>
+			<thingCategories>
+				<li>WeaponsRanged</li>
+			</thingCategories>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_ThrowingAxe"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_ThrowingAxe"]/statBases</xpath>
+		<value>
+			<statBases>
+				<SightsEfficiency>1.0</SightsEfficiency>
+				<ShotSpread>1.5</ShotSpread>
+				<SwayFactor>2.5</SwayFactor>
+				<Bulk>1.25</Bulk>
+				<Mass>0.75</Mass>
+				<RangedWeapon_Cooldown>0.75</RangedWeapon_Cooldown>
+			</statBases>
+			<stackLimit>25</stackLimit>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_ThrowingAxe"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Vikings_ThrowingAxe_Thrown</defaultProjectile>
+					<warmupTime>1.0</warmupTime>
+					<range>10</range>
+					<soundCast>Interact_BeatFire</soundCast>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_ThrowingAxe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<chanceFactor>0.33</chanceFactor>
+					<cooldownTime>1.4</cooldownTime>
+					<armorPenetrationBlunt>0.375</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.18</cooldownTime>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.62</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Harpoon === -->
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="VFE_Harpoon"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>BaseWeapon</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFE_Harpoon"]/costStuffCount</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFE_Harpoon"]/costList</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Harpoon"]</xpath>
+		<value>
+			<thingCategories>
+				<li>WeaponsRanged</li>
+			</thingCategories>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFE_Harpoon"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFE_Harpoon"]/recipeMaker</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Harpoon"]/statBases</xpath>
+		<value>
+			<statBases>
+				<MarketValue>7.26</MarketValue>
+				<SightsEfficiency>1.0</SightsEfficiency>
+				<ShotSpread>1.5</ShotSpread>
+				<SwayFactor>2.5</SwayFactor>
+				<Bulk>3</Bulk>
+				<Mass>1.75</Mass>
+				<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			</statBases>
+			<stackLimit>25</stackLimit>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Harpoon"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Vikings_Harpoon_Thrown</defaultProjectile>
+					<warmupTime>0.8</warmupTime>
+					<range>12</range>
+					<soundCast>Interact_BeatFire</soundCast>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Harpoon"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<chanceFactor>0.33</chanceFactor>
+					<cooldownTime>1.35</cooldownTime>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.37</cooldownTime>
+					<armorPenetrationBlunt>1.69</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.34</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Furniture Expanded - Security/Defs/Vanilla Furniture Expanded - Security/Ammo_Security.xml b/ModPatches/Vanilla Furniture Expanded - Security/Defs/Vanilla Furniture Expanded - Security/Ammo_Security.xml
new file mode 100644
index 0000000000..45a1b5548b
--- /dev/null
+++ b/ModPatches/Vanilla Furniture Expanded - Security/Defs/Vanilla Furniture Expanded - Security/Ammo_Security.xml	
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ========== EMP Ammo ========== -->
+	<ThingDef ParentName="BaseExplosiveBullet">
+		<defName>Bullet_EMPCannon</defName>
+		<label>EMP Blast</label>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_EMPCannon</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>EMP</damageDef>
+			<damageAmountBase>42</damageAmountBase>
+			<explosionRadius>4</explosionRadius>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<speed>129</speed>
+			<flyOverhead>false</flyOverhead>
+			<dropsCasings>false</dropsCasings>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+		</projectile>
+	</ThingDef>
+
+	<!-- ========== Raider Artillery (To circumvent the issue with vanilla shells.) ========== -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_RaiderArtillery</defName>
+		<label>Raider Artillery</label>
+		<ammoTypes>
+			<Shell_HighExplosive>Bullet_155mmHowitzerShell_HE</Shell_HighExplosive>
+			<Shell_Incendiary>Bullet_155mmHowitzerShell_Incendiary</Shell_Incendiary>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Furniture Expanded - Security/Defs/Vanilla Furniture Expanded - Security/NewRaiderArtillery.xml b/ModPatches/Vanilla Furniture Expanded - Security/Defs/Vanilla Furniture Expanded - Security/NewRaiderArtillery.xml
new file mode 100644
index 0000000000..cd1fd3626f
--- /dev/null
+++ b/ModPatches/Vanilla Furniture Expanded - Security/Defs/Vanilla Furniture Expanded - Security/NewRaiderArtillery.xml	
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- Raider Artillery. Because the sieges are only set up to supply sieges with vanilla mortars shells, we need a version that consumes those. -->
+
+	<ThingDef ParentName="BaseArtilleryBuilding">
+		<defName>Raider_Turret_Artillery</defName>
+		<label>heavy artillery</label>
+		<description>A manned artillery that launches all kinds of shells. Capable of inflicting devastating damage to both enemy forces and structures, this military machinery excels at laying down fire support for soldiers in the field.\n\nCapable of targeting other areas of the world within a medium radius.</description>
+		<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		<graphicData>
+			<texPath>Things/Building/Artillery/TurretArtillery_Base</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>(3,3)</drawSize>
+			<damageData>
+				<rect>(0.38,0.2,0.56375,0.8)</rect>
+				<cornerTL>Damage/Corner</cornerTL>
+			</damageData>
+			<shadowData>
+				<offset>(-0.13,-0.87,-0.1)</offset>
+				<volume>(0.5,0.4,1.05)</volume>
+			</shadowData>
+		</graphicData>
+		<statBases>
+			<MaxHitPoints>250</MaxHitPoints>
+			<WorkToBuild>3600</WorkToBuild>
+		</statBases>
+		<techLevel>Industrial</techLevel>
+		<interactionCellOffset>(0,0,-2)</interactionCellOffset>
+		<hasInteractionCell>true</hasInteractionCell>
+		<size>(3,3)</size>
+		<!-- <designationCategory /> -->
+		<rotatable>true</rotatable>
+		<stealable>false</stealable>
+		<stuffCategories>
+			<li>Metallic</li>
+		</stuffCategories>
+		<costStuffCount>100</costStuffCount>
+		<costList>
+			<Steel>180</Steel>
+			<ComponentIndustrial>9</ComponentIndustrial>
+		</costList>
+		<comps>
+		</comps>
+		<terrainAffordanceNeeded>Heavy</terrainAffordanceNeeded>
+		<building>
+			<claimable>false</claimable>
+			<turretGunDef>Raider_Artillery_Weapon</turretGunDef>
+			<turretTopDrawSize>3</turretTopDrawSize>
+			<buildingTags>
+				<li>Artillery_BaseDestroyer</li>
+			</buildingTags>
+			<turretBurstWarmupTime>1</turretBurstWarmupTime>
+			<turretBurstCooldownTime>1</turretBurstCooldownTime>
+			<defaultStorageSettings Inherit="False">
+				<filter>
+					<categories>
+						<li>MortarShells</li>
+					</categories>
+					<disallowedThingDefs>
+						<li>Shell_Incendiary</li>
+						<li>Shell_Firefoam</li>
+						<li>Shell_AntigrainWarhead</li>
+					</disallowedThingDefs>
+				</filter>
+			</defaultStorageSettings>
+		</building>
+		<uiIconPath>Things/Building/Artillery/TurretArtillery_MenuIcon</uiIconPath>
+		<uiIconScale>0.9</uiIconScale>
+		<constructionSkillPrerequisite>5</constructionSkillPrerequisite>
+		<researchPrerequisites>
+			<li>VFES_Artillery_Debug</li>
+		</researchPrerequisites>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseArtilleryWeapon">
+		<defName>Raider_Artillery_Weapon</defName>
+		<label>artillery</label>
+		<description>Artillery cannon capable of long range bombardment.</description>
+		<graphicData>
+			<texPath>Things/Building/Artillery/TurretArtillery_Top</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<statBases>
+			<SightsEfficiency>0.5</SightsEfficiency>
+			<RangedWeapon_Cooldown>8.5</RangedWeapon_Cooldown>
+		</statBases>
+		<weaponTags>
+			<li>Artillery_BaseDestroyer</li>
+			<li>TurretGun</li>
+		</weaponTags>
+		<verbs>
+			<li Class="CombatExtended.VerbPropertiesCE">
+				<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+				<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+				<hasStandardCommand>true</hasStandardCommand>
+				<defaultProjectile>Bullet_155mmHowitzerShell_HE</defaultProjectile>
+				<warmupTime>4</warmupTime>
+				<minRange>40</minRange>
+				<range>1000</range>
+				<burstShotCount>1</burstShotCount>
+				<soundCast>VFES_Shot_Artillery</soundCast>
+				<muzzleFlashScale>20</muzzleFlashScale>
+				<indirectFirePenalty>0.2</indirectFirePenalty>
+				<targetParams>
+					<canTargetLocations>true</canTargetLocations>
+				</targetParams>
+			</li>
+		</verbs>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>30</li>
+					<li>50</li>
+					<li>70</li>
+					<li>90</li>
+				</chargeSpeeds>
+			</li>
+			<li Class="CombatExtended.CompProperties_AmmoUser">
+				<magazineSize>1</magazineSize>
+				<reloadTime>12</reloadTime>
+				<ammoSet>AmmoSet_RaiderArtillery</ammoSet>
+			</li>
+		</comps>
+		<building>
+			<fixedStorageSettings>
+				<filter>
+					<categories>
+						<li>MortarShells</li>
+					</categories>
+				</filter>
+			</fixedStorageSettings>
+			<defaultStorageSettings>
+				<filter>
+					<categories>
+						<li>MortarShells</li>
+					</categories>
+					<disallowedThingDefs>
+						<li>Shell_Firefoam</li>
+						<li>Shell_AntigrainWarhead</li>
+					</disallowedThingDefs>
+				</filter>
+			</defaultStorageSettings>
+		</building>
+	</ThingDef>
+
+	<!-- Dummy research project. This allows raiders to spawn and build their own variation of the artillery gun without the player being able to access it. -->
+
+	<ResearchProjectDef ParentName="VFES_ResearchBase">
+		<defName>VFES_Artillery_Debug</defName>
+		<label>Combat Extended Artillery Debug</label>
+		<description>Ignore this project. A dummy research project as a workaround for raider artillery compatibility. Not intended for the player.</description>
+		<baseCost>99999</baseCost>
+		<techLevel>Ultra</techLevel>
+		<requiredResearchFacilities>
+			<li>MultiAnalyzer</li>
+		</requiredResearchFacilities>
+		<requiredResearchBuilding>HiTechResearchBench</requiredResearchBuilding>
+		<researchViewX>10</researchViewX>
+		<researchViewY>0</researchViewY>
+	</ResearchProjectDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Furniture Expanded - Security/Patches/Vanilla Furniture Expanded - Security/ThingDefs_Manned.xml b/ModPatches/Vanilla Furniture Expanded - Security/Patches/Vanilla Furniture Expanded - Security/ThingDefs_Manned.xml
new file mode 100644
index 0000000000..657d816ea8
--- /dev/null
+++ b/ModPatches/Vanilla Furniture Expanded - Security/Patches/Vanilla Furniture Expanded - Security/ThingDefs_Manned.xml	
@@ -0,0 +1,340 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName = "VFES_Turret_HMGComplex" or
+			defName = "VFES_Turret_ChargeComplex" or
+			defName = "VFES_Turret_Ballista"
+			]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "VFES_Turret_HMGComplex" or
+			defName = "VFES_Turret_ChargeComplex" or
+			defName = "VFES_Turret_Artillery" or
+			defName = "VFES_Turret_Catapult" or
+			defName = "VFES_Turret_Ballista"
+			]/thingClass </xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "VFES_Turret_HMGComplex" or
+			defName = "VFES_Turret_ChargeComplex" or
+			defName = "VFES_Turret_Ballista"
+			]/fillPercent </xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<!-- ========== Ballista - Weapon ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFES_Gun_BallistaTurret</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>1</ShotSpread>
+			<SwayFactor>1</SwayFactor>
+			<Bulk>4.00</Bulk>
+			<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Pilum_Fired</defaultProjectile>
+			<warmupTime>1.4</warmupTime>
+			<range>44</range>
+			<soundCast>VFES_Shot_Ballista</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>8</reloadTime>
+			<ammoSet>AmmoSet_Javelins</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>false</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "VFES_Gun_BallistaTurret"]/weaponTags</xpath>
+		<value>
+			<li>TurretGun</li>
+		</value>
+	</Operation>
+
+	<!-- Charge Complex -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFES_Gun_ChargeComplex</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>0.82</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.96</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>86</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>Shot_ChargeBlaster</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<targetParams>
+				<canTargetLocations>True</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags Inherit="False">
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- HMG Complex -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFES_Gun_HMGComplex</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.16</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.81</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>70</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>VFES_Shot_HMG</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<targetParams>
+				<canTargetLocations>True</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags Inherit="False">
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Catapult - Base ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFES_Turret_Catapult"]/building</xpath>
+		<value>
+			<spawnedConceptLearnOpportunity>CE_MortarDirectFire</spawnedConceptLearnOpportunity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFES_Turret_Catapult"]/building/turretBurstWarmupTime</xpath>
+		<value>
+			<turretBurstWarmupTime>1</turretBurstWarmupTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFES_Turret_Catapult"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>1</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFES_Turret_Catapult"]/inspectorTabs</xpath>
+	</Operation>
+
+	<!-- ========== Catapult - Weapon ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFES_Artillery_Catapult"]/statBases</xpath>
+		<value>
+			<SightsEfficiency>0.5</SightsEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "VFES_Artillery_Catapult"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>30</li>
+					<li>50</li>
+					<li>70</li>
+					<li>90</li>
+				</chargeSpeeds>
+			</li>
+			<li Class="CombatExtended.CompProperties_AmmoUser">
+				<magazineSize>1</magazineSize>
+				<reloadTime>12</reloadTime>
+				<ammoSet>AmmoSet_Catapult</ammoSet>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VFES_Artillery_Catapult"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+					<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Projectile_CatapultBullet_Boulder</defaultProjectile>
+					<warmupTime>4</warmupTime>
+					<minRange>30</minRange>
+					<range>500</range>
+					<burstShotCount>1</burstShotCount>
+					<soundCast>Bow_Recurve</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<indirectFirePenalty>0.2</indirectFirePenalty>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "VFES_Artillery_Catapult"]/weaponTags</xpath>
+		<value>
+			<li>TurretGun</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Artillery - Base ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFES_Turret_Artillery"]/statBases</xpath>
+		<value>
+			<Mass>5500</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFES_Turret_Artillery"]/building</xpath>
+		<value>
+			<spawnedConceptLearnOpportunity>CE_MortarDirectFire</spawnedConceptLearnOpportunity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFES_Turret_Artillery"]/building/buildingTags</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFES_Turret_Artillery"]/building/turretBurstWarmupTime</xpath>
+		<value>
+			<turretBurstWarmupTime>1</turretBurstWarmupTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFES_Turret_Artillery"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>1</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFES_Turret_Artillery"]/comps/li[@Class="VFESecurity.CompProperties_LongRangeArtillery"]</xpath>
+	</Operation>
+
+	<!-- ========== Artillery - Weapon ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFES_Artillery_Weapon"]/statBases</xpath>
+		<value>
+			<SightsEfficiency>0.5</SightsEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "VFES_Artillery_Weapon"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>30</li>
+					<li>50</li>
+					<li>70</li>
+					<li>90</li>
+				</chargeSpeeds>
+			</li>
+			<li Class="CombatExtended.CompProperties_AmmoUser">
+				<magazineSize>1</magazineSize>
+				<reloadTime>12</reloadTime>
+				<ammoSet>AmmoSet_155mmHowitzerShell</ammoSet>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VFES_Artillery_Weapon"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+					<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_155mmHowitzerShell_HE</defaultProjectile>
+					<warmupTime>4</warmupTime>
+					<minRange>40</minRange>
+					<range>1000</range>
+					<burstShotCount>1</burstShotCount>
+					<soundCast>VFES_Shot_Artillery</soundCast>
+					<muzzleFlashScale>20</muzzleFlashScale>
+					<indirectFirePenalty>0.2</indirectFirePenalty>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VFES_Artillery_Weapon"]/weaponTags</xpath>
+		<value>
+			<weaponTags>
+				<li>Artillery_BaseDestroyer</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Furniture Expanded - Security/Patches/Vanilla Furniture Expanded - Security/ThingDefs_Sentry.xml b/ModPatches/Vanilla Furniture Expanded - Security/Patches/Vanilla Furniture Expanded - Security/ThingDefs_Sentry.xml
new file mode 100644
index 0000000000..44a21c5d4b
--- /dev/null
+++ b/ModPatches/Vanilla Furniture Expanded - Security/Patches/Vanilla Furniture Expanded - Security/ThingDefs_Sentry.xml	
@@ -0,0 +1,467 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Remove refuelable property -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName = "VFES_Turret_ChargeRailgunTurret" or
+			defName = "VFES_Turret_ChargeTurret" or
+			defName = "VFES_Turret_AutocannonDouble" or
+			defName = "VFES_Turret_EMPTurret" or
+			defName = "VFES_Turret_Flame" or
+			defName = "VFES_Turret_SentryGun" or
+			defName = "VFES_Turret_MilitaryTurret"
+			]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
+	</Operation>
+
+	<!-- Remove Explosive comp -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName = "VFES_Turret_ChargeRailgunTurret" or
+			defName = "VFES_Turret_ChargeTurret" or
+			defName = "VFES_Turret_AutocannonDouble" or
+			defName = "VFES_Turret_EMPTurret" or
+			defName = "VFES_Turret_Flame" or
+			defName = "VFES_Turret_SentryGun" or
+			defName = "VFES_Turret_MilitaryTurret"
+			]/comps/li[@Class = "CompProperties_Explosive"] </xpath>
+	</Operation>
+
+	<!-- Replace vanilla thingClass -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "VFES_Turret_ChargeRailgunTurret" or
+			defName = "VFES_Turret_ChargeTurret" or
+			defName = "VFES_Turret_AutocannonDouble" or
+			defName = "VFES_Turret_EMPTurret" or
+			defName = "VFES_Turret_Flame" or
+			defName = "VFES_Turret_SentryGun" or
+			defName = "VFES_Turret_MilitaryTurret" or
+			defName = "VFES_Turret_FloorTurret"
+			]/thingClass </xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<!-- Make turrets taller -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "VFES_Turret_ChargeRailgunTurret" or
+			defName = "VFES_Turret_ChargeTurret" or
+			defName = "VFES_Turret_AutocannonDouble" or
+			defName = "VFES_Turret_EMPTurret" or
+			defName = "VFES_Turret_Flame" or
+			defName = "VFES_Turret_SentryGun" or
+			defName = "VFES_Turret_MilitaryTurret"
+			]/fillPercent </xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName = "VFES_Turret_Flame" or
+			defName = "VFES_Turret_SentryGun" or
+			defName = "VFES_Turret_MilitaryTurret" or
+			defName = "VFES_Turret_FloorTurret" or
+			defName = "VFES_Turret_Searchlight"
+			]/statBases </xpath>
+		<value>
+			<AimingAccuracy>0.25</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName = "VFES_Turret_ChargeRailgunTurret" or
+			defName = "VFES_Turret_ChargeTurret" or
+			defName = "VFES_Turret_AutocannonDouble" or
+			defName = "VFES_Turret_EMPTurret"
+			]/statBases </xpath>
+		<value>
+			<AimingAccuracy>0.5</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName = "VFES_Turret_ChargeRailgunTurret" or
+			defName = "VFES_Turret_ChargeTurret" or
+			defName = "VFES_Turret_EMPTurret"
+			]/statBases </xpath>
+		<value>
+			<NightVisionEfficiency>0.5</NightVisionEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "VFES_Turret_EMPTurret" or
+			defName = "VFES_Turret_Flame" or
+			defName = "VFES_Turret_SentryGun" or
+			defName = "VFES_Turret_MilitaryTurret" or
+			defName = "VFES_Turret_FloorTurret"
+			]/statBases/ShootingAccuracyTurret </xpath>
+		<value>
+			<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "VFES_Turret_ChargeTurret" or
+			defName = "VFES_Turret_ChargeRailgunTurret" or
+			defName = "VFES_Turret_AutocannonDouble"
+			]/statBases/ShootingAccuracyTurret </xpath>
+		<value>
+			<ShootingAccuracyTurret>1.25</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "VFES_Turret_ChargeRailgunTurret" or
+			defName = "VFES_Turret_ChargeTurret" or
+			defName = "VFES_Turret_AutocannonDouble" or
+			defName = "VFES_Turret_EMPTurret" or
+			defName = "VFES_Turret_Flame" or
+			defName = "VFES_Turret_SentryGun" or
+			defName = "VFES_Turret_MilitaryTurret" or
+			defName = "VFES_Turret_FloorTurret"
+			]/building/turretBurstCooldownTime </xpath>
+		<value>
+			<turretBurstCooldownTime>1.1</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<!-- Searchlight -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VFES_Turret_Searchlight"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>68</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VFES_Gun_Searchlight"]/verbs/li/range</xpath>
+		<value>
+			<range>68</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VFES_Gun_Searchlight"]/modExtensions/li[@Class="VFESecurity.ExtendedVerbProperties"]/illuminatedRadius</xpath>
+		<value>
+			<illuminatedRadius>6</illuminatedRadius>
+		</value>
+	</Operation>
+
+	<!-- Flame Turret -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VFES_Turret_Flame"]/costList/Chemfuel</xpath>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFES_Gun_FlameTurret</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>3.0</ShotSpread>
+			<SwayFactor>1.59</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.65</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Flamethrower_Napalm</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>20</range>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<burstShotCount>16</burstShotCount>
+			<soundCast>VFES_Shot_Flamethrower</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>0</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>75</magazineSize>
+			<reloadTime>9.8</reloadTime>
+			<ammoSet>AmmoSet_Flamethrower</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>true</aiUseBurstMode>
+			<aimedBurstShotCount>10</aimedBurstShotCount>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags Inherit="False">
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Military Turret -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFES_Gun_MilitaryTurret</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>0.82</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.85</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>48</range>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<burstShotCount>12</burstShotCount>
+			<soundCast>GunShotA</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>120</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- Concealable Military Turret -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFES_Gun_FloorTurret</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>0.82</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.91</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>48</range>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<burstShotCount>12</burstShotCount>
+			<soundCast>GunShotA</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>120</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- Charge Turret -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFES_Gun_ChargeTurret</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>0.72</SwayFactor>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<NightVisionEfficiency_Weapon>0.5</NightVisionEfficiency_Weapon>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.85</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>55</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>10</burstShotCount>
+			<soundCast>Shot_ChargeBlaster</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags Inherit="False">
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Double Autocannon -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFES_TurretDoubleAutocannon_Top</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.72</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.56</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_20x102mmNATO_AP</defaultProjectile>
+			<warmupTime>2.3</warmupTime>
+			<range>78</range>
+			<burstShotCount>12</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>Shot_Autocannon</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>120</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_20x102mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags Inherit="False">
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "VFES_Turret_AutocannonDouble"]/researchPrerequisites</xpath>
+		<value>
+			<li>CE_HeavyTurret</li>
+		</value>
+	</Operation>
+
+	<!-- Sentry Gun -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFES_Gun_SentryTurret</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>1.32</SwayFactor>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.3</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>2.1</warmupTime>
+			<range>54</range>
+			<burstShotCount>25</burstShotCount>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>250</magazineSize>
+			<reloadTime>9.2</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags Inherit="False">
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- EMP Cannon -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFES_Gun_EMPTurret</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>6</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>0.46</SwayFactor>
+			<NightVisionEfficiency_Weapon>0.5</NightVisionEfficiency_Weapon>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_EMPCannon</defaultProjectile>
+			<warmupTime>3</warmupTime>
+			<range>86</range>
+			<burstShotCount>1</burstShotCount>
+			<ticksBetweenBurstShots>56</ticksBetweenBurstShots>
+			<soundCast>EnergyShield_AbsorbDamage</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags Inherit="False">
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Railgun Turret -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFES_Gun_RailgunTurret</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>5</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.2</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>0.26</SwayFactor>
+			<NightVisionEfficiency_Weapon>0.5</NightVisionEfficiency_Weapon>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_12mmRailgun_Sabot</defaultProjectile>
+			<warmupTime>2</warmupTime>
+			<range>86</range>
+			<minRange>13</minRange>
+			<burstShotCount>4</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<soundCast>ChargeLance_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>10</reloadTime>
+			<ammoSet>AmmoSet_12mmRailgun</ammoSet>
+		</AmmoUser>
+		<weaponTags Inherit="False">
+			<li>TurretGun</li>
+		</weaponTags>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Genetics Expanded/Defs/Vanilla Genetics Expanded/Projectiles.xml b/ModPatches/Vanilla Genetics Expanded/Defs/Vanilla Genetics Expanded/Projectiles.xml
new file mode 100644
index 0000000000..efee53847d
--- /dev/null
+++ b/ModPatches/Vanilla Genetics Expanded/Defs/Vanilla Genetics Expanded/Projectiles.xml	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!--== Projectiles ==-->
+	<ThingDef ParentName="BaseBulletCE">
+		<defName>GR_PoisonBreathAnimated_CE</defName>
+		<label>poison breath</label>
+		<thingClass>CombatExtended.BulletCE</thingClass>
+		<graphicData>
+			<texPath>Things/Projectile/GR_PoisonShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>MoteGlow</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<flyOverhead>false</flyOverhead>
+			<damageDef>ToxicBite</damageDef>
+			<damageAmountBase>25</damageAmountBase>
+			<speed>20</speed>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBulletCE">
+		<defName>GR_FlameBreathAnimated_CE</defName>
+		<label>flame breath</label>
+		<thingClass>CombatExtended.BulletCE</thingClass>
+		<graphicData>
+			<texPath>Things/Projectile/GR_FireSpit</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>MoteGlow</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<flyOverhead>false</flyOverhead>
+			<damageDef>Flame</damageDef>
+			<damageAmountBase>5</damageAmountBase>
+			<speed>20</speed>
+			<ai_IsIncendiary>true</ai_IsIncendiary>
+		</projectile>
+	</ThingDef>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Bodies/Patch_Bodies_Animals.xml b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Bodies/Patch_Bodies_Animals.xml
new file mode 100644
index 0000000000..6d10404db8
--- /dev/null
+++ b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Bodies/Patch_Bodies_Animals.xml	
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Bird With Teeth -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="GR_BirdWithTeeth"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Leg" or
+			def="Tail"
+			] </xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="GR_BirdWithTeeth"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Head" or
+			def="AnimalJaw" or
+			def="Leg" or
+			def="Foot" or
+			def="Tail"
+			]/groups </xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- Horned Bird -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="GR_HornedBird"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Leg" or
+			def="Tail"
+			] </xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="GR_HornedBird"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Head" or
+			def="Beak" or
+			def="Leg" or
+			def="Foot" or
+			def="Tail"
+			]/groups </xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- Jellyfish Body -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="GR_JellyfishBody"]//*[def="GR_JellyfishMainBody"]</xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="GR_JellyfishBody"]//*[def="GR_JellyfishMainBody"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- Quadruped With Beak -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="GR_QuadrupedAnimalWithBeak"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Leg" or
+			customLabel="rear left paw" or
+			customLabel="rear right paw"
+			] </xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="GR_QuadrupedAnimalWithBeak"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Head" or
+			def="Beak" or
+			def="Leg" or
+			def="Paw"
+			]/groups </xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- Quadruped With Beak and Hump -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="GR_QuadrupedAnimalWithBeakandHump"]//*[
+			def="Body" or
+			def="Neck" or
+			customLabel="rear left leg" or
+			customLabel="rear right leg" or
+			def="Hoof"
+			] </xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="GR_QuadrupedAnimalWithBeakandHump"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Head" or
+			def="Beak" or
+			def="Leg" or
+			def="Hoof"
+			]/groups </xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- Quadruped With Paws and Fangs -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="GR_QuadrupedAnimalWithPawsAndFangs"]//*[
+			def="Body" or
+			def="Neck" or
+			customLabel="rear left paw" or
+			customLabel="rear right paw"
+			] </xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="GR_QuadrupedAnimalWithPawsAndFangs"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Head" or
+			def="AnimalJaw" or
+			def="Leg" or
+			def="Paw"
+			]/groups </xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- Quadruped With Paws, Horn, and Tail -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="GR_QuadrupedAnimalWithPawsHornAndTail"]//*[
+			def="Body" or
+			def="Neck" or
+			customLabel="rear left leg" or
+			customLabel="rear right leg" or
+			customLabel="rear left hoof" or
+			customLabel="rear right hoof" or
+			def="Tail"
+			] </xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="GR_QuadrupedAnimalWithPawsHornAndTail"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Head" or
+			def="AnimalJaw" or
+			def="Leg" or
+			def="Paw" or
+			def="Hoof" or
+			def="Tail"
+			]/groups </xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- Quadruped With Paws, Horn, and Tail - Thrumbo -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="GR_QuadrupedAnimalWithPawsHornAndTailThrumbo"]//*[
+			def="Body" or
+			def="Neck" or
+			customLabel="rear left leg" or
+			customLabel="rear right leg" or
+			customLabel="rear left paw" or
+			customLabel="rear right paw" or
+			def="Hoof"
+			] </xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="GR_QuadrupedAnimalWithPawsHornAndTailThrumbo"]//*[
+			def="Body" or
+			def="Neck" or
+			def="Head" or
+			def="AnimalJaw" or
+			def="Leg" or
+			def="Horn" or
+			def="Paw"
+			]/groups </xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- Great Ape -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="GR_GreatApe"]//*[
+			def="Torso" or
+			def="Neck" or
+			def="Shoulder" or
+			def="Arm" or
+			def="Hand" or
+			def="Leg" or
+			def="Foot" or
+			def="Toe"
+			] </xpath>
+		<value>
+			<groups/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="GR_GreatApe"]//*[
+			def="Torso" or
+			def="Neck" or
+			def="Head" or
+			def="AnimalJaw" or
+			def="Shoulder" or
+			def="Arm" or
+			def="Hand" or
+			def="Finger" or
+			def="Leg" or
+			def="Foot" or
+			def="Toe"
+			]/groups </xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/HediffDefs/Hediffs_Local_Implants_Animals.xml b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/HediffDefs/Hediffs_Local_Implants_Animals.xml
new file mode 100644
index 0000000000..dc2baea331
--- /dev/null
+++ b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/HediffDefs/Hediffs_Local_Implants_Animals.xml	
@@ -0,0 +1,802 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- =============== Legs ==================== -->
+
+	<!-- ========= Bear Leg ============ -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_BearLeg"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>animal Implant: bear leg</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.75</cooldownTime>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_BearLeg"]/stages/li[1]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.035</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_BearLeg"]/stages/li[1]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.035</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_BearLeg"]/stages/li[2]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.050</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_BearLeg"]/stages/li[2]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.050</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_BearLeg"]/stages/li[3]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.070</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_BearLeg"]/stages/li[3]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.070</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_BearLeg"]/stages/li[4]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.085</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_BearLeg"]/stages/li[4]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.085</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_BearLeg"]/stages/li[5]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_BearLeg"]/stages/li[5]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_BearLeg"]/stages/li[6]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.125</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_BearLeg"]/stages/li[6]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.125</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_BearLeg"]/stages/li[7]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_BearLeg"]/stages/li[7]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ========= lizard Leg ============ -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_LizardLeg"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>animal Implant: lizard leg</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.7</cooldownTime>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_LizardLeg"]/stages/li[1]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.035</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_LizardLeg"]/stages/li[1]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.035</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_LizardLeg"]/stages/li[2]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.050</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_LizardLeg"]/stages/li[2]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.050</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_LizardLeg"]/stages/li[3]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.070</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_LizardLeg"]/stages/li[3]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.070</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_LizardLeg"]/stages/li[4]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.085</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_LizardLeg"]/stages/li[4]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.085</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_LizardLeg"]/stages/li[5]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_LizardLeg"]/stages/li[5]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_LizardLeg"]/stages/li[6]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_LizardLeg"]/stages/li[6]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_LizardLeg"]/stages/li[7]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_LizardLeg"]/stages/li[7]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ========= Thrumbo Leg ============ -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_ThrumboLeg"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>animal Implant: thrumbo leg</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>34</power>
+					<cooldownTime>1.85</cooldownTime>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_ThrumboLeg"]/stages/li[1]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.035</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_ThrumboLeg"]/stages/li[1]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.035</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_ThrumboLeg"]/stages/li[2]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.050</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_ThrumboLeg"]/stages/li[2]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.050</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_LizardLeg"]/stages/li[3]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.085</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_ThrumboLeg"]/stages/li[3]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.085</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_ThrumboLeg"]/stages/li[4]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_LizardLeg"]/stages/li[4]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_ThrumboLeg"]/stages/li[5]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_ThrumboLeg"]/stages/li[5]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.20</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_ThrumboLeg"]/stages/li[6]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.30</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_ThrumboLeg"]/stages/li[6]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.30</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_LizardLeg"]/stages/li[7]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.40</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_ThrumboLeg"]/stages/li[7]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.40</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- =============== Tails ==================== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_CatTail"]/stages/li[1]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.035</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_CatTail"]/stages/li[1]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.035</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_CatTail"]/stages/li[2]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.050</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_CatTail"]/stages/li[2]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.050</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_CatTail"]/stages/li[3]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.070</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_CatTail"]/stages/li[3]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.070</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_CatTail"]/stages/li[4]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.085</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_CatTail"]/stages/li[4]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.085</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_CatTail"]/stages/li[5]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_CatTail"]/stages/li[5]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_CatTail"]/stages/li[6]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.125</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_CatTail"]/stages/li[6]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.125</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_CatTail"]/stages/li[7]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_CatTail"]/stages/li[7]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ========= Scyther Tail ============ -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_ScytherTail"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>animal Implant: scyther tail</label>
+					<capacities>
+						<li>Cut</li>
+						<li>Stab</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>1.75</cooldownTime>
+					<armorPenetrationSharp>2</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_ScytherTail"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_ScytherTail"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ========= Mechanoid Tail ============ -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_MechaTail"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>animal Implant: mechanoid tail</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>45</power>
+					<cooldownTime>1.85</cooldownTime>
+					<armorPenetrationSharp>4</armorPenetrationSharp>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_MechaTail"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_MechaTail"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- =============== Eyes ==================== -->
+
+	<!-- ========= Insectile Eye ============ -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_InsectileEye"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_InsectileEye"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.05</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ========= ThrumboEye ============ -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_ThrumboEye"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_ThrumboEye"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- =============== Ears ==================== -->
+
+	<!-- ========= Moth Ear ============ -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_MothTympanalOrgan"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_MothTympanalOrgan"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ========= Mechanoid Ear ============ -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_MechaReceptors"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_MechaReceptors"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- =============== Noses ==================== -->
+
+	<!-- ========= Insect Pheromones ============ -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_InsectoidPheromones"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_InsectoidPheromones"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ========= Miniature Thrombo Horn ============ -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_MiniatureThrumboHorn"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>animal Implant: miniature thrumbo horn (tier 3)</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Stab</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.65</cooldownTime>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_MiniatureThrumboHorn"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_MiniatureThrumboHorn"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- =============== Jaws ==================== -->
+
+	<!-- ========= Insect Mandibles ============ -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_InsectMandibles"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>animal Implant: insect mandibles</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_InsectMandibles"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_InsectMandibles"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ========= Thrumbo Jaws ============ -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_ThrumboJaws"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>animal Implant: bionic thrumbo jaws</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>1.85</cooldownTime>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_ThrumboJaws"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_ThrumboJaws"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- =============== Spines ==================== -->
+
+	<!-- ========= Muffalo Spine ============ -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_MuffaloSpine"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_MuffaloSpine"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ========= Crocodile Spine ============ -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_CrocodileSpine"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_CrocodileSpine"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ========= Mecha Spine ============ -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_MechaSpine"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_MechaSpine"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- =============== Hearts ==================== -->
+
+	<!-- ========= Chitinous Heart ============ -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_ChitinousHeart"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_ChitinousHeart"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ========= Mecha Heart ============ -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_MechaHeart"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_MechaHeart"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/HediffDefs/Hediffs_Local_Implants_Humanoid.xml b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/HediffDefs/Hediffs_Local_Implants_Humanoid.xml
new file mode 100644
index 0000000000..8a24d6bb5f
--- /dev/null
+++ b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/HediffDefs/Hediffs_Local_Implants_Humanoid.xml	
@@ -0,0 +1,485 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- =============== Bear Claw ==================== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_BearClaws"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>bear claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>1.36</cooldownTime>
+					<armorPenetrationSharp>1.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- =============== Digging Bear Claw ==================== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_DiggingBearClaws"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>humanoid implant: digging bear claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.65</cooldownTime>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- =============== Muffalo Muscles ==================== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="GR_MuffaloMuscles"]/stages/li[1]/statOffsets</xpath>
+		<value>
+			<CarryWeight>1</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="GR_MuffaloMuscles"]/stages/li[2]/statOffsets</xpath>
+		<value>
+			<CarryWeight>5</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="GR_MuffaloMuscles"]/stages/li[3]/statOffsets</xpath>
+		<value>
+			<CarryWeight>10</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="GR_MuffaloMuscles"]/stages/li[4]/statOffsets</xpath>
+		<value>
+			<CarryWeight>15</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="GR_MuffaloMuscles"]/stages/li[5]/statOffsets</xpath>
+		<value>
+			<CarryWeight>20</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="GR_MuffaloMuscles"]/stages/li[6]/statOffsets</xpath>
+		<value>
+			<CarryWeight>25</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="GR_MuffaloMuscles"]/stages/li[7]/statOffsets</xpath>
+		<value>
+			<CarryWeight>35</CarryWeight>
+		</value>
+	</Operation>
+
+	<!-- =============== Muffalo Skin ==================== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_MuffaloSkin"]/stages/li[1]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.035</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_MuffaloSkin"]/stages/li[1]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.035</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_MuffaloSkin"]/stages/li[2]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.050</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_MuffaloSkin"]/stages/li[2]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.050</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_MuffaloSkin"]/stages/li[3]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.070</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_MuffaloSkin"]/stages/li[3]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.070</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_MuffaloSkin"]/stages/li[4]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.085</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_MuffaloSkin"]/stages/li[4]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.085</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_MuffaloSkin"]/stages/li[5]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_MuffaloSkin"]/stages/li[5]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_MuffaloSkin"]/stages/li[6]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.125</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_MuffaloSkin"]/stages/li[6]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.125</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_MuffaloSkin"]/stages/li[7]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_MuffaloSkin"]/stages/li[7]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- =============== Cat Eye ==================== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="GR_CatEye"]/stages/li[1]/statOffsets</xpath>
+		<value>
+			<NightVisionEfficiency_Implant>0.05</NightVisionEfficiency_Implant>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="GR_CatEye"]/stages/li[2]/statOffsets</xpath>
+		<value>
+			<NightVisionEfficiency_Implant>0.10</NightVisionEfficiency_Implant>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="GR_CatEye"]/stages/li[3]/statOffsets</xpath>
+		<value>
+			<NightVisionEfficiency_Implant>0.15</NightVisionEfficiency_Implant>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="GR_CatEye"]/stages/li[4]/statOffsets</xpath>
+		<value>
+			<NightVisionEfficiency_Implant>0.20</NightVisionEfficiency_Implant>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="GR_CatEye"]/stages/li[5]/statOffsets</xpath>
+		<value>
+			<NightVisionEfficiency_Implant>0.25</NightVisionEfficiency_Implant>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="GR_CatEye"]/stages/li[6]/statOffsets</xpath>
+		<value>
+			<NightVisionEfficiency_Implant>0.30</NightVisionEfficiency_Implant>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="GR_CatEye"]/stages/li[7]/statOffsets</xpath>
+		<value>
+			<NightVisionEfficiency_Implant>0.40</NightVisionEfficiency_Implant>
+		</value>
+	</Operation>
+
+	<!-- =============== Thrumbo Horn ==================== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_HumanThrumboHorn"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>humanoid implant: thrumbo horn</label>
+					<capacities>
+						<li>Cut</li>
+						<li>Stab</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- =============== Thrumbo Skin ==================== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_ThrumboSkin"]/stages/li[1]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.50</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_ThrumboSkin"]/stages/li[1]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.50</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_ThrumboSkin"]/stages/li[2]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_ThrumboSkin"]/stages/li[2]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.75</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_ThrumboSkin"]/stages/li[3]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_ThrumboSkin"]/stages/li[3]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_ThrumboSkin"]/stages/li[4]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_ThrumboSkin"]/stages/li[4]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_ThrumboSkin"]/stages/li[5]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_ThrumboSkin"]/stages/li[5]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_ThrumboSkin"]/stages/li[6]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.75</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_ThrumboSkin"]/stages/li[6]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.75</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_ThrumboSkin"]/stages/li[7]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_ThrumboSkin"]/stages/li[7]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- =============== Venomous Fangs ==================== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_VenomousFangs"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>humanoid implant: venomous fangs</label>
+					<capacities>
+						<li>GR_VeryToxicBite</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.75</cooldownTime>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- =============== Iguana Scales ==================== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_IguanaScales"]/stages/li[1]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.035</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_IguanaScales"]/stages/li[1]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.035</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_IguanaScales"]/stages/li[2]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.050</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_IguanaScales"]/stages/li[2]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.050</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_IguanaScales"]/stages/li[3]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.070</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_IguanaScales"]/stages/li[3]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.070</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_IguanaScales"]/stages/li[4]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.085</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_IguanaScales"]/stages/li[4]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.085</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_IguanaScales"]/stages/li[5]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_IguanaScales"]/stages/li[5]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_IguanaScales"]/stages/li[6]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.125</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_IguanaScales"]/stages/li[6]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.125</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_IguanaScales"]/stages/li[7]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GR_IguanaScales"]/stages/li[7]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Items_Resources.xml b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Items_Resources.xml
new file mode 100644
index 0000000000..4601bc1959
--- /dev/null
+++ b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Items_Resources.xml	
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Compressed Chemfuel -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_CompressedChemfuel"]/statBases</xpath>
+		<value>
+			<Bulk>0.05</Bulk>
+		</value>
+	</Operation>
+
+	<!-- Thick Hybrid Wool -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_ThickHybridWool"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.015</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_ThickHybridWool"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.065</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_ThickHybridWool"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.055</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<!-- Luxriant Hybrid Wool -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_LuxuriantHybridWool"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.0185</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_LuxuriantHybridWool"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.12</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_LuxuriantHybridWool"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.06</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<!-- Hybrid Silk -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_HybridSilk"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.4</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_HybridSilk"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.08</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_HybridSilk"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.03</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_HybridSilk"]/stuffProps/categories</xpath>
+		<value>
+			<li>SoftArmor</li>
+		</value>
+	</Operation>
+
+	<!-- Hybrid Chitin -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_HybridChitin"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.5</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_HybridChitin"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.05</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_HybridChitin"]/stuffProps</xpath>
+		<value>
+			<categories>
+				<li>SoftArmor</li>
+			</categories>
+		</value>
+	</Operation>
+
+	<!-- Hybrid Scales -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_HybridScales"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.01</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Mods/AlphaAnimals_Items_Resource_Stuff.xml.xml b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Mods/AlphaAnimals_Items_Resource_Stuff.xml.xml
new file mode 100644
index 0000000000..15b43898d8
--- /dev/null
+++ b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Mods/AlphaAnimals_Items_Resource_Stuff.xml.xml	
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Alpha Animals</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!--Boomthread -->
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Boomthread"]/statBases/StuffPower_Armor_Sharp</xpath>
+					<value>
+						<StuffPower_Armor_Sharp>0.16</StuffPower_Armor_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Boomthread"]/statBases/StuffPower_Armor_Blunt</xpath>
+					<value>
+						<StuffPower_Armor_Blunt>0.14</StuffPower_Armor_Blunt>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Mods/AlphaAnimals_Patch_Projectiles.xml b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Mods/AlphaAnimals_Patch_Projectiles.xml
new file mode 100644
index 0000000000..7286fc3e22
--- /dev/null
+++ b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Mods/AlphaAnimals_Patch_Projectiles.xml	
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Alpha Animals</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!-- ============== Changing Projectile's thingClass to CE ones ================ -->
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[
+						defName="AA_Bullet_TinyVenomBarb" or
+						defName="AA_HugeQuill" or
+						defName="AA_ExplodingWeb"
+						] </xpath>
+					<value>
+						<thingClass>CombatExtended.BulletCE</thingClass>
+					</value>
+				</li>
+
+				<!-- ============== Adding 'Standard' AimingAccuracy node to creatures' that use ranged attack statBases. =============== -->
+
+				<!-- =============== Now defining Projectiles in CE Procedure ============= -->
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_Bullet_TinyVenomBarb"]/projectile</xpath>
+					<value>
+						<projectile Class="CombatExtended.ProjectilePropertiesCE">
+							<flyOverhead>false</flyOverhead>
+							<damageDef>AA_ToxicSting</damageDef>
+							<damageAmountBase>2</damageAmountBase>
+							<speed>20</speed>
+							<armorPenetrationSharp>0.5</armorPenetrationSharp>
+							<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+						</projectile>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_HugeQuill"]/projectile</xpath>
+					<value>
+						<projectile Class="CombatExtended.ProjectilePropertiesCE">
+							<flyOverhead>false</flyOverhead>
+							<damageDef>AA_ToxicSting</damageDef>
+							<damageAmountBase>36</damageAmountBase>
+							<speed>16</speed>
+							<armorPenetrationSharp>5</armorPenetrationSharp>
+							<armorPenetrationBlunt>21.8</armorPenetrationBlunt>
+						</projectile>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_ExplodingWeb"]/projectile</xpath>
+					<value>
+						<projectile Class="CombatExtended.ProjectilePropertiesCE">
+							<flyOverhead>false</flyOverhead>
+							<damageDef>Bomb</damageDef>
+							<damageAmountBase>12.5</damageAmountBase>
+							<explosionRadius>0.9</explosionRadius>
+							<suppressionFactor>3.0</suppressionFactor>
+							<dangerFactor>2.0</dangerFactor>
+							<speed>12</speed>
+							<secondaryDamage>
+								<li>
+									<def>Stun</def>
+									<amount>6</amount>
+								</li>
+							</secondaryDamage>
+						</projectile>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Mods/AlphaAnimals_Patch_VerbShoot.xml b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Mods/AlphaAnimals_Patch_VerbShoot.xml
new file mode 100644
index 0000000000..f3a8f5a7d7
--- /dev/null
+++ b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Mods/AlphaAnimals_Patch_VerbShoot.xml	
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Alpha Animals</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Nighthrumbo"]/verbs</xpath>
+					<value>
+						<verbs>
+							<li Class="CombatExtended.VerbPropertiesCE">
+								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+								<hasStandardCommand>true</hasStandardCommand>
+								<defaultProjectile>AA_HugeQuill</defaultProjectile>
+								<warmupTime>2.4</warmupTime>
+								<burstShotCount>1</burstShotCount>
+								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+								<minRange>2</minRange>
+								<range>20</range>
+								<soundCast>AA_DartSound</soundCast>
+								<muzzleFlashScale>0</muzzleFlashScale>
+								<commonality>0.8</commonality>
+							</li>
+						</verbs>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Boomalisk"]/verbs</xpath>
+					<value>
+						<verbs>
+							<li Class="CombatExtended.VerbPropertiesCE">
+								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+								<hasStandardCommand>true</hasStandardCommand>
+								<defaultProjectile>AA_ExplodingWeb</defaultProjectile>
+								<warmupTime>2.5</warmupTime>
+								<burstShotCount>3</burstShotCount>
+								<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+								<minRange>1</minRange>
+								<range>16</range>
+								<soundCast>AA_Throw</soundCast>
+								<muzzleFlashScale>0</muzzleFlashScale>
+								<commonality>0.8</commonality>
+							</li>
+						</verbs>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Needlechicken"]/verbs</xpath>
+					<value>
+						<verbs>
+							<li Class="CombatExtended.VerbPropertiesCE">
+								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+								<hasStandardCommand>true</hasStandardCommand>
+								<defaultProjectile>AA_Bullet_TinyVenomBarb</defaultProjectile>
+								<warmupTime>1.8</warmupTime>
+								<burstShotCount>12</burstShotCount>
+								<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+								<minRange>2</minRange>
+								<range>14</range>
+								<soundCast>AA_DartSound</soundCast>
+								<muzzleFlashScale>0</muzzleFlashScale>
+								<commonality>0.99</commonality>
+							</li>
+						</verbs>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Mods/CosmicHorror_Items_Resource_Stuff.xml b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Mods/CosmicHorror_Items_Resource_Stuff.xml
new file mode 100644
index 0000000000..d37851280b
--- /dev/null
+++ b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Mods/CosmicHorror_Items_Resource_Stuff.xml	
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Call of Cthulhu - Cosmic Horrors</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!--GR_EldritchWool -->
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_EldritchWool"]/statBases/StuffPower_Armor_Sharp</xpath>
+					<value>
+						<StuffPower_Armor_Sharp>0.12</StuffPower_Armor_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_EldritchWool"]/statBases/StuffPower_Armor_Blunt</xpath>
+					<value>
+						<StuffPower_Armor_Blunt>0.05</StuffPower_Armor_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_EldritchWool"]/statBases/StuffPower_Armor_Heat</xpath>
+					<value>
+						<StuffPower_Armor_Heat>0.15</StuffPower_Armor_Heat>
+					</value>
+				</li>
+
+				<!--Shiftskin -->
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Shiftskin"]/statBases/StuffPower_Armor_Sharp</xpath>
+					<value>
+						<StuffPower_Armor_Sharp>0.18</StuffPower_Armor_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Shiftskin"]/statBases/StuffPower_Armor_Blunt</xpath>
+					<value>
+						<StuffPower_Armor_Blunt>0.08</StuffPower_Armor_Blunt>
+					</value>
+				</li>
+
+				<!--Wood -->
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_DarkYoungWoodLog"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>3</power>
+								<cooldownTime>1.28</cooldownTime>
+								<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_DarkYoungWoodLog"]</xpath>
+					<value>
+						<equippedStatOffsets>
+							<MeleeCritChance>0.2</MeleeCritChance>
+							<MeleeParryChance>1</MeleeParryChance>
+							<MeleeDodgeChance>0.13</MeleeDodgeChance>
+						</equippedStatOffsets>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_DarkYoungWoodLog"]/statBases</xpath>
+					<value>
+						<Bulk>0.07</Bulk>
+						<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
+						<StuffPower_Armor_Sharp>0.25</StuffPower_Armor_Sharp>
+						<StuffPower_Armor_Blunt>0.375</StuffPower_Armor_Blunt>
+						<StuffPower_Armor_Heat>0.025</StuffPower_Armor_Heat>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_DarkYoungWoodLog"]/statBases/SharpDamageMultiplier</xpath>
+					<value>
+						<SharpDamageMultiplier>0.75</SharpDamageMultiplier>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_DarkYoungWoodLog"]/statBases/BluntDamageMultiplier</xpath>
+					<value>
+						<BluntDamageMultiplier>0.7</BluntDamageMultiplier>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_DarkYoungWoodLog"]/stuffProps/statFactors</xpath>
+					<value>
+						<Mass>0.25</Mass>
+						<MeleePenetrationFactor>0.48</MeleePenetrationFactor>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Mods/Dinosauria_Items_Resource_Stuff.xml b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Mods/Dinosauria_Items_Resource_Stuff.xml
new file mode 100644
index 0000000000..71a9c028e1
--- /dev/null
+++ b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Mods/Dinosauria_Items_Resource_Stuff.xml	
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Dinosauria</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!--DinoFeatherWool -->
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_DinoFeatherWool"]/statBases/StuffPower_Armor_Blunt</xpath>
+					<value>
+						<StuffPower_Armor_Blunt>0.24</StuffPower_Armor_Blunt>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Mods/Races_Animal_AlphaHybridCE.xml b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Mods/Races_Animal_AlphaHybridCE.xml
new file mode 100644
index 0000000000..83b3933549
--- /dev/null
+++ b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Mods/Races_Animal_AlphaHybridCE.xml	
@@ -0,0 +1,651 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Alpha Animals</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="GR_BearBug"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Quadruped</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_BearBug"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.09</MeleeDodgeChance>
+						<MeleeCritChance>0.4</MeleeCritChance>
+						<MeleeParryChance>0.2</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_BearBug"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
+					</value>
+				</li>
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_BearBug"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>0.4</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_BearBug"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>mandibles</label>
+								<capacities>
+									<li>AA_ParalysingBite</li>
+								</capacities>
+								<power>28</power>
+								<cooldownTime>1.85</cooldownTime>
+								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+								<armorPenetrationSharp>1</armorPenetrationSharp>
+								<armorPenetrationBlunt>4</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>10</power>
+								<cooldownTime>1.65</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+								<armorPenetrationBlunt>6</armorPenetrationBlunt>
+								<chanceFactor>0.1</chanceFactor>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<!-- Boomspider -->
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="GR_Boomalisk"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>QuadrupedLow</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_Boomalisk"]/statBases</xpath>
+					<value>
+						<AimingAccuracy>0.65</AimingAccuracy>
+						<ShootingAccuracyPawn>0.65</ShootingAccuracyPawn>
+						<MeleeDodgeChance>0.13</MeleeDodgeChance>
+						<MeleeCritChance>0.18</MeleeCritChance>
+						<MeleeParryChance>0.2</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Boomalisk"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>1</ArmorRating_Blunt>
+					</value>
+				</li>
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Boomalisk"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>1</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Boomalisk"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>left first leg</label>
+								<capacities>
+									<li>Scratch</li>
+								</capacities>
+								<power>14</power>
+								<cooldownTime>1.25</cooldownTime>
+								<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationSharp>0.4</armorPenetrationSharp>
+								<armorPenetrationBlunt>3</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>right first leg</label>
+								<capacities>
+									<li>Scratch</li>
+								</capacities>
+								<power>14</power>
+								<cooldownTime>1.25</cooldownTime>
+								<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationSharp>0.4</armorPenetrationSharp>
+								<armorPenetrationBlunt>3</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<capacities>
+									<li>AA_ToxicSting</li>
+								</capacities>
+								<power>23</power>
+								<cooldownTime>1.65</cooldownTime>
+								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>20</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>3</armorPenetrationSharp>
+								<armorPenetrationBlunt>6</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>9</power>
+								<cooldownTime>1.65</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>1</armorPenetrationBlunt>
+								<chanceFactor>0.2</chanceFactor>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<!-- Chicken Cactus -->
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="GR_Needlechicken"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Birdlike</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_Needlechicken"]/statBases</xpath>
+					<value>
+						<AimingAccuracy>0.3</AimingAccuracy>
+						<ShootingAccuracyPawn>0.3</ShootingAccuracyPawn>
+						<MeleeDodgeChance>0.09</MeleeDodgeChance>
+						<MeleeCritChance>0.03</MeleeCritChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Needlechicken"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>stings</label>
+								<capacities>
+									<li>AA_ToxicSting</li>
+								</capacities>
+								<power>7</power>
+								<cooldownTime>1.2</cooldownTime>
+								<armorPenetrationSharp>0.35</armorPenetrationSharp>
+								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>1</power>
+								<cooldownTime>1</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>Bite</label>
+								<capacities>
+									<li>Bite</li>
+								</capacities>
+								<power>3</power>
+								<cooldownTime>1</cooldownTime>
+								<linkedBodyPartsGroup>AA_Mouth</linkedBodyPartsGroup>
+								<armorPenetrationSharp>0.12</armorPenetrationSharp>
+								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="GR_Beetlefleet"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Birdlike</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_Beetlefleet"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.12</MeleeDodgeChance>
+						<MeleeCritChance>0.24</MeleeCritChance>
+						<MeleeParryChance>0.2</MeleeParryChance>
+						<ArmorRating_Sharp>0.8</ArmorRating_Sharp>
+						<ArmorRating_Blunt>1.2</ArmorRating_Blunt>
+					</value>
+				</li>
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Beetlefleet"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<capacities>
+									<li>Bite</li>
+								</capacities>
+								<power>21</power>
+								<cooldownTime>2.56</cooldownTime>
+								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+								<armorPenetrationSharp>1</armorPenetrationSharp>
+								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>tentacles</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>16</power>
+								<cooldownTime>1.35</cooldownTime>
+								<linkedBodyPartsGroup>Arms</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>6</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="GR_Groundffalo"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Quadruped</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_Groundffalo"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.08</MeleeDodgeChance>
+						<MeleeCritChance>0.4</MeleeCritChance>
+						<MeleeParryChance>0.4</MeleeParryChance>
+					</value>
+				</li>
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Groundffalo"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>left claw</label>
+								<capacities>
+									<li>Scratch</li>
+								</capacities>
+								<power>22</power>
+								<cooldownTime>2.45</cooldownTime>
+								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>21</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>8</armorPenetrationSharp>
+								<armorPenetrationBlunt>15</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>right claw</label>
+								<capacities>
+									<li>Scratch</li>
+								</capacities>
+								<power>22</power>
+								<cooldownTime>2.45</cooldownTime>
+								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>21</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>8</armorPenetrationSharp>
+								<armorPenetrationBlunt>15</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>horn</label>
+								<capacities>
+									<li>Scratch</li>
+									<li>Stab</li>
+								</capacities>
+								<power>25</power>
+								<cooldownTime>2.85</cooldownTime>
+								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationSharp>2.5</armorPenetrationSharp>
+								<armorPenetrationBlunt>10</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>20</power>
+								<cooldownTime>3.17</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>10</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<!-- Birdlizard -->
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="GR_MeadowLizard"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Birdlike</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_MeadowLizard"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.5</MeleeDodgeChance>
+						<MeleeCritChance>0.2</MeleeCritChance>
+						<MeleeParryChance>0.1</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_MeadowLizard"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>claws</label>
+								<capacities>
+									<li>Scratch</li>
+								</capacities>
+								<power>16</power>
+								<cooldownTime>1.33</cooldownTime>
+								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>15</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>0.33</armorPenetrationSharp>
+								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<capacities>
+									<li>AA_ToxicSting</li>
+								</capacities>
+								<power>21</power>
+								<cooldownTime>1.65</cooldownTime>
+								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>13</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>1.5</armorPenetrationSharp>
+								<armorPenetrationBlunt>4</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>7</power>
+								<cooldownTime>1.78</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>1</armorPenetrationBlunt>
+								<chanceFactor>0.2</chanceFactor>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="GR_AnimusHare"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>QuadrupedLow</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_AnimusHare"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.48</MeleeDodgeChance>
+						<MeleeCritChance>0.1</MeleeCritChance>
+					</value>
+				</li>
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_AnimusHare"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>2</power>
+								<cooldownTime>1.65</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<capacities>
+									<li>Bite</li>
+								</capacities>
+								<power>4</power>
+								<cooldownTime>1.65</cooldownTime>
+								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="GR_Nighthrumbo"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>QuadrupedLow</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_Nighthrumbo"]/statBases</xpath>
+					<value>
+						<AimingAccuracy>0.9</AimingAccuracy>
+						<ShootingAccuracyPawn>0.9</ShootingAccuracyPawn>
+						<MeleeDodgeChance>0.25</MeleeDodgeChance>
+						<MeleeCritChance>0.7</MeleeCritChance>
+						<MeleeParryChance>0.45</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Nighthrumbo"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>6</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Nighthrumbo"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>10</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Nighthrumbo"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>horn</label>
+								<capacities>
+									<li>Cut</li>
+									<li>Stab</li>
+								</capacities>
+								<power>46</power>
+								<cooldownTime>2.0</cooldownTime>
+								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationSharp>8</armorPenetrationSharp>
+								<armorPenetrationBlunt>10</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<capacities>
+									<li>ToxicBite</li>
+								</capacities>
+								<power>36</power>
+								<cooldownTime>1.75</cooldownTime>
+								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>25</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>3</armorPenetrationSharp>
+								<armorPenetrationBlunt>9</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>18</power>
+								<cooldownTime>2</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>12</armorPenetrationBlunt>
+								<chanceFactor>0.2</chanceFactor>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="GR_WolfShrimp"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Quadruped</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_WolfShrimp"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>1</MeleeDodgeChance>
+						<MeleeCritChance>0.21</MeleeCritChance>
+						<MeleeParryChance>0.33</MeleeParryChance>
+						<ArmorRating_Blunt>2</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_WolfShrimp"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>3</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_WolfShrimp"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>left claw</label>
+								<capacities>
+									<li>AA_Pierce</li>
+								</capacities>
+								<power>26</power>
+								<cooldownTime>1.12</cooldownTime>
+								<linkedBodyPartsGroup>AA_BladeAttackTool</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>20</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>7</armorPenetrationSharp>
+								<armorPenetrationBlunt>7</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>right claw</label>
+								<capacities>
+									<li>AA_Pierce</li>
+								</capacities>
+								<power>26</power>
+								<cooldownTime>1.12</cooldownTime>
+								<linkedBodyPartsGroup>AA_BladeAttackTool</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>20</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>7</armorPenetrationSharp>
+								<armorPenetrationBlunt>7</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<capacities>
+									<li>Bite</li>
+								</capacities>
+								<power>24</power>
+								<cooldownTime>1.65</cooldownTime>
+								<linkedBodyPartsGroup>AA_Mouth</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>20</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>2.5</armorPenetrationSharp>
+								<armorPenetrationBlunt>7</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Mods/Races_Animal_Dino_HybridCE.xml b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Mods/Races_Animal_Dino_HybridCE.xml
new file mode 100644
index 0000000000..d391fd5148
--- /dev/null
+++ b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Mods/Races_Animal_Dino_HybridCE.xml	
@@ -0,0 +1,557 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Dinosauria</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="GR_Spinobear"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Quadruped</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_Spinobear"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.09</MeleeDodgeChance>
+						<MeleeCritChance>0.42</MeleeCritChance>
+						<MeleeParryChance>0.2</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Spinobear"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>left leg</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>21</power>
+								<cooldownTime>1.55</cooldownTime>
+								<linkedBodyPartsGroup>LeftLeg</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>22</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>right leg</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>21</power>
+								<cooldownTime>1.55</cooldownTime>
+								<linkedBodyPartsGroup>RightLeg</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>22</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>teeth</label>
+								<capacities>
+									<li>Bite</li>
+								</capacities>
+								<power>43</power>
+								<cooldownTime>1.72</cooldownTime>
+								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+								<armorPenetrationSharp>2.5</armorPenetrationSharp>
+								<armorPenetrationBlunt>6</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>8</power>
+								<cooldownTime>2.48</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+								<armorPenetrationBlunt>6</armorPenetrationBlunt>
+								<chanceFactor>0.1</chanceFactor>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<!-- Boomspider -->
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="GR_Parasaurolope"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Quadruped</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_Parasaurolope"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.2</MeleeDodgeChance>
+						<MeleeCritChance>0.37</MeleeCritChance>
+						<MeleeParryChance>0.24</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Parasaurolope"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>24</power>
+								<cooldownTime>3</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>12</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<!-- Chicken Cactus -->
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="GR_Chickennathus"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Birdlike</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_Chickennathus"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.8</MeleeDodgeChance>
+						<MeleeCritChance>0.07</MeleeCritChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Chickennathus"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>left claw</label>
+								<capacities>
+									<li>Scratch</li>
+									<li>Stab</li>
+								</capacities>
+								<power>9</power>
+								<cooldownTime>0.85</cooldownTime>
+								<linkedBodyPartsGroup>FootClawAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationSharp>0.25</armorPenetrationSharp>
+								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>right claw</label>
+								<capacities>
+									<li>Scratch</li>
+									<li>Stab</li>
+								</capacities>
+								<power>9</power>
+								<cooldownTime>0.85</cooldownTime>
+								<linkedBodyPartsGroup>FootClawAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationSharp>0.25</armorPenetrationSharp>
+								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>teeth</label>
+								<capacities>
+									<li>Bite</li>
+								</capacities>
+								<power>16</power>
+								<cooldownTime>1.56</cooldownTime>
+								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+								<armorPenetrationSharp>0.78</armorPenetrationSharp>
+								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="GR_Diplobeetle"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Birdlike</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_Diplobeetle"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.12</MeleeDodgeChance>
+						<MeleeCritChance>1</MeleeCritChance>
+						<MeleeParryChance>0.2</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Diplobeetle"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Diplobeetle"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Diplobeetle"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>left leg</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>38</power>
+								<cooldownTime>3.6</cooldownTime>
+								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>33</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>right leg</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>38</power>
+								<cooldownTime>3.6</cooldownTime>
+								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>33</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>tail</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>56</power>
+								<cooldownTime>5.1</cooldownTime>
+								<linkedBodyPartsGroup>TailAttackTool</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>20</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<chanceFactor>0.25</chanceFactor>
+								<armorPenetrationBlunt>56</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="GR_Triceraffalo"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Quadruped</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_Triceraffalo"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.08</MeleeDodgeChance>
+						<MeleeCritChance>0.4</MeleeCritChance>
+						<MeleeParryChance>0.4</MeleeParryChance>
+					</value>
+				</li>
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Triceraffalo"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>horn</label>
+								<capacities>
+									<li>Scratch</li>
+									<li>Stab</li>
+								</capacities>
+								<power>31</power>
+								<cooldownTime>2.48</cooldownTime>
+								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationSharp>4</armorPenetrationSharp>
+								<armorPenetrationBlunt>8</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>24</power>
+								<cooldownTime>3.17</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>10</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<!-- Birdlizard -->
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="GR_Raptortoise"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Birdlike</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_Raptortoise"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.5</MeleeDodgeChance>
+						<MeleeCritChance>0.23</MeleeCritChance>
+						<MeleeParryChance>0.1</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Raptortoise"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>left claw</label>
+								<capacities>
+									<li>Scratch</li>
+									<li>Stab</li>
+								</capacities>
+								<power>20</power>
+								<cooldownTime>1.12</cooldownTime>
+								<linkedBodyPartsGroup>FootClawAttackTool</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>10</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>0.48</armorPenetrationSharp>
+								<armorPenetrationBlunt>0.92</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>right claw</label>
+								<capacities>
+									<li>Scratch</li>
+									<li>Stab</li>
+								</capacities>
+								<power>20</power>
+								<cooldownTime>1.12</cooldownTime>
+								<linkedBodyPartsGroup>FootClawAttackTool</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>10</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>0.48</armorPenetrationSharp>
+								<armorPenetrationBlunt>0.92</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<capacities>
+									<li>GR_VeryToxicBite</li>
+								</capacities>
+								<power>28</power>
+								<cooldownTime>1.55</cooldownTime>
+								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>13</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>1.75</armorPenetrationSharp>
+								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>6</power>
+								<cooldownTime>1.78</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>2</armorPenetrationBlunt>
+								<chanceFactor>0.2</chanceFactor>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="GR_Stegothrumbo"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Quadruped</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_Stegothrumbo"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.48</MeleeDodgeChance>
+						<MeleeCritChance>0.64</MeleeCritChance>
+						<MeleeParryChance>0.4</MeleeParryChance>
+					</value>
+				</li>
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Stegothrumbo"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>tail</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>48</power>
+								<cooldownTime>3.2</cooldownTime>
+								<linkedBodyPartsGroup>TailAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>55</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>48</power>
+								<cooldownTime>2.88</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<chanceFactor>0.2</chanceFactor>
+								<armorPenetrationSharp>1</armorPenetrationSharp>
+								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Stab</li>
+								</capacities>
+								<power>36</power>
+								<cooldownTime>2.78</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<chanceFactor>0.2</chanceFactor>
+								<armorPenetrationSharp>4</armorPenetrationSharp>
+								<armorPenetrationBlunt>4</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="GR_Velociwolf"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Birdlike</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_Velociwolf"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.5</MeleeDodgeChance>
+						<MeleeCritChance>0.14</MeleeCritChance>
+						<MeleeParryChance>0.2</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Velociwolf"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>left claw</label>
+								<capacities>
+									<li>Scratch</li>
+									<li>Stab</li>
+								</capacities>
+								<power>14</power>
+								<cooldownTime>0.9</cooldownTime>
+								<linkedBodyPartsGroup>FootClawAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationSharp>0.56</armorPenetrationSharp>
+								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>right claw</label>
+								<capacities>
+									<li>Scratch</li>
+									<li>Stab</li>
+								</capacities>
+								<power>14</power>
+								<cooldownTime>0.9</cooldownTime>
+								<linkedBodyPartsGroup>FootClawAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationSharp>0.56</armorPenetrationSharp>
+								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<capacities>
+									<li>Bite</li>
+								</capacities>
+								<power>23</power>
+								<cooldownTime>1.5</cooldownTime>
+								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>20</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>2</armorPenetrationSharp>
+								<armorPenetrationBlunt>4</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>3</power>
+								<cooldownTime>2</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+								<chanceFactor>0.2</chanceFactor>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Mods/Races_Animal_HorrorHybrid.xml b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Mods/Races_Animal_HorrorHybrid.xml
new file mode 100644
index 0000000000..71199d923b
--- /dev/null
+++ b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Mods/Races_Animal_HorrorHybrid.xml	
@@ -0,0 +1,619 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Call of Cthulhu - Cosmic Horrors</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="GR_EldritchBear"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Quadruped</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_EldritchBear"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.15</MeleeDodgeChance>
+						<MeleeCritChance>0.51</MeleeCritChance>
+						<MeleeParryChance>0.25</MeleeParryChance>
+						<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
+						<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_EldritchBear"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>hooves</label>
+								<capacities>
+									<li>ROM_BluntMonstrous</li>
+								</capacities>
+								<power>17</power>
+								<cooldownTime>1.55</cooldownTime>
+								<linkedBodyPartsGroup>ROM_Hooves</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>15.6</armorPenetrationBlunt>
+								<chanceFactor>0.2</chanceFactor>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>tentacles</label>
+								<capacities>
+									<li>ROM_BluntMonstrous</li>
+								</capacities>
+								<power>21</power>
+								<cooldownTime>1.45</cooldownTime>
+								<linkedBodyPartsGroup>ROM_Tentacles</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>14.8</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>coiling tentacles</label>
+								<capacities>
+									<li>ROM_ConstrictMonstrous</li>
+								</capacities>
+								<power>16</power>
+								<cooldownTime>1.65</cooldownTime>
+								<linkedBodyPartsGroup>ROM_Tentacles</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>28.8</armorPenetrationBlunt>
+								<chanceFactor>0.5</chanceFactor>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>maw</label>
+								<capacities>
+									<li>ToxicBite</li>
+								</capacities>
+								<power>31</power>
+								<cooldownTime>1.75</cooldownTime>
+								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+								<armorPenetrationSharp>5</armorPenetrationSharp>
+								<armorPenetrationBlunt>12.6</armorPenetrationBlunt>
+								<chanceFactor>0.33</chanceFactor>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<!-- Boomspawn -->
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="GR_EldritchBoomalope"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Humanoid</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_EldritchBoomalope"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.13</MeleeDodgeChance>
+						<MeleeCritChance>0.27</MeleeCritChance>
+						<MeleeParryChance>0.24</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_EldritchBoomalope"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>amoebic tentacle</label>
+								<capacities>
+									<li>GR_VeryToxicBite</li>
+								</capacities>
+								<power>17</power>
+								<cooldownTime>1.02</cooldownTime>
+								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>10</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>3</armorPenetrationSharp>
+								<armorPenetrationBlunt>6</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>15</power>
+								<cooldownTime>1.45</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>8</armorPenetrationBlunt>
+								<chanceFactor>0.25</chanceFactor>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<!-- EldritchChickens -->
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="GR_EldritchChicken"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Birdlike</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_EldritchChicken"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.5</MeleeDodgeChance>
+						<MeleeCritChance>0.03</MeleeCritChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_EldritchChicken"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>overwhelming mind</label>
+								<capacities>
+									<li>ROM_Psychic</li>
+								</capacities>
+								<power>10</power>
+								<cooldownTime>0.55</cooldownTime>
+								<linkedBodyPartsGroup>ROM_Mind</linkedBodyPartsGroup>
+								<armorPenetrationSharp>100</armorPenetrationSharp>
+								<armorPenetrationBlunt>150</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>2</power>
+								<cooldownTime>1</cooldownTime>
+								<linkedBodyPartsGroup>ROM_Wings</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="GR_EldritchInsectoid"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>QuadrupedLow</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_EldritchInsectoid"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.1</MeleeDodgeChance>
+						<MeleeCritChance>0.18</MeleeCritChance>
+						<MeleeParryChance>0.2</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_EldritchInsectoid"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_EldritchInsectoid"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>1</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_EldritchInsectoid"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>overwhelming mind</label>
+								<capacities>
+									<li>ROM_Psychic</li>
+								</capacities>
+								<power>18</power>
+								<cooldownTime>1.18</cooldownTime>
+								<linkedBodyPartsGroup>ROM_Mind</linkedBodyPartsGroup>
+								<armorPenetrationSharp>200</armorPenetrationSharp>
+								<armorPenetrationBlunt>200</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>grasping tentacles</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>10</power>
+								<cooldownTime>1.36</cooldownTime>
+								<linkedBodyPartsGroup>ROM_Tentacles</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>4</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>mandibles</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>21</power>
+								<cooldownTime>1.48</cooldownTime>
+								<linkedBodyPartsGroup>ROM_Mind</linkedBodyPartsGroup>
+								<armorPenetrationSharp>0.9</armorPenetrationSharp>
+								<armorPenetrationBlunt>2</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="GR_EldritchMuffalo"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Quadruped</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_EldritchMuffalo"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.1</MeleeDodgeChance>
+						<MeleeCritChance>0.47</MeleeCritChance>
+						<MeleeParryChance>0.5</MeleeParryChance>
+					</value>
+				</li>
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_EldritchMuffalo"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>vampiric teeth</label>
+								<capacities>
+									<li>ROM_Exsanguination</li>
+								</capacities>
+								<power>28</power>
+								<cooldownTime>1.56</cooldownTime>
+								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>10</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>10</armorPenetrationSharp>
+								<armorPenetrationBlunt>4</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>18</power>
+								<cooldownTime>1.25</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationSharp>2.5</armorPenetrationSharp>
+								<armorPenetrationBlunt>5</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<!-- Eldritch Snake -->
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="GR_EldritchReptile"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Serpentine</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_EldritchReptile"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.5</MeleeDodgeChance>
+						<MeleeCritChance>0.04</MeleeCritChance>
+						<MeleeParryChance>0.1</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_EldritchReptile"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<capacities>
+									<li>ToxicBite</li>
+								</capacities>
+								<power>6</power>
+								<cooldownTime>0.25</cooldownTime>
+								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>7</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>0.25</armorPenetrationSharp>
+								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>2</power>
+								<cooldownTime>0.3</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+								<chanceFactor>0.1</chanceFactor>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<!-- Eldritch Thrumbo -->
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="GR_EldritchThrumbo"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Birdlike</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_EldritchThrumbo"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.25</MeleeDodgeChance>
+						<MeleeCritChance>0.84</MeleeCritChance>
+						<MeleeParryChance>0.45</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_EldritchThrumbo"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>14</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_EldritchThrumbo"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>22</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_EldritchThrumbo"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>rending claws</label>
+								<capacities>
+									<li>Cut</li>
+									<li>Stab</li>
+								</capacities>
+								<power>45</power>
+								<cooldownTime>1</cooldownTime>
+								<linkedBodyPartsGroup>ROM_RightClaws</linkedBodyPartsGroup>
+								<armorPenetrationSharp>14</armorPenetrationSharp>
+								<armorPenetrationBlunt>32</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>mandibles</label>
+								<capacities>
+									<li>Bite</li>
+									<li>Stab</li>
+								</capacities>
+								<power>40</power>
+								<cooldownTime>1.28</cooldownTime>
+								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+								<armorPenetrationSharp>24</armorPenetrationSharp>
+								<armorPenetrationBlunt>52</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>20</power>
+								<cooldownTime>2.78</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>20</armorPenetrationBlunt>
+								<chanceFactor>0.2</chanceFactor>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<!-- Eldritch Wolf -->
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="GR_EldritchWolf"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Quadruped</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_EldritchWolf"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>1</MeleeDodgeChance>
+						<MeleeCritChance>0.21</MeleeCritChance>
+						<MeleeParryChance>0.33</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_EldritchWolf"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>14</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_EldritchWolf"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>32</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_EldritchWolf"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>venomous fangs</label>
+								<capacities>
+									<li>ToxicBite</li>
+								</capacities>
+								<power>28</power>
+								<cooldownTime>1.25</cooldownTime>
+								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+								<armorPenetrationSharp>5</armorPenetrationSharp>
+								<armorPenetrationBlunt>10</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>claws</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>15</power>
+								<cooldownTime>0.75</cooldownTime>
+								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+								<armorPenetrationSharp>1.5</armorPenetrationSharp>
+								<armorPenetrationBlunt>3</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<!-- Eldritch Cat -->
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="GR_Cathulhu"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Quadruped</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_Cathulhu"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.36</MeleeDodgeChance>
+						<MeleeCritChance>0.30</MeleeCritChance>
+						<MeleeParryChance>0.07</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Cathulhu"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>4</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Cathulhu"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>7</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Cathulhu"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>left claw</label>
+								<capacities>
+									<li>Scratch</li>
+								</capacities>
+								<power>14</power>
+								<cooldownTime>0.92</cooldownTime>
+								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>20</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>0.07</armorPenetrationSharp>
+								<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>right claw</label>
+								<capacities>
+									<li>Scratch</li>
+								</capacities>
+								<power>14</power>
+								<cooldownTime>0.92</cooldownTime>
+								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>20</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>0.07</armorPenetrationSharp>
+								<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<capacities>
+									<li>Bite</li>
+								</capacities>
+								<power>12</power>
+								<cooldownTime>1.37</cooldownTime>
+								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>20</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>0.09</armorPenetrationSharp>
+								<armorPenetrationBlunt>1.690</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>2</power>
+								<cooldownTime>0.97</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<chanceFactor>0.2</chanceFactor>
+								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Mods/Races_Animal_MegaHybrid.xml b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Mods/Races_Animal_MegaHybrid.xml
new file mode 100644
index 0000000000..42802e61de
--- /dev/null
+++ b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Mods/Races_Animal_MegaHybrid.xml	
@@ -0,0 +1,825 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Megafauna</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!-- Rhinobear -->
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="GR_Elasmobearium"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Quadruped</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_Elasmobearium"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.12</MeleeDodgeChance>
+						<MeleeCritChance>0.84</MeleeCritChance>
+						<MeleeParryChance>0.2</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_Elasmobearium"]/statBases</xpath>
+					<value>
+						<ArmorRating_Blunt>4</ArmorRating_Blunt>
+					</value>
+				</li>
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_Elasmobearium"]/statBases</xpath>
+					<value>
+						<ArmorRating_Sharp>0.35</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Elasmobearium"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>left claw</label>
+								<capacities>
+									<li>Scratch</li>
+								</capacities>
+								<power>33</power>
+								<cooldownTime>2</cooldownTime>
+								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>14</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>2.25</armorPenetrationSharp>
+								<armorPenetrationBlunt>18</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>right claw</label>
+								<capacities>
+									<li>Scratch</li>
+								</capacities>
+								<power>33</power>
+								<cooldownTime>2</cooldownTime>
+								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>14</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>2.25</armorPenetrationSharp>
+								<armorPenetrationBlunt>18</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>Jaws</label>
+								<capacities>
+									<li>Bite</li>
+								</capacities>
+								<power>43</power>
+								<cooldownTime>2.48</cooldownTime>
+								<chanceFactor>0.5</chanceFactor>
+								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>14</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>6</armorPenetrationSharp>
+								<armorPenetrationBlunt>24</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>horn</label>
+								<capacities>
+									<li>Scratch</li>
+									<li>Stab</li>
+								</capacities>
+								<power>41</power>
+								<cooldownTime>2.48</cooldownTime>
+								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationSharp>6</armorPenetrationSharp>
+								<armorPenetrationBlunt>24</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<!-- Boomaphant -->
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="GR_Boomnotherium"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Quadruped</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_Boomnotherium"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.12</MeleeDodgeChance>
+						<MeleeCritChance>0.8</MeleeCritChance>
+						<MeleeParryChance>0.2</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_Boomnotherium"]/statBases</xpath>
+					<value>
+						<ArmorRating_Blunt>2</ArmorRating_Blunt>
+						<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Boomnotherium"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>left foot</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>31</power>
+								<cooldownTime>2</cooldownTime>
+								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>32</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>right foot</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>31</power>
+								<cooldownTime>2</cooldownTime>
+								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>32</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<chanceFactor>0.01</chanceFactor>
+								<power>40</power>
+								<cooldownTime>2</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>41</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>tusk</label>
+								<capacities>
+									<li>Scratch</li>
+									<li>Stab</li>
+									<li>Poke</li>
+								</capacities>
+								<power>41</power>
+								<cooldownTime>2.48</cooldownTime>
+								<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationSharp>6</armorPenetrationSharp>
+								<armorPenetrationBlunt>36</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<!-- Chickenlodon -->
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="GR_Chickenlodon"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Birdlike</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_Chickenlodon"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.47</MeleeDodgeChance>
+						<MeleeCritChance>0.4</MeleeCritChance>
+						<MeleeParryChance>0.1</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Chickenlodon"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>left claw</label>
+								<capacities>
+									<li>Scratch</li>
+								</capacities>
+								<power>20</power>
+								<cooldownTime>1.25</cooldownTime>
+								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>14</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>0.36</armorPenetrationSharp>
+								<armorPenetrationBlunt>1</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>right claw</label>
+								<capacities>
+									<li>Scratch</li>
+								</capacities>
+								<power>20</power>
+								<cooldownTime>1.25</cooldownTime>
+								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>14</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>0.36</armorPenetrationSharp>
+								<armorPenetrationBlunt>1</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>Beak</label>
+								<capacities>
+									<li>Bite</li>
+									<li>Stab</li>
+								</capacities>
+								<power>28</power>
+								<cooldownTime>1.65</cooldownTime>
+								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>14</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>3</armorPenetrationSharp>
+								<armorPenetrationBlunt>8</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<!-- Giant Mantis -->
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="GR_Mantistanis"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Birdlike</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_Mantistanis"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.33</MeleeDodgeChance>
+						<MeleeCritChance>0.33</MeleeCritChance>
+						<MeleeParryChance>0.33</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Mantistanis"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<capacities>
+									<li>Bite</li>
+								</capacities>
+								<power>34</power>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>15</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<cooldownTime>2.3</cooldownTime>
+								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+								<armorPenetrationSharp>3</armorPenetrationSharp>
+								<armorPenetrationBlunt>12</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>mantis blades</label>
+								<capacities>
+									<li>Cut</li>
+									<li>Scratch</li>
+								</capacities>
+								<power>37</power>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>15</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<cooldownTime>1.85</cooldownTime>
+								<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
+								<armorPenetrationSharp>1.5</armorPenetrationSharp>
+								<armorPenetrationBlunt>6</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>mantis blades</label>
+								<capacities>
+									<li>Cut</li>
+									<li>Scratch</li>
+								</capacities>
+								<power>37</power>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>15</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<cooldownTime>1.85</cooldownTime>
+								<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
+								<armorPenetrationSharp>1.5</armorPenetrationSharp>
+								<armorPenetrationBlunt>6</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>claws</label>
+								<capacities>
+									<li>Scratch</li>
+								</capacities>
+								<power>30</power>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>15</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<cooldownTime>2</cooldownTime>
+								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+								<armorPenetrationSharp>2</armorPenetrationSharp>
+								<armorPenetrationBlunt>8</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<!-- Paraceramuffalo-->
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="GR_Paraceramuffalo"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Birdlike</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_Paraceramuffalo"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.12</MeleeDodgeChance>
+						<MeleeCritChance>0.88</MeleeCritChance>
+						<MeleeParryChance>0.2</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_Paraceramuffalo"]/statBases</xpath>
+					<value>
+						<ArmorRating_Blunt>4</ArmorRating_Blunt>
+					</value>
+				</li>
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_Paraceramuffalo"]/statBases</xpath>
+					<value>
+						<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Paraceramuffalo"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>left hoof</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>41</power>
+								<cooldownTime>3</cooldownTime>
+								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>36</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>left hoof</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>41</power>
+								<cooldownTime>3</cooldownTime>
+								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>36</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<chanceFactor>0.01</chanceFactor>
+								<power>34</power>
+								<cooldownTime>3</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>24</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<capacities>
+									<li>Bite</li>
+								</capacities>
+								<power>15</power>
+								<cooldownTime>3.0</cooldownTime>
+								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>1</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<!-- cowlizard -->
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="GR_Lizardochs"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Quadruped</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_Lizardochs"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.5</MeleeDodgeChance>
+						<MeleeCritChance>0.2</MeleeCritChance>
+						<MeleeParryChance>0.1</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Lizardochs"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>left hoof</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>26</power>
+								<cooldownTime>2.5</cooldownTime>
+								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>20</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>right hoof</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>26</power>
+								<cooldownTime>2.5</cooldownTime>
+								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>20</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<chanceFactor>0.25</chanceFactor>
+								<power>24</power>
+								<cooldownTime>2</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>24</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>horn</label>
+								<capacities>
+									<li>Blunt</li>
+									<li>Stab</li>
+								</capacities>
+								<chanceFactor>0.45</chanceFactor>
+								<power>28</power>
+								<cooldownTime>2</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationSharp>5</armorPenetrationSharp>
+								<armorPenetrationBlunt>18</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<!-- Rodent -->
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="GR_Doedicoon"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Quadruped</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_Doedicoon"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.3</MeleeDodgeChance>
+						<MeleeCritChance>0.1</MeleeCritChance>
+						<MeleeParryChance>0.1</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Doedicoon"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>1</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Doedicoon"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>2.5</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Doedicoon"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>left claw</label>
+								<capacities>
+									<li>Scratch</li>
+								</capacities>
+								<power>6</power>
+								<cooldownTime>1.25</cooldownTime>
+								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+								<armorPenetrationSharp>5</armorPenetrationSharp>
+								<armorPenetrationBlunt>18</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>left claw</label>
+								<capacities>
+									<li>Scratch</li>
+								</capacities>
+								<power>6</power>
+								<cooldownTime>1.25</cooldownTime>
+								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+								<armorPenetrationSharp>5</armorPenetrationSharp>
+								<armorPenetrationBlunt>18</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>tail</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<chanceFactor>0.5</chanceFactor>
+								<power>8</power>
+								<cooldownTime>2</cooldownTime>
+								<linkedBodyPartsGroup>TailWeapon</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<capacities>
+									<li>Bite</li>
+								</capacities>
+								<power>3</power>
+								<cooldownTime>3.0</cooldownTime>
+								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>1</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<!-- Thrumbo Dino -->
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="GR_Thrumdraeodon"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Quadruped</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_Thrumdraeodon"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.2</MeleeDodgeChance>
+						<MeleeCritChance>0.78</MeleeCritChance>
+						<MeleeParryChance>0.45</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Thrumdraeodon"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>12</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Thrumdraeodon"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>21</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_Thrumdraeodon"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>left foot</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>31</power>
+								<cooldownTime>1.85</cooldownTime>
+								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>32</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>right foot</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>31</power>
+								<cooldownTime>1.85</cooldownTime>
+								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>32</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>horn</label>
+								<capacities>
+									<li>Cut</li>
+									<li>Stab</li>
+								</capacities>
+								<power>48</power>
+								<cooldownTime>1.85</cooldownTime>
+								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationSharp>10</armorPenetrationSharp>
+								<armorPenetrationBlunt>20</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<capacities>
+									<li>Bite</li>
+								</capacities>
+								<power>48</power>
+								<cooldownTime>1.85</cooldownTime>
+								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>25</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>7</armorPenetrationSharp>
+								<armorPenetrationBlunt>25</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<!-- Wooly Wolf -->
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="GR_WoolyWolf"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Quadruped</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="GR_WoolyWolf"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.47</MeleeDodgeChance>
+						<MeleeCritChance>0.2</MeleeCritChance>
+						<MeleeParryChance>0.33</MeleeParryChance>
+						<ArmorRating_Blunt>1</ArmorRating_Blunt>
+						<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="GR_WoolyWolf"]/tools</xpath>
+					<value>
+						<tools>
+
+							<li Class="CombatExtended.ToolCE">
+								<label>left claw</label>
+								<capacities>
+									<li>Scratch</li>
+								</capacities>
+								<power>15</power>
+								<cooldownTime>1</cooldownTime>
+								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>14</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>0.3</armorPenetrationSharp>
+								<armorPenetrationBlunt>2</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>right claw</label>
+								<capacities>
+									<li>Scratch</li>
+								</capacities>
+								<power>15</power>
+								<cooldownTime>1</cooldownTime>
+								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>14</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>0.3</armorPenetrationSharp>
+								<armorPenetrationBlunt>2</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>tusk</label>
+								<capacities>
+									<li>Scratch</li>
+									<li>Stab</li>
+								</capacities>
+								<power>30</power>
+								<cooldownTime>2</cooldownTime>
+								<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
+								<armorPenetrationSharp>2.5</armorPenetrationSharp>
+								<armorPenetrationBlunt>10</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>Jaws</label>
+								<capacities>
+									<li>Bite</li>
+								</capacities>
+								<power>34</power>
+								<cooldownTime>2</cooldownTime>
+								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>14</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<armorPenetrationSharp>2.25</armorPenetrationSharp>
+								<armorPenetrationBlunt>10</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Patch_Items_Drugs.xml b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Patch_Items_Drugs.xml
new file mode 100644
index 0000000000..6d9f7a7d9a
--- /dev/null
+++ b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Patch_Items_Drugs.xml	
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--GR_FeatherdustJoint -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_FeatherdustJoint"]/statBases</xpath>
+		<value>
+			<Bulk>0.12</Bulk>
+		</value>
+	</Operation>
+
+	<!--GR_ElectroEgg -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_ElectroEgg"]/statBases</xpath>
+		<value>
+			<Bulk>0.10</Bulk>
+		</value>
+	</Operation>
+
+	<!--GR_PoisonAmpoule -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_PoisonAmpoule"]/statBases</xpath>
+		<value>
+			<Bulk>0.05</Bulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Patch_Projectiles.xml b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Patch_Projectiles.xml
new file mode 100644
index 0000000000..ae47ba8521
--- /dev/null
+++ b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Patch_Projectiles.xml	
@@ -0,0 +1,328 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ============== Changing Projectile's thingClass to CE ones ================ -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[@Name="GR_BaseAnimalProjectile"]/projectile/flyOverhead</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="GR_SniperFlechette" or
+			defName="GR_RazorProjectile" or
+			defName="GR_Laser" or
+			defName="GR_Disintegrator" or
+			defName="GR_StunBolt" or
+			defName="GR_PoisonBlast" or
+			defName="GR_HairballProjectile" or
+			defName="GR_GreatHairballProjectile" or
+			defName="GR_Web" or
+			defName="GR_CryoBlast" or
+			defName="GR_PoisonBreath"
+			] </xpath>
+		<value>
+			<thingClass>CombatExtended.BulletCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			@Name="GR_BaseAnimalProjectile" or
+			defName="GR_Proj_ThrownSac" or
+			defName="GR_IncendiaryMote" or
+			defName="GR_Warhead" or
+			defName="GR_PlasmaBurst" or
+			defName="GR_FireSpit" or
+			defName="GR_SmokeBomb" or
+			defName="GR_Distortion"
+			]/thingClass </xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+
+	<!-- ============== Adding 'Standard' AimingAccuracy node to creatures' that use ranged attack statBases. =============== -->
+
+	<!-- =============== Now defining Projectiles in CE Procedure ============= -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_SniperFlechette"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>Bullet</damageDef>
+				<damageAmountBase>17</damageAmountBase>
+				<speed>200</speed>
+				<armorPenetrationSharp>14</armorPenetrationSharp>
+				<armorPenetrationBlunt>30</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_RazorProjectile"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>Cut</damageDef>
+				<damageAmountBase>20</damageAmountBase>
+				<speed>40</speed>
+				<armorPenetrationSharp>4</armorPenetrationSharp>
+				<armorPenetrationBlunt>17</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Laser"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>CE_Laser</damageDef>
+				<damageAmountBase>13</damageAmountBase>
+				<speed>300</speed>
+				<ai_IsIncendiary>true</ai_IsIncendiary>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Disintegrator"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>Burn</damageDef>
+				<damageAmountBase>500</damageAmountBase>
+				<speed>300</speed>
+				<ai_IsIncendiary>true</ai_IsIncendiary>
+				<secondaryDamage>
+					<li>
+						<def>PrometheumFlame</def>
+						<amount>3</amount>
+					</li>
+				</secondaryDamage>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_StunBolt"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>Stun</damageDef>
+				<damageAmountBase>15</damageAmountBase>
+				<speed>140</speed>
+				<armorPenetrationSharp>2</armorPenetrationSharp>
+				<armorPenetrationBlunt>3</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_PoisonBlast"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>GR_ToxicExplosion</damageDef>
+				<damageAmountBase>20</damageAmountBase>
+				<speed>78</speed>
+				<armorPenetrationSharp>10</armorPenetrationSharp>
+				<armorPenetrationBlunt>20</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_HairballProjectile"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>GR_HairballProjectileDamage</damageDef>
+				<damageAmountBase>5</damageAmountBase>
+				<speed>18</speed>
+				<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_GreatHairballProjectile"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>GR_GreatHairballProjectileDamage</damageDef>
+				<damageAmountBase>14</damageAmountBase>
+				<speed>14</speed>
+				<armorPenetrationBlunt>0.85</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Web"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>Stun</damageDef>
+				<damageAmountBase>15</damageAmountBase>
+				<speed>20</speed>
+				<armorPenetrationSharp>2</armorPenetrationSharp>
+				<armorPenetrationBlunt>3</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_CryoBlast"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>Frostbite</damageDef>
+				<damageAmountBase>25</damageAmountBase>
+				<speed>48</speed>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_PoisonBreath"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>GR_ToxicGas</damageDef>
+				<damageAmountBase>1</damageAmountBase>
+				<speed>30</speed>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Proj_ThrownSac"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>12</speed>
+				<flyOverhead>False</flyOverhead>
+				<damageDef>Bomb</damageDef>
+				<damageAmountBase>20</damageAmountBase>
+				<explosionRadius>2.5</explosionRadius>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+				<explosionDelay>60</explosionDelay>
+				<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_SmokeBomb"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>18</speed>
+				<damageDef>Smoke</damageDef>
+				<suppressionFactor>0.0</suppressionFactor>
+				<dangerFactor>0.0</dangerFactor>
+				<damageAmountBase>1</damageAmountBase>
+				<explosionRadius>5.9</explosionRadius>
+				<explosionDelay>1</explosionDelay>
+				<postExplosionGasType>BlindSmoke</postExplosionGasType>
+				<postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
+				<postExplosionSpawnChance>1</postExplosionSpawnChance>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_PlasmaBurst"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>31</speed>
+				<damageDef>Bomb</damageDef>
+				<damageAmountBase>56</damageAmountBase>
+				<explosionRadius>3.5</explosionRadius>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+				<explosionDelay>1</explosionDelay>
+				<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_FireSpit"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>10</speed>
+				<damageDef>Flame</damageDef>
+				<damageAmountBase>1</damageAmountBase>
+				<explosionRadius>1.1</explosionRadius>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+				<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
+				<preExplosionSpawnChance>0.1</preExplosionSpawnChance>
+				<ai_IsIncendiary>true</ai_IsIncendiary>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_IncendiaryMote"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>16</speed>
+				<damageDef>Flame</damageDef>
+				<damageAmountBase>5</damageAmountBase>
+				<explosionRadius>1.1</explosionRadius>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+				<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
+				<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
+				<ai_IsIncendiary>true</ai_IsIncendiary>
+				<soundExplode>Interact_Ignite</soundExplode>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Warhead"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<speed>60</speed>
+				<damageDef>Bomb</damageDef>
+				<damageAmountBase>250</damageAmountBase>
+				<explosionRadius>8.9</explosionRadius>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+				<explosionChanceToStartFire>0.25</explosionChanceToStartFire>
+				<explosionDamageFalloff>true</explosionDamageFalloff>
+				<explosionEffect>GiantExplosion</explosionEffect>
+				<flyOverhead>False</flyOverhead>
+				<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+				<soundExplode>Explosion_GiantBomb</soundExplode>
+				<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+				<soundAmbient>MortarRound_Ambient</soundAmbient>
+				<armorPenetrationSharp>100</armorPenetrationSharp>
+				<armorPenetrationBlunt>200</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Distortion"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>GR_DistortionDamage</damageDef>
+				<damageAmountBase>50</damageAmountBase>
+				<explosionRadius>1.1</explosionRadius>
+				<suppressionFactor>3.0</suppressionFactor>
+				<dangerFactor>2.0</dangerFactor>
+				<speed>25</speed>
+				<soundExplode>Interact_Ignite</soundExplode>
+				<armorPenetrationSharp>500</armorPenetrationSharp>
+				<armorPenetrationBlunt>1000</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Patch_VerbShoot.xml b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Patch_VerbShoot.xml
new file mode 100644
index 0000000000..29eb41ad90
--- /dev/null
+++ b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/Patch_VerbShoot.xml	
@@ -0,0 +1,547 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Archocentipede -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_ArchotechCentipede"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>GR_Disintegrator</defaultProjectile>
+					<warmupTime>0.2</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>2</minRange>
+					<range>100</range>
+					<soundCast>GR_DisintegratorSound</soundCast>
+					<muzzleFlashScale>15</muzzleFlashScale>
+					<label>disintegrator</label>
+				</li>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>GR_Laser</defaultProjectile>
+					<warmupTime>1.0</warmupTime>
+					<burstShotCount>10</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>2</minRange>
+					<range>36</range>
+					<soundCast>GR_LaserSound</soundCast>
+					<muzzleFlashScale>9</muzzleFlashScale>
+					<label>twin-coiled laser</label>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Boombeetle"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>GR_Proj_ThrownSac</defaultProjectile>
+					<warmupTime>2</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>3</minRange>
+					<range>20</range>
+					<soundCast>Pawn_BigInsect_Call</soundCast>
+					<muzzleFlashScale>2</muzzleFlashScale>
+					<label>explosive sac</label>
+					<commonality>0.75</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Spidercat"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>GR_HairballProjectile</defaultProjectile>
+					<warmupTime>1.35</warmupTime>
+					<burstShotCount>2</burstShotCount>
+					<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+					<minRange>2</minRange>
+					<range>30</range>
+					<soundCast>Bow_Recurve</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>blinding spit</label>
+					<commonality>0.6</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Catalope"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>GR_FireSpit</defaultProjectile>
+					<warmupTime>1</warmupTime>
+					<burstShotCount>2</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>1</minRange>
+					<range>6</range>
+					<soundCast>ThrowMolotovCocktail</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>chemfuel spit</label>
+					<commonality>0.6</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Spiderhorse"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>GR_Web</defaultProjectile>
+					<warmupTime>2</warmupTime>
+					<burstShotCount>2</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>1</minRange>
+					<range>12</range>
+					<soundCast>GR_Throw</soundCast>
+					<muzzleFlashScale>2</muzzleFlashScale>
+					<label>web</label>
+					<commonality>0.75</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Boomsnake"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>GR_PoisonBlast</defaultProjectile>
+					<warmupTime>2</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>2</minRange>
+					<range>22</range>
+					<soundCast>GR_PoisonBlast</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>poison spit</label>
+					<commonality>1</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Chickenlizard"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>GR_PoisonBlast</defaultProjectile>
+					<warmupTime>2</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>2</minRange>
+					<range>22</range>
+					<soundCast>GR_PoisonBlast</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>poison spit</label>
+					<commonality>1</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Muffalokomodo"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>GR_PoisonBlast</defaultProjectile>
+					<warmupTime>2</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>2</minRange>
+					<range>22</range>
+					<soundCast>GR_PoisonBlast</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>poison spit</label>
+					<commonality>1</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Spidersnake"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>GR_PoisonBlast</defaultProjectile>
+					<warmupTime>2</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>2</minRange>
+					<range>22</range>
+					<soundCast>GR_PoisonBlast</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>poison spit</label>
+					<commonality>1</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Snakecat"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>GR_PoisonBlast</defaultProjectile>
+					<warmupTime>1.2</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>2</minRange>
+					<range>22</range>
+					<soundCast>GR_PoisonBlast</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>poison spit</label>
+					<commonality>1</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Crocorse"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>GR_PoisonBreath</defaultProjectile>
+					<warmupTime>0.2</warmupTime>
+					<burstShotCount>20</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>1</minRange>
+					<range>22</range>
+					<soundCast>GR_PoisonBreath</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>poison breath</label>
+					<commonality>0.8</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Thrumbolizard"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>GR_PoisonBreathAnimated_CE</defaultProjectile>
+					<burstShotCount>1</burstShotCount>
+					<warmupTime>1.2</warmupTime>
+					<range>18</range>
+					<minRange>1</minRange>
+					<soundCast>GR_FireBreath</soundCast>
+					<muzzleFlashScale>1</muzzleFlashScale>
+					<label>poison breath</label>
+					<commonality>1.0</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Wolfalope"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>GR_FlameBreathAnimated_CE</defaultProjectile>
+					<burstShotCount>1</burstShotCount>
+					<warmupTime>1.2</warmupTime>
+					<range>22</range>
+					<minRange>1</minRange>
+					<soundCast>GR_FireBreath</soundCast>
+					<muzzleFlashScale>1</muzzleFlashScale>
+					<label>fire breath</label>
+					<commonality>1.0</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Mechas -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechabear"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>GR_PlasmaBurst</defaultProjectile>
+					<warmupTime>3</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+					<minRange>4</minRange>
+					<range>46</range>
+					<soundCast>Pawn_Mech_Centipede_Call</soundCast>
+					<muzzleFlashScale>2</muzzleFlashScale>
+					<label>plasma burst</label>
+					<commonality>1</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechalope"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>GR_IncendiaryMote</defaultProjectile>
+					<warmupTime>0.4</warmupTime>
+					<burstShotCount>2</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>2</minRange>
+					<range>20</range>
+					<soundCast>ThrowMolotovCocktail</soundCast>
+					<muzzleFlashScale>2</muzzleFlashScale>
+					<label>chemfuel flamethrower</label>
+					<commonality>1</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechachicken"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>GR_SniperFlechette</defaultProjectile>
+					<warmupTime>2.2</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>9</minRange>
+					<range>70</range>
+					<soundCast>Bow_Small</soundCast>
+					<muzzleFlashScale>9</muzzleFlashScale>
+					<label>sniper flechette</label>
+					<commonality>1</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechaspider"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>GR_Laser</defaultProjectile>
+					<warmupTime>1.6</warmupTime>
+					<burstShotCount>10</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>2</minRange>
+					<range>56</range>
+					<soundCast>GR_LaserSound</soundCast>
+					<muzzleFlashScale>9</muzzleFlashScale>
+					<label>twin-coiled laser</label>
+					<commonality>1</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechamuffalo"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>GR_SmokeBomb</defaultProjectile>
+					<warmupTime>4</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>4</minRange>
+					<range>55</range>
+					<soundCast>Pawn_Mech_Centipede_Call</soundCast>
+					<muzzleFlashScale>2</muzzleFlashScale>
+					<label>smoke cannon</label>
+					<commonality>1</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mecharat"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>GR_StunBolt</defaultProjectile>
+					<warmupTime>1.25</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>2</minRange>
+					<range>8</range>
+					<soundCast>GR_Buzz</soundCast>
+					<muzzleFlashScale>9</muzzleFlashScale>
+					<label>stun bolt</label>
+					<commonality>1</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechaturtle"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>GR_PoisonBlast</defaultProjectile>
+					<warmupTime>2</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>2</minRange>
+					<range>62</range>
+					<soundCast>GR_PoisonBlast</soundCast>
+					<muzzleFlashScale>9</muzzleFlashScale>
+					<label>poison blast</label>
+					<commonality>1</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechawolf"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>GR_CryoBlast</defaultProjectile>
+					<warmupTime>2</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>2</minRange>
+					<range>40</range>
+					<soundCast>GR_Liquid</soundCast>
+					<muzzleFlashScale>9</muzzleFlashScale>
+					<label>cryo cannon</label>
+					<commonality>1</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechathrumbo"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>GR_Warhead</defaultProjectile>
+					<warmupTime>6</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+					<minRange>11</minRange>
+					<range>90</range>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<soundCast>Mortar_LaunchA</soundCast>
+					<muzzleFlashScale>15</muzzleFlashScale>
+					<label>antigrain artillery</label>
+					<commonality>1</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechacat"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>GR_RazorProjectile</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>2</minRange>
+					<range>32</range>
+					<soundCast>Pawn_Melee_MechanoidSlash_HitPawn</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>razor tail</label>
+					<commonality>1</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechamime"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>GR_Distortion</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>2</minRange>
+					<range>45</range>
+					<soundCast>GR_Singularity</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<label>spatial distortion</label>
+					<commonality>1</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_ArchoCentipede.xml b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_ArchoCentipede.xml
new file mode 100644
index 0000000000..965c449058
--- /dev/null
+++ b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_ArchoCentipede.xml	
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_ArchotechCentipede"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_ArchotechCentipede"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>3</AimingAccuracy>
+			<ShootingAccuracyPawn>5</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.01</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+			<ArmorRating_Heat>2.00</ArmorRating_Heat>
+			<ArmorRating_Electric>1.00</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_ArchotechCentipede"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>500</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_ArchotechCentipede"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>50</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_ArchotechCentipede"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>160</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>300</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_AvianHybrids.xml b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_AvianHybrids.xml
new file mode 100644
index 0000000000..e12646de53
--- /dev/null
+++ b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_AvianHybrids.xml	
@@ -0,0 +1,392 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Chickenbear"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Chickenbear"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.09</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Chickenbear"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.39</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.39</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Chickenlope"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Chickenlope"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Chickenlope"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.39</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Chickenffalo"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Chickenffalo"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.08</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Chickenffalo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.39</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Chickenwolf"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Chickenwolf"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.12</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Chickenwolf"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.39</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.35</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Chickenrabbit"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Chickenrabbit"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.04</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Chickenrabbit"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.39</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Chickencat"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Chickencat"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.04</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Chickencat"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Turkeyman"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Turkeyman"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.04</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Turkeyman"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.08</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.480</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>toothed beak</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.08</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.480</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2.08</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.480</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_BoomHybrids.xml b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_BoomHybrids.xml
new file mode 100644
index 0000000000..34fffef6bb
--- /dev/null
+++ b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_BoomHybrids.xml	
@@ -0,0 +1,370 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Boomabear"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Boomabear"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.08</MeleeDodgeChance>
+			<MeleeCritChance>0.2</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Boomabear"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>18</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2.22</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Boomachicken"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Boomachicken"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.08</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Boomachicken"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>13</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Boomffalo"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Boomffalo"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			<MeleeCritChance>0.20</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Boomffalo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>3.17</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Boomwolf"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Boomwolf"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Boomwolf"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.66</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Boomsquirrel"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Boomsquirrel"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.03</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Boomsquirrel"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.06</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.06</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.06</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.05</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Boomcat"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Boomcat"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Boomcat"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.28</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Booman"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Booman"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>1</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Booman"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.97</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.07</chanceFactor>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_CanineHybrids.xml b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_CanineHybrids.xml
new file mode 100644
index 0000000000..385e136b71
--- /dev/null
+++ b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_CanineHybrids.xml	
@@ -0,0 +1,575 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Wolfbear"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Wolfbear"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.26</MeleeDodgeChance>
+			<MeleeCritChance>0.14</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Wolfbear"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>18</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Wolfalope"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Wolfalope"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.14</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Wolfalope"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.08</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.08</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.75</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Wolfchicken"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Wolfchicken"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.26</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>0.06</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Wolfchicken"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.06</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.06</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.75</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Wolffalo"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Wolffalo"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.08</MeleeDodgeChance>
+			<MeleeCritChance>0.22</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Wolffalo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.75</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.55</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Wolfbeaver"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Wolfbeaver"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.26</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Wolfbeaver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.06</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.06</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.9</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.85</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Wolfcat"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Wolfcat"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			<MeleeCritChance>0.27</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Wolfcat"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>16</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>16</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.75</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Dogman"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Dogman"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Dogman"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.8</cooldownTime>
+					<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.8</cooldownTime>
+					<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.63</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.11</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.360</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_ColossalHybrids.xml b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_ColossalHybrids.xml
new file mode 100644
index 0000000000..736d72ddd6
--- /dev/null
+++ b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_ColossalHybrids.xml	
@@ -0,0 +1,952 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Thrumbear"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Thrumbear"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.01</MeleeDodgeChance>
+			<MeleeCritChance>0.8</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Thrumbear"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Thrumbear"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Thrumbear"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Cut</li>
+						<li>Stab</li>
+					</capacities>
+					<power>46</power>
+					<cooldownTime>2.52</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.3</chanceFactor>
+					<armorPenetrationSharp>8</armorPenetrationSharp>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Smash!</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>42</power>
+					<cooldownTime>2.43</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<chanceFactor>0.3</chanceFactor>
+					<armorPenetrationBlunt>45</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Smash!</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>42</power>
+					<cooldownTime>2.43</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<chanceFactor>0.3</chanceFactor>
+					<armorPenetrationBlunt>45</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>2.6</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.1</chanceFactor>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>2.75</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.1</chanceFactor>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Thrumbalope"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Thrumbalope"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.06</MeleeDodgeChance>
+			<MeleeCritChance>0.5</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Thrumbalope"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Thrumbalope"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Thrumbalope"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Cut</li>
+						<li>Stab</li>
+					</capacities>
+					<power>46</power>
+					<cooldownTime>2.52</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>7.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>2.33</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8.640</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>2.33</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8.640</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.08</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2.52</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Thrumbochicken"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Thrumbochicken"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.5</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Thrumbochicken"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Thrumbochicken"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Thrumbochicken"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Cut</li>
+						<li>Stab</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>25</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>8</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2.33</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Thrumffalo"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Thrumffalo"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.04</MeleeDodgeChance>
+			<MeleeCritChance>0.65</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Thrumbochicken"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Thrumbochicken"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Thrumffalo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Cut</li>
+						<li>Stab</li>
+					</capacities>
+					<power>46</power>
+					<cooldownTime>2.52</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>7.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>2.33</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8.640</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>2.33</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8.640</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2.33</cooldownTime>
+					<chanceFactor>0.2</chanceFactor>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Thrumwolf"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Thrumwolf"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.35</MeleeDodgeChance>
+			<MeleeCritChance>0.55</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Thrumbochicken"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Thrumbochicken"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Thrumwolf"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Cut</li>
+						<li>Stab</li>
+					</capacities>
+					<power>33</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>7</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>7.2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>7.2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>31</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2.52</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Thrumbocat"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Thrumbocat"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.44</MeleeDodgeChance>
+			<MeleeCritChance>0.56</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Thrumbocat"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Thrumbocat"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Thrumbocat"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Cut</li>
+						<li>Stab</li>
+					</capacities>
+					<power>31</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>7</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>GR_HairballBite</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Thrumborat"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Thrumborat"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.64</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Thrumborat"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Stab</li>
+					</capacities>
+					<power>31</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>7</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left paw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right paw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Thrumhorse"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Thrumhorse"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.10</MeleeDodgeChance>
+			<MeleeCritChance>0.56</MeleeCritChance>
+			<MeleeParryChance>0.35</MeleeParryChance>
+			<Flammability>0.6</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Thrumhorse"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>18</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Thrumhorse"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Thrumhorse"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.5</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Thrumhorse"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>31</power>
+					<cooldownTime>2.42</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>2.52</cooldownTime>
+					<chanceFactor>0.65</chanceFactor>
+					<linkedBodyPartsGroup>HornAttackTool_2</linkedBodyPartsGroup>
+					<armorPenetrationSharp>6</armorPenetrationSharp>
+					<armorPenetrationBlunt>9</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.13</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>14.640</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.13</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>14.640</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2.32</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Thrumbospider"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Thrumbospider"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.09</MeleeDodgeChance>
+			<MeleeCritChance>0.78</MeleeCritChance>
+			<MeleeParryChance>0.3</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Thrumbospider"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>35</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Thrumbospider"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Thrumbospider"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Cut</li>
+						<li>Stab</li>
+					</capacities>
+					<power>56</power>
+					<cooldownTime>2.36</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>20</armorPenetrationSharp>
+					<armorPenetrationBlunt>40</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>2.35</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>30</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Thrumbolizard"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Thrumbolizard"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.08</MeleeDodgeChance>
+			<MeleeCritChance>0.7</MeleeCritChance>
+			<MeleeParryChance>0.3</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Thrumbolizard"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>GR_VeryToxicBite</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>GR_VeryToxicBite</li>
+						<li>Stab</li>
+					</capacities>
+					<power>46</power>
+					<cooldownTime>2.52</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.3</chanceFactor>
+					<armorPenetrationSharp>8</armorPenetrationSharp>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>2.3</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Thrumboman"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Thrumboman"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.09</MeleeDodgeChance>
+			<MeleeCritChance>0.76</MeleeCritChance>
+			<MeleeParryChance>0.45</MeleeParryChance>
+			<Flammability>0.6</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Thrumboman"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>21</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Thrumboman"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Thrumbo"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.6</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Thrumboman"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>46</power>
+					<cooldownTime>2.52</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>16</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>41</power>
+					<cooldownTime>2.52</cooldownTime>
+					<chanceFactor>0.65</chanceFactor>
+					<linkedBodyPartsGroup>HornAttackTool_2</linkedBodyPartsGroup>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>2.13</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>14.640</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>2.13</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>14.640</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>1.62</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.016</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2.52</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_EquineHybrids.xml b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_EquineHybrids.xml
new file mode 100644
index 0000000000..d7c62e3541
--- /dev/null
+++ b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_EquineHybrids.xml	
@@ -0,0 +1,690 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Bearhorse"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Bearhorse"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.12</MeleeDodgeChance>
+			<MeleeCritChance>0.41</MeleeCritChance>
+			<MeleeParryChance>0.24</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Bearhorse"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.57</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>18</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>4.338</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.57</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>18</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>4.338</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.97</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.65</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Boomhorse"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Boomhorse"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.22</MeleeDodgeChance>
+			<MeleeCritChance>0.30</MeleeCritChance>
+			<MeleeParryChance>0.20</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Boomhorse"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.638</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.638</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.97</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Chickenhorse"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Chickenhorse"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.29</MeleeCritChance>
+			<MeleeParryChance>0.18</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Chickenhorse"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.038</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.038</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.97</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Boomhorse"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Cathorse"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.27</MeleeDodgeChance>
+			<MeleeCritChance>0.50</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Cathorse"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof-paw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof-paw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.16</armorPenetrationBlunt>
+					<chanceFactor>0.7</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Molehorse"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Molehorse"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.06</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Molehorse"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.638</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.638</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.97</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Wolfhorse"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Wolfhorse"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			<MeleeCritChance>0.30</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Wolfhorse"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.73</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.55</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.225</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Muffalohorse"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Muffalohorse"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.17</MeleeDodgeChance>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Muffalohorse"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.44</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.69</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.638</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.638</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Crocorse"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Crocorse"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.39</MeleeCritChance>
+			<MeleeParryChance>0.24</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Crocorse"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>bite</label>
+					<capacities>
+						<li>GR_VeryToxicBite</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.2</cooldownTime>
+					<armorPenetrationSharp>3.05</armorPenetrationSharp>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.638</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.638</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Spiderhorse"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Spiderhorse"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.18</MeleeCritChance>
+			<MeleeParryChance>0.51</MeleeParryChance>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Spiderhorse"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Spiderhorse"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Spiderhorse"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>2.28</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.35</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.45</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2.48</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Hurseman"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Hurseman"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.39</MeleeCritChance>
+			<MeleeParryChance>0.24</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Hurseman"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.638</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.638</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.97</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_Failures.xml b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_Failures.xml
new file mode 100644
index 0000000000..ce563abba1
--- /dev/null
+++ b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_Failures.xml	
@@ -0,0 +1,240 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========= Fleshling ============ -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Fleshling"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Fleshling"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			<MeleeCritChance>0.23</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Fleshling"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.35</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.8</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Aberrant Fleshbeast ============ -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_AberrantFleshbeast"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_AberrantFleshbeast"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.01</MeleeDodgeChance>
+			<MeleeCritChance>0.10</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_AberrantFleshbeast"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.56</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Flesh Monstrosity ============ -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_FleshMonstrosity"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_FleshMonstrosity"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.01</MeleeDodgeChance>
+			<MeleeCritChance>0.23</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_FleshMonstrosity"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>GR_RabidSlash</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>2.56</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>6</armorPenetrationSharp>
+					<armorPenetrationBlunt>9</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Flesh Growth ============ -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_FleshGrowth"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_FleshGrowth"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.01</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_FleshGrowth"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.35</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.8</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========= Fleshflies ============ -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_FleshFlies"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Vehicle</bodyShape><!-- Not so much a 'body' as a swarm. -->
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="GR_FleshFlies"]/statBases/ArmorRating_Blunt</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="GR_FleshFlies"]/statBases/ArmorRating_Sharp</xpath>
+	</Operation>
+
+	<!-- 
+Rather than using armor, use damage multipliers to mimic
+only being able to kill a small part of the swarm with each
+attack.
+-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_FleshFlies"]</xpath>
+		<value>
+			<damageMultipliers>
+				<li>
+					<damageDef>Cut</damageDef>
+					<multiplier>0.20</multiplier>
+				</li>
+				<li>
+					<damageDef>Stab</damageDef>
+					<multiplier>0.20</multiplier>
+				</li>
+				<li>
+					<damageDef>Blunt</damageDef>
+					<multiplier>0.20</multiplier>
+				</li>
+				<li>
+					<damageDef>Bullet</damageDef>
+					<multiplier>0.10</multiplier>
+				</li>
+			</damageMultipliers>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_FleshFlies"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.80</MeleeDodgeChance>
+			<MeleeCritChance>0.00</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_FleshFlies"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>0.96</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.01</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="GR_FleshFlies"]/lifeStages/li/bodyGraphicData/texPath</xpath>
+		<value>
+			<texPath>Things/Pawn/Animal/Failures/Fleshflies/FleshfliesA</texPath>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="GR_FleshFlies"]/lifeStages/li/bodyGraphicData/drawSize</xpath>
+		<value>
+			<drawSize>2.0</drawSize>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_FelineHybrids.xml b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_FelineHybrids.xml
new file mode 100644
index 0000000000..0be96b29e4
--- /dev/null
+++ b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_FelineHybrids.xml	
@@ -0,0 +1,523 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Catbear"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Catbear"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.11</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Catbear"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.14</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.14</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.78</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>18</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Catalope"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Catalope"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Catalope"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.06</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Catchicken"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Catchicken"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Catchicken"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>GR_GoForTheEyes</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Catffalo"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Catffalo"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.06</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Catffalo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.17</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Catrabbit"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Catrabbit"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Catrabbit"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.55</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>16</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.06</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.55</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>16</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.06</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.85</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Catwolf"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Catwolf"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.07</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Catwolf"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.9</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>16</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.12</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.9</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>16</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.12</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.55</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.18</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Catman"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Catman"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Catman"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.55</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.55</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.85</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.254</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>0.55</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_HumanoidHybrids.xml b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_HumanoidHybrids.xml
new file mode 100644
index 0000000000..893d436f00
--- /dev/null
+++ b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_HumanoidHybrids.xml	
@@ -0,0 +1,442 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Manbear"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Manbear"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Manbear"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.95</cooldownTime>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.95</cooldownTime>
+					<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.2</cooldownTime>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Manffalo"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Manchicken"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.20</MeleeDodgeChance>
+			<MeleeCritChance>0.08</MeleeCritChance>
+			<MeleeParryChance>0.04</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Manchicken"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.42</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.08</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.89</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.78</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Manffalo"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Manffalo"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.17</MeleeDodgeChance>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Manffalo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.44</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.69</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Manalope"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Manalope"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			<MeleeCritChance>0.01</MeleeCritChance>
+			<MeleeParryChance>0.00</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Manalope"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2.5</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.035</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.01</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Manwolf"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Manwolf"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.75</MeleeCritChance>
+			<MeleeParryChance>0.5</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Manwolf"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.19</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.19</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.46</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<chanceFactor>2</chanceFactor>
+					<armorPenetrationSharp>1.6</armorPenetrationSharp>
+					<armorPenetrationBlunt>8.863</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>3.2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.225</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Mancat"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Mancat"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.27</MeleeDodgeChance>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.20</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mancat"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.09</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Mansquirrel"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mansquirrel"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>2.4</MoveSpeed>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.0</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mansquirrel"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.67</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.67</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.01</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.88</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.07</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>3.00</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_InsectoidHybrids.xml b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_InsectoidHybrids.xml
new file mode 100644
index 0000000000..c41f326778
--- /dev/null
+++ b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_InsectoidHybrids.xml	
@@ -0,0 +1,457 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Bearscarab"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Bearscarab"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			<MeleeCritChance>0.3</MeleeCritChance>
+			<MeleeParryChance>0.27</MeleeParryChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Bearscarab"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Bearscarab"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Bearscarab"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>2.56</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.33</armorPenetrationSharp>
+					<armorPenetrationBlunt>18</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.88</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Boombeetle"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Boombeetle"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.65</AimingAccuracy>
+			<ShootingAccuracyPawn>0.65</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Boombeetle"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Boombeetle"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Boombeetle"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2.1</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>8</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Chickenspider"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Chickenspider"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.24</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Chickenspider"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Chickenspider"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Chickenspider"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Muffalopede"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Muffalopede"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.4</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Muffalopede"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.75</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Muffalopede"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Muffalopede"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>2.78</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.55</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>3</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Wolfscarab"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Wolfscarab"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.28</MeleeCritChance>
+			<MeleeParryChance>0.3</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Wolfscarab"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Wolfscarab"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Wolfscarab"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.68</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.88</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>8</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.95</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Spidercat"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Spidercat"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.75</AimingAccuracy>
+			<ShootingAccuracyPawn>0.75</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.13</MeleeCritChance>
+			<MeleeParryChance>0.33</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Spidercat"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Spidercat"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Spidercat"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>6</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Manscarab"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.07</MeleeDodgeChance>
+			<MeleeCritChance>0.31</MeleeCritChance>
+			<MeleeParryChance>0.17</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Manscarab"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>mandibles</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.48</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Manscarab"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Manscarab"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_MechanoidHybrids.xml b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_MechanoidHybrids.xml
new file mode 100644
index 0000000000..255b17aee2
--- /dev/null
+++ b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_MechanoidHybrids.xml	
@@ -0,0 +1,788 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Mechabear"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Mechabear"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.45</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechabear"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>32</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechabear"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechabear"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>43</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>18</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>12</armorPenetrationSharp>
+					<armorPenetrationBlunt>32</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Mechalope"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Mechalope"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.35</MeleeDodgeChance>
+			<MeleeCritChance>0.3</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechalope"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechalope"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechalope"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>14</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Mechachicken"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Mechachicken"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>2.6</AimingAccuracy>
+			<ShootingAccuracyPawn>2.6</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.65</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechachicken"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechachicken"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechachicken"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>0.55</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Mechaspider"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Mechaspider"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1.6</AimingAccuracy>
+			<ShootingAccuracyPawn>1.6</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.36</MeleeDodgeChance>
+			<MeleeCritChance>0.4</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechaspider"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechaspider"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechaspider"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>13</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Mechamuffalo"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Mechamuffalo"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			<MeleeCritChance>0.5</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechamuffalo"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>28</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechamuffalo"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>11</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechamuffalo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>3</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>32</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Mecharat"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Mecharat"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.8</AimingAccuracy>
+			<ShootingAccuracyPawn>0.8</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.33</MeleeDodgeChance>
+			<MeleeCritChance>0.03</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mecharat"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mecharat"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mecharat"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.55</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Mechaturtle"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Mechaturtle"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1.6</AimingAccuracy>
+			<ShootingAccuracyPawn>1.6</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			<MeleeCritChance>0.5</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechaturtle"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>58</ArmorRating_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechaturtle"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>23</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechaturtle"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>2.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Mechawolf"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Mechawolf"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			<MeleeCritChance>0.5</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechawolf"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechawolf"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>7.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechawolf"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>18</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Mechathrumbo"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Mechathrumbo"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			<MeleeCritChance>0.75</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechathrumbo"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>48</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechathrumbo"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechathrumbo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>56</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>20</armorPenetrationSharp>
+					<armorPenetrationBlunt>50</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>50</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Mechacat"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Mechacat"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.75</MeleeDodgeChance>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechacat"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechacat"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>7.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechacat"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>18</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Mechahorse"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechahorse"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2.75</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechahorse"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3.85</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Mechahorse"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.39</MeleeCritChance>
+			<MeleeParryChance>0.24</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechahorse"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4.12</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4.12</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4.12</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4.12</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.97</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Mechamime"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Mechamime"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechamime"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechamime"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>5.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Mechamime"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>25</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_MuffaloHybrids.xml b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_MuffaloHybrids.xml
new file mode 100644
index 0000000000..5b6dbf81d7
--- /dev/null
+++ b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_MuffaloHybrids.xml	
@@ -0,0 +1,288 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Muffalobear"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Muffalobear"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.38</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Muffalobear"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>3.17</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Muffalochicken"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Muffalochicken"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.12</MeleeDodgeChance>
+			<MeleeCritChance>0.27</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Muffalochicken"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.75</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>3.17</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Muffalope"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Muffalope"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.27</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Muffalope"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>3.17</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Muffalowolf"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Muffalowolf"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.33</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Muffalowolf"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>3.17</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>1.85</cooldownTime>
+					<chanceFactor>0.5</chanceFactor>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.6</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Muffalocat"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Muffalocat"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.27</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Muffalocat"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>3.17</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Muffalorat"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Muffalorat"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Muffalorat"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>3.17</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>Tusk</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>2</cooldownTime>
+					<chanceFactor>0.5</chanceFactor>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.85</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Muffaloman"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Muffaloman"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.14</MeleeDodgeChance>
+			<MeleeCritChance>0.32</MeleeCritChance>
+			<MeleeParryChance>0.24</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Muffaloman"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>3.17</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_Paragons.xml b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_Paragons.xml
new file mode 100644
index 0000000000..6f27dfba55
--- /dev/null
+++ b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_Paragons.xml	
@@ -0,0 +1,903 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_ParagonBear"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_ParagonBear"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.6</MeleeCritChance>
+			<MeleeParryChance>0.3</MeleeParryChance>
+			<ArmorRating_Blunt>1.8</ArmorRating_Blunt>
+			<ArmorRating_Sharp>0.35</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_ParagonBear"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>27</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>27</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>46</power>
+					<cooldownTime>1.95</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>24</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>5</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_ParagonBoomalope"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_ParagonBoomalope"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.04</MeleeDodgeChance>
+			<MeleeCritChance>0.22</MeleeCritChance>
+			<MeleeParryChance>0.01</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_ParagonBoomalope"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>3.17</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_ParagonChicken"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_ParagonChicken"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.09</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_ParagonChicken"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.75</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.18</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_ParagonMuffalo"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_ParagonMuffalo"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.01</MeleeDodgeChance>
+			<MeleeCritChance>0.5</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+			<ArmorRating_Sharp>0.2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_ParagonMuffalo"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4.6</MoveSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_ParagonMuffalo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>2.66</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_ParagonWolf"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_ParagonWolf"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>7.1</MoveSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_ParagonWolf"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.45</MeleeDodgeChance>
+			<MeleeCritChance>0.27</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_ParagonWolf"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>1.75</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_ParagonIguana"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_ParagonIguana"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.22</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_ParagonIguana"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4</MoveSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_ParagonIguana"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>GR_VeryToxicBite</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.28</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>GR_VeryToxicBite</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.28</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>GR_VeryToxicBite</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.88</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_ParagonHorse"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_ParagonHorse"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>7</MoveSpeed>
+			<MeleeDodgeChance>0.35</MeleeDodgeChance>
+			<MeleeCritChance>0.20</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_ParagonHorse"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4.238</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4.238</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4.238</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4.238</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.97</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.85</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_ParagonThrumbo"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_ParagonThrumbo"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.09</MeleeDodgeChance>
+			<MeleeCritChance>0.90</MeleeCritChance>
+			<MeleeParryChance>0.55</MeleeParryChance>
+			<Flammability>0.5</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_ParagonThrumbo"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>24</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_ParagonThrumbo"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>17</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_ParagonThrumbo"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0.7</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_ParagonThrumbo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>56</power>
+					<cooldownTime>2.52</cooldownTime>
+					<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>4</armorPenetrationSharp>
+					<armorPenetrationBlunt>18</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>horn</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>48</power>
+					<cooldownTime>2.52</cooldownTime>
+					<chanceFactor>0.65</chanceFactor>
+					<linkedBodyPartsGroup>HornAttackTool_2</linkedBodyPartsGroup>
+					<armorPenetrationSharp>11</armorPenetrationSharp>
+					<armorPenetrationBlunt>9</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>2.13</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>16.640</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right foot</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>2.13</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>16.640</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.62</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.84</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.016</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>2.52</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_ParagonRat"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_ParagonRat"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_ParagonRat"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>GR_PlagueBite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>GR_PlagueBite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>GR_PlagueBite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.4</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.34</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_ParagonHumanoid"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_ParagonHumanoid"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.20</MeleeCritChance>
+			<MeleeParryChance>0.15</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_ParagonHumanoid"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1</cooldownTime>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>17</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1</cooldownTime>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>17</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>33</power>
+					<cooldownTime>1.9</cooldownTime>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>9.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2</cooldownTime>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>4.32</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_ParagonFeline"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_ParagonFeline"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_ParagonFeline"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.55</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.048</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.025</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.55</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.048</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.025</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>0.85</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.284</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.065</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>0.55</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_ParagonInsectoid"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.30</MeleeCritChance>
+			<MeleeParryChance>0.57</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_ParagonInsectoid"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>18</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_ParagonInsectoid"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_ParagonInsectoid"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head claw</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>37</power>
+					<cooldownTime>1.48</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>50</armorPenetrationSharp>
+					<armorPenetrationBlunt>30</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head claw</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>65</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>3.38</armorPenetrationSharp>
+					<armorPenetrationBlunt>8.438</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>34</power>
+					<cooldownTime>2.64</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_ReptileHybrids.xml b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_ReptileHybrids.xml
new file mode 100644
index 0000000000..dd75ce6d27
--- /dev/null
+++ b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_ReptileHybrids.xml	
@@ -0,0 +1,497 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Bearodile"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Bearodile"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			<MeleeCritChance>0.43</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+			<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
+			<ArmorRating_Sharp>0.3</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Bearodile"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>GR_VeryToxicBite</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>GR_VeryToxicBite</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.35</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>GR_VeryToxicBite</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Boomsnake"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Serpentine</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Boomsnake"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			<MeleeCritChance>0.33</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Boomsnake"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>GR_VeryToxicBite</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.85</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Chickenlizard"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Chickenlizard"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.07</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Chickenlizard"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>GR_LightToxicBite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.9</cooldownTime>
+					<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.08</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>GR_LightToxicBite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.9</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>GR_LightToxicBite</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>0.86</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.08</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.12</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Muffalokomodo"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Muffalokomodo"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.06</MeleeDodgeChance>
+			<MeleeCritChance>0.4</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+			<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
+			<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Muffalokomodo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>GR_VeryToxicBite</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.88</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>3.17</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Spidersnake"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Serpentine</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Spidersnake"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.45</MeleeDodgeChance>
+			<MeleeCritChance>0.07</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Spidersnake"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>GR_VeryToxicBite</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>GR_VeryToxicBite</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Wolfsnake"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Wolfsnake"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.3</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+			<ArmorRating_Sharp>0.12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Wolfsnake"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>GR_VeryToxicBite</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>GR_VeryToxicBite</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>GR_VeryToxicBite</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.88</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Snakecat"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Serpentine</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Snakecat"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Snakecat"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>GR_VeryToxicBite</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.75</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.85</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Lizardman"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Lizardman"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.31</MeleeCritChance>
+			<MeleeParryChance>0.19</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Lizardman"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>GR_VeryToxicBite</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.7</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.41</armorPenetrationSharp>
+					<armorPenetrationBlunt>9</armorPenetrationBlunt>
+					<chanceFactor>0.5</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_RodentHybrids.xml b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_RodentHybrids.xml
new file mode 100644
index 0000000000..1cd83f196f
--- /dev/null
+++ b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_RodentHybrids.xml	
@@ -0,0 +1,489 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Molebear"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Molebear"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.18</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Molebear"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.28</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.28</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.85</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Squirralope"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Squirralope"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Squirralope"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.56</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Rabbitchicken"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Rabbitchicken"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.02</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Rabbitchicken"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>0.85</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.06</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Ratffalo"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Ratffalo"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.22</MeleeDodgeChance>
+			<MeleeCritChance>0.03</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Ratffalo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.18</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Beaverwolf"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Beaverwolf"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Beaverwolf"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.65</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Rabbitcat"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Rabbitcat"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			<MeleeCritChance>0.27</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Rabbitcat"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>34</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1.85</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Moleman"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Moleman"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.12</MeleeDodgeChance>
+			<MeleeCritChance>0.05</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Moleman"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.87</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.36</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>0.97</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_UrsineHybrids.xml b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_UrsineHybrids.xml
new file mode 100644
index 0000000000..429df3400c
--- /dev/null
+++ b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_UrsineHybrids.xml	
@@ -0,0 +1,650 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Bearalope"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Bearalope"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.09</MeleeDodgeChance>
+			<MeleeCritChance>0.25</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Bearalope"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>18</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.45</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>18</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>31</power>
+					<cooldownTime>2.1</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>18</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.85</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.22</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Bearchicken"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Bearchicken"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.12</MeleeDodgeChance>
+			<MeleeCritChance>0.07</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Bearchicken"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.48</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.48</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>13</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.6</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Bearffalo"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Bearffalo"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.07</MeleeDodgeChance>
+			<MeleeCritChance>0.3</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Bearffalo"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.68</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>16</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.68</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>16</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>2.33</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>16</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.78</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Bearwolf"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Bearwolf"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Bearwolf"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>18</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>18</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.55</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Bearmole"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Bearmole"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			<MeleeCritChance>0.16</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Bearmole"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>18</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.35</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>18</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+						<li>Stab</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Bearcat"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Bearcat"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.35</MeleeDodgeChance>
+			<MeleeCritChance>0.23</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Bearcat"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>18</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>18</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>1.6</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="GR_Bearman"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GR_Bearman"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>1</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GR_Bearman"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.75</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>12</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.75</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>12</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2.4</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.4</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>18</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.0</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/TraderKinds_MadScientists.xml b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/TraderKinds_MadScientists.xml
new file mode 100644
index 0000000000..07325a56b0
--- /dev/null
+++ b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/TraderKinds_MadScientists.xml	
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Caravan Trader -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="GR_Outlander_CaravanTrader"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>FSX</thingDef>
+				<countRange>
+					<min>25</min>
+					<max>100</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>Prometheum</thingDef>
+				<countRange>
+					<min>15</min>
+					<max>100</max>
+				</countRange>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Orbital Trader -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="GR_OrbitalTrader"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>FSX</thingDef>
+				<countRange>
+					<min>50</min>
+					<max>200</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>Prometheum</thingDef>
+				<countRange>
+					<min>50</min>
+					<max>200</max>
+				</countRange>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Ideology Expanded - Dryads/Patches/Vanilla Ideology Expanded - Dryads/DamageDefs/Animal_Projectile_Shoot.xml b/ModPatches/Vanilla Ideology Expanded - Dryads/Patches/Vanilla Ideology Expanded - Dryads/DamageDefs/Animal_Projectile_Shoot.xml
new file mode 100644
index 0000000000..7dedad0a81
--- /dev/null
+++ b/ModPatches/Vanilla Ideology Expanded - Dryads/Patches/Vanilla Ideology Expanded - Dryads/DamageDefs/Animal_Projectile_Shoot.xml	
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ================= Setting it so that the Animal is shooting using CE code ================= -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Spitter"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>VDE_AcidBolt</defaultProjectile>
+					<warmupTime>1.8</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>1.9</minRange>
+					<range>32</range>
+					<soundCast>VDE_AcidBolt</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<commonality>0.8</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VDE_Dryad_Spitter"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>VDE_AcidBolt</defaultProjectile>
+					<warmupTime>2.0</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+					<minRange>1.9</minRange>
+					<range>22</range>
+					<soundCast>VDE_AcidBolt</soundCast>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<commonality>0.8</commonality>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Ideology Expanded - Dryads/Patches/Vanilla Ideology Expanded - Dryads/DamageDefs/Animal_Projectiles.xml b/ModPatches/Vanilla Ideology Expanded - Dryads/Patches/Vanilla Ideology Expanded - Dryads/DamageDefs/Animal_Projectiles.xml
new file mode 100644
index 0000000000..d416f89e43
--- /dev/null
+++ b/ModPatches/Vanilla Ideology Expanded - Dryads/Patches/Vanilla Ideology Expanded - Dryads/DamageDefs/Animal_Projectiles.xml	
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ================= Setting it so that the Animal is shooting using CE code ================= -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VDE_AcidBolt"]</xpath>
+		<value>
+			<thingClass>CombatExtended.BulletCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VDE_AcidBolt"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>VDE_AcidSpit</damageDef>
+				<damageAmountBase>5</damageAmountBase>
+				<speed>21</speed>
+				<armorPenetrationSharp>2</armorPenetrationSharp>
+				<armorPenetrationBlunt>2.4</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Ideology Expanded - Dryads/Patches/Vanilla Ideology Expanded - Dryads/ThingDefs_Items/Items_Resource_Stuff.xml b/ModPatches/Vanilla Ideology Expanded - Dryads/Patches/Vanilla Ideology Expanded - Dryads/ThingDefs_Items/Items_Resource_Stuff.xml
new file mode 100644
index 0000000000..7648e8a763
--- /dev/null
+++ b/ModPatches/Vanilla Ideology Expanded - Dryads/Patches/Vanilla Ideology Expanded - Dryads/ThingDefs_Items/Items_Resource_Stuff.xml	
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VDE_Gaubric"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.05</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VDE_Gaubric"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.04</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VDE_Gaubric"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.01</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Ideology Expanded - Dryads/Patches/Vanilla Ideology Expanded - Dryads/ThingDefs_Races/Races_Animal_AwakenedDryads.xml b/ModPatches/Vanilla Ideology Expanded - Dryads/Patches/Vanilla Ideology Expanded - Dryads/ThingDefs_Races/Races_Animal_AwakenedDryads.xml
new file mode 100644
index 0000000000..045b0c94b4
--- /dev/null
+++ b/ModPatches/Vanilla Ideology Expanded - Dryads/Patches/Vanilla Ideology Expanded - Dryads/ThingDefs_Races/Races_Animal_AwakenedDryads.xml	
@@ -0,0 +1,1123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Carrier"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ======================== Awakened Carrier ========================  -->
+
+	<!-- Adding stats to the pawn to make sure they have them -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Carrier"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.06</MeleeCritChance>
+			<MeleeParryChance>0.04</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<!-- Adds the combat stats that CE needs in order to work-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Carrier"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.5</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>5</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ======================== Awakened Clawer ========================  -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Clawer"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Adding stats to the pawn to make sure they have them -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Clawer"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>2.25</ArmorRating_Blunt>
+			<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+			<MeleeDodgeChance>0.8</MeleeDodgeChance>
+			<MeleeCritChance>0.45</MeleeCritChance>
+			<MeleeParryChance>0.50</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<!-- Adds the combat stats that CE needs in order to work-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Clawer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>0.96</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>24</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>8</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>0.96</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>24</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>5.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>8</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>1.5</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+					<armorPenetrationSharp>15</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>5</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.2</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ======================== Awakened Barkskin ========================  -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Barkskin"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Barkskin"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>0.08</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Barkskin"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>24</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Barkskin"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Adds the combat stats that CE needs in order to work-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Barkskin"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.5</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>5</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ======================== Awakened WoodMaker ========================  -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Woodmaker"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Adding stats to the pawn to make sure they have them -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Woodmaker"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.06</MeleeCritChance>
+			<MeleeParryChance>0.04</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<!-- Adds the combat stats that CE needs in order to work-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Woodmaker"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>15</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.5</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>8</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>5</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ======================== Awakened Medicinemaker ========================  -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Medicinemaker"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Adding stats to the pawn to make sure they have them -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Medicinemaker"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.06</MeleeCritChance>
+			<MeleeParryChance>0.04</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<!-- Adds the combat stats that CE needs in order to work-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Medicinemaker"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.5</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>5</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ======================== Awakened Berrymaker ========================  -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Berrymaker"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Adding stats to the pawn to make sure they have them -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Berrymaker"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.06</MeleeCritChance>
+			<MeleeParryChance>0.04</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<!-- Adds the combat stats that CE needs in order to work-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Berrymaker"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.5</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>5</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ======================== Awakened Stonedigger ========================  -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Stonedigger"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Adding stats to the pawn to make sure they have them -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Stonedigger"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.06</MeleeCritChance>
+			<MeleeParryChance>0.04</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<!-- Adds the combat stats that CE needs in order to work-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Stonedigger"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.5</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>5</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ======================== Awakened Nectarmaker ========================  -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Nectarmaker"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Adding stats to the pawn to make sure they have them -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Nectarmaker"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.06</MeleeCritChance>
+			<MeleeParryChance>0.04</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<!-- Adds the combat stats that CE needs in order to work-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Nectarmaker"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.5</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>5</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ======================== Awakened Spitter ========================  -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Spitter"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Serpentine</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Adding stats to the pawn to make sure they have them -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Spitter"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>0.75</ArmorRating_Blunt>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.06</MeleeCritChance>
+			<MeleeParryChance>0.04</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<!-- Adds the combat stats that CE needs in order to work-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Spitter"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.5</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>5</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ======================== Awakened Gaubricmaker ========================  -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Gaubricmaker"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Adding stats to the pawn to make sure they have them -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Gaubricmaker"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			<MeleeCritChance>0.06</MeleeCritChance>
+			<MeleeParryChance>0.04</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<!-- Adds the combat stats that CE needs in order to work-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Gaubricmaker"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.5</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>10</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>2</cooldownTime>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>5</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Ideology Expanded - Dryads/Patches/Vanilla Ideology Expanded - Dryads/ThingDefs_Races/Races_Spitter_RangedAttack.xml b/ModPatches/Vanilla Ideology Expanded - Dryads/Patches/Vanilla Ideology Expanded - Dryads/ThingDefs_Races/Races_Spitter_RangedAttack.xml
new file mode 100644
index 0000000000..9b3395799b
--- /dev/null
+++ b/ModPatches/Vanilla Ideology Expanded - Dryads/Patches/Vanilla Ideology Expanded - Dryads/ThingDefs_Races/Races_Spitter_RangedAttack.xml	
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VDE_Dryad_Spitter"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Ideology Expanded - Hats and Rags/Patches/Vanilla Ideology Expanded - Hats and Rags/Apparel_Headgear.xml b/ModPatches/Vanilla Ideology Expanded - Hats and Rags/Patches/Vanilla Ideology Expanded - Hats and Rags/Apparel_Headgear.xml
new file mode 100644
index 0000000000..5479af29a0
--- /dev/null
+++ b/ModPatches/Vanilla Ideology Expanded - Hats and Rags/Patches/Vanilla Ideology Expanded - Hats and Rags/Apparel_Headgear.xml	
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="VIEHAR_Apparel_Beads" or
+			defName="VIEHAR_Apparel_BishopHat" or
+			defName="VIEHAR_Apparel_BrimlessHat" or
+			defName="VIEHAR_Apparel_CommisarHat" or
+			defName="VIEHAR_Apparel_DeerSkull" or
+			defName="VIEHAR_Apparel_Fez" or
+			defName="VIEHAR_Apparel_Headbag" or
+			defName="VIEHAR_Apparel_Headscarf" or
+			defName="VIEHAR_Apparel_HorseMask" or
+			defName="VIEHAR_Apparel_MilitaryCap" or
+			defName="VIEHAR_Apparel_WideHat"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="VIEHAR_Apparel_Skullcap" or
+			defName="VIEHAR_Apparel_SpikedSkullcap"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+			<Bulk>3</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="VIEHAR_Apparel_DeerSkull" or
+			defName="VIEHAR_Apparel_Headbag" or
+			defName="VIEHAR_Apparel_HorseMask" or
+			defName="VIEHAR_Apparel_MilitaryCap"
+			] </xpath>
+		<value>
+			<equippedStatOffsets>
+				<Suppressability>-0.25</Suppressability>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VIEHAR_Apparel_CommisarHat"]/equippedStatOffsets</xpath>
+		<value>
+			<Suppressability>-0.25</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VIEHAR_Apparel_Beads" or defName="VIEHAR_Apparel_Headscarf"]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>StrappedHead</li>
+			</layers>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Ideology Expanded - Hats and Rags/Patches/Vanilla Ideology Expanded - Hats and Rags/Apparel_Various.xml b/ModPatches/Vanilla Ideology Expanded - Hats and Rags/Patches/Vanilla Ideology Expanded - Hats and Rags/Apparel_Various.xml
new file mode 100644
index 0000000000..6d56fd03c0
--- /dev/null
+++ b/ModPatches/Vanilla Ideology Expanded - Hats and Rags/Patches/Vanilla Ideology Expanded - Hats and Rags/Apparel_Various.xml	
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VIEHAR_Apparel_Rags"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Ideology Expanded - Memes and Structures/Patches/Vanilla Ideology Expanded - Memes and Structures/Hediffs_BodyParts.xml b/ModPatches/Vanilla Ideology Expanded - Memes and Structures/Patches/Vanilla Ideology Expanded - Memes and Structures/Hediffs_BodyParts.xml
new file mode 100644
index 0000000000..e89bb7744e
--- /dev/null
+++ b/ModPatches/Vanilla Ideology Expanded - Memes and Structures/Patches/Vanilla Ideology Expanded - Memes and Structures/Hediffs_BodyParts.xml	
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="VME_FleshcraftedArmHediff"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label><!-- Same as natural fist. -->
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Persona Weapons Expanded/Patches/Vanilla Persona Weapons Expanded/MeleeBladelink.xml b/ModPatches/Vanilla Persona Weapons Expanded/Patches/Vanilla Persona Weapons Expanded/MeleeBladelink.xml
new file mode 100644
index 0000000000..a8e8cff113
--- /dev/null
+++ b/ModPatches/Vanilla Persona Weapons Expanded/Patches/Vanilla Persona Weapons Expanded/MeleeBladelink.xml	
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VPWE_MeleeWeapon_PsyfocusStaffBladelink"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VPWE_MeleeWeapon_PsyfocusStaffBladelink"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>1.56</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VPWE_MeleeWeapon_PsyfocusStaffBladelink"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.6</MeleeCritChance>
+			<MeleeParryChance>1.17</MeleeParryChance>
+			<MeleeDodgeChance>0.47</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Plants Expanded - Mushrooms/Patches/Vanilla Plants Expanded - Mushrooms/ThingDefs_Items/Items_Resource_Stuff.xml b/ModPatches/Vanilla Plants Expanded - Mushrooms/Patches/Vanilla Plants Expanded - Mushrooms/ThingDefs_Items/Items_Resource_Stuff.xml
new file mode 100644
index 0000000000..de0e776201
--- /dev/null
+++ b/ModPatches/Vanilla Plants Expanded - Mushrooms/Patches/Vanilla Plants Expanded - Mushrooms/ThingDefs_Items/Items_Resource_Stuff.xml	
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VPE_Mycothread"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.009</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VPE_Mycothread"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.015</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VPE_Mycothread"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.04</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VPE_Mycothread"]/statBases</xpath>
+		<value>
+			<Bulk>0.05</Bulk>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Psycasts Expanded - Hemosage/Patches/Vanilla Psycasts Expanded - Hemosage/AbilityDefs/AbilityDefs_Patch.xml b/ModPatches/Vanilla Psycasts Expanded - Hemosage/Patches/Vanilla Psycasts Expanded - Hemosage/AbilityDefs/AbilityDefs_Patch.xml
new file mode 100644
index 0000000000..ee77b79693
--- /dev/null
+++ b/ModPatches/Vanilla Psycasts Expanded - Hemosage/Patches/Vanilla Psycasts Expanded - Hemosage/AbilityDefs/AbilityDefs_Patch.xml	
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPEH_BloodShard"]/range</xpath>
+		<value>
+			<range>21</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPEH_SanguineSpear"]/range</xpath>
+		<value>
+			<range>62</range>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Psycasts Expanded - Hemosage/Patches/Vanilla Psycasts Expanded - Hemosage/ThingDefs/Projectile_Tweaks.xml b/ModPatches/Vanilla Psycasts Expanded - Hemosage/Patches/Vanilla Psycasts Expanded - Hemosage/ThingDefs/Projectile_Tweaks.xml
new file mode 100644
index 0000000000..2bbbd4ba8a
--- /dev/null
+++ b/ModPatches/Vanilla Psycasts Expanded - Hemosage/Patches/Vanilla Psycasts Expanded - Hemosage/ThingDefs/Projectile_Tweaks.xml	
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VPEH_BloodShard"]/projectile</xpath>
+		<value>
+			<armorPenetrationBase>3</armorPenetrationBase>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VPEH_BloodShard"]/projectile/damageAmountBase</xpath>
+		<value>
+			<damageAmountBase>6</damageAmountBase>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VPEH_SanguineSpear"]/projectile</xpath>
+		<value>
+			<armorPenetrationBase>6</armorPenetrationBase>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VPEH_SanguineSpear"]/projectile/speed</xpath>
+		<value>
+			<speed>30</speed>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Psycasts Expanded/Patches/Vanilla Psycasts Expanded/AbilityDefs/AbilityDefs_Patch.xml b/ModPatches/Vanilla Psycasts Expanded/Patches/Vanilla Psycasts Expanded/AbilityDefs/AbilityDefs_Patch.xml
new file mode 100644
index 0000000000..012da9b9dd
--- /dev/null
+++ b/ModPatches/Vanilla Psycasts Expanded/Patches/Vanilla Psycasts Expanded/AbilityDefs/AbilityDefs_Patch.xml	
@@ -0,0 +1,370 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ======= Ability Range Adjustment 'ARA ARAA~' ======= -->
+
+	<!-- ===== Archon Psycaster Path ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_MindBreak"]/range</xpath>
+		<value>
+			<range>6</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_BlindingPulse"]/range</xpath>
+		<value>
+			<range>28</range>
+		</value>
+	</Operation>
+
+	<!-- ===== ArchoTechist Psycaster Path ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_BerserkPulse"]/range</xpath>
+		<value>
+			<range>17.5</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Berserk"]/range</xpath>
+		<value>
+			<range>23</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Stun" or defName="VPE_PsychicShock" or defName="VPE_NeuralHeatDump" or defName="VPE_AggressiveHeatDump"]/range</xpath>
+		<value>
+			<range>28</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Burden"]/range</xpath>
+		<value>
+			<range>34.5</range>
+		</value>
+	</Operation>
+
+	<!-- ===== Chronopath Psycaster Path ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_PlantTimeskip" or defName="VPE_Age"]/range</xpath>
+		<value>
+			<range>8</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_TimeSphere"]/range</xpath>
+		<value>
+			<range>28</range>
+		</value>
+	</Operation>
+
+	<!-- ===== Conflagator Psycaster Path ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_FireShield"]/range</xpath>
+		<value>
+			<range>8</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_BreatheFlame" or defName="VPE_Explosion"]/range</xpath>
+		<value>
+			<range>19</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Flameball"]/range</xpath>
+		<value>
+			<range>28</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_EyeBlast"]/range</xpath>
+		<value>
+			<range>30</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_MeteorShower"]/range</xpath>
+		<value>
+			<range>40</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_FireBeam" or defName="VPE_FlameTornado"]/range</xpath>
+		<value>
+			<range>51</range>
+		</value>
+	</Operation>
+
+	<!-- ===== Frostshaper Psycaster Path ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_IceCrystal"]/range</xpath>
+		<value>
+			<range>8</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_IceShield"]/range</xpath>
+		<value>
+			<range>14.5</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_IceBreath"]/range</xpath>
+		<value>
+			<range>19</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_FrostRay"]/range</xpath>
+		<value>
+			<range>25</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_IceSpike" or defName="VPE_IceBlock" or defName="VPE_SnapFreeze"]/range</xpath>
+		<value>
+			<range>28</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_ColdZone"]/range</xpath>
+		<value>
+			<range>68</range>
+		</value>
+	</Operation>
+
+	<!-- ===== Harmonist Psycaster Path ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_PsychicGuidance" or defName="VPE_LuckTransfer"]/range</xpath>
+		<value>
+			<range>8</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_HealthSwap"]/range</xpath>
+		<value>
+			<range>17.5</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Mindcontrol"]/range</xpath>
+		<value>
+			<range>23</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_TransmuteStone"]/range</xpath>
+		<value>
+			<range>28</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_LocationSwap"]/range</xpath>
+		<value>
+			<range>35</range>
+		</value>
+	</Operation>
+
+	<!-- ===== Necropath Psycaster Path ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_StealVitality"]/range</xpath>
+		<value>
+			<range>6</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Liferot"]/range</xpath>
+		<value>
+			<range>17.5</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Enthrall"]/range</xpath>
+		<value>
+			<range>28</range>
+		</value>
+	</Operation>
+
+	<!-- ===== Nightstalker Psycaster Path ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Darkvision"]/range</xpath>
+		<value>
+			<range>8</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Decoy"]/range</xpath>
+		<value>
+			<range>23</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Darkness"]/range</xpath>
+		<value>
+			<range>28</range>
+		</value>
+	</Operation>
+
+	<!-- ===== Protector Psycaster Path ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Overshield"]/range</xpath>
+		<value>
+			<range>12</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Painblock" or defName="VPE_Skipshield"]/range</xpath>
+		<value>
+			<range>28</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Focus" or defName="VPE_Invisibility"]/range</xpath>
+		<value>
+			<range>32</range>
+		</value>
+	</Operation>
+
+	<!-- ===== Skipmaster Psycaster Path ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Skipdoor"]/range</xpath>
+		<value>
+			<range>8</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_MassChaosSkip"]/range</xpath>
+		<value>
+			<range>23</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_SolarPinhole" or defName="VPE_Chunkskip" or defName="VPE_Waterskip" or defName="VPE_ChaosSkip" or defName="VPE_Wallraise" or defName="VPE_Smokepop"]/range</xpath>
+		<value>
+			<range>28</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Skip"]/range</xpath>
+		<value>
+			<range>32</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Smokepop"]/radius</xpath>
+		<value>
+			<radius>4.0</radius>
+		</value>
+	</Operation>
+
+	<!-- ===== Staticlord Psycaster Path ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_StaticAura"]/range</xpath>
+		<value>
+			<range>8</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Vortex" or defName="VPE_Flashstorm"]/range</xpath>
+		<value>
+			<range>23</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Bolt"]/range</xpath>
+		<value>
+			<range>25</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_ChainBolt" or defName="VPE_Thunderbolt"]/range</xpath>
+		<value>
+			<range>28</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_BallLightning"]/range</xpath>
+		<value>
+			<range>34.5</range>
+		</value>
+	</Operation>
+
+	<!-- ===== Technomancer Psycaster Path ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Haywire"]/range</xpath>
+		<value>
+			<range>23</range>
+		</value>
+	</Operation>
+
+	<!-- ===== Warlord Psycaster Path ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_PowerLeap"]/range</xpath>
+		<value>
+			<range>19</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Beckon" or defName="VPE_Killskip" or defName="VPE_MassBeckon"]/range</xpath>
+		<value>
+			<range>23</range>
+		</value>
+	</Operation>
+
+	<!-- ===== Wildspeaker Psycaster Path ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_BrambleMaze" or defName="VPE_CropBurst"]/range</xpath>
+		<value>
+			<range>28</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_ManhunterPulse" or defName="VPE_AnimalAllies"]/range</xpath>
+		<value>
+			<range>40</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_TreeSprout"]/range</xpath>
+		<value>
+			<range>42</range>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Psycasts Expanded/Patches/Vanilla Psycasts Expanded/Bodies/Bodies_Patch.xml b/ModPatches/Vanilla Psycasts Expanded/Patches/Vanilla Psycasts Expanded/Bodies/Bodies_Patch.xml
new file mode 100644
index 0000000000..403e30084b
--- /dev/null
+++ b/ModPatches/Vanilla Psycasts Expanded/Patches/Vanilla Psycasts Expanded/Bodies/Bodies_Patch.xml	
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ======= Body Parts ======= -->
+
+	<!-- ===== Constructs ===== -->
+
+	<!-- === Rock Construct === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="VPE_RockConstructBody"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="VPE_RockConstructBody"]/corePart/parts/li[def = "VPE_RockHead"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="VPE_RockConstructBody"]/corePart/parts/li[def = "VPE_RockBody"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<!-- === Metal Construct === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="VPE_MetalConstructBody"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="VPE_MetalConstructBody"]/corePart/parts/li[def = "VPE_MetalHead"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="VPE_MetalConstructBody"]/corePart/parts/li[def = "VPE_MetalBody"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+	<!-- ===== Skeletal Body ===== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="VPE_SkeletalBody"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="VPE_SkeletalBody"]/corePart/parts/li[def = "VPE_Skull"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="VPE_SkeletalBody"]/corePart/parts/li[def = "VPE_SkeletalArm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="VPE_SkeletalBody"]/corePart/parts/li[def = "VPE_SkeletalLeg"]</xpath>
+		<value>
+			<groups>
+				<li>CoveredByNaturalArmor</li>
+			</groups>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Psycasts Expanded/Patches/Vanilla Psycasts Expanded/HediffDefs/Hediffs_Patch.xml b/ModPatches/Vanilla Psycasts Expanded/Patches/Vanilla Psycasts Expanded/HediffDefs/Hediffs_Patch.xml
new file mode 100644
index 0000000000..8012d33b90
--- /dev/null
+++ b/ModPatches/Vanilla Psycasts Expanded/Patches/Vanilla Psycasts Expanded/HediffDefs/Hediffs_Patch.xml	
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ===== Psycast Hediff ===== -->
+
+	<!-- === Conflagrator === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="VPE_FireShield"]/stages/li/statOffsets</xpath>
+		<value>
+			<ArmorRating_Heat>3.0</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!-- === Warlord === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="VPE_FiringFocus"]/stages/li/statFactors</xpath>
+		<value>
+			<statOffsets>
+				<AimingDelayFactor>-0.50</AimingDelayFactor>
+				<ReloadSpeed>1.0</ReloadSpeed>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="VPE_AdrenalineRush"]/stages/li</xpath>
+		<value>
+			<statOffsets>
+				<Suppressability>-0.25</Suppressability>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="VPE_GuidedShot"]/stages/li</xpath>
+		<value>
+			<statOffsets>
+				<AimingAccuracy>5.0</AimingAccuracy>
+				<ShootingAccuracyPawn>5.0</ShootingAccuracyPawn>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<!-- === Harmonist === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="VPE_Lucky"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<statOffsets>
+						<ShootingAccuracyPawn>5.0</ShootingAccuracyPawn>
+						<MeleeHitChance>5</MeleeHitChance>
+						<MeleeDodgeChance>5.0</MeleeDodgeChance>
+						<IncomingDamageFactor>-1.0</IncomingDamageFactor>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="VPE_UnLucky"]</xpath>
+		<value>
+			<stages>
+				<li>
+					<statOffsets>
+						<ShootingAccuracyPawn>-5.0</ShootingAccuracyPawn>
+						<MeleeHitChance>-5</MeleeHitChance>
+						<MeleeDodgeChance>-5.0</MeleeDodgeChance>
+					</statOffsets>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+
+	<!-- === Nightstalker === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="VPE_Darkvision"]/stages/li/statFactors</xpath>
+		<value>
+			<statOffsets>
+				<NightVisionEfficiency>1.0</NightVisionEfficiency>
+			</statOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Psycasts Expanded/Patches/Vanilla Psycasts Expanded/PawnKinds/EmpirePawnKinds_Patch.xml b/ModPatches/Vanilla Psycasts Expanded/Patches/Vanilla Psycasts Expanded/PawnKinds/EmpirePawnKinds_Patch.xml
new file mode 100644
index 0000000000..788925aee3
--- /dev/null
+++ b/ModPatches/Vanilla Psycasts Expanded/Patches/Vanilla Psycasts Expanded/PawnKinds/EmpirePawnKinds_Patch.xml	
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ===== Pawnkinds ===== -->
+
+	<!-- === Empire Warlord Ranged === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Empire_Caster_Warlord_Ranged"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>400</min>
+							<max>600</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Psycasts Expanded/Patches/Vanilla Psycasts Expanded/ThingDefs/Projectile_Tweaks.xml b/ModPatches/Vanilla Psycasts Expanded/Patches/Vanilla Psycasts Expanded/ThingDefs/Projectile_Tweaks.xml
new file mode 100644
index 0000000000..77121da206
--- /dev/null
+++ b/ModPatches/Vanilla Psycasts Expanded/Patches/Vanilla Psycasts Expanded/ThingDefs/Projectile_Tweaks.xml	
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ======= Projectile Adjustment ======= -->
+
+	<!-- ===== Conflagator ===== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VPE_Flameball"]/projectile</xpath>
+		<value>
+			<damageAmountBase>10</damageAmountBase>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VPE_Flameball"]/projectile/speed</xpath>
+		<value>
+			<speed>30</speed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.ExpandableProjectileDef[defName="VPE_FireBreath"]/projectile/damageAmountBase</xpath>
+		<value>
+			<damageAmountBase>12</damageAmountBase>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.ExpandableProjectileDef[defName="VPE_FireBreath"]/projectile/speed</xpath>
+		<value>
+			<speed>53</speed>
+		</value>
+	</Operation>
+
+	<!-- ===== Staticlord ===== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VPE_Bolt"]/projectile</xpath>
+		<value>
+			<damageAmountBase>10</damageAmountBase>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VPE_BallLightning"]/projectile/speed</xpath>
+		<value>
+			<speed>8</speed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VPE_BallLightning"]/projectile/damageAmountBase</xpath>
+		<value>
+			<damageAmountBase>12</damageAmountBase>
+		</value>
+	</Operation>
+
+	<!-- ===== Frostshaper ===== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFECore.ExpandableProjectileDef[defName="VPE_IceBreathe"]/projectile/speed</xpath>
+		<value>
+			<speed>48</speed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VPE_IceSpike"]/projectile/damageAmountBase</xpath>
+		<value>
+			<damageAmountBase>15</damageAmountBase>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Psycasts Expanded/Patches/Vanilla Psycasts Expanded/ThingDefs_Misc/Apparel_Patch.xml b/ModPatches/Vanilla Psycasts Expanded/Patches/Vanilla Psycasts Expanded/ThingDefs_Misc/Apparel_Patch.xml
new file mode 100644
index 0000000000..ab74fa23d0
--- /dev/null
+++ b/ModPatches/Vanilla Psycasts Expanded/Patches/Vanilla Psycasts Expanded/ThingDefs_Misc/Apparel_Patch.xml	
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ===== Apparel ===== -->
+
+	<!-- === Eltex Mask === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VPE_Apparel_EltexMask"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VPE_Apparel_EltexMask"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VPE_Apparel_EltexMask"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.0</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VPE_Apparel_EltexMask"]/equippedStatOffsets</xpath>
+		<value>
+			<Suppressability>-0.20</Suppressability>
+		</value>
+	</Operation>
+
+	<!-- === Eltex Cape === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VPE_Apparel_EltexCape"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VPE_Apparel_EltexCape"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VPE_Apparel_EltexCape"]/statBases/ArmorRating_Blunt</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VPE_Apparel_EltexCape"]/statBases/ArmorRating_Heat</xpath>
+	</Operation>
+
+	<!-- === Plate Armor Prestige === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VPE_Apparel_PlateArmorPrestige"]/statBases</xpath>
+		<value>
+			<Bulk>100</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VPE_Apparel_PlateArmorPrestige"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VPE_Apparel_PlateArmorPrestige"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<MeleeDodgeChance>-0.15</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VPE_Apparel_PlateArmorPrestige"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VPE_Apparel_PlateArmorPrestige"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Psyring === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VPE_Psyring"]/statBases</xpath>
+		<value>
+			<Bulk>0.5</Bulk>
+			<WornBulk>0.1</WornBulk>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Psycasts Expanded/Patches/Vanilla Psycasts Expanded/ThingDefs_Misc/Weapons_Patch.xml b/ModPatches/Vanilla Psycasts Expanded/Patches/Vanilla Psycasts Expanded/ThingDefs_Misc/Weapons_Patch.xml
new file mode 100644
index 0000000000..f573342d4e
--- /dev/null
+++ b/ModPatches/Vanilla Psycasts Expanded/Patches/Vanilla Psycasts Expanded/ThingDefs_Misc/Weapons_Patch.xml	
@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ===== Eltex Weapon ===== -->
+
+	<!-- === Eltex Dagger === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexDagger"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<MeleeCounterParryBonus>0.25</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexDagger"]/equippedStatOffsets</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexDagger"]</xpath>
+			<value>
+				<equippedStatOffsets>
+					<MeleeCritChance>0.15</MeleeCritChance>
+					<MeleeParryChance>0.30</MeleeParryChance>
+					<MeleeDodgeChance>0.30</MeleeDodgeChance>
+				</equippedStatOffsets>
+			</value>
+		</nomatch>
+
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexDagger"]/equippedStatOffsets</xpath>
+			<value>
+				<MeleeCritChance>0.15</MeleeCritChance>
+				<MeleeParryChance>0.30</MeleeParryChance>
+				<MeleeDodgeChance>0.30</MeleeDodgeChance>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexDagger"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexDagger"]</xpath>
+			<value>
+				<weaponTags>
+					<li>CE_OneHandedWeapon</li>
+				</weaponTags>
+			</value>
+		</nomatch>
+
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexDagger"]/weaponTags</xpath>
+			<value>
+				<li>CE_OneHandedWeapon</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexDagger"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.69</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.46</cooldownTime>
+					<chanceFactor>0.50</chanceFactor>
+					<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.20</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.36</cooldownTime>
+					<chanceFactor>0.45</chanceFactor>
+					<armorPenetrationBlunt>0.95</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.58</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Eltex Mace === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexMace"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexMace"]/equippedStatOffsets</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexMace"]</xpath>
+			<value>
+				<equippedStatOffsets>
+					<MeleeCritChance>0.42</MeleeCritChance>
+					<MeleeParryChance>0.24</MeleeParryChance>
+					<MeleeDodgeChance>0.2</MeleeDodgeChance>
+				</equippedStatOffsets>
+			</value>
+		</nomatch>
+
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexMace"]/equippedStatOffsets</xpath>
+			<value>
+				<MeleeCritChance>0.42</MeleeCritChance>
+				<MeleeParryChance>0.24</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexMace"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexMace"]</xpath>
+			<value>
+				<weaponTags>
+					<li>CE_OneHandedWeapon</li>
+				</weaponTags>
+			</value>
+		</nomatch>
+
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexMace"]/weaponTags</xpath>
+			<value>
+				<li>CE_OneHandedWeapon</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexMace"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>2.1</cooldownTime>
+					<chanceFactor>0.90</chanceFactor>
+					<armorPenetrationBlunt>6.925</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Eltex Sword === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexSword"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexSword"]/equippedStatOffsets</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexSword"]</xpath>
+			<value>
+				<equippedStatOffsets>
+					<MeleeCritChance>0.40</MeleeCritChance>
+					<MeleeParryChance>0.60</MeleeParryChance>
+					<MeleeDodgeChance>0.30</MeleeDodgeChance>
+				</equippedStatOffsets>
+			</value>
+		</nomatch>
+
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexSword"]/equippedStatOffsets</xpath>
+			<value>
+				<MeleeCritChance>0.40</MeleeCritChance>
+				<MeleeParryChance>0.60</MeleeParryChance>
+				<MeleeDodgeChance>0.30</MeleeDodgeChance>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexSword"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexSword"]</xpath>
+			<value>
+				<weaponTags>
+					<li>CE_OneHandedWeapon</li>
+				</weaponTags>
+			</value>
+		</nomatch>
+
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexSword"]/weaponTags</xpath>
+			<value>
+				<li>CE_OneHandedWeapon</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexSword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.46</cooldownTime>
+					<chanceFactor>0.50</chanceFactor>
+					<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.40</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>21</power>
+					<cooldownTime>1.59</cooldownTime>
+					<chanceFactor>0.45</chanceFactor>
+					<armorPenetrationBlunt>1.1</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.58</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ===== Misc ===== -->
+
+	<!-- === Heat Pearls === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VPE_HeatPearls"]/verbs/li/range</xpath>
+		<value>
+			<range>17.9</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VPE_HeatPearls"]/verbs/li/forcedMissRadius</xpath>
+		<value>
+			<forcedMissRadius>0.9</forcedMissRadius>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Psycasts Expanded/Patches/Vanilla Psycasts Expanded/ThingDefs_Races/Races_Patch.xml b/ModPatches/Vanilla Psycasts Expanded/Patches/Vanilla Psycasts Expanded/ThingDefs_Races/Races_Patch.xml
new file mode 100644
index 0000000000..5247de0911
--- /dev/null
+++ b/ModPatches/Vanilla Psycasts Expanded/Patches/Vanilla Psycasts Expanded/ThingDefs_Races/Races_Patch.xml	
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ===== Psychic Construct ===== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VPE_SteelConstruct" or defName="VPE_RockConstruct" or defName="VPE_SummonedSkeleton"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VPE_SteelConstruct" or defName="VPE_RockConstruct"]/statBases</xpath>
+		<value>
+			<CarryWeight>5</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.19</MeleeDodgeChance>
+			<MeleeCritChance>0.22</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
+			<MaxHitPoints>200</MaxHitPoints>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!-- === Steel Construct === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VPE_SteelConstruct"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2.6</ArmorRating_Sharp>
+			<ArmorRating_Blunt>0.4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VPE_SteelConstruct"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>4.16</cooldownTime>
+					<armorPenetrationSharp>1.74</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.91</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Rock Construct === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VPE_RockConstruct"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Sharp>0.4</ArmorRating_Sharp>
+			<ArmorRating_Blunt>2.6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VPE_RockConstruct"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>4.16</cooldownTime>
+					<armorPenetrationSharp>0.91</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.74</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ===== Skeleton ===== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VPE_SummonedSkeleton"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VPE_SummonedSkeleton"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.44</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationSharp>0</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.44</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Races Expanded - Android/Patches/Vanilla Races Expanded - Android/Scenario_Android.xml b/ModPatches/Vanilla Races Expanded - Android/Patches/Vanilla Races Expanded - Android/Scenario_Android.xml
new file mode 100644
index 0000000000..d83b8b3387
--- /dev/null
+++ b/ModPatches/Vanilla Races Expanded - Android/Patches/Vanilla Races Expanded - Android/Scenario_Android.xml	
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Adds ammo to the scenario === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="VREA_NewUtopia"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_556x45mmNATO_FMJ</thingDef>
+				<count>150</count>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Races Expanded - Archon/Patches/Vanilla Races Expanded - Archon/Apparel_Various.xml b/ModPatches/Vanilla Races Expanded - Archon/Patches/Vanilla Races Expanded - Archon/Apparel_Various.xml
new file mode 100644
index 0000000000..b14ce4cbca
--- /dev/null
+++ b/ModPatches/Vanilla Races Expanded - Archon/Patches/Vanilla Races Expanded - Archon/Apparel_Various.xml	
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Archoplate -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VREA_Apparel_Archoplate"]/statBases</xpath>
+		<value>
+			<Bulk>50</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VREA_Apparel_Archoplate"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>650</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VREA_Apparel_Archoplate"]/statBases/VEF_EnergyShieldEnergyMaxApparel</xpath>
+		<value>
+			<VEF_EnergyShieldEnergyMaxApparel>12</VEF_EnergyShieldEnergyMaxApparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VREA_Apparel_Archoplate"]/statBases/Mass</xpath>
+		<value>
+			<Mass>25</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VREA_Apparel_Archoplate"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VREA_Apparel_Archoplate"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>26</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VREA_Apparel_Archoplate"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>54</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VREA_Apparel_Archoplate"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VREA_Apparel_Archoplate"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VREA_Apparel_Archoplate"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Races Expanded - Archon/Patches/Vanilla Races Expanded - Archon/Archon_Misc.xml b/ModPatches/Vanilla Races Expanded - Archon/Patches/Vanilla Races Expanded - Archon/Archon_Misc.xml
new file mode 100644
index 0000000000..2b5a823682
--- /dev/null
+++ b/ModPatches/Vanilla Races Expanded - Archon/Patches/Vanilla Races Expanded - Archon/Archon_Misc.xml	
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Patch Leatherskin Armor Values === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/GeneDef[defName="VRE_Leatherskin"]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/GeneDef[defName="VRE_Leatherskin"]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Patch Archon Pawnkinds === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="ArchonWarrior"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>12</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Races Expanded - Archon/Patches/Vanilla Races Expanded - Archon/Melee_Archon.xml b/ModPatches/Vanilla Races Expanded - Archon/Patches/Vanilla Races Expanded - Archon/Melee_Archon.xml
new file mode 100644
index 0000000000..ea691e56c0
--- /dev/null
+++ b/ModPatches/Vanilla Races Expanded - Archon/Patches/Vanilla Races Expanded - Archon/Melee_Archon.xml	
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Archoblade === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VREA_MeleeWeapon_ArchobladeBladelink"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.69</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.80</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>VREA_Sear</li>
+					</capacities>
+					<power>49</power>
+					<cooldownTime>1.37</cooldownTime>
+					<armorPenetrationBlunt>4.06</armorPenetrationBlunt>
+					<armorPenetrationSharp>50</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VREA_MeleeWeapon_ArchobladeBladelink"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>1.42</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VREA_MeleeWeapon_ArchobladeBladelink"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.00</MeleeCritChance>
+				<MeleeParryChance>0.60</MeleeParryChance>
+				<MeleeDodgeChance>0.53</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Races Expanded - Fungoid/Patches/Vanilla Races Expanded - Fungoid/Apparel_Various.xml b/ModPatches/Vanilla Races Expanded - Fungoid/Patches/Vanilla Races Expanded - Fungoid/Apparel_Various.xml
new file mode 100644
index 0000000000..20bd46a6cb
--- /dev/null
+++ b/ModPatches/Vanilla Races Expanded - Fungoid/Patches/Vanilla Races Expanded - Fungoid/Apparel_Various.xml	
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === Space Suit === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="VREF_ApparelArmorAstrosuitBase"]/statBases</xpath>
+		<value>
+			<Bulk>40</Bulk>
+			<WornBulk>15</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="VREF_ApparelArmorAstrosuitBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="VREF_ApparelArmorAstrosuitBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>28</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="VREF_ApparelArmorAstrosuitBase"]/equippedStatOffsets/MoveSpeed</xpath>
+		<value>
+			<MeleeDodgeChance>-0.15</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="VREF_ApparelArmorAstrosuitBase"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="VREF_ApparelArmorAstrosuitBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Leg</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Races Expanded - Fungoid/Patches/Vanilla Races Expanded - Fungoid/Fungoid_Hediffs_BodyParts.xml b/ModPatches/Vanilla Races Expanded - Fungoid/Patches/Vanilla Races Expanded - Fungoid/Fungoid_Hediffs_BodyParts.xml
new file mode 100644
index 0000000000..01265d8d63
--- /dev/null
+++ b/ModPatches/Vanilla Races Expanded - Fungoid/Patches/Vanilla Races Expanded - Fungoid/Fungoid_Hediffs_BodyParts.xml	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="VRE_InfectorMouth"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>infector mouth</label>
+					<capacities>
+						<li>VRE_Infection_Bite</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="VRE_InfectorHands"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>infector hand</label>
+					<capacities>
+						<li>VRE_Infection</li>
+					</capacities>
+					<power>8</power>
+					<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.18</armorPenetrationSharp>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<cooldownTime>1.5</cooldownTime>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Races Expanded - Highmate/Patches/Vanilla Races Expanded - Highmate/HighmateBondEffectHediffs/HighmateBondEffectHediffs.xml b/ModPatches/Vanilla Races Expanded - Highmate/Patches/Vanilla Races Expanded - Highmate/HighmateBondEffectHediffs/HighmateBondEffectHediffs.xml
new file mode 100644
index 0000000000..79b28b5d99
--- /dev/null
+++ b/ModPatches/Vanilla Races Expanded - Highmate/Patches/Vanilla Races Expanded - Highmate/HighmateBondEffectHediffs/HighmateBondEffectHediffs.xml	
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="VRE_PsychicBondBloodlust"]/stages/li/statFactors/MeleeDamageFactor</xpath>
+		<value>
+			<MeleeDamageFactor>1.25</MeleeDamageFactor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="VRE_PsychicBondCarefulShooter"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>1.0</ShootingAccuracyPawn>
+			<AimingAccuracy>0.1</AimingAccuracy>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Races Expanded - Hussar/Patches/Vanilla Races Expanded - Hussar/GeneDefs/GeneDefs_Misc.xml b/ModPatches/Vanilla Races Expanded - Hussar/Patches/Vanilla Races Expanded - Hussar/GeneDefs/GeneDefs_Misc.xml
new file mode 100644
index 0000000000..97d81deb51
--- /dev/null
+++ b/ModPatches/Vanilla Races Expanded - Hussar/Patches/Vanilla Races Expanded - Hussar/GeneDefs/GeneDefs_Misc.xml	
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/GeneDef[defName="VREH_BulletproofSkin"]</xpath>
+		<value>
+			<statOffsets>
+				<ArmorRating_Sharp>4.0</ArmorRating_Sharp>
+			</statOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Races Expanded - Phytokin/Patches/Vanilla Races Expanded - Phytokin/GeneDefs/GeneDefs_BarkSkin.xml b/ModPatches/Vanilla Races Expanded - Phytokin/Patches/Vanilla Races Expanded - Phytokin/GeneDefs/GeneDefs_BarkSkin.xml
new file mode 100644
index 0000000000..e1682aa21e
--- /dev/null
+++ b/ModPatches/Vanilla Races Expanded - Phytokin/Patches/Vanilla Races Expanded - Phytokin/GeneDefs/GeneDefs_BarkSkin.xml	
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/GeneDef[defName="VRE_BarkSkin"]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>8.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Races Expanded - Phytokin/Patches/Vanilla Races Expanded - Phytokin/GeneDefs/Races_Animal_Ideology.xml b/ModPatches/Vanilla Races Expanded - Phytokin/Patches/Vanilla Races Expanded - Phytokin/GeneDefs/Races_Animal_Ideology.xml
new file mode 100644
index 0000000000..914310e46d
--- /dev/null
+++ b/ModPatches/Vanilla Races Expanded - Phytokin/Patches/Vanilla Races Expanded - Phytokin/GeneDefs/Races_Animal_Ideology.xml	
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Ideology</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="VRE_CompanionDryad"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Quadruped</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VRE_CompanionDryad"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.20</MeleeDodgeChance>
+						<MeleeCritChance>0.15</MeleeCritChance>
+						<MeleeParryChance>0.18</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VRE_CompanionDryad"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>left claw</label>
+								<capacities>
+									<li>Scratch</li>
+								</capacities>
+								<power>7</power>
+								<cooldownTime>1.1</cooldownTime>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>12</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+								<armorPenetrationSharp>0.15</armorPenetrationSharp>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>right claw</label>
+								<capacities>
+									<li>Scratch</li>
+								</capacities>
+								<power>7</power>
+								<cooldownTime>1.1</cooldownTime>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>12</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+								<armorPenetrationSharp>0.15</armorPenetrationSharp>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<capacities>
+									<li>Bite</li>
+								</capacities>
+								<power>14</power>
+								<cooldownTime>1.8</cooldownTime>
+								<surpriseAttack>
+									<extraMeleeDamages>
+										<li>
+											<def>Stun</def>
+											<amount>10</amount>
+										</li>
+									</extraMeleeDamages>
+								</surpriseAttack>
+								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+								<armorPenetrationBlunt>5.0</armorPenetrationBlunt>
+								<armorPenetrationSharp>0.5</armorPenetrationSharp>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>6</power>
+								<cooldownTime>1.5</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<chanceFactor>0.2</chanceFactor>
+								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Races Expanded - Sanguophage/Patches/Vanilla Races Expanded - Sanguophage/AbilityDefs/Abilities_SingleUse.xml b/ModPatches/Vanilla Races Expanded - Sanguophage/Patches/Vanilla Races Expanded - Sanguophage/AbilityDefs/Abilities_SingleUse.xml
new file mode 100644
index 0000000000..851c3ad5d2
--- /dev/null
+++ b/ModPatches/Vanilla Races Expanded - Sanguophage/Patches/Vanilla Races Expanded - Sanguophage/AbilityDefs/Abilities_SingleUse.xml	
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AbilityDef[defName="VRE_PiercingSpine_SingleUse"]/verbProperties/range</xpath>
+		<value>
+			<range>5.9</range>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Races Expanded - Sanguophage/Patches/Vanilla Races Expanded - Sanguophage/HediffDefs/HediffDef_Deathrest.xml b/ModPatches/Vanilla Races Expanded - Sanguophage/Patches/Vanilla Races Expanded - Sanguophage/HediffDefs/HediffDef_Deathrest.xml
new file mode 100644
index 0000000000..f04153a41a
--- /dev/null
+++ b/ModPatches/Vanilla Races Expanded - Sanguophage/Patches/Vanilla Races Expanded - Sanguophage/HediffDefs/HediffDef_Deathrest.xml	
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="VRE_SolidifiedHemogen"]/stages/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
+				<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+			</statOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Races Expanded - Sanguophage/Patches/Vanilla Races Expanded - Sanguophage/HediffDefs/HediffDef_SharpTalons.xml b/ModPatches/Vanilla Races Expanded - Sanguophage/Patches/Vanilla Races Expanded - Sanguophage/HediffDefs/HediffDef_SharpTalons.xml
new file mode 100644
index 0000000000..a7bb795418
--- /dev/null
+++ b/ModPatches/Vanilla Races Expanded - Sanguophage/Patches/Vanilla Races Expanded - Sanguophage/HediffDefs/HediffDef_SharpTalons.xml	
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="VRE_SharpTalons"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>sharp talons</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Races Expanded - Sanguophage/Patches/Vanilla Races Expanded - Sanguophage/ThingDefs_Items/HemogenPacks.xml b/ModPatches/Vanilla Races Expanded - Sanguophage/Patches/Vanilla Races Expanded - Sanguophage/ThingDefs_Items/HemogenPacks.xml
new file mode 100644
index 0000000000..242db6c1f3
--- /dev/null
+++ b/ModPatches/Vanilla Races Expanded - Sanguophage/Patches/Vanilla Races Expanded - Sanguophage/ThingDefs_Items/HemogenPacks.xml	
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VRE_HemogenPack_Animal" or defName="VRE_HemogenPack_Corpse" or defName="VRE_HemogenPack_Sanguophage"]/statBases</xpath>
+		<value>
+			<Bulk>0.25</Bulk>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Races Expanded - Saurid/Patches/Vanilla Races Expanded - Saurid/GeneDefs/GeneDefs_ScaleSkin.xml b/ModPatches/Vanilla Races Expanded - Saurid/Patches/Vanilla Races Expanded - Saurid/GeneDefs/GeneDefs_ScaleSkin.xml
new file mode 100644
index 0000000000..f772356042
--- /dev/null
+++ b/ModPatches/Vanilla Races Expanded - Saurid/Patches/Vanilla Races Expanded - Saurid/GeneDefs/GeneDefs_ScaleSkin.xml	
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/GeneDef[defName="VRESaurids_ScaleSkin"]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Races Expanded - Saurid/Patches/Vanilla Races Expanded - Saurid/HediffDefs/HediffDef_SauridClaws.xml b/ModPatches/Vanilla Races Expanded - Saurid/Patches/Vanilla Races Expanded - Saurid/HediffDefs/HediffDef_SauridClaws.xml
new file mode 100644
index 0000000000..f95e664e89
--- /dev/null
+++ b/ModPatches/Vanilla Races Expanded - Saurid/Patches/Vanilla Races Expanded - Saurid/HediffDefs/HediffDef_SauridClaws.xml	
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="VRESaurids_SauridClaws"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>claws</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationSharp>1.0</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Races Expanded - Waster/Patches/Vanilla Races Expanded - Waster/HediffDefs/Hediffs.xml b/ModPatches/Vanilla Races Expanded - Waster/Patches/Vanilla Races Expanded - Waster/HediffDefs/Hediffs.xml
new file mode 100644
index 0000000000..c50ef068e2
--- /dev/null
+++ b/ModPatches/Vanilla Races Expanded - Waster/Patches/Vanilla Races Expanded - Waster/HediffDefs/Hediffs.xml	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="VRE_PollutionAccuracy"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<label>inactive</label>
+					<minSeverity>0.01</minSeverity>
+				</li>
+				<li>
+					<label>minor</label>
+					<minSeverity>0.02</minSeverity>
+					<statFactors>
+						<ShootingAccuracyPawn>1.1</ShootingAccuracyPawn>
+						<AimingAccuracy>1.1</AimingAccuracy>
+					</statFactors>
+				</li>
+				<li>
+					<label>moderate</label>
+					<minSeverity>0.20</minSeverity>
+					<statFactors>
+						<ShootingAccuracyPawn>1.15</ShootingAccuracyPawn>
+						<AimingAccuracy>1.2</AimingAccuracy>
+					</statFactors>
+				</li>
+				<li>
+					<label>extreme</label>
+					<minSeverity>0.50</minSeverity>
+					<statFactors>
+						<ShootingAccuracyPawn>1.2</ShootingAccuracyPawn>
+						<AimingAccuracy>1.3</AimingAccuracy>
+					</statFactors>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Skills Expanded/Patches/Vanilla Skills Expanded/Expertise.xml b/ModPatches/Vanilla Skills Expanded/Patches/Vanilla Skills Expanded/Expertise.xml
new file mode 100644
index 0000000000..f409127694
--- /dev/null
+++ b/ModPatches/Vanilla Skills Expanded/Patches/Vanilla Skills Expanded/Expertise.xml	
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Sharpshooting expertise -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VSE.Expertise.ExpertiseDef[defName="Precision"]/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ShootingAccuracyPawn>0.075</ShootingAccuracyPawn>
+				<AimingAccuracy>0.025</AimingAccuracy>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<!-- Aiming expertise -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VSE.Expertise.ExpertiseDef[defName="CloseQuarters"]/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<AimingDelayFactor>-0.025</AimingDelayFactor>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<!-- Reloading expertise -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VSE.Expertise.ExpertiseDef[defName="Gunner"]/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ReloadSpeed>0.025</ReloadSpeed>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<!-- Piercing expertise -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VSE.Expertise.ExpertiseDef[defName="Sharp"]/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<MeleeCritChance>0.05</MeleeCritChance>
+			</statOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Storytellers Expanded - Perry Persistent/Patches/Vanilla Storytellers Expanded - Perry Persistent/PawnKinds_ManInCoat.xml b/ModPatches/Vanilla Storytellers Expanded - Perry Persistent/Patches/Vanilla Storytellers Expanded - Perry Persistent/PawnKinds_ManInCoat.xml
new file mode 100644
index 0000000000..7abaf6af7f
--- /dev/null
+++ b/ModPatches/Vanilla Storytellers Expanded - Perry Persistent/Patches/Vanilla Storytellers Expanded - Perry Persistent/PawnKinds_ManInCoat.xml	
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ===Man in coat === -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="VSE_ManInTheCoat"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="VSE_ManInTheCoat"]/invNutrition</xpath>
+		<value>
+			<invNutrition>6</invNutrition>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="VSE_ManInTheCoat"]/apparelRequired</xpath>
+		<value>
+			<li>CE_Apparel_Backpack</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Storytellers Expanded - Winston Waves/Patches/Vanilla Storytellers Expanded - Winston Waves/Modifiers/Modifiers.xml b/ModPatches/Vanilla Storytellers Expanded - Winston Waves/Patches/Vanilla Storytellers Expanded - Winston Waves/Modifiers/Modifiers.xml
new file mode 100644
index 0000000000..460172ea18
--- /dev/null
+++ b/ModPatches/Vanilla Storytellers Expanded - Winston Waves/Patches/Vanilla Storytellers Expanded - Winston Waves/Modifiers/Modifiers.xml	
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Charge For Everyone === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VSEWW.ModifierDef[defName="VSEWW_ChargeForEveryone"]/allowedWeaponDef/li[contains(.,"Gun_ChargeLance")]</xpath>
+		<value>
+			<li MayRequire="CETeam.CombatExtendedGuns">CE_Gun_ChargeLMG</li>
+			<li MayRequire="CETeam.CombatExtendedGuns">CE_Gun_ChargeSniperRifle</li>
+			<li MayRequire="CETeam.CombatExtendedGuns">CE_Gun_ChargeSMG</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Storytellers Expanded - Winston Waves/Patches/Vanilla Storytellers Expanded - Winston Waves/Rewards/Rewards.xml b/ModPatches/Vanilla Storytellers Expanded - Winston Waves/Patches/Vanilla Storytellers Expanded - Winston Waves/Rewards/Rewards.xml
new file mode 100644
index 0000000000..4556025fc7
--- /dev/null
+++ b/ModPatches/Vanilla Storytellers Expanded - Winston Waves/Patches/Vanilla Storytellers Expanded - Winston Waves/Rewards/Rewards.xml	
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === FSX and Prometheum Rewards === -->
+
+	<!-- === Good Reward === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VSEWW.RewardDef[defName="VSEWW_GoodResourceDrop"]/description</xpath>
+		<value>
+			<description>Cargo pods drop 500 wood, 500 steel, 30 components, 200 plasteel, 10 FSX and 10 Prometheum</description>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VSEWW.RewardDef[defName="VSEWW_GoodResourceDrop"]/items</xpath>
+		<value>
+			<li>
+				<thing>FSX</thing>
+				<count>10</count>
+			</li>
+			<li>
+				<thing>Prometheum</thing>
+				<count>10</count>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Excellent Reward === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VSEWW.RewardDef[defName="VSEWW_ExcellentResourceDrop"]/description</xpath>
+		<value>
+			<description>Cargo pods drop 1000 wood, 1000 steel, 60 components, 20 advanced components, 300 plasteel, 25 FSX and 25 Prometheum</description>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VSEWW.RewardDef[defName="VSEWW_ExcellentResourceDrop"]/items</xpath>
+		<value>
+			<li>
+				<thing>FSX</thing>
+				<count>25</count>
+			</li>
+			<li>
+				<thing>Prometheum</thing>
+				<count>25</count>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Legendary Reward === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VSEWW.RewardDef[defName="VSEWW_LegendaryResourceDrop"]/description</xpath>
+		<value>
+			<description>Cargo pods drop 3000 wood, 3000 steel, 100 components, 50 advanced components, 500 plasteel, 100 FSX and 100 Prometheum</description>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VSEWW.RewardDef[defName="VSEWW_LegendaryResourceDrop"]/items</xpath>
+		<value>
+			<li>
+				<thing>FSX</thing>
+				<count>100</count>
+			</li>
+			<li>
+				<thing>Prometheum</thing>
+				<count>100</count>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Vehicles Expanded - Tier 3/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Badger.xml b/ModPatches/Vanilla Vehicles Expanded - Tier 3/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Badger.xml
new file mode 100644
index 0000000000..6b87644d92
--- /dev/null
+++ b/ModPatches/Vanilla Vehicles Expanded - Tier 3/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Badger.xml	
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Turret -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Badger_MainTurret"]/projectile</xpath>
+		<value>
+			<projectile>Bullet_25x137mmNATO_AP</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Badger_MainTurret"]/reloadTimer</xpath>
+		<value>
+			<reloadTimer>8.8</reloadTimer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Badger_MainTurret"]/warmUpTimer</xpath>
+		<value>
+			<warmUpTimer>1.6</warmUpTimer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Badger_MainTurret"]/magazineCapacity</xpath>
+		<value>
+			<magazineCapacity>200</magazineCapacity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Badger_MainTurret"]/maxRange</xpath>
+		<value>
+			<maxRange>74</maxRange>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Badger_MainTurret"]/fireModes</xpath>
+		<value>
+			<fireModes>
+				<li>
+					<shotsPerBurst>1</shotsPerBurst>
+					<ticksBetweenShots>6</ticksBetweenShots>
+					<ticksBetweenBursts>60</ticksBetweenBursts>
+					<label>Single</label>
+					<texPath>UI/Gizmos/FireRate_Single</texPath>
+				</li>
+				<li>
+					<shotsPerBurst>5</shotsPerBurst>
+					<ticksBetweenShots>6</ticksBetweenShots>
+					<ticksBetweenBursts>60</ticksBetweenBursts>
+					<label>Burst</label>
+					<texPath>UI/Gizmos/FireRate_Burst</texPath>
+				</li>
+				<li>
+					<shotsPerBurst>10</shotsPerBurst>
+					<ticksBetweenShots>6</ticksBetweenShots>
+					<ticksBetweenBursts>60</ticksBetweenBursts>
+					<label>Auto</label>
+					<texPath>UI/Gizmos/FireRate_Auto</texPath>
+				</li>
+			</fireModes>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Badger_MainTurret"]</xpath>
+		<value>
+			<li Class="Vehicles.CETurretDataDefModExtension">
+				<ammoSet>AmmoSet_25x137mmNATO</ammoSet>
+				<shotHeight>2.0</shotHeight>
+				<speed>192</speed>
+				<sway>1.61</sway>
+				<spread>0.04</spread>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Vehicle -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Badger"]</xpath>
+		<value>
+			<descriptionHyperlinks>
+				<CombatExtended.AmmoSetDef>AmmoSet_25x137mmNATO</CombatExtended.AmmoSetDef>
+			</descriptionHyperlinks>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Badger"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>14</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Badger"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Badger"]/components/li[key="FrontArmorPlating"]/health</xpath>
+		<value>
+			<health>700</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Badger"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>24</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Badger"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Badger"]/components/li[key="LeftArmorPlating"]/health</xpath>
+		<value>
+			<health>340</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Badger"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>24</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Badger"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Badger"]/components/li[key="RightArmorPlating"]/health</xpath>
+		<value>
+			<health>340</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Badger"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>24</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Badger"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Vehicles Expanded - Tier 3/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Burya.xml b/ModPatches/Vanilla Vehicles Expanded - Tier 3/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Burya.xml
new file mode 100644
index 0000000000..4f3d69ce74
--- /dev/null
+++ b/ModPatches/Vanilla Vehicles Expanded - Tier 3/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Burya.xml	
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Turret -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Burya_MainTurret"]/projectile</xpath>
+		<value>
+			<projectile>Bullet_50mmRocket_HE</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Burya_MainTurret"]/reloadTimer</xpath>
+		<value>
+			<reloadTimer>9.2</reloadTimer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Burya_MainTurret"]/magazineCapacity</xpath>
+		<value>
+			<magazineCapacity>22</magazineCapacity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Burya_MainTurret"]</xpath>
+		<value>
+			<li Class="Vehicles.CETurretDataDefModExtension">
+				<ammoSet>AmmoSet_50mmRocket</ammoSet>
+				<shotHeight>2.5</shotHeight>
+				<speed>160</speed> <!-- Temporarily set artifically high, as it fires on a flat trajectory. -->
+				<sway>0.82</sway>
+				<spread>0.15</spread>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Vehicle -->
+	<Operation Class="PatchOperationAdd"> <!-- Doesn't currently work. -->
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Burya"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>20</li>
+					<li>30</li>
+					<li>40</li>
+					<li>50</li>
+					<li>60</li>
+				</chargeSpeeds>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Burya"]</xpath>
+		<value>
+			<descriptionHyperlinks>
+				<CombatExtended.AmmoSetDef>AmmoSet_50mmRocket</CombatExtended.AmmoSetDef>
+			</descriptionHyperlinks>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Burya"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Burya"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Burya"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Burya"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Burya"]/components/li[key="FrontArmorPlating"]/health</xpath>
+		<value>
+			<health>100</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Burya"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Burya"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Burya"]/components/li[key="LeftArmorPlating"]/health</xpath>
+		<value>
+			<health>120</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Burya"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Burya"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Burya"]/components/li[key="RightArmorPlating"]/health</xpath>
+		<value>
+			<health>120</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Burya"]/components/li[
+		key="FrontLeftWheel" or
+		key="FrontRightWheel" or
+		key="MiddleLeftWheel" or
+		key="MiddleRightWheel" or
+		key="BackLeftWheel" or
+		key="BackRightWheel"
+		]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Burya"]/components/li[
+		key="FrontLeftWheel" or
+		key="FrontRightWheel" or
+		key="MiddleLeftWheel" or
+		key="MiddleRightWheel" or
+		key="BackLeftWheel" or
+		key="BackRightWheel"
+		]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Burya"]/components/li[
+		key="FrontLeftWheel" or
+		key="FrontRightWheel" or
+		key="MiddleLeftWheel" or
+		key="MiddleRightWheel" or
+		key="BackLeftWheel" or
+		key="BackRightWheel"
+		]/health</xpath>
+		<value>
+			<health>60</health>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Vehicles Expanded - Tier 3/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Goliath.xml b/ModPatches/Vanilla Vehicles Expanded - Tier 3/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Goliath.xml
new file mode 100644
index 0000000000..be3d514629
--- /dev/null
+++ b/ModPatches/Vanilla Vehicles Expanded - Tier 3/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Goliath.xml	
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Turret - Swarm -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Goliath_SwarmTurret"]/projectile</xpath>
+		<value>
+			<projectile>Bullet_50mmRocket_HE</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Goliath_SwarmTurret"]/reloadTimer</xpath>
+		<value>
+			<reloadTimer>7.2</reloadTimer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Goliath_SwarmTurret"]/magazineCapacity</xpath>
+		<value>
+			<magazineCapacity>12</magazineCapacity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Goliath_SwarmTurret"]</xpath>
+		<value>
+			<li Class="Vehicles.CETurretDataDefModExtension">
+				<ammoSet>AmmoSet_50mmRocket</ammoSet>
+				<shotHeight>2</shotHeight>
+				<speed>60</speed> <!-- Temporarily set to max charge speed to make them somewhat usable. -->
+				<sway>0.82</sway>
+				<spread>0.15</spread>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Turret - Military -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Goliath_MilitaryTurret"]/projectile</xpath>
+		<value>
+			<projectile>Bullet_762x51mmNATO_FMJ</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Goliath_MilitaryTurret"]/reloadTimer</xpath>
+		<value>
+			<reloadTimer>7.8</reloadTimer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Goliath_MilitaryTurret"]/warmUpTimer</xpath>
+		<value>
+			<warmUpTimer>1.3</warmUpTimer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Goliath_MilitaryTurret"]/magazineCapacity</xpath>
+		<value>
+			<magazineCapacity>120</magazineCapacity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Goliath_MilitaryTurret"]/maxRange</xpath>
+		<value>
+			<maxRange>48</maxRange>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Goliath_MilitaryTurret"]/fireModes</xpath>
+		<value>
+			<fireModes>
+				<li>
+					<shotsPerBurst>1</shotsPerBurst>
+					<ticksBetweenShots>4</ticksBetweenShots>
+					<ticksBetweenBursts>60</ticksBetweenBursts>
+					<label>Single</label>
+					<texPath>UI/Gizmos/FireRate_Single</texPath>
+				</li>
+				<li>
+					<shotsPerBurst>6</shotsPerBurst>
+					<ticksBetweenShots>4</ticksBetweenShots>
+					<ticksBetweenBursts>60</ticksBetweenBursts>
+					<label>Burst</label>
+					<texPath>UI/Gizmos/FireRate_Burst</texPath>
+				</li>
+				<li>
+					<shotsPerBurst>12</shotsPerBurst>
+					<ticksBetweenShots>4</ticksBetweenShots>
+					<ticksBetweenBursts>60</ticksBetweenBursts>
+					<label>Auto</label>
+					<texPath>UI/Gizmos/FireRate_Auto</texPath>
+				</li>
+			</fireModes>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Goliath_MilitaryTurret"]</xpath>
+		<value>
+			<li Class="Vehicles.CETurretDataDefModExtension">
+				<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+				<shotHeight>2.5</shotHeight>
+				<speed>168</speed>
+				<sway>0.82</sway>
+				<spread>0.07</spread>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Mortar -->
+	<Operation Class="PatchOperationAdd"> <!-- Doesn't currently work. -->
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Goliath"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>20</li>
+					<li>30</li>
+					<li>40</li>
+					<li>50</li>
+					<li>60</li>
+				</chargeSpeeds>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Vehicle -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Goliath"]</xpath>
+		<value>
+			<descriptionHyperlinks>
+				<CombatExtended.AmmoSetDef>AmmoSet_50mmRocket</CombatExtended.AmmoSetDef>
+				<CombatExtended.AmmoSetDef>AmmoSet_556x45mmNATO</CombatExtended.AmmoSetDef>
+			</descriptionHyperlinks>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Goliath"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Goliath"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Goliath"]/components/li[key="BlastShield"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Goliath"]/components/li[key="BlastShield"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Goliath"]/components/li[key="BlastShield"]/health</xpath>
+		<value>
+			<health>400</health>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Vehicles Expanded - Tier 3/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Marshal.xml b/ModPatches/Vanilla Vehicles Expanded - Tier 3/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Marshal.xml
new file mode 100644
index 0000000000..9d6f9140e3
--- /dev/null
+++ b/ModPatches/Vanilla Vehicles Expanded - Tier 3/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Marshal.xml	
@@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Main Turret -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Marshal_MainTurret"]/projectile</xpath>
+		<value>
+			<projectile>Bullet_105x617mmRCannonShell_HE</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Marshal_MainTurret"]/reloadTimer</xpath>
+		<value>
+			<reloadTimer>7.8</reloadTimer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Marshal_MainTurret"]/warmUpTimer</xpath>
+		<value>
+			<warmUpTimer>2.8</warmUpTimer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Marshal_MainTurret"]/maxRange</xpath>
+		<value>
+			<maxRange>86</maxRange>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Marshal_MainTurret"]</xpath>
+		<value>
+			<li Class="Vehicles.CETurretDataDefModExtension">
+				<ammoSet>AmmoSet_105x617mmRCannonShell</ammoSet>
+				<shotHeight>2.5</shotHeight>
+				<speed>201</speed>
+				<sway>0.82</sway>
+				<spread>0.01</spread>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Mounted Turret -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Marshal_MountedTurret"]/projectile</xpath>
+		<value>
+			<projectile>Bullet_762x51mmNATO_FMJ</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Marshal_MountedTurret"]/reloadTimer</xpath>
+		<value>
+			<reloadTimer>7.8</reloadTimer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Marshal_MountedTurret"]/warmUpTimer</xpath>
+		<value>
+			<warmUpTimer>1.3</warmUpTimer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Marshal_MountedTurret"]/magazineCapacity</xpath>
+		<value>
+			<magazineCapacity>200</magazineCapacity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Marshal_MountedTurret"]/maxRange</xpath>
+		<value>
+			<maxRange>62</maxRange>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Marshal_MountedTurret"]/fireModes</xpath>
+		<value>
+			<fireModes>
+				<li>
+					<shotsPerBurst>1</shotsPerBurst>
+					<ticksBetweenShots>6</ticksBetweenShots>
+					<ticksBetweenBursts>60</ticksBetweenBursts>
+					<label>Single</label>
+					<texPath>UI/Gizmos/FireRate_Single</texPath>
+				</li>
+				<li>
+					<shotsPerBurst>5</shotsPerBurst>
+					<ticksBetweenShots>6</ticksBetweenShots>
+					<ticksBetweenBursts>60</ticksBetweenBursts>
+					<label>Burst</label>
+					<texPath>UI/Gizmos/FireRate_Burst</texPath>
+				</li>
+				<li>
+					<shotsPerBurst>10</shotsPerBurst>
+					<ticksBetweenShots>6</ticksBetweenShots>
+					<ticksBetweenBursts>60</ticksBetweenBursts>
+					<label>Auto</label>
+					<texPath>UI/Gizmos/FireRate_Auto</texPath>
+				</li>
+			</fireModes>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Marshal_MountedTurret"]</xpath>
+		<value>
+			<li Class="Vehicles.CETurretDataDefModExtension">
+				<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+				<shotHeight>2.5</shotHeight>
+				<speed>156</speed>
+				<sway>0.82</sway>
+				<spread>0.01</spread>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Vehicle -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Marshal"]</xpath>
+		<value>
+			<descriptionHyperlinks>
+				<CombatExtended.AmmoSetDef>AmmoSet_105x617mmRCannonShell</CombatExtended.AmmoSetDef>
+				<CombatExtended.AmmoSetDef>AmmoSet_762x51mmNATO</CombatExtended.AmmoSetDef>
+			</descriptionHyperlinks>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Marshal"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>32</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Marshal"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Marshal"]/vehicleStats/CargoCapacity</xpath>
+		<value>
+			<CargoCapacity>300</CargoCapacity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Marshal"]/components/li[key="FrontArmorPlating"]/health</xpath>
+		<value>
+			<health>900</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Marshal"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>48</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Marshal"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>24</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Marshal"]/components/li[key="LeftArmorPlating"]/health</xpath>
+		<value>
+			<health>800</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Marshal"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>44</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Marshal"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>22</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Marshal"]/components/li[key="RightArmorPlating"]/health</xpath>
+		<value>
+			<health>800</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Marshal"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>44</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Marshal"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>22</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Marshal"]/components/li[key="BackArmorPlating"]/health</xpath>
+		<value>
+			<health>600</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Marshal"]/components/li[key="Roof"]/health</xpath>
+		<value>
+			<health>600</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Marshal"]/components/li[key="Roof"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>32</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Marshal"]/components/li[key="Roof"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Vehicles Expanded - Tier 3/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Paladin.xml b/ModPatches/Vanilla Vehicles Expanded - Tier 3/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Paladin.xml
new file mode 100644
index 0000000000..a41d91e0de
--- /dev/null
+++ b/ModPatches/Vanilla Vehicles Expanded - Tier 3/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Paladin.xml	
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Turret -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Paladin_MainTurret"]/projectile</xpath>
+		<value>
+			<projectile>Bullet_40x53mmGrenade_HE</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Paladin_MainTurret"]/reloadTimer</xpath>
+		<value>
+			<reloadTimer>7.8</reloadTimer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Paladin_MainTurret"]/warmUpTimer</xpath>
+		<value>
+			<warmUpTimer>1.5</warmUpTimer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Paladin_MainTurret"]/magazineCapacity</xpath>
+		<value>
+			<magazineCapacity>50</magazineCapacity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Paladin_MainTurret"]/maxRange</xpath>
+		<value>
+			<maxRange>74</maxRange>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Paladin_MainTurret"]/fireModes</xpath>
+		<value>
+			<fireModes>
+				<li>
+					<shotsPerBurst>1</shotsPerBurst>
+					<ticksBetweenShots>6</ticksBetweenShots>
+					<ticksBetweenBursts>60</ticksBetweenBursts>
+					<label>Single</label>
+					<texPath>UI/Gizmos/FireRate_Single</texPath>
+				</li>
+				<li>
+					<shotsPerBurst>5</shotsPerBurst>
+					<ticksBetweenShots>6</ticksBetweenShots>
+					<ticksBetweenBursts>60</ticksBetweenBursts>
+					<label>Burst</label>
+					<texPath>UI/Gizmos/FireRate_Burst</texPath>
+				</li>
+			</fireModes>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Paladin_MainTurret"]</xpath>
+		<value>
+			<li Class="Vehicles.CETurretDataDefModExtension">
+				<ammoSet>AmmoSet_40x53mmGrenade</ammoSet>
+				<shotHeight>2.0</shotHeight>
+				<speed>62</speed>
+				<sway>1.61</sway>
+				<spread>0.15</spread>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Vehicle -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Paladin"]</xpath>
+		<value>
+			<descriptionHyperlinks>
+				<CombatExtended.AmmoSetDef>AmmoSet_40x53mmGrenade</CombatExtended.AmmoSetDef>
+			</descriptionHyperlinks>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Paladin"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>18</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Paladin"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>9</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Paladin"]/components/li[key="FrontArmorPlating"]/health</xpath>
+		<value>
+			<health>700</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Paladin"]/components/li[key="LeftArmorPlating"]/health</xpath>
+		<value>
+			<health>260</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Paladin"]/components/li[key="RightArmorPlating"]/health</xpath>
+		<value>
+			<health>260</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Paladin"]/components/li[key="BackArmorPlating"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>12</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Paladin"]/components/li[key="BackArmorPlating"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Paladin"]/components/li[key="BackArmorPlating"]/health</xpath>
+		<value>
+			<health>180</health>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Vehicles Expanded - Tier 3/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Udar.xml b/ModPatches/Vanilla Vehicles Expanded - Tier 3/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Udar.xml
new file mode 100644
index 0000000000..6c58667c64
--- /dev/null
+++ b/ModPatches/Vanilla Vehicles Expanded - Tier 3/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Udar.xml	
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Udar_MainTurret"]</xpath>
+		<value>
+			<projectile>Bullet_155mmHowitzerShell_HE</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Udar_MainTurret"]/reloadTimer</xpath>
+		<value>
+			<reloadTimer>7.8</reloadTimer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Udar_MainTurret"]/warmUpTimer</xpath>
+		<value>
+			<warmUpTimer>4</warmUpTimer>
+		</value>
+	</Operation>
+	<!--
+	<li Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Udar_MainTurret"]/maxRange</xpath>
+		<value>
+			<maxRange>500</maxRange>
+		</value>
+	</li>
+-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Udar_MainTurret"]/fireModes</xpath>
+		<value>
+			<fireModes>
+				<li>
+					<shotsPerBurst>1</shotsPerBurst>
+					<ticksBetweenShots>6</ticksBetweenShots>
+					<ticksBetweenBursts>60</ticksBetweenBursts>
+					<label>Single</label>
+					<texPath>UI/Gizmos/FireRate_Single</texPath>
+				</li>
+			</fireModes>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Udar_MainTurret"]/ammunition</xpath>
+		<value>
+			<ammunition>
+				<thingDefs>
+					<li>Ammo_155mmHowitzerShell_HE</li>
+					<li>Ammo_155mmHowitzerShell_Incendiary</li>
+					<li>Ammo_155mmHowitzerShell_EMP</li>
+					<li>Ammo_155mmHowitzerShell_Smoke</li>
+				</thingDefs>
+			</ammunition>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Udar_MainTurret"]</xpath>
+		<value>
+			<li Class="Vehicles.CETurretDataDefModExtension">
+				<ammoSet>AmmoSet_155mmHowitzerShell</ammoSet>
+				<shotHeight>2.25</shotHeight>
+				<speed>155</speed>
+				<sway>1.61</sway>
+				<spread>0.01</spread>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Vehicle -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Udar"]</xpath>
+		<value>
+			<descriptionHyperlinks>
+				<CombatExtended.AmmoSetDef>AmmoSet_155mmHowitzerShell</CombatExtended.AmmoSetDef>
+			</descriptionHyperlinks>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Udar"]/vehicleStats/CargoCapacity</xpath>
+		<value>
+			<CargoCapacity>300</CargoCapacity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Udar"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>24</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Udar"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Udar"]/components/li[key="FrontArmorPlating"]/health</xpath>
+		<value>
+			<health>660</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Udar"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>24</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Udar"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Udar"]/components/li[key="LeftArmorPlating"]/health</xpath>
+		<value>
+			<health>660</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Udar"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Udar"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Udar"]/components/li[key="RightArmorPlating"]/health</xpath>
+		<value>
+			<health>660</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Udar"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Udar"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Udar"]/components/li[key="BackArmorPlating"]/health</xpath>
+		<value>
+			<health>510</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Udar"]/components/li[key="BackArmorPlating"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Udar"]/components/li[key="BackArmorPlating"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Udar"]/components/li[key="Roof"]/health</xpath>
+		<value>
+			<health>20</health>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Vehicles Expanded - Tier 3/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Vehicles_ExplosionsHotfixTier3.xml b/ModPatches/Vanilla Vehicles Expanded - Tier 3/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Vehicles_ExplosionsHotfixTier3.xml
new file mode 100644
index 0000000000..5173869668
--- /dev/null
+++ b/ModPatches/Vanilla Vehicles Expanded - Tier 3/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Vehicles_ExplosionsHotfixTier3.xml	
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[
+			defName="VVE_Badger" or
+			defName="VVE_BigRig" or
+			defName="VVE_Burya" or
+			defName="VVE_Cherokee" or
+			defName="VVE_Goliath" or
+			defName="VVE_Hermano" or
+			defName="VVE_Lightning" or
+			defName="VVE_Louie" or
+			defName="VVE_Marshal" or
+			defName="VVE_Nomad" or
+			defName="VVE_Paladin" or
+			defName="VVE_Springbok" or
+			defName="VVE_Udar"
+			]/components/li[key="Engine"]/reactors/li[@Class = "Vehicles.Reactor_Explosive"]/damageDef</xpath>
+		<value>
+			<damageDef>Bomb</damageDef>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[
+			defName="VVE_Badger" or
+			defName="VVE_BigRig" or
+			defName="VVE_Burya" or
+			defName="VVE_Cherokee" or
+			defName="VVE_Goliath" or
+			defName="VVE_Hermano" or
+			defName="VVE_Lightning" or
+			defName="VVE_Louie" or
+			defName="VVE_Marshal" or
+			defName="VVE_Nomad" or
+			defName="VVE_Paladin" or
+			defName="VVE_Springbok" or
+			defName="VVE_Udar"
+			]/components/li[key="Engine"]/reactors/li[@Class = "Vehicles.Reactor_Explosive"]/radius</xpath>
+		<value>
+			<radius>1</radius>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[
+			defName="VVE_Badger" or
+			defName="VVE_BigRig" or
+			defName="VVE_Burya" or
+			defName="VVE_Cherokee" or
+			defName="VVE_Goliath" or
+			defName="VVE_Hermano" or
+			defName="VVE_Lightning" or
+			defName="VVE_Louie" or
+			defName="VVE_Marshal" or
+			defName="VVE_Nomad" or
+			defName="VVE_Paladin" or
+			defName="VVE_Springbok" or
+			defName="VVE_Udar"
+			]/components/li[key="Chemtank"]/reactors/li[@Class = "Vehicles.Reactor_Explosive"]/damageDef</xpath>
+		<value>
+			<damageDef>Bomb</damageDef>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Vehicles Expanded - Tier 3/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Vehicles_Unarmed.xml b/ModPatches/Vanilla Vehicles Expanded - Tier 3/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Vehicles_Unarmed.xml
new file mode 100644
index 0000000000..4c590c1e45
--- /dev/null
+++ b/ModPatches/Vanilla Vehicles Expanded - Tier 3/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Vehicles_Unarmed.xml	
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Big Rig -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_BigRig"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_BigRig"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Cherokee -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Cherokee"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Cherokee"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Hermano -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Hermano"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3.25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Hermano"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Lightning -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Lightning"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.65</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Lightning"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3.75</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Louie -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Louie"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>11</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Louie"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Nomad -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Nomad"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Nomad"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Nomad"]/components/li[key="FrontPanel"]/health</xpath>
+		<value>
+			<health>300</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Nomad"]/components/li[key="FrontPanel"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Nomad"]/components/li[key="FrontPanel"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Nomad"]/components/li[key="LeftSidePanel"]/health</xpath>
+		<value>
+			<health>300</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Nomad"]/components/li[key="LeftSidePanel"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Nomad"]/components/li[key="LeftSidePanel"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Nomad"]/components/li[key="RightSidePanel"]/health</xpath>
+		<value>
+			<health>300</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Nomad"]/components/li[key="RightSidePanel"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Nomad"]/components/li[key="RightSidePanel"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Springbok -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Springbok"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Springbok"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Vehicles Expanded/Patches/Vanilla Vehicles Expanded/Resources_CarParts.xml b/ModPatches/Vanilla Vehicles Expanded/Patches/Vanilla Vehicles Expanded/Resources_CarParts.xml
new file mode 100644
index 0000000000..f8825bd750
--- /dev/null
+++ b/ModPatches/Vanilla Vehicles Expanded/Patches/Vanilla Vehicles Expanded/Resources_CarParts.xml	
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="VVE_CarPartBase"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VVE_EngineBlock"]/statBases</xpath>
+		<value>
+			<Bulk>20</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VVE_CarAlternator"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VVE_CarExhaust"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VVE_CarSuspension"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VVE_CarWheel"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Vehicles Expanded/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier1/Bunsen.xml b/ModPatches/Vanilla Vehicles Expanded/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier1/Bunsen.xml
new file mode 100644
index 0000000000..f4343b1796
--- /dev/null
+++ b/ModPatches/Vanilla Vehicles Expanded/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier1/Bunsen.xml	
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Turret -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="VVE_Bunsen_MainTurret"]/projectile</xpath>
+		<value>
+			<projectile>Bullet_Flamethrower_Prometheum</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="VVE_Bunsen_MainTurret"]/reloadTimer</xpath>
+		<value>
+			<reloadTimer>7.0</reloadTimer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="VVE_Bunsen_MainTurret"]/warmUpTimer</xpath>
+		<value>
+			<warmUpTimer>1.0</warmUpTimer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="VVE_Bunsen_MainTurret"]/magazineCapacity</xpath>
+		<value>
+			<magazineCapacity>200</magazineCapacity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="VVE_Bunsen_MainTurret"]/maxRange</xpath>
+		<value>
+			<maxRange>40</maxRange>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="VVE_Bunsen_MainTurret"]/projectileOffset</xpath>
+		<value>
+			<projectileOffset>1</projectileOffset>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="VVE_Bunsen_MainTurret"]/fireModes</xpath>
+		<value>
+			<fireModes>
+				<li>
+					<shotsPerBurst>5</shotsPerBurst>
+					<ticksBetweenShots>3</ticksBetweenShots>
+					<ticksBetweenBursts>60</ticksBetweenBursts>
+					<label>Burst</label>
+					<texPath>UI/Gizmos/FireRate_Burst</texPath>
+				</li>
+				<li>
+					<shotsPerBurst>10</shotsPerBurst>
+					<ticksBetweenShots>3</ticksBetweenShots>
+					<ticksBetweenBursts>60</ticksBetweenBursts>
+					<label>Auto</label>
+					<texPath>UI/Gizmos/FireRate_Auto</texPath>
+				</li>
+			</fireModes>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="VVE_Bunsen_MainTurret"]</xpath>
+		<value>
+			<li Class="Vehicles.CETurretDataDefModExtension">
+				<ammoSet>AmmoSet_Flamethrower</ammoSet>
+				<shotHeight>2.0</shotHeight>
+				<speed>20</speed>
+				<sway>0.25</sway>
+				<spread>0.30</spread>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Vehicle -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]</xpath>
+		<value>
+			<descriptionHyperlinks>
+				<CombatExtended.AmmoSetDef>AmmoSet_Flamethrower</CombatExtended.AmmoSetDef>
+			</descriptionHyperlinks>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]/comps/li[@Class="Vehicles.CompProperties_VehicleTurrets"]</xpath>
+		<value>
+			<li Class="Vehicles.CompProperties_VehicleTurrets">
+				<turrets>
+					<li>
+						<turretDef>VVE_Bunsen_MainTurret</turretDef>
+						<renderProperties>
+							<north>(-0.05, 0.2)</north>
+							<south>(-0.02, 0.2)</south>
+							<east>(-0.02, 0.4)</east>
+						</renderProperties>
+						<gizmoLabel>Main Turret</gizmoLabel>
+						<angleRestricted/>
+						<aimPieOffset>(0, 1.5)</aimPieOffset>
+						<key>mainTurret</key>
+					</li>
+				</turrets>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]/comps/li[@Class="Vehicles.CompProperties_FueledTravel"]/fuelCapacity</xpath>
+		<value>
+			<fuelCapacity>120</fuelCapacity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]/components/li[key="FrontArmorPlating"]/health</xpath>
+		<value>
+			<health>220</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]/components/li[key="LeftArmorPlating"]/health</xpath>
+		<value>
+			<health>180</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]/components/li[key="RightArmorPlating"]/health</xpath>
+		<value>
+			<health>180</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]/components/li[key="BackArmorPlating"]/health</xpath>
+		<value>
+			<health>180</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]/components/li[key="BackArmorPlating"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]/components/li[key="BackArmorPlating"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]/components/li[key="Roof"]/health</xpath>
+		<value>
+			<health>180</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]/components/li[key="Roof"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]/components/li[key="Roof"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Vehicles Expanded/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier1/Highwayman.xml b/ModPatches/Vanilla Vehicles Expanded/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier1/Highwayman.xml
new file mode 100644
index 0000000000..d4a5dd708a
--- /dev/null
+++ b/ModPatches/Vanilla Vehicles Expanded/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier1/Highwayman.xml	
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Turret -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Highwayman_MainTurret"]/projectile</xpath>
+		<value>
+			<projectile>Bullet_762x51mmNATO_FMJ</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Highwayman_MainTurret"]/reloadTimer</xpath>
+		<value>
+			<reloadTimer>7.8</reloadTimer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Highwayman_MainTurret"]/warmUpTimer</xpath>
+		<value>
+			<warmUpTimer>1.3</warmUpTimer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Highwayman_MainTurret"]/magazineCapacity</xpath>
+		<value>
+			<magazineCapacity>200</magazineCapacity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Highwayman_MainTurret"]/projectileShifting</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Highwayman_MainTurret"]/maxRange</xpath>
+		<value>
+			<maxRange>55</maxRange>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Highwayman_MainTurret"]/fireModes</xpath>
+		<value>
+			<fireModes>
+				<li>
+					<shotsPerBurst>1</shotsPerBurst>
+					<ticksBetweenShots>6</ticksBetweenShots>
+					<ticksBetweenBursts>60</ticksBetweenBursts>
+					<label>Single</label>
+					<texPath>UI/Gizmos/FireRate_Single</texPath>
+				</li>
+				<li>
+					<shotsPerBurst>5</shotsPerBurst>
+					<ticksBetweenShots>6</ticksBetweenShots>
+					<ticksBetweenBursts>60</ticksBetweenBursts>
+					<label>Burst</label>
+					<texPath>UI/Gizmos/FireRate_Burst</texPath>
+				</li>
+				<li>
+					<shotsPerBurst>10</shotsPerBurst>
+					<ticksBetweenShots>6</ticksBetweenShots>
+					<ticksBetweenBursts>60</ticksBetweenBursts>
+					<label>Auto</label>
+					<texPath>UI/Gizmos/FireRate_Auto</texPath>
+				</li>
+			</fireModes>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Highwayman_MainTurret"]</xpath>
+		<value>
+			<li Class="Vehicles.CETurretDataDefModExtension">
+				<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+				<shotHeight>2.0</shotHeight>
+				<speed>156</speed>
+				<sway>0.96</sway>
+				<spread>0.04</spread>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Vehicle -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Highwayman"]</xpath>
+		<value>
+			<descriptionHyperlinks>
+				<CombatExtended.AmmoSetDef>AmmoSet_762x51mmNATO</CombatExtended.AmmoSetDef>
+			</descriptionHyperlinks>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Highwayman"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Highwayman"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Highwayman"]/components/li[key="FrontArmorPlating"]/health</xpath>
+		<value>
+			<health>300</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Highwayman"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Highwayman"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Highwayman"]/components/li[key="LeftArmorPlating"]/health</xpath>
+		<value>
+			<health>240</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Highwayman"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Highwayman"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Highwayman"]/components/li[key="RightArmorPlating"]/health</xpath>
+		<value>
+			<health>240</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Highwayman"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Highwayman"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Highwayman"]/components/li[key="Roof"]/health</xpath>
+		<value>
+			<health>255</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Highwayman"]/components/li[key="Roof"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Highwayman"]/components/li[key="Roof"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Vehicles Expanded/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier1/Roadkill.xml b/ModPatches/Vanilla Vehicles Expanded/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier1/Roadkill.xml
new file mode 100644
index 0000000000..32a7b6e427
--- /dev/null
+++ b/ModPatches/Vanilla Vehicles Expanded/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier1/Roadkill.xml	
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Turret -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Roadkill_MainTurret"]/projectile</xpath>
+		<value>
+			<projectile>Bullet_57x307mmR_HE</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Roadkill_MainTurret"]/reloadTimer</xpath>
+		<value>
+			<reloadTimer>8.2</reloadTimer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Roadkill_MainTurret"]/warmUpTimer</xpath>
+		<value>
+			<warmUpTimer>3.5</warmUpTimer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Roadkill_MainTurret"]/maxRange</xpath>
+		<value>
+			<maxRange>62</maxRange>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Roadkill_MainTurret"]</xpath>
+		<value>
+			<li Class="Vehicles.CETurretDataDefModExtension">
+				<ammoSet>AmmoSet_57x307mmR</ammoSet>
+				<shotHeight>2.5</shotHeight>
+				<speed>92</speed>
+				<sway>0.82</sway>
+				<spread>0.01</spread>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Vehicle -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Roadkill"]</xpath>
+		<value>
+			<descriptionHyperlinks>
+				<CombatExtended.AmmoSetDef>AmmoSet_57x307mmR</CombatExtended.AmmoSetDef>
+			</descriptionHyperlinks>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Roadkill"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Roadkill"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Roadkill"]/vehicleStats/CargoCapacity</xpath>
+		<value>
+			<CargoCapacity>180</CargoCapacity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Roadkill"]/components/li[key="FrontArmorPlating"]/health</xpath>
+		<value>
+			<health>300</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Roadkill"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Roadkill"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Roadkill"]/components/li[key="LeftArmorPlating"]/health</xpath>
+		<value>
+			<health>300</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Roadkill"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Roadkill"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Roadkill"]/components/li[key="RightArmorPlating"]/health</xpath>
+		<value>
+			<health>300</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Roadkill"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Roadkill"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Roadkill"]/components/li[key="Roof"]/health</xpath>
+		<value>
+			<health>300</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Roadkill"]/components/li[key="Roof"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Roadkill"]/components/li[key="Roof"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Vehicles Expanded/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier1/Scytheman.xml b/ModPatches/Vanilla Vehicles Expanded/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier1/Scytheman.xml
new file mode 100644
index 0000000000..11ff892304
--- /dev/null
+++ b/ModPatches/Vanilla Vehicles Expanded/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier1/Scytheman.xml	
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Turret -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Scytheman_MainTurret"]/projectile</xpath>
+		<value>
+			<projectile>Bullet_50mmRocket_HE</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Scytheman_MainTurret"]/reloadTimer</xpath>
+		<value>
+			<reloadTimer>7.2</reloadTimer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Scytheman_MainTurret"]/genericAmmo</xpath>
+		<value>
+			<genericAmmo>false</genericAmmo>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Scytheman_MainTurret"]/magazineCapacity</xpath>
+		<value>
+			<magazineCapacity>12</magazineCapacity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Scytheman_MainTurret"]</xpath>
+		<value>
+			<li Class="Vehicles.CETurretDataDefModExtension">
+				<ammoSet>AmmoSet_50mmRocket</ammoSet>
+				<shotHeight>2</shotHeight>
+				<speed>160</speed> <!-- Temporarily set artifically high, as it fires on a flat trajectory. -->
+				<sway>0.82</sway>
+				<spread>0.15</spread>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Vehicle -->
+	<Operation Class="PatchOperationAdd"> <!-- Doesn't currently work. -->
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Scytheman"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>20</li>
+					<li>30</li>
+					<li>40</li>
+					<li>50</li>
+					<li>60</li>
+				</chargeSpeeds>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Scytheman"]</xpath>
+		<value>
+			<descriptionHyperlinks>
+				<CombatExtended.AmmoSetDef>AmmoSet_50mmRocket</CombatExtended.AmmoSetDef>
+			</descriptionHyperlinks>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Scytheman"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Scytheman"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Vehicles Expanded/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier1/Toad.xml b/ModPatches/Vanilla Vehicles Expanded/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier1/Toad.xml
new file mode 100644
index 0000000000..98a132d447
--- /dev/null
+++ b/ModPatches/Vanilla Vehicles Expanded/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier1/Toad.xml	
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Turret -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Toad_MainTurret"]</xpath>
+		<value>
+			<projectile>Bullet_81mmMortarShell_HE</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Toad_MainTurret"]/reloadTimer</xpath>
+		<value>
+			<reloadTimer>6.5</reloadTimer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Toad_MainTurret"]/warmUpTimer</xpath>
+		<value>
+			<warmUpTimer>5.5</warmUpTimer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Toad_MainTurret"]/minRange</xpath>
+		<value>
+			<minRange>32</minRange>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Toad_MainTurret"]/ammunition/categories</xpath>
+		<value>
+			<categories>
+				<li>Ammo81mmMortarShells</li>
+			</categories>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Toad_MainTurret"]</xpath>
+		<value>
+			<li Class="Vehicles.CETurretDataDefModExtension">
+				<ammoSet>AmmoSet_81mmMortarShell</ammoSet>
+				<shotHeight>2</shotHeight>
+				<speed>90</speed> <!-- Temporarily set to max charge speed to make them somewhat usable. -->
+				<sway>0.82</sway>
+				<spread>0.01</spread>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Mortar -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Toad"]/statBases</xpath>
+		<value>
+			<SightsEfficiency>0.5</SightsEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"> <!-- Doesn't currently work. -->
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Toad"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>30</li>
+					<li>50</li>
+					<li>70</li>
+					<li>90</li>
+				</chargeSpeeds>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Vehicle -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Toad"]</xpath>
+		<value>
+			<descriptionHyperlinks>
+				<CombatExtended.AmmoSetDef>AmmoSet_81mmMortarShell</CombatExtended.AmmoSetDef>
+			</descriptionHyperlinks>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Toad"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>46</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Toad"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>23</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Vehicles Expanded/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier1/Vehicles_T1_Unarmed.xml b/ModPatches/Vanilla Vehicles Expanded/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier1/Vehicles_T1_Unarmed.xml
new file mode 100644
index 0000000000..eb07f36cf2
--- /dev/null
+++ b/ModPatches/Vanilla Vehicles Expanded/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier1/Vehicles_T1_Unarmed.xml	
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Traveller -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Traveller"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Traveller"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Prowler -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Prowler"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Prowler"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.65</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Bang Bus -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_BangBus"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_BangBus"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_BangBus"]/components/li[key="LeftSidePanel"]/health</xpath>
+		<value>
+			<health>270</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_BangBus"]/components/li[key="LeftSidePanel"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_BangBus"]/components/li[key="LeftSidePanel"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_BangBus"]/components/li[key="RightSidePanel"]/health</xpath>
+		<value>
+			<health>270</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_BangBus"]/components/li[key="RightSidePanel"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_BangBus"]/components/li[key="RightSidePanel"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Dinghy -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Dinghy"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Dinghy"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Dirtbike -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Dirtbike"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.9</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Dirtbike"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Frog -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Frog"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Frog"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Mule -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Mule"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2.25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Mule"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Vehicles Expanded/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier2/Bulldog.xml b/ModPatches/Vanilla Vehicles Expanded/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier2/Bulldog.xml
new file mode 100644
index 0000000000..0033b208df
--- /dev/null
+++ b/ModPatches/Vanilla Vehicles Expanded/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier2/Bulldog.xml	
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Turret -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Bulldog_MainTurret"]/projectile</xpath>
+		<value>
+			<projectile>Bullet_75x350mmR_HE</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Bulldog_MainTurret"]/reloadTimer</xpath>
+		<value>
+			<reloadTimer>6.2</reloadTimer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Bulldog_MainTurret"]/warmUpTimer</xpath>
+		<value>
+			<warmUpTimer>2.8</warmUpTimer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Bulldog_MainTurret"]/maxRange</xpath>
+		<value>
+			<maxRange>86</maxRange>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Bulldog_MainTurret"]</xpath>
+		<value>
+			<li Class="Vehicles.CETurretDataDefModExtension">
+				<ammoSet>AmmoSet_75x350mmR</ammoSet>
+				<shotHeight>2.5</shotHeight>
+				<speed>124</speed>
+				<sway>0.82</sway>
+				<spread>0.01</spread>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Vehicle -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bulldog"]</xpath>
+		<value>
+			<descriptionHyperlinks>
+				<CombatExtended.AmmoSetDef>AmmoSet_75x350mmR</CombatExtended.AmmoSetDef>
+			</descriptionHyperlinks>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bulldog"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>32</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bulldog"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bulldog"]/vehicleStats/CargoCapacity</xpath>
+		<value>
+			<CargoCapacity>300</CargoCapacity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bulldog"]/components/li[key="FrontArmorPlating"]/health</xpath>
+		<value>
+			<health>600</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bulldog"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>32</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bulldog"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bulldog"]/components/li[key="LeftArmorPlating"]/health</xpath>
+		<value>
+			<health>600</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bulldog"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>28</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bulldog"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bulldog"]/components/li[key="RightArmorPlating"]/health</xpath>
+		<value>
+			<health>600</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bulldog"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>28</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bulldog"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>14</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bulldog"]/components/li[key="BackArmorPlating"]/health</xpath>
+		<value>
+			<health>600</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bulldog"]/components/li[key="Roof"]/health</xpath>
+		<value>
+			<health>400</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bulldog"]/components/li[key="Roof"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bulldog"]/components/li[key="Roof"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Vehicles Expanded/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier2/Tango.xml b/ModPatches/Vanilla Vehicles Expanded/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier2/Tango.xml
new file mode 100644
index 0000000000..fe7f7526be
--- /dev/null
+++ b/ModPatches/Vanilla Vehicles Expanded/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier2/Tango.xml	
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Tango_MainTurret"]/projectile</xpath>
+		<value>
+			<projectile>Bullet_20x102mmNATO_AP</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Tango_MainTurret"]/reloadTimer</xpath>
+		<value>
+			<reloadTimer>7.8</reloadTimer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Tango_MainTurret"]/warmUpTimer</xpath>
+		<value>
+			<warmUpTimer>2.3</warmUpTimer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Tango_MainTurret"]/magazineCapacity</xpath>
+		<value>
+			<magazineCapacity>50</magazineCapacity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Tango_MainTurret"]/maxRange</xpath>
+		<value>
+			<maxRange>78</maxRange>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Tango_MainTurret"]/fireModes</xpath>
+		<value>
+			<fireModes>
+				<li>
+					<shotsPerBurst>1</shotsPerBurst>
+					<ticksBetweenShots>6</ticksBetweenShots>
+					<ticksBetweenBursts>60</ticksBetweenBursts>
+					<label>Single</label>
+					<texPath>UI/Gizmos/FireRate_Single</texPath>
+				</li>
+				<li>
+					<shotsPerBurst>2</shotsPerBurst>
+					<ticksBetweenShots>6</ticksBetweenShots>
+					<ticksBetweenBursts>60</ticksBetweenBursts>
+					<label>Burst</label>
+					<texPath>UI/Gizmos/FireRate_Burst</texPath>
+				</li>
+				<li>
+					<shotsPerBurst>5</shotsPerBurst>
+					<ticksBetweenShots>6</ticksBetweenShots>
+					<ticksBetweenBursts>60</ticksBetweenBursts>
+					<label>Auto</label>
+					<texPath>UI/Gizmos/FireRate_Auto</texPath>
+				</li>
+			</fireModes>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="Tango_MainTurret"]</xpath>
+		<value>
+			<li Class="Vehicles.CETurretDataDefModExtension">
+				<ammoSet>AmmoSet_20x102mmNATO</ammoSet>
+				<shotHeight>2.25</shotHeight>
+				<speed>182</speed>
+				<sway>1.61</sway>
+				<spread>0.01</spread>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Vehicle -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Tango"]</xpath>
+		<value>
+			<descriptionHyperlinks>
+				<CombatExtended.AmmoSetDef>AmmoSet_20x102mmNATO</CombatExtended.AmmoSetDef>
+			</descriptionHyperlinks>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Tango"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Tango"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Tango"]/components/li[key="FrontArmorPlating"]/health</xpath>
+		<value>
+			<health>660</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Tango"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Tango"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Tango"]/components/li[key="LeftArmorPlating"]/health</xpath>
+		<value>
+			<health>660</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Tango"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Tango"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Tango"]/components/li[key="RightArmorPlating"]/health</xpath>
+		<value>
+			<health>660</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Tango"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Tango"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Tango"]/components/li[key="BackArmorPlating"]/health</xpath>
+		<value>
+			<health>510</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Tango"]/components/li[key="Roof"]/health</xpath>
+		<value>
+			<health>390</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Tango"]/components/li[key="Roof"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>16</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Tango"]/components/li[key="Roof"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Vehicles Expanded/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier2/Vehicles_T2_Unarmed.xml b/ModPatches/Vanilla Vehicles Expanded/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier2/Vehicles_T2_Unarmed.xml
new file mode 100644
index 0000000000..209635f784
--- /dev/null
+++ b/ModPatches/Vanilla Vehicles Expanded/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier2/Vehicles_T2_Unarmed.xml	
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Wagon -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Wagon"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3.75</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Wagon"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.85</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Snatcher -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Snatcher"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Snatcher"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Trawler -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Trawler"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>7</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Trawler"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Charley -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Charley"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2.8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Charley"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.45</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Roadrunner -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Roadrunner"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4.75</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Roadrunner"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Mosquito -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Mosquito"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Mosquito"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Smuggler -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Smuggler"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Smuggler"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Warbird -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Warbird"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Warbird"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Wisent -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Wisent"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Wisent"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Wisent"]/components/li[key="LeftBackPanel"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Wisent"]/components/li[key="LeftBackPanel"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Wisent"]/components/li[key="LeftBackPanel"]/health</xpath>
+		<value>
+			<health>120</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Wisent"]/components/li[key="RightBackPanel"]/armor/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Wisent"]/components/li[key="RightBackPanel"]/armor/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Wisent"]/components/li[key="RightBackPanel"]/health</xpath>
+		<value>
+			<health>120</health>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Vehicles Expanded/Patches/Vanilla Vehicles Expanded/Vehicles_Explosions_Fix.xml b/ModPatches/Vanilla Vehicles Expanded/Patches/Vanilla Vehicles Expanded/Vehicles_Explosions_Fix.xml
new file mode 100644
index 0000000000..adc42682b2
--- /dev/null
+++ b/ModPatches/Vanilla Vehicles Expanded/Patches/Vanilla Vehicles Expanded/Vehicles_Explosions_Fix.xml	
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[
+			defName="VVE_BangBus" or
+			defName="VVE_Bunsen" or
+			defName="VVE_Dinghy" or
+			defName="VVE_Dirtbike" or
+			defName="VVE_Frog" or
+			defName="VVE_Highwayman" or
+			defName="VVE_Mule" or
+			defName="VVE_Prowler" or
+			defName="VVE_Roadkill" or
+			defName="VVE_Scytheman" or
+			defName="VVE_Toad" or
+			defName="VVE_Traveller" or
+			defName="VVE_Bulldog" or
+			defName="VVE_Charley" or
+			defName="VVE_Mosquito" or
+			defName="VVE_Roadrunner" or
+			defName="VVE_Smuggler" or
+			defName="VVE_Snatcher" or
+			defName="VVE_Tango" or
+			defName="VVE_Trawler" or
+			defName="VVE_Wagon" or
+			defName="VVE_Warbird" or
+			defName="VVE_Wisent"
+			]/components/li[key="Engine"]/reactors/li[@Class = "Vehicles.Reactor_Explosive"]/damageDef</xpath>
+		<value>
+			<damageDef>Bomb</damageDef>
+		</value>
+	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[
+			defName="VVE_BangBus" or
+			defName="VVE_Bunsen" or
+			defName="VVE_Dinghy" or
+			defName="VVE_Dirtbike" or
+			defName="VVE_Frog" or
+			defName="VVE_Highwayman" or
+			defName="VVE_Mule" or
+			defName="VVE_Prowler" or
+			defName="VVE_Roadkill" or
+			defName="VVE_Scytheman" or
+			defName="VVE_Toad" or
+			defName="VVE_Traveller" or
+			defName="VVE_Bulldog" or
+			defName="VVE_Charley" or
+			defName="VVE_Mosquito" or
+			defName="VVE_Roadrunner" or
+			defName="VVE_Smuggler" or
+			defName="VVE_Snatcher" or
+			defName="VVE_Tango" or
+			defName="VVE_Trawler" or
+			defName="VVE_Wagon" or
+			defName="VVE_Warbird" or
+			defName="VVE_Wisent"
+			]/components/li[key="Engine"]/reactors/li[@Class = "Vehicles.Reactor_Explosive"]/radius</xpath>
+		<value>
+			<radius>1</radius>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[
+			defName="VVE_BangBus" or
+			defName="VVE_Bunsen" or
+			defName="VVE_Dinghy" or
+			defName="VVE_Dirtbike" or
+			defName="VVE_Frog" or
+			defName="VVE_Highwayman" or
+			defName="VVE_Mule" or
+			defName="VVE_Prowler" or
+			defName="VVE_Roadkill" or
+			defName="VVE_Scytheman" or
+			defName="VVE_Toad" or
+			defName="VVE_Traveller" or
+			defName="VVE_Bulldog" or
+			defName="VVE_Charley" or
+			defName="VVE_Mosquito" or
+			defName="VVE_Roadrunner" or
+			defName="VVE_Smuggler" or
+			defName="VVE_Snatcher" or
+			defName="VVE_Tango" or
+			defName="VVE_Trawler" or
+			defName="VVE_Wagon" or
+			defName="VVE_Warbird" or
+			defName="VVE_Wisent"
+			]/components/li[key="Chemtank"]/reactors/li[@Class = "Vehicles.Reactor_Explosive"]/damageDef</xpath>
+		<value>
+			<damageDef>Bomb</damageDef>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded - Coilguns/Defs/Vanilla Weapons Expanded - Coilguns/Ammo.xml b/ModPatches/Vanilla Weapons Expanded - Coilguns/Defs/Vanilla Weapons Expanded - Coilguns/Ammo.xml
new file mode 100644
index 0000000000..fe8c2df1de
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded - Coilguns/Defs/Vanilla Weapons Expanded - Coilguns/Ammo.xml	
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- === 
+	Coilguns do less damage than some conventional rounds, but have
+	far superior penetration, making them superior against thick
+	armor. 
+	=== -->
+
+	<!-- === Ammo Sets === -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_6mmRailgun_GaussRifle</defName>
+		<label>6mm Railgun</label>
+		<ammoTypes>
+			<Ammo_6mmRailgun_Sabot>Bullet_CoilGun_Rifle</Ammo_6mmRailgun_Sabot>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_6mmRailgun_GaussMagnum</defName>
+		<label>6mm Railgun</label>
+		<ammoTypes>
+			<Ammo_6mmRailgun_Sabot>Bullet_CoilGun_Magnum</Ammo_6mmRailgun_Sabot>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_8mmRailgun_GaussLance</defName>
+		<label>8mm Railgun</label>
+		<ammoTypes>
+			<Ammo_8mmRailgun_Sabot>Bullet_CoilGun_Lance</Ammo_8mmRailgun_Sabot>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- === Projectiles === -->
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletYellow">
+		<defName>Bullet_CoilGun_Magnum</defName>
+		<label>gauss magnum shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<isInstant>true</isInstant>
+			<damageFalloff>False</damageFalloff>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>15</damageAmountBase>
+			<armorPenetrationSharp>23</armorPenetrationSharp>
+			<armorPenetrationBlunt>142.5</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletYellow">
+		<defName>Bullet_CoilGun_Rifle</defName>
+		<label>gauss rifle shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<isInstant>true</isInstant>
+			<damageFalloff>False</damageFalloff>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>16</damageAmountBase>
+			<armorPenetrationSharp>36.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>235.5</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletYellow">
+		<defName>Bullet_CoilGun_Lance</defName>
+		<label>gauss lance shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<isInstant>true</isInstant>
+			<damageFalloff>False</damageFalloff>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>21</damageAmountBase>
+			<armorPenetrationSharp>46.4</armorPenetrationSharp>
+			<armorPenetrationBlunt>312</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded - Coilguns/Patches/Vanilla Weapons Expanded - Coilguns/RangedSpacer.xml b/ModPatches/Vanilla Weapons Expanded - Coilguns/Patches/Vanilla Weapons Expanded - Coilguns/RangedSpacer.xml
new file mode 100644
index 0000000000..a8f87e4a0b
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded - Coilguns/Patches/Vanilla Weapons Expanded - Coilguns/RangedSpacer.xml	
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === 
+      Compared to conventional weapons, coilguns have longer
+      warmups, but higher rates of fire and large magazines.
+      === -->
+
+	<!-- === Tools === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName ="VWE_Gun_GaussMagnum"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VWE_Gun_GaussRifle"]/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="VWE_Gun_GaussLance"]/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>
+
+	<!-- === Gauss Magnum === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_GaussMagnum</defName>
+		<statBases>
+			<Mass>1.45</Mass>
+			<Bulk>2.50</Bulk>
+			<SwayFactor>1.32</SwayFactor>
+			<ShotSpread>0.17</ShotSpread>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.51</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>3.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_CoilGun_Magnum</defaultProjectile>
+			<warmupTime>0.8</warmupTime>
+			<range>15</range>
+			<soundCast>VWE_Shot_GaussMagnum</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_6mmRailgun_GaussMagnum</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Gauss Rifle === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_GaussRifle</defName>
+		<statBases>
+			<Mass>4.0</Mass>
+			<Bulk>9.0</Bulk>
+			<SwayFactor>1.30</SwayFactor>
+			<ShotSpread>0.07</ShotSpread>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.09</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_CoilGun_Rifle</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>VWE_Shot_GaussRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_6mmRailgun_GaussRifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>4</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>Coilgun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Gauss Lance === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_GaussLance</defName>
+		<statBases>
+			<Mass>12.0</Mass>
+			<Bulk>12.0</Bulk>
+			<SwayFactor>2.40</SwayFactor>
+			<ShotSpread>0.1</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.86</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_CoilGun_Lance</defaultProjectile>
+			<warmupTime>2.4</warmupTime>
+			<range>62</range>
+			<soundCast>VWE_Shot_GaussLance</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>5.2</reloadTime>
+			<ammoSet>AmmoSet_8mmRailgun_GaussLance</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+		</weaponTags>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded - Frontier/Defs/Vanilla Weapons Expanded - Frontier/HighRoller_Ammo.xml b/ModPatches/Vanilla Weapons Expanded - Frontier/Defs/Vanilla Weapons Expanded - Frontier/HighRoller_Ammo.xml
new file mode 100644
index 0000000000..7019e572de
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded - Frontier/Defs/Vanilla Weapons Expanded - Frontier/HighRoller_Ammo.xml	
@@ -0,0 +1,436 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_44MagnumHR</defName>
+		<label>.44 Magnum</label>
+		<ammoTypes>
+			<Ammo_44Magnum_FMJ>Bullet_44MagnumHR_FMJ</Ammo_44Magnum_FMJ>
+			<Ammo_44Magnum_AP>Bullet_44MagnumHR_AP</Ammo_44Magnum_AP>
+			<Ammo_44Magnum_HP>Bullet_44MagnumHR_HP</Ammo_44Magnum_HP>
+		</ammoTypes>
+		<similarTo>AmmoSet_PistolMagnum</similarTo>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base44MagnumBullet">
+		<defName>Bullet_44MagnumHR_FMJ</defName>
+		<label>.44 Magnum bullet (FMJ)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>15</damageAmountBase>
+			<armorPenetrationSharp>6</armorPenetrationSharp>
+			<armorPenetrationBlunt>23.280</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bullet</def>
+					<amount>15</amount>
+					<chance>0.10</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base44MagnumBullet">
+		<defName>Bullet_44MagnumHR_AP</defName>
+		<label>.44 Magnum bullet (AP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationSharp>12</armorPenetrationSharp>
+			<armorPenetrationBlunt>23.280</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bullet</def>
+					<amount>10</amount>
+					<chance>0.10</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base44MagnumBullet">
+		<defName>Bullet_44MagnumHR_HP</defName>
+		<label>.44 Magnum bullet (HP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>19</damageAmountBase>
+			<armorPenetrationSharp>3</armorPenetrationSharp>
+			<armorPenetrationBlunt>23.280</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bullet</def>
+					<amount>19</amount>
+					<chance>0.10</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_763x25mmMauserHR</defName>
+		<label>7.63x25mm Mauser</label>
+		<ammoTypes>
+			<Ammo_763x25mmMauser_FMJ>Bullet_763x25mmMauserHR_FMJ</Ammo_763x25mmMauser_FMJ>
+			<Ammo_763x25mmMauser_AP>Bullet_763x25mmMauserHR_AP</Ammo_763x25mmMauser_AP>
+			<Ammo_763x25mmMauser_HP>Bullet_763x25mmMauserHR_HP</Ammo_763x25mmMauser_HP>
+		</ammoTypes>
+		<similarTo>AmmoSet_Pistol</similarTo>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base763x25mmMauserBullet">
+		<defName>Bullet_763x25mmMauserHR_FMJ</defName>
+		<label>7.63mm Mauser bullet (FMJ)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationSharp>5</armorPenetrationSharp>
+			<armorPenetrationBlunt>10.9</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bullet</def>
+					<amount>10</amount>
+					<chance>0.10</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base763x25mmMauserBullet">
+		<defName>Bullet_763x25mmMauserHR_AP</defName>
+		<label>7.63mm Mauser bullet (AP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>7</damageAmountBase>
+			<armorPenetrationSharp>10</armorPenetrationSharp>
+			<armorPenetrationBlunt>10.9</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bullet</def>
+					<amount>7</amount>
+					<chance>0.10</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base763x25mmMauserBullet">
+		<defName>Bullet_763x25mmMauserHR_HP</defName>
+		<label>7.63mm Mauser bullet (HP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>13</damageAmountBase>
+			<armorPenetrationSharp>3</armorPenetrationSharp>
+			<armorPenetrationBlunt>10.9</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bullet</def>
+					<amount>13</amount>
+					<chance>0.10</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_4570GovHR</defName>
+		<label>.45-70 Government</label>
+		<ammoTypes>
+			<Ammo_4570Gov_FMJ>Bullet_4570GovHR_FMJ</Ammo_4570Gov_FMJ>
+			<Ammo_4570Gov_AP>Bullet_4570GovHR_AP</Ammo_4570Gov_AP>
+			<Ammo_4570Gov_HP>Bullet_4570GovHR_HP</Ammo_4570Gov_HP>
+			<Ammo_4570Gov_Incendiary>Bullet_4570GovHR_Incendiary</Ammo_4570Gov_Incendiary>
+			<Ammo_4570Gov_HE>Bullet_4570GovHR_HE</Ammo_4570Gov_HE>
+			<Ammo_4570Gov_Sabot>Bullet_4570GovHR_Sabot</Ammo_4570Gov_Sabot>
+		</ammoTypes>
+		<similarTo>AmmoSet_Rifle</similarTo>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base4570GovBullet">
+		<defName>Bullet_4570GovHR_FMJ</defName>
+		<label>.45-70 Government cartridge (FMJ)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>9</armorPenetrationSharp>
+			<armorPenetrationBlunt>47.32</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bullet</def>
+					<amount>20</amount>
+					<chance>0.10</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base4570GovBullet">
+		<defName>Bullet_4570GovHR_AP</defName>
+		<label>.45-70 Government cartridge (AP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>13</damageAmountBase>
+			<armorPenetrationSharp>18</armorPenetrationSharp>
+			<armorPenetrationBlunt>47.32</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bullet</def>
+					<amount>13</amount>
+					<chance>0.10</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base4570GovBullet">
+		<defName>Bullet_4570GovHR_HP</defName>
+		<label>.45-70 Government cartridge (HP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>25</damageAmountBase>
+			<armorPenetrationSharp>5</armorPenetrationSharp>
+			<armorPenetrationBlunt>47.32</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bullet</def>
+					<amount>25</amount>
+					<chance>0.10</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base4570GovBullet">
+		<defName>Bullet_4570GovHR_Incendiary</defName>
+		<label>.45-70 bullet (AP-I)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>13</damageAmountBase>
+			<armorPenetrationSharp>18</armorPenetrationSharp>
+			<armorPenetrationBlunt>47.32</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>8</amount>
+				</li>
+				<li>
+					<def>Bullet</def>
+					<amount>13</amount>
+					<chance>0.10</chance>
+				</li>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>8</amount>
+					<chance>0.10</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base4570GovBullet">
+		<defName>Bullet_4570GovHR_HE</defName>
+		<label>.45-70 bullet (HE)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>9</armorPenetrationSharp>
+			<armorPenetrationBlunt>47.32</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>12</amount>
+				</li>
+				<li>
+					<def>Bullet</def>
+					<amount>20</amount>
+					<chance>0.10</chance>
+				</li>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>12</amount>
+					<chance>0.10</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base4570GovBullet">
+		<defName>Bullet_4570GovHR_Sabot</defName>
+		<label>.45-70 bullet (Sabot)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>11</damageAmountBase>
+			<armorPenetrationSharp>31.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>60.68</armorPenetrationBlunt>
+			<speed>128</speed>
+			<secondaryDamage>
+				<li>
+					<def>Bullet</def>
+					<amount>11</amount>
+					<chance>0.10</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_12GaugeHR</defName>
+		<label>12 Gauge</label>
+		<ammoTypes>
+			<Ammo_12Gauge_Buck>Bullet_12GaugeHR_Buck</Ammo_12Gauge_Buck>
+			<Ammo_12Gauge_Slug>Bullet_12GaugeHR_Slug</Ammo_12Gauge_Slug>
+			<Ammo_12Gauge_Beanbag>Bullet_12Gauge_Beanbag</Ammo_12Gauge_Beanbag>
+			<Ammo_12Gauge_ElectroSlug>Bullet_12GaugeHR_ElectroSlug</Ammo_12Gauge_ElectroSlug>
+		</ammoTypes>
+		<similarTo>AmmoSet_Shotgun</similarTo>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base12GaugeBullet">
+		<defName>Bullet_12GaugeHR_Buck</defName>
+		<label>buckshot pellet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shotgun_Pellet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>8</damageAmountBase>
+			<pelletCount>9</pelletCount>
+			<armorPenetrationSharp>4</armorPenetrationSharp>
+			<armorPenetrationBlunt>4.52</armorPenetrationBlunt>
+			<spreadMult>17.8</spreadMult>
+			<secondaryDamage>
+				<li>
+					<def>Bullet</def>
+					<amount>9</amount>
+					<chance>0.10</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base12GaugeBullet">
+		<defName>Bullet_12GaugeHR_Slug</defName>
+		<label>shotgun slug</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>110</speed>
+			<damageAmountBase>28</damageAmountBase>
+			<armorPenetrationSharp>6</armorPenetrationSharp>
+			<armorPenetrationBlunt>85.2</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bullet</def>
+					<amount>28</amount>
+					<chance>0.10</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base12GaugeBullet">
+		<defName>Bullet_12GaugeHR_ElectroSlug</defName>
+		<label>EMP slug</label>
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>30</speed>
+			<damageDef>EMP</damageDef>
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+			<empShieldBreakChance>0.2</empShieldBreakChance>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>12</amount>
+					<chance>0.10</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_25ACPHR</defName>
+		<label>.25 ACP</label>
+		<ammoTypes>
+			<Ammo_25ACP_FMJ>Bullet_25ACPHR_FMJ</Ammo_25ACP_FMJ>
+			<Ammo_25ACP_AP>Bullet_25ACPHR_AP</Ammo_25ACP_AP>
+			<Ammo_25ACP_HP>Bullet_25ACPHR_HP</Ammo_25ACP_HP>
+		</ammoTypes>
+		<similarTo>AmmoSet_Pistol</similarTo>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base25ACPBullet">
+		<defName>Bullet_25ACPHR_FMJ</defName>
+		<label>.25 ACP bullet (FMJ)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>5</damageAmountBase>
+			<armorPenetrationSharp>3</armorPenetrationSharp>
+			<armorPenetrationBlunt>1.58</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bullet</def>
+					<amount>5</amount>
+					<chance>0.10</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base25ACPBullet">
+		<defName>Bullet_25ACPHR_AP</defName>
+		<label>.25 ACP bullet (AP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>3</damageAmountBase>
+			<armorPenetrationSharp>6</armorPenetrationSharp>
+			<armorPenetrationBlunt>1.58</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bullet</def>
+					<amount>3</amount>
+					<chance>0.10</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base25ACPBullet">
+		<defName>Bullet_25ACPHR_HP</defName>
+		<label>.25 ACP bullet (HP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>6</damageAmountBase>
+			<armorPenetrationSharp>2</armorPenetrationSharp>
+			<armorPenetrationBlunt>1.58</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bullet</def>
+					<amount>6</amount>
+					<chance>0.10</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded - Frontier/Patches/Vanilla Weapons Expanded - Frontier/Patch_HighRoller_AddonAmmo.xml b/ModPatches/Vanilla Weapons Expanded - Frontier/Patches/Vanilla Weapons Expanded - Frontier/Patch_HighRoller_AddonAmmo.xml
new file mode 100644
index 0000000000..c096451c37
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded - Frontier/Patches/Vanilla Weapons Expanded - Frontier/Patch_HighRoller_AddonAmmo.xml	
@@ -0,0 +1,252 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Weapons Expanded - Quickdraw</li>
+		</mods>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs</xpath>
+			<value>
+
+				<!-- ==================== AmmoSet ========================== -->
+
+				<CombatExtended.AmmoSetDef>
+					<defName>AmmoSet_41RimfireHR</defName>
+					<label>.41 Rimfire</label>
+					<ammoTypes>
+						<Ammo_41Rimfire_FMJ>Bullet_41RimfireHR_FMJ</Ammo_41Rimfire_FMJ>
+						<Ammo_41Rimfire_AP>Bullet_41RimfireHR_AP</Ammo_41Rimfire_AP>
+						<Ammo_41Rimfire_HP>Bullet_41RimfireHR_HP</Ammo_41Rimfire_HP>
+					</ammoTypes>
+					<similarTo>AmmoSet_Pistol</similarTo>
+				</CombatExtended.AmmoSetDef>
+
+				<!-- ==================== Ammo ========================== -->
+
+				<!-- ================== Projectiles ================== -->
+
+				<ThingDef ParentName="Base41RimfireBullet">
+					<defName>Bullet_41RimfireHR_FMJ</defName>
+					<label>.41 Rimfire bullet (FMJ)</label>
+					<projectile Class="CombatExtended.ProjectilePropertiesCE">
+						<damageAmountBase>6</damageAmountBase>
+						<armorPenetrationSharp>1</armorPenetrationSharp>
+						<armorPenetrationBlunt>1.36</armorPenetrationBlunt>
+						<secondaryDamage>
+							<li>
+								<def>Bullet</def>
+								<amount>6</amount>
+								<chance>0.10</chance>
+							</li>
+						</secondaryDamage>
+					</projectile>
+				</ThingDef>
+
+				<ThingDef ParentName="Base41RimfireBullet">
+					<defName>Bullet_41RimfireHR_AP</defName>
+					<label>.41 Rimfire bullet (AP)</label>
+					<projectile Class="CombatExtended.ProjectilePropertiesCE">
+						<damageAmountBase>4</damageAmountBase>
+						<armorPenetrationSharp>2</armorPenetrationSharp>
+						<armorPenetrationBlunt>1.36</armorPenetrationBlunt>
+						<secondaryDamage>
+							<li>
+								<def>Bullet</def>
+								<amount>4</amount>
+								<chance>0.10</chance>
+							</li>
+						</secondaryDamage>
+					</projectile>
+				</ThingDef>
+
+				<ThingDef ParentName="Base41RimfireBullet">
+					<defName>Bullet_41RimfireHR_HP</defName>
+					<label>.41 Rimfire bullet (HP)</label>
+					<projectile Class="CombatExtended.ProjectilePropertiesCE">
+						<damageAmountBase>7</damageAmountBase>
+						<armorPenetrationSharp>1</armorPenetrationSharp>
+						<armorPenetrationBlunt>1.36</armorPenetrationBlunt>
+						<secondaryDamage>
+							<li>
+								<def>Bullet</def>
+								<amount>7</amount>
+								<chance>0.10</chance>
+							</li>
+						</secondaryDamage>
+					</projectile>
+				</ThingDef>
+
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Weapons Expanded - Coilguns</li>
+		</mods>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs</xpath>
+			<value>
+
+				<!-- ==================== AmmoSet ========================== -->
+
+				<CombatExtended.AmmoSetDef>
+					<defName>AmmoSet_GaussRevolver_HR</defName>
+					<label>6mm Railgun</label>
+					<ammoTypes>
+						<Ammo_6mmRailgun_Sabot>Bullet_GaussRevolver_HR</Ammo_6mmRailgun_Sabot>
+					</ammoTypes>
+				</CombatExtended.AmmoSetDef>
+
+				<CombatExtended.AmmoSetDef>
+					<defName>AmmoSet_GaussRepeater_HR</defName>
+					<label>6mm Railgun</label>
+					<ammoTypes>
+						<Ammo_6mmRailgun_Sabot>Bullet_GaussRepeater_HR</Ammo_6mmRailgun_Sabot>
+					</ammoTypes>
+				</CombatExtended.AmmoSetDef>
+
+				<!-- ==================== Ammo ========================== -->
+
+				<!-- ================== Projectiles ================== -->
+
+				<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="BaseLaserBullet">
+					<defName>Bullet_GaussRevolver_HR</defName>
+					<label>gauss revolver shot</label>
+					<projectile Class="CombatExtended.ProjectilePropertiesCE">
+						<isInstant>true</isInstant>
+						<damageFalloff>False</damageFalloff>
+						<damageDef>Bullet</damageDef>
+						<damageAmountBase>14</damageAmountBase>
+						<armorPenetrationSharp>22.2</armorPenetrationSharp>
+						<armorPenetrationBlunt>115.42</armorPenetrationBlunt>
+						<secondaryDamage>
+							<li>
+								<def>Bullet</def>
+								<amount>14</amount>
+								<chance>0.10</chance>
+							</li>
+						</secondaryDamage>
+					</projectile>
+				</ThingDef>
+
+				<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="BaseLaserBullet">
+					<defName>Bullet_GaussRepeater_HR</defName>
+					<label>gauss repeater shot</label>
+					<projectile Class="CombatExtended.ProjectilePropertiesCE">
+						<isInstant>true</isInstant>
+						<damageFalloff>False</damageFalloff>
+						<damageDef>Bullet</damageDef>
+						<damageAmountBase>16</damageAmountBase>
+						<armorPenetrationSharp>35.1</armorPenetrationSharp>
+						<armorPenetrationBlunt>190.8</armorPenetrationBlunt>
+						<secondaryDamage>
+							<li>
+								<def>Bullet</def>
+								<amount>16</amount>
+								<chance>0.10</chance>
+							</li>
+						</secondaryDamage>
+					</projectile>
+				</ThingDef>
+
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Weapons Expanded - Laser</li>
+		</mods>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs</xpath>
+			<value>
+
+				<!-- ==================== AmmoSet ========================== -->
+
+				<CombatExtended.AmmoSetDef>
+					<defName>AmmoSet_SalvagedLaserRevolver_HR</defName>
+					<label>laser charge</label>
+					<ammoTypes>
+						<Ammo_LaserChargePack>Bullet_Laser_SalvagedLaserRevolver_HR</Ammo_LaserChargePack>
+					</ammoTypes>
+				</CombatExtended.AmmoSetDef>
+
+				<CombatExtended.AmmoSetDef>
+					<defName>AmmoSet_SalvagedLaserRepeater_HR</defName>
+					<label>laser charge</label>
+					<ammoTypes>
+						<Ammo_LaserChargePack>Bullet_Laser_SalvagedLaserRepeater_HR</Ammo_LaserChargePack>
+					</ammoTypes>
+				</CombatExtended.AmmoSetDef>
+
+				<CombatExtended.AmmoSetDef>
+					<defName>AmmoSet_SalvagedLaserHuntingRifle_HR</defName>
+					<label>laser charge</label>
+					<ammoTypes>
+						<Ammo_LaserChargePack>Bullet_Laser_SalvagedLaserHuntingRifle_HR</Ammo_LaserChargePack>
+					</ammoTypes>
+				</CombatExtended.AmmoSetDef>
+
+				<!-- ==================== Ammo ========================== -->
+
+				<!-- ================== Projectiles ================== -->
+
+				<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletGreen">
+					<defName>Bullet_Laser_SalvagedLaserRevolver_HR</defName>
+					<label>laser beam</label>
+					<projectile Class="CombatExtended.ProjectilePropertiesCE">
+						<damageDef>CE_Laser</damageDef>
+						<damageAmountBase>12</damageAmountBase>
+						<armorPenetrationSharp>15.5</armorPenetrationSharp>
+						<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+						<secondaryDamage>
+							<li>
+								<def>Bullet</def>
+								<amount>12</amount>
+								<chance>0.10</chance>
+							</li>
+						</secondaryDamage>
+					</projectile>
+				</ThingDef>
+
+				<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletGreen">
+					<defName>Bullet_Laser_SalvagedLaserRepeater_HR</defName>
+					<label>laser beam</label>
+					<projectile Class="CombatExtended.ProjectilePropertiesCE">
+						<damageDef>CE_Laser</damageDef>
+						<damageAmountBase>20</damageAmountBase>
+						<armorPenetrationSharp>16.75</armorPenetrationSharp>
+						<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+						<secondaryDamage>
+							<li>
+								<def>Bullet</def>
+								<amount>20</amount>
+								<chance>0.10</chance>
+							</li>
+						</secondaryDamage>
+					</projectile>
+				</ThingDef>
+
+				<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletGreen">
+					<defName>Bullet_Laser_SalvagedLaserHuntingRifle_HR</defName>
+					<label>laser beam</label>
+					<projectile Class="CombatExtended.ProjectilePropertiesCE">
+						<damageDef>CE_Laser</damageDef>
+						<damageAmountBase>24</damageAmountBase>
+						<armorPenetrationSharp>18.75</armorPenetrationSharp>
+						<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+						<secondaryDamage>
+							<li>
+								<def>Bullet</def>
+								<amount>24</amount>
+								<chance>0.10</chance>
+							</li>
+						</secondaryDamage>
+					</projectile>
+				</ThingDef>
+
+			</value>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded - Frontier/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier-Coilguns.xml b/ModPatches/Vanilla Weapons Expanded - Frontier/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier-Coilguns.xml
new file mode 100644
index 0000000000..b3861ee157
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded - Frontier/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier-Coilguns.xml	
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Weapons Expanded - Coilguns</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!-- === Tools === -->
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VWEFT_Gun_GaussRevolver"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>grip</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>2</power>
+								<cooldownTime>1.54</cooldownTime>
+								<chanceFactor>1.5</chanceFactor>
+								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>muzzle</label>
+								<capacities>
+									<li>Poke</li>
+								</capacities>
+								<power>2</power>
+								<cooldownTime>1.54</cooldownTime>
+								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VWEFT_Gun_GaussRepeater"]/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>
+				</li>
+
+				<!-- === Gauss Revolver === -->
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>VWEFT_Gun_GaussRevolver</defName>
+					<statBases>
+						<Mass>1.45</Mass>
+						<Bulk>2.50</Bulk>
+						<SwayFactor>1.32</SwayFactor>
+						<ShotSpread>0.17</ShotSpread>
+						<SightsEfficiency>0.70</SightsEfficiency>
+						<RangedWeapon_Cooldown>0.51</RangedWeapon_Cooldown>
+					</statBases>
+					<Properties>
+						<recoilAmount>3.0</recoilAmount>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>True</hasStandardCommand>
+						<defaultProjectile>Bullet_CoilGun_Magnum</defaultProjectile>
+						<warmupTime>0.8</warmupTime>
+						<range>15</range>
+						<soundCast>VWE_Shot_GaussMagnum</soundCast>
+						<soundCastTail>GunTail_Light</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>6</magazineSize>
+						<reloadOneAtATime>true</reloadOneAtATime>
+						<reloadTime>0.95</reloadTime>
+						<ammoSet>AmmoSet_GaussRevolver_HR</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aiAimMode>AimedShot</aiAimMode>
+					</FireModes>
+					<weaponTags>
+						<li>FrontierCoilguns</li>
+					</weaponTags>
+				</li>
+
+				<!-- === Gauss Repeater === -->
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>VWEFT_Gun_GaussRepeater</defName>
+					<statBases>
+						<Mass>4.3</Mass>
+						<Bulk>10.0</Bulk>
+						<SwayFactor>1.30</SwayFactor>
+						<ShotSpread>0.07</ShotSpread>
+						<SightsEfficiency>1.00</SightsEfficiency>
+						<RangedWeapon_Cooldown>0.77</RangedWeapon_Cooldown>
+					</statBases>
+					<Properties>
+						<recoilAmount>2.0</recoilAmount>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>True</hasStandardCommand>
+						<defaultProjectile>Bullet_CoilGun_Rifle</defaultProjectile>
+						<warmupTime>1.1</warmupTime>
+						<range>48</range>
+						<soundCast>VWE_Shot_GaussRifle</soundCast>
+						<soundCastTail>GunTail_Medium</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>12</magazineSize>
+						<reloadOneAtATime>true</reloadOneAtATime>
+						<reloadTime>1</reloadTime>
+						<ammoSet>AmmoSet_GaussRepeater_HR</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aiAimMode>AimedShot</aiAimMode>
+						<aiUseBurstMode>True</aiUseBurstMode>
+					</FireModes>
+					<weaponTags>
+						<li>FrontierCoilguns</li>
+					</weaponTags>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded - Frontier/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier-HeavyWeapons.xml b/ModPatches/Vanilla Weapons Expanded - Frontier/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier-HeavyWeapons.xml
new file mode 100644
index 0000000000..c14363e825
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded - Frontier/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier-HeavyWeapons.xml	
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Weapons Expanded - Heavy Weapons</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!-- === Tools === -->
+
+				<li Class="PatchOperationReplace">
+					<xpath>
+						Defs/ThingDef[defName = "VWEFT_Gun_HandheldGatlingGun"]/tools
+					</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>barrels</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>10</power>
+								<cooldownTime>2.44</cooldownTime>
+								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<!-- === Handheld Gatling Gun === -->
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName = "VWEFT_Gun_HandheldGatlingGun"]/costList/ComponentIndustrial</xpath>
+					<value>
+						<ComponentIndustrial>14</ComponentIndustrial>
+					</value>
+				</li>
+
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>VWEFT_Gun_HandheldGatlingGun</defName>
+					<statBases>
+						<Mass>77</Mass>
+						<Bulk>22</Bulk>
+						<SwayFactor>8.78</SwayFactor>
+						<ShotSpread>0.01</ShotSpread>
+						<SightsEfficiency>0.60</SightsEfficiency>
+						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+					</statBases>
+					<Properties>
+						<recoilAmount>0.66</recoilAmount>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>True</hasStandardCommand>
+						<defaultProjectile>Bullet_4570GovHR_FMJ</defaultProjectile>
+						<burstShotCount>10</burstShotCount>
+						<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
+						<warmupTime>2.1</warmupTime>
+						<range>46</range>
+						<minRange>2</minRange>
+						<soundCast>Shot_Minigun</soundCast>
+						<soundCastTail>GunTail_Medium</soundCastTail>
+						<muzzleFlashScale>12</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>40</magazineSize>
+						<reloadTime>7.8</reloadTime>
+						<ammoSet>AmmoSet_4570GovHR</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aiAimMode>SuppressFire</aiAimMode>
+						<aiUseBurstMode>True</aiUseBurstMode>
+						<aimedBurstShotCount>5</aimedBurstShotCount>
+						<noSingleShot>true</noSingleShot>
+					</FireModes>
+					<AllowWithRunAndGun>false</AllowWithRunAndGun>
+				</li>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName = "VWEFT_Gun_HandheldGatlingGun"]</xpath>
+					<value>
+						<li Class="CombatExtended.GunDrawExtension">
+							<DrawSize>1.3,1.3</DrawSize>
+							<DrawOffset>0.10,-0.22</DrawOffset>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded - Frontier/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier-Laser.xml b/ModPatches/Vanilla Weapons Expanded - Frontier/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier-Laser.xml
new file mode 100644
index 0000000000..e0b3dfc32f
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded - Frontier/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier-Laser.xml	
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Weapons Expanded - Laser</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!-- === Tools === -->
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VWEFT_Gun_SalvagedLaserRevolver"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>grip</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>2</power>
+								<cooldownTime>1.54</cooldownTime>
+								<chanceFactor>1.5</chanceFactor>
+								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>muzzle</label>
+								<capacities>
+									<li>Poke</li>
+								</capacities>
+								<power>2</power>
+								<cooldownTime>1.54</cooldownTime>
+								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VWEFT_Gun_SalvagedLaserRepeater" or defName="VWEFT_Gun_SalvagedLaserHuntingRifle"]/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>
+				</li>
+
+				<!-- === Remove VWE Overheating Gizmo === -->
+
+				<li Class="PatchOperationRemove">
+					<xpath>Defs/ThingDef[
+						defName = "VWEFT_Gun_SalvagedLaserRevolver" or
+						defName = "VWEFT_Gun_SalvagedLaserRepeater" or
+						defName = "VWEFT_Gun_SalvagedLaserHuntingRifle"
+						]/comps/li[@Class="VanillaWeaponsExpandedLaser.CompProperties_LaserCapacitor"] </xpath>
+				</li>
+
+				<!-- === Salvaged Laser Revolver === -->
+
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>VWEFT_Gun_SalvagedLaserRevolver</defName>
+					<statBases>
+						<Mass>1.40</Mass>
+						<Bulk>2.60</Bulk>
+						<SwayFactor>1.33</SwayFactor>
+						<ShotSpread>0.07</ShotSpread>
+						<SightsEfficiency>0.7</SightsEfficiency>
+						<RangedWeapon_Cooldown>0.65</RangedWeapon_Cooldown>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>True</hasStandardCommand>
+						<defaultProjectile>Bullet_Laser_SalvagedLaserRevolver_HR</defaultProjectile>
+						<warmupTime>0.6</warmupTime>
+						<range>16</range>
+						<soundCast>VWE_UnstableLaserShot_Light</soundCast>
+						<soundCastTail>GunTail_Heavy</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>16</magazineSize>
+						<reloadTime>4</reloadTime>
+						<ammoSet>AmmoSet_SalvagedLaserRevolver_HR</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aiAimMode>AimedShot</aiAimMode>
+					</FireModes>
+					<weaponTags>
+						<li>SalvagedLaserGun</li>
+						<li>CE_OneHandedWeapon</li>
+					</weaponTags>
+				</li>
+
+				<!-- === Salvaged Laser Repeater === -->
+
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>VWEFT_Gun_SalvagedLaserRepeater</defName>
+					<statBases>
+						<Mass>3.60</Mass>
+						<Bulk>10.10</Bulk>
+						<SwayFactor>1.37</SwayFactor>
+						<ShotSpread>0.08</ShotSpread>
+						<SightsEfficiency>1.00</SightsEfficiency>
+						<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>True</hasStandardCommand>
+						<defaultProjectile>Bullet_Laser_SalvagedLaserRepeater_HR</defaultProjectile>
+						<warmupTime>1</warmupTime>
+						<range>62</range>
+						<soundCast>VWE_UnstableLaserShot_Rifle</soundCast>
+						<soundCastTail>GunTail_Heavy</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>20</magazineSize>
+						<reloadTime>4</reloadTime>
+						<ammoSet>AmmoSet_SalvagedLaserRepeater_HR</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aiAimMode>AimedShot</aiAimMode>
+						<aiUseBurstMode>True</aiUseBurstMode>
+					</FireModes>
+					<weaponTags>
+						<li>SalvagedLaserGun</li>
+					</weaponTags>
+				</li>
+
+				<!-- === Salvaged Laser Hunting Rifle === -->
+
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>VWEFT_Gun_SalvagedLaserHuntingRifle</defName>
+					<statBases>
+						<Mass>4.45</Mass>
+						<Bulk>13.50</Bulk>
+						<SwayFactor>1.35</SwayFactor>
+						<ShotSpread>0.03</ShotSpread>
+						<SightsEfficiency>1.86</SightsEfficiency>
+						<RangedWeapon_Cooldown>0.78</RangedWeapon_Cooldown>
+					</statBases>
+					<Properties>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>True</hasStandardCommand>
+						<defaultProjectile>Bullet_Laser_SalvagedLaserHuntingRifle_HR</defaultProjectile>
+						<warmupTime>1.85</warmupTime>
+						<range>76</range>
+						<soundCast>VWE_LaserShot_Heavy</soundCast>
+						<soundCastTail>GunTail_Heavy</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>12</magazineSize>
+						<reloadTime>4</reloadTime>
+						<ammoSet>AmmoSet_SalvagedLaserHuntingRifle_HR</ammoSet>
+					</AmmoUser>
+					<FireModes>
+						<aiAimMode>AimedShot</aiAimMode>
+					</FireModes>
+					<weaponTags>
+						<li>SalvagedLaserGun</li>
+					</weaponTags>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded - Frontier/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier-Quickdraw.xml b/ModPatches/Vanilla Weapons Expanded - Frontier/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier-Quickdraw.xml
new file mode 100644
index 0000000000..076bdab730
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded - Frontier/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier-Quickdraw.xml	
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Weapons Expanded - Quickdraw</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!-- ========== Melee Tools ========== -->
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VWEFT_Gun_Derringer"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>grip</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>2</power>
+								<cooldownTime>1.54</cooldownTime>
+								<chanceFactor>1.5</chanceFactor>
+								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>muzzle</label>
+								<capacities>
+									<li>Poke</li>
+								</capacities>
+								<power>2</power>
+								<cooldownTime>1.54</cooldownTime>
+								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VWEFT_Gun_LeverActionShotgun"]/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>
+				</li>
+
+				<!-- Derringer -->
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>VWEFT_Gun_Derringer</defName>
+					<statBases>
+						<Mass>0.31</Mass>
+						<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
+						<SightsEfficiency>0.70</SightsEfficiency>
+						<ShotSpread>0.19</ShotSpread>
+						<SwayFactor>0.51</SwayFactor>
+						<Bulk>1.23</Bulk>
+					</statBases>
+					<Properties>
+						<recoilAmount>2.0</recoilAmount>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_41RimfireHR_FMJ</defaultProjectile>
+						<warmupTime>0.4</warmupTime>
+						<range>8</range>
+						<soundCast>Shot_Revolver</soundCast>
+						<soundCastTail>GunTail_Light</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>2</magazineSize>
+						<reloadTime>1</reloadTime>
+						<ammoSet>AmmoSet_41RimfireHR</ammoSet>
+						<reloadOneAtATime>true</reloadOneAtATime>
+					</AmmoUser>
+					<FireModes>
+						<aiUseBurstMode>FALSE</aiUseBurstMode>
+						<aiAimMode>Snapshot</aiAimMode>
+						<noSnapshot>false</noSnapshot>
+						<noSingleShot>false</noSingleShot>
+					</FireModes>
+					<weaponTags>
+						<li>CE_AI_Pistol</li>
+						<li>CE_OneHandedWeapon</li>
+						<li>FrontierGunSimple</li>
+					</weaponTags>
+				</li>
+
+				<!-- ========== Lever Action Shotgun ========== -->
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>VWEFT_Gun_LeverActionShotgun</defName>
+					<statBases>
+						<Mass>3.60</Mass>
+						<RangedWeapon_Cooldown>0.79</RangedWeapon_Cooldown>
+						<SightsEfficiency>1</SightsEfficiency>
+						<ShotSpread>0.11</ShotSpread>
+						<SwayFactor>1.36</SwayFactor>
+						<Bulk>9.97</Bulk>
+					</statBases>
+					<Properties>
+						<recoilAmount>2.0</recoilAmount>
+						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+						<hasStandardCommand>true</hasStandardCommand>
+						<defaultProjectile>Bullet_12GaugeHR_Buck</defaultProjectile>
+						<warmupTime>0.6</warmupTime>
+						<range>16</range>
+						<soundCast>Shot_Shotgun</soundCast>
+						<soundCastTail>GunTail_Heavy</soundCastTail>
+						<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+					<AmmoUser>
+						<magazineSize>5</magazineSize>
+						<reloadTime>0.85</reloadTime>
+						<ammoSet>AmmoSet_12GaugeHR</ammoSet>
+						<reloadOneAtATime>true</reloadOneAtATime>
+					</AmmoUser>
+					<FireModes>
+						<aiUseBurstMode>FALSE</aiUseBurstMode>
+						<aiAimMode>Snapshot</aiAimMode>
+					</FireModes>
+					<weaponTags>
+						<li>FrontierGunAdvanced</li>
+					</weaponTags>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded - Frontier/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier.xml b/ModPatches/Vanilla Weapons Expanded - Frontier/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier.xml
new file mode 100644
index 0000000000..732692aa83
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded - Frontier/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier.xml	
@@ -0,0 +1,286 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Melee Tools ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="VWEFT_Gun_HeavyRevolver" or
+			defName="VWEFT_Gun_VolcanicPistol" or
+			defName="VWEFT_Gun_FrontierPistol"
+			]/tools </xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWEFT_Gun_RollingBlockRifle" or defName="VWEFT_Gun_RepeatingShotgun"]/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>
+
+	<!-- Crafting Recipes -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="VWEFT_Gun_HeavyRevolver" or
+			defName="VWEFT_Gun_VolcanicPistol" or
+			defName="VWEFT_Gun_FrontierPistol"
+			]/costList/ComponentIndustrial </xpath>
+		<value>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VWEFT_Gun_RepeatingShotgun"]/costList/ComponentIndustrial</xpath>
+		<value>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</value>
+	</Operation>
+
+	<!-- Heavy Revolver -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWEFT_Gun_HeavyRevolver</defName>
+		<statBases>
+			<Mass>1.90</Mass>
+			<RangedWeapon_Cooldown>0.88</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.88</SwayFactor>
+			<Bulk>3.75</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_44MagnumHR_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Revolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>5.1</reloadTime>
+			<ammoSet>AmmoSet_44MagnumHR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<noSnapshot>false</noSnapshot>
+			<noSingleShot>false</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>FrontierGunAdvanced</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Volcanic Pistol -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWEFT_Gun_VolcanicPistol</defName>
+		<statBases>
+			<Mass>1.31</Mass>
+			<RangedWeapon_Cooldown>0.75</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.70</SwayFactor>
+			<Bulk>3.80</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_25ACPHR_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Revolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_25ACPHR</ammoSet>
+			<reloadOneAtATime>true</reloadOneAtATime>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<noSnapshot>false</noSnapshot>
+			<noSingleShot>false</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>FrontierGunSimple</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Frontier Pistol ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWEFT_Gun_FrontierPistol</defName>
+		<statBases>
+			<Mass>1.13</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.42</SwayFactor>
+			<Bulk>3.12</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_763x25mmMauserHR_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_763x25mmMauserHR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+			<li>SimpleGun</li>
+			<li>FrontierGunSimple</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Rolling Block Rifle ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWEFT_Gun_RollingBlockRifle</defName>
+		<statBases>
+			<Mass>7.30</Mass>
+			<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.15</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.73</SwayFactor>
+			<Bulk>12.80</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_4570GovHR_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>64</range>
+			<soundCast>Shot_SniperRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>7</AmmoGenPerMagOverride>
+			<reloadTime>2.2</reloadTime>
+			<ammoSet>AmmoSet_4570GovHR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>FrontierGunAdvanced</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Repeating Shotgun ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWEFT_Gun_RepeatingShotgun</defName>
+		<statBases>
+			<Mass>3.60</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.36</SwayFactor>
+			<Bulk>9.97</Bulk>
+			<SightsEfficiency>1</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<recoilAmount>3.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12GaugeHR_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_12GaugeHR</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded - Grenades/Patches/Vanilla Weapons Expanded - Grenades/Apparel_Packs-NonLethal.xml b/ModPatches/Vanilla Weapons Expanded - Grenades/Patches/Vanilla Weapons Expanded - Grenades/Apparel_Packs-NonLethal.xml
new file mode 100644
index 0000000000..ce759e6189
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded - Grenades/Patches/Vanilla Weapons Expanded - Grenades/Apparel_Packs-NonLethal.xml	
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Weapons Expanded - Non-Lethal</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!-- Tear Gas Grenade Belt -->
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VWE_Apparel_GrenadeTearGasBelt"]/costList</xpath>
+					<value>
+						<costList>
+							<VWE_TearGasGrenade>5</VWE_TearGasGrenade>
+						</costList>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VWE_Apparel_GrenadeTearGasBelt"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountToRefill</xpath>
+					<value>
+						<ammoCountPerCharge>1</ammoCountPerCharge>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VWE_Apparel_GrenadeTearGasBelt"]/verbs</xpath>
+					<value>
+						<verbs>
+							<li Class="CombatExtended.VerbPropertiesCE">
+								<label>throw tear gas</label>
+								<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
+								<hasStandardCommand>true</hasStandardCommand>
+								<onlyManualCast>True</onlyManualCast>
+								<warmupTime>0.8</warmupTime>
+								<range>10</range>
+								<minRange>3</minRange>
+								<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+								<soundCast>ThrowGrenade</soundCast>
+								<soundCastTail>GunTail_Medium</soundCastTail>
+								<muzzleFlashScale>0</muzzleFlashScale>
+								<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
+								<targetParams>
+									<canTargetLocations>true</canTargetLocations>
+								</targetParams>
+								<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+								<defaultProjectile>VWENL_Projectile_TearGasGrenade</defaultProjectile>
+								<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
+							</li>
+						</verbs>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded - Grenades/Patches/Vanilla Weapons Expanded - Grenades/Apparel_Packs.xml b/ModPatches/Vanilla Weapons Expanded - Grenades/Patches/Vanilla Weapons Expanded - Grenades/Apparel_Packs.xml
new file mode 100644
index 0000000000..25e52a421c
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded - Grenades/Patches/Vanilla Weapons Expanded - Grenades/Apparel_Packs.xml	
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Frag Grenade Belt -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_Apparel_GrenadeFragBelt"]/costList</xpath>
+		<value>
+			<costList>
+				<Weapon_GrenadeFrag>5</Weapon_GrenadeFrag>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_Apparel_GrenadeFragBelt"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountToRefill</xpath>
+		<value>
+			<ammoCountPerCharge>1</ammoCountPerCharge>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_Apparel_GrenadeFragBelt"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<label>throw frag grenade</label>
+					<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<onlyManualCast>True</onlyManualCast>
+					<warmupTime>0.8</warmupTime>
+					<range>10</range>
+					<minRange>3</minRange>
+					<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+					<soundCast>ThrowGrenade</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+					<defaultProjectile>Proj_GrenadeFrag</defaultProjectile>
+					<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- Molotov Belt -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_Apparel_GrenadeMolotovBelt"]/costList</xpath>
+		<value>
+			<costList>
+				<Weapon_GrenadeMolotov>5</Weapon_GrenadeMolotov>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_Apparel_GrenadeMolotovBelt"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountToRefill</xpath>
+		<value>
+			<ammoCountPerCharge>1</ammoCountPerCharge>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_Apparel_GrenadeMolotovBelt"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<label>throw molotov</label>
+					<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<onlyManualCast>True</onlyManualCast>
+					<warmupTime>0.8</warmupTime>
+					<range>10</range>
+					<minRange>3</minRange>
+					<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+					<soundCast>ThrowMolotovCocktail</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>10</muzzleFlashScale>
+					<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+					<defaultProjectile>Proj_GrenadeMolotov</defaultProjectile>
+					<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- EMP Grenade Belt -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_Apparel_GrenadeEMPBelt"]/costList</xpath>
+		<value>
+			<costList>
+				<Weapon_GrenadeEMP>5</Weapon_GrenadeEMP>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_Apparel_GrenadeEMPBelt"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountToRefill</xpath>
+		<value>
+			<ammoCountPerCharge>1</ammoCountPerCharge>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_Apparel_GrenadeEMPBelt"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<label>throw EMP grenade</label>
+					<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<onlyManualCast>True</onlyManualCast>
+					<warmupTime>0.8</warmupTime>
+					<range>10</range>
+					<minRange>3</minRange>
+					<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+					<soundCast>ThrowGrenade</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>0</muzzleFlashScale>
+					<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+					<defaultProjectile>Proj_GrenadeEMP</defaultProjectile>
+					<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded - Heavy Weapons/Defs/Vanilla Weapons Expanded - Heavy Weapons/Ammo/M73.xml b/ModPatches/Vanilla Weapons Expanded - Heavy Weapons/Defs/Vanilla Weapons Expanded - Heavy Weapons/Ammo/M73.xml
new file mode 100644
index 0000000000..29c7b58095
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded - Heavy Weapons/Defs/Vanilla Weapons Expanded - Heavy Weapons/Ammo/M73.xml	
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>AmmoM73Rockets</defName>
+		<label>M73 Rockets</label>
+		<parent>AmmoRockets</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRocket</iconPath>
+	</ThingCategoryDef>
+
+	<!-- === AmmoSet === -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_M73</defName>
+		<label>M73 Rockets</label>
+		<ammoTypes>
+			<Ammo_M73_HE>Bullet_M73_HE</Ammo_M73_HE>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- === Ammo === -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="MediumAmmoBase">
+		<defName>Ammo_M73_HE</defName>
+		<label>M73 Rocket (HE)</label>
+		<description>66mm high explosive rocket based upon the rocket used in the M72 LAW, used by the Swarm Missile Launcher.</description>
+		<graphicData>
+			<texPath>Things/Ammo/Rocket/M74</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<statBases>
+			<MaxHitPoints>150</MaxHitPoints>
+			<MarketValue>45.19</MarketValue>
+			<Mass>1.71</Mass>
+			<Bulk>5.08</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoM73Rockets</li>
+		</thingCategories>
+		<stackLimit>25</stackLimit>
+		<ammoClass>GrenadeHE</ammoClass>
+		<cookOffFlashScale>40</cookOffFlashScale>
+		<cookOffSound>MortarBomb_Explode</cookOffSound>
+	</ThingDef>
+
+	<!-- === Projectile === -->
+	<ThingDef ParentName="BaseExplosiveBullet">
+		<defName>Bullet_M73_HE</defName>
+		<label>M73 Rocket (HE)</label>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<graphicData>
+			<texPath>Things/Projectile/Rocket/M74</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>42</speed>
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>124</damageAmountBase>
+			<explosionRadius>4</explosionRadius>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<soundAmbient>RocketPropelledLoop_Small</soundAmbient>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>6</Fragment_Large>
+					<Fragment_Small>30</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- === Recipes === -->
+	<RecipeDef ParentName="AdvancedAmmoRecipeBase">
+		<defName>MakeAmmo_M73_HE</defName>
+		<label>make M73 HE rockets x5</label>
+		<description>Craft 5 M73 HE rockets.</description>
+		<jobString>Making M73 HE rockets.</jobString>
+		<workAmount>5200</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>16</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_M73_HE>4</Ammo_M73_HE>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded - Heavy Weapons/Patches/Vanilla Weapons Expanded - Heavy Weapons/Apparel_Packs.xml b/ModPatches/Vanilla Weapons Expanded - Heavy Weapons/Patches/Vanilla Weapons Expanded - Heavy Weapons/Apparel_Packs.xml
new file mode 100644
index 0000000000..7fdced729c
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded - Heavy Weapons/Patches/Vanilla Weapons Expanded - Heavy Weapons/Apparel_Packs.xml	
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_Apparel_Exoframe"]/statBases</xpath>
+		<value>
+			<Bulk>35</Bulk>
+			<WornBulk>12</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_Apparel_Exoframe"]/equippedStatOffsets/CarryingCapacity</xpath>
+		<value>
+			<CarryWeight>55</CarryWeight>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded - Heavy Weapons/Patches/Vanilla Weapons Expanded - Heavy Weapons/RangedIndustrialHeavy.xml b/ModPatches/Vanilla Weapons Expanded - Heavy Weapons/Patches/Vanilla Weapons Expanded - Heavy Weapons/RangedIndustrialHeavy.xml
new file mode 100644
index 0000000000..87b147f61e
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded - Heavy Weapons/Patches/Vanilla Weapons Expanded - Heavy Weapons/RangedIndustrialHeavy.xml	
@@ -0,0 +1,324 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === verbClass === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "VWE_Gun_Autocannon" or
+			defName = "VWE_Gun_HandheldMortar" or
+			defName = "VWE_Gun_HeavyFlamer" or
+			defName = "VWE_Gun_SwarmMissileLauncher" or
+			defName = "VWE_Gun_UraniumSlugRifle"
+			]/verbs/li/verbClass
+		</xpath>
+		<value>
+			<verbClass>Verb_Shoot</verbClass>
+		</value>
+	</Operation>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "VWE_Gun_Autocannon" or
+			defName = "VWE_Gun_HandheldMortar" or
+			defName = "VWE_Gun_HeavyFlamer" or
+			defName = "VWE_Gun_SwarmMissileLauncher" or
+			defName = "VWE_Gun_UraniumSlugRifle"
+			]/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>
+
+	<!-- === Autocannon === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_Autocannon</defName>
+		<statBases>
+			<Mass>55</Mass>
+			<Bulk>22</Bulk>
+			<SwayFactor>8.80</SwayFactor>
+			<ShotSpread>0.01</ShotSpread>
+			<SightsEfficiency>0.66</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.72</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_20x102mmNATO_AP</defaultProjectile>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+			<warmupTime>1</warmupTime>
+			<range>56</range>
+			<minRange>2</minRange>
+			<soundCast>Shot_Autocannon</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>6.5</reloadTime>
+			<ammoSet>AmmoSet_20x102mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VWE_Gun_Autocannon"]/recipeMaker/researchPrerequisite</xpath>
+		<value>
+			<researchPrerequisite>CE_TurretHeavyWeapons</researchPrerequisite>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName = "VWE_Gun_Autocannon"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.3,1.3</DrawSize>
+				<DrawOffset>0.10,-0.22</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Handheld Mortar === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_HandheldMortar</defName>
+		<statBases>
+			<Bulk>20</Bulk>
+			<SwayFactor>1.24</SwayFactor>
+			<ShotSpread>0.10</ShotSpread>
+			<SightsEfficiency>0.5</SightsEfficiency>
+			<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>5.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_60mmMortarShell_HE</defaultProjectile>
+			<warmupTime>3.5</warmupTime>
+			<range>126</range>
+			<minRange>16</minRange>
+			<soundCast>Mortar_LaunchA</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>16</muzzleFlashScale>
+			<circularError>1.1</circularError>
+			<indirectFirePenalty>0.3</indirectFirePenalty>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>5.2</reloadTime>
+			<ammoSet>AmmoSet_60mmMortarShell</ammoSet>
+		</AmmoUser>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_Gun_HandheldMortar"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>30</li>
+					<li>50</li>
+					<li>70</li>
+					<li>90</li>
+				</chargeSpeeds>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VWE_Gun_HandheldMortar"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.3,1.3</DrawSize>
+				<DrawOffset>0.10,-0.20</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Slug Rifle === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_UraniumSlugRifle</defName>
+		<statBases>
+			<Mass>60</Mass>
+			<Bulk>22.5</Bulk>
+			<SwayFactor>9.85</SwayFactor>
+			<ShotSpread>0.01</ShotSpread>
+			<SightsEfficiency>2.20</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.40</RangedWeapon_Cooldown>
+			<NightVisionEfficiency_Weapon>0.4</NightVisionEfficiency_Weapon>
+		</statBases>
+		<Properties>
+			<recoilAmount>3.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_30x173mmNATO_AP</defaultProjectile>
+			<warmupTime>4.6</warmupTime>
+			<range>86</range>
+			<minRange>9</minRange>
+			<soundCast>Shot_TurretSniper</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>6.6</reloadTime>
+			<ammoSet>AmmoSet_30x173mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VWE_Gun_UraniumSlugRifle"]/recipeMaker/researchPrerequisite</xpath>
+		<value>
+			<researchPrerequisite>CE_TurretHeavyWeapons</researchPrerequisite>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VWE_Gun_UraniumSlugRifle"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.4,1.4</DrawSize>
+				<DrawOffset>0.15,-0.22</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Heavy Flamer === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_HeavyFlamer</defName>
+		<statBases>
+			<Bulk>18</Bulk>
+			<SwayFactor>7.10</SwayFactor>
+			<ShotSpread>0.5</ShotSpread>
+			<SightsEfficiency>0.60</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<recoilAmount>0.85</recoilAmount>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Flamethrower_Prometheum</defaultProjectile>
+			<burstShotCount>40</burstShotCount>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<warmupTime>1</warmupTime>
+			<range>26</range>
+			<minRange>3</minRange>
+			<soundCast>HissFlamethrower</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>5.6</reloadTime>
+			<ammoSet>AmmoSet_Flamethrower</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>20</aimedBurstShotCount>
+			<noSingleShot>True</noSingleShot>
+		</FireModes>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VWE_Gun_HeavyFlamer"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.3,1.3</DrawSize>
+				<DrawOffset>0.10,-0.20</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- === Missile Launcher === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_SwarmMissileLauncher</defName>
+		<statBases>
+			<Mass>40</Mass>
+			<Bulk>22</Bulk>
+			<SwayFactor>3.54</SwayFactor>
+			<ShotSpread>0.10</ShotSpread>
+			<SightsEfficiency>0.66</SightsEfficiency>
+			<RangedWeapon_Cooldown>1.40</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.72</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_M73_HE</defaultProjectile>
+			<burstShotCount>8</burstShotCount>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<warmupTime>3.5</warmupTime>
+			<range>68</range>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>2</reloadTime>
+			<ammoSet>AmmoSet_M73</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>4</aimedBurstShotCount>
+		</FireModes>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VWE_Gun_SwarmMissileLauncher"]/recipeMaker/researchPrerequisite</xpath>
+		<value>
+			<researchPrerequisite>CE_AdvancedLaunchers</researchPrerequisite>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="VWE_Gun_SwarmMissileLauncher"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.3,1.3</DrawSize>
+				<DrawOffset>0.10,-0.20</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded - Laser/Defs/Vanilla Weapons Expanded - Laser/Ammo.xml b/ModPatches/Vanilla Weapons Expanded - Laser/Defs/Vanilla Weapons Expanded - Laser/Ammo.xml
new file mode 100644
index 0000000000..bd44dad111
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded - Laser/Defs/Vanilla Weapons Expanded - Laser/Ammo.xml	
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- === Ammo Sets === -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_SalvagedLaserPistol</defName>
+		<label>laser charge</label>
+		<ammoTypes>
+			<Ammo_LaserChargePack>Bullet_Laser_SalvagedLaserPistol</Ammo_LaserChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_LaserPistol</defName>
+		<label>laser charge</label>
+		<ammoTypes>
+			<Ammo_LaserChargePack>Bullet_Laser_LaserPistol</Ammo_LaserChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_LaserSMG</defName>
+		<label>laser charge</label>
+		<ammoTypes>
+			<Ammo_LaserChargePack>Bullet_Laser_LaserSMG</Ammo_LaserChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_SalvagedLaserRifle</defName>
+		<label>laser charge</label>
+		<ammoTypes>
+			<Ammo_LaserChargePack>Bullet_Laser_SalvagedLaserRifle</Ammo_LaserChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_LaserRifle</defName>
+		<label>laser charge</label>
+		<ammoTypes>
+			<Ammo_LaserChargePack>Bullet_Laser_LaserRifle</Ammo_LaserChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_SalvagedLaserShotgun</defName>
+		<label>laser charge</label>
+		<ammoTypes>
+			<Ammo_LaserChargePack>Bullet_Laser_SalvagedLaserShotgun</Ammo_LaserChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_LaserShotgun</defName>
+		<label>laser charge</label>
+		<ammoTypes>
+			<Ammo_LaserChargePack>Bullet_Laser_LaserShotgun</Ammo_LaserChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_SalvagedLaserSniperRifle</defName>
+		<label>laser charge</label>
+		<ammoTypes>
+			<Ammo_LaserChargePack>Bullet_Laser_SalvagedLaserSniperRifle</Ammo_LaserChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_LaserSniperRifle</defName>
+		<label>laser charge</label>
+		<ammoTypes>
+			<Ammo_LaserChargePack>Bullet_Laser_LaserSniperRifle</Ammo_LaserChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_LaserMiniGun</defName>
+		<label>laser charge</label>
+		<ammoTypes>
+			<Ammo_LaserChargePack>Bullet_Laser_LaserMiniGun</Ammo_LaserChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_LaserTeslaGun</defName>
+		<label>laser charge</label>
+		<ammoTypes>
+			<Ammo_LaserChargePack>Bullet_Laser_TeslaGun</Ammo_LaserChargePack>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- === Projectiles === -->
+
+	<!--
+	Unstable shots do slightly higher damage, but have slightly less penetration, due to the beams being less focused, delivering the energy over a wider area.
+	Vice versa for stable shots, due to better made weaponry.
+	-->
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="BaseLaserBullet">
+		<defName>Bullet_Laser_SalvagedLaserPistol</defName>
+		<label>laser beam</label>
+		<textures>
+			<li>Things/Projectile/Shot_SalvagedLaserPistol</li>
+		</textures>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>15.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt><!-- The overall pressure exerted by a laser beam striking something is, unsuprisingly, negligable. -->
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="BaseLaserBullet">
+		<defName>Bullet_Laser_LaserPistol</defName>
+		<label>laser beam</label>
+		<textures>
+			<li>Things/Projectile/Shot_LaserPistol</li>
+		</textures>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationSharp>17.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="BaseLaserBullet">
+		<defName>Bullet_Laser_LaserSMG</defName>
+		<label>laser beam</label>
+		<textures>
+			<li>Things/Projectile/Shot_LaserPistol</li>
+		</textures>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>11</damageAmountBase>
+			<armorPenetrationSharp>18.25</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="BaseLaserBullet">
+		<defName>Bullet_Laser_SalvagedLaserRifle</defName>
+		<label>laser beam</label>
+		<textures>
+			<li>Things/Projectile/Shot_SalvagedLaserRifle</li>
+		</textures>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>16.75</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="BaseLaserBullet">
+		<defName>Bullet_Laser_LaserRifle</defName>
+		<label>laser beam</label>
+		<textures>
+			<li>Things/Projectile/Shot_LaserRifle</li>
+		</textures>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>18</damageAmountBase>
+			<armorPenetrationSharp>17.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="BaseLaserBullet">
+		<defName>Bullet_Laser_SalvagedLaserShotgun</defName>
+		<label>rifle beam</label>
+		<textures>
+			<li>Things/Projectile/Shot_SalvagedLaserShotgun</li>
+		</textures>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>9</damageAmountBase>
+			<armorPenetrationSharp>14.25</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+			<pelletCount>7</pelletCount>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="BaseLaserBullet">
+		<defName>Bullet_Laser_LaserShotgun</defName>
+		<label>laser beam</label>
+		<textures>
+			<li>Things/Projectile/Shot_LaserShotgun</li>
+		</textures>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>8</damageAmountBase>
+			<armorPenetrationSharp>15.75</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+			<pelletCount>7</pelletCount>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="BaseLaserBullet">
+		<defName>Bullet_Laser_SalvagedLaserSniperRifle</defName>
+		<label>laser beam</label>
+		<textures>
+			<li>Things/Projectile/Shot_SalvagedLaserSniperRifle</li>
+		</textures>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>24</damageAmountBase>
+			<armorPenetrationSharp>18.75</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="BaseLaserBullet">
+		<defName>Bullet_Laser_LaserSniperRifle</defName>
+		<label>laser beam</label>
+		<textures>
+			<li>Things/Projectile/Shot_LaserSniperRifle</li>
+		</textures>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>20.25</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="BaseLaserBullet">
+		<defName>Bullet_Laser_LaserMiniGun</defName>
+		<label>laser beam</label>
+		<textures>
+			<li>Things/Projectile/Shot_LaserMinigun</li>
+		</textures>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>16</damageAmountBase>
+			<armorPenetrationSharp>16</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="BaseLaserBullet">
+		<defName>Bullet_Laser_TeslaGun</defName>
+		<label>arc discharge</label>
+		<textures>
+			<li>Things/Projectile/Shot_TeslaGunA</li>
+			<li>Things/Projectile/Shot_TeslaGunB</li>
+			<li>Things/Projectile/Shot_TeslaGunC</li>
+			<li>Things/Projectile/Shot_TeslaGunD</li>
+			<li>Things/Projectile/Shot_TeslaGunE</li>
+		</textures>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>EMP</damageDef>
+<!--        <damageAmountBase>8</damageAmountBase>
+			<armorPenetrationSharp>16</armorPenetrationSharp> -->
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded - Laser/Patches/Vanilla Weapons Expanded - Laser/MeleeSpacer.xml b/ModPatches/Vanilla Weapons Expanded - Laser/Patches/Vanilla Weapons Expanded - Laser/MeleeSpacer.xml
new file mode 100644
index 0000000000..a07b97b49f
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded - Laser/Patches/Vanilla Weapons Expanded - Laser/MeleeSpacer.xml	
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Laser Sword ========== -->
+
+	<!--
+    Appears like a laser rapier of sorts, favoring quick thrusts capable of poking through armor.
+    -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWEL_LaserSword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<chanceFactor>0.33</chanceFactor>
+					<cooldownTime>1.52</cooldownTime>
+					<armorPenetrationBlunt>0.500</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.24</cooldownTime>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<armorPenetrationSharp>42</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.14</cooldownTime>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+					<armorPenetrationSharp>20</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWEL_LaserSword"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWEL_LaserSword"]/equippedAngleOffset</xpath>
+		<value>
+			<equippedAngleOffset>-45</equippedAngleOffset>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWEL_LaserSword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.63</MeleeCritChance>
+				<MeleeParryChance>0.75</MeleeParryChance>
+				<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWEL_LaserSword"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded - Laser/Patches/Vanilla Weapons Expanded - Laser/PawnKinds.xml b/ModPatches/Vanilla Weapons Expanded - Laser/Patches/Vanilla Weapons Expanded - Laser/PawnKinds.xml
new file mode 100644
index 0000000000..ce3389639f
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded - Laser/Patches/Vanilla Weapons Expanded - Laser/PawnKinds.xml	
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Give ammo to Mercenary Marine ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="Mercenary_Marine"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>7</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded - Laser/Patches/Vanilla Weapons Expanded - Laser/RangedSpacer.xml b/ModPatches/Vanilla Weapons Expanded - Laser/Patches/Vanilla Weapons Expanded - Laser/RangedSpacer.xml
new file mode 100644
index 0000000000..3531ef7119
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded - Laser/Patches/Vanilla Weapons Expanded - Laser/RangedSpacer.xml	
@@ -0,0 +1,519 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--
+      Compared to conventional weaponry, laser weapons have high magazine capacities and high rates of fire. No noticable recoil and the instantaneous
+      nature of their projectiles makes them accurate and easy to shoot, but their damage falls-off significantly with range as the beam scatters.
+
+      Scavenged/salvaged weapons are cruder than their refined counterparts. They're heavier and bulkier, take more time to warm up and cool down, and 
+      experience greater falloff due to imperfections in the focusing lenses, but they do slightly more damage.
+      -->
+
+	<!-- === Tools === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VWEL_Gun_LaserPistol" or defName = "VWEL_Gun_SalvagedLaserPistol"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "VWEL_Gun_LaserSMG" or
+			defName = "VWEL_Gun_LaserRifle" or
+			defName = "VWEL_Gun_LaserShotgun" or
+			defName = "VWEL_Gun_LaserSniperRifle" or
+			defName = "VWEL_Gun_SalvagedLaserRifle" or
+			defName = "VWEL_Gun_SalvagedLaserShotgun" or
+			defName = "VWEL_Gun_SalvagedLaserSniperRifle"
+			]/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="VWEL_Gun_LaserMinigun" or defName = "VWEL_Gun_TeslaGun"]/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>
+
+	<!-- === Remove VWE Overheating Gizmo === -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName = "VWEL_Gun_LaserPistol" or
+			defName = "VWEL_Gun_SalvagedLaserPistol" or
+			defName = "VWEL_Gun_LaserSMG" or
+			defName = "VWEL_Gun_LaserRifle" or
+			defName = "VWEL_Gun_LaserShotgun" or
+			defName = "VWEL_Gun_LaserSniperRifle" or
+			defName = "VWEL_Gun_SalvagedLaserRifle" or
+			defName = "VWEL_Gun_SalvagedLaserShotgun" or
+			defName = "VWEL_Gun_SalvagedLaserSniperRifle" or
+			defName="VWEL_Gun_LaserMinigun" or
+			defName = "VWEL_Gun_TeslaGun"
+			]/comps/li[@Class="VanillaWeaponsExpandedLaser.CompProperties_LaserCapacitor"] </xpath>
+	</Operation>
+
+	<!-- === Laser Pistol === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWEL_Gun_LaserPistol</defName>
+		<statBases>
+			<Mass>1.20</Mass>
+			<Bulk>2.30</Bulk>
+			<SwayFactor>1.17</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Laser_LaserPistol</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>16</range>
+			<soundCast>VWE_LaserShot_Light</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_LaserPistol</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>LaserGun</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Salvaged Laser Pistol === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWEL_Gun_SalvagedLaserPistol</defName>
+		<statBases>
+			<Mass>1.40</Mass>
+			<Bulk>2.60</Bulk>
+			<SwayFactor>1.33</SwayFactor>
+			<ShotSpread>0.08</ShotSpread>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Laser_SalvagedLaserPistol</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>VWE_UnstableLaserShot_Light</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_SalvagedLaserPistol</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SalvagedLaserGun</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Laser SMG === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWEL_Gun_LaserSMG</defName>
+		<statBases>
+			<Mass>2.25</Mass>
+			<Bulk>6.90</Bulk>
+			<SwayFactor>0.92</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Laser_LaserSMG</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>28</range>
+			<burstShotCount>7</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>VWE_LaserShot_Light</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>45</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_LaserSMG</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- === Laser Rifle === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWEL_Gun_LaserRifle</defName>
+		<statBases>
+			<Mass>3.50</Mass>
+			<Bulk>10.00</Bulk>
+			<SwayFactor>1.35</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.01</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Laser_LaserRifle</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>62</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>VWE_UnstableLaserShot_Rifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>60</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_LaserRifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- === Salvaged Laser Rifle === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWEL_Gun_SalvagedLaserRifle</defName>
+		<statBases>
+			<Mass>3.60</Mass>
+			<Bulk>10.10</Bulk>
+			<SwayFactor>1.37</SwayFactor>
+			<ShotSpread>0.08</ShotSpread>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.01</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Laser_SalvagedLaserRifle</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>62</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>VWE_UnstableLaserShot_Rifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>60</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_SalvagedLaserRifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- === Laser Shotgun === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWEL_Gun_LaserShotgun</defName>
+		<statBases>
+			<Mass>3.40</Mass>
+			<Bulk>9.00</Bulk>
+			<SwayFactor>1.24</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.01</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Laser_LaserShotgun</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>17</range>
+			<soundCast>VWE_LaserShot_Heavy</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_LaserShotgun</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+		</FireModes>
+	</Operation>
+
+	<!-- === Salvaged Laser Shotgun === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWEL_Gun_SalvagedLaserShotgun</defName>
+		<statBases>
+			<Mass>3.50</Mass>
+			<Bulk>9.10</Bulk>
+			<SwayFactor>1.26</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.01</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Laser_SalvagedLaserShotgun</defaultProjectile>
+			<warmupTime>0.65</warmupTime>
+			<range>17</range>
+			<soundCast>VWE_LaserShot_Heavy</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_SalvagedLaserShotgun</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+		</FireModes>
+	</Operation>
+
+	<!-- === Laser Sniper Rifle === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWEL_Gun_LaserSniperRifle</defName>
+		<statBases>
+			<Mass>4.20</Mass>
+			<Bulk>13.00</Bulk>
+			<SwayFactor>1.19</SwayFactor>
+			<ShotSpread>0.04</ShotSpread>
+			<SightsEfficiency>2.48</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
+			<NightVisionEfficiency_Weapon>0.4</NightVisionEfficiency_Weapon>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Laser_LaserSniperRifle</defaultProjectile>
+			<warmupTime>1.7</warmupTime>
+			<range>81</range>
+			<soundCast>VWE_LaserShot_Heavy</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_LaserSniperRifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>Bipod_DMR</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Salvaged Laser Sniper Rifle === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWEL_Gun_SalvagedLaserSniperRifle</defName>
+		<statBases>
+			<Mass>4.45</Mass>
+			<Bulk>13.50</Bulk>
+			<SwayFactor>1.35</SwayFactor>
+			<ShotSpread>0.03</ShotSpread>
+			<SightsEfficiency>2.36</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.65</RangedWeapon_Cooldown>
+			<NightVisionEfficiency_Weapon>0.3</NightVisionEfficiency_Weapon>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Laser_SalvagedLaserSniperRifle</defaultProjectile>
+			<warmupTime>1.85</warmupTime>
+			<range>81</range>
+			<soundCast>VWE_LaserShot_Heavy</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_SalvagedLaserSniperRifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>Bipod_DMR</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Laser Minigun === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWEL_Gun_LaserMinigun</defName>
+		<statBases>
+			<Mass>16.00</Mass>
+			<Bulk>10.40</Bulk>
+			<SwayFactor>2.64</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Laser_LaserMiniGun</defaultProjectile>
+			<burstShotCount>250</burstShotCount>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<warmupTime>2</warmupTime>
+			<range>75</range>
+			<soundCast>VWE_LaserShot_Rifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilAmount>0.01</recoilAmount>
+			<recoilPattern>Regular</recoilPattern>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1000</magazineSize>
+			<reloadTime>6</reloadTime>
+			<ammoSet>AmmoSet_LaserMiniGun</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>100</aimedBurstShotCount>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+
+	<!-- === Tesla Gun === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWEL_Gun_TeslaGun</defName>
+		<statBases>
+			<Mass>8.0</Mass>
+			<Bulk>10.0</Bulk>
+			<SwayFactor>1.80</SwayFactor>
+			<ShotSpread>0.01</ShotSpread>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Laser_TeslaGun</defaultProjectile>
+			<burstShotCount>30</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>0.8</warmupTime>
+			<range>31</range>
+			<soundCast>VWE_LaserShot_Electricity</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilAmount>0.01</recoilAmount>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>6.2</reloadTime>
+			<ammoSet>AmmoSet_LaserTeslaGun</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded - Makeshift/Patches/Vanilla Weapons Expanded - Makeshift/RangedIndustrial.xml b/ModPatches/Vanilla Weapons Expanded - Makeshift/Patches/Vanilla Weapons Expanded - Makeshift/RangedIndustrial.xml
new file mode 100644
index 0000000000..d8a0446385
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded - Makeshift/Patches/Vanilla Weapons Expanded - Makeshift/RangedIndustrial.xml	
@@ -0,0 +1,311 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName = "VWE_Gun_MakeshiftPistol" or
+			defName = "VWE_Gun_MakeshiftSMG" or
+			defName = "VWE_Gun_MakeshiftRifle" or
+			defName = "VWE_Gun_MakeshiftLMG" or
+			defName = "VWE_Gun_MakeshiftShotgun"
+			]/modExtensions</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[defName = "VWE_Gun_MakeshiftPistol"]/tools
+		</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "VWE_Gun_MakeshiftSMG" or
+			defName = "VWE_Gun_MakeshiftRifle" or
+			defName = "VWE_Gun_MakeshiftLMG" or
+			defName = "VWE_Gun_MakeshiftShotgun"
+			]/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="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_MakeshiftPistol</defName>
+		<statBases>
+			<Mass>1.33</Mass>
+			<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.50</SightsEfficiency>
+			<ShotSpread>0.60</ShotSpread>
+			<SwayFactor>1.30</SwayFactor>
+			<Bulk>2.62</Bulk>
+		</statBases>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_Gun_MakeshiftPistol"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.75</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+					<warmupTime>0.5</warmupTime>
+					<range>10</range>
+					<soundCast>Shot_Autopistol</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_MakeshiftSMG</defName>
+		<statBases>
+			<Mass>2.83</Mass>
+			<RangedWeapon_Cooldown>0.40</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.80</SightsEfficiency>
+			<ShotSpread>0.38</ShotSpread>
+			<SwayFactor>1.18</SwayFactor>
+			<Bulk>5.62</Bulk>
+		</statBases>
+		<AmmoUser>
+			<magazineSize>24</magazineSize>
+			<reloadTime>4.4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_Gun_MakeshiftSMG"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.02</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+					<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
+					<burstShotCount>6</burstShotCount>
+					<warmupTime>0.6</warmupTime>
+					<range>22</range>
+					<soundCast>Shot_MachinePistol</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_MakeshiftRifle</defName>
+		<statBases>
+			<Mass>4</Mass>
+			<RangedWeapon_Cooldown>0.40</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.80</SightsEfficiency>
+			<ShotSpread>0.30</ShotSpread>
+			<SwayFactor>1.68</SwayFactor>
+			<Bulk>11.62</Bulk>
+		</statBases>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AR</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_Gun_MakeshiftRifle"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.73</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+					<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
+					<burstShotCount>5</burstShotCount>
+					<warmupTime>1.1</warmupTime>
+					<range>40</range>
+					<soundCast>Shot_AssaultRifle</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_MakeshiftLMG</defName>
+		<statBases>
+			<Mass>11.5</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.80</SightsEfficiency>
+			<ShotSpread>0.28</ShotSpread>
+			<SwayFactor>2.23</SwayFactor>
+			<Bulk>15.7</Bulk>
+		</statBases>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>5.2</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_Gun_MakeshiftLMG"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.32</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+					<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+					<burstShotCount>10</burstShotCount>
+					<warmupTime>1.3</warmupTime>
+					<range>58</range>
+					<soundCast>Shot_Minigun</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_MakeshiftShotgun</defName>
+		<statBases>
+			<Mass>4.5</Mass>
+			<RangedWeapon_Cooldown>1.0</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.80</SightsEfficiency>
+			<ShotSpread>0.38</ShotSpread>
+			<SwayFactor>1.48</SwayFactor>
+			<Bulk>9.6</Bulk>
+		</statBases>
+		<AmmoUser>
+			<magazineSize>2</magazineSize>
+			<AmmoGenPerMagOverride>4</AmmoGenPerMagOverride>
+			<reloadTime>1.0</reloadTime>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_Gun_MakeshiftShotgun"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.69</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<range>13</range>
+					<soundCast>Shot_Shotgun</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded - Non-Lethal/Defs/Vanilla Weapons Expanded - Non-Lethal/40mmLessLethal.xml b/ModPatches/Vanilla Weapons Expanded - Non-Lethal/Defs/Vanilla Weapons Expanded - Non-Lethal/40mmLessLethal.xml
new file mode 100644
index 0000000000..27e9ccfc60
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded - Non-Lethal/Defs/Vanilla Weapons Expanded - Non-Lethal/40mmLessLethal.xml	
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_40x46mmGrenadeNL</defName>
+		<label>40x46mm Grenades</label>
+		<ammoTypes>
+			<Ammo_40x46mmGrenade_CN>Bullet_40x46mmGrenade_CN</Ammo_40x46mmGrenade_CN>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="40x46mmGrenadeBase">
+		<defName>Ammo_40x46mmGrenade_CN</defName>
+		<label>40x46mm grenade (CN)</label>
+		<description>Low velocity grenade filled with a non-lethal chemical irritant, intended for crowd control.</description>
+		<graphicData>
+			<texPath>Things/Ammo/GrenadeLauncher/GS50_SMK</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>5.37</MarketValue>
+		</statBases>
+		<stackLimit>200</stackLimit>
+		<ammoClass>CNGas</ammoClass>
+		<detonateProjectile>Bullet_40x46mmGrenade_CN</detonateProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base40x46mmGrenadeBullet">
+		<defName>Bullet_40x46mmGrenade_CN</defName>
+		<label>40x46mm grenade (CN)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>3.9</explosionRadius>
+			<damageDef>VWENL_TearGas</damageDef>
+			<postExplosionSpawnThingDef>VWENL_TearGasCloud</postExplosionSpawnThingDef>
+			<preExplosionSpawnChance>1</preExplosionSpawnChance>
+			<postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_40x46mmGrenade_CN</defName>
+		<label>make 40x46mm CN grenades x100</label>
+		<description>Craft 100 40x46mm CN grenades.</description>
+		<jobString>Making 40x46mm CN grenades.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>50</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Neutroamine</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Neutroamine</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_40x46mmGrenade_CN>100</Ammo_40x46mmGrenade_CN>
+		</products>
+		<workAmount>9000</workAmount>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded - Non-Lethal/Defs/Vanilla Weapons Expanded - Non-Lethal/Recipe_TearGas.xml b/ModPatches/Vanilla Weapons Expanded - Non-Lethal/Defs/Vanilla Weapons Expanded - Non-Lethal/Recipe_TearGas.xml
new file mode 100644
index 0000000000..6e3cffefc7
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded - Non-Lethal/Defs/Vanilla Weapons Expanded - Non-Lethal/Recipe_TearGas.xml	
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeVWENLTearGasGrenade</defName>
+		<label>make tear gas grenades x10</label>
+		<description>Craft 10 tear gas grenades.</description>
+		<jobString>Making tear gas grenades.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Neutroamine</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Neutroamine</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<VWE_TearGasGrenade>10</VWE_TearGasGrenade>
+		</products>
+	</RecipeDef>
+	
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded - Non-Lethal/Defs/Vanilla Weapons Expanded - Non-Lethal/RubberBullet.xml b/ModPatches/Vanilla Weapons Expanded - Non-Lethal/Defs/Vanilla Weapons Expanded - Non-Lethal/RubberBullet.xml
new file mode 100644
index 0000000000..52174d9a4c
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded - Non-Lethal/Defs/Vanilla Weapons Expanded - Non-Lethal/RubberBullet.xml	
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>Ammo43cal</defName>
+		<label>.43 caliber</label>
+		<parent>AmmoPistols</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_43cal_NL</defName>
+		<label>.43 caliber rubber bullet</label>
+		<ammoTypes>
+			<Ammo_43cal_NL>Bullet_43cal_NL</Ammo_43cal_NL>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="45ACPBase">
+		<defName>Ammo_43cal_NL</defName>
+		<label>.43 caliber rubber bullet</label>
+		<description>Gas-powered pistol cartridge firing rubberized projectiles. Painful, but generally non-lethal.</description>
+		<graphicData>
+			<texPath>Things/Ammo/Pistol/FMJ</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.09</MarketValue>
+		</statBases>
+		<ammoClass>RubberBullet</ammoClass>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base45ACPBullet">
+		<defName>Bullet_43cal_NL</defName>
+		<label>rubber bullet</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Blunt</damageDef>
+			<damageAmountBase>5</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Beanbag</def>
+					<amount>4</amount>
+					<chance>0.10</chance>
+				</li>
+			</secondaryDamage>
+			<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
+			<speed>32</speed>
+			<dropsCasings>false</dropsCasings>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_43cal_NL</defName>
+		<label>make .43 rubber bullet cartridges x200</label>
+		<description>Craft 200 .43 rubber bullet cartridges.</description>
+		<jobString>Making .43 rubber bullet cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>16</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Chemfuel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Chemfuel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_43cal_NL>200</Ammo_43cal_NL>
+		</products>
+		<workAmount>1800</workAmount>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded - Non-Lethal/Defs/Vanilla Weapons Expanded - Non-Lethal/TaserCartridge.xml b/ModPatches/Vanilla Weapons Expanded - Non-Lethal/Defs/Vanilla Weapons Expanded - Non-Lethal/TaserCartridge.xml
new file mode 100644
index 0000000000..db45e77766
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded - Non-Lethal/Defs/Vanilla Weapons Expanded - Non-Lethal/TaserCartridge.xml	
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>AmmoTaser</defName>
+		<label>taser cartridge</label>
+		<parent>AmmoPistols</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Taser</defName>
+		<label>taser cartridge</label>
+		<ammoTypes>
+			<Ammo_Taser>Bullet_Taser</Ammo_Taser>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="45ACPBase">
+		<defName>Ammo_Taser</defName>
+		<label>taser cartridge</label>
+		<description>A nitrogen powered cartridge, firing a pair of thin wires to deliver an incapacitating shock to foes.</description>
+		<graphicData>
+			<texPath>Things/Ammo/PlasmaCell/Pistol</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.85</MarketValue>
+			<Mass>0.05</Mass>
+			<Bulk>0.05</Bulk>
+		</statBases>
+		<ammoClass>Taser</ammoClass>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base45ACPBullet">
+		<defName>Bullet_Taser</defName>
+		<label>taser prong</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>6</damageAmountBase>
+			<damageDef>Taser</damageDef>
+			<armorPenetrationSharp>0.65</armorPenetrationSharp>
+			<armorPenetrationBlunt>3</armorPenetrationBlunt>
+			<speed>30</speed>
+			<dropsCasings>false</dropsCasings>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_Taser</defName>
+		<label>make taser cartridge x50</label>
+		<description>Craft 50 taser cartridges.</description>
+		<jobString>Making taser cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>15</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Chemfuel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>Chemfuel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Taser>50</Ammo_Taser>
+		</products>
+		<workAmount>2400</workAmount>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded - Non-Lethal/Defs/Vanilla Weapons Expanded - Non-Lethal/TranquilizerDart.xml b/ModPatches/Vanilla Weapons Expanded - Non-Lethal/Defs/Vanilla Weapons Expanded - Non-Lethal/TranquilizerDart.xml
new file mode 100644
index 0000000000..7b2958ba58
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded - Non-Lethal/Defs/Vanilla Weapons Expanded - Non-Lethal/TranquilizerDart.xml	
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_DartRifle_NonLethal</defName>
+		<label>dart rifle</label>
+		<ammoTypes>
+			<Ammo_DartRifle_NL>Bullet_DartRifle_NL</Ammo_DartRifle_NL>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x51mmNATOBase">
+		<defName>Ammo_DartRifle_NL</defName>
+		<label>dart rifle cartridge</label>
+		<graphicData>
+			<texPath>ThirdParty/CP Metal Gear Solid/Rifle/NL</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.85</MarketValue>
+		</statBases>
+		<ammoClass>TranqNonLethal</ammoClass>
+		<cookOffProjectile>Bullet_DartRifle_NL</cookOffProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base762x51mmNATOBullet">
+		<defName>Bullet_DartRifle_NL</defName>
+		<label>tranquilizer dart</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>VWE_AnestheticDart</damageDef>
+			<damageAmountBase>2</damageAmountBase>
+			<armorPenetrationSharp>1.85</armorPenetrationSharp>
+			<armorPenetrationBlunt>12.85</armorPenetrationBlunt>
+			<speed>43</speed>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_DartRifle_NL</defName>
+		<label>make dart rifle cartridge x200</label>
+		<description>Craft 200 dart rifle cartridges.</description>
+		<jobString>Making dart rifle cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>18</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Neutroamine</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Neutroamine</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_DartRifle_NL>200</Ammo_DartRifle_NL>
+		</products>
+		<workAmount>3800</workAmount>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded - Non-Lethal/Patches/Vanilla Weapons Expanded - Non-Lethal/NonLethal_Grenades.xml b/ModPatches/Vanilla Weapons Expanded - Non-Lethal/Patches/Vanilla Weapons Expanded - Non-Lethal/NonLethal_Grenades.xml
new file mode 100644
index 0000000000..b7ed833d5e
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded - Non-Lethal/Patches/Vanilla Weapons Expanded - Non-Lethal/NonLethal_Grenades.xml	
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tear Gas Grenade === -->
+	<!-- == Projectile == -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWENL_Projectile_TearGasGrenade"]</xpath>
+		<value>
+			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWENL_Projectile_TearGasGrenade"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<damageDef>VWENL_TearGas</damageDef>
+				<explosionRadius>3.9</explosionRadius>
+				<damageAmountBase>1</damageAmountBase>
+				<explosionDelay>100</explosionDelay>
+				<dropsCasings>true</dropsCasings>
+				<flyOverhead>false</flyOverhead>
+				<soundExplode>DispensePaste</soundExplode>
+				<postExplosionSpawnThingDef>VWENL_TearGasCloud</postExplosionSpawnThingDef>
+				<postExplosionSpawnChance>1</postExplosionSpawnChance>
+				<postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+				<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+			</projectile>
+		</value>
+	</Operation>
+
+	<!-- == Grenade == -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_TearGasGrenade"]</xpath>
+		<value>
+			<thingClass>CombatExtended.AmmoThing</thingClass>
+			<stackLimit>75</stackLimit>
+			<resourceReadoutPriority>First</resourceReadoutPriority>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="VWE_TearGasGrenade"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_TearGasGrenade</defName>
+		<statBases>
+			<Mass>1</Mass>
+			<MarketValue>2.25</MarketValue>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<label>throw tear gas</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>VWENL_Projectile_TearGasGrenade</defaultProjectile>
+			<range>12</range>
+			<warmupTime>1.8</warmupTime>
+			<soundCast>ThrowGrenade</soundCast>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+			<onlyManualCast>true</onlyManualCast>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded - Non-Lethal/Patches/Vanilla Weapons Expanded - Non-Lethal/NonLethal_Melee.xml b/ModPatches/Vanilla Weapons Expanded - Non-Lethal/Patches/Vanilla Weapons Expanded - Non-Lethal/NonLethal_Melee.xml
new file mode 100644
index 0000000000..daecbdf394
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded - Non-Lethal/Patches/Vanilla Weapons Expanded - Non-Lethal/NonLethal_Melee.xml	
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Baton === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_StunBaton"]/statBases</xpath>
+		<value>
+			<Bulk>2.75</Bulk>
+			<MeleeCounterParryBonus>0.9</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_StunBaton"]</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="VWE_MeleeWeapon_StunBaton"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_StunBaton"]/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>head</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Stun</def>
+							<amount>32</amount>
+							<chance>0.20</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>1.68</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>3.375</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded - Non-Lethal/Patches/Vanilla Weapons Expanded - Non-Lethal/NonLethal_Ranged.xml b/ModPatches/Vanilla Weapons Expanded - Non-Lethal/Patches/Vanilla Weapons Expanded - Non-Lethal/NonLethal_Ranged.xml
new file mode 100644
index 0000000000..58c871aee1
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded - Non-Lethal/Patches/Vanilla Weapons Expanded - Non-Lethal/NonLethal_Ranged.xml	
@@ -0,0 +1,250 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tools === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_Gun_Taser" or defName="VWE_Gun_RubberBulletPistol"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VWE_Gun_DartGun"]/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="VWE_Gun_TearGasLauncher"]/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>
+
+	<!-- ========== Taser ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_Taser</defName>
+		<statBases>
+			<Mass>0.21</Mass>
+			<RangedWeapon_Cooldown>0.98</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.60</SightsEfficiency>
+			<ShotSpread>0.67</ShotSpread>
+			<SwayFactor>1.07</SwayFactor>
+			<Bulk>1.85</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Taser</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>7</range>
+			<soundCast>VWE_TaserShot_Electricity</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>2</magazineSize>
+			<reloadTime>4.7</reloadTime>
+			<ammoSet>AmmoSet_Taser</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>NonLethal</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Rubber Bullet Pistol ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_RubberBulletPistol</defName>
+		<statBases>
+			<Mass>1.11</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.07</SwayFactor>
+			<Bulk>2.10</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_43cal_NL</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>VWENL_Shot_RubberBulletPistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>5.4</reloadTime>
+			<ammoSet>AmmoSet_43cal_NL</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>NonLethal</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Dart Gun ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_DartGun</defName>
+		<statBases>
+			<Mass>3</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.6</SightsEfficiency>
+			<ShotSpread>0.21</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>10.03</Bulk>
+		</statBases>
+		<costList>
+			<Steel>60</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_DartRifle_NL</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>VWENL_Shot_DartGun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>5</AmmoGenPerMagOverride>
+			<reloadTime>2.4</reloadTime>
+			<ammoSet>AmmoSet_DartRifle_NonLethal</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- === Tear Gas Launcher === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_TearGasLauncher</defName>
+		<statBases>
+			<Mass>5.35</Mass>
+			<Bulk>5.70</Bulk>
+			<SwayFactor>1.31</SwayFactor>
+			<ShotSpread>0.18</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>65</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.3</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_40x46mmGrenade_CN</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>40</range>
+			<soundCast>VWENL_Shot_GrenadeLauncher</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<ai_IsBuildingDestroyer>True</ai_IsBuildingDestroyer>
+			<ignorePartialLoSBlocker>True</ignorePartialLoSBlocker>
+			<targetParams>
+				<canTargetLocations>True</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
+			<reloadTime>2.2</reloadTime>
+			<ammoSet>AmmoSet_40x46mmGrenadeNL</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>False</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>NonLethal</li>
+		</weaponTags>
+
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded - Quickdraw/Patches/Vanilla Weapons Expanded - Quickdraw/Weapons_Quickdraw.xml b/ModPatches/Vanilla Weapons Expanded - Quickdraw/Patches/Vanilla Weapons Expanded - Quickdraw/Weapons_Quickdraw.xml
new file mode 100644
index 0000000000..cdaafd0146
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded - Quickdraw/Patches/Vanilla Weapons Expanded - Quickdraw/Weapons_Quickdraw.xml	
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Melee Tools ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_Gun_AutomaticPistol"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_Gun_PDW" or defName="VWE_Gun_BullpupRifle" or defName="VWE_Gun_BullpupDMR"]/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>
+
+	<!-- ========== PDW ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_PDW</defName>
+		<statBases>
+			<Mass>2.60</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>0.77</SwayFactor>
+			<Bulk>5.05</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.05</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>25</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>Shot_HeavySMG</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_FN57x28mm</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>CE_Sidearm</li>
+		</weaponTags>
+		<!-- Required research rework -->
+		<researchPrerequisite>BlowbackOperation</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== Bullpup Rifle ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_BullpupRifle</defName>
+		<statBases>
+			<WorkToMake>32000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.10</SwayFactor>
+			<Bulk>7.37</Bulk>
+			<Mass>3.61</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.46</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<warmupTime>0.9</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>Bipod_Rifle</li>
+		</weaponTags>
+		<!-- Required research rework -->
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== Bullpup DMR ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_BullpupDMR</defName>
+		<statBases>
+			<WorkToMake>23000</WorkToMake>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.70</SwayFactor>
+			<Bulk>12.25</Bulk>
+			<Mass>4.30</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>75</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SniperRifle</li>
+			<li>Bipod_DMR</li>
+		</weaponTags>
+		<!-- Required research rework -->
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!-- ========== Auto Pistol ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_AutomaticPistol</defName>
+		<statBases>
+			<WorkToMake>7000</WorkToMake>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>0.88</SwayFactor>
+			<Bulk>1.86</Bulk>
+			<Mass>0.78</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.74</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>12</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>17</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+		<!-- Required research rework -->
+		<researchPrerequisite>BlowbackOperation</researchPrerequisite>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded - Tribal/Defs/Vanilla Weapons Expanded - Tribal/Recipes_Ranged.xml b/ModPatches/Vanilla Weapons Expanded - Tribal/Defs/Vanilla Weapons Expanded - Tribal/Recipes_Ranged.xml
new file mode 100644
index 0000000000..28d6b3219a
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded - Tribal/Defs/Vanilla Weapons Expanded - Tribal/Recipes_Ranged.xml	
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Def>
+
+	<!-- == Recipes == -->
+
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeVWEThrowingShard</defName>
+		<label>make throwing shards x10</label>
+		<description>Craft 10 throwing shards.</description>
+		<jobString>Making throwing shards.</jobString>
+		<workAmount>800</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<stuffCategoriesToAllow>
+						<li>Metallic</li>
+						<li>Stony</li>
+					</stuffCategoriesToAllow>
+				</filter>
+				<count>20</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<stuffCategoriesToAllow>
+				<li>Metallic</li>
+				<li>Stony</li>
+			</stuffCategoriesToAllow>
+		</fixedIngredientFilter>
+		<products>
+			<VWE_Throwing_Shards>10</VWE_Throwing_Shards>
+		</products>
+		<recipeUsers>
+			<li>CraftingSpot</li>
+		</recipeUsers>
+	</RecipeDef>
+
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeFireBomb</defName>
+		<label>make fire bombs x10</label>
+		<description>Craft 10 fire bombs.</description>
+		<jobString>Making fire bombs.</jobString>
+		<workAmount>1200</workAmount>
+		<recipeUsers>
+			<li>CraftingSpot</li>
+		</recipeUsers>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Cloth</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Chemfuel</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Cloth</li>
+				<li>Chemfuel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<VWE_Weapon_FireBomb>10</VWE_Weapon_FireBomb>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded - Tribal/Patches/Vanilla Weapons Expanded - Tribal/Melee_Neolithic.xml b/ModPatches/Vanilla Weapons Expanded - Tribal/Patches/Vanilla Weapons Expanded - Tribal/Melee_Neolithic.xml
new file mode 100644
index 0000000000..6ae7506e26
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded - Tribal/Patches/Vanilla Weapons Expanded - Tribal/Melee_Neolithic.xml	
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Heavy Club -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_HeavyClub"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<chanceFactor>0.33</chanceFactor>
+					<cooldownTime>1.93</cooldownTime>
+					<armorPenetrationBlunt>1.375</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>4.49</cooldownTime>
+					<armorPenetrationBlunt>5.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_HeavyClub"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>0.53</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_HeavyClub"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.38</MeleeCritChance>
+				<MeleeParryChance>0.4</MeleeParryChance>
+				<MeleeDodgeChance>0.37</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Light Club -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_LightClub"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<chanceFactor>0.33</chanceFactor>
+					<cooldownTime>1.78</cooldownTime>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>3.01</cooldownTime>
+					<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_LightClub"]/statBases</xpath>
+		<value>
+			<Bulk>3.75</Bulk>
+			<MeleeCounterParryBonus>0.14</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_LightClub"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.58</MeleeCritChance>
+				<MeleeParryChance>0.14</MeleeParryChance>
+				<MeleeDodgeChance>0.16</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_LightClub"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- === Tribal Axe === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_TribalAxe"]/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.33</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>
+					<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.28</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_TribalAxe"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_TribalAxe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.10</MeleeCritChance>
+				<MeleeParryChance>0.15</MeleeParryChance>
+				<MeleeDodgeChance>0.20</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_TribalAxe"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- === Shiv === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_Shiv"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<chanceFactor>0.33</chanceFactor>
+					<cooldownTime>1.2</cooldownTime>
+					<armorPenetrationBlunt>0.07</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>9.5</power>
+					<cooldownTime>1.2</cooldownTime>
+					<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.18</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_Shiv"]/statBases</xpath>
+		<value>
+			<Bulk>0.15</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_Shiv"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.1</MeleeCritChance>
+				<MeleeParryChance>0.1</MeleeParryChance>
+				<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_Shiv"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded - Tribal/Patches/Vanilla Weapons Expanded - Tribal/Ranged_Neolithic.xml b/ModPatches/Vanilla Weapons Expanded - Tribal/Patches/Vanilla Weapons Expanded - Tribal/Ranged_Neolithic.xml
new file mode 100644
index 0000000000..c17d02fda5
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded - Tribal/Patches/Vanilla Weapons Expanded - Tribal/Ranged_Neolithic.xml	
@@ -0,0 +1,299 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Sling ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Sling</defName>
+		<statBases>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<ShotSpread>1</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>0.8</Bulk>
+			<RangedWeapon_Cooldown>3.2</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Projectile_SlingBullet_Stone</defaultProjectile>
+			<warmupTime>2.4</warmupTime>
+			<range>32</range>
+			<soundCast>Bow_Small</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<reloadTime>3.8</reloadTime>
+			<ammoSet>AmmoSet_SlingBullet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_Sling"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Body</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.75</cooldownTime>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Throwing Shard === -->
+	<!-- == Projectile == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_FlyingShard"]</xpath>
+		<value>
+			<ThingDef ParentName="BasePilumProjectile">
+				<defName>VWE_FlyingShard</defName>
+				<label>shard</label>
+				<graphicData>
+					<texPath>Things/Projectile/ShardThrown</texPath>
+					<graphicClass>Graphic_Single</graphicClass>
+				</graphicData>
+				<projectile Class="CombatExtended.ProjectilePropertiesCE">
+					<damageDef>RangedStab</damageDef>
+					<damageAmountBase>7</damageAmountBase>
+					<flyOverhead>false</flyOverhead>
+					<speed>25</speed>
+					<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.26</armorPenetrationSharp>
+					<preExplosionSpawnChance>0.60</preExplosionSpawnChance>
+					<preExplosionSpawnThingDef>VWE_Throwing_Shards</preExplosionSpawnThingDef>
+				</projectile>
+			</ThingDef>
+		</value>
+	</Operation>
+
+	<!-- == Weapon == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_Throwing_Shards"]/graphicData</xpath>
+		<value>
+			<graphicData>
+				<texPath>Things/Projectile/ShardThrown</texPath>
+				<graphicClass>Graphic_Single</graphicClass>
+			</graphicData>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="VWE_Throwing_Shards"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>BaseWeapon</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_Throwing_Shards"]</xpath>
+		<value>
+			<thingCategories>
+				<li>WeaponsRanged</li>
+			</thingCategories>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VWE_Throwing_Shards"]/recipeMaker</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VWE_Throwing_Shards"]/costStuffCount</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VWE_Throwing_Shards"]/stuffCategories</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_Throwing_Shards"]/smeltable</xpath>
+		<value>
+			<thingClass>CombatExtended.AmmoThing</thingClass>
+			<stackLimit>75</stackLimit>
+			<resourceReadoutPriority>First</resourceReadoutPriority>
+			<smeltable>False</smeltable>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="VWE_Throwing_Shards"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Throwing_Shards</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<Bulk>0.35</Bulk>
+			<Mass>0.15</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<label>Throw shard</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>VWE_FlyingShard</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>9</range>
+			<soundCast>ThrowGrenade</soundCast>
+			<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+		</Properties>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_Throwing_Shards"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.26</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.36</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Fire Bomb ========== -->
+
+	<!-- Projectile -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_Proj_FireBomb"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<explosionRadius>0.5</explosionRadius>
+				<damageDef>Flame</damageDef>
+				<damageAmountBase>10</damageAmountBase>
+				<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
+				<preExplosionSpawnChance>1</preExplosionSpawnChance>
+				<speed>10</speed>
+				<ai_IsIncendiary>true</ai_IsIncendiary>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_Proj_FireBomb"]</xpath>
+		<value>
+			<thingClass>CombatExtended.Projectile_FireTrail</thingClass>
+		</value>
+	</Operation>
+
+	<!-- Grenade -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_Weapon_FireBomb"]/graphicData</xpath>
+		<value>
+			<graphicData>
+				<texPath>Things/Projectile/FireBombThrown</texPath>
+				<graphicClass>Graphic_Single</graphicClass>
+			</graphicData>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_Weapon_FireBomb"]</xpath>
+		<value>
+			<thingClass>CombatExtended.AmmoThing</thingClass>
+			<stackLimit>50</stackLimit>
+			<resourceReadoutPriority>First</resourceReadoutPriority>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="VWE_Weapon_FireBomb"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_Weapon_FireBomb"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>1</damageAmountBase>
+				<explosiveDamageType>Flame</explosiveDamageType>
+				<explosiveRadius>0.5</explosiveRadius>
+				<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
+				<preExplosionSpawnChance>1</preExplosionSpawnChance>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Weapon_FireBomb</defName>
+		<statBases>
+			<Mass>0.6</Mass>
+			<Bulk>1.8</Bulk>
+			<MarketValue>3</MarketValue>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.0</SightsEfficiency>
+		</statBases>
+		<Properties>
+			<label>throw firebomb</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<range>10</range>
+			<minRange>3</minRange>
+			<warmupTime>1.8</warmupTime>
+			<noiseRadius>4</noiseRadius>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<soundCast>ThrowMolotovCocktail</soundCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<defaultProjectile>VWE_Proj_FireBomb</defaultProjectile>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VWE_Weapon_FireBomb"]/recipeMaker</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_Weapon_FireBomb"]</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Body</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.75</cooldownTime>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded/Defs/Vanilla Weapons Expanded/Ammo/AntiGrainRocket.xml b/ModPatches/Vanilla Weapons Expanded/Defs/Vanilla Weapons Expanded/Ammo/AntiGrainRocket.xml
new file mode 100644
index 0000000000..38374280aa
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded/Defs/Vanilla Weapons Expanded/Ammo/AntiGrainRocket.xml	
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- === Projectile === -->
+	<ThingDef ParentName="BaseSPG9Rocket">
+		<defName>Bullet_AntiGrainRocket</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>anti-grain rocket</label>
+		<graphicData>
+			<texPath>Things/Projectile/RPG/Frag</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>100</speed>
+			<damageDef>EMP</damageDef>
+			<explosionRadius>8</explosionRadius>
+			<damageAmountBase>300</damageAmountBase>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>250</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>8</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Small>100</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded/Defs/Vanilla Weapons Expanded/Ammo/ChargeTriplet.xml b/ModPatches/Vanilla Weapons Expanded/Defs/Vanilla Weapons Expanded/Ammo/ChargeTriplet.xml
new file mode 100644
index 0000000000..8ac12d309e
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded/Defs/Vanilla Weapons Expanded/Ammo/ChargeTriplet.xml	
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- == AmmoSet == -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_8x35mmCharged_Triple</defName>
+		<label>8x35mm Charged</label>
+		<ammoTypes>
+			<Ammo_8x35mmCharged>Bullet_8x35mmCharged_Triple</Ammo_8x35mmCharged>
+			<Ammo_8x35mmCharged_AP>Bullet_8x35mmCharged_AP_Triple</Ammo_8x35mmCharged_AP>
+			<Ammo_8x35mmCharged_Ion>Bullet_8x35mmCharged_Ion_Triple</Ammo_8x35mmCharged_Ion>
+		</ammoTypes>
+		<similarTo>AmmoSet_ChargedRifle</similarTo>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- == Projectiles == -->
+	<ThingDef ParentName="Bullet_8x35mmCharged">
+		<defName>Bullet_8x35mmCharged_Triple</defName>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<pelletCount>3</pelletCount>
+			<spreadMult>1.8</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Bullet_8x35mmCharged_AP">
+		<defName>Bullet_8x35mmCharged_AP_Triple</defName>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<pelletCount>3</pelletCount>
+			<spreadMult>1.8</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Bullet_8x35mmCharged_Ion">
+		<defName>Bullet_8x35mmCharged_Ion_Triple</defName>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<pelletCount>3</pelletCount>
+			<spreadMult>1.8</spreadMult>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded/Defs/Vanilla Weapons Expanded/Ammo/FireExtinguisher.xml b/ModPatches/Vanilla Weapons Expanded/Defs/Vanilla Weapons Expanded/Ammo/FireExtinguisher.xml
new file mode 100644
index 0000000000..2932763ba2
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded/Defs/Vanilla Weapons Expanded/Ammo/FireExtinguisher.xml	
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- === Thing Category & Ammo Def === -->
+
+	<ThingCategoryDef>
+		<defName>AmmoVWEExtinguisher</defName>
+		<label>firefoam</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberFuel</iconPath>
+	</ThingCategoryDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_VWE_Extinguisher</defName>
+		<label>firefoam</label>
+		<ammoTypes>
+			<Ammo_VWE_Extinguisher>Bullet_VWE_Extinguisher</Ammo_VWE_Extinguisher>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- === Ammo === -->
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_VWE_Extinguisher</defName>
+		<label>firefoam</label>
+		<description>Flame suppressant used by the Fire Extinguisher</description>
+		<graphicData>
+			<texPath>Things/Ammo/FuelCell/Foam</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.50</MarketValue>
+			<MaxHitPoints>70</MaxHitPoints>
+			<Flammability>1.0</Flammability>
+			<Mass>0.03</Mass>
+			<Bulk>0.03</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoVWEExtinguisher</li>
+		</thingCategories>
+		<stackLimit>500</stackLimit>
+		<ammoClass>FoamFuel</ammoClass>
+		<generateAllowChance>0</generateAllowChance>
+	</ThingDef>
+
+	<!-- === Projectile === -->
+	<ThingDef ParentName="BaseBulletCE">
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<defName>Bullet_VWE_Extinguisher</defName>
+		<label>firefoam</label>
+		<graphicData>
+			<texPath>Things/Projectile/Proj_FireExtinguisher/Proj_FireExtinguisherA</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>VWE_Extinguish</damageDef>
+			<damageAmountBase>50</damageAmountBase>
+			<explosionRadius>1</explosionRadius>
+			<suppressionFactor>0.0</suppressionFactor>
+			<dangerFactor>0.0</dangerFactor>
+			<preExplosionSpawnThingDef>Filth_FireFoam</preExplosionSpawnThingDef>
+			<preExplosionSpawnChance>1</preExplosionSpawnChance>
+			<soundExplode>VWE_Explosion_FireExtinguisher</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<speed>20</speed>
+			<flyOverhead>false</flyOverhead>
+		</projectile>
+	</ThingDef>
+
+	<!-- === Recipe === -->
+	<RecipeDef Name="ExtinguisherAmmoRecipeBase" ParentName="AmmoRecipeBase" Abstract="true">
+		<workSpeedStat>DrugSynthesisSpeed</workSpeedStat>
+		<effectWorking>Cook</effectWorking>
+		<soundWorking>Recipe_CookMeal</soundWorking>
+		<workSkill>Intellectual</workSkill>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ExtinguisherAmmoRecipeBase">
+		<defName>MakeAmmo_VWE_Extinguisher</defName>
+		<label>make firefoam x500</label>
+		<description>Craft 500 units of firefoam.</description>
+		<jobString>Making firefoam.</jobString>
+		<recipeUsers>
+			<li>DrugLab</li>
+		</recipeUsers>
+		<researchPrerequisite>Firefoam</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Chemfuel</li>
+					</thingDefs>
+				</filter>
+				<count>25</count>
+			</li>
+			<li>
+				<filter>
+					<categories>
+						<li>MeatRaw</li>
+					</categories>
+				</filter>
+				<count>25</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Chemfuel</li>
+			</thingDefs>
+			<categories>
+				<li>MeatRaw</li>
+			</categories>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_VWE_Extinguisher>500</Ammo_VWE_Extinguisher>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded/Defs/Vanilla Weapons Expanded/Ammo/Recipes.xml b/ModPatches/Vanilla Weapons Expanded/Defs/Vanilla Weapons Expanded/Ammo/Recipes.xml
new file mode 100644
index 0000000000..d5084ed9f6
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded/Defs/Vanilla Weapons Expanded/Ammo/Recipes.xml	
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- == Recipes == -->
+	<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>
+
+	<RecipeDef ParentName="GrenadeRecipeBase">
+		<defName>MakeVWEThrowingKnives</defName>
+		<label>make throwing knives x10</label>
+		<description>Craft 10 throwing knives.</description>
+		<jobString>Making throwing knives.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>14</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<VWE_Throwing_Knives>14</VWE_Throwing_Knives>
+		</products>
+		<recipeUsers>
+			<li>FueledSmithy</li>
+			<li>ElectricSmithy</li>
+		</recipeUsers>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded/Defs/Vanilla Weapons Expanded/Ammo/Whip.xml b/ModPatches/Vanilla Weapons Expanded/Defs/Vanilla Weapons Expanded/Ammo/Whip.xml
new file mode 100644
index 0000000000..fd1082326e
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded/Defs/Vanilla Weapons Expanded/Ammo/Whip.xml	
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- === Projectile === -->
+	<ThingDef ParentName="BaseBulletCE">
+		<thingClass>CombatExtended.BulletCE</thingClass>
+		<defName>Bullet_VWE_Whip</defName>
+		<label>whip slash</label>
+		<graphicData>
+			<texPath>Things/Projectile/WhipSlash</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>80</speed>
+			<damageDef>VWE_RangedCut</damageDef>
+			<damageAmountBase>8</damageAmountBase>
+			<armorPenetrationSharp>0.65</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded/Defs/Vanilla Weapons Expanded/DamageDefs/Damage_RangedCut.xml b/ModPatches/Vanilla Weapons Expanded/Defs/Vanilla Weapons Expanded/DamageDefs/Damage_RangedCut.xml
new file mode 100644
index 0000000000..b40b7f8f11
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded/Defs/Vanilla Weapons Expanded/DamageDefs/Damage_RangedCut.xml	
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<DamageDef>
+		<defName>VWE_RangedCut</defName>
+		<label>cut</label>
+		<workerClass>DamageWorker_Cut</workerClass>
+		<externalViolence>true</externalViolence>
+		<deathMessage>{0} has been cut to death.</deathMessage>
+		<hediff>Cut</hediff>
+		<hediffSkin>Cut</hediffSkin>
+		<hediffSolid>Crack</hediffSolid>
+		<impactSoundType>Slice</impactSoundType>
+		<armorCategory>Sharp</armorCategory>
+		<isRanged>true</isRanged>
+		<makesAnimalsFlee>true</makesAnimalsFlee>
+		<overkillPctToDestroyPart>0~0.1</overkillPctToDestroyPart>
+	</DamageDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded/Patches/Vanilla Weapons Expanded/Industrial_Grenades.xml b/ModPatches/Vanilla Weapons Expanded/Patches/Vanilla Weapons Expanded/Industrial_Grenades.xml
new file mode 100644
index 0000000000..35ba0de095
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded/Patches/Vanilla Weapons Expanded/Industrial_Grenades.xml	
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Remove Flashbang / Smoke as they're redundant === -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>
+			Defs/ThingDef[
+			defName = "VWE_Projectile_FlashGrenade" or
+			defName = "VWE_Projectile_SmokeGrenade" or
+			defName = "VWE_FlashGrenade" or
+			defName = "VWE_SmokeGrenade"]
+		</xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded/Patches/Vanilla Weapons Expanded/Industrial_Melee.xml b/ModPatches/Vanilla Weapons Expanded/Patches/Vanilla Weapons Expanded/Industrial_Melee.xml
new file mode 100644
index 0000000000..20076ab9a5
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded/Patches/Vanilla Weapons Expanded/Industrial_Melee.xml	
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Baton === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_Baton"]/statBases</xpath>
+		<value>
+			<Bulk>2.75</Bulk>
+			<MeleeCounterParryBonus>0.9</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_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="VWE_MeleeWeapon_Baton"]/weaponTags</xpath>
+		<value>
+			<li>CE_Sidearm_Melee</li>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_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>
+
+	<!-- === Combat Knife === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_CombatKnife"]/statBases</xpath>
+		<value>
+			<Bulk>1.25</Bulk>
+			<MeleeCounterParryBonus>0.30</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_CombatKnife"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.10</MeleeCritChance>
+				<MeleeParryChance>0.30</MeleeParryChance>
+				<MeleeDodgeChance>0.010</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_CombatKnife"]/weaponTags</xpath>
+		<value>
+			<li>CE_Sidearm_Melee</li>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_CombatKnife"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<chanceFactor>0.33</chanceFactor>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1</cooldownTime>
+					<armorPenetrationBlunt>0.56</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.72</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1</cooldownTime>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.76</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Shovel === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_Shovel"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>0.56</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_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="VWE_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>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded/Patches/Vanilla Weapons Expanded/Industrial_Ranged.xml b/ModPatches/Vanilla Weapons Expanded/Patches/Vanilla Weapons Expanded/Industrial_Ranged.xml
new file mode 100644
index 0000000000..280c3e3256
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded/Patches/Vanilla Weapons Expanded/Industrial_Ranged.xml	
@@ -0,0 +1,1046 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_Bow_Compound"]/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>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "VWE_CombatHandgun" or
+			defName = "VWE_Gun_HandCannon" or
+			defName = "VWE_Gun_LightSMG" or
+			defName = "VWE_Gun_SMG" or
+			defName = "VWE_SawedOffShotgun"
+			]/tools
+		</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "VWE_Gun_AntiMaterialRifle" or
+			defName = "VWE_Gun_SemiAutomaticRifle" or
+			defName = "VWE_Gun_BattleRifle" or
+			defName = "VWE_Gun_Carbine" or
+			defName = "VWE_Gun_Flamethrower" or
+			defName = "VWE_Gun_HMG" or
+			defName = "VWE_Gun_LeverActionRifle" or
+			defName = "VWE_Gun_MarksmanRifle" or
+			defName = "VWE_Gun_GrenadeLauncher" or
+			defName = "VWE_Gun_ServiceRifle"
+			]/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="VWE_Gun_RocketLauncher"]/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="VWE_Gun_FireExtinguisher"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tank</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2.02</cooldownTime>
+					<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Compound Bow === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Bow_Compound</defName>
+		<statBases>
+			<Bulk>4</Bulk>
+			<SwayFactor>2</SwayFactor>
+			<ShotSpread>1</ShotSpread>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Projectile_StreamlinedArrow_Steel</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>24</range>
+			<soundCast>VWE_Bow_Compound</soundCast>
+		</Properties>
+		<AmmoUser>
+			<ammoSet>AmmoSet_StreamlinedArrow</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags Inherit="False">
+			<li>CE_Bow</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Combat Handgun === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_CombatHandgun</defName>
+		<statBases>
+			<WorkToMake>7000</WorkToMake>
+			<Mass>1.11</Mass>
+			<Bulk>2.10</Bulk>
+			<SwayFactor>0.32</SwayFactor>
+			<ShotSpread>0.17</ShotSpread>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_45ACP</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Hand Cannon === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_HandCannon</defName>
+		<statBases>
+			<WorkToMake>4500</WorkToMake>
+			<Mass>0.90</Mass>
+			<Bulk>2.41</Bulk>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.10</SwayFactor>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>20</Steel>
+			<WoodLog>5</WoodLog>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_357Magnum_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>VWE_Shot_Handcannon</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_357Magnum</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SimpleGun</li>
+			<li>Revolver</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Light SMG === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_LightSMG</defName>
+		<statBases>
+			<Mass>3.50</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>3.30</SwayFactor>
+			<Bulk>4.70</Bulk>
+			<WorkToMake>24000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.39</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>25</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>VWE_Shot_LightSMG</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>CE_AI_AssaultWeapon</li>
+			<li>CE_SMG</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === SMG === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_SMG</defName>
+		<statBases>
+			<WorkToMake>13000</WorkToMake>
+			<Mass>2.00</Mass>
+			<Bulk>3.25</Bulk>
+			<SwayFactor>1.75</SwayFactor>
+			<ShotSpread>0.17</ShotSpread>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.39</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>0.6</warmupTime>
+			<range>20</range>
+			<soundCast>VWE_Shot_SMG</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x19mmPara</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Sawed Off === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_SawedOffShotgun</defName>
+		<statBases>
+			<WorkToMake>9500</WorkToMake>
+			<Bulk>4.75</Bulk>
+			<Mass>1.85</Mass>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>2.20</SwayFactor>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.93</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>30</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>3.5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>14</range>
+			<soundCast>Shot_Shotgun_NoRack</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>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+		<researchPrerequisite>Gunsmithing</researchPrerequisite>
+	</Operation>
+
+	<!-- === Battle Rifle === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_BattleRifle</defName>
+		<statBases>
+			<WorkToMake>31000</WorkToMake>
+			<Mass>3.50</Mass>
+			<Bulk>8.89</Bulk>
+			<SwayFactor>1.24</SwayFactor>
+			<ShotSpread>0.11</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>45</Steel>
+			<Chemfuel>10</Chemfuel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.12</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>51</range>
+			<soundCast>VWE_Shot_BattleRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<!-- Required Research Rework -->
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!-- === Carbine === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_Carbine</defName>
+		<statBases>
+			<WorkToMake>31500</WorkToMake>
+			<Mass>3.30</Mass>
+			<Bulk>6.90</Bulk>
+			<SwayFactor>1.04</SwayFactor>
+			<ShotSpread>0.09</ShotSpread>
+			<SightsEfficiency>2</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<Chemfuel>10</Chemfuel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>48</range>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<!-- Required Research Rework -->
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!-- === Service Rifle === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_ServiceRifle</defName>
+		<statBases>
+			<WorkToMake>27000</WorkToMake>
+			<Mass>3.30</Mass>
+			<Bulk>6.90</Bulk>
+			<SwayFactor>1.04</SwayFactor>
+			<ShotSpread>0.09</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>45</Steel>
+			<WoodLog>10</WoodLog>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.53</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>44</range>
+			<soundCast>VWE_Shot_ServiceRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+		</weaponTags>
+		<!-- Required Research Rework -->
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!-- === Semi Automatic Rifle === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_SemiAutomaticRifle</defName>
+		<statBases>
+			<WorkToMake>18500</WorkToMake>
+			<Mass>4.10</Mass>
+			<Bulk>11.26</Bulk>
+			<SwayFactor>1.54</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>55</Steel>
+			<WoodLog>10</WoodLog>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.75</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>52</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<!-- Required Research Rework -->
+		<researchPrerequisite>GasOperation</researchPrerequisite>
+	</Operation>
+
+	<!-- === Lever Action Rifle === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_LeverActionRifle</defName>
+		<statBases>
+			<WorkToMake>15500</WorkToMake>
+			<Mass>4.30</Mass>
+			<Bulk>12.50</Bulk>
+			<SwayFactor>1.67</SwayFactor>
+			<ShotSpread>0.02</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.77</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>60</Steel>
+			<WoodLog>10</WoodLog>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.75</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_44-40Winchester_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>31</range>
+			<soundCast>VWE_Shot_LeverActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_44-40Winchester</ammoSet>
+			<reloadOneAtATime>true</reloadOneAtATime>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<!-- Required Research Rework -->
+		<researchPrerequisite>Gunsmithing</researchPrerequisite>
+	</Operation>
+
+	<!-- === Anti Material Rifle === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_AntiMaterialRifle</defName>
+		<statBases>
+			<WorkToMake>39000</WorkToMake>
+			<Mass>13.50</Mass>
+			<Bulk>15.00</Bulk>
+			<SwayFactor>2.00</SwayFactor>
+			<ShotSpread>0.07</ShotSpread>
+			<SightsEfficiency>2.84</SightsEfficiency>
+			<RangedWeapon_Cooldown>1.38</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>90</Steel>
+			<Chemfuel>20</Chemfuel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+			<warmupTime>3.5</warmupTime>
+			<range>86</range>
+			<soundCast>VWE_Shot_AntiMaterialRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SniperRifle</li>
+			<li>Bipod_AMR</li>
+		</weaponTags>
+		<!-- Required Research Rework -->
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- === Marksman Rifle === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_MarksmanRifle</defName>
+		<statBases>
+			<WorkToMake>23000</WorkToMake>
+			<Mass>4.30</Mass>
+			<Bulk>12.25</Bulk>
+			<SwayFactor>1.70</SwayFactor>
+			<ShotSpread>0.04</ShotSpread>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>60</Steel>
+			<WoodLog>10</WoodLog>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.94</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<soundCast>Shot_SniperRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SniperRifle</li>
+			<li>Bipod_DMR</li>
+		</weaponTags>
+		<!-- Required Research Rework -->
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- === Heavy Machine Gun === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_HMG</defName>
+		<statBases>
+			<WorkToMake>36500</WorkToMake>
+			<Mass>8.30</Mass>
+			<Bulk>13.00</Bulk>
+			<SwayFactor>1.28</SwayFactor>
+			<ShotSpread>0.07</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>70</Steel>
+			<WoodLog>15</WoodLog>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.49</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>1.3</warmupTime>
+			<range>65</range>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>IndustrialGunAdvanced</li>
+			<li>GunHeavy</li>
+			<li>CE_MachineGun</li>
+			<li>Bipod_LMG</li>
+		</weaponTags>
+		<!-- Required Research Rework -->
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- === Fire Extinguisher === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_FireExtinguisher</defName>
+		<statBases>
+			<WorkToMake>12500</WorkToMake>
+			<Mass>5.08</Mass>
+			<Bulk>7.40</Bulk>
+			<SwayFactor>1.28</SwayFactor>
+			<ShotSpread>0.15</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<Chemfuel>5</Chemfuel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_VWE_Extinguisher</defaultProjectile>
+			<burstShotCount>20</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>10</range>
+			<soundCast>VWE_Shot_FireExtinguisher</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>0</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>500</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_VWE_Extinguisher</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<weaponTags Inherit="False">
+			<li>ToolDecent</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Flamethrower === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_Flamethrower</defName>
+		<statBases>
+			<WorkToMake>25500</WorkToMake>
+			<Mass>5.5</Mass>
+			<Bulk>8</Bulk>
+			<SwayFactor>1.35</SwayFactor>
+			<ShotSpread>0.15</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<Chemfuel>10</Chemfuel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>0.85</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Flamethrower_Prometheum</defaultProjectile>
+			<burstShotCount>20</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<warmupTime>1.1</warmupTime>
+			<range>11</range>
+			<minRange>3</minRange>
+			<soundCast>VWE_Shot_Flamethrower</soundCast>
+			<muzzleFlashScale>0</muzzleFlashScale>
+			<ai_IsBuildingDestroyer>True</ai_IsBuildingDestroyer>
+			<targetParams>
+				<canTargetLocations>True</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_Flamethrower</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>10</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>GunHeavy</li>
+		</weaponTags>
+		<!-- Required Research Rework -->
+		<researchPrerequisite>CE_Launchers</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- === Grenade Launcher === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_GrenadeLauncher</defName>
+		<statBases>
+			<WorkToMake>25500</WorkToMake>
+			<Mass>5.35</Mass>
+			<Bulk>5.70</Bulk>
+			<SwayFactor>1.31</SwayFactor>
+			<ShotSpread>0.18</ShotSpread>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<Chemfuel>10</Chemfuel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.93</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>40</range>
+			<minRange>5</minRange>
+			<soundCast>VWE_Shot_GrenadeLauncher</soundCast>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<ai_IsBuildingDestroyer>True</ai_IsBuildingDestroyer>
+			<ignorePartialLoSBlocker>True</ignorePartialLoSBlocker>
+			<targetParams>
+				<canTargetLocations>True</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>5.1</reloadTime>
+			<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aiUseBurstMode>False</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>GunHeavy</li>
+		</weaponTags>
+		<researchPrerequisite>CE_Launchers</researchPrerequisite>
+
+		<!-- Disallow with Run And Gun -->
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- === Rocket Launcher === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_RocketLauncher</defName>
+		<statBases>
+			<WorkToMake>43500</WorkToMake>
+			<Mass>12.0</Mass>
+			<Bulk>13.0</Bulk>
+			<SwayFactor>3.24</SwayFactor>
+			<ShotSpread>0.02</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>90</Steel>
+			<FSX>5</FSX>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Rocket</defaultProjectile>
+			<burstShotCount>1</burstShotCount>
+			<warmupTime>1.45</warmupTime>
+			<range>40</range>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<onlyManualCast>True</onlyManualCast>
+			<ai_IsBuildingDestroyer>True</ai_IsBuildingDestroyer>
+			<ignorePartialLoSBlocker>True</ignorePartialLoSBlocker>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>GunHeavy</li>
+			<li>CE_AI_Launcher</li>
+		</weaponTags>
+		<!-- Research prerequisite rework   -->
+		<researchPrerequisite>CE_AdvancedLaunchers</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- === Triple Rocket Launcher === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_TripleRocket</defName>
+		<statBases>
+			<WorkToMake>43000</WorkToMake>
+			<Mass>12.00</Mass>
+			<Bulk>13.00</Bulk>
+			<SwayFactor>2.20</SwayFactor>
+			<ShotSpread>0.20</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>90</Steel>
+			<FSX>3</FSX>
+			<ComponentIndustrial>7</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Rocket</defaultProjectile>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>20</ticksBetweenBurstShots>
+			<warmupTime>1.9</warmupTime>
+			<range>40</range>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSingleShot>True</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Launcher</li>
+		</weaponTags>
+		<!-- Research requisite rework -->
+		<researchPrerequisite>CE_AdvancedLaunchers</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- === Doomsday Rocket Launcher === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_DoomsdayRocket</defName>
+		<statBases>
+			<WorkToMake>49500</WorkToMake>
+			<Mass>20.00</Mass>
+			<Bulk>13.0</Bulk>
+			<SwayFactor>3.24</SwayFactor>
+			<ShotSpread>0.20</ShotSpread>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>125</Steel>
+			<FSX>5</FSX>
+			<ComponentIndustrial>8</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_DoomsdayRocket</defaultProjectile>
+			<burstShotCount>1</burstShotCount>
+			<warmupTime>2.1</warmupTime>
+			<range>48</range>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<onlyManualCast>true</onlyManualCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Launcher</li>
+		</weaponTags>
+		<!-- Research requisite rework -->
+		<researchPrerequisite>CE_AdvancedLaunchers</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded/Patches/Vanilla Weapons Expanded/Medieval_Melee.xml b/ModPatches/Vanilla Weapons Expanded/Patches/Vanilla Weapons Expanded/Medieval_Melee.xml
new file mode 100644
index 0000000000..9be94f9891
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded/Patches/Vanilla Weapons Expanded/Medieval_Melee.xml	
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Battle Axe === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_BattleAxe"]/statBases</xpath>
+		<value>
+			<Bulk>13</Bulk>
+			<MeleeCounterParryBonus>1.5</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_BattleAxe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.3</MeleeCritChance>
+				<MeleeParryChance>1.6</MeleeParryChance>
+				<MeleeDodgeChance>0.56</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_BattleAxe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<chanceFactor>0.33</chanceFactor>
+					<cooldownTime>1.31</cooldownTime>
+					<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>48</power>
+					<cooldownTime>3.4</cooldownTime>
+					<armorPenetrationBlunt>10.4</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.8</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>41</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>2.3</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.2</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Halberd === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_Halberd"]/statBases</xpath>
+		<value>
+			<Bulk>13</Bulk>
+			<MeleeCounterParryBonus>1.08</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_Halberd"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.2</MeleeCritChance>
+				<MeleeParryChance>1.45</MeleeParryChance>
+				<MeleeDodgeChance>0.6</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_Halberd"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<chanceFactor>0.33</chanceFactor>
+					<cooldownTime>1.31</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>3.4</cooldownTime>
+					<armorPenetrationBlunt>8.3</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.69</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>1.4</cooldownTime>
+					<armorPenetrationBlunt>2.1</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.15</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Hammer === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_Hammer"]/statBases</xpath>
+		<value>
+			<Bulk>3.75</Bulk>
+			<MeleeCounterParryBonus>0.06</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_Hammer"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.45</MeleeCritChance>
+			<MeleeParryChance>0.11</MeleeParryChance>
+			<MeleeDodgeChance>0.10</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_Hammer"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_Hammer"]/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.62</cooldownTime>
+					<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2.79</cooldownTime>
+					<armorPenetrationBlunt>2.7</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded/Patches/Vanilla Weapons Expanded/Medieval_Ranged.xml b/ModPatches/Vanilla Weapons Expanded/Patches/Vanilla Weapons Expanded/Medieval_Ranged.xml
new file mode 100644
index 0000000000..3a0a5ed442
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded/Patches/Vanilla Weapons Expanded/Medieval_Ranged.xml	
@@ -0,0 +1,402 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_Bow_Crossbow"]/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>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VWE_Gun_Flintlock"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VWE_Gun_Musket"]/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>
+
+	<!-- === Crossbow === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Bow_Crossbow</defName>
+		<statBases>
+			<Bulk>6</Bulk>
+			<SwayFactor>1.2</SwayFactor>
+			<ShotSpread>0.5</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<WoodLog>70</WoodLog>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Projectile_CrossbowBolt_Steel</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>20</range>
+			<soundCast>Bow_Large</soundCast>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>7</reloadTime>
+			<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>NeolithicRangedHeavy</li>
+			<li>NeolithicRangedChief</li>
+			<li>CE_Bow</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Flintlock === -->
+	<!-- 
+          - VWE uses a custom verb to trigger smoke effects after the gun is fired, this causes trouble with CE and just overriding it doesn't work.
+          - Has to be replaced in vanilla too 
+        -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_Gun_Flintlock"]/verbs/li/verbClass</xpath>
+		<value>
+			<verbClass>Verb_Shoot</verbClass>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_Flintlock</defName>
+		<statBases>
+			<WorkToMake>3500</WorkToMake>
+			<Mass>1.25</Mass>
+			<Bulk>3.90</Bulk>
+			<SwayFactor>1.22</SwayFactor>
+			<ShotSpread>0.36</ShotSpread>
+			<SightsEfficiency>0.5</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>25</Steel>
+			<WoodLog>5</WoodLog>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_SlowMusketBall</defaultProjectile>
+			<warmupTime>1.66</warmupTime>
+			<range>12</range>
+			<soundCast>VWE_Shot_Musket</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>6.5</reloadTime>
+			<ammoSet>AmmoSet_SlowMusketBall</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>NeolithicRangedHeavy</li>
+			<li>NeolithicRangedChief</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Musket === -->
+	<!-- 
+          - VWE uses a custom verb to trigger smoke effects after the gun is fired, this causes trouble with CE and just overriding it doesn't work.
+          - Has to be replaced in vanilla too 
+        -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_Gun_Musket"]/verbs/li/verbClass</xpath>
+		<value>
+			<verbClass>Verb_Shoot</verbClass>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_Musket</defName>
+		<statBases>
+			<WorkToMake>20000</WorkToMake>
+			<Mass>4.8</Mass>
+			<Bulk>14.9</Bulk>
+			<SwayFactor>1.92</SwayFactor>
+			<ShotSpread>0.30</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>1.35</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>65</Steel>
+			<WoodLog>15</WoodLog>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_FastMusketBall</defaultProjectile>
+			<warmupTime>2.5</warmupTime>
+			<range>45</range>
+			<soundCast>VWE_Shot_Musket</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>10</reloadTime>
+			<ammoSet>AmmoSet_FastMusketBall</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>NeolithicRangedHeavy</li>
+			<li>NeolithicRangedChief</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Throwing Knives === -->
+	<!-- == Projectile == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_FlyingBlade"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<damageDef>RangedStab</damageDef>
+				<damageAmountBase>11</damageAmountBase>
+				<flyOverhead>false</flyOverhead>
+				<speed>12</speed>
+				<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				<armorPenetrationSharp>0.4</armorPenetrationSharp>
+				<preExplosionSpawnChance>0.80</preExplosionSpawnChance>
+				<preExplosionSpawnThingDef>VWE_Throwing_Knives</preExplosionSpawnThingDef>
+			</projectile>
+		</value>
+	</Operation>
+
+	<!-- == Weapon == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_Throwing_Knives"]/graphicData</xpath>
+		<value>
+			<graphicData>
+				<texPath>Things/Projectile/KnifeThrown</texPath>
+				<graphicClass>Graphic_Single</graphicClass>
+			</graphicData>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="VWE_Throwing_Knives"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>BaseWeapon</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_Throwing_Knives"]</xpath>
+		<value>
+			<thingCategories>
+				<li>WeaponsRanged</li>
+			</thingCategories>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VWE_Throwing_Knives"]/recipeMaker</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VWE_Throwing_Knives"]/costStuffCount</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="VWE_Throwing_Knives"]/stuffCategories</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_Throwing_Knives"]</xpath>
+		<value>
+			<thingClass>CombatExtended.AmmoThing</thingClass>
+			<stackLimit>75</stackLimit>
+			<resourceReadoutPriority>First</resourceReadoutPriority>
+			<smeltProducts>
+				<Steel>1</Steel>
+			</smeltProducts>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="VWE_Throwing_Knives"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Throwing_Knives</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>1.5</ShotSpread>
+			<SwayFactor>2</SwayFactor>
+			<Bulk>0.35</Bulk>
+			<Mass>0.15</Mass>
+			<RangedWeapon_Cooldown>0.48</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<label>Throw knife</label>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>VWE_FlyingBlade</defaultProjectile>
+			<warmupTime>0.66</warmupTime>
+			<range>10</range>
+			<soundCast>ThrowGrenade</soundCast>
+			<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+		</Properties>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_Throwing_Knives"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.26</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.42</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Whip === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Tool_Whip</defName>
+		<statBases>
+			<WorkToMake>6800</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.5</ShotSpread>
+			<SwayFactor>0.26</SwayFactor>
+			<Bulk>1.5</Bulk>
+			<Mass>0.9</Mass>
+			<RangedWeapon_Cooldown>.48</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_VWE_Whip</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>6</range>
+			<soundCast>VWE_Shot_Whip</soundCast>
+		</Properties>
+	</Operation>
+
+	<!-- Tools -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_Tool_Whip"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded/Patches/Vanilla Weapons Expanded/Neolithic_Melee.xml b/ModPatches/Vanilla Weapons Expanded/Patches/Vanilla Weapons Expanded/Neolithic_Melee.xml
new file mode 100644
index 0000000000..47f6b631c0
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded/Patches/Vanilla Weapons Expanded/Neolithic_Melee.xml	
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Axe === -->
+	<Operation 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.33</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>
+					<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.68</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_Axe"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation 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>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_Axe"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded/Patches/Vanilla Weapons Expanded/Neolithic_Ranged.xml b/ModPatches/Vanilla Weapons Expanded/Patches/Vanilla Weapons Expanded/Neolithic_Ranged.xml
new file mode 100644
index 0000000000..d564831e88
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded/Patches/Vanilla Weapons Expanded/Neolithic_Ranged.xml	
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Long Bow === -->
+	<!-- == Weapon == -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Bow_Long</defName>
+		<statBases>
+			<SightsEfficiency>0.8</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>30</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>
+	</Operation>
+
+	<!-- == Tools == -->
+	<Operation 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>
+	</Operation>
+
+	<!-- === Throwing Rock === -->
+	<!-- == Projectile == -->
+	<Operation 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>
+	</Operation>
+
+	<!-- == Weapon == -->
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="VWE_Throwing_Rocks"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>BaseWeapon</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_Throwing_Rocks"]</xpath>
+		<value>
+			<thingCategories>
+				<li>WeaponsRanged</li>
+			</thingCategories>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>
+			Defs/ThingDef[defName="VWE_Throwing_Rocks"]/recipeMaker |
+			Defs/ThingDef[defName="VWE_Throwing_Rocks"]/costStuffCount |
+			Defs/ThingDef[defName="VWE_Throwing_Rocks"]/stuffCategories
+		</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VWE_Throwing_Rocks"]/smeltable</xpath>
+		<value>
+			<thingClass>CombatExtended.AmmoThing</thingClass>
+			<stackLimit>75</stackLimit>
+			<resourceReadoutPriority>First</resourceReadoutPriority>
+			<smeltable>false</smeltable>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VWE_Throwing_Rocks"]/graphicData</xpath>
+		<value>
+			<color>(158,153,135)</color>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="VWE_Throwing_Rocks"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName = "VWE_Throwing_Rocks"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName = "VWE_Throwing_Rocks"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation 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>
+	</Operation>
+
+	<Operation 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>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded/Patches/Vanilla Weapons Expanded/ResearchProjects.xml b/ModPatches/Vanilla Weapons Expanded/Patches/Vanilla Weapons Expanded/ResearchProjects.xml
new file mode 100644
index 0000000000..7c2c1e2771
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded/Patches/Vanilla Weapons Expanded/ResearchProjects.xml	
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Prerequisite Replacement === -->
+	<!-- == Laser Targeting Systems == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ResearchProjectDef[defName="VWE_LaserTargetingSystems"]/prerequisites</xpath>
+		<value>
+			<prerequisites>
+				<li>CE_AdvancedLaunchers</li>
+				<li>ChargedShot</li>
+			</prerequisites>
+		</value>
+	</Operation>
+
+	<!-- === Remove Unused Research Defs === -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>
+			Defs/ResearchProjectDef[
+			defName="VWE_HeavyWeapons" or
+			defName="VWE_DesignatedMarksmanRifle" or
+			defName="VWE_Flamethrower" or
+			defName="VWE_HeavyWeapons"]
+		</xpath>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla Weapons Expanded/Patches/Vanilla Weapons Expanded/Spacer_Ranged.xml b/ModPatches/Vanilla Weapons Expanded/Patches/Vanilla Weapons Expanded/Spacer_Ranged.xml
new file mode 100644
index 0000000000..38587c01bf
--- /dev/null
+++ b/ModPatches/Vanilla Weapons Expanded/Patches/Vanilla Weapons Expanded/Spacer_Ranged.xml	
@@ -0,0 +1,433 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName ="VWE_Gun_ChargePistol" or
+			defName = "VWE_Gun_ChargeSMG"]/tools
+		</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "VWE_Gun_ChargeShotgun" or
+			defName = "VWE_Gun_ChargeSniperRifle" or
+			defName = "VWE_Gun_ChargeLMG" or
+			defName = "VWE_Gun_ChargeMinigun"
+			]/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="VWE_Gun_ChargeRocketLauncher"]/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>
+
+	<!-- === Charge Pistol === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_ChargePistol</defName>
+		<statBases>
+			<WorkToMake>16000</WorkToMake>
+			<Mass>1.50</Mass>
+			<Bulk>2.60</Bulk>
+			<SwayFactor>1.07</SwayFactor>
+			<ShotSpread>0.15</ShotSpread>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>20</Steel>
+			<Plasteel>30</Plasteel>
+			<Chemfuel>5</Chemfuel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+			<ComponentSpacer>1</ComponentSpacer>
+		</costList>
+		<Properties>
+			<recoilAmount>3.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<warmupTime>0.5</warmupTime>
+			<range>12</range>
+			<soundCast>VWE_Shot_ChargePistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Charge SMG === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_ChargeSMG</defName>
+		<statBases>
+			<WorkToMake>40000</WorkToMake>
+			<Mass>2.80</Mass>
+			<Bulk>5.00</Bulk>
+			<SwayFactor>0.75</SwayFactor>
+			<ShotSpread>0.16</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>55</Steel>
+			<Plasteel>25</Plasteel>
+			<Chemfuel>15</Chemfuel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+			<ComponentSpacer>1</ComponentSpacer>
+		</costList>
+		<Properties>
+			<recoilAmount>1.20</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>0.5</warmupTime>
+			<range>31</range>
+			<soundCast>VWE_Shot_ChargeSMG</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Charge Shotgun === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_ChargeShotgun</defName>
+		<statBases>
+			<WorkToMake>46000</WorkToMake>
+			<Mass>4.35</Mass>
+			<Bulk>6.0</Bulk>
+			<SwayFactor>1.25</SwayFactor>
+			<ShotSpread>0.14</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<Plasteel>25</Plasteel>
+			<Chemfuel>15</Chemfuel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+			<ComponentSpacer>1</ComponentSpacer>
+		</costList>
+		<Properties>
+			<recoilAmount>3.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_12GaugeCharged</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>20</range>
+			<soundCast>VWE_Shot_ChargeShotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_12GaugeCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Charge Sniper Rifle === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_ChargeSniperRifle</defName>
+		<statBases>
+			<WorkToMake>49000</WorkToMake>
+			<Mass>8</Mass>
+			<Bulk>14.5</Bulk>
+			<SwayFactor>2.25</SwayFactor>
+			<ShotSpread>0.05</ShotSpread>
+			<SightsEfficiency>2.6</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
+			<NightVisionEfficiency_Weapon>0.4</NightVisionEfficiency_Weapon>
+		</statBases>
+		<costList>
+			<Steel>75</Steel>
+			<Plasteel>40</Plasteel>
+			<Chemfuel>15</Chemfuel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+			<ComponentSpacer>1</ComponentSpacer>
+		</costList>
+		<Properties>
+			<recoilAmount>1.5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_8x35mmCharged_Triple</defaultProjectile>
+			<warmupTime>1.6</warmupTime>
+			<range>75</range>
+			<soundCast>VWE_Shot_ChargeSniperRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+			<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_8x35mmCharged_Triple</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SniperRifle</li>
+			<li>SpacerGun</li>
+			<li>Bipod_DMR</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- === Charge LMG === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_ChargeLMG</defName>
+		<statBases>
+			<WorkToMake>55000</WorkToMake>
+			<Mass>9.0</Mass>
+			<Bulk>16.46</Bulk>
+			<SwayFactor>1.26</SwayFactor>
+			<ShotSpread>0.05</ShotSpread>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>65</Steel>
+			<Plasteel>30</Plasteel>
+			<Chemfuel>15</Chemfuel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+			<ComponentSpacer>1</ComponentSpacer>
+		</costList>
+		<Properties>
+			<recoilAmount>1.16</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>1.2</warmupTime>
+			<range>62</range>
+			<soundCast>Shot_ChargeBlaster</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+			<targetParams>
+				<canTargetLocations>True</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>200</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aiUseBurstMode>False</aiUseBurstMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+			<li>CE_MachineGun</li>
+			<li>Bipod_SAW</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- === Charge Minigun === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_ChargeMinigun</defName>
+		<statBases>
+			<WorkToMake>60000</WorkToMake>
+			<Mass>20.0</Mass>
+			<Bulk>12.0</Bulk>
+			<SwayFactor>1.35</SwayFactor>
+			<ShotSpread>0.10</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>120</Steel>
+			<Plasteel>40</Plasteel>
+			<Chemfuel>15</Chemfuel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+			<ComponentSpacer>1</ComponentSpacer>
+		</costList>
+		<Properties>
+			<recoilAmount>1.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
+			<burstShotCount>50</burstShotCount>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<warmupTime>2.5</warmupTime>
+			<range>62</range>
+			<soundCast>VWE_Shot_ChargeMinigun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>500</magazineSize>
+			<reloadTime>9.2</reloadTime>
+			<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>25</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>SpacerGun</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- === Charge Rocket Launcher === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VWE_Gun_ChargeRocketLauncher</defName>
+		<statBases>
+			<WorkToMake>88000</WorkToMake>
+			<Mass>24.0</Mass>
+			<Bulk>15.65</Bulk>
+			<SwayFactor>3.24</SwayFactor>
+			<ShotSpread>0.01</ShotSpread>
+			<SightsEfficiency>2.5</SightsEfficiency>
+			<RangedWeapon_Cooldown>1.9</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>125</Steel>
+			<Plasteel>45</Plasteel>
+			<FSX>10</FSX>
+			<ComponentIndustrial>4</ComponentIndustrial>
+			<ComponentSpacer>1</ComponentSpacer>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_AntiGrainRocket</defaultProjectile>
+			<warmupTime>2</warmupTime>
+			<range>52</range>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<onlyManualCast>True</onlyManualCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>GunHeavy</li>
+		</weaponTags>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla XCOM Laser Weapons/Defs/Vanilla XCOM Laser Weapons/Ammo.xml b/ModPatches/Vanilla XCOM Laser Weapons/Defs/Vanilla XCOM Laser Weapons/Ammo.xml
new file mode 100644
index 0000000000..99b03b054b
--- /dev/null
+++ b/ModPatches/Vanilla XCOM Laser Weapons/Defs/Vanilla XCOM Laser Weapons/Ammo.xml	
@@ -0,0 +1,689 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>XCOM_Laser</defName>
+		<label>laser</label>
+		<labelShort>laser</labelShort>
+		<description>Batteries and reagents that can power a chemlaser emitter. The reagents generates laser at visible wavelengths.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>XCOM_LaserInc</defName>
+		<label>infrared laser</label>
+		<labelShort>IR laser</labelShort>
+		<description>Batteries and reagents that can power a chemlaser emitter. The reagents generates laser at infrared wavelengths, causing burns and start fires.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>XCOM_LaserHP</defName>
+		<label>untraviolet laser</label>
+		<labelShort>UV laser</labelShort>
+		<description>Batteries and reagents that can power a chemlaser emitter. The reagents generates laser at untraviolet wavelengths, delivering more energy and causing more damage.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>XCOM_LaserEMP</defName>
+		<label>EM laser</label>
+		<labelShort>EM laser</labelShort>
+		<description>Batteries and reagents that can power a chemlaser emitter. The reagents generates laser at radio wavelengths, disrupting electronic systems.</description>
+	</CombatExtended.AmmoCategoryDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="LaserChargePackBase">
+		<defName>Ammo_XCOMLaserPack</defName>
+		<label>standard laser cell</label>
+		<graphicData>
+			<texPath>ThirdParty/VanillaXCOM/Laser/Standard</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.69</MarketValue>
+		</statBases>
+		<ammoClass>XCOM_Laser</ammoClass>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="LaserChargePackBase">
+		<defName>Ammo_XCOMLaserPackInc</defName>
+		<label>infrared laser cell</label>
+		<graphicData>
+			<texPath>ThirdParty/VanillaXCOM/Laser/Infrared</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.69</MarketValue>
+		</statBases>
+		<ammoClass>XCOM_LaserInc</ammoClass>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="LaserChargePackBase">
+		<defName>Ammo_XCOMLaserPackHP</defName>
+		<label>untraviolet laser cell</label>
+		<graphicData>
+			<texPath>ThirdParty/VanillaXCOM/Laser/Ultraviolet</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.69</MarketValue>
+		</statBases>
+		<ammoClass>XCOM_LaserHP</ammoClass>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="LaserChargePackBase">
+		<defName>Ammo_XCOMLaserPackEMP</defName>
+		<label>EM frequency laser cell</label>
+		<graphicData>
+			<texPath>ThirdParty/VanillaXCOM/Laser/EM</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.69</MarketValue>
+		</statBases>
+		<ammoClass>XCOM_LaserEMP</ammoClass>
+	</ThingDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_XCOMLaserPack</defName>
+		<label>make laser charge pack x500</label>
+		<description>Craft 500 laser charge pack.</description>
+		<jobString>Making laser charge pack.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Plasteel</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_XCOMLaserPack>500</Ammo_XCOMLaserPack>
+		</products>
+		<workAmount>8400</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_XCOMLaserPackInc</defName>
+		<label>make laser charge pack x500</label>
+		<description>Craft 500 laser charge pack.</description>
+		<jobString>Making laser charge pack.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Plasteel</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_XCOMLaserPackInc>500</Ammo_XCOMLaserPackInc>
+		</products>
+		<workAmount>8400</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_XCOMLaserPackHP</defName>
+		<label>make laser charge pack x500</label>
+		<description>Craft 500 laser charge pack.</description>
+		<jobString>Making laser charge pack.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Plasteel</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_XCOMLaserPackHP>500</Ammo_XCOMLaserPackHP>
+		</products>
+		<workAmount>8400</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_XCOMLaserPackEMP</defName>
+		<label>make laser charge pack x500</label>
+		<description>Craft 500 laser charge pack.</description>
+		<jobString>Making laser charge pack.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Plasteel</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_XCOMLaserPackEMP>500</Ammo_XCOMLaserPackEMP>
+		</products>
+		<workAmount>8400</workAmount>
+	</RecipeDef>
+
+	<!-- laser rifle-->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_XCOM_Gun_LaserRifle</defName>
+		<label>laser</label>
+		<ammoTypes>
+			<Ammo_XCOMLaserPack>XCOM_Bullet_LaserRifleCE</Ammo_XCOMLaserPack>
+			<Ammo_XCOMLaserPackInc>XCOM_Bullet_LaserRifleCEInc</Ammo_XCOMLaserPackInc>
+			<Ammo_XCOMLaserPackHP>XCOM_Bullet_LaserRifleCEHP</Ammo_XCOMLaserPackHP>
+			<Ammo_XCOMLaserPackEMP>XCOM_Bullet_LaserRifleCEEMP</Ammo_XCOMLaserPackEMP>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletGreen">
+		<defName>XCOM_Bullet_LaserRifleCE</defName>
+		<label>laser beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>17.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>6</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletRed">
+		<defName>XCOM_Bullet_LaserRifleCEInc</defName>
+		<label>laser beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>17.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame</def>
+					<amount>12</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletPurple">
+		<defName>XCOM_Bullet_LaserRifleCEHP</defName>
+		<label>laser beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>18</damageAmountBase>
+			<armorPenetrationSharp>34.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>8</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletBlue">
+		<defName>XCOM_Bullet_LaserRifleCEEMP</defName>
+		<label>laser beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>17.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>6</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<!-- Laser sniper-->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_XCOM_Gun_LaserSniperRifle</defName>
+		<label>laser</label>
+		<ammoTypes>
+			<Ammo_XCOMLaserPack>XCOM_Bullet_LaserSniperRifleCE</Ammo_XCOMLaserPack>
+			<Ammo_XCOMLaserPackInc>XCOM_Bullet_LaserSniperRifleCEInc</Ammo_XCOMLaserPackInc>
+			<Ammo_XCOMLaserPackHP>XCOM_Bullet_LaserSniperRifleCEHP</Ammo_XCOMLaserPackHP>
+			<Ammo_XCOMLaserPackEMP>XCOM_Bullet_LaserSniperRifleCEEMP</Ammo_XCOMLaserPackEMP>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletGreen">
+		<defName>XCOM_Bullet_LaserSniperRifleCE</defName>
+		<label>laser beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>16</damageAmountBase>
+			<armorPenetrationSharp>18.75</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>8</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletRed">
+		<defName>XCOM_Bullet_LaserSniperRifleCEInc</defName>
+		<label>laser beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>16</damageAmountBase>
+			<armorPenetrationSharp>18.75</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame</def>
+					<amount>16</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletPurple">
+		<defName>XCOM_Bullet_LaserSniperRifleCEHP</defName>
+		<label>laser beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>24</damageAmountBase>
+			<armorPenetrationSharp>38.75</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>12</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletBlue">
+		<defName>XCOM_Bullet_LaserSniperRifleCEEMP</defName>
+		<label>laser beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>18</damageAmountBase>
+			<armorPenetrationSharp>18.75</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>8</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<!-- scatter Laser-->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_XCOM_Gun_LaserShotgun</defName>
+		<label>laser</label>
+		<ammoTypes>
+			<Ammo_XCOMLaserPack>XCOM_Bullet_LaserShotgunCE</Ammo_XCOMLaserPack>
+			<Ammo_XCOMLaserPackInc>XCOM_Bullet_LaserShotgunCEInc</Ammo_XCOMLaserPackInc>
+			<Ammo_XCOMLaserPackHP>XCOM_Bullet_LaserShotgunCEHP</Ammo_XCOMLaserPackHP>
+			<Ammo_XCOMLaserPackEMP>XCOM_Bullet_LaserShotgunCEEMP</Ammo_XCOMLaserPackEMP>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletGreen">
+		<defName>XCOM_Bullet_LaserShotgunCE</defName>
+		<label>laser beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>6</damageAmountBase>
+			<armorPenetrationSharp>15.75</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+			<pelletCount>7</pelletCount>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>3</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletRed">
+		<defName>XCOM_Bullet_LaserShotgunCEInc</defName>
+		<label>laser beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>6</damageAmountBase>
+			<armorPenetrationSharp>15.75</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+			<pelletCount>7</pelletCount>
+			<secondaryDamage>
+				<li>
+					<def>Flame</def>
+					<amount>6</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletPurple">
+		<defName>XCOM_Bullet_LaserShotgunCEHP</defName>
+		<label>laser beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>9</damageAmountBase>
+			<armorPenetrationSharp>24.75</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+			<pelletCount>5</pelletCount>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>5</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletBlue">
+		<defName>XCOM_Bullet_LaserShotgunCEEMP</defName>
+		<label>laser beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>6</damageAmountBase>
+			<armorPenetrationSharp>15.75</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+			<pelletCount>7</pelletCount>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>3</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<!-- Laser cannon (bruh)-->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_XCOM_Gun_LaserCannon</defName>
+		<label>laser</label>
+		<ammoTypes>
+			<Ammo_XCOMLaserPack>XCOM_Bullet_LaserCannonCE</Ammo_XCOMLaserPack>
+			<Ammo_XCOMLaserPackInc>XCOM_Bullet_LaserCannonCEInc</Ammo_XCOMLaserPackInc>
+			<Ammo_XCOMLaserPackHP>XCOM_Bullet_LaserCannonCEHP</Ammo_XCOMLaserPackHP>
+			<Ammo_XCOMLaserPackEMP>XCOM_Bullet_LaserCannonCEEMP</Ammo_XCOMLaserPackEMP>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletGreen">
+		<defName>XCOM_Bullet_LaserCannonCE</defName>
+		<label>laser beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationSharp>16.75</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>5</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletRed">
+		<defName>XCOM_Bullet_LaserCannonCEInc</defName>
+		<label>laser beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationSharp>16.75</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame</def>
+					<amount>10</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletPurple">
+		<defName>XCOM_Bullet_LaserCannonCEHP</defName>
+		<label>laser beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>15</damageAmountBase>
+			<armorPenetrationSharp>24.75</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>13</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletBlue">
+		<defName>XCOM_Bullet_LaserCannonCEEMP</defName>
+		<label>laser beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationSharp>16.75</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>5</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<!-- Laser pistol-->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_XCOM_Gun_LaserPistol</defName>
+		<label>laser</label>
+		<ammoTypes>
+			<Ammo_XCOMLaserPack>XCOM_Bullet_Laser_PistolCE</Ammo_XCOMLaserPack>
+			<Ammo_XCOMLaserPackInc>XCOM_Bullet_Laser_PistolCEInc</Ammo_XCOMLaserPackInc>
+			<Ammo_XCOMLaserPackHP>XCOM_Bullet_Laser_PistolCEHP</Ammo_XCOMLaserPackHP>
+			<Ammo_XCOMLaserPackEMP>XCOM_Bullet_Laser_PistolCEEMP</Ammo_XCOMLaserPackEMP>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletGreen">
+		<defName>XCOM_Bullet_Laser_PistolCE</defName>
+		<label>laser beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>6</damageAmountBase>
+			<armorPenetrationSharp>17.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>4</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletRed">
+		<defName>XCOM_Bullet_Laser_PistolCEInc</defName>
+		<label>laser beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>6</damageAmountBase>
+			<armorPenetrationSharp>17.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame</def>
+					<amount>6</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletPurple">
+		<defName>XCOM_Bullet_Laser_PistolCEHP</defName>
+		<label>laser beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>9</damageAmountBase>
+			<armorPenetrationSharp>27.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>6</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletBlue">
+		<defName>XCOM_Bullet_Laser_PistolCEEMP</defName>
+		<label>laser beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>6</damageAmountBase>
+			<armorPenetrationSharp>17.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>4</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<!-- rail gun-->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_XCOM_Gun_LaserRailgun</defName>
+		<label>12mm Railgun</label>
+		<ammoTypes>
+			<Ammo_12mmRailgun_Sabot>XCOM_Bullet_LaserRailgunCE</Ammo_12mmRailgun_Sabot>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletYellow">
+		<defName>XCOM_Bullet_LaserRailgunCE</defName>
+		<label>12mm Railgun bullet (Sabot)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>73</damageAmountBase>
+			<armorPenetrationSharp>130</armorPenetrationSharp>
+			<armorPenetrationBlunt>7250</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla XCOM Laser Weapons/Patches/Vanilla XCOM Laser Weapons/Weapon_Ranged.xml b/ModPatches/Vanilla XCOM Laser Weapons/Patches/Vanilla XCOM Laser Weapons/Weapon_Ranged.xml
new file mode 100644
index 0000000000..e6fd49e329
--- /dev/null
+++ b/ModPatches/Vanilla XCOM Laser Weapons/Patches/Vanilla XCOM Laser Weapons/Weapon_Ranged.xml	
@@ -0,0 +1,353 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName="XCOM_Gun_LaserRifle" or
+			defName="XCOM_Gun_LaserSniperRifle" or
+			defName="XCOM_Gun_LaserShotgun" or
+			defName="XCOM_Gun_LaserCannon" or
+			defName="XCOM_Gun_LaserRailgun"
+			]/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="XCOM_Gun_LaserPistol"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- XCOM laser Rifle -->
+	<!-- so, faster firing single shot gun-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_Gun_LaserRifle</defName>
+		<statBases>
+			<Mass>3.50</Mass>
+			<Bulk>10.00</Bulk>
+			<SwayFactor>1.35</SwayFactor>
+			<ShotSpread>0.08</ShotSpread>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
+			<WorkToMake>45000</WorkToMake>
+		</statBases>
+		<costList>
+			<Plasteel>70</Plasteel>
+			<ComponentSpacer>3</ComponentSpacer>
+		</costList>
+		<Properties>
+			<hasStandardCommand>true</hasStandardCommand>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<soundAiming>Laser_Warmup</soundAiming>
+			<recoilAmount>0</recoilAmount>
+			<defaultProjectile>XCOM_Bullet_LaserRifleCE</defaultProjectile>
+			<warmupTime>0.9</warmupTime>
+			<range>46</range>
+			<soundCast>Laser_Rifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_XCOM_Gun_LaserRifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AR</li>
+		</weaponTags>
+		<researchPrerequisite>XCOM_LaserWeapons</researchPrerequisite>
+	</Operation>
+
+	<!-- XCOM laser sniper-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_Gun_LaserSniperRifle</defName>
+		<statBases>
+			<Mass>4.20</Mass>
+			<Bulk>13.00</Bulk>
+			<SwayFactor>1.19</SwayFactor>
+			<ShotSpread>0.04</ShotSpread>
+			<SightsEfficiency>2.48</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
+			<NightVisionEfficiency_Weapon>0.4</NightVisionEfficiency_Weapon>
+			<WorkToMake>60000</WorkToMake>
+		</statBases>
+		<costList>
+			<Plasteel>100</Plasteel>
+			<ComponentSpacer>5</ComponentSpacer>
+		</costList>
+		<Properties>
+			<hasStandardCommand>true</hasStandardCommand>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<recoilAmount>0</recoilAmount>
+			<soundAiming>Laser_LoudWarmup</soundAiming>
+			<defaultProjectile>XCOM_Bullet_LaserSniperRifleCE</defaultProjectile>
+			<warmupTime>2</warmupTime>
+			<range>62</range>
+			<soundCast>Laser_SniperRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_XCOM_Gun_LaserSniperRifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_SR</li>
+			<li>Bipod_DMR</li>
+		</weaponTags>
+		<researchPrerequisite>XCOM_LaserWeapons</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- XCOM scatter laser -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_Gun_LaserShotgun</defName>
+		<statBases>
+			<Mass>3.50</Mass>
+			<Bulk>9.10</Bulk>
+			<SwayFactor>1.26</SwayFactor>
+			<ShotSpread>0.5</ShotSpread>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
+			<WorkToMake>45000</WorkToMake>
+		</statBases>
+		<costList>
+			<Plasteel>55</Plasteel>
+			<ComponentSpacer>5</ComponentSpacer>
+		</costList>
+		<Properties>
+			<hasStandardCommand>true</hasStandardCommand>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<recoilAmount>0</recoilAmount>
+			<soundAiming>Laser_LoudWarmup</soundAiming>
+			<defaultProjectile>XCOM_Bullet_LaserShotgunCE</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>12</range>
+			<soundCast>Laser_Shotgun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_XCOM_Gun_LaserShotgun</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+		<researchPrerequisite>XCOM_LaserWeapons</researchPrerequisite>
+	</Operation>
+
+	<!-- XCOM Laser Cannon -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_Gun_LaserCannon</defName>
+		<statBases>
+			<Mass>16.00</Mass>
+			<Bulk>10.40</Bulk>
+			<SwayFactor>2.64</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<WorkToMake>80000</WorkToMake>
+		</statBases>
+		<costList>
+			<Plasteel>120</Plasteel>
+			<ComponentSpacer>9</ComponentSpacer>
+		</costList>
+		<Properties>
+			<recoilAmount>0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>XCOM_Bullet_LaserCannonCE</defaultProjectile>
+			<soundAiming>Laser_Warmup</soundAiming>
+			<warmupTime>1.75</warmupTime>
+			<burstShotCount>25</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<range>46</range>
+			<soundCast>Laser_Cannon</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>75</magazineSize>
+			<reloadTime>7.5</reloadTime>
+			<ammoSet>AmmoSet_XCOM_Gun_LaserCannon</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Suppressive</li>
+			<li>Bipod_LMG</li>
+		</weaponTags>
+		<researchPrerequisite>XCOM_LaserWeapons</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- XCOM Laser Pistol -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_Gun_LaserPistol</defName>
+		<statBases>
+			<Mass>1.20</Mass>
+			<Bulk>2.30</Bulk>
+			<SwayFactor>1.17</SwayFactor>
+			<ShotSpread>0.2</ShotSpread>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<WorkToMake>35000</WorkToMake>
+		</statBases>
+		<costList>
+			<Plasteel>45</Plasteel>
+			<ComponentSpacer>2</ComponentSpacer>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<recoilAmount>0</recoilAmount>
+			<soundAiming>Laser_Warmup</soundAiming>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>XCOM_Bullet_Laser_PistolCE</defaultProjectile>
+			<warmupTime>0.8</warmupTime>
+			<range>12</range>
+			<soundCast>Laser_Pistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_XCOM_Gun_LaserPistol</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_BROOM</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+		<researchPrerequisite>XCOM_LaserWeapons</researchPrerequisite>
+	</Operation>
+
+	<!-- Brun recoilless railgun-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_Gun_LaserRailgun</defName>
+		<statBases>
+			<WorkToMake>125000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>2.2</SwayFactor>
+			<Bulk>55.90</Bulk>
+			<Mass>28.30</Mass>
+			<RangedWeapon_Cooldown>1.47</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Plasteel>300</Plasteel>
+			<ComponentSpacer>12</ComponentSpacer>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<soundAiming>Laser_Warmup</soundAiming>
+			<recoilAmount>1</recoilAmount>
+			<defaultProjectile>XCOM_Bullet_LaserRailgunCE</defaultProjectile>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
+			<warmupTime>2</warmupTime>
+			<range>55</range>
+			<soundCast>Laser_Railgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>18</magazineSize>
+			<reloadTime>7.5</reloadTime>
+			<ammoSet>AmmoSet_XCOM_Gun_LaserRailgun</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>Bipod_LMG</li>
+		</weaponTags>
+		<researchPrerequisite>XCOM_LaserWeapons</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla XCOM Magnetic Weapons/Defs/Vanilla XCOM Magnetic Weapons/Ammo.xml b/ModPatches/Vanilla XCOM Magnetic Weapons/Defs/Vanilla XCOM Magnetic Weapons/Ammo.xml
new file mode 100644
index 0000000000..45dfde77dc
--- /dev/null
+++ b/ModPatches/Vanilla XCOM Magnetic Weapons/Defs/Vanilla XCOM Magnetic Weapons/Ammo.xml	
@@ -0,0 +1,1133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- So we don't have rail pistol in base CE. slap the stats of 3HST 4MMRAIL then-->
+	<!-- I mean, for fuck's sane we have rail pistol ammo texture but nothing use it-->
+	<ThingCategoryDef>
+		<defName>Ammo4mmRailgun</defName>
+		<label>4mm Railgun</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRailgunPistol</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_4mmRailgunXCOM</defName>
+		<label>4mm Railgun</label>
+		<ammoTypes>
+			<Ammo_4mmRailgun_Sabot>Bullet_XCOM4mmRailgun_Sabot</Ammo_4mmRailgun_Sabot>
+			<Ammo_4mmRailgun_API>Bullet_XCOM4mmRailgun_API</Ammo_4mmRailgun_API>
+			<Ammo_4mmRailgun_APHE>Bullet_XCOM4mmRailgun_APHE</Ammo_4mmRailgun_APHE>
+			<Ammo_4mmRailgun_EMP>Bullet_XCOM4mmRailgun_EMP</Ammo_4mmRailgun_EMP>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_4mmRailgun_Sabot</defName>
+		<label>4mm Railgun cartridge (Sabot)</label>
+		<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for railgun rifles.</description>
+		<statBases>
+			<Mass>0.01</Mass>
+			<Bulk>0.008</Bulk>
+			<MarketValue>0.06</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo4mmRailgun</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>Things/Ammo/Railgun/Pistol</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>RailgunSabot</ammoClass>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_4mmRailgun_API</defName>
+		<label>4mm Railgun cartridge (AP-I)</label>
+		<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for railgun rifles.</description>
+		<statBases>
+			<Mass>0.01</Mass>
+			<Bulk>0.008</Bulk>
+			<MarketValue>0.06</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo4mmRailgun</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>ThirdParty/VanillaXCOM/Railgun/API/Pistol</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>IncendiaryAP</ammoClass>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_4mmRailgun_APHE</defName>
+		<label>4mm Railgun cartridge (HE)</label>
+		<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for railgun rifles.</description>
+		<statBases>
+			<Mass>0.01</Mass>
+			<Bulk>0.008</Bulk>
+			<MarketValue>0.05</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo4mmRailgun</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>ThirdParty/VanillaXCOM/Railgun/APHE/Pistol</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>ExplosiveAP</ammoClass>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_4mmRailgun_EMP</defName>
+		<label>4mm Railgun cartridge (Ion)</label>
+		<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for railgun rifles.</description>
+		<statBases>
+			<Mass>0.01</Mass>
+			<Bulk>0.008</Bulk>
+			<MarketValue>0.06</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo4mmRailgun</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>ThirdParty/VanillaXCOM/Railgun/EMP/Pistol</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>Ionized</ammoClass>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<!-- Why BaseBullet don't work while Base9x19mmParaBullet work? I don't fucking know-->
+
+	<ThingDef ParentName="Base9x19mmParaBullet">
+		<defName>Bullet_XCOM4mmRailgun_Sabot</defName>
+		<label>4mm Railgun bullet (Sabot)</label>
+		<graphicData>
+			<texPath>Bullet_Mag_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>0.6</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>15</damageAmountBase>
+			<armorPenetrationSharp>14.8</armorPenetrationSharp>
+			<armorPenetrationBlunt>177.46</armorPenetrationBlunt>
+			<speed>250</speed>
+			<dropsCasings>false</dropsCasings>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base9x19mmParaBullet">
+		<defName>Bullet_XCOM4mmRailgun_API</defName>
+		<label>4mm Railgun bullet (AP-I)</label>
+		<graphicData>
+			<texPath>Bullet_Mag_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>0.6</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>29.6</armorPenetrationSharp>
+			<armorPenetrationBlunt>177.46</armorPenetrationBlunt>
+			<speed>250</speed>
+			<dropsCasings>false</dropsCasings>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>5</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base9x19mmParaBullet">
+		<defName>Bullet_XCOM4mmRailgun_APHE</defName>
+		<label>4mm Railgun bullet (HE)</label>
+		<graphicData>
+			<texPath>Bullet_Mag_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>0.6</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>15</damageAmountBase>
+			<armorPenetrationSharp>14.8</armorPenetrationSharp>
+			<armorPenetrationBlunt>177.46</armorPenetrationBlunt>
+			<speed>250</speed>
+			<dropsCasings>false</dropsCasings>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>8</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base9x19mmParaBullet">
+		<defName>Bullet_XCOM4mmRailgun_EMP</defName>
+		<label>4mm Railgun bullet (Ion)</label>
+		<graphicData>
+			<texPath>Bullet_Mag_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>0.6</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationSharp>14.8</armorPenetrationSharp>
+			<armorPenetrationBlunt>177.46</armorPenetrationBlunt>
+			<speed>250</speed>
+			<dropsCasings>false</dropsCasings>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>5</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_4mmRailgun_Sabot</defName>
+		<label>make 4mm Railgun cartridge (Sabot) x500</label>
+		<description>Craft 500 4mm Railgun (Sabot) cartridges.</description>
+		<jobString>Making 4mm Railgun (Sabot) cartridges.</jobString>
+		<workAmount>1000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Uranium</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_4mmRailgun_Sabot>500</Ammo_4mmRailgun_Sabot>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_4mmRailgun_API</defName>
+		<label>make 4mm Railgun cartridge (AP-I) x500</label>
+		<description>Craft 500 4mm Railgun (AP-I) cartridges.</description>
+		<jobString>Making 4mm Railgun (AP-I) cartridges.</jobString>
+		<workAmount>2000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Uranium</li>
+				<li>Prometheum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_4mmRailgun_API>500</Ammo_4mmRailgun_API>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_4mmRailgun_APHE</defName>
+		<label>make 4mm Railgun cartridge (Sabot) x500</label>
+		<description>Craft 500 4mm Railgun (Sabot) cartridges.</description>
+		<jobString>Making 4mm Railgun (Sabot) cartridges.</jobString>
+		<workAmount>2000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Uranium</li>
+				<li>FSX</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_4mmRailgun_APHE>500</Ammo_4mmRailgun_APHE>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_4mmRailgun_EMP</defName>
+		<label>make 4mm Railgun cartridge (Ion) x500</label>
+		<description>Craft 500 4mm Railgun (Ion) cartridges.</description>
+		<jobString>Making 4mm Railgun (Ion) cartridges.</jobString>
+		<workAmount>3000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Uranium</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_4mmRailgun_EMP>500</Ammo_4mmRailgun_EMP>
+		</products>
+	</RecipeDef>
+
+	<!-- They have custom projectile texture that isn't cringe, so I'm arsed enough to keep them-->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_6mmRailgunXCOM</defName>
+		<label>6mm Railgun</label>
+		<ammoTypes>
+			<Ammo_6mmRailgun_Sabot>Bullet_XCOM6mmRailgun_Sabot</Ammo_6mmRailgun_Sabot>
+			<Ammo_6mmRailgun_API>Bullet_XCOM6mmRailgun_API</Ammo_6mmRailgun_API>
+			<Ammo_6mmRailgun_APHE>Bullet_XCOM6mmRailgun_APHE</Ammo_6mmRailgun_APHE>
+			<Ammo_6mmRailgun_EMP>Bullet_XCOM6mmRailgun_EMP</Ammo_6mmRailgun_EMP>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_6mmRailgun_API</defName>
+		<label>6mm Railgun cartridge (AP-I)</label>
+		<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for railgun rifles.</description>
+		<statBases>
+			<Mass>0.01</Mass>
+			<Bulk>0.008</Bulk>
+			<MarketValue>0.06</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo6mmRailgun</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>ThirdParty/VanillaXCOM/Railgun/API/Rifle</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>IncendiaryAP</ammoClass>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_6mmRailgun_APHE</defName>
+		<label>6mm Railgun cartridge (HE)</label>
+		<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for railgun rifles.</description>
+		<statBases>
+			<Mass>0.01</Mass>
+			<Bulk>0.008</Bulk>
+			<MarketValue>0.05</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo6mmRailgun</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>ThirdParty/VanillaXCOM/Railgun/APHE/Rifle</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>ExplosiveAP</ammoClass>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_6mmRailgun_EMP</defName>
+		<label>6mm Railgun cartridge (Ion)</label>
+		<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for railgun rifles.</description>
+		<statBases>
+			<Mass>0.01</Mass>
+			<Bulk>0.008</Bulk>
+			<MarketValue>0.06</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo6mmRailgun</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>ThirdParty/VanillaXCOM/Railgun/EMP/Rifle</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>Ionized</ammoClass>
+	</ThingDef>
+
+	<!-- you know what? I always worried about my 3HST railguns are too imba until I saw the stats CE gave for railguns. So I'll take my liberty here as I'm gonna rewrite the projectile anyway. I don't really buy the "fromtloaded cost" explanation-->
+
+	<ThingDef ParentName="Base9x19mmParaBullet">
+		<defName>Bullet_XCOM6mmRailgun_Sabot</defName>
+		<label>6mm Railgun bullet (Sabot)</label>
+		<graphicData>
+			<texPath>Bullet_Mag_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>1.1</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>18</damageAmountBase>
+			<armorPenetrationSharp>44</armorPenetrationSharp>
+			<armorPenetrationBlunt>290.80</armorPenetrationBlunt>
+			<speed>300</speed>
+			<dropsCasings>false</dropsCasings>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base9x19mmParaBullet">
+		<defName>Bullet_XCOM6mmRailgun_API</defName>
+		<label>6mm Railgun bullet (AP-I)</label>
+		<graphicData>
+			<texPath>Bullet_Mag_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>1.1</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>13</damageAmountBase>
+			<armorPenetrationSharp>88</armorPenetrationSharp>
+			<armorPenetrationBlunt>290.80</armorPenetrationBlunt>
+			<speed>300</speed>
+			<dropsCasings>false</dropsCasings>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>6</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base9x19mmParaBullet">
+		<defName>Bullet_XCOM6mmRailgun_APHE</defName>
+		<label>6mm Railgun bullet (HE)</label>
+		<graphicData>
+			<texPath>Bullet_Mag_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>1.1</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>18</damageAmountBase>
+			<armorPenetrationSharp>44</armorPenetrationSharp>
+			<armorPenetrationBlunt>290.80</armorPenetrationBlunt>
+			<speed>300</speed>
+			<dropsCasings>false</dropsCasings>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>10</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base9x19mmParaBullet">
+		<defName>Bullet_XCOM6mmRailgun_EMP</defName>
+		<label>6mm Railgun bullet (Ion)</label>
+		<graphicData>
+			<texPath>Bullet_Mag_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>1.1</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>11</damageAmountBase>
+			<armorPenetrationSharp>44</armorPenetrationSharp>
+			<armorPenetrationBlunt>290.80</armorPenetrationBlunt>
+			<speed>300</speed>
+			<dropsCasings>false</dropsCasings>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>7</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_6mmRailgun_API</defName>
+		<label>make 6mm Railgun cartridge (AP-I) x500</label>
+		<description>Craft 500 6mm Railgun (AP-I) cartridges.</description>
+		<jobString>Making 6mm Railgun (AP-I) cartridges.</jobString>
+		<workAmount>2000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Prometheum</li>
+				<li>Steel</li>
+				<li>Uranium</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_6mmRailgun_API>500</Ammo_6mmRailgun_API>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_6mmRailgun_APHE</defName>
+		<label>make 6mm Railgun cartridge (HE) x500</label>
+		<description>Craft 500 6mm Railgun (HE) cartridges.</description>
+		<jobString>Making 6mm Railgun (HE) cartridges.</jobString>
+		<workAmount>2000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>FSX</li>
+				<li>Steel</li>
+				<li>Uranium</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_6mmRailgun_APHE>500</Ammo_6mmRailgun_APHE>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_6mmRailgun_EMP</defName>
+		<label>make 6mm Railgun cartridge (Ion) x500</label>
+		<description>Craft 500 6mm Railgun (Ion) cartridges.</description>
+		<jobString>Making 6mm Railgun (Ion) cartridges.</jobString>
+		<workAmount>3000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>ComponentIndustrial</li>
+				<li>Steel</li>
+				<li>Uranium</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_6mmRailgun_EMP>500</Ammo_6mmRailgun_EMP>
+		</products>
+	</RecipeDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_8mmRailgunXCOM</defName>
+		<label>8mm Railgun</label>
+		<ammoTypes>
+			<Ammo_8mmRailgun_Sabot>Bullet_XCOM8mmRailgun_Sabot</Ammo_8mmRailgun_Sabot>
+			<Ammo_8mmRailgun_API>Bullet_XCOM8mmRailgun_API</Ammo_8mmRailgun_API>
+			<Ammo_8mmRailgun_APHE>Bullet_XCOM8mmRailgun_APHE</Ammo_8mmRailgun_APHE>
+			<Ammo_8mmRailgun_EMP>Bullet_XCOM8mmRailgun_EMP</Ammo_8mmRailgun_EMP>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_8mmRailgun_API</defName>
+		<label>8mm Railgun cartridge (AP-I)</label>
+		<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for railgun pistols.</description>
+		<statBases>
+			<Mass>0.009</Mass>
+			<Bulk>0.01</Bulk>
+			<MarketValue>0.06</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo8mmRailgun</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>ThirdParty/VanillaXCOM/Railgun/API/Rifle</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>IncendiaryAP</ammoClass>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_8mmRailgun_APHE</defName>
+		<label>8mm Railgun cartridge (HE)</label>
+		<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for railgun pistols.</description>
+		<statBases>
+			<Mass>0.009</Mass>
+			<Bulk>0.01</Bulk>
+			<MarketValue>0.05</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo8mmRailgun</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>ThirdParty/VanillaXCOM/Railgun/APHE/Rifle</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>ExplosiveAP</ammoClass>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_8mmRailgun_EMP</defName>
+		<label>8mm Railgun cartridge (Ion)</label>
+		<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for railgun pistols.</description>
+		<statBases>
+			<Mass>0.009</Mass>
+			<Bulk>0.01</Bulk>
+			<MarketValue>0.06</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo8mmRailgun</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>ThirdParty/VanillaXCOM/Railgun/EMP/Rifle</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>Ionized</ammoClass>
+	</ThingDef>
+
+	<!-- well...3HST 9mm is another story, and 3HST 20mm is just worse.-->
+
+	<ThingDef ParentName="Base9x19mmParaBullet">
+		<defName>Bullet_XCOM8mmRailgun_Sabot</defName>
+		<label>8mm Railgun bullet (Sabot)</label>
+		<graphicData>
+			<texPath>Bullet_Mag_Big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>75</armorPenetrationSharp>
+			<armorPenetrationBlunt>252.720</armorPenetrationBlunt>
+			<speed>360</speed>
+			<dropsCasings>false</dropsCasings>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base9x19mmParaBullet">
+		<defName>Bullet_XCOM8mmRailgun_API</defName>
+		<label>8mm Railgun bullet (AP-I)</label>
+		<graphicData>
+			<texPath>Bullet_Mag_Big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>15</damageAmountBase>
+			<armorPenetrationSharp>150</armorPenetrationSharp>
+			<armorPenetrationBlunt>252.720</armorPenetrationBlunt>
+			<speed>360</speed>
+			<dropsCasings>false</dropsCasings>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>8</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base9x19mmParaBullet">
+		<defName>Bullet_XCOM8mmRailgun_APHE</defName>
+		<label>8mm Railgun bullet (HE)</label>
+		<graphicData>
+			<texPath>Bullet_Mag_Big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>75</armorPenetrationSharp>
+			<armorPenetrationBlunt>252.720</armorPenetrationBlunt>
+			<speed>360</speed>
+			<dropsCasings>false</dropsCasings>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>10</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base9x19mmParaBullet">
+		<defName>Bullet_XCOM8mmRailgun_EMP</defName>
+		<label>8mm Railgun bullet (Ion)</label>
+		<graphicData>
+			<texPath>Bullet_Mag_Big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>75</armorPenetrationSharp>
+			<armorPenetrationBlunt>252.720</armorPenetrationBlunt>
+			<speed>360</speed>
+			<dropsCasings>false</dropsCasings>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>10</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_8mmRailgun_API</defName>
+		<label>make 8mm Railgun cartridge (AP-I) x500</label>
+		<description>Craft 500 8mm Railgun (AP-I) cartridges.</description>
+		<jobString>Making 8mm Railgun (AP-I) cartridges.</jobString>
+		<workAmount>2000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Prometheum</li>
+				<li>Steel</li>
+				<li>Uranium</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_8mmRailgun_API>500</Ammo_8mmRailgun_API>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_8mmRailgun_APHE</defName>
+		<label>make 8mm Railgun cartridge (HE) x500</label>
+		<description>Craft 500 8mm Railgun (HE) cartridges.</description>
+		<jobString>Making 8mm Railgun (HE) cartridges.</jobString>
+		<workAmount>2000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>FSX</li>
+				<li>Steel</li>
+				<li>Uranium</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_8mmRailgun_APHE>500</Ammo_8mmRailgun_APHE>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_8mmRailgun_EMP</defName>
+		<label>make 8mm Railgun cartridge (Ion) x500</label>
+		<description>Craft 500 8mm Railgun (Ion) cartridges.</description>
+		<jobString>Making 8mm Railgun (Ion) cartridges.</jobString>
+		<workAmount>3000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>ComponentIndustrial</li>
+				<li>Steel</li>
+				<li>Uranium</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_8mmRailgun_EMP>500</Ammo_8mmRailgun_EMP>
+		</products>
+	</RecipeDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_12mmRailgunXCOM</defName>
+		<label>12mm Railgun</label>
+		<ammoTypes>
+			<Ammo_12mmRailgun_Sabot>Bullet_XCOM12mmRailgun_Sabot</Ammo_12mmRailgun_Sabot>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef ParentName="Base9x19mmParaBullet">
+		<defName>Bullet_XCOM12mmRailgun_Sabot</defName>
+		<label>12mm Railgun bullet (Sabot)</label>
+		<graphicData>
+			<texPath>Bullet_Mag_Big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>1.5</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>73</damageAmountBase>
+			<armorPenetrationSharp>130</armorPenetrationSharp>
+			<armorPenetrationBlunt>7250</armorPenetrationBlunt>
+			<speed>500</speed>
+			<dropsCasings>false</dropsCasings>
+		</projectile>
+	</ThingDef>
+
+	<!-- and...rail shotgun, slapping 3HST 20mm NCQ canister stats here-->
+
+	<ThingCategoryDef>
+		<defName>Ammo12GaugeRailgun</defName>
+		<label>12 Gauge scatter railgun</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberRailgunRifle</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_ScatterRailgunXCOM</defName>
+		<label>12 Gauge scatter railgun</label>
+		<ammoTypes>
+			<Ammo_12GaugeRailgun_Sabot>Bullet_XCOMScatterRailgun_Sabot</Ammo_12GaugeRailgun_Sabot>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_12GaugeRailgun_Sabot</defName>
+		<label>12 Gauge railgun bullet (Sabot)</label>
+		<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for railgun rifles.</description>
+		<statBases>
+			<Mass>0.051</Mass>
+			<Bulk>0.06</Bulk>
+			<MarketValue>0.06</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+			<!-- Railgun ammo isn't handloaded because it contains no propellant, and the sabots must be precision-machined anyway -->
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo12GaugeRailgun</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>Things/Ammo/Railgun/HighCaliber</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>XCOM_MAGShotgun</ammoClass>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base9x19mmParaBullet">
+		<defName>Bullet_XCOMScatterRailgun_Sabot</defName>
+		<label>12 Gauge railgun bullet (Sabot)</label>
+		<graphicData>
+			<texPath>Bullet_Mag_Small</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>0.3</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>250</speed>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationSharp>10</armorPenetrationSharp>
+			<armorPenetrationBlunt>25.88</armorPenetrationBlunt>
+			<spreadMult>23.8</spreadMult>
+			<pelletCount>12</pelletCount>
+			<dropsCasings>false</dropsCasings>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_12GaugeRailgun_Sabot</defName>
+		<label>make 12 Gauge railgun cartridge (Sabot) x200</label>
+		<description>Craft 500 12 Gauge railgun (Sabot) cartridges.</description>
+		<jobString>Making 12 Gauge railgun (Sabot) cartridges.</jobString>
+		<workAmount>2500</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Uranium</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_12GaugeRailgun_Sabot>200</Ammo_12GaugeRailgun_Sabot>
+		</products>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla XCOM Magnetic Weapons/Defs/Vanilla XCOM Magnetic Weapons/AmmoClass.xml b/ModPatches/Vanilla XCOM Magnetic Weapons/Defs/Vanilla XCOM Magnetic Weapons/AmmoClass.xml
new file mode 100644
index 0000000000..9c0a8b4654
--- /dev/null
+++ b/ModPatches/Vanilla XCOM Magnetic Weapons/Defs/Vanilla XCOM Magnetic Weapons/AmmoClass.xml	
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>XCOM_MAGShotgun</defName>
+		<label>Scatter railgun</label>
+		<labelShort>buckshot</labelShort>
+		<description>Uses a discarding sabot to fire several undersized projectile at higher muzzle velocities, greatly improving armor penetration.</description>
+	</CombatExtended.AmmoCategoryDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla XCOM Magnetic Weapons/Patches/Vanilla XCOM Magnetic Weapons/Weapon_Ranged.xml b/ModPatches/Vanilla XCOM Magnetic Weapons/Patches/Vanilla XCOM Magnetic Weapons/Weapon_Ranged.xml
new file mode 100644
index 0000000000..79a4f44258
--- /dev/null
+++ b/ModPatches/Vanilla XCOM Magnetic Weapons/Patches/Vanilla XCOM Magnetic Weapons/Weapon_Ranged.xml	
@@ -0,0 +1,524 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--
+	[Smmothbrain:Bill]
+	He will refuse to use his brain and slap existing 3HST weapon stats whenever possible
+	The last straw: "Mag autocannon"
+	-->
+
+	<!-- Magnetic, bulky and heavy than conventional I assume? since all these coils and rails-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName="XCOM_Gun_MagRifle" or
+			defName="XCOM_Gun_MagShotgun" or
+			defName="XCOM_Gun_MagSniperRifle" or
+			defName="XCOM_Gun_MagCannon" or
+			defName="XCOM_Gun_MagBullpup" or
+			defName="XCOM_Gun_MagVektor" or
+			defName="XCOM_Gun_MagHeavyAutocannon"
+			]/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="XCOM_Gun_MagPistol" or defName="XCOM_Gun_MagAutopistol"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- XCOM Mag Rifle -->
+	<!--So. rail assault rifle.-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_Gun_MagRifle</defName>
+		<statBases>
+			<WorkToMake>60500</WorkToMake>
+			<Mass>5.5</Mass>
+			<Bulk>12.5</Bulk>
+			<SwayFactor>1.26</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
+			<NightVisionEfficiency_Weapon>0.4</NightVisionEfficiency_Weapon>
+		</statBases>
+		<costList>
+			<Steel>70</Steel>
+			<Plasteel>65</Plasteel>
+			<ComponentSpacer>3</ComponentSpacer>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_XCOM6mmRailgun_Sabot</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<range>55</range>
+			<soundCast>Mag_Rifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<recoilAmount>3.65</recoilAmount>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_6mmRailgunXCOM</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AR</li>
+		</weaponTags>
+		<researchPrerequisite>ChargedShot</researchPrerequisite>
+	</Operation>
+
+	<!-- XCOM Mag Pistol -->
+	<!-- auto rail pistol? well this is not automatic. we don't really have SMG here in XCOM-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_Gun_MagPistol</defName>
+		<statBases>
+			<WorkToMake>22000</WorkToMake>
+			<Mass>2.2</Mass>
+			<Bulk>2.75</Bulk>
+			<SwayFactor>0.72</SwayFactor>
+			<ShotSpread>0.19</ShotSpread>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.69</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>20</Steel>
+			<Plasteel>40</Plasteel>
+			<ComponentSpacer>1</ComponentSpacer>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_XCOM4mmRailgun_Sabot</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Mag_Pistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<recoilAmount>2</recoilAmount>
+			<muzzleFlashScale>8</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_4mmRailgunXCOM</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+		<researchPrerequisite>ChargedShot</researchPrerequisite>
+	</Operation>
+
+	<!-- XCOM Mag Shotgun -->
+	<!-- Pump action rail shotgun, I happened to have one-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_Gun_MagShotgun</defName>
+		<statBases>
+			<WorkToMake>30000</WorkToMake>
+			<Mass>5.2</Mass>
+			<Bulk>12.2</Bulk>
+			<SwayFactor>1.32</SwayFactor>
+			<ShotSpread>0.15</ShotSpread>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.96</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>55</Steel>
+			<Plasteel>50</Plasteel>
+			<ComponentSpacer>2</ComponentSpacer>
+		</costList>
+		<Properties>
+			<recoilAmount>3.10</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_XCOMScatterRailgun_Sabot</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>44</range>
+			<soundCast>Mag_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>0.65</reloadTime>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<ammoSet>AmmoSet_ScatterRailgunXCOM</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+		<researchPrerequisite>ChargedShot</researchPrerequisite>
+	</Operation>
+
+	<!-- XCOM Mag Sniper Rifle -->
+	<!-- wow, 40 dmg in vanilla-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_Gun_MagSniperRifle</defName>
+		<statBases>
+			<WorkToMake>75500</WorkToMake>
+			<Mass>12.7</Mass>
+			<Bulk>13</Bulk>
+			<SwayFactor>1.34</SwayFactor>
+			<ShotSpread>0.03</ShotSpread>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<RangedWeapon_Cooldown>1.22</RangedWeapon_Cooldown>
+			<NightVisionEfficiency_Weapon>0.6</NightVisionEfficiency_Weapon>
+		</statBases>
+		<costList>
+			<Steel>70</Steel>
+			<Plasteel>90</Plasteel>
+			<ComponentSpacer>4</ComponentSpacer>
+		</costList>
+		<Properties>
+			<recoilAmount>5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_XCOM8mmRailgun_Sabot</defaultProjectile>
+			<warmupTime>2.5</warmupTime>
+			<range>86</range>
+			<soundCast>Mag_SniperRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_8mmRailgunXCOM</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SniperRifle</li>
+			<li>CE_AI_SR</li>
+			<li>Bipod_DMR</li>
+		</weaponTags>
+		<researchPrerequisite>ChargedShot</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- XCOM Mag Cannon -->
+	<!-- bruh another "cannon" minigun-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_Gun_MagCannon</defName>
+		<statBases>
+			<WorkToMake>110000</WorkToMake>
+			<Mass>39</Mass>
+			<Bulk>25</Bulk>
+			<SwayFactor>2.2</SwayFactor>
+			<ShotSpread>0.01</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>1.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>140</Steel>
+			<Plasteel>110</Plasteel>
+			<ComponentSpacer>7</ComponentSpacer>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_XCOM8mmRailgun_Sabot</defaultProjectile>
+			<warmupTime>3.1</warmupTime>
+			<range>65</range>
+			<soundCast>Mag_Cannon</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<recoilAmount>3.14</recoilAmount>
+			<muzzleFlashScale>18</muzzleFlashScale>
+			<burstShotCount>20</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>80</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_8mmRailgunXCOM</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>GunHeavy</li>
+			<li>CE_AI_SR</li>
+			<li>Bipod_LMG</li>
+		</weaponTags>
+		<researchPrerequisite>ChargedShot</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- XCOM Mag Bullpup -->
+	<!-- Rail AR, but faster-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_Gun_MagBullpup</defName>
+		<statBases>
+			<WorkToMake>60500</WorkToMake>
+			<Mass>4.5</Mass>
+			<Bulk>8.5</Bulk>
+			<SwayFactor>1.46</SwayFactor>
+			<ShotSpread>0.1</ShotSpread>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.33</RangedWeapon_Cooldown>
+			<NightVisionEfficiency_Weapon>0.4</NightVisionEfficiency_Weapon>
+		</statBases>
+		<costList>
+			<Steel>70</Steel>
+			<Plasteel>65</Plasteel>
+			<ComponentSpacer>3</ComponentSpacer>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_XCOM6mmRailgun_Sabot</defaultProjectile>
+			<warmupTime>0.8</warmupTime>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<range>55</range>
+			<soundCast>Mag_Bullpup</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<recoilAmount>3.65</recoilAmount>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_6mmRailgunXCOM</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>false</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AR</li>
+		</weaponTags>
+		<researchPrerequisite>ChargedShot</researchPrerequisite>
+	</Operation>
+
+	<!-- XCOM Mag Vektor -->
+	<!-- Sniper but faster-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_Gun_MagVektor</defName>
+		<statBases>
+			<WorkToMake>75500</WorkToMake>
+			<Mass>5.7</Mass>
+			<Bulk>11</Bulk>
+			<SwayFactor>1.55</SwayFactor>
+			<ShotSpread>0.03</ShotSpread>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<NightVisionEfficiency_Weapon>0.6</NightVisionEfficiency_Weapon>
+		</statBases>
+		<costList>
+			<Steel>70</Steel>
+			<Plasteel>90</Plasteel>
+			<ComponentSpacer>4</ComponentSpacer>
+		</costList>
+		<Properties>
+			<recoilAmount>5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_XCOM8mmRailgun_Sabot</defaultProjectile>
+			<warmupTime>2</warmupTime>
+			<range>86</range>
+			<soundCast>Mag_Vektor</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>10</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_8mmRailgunXCOM</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SniperRifle</li>
+			<li>CE_AI_SR</li>
+			<li>Bipod_DMR</li>
+		</weaponTags>
+		<researchPrerequisite>ChargedShot</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- XCOM Mag Autopistol -->
+	<!-- autorailpistol-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_Gun_MagAutopistol</defName>
+		<statBases>
+			<WorkToMake>22000</WorkToMake>
+			<Mass>2.5</Mass>
+			<Bulk>2.75</Bulk>
+			<SwayFactor>1.03</SwayFactor>
+			<ShotSpread>0.17</ShotSpread>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.49</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>20</Steel>
+			<Plasteel>45</Plasteel>
+			<ComponentSpacer>1</ComponentSpacer>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_XCOM4mmRailgun_Sabot</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<range>12</range>
+			<soundCast>Mag_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<recoilAmount>5.23</recoilAmount>
+			<muzzleFlashScale>8</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_4mmRailgunXCOM</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+		<researchPrerequisite>ChargedShot</researchPrerequisite>
+	</Operation>
+
+	<!-- SPARK Helix Rail-Cannon -->
+	<!-- AMOTHER handheld autocannon which is in fact a battle rifle....not again-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_Gun_MagHeavyAutocannon</defName>
+		<statBases>
+			<WorkToMake>75500</WorkToMake>
+			<Mass>12.8</Mass>
+			<Bulk>11.5</Bulk>
+			<SwayFactor>1.7</SwayFactor>
+			<ShotSpread>0.1</ShotSpread>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<RangedWeapon_Cooldown>1.57</RangedWeapon_Cooldown>
+			<NightVisionEfficiency_Weapon>0.4</NightVisionEfficiency_Weapon>
+		</statBases>
+		<costList>
+			<Steel>80</Steel>
+			<Plasteel>130</Plasteel>
+			<ComponentIndustrial>10</ComponentIndustrial>
+			<ComponentSpacer>5</ComponentSpacer>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_XCOM8mmRailgun_Sabot</defaultProjectile>
+			<warmupTime>2</warmupTime>
+			<burstShotCount>8</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<range>55</range>
+			<soundCast>Mag_HeavyAutocannon</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<recoilAmount>2.9</recoilAmount>
+			<muzzleFlashScale>8</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>6.5</reloadTime>
+			<ammoSet>AmmoSet_8mmRailgunXCOM</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>4</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_LMG</li>
+			<li>Bipod_LMG</li>
+		</weaponTags>
+		<researchPrerequisite>ChargedShot</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla XCOM Patches/Patches/Vanilla XCOM Patches/Weapon_RangedWC.xml b/ModPatches/Vanilla XCOM Patches/Patches/Vanilla XCOM Patches/Weapon_RangedWC.xml
new file mode 100644
index 0000000000..8bdc6cb9dc
--- /dev/null
+++ b/ModPatches/Vanilla XCOM Patches/Patches/Vanilla XCOM Patches/Weapon_RangedWC.xml	
@@ -0,0 +1,248 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--
+	[Smmothbrain:Bill]
+	He will refuse to use his brain and slap existing 3HST weapon stats whenever possible
+	The last straw: "Mag autocannon"
+	-->
+
+	<!-- Magnetic, bulky and heavy than conventional I assume? since all these coils and
+	rails-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName="XCOM_WarcasketGun_CVHA" or
+			defName="XCOM_WarcasketGun_Railgun" or
+			defName="XCOM_WarcasketGun_MagHA" or
+			defName="XCOM_WarcasketGun_BeamHA"
+			]/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="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_WarcasketGun_CVHA</defName>
+		<statBases>
+			<WorkToMake>48000</WorkToMake>
+			<SightsEfficiency>1.2</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.7</SwayFactor>
+			<Bulk>13.90</Bulk>
+			<Mass>6.30</Mass>
+			<RangedWeapon_Cooldown>0.47</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>80</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<recoilAmount>3.2</recoilAmount>
+			<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<warmupTime>1.4</warmupTime>
+			<range>55</range>
+			<soundCast>CV_HeavyAutocannon</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_338Lapua</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>Bipod_LMG</li>
+		</weaponTags>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_WarcasketGun_Railgun</defName>
+		<statBases>
+			<WorkToMake>125000</WorkToMake>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>2.2</SwayFactor>
+			<Bulk>55.90</Bulk>
+			<Mass>28.30</Mass>
+			<RangedWeapon_Cooldown>1.47</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Plasteel>300</Plasteel>
+			<ComponentSpacer>12</ComponentSpacer>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<soundAiming>Laser_Warmup</soundAiming>
+			<recoilAmount>1</recoilAmount>
+			<defaultProjectile>XCOM_Bullet_LaserRailgunCE</defaultProjectile>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
+			<warmupTime>2</warmupTime>
+			<range>55</range>
+			<soundCast>Laser_Railgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>18</magazineSize>
+			<reloadTime>7.5</reloadTime>
+			<ammoSet>AmmoSet_XCOM_Gun_LaserRailgun</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>Bipod_LMG</li>
+		</weaponTags>
+		<researchPrerequisite>XCOM_LaserWeapons</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_WarcasketGun_BeamHA</defName>
+		<statBases>
+			<WorkToMake>125000</WorkToMake>
+			<SightsEfficiency>1.2</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.7</SwayFactor>
+			<Bulk>13.90</Bulk>
+			<Mass>15.30</Mass>
+			<RangedWeapon_Cooldown>0.47</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Plasteel>180</Plasteel>
+			<ComponentSpacer>12</ComponentSpacer>
+			<Uranium>50</Uranium>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<soundAiming>Beam_WarmupAutocannon</soundAiming>
+			<recoilAmount>1</recoilAmount>
+			<defaultProjectile>XCOM_Bullet_BeamSniperRifleCE</defaultProjectile>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>1.4</warmupTime>
+			<range>55</range>
+			<soundCast>Beam_HeavyAutocannon</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_XCOM_Gun_BeamSniperRifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>Bipod_LMG</li>
+		</weaponTags>
+		<researchPrerequisite>XCOM_BeamWeapons</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- SPARK Helix Rail-Cannon -->
+	<!-- AMOTHER handheld autocannon which is in fact a battle rifle....not again-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_WarcasketGun_MagHA</defName>
+		<statBases>
+			<WorkToMake>75500</WorkToMake>
+			<Mass>12.8</Mass>
+			<Bulk>11.5</Bulk>
+			<SwayFactor>1.7</SwayFactor>
+			<ShotSpread>0.1</ShotSpread>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<RangedWeapon_Cooldown>1.57</RangedWeapon_Cooldown>
+			<NightVisionEfficiency_Weapon>0.4</NightVisionEfficiency_Weapon>
+		</statBases>
+		<costList>
+			<Steel>80</Steel>
+			<Plasteel>130</Plasteel>
+			<ComponentIndustrial>10</ComponentIndustrial>
+			<ComponentSpacer>5</ComponentSpacer>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_XCOM8mmRailgun_Sabot</defaultProjectile>
+			<warmupTime>2</warmupTime>
+			<burstShotCount>8</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<range>55</range>
+			<soundCast>Mag_HeavyAutocannon</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<recoilAmount>2.9</recoilAmount>
+			<muzzleFlashScale>8</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>6.5</reloadTime>
+			<ammoSet>AmmoSet_8mmRailgunXCOM</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>4</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_LMG</li>
+			<li>Bipod_LMG</li>
+		</weaponTags>
+		<researchPrerequisite>ChargedShot</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla XCOM Plasma Weapons/Defs/Vanilla XCOM Plasma Weapons/Ammo.xml b/ModPatches/Vanilla XCOM Plasma Weapons/Defs/Vanilla XCOM Plasma Weapons/Ammo.xml
new file mode 100644
index 0000000000..650b26918b
--- /dev/null
+++ b/ModPatches/Vanilla XCOM Plasma Weapons/Defs/Vanilla XCOM Plasma Weapons/Ammo.xml	
@@ -0,0 +1,1352 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>XCOM_PlasmaLight</defName>
+		<label>Light Plasma</label>
+		<labelShort>light</labelShort>
+		<description>Highly-energized ionized gas capable of devastating burn effects.</description>
+		<advanced>true</advanced>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>XCOM_PlasmaDense</defName>
+		<label>Dense Plasma</label>
+		<labelShort>dense</labelShort>
+		<description>Highly-energized ionized gas capable of devastating burn effects.</description>
+		<advanced>true</advanced>
+	</CombatExtended.AmmoCategoryDef>
+
+	<CombatExtended.AmmoCategoryDef>
+		<defName>XCOM_PlasmaUnstable</defName>
+		<label>Unstable Plasma</label>
+		<labelShort>unstable</labelShort>
+		<description>Highly-energized ionized gas capable of devastating burn effects.</description>
+		<advanced>true</advanced>
+	</CombatExtended.AmmoCategoryDef>
+
+	<!--Ammo items-->
+
+	<!--Pistol-->
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_XCOM_PlasmaCellPistolStandard</defName>
+		<label>Standard Plasma Pistol Cell</label>
+		<description>Plasma containment cell optimized for pistols</description>
+		<statBases>
+			<Mass>0.014</Mass>
+			<Bulk>0.01</Bulk>
+			<MarketValue>0.23</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoPlasmaCellPistol</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>ThirdParty/VanillaXCOM/Plasma/Standard/Pistol</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>Plasma</ammoClass>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>15</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.25</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>2</Fragment_Large>
+					<Fragment_Small>4</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_XCOM_PlasmaCellPistolLight</defName>
+		<label>Light Plasma Pistol Cell</label>
+		<description>Plasma containment cell optimized for pistols</description>
+		<statBases>
+			<Mass>0.014</Mass>
+			<Bulk>0.01</Bulk>
+			<MarketValue>0.2</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoPlasmaCellPistol</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>ThirdParty/VanillaXCOM/Plasma/Light/Pistol</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>XCOM_PlasmaLight</ammoClass>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>15</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.25</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>2</Fragment_Large>
+					<Fragment_Small>4</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_XCOM_PlasmaCellPistolDense</defName>
+		<label>Dense Plasma Pistol Cell</label>
+		<description>Plasma containment cell optimized for pistols</description>
+		<statBases>
+			<Mass>0.014</Mass>
+			<Bulk>0.01</Bulk>
+			<MarketValue>0.2</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoPlasmaCellPistol</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>ThirdParty/VanillaXCOM/Plasma/Dense/Pistol</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>XCOM_PlasmaDense</ammoClass>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>15</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.25</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>2</Fragment_Large>
+					<Fragment_Small>4</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_XCOM_PlasmaCellPistolUnstable</defName>
+		<label>Unstable Plasma Pistol Cell</label>
+		<description>Plasma containment cell optimized for pistols</description>
+		<statBases>
+			<Mass>0.014</Mass>
+			<Bulk>0.01</Bulk>
+			<MarketValue>0.2</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoPlasmaCellPistol</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>ThirdParty/VanillaXCOM/Plasma/Unstable/Pistol</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>XCOM_PlasmaUnstable</ammoClass>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>15</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.25</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>2</Fragment_Large>
+					<Fragment_Small>4</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_XCOM_PlasmaCellPistolStandard</defName>
+		<label>make Standard Plasma Pistol Cells</label>
+		<description>Craft 500 shots' worth of Standard Plasma Pistol Cells.</description>
+		<jobString>Making Plasma Pistol Cells.</jobString>
+		<workAmount>3400</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>14</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Plasteel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_XCOM_PlasmaCellPistolStandard>500</Ammo_XCOM_PlasmaCellPistolStandard>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_XCOM_PlasmaCellPistolLight</defName>
+		<label>make Light Plasma Pistol Cells</label>
+		<description>Craft 500 shots' worth of Light Plasma Pistol Cells.</description>
+		<jobString>Making Plasma Pistol Cells.</jobString>
+		<workAmount>3400</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Silver</li>
+					</thingDefs>
+				</filter>
+				<count>1.4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Silver</li>
+				<li>Plasteel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_XCOM_PlasmaCellPistolLight>500</Ammo_XCOM_PlasmaCellPistolLight>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_XCOM_PlasmaCellPistolDense</defName>
+		<label>make Heavy Plasma Pistol Cells</label>
+		<description>Craft 500 shots' worth of Heavy Plasma Pistol Cells.</description>
+		<jobString>Making Plasma Pistol Cells.</jobString>
+		<workAmount>3400</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>14</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Uranium</li>
+				<li>Plasteel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_XCOM_PlasmaCellPistolDense>500</Ammo_XCOM_PlasmaCellPistolDense>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_XCOM_PlasmaCellPistolUnstable</defName>
+		<label>make Unstable Plasma Pistol Cells</label>
+		<description>Craft 500 shots' worth of Unstable Plasma Pistol Cells.</description>
+		<jobString>Making Plasma Pistol Cells.</jobString>
+		<workAmount>3400</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>14</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>FSX</li>
+				<li>Plasteel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_XCOM_PlasmaCellPistolUnstable>500</Ammo_XCOM_PlasmaCellPistolUnstable>
+		</products>
+	</RecipeDef>
+
+	<!--Rifle-->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_XCOM_PlasmaCellRifleStandard</defName>
+		<label>Standard Plasma Rifle Cell</label>
+		<description>Plasma containment cell optimized for rifles</description>
+		<statBases>
+			<Mass>0.017</Mass>
+			<Bulk>0.01</Bulk>
+			<MarketValue>0.24</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoPlasmaCellRifle</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>ThirdParty/VanillaXCOM/Plasma/Standard/Rifle</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>Plasma</ammoClass>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>20</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>2</Fragment_Large>
+					<Fragment_Small>8</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_XCOM_PlasmaCellRifleLight</defName>
+		<label>Light Plasma Rifle Cell</label>
+		<description>Plasma containment cell optimized for rifles</description>
+		<statBases>
+			<Mass>0.017</Mass>
+			<Bulk>0.01</Bulk>
+			<MarketValue>0.24</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoPlasmaCellRifle</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>ThirdParty/VanillaXCOM/Plasma/Light/Rifle</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>XCOM_PlasmaLight</ammoClass>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>20</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>2</Fragment_Large>
+					<Fragment_Small>8</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_XCOM_PlasmaCellRifleDense</defName>
+		<label>Heavy Plasma Rifle Cell</label>
+		<description>Plasma containment cell optimized for rifles</description>
+		<statBases>
+			<Mass>0.017</Mass>
+			<Bulk>0.01</Bulk>
+			<MarketValue>0.24</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoPlasmaCellRifle</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>ThirdParty/VanillaXCOM/Plasma/Dense/Rifle</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>XCOM_PlasmaDense</ammoClass>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>20</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>2</Fragment_Large>
+					<Fragment_Small>8</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_XCOM_PlasmaCellRifleUnstable</defName>
+		<label>Unstable Plasma Rifle Cell</label>
+		<description>Plasma containment cell optimized for rifles</description>
+		<statBases>
+			<Mass>0.017</Mass>
+			<Bulk>0.01</Bulk>
+			<MarketValue>0.24</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoPlasmaCellRifle</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>ThirdParty/VanillaXCOM/Plasma/Unstable/Rifle</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>XCOM_PlasmaUnstable</ammoClass>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>20</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>2</Fragment_Large>
+					<Fragment_Small>8</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_XCOM_PlasmaCellRifleStandard</defName>
+		<label>make Standard Plasma Rifle Cells</label>
+		<description>Craft 500 shots' worth of Standard Plasma Rifle Cells.</description>
+		<jobString>Making Plasma Rifle Cells.</jobString>
+		<workAmount>3800</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>18</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Plasteel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_XCOM_PlasmaCellRifleStandard>500</Ammo_XCOM_PlasmaCellRifleStandard>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_XCOM_PlasmaCellRifleLight</defName>
+		<label>make Light Plasma Rifle Cells</label>
+		<description>Craft 500 shots' worth of Light Plasma Rifle Cells.</description>
+		<jobString>Making Plasma Rifle Cells.</jobString>
+		<workAmount>3800</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Silver</li>
+					</thingDefs>
+				</filter>
+				<count>1.8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Silver</li>
+				<li>Plasteel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_XCOM_PlasmaCellRifleLight>500</Ammo_XCOM_PlasmaCellRifleLight>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_XCOM_PlasmaCellRifleDense</defName>
+		<label>make Dense Plasma Rifle Cells</label>
+		<description>Craft 500 shots' worth of Dense Plasma Rifle Cells.</description>
+		<jobString>Making Plasma Rifle Cells.</jobString>
+		<workAmount>3800</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>18</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Uranium</li>
+				<li>Plasteel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_XCOM_PlasmaCellRifleDense>500</Ammo_XCOM_PlasmaCellRifleDense>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_XCOM_PlasmaCellRifleUnstable</defName>
+		<label>make Unstable Plasma Rifle Cells</label>
+		<description>Craft 500 shots' worth of Unstable Plasma Rifle Cells.</description>
+		<jobString>Making Plasma Rifle Cells.</jobString>
+		<workAmount>3800</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>18</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>FSX</li>
+				<li>Plasteel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_XCOM_PlasmaCellRifleUnstable>500</Ammo_XCOM_PlasmaCellRifleUnstable>
+		</products>
+	</RecipeDef>
+
+	<!--Heavy-->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_XCOM_PlasmaCellHeavyStandard</defName>
+		<label>Standard Plasma Heavy Cell</label>
+		<description>Plasma containment cell optimized for heavy weapons</description>
+		<statBases>
+			<Mass>0.134</Mass>
+			<Bulk>0.51</Bulk>
+			<MarketValue>2.52</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoPlasmaCellHeavy</li>
+		</thingCategories>
+		<stackLimit>75</stackLimit>
+		<graphicData>
+			<texPath>ThirdParty/VanillaXCOM/Plasma/Standard/Heavy</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>Plasma</ammoClass>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>35</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>2</Fragment_Large>
+					<Fragment_Small>10</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_XCOM_PlasmaCellHeavyLight</defName>
+		<label>Light Plasma Heavy Cell</label>
+		<description>Plasma containment cell optimized for heavy weapons</description>
+		<statBases>
+			<Mass>0.134</Mass>
+			<Bulk>0.51</Bulk>
+			<MarketValue>2.52</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoPlasmaCellHeavy</li>
+		</thingCategories>
+		<stackLimit>75</stackLimit>
+		<graphicData>
+			<texPath>ThirdParty/VanillaXCOM/Plasma/Light/Heavy</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>XCOM_PlasmaLight</ammoClass>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>35</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>2</Fragment_Large>
+					<Fragment_Small>10</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_XCOM_PlasmaCellHeavyDense</defName>
+		<label>Dense Plasma Heavy Cell</label>
+		<description>Plasma containment cell optimized for heavy weapons</description>
+		<statBases>
+			<Mass>0.134</Mass>
+			<Bulk>0.51</Bulk>
+			<MarketValue>2.52</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoPlasmaCellHeavy</li>
+		</thingCategories>
+		<stackLimit>75</stackLimit>
+		<graphicData>
+			<texPath>ThirdParty/VanillaXCOM/Plasma/Dense/Heavy</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>XCOM_PlasmaDense</ammoClass>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>35</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>2</Fragment_Large>
+					<Fragment_Small>10</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_XCOM_PlasmaCellHeavyUnstable</defName>
+		<label>Unstable Plasma Heavy Cell</label>
+		<description>Plasma containment cell optimized for heavy weapons</description>
+		<statBases>
+			<Mass>0.134</Mass>
+			<Bulk>0.51</Bulk>
+			<MarketValue>2.52</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_FabricationBench</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoPlasmaCellHeavy</li>
+		</thingCategories>
+		<stackLimit>75</stackLimit>
+		<graphicData>
+			<texPath>ThirdParty/VanillaXCOM/Plasma/Unstable/Heavy</texPath>
+			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
+		</graphicData>
+		<ammoClass>XCOM_PlasmaUnstable</ammoClass>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>35</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>2</Fragment_Large>
+					<Fragment_Small>10</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_XCOM_PlasmaCellHeavyStandard</defName>
+		<label>make Standard Plasma Heavy Cells</label>
+		<description>Craft 75 shots' worth of Standard Plasma Heavy Cells.</description>
+		<jobString>Making Plasma Heavy Cells.</jobString>
+		<workAmount>6800</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>9</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Plasteel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_XCOM_PlasmaCellHeavyStandard>75</Ammo_XCOM_PlasmaCellHeavyStandard>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_XCOM_PlasmaCellHeavyLight</defName>
+		<label>make Light Plasma Heavy Cells</label>
+		<description>Craft 75 shots' worth of Light Plasma Heavy Cells.</description>
+		<jobString>Making Plasma Heavy Cells.</jobString>
+		<workAmount>6800</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Silver</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>9</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Silver</li>
+				<li>Plasteel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_XCOM_PlasmaCellHeavyLight>75</Ammo_XCOM_PlasmaCellHeavyLight>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_XCOM_PlasmaCellHeavyDense</defName>
+		<label>make Dense Plasma Heavy Cells</label>
+		<description>Craft 75 shots' worth of Dense Plasma Heavy Cells.</description>
+		<jobString>Making Plasma Heavy Cells.</jobString>
+		<workAmount>6800</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>9</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Uranium</li>
+				<li>Plasteel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_XCOM_PlasmaCellHeavyDense>75</Ammo_XCOM_PlasmaCellHeavyDense>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_XCOM_PlasmaCellHeavyUnstable</defName>
+		<label>make Unstable Plasma Heavy Cells</label>
+		<description>Craft 75 shots' worth of Unstable Plasma Heavy Cells.</description>
+		<jobString>Making Plasma Heavy Cells.</jobString>
+		<workAmount>6800</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Plasteel</li>
+					</thingDefs>
+				</filter>
+				<count>9</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>FSX</li>
+				<li>Plasteel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_XCOM_PlasmaCellHeavyUnstable>75</Ammo_XCOM_PlasmaCellHeavyUnstable>
+		</products>
+	</RecipeDef>
+
+	<!-- XCOM Plasma Rifle, cannon, vektor and bullpup-->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_XCOM_Gun_BeamRifle</defName>
+		<label>plasma</label>
+		<ammoTypes>
+			<Ammo_XCOM_PlasmaCellRifleStandard>XCOM_Bullet_BeamRifleCE</Ammo_XCOM_PlasmaCellRifleStandard>
+			<Ammo_XCOM_PlasmaCellRifleLight>XCOM_Bullet_BeamRifleCELight</Ammo_XCOM_PlasmaCellRifleLight>
+			<Ammo_XCOM_PlasmaCellRifleDense>XCOM_Bullet_BeamRifleCEDense</Ammo_XCOM_PlasmaCellRifleDense>
+			<Ammo_XCOM_PlasmaCellRifleUnstable>XCOM_Bullet_BeamRifleCEUnstable</Ammo_XCOM_PlasmaCellRifleUnstable>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletGreen">
+		<defName>XCOM_Bullet_BeamRifleCE</defName>
+		<label>plasma beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>XCOM_Plasma</damageDef>
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationSharp>22.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>44.52</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>13</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletBlue">
+		<defName>XCOM_Bullet_BeamRifleCELight</defName>
+		<label>plasma beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>XCOM_Plasma</damageDef>
+			<damageAmountBase>15</damageAmountBase>
+			<armorPenetrationSharp>11.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>44.52</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>18</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletYellow">
+		<defName>XCOM_Bullet_BeamRifleCEDense</defName>
+		<label>plasma beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>XCOM_Plasma</damageDef>
+			<damageAmountBase>8</damageAmountBase>
+			<armorPenetrationSharp>33.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>44.52</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>9</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletRed">
+		<defName>XCOM_Bullet_BeamRifleCEUnstable</defName>
+		<label>plasma beam</label>
+		<canExplode>true</canExplode>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>XCOM_Plasma</damageDef>
+			<damageAmountBase>10</damageAmountBase>
+			<explosionRadius>1.2</explosionRadius>
+			<armorPenetrationSharp>22.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>44.52</armorPenetrationBlunt>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>13</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<!-- XCOM Plasma Lance and autocannon-->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_XCOM_Gun_BeamSniperRifle</defName>
+		<label>heavy plasma</label>
+		<ammoTypes>
+			<Ammo_XCOM_PlasmaCellHeavyStandard>XCOM_Bullet_BeamSniperRifleCE</Ammo_XCOM_PlasmaCellHeavyStandard>
+			<Ammo_XCOM_PlasmaCellHeavyLight>XCOM_Bullet_BeamSniperRifleCELight</Ammo_XCOM_PlasmaCellHeavyLight>
+			<Ammo_XCOM_PlasmaCellHeavyDense>XCOM_Bullet_BeamSniperRifleCEDense</Ammo_XCOM_PlasmaCellHeavyDense>
+			<Ammo_XCOM_PlasmaCellHeavyUnstable>XCOM_Bullet_BeamSniperRifleCEUnstable</Ammo_XCOM_PlasmaCellHeavyUnstable>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletGreen">
+		<defName>XCOM_Bullet_BeamSniperRifleCE</defName>
+		<label>plasma beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>XCOM_Plasma</damageDef>
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>35</armorPenetrationSharp>
+			<armorPenetrationBlunt>70.52</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>20</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletBlue">
+		<defName>XCOM_Bullet_BeamSniperRifleCELight</defName>
+		<label>plasma beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>XCOM_Plasma</damageDef>
+			<damageAmountBase>28</damageAmountBase>
+			<armorPenetrationSharp>17.75</armorPenetrationSharp>
+			<armorPenetrationBlunt>70.52</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>28</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletYellow">
+		<defName>XCOM_Bullet_BeamSniperRifleCEDense</defName>
+		<label>plasma beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>XCOM_Plasma</damageDef>
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>50</armorPenetrationSharp>
+			<armorPenetrationBlunt>70.52</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>12</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletRed">
+		<defName>XCOM_Bullet_BeamSniperRifleCEUnstable</defName>
+		<label>plasma beam</label>
+		<canExplode>true</canExplode>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>XCOM_Plasma</damageDef>
+			<damageAmountBase>20</damageAmountBase>
+			<explosionRadius>1.8</explosionRadius>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<armorPenetrationSharp>35</armorPenetrationSharp>
+			<armorPenetrationBlunt>70.52</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>20</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<!-- XCOM Storm Gun -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_XCOM_Gun_BeamShotgun</defName>
+		<label>heavy plasma</label>
+		<ammoTypes>
+			<Ammo_XCOM_PlasmaCellHeavyStandard>XCOM_Bullet_BeamShotgunCE</Ammo_XCOM_PlasmaCellHeavyStandard>
+			<Ammo_XCOM_PlasmaCellHeavyLight>XCOM_Bullet_BeamShotgunCELight</Ammo_XCOM_PlasmaCellHeavyLight>
+			<Ammo_XCOM_PlasmaCellHeavyDense>XCOM_Bullet_BeamShotgunCEDense</Ammo_XCOM_PlasmaCellHeavyDense>
+			<Ammo_XCOM_PlasmaCellHeavyUnstable>XCOM_Bullet_BeamShotgunCEUnstable</Ammo_XCOM_PlasmaCellHeavyUnstable>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletGreen">
+		<defName>XCOM_Bullet_BeamShotgunCE</defName>
+		<label>plasma beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<spreadMult>17.8</spreadMult>
+			<pelletCount>7</pelletCount>
+			<damageDef>XCOM_Plasma</damageDef>
+			<damageAmountBase>6</damageAmountBase>
+			<armorPenetrationSharp>15</armorPenetrationSharp>
+			<armorPenetrationBlunt>14.22</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>4</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletBlue">
+		<defName>XCOM_Bullet_BeamShotgunCELight</defName>
+		<label>plasma beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<spreadMult>114514</spreadMult>
+			<pelletCount>12</pelletCount>
+			<damageDef>XCOM_Plasma</damageDef>
+			<damageAmountBase>7</damageAmountBase>
+			<armorPenetrationSharp>7.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>14.22</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>5</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletYellow">
+		<defName>XCOM_Bullet_BeamShotgunCEDense</defName>
+		<label>plasma beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<spreadMult>7.8</spreadMult>
+			<pelletCount>3</pelletCount>
+			<damageDef>XCOM_Plasma</damageDef>
+			<damageAmountBase>7</damageAmountBase>
+			<armorPenetrationSharp>24.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>14.22</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>4</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletRed">
+		<defName>XCOM_Bullet_BeamShotgunCEUnstable</defName>
+		<label>plasma beam</label>
+		<canExplode>true</canExplode>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<spreadMult>17.8</spreadMult>
+			<pelletCount>5</pelletCount>
+			<damageDef>XCOM_Plasma</damageDef>
+			<damageAmountBase>8</damageAmountBase>
+			<explosionRadius>0.5</explosionRadius>
+			<armorPenetrationSharp>15</armorPenetrationSharp>
+			<armorPenetrationBlunt>14.22</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>4</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<!-- XCOM Beam Pistol and autopistol-->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_XCOM_Gun_BeamPistol</defName>
+		<label>light plasma</label>
+		<ammoTypes>
+			<Ammo_XCOM_PlasmaCellPistolStandard>XCOM_Bullet_Beam_PistolCE</Ammo_XCOM_PlasmaCellPistolStandard>
+			<Ammo_XCOM_PlasmaCellPistolLight>XCOM_Bullet_Beam_PistolCELight</Ammo_XCOM_PlasmaCellPistolLight>
+			<Ammo_XCOM_PlasmaCellPistolDense>XCOM_Bullet_Beam_PistolCEDense</Ammo_XCOM_PlasmaCellPistolDense>
+			<Ammo_XCOM_PlasmaCellPistolUnstable>XCOM_Bullet_Beam_PistolCEUnstable</Ammo_XCOM_PlasmaCellPistolUnstable>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletGreen">
+		<defName>XCOM_Bullet_Beam_PistolCE</defName>
+		<label>plasma beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>XCOM_Plasma</damageDef>
+			<damageAmountBase>7</damageAmountBase>
+			<armorPenetrationSharp>17.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>25.67</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>6</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletBlue">
+		<defName>XCOM_Bullet_Beam_PistolCELight</defName>
+		<label>plasma beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>XCOM_Plasma</damageDef>
+			<damageAmountBase>10</damageAmountBase>
+			<armorPenetrationSharp>8.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>25.67</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>8</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletYellow">
+		<defName>XCOM_Bullet_Beam_PistolCEDense</defName>
+		<label>plasma beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>XCOM_Plasma</damageDef>
+			<damageAmountBase>5</damageAmountBase>
+			<armorPenetrationSharp>25.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>25.67</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>3</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletRed">
+		<defName>XCOM_Bullet_Beam_PistolCEUnstable</defName>
+		<label>plasma beam</label>
+		<canExplode>true</canExplode>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>XCOM_Plasma</damageDef>
+			<explosionRadius>0.5</explosionRadius>
+			<damageAmountBase>7</damageAmountBase>
+			<armorPenetrationSharp>17.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>25.67</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>6</amount>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla XCOM Plasma Weapons/Patches/Vanilla XCOM Plasma Weapons/Weapon_Ranged.xml b/ModPatches/Vanilla XCOM Plasma Weapons/Patches/Vanilla XCOM Plasma Weapons/Weapon_Ranged.xml
new file mode 100644
index 0000000000..28e18633ae
--- /dev/null
+++ b/ModPatches/Vanilla XCOM Plasma Weapons/Patches/Vanilla XCOM Plasma Weapons/Weapon_Ranged.xml	
@@ -0,0 +1,513 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<!-- Sleek, advanced, but still energy weapon thus heavier mass but less bulk -->
+
+		<xpath>
+			Defs/ThingDef[
+			defName="XCOM_Gun_BeamRifle" or
+			defName="XCOM_Gun_BeamSniperRifle" or
+			defName="XCOM_Gun_BeamShotgun" or
+			defName="XCOM_Gun_BeamCannon" or
+			defName="XCOM_Gun_BeamVektor" or
+			defName="XCOM_Gun_BeamBullpup" or
+			defName="XCOM_Gun_BeamHeavyAutocannon"
+			]/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="XCOM_Gun_BeamPistol" or defName="XCOM_Gun_BeamAutopistol"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- XCOM Plasma Rifle -->
+	<!-- peeeeeew~-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_Gun_BeamRifle</defName>
+		<statBases>
+			<Mass>4.5</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>9.2</Bulk>
+			<WorkToMake>60000</WorkToMake>
+		</statBases>
+		<costList>
+			<Plasteel>60</Plasteel>
+			<ComponentSpacer>4</ComponentSpacer>
+			<Uranium>20</Uranium>
+		</costList>
+		<Properties>
+			<hasStandardCommand>true</hasStandardCommand>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<recoilAmount>0</recoilAmount>
+			<soundAiming>Beam_WarmupRifle</soundAiming>
+			<defaultProjectile>XCOM_Bullet_BeamRifleCE</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<soundCast>Beam_Rifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>36</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_XCOM_Gun_BeamRifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AR</li>
+		</weaponTags>
+		<researchPrerequisite>XCOM_BeamWeapons</researchPrerequisite>
+	</Operation>
+
+	<!-- XCOM Plasma Lance -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_Gun_BeamSniperRifle</defName>
+		<statBases>
+			<Mass>11</Mass>
+			<RangedWeapon_Cooldown>1.55</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.6</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.35</SwayFactor>
+			<Bulk>10.88</Bulk>
+			<WorkToMake>75000</WorkToMake>
+		</statBases>
+		<costList>
+			<Plasteel>100</Plasteel>
+			<ComponentSpacer>8</ComponentSpacer>
+			<Uranium>30</Uranium>
+		</costList>
+		<Properties>
+			<hasStandardCommand>true</hasStandardCommand>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<recoilAmount>0</recoilAmount>
+			<soundAiming>Beam_WarmupSniperRifle</soundAiming>
+			<defaultProjectile>XCOM_Bullet_BeamSniperRifleCE</defaultProjectile>
+			<warmupTime>2</warmupTime>
+			<range>76</range>
+			<soundCast>Beam_SniperRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_XCOM_Gun_BeamSniperRifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_SR</li>
+			<li>Bipod_DMR</li>
+		</weaponTags>
+		<researchPrerequisite>XCOM_BeamWeapons</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- XCOM Storm Gun -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_Gun_BeamShotgun</defName>
+		<statBases>
+			<Mass>4.5</Mass>
+			<RangedWeapon_Cooldown>1.00</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.97</SwayFactor>
+			<Bulk>5</Bulk>
+			<WorkToMake>50000</WorkToMake>
+		</statBases>
+		<costList>
+			<Plasteel>50</Plasteel>
+			<ComponentSpacer>4</ComponentSpacer>
+			<Uranium>25</Uranium>
+		</costList>
+		<Properties>
+			<hasStandardCommand>true</hasStandardCommand>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<recoilAmount>0</recoilAmount>
+			<soundAiming>Beam_WarmupShotgun</soundAiming>
+			<defaultProjectile>XCOM_Bullet_BeamShotgunCE</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>20</range>
+			<soundCast>Beam_Shotgun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_XCOM_Gun_BeamShotgun</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+		<researchPrerequisite>XCOM_BeamWeapons</researchPrerequisite>
+	</Operation>
+
+	<!-- XCOM Beam Cannon -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_Gun_BeamCannon</defName>
+		<statBases>
+			<Mass>20.5</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>3.22</SwayFactor>
+			<Bulk>12.5</Bulk>
+			<WorkToMake>100000</WorkToMake>
+		</statBases>
+		<costList>
+			<Plasteel>150</Plasteel>
+			<ComponentSpacer>10</ComponentSpacer>
+			<Uranium>40</Uranium>
+		</costList>
+		<Properties>
+			<recoilAmount>0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>XCOM_Bullet_BeamRifleCE</defaultProjectile>
+			<soundAiming>Beam_WarmupCannon</soundAiming>
+			<warmupTime>2.5</warmupTime>
+			<burstShotCount>30</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<range>62</range>
+			<soundCast>Beam_Cannon</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>90</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_XCOM_Gun_BeamRifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Suppressive</li>
+			<li>Bipod_LMG</li>
+		</weaponTags>
+		<researchPrerequisite>XCOM_BeamWeapons</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- XCOM Beam Pistol -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_Gun_BeamPistol</defName>
+		<statBases>
+			<Mass>2.2</Mass>
+			<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.4</SwayFactor>
+			<Bulk>2</Bulk>
+			<WorkToMake>42000</WorkToMake>
+		</statBases>
+		<costList>
+			<Plasteel>40</Plasteel>
+			<ComponentSpacer>2</ComponentSpacer>
+			<Uranium>10</Uranium>
+		</costList>
+		<Properties>
+			<recoilAmount>3.55</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<soundAiming>Beam_WarmupPistol</soundAiming>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>XCOM_Bullet_Beam_PistolCE</defaultProjectile>
+			<warmupTime>0.8</warmupTime>
+			<range>18</range>
+			<soundCast>Beam_Pistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_XCOM_Gun_BeamPistol</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_BROOM</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+		<researchPrerequisite>XCOM_BeamWeapons</researchPrerequisite>
+	</Operation>
+
+	<!-- XCOM Beam Autopistol -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_Gun_BeamAutopistol</defName>
+		<statBases>
+			<Mass>3</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.93</SwayFactor>
+			<Bulk>2.5</Bulk>
+			<WorkToMake>45000</WorkToMake>
+		</statBases>
+		<costList>
+			<Plasteel>50</Plasteel>
+			<ComponentSpacer>2</ComponentSpacer>
+			<Uranium>15</Uranium>
+		</costList>
+		<Properties>
+			<recoilAmount>1.81</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<soundAiming>Beam_WarmupAutopistol</soundAiming>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>XCOM_Bullet_Beam_PistolCE</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>15</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>Beam_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>24</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_XCOM_Gun_BeamPistol</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_BROOM</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+		<researchPrerequisite>XCOM_BeamWeapons</researchPrerequisite>
+	</Operation>
+
+	<!-- XCOM Beam Vektor -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_Gun_BeamVektor</defName>
+		<statBases>
+			<WorkToMake>70000</WorkToMake>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.70</SwayFactor>
+			<Bulk>10.25</Bulk>
+			<Mass>5.9</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Plasteel>80</Plasteel>
+			<ComponentSpacer>6</ComponentSpacer>
+			<Uranium>20</Uranium>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<soundAiming>Beam_WarmupRifle</soundAiming>
+			<recoilAmount>0</recoilAmount>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>XCOM_Bullet_BeamRifleCE</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>75</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<soundCast>Beam_Vektor</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>18</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_XCOM_Gun_BeamRifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>SniperRifle</li>
+			<li>CE_AI_SR</li>
+			<li>Bipod_DMR</li>
+		</weaponTags>
+		<researchPrerequisite>XCOM_BeamWeapons</researchPrerequisite>
+	</Operation>
+
+	<!-- XCOM Beam Bullpup -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_Gun_BeamBullpup</defName>
+		<statBases>
+			<WorkToMake>55000</WorkToMake>
+			<Mass>5.4</Mass>
+			<Bulk>6.30</Bulk>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>1.55</SwayFactor>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Plasteel>80</Plasteel>
+			<ComponentSpacer>4</ComponentSpacer>
+			<Uranium>25</Uranium>
+		</costList>
+		<Properties>
+			<hasStandardCommand>true</hasStandardCommand>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<recoilAmount>0</recoilAmount>
+			<soundAiming>Beam_WarmupRifle</soundAiming>
+			<defaultProjectile>XCOM_Bullet_BeamRifleCE</defaultProjectile>
+			<warmupTime>0.9</warmupTime>
+			<range>55</range>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<soundCast>Beam_Rifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_XCOM_Gun_BeamRifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+		<researchPrerequisite>XCOM_BeamWeapons</researchPrerequisite>
+	</Operation>
+
+	<!-- SPARK Elerium Phase-Cannon -->
+	<!-- An even more fancy "autocannon"-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_Gun_BeamHeavyAutocannon</defName>
+		<statBases>
+			<WorkToMake>125000</WorkToMake>
+			<SightsEfficiency>1.2</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.7</SwayFactor>
+			<Bulk>13.90</Bulk>
+			<Mass>15.30</Mass>
+			<RangedWeapon_Cooldown>0.47</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Plasteel>180</Plasteel>
+			<ComponentSpacer>12</ComponentSpacer>
+			<Uranium>50</Uranium>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<soundAiming>Beam_WarmupAutocannon</soundAiming>
+			<recoilAmount>1</recoilAmount>
+			<defaultProjectile>XCOM_Bullet_BeamSniperRifleCE</defaultProjectile>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<warmupTime>1.4</warmupTime>
+			<range>55</range>
+			<soundCast>Beam_HeavyAutocannon</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_XCOM_Gun_BeamSniperRifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>Bipod_LMG</li>
+		</weaponTags>
+		<researchPrerequisite>XCOM_BeamWeapons</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vanilla XCOM Weapons/Defs/Vanilla XCOM Weapons/ArcThrowerProjectile.xml b/ModPatches/Vanilla XCOM Weapons/Defs/Vanilla XCOM Weapons/ArcThrowerProjectile.xml
new file mode 100644
index 0000000000..268b4c697a
--- /dev/null
+++ b/ModPatches/Vanilla XCOM Weapons/Defs/Vanilla XCOM Weapons/ArcThrowerProjectile.xml	
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingDef ParentName="Base50BMGBullet">
+		<defName>XCOM_Bullet_ArcThrowerCE</defName>
+		<label>arc thrower beam</label>
+		<graphicData>
+			<texPath>Things/Projectile/ChargeLanceShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>EMP</damageDef>
+			<damageAmountBase>20</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>Stun</def>
+					<amount>100</amount>
+					<chance>0.9</chance>
+				</li>
+			</secondaryDamage>
+			<speed>100</speed>
+			<dropsCasings>false</dropsCasings>
+		</projectile>
+	</ThingDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla XCOM Weapons/Defs/Vanilla XCOM Weapons/BoltCasterAmmo.xml b/ModPatches/Vanilla XCOM Weapons/Defs/Vanilla XCOM Weapons/BoltCasterAmmo.xml
new file mode 100644
index 0000000000..7ed1ced207
--- /dev/null
+++ b/ModPatches/Vanilla XCOM Weapons/Defs/Vanilla XCOM Weapons/BoltCasterAmmo.xml	
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- Bolt Caster -->
+	<!-- whoo, 6-8 dmg and stun. 50cal then, gonna need a new ammo set for this.-->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_XCOMBoltCaster</defName>
+		<label>.50 BMG</label>
+		<ammoTypes>
+			<Ammo_50BMG_FMJ>Bullet_50BMG_FMJStun</Ammo_50BMG_FMJ>
+			<Ammo_50BMG_AP>Bullet_50BMG_APStun</Ammo_50BMG_AP>
+			<Ammo_50BMG_Incendiary>Bullet_50BMG_IncendiaryStun</Ammo_50BMG_Incendiary>
+			<Ammo_50BMG_HE>Bullet_50BMG_HEStun</Ammo_50BMG_HE>
+			<Ammo_50BMG_Sabot>Bullet_50BMG_SabotStun</Ammo_50BMG_Sabot>
+		</ammoTypes>
+		<similarTo>AmmoSet_AntiMateriel</similarTo>
+	</CombatExtended.AmmoSetDef>
+
+	<ThingDef ParentName="Base50BMGBullet">
+		<defName>Bullet_50BMG_FMJStun</defName>
+		<label>.50 BMG bullet (FMJ)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>30</damageAmountBase>
+			<armorPenetrationSharp>15.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>360.34</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Stun</def>
+					<amount>10</amount>
+					<chance>0.2</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base50BMGBullet">
+		<defName>Bullet_50BMG_APStun</defName>
+		<label>.50 BMG bullet (AP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>31</armorPenetrationSharp>
+			<armorPenetrationBlunt>360.34</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Stun</def>
+					<amount>10</amount>
+					<chance>0.2</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base50BMGBullet">
+		<defName>Bullet_50BMG_IncendiaryStun</defName>
+		<label>.50 BMG bullet (AP-I)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>31</armorPenetrationSharp>
+			<armorPenetrationBlunt>360.34</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Flame_Secondary</def>
+					<amount>12</amount>
+				</li>
+				<li>
+					<def>Stun</def>
+					<amount>10</amount>
+					<chance>0.2</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base50BMGBullet">
+		<defName>Bullet_50BMG_HEStun</defName>
+		<label>.50 BMG bullet (HE)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>30</damageAmountBase>
+			<armorPenetrationSharp>15.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>360.34</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>Bomb_Secondary</def>
+					<amount>20</amount>
+				</li>
+				<li>
+					<def>Stun</def>
+					<amount>10</amount>
+					<chance>0.2</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base50BMGBullet">
+		<defName>Bullet_50BMG_SabotStun</defName>
+		<label>.50 BMG bullet (Sabot)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>14</damageAmountBase>
+			<armorPenetrationSharp>54</armorPenetrationSharp>
+			<armorPenetrationBlunt>388.88</armorPenetrationBlunt>
+			<speed>244</speed>
+			<secondaryDamage>
+				<li>
+					<def>Stun</def>
+					<amount>10</amount>
+					<chance>0.2</chance>
+				</li>
+			</secondaryDamage>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Vanilla XCOM Weapons/Patches/Vanilla XCOM Weapons/Weapon_Ranged.xml b/ModPatches/Vanilla XCOM Weapons/Patches/Vanilla XCOM Weapons/Weapon_Ranged.xml
new file mode 100644
index 0000000000..d6a036a16b
--- /dev/null
+++ b/ModPatches/Vanilla XCOM Weapons/Patches/Vanilla XCOM Weapons/Weapon_Ranged.xml	
@@ -0,0 +1,783 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName="XCOM_Gun_CVRifle" or
+			defName="XCOM_Gun_CVSniperRifle" or
+			defName="XCOM_Gun_CVShotgun" or
+			defName="XCOM_Gun_CVCannon" or
+			defName="XCOM_Gun_CVGrenadeLauncher" or
+			defName="XCOM_Gun_CVVektorRifle" or
+			defName="XCOM_Gun_CVBullpup" or
+			defName="XCOM_Gun_CVHeavyAutocannon"
+			]/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="XCOM_Gun_CVPistol" or defName="XCOM_Gun_TemplarPistol" or defName="XCOM_Gun_ArcThrower"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[defName="XCOM_Gun_BoltCaster"]/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>
+				<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>22</power>
+					<cooldownTime>2.18</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.72</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- XCOM Conventional Rifle -->
+	<!--5 burst instead of 3 in vanilla, as for the better penetration, we have AP ammo already-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_Gun_CVRifle</defName>
+		<statBases>
+			<Mass>3.26</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>1.33</SwayFactor>
+			<Bulk>10.03</Bulk>
+			<WorkToMake>30000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>70</Steel>
+			<ComponentIndustrial>8</ComponentIndustrial>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>1.70</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<burstShotCount>8</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>CV_Rifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>32</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AR</li>
+		</weaponTags>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!-- XCOM Conventional Sniper Rifle -->
+	<!-- DMG and accuracy slightly better than vanilla SR which is full power...so magnum?-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_Gun_CVSniperRifle</defName>
+		<statBases>
+			<Mass>9.7</Mass>
+			<RangedWeapon_Cooldown>1.55</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.6</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.35</SwayFactor>
+			<Bulk>12.77</Bulk>
+			<WorkToMake>40000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>120</Steel>
+			<ComponentIndustrial>8</ComponentIndustrial>
+			<Chemfuel>15</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>3.2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
+			<warmupTime>2</warmupTime>
+			<range>65</range>
+			<soundCast>CV_SniperRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_338Lapua</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_SR</li>
+			<li>Bipod_DMR</li>
+		</weaponTags>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- XCOM Conventional Shotgun -->
+	<!-- so this one is very straight forward. a KSG, that's it. the vanilla stats are of negalible difference from vanilla pump action-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_Gun_CVShotgun</defName>
+		<statBases>
+			<Mass>3.10</Mass>
+			<RangedWeapon_Cooldown>1.00</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>0.97</SwayFactor>
+			<Bulk>6.60</Bulk>
+			<WorkToMake>18000</WorkToMake>
+		</statBases>
+		<costList>
+			<Chemfuel>25</Chemfuel>
+			<Steel>55</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>3.10</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>CV_Shotgun</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Regular</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_BROOM</li>
+		</weaponTags>
+		<researchPrerequisite>Gunsmithing</researchPrerequisite>
+	</Operation>
+
+	<!-- XCOM Conventional Cannon -->
+	<!-- bruh, cannon? the vanilla data suggests it deal less damage than minigun, but xcom stats say it hit as hard as sniper
+A magnum rifle with 20 burst and 60 round mag then-->
+
+	<!-- It says faster spin up and is three barreled, so I assume it's lighter than minigun despite firing magnum-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_Gun_CVCannon</defName>
+		<statBases>
+			<Mass>17.5</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.06</ShotSpread>
+			<SwayFactor>3.22</SwayFactor>
+			<Bulk>14.5</Bulk>
+			<WorkToMake>60000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>170</Steel>
+			<ComponentIndustrial>20</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.80</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
+			<warmupTime>1.6</warmupTime>
+			<burstShotCount>20</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<range>62</range>
+			<soundCast>CV_Cannon</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>60</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_338Lapua</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Suppressive</li>
+			<li>Bipod_LMG</li>
+		</weaponTags>
+		<researchPrerequisite>MultibarrelWeapons</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- XCOM Conventional Pistol -->
+	<!-- "Slightly more powerful" than out normal revolver which is .44magnum.... .500SW there you go-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_Gun_CVPistol</defName>
+		<statBases>
+			<Mass>1.88</Mass>
+			<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.4</SwayFactor>
+			<Bulk>2.9</Bulk>
+			<WorkToMake>8000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>40</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>3.55</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_500SWMagnum_FMJ</defaultProjectile>
+			<warmupTime>0.9</warmupTime>
+			<range>15</range>
+			<soundCast>CV_Pistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_500SWMagnum</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_Sidearm</li>
+			<li>CE_AI_BROOM</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+		<researchPrerequisite>Gunsmithing</researchPrerequisite>
+	</Operation>
+
+	<!-- XCOM Conventional Grenade Launcher -->
+	<!-- Copy-pasty, Milkor launchy-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_Gun_CVGrenadeLauncher</defName>
+		<statBases>
+			<WorkToMake>25500</WorkToMake>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>1.31</SwayFactor>
+			<Bulk>5.65</Bulk>
+			<Mass>6.3</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>80</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>2.93</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
+			<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+			<warmupTime>1</warmupTime>
+			<range>40</range>
+			<minRange>5</minRange>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<soundCast>CV_GrenadeLauncher</soundCast>
+			<muzzleFlashScale>14</muzzleFlashScale>
+			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>5.1</reloadTime>
+			<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>GunHeavy</li>
+			<li>CE_AI_AOE</li>
+		</weaponTags>
+		<researchPrerequisite>CE_Launchers</researchPrerequisite>
+	</Operation>
+
+	<!-- XCOM Conventional Autopistol -->
+	<!--MP7 or MAC-10 whatsoever...slightly more powerful than vanilla MP, 10mmAuto then-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_Gun_TemplarPistol</defName>
+		<statBases>
+			<Mass>3</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.93</SwayFactor>
+			<Bulk>3</Bulk>
+			<WorkToMake>28900</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>45</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.81</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_10mmAuto_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<soundCast>CV_TemplarPistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_10mmAuto</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_SMG</li>
+			<li>CE_AI_BROOM</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+		<researchPrerequisite>BlowbackOperation</researchPrerequisite>
+	</Operation>
+
+	<!-- XCOM Arc Thrower -->
+	<!-- Stun gun, how Imba-->
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="XCOM_Gun_ArcThrower"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>BaseGun</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="XCOM_Gun_ArcThrower"]/recipeMaker</xpath>
+		<value>
+			<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+			<workSkill>Crafting</workSkill>
+			<effectWorking>Smith</effectWorking>
+			<soundWorking>Recipe_Smith</soundWorking>
+			<recipeUsers>
+				<li>TableMachining</li>
+			</recipeUsers>
+			<unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
+			<researchPrerequisite>CE_AdvancedLaunchers</researchPrerequisite>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_Gun_ArcThrower</defName>
+		<statBases>
+			<Mass>2</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.9</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>0.93</SwayFactor>
+			<Bulk>2</Bulk>
+			<WorkToMake>32000</WorkToMake>
+		</statBases>
+		<costList>
+			<Plasteel>40</Plasteel>
+			<ComponentSpacer>1</ComponentSpacer>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>XCOM_Bullet_ArcThrowerCE</defaultProjectile>
+			<warmupTime>2</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_ChargeBlaster</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- XCOM Vektor Rifle -->
+	<!-- SVD. again, ctrl-cv-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_Gun_CVVektorRifle</defName>
+		<statBases>
+			<WorkToMake>23000</WorkToMake>
+			<SightsEfficiency>2.24</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.70</SwayFactor>
+			<Bulk>12.25</Bulk>
+			<Mass>4.30</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>60</Steel>
+			<ComponentIndustrial>4</ComponentIndustrial>
+			<WoodLog>10</WoodLog>
+		</costList>
+		<Properties>
+			<recoilAmount>1.94</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>75</range>
+			<soundCast>CV_VektorRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SniperRifle</li>
+			<li>CE_AI_SR</li>
+			<li>Bipod_DMR</li>
+		</weaponTags>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!-- Kal-7 Bullpup -->
+	<!-- Tavor? do we have any tavor mod around? So, does not end turn when firing? I assume that translate into faster warm up and cool down-->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_Gun_CVBullpup</defName>
+		<statBases>
+			<WorkToMake>37500</WorkToMake>
+			<Mass>4.10</Mass>
+			<Bulk>7.30</Bulk>
+			<ShotSpread>0.1</ShotSpread>
+			<SwayFactor>1.55</SwayFactor>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>45</Steel>
+			<Chemfuel>10</Chemfuel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<recoilAmount>2.11</recoilAmount>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<warmupTime>0.9</warmupTime>
+			<range>55</range>
+			<soundCast>CV_Bullpup</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+		</weaponTags>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<!-- SPARK Heavy Autocannon -->
+	<!-- Yet another handheld autocannon...but it looks more like a heavy battle rifle. 4-6 dmg? 338Lapua here you go.-->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_Gun_CVHeavyAutocannon</defName>
+		<statBases>
+			<WorkToMake>48000</WorkToMake>
+			<SightsEfficiency>1.2</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.7</SwayFactor>
+			<Bulk>13.90</Bulk>
+			<Mass>6.30</Mass>
+			<RangedWeapon_Cooldown>0.47</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>80</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<recoilAmount>3.2</recoilAmount>
+			<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<warmupTime>1.4</warmupTime>
+			<range>55</range>
+			<soundCast>CV_HeavyAutocannon</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_338Lapua</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Rifle</li>
+			<li>Bipod_LMG</li>
+		</weaponTags>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XCOM_Gun_BoltCaster</defName>
+		<statBases>
+			<Mass>12.5</Mass>
+			<RangedWeapon_Cooldown>1.55</RangedWeapon_Cooldown>
+			<SightsEfficiency>3.5</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>2.07</SwayFactor>
+			<Bulk>12.40</Bulk>
+			<Mass>14.50</Mass>
+		</statBases>
+		<costList>
+			<Steel>150</Steel>
+			<ComponentIndustrial>12</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>3</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_50BMG_FMJStun</defaultProjectile>
+			<warmupTime>3</warmupTime>
+			<range>62</range>
+			<soundCast>CV_SniperRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<AmmoGenPerMagOverride>5</AmmoGenPerMagOverride>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_XCOMBoltCaster</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>SniperRifle</li>
+			<li>Bipod_AMR</li>
+			<li>CE_AI_SR</li>
+		</weaponTags>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="XCOM_MeleeWeapon_ShardGauntlet"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.69</cooldownTime>
+					<chanceFactor>0.10</chanceFactor>
+					<armorPenetrationBlunt>0.80</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>1.17</cooldownTime>
+					<chanceFactor>0.66</chanceFactor>
+					<armorPenetrationBlunt>4.06</armorPenetrationBlunt>
+					<armorPenetrationSharp>25</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.05</cooldownTime>
+					<armorPenetrationBlunt>2.048</armorPenetrationBlunt>
+					<armorPenetrationSharp>25</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="XCOM_MeleeWeapon_ShardGauntlet"]/statBases</xpath>
+		<value>
+			<Bulk>2.5</Bulk>
+			<MeleeCounterParryBonus>0.9</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="XCOM_MeleeWeapon_ShardGauntlet"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.00</MeleeCritChance>
+				<MeleeParryChance>0</MeleeParryChance>
+				<MeleeDodgeChance>0.60</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vehicle Framework Expanded - Classic Mechs/Patches/Vehicle Framework Expanded - Classic Mechs/Mech_BattleCannon.xml b/ModPatches/Vehicle Framework Expanded - Classic Mechs/Patches/Vehicle Framework Expanded - Classic Mechs/Mech_BattleCannon.xml
new file mode 100644
index 0000000000..2cc539ae1c
--- /dev/null
+++ b/ModPatches/Vehicle Framework Expanded - Classic Mechs/Patches/Vehicle Framework Expanded - Classic Mechs/Mech_BattleCannon.xml	
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Main Guns -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_BattleCannon"]/projectile</xpath>
+		<value>
+			<projectile>Bullet_120mmCannonShell_HE</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_BattleCannon"]/reloadTimer</xpath>
+		<value>
+			<reloadTimer>9.6</reloadTimer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_BattleCannon"]/warmUpTimer</xpath>
+		<value>
+			<warmUpTimer>3</warmUpTimer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_BattleCannon"]/magazineCapacity</xpath>
+		<value>
+			<magazineCapacity>20</magazineCapacity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_BattleCannon"]/maxRange</xpath>
+		<value>
+			<maxRange>105</maxRange>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_BattleCannon"]</xpath>
+		<value>
+			<li Class="Vehicles.CETurretDataDefModExtension">
+				<ammoSet>AmmoSet_120mmCannonShell</ammoSet>
+				<shotHeight>5</shotHeight>
+				<speed>229</speed>
+				<sway>0.82</sway>
+				<spread>0.01</spread>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vehicle Framework Expanded - Classic Mechs/Patches/Vehicle Framework Expanded - Classic Mechs/Mech_GatlingCannon.xml b/ModPatches/Vehicle Framework Expanded - Classic Mechs/Patches/Vehicle Framework Expanded - Classic Mechs/Mech_GatlingCannon.xml
new file mode 100644
index 0000000000..edfc835c2f
--- /dev/null
+++ b/ModPatches/Vehicle Framework Expanded - Classic Mechs/Patches/Vehicle Framework Expanded - Classic Mechs/Mech_GatlingCannon.xml	
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Main Guns -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_GatlingCannon"]/projectile</xpath>
+		<value>
+			<projectile>Bullet_30x173mmNATO_AP</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_GatlingCannon"]/reloadTimer</xpath>
+		<value>
+			<reloadTimer>7.8</reloadTimer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_GatlingCannon"]/warmUpTimer</xpath>
+		<value>
+			<warmUpTimer>2.5</warmUpTimer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_GatlingCannon"]/magazineCapacity</xpath>
+		<value>
+			<magazineCapacity>80</magazineCapacity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_GatlingCannon"]/maxRange</xpath>
+		<value>
+			<maxRange>95</maxRange>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_GatlingCannon"]/fireModes</xpath>
+		<value>
+			<fireModes>
+				<li>
+					<shotsPerBurst>1</shotsPerBurst>
+					<ticksBetweenShots>6</ticksBetweenShots>
+					<ticksBetweenBursts>60</ticksBetweenBursts>
+					<label>Single</label>
+					<texPath>UI/Gizmos/FireRate_Single</texPath>
+				</li>
+				<li>
+					<shotsPerBurst>4</shotsPerBurst>
+					<ticksBetweenShots>6</ticksBetweenShots>
+					<ticksBetweenBursts>60</ticksBetweenBursts>
+					<label>Burst</label>
+					<texPath>UI/Gizmos/FireRate_Burst</texPath>
+				</li>
+				<li>
+					<shotsPerBurst>8</shotsPerBurst>
+					<ticksBetweenShots>6</ticksBetweenShots>
+					<ticksBetweenBursts>60</ticksBetweenBursts>
+					<label>Auto</label>
+					<texPath>UI/Gizmos/FireRate_Auto</texPath>
+				</li>
+			</fireModes>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_GatlingCannon"]</xpath>
+		<value>
+			<li Class="Vehicles.CETurretDataDefModExtension">
+				<ammoSet>AmmoSet_30x173mmNATO</ammoSet>
+				<shotHeight>5</shotHeight>
+				<speed>181</speed>
+				<sway>0.9</sway>
+				<spread>0.08</spread>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vehicle Framework Expanded - Classic Mechs/Patches/Vehicle Framework Expanded - Classic Mechs/Mech_MachineGun.xml b/ModPatches/Vehicle Framework Expanded - Classic Mechs/Patches/Vehicle Framework Expanded - Classic Mechs/Mech_MachineGun.xml
new file mode 100644
index 0000000000..50e91e2ee0
--- /dev/null
+++ b/ModPatches/Vehicle Framework Expanded - Classic Mechs/Patches/Vehicle Framework Expanded - Classic Mechs/Mech_MachineGun.xml	
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- HMG Sub-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MachineGun"]/projectile</xpath>
+		<value>
+			<projectile>Bullet_50BMG_FMJ</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MachineGun"]/reloadTimer</xpath>
+		<value>
+			<reloadTimer>3</reloadTimer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MachineGun"]/warmUpTimer</xpath>
+		<value>
+			<warmUpTimer>1</warmUpTimer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MachineGun"]/magazineCapacity</xpath>
+		<value>
+			<magazineCapacity>200</magazineCapacity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MachineGun"]/maxRange</xpath>
+		<value>
+			<maxRange>80</maxRange>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MachineGun"]/ammunition/thingDefs</xpath>
+		<value>
+			<thingDefs>
+				<li>Ammo_50BMG_FMJ</li>
+				<li>Ammo_50BMG_AP</li>
+				<li>Ammo_50BMG_Incendiary</li>
+				<li>Ammo_50BMG_HE</li>
+				<li>Ammo_50BMG_Sabot</li>
+			</thingDefs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MachineGun"]/fireModes</xpath>
+		<value>
+			<fireModes>
+				<li>
+					<shotsPerBurst>1</shotsPerBurst>
+					<ticksBetweenShots>6</ticksBetweenShots>
+					<ticksBetweenBursts>60</ticksBetweenBursts>
+					<label>Single</label>
+					<texPath>UI/Gizmos/FireRate_Single</texPath>
+				</li>
+				<li>
+					<shotsPerBurst>5</shotsPerBurst>
+					<ticksBetweenShots>6</ticksBetweenShots>
+					<ticksBetweenBursts>60</ticksBetweenBursts>
+					<label>Burst</label>
+					<texPath>UI/Gizmos/FireRate_Burst</texPath>
+				</li>
+				<li>
+					<shotsPerBurst>10</shotsPerBurst>
+					<ticksBetweenShots>6</ticksBetweenShots>
+					<ticksBetweenBursts>60</ticksBetweenBursts>
+					<label>Auto</label>
+					<texPath>UI/Gizmos/FireRate_Auto</texPath>
+				</li>
+			</fireModes>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MachineGun"]</xpath>
+		<value>
+			<li Class="Vehicles.CETurretDataDefModExtension">
+				<ammoSet>AmmoSet_50BMG</ammoSet>
+				<shotHeight>2.5</shotHeight>
+				<speed>163</speed>
+				<sway>1.5</sway>
+				<spread>0.1</spread>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vehicle Framework Expanded - Classic Mechs/Patches/Vehicle Framework Expanded - Classic Mechs/Mech_MissileLauncher.xml b/ModPatches/Vehicle Framework Expanded - Classic Mechs/Patches/Vehicle Framework Expanded - Classic Mechs/Mech_MissileLauncher.xml
new file mode 100644
index 0000000000..2f85abcfc3
--- /dev/null
+++ b/ModPatches/Vehicle Framework Expanded - Classic Mechs/Patches/Vehicle Framework Expanded - Classic Mechs/Mech_MissileLauncher.xml	
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Missile Launcher -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MissileLauncher"]/projectile</xpath>
+		<value>
+			<projectile>Bullet_83mmSMAW_HEAT</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MissileLauncher"]/reloadTimer</xpath>
+		<value>
+			<reloadTimer>18.6</reloadTimer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MissileLauncher"]/warmUpTimer</xpath>
+		<value>
+			<warmUpTimer>3</warmUpTimer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MissileLauncher"]/magazineCapacity</xpath>
+		<value>
+			<magazineCapacity>16</magazineCapacity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MissileLauncher"]/maxRange</xpath>
+		<value>
+			<maxRange>75</maxRange>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MissileLauncher"]/fireModes</xpath>
+		<value>
+			<fireModes>
+				<li>
+					<shotsPerBurst>1</shotsPerBurst>
+					<ticksBetweenShots>6</ticksBetweenShots>
+					<ticksBetweenBursts>60</ticksBetweenBursts>
+					<label>Single</label>
+					<texPath>UI/Gizmos/FireRate_Single</texPath>
+				</li>
+				<li>
+					<shotsPerBurst>4</shotsPerBurst>
+					<ticksBetweenShots>12</ticksBetweenShots>
+					<ticksBetweenBursts>120</ticksBetweenBursts>
+					<label>Burst</label>
+					<texPath>UI/Gizmos/FireRate_Burst</texPath>
+				</li>
+			</fireModes>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MissileLauncher"]</xpath>
+		<value>
+			<li Class="Vehicles.CETurretDataDefModExtension">
+				<ammoSet>AmmoSet_83mmSMAW</ammoSet>
+				<shotHeight>3</shotHeight>
+				<speed>58</speed>
+				<sway>0.82</sway>
+				<spread>0.03</spread>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vehicle Framework Expanded - Classic Mechs/Patches/Vehicle Framework Expanded - Classic Mechs/Mech_VehiclePawn.xml b/ModPatches/Vehicle Framework Expanded - Classic Mechs/Patches/Vehicle Framework Expanded - Classic Mechs/Mech_VehiclePawn.xml
new file mode 100644
index 0000000000..c1fa3fc1d5
--- /dev/null
+++ b/ModPatches/Vehicle Framework Expanded - Classic Mechs/Patches/Vehicle Framework Expanded - Classic Mechs/Mech_VehiclePawn.xml	
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Main Vehicle -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[@Name="HighMacsBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[@Name="HighMacsBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[@Name="HighMacsBase"]/vehicleStats/CargoCapacity</xpath>
+		<value>
+			<CargoCapacity>2950</CargoCapacity>
+		</value>
+	</Operation>
+
+	<!-- Front Armor -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[@Name="HighMacsBase"]/components/li [key="FrontArmor"]/health</xpath>
+		<value>
+			<health>200</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[@Name="HighMacsBase"]/components/li [key="FrontArmor"]/armor</xpath>
+		<value>
+			<armor>
+				<ArmorRating_Blunt>80</ArmorRating_Blunt>
+				<ArmorRating_Sharp>40</ArmorRating_Sharp>
+			</armor>
+		</value>
+	</Operation>
+
+	<!-- Left Armor -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[@Name="HighMacsBase"]/components/li [key="LeftArmor"]/health</xpath>
+		<value>
+			<health>200</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[@Name="HighMacsBase"]/components/li [key="LeftArmor"]/armor</xpath>
+		<value>
+			<armor>
+				<ArmorRating_Blunt>64</ArmorRating_Blunt>
+				<ArmorRating_Sharp>32</ArmorRating_Sharp>
+			</armor>
+		</value>
+	</Operation>
+
+	<!-- Right Armor -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[@Name="HighMacsBase"]/components/li [key="RightArmor"]/health</xpath>
+		<value>
+			<health>150</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[@Name="HighMacsBase"]/components/li [key="RightArmor"]/armor</xpath>
+		<value>
+			<armor>
+				<ArmorRating_Blunt>64</ArmorRating_Blunt>
+				<ArmorRating_Sharp>32</ArmorRating_Sharp>
+			</armor>
+		</value>
+	</Operation>
+
+	<!-- Back Armor -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[@Name="HighMacsBase"]/components/li [key="BackArmor"]/health</xpath>
+		<value>
+			<health>150</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[@Name="HighMacsBase"]/components/li [key="BackArmor"]/armor</xpath>
+		<value>
+			<armor>
+				<ArmorRating_Blunt>52</ArmorRating_Blunt>
+				<ArmorRating_Sharp>24</ArmorRating_Sharp>
+			</armor>
+		</value>
+	</Operation>
+
+	<!-- Leg Armor -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleDef[@Name="HighMacsBase"]/components/li[key="FrontLeftLeg" or key="FrontRightLeg"]/health</xpath>
+		<value>
+			<health>150</health>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/Vehicles.VehicleDef[@Name="HighMacsBase"]/components/li[key="FrontLeftLeg" or key="FrontRightLeg"]</xpath>
+		<value>
+			<armor>
+				<ArmorRating_Sharp>15</ArmorRating_Sharp>
+				<ArmorRating_Blunt>12</ArmorRating_Blunt>
+			</armor>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vulpine Pack/Patches/Vulpine Pack/PawnKinds_FenX.xml b/ModPatches/Vulpine Pack/Patches/Vulpine Pack/PawnKinds_FenX.xml
new file mode 100644
index 0000000000..6108e9a66a
--- /dev/null
+++ b/ModPatches/Vulpine Pack/Patches/Vulpine Pack/PawnKinds_FenX.xml	
@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Scoot ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FennexColonist"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FennexKeeper"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FennexTrader"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FennexSlave"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FennexRefugee"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FennexSecurityGuard"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FennexSoldier"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>7</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FennexStalker"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FennexAgent"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FennexAssassin"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vulpine Pack/Patches/Vulpine Pack/PawnKinds_Frij.xml b/ModPatches/Vulpine Pack/Patches/Vulpine Pack/PawnKinds_Frij.xml
new file mode 100644
index 0000000000..768c7b53e8
--- /dev/null
+++ b/ModPatches/Vulpine Pack/Patches/Vulpine Pack/PawnKinds_Frij.xml	
@@ -0,0 +1,325 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Scoot ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FrijjidColonist"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FrijjidKeeper"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FrijjidTrader"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FrijjidSlave"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FrijjidRefugee"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FrijjidSecurityGuard"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FrijjidSoldier"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FrijjidStalker"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FrijjidAgent"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="FrijjidAssassin"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vulpine Pack/Patches/Vulpine Pack/Race_Fenx.xml b/ModPatches/Vulpine Pack/Patches/Vulpine Pack/Race_Fenx.xml
new file mode 100644
index 0000000000..1230b1861c
--- /dev/null
+++ b/ModPatches/Vulpine Pack/Patches/Vulpine Pack/Race_Fenx.xml	
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Found Fenni ========== -->
+
+	<!-- ========== Turn our dog boys into dog *boys* ========== -->
+	<!-- ========== To be human is to be a tall brick ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<!-- === Note to future furball compatibility nerds: 		=== -->
+		<!-- === Paste the defName of your horrible alien there   |	=== -->
+		<!-- === 												  V	=== -->
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Fennex"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Gives Gun Gizmos to Fennex HUD thing ========== -->
+	<!-- ========== Also Makes Em Suppressable		   ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<!-- === Shouldn't need to change this at all		  === -->
+		<!-- === Unless you changed the name of your BasePawn === -->
+		<!-- === In which case change "BasePawn" to that name === -->
+		<xpath>Defs/ThingDef[@Name="BaseFnnxPawn"]</xpath>
+		<value>
+			<comps>
+				<li>
+					<compClass>CombatExtended.CompPawnGizmo</compClass>
+				</li>
+				<li Class="CombatExtended.CompProperties_Suppressable"/>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- === Patch Fennex default melee attacks === -->
+	<!-- === For the most part, it adds the CE melee handler thing 	=== -->
+	<!-- === And also defines armor penetration, which allows them	=== -->
+	<!-- === to actually do damage. Try attacking a raccoon with an === -->
+	<!-- === unpatched melee attack. I'll wait.						=== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Fennex"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1</AimingAccuracy>
+			<MeleeDodgeChance>1.6</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>0.75</MeleeParryChance>
+			<ReloadSpeed>1</ReloadSpeed>
+			<Suppressability>1</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Fennex"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.10</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.10</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.16</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.16</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- === BaseBodySize, ArmorRatings, MoveSpeed, and BaseHealth should already be set. I think. === -->
+	<!-- ===================================== -->
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Vulpine Pack/Patches/Vulpine Pack/Race_Frij.xml b/ModPatches/Vulpine Pack/Patches/Vulpine Pack/Race_Frij.xml
new file mode 100644
index 0000000000..716381d502
--- /dev/null
+++ b/ModPatches/Vulpine Pack/Patches/Vulpine Pack/Race_Frij.xml	
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Found Fenni ========== -->
+
+	<!-- ========== Turn our dog boys into dog *boys* ========== -->
+	<!-- ========== To be human is to be a tall brick ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<!-- === Note to future furball compatibility nerds: 		=== -->
+		<!-- === Paste the defName of your horrible alien there   |	=== -->
+		<!-- === 												  V	=== -->
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Frijjid"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Gives Gun Gizmos to Fennex HUD thing ========== -->
+	<!-- ========== Also Makes Em Suppressable		   ========== -->
+	<Operation Class="PatchOperationAdd">
+		<!-- === Shouldn't need to change this at all		  === -->
+		<!-- === Unless you changed the name of your BasePawn === -->
+		<!-- === In which case change "BasePawn" to that name === -->
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Frijjid"]</xpath>
+		<value>
+			<comps>
+				<li>
+					<compClass>CombatExtended.CompPawnGizmo</compClass>
+				</li>
+				<li Class="CombatExtended.CompProperties_Suppressable"/>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- === Patch Fennex default melee attacks === -->
+	<!-- === For the most part, it adds the CE melee handler thing 	=== -->
+	<!-- === And also defines armor penetration, which allows them	=== -->
+	<!-- === to actually do damage. Try attacking a raccoon with an === -->
+	<!-- === unpatched melee attack. I'll wait.						=== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Frijjid"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1</AimingAccuracy>
+			<MeleeDodgeChance>1.6</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>0.75</MeleeParryChance>
+			<ReloadSpeed>1</ReloadSpeed>
+			<Suppressability>1</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Frijjid"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>0.8</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.923</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- === BaseBodySize, ArmorRatings, MoveSpeed, and BaseHealth should already be set. I think. === -->
+	<!-- ===================================== -->
+	<!-- === Adds In Inspector Tabs 	   === -->
+	<!-- === Inventory and all that jazz   === -->
+	<!-- === Again, no need to change 'em  === -->
+	<!-- === Unless you changed it         === -->
+	<!-- === then change 'em			   === -->
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/WWII German Uniforms/Patches/WWII German Uniforms/Apparel_GermanUniforms.xml b/ModPatches/WWII German Uniforms/Patches/WWII German Uniforms/Apparel_GermanUniforms.xml
new file mode 100644
index 0000000000..fec5ea001d
--- /dev/null
+++ b/ModPatches/WWII German Uniforms/Patches/WWII German Uniforms/Apparel_GermanUniforms.xml	
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Harnesses, Belts, Accessories -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparel_3RHarnessA" or
+			defName = "Apparel_3RHarnessRif" or
+			defName = "Apparel_3ROfficerbelt" or
+			defName = "Apparel_3RFeldgendararmerieGorget" or
+			defName = "Apparel_3RHarnessFal"
+			]/equippedStatOffsets </xpath>
+		<value>
+			<CarryWeight>10</CarryWeight>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparel_3RHarnessA" or
+			defName = "Apparel_3RHarnessRif" or
+			defName = "Apparel_3ROfficerbelt" or
+			defName = "Apparel_3RFeldgendararmerieGorget" or
+			defName = "Apparel_3RHarnessFal"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparel_3RHarnessA" or
+			defName = "Apparel_3RHarnessRif" or
+			defName = "Apparel_3ROfficerbelt" or
+			defName = "Apparel_3RFeldgendararmerieGorget" or
+			defName = "Apparel_3RHarnessFal"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>0.08</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Hats -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparel_3RM40Inf" or
+			defName = "Apparel_3RM43Inf" or
+			defName = "Apparel_3ROfficerCapInf" or
+			defName = "Apparel_3RFieldMarshalCap"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>0.03</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparel_3RM40Inf" or
+			defName = "Apparel_3RM43Inf" or
+			defName = "Apparel_3ROfficerCapInf" or
+			defName = "Apparel_3RFieldMarshalCap"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>0.05</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Helmets -->
+
+	<!-- Bulk -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparel_3RStahlhelmM42Inf" or
+			defName = "Apparel_3RStahlhelmM42InfStraps" or
+			defName = "Apparel_3RStahlhelmM42InfSniper" or
+			defName = "Apparel_3RStahlhelmM42coverSplinter" or
+			defName = "Apparel_3RStahlhelmM42Gogg" or
+			defName = "Apparel_3RStahlhelmM42Winter" or
+			defName = "Apparel_3RM38Fal" or
+			defName = "Apparel_3RM38FalCam" or
+			defName = "Apparel_3RM38FalWinter"
+			]/statBases </xpath>
+		<value>
+			<Bulk>4</Bulk>
+		</value>
+	</Operation>
+
+	<!-- M42 Helmet -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparel_3RStahlhelmM42Inf" or
+			defName = "Apparel_3RStahlhelmM42InfStraps" or
+			defName = "Apparel_3RStahlhelmM42InfSniper" or
+			defName = "Apparel_3RStahlhelmM42coverSplinter" or
+			defName = "Apparel_3RStahlhelmM42Gogg" or
+			defName = "Apparel_3RStahlhelmM42Winter"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>1.8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparel_3RStahlhelmM42Inf" or
+			defName = "Apparel_3RStahlhelmM42InfStraps" or
+			defName = "Apparel_3RStahlhelmM42InfSniper" or
+			defName = "Apparel_3RStahlhelmM42coverSplinter" or
+			defName = "Apparel_3RStahlhelmM42Gogg" or
+			defName = "Apparel_3RStahlhelmM42Winter"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>2.7</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- M38 Helmet -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparel_3RM38Fal" or
+			defName = "Apparel_3RM38FalCam" or
+			defName = "Apparel_3RM38FalWinter"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparel_3RM38Fal" or
+			defName = "Apparel_3RM38FalCam" or
+			defName = "Apparel_3RM38FalWinter"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>2.25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Uniforms -->
+
+	<!-- Fatigues -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparel_3RInfUniform" or
+			defName = "Apparel_3RInfSplitUniform" or
+			defName = "Apparel_3RInfOfficerUniform" or
+			defName = "Apparel_3RFalUniform" or
+			defName = "Apparel_3RFieldMarshal"]/statBases </xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<WornBulk>2.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparel_3RInfUniform" or
+			defName = "Apparel_3RInfSplitUniform" or
+			defName = "Apparel_3RInfOfficerUniform" or
+			defName = "Apparel_3RFalUniform" or
+			defName = "Apparel_3RFieldMarshal"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>0.15</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparel_3RInfUniform" or
+			defName = "Apparel_3RInfSplitUniform" or
+			defName = "Apparel_3RInfOfficerUniform" or
+			defName = "Apparel_3RFalUniform" or
+			defName = "Apparel_3RFieldMarshal"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>0.2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Coats -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparel_3RNaziTrenchCoat" or defName = "Apparel_3RNaziCoat"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparel_3RNaziTrenchCoat" or defName = "Apparel_3RNaziCoat"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparel_3RNaziTrenchCoat" or defName = "Apparel_3RNaziCoat"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.3</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Poncho -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Apparel_3RZelt"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>0.75</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparel_3RZelt"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.03</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Apparel_3RZelt"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/WWII Soviet Faction/Patches/WWII Soviet Faction/WWIISovietFaction_CE_Patch_Clothing.xml b/ModPatches/WWII Soviet Faction/Patches/WWII Soviet Faction/WWIISovietFaction_CE_Patch_Clothing.xml
new file mode 100644
index 0000000000..358214d505
--- /dev/null
+++ b/ModPatches/WWII Soviet Faction/Patches/WWII Soviet Faction/WWIISovietFaction_CE_Patch_Clothing.xml	
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== M73 Uniform ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_M73_Uniform"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_M73_Uniform"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_M73_Uniform"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ========== Harness ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_M73_Harness"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_M73_Harness"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>18</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_M73_Harness"]/apparel</xpath>
+		<value>
+			<apparel>
+				<bodyPartGroups>
+					<li>Shoulders</li>
+				</bodyPartGroups>
+				<layers>
+					<li>Webbing</li>
+				</layers>
+				<tags>
+					<li>WWII_Soviet_Harness</li>
+				</tags>
+				<wornGraphicPath>Things/Apparel/Belts/M73Harness</wornGraphicPath>
+			</apparel>
+		</value>
+	</Operation>
+
+	<!-- ========== M35 Uniform ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_M35_Uniform"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>4</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_M35_Uniform"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_M35_Uniform"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ========== Vest ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_SN-42Armor"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>5.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SN-42Armor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SN-42Armor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>3</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SN-42Armor"]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>Middle</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<!-- ========== Coat ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_SovietCoat"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<WornBulk>3</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SovietCoat"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SovietCoat"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/WWII Soviet Faction/Patches/WWII Soviet Faction/WWIISovietFaction_CE_Patch_Headgear.xml b/ModPatches/WWII Soviet Faction/Patches/WWII Soviet Faction/WWIISovietFaction_CE_Patch_Headgear.xml
new file mode 100644
index 0000000000..92ad49238c
--- /dev/null
+++ b/ModPatches/WWII Soviet Faction/Patches/WWII Soviet Faction/WWIISovietFaction_CE_Patch_Headgear.xml	
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== M73Cap =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_M73Cap"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>0.75</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_M73Cap"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_M73Cap"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.08</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_M73Cap"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>5</Steel>
+				<Cloth>40</Cloth>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_M73Cap"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>UpperHead</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Apparel_M73Cap"]/apparel/useDeflectMetalEffect</xpath>
+	</Operation>
+
+	<!-- ========== SSh40Helmet =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_SSh40Helmet"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SSh40Helmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SSh40Helmet"]/stuffCategories/li[.="Metallic"]</xpath>
+		<value>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Officer M35Cap =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_M35_Cap"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_M35_Cap"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_M35_Cap"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.08</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_M35_Cap"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>5</Steel>
+				<Cloth>60</Cloth>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_M35_Cap"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<bodyPartGroups>
+				<li>UpperHead</li>
+			</bodyPartGroups>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Apparel_M35_Cap"]/apparel/useDeflectMetalEffect</xpath>
+	</Operation>
+
+	<!-- ========== Ushanka =========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_Ushanka"]/statBases</xpath>
+		<value>
+			<Bulk>2.5</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Ushanka"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.06</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_Ushanka"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Apparel_Ushanka"]/apparel/useDeflectMetalEffect</xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/WWII Soviet Faction/Patches/WWII Soviet Faction/WWIISovietFaction_CE_Patch_PawnKindDefs.xml b/ModPatches/WWII Soviet Faction/Patches/WWII Soviet Faction/WWIISovietFaction_CE_Patch_PawnKindDefs.xml
new file mode 100644
index 0000000000..162d66dea2
--- /dev/null
+++ b/ModPatches/WWII Soviet Faction/Patches/WWII Soviet Faction/WWIISovietFaction_CE_Patch_PawnKindDefs.xml	
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Reduce meals and medicine carried by all pawns ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[@Name="WWII_SovietPawnKind_Base"]/invNutrition</xpath>
+		<value>
+			<invNutrition>1</invNutrition>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/PawnKindDef[@Name="WWII_SovietPawnKind_Base"]/inventoryOptions</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[
+			defName="WWII_Soviet_Grunt" or
+			defName="WWII_Soviet_Assault" or
+			defName="WWII_Soviet_Assault_TierII" or
+			defName="WWII_Soviet_Sniper" or
+			defName="WWII_Soviet_Sniper_TierII" or
+			defName="WWII_Soviet_Grenadier" or
+			defName="WWII_Soviet_Boss"
+			]/inventoryOptions/subOptionsChooseOne/li[thingDef="MedicineIndustrial"]/countRange </xpath>
+		<value>
+			<countRange>
+				<min>0</min>
+				<max>1</max>
+			</countRange>
+		</value>
+	</Operation>
+
+	<!-- ========== WWII Soviet Faction Grunts should always spawn with harnesses, to compensate for the added bulk of their primary weapon, ammo and kit ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="WWII_Soviet_Grunt"]/apparelRequired</xpath>
+		<value>
+			<li>Apparel_M73_Harness</li>
+		</value>
+	</Operation>
+
+	<!-- ========== WWII Soviet Faction Komandirs should always spawn with harnesses instead of smokepop belts, to compensate for the added bulk of their primary weapon, ammo and kit ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="WWII_Soviet_Boss"]/apparelRequired</xpath>
+		<value>
+			<apparelRequired>
+				<li>Apparel_SovietCoat</li>
+				<li>Apparel_SN-42Armor</li>
+				<li>Apparel_M35_Uniform</li>
+				<li>Apparel_Ushanka</li>
+				<li>Apparel_M73_Harness</li>
+			</apparelRequired>
+		</value>
+	</Operation>
+
+	<!-- ========== WWII Soviet Faction pawns should spawn with ammo appropriate to their primary weapon ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			defName="WWII_Soviet_Grunt" or
+			defName="WWII_Soviet_Assault" or
+			defName="WWII_Soviet_Assault_TierII" or
+			defName="WWII_Soviet_Sniper" or
+			defName="WWII_Soviet_Sniper_TierII" or
+			defName="WWII_Soviet_Grenadier" or
+			defName="WWII_Soviet_Stormtrooper" or
+			defName="WWII_Soviet_Boss" or
+			defName="WWII_Soviet_Trader"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>8</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/WWII Soviet Faction/Patches/WWII Soviet Faction/WWIISovietFaction_CE_Patch_RangedIndustrial.xml b/ModPatches/WWII Soviet Faction/Patches/WWII Soviet Faction/WWIISovietFaction_CE_Patch_RangedIndustrial.xml
new file mode 100644
index 0000000000..fc53efbcae
--- /dev/null
+++ b/ModPatches/WWII Soviet Faction/Patches/WWII Soviet Faction/WWIISovietFaction_CE_Patch_RangedIndustrial.xml	
@@ -0,0 +1,373 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Mosin ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_WWII_MosinNagant_Normal</defName>
+		<statBases>
+			<Mass>4.00</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>1.63</SwayFactor>
+			<Bulk>12.32</Bulk>
+			<WorkToMake>12000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>55</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- ========== Mosin Bayonet ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_WWII_MosinNagant_Bayonet</defName>
+		<statBases>
+			<Mass>4.10</Mass>
+			<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>2.07</SwayFactor>
+			<Bulk>12.32</Bulk>
+			<!-- Bulk reduced to non-bayonet version, assuming bayonet has negligible effect on overall bulk -->
+			<WorkToMake>14000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>70</Steel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_BoltActionRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4.3</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Gun_WWII_MosinNagant_Bayonet"]/weaponTags</xpath>
+		<value>
+			<li>NoSwitch</li>
+		</value>
+	</Operation>
+
+	<!-- ========== PPsh-41 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_WWII_PPShSMG</defName>
+		<statBases>
+			<Mass>3.63</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.12</ShotSpread>
+			<SwayFactor>1.21</SwayFactor>
+			<Bulk>9.43</Bulk>
+			<WorkToMake>27500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>50</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.22</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>23</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>Shot_HeavySMG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>71</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== DP-28 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_DP-28_LMG</defName>
+		<statBases>
+			<Mass>9.12</Mass>
+			<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.53</SwayFactor>
+			<Bulk>14.70</Bulk>
+			<WorkToMake>32000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>10</WoodLog>
+			<Steel>85</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<recoilAmount>1.32</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<range>62</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<soundCast>Shot_Minigun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>47</magazineSize>
+			<reloadTime>4.9</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Nagant Revolver ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_Nagant_Revolver</defName>
+		<statBases>
+			<Mass>0.8</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.17</ShotSpread>
+			<SwayFactor>1.05</SwayFactor>
+			<Bulk>2.35</Bulk>
+			<WorkToMake>4500</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>5</WoodLog>
+			<Steel>20</Steel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x38mmR_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Revolver</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>6</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_762x38mmR</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Svt-40 ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_WWII_Svt-40_Rifle</defName>
+		<statBases>
+			<Mass>3.85</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.00</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.61</SwayFactor>
+			<Bulk>12.26</Bulk>
+			<WorkToMake>19000</WorkToMake>
+		</statBases>
+		<costList>
+			<WoodLog>15</WoodLog>
+			<Steel>55</Steel>
+			<ComponentIndustrial>3</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<soundCast>Shot_HeavySMG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>7</muzzleFlashScale>
+		</Properties>
+
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+	<!-- == Shared patches for firearm melee tools == -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_WWII_MosinNagant_Bayonet"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>bayonet</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Gun_WWII_MosinNagant_Normal" or
+			defName="Gun_WWII_PPShSMG" or
+			defName="Gun_DP-28_LMG" or
+			defName="Gun_WWII_Svt-40_Rifle"
+			]/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_Nagant_Revolver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/WWII Soviet Faction/Patches/WWII Soviet Faction/WWIISovietFaction_CE_Patch_Turret.xml b/ModPatches/WWII Soviet Faction/Patches/WWII Soviet Faction/WWIISovietFaction_CE_Patch_Turret.xml
new file mode 100644
index 0000000000..405dec42f8
--- /dev/null
+++ b/ModPatches/WWII Soviet Faction/Patches/WWII Soviet Faction/WWIISovietFaction_CE_Patch_Turret.xml	
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== ZiS (76 mm divisional gun M1942) ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_TurretZis</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>2.64</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.3</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>0.81</SwayFactor>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x385mmRCannonShell_HE</defaultProjectile>
+			<warmupTime>4.3</warmupTime>
+			<range>86</range>
+			<minRange>16</minRange>
+			<soundCast>Shot_Revolver</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>13</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>9.8</reloadTime>
+			<ammoSet>AmmoSet_762x385mmRCannonShell</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_TurretZis"]/soundInteract</xpath>
+		<value>
+			<soundInteract>Artillery_ShellLoaded</soundInteract>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Turret_Zis"]/statBases</xpath>
+		<value>
+			<ShootingAccuracyTurret>1.0</ShootingAccuracyTurret>
+			<AimingAccuracy>1.0</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_Zis"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_Zis"]/fillPercent</xpath>
+		<value>
+			<!-- Needs to be at least 0.85 in order to shoot out from CE embrasures -->
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_Zis"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>400</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_Zis"]/statBases/WorkToBuild</xpath>
+		<value>
+			<WorkToBuild>94500</WorkToBuild>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_Zis"]/statBases/Mass</xpath>
+		<value>
+			<Mass>1116</Mass>
+			<Bulk>1000</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_Zis"]/costList</xpath>
+		<value>
+			<costList>
+				<Steel>535</Steel>
+				<ComponentIndustrial>5</ComponentIndustrial>
+			</costList>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Turret_Zis"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>86</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="Turret_Zis"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Wall Mounted Turrets/Patches/Wall Mounted Turrets/WallMountedTurrets_CE_AllTurrets.xml b/ModPatches/Wall Mounted Turrets/Patches/Wall Mounted Turrets/WallMountedTurrets_CE_AllTurrets.xml
new file mode 100644
index 0000000000..d140810625
--- /dev/null
+++ b/ModPatches/Wall Mounted Turrets/Patches/Wall Mounted Turrets/WallMountedTurrets_CE_AllTurrets.xml	
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== All turrets ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WallTurret" or defName="WallRocketTurret" or defName="WallTurretMiniGun" or defName="WallFlameTurret"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="WallRiotControlTurret"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="WallTurret" or defName="WallRocketTurret" or defName="WallTurretMiniGun" or defName="WallFlameTurret"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WallTurret" or defName="WallRocketTurret" or defName="WallTurretMiniGun" or defName="WallFlameTurret"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WallTurret" or defName="WallRocketTurret" or defName="WallTurretMiniGun" or defName="WallFlameTurret"]/statBases/Mass</xpath>
+		<value>
+			<Mass>15</Mass>
+		</value>
+	</Operation>
+
+	<!-- Add trade tags -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WallTurret" or defName="WallRocketTurret" or defName="WallTurretMiniGun" or defName="WallFlameTurret"]</xpath>
+		<value>
+			<tradeTags>
+				<li>CE_Turret</li>
+			</tradeTags>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Wall Mounted Turrets/Patches/Wall Mounted Turrets/WallMountedTurrets_CE_FlameTurret.xml b/ModPatches/Wall Mounted Turrets/Patches/Wall Mounted Turrets/WallMountedTurrets_CE_FlameTurret.xml
new file mode 100644
index 0000000000..e3ea521062
--- /dev/null
+++ b/ModPatches/Wall Mounted Turrets/Patches/Wall Mounted Turrets/WallMountedTurrets_CE_FlameTurret.xml	
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Wall Flame Turret ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WallFlameTurret"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>1.7</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WallFlameTurret"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.20</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WallFlameTurret"]/statBases/ShootingAccuracyTurret</xpath>
+		<value>
+			<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_WallTurretFlame</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>0.32</SwayFactor>
+			<Bulk>10.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Flamethrower_Napalm</defaultProjectile>
+			<warmupTime>2</warmupTime>
+			<range>10</range>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<burstShotCount>3</burstShotCount>
+			<soundCast>Shot_IncendiaryLauncher</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_Flamethrower</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Wall Mounted Turrets/Patches/Wall Mounted Turrets/WallMountedTurrets_CE_MiniGunTurret.xml b/ModPatches/Wall Mounted Turrets/Patches/Wall Mounted Turrets/WallMountedTurrets_CE_MiniGunTurret.xml
new file mode 100644
index 0000000000..9c9cd0056f
--- /dev/null
+++ b/ModPatches/Wall Mounted Turrets/Patches/Wall Mounted Turrets/WallMountedTurrets_CE_MiniGunTurret.xml	
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Wall MiniGun Turret ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WallTurretMiniGun"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.25</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WallTurretMiniGun"]/statBases/ShootingAccuracyTurret</xpath>
+		<value>
+			<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WallTurretMiniGun"]/researchPrerequisites</xpath>
+		<value>
+			<researchPrerequisites>
+				<li>GunTurrets</li>
+			</researchPrerequisites>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_WallTurretMiniGun</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>0.85</SwayFactor>
+			<Bulk>10.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.76</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>0.1</warmupTime>
+			<range>20</range>
+			<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
+			<burstShotCount>1</burstShotCount>
+			<soundCast>GunShotA</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>250</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Wall Mounted Turrets/Patches/Wall Mounted Turrets/WallMountedTurrets_CE_RocketTurret.xml b/ModPatches/Wall Mounted Turrets/Patches/Wall Mounted Turrets/WallMountedTurrets_CE_RocketTurret.xml
new file mode 100644
index 0000000000..b8c5eb3dc2
--- /dev/null
+++ b/ModPatches/Wall Mounted Turrets/Patches/Wall Mounted Turrets/WallMountedTurrets_CE_RocketTurret.xml	
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Wall Rocket Turret ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WallRocketTurret"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>3.8</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WallRocketTurret"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.25</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WallRocketTurret"]/statBases/ShootingAccuracyTurret</xpath>
+		<value>
+			<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WallRocketTurret"]/researchPrerequisites</xpath>
+		<value>
+			<researchPrerequisites>
+				<li>GunTurrets</li>
+			</researchPrerequisites>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_WallTurretRocket</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>3.5</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.03</ShotSpread>
+			<SwayFactor>0.32</SwayFactor>
+			<Bulk>10.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_20mmFliegerfaust_HE</defaultProjectile>
+			<warmupTime>2</warmupTime>
+			<minRange>3</minRange>
+			<range>25</range>
+			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+			<burstShotCount>2</burstShotCount>
+			<soundCast>Shot_Autocannon</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_20mmFliegerfaust</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Wall Mounted Turrets/Patches/Wall Mounted Turrets/WallMountedTurrets_CE_WallTurret.xml b/ModPatches/Wall Mounted Turrets/Patches/Wall Mounted Turrets/WallMountedTurrets_CE_WallTurret.xml
new file mode 100644
index 0000000000..7ac799020f
--- /dev/null
+++ b/ModPatches/Wall Mounted Turrets/Patches/Wall Mounted Turrets/WallMountedTurrets_CE_WallTurret.xml	
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Normal Wall Turret ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WallTurret"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>1.1</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WallTurret"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.25</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WallTurret"]/statBases/ShootingAccuracyTurret</xpath>
+		<value>
+			<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_WallTurret</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>0.82</SwayFactor>
+			<Bulk>10.00</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.76</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>0</warmupTime>
+			<range>14.9</range>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+			<burstShotCount>3</burstShotCount>
+			<soundCast>GunShotA</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.8</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>true</noSingleShot>
+		</FireModes>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/WarCasket Barbatos Gundam Addon/Patches/WarCasket Barbatos Gundam Addon/Apparel_Warcaskets.xml b/ModPatches/WarCasket Barbatos Gundam Addon/Patches/WarCasket Barbatos Gundam Addon/Apparel_Warcaskets.xml
new file mode 100644
index 0000000000..2cca1349fd
--- /dev/null
+++ b/ModPatches/WarCasket Barbatos Gundam Addon/Patches/WarCasket Barbatos Gundam Addon/Apparel_Warcaskets.xml	
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Remove Vanilla Carry Capacity ========== -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/VFEPirates.WarcasketDef[
+			defName="VFEP_Warcasket_Barbatos"
+			]/modExtensions/li/carryingCapacity </xpath>
+	</Operation>
+
+	<!-- ========== Barbatos (Aerial Warcasket) ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Barbatos"]/statBases</xpath>
+		<value>
+			<Bulk>250</Bulk>
+			<WornBulk>25</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Barbatos"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>28</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Barbatos"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>70</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Barbatos"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>250</CarryWeight>
+			<CarryBulk>200</CarryBulk>
+			<Suppressability>-100</Suppressability>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Barbatos"]/costList/Steel</xpath>
+		<value>
+			<Steel>290</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Barbatos"]/costList/ComponentIndustrial</xpath>
+		<value>
+			<ComponentIndustrial>16</ComponentIndustrial>
+		</value>
+	</Operation>
+
+	<!-- ========== Barbatos - Shoulders ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Barbatos"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Barbatos"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>28</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Barbatos"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>70</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Barbatos"]/costList/Steel</xpath>
+		<value>
+			<Steel>40</Steel>
+		</value>
+	</Operation>
+
+	<!-- === Barbatos Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Barbatos"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>8</WornBulk>
+			<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Barbatos"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Barbatos"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Barbatos"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Barbatos"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Barbatos"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>56</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Barbatos"]/costList/Steel</xpath>
+		<value>
+			<Steel>90</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Barbatos"]/costList/ComponentIndustrial</xpath>
+		<value>
+			<ComponentIndustrial>6</ComponentIndustrial>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/WarCasket Barbatos Gundam Addon/Patches/WarCasket Barbatos Gundam Addon/Melee_Warcaskets.xml b/ModPatches/WarCasket Barbatos Gundam Addon/Patches/WarCasket Barbatos Gundam Addon/Melee_Warcaskets.xml
new file mode 100644
index 0000000000..cd991ed641
--- /dev/null
+++ b/ModPatches/WarCasket Barbatos Gundam Addon/Patches/WarCasket Barbatos Gundam Addon/Melee_Warcaskets.xml	
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Barbatos Katana (Warcasket Broadsword) -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEP_WarcasketMeleeWeapon_GKatana"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>56</power>
+					<cooldownTime>2.4</cooldownTime>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>9</armorPenetrationBlunt>
+					<armorPenetrationSharp>6</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>68</power>
+					<cooldownTime>3.35</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>17</armorPenetrationBlunt>
+					<armorPenetrationSharp>4.8</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEP_WarcasketMeleeWeapon_GKatana"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.02</MeleeCritChance>
+				<MeleeParryChance>0.47</MeleeParryChance>
+				<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEP_WarcasketMeleeWeapon_GKatana"]/statBases</xpath>
+		<value>
+			<Bulk>14</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+			<ToughnessRating>10</ToughnessRating>
+		</value>
+	</Operation>
+
+	<!-- Barbatos' mace -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFEP_WarcasketMeleeWeapon_GMace"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>spikerod</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2.8</cooldownTime>
+					<armorPenetrationBlunt>16</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>4</cooldownTime>
+					<armorPenetrationBlunt>105</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEP_WarcasketMeleeWeapon_GMace"]/statBases</xpath>
+		<value>
+			<Bulk>20</Bulk>
+			<MeleeCounterParryBonus>1.28</MeleeCounterParryBonus>
+			<ToughnessRating>10</ToughnessRating>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="VFEP_WarcasketMeleeWeapon_GMace"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.5</MeleeCritChance>
+				<MeleeParryChance>0.06</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/WarCasket Barbatos Gundam Addon/Patches/WarCasket Barbatos Gundam Addon/Ranged_Warcaskets.xml b/ModPatches/WarCasket Barbatos Gundam Addon/Patches/WarCasket Barbatos Gundam Addon/Ranged_Warcaskets.xml
new file mode 100644
index 0000000000..e398fc6652
--- /dev/null
+++ b/ModPatches/WarCasket Barbatos Gundam Addon/Patches/WarCasket Barbatos Gundam Addon/Ranged_Warcaskets.xml	
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "VFEP_WarcasketGun_GSmoothboreGun"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>2.44</cooldownTime>
+					<armorPenetrationBlunt>16</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== warcasket "300mm" smoothbore gun (RPG-7) ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFEP_WarcasketGun_GSmoothboreGun</defName>
+		<statBases>
+			<Mass>40</Mass>
+			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.16</SightsEfficiency>
+			<ShotSpread>0.2</ShotSpread>
+			<SwayFactor>1.68</SwayFactor>
+			<Bulk>30.50</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_RPG7Grenade_HEAT</defaultProjectile>
+			<warmupTime>2.035</warmupTime>
+			<range>40</range>
+			<minRange>3</minRange>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<onlyManualCast>true</onlyManualCast>
+			<stopBurstWithoutLos>false</stopBurstWithoutLos>
+			<muzzleFlashScale>15</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>5.6</reloadTime>
+			<ammoSet>AmmoSet_RPG7Grenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<AllowWithRunAndGun>false</AllowWithRunAndGun>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/WarCasket Expanded/Patches/WarCasket Expanded/Apparel_Warcaskets.xml b/ModPatches/WarCasket Expanded/Patches/WarCasket Expanded/Apparel_Warcaskets.xml
new file mode 100644
index 0000000000..c15903a512
--- /dev/null
+++ b/ModPatches/WarCasket Expanded/Patches/WarCasket Expanded/Apparel_Warcaskets.xml	
@@ -0,0 +1,409 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Remove Vanilla Carry Capacity ========== -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/VFEPirates.WarcasketDef[
+			defName="Warcasket_Sentinel" or
+			defName="Warcasket_GuardianX" or
+			defName="Warcasket_Tyrant"
+			]/modExtensions/li/carryingCapacity </xpath>
+	</Operation>
+
+	<!-- ========== Sentinel Warcasket ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Sentinel"]/statBases</xpath>
+		<value>
+			<Bulk>218.75</Bulk>
+			<WornBulk>18.75</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Sentinel"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>21.83</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Sentinel"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>54.575</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Sentinel"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>225</CarryWeight>
+			<CarryBulk>175</CarryBulk>
+			<Suppressability>-100</Suppressability>
+		</value>
+	</Operation>
+
+	<!-- ========== Shoulders ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_Sentinel"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_Sentinel"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>21.83</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_Sentinel"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>54.575</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Sentinel"]/statBases</xpath>
+		<value>
+			<Bulk>12.5</Bulk>
+			<WornBulk>6.25</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Sentinel"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Sentinel"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Sentinel"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Sentinel"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>19.47</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Sentinel"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>43.8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- GuardianX Warcasket -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_GuardianX"]/statBases</xpath>
+		<value>
+			<Bulk>230</Bulk>
+			<WornBulk>25</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_GuardianX"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>28</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_GuardianX"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>112</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_GuardianX"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>225</CarryWeight>
+			<CarryBulk>175</CarryBulk>
+			<Suppressability>-100</Suppressability>
+		</value>
+	</Operation>
+
+	<!-- ========== Shoulders ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_GuardianX"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_GuardianX"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>28</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_GuardianX"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>112</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_GuardianX"]/statBases</xpath>
+		<value>
+			<Bulk>12.5</Bulk>
+			<WornBulk>6.25</WornBulk>
+			<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_GuardianX"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_GuardianX"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_GuardianX"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_GuardianX"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>30</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_GuardianX"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>120</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ========== Tyrant Warcasket ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Tyrant"]/statBases</xpath>
+		<value>
+			<Bulk>275</Bulk>
+			<WornBulk>35</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Tyrant"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Tyrant"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>48</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Tyrant"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>225</CarryWeight>
+			<CarryBulk>175</CarryBulk>
+			<Suppressability>-100</Suppressability>
+		</value>
+	</Operation>
+
+	<!-- ========== Shoulders ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_Tyrant"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_Tyrant"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_Tyrant"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>48</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_Tyrant"]/comps/li[@Class="CompProperties_Reloadable"]/ammoDef</xpath>
+		<value>
+			<ammoDef>Ammo_40x53mmGrenade_Smoke</ammoDef>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_Tyrant"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountPerCharge</xpath>
+		<value>
+			<ammoCountPerCharge>1</ammoCountPerCharge>
+		</value>
+	</Operation>
+
+	<!-- === Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Tyrant"]/statBases</xpath>
+		<value>
+			<Bulk>12.5</Bulk>
+			<WornBulk>6.25</WornBulk>
+			<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Tyrant"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Tyrant"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Tyrant"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Tyrant"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>22</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Tyrant"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>50</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Centurion Warcasket -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Centurion"]/statBases</xpath>
+		<value>
+			<Bulk>230</Bulk>
+			<WornBulk>25</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Centurion"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>28</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Centurion"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>112</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Centurion"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>225</CarryWeight>
+			<CarryBulk>175</CarryBulk>
+			<Suppressability>-100</Suppressability>
+		</value>
+	</Operation>
+
+	<!-- ========== Shoulders ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_Centurion"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_Centurion"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>28</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_Centurion"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>112</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Centurion"]/statBases</xpath>
+		<value>
+			<Bulk>12.5</Bulk>
+			<WornBulk>6.25</WornBulk>
+			<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Centurion"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Centurion"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Centurion"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Centurion"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>30</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Centurion"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>120</ArmorRating_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Warcasket Persona Weapons/Patches/Warcasket Persona Weapons/Weapons_Warcaskets.xml b/ModPatches/Warcasket Persona Weapons/Patches/Warcasket Persona Weapons/Weapons_Warcaskets.xml
new file mode 100644
index 0000000000..148b0e599c
--- /dev/null
+++ b/ModPatches/Warcasket Persona Weapons/Patches/Warcasket Persona Weapons/Weapons_Warcaskets.xml	
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Tool Capacity Def -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ToolCapacityDef[
+			defName="BifurcatorCleave" or
+			defName="CrustbreakerSmash"
+			]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.ModExtensionMeleeToolPenetration">
+				<canHitInternal>true</canHitInternal>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Kyokatana -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WP_Kyokatana"]/statBases</xpath>
+		<value>
+			<Bulk>35</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+			<ToughnessRating>24</ToughnessRating>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WP_Kyokatana"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeCritChance>0.02</MeleeCritChance>
+			<MeleeParryChance>0.47</MeleeParryChance>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WP_Kyokatana"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>46</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>9</armorPenetrationBlunt>
+					<armorPenetrationSharp>64</armorPenetrationSharp>
+					<extraMeleeDamages>
+						<li>
+							<def>WP_WhiteHotBurn</def>
+							<amount>10</amount>
+						</li>
+						<li>
+							<def>Flame</def>
+							<amount>10</amount>
+							<chance>0.15</chance>
+						</li>
+					</extraMeleeDamages>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>58</power>
+					<cooldownTime>2.6</cooldownTime>
+					<armorPenetrationBlunt>17</armorPenetrationBlunt>
+					<armorPenetrationSharp>48</armorPenetrationSharp>
+					<extraMeleeDamages>
+						<li>
+							<def>WP_WhiteHotBurn</def>
+							<amount>10</amount>
+						</li>
+						<li>
+							<def>Flame</def>
+							<amount>10</amount>
+							<chance>0.5</chance>
+						</li>
+					</extraMeleeDamages>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Bifurcator -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WP_Bifurcator"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>BifurcatorCleave</li>
+					</capacities>
+					<power>62</power>
+					<cooldownTime>5.73</cooldownTime>
+					<armorPenetrationSharp>52</armorPenetrationSharp>
+					<armorPenetrationBlunt>580</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WP_Bifurcator"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.8</MeleeCritChance>
+				<MeleeParryChance>0.1</MeleeParryChance>
+				<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WP_Bifurcator"]/statBases</xpath>
+		<value>
+			<Bulk>16</Bulk>
+			<MeleeCounterParryBonus>1.75</MeleeCounterParryBonus>
+			<ToughnessRating>22</ToughnessRating>
+		</value>
+	</Operation>
+
+	<!-- Voltrender -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WP_Voltrender"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+			<ToughnessRating>24</ToughnessRating>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WP_Voltrender"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.02</MeleeCritChance>
+				<MeleeParryChance>0.44</MeleeParryChance>
+				<MeleeDodgeChance>0.22</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WP_Voltrender"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>VoltaicSlash</li>
+					</capacities>
+					<power>52</power>
+					<cooldownTime>2.6</cooldownTime>
+					<armorPenetrationBlunt>17</armorPenetrationBlunt>
+					<armorPenetrationSharp>28</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Crustbreaker -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WP_Crustbreaker"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>CrustbreakerSmash</li>
+					</capacities>
+					<power>92</power>
+					<cooldownTime>5.73</cooldownTime>
+					<armorPenetrationBlunt>580</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WP_Crustbreaker"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.8</MeleeCritChance>
+				<MeleeParryChance>0.1</MeleeParryChance>
+				<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WP_Crustbreaker"]/statBases</xpath>
+		<value>
+			<Bulk>18</Bulk>
+			<MeleeCounterParryBonus>2</MeleeCounterParryBonus>
+			<ToughnessRating>25</ToughnessRating>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Warcaskets - Adeptus Astartes/Patches/Warcaskets - Adeptus Astartes/Apparel_Warcaskets_Astartes.xml b/ModPatches/Warcaskets - Adeptus Astartes/Patches/Warcaskets - Adeptus Astartes/Apparel_Warcaskets_Astartes.xml
new file mode 100644
index 0000000000..f606eaa074
--- /dev/null
+++ b/ModPatches/Warcaskets - Adeptus Astartes/Patches/Warcaskets - Adeptus Astartes/Apparel_Warcaskets_Astartes.xml	
@@ -0,0 +1,902 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- "The Emperor protects!" (But a few centimeters of ceramite never hurt, either.) -->
+
+	<!-- ========== Swap ShootingAccuracy for AimingAccuracy ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[
+			defName="VFEP_WarcasketHelmet_SpaceMarine"
+			]/equippedStatOffsets/ShootingAccuracyPawn </xpath>
+		<value>
+			<AimingAccuracy>0.15</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[
+			defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarOne" or
+			defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarTwo" or
+			defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarThree" or
+			defName="VFEP_WarcasketHelmet_SpaceMarineWings" or
+			defName="VFEP_WarcasketHelmet_SpaceMarineKnight" or
+			defName="VFEP_WarcasketHelmet_SpaceMarineMkVI"
+			]/equippedStatOffsets/ShootingAccuracyPawn </xpath>
+		<value>
+			<AimingAccuracy>0.18</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[
+			defName="VFEP_WarcasketHelmet_SpaceMarinePrimarisSgt" or
+			defName="VFEP_WarcasketHelmet_SpaceMarinePrimarisCpt" or
+			defName="VFEP_WarcasketHelmet_SpaceMarineKnightVet"
+			]/equippedStatOffsets/ShootingAccuracyPawn </xpath>
+		<value>
+			<AimingAccuracy>0.21</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[
+			defName="VFEP_WarcasketHelmet_SpaceMarineTerminator"
+			]/equippedStatOffsets/ShootingAccuracyPawn </xpath>
+		<value>
+			<AimingAccuracy>0.39</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<!-- ========== Space Marine Warcasket (Standard) ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine"]/statBases</xpath>
+		<value>
+			<Bulk>200</Bulk>
+			<WornBulk>20</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>26</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>62</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>250</CarryWeight>
+			<CarryBulk>200</CarryBulk>
+			<Suppressability>-100</Suppressability>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine"]/costList/Steel</xpath>
+		<value>
+			<Steel>260</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine"]/costList/ComponentIndustrial</xpath>
+		<value>
+			<ComponentIndustrial>8</ComponentIndustrial>
+		</value>
+	</Operation>
+
+	<!-- === Space Marine Warcasket Shoulders (Standard) === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>26</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>54</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Space Marine Warcasket Helmet (Standard) === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarine"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+			<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarine"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarine"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarine"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarine"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>22</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarine"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>48</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ========== Space Marine Warcasket (Veteran) ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_Vet"]/statBases</xpath>
+		<value>
+			<Bulk>225</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_Vet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>27.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_Vet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>64</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_Vet"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>250</CarryWeight>
+			<CarryBulk>200</CarryBulk>
+			<Suppressability>-100</Suppressability>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_Vet"]/costList/Steel</xpath>
+		<value>
+			<Steel>270</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_Vet"]/costList/ComponentIndustrial</xpath>
+		<value>
+			<ComponentIndustrial>9</ComponentIndustrial>
+		</value>
+	</Operation>
+
+	<!-- === Space Marine Warcasket Shoulders (Veteran) === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine_Vet"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine_Vet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>28.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine_Vet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>58</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ========== Space Marine Warcasket (Cpt.) ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_Cpt"]/statBases</xpath>
+		<value>
+			<Bulk>250</Bulk>
+			<WornBulk>25</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_Cpt"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>32</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_Cpt"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>74</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_Cpt"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>250</CarryWeight>
+			<CarryBulk>200</CarryBulk>
+			<Suppressability>-100</Suppressability>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_Cpt"]/costList/Steel</xpath>
+		<value>
+			<Steel>350</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_Cpt"]/costList/ComponentIndustrial</xpath>
+		<value>
+			<ComponentIndustrial>10</ComponentIndustrial>
+		</value>
+	</Operation>
+
+	<!-- ========== Space Marine Warcasket (Mk. II) ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_MkII"]/statBases</xpath>
+		<value>
+			<Bulk>250</Bulk>
+			<WornBulk>25</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_MkII"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>29.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_MkII"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>74</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_MkII"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>250</CarryWeight>
+			<CarryBulk>200</CarryBulk>
+			<Suppressability>-100</Suppressability>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_MkII"]/costList/Steel</xpath>
+		<value>
+			<Steel>360</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_MkII"]/costList/ComponentIndustrial</xpath>
+		<value>
+			<ComponentIndustrial>10</ComponentIndustrial>
+		</value>
+	</Operation>
+
+	<!-- === Space Marine Warcasket Shoulders (Mk. II) === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine_MkII"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine_MkII"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>29.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine_MkII"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>68</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ========== Space Marine Warcasket (Mk. VI) ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_MKVI"]/statBases</xpath>
+		<value>
+			<Bulk>250</Bulk>
+			<WornBulk>25</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_MKVI"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>32</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_MKVI"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>70</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_MKVI"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>250</CarryWeight>
+			<CarryBulk>200</CarryBulk>
+			<Suppressability>-100</Suppressability>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_MKVI"]/costList/Steel</xpath>
+		<value>
+			<Steel>370</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_MKVI"]/costList/ComponentIndustrial</xpath>
+		<value>
+			<ComponentIndustrial>10</ComponentIndustrial>
+		</value>
+	</Operation>
+
+	<!-- ========== Terminator Warcasket ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_Terminator"]/statBases</xpath>
+		<value>
+			<Bulk>275</Bulk>
+			<WornBulk>35</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_Terminator"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>37.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_Terminator"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>84</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_Terminator"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>250</CarryWeight>
+			<CarryBulk>225</CarryBulk>
+			<Suppressability>-100</Suppressability>
+		</value>
+	</Operation>
+
+	<!-- Increase Cost -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_Terminator"]/costList/Steel</xpath>
+		<value>
+			<Steel>480</Steel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_Terminator"]/costList/ComponentIndustrial</xpath>
+		<value>
+			<ComponentIndustrial>16</ComponentIndustrial>
+		</value>
+	</Operation>
+
+	<!-- === Terminator Warcasket Shoulders === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine_Terminator"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine_Terminator"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>36</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine_Terminator"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>84</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Space Marine Warcasket Shoulders (Tac) === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine_Tac"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine_Tac"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>27.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine_Tac"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>62</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Space Marine Warcasket Shoulders (Heavy Support) === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine_HeavySupport"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine_HeavySupport"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>26</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine_HeavySupport"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>62</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Space Marine Warcasket Shoulders (Studded) === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine_Studded"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine_Studded"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>26</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine_Studded"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>62</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Primaris Marine Warcasket Helmet (V. 1) === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarOne"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarOne"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarOne"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarOne"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarOne"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>24</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarOne"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>50</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Primaris Marine Warcasket Helmet (V. 2 and V. 3) === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarTwo" or defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarThree"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarTwo" or defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarThree"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarTwo" or defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarThree"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarTwo" or defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarThree"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarTwo" or defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarThree"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>25.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarTwo" or defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarThree"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>50</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Primaris Marine Warcasket Helmet (Winged) === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineWings"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineWings"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineWings"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineWings"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineWings"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>27</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineWings"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>52</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Primaris Marine Warcasket Helmet (Sgt.) === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimarisSgt"]/statBases</xpath>
+		<value>
+			<Bulk>20</Bulk>
+			<WornBulk>5</WornBulk>
+			<NightVisionEfficiency_Apparel>0.65</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimarisSgt"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimarisSgt"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimarisSgt"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimarisSgt"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>28.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimarisSgt"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>54</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Primaris Marine Warcasket Helmet (Cpt.) === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimarisCpt"]/statBases</xpath>
+		<value>
+			<Bulk>20</Bulk>
+			<WornBulk>5</WornBulk>
+			<NightVisionEfficiency_Apparel>0.65</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimarisCpt"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimarisCpt"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimarisCpt"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimarisCpt"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>30</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimarisCpt"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>56</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Space Marine Warcasket Helmet (Mk. II) === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineKnight"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+			<NightVisionEfficiency_Apparel>0.65</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineKnight"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineKnight"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineKnight"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineKnight"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>27</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineKnight"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>50</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Space Marine Warcasket Helmet (Mk. II Vet.) === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineKnightVet"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+			<NightVisionEfficiency_Apparel>0.7</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineKnightVet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineKnightVet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineKnightVet"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineKnightVet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>27</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineKnightVet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>54</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Space Marine Warcasket Helmet (Mk. VI) === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineMkVI"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+			<NightVisionEfficiency_Apparel>0.7</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineMkVI"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineMkVI"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineMkVI"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineMkVI"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineMkVI"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>50</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- === Terminator Warcasket Helmet === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineTerminator"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<WornBulk>5</WornBulk>
+			<NightVisionEfficiency_Apparel>0.7</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineTerminator"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineTerminator"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineTerminator"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineTerminator"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>38</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineTerminator"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>84</ArmorRating_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Warcaskets - Adeptus Astartes/Patches/Warcaskets - Adeptus Astartes/Melee_Astartes.xml b/ModPatches/Warcaskets - Adeptus Astartes/Patches/Warcaskets - Adeptus Astartes/Melee_Astartes.xml
new file mode 100644
index 0000000000..a1a8f8f5c2
--- /dev/null
+++ b/ModPatches/Warcaskets - Adeptus Astartes/Patches/Warcaskets - Adeptus Astartes/Melee_Astartes.xml	
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- "They are my Space Marines and they shall know no fear." -->
+
+	<!-- Power Sword -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HP_WarcasketMeleeWeapon_PowerSword"]/statBases</xpath>
+		<value>
+			<Bulk>15</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+			<ToughnessRating>24</ToughnessRating>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HP_WarcasketMeleeWeapon_PowerSword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.02</MeleeCritChance>
+				<MeleeParryChance>0.44</MeleeParryChance>
+				<MeleeDodgeChance>0.22</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HP_WarcasketMeleeWeapon_PowerSword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>HP_Power_Stab</li>
+					</capacities>
+					<power>43</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>9</armorPenetrationBlunt>
+					<armorPenetrationSharp>46</armorPenetrationSharp>
+					<extraMeleeDamages>
+						<li>
+							<def>Electrical</def>
+							<amount>10</amount>
+							<chance>0.15</chance>
+						</li>
+					</extraMeleeDamages>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>HP_Power_Cut</li>
+					</capacities>
+					<power>52</power>
+					<cooldownTime>2.6</cooldownTime>
+					<armorPenetrationBlunt>17</armorPenetrationBlunt>
+					<armorPenetrationSharp>28</armorPenetrationSharp>
+					<extraMeleeDamages>
+						<li>
+							<def>Electrical</def>
+							<amount>10</amount>
+							<chance>0.5</chance>
+						</li>
+					</extraMeleeDamages>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Chain Sword -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HP_WarcasketMeleeWeapon_ChainSword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>HP_Chain_Stab</li>
+					</capacities>
+					<power>56</power>
+					<cooldownTime>2.5</cooldownTime>
+					<chanceFactor>0.60</chanceFactor>
+					<armorPenetrationBlunt>11.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>12</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>HP_Power_Cut</label>
+					<capacities>
+						<li>HP_Chain_Cut</li>
+					</capacities>
+					<power>68</power>
+					<cooldownTime>3.45</cooldownTime>
+					<chanceFactor>0.30</chanceFactor>
+					<armorPenetrationBlunt>17</armorPenetrationBlunt>
+					<armorPenetrationSharp>18</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HP_WarcasketMeleeWeapon_ChainSword"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.11</MeleeCritChance>
+				<MeleeParryChance>0.47</MeleeParryChance>
+				<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HP_WarcasketMeleeWeapon_ChainSword"]/statBases</xpath>
+		<value>
+			<Bulk>18</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+			<ToughnessRating>20</ToughnessRating>
+		</value>
+	</Operation>
+
+	<!-- Thunder Hammer -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HP_WarcasketMeleeWeapon_ThunderHammer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>HP_Thunder_Hit</li>
+					</capacities>
+					<power>62</power>
+					<cooldownTime>5.73</cooldownTime>
+					<chanceFactor>0.70</chanceFactor>
+					<armorPenetrationBlunt>580</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>2.11</cooldownTime>
+					<chanceFactor>0.20</chanceFactor>
+					<armorPenetrationBlunt>22.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HP_WarcasketMeleeWeapon_ThunderHammer"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.8</MeleeCritChance>
+				<MeleeParryChance>0.1</MeleeParryChance>
+				<MeleeDodgeChance>0.12</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HP_WarcasketMeleeWeapon_ThunderHammer"]/statBases</xpath>
+		<value>
+			<Bulk>20</Bulk>
+			<MeleeCounterParryBonus>2</MeleeCounterParryBonus>
+			<ToughnessRating>25</ToughnessRating>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Warcaskets - Adeptus Astartes/Patches/Warcaskets - Adeptus Astartes/Ranged_Astartes.xml b/ModPatches/Warcaskets - Adeptus Astartes/Patches/Warcaskets - Adeptus Astartes/Ranged_Astartes.xml
new file mode 100644
index 0000000000..a319d47425
--- /dev/null
+++ b/ModPatches/Warcaskets - Adeptus Astartes/Patches/Warcaskets - Adeptus Astartes/Ranged_Astartes.xml	
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- "The boltgun is far more than a weapon; it is an instrument of Mankind's divinity." -->
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>
+			Defs/ThingDef[
+			defName = "HP_WarcasketGun_Bolter" or
+			defName = "HP_WarcasketGun_BolterRifle" or
+			defName = "VFEP_WarcasketGun_HeavyBolter" or
+			defName = "HP_WarcasketGun_StormBolter" or
+			defName = "VFEP_WarcasketGun_MeltaGun" or
+			defName = "VFEP_WarcasketGun_PlasmaCannon"
+			]/tools
+		</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>2.44</cooldownTime>
+					<armorPenetrationBlunt>16</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Bolter === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>HP_WarcasketGun_Bolter</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>2.58</SwayFactor><!-- Sway has been reduced, given the wielders. -->
+			<Bulk>7.5</Bulk>
+			<Mass>8</Mass>
+			<RangedWeapon_Cooldown>0.43</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>3.27</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Bolter75_Standard</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>14</ticksBetweenBurstShots>
+			<range>25</range>
+			<soundCast>HP_Bolt_Gun_Sound</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_Bolter75</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- === Bolter Rifle === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>HP_WarcasketGun_BolterRifle</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.04</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>10.5</Bulk>
+			<Mass>15</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.38</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Bolter75_Standard</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+			<range>44</range>
+			<soundCast>HP_Bolt_Gun_Sound</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>5.5</reloadTime>
+			<ammoSet>AmmoSet_Bolter75</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- === Heavy Bolter Rifle === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFEP_WarcasketGun_HeavyBolter</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>2.55</SwayFactor>
+			<Bulk>12.5</Bulk>
+			<Mass>25</Mass>
+			<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>3.22</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Bolter998_Standard</defaultProjectile>
+			<warmupTime>1.3</warmupTime>
+			<burstShotCount>8</burstShotCount>
+			<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+			<range>52</range>
+			<soundCast>HP_HeavyBolter_Gun_Sound</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>6.2</reloadTime>
+			<ammoSet>AmmoSet_Bolter998</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>4</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- === Storm Bolter === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>HP_WarcasketGun_StormBolter</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.07</ShotSpread>
+			<SwayFactor>2.92</SwayFactor>
+			<Bulk>7.5</Bulk>
+			<Mass>10</Mass>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.93</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Bolter75_Standard</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<burstShotCount>8</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<range>20</range>
+			<soundCast>HP_HeavyBolter_Gun_Sound</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>40</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_Bolter75</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>4</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- === Melta Gun === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFEP_WarcasketGun_MeltaGun</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>10</Bulk>
+			<Mass>12</Mass>
+			<RangedWeapon_Cooldown>1.32</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Laser_MeltaCharge</defaultProjectile>
+			<warmupTime>2.2</warmupTime>
+			<range>42</range>
+			<ammoConsumedPerShotCount>50</ammoConsumedPerShotCount>
+			<soundCast>HP_Meltagun_Gun_Sound</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>19</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>100</magazineSize>
+			<reloadTime>7.2</reloadTime>
+			<ammoSet>AmmoSet_MeltaCharge</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- === Plasma Cannon === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>VFEP_WarcasketGun_PlasmaCannon</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>1.27</SwayFactor>
+			<Bulk>8</Bulk>
+			<Mass>10</Mass>
+			<RangedWeapon_Cooldown>1.06</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_PlasmaCannon</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>42</range>
+			<soundCast>HP_PlasmaCannon_Gun_Sound</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>19</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>6.2</reloadTime>
+			<ammoSet>AmmoSet_PlasmaCanister_Cannon</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Warhammer - Dryad/Defs/Warhammer - Dryad/Projectiles_Dryad.xml b/ModPatches/Warhammer - Dryad/Defs/Warhammer - Dryad/Projectiles_Dryad.xml
new file mode 100644
index 0000000000..d03bf4a251
--- /dev/null
+++ b/ModPatches/Warhammer - Dryad/Defs/Warhammer - Dryad/Projectiles_Dryad.xml	
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingDef ParentName="BaseBulletCE">
+		<thingClass>CombatExtended.BulletCE</thingClass>
+		<defName>Bullet_WillowWhip</defName>
+		<label>willow lash</label>
+		<graphicData>
+			<texPath>Things/Projectile/WillowBullet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>80</speed>
+			<damageDef>Cut</damageDef>
+			<damageAmountBase>8</damageAmountBase>
+			<armorPenetrationSharp>0.65</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.80</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBulletCE">
+		<thingClass>CombatExtended.BulletCE</thingClass>
+		<defName>Bullet_DryadArm</defName>
+		<label>revenant projectile</label>
+		<graphicData>
+			<texPath>Things/Projectile/ArmTurretBullet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>60</speed>
+			<damageDef>Cut</damageDef>
+			<damageAmountBase>16</damageAmountBase>
+			<armorPenetrationSharp>2</armorPenetrationSharp>
+			<armorPenetrationBlunt>5</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBulletCE">
+		<thingClass>CombatExtended.BulletCE</thingClass>
+		<defName>Bullet_RevenantArm</defName>
+		<label>revenant projectile</label>
+		<graphicData>
+			<texPath>Things/Projectile/RevenantTurretBullet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>60</speed>
+			<damageDef>Cut</damageDef>
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>4</armorPenetrationSharp>
+			<armorPenetrationBlunt>8</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Warhammer - Dryad/Patches/Warhammer - Dryad/Apparel_Dryad.xml b/ModPatches/Warhammer - Dryad/Patches/Warhammer - Dryad/Apparel_Dryad.xml
new file mode 100644
index 0000000000..c8fe742ab7
--- /dev/null
+++ b/ModPatches/Warhammer - Dryad/Patches/Warhammer - Dryad/Apparel_Dryad.xml	
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_DryadicMask"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.75</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Warhammer - Dryad/Patches/Warhammer - Dryad/PawnKinds_Dryad.xml b/ModPatches/Warhammer - Dryad/Patches/Warhammer - Dryad/PawnKinds_Dryad.xml
new file mode 100644
index 0000000000..73cd255cfe
--- /dev/null
+++ b/ModPatches/Warhammer - Dryad/Patches/Warhammer - Dryad/PawnKinds_Dryad.xml	
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Give ammo to pawns with ranged weapons. ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>
+			Defs/PawnKindDef[
+			defName="DryadGood" or
+			defName="DryadBad" or
+			defName="WildDryadGood" or
+			defName="WildDryadBad" or
+			defName="DryadPlayer" or
+			defName="BranchHunter"
+			]
+		</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>14</min>
+					<max>20</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>80</min>
+						<max>160</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_Tribal</li>
+					</weaponTags>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Warhammer - Dryad/Patches/Warhammer - Dryad/Race_Dryad.xml b/ModPatches/Warhammer - Dryad/Patches/Warhammer - Dryad/Race_Dryad.xml
new file mode 100644
index 0000000000..bea1e94cf1
--- /dev/null
+++ b/ModPatches/Warhammer - Dryad/Patches/Warhammer - Dryad/Race_Dryad.xml	
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Base Dryad -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[@Name="KTDryadAnimalThingBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[@Name="KTDryadAnimalThingBase"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[@Name="KTDryadAnimalThingBase"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="KTDryadAnimalThingBase"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<!-- Dryad -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Dryad" or defName="Alien_DryadWild"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Dryad" or defName="Alien_DryadWild"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Dryad" or defName="Alien_DryadWild"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Dryad" or defName="Alien_DryadWild"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<NightVisionEfficiency>0.4</NightVisionEfficiency>
+			<MeleeDodgeChance>1.1</MeleeDodgeChance>
+			<MeleeCritChance>0.8</MeleeCritChance>
+			<MeleeParryChance>0.85</MeleeParryChance>
+			<CarryWeight>35</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Dryad" or defName="Alien_DryadWild"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.35</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Dryad" or defName="Alien_DryadWild"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Dryad" or defName="Alien_DryadWild"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left branch</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>5</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>DryadLeftBranchG</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right branch</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>5</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>DryadRightBranchG</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.923</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Willow Aspect -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DryadWillowAspect"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<NightVisionEfficiency>0.4</NightVisionEfficiency>
+			<MeleeDodgeChance>1.6</MeleeDodgeChance>
+			<MeleeCritChance>0.75</MeleeCritChance>
+			<MeleeParryChance>0.80</MeleeParryChance>
+			<CarryWeight>35</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DryadWillowAspect"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.35</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DryadWillowAspect"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DryadWillowAspect"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left branch</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.15</cooldownTime>
+					<linkedBodyPartsGroup>DryadLeftBranchG</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right branch</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.15</cooldownTime>
+					<linkedBodyPartsGroup>DryadRightBranchG</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Oak Aspect -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DryadOakAspect"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency>0.4</NightVisionEfficiency>
+			<MeleeDodgeChance>0.8</MeleeDodgeChance>
+			<MeleeCritChance>0.80</MeleeCritChance>
+			<MeleeParryChance>0.85</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DryadOakAspect"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2.35</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DryadOakAspect"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DryadOakAspect"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left branch</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>DryadLeftBranchG</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right branch</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.85</cooldownTime>
+					<linkedBodyPartsGroup>DryadRightBranchG</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Warhammer - Dryad/Patches/Warhammer - Dryad/Race_Revenant.xml b/ModPatches/Warhammer - Dryad/Patches/Warhammer - Dryad/Race_Revenant.xml
new file mode 100644
index 0000000000..45997af856
--- /dev/null
+++ b/ModPatches/Warhammer - Dryad/Patches/Warhammer - Dryad/Race_Revenant.xml	
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Revenants -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DryadDeadRevenant" or defName="DryadDeadRevenantFoe"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+			<Suppressability>-10</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DryadSpiteRevenant" or defName="DryadSpiteRevenantAnimal"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2.5</ArmorRating_Blunt>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+			<Suppressability>-10</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DryadSpiteRevenant" or defName="DryadSpiteRevenantAnimal"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.75</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DryadDeadRevenant" or defName="DryadDeadRevenantFoe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left branch</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.15</cooldownTime>
+					<linkedBodyPartsGroup>DryadLeftBranchG</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right branch</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.15</cooldownTime>
+					<linkedBodyPartsGroup>DryadRightBranchG</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DryadSpiteRevenant" or defName="DryadSpiteRevenantAnimal"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left branch</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.15</cooldownTime>
+					<linkedBodyPartsGroup>DryadLeftBranchG</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right branch</label>
+					<capacities>
+						<li>Scratch</li>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.15</cooldownTime>
+					<linkedBodyPartsGroup>DryadRightBranchG</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Warhammer - Dryad/Patches/Warhammer - Dryad/ThingDefs_Turrets.xml b/ModPatches/Warhammer - Dryad/Patches/Warhammer - Dryad/ThingDefs_Turrets.xml
new file mode 100644
index 0000000000..3342dac356
--- /dev/null
+++ b/ModPatches/Warhammer - Dryad/Patches/Warhammer - Dryad/ThingDefs_Turrets.xml	
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Replace vanilla thingClass -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Turret_DryadArm" or defName = "Turret_DryadRevenant"]/thingClass</xpath>
+		<value>
+			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName = "Turret_DryadArm" or defName = "Turret_DryadRevenant"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>0.75</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Turret_DryadArm" or defName = "Turret_DryadRevenant"]/statBases/ShootingAccuracyTurret</xpath>
+		<value>
+			<ShootingAccuracyTurret>1.1</ShootingAccuracyTurret>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Turret_DryadArm" or defName = "Turret_DryadRevenant"]/building/turretBurstCooldownTime</xpath>
+		<value>
+			<turretBurstCooldownTime>2.5</turretBurstCooldownTime>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Turret_DryadArm"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>13</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "Turret_DryadRevenant"]/specialDisplayRadius</xpath>
+		<value>
+			<specialDisplayRadius>18</specialDisplayRadius>
+		</value>
+	</Operation>
+
+	<!-- Dryad Arm -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_DryadArm</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>3</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>0.01</SwayFactor>
+			<Bulk>10.00</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_DryadArm</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>13</range>
+			<soundCast>Pawn_BigInsect_Angry</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>0</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- Revenant Arm -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_DryadRevenant</defName>
+		<statBases>
+			<RangedWeapon_Cooldown>3</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.01</ShotSpread>
+			<SwayFactor>0.01</SwayFactor>
+			<Bulk>10.00</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_RevenantArm</defaultProjectile>
+			<warmupTime>1.2</warmupTime>
+			<range>18</range>
+			<soundCast>Pawn_BigInsect_Angry</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>0</muzzleFlashScale>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Warhammer - Dryad/Patches/Warhammer - Dryad/Weapons_Dryad.xml b/ModPatches/Warhammer - Dryad/Patches/Warhammer - Dryad/Weapons_Dryad.xml
new file mode 100644
index 0000000000..929877ee00
--- /dev/null
+++ b/ModPatches/Warhammer - Dryad/Patches/Warhammer - Dryad/Weapons_Dryad.xml	
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ==== Scythe ==== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_SylScythe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>hand guard</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>hook</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.11</cooldownTime>
+					<armorPenetrationSharp>2.82</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>1.32</cooldownTime>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.375</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_SylScythe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.25</MeleeCritChance>
+				<MeleeParryChance>0.5</MeleeParryChance>
+				<MeleeDodgeChance>0.6</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_SylScythe"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>0.54</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<!-- === Willow Whip === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_WillowWhip</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.5</ShotSpread>
+			<SwayFactor>0.26</SwayFactor>
+			<Bulk>1.5</Bulk>
+			<Mass>0.9</Mass>
+			<RangedWeapon_Cooldown>0.48</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_WillowWhip</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>6</range>
+			<soundCast>Interact_BeatFire</soundCast>
+		</Properties>
+	</Operation>
+
+	<!-- Tools -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_WillowWhip"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>branch</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationSharp>0.15</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Warhammer 40.000 - Imperium Materials/Patches/Warhammer 40.000 - Imperium Materials/GrimForge_CE_Resources.xml b/ModPatches/Warhammer 40.000 - Imperium Materials/Patches/Warhammer 40.000 - Imperium Materials/GrimForge_CE_Resources.xml
new file mode 100644
index 0000000000..684476727b
--- /dev/null
+++ b/ModPatches/Warhammer 40.000 - Imperium Materials/Patches/Warhammer 40.000 - Imperium Materials/GrimForge_CE_Resources.xml	
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Adamantium -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_Adamantium"]/stuffProps/categories</xpath>
+		<value>
+			<li>Metallic_Weapon</li>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_Adamantium"]/statBases</xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_Adamantium"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>3</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_Adamantium"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>4.5</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_Adamantium"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.15</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<!-- Auramite -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_Auramite"]/stuffProps/categories</xpath>
+		<value>
+			<li>Metallic_Weapon</li>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_Auramite"]/statBases</xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_Auramite"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>2.1</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_Auramite"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>3.15</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_Auramite"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.07</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<!-- Ceramite -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_Ceramite"]/stuffProps/categories</xpath>
+		<value>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_Ceramite"]/statBases</xpath>
+		<value>
+			<Bulk>0.06</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_Ceramite"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>2.15</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_Ceramite"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>3.2</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_Ceramite"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.12</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<!-- Diamantine -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_Diamantine"]/stuffProps/categories</xpath>
+		<value>
+			<li>Steeled</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_Diamantine"]/statBases</xpath>
+		<value>
+			<Bulk>0.03</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_Diamantine"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>2.35</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_Diamantine"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>3.55</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_Diamantine"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.14</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<!-- Ferrocrete -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_Ferrocrete"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Warhammer 40.000 - Imperium Weaponry/Defs/Warhammer 40.000 - Imperium Weaponry/GF40K_Ammo_Braizer.xml b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Defs/Warhammer 40.000 - Imperium Weaponry/GF40K_Ammo_Braizer.xml
new file mode 100644
index 0000000000..abb724ec80
--- /dev/null
+++ b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Defs/Warhammer 40.000 - Imperium Weaponry/GF40K_Ammo_Braizer.xml	
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- ==================== AmmoSet ========================== -->
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="BaseRPG7Grenade">
+		<defName>Bullet_Braizer</defName>
+		<label>brazier fireball</label>
+		<graphicData>
+			<texPath>Things/Projectile/Fireball</texPath>
+			<shaderType>TransparentPostLight</shaderType>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>38</speed>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>16</damageAmountBase>
+			<armorPenetrationSharp>18</armorPenetrationSharp>
+			<armorPenetrationBlunt>8</armorPenetrationBlunt>
+			<dropsCasings>false</dropsCasings>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>9</damageAmountBase>
+				<explosiveDamageType>Flame</explosiveDamageType>
+				<explosiveRadius>0.9</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseRPG7Grenade">
+		<defName>Bullet_Braizer_Relic</defName>
+		<label>brazier fireball</label>
+		<graphicData>
+			<texPath>Things/Projectile/Fireball</texPath>
+			<shaderType>TransparentPostLight</shaderType>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>38</speed>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>22</armorPenetrationSharp>
+			<armorPenetrationBlunt>10</armorPenetrationBlunt>
+			<dropsCasings>false</dropsCasings>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>12</damageAmountBase>
+				<explosiveDamageType>Flame</explosiveDamageType>
+				<explosiveRadius>1.4</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Warhammer 40.000 - Imperium Weaponry/Defs/Warhammer 40.000 - Imperium Weaponry/GF40K_Ammo_Galvanic.xml b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Defs/Warhammer 40.000 - Imperium Weaponry/GF40K_Ammo_Galvanic.xml
new file mode 100644
index 0000000000..80e29f8556
--- /dev/null
+++ b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Defs/Warhammer 40.000 - Imperium Weaponry/GF40K_Ammo_Galvanic.xml	
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_8mmGauss_Galvanic</defName>
+		<label>8mm galvanic gauss</label>
+		<ammoTypes>
+			<Ammo_8mmRailgun_Sabot>Bullet_Gauss_Galvanic</Ammo_8mmRailgun_Sabot>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_8mmGauss_Galvanic_Relic</defName>
+		<label>8mm galvanic gauss</label>
+		<ammoTypes>
+			<Ammo_8mmRailgun_Sabot>Bullet_Gauss_Galvanic_Relic</Ammo_8mmRailgun_Sabot>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletYellow">
+		<defName>Bullet_Gauss_Galvanic</defName>
+		<label>galvanic Gauss shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<isInstant>true</isInstant>
+			<damageFalloff>False</damageFalloff>
+			<damageDef>GF40K_Gauss</damageDef>
+			<damageAmountBase>22</damageAmountBase>
+			<armorPenetrationSharp>50</armorPenetrationSharp>
+			<armorPenetrationBlunt>312</armorPenetrationBlunt>
+			<extraDamages>
+				<li>
+					<def>EMP</def>
+					<amount>45</amount>
+					<chance>0.4</chance>
+				</li>
+			</extraDamages>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletRed">
+		<defName>Bullet_Gauss_Galvanic_Relic</defName>
+		<label>galvanic Gauss shot</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<isInstant>true</isInstant>
+			<damageFalloff>False</damageFalloff>
+			<damageDef>GF40K_Gauss</damageDef>
+			<damageAmountBase>26</damageAmountBase>
+			<armorPenetrationSharp>58</armorPenetrationSharp>
+			<armorPenetrationBlunt>322</armorPenetrationBlunt>
+			<extraDamages>
+				<li>
+					<def>EMP</def>
+					<amount>50</amount>
+					<chance>0.5</chance>
+				</li>
+			</extraDamages>
+		</projectile>
+	</ThingDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Warhammer 40.000 - Imperium Weaponry/Defs/Warhammer 40.000 - Imperium Weaponry/GF40K_Ammo_Radium.xml b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Defs/Warhammer 40.000 - Imperium Weaponry/GF40K_Ammo_Radium.xml
new file mode 100644
index 0000000000..ea77c02fb8
--- /dev/null
+++ b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Defs/Warhammer 40.000 - Imperium Weaponry/GF40K_Ammo_Radium.xml	
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Radium_Pistol</defName>
+		<label>10x18mm Radium Charged</label>
+		<ammoTypes>
+			<Ammo_10x18mmCharged>Bullet_10x18mmCharged</Ammo_10x18mmCharged>
+			<Ammo_10x18mmCharged_AP>Bullet_10x18mmCharged_AP</Ammo_10x18mmCharged_AP>
+			<Ammo_10x18mmCharged_Ion>Bullet_10x18mmCharged_Ion</Ammo_10x18mmCharged_Ion>
+			<Ammo_RadiumPistol_Tox>Bullet_RadiumPistol_Tox</Ammo_RadiumPistol_Tox>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_Radium_Carbine</defName>
+		<label>8x35mm Radium Charged</label>
+		<ammoTypes>
+			<Ammo_8x35mmCharged>Bullet_8x35mmCharged</Ammo_8x35mmCharged>
+			<Ammo_8x35mmCharged_AP>Bullet_8x35mmCharged_AP</Ammo_8x35mmCharged_AP>
+			<Ammo_8x35mmCharged_Ion>Bullet_8x35mmCharged_Ion</Ammo_8x35mmCharged_Ion>
+			<Ammo_RadiumCarbine_Tox>Bullet_RadiumCarbine_Tox</Ammo_RadiumCarbine_Tox>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="10x18mmChargedBase">
+		<defName>Ammo_RadiumPistol_Tox</defName>
+		<label>10x18mm Charged (Tox)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Charged/SmallTox</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>1.06</MarketValue>
+		</statBases>
+		<ammoClass>RadiationIonising</ammoClass>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="8x35mmChargedBase">
+		<defName>Ammo_RadiumCarbine_Tox</defName>
+		<label>8x35mm Charged (Tox)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Charged/MediumTox</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.97</MarketValue>
+		</statBases>
+		<ammoClass>RadiationIonising</ammoClass>
+	</ThingDef>
+
+	<!-- =================== Projectiles ==================== -->
+
+	<ThingDef ParentName="Base10x18mmChargedBullet">
+		<defName>Bullet_RadiumPistol_Tox</defName>
+		<label>10x18mm Charged bullet (Tox)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>15</damageAmountBase>
+			<damageDef>GF40K_ToxBullet</damageDef>
+			<armorPenetrationSharp>12</armorPenetrationSharp>
+			<armorPenetrationBlunt>22.56</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Name="Bullet_8x35mmCharged" ParentName="Base8x35mmChargedBullet">
+		<defName>Bullet_RadiumCarbine_Tox</defName>
+		<label>8x35mm Charged bullet (Tox)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>19</damageAmountBase>
+			<damageDef>GF40K_ToxBullet</damageDef>
+			<armorPenetrationSharp>16</armorPenetrationSharp>
+			<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_RadiumPistol_Tox</defName>
+		<label>make 10x18mm Charged (Tox) cartridge x500</label>
+		<description>Craft 500 10x18mm Charged (Tox) cartridges.</description>
+		<jobString>Making 10x18mm Charged (Tox) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Uranium</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_RadiumPistol_Tox>500</Ammo_RadiumPistol_Tox>
+		</products>
+		<workAmount>14800</workAmount>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_RadiumCarbine_Tox</defName>
+		<label>make 8x35mm Charged (Tox) cartridge x500</label>
+		<description>Craft 500 8x35mm Charged (Tox) cartridges.</description>
+		<jobString>Making 8x35mm Charged (Tox) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>18</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>9</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Uranium</li>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_RadiumCarbine_Tox>500</Ammo_RadiumCarbine_Tox>
+		</products>
+		<workAmount>13600</workAmount>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/GF40K_Damages_LocalInjury.xml b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/GF40K_Damages_LocalInjury.xml
new file mode 100644
index 0000000000..42f129db81
--- /dev/null
+++ b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/GF40K_Damages_LocalInjury.xml	
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Add DefModExtension ========== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/DamageDef[defName="GF40K_Shock"]</xpath>
+		<value>
+			<li Class="CombatExtended.DamageDefExtensionCE">
+				<harmOnlyOutsideLayers>true</harmOnlyOutsideLayers>
+				<isAmbientDamage>true</isAmbientDamage>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Melee/GF40K_ForceWeapons.xml b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Melee/GF40K_ForceWeapons.xml
new file mode 100644
index 0000000000..043907b6cb
--- /dev/null
+++ b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Melee/GF40K_ForceWeapons.xml	
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_ForceHalberd"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>12</Bulk>
+				<MeleeCounterParryBonus>1.7</MeleeCounterParryBonus>
+			</statBases>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.2</MeleeCritChance>
+				<MeleeParryChance>1.5</MeleeParryChance>
+				<MeleeDodgeChance>0.75</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_ForceHalberd"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>33</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>52</power>
+					<cooldownTime>2.2</cooldownTime>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+					<armorPenetrationSharp>30</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_ForceStaff"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.5</MeleeCritChance>
+				<MeleeParryChance>1.25</MeleeParryChance>
+				<MeleeDodgeChance>0.75</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_ForceStaff"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<MeleeCounterParryBonus>1.7</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_ForceStaff"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>2.1</cooldownTime>
+					<armorPenetrationBlunt>50</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>2.5</cooldownTime>
+					<armorPenetrationBlunt>60</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_ForceSword"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>10</Bulk>
+				<MeleeCounterParryBonus>1.5</MeleeCounterParryBonus>
+			</statBases>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.0</MeleeCritChance>
+				<MeleeParryChance>0.75</MeleeParryChance>
+				<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_ForceSword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>2.2</cooldownTime>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<armorPenetrationSharp>35</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>60</power>
+					<cooldownTime>2.2</cooldownTime>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+					<armorPenetrationSharp>25</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_ForceTome"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.5</MeleeCritChance>
+				<MeleeParryChance>1.25</MeleeParryChance>
+				<MeleeDodgeChance>0.75</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_ForceTome"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_ForceTome"]</xpath>
+		<value>
+			<weaponTags>
+				<li>CE_OneHandedWeapon</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_ForceTome"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<labelUsedInLogging>false</labelUsedInLogging>
+					<label>tome</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>3.5</cooldownTime>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Melee/GF40K_MechanicusWeapons.xml b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Melee/GF40K_MechanicusWeapons.xml
new file mode 100644
index 0000000000..0394771a04
--- /dev/null
+++ b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Melee/GF40K_MechanicusWeapons.xml	
@@ -0,0 +1,335 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_MechanicusArcMaul"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>15</Bulk>
+				<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
+			</statBases>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.5</MeleeCritChance>
+				<MeleeParryChance>0.3</MeleeParryChance>
+				<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			</equippedStatOffsets>
+			<weaponTags>
+				<li>CE_OneHandedWeapon</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_MechanicusArcMaul"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>60</power>
+					<extraMeleeDamages>
+						<li>
+							<def>EMP</def>
+							<amount>2</amount>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>2.5</cooldownTime>
+					<armorPenetrationBlunt>200</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_MechanicusOmnisianAxe"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>12</Bulk>
+				<MeleeCounterParryBonus>1.5</MeleeCounterParryBonus>
+			</statBases>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.5</MeleeCritChance>
+				<MeleeParryChance>0.3</MeleeParryChance>
+				<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_MechanicusOmnisianAxe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>2.1</cooldownTime>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<armorPenetrationSharp>45</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>62</power>
+					<extraMeleeDamages>
+						<li>
+							<def>EMP</def>
+							<amount>2</amount>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>2.5</cooldownTime>
+					<armorPenetrationBlunt>9</armorPenetrationBlunt>
+					<armorPenetrationSharp>35</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_MechanicusPowerSword"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>10</Bulk>
+				<MeleeCounterParryBonus>1.5</MeleeCounterParryBonus>
+			</statBases>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.0</MeleeCritChance>
+				<MeleeParryChance>0.75</MeleeParryChance>
+				<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			</equippedStatOffsets>
+			<weaponTags>
+				<li>CE_OneHandedWeapon</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_MechanicusPowerSword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>2.2</cooldownTime>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>58</power>
+					<extraMeleeDamages>
+						<li>
+							<def>EMP</def>
+							<amount>2</amount>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>2.2</cooldownTime>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<armorPenetrationSharp>30</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_MechanicusTaserGoad"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>8</Bulk>
+				<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
+			</statBases>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.70</MeleeCritChance>
+				<MeleeParryChance>0.5</MeleeParryChance>
+				<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			</equippedStatOffsets>
+			<weaponTags>
+				<li>CE_OneHandedWeapon</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_MechanicusTaserGoad"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tip</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>36</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Stun</def>
+							<amount>2</amount>
+							<chance>0.33</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>2.1</cooldownTime>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<armorPenetrationSharp>30</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_MechanicusTransonicBlade"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>10</Bulk>
+				<MeleeCounterParryBonus>1.5</MeleeCounterParryBonus>
+			</statBases>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.0</MeleeCritChance>
+				<MeleeParryChance>0.75</MeleeParryChance>
+				<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			</equippedStatOffsets>
+			<weaponTags>
+				<li>CE_OneHandedWeapon</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_MechanicusTransonicBlade"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tip</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>34</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+					<armorPenetrationSharp>38</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>GF40K_MolDesCut</li>
+					</capacities>
+					<power>47</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<armorPenetrationSharp>27</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_MechanicusTransonicRazor"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>4</Bulk>
+				<MeleeCounterParryBonus>0.3</MeleeCounterParryBonus>
+			</statBases>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.2</MeleeCritChance>
+				<MeleeParryChance>0.15</MeleeParryChance>
+				<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			</equippedStatOffsets>
+			<weaponTags>
+				<li>CE_OneHandedWeapon</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_MechanicusTransonicRazor"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>tip</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+					<armorPenetrationSharp>38</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>GF40K_MolDesCut</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<armorPenetrationSharp>27</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Melee/GF40K_MechanicusWeaponsRelic.xml b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Melee/GF40K_MechanicusWeaponsRelic.xml
new file mode 100644
index 0000000000..1b503cee39
--- /dev/null
+++ b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Melee/GF40K_MechanicusWeaponsRelic.xml	
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_RelicMechanicusPowerSword"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>10</Bulk>
+				<MeleeCounterParryBonus>1.6</MeleeCounterParryBonus>
+			</statBases>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.1</MeleeCritChance>
+				<MeleeParryChance>0.85</MeleeParryChance>
+				<MeleeDodgeChance>0.6</MeleeDodgeChance>
+			</equippedStatOffsets>
+			<weaponTags>
+				<li>CE_OneHandedWeapon</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_RelicMechanicusPowerSword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>39</power>
+					<cooldownTime>2.0</cooldownTime>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<armorPenetrationSharp>46</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>62</power>
+					<extraMeleeDamages>
+						<li>
+							<def>EMP</def>
+							<amount>2</amount>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>2.0</cooldownTime>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+					<armorPenetrationSharp>35</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Melee/GF40K_RegularWeapons.xml b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Melee/GF40K_RegularWeapons.xml
new file mode 100644
index 0000000000..2064cf7295
--- /dev/null
+++ b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Melee/GF40K_RegularWeapons.xml	
@@ -0,0 +1,310 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_ChainSword"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>10</Bulk>
+				<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
+			</statBases>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.5</MeleeCritChance>
+				<MeleeParryChance>0.3</MeleeParryChance>
+				<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			</equippedStatOffsets>
+			<weaponTags>
+				<li>CE_OneHandedWeapon</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_ChainSword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>backside</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>2.0</cooldownTime>
+					<armorPenetrationBlunt>35</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>chain</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>45</power>
+					<cooldownTime>2.0</cooldownTime>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+					<armorPenetrationSharp>30</armorPenetrationSharp>
+					<soundMeleeHit>40_ChainSword</soundMeleeHit>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_ChainAxe"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>8</Bulk>
+				<MeleeCounterParryBonus>0.65</MeleeCounterParryBonus>
+			</statBases>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.65</MeleeCritChance>
+				<MeleeParryChance>0.2</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+			<weaponTags>
+				<li>CE_OneHandedWeapon</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_ChainAxe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>chain</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>2.5</cooldownTime>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<armorPenetrationSharp>35</armorPenetrationSharp>
+					<soundMeleeHit>40_ChainSword</soundMeleeHit>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2.3</cooldownTime>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_Eviscerator"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>10</Bulk>
+				<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
+			</statBases>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.6</MeleeCritChance>
+				<MeleeParryChance>0.4</MeleeParryChance>
+				<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_Eviscerator"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>backside</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>50</power>
+					<cooldownTime>2.5</cooldownTime>
+					<armorPenetrationBlunt>40</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>chain</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>55</power>
+					<cooldownTime>2.5</cooldownTime>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<armorPenetrationSharp>35</armorPenetrationSharp>
+					<soundMeleeHit>40_ChainSword</soundMeleeHit>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_Chainspear"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>12</Bulk>
+				<MeleeCounterParryBonus>1.8</MeleeCounterParryBonus>
+			</statBases>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.5</MeleeCritChance>
+				<MeleeParryChance>1.5</MeleeParryChance>
+				<MeleeDodgeChance>0.8</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_Chainspear"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>chain</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>45</power>
+					<cooldownTime>2.20</cooldownTime>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+					<armorPenetrationSharp>37</armorPenetrationSharp>
+					<soundMeleeHit>40_ChainSword</soundMeleeHit>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.4</cooldownTime>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_PowerSabre"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>8</Bulk>
+				<MeleeCounterParryBonus>1.2</MeleeCounterParryBonus>
+			</statBases>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.2</MeleeCritChance>
+				<MeleeParryChance>0.2</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+			<weaponTags>
+				<li>CE_OneHandedWeapon</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_PowerSabre"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+					<armorPenetrationSharp>30</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_PowerSword"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>10</Bulk>
+				<MeleeCounterParryBonus>1.2</MeleeCounterParryBonus>
+			</statBases>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.3</MeleeCritChance>
+				<MeleeParryChance>0.25</MeleeParryChance>
+				<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			</equippedStatOffsets>
+			<weaponTags>
+				<li>CE_OneHandedWeapon</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_PowerSword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+					<armorPenetrationSharp>30</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Melee/GF40K_RegularWeaponsRelic.xml b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Melee/GF40K_RegularWeaponsRelic.xml
new file mode 100644
index 0000000000..1f755e118d
--- /dev/null
+++ b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Melee/GF40K_RegularWeaponsRelic.xml	
@@ -0,0 +1,310 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_RelicChainSword"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>10</Bulk>
+				<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
+			</statBases>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.6</MeleeCritChance>
+				<MeleeParryChance>0.4</MeleeParryChance>
+				<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			</equippedStatOffsets>
+			<weaponTags>
+				<li>CE_OneHandedWeapon</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_RelicChainSword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>backside</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>1.9</cooldownTime>
+					<armorPenetrationBlunt>38</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>chain</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>45</power>
+					<cooldownTime>1.9</cooldownTime>
+					<armorPenetrationBlunt>9</armorPenetrationBlunt>
+					<armorPenetrationSharp>33</armorPenetrationSharp>
+					<soundMeleeHit>40_ChainSword</soundMeleeHit>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_RelicChainAxe"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>7</Bulk>
+				<MeleeCounterParryBonus>0.85</MeleeCounterParryBonus>
+			</statBases>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.8</MeleeCritChance>
+				<MeleeParryChance>0.3</MeleeParryChance>
+				<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			</equippedStatOffsets>
+			<weaponTags>
+				<li>CE_OneHandedWeapon</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_RelicChainAxe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>chain</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>39</power>
+					<cooldownTime>2.35</cooldownTime>
+					<armorPenetrationBlunt>8.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+					<soundMeleeHit>40_ChainSword</soundMeleeHit>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2.1</cooldownTime>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_RelicEviscerator"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>10</Bulk>
+				<MeleeCounterParryBonus>0.7</MeleeCounterParryBonus>
+			</statBases>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.7</MeleeCritChance>
+				<MeleeParryChance>0.5</MeleeParryChance>
+				<MeleeDodgeChance>0.5</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_RelicEviscerator"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>backside</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>55</power>
+					<cooldownTime>2.4</cooldownTime>
+					<armorPenetrationBlunt>44</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>chain</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>60</power>
+					<cooldownTime>2.4</cooldownTime>
+					<armorPenetrationBlunt>9</armorPenetrationBlunt>
+					<armorPenetrationSharp>38</armorPenetrationSharp>
+					<soundMeleeHit>40_ChainSword</soundMeleeHit>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_RelicChainSpear"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>11</Bulk>
+				<MeleeCounterParryBonus>1.9</MeleeCounterParryBonus>
+			</statBases>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.65</MeleeCritChance>
+				<MeleeParryChance>1.65</MeleeParryChance>
+				<MeleeDodgeChance>0.88</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_RelicChainSpear"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>chain</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>49</power>
+					<cooldownTime>2.05</cooldownTime>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+					<soundMeleeHit>40_ChainSword</soundMeleeHit>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>12.8</power>
+					<cooldownTime>2.24</cooldownTime>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_RelicPowerSabre"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>8</Bulk>
+				<MeleeCounterParryBonus>1.3</MeleeCounterParryBonus>
+			</statBases>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.3</MeleeCritChance>
+				<MeleeParryChance>0.3</MeleeParryChance>
+				<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			</equippedStatOffsets>
+			<weaponTags>
+				<li>CE_OneHandedWeapon</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_RelicPowerSabre"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+					<armorPenetrationSharp>44</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>34</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>8</armorPenetrationBlunt>
+					<armorPenetrationSharp>33</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_RelicPowerSword"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>10</Bulk>
+				<MeleeCounterParryBonus>1.3</MeleeCounterParryBonus>
+			</statBases>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.4</MeleeCritChance>
+				<MeleeParryChance>0.35</MeleeParryChance>
+				<MeleeDodgeChance>0.25</MeleeDodgeChance>
+			</equippedStatOffsets>
+			<weaponTags>
+				<li>CE_OneHandedWeapon</li>
+			</weaponTags>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_RelicPowerSword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>1.7</cooldownTime>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+					<armorPenetrationSharp>44</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>39</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+					<armorPenetrationSharp>33</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_ArkWeapons.xml b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_ArkWeapons.xml
new file mode 100644
index 0000000000..65fe94c253
--- /dev/null
+++ b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_ArkWeapons.xml	
@@ -0,0 +1,283 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_ArkPistol"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_RelicArkPistol"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.34</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.34</cooldownTime>
+					<armorPenetrationBlunt>0.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_ArkRifle"]/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="GF40K_RelicArkRifle"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.45</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>3.1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.86</cooldownTime>
+					<armorPenetrationBlunt>1.930</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>8.8</power>
+					<cooldownTime>1.45</cooldownTime>
+					<armorPenetrationBlunt>3.1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Ark Pistol === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_ArkPistol</defName>
+		<statBases>
+			<Mass>1.25</Mass>
+			<Bulk>2.5</Bulk>
+			<SwayFactor>1.25</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_10x18mmCharged</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>18</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_10x18mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Relic Ark Pistol === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_RelicArkPistol</defName>
+		<statBases>
+			<Mass>1.2</Mass>
+			<Bulk>2.35</Bulk>
+			<SwayFactor>1.25</SwayFactor>
+			<ShotSpread>0.04</ShotSpread>
+			<SightsEfficiency>0.85</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.32</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.4</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_10x18mmCharged</defaultProjectile>
+			<warmupTime>0.45</warmupTime>
+			<range>21</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_10x18mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Ark Rifle === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_ArkRifle</defName>
+		<statBases>
+			<Mass>5.0</Mass>
+			<Bulk>10.00</Bulk>
+			<SwayFactor>1.5</SwayFactor>
+			<ShotSpread>0.05</ShotSpread>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.7</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_8x35mmCharged_Ion</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>62</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+			<soundCast>GF40K_LaserPistolShot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- === Relic Ark Rifle === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_RelicArkRifle</defName>
+		<statBases>
+			<Mass>4.75</Mass>
+			<Bulk>9.8</Bulk>
+			<SwayFactor>1.5</SwayFactor>
+			<ShotSpread>0.05</ShotSpread>
+			<SightsEfficiency>1.15</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.32</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.6</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_8x35mmCharged_Ion</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>65</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+			<soundCast>GF40K_LaserPistolShot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_BolterWeapons.xml b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_BolterWeapons.xml
new file mode 100644
index 0000000000..0f653498eb
--- /dev/null
+++ b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_BolterWeapons.xml	
@@ -0,0 +1,343 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tools === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "GF40K_BoltPistol" or
+			defName = "GF40K_BoltPistolRelic"
+			]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "GF40K_BoltGun" or
+			defName = "GF40K_BoltSniper" or
+			defName = "GF40K_BoltGunRelic" or
+			defName = "GF40K_BoltSniperRelic"
+			]/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>
+
+	<!-- === Bolt Pistol === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_BoltPistol</defName>
+		<statBases>
+			<Mass>4.5</Mass>
+			<Bulk>4.5</Bulk>
+			<SwayFactor>1.17</SwayFactor>
+			<ShotSpread>0.15</ShotSpread>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_Bolter75</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_BoltPistol"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.5</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>True</hasStandardCommand>
+					<defaultProjectile>Bullet_Bolter75_Standard</defaultProjectile>
+					<warmupTime>0.5</warmupTime>
+					<range>15</range>
+					<burstShotCount>2</burstShotCount>
+					<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+					<soundCast>Shot_SniperRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- === Relic Bolt Pistol === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_BoltPistolRelic</defName>
+		<statBases>
+			<Mass>4.5</Mass>
+			<Bulk>4.5</Bulk>
+			<SwayFactor>1.00</SwayFactor>
+			<ShotSpread>0.05</ShotSpread>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
+		</statBases>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>3.8</reloadTime>
+			<ammoSet>AmmoSet_Bolter75_Relic</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_BoltPistolRelic"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.3</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>True</hasStandardCommand>
+					<defaultProjectile>Bullet_Bolter75_Standard_Relic</defaultProjectile>
+					<warmupTime>0.45</warmupTime>
+					<range>16</range>
+					<burstShotCount>3</burstShotCount>
+					<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+					<soundCast>Shot_SniperRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- === Bolt Gun === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_BoltGun</defName>
+		<statBases>
+			<Mass>8.50</Mass>
+			<Bulk>8.00</Bulk>
+			<SwayFactor>1.35</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_Bolter75</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_BoltGun"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>0.95</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>True</hasStandardCommand>
+					<defaultProjectile>Bullet_Bolter75_Standard</defaultProjectile>
+					<warmupTime>1</warmupTime>
+					<range>51</range>
+					<burstShotCount>3</burstShotCount>
+					<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+					<soundCast>Shot_SniperRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- === Relic Bolt Gun === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_BoltGunRelic</defName>
+		<statBases>
+			<Mass>8.50</Mass>
+			<Bulk>8.00</Bulk>
+			<SwayFactor>1.30</SwayFactor>
+			<ShotSpread>0.02</ShotSpread>
+			<SightsEfficiency>1.4</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
+		</statBases>
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_Bolter75_Relic</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_BoltGunRelic"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>0.85</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>True</hasStandardCommand>
+					<defaultProjectile>Bullet_Bolter75_Standard_Relic</defaultProjectile>
+					<warmupTime>0.95</warmupTime>
+					<range>55</range>
+					<burstShotCount>6</burstShotCount>
+					<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+					<soundCast>Shot_SniperRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- === Bolt Sniper === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_BoltSniper</defName>
+		<statBases>
+			<Mass>10.20</Mass>
+			<Bulk>10.00</Bulk>
+			<SwayFactor>1.19</SwayFactor>
+			<ShotSpread>0.03</ShotSpread>
+			<SightsEfficiency>2.48</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
+			<NightVisionEfficiency_Weapon>0.55</NightVisionEfficiency_Weapon>
+		</statBases>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_Bolter75</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_BoltSniper"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>0.7</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>True</hasStandardCommand>
+					<defaultProjectile>Bullet_Bolter75_Standard</defaultProjectile>
+					<warmupTime>1.7</warmupTime>
+					<range>75</range>
+					<soundCast>Shot_SniperRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- === Relic Bolt Sniper === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_BoltSniperRelic</defName>
+		<statBases>
+			<Mass>10.20</Mass>
+			<Bulk>10.00</Bulk>
+			<SwayFactor>1.10</SwayFactor>
+			<ShotSpread>0.01</ShotSpread>
+			<SightsEfficiency>3.1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.50</RangedWeapon_Cooldown>
+			<NightVisionEfficiency_Weapon>0.7</NightVisionEfficiency_Weapon>
+		</statBases>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>3.9</reloadTime>
+			<ammoSet>AmmoSet_Bolter75_Relic</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_BoltSniperRelic"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>0.6</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>True</hasStandardCommand>
+					<defaultProjectile>Bullet_Bolter75_Standard_Relic</defaultProjectile>
+					<warmupTime>1.5</warmupTime>
+					<range>81</range>
+					<soundCast>Shot_SniperRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_Braizer.xml b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_Braizer.xml
new file mode 100644
index 0000000000..d07ce7c944
--- /dev/null
+++ b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_Braizer.xml	
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_Brazier"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_Brazier"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.6</MeleeCritChance>
+				<MeleeParryChance>1.2</MeleeParryChance>
+				<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_BrazierRelic"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GF40K_BrazierRelic"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.6</MeleeCritChance>
+				<MeleeParryChance>1.2</MeleeParryChance>
+				<MeleeDodgeChance>0.4</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_BrazierRelic"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>1.85</cooldownTime>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.7</cooldownTime>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_BrazierRelic"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>1.85</cooldownTime>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.7</cooldownTime>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Braizer === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_Brazier</defName>
+		<statBases>
+			<Bulk>9.8</Bulk>
+			<SwayFactor>1.2</SwayFactor>
+			<ShotSpread>0.1</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.62</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.6</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Braizer</defaultProjectile>
+			<warmupTime>0.8</warmupTime>
+			<range>24</range>
+			<burstShotCount>4</burstShotCount>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+	</Operation>
+
+	<!-- === Braizer - Relic === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_BrazierRelic</defName>
+		<statBases>
+			<Bulk>9.8</Bulk>
+			<SwayFactor>1.2</SwayFactor>
+			<ShotSpread>0.1</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.62</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.6</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Braizer_Relic</defaultProjectile>
+			<warmupTime>0.8</warmupTime>
+			<range>24</range>
+			<burstShotCount>4</burstShotCount>
+			<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+			<soundCast>InfernoCannon_Fire</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
+		</Properties>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_FlamerWeapon.xml b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_FlamerWeapon.xml
new file mode 100644
index 0000000000..5d2bc69d7d
--- /dev/null
+++ b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_FlamerWeapon.xml	
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_Flamer"]/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>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_RelicFlamer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.44</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>6</power>
+					<cooldownTime>1.9</cooldownTime>
+					<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.44</cooldownTime>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Flamer === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_Flamer</defName>
+		<statBases>
+			<Mass>6.5</Mass>
+			<Bulk>8.0</Bulk>
+			<SwayFactor>1.25</SwayFactor>
+			<ShotSpread>2.0</ShotSpread>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Flamethrower_Prometheum</defaultProjectile>
+			<burstShotCount>20</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<warmupTime>1.0</warmupTime>
+			<range>16</range>
+			<minRange>3</minRange>
+			<soundCast>HissFlamethrower</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>0</muzzleFlashScale>
+			<ai_IsBuildingDestroyer>True</ai_IsBuildingDestroyer>
+			<targetParams>
+				<canTargetLocations>True</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>60</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_Flamethrower</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>10</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- === Relic Flamer === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_RelicFlamer</defName>
+		<statBases>
+			<Mass>6.5</Mass>
+			<Bulk>8.0</Bulk>
+			<SwayFactor>1.20</SwayFactor>
+			<ShotSpread>1.8</ShotSpread>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.32</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.0</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Flamethrower_Prometheum</defaultProjectile>
+			<burstShotCount>20</burstShotCount>
+			<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+			<warmupTime>1.0</warmupTime>
+			<range>18</range>
+			<minRange>3</minRange>
+			<soundCast>HissFlamethrower</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>0</muzzleFlashScale>
+			<ai_IsBuildingDestroyer>True</ai_IsBuildingDestroyer>
+			<targetParams>
+				<canTargetLocations>True</canTargetLocations>
+			</targetParams>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>60</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_Flamethrower</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>10</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_GalvanicRifleWeapon.xml b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_GalvanicRifleWeapon.xml
new file mode 100644
index 0000000000..fec1c59331
--- /dev/null
+++ b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_GalvanicRifleWeapon.xml	
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_GalvanicRifle"]/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="GF40K_RelicGalvanicRifle"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.4</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>2.95</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.9</cooldownTime>
+					<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.4</cooldownTime>
+					<armorPenetrationBlunt>2.95</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Galvanic Rifle === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_GalvanicRifle</defName>
+		<statBases>
+			<Mass>10.0</Mass>
+			<Bulk>12.0</Bulk>
+			<SwayFactor>2.2</SwayFactor>
+			<ShotSpread>0.05</ShotSpread>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.86</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Gauss_Galvanic</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>75</range>
+			<soundCast>ChargeLance_Fire</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_8mmGauss_Galvanic</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- === Relic Galvanic Rifle === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_RelicGalvanicRifle</defName>
+		<statBases>
+			<Mass>10.0</Mass>
+			<Bulk>12.0</Bulk>
+			<SwayFactor>2</SwayFactor>
+			<ShotSpread>0.04</ShotSpread>
+			<SightsEfficiency>1.3</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.8</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>2</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Gauss_Galvanic_Relic</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>75</range>
+			<soundCast>ChargeLance_Fire</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>12</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_8mmGauss_Galvanic_Relic</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_GrenadeLauncherWeapon.xml b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_GrenadeLauncherWeapon.xml
new file mode 100644
index 0000000000..31f16a1f04
--- /dev/null
+++ b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_GrenadeLauncherWeapon.xml	
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_GrenadeLauncher"]/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="GF40K_RelicGrenadeLauncher"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.44</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>6</power>
+					<cooldownTime>1.9</cooldownTime>
+					<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.44</cooldownTime>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Grenade Launcher === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_GrenadeLauncher</defName>
+		<statBases>
+			<Mass>7.0</Mass>
+			<Bulk>6.0</Bulk>
+			<SwayFactor>1.35</SwayFactor>
+			<ShotSpread>0.17</ShotSpread>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.57</RangedWeapon_Cooldown>
+		</statBases>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_40x53mmGrenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_GrenadeLauncher"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>4.88</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>True</hasStandardCommand>
+					<defaultProjectile>Bullet_40x53mmGrenade_HE</defaultProjectile>
+					<warmupTime>1.0</warmupTime>
+					<range>55</range>
+					<minRange>6</minRange>
+					<soundCast>Mortar_LaunchA</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>14</muzzleFlashScale>
+					<ai_IsBuildingDestroyer>True</ai_IsBuildingDestroyer>
+					<targetParams>
+						<canTargetLocations>True</canTargetLocations>
+					</targetParams>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- === Relic Grenade Launcher === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_RelicGrenadeLauncher</defName>
+		<statBases>
+			<Mass>7.0</Mass>
+			<Bulk>6.0</Bulk>
+			<SwayFactor>1.30</SwayFactor>
+			<ShotSpread>0.13</ShotSpread>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.54</RangedWeapon_Cooldown>
+		</statBases>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.80</reloadTime>
+			<ammoSet>AmmoSet_40x53mmGrenade</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_RelicGrenadeLauncher"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>4.4</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>True</hasStandardCommand>
+					<defaultProjectile>Bullet_40x53mmGrenade_HE</defaultProjectile>
+					<warmupTime>1.0</warmupTime>
+					<range>60</range>
+					<minRange>6</minRange>
+					<soundCast>Mortar_LaunchA</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>14</muzzleFlashScale>
+					<ai_IsBuildingDestroyer>True</ai_IsBuildingDestroyer>
+					<targetParams>
+						<canTargetLocations>True</canTargetLocations>
+					</targetParams>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_LasWeapons.xml b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_LasWeapons.xml
new file mode 100644
index 0000000000..84cd2620c7
--- /dev/null
+++ b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_LasWeapons.xml	
@@ -0,0 +1,454 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "GF40K_LaserPistol" or
+			defName = "GF40K_LaserSMG" or
+			defName = "GF40K_LaserPistolRelic" or
+			defName = "GF40K_LaserSMGRelic"
+			]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "GF40K_LaserSMG" or
+			defName = "GF40K_LaserGun" or
+			defName = "GF40K_LaserCarbine" or
+			defName = "GF40K_LaserSniper" or
+			defName = "GF40K_LaserSMGRelic" or
+			defName = "GF40K_LaserGunRelic" or
+			defName = "GF40K_LaserCarbineRelic" or
+			defName = "GF40K_LaserSniperRelic"
+			]/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>
+
+	<!-- === Remove VWE Overheating Gizmo === -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName = "GF40K_LaserPistol" or
+			defName = "GF40K_LaserSMG" or
+			defName = "GF40K_LaserPistolRelic" or
+			defName = "GF40K_LaserSMGRelic" or
+			defName = "GF40K_LaserGun" or
+			defName = "GF40K_LaserCarbine" or
+			defName = "GF40K_LaserSniper" or
+			defName = "GF40K_LaserGunRelic" or
+			defName = "GF40K_LaserCarbineRelic" or
+			defName = "GF40K_LaserSniperRelic"
+			]/comps/li[@Class="VanillaWeaponsExpandedLaser.CompProperties_LaserCapacitor"]</xpath>
+	</Operation>
+
+	<!-- === Las Pistol === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_LaserPistol</defName>
+		<statBases>
+			<Mass>2.20</Mass>
+			<Bulk>4.30</Bulk>
+			<SwayFactor>1.17</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.01</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Lasgun_Pistol</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>16</range>
+			<soundCast>GF40K_LaserPistolShot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_Lasgun_Pistol</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Relic Las Pistol === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_LaserPistolRelic</defName>
+		<statBases>
+			<Mass>2.20</Mass>
+			<Bulk>4.30</Bulk>
+			<SwayFactor>1.00</SwayFactor>
+			<ShotSpread>0.03</ShotSpread>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.01</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Lasgun_Pistol</defaultProjectile>
+			<warmupTime>0.45</warmupTime>
+			<range>16</range>
+			<soundCast>GF40K_LaserPistolShot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>3.8</reloadTime>
+			<ammoSet>AmmoSet_Lasgun_Pistol</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Laser SMG === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_LaserSMG</defName>
+		<statBases>
+			<Mass>4.2</Mass>
+			<Bulk>6.4</Bulk>
+			<SwayFactor>0.92</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<SightsEfficiency>1.1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.01</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Lasgun_Pistol</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>28</range>
+			<soundCast>GF40K_LaserPistolShot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<burstShotCount>5</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_Lasgun_Pistol</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- === Relic Laser SMG === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_LaserSMGRelic</defName>
+		<statBases>
+			<Mass>4</Mass>
+			<Bulk>6.1</Bulk>
+			<SwayFactor>0.87</SwayFactor>
+			<ShotSpread>0.025</ShotSpread>
+			<SightsEfficiency>1.4</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.01</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Lasgun_Pistol</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>28</range>
+			<burstShotCount>3</burstShotCount>
+			<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
+			<soundCast>GF40K_LaserPistolShot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>3.8</reloadTime>
+			<ammoSet>AmmoSet_Lasgun_Pistol</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- === Las Rifle === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_LaserGun</defName>
+		<statBases>
+			<Mass>5.2</Mass>
+			<Bulk>9.5</Bulk>
+			<SwayFactor>1.35</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.01</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Lasgun_Rifle</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>62</range>
+			<soundCast>GF40K_LaserGunShot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>80</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_Lasgun_Rifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- === Relic Las Rifle === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_LaserGunRelic</defName>
+		<statBases>
+			<Mass>5</Mass>
+			<Bulk>9</Bulk>
+			<SwayFactor>1.30</SwayFactor>
+			<ShotSpread>0.03</ShotSpread>
+			<SightsEfficiency>1.4</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.01</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Lasgun_Rifle</defaultProjectile>
+			<warmupTime>0.95</warmupTime>
+			<range>62</range>
+			<soundCast>GF40K_LaserGunShot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>80</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_Lasgun_Rifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- === Las Carbine === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_LaserCarbine</defName>
+		<statBases>
+			<Mass>4.6</Mass>
+			<Bulk>8.8</Bulk>
+			<SwayFactor>1.25</SwayFactor>
+			<ShotSpread>0.065</ShotSpread>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.01</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Lasgun_Rifle</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>75</range>
+			<soundCast>GF40K_LaserPistolShot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>60</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_Lasgun_Rifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- === Relic Las Carbine === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_LaserCarbineRelic</defName>
+		<statBases>
+			<Mass>4.4</Mass>
+			<Bulk>8.2</Bulk>
+			<SwayFactor>1.20</SwayFactor>
+			<ShotSpread>0.04</ShotSpread>
+			<SightsEfficiency>1.4</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.01</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Lasgun_Rifle</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>75</range>
+			<soundCast>GF40K_LaserPistolShot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>60</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_Lasgun_Rifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- === Las Sniper Rifle === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_LaserSniper</defName>
+		<statBases>
+			<Mass>8.5</Mass>
+			<Bulk>12</Bulk>
+			<SwayFactor>1.19</SwayFactor>
+			<ShotSpread>0.025</ShotSpread>
+			<SightsEfficiency>2.48</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
+			<NightVisionEfficiency_Weapon>0.55</NightVisionEfficiency_Weapon>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.01</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Lasgun_HellGun</defaultProjectile>
+			<warmupTime>1.7</warmupTime>
+			<range>81</range>
+			<soundCast>GF40K_LaserSniperShot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_Lasgun_HellGun</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- === Relic Las Sniper Rifle === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_LaserSniperRelic</defName>
+		<statBases>
+			<Mass>8.12</Mass>
+			<Bulk>11.25</Bulk>
+			<SwayFactor>1.10</SwayFactor>
+			<ShotSpread>0.01</ShotSpread>
+			<SightsEfficiency>3.1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.50</RangedWeapon_Cooldown>
+			<NightVisionEfficiency_Weapon>0.7</NightVisionEfficiency_Weapon>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.01</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Lasgun_HellGun</defaultProjectile>
+			<warmupTime>1.5</warmupTime>
+			<range>81</range>
+			<soundCast>GF40K_LaserSniperShot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>3.9</reloadTime>
+			<ammoSet>AmmoSet_Lasgun_HellGun</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_Meltagun.xml b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_Meltagun.xml
new file mode 100644
index 0000000000..d0b2e0bc0e
--- /dev/null
+++ b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_Meltagun.xml	
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "GF40K_Hellgun" or
+			defName = "GF40K_HellgunRelic"
+			]/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>
+
+	<!-- === Remove VWE Overheating Gizmo === -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName = "GF40K_Hellgun" or
+			defName = "GF40K_HellgunRelic"
+			]/comps/li[@Class="VanillaWeaponsExpandedLaser.CompProperties_LaserCapacitor"]</xpath>
+	</Operation>
+
+	<!-- === Hellgun === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_LaserGun</defName>
+		<statBases>
+			<Mass>5.75</Mass>
+			<Bulk>10.15</Bulk>
+			<SwayFactor>1.35</SwayFactor>
+			<ShotSpread>0.04</ShotSpread>
+			<SightsEfficiency>1.2</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.01</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Lasgun_HellGun</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>66</range>
+			<soundCast>GF40K_LaserGunShot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>60</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_Lasgun_HellGun</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- === Relic Hellgun === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_HellgunRelic</defName>
+		<statBases>
+			<Mass>5.15</Mass>
+			<Bulk>9.85</Bulk>
+			<SwayFactor>1.15</SwayFactor>
+			<ShotSpread>0.02</ShotSpread>
+			<SightsEfficiency>1.5</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.01</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_Lasgun_HellGun</defaultProjectile>
+			<warmupTime>0.95</warmupTime>
+			<range>70</range>
+			<soundCast>GF40K_LaserGunShot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>11</muzzleFlashScale>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>60</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_Lasgun_HellGun</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_PlasmaWeapons.xml b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_PlasmaWeapons.xml
new file mode 100644
index 0000000000..4a8174f58a
--- /dev/null
+++ b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_PlasmaWeapons.xml	
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "GF40K_PlasmaPistol" or
+			defName = "GF40K_PlasmaPistolRelic"
+			]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "GF40K_PlasmaGun" or
+			defName = "GF40K_PlasmaGunRelic"
+			]/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>
+
+	<!-- === Remove VE Laser components === -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			defName = "GF40K_PlasmaPistolRelic" or
+			defName = "GF40K_PlasmaGunRelic"
+			]/comps/li[@Class="VanillaWeaponsExpandedLaser.CompProperties_LaserCapacitor"]</xpath>
+	</Operation>
+
+	<!-- === Plasma Pistol === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_PlasmaPistol</defName>
+		<statBases>
+			<Mass>2.5</Mass>
+			<Bulk>5.0</Bulk>
+			<SwayFactor>1.17</SwayFactor>
+			<ShotSpread>0.15</ShotSpread>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_PlasmaPistol</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>16</range>
+			<soundCast>GF40K_LaserPistolShot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_PlasmaCanister_Pistol</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Relic Plasma Pistol === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_PlasmaPistolRelic</defName>
+		<statBases>
+			<Mass>2.5</Mass>
+			<Bulk>5.0</Bulk>
+			<SwayFactor>1.00</SwayFactor>
+			<ShotSpread>0.05</ShotSpread>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.3</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_PlasmaPistol_Relic</defaultProjectile>
+			<warmupTime>0.45</warmupTime>
+			<range>18</range>
+			<soundCast>GF40K_LaserPistolShot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>3.8</reloadTime>
+			<ammoSet>AmmoSet_PlasmaCanister_Pistol_Relic</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Plasma Gun === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_PlasmaGun</defName>
+		<statBases>
+			<Mass>6.50</Mass>
+			<Bulk>8.00</Bulk>
+			<SwayFactor>1.35</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.65</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_PlasmaRifle</defaultProjectile>
+			<warmupTime>1</warmupTime>
+			<range>55</range>
+			<soundCast>GF40K_LaserPistolShot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_PlasmaCanister_Rifle</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<!-- === Relic Plasma Gun === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_PlasmaGunRelic</defName>
+		<statBases>
+			<Mass>6.50</Mass>
+			<Bulk>8.00</Bulk>
+			<SwayFactor>1.30</SwayFactor>
+			<ShotSpread>0.02</ShotSpread>
+			<SightsEfficiency>1.4</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.4</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_PlasmaRifle_Relic</defaultProjectile>
+			<warmupTime>0.95</warmupTime>
+			<range>58</range>
+			<soundCast>GF40K_LaserPistolShot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_PlasmaCanister_Rifle_Relic</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_StubberWeapons.xml b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_StubberWeapons.xml
new file mode 100644
index 0000000000..dbb5e052ed
--- /dev/null
+++ b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_StubberWeapons.xml	
@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "GF40K_StubShotgun" or
+			defName = "GF40K_StubCarbine" or
+			defName = "GF40K_StubPistol" or
+			defName = "GF40K_StubSniper"
+			]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "GF40K_StubHMG"]/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>
+
+	<!-- === Stub Shotgun === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_StubShotgun</defName>
+		<statBases>
+			<Mass>5.5</Mass>
+			<Bulk>7</Bulk>
+			<SwayFactor>1.25</SwayFactor>
+			<ShotSpread>0.15</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_23x75mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_StubShotgun"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.75</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>True</hasStandardCommand>
+					<defaultProjectile>Bullet_23x75mmR_Buck</defaultProjectile>
+					<warmupTime>0.5</warmupTime>
+					<range>16</range>
+					<ticksBetweenBurstShots>14</ticksBetweenBurstShots>
+					<soundCast>Shot_Shotgun</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- === Stub HMG === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_StubHMG</defName>
+		<statBases>
+			<Mass>8.50</Mass>
+			<Bulk>12.5</Bulk>
+			<SwayFactor>1.35</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
+		</statBases>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>SuppressFire</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_StubHMG"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.4</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>True</hasStandardCommand>
+					<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+					<warmupTime>1.2</warmupTime>
+					<range>62</range>
+					<burstShotCount>10</burstShotCount>
+					<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+					<soundCast>HeavyMG</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- === Stub Carbine === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_StubCarbine</defName>
+		<statBases>
+			<Mass>4.21</Mass>
+			<Bulk>9.6</Bulk>
+			<SwayFactor>1.30</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_StubCarbine"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.5</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>True</hasStandardCommand>
+					<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+					<warmupTime>1.05</warmupTime>
+					<range>55</range>
+					<burstShotCount>6</burstShotCount>
+					<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+					<soundCast>Shot_Shotgun_NoRack</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- === Stub Sniper === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_StubSniper</defName>
+		<statBases>
+			<Mass>8.20</Mass>
+			<Bulk>12.00</Bulk>
+			<SwayFactor>1.34</SwayFactor>
+			<ShotSpread>0.04</ShotSpread>
+			<SightsEfficiency>2.6</SightsEfficiency>
+			<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
+		</statBases>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_StubSniper"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.4</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>True</hasStandardCommand>
+					<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+					<warmupTime>1.7</warmupTime>
+					<range>75</range>
+					<soundCast>Shot_SniperRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- === Stub Pistol === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_StubPistol</defName>
+		<statBases>
+			<Mass>1.20</Mass>
+			<Bulk>2.50</Bulk>
+			<SwayFactor>1.05</SwayFactor>
+			<ShotSpread>0.15</ShotSpread>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+		</statBases>
+		<AmmoUser>
+			<magazineSize>9</magazineSize>
+			<reloadTime>3.5</reloadTime>
+			<ammoSet>AmmoSet_50AE</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_StubPistol"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.7</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>True</hasStandardCommand>
+					<defaultProjectile>Bullet_50AE_FMJ</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<range>15</range>
+					<soundCast>Shot_Shotgun_NoRack</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_StubberWeapons_Relic.xml b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_StubberWeapons_Relic.xml
new file mode 100644
index 0000000000..7cbe804400
--- /dev/null
+++ b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_StubberWeapons_Relic.xml	
@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName = "GF40K_RelicStubShotgun" or
+			defName = "GF40K_RelicStubHMG" or
+			defName = "GF40K_RelicStubCarbine" or
+			defName = "GF40K_RelicStubPistol" or
+			defName = "GF40K_RelicStubSniper"
+			]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Stub Shotgun === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_RelicStubShotgun</defName>
+		<statBases>
+			<Mass>5.5</Mass>
+			<Bulk>7</Bulk>
+			<SwayFactor>1.20</SwayFactor>
+			<ShotSpread>0.12</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
+		</statBases>
+		<AmmoUser>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_23x75mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_RelicStubShotgun"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>2.4</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>True</hasStandardCommand>
+					<defaultProjectile>Bullet_23x75mmR_Buck</defaultProjectile>
+					<warmupTime>0.4</warmupTime>
+					<range>16</range>
+					<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+					<soundCast>Shot_Shotgun_NoRack</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- === Stub HMG === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_RelicStubHMG</defName>
+		<statBases>
+			<Mass>8.50</Mass>
+			<Bulk>12.5</Bulk>
+			<SwayFactor>1.30</SwayFactor>
+			<ShotSpread>0.05</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+		</statBases>
+		<AmmoUser>
+			<magazineSize>50</magazineSize>
+			<reloadTime>5</reloadTime>
+			<ammoSet>AmmoSet_50BMG</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_RelicStubHMG"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.3</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>True</hasStandardCommand>
+					<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>65</range>
+					<burstShotCount>10</burstShotCount>
+					<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+					<soundCast>Shot_CE_BattleRifle</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- === Stub Carbine === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_RelicStubCarbine</defName>
+		<statBases>
+			<Mass>4.21</Mass>
+			<Bulk>11.2</Bulk>
+			<SwayFactor>1.22</SwayFactor>
+			<ShotSpread>0.04</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.32</RangedWeapon_Cooldown>
+		</statBases>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_RelicStubCarbine"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.4</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>True</hasStandardCommand>
+					<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+					<warmupTime>1</warmupTime>
+					<range>65</range>
+					<burstShotCount>6</burstShotCount>
+					<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+					<soundCast>Shot_AssaultRifle</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- === Stub Sniper === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_RelicStubSniper</defName>
+		<statBases>
+			<Mass>8.20</Mass>
+			<Bulk>12.00</Bulk>
+			<SwayFactor>1.11</SwayFactor>
+			<ShotSpread>0.02</ShotSpread>
+			<SightsEfficiency>3.2</SightsEfficiency>
+			<RangedWeapon_Cooldown>1.25</RangedWeapon_Cooldown>
+		</statBases>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x54mmR</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_RelicStubSniper"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.1</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>True</hasStandardCommand>
+					<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
+					<warmupTime>1.6</warmupTime>
+					<range>82</range>
+					<soundCast>Shot_SniperRifle</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<!-- === Stub Pistol === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_RelicStubPistol</defName>
+		<statBases>
+			<Mass>1.20</Mass>
+			<Bulk>2.50</Bulk>
+			<SwayFactor>1.02</SwayFactor>
+			<ShotSpread>0.12</ShotSpread>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<AmmoUser>
+			<magazineSize>9</magazineSize>
+			<reloadTime>3</reloadTime>
+			<ammoSet>AmmoSet_50AE</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_RelicStubPistol"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.4</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>True</hasStandardCommand>
+					<defaultProjectile>Bullet_50AE_FMJ</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<range>16</range>
+					<soundCast>Shot_Shotgun_NoRack</soundCast>
+					<soundCastTail>GunTail_Light</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_Tox_Relic.xml b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_Tox_Relic.xml
new file mode 100644
index 0000000000..fc931f55f9
--- /dev/null
+++ b/ModPatches/Warhammer 40.000 - Imperium Weaponry/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_Tox_Relic.xml	
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Tools === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_PhosphorPistolRelic" or defName="GF40K_RelicRadiumPistol"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>grip</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GF40K_RelicRadiumCarbine"]/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>
+
+	<!-- === Remove VWE: Laser Components === -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName = "GF40K_PhosphorPistolRelic"]/comps/li[@Class="VanillaWeaponsExpandedLaser.CompProperties_LaserCapacitor"]</xpath>
+	</Operation>
+
+	<!-- === Phosphor Pistol === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_PhosphorPistolRelic</defName>
+		<statBases>
+			<Bulk>2.5</Bulk>
+			<SwayFactor>1.25</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_30x64mmFuel_Incendiary</defaultProjectile>
+			<warmupTime>0.95</warmupTime>
+			<range>28</range>
+			<soundCast>GF40K_LaserPistolShot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadTime>5.2</reloadTime>
+			<ammoSet>AmmoSet_30x64mmFuel</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Radium Pistol === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_RelicRadiumPistol</defName>
+		<statBases>
+			<Mass>1.25</Mass>
+			<Bulk>2.5</Bulk>
+			<SwayFactor>1.25</SwayFactor>
+			<ShotSpread>0.06</ShotSpread>
+			<SightsEfficiency>0.8</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_RadiumPistol_Tox</defaultProjectile>
+			<warmupTime>0.5</warmupTime>
+			<range>18</range>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_Radium_Pistol</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- === Radium Carbine === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>GF40K_RelicRadiumCarbine</defName>
+		<statBases>
+			<Mass>5.0</Mass>
+			<Bulk>10.00</Bulk>
+			<SwayFactor>1.5</SwayFactor>
+			<ShotSpread>0.05</ShotSpread>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.7</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_RadiumCarbine_Tox</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>62</range>
+			<burstShotCount>4</burstShotCount>
+			<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
+			<soundCast>GF40K_LaserPistolShot</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_Radium_Carbine</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aiUseBurstMode>True</aiUseBurstMode>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/Abilities_SpaceMarine.xml b/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/Abilities_SpaceMarine.xml
new file mode 100644
index 0000000000..acdb085542
--- /dev/null
+++ b/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/Abilities_SpaceMarine.xml	
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ============== Betcher's Spit ================ -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AbilityDef[defName="BEWH_BetchersSpit"]/verbProperties/range</xpath>
+		<value>
+			<range>32</range>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BEWH_SpitProjectile"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<damageDef>AcidBurn</damageDef>
+				<speed>48</speed>
+				<damageAmountBase>18</damageAmountBase>
+				<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				<shadowSize>0</shadowSize>
+				<filth>Filth_SpentAcid</filth>
+				<filthCount>1</filthCount>
+				<arcHeightFactor>0.4</arcHeightFactor>
+			</projectile>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/GeneDefs.xml b/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/GeneDefs.xml
new file mode 100644
index 0000000000..ecc7db998d
--- /dev/null
+++ b/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/GeneDefs.xml	
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Progenoid Glands -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/GeneDef[defName="BEWH_ProgenoidGlands"]</xpath>
+		<value>
+			<statOffsets>
+				<SmokeSensitivity>-1</SmokeSensitivity>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<!-- Multi-Lung -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/GeneDef[defName="BEWH_MultiLung"]/statOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!-- Occulobe -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/GeneDef[defName="BEWH_Occulobe"]</xpath>
+		<value>
+			<statOffsets>
+				<NightVisionEfficiency>0.8</NightVisionEfficiency>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<!-- Ossmodula -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/GeneDef[defName="BEWH_Ossmodula"]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/GeneDef[defName="BEWH_Ossmodula"]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Biscopea -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/GeneDef[defName="BEWH_Biscopea"]/statOffsets/CarryingCapacity</xpath>
+		<value>
+			<CarryWeight>100</CarryWeight>
+		</value>
+	</Operation>
+
+	<!-- Sinew Coil -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/GeneDef[defName="BEWH_SinewCoil"]/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<CarryWeight>100</CarryWeight>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<!-- Custodes -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/GeneDef[defName="BEWH_Custodes"]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>24.5</ArmorRating_Blunt>
+			<NightVisionEfficiency>0.8</NightVisionEfficiency>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/GeneDef[defName="BEWH_Custodes"]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/GeneDef[defName="BEWH_Custodes"]/statOffsets/CarryingCapacity</xpath>
+		<value>
+			<CarryWeight>200</CarryWeight>
+		</value>
+	</Operation>
+
+	<!-- Primarch -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/GeneDef[defName="BEWH_Primarch"]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>33.75</ArmorRating_Blunt>
+			<NightVisionEfficiency>0.8</NightVisionEfficiency>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/GeneDef[defName="BEWH_Primarch"]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>11</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/GeneDef[defName="BEWH_Primarch"]/statOffsets/CarryingCapacity</xpath>
+		<value>
+			<CarryWeight>250</CarryWeight>
+		</value>
+	</Operation>
+
+	<!-- Mark of Nurgle -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/GeneDef[defName="BEWH_NurgleMark"]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/GeneDef[defName="BEWH_NurgleMark"]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Mark of Chaos -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/GeneDef[defName="BEWH_UndividedMark"]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/GeneDef[defName="BEWH_UndividedMark"]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Daemon Hide -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/GeneDef[defName="BEWH_DaemonHide"]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>17</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/GeneDef[defName="BEWH_DaemonHide"]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<!-- Daemon Wings -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/GeneDef[defName="BEWH_DaemonWings"]/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<CarryWeight>100</CarryWeight>
+			</statOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/Hediffs_Attacks.xml b/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/Hediffs_Attacks.xml
new file mode 100644
index 0000000000..d533bdff79
--- /dev/null
+++ b/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/Hediffs_Attacks.xml	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Daemonic Melee Attacks -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BEWH_DaemonicHornAttack"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>daemonic horns</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>0.82</cooldownTime>
+					<armorPenetrationSharp>8</armorPenetrationSharp>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BEWH_DaemonicTailAttack"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>daemonic tail</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<cooldownTime>0.76</cooldownTime>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/PawnKinds.xml b/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/PawnKinds.xml
new file mode 100644
index 0000000000..ca213fc3c7
--- /dev/null
+++ b/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/PawnKinds.xml	
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Chaos Cultist & Imperial Trader -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="ChaosCultistBasePawn" or defName="BEWH_ImperiumTrader"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Chaos Cultist -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="ChaosCultistBasePawn"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>4</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Daemon Prince -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="DaemonPrincePawnBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>12</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Space Marines -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="ChaosMarineBasePawn" or @Name="SpaceMarineBasePawn"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>6</min>
+					<max>10</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/TraderKinds.xml b/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/TraderKinds.xml
new file mode 100644
index 0000000000..26db83b8e3
--- /dev/null
+++ b/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/TraderKinds.xml	
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Imperial Base ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="BEWH_ImperiumTraderBase"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>FSX</thingDef>
+				<countRange>
+					<min>25</min>
+					<max>100</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_SingleDef">
+				<thingDef>Prometheum</thingDef>
+				<countRange>
+					<min>25</min>
+					<max>100</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Ammo</tradeTag>
+				<countRange>
+					<min>500</min>
+					<max>2000</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>5</min>
+					<max>9</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_MediumAmmo</tradeTag>
+				<countRange>
+					<min>30</min>
+					<max>100</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>5</min>
+					<max>8</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_HeavyAmmo</tradeTag>
+				<countRange>
+					<min>10</min>
+					<max>50</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>4</min>
+					<max>6</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Category">
+				<categoryDef>Ammo</categoryDef>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>0</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Turret</tradeTag>
+				<thingDefCountRange>
+					<min>-2</min>
+					<max>4</max>
+				</thingDefCountRange>
+				<countRange>
+					<min>1</min>
+					<max>2</max>
+				</countRange>
+			</li>
+			<li Class="StockGenerator_Category">
+				<categoryDef>WeaponsTurrets</categoryDef>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>0</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Animals">
+				<tradeTagsSell>
+					<li>CE_AnimalBoom</li>
+				</tradeTagsSell>
+				<tradeTagsBuy>
+					<li>CE_AnimalBoom</li>
+				</tradeTagsBuy>
+				<kindCountRange>
+					<min>1</min>
+					<max>2</max>
+				</kindCountRange>
+				<countRange>
+					<min>-2</min>
+					<max>4</max>
+				</countRange>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Imperial Caravan ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TraderKindDef[defName="BEWH_ImperiumTraderCaravan"]/stockGenerators</xpath>
+		<value>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_Ammo</tradeTag>
+				<countRange>
+					<min>200</min>
+					<max>400</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>1</min>
+					<max>4</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_MediumAmmo</tradeTag>
+				<countRange>
+					<min>20</min>
+					<max>40</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>2</min>
+					<max>6</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Tag">
+				<tradeTag>CE_HeavyAmmo</tradeTag>
+				<countRange>
+					<min>5</min>
+					<max>10</max>
+				</countRange>
+				<thingDefCountRange>
+					<min>2</min>
+					<max>4</max>
+				</thingDefCountRange>
+			</li>
+			<li Class="StockGenerator_Category">
+				<categoryDef>Ammo</categoryDef>
+				<thingDefCountRange>
+					<min>0</min>
+					<max>0</max>
+				</thingDefCountRange>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Waster Toxic Breather/Patches/Waster Toxic Breather/WasterBreather.xml b/ModPatches/Waster Toxic Breather/Patches/Waster Toxic Breather/WasterBreather.xml
new file mode 100644
index 0000000000..fbff8f2f66
--- /dev/null
+++ b/ModPatches/Waster Toxic Breather/Patches/Waster Toxic Breather/WasterBreather.xml	
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Gas Mask  -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WTM_ToxicBreather"]/statBases</xpath>
+		<value>
+			<statBases>
+				<WorkToMake>8000</WorkToMake>
+				<MaxHitPoints>100</MaxHitPoints>
+				<Mass>0.5</Mass>
+				<Bulk>3</Bulk>
+				<WornBulk>1</WornBulk>
+				<EquipDelay>0.5</EquipDelay>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="WTM_ToxicBreather"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="WTM_ToxicBreather"]</xpath>
+		<value>
+			<li Class="CombatExtended.ApparelHediffExtension">
+				<hediff>WearingGasMask</hediff>
+			</li>
+			<li Class="CombatExtended.ApperalRenderingExtension">
+				<HideHair>false</HideHair>
+				<HideBeard>true</HideBeard>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WTM_ToxicBreather"]/apparel/hatRenderedFrontOfFace</xpath>
+		<value>
+			<hatRenderedFrontOfFace>false</hatRenderedFrontOfFace>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="WTM_ToxicBreather"]/apparel/layers</xpath>
+		<value>
+			<layers>
+				<li>StrappedHead</li>
+			</layers>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Weapons+/Patches/Weapons+/WeaponsPlus_MeleeWeapons.xml b/ModPatches/Weapons+/Patches/Weapons+/WeaponsPlus_MeleeWeapons.xml
new file mode 100644
index 0000000000..10832e409f
--- /dev/null
+++ b/ModPatches/Weapons+/Patches/Weapons+/WeaponsPlus_MeleeWeapons.xml
@@ -0,0 +1,1031 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Great Axe -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Great_Axe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>3</cooldownTime>
+					<armorPenetrationBlunt>2.813</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>42</power>
+					<cooldownTime>1.89</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>11.250</armorPenetrationBlunt>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Great_Axe"]/statBases</xpath>
+		<value>
+			<Bulk>11</Bulk>
+			<MeleeCounterParryBonus>0.36</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Great_Axe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.05</MeleeCritChance>
+				<MeleeParryChance>0.48</MeleeParryChance>
+				<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Flail -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Flail"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>0.79</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Flail"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Flail"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.2</MeleeCritChance>
+				<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Flail"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- Nunchaku -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Nunchaku"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>0.72</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Nunchaku"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Nunchaku"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.13</MeleeCritChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Maul -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Maul"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>34</power>
+					<cooldownTime>2.01</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Maul"]/statBases</xpath>
+		<value>
+			<Bulk>16</Bulk>
+			<MeleeCounterParryBonus>0.28</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Maul"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.6</MeleeCritChance>
+				<MeleeParryChance>0.38</MeleeParryChance>
+				<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Morning Star -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Morning_Star"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetrationBlunt>0.650</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetrationBlunt>5.850</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Morning_Star"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.23</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Morning_Star"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.43</MeleeCritChance>
+				<MeleeParryChance>0.23</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Morning_Star"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- Primitive Knife -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Primitive_Knife"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.23</cooldownTime>
+					<armorPenetrationBlunt>0.225</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>0.95</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.380</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.04</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>0.77</cooldownTime>
+					<armorPenetrationBlunt>0.576</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Primitive_Knife"]/statBases</xpath>
+		<value>
+			<Bulk>1.2</Bulk>
+			<MeleeCounterParryBonus>0.11</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Primitive_Knife"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.56</MeleeCritChance>
+				<MeleeParryChance>0.11</MeleeParryChance>
+				<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Primitive_Knife"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_Sidearm_Tribal</li>
+		</value>
+	</Operation>
+
+	<!-- Kukri -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Kukri"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.32</cooldownTime>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>0.83</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.768</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.35</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.32</cooldownTime>
+					<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.06</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Kukri"]/statBases</xpath>
+		<value>
+			<Bulk>1.8</Bulk>
+			<MeleeCounterParryBonus>0.25</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Kukri"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.21</MeleeCritChance>
+				<MeleeParryChance>0.25</MeleeParryChance>
+				<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Kukri"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_Sidearm_Melee</li>
+		</value>
+	</Operation>
+
+	<!-- Bardiche -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Bardiche"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.23</cooldownTime>
+					<armorPenetrationBlunt>2.588</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>42</power>
+					<cooldownTime>1.85</cooldownTime>
+					<armorPenetrationBlunt>1.150</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.15</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>48</power>
+					<cooldownTime>2.22</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>7.188</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.44</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Bardiche"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<MeleeCounterParryBonus>0.61</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Bardiche"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.17</MeleeCritChance>
+				<MeleeParryChance>0.7</MeleeParryChance>
+				<MeleeDodgeChance>0.43</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Glaive -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="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="MeleeWeapon_Glaive"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>0.89</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Glaive"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.22</MeleeCritChance>
+				<MeleeParryChance>1.33</MeleeParryChance>
+				<MeleeDodgeChance>0.57</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Glaive"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawSize>1.7,1.7</DrawSize>
+				<DrawOffset>0.3,0.4</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Bo Staff -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Bo_Staff"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>0.5</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>end</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.63</cooldownTime>
+					<armorPenetrationBlunt>0.7</armorPenetrationBlunt>
+					<!-- <linkedBodyPartsGroup>End</linkedBodyPartsGroup> -->
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Bo_Staff"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>1.38</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Bo_Staff"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.7</MeleeCritChance>
+				<MeleeParryChance>1.43</MeleeParryChance>
+				<MeleeDodgeChance>0.57</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Scythe -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Scythe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.78</cooldownTime>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>29</power>
+					<cooldownTime>3.57</cooldownTime>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>3.57</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.5</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Scythe"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<MeleeCounterParryBonus>0.33</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<!-- *** Replace instead of Add *** -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Scythe"]/equippedStatOffsets</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.2</MeleeCritChance>
+				<MeleeParryChance>0.5</MeleeParryChance>
+				<PlantHarvestYield>0.1</PlantHarvestYield>
+				<PlantWorkSpeed>0.1</PlantWorkSpeed>
+				<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Naginata -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Naginata"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.14</cooldownTime>
+					<armorPenetrationBlunt>1.913</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>49</power>
+					<cooldownTime>1.71</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>7.650</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.7</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>1.07</cooldownTime>
+					<armorPenetrationBlunt>2.176</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.42</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Naginata"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>1.13</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Naginata"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.24</MeleeCritChance>
+				<MeleeParryChance>1.18</MeleeParryChance>
+				<MeleeDodgeChance>0.57</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Brass Knuckles -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Brass_Knuckles"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>knuckles</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.46</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Brass_Knuckles"]/statBases</xpath>
+		<value>
+			<Bulk>1.2</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Brass_Knuckles"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.13</MeleeCritChance>
+				<MeleeParryChance>0.13</MeleeParryChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Brass_Knuckles"]/weaponTags</xpath>
+		<value>
+			<li>CE_Sidearm_Melee</li>
+		</value>
+	</Operation>
+
+	<!-- Tonfa -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Tonfa"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>end</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.6</cooldownTime>
+					<armorPenetrationBlunt>0.650</armorPenetrationBlunt>
+					<!-- <linkedBodyPartsGroup>End</linkedBodyPartsGroup> -->
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>side</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.6</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.650</armorPenetrationBlunt>
+					<!-- <linkedBodyPartsGroup>Side</linkedBodyPartsGroup> -->
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Tonfa"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>0.02</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Tonfa"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.43</MeleeCritChance>
+				<MeleeParryChance>0.19</MeleeParryChance>
+				<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Katana -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Katana"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.66</cooldownTime>
+					<armorPenetrationBlunt>0.750</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>1.66</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>0.750</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.84</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>43</power>
+					<cooldownTime>0.66</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>4.688</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.05</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Katana"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<MeleeCounterParryBonus>0.71</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<!-- Changing Mass since it's a 2h weapon now -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Katana"]/statBases/Mass</xpath>
+		<value>
+			<Mass>1.5</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Katana"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.27</MeleeCritChance>
+				<MeleeParryChance>0.53</MeleeParryChance>
+				<MeleeDodgeChance>0.27</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Claymore -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Claymore"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.89</cooldownTime>
+					<armorPenetrationBlunt>1.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>1.89</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>1.250</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.7</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>54</power>
+					<cooldownTime>0.86</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>6.05</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.68</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Claymore"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>0.69</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Claymore"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.13</MeleeCritChance>
+				<MeleeParryChance>0.52</MeleeParryChance>
+				<MeleeDodgeChance>0.43</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Zweihander -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Zweihander"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.01</cooldownTime>
+					<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>60</power>
+					<cooldownTime>2.01</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.89</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>61</power>
+					<cooldownTime>1</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>6.4</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.72</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Zweihander"]/statBases</xpath>
+		<value>
+			<Bulk>12</Bulk>
+			<MeleeCounterParryBonus>0.83</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Zweihander"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.8</MeleeCritChance>
+				<MeleeParryChance>0.63</MeleeParryChance>
+				<MeleeDodgeChance>0.67</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Sabre -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Sabre"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1.42</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.42</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>0.89</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>1.024</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.46</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Sabre"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+			<MeleeCounterParryBonus>0.53</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Sabre"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.31</MeleeCritChance>
+				<MeleeParryChance>0.53</MeleeParryChance>
+				<MeleeDodgeChance>0.28</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Sabre"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Weapons+/Patches/Weapons+/WeaponsPlus_Projectiles.xml b/ModPatches/Weapons+/Patches/Weapons+/WeaponsPlus_Projectiles.xml
new file mode 100644
index 0000000000..8b40c2d42f
--- /dev/null
+++ b/ModPatches/Weapons+/Patches/Weapons+/WeaponsPlus_Projectiles.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Kunai_Thrown -->
+	<Operation Class="PatchOperationAttributeAdd">
+		<xpath>Defs/ThingDef[defName="Kunai_Thrown"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Kunai_Thrown"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<damageDef>Stab</damageDef>
+				<damageAmountBase>10</damageAmountBase>
+				<speed>12</speed>
+				<armorPenetrationSharp>0.5</armorPenetrationSharp>
+				<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
+				<preExplosionSpawnThingDef>RangedWeapon_Kunai</preExplosionSpawnThingDef>
+			</projectile>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Weapons+/Patches/Weapons+/WeaponsPlus_RangedWeapons.xml b/ModPatches/Weapons+/Patches/Weapons+/WeaponsPlus_RangedWeapons.xml
new file mode 100644
index 0000000000..05308b8cc4
--- /dev/null
+++ b/ModPatches/Weapons+/Patches/Weapons+/WeaponsPlus_RangedWeapons.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAttributeAdd">
+		<xpath>Defs/ThingDef[defName="RangedWeapon_Kunai"]</xpath>
+		<attribute>Class</attribute>
+		<value>CombatExtended.AmmoDef</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/ThingDef[defName="RangedWeapon_Kunai"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>BaseWeaponAndAmmoNeolithic</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RangedWeapon_Kunai"]/graphicData</xpath>
+		<value>
+			<graphicData>
+				<texPath>Things/Ammo/Neolithic/Kunai</texPath>
+				<graphicClass>Graphic_StackCount</graphicClass>
+				<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
+			</graphicData>
+		</value>
+	</Operation>
+
+	<!-- Kunai is made of stuff, we remove that and just give a steel cost per kunai. -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="RangedWeapon_Kunai"]/costStuffCount|Defs/ThingDef[defName="RangedWeapon_Kunai"]/stuffCategories</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RangedWeapon_Kunai"]</xpath>
+		<value>
+			<costList>
+				<Steel>3</Steel>
+			</costList>
+			<stackLimit>75</stackLimit>
+			<tradeTags>
+				<li>CE_AutoEnableTrade</li>
+			</tradeTags>
+			<ammoClass>Kunai</ammoClass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RangedWeapon_Kunai"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.26</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RangedWeapon_Kunai"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Kunai_Thrown</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<range>4</range>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="RangedWeapon_Kunai"]/statBases</xpath>
+		<value>
+			<statBases>
+				<WorkToMake>1000</WorkToMake>
+				<MarketValue>4</MarketValue>
+				<SightsEfficiency>1.0</SightsEfficiency>
+				<ShotSpread>1.5</ShotSpread>
+				<SwayFactor>2.5</SwayFactor>
+				<Bulk>1.00</Bulk>
+				<Mass>0.2</Mass>
+				<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
+			</statBases>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="RangedWeapon_Kunai"]/weaponTags</xpath>
+		<value>
+			<li>CE_Pila</li>
+			<li>CE_OneHandedWeapon</li>
+			<li>CE_AI_Rifle</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Windows/Patches/Windows/Openvindows.xml b/ModPatches/Windows/Patches/Windows/Openvindows.xml
new file mode 100644
index 0000000000..7b77b07dce
--- /dev/null
+++ b/ModPatches/Windows/Patches/Windows/Openvindows.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name = "WindowBase"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.6</fillPercent>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Xenn/Defs/Xenn/ThingDefs_Misc/Xenn_Ammo.xml b/ModPatches/Xenn/Defs/Xenn/ThingDefs_Misc/Xenn_Ammo.xml
new file mode 100644
index 0000000000..9af7ca3325
--- /dev/null
+++ b/ModPatches/Xenn/Defs/Xenn/ThingDefs_Misc/Xenn_Ammo.xml
@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<ThingCategoryDef>
+		<defName>AmmoXennCell</defName>
+		<label>Xenn Fuel Cell</label>
+		<parent>AmmoAdvanced</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberFuel</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_XennFuel</defName>
+		<label>Xenn Fuel Cell</label>
+		<ammoTypes>
+			<Ammo_Xenn_Hot>Bullet_Xenn_Hot</Ammo_Xenn_Hot>
+			<Ammo_Xenn_Cold>Bullet_Xenn_Cold</Ammo_Xenn_Cold>
+			<Ammo_Xenn_Foam>Bullet_Xenn_Foam</Ammo_Xenn_Foam>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="XennCellBase" ParentName="SpacerSmallAmmoBase" Abstract="True">
+		<description>Container holding fuel for Xenn weaponry.</description>
+		<statBases>
+			<Mass>0.3</Mass>
+			<Bulk>0.2</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoXennCell</li>
+		</thingCategories>
+		<stackLimit>75</stackLimit>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="XennCellBase">
+		<defName>Ammo_Xenn_Hot</defName>
+		<label>Xenn Plasma Cell</label>
+		<graphicData>
+			<texPath>Things/Ammo/FuelCell/Incendiary</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>1.52</MarketValue>
+		</statBases>
+		<ammoClass>IncendiaryFuel</ammoClass>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="XennCellBase">
+		<defName>Ammo_Xenn_Cold</defName>
+		<label>Xenn Cryogenic Cell</label>
+		<graphicData>
+			<texPath>Things/Ammo/FuelCell/Thermobaric</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>2.16</MarketValue>
+		</statBases>
+		<ammoClass>ThermobaricFuel</ammoClass>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="XennCellBase">
+		<defName>Ammo_Xenn_Foam</defName>
+		<label>Xenn Firefoam Cell</label>
+		<graphicData>
+			<texPath>Things/Ammo/FuelCell/Foam</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.61</MarketValue>
+		</statBases>
+		<ammoClass>FoamFuel</ammoClass>
+		<generateAllowChance>0</generateAllowChance>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef Name="BaseXennBullet" ParentName="BaseExplosiveBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/LauncherShot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>80</speed>
+			<dropsCasings>true</dropsCasings>
+			<flyOverhead>false</flyOverhead>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseXennBullet">
+		<defName>Bullet_Xenn_Hot</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>incendiary bolt</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>PrometheumFlame</damageDef>
+			<damageAmountBase>10</damageAmountBase>
+			<explosionRadius>0.5</explosionRadius>
+			<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseXennBullet">
+		<defName>Bullet_Xenn_Cold</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>freezer bolt</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>0.75</explosionRadius>
+			<damageDef>Frostbite</damageDef>
+			<damageAmountBase>15</damageAmountBase>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseXennBullet">
+		<defName>Bullet_Xenn_Foam</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>foam bolt</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Extinguish</damageDef>
+			<suppressionFactor>0.0</suppressionFactor>
+			<dangerFactor>0.0</dangerFactor>
+			<damageAmountBase>50</damageAmountBase>
+			<explosionRadius>1</explosionRadius>
+			<postExplosionSpawnThingDef>Filth_FireFoam</postExplosionSpawnThingDef>
+			<preExplosionSpawnChance>1</preExplosionSpawnChance>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_Xenn_Hot</defName>
+		<label>make Xenn Plasma Cells x50</label>
+		<description>Craft 50 Xenn plasma cells.</description>
+		<jobString>Making Xenn Plasma cells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Prometheum</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Xenn_Hot>50</Ammo_Xenn_Hot>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_Xenn_Cold</defName>
+		<label>make Xenn Cryo Cell x50</label>
+		<description>Craft 50 Xenn cryo cells.</description>
+		<jobString>Making Xenn cells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>12</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Xenn_Cold>50</Ammo_Xenn_Cold>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_Xenn_Foam</defName>
+		<label>make Xenn foam cell x50</label>
+		<description>Craft 50 Xenn foam cells.</description>
+		<jobString>Making Xenn foam cells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<categories>
+						<li>MeatRaw</li>
+					</categories>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+			<categories>
+				<li>MeatRaw</li>
+			</categories>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_Xenn_Foam>50</Ammo_Xenn_Foam>
+		</products>
+	</RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Xenn/Patches/Xenn/PawnKindDefs_Humanlikes/PawnKinds_Xenn.xml b/ModPatches/Xenn/Patches/Xenn/PawnKindDefs_Humanlikes/PawnKinds_Xenn.xml
new file mode 100644
index 0000000000..f26217107e
--- /dev/null
+++ b/ModPatches/Xenn/Patches/Xenn/PawnKindDefs_Humanlikes/PawnKinds_Xenn.xml
@@ -0,0 +1,314 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Scoot ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="XennColonist"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="XennPackLeader"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="XennTrader"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="XennSlave"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="XennRefugee"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="XennSecurityGuard"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="XennRecruit"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="XennHunter"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="XennCommando"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="XennCommandoElite"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>500</min>
+					<max>1400</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>OutlanderShield</li>
+				</shieldTags>
+				<shieldChance>0.5</shieldChance>
+				<sidearms>
+					<li>
+						<generateChance>0.5</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Xenn/Patches/Xenn/ThingDefs_Misc/Apparel_Various.xml b/ModPatches/Xenn/Patches/Xenn/ThingDefs_Misc/Apparel_Various.xml
new file mode 100644
index 0000000000..ce835a0332
--- /dev/null
+++ b/ModPatches/Xenn/Patches/Xenn/ThingDefs_Misc/Apparel_Various.xml
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Power Armor with Duster ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXX"]/statBases</xpath>
+		<value>
+			<Bulk>90</Bulk>
+			<WornBulk>12</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXX"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>550</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXX"]/statBases/Mass</xpath>
+		<value>
+			<Mass>51</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXX"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXX"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXX"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>75</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXX"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>110</CarryWeight>
+				<CarryBulk>25</CarryBulk>
+				<ShootingAccuracyPawn>0.10</ShootingAccuracyPawn>
+				<ToxicEnvironmentResistance>0.60</ToxicEnvironmentResistance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXX"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+
+		</value>
+	</Operation>
+
+	<!-- ========== Power Armor with *Arctic* Duster ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXXArc"]/statBases</xpath>
+		<value>
+			<Bulk>90</Bulk>
+			<WornBulk>12</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXXArc"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>550</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXXArc"]/statBases/Mass</xpath>
+		<value>
+			<Mass>51</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXXArc"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXXArc"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXXArc"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>75</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXXArc"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>110</CarryWeight>
+				<CarryBulk>25</CarryBulk>
+				<ShootingAccuracyPawn>0.10</ShootingAccuracyPawn>
+				<ToxicEnvironmentResistance>0.60</ToxicEnvironmentResistance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXXArc"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Power Armor with *Jungle* Duster ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXXJ"]/statBases</xpath>
+		<value>
+			<Bulk>90</Bulk>
+			<WornBulk>12</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXXJ"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>550</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXXJ"]/statBases/Mass</xpath>
+		<value>
+			<Mass>51</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXXJ"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXXJ"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXXJ"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>75</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXXJ"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryWeight>110</CarryWeight>
+				<CarryBulk>25</CarryBulk>
+				<ShootingAccuracyPawn>0.10</ShootingAccuracyPawn>
+				<ToxicEnvironmentResistance>0.60</ToxicEnvironmentResistance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXXJ"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+
+		</value>
+	</Operation>
+
+	<!-- ========== Shadez ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "XennSunglasses"]/statBases/Mass</xpath>
+		<value>
+			<Mass>1</Mass>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "XennSunglasses"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.17</ArmorRating_Sharp>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Xenn/Patches/Xenn/ThingDefs_Misc/Xenn_Weps.xml b/ModPatches/Xenn/Patches/Xenn/ThingDefs_Misc/Xenn_Weps.xml
new file mode 100644
index 0000000000..2bdc4d1c9d
--- /dev/null
+++ b/ModPatches/Xenn/Patches/Xenn/ThingDefs_Misc/Xenn_Weps.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Xenn Burn Cannon -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XennBurnCannon</defName>
+		<statBases>
+			<Bulk>8.5</Bulk>
+			<Mass>4.1</Mass>
+			<SwayFactor>1.38</SwayFactor>
+			<ShotSpread>0.08</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
+			<WorkToMake>29000</WorkToMake>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_30x64mmFuel_Incendiary</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<burstShotCount>4</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>Xenngun</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_XennFuel</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="XennBurnCannon"]/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>
+
+	<!-- Xenn Frost Cannon -->
+	<!-- Gonna just be the firegun for now cus ill need to make a good ammo 4 it lol heart -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>XennFrostCannon</defName>
+		<statBases>
+			<Bulk>8.5</Bulk>
+			<Mass>4.1</Mass>
+			<SwayFactor>1.38</SwayFactor>
+			<ShotSpread>0.08</ShotSpread>
+			<SightsEfficiency>1</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
+			<WorkToMake>29000</WorkToMake>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.5</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_30x64mmFuel_Incendiary</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<burstShotCount>4</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>Xenngun</soundCast>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_XennFuel</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>2</aimedBurstShotCount>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AssaultWeapon</li>
+		</weaponTags>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="XennFrostCannon"]/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>
+	<!-- etc.. -->
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Xenn/Patches/Xenn/ThingDefs_Races/Race_Xenn.xml b/ModPatches/Xenn/Patches/Xenn/ThingDefs_Races/Race_Xenn.xml
new file mode 100644
index 0000000000..a0937c81e5
--- /dev/null
+++ b/ModPatches/Xenn/Patches/Xenn/ThingDefs_Races/Race_Xenn.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ========== Found Fido ========== -->
+
+	<!-- ========== Turn our dog boys into dog *boys* ========== -->
+	<!-- ========== To be human is to be a tall brick ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<!-- === Note to future furball compatibility nerds: 		=== -->
+		<!-- === Paste the defName of your horrible alien there   |	=== -->
+		<!-- === 												  V	=== -->
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Xenn"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Gives Gun Gizmos to Xenn HUD thing ========== -->
+	<!-- ========== Also Makes Em Suppressable		   ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<!-- === Shouldn't need to change this at all		  === -->
+		<!-- === Unless you changed the name of your BaseXennPawn === -->
+		<!-- === In which case change "BaseXennPawn" to that name === -->
+		<xpath>Defs/ThingDef[@Name="BaseXennPawn"]</xpath>
+		<value>
+			<comps>
+				<li>
+					<compClass>CombatExtended.CompPawnGizmo</compClass>
+				</li>
+				<li Class="CombatExtended.CompProperties_Suppressable"/>
+			</comps>
+		</value>
+	</Operation>
+
+	<!-- === Patch Xenn default melee attacks === -->
+	<!-- === For the most part, it adds the CE melee handler thing 	=== -->
+	<!-- === And also defines armor penetration, which allows them	=== -->
+	<!-- === to actually do damage.									=== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Xenn"]/statBases</xpath>
+		<value>
+			<AimingAccuracy>1</AimingAccuracy>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1.15</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<ReloadSpeed>1</ReloadSpeed>
+			<Suppressability>1</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Xenn"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.15</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claws</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.15</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>1.37</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.02</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.923</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- ===================================== -->
+	<!-- === BaseBodySize, ArmorRatings, MoveSpeed, and BaseHealth should already be set. I think. === -->
+	<!-- ===================================== -->
+
+	<!-- === Congratulations! Your alien is Combat Ready!	 === -->
+	<!-- === If your alien comes with extra guns and gear,	 === -->
+	<!-- === Congratulations! You're not even close to done! === -->
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Xenohumans - Anthromorphs/Patches/Xenohumans - Anthromorphs/Races_Avianmorph.xml b/ModPatches/Xenohumans - Anthromorphs/Patches/Xenohumans - Anthromorphs/Races_Avianmorph.xml
new file mode 100644
index 0000000000..ad66077001
--- /dev/null
+++ b/ModPatches/Xenohumans - Anthromorphs/Patches/Xenohumans - Anthromorphs/Races_Avianmorph.xml	
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Avianmorph"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Avianmorph"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>1</Suppressability>
+			<SmokeSensitivity>1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Avianmorph"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Avianmorph"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Avianmorph"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Avianmorph"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="ATK_Villager_Avianmorph"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Xenohumans - Anthromorphs/Patches/Xenohumans - Anthromorphs/Races_Bovinemorph.xml b/ModPatches/Xenohumans - Anthromorphs/Patches/Xenohumans - Anthromorphs/Races_Bovinemorph.xml
new file mode 100644
index 0000000000..37db21f0bb
--- /dev/null
+++ b/ModPatches/Xenohumans - Anthromorphs/Patches/Xenohumans - Anthromorphs/Races_Bovinemorph.xml	
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Bovinemorph"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Bovinemorph"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>1</Suppressability>
+			<SmokeSensitivity>1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Bovinemorph"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Bovinemorph"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Bovinemorph"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Bovinemorph"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="ATK_Villager_Bovinemorph"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Xenohumans - Anthromorphs/Patches/Xenohumans - Anthromorphs/Races_Caninemorph.xml b/ModPatches/Xenohumans - Anthromorphs/Patches/Xenohumans - Anthromorphs/Races_Caninemorph.xml
new file mode 100644
index 0000000000..f93c00ef8a
--- /dev/null
+++ b/ModPatches/Xenohumans - Anthromorphs/Patches/Xenohumans - Anthromorphs/Races_Caninemorph.xml	
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Caninemorph"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Caninemorph"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>1</Suppressability>
+			<SmokeSensitivity>1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Caninemorph"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Caninemorph"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Caninemorph"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Caninemorph"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="ATK_Villager_Caninemorph"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Xenohumans - Anthromorphs/Patches/Xenohumans - Anthromorphs/Races_Cervinemorph.xml b/ModPatches/Xenohumans - Anthromorphs/Patches/Xenohumans - Anthromorphs/Races_Cervinemorph.xml
new file mode 100644
index 0000000000..d742e53f86
--- /dev/null
+++ b/ModPatches/Xenohumans - Anthromorphs/Patches/Xenohumans - Anthromorphs/Races_Cervinemorph.xml	
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Cervinemorph"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Cervinemorph"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>1</Suppressability>
+			<SmokeSensitivity>1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Cervinemorph"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Cervinemorph"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Cervinemorph"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Cervinemorph"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="ATK_Villager_Cervinemorph"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Xenohumans - Anthromorphs/Patches/Xenohumans - Anthromorphs/Races_Dragomorph.xml b/ModPatches/Xenohumans - Anthromorphs/Patches/Xenohumans - Anthromorphs/Races_Dragomorph.xml
new file mode 100644
index 0000000000..472c77b963
--- /dev/null
+++ b/ModPatches/Xenohumans - Anthromorphs/Patches/Xenohumans - Anthromorphs/Races_Dragomorph.xml	
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Dragomorph"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Dragomorph"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>1</Suppressability>
+			<SmokeSensitivity>1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Dragomorph"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Dragomorph"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Dragomorph"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Dragomorph"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ATK_Leather_Dragon"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.06</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="ATK_Villager_Dragomorph"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Xenohumans - Anthromorphs/Patches/Xenohumans - Anthromorphs/Races_Felinemorph.xml b/ModPatches/Xenohumans - Anthromorphs/Patches/Xenohumans - Anthromorphs/Races_Felinemorph.xml
new file mode 100644
index 0000000000..23e669514e
--- /dev/null
+++ b/ModPatches/Xenohumans - Anthromorphs/Patches/Xenohumans - Anthromorphs/Races_Felinemorph.xml	
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Felinemorph"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Felinemorph"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>1</Suppressability>
+			<SmokeSensitivity>1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Felinemorph"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Felinemorph"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Felinemorph"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Felinemorph"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="ATK_Villager_Felinemorph"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Xenohumans - Anthromorphs/Patches/Xenohumans - Anthromorphs/Races_Gnollmorph.xml b/ModPatches/Xenohumans - Anthromorphs/Patches/Xenohumans - Anthromorphs/Races_Gnollmorph.xml
new file mode 100644
index 0000000000..d95465cc89
--- /dev/null
+++ b/ModPatches/Xenohumans - Anthromorphs/Patches/Xenohumans - Anthromorphs/Races_Gnollmorph.xml	
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Gnollmorph"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Gnollmorph"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>1</Suppressability>
+			<SmokeSensitivity>1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Gnollmorph"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Gnollmorph"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Gnollmorph"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Gnollmorph"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="ATK_Villager_Gnollmorph"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Xenohumans - Anthromorphs/Patches/Xenohumans - Anthromorphs/Races_Lagomorph.xml b/ModPatches/Xenohumans - Anthromorphs/Patches/Xenohumans - Anthromorphs/Races_Lagomorph.xml
new file mode 100644
index 0000000000..21e2d6da65
--- /dev/null
+++ b/ModPatches/Xenohumans - Anthromorphs/Patches/Xenohumans - Anthromorphs/Races_Lagomorph.xml	
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Lagomorph"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Lagomorph"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>1</Suppressability>
+			<SmokeSensitivity>1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Lagomorph"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Lagomorph"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Lagomorph"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Lagomorph"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="ATK_Villager_Lagomorph"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Xenohumans - Anthromorphs/Patches/Xenohumans - Anthromorphs/Races_Vulpinemorph.xml b/ModPatches/Xenohumans - Anthromorphs/Patches/Xenohumans - Anthromorphs/Races_Vulpinemorph.xml
new file mode 100644
index 0000000000..16b57c89ff
--- /dev/null
+++ b/ModPatches/Xenohumans - Anthromorphs/Patches/Xenohumans - Anthromorphs/Races_Vulpinemorph.xml	
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Vulpinemorph"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Vulpinemorph"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>1</Suppressability>
+			<SmokeSensitivity>1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Vulpinemorph"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Vulpinemorph"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Vulpinemorph"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Vulpinemorph"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="ATK_Villager_Vulpinemorph"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Xenohumans Expanded/Patches/Xenohumans Expanded/Races_Glitter_XH.xml b/ModPatches/Xenohumans Expanded/Patches/Xenohumans Expanded/Races_Glitter_XH.xml
new file mode 100644
index 0000000000..cf01159fa5
--- /dev/null
+++ b/ModPatches/Xenohumans Expanded/Patches/Xenohumans Expanded/Races_Glitter_XH.xml	
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="GlitterWorlderRace"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="GlitterWorlderRace"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="GlitterWorlderRace"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="GlitterWorlderRace"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="GlitterWorlderRace"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="GlitterWorlderRace"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Xenohumans Expanded/Patches/Xenohumans Expanded/Races_Gravi_XH.xml b/ModPatches/Xenohumans Expanded/Patches/Xenohumans Expanded/Races_Gravi_XH.xml
new file mode 100644
index 0000000000..c58634ae72
--- /dev/null
+++ b/ModPatches/Xenohumans Expanded/Patches/Xenohumans Expanded/Races_Gravi_XH.xml	
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HighGravWorlderRace"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>HumanoidWide</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HighGravWorlderRace"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>4.25</MoveSpeed>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HighGravWorlderRace"]/statBases/CarryingCapacity</xpath>
+		<value>
+			<CarryWeight>90</CarryWeight>
+			<CarryBulk>30</CarryBulk>
+			<CarryingCapacity>150</CarryingCapacity>
+			<MeleeDodgeChance>0.85</MeleeDodgeChance>
+			<MeleeCritChance>1.1</MeleeCritChance>
+			<MeleeParryChance>1.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HighGravWorlderRace"]/statBases</xpath>
+		<value>
+			<ArmorRating_Blunt>0.2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HighGravWorlderRace"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.350</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.350</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.85</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HighGravWorlderRace"]/race/baseBodySize</xpath>
+		<value>
+			<baseBodySize>0.7</baseBodySize>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HighGravWorlderRace"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>1.1</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HighGravWorlderRace"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HighGravWorlderRace"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HighGravWorlderRace"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Xenohumans Expanded/Patches/Xenohumans Expanded/Races_LowGravi_XH.xml b/ModPatches/Xenohumans Expanded/Patches/Xenohumans Expanded/Races_LowGravi_XH.xml
new file mode 100644
index 0000000000..df6d95b6cd
--- /dev/null
+++ b/ModPatches/Xenohumans Expanded/Patches/Xenohumans Expanded/Races_LowGravi_XH.xml	
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="LowGravWorlderRace"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="LowGravWorlderRace"]/statBases/Mass</xpath>
+		<value>
+			<Mass>48</Mass>
+			<CarryWeight>28</CarryWeight>
+			<MeleeDodgeChance>1.0</MeleeDodgeChance>
+			<MeleeCritChance>0.9</MeleeCritChance>
+			<MeleeParryChance>0.9</MeleeParryChance>
+			<GlobalLearningFactor>1.5</GlobalLearningFactor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="LowGravWorlderRace"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.27</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.164</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.27</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.174</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.99</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.556</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="LowGravWorlderRace"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>0.85</baseHealthScale>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="LowGravWorlderRace"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="LowGravWorlderRace"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="LowGravWorlderRace"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Xenohumans Expanded/Patches/Xenohumans Expanded/Races_Radman_XH.xml b/ModPatches/Xenohumans Expanded/Patches/Xenohumans Expanded/Races_Radman_XH.xml
new file mode 100644
index 0000000000..30c8d480b9
--- /dev/null
+++ b/ModPatches/Xenohumans Expanded/Patches/Xenohumans Expanded/Races_Radman_XH.xml	
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="RadWorlderRace"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="RadWorlderRace"]/statBases/ToxicResistance</xpath>
+		<value>
+			<ToxicResistance>0.4</ToxicResistance>
+			<SmokeSensitivity>0.7</SmokeSensitivity>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="RadWorlderRace"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="RadWorlderRace"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="RadWorlderRace"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="RadWorlderRace"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Xenohumans Expanded/Patches/Xenohumans Expanded/Races_Vatgrown_XH.xml b/ModPatches/Xenohumans Expanded/Patches/Xenohumans Expanded/Races_Vatgrown_XH.xml
new file mode 100644
index 0000000000..3562517b35
--- /dev/null
+++ b/ModPatches/Xenohumans Expanded/Patches/Xenohumans Expanded/Races_Vatgrown_XH.xml	
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="VatgrownHumanRace"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="VatgrownHumanRace"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="VatgrownHumanRace"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="VatgrownHumanRace"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="VatgrownHumanRace"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="VatgrownHumanRace"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Xenohumans Expanded/Patches/Xenohumans Expanded/Xenos_Pawns.xml b/ModPatches/Xenohumans Expanded/Patches/Xenohumans Expanded/Xenos_Pawns.xml
new file mode 100644
index 0000000000..43ef357baf
--- /dev/null
+++ b/ModPatches/Xenohumans Expanded/Patches/Xenohumans Expanded/Xenos_Pawns.xml	
@@ -0,0 +1,361 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="Town_GuardKindAlienBase" or @Name="Town_TraderKindAlienBase" or @Name="PirateKindAlienBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>3</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.1</generateChance>
+						<sidearmMoney>
+							<min>50</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+					<li>
+						<generateChance>0.075</generateChance>
+						<sidearmMoney>
+							<min>80</min>
+							<max>160</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_FlareLauncher</li>
+						</weaponTags>
+						<magazineCount>
+							<min>0</min>
+							<max>1</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="VillagerBaseKindAlienBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>1</min>
+					<max>3</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.05</generateChance>
+						<sidearmMoney>
+							<min>50</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+					<li>
+						<generateChance>0.04</generateChance>
+						<sidearmMoney>
+							<min>80</min>
+							<max>160</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_FlareLauncher</li>
+						</weaponTags>
+						<magazineCount>
+							<min>0</min>
+							<max>1</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="Mercenary_GunnerKindAlienBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.25</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+					<li>
+						<generateChance>0.125</generateChance>
+						<sidearmMoney>
+							<min>10</min>
+							<max>100</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>GrenadeSmoke</li>
+							<li>GrenadeDestructive</li>
+						</weaponTags>
+						<magazineCount>
+							<min>0</min>
+							<max>1</max>
+						</magazineCount>
+					</li>
+					<li>
+						<generateChance>0.075</generateChance>
+						<sidearmMoney>
+							<min>80</min>
+							<max>160</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_FlareLauncher</li>
+						</weaponTags>
+						<magazineCount>
+							<min>1</min>
+							<max>1</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="Mercenary_SniperKindAlienBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="Mercenary_HeavyKindAlienBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>4</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>150</min>
+						<max>350</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_SMG</li>
+					</weaponTags>
+					<magazineCount>
+						<min>0</min>
+						<max>1</max>
+					</magazineCount>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="Mercenary_EliteKindAlienBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>3</min>
+					<max>5</max>
+				</primaryMagazineCount>
+				<sidearms>
+					<li>
+						<generateChance>0.25</generateChance>
+						<sidearmMoney>
+							<min>100</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Melee</li>
+						</weaponTags>
+					</li>
+					<li>
+						<generateChance>0.2</generateChance>
+						<sidearmMoney>
+							<min>10</min>
+							<max>150</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>GrenadeSmoke</li>
+							<li>GrenadeDestructive</li>
+						</weaponTags>
+						<magazineCount>
+							<min>0</min>
+							<max>1</max>
+						</magazineCount>
+					</li>
+					<li>
+						<generateChance>0.075</generateChance>
+						<sidearmMoney>
+							<min>80</min>
+							<max>160</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_FlareLauncher</li>
+						</weaponTags>
+						<magazineCount>
+							<min>1</min>
+							<max>1</max>
+						</magazineCount>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="Tribal_WarriorKindAlienBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>100</min>
+					<max>150</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.9</shieldChance>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="Tribal_HunterKindAlienBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>20</min>
+					<max>40</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>100</min>
+					<max>130</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.6</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>80</min>
+							<max>240</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="Tribal_HeavyArcherKindAlienBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>20</min>
+					<max>40</max>
+				</primaryMagazineCount>
+				<shieldMoney>
+					<min>100</min>
+					<max>160</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.6</shieldChance>
+				<sidearms>
+					<li>
+						<sidearmMoney>
+							<min>80</min>
+							<max>300</max>
+						</sidearmMoney>
+						<weaponTags>
+							<li>CE_Sidearm_Tribal</li>
+						</weaponTags>
+					</li>
+				</sidearms>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[@Name="Tribal_BerserkerKindAlienBase"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<shieldMoney>
+					<min>120</min>
+					<max>160</max>
+				</shieldMoney>
+				<shieldTags>
+					<li>TribalShield</li>
+				</shieldTags>
+				<shieldChance>0.9</shieldChance>
+			</li>
+		</value>
+	</Operation>
+	<!-- ======= Combat Power ======= -->
+
+	<!-- Trooper -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[
+			@Name="Tribal_PenitentKindAlienBase"
+			]/combatPower </xpath>
+		<value>
+			<combatPower>16</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[@Name="Tribal_ArcherKindAlienBase"]/combatPower</xpath>
+		<value>
+			<combatPower>20</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[@Name="Tribal_WarriorKindAlienBase"]/combatPower</xpath>
+		<value>
+			<combatPower>24</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[@Name="Tribal_HunterKindAlienBase"]/combatPower</xpath>
+		<value>
+			<combatPower>30</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[@Name="Tribal_BerserkerKindAlienBase"]/combatPower</xpath>
+		<value>
+			<combatPower>50</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[@Name="Tribal_HeavyArcherKindAlienBase"]/combatPower</xpath>
+		<value>
+			<combatPower>45</combatPower>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Xenohumans/Patches/Xenohumans/Races_Designermate_XH.xml b/ModPatches/Xenohumans/Patches/Xenohumans/Races_Designermate_XH.xml
new file mode 100644
index 0000000000..b033d877ab
--- /dev/null
+++ b/ModPatches/Xenohumans/Patches/Xenohumans/Races_Designermate_XH.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="DesignerMatesXH"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="DesignerMatesXH"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="DesignerMatesXH"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="DesignerMatesXH"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="DesignerMatesXH"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="DesignerMatesXH"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Xenohumans/Patches/Xenohumans/Races_Scaleman_XH.xml b/ModPatches/Xenohumans/Patches/Xenohumans/Races_Scaleman_XH.xml
new file mode 100644
index 0000000000..98ec8f6946
--- /dev/null
+++ b/ModPatches/Xenohumans/Patches/Xenohumans/Races_Scaleman_XH.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ScaleManXH"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ScaleManXH"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.85</MeleeDodgeChance>
+			<MeleeCritChance>0.95</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ScaleManXH"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ScaleManXH"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ScaleManXH"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.26</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ScaleManXH"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ScaleManXH"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ScaleManXH"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Xenohumans/Patches/Xenohumans/Races_Soldiermorph_XH.xml b/ModPatches/Xenohumans/Patches/Xenohumans/Races_Soldiermorph_XH.xml
new file mode 100644
index 0000000000..4282a19bf4
--- /dev/null
+++ b/ModPatches/Xenohumans/Patches/Xenohumans/Races_Soldiermorph_XH.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="SoldiermorphXH"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="SoldiermorphXH"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1.2</MeleeDodgeChance>
+			<MeleeCritChance>1.2</MeleeCritChance>
+			<MeleeParryChance>1.1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="SoldiermorphXH"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.07</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.634</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>1.07</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>14</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>0.634</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.99</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.406</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="SoldiermorphXH"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="SoldiermorphXH"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="SoldiermorphXH"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Xenohumans/Patches/Xenohumans/Races_Wolfman_XH.xml b/ModPatches/Xenohumans/Patches/Xenohumans/Races_Wolfman_XH.xml
new file mode 100644
index 0000000000..2d2c681c5a
--- /dev/null
+++ b/ModPatches/Xenohumans/Patches/Xenohumans/Races_Wolfman_XH.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WolfManXH"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WolfManXH"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.05</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WolfManXH"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WolfManXH"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WolfManXH"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.84</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.563</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>0.84</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.12</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.563</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.03</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.16</armorPenetrationBlunt>
+					<chanceFactor>0.3</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WolfManXH"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WolfManXH"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WolfManXH"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Xenoorca Race/Patches/Xenoorca Race/Ammo/Projectiles.xml b/ModPatches/Xenoorca Race/Patches/Xenoorca Race/Ammo/Projectiles.xml
new file mode 100644
index 0000000000..6892b13651
--- /dev/null
+++ b/ModPatches/Xenoorca Race/Patches/Xenoorca Race/Ammo/Projectiles.xml	
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Xenoorca Race/Patches/Xenoorca Race/Bodies/Xenoorca_Bodytype.xml b/ModPatches/Xenoorca Race/Patches/Xenoorca Race/Bodies/Xenoorca_Bodytype.xml
new file mode 100644
index 0000000000..f0dfd3e63b
--- /dev/null
+++ b/ModPatches/Xenoorca Race/Patches/Xenoorca Race/Bodies/Xenoorca_Bodytype.xml	
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Nearmare Bodytype-->
+
+	<!--Arm Groups-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Xenoorca_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Xenoorca_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Xenoorca_Body"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Xenoorca_Body"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<!--Natural Armor-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Xenoorca_Body"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Xenoorca_Body"]/corePart/parts/li[def="Xenoorca_Fillet"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Xenoorca_Body"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Xenoorca_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Xenoorca_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Xenoorca_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Xenoorca_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Xenoorca_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Xenoorca_Gills"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Xenoorca_Body"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Xenoorca_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Xenoorca_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Xenoorca_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Xenoorca_Body"]/corePart/parts/li[def="Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Xenoorca_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="HAR_Xenoorca_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Xenoorca Race/Patches/Xenoorca Race/Hediffs/XO_Hediffs.xml b/ModPatches/Xenoorca Race/Patches/Xenoorca Race/Hediffs/XO_Hediffs.xml
new file mode 100644
index 0000000000..329e5cb68d
--- /dev/null
+++ b/ModPatches/Xenoorca Race/Patches/Xenoorca Race/Hediffs/XO_Hediffs.xml	
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv1"]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv1"]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv2"]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv2"]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.72</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv3"]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.7</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv3"]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.84</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv4"]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv4"]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.96</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv5"]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.9</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv5"]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.08</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv6"]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv6"]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv7"]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.1</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv7"]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.32</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv8"]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.2</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv8"]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.44</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv9"]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.3</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv9"]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.52</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv10"]/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv10"]/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>1.8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Xenoorca Race/Patches/Xenoorca Race/PawnKindDefs/Xenoorca_PawnKind.xml b/ModPatches/Xenoorca Race/Patches/Xenoorca Race/PawnKindDefs/Xenoorca_PawnKind.xml
new file mode 100644
index 0000000000..be9d3949c2
--- /dev/null
+++ b/ModPatches/Xenoorca Race/Patches/Xenoorca Race/PawnKindDefs/Xenoorca_PawnKind.xml	
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--Ammo-->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[
+			@Name="HAR_Xenoorca_KindBase_NPC"
+			] </xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>2</min>
+					<max>6</max>
+				</primaryMagazineCount>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Backpack-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="CE_Apparel_Backpack"]/apparel/tags</xpath>
+		<value>
+			<li>HAR_XO_Apparel_Orcinus</li>
+		</value>
+	</Operation>
+
+	<!--combatPower-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[@Name="HAR_Xenoorca_KindBase"]/combatPower</xpath>
+		<value>
+			<combatPower>200</combatPower>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Xenoorca Race/Patches/Xenoorca Race/Scenario/Xenoorca_Scenario.xml b/ModPatches/Xenoorca Race/Patches/Xenoorca Race/Scenario/Xenoorca_Scenario.xml
new file mode 100644
index 0000000000..f6b9dfbd28
--- /dev/null
+++ b/ModPatches/Xenoorca Race/Patches/Xenoorca Race/Scenario/Xenoorca_Scenario.xml	
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="Xenoorca_Scenario"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_303British_FMJ</thingDef>
+				<count>100</count>
+			</li>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_44Magnum_FMJ</thingDef>
+				<count>60</count>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ScenarioDef[defName="Xenoorca_Scenario"]/scenario/parts/li[thingDef="Apparel_AdvancedHelmet"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ScenarioDef[defName="Xenoorca_Scenario"]/scenario/parts/li[thingDef="Apparel_FlakVest"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ScenarioDef[defName="Xenoorca_Scenario"]/scenario/parts/li[thingDef="Apparel_FlakPants"]</xpath>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Xenoorca Race/Patches/Xenoorca Race/ThingDefs_Misc/Weapons.xml b/ModPatches/Xenoorca Race/Patches/Xenoorca Race/ThingDefs_Misc/Weapons.xml
new file mode 100644
index 0000000000..ed21c7f225
--- /dev/null
+++ b/ModPatches/Xenoorca Race/Patches/Xenoorca Race/ThingDefs_Misc/Weapons.xml	
@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- ==========  Remove Grenade  =========== -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs//ThingDef[defName="Weapon_GrenadeFrag_XO"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs//ThingDef[defName="Proj_GrenadeFrag_XO"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_AssaultRifle_XO" or defName="Gun_SniperRifle_XO" or defName="Gun_PumpShotgun_XO" or defName="Gun_ChargeRifle_XO"]/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="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_AssaultRifle_XO</defName>
+		<statBases>
+			<Mass>3.5</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.02</SwayFactor>
+			<Bulk>6.65</Bulk>
+			<WorkToMake>30000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>50</Steel>
+			<ComponentIndustrial>6</ComponentIndustrial>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>1.48</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<soundCast>Shot_AssaultRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4.5</reloadTime>
+			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_SniperRifle_XO</defName>
+		<statBases>
+			<Mass>7.30</Mass>
+			<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>2.6</SightsEfficiency>
+			<ShotSpread>0.05</ShotSpread>
+			<SwayFactor>1.92</SwayFactor>
+			<Bulk>11.92</Bulk>
+			<WorkToMake>30000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>60</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+			<Chemfuel>15</Chemfuel>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.6</warmupTime>
+			<range>75</range>
+			<soundCast>Shot_SniperRifle</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<researchPrerequisite>PrecisionRifling</researchPrerequisite>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_PumpShotgun_XO</defName>
+		<statBases>
+			<Mass>3.00</Mass>
+			<RangedWeapon_Cooldown>1.0</RangedWeapon_Cooldown>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>1.20</SwayFactor>
+			<Bulk>9.0</Bulk>
+			<SightsEfficiency>1</SightsEfficiency>
+			<WorkToMake>9500</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>45</Steel>
+			<Chemfuel>10</Chemfuel>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</costList>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>16</range>
+			<soundCast>Shot_Shotgun</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>5</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.85</reloadTime>
+			<ammoSet>AmmoSet_12Gauge</ammoSet>
+		</AmmoUser>
+		<FireModes/>
+		<researchPrerequisite>Gunsmithing</researchPrerequisite>
+	</Operation>
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Gun_ChargeRifle_XO</defName>
+		<statBases>
+			<Mass>3.0</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+			<SightsEfficiency>1.10</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.20</SwayFactor>
+			<Bulk>7.00</Bulk>
+			<WorkToMake>48000</WorkToMake>
+		</statBases>
+		<costList>
+			<Steel>45</Steel>
+			<Plasteel>25</Plasteel>
+			<ComponentIndustrial>10</ComponentIndustrial>
+			<Chemfuel>10</Chemfuel>
+		</costList>
+		<Properties>
+			<recoilAmount>1.51</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>55</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>6</burstShotCount>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<researchPrerequisite>ChargedShot</researchPrerequisite>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Trident_XO"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.31</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>2.9</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="MeleeWeapon_Trident_XO"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>1.08</MeleeCounterParryBonus>
+			<Bulk>10</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Trident_XO"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.22</MeleeCritChance>
+				<MeleeParryChance>1.53</MeleeParryChance>
+				<MeleeDodgeChance>0.67</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Xenoorca Race/Patches/Xenoorca Race/ThingDefs_Misc/Xenoorca_Apparel.xml b/ModPatches/Xenoorca Race/Patches/Xenoorca Race/ThingDefs_Misc/Xenoorca_Apparel.xml
new file mode 100644
index 0000000000..3ea16b5589
--- /dev/null
+++ b/ModPatches/Xenoorca Race/Patches/Xenoorca Race/ThingDefs_Misc/Xenoorca_Apparel.xml	
@@ -0,0 +1,290 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!--========= Stuffable =========-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_XO_AT_d" or
+			defName="HAR_XO_AT_f"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_XO_AT_e"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_XO_AT_a" or
+			defName="HAR_XO_AT_b" or
+			defName="HAR_XO_AT_c"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Middle PA-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_XO_AM_a"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+			<Bulk>80</Bulk>
+			<WornBulk>10</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_XO_AM_a"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>40</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_XO_AM_a"
+			]/statBases/Mass </xpath>
+		<value>
+			<Mass>60</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_XO_AM_a"
+			]/equippedStatOffsets/MoveSpeed </xpath>
+		<value>
+			<CarryWeight>80</CarryWeight>
+			<CarryBulk>10</CarryBulk>
+			<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HAR_XO_AM_a"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HAR_XO_AM_a"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>160</Plasteel>
+			<DevilstrandCloth>50</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_XO_AM_b"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+			<Bulk>40</Bulk>
+			<WornBulk>8</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_XO_AM_b"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>30</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_XO_AM_b"
+			]/statBases/Mass </xpath>
+		<value>
+			<Mass>25</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="HAR_XO_AM_b"
+			]/equippedStatOffsets </xpath>
+		<value>
+			<CarryWeight>45</CarryWeight>
+			<CarryBulk>12</CarryBulk>
+			<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="HAR_XO_AM_b"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HAR_XO_AM_b"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>130</Plasteel>
+			<DevilstrandCloth>20</DevilstrandCloth>
+			<ComponentSpacer>1</ComponentSpacer>
+		</value>
+	</Operation>
+
+	<!--Shell-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_XO_AS_a" or
+			defName="HAR_XO_AS_b"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Shell Metallic-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_XO_AS_c"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Overhead-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_XO_AH_a"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_XO_AH_b" or
+			defName="HAR_XO_AH_c" or
+			defName="HAR_XO_AH_d" or
+			defName="HAR_XO_AH_e"
+			]/statBases/StuffEffectMultiplierArmor </xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<!--Overhead Armor-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_XO_AH_f"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>18</ArmorRating_Sharp>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_XO_AH_f"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>40.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="HAR_XO_AH_f"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="HAR_XO_AH_f"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_XO_AH_f"
+			]/equippedStatOffsets/MoveSpeed </xpath>
+		<value>
+			<AimingAccuracy>0.15</AimingAccuracy>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HAR_XO_AH_f"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>70</Plasteel>
+			<DevilstrandCloth>20</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_XO_AH_g"
+			]/statBases/ArmorRating_Sharp </xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="HAR_XO_AH_g"
+			]/statBases/ArmorRating_Blunt </xpath>
+		<value>
+			<ArmorRating_Blunt>22.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="HAR_XO_AH_g"]/costList/Plasteel</xpath>
+		<value>
+			<Plasteel>40</Plasteel>
+			<DevilstrandCloth>10</DevilstrandCloth>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Xenoorca Race/Patches/Xenoorca Race/ThingDefs_Races/AlienRace_Xenoorca.xml b/ModPatches/Xenoorca Race/Patches/Xenoorca Race/ThingDefs_Races/AlienRace_Xenoorca.xml
new file mode 100644
index 0000000000..f1456339d1
--- /dev/null
+++ b/ModPatches/Xenoorca Race/Patches/Xenoorca Race/ThingDefs_Races/AlienRace_Xenoorca.xml	
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="HAR_Xenoorca_BaseNRPawn"]/inspectorTabs/li[.="ITab_Pawn_Gear"]</xpath>
+		<value>
+			<li>CombatExtended.ITab_Inventory</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="HAR_Xenoorca_BaseNRPawn"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Inventory"/>
+			<li Class="CombatExtended.CompProperties_TacticalManager"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="HAR_Xenoorca_BaseNRPawn"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Xenoorca"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Xenoorca"]/statBases</xpath>
+		<value>
+			<Suppressability>1</Suppressability>
+			<SmokeSensitivity>1.2</SmokeSensitivity>
+			<MeleeCritChance>1.05</MeleeCritChance>
+			<MeleeParryChance>1.06</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Xenoorca"]/statBases/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>1.30</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Xenoorca"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Xenoorca"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Xenoorca"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.66</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.66</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>5.05</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Xenoorca"]/alienRace/raceRestriction/whiteApparelList</xpath>
+		<value>
+			<li>CE_Apparel_TacVest</li>
+			<li>CE_Apparel_Backpack</li>
+			<li>CE_Apparel_TribalBackpack</li>
+			<li>CE_Apparel_BallisticShield</li>
+			<li>CE_Apparel_MeleeShield</li>
+			<li>CE_Apparel_GasMask</li>
+			<li>CE_Apparel_ImprovGasMask</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/YetAnotherProsthetics - Core/Patches/YetAnotherProsthetics - Core/Patches/Bionics_Patch.xml b/ModPatches/YetAnotherProsthetics - Core/Patches/YetAnotherProsthetics - Core/Patches/Bionics_Patch.xml
new file mode 100644
index 0000000000..c124a05f09
--- /dev/null
+++ b/ModPatches/YetAnotherProsthetics - Core/Patches/YetAnotherProsthetics - Core/Patches/Bionics_Patch.xml	
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- Patches the BionicArm and BIE_BionicHand -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BionicArm" or defName="BIE_BionicHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.11</cooldownTime>
+					<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- Patches the BIE_AdvancedBionicArm and BIE_AdvancedBionicHand -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BIE_AdvancedBionicArm" or defName="BIE_AdvancedBionicHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>bionic fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>0.96</cooldownTime>
+					<armorPenetrationBlunt>3.00</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- Patches the BIE_UltratechBionicArm (no hand for this tier) -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BIE_UltratechBionicArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>bionic fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>0.81</cooldownTime>
+					<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- Patches the ArchotechArm (no hand for this tier, it's patching vanilla for this) -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ArchotechArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>bionic fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>0.66</cooldownTime>
+					<armorPenetrationBlunt>6.00</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- Commented out until we can resolve issues with smoke hediff on body parts for resistance -->
+	<!-- Add for lungs of advanced nature, scale, recommended 15% for elite bionics, down to 5% for better-than -->
+	<!-- BIE_BionicLung -->
+	<!-- <li Class="PatchOperationAdd"> -->
+	<!-- <xpath>Defs/HediffDef[defName="BIE_BionicLung"]/stages/li[minSeverity="0.99"]/statOffsets</xpath> -->
+	<!-- <value> -->
+	<!-- <SmokeSensitivity>-0.025</SmokeSensitivity> -->
+	<!-- </value> -->
+	<!-- </li> -->
+	<!-- BIE_AdvancedBionicLung -->
+	<!-- <li Class="PatchOperationAdd"> -->
+	<!-- <xpath>Defs/HediffDef[defName="BIE_AdvancedBionicLung"]/stages/li[minSeverity="0.99"]/statOffsets</xpath> -->
+	<!-- <value> -->
+	<!-- <SmokeSensitivity>-0.05</SmokeSensitivity> -->
+	<!-- </value> -->
+	<!-- </li> -->
+	<!-- BIE_UltratechBionicLung -->
+	<!-- <li Class="PatchOperationAdd"> -->
+	<!-- <xpath>Defs/HediffDef[defName="BIE_UltratechBionicLung"]/stages/li[minSeverity="0.99"]/statOffsets</xpath> -->
+	<!-- <value> -->
+	<!-- <SmokeSensitivity>-0.10</SmokeSensitivity> -->
+	<!-- </value> -->
+	<!-- </li> -->
+	<!-- SoSArchotechLung -->
+	<!-- <li Class="PatchOperationAdd"> -->
+	<!-- <xpath>Defs/HediffDef[defName="SoSArchotechLung"]/stages/li[minSeverity="0.99"]/statOffsets</xpath> -->
+	<!-- <value> -->
+	<!-- <SmokeSensitivity>-0.15</SmokeSensitivity> -->
+	<!-- </value> -->
+	<!-- </li> -->
+
+	<!-- Patch for BIE_BionicJaw -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="BIE_BionicJaw"]</xpath>
+		<value>
+			<comps>
+				<li Class="HediffCompProperties_VerbGiver">
+					<tools>
+						<li Class="CombatExtended.ToolCE">
+							<label>teeth</label>
+							<capacities>
+								<li>Bite</li>
+							</capacities>
+							<power>4</power>
+							<cooldownTime>1.27</cooldownTime>
+							<armorPenetrationBlunt>1.288</armorPenetrationBlunt>
+							<armorPenetrationSharp>0.2</armorPenetrationSharp>
+						</li>
+					</tools>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+	<!-- Patch for BIE_AdvancedBionicJaw -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="BIE_AdvancedBionicJaw"]</xpath>
+		<value>
+			<comps>
+				<li Class="HediffCompProperties_VerbGiver">
+					<tools>
+						<li Class="CombatExtended.ToolCE">
+							<label>teeth</label>
+							<capacities>
+								<li>Bite</li>
+							</capacities>
+							<power>7</power>
+							<cooldownTime>1.12</cooldownTime>
+							<armorPenetrationBlunt>2.2</armorPenetrationBlunt>
+							<armorPenetrationSharp>0.4</armorPenetrationSharp>
+						</li>
+					</tools>
+				</li>
+			</comps>
+		</value>
+	</Operation>
+	<!-- BIE_UltratechBionicJaw -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BIE_UltratechBionicJaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>0.97</cooldownTime>
+					<armorPenetrationBlunt>3.0</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.6</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+	<!-- SoSArchotechJaw -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="SoSArchotechJaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>0.82</cooldownTime>
+					<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.8</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Patch for BIE_UltratechBionicSkin -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BIE_UltratechBionicSkin"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>1.75</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="BIE_UltratechBionicSkin"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2.25</ArmorRating_Blunt>
+			<ArmorRating_Electric>0.2</ArmorRating_Electric>
+		</value>
+	</Operation>
+	<!-- Patch for SoSArchotechSkin (YAP uses SOSArch for these) -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="SoSArchotechSkin"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3</ArmorRating_Sharp>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="SoSArchotechSkin"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>4.5</ArmorRating_Blunt>
+			<ArmorRating_Electric>0.4</ArmorRating_Electric>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Zombieland/Patches/Zombieland/Zombieland_Patches.xml b/ModPatches/Zombieland/Patches/Zombieland/Zombieland_Patches.xml
new file mode 100644
index 0000000000..a1b07f3571
--- /dev/null
+++ b/ModPatches/Zombieland/Patches/Zombieland/Zombieland_Patches.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ===== Zombies ===== -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Zombie"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Zombie"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.1</MeleeDodgeChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Zombie"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>22</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>22</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.05</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>ZombieBite</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>4</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ===== Zombie Spitter ===== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="ZombieSpitterBody"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="ZombieSpitterBody"]/corePart</xpath>
+			<value>
+				<groups>
+					<li>CoveredByNaturalArmor</li>
+				</groups>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="ZombieSpitterBody"]/corePart/groups</xpath>
+			<value>
+				<li>CoveredByNaturalArmor</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ZombieSpitter"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ZombieSpitter"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ZombieSpitter"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="ZombieSpitter"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="ZombieSpitter"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ZombieSpitter"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>2000</Durability>
+				<Regenerates>false</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ===== Misc Stuff ===== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Chainsaw"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.25</cooldownTime>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Chainsaw"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ElectricalField"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>0</Bulk>
+				<Mass>0</Mass>
+			</statBases>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/kemomimihouse Kz/Patches/kemomimihouse Kz/Misc/HediffGiverSets.xml b/ModPatches/kemomimihouse Kz/Patches/kemomimihouse Kz/Misc/HediffGiverSets.xml
new file mode 100644
index 0000000000..7a7cd84993
--- /dev/null
+++ b/ModPatches/kemomimihouse Kz/Patches/kemomimihouse Kz/Misc/HediffGiverSets.xml	
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[label="风切武装"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.01</minSeverity>
+					<label>蛰伏</label>
+					<naturalHealingFactor>1.25</naturalHealingFactor>
+				</li>
+
+				<li>
+					<minSeverity>0.99</minSeverity>
+					<label>激活</label>
+					<restFallFactorOffset>0.35</restFallFactorOffset>
+					<painOffset>-0.15</painOffset>
+					<statOffsets>
+						<ArmorRating_Sharp>5</ArmorRating_Sharp>
+						<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.25</ArmorRating_Heat>
+					</statOffsets>
+					<statFactors>
+						<MeleeDodgeChance>1.25</MeleeDodgeChance>
+						<MeleeHitChance>1.35</MeleeHitChance>
+						<IncomingDamageFactor>0.7</IncomingDamageFactor>
+						<MoveSpeed>0.80</MoveSpeed>
+					</statFactors>
+					<capMods>
+						<li>
+							<capacity>Consciousness</capacity>
+							<postFactor>1.15</postFactor>
+						</li>
+
+						<li>
+							<capacity>Manipulation</capacity>
+							<postFactor>1.15</postFactor>
+						</li>
+					</capMods>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="siroTalent"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.01</minSeverity>
+					<label>蛰伏</label>
+					<naturalHealingFactor>1.15</naturalHealingFactor>
+				</li>
+
+				<li>
+					<minSeverity>0.99</minSeverity>
+					<label>激活</label>
+					<restFallFactorOffset>0.25</restFallFactorOffset>
+					<painOffset>-0.20</painOffset>
+					<statOffsets>
+						<ArmorRating_Sharp>4</ArmorRating_Sharp>
+						<ArmorRating_Blunt>10.6</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.15</ArmorRating_Heat>
+					</statOffsets>
+					<statFactors>
+						<IncomingDamageFactor>0.7</IncomingDamageFactor>
+						<MoveSpeed>0.70</MoveSpeed>
+					</statFactors>
+					<capMods>
+						<li>
+							<capacity>Consciousness</capacity>
+							<postFactor>1.20</postFactor>
+						</li>
+
+						<li>
+							<capacity>Manipulation</capacity>
+							<postFactor>1.25</postFactor>
+						</li>
+					</capMods>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="kuroTalent"]/stages</xpath>
+		<value>
+			<stages>
+				<li>
+					<minSeverity>0.01</minSeverity>
+					<label>蛰伏</label>
+					<naturalHealingFactor>1.15</naturalHealingFactor>
+				</li>
+
+				<li>
+					<minSeverity>0.99</minSeverity>
+					<label>激活</label>
+					<restFallFactorOffset>0.10</restFallFactorOffset>
+					<painOffset>-0.10</painOffset>
+					<statOffsets>
+						<ArmorRating_Sharp>3</ArmorRating_Sharp>
+						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+						<ArmorRating_Heat>0.10</ArmorRating_Heat>
+					</statOffsets>
+					<statFactors>
+						<IncomingDamageFactor>0.85</IncomingDamageFactor>
+						<MoveSpeed>0.90</MoveSpeed>
+					</statFactors>
+					<capMods>
+						<li>
+							<capacity>Consciousness</capacity>
+							<postFactor>1.10</postFactor>
+						</li>
+
+						<li>
+							<capacity>Manipulation</capacity>
+							<postFactor>1.05</postFactor>
+						</li>
+					</capMods>
+				</li>
+			</stages>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/kemomimihouse Kz/Patches/kemomimihouse Kz/Misc/Projectile.xml b/ModPatches/kemomimihouse Kz/Patches/kemomimihouse Kz/Misc/Projectile.xml
new file mode 100644
index 0000000000..7536f8f7d4
--- /dev/null
+++ b/ModPatches/kemomimihouse Kz/Patches/kemomimihouse Kz/Misc/Projectile.xml	
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="FrostbitePower_yuki"]/stages/li/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ArmorRating_Blunt>-7.5</ArmorRating_Blunt>
+				<IncomingDamageFactor>0.15</IncomingDamageFactor>
+			</statOffsets>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/pphhyy Demigryph/Patches/pphhyy Demigryph/Demigryph_Animals.xml b/ModPatches/pphhyy Demigryph/Patches/pphhyy Demigryph/Demigryph_Animals.xml
new file mode 100644
index 0000000000..30f7587c1c
--- /dev/null
+++ b/ModPatches/pphhyy Demigryph/Patches/pphhyy Demigryph/Demigryph_Animals.xml	
@@ -0,0 +1,578 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Demigryph Statbases ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="pphhyy_Demigryph" or defName="pphhyy_LeopardDemigryph" or defName="pphhyy_PantherDemigryph" or defName="pphhyy_JadeDemigryph"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.17</MeleeDodgeChance>
+			<MeleeCritChance>0.21</MeleeCritChance>
+			<MeleeParryChance>0.17</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="pphhyy_CrimsonDemigryph" or defName="pphhyy_CheetahDemigryph" or defName="pphhyy_VultureDemigryph"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.14</MeleeDodgeChance>
+			<MeleeCritChance>0.24</MeleeCritChance>
+			<MeleeParryChance>0.19</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="pphhyy_TigerDemigryph" or defName="pphhyy_Daermigryph"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.14</MeleeDodgeChance>
+			<MeleeCritChance>0.18</MeleeCritChance>
+			<MeleeParryChance>0.17</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<!-- ========== Basic Leopard and Panther Demigryph ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="pphhyy_Demigryph" or defName="pphhyy_LeopardDemigryph" or defName="pphhyy_PantherDemigryph"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>beak</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>33</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationSharp>1.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>9.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.22</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>4.235</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Crimson Demigryph ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="pphhyy_CrimsonDemigryph"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>beak</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>39</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationSharp>2.1</armorPenetrationSharp>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.44</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Cheetah Demigryph ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="pphhyy_CheetahDemigryph"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.25</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>beak</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>4.235</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Vulture Demigryph ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="pphhyy_VultureDemigryph"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>22</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>beak</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationSharp>1.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>9.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.22</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>4.235</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Tiger Demigryph ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="pphhyy_TigerDemigryph"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>beak</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>33</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationSharp>1.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>9.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.44</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Daermigryph ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="pphhyy_Daermigryph"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.6</armorPenetrationSharp>
+					<armorPenetrationBlunt>9</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>26</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.6</armorPenetrationSharp>
+					<armorPenetrationBlunt>9</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>beak</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>33</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationSharp>1.25</armorPenetrationSharp>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.44</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ========== Jade Demigryph ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="pphhyy_JadeDemigryph"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.3</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.45</armorPenetrationSharp>
+					<armorPenetrationBlunt>7</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>beak</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.8</cooldownTime>
+					<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationSharp>1.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>9.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.44</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/pphhyy Demigryph/Patches/pphhyy Demigryph/Demigryph_Bodies.xml b/ModPatches/pphhyy Demigryph/Patches/pphhyy Demigryph/Demigryph_Bodies.xml
new file mode 100644
index 0000000000..49c75d7838
--- /dev/null
+++ b/ModPatches/pphhyy Demigryph/Patches/pphhyy Demigryph/Demigryph_Bodies.xml	
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ==================== pphhyy_QuadrupedAnimal_Demigryph ==================== -->
+	<!-- ========== Add groups entry if it doesn't exist already ========== -->
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Neck"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Beak"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Beak"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Leg"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Leg"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<!-- ========== Add armor coverage ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Beak"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Tail"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/pphhyy Demigryph/Patches/pphhyy Demigryph/Demigryph_GryphArmor.xml b/ModPatches/pphhyy Demigryph/Patches/pphhyy Demigryph/Demigryph_GryphArmor.xml
new file mode 100644
index 0000000000..d97e6cd619
--- /dev/null
+++ b/ModPatches/pphhyy Demigryph/Patches/pphhyy Demigryph/Demigryph_GryphArmor.xml	
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Animal Gear</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!-- Gryphon Leather -->
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="pphhyy_Demigryph_leatherArmor" or defName="pphhyy_Demigryph_leatherArmorFront"]/statBases</xpath>
+					<value>
+						<Bulk>3</Bulk>
+						<WornBulk>1</WornBulk>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="pphhyy_Demigryph_leatherArmor" or defName="pphhyy_Demigryph_leatherArmorFront"]/statBases/StuffEffectMultiplierArmor</xpath>
+					<value>
+						<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
+					</value>
+				</li>
+
+				<!-- Gryphon Plate -->
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="pphhyy_Demigryph_PlateArmor" or defName="pphhyy_Demigryph_PlateArmorFront"]/statBases/StuffEffectMultiplierArmor</xpath>
+					<value>
+						<StuffEffectMultiplierArmor>4.5</StuffEffectMultiplierArmor>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="pphhyy_Demigryph_PlateArmor" or defName="pphhyy_Demigryph_PlateArmorFront"]/equippedStatOffsets</xpath>
+					<value>
+						<equippedStatOffsets>
+							<MeleeDodgeChance>-0.05</MeleeDodgeChance>
+						</equippedStatOffsets>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="pphhyy_Demigryph_PlateArmor" or defName="pphhyy_Demigryph_PlateArmorFront"]/statBases</xpath>
+					<value>
+						<Bulk>17.5</Bulk>
+						<WornBulk>3.5</WornBulk>
+					</value>
+				</li>
+
+				<!-- Gryphon Plate -->
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="pphhyy_Demigryph_NoblePlateArmor" or defName="pphhyy_Demigryph_NoblePlateArmorFront" or defName="pphhyy_Demigryph_RaiderPlateArmor" or defName="pphhyy_Demigryph_RaiderPlateArmorFront"]/statBases/StuffEffectMultiplierArmor</xpath>
+					<value>
+						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="pphhyy_Demigryph_NoblePlateArmor" or defName="pphhyy_Demigryph_NoblePlateArmorFront" or defName="pphhyy_Demigryph_RaiderPlateArmor" or defName="pphhyy_Demigryph_RaiderPlateArmorFront"]/equippedStatOffsets</xpath>
+					<value>
+						<equippedStatOffsets>
+							<MeleeDodgeChance>-0.05</MeleeDodgeChance>
+						</equippedStatOffsets>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="pphhyy_Demigryph_NoblePlateArmor" or defName="pphhyy_Demigryph_NoblePlateArmorFront" or defName="pphhyy_Demigryph_RaiderPlateArmor" or defName="pphhyy_Demigryph_RaiderPlateArmorFront"]/statBases</xpath>
+					<value>
+						<Bulk>17.5</Bulk>
+						<WornBulk>3.5</WornBulk>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/pphhyy Demigryph/Patches/pphhyy Demigryph/Demigryph_Helmets.xml b/ModPatches/pphhyy Demigryph/Patches/pphhyy Demigryph/Demigryph_Helmets.xml
new file mode 100644
index 0000000000..1f3a9de39b
--- /dev/null
+++ b/ModPatches/pphhyy Demigryph/Patches/pphhyy Demigryph/Demigryph_Helmets.xml	
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Helm Bulk -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="pphhyy_Human_DemigyryphHelm" or defName="pphhyy_Human_DemigyryphChampionHelm" or defName="pphhyy_Human_DemigyryphGildedHelm"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="pphhyy_Human_DemigyryphHelm" or defName="pphhyy_Human_DemigyryphChampionHelm" or defName="pphhyy_Human_DemigyryphGildedHelm"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+	</Operation>
+
+	<!-- Staff Offsets -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="pphhyy_Human_DemigyryphHelm" or defName="pphhyy_Human_DemigyryphChampionHelm" or defName="pphhyy_Human_DemigyryphGildedHelm" or defName="pphhyy_Human_DemigyryphRaiderHelm" or defName="pphhyy_Human_DemigyryphHunterHelm"]/equippedStatOffsets</xpath>
+		<value>
+			<AimingAccuracy>-0.4</AimingAccuracy>
+			<MeleeHitChance>-2</MeleeHitChance>
+			<Suppressability>-0.20</Suppressability>
+		</value>
+	</Operation>
+
+	<!--Demigryph Helm-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="pphhyy_Human_DemigyryphHelm"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="pphhyy_Human_DemigyryphHelm"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>80</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="pphhyy_Human_DemigyryphHelm"]/recipeMaker/researchPrerequisite</xpath>
+		<value>
+			<researchPrerequisite>PlateArmor</researchPrerequisite>
+		</value>
+	</Operation>
+
+	<!--Demigryph Champion Helm and DemigyryphGildedHelm-->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="pphhyy_Human_DemigyryphChampionHelm" or defName="pphhyy_Human_DemigyryphGildedHelm" or defName="pphhyy_Human_DemigyryphRaiderHelm"]/statBases/Mass</xpath>
+		<value>
+			<Mass>3.5</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="pphhyy_Human_DemigyryphChampionHelm" or defName="pphhyy_Human_DemigyryphGildedHelm" or defName="pphhyy_Human_DemigyryphRaiderHelm"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="pphhyy_Human_DemigyryphChampionHelm"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>90</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="pphhyy_Human_DemigyryphRaiderHelm"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>95</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="pphhyy_Human_DemigyryphGildedHelm" or defName="pphhyy_Human_DemigyryphHunterHelm"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>100</costStuffCount>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="pphhyy_Human_DemigyryphHunterHelm"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>3.75</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/pphhyy Demigryph/Patches/pphhyy Demigryph/Demigryph_Materials.xml b/ModPatches/pphhyy Demigryph/Patches/pphhyy Demigryph/Demigryph_Materials.xml
new file mode 100644
index 0000000000..5a2f5e004c
--- /dev/null
+++ b/ModPatches/pphhyy Demigryph/Patches/pphhyy Demigryph/Demigryph_Materials.xml	
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Demigryph leather -->
+	<!-- Warmleather Demigryph -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="pphhyy_WarmLeather_Demigryph" or defName="pphhyy_coldLeather_Demigryph" or defName="pphhyy_Leather_Demigryph"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.05</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="pphhyy_WarmLeather_Demigryph" or defName="pphhyy_coldLeather_Demigryph" or defName="pphhyy_Leather_Demigryph"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.04</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/pphhyy Expanded Scythers/Patches/pphhyy Expanded Scythers/MechBodies_CE.xml b/ModPatches/pphhyy Expanded Scythers/Patches/pphhyy Expanded Scythers/MechBodies_CE.xml
new file mode 100644
index 0000000000..fd5d6afa92
--- /dev/null
+++ b/ModPatches/pphhyy Expanded Scythers/Patches/pphhyy Expanded Scythers/MechBodies_CE.xml	
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ==================== Phynilla Scythers ==================== -->
+
+	<!-- ========== Add groups entry if it doesn't exist already ========== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalNeck"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalLeg"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<!-- ========== Add armor coverage ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="Blade"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/parts/li[def="MechanicalFinger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Modify coverage ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/coverage</xpath>
+		<value>
+			<coverage>0.15</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="Blade"]/coverage</xpath>
+		<value>
+			<coverage>0.2</coverage>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="FluidReprocessor"]/coverage</xpath>
+		<value>
+			<coverage>0.05</coverage>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/pphhyy Expanded Scythers/Patches/pphhyy Expanded Scythers/MechKind_CE.xml b/ModPatches/pphhyy Expanded Scythers/Patches/pphhyy Expanded Scythers/MechKind_CE.xml
new file mode 100644
index 0000000000..440fc4c9f8
--- /dev/null
+++ b/ModPatches/pphhyy Expanded Scythers/Patches/pphhyy Expanded Scythers/MechKind_CE.xml	
@@ -0,0 +1,728 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[
+			defName="pphhyy_ScytherExpandedArch" or
+			defName="pphhyy_ScytherExpandedMono" or
+			defName="pphhyy_ScytherExpandedSearing" or
+			defName="pphhyy_ScytherExpandedPrestige"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[
+			defName="pphhyy_ScytherExpandedTank" or
+			defName="pphhyy_ScytherExpandedArch" or
+			defName="pphhyy_ScytherExpandedSearing"
+			]/combatPower</xpath>
+		<value>
+			<combatPower>190</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="pphhyy_ScytherExpandedMono"]/combatPower</xpath>
+		<value>
+			<combatPower>240</combatPower>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="pphhyy_ScytherExpandedPrestige"]/combatPower</xpath>
+		<value>
+			<combatPower>320</combatPower>
+		</value>
+	</Operation>
+
+	<!--Arch Scyther (EMP one)-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedArch"]/statBases</xpath>
+		<value>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.19</MeleeCritChance>
+			<MeleeParryChance>0.23</MeleeParryChance>
+			<MaxHitPoints>250</MaxHitPoints>
+			<ArmorRating_Electric>0.2</ArmorRating_Electric>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedArch"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedArch"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedArch"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left Mace</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<extraMeleeDamages>
+						<li>
+							<def>EMP</def>
+							<amount>4</amount>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>35</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right Mace</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<extraMeleeDamages>
+						<li>
+							<def>EMP</def>
+							<amount>4</amount>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>35</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<extraMeleeDamages>
+						<li>
+							<def>EMP</def>
+							<amount>2</amount>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>5.9</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.875</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedArch"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedArch"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedArch"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1225</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>116</MaxOverHeal>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Scyther Guard (Tank one)-->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedTank"]/statBases</xpath>
+		<value>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+			<MeleeDodgeChance>0.07</MeleeDodgeChance>
+			<MeleeCritChance>0.04</MeleeCritChance>
+			<MeleeParryChance>0.65</MeleeParryChance>
+			<MaxHitPoints>400</MaxHitPoints>
+			<ArmorRating_Heat>0.15</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedTank"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>24</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedTank"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedTank"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>right Mace</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>24</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Stun</def>
+							<amount>4</amount>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>16</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>5.9</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.875</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedTank"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedTank"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedTank"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1875</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>140</MaxOverHeal>
+				<MinArmorPct>0.65</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedTank"]</xpath>
+		<value>
+			<modExtensions Inherit="False">
+				<li Class="CombatExtended.RacePropertiesExtensionCE">
+					<bodyShape>Humanoid</bodyShape>
+				</li>
+				<li Class="CombatExtended.PartialArmorExt">
+					<stats>
+						<li>
+							<useStatic>false</useStatic>
+							<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
+							<parts>
+								<li>SightSensor</li>
+							</parts>
+						</li>
+						<li>
+							<useStatic>false</useStatic>
+							<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
+							<parts>
+								<li>SightSensor</li>
+							</parts>
+						</li>
+						<li>
+							<useStatic>false</useStatic>
+							<ArmorRating_Sharp>0.625</ArmorRating_Sharp>
+							<parts>
+								<li>MechanicalHead</li>
+							</parts>
+						</li>
+						<li>
+							<useStatic>false</useStatic>
+							<ArmorRating_Blunt>0.625</ArmorRating_Blunt>
+							<parts>
+								<li>MechanicalHead</li>
+							</parts>
+						</li>
+						<li>
+							<useStatic>false</useStatic>
+							<ArmorRating_Sharp>0.625</ArmorRating_Sharp>
+							<parts>
+								<li>MechanicalLeg</li>
+							</parts>
+						</li>
+						<li>
+							<useStatic>false</useStatic>
+							<ArmorRating_Blunt>0.625</ArmorRating_Blunt>
+							<parts>
+								<li>MechanicalLeg</li>
+							</parts>
+						</li>
+					</stats>
+				</li>
+			</modExtensions>
+		</value>
+	</Operation>
+
+	<!--Mono Scyther -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedMono"]/statBases</xpath>
+		<value>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+			<MeleeDodgeChance>0.43</MeleeDodgeChance>
+			<MeleeCritChance>0.41</MeleeCritChance>
+			<MeleeParryChance>0.36</MeleeParryChance>
+			<MaxHitPoints>300</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedMono"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>14</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedMono"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedMono"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>45</power>
+					<cooldownTime>1.84</cooldownTime>
+					<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
+					<armorPenetrationSharp>16</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left blade</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>1.03</cooldownTime>
+					<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
+					<armorPenetrationSharp>45</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>45</power>
+					<cooldownTime>1.84</cooldownTime>
+					<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
+					<armorPenetrationSharp>16</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right blade</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>1.03</cooldownTime>
+					<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
+					<armorPenetrationSharp>45</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>5.9</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.875</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedMono"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedMono"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedMono"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1300</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>116</MaxOverHeal>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Searing Scyther -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedSearing"]/statBases</xpath>
+		<value>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+			<MeleeDodgeChance>0.18</MeleeDodgeChance>
+			<MeleeCritChance>0.23</MeleeCritChance>
+			<MeleeParryChance>0.19</MeleeParryChance>
+			<MaxHitPoints>250</MaxHitPoints>
+			<ArmorRating_Heat>0.4</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedSearing"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>8</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedSearing"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedSearing"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>43</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>5</amount>
+							<chance>0.3</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>2.07</cooldownTime>
+					<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
+					<armorPenetrationSharp>2.16</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left blade</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>24</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>5</amount>
+							<chance>0.3</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>43</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>5</amount>
+							<chance>0.3</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>2.07</cooldownTime>
+					<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
+					<armorPenetrationSharp>2.16</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right blade</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>24</power>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>5</amount>
+							<chance>0.3</chance>
+						</li>
+					</extraMeleeDamages>
+					<cooldownTime>1.33</cooldownTime>
+					<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
+					<armorPenetrationSharp>40</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>5.9</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.875</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedSearing"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedSearing"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedSearing"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1225</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>116</MaxOverHeal>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<!--Prestige Scyther -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedPrestige"]/statBases</xpath>
+		<value>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+			<MeleeDodgeChance>0.58</MeleeDodgeChance>
+			<MeleeCritChance>0.54</MeleeCritChance>
+			<MeleeParryChance>0.45</MeleeParryChance>
+			<MaxHitPoints>380</MaxHitPoints>
+			<ArmorRating_Electric>0.2</ArmorRating_Electric>
+			<ArmorRating_Heat>0.15</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedPrestige"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>24</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedPrestige"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedPrestige"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>46</power>
+					<cooldownTime>1.84</cooldownTime>
+					<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
+					<armorPenetrationSharp>20</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left blade</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>1.03</cooldownTime>
+					<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
+					<armorPenetrationSharp>45</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>46</power>
+					<cooldownTime>1.84</cooldownTime>
+					<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
+					<armorPenetrationSharp>20</armorPenetrationSharp>
+					<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right blade</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>1.03</cooldownTime>
+					<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
+					<armorPenetrationSharp>45</armorPenetrationSharp>
+					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>5.9</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.875</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedPrestige"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedPrestige"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedPrestige"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>1500</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>1250</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<Repairable>true</Repairable>
+				<RepairIngredients>
+					<Steel>5</Steel>
+					<Plasteel>5</Plasteel>
+				</RepairIngredients>
+				<RepairTime>300</RepairTime>
+				<RepairValue>200</RepairValue>
+				<CanOverHeal>true</CanOverHeal>
+				<MaxOverHeal>150</MaxOverHeal>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/pphhyy Sanguinary Animals/Patches/pphhyy Sanguinary Animals/SanguineAnimals_Animals.xml b/ModPatches/pphhyy Sanguinary Animals/Patches/pphhyy Sanguinary Animals/SanguineAnimals_Animals.xml
new file mode 100644
index 0000000000..54d8f35410
--- /dev/null
+++ b/ModPatches/pphhyy Sanguinary Animals/Patches/pphhyy Sanguinary Animals/SanguineAnimals_Animals.xml	
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Sanguine Deer ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="pphhyy_SanguineDeer"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.12</MeleeDodgeChance>
+			<MeleeCritChance>0.18</MeleeCritChance>
+			<MeleeParryChance>0.19</MeleeParryChance>
+			<NightVisionEfficiency>1</NightVisionEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="pphhyy_SanguineDeer"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.19</cooldownTime>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.19</cooldownTime>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.19</cooldownTime>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hoof</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.19</cooldownTime>
+					<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>razorfangs</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.46</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>20</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<chanceFactor>2</chanceFactor>
+					<armorPenetrationSharp>1.6</armorPenetrationSharp>
+					<armorPenetrationBlunt>8.863</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>3.2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.225</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="pphhyy_SanguineDeer"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ========== Varghulf ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="pphhyy_Vargulf"]/statBases/MoveSpeed</xpath>
+		<value>
+			<MoveSpeed>6</MoveSpeed>
+			<MeleeDodgeChance>0.14</MeleeDodgeChance>
+			<MeleeCritChance>0.24</MeleeCritChance>
+			<MeleeParryChance>0.19</MeleeParryChance>
+			<NightVisionEfficiency>1</NightVisionEfficiency>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="pphhyy_Vargulf"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.17</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.54</armorPenetrationSharp>
+					<armorPenetrationBlunt>8.47</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>24</power>
+					<cooldownTime>1.17</cooldownTime>
+					<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>0.54</armorPenetrationSharp>
+					<armorPenetrationBlunt>8.47</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>36</power>
+					<cooldownTime>1.62</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>21</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<chanceFactor>0.5</chanceFactor>
+					<armorPenetrationSharp>2.18</armorPenetrationSharp>
+					<armorPenetrationBlunt>14.52</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>2.2</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>4.24</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/pphhyy Sanguinary Animals/Patches/pphhyy Sanguinary Animals/SanguineAnimals_Bodies.xml b/ModPatches/pphhyy Sanguinary Animals/Patches/pphhyy Sanguinary Animals/SanguineAnimals_Bodies.xml
new file mode 100644
index 0000000000..e3d9e5626c
--- /dev/null
+++ b/ModPatches/pphhyy Sanguinary Animals/Patches/pphhyy Sanguinary Animals/SanguineAnimals_Bodies.xml	
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ==================== pphhyy_QuadrupedAnimal_Vargulf ==================== -->
+	<!-- ========== Add groups entry if it doesn't exist already ========== -->
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="pphhyy_Vargulf_Wing"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="pphhyy_Vargulf_Wing"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="Neck"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="Leg"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="Leg"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<!-- ========== Add armor coverage ========== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="pphhyy_Vargulf_Wing"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/pphhyy Sanguinary Animals/Patches/pphhyy Sanguinary Animals/SanguineAnimals_Insects.xml b/ModPatches/pphhyy Sanguinary Animals/Patches/pphhyy Sanguinary Animals/SanguineAnimals_Insects.xml
new file mode 100644
index 0000000000..0b528527d3
--- /dev/null
+++ b/ModPatches/pphhyy Sanguinary Animals/Patches/pphhyy Sanguinary Animals/SanguineAnimals_Insects.xml	
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!-- ========== Megaspider ========== -->
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="pphhyy_BloodScarab"]/statBases/MoveSpeed</xpath>
+					<value>
+						<MoveSpeed>4.4</MoveSpeed>
+						<MeleeDodgeChance>0.07</MeleeDodgeChance>
+						<MeleeCritChance>0.31</MeleeCritChance>
+						<MeleeParryChance>0.17</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="pphhyy_BloodScarab"]/race/body</xpath>
+					<value>
+						<body>BeetleLike</body>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="pphhyy_BloodScarab"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>mandibles</label>
+								<capacities>
+									<li>Stab</li>
+								</capacities>
+								<power>24</power>
+								<cooldownTime>1.33</cooldownTime>
+								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+								<armorPenetrationSharp>40</armorPenetrationSharp>
+								<armorPenetrationBlunt>20</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>mandibles</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>43</power>
+								<cooldownTime>2.48</cooldownTime>
+								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+								<armorPenetrationSharp>1.5</armorPenetrationSharp>
+								<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>24</power>
+								<cooldownTime>1.33</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<chanceFactor>0.2</chanceFactor>
+								<armorPenetrationBlunt>6</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="pphhyy_BloodScarab"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>10</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="pphhyy_BloodScarab"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>4</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="pphhyy_BloodScarab"]/race/baseHealthScale</xpath>
+					<value>
+						<baseHealthScale>1.8</baseHealthScale>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/pphhyy Sanguinary Animals/Patches/pphhyy Sanguinary Animals/SanguineAnimals_Materials.xml b/ModPatches/pphhyy Sanguinary Animals/Patches/pphhyy Sanguinary Animals/SanguineAnimals_Materials.xml
new file mode 100644
index 0000000000..a724fd979c
--- /dev/null
+++ b/ModPatches/pphhyy Sanguinary Animals/Patches/pphhyy Sanguinary Animals/SanguineAnimals_Materials.xml	
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Sanguine Deer Leather -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="pphhyy_Leather_SanguineDeer"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.05</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="pphhyy_Leather_SanguineDeer"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.02</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Sanguine Deer Wool -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="pphhyy_Wool_SanguineDeer"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.01</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="pphhyy_Wool_SanguineDeer"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.044</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="pphhyy_Wool_SanguineDeer"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
+		</value>
+	</Operation>
+
+	<!-- Vargulf -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="pphhyy_Leather_Vargulf"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<StuffPower_Armor_Sharp>0.07</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="pphhyy_Leather_Vargulf"]/statBases</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.056</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/Patches/A Rimworld of Magic/Patch_Apparel.xml b/Patches/A Rimworld of Magic/Patch_Apparel.xml
deleted file mode 100644
index 6563f498c8..0000000000
--- a/Patches/A Rimworld of Magic/Patch_Apparel.xml	
+++ /dev/null
@@ -1,368 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>A RimWorld of Magic</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Cloaks : Vanilla cape is 4mm, so we use a general of that as a base and modify based on the original's stat -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="TM_MaestersCloak" or
-						defName="DemonLordCloak"
-						]/statBases </xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_MaestersCloak"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="DemonLordCloak"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Robes : Take up middle so we'll add a little extra protection to compensate. Should still generally be inferior to the armor combo unless we're using super-fabric though-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="DarkRobe" or
-						defName="ArchMageRobe" or
-						defName="TM_DreamcatcherBuckskin"
-						]/statBases </xpath>
-					<value>
-						<Bulk>20</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="DarkRobe"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="DarkRobe"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="DarkRobe"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_DreamcatcherBuckskin"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>7</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_DreamcatcherBuckskin"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_DreamcatcherBuckskin"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_DreamcatcherBuckskin"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>9</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_DreamcatcherBuckskin"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_DreamcatcherBuckskin"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Hats -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="TM_WizardHat" or
-						defName="ArcaneHood"
-						]/statBases </xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_WizardHat"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="ArcaneHood"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="HoodOfMadness"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="HoodOfMadness"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="HoodOfMadness"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="HoodOfMadness"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>0.75</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!--Armors-->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="AncientMail" or
-						defName="RoyalHelm" or
-						defName="ParagonHelm" or
-						defName="RoyalArmor"
-						]/statBases/ArmorRating_Sharp </xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="AncientMail" or
-						defName="RoyalHelm" or
-						defName="ParagonHelm" or
-						defName="RoyalArmor"
-						]/statBases/ArmorRating_Blunt </xpath>
-				</li>
-
-				<!-- Based on Vanilla Armor Expanded CE patch -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoyalArmor"]/statBases/Mass</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>10</WornBulk>
-						<Mass>15</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoyalArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AncientMail"]/statBases/Mass</xpath>
-					<value>
-						<Bulk>60</Bulk>
-						<WornBulk>7.5</WornBulk>
-						<Mass>7.5</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AncientMail"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!--<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="AncientMail"]/stuffCategories</xpath>
-				<value>
-					<stuffCategories>
-						<li>Steeled</li>
-					</stuffCategories>
-				</value>
-			</li>-->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="AncientMail"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoyalHelm"]/statBases/Mass</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>0.5</WornBulk>
-						<Mass>3</Mass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoyalHelm"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoyalHelm"]/stuffCategories</xpath>
-					<value>
-						<stuffCategories>
-							<li>Steeled</li>
-						</stuffCategories>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoyalHelm"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>UpperHead</li>
-							<li>Eyes</li>
-							<li>Teeth</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ParagonHelm"]/statBases/Mass</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<Mass>4</Mass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ParagonHelm"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ParagonHelm"]/stuffCategories</xpath>
-					<value>
-						<stuffCategories>
-							<li>Steeled</li>
-						</stuffCategories>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ParagonHelm"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>UpperHead</li>
-							<li>Eyes</li>
-							<li>Teeth</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[@Name="TM_ArtifactBase"]/statBases</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[@Name="TM_ArtifactBase"]</xpath>
-						<value>
-							<statBases />
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[@Name="TM_ArtifactBase"]</xpath>
-						<value>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="TM_ArtifactBase"]/statBases</xpath>
-					<value>
-						<Bulk>0.35</Bulk>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/A Rimworld of Magic/Patch_Demon.xml b/Patches/A Rimworld of Magic/Patch_Demon.xml
deleted file mode 100644
index cb71fdb341..0000000000
--- a/Patches/A Rimworld of Magic/Patch_Demon.xml	
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>A RimWorld of Magic</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[
-						defName="TM_LesserDemonR" or
-						defName="TM_DemonR"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="TM_LesserDemonR" or
-						defName="TM_DemonR"
-						]/statBases </xpath>
-					<value>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.19</MeleeDodgeChance>
-						<MeleeCritChance>0.22</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-						<MaxHitPoints>200</MaxHitPoints>
-						<SmokeSensitivity>0</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_LesserDemonR" or
-						defName="TM_DemonR"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>15</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_LesserDemonR" or
-						defName="TM_DemonR"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>12</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_LesserDemonR"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left arm</label>
-								<capacities>
-									<li>TM_ClawSweep</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.1</cooldownTime>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<armorPenetrationBlunt>18.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Demon_LeftArm</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right arm</label>
-								<capacities>
-									<li>TM_ClawSweep</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.3</cooldownTime>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<armorPenetrationBlunt>18.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Demon_RightArm</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>11.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Demon_Legs</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_DemonR"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left arm</label>
-								<capacities>
-									<li>TM_ClawSweep</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.1</cooldownTime>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<armorPenetrationBlunt>18.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Demon_LeftArm</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right arm</label>
-								<capacities>
-									<li>TM_ClawSweep</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.3</cooldownTime>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<armorPenetrationBlunt>18.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Demon_RightArm</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>32</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>15.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Demon_Legs</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/A Rimworld of Magic/Patch_Direwolf.xml b/Patches/A Rimworld of Magic/Patch_Direwolf.xml
deleted file mode 100644
index 790c7d1eaa..0000000000
--- a/Patches/A Rimworld of Magic/Patch_Direwolf.xml	
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>A RimWorld of Magic</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="TM_Dire_WolfR"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_Dire_WolfR"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_Dire_WolfR"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_Dire_WolfR"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>6.6</MoveSpeed>
-						<MeleeDodgeChance>0.29</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.06</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_Dire_WolfR"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>11.4</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>4.225</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.2</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>12.2</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>4.225</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.3</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>6.55</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>0.6</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/A Rimworld of Magic/Patch_Elemental.xml b/Patches/A Rimworld of Magic/Patch_Elemental.xml
deleted file mode 100644
index cfc05cf1b1..0000000000
--- a/Patches/A Rimworld of Magic/Patch_Elemental.xml	
+++ /dev/null
@@ -1,411 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>A RimWorld of Magic</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[
-						defName="TM_LesserEarth_ElementalR" or
-						defName="TM_GreaterEarth_ElementalR" or
-						defName="TM_Earth_ElementalR" or
-						defName="TM_LesserFire_ElementalR" or
-						defName="TM_GreaterFire_ElementalR" or
-						defName="TM_Fire_ElementalR" or
-						defName="TM_LesserWater_ElementalR" or
-						defName="TM_GreaterWater_ElementalR" or
-						defName="TM_Water_ElementalR" or
-						defName="TM_LesserWind_ElementalR" or
-						defName="TM_GreaterWind_ElementalR" or
-						defName="TM_Wind_ElementalR"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="TM_LesserEarth_ElementalR" or
-						defName="TM_GreaterEarth_ElementalR" or
-						defName="TM_Earth_ElementalR" or
-						defName="TM_LesserFire_ElementalR" or
-						defName="TM_GreaterFire_ElementalR" or
-						defName="TM_Fire_ElementalR" or
-						defName="TM_LesserWater_ElementalR" or
-						defName="TM_GreaterWater_ElementalR" or
-						defName="TM_Water_ElementalR" or
-						defName="TM_LesserWind_ElementalR" or
-						defName="TM_GreaterWind_ElementalR" or
-						defName="TM_Wind_ElementalR"
-						]/statBases </xpath>
-					<value>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.19</MeleeDodgeChance>
-						<MeleeCritChance>0.22</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-						<MaxHitPoints>200</MaxHitPoints>
-						<SmokeSensitivity>0</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_LesserEarth_ElementalR" or
-						defName="TM_GreaterEarth_ElementalR" or
-						defName="TM_Earth_ElementalR"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_LesserEarth_ElementalR" or
-						defName="TM_GreaterEarth_ElementalR" or
-						defName="TM_Earth_ElementalR"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_LesserFire_ElementalR" or
-						defName="TM_GreaterFire_ElementalR" or
-						defName="TM_Fire_ElementalR"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_LesserFire_ElementalR" or
-						defName="TM_GreaterFire_ElementalR" or
-						defName="TM_Fire_ElementalR"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_LesserWater_ElementalR" or
-						defName="TM_GreaterWater_ElementalR" or
-						defName="TM_Water_ElementalR"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_LesserWater_ElementalR" or
-						defName="TM_GreaterWater_ElementalR" or
-						defName="TM_Water_ElementalR"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_LesserWind_ElementalR" or
-						defName="TM_GreaterWind_ElementalR" or
-						defName="TM_Wind_ElementalR"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>3.65</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_LesserWind_ElementalR" or
-						defName="TM_GreaterWind_ElementalR" or
-						defName="TM_Wind_ElementalR"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_LesserEarth_ElementalR"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left arm</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Ele_LeftArm</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right arm</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>2.2</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Ele_RightArm</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>2.8</cooldownTime>
-								<armorPenetrationSharp>1.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Ele_Horn</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_Earth_ElementalR"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left arm</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>8.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Ele_LeftArm</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right arm</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>2.2</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>8.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Ele_RightArm</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>34</power>
-								<cooldownTime>2.8</cooldownTime>
-								<armorPenetrationSharp>2.16</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Ele_Horn</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_GreaterEarth_ElementalR"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left arm</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>10.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Ele_LeftArm</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right arm</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>2.2</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>9.93</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Ele_RightArm</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>38</power>
-								<cooldownTime>2.8</cooldownTime>
-								<armorPenetrationSharp>2.41</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.87</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Ele_Horn</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_LesserFire_ElementalR" or
-						defName="TM_LesserWater_ElementalR" or
-						defName="TM_LesserWind_ElementalR"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left arm</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Ele_LeftArm</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right arm</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.4</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Ele_RightArm</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>2.2</cooldownTime>
-								<armorPenetrationSharp>1.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Ele_Horn</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_Fire_ElementalR" or
-						defName="TM_Water_ElementalR" or
-						defName="TM_Wind_ElementalR"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left arm</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>.9</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Ele_LeftArm</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right arm</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.3</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Ele_RightArm</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationSharp>1.54</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.74</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Ele_Horn</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_GreaterFire_ElementalR" or
-						defName="TM_GreaterWater_ElementalR" or
-						defName="TM_GreaterWind_ElementalR"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left arm</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>.9</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Ele_LeftArm</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right arm</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Ele_RightArm</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationSharp>1.7</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Ele_Horn</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/A Rimworld of Magic/Patch_Hediff.xml b/Patches/A Rimworld of Magic/Patch_Hediff.xml
deleted file mode 100644
index 772e35d629..0000000000
--- a/Patches/A Rimworld of Magic/Patch_Hediff.xml	
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>A RimWorld of Magic</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TM_HediffStrongBack"]/stages/li[1]/statOffsets/CarryingCapacity</xpath>
-					<value>
-						<CarryBulk>15</CarryBulk>
-						<CarryWeight>20</CarryWeight>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TM_HediffStrongBack"]/stages/li[2]/statOffsets/CarryingCapacity</xpath>
-					<value>
-						<CarryBulk>18</CarryBulk>
-						<CarryWeight>25</CarryWeight>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TM_HediffStrongBack"]/stages/li[3]/statOffsets/CarryingCapacity</xpath>
-					<value>
-						<CarryBulk>20</CarryBulk>
-						<CarryWeight>30</CarryWeight>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TM_HediffThickSkin"]/stages/li[1]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TM_HediffThickSkin"]/stages/li[1]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TM_HediffThickSkin"]/stages/li[2]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TM_HediffThickSkin"]/stages/li[2]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TM_HediffThickSkin"]/stages/li[3]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TM_HediffThickSkin"]/stages/li[3]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TM_HediffThickSkin"]/stages/li[4]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TM_HediffThickSkin"]/stages/li[4]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName = "TM_HediffFightersFocus"]/stages/li[1]/statOffsets</xpath>
-					<value>
-						<Suppressability>-0.1</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName = "TM_HediffFightersFocus"]/stages/li[2]/statOffsets</xpath>
-					<value>
-						<Suppressability>-0.2</Suppressability>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/A Rimworld of Magic/Patch_Loadouts.xml b/Patches/A Rimworld of Magic/Patch_Loadouts.xml
deleted file mode 100644
index d08ab16b59..0000000000
--- a/Patches/A Rimworld of Magic/Patch_Loadouts.xml	
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>A RimWorld of Magic</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[
-						defName="SeerBowman"
-						] </xpath>
-					<value>
-						<inventoryOptions>
-							<skipChance>0</skipChance>
-							<subOptionsChooseOne>
-								<li>
-									<choiceChance>50</choiceChance>
-									<thingDef>Ammo_Arrow_Steel</thingDef>
-									<countRange>
-										<min>20</min>
-										<max>60</max>
-									</countRange>
-								</li>
-								<li>
-									<choiceChance>25</choiceChance>
-									<thingDef>Ammo_Arrow_Venom</thingDef>
-									<countRange>
-										<min>20</min>
-										<max>60</max>
-									</countRange>
-								</li>
-								<li>
-									<choiceChance>25</choiceChance>
-									<thingDef>Ammo_Arrow_Flame</thingDef>
-									<countRange>
-										<min>20</min>
-										<max>60</max>
-									</countRange>
-								</li>
-							</subOptionsChooseOne>
-						</inventoryOptions>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/A Rimworld of Magic/Patch_Melee.xml b/Patches/A Rimworld of Magic/Patch_Melee.xml
deleted file mode 100644
index d620100096..0000000000
--- a/Patches/A Rimworld of Magic/Patch_Melee.xml	
+++ /dev/null
@@ -1,427 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>A RimWorld of Magic</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "TM_ElephantSpear"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2.24</cooldownTime>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>59</power>
-								<cooldownTime>4.71</cooldownTime>
-								<chanceFactor>1.165</chanceFactor>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.25</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.87</cooldownTime>
-								<chanceFactor>1.165</chanceFactor>
-								<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.4</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "TM_ElephantSpear"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "TM_ElephantSpear"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.17</MeleeCritChance>
-							<MeleeParryChance>1.45</MeleeParryChance>
-							<MeleeDodgeChance>0.9</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Gladius with better stats (like crit and parry) -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "TM_ElephantTusk"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.32</cooldownTime>
-								<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>0.88</cooldownTime>
-								<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.85</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>0.83</cooldownTime>
-								<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "TM_ElephantTusk"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<MeleeCounterParryBonus>0.75</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "TM_ElephantTusk"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.6</MeleeCritChance>
-							<MeleeParryChance>0.5</MeleeParryChance>
-							<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "TM_ElephantTusk"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "TM_ElephantTusk"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "TM_ElephantTusk"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "TM_ThrumboSaber"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>0.94</cooldownTime>
-								<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>15.06</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>0.83</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "TM_ThrumboSaber"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<MeleeCounterParryBonus>0.75</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "TM_ThrumboSaber"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.6</MeleeCritChance>
-							<MeleeParryChance>0.5</MeleeParryChance>
-							<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "TM_ThrumboSaber"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "TM_ThrumboSaber"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "TM_ThrumboSaber"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- VWE Battleaxe with double the sharp penetration -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "TM_ThrumboAxe"]/statBases</xpath>
-					<value>
-						<Bulk>13</Bulk>
-						<MeleeCounterParryBonus>1.5</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "TM_ThrumboAxe"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.3</MeleeCritChance>
-							<MeleeParryChance>1.6</MeleeParryChance>
-							<MeleeDodgeChance>0.56</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "TM_ThrumboAxe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>59</power>
-								<cooldownTime>4.71</cooldownTime>
-								<chanceFactor>1.165</chanceFactor>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<armorPenetrationSharp>16.13</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.87</cooldownTime>
-								<chanceFactor>1.165</chanceFactor>
-								<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Longsword with much higher crit chance -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "TM_Ruunbled"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.69</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>0.94</cooldownTime>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>2.048</armorPenetrationBlunt>
-								<armorPenetrationSharp>32</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>47</power>
-								<cooldownTime>0.83</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>4.608</armorPenetrationBlunt>
-								<armorPenetrationSharp>24</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "TM_Ruunbled"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "TM_Ruunbled"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.4</MeleeCritChance>
-							<MeleeParryChance>0.75</MeleeParryChance>
-							<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "TM_DemonFang"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.32</cooldownTime>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>stab</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>.88</cooldownTime>
-								<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
-								<armorPenetrationSharp>8.44</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>0.83</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "TM_DemonFang"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "TM_DemonFang"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.5</MeleeCritChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-							<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Add tags -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "TM_DemonFang"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "TM_DemonFang"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "TM_DemonFang"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/A Rimworld of Magic/Patch_Minion.xml b/Patches/A Rimworld of Magic/Patch_Minion.xml
deleted file mode 100644
index ba235fd464..0000000000
--- a/Patches/A Rimworld of Magic/Patch_Minion.xml	
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>A RimWorld of Magic</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Looks like an alpha animals needle roll so I gave it the same body shape -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[
-						defName="TM_MinionR" or
-						defName="TM_GreaterMinionR"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="TM_MinionR"
-						]/statBases </xpath>
-					<value>
-						<CarryWeight>30</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.19</MeleeDodgeChance>
-						<MeleeCritChance>0.22</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-						<MaxHitPoints>200</MaxHitPoints>
-						<SmokeSensitivity>0.5</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="TM_GreaterMinionR"
-						]/statBases </xpath>
-					<value>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>30</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.19</MeleeDodgeChance>
-						<MeleeCritChance>0.22</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-						<MaxHitPoints>200</MaxHitPoints>
-						<SmokeSensitivity>0.5</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_MinionR"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>1.1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_MinionR"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>0.8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_GreaterMinionR"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_GreaterMinionR"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_MinionR"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horns</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<armorPenetrationBlunt>9.2</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Minion_Horns</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>bite</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2.2</cooldownTime>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>18.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Minion_Teeth</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_GreaterMinionR"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horns</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<armorPenetrationBlunt>9.2</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Minion_Horns</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>bite</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2.2</cooldownTime>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>18.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Minion_Teeth</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/A Rimworld of Magic/Patch_Ranged.xml b/Patches/A Rimworld of Magic/Patch_Ranged.xml
deleted file mode 100644
index ee16379ad3..0000000000
--- a/Patches/A Rimworld of Magic/Patch_Ranged.xml	
+++ /dev/null
@@ -1,611 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>A RimWorld of Magic</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_LightningWand" or
-						defName="TM_IceWand" or
-						defName="TM_DefenderStaff" or
-						defName="TM_BlazingPowerStaff" or
-						defName="TM_FireWand"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>wand</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Seer_FireRing" or
-						defName="Seer_IceRing" or
-						defName="Seer_LightningRing"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>ring</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.5</cooldownTime>
-								<armorPenetrationBlunt>.2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Projectile_IceWand"]</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="Base6x24mmChargedBullet" Class="AbilityUser.ProjectileDef_Ability">
-							<!--<thingClass>TorannMagic.Weapon.Projectile_IceWand</thingClass>-->
-							<defName>Projectile_IceWand</defName>
-							<label>ice shard</label>
-							<graphicData>
-								<texPath>Spells/Icebolt</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Iceshard</damageDef>
-								<damageAmountBase>18</damageAmountBase>
-								<armorPenetrationBlunt>50</armorPenetrationBlunt>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<speed>65</speed>
-								<dropsCasings>false</dropsCasings>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Projectile_FireWand"]</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="Base6x24mmChargedBullet" Class="AbilityUser.ProjectileDef_Ability">
-							<!--<thingClass>TorannMagic.Weapon.Projectile_IceWand</thingClass>-->
-							<defName>Projectile_FireWand</defName>
-							<label>fire blast</label>
-							<graphicData>
-								<texPath>Spells/seer_ring_fire</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Flame</damageDef>
-								<damageAmountBase>5</damageAmountBase>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<explosionRadius>1.2</explosionRadius>
-								<suppressionFactor>3.0</suppressionFactor>
-								<dangerFactor>2.0</dangerFactor>
-								<speed>65</speed>
-								<dropsCasings>false</dropsCasings>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Projectile_LightningWand"]</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="Base6x24mmChargedBullet" Class="AbilityUser.ProjectileDef_Ability">
-							<!--<thingClass>TorannMagic.Weapon.Projectile_IceWand</thingClass>-->
-							<defName>Projectile_LightningWand</defName>
-							<label>lightning bolt</label>
-							<graphicData>
-								<texPath>Spells/LightningBolt</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>TM_Lightning</damageDef>
-								<damageAmountBase>6</damageAmountBase>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<explosionRadius>1.2</explosionRadius>
-								<suppressionFactor>3.0</suppressionFactor>
-								<dangerFactor>2.0</dangerFactor>
-								<speed>200</speed>
-								<dropsCasings>false</dropsCasings>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>TM_IceWand</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.01</SwayFactor>
-						<Bulk>1</Bulk>
-						<Mass>1</Mass>
-						<RangedWeapon_Cooldown>.6</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_IceWand</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>40</range>
-						<soundCast>TM_Woosh</soundCast>
-						<muzzleFlashScale>5</muzzleFlashScale>
-						<soundCastTail>GunTail_Light</soundCastTail>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Seer_IceRing</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>0.10</SwayFactor>
-						<Bulk>0.5</Bulk>
-						<Mass>1</Mass>
-						<RangedWeapon_Cooldown>.3</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_IceWand</defaultProjectile>
-						<warmupTime>0.25</warmupTime>
-						<range>40</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<muzzleFlashScale>5</muzzleFlashScale>
-						<soundCastTail>GunTail_Light</soundCastTail>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>TM_LightningWand</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.01</SwayFactor>
-						<Bulk>1</Bulk>
-						<Mass>1</Mass>
-						<RangedWeapon_Cooldown>1.6</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_LightningWand</defaultProjectile>
-						<warmupTime>2.8</warmupTime>
-						<range>32</range>
-						<soundCast>TM_Thunder_OnMap</soundCast>
-						<muzzleFlashScale>5</muzzleFlashScale>
-						<soundCastTail>GunTail_Light</soundCastTail>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Seer_LightningRing</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>0.10</SwayFactor>
-						<Bulk>0.5</Bulk>
-						<Mass>1</Mass>
-						<RangedWeapon_Cooldown>.8</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_LightningWand</defaultProjectile>
-						<warmupTime>1.4</warmupTime>
-						<range>32</range>
-						<soundCast>TM_Thunder_OnMap</soundCast>
-						<muzzleFlashScale>5</muzzleFlashScale>
-						<soundCastTail>GunTail_Light</soundCastTail>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>TM_FireWand</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.01</SwayFactor>
-						<Bulk>1</Bulk>
-						<Mass>1</Mass>
-						<RangedWeapon_Cooldown>1.9</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_FireWand</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>32</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
-						<soundCast>TM_Woosh</soundCast>
-						<muzzleFlashScale>5</muzzleFlashScale>
-						<soundCastTail>GunTail_Light</soundCastTail>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Seer_FireRing</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>0.10</SwayFactor>
-						<Bulk>0.5</Bulk>
-						<Mass>1</Mass>
-						<RangedWeapon_Cooldown>.95</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_FireWand</defaultProjectile>
-						<warmupTime>0.75</warmupTime>
-						<range>32</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
-						<soundCast>DropPod_Leaving</soundCast>
-						<muzzleFlashScale>5</muzzleFlashScale>
-						<soundCastTail>GunTail_Light</soundCastTail>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Projectile_BlazingPower"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="TM_DefenderStaff" or defName="TM_BlazingPowerStaff"]/verbs/li[verbClass="TorannMagic.Weapon.Verb_BlazingPower"]</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="Base6x24mmChargedBullet" Class="AbilityUser.ProjectileDef_Ability">
-							<defName>Projectile_BlazingPower</defName>
-							<label>blazing power</label>
-							<graphicData>
-								<texPath>Spells/blazingpower</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>TM_BlazingPower</damageDef>
-								<damageAmountBase>7</damageAmountBase>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<explosionRadius>0.5</explosionRadius>
-								<suppressionFactor>3.0</suppressionFactor>
-								<dangerFactor>2.0</dangerFactor>
-								<speed>65</speed>
-								<dropsCasings>false</dropsCasings>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>TM_DefenderStaff</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.01</SwayFactor>
-						<Bulk>2</Bulk>
-						<Mass>2</Mass>
-						<RangedWeapon_Cooldown>2.6</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_BlazingPower</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>40</range>
-						<soundCast>TM_Woosh</soundCast>
-						<burstShotCount>5</burstShotCount>
-						<muzzleFlashScale>7</muzzleFlashScale>
-						<soundCastTail>GunTail_Light</soundCastTail>
-					</Properties>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>TM_BlazingPowerStaff</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.01</SwayFactor>
-						<Bulk>2</Bulk>
-						<Mass>2</Mass>
-						<RangedWeapon_Cooldown>3.5</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_BlazingPower</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>40</range>
-						<soundCast>TM_Woosh</soundCast>
-						<burstShotCount>7</burstShotCount>
-						<muzzleFlashScale>8</muzzleFlashScale>
-						<soundCastTail>GunTail_Light</soundCastTail>
-					</Properties>
-					<FireModes>
-						<aimedBurstShotCount>4</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>TM_ElephantBow</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.5</ShotSpread>
-						<SwayFactor>1</SwayFactor>
-						<Bulk>4.00</Bulk>
-						<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_StreamlinedArrow_Stone</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>34</range>
-						<soundCast>TM_ThrumBow</soundCast>
-						<soundCastTail>TM_Woosh</soundCastTail>
-						<muzzleFlashScale>1</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<ammoSet>AmmoSet_StreamlinedArrow</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Bow</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_ElephantBow"]/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>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>TM_ThrumBow</defName>
-					<statBases>
-						<SightsEfficiency>1.4</SightsEfficiency>
-						<ShotSpread>0.3</ShotSpread>
-						<SwayFactor>0.7</SwayFactor>
-						<Bulk>4.00</Bulk>
-						<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_StreamlinedArrow_Stone</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>40</range>
-						<soundCast>TM_ThrumBow</soundCast>
-					</Properties>
-					<AmmoUser>
-						<ammoSet>AmmoSet_GreatArrowRoMThrumbo</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Bow</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_ThrumBow"]/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>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<!-- ==================== AmmoSets ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_GreatArrowRoMThrumbo</defName>
-							<label>great arrows</label>
-							<ammoTypes>
-								<Ammo_GreatArrow_Stone>Projectile_GreatArrowRoMThrumbo_Stone</Ammo_GreatArrow_Stone>
-								<Ammo_GreatArrow_Steel>Projectile_GreatArrowRoMThrumbo_Steel</Ammo_GreatArrow_Steel>
-								<Ammo_GreatArrow_Plasteel>Projectile_GreatArrowRoMThrumbo_Plasteel</Ammo_GreatArrow_Plasteel>
-								<Ammo_GreatArrow_Venom>Projectile_GreatArrowRoMThrumbo_Venom</Ammo_GreatArrow_Venom>
-								<Ammo_GreatArrow_Flame>Projectile_GreatArrowRoMThrumbo_Flame</Ammo_GreatArrow_Flame>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGreatArrowProjectile">
-							<defName>Projectile_GreatArrowRoMThrumbo_Stone</defName>
-							<label>great arrow (stone)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Stone</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>29</speed>
-								<damageAmountBase>17</damageAmountBase><!--Artifically reduced from 33-->
-								<armorPenetrationBlunt>14.98</armorPenetrationBlunt>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<preExplosionSpawnChance>0.1</preExplosionSpawnChance><!-- All values are halved from original great arrow -->
-								<preExplosionSpawnThingDef>Ammo_GreatArrow_Stone</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGreatArrowProjectile">
-							<defName>Projectile_GreatArrowRoMThrumbo_Steel</defName>
-							<label>great arrow (steel)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>34</speed>
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationBlunt>21.06</armorPenetrationBlunt>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<preExplosionSpawnChance>0.3</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Ammo_GreatArrow_Steel</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGreatArrowProjectile">
-							<defName>Projectile_GreatArrowRoMThrumbo_Plasteel</defName>
-							<label>great arrow (plasteel)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Plasteel</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>38</speed>
-								<damageAmountBase>18</damageAmountBase>
-								<armorPenetrationBlunt>19.26</armorPenetrationBlunt>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<preExplosionSpawnChance>0.375</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Ammo_GreatArrow_Plasteel</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGreatArrowProjectile">
-							<defName>Projectile_GreatArrowRoMThrumbo_Venom</defName>
-							<label>great arrow (venom)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Venom</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>34</speed>
-								<damageDef>Arrow</damageDef>
-								<damageAmountBase>16</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>ArrowVenom</def>
-										<amount>4</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationBlunt>21.06</armorPenetrationBlunt>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<preExplosionSpawnChance>0.3</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Ammo_GreatArrow_Steel</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGreatArrowProjectile">
-							<defName>Projectile_GreatArrowRoMThrumbo_Flame</defName>
-							<label>great arrow (flame)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Flame</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>29</speed>
-								<damageDef>Arrow</damageDef>
-								<damageAmountBase>6</damageAmountBase>
-								<armorPenetrationBlunt>10.54</armorPenetrationBlunt>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<secondaryDamage>
-									<li>
-										<def>Flame</def>
-										<amount>1</amount>
-										<chance>0.33</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/A Rimworld of Magic/Patch_Sentinel.xml b/Patches/A Rimworld of Magic/Patch_Sentinel.xml
deleted file mode 100644
index be8d67e065..0000000000
--- a/Patches/A Rimworld of Magic/Patch_Sentinel.xml	
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>A RimWorld of Magic</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[
-						defName="TM_Lesser_SentinelR" or
-						defName="TM_SentinelR" or
-						defName="TM_Greater_SentinelR"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="TM_Lesser_SentinelR" or
-						defName="TM_SentinelR" or
-						defName="TM_Greater_SentinelR"
-						]/statBases </xpath>
-					<value>
-						<CarryBulk>20</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.19</MeleeDodgeChance>
-						<MeleeCritChance>0.22</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-						<MaxHitPoints>200</MaxHitPoints>
-						<SmokeSensitivity>0</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_Lesser_SentinelR"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_Lesser_SentinelR"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_SentinelR"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>2.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_SentinelR"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>5.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_Greater_SentinelR"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_Greater_SentinelR"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_Lesser_SentinelR"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1</cooldownTime>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<armorPenetrationBlunt>18.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Sentinel_Claws</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>9.2</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Sentinel_Teeth</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_SentinelR"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1</cooldownTime>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<armorPenetrationBlunt>18.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Sentinel_Claws</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>9.2</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Sentinel_Teeth</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_Greater_SentinelR"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1</cooldownTime>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<armorPenetrationBlunt>18.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Sentinel_Claws</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>9.2</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Sentinel_Teeth</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/A Rimworld of Magic/Patch_Skeleton.xml b/Patches/A Rimworld of Magic/Patch_Skeleton.xml
deleted file mode 100644
index a67227dcf2..0000000000
--- a/Patches/A Rimworld of Magic/Patch_Skeleton.xml	
+++ /dev/null
@@ -1,257 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>A RimWorld of Magic</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[
-						defName="TM_SkeletonLichR" or
-						defName="TM_GiantSkeletonR" or
-						defName="TM_SkeletonR"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="TM_SkeletonLichR"
-						]/statBases </xpath>
-					<value>
-						<CarryWeight>45</CarryWeight>
-						<CarryBulk>30</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>5</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.19</MeleeDodgeChance>
-						<MeleeCritChance>0.22</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-						<MaxHitPoints>200</MaxHitPoints>
-						<SmokeSensitivity>0.1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="TM_GiantSkeletonR"
-						]/statBases </xpath>
-					<value>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>50</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.19</MeleeDodgeChance>
-						<MeleeCritChance>0.22</MeleeCritChance>
-						<MeleeParryChance>0.3</MeleeParryChance>
-						<MaxHitPoints>200</MaxHitPoints>
-						<SmokeSensitivity>0</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="TM_SkeletonR"
-						]/statBases </xpath>
-					<value>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>30</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.09</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-						<MaxHitPoints>200</MaxHitPoints>
-						<SmokeSensitivity>0</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_SkeletonLichR"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_SkeletonLichR"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_GiantSkeletonR"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_GiantSkeletonR"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_SkeletonR"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_SkeletonR"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_SkeletonR"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.44</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.44</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>2.5</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_GiantSkeletonR"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>2.5</cooldownTime>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_SkeletonLichR"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>TM_ShadowBurn</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>1.1</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>TM_ShadowBurn</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>1.1</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>death stare</label>
-								<capacities>
-									<li>TM_DeathGaze</li>
-								</capacities>
-								<power>20</power>
-								<chanceFactor>.1</chanceFactor>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/A Rimworld of Magic/Patch_SpiritAnimal.xml b/Patches/A Rimworld of Magic/Patch_SpiritAnimal.xml
deleted file mode 100644
index ac919aa87f..0000000000
--- a/Patches/A Rimworld of Magic/Patch_SpiritAnimal.xml	
+++ /dev/null
@@ -1,249 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>A RimWorld of Magic</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="TM_SpiritBearR"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="TM_SpiritMongooseR"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="TM_SpiritCrowR"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TM_SpiritBearR"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.19</MeleeCritChance>
-						<MeleeParryChance>0.11</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_SpiritBearR"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.875</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_SpiritBearR"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.44</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_SpiritBearR"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.41</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.41</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>31</power>
-								<cooldownTime>2.05</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.85</armorPenetrationSharp>
-								<armorPenetrationBlunt>8.450</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.22</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>4.235</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TM_SpiritMongooseR"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						<MeleeCritChance>0.4</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_SpiritMongooseR"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_SpiritMongooseR"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_SpiritMongooseR"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>.9</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TM_SpiritCrowR"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.8</MeleeDodgeChance>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="TM_SpiritCrowR"]/statBases/ArmorRating_Blunt</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="TM_SpiritCrowR"]/statBases/ArmorRating_Sharp</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_SpiritCrowR"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.42</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.08</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.89</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>.325</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.78</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/A Rimworld of Magic/Patch_Stuff.xml b/Patches/A Rimworld of Magic/Patch_Stuff.xml
deleted file mode 100644
index 2e3c9ccc6c..0000000000
--- a/Patches/A Rimworld of Magic/Patch_Stuff.xml	
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>A RimWorld of Magic</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Demonscale-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TM_Demonscale"]/stuffProps/categories</xpath>
-					<value>
-						<li>Metallic_Weapon</li>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TM_Demonscale"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>1.5</MeleePenetrationFactor>
-						<Mass>0.75</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_Demonscale"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1.75</StuffPower_Armor_Sharp>
-						<StuffPower_Armor_Electric>0.20</StuffPower_Armor_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_Demonscale"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>3.5</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_Demonscale"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.35</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_Demonscale"]/statBases/StuffPower_Armor_Harmony</xpath>
-					<value>
-						<StuffPower_Armor_Harmony>0.15</StuffPower_Armor_Harmony>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TM_Demonscale"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-
-				<!--Arcalleum-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TM_Arcalleum"]/stuffProps/categories</xpath>
-					<value>
-						<li>Metallic_Weapon</li>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TM_Arcalleum"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>1.3</MeleePenetrationFactor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_Arcalleum"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1.1</StuffPower_Armor_Sharp>
-						<StuffPower_Armor_Electric>0.20</StuffPower_Armor_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_Arcalleum"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>3.25</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_Arcalleum"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.20</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_Arcalleum"]/statBases/StuffPower_Armor_Harmony</xpath>
-					<value>
-						<StuffPower_Armor_Harmony>0.12</StuffPower_Armor_Harmony>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_Arcalleum"]/statBases/SharpDamageMultiplier</xpath>
-					<value>
-						<SharpDamageMultiplier>0.75</SharpDamageMultiplier>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TM_Arcalleum"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-
-				<!--Manaweave-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_Manaweave"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.5</StuffPower_Armor_Sharp>
-						<StuffPower_Armor_Electric>0.08</StuffPower_Armor_Electric>
-						<Bulk>0.3</Bulk>
-						<WornBulk>0.3</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_Manaweave"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_Manaweave"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.08</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_Manaweave"]/statBases/StuffPower_Armor_Harmony</xpath>
-					<value>
-						<StuffPower_Armor_Harmony>0.025</StuffPower_Armor_Harmony>
-					</value>
-				</li>
-
-				<!--Demonhide-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_Demonhide"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.95</StuffPower_Armor_Sharp>
-						<StuffPower_Armor_Electric>0.08</StuffPower_Armor_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_Demonhide"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.3</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_Demonhide"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.08</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TM_Demonhide"]/statBases/StuffPower_Armor_Harmony</xpath>
-					<value>
-						<StuffPower_Armor_Harmony>0.06</StuffPower_Armor_Harmony>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/A Rimworld of Magic/Patch_Traits.xml b/Patches/A Rimworld of Magic/Patch_Traits.xml
deleted file mode 100644
index d4814c2999..0000000000
--- a/Patches/A Rimworld of Magic/Patch_Traits.xml	
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>A RimWorld of Magic</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraitDef[defName="Undead"]/degreeDatas/li/statOffsets</xpath>
-					<value>
-						<Suppressability>-1</Suppressability>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraitDef[
-						defName="InnerFire" or
-						defName="TM_TheShadow"
-						]/degreeDatas/li/statOffsets/ShootingAccuracyPawn </xpath>
-					<value>
-						<ShootingAccuracyPawn>-1</ShootingAccuracyPawn><!-- -5 -->
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraitDef[
-						defName="Technomancer"
-						]/degreeDatas/li/statOffsets/ShootingAccuracyPawn </xpath>
-					<value>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn><!-- +5 -->
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraitDef[defName="TM_Brightmage"]/degreeDatas/li/statOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<ShootingAccuracyPawn>-3</ShootingAccuracyPawn><!-- -35 -->
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraitDef[
-						defName="TM_Sniper"
-						]/degreeDatas/li[1]/statOffsets/ShootingAccuracyPawn </xpath>
-					<value>
-						<ShootingAccuracyPawn>0.4</ShootingAccuracyPawn><!-- +2 -->
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraitDef[
-						defName="TM_Sniper"
-						]/degreeDatas/li[2]/statOffsets/ShootingAccuracyPawn </xpath>
-					<value>
-						<ShootingAccuracyPawn>0.8</ShootingAccuracyPawn><!-- +4 -->
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraitDef[
-						defName="TM_Sniper"
-						]/degreeDatas/li[3]/statOffsets/ShootingAccuracyPawn </xpath>
-					<value>
-						<ShootingAccuracyPawn>1.2</ShootingAccuracyPawn><!-- +6 -->
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraitDef[
-						defName="TM_Sniper"
-						]/degreeDatas/li[4]/statOffsets/ShootingAccuracyPawn </xpath>
-					<value>
-						<ShootingAccuracyPawn>1.6</ShootingAccuracyPawn><!-- +8 -->
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraitDef[
-						defName="Bladedancer"
-						]/degreeDatas/li[1]/statOffsets/ShootingAccuracyPawn </xpath>
-					<value>
-						<ShootingAccuracyPawn>-2</ShootingAccuracyPawn><!-- -20 -->
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraitDef[
-						defName="Bladedancer"
-						]/degreeDatas/li[2]/statOffsets/ShootingAccuracyPawn </xpath>
-					<value>
-						<ShootingAccuracyPawn>-2.5</ShootingAccuracyPawn><!-- -25 -->
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraitDef[
-						defName="Bladedancer"
-						]/degreeDatas/li[3]/statOffsets/ShootingAccuracyPawn </xpath>
-					<value>
-						<ShootingAccuracyPawn>-2.8</ShootingAccuracyPawn><!-- -28 -->
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraitDef[
-						defName="Bladedancer"
-						]/degreeDatas/li[4]/statOffsets/ShootingAccuracyPawn </xpath>
-					<value>
-						<ShootingAccuracyPawn>-30</ShootingAccuracyPawn><!-- -30 -->
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/A Rimworld of Magic/Patch_Turrets.xml b/Patches/A Rimworld of Magic/Patch_Turrets.xml
deleted file mode 100644
index 3e8ef129a2..0000000000
--- a/Patches/A Rimworld of Magic/Patch_Turrets.xml	
+++ /dev/null
@@ -1,289 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>A RimWorld of Magic</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Pylon -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="DefensePylon" or
-						defName="DefensePylon_I" or
-						defName="DefensePylon_II" or
-						defName="DefensePylon_III" or
-						defName="TM_TechnoTurret_Base" or
-						defName="TM_60mmMortar_Base"
-						]/fillPercent </xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TM_LightningTotem" or
-						defName="TM_HealingTotem" or
-						defName="TM_EarthTotem"
-						]/fillPercent </xpath>
-					<value>
-						<fillPercent>0.50</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_DefensePylon"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<armorPenetrationBlunt>20</armorPenetrationBlunt>
-							<armorPenetrationSharp>5</armorPenetrationSharp>
-							<dropsCasings>false</dropsCasings>
-							<damageDef>TM_MagicMissile_Weak</damageDef>
-							<damageAmountBase>8</damageAmountBase>
-							<speed>70</speed>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Bullet_DefensePylon"]</xpath>
-					<value>
-						<thingClass>CombatExtended.BulletCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Launcher_DefensePylon</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>.6</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.10</ShotSpread>
-						<SwayFactor>1.00</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.19</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_DefensePylon</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>32</range>
-						<soundCast>GunShotA</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>3</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Launcher_DefensePylon_I</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>.6</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.10</ShotSpread>
-						<SwayFactor>1.00</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.19</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_DefensePylon</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>36</range>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<burstShotCount>3</burstShotCount>
-						<soundCast>GunShotA</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>4</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Launcher_DefensePylon_II</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>.6</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.10</ShotSpread>
-						<SwayFactor>1.00</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.19</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_DefensePylon</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>40</range>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<burstShotCount>4</burstShotCount>
-						<soundCast>GunShotA</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>5</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Launcher_DefensePylon_III</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>.6</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.10</ShotSpread>
-						<SwayFactor>1.00</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.19</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_DefensePylon</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>44</range>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<burstShotCount>5</burstShotCount>
-						<soundCast>GunShotA</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>6</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- Mark IV -->
-
-				<!--
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_Mark-IV"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<damageAmountBase>7</damageAmountBase>
-							<armorPenetrationSharp>6</armorPenetrationSharp>
-							<armorPenetrationBlunt>10.860</armorPenetrationBlunt>
-							<dropsCasings>true</dropsCasings>
-							<speed>90</speed>
-						</projectile>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Bullet_Mark-IV"]</xpath>
-					<value>
-						<thingClass>CombatExtended.BulletCE</thingClass>
-					</value>
-				</li>-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Mark-IV</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>.6</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.10</ShotSpread>
-						<SwayFactor>1.00</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.19</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_AP</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>45</range>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<burstShotCount>6</burstShotCount>
-						<soundCast>Shot_Revolver</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<!--
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_Shell_TechnoTurretExplosive"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<damageDef>Bomb</damageDef>
-							<damageAmountBase>15</damageAmountBase>
-							<explosionRadius>1.5</explosionRadius>
-<suppressionFactor>3.0</suppressionFactor>
-<dangerFactor>2.0</dangerFactor>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-							<soundExplode>MortarBomb_Explode</soundExplode>
-							<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
-							<soundAmbient>MortarRound_Ambient</soundAmbient>
-							<speed>45</speed>
-						</projectile>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_Shell_TechnoTurretExplosive"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Bullet_Shell_TechnoTurretExplosive"]</xpath>
-					<value>
-						<comps>
-						  <li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-							  <Fragment_Small>11</Fragment_Small>
-							</fragments>
-						  </li>
-						</comps>
-					</value>
-				</li>
-				-->
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/ADE Advanced Turrets/Buildings_Security.xml b/Patches/ADE Advanced Turrets/Buildings_Security.xml
deleted file mode 100644
index abdefcd4de..0000000000
--- a/Patches/ADE Advanced Turrets/Buildings_Security.xml	
+++ /dev/null
@@ -1,182 +0,0 @@
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ADE Advanced Turrets</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="ADE_Turret_HMGT" or
-						defName="ADE_Turret_HST" or
-						defName="ADE_Turret_GLT"
-						]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="ADE_Turret_HMGT" or
-						defName="ADE_Turret_HST" or
-						defName="ADE_Turret_GLT"
-						]/thingClass </xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="ADE_Turret_HMGT" or
-						defName="ADE_Turret_HST" or
-						defName="ADE_Turret_GLT"
-						]/fillPercent </xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-				<!-- adding power requirement -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="ADE_Turret_HMGT" or
-						defName="ADE_Turret_HST" or
-						defName="ADE_Turret_GLT"
-						]/comps </xpath>
-					<value>
-						<li Class="CompProperties_Power">
-							<compClass>CompPowerTrader</compClass>
-							<basePowerConsumption>350</basePowerConsumption>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="ADE_Turret_HMGT" or
-						defName="ADE_Turret_HST" or
-						defName="ADE_Turret_GLT"
-						]/statBases/ShootingAccuracyTurret </xpath>
-					<value>
-						<AimingAccuracy>1</AimingAccuracy>
-						<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
-					</value>
-				</li>
-				<!-- ========== HMG  Turret ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ADE_Gun_HMGT</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.18</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1.13</SwayFactor>
-						<Bulk>37.08</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.09</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>54</range>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<burstShotCount>20</burstShotCount>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>500</magazineSize>
-						<reloadTime>15.6</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!-- ========== Grenade Launcher Turret ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ADE_Gun_GLT</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>2.02</SwayFactor>
-						<Bulk>10.66</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.34</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_40x53mmGrenade_HE</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>55</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>5</burstShotCount>
-						<soundCast>AGS</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>18</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-						<requireLineOfSight>false</requireLineOfSight>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>40</magazineSize>
-						<reloadTime>10.9</reloadTime>
-						<ammoSet>AmmoSet_40x53mmGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!-- ========== Anti Aircraft Precision ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ADE_Gun_HST</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.2</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>28.72</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.80</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_20x128mmOerlikon_AP</defaultProjectile>
-						<warmupTime>1.4</warmupTime>
-						<range>65</range>
-						<soundCast>autocannon_slow</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<muzzleFlashScale>45</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>150</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_20x128mmOerlikon</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/ADE Advanced Turrets/Remove_Mod_Ammo.xml b/Patches/ADE Advanced Turrets/Remove_Mod_Ammo.xml
deleted file mode 100644
index d7ab48a71a..0000000000
--- a/Patches/ADE Advanced Turrets/Remove_Mod_Ammo.xml	
+++ /dev/null
@@ -1,28 +0,0 @@
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ADE Advanced Turrets</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/RecipeDef[
-						defName="Make_Ammo_x_HMGT_CannonShell" or
-						defName="Make_Ammo_xxx_HMGT_CannonShell" or
-						defName="Make_Ammo_x_HST_CannonShell" or
-						defName="Make_Ammo_xx_HST_CannonShell" or
-						defName="Make_Ammo_x_Grenade_CannonShell" or
-						defName="Make_Ammo_xx_Grenade_CannonShell"
-						] </xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="HMGT_Ammo" or
-						defName="HST_Ammo" or
-						defName="HST_Grenade_Ammo"
-						] </xpath>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/ADE Advanced turrets PLUS/Buildings_Security.xml b/Patches/ADE Advanced turrets PLUS/Buildings_Security.xml
deleted file mode 100644
index 3c781e2e5b..0000000000
--- a/Patches/ADE Advanced turrets PLUS/Buildings_Security.xml	
+++ /dev/null
@@ -1,182 +0,0 @@
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ADE Advanced Turrets +</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="ADE_Turret_AHMGT" or
-						defName="ADE_Turret_AMBMGT" or
-						defName="ADE_Turret_AHST"
-						]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="ADE_Turret_AHMGT" or
-						defName="ADE_Turret_AMBMGT" or
-						defName="ADE_Turret_AHST"
-						]/thingClass </xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="ADE_Turret_AHMGT" or
-						defName="ADE_Turret_AMBMGT" or
-						defName="ADE_Turret_AHST"
-						]/fillPercent </xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-				<!-- adding power requirement -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="ADE_Turret_AHMGT" or
-						defName="ADE_Turret_AMBMGT" or
-						defName="ADE_Turret_AHST"
-						]/comps </xpath>
-					<value>
-						<li Class="CompProperties_Power">
-							<compClass>CompPowerTrader</compClass>
-							<basePowerConsumption>950</basePowerConsumption>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="ADE_Turret_AHMGT" or
-						defName="ADE_Turret_AMBMGT" or
-						defName="ADE_Turret_AHST"
-						]/statBases/ShootingAccuracyTurret </xpath>
-					<value>
-						<AimingAccuracy>1</AimingAccuracy>
-						<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
-					</value>
-				</li>
-				<!-- ========== HMG+  Turret ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ADE_Gun_AHMGT</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.18</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.13</SwayFactor>
-						<Bulk>37.08</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.59</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_145x114mm_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>68</range>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<burstShotCount>20</burstShotCount>
-						<soundCast>Shot_Autocannon</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>300</magazineSize>
-						<reloadTime>17.8</reloadTime>
-						<ammoSet>AmmoSet_145x114mm</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!-- ========== gatling autocannon Turret ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ADE_Gun_AMBMGT</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>2.02</SwayFactor>
-						<Bulk>10.66</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.61</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_20x102mmNATO_AP</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>62</range>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<burstShotCount>20</burstShotCount>
-						<soundCast>Shot_Autocannon</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>45</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-						<requireLineOfSight>false</requireLineOfSight>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>200</magazineSize>
-						<reloadTime>18.9</reloadTime>
-						<ammoSet>AmmoSet_20x102mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!-- ========== Anti Aircraft autocannon PLUS========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ADE_Gun_AHST</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>1.27</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.5</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.02</SwayFactor>
-						<Bulk>28.72</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>3.74</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_57x483mmBofors_HE</defaultProjectile>
-						<warmupTime>2.5</warmupTime>
-						<range>80</range>
-						<soundCast>autocannon_slow</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<muzzleFlashScale>55</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>10.8</reloadTime>
-						<ammoSet>AmmoSet_57x483mmBofors</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/ADE Advanced turrets PLUS/Remove_Mod_Ammo.xml b/Patches/ADE Advanced turrets PLUS/Remove_Mod_Ammo.xml
deleted file mode 100644
index 419feeb04a..0000000000
--- a/Patches/ADE Advanced turrets PLUS/Remove_Mod_Ammo.xml	
+++ /dev/null
@@ -1,22 +0,0 @@
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ADE Advanced Turrets +</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/RecipeDef[
-						defName="Make_Ammo_x_AHST_CannonShell" or
-						defName="Make_Ammo_xx_AHST_CannonShell"
-						] </xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="AHST_Ammo"
-						] </xpath>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/ADE Pulse Turrets PLUS/Buildings_Security.xml b/Patches/ADE Pulse Turrets PLUS/Buildings_Security.xml
deleted file mode 100644
index df96516ba0..0000000000
--- a/Patches/ADE Pulse Turrets PLUS/Buildings_Security.xml	
+++ /dev/null
@@ -1,240 +0,0 @@
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ADE Pulse Turrets</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="ZXT_Turret_Pulsemachinegunturret" or
-						defName="ZXT_Turret_Sniperpulseturret" or
-						defName="ZXT_Turret_Armoredpowerpulseturret" or
-						defName="ZXT_Turret_Advancedrotarypulsemachinegunturret"
-						]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="ZXT_Turret_Pulsemachinegunturret" or
-						defName="ZXT_Turret_Sniperpulseturret" or
-						defName="ZXT_Turret_Armoredpowerpulseturret" or
-						defName="ZXT_Turret_Advancedrotarypulsemachinegunturret"
-						]/thingClass </xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-				<!-- Same label??? wth? -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="ZXT_Turret_Sniperpulseturret"
-						]/label </xpath>
-					<value>
-						<label>Armored Gauss Lance</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="ZXT_Turret_Pulsemachinegunturret" or
-						defName="ZXT_Turret_Sniperpulseturret" or
-						defName="ZXT_Turret_Armoredpowerpulseturret" or
-						defName="ZXT_Turret_Advancedrotarypulsemachinegunturret"
-						]/fillPercent </xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<!-- Increasing power requirement -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="ZXT_Turret_Pulsemachinegunturret" or
-						defName="ZXT_Turret_Sniperpulseturret" or
-						defName="ZXT_Turret_Armoredpowerpulseturret"
-						]/comps/li[@Class = "CompProperties_Power"]/basePowerConsumption </xpath>
-					<value>
-						<basePowerConsumption>1050</basePowerConsumption>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="ZXT_Turret_Advancedrotarypulsemachinegunturret"
-						]/comps/li[@Class = "CompProperties_Power"]/basePowerConsumption </xpath>
-					<value>
-						<basePowerConsumption>1450</basePowerConsumption>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="ZXT_Turret_Pulsemachinegunturret" or
-						defName="ZXT_Turret_Sniperpulseturret" or
-						defName="ZXT_Turret_Armoredpowerpulseturret" or
-						defName="ZXT_Turret_Advancedrotarypulsemachinegunturret"
-						]/statBases/ShootingAccuracyTurret </xpath>
-					<value>
-						<AimingAccuracy>1</AimingAccuracy>
-						<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
-					</value>
-				</li>
-				<!-- ========== Pulse HMG Turret ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ZXT_Gun_Pulsemachinegunturret</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.18</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.03</SwayFactor>
-						<Bulk>37.08</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.55</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
-						<warmupTime>1.4</warmupTime>
-						<range>72</range>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<burstShotCount>20</burstShotCount>
-						<soundCast>Shot_ChargeBlaster</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>200</magazineSize>
-						<reloadTime>15.8</reloadTime>
-						<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!-- ========== Charged SNiper Pulse Turret ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ZXT_Gun_Sniperpulseturret</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.02</SwayFactor>
-						<Bulk>10.66</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.51</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12mmRailgun_Sabot</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>102</range>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<burstShotCount>1</burstShotCount>
-						<soundCast>ChargeLance_Fire</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>45</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-						<requireLineOfSight>false</requireLineOfSight>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>15.8</reloadTime>
-						<ammoSet>AmmoSet_12mmRailgun</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!-- ========== Armored Pulse Turrets, one caliber higher PLUS========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ZXT_Gun_Armoredpowerpulseturret</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.25</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.22</SwayFactor>
-						<Bulk>37.08</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.75</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8x50mmCharged</defaultProjectile>
-						<warmupTime>1.4</warmupTime>
-						<range>78</range>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<burstShotCount>20</burstShotCount>
-						<soundCast>Shot_ChargeBlaster</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>22</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>250</magazineSize>
-						<reloadTime>16.5</reloadTime>
-						<ammoSet>AmmoSet_8x50mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-				<!-- ========== Armored Gatling Gun, ========= -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ZXT_Gun_Advancedrotarypulsemachinegunturret</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.25</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.25</SwayFactor>
-						<Bulk>37.08</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.725</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12x64mmCharged</defaultProjectile>
-						<warmupTime>1.25</warmupTime>
-						<range>77</range>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<burstShotCount>30</burstShotCount>
-						<soundCast>Shot_ChargeBlaster</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>22</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>300</magazineSize>
-						<reloadTime>18.5</reloadTime>
-						<ammoSet>AmmoSet_MechCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/ADE Pulse Turrets PLUS/Remove_Mod_Ammo.xml b/Patches/ADE Pulse Turrets PLUS/Remove_Mod_Ammo.xml
deleted file mode 100644
index ccf9ff84b7..0000000000
--- a/Patches/ADE Pulse Turrets PLUS/Remove_Mod_Ammo.xml	
+++ /dev/null
@@ -1,22 +0,0 @@
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ADE Pulse Turrets</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/RecipeDef[
-						defName="ZXT_Make_Ammo_Mediumpulsebattery" or
-						defName="ZXT_Make_x_Ammo_Mediumpulsebattery"
-						] </xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="ZXT_Ammo_Mediumpulsebattery"
-						] </xpath>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/ADogSaid/Bionics.xml b/Patches/ADogSaid/Bionics.xml
deleted file mode 100644
index b5a12e3c0c..0000000000
--- a/Patches/ADogSaid/Bionics.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>A Dog Said... Animal Prosthetics</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Simple prosthetics ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="SimpleProstheticLegAnimal"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>prosthetic animal leg</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<cooldownTime>1.8</cooldownTime>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="SimpleProstheticArmAnimal"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>prosthetic animal arm</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<cooldownTime>1.8</cooldownTime>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="JawAnimalSimple"]</xpath>
-					<value>
-						<comps>
-							<li Class="HediffCompProperties_VerbGiver">
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>simple animal jaw</label>
-										<capacities>
-											<li>Bite</li>
-										</capacities>
-										<power>6</power>
-										<armorPenetrationBlunt>2.0</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.1</armorPenetrationSharp>
-										<cooldownTime>1.8</cooldownTime>
-									</li>
-								</tools>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ========== Bionics ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BionicLegAnimal"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>bionic animal leg</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>20</power>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<cooldownTime>1.4</cooldownTime>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BionicArmAnimal"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>bionic animal arm</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>15</power>
-								<armorPenetrationBlunt>2.0</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<cooldownTime>1.4</cooldownTime>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="JawAnimalBionic"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>bionic animal jaw</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>15</power>
-								<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<cooldownTime>1.6</cooldownTime>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AOC The Cleanup Devil/AMMO.xml b/Patches/AOC The Cleanup Devil/AMMO.xml
deleted file mode 100644
index 2b0ae480fc..0000000000
--- a/Patches/AOC The Cleanup Devil/AMMO.xml	
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AOC The Cleanup Devil</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- AOCPOWERCELL -->
-
-						<ThingCategoryDef>
-							<defName>AmmoAOCPowerCell</defName>
-							<label>AOCPOWERCELL</label>
-							<parent>AmmoRifles</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== Ammo AOCPOWERCELL ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="AOCPowerCellBase" ParentName="SmallAmmoBase" Abstract="True">
-							<description>A power cell.</description>
-							<statBases>
-								<Mass>0.5</Mass>
-								<Bulk>0.1</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoAOCPowerCell</li>
-							</thingCategories>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="AOCPowerCellBase">
-							<defName>Ammo_AOCPowerCell</defName>
-							<label>(AOC) Power cell</label>
-							<graphicData>
-								<texPath>Things/Ammo/Charged/MediumMech</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>1.5</MarketValue>
-							</statBases>
-							<ammoClass>Charged</ammoClass>
-						</ThingDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_AOCPowerCell</defName>
-							<label>AOC POWER CELL</label>
-							<ammoTypes>
-								<Ammo_AOCPowerCell>Bullet_SuviBusterProjectile</Ammo_AOCPowerCell>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Recipe: AOCELL===================== -->
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_AOCPowerCell</defName>
-							<label>make AOC PowerCell Power Cell x500</label>
-							<description>Craft 500 AOC PowerCell Power Cell.</description>
-							<jobString>Making TE Universal Power Cell.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Chemfuel</li>
-										</thingDefs>
-									</filter>
-									<count>15</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Chemfuel</li>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_AOCPowerCell>500</Ammo_AOCPowerCell>
-							</products>
-							<workAmount>19000</workAmount>
-						</RecipeDef>
-
-						<!--SuvisniperProjectile-->
-
-						<ThingDef ParentName="Base40x365mmBoforsBullet">
-							<defName>Bullet_SuviBusterProjectile</defName>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<label>energy bolt</label>
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_SuviBuster</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Flame</damageDef>
-								<speed>90</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<explosionRadius>1</explosionRadius>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/AOC The Cleanup Devil/Animals.xml b/Patches/AOC The Cleanup Devil/Animals.xml
deleted file mode 100644
index 5bd5ba1274..0000000000
--- a/Patches/AOC The Cleanup Devil/Animals.xml	
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AOC The Cleanup Devil</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--PooPoo-->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="PooPoo"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PooPoo"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency>0.75</NightVisionEfficiency>
-						<MeleeDodgeChance>0.69</MeleeDodgeChance>
-						<MeleeCritChance>0.33</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PooPoo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>razorfangs</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.46</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<chanceFactor>2</chanceFactor>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>3.2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.225</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Fckrat-->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="FCKrat"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="FCKrat"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency>0.75</NightVisionEfficiency>
-						<MeleeDodgeChance>0.69</MeleeDodgeChance>
-						<MeleeCritChance>0.33</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FCKrat"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>razorfangs</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.46</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<chanceFactor>2</chanceFactor>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>3.2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.225</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/AOC The Cleanup Devil/Apparel/Apparel - Armor.xml b/Patches/AOC The Cleanup Devil/Apparel/Apparel - Armor.xml
deleted file mode 100644
index 9eab8a31a2..0000000000
--- a/Patches/AOC The Cleanup Devil/Apparel/Apparel - Armor.xml	
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AOC The Cleanup Devil</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--========= Doom Armor =========-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_Doomarmor"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_Doomarmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>500</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_Doomarmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>50</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_Doomarmor"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_Doomarmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_Doomarmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>45</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_Doomarmor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>80</CarryWeight>
-						<CarryBulk>10</CarryBulk>
-						<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_Doomarmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AOC_Doomarmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!--========= Doom Helmet =========-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_DoomHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_DoomHelmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_DoomHelmet"]/statBases/Mass</xpath>
-					<value>
-						<Mass>4.8</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_DoomHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>300</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_DoomHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_DoomHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>36</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_DoomHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<AimingAccuracy>0.15</AimingAccuracy>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_DoomHelmet"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>60</Plasteel>
-						<DevilstrandCloth>20</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_DoomHelmet"]/apparel</xpath>
-					<value>
-						<immuneToToxGasExposure>true</immuneToToxGasExposure>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_DoomHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AOC_DoomHelmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/AOC The Cleanup Devil/Apparel/Apparel - Biotech.xml b/Patches/AOC The Cleanup Devil/Apparel/Apparel - Biotech.xml
deleted file mode 100644
index ac99b07bbf..0000000000
--- a/Patches/AOC The Cleanup Devil/Apparel/Apparel - Biotech.xml	
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AOC The Cleanup Devil</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Biotech</li>
-			</mods>
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<!-- ========== Child Apparel ========== -->
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[
-							defName="AOCC_Kid_Apparel_Bori" or
-							defName="AOCC_Kid_Apparel_Miho" or
-							defName="AOCC_Kid_Apparel_AOC" or
-							defName="AOCC_Kid_Apparel_sheepawn"
-							]/statBases/StuffEffectMultiplierArmor </xpath>
-						<value>
-							<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[
-							defName="AOCC_Kid_Apparel_Bori" or
-							defName="AOCC_Kid_Apparel_Miho" or
-							defName="AOCC_Kid_Apparel_AOC" or
-							defName="AOCC_Kid_Apparel_sheepawn"
-							]/statBases </xpath>
-						<value>
-							<Bulk>1.5</Bulk>
-							<WornBulk>0.5</WornBulk>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/AOC The Cleanup Devil/Apparel/Apparel - Flex.xml b/Patches/AOC The Cleanup Devil/Apparel/Apparel - Flex.xml
deleted file mode 100644
index 86b20801c7..0000000000
--- a/Patches/AOC The Cleanup Devil/Apparel/Apparel - Flex.xml	
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AOC The Cleanup Devil</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== FLEX Apparel ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_FLEX_clothes"]/statBases</xpath>
-					<value>
-						<Bulk>1.5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_FLEX_clothes"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>20</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- FLEX Suit -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_FLEX_Suit"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_FLEX_Suit"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>7</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_FLEX_Suit"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>10</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- FLEX Dress -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_FLEX_Dress"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_FLEX_Dress"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- FLEX Coat -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_FLEX_Coat"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_FLEX_Coat"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/AOC The Cleanup Devil/Apparel/Apparel - Kellion.xml b/Patches/AOC The Cleanup Devil/Apparel/Apparel - Kellion.xml
deleted file mode 100644
index 6a8f4b4411..0000000000
--- a/Patches/AOC The Cleanup Devil/Apparel/Apparel - Kellion.xml	
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AOC The Cleanup Devil</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--========= Kellion Armor =========-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_Kellionarmor"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_Kellionarmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>700</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_Kellionarmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>50</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_Kellionarmor"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_Kellionarmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>30</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_Kellionarmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>45</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_Kellionarmor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>90</CarryWeight>
-						<CarryBulk>10</CarryBulk>
-						<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_Kellionarmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AOC_Kellionarmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!--========= Kellion Helmet	 =========-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_KellionHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_KellionHelmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_KellionHelmet"]/statBases/Mass</xpath>
-					<value>
-						<Mass>4.8</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_KellionHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>300</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_KellionHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_KellionHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>45</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_KellionHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<AimingAccuracy>0.15</AimingAccuracy>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_KellionHelmet"]/apparel</xpath>
-					<value>
-						<immuneToToxGasExposure>true</immuneToToxGasExposure>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_KellionHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AOC_KellionHelmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Nose</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Nose</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/AOC The Cleanup Devil/Apparel/Apparel - Space.xml b/Patches/AOC The Cleanup Devil/Apparel/Apparel - Space.xml
deleted file mode 100644
index 1ca501523a..0000000000
--- a/Patches/AOC The Cleanup Devil/Apparel/Apparel - Space.xml	
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AOC The Cleanup Devil</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--========= SpaceSuit and Royal =========-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="AOC_SpaceApparelBase"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="AOC_SpaceApparelBase"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>700</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="AOC_SpaceApparelBase"]/statBases/Mass</xpath>
-					<value>
-						<Mass>50</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="AOC_SpaceApparelBase"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="AOC_SpaceApparelBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="AOC_SpaceApparelBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>30</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="AOC_SpaceApparelBase"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>100</CarryWeight>
-						<CarryBulk>10</CarryBulk>
-						<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="AOC_SpaceApparelBase"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="AOC_SpaceApparelBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!--========= Space Suit Helmet and Royal Helmet=========-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="AOC_SpaceApparelHelmetBase"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="AOC_SpaceApparelHelmetBase"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="AOC_SpaceApparelHelmetBase"]/statBases/Mass</xpath>
-					<value>
-						<Mass>4.8</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="AOC_SpaceApparelHelmetBase"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>300</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="AOC_SpaceApparelHelmetBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>13</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="AOC_SpaceApparelHelmetBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>30</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="AOC_SpaceApparelHelmetBase"]/equippedStatOffsets</xpath>
-					<value>
-						<AimingAccuracy>0.2</AimingAccuracy>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="AOC_SpaceApparelHelmetBase"]/apparel</xpath>
-					<value>
-						<immuneToToxGasExposure>true</immuneToToxGasExposure>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="AOC_SpaceApparelHelmetBase"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="AOC_SpaceApparelHelmetBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Nose</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Nose</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/AOC The Cleanup Devil/Apparel/Apparel.xml b/Patches/AOC The Cleanup Devil/Apparel/Apparel.xml
deleted file mode 100644
index d004ae4241..0000000000
--- a/Patches/AOC The Cleanup Devil/Apparel/Apparel.xml	
+++ /dev/null
@@ -1,907 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AOC The Cleanup Devil</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--========= MonerArmor =========-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_Monerarmor"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_Monerarmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>700</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_Monerarmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>50</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_Monerarmor"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_Monerarmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_Monerarmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>30</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_Monerarmor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>100</CarryWeight>
-						<CarryBulk>10</CarryBulk>
-						<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_Monerarmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AOC_Monerarmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!--========= Moner Helmet =========-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_MonerHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_MonerHelmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_MonerHelmet"]/statBases/Mass</xpath>
-					<value>
-						<Mass>4.8</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_MonerHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>240</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_MonerHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_MonerHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>36</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_MonerHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<AimingAccuracy>0.15</AimingAccuracy>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_MonerHelmet"]/apparel</xpath>
-					<value>
-						<immuneToToxGasExposure>true</immuneToToxGasExposure>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_MonerHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AOC_MonerHelmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Nose</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Nose</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!--========= Bone Armor =========-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_bone_armor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_bone_armor"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<!--========= SAE Helmet =========-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="AOC_SAEHelmetPowerBase"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="AOC_SAEHelmetPowerBase"]/statBases/Mass</xpath>
-					<value>
-						<Mass>4.8</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="AOC_SAEHelmetPowerBase"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>240</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="AOC_SAEHelmetPowerBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="AOC_SAEHelmetPowerBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>36</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="AOC_SAEHelmetPowerBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Nose</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Nose</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== warsuits ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_war_suits"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_war_suits"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>30</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="AOC_war_suits"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_war_suits"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AOC_war_suits"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Apparel ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_work_clothes"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_work_clothes"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_winter_hat"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_winter_hat"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_Cdress"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_Cdress"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_winter_clothes"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_winter_clothes"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_Jump_Suit"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_Jump_Suit"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_Aloha"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>0.8</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_Aloha"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_overalls"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_overalls"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_audit_clothes"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_audit_clothes"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_audit_coat"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_audit_coat"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_coat"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_coat"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_work_cap"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_work_cap"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOCHealHat"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOCHealHat"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_war_cap"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>15</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_war_cap"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOCStraw"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_arm_band"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>0.4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_arm_band"]/statBases</xpath>
-					<value>
-						<Bulk>0.25</Bulk>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_card"]/statBases</xpath>
-					<value>
-						<Bulk>0.25</Bulk>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="AOC_card"]/statBases/StuffEffectMultiplierArmor</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_AlohaF"]/statBases</xpath>
-					<value>
-						<Bulk>0.25</Bulk>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_Doll_Whale"]/statBases</xpath>
-					<value>
-						<Bulk>0.25</Bulk>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="AOC_AlohaF"]/statBases/StuffEffectMultiplierArmor</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_arm_band"]/statBases/EnergyShieldRechargeRate</xpath>
-					<value>
-						<EnergyShieldRechargeRate>0.300</EnergyShieldRechargeRate>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_arm_band"]/statBases/EnergyShieldEnergyMax</xpath>
-					<value>
-						<EnergyShieldEnergyMax>0.55</EnergyShieldEnergyMax>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_coat"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_coat"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>7</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AOC_coat"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_coat"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>2.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_NanoSuit"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_NanoSuit"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_NanoSuit"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AOC_NanoSuit"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_GasVeil"]/statBases</xpath>
-					<value>
-						<Bulk>1.5</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_GasVeil"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_GasVeil"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_GasMask"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_GasMask"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_GasMask"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_GasMask"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>8</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ========== Trash Apparel ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_Trash_clothes"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_Trash_clothes"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_Trash_clothes"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_Trash_clothes"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_Wintercoat"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>3</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_Wintercoat"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_Wintercoat"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/AOC The Cleanup Devil/Apparel/Backpacks.xml b/Patches/AOC The Cleanup Devil/Apparel/Backpacks.xml
deleted file mode 100644
index a860107d5b..0000000000
--- a/Patches/AOC The Cleanup Devil/Apparel/Backpacks.xml	
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AOC The Cleanup Devil</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Battle Backpacks-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_Battle_Backpacks"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_Battle_Backpacks"]/equippedStatOffsets/CarryingCapacity</xpath>
-					<value>
-						<CarryBulk>70</CarryBulk>
-					</value>
-				</li>
-
-				<!--Cleaner Backpacks-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_Cleaner_Backpacks"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_Cleaner_Backpacks"]/equippedStatOffsets/CarryingCapacity</xpath>
-					<value>
-						<CarryBulk>100</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_Cleaner_Backpacks"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<label>cleaner</label>
-								<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<onlyManualCast>True</onlyManualCast>
-								<warmupTime>1</warmupTime>
-								<range>12</range>
-								<minRange>2</minRange>
-								<soundCast>Shot_IncendiaryLauncher</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>14</muzzleFlashScale>
-								<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-								<defaultProjectile>Proj_FilthEraser</defaultProjectile>
-								<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!--Recycle Backpacks-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_Recyle_Backpacks"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_Recyle_Backpacks"]/equippedStatOffsets/CarryingCapacity</xpath>
-					<value>
-						<CarryBulk>100</CarryBulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/AOC The Cleanup Devil/BodyDef.xml b/Patches/AOC The Cleanup Devil/BodyDef.xml
deleted file mode 100644
index 7f8b7e5112..0000000000
--- a/Patches/AOC The Cleanup Devil/BodyDef.xml	
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AOC The Cleanup Devil</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Melee-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="AOC"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Gizmo-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="AOC"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-				<!--Arm Groups-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="AOC"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
-					<value>
-						<li>LeftArm</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="AOC"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
-					<value>
-						<li>RightArm</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="AOC"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
-					<value>
-						<li>LeftShoulder</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="AOC"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
-					<value>
-						<li>RightShoulder</li>
-					</value>
-				</li>
-
-				<!--Natural Armor-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="AOC"]//*[
-						def="Torso" or
-						def="Neck" or
-						def="Head" or
-						def="AOCTail" or
-						def="Nose" or
-						def="Jaw" or
-						def="Ear" or
-						def="Shoulder" or
-						def="Arm" or
-						def="Hand" or
-						def="Finger" or
-						def="Leg" or
-						def="Foot" or
-						def="Toe"]/groups
-					</xpath>
-
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/AOC The Cleanup Devil/Grenades.xml b/Patches/AOC The Cleanup Devil/Grenades.xml
deleted file mode 100644
index 6477b8b7bf..0000000000
--- a/Patches/AOC The Cleanup Devil/Grenades.xml	
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AOC The Cleanup Devil</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="AOC_B2H" or
-						defName="AOC_Trash_Grenade"
-						] </xpath>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<stackLimit>25</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[
-						defName="AOC_B2H" or
-						defName="AOC_Trash_Grenade"
-						] </xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AOC_B2H"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AOC_B2H"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AOC_Trash_Grenade"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AOC_Trash_Grenade"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Proj_GrenadeDevEraser" or
-						defName="Proj_AOC_Trash_Bag"
-						]/thingClass </xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Proj_GrenadeDevEraser"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Proj_GrenadeDevEraser"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Proj_AOC_Trash_Bag"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Proj_AOC_Trash_Bag"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<!-- ========== B2H ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AOC_B2H</defName>
-					<statBases>
-						<Mass>1</Mass>
-						<Bulk>1</Bulk>
-						<MarketValue>10.95</MarketValue>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<label>throw EMP grenade</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<range>12.0</range>
-						<minRange>2</minRange>
-						<warmupTime>0.8</warmupTime>
-						<noiseRadius>4</noiseRadius>
-						<soundCast>ThrowGrenade</soundCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<defaultProjectile>Proj_GrenadeDevEraser</defaultProjectile>
-						<onlyManualCast>true</onlyManualCast>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Proj_GrenadeDevEraser"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>3.55</explosionRadius>
-							<damageDef>DevModeEraser</damageDef>
-							<explosionDelay>100</explosionDelay>
-							<speed>14</speed>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
-						</projectile>
-					</value>
-				</li>
-
-				<!-- ========== Trash Grenade ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AOC_Trash_Grenade</defName>
-					<statBases>
-						<Mass>1</Mass>
-						<Bulk>4</Bulk>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<label>throw trash bag</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<range>10.0</range>
-						<minRange>2</minRange>
-						<warmupTime>0.8</warmupTime>
-						<noiseRadius>4</noiseRadius>
-						<soundCast>ThrowGrenade</soundCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<defaultProjectile>Proj_AOC_Trash_Bag</defaultProjectile>
-						<onlyManualCast>true</onlyManualCast>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Proj_AOC_Trash_Bag"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>3.5</explosionRadius>
-							<damageAmountBase>5</damageAmountBase>
-							<soundExplode>MortarBomb_Explode</soundExplode>
-							<damageDef>AOC_Trash_Boom</damageDef>
-							<preExplosionSpawnThingDef>Filth_DDong</preExplosionSpawnThingDef>
-							<speed>12</speed>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
-						</projectile>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/AOC The Cleanup Devil/MeleeWeapons.xml b/Patches/AOC The Cleanup Devil/MeleeWeapons.xml
deleted file mode 100644
index 9972b760ee..0000000000
--- a/Patches/AOC The Cleanup Devil/MeleeWeapons.xml	
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AOC The Cleanup Devil</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Fire Axe -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_F4T"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.3</cooldownTime>
-								<armorPenetrationBlunt>3.263</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Demolish</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>2.43</cooldownTime>
-								<armorPenetrationBlunt>10.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>41</power>
-								<cooldownTime>2.41</cooldownTime>
-								<armorPenetrationBlunt>13.05</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.16</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_F4T"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.28</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_F4T"]/statBases/Mass</xpath>
-					<value>
-						<Mass>2.9</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_F4T"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.11</MeleeCritChance>
-							<MeleeParryChance>0.28</MeleeParryChance>
-							<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Niddle -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_ND"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.35</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.78</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.19</cooldownTime>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.25</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_ND"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_ND"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.17</MeleeCritChance>
-							<MeleeParryChance>1.45</MeleeParryChance>
-							<MeleeDodgeChance>0.9</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Monospear -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_MonoSpear"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.15</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.48</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.09</cooldownTime>
-								<armorPenetrationBlunt>5.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>18.5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_MonoSpear"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>8</Bulk>
-							<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_MonoSpear"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.23</MeleeCritChance>
-							<MeleeParryChance>1.5</MeleeParryChance>
-							<MeleeDodgeChance>0.92</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Long Monospear -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_LongMonoSpear"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.45</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.68</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>1.39</cooldownTime>
-								<armorPenetrationBlunt>5.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>22.5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_LongMonoSpear"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>8</Bulk>
-							<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_LongMonoSpear"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.23</MeleeCritChance>
-							<MeleeParryChance>1.5</MeleeParryChance>
-							<MeleeDodgeChance>0.92</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/AOC The Cleanup Devil/PawnKinds_AOC.xml b/Patches/AOC The Cleanup Devil/PawnKinds_AOC.xml
deleted file mode 100644
index d4a37fa5be..0000000000
--- a/Patches/AOC The Cleanup Devil/PawnKinds_AOC.xml	
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AOC The Cleanup Devil</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Give ammo to pawns ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="AOC_Freeter" or
-						defName="AOC_Audit_Team_Leader" or
-						defName="AOC_Hunter" or
-						defName="AOC_Trash_Girl"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="AOC_Hammer" or
-						defName="AOC_Firefighter" or
-						defName="AOC_Doom_Guard" or
-						defName="AOC_Audit_Team" or
-						defName="AOC_Commander" or
-						defName="AOC_Anvil" or
-						defName="AOC_assult"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>7</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="AOC_Doom_Punisher"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AOC The Cleanup Devil/RangedWeapons.xml b/Patches/AOC The Cleanup Devil/RangedWeapons.xml
deleted file mode 100644
index 953134f552..0000000000
--- a/Patches/AOC The Cleanup Devil/RangedWeapons.xml	
+++ /dev/null
@@ -1,548 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AOC The Cleanup Devil</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Monojavelin -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_Monojavelin"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.15</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.48</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.09</cooldownTime>
-								<armorPenetrationBlunt>5.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>18.5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_Monojavelin"]</xpath>
-					<value>
-						<thingCategories>
-							<li>WeaponsRanged</li>
-						</thingCategories>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AOC_Monojavelin"]</xpath>
-					<value>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_Monojavelin"]/statBases</xpath>
-					<value>
-						<statBases>
-							<SightsEfficiency>1.0</SightsEfficiency>
-							<ShotSpread>1.5</ShotSpread>
-							<SwayFactor>2.5</SwayFactor>
-							<Bulk>2.5</Bulk>
-							<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						</statBases>
-						<stackLimit>25</stackLimit>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_Monojavelin"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Monojavelin_Thrown</defaultProjectile>
-								<warmupTime>0.8</warmupTime>
-								<range>32</range>
-								<soundCast>Interact_BeatFire</soundCast>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingDef ParentName="BasePilumProjectile">
-							<defName>Monojavelin_Thrown</defName>
-							<label>Monojavelin (thrown)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>28</damageAmountBase>
-								<speed>52</speed>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<armorPenetrationSharp>22</armorPenetrationSharp>
-								<preExplosionSpawnChance>1</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>AOC_Monojavelin</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-				<!-- Melee Tools -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="QKB_18K" or
-						defName="TCB_26K"
-						]/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>
-				</li>
-
-				<!-- TCB 26K -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="TCB_26K_AP"]</xpath>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>TCB_26K</defName>
-					<statBases>
-						<Mass>3.50</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.26</SwayFactor>
-						<Bulk>6.2</Bulk>
-						<SightsEfficiency>1</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.54</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>19</range>
-						<soundCast>Shot_Shotgun_NoRack</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="QKB_18K"]/costList/Chemfuel</xpath>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>QKB_18K</defName>
-					<statBases>
-						<Mass>8</Mass>
-						<RangedWeapon_Cooldown>0.43</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.8</SwayFactor>
-						<Bulk>8</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_30x64mmFuel_Incendiary</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>40</range>
-						<burstShotCount>2</burstShotCount>
-						<soundCast>Shot_IncendiaryLauncher</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>5.5</reloadTime>
-						<ammoSet>AmmoSet_30x64mmFuel</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- SC SK -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AOC_SCP_SK</defName>
-					<statBases>
-						<Mass>3.50</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.26</SwayFactor>
-						<Bulk>6.2</Bulk>
-						<SightsEfficiency>1</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.54</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>19</range>
-						<soundCast>Shot_Shotgun_NoRack</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_SCP_SK" ]/tools
-					</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>pickaxe</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>grip</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>shovel</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.55</cooldownTime>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- A2E -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AOC_A2E</defName>
-					<statBases>
-						<Mass>5</Mass>
-						<RangedWeapon_Cooldown>2.53</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.35</ShotSpread>
-						<SwayFactor>1.02</SwayFactor>
-						<Bulk>4.00</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Proj_FilthEraser</defaultProjectile>
-						<warmupTime>4.5</warmupTime>
-						<range>14</range>
-						<ticksBetweenBurstShots>25</ticksBetweenBurstShots>
-						<burstShotCount>4</burstShotCount>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<ai_AvoidFriendlyFireRadius>2</ai_AvoidFriendlyFireRadius>
-						<minRange>2</minRange>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>4</magazineSize>
-						<reloadTime>8</reloadTime>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Proj_FilthEraser"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Proj_FilthEraser"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<speed>20</speed>
-							<explosionRadius>4.5</explosionRadius>
-							<damageDef>FilthEraser</damageDef>
-							<!-- Use default damage from explosion def -->
-							<explosionDelay>50</explosionDelay>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
-						</projectile>
-					</value>
-				</li>
-
-				<!--Killakill/Launcher-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AOC_KILLAKILL</defName>
-					<statBases>
-						<Mass>8</Mass>
-						<RangedWeapon_Cooldown>0.43</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.8</SwayFactor>
-						<Bulk>10</Bulk>
-						<WorkToMake>39500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>65</Steel>
-						<Plasteel>30</Plasteel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-						<Chemfuel>10</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>1.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_25x59mmGrenade_HE</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>40</range>
-						<burstShotCount>0</burstShotCount>
-						<soundCast>ThrowGrenade</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_25x59mmGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AOE</li>
-						<li>EliteGun</li>
-					</weaponTags>
-					<researchPrerequisite>AOC_Toy2_Access</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!--KJW-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AOC_KJW</defName>
-					<statBases>
-						<Mass>7.60</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>3.22</SwayFactor>
-						<Bulk>10</Bulk>
-						<WorkToMake>15000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>110</Steel>
-						<ComponentIndustrial>11</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>0.97</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>2.1</warmupTime>
-						<range>62</range>
-						<burstShotCount>50</burstShotCount>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>150</magazineSize>
-						<reloadTime>4.0</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>25</aimedBurstShotCount>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Suppressive</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_KJW"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrels</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2.44</cooldownTime>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrels</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="AOC_KJW"]/equippedStatOffsets</xpath>
-				</li>
-
-				<!--SuviSniper-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AOC_Suvi_Sniper</defName>
-					<statBases>
-						<SightsEfficiency>2.60</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.46</SwayFactor>
-						<Bulk>12.40</Bulk>
-						<Mass>5.20</Mass>
-						<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.06</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_SuviBusterProjectile</defaultProjectile>
-						<warmupTime>5</warmupTime>
-						<range>50</range>
-						<soundCast>ChargeLance_Fire</soundCast>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>2</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_AOCPowerCell</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AOC_Suvi_Sniper"]/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>Barrels</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/AOC The Cleanup Devil/Scenario - Biotech.xml b/Patches/AOC The Cleanup Devil/Scenario - Biotech.xml
deleted file mode 100644
index ed0265b9a3..0000000000
--- a/Patches/AOC The Cleanup Devil/Scenario - Biotech.xml	
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AOC The Cleanup Devil</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Biotech</li>
-			</mods>
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ScenarioDef[defName="AOC_Scenario_BioTech"]/scenario/parts</xpath>
-						<value>
-							<li Class="ScenPart_StartingThing_Defined">
-								<def>StartingThing_Defined</def>
-								<thingDef>Ammo_303British_FMJ</thingDef>
-								<count>100</count>
-							</li>
-							<li Class="ScenPart_StartingThing_Defined">
-								<def>StartingThing_Defined</def>
-								<thingDef>Ammo_44Magnum_FMJ</thingDef>
-								<count>60</count>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ScenarioDef[defName="AOC_Scenario_BioTech"]/scenario/parts/li[thingDef="Apparel_FlakVest"]</xpath>
-						<value>
-							<li Class="ScenPart_StartingThing_Defined">
-								<def>StartingThing_Defined</def>
-								<thingDef>Apparel_FlakVest</thingDef>
-								<stuff>Steel</stuff>
-								<count>1</count>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/AOC The Cleanup Devil/Scenario.xml b/Patches/AOC The Cleanup Devil/Scenario.xml
deleted file mode 100644
index 3b6eb3cc45..0000000000
--- a/Patches/AOC The Cleanup Devil/Scenario.xml	
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AOC The Cleanup Devil</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="AOC_Scenario"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_303British_FMJ</thingDef>
-							<count>100</count>
-						</li>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_44Magnum_FMJ</thingDef>
-							<count>60</count>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ScenarioDef[defName="AOC_Scenario"]/scenario/parts/li[thingDef="Apparel_FlakVest"]</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Apparel_FlakVest</thingDef>
-							<stuff>Steel</stuff>
-							<count>1</count>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AOC The Cleanup Devil/Traders_AOC.xml b/Patches/AOC The Cleanup Devil/Traders_AOC.xml
deleted file mode 100644
index 7923726361..0000000000
--- a/Patches/AOC The Cleanup Devil/Traders_AOC.xml	
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AOC The Cleanup Devil</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Traders ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="Base_Neolithic_Standard_AOC"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>FSX</thingDef>
-							<countRange>
-								<min>15</min>
-								<max>50</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>Prometheum</thingDef>
-							<countRange>
-								<min>15</min>
-								<max>50</max>
-							</countRange>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="AOC_Trash_Trader"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>FSX</thingDef>
-							<countRange>
-								<min>0</min>
-								<max>25</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>Prometheum</thingDef>
-							<countRange>
-								<min>0</min>
-								<max>25</max>
-							</countRange>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="Orbital_AOC"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Ammo</tradeTag>
-							<countRange>
-								<min>400</min>
-								<max>1000</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>2</min>
-								<max>4</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_MediumAmmo</tradeTag>
-							<countRange>
-								<min>60</min>
-								<max>120</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>4</min>
-								<max>7</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_HeavyAmmo</tradeTag>
-							<countRange>
-								<min>15</min>
-								<max>50</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>2</min>
-								<max>4</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>FSX</thingDef>
-							<countRange>
-								<min>50</min>
-								<max>100</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>Prometheum</thingDef>
-							<countRange>
-								<min>50</min>
-								<max>100</max>
-							</countRange>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Advanced Mechanoid Warfare/Patches/Patch_Ammo.xml b/Patches/Advanced Mechanoid Warfare/Patches/Patch_Ammo.xml
deleted file mode 100644
index 5086c5e30b..0000000000
--- a/Patches/Advanced Mechanoid Warfare/Patches/Patch_Ammo.xml	
+++ /dev/null
@@ -1,281 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RWY]Advanced Mechanoid Warfare</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Bullet_NomadShot"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Bullet_StalkersShot"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Bullet_UWMChargeShot"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Bullet_UWMFireShot"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Bullet_UWMEmpShot"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Bullet_IonLenseShot"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Bullet_VaporizerShot"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Bullet_EBlade"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Bullet_HeadhunterShot"]</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmChargedBullet">
-							<defName>Bullet_UWMChargeShot</defName>
-							<label>Unstable bullet</label>
-							<graphicData>
-								<texPath>Things/Equipment/WeaponRanged/Projectiles/NomadShot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>6</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>14</armorPenetrationSharp>
-								<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
-								<speed>120</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmChargedBullet">
-							<defName>Bullet_UWMFireShot</defName>
-							<label>Unstable bullet</label>
-							<graphicData>
-								<texPath>Things/Equipment/WeaponRanged/Projectiles/FireBlob</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>7</damageAmountBase>
-								<armorPenetrationSharp>14</armorPenetrationSharp>
-								<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
-								<damageDef>Flame</damageDef>
-								<speed>65</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmChargedBullet">
-							<defName>Bullet_UWMEmpShot</defName>
-							<label>Unstable bullet</label>
-							<graphicData>
-								<texPath>Things/Equipment/WeaponRanged/Projectiles/UnstableEmp</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>7</damageAmountBase>
-								<armorPenetrationSharp>14</armorPenetrationSharp>
-								<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
-								<damageDef>EMP</damageDef>
-								<speed>65</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmChargedBullet">
-							<defName>Bullet_NomadShot</defName>
-							<label>Unstable bullet</label>
-							<graphicData>
-								<texPath>Things/Equipment/WeaponRanged/Projectiles/NomadShot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>7</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>10</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>22</armorPenetrationSharp>
-								<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
-								<damageDef>Bullet</damageDef>
-								<speed>120</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmChargedBullet">
-							<defName>Bullet_StalkersShot</defName>
-							<label>Unstable bullet</label>
-							<graphicData>
-								<texPath>Things/Equipment/WeaponRanged/Projectiles/StalkersShot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>7</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>10</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>26</armorPenetrationSharp>
-								<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
-								<damageDef>Bullet</damageDef>
-								<speed>150</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmChargedBullet">
-							<defName>Bullet_IonLenseShot</defName>
-							<label>Unstable bullet</label>
-							<graphicData>
-								<texPath>Things/Equipment/WeaponRanged/Projectiles/IonLenseShot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>9</damageAmountBase>
-								<armorPenetrationSharp>26</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<damageDef>Bullet</damageDef>
-								<speed>150</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmChargedBullet">
-							<defName>Bullet_VaporizerShot</defName>
-							<label>Unstable bullet</label>
-							<graphicData>
-								<texPath>Things/Equipment/WeaponRanged/Projectiles/VaporizerShot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>3.1</drawSize>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>27</damageAmountBase>
-								<armorPenetrationSharp>14</armorPenetrationSharp>
-								<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
-								<damageDef>Bullet</damageDef>
-								<speed>85</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmChargedBullet">
-							<defName>Bullet_HeadhunterShot</defName>
-							<label>Unstable bullet</label>
-							<graphicData>
-								<texPath>Things/Equipment/WeaponRanged/Projectiles/HeadhunterShot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>3.1</drawSize>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>31</damageAmountBase>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
-								<damageDef>Bullet</damageDef>
-								<speed>120</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmChargedBullet">
-							<defName>Bullet_EBlade</defName>
-							<label>Unstable bullet</label>
-							<graphicData>
-								<texPath>Things/Equipment/WeaponRanged/Projectiles/EBlade</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>1.2</drawSize>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>24</damageAmountBase>
-								<armorPenetrationSharp>14</armorPenetrationSharp>
-								<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
-								<damageDef>Bullet</damageDef>
-								<speed>85</speed>
-							</projectile>
-						</ThingDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_UMW</defName>
-							<label>Universal Weapon Module</label>
-							<ammoTypes>
-								<Ammo_8x35mmCharged>Bullet_UWMChargeShot</Ammo_8x35mmCharged>
-								<Ammo_PlasmaCellRifle>Bullet_UWMFireShot</Ammo_PlasmaCellRifle>
-								<Ammo_8x35mmCharged_Ion>Bullet_UWMEmpShot</Ammo_8x35mmCharged_Ion>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Nomad</defName>
-							<label>Unstable Shot</label>
-							<ammoTypes>
-								<Ammo_5x35mmCharged>Bullet_NomadShot</Ammo_5x35mmCharged>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Stalker</defName>
-							<label>Unstable Shot</label>
-							<ammoTypes>
-								<Ammo_5x35mmCharged>Bullet_StalkersShot</Ammo_5x35mmCharged>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Lens</defName>
-							<label>Unstable Shot</label>
-							<ammoTypes>
-								<Ammo_5x35mmCharged>Bullet_IonLenseShot</Ammo_5x35mmCharged>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Vapor</defName>
-							<label>Unstable Shot</label>
-							<ammoTypes>
-								<Ammo_5x35mmCharged>Bullet_VaporizerShot</Ammo_5x35mmCharged>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Headhunter</defName>
-							<label>Unstable Shot</label>
-							<ammoTypes>
-								<Ammo_5x35mmCharged>Bullet_HeadhunterShot</Ammo_5x35mmCharged>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Advanced Mechanoid Warfare/Patches/Patch_Armor.xml b/Patches/Advanced Mechanoid Warfare/Patches/Patch_Armor.xml
deleted file mode 100644
index 38b42566bf..0000000000
--- a/Patches/Advanced Mechanoid Warfare/Patches/Patch_Armor.xml	
+++ /dev/null
@@ -1,303 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RWY]Advanced Mechanoid Warfare</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="NovaBlossomAMW"]//*[def="MechanicalLeg" or def="MechanicalHead"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="NovaBlossomAMW"]//*[def="MechanicalThorax"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MechaDergAMW"]//*[def="MechanicalLeg" or def="MechanicalTailAMW" or def="MechanicalClawsAMW" or def="MechanicalHead"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MechaDergAMW"]//*[def="MechanicalWingsAMW" or (def="MechanicalLeg" and not(groups)) or def="MechanicalThorax"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ChargerAMW"]//*[def="MechanicalThoraxAMW" or def="MechanicalHead" or def="MechanicalLegsAMW" or def="MechanicalJawAMW"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ChargerAMW"]//*[def="MechanicalWolfBodyAMW"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="AnarchistAMW"]//*[def="MechanicalThoraxAMW" or def="MechanicalHead" or def="MechanicalPincerAMW" or def="MechanicalTailAMW"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="AnarchistAMW"]//*[def="MechanicalInsectBodyAMW" or def="MechanicalLeg"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="HeadhunterAMW"]//*[def="MechanicalThoraxAMW" or def="MechanicalHead" or def="MechanicalPincerAMW"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="HeadhunterAMW"]//*[def="MechanicalInsectBodyAMW" or def="MechanicalLeg"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="PurgerAMW"]//*[def="MechanicalThoraxAMW" or def="MechanicalHead" or def="MechanicalLegsAMW"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="PurgerAMW"]//*[def="MechanicalInsectBodyAMW" or (def="MechanicalLegsAMW" and not(groups))]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ReaperAMW"]//*[def="MechanicalThoraxAMW" or def="MechanicalHead" or def="MechanicalLegsAMW"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ReaperAMW"]//*[def="MechanicalInsectBodyAMW" or (def="MechanicalLegsAMW" and not(groups))]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ImpulseAMW"]//*[def="MechanicalThoraxAMW" or def="MechanicalHead" or def="MechanicalLegsAMW" or def="MechanicalJawAMW"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ImpulseAMW"]//*[def="MechanicalWolfBodyAMW" or (def="MechanicalLegsAMW" and not(groups))]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ScourgeAMW"]//*[def="MechanicalThoraxAMW" or def="MechanicalHead" or def="MechanicalLegsAMW" or def="MechanicalJawAMW"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ScourgeAMW"]//*[def="MechanicalSmallBodyAMW" or (def="MechanicalLegsAMW" and not(groups))]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="SawbladeAMW"]//*[def="MechanicalThoraxAMW" or def="MechanicalHead" or def="MechanicalLegsAMW" or def="MechanicalJawAMW"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="SawbladeAMW"]//*[def="MechanicalWolfBodyAMW" or (def="MechanicalLegsAMW" and not(groups))]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MechSpikeAMW"]//*[def="MechanicalThoraxAMW" or def="MechanicalHead" or def="MechanicalLegsAMW" or def="MechanicalJawAMW"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MechSpikeAMW"]//*[def="MechanicalWolfBodyAMW" or (def="MechanicalLegsAMW" and not(groups))]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MechThrumboAMW"]//*[def="MechanicalThoraxAMW" or def="MechanicalHead" or def="MechanicalLegsAMW" or def="PlasmaHornAMW"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MechThrumboAMW"]//*[def="MechanicalWolfBodyAMW" or (def="MechanicalLegsAMW" and not(groups))]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RenegadeAMW"]//*[def="MechanicalThoraxAMW" or def="MechanicalHead" or def="MechanicalLegsAMW" or def="MechanicalJawAMW"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RenegadeAMW"]//*[def="MechanicalWolfBodyAMW" or (def="MechanicalLegsAMW" and not(groups))]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="SupressorAMW"]//*[def="MechanicalThoraxAMW" or def="MechanicalHead" or def="MechanicalTailAMW"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="SupressorAMW"]//*[def="MechanicalSmallBodyAMW" or def="MechanicalSegmentAMW"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="FlayerAMW"]//*[def="MechanicalThoraxAMW" or def="MechanicalHead" or def="MechanicalSmallScytheAMW" or def="MechanicalTailAMW"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="FlayerAMW"]//*[def="MechanicalSmallBodyAMW" or def="MechanicalLegsAMW"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="VortexAMW"]//*[def="MechanicalThoraxAMW" or def="MechanicalHead" or def="MechanicalTailAMW"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="VortexAMW"]//*[def="MechanicalSmallBodyAMW" or def="MechanicalLegsAMW"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="WraithAMW"]//*[def="MechanicalThoraxAMW" or def="MechanicalHead" or def="MechanicalLargeScytheAMW" or def="MechanicalTailAMW"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="WraithAMW"]//*[def="WraithBodyAMW"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="NomadAMW" or defName="SeekerAMW" or defName="SpectreAMW" or defName="StalkerAMW"]//*[def="MechanicalThoraxAMW" or def="MechanicalHead" or def="MechanicalFinger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="NomadAMW" or defName="SeekerAMW" or defName="SpectreAMW" or defName="StalkerAMW"]//*[def="HumanoidBodyAMW" or def="MechanicalShoulder" or def="MechanicalArm" or def="MechanicalLeg" or def="MechanicalFoot"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Advanced Mechanoid Warfare/Patches/Patch_DamageDef.xml b/Patches/Advanced Mechanoid Warfare/Patches/Patch_DamageDef.xml
deleted file mode 100644
index 945d15abe9..0000000000
--- a/Patches/Advanced Mechanoid Warfare/Patches/Patch_DamageDef.xml	
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RWY]Advanced Mechanoid Warfare</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[defName="NovaBomb"]/defaultDamage</xpath>
-					<value>
-						<defaultDamage>80</defaultDamage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[defName="NovaBomb"]/defaultArmorPenetration</xpath>
-					<value>
-						<defaultArmorPenetration>130</defaultArmorPenetration>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[defName="NovaBomb"]/armorCategory</xpath>
-					<value>
-						<armorCategory>Blunt</armorCategory>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Advanced Mechanoid Warfare/Patches/Patch_Loadouts.xml b/Patches/Advanced Mechanoid Warfare/Patches/Patch_Loadouts.xml
deleted file mode 100644
index fd1427cad1..0000000000
--- a/Patches/Advanced Mechanoid Warfare/Patches/Patch_Loadouts.xml	
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RWY]Advanced Mechanoid Warfare</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="Mech_NovaBlossom" or
-						defName="AMW_Mech_Blacklight" or
-						defName="AMW_Mech_Frosthound" or
-						defName="Mech_Charger" or
-						defName="Mech_Anarchist" or
-						defName="Mech_Headhunter" or
-						defName="Mech_Impulse" or
-						defName="Mech_Scourge" or
-						defName="Mech_Sawblade" or
-						defName="Mech_Spike" or
-						defName="Mech_Renegade" or
-						defName="Mech_Supressor" or
-						defName="Mech_Flayer" or
-						defName="Mech_Nomad" or
-						defName="Mech_AMWSeeker" or
-						defName="Mech_Spectre" or
-						defName="Mech_Stalker" or
-						defName="Mech_Vortex" or
-						defName="Mech_Derg" or
-						defName="AMW_Mech_Supernova" or
-						defName="Mech_Purger" or
-						defName="Mech_Reaper" or
-						defName="Mech_Thrumbo" or
-						defName="Mech_Wraith"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>10</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Advanced Mechanoid Warfare/Patches/Patch_Melee.xml b/Patches/Advanced Mechanoid Warfare/Patches/Patch_Melee.xml
deleted file mode 100644
index 55623a971e..0000000000
--- a/Patches/Advanced Mechanoid Warfare/Patches/Patch_Melee.xml	
+++ /dev/null
@@ -1,711 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RWY]Advanced Mechanoid Warfare</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mech_NovaBlossom"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>front legs</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.85</cooldownTime>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<armorPenetrationBlunt>18.4</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<linkedBodyPartsGroup>MechanicalLegsAMW</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="AMW_Mech_Frosthound" or
-						defName="AMW_Mech_Supernova"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>front legs</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>0.85</cooldownTime>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<armorPenetrationBlunt>24</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<linkedBodyPartsGroup>MechanicalLegsAMW</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AMW_Mech_Blacklight"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2.6</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.84</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mech_Derg"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>47</power>
-								<cooldownTime>2.15</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>33</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>derg claws</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>86</power>
-								<cooldownTime>2.8</cooldownTime>
-								<armorPenetrationBlunt>33.750</armorPenetrationBlunt>
-								<armorPenetrationSharp>67.5</armorPenetrationSharp>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<linkedBodyPartsGroup>DergClawsAMW</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>tail</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>56</power>
-								<cooldownTime>2.15</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<linkedBodyPartsGroup>MechanicalTailAMW</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mech_Thrumbo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>2.15</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>33</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>plasma horn</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>87</power>
-								<cooldownTime>1.79</cooldownTime>
-								<armorPenetrationBlunt>33.750</armorPenetrationBlunt>
-								<armorPenetrationSharp>45</armorPenetrationSharp>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<linkedBodyPartsGroup>PlasmaHornAMW</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mech_Supressor"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2.6</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.84</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>derg claws</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.79</cooldownTime>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<chanceFactor>0.8</chanceFactor>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<linkedBodyPartsGroup>MechanicalTailAMW</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Mech_Charger" or
-						defName="Mech_Sawblade" or
-						defName="Mech_Impulse"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mechanical paws</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.33</cooldownTime>
-								<armorPenetrationBlunt>23</armorPenetrationBlunt>
-								<armorPenetrationSharp>17</armorPenetrationSharp>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<linkedBodyPartsGroup>MechanicalPawsAMW</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>2.15</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.83</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>mechanical jaw</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>32</power>
-								<cooldownTime>1.3</cooldownTime>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-								<chanceFactor>0.8</chanceFactor>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<linkedBodyPartsGroup>MechanicalJawAMW</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Mech_Flayer"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.15</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.83</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>mechanical tail</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.19</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.83</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<linkedBodyPartsGroup>MechanicalTailAMW</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>scythe</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>0.55</cooldownTime>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<chanceFactor>0.8</chanceFactor>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<linkedBodyPartsGroup>MechanicalSmallScytheAMW</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Mech_Vortex"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.15</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.83</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>mechanical tail</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.19</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<chanceFactor>0.3</chanceFactor>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<linkedBodyPartsGroup>MechanicalTailAMW</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Mech_Spike" or
-						defName="Mech_Renegade"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mechanical paws</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>37</power>
-								<cooldownTime>.97</cooldownTime>
-								<armorPenetrationBlunt>23</armorPenetrationBlunt>
-								<armorPenetrationSharp>17</armorPenetrationSharp>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<linkedBodyPartsGroup>MechanicalPawsAMW</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>2.15</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>mechanical jaw</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>31</power>
-								<cooldownTime>1.79</cooldownTime>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-								<chanceFactor>0.8</chanceFactor>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<linkedBodyPartsGroup>MechanicalJawAMW</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Mech_Wraith"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>scythe</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>221</power>
-								<cooldownTime>2.85</cooldownTime>
-								<armorPenetrationBlunt>100</armorPenetrationBlunt>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<chanceFactor>0.8</chanceFactor>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<linkedBodyPartsGroup>MechanicalLargeScytheAMW</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>mechanical tail</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>77</power>
-								<cooldownTime>3.11</cooldownTime>
-								<armorPenetrationBlunt>50</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<chanceFactor>0.2</chanceFactor>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<linkedBodyPartsGroup>MechanicalTailAMW</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Mech_Scourge"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mechanical paws</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.33</cooldownTime>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<linkedBodyPartsGroup>MechanicalPawsAMW</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.15</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.83</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>mechanical jaw</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.3</cooldownTime>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<chanceFactor>0.8</chanceFactor>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<linkedBodyPartsGroup>MechanicalJawAMW</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mech_Anarchist"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mechanical pincer</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>1.03</cooldownTime>
-								<armorPenetrationBlunt>45</armorPenetrationBlunt>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<chanceFactor>0.63</chanceFactor>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<linkedBodyPartsGroup>MechanicalPincerAMW</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>2.15</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.83</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>mechanical tail</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>2.15</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-								<chanceFactor>0.33</chanceFactor>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<linkedBodyPartsGroup>MechanicalTailAMW</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mech_Headhunter"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mechanical pincer</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.03</cooldownTime>
-								<armorPenetrationBlunt>28</armorPenetrationBlunt>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<chanceFactor>0.63</chanceFactor>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<linkedBodyPartsGroup>MechanicalPincerAMW</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2.15</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.83</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Mech_Purger" or
-						defName="Mech_Reaper"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>front legs</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>0.85</cooldownTime>
-								<armorPenetrationSharp>7</armorPenetrationSharp>
-								<armorPenetrationBlunt>23</armorPenetrationBlunt>
-								<chanceFactor>0.63</chanceFactor>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<linkedBodyPartsGroup>MechanicalLegsAMW</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.15</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Mech_Nomad" or
-						defName="Mech_AMWSeeker" or
-						defName="Mech_Spectre" or
-						defName="Mech_Stalker"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.35</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.35</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="MechaWeapon_SeekerKatana"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>2.2</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>72</power>
-								<cooldownTime>1.35</cooldownTime>
-								<armorPenetrationSharp>23</armorPenetrationSharp>
-								<armorPenetrationBlunt>46</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>53</power>
-								<cooldownTime>1.73</cooldownTime>
-								<armorPenetrationSharp>35</armorPenetrationSharp>
-								<armorPenetrationBlunt>40</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="AMW_MechaWeapon_SSeekerKatana"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>2.2</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>53</power>
-								<cooldownTime>1.35</cooldownTime>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<armorPenetrationBlunt>35</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>37</power>
-								<cooldownTime>1.73</cooldownTime>
-								<armorPenetrationSharp>28</armorPenetrationSharp>
-								<armorPenetrationBlunt>35</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="AMW_MechaWeapon_PowerClaw"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>42</power>
-								<cooldownTime>0.7</cooldownTime>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Advanced Mechanoid Warfare/Patches/Patch_Races.xml b/Patches/Advanced Mechanoid Warfare/Patches/Patch_Races.xml
deleted file mode 100644
index d6cbe8c9be..0000000000
--- a/Patches/Advanced Mechanoid Warfare/Patches/Patch_Races.xml	
+++ /dev/null
@@ -1,367 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RWY]Advanced Mechanoid Warfare</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[
-						defName="Mech_NovaBlossom" or
-						defName="AMW_Mech_Blacklight" or
-						defName="AMW_Mech_Frosthound" or
-						defName="AMW_Mech_Supernova" or
-						defName="Mech_Charger" or
-						defName="Mech_Anarchist" or
-						defName="Mech_Headhunter" or
-						defName="Mech_Purger" or
-						defName="Mech_Reaper" or
-						defName="Mech_Impulse" or
-						defName="Mech_Scourge" or
-						defName="Mech_Sawblade" or
-						defName="Mech_Spike" or
-						defName="Mech_Renegade"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[
-						defName="Mech_Derg" or
-						defName="Mech_Flayer" or
-						defName="Mech_Vortex" or
-						defName="Mech_Thrumbo"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[
-						defName="Mech_Supressor" or
-						defName="Mech_Wraith"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Serpentine</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[
-						defName="Mech_Nomad" or
-						defName="Mech_Spectre" or
-						defName="Mech_Stalker" or
-						defName="Mech_AMWSeeker"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!--
-			<li Class="PatchOperationRemove">
-				<xpath>Defs/ThingDef[
-				defName="Mech_NovaBlossom" or
-				defName="AMW_Mech_Blacklight" or
-				defName="AMW_Mech_Frosthound" or
-				defName="Mech_Derg" or
-				defName="Mech_Charger" or
-				defName="Mech_Anarchist" or
-				defName="Mech_Headhunter" or
-				defName="Mech_Impulse" or
-				defName="Mech_Scourge" or
-				defName="Mech_Sawblade" or
-				defName="Mech_Spike" or
-				defName="Mech_Renegade" or
-				defName="Mech_Supressor" or
-				defName="Mech_Flayer" or
-				defName="Mech_Nomad" or
-				defName="Mech_AMWSeeker" or
-				defName="Mech_Spectre" or
-				defName="Mech_Stalker" or
-				defName="Mech_Vortex" or
-				defName="Mech_Derg" or
-				defName="AMW_Mech_Supernova" or
-				defName="Mech_Purger" or
-				defName="Mech_Reaper" or
-				defName="Mech_Thrumbo" or
-				defName="Mech_Wraith"
-				]/statBases</xpath>
-			</li>
-			-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="Mech_NovaBlossom" or
-						defName="AMW_Mech_Blacklight" or
-						defName="AMW_Mech_Frosthound" or
-						defName="Mech_Charger" or
-						defName="Mech_Anarchist" or
-						defName="Mech_Headhunter" or
-						defName="Mech_Impulse" or
-						defName="Mech_Scourge" or
-						defName="Mech_Sawblade" or
-						defName="Mech_Spike" or
-						defName="Mech_Renegade" or
-						defName="Mech_Supressor" or
-						defName="Mech_Flayer" or
-						defName="Mech_Nomad" or
-						defName="Mech_AMWSeeker" or
-						defName="Mech_Spectre" or
-						defName="Mech_Stalker" or
-						defName="Mech_Vortex"
-						]/statBases </xpath>
-					<value>
-						<CarryWeight>40</CarryWeight>
-						<CarryBulk>30</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1.8</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.09</MeleeDodgeChance>
-						<MeleeCritChance>0.22</MeleeCritChance>
-						<MeleeParryChance>0.19</MeleeParryChance>
-						<MaxHitPoints>200</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Mech_Spectre"
-						]/statBases/ShootingAccuracyPawn </xpath>
-					<value>
-						<ShootingAccuracyPawn>2.6</ShootingAccuracyPawn>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="Mech_Derg" or
-						defName="AMW_Mech_Supernova" or
-						defName="Mech_Purger" or
-						defName="Mech_Reaper" or
-						defName="Mech_Thrumbo" or
-						defName="Mech_Wraith"
-						]/statBases </xpath>
-					<value>
-						<CarryWeight>200</CarryWeight>
-						<CarryBulk>80</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.02</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.41</MeleeParryChance>
-						<AimingDelayFactor>1.25</AimingDelayFactor>
-						<MaxHitPoints>500</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="AMW_Mech_Blacklight"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="AMW_Mech_Blacklight"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Mech_NovaBlossom" or
-						defName="Mech_Headhunter" or
-						defName="Mech_Flayer"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Mech_NovaBlossom" or
-						defName="Mech_Headhunter" or
-						defName="Mech_Flayer"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>3</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="AMW_Mech_Frosthound"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="AMW_Mech_Frosthound"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Mech_Scourge" or
-						defName="Mech_Supressor"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>27</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Mech_Scourge" or
-						defName="Mech_Supressor"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>12</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Mech_Impulse" or
-						defName="Mech_Vortex"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>22.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Mech_Impulse" or
-						defName="Mech_Vortex"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="AMW_Mech_Supernova" or
-						defName="Mech_Sawblade" or
-						defName="Mech_Renegade" or
-						defName="Mech_Charger"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>54</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="AMW_Mech_Supernova" or
-						defName="Mech_Sawblade" or
-						defName="Mech_Renegade" or
-						defName="Mech_Charger"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>22</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Mech_Anarchist" or
-						defName="Mech_Purger" or
-						defName="Mech_Reaper" or
-						defName="Mech_Spike" or
-						defName="Mech_Nomad" or
-						defName="Mech_Spectre"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>58</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Mech_Anarchist" or
-						defName="Mech_Purger" or
-						defName="Mech_Reaper" or
-						defName="Mech_Spike" or
-						defName="Mech_Nomad" or
-						defName="Mech_Spectre"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>24</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Mech_Derg" or
-						defName="Mech_Thrumbo" or
-						defName="Mech_AMWSeeker" or
-						defName="Mech_Stalker"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>67.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Mech_Derg" or
-						defName="Mech_Thrumbo" or
-						defName="Mech_AMWSeeker" or
-						defName="Mech_Stalker"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>30</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Mech_Wraith"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>33</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Mech_Wraith"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>74</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Advanced Mechanoid Warfare/Patches/Patch_Ranged.xml b/Patches/Advanced Mechanoid Warfare/Patches/Patch_Ranged.xml
deleted file mode 100644
index cdae16d58f..0000000000
--- a/Patches/Advanced Mechanoid Warfare/Patches/Patch_Ranged.xml	
+++ /dev/null
@@ -1,1126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RWY]Advanced Mechanoid Warfare</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BreacherGrenade"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BreacherGrenade"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>2.5</explosionRadius>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<damageDef>Bomb</damageDef>
-							<damageAmountBase>33</damageAmountBase><!-- 70mm Mech Grenade damage / 4 -->
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							<speed>20</speed>
-							<dropsCasings>false</dropsCasings>
-						</projectile>
-						<comps>
-							<li Class="CombatExtended.CompProperties_Fragments">
-								<fragments>
-									<Fragment_Small>10</Fragment_Small>
-								</fragments>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Weapon_BreacherAMW</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.01</SwayFactor>
-						<Bulk>3.5</Bulk>
-						<Mass>6</Mass>
-						<RangedWeapon_Cooldown>3.55</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<range>32</range>
-						<burstShotCount>4</burstShotCount>
-						<warmupTime>2.3</warmupTime>
-						<noiseRadius>7</noiseRadius>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<soundCast>DiskLaunch</soundCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<defaultProjectile>BreacherGrenade</defaultProjectile>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Launcher</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_PlasmaSpit"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_PlasmaSpit"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<damageDef>Bomb</damageDef>
-							<damageAmountBase>309</damageAmountBase>
-							<explosionRadius>3.2</explosionRadius>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<speed>75</speed>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							<dropsCasings>false</dropsCasings>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PlasmaSpitInternal</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.01</SwayFactor>
-						<Bulk>3.5</Bulk>
-						<Mass>6</Mass>
-						<RangedWeapon_Cooldown>4</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_PlasmaSpit</defaultProjectile>
-						<warmupTime>4.3</warmupTime>
-						<range>54</range>
-						<!--<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>-->
-						<soundCast>HeavyLaunch</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Launcher</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_KineticWing"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_KineticWing"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<damageDef>Bullet</damageDef>
-							<damageAmountBase>50</damageAmountBase>
-							<!--<soundExplode>MortarBomb_Explode</soundExplode>-->
-							<armorPenetrationSharp>30</armorPenetrationSharp>
-							<armorPenetrationBlunt>38.005</armorPenetrationBlunt>
-							<flyOverhead>true</flyOverhead>
-							<gravityFactor>20</gravityFactor>
-							<speed>105</speed>
-							<dropsCasings>false</dropsCasings>
-						</projectile>
-						<comps>
-							<li Class="CombatExtended.CompProperties_ExplosiveCE">
-								<damageAmountBase>64</damageAmountBase>
-								<explosiveDamageType>Bomb</explosiveDamageType>
-								<explosiveRadius>1.5</explosiveRadius>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							</li>
-							<li Class="CombatExtended.CompProperties_Fragments">
-								<fragments>
-									<Fragment_Small>10</Fragment_Small>
-								</fragments>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_KineticWingInternal</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.01</SwayFactor>
-						<Bulk>3.5</Bulk>
-						<Mass>6</Mass>
-						<RangedWeapon_Cooldown>4</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_KineticWing</defaultProjectile>
-						<warmupTime>5.3</warmupTime>
-						<range>66</range>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<burstShotCount>5</burstShotCount>
-						<!--<ai_AvoidFriendlyFireRadius>4</ai_AvoidFriendlyFireRadius>-->
-						<soundCast>Mortar_LaunchA</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Launcher</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_PlasmaRocket"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_PlasmaRocket"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<damageDef>NovaBomb</damageDef>
-							<damageAmountBase>45</damageAmountBase>
-							<armorPenetrationSharp>0</armorPenetrationSharp>
-							<armorPenetrationBlunt>30</armorPenetrationBlunt>
-							<explosionRadius>1.5</explosionRadius>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							<flyOverhead>false</flyOverhead>
-							<speed>50</speed>
-						</projectile>
-						<comps>
-							<li Class="CombatExtended.CompProperties_Fragments">
-								<fragments>
-									<Fragment_Small>10</Fragment_Small>
-								</fragments>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PRInternal</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.01</SwayFactor>
-						<Bulk>5</Bulk>
-						<Mass>10</Mass>
-						<RangedWeapon_Cooldown>5.6</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_PlasmaRocket</defaultProjectile>
-						<warmupTime>3.13</warmupTime>
-						<range>38</range>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<burstShotCount>4</burstShotCount>
-						<soundCast>HeavyLaunch</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Launcher</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_NomadRifle</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.45</SwayFactor>
-						<Bulk>7.5</Bulk>
-						<Mass>8</Mass>
-						<RangedWeapon_Cooldown>1.6</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_NomadShot</defaultProjectile>
-						<warmupTime>1.11</warmupTime>
-						<range>45</range>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>5</burstShotCount>
-						<soundCast>NomadRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>8</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>24</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_Nomad</ammoSet>
-					</AmmoUser>
-					<weaponTags>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_CryoLiquid"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_CryoLiquid"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<damageDef>CryoFlame</damageDef>
-							<damageAmountBase>4</damageAmountBase>
-							<armorPenetrationSharp>0</armorPenetrationSharp>
-							<armorPenetrationBlunt>20</armorPenetrationBlunt>
-							<explosionRadius>1.2</explosionRadius>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<speed>40</speed>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_CryoInternal</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.01</SwayFactor>
-						<Bulk>5</Bulk>
-						<Mass>10</Mass>
-						<RangedWeapon_Cooldown>5.6</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_CryoLiquid</defaultProjectile>
-						<warmupTime>1.83</warmupTime>
-						<range>22</range>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<burstShotCount>14</burstShotCount>
-						<soundCast>Shot_ChargeBlaster</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>3</muzzleFlashScale>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Launcher</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Shreder</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.53</SwayFactor>
-						<Bulk>5</Bulk>
-						<Mass>10</Mass>
-						<RangedWeapon_Cooldown>2.9</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_NomadShot</defaultProjectile>
-						<warmupTime>2.01</warmupTime>
-						<range>58</range>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>55</burstShotCount>
-						<soundCast>Shreder</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>8</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>220</magazineSize>
-						<reloadTime>7</reloadTime>
-						<ammoSet>AmmoSet_Nomad</ammoSet>
-					</AmmoUser>
-					<weaponTags>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_StalkerRifle</defName>
-					<statBases>
-						<SightsEfficiency>2.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.53</SwayFactor>
-						<Bulk>5</Bulk>
-						<Mass>10</Mass>
-						<RangedWeapon_Cooldown>2.9</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_StalkersShot</defaultProjectile>
-						<warmupTime>1.01</warmupTime>
-						<range>64</range>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>1</burstShotCount>
-						<soundCast>StalkerRail</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>15</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_Stalker</ammoSet>
-					</AmmoUser>
-					<weaponTags>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Gun_UWMEmp"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Gun_UWMFire"]</xpath>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_UWMCharge</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.53</SwayFactor>
-						<Bulk>5</Bulk>
-						<Mass>10</Mass>
-						<RangedWeapon_Cooldown>2.9</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_UWMChargeShot</defaultProjectile>
-						<warmupTime>1.31</warmupTime>
-						<range>22</range>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<burstShotCount>7</burstShotCount>
-						<soundCast>SmallLaser</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>2</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>42</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_UMW</ammoSet>
-					</AmmoUser>
-					<weaponTags>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_ChargeCannon"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_ChargeCannon"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>3.4</explosionRadius>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<damageDef>Bomb</damageDef>
-							<damageAmountBase>60</damageAmountBase>
-							<armorPenetrationBlunt>48</armorPenetrationBlunt>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							<speed>75</speed>
-						</projectile>
-						<comps>
-							<li Class="CombatExtended.CompProperties_Fragments">
-								<fragments>
-									<Fragment_Small>26</Fragment_Small>
-								</fragments>
-							</li>
-						</comps>
-
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_ChargeCannonAWM</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.01</SwayFactor>
-						<Bulk>40</Bulk>
-						<Mass>25</Mass>
-						<RangedWeapon_Cooldown>7</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_ChargeCannon</defaultProjectile>
-						<warmupTime>3.5</warmupTime>
-						<range>57</range>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<burstShotCount>1</burstShotCount>
-						<soundCast>HeavyLaunch</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>27</muzzleFlashScale>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Launcher</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_IonLense</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.53</SwayFactor>
-						<Bulk>5</Bulk>
-						<Mass>10</Mass>
-						<RangedWeapon_Cooldown>7</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_IonLenseShot</defaultProjectile>
-						<warmupTime>2.7</warmupTime>
-						<range>40</range>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<burstShotCount>15</burstShotCount>
-						<soundCast>SmallLaser</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>6</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>60</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_Lens</ammoSet>
-					</AmmoUser>
-					<weaponTags>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Vaporizer</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.53</SwayFactor>
-						<Bulk>5</Bulk>
-						<Mass>10</Mass>
-						<RangedWeapon_Cooldown>3.3</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_VaporizerShot</defaultProjectile>
-						<warmupTime>2.33</warmupTime>
-						<range>36</range>
-						<soundCast>HeavyLaunch</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_Vapor</ammoSet>
-					</AmmoUser>
-					<weaponTags>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_BladeCannon</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.53</SwayFactor>
-						<Bulk>5</Bulk>
-						<Mass>10</Mass>
-						<RangedWeapon_Cooldown>3.3</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_EBlade</defaultProjectile>
-						<warmupTime>2.63</warmupTime>
-						<range>38</range>
-						<soundCast>DiskLaunch</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>22</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_SupShard"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<damageDef>Bullet</damageDef>
-							<damageAmountBase>5</damageAmountBase>
-							<armorPenetrationSharp>12</armorPenetrationSharp>
-							<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							<speed>40</speed>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_VortexLaser</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.53</SwayFactor>
-						<Bulk>5</Bulk>
-						<Mass>10</Mass>
-						<RangedWeapon_Cooldown>2.93</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_IonLenseShot</defaultProjectile>
-						<warmupTime>3.31</warmupTime>
-						<range>64</range>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<burstShotCount>15</burstShotCount>
-						<soundCast>MediumLaser</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>5</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>60</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_Lens</ammoSet>
-					</AmmoUser>
-					<weaponTags>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AnarGattling</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.53</SwayFactor>
-						<Bulk>5</Bulk>
-						<Mass>10</Mass>
-						<RangedWeapon_Cooldown>4.93</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_NomadShot</defaultProjectile>
-						<warmupTime>3.11</warmupTime>
-						<range>41</range>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<burstShotCount>23</burstShotCount>
-						<soundCast>MediumLaser</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>5</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>92</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_Nomad</ammoSet>
-					</AmmoUser>
-					<weaponTags>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Headhunter</defName>
-					<statBases>
-						<SightsEfficiency>2.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.53</SwayFactor>
-						<Bulk>5</Bulk>
-						<Mass>10</Mass>
-						<RangedWeapon_Cooldown>2.9</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_HeadhunterShot</defaultProjectile>
-						<warmupTime>2.41</warmupTime>
-						<range>61</range>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<burstShotCount>1</burstShotCount>
-						<soundCast>StalkerRail</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>18</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>3</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_Headhunter</ammoSet>
-					</AmmoUser>
-					<weaponTags>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AMW_Gun_SNomadRifle</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.56</SwayFactor>
-						<Bulk>7.5</Bulk>
-						<Mass>8</Mass>
-						<RangedWeapon_Cooldown>1.97</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_NomadShot</defaultProjectile>
-						<warmupTime>1.61</warmupTime>
-						<range>42</range>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>5</burstShotCount>
-						<soundCast>NomadRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>8</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>24</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_Nomad</ammoSet>
-					</AmmoUser>
-					<weaponTags>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AMW_Gun_IonPistol</defName>
-					<statBases>
-						<SightsEfficiency>0.9</SightsEfficiency>
-						<ShotSpread>0.21</ShotSpread>
-						<SwayFactor>0.9</SwayFactor>
-						<Bulk>2.5</Bulk>
-						<Mass>1</Mass>
-						<RangedWeapon_Cooldown>1.97</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.21</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_NomadShot</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<burstShotCount>2</burstShotCount>
-						<soundCast>NomadRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>8</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_Nomad</ammoSet>
-					</AmmoUser>
-					<weaponTags>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AMW_Gun_SShreder</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.53</SwayFactor>
-						<Bulk>5</Bulk>
-						<Mass>10</Mass>
-						<RangedWeapon_Cooldown>2.9</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.63</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_ShrederShot</defaultProjectile>
-						<warmupTime>2.37</warmupTime>
-						<range>43</range>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>55</burstShotCount>
-						<soundCast>Shreder</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>8</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>220</magazineSize>
-						<reloadTime>7</reloadTime>
-						<ammoSet>AmmoSet_Nomad</ammoSet>
-					</AmmoUser>
-					<weaponTags>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AMW_Gun_SMG</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>0.76</SwayFactor>
-						<Bulk>5</Bulk>
-						<Mass>3</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.03</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_ShrederShot</defaultProjectile>
-						<warmupTime>0.77</warmupTime>
-						<range>31</range>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>8</burstShotCount>
-						<soundCast>Shreder</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>8</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>40</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_Nomad</ammoSet>
-					</AmmoUser>
-					<weaponTags>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AMW_Gun_SlugRifle</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.34</SwayFactor>
-						<Bulk>8</Bulk>
-						<Mass>6</Mass>
-						<RangedWeapon_Cooldown>0.58</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.67</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_ShrederShot</defaultProjectile>
-						<warmupTime>1.57</warmupTime>
-						<range>45</range>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<burstShotCount>5</burstShotCount>
-						<soundCast>Shreder</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>8</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>40</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_Nomad</ammoSet>
-					</AmmoUser>
-					<weaponTags>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AMW_Gun_SStalkerRifle</defName>
-					<statBases>
-						<SightsEfficiency>1.5</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.53</SwayFactor>
-						<Bulk>5</Bulk>
-						<Mass>10</Mass>
-						<RangedWeapon_Cooldown>2.9</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_StalkersShot</defaultProjectile>
-						<warmupTime>2.17</warmupTime>
-						<range>72</range>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>1</burstShotCount>
-						<soundCast>StalkerRail</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>15</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_Stalker</ammoSet>
-					</AmmoUser>
-					<weaponTags>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AMW_Gun_SChargeCannonAWM</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.01</SwayFactor>
-						<Bulk>40</Bulk>
-						<Mass>25</Mass>
-						<RangedWeapon_Cooldown>7</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_ChargeCannon</defaultProjectile>
-						<warmupTime>4.5</warmupTime>
-						<range>64</range>
-						<soundCast>HeavyLaunch</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>27</muzzleFlashScale>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Launcher</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AMW_Gun_GaussCannon</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.75</SwayFactor>
-						<Bulk>15</Bulk>
-						<Mass>5.5</Mass>
-						<RangedWeapon_Cooldown>3</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_StalkersShot</defaultProjectile>
-						<warmupTime>3.0</warmupTime>
-						<range>75</range>
-						<soundCast>StalkerRail</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_Stalker</ammoSet>
-					</AmmoUser>
-					<weaponTags>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AMW_Gun_HeavyRifle</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.45</SwayFactor>
-						<Bulk>12</Bulk>
-						<Mass>5.0</Mass>
-						<RangedWeapon_Cooldown>2.1</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_StalkersShot</defaultProjectile>
-						<warmupTime>1.67</warmupTime>
-						<range>62</range>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<burstShotCount>3</burstShotCount>
-						<soundCast>StalkerRail</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_Stalker</ammoSet>
-					</AmmoUser>
-					<weaponTags>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AMW_Gun_GrenadeShotgun</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.17</SwayFactor>
-						<Bulk>8</Bulk>
-						<Mass>10</Mass>
-						<RangedWeapon_Cooldown>6</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>BreacherGrenade</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>18</range>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<burstShotCount>3</burstShotCount>
-						<soundCast>HeavyLaunch</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Launcher</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Advanced Mechanoid Warfare/Patches/Patch_Turret.xml b/Patches/Advanced Mechanoid Warfare/Patches/Patch_Turret.xml
deleted file mode 100644
index 7ec2903d86..0000000000
--- a/Patches/Advanced Mechanoid Warfare/Patches/Patch_Turret.xml	
+++ /dev/null
@@ -1,361 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RWY]Advanced Mechanoid Warfare</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[@Name="AAMW_Turret_AutoMortarBase"]/thingClass</xpath>
-				<value>
-					<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-				</value>
-			</li>
-			
-			
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[@Name="AAMW_Turret_AutoMortarBase"]/building/turretBurstCooldownTime</xpath>
-				<value>
-					<turretBurstCooldownTime>10</turretBurstCooldownTime>
-				</value>
-			</li>
-			-->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="AMW_Turret_AutoMortar"]</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingDef ParentName="AMW_Turret_AutoMortarBase">
-							<defName>AMW_Turret_AutoMortar</defName>
-							<label>automated mortar complex</label>
-							<description>A fully automated mortar complex. Fires a volley of 3 explosive shells and does not require to be reloaded or manned in order to operate. However it requires a lot of power to manufacture shells quickly and it can only fire explosive shells.</description>
-							<terrainAffordanceNeeded>Heavy</terrainAffordanceNeeded>
-							<building>
-								<turretGunDef>AMW_Gun_AAComplex</turretGunDef>
-							</building>
-							<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-							<uiIconPath>Things/Buildings/Turrets/AMW_AutoArtillery</uiIconPath>
-							<uiIconScale>0.9</uiIconScale>
-						</ThingDef>
-
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AMW_Gun_AAComplex</defName>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-						<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_81mmMortarShell_HE</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<minRange>20</minRange>
-						<range>500</range>
-						<burstShotCount>3</burstShotCount>
-						<soundCast>Mortar_LaunchA</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>55</muzzleFlashScale>
-						<circularError>1.2</circularError>
-						<requireLineOfSight>false</requireLineOfSight>
-						<indirectFirePenalty>0.3</indirectFirePenalty>
-						<targetParams>
-							<canTargetLocations>false</canTargetLocations>
-						</targetParams>
-					</Properties>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "AMW_Gun_AAComplex"]</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_Charges">
-								<chargeSpeeds>
-									<li>30</li>
-									<li>50</li>
-									<li>70</li>
-									<li>90</li>
-								</chargeSpeeds>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="AMW_Turret_AutoCannon" or
-						defName="AMW_Turret_HeavyTurret" or
-						defName="AMW_Turret_CryoTurret" or
-						defName="AMW_Turret_RocketTurret" or
-						defName="AMW_Turret_LotusTurret"
-						]/fillPercent </xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<!-- ========== cannon turret ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "AMW_Turret_AutoCannon"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "AMW_Turret_AutoCannon"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.25</AimingAccuracy>
-						<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AMW_Gun_AutoCannon</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.62</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.43</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12x72mmCharged</defaultProjectile>
-						<warmupTime>3.3</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<burstShotCount>5</burstShotCount>
-						<soundCast>MediumLaser</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_12x72mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!-- ========== heavy turret ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "AMW_Turret_HeavyTurret"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "AMW_Turret_HeavyTurret"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.25</AimingAccuracy>
-						<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AMW_Gun_HeavyTurret</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1.12</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.25</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8x50mmCharged</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>55</range>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<burstShotCount>14</burstShotCount>
-						<soundCast>SmallLaser</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_8x50mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!-- ========== cryo turret ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "AMW_Turret_CryoTurret"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "AMW_Turret_CryoTurret"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.25</AimingAccuracy>
-						<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AMW_Gun_CryoTurret</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>2.6</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.5</ShotSpread>
-						<SwayFactor>1.12</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.67</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_CryoLiquid</defaultProjectile>
-						<warmupTime>2.3</warmupTime>
-						<range>62</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>9</burstShotCount>
-						<soundCast>SmallLaser</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!-- ========== rocket turret ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "AMW_Turret_RocketTurret"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "AMW_Turret_RocketTurret"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.25</AimingAccuracy>
-						<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AMW_Gun_RocketTurret</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>2.6</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.12</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.67</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x385mmRCannonShell_HEAT</defaultProjectile>
-						<warmupTime>4.3</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>14</ticksBetweenBurstShots>
-						<burstShotCount>5</burstShotCount>
-						<soundCast>HeavyLaunch</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>9.8</reloadTime>
-						<ammoSet>AmmoSet_762x385mmRCannonShell</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!-- ========== lotus turret ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "AMW_Turret_LotusTurret"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "AMW_Turret_LotusTurret"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.25</AimingAccuracy>
-						<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AMW_Gun_LotusTurret</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>2.6</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>0.23</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.67</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12mmRailgun_Sabot</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>86</range>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<soundCast>HeavyLaunch</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>9.8</reloadTime>
-						<ammoSet>AmmoSet_12mmRailgun</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Advanced Mortar/AdvancedMortar_Compatbility.xml b/Patches/Advanced Mortar/AdvancedMortar_Compatbility.xml
deleted file mode 100644
index 12a7cfd419..0000000000
--- a/Patches/Advanced Mortar/AdvancedMortar_Compatbility.xml	
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<!-- Mod Support for Combat Extended -->
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Advanced Mortar (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Ad_Artillery_Mortar"]</xpath>
-					<value>
-						<statBases>
-							<SightsEfficiency>0.7</SightsEfficiency>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Ad_Artillery_Mortar"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Charges">
-							<chargeSpeeds>
-								<li>30</li>
-								<li>50</li>
-								<li>70</li>
-								<li>90</li>
-							</chargeSpeeds>
-						</li>
-						<li Class="CombatExtended.CompProperties_AmmoUser">
-							<magazineSize>3</magazineSize>
-							<reloadTime>5</reloadTime>
-							<ammoSet>AmmoSet_81mmMortarShell</ammoSet>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Ad_Artillery_Mortar"]/weaponTags</xpath>
-					<value>
-						<li>TurretGun</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Ad_Artillery_Mortar"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-								<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_81mmMortarShell_HE</defaultProjectile>
-								<warmupTime>4.0</warmupTime>
-								<minRange>32</minRange>
-								<range>800</range>
-								<burstShotCount>3</burstShotCount>
-								<soundCast>Mortar_LaunchA</soundCast>
-								<muzzleFlashScale>16</muzzleFlashScale>
-								<circularError>1</circularError>
-								<indirectFirePenalty>0.2</indirectFirePenalty>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Ad_Artillery_Mortar"]/label</xpath>
-					<value>
-						<label>81mm improved mortar</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Ad_Turret_Mortar"]/comps</xpath>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Ad_Turret_Mortar"]/tradeTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Ad_Turret_Mortar"]</xpath>
-						<value>
-							<tradeTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Ad_Turret_Mortar"]/tradeTags</xpath>
-					<value>
-						<li>CE_Turret</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/All-Tech Melee/Weapons_ATM_Industrial.xml b/Patches/All-Tech Melee/Weapons_ATM_Industrial.xml
deleted file mode 100644
index d1d5cfc9f8..0000000000
--- a/Patches/All-Tech Melee/Weapons_ATM_Industrial.xml	
+++ /dev/null
@@ -1,355 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>All-Tech Melee</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-			<!-- ========== Gladius ========== -->
-			
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[contains(defName,
-					"ATM_MeleeWeapon_Industrial")]/costStuffCount</xpath>
-				<value>
-					<costStuffCount>100</costStuffCount>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialGladius"]/tools</xpath>
-				<value>
-					<tools>
-						<li Class="CombatExtended.ToolCE">
-							<label>handle</label>
-							<capacities>
-								<li>Poke</li>
-							</capacities>
-							<power>3</power>
-							<chanceFactor>0.33</chanceFactor>
-							<cooldownTime>1.22</cooldownTime>
-							<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>point</label>
-							<capacities>
-								<li>Stab</li>
-							</capacities>
-							<power>35</power>
-							<cooldownTime>1.22</cooldownTime>
-							<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-							<armorPenetrationSharp>0.6</armorPenetrationSharp>
-							<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>edge</label>
-							<capacities>
-								<li>Cut</li>
-							</capacities>
-							<power>25</power>
-							<cooldownTime>1.15</cooldownTime>
-							<armorPenetrationBlunt>1.1</armorPenetrationBlunt>
-							<armorPenetrationSharp>0.6</armorPenetrationSharp>
-							<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-						</li>
-					</tools>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialGladius"]/statBases</xpath>
-				<value>
-					<Bulk>3</Bulk>
-					<MeleeCounterParryBonus>0.45</MeleeCounterParryBonus>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialGladius"]</xpath>
-				<value>
-					<equippedStatOffsets>
-						<MeleeCritChance>0.3</MeleeCritChance>
-						<MeleeParryChance>0.55</MeleeParryChance>
-						<MeleeDodgeChance>0.3</MeleeDodgeChance>
-					</equippedStatOffsets>
-				</value>
-			</li>
-
-			<!-- Add tags -->
-
-			<li Class="PatchOperationConditional">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialGladius"]/weaponTags</xpath>
-				<nomatch Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialGladius"]</xpath>
-					<value>
-						<weaponTags />
-					</value>
-				</nomatch>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialGladius"]/weaponTags</xpath>
-				<value>
-					<li>CE_Sidearm_Melee</li>
-					<li>CE_OneHandedWeapon</li>
-				</value>
-			</li>
-
-			<!-- ========== Hammer ========== -->
-
-			<!-- Patch stats -->
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialHammer"]/tools</xpath>
-				<value>
-					<tools>
-						<li Class="CombatExtended.ToolCE">
-							<label>handle</label>
-							<capacities>
-								<li>Poke</li>
-							</capacities>
-							<power>5</power>
-							<chanceFactor>0.33</chanceFactor>
-							<cooldownTime>1.78</cooldownTime>
-							<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>head</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>15</power>
-							<cooldownTime>3.48</cooldownTime>
-							<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-						</li>
-					</tools>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialHammer"]/statBases</xpath>
-				<value>
-					<Bulk>3</Bulk>
-					<MeleeCounterParryBonus>0.25</MeleeCounterParryBonus>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialHammer"]</xpath>
-				<value>
-					<equippedStatOffsets>
-						<MeleeCritChance>0.75</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-						<MeleeDodgeChance>0.3</MeleeDodgeChance>
-					</equippedStatOffsets>
-				</value>
-			</li>
-
-			<!-- Add tags -->
-
-			<li Class="PatchOperationConditional">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialHammer"]/weaponTags</xpath>
-				<nomatch Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialHammer"]</xpath>
-					<value>
-						<weaponTags />
-					</value>
-				</nomatch>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialHammer"]/weaponTags</xpath>
-				<value>
-					<li>CE_Sidearm_Tribal</li>
-					<li>CE_OneHandedWeapon</li>
-				</value>
-			</li>
-
-			<!-- ========== SledgeHammer ========== -->
-
-			<!-- Patch stats -->
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialSledgehammer"]/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>1.5</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>head</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>20</power>
-							<cooldownTime>1.9</cooldownTime>
-							<armorPenetrationBlunt>7.0</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-						</li>
-					</tools>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialSledgehammer"]/statBases</xpath>
-				<value>
-					<Bulk>3.0</Bulk>
-					<MeleeCounterParryBonus>0.3</MeleeCounterParryBonus>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialSledgehammer"]</xpath>
-				<value>
-					<equippedStatOffsets>
-						<MeleeCritChance>0.52</MeleeCritChance>
-						<MeleeParryChance>0.32</MeleeParryChance>
-						<MeleeDodgeChance>0.3</MeleeDodgeChance>
-					</equippedStatOffsets>
-				</value>
-			</li>
-
-			<!-- ========== Spear ========== -->
-
-			<!-- Patch stats -->
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialSpear"]/tools</xpath>
-				<value>
-					<tools>
-						<li Class="CombatExtended.ToolCE">
-							<label>shaft</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>9</power>
-							<cooldownTime>1.35</cooldownTime>
-							<chanceFactor>0.15</chanceFactor>
-							<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>shaft</label>
-							<capacities>
-								<li>Poke</li>
-							</capacities>
-							<power>5</power>
-							<cooldownTime>1.78</cooldownTime>
-							<chanceFactor>0.05</chanceFactor>
-							<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>head</label>
-							<capacities>
-								<li>Stab</li>
-							</capacities>
-							<power>25</power>
-							<cooldownTime>1.19</cooldownTime>
-							<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-							<armorPenetrationSharp>4.5</armorPenetrationSharp>
-							<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-						</li>
-					</tools>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialSpear"]/statBases</xpath>
-				<value>
-					<Bulk>8</Bulk>
-					<MeleeCounterParryBonus>1.88</MeleeCounterParryBonus>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialSpear"]</xpath>
-				<value>
-					<equippedStatOffsets>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>1.66</MeleeParryChance>
-						<MeleeDodgeChance>1.2</MeleeDodgeChance>
-					</equippedStatOffsets>
-				</value>
-			</li>
-
-			<!-- ========== Longsword ========== -->
-
-			<!-- Patch stats -->
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialLongsword"]/tools</xpath>
-				<value>
-					<tools>
-						<li Class="CombatExtended.ToolCE">
-							<label>handle</label>
-							<capacities>
-								<li>Poke</li>
-							</capacities>
-							<power>6</power>
-							<cooldownTime>1.78</cooldownTime>
-							<chanceFactor>0.10</chanceFactor>
-							<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>point</label>
-							<capacities>
-								<li>Stab</li>
-							</capacities>
-							<power>24</power>
-							<cooldownTime>1.78</cooldownTime>
-							<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							<armorPenetrationSharp>4.0</armorPenetrationSharp>
-							<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>edge</label>
-							<capacities>
-								<li>Cut</li>
-							</capacities>
-							<power>50</power>
-							<cooldownTime>1.64</cooldownTime>
-							<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							<armorPenetrationSharp>2</armorPenetrationSharp>
-							<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-						</li>
-					</tools>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialLongsword"]/statBases</xpath>
-				<value>
-					<Bulk>6</Bulk>
-					<MeleeCounterParryBonus>1.0</MeleeCounterParryBonus>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_IndustrialLongsword"]</xpath>
-				<value>
-					<equippedStatOffsets>
-						<MeleeCritChance>0.65</MeleeCritChance>
-						<MeleeParryChance>0.7</MeleeParryChance>
-						<MeleeDodgeChance>0.5</MeleeDodgeChance>
-					</equippedStatOffsets>
-				</value>
-			</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
diff --git a/Patches/All-Tech Melee/Weapons_ATM_Spacer.xml b/Patches/All-Tech Melee/Weapons_ATM_Spacer.xml
deleted file mode 100644
index 334d30c43b..0000000000
--- a/Patches/All-Tech Melee/Weapons_ATM_Spacer.xml	
+++ /dev/null
@@ -1,356 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>All-Tech Melee</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-			<!-- ========== Gladius ========== -->
-
-			<!-- Patch stats -->
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[contains(defName, "ATM_MeleeWeapon_Spacer")]/costStuffCount</xpath>
-				<value>
-					<costStuffCount>200</costStuffCount>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerGladius"]/tools</xpath>
-				<value>
-					<tools>
-						<li Class="CombatExtended.ToolCE">
-							<label>handle</label>
-							<capacities>
-								<li>Poke</li>
-							</capacities>
-							<power>6</power>
-							<chanceFactor>0.33</chanceFactor>
-							<cooldownTime>1.0</cooldownTime>
-							<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>point</label>
-							<capacities>
-								<li>Stab</li>
-							</capacities>
-							<power>70</power>
-							<cooldownTime>1.0</cooldownTime>
-							<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
-							<armorPenetrationSharp>1.2</armorPenetrationSharp>
-							<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>edge</label>
-							<capacities>
-								<li>Cut</li>
-							</capacities>
-							<power>50</power>
-							<cooldownTime>0.95</cooldownTime>
-							<armorPenetrationBlunt>2.2</armorPenetrationBlunt>
-							<armorPenetrationSharp>1.2</armorPenetrationSharp>
-							<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-						</li>
-					</tools>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerGladius"]/statBases</xpath>
-				<value>
-					<Bulk>2</Bulk>
-					<MeleeCounterParryBonus>0.9</MeleeCounterParryBonus>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerGladius"]</xpath>
-				<value>
-					<equippedStatOffsets>
-						<MeleeCritChance>0.6</MeleeCritChance>
-						<MeleeParryChance>1.1</MeleeParryChance>
-						<MeleeDodgeChance>0.6</MeleeDodgeChance>
-					</equippedStatOffsets>
-				</value>
-			</li>
-
-			<!-- Add tags -->
-
-			<li Class="PatchOperationConditional">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerGladius"]/weaponTags</xpath>
-				<nomatch Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerGladius"]</xpath>
-					<value>
-						<weaponTags />
-					</value>
-				</nomatch>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerGladius"]/weaponTags</xpath>
-				<value>
-					<li>CE_Sidearm_Melee</li>
-					<li>CE_OneHandedWeapon</li>
-				</value>
-			</li>
-
-			<!-- ========== Hammer ========== -->
-
-			<!-- Patch stats -->
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerHammer"]/tools</xpath>
-				<value>
-					<tools>
-						<li Class="CombatExtended.ToolCE">
-							<label>handle</label>
-							<capacities>
-								<li>Poke</li>
-							</capacities>
-							<power>10</power>
-							<chanceFactor>0.33</chanceFactor>
-							<cooldownTime>1.0</cooldownTime>
-							<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>head</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>30</power>
-							<cooldownTime>3.0</cooldownTime>
-							<armorPenetrationBlunt>12</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-						</li>
-					</tools>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerHammer"]/statBases</xpath>
-				<value>
-					<Bulk>3</Bulk>
-					<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerHammer"]</xpath>
-				<value>
-					<equippedStatOffsets>
-						<MeleeCritChance>1.5</MeleeCritChance>
-						<MeleeParryChance>0.5</MeleeParryChance>
-						<MeleeDodgeChance>0.6</MeleeDodgeChance>
-					</equippedStatOffsets>
-				</value>
-			</li>
-
-			<!-- Add tags -->
-
-			<li Class="PatchOperationConditional">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerHammer"]/weaponTags</xpath>
-				<nomatch Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerHammer"]</xpath>
-					<value>
-						<weaponTags />
-					</value>
-				</nomatch>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerHammer"]/weaponTags</xpath>
-				<value>
-					<li>CE_Sidearm_Tribal</li>
-					<li>CE_OneHandedWeapon</li>
-				</value>
-			</li>
-
-			<!-- ========== SledgeHammer ========== -->
-
-			<!-- Patch stats -->
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerSledgehammer"]/tools</xpath>
-				<value>
-					<tools>
-						<li Class="CombatExtended.ToolCE">
-							<label>handle</label>
-							<capacities>
-								<li>Poke</li>
-							</capacities>
-							<power>4</power>
-							<chanceFactor>0.33</chanceFactor>
-							<cooldownTime>1.33</cooldownTime>
-							<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>head</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>40</power>
-							<cooldownTime>1.5</cooldownTime>
-							<armorPenetrationBlunt>18</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-						</li>
-					</tools>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerSledgehammer"]/statBases</xpath>
-				<value>
-					<Bulk>3.0</Bulk>
-					<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerSledgehammer"]</xpath>
-				<value>
-					<equippedStatOffsets>
-						<MeleeCritChance>1.04</MeleeCritChance>
-						<MeleeParryChance>0.64</MeleeParryChance>
-						<MeleeDodgeChance>0.6</MeleeDodgeChance>
-					</equippedStatOffsets>
-				</value>
-			</li>
-
-			<!-- ========== Spear ========== -->
-
-			<!-- Patch stats -->
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerSpear"]/tools</xpath>
-				<value>
-					<tools>
-						<li Class="CombatExtended.ToolCE">
-							<label>shaft</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>18</power>
-							<cooldownTime>1.15</cooldownTime>
-							<chanceFactor>0.15</chanceFactor>
-							<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>shaft</label>
-							<capacities>
-								<li>Poke</li>
-							</capacities>
-							<power>10</power>
-							<cooldownTime>3.6</cooldownTime>
-							<chanceFactor>0.05</chanceFactor>
-							<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>head</label>
-							<capacities>
-								<li>Stab</li>
-							</capacities>
-							<power>50</power>
-							<cooldownTime>1.19</cooldownTime>
-							<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							<armorPenetrationSharp>10</armorPenetrationSharp>
-							<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-						</li>
-					</tools>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerSpear"]/statBases</xpath>
-				<value>
-					<Bulk>6</Bulk>
-					<MeleeCounterParryBonus>3.76</MeleeCounterParryBonus>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerSpear"]</xpath>
-				<value>
-					<equippedStatOffsets>
-						<MeleeCritChance>0.5</MeleeCritChance>
-						<MeleeParryChance>3.32</MeleeParryChance>
-						<MeleeDodgeChance>2.4</MeleeDodgeChance>
-					</equippedStatOffsets>
-				</value>
-			</li>
-
-			<!-- ========== Longsword ========== -->
-
-			<!-- Patch stats -->
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerLongsword"]/tools</xpath>
-				<value>
-					<tools>
-						<li Class="CombatExtended.ToolCE">
-							<label>handle</label>
-							<capacities>
-								<li>Poke</li>
-							</capacities>
-							<power>12</power>
-							<cooldownTime>3.56</cooldownTime>
-							<chanceFactor>0.10</chanceFactor>
-							<armorPenetrationBlunt>5.0</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>point</label>
-							<capacities>
-								<li>Stab</li>
-							</capacities>
-							<power>48</power>
-							<cooldownTime>3.76</cooldownTime>
-							<armorPenetrationBlunt>5.0</armorPenetrationBlunt>
-							<armorPenetrationSharp>9.0</armorPenetrationSharp>
-							<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>edge</label>
-							<capacities>
-								<li>Cut</li>
-							</capacities>
-							<power>100</power>
-							<cooldownTime>3.28</cooldownTime>
-							<armorPenetrationBlunt>11</armorPenetrationBlunt>
-							<armorPenetrationSharp>4</armorPenetrationSharp>
-							<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-						</li>
-					</tools>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerLongsword"]/statBases</xpath>
-				<value>
-					<Bulk>6</Bulk>
-					<MeleeCounterParryBonus>2.0</MeleeCounterParryBonus>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SpacerLongsword"]</xpath>
-				<value>
-					<equippedStatOffsets>
-						<MeleeCritChance>1.3</MeleeCritChance>
-						<MeleeParryChance>1.4</MeleeParryChance>
-						<MeleeDodgeChance>1.0</MeleeDodgeChance>
-					</equippedStatOffsets>
-				</value>
-			</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/All-Tech Melee/Weapons_ATM_Tribal.xml b/Patches/All-Tech Melee/Weapons_ATM_Tribal.xml
deleted file mode 100644
index 5b2d693f58..0000000000
--- a/Patches/All-Tech Melee/Weapons_ATM_Tribal.xml	
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>All-Tech Melee</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SharpStick"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3.5</power>
-								<cooldownTime>0.66</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.9</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>0.59</cooldownTime>
-								<armorPenetrationBlunt>1.175</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.175</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SharpStick"]/statBases</xpath>
-					<value>
-						<Bulk>14</Bulk>
-						<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_SharpStick"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.09</MeleeCritChance>
-							<MeleeParryChance>0.75</MeleeParryChance>
-							<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/All-Tech Melee/Weapons_ATM_Ultratech.xml b/Patches/All-Tech Melee/Weapons_ATM_Ultratech.xml
deleted file mode 100644
index ac3b9f21c5..0000000000
--- a/Patches/All-Tech Melee/Weapons_ATM_Ultratech.xml	
+++ /dev/null
@@ -1,357 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>All-Tech Melee</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-			<!-- ========== Gladius ========== -->
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[contains(defName, "ATM_MeleeWeapon_Spacer")]/costStuffCount</xpath>
-				<value>
-					<costStuffCount>200</costStuffCount>
-				</value>
-			</li>
-
-			<!-- Patch stats -->
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechGladius"]/tools</xpath>
-				<value>
-					<tools>
-						<li Class="CombatExtended.ToolCE">
-							<label>handle</label>
-							<capacities>
-								<li>Poke</li>
-							</capacities>
-							<power>12</power>
-							<chanceFactor>0.33</chanceFactor>
-							<cooldownTime>0.8</cooldownTime>
-							<armorPenetrationBlunt>2.4</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>point</label>
-							<capacities>
-								<li>Stab</li>
-							</capacities>
-							<power>140</power>
-							<cooldownTime>0.75</cooldownTime>
-							<armorPenetrationBlunt>2.4</armorPenetrationBlunt>
-							<armorPenetrationSharp>2.4</armorPenetrationSharp>
-							<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>edge</label>
-							<capacities>
-								<li>Cut</li>
-							</capacities>
-							<power>100</power>
-							<cooldownTime>0.7</cooldownTime>
-							<armorPenetrationBlunt>4.4</armorPenetrationBlunt>
-							<armorPenetrationSharp>2.4</armorPenetrationSharp>
-							<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-						</li>
-					</tools>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechGladius"]/statBases</xpath>
-				<value>
-					<Bulk>1.5</Bulk>
-					<MeleeCounterParryBonus>1.8</MeleeCounterParryBonus>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechGladius"]</xpath>
-				<value>
-					<equippedStatOffsets>
-						<MeleeCritChance>1.2</MeleeCritChance>
-						<MeleeParryChance>2.2</MeleeParryChance>
-						<MeleeDodgeChance>1.2</MeleeDodgeChance>
-					</equippedStatOffsets>
-				</value>
-			</li>
-
-			<!-- Add tags -->
-
-			<li Class="PatchOperationConditional">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechGladius"]/weaponTags</xpath>
-				<nomatch Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechGladius"]</xpath>
-					<value>
-						<weaponTags />
-					</value>
-				</nomatch>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechGladius"]/weaponTags</xpath>
-				<value>
-					<li>CE_Sidearm_Melee</li>
-					<li>CE_OneHandedWeapon</li>
-				</value>
-			</li>
-
-			<!-- ========== Hammer ========== -->
-
-			<!-- Patch stats -->
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechHammer"]/tools</xpath>
-				<value>
-					<tools>
-						<li Class="CombatExtended.ToolCE">
-							<label>handle</label>
-							<capacities>
-								<li>Poke</li>
-							</capacities>
-							<power>20</power>
-							<chanceFactor>0.33</chanceFactor>
-							<cooldownTime>0.5</cooldownTime>
-							<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>head</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>60</power>
-							<cooldownTime>1.5</cooldownTime>
-							<armorPenetrationBlunt>40</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-						</li>
-					</tools>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechHammer"]/statBases</xpath>
-				<value>
-					<Bulk>2</Bulk>
-					<MeleeCounterParryBonus>1.0</MeleeCounterParryBonus>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechHammer"]</xpath>
-				<value>
-					<equippedStatOffsets>
-						<MeleeCritChance>3.0</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<MeleeDodgeChance>1.2</MeleeDodgeChance>
-					</equippedStatOffsets>
-				</value>
-			</li>
-
-			<!-- Add tags -->
-
-			<li Class="PatchOperationConditional">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechHammer"]/weaponTags</xpath>
-				<nomatch Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechHammer"]</xpath>
-					<value>
-						<weaponTags />
-					</value>
-				</nomatch>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechHammer"]/weaponTags</xpath>
-				<value>
-					<li>CE_Sidearm_Tribal</li>
-					<li>CE_OneHandedWeapon</li>
-				</value>
-			</li>
-
-			<!-- ========== SledgeHammer ========== -->
-
-			<!-- Patch stats -->
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechSledgehammer"]/tools</xpath>
-				<value>
-					<tools>
-						<li Class="CombatExtended.ToolCE">
-							<label>handle</label>
-							<capacities>
-								<li>Poke</li>
-							</capacities>
-							<power>8</power>
-							<chanceFactor>0.33</chanceFactor>
-							<cooldownTime>0.66</cooldownTime>
-							<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>head</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>80</power>
-							<cooldownTime>0.75</cooldownTime>
-							<armorPenetrationBlunt>60</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-						</li>
-					</tools>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechSledgehammer"]/statBases</xpath>
-				<value>
-					<Bulk>2.0</Bulk>
-					<MeleeCounterParryBonus>1.2</MeleeCounterParryBonus>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechSledgehammer"]</xpath>
-				<value>
-					<equippedStatOffsets>
-						<MeleeCritChance>2.08</MeleeCritChance>
-						<MeleeParryChance>1.28</MeleeParryChance>
-						<MeleeDodgeChance>1.2</MeleeDodgeChance>
-					</equippedStatOffsets>
-				</value>
-			</li>
-
-			<!-- ========== Spear ========== -->
-
-			<!-- Patch stats -->
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechSpear"]/tools</xpath>
-				<value>
-					<tools>
-						<li Class="CombatExtended.ToolCE">
-							<label>shaft</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>36</power>
-							<cooldownTime>0.57</cooldownTime>
-							<chanceFactor>0.15</chanceFactor>
-							<armorPenetrationBlunt>28</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>shaft</label>
-							<capacities>
-								<li>Poke</li>
-							</capacities>
-							<power>20</power>
-							<cooldownTime>1.8</cooldownTime>
-							<chanceFactor>0.05</chanceFactor>
-							<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>head</label>
-							<capacities>
-								<li>Stab</li>
-							</capacities>
-							<power>100</power>
-							<cooldownTime>0.55</cooldownTime>
-							<armorPenetrationBlunt>33</armorPenetrationBlunt>
-							<armorPenetrationSharp>33</armorPenetrationSharp>
-							<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-						</li>
-					</tools>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechSpear"]/statBases</xpath>
-				<value>
-					<Bulk>5</Bulk>
-					<MeleeCounterParryBonus>7.52</MeleeCounterParryBonus>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechSpear"]</xpath>
-				<value>
-					<equippedStatOffsets>
-						<MeleeCritChance>1.0</MeleeCritChance>
-						<MeleeParryChance>6.64</MeleeParryChance>
-						<MeleeDodgeChance>4.8</MeleeDodgeChance>
-					</equippedStatOffsets>
-				</value>
-			</li>
-
-			<!-- ========== Longsword ========== -->
-
-			<!-- Patch stats -->
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechLongsword"]/tools</xpath>
-				<value>
-					<tools>
-						<li Class="CombatExtended.ToolCE">
-							<label>handle</label>
-							<capacities>
-								<li>Poke</li>
-							</capacities>
-							<power>24</power>
-							<cooldownTime>1.753</cooldownTime>
-							<chanceFactor>0.10</chanceFactor>
-							<armorPenetrationBlunt>12</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>point</label>
-							<capacities>
-								<li>Stab</li>
-							</capacities>
-							<power>96</power>
-							<cooldownTime>1.753</cooldownTime>
-							<armorPenetrationBlunt>12</armorPenetrationBlunt>
-							<armorPenetrationSharp>18</armorPenetrationSharp>
-							<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>edge</label>
-							<capacities>
-								<li>Cut</li>
-							</capacities>
-							<power>200</power>
-							<cooldownTime>3.28</cooldownTime>
-							<armorPenetrationBlunt>30</armorPenetrationBlunt>
-							<armorPenetrationSharp>12</armorPenetrationSharp>
-							<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-						</li>
-					</tools>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechLongsword"]/statBases</xpath>
-				<value>
-					<Bulk>5</Bulk>
-					<MeleeCounterParryBonus>4.0</MeleeCounterParryBonus>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="ATM_MeleeWeapon_UltratechLongsword"]</xpath>
-				<value>
-					<equippedStatOffsets>
-						<MeleeCritChance>2.6</MeleeCritChance>
-						<MeleeParryChance>2.8</MeleeParryChance>
-						<MeleeDodgeChance>2.0</MeleeDodgeChance>
-					</equippedStatOffsets>
-				</value>
-			</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/AA_VPE/AbilityDefs/AbilityDefs_Patch.xml b/Patches/Alpha Animals/AA_VPE/AbilityDefs/AbilityDefs_Patch.xml
deleted file mode 100644
index 1515c690e3..0000000000
--- a/Patches/Alpha Animals/AA_VPE/AbilityDefs/AbilityDefs_Patch.xml	
+++ /dev/null
@@ -1,238 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Psycasts Expanded</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<!-- ======= Ability Range Adjustment ======= -->
-
-					<!-- ===== Herald Path ===== -->
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_VenomSpit"]/range</xpath>
-						<value>
-							<range>19.9</range>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd"><!-- ===== The patched projectile does not work ===== -->
-						<xpath>Defs</xpath>
-						<value>
-							<ThingDef ParentName="BaseBullet">
-								<defName>AA_PoisonBolt_V</defName>
-								<label>venomous spit</label>
-								<graphicData>
-									<texPath>Things/Projectiles/AA_PoisonBolt</texPath>
-									<graphicClass>Graphic_Single</graphicClass>
-								</graphicData>
-								<projectile>
-									<flyOverhead>false</flyOverhead>
-									<damageDef>AA_ToxicBolt</damageDef>
-									<damageAmountBase>10</damageAmountBase>
-									<armorPenetrationBase>2.5</armorPenetrationBase>
-									<speed>50</speed>
-								</projectile>
-							</ThingDef>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_VenomSpit"]/modExtensions/li[@Class="VFECore.Abilities.AbilityExtension_Projectile"]/projectile</xpath>
-						<value>
-							<projectile>AA_PoisonBolt_V</projectile>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_SummonBlackScarab" or defName="AAVPE_SummonBlackSpelopede" or defName="AAVPE_SummonBlackSpider" or defName="AAVPE_SummonMammothWorm" or defName="AAVPE_SummonBlackQueen"]/range</xpath>
-						<value>
-							<range>24</range>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_StrengthenInsect"]/range</xpath>
-						<value>
-							<range>11.9</range>
-						</value>
-					</li>
-
-					<!-- ===== Ocultist Path ===== -->
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_SummonEyeling" or defName="AAVPE_SummonOcularOriginator" or AAVPE_SummonEyelingHorde]/range</xpath>
-						<value>
-							<range>24</range>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_StrikeEyes" or defName="AAVPE_EyeEruption"]/range</xpath>
-						<value>
-							<range>11.9</range>
-						</value>
-					</li>
-
-					<!-- ===== Ravager Path ===== -->
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_Slice"]/range</xpath>
-						<value>
-							<range>6</range>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_Slice"]/modExtensions/li[@Class="AlphaBehavioursAndEvents.Ability_Damage_Extension"]/armourPen</xpath>
-						<value>
-							<armourPen>6.0</armourPen>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_ClawFrenzy"]/modExtensions/li[@Class="AlphaBehavioursAndEvents.Ability_Damage_Extension"]/armourPen</xpath>
-						<value>
-							<armourPen>3.0</armourPen>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_DisablingStrike"]/modExtensions/li[@Class="AlphaBehavioursAndEvents.Ability_Damage_Extension"]/armourPen</xpath>
-						<value>
-							<armourPen>1.0</armourPen>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_Skewer"]/modExtensions/li[@Class="AlphaBehavioursAndEvents.Ability_Damage_Extension"]/armourPen</xpath>
-						<value>
-							<armourPen>9.0</armourPen>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_Charge"]/range</xpath>
-						<value>
-							<range>12</range>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_Charge"]/modExtensions/li[@Class="AlphaBehavioursAndEvents.Ability_Damage_Extension"]/armourPen</xpath>
-						<value>
-							<armourPen>1.0</armourPen>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_ChargeAndSkewer"]/range</xpath>
-						<value>
-							<range>19</range>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_ChargeAndSkewer"]/modExtensions/li[@Class="AlphaBehavioursAndEvents.Ability_Damage_Extension"]/armourPen</xpath>
-						<value>
-							<armourPen>9.0</armourPen>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_EmpBlow"]/modExtensions/li[@Class="AlphaBehavioursAndEvents.Ability_Damage_Extension"]/armourPen</xpath>
-						<value>
-							<armourPen>10.0</armourPen>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_SpinCut"]/range</xpath>
-						<value>
-							<range>10</range>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_SpinCut"]/modExtensions/li[@Class="AlphaBehavioursAndEvents.Ability_Damage_Extension"]/armourPen</xpath>
-						<value>
-							<armourPen>4.0</armourPen>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_LegSkip"]/range</xpath>
-						<value>
-							<range>6</range>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_LegSkip"]/modExtensions/li[@Class="AlphaBehavioursAndEvents.Ability_Damage_Extension"]/armourPen</xpath>
-						<value>
-							<armourPen>10000</armourPen>
-						</value>
-					</li>
-
-					<!-- ===== Xenoseer Path ===== -->
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_ChemfuelNodules"]/range</xpath>
-						<value>
-							<range>29</range>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_Hover" or defName="AAVPE_FungalSkin"]/range</xpath>
-						<value>
-							<range>24</range>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_WebSlinging"]/range</xpath>
-						<value>
-							<range>19.9</range>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_AcidSpit"]/range</xpath>
-						<value>
-							<range>12</range>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_Laser"]/range</xpath>
-						<value>
-							<range>18</range>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_Electrify"]/range</xpath>
-						<value>
-							<range>29</range>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFECore.Abilities.AbilityDef[defName="AAVPE_Regeneration"]/range</xpath>
-						<value>
-							<range>12</range>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/AA_VPE/HediffDefs/Hediffs_Patch.xml b/Patches/Alpha Animals/AA_VPE/HediffDefs/Hediffs_Patch.xml
deleted file mode 100644
index 235b781e81..0000000000
--- a/Patches/Alpha Animals/AA_VPE/HediffDefs/Hediffs_Patch.xml	
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Psycasts Expanded</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<!-- ======= Ability Range Adjustment ======= -->
-
-					<!-- ===== Herald Path ===== -->
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/HediffDef[defName="AAVPE_StrengthenBlackHive"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/HediffDef[defName="AAVPE_StrengthenBlackHive"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>1.0</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<!-- ===== Xenoseer Path ===== -->
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/HediffDef[defName="AAVPE_FungalSkin"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>3.75</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/HediffDef[defName="AAVPE_FungalSkin"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_BlackHive_Psycasts.xml b/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_BlackHive_Psycasts.xml
deleted file mode 100644
index 4d3aa1eeaa..0000000000
--- a/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_BlackHive_Psycasts.xml	
+++ /dev/null
@@ -1,506 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Psycasts Expanded</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AA_BlackScarab_Temporary"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>QuadrupedLow</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/PawnKindDef[defName="AA_BlackScarab_Temporary"]/combatPower</xpath>
-						<value>
-							<combatPower>60</combatPower>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_BlackScarab_Temporary"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>2.55</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_BlackScarab_Temporary"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_BlackScarab_Temporary"]/statBases/MoveSpeed</xpath>
-						<value>
-							<MoveSpeed>4.9</MoveSpeed>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_BlackScarab_Temporary"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.15</MeleeDodgeChance>
-							<MeleeCritChance>0.01</MeleeCritChance>
-							<MeleeParryChance>0</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_BlackScarab_Temporary"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>mandibles</label>
-									<capacities>
-										<li>Bite</li>
-									</capacities>
-									<power>9</power>
-									<cooldownTime>1.33</cooldownTime>
-									<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-									<armorPenetrationSharp>0.5</armorPenetrationSharp>
-									<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>1</power>
-									<cooldownTime>1.26</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-									<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-									<chanceFactor>0.1</chanceFactor>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="AA_BlackScarab_Temporary"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AA_BlackScarab_Temporary"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_BlackScarab_Temporary"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>187</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>600</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<MinArmorPct>0.5</MinArmorPct>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AA_BlackSpelopede_Temporary"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>QuadrupedLow</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_BlackSpelopede_Temporary"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>6</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_BlackSpelopede_Temporary"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>3</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_BlackSpelopede_Temporary"]/statBases/MoveSpeed</xpath>
-						<value>
-							<MoveSpeed>4.7</MoveSpeed>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_BlackSpelopede_Temporary"]/statBases</xpath>
-						<value>
-							<AimingAccuracy>0.75</AimingAccuracy>
-							<ShootingAccuracyPawn>0.75</ShootingAccuracyPawn>
-							<MeleeDodgeChance>0.08</MeleeDodgeChance>
-							<MeleeCritChance>0.18</MeleeCritChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-							<Suppressability>0.25</Suppressability>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/PawnKindDef[defName="AA_BlackSpelopede_Temporary"]/combatPower</xpath>
-						<value>
-							<combatPower>100</combatPower>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_BlackSpelopede_Temporary"]/race/baseHealthScale</xpath>
-						<value>
-							<baseHealthScale>1.4</baseHealthScale>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_BlackSpelopede_Temporary"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>head claw</label>
-									<capacities>
-										<li>Cut</li>
-									</capacities>
-									<power>22</power>
-									<cooldownTime>1.68</cooldownTime>
-									<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-									<armorPenetrationSharp>0.75</armorPenetrationSharp>
-									<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head claw</label>
-									<capacities>
-										<li>Stab</li>
-									</capacities>
-									<power>15</power>
-									<cooldownTime>1.48</cooldownTime>
-									<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-									<armorPenetrationSharp>6</armorPenetrationSharp>
-									<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>2</power>
-									<cooldownTime>1.5</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-									<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-									<chanceFactor>0.2</chanceFactor>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_BlackSpelopede_Temporary"]/verbs</xpath>
-						<value>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>AA_PoisonBolt</defaultProjectile>
-									<warmupTime>2.4</warmupTime>
-									<burstShotCount>1</burstShotCount>
-									<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-									<minRange>2</minRange>
-									<range>20</range>
-									<soundCast>AA_PoisonBolt</soundCast>
-									<muzzleFlashScale>0</muzzleFlashScale>
-									<label>venomous spit</label>
-									<commonality>0.8</commonality>
-								</li>
-							</verbs>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="AA_BlackSpelopede_Temporary"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AA_BlackSpelopede_Temporary"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_BlackSpelopede_Temporary"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>600</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>600</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<MinArmorPct>0.5</MinArmorPct>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AA_BlackSpider_Temporary"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Quadruped</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_BlackSpider_Temporary"]/race/baseHealthScale</xpath>
-						<value>
-							<baseHealthScale>2.1</baseHealthScale>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_BlackSpider_Temporary"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>12</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_BlackSpider_Temporary"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>5</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_BlackSpider_Temporary"]/statBases/MoveSpeed</xpath>
-						<value>
-							<MoveSpeed>4.6</MoveSpeed>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_BlackSpider_Temporary"]/statBases</xpath>
-						<value>
-							<AimingAccuracy>0.65</AimingAccuracy>
-							<ShootingAccuracyPawn>0.65</ShootingAccuracyPawn>
-							<MeleeDodgeChance>0.09</MeleeDodgeChance>
-							<MeleeCritChance>0.45</MeleeCritChance>
-							<MeleeParryChance>0.25</MeleeParryChance>
-							<Suppressability>0.2</Suppressability>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/PawnKindDef[defName="AA_BlackSpider_Temporary"]/combatPower</xpath>
-						<value>
-							<combatPower>200</combatPower>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_BlackSpider_Temporary"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>head claw</label>
-									<capacities>
-										<li>Cut</li>
-									</capacities>
-									<power>44</power>
-									<cooldownTime>2.0</cooldownTime>
-									<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-									<armorPenetrationSharp>2.0</armorPenetrationSharp>
-									<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head claw</label>
-									<capacities>
-										<li>Stab</li>
-									</capacities>
-									<power>26</power>
-									<cooldownTime>1.33</cooldownTime>
-									<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-									<armorPenetrationSharp>44</armorPenetrationSharp>
-									<armorPenetrationBlunt>22</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>25</power>
-									<cooldownTime>1.33</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-									<armorPenetrationBlunt>8.5</armorPenetrationBlunt>
-									<chanceFactor>0.2</chanceFactor>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_BlackSpider_Temporary"]/verbs</xpath>
-						<value>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>AA_PoisonBolt</defaultProjectile>
-									<warmupTime>1.6</warmupTime>
-									<burstShotCount>1</burstShotCount>
-									<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-									<minRange>1.9</minRange>
-									<range>32</range>
-									<soundCast>AA_PoisonBolt</soundCast>
-									<muzzleFlashScale>0</muzzleFlashScale>
-									<label>venomous spit</label>
-									<commonality>0.8</commonality>
-								</li>
-							</verbs>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="AA_BlackSpider_Temporary"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AA_BlackSpider_Temporary"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_BlackSpider_Temporary"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>900</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>600</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<MinArmorPct>0.5</MinArmorPct>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AA_MammothWorm_Temporary"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Quadruped</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/PawnKindDef[defName="AA_MammothWorm_Temporary"]/combatPower</xpath>
-						<value>
-							<combatPower>250</combatPower>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_MammothWorm_Temporary"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>24</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_MammothWorm_Temporary"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>10</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_MammothWorm_Temporary"]/statBases/MoveSpeed</xpath>
-						<value>
-							<MoveSpeed>2.7</MoveSpeed>
-							<MeleeDodgeChance>0.08</MeleeDodgeChance>
-							<MeleeCritChance>0.8</MeleeCritChance>
-							<MeleeParryChance>0.23</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_MammothWorm_Temporary"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>body</label>
-									<capacities>
-										<li>AA_SiegeBlunt</li>
-									</capacities>
-									<power>43</power>
-									<cooldownTime>2.48</cooldownTime>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>21</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationBlunt>50</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<capacities>
-										<li>Stab</li>
-									</capacities>
-									<power>48</power>
-									<cooldownTime>2.68</cooldownTime>
-									<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationSharp>20</armorPenetrationSharp>
-									<armorPenetrationBlunt>50</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="AA_MammothWorm_Temporary"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AA_MammothWorm_Temporary"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_MammothWorm_Temporary"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>1500</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>600</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<MinArmorPct>0.5</MinArmorPct>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_BlackLarva.xml b/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_BlackLarva.xml
deleted file mode 100644
index a3859a0fef..0000000000
--- a/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_BlackLarva.xml	
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Psycasts Expanded</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_BlackLarvae"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.06</MeleeDodgeChance>
-							<MeleeCritChance>0.02</MeleeCritChance>
-							<MeleeParryChance>0.04</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_BlackLarvae"]/race/baseHealthScale</xpath>
-						<value>
-							<baseHealthScale>0.2</baseHealthScale>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_BlackLarvae"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>mandibles</label>
-									<capacities>
-										<li>Bite</li>
-									</capacities>
-									<power>3</power>
-									<cooldownTime>2.12</cooldownTime>
-									<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-									<armorPenetrationSharp>0.01</armorPenetrationSharp>
-									<armorPenetrationBlunt>0.031</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>1</power>
-									<cooldownTime>2.12</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<chanceFactor>0.2</chanceFactor>
-									<armorPenetrationBlunt>0.031</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_BlackQueen.xml b/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_BlackQueen.xml
deleted file mode 100644
index 174c8c24a5..0000000000
--- a/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_BlackQueen.xml	
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Psycasts Expanded</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AAVPE_BlackQueen"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.03</MeleeDodgeChance>
-							<MeleeCritChance>0.30</MeleeCritChance>
-							<MeleeParryChance>0.57</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AAVPE_BlackQueen"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>30</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AAVPE_BlackQueen"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>12</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AAVPE_BlackQueen"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>head claw</label>
-									<capacities>
-										<li>Stab</li>
-									</capacities>
-									<power>37</power>
-									<cooldownTime>1.48</cooldownTime>
-									<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-									<armorPenetrationSharp>50</armorPenetrationSharp>
-									<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>AAVPE_InfectedMandibles</label>
-									<capacities>
-										<li>Cut</li>
-									</capacities>
-									<power>65</power>
-									<cooldownTime>1.65</cooldownTime>
-									<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-									<armorPenetrationSharp>3.38</armorPenetrationSharp>
-									<armorPenetrationBlunt>8.438</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>34</power>
-									<cooldownTime>2.64</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<chanceFactor>0.2</chanceFactor>
-									<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="AAVPE_BlackQueen"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AAVPE_BlackQueen"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AAVPE_BlackQueen"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>3000</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>400</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<MinArmorPct>0.5</MinArmorPct>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_OcularOriginator.xml b/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_OcularOriginator.xml
deleted file mode 100644
index f4b296e524..0000000000
--- a/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_OcularOriginator.xml	
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Psycasts Expanded</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AA_OcularOriginator"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Birdlike</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_OcularOriginator"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.3</MeleeDodgeChance>
-							<MeleeCritChance>0.04</MeleeCritChance>
-							<MeleeParryChance>0.3</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_OcularOriginator"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>tentacles</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>5</power>
-									<cooldownTime>0.35</cooldownTime>
-									<linkedBodyPartsGroup>Arms</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>0.7</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_Summoned_Eyeling.xml b/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_Summoned_Eyeling.xml
deleted file mode 100644
index ff763c36b9..0000000000
--- a/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_Summoned_Eyeling.xml	
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Psycasts Expanded</li>
-			</mods>
-			<match Class="PatchOperationFindMod">
-				<mods>
-					<li>Ideology</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[defName="AA_Summoned_Eyeling"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Quadruped</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AA_Summoned_Eyeling"]/statBases</xpath>
-							<value>
-								<MeleeDodgeChance>0.1</MeleeDodgeChance>
-								<MeleeCritChance>0.1</MeleeCritChance>
-								<MeleeParryChance>0.1</MeleeParryChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AA_Summoned_Eyeling"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<capacities>
-											<li>AA_ToxicBite</li>
-										</capacities>
-										<power>12</power>
-										<cooldownTime>1.65</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<surpriseAttack>
-											<extraMeleeDamages>
-												<li>
-													<def>Stun</def>
-													<amount>10</amount>
-												</li>
-											</extraMeleeDamages>
-										</surpriseAttack>
-										<armorPenetrationSharp>1.0</armorPenetrationSharp>
-										<armorPenetrationBlunt>0.544</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Arachnid.xml b/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Arachnid.xml
deleted file mode 100644
index 19c2510c91..0000000000
--- a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Arachnid.xml	
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== Arachnid ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Arachnid"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Arachnid"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Arachnid"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[def="AA_Thorax"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[def="AA_Thorax"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[def="AA_Thorax"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[def="Pronotum"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[def="Pronotum"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[def="Pronotum"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/parts/li[def="AA_InsectMouth"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/parts/li[def="AA_InsectMouth"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/parts/li[def="AA_InsectMouth"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_ArmouredSlug.xml b/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_ArmouredSlug.xml
deleted file mode 100644
index a0881109e0..0000000000
--- a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_ArmouredSlug.xml	
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== ArmouredSlug ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_ArmouredSlug"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ArmouredSlug"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ArmouredSlug"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_ArmouredSlug"]/corePart/parts/li[def="AA_Carapace"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ArmouredSlug"]/corePart/parts/li[def="AA_Carapace"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ArmouredSlug"]/corePart/parts/li[def="AA_Carapace"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_ArmouredSlug"]/corePart/parts/li[def="Head"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ArmouredSlug"]/corePart/parts/li[def="Head"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ArmouredSlug"]/corePart/parts/li[def="Head"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Assembler.xml b/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Assembler.xml
deleted file mode 100644
index 49fa94cabb..0000000000
--- a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Assembler.xml	
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== Assembler ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Assembler"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Assembler"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Assembler"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Assembler"]/corePart/parts/li[def="MechanicalHead"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Assembler"]/corePart/parts/li[def="MechanicalHead"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Assembler"]/corePart/parts/li[def="MechanicalHead"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Assembler"]/corePart/parts/li[def="AA_MechanicalBodyCarapace"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Assembler"]/corePart/parts/li[def="AA_MechanicalBodyCarapace"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Assembler"]/corePart/parts/li[def="AA_MechanicalBodyCarapace"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Atispec.xml b/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Atispec.xml
deleted file mode 100644
index dfc7d99a36..0000000000
--- a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Atispec.xml	
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== Atispec ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="Tail"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="Tail"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="Tail"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="AA_Thorax"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="AA_Thorax"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="AA_Thorax"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="Pronotum"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="Pronotum"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="Pronotum"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/parts/li[def="AA_InsectMouth"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/parts/li[def="AA_InsectMouth"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/parts/li[def="AA_InsectMouth"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="AA_Abdomen"]/parts/li[def="AA_InsectSting"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="AA_Abdomen"]/parts/li[def="AA_InsectSting"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="AA_Abdomen"]/parts/li[def="AA_InsectSting"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="AA_FrontClaw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="AA_FrontClaw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Atispec"]/corePart/parts/li[def="AA_FrontClaw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Boats.xml b/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Boats.xml
deleted file mode 100644
index dd9ee1d855..0000000000
--- a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Boats.xml	
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== Boat_JellyFish and Boat_Nautiloid ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_JellyfishBoatBody"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_JellyfishBoatBody"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_JellyfishBoatBody"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_JellyfishBoatBody"]/corePart/parts/li[def="AA_BoatHead"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_JellyfishBoatBody"]/corePart/parts/li[def="AA_BoatHead"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_JellyfishBoatBody"]/corePart/parts/li[def="AA_BoatHead"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_JellyfishBoatBody"]/corePart/parts/li[def="AA_Mast"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_JellyfishBoatBody"]/corePart/parts/li[def="AA_Mast"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_JellyfishBoatBody"]/corePart/parts/li[def="AA_Mast"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_NautiloidBody"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_NautiloidBody"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_NautiloidBody"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_NautiloidBody"]/corePart/parts/li[def="AA_BoatHead"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_NautiloidBody"]/corePart/parts/li[def="AA_BoatHead"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_NautiloidBody"]/corePart/parts/li[def="AA_BoatHead"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_NautiloidBody"]/corePart/parts/li[def="AA_Mast"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_NautiloidBody"]/corePart/parts/li[def="AA_Mast"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_NautiloidBody"]/corePart/parts/li[def="AA_Mast"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_NautiloidBody"]/corePart/parts/li[def="AA_NautilusShell"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_NautiloidBody"]/corePart/parts/li[def="AA_NautilusShell"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_NautiloidBody"]/corePart/parts/li[def="AA_NautilusShell"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Butterfly.xml b/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Butterfly.xml
deleted file mode 100644
index e44243d197..0000000000
--- a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Butterfly.xml	
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== Butterfly ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Butterfly"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Butterfly"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Butterfly"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Butterfly"]/corePart/parts/li[def="AA_Thorax"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Butterfly"]/corePart/parts/li[def="AA_Thorax"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Butterfly"]/corePart/parts/li[def="AA_Thorax"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Butterfly"]/corePart/parts/li[def="Pronotum"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Butterfly"]/corePart/parts/li[def="Pronotum"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Butterfly"]/corePart/parts/li[def="Pronotum"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Butterfly"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Butterfly"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Butterfly"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Butterfly"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/parts/li[def="AA_InsectMouth"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Butterfly"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/parts/li[def="AA_InsectMouth"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Butterfly"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/parts/li[def="AA_InsectMouth"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_ClawedSlug.xml b/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_ClawedSlug.xml
deleted file mode 100644
index 68701a4637..0000000000
--- a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_ClawedSlug.xml	
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== ClawedSlug ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_ClawedSlug"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ClawedSlug"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ClawedSlug"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_ClawedSlug"]/corePart/parts/li[def="AA_Carapace"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ClawedSlug"]/corePart/parts/li[def="AA_Carapace"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ClawedSlug"]/corePart/parts/li[def="AA_Carapace"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_ClawedSlug"]/corePart/parts/li[def="AA_FrontClaw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ClawedSlug"]/corePart/parts/li[def="AA_FrontClaw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ClawedSlug"]/corePart/parts/li[def="AA_FrontClaw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_ClawedSlug"]/corePart/parts/li[def="Head"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ClawedSlug"]/corePart/parts/li[def="Head"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ClawedSlug"]/corePart/parts/li[def="Head"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_ClawedSlug"]/corePart/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ClawedSlug"]/corePart/parts/li[def="Head"]/parts/li[def="AnimalJaw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ClawedSlug"]/corePart/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Crocodile.xml b/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Crocodile.xml
deleted file mode 100644
index 75f496aa51..0000000000
--- a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Crocodile.xml	
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== Crocodile ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Tail"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Tail"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Tail"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Neck"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Neck"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Neck"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AA_CrocodileJaw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AA_CrocodileJaw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AA_CrocodileJaw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Leg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Leg"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Leg"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Crocodile"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_DualJawedQuadruped.xml b/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_DualJawedQuadruped.xml
deleted file mode 100644
index 5e31a1585b..0000000000
--- a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_DualJawedQuadruped.xml	
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== DualJawedQuadruped ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Neck"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Neck"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Neck"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Leg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Leg"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Leg"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_DualJawedQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_DualTentacledQuadrupedWithJowl.xml b/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_DualTentacledQuadrupedWithJowl.xml
deleted file mode 100644
index ea571a0606..0000000000
--- a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_DualTentacledQuadrupedWithJowl.xml	
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== DualTentacledQuadrupedWithJowl ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Neck"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Neck"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Neck"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Leg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Leg"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Leg"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_DualTentacledQuadrupedWithJowl"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_ExtraClawedQuadruped.xml b/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_ExtraClawedQuadruped.xml
deleted file mode 100644
index a0b2e878cb..0000000000
--- a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_ExtraClawedQuadruped.xml	
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== ExtraClawedQuadruped ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Neck"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Neck"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Neck"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="AA_FrontClaw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="AA_FrontClaw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="AA_FrontClaw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Leg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Leg"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Leg"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ExtraClawedQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Eye.xml b/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Eye.xml
deleted file mode 100644
index aa3ef0cd40..0000000000
--- a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Eye.xml	
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== Eye ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_EyeBody"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_EyeBody"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_EyeBody"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_EyeBody"]/corePart/parts/li[def="Head"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_EyeBody"]/corePart/parts/li[def="Head"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_EyeBody"]/corePart/parts/li[def="Head"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_EyeBody"]/corePart/parts/li[def="AA_JellyfishTentacle"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_EyeBody]/corePart/parts/li[def="AA_JellyfishTentacle"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_EyeBody"]/corePart/parts/li[def="AA_JellyfishTentacle"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_EyelessQuadruped.xml b/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_EyelessQuadruped.xml
deleted file mode 100644
index d552dc3b31..0000000000
--- a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_EyelessQuadruped.xml	
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== EyelessQuadruped ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/parts/li[def="Neck"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/parts/li[def="Neck"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/parts/li[def="Neck"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_EyelessQuadruped"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Hexapod.xml b/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Hexapod.xml
deleted file mode 100644
index 2904c02abd..0000000000
--- a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Hexapod.xml	
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== Hexapod ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Neck"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Neck"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Neck"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Leg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Leg"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Leg"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="middle left paw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="middle left paw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="middle left paw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="middle right paw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="middle right paw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="middle right paw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Hexapod"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Jellyfish.xml b/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Jellyfish.xml
deleted file mode 100644
index 407f15bf6a..0000000000
--- a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Jellyfish.xml	
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== Jellyfish ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_JellyfishBody"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_JellyfishBody"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_JellyfishBody"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_JellyfishBody"]/corePart/parts/li[def="Head"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_JellyfishBody"]/corePart/parts/li[def="Head"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_JellyfishBody"]/corePart/parts/li[def="Head"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_JellyfishBody"]/corePart/parts/li[def="AA_JellyfishTentacle"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_JellyfishBody]/corePart/parts/li[def="AA_JellyfishTentacle"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_JellyfishBody"]/corePart/parts/li[def="AA_JellyfishTentacle"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_NightCaller.xml b/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_NightCaller.xml
deleted file mode 100644
index d075328961..0000000000
--- a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_NightCaller.xml	
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== NightCaller ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/parts/li[def="Neck"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/parts/li[def="Neck"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/parts/li[def="Neck"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/parts/li[def="Tusk"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/parts/li[def="Tusk"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/parts/li[def="Tusk"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/parts/li[def="Leg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/parts/li[def="Leg"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/parts/li[def="Leg"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/parts/li[def="Leg"]/parts/li[def="Hoof"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/parts/li[def="Leg"]/parts/li[def="Hoof"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="FO_Nightcallerbody"]/corePart/parts/li[def="Leg"]/parts/li[def="Hoof"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_NightMule.xml b/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_NightMule.xml
deleted file mode 100644
index 4349fdf16c..0000000000
--- a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_NightMule.xml	
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== NightMule ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/parts/li[def="Neck"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/parts/li[def="Neck"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/parts/li[def="Neck"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Horn"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Horn"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Horn"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/parts/li[def="Leg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/parts/li[def="Leg"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/parts/li[def="Leg"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Hoof"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Hoof"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_NightMuleBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Hoof"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_NightRam.xml b/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_NightRam.xml
deleted file mode 100644
index 88af77aaf0..0000000000
--- a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_NightRam.xml	
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== NightRam ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/parts/li[def="Neck"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/parts/li[def="Neck"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/parts/li[def="Neck"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Horn"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Horn"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Horn"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/parts/li[def="Leg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/parts/li[def="Leg"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/parts/li[def="Leg"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Hoof"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Hoof"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_NightRamBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Hoof"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Plants.xml b/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Plants.xml
deleted file mode 100644
index 040a4ce6fb..0000000000
--- a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Plants.xml	
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== ManTrap or FlyTrap or Sentientplant ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_FlyTrap" or defName="AA_SentientPlant"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_FlyTrap" or defName="AA_SentientPlant"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_FlyTrap" or defName="AA_SentientPlant"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_FlyTrap" or defName="AA_SentientPlant"]/corePart/parts/li[def="Neck"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_FlyTrap" or defName="AA_SentientPlant"]/corePart/parts/li[def="Neck"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_FlyTrap" or defName="AA_SentientPlant"]/corePart/parts/li[def="Neck"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_FlyTrap" or defName="AA_SentientPlant"]/corePart/parts/li[def="Neck"]/parts/li[def="AA_SentientPlantHead"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_FlyTrap" or defName="AA_SentientPlant"]/corePart/parts/li[def="Neck"]/parts/li[def="AA_SentientPlantHead"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_FlyTrap" or defName="AA_SentientPlant"]/corePart/parts/li[def="Neck"]/parts/li[def="AA_SentientPlantHead"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_FlyTrap" or defName="AA_SentientPlant"]/corePart/parts/li[def="Neck"]/parts/li[def="AA_SentientPlantHead"]/parts/li[def="AA_SentientPlantMouth"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_FlyTrap" or defName="AA_SentientPlant"]/corePart/parts/li[def="Neck"]/parts/li[def="AA_SentientPlantHead"]/parts/li[def="AA_SentientPlantMouth"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_FlyTrap" or defName="AA_SentientPlant"]/corePart/parts/li[def="Neck"]/parts/li[def="AA_SentientPlantHead"]/parts/li[def="AA_SentientPlantMouth"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Raptor.xml b/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Raptor.xml
deleted file mode 100644
index f6294de145..0000000000
--- a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Raptor.xml	
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== Raptor ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/parts/li[def="Tail"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/parts/li[def="Tail"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/parts/li[def="Tail"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/parts/li[def="Neck"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/parts/li[def="Neck"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/parts/li[def="Neck"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/parts/li[def="Leg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/parts/li[def="Leg"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/parts/li[def="Leg"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_RaptorBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_ScorpionLike.xml b/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_ScorpionLike.xml
deleted file mode 100644
index d7561f0773..0000000000
--- a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_ScorpionLike.xml	
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== ScorpionLike ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/parts/li[def="AA_Thorax"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/parts/li[def="AA_Thorax"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/parts/li[def="AA_Thorax"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/parts/li[def="Pronotum"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/parts/li[def="Pronotum"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/parts/li[def="Pronotum"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/parts/li[def="AA_InsectMouth"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/parts/li[def="AA_InsectMouth"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/parts/li[def="AA_InsectMouth"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/parts/li[def="AA_InsectTail"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/parts/li[def="AA_InsectTail"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/parts/li[def="AA_InsectTail"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/parts/li[def="AA_InsectTail"]/parts/li[def="AA_InsectSting"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/parts/li[def="AA_InsectTail"]/parts/li[def="AA_InsectSting"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/parts/li[def="AA_InsectTail"]/parts/li[def="AA_InsectSting"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_ShadowCharger.xml b/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_ShadowCharger.xml
deleted file mode 100644
index fe544efe78..0000000000
--- a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_ShadowCharger.xml	
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== ShadowCharger ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/parts/li[def="Neck"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/parts/li[def="Neck"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/parts/li[def="Neck"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Horn"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Horn"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Horn"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/parts/li[def="Leg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/parts/li[def="Leg"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/parts/li[def="Leg"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Hoof"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Hoof"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="FO_ShadowChargerBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Hoof"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_SixEyedGoat.xml b/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_SixEyedGoat.xml
deleted file mode 100644
index 2af9e68dc2..0000000000
--- a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_SixEyedGoat.xml	
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== SixEyedGoat ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_SixEyedGoat"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_SixEyedGoat"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_SixEyedGoat"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_SixEyedGoat"]/corePart/parts/li[def="Neck"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_SixEyedGoat"]/corePart/parts/li[def="Neck"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_SixEyedGoat"]/corePart/parts/li[def="Neck"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_SixEyedGoat"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_SixEyedGoat"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_SixEyedGoat"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_SixEyedGoat"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_SixEyedGoat"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_SixEyedGoat"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_SixEyedGoat"]/corePart/parts/li[def="Leg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_SixEyedGoat"]/corePart/parts/li[def="Leg"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_SixEyedGoat"]/corePart/parts/li[def="Leg"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_SixEyedGoat"]/corePart/parts/li[def="Leg"]/parts/li[def="Hoof"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_SixEyedGoat"]/corePart/parts/li[def="Leg"]/parts/li[def="Hoof"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_SixEyedGoat"]/corePart/parts/li[def="Leg"]/parts/li[def="Hoof"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Slug.xml b/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Slug.xml
deleted file mode 100644
index 90666d2a87..0000000000
--- a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Slug.xml	
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== Slug ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Slug"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Slug"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Slug"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Slug"]/corePart/parts/li[def="Head"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Slug"]/corePart/parts/li[def="Head"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Slug"]/corePart/parts/li[def="Head"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Slurrypede.xml b/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Slurrypede.xml
deleted file mode 100644
index 9f3582b126..0000000000
--- a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Slurrypede.xml	
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== Slurrypede ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/parts/li[def="MechanicalCentipedeBodyFourthRing"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/parts/li[def="MechanicalCentipedeBodyFourthRing"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/parts/li[def="MechanicalCentipedeBodyFourthRing"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/parts/li[def="MechanicalCentipedeBodyFourthRing"]/parts/li[def="MechanicalCentipedeBodyFifthRing"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/parts/li[def="MechanicalCentipedeBodyFourthRing"]/parts/li[def="MechanicalCentipedeBodyFifthRing"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/parts/li[def="MechanicalCentipedeBodyFourthRing"]/parts/li[def="MechanicalCentipedeBodyFifthRing"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/parts/li[def="MechanicalCentipedeBodyFourthRing"]/parts/li[def="MechanicalCentipedeBodyFifthRing"]/parts/li[def="MechanicalCentipedeBodySixthRing"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/parts/li[def="MechanicalCentipedeBodyFourthRing"]/parts/li[def="MechanicalCentipedeBodyFifthRing"]/parts/li[def="MechanicalCentipedeBodySixthRing"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/parts/li[def="MechanicalCentipedeBodyFourthRing"]/parts/li[def="MechanicalCentipedeBodyFifthRing"]/parts/li[def="MechanicalCentipedeBodySixthRing"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Snail.xml b/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Snail.xml
deleted file mode 100644
index 002e1ced69..0000000000
--- a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Snail.xml	
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== Snail ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Snail"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Snail"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Snail"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Snail"]/corePart/parts/li[def="AA_Carapace"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Snail"]/corePart/parts/li[def="AA_Carapace"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Snail"]/corePart/parts/li[def="AA_Carapace"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_SnakeWithTwoLimbs.xml b/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_SnakeWithTwoLimbs.xml
deleted file mode 100644
index 25ff8a6923..0000000000
--- a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_SnakeWithTwoLimbs.xml	
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== SnakeWithTwoLimbs ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_SnakeWithTwoLimbs"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_SnakeWithTwoLimbs"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_SnakeWithTwoLimbs"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_SnakeWithTwoLimbs"]/corePart/parts/li[def="AA_LeftCreatureLimb" or def="AA_RightCreatureLimb"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_SnakeWithTwoLimbs"]/corePart/parts/li[def="AA_LeftCreatureLimb" or def="AA_RightCreatureLimb"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_SnakeWithTwoLimbs"]/corePart/parts/li[def="AA_LeftCreatureLimb" or def="AA_RightCreatureLimb"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_SnakeWithTwoLimbs"]/corePart/parts/li[def="AA_LeftCreatureLimb" or def="AA_RightCreatureLimb"]/parts/li[def="AA_LeftCreatureBlade" or def="AA_RightCreatureBlade"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_SnakeWithTwoLimbs"]/corePart/parts/li[def="AA_LeftCreatureLimb" or def="AA_RightCreatureLimb"]/parts/li[def="AA_LeftCreatureBlade" or def="AA_RightCreatureBlade"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_SnakeWithTwoLimbs"]/corePart/parts/li[def="AA_LeftCreatureLimb" or def="AA_RightCreatureLimb"]/parts/li[def="AA_LeftCreatureBlade" or def="AA_RightCreatureBlade"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_SnakeWithTwoLimbs"]/corePart/parts/li[def="Neck"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_SnakeWithTwoLimbs"]/corePart/parts/li[def="Neck"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_SnakeWithTwoLimbs"]/corePart/parts/li[def="Neck"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_SnakeWithTwoLimbs"]/corePart/parts/li[def="Neck"]/parts/li[def="SnakeHead"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_SnakeWithTwoLimbs"]/corePart/parts/li[def="Neck"]/parts/li[def="SnakeHead"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_SnakeWithTwoLimbs"]/corePart/parts/li[def="Neck"]/parts/li[def="SnakeHead"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_SnakeWithTwoLimbs"]/corePart/parts/li[def="Neck"]/parts/li[def="SnakeHead"]/parts/li[def="SnakeMouth"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_SnakeWithTwoLimbs"]/corePart/parts/li[def="Neck"]/parts/li[def="SnakeHead"]/parts/li[def="SnakeMouth"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_SnakeWithTwoLimbs"]/corePart/parts/li[def="Neck"]/parts/li[def="SnakeHead"]/parts/li[def="SnakeMouth"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Squid.xml b/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Squid.xml
deleted file mode 100644
index 8d18fb84b7..0000000000
--- a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Squid.xml	
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== Squid ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Squid"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Squid"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Squid"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Squid"]/corePart/parts/li[def="AA_ConicalShell"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Squid"]/corePart/parts/li[def="AA_ConicalShell"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Squid"]/corePart/parts/li[def="AA_ConicalShell"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<!-- ====== No-Shell Squid ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Squid_NoShell"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Squid_NoShell"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Squid_NoShell"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_TentacledEyelessQuadruped.xml b/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_TentacledEyelessQuadruped.xml
deleted file mode 100644
index ca847b6c64..0000000000
--- a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_TentacledEyelessQuadruped.xml	
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== TentacledEyelessQuadruped ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/parts/li[def="Neck"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/parts/li[def="Neck"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/parts/li[def="Neck"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/parts/li[def="Leg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/parts/li[def="Leg"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/parts/li[def="Leg"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_TentacledQuadrupedEyeless"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_TentacledSlug.xml b/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_TentacledSlug.xml
deleted file mode 100644
index 64814fd3b1..0000000000
--- a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_TentacledSlug.xml	
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== TentacledSlug ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_TentacledSlug"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_TentacledSlug"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_TentacledSlug"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_TentacledSlug"]/corePart/parts/li[def="AA_Carapace"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_TentacledSlug"]/corePart/parts/li[def="AA_Carapace"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_TentacledSlug"]/corePart/parts/li[def="AA_Carapace"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Wasp.xml b/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Wasp.xml
deleted file mode 100644
index 2cc5576154..0000000000
--- a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Wasp.xml	
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== Wasp ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[def="AA_Thorax"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[def="AA_Thorax"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[def="AA_Thorax"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[def="Pronotum"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[def="Pronotum"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[def="Pronotum"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/parts/li[def="AA_InsectMouth"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/parts/li[def="AA_InsectMouth"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/parts/li[def="AA_InsectMouth"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[def="AA_Abdomen"]/parts/li[def="AA_InsectSting"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[def="AA_Abdomen"]/parts/li[def="AA_InsectSting"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[def="AA_Abdomen"]/parts/li[def="AA_InsectSting"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[def="AA_SmallInsectLeg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[def="AA_SmallInsectLeg"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[def="AA_SmallInsectLeg"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[customLabel="left second leg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[customLabel="left second leg"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[customLabel="left second leg"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[customLabel="right second leg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[customLabel="right second leg"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_Wasp"]/corePart/parts/li[customLabel="right second leg"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_WingedQuadrupedAnimalWithPawsAndTail.xml b/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_WingedQuadrupedAnimalWithPawsAndTail.xml
deleted file mode 100644
index d50a411729..0000000000
--- a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_WingedQuadrupedAnimalWithPawsAndTail.xml	
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== WingedQuadrupedAnimalWithPawsAndTail ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Tail"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Tail"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Tail"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Neck"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Neck"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Neck"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Leg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Leg"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Leg"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="AA_ReptileWing"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="AA_ReptileWing"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="AA_ReptileWing"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_WingedQuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_WormWithArmor.xml b/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_WormWithArmor.xml
deleted file mode 100644
index d06db82b08..0000000000
--- a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_WormWithArmor.xml	
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== WormWithArmor ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_WormWithArmor"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_WormWithArmor"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_WormWithArmor"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_WormWithArmor"]/corePart/parts/li[def="AA_FirstWormSegment" or def="AA_SecondWormSegment" or def="AA_ThirdWormSegment" or def="AA_FourthWormSegment"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_WormWithArmor"]/corePart/parts/li[def="AA_FirstWormSegment" or def="AA_SecondWormSegment" or def="AA_ThirdWormSegment" or def="AA_FourthWormSegment"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_WormWithArmor"]/corePart/parts/li[def="AA_FirstWormSegment" or def="AA_SecondWormSegment" or def="AA_ThirdWormSegment" or def="AA_FourthWormSegment"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_WormWithArmor"]/corePart/parts/li[def="SnakeHead"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_WormWithArmor"]/corePart/parts/li[def="SnakeHead"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_WormWithArmor"]/corePart/parts/li[def="SnakeHead"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_WormWithArmor"]/corePart/parts/li[def="SnakeHead"]/parts/li[def="Jaw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_WormWithArmor"]/corePart/parts/li[def="SnakeHead"]/parts/li[def="Jaw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_WormWithArmor"]/corePart/parts/li[def="SnakeHead"]/parts/li[def="Jaw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_WormWithArmorAndTusks.xml b/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_WormWithArmorAndTusks.xml
deleted file mode 100644
index d6cb41a800..0000000000
--- a/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_WormWithArmorAndTusks.xml	
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== WormWithArmorAndTusks ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_WormWithArmorAndTusks"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_WormWithArmorAndTusks"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_WormWithArmorAndTusks"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_WormWithArmorAndTusks"]/corePart/parts/li[def="AA_FirstWormSegment" or def="AA_SecondWormSegment" or def="AA_ThirdWormSegment" or def="AA_FourthWormSegment"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_WormWithArmorAndTusks"]/corePart/parts/li[def="AA_FirstWormSegment" or def="AA_SecondWormSegment" or def="AA_ThirdWormSegment" or def="AA_FourthWormSegment"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_WormWithArmorAndTusks"]/corePart/parts/li[def="AA_FirstWormSegment" or def="AA_SecondWormSegment" or def="AA_ThirdWormSegment" or def="AA_FourthWormSegment"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_WormWithArmorAndTusks"]/corePart/parts/li[def="SnakeHead"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_WormWithArmorAndTusks"]/corePart/parts/li[def="SnakeHead"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_WormWithArmorAndTusks"]/corePart/parts/li[def="SnakeHead"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_WormWithArmorAndTusks"]/corePart/parts/li[def="SnakeHead"]/parts/li[def="Jaw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_WormWithArmorAndTusks"]/corePart/parts/li[def="SnakeHead"]/parts/li[def="Jaw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_WormWithArmorAndTusks"]/corePart/parts/li[def="SnakeHead"]/parts/li[def="Jaw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AA_WormWithArmorAndTusks"]/corePart/parts/li[def="SnakeHead"]/parts/li[def="Jaw"]/parts/li[def="Tusk"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_WormWithArmorAndTusks"]/corePart/parts/li[def="SnakeHead"]/parts/li[def="Jaw"]/parts/li[def="Tusk"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AA_WormWithArmorAndTusks"]/corePart/parts/li[def="SnakeHead"]/parts/li[def="Jaw"]/parts/li[def="Tusk"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/DamageDef/AlphaAnimals_CE_Patch_DamageDef.xml b/Patches/Alpha Animals/DamageDef/AlphaAnimals_CE_Patch_DamageDef.xml
deleted file mode 100644
index ed63bbe8ae..0000000000
--- a/Patches/Alpha Animals/DamageDef/AlphaAnimals_CE_Patch_DamageDef.xml	
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/DamageDef[defName="AA_AcidSpit" or defName="AA_SecondaryAcidBurn" or defName="AA_PermanentBurn"]</xpath>
-					<value>
-						<li Class="CombatExtended.DamageDefExtensionCE">
-							<harmOnlyOutsideLayers>true</harmOnlyOutsideLayers>
-							<isAmbientDamage>true</isAmbientDamage>
-						</li>
-					</value>
-				</li>
-
-				<!-- Buffing some Hediffs -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[defName="AA_ToxicSting" or
-						defName="AA_InfectedClaws" or
-						defName="AA_ToxicBite" or
-						defName="AA_ToxicBolt"]/additionalHediffs/li[hediff="AA_ToxicBuildup"]/severityPerDamageDealt </xpath>
-					<value>
-						<severityPerDamageDealt>0.01</severityPerDamageDealt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[defName="AA_VeryToxicSting"]/additionalHediffs/li[hediff="AA_ToxicBuildup"]/severityPerDamageDealt</xpath>
-					<value>
-						<severityPerDamageDealt>0.03</severityPerDamageDealt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[defName="AA_ParalysingBite"]/additionalHediffs/li[hediff="AA_Paralysis"]/severityPerDamageDealt</xpath>
-					<value>
-						<severityPerDamageDealt>0.02</severityPerDamageDealt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[defName="AA_Electric"]/additionalHediffs/li[hediff="AA_Electric"]/severityPerDamageDealt</xpath>
-					<value>
-						<severityPerDamageDealt>0.025</severityPerDamageDealt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[defName="AA_SwarmlingClaws"]/additionalHediffs/li[hediff="AA_SwarmlingImplantation"]/severityPerDamageDealt</xpath>
-					<value>
-						<severityPerDamageDealt>0.0003</severityPerDamageDealt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Misc/AA_Resource_CEStuff.xml b/Patches/Alpha Animals/ThingDefs_Misc/AA_Resource_CEStuff.xml
deleted file mode 100644
index cc45df72d7..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Misc/AA_Resource_CEStuff.xml	
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="AA_MeatMealBase"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_CactipineQuill"]/statBases</xpath>
-					<value>
-						<Bulk>0.1</Bulk>
-					</value>
-				</li>
-
-				<!-- ======== Red Wood ======== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GU_RedWood"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.99</cooldownTime>
-								<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="GU_RedWood"]/equippedStatOffsets</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GU_RedWood"]</xpath>
-						<value>
-							<equippedStatOffsets>
-								<MeleeCritChance>0.2</MeleeCritChance>
-								<MeleeParryChance>1</MeleeParryChance>
-								<MeleeDodgeChance>0.13</MeleeDodgeChance>
-							</equippedStatOffsets>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GU_RedWood"]/equippedStatOffsets</xpath>
-						<value>
-							<equippedStatOffsets>
-								<MeleeCritChance>0.2</MeleeCritChance>
-								<MeleeParryChance>1</MeleeParryChance>
-								<MeleeDodgeChance>0.13</MeleeDodgeChance>
-							</equippedStatOffsets>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="GU_RedWood"]/statBases/Bulk</xpath>
-					<nomatch Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GU_RedWood"]/statBases</xpath>
-						<value>
-							<statBases>
-								<Bulk>0.07</Bulk>
-								<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
-								<StuffPower_Armor_Sharp>0.1</StuffPower_Armor_Sharp>
-								<StuffPower_Armor_Blunt>0.2</StuffPower_Armor_Blunt>
-								<StuffPower_Armor_Heat>0.025</StuffPower_Armor_Heat>
-								<MarketValue>1.2</MarketValue>
-								<MaxHitPoints>150</MaxHitPoints>
-								<Mass>0.4</Mass>
-								<Flammability>0.6</Flammability>
-								<DeteriorationRate>1</DeteriorationRate>
-								<SharpDamageMultiplier>0.7</SharpDamageMultiplier>
-								<BluntDamageMultiplier>0.5</BluntDamageMultiplier>
-							</statBases>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GU_RedWood"]/statBases</xpath>
-						<value>
-							<statBases>
-								<Bulk>0.07</Bulk>
-								<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
-								<StuffPower_Armor_Sharp>0.1</StuffPower_Armor_Sharp>
-								<StuffPower_Armor_Blunt>0.2</StuffPower_Armor_Blunt>
-								<StuffPower_Armor_Heat>0.025</StuffPower_Armor_Heat>
-								<MarketValue>1.2</MarketValue>
-								<MaxHitPoints>150</MaxHitPoints>
-								<Mass>0.4</Mass>
-								<Flammability>0.6</Flammability>
-								<DeteriorationRate>1</DeteriorationRate>
-								<SharpDamageMultiplier>0.7</SharpDamageMultiplier>
-								<BluntDamageMultiplier>0.5</BluntDamageMultiplier>
-							</statBases>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="GU_RedWood"]/stuffProps/statFactors/Mass</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GU_RedWood"]/stuffProps/statFactors</xpath>
-						<value>
-							<Mass>0.3</Mass>
-							<MeleePenetrationFactor>0.3</MeleePenetrationFactor>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GU_RedWood"]/stuffProps/Mass</xpath>
-						<value>
-							<Mass>0.3</Mass>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GU_RedWood"]</xpath>
-					<value>
-						<li Class="CombatExtended.StuffToughnessMultiplierExtensionCE">
-							<toughnessMultiplier>5</toughnessMultiplier>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Gas.xml b/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Gas.xml
deleted file mode 100644
index 61d4e841a3..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Gas.xml	
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Adding CE's gas attributes to certain creatures, except OcularGas since it has a particular AA effect -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_RedGas" or
-						defName="AA_SandPuff" or
-						defName="AA_Filth_Slime" or
-						defName="AA_Filth_RedSlime" or
-						defName="AA_SmokeInk"
-						] </xpath>
-					<value>
-						<thingClass>CombatExtended.Smoke</thingClass>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_Projectiles.xml b/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_Projectiles.xml
deleted file mode 100644
index 912850a3e1..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_Projectiles.xml	
+++ /dev/null
@@ -1,513 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ============== Changing Projectile's thingClass to CE ones ================ -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="AA_FrostWeb" or
-						defName="AA_FireWeb" or
-						defName="AA_AcidicWeb" or
-						defName="AA_ElectricBolt" or
-						defName="AA_FrostBolt"
-						]/thingClass </xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="AA_AcidicWeb" or
-						defName="AA_Bullet_Barb" or
-						defName="AA_Bullet_VenomBarb" or
-						defName="AA_FireWeb" or
-						defName="AA_FrostWeb" or
-						defName="AA_Plasma" or
-						defName="AA_PoisonBolt" or
-						defName="AA_Quill" or
-						defName="AA_RedPoisonBolt" or
-						defName="AA_Web" or
-						defName="AA_FireSpit" or
-						defName="AA_DarkBolt" or
-						defName="AA_AcidBolt" or
-						defName="AA_ElectricBolt" or
-						defName="AA_WindBolt" or
-						defName="AA_FrostBolt"
-						] </xpath>
-					<value>
-						<thingClass>CombatExtended.BulletCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="AA_Bullet_Rock" or
-						defName="AA_ToxicInk" or
-						defName="AA_IncendiaryMote" or
-						defName="AA_FrostBolt"
-						]/thingClass </xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<!-- ============== Adding 'Standard' AimingAccuracy node to creatures' that use ranged attack statBases. =============== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="AA_Barbslinger" or
-						defName="AA_Blizzarisk" or
-						defName="AA_BlizzariskClutchMother" or
-						defName="AA_Cinderlisk" or
-						defName="AA_CrystallineCaracal" or
-						defName="AA_Dunealisk" or
-						defName="AA_DunealiskClutchMother" or
-						defName="AA_Darkbeast" or
-						defName="AA_Feralisk" or
-						defName="AA_FeraliskClutchMother" or
-						defName="AA_GreenGoo" or
-						defName="AA_InfectedAerofleet" or
-						defName="AA_Junglelisk" or
-						defName="AA_Mantrap" or
-						defName="AA_NightAve" or
-						defName="AA_Nightling" or
-						defName="AA_OcularJelly" or
-						defName="AA_Plasmorph" or
-						defName="AA_RedGoo" or
-						defName="AA_RedSpore" or
-						defName="AA_TetraSlug" or
-						defName="AA_Thermadon" or
-						defName="AA_Erin" or
-						defName="AA_Thunderbeast" or
-						defName="AA_WindBeast" or
-						defName="AA_FrostLynx"
-						]/statBases </xpath>
-					<value>
-						<AimingAccuracy>0.7</AimingAccuracy>
-					</value>
-				</li>
-
-				<!-- Different accuracy for spammy stuff -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Needlepost" or defName="AA_Needleroll"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.3</AimingAccuracy>
-					</value>
-				</li>
-
-				<!-- Different accuracy for Gallatross since his Projectile isn't directly under his control (it's just a random boulder he picks off the ground with his psionic abilities) -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Gallatross"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.6</AimingAccuracy>
-					</value>
-				</li>
-
-				<!-- Dunelisk web, does burn damage but does not set the target on fire -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="BaseBulletCE">
-							<defName>AA_BurnWeb</defName>
-							<label>burning web</label>
-							<thingClass>CombatExtended.BulletCE</thingClass>
-							<graphicData>
-								<texPath>Things/Projectiles/AA_Web</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>2</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<flyOverhead>false</flyOverhead>
-								<damageDef>Burn</damageDef>
-								<damageAmountBase>5</damageAmountBase>
-								<speed>15</speed>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<!-- Adding secondary damage with CE's Procedure instead of AA's AnimalProjectile -->
-								<secondaryDamage>
-									<li>
-										<def>Stun</def>
-										<amount>8</amount>
-										<chance>0.5</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBulletCE">
-							<defName>AA_AcidicVomit_CE</defName>
-							<label>acidic vomit</label>
-							<thingClass>CombatExtended.BulletCE</thingClass>
-							<graphicData>
-								<texPath>Things/Projectiles/Proj_LiquidStream</texPath>
-								<graphicClass>Graphic_Flicker</graphicClass>
-								<shaderType>MoteGlow</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>AA_AcidSpit</damageDef>
-								<flyOverhead>false</flyOverhead>
-								<damageAmountBase>15</damageAmountBase>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<speed>18</speed>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- =============== Now defining Projectiles in CE Procedure ============= -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Bullet_Barb"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>AA_ToxicBolt</damageDef>
-							<damageAmountBase>7</damageAmountBase>
-							<speed>31</speed>
-							<armorPenetrationSharp>1.5</armorPenetrationSharp>
-							<armorPenetrationBlunt>1.440</armorPenetrationBlunt>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_PoisonBolt"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>AA_ToxicBolt</damageDef>
-							<damageAmountBase>10</damageAmountBase>
-							<speed>27</speed>
-							<armorPenetrationSharp>2.5</armorPenetrationSharp>
-							<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_RedPoisonBolt"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>AA_ToxicBolt</damageDef>
-							<damageAmountBase>6</damageAmountBase>
-							<speed>27</speed>
-							<armorPenetrationSharp>1.5</armorPenetrationSharp>
-							<armorPenetrationBlunt>1.660</armorPenetrationBlunt>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Plasma"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>Flame</damageDef>
-							<damageAmountBase>25</damageAmountBase>
-							<speed>30</speed>
-							<armorPenetrationSharp>16</armorPenetrationSharp>
-							<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Quill"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>AA_ToxicBolt</damageDef>
-							<damageAmountBase>15</damageAmountBase>
-							<speed>19</speed>
-							<armorPenetrationSharp>1.5</armorPenetrationSharp>
-							<armorPenetrationBlunt>3</armorPenetrationBlunt>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Bullet_VenomBarb"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>AA_ToxicBolt</damageDef>
-							<damageAmountBase>7</damageAmountBase>
-							<speed>27</speed>
-							<armorPenetrationSharp>1.5</armorPenetrationSharp>
-							<armorPenetrationBlunt>1.440</armorPenetrationBlunt>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Bullet_Rock"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>1.5</explosionRadius>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<damageDef>Bomb</damageDef>
-							<damageAmountBase>40</damageAmountBase>
-							<soundExplode>MortarBomb_Explode</soundExplode>
-							<speed>14</speed>
-							<armorPenetrationSharp>5</armorPenetrationSharp>
-							<armorPenetrationBlunt>25</armorPenetrationBlunt>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Bullet_Rock"]</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_Fragments">
-								<fragments>
-									<Fragment_Small>16</Fragment_Small>
-									<Fragment_Large>3</Fragment_Large>
-								</fragments>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_FrostWeb"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>Frostbite</damageDef>
-							<damageAmountBase>5</damageAmountBase>
-							<speed>15</speed>
-							<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							<!-- Adding secondary damage with CE's Procedure instead of AA's AnimalProjectile -->
-							<secondaryDamage>
-								<li>
-									<def>Stun</def>
-									<amount>8</amount>
-									<chance>0.5</chance>
-								</li>
-							</secondaryDamage>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_FireWeb"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>Flame</damageDef>
-							<damageAmountBase>3</damageAmountBase>
-							<speed>15</speed>
-							<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							<!-- Adding secondary damage with CE's Procedure instead of AA's AnimalProjectile -->
-							<secondaryDamage>
-								<li>
-									<def>Stun</def>
-									<amount>8</amount>
-									<chance>0.5</chance>
-								</li>
-							</secondaryDamage>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_AcidicWeb"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>AA_AcidSpit</damageDef>
-							<damageAmountBase>5</damageAmountBase>
-							<speed>15</speed>
-							<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							<!-- Adding secondary damage with CE's Procedure instead of AA's AnimalProjectile -->
-							<secondaryDamage>
-								<li>
-									<def>Stun</def>
-									<amount>8</amount>
-									<chance>0.5</chance>
-								</li>
-							</secondaryDamage>
-						</projectile>
-					</value>
-				</li>
-
-				<!-- ======== Note: AA_ExplodingWeb wasn't used in any Race, so it wasn't included. If it gets added, just add a secondaryDamage to the corresponding projectile, with the Bomb damageDef ======== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Web"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>Stun</damageDef>
-							<damageAmountBase>15</damageAmountBase>
-							<speed>15</speed>
-							<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_IncendiaryMote"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<speed>20</speed>
-							<damageDef>Flame</damageDef>
-							<damageAmountBase>8</damageAmountBase>
-							<explosionRadius>1.1</explosionRadius>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
-							<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
-							<ai_IsIncendiary>true</ai_IsIncendiary>
-							<soundExplode>Interact_Ignite</soundExplode>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_ToxicInk"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<speed>25</speed>
-							<damageDef>AA_ToxicBolt</damageDef>
-							<damageAmountBase>40</damageAmountBase>
-							<explosionRadius>3</explosionRadius>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-							<soundExplode>MortarBomb_Explode</soundExplode>
-							<soundAmbient>MortarRound_Ambient</soundAmbient>
-							<postExplosionSpawnThingDef>AA_SmokeInk</postExplosionSpawnThingDef>
-							<postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
-							<postExplosionSpawnChance>1</postExplosionSpawnChance>
-							<armorPenetrationSharp>12</armorPenetrationSharp>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_FireSpit"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>Flame</damageDef>
-							<damageAmountBase>4</damageAmountBase>
-							<speed>15</speed>
-							<ai_IsIncendiary>true</ai_IsIncendiary>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_AcidBolt"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>AA_AcidSpit</damageDef>
-							<damageAmountBase>5</damageAmountBase>
-							<speed>36</speed>
-							<armorPenetrationSharp>7</armorPenetrationSharp>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_DarkBolt"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>Flame</damageDef>
-							<damageAmountBase>10</damageAmountBase>
-							<speed>36</speed>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_ElectricBolt"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>AA_Electric</damageDef>
-							<damageAmountBase>12</damageAmountBase>
-							<speed>50</speed>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_WindBolt"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>Blunt</damageDef>
-							<damageAmountBase>18</damageAmountBase>
-							<speed>35</speed>
-						</projectile>
-					</value>
-				</li>
-
-				<!-- Windbolt uses an unsupported graphics class. -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_WindBolt"]/graphicData</xpath>
-					<value>
-						<graphicData>
-							<texPath>Things/Pawn/Animal/AA_ArcticLion/AA_ArcticLion_Invisible</texPath>
-							<graphicClass>Graphic_Single</graphicClass>
-						</graphicData>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_FrostBolt"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionDelay>1</explosionDelay>
-							<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
-							<explosionRadius>2.9</explosionRadius>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<damageDef>AA_FrostBomb</damageDef>
-							<damageAmountBase>14</damageAmountBase>
-							<postExplosionSpawnThingDef>AA_FrostPuff</postExplosionSpawnThingDef>
-							<postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
-							<postExplosionSpawnChance>1</postExplosionSpawnChance>
-							<speed>28</speed>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="BaseBulletCE">
-							<defName>AA_FlameBreathAnimated_CE</defName>
-							<label>flame breath</label>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<graphicData>
-								<texPath>Things/Projectiles/AA_FieryProjectile</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>MoteGlow</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<flyOverhead>false</flyOverhead>
-								<damageDef>Flame</damageDef>
-								<damageAmountBase>15</damageAmountBase>
-								<explosionRadius>2.5</explosionRadius>
-								<suppressionFactor>3.0</suppressionFactor>
-								<dangerFactor>2.0</dangerFactor>
-								<speed>40</speed>
-								<ai_IsIncendiary>true</ai_IsIncendiary>
-								<soundExplode>Interact_Ignite</soundExplode>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_Resources_Leathers.xml b/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_Resources_Leathers.xml
deleted file mode 100644
index 2ff83791a5..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_Resources_Leathers.xml	
+++ /dev/null
@@ -1,338 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Remove GallatrossHorn as a weapon -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="AA_GallatrossHorn"]/tools</xpath>
-				</li>
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="AA_GallatrossHorn"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>ResourceBase</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_GallatrossHorn"]/description</xpath>
-					<value>
-						<description>A single horn of the mighty Gallatross. Proof that you're a warrior worthy of the title of Aberration Killer. Traders and collectors might pay a high price for this.</description>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_GallatrossHorn"]/statBases/MarketValue</xpath>
-					<value>
-						<MarketValue>1800</MarketValue>
-					</value>
-				</li>
-
-				<!-- SkySteel -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_SkySteel"]/statBases</xpath>
-					<value>
-						<Bulk>0.025</Bulk>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_SkySteel"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>0.9</Mass>
-						<MeleePenetrationFactor>1.10</MeleePenetrationFactor>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="AA_SkySteel"]/statBases/SharpDamageMultiplier</xpath>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_SkySteel"]/stuffProps/categories</xpath>
-					<value>
-						<li>Metallic_Weapon</li>
-						<li>Steeled</li>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_SkySteel"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1.35</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_SkySteel"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>2.0</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_SkySteel"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>-0.05</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<!-- Nehemoth leather -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Leather_Behemoth"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.5</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Leather_Behemoth"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.3</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!--aerofleet stuff and plant leather -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Leather_Aerofleet"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.03</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Leather_Aerofleet"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.032</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Cactus"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.05</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Leather_Cactus"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.04</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- Lion Leather -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_ArcticLion_Leather" or defName="AA_SandLion_Leather"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.1</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_ArcticLion_Leather" or defName="AA_SandLion_Leather"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.08</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- Night Leather -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Night"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.01</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Leather_Night"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.08</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- Chitin stuff-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Chitin"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.15</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_BlackChitin"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.5</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_BlackChitin"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.16</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Leather_Chitin"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.08</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_RaptorPlates" or defName="Leather_IronChitin"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.36</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Leather_RaptorPlates" or defName="Leather_IronChitin"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.09</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- Gallatross Leather-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Gallatross"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.9</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Gallatross"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.125</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!--Chameleon Yak -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_ChameleonYakWoolDesert" or defName="AA_ChameleonYakWoolTemperate"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.06</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_ChameleonYakWoolDesert" or defName="AA_ChameleonYakWoolTemperate"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.05</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_ChameleonYakWoolJungle"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.12</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_ChameleonYakWoolJungle"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.08</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_ChameleonYakWoolWinter"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.04</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_ChameleonYakWoolWinter"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.05</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- CinderSilk -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_CinderSilk"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.2</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_CinderSilk"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.05</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_CinderSilk"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.02</StuffPower_Armor_Heat>
-					</value>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_CinderSilk"]/stuffProps/categories</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_CinderSilk"]/stuffProps</xpath>
-						<value>
-							<categories>
-								<li>SoftArmor</li>
-							</categories>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_CinderSilk"]/stuffProps/categories</xpath>
-						<value>
-							<li>SoftArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<!-- MothSilk -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_MothSilk"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.32</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_MothSilk"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.09</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_MothSilk"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.015</StuffPower_Armor_Heat>
-					</value>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_MothSilk"]/stuffProps/categories</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_MothSilk"]/stuffProps</xpath>
-						<value>
-							<categories>
-								<li>SoftArmor</li>
-							</categories>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_MothSilk"]/stuffProps/categories</xpath>
-						<value>
-							<li>SoftArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<!-- Wools -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_GreyCoatedMouflonWool" or defName="AA_GiantCrownedSilkieSilk"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.01</StuffPower_Armor_Sharp>
-						<StuffPower_Armor_Blunt>0.045</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_NightWool"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.04</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_NightWool"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.05</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_NightWool"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.06</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_VerbShootCE.xml b/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_VerbShootCE.xml
deleted file mode 100644
index 5d99115423..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_VerbShootCE.xml	
+++ /dev/null
@@ -1,823 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Syntax
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName=""]/verbs</xpath>
-							<value>
-								<verbs>
-									<li Class="CombatExtended.VerbPropertiesCE">
-										<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-										...
-									</li>
-								</verbs>
-							</value>
-					</li>
-				-->
-
-				<!-- Black Hive Insects -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_BlackSpelopede"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AA_PoisonBolt</defaultProjectile>
-								<warmupTime>2.4</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>2</minRange>
-								<range>20</range>
-								<soundCast>AA_PoisonBolt</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>venomous spit</label>
-								<commonality>0.8</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_BlackSpider"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AA_PoisonBolt</defaultProjectile>
-								<warmupTime>1.6</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>1.9</minRange>
-								<range>32</range>
-								<soundCast>AA_PoisonBolt</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>venomous spit</label>
-								<commonality>0.8</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Barbslinger -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Barbslinger"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AA_Bullet_Barb</defaultProjectile>
-								<warmupTime>2</warmupTime>
-								<burstShotCount>3</burstShotCount>
-								<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-								<minRange>2</minRange>
-								<range>18</range>
-								<soundCast>AA_DartSound</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>barbed quills</label>
-								<commonality>0.8</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Animalisk -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Animalisk"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AA_Web</defaultProjectile>
-								<warmupTime>2</warmupTime>
-								<burstShotCount>3</burstShotCount>
-								<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-								<minRange>1</minRange>
-								<range>16</range>
-								<soundCast>AA_Throw</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>web</label>
-								<commonality>0.8</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Blizzarisk and Blizzarisk mom -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Blizzarisk"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AA_FrostWeb</defaultProjectile>
-								<warmupTime>2</warmupTime>
-								<burstShotCount>3</burstShotCount>
-								<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-								<minRange>1</minRange>
-								<range>15</range>
-								<soundCast>AA_Throw</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>frost web</label>
-								<commonality>0.8</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_BlizzariskClutchMother"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AA_FrostWeb</defaultProjectile>
-								<warmupTime>2</warmupTime>
-								<burstShotCount>3</burstShotCount>
-								<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-								<minRange>1</minRange>
-								<range>20</range>
-								<soundCast>AA_Throw</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>frost web</label>
-								<commonality>0.8</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Cinderlisk"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AA_FireWeb</defaultProjectile>
-								<warmupTime>2</warmupTime>
-								<burstShotCount>2</burstShotCount>
-								<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-								<minRange>2</minRange>
-								<range>16</range>
-								<soundCast>AA_Throw</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>fire web</label>
-								<commonality>0.8</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Dunealisk and Dunemom -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Dunealisk"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AA_BurnWeb</defaultProjectile>
-								<warmupTime>2</warmupTime>
-								<burstShotCount>3</burstShotCount>
-								<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-								<minRange>2</minRange>
-								<range>15</range>
-								<soundCast>AA_Throw</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>fire web</label>
-								<commonality>0.8</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_DunealiskClutchMother"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AA_BurnWeb</defaultProjectile>
-								<warmupTime>2</warmupTime>
-								<burstShotCount>3</burstShotCount>
-								<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-								<minRange>2</minRange>
-								<range>20</range>
-								<soundCast>AA_Throw</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>fire web</label>
-								<commonality>0.8</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Feralisk and Fera-san -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Feralisk"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AA_Web</defaultProjectile>
-								<warmupTime>2</warmupTime>
-								<burstShotCount>3</burstShotCount>
-								<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-								<minRange>1</minRange>
-								<range>15</range>
-								<soundCast>AA_Throw</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>web</label>
-								<commonality>0.8</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_FeraliskClutchMother"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AA_Web</defaultProjectile>
-								<warmupTime>2</warmupTime>
-								<burstShotCount>3</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>1</minRange>
-								<range>20</range>
-								<soundCast>AA_Throw</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>web</label>
-								<commonality>0.8</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Gallatross -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Gallatross"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AA_Bullet_Rock</defaultProjectile>
-								<warmupTime>2.5</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>1</minRange>
-								<range>30</range>
-								<soundCast>AA_RockThrow</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-								<commonality>1</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Gallatross Mounribound-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_GallatrossMoribund"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AA_Bullet_Rock</defaultProjectile>
-								<warmupTime>2.5</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>1</minRange>
-								<range>30</range>
-								<soundCast>AA_RockThrow</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-								<commonality>1</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Green Goo -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_GreenGoo"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AA_PoisonBolt</defaultProjectile>
-								<warmupTime>1.5</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>2</minRange>
-								<range>20</range>
-								<soundCast>AA_PoisonBolt</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>venomous spit</label>
-								<commonality>0.6</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Infected Aerofleet -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_InfectedAerofleet"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AA_RedPoisonBolt</defaultProjectile>
-								<warmupTime>1.5</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>2</minRange>
-								<range>15</range>
-								<soundCast>AA_PoisonBolt</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>venomous spit</label>
-								<commonality>0.6</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Junglelisk -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Junglelisk"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AA_AcidicWeb</defaultProjectile>
-								<warmupTime>2</warmupTime>
-								<burstShotCount>2</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>1</minRange>
-								<range>16</range>
-								<soundCast>AA_Throw</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>acidic web</label>
-								<commonality>0.8</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Mantrap -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Mantrap"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AA_AcidBolt</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>2</minRange>
-								<range>14</range>
-								<soundCast>AA_PoisonBolt</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>acidic spit</label>
-								<commonality>0.8</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- NeedlePost -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Needlepost"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AA_Bullet_VenomBarb</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>2</minRange>
-								<range>18</range>
-								<soundCast>AA_DartSound</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>venomous barb</label>
-								<commonality>0.99</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Needleroll -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Needleroll"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AA_Bullet_VenomBarb</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<burstShotCount>3</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>2</minRange>
-								<range>14</range>
-								<soundCast>AA_DartSound</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>venomous barb</label>
-								<commonality>0.99</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- NightAve -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_NightAve"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AA_Quill</defaultProjectile>
-								<warmupTime>1</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>2</minRange>
-								<range>12</range>
-								<soundCast>AA_DartSound</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>barbed quills</label>
-								<commonality>0.6</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Nightling -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Nightling"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AA_Quill</defaultProjectile>
-								<warmupTime>2</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>2</minRange>
-								<range>18</range>
-								<soundCast>AA_DartSound</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>barbed quills</label>
-								<commonality>0.8</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Glassy Cat -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_CrystallineCaracal"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AA_FireSpit</defaultProjectile>
-								<warmupTime>3</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<minRange>1.0</minRange>
-								<range>15</range>
-								<soundCast>AA_LaserBullet</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>laser</label>
-								<commonality>0.8</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- OcularJelly -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_OcularJelly"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AA_RedPoisonBolt</defaultProjectile>
-								<warmupTime>1.5</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>2</minRange>
-								<range>20</range>
-								<soundCast>AA_PoisonBolt</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>venomous spit</label>
-								<commonality>0.6</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- RedGoo -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_RedGoo"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AA_RedPoisonBolt</defaultProjectile>
-								<warmupTime>1.5</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>2</minRange>
-								<range>20</range>
-								<soundCast>AA_PoisonBolt</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>venomous spit</label>
-								<commonality>0.6</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Plasmorph -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Plasmorph"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AA_FireSpit</defaultProjectile>
-								<warmupTime>2.5</warmupTime>
-								<burstShotCount>4</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>2</minRange>
-								<range>11</range>
-								<soundCast>AA_FireSpit</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>fire spit</label>
-								<commonality>0.9</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- RedSpore -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_RedSpore"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AA_RedPoisonBolt</defaultProjectile>
-								<warmupTime>1.5</warmupTime>
-								<burstShotCount>4</burstShotCount>
-								<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-								<minRange>2</minRange>
-								<range>30</range>
-								<soundCast>AA_PoisonBolt</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>venomous spit</label>
-								<commonality>0.9</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- TetraSlug -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_TetraSlug"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AA_Plasma</defaultProjectile>
-								<warmupTime>3.6</warmupTime>
-								<burstShotCount>4</burstShotCount>
-								<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-								<minRange>2</minRange>
-								<range>20</range>
-								<soundCast>AA_Plasma</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>quad tesla cannon</label>
-								<commonality>1</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Thermadon -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Thermadon"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AA_IncendiaryMote</defaultProjectile>
-								<warmupTime>2</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>2</minRange>
-								<range>25</range>
-								<soundCast>AA_PoisonBolt</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>thermal detonating spit</label>
-								<commonality>0.9</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Dark Beast -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Darkbeast"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AA_DarkBolt</defaultProjectile>
-								<warmupTime>2.5</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<minRange>3</minRange>
-								<range>20</range>
-								<soundCast>AA_ElectricBolt</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>dark bolt</label>
-								<commonality>0.8</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Erin -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Erin"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AA_AcidicVomit_CE</defaultProjectile>
-								<warmupTime>2.6</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<minRange>1</minRange>
-								<range>8</range>
-								<soundCast>AA_PoisonBolt</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>acidic vomit</label>
-								<commonality>0.8</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Thunderbeast -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Thunderbeast"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AA_ElectricBolt</defaultProjectile>
-								<warmupTime>2.6</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<range>18</range>
-								<soundCast>AA_ElectricBolt</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>electric bolt</label>
-								<commonality>0.8</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Windbeast -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_WindBeast"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AA_WindBolt</defaultProjectile>
-								<warmupTime>2.6</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<range>26</range>
-								<soundCast>AA_WindBolt</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>wind blast</label>
-								<commonality>0.8</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- FrostLynx -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_FrostLynx"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AA_FrostBolt</defaultProjectile>
-								<warmupTime>2.6</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<range>26</range>
-								<soundCast>AA_FrostBolt</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>frost bolt</label>
-								<commonality>0.8</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Behemoth -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Behemoth"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AA_FlameBreathAnimated_CE</defaultProjectile>
-								<warmupTime>2</warmupTime>
-								<range>31</range>
-								<minRange>2</minRange>
-								<soundCast>FO_FlameBreathSound</soundCast>
-								<muzzleFlashScale>2</muzzleFlashScale>
-								<label>flame breath</label>
-								<commonality>1</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_VerbShootCE_Ideology.xml b/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_VerbShootCE_Ideology.xml
deleted file mode 100644
index 865a6d1c7e..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_VerbShootCE_Ideology.xml	
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Ideology</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<!-- Unblinking Eye -->
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_UnblinkingEye"]/verbs</xpath>
-						<value>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>AA_AcidicVomit_CE</defaultProjectile>
-									<warmupTime>1.6</warmupTime>
-									<burstShotCount>1</burstShotCount>
-									<minRange>2</minRange>
-									<range>40</range>
-									<label>melting gaze</label>
-									<muzzleFlashScale>0</muzzleFlashScale>
-									<commonality>1</commonality>
-								</li>
-							</verbs>
-						</value>
-					</li>
-
-					<!-- Spitter Dryad -->
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_Dryad_Spitter"]/verbs</xpath>
-						<value>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>AA_PoisonBolt</defaultProjectile>
-									<warmupTime>1.5</warmupTime>
-									<burstShotCount>1</burstShotCount>
-									<minRange>2</minRange>
-									<range>44</range>
-									<soundCast>AA_PoisonBolt</soundCast>
-									<muzzleFlashScale>0</muzzleFlashScale>
-									<label>venomous spit</label>
-									<commonality>.8</commonality>
-								</li>
-							</verbs>
-						</value>
-					</li>
-
-					<!-- Ocular Nightling -->
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_OcularNightling"]/verbs</xpath>
-						<value>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>AA_Quill</defaultProjectile>
-									<warmupTime>2</warmupTime>
-									<burstShotCount>1</burstShotCount>
-									<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-									<minRange>2</minRange>
-									<range>18</range>
-									<soundCast>AA_DartSound</soundCast>
-									<muzzleFlashScale>0</muzzleFlashScale>
-									<commonality>0.8</commonality>
-								</li>
-							</verbs>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Misc/Alpha_Hediffs.xml b/Patches/Alpha Animals/ThingDefs_Misc/Alpha_Hediffs.xml
deleted file mode 100644
index e976e77275..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Misc/Alpha_Hediffs.xml	
+++ /dev/null
@@ -1,443 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Alpha Animals</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="AA_BurrowingUnderSand"]/stages/li/statOffsets</xpath>
-							<value>
-								<statOffsets>
-									<ArmorRating_Sharp>3</ArmorRating_Sharp>
-									<ArmorRating_Blunt>4.5</ArmorRating_Blunt>
-								</statOffsets>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="AA_AnoleGrown"]/stages/li/statOffsets</xpath>
-							<value>
-								<statOffsets>
-									<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
-									<ArmorRating_Blunt>1.0</ArmorRating_Blunt>
-								</statOffsets>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="AA_AnoleGrown"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools/li</xpath>
-							<value>
-								<li Class="CombatExtended.ToolCE">
-									<label>claws</label>
-									<capacities>
-										<li>Scratch</li>
-									</capacities>
-									<power>22</power>
-									<cooldownTime>1.33</cooldownTime>
-									<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
-									<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
-									<armorPenetrationSharp>0.75</armorPenetrationSharp>
-									<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								</li>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="AA_EatenACorpse"]/stages/li/statOffsets</xpath>
-							<value>
-								<statOffsets>
-									<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
-									<ArmorRating_Blunt>1.25</ArmorRating_Blunt>
-								</statOffsets>
-							</value>
-						</li>
-
-						<!-- ==== AA_Gigantelope Weights ==== -->
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/HediffDef[defName="AA_CarryWeight1"]/stages/li/statOffsets</xpath>
-							<value>
-								<CarryWeight>1</CarryWeight>
-								<CarryBulk>1</CarryBulk>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/HediffDef[defName="AA_CarryWeight2"]/stages/li/statOffsets</xpath>
-							<value>
-								<CarryWeight>5</CarryWeight>
-								<CarryBulk>5</CarryBulk>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/HediffDef[defName="AA_CarryWeight3"]/stages/li/statOffsets</xpath>
-							<value>
-								<CarryWeight>7</CarryWeight>
-								<CarryBulk>7</CarryBulk>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/HediffDef[defName="AA_CarryWeight4"]/stages/li/statOffsets</xpath>
-							<value>
-								<CarryWeight>10</CarryWeight>
-								<CarryBulk>10</CarryBulk>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/HediffDef[defName="AA_CarryWeight5"]/stages/li/statOffsets</xpath>
-							<value>
-								<CarryWeight>15</CarryWeight>
-								<CarryBulk>15</CarryBulk>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/HediffDef[defName="AA_CarryWeight6"]/stages/li/statOffsets</xpath>
-							<value>
-								<CarryWeight>20</CarryWeight>
-								<CarryBulk>20</CarryBulk>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/HediffDef[defName="AA_CarryWeight7"]/stages/li/statOffsets</xpath>
-							<value>
-								<CarryWeight>30</CarryWeight>
-								<CarryBulk>30</CarryBulk>
-							</value>
-						</li>
-					</operations>
-				</match>
-			</li>
-
-		</operations>
-	</Operation>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>A Dog Said... Animal Prosthetics</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<!--=============== Non-ranged implants ====================-->
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/HediffDef[defName="AA_ProstheticTentacle"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>prosthetic tentacle</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>8</power>
-									<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-									<cooldownTime>1.8</cooldownTime>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/HediffDef[defName="AA_BionicTentacle"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>bionic tentacle</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>20</power>
-									<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-									<cooldownTime>1.4</cooldownTime>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/HediffDef[defName="AA_ProstheticBeak"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>prosthetic beak</label>
-									<capacities>
-										<li>Bite</li>
-									</capacities>
-									<power>8</power>
-									<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-									<armorPenetrationSharp>0.5</armorPenetrationSharp>
-									<cooldownTime>1.8</cooldownTime>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/HediffDef[defName="AA_BionicBeak"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>bionic beak</label>
-									<capacities>
-										<li>Bite</li>
-									</capacities>
-									<power>20</power>
-									<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-									<armorPenetrationSharp>1.0</armorPenetrationSharp>
-									<cooldownTime>1.4</cooldownTime>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/HediffDef[defName="AA_ProstheticShell"]/stages</xpath>
-						<value>
-							<stages>
-								<li>
-									<statOffsets>
-										<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
-										<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
-										<ArmorRating_Heat>0.025</ArmorRating_Heat>
-									</statOffsets>
-								</li>
-							</stages>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/HediffDef[defName="AA_BionicShell"]/stages</xpath>
-						<value>
-							<stages>
-								<li>
-									<statOffsets>
-										<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-										<ArmorRating_Blunt>1.0</ArmorRating_Blunt>
-										<ArmorRating_Heat>0.05</ArmorRating_Heat>
-									</statOffsets>
-								</li>
-							</stages>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/HediffDef[defName="AB_SimpleProstheticClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>simple prosthetic claw</label>
-									<capacities>
-										<li>Cut</li>
-									</capacities>
-									<power>6</power>
-									<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-									<armorPenetrationSharp>0.3</armorPenetrationSharp>
-									<cooldownTime>1.8</cooldownTime>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/HediffDef[defName="AB_BionicClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>bionic claw</label>
-									<capacities>
-										<li>Cut</li>
-									</capacities>
-									<power>15</power>
-									<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-									<armorPenetrationSharp>0.7</armorPenetrationSharp>
-									<cooldownTime>1.4</cooldownTime>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<!--=============== Ranged implants ====================-->
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/HediffDef[defName="AA_RangedSpinneretImplant"]/comps/li[@Class="MVCF.Comps.HediffCompProperties_ExtendedVerbGiver"]/verbs</xpath>
-						<value>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>AA_Web</defaultProjectile>
-									<warmupTime>2</warmupTime>
-									<burstShotCount>3</burstShotCount>
-									<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-									<minRange>1</minRange>
-									<range>20</range>
-									<soundCast>AA_Throw</soundCast>
-									<muzzleFlashScale>0</muzzleFlashScale>
-									<label>web</label>
-									<commonality>0.8</commonality>
-								</li>
-							</verbs>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/HediffDef[defName="AA_VenomousSpitterImplant"]/comps/li[@Class="MVCF.Comps.HediffCompProperties_ExtendedVerbGiver"]/verbs</xpath>
-						<value>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>AA_PoisonBolt</defaultProjectile>
-									<warmupTime>1.6</warmupTime>
-									<burstShotCount>1</burstShotCount>
-									<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-									<minRange>2.0</minRange>
-									<range>30</range>
-									<soundCast>AA_PoisonBolt</soundCast>
-									<muzzleFlashScale>0</muzzleFlashScale>
-									<label>venomous spit</label>
-									<commonality>0.8</commonality>
-								</li>
-							</verbs>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/HediffDef[defName="AA_AcidicSpitterImplant"]/comps/li[@Class="MVCF.Comps.HediffCompProperties_ExtendedVerbGiver"]/verbs</xpath>
-						<value>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>AA_AcidBolt</defaultProjectile>
-									<warmupTime>1.6</warmupTime>
-									<burstShotCount>1</burstShotCount>
-									<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-									<minRange>2</minRange>
-									<range>20</range>
-									<soundCast>AA_PoisonBolt</soundCast>
-									<muzzleFlashScale>0</muzzleFlashScale>
-									<label>acidic spit</label>
-									<commonality>0.8</commonality>
-								</li>
-							</verbs>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/HediffDef[defName="AA_BarbedQuillThrowerImplant"]/comps/li[@Class="MVCF.Comps.HediffCompProperties_ExtendedVerbGiver"]/verbs</xpath>
-						<value>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>AA_Quill</defaultProjectile>
-									<warmupTime>2</warmupTime>
-									<burstShotCount>1</burstShotCount>
-									<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-									<minRange>2</minRange>
-									<range>20</range>
-									<soundCast>AA_DartSound</soundCast>
-									<muzzleFlashScale>0</muzzleFlashScale>
-									<label>barbed quills</label>
-									<commonality>0.8</commonality>
-								</li>
-							</verbs>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/HediffDef[defName="AA_QuadTeslaCannonImplant"]/comps/li[@Class="MVCF.Comps.HediffCompProperties_ExtendedVerbGiver"]/verbs</xpath>
-						<value>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>AA_Plasma</defaultProjectile>
-									<warmupTime>4.0</warmupTime>
-									<burstShotCount>4</burstShotCount>
-									<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-									<minRange>2</minRange>
-									<range>20</range>
-									<soundCast>AA_Plasma</soundCast>
-									<muzzleFlashScale>0</muzzleFlashScale>
-									<label>quad tesla cannon</label>
-									<commonality>1</commonality>
-								</li>
-							</verbs>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/HediffDef[defName="AA_BioelectricOrganImplant"]/comps/li[@Class="MVCF.Comps.HediffCompProperties_ExtendedVerbGiver"]/verbs</xpath>
-						<value>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>AA_ElectricBolt</defaultProjectile>
-									<warmupTime>2.6</warmupTime>
-									<burstShotCount>1</burstShotCount>
-									<range>15</range>
-									<soundCast>AA_ElectricBolt</soundCast>
-									<muzzleFlashScale>0</muzzleFlashScale>
-									<label>electric bolt</label>
-									<commonality>0.8</commonality>
-								</li>
-							</verbs>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/HediffDef[defName="AA_LightFocusingLensImplant"]/comps/li[@Class="MVCF.Comps.HediffCompProperties_ExtendedVerbGiver"]/verbs</xpath>
-						<value>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>AA_LaserBullet</defaultProjectile>
-									<warmupTime>3</warmupTime>
-									<burstShotCount>1</burstShotCount>
-									<minRange>1.0</minRange>
-									<range>10</range>
-									<soundCast>AA_LaserBullet</soundCast>
-									<muzzleFlashScale>0</muzzleFlashScale>
-									<label>laser</label>
-									<commonality>0.8</commonality>
-								</li>
-							</verbs>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/HediffDef[defName="AA_HyperAcidicStomachImplant"]/comps/li[@Class="MVCF.Comps.HediffCompProperties_ExtendedVerbGiver"]/verbs</xpath>
-						<value>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>AA_AcidicVomit_CE</defaultProjectile>
-									<warmupTime>3.0</warmupTime>
-									<burstShotCount>1</burstShotCount>
-									<minRange>1</minRange>
-									<range>7</range>
-									<soundCast>AA_PoisonBolt</soundCast>
-									<muzzleFlashScale>0</muzzleFlashScale>
-									<label>acidic vomit</label>
-									<commonality>0.8</commonality>
-								</li>
-							</verbs>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Aerofleet.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Aerofleet.xml
deleted file mode 100644
index d1f2edcfa7..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Aerofleet.xml	
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Aerofleet"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Aerofleet"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.36</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Aerofleet"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2.5</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.035</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.01</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>tentacles</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Arms</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_ColossalAerofleet"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_ColossalAerofleet"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.16</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0.11</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_ColossalAerofleet"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>2.5</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>tentacles</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Arms</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.015</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Agaripawn.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Agaripawn.xml
deleted file mode 100644
index 80b8be35a7..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Agaripawn.xml	
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Agaripawn"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Agaripawn"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>20</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Agaripawn"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Agaripawn"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.07</MeleeDodgeChance>
-						<MeleeCritChance>0.04</MeleeCritChance>
-						<MeleeParryChance>0.11</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Agaripawn"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left paw</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>13</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right paw</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>13</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Agaripod.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Agaripod.xml
deleted file mode 100644
index c53a6edaba..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Agaripod.xml	
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Agaripod"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Agaripod"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>50</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Agaripod"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Agaripod"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.06</MeleeDodgeChance>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>0.28</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Agaripod"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left paw</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right paw</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.21</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_AmoebaHuge.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_AmoebaHuge.xml
deleted file mode 100644
index 4f798f29ac..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_AmoebaHuge.xml	
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_AcanthamoebaGiganteaHuge"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_AcanthamoebaGiganteaHuge"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.3</MeleeCritChance>
-						<MeleeParryChance>0.00</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_AcanthamoebaGiganteaHuge"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>pseudopods</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Arms</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Amoebachungus.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Amoebachungus.xml
deleted file mode 100644
index f7d6f46959..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Amoebachungus.xml	
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_AcanthamoebaGiganteaLarge"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_AcanthamoebaGiganteaLarge"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.00</MeleeCritChance>
-						<MeleeParryChance>0.00</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_AcanthamoebaGiganteaLarge"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>pseudopods</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Arms</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Amoebasmol.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Amoebasmol.xml
deleted file mode 100644
index de84ed51f5..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Amoebasmol.xml	
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_AcanthamoebaGiganteaSmall"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_AcanthamoebaGiganteaSmall"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.00</MeleeCritChance>
-						<MeleeParryChance>0.00</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_AcanthamoebaGiganteaSmall"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>pseudopods</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Arms</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_AngelaMorthal.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_AngelaMorthal.xml
deleted file mode 100644
index 9a378ce2c0..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_AngelaMorthal.xml	
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Larval Angle Moth -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_AngelMothLarva"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_AngelMothLarva"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.00</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_AngelMothLarva"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_AngelMoth"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_AngelMoth"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<!-- Atispec -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_AngelMoth"]/tools</xpath>
-					<value>
-						<tools>
-
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Animalisk.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Animalisk.xml
deleted file mode 100644
index 3ee9adc744..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Animalisk.xml	
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Animalisk"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Animalisk"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Animalisk"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Animalisk"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.28</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Animalisk"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left first leg</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.68</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right first leg</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.68</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>AA_ToxicSting</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.55</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_Animalisk"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_Animalisk"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Animalisk"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>550</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Animus_Vox.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Animus_Vox.xml
deleted file mode 100644
index 86572b50a0..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Animus_Vox.xml	
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_AnimusVox"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_AnimusVox"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.36</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_AnimusVox"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.9</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.18</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.9</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.18</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Arctic_Lion.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Arctic_Lion.xml
deleted file mode 100644
index 66274e63a8..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Arctic_Lion.xml	
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_ArcticLion"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_ArcticLion"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						<MeleeCritChance>0.34</MeleeCritChance>
-						<MeleeParryChance>0.14</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_ArcticLion"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Cut</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>25</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.95</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Cut</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>25</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.95</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-									<li>Stab</li>
-								</capacities>
-								<power>34</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>4.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.75</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Atispec.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Atispec.xml
deleted file mode 100644
index d627e661ec..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Atispec.xml	
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Larval Atispec -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_LarvalAtispec"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_LarvalAtispec"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.00</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_LarvalAtispec"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Atispec"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Atispec"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>9</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Atispec"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>3</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Atispec"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>5</MoveSpeed>
-						<MeleeDodgeChance>0.35</MeleeDodgeChance>
-						<MeleeCritChance>0.24</MeleeCritChance>
-						<MeleeParryChance>0.40</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Atispec"]/comps</xpath>
-					<value>
-						<li Class="AnimalBehaviours.CompProperties_InitialHediff">
-							<hediffname>AA_LowBleed</hediffname>
-							<hediffseverity>1</hediffseverity>
-						</li>
-					</value>
-				</li>
-
-				<!-- Atispec -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Atispec"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>1.88</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>1.88</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>AA_VeryToxicSting</li>
-								</capacities>
-								<cooldownTime>2.45</cooldownTime>
-								<power>40</power>
-								<linkedBodyPartsGroup>AA_Sting</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<chanceFactor>0.1</chanceFactor>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_Atispec"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_Atispec"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Atispec"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>6750</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_AuroraSylph.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_AuroraSylph.xml
deleted file mode 100644
index 2de6ce607f..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_AuroraSylph.xml	
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_AuroraSylph"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_AuroraSylph"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.33</MeleeDodgeChance>
-						<MeleeCritChance>0</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_AuroraSylph"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.23</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Barb_Slinger.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Barb_Slinger.xml
deleted file mode 100644
index 87ce825443..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Barb_Slinger.xml	
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Barbslinger"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Barbslinger"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.4</MeleeCritChance>
-						<MeleeParryChance>0.4</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Barbslinger"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Barbslinger"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Barbslinger"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left pincer</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.68</cooldownTime>
-								<linkedBodyPartsGroup>AA_PincerAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right pincer</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.68</cooldownTime>
-								<linkedBodyPartsGroup>AA_PincerAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>AA_ToxicSting</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>AA_Sting</linkedBodyPartsGroup>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Barbslinger"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<useStatic>false</useStatic>
-									<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-									<parts>
-										<li>AA_LeftPincer</li>
-										<li>AA_RightPincer</li>
-									</parts>
-								</li>
-								<li>
-									<useStatic>false</useStatic>
-									<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
-									<parts>
-										<li>AA_LeftPincer</li>
-										<li>AA_RightPincer</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_Barbslinger"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_Barbslinger"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Barbslinger"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1125</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Base.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Base.xml
deleted file mode 100644
index 85bcc1271b..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Base.xml	
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="BaseInsect2"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency>0.5</NightVisionEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="AA_AlphaBaseInsect" or @Name="BaseInsect2"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<useStatic>false</useStatic>
-									<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
-									<parts>
-										<li>InsectLeg</li>
-									</parts>
-								</li>
-								<li>
-									<useStatic>false</useStatic>
-									<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
-									<parts>
-										<li>InsectLeg</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="AA_AlphaBaseInsect" or @Name="BaseInsect2"]/statBases</xpath>
-					<value>
-						<PartialArmorBody>0</PartialArmorBody>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Bed_Bug.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Bed_Bug.xml
deleted file mode 100644
index a1487250ed..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Bed_Bug.xml	
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_BedBug"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_BedBug"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_BedBug"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.65</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_BedBug"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.02</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_BedBug"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>AA_ParalysingBite</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_BedBug"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_BedBug"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_BedBug"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>375</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Behemoth.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Behemoth.xml
deleted file mode 100644
index d25ebb0162..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Behemoth.xml	
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Behemoth"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Behemoth"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>1.5</MeleeCritChance>
-						<MeleeParryChance>0.4</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Behemoth"]</xpath>
-					<value>
-						<butcherProducts>
-							<Prometheum>25</Prometheum>
-							<FSX>15</FSX>
-						</butcherProducts>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Behemoth"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>21</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Behemoth"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Behemoth"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.6</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Behemoth"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left dragonclaw</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Stab</li>
-								</capacities>
-								<power>55</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>22</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>2.4</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>16</armorPenetrationSharp>
-								<armorPenetrationBlunt>48</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Right dragonclaw</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Stab</li>
-								</capacities>
-								<power>55</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>22</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>2.4</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>16</armorPenetrationSharp>
-								<armorPenetrationBlunt>48</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>razorfangs</label>
-								<capacities>
-									<li>Bite</li>
-									<li>Stab</li>
-								</capacities>
-								<power>80</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>22</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>4</cooldownTime>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-								<armorPenetrationBlunt>90</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.6</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>devour</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>43</power>
-								<cooldownTime>3</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>40.55</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_Behemoth"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_Behemoth"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Behemoth"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>4500</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>400</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Black_Hive.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Black_Hive.xml
deleted file mode 100644
index 36427b83f7..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Black_Hive.xml	
+++ /dev/null
@@ -1,358 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_BlackScarab"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="AA_BlackScarab"]/combatPower</xpath>
-					<value>
-						<combatPower>60</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_BlackScarab"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2.55</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_BlackScarab"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_BlackScarab"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4.9</MoveSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_BlackScarab"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_BlackScarab"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_BlackScarab"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_BlackScarab"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_BlackScarab"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>187</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_BlackSpelopede"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_BlackSpelopede"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_BlackSpelopede"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>3</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_BlackSpelopede"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4.7</MoveSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_BlackSpelopede"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.75</AimingAccuracy>
-						<ShootingAccuracyPawn>0.75</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.08</MeleeDodgeChance>
-						<MeleeCritChance>0.18</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-						<Suppressability>0.25</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="AA_BlackSpelopede"]/combatPower</xpath>
-					<value>
-						<combatPower>100</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_BlackSpelopede"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>1.4</baseHealthScale>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_BlackSpelopede"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head claw</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.68</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head claw</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.48</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_BlackSpelopede"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_BlackSpelopede"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_BlackSpelopede"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>600</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_BlackSpider"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_BlackSpider"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>2.1</baseHealthScale>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_BlackSpider"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>12</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_BlackSpider"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_BlackSpider"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4.6</MoveSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_BlackSpider"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.65</AimingAccuracy>
-						<ShootingAccuracyPawn>0.65</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.09</MeleeDodgeChance>
-						<MeleeCritChance>0.45</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-						<Suppressability>0.2</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="AA_BlackSpider"]/combatPower</xpath>
-					<value>
-						<combatPower>200</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_BlackSpider"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head claw</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>44</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>2.0</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head claw</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>44</armorPenetrationSharp>
-								<armorPenetrationBlunt>22</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>8.5</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_BlackSpider"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_BlackSpider"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_BlackSpider"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>900</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Blizzarisk.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Blizzarisk.xml
deleted file mode 100644
index 976542df20..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Blizzarisk.xml	
+++ /dev/null
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Blizzarisk"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Blizzarisk"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Blizzarisk"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Blizzarisk"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Blizzarisk"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left first leg</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right first leg</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>AA_ToxicSting</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_Blizzarisk"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_Blizzarisk"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Blizzarisk"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>975</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_BlizzariskClutchMother"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_BlizzariskClutchMother"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_BlizzariskClutchMother"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>8</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_BlizzariskClutchMother"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_BlizzariskClutchMother"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.11</MeleeDodgeChance>
-						<MeleeCritChance>0.5</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_BlizzariskClutchMother"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left first leg</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right first leg</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>AA_ToxicSting</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_BlizzariskClutchMother"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_BlizzariskClutchMother"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_BlizzariskClutchMother"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1500</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Bloodshrimp.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Bloodshrimp.xml
deleted file mode 100644
index b32507e795..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Bloodshrimp.xml	
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_BloodShrimp"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_BloodShrimp"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_BloodShrimp"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>0.75</ArmorRating_Blunt>
-						<MeleeDodgeChance>0.01</MeleeDodgeChance>
-						<MeleeCritChance>0.20</MeleeCritChance>
-						<MeleeParryChance>0.28</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_BloodShrimp"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.1</chanceFactor>
-								<armorPenetrationBlunt>2.50</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>AA_RegenerativePierce</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>AA_Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left blade</label>
-								<capacities>
-									<li>AA_RegenerativePierce</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.55</cooldownTime>
-								<linkedBodyPartsGroup>AA_BladeAttackTool</linkedBodyPartsGroup>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>7.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right blade</label>
-								<capacities>
-									<li>AA_RegenerativePierce</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.55</cooldownTime>
-								<linkedBodyPartsGroup>AA_BladeAttackTool</linkedBodyPartsGroup>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>7.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_BloodShrimp"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_BloodShrimp"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_BloodShrimp"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1000</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>300</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Bobeene.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Bobeene.xml
deleted file mode 100644
index c379d05960..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Bobeene.xml	
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Bobeene"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Bobeene"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.24</MeleeCritChance>
-						<MeleeParryChance>0.13</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Bobeene"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<chanceFactor>0.7</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>2.9</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Boulder_Mit.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Boulder_Mit.xml
deleted file mode 100644
index 924d428a03..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Boulder_Mit.xml	
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_BoulderMit"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_BoulderMit"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>30</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_BoulderMit"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_BoulderMit"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.00</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.34</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_BoulderMit"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>32</power>
-								<cooldownTime>3.1</cooldownTime>
-								<linkedBodyPartsGroup>TurtleBeakAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>6.55</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_BoulderMit"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_BoulderMit"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_BoulderMit"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>3250</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_SummitCrab"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_SummitCrab"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_SummitCrab"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>60</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_SummitCrab"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>40</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_SummitCrab"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.00</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>1.21</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_SummitCrab"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>3.6</cooldownTime>
-								<linkedBodyPartsGroup>TurtleBeakAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>4</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>12.05</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_SummitCrab"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_SummitCrab"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_SummitCrab"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>4750</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Bumbledrone.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Bumbledrone.xml
deleted file mode 100644
index 37de6568f6..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Bumbledrone.xml	
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Bumbledrone"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Bumbledrone"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0.04</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Bumbledrone"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>AA_VeryToxicSting</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.55</cooldownTime>
-								<linkedBodyPartsGroup>AA_Sting</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-								<chanceFactor>0.8</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.1</chanceFactor>
-								<armorPenetrationSharp>0.18</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_BumbledroneHierophant"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_BumbledroneHierophant"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.3</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_BumbledroneHierophant"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>AA_VeryToxicSting</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.55</cooldownTime>
-								<linkedBodyPartsGroup>AA_Sting</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_BumbledroneQueen"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_BumbledroneQueen"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.11</MeleeDodgeChance>
-						<MeleeCritChance>0.17</MeleeCritChance>
-						<MeleeParryChance>0.04</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_BumbledroneQueen"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>AA_VeryToxicSting</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.55</cooldownTime>
-								<linkedBodyPartsGroup>AA_Sting</linkedBodyPartsGroup>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.8</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.1</chanceFactor>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.12</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Cactipine.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Cactipine.xml
deleted file mode 100644
index a8399c1ab1..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Cactipine.xml	
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Cactipine"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Cactipine"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Cactipine"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>7</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.14</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>7</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.14</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.85</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Chameleon Yak.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Chameleon Yak.xml
deleted file mode 100644
index d5888471fe..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Chameleon Yak.xml	
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_ChameleonYak"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_ChameleonYak"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.35</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_ChameleonYak"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>2.4</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_ChemfuelMyrmidon.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_ChemfuelMyrmidon.xml
deleted file mode 100644
index 5180172c3d..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_ChemfuelMyrmidon.xml	
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_ChemfuelMyrmidon"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_ChemfuelMyrmidon"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_ChemfuelMyrmidon"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_ChemfuelMyrmidon"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.01</MeleeDodgeChance>
-						<MeleeCritChance>0.24</MeleeCritChance>
-						<MeleeParryChance>0.35</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_ChemfuelMyrmidon"]</xpath>
-					<value>
-						<butcherProducts>
-							<FSX>13</FSX>
-						</butcherProducts>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_ChemfuelMyrmidon"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>triple maw</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>2.72</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>3</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_ChemfuelMyrmidon"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_ChemfuelMyrmidon"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_ChemfuelMyrmidon"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>750</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Cinderlisk.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Cinderlisk.xml
deleted file mode 100644
index 7bfcd39bde..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Cinderlisk.xml	
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Cinderlisk"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Cinderlisk"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Cinderlisk"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Cinderlisk"]</xpath>
-					<value>
-						<butcherProducts>
-							<Prometheum>12</Prometheum>
-						</butcherProducts>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Cinderlisk"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.20</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Cinderlisk"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left first leg</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right first leg</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>AA_BurningBite</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_Cinderlisk"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_Cinderlisk"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Cinderlisk"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1100</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_CrepuscularBeetle.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_CrepuscularBeetle.xml
deleted file mode 100644
index 5d6bad3fbf..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_CrepuscularBeetle.xml	
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_CrepuscularBeetle"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_CrepuscularBeetle"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_CrepuscularBeetle"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>3</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_CrepuscularBeetle"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency>0.8</NightVisionEfficiency>
-						<MeleeDodgeChance>0.01</MeleeDodgeChance>
-						<MeleeCritChance>0.35</MeleeCritChance>
-						<MeleeParryChance>0.35</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_CrepuscularBeetle"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head claw</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>2.8</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>16</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>17</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_CrepuscularBeetle"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_CrepuscularBeetle"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_CrepuscularBeetle"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1075</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_CrescendoAnole.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_CrescendoAnole.xml
deleted file mode 100644
index d509671427..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_CrescendoAnole.xml	
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_CrescendoAnole"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_CrescendoAnole"]/statBases</xpath>
-					<!-- Used CE's formula to calculate these values -->
-					<!-- (Note this is a lizard that grows strong when angered) -->
-					<value>
-						<MeleeDodgeChance>0.19</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_CrescendoAnole"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.6</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_CrystalMit.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_CrystalMit.xml
deleted file mode 100644
index a7e1eb2122..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_CrystalMit.xml	
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_CrystalMit"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_CrystalMit"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>12</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_CrystalMit"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_CrystalMit"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.02</MeleeDodgeChance>
-						<MeleeCritChance>0.07</MeleeCritChance>
-						<MeleeParryChance>0.04</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_CrystalMit"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2.6</cooldownTime>
-								<linkedBodyPartsGroup>TurtleBeakAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.43</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.65</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.750</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_CrystalMit"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_CrystalMit"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_CrystalMit"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>750</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_CrystallineCaracal.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_CrystallineCaracal.xml
deleted file mode 100644
index 072865158f..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_CrystallineCaracal.xml	
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_CrystallineCaracal"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-				<!-- Used weight of a cougar to generate these -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_CrystallineCaracal"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.08</MeleeCritChance>
-						<MeleeParryChance>0.06</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_CrystallineCaracal"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.42</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.42</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.55</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.94</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.75</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_DarkBeast.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_DarkBeast.xml
deleted file mode 100644
index 0b2acc816a..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_DarkBeast.xml	
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Darkbeast"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Darkbeast"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Darkbeast"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Darkbeast"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency>0.8</NightVisionEfficiency>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.21</MeleeCritChance>
-						<MeleeParryChance>0.24</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Darkbeast"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.4</chanceFactor>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.4</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_Darkbeast"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_Darkbeast"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Darkbeast"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>875</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_DarkVandal.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_DarkVandal.xml
deleted file mode 100644
index 1dfdf93c92..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_DarkVandal.xml	
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_DarkVandal"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_DarkVandal"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						<MeleeCritChance>0.3</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_DarkVandal"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tusk</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Stab</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.35</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.66</cooldownTime>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.6</chanceFactor>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_DecayDrake.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_DecayDrake.xml
deleted file mode 100644
index 6c4817ea38..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_DecayDrake.xml	
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_DecayDrake"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_DecayDrake"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-						<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_DecayDrake"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>razorfangs</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>1.9</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.9</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.723</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Desert Aves.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Desert Aves.xml
deleted file mode 100644
index 96fa827287..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Desert Aves.xml	
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_DesertAve"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_DesertAve"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.35</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.06</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_DesertAve"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>30</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.78</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Devil_Sheep.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Devil_Sheep.xml
deleted file mode 100644
index 858b7bfe2b..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Devil_Sheep.xml	
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_DevilSheep"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_DevilSheep"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.11</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.03</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_DevilSheep"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.60</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Drainer.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Drainer.xml
deleted file mode 100644
index 8eab22fde0..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Drainer.xml	
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Larval Drainer -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_DrainerLarva"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_DrainerLarva"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.00</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_DrainerLarva"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Drainer"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Drainer"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<!-- Atispec -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Drainer"]/tools</xpath>
-					<value>
-						<tools>
-
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Dunealisk.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Dunealisk.xml
deleted file mode 100644
index 326e4643a5..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Dunealisk.xml	
+++ /dev/null
@@ -1,243 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Dunealisk"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Dunealisk"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Dunealisk"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Dunealisk"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Dunealisk"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left first leg</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right first leg</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>AA_ToxicSting</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_Dunealisk"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_Dunealisk"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Dunealisk"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>975</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_DunealiskClutchMother"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_DunealiskClutchMother"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>8</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_DunealiskClutchMother"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_DunealiskClutchMother"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.5</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_DunealiskClutchMother"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left first leg</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right first leg</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>AA_ToxicSting</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_DunealiskClutchMother"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_DunealiskClutchMother"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_DunealiskClutchMother"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1500</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_DuskProwler.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_DuskProwler.xml
deleted file mode 100644
index 8fb79e92f0..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_DuskProwler.xml	
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_DuskProwler"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_DuskProwler"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.9</MeleeDodgeChance>
-						<MeleeCritChance>0.27</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_DuskProwler"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_DuskProwler"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.35</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_DuskProwler"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>ninetails</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>0.35</cooldownTime>
-								<linkedBodyPartsGroup>AA_Tail</linkedBodyPartsGroup>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.0</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.523</armorPenetrationBlunt>
-								<chanceFactor>0.25</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.0</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.523</armorPenetrationBlunt>
-								<chanceFactor>0.25</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<chanceFactor>0.4</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_DuskProwler"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_DuskProwler"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_DuskProwler"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>875</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_DuskRat.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_DuskRat.xml
deleted file mode 100644
index 87b5a66d29..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_DuskRat.xml	
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_DuskRat"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_DuskRat"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.52</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.00</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_DuskRat"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.02</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.02</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_EmpressButterfly.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_EmpressButterfly.xml
deleted file mode 100644
index e8e6ff3a56..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_EmpressButterfly.xml	
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_EmpressButterflyLarva"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_EmpressButterflyLarva"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.00</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_EmpressButterflyLarva"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_EmpressButterfly"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_EmpressButterfly"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_EmpressButterfly"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_EngorgedTentacularAberration.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_EngorgedTentacularAberration.xml
deleted file mode 100644
index 6edbcaa67e..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_EngorgedTentacularAberration.xml	
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Ideology</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AA_EngorgedTentacularAberration"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Quadruped</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_EngorgedTentacularAberration"]/statBases/MoveSpeed</xpath>
-						<value>
-							<MoveSpeed>3.0</MoveSpeed>
-							<MeleeDodgeChance>0.15</MeleeDodgeChance>
-							<MeleeCritChance>0.75</MeleeCritChance>
-							<MeleeParryChance>0.35</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_EngorgedTentacularAberration"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<capacities>
-										<li>Blunt</li>
-										<li>Stab</li>
-									</capacities>
-									<power>48</power>
-									<cooldownTime>2.48</cooldownTime>
-									<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-									<chanceFactor>0.6</chanceFactor>
-									<armorPenetrationSharp>24</armorPenetrationSharp>
-									<armorPenetrationBlunt>48</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>tentacles</label>
-									<capacities>
-										<li>Blunt</li>
-										<li>Poke</li>
-									</capacities>
-									<power>23</power>
-									<cooldownTime>0.8</cooldownTime>
-									<linkedBodyPartsGroup>AA_TentacleAttackTool</linkedBodyPartsGroup>
-									<chanceFactor>0.4</chanceFactor>
-									<armorPenetrationBlunt>25</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_EngorgedTentacularAberration"]/comps</xpath>
-						<value>
-							<li Class="AnimalBehaviours.CompProperties_InitialHediff">
-								<hediffname>AA_LowBleed</hediffname>
-								<hediffseverity>1</hediffseverity>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Erin.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Erin.xml
deleted file mode 100644
index d6d9e4277e..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Erin.xml	
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Erin"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-				<!-- Don't know about balancing -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Erin"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-						<ArmorRating_Sharp>0.12</ArmorRating_Sharp>
-						<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						<MeleeCritChance>0.12</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Erin"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>fangs</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.55</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.9</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>32</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>3.2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Eyeling.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Eyeling.xml
deleted file mode 100644
index 6ffde38fb9..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Eyeling.xml	
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Ideology</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AA_Eyeling"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Quadruped</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_Eyeling"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.1</MeleeDodgeChance>
-							<MeleeCritChance>0.1</MeleeCritChance>
-							<MeleeParryChance>0.1</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_Eyeling"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<capacities>
-										<li>AA_ToxicBite</li>
-									</capacities>
-									<power>12</power>
-									<cooldownTime>1.65</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>10</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>1.0</armorPenetrationSharp>
-									<armorPenetrationBlunt>0.544</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Fangsquid.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Fangsquid.xml
deleted file mode 100644
index 9939e8adf4..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Fangsquid.xml	
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Biomes! Islands</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AA_Fangsquid"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Serpentine</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_Fangsquid"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.1</MeleeDodgeChance>
-							<MeleeCritChance>0.08</MeleeCritChance>
-							<MeleeParryChance>0.4</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_Fangsquid"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<capacities>
-										<li>Bite</li>
-									</capacities>
-									<power>12</power>
-									<cooldownTime>1.68</cooldownTime>
-									<linkedBodyPartsGroup>AA_Mouth</linkedBodyPartsGroup>
-									<armorPenetrationSharp>0.14</armorPenetrationSharp>
-									<armorPenetrationBlunt>1.1</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>tentacle</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>8</power>
-									<cooldownTime>1</cooldownTime>
-									<linkedBodyPartsGroup>AA_TentacleAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Feralisk.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Feralisk.xml
deleted file mode 100644
index d1c8cd9b67..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Feralisk.xml	
+++ /dev/null
@@ -1,243 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Feralisk"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Feralisk"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Feralisk"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Feralisk"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Feralisk"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left first leg</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right first leg</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>AA_ToxicSting</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_Feralisk"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_Feralisk"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Feralisk"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>550</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_FeraliskClutchMother"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_FeraliskClutchMother"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>8</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_FeraliskClutchMother"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_FeraliskClutchMother"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.11</MeleeDodgeChance>
-						<MeleeCritChance>0.5</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_FeraliskClutchMother"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left first leg</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right first leg</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>AA_ToxicSting</li>
-								</capacities>
-								<power>38</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>30</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_FeraliskClutchMother"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_FeraliskClutchMother"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_FeraliskClutchMother"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1500</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Firewasp.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Firewasp.xml
deleted file mode 100644
index 5ac31062df..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Firewasp.xml	
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_FireWasp"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_FireWasp"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0.04</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_FireWasp"]</xpath>
-					<value>
-						<butcherProducts>
-							<Prometheum>8</Prometheum>
-						</butcherProducts>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_FireWasp"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>AA_BurningAndFeedingBite</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.55</cooldownTime>
-								<linkedBodyPartsGroup>AA_Sting</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<chanceFactor>0.8</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>AA_BurningAndFeedingBite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.1</chanceFactor>
-								<armorPenetrationSharp>0.18</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_FissionMouse.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_FissionMouse.xml
deleted file mode 100644
index 7c660ece46..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_FissionMouse.xml	
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_FissionMouse"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_FissionMouse"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.03</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_FissionMouse"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-								<chanceFactor>0.7</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_FissionMouseSecond"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_FissionMouseSecond"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.17</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_FissionMouseSecond"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-								<chanceFactor>0.7</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_FissionMouseThird"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_FissionMouseThird"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0.02</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_FissionMouseThird"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-								<chanceFactor>0.7</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_FlamigoPheonix.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_FlamigoPheonix.xml
deleted file mode 100644
index 28a101ff25..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_FlamigoPheonix.xml	
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_FlamingoPhoenix"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_FlamingoPhoenix"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.24</MeleeDodgeChance>
-						<MeleeCritChance>0.03</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_FlamingoPhoenix"]</xpath>
-					<value>
-						<butcherProducts>
-							<Prometheum>1</Prometheum>
-						</butcherProducts>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_FlamingoPhoenix"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>12</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>4</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.68</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_FrostLynx.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_FrostLynx.xml
deleted file mode 100644
index 4cda47706b..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_FrostLynx.xml	
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_FrostLynx"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_FrostLynx"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.26</MeleeDodgeChance>
-						<MeleeCritChance>0.20</MeleeCritChance>
-						<MeleeParryChance>0.07</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_FrostLynx"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>AA_FrostClaws</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>0.9</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.21</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.623</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>AA_FrostClaws</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>0.84</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.21</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.623</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>AA_FrostBite</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.523</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Frost_Ave.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Frost_Ave.xml
deleted file mode 100644
index 19079a1024..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Frost_Ave.xml	
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_FrostAve"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_FrostAve"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.32</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.07</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_FrostAve"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.9</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>13</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.75</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_FrostboundBehemoth.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_FrostboundBehemoth.xml
deleted file mode 100644
index 46876ecb1d..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_FrostboundBehemoth.xml	
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_FrostboundBehemoth"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_FrostboundBehemoth"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_FrostboundBehemoth"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_FrostboundBehemoth"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.02</MeleeDodgeChance>
-						<MeleeCritChance>0.22</MeleeCritChance>
-						<MeleeParryChance>0.20</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_FrostboundBehemoth"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>body</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>32</power>
-								<cooldownTime>3.6</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>28</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_FrostboundBehemoth"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_FrostboundBehemoth"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_FrostboundBehemoth"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1500</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Frostling.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Frostling.xml
deleted file mode 100644
index af3d726468..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Frostling.xml	
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Frostling"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Frostling"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Frostling"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.35</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Frostling"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						<MeleeCritChance>0.3</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Frostling"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.28</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.823</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.28</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.823</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>32</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>3.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>6.144</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.523</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_Frostling"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_Frostling"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Frostling"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>875</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Frostmite.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Frostmite.xml
deleted file mode 100644
index 37bd066524..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Frostmite.xml	
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Frostmite"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Frostmite"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Frostmite"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Frostmite"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.02</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Frostmite"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head-claw</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.34</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_Frostmite"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_Frostmite"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Frostmite"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>325</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_FungalHusk.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_FungalHusk.xml
deleted file mode 100644
index 55db1046eb..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_FungalHusk.xml	
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_FungalHusk"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_FungalHusk"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.17</MeleeDodgeChance>
-						<MeleeCritChance>0.33</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_FungalHusk"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>AA_FungalClaws</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>AA_FungalClaws</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>25</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Gallatross.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Gallatross.xml
deleted file mode 100644
index 0bc66bb3ea..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Gallatross.xml	
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Gallatross"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Gallatross"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>26</ArmorRating_Blunt>
-						<ArmorRating_Sharp>13</ArmorRating_Sharp>
-						<MeleeDodgeChance>0.02</MeleeDodgeChance>
-						<MeleeCritChance>1.75</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Gallatross"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>81</power>
-								<cooldownTime>2.48</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>120.226</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>56</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<armorPenetrationBlunt>40</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>47</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>45</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_Gallatross"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_Gallatross"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Gallatross"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>11500</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<!-- Add Low Bleed Hediff -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<HediffDef>
-							<defName>AA_LowBleed</defName>
-							<description>This creature bleeds very little.</description>
-							<label>Regen factor</label>
-							<defaultLabelColor>(.8,0,0)</defaultLabelColor>
-							<scenarioCanAdd>false</scenarioCanAdd>
-							<maxSeverity>1.0</maxSeverity>
-							<stages>
-								<li>
-									<totalBleedFactor>0.25</totalBleedFactor>
-								</li>
-							</stages>
-						</HediffDef>
-					</value>
-				</li>
-
-				<!-- Add Low Bleed Hediff -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_Gallatross"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_Gallatross"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Gallatross"]/comps</xpath>
-					<value>
-						<li Class="AnimalBehaviours.CompProperties_InitialHediff">
-							<hediffname>AA_LowBleed</hediffname>
-							<hediffseverity>1</hediffseverity>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Genix.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Genix.xml
deleted file mode 100644
index 94590c820d..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Genix.xml	
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Genix"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Genix"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.26</MeleeDodgeChance>
-						<MeleeCritChance>0.20</MeleeCritChance>
-						<MeleeParryChance>0.07</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Genix"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>0.9</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.21</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.623</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>0.84</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.21</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.623</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.523</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_GiantCrownedSilkie.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_GiantCrownedSilkie.xml
deleted file mode 100644
index cbff8385a6..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_GiantCrownedSilkie.xml	
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_GiantCrownedSilkie"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_GiantCrownedSilkie"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>5</MoveSpeed>
-						<MeleeDodgeChance>0.17</MeleeDodgeChance>
-						<MeleeCritChance>0.10</MeleeCritChance>
-						<MeleeParryChance>0.08</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_GiantCrownedSilkie"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.97</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2.12</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.97</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Gigantelope.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Gigantelope.xml
deleted file mode 100644
index ee7b6109f0..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Gigantelope.xml	
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Gigantelope"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Gigantelope"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.22</MeleeCritChance>
-						<MeleeParryChance>0.13</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Gigantelope"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.750</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2.3</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.750</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Great_Devourer.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Great_Devourer.xml
deleted file mode 100644
index 3d34961596..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Great_Devourer.xml	
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_GreatDevourer"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_GreatDevourer"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.8</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_GreatDevourer"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_GreatDevourer"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.45</MeleeCritChance>
-						<MeleeParryChance>0.08</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_GreatDevourer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>2.6</cooldownTime>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>16</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<chanceFactor>0.3</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_GreatDevourer"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_GreatDevourer"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_GreatDevourer"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1125</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>400</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_GreenGoo.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_GreenGoo.xml
deleted file mode 100644
index e286c0eb98..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_GreenGoo.xml	
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_GreenGoo"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_GreenGoo"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						<MeleeCritChance>0.04</MeleeCritChance>
-						<MeleeParryChance>0.04</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_GreenGoo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tentacles</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.75</cooldownTime>
-								<linkedBodyPartsGroup>Arms</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_GreyCoatedMouflon.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_GreyCoatedMouflon.xml
deleted file mode 100644
index 8129708e12..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_GreyCoatedMouflon.xml	
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_GreyCoatedMouflon"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-				<!-- Don't know about balancing -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_GreyCoatedMouflon"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						<MeleeCritChance>0.07</MeleeCritChance>
-						<MeleeParryChance>0.08</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_GreyCoatedMouflon"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2.3</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>horns</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.85</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Groundrunner.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Groundrunner.xml
deleted file mode 100644
index ecb4ba4371..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Groundrunner.xml	
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Groundrunner"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Groundrunner"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Groundrunner"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Groundrunner"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>2.35</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>7</armorPenetrationSharp>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>2.35</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>7</armorPenetrationSharp>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>13</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.54</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_Groundrunner"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_Groundrunner"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Groundrunner"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1250</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Helixien.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Helixien.xml
deleted file mode 100644
index 994a5e6928..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Helixien.xml	
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Helixien"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Serpentine</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Helixien"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.00</MeleeDodgeChance>
-						<MeleeCritChance>0.5</MeleeCritChance>
-						<MeleeParryChance>0.16</MeleeParryChance>
-						<ArmorRating_Blunt>4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Helixien"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>slimy body</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>3.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>28</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_InfectedAerofleet.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_InfectedAerofleet.xml
deleted file mode 100644
index 385480201f..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_InfectedAerofleet.xml	
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_InfectedAerofleet"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_InfectedAerofleet"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.00</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_InfectedAerofleet"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2.5</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.035</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.01</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>tentacles</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Arms</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Ironhusk_Beetle.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Ironhusk_Beetle.xml
deleted file mode 100644
index 1eebce0976..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Ironhusk_Beetle.xml	
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_IronhuskBeetle"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_IronhuskBeetle"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>20</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_IronhuskBeetle"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_IronhuskBeetle"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.02</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.4</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_IronhuskBeetle"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>3.6</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.75</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_IronhuskBeetle"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_IronhuskBeetle"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_IronhuskBeetle"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1000</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Junglelisk.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Junglelisk.xml
deleted file mode 100644
index 7611bed52d..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Junglelisk.xml	
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Junglelisk"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Junglelisk"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Junglelisk"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Junglelisk"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Junglelisk"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left first leg</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right first leg</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>AA_ToxicSting</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_Junglelisk"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_Junglelisk"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Junglelisk"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>600</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Lockjaw.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Lockjaw.xml
deleted file mode 100644
index 173f4818a2..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Lockjaw.xml	
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Lockjaw"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Lockjaw"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.65</MeleeCritChance>
-						<MeleeParryChance>0.14</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Lockjaw"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>AA_LockJawDamage</li>
-								</capacities>
-								<power>45</power>
-								<cooldownTime>3.8</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>11.0</armorPenetrationSharp>
-								<armorPenetrationBlunt>20.0</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Luciferbug.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Luciferbug.xml
deleted file mode 100644
index 09a3f7930d..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Luciferbug.xml	
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_LuciferBug"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_LuciferBug"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_LuciferBug"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.65</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_LuciferBug"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.03</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_LuciferBug"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.65</cooldownTime>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_LuciferBug"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_LuciferBug"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_LuciferBug"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>250</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Mammoth_Worm.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Mammoth_Worm.xml
deleted file mode 100644
index 11cfb67d31..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Mammoth_Worm.xml	
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_MammothWorm"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="AA_MammothWorm"]/combatPower</xpath>
-					<value>
-						<combatPower>250</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_MammothWorm"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>24</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_MammothWorm"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_MammothWorm"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>2.7</MoveSpeed>
-						<MeleeDodgeChance>0.08</MeleeDodgeChance>
-						<MeleeCritChance>0.8</MeleeCritChance>
-						<MeleeParryChance>0.23</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_MammothWorm"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>body</label>
-								<capacities>
-									<li>AA_SiegeBlunt</li>
-								</capacities>
-								<power>43</power>
-								<cooldownTime>2.48</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>50</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>48</power>
-								<cooldownTime>2.68</cooldownTime>
-								<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<armorPenetrationBlunt>50</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_MammothWorm"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_MammothWorm"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_MammothWorm"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1500</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Mantrap.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Mantrap.xml
deleted file mode 100644
index 27e17d2a7f..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Mantrap.xml	
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Mantrap"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Mantrap"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.8</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Mantrap"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>0.2</ArmorRating_Sharp>
-						<MeleeDodgeChance>0.14</MeleeDodgeChance>
-						<MeleeCritChance>0.04</MeleeCritChance>
-						<MeleeParryChance>0.11</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Mantrap"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>razor barbs</label>
-								<capacities>
-									<li>AA_Acid</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>AA_Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_Mantrap"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_Mantrap"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Mantrap"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>875</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_MatureFleshbeast.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_MatureFleshbeast.xml
deleted file mode 100644
index 1e32e316b0..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_MatureFleshbeast.xml	
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_MatureFleshbeast"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- Remove the 'Swallow Whole' attack, since it doesn't work in CE and insta-kills instead. -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="AA_MatureFleshbeast"]/thingClass</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_MatureFleshbeast"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.01</MeleeDodgeChance>
-						<MeleeCritChance>0.23</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_MatureFleshbeast"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>2.56</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<armorPenetrationBlunt>9</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>3.51</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Meadow_Ave.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Meadow_Ave.xml
deleted file mode 100644
index b4dc1d707b..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Meadow_Ave.xml	
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_MeadowAve"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_MeadowAve"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.35</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_MeadowAve"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>13</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.78</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_MegaLouse.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_MegaLouse.xml
deleted file mode 100644
index 0edd04f977..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_MegaLouse.xml	
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_MegaLouse"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_MegaLouse"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_MegaLouse"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="AA_MegaLouse"]/combatPower</xpath>
-					<value>
-						<combatPower>50</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_MegaLouse"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>3.8</MoveSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_MegaLouse"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.03</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_MegaLouse"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tusk</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.65</cooldownTime>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_MegaLouse"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_MegaLouse"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_MegaLouse"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>337</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Metallovore.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Metallovore.xml
deleted file mode 100644
index 712720b12c..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Metallovore.xml	
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Metallovore"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Metallovore"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.02</MeleeDodgeChance>
-						<MeleeCritChance>0.18</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Metallovore"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>body</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>5</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>tentacles</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>0.75</cooldownTime>
-								<linkedBodyPartsGroup>AA_TentacleAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Mimes.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Mimes.xml
deleted file mode 100644
index 9dfcf57d8c..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Mimes.xml	
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Mime"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Mime"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Mime"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>25</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_MoribundGallatross.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_MoribundGallatross.xml
deleted file mode 100644
index 8e74f3de58..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_MoribundGallatross.xml	
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_GallatrossMoribund"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_GallatrossMoribund"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>26</ArmorRating_Blunt>
-						<ArmorRating_Sharp>13</ArmorRating_Sharp>
-						<MeleeDodgeChance>0.02</MeleeDodgeChance>
-						<MeleeCritChance>1.75</MeleeCritChance>
-						<MeleeParryChance>0.3</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_GallatrossMoribund"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>80</power>
-								<cooldownTime>2.48</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>80.226</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>56</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<armorPenetrationBlunt>36</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>47</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>40</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_GallatrossMoribund"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_GallatrossMoribund"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_GallatrossMoribund"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>11500</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<!-- Add Low Bleed Hediff -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_GallatrossMoribund"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_GallatrossMoribund"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_GallatrossMoribund"]/comps</xpath>
-					<value>
-						<li Class="AnimalBehaviours.CompProperties_InitialHediff">
-							<hediffname>AA_LowBleed</hediffname>
-							<hediffseverity>1</hediffseverity>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Murkling.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Murkling.xml
deleted file mode 100644
index 145783cb13..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Murkling.xml	
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Murkling"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Murkling"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.6</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Murkling"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.06</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.06</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>plague carrier</label>
-								<capacities>
-									<li>FO_PlaguedBite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.4</cooldownTime>
-								<armorPenetrationSharp>0.33</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>poisonous bite</label>
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.4</cooldownTime>
-								<armorPenetrationSharp>0.33</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_MycoidColossus.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_MycoidColossus.xml
deleted file mode 100644
index 6777b124a0..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_MycoidColossus.xml	
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_MycoidColossus"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_MycoidColossus"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.01</MeleeDodgeChance>
-						<MeleeCritChance>0.14</MeleeCritChance>
-						<MeleeParryChance>0.39</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_MycoidColossus"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>2.4</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>3.3</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Needlepost.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Needlepost.xml
deleted file mode 100644
index 4de7b64328..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Needlepost.xml	
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Needlepost"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Needlepost"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.15</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Needlepost"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>0.45</ArmorRating_Sharp>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Needlepost"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stings</label>
-								<capacities>
-									<li>AA_ToxicSting</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.3</cooldownTime>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>AA_Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_Needlepost"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_Needlepost"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Needlepost"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>750</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Needleroll.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Needleroll.xml
deleted file mode 100644
index 78c763e619..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Needleroll.xml	
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Needleroll"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Needleroll"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.8</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Needleroll"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>0.2</ArmorRating_Sharp>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.04</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Needleroll"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stings</label>
-								<capacities>
-									<li>AA_ToxicSting</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.35</cooldownTime>
-								<armorPenetrationSharp>0.14</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.55</cooldownTime>
-								<linkedBodyPartsGroup>AA_Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.14</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_Needleroll"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_Needleroll"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Needleroll"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>100</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_NightMule.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_NightMule.xml
deleted file mode 100644
index 8a5b88bf01..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_NightMule.xml	
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_NightMule"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_NightMule"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.04</MeleeDodgeChance>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>0.18</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_NightMule"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horns</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2.6</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_NightRam.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_NightRam.xml
deleted file mode 100644
index fb410176b4..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_NightRam.xml	
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_NightRam"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_NightRam"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.02</MeleeDodgeChance>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_NightRam"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2.6</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Night_Aves.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Night_Aves.xml
deleted file mode 100644
index 3653c17e7b..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Night_Aves.xml	
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_NightAve"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_NightAve"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency>0.8</NightVisionEfficiency>
-						<MeleeDodgeChance>0.45</MeleeDodgeChance>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_NightAve"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>13</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Nightling.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Nightling.xml
deleted file mode 100644
index 49feba9665..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Nightling.xml	
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Nightling"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Nightling"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>7.2</MoveSpeed>
-						<NightVisionEfficiency>0.8</NightVisionEfficiency>
-						<MeleeDodgeChance>0.37</MeleeDodgeChance>
-						<MeleeCritChance>0.18</MeleeCritChance>
-						<MeleeParryChance>0.08</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Nightling"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>AA_ToxicBite</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.144</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_OcularJelly.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_OcularJelly.xml
deleted file mode 100644
index 0f26f22241..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_OcularJelly.xml	
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_OcularJelly"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_OcularJelly"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.02</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_OcularJelly"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>tentacles</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.7</cooldownTime>
-								<linkedBodyPartsGroup>Arms</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_OcularNightling.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_OcularNightling.xml
deleted file mode 100644
index 7e6fd8453e..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_OcularNightling.xml	
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Ideology</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AA_OcularNightling"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Quadruped</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_OcularNightling"]/statBases/MoveSpeed</xpath>
-						<value>
-							<MoveSpeed>6.8</MoveSpeed>
-							<NightVisionEfficiency>0.8</NightVisionEfficiency>
-							<AimingAccuracy>0.8</AimingAccuracy>
-							<MeleeDodgeChance>0.37</MeleeDodgeChance>
-							<MeleeCritChance>0.21</MeleeCritChance>
-							<MeleeParryChance>0.12</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_OcularNightling"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>left claw</label>
-									<capacities>
-										<li>Scratch</li>
-									</capacities>
-									<power>10</power>
-									<cooldownTime>1</cooldownTime>
-									<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>20</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>0.25</armorPenetrationSharp>
-									<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>right claw</label>
-									<capacities>
-										<li>Scratch</li>
-									</capacities>
-									<power>10</power>
-									<cooldownTime>1</cooldownTime>
-									<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>20</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>0.25</armorPenetrationSharp>
-									<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<capacities>
-										<li>AA_ToxicBite</li>
-									</capacities>
-									<power>24</power>
-									<cooldownTime>1.5</cooldownTime>
-									<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>20</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>2.4</armorPenetrationSharp>
-									<armorPenetrationBlunt>6.544</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>4</power>
-									<cooldownTime>2</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>0.523</armorPenetrationBlunt>
-									<chanceFactor>0.2</chanceFactor>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Overgrown_Colossus.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Overgrown_Colossus.xml
deleted file mode 100644
index 77e97ba797..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Overgrown_Colossus.xml	
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_OvergrownColossus" or
-						defName="AA_AnimaColossus"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_OvergrownColossus" or
-						defName="AA_AnimaColossus"
-						]/statBases </xpath>
-					<value>
-						<MeleeDodgeChance>0.00</MeleeDodgeChance>
-						<MeleeCritChance>0.45</MeleeCritChance>
-						<MeleeParryChance>0.40</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_OvergrownColossus" or
-						defName="AA_AnimaColossus"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>2.4</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>3.3</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>25</armorPenetrationBlunt>
-								<chanceFactor>1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Pebble_Mit.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Pebble_Mit.xml
deleted file mode 100644
index bb496f687b..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Pebble_Mit.xml	
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_PebbleMit"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_PebbleMit"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>15</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_PebbleMit"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_PebbleMit"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.04</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_PebbleMit"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.2</cooldownTime>
-								<linkedBodyPartsGroup>TurtleBeakAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.33</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.750</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.750</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_PebbleMit"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_PebbleMit"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_PebbleMit"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>275</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_PedigreedRaptor.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_PedigreedRaptor.xml
deleted file mode 100644
index 1d33641718..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_PedigreedRaptor.xml	
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_PedigreedRaptor"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_PedigreedRaptor"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.27</MeleeDodgeChance>
-						<MeleeCritChance>0.13</MeleeCritChance>
-						<MeleeParryChance>0.08</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_PedigreedRaptor"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.96</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_PheonixOwlcat.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_PheonixOwlcat.xml
deleted file mode 100644
index 2999210b50..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_PheonixOwlcat.xml	
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_PhoenixOwlcat"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_PhoenixOwlcat"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.36</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_PhoenixOwlcat"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>0.9</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.06</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>0.9</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.06</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Plasmorph.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Plasmorph.xml
deleted file mode 100644
index 17a54cd76b..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Plasmorph.xml	
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Plasmorph"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Serpentine</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Plasmorph"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>20</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Plasmorph"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Plasmorph"]</xpath>
-					<value>
-						<butcherProducts>
-							<Prometheum>12</Prometheum>
-						</butcherProducts>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Plasmorph"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.01</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Plasmorph"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>eyestalk</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>AA_EyestalkAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_Plasmorph"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_Plasmorph"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Plasmorph"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>500</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Radyak.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Radyak.xml
deleted file mode 100644
index e86a46daf5..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Radyak.xml	
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Radyak"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Radyak"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.04</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.4</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Radyak"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.700</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>2.2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.125</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Raptor_Shrimp.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Raptor_Shrimp.xml
deleted file mode 100644
index bbb245563a..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Raptor_Shrimp.xml	
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_RaptorShrimp"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_RaptorShrimp"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_RaptorShrimp"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>4</ArmorRating_Blunt>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						<MeleeCritChance>0.34</MeleeCritChance>
-						<MeleeParryChance>0.4</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_RaptorShrimp"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left blade</label>
-								<capacities>
-									<li>AA_Pierce</li>
-								</capacities>
-								<power>48</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>AA_BladeAttackTool</linkedBodyPartsGroup>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right blade</label>
-								<capacities>
-									<li>AA_Pierce</li>
-								</capacities>
-								<power>48</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>AA_BladeAttackTool</linkedBodyPartsGroup>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>AA_Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.750</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.750</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_RaptorShrimp"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_RaptorShrimp"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_RaptorShrimp"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1100</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>200</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Ravager.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Ravager.xml
deleted file mode 100644
index fd8090a1d1..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Ravager.xml	
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Ravager"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Ravager"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>12</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Ravager"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Ravager"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>3.1</baseHealthScale>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Ravager"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.01</MeleeDodgeChance>
-						<MeleeCritChance>0.36</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Ravager"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>triple maw</label>
-								<capacities>
-									<li>AA_ExtraDamageMechanoidsClaws</li>
-								</capacities>
-								<power>43</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_Ravager"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_Ravager"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Ravager"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1400</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Rayhound.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Rayhound.xml
deleted file mode 100644
index d364155e38..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Rayhound.xml	
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_RayHound"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_RayHound"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_RayHound"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_RayHound"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.33</MeleeDodgeChance>
-						<MeleeCritChance>0.18</MeleeCritChance>
-						<MeleeParryChance>0.08</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_RayHound"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left tentacle</label>
-								<capacities>
-									<li>AA_EMPBlunt</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>AA_TentacleAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.523</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right tentacle</label>
-								<capacities>
-									<li>AA_EMPBlunt</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>AA_TentacleAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.523</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.66</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.78</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.644</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_RayHound"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_RayHound"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_RayHound"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>875</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Razorjack.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Razorjack.xml
deleted file mode 100644
index 46471d8c67..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Razorjack.xml	
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Razorjack"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Razorjack"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-						<MeleeParryChance>0.08</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Razorjack"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>AA_InfectedClaws</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.2</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>AA_InfectedClaws</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.2</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>razorfangs</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.9</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.225</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.350</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_RedGoo.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_RedGoo.xml
deleted file mode 100644
index 2f4c990ad3..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_RedGoo.xml	
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_RedGoo"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_RedGoo"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.02</MeleeDodgeChance>
-						<MeleeCritChance>0.06</MeleeCritChance>
-						<MeleeParryChance>0.04</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_RedGoo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tentacles</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>Arms</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_RedSpore.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_RedSpore.xml
deleted file mode 100644
index a8c10f68b4..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_RedSpore.xml	
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_RedSpore"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_RedSpore"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.08</MeleeDodgeChance>
-						<MeleeCritChance>0.06</MeleeCritChance>
-						<MeleeParryChance>0.10</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_RedSpore"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tentacles</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>Arms</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_RipperHound.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_RipperHound.xml
deleted file mode 100644
index 9add645679..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_RipperHound.xml	
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_RipperHound"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_RipperHound"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.11</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_RipperHound"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_RipperHound"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_RipperHound"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>AA_ExtraDamageInsectoidsClaws</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>AA_ExtraDamageInsectoidsClaws</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.4</chanceFactor>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.350</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_RipperHound"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_RipperHound"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_RipperHound"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>875</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_RoughPlatedMonitor.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_RoughPlatedMonitor.xml
deleted file mode 100644
index 3cb55375cc..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_RoughPlatedMonitor.xml	
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_RoughPlatedMonitor"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Serpentine</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_RoughPlatedMonitor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3.4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_RoughPlatedMonitor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_RoughPlatedMonitor"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.24</MeleeCritChance>
-						<MeleeParryChance>0.14</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_RoughPlatedMonitor"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>fangs</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>2.2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.9</chanceFactor>
-								<armorPenetrationSharp>0.7</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_RoughPlatedMonitor"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_RoughPlatedMonitor"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_RoughPlatedMonitor"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1000</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Royal_Aves.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Royal_Aves.xml
deleted file mode 100644
index 88ad3d5a27..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Royal_Aves.xml	
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_RoyalAve"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_RoyalAve"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_RoyalAve"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.55</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>13</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.6</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_SandLion.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_SandLion.xml
deleted file mode 100644
index 6b6e69122d..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_SandLion.xml	
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_SandLion"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_SandLion"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.56</MeleeDodgeChance>
-						<MeleeCritChance>0.24</MeleeCritChance>
-						<MeleeParryChance>0.14</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_SandLion"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Cut</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>0.72</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>25</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Cut</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>0.72</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>25</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-									<li>Stab</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>1.38</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>4.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.55</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_SandProwler.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_SandProwler.xml
deleted file mode 100644
index 13dd150680..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_SandProwler.xml	
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_SandProwler"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_SandProwler"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.66</MeleeDodgeChance>
-						<MeleeCritChance>0.27</MeleeCritChance>
-						<MeleeParryChance>0.17</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_SandProwler"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.6</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.6</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>32</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.55</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Sand_Squid.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Sand_Squid.xml
deleted file mode 100644
index 85389e1f04..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Sand_Squid.xml	
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_SandSquid"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Serpentine</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_SandSquid"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>18</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_SandSquid"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_SandSquid"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.08</MeleeCritChance>
-						<MeleeParryChance>0.4</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_SandSquid"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.68</cooldownTime>
-								<linkedBodyPartsGroup>AA_Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.14</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>tentacle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>AA_TentacleAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_SandSquid"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_SandSquid"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_SandSquid"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>750</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_ShadowCharger.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_ShadowCharger.xml
deleted file mode 100644
index cdcbb7717d..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_ShadowCharger.xml	
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_ShadowCharger"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_ShadowCharger"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.4</MeleeCritChance>
-						<MeleeParryChance>0.35</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_ShadowCharger"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>2.6</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_ShockGoat.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_ShockGoat.xml
deleted file mode 100644
index cd78078405..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_ShockGoat.xml	
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_ShockGoat"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_ShockGoat"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.07</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_ShockGoat"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>AA_Electric</li>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>AA_Electric</li>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.60</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>horns</label>
-								<capacities>
-									<li>AA_Electric</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.750</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Skiphound.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Skiphound.xml
deleted file mode 100644
index 293bb5d20b..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Skiphound.xml	
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Skiphound"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Skiphound"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>0.18</MeleeCritChance>
-						<MeleeParryChance>0.08</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Skiphound"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.144</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Skyeel.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Skyeel.xml
deleted file mode 100644
index a8a19c0e8f..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Skyeel.xml	
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Skyeel"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Skyeel"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.8</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Skyeel"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.3</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Skyeel"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						<MeleeCritChance>0.03</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Skyeel"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>AA_Electric</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>0.32</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_Skyeel"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_Skyeel"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Skyeel"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>812</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>450</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Slurrypede.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Slurrypede.xml
deleted file mode 100644
index fdb669efbe..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Slurrypede.xml	
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Slurrypede"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Slurrypede"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.17</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Slurrypede"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>20</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Slurrypede"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>9</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Slurrypede"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>2.7</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_Slurrypede"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_Slurrypede"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Slurrypede"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>3500</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>350</MaxOverHeal>
-							<MinArmorPct>0.5</MinArmorPct>
-							<MinArmorValueSharp>6</MinArmorValueSharp>
-							<MinArmorValueBlunt>12</MinArmorValueBlunt>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_SpinedGow.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_SpinedGow.xml
deleted file mode 100644
index 70a841fb10..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_SpinedGow.xml	
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_SpinedGow"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_SpinedGow"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.04</MeleeDodgeChance>
-						<MeleeCritChance>0.32</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_SpinedGow"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>2.64</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_SpitterDryad.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_SpitterDryad.xml
deleted file mode 100644
index 35f5b87fa6..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_SpitterDryad.xml	
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Ideology</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_Dryad_Spitter"]/statBases</xpath>
-						<value>
-							<AimingAccuracy>0.6</AimingAccuracy>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_Dryad_Spitter"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
-						</value>
-					</li>
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_Dryad_Spitter"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>5</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="AA_Dryad_Spitter"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AA_Dryad_Spitter"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_Dryad_Spitter"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>487</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>600</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<MinArmorPct>0.75</MinArmorPct>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Swarmling.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Swarmling.xml
deleted file mode 100644
index eca18b547d..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Swarmling.xml	
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Swarmling"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Swarmling"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.33</MeleeDodgeChance>
-						<MeleeCritChance>0</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Swarmling"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>AA_SwarmlingClaws</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>0.75</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.316</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>AA_SwarmlingClaws</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>0.75</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.316</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.63</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.844</armorPenetrationBlunt>
-								<chanceFactor>0.7</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>0.323</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_TarGuzzler.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_TarGuzzler.xml
deleted file mode 100644
index c330a05e74..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_TarGuzzler.xml	
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_TarGuzzler"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_TarGuzzler"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>4</ArmorRating_Blunt>
-						<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
-						<MeleeDodgeChance>0.02</MeleeDodgeChance>
-						<MeleeCritChance>0.35</MeleeCritChance>
-						<MeleeParryChance>0.23</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_TarGuzzler"]/tools</xpath>
-					<value>
-						<tools>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>gaping maw</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.9</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<armorPenetrationSharp>7.5</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_TeratogenicOriginator.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_TeratogenicOriginator.xml
deleted file mode 100644
index d66323d778..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_TeratogenicOriginator.xml	
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_TeratogenicOriginator"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_TeratogenicOriginator"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						<MeleeCritChance>0.04</MeleeCritChance>
-						<MeleeParryChance>0.3</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_TeratogenicOriginator"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tentacles</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.35</cooldownTime>
-								<linkedBodyPartsGroup>Arms</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.7</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Terramorph.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Terramorph.xml
deleted file mode 100644
index 0d6f9f0203..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Terramorph.xml	
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Terramorph"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Terramorph"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>12</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Terramorph"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>9</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Terramorph"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.02</MeleeDodgeChance>
-						<MeleeCritChance>0.27</MeleeCritChance>
-						<MeleeParryChance>0.4</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Terramorph"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fangs</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>3.8</cooldownTime>
-								<linkedBodyPartsGroup>TurtleBeakAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<armorPenetrationBlunt>40</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.75</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_Terramorph"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_Terramorph"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Terramorph"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>625</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Tetra_Slug.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Tetra_Slug.xml
deleted file mode 100644
index bca8692850..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Tetra_Slug.xml	
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_TetraSlug"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Serpentine</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_TetraSlug"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.06</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>0.38</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_TetraSlug"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>body</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>1.88</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>41</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>13</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Thermadon.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Thermadon.xml
deleted file mode 100644
index dfdbe91ee8..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Thermadon.xml	
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Thermadon"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Thermadon"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>10</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Thermadon"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>7.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Thermadon"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency>0.5</NightVisionEfficiency>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Thermadon"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>2</baseHealthScale>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Thermadon"]</xpath>
-					<value>
-						<butcherProducts>
-							<FSX>4</FSX>
-							<Prometheum>8</Prometheum>
-						</butcherProducts>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Thermadon"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head claw</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>3</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>5</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head claw</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>2.8</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_Thermadon"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_Thermadon"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Thermadon"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1125</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Thunderbeast.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Thunderbeast.xml
deleted file mode 100644
index f9a91711f8..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Thunderbeast.xml	
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Thunderbeast"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Thunderbeast"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2.8</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Thunderbeast"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.65</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- Don't know about balancing -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Thunderbeast"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.16</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Thunderbeast"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>AA_Electric</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>2.6</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2.4</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.4</chanceFactor>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>AA_Electric</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>3</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_Thunderbeast"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_Thunderbeast"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Thunderbeast"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>875</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Thunderox.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Thunderox.xml
deleted file mode 100644
index e028d198ba..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Thunderox.xml	
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Thunderox"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Thunderox"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.45</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Thunderox"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>battleram</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>3</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>runehorn</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>2.6</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_UnblinkingEye.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_UnblinkingEye.xml
deleted file mode 100644
index 07ac03b686..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_UnblinkingEye.xml	
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Ideology</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AA_UnblinkingEye"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Birdlike</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_UnblinkingEye"]/statBases/MoveSpeed</xpath>
-						<value>
-							<MoveSpeed>4</MoveSpeed>
-							<NightVisionEfficiency>0.8</NightVisionEfficiency>
-							<AimingAccuracy>1</AimingAccuracy>
-							<MeleeDodgeChance>0.70</MeleeDodgeChance>
-							<MeleeCritChance>0.80</MeleeCritChance>
-							<MeleeParryChance>0.1</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_UnblinkingEye"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>9.85</ArmorRating_Blunt>
-						</value>
-					</li>
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_UnblinkingEye"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>4.25</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_UnblinkingEye"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<capacities>
-										<li>Bite</li>
-									</capacities>
-									<power>48</power>
-									<cooldownTime>2.0</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationSharp>12</armorPenetrationSharp>
-									<armorPenetrationBlunt>44</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>36</power>
-									<cooldownTime>3</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>64</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_UnblinkingEye"]/comps</xpath>
-						<value>
-							<li Class="AnimalBehaviours.CompProperties_InitialHediff">
-								<hediffname>AA_LowBleed</hediffname>
-								<hediffseverity>1</hediffseverity>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="AA_UnblinkingEye"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AA_UnblinkingEye"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_UnblinkingEye"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>6750</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>450</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<MinArmorPct>0.5</MinArmorPct>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_WaywardAssembler.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_WaywardAssembler.xml
deleted file mode 100644
index 8bc0d54a8f..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_WaywardAssembler.xml	
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_WaywardMobileAssembler"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_WaywardMobileAssembler"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.17</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_WaywardMobileAssembler"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_WaywardMobileAssembler"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>7</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_WaywardMobileAssembler"]/comps/li[@Class ="AnimalBehaviours.CompProperties_AnimalProduct"]/randomItems</xpath>
-					<value>
-						<li>FSX</li>
-						<li>Prometheum</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_WaywardMobileAssembler"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>2.4</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_WaywardMobileAssembler"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_WaywardMobileAssembler"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_WaywardMobileAssembler"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>3500</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>350</MaxOverHeal>
-							<MinArmorPct>0.5</MinArmorPct>
-							<MinArmorValueSharp>4</MinArmorValueSharp>
-							<MinArmorValueBlunt>10</MinArmorValueBlunt>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Wildpawn.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Wildpawn.xml
deleted file mode 100644
index 88e635ef57..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Wildpawn.xml	
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Wildpawn"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Wildpawn"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>20</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Wildpawn"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Wildpawn"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.07</MeleeDodgeChance>
-						<MeleeCritChance>0.04</MeleeCritChance>
-						<MeleeParryChance>0.11</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Wildpawn"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left paw</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>13</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right paw</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>13</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Wildpod.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Wildpod.xml
deleted file mode 100644
index ec064473b7..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Wildpod.xml	
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_Wildpod"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Wildpod"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>48</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Wildpod"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>23</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_Wildpod"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.06</MeleeDodgeChance>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>0.28</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_Wildpod"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left paw</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right paw</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.21</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Windbeast.xml b/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Windbeast.xml
deleted file mode 100644
index 480ec05cf1..0000000000
--- a/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Windbeast.xml	
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AA_WindBeast"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_WindBeast"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2.8</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_WindBeast"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.65</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_WindBeast"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.16</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AA_WindBeast"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>2.6</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2.4</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.4</chanceFactor>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>3</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AA_WindBeast"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AA_WindBeast"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AA_WindBeast"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>875</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Animals/VFE_Mechs/VFESlurrymaster.xml b/Patches/Alpha Animals/VFE_Mechs/VFESlurrymaster.xml
deleted file mode 100644
index c16a3dd848..0000000000
--- a/Patches/Alpha Animals/VFE_Mechs/VFESlurrymaster.xml	
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Factions Expanded - Mechanoids</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Slurrymaster"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>QuadrupedLow</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Slurrymaster"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.12</MeleeDodgeChance>
-							<MeleeCritChance>0.1</MeleeCritChance>
-							<MeleeParryChance>0.17</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Slurrymaster"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>22</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Slurrymaster"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>10</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Slurrymaster"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>16</power>
-									<cooldownTime>2.7</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>12</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Slurrymaster"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Slurrymaster"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Slurrymaster"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>4500</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>450</MaxOverHeal>
-								<MinArmorPct>0.5</MinArmorPct>
-								<MinArmorValueSharp>6</MinArmorValueSharp>
-								<MinArmorValueBlunt>12</MinArmorValueBlunt>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Biomes/Items_Resource_Stuff.xml b/Patches/Alpha Biomes/Items_Resource_Stuff.xml
deleted file mode 100644
index cb0e2f5196..0000000000
--- a/Patches/Alpha Biomes/Items_Resource_Stuff.xml	
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Biomes</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======== Psychotropic Fungus ======== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AB_PsychotropicFungus"]/statBases</xpath>
-					<value>
-						<Bulk>0.05</Bulk>
-					</value>
-				</li>
-
-				<!-- ======== Alcyonite Chunk ======== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AB_AlcyoniteChunk"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AB_AlcyoniteChunk"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1.1</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AB_AlcyoniteChunk"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1.7</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AB_AlcyoniteChunk"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<!-- ======== Red, Crystal and Mushroom Wood ======== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GU_RedWood" or defName="AB_MushroomWoodLog" or defName="AB_CrystalWood"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.99</cooldownTime>
-								<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AB_MushroomWoodLog" or defName="AB_CrystalWood"]</xpath>
-					<value>
-						<li Class="CombatExtended.StuffToughnessMultiplierExtensionCE">
-							<toughnessMultiplier>4</toughnessMultiplier>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationFindMod">
-					<mods>
-						<li>Alpha Animals</li>
-					</mods>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="GU_RedWood" or defName="AB_MushroomWoodLog" or defName="AB_CrystalWood"]/equippedStatOffsets</xpath>
-								<value>
-									<equippedStatOffsets>
-										<MeleeCritChance>0.2</MeleeCritChance>
-										<MeleeParryChance>1</MeleeParryChance>
-										<MeleeDodgeChance>0.13</MeleeDodgeChance>
-									</equippedStatOffsets>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="AB_MushroomWoodLog" or defName="AB_CrystalWood"]/statBases/StuffPower_Armor_Sharp</xpath>
-								<value>
-									<Bulk>0.07</Bulk>
-									<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
-									<StuffPower_Armor_Sharp>0.1</StuffPower_Armor_Sharp>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="GU_RedWood" or defName="AB_MushroomWoodLog" or defName="AB_CrystalWood"]/statBases/StuffPower_Armor_Blunt</xpath>
-								<value>
-									<StuffPower_Armor_Blunt>0.2</StuffPower_Armor_Blunt>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="GU_RedWood" or defName="AB_MushroomWoodLog" or defName="AB_CrystalWood"]/statBases/StuffPower_Armor_Heat</xpath>
-								<value>
-									<StuffPower_Armor_Heat>0.025</StuffPower_Armor_Heat>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-
-					<nomatch Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="GU_RedWood" or defName="AB_MushroomWoodLog" or defName="AB_CrystalWood"]/statBases/StuffPower_Armor_Sharp</xpath>
-								<value>
-									<Bulk>0.07</Bulk>
-									<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
-									<StuffPower_Armor_Sharp>0.1</StuffPower_Armor_Sharp>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="GU_RedWood" or defName="AB_MushroomWoodLog" or defName="AB_CrystalWood"]/statBases/StuffPower_Armor_Blunt</xpath>
-								<value>
-									<StuffPower_Armor_Blunt>0.2</StuffPower_Armor_Blunt>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="GU_RedWood" or defName="AB_MushroomWoodLog" or defName="AB_CrystalWood"]/statBases/StuffPower_Armor_Heat</xpath>
-								<value>
-									<StuffPower_Armor_Heat>0.025</StuffPower_Armor_Heat>
-								</value>
-							</li>
-
-						</operations>
-					</nomatch>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Biomes/RangedIndustrialGrenades.xml b/Patches/Alpha Biomes/RangedIndustrialGrenades.xml
deleted file mode 100644
index baa7b33aab..0000000000
--- a/Patches/Alpha Biomes/RangedIndustrialGrenades.xml	
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Biomes</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Poison Dart ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AB_WeaponPoisonDart</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1</SwayFactor>
-						<Bulk>1</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>AB_WeaponPoisonDartProjectile</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>14</range>
-						<soundCast>ThrowGrenade</soundCast>
-						<muzzleFlashScale>0</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AB_WeaponPoisonDart"]</xpath>
-					<value>
-						<equippedAngleOffset>60</equippedAngleOffset>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="AB_WeaponPoisonDartProjectile"]/projectile</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.ProjectilePropertiesCE</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AB_WeaponPoisonDartProjectile"]</xpath>
-					<value>
-						<thingClass>CombatExtended.BulletCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AB_WeaponPoisonDartProjectile"]/projectile</xpath>
-					<value>
-						<armorPenetrationSharp>1.5</armorPenetrationSharp>
-						<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AB_WeaponPoisonDartProjectile"]/projectile/speed</xpath>
-					<value>
-						<speed>12</speed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AB_WeaponPoisonDartProjectile"]/projectile/damageAmountBase</xpath>
-					<value>
-						<damageAmountBase>5</damageAmountBase>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Biomes/TarShell.xml b/Patches/Alpha Biomes/TarShell.xml
deleted file mode 100644
index 8e30a58780..0000000000
--- a/Patches/Alpha Biomes/TarShell.xml	
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Biomes</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<CombatExtended.AmmoCategoryDef>
-							<defName>Tar</defName>
-							<label>Tar</label>
-							<description>Releases a splattering of thick, black substance.</description>
-						</CombatExtended.AmmoCategoryDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AB_Shell_Tar"]</xpath>
-					<value>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBaseCraftableBase">
-							<defName>AB_Shell_Tar</defName>
-							<label>81mm mortar shell (Tar)</label>
-							<graphicData>
-								<texPath>Things/Item/Resource/AB_Shell_Tar</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>30.03</MarketValue>
-								<Mass>5</Mass>
-								<Bulk>8.34</Bulk>
-							</statBases>
-							<ammoClass>Tar</ammoClass>
-							<detonateProjectile>Bullet_81mmMortarShell_Tar</detonateProjectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="Base81mmMortarShell">
-							<defName>Bullet_81mmMortarShell_Tar</defName>
-							<label>81mm mortar shell (Tar)</label>
-							<graphicData>
-								<texPath>Things/Projectile/ShellHighExplosive</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>AB_Tar</damageDef>
-								<damageAmountBase>40</damageAmountBase>
-								<explosionRadius>3.5</explosionRadius>
-								<flyOverhead>true</flyOverhead>
-								<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-								<soundExplode>Explosion_Smoke</soundExplode>
-								<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
-								<soundAmbient>MortarRound_Ambient</soundAmbient>
-								<postExplosionSpawnThingDef>AB_Filth_Tar</postExplosionSpawnThingDef>
-								<postExplosionSpawnChance>0.8</postExplosionSpawnChance>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_81mmMortarShell"]/ammoTypes</xpath>
-					<value>
-						<AB_Shell_Tar>Bullet_81mmMortarShell_Tar</AB_Shell_Tar>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAB_Shell_Tar</defName>
-							<label>make 81mm tar mortar shell x2</label>
-							<description>Craft 2 tar shells.</description>
-							<jobString>Making 81mm tar shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>25</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>AB_AsphaltBucket</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-									<li>AB_AsphaltBucket</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<AB_Shell_Tar>2</AB_Shell_Tar>
-							</products>
-							<workAmount>3000</workAmount>
-							<researchPrerequisite>Mortars</researchPrerequisite>
-						</RecipeDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Biomes/Tar_IED.xml b/Patches/Alpha Biomes/Tar_IED.xml
deleted file mode 100644
index c15dd5e45e..0000000000
--- a/Patches/Alpha Biomes/Tar_IED.xml	
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Biomes</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === IED === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AB_TrapIED_Tar"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>10</Steel>
-							<ComponentIndustrial>1</ComponentIndustrial>
-							<AB_ProcessedResin>1</AB_ProcessedResin>
-						</costList>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Genes - Insectoid Mutations/HediffDefs/Hediffs_Mutations_CE.xml b/Patches/Alpha Genes - Insectoid Mutations/HediffDefs/Hediffs_Mutations_CE.xml
deleted file mode 100644
index 41e786d87b..0000000000
--- a/Patches/Alpha Genes - Insectoid Mutations/HediffDefs/Hediffs_Mutations_CE.xml	
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Genes - Insectoid Mutations</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AG_VFEI_VenomGland"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>venom gland</label>
-								<capacities>
-									<li>SpittingOnPawn</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4</cooldownTime>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AG_VFEI_PneumaticClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claw</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>3.6</cooldownTime>
-								<armorPenetrationBlunt>22.05</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Genes/AG_Royalty/HediffDefs/HediffDefs_Patch.xml b/Patches/Alpha Genes/AG_Royalty/HediffDefs/HediffDefs_Patch.xml
deleted file mode 100644
index dbe927f329..0000000000
--- a/Patches/Alpha Genes/AG_Royalty/HediffDefs/HediffDefs_Patch.xml	
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Genes</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Royalty</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<!-- ======= Psychic Sight NV ======= -->
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/HediffDef[defName="AG_PsychicSight"]/stages/li[4]</xpath>
-						<value>
-							<statOffsets>
-								<NightVisionEfficiency>0.2</NightVisionEfficiency>
-							</statOffsets>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/HediffDef[defName="AG_PsychicSight"]/stages/li[5]</xpath>
-						<value>
-							<statOffsets>
-								<NightVisionEfficiency>0.4</NightVisionEfficiency>
-							</statOffsets>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/HediffDef[defName="AG_PsychicSight"]/stages/li[6]</xpath>
-						<value>
-							<statOffsets>
-								<NightVisionEfficiency>0.6</NightVisionEfficiency>
-							</statOffsets>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/HediffDef[defName="AG_PsychicSight"]/stages/li[7]</xpath>
-						<value>
-							<statOffsets>
-								<NightVisionEfficiency>0.8</NightVisionEfficiency>
-							</statOffsets>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Genes/AbilityDefs/AbilityDefs_Patch.xml b/Patches/Alpha Genes/AbilityDefs/AbilityDefs_Patch.xml
deleted file mode 100644
index 5dc44b2cd6..0000000000
--- a/Patches/Alpha Genes/AbilityDefs/AbilityDefs_Patch.xml	
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Genes</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= Wing-Powered Jump ======= -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AbilityDef[defName="AG_WingPoweredJump"]/verbProperties/range</xpath>
-					<value>
-						<range>8.9</range>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Genes/DamageDefs/DamageDefs_Patch.xml b/Patches/Alpha Genes/DamageDefs/DamageDefs_Patch.xml
deleted file mode 100644
index 86ce67ad36..0000000000
--- a/Patches/Alpha Genes/DamageDefs/DamageDefs_Patch.xml	
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Genes</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= Patch-out melee stun mechanic from ranged blunt damage ======= -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/DamageDef[defName="AG_RangedBlunt"]/*[self::bluntStunDuration or self::bluntStunChancePerDamagePctOfCorePartToHeadCurve or self::bluntStunChancePerDamagePctOfCorePartToBodyCurve]</xpath>
-				</li>
-
-				<!-- ======= Electric Shock ======= -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/DamageDef[defName="AG_Electric"]</xpath>
-					<value>
-						<li Class="CombatExtended.DamageDefExtensionCE">
-							<isAmbientDamage>true</isAmbientDamage>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[defName="AG_Electric"]/armorCategory</xpath>
-					<value>
-						<armorCategory>Electric</armorCategory>
-					</value>
-				</li>
-
-				<!-- ======= Acid Spit ======= -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/DamageDef[defName="AG_AcidSpit"]</xpath>
-					<value>
-						<li Class="CombatExtended.DamageDefExtensionCE">
-							<isAmbientDamage>true</isAmbientDamage>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Genes/GeneDefs/GeneDefs_Archite.xml b/Patches/Alpha Genes/GeneDefs/GeneDefs_Archite.xml
deleted file mode 100644
index d987710fa9..0000000000
--- a/Patches/Alpha Genes/GeneDefs/GeneDefs_Archite.xml	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Genes</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/GeneDef[defName="AG_HeatImmunity"]/damageFactors</xpath>
-					<value>
-						<PrometheumFlame>0.0</PrometheumFlame>
-						<Flame_Secondary>0.0</Flame_Secondary>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Genes/GeneDefs/GeneDefs_Armour.xml b/Patches/Alpha Genes/GeneDefs/GeneDefs_Armour.xml
deleted file mode 100644
index af65219b72..0000000000
--- a/Patches/Alpha Genes/GeneDefs/GeneDefs_Armour.xml	
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Genes</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/GeneDef[defName="AG_FungalSkin"]/customEffectDescriptions</xpath>
-					<value>
-						<customEffectDescriptions>
-							<li>+3/4.5 blunt/sharp natural armour. +25% injury healing factor.</li>
-							<li>Fires will cause permanent wounds.</li>
-						</customEffectDescriptions>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/GeneDef[defName="AG_ArmourMinor"]/customEffectDescriptions</xpath>
-					<value>
-						<customEffectDescriptions>
-							<li>+1/1.5 blunt/sharp natural armour.</li>
-						</customEffectDescriptions>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/GeneDef[defName="AG_ArmourMedium"]/customEffectDescriptions</xpath>
-					<value>
-						<customEffectDescriptions>
-							<li>+2/3 blunt/sharp natural armour.</li>
-						</customEffectDescriptions>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/GeneDef[defName="AG_ArmourMajor"]/customEffectDescriptions</xpath>
-					<value>
-						<customEffectDescriptions>
-							<li>+2.5/3.75 blunt/sharp natural armour.</li>
-						</customEffectDescriptions>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Genes/GeneDefs/GeneDefs_BodySize.xml b/Patches/Alpha Genes/GeneDefs/GeneDefs_BodySize.xml
deleted file mode 100644
index 1c0ec3d57e..0000000000
--- a/Patches/Alpha Genes/GeneDefs/GeneDefs_BodySize.xml	
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Genes</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/GeneDef[defName="AG_LargerBodySize"]/statFactors</xpath>
-					<value>
-						<CarryWeight>1.25</CarryWeight>
-						<CarryBulk>1.25</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/GeneDef[defName="AG_LargerBodySize"]/statFactors/IncomingDamageFactor</xpath>
-					<value>
-						<IncomingDamageFactor>0.9</IncomingDamageFactor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/GeneDef[defName="AG_SmallerBodySize"]/statFactors</xpath>
-					<value>
-						<CarryWeight>0.75</CarryWeight>
-						<CarryBulk>0.75</CarryBulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Genes/GeneDefs/GeneDefs_Health.xml b/Patches/Alpha Genes/GeneDefs/GeneDefs_Health.xml
deleted file mode 100644
index fd49a7484f..0000000000
--- a/Patches/Alpha Genes/GeneDefs/GeneDefs_Health.xml	
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Genes</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/GeneDef[defName="AG_PackMule"]/statFactors</xpath>
-					<value>
-						<CarryWeight>1.5</CarryWeight>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/GeneDef[defName="AG_FrailBack"]/statFactors</xpath>
-					<value>
-						<CarryWeight>0.5</CarryWeight>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Genes/HediffDefs/Hediffs_Ability.xml b/Patches/Alpha Genes/HediffDefs/Hediffs_Ability.xml
deleted file mode 100644
index 6a6bdcbd76..0000000000
--- a/Patches/Alpha Genes/HediffDefs/Hediffs_Ability.xml	
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Genes</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AG_LungRotStrengthHediff"]/stages/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ArmorRating_Blunt>1.0</ArmorRating_Blunt>
-							<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-							<InjuryHealingFactor>0.15</InjuryHealingFactor>
-						</statOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Genes/HediffDefs/Hediffs_Armour.xml b/Patches/Alpha Genes/HediffDefs/Hediffs_Armour.xml
deleted file mode 100644
index d8f2d02b6d..0000000000
--- a/Patches/Alpha Genes/HediffDefs/Hediffs_Armour.xml	
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Genes</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AG_FungalSkin"]/stages/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ArmorRating_Blunt>3.0</ArmorRating_Blunt>
-							<ArmorRating_Sharp>4.5</ArmorRating_Sharp>
-							<InjuryHealingFactor>0.25</InjuryHealingFactor>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AG_ArmourMinor"]/stages/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ArmorRating_Blunt>1.0</ArmorRating_Blunt>
-							<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AG_ArmourMedium"]/stages/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ArmorRating_Blunt>2.0</ArmorRating_Blunt>
-							<ArmorRating_Sharp>3.0</ArmorRating_Sharp>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AG_ArmourMajor"]/stages/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ArmorRating_Blunt>2.5</ArmorRating_Blunt>
-							<ArmorRating_Sharp>3.75</ArmorRating_Sharp>
-						</statOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Genes/HediffDefs/Hediffs_Attacks.xml b/Patches/Alpha Genes/HediffDefs/Hediffs_Attacks.xml
deleted file mode 100644
index 9d3bca3022..0000000000
--- a/Patches/Alpha Genes/HediffDefs/Hediffs_Attacks.xml	
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Genes</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AG_HornAttack"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationSharp>1.0</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AG_ChainsawHands"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>chainsaw</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.0</cooldownTime>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AG_ScytherHands"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>scyther blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.3</cooldownTime>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.0</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AG_ClawedHands"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>clawed hand</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.3</cooldownTime>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AG_CrabClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claw</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>2.0</cooldownTime>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AG_VenomFangs"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>venom fangs</label>
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>2.0</cooldownTime>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.0</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AG_AcidFangs"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>acid fangs</label>
-								<capacities>
-									<li>AG_Acid</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>2.0</cooldownTime>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Genes/HediffDefs/Hediffs_Mechanitor.xml b/Patches/Alpha Genes/HediffDefs/Hediffs_Mechanitor.xml
deleted file mode 100644
index 8dccc19780..0000000000
--- a/Patches/Alpha Genes/HediffDefs/Hediffs_Mechanitor.xml	
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Genes</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= Reactive Armour ======= -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AG_MechRepairBoost"]/stages/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ArmorRating_Blunt>2</ArmorRating_Blunt>
-							<ArmorRating_Sharp>1</ArmorRating_Sharp>
-						</statOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Genes/HediffDefs/Hediffs_MetalResource.xml b/Patches/Alpha Genes/HediffDefs/Hediffs_MetalResource.xml
deleted file mode 100644
index df4d7407e7..0000000000
--- a/Patches/Alpha Genes/HediffDefs/Hediffs_MetalResource.xml	
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Genes</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= Reactive Armour ======= -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AG_ReactiveArmourHediff"]/stages/li[1]/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
-							<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AG_ReactiveArmourHediff"]/stages/li[2]/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ArmorRating_Blunt>2.0</ArmorRating_Blunt>
-							<ArmorRating_Sharp>3.0</ArmorRating_Sharp>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AG_ReactiveArmourHediff"]/stages/li[3]/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ArmorRating_Blunt>4.0</ArmorRating_Blunt>
-							<ArmorRating_Sharp>6.0</ArmorRating_Sharp>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AG_ReactiveArmourHediff"]/stages/li[4]/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ArmorRating_Blunt>8.0</ArmorRating_Blunt>
-							<ArmorRating_Sharp>12.0</ArmorRating_Sharp>
-						</statOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Genes/ThingDefs_Misc/Projectiles_Patch.xml b/Patches/Alpha Genes/ThingDefs_Misc/Projectiles_Patch.xml
deleted file mode 100644
index 0b61d52f96..0000000000
--- a/Patches/Alpha Genes/ThingDefs_Misc/Projectiles_Patch.xml	
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Genes</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= Mineral Clump ======= -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AG_Rocks"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<damageDef>AG_RangedBlunt</damageDef>
-							<speed>55</speed>
-							<damageAmountBase>20</damageAmountBase>
-							<armorPenetrationBlunt>20</armorPenetrationBlunt>
-						</projectile>
-					</value>
-				</li>
-
-				<!-- ======= Web ======= -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AG_Web"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>Stun</damageDef>
-							<speed>15</speed>
-							<damageAmountBase>15</damageAmountBase>
-						</projectile>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Genes/ThingDefs_Races/Races_OcularSlinger.xml b/Patches/Alpha Genes/ThingDefs_Races/Races_OcularSlinger.xml
deleted file mode 100644
index 16378bdc1b..0000000000
--- a/Patches/Alpha Genes/ThingDefs_Races/Races_OcularSlinger.xml	
+++ /dev/null
@@ -1,360 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Genes</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Races Expanded - Phytokin</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[@Name="AG_BaseInsect"]</xpath>
-						<value>
-							<li Class="CombatExtended.PartialArmorExt">
-								<stats>
-									<li>
-										<useStatic>false</useStatic>
-										<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
-										<parts>
-											<li>InsectLeg</li>
-										</parts>
-									</li>
-									<li>
-										<useStatic>false</useStatic>
-										<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
-										<parts>
-											<li>InsectLeg</li>
-										</parts>
-									</li>
-								</stats>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[@Name="AG_BaseInsect"]</xpath>
-						<value>
-							<li Class="CombatExtended.PartialArmorExt">
-								<stats>
-									<li>
-										<useStatic>false</useStatic>
-										<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-										<parts>
-											<li>AG_LeftPincer</li>
-											<li>AG_RightPincer</li>
-										</parts>
-									</li>
-									<li>
-										<useStatic>false</useStatic>
-										<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
-										<parts>
-											<li>AG_LeftPincer</li>
-											<li>AG_RightPincer</li>
-										</parts>
-									</li>
-								</stats>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[@Name="AG_BaseInsect"]/statBases</xpath>
-						<value>
-							<PartialArmorBody>0</PartialArmorBody>
-						</value>
-					</li>
-
-					<!-- ======= Eye Projectile ======= -->
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AG_EyeProjectile"]</xpath>
-						<value>
-							<thingClass>CombatExtended.BulletCE</thingClass>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AG_EyeProjectile"]/projectile</xpath>
-						<value>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>AG_RangedBlunt</damageDef>
-								<speed>55</speed>
-								<damageAmountBase>10</damageAmountBase>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</projectile>
-						</value>
-					</li>
-
-					<!-- ======= Ocular Slinger ======= -->
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AG_OcularSlinger"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>QuadrupedLow</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AG_OcularSlinger"]/statBases</xpath>
-						<value>
-							<AimingAccuracy>0.7</AimingAccuracy>
-							<MeleeDodgeChance>0.1</MeleeDodgeChance>
-							<MeleeCritChance>0.4</MeleeCritChance>
-							<MeleeParryChance>0.4</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AG_OcularSlinger"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>4</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AG_OcularSlinger"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>2</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AG_OcularSlinger"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>left pincer</label>
-									<capacities>
-										<li>Scratch</li>
-									</capacities>
-									<power>26</power>
-									<cooldownTime>1.68</cooldownTime>
-									<linkedBodyPartsGroup>AG_PincerAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationSharp>3</armorPenetrationSharp>
-									<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>right pincer</label>
-									<capacities>
-										<li>Scratch</li>
-									</capacities>
-									<power>26</power>
-									<cooldownTime>1.68</cooldownTime>
-									<linkedBodyPartsGroup>AG_PincerAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationSharp>3</armorPenetrationSharp>
-									<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<capacities>
-										<li>AG_ToxicSting</li>
-									</capacities>
-									<power>24</power>
-									<cooldownTime>1.8</cooldownTime>
-									<linkedBodyPartsGroup>AG_Sting</linkedBodyPartsGroup>
-									<armorPenetrationSharp>10</armorPenetrationSharp>
-									<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>4</power>
-									<cooldownTime>2</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-									<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-									<chanceFactor>0.1</chanceFactor>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AG_OcularSlinger"]/verbs</xpath>
-						<value>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>AG_EyeProjectile</defaultProjectile>
-									<warmupTime>2</warmupTime>
-									<burstShotCount>3</burstShotCount>
-									<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-									<minRange>2</minRange>
-									<range>18</range>
-									<soundCast>AG_Throw</soundCast>
-									<muzzleFlashScale>0</muzzleFlashScale>
-									<label>eye</label>
-									<commonality>0.8</commonality>
-								</li>
-							</verbs>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="AG_OcularSlinger"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AG_OcularSlinger"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AG_OcularSlinger"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>1125</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>600</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<MinArmorPct>0.5</MinArmorPct>
-							</li>
-						</value>
-					</li>
-
-					<!-- ======= AG_ScorpionLike Body ======= -->
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/groups</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart</xpath>
-							<value>
-								<groups>
-									<li>CoveredByNaturalArmor</li>
-								</groups>
-							</value>
-						</nomatch>
-						<match Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</match>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/parts/li[def="AG_Thorax"]/groups</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/parts/li[def="AG_Thorax"]</xpath>
-							<value>
-								<groups>
-									<li>CoveredByNaturalArmor</li>
-								</groups>
-							</value>
-						</nomatch>
-						<match Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/parts/li[def="AG_Thorax"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</match>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/parts/li[def="Pronotum"]/groups</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/parts/li[def="Pronotum"]</xpath>
-							<value>
-								<groups>
-									<li>CoveredByNaturalArmor</li>
-								</groups>
-							</value>
-						</nomatch>
-						<match Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/parts/li[def="Pronotum"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</match>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/groups</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]</xpath>
-							<value>
-								<groups>
-									<li>CoveredByNaturalArmor</li>
-								</groups>
-							</value>
-						</nomatch>
-						<match Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</match>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/parts/li[def="AG_InsectMouth"]/groups</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/parts/li[def="AG_InsectMouth"]</xpath>
-							<value>
-								<groups>
-									<li>CoveredByNaturalArmor</li>
-								</groups>
-							</value>
-						</nomatch>
-						<match Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/parts/li[def="AG_InsectMouth"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</match>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/parts/li[def="AG_InsectTail"]/groups</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/parts/li[def="AG_InsectTail"]</xpath>
-							<value>
-								<groups>
-									<li>CoveredByNaturalArmor</li>
-								</groups>
-							</value>
-						</nomatch>
-						<match Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/parts/li[def="AG_InsectTail"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</match>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/parts/li[def="AG_InsectTail"]/parts/li[def="AG_InsectSting"]/groups</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/parts/li[def="AG_InsectTail"]/parts/li[def="AG_InsectSting"]</xpath>
-							<value>
-								<groups>
-									<li>CoveredByNaturalArmor</li>
-								</groups>
-							</value>
-						</nomatch>
-						<match Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AG_ScorpionLike"]/corePart/parts/li[def="AG_InsectTail"]/parts/li[def="AG_InsectSting"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</match>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/BodyDefs/Bodies_Apiarist.xml b/Patches/Alpha Mechs/BodyDefs/Bodies_Apiarist.xml
deleted file mode 100644
index 79476ba7e3..0000000000
--- a/Patches/Alpha Mechs/BodyDefs/Bodies_Apiarist.xml	
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== Winged Mech ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_Mech_Winged_Body"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_Mech_Winged_Body"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_Mech_Winged_Body"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_Mech_Winged_Body"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_Mech_Winged_Body"]/corePart/parts/li[def="MechanicalNeck"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_Mech_Winged_Body"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_Mech_Winged_Body"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_Mech_Winged_Body"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_Mech_Winged_Body"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_Mech_Winged_Body"]/corePart/parts/li[def="AM_MechanoidBeeWing"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_Mech_Winged_Body"]/corePart/parts/li[def="AM_MechanoidBeeWing"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_Mech_Winged_Body"]/corePart/parts/li[def="AM_MechanoidBeeWing"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/BodyDefs/Bodies_Apocriton.xml b/Patches/Alpha Mechs/BodyDefs/Bodies_Apocriton.xml
deleted file mode 100644
index 266c2c94e7..0000000000
--- a/Patches/Alpha Mechs/BodyDefs/Bodies_Apocriton.xml	
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== Winged Apocriton ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalNeck"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalLeg"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="AM_MechanoidWing"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="AM_MechanoidWing"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="AM_MechanoidWing"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/BodyDefs/Bodies_Aura.xml b/Patches/Alpha Mechs/BodyDefs/Bodies_Aura.xml
deleted file mode 100644
index de42c02b36..0000000000
--- a/Patches/Alpha Mechs/BodyDefs/Bodies_Aura.xml	
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== Aura ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalNeck"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalShoulder"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/parts/li[def="MechanicalFinger"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/parts/li[def="MechanicalFinger"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/parts/li[def="MechanicalFinger"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalLeg"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="AM_MechanoidWing"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="AM_MechanoidWing"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="AM_MechanoidWing"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/BodyDefs/Bodies_Daggersnout.xml b/Patches/Alpha Mechs/BodyDefs/Bodies_Daggersnout.xml
deleted file mode 100644
index 9ed16bb96b..0000000000
--- a/Patches/Alpha Mechs/BodyDefs/Bodies_Daggersnout.xml	
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== DaggerSnout ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="MechanicalHead"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="MechanicalHead"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="MechanicalHead"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="Blade"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="Blade"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="Blade"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="AM_TankPlateThird"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="AM_TankPlateThird"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="AM_TankPlateThird"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="AM_TankPlateThird"]/parts/li[def="AM_TankPlateFifth"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="AM_TankPlateThird"]/parts/li[def="AM_TankPlateFifth"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="AM_TankPlateThird"]/parts/li[def="AM_TankPlateFifth"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="MechanicalLeg"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/BodyDefs/Bodies_Demolisher.xml b/Patches/Alpha Mechs/BodyDefs/Bodies_Demolisher.xml
deleted file mode 100644
index 76b40099e3..0000000000
--- a/Patches/Alpha Mechs/BodyDefs/Bodies_Demolisher.xml	
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== Demolisher ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="MechanicalHead"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="MechanicalHead"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="MechanicalHead"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="AM_TankPlateThird"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="AM_TankPlateThird"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="AM_TankPlateThird"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="AM_TankPlateThird"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="AM_TankPlateThird"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="AM_TankPlateThird"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="AM_TankPlateThird"]/parts/li[def="AM_TankPlateFifth"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="AM_TankPlateThird"]/parts/li[def="AM_TankPlateFifth"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/parts/li[def="AM_TankPlateThird"]/parts/li[def="AM_TankPlateFifth"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="AM_MechanicalClaw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="AM_MechanicalClaw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="AM_MechanicalClaw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="MechanicalLeg"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/BodyDefs/Bodies_Siegebreaker.xml b/Patches/Alpha Mechs/BodyDefs/Bodies_Siegebreaker.xml
deleted file mode 100644
index 749ac9839e..0000000000
--- a/Patches/Alpha Mechs/BodyDefs/Bodies_Siegebreaker.xml	
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== Siegebreaker ====== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankTurret"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankTurret"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankTurret"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankPlateSecond"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankPlateSecond"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankPlateSecond"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankPlateSecond"]/parts/li[def="AM_TankPlateThird"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankPlateSecond"]/parts/li[def="AM_TankPlateThird"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankPlateSecond"]/parts/li[def="AM_TankPlateThird"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankPlateSecond"]/parts/li[def="AM_TankPlateThird"]/parts/li[def="AM_TankPlateFourth"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankPlateSecond"]/parts/li[def="AM_TankPlateThird"]/parts/li[def="AM_TankPlateFourth"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankPlateSecond"]/parts/li[def="AM_TankPlateThird"]/parts/li[def="AM_TankPlateFourth"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankPlateSecond"]/parts/li[def="AM_TankPlateThird"]/parts/li[def="AM_TankPlateFourth"]/parts/li[def="AM_TankPlateFifth"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankPlateSecond"]/parts/li[def="AM_TankPlateThird"]/parts/li[def="AM_TankPlateFourth"]/parts/li[def="AM_TankPlateFifth"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankPlateSecond"]/parts/li[def="AM_TankPlateThird"]/parts/li[def="AM_TankPlateFourth"]/parts/li[def="AM_TankPlateFifth"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankPlateSecond"]/parts/li[def="AM_TankPlateThird"]/parts/li[def="AM_TankPlateFourth"]/parts/li[def="AM_TankPlateFifth"]/parts/li[def="AM_TankPlateSixth"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankPlateSecond"]/parts/li[def="AM_TankPlateThird"]/parts/li[def="AM_TankPlateFourth"]/parts/li[def="AM_TankPlateFifth"]/parts/li[def="AM_TankPlateSixth"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankPlateSecond"]/parts/li[def="AM_TankPlateThird"]/parts/li[def="AM_TankPlateFourth"]/parts/li[def="AM_TankPlateFifth"]/parts/li[def="AM_TankPlateSixth"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/DamageDef/DamageDefs.xml b/Patches/Alpha Mechs/DamageDef/DamageDefs.xml
deleted file mode 100644
index 08aae05e0b..0000000000
--- a/Patches/Alpha Mechs/DamageDef/DamageDefs.xml	
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Acid Spit ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/DamageDef[defName="AM_AcidSpit"]</xpath>
-					<value>
-						<li Class="CombatExtended.DamageDefExtensionCE">
-							<isAmbientDamage>true</isAmbientDamage>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/AlphaBees/Apiarist.xml b/Patches/Alpha Mechs/Mods/AlphaBees/Apiarist.xml
deleted file mode 100644
index f9cba031ab..0000000000
--- a/Patches/Alpha Mechs/Mods/AlphaBees/Apiarist.xml	
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Alpha Bees</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Apiarist"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Birdlike</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Apiarist"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>4</power>
-									<cooldownTime>2</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-									<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Apiarist"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AM_Mech_Apiarist"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Apiarist"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>700</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>70</MaxOverHeal>
-								<MinArmorPct>0.75</MinArmorPct>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/Biotech/AbilityDefs/Abilities_Biotech.xml b/Patches/Alpha Mechs/Mods/Biotech/AbilityDefs/Abilities_Biotech.xml
deleted file mode 100644
index 42a35bcfe3..0000000000
--- a/Patches/Alpha Mechs/Mods/Biotech/AbilityDefs/Abilities_Biotech.xml	
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Biotech</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/AbilityDef[defName="AM_Detonate"]/comps/li[@Class="AlphaMechs.CompProperties_Detonate"]/damageAmount</xpath>
-						<value>
-							<damageAmount>94</damageAmount>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/AbilityDef[defName="AM_LongjumpMech"]/verbProperties/range</xpath>
-						<value>
-							<range>22.9</range>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Assembler.xml b/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Assembler.xml
deleted file mode 100644
index 5db5a6f96a..0000000000
--- a/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Assembler.xml	
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Biotech</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/BodyDef[defName="AM_Assembler"]/corePart/groups</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_Assembler"]/corePart</xpath>
-							<value>
-								<groups>
-									<li>CoveredByNaturalArmor</li>
-								</groups>
-							</value>
-						</nomatch>
-						<match Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_Assembler"]/corePart/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</match>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/BodyDef[defName="AM_Assembler"]/corePart/parts/li[def="MechanicalHead"]/groups</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_Assembler"]/corePart/parts/li[def="MechanicalHead"]</xpath>
-							<value>
-								<groups>
-									<li>CoveredByNaturalArmor</li>
-								</groups>
-							</value>
-						</nomatch>
-						<match Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_Assembler"]/corePart/parts/li[def="MechanicalHead"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</match>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/BodyDef[defName="AM_Assembler"]/corePart/parts/li[def="AM_MechanicalBodyCarapace"]/groups</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_Assembler"]/corePart/parts/li[def="AM_MechanicalBodyCarapace"]</xpath>
-							<value>
-								<groups>
-									<li>CoveredByNaturalArmor</li>
-								</groups>
-							</value>
-						</nomatch>
-						<match Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_Assembler"]/corePart/parts/li[def="AM_MechanicalBodyCarapace"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</match>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Guttersnipe.xml b/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Guttersnipe.xml
deleted file mode 100644
index 3d7794ec7d..0000000000
--- a/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Guttersnipe.xml	
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Biotech</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/groups</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart</xpath>
-							<value>
-								<groups>
-									<li>CoveredByNaturalArmor</li>
-								</groups>
-							</value>
-						</nomatch>
-						<match Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</match>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/parts/li[def="MechanicalNeck"]</xpath>
-							<value>
-								<groups>
-									<li>CoveredByNaturalArmor</li>
-								</groups>
-							</value>
-						</nomatch>
-						<match Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</match>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]</xpath>
-							<value>
-								<groups>
-									<li>CoveredByNaturalArmor</li>
-								</groups>
-							</value>
-						</nomatch>
-						<match Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</match>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/parts/li[def="AM_CircularSaw"]/groups</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/parts/li[def="AM_CircularSaw"]</xpath>
-							<value>
-								<groups>
-									<li>CoveredByNaturalArmor</li>
-								</groups>
-							</value>
-						</nomatch>
-						<match Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/parts/li[def="AM_CircularSaw"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</match>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Slurrypede.xml b/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Slurrypede.xml
deleted file mode 100644
index c3b178d710..0000000000
--- a/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Slurrypede.xml	
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Biotech</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/groups</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart</xpath>
-							<value>
-								<groups>
-									<li>CoveredByNaturalArmor</li>
-								</groups>
-							</value>
-						</nomatch>
-						<match Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</match>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/groups</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]</xpath>
-							<value>
-								<groups>
-									<li>CoveredByNaturalArmor</li>
-								</groups>
-							</value>
-						</nomatch>
-						<match Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</match>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/groups</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]</xpath>
-							<value>
-								<groups>
-									<li>CoveredByNaturalArmor</li>
-								</groups>
-							</value>
-						</nomatch>
-						<match Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</match>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/groups</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]</xpath>
-							<value>
-								<groups>
-									<li>CoveredByNaturalArmor</li>
-								</groups>
-							</value>
-						</nomatch>
-						<match Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</match>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/parts/li[def="MechanicalCentipedeBodyFourthRing"]/groups</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/parts/li[def="MechanicalCentipedeBodyFourthRing"]</xpath>
-							<value>
-								<groups>
-									<li>CoveredByNaturalArmor</li>
-								</groups>
-							</value>
-						</nomatch>
-						<match Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/parts/li[def="MechanicalCentipedeBodyFourthRing"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</match>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/parts/li[def="MechanicalCentipedeBodyFourthRing"]/parts/li[def="MechanicalCentipedeBodyFifthRing"]/groups</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/parts/li[def="MechanicalCentipedeBodyFourthRing"]/parts/li[def="MechanicalCentipedeBodyFifthRing"]</xpath>
-							<value>
-								<groups>
-									<li>CoveredByNaturalArmor</li>
-								</groups>
-							</value>
-						</nomatch>
-						<match Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/parts/li[def="MechanicalCentipedeBodyFourthRing"]/parts/li[def="MechanicalCentipedeBodyFifthRing"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</match>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/parts/li[def="MechanicalCentipedeBodyFourthRing"]/parts/li[def="MechanicalCentipedeBodyFifthRing"]/parts/li[def="MechanicalCentipedeBodySixthRing"]/groups</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/parts/li[def="MechanicalCentipedeBodyFourthRing"]/parts/li[def="MechanicalCentipedeBodyFifthRing"]/parts/li[def="MechanicalCentipedeBodySixthRing"]</xpath>
-							<value>
-								<groups>
-									<li>CoveredByNaturalArmor</li>
-								</groups>
-							</value>
-						</nomatch>
-						<match Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/parts/li[def="MechanicalCentipedeBodyFourthRing"]/parts/li[def="MechanicalCentipedeBodyFifthRing"]/parts/li[def="MechanicalCentipedeBodySixthRing"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</match>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_WarEmpress.xml b/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_WarEmpress.xml
deleted file mode 100644
index 5e818ac0ae..0000000000
--- a/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_WarEmpress.xml	
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Biotech</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/groups</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart</xpath>
-							<value>
-								<groups>
-									<li>CoveredByNaturalArmor</li>
-								</groups>
-							</value>
-						</nomatch>
-						<match Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</match>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalHead"]/groups</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalHead"]</xpath>
-							<value>
-								<groups>
-									<li>CoveredByNaturalArmor</li>
-								</groups>
-							</value>
-						</nomatch>
-						<match Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalHead"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</match>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalWarqueenBodySecondRing"]/groups</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalWarqueenBodySecondRing"]</xpath>
-							<value>
-								<groups>
-									<li>CoveredByNaturalArmor</li>
-								</groups>
-							</value>
-						</nomatch>
-						<match Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalWarqueenBodySecondRing"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</match>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalWarqueenBodySecondRing"]/parts/li[def="MechanicalWarqueenBodyThirdRing"]/groups</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalWarqueenBodySecondRing"]/parts/li[def="MechanicalWarqueenBodyThirdRing"]</xpath>
-							<value>
-								<groups>
-									<li>CoveredByNaturalArmor</li>
-								</groups>
-							</value>
-						</nomatch>
-						<match Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalWarqueenBodySecondRing"]/parts/li[def="MechanicalWarqueenBodyThirdRing"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</match>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalWarqueenBodySecondRing"]/parts/li[def="MechanicalWarqueenBodyThirdRing"]/parts/li[def="MechanicalWarqueenBodyFourthRing"]/groups</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalWarqueenBodySecondRing"]/parts/li[def="MechanicalWarqueenBodyThirdRing"]/parts/li[def="MechanicalWarqueenBodyFourthRing"]</xpath>
-							<value>
-								<groups>
-									<li>CoveredByNaturalArmor</li>
-								</groups>
-							</value>
-						</nomatch>
-						<match Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalWarqueenBodySecondRing"]/parts/li[def="MechanicalWarqueenBodyThirdRing"]/parts/li[def="MechanicalWarqueenBodyFourthRing"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</match>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalWarqueenBodySecondRing"]/parts/li[def="MechanicalWarqueenBodyThirdRing"]/parts/li[def="MechanicalWarqueenBodyFourthRing"]/parts/li[def="MechanicalWarqueenBodyFifthRing"]/groups</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalWarqueenBodySecondRing"]/parts/li[def="MechanicalWarqueenBodyThirdRing"]/parts/li[def="MechanicalWarqueenBodyFourthRing"]/parts/li[def="MechanicalWarqueenBodyFifthRing"]</xpath>
-							<value>
-								<groups>
-									<li>CoveredByNaturalArmor</li>
-								</groups>
-							</value>
-						</nomatch>
-						<match Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalWarqueenBodySecondRing"]/parts/li[def="MechanicalWarqueenBodyThirdRing"]/parts/li[def="MechanicalWarqueenBodyFourthRing"]/parts/li[def="MechanicalWarqueenBodyFifthRing"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</match>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalShoulder"]</xpath>
-							<value>
-								<groups>
-									<li>CoveredByNaturalArmor</li>
-								</groups>
-							</value>
-						</nomatch>
-						<match Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</match>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]</xpath>
-							<value>
-								<groups>
-									<li>CoveredByNaturalArmor</li>
-								</groups>
-							</value>
-						</nomatch>
-						<match Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</match>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="PowerClaw"]/groups</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="PowerClaw"]</xpath>
-							<value>
-								<groups>
-									<li>CoveredByNaturalArmor</li>
-								</groups>
-							</value>
-						</nomatch>
-						<match Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="PowerClaw"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</match>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="BulbTurret"]/groups</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="BulbTurret"]</xpath>
-							<value>
-								<groups>
-									<li>CoveredByNaturalArmor</li>
-								</groups>
-							</value>
-						</nomatch>
-						<match Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="BulbTurret"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</match>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/Biotech/HediffDefs/Hediffs.xml b/Patches/Alpha Mechs/Mods/Biotech/HediffDefs/Hediffs.xml
deleted file mode 100644
index 5beb4dfae0..0000000000
--- a/Patches/Alpha Mechs/Mods/Biotech/HediffDefs/Hediffs.xml	
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Biotech</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/HediffDef[defName="AM_ArmorMechBoost"]/stages/li/statOffsets</xpath>
-						<value>
-							<statOffsets>
-								<ArmorRating_Sharp>1</ArmorRating_Sharp>
-								<ArmorRating_Blunt>2</ArmorRating_Blunt>
-							</statOffsets>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Misc/Apparel.xml b/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Misc/Apparel.xml
deleted file mode 100644
index 08870d571d..0000000000
--- a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Misc/Apparel.xml	
+++ /dev/null
@@ -1,732 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Biotech</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<!-- Mech Master Helmet -->
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_MechCommanderHelm"]/statBases</xpath>
-						<value>
-							<Bulk>5</Bulk>
-							<WornBulk>1</WornBulk>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_MechCommanderHelm"]/statBases/Flammability</xpath>
-						<value>
-							<Flammability>0</Flammability>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_MechCommanderHelm"]/statBases/Mass</xpath>
-						<value>
-							<Mass>4.8</Mass>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_MechCommanderHelm"]/statBases/MaxHitPoints</xpath>
-						<value>
-							<MaxHitPoints>350</MaxHitPoints>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_MechCommanderHelm"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>16</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_MechCommanderHelm"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>36</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_MechCommanderHelm"]/costList/Plasteel</xpath>
-						<value>
-							<Plasteel>200</Plasteel>
-							<DevilstrandCloth>20</DevilstrandCloth>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_MechCommanderHelm"]/equippedStatOffsets</xpath>
-						<value>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AM_MechCommanderHelm"]</xpath>
-						<value>
-							<li Class="CombatExtended.ApparelDefExtension">
-								<isRadioPack>true</isRadioPack>
-							</li>
-						</value>
-					</li>
-
-					<!-- Mech Breaker Helmet -->
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_MechBreakerHelm"]/statBases</xpath>
-						<value>
-							<Bulk>6</Bulk>
-							<WornBulk>2</WornBulk>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_MechBreakerHelm"]/statBases/Flammability</xpath>
-						<value>
-							<Flammability>0</Flammability>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_MechBreakerHelm"]/statBases/Mass</xpath>
-						<value>
-							<Mass>6</Mass>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_MechBreakerHelm"]/statBases/MaxHitPoints</xpath>
-						<value>
-							<MaxHitPoints>350</MaxHitPoints>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_MechBreakerHelm"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>20</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_MechBreakerHelm"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>50</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_MechBreakerHelm"]/costList/Plasteel</xpath>
-						<value>
-							<Plasteel>60</Plasteel>
-							<DevilstrandCloth>25</DevilstrandCloth>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_MechBreakerHelm"]/equippedStatOffsets</xpath>
-						<value>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AM_MechBreakerHelm"]</xpath>
-						<value>
-							<li Class="CombatExtended.ApparelDefExtension">
-								<isRadioPack>true</isRadioPack>
-							</li>
-						</value>
-					</li>
-
-					<!-- Mech Master Armor -->
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_MechCommanderSuit"]/statBases</xpath>
-						<value>
-							<Bulk>100</Bulk>
-							<WornBulk>15</WornBulk>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_MechCommanderSuit"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>20.5</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_MechCommanderSuit"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>46</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationRemove">
-						<xpath>Defs/ThingDef[defName="AM_MechCommanderSuit"]/equippedStatOffsets/MoveSpeed</xpath>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_MechCommanderSuit"]/costList/Plasteel</xpath>
-						<value>
-							<Plasteel>200</Plasteel>
-							<DevilstrandCloth>40</DevilstrandCloth>
-						</value>
-					</li>
-
-					<!-- Mech Breaker Armor -->
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_MechBreakerArmor"]/statBases</xpath>
-						<value>
-							<Bulk>100</Bulk>
-							<WornBulk>20</WornBulk>
-							<Mass>80</Mass>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_MechBreakerArmor"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>26</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_MechBreakerArmor"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>60</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_MechBreakerArmor"]/statBases/EnergyShieldRechargeRate</xpath>
-						<value>
-							<EnergyShieldRechargeRate>0.03</EnergyShieldRechargeRate>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_MechBreakerArmor"]/statBases/EnergyShieldEnergyMax</xpath>
-						<value>
-							<EnergyShieldEnergyMax>0.6</EnergyShieldEnergyMax>
-						</value>
-					</li>
-
-					<li Class="PatchOperationRemove">
-						<xpath>Defs/ThingDef[defName="AM_MechBreakerArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_MechBreakerArmor"]/equippedStatOffsets</xpath>
-						<value>
-							<CarryWeight>100</CarryWeight>
-							<CarryBulk>20</CarryBulk>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-							<MeleeDodgeChance>-0.15</MeleeDodgeChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_MechBreakerArmor"]/costList/Plasteel</xpath>
-						<value>
-							<Plasteel>270</Plasteel>
-							<DevilstrandCloth>40</DevilstrandCloth>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_MechBreakerArmor"]/costList/Uranium</xpath>
-						<value>
-							<Uranium>80</Uranium>
-						</value>
-					</li>
-
-					<!-- Prestige Gear -->
-
-					<li Class="PatchOperationFindMod">
-						<mods>
-							<li>Royalty</li>
-						</mods>
-
-						<match Class="PatchOperationSequence">
-							<operations>
-
-								<!-- Prestige Mechlord -->
-
-								<li Class="PatchOperationReplace">
-									<xpath>Defs/ThingDef[defName="AM_Apparel_ArmorHelmetMechlordHelmet_Prestige"]/statBases/MaxHitPoints</xpath>
-									<value>
-										<MaxHitPoints>270</MaxHitPoints>
-										<Mass>3.0</Mass>
-										<ArmorRating_Sharp>12</ArmorRating_Sharp>
-										<ArmorRating_Blunt>26</ArmorRating_Blunt>
-										<Flammability>0.25</Flammability>
-									</value>
-								</li>
-
-								<li Class="PatchOperationReplace">
-									<xpath>Defs/ThingDef[defName="AM_Apparel_ArmorHelmetMechlordHelmet_Prestige"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-									<value>
-										<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-										<SmokeSensitivity>-1</SmokeSensitivity>
-									</value>
-								</li>
-
-								<li Class="PatchOperationRemove">
-									<xpath>Defs/ThingDef[defName="AM_Apparel_ArmorHelmetMechlordHelmet_Prestige"]/equippedStatOffsets/MeleeHitChance</xpath>
-								</li>
-
-								<li Class="PatchOperationReplace">
-									<xpath>Defs/ThingDef[defName="AM_Apparel_ArmorHelmetMechlordHelmet_Prestige"]/costList/Plasteel</xpath>
-									<value>
-										<Plasteel>170</Plasteel>
-										<DevilstrandCloth>15</DevilstrandCloth>
-									</value>
-								</li>
-
-								<li Class="PatchOperationAddModExtension">
-									<xpath>Defs/ThingDef[defName="AM_Apparel_ArmorHelmetMechlordHelmet_Prestige"]</xpath>
-									<value>
-										<li Class="CombatExtended.ApparelDefExtension">
-											<isRadioPack>true</isRadioPack>
-										</li>
-									</value>
-								</li>
-
-								<li Class="PatchOperationAdd">
-									<xpath>Defs/ThingDef[defName="AM_Apparel_MechlordSuit_Prestige"]/statBases</xpath>
-									<value>
-										<Bulk>90</Bulk>
-										<WornBulk>13</WornBulk>
-										<Mass>40</Mass>
-										<MaxHitPoints>450</MaxHitPoints>
-									</value>
-								</li>
-
-								<li Class="PatchOperationReplace">
-									<xpath>Defs/ThingDef[defName="AM_Apparel_MechlordSuit_Prestige"]/statBases/ArmorRating_Sharp</xpath>
-									<value>
-										<ArmorRating_Sharp>16</ArmorRating_Sharp>
-									</value>
-								</li>
-
-								<li Class="PatchOperationReplace">
-									<xpath>Defs/ThingDef[defName="AM_Apparel_MechlordSuit_Prestige"]/statBases/ArmorRating_Blunt</xpath>
-									<value>
-										<ArmorRating_Blunt>34</ArmorRating_Blunt>
-									</value>
-								</li>
-
-								<li Class="PatchOperationReplace">
-									<xpath>Defs/ThingDef[defName="AM_Apparel_MechlordSuit_Prestige"]/costList/Plasteel</xpath>
-									<value>
-										<Plasteel>170</Plasteel>
-										<DevilstrandCloth>40</DevilstrandCloth>
-									</value>
-								</li>
-
-								<li Class="PatchOperationReplace">
-									<xpath>Defs/ThingDef[defName="AM_Apparel_MechlordSuit_Prestige"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-									<value>
-										<CarryWeight>65</CarryWeight>
-										<CarryBulk>10</CarryBulk>
-									</value>
-								</li>
-
-								<li Class="PatchOperationRemove">
-									<xpath>Defs/ThingDef[defName="AM_Apparel_MechlordSuit_Prestige"]/equippedStatOffsets/MeleeHitChance</xpath>
-								</li>
-
-								<li Class="PatchOperationAdd">
-									<xpath>Defs/ThingDef[defName="AM_Apparel_MechlordSuit_Prestige"]</xpath>
-									<value>
-										<modExtensions Inherit="False">
-											<li Class="CombatExtended.PartialArmorExt">
-												<stats>
-													<li>
-														<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-														<parts>
-															<li>Neck</li>
-															<li>Hand</li>
-														</parts>
-													</li>
-													<li>
-														<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-														<parts>
-															<li>Neck</li>
-															<li>Hand</li>
-														</parts>
-													</li>
-													<li>
-														<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-														<parts>
-															<li>Leg</li>
-														</parts>
-													</li>
-													<li>
-														<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-														<parts>
-															<li>Leg</li>
-														</parts>
-													</li>
-													<li>
-														<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-														<parts>
-															<li>Arm</li>
-														</parts>
-													</li>
-													<li>
-														<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-														<parts>
-															<li>Arm</li>
-														</parts>
-													</li>
-												</stats>
-											</li>
-										</modExtensions>
-									</value>
-								</li>
-
-								<!-- Prestige Mech Master -->
-
-								<li Class="PatchOperationAdd">
-									<xpath>Defs/ThingDef[defName="AM_MechCommanderHelm_Prestige"]/statBases</xpath>
-									<value>
-										<Bulk>5</Bulk>
-										<WornBulk>1</WornBulk>
-									</value>
-								</li>
-
-								<li Class="PatchOperationReplace">
-									<xpath>Defs/ThingDef[defName="AM_MechCommanderHelm_Prestige"]/statBases/Flammability</xpath>
-									<value>
-										<Flammability>0</Flammability>
-									</value>
-								</li>
-
-								<li Class="PatchOperationReplace">
-									<xpath>Defs/ThingDef[defName="AM_MechCommanderHelm_Prestige"]/statBases/Mass</xpath>
-									<value>
-										<Mass>4.8</Mass>
-									</value>
-								</li>
-
-								<li Class="PatchOperationReplace">
-									<xpath>Defs/ThingDef[defName="AM_MechCommanderHelm_Prestige"]/statBases/MaxHitPoints</xpath>
-									<value>
-										<MaxHitPoints>350</MaxHitPoints>
-									</value>
-								</li>
-
-								<li Class="PatchOperationReplace">
-									<xpath>Defs/ThingDef[defName="AM_MechCommanderHelm_Prestige"]/statBases/ArmorRating_Sharp</xpath>
-									<value>
-										<ArmorRating_Sharp>16</ArmorRating_Sharp>
-									</value>
-								</li>
-
-								<li Class="PatchOperationReplace">
-									<xpath>Defs/ThingDef[defName="AM_MechCommanderHelm_Prestige"]/statBases/ArmorRating_Blunt</xpath>
-									<value>
-										<ArmorRating_Blunt>36</ArmorRating_Blunt>
-									</value>
-								</li>
-
-								<li Class="PatchOperationReplace">
-									<xpath>Defs/ThingDef[defName="AM_MechCommanderHelm_Prestige"]/costList/Plasteel</xpath>
-									<value>
-										<Plasteel>220</Plasteel>
-										<DevilstrandCloth>20</DevilstrandCloth>
-									</value>
-								</li>
-
-								<li Class="PatchOperationAdd">
-									<xpath>Defs/ThingDef[defName="AM_MechCommanderHelm_Prestige"]/equippedStatOffsets</xpath>
-									<value>
-										<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-										<SmokeSensitivity>-1</SmokeSensitivity>
-									</value>
-								</li>
-
-								<li Class="PatchOperationAddModExtension">
-									<xpath>Defs/ThingDef[defName="AM_MechCommanderHelm_Prestige"]</xpath>
-									<value>
-										<li Class="CombatExtended.ApparelDefExtension">
-											<isRadioPack>true</isRadioPack>
-										</li>
-									</value>
-								</li>
-
-								<li Class="PatchOperationAdd">
-									<xpath>Defs/ThingDef[defName="AM_PrestigeMechCommanderSuit"]/statBases</xpath>
-									<value>
-										<Bulk>100</Bulk>
-										<WornBulk>15</WornBulk>
-									</value>
-								</li>
-
-								<li Class="PatchOperationReplace">
-									<xpath>Defs/ThingDef[defName="AM_PrestigeMechCommanderSuit"]/statBases/ArmorRating_Sharp</xpath>
-									<value>
-										<ArmorRating_Sharp>20.5</ArmorRating_Sharp>
-									</value>
-								</li>
-
-								<li Class="PatchOperationReplace">
-									<xpath>Defs/ThingDef[defName="AM_PrestigeMechCommanderSuit"]/statBases/ArmorRating_Blunt</xpath>
-									<value>
-										<ArmorRating_Blunt>46</ArmorRating_Blunt>
-									</value>
-								</li>
-
-								<li Class="PatchOperationRemove">
-									<xpath>Defs/ThingDef[defName="AM_PrestigeMechCommanderSuit"]/equippedStatOffsets/MoveSpeed</xpath>
-								</li>
-
-								<li Class="PatchOperationReplace">
-									<xpath>Defs/ThingDef[defName="AM_PrestigeMechCommanderSuit"]/costList/Plasteel</xpath>
-									<value>
-										<Plasteel>220</Plasteel>
-										<DevilstrandCloth>40</DevilstrandCloth>
-									</value>
-								</li>
-
-								<!-- Prestige Mech Breaker -->
-
-								<li Class="PatchOperationAdd">
-									<xpath>Defs/ThingDef[defName="AM_PrestigeMechBreakerHelm"]/statBases</xpath>
-									<value>
-										<Bulk>6</Bulk>
-										<WornBulk>2</WornBulk>
-									</value>
-								</li>
-
-								<li Class="PatchOperationReplace">
-									<xpath>Defs/ThingDef[defName="AM_PrestigeMechBreakerHelm"]/statBases/Flammability</xpath>
-									<value>
-										<Flammability>0</Flammability>
-									</value>
-								</li>
-
-								<li Class="PatchOperationReplace">
-									<xpath>Defs/ThingDef[defName="AM_PrestigeMechBreakerHelm"]/statBases/Mass</xpath>
-									<value>
-										<Mass>6</Mass>
-									</value>
-								</li>
-
-								<li Class="PatchOperationReplace">
-									<xpath>Defs/ThingDef[defName="AM_PrestigeMechBreakerHelm"]/statBases/MaxHitPoints</xpath>
-									<value>
-										<MaxHitPoints>350</MaxHitPoints>
-									</value>
-								</li>
-
-								<li Class="PatchOperationReplace">
-									<xpath>Defs/ThingDef[defName="AM_PrestigeMechBreakerHelm"]/statBases/ArmorRating_Sharp</xpath>
-									<value>
-										<ArmorRating_Sharp>20</ArmorRating_Sharp>
-									</value>
-								</li>
-
-								<li Class="PatchOperationReplace">
-									<xpath>Defs/ThingDef[defName="AM_PrestigeMechBreakerHelm"]/statBases/ArmorRating_Blunt</xpath>
-									<value>
-										<ArmorRating_Blunt>50</ArmorRating_Blunt>
-									</value>
-								</li>
-
-								<li Class="PatchOperationReplace">
-									<xpath>Defs/ThingDef[defName="AM_PrestigeMechBreakerHelm"]/costList/Plasteel</xpath>
-									<value>
-										<Plasteel>80</Plasteel>
-										<DevilstrandCloth>25</DevilstrandCloth>
-									</value>
-								</li>
-
-								<li Class="PatchOperationAdd">
-									<xpath>Defs/ThingDef[defName="AM_PrestigeMechBreakerHelm"]/equippedStatOffsets</xpath>
-									<value>
-										<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-										<SmokeSensitivity>-1</SmokeSensitivity>
-									</value>
-								</li>
-
-								<li Class="PatchOperationAddModExtension">
-									<xpath>Defs/ThingDef[defName="AM_PrestigeMechBreakerHelm"]</xpath>
-									<value>
-										<li Class="CombatExtended.ApparelDefExtension">
-											<isRadioPack>true</isRadioPack>
-										</li>
-									</value>
-								</li>
-
-								<li Class="PatchOperationAdd">
-									<xpath>Defs/ThingDef[defName="AM_PrestigeMechBreakerArmor"]/statBases</xpath>
-									<value>
-										<Bulk>100</Bulk>
-										<WornBulk>20</WornBulk>
-										<Mass>80</Mass>
-									</value>
-								</li>
-
-								<li Class="PatchOperationReplace">
-									<xpath>Defs/ThingDef[defName="AM_PrestigeMechBreakerArmor"]/statBases/ArmorRating_Sharp</xpath>
-									<value>
-										<ArmorRating_Sharp>26</ArmorRating_Sharp>
-									</value>
-								</li>
-
-								<li Class="PatchOperationReplace">
-									<xpath>Defs/ThingDef[defName="AM_PrestigeMechBreakerArmor"]/statBases/ArmorRating_Blunt</xpath>
-									<value>
-										<ArmorRating_Blunt>60</ArmorRating_Blunt>
-									</value>
-								</li>
-
-								<li Class="PatchOperationReplace">
-									<xpath>Defs/ThingDef[defName="AM_PrestigeMechBreakerArmor"]/statBases/EnergyShieldRechargeRate</xpath>
-									<value>
-										<EnergyShieldRechargeRate>0.03</EnergyShieldRechargeRate>
-									</value>
-								</li>
-
-								<li Class="PatchOperationReplace">
-									<xpath>Defs/ThingDef[defName="AM_PrestigeMechBreakerArmor"]/statBases/EnergyShieldEnergyMax</xpath>
-									<value>
-										<EnergyShieldEnergyMax>0.6</EnergyShieldEnergyMax>
-									</value>
-								</li>
-
-								<li Class="PatchOperationRemove">
-									<xpath>Defs/ThingDef[defName="AM_PrestigeMechBreakerArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-								</li>
-
-								<li Class="PatchOperationAdd">
-									<xpath>Defs/ThingDef[defName="AM_PrestigeMechBreakerArmor"]/equippedStatOffsets</xpath>
-									<value>
-										<CarryWeight>100</CarryWeight>
-										<CarryBulk>20</CarryBulk>
-										<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-										<MeleeDodgeChance>-0.15</MeleeDodgeChance>
-									</value>
-								</li>
-
-								<li Class="PatchOperationReplace">
-									<xpath>Defs/ThingDef[defName="AM_PrestigeMechBreakerArmor"]/costList/Plasteel</xpath>
-									<value>
-										<Plasteel>290</Plasteel>
-										<DevilstrandCloth>40</DevilstrandCloth>
-									</value>
-								</li>
-
-								<li Class="PatchOperationReplace">
-									<xpath>Defs/ThingDef[defName="AM_PrestigeMechBreakerArmor"]/costList/Uranium</xpath>
-									<value>
-										<Uranium>80</Uranium>
-									</value>
-								</li>
-
-							</operations>
-						</match>
-					</li>
-
-					<!-- Packs -->
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[
-							defName="AM_BeamcasterPack" or
-							defName="AM_VoidlinkPack" or
-							defName="AM_CryptoPack"
-							]/apparel/bodyPartGroups </xpath>
-						<value>
-							<li>Shoulders</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[
-							defName="AM_BeamcasterPack" or
-							defName="AM_VoidlinkPack" or
-							defName="AM_CryptoPack"
-							]/apparel/layers </xpath>
-						<value>
-							<li>Backpack</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>
-							Defs/ThingDef[
-							defName="AM_BeamcasterPack" or
-							defName="AM_VoidlinkPack" or
-							defName="AM_CryptoPack"
-							]/statBases
-						</xpath>
-						<value>
-							<Bulk>10</Bulk>
-							<WornBulk>2</WornBulk>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>
-							Defs/ThingDef[
-							defName="AM_BeamcasterPack" or
-							defName="AM_VoidlinkPack" or
-							defName="AM_CryptoPack"]
-						</xpath>
-						<value>
-							<li Class="CombatExtended.ApparelDefExtension">
-								<isRadioPack>true</isRadioPack>
-							</li>
-						</value>
-					</li>
-
-					<!-- Mech Shield -->
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Apparel_ExpandedHeavyShield"]/statBases</xpath>
-						<value>
-							<Bulk>5</Bulk>
-							<WornBulk>2.5</WornBulk>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Apparel_ExpandedHeavyShield"]/statBases/EnergyShieldRechargeRate</xpath>
-						<value>
-							<EnergyShieldRechargeRate>0.0195</EnergyShieldRechargeRate>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Apparel_ExpandedHeavyShield"]/statBases/EnergyShieldEnergyMax</xpath>
-						<value>
-							<EnergyShieldEnergyMax>6</EnergyShieldEnergyMax>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Misc/Weapons.xml b/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Misc/Weapons.xml
deleted file mode 100644
index e7e4ea1b2a..0000000000
--- a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Misc/Weapons.xml	
+++ /dev/null
@@ -1,954 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Biotech</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<!-- Orbital Hellsphere -->
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Gun_HellsphereOrbital"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>barrel</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>10</power>
-									<cooldownTime>3.0</cooldownTime>
-									<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<!-- Coil Lance -->
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs</xpath>
-						<value>
-
-							<CombatExtended.AmmoSetDef>
-								<defName>AmmoSet_CoilLance</defName>
-								<label>8mm Railgun</label>
-								<ammoTypes>
-									<Ammo_8mmRailgun_Sabot>Bullet_CoilLance</Ammo_8mmRailgun_Sabot>
-								</ammoTypes>
-							</CombatExtended.AmmoSetDef>
-
-							<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="BaseLaserBullet">
-								<defName>Bullet_CoilLance</defName>
-								<label>coil lance shot</label>
-								<projectile Class="CombatExtended.ProjectilePropertiesCE">
-									<isInstant>true</isInstant>
-									<damageFalloff>False</damageFalloff>
-									<damageDef>Bullet</damageDef>
-									<damageAmountBase>21</damageAmountBase>
-									<armorPenetrationSharp>46.4</armorPenetrationSharp>
-									<armorPenetrationBlunt>312</armorPenetrationBlunt>
-								</projectile>
-							</ThingDef>
-
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Gun_CoilLance"]/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>
-					</li>
-
-					<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-						<defName>AM_Gun_CoilLance</defName>
-						<statBases>
-							<Mass>10.0</Mass>
-							<Bulk>10.0</Bulk>
-							<SwayFactor>2.0</SwayFactor>
-							<ShotSpread>0.1</ShotSpread>
-							<SightsEfficiency>1</SightsEfficiency>
-							<RangedWeapon_Cooldown>0.86</RangedWeapon_Cooldown>
-						</statBases>
-						<Properties>
-							<recoilAmount>2.0</recoilAmount>
-							<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-							<hasStandardCommand>True</hasStandardCommand>
-							<defaultProjectile>Bullet_CoilLance</defaultProjectile>
-							<warmupTime>2.4</warmupTime>
-							<range>62</range>
-							<soundCast>AM_Gauss</soundCast>
-							<soundCastTail>GunTail_Medium</soundCastTail>
-							<muzzleFlashScale>9</muzzleFlashScale>
-							<targetParams>
-								<canTargetLocations>true</canTargetLocations>
-								<canTargetPawns>true</canTargetPawns>
-								<canTargetBuildings>true</canTargetBuildings>
-							</targetParams>
-						</Properties>
-						<AmmoUser>
-							<magazineSize>10</magazineSize>
-							<reloadTime>5.2</reloadTime>
-							<ammoSet>AmmoSet_CoilLance</ammoSet>
-						</AmmoUser>
-						<FireModes>
-							<aiAimMode>AimedShot</aiAimMode>
-						</FireModes>
-						<weaponTags>
-							<li>NoSwitch</li>
-						</weaponTags>
-					</li>
-
-					<!-- Super HCB -->
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs</xpath>
-						<value>
-
-							<CombatExtended.AmmoSetDef>
-								<defName>AmmoSet_12x64mmHyper</defName>
-								<label>12x64mm Charged</label>
-								<ammoTypes>
-									<Ammo_12x64mmCharged>Bullet_12x64mmHyper</Ammo_12x64mmCharged>
-								</ammoTypes>
-								<similarTo>AmmoSet_MechCharged</similarTo>
-							</CombatExtended.AmmoSetDef>
-
-							<ThingDef ParentName="Base12x64mmChargedBullet">
-								<defName>Bullet_12x64mmHyper</defName>
-								<label>12x64mm Hyper bullet</label>
-								<graphicData>
-									<texPath>Things/Projectiles/AM_RedPlasma_Bullet</texPath>
-									<graphicClass>Graphic_Single</graphicClass>
-									<shaderType>TransparentPostLight</shaderType>
-								</graphicData>
-								<projectile Class="CombatExtended.ProjectilePropertiesCE">
-									<damageDef>Bullet</damageDef>
-									<damageAmountBase>52</damageAmountBase>
-									<speed>178</speed>
-									<secondaryDamage>
-										<li>
-											<def>Bomb_Secondary</def>
-											<amount>13</amount>
-										</li>
-									</secondaryDamage>
-									<armorPenetrationSharp>33</armorPenetrationSharp>
-									<armorPenetrationBlunt>400</armorPenetrationBlunt>
-								</projectile>
-							</ThingDef>
-
-						</value>
-					</li>
-
-					<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-						<defName>AM_Gun_SuperHeavyChargeBlaster</defName>
-						<statBases>
-							<Mass>40.00</Mass>
-							<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							<SightsEfficiency>1</SightsEfficiency>
-							<ShotSpread>0.01</ShotSpread>
-							<SwayFactor>1.5</SwayFactor>
-							<Bulk>15.00</Bulk>
-						</statBases>
-						<Properties>
-							<recoilAmount>1.2</recoilAmount>
-							<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-							<hasStandardCommand>true</hasStandardCommand>
-							<defaultProjectile>Bullet_12x64mmHyper</defaultProjectile>
-							<warmupTime>2.3</warmupTime>
-							<range>75</range>
-							<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-							<burstShotCount>25</burstShotCount>
-							<soundCast>AM_Shot_ChargeBlaster_Red</soundCast>
-							<soundCastTail>GunTail_Heavy</soundCastTail>
-							<muzzleFlashScale>9</muzzleFlashScale>
-						</Properties>
-						<AmmoUser>
-							<magazineSize>150</magazineSize>
-							<reloadTime>9.2</reloadTime>
-							<ammoSet>AmmoSet_12x64mmHyper</ammoSet>
-						</AmmoUser>
-						<FireModes>
-							<aimedBurstShotCount>10</aimedBurstShotCount>
-							<aiAimMode>Snapshot</aiAimMode>
-						</FireModes>
-						<weaponTags>
-							<li>CE_AI_Suppressive</li>
-							<li>NoSwitch</li>
-						</weaponTags>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Gun_SuperHeavyChargeBlaster"]/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>
-					</li>
-
-					<!-- Acid Spewer -->
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs</xpath>
-						<value>
-
-							<CombatExtended.AmmoSetDef>
-								<defName>AmmoSet_5x100mmCaselessAcidic</defName>
-								<label>5x100mm Caseless (Acidic)</label>
-								<ammoTypes>
-									<Ammo_5x100mmCaseless_Sabot>Bullet_5x100mmCaseless_Acidic</Ammo_5x100mmCaseless_Sabot>
-								</ammoTypes>
-								<similarTo>AmmoSet_Rifle</similarTo>
-							</CombatExtended.AmmoSetDef>
-
-							<ThingDef ParentName="Base5x100mmCaselessBullet">
-								<defName>Bullet_5x100mmCaseless_Acidic</defName>
-								<label>5x100 Caseless bullet (Acidic)</label>
-								<graphicData>
-									<texPath>Things/Projectile/ToxicNeedleShot</texPath>
-									<graphicClass>Graphic_Single</graphicClass>
-								</graphicData>
-								<projectile Class="CombatExtended.ProjectilePropertiesCE">
-									<damageDef>Bullet</damageDef>
-									<damageAmountBase>11</damageAmountBase>
-									<armorPenetrationSharp>20</armorPenetrationSharp>
-									<armorPenetrationBlunt>108</armorPenetrationBlunt>
-									<secondaryDamage>
-										<li>
-											<def>AM_AcidSpit</def>
-											<amount>15</amount>
-										</li>
-									</secondaryDamage>
-									<speed>204</speed>
-								</projectile>
-							</ThingDef>
-
-						</value>
-					</li>
-
-					<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-						<defName>AM_Gun_AcidSpewer</defName>
-						<statBases>
-							<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-							<SightsEfficiency>1</SightsEfficiency>
-							<ShotSpread>0.01</ShotSpread>
-							<SwayFactor>0.81</SwayFactor>
-							<Bulk>15.00</Bulk>
-						</statBases>
-						<Properties>
-							<recoilAmount>1.80</recoilAmount>
-							<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-							<hasStandardCommand>true</hasStandardCommand>
-							<defaultProjectile>Bullet_5x100mmCaseless_Acidic</defaultProjectile>
-							<warmupTime>1.3</warmupTime>
-							<range>55</range>
-							<burstShotCount>1</burstShotCount>
-							<soundCast>Shot_ToxicNeedleGun</soundCast>
-							<soundCastTail>GunTail_Heavy</soundCastTail>
-							<muzzleFlashScale>9</muzzleFlashScale>
-						</Properties>
-						<AmmoUser>
-							<magazineSize>10</magazineSize>
-							<reloadTime>4</reloadTime>
-							<ammoSet>AmmoSet_5x100mmCaselessAcidic</ammoSet>
-						</AmmoUser>
-						<FireModes>
-							<aiAimMode>AimedShot</aiAimMode>
-						</FireModes>
-						<weaponTags>
-							<li>CE_AI_Rifle</li>
-							<li>NoSwitch</li>
-						</weaponTags>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Gun_AcidSpewer"]/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>
-					</li>
-
-					<!-- Heavy Laser -->
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs</xpath>
-						<value>
-
-							<CombatExtended.AmmoSetDef>
-								<defName>AmmoSet_HeavyLaser</defName>
-								<label>heavy laser charge</label>
-								<ammoTypes>
-									<Ammo_LaserChargePack>Bullet_HeavyLaser</Ammo_LaserChargePack>
-								</ammoTypes>
-							</CombatExtended.AmmoSetDef>
-
-							<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletRed">
-								<defName>Bullet_HeavyLaser</defName>
-								<label>laser shot</label>
-								<projectile Class="CombatExtended.ProjectilePropertiesCE">
-									<damageDef>CE_Laser</damageDef>
-									<damageAmountBase>17</damageAmountBase>
-									<armorPenetrationSharp>20</armorPenetrationSharp>
-									<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-								</projectile>
-							</ThingDef>
-
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Gun_HeavyLaser"]/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>
-					</li>
-
-					<li Class="PatchOperationRemove">
-						<xpath>Defs/ThingDef[defName="AM_Gun_HeavyLaser"]/comps/li[@Class="VanillaWeaponsExpandedLaser.CompProperties_LaserCapacitor"]</xpath>
-					</li>
-
-					<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-						<defName>AM_Gun_HeavyLaser</defName>
-						<statBases>
-							<Mass>3.50</Mass>
-							<Bulk>10.00</Bulk>
-							<SwayFactor>1.35</SwayFactor>
-							<ShotSpread>0.05</ShotSpread>
-							<SightsEfficiency>1.10</SightsEfficiency>
-							<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						</statBases>
-						<Properties>
-							<recoilAmount>0.01</recoilAmount>
-							<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-							<hasStandardCommand>True</hasStandardCommand>
-							<defaultProjectile>Bullet_HeavyLaser</defaultProjectile>
-							<warmupTime>1</warmupTime>
-							<range>62</range>
-							<burstShotCount>3</burstShotCount>
-							<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-							<soundCast>AM_HeavyLaser</soundCast>
-							<soundCastTail>GunTail_Heavy</soundCastTail>
-							<muzzleFlashScale>14</muzzleFlashScale>
-							<targetParams>
-								<canTargetLocations>true</canTargetLocations>
-							</targetParams>
-						</Properties>
-						<AmmoUser>
-							<magazineSize>60</magazineSize>
-							<reloadTime>4</reloadTime>
-							<ammoSet>AmmoSet_HeavyLaser</ammoSet>
-						</AmmoUser>
-						<FireModes>
-							<aiAimMode>AimedShot</aiAimMode>
-							<aiUseBurstMode>True</aiUseBurstMode>
-							<aimedBurstShotCount>2</aimedBurstShotCount>
-						</FireModes>
-						<weaponTags>
-							<li>NoSwitch</li>
-						</weaponTags>
-					</li>
-
-					<!-- Siegemelter Flamethrower -->
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_SiegemelterTurret"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>barrel</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>11.7</power>
-									<cooldownTime>2.6</cooldownTime>
-									<armorPenetrationBlunt>2.4</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-						<defName>AM_SiegemelterTurret</defName>
-						<statBases>
-							<Mass>20</Mass>
-							<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.0</SightsEfficiency>
-							<ShotSpread>4.0</ShotSpread>
-							<SwayFactor>1.33</SwayFactor>
-						</statBases>
-						<Properties>
-							<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-							<hasStandardCommand>true</hasStandardCommand>
-							<defaultProjectile>Bullet_Flamethrower_Prometheum</defaultProjectile>
-							<warmupTime>1.3</warmupTime>
-							<range>25</range>
-							<minRange>3.9</minRange>
-							<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-							<burstShotCount>10</burstShotCount>
-							<soundCast>AM_PoisonBreath</soundCast>
-							<muzzleFlashScale>2</muzzleFlashScale>
-							<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-						</Properties>
-						<AmmoUser>
-							<magazineSize>100</magazineSize>
-							<reloadTime>8</reloadTime>
-							<ammoSet>AmmoSet_Flamethrower</ammoSet>
-						</AmmoUser>
-						<FireModes>
-							<aiAimMode>AimedShot</aiAimMode>
-						</FireModes>
-						<weaponTags>
-							<li>NoSwitch</li>
-						</weaponTags>
-					</li>
-
-					<!-- Tesla Gun -->
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_TeslaGun"]/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>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_TeslaGun"]/verbs/li/range</xpath>
-						<value>
-							<range>31</range>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Bullet_Tesla"]/projectile/damageAmountBase</xpath>
-						<value>
-							<damageAmountBase>10</damageAmountBase>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Bullet_Tesla"]/modExtensions/li[@Class="VFEMech.TeslaChainingProps"]/damageDef</xpath>
-						<value>
-							<damageDef>EMP</damageDef>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Bullet_Tesla"]/modExtensions/li[@Class="VFEMech.TeslaChainingProps"]/maxLifetime</xpath>
-						<value>
-							<maxLifetime>6</maxLifetime>
-						</value>
-					</li>
-
-					<!-- Starfire Cannon -->
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_StarfireTurret"]/verbs/li/range</xpath>
-						<value>
-							<range>75</range>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_StarfireTurret"]/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>
-					</li>
-
-					<!-- Tactical Shotgun -->
-
-					<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-						<defName>AM_Gun_TacticalShotgun</defName>
-						<statBases>
-							<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
-							<SightsEfficiency>1</SightsEfficiency>
-							<ShotSpread>0.15</ShotSpread>
-							<SwayFactor>0.65</SwayFactor>
-							<Bulk>8.00</Bulk>
-						</statBases>
-						<Properties>
-							<recoilAmount>2.42</recoilAmount>
-							<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-							<hasStandardCommand>true</hasStandardCommand>
-							<defaultProjectile>Bullet_410Bore_Buck</defaultProjectile>
-							<warmupTime>0.8</warmupTime>
-							<range>16</range>
-							<burstShotCount>3</burstShotCount>
-							<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
-							<soundCast>Shot_Shotgun_NoRack</soundCast>
-							<soundCastTail>GunTail_Medium</soundCastTail>
-							<muzzleFlashScale>6</muzzleFlashScale>
-						</Properties>
-						<AmmoUser>
-							<magazineSize>15</magazineSize>
-							<reloadTime>4.9</reloadTime>
-							<ammoSet>AmmoSet_410Bore</ammoSet>
-						</AmmoUser>
-						<FireModes>
-							<aiAimMode>Snapshot</aiAimMode>
-						</FireModes>
-						<weaponTags>
-							<li>NoSwitch</li>
-						</weaponTags>
-					</li>
-
-					<!-- Beam Graser Cannon -->
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_BeamGraserCannon"]/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>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_BeamGraserCannon"]/statBases/RangedWeapon_Cooldown</xpath>
-						<value>
-							<RangedWeapon_Cooldown>1.0</RangedWeapon_Cooldown>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_BeamGraserCannon"]/verbs/li/warmupTime</xpath>
-						<value>
-							<warmupTime>2.0</warmupTime>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_BeamGraserCannon"]/verbs/li/range</xpath>
-						<value>
-							<range>68</range>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_BeamGraserCannon"]/verbs/li/burstShotCount</xpath>
-						<value>
-							<burstShotCount>20</burstShotCount>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_BeamGraserCannon"]/verbs/li/ticksBetweenBurstShots</xpath>
-						<value>
-							<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						</value>
-					</li>
-
-					<!-- Rotary Needle launcher -->
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs</xpath>
-						<value>
-
-							<CombatExtended.AmmoSetDef>
-								<defName>AmmoSet_5x100mmS</defName>
-								<label>5x100mm Special</label>
-								<ammoTypes>
-									<Ammo_5x100mmCaseless_Sabot>Bullet_5x100mmS_Sabot</Ammo_5x100mmCaseless_Sabot>
-								</ammoTypes>
-								<similarTo>AmmoSet_Rifle</similarTo>
-							</CombatExtended.AmmoSetDef>
-
-							<ThingDef ParentName="Base5x100mmCaselessBullet">
-								<defName>Bullet_5x100mmS_Sabot</defName>
-								<label>5x100 Special bullet (Sabot)</label>
-								<projectile Class="CombatExtended.ProjectilePropertiesCE">
-									<damageDef>Bullet</damageDef>
-									<damageAmountBase>8</damageAmountBase>
-									<armorPenetrationSharp>12</armorPenetrationSharp>
-									<armorPenetrationBlunt>48</armorPenetrationBlunt>
-									<speed>150</speed>
-								</projectile>
-							</ThingDef>
-
-						</value>
-					</li>
-
-					<!-- Change the base away from the needle gun to prevent it inheriting incorrect mag size. -->
-					<li Class="PatchOperationAttributeSet">
-						<xpath>Defs/ThingDef[defName="AM_MechanoidGunRotaryNeedle"]</xpath>
-						<attribute>ParentName</attribute>
-						<value>BaseWeapon</value>
-					</li>
-
-					<!-- Add back the important stuff it still needed. Clunky, but it works. -->
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_MechanoidGunRotaryNeedle"]</xpath>
-						<value>
-							<techLevel>Spacer</techLevel>
-							<tradeability>None</tradeability>
-							<destroyOnDrop>true</destroyOnDrop>
-							<relicChance>0</relicChance>
-							<weaponClasses>
-								<li>RangedHeavy</li>
-								<li>LongShots</li>
-							</weaponClasses>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_MechanoidGunRotaryNeedle"]/graphicData</xpath>
-						<value>
-							<graphicClass>Graphic_Single</graphicClass>
-						</value>
-					</li>
-
-					<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-						<defName>AM_MechanoidGunRotaryNeedle</defName>
-						<statBases>
-							<Mass>5.00</Mass>
-							<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-							<SightsEfficiency>1</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.0</SwayFactor>
-							<Bulk>10</Bulk>
-							<MarketValue>1400</MarketValue>
-						</statBases>
-						<Properties>
-							<recoilAmount>1.5</recoilAmount>
-							<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-							<hasStandardCommand>true</hasStandardCommand>
-							<defaultProjectile>Bullet_5x100mmS_Sabot</defaultProjectile>
-							<warmupTime>2.1</warmupTime>
-							<range>55</range>
-							<burstShotCount>20</burstShotCount>
-							<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-							<soundCast>AM_NeedleShot</soundCast>
-							<soundCastTail>GunTail_Heavy</soundCastTail>
-							<muzzleFlashScale>9</muzzleFlashScale>
-						</Properties>
-						<weaponTags>
-							<li>NoSwitch</li>
-							<li>MechanoidGunLongRange</li>
-						</weaponTags>
-						<AmmoUser>
-							<magazineSize>100</magazineSize>
-							<reloadTime>9.2</reloadTime>
-							<ammoSet>AmmoSet_5x100mmS</ammoSet>
-						</AmmoUser>
-						<FireModes>
-							<aiAimMode>AimedShot</aiAimMode>
-							<noSnapshot>true</noSnapshot>
-						</FireModes>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_MechanoidGunRotaryNeedle"]</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>
-					</li>
-
-					<!-- Mini Needle Gun -->
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Gun_MiniNeedle"]/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>
-					</li>
-
-					<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-						<defName>AM_Gun_MiniNeedle</defName>
-						<statBases>
-							<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-							<SightsEfficiency>2.06</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>0.6</SwayFactor>
-							<Bulk>7.00</Bulk>
-						</statBases>
-						<Properties>
-							<recoilAmount>1.2</recoilAmount>
-							<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-							<hasStandardCommand>true</hasStandardCommand>
-							<defaultProjectile>Bullet_5x100mmS_Sabot</defaultProjectile>
-							<warmupTime>1.35</warmupTime>
-							<range>75</range>
-							<burstShotCount>1</burstShotCount>
-							<soundCast>Shot_NeedleGun</soundCast>
-							<soundCastTail>GunTail_Heavy</soundCastTail>
-							<muzzleFlashScale>9</muzzleFlashScale>
-						</Properties>
-						<AmmoUser>
-							<magazineSize>10</magazineSize>
-							<reloadTime>4</reloadTime>
-							<ammoSet>AmmoSet_5x100mmS</ammoSet>
-						</AmmoUser>
-						<FireModes>
-							<aiAimMode>AimedShot</aiAimMode>
-						</FireModes>
-						<weaponTags>
-							<li>NoSwitch</li>
-						</weaponTags>
-					</li>
-
-					<!-- Mortar -->
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_MechanoidMortar"]/tools</xpath>
-						<value>
-							<tools>
-								<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>
-					</li>
-
-					<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-						<defName>AM_MechanoidMortar</defName>
-						<statBases>
-							<Mass>3.0</Mass>
-							<Bulk>6.0</Bulk>
-							<SwayFactor>1.0</SwayFactor>
-							<ShotSpread>0.1</ShotSpread>
-							<SightsEfficiency>1.0</SightsEfficiency>
-							<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						</statBases>
-						<Properties>
-							<recoilAmount>3.5</recoilAmount>
-							<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-							<hasStandardCommand>true</hasStandardCommand>
-							<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
-							<warmupTime>1</warmupTime>
-							<range>40</range>
-							<minRange>5</minRange>
-							<soundCast>InfernoCannon_Fire</soundCast>
-							<muzzleFlashScale>9</muzzleFlashScale>
-							<ai_IsBuildingDestroyer>True</ai_IsBuildingDestroyer>
-							<ignorePartialLoSBlocker>True</ignorePartialLoSBlocker>
-							<targetParams>
-								<canTargetLocations>True</canTargetLocations>
-							</targetParams>
-						</Properties>
-						<AmmoUser>
-							<magazineSize>10</magazineSize>
-							<reloadTime>5.1</reloadTime>
-							<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
-						</AmmoUser>
-						<FireModes>
-							<aiAimMode>SuppressFire</aiAimMode>
-						</FireModes>
-						<weaponTags>
-							<li>NoSwitch</li>
-						</weaponTags>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Base.xml b/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Base.xml
deleted file mode 100644
index b20de8720d..0000000000
--- a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Base.xml	
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Biotech</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[@Name="AM_MediumMechanoid"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>5</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[@Name="AM_MediumMechanoid"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>3</ArmorRating_Sharp>
-							<MaxHitPoints>300</MaxHitPoints>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Apoptosis.xml b/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Apoptosis.xml
deleted file mode 100644
index 8b994a8a83..0000000000
--- a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Apoptosis.xml	
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Biotech</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AM_Apoptosis"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Humanoid</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Apoptosis"]/statBases</xpath>
-						<value>
-							<ArmorRating_Heat>0.75</ArmorRating_Heat>
-							<CarryWeight>75</CarryWeight>
-							<CarryBulk>30</CarryBulk>
-							<MeleeDodgeChance>0.1</MeleeDodgeChance>
-							<MeleeCritChance>0.13</MeleeCritChance>
-							<MeleeParryChance>0.13</MeleeParryChance>
-							<MaxHitPoints>600</MaxHitPoints>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Apoptosis"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>64</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Apoptosis"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>26</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Apoptosis"]/statBases/EnergyShieldRechargeRate</xpath>
-						<value>
-							<EnergyShieldRechargeRate>0.525</EnergyShieldRechargeRate>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Apoptosis"]/statBases/EnergyShieldEnergyMax</xpath>
-						<value>
-							<EnergyShieldEnergyMax>3.75</EnergyShieldEnergyMax>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Apoptosis"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>wing blade</label>
-									<capacities>
-										<li>Cut</li>
-									</capacities>
-									<power>37</power>
-									<cooldownTime>1.5</cooldownTime>
-									<linkedBodyPartsGroup>AM_WingBlades</linkedBodyPartsGroup>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-									<armorPenetrationBlunt>6</armorPenetrationBlunt>
-									<armorPenetrationSharp>2.5</armorPenetrationSharp>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>wing blade</label>
-									<capacities>
-										<li>Stab</li>
-									</capacities>
-									<power>18</power>
-									<cooldownTime>1.25</cooldownTime>
-									<linkedBodyPartsGroup>AM_WingBlades</linkedBodyPartsGroup>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-									<armorPenetrationBlunt>15</armorPenetrationBlunt>
-									<armorPenetrationSharp>30</armorPenetrationSharp>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>10</power>
-									<cooldownTime>2.0</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-									<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="AM_Apoptosis"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AM_Apoptosis"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Apoptosis"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>5250</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>525</MaxOverHeal>
-								<MinArmorPct>0.5</MinArmorPct>
-								<MinArmorValueSharp>14</MinArmorValueSharp>
-								<MinArmorValueBlunt>35</MinArmorValueBlunt>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/PawnKindDef[defName="AM_Apoptosis"]/combatPower</xpath>
-						<value>
-							<combatPower>1000</combatPower>
-						</value>
-					</li>
-
-					<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-						<defName>AM_Gun_SoulDrainTurret</defName>
-						<statBases>
-							<SightsEfficiency>1</SightsEfficiency>
-							<ShotSpread>0.2</ShotSpread><!-- Manually adjusted from 0.08 due to accuracy concerns. -->
-							<SwayFactor>0.56</SwayFactor>
-							<Bulk>6.00</Bulk>
-						</statBases>
-						<Properties>
-							<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-							<hasStandardCommand>true</hasStandardCommand>
-							<defaultProjectile>AM_Bullet_SoulDrain_CE</defaultProjectile>
-							<range>55</range>
-							<burstShotCount>1</burstShotCount>
-							<soundCast>AM_SoulDrain</soundCast>
-							<muzzleFlashScale>9</muzzleFlashScale>
-							<defaultCooldownTime>2.5</defaultCooldownTime>
-							<ticksBetweenBurstShots>150</ticksBetweenBurstShots>
-						</Properties>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs</xpath>
-						<value>
-							<ThingDef ParentName="BaseBulletCE">
-								<defName>AM_Bullet_SoulDrain_CE</defName>
-								<label>soul drain</label>
-								<thingClass>CombatExtended.BulletCE</thingClass>
-								<graphicData>
-									<texPath>Things/Projectiles/AM_SoulDrain</texPath>
-									<graphicClass>Graphic_Single</graphicClass>
-									<shaderType>TransparentPostLight</shaderType>
-									<drawSize>(3,3)</drawSize>
-								</graphicData>
-								<projectile Class="CombatExtended.ProjectilePropertiesCE">
-									<damageDef>AM_SoulDrain</damageDef>
-									<damageAmountBase>15</damageAmountBase>
-									<armorPenetrationBlunt>20</armorPenetrationBlunt>
-									<speed>90</speed>
-								</projectile>
-							</ThingDef>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Bellicor.xml b/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Bellicor.xml
deleted file mode 100644
index 510527b772..0000000000
--- a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Bellicor.xml	
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Biotech</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Bellicor"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Humanoid</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Bellicor"]/statBases</xpath>
-						<value>
-							<CarryWeight>50</CarryWeight>
-							<CarryBulk>20</CarryBulk>
-							<AimingAccuracy>1.0</AimingAccuracy>
-							<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
-							<MeleeDodgeChance>0.13</MeleeDodgeChance>
-							<MeleeCritChance>0.12</MeleeCritChance>
-							<MeleeParryChance>0.09</MeleeParryChance>
-							<MaxHitPoints>150</MaxHitPoints>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Bellicor"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>9</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Bellicor"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>6</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Bellicor"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>5</power>
-									<cooldownTime>1.85</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-									<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Bellicor"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AM_Mech_Bellicor"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Bellicor"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>1000</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>100</MaxOverHeal>
-								<MinArmorPct>0.75</MinArmorPct>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/PawnKindDef[defName="AM_Mech_Bellicor"]/combatPower</xpath>
-						<value>
-							<combatPower>170</combatPower>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/PawnKindDef[defName="AM_Mech_Bellicor"]</xpath>
-						<value>
-							<li Class="CombatExtended.LoadoutPropertiesExtension">
-								<primaryMagazineCount>
-									<min>3</min>
-									<max>5</max>
-								</primaryMagazineCount>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Bellicor_Mortar.xml b/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Bellicor_Mortar.xml
deleted file mode 100644
index ffbcb54a66..0000000000
--- a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Bellicor_Mortar.xml	
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Biotech</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Artilleron"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Humanoid</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Artilleron"]/statBases</xpath>
-						<value>
-							<CarryWeight>50</CarryWeight>
-							<CarryBulk>20</CarryBulk>
-							<AimingAccuracy>1.0</AimingAccuracy>
-							<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
-							<MeleeDodgeChance>0.09</MeleeDodgeChance>
-							<MeleeCritChance>0.12</MeleeCritChance>
-							<MeleeParryChance>0.09</MeleeParryChance>
-							<MaxHitPoints>150</MaxHitPoints>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Artilleron"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>6</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Artilleron"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>4</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Artilleron"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>5</power>
-									<cooldownTime>1.85</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-									<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Artilleron"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AM_Mech_Artilleron"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Artilleron"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>850</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>525</MaxOverHeal>
-								<MinArmorPct>0.75</MinArmorPct>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/PawnKindDef[defName="AM_Mech_Artilleron"]/combatPower</xpath>
-						<value>
-							<combatPower>150</combatPower>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/PawnKindDef[defName="AM_Mech_Artilleron"]</xpath>
-						<value>
-							<li Class="CombatExtended.LoadoutPropertiesExtension">
-								<primaryMagazineCount>
-									<min>3</min>
-									<max>5</max>
-								</primaryMagazineCount>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Blitzkrieg.xml b/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Blitzkrieg.xml
deleted file mode 100644
index e5dfff57bf..0000000000
--- a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Blitzkrieg.xml	
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Biotech</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AM_Blitzkrieg"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Vehicle</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Blitzkrieg"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>2</power>
-									<cooldownTime>1.85</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="AM_Blitzkrieg"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AM_Blitzkrieg"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Blitzkrieg"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>700</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>70</MaxOverHeal>
-								<MinArmorPct>0.75</MinArmorPct>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/PawnKindDef[defName="AM_Blitzkrieg"]/combatPower</xpath>
-						<value>
-							<combatPower>120</combatPower>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Guttersnipe.xml b/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Guttersnipe.xml
deleted file mode 100644
index 350e9428f7..0000000000
--- a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Guttersnipe.xml	
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Biotech</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Guttersnipe"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Vehicle</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Guttersnipe"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.1</MeleeDodgeChance>
-							<MeleeCritChance>0.05</MeleeCritChance>
-							<MeleeParryChance>0.05</MeleeParryChance>
-							<MaxHitPoints>200</MaxHitPoints>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Guttersnipe"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>8</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Guttersnipe"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>4</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Guttersnipe"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Cut</li>
-									</capacities>
-									<power>20</power>
-									<cooldownTime>2.07</cooldownTime>
-									<linkedBodyPartsGroup>AM_CircularSaw</linkedBodyPartsGroup>
-									<armorPenetrationSharp>1.16</armorPenetrationSharp>
-									<armorPenetrationBlunt>2.4</armorPenetrationBlunt>
-									<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Stab</li>
-									</capacities>
-									<power>12</power>
-									<cooldownTime>1.33</cooldownTime>
-									<linkedBodyPartsGroup>AM_CircularSaw</linkedBodyPartsGroup>
-									<armorPenetrationSharp>10</armorPenetrationSharp>
-									<armorPenetrationBlunt>5</armorPenetrationBlunt>
-									<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Guttersnipe"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AM_Mech_Guttersnipe"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Guttersnipe"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>1600</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>160</MaxOverHeal>
-								<MinArmorPct>0.75</MinArmorPct>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Infernus.xml b/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Infernus.xml
deleted file mode 100644
index 46cda6ed3b..0000000000
--- a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Infernus.xml	
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Biotech</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AM_Infernus"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Vehicle</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Infernus"]/statBases</xpath>
-						<value>
-							<ArmorRating_Heat>0.75</ArmorRating_Heat>
-							<CarryWeight>75</CarryWeight>
-							<CarryBulk>60</CarryBulk>
-							<AimingAccuracy>1.0</AimingAccuracy>
-							<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
-							<MeleeDodgeChance>0.1</MeleeDodgeChance>
-							<MeleeCritChance>0.42</MeleeCritChance>
-							<MeleeParryChance>0.64</MeleeParryChance>
-							<AimingDelayFactor>1.25</AimingDelayFactor>
-							<MaxHitPoints>600</MaxHitPoints>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Infernus"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>36</power>
-									<cooldownTime>3.6</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-									<armorPenetrationBlunt>16</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="AM_Infernus"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AM_Infernus"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Infernus"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>4250</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>425</MaxOverHeal>
-								<MinArmorPct>0.5</MinArmorPct>
-								<MinArmorValueSharp>14</MinArmorValueSharp>
-								<MinArmorValueBlunt>35</MinArmorValueBlunt>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/PawnKindDef[defName="AM_Infernus"]/combatPower</xpath>
-						<value>
-							<combatPower>1000</combatPower>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Legate.xml b/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Legate.xml
deleted file mode 100644
index acbb6c5cdf..0000000000
--- a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Legate.xml	
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Biotech</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Legate"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Humanoid</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Legate"]/statBases/EnergyShieldRechargeRate</xpath>
-						<value>
-							<EnergyShieldRechargeRate>1.5</EnergyShieldRechargeRate>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Legate"]/statBases/EnergyShieldEnergyMax</xpath>
-						<value>
-							<EnergyShieldEnergyMax>10.0</EnergyShieldEnergyMax>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Legate"]/statBases</xpath>
-						<value>
-							<ArmorRating_Heat>0.5</ArmorRating_Heat>
-							<CarryWeight>100</CarryWeight>
-							<CarryBulk>75</CarryBulk>
-							<AimingAccuracy>1.0</AimingAccuracy>
-							<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-							<MeleeDodgeChance>0.02</MeleeDodgeChance>
-							<MeleeCritChance>0.20</MeleeCritChance>
-							<MeleeParryChance>0.57</MeleeParryChance>
-							<MaxHitPoints>550</MaxHitPoints>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Legate"]/comps/li[@Class="CompProperties_ProjectileInterceptor"]/hitPoints</xpath>
-						<value>
-							<hitPoints>1000</hitPoints>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Legate"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Demolish</li>
-									</capacities>
-									<power>27</power>
-									<cooldownTime>3.0</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>10</armorPenetrationBlunt>
-									<chanceFactor>0.2</chanceFactor>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Legate"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AM_Mech_Legate"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Legate"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>3800</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>380</MaxOverHeal>
-								<MinArmorPct>0.5</MinArmorPct>
-								<MinArmorValueSharp>14</MinArmorValueSharp>
-								<MinArmorValueBlunt>35</MinArmorValueBlunt>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/PawnKindDef[defName="AM_Mech_Legate"]/combatPower</xpath>
-						<value>
-							<combatPower>600</combatPower>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/PawnKindDef[defName="AM_Mech_Legate"]</xpath>
-						<value>
-							<li Class="CombatExtended.LoadoutPropertiesExtension">
-								<primaryMagazineCount>
-									<min>3</min>
-									<max>5</max>
-								</primaryMagazineCount>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Lux.xml b/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Lux.xml
deleted file mode 100644
index fb6b99c765..0000000000
--- a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Lux.xml	
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Biotech</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Lux"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Humanoid</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Lux"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>left fist</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>5</power>
-									<cooldownTime>1.11</cooldownTime>
-									<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>right fist</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>5</power>
-									<cooldownTime>1.11</cooldownTime>
-									<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>5</power>
-									<cooldownTime>1.85</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<chanceFactor>0.2</chanceFactor>
-									<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Lux"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AM_Mech_Lux"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Lux"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>1000</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>100</MaxOverHeal>
-								<MinArmorPct>0.75</MinArmorPct>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/PawnKindDef[defName="AM_Mech_Lux"]/combatPower</xpath>
-						<value>
-							<combatPower>300</combatPower>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/PawnKindDef[defName="AM_Mech_Lux"]</xpath>
-						<value>
-							<li Class="CombatExtended.LoadoutPropertiesExtension">
-								<primaryMagazineCount>
-									<min>3</min>
-									<max>4</max>
-								</primaryMagazineCount>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_MasterChef.xml b/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_MasterChef.xml
deleted file mode 100644
index 35f43344ae..0000000000
--- a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_MasterChef.xml	
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Biotech</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AM_Mech_MasterChef"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Humanoid</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="AM_Mech_MasterChef"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AM_Mech_MasterChef"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Mech_MasterChef"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>700</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>70</MaxOverHeal>
-								<MinArmorPct>0.75</MinArmorPct>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Munifex.xml b/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Munifex.xml
deleted file mode 100644
index 8fb677bfbb..0000000000
--- a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Munifex.xml	
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Biotech</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Munifex"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Humanoid</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Munifex"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>left fist</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>5</power>
-									<cooldownTime>1.11</cooldownTime>
-									<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>right fist</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>5</power>
-									<cooldownTime>1.11</cooldownTime>
-									<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>5</power>
-									<cooldownTime>1.85</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<chanceFactor>0.2</chanceFactor>
-									<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Munifex"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AM_Mech_Munifex"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Munifex"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>1000</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>100</MaxOverHeal>
-								<MinArmorPct>0.75</MinArmorPct>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/PawnKindDef[defName="AM_Mech_Munifex"]/combatPower</xpath>
-						<value>
-							<combatPower>300</combatPower>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/PawnKindDef[defName="AM_Mech_Munifex"]</xpath>
-						<value>
-							<li Class="CombatExtended.LoadoutPropertiesExtension">
-								<primaryMagazineCount>
-									<min>4</min>
-									<max>5</max>
-								</primaryMagazineCount>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Optio.xml b/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Optio.xml
deleted file mode 100644
index a54519a166..0000000000
--- a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Optio.xml	
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Biotech</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Optio"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Humanoid</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Optio"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Optio"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>5</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Optio"]/statBases/EnergyShieldRechargeRate</xpath>
-						<value>
-							<EnergyShieldRechargeRate>1.125</EnergyShieldRechargeRate>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Optio"]/statBases/EnergyShieldEnergyMax</xpath>
-						<value>
-							<EnergyShieldEnergyMax>7.5</EnergyShieldEnergyMax>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Optio"]/comps/li[@Class="CompProperties_ProjectileInterceptor"]/hitPoints</xpath>
-						<value>
-							<hitPoints>375</hitPoints>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Optio"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AM_Mech_Optio"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Optio"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>860</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>86</MaxOverHeal>
-								<MinArmorPct>0.75</MinArmorPct>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/PawnKindDef[defName="AM_Mech_Optio"]/combatPower</xpath>
-						<value>
-							<combatPower>220</combatPower>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/PawnKindDef[defName="AM_Mech_Optio"]</xpath>
-						<value>
-							<li Class="CombatExtended.LoadoutPropertiesExtension">
-								<primaryMagazineCount>
-									<min>2</min>
-									<max>3</max>
-								</primaryMagazineCount>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Polychoron.xml b/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Polychoron.xml
deleted file mode 100644
index 998a9bdf14..0000000000
--- a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Polychoron.xml	
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Biotech</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Polychoron"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Humanoid</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Polychoron"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Polychoron"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>5</ArmorRating_Sharp>
-							<ArmorRating_Heat>0.5</ArmorRating_Heat>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Polychoron"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AM_Mech_Polychoron"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Polychoron"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>1350</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>135</MaxOverHeal>
-								<MinArmorPct>0.75</MinArmorPct>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/PawnKindDef[defName="AM_Mech_Polychoron"]/combatPower</xpath>
-						<value>
-							<combatPower>300</combatPower>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_PristineAssembler.xml b/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_PristineAssembler.xml
deleted file mode 100644
index cc48c0b07b..0000000000
--- a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_PristineAssembler.xml	
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Biotech</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AM_Mech_PristineAssembler"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Quadruped</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Mech_PristineAssembler"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.12</MeleeDodgeChance>
-							<MeleeCritChance>0.1</MeleeCritChance>
-							<MeleeParryChance>0.17</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Mech_PristineAssembler"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>16</ArmorRating_Blunt>
-						</value>
-					</li>
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Mech_PristineAssembler"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>7</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Mech_PristineAssembler"]/comps/li[@Class ="AnimalBehaviours.CompProperties_AnimalProduct"]/randomItems</xpath>
-						<value>
-							<li>FSX</li>
-							<li>Prometheum</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Mech_PristineAssembler"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>16</power>
-									<cooldownTime>2.4</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="AM_Mech_PristineAssembler"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AM_Mech_PristineAssembler"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Mech_PristineAssembler"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>3500</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>350</MaxOverHeal>
-								<MinArmorPct>0.5</MinArmorPct>
-								<MinArmorValueSharp>4</MinArmorValueSharp>
-								<MinArmorValueBlunt>10</MinArmorValueBlunt>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_PristineSlurrypede.xml b/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_PristineSlurrypede.xml
deleted file mode 100644
index 3914153891..0000000000
--- a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_PristineSlurrypede.xml	
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Biotech</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AM_Mech_PristineSlurrypede"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>QuadrupedLow</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Mech_PristineSlurrypede"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.12</MeleeDodgeChance>
-							<MeleeCritChance>0.1</MeleeCritChance>
-							<MeleeParryChance>0.17</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Mech_PristineSlurrypede"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>20</ArmorRating_Blunt>
-						</value>
-					</li>
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Mech_PristineSlurrypede"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>9</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Mech_PristineSlurrypede"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>16</power>
-									<cooldownTime>2.7</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>12</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="AM_Mech_PristineSlurrypede"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AM_Mech_PristineSlurrypede"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Mech_PristineSlurrypede"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>3500</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>350</MaxOverHeal>
-								<MinArmorPct>0.5</MinArmorPct>
-								<MinArmorValueSharp>6</MinArmorValueSharp>
-								<MinArmorValueBlunt>12</MinArmorValueBlunt>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_PristineStrider.xml b/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_PristineStrider.xml
deleted file mode 100644
index 3465e18e23..0000000000
--- a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_PristineStrider.xml	
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Biotech</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AM_PristineStrider"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>QuadrupedLow</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_PristineStrider"]/statBases</xpath>
-						<value>
-							<CarryWeight>300</CarryWeight>
-							<CarryBulk>100</CarryBulk>
-							<ArmorRating_Blunt>10</ArmorRating_Blunt>
-							<ArmorRating_Sharp>6</ArmorRating_Sharp>
-							<MeleeDodgeChance>0.03</MeleeDodgeChance>
-							<MeleeCritChance>0.26</MeleeCritChance>
-							<MeleeParryChance>0.52</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_PristineStrider"]</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>10</power>
-									<cooldownTime>3.01</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>5</armorPenetrationBlunt>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="AM_PristineStrider"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AM_PristineStrider"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_PristineStrider"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>1000</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>100</MaxOverHeal>
-								<MinArmorPct>0.75</MinArmorPct>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Sagittarius.xml b/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Sagittarius.xml
deleted file mode 100644
index 3164d0def0..0000000000
--- a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Sagittarius.xml	
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Biotech</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Sagittarius"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Humanoid</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Sagittarius"]/statBases</xpath>
-						<value>
-							<ArmorRating_Electric>0.25</ArmorRating_Electric>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Sagittarius"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>left fist</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>5</power>
-									<cooldownTime>1.11</cooldownTime>
-									<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>right fist</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>5</power>
-									<cooldownTime>1.11</cooldownTime>
-									<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>5</power>
-									<cooldownTime>1.85</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<chanceFactor>0.2</chanceFactor>
-									<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Sagittarius"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AM_Mech_Sagittarius"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Sagittarius"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>1000</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>100</MaxOverHeal>
-								<MinArmorPct>0.75</MinArmorPct>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/PawnKindDef[defName="AM_Mech_Sagittarius"]/combatPower</xpath>
-						<value>
-							<combatPower>300</combatPower>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Siegemelter.xml b/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Siegemelter.xml
deleted file mode 100644
index 3336c07c28..0000000000
--- a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Siegemelter.xml	
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Biotech</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AM_Siegemelter"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Vehicle</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Siegemelter"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>64</ArmorRating_Blunt>
-						</value>
-					</li>
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Siegemelter"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>26</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Siegemelter"]/statBases</xpath>
-						<value>
-							<ArmorRating_Heat>0.5</ArmorRating_Heat>
-							<CarryWeight>200</CarryWeight>
-							<CarryBulk>150</CarryBulk>
-							<AimingAccuracy>1.0</AimingAccuracy>
-							<ShootingAccuracyPawn>1.0</ShootingAccuracyPawn>
-							<MeleeDodgeChance>0.01</MeleeDodgeChance>
-							<MeleeCritChance>0.07</MeleeCritChance>
-							<MeleeParryChance>0.24</MeleeParryChance>
-							<MaxHitPoints>600</MaxHitPoints>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Siegemelter"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>30</power>
-									<cooldownTime>3.4</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-									<armorPenetrationBlunt>20</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="AM_Siegemelter"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AM_Siegemelter"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Siegemelter"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>4250</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>425</MaxOverHeal>
-								<MinArmorPct>0.5</MinArmorPct>
-								<MinArmorValueSharp>14</MinArmorValueSharp>
-								<MinArmorValueBlunt>35</MinArmorValueBlunt>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/PawnKindDef[defName="AM_Siegemelter"]/combatPower</xpath>
-						<value>
-							<combatPower>550</combatPower>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/PawnKindDef[defName="AM_Siegemelter"]</xpath>
-						<value>
-							<li Class="CombatExtended.LoadoutPropertiesExtension">
-								<primaryMagazineCount>
-									<min>4</min>
-									<max>5</max>
-								</primaryMagazineCount>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Starfire.xml b/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Starfire.xml
deleted file mode 100644
index 1b2d91ceca..0000000000
--- a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Starfire.xml	
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Biotech</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AM_Starfire"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Vehicle</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Starfire"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>68</ArmorRating_Blunt>
-						</value>
-					</li>
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Starfire"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>28</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Starfire"]/statBases</xpath>
-						<value>
-							<ArmorRating_Heat>0.5</ArmorRating_Heat>
-							<CarryWeight>200</CarryWeight>
-							<CarryBulk>150</CarryBulk>
-							<AimingAccuracy>1.0</AimingAccuracy>
-							<ShootingAccuracyPawn>1.0</ShootingAccuracyPawn>
-							<MeleeDodgeChance>0.01</MeleeDodgeChance>
-							<MeleeCritChance>0.07</MeleeCritChance>
-							<MeleeParryChance>0.24</MeleeParryChance>
-							<MaxHitPoints>600</MaxHitPoints>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Starfire"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>30</power>
-									<cooldownTime>3.4</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-									<armorPenetrationBlunt>20</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="AM_Starfire"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AM_Starfire"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Starfire"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>4500</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>450</MaxOverHeal>
-								<MinArmorPct>0.5</MinArmorPct>
-								<MinArmorValueSharp>16</MinArmorValueSharp>
-								<MinArmorValueBlunt>40</MinArmorValueBlunt>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/PawnKindDef[defName="AM_Starfire"]/combatPower</xpath>
-						<value>
-							<combatPower>750</combatPower>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_TurboCleaner.xml b/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_TurboCleaner.xml
deleted file mode 100644
index 197c47d79e..0000000000
--- a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_TurboCleaner.xml	
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Biotech</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AM_Mech_TurboCleaner"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Vehicle</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Mech_TurboCleaner"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>2</power>
-									<cooldownTime>1.85</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="AM_Mech_TurboCleaner"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AM_Mech_TurboCleaner"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Mech_TurboCleaner"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>600</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>60</MaxOverHeal>
-								<MinArmorPct>0.75</MinArmorPct>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_WarEmpress.xml b/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_WarEmpress.xml
deleted file mode 100644
index a0a3ad95ff..0000000000
--- a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_WarEmpress.xml	
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Biotech</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AM_WarEmpress"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>QuadrupedLow</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_WarEmpress"]/statBases/EnergyShieldRechargeRate</xpath>
-						<value>
-							<EnergyShieldRechargeRate>0.9</EnergyShieldRechargeRate>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_WarEmpress"]/statBases/EnergyShieldEnergyMax</xpath>
-						<value>
-							<EnergyShieldEnergyMax>6.0</EnergyShieldEnergyMax>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_WarEmpress"]/statBases</xpath>
-						<value>
-							<ArmorRating_Heat>0.75</ArmorRating_Heat>
-							<CarryWeight>75</CarryWeight>
-							<CarryBulk>50</CarryBulk>
-							<AimingAccuracy>1.0</AimingAccuracy>
-							<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-							<MeleeDodgeChance>0.02</MeleeDodgeChance>
-							<MeleeCritChance>0.22</MeleeCritChance>
-							<MeleeParryChance>0.64</MeleeParryChance>
-							<MaxHitPoints>600</MaxHitPoints>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_WarEmpress"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>left rending claws</label>
-									<capacities>
-										<li>Scratch</li>
-									</capacities>
-									<power>35</power>
-									<cooldownTime>1.5</cooldownTime>
-									<linkedBodyPartsGroup>LeftPowerClaw</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>5</armorPenetrationBlunt>
-									<armorPenetrationSharp>10</armorPenetrationSharp>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>right rending claws</label>
-									<capacities>
-										<li>Scratch</li>
-									</capacities>
-									<power>35</power>
-									<cooldownTime>1.5</cooldownTime>
-									<linkedBodyPartsGroup>RightPowerClaw</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>5</armorPenetrationBlunt>
-									<armorPenetrationSharp>10</armorPenetrationSharp>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>36</power>
-									<cooldownTime>3.6</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-									<armorPenetrationBlunt>16</armorPenetrationBlunt>
-									<chanceFactor>0.2</chanceFactor>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="AM_WarEmpress"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AM_WarEmpress"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_WarEmpress"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>5750</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>575</MaxOverHeal>
-								<MinArmorPct>0.5</MinArmorPct>
-								<MinArmorValueSharp>14</MinArmorValueSharp>
-								<MinArmorValueBlunt>35</MinArmorValueBlunt>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/PawnKindDef[defName="AM_WarEmpress"]/combatPower</xpath>
-						<value>
-							<combatPower>1100</combatPower>
-						</value>
-					</li>
-
-					<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-						<defName>AM_Gun_SniperTurret</defName>
-						<statBases>
-							<SightsEfficiency>1</SightsEfficiency>
-							<ShotSpread>0.2</ShotSpread><!-- Manually adjusted from 0.08 due to accuracy concerns. -->
-							<SwayFactor>1.89</SwayFactor>
-							<Bulk>20.00</Bulk>
-						</statBases>
-						<Properties>
-							<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-							<hasStandardCommand>true</hasStandardCommand>
-							<defaultProjectile>Bullet_40x311mmR_AP</defaultProjectile>
-							<range>75</range>
-							<minRange>5.9</minRange>
-							<burstShotCount>1</burstShotCount>
-							<soundCast>AM_Shot</soundCast>
-							<muzzleFlashScale>18</muzzleFlashScale>
-							<defaultCooldownTime>4.5</defaultCooldownTime>
-							<ticksBetweenBurstShots>150</ticksBetweenBurstShots>
-						</Properties>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/Rimatomics/Nucleotron.xml b/Patches/Alpha Mechs/Mods/Rimatomics/Nucleotron.xml
deleted file mode 100644
index d358c97042..0000000000
--- a/Patches/Alpha Mechs/Mods/Rimatomics/Nucleotron.xml	
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Dubs Rimatomics</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Nucleotron"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Vehicle</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Nucleotron"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AM_Mech_Nucleotron"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Nucleotron"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>700</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>70</MaxOverHeal>
-								<MinArmorPct>0.75</MinArmorPct>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/VE_Books/Librarian.xml b/Patches/Alpha Mechs/Mods/VE_Books/Librarian.xml
deleted file mode 100644
index 4119f86388..0000000000
--- a/Patches/Alpha Mechs/Mods/VE_Books/Librarian.xml	
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Books Expanded</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Librarian"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Humanoid</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Librarian"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AM_Mech_Librarian"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Librarian"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>700</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>70</MaxOverHeal>
-								<MinArmorPct>0.75</MinArmorPct>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/VE_Fishing/Angler.xml b/Patches/Alpha Mechs/Mods/VE_Fishing/Angler.xml
deleted file mode 100644
index c2b13112b0..0000000000
--- a/Patches/Alpha Mechs/Mods/VE_Fishing/Angler.xml	
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Fishing Expanded</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Angler"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Quadruped</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Angler"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>prow</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>2</power>
-									<cooldownTime>2</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Angler"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AM_Mech_Angler"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Angler"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>700</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>70</MaxOverHeal>
-								<MinArmorPct>0.75</MinArmorPct>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/VE_Genetics/Geneticor.xml b/Patches/Alpha Mechs/Mods/VE_Genetics/Geneticor.xml
deleted file mode 100644
index 252ff525bd..0000000000
--- a/Patches/Alpha Mechs/Mods/VE_Genetics/Geneticor.xml	
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Genetics Expanded</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Geneticor"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Humanoid</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Geneticor"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AM_Mech_Geneticor"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Geneticor"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>700</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>70</MaxOverHeal>
-								<MinArmorPct>0.75</MinArmorPct>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvAura.xml b/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvAura.xml
deleted file mode 100644
index 1c56ece33d..0000000000
--- a/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvAura.xml	
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Factions Expanded - Mechanoids</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Aura"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Humanoid</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Aura"]</xpath>
-						<value>
-							<statBases>
-								<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
-								<ArmorRating_Sharp>5</ArmorRating_Sharp>
-								<MeleeDodgeChance>0.66</MeleeDodgeChance>
-								<MeleeCritChance>0.3</MeleeCritChance>
-								<MeleeParryChance>0.33</MeleeParryChance>
-								<MaxHitPoints>200</MaxHitPoints>
-							</statBases>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Aura"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>wing blade</label>
-									<capacities>
-										<li>Cut</li>
-									</capacities>
-									<power>37</power>
-									<cooldownTime>1.5</cooldownTime>
-									<linkedBodyPartsGroup>AM_WingBlades</linkedBodyPartsGroup>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-									<armorPenetrationBlunt>6</armorPenetrationBlunt>
-									<armorPenetrationSharp>2.5</armorPenetrationSharp>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>wing blade</label>
-									<capacities>
-										<li>Stab</li>
-									</capacities>
-									<power>18</power>
-									<cooldownTime>1.25</cooldownTime>
-									<linkedBodyPartsGroup>AM_WingBlades</linkedBodyPartsGroup>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-									<armorPenetrationBlunt>15</armorPenetrationBlunt>
-									<armorPenetrationSharp>30</armorPenetrationSharp>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>6</power>
-									<cooldownTime>4</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-									<chanceFactor>0.2</chanceFactor>
-									<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Aura"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Aura"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Aura"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>1425</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>500</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>142</MaxOverHeal>
-								<MinArmorPct>0.75</MinArmorPct>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvDaggersnout.xml b/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvDaggersnout.xml
deleted file mode 100644
index 6e439b56bf..0000000000
--- a/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvDaggersnout.xml	
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Factions Expanded - Mechanoids</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Daggersnout"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>QuadrupedLow</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Daggersnout"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.08</MeleeDodgeChance>
-							<MeleeCritChance>0.27</MeleeCritChance>
-							<MeleeParryChance>0.18</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Daggersnout"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>4.5</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Daggersnout"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>3</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Daggersnout"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>snout blade</label>
-									<capacities>
-										<li>Cut</li>
-									</capacities>
-									<power>19</power>
-									<cooldownTime>1.4</cooldownTime>
-									<linkedBodyPartsGroup>AM_NoseBlade</linkedBodyPartsGroup>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-									<armorPenetrationBlunt>8</armorPenetrationBlunt>
-									<armorPenetrationSharp>3</armorPenetrationSharp>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>snout blade</label>
-									<capacities>
-										<li>Stab</li>
-									</capacities>
-									<power>14</power>
-									<cooldownTime>1.2</cooldownTime>
-									<linkedBodyPartsGroup>AM_NoseBlade</linkedBodyPartsGroup>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-									<armorPenetrationBlunt>12</armorPenetrationBlunt>
-									<armorPenetrationSharp>16</armorPenetrationSharp>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>3</power>
-									<cooldownTime>2</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-									<chanceFactor>0.2</chanceFactor>
-									<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Daggersnout"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Daggersnout"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Daggersnout"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>1000</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>100</MaxOverHeal>
-								<MinArmorPct>0.75</MinArmorPct>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvFireworm.xml b/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvFireworm.xml
deleted file mode 100644
index 17b6af001a..0000000000
--- a/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvFireworm.xml	
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Factions Expanded - Mechanoids</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Fireworm"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>QuadrupedLow</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Fireworm"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>30</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Fireworm"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>15</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Fireworm"]/statBases</xpath>
-						<value>
-							<ArmorRating_Heat>1.0</ArmorRating_Heat>
-							<AimingAccuracy>1.0</AimingAccuracy>
-							<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-							<MeleeDodgeChance>0.01</MeleeDodgeChance>
-							<MeleeCritChance>0.19</MeleeCritChance>
-							<MeleeParryChance>0.19</MeleeParryChance>
-							<MaxHitPoints>350</MaxHitPoints>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Fireworm"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>24</power>
-									<cooldownTime>2.6</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-									<armorPenetrationBlunt>12</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Fireworm"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Fireworm"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Fireworm"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>3400</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>340</MaxOverHeal>
-								<MinArmorPct>0.5</MinArmorPct>
-								<MinArmorValueSharp>8</MinArmorValueSharp>
-								<MinArmorValueBlunt>16</MinArmorValueBlunt>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvGoliath.xml b/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvGoliath.xml
deleted file mode 100644
index ddb65592d5..0000000000
--- a/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvGoliath.xml	
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Factions Expanded - Mechanoids</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Goliath"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Humanoid</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Goliath"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>42</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Goliath"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>19</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Goliath"]/statBases</xpath>
-						<value>
-							<ArmorRating_Heat>0.75</ArmorRating_Heat>
-							<CarryWeight>200</CarryWeight>
-							<CarryBulk>100</CarryBulk>
-							<AimingAccuracy>1.0</AimingAccuracy>
-							<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
-							<MeleeDodgeChance>0.05</MeleeDodgeChance>
-							<MeleeCritChance>0.75</MeleeCritChance>
-							<MeleeParryChance>0.2</MeleeParryChance>
-							<MaxHitPoints>500</MaxHitPoints>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Goliath"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>35</power>
-									<cooldownTime>3.0</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-									<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Goliath"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Goliath"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Goliath"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>3650</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>365</MaxOverHeal>
-								<MinArmorPct>0.5</MinArmorPct>
-								<MinArmorValueSharp>12</MinArmorValueSharp>
-								<MinArmorValueBlunt>27</MinArmorValueBlunt>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvPhalanx.xml b/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvPhalanx.xml
deleted file mode 100644
index 8624447b4d..0000000000
--- a/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvPhalanx.xml	
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Factions Expanded - Mechanoids</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Phalanx"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Quadruped</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Phalanx"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>30</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Phalanx"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>13</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Phalanx"]/statBases</xpath>
-						<value>
-							<ArmorRating_Heat>1.0</ArmorRating_Heat>
-							<AimingAccuracy>1.0</AimingAccuracy>
-							<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-							<MeleeDodgeChance>0.01</MeleeDodgeChance>
-							<MeleeCritChance>0.56</MeleeCritChance>
-							<MeleeParryChance>0.44</MeleeParryChance>
-							<MaxHitPoints>350</MaxHitPoints>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Phalanx"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>36</power>
-									<cooldownTime>2</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-									<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Phalanx"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Phalanx"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Phalanx"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>3100</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>310</MaxOverHeal>
-								<MinArmorPct>0.5</MinArmorPct>
-								<MinArmorValueSharp>7</MinArmorValueSharp>
-								<MinArmorValueBlunt>16</MinArmorValueBlunt>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvSiegebreaker.xml b/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvSiegebreaker.xml
deleted file mode 100644
index 1ac4837eef..0000000000
--- a/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvSiegebreaker.xml	
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Factions Expanded - Mechanoids</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Siegebreaker"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Vehicle</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Siegebreaker"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>62</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Siegebreaker"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>25</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Siegebreaker"]/statBases</xpath>
-						<value>
-							<ArmorRating_Heat>0.75</ArmorRating_Heat>
-							<CarryWeight>200</CarryWeight>
-							<CarryBulk>200</CarryBulk>
-							<AimingAccuracy>1.0</AimingAccuracy>
-							<ShootingAccuracyPawn>1.0</ShootingAccuracyPawn>
-							<MeleeDodgeChance>0.01</MeleeDodgeChance>
-							<MeleeCritChance>0.07</MeleeCritChance>
-							<MeleeParryChance>0.24</MeleeParryChance>
-							<MaxHitPoints>600</MaxHitPoints>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Siegebreaker"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>30</power>
-									<cooldownTime>3.4</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-									<armorPenetrationBlunt>20</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Siegebreaker"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Siegebreaker"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Siegebreaker"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>4250</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>425</MaxOverHeal>
-								<MinArmorPct>0.5</MinArmorPct>
-								<MinArmorValueSharp>14</MinArmorValueSharp>
-								<MinArmorValueBlunt>35</MinArmorValueBlunt>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEAura.xml b/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEAura.xml
deleted file mode 100644
index e65a9e7c42..0000000000
--- a/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEAura.xml	
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Factions Expanded - Mechanoids</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Aura"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Humanoid</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Aura"]</xpath>
-						<value>
-							<statBases>
-								<MeleeDodgeChance>0.5</MeleeDodgeChance>
-								<MeleeCritChance>0.24</MeleeCritChance>
-								<MeleeParryChance>0.33</MeleeParryChance>
-								<MaxHitPoints>200</MaxHitPoints>
-							</statBases>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Aura"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>wing blade</label>
-									<capacities>
-										<li>Cut</li>
-									</capacities>
-									<power>37</power>
-									<cooldownTime>1.5</cooldownTime>
-									<linkedBodyPartsGroup>AM_WingBlades</linkedBodyPartsGroup>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-									<armorPenetrationBlunt>6</armorPenetrationBlunt>
-									<armorPenetrationSharp>2.5</armorPenetrationSharp>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>wing blade</label>
-									<capacities>
-										<li>Stab</li>
-									</capacities>
-									<power>18</power>
-									<cooldownTime>1.25</cooldownTime>
-									<linkedBodyPartsGroup>AM_WingBlades</linkedBodyPartsGroup>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-									<armorPenetrationBlunt>15</armorPenetrationBlunt>
-									<armorPenetrationSharp>30</armorPenetrationSharp>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>6</power>
-									<cooldownTime>4</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-									<chanceFactor>0.2</chanceFactor>
-									<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Aura"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Aura"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Aura"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>1425</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>500</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>142</MaxOverHeal>
-								<MinArmorPct>0.75</MinArmorPct>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEDaggersnout.xml b/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEDaggersnout.xml
deleted file mode 100644
index 0c5f7ce903..0000000000
--- a/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEDaggersnout.xml	
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Factions Expanded - Mechanoids</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Daggersnout"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>QuadrupedLow</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Daggersnout"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.08</MeleeDodgeChance>
-							<MeleeCritChance>0.24</MeleeCritChance>
-							<MeleeParryChance>0.18</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Daggersnout"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>3</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Daggersnout"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>2</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Daggersnout"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>snout blade</label>
-									<capacities>
-										<li>Cut</li>
-									</capacities>
-									<power>19</power>
-									<cooldownTime>1.4</cooldownTime>
-									<linkedBodyPartsGroup>AM_NoseBlade</linkedBodyPartsGroup>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-									<armorPenetrationBlunt>8</armorPenetrationBlunt>
-									<armorPenetrationSharp>3</armorPenetrationSharp>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>snout blade</label>
-									<capacities>
-										<li>Stab</li>
-									</capacities>
-									<power>14</power>
-									<cooldownTime>1.2</cooldownTime>
-									<linkedBodyPartsGroup>AM_NoseBlade</linkedBodyPartsGroup>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-									<armorPenetrationBlunt>12</armorPenetrationBlunt>
-									<armorPenetrationSharp>16</armorPenetrationSharp>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>3</power>
-									<cooldownTime>2</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-									<chanceFactor>0.2</chanceFactor>
-									<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Daggersnout"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Daggersnout"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Daggersnout"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>900</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>90</MaxOverHeal>
-								<MinArmorPct>0.75</MinArmorPct>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEFireworm.xml b/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEFireworm.xml
deleted file mode 100644
index b87e916689..0000000000
--- a/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEFireworm.xml	
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Factions Expanded - Mechanoids</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Fireworm"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>QuadrupedLow</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Fireworm"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>28</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Fireworm"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>14</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Fireworm"]/statBases</xpath>
-						<value>
-							<ArmorRating_Heat>0.5</ArmorRating_Heat>
-							<AimingAccuracy>1.0</AimingAccuracy>
-							<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-							<MeleeDodgeChance>0.01</MeleeDodgeChance>
-							<MeleeCritChance>0.19</MeleeCritChance>
-							<MeleeParryChance>0.19</MeleeParryChance>
-							<MaxHitPoints>350</MaxHitPoints>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Fireworm"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>24</power>
-									<cooldownTime>2.6</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-									<armorPenetrationBlunt>12</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Fireworm"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Fireworm"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Fireworm"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>2900</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>290</MaxOverHeal>
-								<MinArmorPct>0.5</MinArmorPct>
-								<MinArmorValueSharp>8</MinArmorValueSharp>
-								<MinArmorValueBlunt>16</MinArmorValueBlunt>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEGoliath.xml b/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEGoliath.xml
deleted file mode 100644
index 64d1a7ff8c..0000000000
--- a/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEGoliath.xml	
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Factions Expanded - Mechanoids</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Goliath"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Humanoid</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Goliath"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>40</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Goliath"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>18</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Goliath"]/statBases</xpath>
-						<value>
-							<ArmorRating_Heat>0.25</ArmorRating_Heat>
-							<CarryWeight>200</CarryWeight>
-							<CarryBulk>100</CarryBulk>
-							<AimingAccuracy>1.0</AimingAccuracy>
-							<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
-							<MeleeDodgeChance>0.05</MeleeDodgeChance>
-							<MeleeCritChance>0.75</MeleeCritChance>
-							<MeleeParryChance>0.2</MeleeParryChance>
-							<MaxHitPoints>500</MaxHitPoints>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Goliath"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>35</power>
-									<cooldownTime>3.0</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-									<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Goliath"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Goliath"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Goliath"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>3200</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>320</MaxOverHeal>
-								<MinArmorPct>0.5</MinArmorPct>
-								<MinArmorValueSharp>12</MinArmorValueSharp>
-								<MinArmorValueBlunt>27</MinArmorValueBlunt>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEPhalanx.xml b/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEPhalanx.xml
deleted file mode 100644
index 63aceb2020..0000000000
--- a/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEPhalanx.xml	
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Factions Expanded - Mechanoids</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Phalanx"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Quadruped</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Phalanx"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>27</ArmorRating_Blunt>
-						</value>
-					</li>
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Phalanx"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>12</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Phalanx"]/statBases</xpath>
-						<value>
-							<ArmorRating_Heat>0.5</ArmorRating_Heat>
-							<AimingAccuracy>1.0</AimingAccuracy>
-							<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-							<MeleeDodgeChance>0.01</MeleeDodgeChance>
-							<MeleeCritChance>0.56</MeleeCritChance>
-							<MeleeParryChance>0.44</MeleeParryChance>
-							<MaxHitPoints>350</MaxHitPoints>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Phalanx"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>36</power>
-									<cooldownTime>2</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-									<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Phalanx"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Phalanx"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Phalanx"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>2725</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>272</MaxOverHeal>
-								<MinArmorPct>0.5</MinArmorPct>
-								<MinArmorValueSharp>7</MinArmorValueSharp>
-								<MinArmorValueBlunt>16</MinArmorValueBlunt>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFESiegebreaker.xml b/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFESiegebreaker.xml
deleted file mode 100644
index 7c3aa0bee9..0000000000
--- a/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFESiegebreaker.xml	
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Factions Expanded - Mechanoids</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Siegebreaker"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Vehicle</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Siegebreaker"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>60</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Siegebreaker"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>24</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Siegebreaker"]/statBases</xpath>
-						<value>
-							<ArmorRating_Heat>0.25</ArmorRating_Heat>
-							<CarryWeight>200</CarryWeight>
-							<CarryBulk>150</CarryBulk>
-							<AimingAccuracy>1.0</AimingAccuracy>
-							<ShootingAccuracyPawn>1.0</ShootingAccuracyPawn>
-							<MeleeDodgeChance>0.01</MeleeDodgeChance>
-							<MeleeCritChance>0.07</MeleeCritChance>
-							<MeleeParryChance>0.24</MeleeParryChance>
-							<MaxHitPoints>600</MaxHitPoints>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Siegebreaker"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>30</power>
-									<cooldownTime>3.4</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-									<armorPenetrationBlunt>20</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Siegebreaker"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Siegebreaker"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Siegebreaker"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>3500</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>350</MaxOverHeal>
-								<MinArmorPct>0.5</MinArmorPct>
-								<MinArmorValueSharp>14</MinArmorValueSharp>
-								<MinArmorValueBlunt>35</MinArmorValueBlunt>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Aura.xml b/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Aura.xml
deleted file mode 100644
index 4240874525..0000000000
--- a/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Aura.xml	
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biotech</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Alpha Mechs</li>
-			</mods>
-
-			<match Class="PatchOperationFindMod">
-				<mods>
-					<li>Vanilla Factions Expanded - Mechanoids</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Aura_PlayerControlled"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Humanoid</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Aura_PlayerControlled"]/statBases</xpath>
-							<value>
-								<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
-								<ArmorRating_Sharp>5</ArmorRating_Sharp>
-								<ArmorRating_Heat>0.5</ArmorRating_Heat>
-								<MeleeDodgeChance>0.66</MeleeDodgeChance>
-								<MeleeCritChance>0.3</MeleeCritChance>
-								<MeleeParryChance>0.33</MeleeParryChance>
-								<MaxHitPoints>200</MaxHitPoints>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Aura_PlayerControlled"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>wing blade</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>37</power>
-										<cooldownTime>1.5</cooldownTime>
-										<linkedBodyPartsGroup>AM_WingBlades</linkedBodyPartsGroup>
-										<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-										<armorPenetrationBlunt>6</armorPenetrationBlunt>
-										<armorPenetrationSharp>2.5</armorPenetrationSharp>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>wing blade</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>18</power>
-										<cooldownTime>1.25</cooldownTime>
-										<linkedBodyPartsGroup>AM_WingBlades</linkedBodyPartsGroup>
-										<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-										<armorPenetrationBlunt>15</armorPenetrationBlunt>
-										<armorPenetrationSharp>30</armorPenetrationSharp>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>6</power>
-										<cooldownTime>4</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationBlunt>2</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Aura_PlayerControlled"]/comps</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Aura_PlayerControlled"]</xpath>
-								<value>
-									<comps />
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Aura_PlayerControlled"]/comps</xpath>
-							<value>
-								<li Class="CombatExtended.CompProperties_ArmorDurability">
-									<Durability>1425</Durability>
-									<Regenerates>true</Regenerates>
-									<RegenInterval>500</RegenInterval>
-									<RegenValue>5</RegenValue>
-									<Repairable>true</Repairable>
-									<RepairIngredients>
-										<Steel>5</Steel>
-										<Plasteel>5</Plasteel>
-									</RepairIngredients>
-									<RepairTime>300</RepairTime>
-									<RepairValue>200</RepairValue>
-									<CanOverHeal>true</CanOverHeal>
-									<MaxOverHeal>142</MaxOverHeal>
-									<MinArmorPct>0.75</MinArmorPct>
-								</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Daggersnout.xml b/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Daggersnout.xml
deleted file mode 100644
index 82a8f4547c..0000000000
--- a/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Daggersnout.xml	
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biotech</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Alpha Mechs</li>
-			</mods>
-
-			<match Class="PatchOperationFindMod">
-				<mods>
-					<li>Vanilla Factions Expanded - Mechanoids</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Daggersnout_PlayerControlled"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>QuadrupedLow</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Daggersnout_PlayerControlled"]/statBases</xpath>
-							<value>
-								<ArmorRating_Heat>0.5</ArmorRating_Heat>
-								<MeleeDodgeChance>0.08</MeleeDodgeChance>
-								<MeleeCritChance>0.27</MeleeCritChance>
-								<MeleeParryChance>0.18</MeleeParryChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Daggersnout_PlayerControlled"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>4.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Daggersnout_PlayerControlled"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>3</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Daggersnout_PlayerControlled"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>snout blade</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>19</power>
-										<cooldownTime>1.4</cooldownTime>
-										<linkedBodyPartsGroup>AM_NoseBlade</linkedBodyPartsGroup>
-										<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-										<armorPenetrationBlunt>8</armorPenetrationBlunt>
-										<armorPenetrationSharp>3</armorPenetrationSharp>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>snout blade</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>14</power>
-										<cooldownTime>1.2</cooldownTime>
-										<linkedBodyPartsGroup>AM_NoseBlade</linkedBodyPartsGroup>
-										<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-										<armorPenetrationBlunt>12</armorPenetrationBlunt>
-										<armorPenetrationSharp>16</armorPenetrationSharp>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>3</power>
-										<cooldownTime>2</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationBlunt>5</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Daggersnout_PlayerControlled"]/comps</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Daggersnout_PlayerControlled"]</xpath>
-								<value>
-									<comps />
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Daggersnout_PlayerControlled"]/comps</xpath>
-							<value>
-								<li Class="CombatExtended.CompProperties_ArmorDurability">
-									<Durability>1000</Durability>
-									<Regenerates>true</Regenerates>
-									<RegenInterval>1250</RegenInterval>
-									<RegenValue>5</RegenValue>
-									<Repairable>true</Repairable>
-									<RepairIngredients>
-										<Steel>5</Steel>
-										<Plasteel>5</Plasteel>
-									</RepairIngredients>
-									<RepairTime>300</RepairTime>
-									<RepairValue>200</RepairValue>
-									<CanOverHeal>true</CanOverHeal>
-									<MaxOverHeal>100</MaxOverHeal>
-									<MinArmorPct>0.75</MinArmorPct>
-								</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Fireworm.xml b/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Fireworm.xml
deleted file mode 100644
index 1aa4121ecc..0000000000
--- a/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Fireworm.xml	
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biotech</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Alpha Mechs</li>
-			</mods>
-
-			<match Class="PatchOperationFindMod">
-				<mods>
-					<li>Vanilla Factions Expanded - Mechanoids</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Fireworm_PlayerControlled"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>QuadrupedLow</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Fireworm_PlayerControlled"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>30</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Fireworm_PlayerControlled"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>15</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Fireworm_PlayerControlled"]/statBases</xpath>
-							<value>
-								<ArmorRating_Heat>1.0</ArmorRating_Heat>
-								<AimingAccuracy>1.0</AimingAccuracy>
-								<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-								<MeleeDodgeChance>0.01</MeleeDodgeChance>
-								<MeleeCritChance>0.19</MeleeCritChance>
-								<MeleeParryChance>0.19</MeleeParryChance>
-								<MaxHitPoints>350</MaxHitPoints>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Fireworm_PlayerControlled"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>24</power>
-										<cooldownTime>2.6</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-										<armorPenetrationBlunt>12</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Fireworm_PlayerControlled"]/comps</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Fireworm_PlayerControlled"]</xpath>
-								<value>
-									<comps />
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Fireworm_PlayerControlled"]/comps</xpath>
-							<value>
-								<li Class="CombatExtended.CompProperties_ArmorDurability">
-									<Durability>3400</Durability>
-									<Regenerates>true</Regenerates>
-									<RegenInterval>1250</RegenInterval>
-									<RegenValue>5</RegenValue>
-									<Repairable>true</Repairable>
-									<RepairIngredients>
-										<Steel>5</Steel>
-										<Plasteel>5</Plasteel>
-									</RepairIngredients>
-									<RepairTime>300</RepairTime>
-									<RepairValue>200</RepairValue>
-									<CanOverHeal>true</CanOverHeal>
-									<MaxOverHeal>340</MaxOverHeal>
-									<MinArmorPct>0.5</MinArmorPct>
-									<MinArmorValueSharp>8</MinArmorValueSharp>
-									<MinArmorValueBlunt>16</MinArmorValueBlunt>
-								</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Goliath.xml b/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Goliath.xml
deleted file mode 100644
index 8507e0a78a..0000000000
--- a/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Goliath.xml	
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biotech</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Alpha Mechs</li>
-			</mods>
-
-			<match Class="PatchOperationFindMod">
-				<mods>
-					<li>Vanilla Factions Expanded - Mechanoids</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Goliath_PlayerControlled"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Humanoid</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Goliath_PlayerControlled"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>42</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Goliath_PlayerControlled"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>19</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Goliath_PlayerControlled"]/statBases</xpath>
-							<value>
-								<ArmorRating_Heat>0.75</ArmorRating_Heat>
-								<CarryWeight>400</CarryWeight>
-								<CarryBulk>200</CarryBulk>
-								<AimingAccuracy>1.0</AimingAccuracy>
-								<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
-								<MeleeDodgeChance>0.05</MeleeDodgeChance>
-								<MeleeCritChance>0.75</MeleeCritChance>
-								<MeleeParryChance>0.2</MeleeParryChance>
-								<MaxHitPoints>500</MaxHitPoints>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Goliath_PlayerControlled"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>35</power>
-										<cooldownTime>3.0</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-										<armorPenetrationBlunt>15</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Goliath_PlayerControlled"]/comps</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Goliath_PlayerControlled"]</xpath>
-								<value>
-									<comps />
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Goliath_PlayerControlled"]/comps</xpath>
-							<value>
-								<li Class="CombatExtended.CompProperties_ArmorDurability">
-									<Durability>3650</Durability>
-									<Regenerates>true</Regenerates>
-									<RegenInterval>1250</RegenInterval>
-									<RegenValue>5</RegenValue>
-									<Repairable>true</Repairable>
-									<RepairIngredients>
-										<Steel>5</Steel>
-										<Plasteel>5</Plasteel>
-									</RepairIngredients>
-									<RepairTime>300</RepairTime>
-									<RepairValue>200</RepairValue>
-									<CanOverHeal>true</CanOverHeal>
-									<MaxOverHeal>365</MaxOverHeal>
-									<MinArmorPct>0.5</MinArmorPct>
-									<MinArmorValueSharp>12</MinArmorValueSharp>
-									<MinArmorValueBlunt>27</MinArmorValueBlunt>
-								</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Phalanx.xml b/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Phalanx.xml
deleted file mode 100644
index 8bb4f6b8a5..0000000000
--- a/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Phalanx.xml	
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biotech</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Alpha Mechs</li>
-			</mods>
-
-			<match Class="PatchOperationFindMod">
-				<mods>
-					<li>Vanilla Factions Expanded - Mechanoids</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Phalanx_PlayerControlled"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Quadruped</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Phalanx_PlayerControlled"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>30</ArmorRating_Blunt>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Phalanx_PlayerControlled"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>13</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Phalanx_PlayerControlled"]/statBases</xpath>
-							<value>
-								<ArmorRating_Heat>1.0</ArmorRating_Heat>
-								<AimingAccuracy>1.0</AimingAccuracy>
-								<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-								<MeleeDodgeChance>0.01</MeleeDodgeChance>
-								<MeleeCritChance>0.56</MeleeCritChance>
-								<MeleeParryChance>0.44</MeleeParryChance>
-								<MaxHitPoints>350</MaxHitPoints>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Phalanx_PlayerControlled"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>36</power>
-										<cooldownTime>2</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-										<armorPenetrationBlunt>30</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Phalanx_PlayerControlled"]/comps</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Phalanx_PlayerControlled"]</xpath>
-								<value>
-									<comps />
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Phalanx_PlayerControlled"]/comps</xpath>
-							<value>
-								<li Class="CombatExtended.CompProperties_ArmorDurability">
-									<Durability>3100</Durability>
-									<Regenerates>true</Regenerates>
-									<RegenInterval>1250</RegenInterval>
-									<RegenValue>5</RegenValue>
-									<Repairable>true</Repairable>
-									<RepairIngredients>
-										<Steel>5</Steel>
-										<Plasteel>5</Plasteel>
-									</RepairIngredients>
-									<RepairTime>300</RepairTime>
-									<RepairValue>200</RepairValue>
-									<CanOverHeal>true</CanOverHeal>
-									<MaxOverHeal>310</MaxOverHeal>
-									<MinArmorPct>0.5</MinArmorPct>
-									<MinArmorValueSharp>7</MinArmorValueSharp>
-									<MinArmorValueBlunt>16</MinArmorValueBlunt>
-								</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Siegebreaker.xml b/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Siegebreaker.xml
deleted file mode 100644
index b541fb1188..0000000000
--- a/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Siegebreaker.xml	
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biotech</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Alpha Mechs</li>
-			</mods>
-
-			<match Class="PatchOperationFindMod">
-				<mods>
-					<li>Vanilla Factions Expanded - Mechanoids</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Siegebreaker_PlayerControlled"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Vehicle</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Siegebreaker_PlayerControlled"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>62</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Siegebreaker_PlayerControlled"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>25</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Siegebreaker_PlayerControlled"]/statBases</xpath>
-							<value>
-								<ArmorRating_Heat>0.75</ArmorRating_Heat>
-								<CarryWeight>200</CarryWeight>
-								<CarryBulk>300</CarryBulk>
-								<AimingAccuracy>1.0</AimingAccuracy>
-								<ShootingAccuracyPawn>1.0</ShootingAccuracyPawn>
-								<MeleeDodgeChance>0.01</MeleeDodgeChance>
-								<MeleeCritChance>0.07</MeleeCritChance>
-								<MeleeParryChance>0.24</MeleeParryChance>
-								<MaxHitPoints>600</MaxHitPoints>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Siegebreaker_PlayerControlled"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>30</power>
-										<cooldownTime>3.4</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-										<armorPenetrationBlunt>20</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Siegebreaker_PlayerControlled"]/comps</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Siegebreaker_PlayerControlled"]</xpath>
-								<value>
-									<comps />
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Siegebreaker_PlayerControlled"]/comps</xpath>
-							<value>
-								<li Class="CombatExtended.CompProperties_ArmorDurability">
-									<Durability>4250</Durability>
-									<Regenerates>true</Regenerates>
-									<RegenInterval>1250</RegenInterval>
-									<RegenValue>5</RegenValue>
-									<Repairable>true</Repairable>
-									<RepairIngredients>
-										<Steel>5</Steel>
-										<Plasteel>5</Plasteel>
-									</RepairIngredients>
-									<RepairTime>300</RepairTime>
-									<RepairValue>200</RepairValue>
-									<CanOverHeal>true</CanOverHeal>
-									<MaxOverHeal>425</MaxOverHeal>
-									<MinArmorPct>0.5</MinArmorPct>
-									<MinArmorValueSharp>14</MinArmorValueSharp>
-									<MinArmorValueBlunt>35</MinArmorValueBlunt>
-								</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Slurrymaster.xml b/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Slurrymaster.xml
deleted file mode 100644
index 811491e1dd..0000000000
--- a/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Slurrymaster.xml	
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biotech</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Alpha Mechs</li>
-			</mods>
-
-			<match Class="PatchOperationFindMod">
-				<mods>
-					<li>Vanilla Factions Expanded - Mechanoids</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[defName="AM_Mech_Advanced_PristineSlurrypede_PlayerControlled"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>QuadrupedLow</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AM_Mech_Advanced_PristineSlurrypede_PlayerControlled"]/statBases</xpath>
-							<value>
-								<ArmorRating_Heat>0.5</ArmorRating_Heat>
-								<MeleeDodgeChance>0.12</MeleeDodgeChance>
-								<MeleeCritChance>0.1</MeleeCritChance>
-								<MeleeParryChance>0.17</MeleeParryChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AM_Mech_Advanced_PristineSlurrypede_PlayerControlled"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>22</ArmorRating_Blunt>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AM_Mech_Advanced_PristineSlurrypede_PlayerControlled"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>10</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AM_Mech_Advanced_PristineSlurrypede_PlayerControlled"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>16</power>
-										<cooldownTime>2.7</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>12</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="AM_Mech_Advanced_PristineSlurrypede_PlayerControlled"]/comps</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="AM_Mech_Advanced_PristineSlurrypede_PlayerControlled"]</xpath>
-								<value>
-									<comps />
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AM_Mech_Advanced_PristineSlurrypede_PlayerControlled"]/comps</xpath>
-							<value>
-								<li Class="CombatExtended.CompProperties_ArmorDurability">
-									<Durability>4000</Durability>
-									<Regenerates>true</Regenerates>
-									<RegenInterval>1250</RegenInterval>
-									<RegenValue>5</RegenValue>
-									<Repairable>true</Repairable>
-									<RepairIngredients>
-										<Steel>5</Steel>
-										<Plasteel>5</Plasteel>
-									</RepairIngredients>
-									<RepairTime>300</RepairTime>
-									<RepairValue>200</RepairValue>
-									<CanOverHeal>true</CanOverHeal>
-									<MaxOverHeal>400</MaxOverHeal>
-									<MinArmorPct>0.5</MinArmorPct>
-									<MinArmorValueSharp>6</MinArmorValueSharp>
-									<MinArmorValueBlunt>12</MinArmorValueBlunt>
-								</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/VFE_Mechs/VFE_Pawnkinds.xml b/Patches/Alpha Mechs/Mods/VFE_Mechs/VFE_Pawnkinds.xml
deleted file mode 100644
index f37ef0f0b3..0000000000
--- a/Patches/Alpha Mechs/Mods/VFE_Mechs/VFE_Pawnkinds.xml	
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Factions Expanded - Mechanoids</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<!-- Siegebreaker -->
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/PawnKindDef[defName="VFE_Mech_Siegebreaker" or defName="VFE_Mech_Advanced_Siegebreaker" or defName="VFE_Mech_Advanced_Siegebreaker_PlayerControlled"]</xpath>
-						<value>
-							<modExtensions>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>4</min>
-										<max>7</max>
-									</primaryMagazineCount>
-								</li>
-							</modExtensions>
-						</value>
-					</li>
-
-					<!-- Fireworm -->
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/PawnKindDef[defName="VFE_Mech_Fireworm" or defName="VFE_Mech_Advanced_Fireworm" or defName="VFE_Mech_Advanced_Fireworm_PlayerControlled"]</xpath>
-						<value>
-							<li Class="CombatExtended.LoadoutPropertiesExtension">
-								<primaryMagazineCount>
-									<min>2</min>
-									<max>3</max>
-								</primaryMagazineCount>
-							</li>
-						</value>
-					</li>
-
-					<!-- Goliath -->
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/PawnKindDef[defName="VFE_Mech_Goliath" or defName="VFE_Mech_Advanced_Goliath" or defName="VFE_Mech_Advanced_Goliath_PlayerControlled"]</xpath>
-						<value>
-							<li Class="CombatExtended.LoadoutPropertiesExtension">
-								<primaryMagazineCount>
-									<min>4</min>
-									<max>6</max>
-								</primaryMagazineCount>
-							</li>
-						</value>
-					</li>
-
-					<!-- === combatPower Patches === -->
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/PawnKindDef[defName="VFE_Mech_Goliath" or defName="VFE_Mech_Advanced_Goliath" or defName="VFE_Mech_Advanced_Goliath_PlayerControlled"]/combatPower</xpath>
-						<value>
-							<combatPower>550</combatPower>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/PawnKindDef[defName="VFE_Mech_Siegebreaker" or defName="VFE_Mech_Advanced_Siegebreaker" or defName="VFE_Mech_Advanced_Siegebreaker_PlayerControlled"]/combatPower</xpath>
-						<value>
-							<combatPower>500</combatPower>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/VFE_Pirates/Mech_Warcasket.xml b/Patches/Alpha Mechs/Mods/VFE_Pirates/Mech_Warcasket.xml
deleted file mode 100644
index 073f21811a..0000000000
--- a/Patches/Alpha Mechs/Mods/VFE_Pirates/Mech_Warcasket.xml	
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Factions Expanded - Pirates</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<!-- ========== Mech Controller Warcasket ========== -->
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_MechController"]/statBases</xpath>
-						<value>
-							<Bulk>275</Bulk>
-							<WornBulk>35</WornBulk>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_MechController"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>34</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_MechController"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>85</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_MechController"]/equippedStatOffsets</xpath>
-						<value>
-							<CarryWeight>250</CarryWeight>
-							<CarryBulk>225</CarryBulk>
-							<Suppressability>-100</Suppressability>
-						</value>
-					</li>
-
-					<!-- Increase Cost -->
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_MechController"]/costList/Plasteel</xpath>
-						<value>
-							<Plasteel>240</Plasteel>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_MechController"]/costList/ComponentSpacer</xpath>
-						<value>
-							<ComponentSpacer>4</ComponentSpacer>
-						</value>
-					</li>
-
-					<!-- === Energy Shield === -->
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_MechController"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldEnergyMax</xpath>
-						<value>
-							<EnergyShieldEnergyMax>375</EnergyShieldEnergyMax>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_MechController"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldRechargeRate</xpath>
-						<value>
-							<EnergyShieldRechargeRate>1.0</EnergyShieldRechargeRate>
-						</value>
-					</li>
-
-					<!-- ========== Siegebreaker Warcasket - Shoulders ========== -->
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Shoulders_MechController"]/statBases</xpath>
-						<value>
-							<Bulk>15</Bulk>
-							<WornBulk>5</WornBulk>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Shoulders_MechController"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>34</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Shoulders_MechController"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>85</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<!-- Increase Cost -->
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Shoulders_MechController"]/costList/Plasteel</xpath>
-						<value>
-							<Plasteel>90</Plasteel>
-						</value>
-					</li>
-
-					<!-- === Siegebreaker Warcasket Helmet === -->
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Helmet_MechController"]/statBases</xpath>
-						<value>
-							<Bulk>20</Bulk>
-							<WornBulk>10</WornBulk>
-							<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Helmet_MechController"]/apparel/immuneToToxGasExposure</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Helmet_MechController"]/apparel</xpath>
-							<value>
-								<immuneToToxGasExposure>true</immuneToToxGasExposure>
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Helmet_MechController"]/equippedStatOffsets</xpath>
-						<value>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Helmet_MechController"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>30</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Helmet_MechController"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>68</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<!-- Increase Cost -->
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Helmet_MechController"]/costList/Plasteel</xpath>
-						<value>
-							<Plasteel>90</Plasteel>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Helmet_MechController"]/costList/ComponentSpacer</xpath>
-						<value>
-							<ComponentSpacer>6</ComponentSpacer>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/Mods/VRE_Sanguophage/Sanguinarius.xml b/Patches/Alpha Mechs/Mods/VRE_Sanguophage/Sanguinarius.xml
deleted file mode 100644
index f01d24f726..0000000000
--- a/Patches/Alpha Mechs/Mods/VRE_Sanguophage/Sanguinarius.xml	
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Races Expanded - Sanguophage</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Sanguinarius"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Quadruped</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Sanguinarius"]/statBases</xpath>
-						<value>
-							<ArmorRating_Sharp>7</ArmorRating_Sharp>
-							<ArmorRating_Blunt>15</ArmorRating_Blunt>
-							<CarryWeight>80</CarryWeight>
-							<CarryBulk>40</CarryBulk>
-							<MeleeDodgeChance>0.04</MeleeDodgeChance>
-							<MeleeCritChance>0.13</MeleeCritChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-							<MaxHitPoints>200</MaxHitPoints>
-						</value>
-					</li>
-
-					<li Class="PatchOperationRemove">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Sanguinarius"]/race/baseHealthScale</xpath>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Sanguinarius"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>front left leg</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>13</power>
-									<cooldownTime>2.67</cooldownTime>
-									<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>5</armorPenetrationBlunt>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>front right leg</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>13</power>
-									<cooldownTime>2.67</cooldownTime>
-									<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>5</armorPenetrationBlunt>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>15</power>
-									<cooldownTime>3.51</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>12</armorPenetrationBlunt>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-									<chanceFactor>0.2</chanceFactor>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Sanguinarius"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AM_Mech_Sanguinarius"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Mech_Sanguinarius"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>1000</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>100</MaxOverHeal>
-								<MinArmorPct>0.75</MinArmorPct>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AM_Gun_BloodBelcher"]/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>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/PawnKindDefs_Mechanoids/AlphaMechs_PawnKinds.xml b/Patches/Alpha Mechs/PawnKindDefs_Mechanoids/AlphaMechs_PawnKinds.xml
deleted file mode 100644
index e4d7dff85a..0000000000
--- a/Patches/Alpha Mechs/PawnKindDefs_Mechanoids/AlphaMechs_PawnKinds.xml	
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Siegebreaker and Demolisher -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="AM_Siegebreaker" or defName="AM_Demolisher"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>7</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!--Fireworm-->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="AM_Fireworm"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>3</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!--Goliath-->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="AM_Goliath"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- === combatPower Patches === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="AM_Goliath"]/combatPower</xpath>
-					<value>
-						<combatPower>550</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="AM_Siegebreaker"]/combatPower</xpath>
-					<value>
-						<combatPower>500</combatPower>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/ThingDefs_Misc/AlphaMechs_RangedMechanoid.xml b/Patches/Alpha Mechs/ThingDefs_Misc/AlphaMechs_RangedMechanoid.xml
deleted file mode 100644
index fa3af4132f..0000000000
--- a/Patches/Alpha Mechs/ThingDefs_Misc/AlphaMechs_RangedMechanoid.xml	
+++ /dev/null
@@ -1,312 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Melee Attacks -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						@Name="AM_FlamethrowerBase" or
-						defName="AM_Gun_GoliathChargeBlaster" or
-						defName="AM_Gun_GoliathNeedle" or
-						@Name="AM_SiegeTurretBase" or
-						@Name="AM_CryogenicGunBase"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11.7</power>
-								<cooldownTime>2.6</cooldownTime>
-								<armorPenetrationBlunt>2.4</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="AM_DemolisherChargeBase"]</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11.7</power>
-								<cooldownTime>2.6</cooldownTime>
-								<armorPenetrationBlunt>2.4</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Flamethrower -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="AM_FlamethrowerBase"]/description</xpath>
-					<value>
-						<description>A prometheum jelly flamethrower. Short range, but it will cause uncontrollable fires if you let the fireworms come near.</description>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AM_Flamethrower</defName>
-					<statBases>
-						<Mass>20</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>4.0</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Flamethrower_Prometheum</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>12</range>
-						<minRange>2.9</minRange>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>5</burstShotCount>
-						<soundCast>HissFlamethrower</soundCast>
-						<muzzleFlashScale>2</muzzleFlashScale>
-						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>8</reloadTime>
-						<ammoSet>AmmoSet_Flamethrower</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Goliath HCB ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AM_Gun_GoliathChargeBlaster</defName>
-					<statBases>
-						<Mass>35.00</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>13.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.08</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12x64mmCharged</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>Shot_ChargeBlaster</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>9.2</reloadTime>
-						<ammoSet>AmmoSet_12x64mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Suppressive</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Goliath Needle Gun ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AM_Gun_GoliathNeedle</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>0.81</SwayFactor>
-						<Bulk>15.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.80</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_5x100mmCaseless_Sabot</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>4</burstShotCount>
-						<soundCast>Shot_NeedleGun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>40</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_5x100mmCaseless</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<!-- Cryogenic Gun -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="AM_BaseMechProjectile">
-							<defName>AM_CryoBulletCE</defName>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<label>cryogenic pellet</label>
-							<graphicData>
-								<texPath>Things/Projectiles/AM_Cryo</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<flyOverhead>false</flyOverhead>
-								<speed>40</speed>
-								<damageDef>Frostbite</damageDef>
-								<damageAmountBase>3</damageAmountBase>
-								<explosionRadius>2.9</explosionRadius>
-								<soundExplode>AM_Cryogun</soundExplode>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AM_CryogenicGun</defName>
-					<statBases>
-						<Mass>20</Mass>
-						<RangedWeapon_Cooldown>1.0</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>1.0</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>1.00</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>AM_CryoBulletCE</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>15</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>3</burstShotCount>
-						<soundCast>AM_Cryogun</soundCast>
-						<muzzleFlashScale>2</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>80</magazineSize>
-						<reloadTime>4</reloadTime>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<!-- Siege Turret -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AM_SiegebreakerTurret</defName>
-					<statBases>
-						<Mass>50.00</Mass>
-						<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.5</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>1.00</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_90mmCannonShell_HE</defaultProjectile>
-						<warmupTime>4.5</warmupTime>
-						<range>92</range>
-						<minRange>8</minRange>
-						<soundCast>120mm</soundCast>
-						<muzzleFlashScale>2</muzzleFlashScale>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>2</AmmoGenPerMagOverride>
-						<reloadTime>8</reloadTime>
-						<ammoSet>AmmoSet_90mmCannonShell</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<!-- Demolisher Charge Gun -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AM_DemolisherChargeBase</defName>
-					<statBases>
-						<Mass>20</Mass>
-						<RangedWeapon_Cooldown>2.13</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.0</SwayFactor>
-						<Bulk>1.00</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_164x284mmDemo</defaultProjectile>
-						<warmupTime>2.0</warmupTime>
-						<range>8</range>
-						<minRange>4</minRange>
-						<soundCast>AM_DemolisherCharge</soundCast>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>2</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_164x284mmDemo</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Aura.xml b/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Aura.xml
deleted file mode 100644
index 69cec99fc1..0000000000
--- a/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Aura.xml	
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AM_Aura"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AM_Aura"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						<MeleeCritChance>0.24</MeleeCritChance>
-						<MeleeParryChance>0.33</MeleeParryChance>
-						<MaxHitPoints>200</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AM_Aura"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>wing blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>37</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>AM_WingBlades</linkedBodyPartsGroup>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>wing blade</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>AM_WingBlades</linkedBodyPartsGroup>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>4</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AM_Aura"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Aura"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AM_Aura"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1000</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>500</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>100</MaxOverHeal>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Daggersnout.xml b/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Daggersnout.xml
deleted file mode 100644
index c81ad2ef16..0000000000
--- a/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Daggersnout.xml	
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AM_Daggersnout"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AM_Daggersnout"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.08</MeleeDodgeChance>
-						<MeleeCritChance>0.24</MeleeCritChance>
-						<MeleeParryChance>0.18</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AM_Daggersnout"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AM_Daggersnout"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AM_Daggersnout"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>snout blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>AM_NoseBlade</linkedBodyPartsGroup>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>snout blade</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>AM_NoseBlade</linkedBodyPartsGroup>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-								<armorPenetrationSharp>16</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AM_Daggersnout"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Daggersnout"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AM_Daggersnout"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>900</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>90</MaxOverHeal>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Demolisher.xml b/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Demolisher.xml
deleted file mode 100644
index 3ea88ae8af..0000000000
--- a/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Demolisher.xml	
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AM_Demolisher"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AM_Demolisher"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>30</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AM_Demolisher"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AM_Demolisher"]/statBases</xpath>
-					<value>
-						<ArmorRating_Heat>0.25</ArmorRating_Heat>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>100</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.01</MeleeDodgeChance>
-						<MeleeCritChance>0.72</MeleeCritChance>
-						<MeleeParryChance>0.33</MeleeParryChance>
-						<MaxHitPoints>400</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AM_Demolisher"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mechanoid claws</label>
-								<capacities>
-									<li>Cut</li>
-									<li>AM_SiegeBlunt</li>
-								</capacities>
-								<power>46</power>
-								<cooldownTime>2.3</cooldownTime>
-								<linkedBodyPartsGroup>AM_MechaClaws</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<armorPenetrationBlunt>80</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AM_Demolisher"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Demolisher"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AM_Demolisher"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>3500</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>350</MaxOverHeal>
-							<MinArmorPct>0.5</MinArmorPct>
-							<MinArmorValueSharp>8</MinArmorValueSharp>
-							<MinArmorValueBlunt>16</MinArmorValueBlunt>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Fireworm.xml b/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Fireworm.xml
deleted file mode 100644
index 3be9a7c264..0000000000
--- a/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Fireworm.xml	
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AM_Fireworm"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AM_Fireworm"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>28</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AM_Fireworm"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AM_Fireworm"]/statBases</xpath>
-					<value>
-						<ArmorRating_Heat>0.5</ArmorRating_Heat>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.01</MeleeDodgeChance>
-						<MeleeCritChance>0.19</MeleeCritChance>
-						<MeleeParryChance>0.19</MeleeParryChance>
-						<MaxHitPoints>350</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AM_Fireworm"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>2.6</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AM_Fireworm"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Fireworm"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AM_Fireworm"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>2900</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>290</MaxOverHeal>
-							<MinArmorPct>0.5</MinArmorPct>
-							<MinArmorValueSharp>8</MinArmorValueSharp>
-							<MinArmorValueBlunt>16</MinArmorValueBlunt>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Goliath.xml b/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Goliath.xml
deleted file mode 100644
index 57b4f9d2cb..0000000000
--- a/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Goliath.xml	
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AM_Goliath"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AM_Goliath"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>40</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AM_Goliath"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AM_Goliath"]/statBases</xpath>
-					<value>
-						<ArmorRating_Heat>0.25</ArmorRating_Heat>
-						<CarryWeight>200</CarryWeight>
-						<CarryBulk>100</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						<MeleeCritChance>0.75</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-						<MaxHitPoints>500</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AM_Goliath"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>3.0</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AM_Goliath"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Goliath"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AM_Goliath"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>3200</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>320</MaxOverHeal>
-							<MinArmorPct>0.5</MinArmorPct>
-							<MinArmorValueSharp>12</MinArmorValueSharp>
-							<MinArmorValueBlunt>27</MinArmorValueBlunt>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Phalanx.xml b/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Phalanx.xml
deleted file mode 100644
index a28d39e721..0000000000
--- a/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Phalanx.xml	
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AM_Phalanx"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AM_Phalanx"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>27</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AM_Phalanx"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>12</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AM_Phalanx"]/statBases</xpath>
-					<value>
-						<ArmorRating_Heat>0.5</ArmorRating_Heat>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.01</MeleeDodgeChance>
-						<MeleeCritChance>0.56</MeleeCritChance>
-						<MeleeParryChance>0.44</MeleeParryChance>
-						<MaxHitPoints>350</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AM_Phalanx"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AM_Phalanx"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Phalanx"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AM_Phalanx"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>2725</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>272</MaxOverHeal>
-							<MinArmorPct>0.5</MinArmorPct>
-							<MinArmorValueSharp>7</MinArmorValueSharp>
-							<MinArmorValueBlunt>16</MinArmorValueBlunt>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Siegebreaker.xml b/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Siegebreaker.xml
deleted file mode 100644
index 567d65c799..0000000000
--- a/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Siegebreaker.xml	
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AM_Siegebreaker"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Vehicle</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AM_Siegebreaker"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>60</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AM_Siegebreaker"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>24</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AM_Siegebreaker"]/statBases</xpath>
-					<value>
-						<ArmorRating_Heat>0.25</ArmorRating_Heat>
-						<CarryWeight>200</CarryWeight>
-						<CarryBulk>150</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1.0</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.01</MeleeDodgeChance>
-						<MeleeCritChance>0.07</MeleeCritChance>
-						<MeleeParryChance>0.24</MeleeParryChance>
-						<MaxHitPoints>600</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AM_Siegebreaker"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>3.4</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AM_Siegebreaker"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AM_Siegebreaker"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AM_Siegebreaker"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>3500</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>350</MaxOverHeal>
-							<MinArmorPct>0.5</MinArmorPct>
-							<MinArmorValueSharp>14</MinArmorValueSharp>
-							<MinArmorValueBlunt>35</MinArmorValueBlunt>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Memes/HediffDefs/Hediffs_Global_Misc.xml b/Patches/Alpha Memes/HediffDefs/Hediffs_Global_Misc.xml
deleted file mode 100644
index f379e245b2..0000000000
--- a/Patches/Alpha Memes/HediffDefs/Hediffs_Global_Misc.xml	
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Memes</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AM_CatharsisHediff"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AM_UtilityDryadHediff"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AM_UtilityDryadHediff"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.75</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AM_CombatDryadHediff"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AM_CombatDryadHediff"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2.0</ArmorRating_Blunt>
-						<AimingAccuracy>0.1</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AM_GenericDryadHediff"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AM_GenericDryadHediff"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.25</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Memes/StyleCategoryDefs/StyleCategoryDefs.xml b/Patches/Alpha Memes/StyleCategoryDefs/StyleCategoryDefs.xml
deleted file mode 100644
index 230dc1ceb8..0000000000
--- a/Patches/Alpha Memes/StyleCategoryDefs/StyleCategoryDefs.xml	
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Memes</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-			<!-- Remove styles for weapons that no longer exist. -->
-			<li Class="PatchOperationRemove">
-				<xpath>Defs/StyleCategoryDef/thingDefStyles/li[thingDef="Flamebow"]</xpath>
-			</li>
-
-			<li Class="PatchOperationRemove">
-				<xpath>Defs/StyleCategoryDef/thingDefStyles/li[thingDef="Gun_EmpLauncher"]</xpath>
-			</li>
-
-			<li Class="PatchOperationRemove">
-				<xpath>Defs/StyleCategoryDef/thingDefStyles/li[thingDef="Gun_ToxbombLauncher"]</xpath>
-			</li>
-
-			<li Class="PatchOperationRemove">
-				<xpath>Defs/StyleCategoryDef/thingDefStyles/li[thingDef="Gun_SmokeLauncher"]</xpath>
-			</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Memes/ThingDefs_Races/Races_UnshackledDryad.xml b/Patches/Alpha Memes/ThingDefs_Races/Races_UnshackledDryad.xml
deleted file mode 100644
index 645d6a97b2..0000000000
--- a/Patches/Alpha Memes/ThingDefs_Races/Races_UnshackledDryad.xml	
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Memes</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AM_UnshackledDryad"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AM_UnshackledDryad"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.06</MeleeCritChance>
-						<MeleeParryChance>0.04</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AM_UnshackledDryad"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.99</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.99</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.77</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.880</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<chanceFactor>0.9</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.19</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mythology/AM_CE_Patch_Bodies.xml b/Patches/Alpha Mythology/AM_CE_Patch_Bodies.xml
deleted file mode 100644
index 981e38ea46..0000000000
--- a/Patches/Alpha Mythology/AM_CE_Patch_Bodies.xml	
+++ /dev/null
@@ -1,358 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mythology</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Ahuizotl -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MM_AhuizotlBody"]//*[
-						def="Body" or
-						def="Tail" or
-						def="Neck" or
-						def="Leg" or
-						customLabel="rear left paw" or
-						customLabel="rear right paw"
-						] </xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MM_AhuizotlBody"]//*[
-						def="Body" or
-						def="Hand" or
-						def="Finger" or
-						def="Neck" or
-						def="Head" or
-						def="AnimalJaw" or
-						def="Leg" or
-						def="Paw"
-						]/groups </xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- Cerberus -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MM_ThreeHeadedDog"]//*[
-						def="Body" or
-						def="Tail" or
-						def="Neck" or
-						def="Leg" or
-						customLabel="rear left paw" or
-						customLabel="rear right paw"
-						] </xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MM_ThreeHeadedDog"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Head" or
-						def="AnimalJaw" or
-						def="Leg" or
-						def="Paw"
-						]/groups </xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- Chimera -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MM_Chimera_Body"]//*[
-						def="Body" or
-						def="MM_Goathead" or
-						def="Neck" or
-						def="Leg" or
-						customLabel="rear left paw" or
-						customLabel="rear right paw"
-						] </xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="MM_Chimera_Body"]/corePart/parts/li[def="MM_ChimeraTail"]/parts/li[def="Head"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="MM_Chimera_Body"]/corePart/parts/li[def="MM_ChimeraTail"]/parts/li[def="Head"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="MM_Chimera_Body"]/corePart/parts/li[def="MM_ChimeraTail"]/parts/li[def="Head"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MM_Chimera_Body"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Head" or
-						def="MM_Goathead" or
-						def="AnimalJaw" or
-						def="Leg" or
-						def="Paw"
-						]/groups </xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- Hydra -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MM_Hydra"]//*[
-						def="SnakeBody" or
-						customLabel="rear left leg" or
-						customLabel="rear right leg" or
-						def="Hoof"
-						] </xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MM_Hydra"]//*[
-						def="SnakeBody" or
-						def="SnakeHead" or
-						def="SnakeMouth" or
-						def="Leg" or
-						def="Hoof"
-						]/groups </xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- Maticore -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MM_ManticoreBody"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Leg" or
-						customLabel="rear left paw" or
-						customLabel="rear right paw"
-						] </xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MM_ManticoreBody"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Head" or
-						def="AnimalJaw" or
-						def="Leg" or
-						def="Paw"
-						]/groups </xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- Pegasus -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MM_PegasusBody"]//*[
-						def="Body" or
-						def="Neck" or
-						customLabel="rear left leg" or
-						customLabel="rear right leg" or
-						def="Hoof"
-						] </xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MM_PegasusBody"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Head" or
-						def="AnimalJaw" or
-						def="Leg" or
-						def="Hoof"
-						]/groups </xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- Qilin -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MM_QilinBody"]//*[
-						def="Body" or
-						def="Neck" or
-						customLabel="rear left leg" or
-						customLabel="rear right leg" or
-						def="Hoof"
-						] </xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MM_QilinBody"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Head" or
-						def="MM_Antlers" or
-						def="AnimalJaw" or
-						def="Leg" or
-						def="Hoof"
-						]/groups </xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- QuadrupedAnimalWithBeakAndWings -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MM_QuadrupedAnimalWithBeakAndWings"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Leg" or
-						customLabel="rear left paw" or
-						customLabel="rear right paw"
-						] </xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MM_QuadrupedAnimalWithBeakAndWings"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Head" or
-						def="Beak" or
-						def="Leg" or
-						def="Paw"
-						]/groups </xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- Wyvern -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MM_WyvernBody"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Leg"
-						] </xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MM_WyvernBody"]//*[
-						def="Body" or
-						def="MM_ScorpionTail" or
-						def="MM_Wing" or
-						def="Neck" or
-						def="Head" or
-						def="AnimalJaw" or
-						def="Leg" or
-						def="Paw"
-						]/groups </xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- HornedHumanlike -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MM_MinotaurBody"]//*[
-						def="Torso" or
-						def="Neck" or
-						def="Head" or
-						def="MM_Horns" or
-						def="Ear" or
-						def="Nose" or
-						def="Jaw" or
-						def="Shoulder" or
-						def="Arm" or
-						def="Hand" or
-						def="Finger" or
-						def="Leg" or
-						def="Foot" or
-						def="Toe"
-						]/groups </xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- HornedMechanoid -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MM_HornedMechanoid"]//*[
-						def="MechanicalThorax" or
-						def="MechanicalNeck" or
-						def="MechanicalShoulder" or
-						def="MechanicalArm" or
-						def="MechanicalHand" or
-						def="MechanicalLeg" or
-						def="MechanicalFoot"
-						] </xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MM_HornedMechanoid"]//*[
-						def="MechanicalThorax" or
-						def="MechanicalNeck" or
-						def="MechanicalHead" or
-						def="MM_Horns" or
-						def="MechanicalShoulder" or
-						def="MechanicalArm" or
-						def="MechanicalHand" or
-						def="MechanicalFinger" or
-						def="MechanicalLeg" or
-						def="MechanicalFoot"
-						]/groups </xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mythology/AM_CE_Patch_Hediffs.xml b/Patches/Alpha Mythology/AM_CE_Patch_Hediffs.xml
deleted file mode 100644
index 74eb6d5eb1..0000000000
--- a/Patches/Alpha Mythology/AM_CE_Patch_Hediffs.xml	
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mythology</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>A Dog Said... Animal Prosthetics</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<!--=============== Non-ranged implants ====================-->
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/HediffDef[defName="MM_ProstheticHorns"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>prosthetic horns</label>
-									<capacities>
-										<li>Scratch</li>
-									</capacities>
-									<power>8</power>
-									<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-									<armorPenetrationSharp>0.15</armorPenetrationSharp>
-									<cooldownTime>1.8</cooldownTime>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/HediffDef[defName="MM_BionicHorns"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>bionic horns</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>20</power>
-									<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-									<armorPenetrationSharp>0.1</armorPenetrationSharp>
-									<cooldownTime>1.4</cooldownTime>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<!--=============== Ranged implants ====================-->
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/HediffDef[defName="MM_PetrifyingGazeImplant"]/comps/li[@Class="MVCF.Comps.HediffCompProperties_ExtendedVerbGiver"]/verbs</xpath>
-						<value>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>MM_GazeAttack_CE</defaultProjectile>
-									<burstShotCount>1</burstShotCount>
-									<warmupTime>1</warmupTime>
-									<range>20</range>
-									<minRange>1</minRange>
-									<muzzleFlashScale>1</muzzleFlashScale>
-									<label>petrifying gaze</label>
-									<commonality>1</commonality>
-									<recoilAmount>0</recoilAmount>
-								</li>
-							</verbs>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/HediffDef[defName="MM_VenomousQuillImplant"]/comps/li[@Class="MVCF.Comps.HediffCompProperties_ExtendedVerbGiver"]/verbs</xpath>
-						<value>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>MM_Quill</defaultProjectile>
-									<burstShotCount>1</burstShotCount>
-									<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-									<warmupTime>1.5</warmupTime>
-									<range>18</range>
-									<minRange>2</minRange>
-									<soundCast>MM_QuillSound</soundCast>
-									<muzzleFlashScale>1</muzzleFlashScale>
-									<label>venomous quills</label>
-									<commonality>1</commonality>
-									<recoilAmount>0.4</recoilAmount>
-								</li>
-							</verbs>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/HediffDef[defName="MM_WispFireImplant"]/comps/li[@Class="MVCF.Comps.HediffCompProperties_ExtendedVerbGiver"]/verbs</xpath>
-						<value>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>MM_WispProjectile</defaultProjectile>
-									<burstShotCount>10</burstShotCount>
-									<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-									<warmupTime>2</warmupTime>
-									<range>15</range>
-									<minRange>1</minRange>
-									<soundCast>MM_PoisonBreathSound</soundCast>
-									<muzzleFlashScale>1</muzzleFlashScale>
-									<label>wisp breath</label>
-									<commonality>1</commonality>
-									<recoilAmount>0.3</recoilAmount>
-								</li>
-							</verbs>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/HediffDef[defName="MM_AcidicBreathImplant"]/comps/li[@Class="MVCF.Comps.HediffCompProperties_ExtendedVerbGiver"]/verbs</xpath>
-						<value>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>MM_AcidicBreath</defaultProjectile>
-									<burstShotCount>6</burstShotCount>
-									<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-									<warmupTime>2.0</warmupTime>
-									<range>18</range>
-									<minRange>2</minRange>
-									<soundCast>MM_PoisonBreathSound</soundCast>
-									<muzzleFlashScale>0</muzzleFlashScale>
-									<label>acidic breath</label>
-									<commonality>1</commonality>
-									<recoilAmount>0.4</recoilAmount>
-								</li>
-							</verbs>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/HediffDef[defName="MM_FireBreathImplant"]/comps/li[@Class="MVCF.Comps.HediffCompProperties_ExtendedVerbGiver"]/verbs</xpath>
-						<value>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>MM_FlameBreathAnimated_CE</defaultProjectile>
-									<burstShotCount>2</burstShotCount>
-									<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-									<warmupTime>2.5</warmupTime>
-									<range>18</range>
-									<minRange>2</minRange>
-									<soundCast>MM_FireBreathSound</soundCast>
-									<muzzleFlashScale>2</muzzleFlashScale>
-									<label>fire breath</label>
-									<commonality>0.8</commonality>
-								</li>
-							</verbs>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/HediffDef[defName="MM_ToxicBreathImplant"]/comps/li[@Class="MVCF.Comps.HediffCompProperties_ExtendedVerbGiver"]/verbs</xpath>
-						<value>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>MM_GreenStreamBreath_CE</defaultProjectile>
-									<burstShotCount>1</burstShotCount>
-									<warmupTime>1.5</warmupTime>
-									<range>14</range>
-									<minRange>1</minRange>
-									<soundCast>MM_PoisonBreathSound</soundCast>
-									<muzzleFlashScale>1</muzzleFlashScale>
-									<label>toxic breath</label>
-									<commonality>1.0</commonality>
-								</li>
-							</verbs>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mythology/AM_CE_Patch_Projectiles.xml b/Patches/Alpha Mythology/AM_CE_Patch_Projectiles.xml
deleted file mode 100644
index 267c6d957f..0000000000
--- a/Patches/Alpha Mythology/AM_CE_Patch_Projectiles.xml	
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mythology</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="MM_Quill" or
-						defName="MM_Tremor" or
-						defName="MM_WispProjectile" or
-						defName="MM_AcidicBreath" or
-						defName="MM_RazorSharpFeathers"
-						] </xpath>
-					<value>
-						<thingClass>CombatExtended.BulletCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_Quill"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>MM_ToxicSting</damageDef>
-							<damageAmountBase>20</damageAmountBase>
-							<speed>20</speed>
-							<!-- Roughly equal to steel neolithic arrows -->
-							<armorPenetrationSharp>0.5</armorPenetrationSharp>
-							<armorPenetrationBlunt>3.02</armorPenetrationBlunt>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_Tremor"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>Blunt</damageDef>
-							<damageAmountBase>20</damageAmountBase>
-							<speed>12</speed>
-							<armorPenetrationBlunt>100</armorPenetrationBlunt>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_WispProjectile"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>Burn</damageDef>
-							<damageAmountBase>2</damageAmountBase>
-							<speed>10</speed>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_AcidicBreath"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<speed>20</speed>
-							<damageDef>MM_AcidicBreath</damageDef>
-							<damageAmountBase>2</damageAmountBase>
-							<flyOverhead>false</flyOverhead>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_RazorSharpFeathers"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<speed>24</speed>
-							<damageDef>Cut</damageDef>
-							<damageAmountBase>12</damageAmountBase>
-							<flyOverhead>false</flyOverhead>
-							<!-- Roughly equal to plasteel neolithic arrows -->
-							<armorPenetrationSharp>1.0</armorPenetrationSharp>
-							<armorPenetrationBlunt>1.66</armorPenetrationBlunt>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="BaseBulletCE">
-							<defName>MM_GazeAttack_CE</defName>
-							<label>petrifying gaze</label>
-							<thingClass>CombatExtended.BulletCE</thingClass>
-							<graphicData>
-								<texPath>Things/Projectiles/MM_GazeAttack</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>MoteGlow</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<flyOverhead>false</flyOverhead>
-								<damageDef>MM_PetrifyingGaze</damageDef>
-								<damageAmountBase>5</damageAmountBase>
-								<speed>20</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBulletCE">
-							<defName>MM_GreenStreamBreath_CE</defName>
-							<label>poison breath</label>
-							<thingClass>CombatExtended.BulletCE</thingClass>
-							<graphicData>
-								<texPath>Things/Projectiles/MM_PoisonBreath</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>MoteGlow</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<flyOverhead>false</flyOverhead>
-								<damageDef>ToxicBite</damageDef>
-								<damageAmountBase>15</damageAmountBase>
-								<speed>20</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseExplosiveBullet">
-							<defName>MM_FlameBreathAnimated_CE</defName>
-							<label>flame breath</label>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<graphicData>
-								<texPath>Things/Projectiles/MM_Firebreath</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>MoteGlow</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<flyOverhead>false</flyOverhead>
-								<damageDef>Flame</damageDef>
-								<damageAmountBase>5</damageAmountBase>
-								<explosionRadius>0.9</explosionRadius>
-								<speed>25</speed>
-								<ai_IsIncendiary>true</ai_IsIncendiary>
-								<soundExplode>Interact_Ignite</soundExplode>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[defName="MM_PetrifyingGaze"]/additionalHediffs/li[hediff="MM_Petrification"]/severityPerDamageDealt</xpath>
-					<value>
-						<severityPerDamageDealt>0.035</severityPerDamageDealt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mythology/AM_CE_Patch_Races.xml b/Patches/Alpha Mythology/AM_CE_Patch_Races.xml
deleted file mode 100644
index 5fa833e69e..0000000000
--- a/Patches/Alpha Mythology/AM_CE_Patch_Races.xml	
+++ /dev/null
@@ -1,2250 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mythology</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Shared bodyShape patches -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[
-						defName="MM_Ahuizotl" or
-						defName="MM_Catoblepas" or
-						defName="MM_Cerberus" or
-						defName="MM_CeryneianHind" or
-						defName="MM_Chimera" or
-						defName="MM_ErymanthianBoar" or
-						defName="MM_Griffin" or
-						defName="MM_Kitsune" or
-						defName="MM_LernaeanHydra" or
-						defName="MM_Manticore" or
-						defName="MM_Pegasus" or
-						defName="MM_Qilin" or
-						defName="MM_Unicorn" or
-						defName="MM_Xiezhi"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="MM_WillOWisp"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="MM_Basilisk" or defName="MM_Tlilcoatl" or defName="MM_Salamander"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Serpentine</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="MM_WildMinotaur" or defName="MM_Kappa"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[
-						defName="MM_Phoenix" or
-						defName="MM_Fenghuang" or
-						defName="MM_Ieltxu" or
-						defName="MM_LesserWyvern" or
-						defName="MM_StymphalianBird"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Ahuizotl ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MM_Ahuizotl"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.10</MeleeDodgeChance>
-						<MeleeCritChance>0.26</MeleeCritChance>
-						<MeleeParryChance>0.13</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_Ahuizotl"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grabbing hand</label>
-								<capacities>
-									<li>MM_Grapple</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
-								<!-- armor penetration stats not applicable here-->
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.19</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.19</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.46</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<chanceFactor>2</chanceFactor>
-								<armorPenetrationSharp>0.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.063</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>3.2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.225</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Basilisk ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MM_Basilisk"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.19</MeleeDodgeChance>
-						<MeleeCritChance>0.18</MeleeCritChance>
-						<MeleeParryChance>0.17</MeleeParryChance>
-						<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
-						<AimingAccuracy>1.0</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_Basilisk"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fangs</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationSharp>0.38</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.24</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>18</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_Basilisk"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>MM_GazeAttack_CE</defaultProjectile>
-								<burstShotCount>1</burstShotCount>
-								<warmupTime>1</warmupTime>
-								<range>12</range>
-								<minRange>1</minRange>
-								<muzzleFlashScale>1</muzzleFlashScale>
-								<label>petrifying gaze</label>
-								<commonality>1</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- ========== Catoblepas ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MM_Catoblepas"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.10</MeleeDodgeChance>
-						<MeleeCritChance>0.35</MeleeCritChance>
-						<MeleeParryChance>0.19</MeleeParryChance>
-						<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
-						<AimingAccuracy>1.0</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_Catoblepas"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>3.8</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationBlunt>4.1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationBlunt>4.1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationSharp>0.47</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.92</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_Catoblepas"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>MM_GazeAttack_CE</defaultProjectile>
-								<burstShotCount>1</burstShotCount>
-								<warmupTime>1</warmupTime>
-								<range>20</range>
-								<minRange>1</minRange>
-								<muzzleFlashScale>1</muzzleFlashScale>
-								<label>petrifying gaze</label>
-								<commonality>1</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- ========== Cerberus ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MM_Cerberus"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						<MeleeCritChance>0.28</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_Cerberus"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7.4</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.213</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7.4</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.213</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.85</chanceFactor>
-								<armorPenetrationSharp>0.85</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.36</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.825</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Ceryneian Hind ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MM_CeryneianHind"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.14</MeleeDodgeChance>
-						<MeleeCritChance>0.27</MeleeCritChance>
-						<MeleeParryChance>0.3</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_CeryneianHind"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>antlers</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>15.8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>antlers</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.35</armorPenetrationSharp>
-								<armorPenetrationBlunt>16.8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>6.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>6.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationSharp>0.65</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.52</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Chimera ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MM_Chimera"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.09</MeleeDodgeChance>
-						<MeleeCritChance>0.48</MeleeCritChance>
-						<MeleeParryChance>0.27</MeleeParryChance>
-						<ShootingAccuracyPawn>1.4</ShootingAccuracyPawn>
-						<AimingAccuracy>0.9</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_Chimera"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<!-- Bite from Lion head-->
-								<label>toxic bite</label>
-								<capacities>
-									<li>MM_ToxicBite</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<!-- Bite from Snake head (tail) -->
-								<capacities>
-									<li>MM_ToxicBite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.67</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.225</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_Chimera"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>MM_FlameBreathAnimated_CE</defaultProjectile>
-								<burstShotCount>2</burstShotCount>
-								<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-								<warmupTime>2.5</warmupTime>
-								<range>18</range>
-								<minRange>2</minRange>
-								<soundCast>MM_FireBreathSound</soundCast>
-								<muzzleFlashScale>2</muzzleFlashScale>
-								<label>fire breath</label>
-								<commonality>0.8</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- ========== Erymanthian Boar ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MM_ErymanthianBoar"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						<MeleeCritChance>0.33</MeleeCritChance>
-						<MeleeParryChance>0.34</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_ErymanthianBoar"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tusk</label>
-								<capacities>
-									<li>Cut</li>
-									<li>MM_BleedingWound</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.89</cooldownTime>
-								<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>tusk</label>
-								<capacities>
-									<li>Stab</li>
-									<li>MM_BleedingWound</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.41</cooldownTime>
-								<chanceFactor>0.65</chanceFactor>
-								<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.940</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.57</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.12</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Fenghuang ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MM_Fenghuang"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.17</MeleeDodgeChance>
-						<MeleeCritChance>0.12</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_Fenghuang"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.26</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.18</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>beak</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>5</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.65</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.08</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Griffin ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MM_Griffin"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.17</MeleeDodgeChance>
-						<MeleeCritChance>0.17</MeleeCritChance>
-						<MeleeParryChance>0.20</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_Griffin"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>beak</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Ieltxu ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MM_Ieltxu"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.22</MeleeDodgeChance>
-						<MeleeCritChance>0.06</MeleeCritChance>
-						<MeleeParryChance>0.08</MeleeParryChance>
-						<ShootingAccuracyPawn>1.4</ShootingAccuracyPawn>
-						<AimingAccuracy>0.9</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_Ieltxu"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.18</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.560</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>beak</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.680</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.280</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_Ieltxu"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>MM_FlameBreathAnimated_CE</defaultProjectile>
-								<burstShotCount>1</burstShotCount>
-								<warmupTime>1.5</warmupTime>
-								<range>10</range>
-								<minRange>2</minRange>
-								<soundCast>MM_FireBreathSound</soundCast>
-								<muzzleFlashScale>1</muzzleFlashScale>
-								<label>fire breath</label>
-								<commonality>1.0</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- ========== Kappa ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MM_Kappa"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						<MeleeCritChance>0.14</MeleeCritChance>
-						<MeleeParryChance>0.20</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_Kappa"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.185</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.185</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.07</chanceFactor>
-								<soundMeleeHit>Pawn_Melee_HumanBite_Hit</soundMeleeHit>
-								<soundMeleeMiss>Pawn_Melee_HumanBite_Miss</soundMeleeMiss>
-								<armorPenetrationSharp>0.21</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.280</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.535</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Kitsune ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MM_Kitsune"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.16</MeleeDodgeChance>
-						<MeleeCritChance>0.07</MeleeCritChance>
-						<MeleeParryChance>0.04</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_Kitsune"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>0.91</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.198</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>0.91</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.198</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.49</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>1.440</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Lernaean Hydra ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MM_LernaeanHydra"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.08</MeleeDodgeChance>
-						<MeleeCritChance>0.22</MeleeCritChance>
-						<MeleeParryChance>0.57</MeleeParryChance>
-						<ShootingAccuracyPawn>1.3</ShootingAccuracyPawn>
-						<AimingAccuracy>0.8</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_LernaeanHydra"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>MM_ToxicBite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.67</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.225</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.3</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.225</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_LernaeanHydra"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>MM_AcidicBreath</defaultProjectile>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-								<warmupTime>2.0</warmupTime>
-								<range>18</range>
-								<minRange>2</minRange>
-								<soundCast>MM_PoisonBreathSound</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>acidic breath</label>
-								<commonality>1</commonality>
-								<recoilAmount>0.4</recoilAmount>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- ========== Lesser Wyvern ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MM_LesserWyvern"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.33</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_LesserWyvern"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.7</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.7</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>razor beak</label>
-								<capacities>
-									<li>MM_VeryToxicBite</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.9</chanceFactor>
-								<armorPenetrationSharp>4.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>8.9</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>tail</label>
-								<capacities>
-									<li>MM_ToxicSting</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>MM_AttackTail</linkedBodyPartsGroup>
-								<chanceFactor>0.75</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>25</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>8.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>8.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_LesserWyvern"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_LesserWyvern"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>7</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="MM_LesserWyvern"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="MM_LesserWyvern"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MM_LesserWyvern"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>4500</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Manticore ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MM_Manticore"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.16</MeleeDodgeChance>
-						<MeleeCritChance>0.31</MeleeCritChance>
-						<MeleeParryChance>0.22</MeleeParryChance>
-						<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
-						<AimingAccuracy>1.0</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_Manticore"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>MM_ToxicSting</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>MM_AttackTail</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>18</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.535</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_Manticore"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>MM_Quill</defaultProjectile>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-								<warmupTime>1.5</warmupTime>
-								<range>18</range>
-								<minRange>2</minRange>
-								<soundCast>MM_QuillSound</soundCast>
-								<muzzleFlashScale>1</muzzleFlashScale>
-								<label>venomous quills</label>
-								<commonality>1</commonality>
-								<recoilAmount>0.4</recoilAmount>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- ========== Pegasus ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MM_Pegasus"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.16</MeleeDodgeChance>
-						<MeleeCritChance>0.48</MeleeCritChance>
-						<MeleeParryChance>0.21</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_Pegasus"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.97</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.12</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Phoenix ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MM_Phoenix"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.36</MeleeDodgeChance>
-						<MeleeCritChance>0.17</MeleeCritChance>
-						<MeleeParryChance>0.21</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_Phoenix"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.48</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>beak</label>
-								<capacities>
-									<li>MM_FlamingBite</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.82</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.65</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_Phoenix"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4.7</MoveSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MM_Phoenix"]</xpath>
-					<value>
-						<butcherProducts>
-							<Prometheum>10</Prometheum>
-						</butcherProducts>
-					</value>
-				</li>
-
-				<!-- ========== Qilin ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MM_Qilin"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						<MeleeCritChance>0.23</MeleeCritChance>
-						<MeleeParryChance>0.10</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_Qilin"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>antlers</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.66</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.750</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>MM_FlamingBite</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.66</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationBlunt>0.750</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.97</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetration>0.2</armorPenetration>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Salamander ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MM_Salamander"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.16</MeleeDodgeChance>
-						<MeleeCritChance>0.29</MeleeCritChance>
-						<MeleeParryChance>0.10</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_Salamander"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fire-fangs</label>
-								<capacities>
-									<li>MM_FlamingBite</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>18</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2.84</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.96</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.85</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Stymphalian bird ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MM_StymphalianBird"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.32</MeleeDodgeChance>
-						<MeleeCritChance>0.20</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-						<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
-						<AimingAccuracy>1.0</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_StymphalianBird"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.0</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>beak</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.0</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>5</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.0</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.85</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_StymphalianBird"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>MM_RazorSharpFeathers</defaultProjectile>
-								<burstShotCount>3</burstShotCount>
-								<warmupTime>2</warmupTime>
-								<range>18</range>
-								<minRange>2</minRange>
-								<soundCast>MM_Feathers</soundCast>
-								<muzzleFlashScale>1</muzzleFlashScale>
-								<label>razor sharp feathers</label>
-								<commonality>0.8</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_StymphalianBird"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4.5</MoveSpeed>
-					</value>
-				</li>
-
-				<!-- ========== Tlilcoatl ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MM_Tlilcoatl"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						<MeleeCritChance>0.12</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-						<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
-						<AimingAccuracy>1.0</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_Tlilcoatl"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fangs</label>
-								<capacities>
-									<li>MM_ToxicBite</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>18</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2.26</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.49</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_Tlilcoatl"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>MM_GreenStreamBreath_CE</defaultProjectile>
-								<burstShotCount>1</burstShotCount>
-								<warmupTime>1.5</warmupTime>
-								<range>14</range>
-								<minRange>1</minRange>
-								<soundCast>MM_PoisonBreathSound</soundCast>
-								<muzzleFlashScale>1</muzzleFlashScale>
-								<label>toxic breath</label>
-								<commonality>1.0</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- ========== Unicorn ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MM_Unicorn"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.16</MeleeDodgeChance>
-						<MeleeCritChance>0.41</MeleeCritChance>
-						<MeleeParryChance>0.19</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_Unicorn"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.54</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.97</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.12</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Wild Minotaur ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MM_WildMinotaur"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						<MeleeCritChance>0.14</MeleeCritChance>
-						<MeleeParryChance>0.22</MeleeParryChance>
-						<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
-						<AimingAccuracy>1.0</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_WildMinotaur"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horns</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.54</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8.2</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8.2</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>8.2</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.07</chanceFactor>
-								<armorPenetrationBlunt>0.253</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_WildMinotaur"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>MM_Tremor</defaultProjectile>
-								<burstShotCount>1</burstShotCount>
-								<warmupTime>1</warmupTime>
-								<range>15</range>
-								<minRange>5</minRange>
-								<soundCast>MM_Tremor</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>tremors</label>
-								<commonality>1</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- ========== Will-O'-Wisp ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MM_WillOWisp"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.22</MeleeDodgeChance>
-						<MeleeCritChance>0.00</MeleeCritChance>
-						<MeleeParryChance>0.02</MeleeParryChance>
-						<ShootingAccuracyPawn>1.3</ShootingAccuracyPawn>
-						<AimingAccuracy>0.8</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_WillOWisp"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>pseudopod</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8.2</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>MM_Pseudopods</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_WillOWisp"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>MM_WispProjectile</defaultProjectile>
-								<burstShotCount>10</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<warmupTime>2</warmupTime>
-								<range>15</range>
-								<minRange>1</minRange>
-								<soundCast>MM_PoisonBreathSound</soundCast>
-								<muzzleFlashScale>1</muzzleFlashScale>
-								<label>wisp breath</label>
-								<commonality>1</commonality>
-								<recoilAmount>0.3</recoilAmount>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- ========== Xiezhi ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MM_Xiezhi"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.18</MeleeCritChance>
-						<MeleeParryChance>0.10</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_Xiezhi"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>MM_ExtraDamageToPiratesHorn</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.9</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>bite</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<chanceFactor>0.6</chanceFactor>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<chanceFactor>0.3</chanceFactor>
-								<armorPenetrationSharp>0.28</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.71</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<chanceFactor>0.3</chanceFactor>
-								<armorPenetrationSharp>0.28</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.71</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.85</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Mythology/AM_CE_Patch_Resources.xml b/Patches/Alpha Mythology/AM_CE_Patch_Resources.xml
deleted file mode 100644
index cff05ae3aa..0000000000
--- a/Patches/Alpha Mythology/AM_CE_Patch_Resources.xml	
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Mythology</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ===== Light Magical Leather ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_LightMagicalLeather"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.45</StuffPower_Armor_Sharp>
-						<StuffPower_Armor_Blunt>0.05</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- ===== Heavy Magical Leather ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_HeavyMagicalLeather"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.65</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MM_HeavyMagicalLeather"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.08</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="MM_LightMagicalLeather" or defName="MM_HeavyMagicalLeather"]/stuffProps/categories</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="MM_LightMagicalLeather" or defName="MM_HeavyMagicalLeather"]/stuffProps</xpath>
-						<value>
-							<categories>
-								<li>SoftArmor</li>
-							</categories>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="MM_LightMagicalLeather" or defName="MM_HeavyMagicalLeather"]/stuffProps/categories</xpath>
-						<value>
-							<li>SoftArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Ships/Patch_AlphaShips_DamageDefs.xml b/Patches/Alpha Ships/Patch_AlphaShips_DamageDefs.xml
deleted file mode 100644
index 8fbb41b84f..0000000000
--- a/Patches/Alpha Ships/Patch_AlphaShips_DamageDefs.xml	
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Ships</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[
-						defName="AS_ShipBioSmall"
-						]/defaultArmorPenetration </xpath>
-					<value>
-						<defaultArmorPenetration>200</defaultArmorPenetration>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Vehicle/Alpha_Vehicle.xml b/Patches/Alpha Vehicle/Alpha_Vehicle.xml
deleted file mode 100644
index f478bf0b69..0000000000
--- a/Patches/Alpha Vehicle/Alpha_Vehicle.xml	
+++ /dev/null
@@ -1,432 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Vehicles - Neolithic</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Chariot -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_Chariot"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_Chariot"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_Chariot"]/components/li[key="LeftWheel"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_Chariot"]/components/li[key="LeftWheel"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_Chariot"]/components/li[key="RightWheel"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_Chariot"]/components/li[key="RightWheel"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_Chariot"]/components/li[key="WoodenStructure"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_Chariot"]/components/li[key="WoodenStructure"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- Covered Carriage -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_CoveredCarriage"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_CoveredCarriage"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.65</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_CoveredCarriage"]/components/li[key="FrontLeftWheel"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_CoveredCarriage"]/components/li[key="FrontLeftWheel"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_CoveredCarriage"]/components/li[key="BackLeftWheel"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_CoveredCarriage"]/components/li[key="BackLeftWheel"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_CoveredCarriage"]/components/li[key="FrontRightWheel"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_CoveredCarriage"]/components/li[key="FrontRightWheel"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_CoveredCarriage"]/components/li[key="BackRightWheel"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_CoveredCarriage"]/components/li[key="BackRightWheel"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_CoveredCarriage"]/components/li[key="WoodenStructure"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_CoveredCarriage"]/components/li[key="WoodenStructure"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- Dog Sled -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_DogSled"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_DogSled"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_DogSled"]/components/li[key="WoodenStructure"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_DogSled"]/components/li[key="WoodenStructure"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- Outrigger Canoe -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_OutriggerCanoe"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_OutriggerCanoe"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_OutriggerCanoe"]/components/li[key="WoodenHull"]</xpath>
-					<value>
-						<armor>
-							<ArmorRating_Blunt>1</ArmorRating_Blunt>
-							<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-						</armor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_OutriggerCanoe"]/components/li[key="Outrigger"]</xpath>
-					<value>
-						<armor>
-							<ArmorRating_Blunt>1</ArmorRating_Blunt>
-							<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-						</armor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_OutriggerCanoe"]/components/li[key="Sail"]</xpath>
-					<value>
-						<armor>
-							<ArmorRating_Blunt>0.015</ArmorRating_Blunt>
-							<ArmorRating_Sharp>0.01</ArmorRating_Sharp>
-						</armor>
-					</value>
-				</li>
-
-				<!-- Ox Cart -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_OxCart"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_OxCart"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_OxCart"]/components/li[key="LeftWheel"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_OxCart"]/components/li[key="LeftWheel"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_OxCart"]/components/li[key="RightWheel"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_OxCart"]/components/li[key="RightWheel"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_OxCart"]/components/li[key="WoodenStructure"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_OxCart"]/components/li[key="WoodenStructure"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- Palanquin -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_Palanquin"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_Palanquin"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_Palanquin"]/components/li[key="WoodenStructure"]</xpath>
-					<value>
-						<armor>
-							<ArmorRating_Blunt>2</ArmorRating_Blunt>
-							<ArmorRating_Sharp>1</ArmorRating_Sharp>
-						</armor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_Palanquin"]/components/li[key="Handles"]</xpath>
-					<value>
-						<armor>
-							<ArmorRating_Blunt>8</ArmorRating_Blunt>
-							<ArmorRating_Sharp>4</ArmorRating_Sharp>
-						</armor>
-					</value>
-				</li>
-
-				<!-- Rickshaw -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_Rickshaw"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_Rickshaw"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_Rickshaw"]/components/li[key="WoodenStructure"]</xpath>
-					<value>
-						<armor>
-							<ArmorRating_Blunt>1</ArmorRating_Blunt>
-							<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-						</armor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_Rickshaw"]/components/li[key="LeftWheel"]</xpath>
-					<value>
-						<armor>
-							<ArmorRating_Blunt>4</ArmorRating_Blunt>
-							<ArmorRating_Sharp>2</ArmorRating_Sharp>
-						</armor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_Rickshaw"]/components/li[key="RightWheel"]</xpath>
-					<value>
-						<armor>
-							<ArmorRating_Blunt>4</ArmorRating_Blunt>
-							<ArmorRating_Sharp>2</ArmorRating_Sharp>
-						</armor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_Rickshaw"]/components/li[key="Handles"]</xpath>
-					<value>
-						<armor>
-							<ArmorRating_Blunt>8</ArmorRating_Blunt>
-							<ArmorRating_Sharp>4</ArmorRating_Sharp>
-						</armor>
-					</value>
-				</li>
-
-				<!-- Wheel Barrow -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_Wheelbarrow"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_Wheelbarrow"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_Wheelbarrow"]/components/li[key="WoodenStructure"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_Wheelbarrow"]/components/li[key="WoodenStructure"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_Wheelbarrow"]/components/li[key="FrontWheel"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_Wheelbarrow"]/components/li[key="FrontWheel"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_Wheelbarrow"]/components/li[key="Handles"]</xpath>
-					<value>
-						<armor>
-							<ArmorRating_Blunt>8</ArmorRating_Blunt>
-							<ArmorRating_Sharp>4</ArmorRating_Sharp>
-						</armor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Vehicle/Alpha_Vehicle_Hwacha.xml b/Patches/Alpha Vehicle/Alpha_Vehicle_Hwacha.xml
deleted file mode 100644
index 2a3044a51d..0000000000
--- a/Patches/Alpha Vehicle/Alpha_Vehicle_Hwacha.xml	
+++ /dev/null
@@ -1,275 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Vehicles - Neolithic</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Turret -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="AV_Hwacha_Turret"]/projectile</xpath>
-					<value>
-						<projectile>Projectile_GreatArrow_ExplosiveArrow</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="AV_Hwacha_Turret"]/reloadTimer</xpath>
-					<value>
-						<reloadTimer>12.0</reloadTimer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="AV_Hwacha_Turret"]/warmUpTimer</xpath>
-					<value>
-						<warmUpTimer>3.0</warmUpTimer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="AV_Hwacha_Turret"]/magazineCapacity</xpath>
-					<value>
-						<magazineCapacity>64</magazineCapacity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="AV_Hwacha_Turret"]/maxRange</xpath>
-					<value>
-						<maxRange>20</maxRange>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="AV_Hwacha_Turret"]/fireModes</xpath>
-					<value>
-						<fireModes>
-							<li>
-								<shotsPerBurst>64</shotsPerBurst>
-								<ticksBetweenShots>6</ticksBetweenShots>
-								<ticksBetweenBursts>15</ticksBetweenBursts>
-								<label>Full Barrage</label>
-								<texPath>UI/Gizmos/AV_ArrowBarrage</texPath>
-							</li>
-							<li>
-								<shotsPerBurst>32</shotsPerBurst>
-								<ticksBetweenShots>6</ticksBetweenShots>
-								<ticksBetweenBursts>15</ticksBetweenBursts>
-								<label>Half Barrage</label>
-								<texPath>UI/Gizmos/FireRate_Auto</texPath>
-							</li>
-							<li>
-								<shotsPerBurst>8</shotsPerBurst>
-								<ticksBetweenShots>6</ticksBetweenShots>
-								<ticksBetweenBursts>15</ticksBetweenBursts>
-								<label>Burst</label>
-								<texPath>UI/Gizmos/FireRate_Burst</texPath>
-							</li>
-						</fireModes>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="AV_Hwacha_Turret"]</xpath>
-					<value>
-						<li Class="Vehicles.CETurretDataDefModExtension">
-							<ammoSet>AmmoSet_Hwacha</ammoSet>
-							<shotHeight>2.1</shotHeight>
-							<speed>30</speed>
-							<sway>10</sway>
-							<spread>0.1</spread>
-							<recoil>30</recoil>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Hwacha</defName>
-							<label>hwacha arrows</label>
-							<ammoTypes>
-								<!--Ammo_GreatArrow_Flame>Projectile_GreatArrow_Flame</Ammo_GreatArrow_Flame-->
-								<Ammo_GreatArrow_ExplosiveArrow>Projectile_GreatArrow_ExplosiveArrow</Ammo_GreatArrow_ExplosiveArrow>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoGreatArrowBase">
-							<defName>Ammo_GreatArrow_ExplosiveArrow</defName>
-							<label>hwacha rocket arrow</label>
-							<graphicData>
-								<texPath>Things/Ammo/Neolithic/Arrow/Flame</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<Mass>0.05</Mass>
-								<MarketValue>1.16</MarketValue>
-							</statBases>
-							<ammoClass>RocketArrow</ammoClass>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseGreatArrowProjectile">
-							<defName>Projectile_GreatArrow_ExplosiveArrow</defName>
-							<label>hwacha rocket arrow</label>
-							<!--thingClass>CombatExtended.ProjectileCE_Explosive</thingClass-->
-							<graphicData>
-								<texPath>Things/Projectiles/AV_ArrowProjectile</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>30</speed>
-								<damageDef>Arrow</damageDef>
-								<damageAmountBase>10</damageAmountBase>
-								<armorPenetrationBlunt>3.18</armorPenetrationBlunt>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<suppressionFactor>3.0</suppressionFactor>
-								<airborneSuppressionFactor>0.42</airborneSuppressionFactor>
-								<dangerFactor>2.0</dangerFactor>
-								<soundExplode>Explosion_Rocket</soundExplode>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>20</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>0.5</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>MakeAmmo_GreatArrow_ExplosiveArrow</defName>
-							<label>make hwacha explosive arrows x10</label>
-							<description>Craft 10 hwacha explosive arrows.</description>
-							<jobString>Making hwacha rocket arrows.</jobString>
-							<workAmount>800</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Cloth</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-									<li>Steel</li>
-									<li>FSX</li>
-									<li>Cloth</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_GreatArrow_ExplosiveArrow>10</Ammo_GreatArrow_ExplosiveArrow>
-							</products>
-							<researchPrerequisites>
-								<li>CE_Gunpowder</li>
-							</researchPrerequisites>
-						</RecipeDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>RocketArrow</defName>
-							<label>hwacha rocket arrow</label>
-							<labelShort>hwacha</labelShort>
-							<description>Steel arrowhead with an underslung tube of gunpowder for explosive results.</description>
-							<advanced>true</advanced>
-						</CombatExtended.AmmoCategoryDef>
-
-					</value>
-				</li>
-
-				<!-- Hwacha -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_Hwacha"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_Hwacha"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_Hwacha"]/components/li[key="LeftWheel"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_Hwacha"]/components/li[key="LeftWheel"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_Hwacha"]/components/li[key="RightWheel"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_Hwacha"]/components/li[key="RightWheel"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_Hwacha"]/components/li[key="WoodenStructure"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_Hwacha"]/components/li[key="WoodenStructure"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Alpha Vehicle/Alpha_Vehicle_WarChariot.xml b/Patches/Alpha Vehicle/Alpha_Vehicle_WarChariot.xml
deleted file mode 100644
index 4cd98a61d2..0000000000
--- a/Patches/Alpha Vehicle/Alpha_Vehicle_WarChariot.xml	
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Vehicles - Neolithic</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Turret -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="AV_WarChariot_Turret"]/projectile</xpath>
-					<value>
-						<projectile>Projectile_GreatArrow_Stone</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="AV_WarChariot_Turret"]/reloadTimer</xpath>
-					<value>
-						<reloadTimer>1.6</reloadTimer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="AV_WarChariot_Turret"]/warmUpTimer</xpath>
-					<value>
-						<warmUpTimer>1.3</warmUpTimer>
-					</value>
-				</li>
-
-				<!--li Class="PatchOperationReplace">
-						<xpath>Defs/Vehicles.VehicleTurretDef[defName="AV_WarChariot"]/magazineCapacity</xpath>
-						<value>
-							<magazineCapacity>35</magazineCapacity>
-						</value>
-					</li-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="AV_WarChariot_Turret"]/maxRange</xpath>
-					<value>
-						<maxRange>30</maxRange>
-					</value>
-				</li>
-
-				<!--li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="AV_WarChariot"]/fireModes</xpath>
-					<value>
-						<fireModes>
-							<li>
-								<shotsPerBurst>1</shotsPerBurst>
-								<ticksBetweenBursts>1</ticksBetweenBursts>
-								<spreadRadius>0</spreadRadius>
-								<label>Single Shot</label>
-								<texPath>UI/Gizmos/FireRate_Single</texPath>
-							</li>
-						</fireModes>
-					</value>
-				</li-->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="AV_WarChariot_Turret"]</xpath>
-					<value>
-						<li Class="Vehicles.CETurretDataDefModExtension">
-							<ammoSet>AmmoSet_GreatArrow</ammoSet>
-							<shotHeight>2</shotHeight>
-							<speed>30</speed>
-							<sway>2</sway>
-							<spread>1</spread>
-						</li>
-					</value>
-				</li>
-
-				<!-- WarChariot -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_WarChariot"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_WarChariot"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_WarChariot"]/components/li[key="WoodenStructure"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_WarChariot"]/components/li[key="WoodenStructure"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_WarChariot"]/components/li[key="LeftWheel"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_WarChariot"]/components/li[key="LeftWheel"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_WarChariot"]/components/li[key="RightWheel"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="AV_WarChariot"]/components/li[key="RightWheel"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Altered Carbon Ultratech Unleashed/AC_Patches.xml b/Patches/Altered Carbon Ultratech Unleashed/AC_Patches.xml
deleted file mode 100644
index a948f2c282..0000000000
--- a/Patches/Altered Carbon Ultratech Unleashed/AC_Patches.xml	
+++ /dev/null
@@ -1,826 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Altered Carbon: Ultratech Unleashed</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Common armor properties -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="AC_HuntersHelmet"]/apparel</xpath>
-					<value>
-						<immuneToToxGasExposure>true</immuneToToxGasExposure>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="AC_HuntersHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="AC_HuntersArmourBase"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<!-- Protector Helmet -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.7</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>275</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/statBases/Mass</xpath>
-					<value>
-						<Mass>3.0</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>45</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/costList/ComponentSpacer</xpath>
-					<value>
-						<ComponentSpacer>2</ComponentSpacer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>75</Plasteel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>30</DevilstrandCloth>
-					</value>
-				</li>
-
-				<!-- Protector Armor -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>600</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>50</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>24</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>56</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>80</CarryWeight>
-						<CarryBulk>10</CarryBulk>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/costList/ComponentSpacer</xpath>
-					<value>
-						<ComponentSpacer>5</ComponentSpacer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>200</Plasteel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/costList/Uranium</xpath>
-					<value>
-						<Uranium>50</Uranium>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>60</DevilstrandCloth>
-					</value>
-				</li>
-
-				<!-- Fusilier Helmet -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>300</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/statBases/Mass</xpath>
-					<value>
-						<Mass>6.6</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>56</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<AimingAccuracy>0.20</AimingAccuracy>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/costList/ComponentSpacer</xpath>
-					<value>
-						<ComponentSpacer>3</ComponentSpacer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>115</Plasteel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>35</DevilstrandCloth>
-					</value>
-				</li>
-
-				<!-- Fusilier Armor -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>700</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>80</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>30</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>68</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>100</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/costList/ComponentSpacer</xpath>
-					<value>
-						<ComponentSpacer>8</ComponentSpacer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>270</Plasteel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/costList/Uranium</xpath>
-					<value>
-						<Uranium>95</Uranium>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>75</DevilstrandCloth>
-					</value>
-				</li>
-
-				<!-- Dragoon Helmet -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>300</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/statBases/Mass</xpath>
-					<value>
-						<Mass>6.6</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>28</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>62</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/costList/ComponentSpacer</xpath>
-					<value>
-						<ComponentSpacer>2</ComponentSpacer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>125</Plasteel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>35</DevilstrandCloth>
-					</value>
-				</li>
-
-				<!-- Dragoon armor and jump wings require Royalty -->
-				<li Class="PatchOperationFindMod">
-					<mods>
-						<li>Royalty</li>
-					</mods>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<!-- Dragoon Armor -->
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/statBases</xpath>
-								<value>
-									<Bulk>100</Bulk>
-									<WornBulk>15</WornBulk>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/statBases/Flammability</xpath>
-								<value>
-									<Flammability>0</Flammability>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/statBases/MaxHitPoints</xpath>
-								<value>
-									<MaxHitPoints>700</MaxHitPoints>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/statBases/Mass</xpath>
-								<value>
-									<Mass>80</Mass>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/statBases/ArmorRating_Sharp</xpath>
-								<value>
-									<ArmorRating_Sharp>32</ArmorRating_Sharp>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/statBases/ArmorRating_Blunt</xpath>
-								<value>
-									<ArmorRating_Blunt>75</ArmorRating_Blunt>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]</xpath>
-								<value>
-									<li Class="CombatExtended.PartialArmorExt">
-										<stats>
-											<li>
-												<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-												<parts>
-													<li>Neck</li>
-												</parts>
-											</li>
-											<li>
-												<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-												<parts>
-													<li>Neck</li>
-												</parts>
-											</li>
-											<li>
-												<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-												<parts>
-													<li>Arm</li>
-												</parts>
-											</li>
-											<li>
-												<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-												<parts>
-													<li>Arm</li>
-												</parts>
-											</li>
-											<li>
-												<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-												<parts>
-													<li>Hand</li>
-												</parts>
-											</li>
-											<li>
-												<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-												<parts>
-													<li>Hand</li>
-												</parts>
-											</li>
-										</stats>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/equippedStatOffsets</xpath>
-								<value>
-									<CarryWeight>100</CarryWeight>
-									<CarryBulk>20</CarryBulk>
-									<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/costList/ComponentSpacer</xpath>
-								<value>
-									<ComponentSpacer>8</ComponentSpacer>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/costList/Plasteel</xpath>
-								<value>
-									<Plasteel>275</Plasteel>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/costList/Uranium</xpath>
-								<value>
-									<Uranium>90</Uranium>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/costList</xpath>
-								<value>
-									<DevilstrandCloth>75</DevilstrandCloth>
-								</value>
-							</li>
-
-							<!-- Jump Wings -->
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="AC_Apparel_WingJump"]/statBases</xpath>
-								<value>
-									<Bulk>10</Bulk>
-									<WornBulk>3</WornBulk>
-								</value>
-							</li>
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="AC_Apparel_WingJump"]/statBases/JumpRange</xpath>
-								<value>
-									<JumpRange>20</JumpRange>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-				<!-- Cuirassier Belt -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AC_CuirassierBelt"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>2</Mass>
-					</value>
-				</li>
-
-				<!-- Autorevolver -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AC_Gun_Autorevolver</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.49</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>2.5</Bulk>
-						<WorkToMake>7000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.9</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_44Magnum_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Revolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_44Magnum</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_BROOM</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AC_Gun_Autorevolver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Ancient Arsenal Warcaskets/AncientWarcaskets.xml b/Patches/Ancient Arsenal Warcaskets/AncientWarcaskets.xml
deleted file mode 100644
index 97b8540174..0000000000
--- a/Patches/Ancient Arsenal Warcaskets/AncientWarcaskets.xml	
+++ /dev/null
@@ -1,361 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Ancient Arsenal: Warcaskets</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== ancient warcasket helmet ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>36</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>80</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient"]/statBases</xpath>
-					<value>
-						<Bulk>20</Bulk>
-						<WornBulk>10</WornBulk>
-						<NightVisionEfficiency_Apparel>0.95</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient"]/verbs</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient"]/comps/li[@Class="MVCF.Comps.CompProperties_VerbGiver"]</xpath>
-				</li>
-
-				<!-- ========== ancient warcasket shoulders ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Ancient"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Ancient"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>40</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Ancient"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>100</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ========== ancient warcasket body ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Ancient"]/statBases</xpath>
-					<value>
-						<Bulk>275</Bulk>
-						<WornBulk>35</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Ancient"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>40</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Ancient"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>100</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Ancient"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>350</CarryWeight>
-						<CarryBulk>425</CarryBulk>
-						<Suppressability>-100</Suppressability>
-					</value>
-				</li>
-
-				<!-- ========== advanced ancient warcasket helmet ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Cloak"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>45</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Cloak"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>100</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Cloak"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Cloak"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Cloak"]/statBases</xpath>
-					<value>
-						<Bulk>20</Bulk>
-						<WornBulk>10</WornBulk>
-						<NightVisionEfficiency_Apparel>0.99</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Cloak"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Cloak"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Cloak"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Cloak"]/verbs</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Cloak"]/comps/li[@Class="MVCF.Comps.CompProperties_VerbGiver"]</xpath>
-				</li>
-
-				<!-- ========== advanced ancient warcasket shoulders ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_Ancient_Cloak"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_Ancient_Cloak"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>50</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_Ancient_Cloak"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>120</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ========== advanced ancient warcasket body ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Ancient_Cloak"]/statBases</xpath>
-					<value>
-						<Bulk>275</Bulk>
-						<WornBulk>35</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Ancient_Cloak"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>50</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Ancient_Cloak"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>120</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Ancient_Cloak"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>450</CarryWeight>
-						<CarryBulk>525</CarryBulk>
-						<Suppressability>-100</Suppressability>
-					</value>
-				</li>
-
-				<!-- ========== advanced ancient warcasket helmet pertinent ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Penitent"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>50</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Penitent"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>120</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Penitent"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Penitent"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Penitent"]/statBases</xpath>
-					<value>
-						<Bulk>20</Bulk>
-						<WornBulk>10</WornBulk>
-						<NightVisionEfficiency_Apparel>0.99</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Penitent"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Penitent"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Penitent"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Penitent"]/verbs</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Penitent"]/comps/li[@Class="MVCF.Comps.CompProperties_VerbGiver"]</xpath>
-				</li>
-
-				<!-- ========== advanced ancient warcasket helmet Mech ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Mechnomancer"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>45</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Mechnomancer"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>110</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Mechnomancer"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Mechnomancer"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Mechnomancer"]/statBases</xpath>
-					<value>
-						<Bulk>20</Bulk>
-						<WornBulk>10</WornBulk>
-						<NightVisionEfficiency_Apparel>0.99</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Mechnomancer"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Mechnomancer"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Mechnomancer"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Mechnomancer"]/verbs</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Ancient_Mechnomancer"]/comps/li[@Class="MVCF.Comps.CompProperties_VerbGiver"]</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Ancient Arsenal Warcaskets/MeleeAncientWC.xml b/Patches/Ancient Arsenal Warcaskets/MeleeAncientWC.xml
deleted file mode 100644
index 7491aea461..0000000000
--- a/Patches/Ancient Arsenal Warcaskets/MeleeAncientWC.xml	
+++ /dev/null
@@ -1,225 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Ancient Arsenal: Warcaskets</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Melee Weapon Draw Size -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AAWarcasketMelee_Cleaver" or defName="AAWarcasketMelee_BrokenBlade"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.7,1.7</DrawSize>
-							<DrawOffset>0.0,0.0</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AAWarcasketMelee_Intruder"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.3,1.3</DrawSize>
-							<DrawOffset>0.0,0.0</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<!-- WarcasketCleaver -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AAWarcasketMelee_Cleaver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>34</power>
-								<cooldownTime>2.6</cooldownTime>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<armorPenetrationSharp>24</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>44</power>
-								<cooldownTime>2.8</cooldownTime>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<armorPenetrationSharp>16.15</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-								<extraMeleeDamages>
-									<li>
-										<def>Flame</def>
-										<amount>30</amount>
-										<chance>1</chance>
-									</li>
-								</extraMeleeDamages>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AAWarcasketMelee_Cleaver"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.93</MeleeCritChance>
-							<MeleeParryChance>0.95</MeleeParryChance>
-							<MeleeDodgeChance>0.6</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AAWarcasketMelee_Cleaver"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<MeleeCounterParryBonus>0.53</MeleeCounterParryBonus>
-						<ToughnessRating>20</ToughnessRating>
-					</value>
-				</li>
-
-				<!-- BrokenBlade -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AAWarcasketMelee_BrokenBlade"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>76</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>11</armorPenetrationBlunt>
-								<armorPenetrationSharp>45</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-								<extraMeleeDamages>
-									<li>
-										<def>EMP</def>
-										<amount>45</amount>
-										<chance>1</chance>
-									</li>
-								</extraMeleeDamages>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>100</power>
-								<cooldownTime>2.35</cooldownTime>
-								<armorPenetrationBlunt>47</armorPenetrationBlunt>
-								<armorPenetrationSharp>34.8</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-								<extraMeleeDamages>
-									<li>
-										<def>Flame</def>
-										<amount>50</amount>
-										<chance>1</chance>
-									</li>
-								</extraMeleeDamages>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AAWarcasketMelee_BrokenBlade"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.99</MeleeCritChance>
-							<MeleeParryChance>0.97</MeleeParryChance>
-							<MeleeDodgeChance>0.88</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AAWarcasketMelee_BrokenBlade"]/statBases</xpath>
-					<value>
-						<Bulk>25</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-						<ToughnessRating>30</ToughnessRating>
-					</value>
-				</li>
-
-				<!-- Intruder -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AAWarcasketMelee_Intruder"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>11</armorPenetrationBlunt>
-								<armorPenetrationSharp>21</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-								<extraMeleeDamages>
-									<li>
-										<def>Flame</def>
-										<amount>20</amount>
-										<chance>1</chance>
-									</li>
-								</extraMeleeDamages>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>50</power>
-								<cooldownTime>1.35</cooldownTime>
-								<armorPenetrationBlunt>27</armorPenetrationBlunt>
-								<armorPenetrationSharp>15.8</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-								<extraMeleeDamages>
-									<li>
-										<def>IntruderToxic</def>
-										<amount>50</amount>
-										<chance>1</chance>
-									</li>
-								</extraMeleeDamages>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AAWarcasketMelee_Intruder"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.79</MeleeCritChance>
-							<MeleeParryChance>0.67</MeleeParryChance>
-							<MeleeDodgeChance>0.48</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AAWarcasketMelee_Intruder"]/statBases</xpath>
-					<value>
-						<Bulk>25</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-						<ToughnessRating>20</ToughnessRating>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Ancient Arsenal Warcaskets/RangedWeapons.xml b/Patches/Ancient Arsenal Warcaskets/RangedWeapons.xml
deleted file mode 100644
index d4f1e38e54..0000000000
--- a/Patches/Ancient Arsenal Warcaskets/RangedWeapons.xml	
+++ /dev/null
@@ -1,289 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Ancient Arsenal: Warcaskets</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "AA_CAS" or
-						defName = "AA_Ripper" or
-						defName = "AA_Brigador" or
-						defName = "WarcasketGun_Confessor"
-						]/tools
-					</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>2.44</cooldownTime>
-								<armorPenetrationBlunt>16</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===  CAS === -->
-				<li Class="PatchOperationRemove">
-					<xpath>/Defs/ThingDef[defName="AA_CAS"]/verbs</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>/Defs/ThingDef[defName="AA_CAS"]/comps/li[@Class="CompToggleFireMode.CompProperties_ToggleFireMode"]</xpath>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AA_CAS</defName>
-					<statBases>
-						<Bulk>25</Bulk>
-						<SwayFactor>1.2</SwayFactor>
-						<ShotSpread>0.08</ShotSpread>
-						<SightsEfficiency>2.20</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.60</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.19</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_SPG9Rocket_HEAT</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>68</range>
-						<soundCast>Brigador_ShotHeavy</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>16</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>6.0</reloadTime>
-						<ammoSet>AmmoSet_SPG9Rocket</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>/Defs/ThingDef[defName="AA_CAS"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.4,1.4</DrawSize>
-							<DrawOffset>0.0,0.0</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<!-- ===  Ripper === -->
-				<li Class="PatchOperationRemove">
-					<xpath>/Defs/ThingDef[defName="AA_Ripper"]/verbs</xpath>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AA_Ripper</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.9</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>2.32</SwayFactor>
-						<Bulk>8</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.22</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50AE_FMJ</defaultProjectile>
-						<warmupTime>2.1</warmupTime>
-						<range>28</range>
-						<burstShotCount>20</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>Ripper_Shots</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>4.2</reloadTime>
-						<ammoSet>AmmoSet_50AE</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>true</aiUseBurstMode>
-						<aimedBurstShotCount>12</aimedBurstShotCount>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>/Defs/ThingDef[defName="AA_Ripper"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>0.8,0.8</DrawSize>
-							<DrawOffset>0.0,0.0</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<!-- ===  Brigador === -->
-				<li Class="PatchOperationRemove">
-					<xpath>/Defs/ThingDef[defName="AA_Brigador"]/verbs</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>/Defs/ThingDef[defName="AA_Brigador"]/comps/li[@Class="CompToggleFireMode.CompProperties_ToggleFireMode"]</xpath>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AA_Brigador</defName>
-					<statBases>
-						<Mass>12.5</Mass>
-						<Bulk>12.5</Bulk>
-						<SwayFactor>1.00</SwayFactor>
-						<ShotSpread>0.05</ShotSpread>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.22</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Bolter75_Standard</defaultProjectile>
-						<warmupTime>0.8</warmupTime>
-						<range>45</range>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>Brigador_ShotHeavy</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>2.2</reloadTime>
-						<ammoSet>AmmoSet_Bolter75</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>/Defs/ThingDef[defName="AA_Brigador"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>0.9,0.9</DrawSize>
-							<DrawOffset>0.0,0.0</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<!-- ===  Confessor === -->
-				<li Class="PatchOperationRemove">
-					<xpath>/Defs/ThingDef[defName="WarcasketGun_Confessor"]/verbs</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>/Defs/ThingDef[defName="WarcasketGun_Confessor"]/comps/li[@Class="CompToggleFireMode.CompProperties_ToggleFireMode"]</xpath>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>WarcasketGun_Confessor</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.9</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.12</SwayFactor>
-						<Bulk>35</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.52</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_600NitroExpress_FMJ</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>57</range>
-						<burstShotCount>50</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>VFEP_Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>500</magazineSize>
-						<reloadTime>6.2</reloadTime>
-						<ammoSet>AmmoSet_600NitroExpress</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>true</aiUseBurstMode>
-						<aimedBurstShotCount>25</aimedBurstShotCount>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WarcasketGun_Confessor"]/comps</xpath>
-					<value>
-
-						<li Class="CombatExtended.CompProperties_UnderBarrel">
-							<propsUnderBarrel>
-								<magazineSize>200</magazineSize>
-								<reloadTime>3.5</reloadTime>
-								<ammoSet>AmmoSet_Flamethrower</ammoSet>
-							</propsUnderBarrel>
-							<verbPropsUnderBarrel>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_Flamethrower_Napalm</defaultProjectile>
-								<warmupTime>0.5</warmupTime>
-								<range>32</range>
-								<burstShotCount>20</burstShotCount>
-								<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-								<soundCast>HissFlamethrower</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>12</muzzleFlashScale>
-							</verbPropsUnderBarrel>
-							<propsFireModesUnderBarrel>
-								<aiUseBurstMode>true</aiUseBurstMode>
-								<aiAimMode>SuppressFire</aiAimMode>
-								<aimedBurstShotCount>10</aimedBurstShotCount>
-							</propsFireModesUnderBarrel>
-						</li>
-
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>/Defs/ThingDef[defName="WarcasketGun_Confessor"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.4,1.4</DrawSize>
-							<DrawOffset>0.0,0.0</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Ancient Blade Cyborg/CE_Cyborg_Race.xml b/Patches/Ancient Blade Cyborg/CE_Cyborg_Race.xml
deleted file mode 100644
index 5614a281ef..0000000000
--- a/Patches/Ancient Blade Cyborg/CE_Cyborg_Race.xml	
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Ancient Blade Cyborg</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Crborg_Hero"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Crborg_Hero"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Crborg_Hero"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Crborg_Hero"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Crborg_Hero"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency>0.3</NightVisionEfficiency>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1.33</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<Suppressability>0.66</Suppressability>
-						<CarryWeight>80</CarryWeight>
-						<CarryBulk>40</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Crborg_Hero"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Crborg_Hero"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3.75</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Crborg_Hero"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>3.0</baseHealthScale>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Crborg_Hero"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left blade fist</label>
-								<capacities>
-									<li>Cut</li>
-									<li>Stab</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>1.36</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>4.0</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Ancient Blade Cyborg/CE_Scenario.xml b/Patches/Ancient Blade Cyborg/CE_Scenario.xml
deleted file mode 100644
index 52c0f28e42..0000000000
--- a/Patches/Ancient Blade Cyborg/CE_Scenario.xml	
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Ancient Blade Cyborg</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="DangerousExperiment"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_ScatterThingsNearPlayerStart">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_45ACP_FMJ</thingDef>
-							<count>600</count>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Ancient Blade Cyborg/CE_Weapons_Guns.xml b/Patches/Ancient Blade Cyborg/CE_Weapons_Guns.xml
deleted file mode 100644
index 3913c9cbbf..0000000000
--- a/Patches/Ancient Blade Cyborg/CE_Weapons_Guns.xml	
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Ancient Blade Cyborg</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_BarracudaHMG" or defName="Gun_ShrimpAutomaticRifle"]/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>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_BarracudaHMG</defName>
-					<statBases>
-						<Mass>20.12</Mass>
-						<RangedWeapon_Cooldown>0.96</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.54</SwayFactor>
-						<Bulk>22.7</Bulk>
-						<WorkToMake>70000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>200</Steel>
-						<WoodLog>10</WoodLog>
-						<ComponentIndustrial>10</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.33</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>1.4</warmupTime>
-						<range>68</range>
-						<minRange>1.9</minRange>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>Shot_BarracudaHMG</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>75</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<researchPrerequisite>GasOperation</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Gun_BarracudaHMG"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.35,1.18</DrawSize>
-							<DrawOffset>0.13,-0.03</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_ShrimpAutomaticRifle</defName>
-					<statBases>
-						<Mass>2.86</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.29</SwayFactor>
-						<Bulk>8.03</Bulk>
-						<WorkToMake>30000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-						<Chemfuel>10</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>1.28</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.75</warmupTime>
-						<range>30</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Gun_ShrimpAutomaticRifle"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.16,1.25</DrawSize>
-							<DrawOffset>0.05,-0.07</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Ancient Blade Cyborg/Cyborg_CoveredByNaturalArmor.xml b/Patches/Ancient Blade Cyborg/Cyborg_CoveredByNaturalArmor.xml
deleted file mode 100644
index fd8dac86ea..0000000000
--- a/Patches/Ancient Blade Cyborg/Cyborg_CoveredByNaturalArmor.xml	
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Ancient Blade Cyborg</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Modify coverage ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Cyborg"]/corePart/parts/li[def="Ribcage"]/coverage</xpath>
-					<value>
-						<coverage>0.07</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Cyborg"]/corePart/parts/li[def="Pelvis"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Cyborg"]/corePart/parts/li[def="Stomach"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Cyborg"]/corePart/parts/li[def="Heart"]/coverage</xpath>
-					<value>
-						<coverage>0.04</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Cyborg"]/corePart/parts/li[def="Lung"]/coverage</xpath>
-					<value>
-						<coverage>0.055</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Cyborg"]/corePart/parts/li[def="Kidney"]/coverage</xpath>
-					<value>
-						<coverage>0.03</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Cyborg"]/corePart/parts/li[def="Liver"]/coverage</xpath>
-					<value>
-						<coverage>0.06</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Cyborg"]/corePart/parts/li[def = "CyborgNeck"]/coverage</xpath>
-					<value>
-						<coverage>0.055</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Cyborg"]/corePart/parts/li[def="CyborgNeck"]/parts/li[def="Head"]/parts/li[def="CyborgSkull"]/parts/li[def="ArtificialBrain"]/coverage</xpath>
-					<value>
-						<coverage>0.9</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Cyborg"]/corePart/parts/li[def = "CyborgNeck"]/parts/li[def="Head"]/parts/li[def = "CyborgNose"]/coverage</xpath>
-					<value>
-						<coverage>0.08</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Cyborg"]/corePart/parts/li[def = "CyborgNeck"]/parts/li[def="Head"]/parts/li[def = "CyborgSightSensor"]/coverage</xpath>
-					<value>
-						<coverage>0.06</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Cyborg"]/corePart/parts/li[def = "CyborgNeck"]/parts/li[def="Head"]/parts/li[def = "CyborgEye"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Cyborg"]/corePart/parts/li[def = "CyborgShoulder"]/coverage</xpath>
-					<value>
-						<coverage>0.085</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Cyborg"]/corePart/parts/li[def = "Shoulder"]/coverage</xpath>
-					<value>
-						<coverage>0.085</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Cyborg"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Clavicle"]/coverage</xpath>
-					<value>
-						<coverage>0.06</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Cyborg"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Humerus"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Cyborg"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Radius"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-
-				<!-- ========== Add armor coverage ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Cyborg"]//*[
-						def="CyborgTorso" or
-						def="CyborgNeck" or
-						def="Head" or
-						def="Jaw" or
-						def="CyborgEar" or
-						def="CyborgNose" or
-						def="CyborgShoulder" or
-						def="Shoulder" or
-						def="CyborgArm" or
-						def="Arm" or
-						def="CyborgBladeFist" or
-						def="CyborgHand" or
-						def="Hand" or
-						def="CyborgFoot" or
-						def="CyborgLeg"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Cyborg"]//*[
-						def="CyborgJaw" or
-						def="CyborgNose" or
-						def="CyborgSightSensor" or
-						def="CyborgEye"]/groups
-					</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Ancient Blade Cyborg/Pawn_CE.xml b/Patches/Ancient Blade Cyborg/Pawn_CE.xml
deleted file mode 100644
index 06a1a39fea..0000000000
--- a/Patches/Ancient Blade Cyborg/Pawn_CE.xml	
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Ancient Blade Cyborg</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[defName="HeroAncientBladeCyborg"]</xpath>
-					<value>
-						<apparelRequired>
-							<li>CE_Apparel_Backpack</li>
-						</apparelRequired>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Ancient Eastern Armory/AsianArmory_Apparel.xml b/Patches/Ancient Eastern Armory/AsianArmory_Apparel.xml
deleted file mode 100644
index e59e711bb8..0000000000
--- a/Patches/Ancient Eastern Armory/AsianArmory_Apparel.xml	
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Ancient Eastern Armory (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Noble Robe -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Ancient_AsianNobleCloth"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Ancient_AsianNobleCloth"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.08</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Ancient_AsianNobleCloth"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.12</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Noble Hat -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Ancient_AsianNobleHat"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Ancient_AsianNobleHat"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.04</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Ancient_AsianNobleHat"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.06</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Ninja Gi -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Ancient_NinjaGi"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Ancient_NinjaGi"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.12</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Ancient_NinjaGi"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.18</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Ninja Mask -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Ancient_NinjaMask"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Ancient_NinjaMask"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.3</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Ancient_NinjaMask"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.45</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Ancient Eastern Armory/AsianArmory_Armour.xml b/Patches/Ancient Eastern Armory/AsianArmory_Armour.xml
deleted file mode 100644
index fbfb90570e..0000000000
--- a/Patches/Ancient Eastern Armory/AsianArmory_Armour.xml	
+++ /dev/null
@@ -1,355 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Ancient Eastern Armory (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Yoroi -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Ancient_SamuraiYoroi"]/statBases</xpath>
-					<value>
-						<Bulk>80</Bulk>
-						<WornBulk>12</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Ancient_SamuraiYoroi"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Ancient_SamuraiYoroi"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeDodgeChance>-0.05</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Yoroi Helmet -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Ancient_SamuraiHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Ancient_SamuraiHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Ancient_SamuraiHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>-0.2</AimingAccuracy>
-							<MeleeHitChance>-1</MeleeHitChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Yoroi - Captain's Helmet -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Ancient_SamuraiCaptainHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>7</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Ancient_SamuraiCaptainHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Ancient_SamuraiCaptainHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>-0.25</AimingAccuracy>
-							<MeleeHitChance>-1.5</MeleeHitChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Ashigaru Armor -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Ancient_AshigaruArmor"]/statBases</xpath>
-					<value>
-						<Bulk>80</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Ancient_AshigaruArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.65</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Ashigaru Helmet -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Ancient_AshigaruHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Ancient_AshigaruHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Qing Light Armor -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Ancient_QingLightArmor"]/statBases</xpath>
-					<value>
-						<Bulk>80</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Ancient_QingLightArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Ancient_QingLightArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Qing Light Helmet -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Ancient_QingLightHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Ancient_QingLightHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Ancient_QingLightHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Qing Heavy Helmet -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Ancient_QingHeavyHelm"]/statBases</xpath>
-					<value>
-						<Bulk>7</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Ancient_QingHeavyHelm"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.8</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Ancient_QingHeavyHelm"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>-0.20</AimingAccuracy>
-							<MeleeHitChance>-1.25</MeleeHitChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Joseon Brigandine -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Ancient_Brigandine"]/statBases</xpath>
-					<value>
-						<Bulk>80</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Ancient_Brigandine"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Ancient_Brigandine"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeDodgeChance>-0.075</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Joseon Brigandine - Leather -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Ancient_LeatherBrigandine"]/statBases</xpath>
-					<value>
-						<Bulk>80</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Ancient_LeatherBrigandine"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Ancient_LeatherBrigandine"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Ancient_LeatherBrigandine"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Ancient_LeatherBrigandine"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeDodgeChance>-0.075</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Joseon Brigandine Helmet -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Ancient_BrigandineHelm"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Ancient_BrigandineHelm"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Ancient_BrigandineHelm"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>-0.2</AimingAccuracy>
-							<MeleeHitChance>-1</MeleeHitChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Joseon Brigandine Helmet - Leather -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Ancient_LeatherBrigandineHelm"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Ancient_LeatherBrigandineHelm"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Ancient_LeatherBrigandineHelm"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Ancient_LeatherBrigandineHelm"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Ancient_LeatherBrigandineHelm"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>-0.2</AimingAccuracy>
-							<MeleeHitChance>-1</MeleeHitChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Gunner's Hat -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Ancient_GunnersHat"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Ancient_GunnersHat"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Ancient Eastern Armory/AsianArmory_Weapons.xml b/Patches/Ancient Eastern Armory/AsianArmory_Weapons.xml
deleted file mode 100644
index c3014e6b20..0000000000
--- a/Patches/Ancient Eastern Armory/AsianArmory_Weapons.xml	
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Ancient Eastern Armory (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Two-Handed Flail -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Ancient_TwoHandedFlail"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.49</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>3.375</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>2.67</cooldownTime>
-								<armorPenetrationBlunt>15.75</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Ancient_TwoHandedFlail"]/statBases</xpath>
-					<value>
-						<Bulk>14</Bulk>
-						<MeleeCounterParryBonus>0.28</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Ancient_TwoHandedFlail"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>1.6</MeleeCritChance>
-						<MeleeParryChance>0.38</MeleeParryChance>
-						<MeleeDodgeChance>0.3</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<!-- Yari -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Ancient_SamuraiYari"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.29</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>1.913</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.71</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.85</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.14</cooldownTime>
-								<chanceFactor>1.00</chanceFactor>
-								<armorPenetrationBlunt>1.913</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.4</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>3.2</cooldownTime>
-								<chanceFactor>0.33</chanceFactor>
-								<armorPenetrationBlunt>1.913</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.28</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Ancient_SamuraiYari"]/statBases</xpath>
-					<value>
-						<Bulk>11</Bulk>
-						<MeleeCounterParryBonus>2.12</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Ancient_SamuraiYari"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeCritChance>0.39</MeleeCritChance>
-						<MeleeParryChance>1.59</MeleeParryChance>
-						<MeleeDodgeChance>0.90</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<!-- Guan Dao -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Ancient_GuanDao"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.49</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>3.375</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.97</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>1.50</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>39</power>
-								<cooldownTime>2.44</cooldownTime>
-								<chanceFactor>0.33</chanceFactor>
-								<armorPenetrationBlunt>4.86</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.95</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Ancient_GuanDao"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<MeleeCounterParryBonus>0.98</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Ancient_GuanDao"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.11</MeleeCritChance>
-							<MeleeParryChance>0.73</MeleeParryChance>
-							<MeleeDodgeChance>0.73</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Ancient Fallout Armory/Apparel_Armor.xml b/Patches/Ancient Fallout Armory/Apparel_Armor.xml
deleted file mode 100644
index 640bef1c57..0000000000
--- a/Patches/Ancient Fallout Armory/Apparel_Armor.xml	
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Ancient Fallout Armory</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Materials === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="FallArmory_HeavyMetalArmor" or
-						defName="Fallarmory_MediumMetalArmor" or
-						defName="Fallarmory_MetalArmorHelmetB" or
-						defName="FallArmory_HeavyCombatArmor" or
-						defName="Fallarmory_MediumCombatArmor"
-						]/stuffCategories </xpath>
-					<value>
-						<stuffCategories>
-							<li>Steeled</li>
-						</stuffCategories>
-					</value>
-				</li>
-
-				<!-- === Metal Armor === -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="FallArmory_HeavyMetalArmor" or defName="Fallarmory_MediumMetalArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="FallArmory_HeavyMetalArmor"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FallArmory_HeavyMetalArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="FallArmory_HeavyMetalArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeDodgeChance>-0.15</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Fallarmory_MediumMetalArmor"]/statBases</xpath>
-					<value>
-						<Bulk>80</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Fallarmory_MediumMetalArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- === Combat Armor === -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="FallArmory_HeavyCombatArmor" or defName="Fallarmory_MediumCombatArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FallArmory_HeavyCombatArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>25</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="FallArmory_HeavyCombatArmor"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FallArmory_HeavyCombatArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>11</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="FallArmory_HeavyCombatArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeDodgeChance>-0.15</MeleeDodgeChance>
-						<CarryBulk>8</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Fallarmory_MediumCombatArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>18</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Fallarmory_MediumCombatArmor"]/statBases</xpath>
-					<value>
-						<Bulk>80</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Fallarmory_MediumCombatArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>5</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Fallarmory_MediumCombatArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>7</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- === Pre-War Armor === -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="FallArmory_HeavyCombatArmorUS"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="FallArmory_HeavyCombatArmorUS"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FallArmory_HeavyCombatArmorUS"]/statBases/Mass</xpath>
-					<value>
-						<Mass>25</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FallArmory_HeavyCombatArmorUS"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>12</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FallArmory_HeavyCombatArmorUS"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="FallArmory_HeavyCombatArmorUS"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeDodgeChance>-0.15</MeleeDodgeChance>
-						<CarryBulk>8</CarryBulk>
-					</value>
-				</li>
-
-				<!-- === Secret Service Armor === -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="FallArmory_SecretServiceArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="FallArmory_SecretServiceArmor"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FallArmory_SecretServiceArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>20</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FallArmory_SecretServiceArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FallArmory_SecretServiceArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>14</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="FallArmory_SecretServiceArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>8</CarryBulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Ancient Fallout Armory/Headgears_Fallout.xml b/Patches/Ancient Fallout Armory/Headgears_Fallout.xml
deleted file mode 100644
index 55e2527afe..0000000000
--- a/Patches/Ancient Fallout Armory/Headgears_Fallout.xml	
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Ancient Fallout Armory</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Materials === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Fallarmory_FlightHelmet" or
-						defName="Fallarmory_MetalArmorHelmetA" or
-						defName="Fallarmory_MetalArmorHelmetB" or
-						defName="Fallarmory_CombatarmorHelmet"
-						]/stuffCategories </xpath>
-					<value>
-						<stuffCategories>
-							<li>Steeled</li>
-						</stuffCategories>
-					</value>
-				</li>
-
-				<!-- === Flight Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Fallarmory_FlightHelmet" or defName="Fallarmory_USFlightHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Fallarmory_FlightHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Fallarmory_USFlightHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Fallarmory_USFlightHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Fallarmory_FlightHelmet" or defName="Fallarmory_USFlightHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Fallarmory_FlightHelmet" or defName="Fallarmory_USFlightHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Fallarmory_FlightHelmet" or defName="Fallarmory_USFlightHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<!-- === Metal Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Fallarmory_MetalArmorHelmetA" or defName="Fallarmory_MetalArmorHelmetB"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Fallarmory_MetalArmorHelmetA" or defName="Fallarmory_MetalArmorHelmetB"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- === Combat Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Fallarmory_CombatarmorHelmet" or defName="FallArmory_CombatarmorHelmetUS"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Fallarmory_CombatarmorHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>7.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FallArmory_CombatarmorHelmetUS"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>9</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FallArmory_CombatarmorHelmetUS"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>14</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- === Secret Service Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="FallArmory_SecretServiceHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FallArmory_SecretServiceHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FallArmory_SecretServiceHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>12</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="FallArmory_SecretServiceHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="FallArmory_SecretServiceHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="FallArmory_SecretServiceHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Ancient Human/Pawnkinds_AncientHuman.xml b/Patches/Ancient Human/Pawnkinds_AncientHuman.xml
deleted file mode 100644
index 233030fb00..0000000000
--- a/Patches/Ancient Human/Pawnkinds_AncientHuman.xml	
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Ancient Human</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="SpaceRefugee_Ancient"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>7</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Ancient Human/Race_AncientHuman.xml b/Patches/Ancient Human/Race_AncientHuman.xml
deleted file mode 100644
index 21f2d29a6a..0000000000
--- a/Patches/Ancient Human/Race_AncientHuman.xml	
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Ancient Human</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Human_Hero"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Human_Hero"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Human_Hero"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Human_Hero"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Human_Hero"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency>0.1</NightVisionEfficiency>
-						<MeleeDodgeChance>1.1</MeleeDodgeChance>
-						<MeleeCritChance>1.1</MeleeCritChance>
-						<MeleeParryChance>1.1</MeleeParryChance>
-						<Suppressability>0.90</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Human_Hero"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Ancient Human/Scenario_AncientHuman.xml b/Patches/Ancient Human/Scenario_AncientHuman.xml
deleted file mode 100644
index 04e2577d38..0000000000
--- a/Patches/Ancient Human/Scenario_AncientHuman.xml	
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Ancient Human</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="IAmAlive"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_ScatterThingsNearPlayerStart">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_556x45mmNATO_FMJ</thingDef>
-							<count>300</count>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Android Tiers - TX Series/PawnkindDefs/PawnKinds_Android.xml b/Patches/Android Tiers - TX Series/PawnkindDefs/PawnKinds_Android.xml
deleted file mode 100644
index 1332a8dce9..0000000000
--- a/Patches/Android Tiers - TX Series/PawnkindDefs/PawnKinds_Android.xml	
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Android tiers - TX Series (Continued)</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[
-								@Name="ATPP_AndroidTX2RaiderBase" or
-								@Name="ATPP_AndroidTX2KRaiderBase" or
-								@Name="ATPP_AndroidTX3RaiderBase" or
-								@Name="ATPP_AndroidTX4RaiderBase" or
-								@Name="ATPP_AndroidTX2CollectiveBase" or
-								@Name="ATPP_AndroidTX2KCollectiveBase" or
-								@Name="ATPP_AndroidTX3CollectiveBase" or
-								@Name="ATPP_AndroidTX4CollectiveBase"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>4</min>
-										<max>6</max>
-									</primaryMagazineCount>
-									<sidearms>
-										<li>
-											<generateChance>0.5</generateChance>
-											<sidearmMoney>
-												<min>20</min>
-												<max>120</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_Sidearm_Melee</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Android Tiers - TX Series/ThingDef_Races/AlienRace_Androids.xml b/Patches/Android Tiers - TX Series/ThingDef_Races/AlienRace_Androids.xml
deleted file mode 100644
index 8de912f06d..0000000000
--- a/Patches/Android Tiers - TX Series/ThingDef_Races/AlienRace_Androids.xml	
+++ /dev/null
@@ -1,422 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Android tiers - TX Series (Continued)</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--Test for comps-->
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2TX"]/comps</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2TX"]</xpath>
-								<value>
-									<comps />
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2ITX"]/comps</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2ITX"]</xpath>
-								<value>
-									<comps />
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android3TX"]/comps</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android3TX"]</xpath>
-								<value>
-									<comps />
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android3ITX"]/comps</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android3ITX"]</xpath>
-								<value>
-									<comps />
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android4TX"]/comps</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android4TX"]</xpath>
-								<value>
-									<comps />
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android4ITX"]/comps</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android4ITX"]</xpath>
-								<value>
-									<comps />
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2KTX"]/comps</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2KTX"]</xpath>
-								<value>
-									<comps />
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2KITX"]/comps</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2KITX"]</xpath>
-								<value>
-									<comps />
-								</value>
-							</nomatch>
-						</li>
-
-						<!--Multiple-->
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[
-								defName="ATPP_Android2TX" or
-								defName="ATPP_Android3TX" or
-								defName="ATPP_Android4TX" or
-								defName="ATPP_Android2ITX" or
-								defName="ATPP_Android3ITX" or
-								defName="ATPP_Android4ITX" or
-								defName="ATPP_Android2KTX" or
-								defName="ATPP_Android2KITX"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Humanoid</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[
-								defName="ATPP_Android2TX" or
-								defName="ATPP_Android3TX" or
-								defName="ATPP_Android4TX" or
-								defName="ATPP_Android2ITX" or
-								defName="ATPP_Android3ITX" or
-								defName="ATPP_Android4ITX" or
-								defName="ATPP_Android2KTX" or
-								defName="ATPP_Android2KITX"
-								]/comps </xpath>
-							<value>
-								<li>
-									<compClass>CombatExtended.CompPawnGizmo</compClass>
-								</li>
-							</value>
-						</li>
-
-						<!--2/3/4 are all complex enough to have at least some intrinsic self presevation. 
-				2KXT Are purpose built combat units and as such do not.-->
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[
-								defName="ATPP_Android2TX" or
-								defName="ATPP_Android3TX" or
-								defName="ATPP_Android4TX" or
-								defName="ATPP_Android2ITX" or
-								defName="ATPP_Android3ITX" or
-								defName="ATPP_Android4ITX"
-								]/comps </xpath>
-							<value>
-								<li Class="CombatExtended.CompProperties_Suppressable" />
-							</value>
-						</li>
-
-						<!--T2-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2TX" or defName="ATPP_Android2ITX"]/statBases</xpath>
-							<value>
-								<MeleeDodgeChance>0.95</MeleeDodgeChance>
-								<MeleeCritChance>0.95</MeleeCritChance>
-								<MeleeParryChance>0.95</MeleeParryChance>
-								<Suppressability>0.10</Suppressability>
-								<SmokeSensitivity>0.05</SmokeSensitivity>
-							</value>
-						</li>
-						<!--1mm Steel-->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2TX" or defName="ATPP_Android2ITX"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>1</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2TX" or defName="ATPP_Android2ITX"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2TX" or defName="ATPP_Android2ITX"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>1.67</cooldownTime>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.405</armorPenetrationBlunt>
-									</li>
-
-									<li Class="CombatExtended.ToolCE">
-										<label>right fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>1.67</cooldownTime>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.405</armorPenetrationBlunt>
-									</li>
-
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>4.49</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<!--T3-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android3TX" or defName="ATPP_Android3ITX"]/statBases</xpath>
-							<value>
-								<MeleeDodgeChance>1</MeleeDodgeChance>
-								<MeleeCritChance>1.1</MeleeCritChance>
-								<MeleeParryChance>1.1</MeleeParryChance>
-								<Suppressability>0.10</Suppressability>
-								<SmokeSensitivity>0</SmokeSensitivity>
-							</value>
-						</li>
-						<!--1mm plasteel/1.5mm steel-->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android3TX" or defName="ATPP_Android3ITX"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>3.5</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android3TX" or defName="ATPP_Android3ITX"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>4.75</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android3TX" or defName="ATPP_Android3ITX"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>5</power>
-										<cooldownTime>1.67</cooldownTime>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>1.44</armorPenetrationBlunt>
-									</li>
-
-									<li Class="CombatExtended.ToolCE">
-										<label>right fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>5</power>
-										<cooldownTime>1.67</cooldownTime>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>1.44</armorPenetrationBlunt>
-									</li>
-
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>5</power>
-										<cooldownTime>2.8</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<!--T4-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android4TX" or defName="ATPP_Android4ITX"]/statBases</xpath>
-							<value>
-								<MeleeDodgeChance>1.2</MeleeDodgeChance>
-								<MeleeCritChance>1.2</MeleeCritChance>
-								<MeleeParryChance>1.2</MeleeParryChance>
-								<Suppressability>0.25</Suppressability>
-								<SmokeSensitivity>0</SmokeSensitivity>
-							</value>
-						</li>
-						<!--2mm plasteel-->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android4TX" or defName="ATPP_Android4ITX"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>4</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android4TX" or defName="ATPP_Android4ITX"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>6</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android4TX" or defName="ATPP_Android4ITX"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>5</power>
-										<cooldownTime>1.11</cooldownTime>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>1.68</armorPenetrationBlunt>
-									</li>
-
-									<li Class="CombatExtended.ToolCE">
-										<label>right fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>5</power>
-										<cooldownTime>1.11</cooldownTime>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>1.68</armorPenetrationBlunt>
-									</li>
-
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>6</power>
-										<cooldownTime>2.49</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<!--T2K-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2KTX" or defName="ATPP_Android2KITX"]/statBases</xpath>
-							<value>
-								<MeleeDodgeChance>0.75</MeleeDodgeChance>
-								<MeleeCritChance>1.0</MeleeCritChance>
-								<MeleeParryChance>1.2</MeleeParryChance>
-								<Suppressability>0</Suppressability>
-								<SmokeSensitivity>0</SmokeSensitivity>
-							</value>
-						</li>
-						<!--4mm Steel-->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2KTX" or defName="ATPP_Android2KITX"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>4</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2KTX" or defName="ATPP_Android2KITX"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>6</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2KTX" or defName="ATPP_Android2KITX"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>5</power>
-										<cooldownTime>2.05</cooldownTime>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
-									</li>
-
-									<li Class="CombatExtended.ToolCE">
-										<label>right fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>5</power>
-										<cooldownTime>2.05</cooldownTime>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
-									</li>
-
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>10</power>
-										<cooldownTime>5.29</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Android Tiers Reforged/Ammo/81mmMortar_SwarmShell.xml b/Patches/Android Tiers Reforged/Ammo/81mmMortar_SwarmShell.xml
deleted file mode 100644
index 88c6f7eb64..0000000000
--- a/Patches/Android Tiers Reforged/Ammo/81mmMortar_SwarmShell.xml	
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Android Tiers Reforged</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<CombatExtended.AmmoCategoryDef>
-							<defName>SwarmShell</defName>
-							<label>swarm shell</label>
-							<description>Releases several pre-programmed microscythers on impact.</description>
-							<advanced>true</advanced>
-						</CombatExtended.AmmoCategoryDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBaseCraftableBase">
-							<defName>Swarm_shell_81mm</defName>
-							<label>81mm mortar shell (Swarm)</label>
-							<graphicData>
-								<texPath>Things/Items/Shells/Microscyther_shell</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>60</MarketValue>
-								<Mass>4.1</Mass>
-								<Bulk>11.34</Bulk>
-							</statBases>
-							<ammoClass>SwarmShell</ammoClass>
-							<comps>
-								<li Class="CompProperties_Explosive">
-									<explosiveRadius>2</explosiveRadius>
-									<explosiveDamageType>Smoke</explosiveDamageType>
-									<explosiveExpandPerStackcount>0.4</explosiveExpandPerStackcount>
-									<startWickHitPointsPercent>0.333</startWickHitPointsPercent>
-									<postExplosionSpawnThingDef>Filth_FireFoam</postExplosionSpawnThingDef>
-									<postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-									<explosionEffect>ExtinguisherExplosion</explosionEffect>
-									<wickTicks>
-										<min>10</min>
-										<max>30</max>
-									</wickTicks>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="Base81mmMortarShell">
-							<defName>Bullet_81mmMortarShell_Swarm</defName>
-							<label>81mm mortar shell (Swarm)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Mortar/EMP</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Smoke</damageDef>
-								<suppressionFactor>0.0</suppressionFactor>
-								<dangerFactor>0.0</dangerFactor>
-								<damageAmountBase>0</damageAmountBase>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>39.493</armorPenetrationBlunt>
-								<explosionRadius>1.9</explosionRadius>
-								<soundExplode>Explosion_EMP</soundExplode>
-								<postExplosionSpawnThingDef>ATR_MicroScytherGenerator</postExplosionSpawnThingDef>
-								<postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<explosionEffect>ExtinguisherExplosion</explosionEffect>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_81mmMortarShell"]/ammoTypes</xpath>
-					<value>
-						<Swarm_shell_81mm>Bullet_81mmMortarShell_Swarm</Swarm_shell_81mm>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeSwarm_shell_81mm</defName>
-							<label>make 81mm Swarm mortar shell x1</label>
-							<description>Craft 1 81mm Swarm shell.</description>
-							<jobString>Making 81mm Swarm shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>50</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Swarm_shell_81mm>1</Swarm_shell_81mm>
-							</products>
-							<workAmount>3000</workAmount>
-							<recipeUsers Inherit="False">
-								<li>ATR_MechanicalAssemblyPod</li>
-							</recipeUsers>
-							<researchPrerequisite>ATR_MilitaryBiomimetics</researchPrerequisite>
-						</RecipeDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="ATR_MicroscytherShell"]</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATR_TrapIED_Microscyther"]/costList</xpath>
-					<value>
-						<costList>
-							<Swarm_shell_81mm>2</Swarm_shell_81mm>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/TraderKindDef[defName="ATR_Orbital_Mechanized"]/stockGenerators/li[thingDef="ATR_MicroscytherShell"]</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Android Tiers Reforged/Bodies/Bodies_Android.xml b/Patches/Android Tiers Reforged/Bodies/Bodies_Android.xml
deleted file mode 100644
index 20da42d4fb..0000000000
--- a/Patches/Android Tiers Reforged/Bodies/Bodies_Android.xml	
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Android Tiers Reforged</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
-					<value>
-						<li>LeftShoulder</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
-					<value>
-						<li>RightShoulder</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalShoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
-					<value>
-						<li>LeftArm</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalShoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
-					<value>
-						<li>RightArm</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_Framework"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalNeck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_VoiceSynthesizer"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_MechanicalAudioSensor"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_SmellSensor"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalShoulder"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalShoulder"]/parts/li[def="ATR_MechanicalArm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalShoulder"]/parts/li[def="ATR_MechanicalArm"]/parts/li[def="ATR_MechanicalHand"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalShoulder"]/parts/li[def="ATR_MechanicalArm"]/parts/li[def="ATR_MechanicalHand"]/parts/li[def="ATR_MechanicalFinger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalLeg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalLeg"]/parts/li[def="ATR_MechanicalFoot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="ATR_AndroidBody"]//*[
-						def="ATR_VoiceSynthesizer" or
-						def="ATR_SmellSensor" or
-						def="ATR_MechanicalVisualSensor"]/groups
-					</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Android Tiers Reforged/Bodies/Bodies_Animal_Airborne.xml b/Patches/Android Tiers Reforged/Bodies/Bodies_Animal_Airborne.xml
deleted file mode 100644
index 5c33d62752..0000000000
--- a/Patches/Android Tiers Reforged/Bodies/Bodies_Animal_Airborne.xml	
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Android Tiers Reforged</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_MechAirborne"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_MechAirborne"]/corePart/parts/li[def="ATR_Framework"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_MechAirborne"]/corePart/parts/li[def="ATR_MechanicalNeck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_MechAirborne"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_MechAirborne"]/corePart/parts/li[def="ATR_MechanicalWing"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_MechAirborne"]/corePart/parts/li[def="ATR_MechanicalPropeller"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_MechAirborne"]/corePart/parts/li[def="ATR_MechanicalPropeller"]/parts/li[def="ATR_CounterWeightTop"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Android Tiers Reforged/Bodies/Bodies_Animal_Bipedal.xml b/Patches/Android Tiers Reforged/Bodies/Bodies_Animal_Bipedal.xml
deleted file mode 100644
index 7d25384d16..0000000000
--- a/Patches/Android Tiers Reforged/Bodies/Bodies_Animal_Bipedal.xml	
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Android Tiers Reforged</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_MechBipedal"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_MechBipedal"]/corePart/parts/li[def="ATR_Framework"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_MechBipedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_MechBipedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_MechBipedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_MechanicalAudioSensor"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_MechBipedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_SmellSensor"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_MechBipedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_MechanicalJaw"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_MechBipedal"]/corePart/parts/li[def="ATR_MechanicalLeg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_MechBipedal"]/corePart/parts/li[def="ATR_MechanicalLeg"]/parts/li[def="ATR_MechanicalFoot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="ATR_MechBipedal"]//*[
-						def="ATR_MechanicalJaw" or
-						def="ATR_SmellSensor" or
-						def="ATR_MechanicalVisualSensor"]/groups
-					</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Android Tiers Reforged/Bodies/Bodies_Animal_Quadrupedal.xml b/Patches/Android Tiers Reforged/Bodies/Bodies_Animal_Quadrupedal.xml
deleted file mode 100644
index dc278af28f..0000000000
--- a/Patches/Android Tiers Reforged/Bodies/Bodies_Animal_Quadrupedal.xml	
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Android Tiers Reforged</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="ATR_MechQuadrupedal"]/corePart/parts/li[12]/parts/li[def="ATR_MechanicalFoot"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="ATR_MechQuadrupedal"]/corePart/parts/li[12]/parts/li[def="ATR_MechanicalFoot"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="ATR_MechQuadrupedal"]/corePart/parts/li[13]/parts/li[def="ATR_MechanicalFoot"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="ATR_MechQuadrupedal"]/corePart/parts/li[13]/parts/li[def="ATR_MechanicalFoot"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_MechQuadrupedal"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_MechQuadrupedal"]/corePart/parts/li[def="ATR_Framework"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_MechQuadrupedal"]/corePart/parts/li[def="ATR_CounterWeightTail"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_MechQuadrupedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_MechQuadrupedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_MechQuadrupedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_MechanicalAudioSensor"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_MechQuadrupedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_SmellSensor"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_MechQuadrupedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_MechanicalJaw"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_MechQuadrupedal"]/corePart/parts/li[def="ATR_MechanicalLeg"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_MechQuadrupedal"]/corePart/parts/li[def="ATR_MechanicalLeg"]/parts/li[def="ATR_MechanicalFoot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="ATR_MechQuadrupedal"]//*[
-						def="ATR_MechanicalJaw" or
-						def="ATR_SmellSensor" or
-						def="ATR_MechanicalVisualSensor"]/groups
-					</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Android Tiers Reforged/Hediffs/Hediffs_Android.xml b/Patches/Android Tiers Reforged/Hediffs/Hediffs_Android.xml
deleted file mode 100644
index c088667b23..0000000000
--- a/Patches/Android Tiers Reforged/Hediffs/Hediffs_Android.xml	
+++ /dev/null
@@ -1,254 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Android Tiers Reforged</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ATR_CombatAssistant"]/stages/li/statOffsets</xpath>
-					<value>
-						<Suppressability>-0.25</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ATR_CombatAssistant"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<ShootingAccuracyPawn>1.0</ShootingAccuracyPawn>
-						<AimingAccuracy>0.4</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ATR_CombatAssistant"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ATR_PlatingPlasteel"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ATR_PlatingPlasteel"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ATR_CompositePlating"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-						<ArmorRating_Heat>0.1</ArmorRating_Heat>
-						<ArmorRating_Electric>0.1</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ATR_CompositePlating"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ATR_HydraulicFrame"]/stages/li/statOffsets</xpath>
-					<value>
-						<CarryWeight>10</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ATR_MobilityFrame"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.5</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ATR_SuppressorFrame"]/stages/li/statOffsets</xpath>
-					<value>
-						<Suppressability>1</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ATR_MiningArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>drill</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.25</cooldownTime>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ATR_AgriArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>scythe</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.25</cooldownTime>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ATR_PacificationArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>charged fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.0</cooldownTime>
-								<extraMeleeDamages>
-									<li>
-										<def>Flame</def>
-										<amount>10</amount>
-									</li>
-									<li>
-										<def>EMP</def>
-										<amount>5</amount>
-									</li>
-								</extraMeleeDamages>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ATR_ScalpelArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>scalpel</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationSharp>1.0</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>scalpel</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.0</cooldownTime>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ATR_RendingArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>carver</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>1.25</cooldownTime>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>carver</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>0.75</cooldownTime>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>carver</label>
-								<capacities>
-									<li>Demolish</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2.0</cooldownTime>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ATR_MakeshiftMechArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ATR_AdvancedArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.25</cooldownTime>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Android Tiers Reforged/PawnkindDefs/PawnKinds_Android.xml b/Patches/Android Tiers Reforged/PawnkindDefs/PawnKinds_Android.xml
deleted file mode 100644
index c32221700c..0000000000
--- a/Patches/Android Tiers Reforged/PawnkindDefs/PawnKinds_Android.xml	
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationSequence">
-		<operations>
-
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Android Tiers Reforged</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[
-								defName="ATR_RaiderSoldierT1" or
-								defName="ATR_RaiderSoldierT2" or
-								defName="ATR_AndroidT2Surrogate" or
-								defName="ATR_AndroidT2CollectiveTrader" or
-								defName="ATR_AndroidT1CollectiveSoldier" or
-								defName="ATR_AndroidT2CollectiveSoldier"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>3</max>
-									</primaryMagazineCount>
-									<sidearms>
-										<li>
-											<generateChance>0.5</generateChance>
-											<sidearmMoney>
-												<min>20</min>
-												<max>120</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_Sidearm_Melee</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[
-								defName="ATR_RaiderSoldierT3" or
-								defName="ATR_RaiderSoldierT4" or
-								defName="ATR_AndroidT3Surrogate" or
-								defName="ATR_AndroidT4Surrogate" or
-								defName="ATR_AndroidT3CollectiveSoldier" or
-								defName="ATR_AndroidT4CollectiveSoldier" or
-								defName="ATR_AndroidT4CollectiveLeader"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>4</min>
-										<max>6</max>
-									</primaryMagazineCount>
-									<sidearms>
-										<li>
-											<generateChance>0.25</generateChance>
-											<sidearmMoney>
-												<min>20</min>
-												<max>120</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_Sidearm_Melee</li>
-											</weaponTags>
-										</li>
-										<li>
-											<generateChance>0.075</generateChance>
-											<sidearmMoney>
-												<min>80</min>
-												<max>160</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_FlareLauncher</li>
-											</weaponTags>
-											<magazineCount>
-												<min>1</min>
-												<max>1</max>
-											</magazineCount>
-										</li>
-										<li>
-											<generateChance>0.125</generateChance>
-											<sidearmMoney>
-												<min>10</min>
-												<max>100</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>GrenadeDestructive</li>
-											</weaponTags>
-											<magazineCount>
-												<min>1</min>
-												<max>1</max>
-											</magazineCount>
-										</li>
-									</sidearms>
-								</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Android Tiers Reforged/ScenarioDefs/Scenarios_Androids.xml b/Patches/Android Tiers Reforged/ScenarioDefs/Scenarios_Androids.xml
deleted file mode 100644
index 53c10ff52d..0000000000
--- a/Patches/Android Tiers Reforged/ScenarioDefs/Scenarios_Androids.xml	
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Android Tiers Reforged</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Add ammo to scenario === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="ATR_CrashlandedAndroids"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_303British_FMJ</thingDef>
-							<count>100</count>
-						</li>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_44Magnum_FMJ</thingDef>
-							<count>60</count>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Android Tiers Reforged/ThingDef_Misc/Apparel_Packs.xml b/Patches/Android Tiers Reforged/ThingDef_Misc/Apparel_Packs.xml
deleted file mode 100644
index 86710eee65..0000000000
--- a/Patches/Android Tiers Reforged/ThingDef_Misc/Apparel_Packs.xml	
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Android Tiers Reforged</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ATR_Apparel_ScorchPack"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Shoulders</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ATR_Apparel_ScorchPack"]/apparel/layers</xpath>
-					<value>
-						<li>Backpack</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ATR_Apparel_ScorchPack"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Android Tiers Reforged/ThingDef_Races/AlienRace_Androids.xml b/Patches/Android Tiers Reforged/ThingDef_Races/AlienRace_Androids.xml
deleted file mode 100644
index ec7e00b166..0000000000
--- a/Patches/Android Tiers Reforged/ThingDef_Races/AlienRace_Androids.xml	
+++ /dev/null
@@ -1,378 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Android Tiers Reforged</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Test for comps-->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier1Android"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier1Android"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier2Android"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier2Android"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier3Android"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier3Android"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier4Android"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier4Android"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier1Android" or
-						defName="ATR_Tier2Android" or
-						defName="ATR_Tier3Android" or
-						defName="ATR_Tier4Android"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier1Android" or
-						defName="ATR_Tier2Android" or
-						defName="ATR_Tier3Android" or
-						defName="ATR_Tier4Android"
-						]/comps </xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li>
-							<compClass>CombatExtended.CompAmmoGiver</compClass>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier2Android" or
-						defName="ATR_Tier3Android" or
-						defName="ATR_Tier4Android"
-						]/comps </xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-				<!--T1-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier1Android"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						<MeleeCritChance>0.5</MeleeCritChance>
-						<MeleeParryChance>0.5</MeleeParryChance>
-						<SmokeSensitivity>0.5</SmokeSensitivity>
-						<AimingAccuracy>0.75</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier1Android"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.0</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier1Android"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier1Android"]/race/baseBodySize</xpath>
-					<value>
-						<baseBodySize>0.8</baseBodySize>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier1Android"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>2.14</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.245</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>2.14</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.245</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>5.61</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.40</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--T2-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier2Android"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.8</MeleeDodgeChance>
-						<MeleeCritChance>0.8</MeleeCritChance>
-						<MeleeParryChance>0.8</MeleeParryChance>
-						<Suppressability>0.15</Suppressability>
-						<AimingAccuracy>0.9</AimingAccuracy>
-						<SmokeSensitivity>0.25</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier2Android"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier2Android"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier2Android"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.67</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.67</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier2Android"]/race/baseBodySize</xpath>
-					<value>
-						<baseBodySize>1</baseBodySize>
-					</value>
-				</li>
-
-				<!--T3-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier3Android"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency>0.25</NightVisionEfficiency>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1.1</MeleeCritChance>
-						<MeleeParryChance>1.1</MeleeParryChance>
-						<Suppressability>0.2</Suppressability>
-						<SmokeSensitivity>0</SmokeSensitivity>
-						<CarryWeight>45</CarryWeight>
-						<CarryBulk>22.5</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier3Android"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier3Android"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier3Android"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.44</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.44</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2.8</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--T4-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier4Android"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency>0.4</NightVisionEfficiency>
-						<AimingAccuracy>1.1</AimingAccuracy>
-						<MeleeDodgeChance>1.2</MeleeDodgeChance>
-						<MeleeCritChance>1.2</MeleeCritChance>
-						<MeleeParryChance>1.2</MeleeParryChance>
-						<Suppressability>0.33</Suppressability>
-						<SmokeSensitivity>0</SmokeSensitivity>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>25</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier4Android"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier4Android"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier4Android"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.68</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.68</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Android Tiers Reforged/ThingDef_Races/Races_Animals.xml b/Patches/Android Tiers Reforged/ThingDef_Races/Races_Animals.xml
deleted file mode 100644
index f52d64a34e..0000000000
--- a/Patches/Android Tiers Reforged/ThingDef_Races/Races_Animals.xml	
+++ /dev/null
@@ -1,449 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Android Tiers Reforged</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Bodytype-->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ATR_MicroScyther"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ATR_FractalAbomination"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ATR_DroneTORT" or
-						defName="ATR_DroneMineralUnit" or
-						defName="ATR_DroneNutritionUnit" or
-						defName="ATR_DroneWatchdog"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ATR_DroneChemUnit"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- Micro Scyther-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ATR_MicroScyther"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.26</MeleeDodgeChance>
-						<MeleeCritChance>0.03</MeleeCritChance>
-						<SmokeSensitivity>0</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATR_MicroScyther"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left wing</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.54</cooldownTime>
-								<linkedBodyPartsGroup>ATR_MechanicalLeftWing</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.303</armorPenetrationBlunt>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>right wing</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.54</cooldownTime>
-								<linkedBodyPartsGroup>ATR_MechanicalRightWing</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.303</armorPenetrationBlunt>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.05</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Chemical Processing Unit-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ATR_DroneChemUnit"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.0</MeleeCritChance>
-						<SmokeSensitivity>0.05</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATR_DroneChemUnit"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Abomination -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ATR_FractalAbomination"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.24</MeleeDodgeChance>
-						<MeleeCritChance>0.36</MeleeCritChance>
-						<MeleeParryChance>0.36</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATR_FractalAbomination"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATR_FractalAbomination"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>15</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!--Base melee is exceptionally strong. -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATR_FractalAbomination"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Demolish</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5.625</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Demolish</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5.625</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>2.95</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>fractal lance</label>
-								<capacities>
-									<li>ATR_FractalLance</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.5</cooldownTime>
-								<linkedBodyPartsGroup>Torso</linkedBodyPartsGroup>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-								<chanceFactor>0.025</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Mineral unit -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ATR_DroneMineralUnit"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.08</MeleeDodgeChance>
-						<MeleeCritChance>0.13</MeleeCritChance>
-						<MeleeParryChance>0.18</MeleeParryChance>
-						<SmokeSensitivity>0.05</SmokeSensitivity>
-						<CarryWeight>60</CarryWeight>
-						<CarryBulk>30</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATR_DroneMineralUnit"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.12</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Nutrition unit -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ATR_DroneNutritionUnit"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						<MeleeCritChance>0.28</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-						<SmokeSensitivity>0.05</SmokeSensitivity>
-						<CarryWeight>60</CarryWeight>
-						<CarryBulk>30</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATR_DroneNutritionUnit"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.12</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- TORT unit -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ATR_DroneTORT"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.17</MeleeDodgeChance>
-						<MeleeCritChance>0.23</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-						<SmokeSensitivity>0.05</SmokeSensitivity>
-						<CarryWeight>100</CarryWeight>
-						<CarryBulk>50</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATR_DroneTORT"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>2.12</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATR_DroneTORT"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>12</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATR_DroneTORT"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>36</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATR_DroneTORT"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!-- Watchdog unit -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ATR_DroneWatchdog"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.16</MeleeDodgeChance>
-						<MeleeCritChance>0.21</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-						<SmokeSensitivity>0</SmokeSensitivity>
-						<CarryWeight>60</CarryWeight>
-						<CarryBulk>30</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATR_DroneWatchdog"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATR_DroneWatchdog"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATR_DroneWatchdog"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>26</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.475</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>26</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.475</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2.5</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>32</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>12.8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Android Tiers Reforged/TraderKindDefs/Android_TraderKinds.xml b/Patches/Android Tiers Reforged/TraderKindDefs/Android_TraderKinds.xml
deleted file mode 100644
index 5db76836d8..0000000000
--- a/Patches/Android Tiers Reforged/TraderKindDefs/Android_TraderKinds.xml	
+++ /dev/null
@@ -1,332 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Android Tiers Reforged</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Android Base ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="ATR_Base_AndroidCollective_Standard"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>FSX</thingDef>
-							<countRange>
-								<min>25</min>
-								<max>100</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>Prometheum</thingDef>
-							<countRange>
-								<min>25</min>
-								<max>100</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Ammo</tradeTag>
-							<countRange>
-								<min>500</min>
-								<max>2000</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>5</min>
-								<max>9</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_MediumAmmo</tradeTag>
-							<countRange>
-								<min>30</min>
-								<max>100</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>5</min>
-								<max>8</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_HeavyAmmo</tradeTag>
-							<countRange>
-								<min>10</min>
-								<max>50</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>4</min>
-								<max>6</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Category">
-							<categoryDef>Ammo</categoryDef>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>0</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Turret</tradeTag>
-							<thingDefCountRange>
-								<min>-2</min>
-								<max>4</max>
-							</thingDefCountRange>
-							<countRange>
-								<min>1</min>
-								<max>2</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_Category">
-							<categoryDef>WeaponsTurrets</categoryDef>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>0</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Animals">
-							<tradeTagsSell>
-								<li>CE_AnimalBoom</li>
-							</tradeTagsSell>
-							<tradeTagsBuy>
-								<li>CE_AnimalBoom</li>
-							</tradeTagsBuy>
-							<kindCountRange>
-								<min>1</min>
-								<max>2</max>
-							</kindCountRange>
-							<countRange>
-								<min>-2</min>
-								<max>4</max>
-							</countRange>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Andro Caravan ========== -->
-
-				<!-- Pirate Merchant and Bulk Goods ammo -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="ATR_Caravan_AndroidCollective_BulkGoods" or defName="Caravan_AndroidCollective_AndroidMerchant" or defName="Caravan_AndroidCollective_HighTech"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Ammo</tradeTag>
-							<countRange>
-								<min>200</min>
-								<max>400</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>1</min>
-								<max>4</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_MediumAmmo</tradeTag>
-							<countRange>
-								<min>20</min>
-								<max>40</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>2</min>
-								<max>6</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_HeavyAmmo</tradeTag>
-							<countRange>
-								<min>5</min>
-								<max>10</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>2</min>
-								<max>4</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Category">
-							<categoryDef>Ammo</categoryDef>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>0</max>
-							</thingDefCountRange>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="ATR_Caravan_AndroidCollective_BulkGoods"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>FSX</thingDef>
-							<countRange>
-								<min>25</min>
-								<max>65</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>Prometheum</thingDef>
-							<countRange>
-								<min>25</min>
-								<max>65</max>
-							</countRange>
-						</li>
-					</value>
-				</li>
-
-				<!-- Combat Supplier -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="Caravan_AndroidCollective_CombatSupplier"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>FSX</thingDef>
-							<countRange>
-								<min>15</min>
-								<max>40</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>Prometheum</thingDef>
-							<countRange>
-								<min>15</min>
-								<max>40</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Ammo</tradeTag>
-							<countRange>
-								<min>400</min>
-								<max>1000</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>3</min>
-								<max>8</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_MediumAmmo</tradeTag>
-							<countRange>
-								<min>30</min>
-								<max>60</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>3</min>
-								<max>6</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_HeavyAmmo</tradeTag>
-							<countRange>
-								<min>10</min>
-								<max>15</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>4</min>
-								<max>6</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Category">
-							<categoryDef>Ammo</categoryDef>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>0</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Turret</tradeTag>
-							<thingDefCountRange>
-								<min>-4</min>
-								<max>2</max>
-							</thingDefCountRange>
-							<countRange>
-								<min>1</min>
-								<max>1</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_Category">
-							<categoryDef>WeaponsTurrets</categoryDef>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>0</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Animals">
-							<tradeTagsSell>
-								<li>CE_AnimalBoom</li>
-							</tradeTagsSell>
-							<tradeTagsBuy>
-								<li>CE_AnimalBoom</li>
-							</tradeTagsBuy>
-							<kindCountRange>
-								<min>1</min>
-								<max>1</max>
-							</kindCountRange>
-							<countRange>
-								<min>-1</min>
-								<max>2</max>
-							</countRange>
-						</li>
-					</value>
-				</li>
-
-				<!-- Orbital Mechanized Trader -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="ATR_Orbital_Mechanized"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Ammo</tradeTag>
-							<countRange>
-								<min>400</min>
-								<max>1000</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>2</min>
-								<max>4</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_MediumAmmo</tradeTag>
-							<countRange>
-								<min>60</min>
-								<max>120</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>4</min>
-								<max>7</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_HeavyAmmo</tradeTag>
-							<countRange>
-								<min>15</min>
-								<max>50</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>2</min>
-								<max>4</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Category">
-							<categoryDef>Ammo</categoryDef>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>0</max>
-							</thingDefCountRange>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Android Tiers SM7 Overhaul/AndroidTiersSM7Overhaul_CEPatch.xml b/Patches/Android Tiers SM7 Overhaul/AndroidTiersSM7Overhaul_CEPatch.xml
deleted file mode 100644
index 524f42c595..0000000000
--- a/Patches/Android Tiers SM7 Overhaul/AndroidTiersSM7Overhaul_CEPatch.xml	
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Android Tiers SM7 Overhaul (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==========  20mm Rotary Cannon  =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>MechRotaryCannon</defName>
-					<statBases>
-						<SightsEfficiency>1.5</SightsEfficiency>
-						<ShotSpread>0.25</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>35</Bulk>
-						<Mass>42</Mass>
-						<RangedWeapon_Cooldown>0</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_20x102mmNATO_AP</defaultProjectile>
-						<warmupTime>3</warmupTime>
-						<burstShotCount>250</burstShotCount>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<range>64</range>
-						<soundCast>RotaryCannon</soundCast>
-						<soundCastTail>RotaryCannonSpin</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1000</magazineSize>
-						<reloadTime>8</reloadTime>
-						<ammoSet>AmmoSet_20x102mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MechRotaryCannon"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>2.1</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>21</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>45</power>
-								<cooldownTime>2.2</cooldownTime>
-								<armorPenetrationBlunt>21</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>2.5</cooldownTime>
-								<armorPenetrationBlunt>30.24</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Androids Expanded/AlienRace/AlienRace_Droids.xml b/Patches/Androids Expanded/AlienRace/AlienRace_Droids.xml
deleted file mode 100644
index 9b4943b433..0000000000
--- a/Patches/Androids Expanded/AlienRace/AlienRace_Droids.xml	
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Androids Expanded</li>
-			<li>Androids Expanded (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Comps === -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjSpacerDroid"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjSpacerDroid"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjSpacerBattleDroid"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjSpacerBattleDroid"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjSpacerDroid" or defName="ChjSpacerBattleDroid"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjSpacerDroid" or defName="ChjSpacerBattleDroid"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Worker Droid === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjSpacerDroid"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<SmokeSensitivity>0</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjSpacerDroid"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjSpacerDroid"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjSpacerDroid"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Battle Droid === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjSpacerBattleDroid"]/statBases</xpath>
-					<value>
-						<MeleeCritChance>1.4</MeleeCritChance>
-						<MeleeParryChance>1.5</MeleeParryChance>
-						<SmokeSensitivity>0</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjSpacerBattleDroid"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjSpacerBattleDroid"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>36</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjSpacerBattleDroid"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left razor-fist</label>
-								<capacities>
-									<li>Cut</li>
-									<li>Stab</li>
-									<li>Blunt</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>1.76</cooldownTime>
-								<linkedBodyPartsGroup>LeftDroidHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>60</armorPenetrationBlunt>
-								<armorPenetrationSharp>24</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right razor-fist</label>
-								<capacities>
-									<li>Cut</li>
-									<li>Stab</li>
-									<li>Blunt</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>1.76</cooldownTime>
-								<linkedBodyPartsGroup>RightDroidHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>60</armorPenetrationBlunt>
-								<armorPenetrationSharp>24</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>lower left razor-fist</label>
-								<capacities>
-									<li>Cut</li>
-									<li>Stab</li>
-									<li>Blunt</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>1.76</cooldownTime>
-								<linkedBodyPartsGroup>LeftDroidHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>60</armorPenetrationBlunt>
-								<armorPenetrationSharp>24</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>lower right razor-fist</label>
-								<capacities>
-									<li>Cut</li>
-									<li>Stab</li>
-									<li>Blunt</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>1.76</cooldownTime>
-								<linkedBodyPartsGroup>LowerRightDroidHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>60</armorPenetrationBlunt>
-								<armorPenetrationSharp>24</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<chanceFactor>0.33</chanceFactor>
-								<cooldownTime>2.52</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Androids Expanded/AlienRace/AlienRace_Drones.xml b/Patches/Androids Expanded/AlienRace/AlienRace_Drones.xml
deleted file mode 100644
index 28cba82720..0000000000
--- a/Patches/Androids Expanded/AlienRace/AlienRace_Drones.xml	
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Androids Expanded</li>
-			<li>Androids Expanded (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Comps === -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NChefDrone"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NChefDrone"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NEngiDrone"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NEngiDrone"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NMedicDrone"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NMedicDrone"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NChefDrone" or defName="NEngiDrone" or defName="NMedicDrone"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NChefDrone" or defName="NEngiDrone" or defName="NMedicDrone"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Drones === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NChefDrone" or defName="NEngiDrone" or defName="NMedicDrone"
-						]/statBases </xpath>
-					<value>
-						<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						<MeleeCritChance>0.5</MeleeCritChance>
-						<MeleeParryChance>0.5</MeleeParryChance>
-						<SmokeSensitivity>0</SmokeSensitivity>
-					</value>
-				</li>
-				<!--0.5mm Steel-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NChefDrone" or defName="NEngiDrone" or defName="NMedicDrone"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NChefDrone" or defName="NEngiDrone" or defName="NMedicDrone"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.75</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NChefDrone" or defName="NEngiDrone" or defName="NMedicDrone"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tool strike</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.688</cooldownTime>
-								<linkedBodyPartsGroup>DroneHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.525</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Androids Expanded/Bodies/Bodies_DroidsExpanded.xml b/Patches/Androids Expanded/Bodies/Bodies_DroidsExpanded.xml
deleted file mode 100644
index 6159305c65..0000000000
--- a/Patches/Androids Expanded/Bodies/Bodies_DroidsExpanded.xml	
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Androids Expanded</li>
-			<li>Androids Expanded (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Droid === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="DroidBody"]//*[def="DroidNeck"]</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="DroidBody"]//*[
-						def="Chasis" or
-						def="Head" or
-						def="DroidNeck" or
-						def="Jaw" or
-						def="Frame" or
-						def="LeftDroidShoulder" or
-						def="LeftDroidArm" or
-						def="LeftDroidHand" or
-						def="LeftHandDroidPinky" or
-						def="LeftHandDroidMiddleFinger" or
-						def="LeftHandDroidIndexFinger" or
-						def="LeftHandDroidThumb" or
-						def="RightDroidShoulder" or
-						def="RightDroidArm" or
-						def="RightDroidHand" or
-						def="RightHandDroidPinky" or
-						def="RightHandDroidMiddleFinger" or
-						def="RightHandDroidIndexFinger" or
-						def="RightHandDroidThumb" or
-						def="LeftDroidLeg" or
-						def="LeftDroidFoot" or
-						def="RightDroidLeg" or
-						def="RightDroidFoot"
-						]/groups
-					</xpath>
-
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="DroidBody"]//*[def="LeftDroidShoulder"]/groups
-					</xpath>
-					<value>
-						<li>LeftShoulder</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="DroidBody"]//*[def="LeftDroidArm"]/groups
-					</xpath>
-					<value>
-						<li>LeftArm</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="DroidBody"]//*[def="RightDroidShoulder"]/groups
-					</xpath>
-					<value>
-						<li>RightShoulder</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="DroidBody"]//*[def="RightDroidArm"]/groups
-					</xpath>
-					<value>
-						<li>RightArm</li>
-					</value>
-				</li>
-
-				<!-- === Wardroid === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="WardroidBody"]//*[def="DroidNeck"]</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[
-						defName="WardroidBody"]//*[
-						def="Chasis" or
-						def="Head" or
-						def="DroidNeck" or
-						def="Jaw" or
-						def="Frame" or
-						def="LeftDroidShoulder" or
-						def="LeftDroidArm" or
-						def="LeftDroidHand" or
-						def="LeftHandDroidPinky" or
-						def="LeftHandDroidMiddleFinger" or
-						def="LeftHandDroidIndexFinger" or
-						def="LeftHandDroidThumb" or
-						def="RightDroidShoulder" or
-						def="RightDroidArm" or
-						def="RightDroidHand" or
-						def="RightHandDroidPinky" or
-						def="RightHandDroidMiddleFinger" or
-						def="RightHandDroidIndexFinger" or
-						def="RightHandDroidThumb" or
-						def="LowerLeftDroidShoulder" or
-						def="LowerLeftDroidArm" or
-						def="LowerLeftDroidHand" or
-						def="LowerLeftHandDroidPinky" or
-						def="LowerLeftHandDroidMiddleFinger" or
-						def="LowerLeftHandDroidIndexFinger" or
-						def="LowerLeftHandDroidThumb" or
-						def="LowerRightDroidShoulder" or
-						def="LowerRightDroidArm" or
-						def="LowerRightDroidHand" or
-						def="LowerRightHandDroidPinky" or
-						def="LowerRightHandDroidMiddleFinger" or
-						def="LowerRightHandDroidIndexFinger" or
-						def="LowerRightHandDroidThumb" or
-						def="LeftDroidLeg" or
-						def="LeftDroidFoot" or
-						def="RightDroidLeg" or
-						def="RightDroidFoot"
-						]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="WardroidBody"]//*[def="LeftDroidShoulder"]/groups</xpath>
-					<value>
-						<li>LeftShoulder</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="WardroidBody"]//*[def="LeftDroidArm"]/groups</xpath>
-					<value>
-						<li>LeftArm</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="WardroidBody"]//*[def="RightDroidShoulder"]/groups</xpath>
-					<value>
-						<li>RightShoulder</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="DroidBody"]//*[def="RightDroidArm"]/groups</xpath>
-					<value>
-						<li>RightArm</li>
-					</value>
-				</li>
-
-				<!-- === Drone Body === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="DroneBody"]//*[def="DroneNeck"]</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[
-						defName="DroneBody"]//*[
-						def="DroneShell" or
-						def="DroneNeck" or
-						def="DroneHead" or
-						def="DroneShoulder" or
-						def="DroneArm" or
-						def="DroneHand" or
-						def="LeftDroneLeg" or
-						def="LeftDroneFoot" or
-						def="RightDroneLeg" or
-						def="RightDroneFoot"
-						]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Androids/AlienRace/AlienRace_Chj.xml b/Patches/Androids/AlienRace/AlienRace_Chj.xml
deleted file mode 100644
index f9ee9feab5..0000000000
--- a/Patches/Androids/AlienRace/AlienRace_Chj.xml
+++ /dev/null
@@ -1,287 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Androids for RW 1.4</li>
-					<li>Androids</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--Test for comps-->
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjAndroid"]/comps</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjAndroid"]</xpath>
-								<value>
-									<comps />
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjDroid"]/comps</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjDroid"]</xpath>
-								<value>
-									<comps />
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjBattleDroid"]/comps</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjBattleDroid"]</xpath>
-								<value>
-									<comps />
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjAndroid" or
-								defName="ChjDroid" or
-								defName="ChjBattleDroid"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Humanoid</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjAndroid" or
-								defName="ChjDroid" or
-								defName="ChjBattleDroid"
-								]/comps </xpath>
-							<value>
-								<li>
-									<compClass>CombatExtended.CompPawnGizmo</compClass>
-								</li>
-							</value>
-						</li>
-
-						<!--These androids are pretty much printed humans functionally-->
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjAndroid"]/comps</xpath>
-							<value>
-								<li Class="CombatExtended.CompProperties_Suppressable" />
-							</value>
-						</li>
-
-						<!--Android-->
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjAndroid"]/statBases</xpath>
-							<value>
-								<MeleeDodgeChance>1</MeleeDodgeChance>
-								<MeleeCritChance>1</MeleeCritChance>
-								<MeleeParryChance>1</MeleeParryChance>
-								<Suppressability>1</Suppressability>
-								<SmokeSensitivity>0.5</SmokeSensitivity>
-							</value>
-						</li>
-
-						<!--Slighly lighter weight attacks-->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjAndroid"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>1.19</cooldownTime>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-									</li>
-
-									<li Class="CombatExtended.ToolCE">
-										<label>right fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>1.19</cooldownTime>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-									</li>
-
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>4.24</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Leather_ChJAndroid"]/statBases/StuffPower_Armor_Sharp</xpath>
-							<value>
-								<StuffPower_Armor_Sharp>0.02</StuffPower_Armor_Sharp>
-							</value>
-						</li>
-
-						<!--Worker Droid-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjDroid"]/statBases</xpath>
-							<value>
-								<MeleeDodgeChance>0.95</MeleeDodgeChance>
-								<MeleeCritChance>0.95</MeleeCritChance>
-								<MeleeParryChance>0.95</MeleeParryChance>
-								<SmokeSensitivity>0</SmokeSensitivity>
-							</value>
-						</li>
-						<!--2mm Steel-->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjDroid"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>2</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjDroid"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>3</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjDroid"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>1.58</cooldownTime>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.16</armorPenetrationBlunt>
-									</li>
-
-									<li Class="CombatExtended.ToolCE">
-										<label>right fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>1.58</cooldownTime>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.16</armorPenetrationBlunt>
-									</li>
-
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>4.49</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<!--Battledroid-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjBattleDroid"]/statBases</xpath>
-							<value>
-								<MeleeCritChance>1</MeleeCritChance>
-								<MeleeParryChance>1</MeleeParryChance>
-								<SmokeSensitivity>0</SmokeSensitivity>
-							</value>
-						</li>
-						<!--8mm Steel-->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjBattleDroid"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>8</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjBattleDroid"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>12</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjBattleDroid"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left bladed fist</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>9</power>
-										<cooldownTime>1.49</cooldownTime>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>1.44</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.32</armorPenetrationSharp>
-									</li>
-
-									<li Class="CombatExtended.ToolCE">
-										<label>right bladed fist</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>9</power>
-										<cooldownTime>1.49</cooldownTime>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>1.44</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.32</armorPenetrationSharp>
-									</li>
-
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>4</power>
-										<cooldownTime>5.05</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>1</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ChjBattleDroid"]/alienRace/raceRestriction/whiteApparelList</xpath>
-							<value>
-								<li>CE_Apparel_TacVest</li>
-								<li>CE_Apparel_Backpack</li>
-								<li>CE_Apparel_TribalBackpack</li>
-								<li>CE_Apparel_BallisticShield</li>
-								<li>CE_Apparel_MeleeShield</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Androids/Bodies/Mod_Bodies_Droid.xml b/Patches/Androids/Bodies/Mod_Bodies_Droid.xml
deleted file mode 100644
index 0d691882de..0000000000
--- a/Patches/Androids/Bodies/Mod_Bodies_Droid.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-
-			<!--Patch ChJDroid Bodytype-->
-
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Androids for RW 1.4</li>
-					<li>Androids</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--Arm Groups-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="ChJDroid"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
-							<value>
-								<li>LeftArm</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="ChJDroid"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
-							<value>
-								<li>RightArm</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="ChJDroid"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
-							<value>
-								<li>LeftShoulder</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="ChJDroid"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
-							<value>
-								<li>RightShoulder</li>
-							</value>
-						</li>
-
-						<!--Natural Armor-->
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="ChJDroid"]/corePart/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="ChJDroid"]/corePart/parts/li[def="Neck"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="ChJDroid"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="ChJDroid"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="ChJDroid"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="ChJDroid"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="ChJDroid"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="ChJDroid"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="ChJDroid"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="ChJDroid"]/corePart/parts/li[def="Leg"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="ChJDroid"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="ChJDroid"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Androids/HediffDefs/Hediffs_Upgrades.xml b/Patches/Androids/HediffDefs/Hediffs_Upgrades.xml
deleted file mode 100644
index e51be0ec40..0000000000
--- a/Patches/Androids/HediffDefs/Hediffs_Upgrades.xml
+++ /dev/null
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Androids for RW 1.4</li>
-			<li>Androids</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Core Modules-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_DroneCore"]/stages/li/statOffsets</xpath>
-					<value>
-						<Suppressability>-5</Suppressability>
-					</value>
-				</li>
-
-				<!--==========Physique Upgrades==========-->
-
-				<!--Hulking-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_Hulking"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_Hulking"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_Hulking"]/stages/li/statOffsets</xpath>
-					<value>
-						<CarryWeight>40</CarryWeight>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_Hulking"]/stages/li/statOffsets</xpath>
-					<value>
-						<CarryBulk>20</CarryBulk>
-					</value>
-				</li>
-
-				<!--Agile-->
-
-				<!--Provides same melee dodge as combat upgrade below-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_Agile"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.2625</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<!--Perfect-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_Super"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_Super"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!--Provides half melee dodge of combat upgrade-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_Super"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.13125</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_Super"]/stages/li/statOffsets</xpath>
-					<value>
-						<CarryWeight>25</CarryWeight>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_Super"]/stages/li/statOffsets</xpath>
-					<value>
-						<CarryBulk>10</CarryBulk>
-					</value>
-				</li>
-
-				<!--==========Skin Modules==========-->
-
-				<!--Hyperweave, 1.5mm;Heat resistance unadjusted-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_HyperweaveSkin"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_HyperweaveSkin"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2.25</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!--Plasteel, 1.5mm;Heat resistance unadjusted-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_PlasteelSkin"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>3</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_PlasteelSkin"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!--Dragonscale-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_DragonScales"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_DragonScales"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_DragonScales"]/stages/li/statOffsets</xpath>
-					<value>
-						<Flammability>-1</Flammability>
-					</value>
-				</li>
-
-				<!--==========Upgrade Modules==========-->
-
-				<!--Fighter-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_FighterModule"]/stages/li/statOffsets</xpath>
-					<value>
-						<Suppressability>-5</Suppressability>
-					</value>
-				</li>
-
-				<!--Splitting up the bonuses to melee/ranged into CE subcatergories. 15 levels of skill worth of bonus-->
-
-				<!--Shooting-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_FighterModule"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<ShootingAccuracyPawn>3</ShootingAccuracyPawn>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_FighterModule"]/stages/li/statOffsets</xpath>
-					<value>
-						<AimingAccuracy>1.5</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_FighterModule"]/stages/li/statOffsets</xpath>
-					<value>
-						<ReloadSpeed>0.35</ReloadSpeed>
-					</value>
-				</li>
-
-				<!--Melee-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_FighterModule"]/stages/li/statOffsets/MeleeHitChance</xpath>
-					<value>
-						<MeleeHitChance>15</MeleeHitChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_FighterModule"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.2625</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_FighterModule"]/stages/li/statOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.15</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ChjAndroidUpgrade_FighterModule"]/stages/li/statOffsets</xpath>
-					<value>
-						<MeleeParryChance>0.1875</MeleeParryChance>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Androids/PawnkindDefs/PawnKinds.xml b/Patches/Androids/PawnkindDefs/PawnKinds.xml
deleted file mode 100644
index ba49144003..0000000000
--- a/Patches/Androids/PawnkindDefs/PawnKinds.xml
+++ /dev/null
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Androids for RW 1.4</li>
-			<li>Androids</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="ChjAndroidVillager"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>1</min>
-								<max>2</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>20</min>
-										<max>120</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="ChjAndroidTownGuard"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>4</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>20</min>
-										<max>120</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="ChjAndroidGrenadierDestructive"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>10</min>
-								<max>30</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>200</min>
-								<max>600</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>150</min>
-									<max>350</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>CE_Sidearm_Melee</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="ChjAndroidGrenadierEMP"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>10</min>
-								<max>30</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>200</min>
-								<max>600</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>150</min>
-									<max>350</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>CE_Sidearm_Melee</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="ChjAndroidMercenaryGunner"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>4</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>200</min>
-								<max>600</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.8</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>60</min>
-										<max>150</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="ChjAndroidMercenarySniper"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>1</generateChance>
-									<sidearmMoney>
-										<min>60</min>
-										<max>150</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>60</min>
-										<max>150</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="ChjAndroidMercenaryHeavy"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>1</min>
-								<max>4</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>150</min>
-									<max>350</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>CE_SMG</li>
-								</weaponTags>
-								<magazineCount>
-									<min>0</min>
-									<max>1</max>
-								</magazineCount>
-							</forcedSidearm>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>60</min>
-										<max>150</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="ChjAndroidMercenarySlasher"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.9</shieldChance>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Androids/ScenarioDefs/ScenarioDefs.xml b/Patches/Androids/ScenarioDefs/ScenarioDefs.xml
deleted file mode 100644
index 1abd1fa8d9..0000000000
--- a/Patches/Androids/ScenarioDefs/ScenarioDefs.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Androids</li>
-			<li>Androids for RW 1.4</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Add ammo to scenarioes-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="ChJAndroidResistance"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_6x24mmCharged</thingDef>
-							<count>150</count>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="ChjAndroidRunner"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_6x24mmCharged</thingDef>
-							<count>100</count>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="ChjAndroidTheMechanist"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_762x54mmR_FMJ</thingDef>
-							<count>141</count>
-						</li>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_12Gauge_Buck</thingDef>
-							<count>48</count>
-						</li>
-					</value>
-				</li>
-
-				<!--Replace minigun-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ScenarioDef[defName="ChjAndroidTheMechanist"]/scenario/parts/li[thingDef="Gun_Minigun"]</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Gun_LMG</thingDef>
-							<count>1</count>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Androids/ThingDefs_Misc/Apparel.xml b/Patches/Androids/ThingDefs_Misc/Apparel.xml
deleted file mode 100644
index 4a842d852a..0000000000
--- a/Patches/Androids/ThingDefs_Misc/Apparel.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Androids</li>
-					<li>Androids for RW 1.4</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!-- ===================== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ChjAndroidMaidOutfit"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ChjAndroidMaidOutfit"]/statBases</xpath>
-							<value>
-								<Bulk>3</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ChjAndroid_SolarDuster"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ChjAndroid_SolarDuster"]/statBases</xpath>
-							<value>
-								<Bulk>5</Bulk>
-								<WornBulk>3</WornBulk>
-							</value>
-						</li>
-
-						<!--1mm Plasteel, 2mm Devilstrand-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ChjAndroidMaidBattleDress"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>3</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ChjAndroidMaidBattleDress"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>3.2</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ChjAndroidMaidBattleDress"]/statBases/ArmorRating_Heat</xpath>
-							<value>
-								<ArmorRating_Heat>0</ArmorRating_Heat>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ChjAndroidMaidBattleDress"]/statBases</xpath>
-							<value>
-								<Bulk>5</Bulk>
-								<WornBulk>7</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ChjAndroidBattleMaidHat"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>3</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ChjAndroidBattleMaidHat"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>3.2</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ChjAndroidBattleMaidHat"]/statBases/ArmorRating_Heat</xpath>
-							<value>
-								<ArmorRating_Heat>0</ArmorRating_Heat>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ChjAndroidBattleMaidHat"]/statBases</xpath>
-							<value>
-								<Bulk>2</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Androids/ThingDefs_Misc/Weapons_Guns.xml b/Patches/Androids/ThingDefs_Misc/Weapons_Guns.xml
deleted file mode 100644
index c95a84ce67..0000000000
--- a/Patches/Androids/ThingDefs_Misc/Weapons_Guns.xml
+++ /dev/null
@@ -1,232 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Androids</li>
-					<li>Androids for RW 1.4</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!-- ==========  Core Blaster =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Gun_ChjCoreLauncher</defName>
-							<statBases>
-								<SightsEfficiency>2.18</SightsEfficiency>
-								<ShotSpread>0.15</ShotSpread>
-								<SwayFactor>1.72</SwayFactor>
-								<Bulk>12</Bulk>
-								<Mass>22.5</Mass>
-								<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-							</statBases>
-
-							<Properties>
-								<recoilAmount>2.31</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_30x64mmFuel_Incendiary</defaultProjectile>
-								<warmupTime>1.2</warmupTime>
-								<minRange>2.5</minRange>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>30</ticksBetweenBurstShots>
-								<range>44</range>
-								<soundCast>Shot_IncendiaryLauncher</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>28</muzzleFlashScale>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>18</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_30x64mmFuel</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-							</FireModes>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Gun_ChjCoreLauncher"]/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>
-						</li>
-
-						<!-- ==========  Rebel Guns  =========== -->
-						<!--Early access to charge guns, but low spec-->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>ChjAndroidGun_RebelRifle</defName>
-							<statBases>
-								<SightsEfficiency>1.00</SightsEfficiency>
-								<ShotSpread>0.09</ShotSpread>
-								<SwayFactor>1.51</SwayFactor>
-								<Bulk>10.50</Bulk>
-								<Mass>4.60</Mass>
-								<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-							</statBases>
-
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>40</range>
-								<soundCast>Shot_ChargeRifle</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>12</muzzleFlashScale>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>18</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
-							</AmmoUser>
-							<FireModes>
-							</FireModes>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ChjAndroidGun_RebelRifle"]/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>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>ChjAndroidGun_Rebelpistol</defName>
-							<statBases>
-								<SightsEfficiency>0.70</SightsEfficiency>
-								<ShotSpread>0.2</ShotSpread>
-								<SwayFactor>1.40</SwayFactor>
-								<Bulk>3.00</Bulk>
-								<Mass>1.20</Mass>
-								<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-							</statBases>
-
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>9</range>
-								<soundCast>Shot_ChargeRifle</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>6</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
-							</AmmoUser>
-							<FireModes>
-							</FireModes>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ChjAndroidGun_Rebelpistol"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>grip</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>1.54</cooldownTime>
-										<chanceFactor>1.5</chanceFactor>
-										<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>muzzle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>1.54</cooldownTime>
-										<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Anima Animals - Community Temp/AnimaAnimalsResources_Leathers.xml b/Patches/Anima Animals - Community Temp/AnimaAnimalsResources_Leathers.xml
deleted file mode 100644
index 3988dfd84c..0000000000
--- a/Patches/Anima Animals - Community Temp/AnimaAnimalsResources_Leathers.xml	
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Anima Animals - Community Pack (temp)[HH]</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Anima Thrumbofur -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_AnimaThrumbo"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.95</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_AnimaThrumbo"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.15</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- Anima Warg -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_OPAnimaWarg"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.075</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Leather_OPAnimaWarg"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.06</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- Anima Bear -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_AnimaBear"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.09</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_AnimaBear"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.076</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- Anima Wool -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoolAnimaYak"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.02</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoolAnimaYak"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.064</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Anima Animals - Community Temp/AnimaWeapons.xml b/Patches/Anima Animals - Community Temp/AnimaWeapons.xml
deleted file mode 100644
index 5ec867c258..0000000000
--- a/Patches/Anima Animals - Community Temp/AnimaWeapons.xml	
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Anima Animals - Community Pack (temp)[HH]</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Anima Thrumbo Horn -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="AnimaThrumboHorn"]/tools</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="AnimaThrumboHorn"]/equippedStatOffsets</xpath>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="AnimaThrumboHorn"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>ResourceBase</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AnimaThrumboHorn"]/statBases/Mass</xpath>
-					<value>
-						<Mass>50</Mass>
-						<Bulk>25</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AnimaThrumboHorn"]/description</xpath>
-					<value>
-						<description>An anima thrumbo's horn. It's razor-sharp, rock-hard. This is a true trophy.</description>
-					</value>
-				</li>
-
-				<!-- ========== Anima Warg Fang / Razorfang Knife ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AnimaWargFang"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.18</cooldownTime>
-								<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.28</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.26</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.38</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_RazorfangKnife"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.18</cooldownTime>
-								<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.36</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.26</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.48</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AnimaWargFang" or defName="MeleeWeapon_RazorfangKnife"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AnimaWargFang" or defName="MeleeWeapon_RazorfangKnife"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.5</MeleeCritChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-							<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AnimaWargFang" or defName="MeleeWeapon_RazorfangKnife"]</xpath>
-					<value>
-						<weaponTags>
-							<li>CE_Sidearm_Melee</li>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Anima Animals - Community Temp/ThingDefs_AnimaCreatures.xml b/Patches/Anima Animals - Community Temp/ThingDefs_AnimaCreatures.xml
deleted file mode 100644
index b90dc3d7be..0000000000
--- a/Patches/Anima Animals - Community Temp/ThingDefs_AnimaCreatures.xml	
+++ /dev/null
@@ -1,665 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Anima Animals - Community Pack (temp)[HH]</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== AnimaThrumbo ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AnimaThrumbo"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.09</MeleeDodgeChance>
-						<MeleeCritChance>0.76</MeleeCritChance>
-						<MeleeParryChance>0.45</MeleeParryChance>
-						<Flammability>0.6</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AnimaThrumbo"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>24</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AnimaThrumbo"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AnimaThrumbo"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.7</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AnimaThrumbo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>anima horn</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>49</power>
-								<cooldownTime>2.52</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.85</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>46</power>
-								<cooldownTime>2.52</cooldownTime>
-								<chanceFactor>0.65</chanceFactor>
-								<linkedBodyPartsGroup>HornAttackTool_2</linkedBodyPartsGroup>
-								<armorPenetrationSharp>11</armorPenetrationSharp>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>2.33</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8.840</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>2.33</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8.840</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.62</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.216</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>2.52</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AnimaThrumbo"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="AnimaThrumbo"]/combatPower</xpath>
-					<value>
-						<combatPower>500</combatPower>
-					</value>
-				</li>
-
-				<!-- ========== AnimaWarg ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AnimaWarg"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AnimaWarg"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>7</MoveSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AnimaWarg"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>0.085</ArmorRating_Blunt>
-						<ArmorRating_Sharp>0.065</ArmorRating_Sharp>
-						<MeleeDodgeChance>0.21</MeleeDodgeChance>
-						<MeleeCritChance>0.20</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AnimaWarg"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.19</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>24</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>2.450</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.95</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.19</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>24</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>2.450</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.95</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>1.46</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>24</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<chanceFactor>2</chanceFactor>
-								<armorPenetrationSharp>1.05</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.263</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>3.2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.425</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AnimaWarg"]/race/wildness</xpath>
-					<value>
-						<wildness>0.3</wildness>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="AnimaWarg"]/combatPower</xpath>
-					<value>
-						<combatPower>160</combatPower>
-					</value>
-				</li>
-
-				<!-- ========== Anima Bear ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AnimaBear"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AnimaBear"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>5.7</MoveSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AnimaBear"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.17</MeleeDodgeChance>
-						<MeleeCritChance>0.19</MeleeCritChance>
-						<MeleeParryChance>0.17</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="AnimaBear"]/tools</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AnimaBear"]/race/wildness</xpath>
-					<value>
-						<wildness>0.6</wildness>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="AnimaBear"]/combatPower</xpath>
-					<value>
-						<combatPower>170</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AnimaBear"]</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.41</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>24</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.35</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.85</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.41</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>24</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.35</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.85</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>34</power>
-								<cooldownTime>2.05</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>26</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.05</armorPenetrationSharp>
-								<armorPenetrationBlunt>8.850</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>2.22</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>4.435</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== AnimaYak ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AnimaYak"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>5</MoveSpeed>
-						<MeleeDodgeChance>0.11</MeleeDodgeChance>
-						<MeleeCritChance>0.21</MeleeCritChance>
-						<MeleeParryChance>0.20</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AnimaYak"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.66</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.85</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>horns</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2.05</cooldownTime>
-								<restrictedGender>Female</restrictedGender>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.95</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>horns</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>2.05</cooldownTime>
-								<restrictedGender>Male</restrictedGender>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.85</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AnimaYak"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="AnimaYak"]/combatPower</xpath>
-					<value>
-						<combatPower>75</combatPower>
-					</value>
-				</li>
-
-				<!-- ========== Anima Muffalo ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AnimaMuffalo"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>5</MoveSpeed>
-						<MeleeDodgeChance>0.14</MeleeDodgeChance>
-						<MeleeCritChance>0.32</MeleeCritChance>
-						<MeleeParryChance>0.24</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AnimaMuffalo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>3.17</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AnimaMuffalo"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Anima Fox ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AnimaFox"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AnimaFox"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.28</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-						<MeleeParryChance>0.02</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AnimaFox"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.91</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.20</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.91</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.20</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.49</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>1.640</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Anima Megaspider ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AnimaMegaspider"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4.5</MoveSpeed>
-						<MeleeDodgeChance>0.07</MeleeDodgeChance>
-						<MeleeCritChance>0.31</MeleeCritChance>
-						<MeleeParryChance>0.17</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AnimaMegaspider"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>42</armorPenetrationSharp>
-								<armorPenetrationBlunt>23</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>45</power>
-								<cooldownTime>2.48</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>7.85</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationSharp>42</armorPenetrationSharp>
-								<armorPenetrationBlunt>24</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AnimaMegaspider"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>10</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AnimaMegaspider"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AnimaMegaspider"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>1.8</baseHealthScale>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AnimaMegaspider"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>750</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Anima Bionics/Hediffs_Anima_Bionics.xml b/Patches/Anima Bionics/Hediffs_Anima_Bionics.xml
deleted file mode 100644
index b8eaf3e43f..0000000000
--- a/Patches/Anima Bionics/Hediffs_Anima_Bionics.xml	
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Anima Bionics</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-
-			<operations>
-
-				<!-- ===== V1 ===== -->
-
-				<!-- Anima War Arm -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AnimaWarArmHeddiff"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Scythe</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.29</cooldownTime>
-								<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.76</armorPenetrationSharp>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== V2 ===== -->
-
-				<!-- ===== V3 ===== -->
-
-				<!-- Anima Plate -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AnimaPlateHediff"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AnimaPlateHediff"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.8</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Anima Spine -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="AnimaspineHediff"]/stages/li/statOffsets</xpath>
-					<value>
-						<CarryWeight>10</CarryWeight>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AnimaspineHediff"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AnimaspineHediff"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Anima Gear/AnimaGear_Apparel.xml b/Patches/Anima Gear/AnimaGear_Apparel.xml
deleted file mode 100644
index 1a26f1ebf9..0000000000
--- a/Patches/Anima Gear/AnimaGear_Apparel.xml	
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Anima Gear</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Anima Tribalwear -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_AnimaTribal"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_AnimaTribal"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>0.03</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_AnimaTribal"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>0.045</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Anima Crown -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_AnimaCrown"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_AnimaCrown"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_AnimaCrown"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.15</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Anima War Mask & Veil -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_AnimaWarMask" or defName="Apparel_AnimaWarVeil"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_AnimaWarMask" or defName="Apparel_AnimaWarVeil"]/equippedStatOffsets</xpath>
-					<value>
-						<Suppressability>-0.25</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_AnimaWarMask"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_AnimaWarMask"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.15</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_AnimaWarVeil"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.01</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_AnimaWarVeil"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>0.015</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Anima Gear/AnimaGear_Resources.xml b/Patches/Anima Gear/AnimaGear_Resources.xml
deleted file mode 100644
index 478d832ecc..0000000000
--- a/Patches/Anima Gear/AnimaGear_Resources.xml	
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Anima Gear</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Anima Fiber, has the same base stats as cloth. -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AnimaFiber"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.01</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AnimaFiber"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.015</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AnimaFiber"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.044</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Anima Gear/PsychicWeapons.xml b/Patches/Anima Gear/PsychicWeapons.xml
deleted file mode 100644
index 519e5883fe..0000000000
--- a/Patches/Anima Gear/PsychicWeapons.xml	
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Anima Gear</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Anima Staff ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_AnimaStaff"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2.85</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>1.69</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_AnimaStaff"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<MeleeCounterParryBonus>0.93</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_AnimaStaff"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>1.00</MeleeCritChance>
-						<MeleeParryChance>0.70</MeleeParryChance>
-						<MeleeDodgeChance>0.47</MeleeDodgeChance>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Animal Armor - Vanilla/ThingDefs_Apparel.xml b/Patches/Animal Armor - Vanilla/ThingDefs_Apparel.xml
deleted file mode 100644
index 77cc88e08e..0000000000
--- a/Patches/Animal Armor - Vanilla/ThingDefs_Apparel.xml	
+++ /dev/null
@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Animal Armor: Vanilla</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Scarf === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_AnimalScarf"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Apparel_AnimalScarf"]/statBases/ArmorRating_Sharp</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_AnimalScarf"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- === Animal Clothing === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_AnimalClothes"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>4</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_AnimalClothes"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>12</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- === Bridle and Howdah === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_bridle" or defName="Apparel_Howdah"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>25</CarryWeight>
-							<CarryBulk>15</CarryBulk>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_bridle" or defName="Apparel_Howdah"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>4</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_bridle" or defName="Apparel_Howdah"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>15</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- === Plate Armor === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_AnimalPlateArmor"]/statBases</xpath>
-					<value>
-						<Bulk>35</Bulk>
-						<WornBulk>7</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_AnimalPlateArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- === Simple Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_AnimalPlateHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_AnimalPlateHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- === Flak Armor === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_AnimalFlakArmor"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_AnimalFlakArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_AnimalFlakArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>10</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- === Advanced Helmet === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_AnimalAdvancedHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_AnimalAdvancedHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- === Power Armor === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_AnimalPowerArmor"]/statBases</xpath>
-					<value>
-						<Bulk>50</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_AnimalPowerArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_AnimalPowerArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>45</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_AnimalPowerArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<CarryWeight>60</CarryWeight>
-						<CarryBulk>10</CarryBulk>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-					</value>
-				</li>
-
-				<!-- === Power Armor Helmet === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_AnimalPowerArmorHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_AnimalPowerArmorHelmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_AnimalPowerArmorHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>240</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_AnimalPowerArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_AnimalPowerArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>36</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Apparel_AnimalPowerArmorHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Apparel_AnimalPowerArmorHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_AnimalPowerArmorHelmet"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Animal Equipment/Apparel_Accessories.xml b/Patches/Animal Equipment/Apparel_Accessories.xml
deleted file mode 100644
index 05316842d3..0000000000
--- a/Patches/Animal Equipment/Apparel_Accessories.xml	
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Animal Equipment</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Scarf -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="AnimalScarfBase"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="AnimalScarfBase"]/statBases/ArmorRating_Sharp</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="AnimalScarfBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Animal Equipment/Apparel_Clothing.xml b/Patches/Animal Equipment/Apparel_Clothing.xml
deleted file mode 100644
index c46822b40b..0000000000
--- a/Patches/Animal Equipment/Apparel_Clothing.xml	
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Animal Equipment</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Clothes -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="AnimalClothesBase"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="AnimalClothesBase"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Animal Equipment/Apparel_Flak.xml b/Patches/Animal Equipment/Apparel_Flak.xml
deleted file mode 100644
index 7995997297..0000000000
--- a/Patches/Animal Equipment/Apparel_Flak.xml	
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Animal Equipment</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Flak Armor -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="AnimalFlakArmorBase"]/equippedStatOffsets</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="AnimalFlakArmorBase"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="AnimalFlakArmorBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>12</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="AnimalFlakArmorBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>18</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SmallAnimalFlakArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>100</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_LargeAnimalFlakArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>150</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SmallAnimalFlakArmor"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>60</Steel>
-							<DevilstrandCloth>20</DevilstrandCloth>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_LargeAnimalFlakArmor"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>75</Steel>
-							<DevilstrandCloth>30</DevilstrandCloth>
-						</costList>
-					</value>
-				</li>
-
-				<!-- Flak Helmet -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="AnimalFlakHelmBase"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="AnimalFlakHelmBase"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-						<ArmorRating_Blunt>15</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Apparel_SmallAnimalAdvancedHelmet" or defName="Apparel_LargeAnimalAdvancedHelmet"]/costStuffCount</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="AnimalFlakHelmBase"]/stuffCategories</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SmallAnimalAdvancedHelmet"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>25</Steel>
-							<DevilstrandCloth>10</DevilstrandCloth>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_LargeAnimalAdvancedHelmet"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>40</Steel>
-							<DevilstrandCloth>20</DevilstrandCloth>
-						</costList>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Animal Equipment/Apparel_Plate.xml b/Patches/Animal Equipment/Apparel_Plate.xml
deleted file mode 100644
index 3f8564f34a..0000000000
--- a/Patches/Animal Equipment/Apparel_Plate.xml	
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Animal Equipment</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Plate Armor -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="AnimalPlateArmorBase"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeDodgeChance>-0.1</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="AnimalPlateArmorBase"]/statBases</xpath>
-					<value>
-						<Bulk>35</Bulk>
-						<WornBulk>7</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="AnimalPlateArmorBase"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Plate Helmet -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="AnimalPlateHelmBase"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeHitChance>-1.0</MeleeHitChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="AnimalPlateHelmBase"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="AnimalPlateHelmBase"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Animal Equipment/Apparel_Riding.xml b/Patches/Animal Equipment/Apparel_Riding.xml
deleted file mode 100644
index 38109fbf6f..0000000000
--- a/Patches/Animal Equipment/Apparel_Riding.xml	
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Animal Equipment</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Riding Gear -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_bridle"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>25</CarryWeight>
-							<CarryBulk>15</CarryBulk>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_bridle"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_bridle"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Animal Equipment/Apparel_Spacer.xml b/Patches/Animal Equipment/Apparel_Spacer.xml
deleted file mode 100644
index 61e562495c..0000000000
--- a/Patches/Animal Equipment/Apparel_Spacer.xml	
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Animal Equipment</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Power Armor -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="AnimalSpacerArmorBase"]/statBases</xpath>
-					<value>
-						<Bulk>50</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="AnimalSpacerArmorBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="AnimalSpacerArmorBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>45</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="AnimalSpacerArmorBase"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<CarryWeight>60</CarryWeight>
-						<CarryBulk>10</CarryBulk>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SmallAnimalPowerArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>450</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_LargeAnimalPowerArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>550</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_SmallAnimalPowerArmor"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>30</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_LargeAnimalPowerArmor"]/costList/Plasteel</xpath>
-					<value>
-						<DevilstrandCloth>60</DevilstrandCloth>
-						<Plasteel>150</Plasteel>
-					</value>
-				</li>
-
-				<!-- Power Helm -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="AnimalSpacerHelmBase"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="AnimalSpacerHelmBase"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="AnimalSpacerHelmBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="AnimalSpacerHelmBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>36</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[@Name="AnimalSpacerHelmBase"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[@Name="AnimalSpacerHelmBase"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="AnimalSpacerHelmBase"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SmallAnimalPowerArmorHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>220</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_LargeAnimalPowerArmorHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>260</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SmallAnimalPowerArmorHelmet"]/costList/Plasteel</xpath>
-					<value>
-						<DevilstrandCloth>10</DevilstrandCloth>
-						<Plasteel>50</Plasteel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_LargeAnimalPowerArmorHelmet"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>30</DevilstrandCloth>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Animal Equipment/Apparel_VEF.xml b/Patches/Animal Equipment/Apparel_VEF.xml
deleted file mode 100644
index bae7fb2121..0000000000
--- a/Patches/Animal Equipment/Apparel_VEF.xml	
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Animal Equipment</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Expanded Framework</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Apparel_AnimalReins"]</xpath>
-						<value>
-							<equippedStatOffsets>
-								<CarryWeight>25</CarryWeight>
-								<CarryBulk>15</CarryBulk>
-							</equippedStatOffsets>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Apparel_AnimalReins"]/statBases</xpath>
-						<value>
-							<Bulk>6</Bulk>
-							<WornBulk>2</WornBulk>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="Apparel_AnimalReins"]/statBases/StuffEffectMultiplierArmor</xpath>
-						<value>
-							<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="Apparel_AnimalFlakArmor"]/statBases/MaxHitPoints</xpath>
-						<value>
-							<MaxHitPoints>110</MaxHitPoints>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="Apparel_AnimalFlakArmor"]/costList</xpath>
-						<value>
-							<costList>
-								<Steel>65</Steel>
-								<DevilstrandCloth>25</DevilstrandCloth>
-							</costList>
-						</value>
-					</li>
-
-					<li Class="PatchOperationRemove">
-						<xpath>Defs/ThingDef[defName="Apparel_AnimalAdvancedHelmet"]/costStuffCount</xpath>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="Apparel_AnimalAdvancedHelmet"]/costList</xpath>
-						<value>
-							<costList>
-								<Steel>30</Steel>
-								<DevilstrandCloth>15</DevilstrandCloth>
-							</costList>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="Apparel_AnimalPowerArmor"]/statBases/MaxHitPoints</xpath>
-						<value>
-							<MaxHitPoints>500</MaxHitPoints>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Apparel_AnimalPowerArmor"]/costList</xpath>
-						<value>
-							<DevilstrandCloth>40</DevilstrandCloth>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="Apparel_AnimalPowerArmorHelmet"]/statBases/MaxHitPoints</xpath>
-						<value>
-							<MaxHitPoints>240</MaxHitPoints>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="Apparel_AnimalPowerArmorHelmet"]/costList/Plasteel</xpath>
-						<value>
-							<DevilstrandCloth>15</DevilstrandCloth>
-							<Plasteel>60</Plasteel>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj-VanillaStyle_CE_Patch_StuffRebalance.xml b/Patches/AnimalCollabProj/AnimalCollabProj-VanillaStyle_CE_Patch_StuffRebalance.xml
deleted file mode 100644
index 002634f848..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj-VanillaStyle_CE_Patch_StuffRebalance.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Clear these out all at once so we can just replace them easily -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="Leather_ACP" or
-						defName="ACPFerretSilk" or
-						defName="ACPBDireWolfWool" or
-						defName="ACPSpidersilk" or
-						defName="ACPLlamaWool" or
-						@Name="WoolBaseACP"
-						]/statBases/StuffPower_Armor_Sharp |
-						Defs/ThingDef[
-						defName="Leather_ACP" or
-						defName="ACPFerretSilk" or
-						defName="ACPBDireWolfWool" or
-						defName="ACPSpidersilk" or
-						defName="ACPLlamaWool" or
-						@Name="WoolBaseACP"
-						]/statBases/StuffPower_Armor_Blunt </xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Leather_ACP"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.33</StuffPower_Armor_Sharp>
-						<StuffPower_Armor_Blunt>0.165</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPFerretSilk"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.25</StuffPower_Armor_Sharp>
-						<StuffPower_Armor_Blunt>0.12</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPBDireWolfWool"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.35</StuffPower_Armor_Sharp>
-						<StuffPower_Armor_Blunt>0.17</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPSpidersilk"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.30</StuffPower_Armor_Sharp>
-						<StuffPower_Armor_Blunt>0.14</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPLlamaWool"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.20</StuffPower_Armor_Sharp>
-						<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="WoolBaseACP"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.044</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_AddClass.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_AddClass.xml
deleted file mode 100644
index f364012ea0..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_AddClass.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>
-						Defs/ThingDef[
-						defName="ACPBlackRhinoceros" or
-						defName="ACPBlackwolf" or
-						defName="ACPDirewolf" or
-						defName="ACPHippopotamus" or
-						defName="ACPHorse" or
-						defName="ACPLlama" or
-						defName="ACPMajoreraGoat" or
-						defName="ACPPeccary" or
-						defName="ACPSpiritwolf" or
-						defName="ACPSpiritwolfFF" or
-						defName="ACPTapir" or
-						defName="ACPWildDog" or
-						defName="ACPWoolyHorse" or
-						defName="ACPWoolyRhino"
-						]
-					</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>
-						Defs/ThingDef[
-						defName="ACPAcidAnt" or
-						defName="ACPAngoraRabbit" or
-						defName="ACPChipmunk" or
-						defName="ACPDuckBilledPlatypus" or
-						defName="ACPDomesticRabbit" or
-						defName="ACPErmine" or
-						defName="ACPFerret" or
-						defName="ACPFishercat" or
-						defName="ACPHaulerAnt" or
-						defName="ACPHedgehog" or
-						defName="ACPHoneyBadger" or
-						defName="ACPJackalope" or
-						defName="ACPKomodo" or
-						defName="ACPMegabadger" or
-						defName="ACPMegaFerret" or
-						defName="ACPMegascorpion" or
-						defName="ACPMunchkinCat" or
-						defName="ACPOtter" or
-						defName="ACPPorcupine" or
-						defName="ACPRedPanda" or
-						defName="ACPSilkspider" or
-						defName="ACPSpottedSeal" or
-						defName="ACPThornyDevil" or
-						defName="ACPWalrus" or
-						defName="ACPXenguana" or
-						defName="ACPXGecko"
-						]
-					</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>
-						Defs/ThingDef[
-						defName="ACPGiraffe" or
-						defName="ACPFlamingo" or
-						defName="ACPGreatBustard" or
-						defName="ACPKiwi" or
-						defName="ACPPenguin" or
-						defName="ACPPtarmigan" or
-						defName="ACPSilkieChicken" or
-						defName="ACPValleyQuail"
-						]
-					</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Damages.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Damages.xml
deleted file mode 100644
index c032566bb0..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Damages.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/DamageDef[defName="PlatypusSting"]</xpath>
-					<value>
-						<hediff>PlatypusVenom</hediff>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/DamageDef[defName="PlatypusSting"]/additionalHediffs/li[hediff="PlatypusVenom"]</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/DamageDef[defName="ScorpionSting"]</xpath>
-					<value>
-						<hediff>ScorpionVenom</hediff>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/DamageDef[defName="ScorpionSting"]/additionalHediffs/li[hediff="ScorpionVenom"]</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Hediffs.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Hediffs.xml
deleted file mode 100644
index 95aca80c63..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Hediffs.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="PlatypusVenom"]</xpath>
-					<value>
-						<HediffDef ParentName="HediffBite">
-							<defName>PlatypusVenom</defName>
-							<label>platypus venom sting</label>
-							<labelNoun>the venom from a platypus' spur</labelNoun>
-							<comps>
-								<li Class="CombatExtended.HediffCompProperties_Venom">
-									<!-- 0.25x as potent as vanilla CE venom hediffs -->
-									<VenomPerSeverity>0.00000335</VenomPerSeverity>
-									<MinTicks>10000</MinTicks>
-									<MaxTicks>15000</MaxTicks>
-								</li>
-							</comps>
-						</HediffDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ScorpionVenom"]</xpath>
-					<value>
-						<HediffDef ParentName="HediffBite">
-							<defName>ScorpionVenom</defName>
-							<label>scorpion venom sting</label>
-							<labelNoun>scorpion venom</labelNoun>
-							<comps>
-								<li Class="CombatExtended.HediffCompProperties_Venom">
-									<!-- 0.25x as potent as vanilla CE venom hediffs -->
-									<VenomPerSeverity>0.00000335</VenomPerSeverity>
-									<MinTicks>10000</MinTicks>
-									<MaxTicks>45000</MaxTicks>
-								</li>
-							</comps>
-						</HediffDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Misc.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Misc.xml
deleted file mode 100644
index 3dce51b099..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Misc.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Walrus Tusk -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="ACPWalrusTusk"]/tools</xpath>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="ACPWalrusTusk"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>ResourceBase</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPWalrusTusk"]/statBases/Mass</xpath>
-					<value>
-						<Mass>5</Mass>
-						<Bulk>13</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPWalrusTusk"]/description</xpath>
-					<value>
-						<description>A walrus' tusk. Very durable and valuable.</description>
-					</value>
-				</li>
-
-				<!-- Carapace Helmet -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_ACPCarapaceHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ACPCarapaceHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2.25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ACPCarapaceHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4.75</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Angora.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Angora.xml
deleted file mode 100644
index 562935f335..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Angora.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPAngoraRabbit"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.24</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPAngoraRabbit"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_BRhino.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_BRhino.xml
deleted file mode 100644
index a866435df8..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_BRhino.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPBlackRhinoceros"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.52</MeleeCritChance>
-						<MeleeParryChance>0.27</MeleeParryChance>
-						<ArmorRating_Blunt>8</ArmorRating_Blunt>
-						<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPBlackRhinoceros"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>3.17</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>3.17</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool_2</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2.44</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>2.95</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Bison.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Bison.xml
deleted file mode 100644
index e5f594328d..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Bison.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ACPBison"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPBison"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.11</MeleeDodgeChance>
-						<MeleeCritChance>0.37</MeleeCritChance>
-						<MeleeParryChance>0.22</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPBison"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>5.6</MoveSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPBison"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>3.09</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>9</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Blackbear.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Blackbear.xml
deleted file mode 100644
index 58ebe8fa69..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Blackbear.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPBlackbear"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.19</MeleeCritChance>
-						<MeleeParryChance>0.11</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPBlackbear"]</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.41</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.41</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>31</power>
-								<cooldownTime>2.05</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.85</armorPenetrationSharp>
-								<armorPenetrationBlunt>8.450</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.22</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>4.235</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Cats.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Cats.xml
deleted file mode 100644
index 7e50edbcd4..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Cats.xml
+++ /dev/null
@@ -1,325 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Lion ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPLion"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.135</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.6345</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.135</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.6345</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.375</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.530</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Tiger ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPTiger"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.135</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.6345</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.135</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.6345</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.375</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.530</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Cheetah ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPCheetah"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>0.92</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>0.92</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.690</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Amur and Snow Leopards ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="ACPAmurLeopard" or
-						defName="ACPSnowLeopard"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>0.92</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>0.92</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.690</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Chipmunk.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Chipmunk.xml
deleted file mode 100644
index 7c408e4e71..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Chipmunk.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPChipmunk"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.0</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPChipmunk"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.67</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.67</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.88</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>3.00</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_DomesticCats.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_DomesticCats.xml
deleted file mode 100644
index 24508b953a..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_DomesticCats.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPMunchkinCat"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-						<MeleeParryChance>0.06</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPMunchkinCat"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.55</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.55</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.85</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.254</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>0.55</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_DomesticRabbit.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_DomesticRabbit.xml
deleted file mode 100644
index d15539898f..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_DomesticRabbit.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPDomesticRabbit"]</xpath>
-					<value>
-						<statBases>
-							<MeleeDodgeChance>0.24</MeleeDodgeChance>
-							<MeleeCritChance>0.02</MeleeCritChance>
-							<MeleeParryChance>0.06</MeleeParryChance>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPDomesticRabbit"]</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Duck.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Duck.xml
deleted file mode 100644
index 89d92fe2b8..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Duck.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ACPDuck"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPDuck"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.14</MeleeDodgeChance>
-						<MeleeCritChance>0.0</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPDuck"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.162</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.162</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.52</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.284</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_DuckBilledPlatypus.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_DuckBilledPlatypus.xml
deleted file mode 100644
index 45d3203ae1..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_DuckBilledPlatypus.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPDuckBilledPlatypus"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.07</MeleeDodgeChance>
-						<MeleeCritChance>0.11</MeleeCritChance>
-						<MeleeParryChance>0.02</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPDuckBilledPlatypus"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>spurs</label>
-								<capacities>
-									<li>PlatypusSting</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.9</cooldownTime>
-								<linkedBodyPartsGroup>Spurs</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.06</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.33</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.162</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.162</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Ferret.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Ferret.xml
deleted file mode 100644
index aa90589f71..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Ferret.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPFerret"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.27</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.02</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPFerret"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.67</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.67</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.88</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>3.00</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Flamingo.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Flamingo.xml
deleted file mode 100644
index 542b21846d..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Flamingo.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPFlamingo"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.22</MeleeDodgeChance>
-						<MeleeCritChance>0.11</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPFlamingo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.480</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2.08</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.480</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2.08</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.480</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Giraffe.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Giraffe.xml
deleted file mode 100644
index eaa84abaf4..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Giraffe.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPGiraffe"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.08</MeleeDodgeChance>
-						<MeleeCritChance>0.61</MeleeCritChance>
-						<MeleeParryChance>0.37</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPGiraffe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.66</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.750</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.97</cooldownTime>
-								<restrictedGender>Female</restrictedGender>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Goat.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Goat.xml
deleted file mode 100644
index e824f37a88..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Goat.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPMajoreraGoat"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.17</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPMajoreraGoat"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.12</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Goose.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Goose.xml
deleted file mode 100644
index a2d91595ad..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Goose.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="GooseThingBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="GooseThingBase"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.02</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="GooseThingBase"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.92</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.08</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.352</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.58</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.16</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.92</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.352</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_GreatBustard.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_GreatBustard.xml
deleted file mode 100644
index cf4a4254ec..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_GreatBustard.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPGreatBustard"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.22</MeleeDodgeChance>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>0.13</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPGreatBustard"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.480</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2.08</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.480</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2.08</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.480</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_GuineaPig.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_GuineaPig.xml
deleted file mode 100644
index 99291d910c..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_GuineaPig.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ACPGuineaPig"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPGuineaPig"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.14</MeleeDodgeChance>
-						<MeleeCritChance>0.00</MeleeCritChance>
-						<MeleeParryChance>0.00</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPGuineaPig"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2.01</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.025</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2.01</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.025</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.84</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.144</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>3.00</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Hedgehog.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Hedgehog.xml
deleted file mode 100644
index bb7184cbe4..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Hedgehog.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPHedgehog"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.17</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPHedgehog"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>quills</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>Quills</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>0.95</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Hippo.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Hippo.xml
deleted file mode 100644
index b41fa759ef..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Hippo.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPHippopotamus"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.08</MeleeDodgeChance>
-						<MeleeCritChance>0.64</MeleeCritChance>
-						<MeleeParryChance>0.45</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPHippopotamus"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>6.75</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>6.75</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_HoneyBadger.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_HoneyBadger.xml
deleted file mode 100644
index c5725d6345..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_HoneyBadger.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPHoneyBadger"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.21</MeleeDodgeChance>
-						<MeleeCritChance>0.31</MeleeCritChance>
-						<MeleeParryChance>0.08</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPHoneyBadger"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Horse.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Horse.xml
deleted file mode 100644
index c9a192aeed..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Horse.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="ACPHorse" or
-						defName="ACPWoolyHorse"
-						]/statBases </xpath>
-					<value>
-						<MeleeDodgeChance>0.11</MeleeDodgeChance>
-						<MeleeCritChance>0.30</MeleeCritChance>
-						<MeleeParryChance>0.19</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="ACPHorse" or
-						defName="ACPWoolyHorse"
-						]/statBases/MoveSpeed </xpath>
-					<value>
-						<MoveSpeed>5</MoveSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="ACPHorse" or
-						defName="ACPWoolyHorse"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.97</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.12</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Insects.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Insects.xml
deleted file mode 100644
index 4fb02a7ad6..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Insects.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Silk Spider ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPSilkspider"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPSilkspider"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.02</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>2.5</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.01</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Hauler Ant ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPHaulerAnt"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.08</MeleeDodgeChance>
-						<MeleeCritChance>0.34</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPHaulerAnt"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.5</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.02</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Acid Ant ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPAcidAnt"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.24</MeleeDodgeChance>
-						<MeleeCritChance>0.08</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPAcidAnt"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.02</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>AcidBite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.01</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Jackalope.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Jackalope.xml
deleted file mode 100644
index 3a4494047b..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Jackalope.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPJackalope"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPJackalope"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>antlers</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Antlers</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.750</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Kiwi.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Kiwi.xml
deleted file mode 100644
index 7f24253683..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Kiwi.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPKiwi"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.28</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPKiwi"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.39</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.096</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.39</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.096</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Komodo.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Komodo.xml
deleted file mode 100644
index cd3d3b09ac..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Komodo.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPKomodo"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.08</MeleeDodgeChance>
-						<MeleeCritChance>0.4</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPKomodo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.19</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.19</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.375</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Lizard.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Lizard.xml
deleted file mode 100644
index c08b6dc6fb..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Lizard.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPXenguana"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.16</MeleeDodgeChance>
-						<MeleeCritChance>0.18</MeleeCritChance>
-						<MeleeParryChance>0.03</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPXenguana"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.06</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.06</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.89</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.50</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>4.24</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPXGecko"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.22</MeleeDodgeChance>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>0.04</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPXGecko"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.89</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.250</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Llama.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Llama.xml
deleted file mode 100644
index 2a110c782b..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Llama.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPLlama"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.14</MeleeDodgeChance>
-						<MeleeCritChance>0.06</MeleeCritChance>
-						<MeleeParryChance>0.07</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPLlama"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.19</cooldownTime>
-								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.19</cooldownTime>
-								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.19</cooldownTime>
-								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.19</cooldownTime>
-								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>0.84</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.05</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.97</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Martens.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Martens.xml
deleted file mode 100644
index e77b6b4b54..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Martens.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="ACPFishercat" or
-						defName="ACPErmine"
-						]/statBases </xpath>
-					<value>
-						<MeleeDodgeChance>0.24</MeleeDodgeChance>
-						<MeleeCritChance>0.11</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="ACPFishercat" or
-						defName="ACPErmine"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.67</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.67</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.88</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>3.00</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_MegaBadger.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_MegaBadger.xml
deleted file mode 100644
index 39949662f2..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_MegaBadger.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPMegabadger"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.11</MeleeDodgeChance>
-						<MeleeCritChance>0.43</MeleeCritChance>
-						<MeleeParryChance>0.27</MeleeParryChance>
-						<ArmorRating_Blunt>8</ArmorRating_Blunt>
-						<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPMegabadger"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.18</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.18</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>3.375</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.35</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_MegaFerret.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_MegaFerret.xml
deleted file mode 100644
index 1783cce297..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_MegaFerret.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPMegaFerret"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.41</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPMegaFerret"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.67</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.67</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>0.88</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>3.00</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Otter.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Otter.xml
deleted file mode 100644
index 74122c1570..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Otter.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPOtter"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.20</MeleeCritChance>
-						<MeleeParryChance>0.08</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPOtter"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.67</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.67</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>0.88</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>3.00</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Panda.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Panda.xml
deleted file mode 100644
index d953247e8c..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Panda.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPPanda"]</xpath>
-					<value>
-						<statBases>
-							<MeleeDodgeChance>0.18</MeleeDodgeChance>
-							<MeleeCritChance>0.17</MeleeCritChance>
-							<MeleeParryChance>0.11</MeleeParryChance>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPPanda"]</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.41</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.41</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2.05</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.85</armorPenetrationSharp>
-								<armorPenetrationBlunt>8.450</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2.22</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>4.235</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Peccary.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Peccary.xml
deleted file mode 100644
index 15dfde0208..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Peccary.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPPeccary"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						<MeleeCritChance>0.08</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPPeccary"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.12</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Penguin.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Penguin.xml
deleted file mode 100644
index ab1c25dc7c..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Penguin.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPPenguin"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.08</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPPenguin"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>4</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.162</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>6</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.162</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.284</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Porcupine.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Porcupine.xml
deleted file mode 100644
index 0390fd2082..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Porcupine.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPPorcupine"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						<MeleeCritChance>0.55</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPPorcupine"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>quills</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>Quills</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Ptarmigan.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Ptarmigan.xml
deleted file mode 100644
index d6fddfe864..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Ptarmigan.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPPtarmigan"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.22</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPPtarmigan"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.096</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.480</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Quail.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Quail.xml
deleted file mode 100644
index 593bc3cae1..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Quail.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPValleyQuail"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.24</MeleeDodgeChance>
-						<MeleeCritChance>0.03</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPValleyQuail"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.096</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.096</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.480</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_RedPanda.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_RedPanda.xml
deleted file mode 100644
index 96afe04135..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_RedPanda.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPRedPanda"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.16</MeleeDodgeChance>
-						<MeleeCritChance>0.03</MeleeCritChance>
-						<MeleeParryChance>0.02</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPRedPanda"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.55</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>7</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.55</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>7</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.85</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>8</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.254</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.55</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Scorpions.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Scorpions.xml
deleted file mode 100644
index 8acfee4e8c..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Scorpions.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPMegascorpion"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						<MeleeCritChance>0.33</MeleeCritChance>
-						<MeleeParryChance>0.17</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPMegascorpion"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stinger</label>
-								<capacities>
-									<li>ScorpionSting</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.55</cooldownTime>
-								<linkedBodyPartsGroup>StingerAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.535</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>pincer</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.9</cooldownTime>
-								<linkedBodyPartsGroup>PincerAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Seal.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Seal.xml
deleted file mode 100644
index 0e73c632ff..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Seal.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPSpottedSeal"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.09</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0.03</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPSpottedSeal"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Silkie.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Silkie.xml
deleted file mode 100644
index 0fc22ccd16..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Silkie.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPSilkieChicken"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPSilkieChicken"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.39</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.096</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.39</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.096</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.192</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Tapir.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Tapir.xml
deleted file mode 100644
index e9fb9ce8d8..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Tapir.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPTapir"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						<MeleeCritChance>0.07</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPTapir"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2.12</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_ThornyDevil.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_ThornyDevil.xml
deleted file mode 100644
index 6deffeb603..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_ThornyDevil.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPThornyDevil"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						<MeleeCritChance>0.18</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPThornyDevil"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.89</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.250</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Walrus.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Walrus.xml
deleted file mode 100644
index fdbbf465f2..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Walrus.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPWalrus"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.06</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.08</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPWalrus"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tusk</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.89</cooldownTime>
-								<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>tusk</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.41</cooldownTime>
-								<chanceFactor>0.65</chanceFactor>
-								<linkedBodyPartsGroup>TuskAttackTool_2</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.940</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_WildDog.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_WildDog.xml
deleted file mode 100644
index 3cfe17893d..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_WildDog.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPWildDog"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.26</MeleeDodgeChance>
-						<MeleeCritChance>0.09</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPWildDog"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>17</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.380</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Wolves.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Wolves.xml
deleted file mode 100644
index 376c8c0f5b..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Wolves.xml
+++ /dev/null
@@ -1,251 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Dire wolf ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPDirewolf"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						<MeleeCritChance>0.30</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-						<ArmorRating_Sharp>3.5</ArmorRating_Sharp>
-						<ArmorRating_Blunt>5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPDirewolf"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.900</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.075</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.900</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.075</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.65</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.225</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Black dire wolf ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPBlackwolf"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.26</MeleeDodgeChance>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-						<ArmorRating_Sharp>3.5</ArmorRating_Sharp>
-						<ArmorRating_Blunt>5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPBlackwolf"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.900</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.075</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.900</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.075</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.65</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.225</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Spirit wolf ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="ACPSpiritwolf" or
-						defName="ACPSpiritwolfFF"
-						]/statBases </xpath>
-					<value>
-						<MeleeDodgeChance>0.24</MeleeDodgeChance>
-						<MeleeCritChance>0.30</MeleeCritChance>
-						<MeleeParryChance>0.06</MeleeParryChance>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-						<ArmorRating_Blunt>21</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="ACPSpiritwolf" or
-						defName="ACPSpiritwolfFF"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>1.80</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>1.80</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>24</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.86</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.225</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Woolyrhino.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Woolyrhino.xml
deleted file mode 100644
index d1784abe38..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Woolyrhino.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-			<li>Animal Collab Project Vanilla-Style</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPWoolyRhino"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.10</MeleeDodgeChance>
-						<MeleeCritChance>0.50</MeleeCritChance>
-						<MeleeParryChance>0.30</MeleeParryChance>
-						<ArmorRating_Blunt>8</ArmorRating_Blunt>
-						<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ACPWoolyRhino"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_StuffRebalance.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_StuffRebalance.xml
deleted file mode 100644
index f20880f5aa..0000000000
--- a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_StuffRebalance.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>AnimalCollabProj</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Clear these out all at once so we can just replace them easily -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="Leather_ACP" or
-						defName="ACPFerretSilk" or
-						defName="ACPBDireWolfWool" or
-						defName="ACPSpidersilk" or
-						defName="ACPLlamaWool" or
-						@Name="ACPWoolBase"
-						]/statBases/StuffPower_Armor_Sharp |
-						Defs/ThingDef[
-						defName="Leather_ACP" or
-						defName="ACPFerretSilk" or
-						defName="ACPBDireWolfWool" or
-						defName="ACPSpidersilk" or
-						defName="ACPLlamaWool" or
-						@Name="ACPWoolBase"
-						]/statBases/StuffPower_Armor_Blunt </xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Leather_ACP"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.33</StuffPower_Armor_Sharp>
-						<StuffPower_Armor_Blunt>0.165</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPFerretSilk"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.25</StuffPower_Armor_Sharp>
-						<StuffPower_Armor_Blunt>0.12</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPBDireWolfWool"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.35</StuffPower_Armor_Sharp>
-						<StuffPower_Armor_Blunt>0.17</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPSpidersilk"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.30</StuffPower_Armor_Sharp>
-						<StuffPower_Armor_Blunt>0.14</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ACPLlamaWool"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.20</StuffPower_Armor_Sharp>
-						<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="ACPWoolBase"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.2</StuffPower_Armor_Sharp>
-						<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Anthro Race/Anthro_Bodytype.xml b/Patches/Anthro Race/Anthro_Bodytype.xml
deleted file mode 100644
index dae863c8cd..0000000000
--- a/Patches/Anthro Race/Anthro_Bodytype.xml	
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Anthro Race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Outside Squishy-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Anthro"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "right eye"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Anthro"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "left eye"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Anthro"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Anthro"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<!--Arm Groups-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Anthro"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
-					<value>
-						<li>LeftArm</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Anthro"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
-					<value>
-						<li>RightArm</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Anthro"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
-					<value>
-						<li>LeftShoulder</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Anthro"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
-					<value>
-						<li>RightShoulder</li>
-					</value>
-				</li>
-
-				<!--Natural Armor-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Anthro"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Anthro"]/corePart/parts/li[def="Neck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Anthro"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Anthro"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Anthro"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Anthro"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Anthro"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Anthro"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Anthro"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Anthro"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Anthro"]/corePart/parts/li[def="Leg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Anthro"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Anthro"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Anthro Race/PawnKinds_Anthro.xml b/Patches/Anthro Race/PawnKinds_Anthro.xml
deleted file mode 100644
index fcc3fb7164..0000000000
--- a/Patches/Anthro Race/PawnKinds_Anthro.xml	
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Anthro Race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Give ammo to pawns ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>
-						Defs/PawnKindDef[@Name="AnthroOutlanderBase"]
-					</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>7</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Anthro Race/Race_Anthro.xml b/Patches/Anthro Race/Race_Anthro.xml
deleted file mode 100644
index f8a1498d92..0000000000
--- a/Patches/Anthro Race/Race_Anthro.xml	
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Anthro Race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Anthro"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Anthro"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Anthro"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Anthro"]/statBases/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Anthro"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Anthro"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Anthro Race/Scenarios_Anthro.xml b/Patches/Anthro Race/Scenarios_Anthro.xml
deleted file mode 100644
index ef99d50d11..0000000000
--- a/Patches/Anthro Race/Scenarios_Anthro.xml	
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Anthro Race</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="AnthroScenarioClassic"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_44Magnum_FMJ</thingDef>
-							<count>180</count>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ScenarioDef[defName="AnthroScenarioClassic"]/scenario/parts/li[thingDef="Apparel_FlakVest"]</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Antinium/Bodies/Ant_Bodies.xml b/Patches/Antinium/Bodies/Ant_Bodies.xml
deleted file mode 100644
index 41ca90a41c..0000000000
--- a/Patches/Antinium/Bodies/Ant_Bodies.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Antinium (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Natural armor coverage -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Antinium"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Waist"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Neck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Leg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- Part squishy-ness -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Eye"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<!-- Arm and shoulder tags-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def = "Shoulder"]/parts/li[contains(./customLabel, "left arm")]/groups</xpath>
-					<value>
-						<li>LeftArm</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[contains(./customLabel, "left shoulder")]/groups</xpath>
-					<value>
-						<li>LeftShoulder</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def = "Shoulder"]/parts/li[contains(./customLabel, "right arm")]/groups</xpath>
-					<value>
-						<li>RightArm</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[contains(./customLabel, "right shoulder")]/groups</xpath>
-					<value>
-						<li>RightShoulder</li>
-					</value>
-				</li>
-
-				<!-- Coverage -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Stomach"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Heart"]/coverage</xpath>
-					<value>
-						<coverage>0.04</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Lung"]/coverage</xpath>
-					<value>
-						<coverage>0.055</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Kidney"]/coverage</xpath>
-					<value>
-						<coverage>0.03</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Liver"]/coverage</xpath>
-					<value>
-						<coverage>0.06</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Neck"]/coverage</xpath>
-					<value>
-						<coverage>0.055</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Skull"]/parts/li[def="Brain"]/coverage</xpath>
-					<value>
-						<coverage>0.9</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Eye"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ant_Antenna"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/coverage</xpath>
-					<value>
-						<coverage>0.08</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Shoulder"]/coverage</xpath>
-					<value>
-						<coverage>0.085</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Clavicle"]/coverage</xpath>
-					<value>
-						<coverage>0.06</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Humerus"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Radius"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Leg"]/parts/li[def="Femur"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Antinium"]/corePart/parts/li[def="Leg"]/parts/li[def="Tibia"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Antinium/PawnKindDefs_Ants/Ant_PawnKindsRaider.xml b/Patches/Antinium/PawnKindDefs_Ants/Ant_PawnKindsRaider.xml
deleted file mode 100644
index d63e8ad87e..0000000000
--- a/Patches/Antinium/PawnKindDefs_Ants/Ant_PawnKindsRaider.xml
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Antinium (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Ant_CannonFodder -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Ant_CannonFodder"]/combatPower</xpath>
-					<value>
-						<combatPower>20</combatPower>
-					</value>
-				</li>
-
-				<!-- Ant_Combatant -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Ant_Combatant"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>40</min>
-								<max>100</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.6</shieldChance>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Ant_Combatant"]/combatPower</xpath>
-					<value>
-						<combatPower>25</combatPower>
-					</value>
-				</li>
-
-				<!-- Ant_Soldier -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Ant_Soldier"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>100</min>
-								<max>200</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.9</shieldChance>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Ant_Soldier"]/combatPower</xpath>
-					<value>
-						<combatPower>35</combatPower>
-					</value>
-				</li>
-
-				<!-- Ant_Bowman -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Ant_Bowman"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>15</min>
-								<max>30</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>80</min>
-								<max>120</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.6</shieldChance>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>60</min>
-										<max>120</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Tribal</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Ant_Bowman"]/combatPower</xpath>
-					<value>
-						<combatPower>35</combatPower>
-					</value>
-				</li>
-
-				<!-- Ant_Archer -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Ant_Archer"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>20</min>
-								<max>40</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>100</min>
-								<max>175</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.6</shieldChance>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>80</min>
-										<max>160</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Tribal</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Ant_Archer"]/combatPower</xpath>
-					<value>
-						<combatPower>45</combatPower>
-					</value>
-				</li>
-
-				<!-- Ant_SpecialArcher -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Ant_SpecialArcher"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>10</min>
-								<max>40</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>100</min>
-								<max>180</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.6</shieldChance>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>120</min>
-										<max>360</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Tribal</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<!-- Removing the smokepop belt requirement -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/PawnKindDef[defName="Ant_SpecialArcher"]/apparelRequired</xpath>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Ant_SpecialArcher"]/combatPower</xpath>
-					<value>
-						<combatPower>65</combatPower>
-					</value>
-				</li>
-
-				<!-- Ant_Warrior -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Ant_Warrior"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>180</min>
-								<max>300</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.9</shieldChance>
-						</li>
-					</value>
-				</li>
-				<!-- Removing the shield belt requirement -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/PawnKindDef[defName="Ant_Warrior"]/apparelRequired</xpath>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Ant_Warrior"]/combatPower</xpath>
-					<value>
-						<combatPower>65</combatPower>
-					</value>
-				</li>
-
-				<!-- Ant_ArmoredAntinium -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Ant_ArmoredAntinium"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>120</min>
-								<max>240</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.9</shieldChance>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Antinium/Scenarios/Ant_Scenario.xml b/Patches/Antinium/Scenarios/Ant_Scenario.xml
deleted file mode 100644
index 49436d8b37..0000000000
--- a/Patches/Antinium/Scenarios/Ant_Scenario.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Antinium (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="Ant_NewHive"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_Arrow_Stone</thingDef>
-							<count>100</count>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Antinium/ThingDefs_Misc/Ant_DrugDefs.xml b/Patches/Antinium/ThingDefs_Misc/Ant_DrugDefs.xml
deleted file mode 100644
index 5d8806c1ce..0000000000
--- a/Patches/Antinium/ThingDefs_Misc/Ant_DrugDefs.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Antinium (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Rxlvn (antinium beer) -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Ant_Rxlvn"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2.22</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>neck</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>3.33</cooldownTime>
-								<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Neck</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Antinium/ThingDefs_Misc/Ant_ThingDefs.xml b/Patches/Antinium/ThingDefs_Misc/Ant_ThingDefs.xml
deleted file mode 100644
index e3ef518e92..0000000000
--- a/Patches/Antinium/ThingDefs_Misc/Ant_ThingDefs.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Antinium (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Antinium chitin -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Ant_AntiniumChitin"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.09</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Ant_AntiniumChitin"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.035</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Antinium/ThingDefs_Races/Ant_AntiniumRace.xml b/Patches/Antinium/ThingDefs_Races/Ant_AntiniumRace.xml
deleted file mode 100644
index cb142ff5b5..0000000000
--- a/Patches/Antinium/ThingDefs_Races/Ant_AntiniumRace.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Antinium (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Antinium alien race (Ant_AntiniumRace) -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Ant_AntiniumRace"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Ant_AntiniumRace"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-				<!-- Stat bases  -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Ant_AntiniumRace"]/statBases/ShootingAccuracyPawn</xpath>
-					<value>
-						<AimingAccuracy>0.8</AimingAccuracy>
-						<MeleeCritChance>1.17</MeleeCritChance>
-						<MeleeParryChance>1.05</MeleeParryChance>
-						<ReloadSpeed>1.5</ReloadSpeed><!-- Extra hands means extra speed when reloading -->
-						<CarryWeight>60</CarryWeight><!-- Ants can lift more than they weight irl -->
-						<Mass>72</Mass><!-- A human weighs 60 kg, but ants have chitin so mass is increased -->
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Ant_AntiniumRace"]/statBases/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.9</MeleeDodgeChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Ant_AntiniumRace"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.33</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Ant_AntiniumRace"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2.5</ArmorRating_Blunt>
-					</value>
-				</li>
-				<!-- Unarmed attacks -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Ant_AntiniumRace"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.09</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.441</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.09</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.441</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>lower left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.09</cooldownTime>
-								<linkedBodyPartsGroup>LowerLeftHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.441</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>lower right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.09</cooldownTime>
-								<linkedBodyPartsGroup>LowerRightHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.441</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.95</cooldownTime>
-								<linkedBodyPartsGroup>Ant_Mandibles</linkedBodyPartsGroup>
-								<chanceFactor>0.1</chanceFactor>
-								<armorPenetrationBlunt>1.533</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>4.64</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.766</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- Race stats -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Ant_AntiniumRace"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>1.2</baseHealthScale>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Antinium/TraderKindDefs/Ant_TraderKinds.xml b/Patches/Antinium/TraderKindDefs/Ant_TraderKinds.xml
deleted file mode 100644
index e7548787eb..0000000000
--- a/Patches/Antinium/TraderKindDefs/Ant_TraderKinds.xml
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Antinium (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Antinium base trader -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="Ant_Base_Standard"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_Category">
-							<categoryDef>Ammo</categoryDef>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>0</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Category">
-							<categoryDef>WeaponsTurrets</categoryDef>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>0</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Animals">
-							<tradeTagsSell>
-								<li>CE_AnimalBoom</li>
-							</tradeTagsSell>
-							<tradeTagsBuy>
-								<li>CE_AnimalBoom</li>
-							</tradeTagsBuy>
-							<kindCountRange>
-								<min>1</min>
-								<max>2</max>
-							</kindCountRange>
-							<countRange>
-								<min>-2</min>
-								<max>4</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>FSX</thingDef>
-							<countRange>
-								<min>10</min>
-								<max>50</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>Prometheum</thingDef>
-							<countRange>
-								<min>10</min>
-								<max>50</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_PreIndustrialAmmo</tradeTag>
-							<countRange>
-								<min>60</min>
-								<max>300</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>1</min>
-								<max>4</max>
-							</thingDefCountRange>
-						</li>
-					</value>
-				</li>
-
-				<!-- Antinium bulk goods trader -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="Ant_Caravan_BulkGoods"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_Category">
-							<categoryDef>Ammo</categoryDef>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>0</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Category">
-							<categoryDef>WeaponsTurrets</categoryDef>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>0</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>FSX</thingDef>
-							<countRange>
-								<min>15</min>
-								<max>40</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>Prometheum</thingDef>
-							<countRange>
-								<min>15</min>
-								<max>40</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_PreIndustrialAmmo</tradeTag>
-							<countRange>
-								<min>30</min>
-								<max>100</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>3</max>
-							</thingDefCountRange>
-						</li>
-					</value>
-				</li>
-
-				<!-- Antinium war merchant -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="Ant_Caravan_WarMerchant"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>FSX</thingDef>
-							<countRange>
-								<min>5</min>
-								<max>20</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>Prometheum</thingDef>
-							<countRange>
-								<min>5</min>
-								<max>20</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_Category">
-							<categoryDef>Ammo</categoryDef>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>0</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Category">
-							<categoryDef>WeaponsTurrets</categoryDef>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>0</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Animals">
-							<tradeTagsSell>
-								<li>CE_AnimalBoom</li>
-							</tradeTagsSell>
-							<tradeTagsBuy>
-								<li>CE_AnimalBoom</li>
-							</tradeTagsBuy>
-							<kindCountRange>
-								<min>1</min>
-								<max>2</max>
-							</kindCountRange>
-							<countRange>
-								<min>1</min>
-								<max>4</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_PreIndustrialAmmo</tradeTag>
-							<countRange>
-								<min>50</min>
-								<max>300</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>1</min>
-								<max>4</max>
-							</thingDefCountRange>
-						</li>
-					</value>
-				</li>
-
-				<!-- Miscellaneous antinium traders -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="Ant_Caravan_Slaver" or defName="Ant_Caravan_ShamanMerchant"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_Category">
-							<categoryDef>Ammo</categoryDef>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>0</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Category">
-							<categoryDef>WeaponsTurrets</categoryDef>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>0</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_PreIndustrialAmmo</tradeTag>
-							<countRange>
-								<min>30</min>
-								<max>100</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>3</max>
-							</thingDefCountRange>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Antinium/TraitDefs/Ant_Traits_Special.xml b/Patches/Antinium/TraitDefs/Ant_Traits_Special.xml
deleted file mode 100644
index e5e63fe3da..0000000000
--- a/Patches/Antinium/TraitDefs/Ant_Traits_Special.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Antinium (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Antinium ranger -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraitDef[defName="Ant_Ranger"]/degreeDatas/li/statOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<ShootingAccuracyPawn>0.6</ShootingAccuracyPawn>
-						<AimingAccuracy>0.3</AimingAccuracy>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Anty the war Ant/Ammo/Ammo_Anty.xml b/Patches/Anty the war Ant/Ammo/Ammo_Anty.xml
deleted file mode 100644
index 0a11a19840..0000000000
--- a/Patches/Anty the war Ant/Ammo/Ammo_Anty.xml	
+++ /dev/null
@@ -1,675 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Anty the war ant race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!-- ==================== Boltcaster ========================== -->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<!-- ==================== AmmoSets ========================== -->
-
-								<CombatExtended.AmmoSetDef>
-									<defName>AmmoSet_AntyAcidRifle</defName>
-									<label>Acid Shot</label>
-									<ammoTypes>
-										<Ammo_AntyAcidRifle>Bullet_AntyAcidRifle</Ammo_AntyAcidRifle>
-									</ammoTypes>
-								</CombatExtended.AmmoSetDef>
-
-								<CombatExtended.AmmoSetDef>
-									<defName>AmmoSet_AntyAcidLauncher</defName>
-									<label>Acid Launcher</label>
-									<ammoTypes>
-										<Ammo_AntyAcidRifle>Bullet_AntyAcidLauncher</Ammo_AntyAcidRifle>
-									</ammoTypes>
-								</CombatExtended.AmmoSetDef>
-
-								<CombatExtended.AmmoSetDef>
-									<defName>AmmoSet_AntyGlueLauncher</defName>
-									<label>Glue Launcher</label>
-									<ammoTypes>
-										<Ammo_AntyGlueLauncher>Bullet_AntyGlueLauncher</Ammo_AntyGlueLauncher>
-									</ammoTypes>
-								</CombatExtended.AmmoSetDef>
-
-								<CombatExtended.AmmoSetDef>
-									<defName>AmmoSet_AntyAcidCrossbow</defName>
-									<label>Acid Bolt</label>
-									<ammoTypes>
-										<Ammo_CrossbowBolt_AntyAcid>Projectile_CrossbowBolt_AntyAcid</Ammo_CrossbowBolt_AntyAcid>
-									</ammoTypes>
-								</CombatExtended.AmmoSetDef>
-
-								<CombatExtended.AmmoSetDef>
-									<defName>AmmoSet_AntyRedAcidLauncher</defName>
-									<label>Acid Launcher</label>
-									<ammoTypes>
-										<Ammo_AntyAcidRed>Bullet_AntyRedAcidLauncher</Ammo_AntyAcidRed>
-									</ammoTypes>
-								</CombatExtended.AmmoSetDef>
-
-								<CombatExtended.AmmoSetDef>
-									<defName>AmmoSet_AntyRedAcidLine</defName>
-									<label>Acid Line Blaster</label>
-									<ammoTypes>
-										<Ammo_AntyAcidRed>Bullet_AntyRedAcidLine</Ammo_AntyAcidRed>
-									</ammoTypes>
-								</CombatExtended.AmmoSetDef>
-
-								<CombatExtended.AmmoSetDef>
-									<defName>AmmoSet_AntyRedAcidCluster</defName>
-									<label>Acid Launcher</label>
-									<ammoTypes>
-										<Ammo_AntyAcidRed>Bullet_AntyRedAcidCluster</Ammo_AntyAcidRed>
-									</ammoTypes>
-								</CombatExtended.AmmoSetDef>
-
-								<CombatExtended.AmmoSetDef>
-									<defName>AmmoSet_AntyAcidGlue</defName>
-									<label>Acid Shot</label>
-									<ammoTypes>
-										<Ammo_AntyAcidRifle>Bullet_AntyAcidGlue</Ammo_AntyAcidRifle>
-									</ammoTypes>
-								</CombatExtended.AmmoSetDef>
-
-								<CombatExtended.AmmoCategoryDef>
-									<defName>AntyAcid</defName>
-									<label>Acid</label>
-									<description>Anty Bioacid.</description>
-								</CombatExtended.AmmoCategoryDef>
-
-								<CombatExtended.AmmoCategoryDef>
-									<defName>AntyGlue</defName>
-									<label>Glue</label>
-									<description>Anty Glue.</description>
-								</CombatExtended.AmmoCategoryDef>
-
-								<CombatExtended.AmmoCategoryDef>
-									<defName>AntyBolt</defName>
-									<label>Acid</label>
-									<description>Acid Bolt.</description>
-								</CombatExtended.AmmoCategoryDef>
-
-								<CombatExtended.AmmoCategoryDef>
-									<defName>AntyRedAcid</defName>
-									<label>Acid</label>
-									<description>Red Acid.</description>
-								</CombatExtended.AmmoCategoryDef>
-
-								<!-- ==================== Ammo ========================== -->
-
-								<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-									<defName>Ammo_AntyAcidRifle</defName>
-									<label>Anty Acid Cartridge</label>
-									<description>Specialised munitions filled with acid produced by anty, used in a number of their weapons.</description>
-									<statBases>
-										<Mass>0.02</Mass>
-										<Bulk>0.02</Bulk>
-										<MarketValue>0.1</MarketValue>
-									</statBases>
-									<tradeTags>
-										<li>CE_AutoEnableTrade</li>
-									</tradeTags>
-									<thingCategories>
-										<li>AmmoAdvanced</li>
-									</thingCategories>
-									<stackLimit>1000</stackLimit>
-									<graphicData>
-										<texPath>Things/Ammo/Railgun/HighCaliber</texPath>
-										<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-									</graphicData>
-									<ammoClass>AntyAcid</ammoClass>
-								</ThingDef>
-
-								<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-									<defName>Ammo_AntyGlueLauncher</defName>
-									<label>anty glue canister</label>
-									<description>Container holding glue for use in anty support weapons.</description>
-									<statBases>
-										<Mass>0.08</Mass>
-										<Bulk>0.14</Bulk>
-										<MarketValue>3.5</MarketValue>
-									</statBases>
-									<graphicData>
-										<texPath>Things/Ammo/FuelCell/Foam</texPath>
-										<graphicClass>Graphic_StackCount</graphicClass>
-									</graphicData>
-									<tradeTags>
-										<li>CE_AutoEnableTrade</li>
-									</tradeTags>
-									<thingCategories>
-										<li>AmmoAdvanced</li>
-									</thingCategories>
-									<stackLimit>200</stackLimit>
-									<ammoClass>AntyGlue</ammoClass>
-								</ThingDef>
-
-								<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-									<defName>Ammo_AntyAcidRed</defName>
-									<label>Anty Hydroheliumion Cartridge</label>
-									<description>High strength mixture made of Anty-acid combined with Refleum.</description>
-									<statBases>
-										<Mass>0.02</Mass>
-										<Bulk>0.02</Bulk>
-										<MarketValue>0.4</MarketValue>
-									</statBases>
-									<tradeTags>
-										<li>CE_AutoEnableTrade</li>
-									</tradeTags>
-									<thingCategories>
-										<li>AmmoAdvanced</li>
-									</thingCategories>
-									<stackLimit>1000</stackLimit>
-									<graphicData>
-										<texPath>Things/Ammo/Railgun/HighCaliber</texPath>
-										<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-									</graphicData>
-									<ammoClass>AntyRedAcid</ammoClass>
-								</ThingDef>
-
-								<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoCrossbowBoltBase">
-									<defName>Ammo_CrossbowBolt_AntyAcid</defName>
-									<label>crossbow bolt (Acid)</label>
-									<graphicData>
-										<texPath>Things/Ammo/Medieval/Bolt/Steel</texPath>
-										<graphicClass>Graphic_StackCount</graphicClass>
-									</graphicData>
-									<statBases>
-										<MarketValue>0.66</MarketValue>
-									</statBases>
-									<ammoClass>AntyBolt</ammoClass>
-								</ThingDef>
-
-								<!-- ================== Projectiles ================== -->
-
-								<ThingDef ParentName="Base762x39mmSovietBullet">
-									<defName>Bullet_AntyAcidRifle</defName>
-									<label>Acid Bullet</label>
-									<graphicData>
-										<texPath>Things/Weapons/jan</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageDef>AT_AcidBullet</damageDef>
-										<damageAmountBase>9</damageAmountBase>
-										<armorPenetrationSharp>0</armorPenetrationSharp>
-										<armorPenetrationBlunt>25</armorPenetrationBlunt>
-									</projectile>
-								</ThingDef>
-
-								<ThingDef ParentName="Base762x39mmSovietBullet">
-									<defName>Bullet_AntyRedAcidLine</defName>
-									<label>Red Burst Bullet</label>
-									<graphicData>
-										<texPath>Things/Weapons/kan</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageDef>AT_AcidBullet</damageDef>
-										<damageAmountBase>1</damageAmountBase>
-										<armorPenetrationSharp>0</armorPenetrationSharp>
-										<armorPenetrationBlunt>1000</armorPenetrationBlunt>
-										<pelletCount>5</pelletCount>
-										<spreadMult>15</spreadMult>
-										<secondaryDamage>
-											<li>
-												<def>Stun</def>
-												<amount>3</amount>
-												<chance>0.05</chance>
-											</li>
-										</secondaryDamage>
-									</projectile>
-								</ThingDef>
-
-								<ThingDef ParentName="Base25x40mmGrenadeBullet">
-									<defName>Bullet_AntyAcidLauncher</defName>
-									<label>Acid Grenade</label>
-									<graphicData>
-										<texPath>Things/Weapons/lan</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<explosionRadius>0</explosionRadius>
-										<damageDef>AT_AcidBomb</damageDef>
-										<preExplosionSpawnThingDef>Filth_AntyAcid</preExplosionSpawnThingDef>
-										<preExplosionSpawnChance>0.2</preExplosionSpawnChance>
-									</projectile>
-									<comps>
-										<li Class="CombatExtended.CompProperties_ExplosiveCE">
-											<explosiveDamageType>AT_AcidBomb</explosiveDamageType>
-											<explosiveRadius>2.1</explosiveRadius>
-											<preExplosionSpawnThingDef>Filth_AntyAcid</preExplosionSpawnThingDef>
-											<preExplosionSpawnChance>0.2</preExplosionSpawnChance>
-											<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-										</li>
-									</comps>
-								</ThingDef>
-
-								<ThingDef ParentName="Base25x40mmGrenadeBullet">
-									<defName>Bullet_AntyRedAcidLauncher</defName>
-									<label>Red Burst Bullet</label>
-									<graphicData>
-										<texPath>Things/Weapons/kan</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-										<shaderType>TransparentPostLight</shaderType>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageDef>AT_AcidBomb_B</damageDef>
-										<preExplosionSpawnThingDef>Filth_ApproachSmoke_B</preExplosionSpawnThingDef>
-										<preExplosionSpawnChance>0.2</preExplosionSpawnChance>
-									</projectile>
-									<comps>
-										<li Class="CombatExtended.CompProperties_ExplosiveCE">
-											<explosiveDamageType>AT_AcidBomb_B</explosiveDamageType>
-											<explosiveRadius>2.1</explosiveRadius>
-											<preExplosionSpawnThingDef>Filth_ApproachSmoke_B</preExplosionSpawnThingDef>
-											<preExplosionSpawnChance>0.2</preExplosionSpawnChance>
-											<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-										</li>
-									</comps>
-								</ThingDef>
-
-								<ThingDef ParentName="Base25x40mmGrenadeBullet">
-									<defName>Bullet_AntyRedAcidCluster</defName>
-									<label>Red Burst Cluster</label>
-									<graphicData>
-										<texPath>Things/Weapons/kan</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-										<shaderType>TransparentPostLight</shaderType>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageDef>AT_AcidBomb_B</damageDef>
-										<preExplosionSpawnThingDef>Filth_ApproachSmoke_B</preExplosionSpawnThingDef>
-										<preExplosionSpawnChance>0.2</preExplosionSpawnChance>
-									</projectile>
-									<comps>
-										<li Class="CombatExtended.CompProperties_Fragments">
-											<fragments>
-												<Bullet_AntyRedAcidCluster_Frag>50</Bullet_AntyRedAcidCluster_Frag>
-											</fragments>
-										</li>
-										<li Class="CombatExtended.CompProperties_ExplosiveCE">
-											<explosiveDamageType>AT_AcidBomb_B</explosiveDamageType>
-											<explosiveRadius>2.1</explosiveRadius>
-											<preExplosionSpawnThingDef>Filth_ApproachSmoke_B</preExplosionSpawnThingDef>
-											<preExplosionSpawnChance>0.2</preExplosionSpawnChance>
-											<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-										</li>
-									</comps>
-								</ThingDef>
-
-								<ThingDef ParentName="Base25x40mmGrenadeBullet">
-									<defName>Bullet_AntyRedAcidCluster_Frag</defName>
-									<label>Red Burst Cluster</label>
-									<graphicData>
-										<texPath>Things/Weapons/Han</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-										<shaderType>TransparentPostLight</shaderType>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageDef>AT_AcidBomb_B</damageDef>
-										<speed>12</speed>
-										<preExplosionSpawnThingDef>Filth_ApproachSmoke_B</preExplosionSpawnThingDef>
-										<preExplosionSpawnChance>0.2</preExplosionSpawnChance>
-										<explosionDelay>20</explosionDelay>
-										<gravityFactor>15</gravityFactor>
-									</projectile>
-									<comps>
-										<li Class="CombatExtended.CompProperties_ExplosiveCE">
-											<explosiveDamageType>AT_AcidBomb_B</explosiveDamageType>
-											<explosiveRadius>2.1</explosiveRadius>
-											<preExplosionSpawnThingDef>Filth_ApproachSmoke_B</preExplosionSpawnThingDef>
-											<preExplosionSpawnChance>0.2</preExplosionSpawnChance>
-											<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-										</li>
-									</comps>
-								</ThingDef>
-
-								<ThingDef ParentName="Base40x46mmGrenadeBullet">
-									<defName>Bullet_AntyGlueLauncher</defName>
-									<label>glue grenade</label>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<explosionRadius>4.1</explosionRadius>
-										<damageDef>AT_glueBomb</damageDef>
-									</projectile>
-								</ThingDef>
-
-								<ThingDef ParentName="BaseCrossbowBoltProjectile">
-									<defName>Projectile_CrossbowBolt_AntyAcid</defName>
-									<label>crossbow bolt (acid)</label>
-									<graphicData>
-										<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageDef>AT_AcidArrow</damageDef>
-										<damageAmountBase>8</damageAmountBase>
-										<armorPenetrationBlunt>6.5</armorPenetrationBlunt>
-										<armorPenetrationSharp>2.5</armorPenetrationSharp>
-										<speed>17</speed>
-									</projectile>
-								</ThingDef>
-
-								<ThingDef ParentName="Base762x39mmSovietBullet">
-									<defName>Bullet_AntyAcidGlue</defName>
-									<label>Acid Bullet</label>
-									<graphicData>
-										<texPath>Things/Weapons/jan</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageDef>AT_glueBullet</damageDef>
-										<damageAmountBase>1</damageAmountBase>
-										<armorPenetrationSharp>0</armorPenetrationSharp>
-										<armorPenetrationBlunt>70</armorPenetrationBlunt>
-										<secondaryDamage>
-											<li>
-												<def>AT_AcidBullet</def>
-												<amount>5</amount>
-											</li>
-										</secondaryDamage>
-									</projectile>
-								</ThingDef>
-
-								<!-- ==================== Recipes ========================== -->
-
-								<RecipeDef ParentName="AmmoRecipeBase">
-									<defName>MakeAmmo_AntyAcidRifle</defName>
-									<label>make anty acid cartridge x500</label>
-									<description>Craft 500 anty acid cartridges.</description>
-									<jobString>Making anty acid cartridges.</jobString>
-									<researchPrerequisite>AntyAcidweapon_B</researchPrerequisite>
-									<ingredients>
-										<li>
-											<filter>
-												<thingDefs>
-													<li>AntyExoskeleton</li>
-												</thingDefs>
-											</filter>
-											<count>18</count>
-										</li>
-									</ingredients>
-									<fixedIngredientFilter>
-										<thingDefs>
-											<li>AntyExoskeleton</li>
-										</thingDefs>
-									</fixedIngredientFilter>
-									<products>
-										<Ammo_AntyAcidRifle>500</Ammo_AntyAcidRifle>
-									</products>
-									<workAmount>1800</workAmount>
-									<recipeUsers>
-										<li>AntyCopyTableMachining</li>
-									</recipeUsers>
-								</RecipeDef>
-
-								<RecipeDef ParentName="AmmoRecipeBase">
-									<defName>MakeAmmo_AntyAcidRed</defName>
-									<label>make anty Hydroheliumion cartridge x500</label>
-									<description>Craft 500 anty Hydroheliumion cartridges.</description>
-									<jobString>Making anty Hydroheliumion cartridges.</jobString>
-									<researchPrerequisite>hydroheliumion</researchPrerequisite>
-									<ingredients>
-										<li>
-											<filter>
-												<thingDefs>
-													<li>AntyExoskeleton</li>
-												</thingDefs>
-											</filter>
-											<count>18</count>
-										</li>
-										<li>
-											<filter>
-												<thingDefs>
-													<li>Refleum</li>
-												</thingDefs>
-											</filter>
-											<count>18</count>
-										</li>
-									</ingredients>
-									<fixedIngredientFilter>
-										<thingDefs>
-											<li>Refleum</li>
-											<li>AntyExoskeleton</li>
-										</thingDefs>
-									</fixedIngredientFilter>
-									<products>
-										<Ammo_AntyAcidRed>500</Ammo_AntyAcidRed>
-									</products>
-									<workAmount>1800</workAmount>
-									<recipeUsers>
-										<li>AntyCopyTableMachining</li>
-									</recipeUsers>
-								</RecipeDef>
-
-								<RecipeDef ParentName="AmmoRecipeBase">
-									<defName>MakeAmmo_AntyGlueLauncher</defName>
-									<label>make anty glue grenade x50</label>
-									<description>Craft 50 anty glue grenades.</description>
-									<jobString>Making anty glue grenades.</jobString>
-									<researchPrerequisite>Combatglue</researchPrerequisite>
-									<ingredients>
-										<li>
-											<filter>
-												<thingDefs>
-													<li>AntyExoskeleton</li>
-												</thingDefs>
-											</filter>
-											<count>8</count>
-										</li>
-										<li>
-											<filter>
-												<thingDefs>
-													<li>ComponentIndustrial</li>
-												</thingDefs>
-											</filter>
-											<count>2</count>
-										</li>
-									</ingredients>
-									<fixedIngredientFilter>
-										<thingDefs>
-											<li>AntyExoskeleton</li>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</fixedIngredientFilter>
-									<products>
-										<Ammo_AntyGlueLauncher>50</Ammo_AntyGlueLauncher>
-									</products>
-									<workAmount>11400</workAmount>
-									<recipeUsers>
-										<li>AntyCopyTableMachining</li>
-									</recipeUsers>
-								</RecipeDef>
-
-								<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-									<defName>MakeAmmo_CrossbowBolt_AntyAcid</defName>
-									<label>make acid crossbow bolts x10</label>
-									<description>Craft 10 acid crossbow bolts.</description>
-									<jobString>Making acid crossbow bolts.</jobString>
-									<ingredients>
-										<li>
-											<filter>
-												<thingDefs>
-													<li>WoodLog</li>
-												</thingDefs>
-											</filter>
-											<count>2</count>
-										</li>
-										<li>
-											<filter>
-												<thingDefs>
-													<li>AntyExoskeleton</li>
-												</thingDefs>
-											</filter>
-											<count>2</count>
-										</li>
-									</ingredients>
-									<fixedIngredientFilter>
-										<thingDefs>
-											<li>WoodLog</li>
-											<li>AntyExoskeleton</li>
-										</thingDefs>
-									</fixedIngredientFilter>
-									<products>
-										<Ammo_CrossbowBolt_AntyAcid>10</Ammo_CrossbowBolt_AntyAcid>
-									</products>
-									<workAmount>400</workAmount>
-								</RecipeDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/DamageDef[defName="AT_AcidBomb"]/defaultArmorPenetration</xpath>
-							<value>
-								<defaultArmorPenetration>20</defaultArmorPenetration>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/DamageDef[defName="AT_AcidBomb"]/defaultDamage</xpath>
-							<value>
-								<defaultDamage>16</defaultDamage>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/DamageDef[defName="AT_AcidBomb_B"]/defaultArmorPenetration</xpath>
-							<value>
-								<defaultArmorPenetration>1000</defaultArmorPenetration>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/DamageDef[defName="AT_AcidBomb_B"]/defaultDamage</xpath>
-							<value>
-								<defaultDamage>16</defaultDamage>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="BulletCombatSmokeLauncher"]</xpath>
-							<value>
-								<ThingDef ParentName="Base25x40mmGrenadeBullet">
-									<defName>BulletCombatSmokeLauncher</defName>
-									<label>Refleum gas Grenade</label>
-									<graphicData>
-										<texPath>Things/Weapons/lan</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-										<shaderType>TransparentPostLight</shaderType>
-										<color>(0.6, 0.2, 0.2)</color>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<speed>50</speed>
-										<damageDef>AT_AcidBomb_B</damageDef>
-										<preExplosionSpawnThingDef>Filth_ApproachSmoke_B</preExplosionSpawnThingDef>
-										<preExplosionSpawnChance>1</preExplosionSpawnChance>
-										<explosionRadius>0</explosionRadius>
-										<explosionDelay>30</explosionDelay>
-									</projectile>
-									<comps>
-										<li Class="CombatExtended.CompProperties_ExplosiveCE">
-											<explosiveDamageType>AT_AcidBomb_B</explosiveDamageType>
-											<explosiveRadius>6.9</explosiveRadius>
-											<preExplosionSpawnThingDef>Filth_ApproachSmoke_B</preExplosionSpawnThingDef>
-											<preExplosionSpawnChance>1</preExplosionSpawnChance>
-											<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-										</li>
-									</comps>
-								</ThingDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_BulletTargetingLauncher"]</xpath>
-							<value>
-								<ThingDef ParentName="Base25x40mmGrenadeBullet">
-									<defName>AT_BulletTargetingLauncher</defName>
-									<label>Targeting Grenade</label>
-									<graphicData>
-										<texPath>Things/Weapons/lan</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-										<shaderType>TransparentPostLight</shaderType>
-										<color>(0.6, 0.2, 0.2)</color>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<speed>50</speed>
-										<damageDef>AT_TargetBomb</damageDef>
-										<explosionRadius>1.9</explosionRadius>
-										<explosionDelay>30</explosionDelay>
-									</projectile>
-								</ThingDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_Apparel_CombatSmoke"]/verbs</xpath>
-							<value>
-								<verbs>
-									<li Class="CombatExtended.VerbPropertiesCE">
-										<label>launch Refleum gas Grenade</label>
-										<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
-										<hasStandardCommand>true</hasStandardCommand>
-										<onlyManualCast>True</onlyManualCast>
-										<warmupTime>1.1</warmupTime>
-										<range>40</range>
-										<minRange>5</minRange>
-										<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-										<soundCast>Shot_IncendiaryLauncher</soundCast>
-										<soundCastTail>GunTail_Medium</soundCastTail>
-										<muzzleFlashScale>14</muzzleFlashScale>
-										<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
-										<targetParams>
-											<canTargetLocations>true</canTargetLocations>
-										</targetParams>
-										<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-										<defaultProjectile>BulletCombatSmokeLauncher</defaultProjectile>
-										<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
-									</li>
-								</verbs>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_Apparel_pheromone_TP"]/verbs</xpath>
-							<value>
-								<verbs>
-									<li Class="CombatExtended.VerbPropertiesCE">
-										<label>launch Targeting pheromone</label>
-										<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
-										<hasStandardCommand>true</hasStandardCommand>
-										<onlyManualCast>True</onlyManualCast>
-										<warmupTime>1.1</warmupTime>
-										<range>40</range>
-										<minRange>5</minRange>
-										<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-										<soundCast>Shot_IncendiaryLauncher</soundCast>
-										<soundCastTail>GunTail_Medium</soundCastTail>
-										<muzzleFlashScale>14</muzzleFlashScale>
-										<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
-										<targetParams>
-											<canTargetLocations>true</canTargetLocations>
-										</targetParams>
-										<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-										<defaultProjectile>AT_BulletTargetingLauncher</defaultProjectile>
-										<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
-									</li>
-								</verbs>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Anty the war Ant/Bodies/Anty_Bodytype.xml b/Patches/Anty the war Ant/Bodies/Anty_Bodytype.xml
deleted file mode 100644
index 01a6ad9e99..0000000000
--- a/Patches/Anty the war Ant/Bodies/Anty_Bodytype.xml	
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Anty the war ant race</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--Arm Groups-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>
-								Defs/BodyDef[defName="Anty"]//*[
-								customLabel="Left shoulder"
-								]/groups
-							</xpath>
-							<value>
-								<li>LeftShoulder</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>
-								Defs/BodyDef[defName="Anty"]//*[
-								customLabel="Right shoulder"
-								]/groups
-							</xpath>
-							<value>
-								<li>RightShoulder</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>
-								Defs/BodyDef[defName="Anty"]//*[
-								customLabel="Left arm"
-								]/groups
-							</xpath>
-							<value>
-								<li>LeftArm</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>
-								Defs/BodyDef[defName="Anty"]//*[
-								customLabel="Right arm"
-								]/groups
-							</xpath>
-							<value>
-								<li>RightArm</li>
-							</value>
-						</li>
-
-						<!--Natural Armor-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>
-								Defs/BodyDef[defName="Anty"]//*[
-								def="ExoThorax" or
-								def="AntyThorax" or
-								def="Neck" or
-								def="ExoHead" or
-								def="Head" or
-								def="Nose" or
-								def="Jaw" or
-								def="Shoulder" or
-								def="ExoArm" or
-								def="Arm" or
-								def="Hand" or
-								def="Finger" or
-								def="ExoLeg" or
-								def="Leg" or
-								def="Foot" or
-								def="Toe"
-								]/groups
-							</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Anty the war Ant/Drugs/Jelly.xml b/Patches/Anty the war Ant/Drugs/Jelly.xml
deleted file mode 100644
index 578808bf2d..0000000000
--- a/Patches/Anty the war Ant/Drugs/Jelly.xml	
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Anty the war ant race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/HediffDef[defName="AntySoldierbirth"]/stages/li[1]</xpath>
-							<value>
-								<statOffsets>
-									<Suppressability>-0.5</Suppressability>
-								</statOffsets>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Anty the war Ant/PawnKindDefs/Anty_PawnKind.xml b/Patches/Anty the war Ant/PawnKindDefs/Anty_PawnKind.xml
deleted file mode 100644
index 2b021cfd61..0000000000
--- a/Patches/Anty the war Ant/PawnKindDefs/Anty_PawnKind.xml	
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Anty the war ant race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[defName="AT_Raid_A"]</xpath>
-							<value>
-								<li Inherit="False" Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>12</min>
-										<max>32</max>
-									</primaryMagazineCount>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[defName="AT_Sapper_A"]</xpath>
-							<value>
-								<li Inherit="False" Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>8</min>
-										<max>20</max>
-									</primaryMagazineCount>
-									<forcedSidearm>
-										<sidearmMoney>
-											<min>500</min>
-											<max>1200</max>
-										</sidearmMoney>
-										<weaponTags>
-											<li>ATCharge</li>
-										</weaponTags>
-										<magazineCount>
-											<min>0</min>
-											<max>2</max>
-										</magazineCount>
-									</forcedSidearm>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[defName="AT_Sapper_B"]</xpath>
-							<value>
-								<li Inherit="False" Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>8</min>
-										<max>20</max>
-									</primaryMagazineCount>
-									<forcedSidearm>
-										<sidearmMoney>
-											<min>500</min>
-											<max>1200</max>
-										</sidearmMoney>
-										<weaponTags>
-											<li>ATCharge</li>
-										</weaponTags>
-										<magazineCount>
-											<min>0</min>
-											<max>2</max>
-										</magazineCount>
-									</forcedSidearm>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[defName="AT_SingleUse"]</xpath>
-							<value>
-								<li Inherit="False" Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>1</min>
-										<max>3</max>
-									</primaryMagazineCount>
-									<forcedSidearm>
-										<sidearmMoney>
-											<min>500</min>
-											<max>1200</max>
-										</sidearmMoney>
-										<weaponTags>
-											<li>ATCharge</li>
-										</weaponTags>
-										<magazineCount>
-											<min>0</min>
-											<max>2</max>
-										</magazineCount>
-									</forcedSidearm>
-								</li>
-							</value>
-						</li>
-
-						<!--Backpack-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/PawnKindDef[
-								defName="Anty_Commander" or
-								defName="AT_Sapper_A" or
-								defName="AT_Sapper_B" or
-								defName="AT_Rifle_B" or
-								defName="AT_Charge_B" or
-								defName="AT_Launcher_A" or
-								defName="AT_SingleUse" or
-								defName="AT_Power"
-								]/apparelRequired </xpath>
-							<value>
-								<li>CE_Apparel_Backpack</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[
-								defName="Anty_Commander" or
-								defName="AT_Rifle_A" or
-								defName="AT_Rifle_B" or
-								defName="AT_Charge_B" or
-								defName="AT_Launcher_A" or
-								defName="AT_Power"
-								] </xpath>
-							<value>
-								<li Inherit="False" Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>3</min>
-										<max>6</max>
-									</primaryMagazineCount>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="CE_Apparel_Backpack"]/apparel/tags</xpath>
-							<value>
-								<li>AntyALL</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="CE_Apparel_TribalBackpack"]/apparel/tags</xpath>
-							<value>
-								<li>AntyME</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Anty the war Ant/Scenario/Anty_Scenario.xml b/Patches/Anty the war Ant/Scenario/Anty_Scenario.xml
deleted file mode 100644
index 63e8e60379..0000000000
--- a/Patches/Anty the war Ant/Scenario/Anty_Scenario.xml	
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Anty the war ant race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ScenarioDef[defName="AT_Scenario"]/scenario/parts</xpath>
-							<value>
-								<li Class="ScenPart_StartingThing_Defined">
-									<def>StartingThing_Defined</def>
-									<thingDef>Ammo_CrossbowBolt_AntyAcid</thingDef>
-									<count>60</count>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ScenarioDef[defName="AT_Scenario_B"]/scenario/parts</xpath>
-							<value>
-								<li Class="ScenPart_StartingThing_Defined">
-									<def>StartingThing_Defined</def>
-									<thingDef>Ammo_AntyAcidRifle</thingDef>
-									<count>900</count>
-								</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Anty the war Ant/ThingDefs_Buildings/Buildings_Turrets.xml b/Patches/Anty the war Ant/ThingDefs_Buildings/Buildings_Turrets.xml
deleted file mode 100644
index 28971af812..0000000000
--- a/Patches/Anty the war Ant/ThingDefs_Buildings/Buildings_Turrets.xml	
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Anty the war ant race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Anty_RecycleTurret" or defName="Anty_RecycleTurretB"]/thingClass</xpath>
-							<value>
-								<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Anty_RecycleTurret" or defName="Anty_RecycleTurretB"]/statBases</xpath>
-							<value>
-								<AimingAccuracy>0.25</AimingAccuracy>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Anty_RecycleTurret" or defName="Anty_RecycleTurretB"]/statBases</xpath>
-							<value>
-								<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Anty_RecycleTurret" or defName="Anty_RecycleTurretB"]/statBases/Mass</xpath>
-							<value>
-								<Mass>25</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="Anty_RecycleTurret" or defName="Anty_RecycleTurretB"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Anty_RecycleTurret" or defName="Anty_RecycleTurretB"]/fillPercent</xpath>
-							<value>
-								<fillPercent>0.85</fillPercent>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Anty_RecycleTurret" or defName="Anty_RecycleTurretB"]/building/turretBurstCooldownTime</xpath>
-							<value>
-								<turretBurstCooldownTime>1.1</turretBurstCooldownTime>
-							</value>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Gun_RecycleTurret</defName>
-							<statBases>
-								<SightsEfficiency>1</SightsEfficiency>
-								<ShotSpread>0.1</ShotSpread>
-								<SwayFactor>1.8</SwayFactor>
-								<Bulk>10.03</Bulk>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							</statBases>
-
-							<Properties>
-								<recoilAmount>1.14</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_AntyAcidLauncher</defaultProjectile>
-								<warmupTime>1.2</warmupTime>
-								<range>51</range>
-								<burstShotCount>3</burstShotCount>
-								<ticksBetweenBurstShots>18</ticksBetweenBurstShots>
-								<ammoConsumedPerShotCount>20</ammoConsumedPerShotCount>
-								<soundCast>Shot_IncendiaryLauncher</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>240</magazineSize>
-								<reloadTime>7.8</reloadTime>
-								<ammoSet>AmmoSet_AntyAcidLauncher</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiAimMode>AimedShot</aiAimMode>
-								<noSnapshot>true</noSnapshot>
-								<noSingleShot>true</noSingleShot>
-							</FireModes>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Gun_RecycleTurretB</defName>
-							<statBases>
-								<SightsEfficiency>1</SightsEfficiency>
-								<ShotSpread>0.1</ShotSpread>
-								<SwayFactor>1.5</SwayFactor>
-								<Bulk>10.03</Bulk>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							</statBases>
-
-							<Properties>
-								<recoilAmount>1.14</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_AntyAcidLauncher</defaultProjectile>
-								<warmupTime>1.2</warmupTime>
-								<range>31</range>
-								<burstShotCount>10</burstShotCount>
-								<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-								<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-								<soundCast>ShotAnty_E</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>200</magazineSize>
-								<reloadTime>7.8</reloadTime>
-								<ammoSet>AmmoSet_AntyAcidGlue</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiAimMode>AimedShot</aiAimMode>
-								<noSnapshot>true</noSnapshot>
-								<noSingleShot>true</noSingleShot>
-							</FireModes>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Anty the war Ant/ThingDefs_Items/Items_Resources.xml b/Patches/Anty the war Ant/ThingDefs_Items/Items_Resources.xml
deleted file mode 100644
index 4f6d1b5caa..0000000000
--- a/Patches/Anty the war Ant/ThingDefs_Items/Items_Resources.xml	
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Anty the war ant race</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!-- ==========  Anty Exoskeleton  =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AntyExoskeleton"]/statBases/StuffPower_Armor_Sharp</xpath>
-							<value>
-								<StuffPower_Armor_Sharp>1.1</StuffPower_Armor_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AntyExoskeleton"]/statBases/StuffPower_Armor_Blunt</xpath>
-							<value>
-								<StuffPower_Armor_Blunt>0.8</StuffPower_Armor_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AntyExoskeleton"]/statBases/StuffPower_Armor_Heat</xpath>
-							<value>
-								<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
-								<StuffPower_Armor_Electric>0.025</StuffPower_Armor_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AntyExoskeleton"]/stuffProps/categories</xpath>
-							<value>
-								<li>Metallic_Weapon</li>
-								<li>Steeled</li>
-							</value>
-						</li>
-
-						<!-- ==========  Anty Exoskeleton  =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Refleum"]/statBases/StuffPower_Armor_Sharp</xpath>
-							<value>
-								<StuffPower_Armor_Sharp>2.3</StuffPower_Armor_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Refleum"]/statBases/StuffPower_Armor_Blunt</xpath>
-							<value>
-								<StuffPower_Armor_Blunt>3.45</StuffPower_Armor_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Refleum"]/statBases/StuffPower_Armor_Heat</xpath>
-							<value>
-								<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Refleum"]/stuffProps/categories</xpath>
-							<value>
-								<li>Metallic_Weapon</li>
-								<li>Steeled</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Anty the war Ant/ThingDefs_Misc/Anty_Apparel.xml b/Patches/Anty the war Ant/ThingDefs_Misc/Anty_Apparel.xml
deleted file mode 100644
index d9b88ded97..0000000000
--- a/Patches/Anty the war Ant/ThingDefs_Misc/Anty_Apparel.xml	
+++ /dev/null
@@ -1,595 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Anty the war ant race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--========= Stuffable =========-->
-
-						<!--Shirt-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="AT_AP_St_A" or
-								defName="AT_AP_St_B" or
-								defName="AT_AP_St_F"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-								<WornBulk>0</WornBulk>
-							</value>
-						</li>
-
-						<!--Jacket/Coat-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AT_AP_St_C" or
-								defName="AT_AP_St_D"]/statBases </xpath>
-							<value>
-								<Bulk>7.5</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_St_C" or
-								defName="AT_AP_St_D"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<!--Chain-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AT_AP_Chain_A"]/statBases</xpath>
-							<value>
-								<Bulk>10</Bulk>
-								<WornBulk>3</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_Chain_A"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>1.25</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<!--Simple Helmet-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AT_AP_Helm_A"]/statBases</xpath>
-							<value>
-								<Bulk>3</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_Helm_A"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<!--Composite-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AT_AP_Shooter_A"]/statBases</xpath>
-							<value>
-								<Bulk>10</Bulk>
-								<WornBulk>5</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_Shooter_A"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_Shooter_A"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_Shooter_A"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.75</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--Composite Helmet-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AT_AP_Head_A"]/statBases</xpath>
-							<value>
-								<Bulk>4</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_Head_A"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>4.5</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_Head_A"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>2</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_Head_A"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>3</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--========= Fixed Armor Value =========-->
-
-						<!--Engineering Suit-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AT_AP_Additionalchain_A"]/statBases</xpath>
-							<value>
-								<Bulk>5</Bulk>
-								<WornBulk>2</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_Additionalchain_A"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_Additionalchain_A"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>3.75</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_Additionalchain_A"]/statBases/ArmorRating_Heat</xpath>
-							<value>
-								<ArmorRating_Heat>0</ArmorRating_Heat>
-							</value>
-						</li>
-
-						<!--Flak Vest-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AT_AP_Flakvest"]/statBases</xpath>
-							<value>
-								<Bulk>10</Bulk>
-								<WornBulk>3</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_Flakvest"]/statBases/Mass</xpath>
-							<value>
-								<Mass>12</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_Flakvest"]/statBases/MaxHitPoints</xpath>
-							<value>
-								<MaxHitPoints>175</MaxHitPoints>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_Flakvest"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>13</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_Flakvest"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>20.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--Flak Plate-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AT_AP_Additionalarmorplate_A"]/statBases</xpath>
-							<value>
-								<Bulk>6</Bulk>
-								<WornBulk>2</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_Additionalarmorplate_A"]/statBases/Mass</xpath>
-							<value>
-								<Mass>4</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_Additionalarmorplate_A"]/statBases/MaxHitPoints</xpath>
-							<value>
-								<MaxHitPoints>75</MaxHitPoints>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_Additionalarmorplate_A"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>13</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_Additionalarmorplate_A"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>20.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--Cloaks-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AT_AP_SH_A" or
-								defName="AT_AP_CO_A"]/statBases </xpath>
-							<value>
-								<Bulk>4</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_SH_A" or
-								defName="AT_AP_CO_A"]/statBases/ArmorRating_Sharp </xpath>
-							<value>
-								<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_SH_A" or
-								defName="AT_AP_CO_A"]/statBases/ArmorRating_Blunt </xpath>
-							<value>
-								<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--Power Armor-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_Power_A"]/statBases/Mass</xpath>
-							<value>
-								<Mass>40</Mass>
-								<Bulk>40</Bulk>
-								<WornBulk>10</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_Power_A"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>20</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_Power_A"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>45</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_Power_A"]/equippedStatOffsets/MoveSpeed</xpath>
-							<value>
-								<CarryBulk>10</CarryBulk>
-								<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-								<CarryWeight>60</CarryWeight>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_Power_Head_A"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>18</ArmorRating_Sharp>
-								<Bulk>5</Bulk>
-								<WornBulk>2</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_Power_Head_A"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>40.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="AT_AP_Power_Head_A"]/apparel/immuneToToxGasExposure</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="AT_AP_Power_Head_A"]/apparel</xpath>
-								<value>
-									<immuneToToxGasExposure>true</immuneToToxGasExposure>
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AT_AP_Power_Head_A"]/equippedStatOffsets</xpath>
-							<value>
-								<AimingAccuracy>0.15</AimingAccuracy>
-								<SmokeSensitivity>-1</SmokeSensitivity>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_AdditionalPower_A"]/statBases/Mass</xpath>
-							<value>
-								<Mass>10</Mass>
-								<Bulk>25</Bulk>
-								<WornBulk>5</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_AdditionalPower_A"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>20</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_AdditionalPower_A"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>45</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_AdditionalPower_A"]/equippedStatOffsets/MoveSpeed</xpath>
-							<value>
-								<CarryBulk>5</CarryBulk>
-							</value>
-						</li>
-
-						<!--Heavy Power Armor-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_Power_C"]/statBases/Mass</xpath>
-							<value>
-								<Mass>60</Mass>
-								<Bulk>40</Bulk>
-								<WornBulk>20</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_Power_C"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>30</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_Power_C"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>75</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_Power_C"]/equippedStatOffsets/MoveSpeed</xpath>
-							<value>
-								<CarryBulk>20</CarryBulk>
-								<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-								<CarryWeight>65</CarryWeight>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_Power_Head_C"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>25</ArmorRating_Sharp>
-								<Bulk>5</Bulk>
-								<WornBulk>10</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_Power_Head_C"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>62.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="AT_AP_Power_Head_C"]/apparel/immuneToToxGasExposure</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="AT_AP_Power_Head_C"]/apparel</xpath>
-								<value>
-									<immuneToToxGasExposure>true</immuneToToxGasExposure>
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AT_AP_Power_Head_C"]/equippedStatOffsets</xpath>
-							<value>
-								<AimingAccuracy>0.15</AimingAccuracy>
-								<SmokeSensitivity>-1</SmokeSensitivity>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_AdditionalPower_C"]/statBases/Mass</xpath>
-							<value>
-								<Mass>15</Mass>
-								<Bulk>25</Bulk>
-								<WornBulk>10</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_AdditionalPower_C"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>30</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_AdditionalPower_C"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>75</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_AdditionalPower_C"]/equippedStatOffsets/MoveSpeed</xpath>
-							<value>
-								<CarryBulk>5</CarryBulk>
-							</value>
-						</li>
-
-						<!--Light Power Armor-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_Power_D"]/statBases/Mass</xpath>
-							<value>
-								<Mass>30</Mass>
-								<Bulk>35</Bulk>
-								<WornBulk>5</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_Power_D"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>16</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_Power_D"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>40</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_Power_D"]/equippedStatOffsets/MoveSpeed</xpath>
-							<value>
-								<CarryBulk>5</CarryBulk>
-								<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-								<CarryWeight>50</CarryWeight>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_Power_Head_D"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>18</ArmorRating_Sharp>
-								<Bulk>5</Bulk>
-								<WornBulk>2</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_Power_Head_D"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>40.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="AT_AP_Power_Head_D"]/apparel/immuneToToxGasExposure</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="AT_AP_Power_Head_D"]/apparel</xpath>
-								<value>
-									<immuneToToxGasExposure>true</immuneToToxGasExposure>
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AT_AP_Power_Head_D"]/equippedStatOffsets</xpath>
-							<value>
-								<AimingAccuracy>0.15</AimingAccuracy>
-								<SmokeSensitivity>-1</SmokeSensitivity>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_AdditionalPower_D"]/statBases/Mass</xpath>
-							<value>
-								<Mass>10</Mass>
-								<Bulk>25</Bulk>
-								<WornBulk>5</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_AdditionalPower_D"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>20</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_AdditionalPower_D"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>45</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AP_AdditionalPower_D"]/equippedStatOffsets/MoveSpeed</xpath>
-							<value>
-								<CarryBulk>5</CarryBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[
-								defName="AT_Apparel_CombatSmoke" or
-								defName="AT_Apparel_pheromone_TP" or
-								defName="AT_Apparel_chunk" or
-								defName="AT_Apparel_barricade" or
-								defName="AT_Apparel_bunker"
-								]/statBases </xpath>
-							<value>
-								<Bulk>2</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Anty the war Ant/ThingDefs_Misc/Weapons.xml b/Patches/Anty the war Ant/ThingDefs_Misc/Weapons.xml
deleted file mode 100644
index 161c5e2e18..0000000000
--- a/Patches/Anty the war Ant/ThingDefs_Misc/Weapons.xml	
+++ /dev/null
@@ -1,534 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Anty the war ant race</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!-- ==========  Halberd  =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_Halberd"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>Axe</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>47</power>
-										<cooldownTime>2.9</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>
-									<li Class="CombatExtended.ToolCE">
-										<label>Hook</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>6</power>
-										<cooldownTime>1.31</cooldownTime>
-										<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AT_Halberd"]/statBases</xpath>
-							<value>
-								<Bulk>10</Bulk>
-								<MeleeCounterParryBonus>1.08</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AT_Halberd"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.22</MeleeCritChance>
-									<MeleeParryChance>1.53</MeleeParryChance>
-									<MeleeDodgeChance>0.67</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-						<!-- ==========  Hammer  =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_Hammer"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>36</power>
-										<cooldownTime>2.67</cooldownTime>
-										<armorPenetrationBlunt>15.75</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AT_Hammer"]/statBases</xpath>
-							<value>
-								<Bulk>16</Bulk>
-								<MeleeCounterParryBonus>0.28</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AT_Hammer"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>1.6</MeleeCritChance>
-									<MeleeParryChance>0.38</MeleeParryChance>
-									<MeleeDodgeChance>0.3</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-						<!-- ==========  Sickle  =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_Sickle"]/tools</xpath>
-							<value>
-								<tools>
-									<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>
-									<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>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AT_Sickle"]/statBases</xpath>
-							<value>
-								<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-								<Bulk>3.5</Bulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AT_Sickle"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.2</MeleeCritChance>
-									<MeleeParryChance>0.35</MeleeParryChance>
-									<MeleeDodgeChance>0.2</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AT_Sickle"]/weaponTags</xpath>
-							<value>
-								<li>CE_OneHandedWeapon</li>
-							</value>
-						</li>
-
-						<!-- ========== Base Rifle =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>AT_AcidRifle</defName>
-							<statBases>
-								<SightsEfficiency>1</SightsEfficiency>
-								<ShotSpread>0.07</ShotSpread>
-								<SwayFactor>1.33</SwayFactor>
-								<Bulk>10.03</Bulk>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							</statBases>
-
-							<Properties>
-								<recoilAmount>1.14</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_AntyAcidRifle</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<burstShotCount>3</burstShotCount>
-								<ticksBetweenBurstShots>18</ticksBetweenBurstShots>
-								<range>51</range>
-								<soundCast>ShotAnty_C</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>18</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_AntyAcidRifle</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>2</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== Assault Rifle =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>AT_AcidAssaultRifle</defName>
-							<statBases>
-								<SightsEfficiency>1</SightsEfficiency>
-								<ShotSpread>0.07</ShotSpread>
-								<SwayFactor>1.69</SwayFactor>
-								<Bulk>10.03</Bulk>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							</statBases>
-
-							<Properties>
-								<recoilAmount>0.96</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_AntyAcidRifle</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
-								<range>55</range>
-								<soundCast>ShotAnty_B</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>30</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_AntyAcidRifle</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== Line Rifle =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>AT_AcidLineRifle</defName>
-							<statBases>
-								<SightsEfficiency>1</SightsEfficiency>
-								<ShotSpread>0.09</ShotSpread>
-								<SwayFactor>1.69</SwayFactor>
-								<Bulk>9.73</Bulk>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							</statBases>
-
-							<Properties>
-								<recoilAmount>0.96</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_AntyAcidRifle</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-								<range>31</range>
-								<soundCast>ShotAnty_B</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>30</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_AntyAcidRifle</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>Snapshot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AT_AcidLineRifle"]/weaponTags</xpath>
-							<value>
-								<li>NoSwitch</li>
-							</value>
-						</li>
-
-						<!-- ========== Launcher =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>AT_AcidLauncher</defName>
-							<statBases>
-								<SightsEfficiency>1</SightsEfficiency>
-								<ShotSpread>0.07</ShotSpread>
-								<SwayFactor>1.79</SwayFactor>
-								<Bulk>10.03</Bulk>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							</statBases>
-
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_AntyAcidLauncher</defaultProjectile>
-								<warmupTime>1.2</warmupTime>
-								<range>51</range>
-								<ammoConsumedPerShotCount>20</ammoConsumedPerShotCount>
-								<soundCast>ShotAnty_D</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>14</muzzleFlashScale>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>120</magazineSize>
-								<reloadTime>7.8</reloadTime>
-								<ammoSet>AmmoSet_AntyAcidLauncher</ammoSet>
-							</AmmoUser>
-							<FireModes>
-							</FireModes>
-						</li>
-
-						<!-- ========== Glue Launcher =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>AT_Combatglue</defName>
-							<statBases>
-								<SightsEfficiency>1.0</SightsEfficiency>
-								<ShotSpread>0.18</ShotSpread>
-								<SwayFactor>1.31</SwayFactor>
-								<Bulk>5.65</Bulk>
-								<Mass>5.3</Mass>
-								<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-							</statBases>
-
-							<Properties>
-								<recoilAmount>2.93</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_AntyGlueLauncher</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>62</range>
-								<soundCast>Shot_IncendiaryLauncher</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>14</muzzleFlashScale>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>6</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_AntyGlueLauncher</ammoSet>
-							</AmmoUser>
-							<FireModes>
-							</FireModes>
-						</li>
-
-						<!-- ========== LMG =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>AT_LMG</defName>
-							<statBases>
-								<SightsEfficiency>1</SightsEfficiency>
-								<ShotSpread>0.06</ShotSpread>
-								<SwayFactor>1.24</SwayFactor>
-								<Bulk>13.37</Bulk>
-								<Mass>7.40</Mass>
-								<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-							</statBases>
-
-							<Properties>
-								<recoilAmount>1.22</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_AntyAcidRifle</defaultProjectile>
-								<warmupTime>1.3</warmupTime>
-								<burstShotCount>10</burstShotCount>
-								<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
-								<range>48</range>
-								<soundCast>ShotAnty_E</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<recoilPattern>Mounted</recoilPattern>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>100</magazineSize>
-								<reloadTime>7.8</reloadTime>
-								<ammoSet>AmmoSet_AntyAcidRifle</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>5</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>SuppressFire</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== Crossbow =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>AT_AcidCross</defName>
-							<statBases>
-								<Bulk>6</Bulk>
-								<SwayFactor>1.0</SwayFactor>
-								<ShotSpread>0.5</ShotSpread>
-								<SightsEfficiency>1</SightsEfficiency>
-								<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-							</statBases>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>True</hasStandardCommand>
-								<defaultProjectile>Projectile_CrossbowBolt_AntyAcid</defaultProjectile>
-								<warmupTime>1</warmupTime>
-								<range>20</range>
-								<soundCast>Bow_Large</soundCast>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>1</magazineSize>
-								<reloadTime>8</reloadTime>
-								<ammoSet>AmmoSet_AntyAcidCrossbow</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== Melee Attacks =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AcidRifle" or
-								defName="AT_AcidAssaultRifle" or
-								defName="AT_AcidLauncher" or
-								defName="AT_LMG" or
-								defName="AT_Combatglue" or
-								defName="AT_AcidCross"
-								]/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>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_AcidLineRifle"
-								]/tools </xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>stock</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>8</power>
-										<cooldownTime>1.55</cooldownTime>
-										<chanceFactor>0.2</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>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>bayonet</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>18</power>
-										<cooldownTime>1.55</cooldownTime>
-										<chanceFactor>1.5</chanceFactor>
-										<armorPenetrationSharp>0.75</armorPenetrationSharp>
-										<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Anty the war Ant/ThingDefs_Misc/WeaponsP.xml b/Patches/Anty the war Ant/ThingDefs_Misc/WeaponsP.xml
deleted file mode 100644
index 431a1896b5..0000000000
--- a/Patches/Anty the war Ant/ThingDefs_Misc/WeaponsP.xml	
+++ /dev/null
@@ -1,338 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Anty the war ant race</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!-- ========== Launcher =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>AT_hydroheliumion_A</defName>
-							<statBases>
-								<SightsEfficiency>1</SightsEfficiency>
-								<ShotSpread>0.07</ShotSpread>
-								<SwayFactor>1.79</SwayFactor>
-								<Bulk>10.03</Bulk>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							</statBases>
-
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_AntyRedAcidLauncher</defaultProjectile>
-								<warmupTime>1.2</warmupTime>
-								<range>51</range>
-								<ammoConsumedPerShotCount>20</ammoConsumedPerShotCount>
-								<soundCast>ShotAnty_G</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>8</muzzleFlashScale>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>120</magazineSize>
-								<reloadTime>7.8</reloadTime>
-								<ammoSet>AmmoSet_AntyRedAcidLauncher</ammoSet>
-							</AmmoUser>
-							<FireModes>
-							</FireModes>
-						</li>
-
-						<!-- ========== Line Rifle =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_hydroheliumion_B"]</xpath>
-							<value>
-								<ThingDef ParentName="BaseMakeableGun_Anty">
-									<defName>AT_hydroheliumion_B</defName>
-									<label>Red Burst Line Rifle</label>
-									<description>It is a weapon developed by Anties to deal with targets with thick armor or strong body itself, such as mechanoids.\n\n Unlike conventional acid weapons, it fires Red Burst, a compound of Anty-acid and Refleum, rather than Anty-acid. Exhibits powerful power.</description>
-									<graphicData>
-										<texPath>Things/Weapons/AT_hydroheliumion_B</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-										<shaderType>TransparentPostLight</shaderType>
-									</graphicData>
-									<soundInteract>hydroheliumion_A</soundInteract>
-									<statBases>
-										<WorkToMake>90000</WorkToMake>
-										<SightsEfficiency>1</SightsEfficiency>
-										<ShotSpread>0.14</ShotSpread>
-										<SwayFactor>1.51</SwayFactor>
-										<Bulk>9.60</Bulk>
-										<Mass>5.45</Mass>
-										<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-									</statBases>
-									<equippedAngleOffset>45</equippedAngleOffset>
-									<weaponTags>
-										<li>hydroheliumion_B</li>
-									</weaponTags>
-									<costList>
-										<AntyExoskeleton>80</AntyExoskeleton>
-										<Refleum>15</Refleum>
-										<Uranium>20</Uranium>
-										<ComponentSpacer>4</ComponentSpacer>
-										<Anty_Recyclecore>1</Anty_Recyclecore>
-									</costList>
-									<verbs>
-										<li Class="CombatExtended.VerbPropertiesCE">
-											<recoilAmount>2.36</recoilAmount>
-											<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-											<hasStandardCommand>true</hasStandardCommand>
-											<defaultProjectile>Bullet_AntyRedAcidLine</defaultProjectile>
-											<burstShotCount>3</burstShotCount>
-											<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
-											<warmupTime>0.6</warmupTime>
-											<range>16</range>
-											<soundCast>ShotAnty_G</soundCast>
-											<soundCastTail>GunTail_Light</soundCastTail>
-											<muzzleFlashScale>9</muzzleFlashScale>
-										</li>
-									</verbs>
-									<comps>
-										<li Class="CombatExtended.CompProperties_AmmoUser">
-											<magazineSize>10</magazineSize>
-											<reloadTime>4</reloadTime>
-											<ammoSet>AmmoSet_AntyRedAcidLine</ammoSet>
-										</li>
-										<li Class="CombatExtended.CompProperties_FireModes">
-											<aimedBurstShotCount>2</aimedBurstShotCount>
-										</li>
-									</comps>
-									<recipeMaker>
-										<skillRequirements>
-											<Crafting>10</Crafting>
-											<Intellectual>10</Intellectual>
-										</skillRequirements>
-										<researchPrerequisite>hydroheliumion_B</researchPrerequisite>
-									</recipeMaker>
-									<tools>
-										<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>
-											<extraMeleeDamages>
-												<li>
-													<def>Anty_Poke</def>
-													<amount>10</amount>
-													<chance>0.35</chance>
-												</li>
-												<li>
-													<def>EMP</def>
-													<amount>12</amount>
-													<chance>0.25</chance>
-												</li>
-												<li>
-													<def>Stun</def>
-													<amount>3</amount>
-													<chance>0.15</chance>
-												</li>
-											</extraMeleeDamages>
-										</li>
-									</tools>
-								</ThingDef>
-							</value>
-						</li>
-
-						<!-- ========== Cluster =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>AT_hydroheliumion_C</defName>
-							<statBases>
-								<SightsEfficiency>1</SightsEfficiency>
-								<ShotSpread>0.07</ShotSpread>
-								<SwayFactor>1.85</SwayFactor>
-								<Bulk>11.03</Bulk>
-								<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
-							</statBases>
-
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_AntyRedAcidCluster</defaultProjectile>
-								<warmupTime>3</warmupTime>
-								<range>62</range>
-								<ammoConsumedPerShotCount>200</ammoConsumedPerShotCount>
-								<soundCast>ShotAnty_G</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>8</muzzleFlashScale>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>200</magazineSize>
-								<reloadTime>5.1</reloadTime>
-								<ammoSet>AmmoSet_AntyRedAcidCluster</ammoSet>
-							</AmmoUser>
-							<FireModes>
-							</FireModes>
-						</li>
-
-						<!-- ========== Melee Attacks =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_hydroheliumion_A" or
-								defName="AT_hydroheliumion_C"
-								]/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>
-						</li>
-
-						<!-- ========== Melee Attacks =========== -->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AT_RedHalberd"]/statBases</xpath>
-							<value>
-								<MeleeCounterParryBonus>1.08</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AT_RedHalberd"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.22</MeleeCritChance>
-									<MeleeParryChance>1.53</MeleeParryChance>
-									<MeleeDodgeChance>0.67</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AT_RedHalberd"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>Point</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>12</power>
-										<extraMeleeDamages>
-											<li>
-												<def>Anty_Poke</def>
-												<amount>15</amount>
-												<chance>1</chance>
-											</li>
-											<li>
-												<def>Anty_Cut</def>
-												<amount>15</amount>
-												<chance>1</chance>
-											</li>
-											<li>
-												<def>EMP</def>
-												<amount>12</amount>
-											</li>
-											<li>
-												<def>Stun</def>
-												<amount>10</amount>
-												<chance>1</chance>
-											</li>
-										</extraMeleeDamages>
-										<cooldownTime>1.72</cooldownTime>
-										<chanceFactor>1</chanceFactor>
-										<armorPenetrationBlunt>2.59</armorPenetrationBlunt>
-										<armorPenetrationSharp>20.74</armorPenetrationSharp>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>Axe</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>27</power>
-										<extraMeleeDamages>
-											<li>
-												<def>Anty_Cut</def>
-												<amount>10</amount>
-												<chance>1</chance>
-											</li>
-											<li>
-												<def>EMP</def>
-												<amount>2</amount>
-											</li>
-										</extraMeleeDamages>
-										<cooldownTime>1.72</cooldownTime>
-										<chanceFactor>1</chanceFactor>
-										<armorPenetrationBlunt>2.59</armorPenetrationBlunt>
-										<armorPenetrationSharp>9.72</armorPenetrationSharp>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>Hook</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>12</power>
-										<extraMeleeDamages>
-											<li>
-												<def>Anty_Poke</def>
-												<amount>10</amount>
-												<chance>1</chance>
-											</li>
-											<li>
-												<def>Stun</def>
-												<amount>2</amount>
-												<chance>0.8</chance>
-											</li>
-										</extraMeleeDamages>
-										<cooldownTime>1.72</cooldownTime>
-										<chanceFactor>1</chanceFactor>
-										<armorPenetrationBlunt>2.59</armorPenetrationBlunt>
-										<armorPenetrationSharp>12.96</armorPenetrationSharp>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Anty the war Ant/ThingDefs_Races/AlienRace_Anty.xml b/Patches/Anty the war Ant/ThingDefs_Races/AlienRace_Anty.xml
deleted file mode 100644
index ce7e322d7a..0000000000
--- a/Patches/Anty the war Ant/ThingDefs_Races/AlienRace_Anty.xml	
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Anty the war ant race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="AT_PawnBase"]</xpath>
-							<value>
-								<comps>
-								</comps>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="AT_PawnBase"]/comps</xpath>
-							<value>
-								<li>
-									<compClass>CombatExtended.CompPawnGizmo</compClass>
-								</li>
-								<li Class="CombatExtended.CompProperties_Suppressable" />
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="AT_PawnBase"]/comps</xpath>
-							<value>
-								<li Class="CombatExtended.CompProperties_Inventory" />
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Anty"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Humanoid</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Anty"]/statBases</xpath>
-							<value>
-								<MeleeCritChance>1</MeleeCritChance>
-								<MeleeParryChance>1</MeleeParryChance>
-								<Suppressability>0.5</Suppressability>
-								<SmokeSensitivity>0.9</SmokeSensitivity>
-							</value>
-						</li>
-
-						<!--Only bite-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Anty"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>teeth</label>
-										<capacities>
-											<li>Bite</li>
-										</capacities>
-										<power>3</power>
-										<cooldownTime>1.5</cooldownTime>
-										<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-										<chanceFactor>1</chanceFactor>
-										<armorPenetrationSharp>0.1</armorPenetrationSharp>
-										<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Anty the war Ant/ThingDefs_Races/Race_Proty.xml b/Patches/Anty the war Ant/ThingDefs_Races/Race_Proty.xml
deleted file mode 100644
index e723555612..0000000000
--- a/Patches/Anty the war Ant/ThingDefs_Races/Race_Proty.xml	
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Anty the war ant race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[defName="Anty_prototype"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>QuadrupedLow</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Anty_prototype"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>6</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Anty_prototype"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>2</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Anty_prototype"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>BigJaw</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>11</power>
-										<cooldownTime>1.78</cooldownTime>
-										<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-										<armorPenetrationSharp>0.14</armorPenetrationSharp>
-										<armorPenetrationBlunt>1</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>1.5</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Apex - Rimworld Legends/ApexRimworldLegends_AmmoPatch.xml b/Patches/Apex - Rimworld Legends/ApexRimworldLegends_AmmoPatch.xml
deleted file mode 100644
index 0ba5b928de..0000000000
--- a/Patches/Apex - Rimworld Legends/ApexRimworldLegends_AmmoPatch.xml	
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Apex: Rimworld Legends (Continued)</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>AmmoARL127x39mmCharged</defName>
-					<label>127x39mm HE Charged Cartridge</label>
-					<parent>AmmoAdvanced</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberChargeLarge</iconPath>
-				</ThingCategoryDef>
-
-				<!-- Ammo Set -->
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_ARL_127x39mmCharged</defName>
-					<label>127x39mm HE Charged Cartridge</label>
-					<ammoTypes>
-						<Ammo_ARL_127x39mmCharged_HE>Bullet_ARL_127x39mmCharged_HE</Ammo_ARL_127x39mmCharged_HE>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- Ammo -->
-				<ThingDef Class="CombatExtended.AmmoDef" Name="40mmChargeMinigunBase" ParentName="AmmoBase" Abstract="True">
-					<description>Specialized 127x39mm HE charged cartridge</description>
-					<statBases>
-						<Mass>0.172</Mass>
-						<Bulk>0.16</Bulk>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-					</tradeTags>
-					<thingCategories>
-						<li>AmmoARL127x39mmCharged</li>
-					</thingCategories>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDEf" ParentName="40mmChargeMinigunBase">
-					<defName>Ammo_ARL_127x39mmCharged_HE</defName>
-					<label>127x39mm HE Charged Cartridge</label>
-					<graphicData>
-						<texPath>Things/Ammo/Charged/LargeIon</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<ammoClass>GrenadeHE</ammoClass>
-					<cookOffProjectile>Bullet_ARL_127x39mmCharged_HE</cookOffProjectile>
-					<comps />
-				</ThingDef>
-
-				<!-- Projectile -->
-				<ThingDef ParentName="BaseExplosiveBullet">
-					<defName>Bullet_ARL_127x39mmCharged_HE</defName>
-					<graphicData>
-						<texPath>Things/Projectile/Charge_Explosive</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-						<shaderType>TransparentPostLight</shaderType>
-					</graphicData>
-					<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>ARL_Bomb_ChargeMinigun</damageDef>
-						<damageAmountBase>10</damageAmountBase>
-						<explosionRadius>1.4</explosionRadius>
-						<speed>81</speed>
-						<flyOverhead>false</flyOverhead>
-						<dropsCasings>true</dropsCasings>
-					</projectile>
-				</ThingDef>
-
-				<!-- Recipes -->
-				<RecipeDef ParentName="ChargeAmmoRecipeBase">
-					<defName>MakeAmmo_ARL_127x39mmCharged_HE</defName>
-					<label>make 127x39mm HE charged cartridge x100</label>
-					<description>Craft 100 127x39mm HE charged cartridges.</description>
-					<jobString>Making 127x39mm HE charged cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Plasteel</li>
-								</thingDefs>
-							</filter>
-							<count>3</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>3</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Chemfuel</li>
-								</thingDefs>
-							</filter>
-							<count>3</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Plasteel</li>
-							<li>ComponentIndustrial</li>
-							<li>Chemfuel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_ARL_127x39mmCharged_HE>100</Ammo_ARL_127x39mmCharged_HE>
-					</products>
-				</RecipeDef>
-
-				<ThingDef ParentName="BaseGrenadeProjectile">
-					<defName>Proj_ARL_ChargeGrenade</defName>
-					<graphicData>
-						<texPath>Things/Projectile/arcstar</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>ARL_Bomb_ChargeGrenade</damageDef>
-						<damageAmountBase>40</damageAmountBase>
-						<explosionRadius>1.6</explosionRadius>
-						<explosionDelay>30</explosionDelay>
-						<speed>54</speed>
-						<ai_IsIncendiary>false</ai_IsIncendiary>
-						<flyOverhead>false</flyOverhead>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-					</projectile>
-				</ThingDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeARLArcStar</defName>
-					<label>make arc stars</label>
-					<description>Craft 50 Arc Stars.</description>
-					<jobString>Making Arc Stars.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Plasteel</li>
-								</thingDefs>
-							</filter>
-							<count>13</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Chemfuel</li>
-								</thingDefs>
-							</filter>
-							<count>3</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>1</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Plasteel</li>
-							<li>Chemfuel</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Proj_ARL_ChargeGrenade>50</Proj_ARL_ChargeGrenade>
-					</products>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_AssaultRifles.xml b/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_AssaultRifles.xml
deleted file mode 100644
index a1461553a1..0000000000
--- a/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_AssaultRifles.xml	
+++ /dev/null
@@ -1,343 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Apex: Rimworld Legends (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- VK-47 Flatline -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ARL_BullpupRifle</defName>
-					<statBases>
-						<WorkToMake>30000</WorkToMake>
-						<Bulk>8.8</Bulk>
-						<Mass>3.50</Mass>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.82</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>52</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_BullpupRifle"]/label</xpath>
-					<value>
-						<label>VK-47 Flatline</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_BullpupRifle"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.075</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.102</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.075</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- M1A3 Hemlok BF-R -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ARL_BattleRifle</defName>
-					<statBases>
-						<WorkToMake>45000</WorkToMake>
-						<Bulk>4.5</Bulk>
-						<Mass>4.5</Mass>
-						<SightsEfficiency>1.2</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.2</SwayFactor>
-						<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.65</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>5.66</ticksBetweenBurstShots>
-						<warmupTime>1.0</warmupTime>
-						<range>50</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>2.4</reloadTime>
-						<ammoSet>AmmoSet_303British</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_BattleRifle"]/label</xpath>
-					<value>
-						<label>M1A3 Hemlok BF-R</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_BattleRifle"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.075</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.102</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.075</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- R-301 Carbine -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ARL_AssaultCarbine</defName>
-					<statBases>
-						<WorkToMake>35000</WorkToMake>
-						<Bulk>3.5</Bulk>
-						<Mass>2.5</Mass>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>1.16</ShotSpread>
-						<SwayFactor>0.85</SwayFactor>
-						<RangedWeapon_Cooldown>1.7</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.40</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
-						<burstShotCount>14</burstShotCount>
-						<ticksBetweenBurstShots>4.2</ticksBetweenBurstShots>
-						<warmupTime>1</warmupTime>
-						<range>46</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>28</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_FN57x28mm</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_AssaultCarbine"]/label</xpath>
-					<value>
-						<label>R-301 Carbine</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_AssaultCarbine"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.102</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Havoc -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ARL_MechanoidRifle</defName>
-					<statBases>
-						<WorkToMake>75000</WorkToMake>
-						<Bulk>12</Bulk>
-						<Mass>4.2</Mass>
-						<SightsEfficiency>2.1</SightsEfficiency>
-						<ShotSpread>0.5</ShotSpread>
-						<SwayFactor>1.7</SwayFactor>
-						<RangedWeapon_Cooldown>3</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.96</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8x40mmCharged</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5.2</ticksBetweenBurstShots>
-						<warmupTime>1</warmupTime>
-						<range>58</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>36</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_8x40mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_MechanoidRifle"]/label</xpath>
-					<value>
-						<label>Havoc</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_MechanoidRifle"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.86</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.118</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.86</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_Grenades.xml b/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_Grenades.xml
deleted file mode 100644
index 47b2ad2311..0000000000
--- a/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_Grenades.xml	
+++ /dev/null
@@ -1,252 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Apex: Rimworld Legends (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Arc Star -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ARL_ChargeGrenade</defName>
-					<statBases>
-						<WorkToMake>16000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>3.66</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Proj_ARL_ChargeGrenade</defaultProjectile>
-						<warmupTime>0.85</warmupTime>
-						<range>16</range>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<onlyManualCast>true</onlyManualCast>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-						<noiseRadius>4</noiseRadius>
-						<soundCast>ARL_Throw_ChargeGrenade</soundCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<weaponTags>
-						<li>CE_AI_Grenade</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_ChargeGrenade"]/label</xpath>
-					<value>
-						<label>Arc Star</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_ChargeGrenade"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1</cooldownTime>
-								<armorPenetrationSharp>1.20</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.96</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Smoke Grenade -->
-				<!-- Projectile -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_Projectile_SmokeGrenade"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_Projectile_SmokeGrenade"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<damageDef>Smoke</damageDef>
-							<suppressionFactor>0.0</suppressionFactor>
-							<dangerFactor>0.0</dangerFactor>
-							<explosionRadius>4.3</explosionRadius>
-							<damageAmountBase>10</damageAmountBase>
-							<explosionDelay>60</explosionDelay>
-							<dropsCasings>true</dropsCasings>
-							<postExplosionGasType>BlindSmoke</postExplosionGasType>
-							<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-							<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-						</projectile>
-					</value>
-				</li>
-
-				<!-- Grenade -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_SmokeGrenade"]/label</xpath>
-					<value>
-						<label>Bangalore Smoke Grenade</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ARL_SmokeGrenade"]</xpath>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<stackLimit>75</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="ARL_SmokeGrenade"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="ARL_SmokeGrenade"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="ARL_SmokeGrenade"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ARL_SmokeGrenade</defName>
-					<statBases>
-						<Mass>0.4</Mass>
-						<MarketValue>2.25</MarketValue>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<label>throw Smoke grenade</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>ARL_Projectile_SmokeGrenade</defaultProjectile>
-						<range>16</range>
-						<minRange>4</minRange>
-						<warmupTime>1.8</warmupTime>
-						<soundCast>ThrowGrenade</soundCast>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-						<onlyManualCast>true</onlyManualCast>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<weaponTags>
-						<li>CE_AI_Grenade</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- Toxic Grenade -->
-				<!-- Projectile -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_Projectile_ToxicGrenade"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_Projectile_ToxicGrenade"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<damageDef>ARL_ToxicGas</damageDef>
-							<explosionRadius>3.9</explosionRadius>
-							<damageAmountBase>10</damageAmountBase>
-							<explosionDelay>60</explosionDelay>
-							<dropsCasings>true</dropsCasings>
-							<soundExplode>DispensePaste</soundExplode>
-							<postExplosionSpawnThingDef>ARL_ToxicGasCloud</postExplosionSpawnThingDef>
-							<postExplosionSpawnChance>1</postExplosionSpawnChance>
-							<postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-							<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-						</projectile>
-					</value>
-				</li>
-
-				<!-- Grenade -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_ToxicGrenade"]/label</xpath>
-					<value>
-						<label>Caustic Nox Grenade</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ARL_ToxicGrenade"]</xpath>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<stackLimit>75</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="ARL_ToxicGrenade"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="ARL_ToxicGrenade"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="ARL_ToxicGrenade"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ARL_ToxicGrenade</defName>
-					<statBases>
-						<Mass>0.4</Mass>
-						<MarketValue>2.25</MarketValue>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<label>throw toxic grenade</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>ARL_Projectile_ToxicGrenade</defaultProjectile>
-						<range>16</range>
-						<minRange>4</minRange>
-						<warmupTime>3.5</warmupTime>
-						<soundCast>ThrowGrenade</soundCast>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-						<onlyManualCast>true</onlyManualCast>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<weaponTags>
-						<li>CE_AI_Grenade</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_Launchers.xml b/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_Launchers.xml
deleted file mode 100644
index 86854178e8..0000000000
--- a/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_Launchers.xml	
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Apex: Rimworld Legends (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Quad Rocket Launcher -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ARL_MechanoidRocketLauncher</defName>
-					<statBases>
-						<WorkToMake>75000</WorkToMake>
-						<Bulk>18</Bulk>
-						<Mass>8</Mass>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.8</SwayFactor>
-						<RangedWeapon_Cooldown>10</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>3.45</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_M74_Incendiary</defaultProjectile>
-						<burstShotCount>8</burstShotCount>
-						<ticksBetweenBurstShots>16</ticksBetweenBurstShots>
-						<warmupTime>3.33</warmupTime>
-						<range>48</range>
-						<minRange>5</minRange>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>15</reloadTime>
-						<ammoSet>AmmoSet_M74</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_AI_Launcher</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_MechanoidRocketLauncher"]/label</xpath>
-					<value>
-						<label>Rocket Launcher</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_MechanoidRocketLauncher"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.86</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.118</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.86</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- R-6P Softball -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ARL_GrenadeLauncher</defName>
-					<statBases>
-						<WorkToMake>16000</WorkToMake>
-						<Bulk>5.65</Bulk>
-						<Mass>5.3</Mass>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>1.31</SwayFactor>
-						<RangedWeapon_Cooldown>2.67</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.93</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
-						<burstShotCount>1</burstShotCount>
-						<warmupTime>2.5</warmupTime>
-						<range>44</range>
-						<minRange>4</minRange>
-						<soundCast>Shot_IncendiaryLauncher</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>5.1</reloadTime>
-						<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_AI_Launcher</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_GrenadeLauncher"]/label</xpath>
-					<value>
-						<label>R-6P Softball</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_GrenadeLauncher"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.86</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.118</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.86</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_MachineGuns.xml b/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_MachineGuns.xml
deleted file mode 100644
index 33e63dc28e..0000000000
--- a/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_MachineGuns.xml	
+++ /dev/null
@@ -1,356 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Apex: Rimworld Legends (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- M600 Spitfire -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ARL_HMG</defName>
-					<statBases>
-						<WorkToMake>50000</WorkToMake>
-						<Bulk>14.05</Bulk>
-						<Mass>10.5</Mass>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.51</SwayFactor>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.33</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<burstShotCount>21</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>1.25</warmupTime>
-						<range>60</range>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>63</magazineSize>
-						<reloadTime>3.33</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_Machinegun</li>
-					</weaponTags>
-					<researchPrerequisite>GasOperation</researchPrerequisite>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_HMG"]/label</xpath>
-					<value>
-						<label>M600 Spitfire</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_HMG"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.6</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.102</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetrationBlunt>0.102</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetrationBlunt>0.075</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- L-Star -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ARL_MechanoidLMG</defName>
-					<statBases>
-						<WorkToMake>100000</WorkToMake>
-						<Bulk>14.7</Bulk>
-						<Mass>11.3</Mass>
-						<SightsEfficiency>1.2</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.16</SwayFactor>
-						<RangedWeapon_Cooldown>5.5</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.23</recoilAmount>
-						<recoilPattern>Mounted</recoilPattern>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
-						<burstShotCount>20</burstShotCount>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<warmupTime>1.25</warmupTime>
-						<range>64</range>
-						<soundCast>Shot_ChargeBlaster</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>80</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-					<researchPrerequisite>GasOperation</researchPrerequisite>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_MechanoidLMG"]/label</xpath>
-					<value>
-						<label>L-Star</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_MechanoidLMG"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.086</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Poke</li>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.118</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.086</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>
-								</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Devotion -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ARL_ChargeLMG</defName>
-					<statBases>
-						<WorkToMake>55000</WorkToMake>
-						<Bulk>12.5</Bulk>
-						<Mass>12.5</Mass>
-						<SightsEfficiency>1.5</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.1</SwayFactor>
-						<RangedWeapon_Cooldown>1.80</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.23</recoilAmount>
-						<recoilPattern>Mounted</recoilPattern>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
-						<burstShotCount>15</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>1.8</warmupTime>
-						<range>58</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>60</magazineSize>
-						<reloadTime>2.8</reloadTime>
-						<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>10</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-					</weaponTags>
-					<researchPrerequisite>GasOperation</researchPrerequisite>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_ChargeLMG"]/label</xpath>
-					<value>
-						<label>Devotion</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_ChargeLMG"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.6</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.102</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetrationBlunt>0.102</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetrationBlunt>0.075</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- 40mm Charge Minigun -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ARL_ChargeMinigun</defName>
-					<statBases>
-						<WorkToMake>105000</WorkToMake>
-						<Bulk>14.7</Bulk>
-						<Mass>9.12</Mass>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.53</SwayFactor>
-						<RangedWeapon_Cooldown>0.90</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.98</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_ARL_127x39mmCharged_HE</defaultProjectile>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>18</ticksBetweenBurstShots>
-						<warmupTime>1.75</warmupTime>
-						<range>52</range>
-						<minRange>2</minRange>
-						<soundCast>ARL_Shot_ChargeMinigun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>60</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_ARL_127x39mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_Machinegun</li>
-					</weaponTags>
-					<researchPrerequisite>GasOperation</researchPrerequisite>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_ChargeMinigun"]/label</xpath>
-					<value>
-						<label>Charge Minigun</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_ChargeMinigun"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.86</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.118</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.86</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_Pistols.xml b/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_Pistols.xml
deleted file mode 100644
index 1f0cf2cc38..0000000000
--- a/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_Pistols.xml	
+++ /dev/null
@@ -1,341 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Apex: Rimworld Legends (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Hammond P2020 -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ARL_CombatHandgun</defName>
-					<statBases>
-						<WorkToMake>5000</WorkToMake>
-						<Bulk>1.2</Bulk>
-						<Mass>1.2</Mass>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1</SwayFactor>
-						<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_38ACP_FMJ</defaultProjectile>
-						<warmupTime>0.3</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>1.25</reloadTime>
-						<ammoSet>AmmoSet_38ACP</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_CombatHandgun"]/label</xpath>
-					<value>
-						<label>Hammond P2020</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_CombatHandgun"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.075</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.102</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.075</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Re-45 -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ARL_ChargePistol</defName>
-					<statBases>
-						<WorkToMake>10000</WorkToMake>
-						<Bulk>1.75</Bulk>
-						<Mass>0.85</Mass>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>0.87</SwayFactor>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.60</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
-						<burstShotCount>15</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>14</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>1.74</reloadTime>
-						<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_ChargePistol"]/label</xpath>
-					<value>
-						<label>Re-45 Autopistol</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_ChargePistol"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.102</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.102</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Wingman -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ARL_HandCannon</defName>
-					<statBases>
-						<WorkToMake>4500</WorkToMake>
-						<Bulk>2.1</Bulk>
-						<Mass>0.82</Mass>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.19</ShotSpread>
-						<SwayFactor>0.91</SwayFactor>
-						<RangedWeapon_Cooldown>1.4</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.42</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>0.46</warmupTime>
-						<range>16</range>
-						<soundCast>Shot_Revolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>3.66</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_HandCannon"]/label</xpath>
-					<value>
-						<label>B3 Wingman</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_HandCannon"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.075</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.102</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.075</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Mozambique -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ARL_ShotgunHandgun</defName>
-					<statBases>
-						<WorkToMake>6000</WorkToMake>
-						<Bulk>1.6</Bulk>
-						<Mass>0.82</Mass>
-						<SightsEfficiency>0.9</SightsEfficiency>
-						<ShotSpread>0.19</ShotSpread>
-						<SwayFactor>0.91</SwayFactor>
-						<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>3.76</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_38ACP_FMJ</defaultProjectile>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<warmupTime>1.8</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Revolver</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>3.66</reloadTime>
-						<ammoSet>AmmoSet_38ACP</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_ShotgunHandgun"]/label</xpath>
-					<value>
-						<label>SA-3 Mozambique</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_ShotgunHandgun"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.102</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_SMG.xml b/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_SMG.xml
deleted file mode 100644
index c5a5237a54..0000000000
--- a/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_SMG.xml	
+++ /dev/null
@@ -1,266 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Apex: Rimworld Legends (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Alternator -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ARL_LightSMG</defName>
-					<statBases>
-						<WorkToMake>11500</WorkToMake>
-						<Bulk>2.5</Bulk>
-						<Mass>0.85</Mass>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>0.85</SwayFactor>
-						<RangedWeapon_Cooldown>1.4</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.22</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_41Rimfire_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>0.5</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>18</magazineSize>
-						<reloadTime>3.2</reloadTime>
-						<ammoSet>AmmoSet_41Rimfire</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_SMG</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_LightSMG"]/label</xpath>
-					<value>
-						<label>Alternator SMG</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_LightSMG"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.075</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.102</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- R-99 SMG -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ARL_CompactSMG</defName>
-					<statBases>
-						<WorkToMake>24000</WorkToMake>
-						<Bulk>3.5</Bulk>
-						<Mass>3.5</Mass>
-						<SightsEfficiency>1.2</SightsEfficiency>
-						<ShotSpread>1.03</ShotSpread>
-						<SwayFactor>1.5</SwayFactor>
-						<RangedWeapon_Cooldown>1.33</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.55</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<burstShotCount>4</burstShotCount>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<warmupTime>1</warmupTime>
-						<range>26</range>
-						<soundCast>Shot_HeavySMG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>18</magazineSize>
-						<reloadTime>1.80</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_SMG</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_CompactSMG"]/label</xpath>
-					<value>
-						<label>R-99 SMG</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_CompactSMG"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.075</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.102</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Prowler Burst PDW -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ARL_ChargeSMG</defName>
-					<statBases>
-						<WorkToMake>29000</WorkToMake>
-						<Bulk>3.68</Bulk>
-						<Mass>2.5</Mass>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>0.85</SwayFactor>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.41</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>0.9</warmupTime>
-						<range>28</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>21</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_SMG</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_ChargeSMG"]/label</xpath>
-					<value>
-						<label>Prowler Burst PDW</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_ChargeSMG"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.075</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.102</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.075</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_Shotguns.xml b/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_Shotguns.xml
deleted file mode 100644
index aeb17a01d7..0000000000
--- a/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_Shotguns.xml	
+++ /dev/null
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Apex: Rimworld Legends (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Mastiff -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ARL_ChargeShotgun</defName>
-					<statBases>
-						<WorkToMake>48000</WorkToMake>
-						<Bulk>9</Bulk>
-						<Mass>3.5</Mass>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.25</SwayFactor>
-						<RangedWeapon_Cooldown>1.58</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.39</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12GaugeCharged_Slug</defaultProjectile>
-						<warmupTime>1.36</warmupTime>
-						<range>16</range>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>4</magazineSize>
-						<reloadTime>6</reloadTime>
-						<ammoSet>AmmoSet_12GaugeCharged</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_ChargeShotgun"]/label</xpath>
-					<value>
-						<label>M1901 Mastiff</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_ChargeShotgun"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.102</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Peacekeeper -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ARL_LeverActionShotgun</defName>
-					<statBases>
-						<WorkToMake>13000</WorkToMake>
-						<Bulk>4.2</Bulk>
-						<Mass>2.3</Mass>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.20</SwayFactor>
-						<RangedWeapon_Cooldown>0.91</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.56</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.9</warmupTime>
-						<range>18</range>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>10</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_LeverActionShotgun"]/label</xpath>
-					<value>
-						<label>Peacepeeker</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "ARL_LeverActionShotgun"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.118</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- EVA-8 Auto -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ARL_SemiAutomaticShotgun</defName>
-					<statBases>
-						<WorkToMake>33000</WorkToMake>
-						<Bulk>4.6</Bulk>
-						<Mass>4.6</Mass>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.26</SwayFactor>
-						<RangedWeapon_Cooldown>1.35</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.12</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>16</range>
-						<soundCast>Shot_Shotgun_NoRack</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>2.75</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_SemiAutomaticShotgun"]/label</xpath>
-					<value>
-						<label>Eva-8 Auto</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_SemiAutomaticShotgun"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.118</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.118</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.086</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_SniperRifles.xml b/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_SniperRifles.xml
deleted file mode 100644
index 1d5cb22ad4..0000000000
--- a/Patches/Apex - Rimworld Legends/ApexRimworldLegends_Weapons_SniperRifles.xml	
+++ /dev/null
@@ -1,339 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Apex: Rimworld Legends (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Longbow DMR -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ARL_MarksmanRifle</defName>
-					<statBases>
-						<WorkToMake>55000</WorkToMake>
-						<Bulk>12.25</Bulk>
-						<Mass>4.3</Mass>
-						<SightsEfficiency>3.5</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.70</SwayFactor>
-						<RangedWeapon_Cooldown>2.3</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.36</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>3</warmupTime>
-						<range>86</range>
-						<soundCast>Shot_SniperRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>2.82</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SniperRifle</li>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_MarksmanRifle"]/label</xpath>
-					<value>
-						<label>D-101 Longbow DMR</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_MarksmanRifle"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.086</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Barrel</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.118</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.086</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Triple Take -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ARL_ChargeSniperRifle</defName>
-					<statBases>
-						<WorkToMake>48000</WorkToMake>
-						<Bulk>12.24</Bulk>
-						<Mass>4.3</Mass>
-						<SightsEfficiency>2</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1.92</SwayFactor>
-						<RangedWeapon_Cooldown>2.3</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.11</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_5656Spencer_FMJ</defaultProjectile>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<warmupTime>3.5</warmupTime>
-						<range>68</range>
-						<soundCast>Shot_SniperRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>3.2</reloadTime>
-						<ammoSet>AmmoSet_5656Spencer</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>SniperRifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_ChargeSniperRifle"]/label</xpath>
-					<value>
-						<label>Triple Take</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_ChargeSniperRifle"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.086</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.118</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.86</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- G7 Scout -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ARL_SemiautomaticRifle</defName>
-					<statBases>
-						<WorkToMake>23500</WorkToMake>
-						<Bulk>9.8</Bulk>
-						<Mass>3.0</Mass>
-						<SightsEfficiency>1.66</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.31</SwayFactor>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.96</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
-						<warmupTime>0.90</warmupTime>
-						<range>64</range>
-						<soundCast>Shot_SniperRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.0</reloadTime>
-						<ammoSet>AmmoSet_338Lapua</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>SniperRifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_SemiautomaticRifle"]/label</xpath>
-					<value>
-						<label>G7 Scout</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_SemiautomaticRifle"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.86</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.118</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.086</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Kraber -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ARL_MechanoidSniperRifle</defName>
-					<statBases>
-						<WorkToMake>100000</WorkToMake>
-						<Bulk>14.6</Bulk>
-						<Mass>13.53</Mass>
-						<SightsEfficiency>3</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>2.23</SwayFactor>
-						<RangedWeapon_Cooldown>3.13</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>3.21</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>3.5</warmupTime>
-						<range>106</range>
-						<soundCast>ARL_Shot_MechanoidSniperRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>4</magazineSize>
-						<reloadTime>3.6</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>SniperRifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_MechanoidSniperRifle"]/label</xpath>
-					<value>
-						<label>.50 Kraber AM-R</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ARL_MechanoidSniperRifle"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.86</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.116</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.86</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Apparello/ThingDefs/ApparelHats_Famous.xml b/Patches/Apparello/ThingDefs/ApparelHats_Famous.xml
deleted file mode 100644
index 22d4292eb0..0000000000
--- a/Patches/Apparello/ThingDefs/ApparelHats_Famous.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Apparello 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== Doom helmet ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparello_Doom"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Doom"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>36</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Doom"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName = "Apparello_Doom"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-				<!-- ========== Quote hat ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Quotee"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.02</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Quotee"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.03</ArmorRating_Blunt>
-					</value>
-				</li>
-				<!-- ========== PsyCo mask ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparel_Psymask"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparel_Psymask"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "Apparel_Psymask"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "Apparel_Psymask"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparel_Psymask"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName = "Apparel_Psymask"]</xpath>
-					<value>
-						<li Class="CombatExtended.ApparelHediffExtension">
-							<hediff>WearingGasMask</hediff>
-						</li>
-					</value>
-				</li>
-				<!-- ========== Zorro, foot clan ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Zorro" or defName="Apparello_Footy"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.02</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Zorro" or defName="Apparello_Footy"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.03</ArmorRating_Blunt>
-					</value>
-				</li>
-				<!-- ========== Tali ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparello_Meffect" or defName = "Apparello_Meffectwo"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Meffect" or defName = "Apparello_Meffectwo"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>18</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Meffect" or defName = "Apparello_Meffectwo"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>9</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName = "Apparello_Meffect" or defName = "Apparello_Meffectwo"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-				<!-- ========== Aerocowl ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Kurt" or defName="Apparello_Kurtlite"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Kurt" or defName="Apparello_Kurtlite"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-				<!-- ========== Scrap mask ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparello_Raideroos"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Raideroos"]/stuffCategories/li[.="Metallic"]</xpath>
-					<value>
-						<li>Steeled</li>
-					</value>
-				</li>
-				<!-- ========== Infiltrator headgear ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparello_Yi"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Yi"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<AimingAccuracy>0.05</AimingAccuracy>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName = "Apparello_Yi"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-				<!-- ========== Raz ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Raz"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.08</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Raz"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Apparello/ThingDefs/ApparelHats_FurEyes.xml b/Patches/Apparello/ThingDefs/ApparelHats_FurEyes.xml
deleted file mode 100644
index cdba882376..0000000000
--- a/Patches/Apparello/ThingDefs/ApparelHats_FurEyes.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Apparello 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== Science goggles, shades, aviators, visors ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparello_Goggles" or defName="Apparello_Shadess" or defName="Apparello_Piloggle"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>0.02</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Visoor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.02</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Goggles" or defName="Apparello_Visoor" or defName="Apparello_Shadess" or defName="Apparello_Piloggle"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.03</ArmorRating_Blunt>
-					</value>
-				</li>
-				<!-- ========== Ski mask ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Brimsk"]/statBases/Mass</xpath>
-					<value>
-						<Mass>1</Mass>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Brimsk"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Brimsk"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Apparello/ThingDefs/ApparelHats_Various.xml b/Patches/Apparello/ThingDefs/ApparelHats_Various.xml
deleted file mode 100644
index ff8f81d01f..0000000000
--- a/Patches/Apparello/ThingDefs/ApparelHats_Various.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Apparello 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== Welding mask ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Wendywelder"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-				<!-- ========== Hardhat ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Hardhat"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Hardhat"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-				<!-- ========== Chef hats, surgeon ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparello_Chefhat" or defName="Apparello_Docteur"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<ArmorRating_Sharp>0.02</ArmorRating_Sharp>
-						<ArmorRating_Blunt>0.03</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparello_Chefhatplus"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.02</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparello_Chefhatplus"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.03</ArmorRating_Blunt>
-					</value>
-				</li>
-				<!-- ========== Tac-team headcover ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Cyninja" or defName = "Apparello_Cybissar"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<AimingAccuracy>0.05</AimingAccuracy>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Cyninja" or defName = "Apparello_Cybissar"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Cyninja" or defName = "Apparello_Cybissar"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>12</ArmorRating_Blunt>
-					</value>
-				</li>
-				<!-- ========== Medic helmet ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparello_Medihelmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Medihelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>12</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Medihelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName = "Apparello_Medihelmet"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-				<!-- ========== Medic bandana ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Medband"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.015</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Medband"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.01</ArmorRating_Sharp>
-					</value>
-				</li>
-				<!-- ========== Nerve enhancer ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparello_Proto" or defName = "Apparello_ProtoFin"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Proto" or defName = "Apparello_ProtoFin"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Proto" or defName = "Apparello_ProtoFin"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-				<!-- ========== Misc ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparello_Wendywelder" or defName = "Apparello_Hardhat" or defName = "Apparello_Moron"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Moron"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Moron"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparello_Sandtrader"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>0.03</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparello_Sandtrader"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>0.02</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "Apparello_Gassy" or defName = "Apparello_Sandtrader"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "Apparello_Gassy" or defName = "Apparello_Sandtrader"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparello_Gassy" or defName="Apparello_Sandtrader"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName = "Apparello_Gassy"]</xpath>
-					<value>
-						<li Class="CombatExtended.ApparelHediffExtension">
-							<hediff>WearingGasMask</hediff>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparello_Bandit" or defName="Apparello_Vandal"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-0.15</SmokeSensitivity>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Apparello/ThingDefs/ApparelLayers.xml b/Patches/Apparello/ThingDefs/ApparelLayers.xml
deleted file mode 100644
index 0b65d095a9..0000000000
--- a/Patches/Apparello/ThingDefs/ApparelLayers.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Apparello 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Apparello_Bandit" or defName="Apparello_Bandal" or defName="Apparello_Beret" or defName="Apparello_Brimsk" or defName="Apparello_Cyninja" or defName="Apparello_Footy" or defName="Apparello_Gassy" or defName="Apparello_Goggles" or defName="Apparello_Headset" or defName="Apparello_Hoood" or defName="Apparello_Medband" or defName="Apparel_Psymask" or defName="Apparello_Raz" or defName="Apparello_Vandal" or defName="Apparello_Shadess" or defName="Apparello_Docteur" or defName="Apparello_Visoor"]/apparel/layers/li[.="Overhead"]</xpath>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparello_Cyninja" or defName="Apparello_Cybissar" or defName="Apparello_Doom" or defName="Apparello_Meffect" or defName="Apparello_Meffectwo" or defName="Apparello_Kurt" or defName="Apparello_Kurtlite" or defName="Apparello_ProtoFin" or defName="Apparello_Proto" or defName="Apparello_Rockman" or defName="Apparello_Wendywelder" or defName="Apparello_Yi" or defName="Apparello_Brimsk" or defName="Apparello_Gassy" or defName="Apparello_Goggles" or defName="Apparello_Headset" or defName="Apparel_Psymask" or defName="Apparello_Shadess" or defName="Apparello_Docteur" or defName="Apparello_Visoor" or defName="Apparello_Sandtrader" or defName="Apparello_Zorro"]/apparel/layers</xpath>
-					<value>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparello_Cyninja" or defName="Apparello_Cybissar" or defName="Apparello_ProtoFin" or defName="Apparello_Proto" or defName="Apparello_Headset" or defName="Apparello_Docteur" or defName="Apparello_Footy" or defName="Apparello_Medband" or defName="Apparello_Vandal"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Tribalshield"]/apparel/layers/li[.="Shell"]</xpath>
-					<value>
-						<li>Shield</li>
-					</value>
-				</li>
-				<!-- ====================== Bandit ===================== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparello_Bandit"]/apparel/layers</xpath>
-					<value>
-						<layers>
-							<li>Overhead</li>
-						</layers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparello_Bandit"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>Neck</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-				<!-- ====================== Beret ===================== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparello_Beret"]/apparel/layers</xpath>
-					<value>
-						<layers>
-							<li>Overhead</li>
-						</layers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparello_Beret"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>UpperHead</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-				<!-- ====================== Bandal ===================== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparello_Bandal"]/apparel/layers</xpath>
-					<value>
-						<layers>
-							<li>Overhead</li>
-						</layers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparello_Bandal"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>UpperHead</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-				<!-- ====================== Hood ===================== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparello_Hoood"]/apparel/layers</xpath>
-					<value>
-						<layers>
-							<li>Overhead</li>
-						</layers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparello_Hoood"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>UpperHead</li>
-							<li>Neck</li>
-							<li>Ears</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-				<!-- ====================== Raz ===================== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparello_Raz"]/apparel/layers</xpath>
-					<value>
-						<layers>
-							<li>Overhead</li>
-						</layers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparello_Raz"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>UpperHead</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-				<!-- ====================== Shades ===================== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparello_Shadess"]/apparel/layers</xpath>
-					<value>
-						<layers>
-							<li>StrappedHead</li>
-						</layers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparello_Shadess"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>Eyes</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-				<!-- ====================== Aviator Sunglasses ===================== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparello_Piloggle"]/apparel/layers</xpath>
-					<value>
-						<layers>
-							<li>StrappedHead</li>
-						</layers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparello_Piloggle"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>Eyes</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Apparello/ThingDefs/Apparel_Pantaloons.xml b/Patches/Apparello/ThingDefs/Apparel_Pantaloons.xml
deleted file mode 100644
index dd98657230..0000000000
--- a/Patches/Apparello/ThingDefs/Apparel_Pantaloons.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Apparello 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparello_Spacemarinepants"]/statBases</xpath>
-					<value>
-						<Bulk>20</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Pollypocket"]/equippedStatOffsets/CarryingCapacity</xpath>
-					<value>
-						<CarryBulk>5</CarryBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName = "Apparello_Pollypocket"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Apparello/ThingDefs/Apparel_RareTheHippogryff.xml b/Patches/Apparello/ThingDefs/Apparel_RareTheHippogryff.xml
deleted file mode 100644
index eb80ed1887..0000000000
--- a/Patches/Apparello/ThingDefs/Apparel_RareTheHippogryff.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Apparello 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== Prototype armors ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparello_Scytherframe"]/equippedStatOffsets</xpath>
-					<value>
-						<ReloadSpeed>0.2</ReloadSpeed>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Scytherframe"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Scytherframe"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>12</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_HiveArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_HiveArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>45</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Steamhull"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Steamhull"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>40.5</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName = "Apparello_HiveArmor" or defName = "Apparello_Steamhull"]/equippedStatOffsets</xpath>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparello_HiveArmor" or defName = "Apparello_Steamhull"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>25</WornBulk>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Apparello/ThingDefs/Apparel_Stuffed.xml b/Patches/Apparello/ThingDefs/Apparel_Stuffed.xml
deleted file mode 100644
index 9351b52161..0000000000
--- a/Patches/Apparello/ThingDefs/Apparel_Stuffed.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Apparello 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== XCOM ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparello_XcomOne"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>5</CarryBulk>
-					</value>
-				</li>
-
-				<!-- ========== Padded vest ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparello_Sheet"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<!-- ========== Ammo belt ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Ammobelt"]/equippedStatOffsets/AimingDelayFactor</xpath>
-					<value>
-						<CarryBulk>5</CarryBulk>
-						<ReloadSpeed>0.05</ReloadSpeed>
-					</value>
-				</li>
-
-				<!-- ========== Trader coat ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparello_Trypophobiaa"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparello_Trypophobiaa"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>50</CarryBulk>
-						<ReloadSpeed>0.05</ReloadSpeed>
-					</value>
-				</li>
-				<!--
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName = "Apparello_Trypophobiaa"]/apparel/layers</xpath>
-				<value>
-					<li>Belt</li>
-				</value>
-			</li>
-			-->
-				<!-- ========== Tribal shield ========== -->
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName = "Apparello_Tribalshield"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>ShieldBase</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Tribalshield"]/apparel</xpath>
-					<value>
-						<apparel>
-							<tags>
-								<li>TribalShield</li>
-							</tags>
-						</apparel>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparello_Tribalshield"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparello_Tribalshield"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<ReloadSpeed>-0.05</ReloadSpeed>
-							<MeleeHitChance>-0.05</MeleeHitChance>
-							<ShootingAccuracyPawn>-0.05</ShootingAccuracyPawn>
-							<AimingAccuracy>-0.05</AimingAccuracy>
-							<Suppressability>-0.25</Suppressability>
-							<MeleeCritChance>-0.05</MeleeCritChance>
-							<MeleeParryChance>1.0</MeleeParryChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName = "Apparello_Tribalshield"]/generateCommonality</xpath>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName = "Apparello_Tribalshield"]</xpath>
-					<value>
-						<li Class="CombatExtended.ShieldDefExtension">
-							<shieldCoverage>
-								<li>Hands</li>
-								<li>Arms</li>
-								<li>Shoulders</li>
-								<li>Torso</li>
-								<li>Neck</li>
-							</shieldCoverage>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Apparello/ThingDefs/Apparel_Stuffless_And_Bases.xml b/Patches/Apparello/ThingDefs/Apparel_Stuffless_And_Bases.xml
deleted file mode 100644
index febcb91f4a..0000000000
--- a/Patches/Apparello/ThingDefs/Apparel_Stuffless_And_Bases.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Apparello 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== Alloy vest ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Gspot"]/statBases/Mass</xpath>
-					<value>
-						<Mass>9</Mass>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Gspot"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Gspot"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>36</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ========== Medium power armor ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparello_Gshell" or defName="Apparello_GShellII"]/statBases</xpath>
-					<value>
-						<Bulk>20</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Gshell" or defName="Apparello_GShellII"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<CarryWeight>10</CarryWeight>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Gshell" or defName="Apparello_GShellII"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>15</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Gshell" or defName="Apparello_GShellII"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>30</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ========== Surgeon's apron ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparello_MedicalApron"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>0.02</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparello_MedicalApron"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>0.03</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ========== Tunica el mogo ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparello_Mogo"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>0.02</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparello_Mogo"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>0.03</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ========== XCOM ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparello_Standissue"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>5</CarryBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Standissue"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.02</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Standissue"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.03</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ========== Chestplate ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparello_Syndicatetello" or defName="Apparello_Syndicatellorare"]/statBases</xpath>
-					<value>
-						<Bulk>20</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName = "Apparello_Syndicatetello"]/equippedStatOffsets</xpath>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Syndicatetello"]/statBases/EnergyShieldRechargeRate</xpath>
-					<value>
-						<EnergyShieldRechargeRate>0.235</EnergyShieldRechargeRate>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Syndicatetello"]/statBases/EnergyShieldEnergyMax</xpath>
-					<value>
-						<EnergyShieldEnergyMax>2</EnergyShieldEnergyMax>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Syndicatetello" or defName="Apparello_Syndicatellorare"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Syndicatetello" or defName="Apparello_Syndicatellorare"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>12</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ========== Orkpads ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Orkpad"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Orkpad"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ========== Spacemarine leggings ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Spacemarinepants"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Spacemarinepants"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>36</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ========== Joywirer's brocade ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparello_Medicade"]/apparel/layers</xpath>
-					<value>
-						<li>Belt</li>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Medicade"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<ArmorRating_Sharp>0.01</ArmorRating_Sharp>
-						<ArmorRating_Blunt>0.015</ArmorRating_Blunt>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Apparello/ThingDefs/StuffPowers.xml b/Patches/Apparello/ThingDefs/StuffPowers.xml
deleted file mode 100644
index d5852bc994..0000000000
--- a/Patches/Apparello/ThingDefs/StuffPowers.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Apparello 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparello_Bandit"]/statBases</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Brocade" or defName="Apparello_Urbulence" or defName="Apparello_Headset" or defName="Apparello_Vandal"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_GSkin" or defName = "Apparello_XcomOne" or defName="Apparello_SFSurge" or defName="Apparello_Cookaprontosaurus" or defName="Apparello_PonPon" or defName="Apparello_Preston" or defName="Apparello_Urbskin" or defName="Apparello_Suspender" or defName="Apparello_Spacerpants" or defName="Apparello_Holdem" or defName="Apparello_Scrapants" or defName="Apparello_Pollypocket" or defName="Apparello_Jodhpurs" or defName="Apparello_Skirtwirly" or defName="Apparello_square" or defName="Apparello_Commissar" or defName="Apparello_Gassy" or defName="Apparello_Plainhat" or defName="Apparello_Cardshark" or defName="Apparello_Fedora" or defName="Apparello_Beret" or defName="Apparello_Tophat" or defName="Apparello_Bandal" or defName="Apparello_Lecap" or defName="Apparello_Sombrero"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparello_Chapel" or defName="Apparello_TribalPants"]/statBases</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Smithaprontosaurus" or defName="Apparel_UniPjays" or defName="Apparello_Jeans" or defName="Apparello_Lederhose" or defName="Apparello_Tunic" or defName="Apparello_Tradecone"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName = "Apparello_Urpad" or defName="Apparello_Rockman" or defName = "Apparello_Raideroos" or defName = "Apparello_Yi"]/statBases/ArmorRating_Sharp
-						| Defs/ThingDef[defName = "Apparello_Urpad" or defName="Apparello_Rockman" or defName = "Apparello_Raideroos" or defName = "Apparello_Yi"]/statBases/ArmorRating_Blunt </xpath>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparello_Urpad" or defName="Apparello_Ammobelt" or defName="Apparello_Tribalpad" or defName="Apparello_Rockman" or defName = "Apparello_Raideroos" or defName = "Apparello_Yi"]/statBases</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparello_Trypophobiaa" or defName="Apparello_Longlylonglong" or defName="Apparello_Skull" or defName="Apparello_Armorpants" or defName="Apparello_Hoood"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName = "Apparello_Sheet"]/statBases/ArmorRating_Sharp
-						| Defs/ThingDef[defName = "Apparello_Sheet"]/statBases/ArmorRating_Blunt </xpath>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparello_Sheet" or defName="Apparello_Furhat"]/statBases</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparello_Tribalshield" or defName="Apparello_Mojo" or defName="Apparello_Mojotwo" or defName="Apparello_MojoFeather"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>10</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Appliances Expanded/CA_ChemfuelSmithy.xml b/Patches/Appliances Expanded/CA_ChemfuelSmithy.xml
deleted file mode 100644
index 4b9fe09f7b..0000000000
--- a/Patches/Appliances Expanded/CA_ChemfuelSmithy.xml	
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Appliances Expanded</li>
-		</mods>
-
-		<!-- Patches for the smithy and large smithy if VFE: Production is loaded -->
-		<match Class="PatchOperationAdd">
-			<xpath>Defs/ThingDef[contains(tradeTags, "CE_AutoEnableCrafting_FueledSmithy")]/tradeTags</xpath>
-			<value>
-				<li>CE_AutoEnableCrafting_CA_ChemfuelSmithy</li>
-				<!-- Reduces patch complexity since MayRequire is allowed on li items -->
-				<li MayRequire="vanillaexpanded.vfeproduction">CE_AutoEnableCrafting_CE_FueledSmithyLarge</li>
-			</value>
-		</match>
-
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Arachne/AlienRace_Arachne.xml b/Patches/Arachne/AlienRace_Arachne.xml
deleted file mode 100644
index 534821b6c6..0000000000
--- a/Patches/Arachne/AlienRace_Arachne.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Arachne Race</li>
-			<li>Arachne Race (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Arachne"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Arachne"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1</AimingAccuracy>
-						<MeleeCritChance>1.1</MeleeCritChance>
-						<MeleeParryChance>1.1</MeleeParryChance>
-						<ReloadSpeed>1</ReloadSpeed>
-						<Suppressability>1.2</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Arachne"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.90</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>22</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.90</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>22</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>ArachneClawLeft</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.60</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.90</armorPenetrationSharp>
-								<chanceFactor>0.2</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>30</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>ArachneClawRight</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.60</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.90</armorPenetrationSharp>
-								<chanceFactor>0.2</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>30</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Arachne"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Arachne"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Arachne"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Arachne/ApparelNew_Arachne.xml b/Patches/Arachne/ApparelNew_Arachne.xml
deleted file mode 100644
index 0f50724f5a..0000000000
--- a/Patches/Arachne/ApparelNew_Arachne.xml
+++ /dev/null
@@ -1,413 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Arachne Race</li>
-			<li>Arachne Race (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Arachne Shirt -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Arachne_Shirt"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachne_Shirt"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Arachne Valkyrie Armor -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Arachne_Valkyrie"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>18</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachne_Valkyrie"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3.15</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Arachne_Valkyrie"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachne_Valkyrie"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>-0.15</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Arachne_Valkyrie"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Arachne_Valkyrie"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- Arachne Valkyrie Helmet -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Arachne_Valkyrie_Helmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachne_Valkyrie_Helmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.45</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Arachne_Valkyrie_Helmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- Arachne Scout Armor -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Arachne_Scout_Armor"]/statBases</xpath>
-					<value>
-						<Bulk>90</Bulk>
-						<WornBulk>13</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachne_Scout_Armor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>450</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachne_Scout_Armor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>40</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachne_Scout_Armor"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0.2</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachne_Scout_Armor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachne_Scout_Armor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>40</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachne_Scout_Armor"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>140</Plasteel>
-						<DevilstrandCloth>40</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Arachne_Scout_Armor"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Arachne_Scout_Armor"]/equippedStatOffsets/WorkSpeedGlobal</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Arachne_Scout_Armor"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Arachne_Scout_Armor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>8</CarryBulk>
-						<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-						<MoveSpeed>0.3</MoveSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Arachne_Scout_Armor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Arachne_Scout_Armor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- Arachne Scout Helmet -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Arachne_Scout_Helmet"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.7</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachne_Scout_Helmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>190</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachne_Scout_Helmet"]/statBases/Mass</xpath>
-					<value>
-						<Mass>3.0</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachne_Scout_Helmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0.25</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachne_Scout_Helmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachne_Scout_Helmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>30</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachne_Scout_Helmet"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>50</Plasteel>
-						<DevilstrandCloth>15</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Arachne_Scout_Helmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Arachne_Scout_Helmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Arachne_Scout_Helmet"]/equippedStatOffsets</xpath>
-					<value>
-						<AimingAccuracy>0.15</AimingAccuracy>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Arachne_Scout_Helmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Arachne_Scout_Helmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.50</ArmorRating_Sharp>
-									<parts>
-										<li>Nose</li>
-										<li>Jaw</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.50</ArmorRating_Blunt>
-									<parts>
-										<li>Nose</li>
-										<li>Jaw</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Arachne/Apparel_Arachne.xml b/Patches/Arachne/Apparel_Arachne.xml
deleted file mode 100644
index 5730b2ee87..0000000000
--- a/Patches/Arachne/Apparel_Arachne.xml
+++ /dev/null
@@ -1,381 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Arachne Race</li>
-			<li>Arachne Race (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Arachne Battle Armor -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Arachne_Armor"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachne_Armor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Arachne_Armor"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachne_Armor"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>-0.15</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Arachne_Armor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Arachne_Armor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- Arachne Battle Helmet -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Arachne_Armor_Helmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachne_Armor_Helmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.35</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Arachne_Armor_Helmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- Arachne Assassin Armor -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Arachne_Power_Armor"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachne_Power_Armor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>500</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachne_Power_Armor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>47</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachne_Power_Armor"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachne_Power_Armor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachne_Power_Armor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>45</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachne_Power_Armor"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>160</Plasteel>
-						<DevilstrandCloth>50</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Arachne_Power_Armor"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Arachne_Power_Armor"]/equippedStatOffsets/WorkSpeedGlobal</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Arachne_Power_Armor"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Arachne_Power_Armor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>80</CarryWeight>
-						<CarryBulk>10</CarryBulk>
-						<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Arachne_Power_Armor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Arachne_Power_Armor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- Arachne Assassin Helmet -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Arachne_Power_Helmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachne_Power_Helmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>240</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachne_Power_Helmet"]/statBases/Mass</xpath>
-					<value>
-						<Mass>4.8</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachne_Power_Helmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachne_Power_Helmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachne_Power_Helmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>36</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachne_Power_Helmet"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>60</Plasteel>
-						<DevilstrandCloth>20</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Arachne_Power_Helmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Arachne_Power_Helmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Arachne_Power_Helmet"]/equippedStatOffsets</xpath>
-					<value>
-						<AimingAccuracy>0.15</AimingAccuracy>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Arachne_Power_Helmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Arachne_Power_Helmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Arachne/Leather_Arachne.xml b/Patches/Arachne/Leather_Arachne.xml
deleted file mode 100644
index b50708db5d..0000000000
--- a/Patches/Arachne/Leather_Arachne.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Arachne Race</li>
-			<li>Arachne Race (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Leather_Arachne"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.30</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Arachne"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.20</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Leather_Arachne"]/stuffProps</xpath>
-					<value>
-						<categories>
-							<li>SoftArmor</li>
-						</categories>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Arachne/MeleeWeapons_Arachne.xml b/Patches/Arachne/MeleeWeapons_Arachne.xml
deleted file mode 100644
index baa8dac343..0000000000
--- a/Patches/Arachne/MeleeWeapons_Arachne.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Arachne Race</li>
-			<li>Arachne Race (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Arachne Sword -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachne_Sword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2.1</cooldownTime>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>38</power>
-								<cooldownTime>3</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Arachne_Sword"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>3</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Arachne_Sword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.60</MeleeCritChance>
-							<MeleeParryChance>0.375</MeleeParryChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Arachne Scythe -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachne_Scythe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2.46</cooldownTime>
-								<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>2.83</cooldownTime>
-								<chanceFactor>1.122</chanceFactor>
-								<armorPenetrationSharp>5.065</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Arachne_Scythe"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<MeleeCounterParryBonus>0.69</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Arachne_Scythe"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.1</MeleeCritChance>
-							<MeleeParryChance>0.63</MeleeParryChance>
-							<MeleeDodgeChance>0.67</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Arachne/PawnKind_Arachne.xml b/Patches/Arachne/PawnKind_Arachne.xml
deleted file mode 100644
index 485e1b22f8..0000000000
--- a/Patches/Arachne/PawnKind_Arachne.xml
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Arachne Race</li>
-			<li>Arachne Race (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Arachne_Colonist"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>1</min>
-								<max>3</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>50</min>
-										<max>1000</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Arachne_Settler"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>1</min>
-								<max>3</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>50</min>
-										<max>1000</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Arachne_Trader"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>1</min>
-								<max>1</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>500</min>
-										<max>2000</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Arachne_Soldier"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>1000</min>
-										<max>3000</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-										<li>ArachneSword</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Arachne_Valkyrie"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>1000</min>
-										<max>3000</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-										<li>ArachneSword</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Arachne_Scout"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>1000</min>
-										<max>3000</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-										<li>ArachneSword</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="ArachneGrenadierBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>2000</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-										<li>ArachneSword</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="ArachneMidTierBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>2000</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-										<li>ArachneSword</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="ArachneEliteTierBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>2000</min>
-										<max>5000</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-										<li>ArachneSword</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Arachne/Weapons_Arachne.xml b/Patches/Arachne/Weapons_Arachne.xml
deleted file mode 100644
index 430bb8b4ee..0000000000
--- a/Patches/Arachne/Weapons_Arachne.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Arachne Race</li>
-			<li>Arachne Race (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ArachnePninety</defName>
-					<statBases>
-						<Mass>3.5</Mass>
-						<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.2</SightsEfficiency>
-						<ShotSpread>0.3</ShotSpread>
-						<SwayFactor>0.5</SwayFactor>
-						<Bulk>4.5</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.1</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>30</range>
-						<burstShotCount>9</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>Shot_SMG</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>6</reloadTime>
-						<ammoSet>AmmoSet_FN57x28mm</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>ArachneWeapon</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ArachnePninety"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.999</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetrationBlunt>0.777</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetrationBlunt>0.888</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Arasaka Corporation [1.3]/7mmMiniRailgun.xml b/Patches/Arasaka Corporation [1.3]/7mmMiniRailgun.xml
deleted file mode 100644
index 7135577d59..0000000000
--- a/Patches/Arasaka Corporation [1.3]/7mmMiniRailgun.xml	
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Arasaka Corporation</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingCategoryDef>
-							<defName>Ammo7mmMiniRailgun</defName>
-							<label>7mm Railgun</label>
-							<parent>AmmoAdvanced</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberRailgunPistol</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_7mmMiniRailgun</defName>
-							<label>7mm Railgun</label>
-							<ammoTypes>
-								<Ammo_7mmMiniRailgun_Sabot>Bullet_7mmMiniRailgun_Sabot</Ammo_7mmMiniRailgun_Sabot>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_7mmMiniRailgun_Sabot</defName>
-							<label>7mm Railgun cartridge (Sabot)</label>
-							<description>Powerful tungsten carbide penetrator with discarding sabot, designed for railgun pistols.</description>
-							<statBases>
-								<Mass>0.01</Mass>
-								<Bulk>0.012</Bulk>
-								<MarketValue>0.06</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_FabricationBench</li>
-								<!-- Railgun ammo isn't handloaded because it contains no propellant, and the sabots must be precision-machined anyway -->
-							</tradeTags>
-							<thingCategories>
-								<li>Ammo7mmMiniRailgun</li>
-							</thingCategories>
-							<graphicData>
-								<texPath>Things/Ammo/Railgun/Pistol</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>RailgunSabot</ammoClass>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="Base45ACPBullet">
-							<defName>Bullet_7mmMiniRailgun_Sabot</defName>
-							<label>7mm Railgun bullet (Sabot)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_Small</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>14</damageAmountBase>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<armorPenetrationBlunt>76.720</armorPenetrationBlunt>
-								<speed>202</speed>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_7mmMiniRailgun_Sabot</defName>
-							<label>make 7mm Railgun cartridge (Sabot) x500</label>
-							<description>Craft 500 7mm Railgun (Sabot) cartridges.</description>
-							<jobString>Making 7mm Railgun (Sabot) cartridges.</jobString>
-							<workAmount>5000</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>9</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Uranium</li>
-										</thingDefs>
-									</filter>
-									<count>3</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Uranium</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_7mmMiniRailgun_Sabot>500</Ammo_7mmMiniRailgun_Sabot>
-							</products>
-						</RecipeDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Arasaka Corporation [1.3]/BigBrainGyrojet.xml b/Patches/Arasaka Corporation [1.3]/BigBrainGyrojet.xml
deleted file mode 100644
index 0e3dd5f6a6..0000000000
--- a/Patches/Arasaka Corporation [1.3]/BigBrainGyrojet.xml	
+++ /dev/null
@@ -1,250 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Arasaka Corporation</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingCategoryDef>
-							<defName>Ammo6mmSmartGyrojet</defName>
-							<label>6mm Smart</label>
-							<parent>AmmoPistols</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_6mmSmartGyrojet</defName>
-							<label>6mm Smart</label>
-							<ammoTypes>
-								<Ammo_6mmSmartGyrojet_FMJ>Bullet_6mmSmartGyrojet_FMJ</Ammo_6mmSmartGyrojet_FMJ>
-								<Ammo_6mmSmartGyrojet_AP>Bullet_6mmSmartGyrojet_AP</Ammo_6mmSmartGyrojet_AP>
-								<Ammo_6mmSmartGyrojet_HP>Bullet_6mmSmartGyrojet_HP</Ammo_6mmSmartGyrojet_HP>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="6mmSmartGyrojetBase" ParentName="SmallAmmoBase" Abstract="True">
-							<description>Overengineered pistol rounds that utilizes miniature rockets for propulsion instead of gunpowder. It features limited self guidance.</description>
-							<statBases>
-								<Mass>0.011</Mass>
-								<Bulk>0.014</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_FabricationBench</li>
-							</tradeTags>
-							<thingCategories>
-								<li>Ammo6mmSmartGyrojet</li>
-							</thingCategories>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="6mmSmartGyrojetBase">
-							<defName>Ammo_6mmSmartGyrojet_FMJ</defName>
-							<label>6mm Smart rocket (FMJ)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Pistol/FMJ</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.14</MarketValue>
-							</statBases>
-							<ammoClass>FullMetalJacket</ammoClass>
-							<cookOffProjectile>Bullet_6mmSmartGyrojet_FMJ</cookOffProjectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="6mmSmartGyrojetBase">
-							<defName>Ammo_6mmSmartGyrojet_AP</defName>
-							<label>6mm Smart rocket (AP)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Pistol/AP</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.14</MarketValue>
-							</statBases>
-							<ammoClass>ArmorPiercing</ammoClass>
-							<cookOffProjectile>Bullet_6mmSmartGyrojet_AP</cookOffProjectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="6mmSmartGyrojetBase">
-							<defName>Ammo_6mmSmartGyrojet_HP</defName>
-							<label>6mm Smart rocket (HP)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Pistol/HP</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.14</MarketValue>
-							</statBases>
-							<ammoClass>HollowPoint</ammoClass>
-							<cookOffProjectile>Bullet_6mmSmartGyrojet_HP</cookOffProjectile>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="Base6mmSmartGyrojetBullet" ParentName="Base45ACPBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_Small</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>85</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6mmSmartGyrojetBullet">
-							<defName>Bullet_6mmSmartGyrojet_FMJ</defName>
-							<label>6mm Smart bullet (FMJ)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>10</damageAmountBase>
-								<armorPenetrationSharp>5</armorPenetrationSharp>
-								<armorPenetrationBlunt>18.4</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6mmSmartGyrojetBullet">
-							<defName>Bullet_6mmSmartGyrojet_AP</defName>
-							<label>6mm Smart bullet (AP)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>7</damageAmountBase>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>18.4</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6mmSmartGyrojetBullet">
-							<defName>Bullet_6mmSmartGyrojet_HP</defName>
-							<label>6mm Smart bullet (HP)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>13</damageAmountBase>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>18.4</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_6mmSmartGyrojet_FMJ</defName>
-							<label>make 6mm Smart (FMJ) rocket x200</label>
-							<description>Craft 200 6mm Smart (FMJ) rockets.</description>
-							<jobString>Making 6mm Smart (FMJ) rockets.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_6mmSmartGyrojet_FMJ>200</Ammo_6mmSmartGyrojet_FMJ>
-							</products>
-							<workAmount>2400</workAmount>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_6mmSmartGyrojet_AP</defName>
-							<label>make 6mm Smart (AP) rocket x200</label>
-							<description>Craft 200 6mm Smart (AP) rockets.</description>
-							<jobString>Making 6mm Smart (AP) rockets.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_6mmSmartGyrojet_AP>200</Ammo_6mmSmartGyrojet_AP>
-							</products>
-							<workAmount>2400</workAmount>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_6mmSmartGyrojet_HP</defName>
-							<label>make 6mm Smart (HP) rocket x200</label>
-							<description>Craft 200 6mm Smart (HP) rockets.</description>
-							<jobString>Making 6mm Smart (HP) rockets.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_6mmSmartGyrojet_HP>200</Ammo_6mmSmartGyrojet_HP>
-							</products>
-							<workAmount>2400</workAmount>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Arasaka Corporation [1.3]/Cyberweeb_Apperal.xml b/Patches/Arasaka Corporation [1.3]/Cyberweeb_Apperal.xml
deleted file mode 100644
index 1a2ee3481a..0000000000
--- a/Patches/Arasaka Corporation [1.3]/Cyberweeb_Apperal.xml	
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Arasaka Corporation</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Apparel_Turtleneck_AC === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_Turtleneck_AC" or defName="Apparel_Workwear_AC" or defName="Apparel_Workwear_W_AC"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<!-- === Arasaka Aramid Vest === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Aramid_Vest_AC"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-						<Bulk>5</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Aramid_Vest_AC"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>21</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Aramid_Vest_AC"]/costList/Cloth</xpath>
-					<value>
-						<Cloth>30</Cloth>
-						<DevilstrandCloth>15</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Apparel_Aramid_Vest_AC"]/equippedStatOffsets</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Arasaka Corporation [1.3]/Cyberweeb_Guns.xml b/Patches/Arasaka Corporation [1.3]/Cyberweeb_Guns.xml
deleted file mode 100644
index 4237870822..0000000000
--- a/Patches/Arasaka Corporation [1.3]/Cyberweeb_Guns.xml	
+++ /dev/null
@@ -1,366 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Arasaka Corporation</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--  ==========Guns==========  -->
-
-				<!-- Masamune Conventional-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_HJSH_18_Masamune_AC</defName>
-					<statBases>
-						<Mass>3.5</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.3</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.29</SwayFactor>
-						<Bulk>7.78</Bulk>
-						<WorkToMake>40000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>45</Steel>
-						<ComponentIndustrial>8</ComponentIndustrial>
-						<Chemfuel>20</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>1.31</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_300AACBlackout_FMJ</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>58</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>Shot_Masamune</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_300AACBlackout</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- Nowaki Conventional-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Nowaki_AC</defName>
-					<statBases>
-						<Bulk>7.36</Bulk>
-						<Mass>3.2</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<SwayFactor>1.35</SwayFactor>
-						<ShotSpread>0.07</ShotSpread>
-						<WorkToMake>32000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>45</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-						<Chemfuel>15</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>1.58</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_300AACBlackout_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>Shot_Masamune</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_300AACBlackout</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<researchPrerequisite>Fabrication</researchPrerequisite>
-				</li>
-
-				<!-- Shigure Conventional SMG-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Shigure_AC</defName>
-					<statBases>
-						<Mass>2.3</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>0.96</SwayFactor>
-						<Bulk>4.50</Bulk>
-						<WorkToMake>25500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<Chemfuel>15</Chemfuel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<recoilAmount>1.33</recoilAmount>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>28</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>Shot_Kenshin</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_FN57x28mm</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- Kenshin Railgun Pistol-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_JKE-X2_Kenshin_AC</defName>
-					<statBases>
-						<WorkToMake>30000</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.24</SwayFactor>
-						<Bulk>2.47</Bulk>
-						<Mass>1.45</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>10</Steel>
-						<Plasteel>20</Plasteel>
-						<Chemfuel>5</Chemfuel>
-						<ComponentSpacer>1</ComponentSpacer>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_7mmMiniRailgun_Sabot</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>25</range>
-						<burstShotCount>4</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>Shot_Kenshin</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-						<recoilAmount>1.88</recoilAmount>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_7mmMiniRailgun</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- TKI-20 Shingen Smart SMG-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_TKI-20_Shingen_AC</defName>
-					<statBases>
-						<Mass>2.20</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.1</ShotSpread>
-						<SwayFactor>0.25</SwayFactor>
-						<Bulk>4.00</Bulk>
-						<WorkToMake>42000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<Chemfuel>10</Chemfuel>
-						<ComponentSpacer>1</ComponentSpacer>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<recoilAmount>0.8</recoilAmount>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6mmSmartGyrojet_FMJ</defaultProjectile>
-						<warmupTime>0.55</warmupTime>
-						<range>30</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>Shot_Shingen</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>60</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_6mmSmartGyrojet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- HJKE-11 Yukimura Smart pistol-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_HJKE-11_Yukimura_AC</defName>
-					<statBases>
-						<Mass>1.12</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.75</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>0.25</SwayFactor>
-						<Bulk>2.00</Bulk>
-						<WorkToMake>29000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>15</Steel>
-						<Chemfuel>5</Chemfuel>
-						<ComponentSpacer>1</ComponentSpacer>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<recoilAmount>0.9</recoilAmount>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6mmSmartGyrojet_FMJ</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>22</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<soundCast>Shot_Yukimura</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>3.0</reloadTime>
-						<ammoSet>AmmoSet_6mmSmartGyrojet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Tools ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Gun_JKE-X2_Kenshin_AC" or
-						defName="Gun_HJKE-11_Yukimura_AC"]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Gun_HJSH_18_Masamune_AC" or
-						defName="Gun_Nowaki_AC" or
-						defName="Gun_Shigure_AC" or
-						defName="Gun_TKI-20_Shingen_AC"]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Arasaka Corporation [1.3]/Cyberweeb_Hats.xml b/Patches/Arasaka Corporation [1.3]/Cyberweeb_Hats.xml
deleted file mode 100644
index afca23e592..0000000000
--- a/Patches/Arasaka Corporation [1.3]/Cyberweeb_Hats.xml	
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Arasaka Corporation</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- == Cap ac == -->
-				<!-- statBases -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_Cap_AC" or defName="Apparel_Cap_W_AC"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>0.024</ArmorRating_Blunt>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-						<Bulk>2</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<!-- == GasMask == -->
-				<!-- statBases -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Hazmat_Mask_AC"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Apparel_Hazmat_Mask_AC"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Apparel_Hazmat_Mask_AC"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_Hazmat_Mask_AC"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Hazmat_Mask_AC"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_Hazmat_Mask_AC"]/apparel/layers</xpath>
-					<value>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName = "Apparel_Hazmat_Mask_AC"]</xpath>
-					<value>
-						<li Class="CombatExtended.ApparelHediffExtension">
-							<hediff>WearingGasMask</hediff>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Helmet === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Helmet_AC"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Helmet_AC"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>12</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.42</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Helmet_AC"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>30</Steel>
-							<DevilstrandCloth>10</DevilstrandCloth>
-							<Plasteel>10</Plasteel>
-						</costList>
-					</value>
-				</li>
-				<!-- === Goggles === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Helmet_With_Techgogs_AC"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-						<Bulk>6</Bulk>
-						<WornBulk>1.5</WornBulk>
-						<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Helmet_With_Techgogs_AC"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>12</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.42</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Helmet_With_Techgogs_AC"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>25</Steel>
-							<DevilstrandCloth>15</DevilstrandCloth>
-							<ComponentIndustrial>6</ComponentIndustrial>
-							<Plasteel>20</Plasteel>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Helmet_With_Techgogs_AC"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<ShootingAccuracyPawn>0.1</ShootingAccuracyPawn>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_Helmet_With_Techgogs_AC"]/apparel/layers</xpath>
-					<value>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Arasaka Corporation [1.3]/Cyberweeb_Melee.xml b/Patches/Arasaka Corporation [1.3]/Cyberweeb_Melee.xml
deleted file mode 100644
index 69854aad84..0000000000
--- a/Patches/Arasaka Corporation [1.3]/Cyberweeb_Melee.xml	
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Arasaka Corporation</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Weeb sword === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "MeleeWeapon_Thermal_Katana_AC"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.27</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.7</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>16</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Burn</def>
-										<amount>5</amount>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>1.3</cooldownTime>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>0.536</armorPenetrationBlunt>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>30</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Burn</def>
-										<amount>8</amount>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>1.4</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "MeleeWeapon_Thermal_Katana_AC"]/statBases</xpath>
-					<value>
-						<statBases>
-							<WorkToMake>50000</WorkToMake>
-							<Mass>1</Mass>
-							<Bulk>7.5</Bulk>
-							<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "MeleeWeapon_Thermal_Katana_AC"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.9</MeleeCritChance>
-							<MeleeParryChance>0.69</MeleeParryChance>
-							<MeleeDodgeChance>0.33</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- === katana === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Millitary_Katana_AC"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.27</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.7</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.3</cooldownTime>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>0.559</armorPenetrationBlunt>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>34</power>
-								<cooldownTime>1.4</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>0.674</armorPenetrationBlunt>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Millitary_Katana_AC"]/statBases</xpath>
-					<value>
-						<statBases>
-							<WorkToMake>25000</WorkToMake>
-							<Mass>0.9</Mass>
-							<Bulk>7.5</Bulk>
-							<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Millitary_Katana_AC"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.9</MeleeCritChance>
-							<MeleeParryChance>0.69</MeleeParryChance>
-							<MeleeDodgeChance>0.33</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Millitary_Katana_AC"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>40</Steel>
-							<Plasteel>60</Plasteel>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Thermal_Katana_AC"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>25</Steel>
-							<Plasteel>75</Plasteel>
-							<ComponentSpacer>2</ComponentSpacer>
-						</costList>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Arasaka Corporation [1.3]/Cyberweeb_Turrets_Cyberware.xml b/Patches/Arasaka Corporation [1.3]/Cyberweeb_Turrets_Cyberware.xml
deleted file mode 100644
index eb9e697322..0000000000
--- a/Patches/Arasaka Corporation [1.3]/Cyberweeb_Turrets_Cyberware.xml	
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Arasaka Corporation</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Remove refuelable property -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName = "Security_Turret_AC"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
-				</li>
-
-				<!-- Replace vanilla thingClass -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Security_Turret_AC"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Security_Turret_AC"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>440</Steel>
-							<Plasteel>40</Plasteel>
-							<ComponentIndustrial>15</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<!-- Make turrets taller -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Security_Turret_AC"]/fillPercent</xpath>
-					<value>
-						<fillPercent>1</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Security_Turret_AC"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Security_Turret_AC"]/statBases/WorkToBuild</xpath>
-					<value>
-						<WorkToBuild>60000</WorkToBuild>
-						<AimingAccuracy>0.33</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Security_Turret_AC"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>1.1</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Security_Turret_AC"]/comps/li[@Class="CompProperties_Power"]</xpath>
-					<value>
-						<li Class="CompProperties_Power">
-							<compClass>CompPowerTrader</compClass>
-							<basePowerConsumption>1350</basePowerConsumption>
-						</li>
-					</value>
-				</li>
-				<!-- Make the Turret usable -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Security_Turret_AC</defName>
-					<statBases>
-						<Mass>10.00</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>1.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.33</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_25x137mmNATO_AP</defaultProjectile>
-						<warmupTime>1.35</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>18</ticksBetweenBurstShots>
-						<burstShotCount>6</burstShotCount>
-						<minRange>2.0</minRange>
-						<soundCast>Shot_Turret</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_25x137mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<noSnapshot>true</noSnapshot>
-					</FireModes>
-				</li>
-
-				<!-- Implant Hediffs -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="Arasaka_Mantis_AC"]/stages/li[1]/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<MeleeDPS>0.20</MeleeDPS>
-							<MeleeHitChance>0.20</MeleeHitChance>
-							<MeleeDodgeChance>0.15</MeleeDodgeChance>
-							<IncomingDamageFactor>-0.05</IncomingDamageFactor>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="Arasaka_Leg_AC" or defName="Arasaka_Arm_AC" or defName="Arasaka_Spine_AC" or defName="Arasaka_Ribcage_AC"]/stages/li[1]/statOffsets/IncomingDamageFactor</xpath>
-					<value>
-						<IncomingDamageFactor>-0.05</IncomingDamageFactor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="Arasaka_Mantis_AC"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mantis blade</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.0</cooldownTime>
-								<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
-								<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>mantis blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>34</power>
-								<cooldownTime>1.29</cooldownTime>
-								<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
-								<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="Arasaka_Arm_AC"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.11</cooldownTime>
-								<armorPenetrationBlunt>2.75</armorPenetrationBlunt>
-								<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
-								<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- Add night vision to eyes when it comes out-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Arasaka_Eye_AC"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency_Implant>0.3</NightVisionEfficiency_Implant>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="Arasaka_Eye_AC"]/stages/li[1]/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-							<NightVisionEfficiency_Implant>0.3</NightVisionEfficiency_Implant>
-						</statOffsets>
-					</value>
-				</li>
-
-				<!-- Reduce surpression for cyberdeck Does increased consciousness increase Suppressability?-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="Arasaka_MKI_AC"]/stages/li[1]/statOffsets</xpath>
-					<value>
-						<Suppressability>-0.075</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="Arasaka_MKII_AC"]/stages/li[1]/statOffsets</xpath>
-					<value>
-						<Suppressability>-0.15</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="Arasaka_MKIII_AC"]/stages/li[1]/statOffsets</xpath>
-					<value>
-						<Suppressability>-0.25</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="Arasaka_MKIV_AC"]/stages/li[1]/statOffsets</xpath>
-					<value>
-						<Suppressability>-0.5</Suppressability>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Archotech Expanded/AE_Hediffs_BodyParts_Prosthetics.xml b/Patches/Archotech Expanded/AE_Hediffs_BodyParts_Prosthetics.xml
deleted file mode 100644
index 81f4ea458a..0000000000
--- a/Patches/Archotech Expanded/AE_Hediffs_BodyParts_Prosthetics.xml	
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Archotech Expanded</li>
-			<li>Archotech Expanded Prosthetics</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AdvancedArchotechArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ArchotechObliterator"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>0.01</cooldownTime>
-								<armorPenetrationBlunt>21.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ArchotechMembrane"]/stages/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<MeleeDodgeChance>10</MeleeDodgeChance>
-							<ArmorRating_Sharp>14</ArmorRating_Sharp>
-							<ArmorRating_Blunt>21</ArmorRating_Blunt>
-							<ArmorRating_Heat>1.5</ArmorRating_Heat>
-							<GeneralLaborSpeed>10</GeneralLaborSpeed>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ArchotechDeathClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>0.89</cooldownTime>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Archotech Expanded/AE_Items_Resource_Stuff.xml b/Patches/Archotech Expanded/AE_Items_Resource_Stuff.xml
deleted file mode 100644
index 677ba38b23..0000000000
--- a/Patches/Archotech Expanded/AE_Items_Resource_Stuff.xml	
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Archotech Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Atto -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Attomachinery"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Attomachinery"]/stuffProps/categories</xpath>
-					<value>
-						<li>Metallic_Weapon</li>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Attomachinery"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>50</MeleePenetrationFactor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Attomachinery"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>50</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Attomachinery"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>50</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- Pico -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Picomachinery"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Picomachinery"]/stuffProps/categories</xpath>
-					<value>
-						<li>Metallic_Weapon</li>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Picomachinery"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>25</MeleePenetrationFactor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Picomachinery"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>25</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Picomachinery"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>25</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- Nano -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Nanomachinery"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Nanomachinery"]/stuffProps/categories</xpath>
-					<value>
-						<li>Metallic_Weapon</li>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Nanomachinery"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>2.5</MeleePenetrationFactor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Nanomachinery"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>2.5</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Nanomachinery"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>2.5</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Archotech PowerArmor/Apparel_JDS.xml b/Patches/Archotech PowerArmor/Apparel_JDS.xml
deleted file mode 100644
index ff737678dd..0000000000
--- a/Patches/Archotech PowerArmor/Apparel_JDS.xml	
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Archotech PowerArmor</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ===== Add Bodypart Groups and Layers ===== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="APA_HelmetBase"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="APA_ArmorBase"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<!-- ===== Add Costlist ===== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="APA_HelmetBase"]/costList</xpath>
-					<value>
-						<Uranium>20</Uranium>
-						<Hyperweave>30</Hyperweave>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="APA_ArmorBase"]/costList</xpath>
-					<value>
-						<Uranium>45</Uranium>
-						<Hyperweave>90</Hyperweave>
-					</value>
-				</li>
-
-				<!-- ===== Stats Adjustment ===== -->
-
-				<!-- === Archotech Power Helmet === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="APA_HelmetBase"]/statBases/WorkToMake</xpath>
-					<value>
-						<WorkToMake>26250</WorkToMake>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="APA_HelmetBase"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>360</MaxHitPoints>
-						<Bulk>5.5</Bulk>
-						<WornBulk>1.25</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="APA_HelmetBase"]/statBases/Mass</xpath>
-					<value>
-						<Mass>5</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[@Name="APA_HelmetBase"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[@Name="APA_HelmetBase"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="APA_HelmetBase"]/equippedStatOffsets</xpath>
-					<value>
-						<AimingAccuracy>0.20</AimingAccuracy>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-						<NightVisionEfficiency_Apparel>1.0</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="APA_HelmetBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>24</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="APA_HelmetBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>52</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="APA_HelmetBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>1.05</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>1.05</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Archotech Power Armor === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="APA_ArmorBase"]/statBases/WorkToMake</xpath>
-					<value>
-						<WorkToMake>80000</WorkToMake>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="APA_ArmorBase"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>650</MaxHitPoints>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="APA_ArmorBase"]/statBases/Mass</xpath>
-					<value>
-						<Mass>60</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="APA_ArmorBase"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>90</CarryWeight>
-						<CarryBulk>12.5</CarryBulk>
-						<ShootingAccuracyPawn>0.20</ShootingAccuracyPawn>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="APA_ArmorBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>30</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="APA_ArmorBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>62</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="APA_ArmorBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.95</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.95</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Archotech Weaponry/ArchoDamageDefs.xml b/Patches/Archotech Weaponry/ArchoDamageDefs.xml
deleted file mode 100644
index 93542daf89..0000000000
--- a/Patches/Archotech Weaponry/ArchoDamageDefs.xml	
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Archotech Weaponry</li>
-		</mods>
-
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<DamageDef ParentName="Bullet">
-					<defName>CE_ArchoNL</defName>
-					<label>archonanites (non-lethal)</label>
-					<additionalHediffs>
-						<li>
-							<hediff>VoidToxin</hediff>
-							<severityPerDamageDealt>0.29</severityPerDamageDealt>
-						</li>
-					</additionalHediffs>
-					<modExtensions>
-						<li Class="CombatExtended.DamageDefExtensionCE">
-							<harmOnlyOutsideLayers>true</harmOnlyOutsideLayers>
-						</li>
-					</modExtensions>
-				</DamageDef>
-
-				<DamageDef ParentName="Bullet">
-					<defName>CE_ArchoL</defName>
-					<label>archonanites (lethal)</label>
-					<additionalHediffs>
-						<li>
-							<hediff>VoidNecrosisTemp</hediff>
-							<severityPerDamageDealt>0.05</severityPerDamageDealt>
-						</li>
-					</additionalHediffs>
-				</DamageDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Archotech Weaponry/ArchoNotAmmo.xml b/Patches/Archotech Weaponry/ArchoNotAmmo.xml
deleted file mode 100644
index 6b95c1c714..0000000000
--- a/Patches/Archotech Weaponry/ArchoNotAmmo.xml	
+++ /dev/null
@@ -1,481 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Archotech Weaponry</li>
-		</mods>
-
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-				<ThingCategoryDef>
-					<defName>AmmoArchoChargePack</defName>
-					<label>Archo charge pack</label>
-					<parent>AmmoAdvanced</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== Ammo ========================== -->
-				<ThingDef Class="CombatExtended.AmmoDef" Name="ArchoChargePackBase" ParentName="SpacerSmallAmmoBase" Abstract="True">
-					<description>A universal charge pack for various Archo weapons.</description>
-					<statBases>
-						<Mass>0.008</Mass>
-						<Bulk>0.01</Bulk>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>Artifact</li>
-					</tradeTags>
-					<thingCategories>
-						<li>AmmoArchoChargePack</li>
-					</thingCategories>
-					<stackLimit>5000</stackLimit>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="ArchoChargePackBase">
-					<defName>Ammo_ArchoChargePack</defName>
-					<label>Archo charge pack</label>
-					<graphicData>
-						<texPath>ThirdParty/ArchotechWeaponry/Ammo/Archotech</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.29</MarketValue>
-					</statBases>
-					<ammoClass>Charged</ammoClass>
-					<thingSetMakerTags>
-						<li>RewardStandardHighFreq</li>
-					</thingSetMakerTags>
-				</ThingDef>
-
-				<!-- ==================== AmmoSet-NL ========================== -->
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_ArchoPistol_CE_NL</defName>
-					<label>Archo charge(Non Lethal)</label>
-					<ammoTypes>
-						<Ammo_ArchoChargePack>AW_Bullet_ArchotechPistol_CE_NL</Ammo_ArchoChargePack>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_ArchoSniper_CE_NL</defName>
-					<label>Archo charge(Non Lethal)</label>
-					<ammoTypes>
-						<Ammo_ArchoChargePack>AW_Bullet_ArchotechSniper_CE_NL</Ammo_ArchoChargePack>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_ArchoRifle_CE_NL</defName>
-					<label>Archo charge(Non Lethal)</label>
-					<ammoTypes>
-						<Ammo_ArchoChargePack>AW_Bullet_ArchotechRifle_CE_NL</Ammo_ArchoChargePack>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_ArchoMG_CE_NL</defName>
-					<label>Archo charge(Non Lethal)</label>
-					<ammoTypes>
-						<Ammo_ArchoChargePack>AW_Bullet_ArchotechMG_CE_NL</Ammo_ArchoChargePack>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_ArchoShotgun_CE_NL</defName>
-					<label>Archo charge(Non Lethal)</label>
-					<ammoTypes>
-						<Ammo_ArchoChargePack>AW_Bullet_ArchotechShotgun_CE_NL</Ammo_ArchoChargePack>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_ArchoBow_CE_NL</defName>
-					<label>Archo charge(Non Lethal)</label>
-					<ammoTypes>
-						<Ammo_ArchoChargePack>AW_Bullet_ArchotechBow_CE_NL</Ammo_ArchoChargePack>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_ArchoCrossbow_CE_NL</defName>
-					<label>Archo charge(Non Lethal)</label>
-					<ammoTypes>
-						<Ammo_ArchoChargePack>AW_Bullet_ArchotechCrossbow_CE_NL</Ammo_ArchoChargePack>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== AmmoSet-L ========================== -->
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_ArchoPistol_CE_L</defName>
-					<label>Archo charge(Lethal)</label>
-					<ammoTypes>
-						<Ammo_ArchoChargePack>AW_Bullet_ArchotechPistol_CE_L</Ammo_ArchoChargePack>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_ArchoSniper_CE_L</defName>
-					<label>Archo charge(Lethal)</label>
-					<ammoTypes>
-						<Ammo_ArchoChargePack>AW_Bullet_ArchotechSniper_CE_L</Ammo_ArchoChargePack>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_ArchoRifle_CE_L</defName>
-					<label>Archo charge(Lethal)</label>
-					<ammoTypes>
-						<Ammo_ArchoChargePack>AW_Bullet_ArchotechRifle_CE_L</Ammo_ArchoChargePack>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_ArchoMG_CE_L</defName>
-					<label>Archo charge(Lethal)</label>
-					<ammoTypes>
-						<Ammo_ArchoChargePack>AW_Bullet_ArchotechMG_CE_L</Ammo_ArchoChargePack>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_ArchoShotgun_CE_L</defName>
-					<label>Archo charge(Lethal)</label>
-					<ammoTypes>
-						<Ammo_ArchoChargePack>AW_Bullet_ArchotechShotgun_CE_L</Ammo_ArchoChargePack>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_ArchoBow_CE_L</defName>
-					<label>Archo charge(Lethal)</label>
-					<ammoTypes>
-						<Ammo_ArchoChargePack>AW_Bullet_ArchotechBow_CE_L</Ammo_ArchoChargePack>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_ArchoCrossbow_CE_L</defName>
-					<label>Archo charge(Lethal)</label>
-					<ammoTypes>
-						<Ammo_ArchoChargePack>AW_Bullet_ArchotechCrossbow_CE_L</Ammo_ArchoChargePack>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ================== Projectiles ================== -->
-				<ThingDef ParentName="Base10x18mmChargedBullet">
-					<defName>AW_Bullet_ArchotechPistol_CE_NL</defName>
-					<label>archotech pistol bullet</label>
-					<graphicData>
-						<texPath>Things/Projectile/Shot_Archotech</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>CE_ArchoNL</damageDef>
-						<damageAmountBase>3</damageAmountBase>
-						<secondaryDamage>
-							<li>
-								<def>EMP</def>
-								<amount>7</amount>
-							</li>
-						</secondaryDamage>
-						<armorPenetrationSharp>19.5</armorPenetrationSharp>
-						<armorPenetrationBlunt>22.56</armorPenetrationBlunt>
-						<empShieldBreakChance>1</empShieldBreakChance>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base10x18mmChargedBullet">
-					<defName>AW_Bullet_ArchotechPistol_CE_L</defName>
-					<label>archotech pistol bullet</label>
-					<graphicData>
-						<texPath>Things/Projectile/Shot_Archotech</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>CE_ArchoL</damageDef>
-						<damageAmountBase>11</damageAmountBase>
-						<secondaryDamage>
-							<li>
-								<def>EMP</def>
-								<amount>7</amount>
-							</li>
-						</secondaryDamage>
-						<armorPenetrationSharp>19.5</armorPenetrationSharp>
-						<armorPenetrationBlunt>22.56</armorPenetrationBlunt>
-						<empShieldBreakChance>1</empShieldBreakChance>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base12x72mmChargedBullet">
-					<defName>AW_Bullet_ArchotechSniper_CE_NL</defName>
-					<label>archotech sniper bullet</label>
-					<graphicData>
-						<texPath>Things/Projectile/Shot_Archotech</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>CE_ArchoNL</damageDef>
-						<damageAmountBase>5</damageAmountBase>
-						<secondaryDamage>
-							<li>
-								<def>EMP</def>
-								<amount>18</amount>
-							</li>
-						</secondaryDamage>
-						<armorPenetrationSharp>45</armorPenetrationSharp>
-						<armorPenetrationBlunt>324</armorPenetrationBlunt>
-						<empShieldBreakChance>1</empShieldBreakChance>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base12x72mmChargedBullet">
-					<defName>AW_Bullet_ArchotechSniper_CE_L</defName>
-					<label>archotech sniper bullet</label>
-					<graphicData>
-						<texPath>Things/Projectile/Shot_Archotech</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>CE_ArchoL</damageDef>
-						<damageAmountBase>31</damageAmountBase>
-						<secondaryDamage>
-							<li>
-								<def>EMP</def>
-								<amount>18</amount>
-							</li>
-						</secondaryDamage>
-						<armorPenetrationSharp>45</armorPenetrationSharp>
-						<armorPenetrationBlunt>324</armorPenetrationBlunt>
-						<empShieldBreakChance>1</empShieldBreakChance>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base8x35mmChargedBullet">
-					<defName>AW_Bullet_ArchotechRifle_CE_NL</defName>
-					<label>archotech rifle bullet</label>
-					<graphicData>
-						<texPath>Things/Projectile/Shot_Archotech</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>CE_ArchoNL</damageDef>
-						<damageAmountBase>4</damageAmountBase>
-						<secondaryDamage>
-							<li>
-								<def>EMP</def>
-								<amount>9</amount>
-							</li>
-						</secondaryDamage>
-						<armorPenetrationSharp>24</armorPenetrationSharp>
-						<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
-						<empShieldBreakChance>0.33</empShieldBreakChance>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base8x35mmChargedBullet">
-					<defName>AW_Bullet_ArchotechRifle_CE_L</defName>
-					<label>archotech rifle bullet</label>
-					<graphicData>
-						<texPath>Things/Projectile/Shot_Archotech</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>CE_ArchoL</damageDef>
-						<damageAmountBase>15</damageAmountBase>
-						<secondaryDamage>
-							<li>
-								<def>EMP</def>
-								<amount>9</amount>
-							</li>
-						</secondaryDamage>
-						<armorPenetrationSharp>24</armorPenetrationSharp>
-						<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
-						<empShieldBreakChance>0.33</empShieldBreakChance>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base8x50mmChargedBullet">
-					<defName>AW_Bullet_ArchotechMG_CE_NL</defName>
-					<label>archotech MG bullet</label>
-					<graphicData>
-						<texPath>Things/Projectile/Shot_Archotech</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>CE_ArchoNL</damageDef>
-						<damageAmountBase>4</damageAmountBase>
-						<secondaryDamage>
-							<li>
-								<def>EMP</def>
-								<amount>11</amount>
-							</li>
-						</secondaryDamage>
-						<armorPenetrationSharp>27</armorPenetrationSharp>
-						<armorPenetrationBlunt>120</armorPenetrationBlunt>
-						<empShieldBreakChance>1</empShieldBreakChance>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base8x50mmChargedBullet">
-					<defName>AW_Bullet_ArchotechMG_CE_L</defName>
-					<label>archotech MG bullet</label>
-					<graphicData>
-						<texPath>Things/Projectile/Shot_Archotech</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>CE_ArchoL</damageDef>
-						<damageAmountBase>19</damageAmountBase>
-						<secondaryDamage>
-							<li>
-								<def>EMP</def>
-								<amount>11</amount>
-							</li>
-						</secondaryDamage>
-						<armorPenetrationSharp>27</armorPenetrationSharp>
-						<armorPenetrationBlunt>120</armorPenetrationBlunt>
-						<empShieldBreakChance>1</empShieldBreakChance>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base15x65mmDiffusingChargedBullet">
-					<defName>AW_Bullet_ArchotechShotgun_CE_NL</defName>
-					<label>archotech bullet</label>
-					<graphicData>
-						<texPath>Things/Projectile/Shot_Archotech</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>CE_ArchoNL</damageDef>
-						<damageAmountBase>2</damageAmountBase>
-						<pelletCount>5</pelletCount>
-						<secondaryDamage>
-							<li>
-								<def>Bomb_Secondary</def>
-								<amount>7</amount>
-							</li>
-						</secondaryDamage>
-						<armorPenetrationSharp>8</armorPenetrationSharp>
-						<armorPenetrationBlunt>50.46</armorPenetrationBlunt>
-						<spreadMult>8.9</spreadMult>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base15x65mmDiffusingChargedBullet">
-					<defName>AW_Bullet_ArchotechShotgun_CE_L</defName>
-					<label>archotech bullet</label>
-					<graphicData>
-						<texPath>Things/Projectile/Shot_Archotech</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>CE_ArchoL</damageDef>
-						<damageAmountBase>22</damageAmountBase>
-						<pelletCount>5</pelletCount>
-						<secondaryDamage>
-							<li>
-								<def>Bomb_Secondary</def>
-								<amount>7</amount>
-							</li>
-						</secondaryDamage>
-						<armorPenetrationSharp>8</armorPenetrationSharp>
-						<armorPenetrationBlunt>50.46</armorPenetrationBlunt>
-						<spreadMult>8.9</spreadMult>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base8x35mmChargedBullet">
-					<defName>AW_Bullet_ArchotechBow_CE_NL</defName>
-					<label>archotech bow arrow</label>
-					<graphicData>
-						<texPath>Things/Projectile/Shot_Archotech_Voidarrow</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>CE_ArchoNL</damageDef>
-						<damageAmountBase>5</damageAmountBase>
-						<secondaryDamage>
-							<li>
-								<def>EMP</def>
-								<amount>9</amount>
-							</li>
-						</secondaryDamage>
-						<armorPenetrationSharp>24</armorPenetrationSharp>
-						<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
-						<empShieldBreakChance>0.33</empShieldBreakChance>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base8x35mmChargedBullet">
-					<defName>AW_Bullet_ArchotechBow_CE_L</defName>
-					<label>archotech bow arrow</label>
-					<graphicData>
-						<texPath>Things/Projectile/Shot_Archotech_Voidarrow</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>CE_ArchoL</damageDef>
-						<damageAmountBase>20</damageAmountBase>
-						<secondaryDamage>
-							<li>
-								<def>EMP</def>
-								<amount>9</amount>
-							</li>
-						</secondaryDamage>
-						<armorPenetrationSharp>24</armorPenetrationSharp>
-						<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
-						<empShieldBreakChance>0.33</empShieldBreakChance>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base8x35mmChargedBullet">
-					<defName>AW_Bullet_ArchotechCrossbow_CE_NL</defName>
-					<label>archotech crossbow bolt</label>
-					<graphicData>
-						<texPath>Things/Projectile/Shot_Archotech_voidbolt</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>CE_ArchoNL</damageDef>
-						<damageAmountBase>5</damageAmountBase>
-						<secondaryDamage>
-							<li>
-								<def>EMP</def>
-								<amount>9</amount>
-							</li>
-						</secondaryDamage>
-						<armorPenetrationSharp>24</armorPenetrationSharp>
-						<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
-						<empShieldBreakChance>0.33</empShieldBreakChance>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base8x35mmChargedBullet">
-					<defName>AW_Bullet_ArchotechCrossbow_CE_L</defName>
-					<label>archotech crossbow bolt</label>
-					<graphicData>
-						<texPath>Things/Projectile/Shot_Archotech_voidbolt</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>CE_ArchoL</damageDef>
-						<damageAmountBase>25</damageAmountBase>
-						<secondaryDamage>
-							<li>
-								<def>EMP</def>
-								<amount>9</amount>
-							</li>
-						</secondaryDamage>
-						<armorPenetrationSharp>24</armorPenetrationSharp>
-						<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
-						<empShieldBreakChance>0.33</empShieldBreakChance>
-					</projectile>
-				</ThingDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Archotech Weaponry/MeleeArchotech.xml b/Patches/Archotech Weaponry/MeleeArchotech.xml
deleted file mode 100644
index 2a1dda7713..0000000000
--- a/Patches/Archotech Weaponry/MeleeArchotech.xml	
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Archotech Weaponry</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="AW_ArchotechSword"]/statBases/MeleeWeapon_AverageArmorPenetration</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AW_ArchotechSword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<chanceFactor>0.33</chanceFactor>
-								<cooldownTime>1.52</cooldownTime>
-								<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>1.24</cooldownTime>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<armorPenetrationSharp>22</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>1.14</cooldownTime>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AW_ArchotechSword"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AW_ArchotechSword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.73</MeleeCritChance>
-							<MeleeParryChance>0.45</MeleeParryChance>
-							<MeleeDodgeChance>0.6</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AW_ArchotechSword"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="AW_ArchotechHeavySword"]/statBases/MeleeWeapon_AverageArmorPenetration</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AW_ArchotechHeavySword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<chanceFactor>0.33</chanceFactor>
-								<cooldownTime>1.52</cooldownTime>
-								<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>1.55</cooldownTime>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-								<armorPenetrationSharp>35</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>1.75</cooldownTime>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-								<armorPenetrationSharp>25</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AW_ArchotechHeavySword"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<MeleeCounterParryBonus>0.75</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AW_ArchotechHeavySword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1</MeleeCritChance>
-							<MeleeParryChance>0.65</MeleeParryChance>
-							<MeleeDodgeChance>0.45</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Archotech Weaponry/RangedArchotech.xml b/Patches/Archotech Weaponry/RangedArchotech.xml
deleted file mode 100644
index 829590faa1..0000000000
--- a/Patches/Archotech Weaponry/RangedArchotech.xml	
+++ /dev/null
@@ -1,727 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Archotech Weaponry</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[
-						defName = "AW_ArchotechPistol" or
-						defName = "AW_ArchotechSMG"]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "AW_ArchotechRifle" or
-						defName = "AW_ArchotechSniper"
-						]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[
-						defName = "AW_ArchotechMinigun" or
-						defName = "AW_ArchotechShotgun" or
-						defName = "AW_ArchotechLMG" or
-						defName = "AW_ArchotechCrossbow" or
-						defName = "AW_ArchotechBow" or
-						defName = "AW_ArchotechVoidlauncher"]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</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>10</power>
-								<cooldownTime>1.55</cooldownTime>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Misc === -->
-				<li Class="PatchOperationRemove">
-					<xpath>/Defs/ThingDef[
-						defName = "AW_ArchotechMinigun" or
-						defName = "AW_ArchotechShotgun" or
-						defName = "AW_ArchotechLMG" or
-						defName = "AW_ArchotechCrossbow" or
-						defName = "AW_ArchotechBow" or
-						defName = "AW_ArchotechPistol" or
-						defName = "AW_ArchotechSMG" or
-						defName = "AW_ArchotechRifle" or
-						defName = "AW_ArchotechSniper"
-						]/modExtensions/li[@Class="ArchotechWeaponry.Defs.ArchotechDamageExtension"] </xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName = "AW_ArchotechVoidlauncher"]/weaponTags</xpath>
-					<value>
-						<li>Patched</li>
-					</value>
-				</li>
-
-				<!-- ==== Archotech Minigun ==== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AW_ArchotechMinigun</defName>
-					<statBases>
-						<Mass>9</Mass>
-						<Bulk>12.50</Bulk>
-						<SwayFactor>2.45</SwayFactor>
-						<ShotSpread>0.16</ShotSpread>
-						<SightsEfficiency>1.25</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>AW_Bullet_ArchotechMG_CE_NL</defaultProjectile>
-						<burstShotCount>50</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<warmupTime>1.5</warmupTime>
-						<range>69</range>
-						<recoilAmount>0.01</recoilAmount>
-						<soundCast>AW_GunLightShoot</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1000</magazineSize>
-						<reloadTime>6.5</reloadTime>
-						<ammoSet>AmmoSet_ArchoMG_CE_NL</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>25</aimedBurstShotCount>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AW_ArchotechMinigun"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_UnderBarrel">
-							<propsUnderBarrel>
-								<magazineSize>1000</magazineSize>
-								<reloadTime>6.5</reloadTime>
-								<ammoSet>AmmoSet_ArchoMG_CE_L</ammoSet>
-							</propsUnderBarrel>
-							<verbPropsUnderBarrel>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AW_Bullet_ArchotechMG_CE_L</defaultProjectile>
-								<warmupTime>1.5</warmupTime>
-								<burstShotCount>50</burstShotCount>
-								<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-								<range>69</range>
-								<recoilAmount>0.01</recoilAmount>
-								<soundCast>AW_GunLightShoot</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>12</muzzleFlashScale>
-							</verbPropsUnderBarrel>
-							<propsFireModesUnderBarrel>
-								<aimedBurstShotCount>25</aimedBurstShotCount>
-								<aiAimMode>Snapshot</aiAimMode>
-							</propsFireModesUnderBarrel>
-						</li>
-					</value>
-				</li>
-
-				<!-- ==== Archotech Shotgun ==== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AW_ArchotechShotgun</defName>
-					<statBases>
-						<Mass>3.8</Mass>
-						<Bulk>7.6</Bulk>
-						<SwayFactor>1.45</SwayFactor>
-						<ShotSpread>0.8</ShotSpread>
-						<SightsEfficiency>1.35</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>AW_Bullet_ArchotechShotgun_CE_NL</defaultProjectile>
-						<burstShotCount>2</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<warmupTime>0.5</warmupTime>
-						<range>23</range>
-						<recoilAmount>0.01</recoilAmount>
-						<soundCast>AW_ShotgunShoot</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>40</magazineSize>
-						<reloadTime>5.5</reloadTime>
-						<ammoSet>AmmoSet_ArchoShotgun_CE_NL</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AW_ArchotechShotgun"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_UnderBarrel">
-							<propsUnderBarrel>
-								<magazineSize>40</magazineSize>
-								<reloadTime>5.5</reloadTime>
-								<ammoSet>AmmoSet_ArchoShotgun_CE_L</ammoSet>
-							</propsUnderBarrel>
-							<verbPropsUnderBarrel>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AW_Bullet_ArchotechShotgun_CE_L</defaultProjectile>
-								<warmupTime>0.5</warmupTime>
-								<burstShotCount>2</burstShotCount>
-								<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-								<range>23</range>
-								<recoilAmount>0.01</recoilAmount>
-								<soundCast>AW_ShotgunShoot</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>12</muzzleFlashScale>
-							</verbPropsUnderBarrel>
-							<propsFireModesUnderBarrel>
-								<aiAimMode>Snapshot</aiAimMode>
-							</propsFireModesUnderBarrel>
-						</li>
-					</value>
-				</li>
-
-				<!-- ==== Archotech LMG ==== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AW_ArchotechLMG</defName>
-					<statBases>
-						<Mass>2.6</Mass>
-						<Bulk>5.20</Bulk>
-						<SwayFactor>2.25</SwayFactor>
-						<ShotSpread>0.10</ShotSpread>
-						<SightsEfficiency>1.45</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>AW_Bullet_ArchotechMG_CE_NL</defaultProjectile>
-						<burstShotCount>20</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<warmupTime>1.5</warmupTime>
-						<range>69</range>
-						<recoilAmount>0.01</recoilAmount>
-						<soundCast>AW_GunLightShoot</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>400</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_ArchoMG_CE_NL</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>10</aimedBurstShotCount>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AW_ArchotechLMG"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_UnderBarrel">
-							<propsUnderBarrel>
-								<magazineSize>400</magazineSize>
-								<reloadTime>4.5</reloadTime>
-								<ammoSet>AmmoSet_ArchoMG_CE_L</ammoSet>
-							</propsUnderBarrel>
-							<verbPropsUnderBarrel>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AW_Bullet_ArchotechMG_CE_L</defaultProjectile>
-								<warmupTime>1.5</warmupTime>
-								<burstShotCount>20</burstShotCount>
-								<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-								<range>69</range>
-								<recoilAmount>0.01</recoilAmount>
-								<soundCast>AW_GunLightShoot</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>12</muzzleFlashScale>
-							</verbPropsUnderBarrel>
-							<propsFireModesUnderBarrel>
-								<aimedBurstShotCount>10</aimedBurstShotCount>
-								<aiAimMode>Snapshot</aiAimMode>
-							</propsFireModesUnderBarrel>
-						</li>
-					</value>
-				</li>
-
-				<!-- ==== Archotech Crossbow ==== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AW_ArchotechCrossbow</defName>
-					<statBases>
-						<Mass>2.6</Mass>
-						<Bulk>5.20</Bulk>
-						<SwayFactor>1.25</SwayFactor>
-						<ShotSpread>0.6</ShotSpread>
-						<SightsEfficiency>2.05</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.75</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>AW_Bullet_ArchotechCrossbow_CE_NL</defaultProjectile>
-						<burstShotCount>1</burstShotCount>
-						<warmupTime>1.5</warmupTime>
-						<range>55</range>
-						<recoilAmount>0.01</recoilAmount>
-						<soundCast>AW_BowShoot</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>1.5</reloadTime>
-						<ammoSet>AmmoSet_ArchoCrossbow_CE_NL</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AW_ArchotechCrossbow"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_UnderBarrel">
-							<propsUnderBarrel>
-								<magazineSize>1</magazineSize>
-								<reloadTime>1.5</reloadTime>
-								<ammoSet>AmmoSet_ArchoCrossbow_CE_L</ammoSet>
-							</propsUnderBarrel>
-							<verbPropsUnderBarrel>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AW_Bullet_ArchotechCrossbow_CE_L</defaultProjectile>
-								<warmupTime>1.5</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<range>55</range>
-								<recoilAmount>0.01</recoilAmount>
-								<soundCast>AW_BowShoot</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>12</muzzleFlashScale>
-							</verbPropsUnderBarrel>
-							<propsFireModesUnderBarrel>
-								<aiAimMode>AimedShot</aiAimMode>
-							</propsFireModesUnderBarrel>
-						</li>
-					</value>
-				</li>
-
-				<!-- ==== Archotech Bow ==== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AW_ArchotechBow</defName>
-					<statBases>
-						<Mass>1.3</Mass>
-						<Bulk>2.6</Bulk>
-						<SwayFactor>1.25</SwayFactor>
-						<ShotSpread>0.6</ShotSpread>
-						<SightsEfficiency>2.15</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.75</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>AW_Bullet_ArchotechBow_CE_NL</defaultProjectile>
-						<burstShotCount>1</burstShotCount>
-						<warmupTime>1.5</warmupTime>
-						<range>49</range>
-						<recoilAmount>0.01</recoilAmount>
-						<soundCast>AW_BowShoot</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>1.5</reloadTime>
-						<ammoSet>AmmoSet_ArchoBow_CE_NL</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AW_ArchotechBow"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_UnderBarrel">
-							<propsUnderBarrel>
-								<magazineSize>1</magazineSize>
-								<reloadTime>1.5</reloadTime>
-								<ammoSet>AmmoSet_ArchoBow_CE_L</ammoSet>
-							</propsUnderBarrel>
-							<verbPropsUnderBarrel>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AW_Bullet_ArchotechBow_CE_L</defaultProjectile>
-								<warmupTime>1.5</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<range>49</range>
-								<recoilAmount>0.01</recoilAmount>
-								<soundCast>AW_BowShoot</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>12</muzzleFlashScale>
-							</verbPropsUnderBarrel>
-							<propsFireModesUnderBarrel>
-								<aiAimMode>AimedShot</aiAimMode>
-							</propsFireModesUnderBarrel>
-						</li>
-					</value>
-				</li>
-
-				<!-- ==== Archotech SMG ==== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AW_ArchotechSMG</defName>
-					<statBases>
-						<Mass>2.6</Mass>
-						<Bulk>5.20</Bulk>
-						<SwayFactor>2.25</SwayFactor>
-						<ShotSpread>0.10</ShotSpread>
-						<SightsEfficiency>1.45</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>AW_Bullet_ArchotechPistol_CE_NL</defaultProjectile>
-						<burstShotCount>20</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<warmupTime>1.5</warmupTime>
-						<range>30</range>
-						<recoilAmount>0.01</recoilAmount>
-						<soundCast>AW_GunLightShoot</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>120</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_ArchoPistol_CE_NL</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>10</aimedBurstShotCount>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AW_ArchotechSMG"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_UnderBarrel">
-							<propsUnderBarrel>
-								<magazineSize>120</magazineSize>
-								<reloadTime>4.5</reloadTime>
-								<ammoSet>AmmoSet_ArchoPistol_CE_L</ammoSet>
-							</propsUnderBarrel>
-							<verbPropsUnderBarrel>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AW_Bullet_ArchotechPistol_CE_L</defaultProjectile>
-								<warmupTime>1.5</warmupTime>
-								<burstShotCount>20</burstShotCount>
-								<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-								<range>30</range>
-								<recoilAmount>0.01</recoilAmount>
-								<soundCast>AW_GunLightShoot</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>12</muzzleFlashScale>
-							</verbPropsUnderBarrel>
-							<propsFireModesUnderBarrel>
-								<aimedBurstShotCount>10</aimedBurstShotCount>
-								<aiAimMode>Snapshot</aiAimMode>
-							</propsFireModesUnderBarrel>
-						</li>
-					</value>
-				</li>
-
-				<!-- ==== Archotech Sniper ==== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AW_ArchotechSniper</defName>
-					<statBases>
-						<Mass>2.6</Mass>
-						<Bulk>5.2</Bulk>
-						<SwayFactor>1.25</SwayFactor>
-						<ShotSpread>0.6</ShotSpread>
-						<SightsEfficiency>2.15</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.75</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>AW_Bullet_ArchotechPistol_CE_NL</defaultProjectile>
-						<burstShotCount>1</burstShotCount>
-						<warmupTime>1.5</warmupTime>
-						<range>86</range>
-						<recoilAmount>0.01</recoilAmount>
-						<soundCast>AW_SniperShoot</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>6.5</reloadTime>
-						<ammoSet>AmmoSet_ArchoSniper_CE_NL</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AW_ArchotechSniper"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_UnderBarrel">
-							<propsUnderBarrel>
-								<magazineSize>10</magazineSize>
-								<reloadTime>6.5</reloadTime>
-								<ammoSet>AmmoSet_ArchoSniper_CE_L</ammoSet>
-							</propsUnderBarrel>
-							<verbPropsUnderBarrel>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AW_Bullet_ArchotechSniper_CE_L</defaultProjectile>
-								<warmupTime>1.5</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<range>86</range>
-								<recoilAmount>0.01</recoilAmount>
-								<soundCast>AW_SniperShoot</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>12</muzzleFlashScale>
-							</verbPropsUnderBarrel>
-							<propsFireModesUnderBarrel>
-								<aiAimMode>AimedShot</aiAimMode>
-							</propsFireModesUnderBarrel>
-						</li>
-					</value>
-				</li>
-
-				<!-- ==== Archotech Rifle ==== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AW_ArchotechRifle</defName>
-					<statBases>
-						<Mass>2.6</Mass>
-						<Bulk>5.20</Bulk>
-						<SwayFactor>2.25</SwayFactor>
-						<ShotSpread>0.10</ShotSpread>
-						<SightsEfficiency>1.65</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>AW_Bullet_ArchotechRifle_CE_NL</defaultProjectile>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<warmupTime>1.5</warmupTime>
-						<range>56</range>
-						<recoilAmount>0.01</recoilAmount>
-						<soundCast>AW_GunLightShoot</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>80</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_ArchoRifle_CE_NL</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AW_ArchotechRifle"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_UnderBarrel">
-							<propsUnderBarrel>
-								<magazineSize>80</magazineSize>
-								<reloadTime>4.5</reloadTime>
-								<ammoSet>AmmoSet_ArchoRifle_CE_L</ammoSet>
-							</propsUnderBarrel>
-							<verbPropsUnderBarrel>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AW_Bullet_ArchotechRifle_CE_L</defaultProjectile>
-								<warmupTime>1.5</warmupTime>
-								<burstShotCount>10</burstShotCount>
-								<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-								<range>56</range>
-								<recoilAmount>0.01</recoilAmount>
-								<soundCast>AW_GunLightShoot</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>12</muzzleFlashScale>
-							</verbPropsUnderBarrel>
-							<propsFireModesUnderBarrel>
-								<aimedBurstShotCount>5</aimedBurstShotCount>
-								<aiAimMode>Snapshot</aiAimMode>
-							</propsFireModesUnderBarrel>
-						</li>
-					</value>
-				</li>
-
-				<!-- ==== Archotech Pistol ==== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AW_ArchotechPistol</defName>
-					<statBases>
-						<WorkToMake>27500</WorkToMake>
-						<Mass>0.7</Mass>
-						<Bulk>1.50</Bulk>
-						<SwayFactor>0.45</SwayFactor>
-						<ShotSpread>0.16</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>AW_Bullet_ArchotechPistol_CE_NL</defaultProjectile>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<warmupTime>0.5</warmupTime>
-						<range>35</range>
-						<soundCast>AW_GunShoot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>40</magazineSize>
-						<reloadTime>2.5</reloadTime>
-						<ammoSet>AmmoSet_ArchoPistol_CE_NL</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AW_ArchotechPistol"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_UnderBarrel">
-							<propsUnderBarrel>
-								<magazineSize>40</magazineSize>
-								<reloadTime>2.5</reloadTime>
-								<ammoSet>AmmoSet_ArchoPistol_CE_L</ammoSet>
-							</propsUnderBarrel>
-							<verbPropsUnderBarrel>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>AW_Bullet_ArchotechPistol_CE_L</defaultProjectile>
-								<warmupTime>0.5</warmupTime>
-								<burstShotCount>10</burstShotCount>
-								<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-								<range>35</range>
-								<soundCast>AW_GunShoot</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>12</muzzleFlashScale>
-							</verbPropsUnderBarrel>
-							<propsFireModesUnderBarrel>
-								<aimedBurstShotCount>5</aimedBurstShotCount>
-								<aiAimMode>Snapshot</aiAimMode>
-							</propsFireModesUnderBarrel>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Archotech+/ArchotechPlus_Hediffs_BodyParts_Archotech.xml b/Patches/Archotech+/ArchotechPlus_Hediffs_BodyParts_Archotech.xml
deleted file mode 100644
index 78e9c62f43..0000000000
--- a/Patches/Archotech+/ArchotechPlus_Hediffs_BodyParts_Archotech.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Archotech+ (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ArchotechSubdermalArmor"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>1</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>2</ArmorRating_Sharp>
-									<ArmorRating_Blunt>2</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.2</ArmorRating_Heat>
-								</statOffsets>
-								<totalBleedFactor>0.8</totalBleedFactor>
-							</li>
-							<li>
-								<minSeverity>2</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>3</ArmorRating_Sharp>
-									<ArmorRating_Blunt>3</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.30</ArmorRating_Heat>
-								</statOffsets>
-								<totalBleedFactor>0.6</totalBleedFactor>
-								<statFactors>
-									<IncomingDamageFactor>0.9</IncomingDamageFactor>
-								</statFactors>
-							</li>
-							<li>
-								<minSeverity>3</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>4</ArmorRating_Sharp>
-									<ArmorRating_Blunt>4</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.4</ArmorRating_Heat>
-								</statOffsets>
-								<totalBleedFactor>0.4</totalBleedFactor>
-								<statFactors>
-									<IncomingDamageFactor>0.75</IncomingDamageFactor>
-								</statFactors>
-							</li>
-						</stages>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ArchotechCortex"]/stages/li[minSeverity=1]/statOffsets</xpath>
-					<value>
-						<Suppressability>-0.05</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ArchotechCortex"]/stages/li[minSeverity=2]/statOffsets</xpath>
-					<value>
-						<Suppressability>-0.1</Suppressability>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Argonians of Blackmarsh/Argonian_Bodytype.xml b/Patches/Argonians of Blackmarsh/Argonian_Bodytype.xml
deleted file mode 100644
index 1c6307ebbc..0000000000
--- a/Patches/Argonians of Blackmarsh/Argonian_Bodytype.xml	
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Argonians of Blackmarsh (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Outside Squishy-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Argonian"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "right eye"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Argonian"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "left eye"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Argonian"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Argonian"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<!--Arm Groups-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Argonian"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
-					<value>
-						<li>LeftArm</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Argonian"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
-					<value>
-						<li>RightArm</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Argonian"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
-					<value>
-						<li>LeftShoulder</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Argonian"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
-					<value>
-						<li>RightShoulder</li>
-					</value>
-				</li>
-
-				<!--Natural Armor-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Argonian"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Argonian"]/corePart/parts/li[def="Neck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Argonian"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Argonian"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Argonian"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Argonian"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Argonian"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Argonian"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Argonian"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Argonian"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Argonian"]/corePart/parts/li[def="Leg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Argonian"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Argonian"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Argonians of Blackmarsh/PawnKinds_Argonian.xml b/Patches/Argonians of Blackmarsh/PawnKinds_Argonian.xml
deleted file mode 100644
index b3611e8a2a..0000000000
--- a/Patches/Argonians of Blackmarsh/PawnKinds_Argonian.xml	
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Argonians of Blackmarsh (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="ArgoColonist"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>12</min>
-								<max>20</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="ArgoHistSpeaker"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>12</min>
-								<max>20</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="ArgoTrader"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>12</min>
-								<max>20</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="ArgoSlave"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>12</min>
-								<max>20</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="ArgoRefugee"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>12</min>
-								<max>20</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="ArgoGuard"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>12</min>
-								<max>20</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="ArgoFighter"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>12</min>
-								<max>20</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="ArgoHunter"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>12</min>
-								<max>20</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="ArgoHistGuard"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>12</min>
-								<max>20</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="ArgoShadowscale"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Argonians of Blackmarsh/Race_XArgonian.xml b/Patches/Argonians of Blackmarsh/Race_XArgonian.xml
deleted file mode 100644
index 8e05aee556..0000000000
--- a/Patches/Argonians of Blackmarsh/Race_XArgonian.xml	
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Argonians of Blackmarsh (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Argonian"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Argonian"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>22</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>22</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.9</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Argonian"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Argonian"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Argonian"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Arrow Please/ArrowPlease_Ranged.xml b/Patches/Arrow Please/ArrowPlease_Ranged.xml
deleted file mode 100644
index 70143712a4..0000000000
--- a/Patches/Arrow Please/ArrowPlease_Ranged.xml	
+++ /dev/null
@@ -1,315 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Arrow Please (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Melee Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Ranged_Crossbow" or
-						defName="Ranged_Arbalest" or
-						defName="Ranged_Waistcrossbow" or
-						defName="Ranged_Repeatingcrossbow"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.65</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Ranged_Crossbow === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Ranged_Crossbow</defName>
-					<statBases>
-						<Bulk>4</Bulk>
-						<SwayFactor>1.0</SwayFactor>
-						<ShotSpread>0.5</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>2.05</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Projectile_CrossbowBolt_Steel</defaultProjectile>
-						<warmupTime>0.90</warmupTime>
-						<range>20</range>
-						<soundCast>Bow_Small</soundCast>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>MedievalRanged</li>
-						<li>CE_Bow</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Ranged_Arbalest === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Ranged_Arbalest</defName>
-					<statBases>
-						<Bulk>6</Bulk>
-						<SwayFactor>1.0</SwayFactor>
-						<ShotSpread>0.5</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>2.55</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Projectile_CrossbowBolt_Steel</defaultProjectile>
-						<warmupTime>1.05</warmupTime>
-						<range>24</range>
-						<soundCast>Bow_Large</soundCast>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>MedievalRanged</li>
-						<li>CE_Bow</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Ranged_Waistcrossbow === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Ranged_Waistcrossbow</defName>
-					<statBases>
-						<Bulk>12</Bulk>
-						<SwayFactor>1.0</SwayFactor>
-						<ShotSpread>0.5</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>4.15</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Projectile_CrossbowBolt_Steel</defaultProjectile>
-						<warmupTime>1.15</warmupTime>
-						<range>20</range>
-						<soundCast>Bow_Large</soundCast>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>9</reloadTime>
-						<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>MedievalRanged</li>
-						<li>CE_Bow</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Ranged_Repeatingcrossbow === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Ranged_Repeatingcrossbow</defName>
-					<statBases>
-						<Bulk>7</Bulk>
-						<SwayFactor>1.0</SwayFactor>
-						<ShotSpread>0.5</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>4.15</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Projectile_CrossbowBolt_Steel</defaultProjectile>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<warmupTime>0.95</warmupTime>
-						<range>18</range>
-						<soundCast>Bow_Small</soundCast>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>7</reloadTime>
-						<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>MedievalRanged</li>
-						<li>CE_Bow</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Ranged_Slinger === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Ranged_Slinger"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stone</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.65</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Ranged_Slinger</defName>
-					<statBases>
-						<Bulk>2</Bulk>
-						<SwayFactor>1.0</SwayFactor>
-						<ShotSpread>0.5</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Ammo_SlingBullet_Stone</defaultProjectile>
-						<warmupTime>2.25</warmupTime>
-						<range>16</range>
-						<soundCast>ThrowGrenade</soundCast>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>1.5</reloadTime>
-						<ammoSet>AmmoSet_SlingBullet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>NeolithicRangedBasic</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Ranged_Blowgun === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Ranged_Blowgun"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>0.65</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Ranged_Blowgun</defName>
-					<statBases>
-						<Bulk>2</Bulk>
-						<SwayFactor>1.0</SwayFactor>
-						<ShotSpread>0.5</ShotSpread>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Projectile_Dart_Venom</defaultProjectile>
-						<warmupTime>1.65</warmupTime>
-						<range>12</range>
-						<soundCast>Bow_Small</soundCast>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>2</reloadTime>
-						<ammoSet>AmmoSet_Blowdart</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>NeolithicRangedBasic</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Remove Unneeded === -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Flame_Crossbow"]</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Arrow_Crossbow"]</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="FlameArrow_Crossbow"]</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Arrow_Arbalest"]</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Flame_Arbalest"]</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="FlameArrow_Arbalest"]</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Arrow_Waistcrossbow"]</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Arrow_Repeatingcrossbow"]</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Stone_Slinger"]</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Dart_Blowgun"]</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Bowshort_Flame"]</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Arrowshort_Flame"]</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Bowrecurve_Flame"]</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Arrowrecurve_Flame"]</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Bowgreat_Flame"]</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Arrowgreat_Flame"]</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Arrow Please/ArrowPlease_Throwable.xml b/Patches/Arrow Please/ArrowPlease_Throwable.xml
deleted file mode 100644
index a678b3275a..0000000000
--- a/Patches/Arrow Please/ArrowPlease_Throwable.xml	
+++ /dev/null
@@ -1,327 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Arrow Please (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Tomahawk -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Ranged_Tomahawk"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationSharp>0.6</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Ranged_Tomahawk"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<MeleeCounterParryBonus>0.2</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Ranged_Tomahawk"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.40</MeleeCritChance>
-							<MeleeParryChance>0.20</MeleeParryChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Ranged_Tomahawk</defName>
-					<statBases>
-						<Mass>1.2</Mass>
-						<Bulk>3.3</Bulk>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>1.5</ShotSpread>
-						<SwayFactor>2.5</SwayFactor>
-						<RangedWeapon_Cooldown>0.75</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<label>throw tomahawk</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Axe_Tomahawk</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>10</range>
-						<soundCast>Interact_BeatFire</soundCast>
-					</Properties>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Axe_Tomahawk"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<damageDef>Stab</damageDef>
-							<damageAmountBase>10</damageAmountBase>
-							<speed>12</speed>
-							<armorPenetrationSharp>0.5</armorPenetrationSharp>
-							<armorPenetrationBlunt>2</armorPenetrationBlunt>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="Ranged_Tomahawk"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>BaseWeapon</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Ranged_Tomahawk"]/costStuffCount</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Ranged_Tomahawk"]/costList</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Ranged_Tomahawk"]/recipeMaker</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Ranged_Tomahawk"]</xpath>
-					<value>
-						<stackLimit>25</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="Ranged_Tomahawk"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<!-- == Recipe == -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>Make_Ranged_Tomahawk_CE</defName>
-							<label>make tomahawk x10</label>
-							<description>Craft 10 tomahawks.</description>
-							<jobString>Making tomahawk.</jobString>
-							<workAmount>8500</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-								<li>
-									<filter>
-										<stuffCategoriesToAllow>
-											<li>Metallic</li>
-											<li>Stony</li>
-										</stuffCategoriesToAllow>
-									</filter>
-									<count>50</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-								</thingDefs>
-								<stuffCategoriesToAllow>
-									<li>Metallic</li>
-									<li>Stony</li>
-								</stuffCategoriesToAllow>
-							</fixedIngredientFilter>
-							<products>
-								<Ranged_Tomahawk>10</Ranged_Tomahawk>
-							</products>
-							<recipeUsers>
-								<li>FueledSmithy</li>
-								<li>ElectricSmithy</li>
-								<li>CraftingSpot</li>
-							</recipeUsers>
-						</RecipeDef>
-					</value>
-				</li>
-
-				<!-- Torch -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Ranged_Torch"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stick</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>fire</label>
-								<capacities>
-									<li>TorchBurn</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2.2</cooldownTime>
-								<chanceFactor>2.2</chanceFactor>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>fire</label>
-								<capacities>
-									<li>TorchFlame</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2.2</cooldownTime>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationBlunt>0.0</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="Ranged_Torch"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>BaseWeapon</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Ranged_Torch</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>1.5</ShotSpread>
-						<SwayFactor>2.5</SwayFactor>
-						<RangedWeapon_Cooldown>0.75</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<label>throw torch</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Torch_Torch</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>10</range>
-						<soundCast>Interact_BeatFire</soundCast>
-					</Properties>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Ranged_Torch"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<MeleeCounterParryBonus>0.2</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Ranged_Torch"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.10</MeleeCritChance>
-						<MeleeParryChance>0.30</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Ranged_Torch"]</xpath>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<stackLimit>25</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Torch_Torch"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<damageDef>Flame</damageDef>
-							<damageAmountBase>1</damageAmountBase>
-							<speed>12</speed>
-							<armorPenetrationSharp>0.0</armorPenetrationSharp>
-							<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							<ai_IsIncendiary>true</ai_IsIncendiary>
-							<!--
-					<explosionRadius>0.5</explosionRadius>
-					<postExplosionSpawnChance>1</postExplosionSpawnChance>
-					<postExplosionSpawnThingDef>Fire</postExplosionSpawnThingDef>
-					<postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
-					-->
-						</projectile>
-					</value>
-				</li>
-
-				<!-- == Recipe == -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>Make_Torch_Torch</defName>
-							<label>make torch x10</label>
-							<description>Craft 10 torches.</description>
-							<jobString>Making torch.</jobString>
-							<workAmount>400</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>40</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Torch_Torch>10</Torch_Torch>
-							</products>
-							<recipeUsers>
-								<li>FueledSmithy</li>
-								<li>ElectricSmithy</li>
-								<li>CraftingSpot</li>
-							</recipeUsers>
-						</RecipeDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Arrow Please/ArrowPlease_Turret.xml b/Patches/Arrow Please/ArrowPlease_Turret.xml
deleted file mode 100644
index 95a8051736..0000000000
--- a/Patches/Arrow Please/ArrowPlease_Turret.xml	
+++ /dev/null
@@ -1,306 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Arrow Please (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--=============== Base turrets ===============-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Turret_Ballista" or
-						defName="Turret_Triplecrossbow" or
-						@Name="Turret_CatapultBase" or
-						@Name="Turret_TrebuchetBase"
-						]/thingClass </xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="Turret_Ballista" or
-						defName="Turret_Triplecrossbow"
-						]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
-				</li>
-
-				<!-- Remove duplicate mannable comp. -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						@Name="Turret_CatapultBase" or
-						@Name="Turret_TrebuchetBase"
-						]/comps/li[@Class = "CompProperties_Mannable"] </xpath>
-				</li>
-
-				<!--=============== Ballista ===============-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Turret_BallistaGun</defName>
-					<statBases>
-						<Mass>25.0</Mass>
-						<RangedWeapon_Cooldown>8.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.002</ShotSpread>
-						<SwayFactor>0.0</SwayFactor>
-						<Bulk>18.87</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.1</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Pilum_Fired</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>42</range>
-						<soundCast>Ballista_Launch</soundCast>
-						<muzzleFlashScale>0</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_Javelins</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!--=============== Triple Crossbow ===============-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Turret_TriplecrossbowGun</defName>
-					<statBases>
-						<Mass>25.0</Mass>
-						<RangedWeapon_Cooldown>8.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.005</ShotSpread>
-						<SwayFactor>0.0</SwayFactor>
-						<Bulk>22.87</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.1</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Pilum_Fired</defaultProjectile>
-						<warmupTime>0.85</warmupTime>
-						<range>40</range>
-						<soundCast>Ballista_Launch</soundCast>
-						<muzzleFlashScale>0</muzzleFlashScale>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<burstShotCount>3</burstShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>3</magazineSize>
-						<reloadTime>4.95</reloadTime>
-						<ammoSet>AmmoSet_Javelins</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>true</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!--========== Catapult - Weapon ==========-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="BaseCatapultWeapon"]</xpath>
-					<value>
-						<statBases>
-							<SightsEfficiency>0.5</SightsEfficiency>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name = "BaseCatapultWeapon"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Charges">
-							<chargeSpeeds>
-								<li>10</li>
-								<li>20</li>
-								<li>30</li>
-								<li>50</li>
-								<li>70</li>
-							</chargeSpeeds>
-						</li>
-						<li Class="CombatExtended.CompProperties_AmmoUser">
-							<magazineSize>1</magazineSize>
-							<reloadTime>12</reloadTime>
-							<ammoSet>AmmoSet_Catapult</ammoSet>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Turret_CatapultGun"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-								<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Projectile_CatapultBullet_Boulder</defaultProjectile>
-								<warmupTime>4</warmupTime>
-								<minRange>20</minRange>
-								<range>500</range>
-								<burstShotCount>1</burstShotCount>
-								<soundCast>Bow_Recurve</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<indirectFirePenalty>0.2</indirectFirePenalty>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Turret_CatapultGun"]/weaponTags</xpath>
-					<value>
-						<li>TurretGun</li>
-					</value>
-				</li>
-
-				<!-- ========== Catapult - Base ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Turret_CatapultBase"]/building/turretBurstWarmupTime</xpath>
-					<value>
-						<turretBurstWarmupTime>1</turretBurstWarmupTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Turret_CatapultBase"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>1</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="Turret_CatapultBase"]/inspectorTabs</xpath>
-				</li>
-
-				<!--========== Trebuchet - Weapon ==========-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="BaseTrebuchetWeapon"]</xpath>
-					<value>
-						<statBases>
-							<SightsEfficiency>0.5</SightsEfficiency>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name = "BaseTrebuchetWeapon"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Charges">
-							<chargeSpeeds>
-								<li>30</li>
-								<li>50</li>
-								<li>70</li>
-								<li>90</li>
-							</chargeSpeeds>
-						</li>
-						<li Class="CombatExtended.CompProperties_AmmoUser">
-							<magazineSize>1</magazineSize>
-							<reloadTime>14</reloadTime>
-							<ammoSet>AmmoSet_Catapult</ammoSet>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Turret_TrebuchetGun"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-								<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Projectile_CatapultBullet_Boulder</defaultProjectile>
-								<warmupTime>4</warmupTime>
-								<minRange>30</minRange>
-								<range>500</range>
-								<burstShotCount>1</burstShotCount>
-								<soundCast>Bow_Recurve</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<indirectFirePenalty>0.2</indirectFirePenalty>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Turret_TrebuchetGun"]/weaponTags</xpath>
-					<value>
-						<li>TurretGun</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="Turret_TrebuchetBase"]/inspectorTabs</xpath>
-				</li>
-
-				<!-- === Remove Unneeded === -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Trebuchet_ShellsN"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/RecipeDef[defName="Make_TrebuchetShells"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/RecipeDef[defName="Make_TrebuchetShellsA"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Trebuchet_ShellsF"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Trebuchet_ShellsH"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/RecipeDef[defName="MakeHumanRound"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Catapult_ShellsN"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Catapult_ShellsF"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/RecipeDef[defName="Make_CatapultShells"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/RecipeDef[defName="Make_CatapultShellsA"]</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Aspero Race/CE_Patch_Animal_Meatdrake.xml b/Patches/Aspero Race/CE_Patch_Animal_Meatdrake.xml
deleted file mode 100644
index e2d6554b09..0000000000
--- a/Patches/Aspero Race/CE_Patch_Animal_Meatdrake.xml	
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Aspero</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd"><!-- This thing is basically a big slower, stupider, iguana so using the CE Iguana as a base -->
-					<xpath>Defs/ThingDef[defName="Grei_MeatDrake"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.04</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Grei_MeatDrake"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2.2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.250</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Grei_MeatDrake"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Serpentine</bodyShape>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Aspero Race/CE_Patch_Bodies.xml b/Patches/Aspero Race/CE_Patch_Bodies.xml
deleted file mode 100644
index dc4112a75d..0000000000
--- a/Patches/Aspero Race/CE_Patch_Bodies.xml	
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Aspero</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd"><!-- Horns should be armored very well -->
-					<xpath>Defs/BodyDef[defName = "Aspero_Body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Horn"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd"><!-- Tail should be armored the same as the rest of the body-->
-					<xpath>Defs/BodyDef[defName = "Aspero_Body"]/corePart/parts/li[def = "Tail"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<!-- The rest is identical to default humanoid, but since Aspero use a custom body the armor tags needs to be set seperately -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Aspero_Body"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Aspero_Body"]/corePart/parts/li[def = "Neck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Aspero_Body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Aspero_Body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Jaw"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Aspero_Body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Nose"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Aspero_Body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Ear"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Aspero_Body"]/corePart/parts/li[def = "Shoulder"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Aspero_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Aspero_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Aspero_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/parts/li[def = "Finger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Aspero_Body"]/corePart/parts/li[def = "Leg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Aspero_Body"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Aspero_Body"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/parts/li[def = "Toe"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- Squishy bits -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Aspero_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "right eye"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Aspero_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "left eye"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Aspero_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Aspero_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Aspero Race/CE_Patch_HediffParts.xml b/Patches/Aspero Race/CE_Patch_HediffParts.xml
deleted file mode 100644
index dfa71cc1d7..0000000000
--- a/Patches/Aspero Race/CE_Patch_HediffParts.xml	
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Aspero</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="SimpleAsperoTail"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tail</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>0.5</power>
-								<cooldownTime>2</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.01</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="CombatAsperoTail"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>spiked tail</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2</cooldownTime>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.42</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BionicAsperoTail"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>transforming tail</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1</cooldownTime>
-								<chanceFactor>0.3</chanceFactor>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>transforming tail</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>4</cooldownTime>
-								<chanceFactor>0.3</chanceFactor>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Aspero Race/CE_Patch_Leather.xml b/Patches/Aspero Race/CE_Patch_Leather.xml
deleted file mode 100644
index b1e5b241a5..0000000000
--- a/Patches/Aspero Race/CE_Patch_Leather.xml	
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Aspero</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Aspero"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.10</StuffPower_Armor_Sharp><!-- Vanilla lizard is 0.81 aspero is 1 CE lizard is 0.08, so 0.1 seems to make sense. -->
-					</value>
-				</li>
-				<li Class="PatchOperationadd"><!-- add instead of replace since aspero used leather base for blunt and didn't define a value itself -->
-					<xpath>Defs/ThingDef[defName="Leather_Aspero"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.04</StuffPower_Armor_Blunt><!-- If I understand the CE xmls right this should be the same as human leather -->
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Aspero"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.050</StuffPower_Armor_Heat><!-- I don't see a lot comparable CE examples for this value. Compared to other materials ingame instead and decided to go with with 5% -->
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Aspero Race/CE_Patch_Pawnkinds.xml b/Patches/Aspero Race/CE_Patch_Pawnkinds.xml
deleted file mode 100644
index 9e44afd5f6..0000000000
--- a/Patches/Aspero Race/CE_Patch_Pawnkinds.xml	
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Aspero</li>
-		</mods>
-		<match Class="PatchOperationAddModExtension"><!-- tried to do off the pawnkind base but that didn't work soooo.....-->
-			<xpath>Defs/PawnKindDef[@Name="AsperoPawnkindBase" or DefName="AsperoCivilian" or DefName="AsperoMilitia" or DefName="AsperoTrader" or DefName="AsperoOverseer" or DefName="AsperoSoldier" or DefName="AsperoESoldier" or DefName="AsperoSniper" or DefName="AsperoMeleeSoldier" or DefName="AsperoEMeleeSoldier"]</xpath>
-			<value>
-				<li Class="CombatExtended.LoadoutPropertiesExtension">
-					<primaryMagazineCount>
-						<min>1</min>
-						<max>4</max>
-					</primaryMagazineCount>
-					<shieldMoney>
-						<min>500</min>
-						<max>1400</max>
-					</shieldMoney>
-					<shieldTags>
-						<li>OutlanderShield</li>
-					</shieldTags>
-					<shieldChance>0.3</shieldChance>
-					<sidearms>
-						<li>
-							<generateChance>0.5</generateChance>
-							<sidearmMoney>
-								<min>60</min>
-								<max>150</max>
-							</sidearmMoney>
-							<weaponTags>
-								<li>CE_Sidearm_Melee</li>
-							</weaponTags>
-						</li>
-					</sidearms>
-				</li>
-			</value>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Aspero Race/CE_Patch_Race_Aspero.xml b/Patches/Aspero Race/CE_Patch_Race_Aspero.xml
deleted file mode 100644
index caff55b509..0000000000
--- a/Patches/Aspero Race/CE_Patch_Race_Aspero.xml	
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Aspero</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Grei_Aspero"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Grei_Aspero"]/statBases</xpath>
-					<value>
-						<MeleeCritChance>0.9</MeleeCritChance>
-						<MeleeDodgeChance>0.9</MeleeDodgeChance>
-						<MeleeParryChance>1.1</MeleeParryChance>
-						<Suppressability>0.9</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Grei_Aspero"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Grei_Aspero"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Grei_Aspero"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Aspero</li>
-		</mods>
-		<match Class="PatchOperationReplace">
-			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Grei_Aspero"]/tools</xpath>
-			<value>
-				<tools>
-					<li Class="CombatExtended.ToolCE">
-						<label>left claws</label>
-						<capacities>
-							<li>Scratch</li>
-						</capacities>
-						<power>1.5</power>
-						<cooldownTime>1.3</cooldownTime>
-						<linkedBodyPartsGroup>Aspero_LeftClaw</linkedBodyPartsGroup>
-						<armorPenetrationSharp>0.15</armorPenetrationSharp>
-						<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-					</li>
-					<li Class="CombatExtended.ToolCE">
-						<label>right claws</label>
-						<capacities>
-							<li>Scratch</li>
-						</capacities>
-						<power>1.5</power>
-						<cooldownTime>1.3</cooldownTime>
-						<linkedBodyPartsGroup>Aspero_RightClaw</linkedBodyPartsGroup>
-						<armorPenetrationSharp>0.15</armorPenetrationSharp>
-						<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-					</li>
-					<li Class="CombatExtended.ToolCE">
-						<label>teeth</label>
-						<capacities>
-							<li>Bite</li>
-						</capacities>
-						<power>2</power>
-						<cooldownTime>1.35</cooldownTime>
-						<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-						<chanceFactor>0.2</chanceFactor>
-						<armorPenetrationSharp>0.5</armorPenetrationSharp>
-						<armorPenetrationBlunt>2</armorPenetrationBlunt>
-					</li>
-					<li Class="CombatExtended.ToolCE">
-						<label>head</label>
-						<capacities>
-							<li>Stab</li>
-						</capacities>
-						<power>2</power>
-						<cooldownTime>1.5</cooldownTime>
-						<linkedBodyPartsGroup>Aspero_hornGroup</linkedBodyPartsGroup>
-						<chanceFactor>0.2</chanceFactor>
-						<armorPenetrationSharp>0.8</armorPenetrationSharp>
-						<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-					</li>
-					<li Class="CombatExtended.ToolCE">
-						<label>tail</label>
-						<capacities>
-							<li>Blunt</li>
-						</capacities>
-						<power>2</power>
-						<cooldownTime>1.5</cooldownTime>
-						<linkedBodyPartsGroup>Aspero_TailGroup</linkedBodyPartsGroup>
-						<chanceFactor>0.2</chanceFactor>
-						<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-					</li>
-				</tools>
-			</value>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Aspero Race/CE_Patch_Scenario.xml b/Patches/Aspero Race/CE_Patch_Scenario.xml
deleted file mode 100644
index 0e1b864d8f..0000000000
--- a/Patches/Aspero Race/CE_Patch_Scenario.xml	
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Aspero</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd"><!-- Same as crashlanded -->
-					<xpath>Defs/ScenarioDef[@Name="AsperoStart"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_303British_FMJ</thingDef>
-							<count>100</count>
-						</li>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_44Magnum_FMJ</thingDef>
-							<count>60</count>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Astoriel Legacy/Astoriel_Bodytype.xml b/Patches/Astoriel Legacy/Astoriel_Bodytype.xml
deleted file mode 100644
index 6cf9be9c43..0000000000
--- a/Patches/Astoriel Legacy/Astoriel_Bodytype.xml	
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Astoriel Legacy</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Outside Squishy-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Astoriel"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "right eye"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Astoriel"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "left eye"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Astoriel"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Astoriel"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<!--Arm Groups-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Astoriel"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
-					<value>
-						<li>LeftArm</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Astoriel"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
-					<value>
-						<li>RightArm</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Astoriel"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
-					<value>
-						<li>LeftShoulder</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Astoriel"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
-					<value>
-						<li>RightShoulder</li>
-					</value>
-				</li>
-
-				<!--Natural Armor-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Astoriel"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Astoriel"]/corePart/parts/li[def="Neck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Astoriel"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Astoriel"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Astoriel"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Astoriel"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Astoriel"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Astoriel"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Astoriel"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Astoriel"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Astoriel"]/corePart/parts/li[def="Leg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Astoriel"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Astoriel"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Astoriel Legacy/PawnKinds_Astoriel.xml b/Patches/Astoriel Legacy/PawnKinds_Astoriel.xml
deleted file mode 100644
index 4223fad997..0000000000
--- a/Patches/Astoriel Legacy/PawnKinds_Astoriel.xml	
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Astoriel Legacy</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Give ammo to pawns ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>
-						Defs/PawnKindDef[@Name="AstorielCivBase"]
-					</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>
-						Defs/PawnKindDef[@Name="AstorielMilBase"]
-					</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>7</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Give packs to pawns ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[@Name="AstorielMilBase" or @Name="AstorielCivBase"]</xpath>
-					<value>
-						<apparelRequired>
-							<li>CE_Apparel_Backpack</li>
-						</apparelRequired>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Astoriel Legacy/Race_Astoriel.xml b/Patches/Astoriel Legacy/Race_Astoriel.xml
deleted file mode 100644
index b5c70260fa..0000000000
--- a/Patches/Astoriel Legacy/Race_Astoriel.xml	
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Astoriel Legacy</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Astoriel"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Astoriel"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Astoriel"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Astoriel"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency>0.4</NightVisionEfficiency>
-						<MeleeDodgeChance>1.1</MeleeDodgeChance>
-						<MeleeCritChance>0.8</MeleeCritChance>
-						<MeleeParryChance>0.85</MeleeParryChance>
-						<CarryWeight>35</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Astoriel"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Astoriel"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Astoriel Legacy/Scenarios_Astoriel.xml b/Patches/Astoriel Legacy/Scenarios_Astoriel.xml
deleted file mode 100644
index 4d4f923216..0000000000
--- a/Patches/Astoriel Legacy/Scenarios_Astoriel.xml	
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Astoriel Legacy</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Add ammo to scenario === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="AstorielScenario"]/scenario/parts</xpath>
-
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_6x24mmCharged</thingDef>
-							<count>600</count>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Astoriel Legacy/Traders_Astoriel.xml b/Patches/Astoriel Legacy/Traders_Astoriel.xml
deleted file mode 100644
index 6a7eb6526a..0000000000
--- a/Patches/Astoriel Legacy/Traders_Astoriel.xml	
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Astoriel Legacy</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==========  ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[
-						defName="Caravan_Astoriel_BulkGoods" or defName="Caravan_Astoriel_PirateMerchant"
-						]/stockGenerators </xpath>
-					<value>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>FSX</thingDef>
-							<countRange>
-								<min>15</min>
-								<max>45</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>Prometheum</thingDef>
-							<countRange>
-								<min>15</min>
-								<max>45</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_HeavyAmmo</tradeTag>
-							<countRange>
-								<min>1</min>
-								<max>5</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>-1</min>
-								<max>3</max>
-							</thingDefCountRange>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="Caravan_Astoriel_CombatSupplier"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>FSX</thingDef>
-							<countRange>
-								<min>12</min>
-								<max>36</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>Prometheum</thingDef>
-							<countRange>
-								<min>12</min>
-								<max>36</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Ammo</tradeTag>
-							<countRange>
-								<min>300</min>
-								<max>1200</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>1</min>
-								<max>3</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_MediumAmmo</tradeTag>
-							<countRange>
-								<min>20</min>
-								<max>30</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>2</min>
-								<max>4</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_HeavyAmmo</tradeTag>
-							<countRange>
-								<min>10</min>
-								<max>15</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>3</max>
-							</thingDefCountRange>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="Visitor_Astoriel_Standard"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Ammo</tradeTag>
-							<countRange>
-								<min>10</min>
-								<max>60</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>-1</min>
-								<max>1</max>
-							</thingDefCountRange>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Astra Militarum Regimentum - Cadia/Armor_Industrial.xml b/Patches/Astra Militarum Regimentum - Cadia/Armor_Industrial.xml
deleted file mode 100644
index 4051f62557..0000000000
--- a/Patches/Astra Militarum Regimentum - Cadia/Armor_Industrial.xml	
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[1.4] Astra Militarum Regimentum - Cadia</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Fatigues === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_Cadian_Fatigues"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_Cadian_Fatigues"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- === Flak Armor === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_Cadian_FlakArmor"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_Cadian_FlakArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>12</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_Cadian_FlakArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>18</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_Cadian_FlakArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>30</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_Cadian_FlakArmor"]/apparel/layers</xpath>
-					<value>
-						<li>Webbing</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_Cadian_FlakArmor"]/stuffCategories</xpath>
-					<value>
-						<stuffCategories>
-							<li>Steeled</li>
-						</stuffCategories>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_Cadian_FlakArmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
-									<parts>
-										<li>Shoulder</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.85</ArmorRating_Blunt>
-									<parts>
-										<li>Shoulder</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Heavy Flak Armor === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_CadianKasrkin_FlakArmor"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_CadianKasrkin_FlakArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_CadianKasrkin_FlakArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>22</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_CadianKasrkin_FlakArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>30</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_CadianKasrkin_FlakArmor"]/apparel/layers</xpath>
-					<value>
-						<li>Webbing</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_CadianKasrkin_FlakArmor"]/stuffCategories</xpath>
-					<value>
-						<stuffCategories>
-							<li>Steeled</li>
-						</stuffCategories>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_CadianKasrkin_FlakArmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Astra Militarum Regimentum - Cadia/Headgear_Industrial.xml b/Patches/Astra Militarum Regimentum - Cadia/Headgear_Industrial.xml
deleted file mode 100644
index f6d282ee41..0000000000
--- a/Patches/Astra Militarum Regimentum - Cadia/Headgear_Industrial.xml	
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[1.4] Astra Militarum Regimentum - Cadia</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Officer Gorget === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_Cadian_OfficerGorget"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>0.5</Bulk>
-						<StuffEffectMultiplierArmor>1.25</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- === Field Cap === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_Cadian_Fieldcap"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- === Officer's Cap === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_Cadian_CrusherCap"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- === Helmet === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_Cadian_Helmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-						<StuffEffectMultiplierArmor>6.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_Cadian_Helmet"]</xpath>
-					<value>
-						<costList>
-							<Hyperweave>15</Hyperweave><!-- Hyperweave instead of Devilstrand, since the torso armor already uses it.-->
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_Cadian_Helmet"]/stuffCategories/li[.="Metallic"]</xpath>
-					<value>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<!-- === Kasrkin Helmet === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_CadianKasrkin_Helmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<StuffEffectMultiplierArmor>9</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_CadianKasrkin_Helmet"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_CadianKasrkin_Helmet"]/costList</xpath>
-					<value>
-						<Hyperweave>20</Hyperweave>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_CadianKasrkin_Helmet"]/stuffCategories/li[.="Metallic"]</xpath>
-					<value>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Astra Militarum Regimentum - Krieg Officer Helmet/Headgear_Industrial.xml b/Patches/Astra Militarum Regimentum - Krieg Officer Helmet/Headgear_Industrial.xml
deleted file mode 100644
index 5521802b62..0000000000
--- a/Patches/Astra Militarum Regimentum - Krieg Officer Helmet/Headgear_Industrial.xml	
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[1.4] Astra Militarum Regimentum - Krieg: Officer Helmet</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Grenadier Helmet === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_40K_IG_DKOK_OFFICER" or defName="ODZ_40K_IG_DKOK_NCO"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<StuffEffectMultiplierArmor>10</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ODZ_40K_IG_DKOK_OFFICER" or defName="ODZ_40K_IG_DKOK_NCO"]</xpath>
-					<value>
-						<costList>
-							<Hyperweave>20</Hyperweave>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_40K_IG_DKOK_OFFICER" or defName="ODZ_40K_IG_DKOK_NCO"]/stuffCategories/li[.="Metallic"]</xpath>
-					<value>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Astra Militarum Regimentum - Krieg/Armor_Industrial.xml b/Patches/Astra Militarum Regimentum - Krieg/Armor_Industrial.xml
deleted file mode 100644
index c66408c221..0000000000
--- a/Patches/Astra Militarum Regimentum - Krieg/Armor_Industrial.xml	
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[1.4] Astra Militarum Regimentum - Krieg</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Krieg Uniform === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_KriegUniform"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_KriegUniform"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- === Combat Webbing === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_CombatWebbing"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_CombatWebbing"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- === Flak Armor === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_GrenadierArmor"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_GrenadierArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>12</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_GrenadierArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>18</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_GrenadierArmor"]/stuffCategories</xpath>
-					<value>
-						<stuffCategories>
-							<li>Steeled</li>
-						</stuffCategories>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_GrenadierArmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
-									<parts>
-										<li>Shoulder</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.85</ArmorRating_Blunt>
-									<parts>
-										<li>Shoulder</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Astra Militarum Regimentum - Krieg/Headgear_Industrial.xml b/Patches/Astra Militarum Regimentum - Krieg/Headgear_Industrial.xml
deleted file mode 100644
index ce9fc68305..0000000000
--- a/Patches/Astra Militarum Regimentum - Krieg/Headgear_Industrial.xml	
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[1.4] Astra Militarum Regimentum - Krieg</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Helmet === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_Helmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-						<StuffEffectMultiplierArmor>6.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_Helmet"]</xpath>
-					<value>
-						<costList>
-							<Hyperweave>15</Hyperweave><!-- Hyperweave instead of Devilstrand.-->
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_Helmet"]/stuffCategories/li[.="Metallic"]</xpath>
-					<value>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<!-- === Grenadier Helmet === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_GrenadierHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_GrenadierHelmet"]</xpath>
-					<value>
-						<costList>
-							<Hyperweave>20</Hyperweave>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_GrenadierHelmet"]/stuffCategories/li[.="Metallic"]</xpath>
-					<value>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<!-- === Gas Mask === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_Gasmask"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_Gasmask"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<!-- === Grenadier Gas Mask === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_GrenadierGasmask"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-						<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_GrenadierGasmask"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Auto-Mortars/Buildings_Security.xml b/Patches/Auto-Mortars/Buildings_Security.xml
deleted file mode 100644
index 61b8a4f06e..0000000000
--- a/Patches/Auto-Mortars/Buildings_Security.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Auto-Mortars(Unofficial)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Auto Mortars ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_Auto_Mortar"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_Auto_Mortar"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>10</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Turret_Auto_Mortar"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AutoMortarTurret</defName>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-						<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_60mmMortarShell_HE</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<minRange>20</minRange>
-						<range>500</range>
-						<burstShotCount>1</burstShotCount>
-						<soundCast>Mortar_LaunchA</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>55</muzzleFlashScale>
-						<circularError>1.2</circularError>
-						<requireLineOfSight>false</requireLineOfSight>
-						<indirectFirePenalty>0.3</indirectFirePenalty>
-						<targetParams>
-							<canTargetLocations>false</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_60mmMortarShell</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Gun_AutoMortarTurret"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Charges">
-							<chargeSpeeds>
-								<li>30</li>
-								<li>50</li>
-								<li>70</li>
-								<li>90</li>
-							</chargeSpeeds>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Autocleaner/Autocleaner.xml b/Patches/Autocleaner/Autocleaner.xml
deleted file mode 100644
index 3f977eb7f1..0000000000
--- a/Patches/Autocleaner/Autocleaner.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Autocleaner</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Autocleaner === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Autocleaner"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.3</ArmorRating_Heat>
-						<MeleeDodgeChance>0</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Autocleaner"]/race/baseBodySize</xpath>
-					<value>
-						<baseBodySize>0.20</baseBodySize>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Autocleaner"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Autocleaner"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>body</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.05</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Based upon the dimensions of an actual Roomba. === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AutocleanerItem"]/statBases</xpath>
-					<value>
-						<Bulk>9</Bulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Bastyon/Bast_Resources.xml b/Patches/Bastyon/Bast_Resources.xml
deleted file mode 100644
index 1e6c7a317f..0000000000
--- a/Patches/Bastyon/Bast_Resources.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Bastyon</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Remove tusk as a weapon -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Bast_CeratokHorn"]/tools</xpath>
-				</li>
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="Bast_CeratokHorn"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>ResourceBase</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_CeratokHorn"]/statBases/MarketValue</xpath>
-					<value>
-						<MarketValue>500</MarketValue>
-					</value>
-				</li>
-
-				<!--Bahlrin -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Bahlrin"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.09</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Bahlrin"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.04</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Bahlrin"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.02</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<!--Bastyon -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Bastyon"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.08</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Bastyon"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.04</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!--Leather_Blazing_Felidae -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Blazing_Felidae"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.09</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<!--Tegu -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Chem_Tegu"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.06</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Chem_Tegu"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.03</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!--Leather_Scire -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Scire"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.046</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Scire"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.02</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Scire"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.07</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<!--Leather_Ethereal_Lion -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Ethereal_Lion"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.07</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Ethereal_Lion"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.036</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!--Leather_Ceratok -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Ceratok"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.12</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Ceratok"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.064</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Ceratok"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.04</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<!--Leather_Soul_Eater -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Soul_Eater"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.03</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Soul_Eater"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.2</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!--Leather_Soul_Eater -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Vorpal_Bunny"
-						or defName="Leather_Vorpal_Bunny_Enraged"
-						or defName="Leather_Vorpal_Bunny_Iridescent"
-						or defName="Leather_Vorpal_Bunny_Pragmatic"
-						or defName="Leather_Vorpal_Bunny_Befouled"]/statBases/StuffPower_Armor_Sharp </xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.03</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Vorpal_Bunny"
-						or defName="Leather_Vorpal_Bunny_Enraged"
-						or defName="Leather_Vorpal_Bunny_Iridescent"
-						or defName="Leather_Vorpal_Bunny_Pragmatic"
-						or defName="Leather_Vorpal_Bunny_Befouled"]/statBases/StuffPower_Armor_Blunt </xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.2</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Bastyon/Basty_Bodies.xml b/Patches/Bastyon/Basty_Bodies.xml
deleted file mode 100644
index d76996b1d1..0000000000
--- a/Patches/Bastyon/Basty_Bodies.xml
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Bastyon</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Natural Armor -->
-				<!-- Bast_Critter -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Bast_Critter"]//*[
-						def="Body" or
-						def="Leg" or
-						def="Neck"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Bast_Critter"]//*[
-						def="Body" or
-						def="Neck" or
-						def="AnimalJaw" or
-						def="Leg" or
-						def="Foot" or
-						def="Head"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- Natural Armor -->
-				<!-- Bast_SnippingSnail -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Bast_SnippingSnail"]//*[
-						def="Bast_SnailBody" or
-						def="Bast_GastropodShell"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Bast_SnippingSnail"]//*[
-						def="Bast_GastropodShell" or
-						def="Bast_BladedRightLeg" or
-						def="Bast_BladedLeftLeg"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- Natural Armor -->
-				<!-- Anty the vore ant -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Bast_Ant"]//*[
-						def="Body" or
-						def="Bast_Thorax" or
-						def="Pronotum" or
-						def="InsectNostril" or
-						def="Bast_Abdomen" or
-						def="Bast_Antennae"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Bast_Ant"]//*[
-						def="Body" or
-						def="Bast_Thorax" or
-						def="Pronotum" or
-						def="InsectNostril" or
-						def="InsectHead" or
-						def="Bast_InsectMouth" or
-						def="Bast_Antennae" or
-						def="Bast_Abdomen" or
-						def="Bast_SmallInsectLeg"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- Bahlrin -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Bast_BahlrinBody"]//*[
-						def="Body" or
-						def="Tail" or
-						def="Neck" or
-						def="Bast_Wing"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Bast_BahlrinBody"]//*[
-						def="Body" or
-						def="Tail" or
-						def="Neck" or
-						def="AnimalJaw" or
-						def="Head" or
-						def="Bast_Wing"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- BastLimblessGelatinous -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Bast_LimblessGelatinous"]//*[def="Body"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- Bast_LimblessHovering -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Bast_LimblessHovering"]//*[
-						def="Body"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Bast_LimblessHovering"]//*[
-						def="Body" or
-						def="Head"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- Bast_Spider -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Bast_Spider"]//*[
-						def="Body" or
-						def="Bast_Thorax" or
-						def="Pronotum" or
-						def="InsectNostril"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Bast_Spider"]//*[
-						def="Body" or
-						def="Bast_Thorax" or
-						def="Pronotum" or
-						def="InsectNostril" or
-						def="InsectHead" or
-						def="Bast_InsectMouth" or
-						def="InsectLeg"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Bast_SvarogBody"]//*[
-						def="Bast_SavrogMainBody" or
-						def="Bast_SmolderingFist"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Bast_LightningElementalBody"]//*[
-						def="Bast_LightningElementalMainBody" or
-						def="Bast_GalvanizedFist"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Bastyon/BetaAnimals_CE_Patch_Projectiles.xml b/Patches/Bastyon/BetaAnimals_CE_Patch_Projectiles.xml
deleted file mode 100644
index e3d141579a..0000000000
--- a/Patches/Bastyon/BetaAnimals_CE_Patch_Projectiles.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Bastyon</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ============== Changing Projectile's thingClass to CE ones ================ -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Bast_ScireFireBall" or
-						defName="Bast_Web" or
-						defName="Bast_AlluviumGoo" or
-						defName="Bast_CritterSpike" or
-						defName="Bast_BlisteringWind" or
-						defName="Bast_LightningBolt" or
-						defName="Bast_SnippingSnailAcid"] </xpath>
-					<value>
-						<thingClass>CombatExtended.BulletCE</thingClass>
-					</value>
-				</li>
-
-				<!-- ============== Adding 'Standard' AimingAccuracy node to creatures' that use ranged attack statBases. =============== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Bast_Scire" or
-						defName="Bast_Alluvium" or defName="Bast_Snipping_Snail" or defName="Bast_Soul_Eater" or defName="Bast_LightningBolt"]/statBases </xpath>
-					<value>
-						<AimingAccuracy>0.7</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Bast_Critter" or defName="Bast_Gray_Terror"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.3</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Bast_Bastyon" or defName="Bast_Blazing_Felidae" or defName="Bast_Svarog"]/statBases</xpath>
-					<value>
-						<ShootingAccuracyPawn>2</ShootingAccuracyPawn>
-						<AimingAccuracy>1</AimingAccuracy>
-					</value>
-				</li>
-
-				<!-- =============== Now defining Projectiles in CE Procedure ============= -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_LightningBolt"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>Bast_Electric</damageDef>
-							<damageAmountBase>8</damageAmountBase>
-							<stoppingPower>0.5</stoppingPower>
-							<speed>30</speed>
-							<armorPenetrationSharp>50</armorPenetrationSharp>
-							<armorPenetrationBlunt>0.01</armorPenetrationBlunt>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_SnippingSnailAcid"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>Bast_AcidStream</damageDef>
-							<damageAmountBase>3</damageAmountBase>
-							<speed>12</speed>
-							<armorPenetrationSharp>2</armorPenetrationSharp>
-							<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-						</projectile>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_CritterSpike"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>Cut</damageDef>
-							<damageAmountBase>6</damageAmountBase>
-							<speed>14</speed>
-							<armorPenetrationSharp>0.4</armorPenetrationSharp>
-							<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-						</projectile>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_AlluviumGoo"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>Blunt</damageDef>
-							<damageAmountBase>2</damageAmountBase>
-							<speed>8</speed>
-							<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							<secondaryDamage>
-								<li>
-									<def>Stun</def>
-									<amount>10</amount>
-								</li>
-							</secondaryDamage>
-						</projectile>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_ScireFireBall"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>Flame</damageDef>
-							<damageAmountBase>1</damageAmountBase>
-							<armorPenetrationSharp>3</armorPenetrationSharp>
-							<speed>16</speed>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Web"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>Blunt</damageDef>
-							<damageAmountBase>2</damageAmountBase>
-							<speed>14</speed>
-							<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							<secondaryDamage>
-								<li>
-									<def>Stun</def>
-									<amount>8</amount>
-								</li>
-							</secondaryDamage>
-						</projectile>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Bastyon/BetaAnimals_CE_Patch_VerbShootCE.xml b/Patches/Bastyon/BetaAnimals_CE_Patch_VerbShootCE.xml
deleted file mode 100644
index b65f204a7e..0000000000
--- a/Patches/Bastyon/BetaAnimals_CE_Patch_VerbShootCE.xml
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Bastyon</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Alluvium"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bast_AlluviumGoo</defaultProjectile>
-								<warmupTime>1.5</warmupTime>
-								<burstShotCount>2</burstShotCount>
-								<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
-								<minRange>2</minRange>
-								<range>12</range>
-								<soundCast>Bast_AlluviumGoo</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<commonality>0.8</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Critter"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bast_CritterSpike</defaultProjectile>
-								<warmupTime>2</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>1.9</minRange>
-								<range>10</range>
-								<soundCast>Bast_CritterSpike</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>critter spike</label>
-								<commonality>0.8</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Grey spider -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Gray_Terror"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bast_Web</defaultProjectile>
-								<warmupTime>2</warmupTime>
-								<burstShotCount>2</burstShotCount>
-								<ticksBetweenBurstShots>25</ticksBetweenBurstShots>
-								<minRange>2</minRange>
-								<range>15</range>
-								<soundCast>Bast_Web</soundCast>
-								<label>spider web</label>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<commonality>0.5</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Scire -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Scire"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bast_ScireFireBall</defaultProjectile>
-								<warmupTime>2.5</warmupTime>
-								<burstShotCount>3</burstShotCount>
-								<ticksBetweenBurstShots>18</ticksBetweenBurstShots>
-								<minRange>2</minRange>
-								<range>16</range>
-								<soundCast>Bast_ScireFireBall</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>eternal fire</label>
-								<commonality>0.75</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Snipping_Snail"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bast_SnippingSnailAcid</defaultProjectile>
-								<warmupTime>2.5</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<minRange>2</minRange>
-								<range>8</range>
-								<soundCast>Bast_SnippingSnailAcid</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>acid stream</label>
-								<commonality>0.8</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Soul_Eater"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bast_BlisteringWind</defaultProjectile>
-								<warmupTime>3</warmupTime>
-								<burstShotCount>4</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>1.9</minRange>
-								<range>12</range>
-								<soundCast>Bast_BlisteringWind</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>blistering wind</label>
-								<commonality>0.8</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Lightning_Elemental"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bast_LightningBolt</defaultProjectile>
-								<warmupTime>3</warmupTime>
-								<burstShotCount>3</burstShotCount>
-								<minRange>1.1</minRange>
-								<range>36</range>
-								<soundCast>Thunder_OnMap</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>lightning bolt</label>
-								<commonality>.5</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Svarog"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li>
-								<verbClass>Verb_Shoot</verbClass>
-								<accuracyTouch>1</accuracyTouch>
-								<accuracyShort>1</accuracyShort>
-								<accuracyMedium>.85</accuracyMedium>
-								<accuracyLong>.75</accuracyLong>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bast_SvarogFireStream</defaultProjectile>
-								<warmupTime>3.5</warmupTime>
-								<burstShotCount>2</burstShotCount>
-								<minRange>3</minRange>
-								<range>12</range>
-								<soundCast>Bast_FireStream</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>searing fire</label>
-								<commonality>1</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Bastyon/CE_Patch_BastRace_All.xml b/Patches/Bastyon/CE_Patch_BastRace_All.xml
deleted file mode 100644
index 1c5f85e7ec..0000000000
--- a/Patches/Bastyon/CE_Patch_BastRace_All.xml
+++ /dev/null
@@ -1,664 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Bastyon</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Anty the vore ant === -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Bast_Abatanica_Ant"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Bast_Abatanica_Ant"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.01</MeleeDodgeChance>
-						<MeleeCritChance>0.24</MeleeCritChance>
-						<MeleeParryChance>0.35</MeleeParryChance>
-						<ArmorRating_Sharp>0.12</ArmorRating_Sharp>
-						<ArmorRating_Blunt>0.2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Abatanica_Ant"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandible</label>
-								<capacities>
-									<li>Cut</li>
-									<li>Scratch</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2.64</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>3</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Abatanica_Ant"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>0.6</baseHealthScale>
-					</value>
-				</li>
-
-				<!-- === Alluvium === -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Bast_Alluvium"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Bast_Alluvium"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.00</MeleeCritChance>
-						<MeleeParryChance>0.00</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Alluvium"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Bast_Nucleoplasm</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>5</cooldownTime>
-								<linkedBodyPartsGroup>Bast_Body</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>false</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Alluvium"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>1.5</baseHealthScale>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Bast_Alluvium"]/statBases/ArmorRating_Blunt</xpath>
-				</li>
-
-				<!-- === Bahlrin === -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Bast_Bahlrin"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Bast_Bahlrin"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.8</MeleeDodgeChance>
-						<MeleeCritChance>0.18</MeleeCritChance>
-						<MeleeParryChance>0.03</MeleeParryChance>
-						<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
-						<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Bahlrin"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>jagged teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>12</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>16</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Bahlrin"]/race/baseBodySize</xpath>
-					<value>
-						<baseBodySize>1.1</baseBodySize>
-					</value>
-				</li>
-
-				<!-- === Bastyon === -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Bast_Bastyon"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Bast_Bastyon"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.33</MeleeDodgeChance>
-						<MeleeCritChance>0.24</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Bastyon"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>0.84</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.43</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>0.84</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.43</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>1.64</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2.0</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.75</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Felidae === -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Bast_Blazing_Felidae"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Bast_Blazing_Felidae"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.33</MeleeDodgeChance>
-						<MeleeCritChance>0.16</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Blazing_Felidae"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>0.9</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<extraMeleeDamages>
-									<li>
-										<def>Burn</def>
-										<amount>4</amount>
-										<chance>0.5</chance>
-									</li>
-								</extraMeleeDamages>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.36</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>0.9</cooldownTime>
-								<extraMeleeDamages>
-									<li>
-										<def>Burn</def>
-										<amount>4</amount>
-										<chance>0.5</chance>
-									</li>
-								</extraMeleeDamages>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.36</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.6</cooldownTime>
-								<extraMeleeDamages>
-									<li>
-										<def>Burn</def>
-										<amount>6</amount>
-										<chance>0.5</chance>
-									</li>
-								</extraMeleeDamages>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Ceratok === -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Bast_Ceratok"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Ceratok"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>5.2</MoveSpeed>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.67</MeleeCritChance>
-						<MeleeParryChance>0.3</MeleeParryChance>
-						<ArmorRating_Blunt>4</ArmorRating_Blunt>
-						<ArmorRating_Sharp>0.35</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Ceratok"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horns</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>24</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Poke</def>
-										<amount>14</amount>
-										<chance>0.5</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>2.18</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>21</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>horns</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>24</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Stab</def>
-										<amount>20</amount>
-										<chance>0.5</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>2.18</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>21</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>2.7</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>24</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Ceratok"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>3.0</baseHealthScale>
-					</value>
-				</li>
-
-				<!-- === Tegu === -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Bast_Chem_Tegu"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Bast_Chem_Tegu"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						<MeleeCritChance>0.16</MeleeCritChance>
-						<MeleeParryChance>0.18</MeleeParryChance>
-						<ArmorRating_Blunt>0.15</ArmorRating_Blunt>
-						<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Chem_Tegu"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>2.7</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.6</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2.4</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Bast_Chem_Tegu"]</xpath>
-					<value>
-						<butcherProducts>
-							<Chemfuel>40</Chemfuel>
-						</butcherProducts>
-					</value>
-				</li>
-
-				<!-- === Snippy === -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Bast_Snipping_Snail"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Bast_Snipping_Snail"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.01</MeleeDodgeChance>
-						<MeleeCritChance>0.24</MeleeCritChance>
-						<MeleeParryChance>0.35</MeleeParryChance>
-						<ArmorRating_Sharp>0.6</ArmorRating_Sharp>
-						<ArmorRating_Blunt>1.0</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Snipping_Snail"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left blade arm</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Cut</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>3</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right blade arm</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Cut</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>3</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>2.4</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Snipping_Snail"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>1</baseHealthScale>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Bastyon/CE_Patch_BastRace_All2.xml b/Patches/Bastyon/CE_Patch_BastRace_All2.xml
deleted file mode 100644
index 60692c8086..0000000000
--- a/Patches/Bastyon/CE_Patch_BastRace_All2.xml
+++ /dev/null
@@ -1,478 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Bastyon</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Bast_Critter === -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Bast_Critter"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Bast_Critter"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.33</MeleeDodgeChance>
-						<MeleeCritChance>0.13</MeleeCritChance>
-						<MeleeParryChance>0.24</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Critter"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Bast_Ethereal_Lion === -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Bast_Ethereal_Lion"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Bast_Ethereal_Lion"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						<MeleeCritChance>0.27</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Ethereal_Lion"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>0.88</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.66</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>0.88</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.66</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>33</power>
-								<cooldownTime>1.64</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.75</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Gnomaclu === -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Bast_Hazey_Gnomaclu" or defName="Bast_Midnight_Gnomaclu" or defName="Bast_Sunburst_Gnomaclu"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Vehicle</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Bast_Hazey_Gnomaclu" or defName="Bast_Midnight_Gnomaclu" or defName="Bast_Sunburst_Gnomaclu"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.21</MeleeCritChance>
-						<MeleeParryChance>0.00</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Hazey_Gnomaclu" or defName="Bast_Midnight_Gnomaclu" or defName="Bast_Sunburst_Gnomaclu"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Bast_Nucleoplasm</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>4</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>false</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Soul Eater === -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Bast_Soul_Eater"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Soul_Eater"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>7.8</MoveSpeed>
-						<MeleeDodgeChance>0.6</MeleeDodgeChance>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>0.4</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Soul_Eater"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.32</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.32</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>1.64</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.75</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Scire === -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Bast_Scire"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Scire"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>8.1</MoveSpeed>
-						<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						<MeleeCritChance>0.17</MeleeCritChance>
-						<MeleeParryChance>0.4</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Scire"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.66</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.750</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.97</cooldownTime>
-								<restrictedGender>Female</restrictedGender>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>antlers</label>
-								<capacities>
-									<li>Poke</li>
-									<li>Scratch</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.88</cooldownTime>
-								<restrictedGender>Male</restrictedGender>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Gray Terror === -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Bast_Gray_Terror"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Gray_Terror"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>8</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Gray_Terror"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.33</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Bast_Gray_Terror"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.24</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Gray_Terror"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left front metatarsus</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right front metatarsus</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>2.2</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Bastyon/CE_Patch_BastRace_All3.xml b/Patches/Bastyon/CE_Patch_BastRace_All3.xml
deleted file mode 100644
index 4122a3e600..0000000000
--- a/Patches/Bastyon/CE_Patch_BastRace_All3.xml
+++ /dev/null
@@ -1,345 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Bastyon</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Cervus === -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Bast_Gleaming_Cervus"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Gleaming_Cervus"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>6.9</MoveSpeed>
-						<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						<MeleeCritChance>0.17</MeleeCritChance>
-						<MeleeParryChance>0.4</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Gleaming_Cervus"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.66</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.750</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.97</cooldownTime>
-								<restrictedGender>Female</restrictedGender>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>daunting antlers</label>
-								<capacities>
-									<li>Poke</li>
-									<li>Scratch</li>
-									<li>Blunt</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>2</cooldownTime>
-								<restrictedGender>Male</restrictedGender>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Bunnies === -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Bast_Vorpal_Bunny"
-						or defName="Bast_Vorpal_Bunny_Befouled"
-						or defName="Bast_Vorpal_Bunny_Enduring"
-						or defName="Bast_Vorpal_Bunny_Enraged"
-						or defName="Bast_Vorpal_Bunny_Gilded"
-						or defName="Bast_Vorpal_Bunny_Iridescent"
-						or defName="Bast_Vorpal_Bunny_Pragmatic"] </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Giving them non stupid stats === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Vorpal_Bunny"
-						or defName="Bast_Vorpal_Bunny_Befouled"
-						or defName="Bast_Vorpal_Bunny_Enduring"
-						or defName="Bast_Vorpal_Bunny_Enraged"
-						or defName="Bast_Vorpal_Bunny_Gilded"
-						or defName="Bast_Vorpal_Bunny_Iridescent"
-						or defName="Bast_Vorpal_Bunny_Pragmatic"]/statBases </xpath>
-					<value>
-						<statBases>
-							<MoveSpeed>6.00</MoveSpeed>
-							<ComfyTemperatureMin>0</ComfyTemperatureMin>
-							<ComfyTemperatureMax>35</ComfyTemperatureMax>
-							<MarketValue>250</MarketValue>
-							<MeatAmount>30</MeatAmount>
-							<MeleeDodgeChance>0.33</MeleeDodgeChance>
-							<MeleeCritChance>0.07</MeleeCritChance>
-							<MeleeParryChance>0.00</MeleeParryChance>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Vorpal_Bunny"
-						or defName="Bast_Vorpal_Bunny_Befouled"
-						or defName="Bast_Vorpal_Bunny_Enduring"
-						or defName="Bast_Vorpal_Bunny_Enraged"
-						or defName="Bast_Vorpal_Bunny_Gilded"
-						or defName="Bast_Vorpal_Bunny_Iridescent"
-						or defName="Bast_Vorpal_Bunny_Pragmatic"]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Vorpal_Bunny"
-						or defName="Bast_Vorpal_Bunny_Befouled"
-						or defName="Bast_Vorpal_Bunny_Enduring"
-						or defName="Bast_Vorpal_Bunny_Enraged"
-						or defName="Bast_Vorpal_Bunny_Gilded"
-						or defName="Bast_Vorpal_Bunny_Iridescent"
-						or defName="Bast_Vorpal_Bunny_Pragmatic"]/race/baseHealthScale </xpath>
-					<value>
-						<baseHealthScale>0.5</baseHealthScale>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Bast_Vorpal_Bunny"
-						or defName="Bast_Vorpal_Bunny_Befouled"
-						or defName="Bast_Vorpal_Bunny_Enduring"
-						or defName="Bast_Vorpal_Bunny_Enraged"
-						or defName="Bast_Vorpal_Bunny_Gilded"
-						or defName="Bast_Vorpal_Bunny_Iridescent"
-						or defName="Bast_Vorpal_Bunny_Pragmatic"]/combatPower </xpath>
-					<value>
-						<combatPower>20</combatPower>
-					</value>
-				</li>
-
-				<!-- === Svarog === -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Bast_Svarog"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Svarog"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>3</MoveSpeed>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>0.5</MeleeCritChance>
-						<MeleeParryChance>0.4</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Svarog"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Svarog"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>10</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Svarog"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left smoldering fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.5</cooldownTime>
-								<extraMeleeDamages>
-									<li>
-										<def>Flame</def>
-										<amount>8</amount>
-										<chance>0.75</chance>
-									</li>
-								</extraMeleeDamages>
-								<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right smoldering fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.5</cooldownTime>
-								<extraMeleeDamages>
-									<li>
-										<def>Flame</def>
-										<amount>8</amount>
-										<chance>0.75</chance>
-									</li>
-								</extraMeleeDamages>
-								<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Lightning === -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Bast_Lightning_Elemental"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Lightning_Elemental"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>3</MoveSpeed>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>0.5</MeleeCritChance>
-						<MeleeParryChance>0.4</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Lightning_Elemental"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Lightning_Elemental"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>10</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bast_Lightning_Elemental"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left galvanized fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.5</cooldownTime>
-								<extraMeleeDamages>
-									<li>
-										<def>Bast_Electric</def>
-										<amount>8</amount>
-										<chance>0.75</chance>
-									</li>
-								</extraMeleeDamages>
-								<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right galvanized fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.5</cooldownTime>
-								<extraMeleeDamages>
-									<li>
-										<def>Bast_Electric</def>
-										<amount>8</amount>
-										<chance>0.75</chance>
-									</li>
-								</extraMeleeDamages>
-								<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Beast Man Tribes/CE_Beast_Race.xml b/Patches/Beast Man Tribes/CE_Beast_Race.xml
deleted file mode 100644
index 5518ad7f8a..0000000000
--- a/Patches/Beast Man Tribes/CE_Beast_Race.xml	
+++ /dev/null
@@ -1,564 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Beast Man Tribes</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="BearMan" or
-						defName="CamelMan" or
-						defName="ElephantMan" or
-						defName="ElkMan" or
-						defName="FoxMan" or
-						defName="GazelleMan" or
-						defName="LynxMan" or
-						defName="PigMan" or
-						defName="RaccoonMan" or
-						defName="WolfMan"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="BearMan" or
-						defName="CamelMan" or
-						defName="ElephantMan" or
-						defName="ElkMan" or
-						defName="FoxMan" or
-						defName="GazelleMan" or
-						defName="LynxMan" or
-						defName="PigMan" or
-						defName="RaccoonMan" or
-						defName="WolfMan"
-						] </xpath>
-					<value>
-						<comps>
-							<li>
-								<compClass>CombatExtended.CompPawnGizmo</compClass>
-							</li>
-							<li Class="CombatExtended.CompProperties_Suppressable" />
-						</comps>
-					</value>
-				</li>
-
-				<!-- Bears -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="BearMan"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<Suppressability>1</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="BearMan"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.08</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="BearMan"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.05</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="BearMan"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2.4</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.0</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Camels -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="CamelMan"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<Suppressability>1</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="CamelMan"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="CamelMan"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.07</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="CamelMan"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Elephant -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ElephantMan"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<Suppressability>1</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ElephantMan"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ElephantMan"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ElephantMan"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Elks -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ElkMan"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<Suppressability>1</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ElkMan"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.04</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ElkMan"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.04</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ElkMan"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.25</chanceFactor>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Gazelle -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="GazelleMan"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1.25</MeleeDodgeChance>
-						<MeleeCritChance>0.85</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<Suppressability>1</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="GazelleMan"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.01</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="GazelleMan"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.01</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="GazelleMan"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.25</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Fox and Lynxes, Pigs and Raccoon -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="FoxMan" or
-						defName="LynxMan" or
-						defName="PigMan" or
-						defName="RaccoonMan"
-						]/statBases </xpath>
-					<value>
-						<MeleeDodgeChance>1.2</MeleeDodgeChance>
-						<MeleeCritChance>0.9</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<Suppressability>1</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="FoxMan" or
-						defName="LynxMan" or
-						defName="PigMan" or
-						defName="RaccoonMan"]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>0.01</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="FoxMan" or
-						defName="LynxMan" or
-						defName="PigMan" or
-						defName="RaccoonMan"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>0.01</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="FoxMan" or
-						defName="LynxMan" or
-						defName="PigMan" or
-						defName="RaccoonMan"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.24</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Wolf -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WolfMan"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<Suppressability>1</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WolfMan"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.01</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WolfMan"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.01</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WolfMan"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.27</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.25</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Beast Man Tribes/New_Beasts.xml b/Patches/Beast Man Tribes/New_Beasts.xml
deleted file mode 100644
index e365a7ca07..0000000000
--- a/Patches/Beast Man Tribes/New_Beasts.xml	
+++ /dev/null
@@ -1,1822 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Beast Man Tribes</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ========== Tribals ========== -->
-
-						<PawnKindDef>
-							<defName>BearManGrenadier</defName>
-							<race>BearMan</race>
-							<label>boomer</label>
-							<initialWillRange>1~3</initialWillRange>
-							<initialResistanceRange>12~19</initialResistanceRange>
-							<combatPower>60</combatPower>
-							<defaultFactionType>BearManTribe</defaultFactionType>
-							<backstoryCategories>
-								<li>Tribal</li>
-							</backstoryCategories>
-							<maxGenerationAge>60</maxGenerationAge>
-							<chemicalAddictionChance>0.05</chemicalAddictionChance>
-							<invNutrition>2.55</invNutrition>
-							<invFoodDef>Pemmican</invFoodDef>
-							<canBeSapper>true</canBeSapper>
-							<gearHealthRange>
-								<min>0.5</min>
-								<max>1.8</max>
-							</gearHealthRange>
-							<apparelMoney>
-								<min>180</min>
-								<max>350</max>
-							</apparelMoney>
-							<apparelRequired>
-								<li>Apparel_WarVeil</li>
-								<li>CE_Apparel_TribalBackpack</li>
-							</apparelRequired>
-							<apparelTags>
-								<li>Tribal</li>
-							</apparelTags>
-							<weaponMoney>
-								<min>60</min>
-								<max>400</max>
-							</weaponMoney>
-							<weaponTags>
-								<li>CE_GrenadeNeolithic</li>
-							</weaponTags>
-							<techHediffsMoney>
-								<min>50</min>
-								<max>800</max>
-							</techHediffsMoney>
-							<techHediffsTags>
-								<li>Poor</li>
-								<li>Simple</li>
-							</techHediffsTags>
-							<techHediffsChance>0.33</techHediffsChance>
-							<modExtensions>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>6</min>
-										<max>20</max>
-									</primaryMagazineCount>
-									<forcedSidearm>
-										<sidearmMoney>
-											<min>80</min>
-											<max>160</max>
-										</sidearmMoney>
-										<weaponTags>
-											<li>CE_Sidearm_Tribal</li>
-										</weaponTags>
-									</forcedSidearm>
-								</li>
-							</modExtensions>
-						</PawnKindDef>
-
-						<PawnKindDef>
-							<defName>BearManGunner</defName>
-							<race>BearMan</race>
-							<label>thunderer</label>
-							<initialWillRange>3~5</initialWillRange>
-							<initialResistanceRange>20~34</initialResistanceRange>
-							<combatPower>60</combatPower>
-							<defaultFactionType>BearManTribe</defaultFactionType>
-							<backstoryCategories>
-								<li>Tribal</li>
-							</backstoryCategories>
-							<maxGenerationAge>60</maxGenerationAge>
-							<chemicalAddictionChance>0.05</chemicalAddictionChance>
-							<invNutrition>2.55</invNutrition>
-							<invFoodDef>Pemmican</invFoodDef>
-							<gearHealthRange>
-								<min>0.5</min>
-								<max>1.8</max>
-							</gearHealthRange>
-							<apparelMoney>
-								<min>180</min>
-								<max>350</max>
-							</apparelMoney>
-							<apparelTags>
-								<li>Tribal</li>
-							</apparelTags>
-							<apparelRequired>
-								<li>Apparel_WarMask</li>
-							</apparelRequired>
-							<weaponMoney>
-								<min>180</min>
-								<max>290</max>
-							</weaponMoney>
-							<weaponTags>
-								<li>Gun</li>
-							</weaponTags>
-							<techHediffsMoney>
-								<min>50</min>
-								<max>800</max>
-							</techHediffsMoney>
-							<techHediffsTags>
-								<li>Poor</li>
-								<li>Simple</li>
-							</techHediffsTags>
-							<techHediffsChance>0.20</techHediffsChance>
-							<modExtensions>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>4</max>
-									</primaryMagazineCount>
-									<shieldMoney>
-										<min>120</min>
-										<max>160</max>
-									</shieldMoney>
-									<shieldTags>
-										<li>TribalShield</li>
-									</shieldTags>
-									<shieldChance>0.9</shieldChance>
-									<sidearms>
-										<li>
-											<sidearmMoney>
-												<min>100</min>
-												<max>600</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_Sidearm_Tribal</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</modExtensions>
-						</PawnKindDef>
-
-						<PawnKindDef>
-							<defName>CamelManGrenadier</defName>
-							<race>CamelMan</race>
-							<label>boomer</label>
-							<initialWillRange>1~3</initialWillRange>
-							<initialResistanceRange>12~19</initialResistanceRange>
-							<combatPower>60</combatPower>
-							<defaultFactionType>CamelManTribe</defaultFactionType>
-							<backstoryCategories>
-								<li>Tribal</li>
-							</backstoryCategories>
-							<maxGenerationAge>60</maxGenerationAge>
-							<chemicalAddictionChance>0.05</chemicalAddictionChance>
-							<invNutrition>2.55</invNutrition>
-							<invFoodDef>Pemmican</invFoodDef>
-							<canBeSapper>true</canBeSapper>
-							<gearHealthRange>
-								<min>0.5</min>
-								<max>1.8</max>
-							</gearHealthRange>
-							<apparelMoney>
-								<min>180</min>
-								<max>350</max>
-							</apparelMoney>
-							<apparelRequired>
-								<li>Apparel_WarVeil</li>
-								<li>CE_Apparel_TribalBackpack</li>
-							</apparelRequired>
-							<apparelTags>
-								<li>Tribal</li>
-							</apparelTags>
-							<weaponMoney>
-								<min>60</min>
-								<max>400</max>
-							</weaponMoney>
-							<weaponTags>
-								<li>CE_GrenadeNeolithic</li>
-							</weaponTags>
-							<techHediffsMoney>
-								<min>50</min>
-								<max>800</max>
-							</techHediffsMoney>
-							<techHediffsTags>
-								<li>Poor</li>
-								<li>Simple</li>
-							</techHediffsTags>
-							<techHediffsChance>0.33</techHediffsChance>
-							<modExtensions>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>6</min>
-										<max>20</max>
-									</primaryMagazineCount>
-									<forcedSidearm>
-										<sidearmMoney>
-											<min>80</min>
-											<max>160</max>
-										</sidearmMoney>
-										<weaponTags>
-											<li>CE_Sidearm_Tribal</li>
-										</weaponTags>
-									</forcedSidearm>
-								</li>
-							</modExtensions>
-						</PawnKindDef>
-
-						<PawnKindDef>
-							<defName>CamelManGunner</defName>
-							<race>CamelMan</race>
-							<label>thunderer</label>
-							<initialWillRange>3~5</initialWillRange>
-							<initialResistanceRange>20~34</initialResistanceRange>
-							<combatPower>60</combatPower>
-							<defaultFactionType>CamelManTribe</defaultFactionType>
-							<backstoryCategories>
-								<li>Tribal</li>
-							</backstoryCategories>
-							<maxGenerationAge>60</maxGenerationAge>
-							<chemicalAddictionChance>0.05</chemicalAddictionChance>
-							<invNutrition>2.55</invNutrition>
-							<invFoodDef>Pemmican</invFoodDef>
-							<gearHealthRange>
-								<min>0.5</min>
-								<max>1.8</max>
-							</gearHealthRange>
-							<apparelMoney>
-								<min>180</min>
-								<max>350</max>
-							</apparelMoney>
-							<apparelTags>
-								<li>Tribal</li>
-							</apparelTags>
-							<apparelRequired>
-								<li>Apparel_WarMask</li>
-							</apparelRequired>
-							<weaponMoney>
-								<min>180</min>
-								<max>290</max>
-							</weaponMoney>
-							<weaponTags>
-								<li>Gun</li>
-							</weaponTags>
-							<techHediffsMoney>
-								<min>50</min>
-								<max>800</max>
-							</techHediffsMoney>
-							<techHediffsTags>
-								<li>Poor</li>
-								<li>Simple</li>
-							</techHediffsTags>
-							<techHediffsChance>0.20</techHediffsChance>
-							<modExtensions>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>4</max>
-									</primaryMagazineCount>
-									<shieldMoney>
-										<min>120</min>
-										<max>160</max>
-									</shieldMoney>
-									<shieldTags>
-										<li>TribalShield</li>
-									</shieldTags>
-									<shieldChance>0.9</shieldChance>
-									<sidearms>
-										<li>
-											<sidearmMoney>
-												<min>100</min>
-												<max>600</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_Sidearm_Tribal</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</modExtensions>
-						</PawnKindDef>
-
-						<PawnKindDef>
-							<defName>ElephantManGrenadier</defName>
-							<race>ElephantMan</race>
-							<label>boomer</label>
-							<initialWillRange>1~3</initialWillRange>
-							<initialResistanceRange>12~19</initialResistanceRange>
-							<combatPower>60</combatPower>
-							<defaultFactionType>ElephantManTribe</defaultFactionType>
-							<backstoryCategories>
-								<li>Tribal</li>
-							</backstoryCategories>
-							<maxGenerationAge>60</maxGenerationAge>
-							<chemicalAddictionChance>0.05</chemicalAddictionChance>
-							<invNutrition>2.55</invNutrition>
-							<invFoodDef>Pemmican</invFoodDef>
-							<canBeSapper>true</canBeSapper>
-							<gearHealthRange>
-								<min>0.5</min>
-								<max>1.8</max>
-							</gearHealthRange>
-							<apparelMoney>
-								<min>180</min>
-								<max>350</max>
-							</apparelMoney>
-							<apparelRequired>
-								<li>Apparel_WarVeil</li>
-								<li>CE_Apparel_TribalBackpack</li>
-							</apparelRequired>
-							<apparelTags>
-								<li>Tribal</li>
-							</apparelTags>
-							<weaponMoney>
-								<min>60</min>
-								<max>400</max>
-							</weaponMoney>
-							<weaponTags>
-								<li>CE_GrenadeNeolithic</li>
-							</weaponTags>
-							<techHediffsMoney>
-								<min>50</min>
-								<max>800</max>
-							</techHediffsMoney>
-							<techHediffsTags>
-								<li>Poor</li>
-								<li>Simple</li>
-							</techHediffsTags>
-							<techHediffsChance>0.33</techHediffsChance>
-							<modExtensions>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>6</min>
-										<max>20</max>
-									</primaryMagazineCount>
-									<forcedSidearm>
-										<sidearmMoney>
-											<min>80</min>
-											<max>160</max>
-										</sidearmMoney>
-										<weaponTags>
-											<li>CE_Sidearm_Tribal</li>
-										</weaponTags>
-									</forcedSidearm>
-								</li>
-							</modExtensions>
-						</PawnKindDef>
-
-						<PawnKindDef>
-							<defName>ElephantManGunner</defName>
-							<race>ElephantMan</race>
-							<label>thunderer</label>
-							<initialWillRange>3~5</initialWillRange>
-							<initialResistanceRange>20~34</initialResistanceRange>
-							<combatPower>60</combatPower>
-							<defaultFactionType>ElephantManTribe</defaultFactionType>
-							<backstoryCategories>
-								<li>Tribal</li>
-							</backstoryCategories>
-							<maxGenerationAge>60</maxGenerationAge>
-							<chemicalAddictionChance>0.05</chemicalAddictionChance>
-							<invNutrition>2.55</invNutrition>
-							<invFoodDef>Pemmican</invFoodDef>
-							<gearHealthRange>
-								<min>0.5</min>
-								<max>1.8</max>
-							</gearHealthRange>
-							<apparelMoney>
-								<min>180</min>
-								<max>350</max>
-							</apparelMoney>
-							<apparelTags>
-								<li>Tribal</li>
-							</apparelTags>
-							<apparelRequired>
-								<li>Apparel_WarMask</li>
-							</apparelRequired>
-							<weaponMoney>
-								<min>180</min>
-								<max>290</max>
-							</weaponMoney>
-							<weaponTags>
-								<li>Gun</li>
-							</weaponTags>
-							<techHediffsMoney>
-								<min>50</min>
-								<max>800</max>
-							</techHediffsMoney>
-							<techHediffsTags>
-								<li>Poor</li>
-								<li>Simple</li>
-							</techHediffsTags>
-							<techHediffsChance>0.20</techHediffsChance>
-							<modExtensions>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>4</max>
-									</primaryMagazineCount>
-									<shieldMoney>
-										<min>120</min>
-										<max>160</max>
-									</shieldMoney>
-									<shieldTags>
-										<li>TribalShield</li>
-									</shieldTags>
-									<shieldChance>0.9</shieldChance>
-									<sidearms>
-										<li>
-											<sidearmMoney>
-												<min>100</min>
-												<max>600</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_Sidearm_Tribal</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</modExtensions>
-						</PawnKindDef>
-
-						<PawnKindDef>
-							<defName>ElkManGrenadier</defName>
-							<race>ElkMan</race>
-							<label>boomer</label>
-							<initialWillRange>1~3</initialWillRange>
-							<initialResistanceRange>12~19</initialResistanceRange>
-							<combatPower>60</combatPower>
-							<defaultFactionType>ElkManTribe</defaultFactionType>
-							<backstoryCategories>
-								<li>Tribal</li>
-							</backstoryCategories>
-							<maxGenerationAge>60</maxGenerationAge>
-							<chemicalAddictionChance>0.05</chemicalAddictionChance>
-							<invNutrition>2.55</invNutrition>
-							<invFoodDef>Pemmican</invFoodDef>
-							<canBeSapper>true</canBeSapper>
-							<gearHealthRange>
-								<min>0.5</min>
-								<max>1.8</max>
-							</gearHealthRange>
-							<apparelMoney>
-								<min>180</min>
-								<max>350</max>
-							</apparelMoney>
-							<apparelRequired>
-								<li>Apparel_WarVeil</li>
-								<li>CE_Apparel_TribalBackpack</li>
-							</apparelRequired>
-							<apparelTags>
-								<li>Tribal</li>
-							</apparelTags>
-							<weaponMoney>
-								<min>60</min>
-								<max>400</max>
-							</weaponMoney>
-							<weaponTags>
-								<li>CE_GrenadeNeolithic</li>
-							</weaponTags>
-							<techHediffsMoney>
-								<min>50</min>
-								<max>800</max>
-							</techHediffsMoney>
-							<techHediffsTags>
-								<li>Poor</li>
-								<li>Simple</li>
-							</techHediffsTags>
-							<techHediffsChance>0.33</techHediffsChance>
-							<modExtensions>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>6</min>
-										<max>20</max>
-									</primaryMagazineCount>
-									<forcedSidearm>
-										<sidearmMoney>
-											<min>80</min>
-											<max>160</max>
-										</sidearmMoney>
-										<weaponTags>
-											<li>CE_Sidearm_Tribal</li>
-										</weaponTags>
-									</forcedSidearm>
-								</li>
-							</modExtensions>
-						</PawnKindDef>
-
-						<PawnKindDef>
-							<defName>ElkManGunner</defName>
-							<race>ElkMan</race>
-							<label>thunderer</label>
-							<initialWillRange>3~5</initialWillRange>
-							<initialResistanceRange>20~34</initialResistanceRange>
-							<combatPower>60</combatPower>
-							<defaultFactionType>ElkManTribe</defaultFactionType>
-							<backstoryCategories>
-								<li>Tribal</li>
-							</backstoryCategories>
-							<maxGenerationAge>60</maxGenerationAge>
-							<chemicalAddictionChance>0.05</chemicalAddictionChance>
-							<invNutrition>2.55</invNutrition>
-							<invFoodDef>Pemmican</invFoodDef>
-							<gearHealthRange>
-								<min>0.5</min>
-								<max>1.8</max>
-							</gearHealthRange>
-							<apparelMoney>
-								<min>180</min>
-								<max>350</max>
-							</apparelMoney>
-							<apparelTags>
-								<li>Tribal</li>
-							</apparelTags>
-							<apparelRequired>
-								<li>Apparel_WarMask</li>
-							</apparelRequired>
-							<weaponMoney>
-								<min>180</min>
-								<max>290</max>
-							</weaponMoney>
-							<weaponTags>
-								<li>Gun</li>
-							</weaponTags>
-							<techHediffsMoney>
-								<min>50</min>
-								<max>800</max>
-							</techHediffsMoney>
-							<techHediffsTags>
-								<li>Poor</li>
-								<li>Simple</li>
-							</techHediffsTags>
-							<techHediffsChance>0.20</techHediffsChance>
-							<modExtensions>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>4</max>
-									</primaryMagazineCount>
-									<shieldMoney>
-										<min>120</min>
-										<max>160</max>
-									</shieldMoney>
-									<shieldTags>
-										<li>TribalShield</li>
-									</shieldTags>
-									<shieldChance>0.9</shieldChance>
-									<sidearms>
-										<li>
-											<sidearmMoney>
-												<min>100</min>
-												<max>600</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_Sidearm_Tribal</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</modExtensions>
-						</PawnKindDef>
-
-						<PawnKindDef>
-							<defName>FoxManGrenadier</defName>
-							<race>FoxMan</race>
-							<label>yeefers</label>
-							<initialWillRange>1~3</initialWillRange>
-							<initialResistanceRange>12~19</initialResistanceRange>
-							<combatPower>60</combatPower>
-							<defaultFactionType>FoxManTribe</defaultFactionType>
-							<backstoryCategories>
-								<li>Tribal</li>
-							</backstoryCategories>
-							<maxGenerationAge>60</maxGenerationAge>
-							<chemicalAddictionChance>0.05</chemicalAddictionChance>
-							<invNutrition>2.55</invNutrition>
-							<invFoodDef>Pemmican</invFoodDef>
-							<canBeSapper>true</canBeSapper>
-							<gearHealthRange>
-								<min>0.5</min>
-								<max>1.8</max>
-							</gearHealthRange>
-							<apparelMoney>
-								<min>180</min>
-								<max>350</max>
-							</apparelMoney>
-							<apparelRequired>
-								<li>Apparel_WarVeil</li>
-								<li>CE_Apparel_TribalBackpack</li>
-							</apparelRequired>
-							<apparelTags>
-								<li>Tribal</li>
-							</apparelTags>
-							<weaponMoney>
-								<min>60</min>
-								<max>400</max>
-							</weaponMoney>
-							<weaponTags>
-								<li>CE_GrenadeNeolithic</li>
-							</weaponTags>
-							<techHediffsMoney>
-								<min>50</min>
-								<max>800</max>
-							</techHediffsMoney>
-							<techHediffsTags>
-								<li>Poor</li>
-								<li>Simple</li>
-							</techHediffsTags>
-							<techHediffsChance>0.33</techHediffsChance>
-							<modExtensions>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>6</min>
-										<max>20</max>
-									</primaryMagazineCount>
-									<forcedSidearm>
-										<sidearmMoney>
-											<min>80</min>
-											<max>160</max>
-										</sidearmMoney>
-										<weaponTags>
-											<li>CE_Sidearm_Tribal</li>
-										</weaponTags>
-									</forcedSidearm>
-								</li>
-							</modExtensions>
-						</PawnKindDef>
-
-						<PawnKindDef>
-							<defName>FoxManGunner</defName>
-							<race>FoxMan</race>
-							<label>yiffers</label>
-							<initialWillRange>3~5</initialWillRange>
-							<initialResistanceRange>20~34</initialResistanceRange>
-							<combatPower>60</combatPower>
-							<defaultFactionType>FoxManTribe</defaultFactionType>
-							<backstoryCategories>
-								<li>Tribal</li>
-							</backstoryCategories>
-							<maxGenerationAge>60</maxGenerationAge>
-							<chemicalAddictionChance>0.05</chemicalAddictionChance>
-							<invNutrition>2.55</invNutrition>
-							<invFoodDef>Pemmican</invFoodDef>
-							<gearHealthRange>
-								<min>0.5</min>
-								<max>1.8</max>
-							</gearHealthRange>
-							<apparelMoney>
-								<min>180</min>
-								<max>350</max>
-							</apparelMoney>
-							<apparelTags>
-								<li>Tribal</li>
-							</apparelTags>
-							<apparelRequired>
-								<li>Apparel_WarMask</li>
-							</apparelRequired>
-							<weaponMoney>
-								<min>180</min>
-								<max>290</max>
-							</weaponMoney>
-							<weaponTags>
-								<li>Gun</li>
-							</weaponTags>
-							<techHediffsMoney>
-								<min>50</min>
-								<max>800</max>
-							</techHediffsMoney>
-							<techHediffsTags>
-								<li>Poor</li>
-								<li>Simple</li>
-							</techHediffsTags>
-							<techHediffsChance>0.20</techHediffsChance>
-							<modExtensions>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>4</max>
-									</primaryMagazineCount>
-									<shieldMoney>
-										<min>120</min>
-										<max>160</max>
-									</shieldMoney>
-									<shieldTags>
-										<li>TribalShield</li>
-									</shieldTags>
-									<shieldChance>0.9</shieldChance>
-									<sidearms>
-										<li>
-											<sidearmMoney>
-												<min>100</min>
-												<max>600</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_Sidearm_Tribal</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</modExtensions>
-						</PawnKindDef>
-
-						<PawnKindDef>
-							<defName>GazelleManGrenadier</defName>
-							<race>GazelleMan</race>
-							<label>boomer</label>
-							<initialWillRange>1~3</initialWillRange>
-							<initialResistanceRange>12~19</initialResistanceRange>
-							<combatPower>60</combatPower>
-							<defaultFactionType>GazelleManTribe</defaultFactionType>
-							<backstoryCategories>
-								<li>Tribal</li>
-							</backstoryCategories>
-							<maxGenerationAge>60</maxGenerationAge>
-							<chemicalAddictionChance>0.05</chemicalAddictionChance>
-							<invNutrition>2.55</invNutrition>
-							<invFoodDef>Pemmican</invFoodDef>
-							<canBeSapper>true</canBeSapper>
-							<gearHealthRange>
-								<min>0.5</min>
-								<max>1.8</max>
-							</gearHealthRange>
-							<apparelMoney>
-								<min>180</min>
-								<max>350</max>
-							</apparelMoney>
-							<apparelRequired>
-								<li>Apparel_WarVeil</li>
-								<li>CE_Apparel_TribalBackpack</li>
-							</apparelRequired>
-							<apparelTags>
-								<li>Tribal</li>
-							</apparelTags>
-							<weaponMoney>
-								<min>60</min>
-								<max>400</max>
-							</weaponMoney>
-							<weaponTags>
-								<li>CE_GrenadeNeolithic</li>
-							</weaponTags>
-							<techHediffsMoney>
-								<min>50</min>
-								<max>800</max>
-							</techHediffsMoney>
-							<techHediffsTags>
-								<li>Poor</li>
-								<li>Simple</li>
-							</techHediffsTags>
-							<techHediffsChance>0.33</techHediffsChance>
-							<modExtensions>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>6</min>
-										<max>20</max>
-									</primaryMagazineCount>
-									<forcedSidearm>
-										<sidearmMoney>
-											<min>80</min>
-											<max>160</max>
-										</sidearmMoney>
-										<weaponTags>
-											<li>CE_Sidearm_Tribal</li>
-										</weaponTags>
-									</forcedSidearm>
-								</li>
-							</modExtensions>
-						</PawnKindDef>
-
-						<PawnKindDef>
-							<defName>GazelleManGunner</defName>
-							<race>GazelleMan</race>
-							<label>thunderer</label>
-							<initialWillRange>3~5</initialWillRange>
-							<initialResistanceRange>20~34</initialResistanceRange>
-							<combatPower>60</combatPower>
-							<defaultFactionType>GazelleManTribe</defaultFactionType>
-							<backstoryCategories>
-								<li>Tribal</li>
-							</backstoryCategories>
-							<maxGenerationAge>60</maxGenerationAge>
-							<chemicalAddictionChance>0.05</chemicalAddictionChance>
-							<invNutrition>2.55</invNutrition>
-							<invFoodDef>Pemmican</invFoodDef>
-							<gearHealthRange>
-								<min>0.5</min>
-								<max>1.8</max>
-							</gearHealthRange>
-							<apparelMoney>
-								<min>180</min>
-								<max>350</max>
-							</apparelMoney>
-							<apparelTags>
-								<li>Tribal</li>
-							</apparelTags>
-							<apparelRequired>
-								<li>Apparel_WarMask</li>
-							</apparelRequired>
-							<weaponMoney>
-								<min>180</min>
-								<max>290</max>
-							</weaponMoney>
-							<weaponTags>
-								<li>Gun</li>
-							</weaponTags>
-							<techHediffsMoney>
-								<min>50</min>
-								<max>800</max>
-							</techHediffsMoney>
-							<techHediffsTags>
-								<li>Poor</li>
-								<li>Simple</li>
-							</techHediffsTags>
-							<techHediffsChance>0.20</techHediffsChance>
-							<modExtensions>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>4</max>
-									</primaryMagazineCount>
-									<shieldMoney>
-										<min>120</min>
-										<max>160</max>
-									</shieldMoney>
-									<shieldTags>
-										<li>TribalShield</li>
-									</shieldTags>
-									<shieldChance>0.9</shieldChance>
-									<sidearms>
-										<li>
-											<sidearmMoney>
-												<min>100</min>
-												<max>600</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_Sidearm_Tribal</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</modExtensions>
-						</PawnKindDef>
-
-						<PawnKindDef>
-							<defName>LynxManGrenadier</defName>
-							<race>LynxMan</race>
-							<label>boomer</label>
-							<initialWillRange>1~3</initialWillRange>
-							<initialResistanceRange>12~19</initialResistanceRange>
-							<combatPower>60</combatPower>
-							<defaultFactionType>LynxManTribe</defaultFactionType>
-							<backstoryCategories>
-								<li>Tribal</li>
-							</backstoryCategories>
-							<maxGenerationAge>60</maxGenerationAge>
-							<chemicalAddictionChance>0.05</chemicalAddictionChance>
-							<invNutrition>2.55</invNutrition>
-							<invFoodDef>Pemmican</invFoodDef>
-							<canBeSapper>true</canBeSapper>
-							<gearHealthRange>
-								<min>0.5</min>
-								<max>1.8</max>
-							</gearHealthRange>
-							<apparelMoney>
-								<min>180</min>
-								<max>350</max>
-							</apparelMoney>
-							<apparelRequired>
-								<li>Apparel_WarVeil</li>
-								<li>CE_Apparel_TribalBackpack</li>
-							</apparelRequired>
-							<apparelTags>
-								<li>Tribal</li>
-							</apparelTags>
-							<weaponMoney>
-								<min>60</min>
-								<max>400</max>
-							</weaponMoney>
-							<weaponTags>
-								<li>CE_GrenadeNeolithic</li>
-							</weaponTags>
-							<techHediffsMoney>
-								<min>50</min>
-								<max>800</max>
-							</techHediffsMoney>
-							<techHediffsTags>
-								<li>Poor</li>
-								<li>Simple</li>
-							</techHediffsTags>
-							<techHediffsChance>0.33</techHediffsChance>
-							<modExtensions>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>6</min>
-										<max>20</max>
-									</primaryMagazineCount>
-									<forcedSidearm>
-										<sidearmMoney>
-											<min>80</min>
-											<max>160</max>
-										</sidearmMoney>
-										<weaponTags>
-											<li>CE_Sidearm_Tribal</li>
-										</weaponTags>
-									</forcedSidearm>
-								</li>
-							</modExtensions>
-						</PawnKindDef>
-
-						<PawnKindDef>
-							<defName>LynxManGunner</defName>
-							<race>LynxMan</race>
-							<label>thunderer</label>
-							<initialWillRange>3~5</initialWillRange>
-							<initialResistanceRange>20~34</initialResistanceRange>
-							<combatPower>60</combatPower>
-							<defaultFactionType>LynxManTribe</defaultFactionType>
-							<backstoryCategories>
-								<li>Tribal</li>
-							</backstoryCategories>
-							<maxGenerationAge>60</maxGenerationAge>
-							<chemicalAddictionChance>0.05</chemicalAddictionChance>
-							<invNutrition>2.55</invNutrition>
-							<invFoodDef>Pemmican</invFoodDef>
-							<gearHealthRange>
-								<min>0.5</min>
-								<max>1.8</max>
-							</gearHealthRange>
-							<apparelMoney>
-								<min>180</min>
-								<max>350</max>
-							</apparelMoney>
-							<apparelTags>
-								<li>Tribal</li>
-							</apparelTags>
-							<apparelRequired>
-								<li>Apparel_WarMask</li>
-							</apparelRequired>
-							<weaponMoney>
-								<min>180</min>
-								<max>290</max>
-							</weaponMoney>
-							<weaponTags>
-								<li>Gun</li>
-							</weaponTags>
-							<techHediffsMoney>
-								<min>50</min>
-								<max>800</max>
-							</techHediffsMoney>
-							<techHediffsTags>
-								<li>Poor</li>
-								<li>Simple</li>
-							</techHediffsTags>
-							<techHediffsChance>0.20</techHediffsChance>
-							<modExtensions>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>4</max>
-									</primaryMagazineCount>
-									<shieldMoney>
-										<min>120</min>
-										<max>160</max>
-									</shieldMoney>
-									<shieldTags>
-										<li>TribalShield</li>
-									</shieldTags>
-									<shieldChance>0.9</shieldChance>
-									<sidearms>
-										<li>
-											<sidearmMoney>
-												<min>100</min>
-												<max>600</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_Sidearm_Tribal</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</modExtensions>
-						</PawnKindDef>
-
-						<PawnKindDef>
-							<defName>PigManGrenadier</defName>
-							<race>PigMan</race>
-							<label>boomer</label>
-							<initialWillRange>1~3</initialWillRange>
-							<initialResistanceRange>12~19</initialResistanceRange>
-							<combatPower>60</combatPower>
-							<defaultFactionType>PigManTribe</defaultFactionType>
-							<backstoryCategories>
-								<li>Tribal</li>
-							</backstoryCategories>
-							<maxGenerationAge>60</maxGenerationAge>
-							<chemicalAddictionChance>0.05</chemicalAddictionChance>
-							<invNutrition>2.55</invNutrition>
-							<invFoodDef>Pemmican</invFoodDef>
-							<canBeSapper>true</canBeSapper>
-							<gearHealthRange>
-								<min>0.5</min>
-								<max>1.8</max>
-							</gearHealthRange>
-							<apparelMoney>
-								<min>180</min>
-								<max>350</max>
-							</apparelMoney>
-							<apparelRequired>
-								<li>Apparel_WarVeil</li>
-								<li>CE_Apparel_TribalBackpack</li>
-							</apparelRequired>
-							<apparelTags>
-								<li>Tribal</li>
-							</apparelTags>
-							<weaponMoney>
-								<min>60</min>
-								<max>400</max>
-							</weaponMoney>
-							<weaponTags>
-								<li>CE_GrenadeNeolithic</li>
-							</weaponTags>
-							<techHediffsMoney>
-								<min>50</min>
-								<max>800</max>
-							</techHediffsMoney>
-							<techHediffsTags>
-								<li>Poor</li>
-								<li>Simple</li>
-							</techHediffsTags>
-							<techHediffsChance>0.33</techHediffsChance>
-							<modExtensions>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>6</min>
-										<max>20</max>
-									</primaryMagazineCount>
-									<forcedSidearm>
-										<sidearmMoney>
-											<min>80</min>
-											<max>160</max>
-										</sidearmMoney>
-										<weaponTags>
-											<li>CE_Sidearm_Tribal</li>
-										</weaponTags>
-									</forcedSidearm>
-								</li>
-							</modExtensions>
-						</PawnKindDef>
-
-						<PawnKindDef>
-							<defName>PigManGunner</defName>
-							<race>PigMan</race>
-							<label>thunderer</label>
-							<initialWillRange>3~5</initialWillRange>
-							<initialResistanceRange>20~34</initialResistanceRange>
-							<combatPower>60</combatPower>
-							<defaultFactionType>PigManTribe</defaultFactionType>
-							<backstoryCategories>
-								<li>Tribal</li>
-							</backstoryCategories>
-							<maxGenerationAge>60</maxGenerationAge>
-							<chemicalAddictionChance>0.05</chemicalAddictionChance>
-							<invNutrition>2.55</invNutrition>
-							<invFoodDef>Pemmican</invFoodDef>
-							<gearHealthRange>
-								<min>0.5</min>
-								<max>1.8</max>
-							</gearHealthRange>
-							<apparelMoney>
-								<min>180</min>
-								<max>350</max>
-							</apparelMoney>
-							<apparelTags>
-								<li>Tribal</li>
-							</apparelTags>
-							<apparelRequired>
-								<li>Apparel_WarMask</li>
-							</apparelRequired>
-							<weaponMoney>
-								<min>180</min>
-								<max>290</max>
-							</weaponMoney>
-							<weaponTags>
-								<li>Gun</li>
-							</weaponTags>
-							<techHediffsMoney>
-								<min>50</min>
-								<max>800</max>
-							</techHediffsMoney>
-							<techHediffsTags>
-								<li>Poor</li>
-								<li>Simple</li>
-							</techHediffsTags>
-							<techHediffsChance>0.20</techHediffsChance>
-							<modExtensions>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>4</max>
-									</primaryMagazineCount>
-									<shieldMoney>
-										<min>120</min>
-										<max>160</max>
-									</shieldMoney>
-									<shieldTags>
-										<li>TribalShield</li>
-									</shieldTags>
-									<shieldChance>0.9</shieldChance>
-									<sidearms>
-										<li>
-											<sidearmMoney>
-												<min>100</min>
-												<max>600</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_Sidearm_Tribal</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</modExtensions>
-						</PawnKindDef>
-
-						<PawnKindDef>
-							<defName>RaccoonManGrenadier</defName>
-							<race>RaccoonMan</race>
-							<label>boomer</label>
-							<initialWillRange>1~3</initialWillRange>
-							<initialResistanceRange>12~19</initialResistanceRange>
-							<combatPower>60</combatPower>
-							<defaultFactionType>RaccoonManTribe</defaultFactionType>
-							<backstoryCategories>
-								<li>Tribal</li>
-							</backstoryCategories>
-							<maxGenerationAge>60</maxGenerationAge>
-							<chemicalAddictionChance>0.05</chemicalAddictionChance>
-							<invNutrition>2.55</invNutrition>
-							<invFoodDef>Pemmican</invFoodDef>
-							<canBeSapper>true</canBeSapper>
-							<gearHealthRange>
-								<min>0.5</min>
-								<max>1.8</max>
-							</gearHealthRange>
-							<apparelMoney>
-								<min>180</min>
-								<max>350</max>
-							</apparelMoney>
-							<apparelRequired>
-								<li>Apparel_WarVeil</li>
-								<li>CE_Apparel_TribalBackpack</li>
-							</apparelRequired>
-							<apparelTags>
-								<li>Tribal</li>
-							</apparelTags>
-							<weaponMoney>
-								<min>60</min>
-								<max>400</max>
-							</weaponMoney>
-							<weaponTags>
-								<li>CE_GrenadeNeolithic</li>
-							</weaponTags>
-							<techHediffsMoney>
-								<min>50</min>
-								<max>800</max>
-							</techHediffsMoney>
-							<techHediffsTags>
-								<li>Poor</li>
-								<li>Simple</li>
-							</techHediffsTags>
-							<techHediffsChance>0.33</techHediffsChance>
-							<modExtensions>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>6</min>
-										<max>20</max>
-									</primaryMagazineCount>
-									<forcedSidearm>
-										<sidearmMoney>
-											<min>80</min>
-											<max>160</max>
-										</sidearmMoney>
-										<weaponTags>
-											<li>CE_Sidearm_Tribal</li>
-										</weaponTags>
-									</forcedSidearm>
-								</li>
-							</modExtensions>
-						</PawnKindDef>
-
-						<PawnKindDef>
-							<defName>RaccoonManGunner</defName>
-							<race>RaccoonMan</race>
-							<label>thunderer</label>
-							<initialWillRange>3~5</initialWillRange>
-							<initialResistanceRange>20~34</initialResistanceRange>
-							<combatPower>60</combatPower>
-							<defaultFactionType>RaccoonManTribe</defaultFactionType>
-							<backstoryCategories>
-								<li>Tribal</li>
-							</backstoryCategories>
-							<maxGenerationAge>60</maxGenerationAge>
-							<chemicalAddictionChance>0.05</chemicalAddictionChance>
-							<invNutrition>2.55</invNutrition>
-							<invFoodDef>Pemmican</invFoodDef>
-							<gearHealthRange>
-								<min>0.5</min>
-								<max>1.8</max>
-							</gearHealthRange>
-							<apparelMoney>
-								<min>180</min>
-								<max>350</max>
-							</apparelMoney>
-							<apparelTags>
-								<li>Tribal</li>
-							</apparelTags>
-							<apparelRequired>
-								<li>Apparel_WarMask</li>
-							</apparelRequired>
-							<weaponMoney>
-								<min>180</min>
-								<max>290</max>
-							</weaponMoney>
-							<weaponTags>
-								<li>Gun</li>
-							</weaponTags>
-							<techHediffsMoney>
-								<min>50</min>
-								<max>800</max>
-							</techHediffsMoney>
-							<techHediffsTags>
-								<li>Poor</li>
-								<li>Simple</li>
-							</techHediffsTags>
-							<techHediffsChance>0.20</techHediffsChance>
-							<modExtensions>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>4</max>
-									</primaryMagazineCount>
-									<shieldMoney>
-										<min>120</min>
-										<max>160</max>
-									</shieldMoney>
-									<shieldTags>
-										<li>TribalShield</li>
-									</shieldTags>
-									<shieldChance>0.9</shieldChance>
-									<sidearms>
-										<li>
-											<sidearmMoney>
-												<min>100</min>
-												<max>600</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_Sidearm_Tribal</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</modExtensions>
-						</PawnKindDef>
-
-						<PawnKindDef>
-							<defName>WolfManGrenadier</defName>
-							<race>WolfMan</race>
-							<label>woofers</label>
-							<initialWillRange>1~3</initialWillRange>
-							<initialResistanceRange>12~19</initialResistanceRange>
-							<combatPower>60</combatPower>
-							<defaultFactionType>WolfManTribe</defaultFactionType>
-							<backstoryCategories>
-								<li>Tribal</li>
-							</backstoryCategories>
-							<maxGenerationAge>60</maxGenerationAge>
-							<chemicalAddictionChance>0.05</chemicalAddictionChance>
-							<invNutrition>2.55</invNutrition>
-							<invFoodDef>Pemmican</invFoodDef>
-							<canBeSapper>true</canBeSapper>
-							<gearHealthRange>
-								<min>0.5</min>
-								<max>1.8</max>
-							</gearHealthRange>
-							<apparelMoney>
-								<min>180</min>
-								<max>350</max>
-							</apparelMoney>
-							<apparelRequired>
-								<li>Apparel_WarVeil</li>
-								<li>CE_Apparel_TribalBackpack</li>
-							</apparelRequired>
-							<apparelTags>
-								<li>Tribal</li>
-							</apparelTags>
-							<weaponMoney>
-								<min>60</min>
-								<max>400</max>
-							</weaponMoney>
-							<weaponTags>
-								<li>CE_GrenadeNeolithic</li>
-							</weaponTags>
-							<techHediffsMoney>
-								<min>50</min>
-								<max>800</max>
-							</techHediffsMoney>
-							<techHediffsTags>
-								<li>Poor</li>
-								<li>Simple</li>
-							</techHediffsTags>
-							<techHediffsChance>0.33</techHediffsChance>
-							<modExtensions>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>6</min>
-										<max>20</max>
-									</primaryMagazineCount>
-									<forcedSidearm>
-										<sidearmMoney>
-											<min>80</min>
-											<max>160</max>
-										</sidearmMoney>
-										<weaponTags>
-											<li>CE_Sidearm_Tribal</li>
-										</weaponTags>
-									</forcedSidearm>
-								</li>
-							</modExtensions>
-						</PawnKindDef>
-
-						<PawnKindDef>
-							<defName>WolfManGunner</defName>
-							<race>WolfMan</race>
-							<label>yiffers</label>
-							<initialWillRange>3~5</initialWillRange>
-							<initialResistanceRange>20~34</initialResistanceRange>
-							<combatPower>60</combatPower>
-							<defaultFactionType>WolfManTribe</defaultFactionType>
-							<backstoryCategories>
-								<li>Tribal</li>
-							</backstoryCategories>
-							<maxGenerationAge>60</maxGenerationAge>
-							<chemicalAddictionChance>0.05</chemicalAddictionChance>
-							<invNutrition>2.55</invNutrition>
-							<invFoodDef>Pemmican</invFoodDef>
-							<gearHealthRange>
-								<min>0.5</min>
-								<max>1.8</max>
-							</gearHealthRange>
-							<apparelMoney>
-								<min>180</min>
-								<max>350</max>
-							</apparelMoney>
-							<apparelTags>
-								<li>Tribal</li>
-							</apparelTags>
-							<apparelRequired>
-								<li>Apparel_WarMask</li>
-							</apparelRequired>
-							<weaponMoney>
-								<min>180</min>
-								<max>290</max>
-							</weaponMoney>
-							<weaponTags>
-								<li>Gun</li>
-							</weaponTags>
-							<techHediffsMoney>
-								<min>50</min>
-								<max>800</max>
-							</techHediffsMoney>
-							<techHediffsTags>
-								<li>Poor</li>
-								<li>Simple</li>
-							</techHediffsTags>
-							<techHediffsChance>0.20</techHediffsChance>
-							<modExtensions>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>4</max>
-									</primaryMagazineCount>
-									<shieldMoney>
-										<min>120</min>
-										<max>160</max>
-									</shieldMoney>
-									<shieldTags>
-										<li>TribalShield</li>
-									</shieldTags>
-									<shieldChance>0.9</shieldChance>
-									<sidearms>
-										<li>
-											<sidearmMoney>
-												<min>100</min>
-												<max>600</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_Sidearm_Tribal</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</modExtensions>
-						</PawnKindDef>
-					</value>
-				</li>
-
-				<!-- ========== Add tribal grenadies ========== -->
-
-				<li Class="PatchOperationAdd"><!-- Combat -->
-					<xpath>Defs/FactionDef[defName="BearManTribe"]/pawnGroupMakers/li[1]/options</xpath>
-					<value>
-						<BearManGrenadier>10</BearManGrenadier>
-						<BearManGunner>5</BearManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Normal fights, ranged only -->
-					<xpath>Defs/FactionDef[defName="BearManTribe"]/pawnGroupMakers/li[2]/options</xpath>
-					<value>
-						<BearManGrenadier>5</BearManGrenadier>
-						<BearManGunner>10</BearManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!--Peaceful-->
-					<xpath>Defs/FactionDef[defName="BearManTribe"]/pawnGroupMakers/li[4]/options</xpath>
-					<value>
-						<BearManGrenadier>10</BearManGrenadier>
-						<BearManGunner>5</BearManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!--Trader-->
-					<xpath>Defs/FactionDef[defName="BearManTribe"]/pawnGroupMakers/li[5]/guards</xpath>
-					<value>
-						<BearManGrenadier>5</BearManGrenadier>
-						<BearManGunner>15</BearManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Settlement -->
-					<xpath>Defs/FactionDef[defName="BearManTribe"]/pawnGroupMakers/li[6]/options</xpath>
-					<value>
-						<BearManGrenadier>10</BearManGrenadier>
-						<BearManGunner>10</BearManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Combat -->
-					<xpath>Defs/FactionDef[defName="CamelManTribe"]/pawnGroupMakers/li[1]/options</xpath>
-					<value>
-						<CamelManGrenadier>10</CamelManGrenadier>
-						<CamelManGunner>5</CamelManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Normal fights, ranged only -->
-					<xpath>Defs/FactionDef[defName="CamelManTribe"]/pawnGroupMakers/li[2]/options</xpath>
-					<value>
-						<CamelManGrenadier>5</CamelManGrenadier>
-						<CamelManGunner>10</CamelManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!--Peaceful-->
-					<xpath>Defs/FactionDef[defName="CamelManTribe"]/pawnGroupMakers/li[4]/options</xpath>
-					<value>
-						<CamelManGrenadier>10</CamelManGrenadier>
-						<CamelManGunner>5</CamelManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!--Trader-->
-					<xpath>Defs/FactionDef[defName="CamelManTribe"]/pawnGroupMakers/li[5]/guards</xpath>
-					<value>
-						<CamelManGrenadier>5</CamelManGrenadier>
-						<CamelManGunner>15</CamelManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Settlement -->
-					<xpath>Defs/FactionDef[defName="CamelManTribe"]/pawnGroupMakers/li[6]/options</xpath>
-					<value>
-						<CamelManGrenadier>10</CamelManGrenadier>
-						<CamelManGunner>10</CamelManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Combat -->
-					<xpath>Defs/FactionDef[defName="ElephantManTribe"]/pawnGroupMakers/li[1]/options</xpath>
-					<value>
-						<ElephantManGrenadier>10</ElephantManGrenadier>
-						<ElephantManGunner>5</ElephantManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Normal fights, ranged only -->
-					<xpath>Defs/FactionDef[defName="ElephantManTribe"]/pawnGroupMakers/li[2]/options</xpath>
-					<value>
-						<ElephantManGrenadier>5</ElephantManGrenadier>
-						<ElephantManGunner>10</ElephantManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!--Peaceful-->
-					<xpath>Defs/FactionDef[defName="ElephantManTribe"]/pawnGroupMakers/li[4]/options</xpath>
-					<value>
-						<ElephantManGrenadier>10</ElephantManGrenadier>
-						<ElephantManGunner>5</ElephantManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!--Trader-->
-					<xpath>Defs/FactionDef[defName="ElephantManTribe"]/pawnGroupMakers/li[5]/guards</xpath>
-					<value>
-						<ElephantManGrenadier>5</ElephantManGrenadier>
-						<ElephantManGunner>15</ElephantManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Settlement -->
-					<xpath>Defs/FactionDef[defName="ElephantManTribe"]/pawnGroupMakers/li[6]/options</xpath>
-					<value>
-						<ElephantManGrenadier>10</ElephantManGrenadier>
-						<ElephantManGunner>10</ElephantManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Combat -->
-					<xpath>Defs/FactionDef[defName="ElkManTribe"]/pawnGroupMakers/li[1]/options</xpath>
-					<value>
-						<ElkManGrenadier>10</ElkManGrenadier>
-						<ElkManGunner>5</ElkManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Normal fights, ranged only -->
-					<xpath>Defs/FactionDef[defName="ElkManTribe"]/pawnGroupMakers/li[2]/options</xpath>
-					<value>
-						<ElkManGrenadier>5</ElkManGrenadier>
-						<ElkManGunner>10</ElkManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!--Peaceful-->
-					<xpath>Defs/FactionDef[defName="ElkManTribe"]/pawnGroupMakers/li[4]/options</xpath>
-					<value>
-						<ElkManGrenadier>10</ElkManGrenadier>
-						<ElkManGunner>5</ElkManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!--Trader-->
-					<xpath>Defs/FactionDef[defName="ElkManTribe"]/pawnGroupMakers/li[5]/guards</xpath>
-					<value>
-						<ElkManGrenadier>5</ElkManGrenadier>
-						<ElkManGunner>15</ElkManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Settlement -->
-					<xpath>Defs/FactionDef[defName="ElkManTribe"]/pawnGroupMakers/li[6]/options</xpath>
-					<value>
-						<ElkManGrenadier>10</ElkManGrenadier>
-						<ElkManGunner>10</ElkManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Combat -->
-					<xpath>Defs/FactionDef[defName="FoxManTribe"]/pawnGroupMakers/li[1]/options</xpath>
-					<value>
-						<FoxManGrenadier>10</FoxManGrenadier>
-						<FoxManGunner>5</FoxManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Normal fights, ranged only -->
-					<xpath>Defs/FactionDef[defName="FoxManTribe"]/pawnGroupMakers/li[2]/options</xpath>
-					<value>
-						<FoxManGrenadier>5</FoxManGrenadier>
-						<FoxManGunner>10</FoxManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!--Peaceful-->
-					<xpath>Defs/FactionDef[defName="FoxManTribe"]/pawnGroupMakers/li[4]/options</xpath>
-					<value>
-						<FoxManGrenadier>10</FoxManGrenadier>
-						<FoxManGunner>5</FoxManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!--Trader-->
-					<xpath>Defs/FactionDef[defName="FoxManTribe"]/pawnGroupMakers/li[5]/guards</xpath>
-					<value>
-						<FoxManGrenadier>5</FoxManGrenadier>
-						<FoxManGunner>15</FoxManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Settlement -->
-					<xpath>Defs/FactionDef[defName="FoxManTribe"]/pawnGroupMakers/li[6]/options</xpath>
-					<value>
-						<FoxManGrenadier>10</FoxManGrenadier>
-						<FoxManGunner>10</FoxManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Combat -->
-					<xpath>Defs/FactionDef[defName="GazelleManTribe"]/pawnGroupMakers/li[1]/options</xpath>
-					<value>
-						<GazelleManGrenadier>10</GazelleManGrenadier>
-						<GazelleManGunner>5</GazelleManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Normal fights, ranged only -->
-					<xpath>Defs/FactionDef[defName="GazelleManTribe"]/pawnGroupMakers/li[2]/options</xpath>
-					<value>
-						<GazelleManGrenadier>5</GazelleManGrenadier>
-						<GazelleManGunner>10</GazelleManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!--Peaceful-->
-					<xpath>Defs/FactionDef[defName="GazelleManTribe"]/pawnGroupMakers/li[4]/options</xpath>
-					<value>
-						<GazelleManGrenadier>10</GazelleManGrenadier>
-						<GazelleManGunner>5</GazelleManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!--Trader-->
-					<xpath>Defs/FactionDef[defName="GazelleManTribe"]/pawnGroupMakers/li[5]/guards</xpath>
-					<value>
-						<GazelleManGrenadier>5</GazelleManGrenadier>
-						<GazelleManGunner>15</GazelleManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Settlement -->
-					<xpath>Defs/FactionDef[defName="GazelleManTribe"]/pawnGroupMakers/li[6]/options</xpath>
-					<value>
-						<GazelleManGrenadier>10</GazelleManGrenadier>
-						<GazelleManGunner>10</GazelleManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Combat -->
-					<xpath>Defs/FactionDef[defName="LynxManTribe"]/pawnGroupMakers/li[1]/options</xpath>
-					<value>
-						<LynxManGrenadier>10</LynxManGrenadier>
-						<LynxManGunner>5</LynxManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Normal fights, ranged only -->
-					<xpath>Defs/FactionDef[defName="LynxManTribe"]/pawnGroupMakers/li[2]/options</xpath>
-					<value>
-						<LynxManGrenadier>5</LynxManGrenadier>
-						<LynxManGunner>10</LynxManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!--Peaceful-->
-					<xpath>Defs/FactionDef[defName="LynxManTribe"]/pawnGroupMakers/li[4]/options</xpath>
-					<value>
-						<LynxManGrenadier>10</LynxManGrenadier>
-						<LynxManGunner>5</LynxManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!--Trader-->
-					<xpath>Defs/FactionDef[defName="LynxManTribe"]/pawnGroupMakers/li[5]/guards</xpath>
-					<value>
-						<LynxManGrenadier>5</LynxManGrenadier>
-						<LynxManGunner>15</LynxManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Settlement -->
-					<xpath>Defs/FactionDef[defName="LynxManTribe"]/pawnGroupMakers/li[6]/options</xpath>
-					<value>
-						<LynxManGrenadier>10</LynxManGrenadier>
-						<LynxManGunner>10</LynxManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Combat -->
-					<xpath>Defs/FactionDef[defName="PigManTribe"]/pawnGroupMakers/li[1]/options</xpath>
-					<value>
-						<PigManGrenadier>10</PigManGrenadier>
-						<PigManGunner>5</PigManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Normal fights, ranged only -->
-					<xpath>Defs/FactionDef[defName="PigManTribe"]/pawnGroupMakers/li[2]/options</xpath>
-					<value>
-						<PigManGrenadier>5</PigManGrenadier>
-						<PigManGunner>10</PigManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!--Peaceful-->
-					<xpath>Defs/FactionDef[defName="PigManTribe"]/pawnGroupMakers/li[4]/options</xpath>
-					<value>
-						<PigManGrenadier>10</PigManGrenadier>
-						<PigManGunner>5</PigManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!--Trader-->
-					<xpath>Defs/FactionDef[defName="PigManTribe"]/pawnGroupMakers/li[5]/guards</xpath>
-					<value>
-						<PigManGrenadier>5</PigManGrenadier>
-						<PigManGunner>15</PigManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Settlement -->
-					<xpath>Defs/FactionDef[defName="PigManTribe"]/pawnGroupMakers/li[6]/options</xpath>
-					<value>
-						<PigManGrenadier>10</PigManGrenadier>
-						<PigManGunner>10</PigManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Combat -->
-					<xpath>Defs/FactionDef[defName="RaccoonManTribe"]/pawnGroupMakers/li[1]/options</xpath>
-					<value>
-						<RaccoonManGrenadier>10</RaccoonManGrenadier>
-						<RaccoonManGunner>5</RaccoonManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Normal fights, ranged only -->
-					<xpath>Defs/FactionDef[defName="RaccoonManTribe"]/pawnGroupMakers/li[2]/options</xpath>
-					<value>
-						<RaccoonManGrenadier>5</RaccoonManGrenadier>
-						<RaccoonManGunner>10</RaccoonManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!--Peaceful-->
-					<xpath>Defs/FactionDef[defName="RaccoonManTribe"]/pawnGroupMakers/li[4]/options</xpath>
-					<value>
-						<RaccoonManGrenadier>10</RaccoonManGrenadier>
-						<RaccoonManGunner>5</RaccoonManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!--Trader-->
-					<xpath>Defs/FactionDef[defName="RaccoonManTribe"]/pawnGroupMakers/li[5]/guards</xpath>
-					<value>
-						<RaccoonManGrenadier>5</RaccoonManGrenadier>
-						<RaccoonManGunner>15</RaccoonManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Settlement -->
-					<xpath>Defs/FactionDef[defName="RaccoonManTribe"]/pawnGroupMakers/li[6]/options</xpath>
-					<value>
-						<RaccoonManGrenadier>10</RaccoonManGrenadier>
-						<RaccoonManGunner>10</RaccoonManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Combat -->
-					<xpath>Defs/FactionDef[defName="WolfManTribe"]/pawnGroupMakers/li[1]/options</xpath>
-					<value>
-						<WolfManGrenadier>10</WolfManGrenadier>
-						<WolfManGunner>5</WolfManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Normal fights, ranged only -->
-					<xpath>Defs/FactionDef[defName="WolfManTribe"]/pawnGroupMakers/li[2]/options</xpath>
-					<value>
-						<WolfManGrenadier>5</WolfManGrenadier>
-						<WolfManGunner>10</WolfManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!--Peaceful-->
-					<xpath>Defs/FactionDef[defName="WolfManTribe"]/pawnGroupMakers/li[4]/options</xpath>
-					<value>
-						<WolfManGrenadier>10</WolfManGrenadier>
-						<WolfManGunner>5</WolfManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!--Trader-->
-					<xpath>Defs/FactionDef[defName="WolfManTribe"]/pawnGroupMakers/li[5]/guards</xpath>
-					<value>
-						<WolfManGrenadier>5</WolfManGrenadier>
-						<WolfManGunner>15</WolfManGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Settlement -->
-					<xpath>Defs/FactionDef[defName="WolfManTribe"]/pawnGroupMakers/li[6]/options</xpath>
-					<value>
-						<WolfManGrenadier>10</WolfManGrenadier>
-						<WolfManGunner>10</WolfManGunner>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Beast Man Tribes/Patch_PawnKinds_Beasts.xml b/Patches/Beast Man Tribes/Patch_PawnKinds_Beasts.xml
deleted file mode 100644
index 40e33317f8..0000000000
--- a/Patches/Beast Man Tribes/Patch_PawnKinds_Beasts.xml	
+++ /dev/null
@@ -1,427 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Beast Man Tribes</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Tribal raid points-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="BearMan_Penitent"
-						or defName="CamelMan_Penitent"
-						or defName="ElephantMan_Penitent"
-						or defName="ElkMan_Penitent"
-						or defName="FoxMan_Penitent"
-						or defName="GazelleMan_Penitent"
-						or defName="LynxMan_Penitent"
-						or defName="PigMan_Penitent"
-						or defName="RaccoonMan_Penitent"
-						or defName="WolfMan_Penitent"]/weaponMoney </xpath>
-					<value>
-						<weaponMoney>50~150</weaponMoney>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="BearMan_Penitent"
-						or defName="CamelMan_Penitent"
-						or defName="ElephantMan_Penitent"
-						or defName="ElkMan_Penitent"
-						or defName="FoxMan_Penitent"
-						or defName="GazelleMan_Penitent"
-						or defName="LynxMan_Penitent"
-						or defName="PigMan_Penitent"
-						or defName="RaccoonMan_Penitent"
-						or defName="WolfMan_Penitent"]/combatPower </xpath>
-					<value>
-						<combatPower>16</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="BearMan_Warrior"
-						or defName="CamelMan_Warrior"
-						or defName="ElephantMan_Warrior"
-						or defName="ElkMan_Warrior"
-						or defName="FoxMan_Warrior"
-						or defName="GazelleMan_Warrior"
-						or defName="LynxMan_Warrior"
-						or defName="PigMan_Warrior"
-						or defName="RaccoonMan_Warrior"
-						or defName="WolfMan_Warrior"]/weaponMoney </xpath>
-					<value>
-						<weaponMoney>80~150</weaponMoney>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="BearMan_Warrior"
-						or defName="CamelMan_Warrior"
-						or defName="ElephantMan_Warrior"
-						or defName="ElkMan_Warrior"
-						or defName="FoxMan_Warrior"
-						or defName="GazelleMan_Warrior"
-						or defName="LynxMan_Warrior"
-						or defName="PigMan_Warrior"
-						or defName="RaccoonMan_Warrior"
-						or defName="WolfMan_Warrior"] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>100</min>
-								<max>150</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.9</shieldChance>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="BearMan_Warrior"
-						or defName="CamelMan_Warrior"
-						or defName="ElephantMan_Warrior"
-						or defName="ElkMan_Warrior"
-						or defName="FoxMan_Warrior"
-						or defName="GazelleMan_Warrior"
-						or defName="LynxMan_Warrior"
-						or defName="PigMan_Warrior"
-						or defName="RaccoonMan_Warrior"
-						or defName="WolfMan_Warrior"]/combatPower </xpath>
-					<value>
-						<combatPower>24</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="BearMan_Archer"
-						or defName="CamelMan_Archer"
-						or defName="ElephantMan_Archer"
-						or defName="ElkMan_Archer"
-						or defName="FoxMan_Archer"
-						or defName="GazelleMan_Archer"
-						or defName="LynxMan_Archer"
-						or defName="PigMan_Archer"
-						or defName="RaccoonMan_Archer"
-						or defName="WolfMan_Archer"] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>20</min>
-								<max>40</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>100</min>
-								<max>130</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.6</shieldChance>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>80</min>
-										<max>160</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Tribal</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="BearMan_Archer"
-						or defName="CamelMan_Archer"
-						or defName="ElephantMan_Archer"
-						or defName="ElkMan_Archer"
-						or defName="FoxMan_Archer"
-						or defName="GazelleMan_Archer"
-						or defName="LynxMan_Archer"
-						or defName="PigMan_Archer"
-						or defName="RaccoonMan_Archer"
-						or defName="WolfMan_Archer"]/combatPower </xpath>
-					<value>
-						<combatPower>30</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="BearMan_Hunter"
-						or defName="CamelMan_Hunter"
-						or defName="ElephantMan_Hunter"
-						or defName="ElkMan_Hunter"
-						or defName="FoxMan_Hunter"
-						or defName="GazelleMan_Hunter"
-						or defName="LynxMan_Hunter"
-						or defName="PigMan_Hunter"
-						or defName="RaccoonMan_Hunter"
-						or defName="WolfMan_Hunter"] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>25</min>
-								<max>50</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>100</min>
-								<max>140</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.6</shieldChance>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>80</min>
-										<max>240</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Tribal</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="BearMan_Hunter"
-						or defName="CamelMan_Hunter"
-						or defName="ElephantMan_Hunter"
-						or defName="ElkMan_Hunter"
-						or defName="FoxMan_Hunter"
-						or defName="GazelleMan_Hunter"
-						or defName="LynxMan_Hunter"
-						or defName="PigMan_Hunter"
-						or defName="RaccoonMan_Hunter"
-						or defName="WolfMan_Hunter"]/combatPower </xpath>
-					<value>
-						<combatPower>45</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="BearMan_HeavyArcher"
-						or defName="CamelMan_HeavyArcher"
-						or defName="ElephantMan_HeavyArcher"
-						or defName="ElkMan_HeavyArcher"
-						or defName="FoxMan_HeavyArcher"
-						or defName="GazelleMan_HeavyArcher"
-						or defName="LynxMan_HeavyArcher"
-						or defName="PigMan_HeavyArcher"
-						or defName="RaccoonMan_HeavyArcher"
-						or defName="WolfMan_HeavyArcher"] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>20</min>
-								<max>40</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>100</min>
-								<max>160</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.6</shieldChance>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>80</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Tribal</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="BearMan_HeavyArcher"
-						or defName="CamelMan_HeavyArcher"
-						or defName="ElephantMan_HeavyArcher"
-						or defName="ElkMan_HeavyArcher"
-						or defName="FoxMan_HeavyArcher"
-						or defName="GazelleMan_HeavyArcher"
-						or defName="LynxMan_HeavyArcher"
-						or defName="PigMan_HeavyArcher"
-						or defName="RaccoonMan_HeavyArcher"
-						or defName="WolfMan_HeavyArcher"]/combatPower </xpath>
-					<value>
-						<combatPower>60</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="BearMan_Berserker"
-						or defName="CamelMan_Berserker"
-						or defName="ElephantMan_Berserker"
-						or defName="ElkMan_Berserker"
-						or defName="FoxMan_Berserker"
-						or defName="GazelleMan_Berserker"
-						or defName="LynxMan_Berserker"
-						or defName="PigMan_Berserker"
-						or defName="RaccoonMan_Berserker"
-						or defName="WolfMan_Berserker"] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>120</min>
-								<max>160</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.9</shieldChance>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="BearMan_Berserker"
-						or defName="CamelMan_Berserker"
-						or defName="ElephantMan_Berserker"
-						or defName="ElkMan_Berserker"
-						or defName="FoxMan_Berserker"
-						or defName="GazelleMan_Berserker"
-						or defName="LynxMan_Berserker"
-						or defName="PigMan_Berserker"
-						or defName="RaccoonMan_Berserker"
-						or defName="WolfMan_Berserker"]/combatPower </xpath>
-					<value>
-						<combatPower>60</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="BearMan_ChiefMelee"
-						or defName="CamelMan_ChiefMelee"
-						or defName="ElephantMan_ChiefMelee"
-						or defName="ElkMan_ChiefMelee"
-						or defName="FoxMan_ChiefMelee"
-						or defName="GazelleMan_ChiefMelee"
-						or defName="LynxMan_ChiefMelee"
-						or defName="PigMan_ChiefMelee"
-						or defName="RaccoonMan_ChiefMelee"
-						or defName="WolfMan_ChiefMelee"] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>120</min>
-								<max>160</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.9</shieldChance>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="BearMan_ChiefRanged"
-						or defName="CamelMan_ChiefRanged"
-						or defName="ElephantMan_ChiefRanged"
-						or defName="ElkMan_ChiefRanged"
-						or defName="FoxMan_ChiefRanged"
-						or defName="GazelleMan_ChiefRanged"
-						or defName="LynxMan_ChiefRanged"
-						or defName="PigMan_ChiefRanged"
-						or defName="RaccoonMan_ChiefRanged"
-						or defName="WolfMan_ChiefRanged"] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>30</min>
-								<max>60</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>120</min>
-								<max>160</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.9</shieldChance>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>100</min>
-										<max>600</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Tribal</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="BearMan_ChiefRanged"
-						or defName="CamelMan_ChiefRanged"
-						or defName="ElephantMan_ChiefRanged"
-						or defName="ElkMan_ChiefRanged"
-						or defName="FoxMan_ChiefRanged"
-						or defName="GazelleMan_ChiefRanged"
-						or defName="LynxMan_ChiefRanged"
-						or defName="PigMan_ChiefRanged"
-						or defName="RaccoonMan_ChiefRanged"
-						or defName="WolfMan_ChiefRanged"]/weaponTags/li[.="NeolithicRangedChief"] </xpath>
-					<value>
-						<li>Gun</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="BearMan_ChiefRanged"
-						or defName="CamelMan_ChiefRanged"
-						or defName="ElephantMan_ChiefRanged"
-						or defName="ElkMan_ChiefRanged"
-						or defName="FoxMan_ChiefRanged"
-						or defName="GazelleMan_ChiefRanged"
-						or defName="LynxMan_ChiefRanged"
-						or defName="PigMan_ChiefRanged"
-						or defName="RaccoonMan_ChiefRanged"
-						or defName="WolfMan_ChiefRanged"
-						or defName="BearMan_ChiefMelee"
-						or defName="CamelMan_ChiefMelee"
-						or defName="ElephantMan_ChiefMelee"
-						or defName="ElkMan_ChiefMelee"
-						or defName="FoxMan_ChiefMelee"
-						or defName="GazelleMan_ChiefMelee"
-						or defName="LynxMan_ChiefMelee"
-						or defName="PigMan_ChiefMelee"
-						or defName="RaccoonMan_ChiefMelee"
-						or defName="WolfMan_ChiefMelee"]/weaponMoney </xpath>
-					<value>
-						<weaponMoney>
-							<min>230</min>
-							<max>300</max>
-						</weaponMoney>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Beeralope Squad/Drugs/Natural_Beer.xml b/Patches/Beeralope Squad/Drugs/Natural_Beer.xml
deleted file mode 100644
index 311210d446..0000000000
--- a/Patches/Beeralope Squad/Drugs/Natural_Beer.xml	
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Beeralope Squad</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="NaturalBeer"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>2.22</cooldownTime>
-										<chanceFactor>1.33</chanceFactor>
-										<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>neck</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>3.33</cooldownTime>
-										<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Neck</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<!--Add weapon tags for 1-handing-->
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="NaturalBeer"]/weaponTags</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="NaturalBeer"]</xpath>
-								<value>
-									<weaponTags />
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="NaturalBeer"]/weaponTags</xpath>
-							<value>
-								<li>CE_OneHandedWeapon</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-
-		</operations>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Beeralope Squad/ThingDefs_Races/Races_Beerhybrids.xml b/Patches/Beeralope Squad/ThingDefs_Races/Races_Beerhybrids.xml
deleted file mode 100644
index 22897246d8..0000000000
--- a/Patches/Beeralope Squad/ThingDefs_Races/Races_Beerhybrids.xml	
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Beeralope Squad</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--Bodytype-->
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[defName="Beeralope"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Quadruped</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[defName="Beerat"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>QuadrupedLow</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[defName="Beerbro"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Birdlike</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<!--Beeralope-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Beeralope"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>5</power>
-										<cooldownTime>1.97</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<!--Beerat-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Beerat"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left claw</label>
-										<capacities>
-											<li>Scratch</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>1.69</cooldownTime>
-										<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.013</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.01</armorPenetrationSharp>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>right claw</label>
-										<capacities>
-											<li>Scratch</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>1.69</cooldownTime>
-										<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.013</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.01</armorPenetrationSharp>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<capacities>
-											<li>Bite</li>
-										</capacities>
-										<power>4</power>
-										<cooldownTime>0.95</cooldownTime>
-										<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.09</armorPenetrationSharp>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>3.00</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
-										<armorPenetrationSharp>0</armorPenetrationSharp>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Beerat"]/race/baseHealthScale</xpath>
-							<value>
-								<baseHealthScale>0.2</baseHealthScale>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/PawnKindDef[defName="Beerat"]/combatPower</xpath>
-							<value>
-								<combatPower>40</combatPower>
-							</value>
-						</li>
-
-						<!--Beerbro-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Beerbro"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>15</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Beerbro"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>10</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Beerbro"]/statBases/ArmorRating_Heat</xpath>
-							<value>
-								<ArmorRating_Heat>0.8</ArmorRating_Heat>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Beerbro"]/race/baseHealthScale</xpath>
-							<value>
-								<baseHealthScale>5</baseHealthScale>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Beerbro"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>horn</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>46</power>
-										<cooldownTime>2.52</cooldownTime>
-										<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-										<armorPenetrationSharp>0.54</armorPenetrationSharp>
-										<armorPenetrationBlunt>4</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>horn</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>42</power>
-										<cooldownTime>2.52</cooldownTime>
-										<chanceFactor>0.65</chanceFactor>
-										<linkedBodyPartsGroup>HornAttackTool_2</linkedBodyPartsGroup>
-										<armorPenetrationSharp>8</armorPenetrationSharp>
-										<armorPenetrationBlunt>4</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>left foot</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>21</power>
-										<cooldownTime>2.33</cooldownTime>
-										<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>8.640</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>right foot</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>21</power>
-										<cooldownTime>2.33</cooldownTime>
-										<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>8.640</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<capacities>
-											<li>Bite</li>
-										</capacities>
-										<power>19</power>
-										<cooldownTime>1.62</cooldownTime>
-										<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-										<armorPenetrationSharp>0.03</armorPenetrationSharp>
-										<armorPenetrationBlunt>2.016</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>11</power>
-										<cooldownTime>2.52</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationBlunt>4</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/PawnKindDef[defName="Beerbro"]/combatPower</xpath>
-							<value>
-								<combatPower>450</combatPower>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-
-		</operations>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Better Infestations/Race_Insect.xml b/Patches/Better Infestations/Race_Insect.xml
deleted file mode 100644
index aad5719857..0000000000
--- a/Patches/Better Infestations/Race_Insect.xml	
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Better Infestations 1.3</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- BI_Queen -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BI_Queen"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BI_Queen"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-						<MeleeDodgeChance>0.04</MeleeDodgeChance>
-						<MeleeCritChance>0.11</MeleeCritChance>
-						<MeleeParryChance>0.24</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BI_Queen"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>3</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BI_Queen"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head claw</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>44</power>
-								<cooldownTime>3.66</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.22</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.164</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>3.66</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3.164</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>3.94</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.219</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Better Wool Production/Blended_Wool_Patch.xml b/Patches/Better Wool Production/Blended_Wool_Patch.xml
deleted file mode 100644
index 9d5c372ea6..0000000000
--- a/Patches/Better Wool Production/Blended_Wool_Patch.xml	
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Better Wool Production - C# Edition</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoolBlended"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.01</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoolBlended"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Big and Small/Big and Small - MO/BS_MO_Pawnkind.xml b/Patches/Big and Small/Big and Small - MO/BS_MO_Pawnkind.xml
deleted file mode 100644
index b2afdd40aa..0000000000
--- a/Patches/Big and Small/Big and Small - MO/BS_MO_Pawnkind.xml	
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Big and Small - Medieval Overhaul Factions</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Give ammo to crosbowman-->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="BS_Crossbowman"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>12</min>
-								<max>20</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>100</min>
-									<max>200</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>NeolithicMeleeBasic</li>
-									<li>MedievalMeleeDecent</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<!-- Tribal Backpacks -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[
-						defName="BS_Crossbowman"]
-					</xpath>
-					<value>
-						<apparelRequired>
-							<li>CE_Apparel_TribalBackpack</li>
-							<li>DankPyon_Apparel_Quiver</li>
-						</apparelRequired>
-					</value>
-				</li>
-
-				<!-- Weapon Tags -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[defName="BS_Crossbowman"]/weaponTags</xpath>
-					<value>
-						<li>CE_XBow</li>
-					</value>
-				</li>
-
-				<!-- Force no Shield -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[defName="BS_Jotun_Knight"]</xpath>
-					<value>
-						<modExtensions Inherit="False">
-							<li Class="CombatExtended.LoadoutPropertiesExtension">
-								<shieldMoney>
-									<min>1</min>
-									<max>1</max>
-								</shieldMoney>
-								<shieldTags>
-									<li>HeaterShield</li>
-									<li>KiteShield</li>
-								</shieldTags>
-								<shieldChance>0.01</shieldChance>
-							</li>
-						</modExtensions>
-					</value>
-				</li>
-
-				<!-- More Javelins for Giant-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[defName="BS_Jotun_Raider_Ranged" or defName="BS_Heavy_Jotun_Spearman"]</xpath>
-					<value>
-						<modExtensions Inherit="False">
-							<li Class="CombatExtended.LoadoutPropertiesExtension">
-								<primaryMagazineCount>
-									<min>4</min>
-									<max>10</max>
-								</primaryMagazineCount>
-								<forcedSidearm>
-									<sidearmMoney>
-										<min>100</min>
-										<max>600</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>NeolithicMeleeGiant</li>
-									</weaponTags>
-								</forcedSidearm>
-							</li>
-						</modExtensions>
-					</value>
-				</li>
-
-				<!-- Tribal Backpacks -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[
-						defName="BS_Jotun_Raider_Ranged" or defName="BS_Heavy_Jotun_Spearman"] </xpath>
-					<value>
-						<apparelRequired>
-							<li>CE_Apparel_TribalBackpack</li>
-						</apparelRequired>
-					</value>
-				</li>
-
-				<!-- Balancing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[
-						defName="BS_Jotun_Raider" or
-						defName="BS_Jotun_Raider_Ranged" or
-						defName="BS_Medium_Jotun_Raider"]/combatPower</xpath>
-					<value>
-						<combatPower>80</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[
-						defName="BS_Heavy_Jotun" or
-						defName="BS_Heavy_Jotun_Spearman"]/combatPower</xpath>
-					<value>
-						<combatPower>120</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="BS_Jotun_Knight"]/combatPower</xpath>
-					<value>
-						<combatPower>150</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="BS_Jotun_Lord"]/combatPower</xpath>
-					<value>
-						<combatPower>200</combatPower>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Big and Small/Big and Small - Medieval Factions/BS_Medieval_Pawnkind.xml b/Patches/Big and Small/Big and Small - Medieval Factions/BS_Medieval_Pawnkind.xml
deleted file mode 100644
index dcd609bfb9..0000000000
--- a/Patches/Big and Small/Big and Small - Medieval Factions/BS_Medieval_Pawnkind.xml	
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Big and Small - Medieval Factions</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Red Bandana-->
-
-				<!--Give ammo to crosbowman-->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="BS_Crossbowman"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>12</min>
-								<max>20</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>100</min>
-									<max>200</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>NeolithicMeleeBasic</li>
-									<li>MedievalMeleeDecent</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<!-- Tribal Backpacks -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[
-						defName="BS_Crossbowman"] </xpath>
-					<value>
-						<apparelRequired>
-							<li>CE_Apparel_TribalBackpack</li>
-							<li>DankPyon_Apparel_Quiver</li>
-						</apparelRequired>
-					</value>
-				</li>
-
-				<!-- Weapon Tags -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[defName="BS_Crossbowman"]/weaponTags</xpath>
-					<value>
-						<li>CE_XBow</li>
-					</value>
-				</li>
-
-				<!-- More Javelins for Giant-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[defName="BS_Jotun_Javelin" or defName="BS_Jotun_NiflJavelin"]</xpath>
-					<value>
-						<modExtensions Inherit="False">
-							<li Class="CombatExtended.LoadoutPropertiesExtension">
-								<primaryMagazineCount>
-									<min>2</min>
-									<max>4</max>
-								</primaryMagazineCount>
-								<shieldMoney>
-									<min>100</min>
-									<max>350</max>
-								</shieldMoney>
-								<shieldTags>
-									<li>KiteShield</li>
-									<li>HeaterShield</li>
-								</shieldTags>
-								<shieldChance>0.6</shieldChance>
-								<forcedSidearm>
-									<sidearmMoney>
-										<min>100</min>
-										<max>600</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>NeolithicMeleeGiant</li>
-									</weaponTags>
-								</forcedSidearm>
-							</li>
-						</modExtensions>
-					</value>
-				</li>
-
-				<!-- More Javelins for Giant-->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="BS_Jotun_Hunter"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>4</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>50</min>
-									<max>150</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>RangedNeolithicGiant</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Big and Small/Big and Small Genes/Genes/GeneDefs_Small.xml b/Patches/Big and Small/Big and Small Genes/Genes/GeneDefs_Small.xml
deleted file mode 100644
index 68f3d56654..0000000000
--- a/Patches/Big and Small/Big and Small Genes/Genes/GeneDefs_Small.xml	
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Big and Small Genes</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Adds Dwarf Bulk -->
-				<!-- Adds Gnome Bulk -->
-				<!-- Adds Rabbit Bulk -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/GeneDef[defName="DwarfFrame" or defName="GnomeFrame" or defName="BS_RabbitFrame"]/statOffsets</xpath>
-					<value>
-						<CarryBulk>10</CarryBulk>
-					</value>
-				</li>
-
-				<!-- Add Small Frame Bulk -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/GeneDef[defName="BS_SmallFrame"]/statOffsets</xpath>
-					<value>
-						<CarryBulk>8</CarryBulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Big and Small/Big and Small Genes/Genes/GeneDefs_Temperature.xml b/Patches/Big and Small/Big and Small Genes/Genes/GeneDefs_Temperature.xml
deleted file mode 100644
index 715636a86c..0000000000
--- a/Patches/Big and Small/Big and Small Genes/Genes/GeneDefs_Temperature.xml	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Big and Small Genes</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/GeneDef[defName="FireImmunity"]/damageFactors</xpath>
-					<value>
-						<PrometheumFlame>0.0</PrometheumFlame>
-						<Flame_Secondary>0.0</Flame_Secondary>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Big and Small/Big and Small Genes/HediffDefs/Hediffs_Armor.xml b/Patches/Big and Small/Big and Small Genes/HediffDefs/Hediffs_Armor.xml
deleted file mode 100644
index 52e55e50dd..0000000000
--- a/Patches/Big and Small/Big and Small Genes/HediffDefs/Hediffs_Armor.xml	
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Big and Small Genes</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BS_ToughSkin"]/stages/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ArmorRating_Blunt>1</ArmorRating_Blunt>
-							<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BS_NaturalArmor_Padded"]/stages/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-							<ArmorRating_Sharp>1</ArmorRating_Sharp>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BS_NaturalArmor_Riot"]/stages/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ArmorRating_Blunt>2</ArmorRating_Blunt>
-							<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BS_PsychicArmor_Stage1"]/stages/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ArmorRating_Blunt>1</ArmorRating_Blunt>
-							<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BS_PsychicArmor_Stage2"]/stages/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ArmorRating_Blunt>2</ArmorRating_Blunt>
-							<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-						</statOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Big and Small/Big and Small Genes/HediffDefs/Hediffs_Weapons..xml b/Patches/Big and Small/Big and Small Genes/HediffDefs/Hediffs_Weapons..xml
deleted file mode 100644
index de7d680e3f..0000000000
--- a/Patches/Big and Small/Big and Small Genes/HediffDefs/Hediffs_Weapons..xml	
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Big and Small Genes</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Acid Attack -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BS_AcidAttack"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>BS_AcidBuiltupCap</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.26</cooldownTime>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Venomous Talons -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="LoS_VenomClaws"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>venomous talons</label>
-								<capacities>
-									<li>BS_AcidBuiltupCap</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationSharp>1.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.8</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Talons -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BS_Talons"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>talons</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationSharp>1.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.8</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Feeding Frenzy -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BS_FeedingFrenzy"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.50</cooldownTime>
-								<chanceFactor>5</chanceFactor>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<soundMeleeHit>Pawn_Melee_HumanBite_Hit</soundMeleeHit>
-								<soundMeleeMiss>Pawn_Melee_HumanBite_Miss</soundMeleeMiss>
-								<armorPenetrationSharp>0.35</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Snake Tail -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="LS_SnakeTail"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tail</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>3.17</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>6</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Big and Small/Big and Small Genes/Pawnkind/BS_Genes_Pawnkind.xml b/Patches/Big and Small/Big and Small Genes/Pawnkind/BS_Genes_Pawnkind.xml
deleted file mode 100644
index 6be541623c..0000000000
--- a/Patches/Big and Small/Big and Small Genes/Pawnkind/BS_Genes_Pawnkind.xml	
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Big and Small Genes</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- More Javelins for Giant-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[defName="BS_Ogre_Hunter"]</xpath>
-					<value>
-						<modExtensions Inherit="False">
-							<li Class="CombatExtended.LoadoutPropertiesExtension">
-								<primaryMagazineCount>
-									<min>3</min>
-									<max>4</max>
-								</primaryMagazineCount>
-								<forcedSidearm>
-									<sidearmMoney>
-										<min>100</min>
-										<max>600</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>NeolithicMeleeGiant</li>
-									</weaponTags>
-								</forcedSidearm>
-							</li>
-						</modExtensions>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/PawnKindDef[defName="BS_Ogre_Warrior"]/weaponTags/li[.="NeolithicMeleeBasic"]</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Big and Small/Big and Small Genes/Weapons/ThingDef_Ammo.xml b/Patches/Big and Small/Big and Small Genes/Weapons/ThingDef_Ammo.xml
deleted file mode 100644
index bd83c2d131..0000000000
--- a/Patches/Big and Small/Big and Small Genes/Weapons/ThingDef_Ammo.xml	
+++ /dev/null
@@ -1,231 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Big and Small Genes</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="BasePilumProjectile">
-							<defName>Projectile_GiantThrown</defName>
-							<label>giant javelin (thrown)</label>
-							<graphicData>
-								<texPath>Item/GiantJavelin_Projectile</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>37</damageAmountBase>
-								<speed>30</speed>
-								<armorPenetrationBlunt>486</armorPenetrationBlunt>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<preExplosionSpawnChance>0.9</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>BS_JotunJavelin</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>MakeAmmo_BS_JotunJavelin</defName>
-							<label>make giant javeln</label>
-							<description>Craft a giant javelin.</description>
-							<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-							<workSkill>Crafting</workSkill>
-							<skillRequirements>
-								<Crafting>3</Crafting>
-							</skillRequirements>
-							<recipeUsers>
-								<li>ElectricSmithy</li>
-								<li>FueledSmithy</li>
-								<li>CraftingSpot</li>
-							</recipeUsers>
-							<effectWorking>Smelt</effectWorking>
-							<unfinishedThingDef>UnfinishedAmmo</unfinishedThingDef>
-							<workAmount>18000</workAmount>
-							<jobString>Making pila.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>140</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>80</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<BS_JotunJavelin>1</BS_JotunJavelin>
-							</products>
-							<displayPriority>500</displayPriority>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-				<!-- === Shrink Ray Ammo === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- === Ammo Set === -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_ShrinkRay</defName>
-							<label>Shrink Ray Power Cell</label>
-							<ammoTypes>
-								<Ammo_LaserChargePack>Projectile_ShrinkRay</Ammo_LaserChargePack>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- === Projectile === -->
-						<ThingDef ParentName="BaseBulletCE">
-							<defName>Projectile_ShrinkRay</defName>
-							<label>shrink ray</label>
-							<graphicData>
-								<texPath>Things/Projectile/ChargeLanceShot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-								<drawSize>1.5</drawSize>
-								<color>(180, 180, 255)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>ShrinkRay</damageDef>
-								<damageAmountBase>1</damageAmountBase><!-- -2 -->
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt><!-- -0.5 -->
-								<armorPenetrationSharp>0.5</armorPenetrationSharp><!-- -0.2 -->
-								<speed>70</speed>
-							</projectile>
-						</ThingDef>
-
-						<!-- === Damage Def === -->
-						<DamageDef>
-							<defName>ShrinkRay</defName>
-							<label>vaporize</label>
-							<workerClass>DamageWorker_Vaporize</workerClass>
-							<externalViolence>true</externalViolence>
-							<deathMessage>{0} has been vaporized by extreme heat.</deathMessage>
-							<hediff>Burn</hediff>
-							<additionalHediffs>
-								<li>
-									<hediff>BS_Affliction_ShrinkRay</hediff>
-									<severityPerDamageDealt>0.12</severityPerDamageDealt>
-								</li>
-							</additionalHediffs>
-							<harmAllLayersUntilOutside>true</harmAllLayersUntilOutside>
-							<defaultDamage>800</defaultDamage>
-							<defaultStoppingPower>1.5</defaultStoppingPower>
-							<defaultArmorPenetration>1</defaultArmorPenetration>
-							<buildingDamageFactorImpassable>4</buildingDamageFactorImpassable>
-							<buildingDamageFactorPassable>2</buildingDamageFactorPassable>
-							<plantDamageFactor>2</plantDamageFactor>
-							<explosionHeatEnergyPerCell>20</explosionHeatEnergyPerCell>
-							<explosionCellFleck>Fleck_Vaporize</explosionCellFleck>
-							<armorCategory>Sharp</armorCategory>
-							<minDamageToFragment>15</minDamageToFragment>
-							<makesAnimalsFlee>true</makesAnimalsFlee>
-							<explosionColorCenter>(1, 1, 1)</explosionColorCenter>
-							<explosionColorEdge>(0.6, 0.5, 0.4)</explosionColorEdge>
-							<soundExplosion>Explosion_Vaporize</soundExplosion>
-							<expolosionPropagationSpeed>0.3</expolosionPropagationSpeed>
-							<hasForcefulImpact>true</hasForcefulImpact>
-							<corpseDamageFactor>0.1</corpseDamageFactor>
-						</DamageDef>
-
-					</value>
-				</li>
-
-				<!-- === Growth Ray Ammo === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- === Ammo Set === -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_GrowthRay</defName>
-							<label>Growth Ray Power Cell</label>
-							<ammoTypes>
-								<Ammo_LaserChargePack>Projectile_GrowthRay</Ammo_LaserChargePack>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- === Projectile === -->
-						<ThingDef ParentName="BaseBulletCE">
-							<defName>Projectile_GrowthRay</defName>
-							<label>growth ray</label>
-							<graphicData>
-								<texPath>Things/Projectile/ChargeLanceShot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-								<drawSize>1.5</drawSize>
-								<color>(255, 180, 255)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>GrowthRay</damageDef>
-								<damageAmountBase>1</damageAmountBase><!-- -2 -->
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt><!-- -0.5 -->
-								<armorPenetrationSharp>0.5</armorPenetrationSharp><!-- -0.2 -->
-								<speed>70</speed>
-							</projectile>
-						</ThingDef>
-
-						<!-- === Damage Def === -->
-						<DamageDef>
-							<defName>GrowthRay</defName>
-							<label>vaporize</label>
-							<workerClass>DamageWorker_Vaporize</workerClass>
-							<externalViolence>true</externalViolence>
-							<deathMessage>{0} has been vaporized by extreme heat.</deathMessage>
-							<hediff>Burn</hediff>
-							<additionalHediffs>
-								<li>
-									<hediff>BS_Affliction_GrowthRay</hediff>
-									<severityPerDamageDealt>0.12</severityPerDamageDealt>
-								</li>
-							</additionalHediffs>
-							<harmAllLayersUntilOutside>true</harmAllLayersUntilOutside>
-							<defaultDamage>800</defaultDamage>
-							<defaultStoppingPower>1.5</defaultStoppingPower>
-							<defaultArmorPenetration>1</defaultArmorPenetration>
-							<buildingDamageFactorImpassable>4</buildingDamageFactorImpassable>
-							<buildingDamageFactorPassable>2</buildingDamageFactorPassable>
-							<plantDamageFactor>2</plantDamageFactor>
-							<explosionHeatEnergyPerCell>20</explosionHeatEnergyPerCell>
-							<explosionCellFleck>Fleck_Vaporize</explosionCellFleck>
-							<armorCategory>Sharp</armorCategory>
-							<minDamageToFragment>15</minDamageToFragment>
-							<makesAnimalsFlee>true</makesAnimalsFlee>
-							<explosionColorCenter>(1, 1, 1)</explosionColorCenter>
-							<explosionColorEdge>(0.6, 0.5, 0.4)</explosionColorEdge>
-							<soundExplosion>Explosion_Vaporize</soundExplosion>
-							<expolosionPropagationSpeed>0.3</expolosionPropagationSpeed>
-							<hasForcefulImpact>true</hasForcefulImpact>
-							<corpseDamageFactor>0.1</corpseDamageFactor>
-						</DamageDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Big and Small/Big and Small Genes/Weapons/ThingDef_Building_Security.xml b/Patches/Big and Small/Big and Small Genes/Weapons/ThingDef_Building_Security.xml
deleted file mode 100644
index de2994b3d3..0000000000
--- a/Patches/Big and Small/Big and Small Genes/Weapons/ThingDef_Building_Security.xml	
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Big and Small Genes</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Shrink Turret === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMAD_ShrinkTurret"]/description</xpath>
-					<value>
-						<description>A portable automatic turret with shrink ray attached. Its dumb AI brain can't be directly controlled, so beware of friendly fire.</description>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMAD_ShrinkTurret"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMAD_ShrinkTurret"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.25</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMAD_ShrinkTurret"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMAD_ShrinkTurret"]/statBases/Mass</xpath>
-					<value>
-						<Mass>25</Mass>
-						<Bulk>15</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMAD_ShrinkTurret"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>150</Steel>
-							<Plasteel>30</Plasteel>
-							<ComponentIndustrial>7</ComponentIndustrial>
-							<ComponentSpacer>4</ComponentSpacer>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="BMAD_ShrinkTurret"]/comps/li[@Class="CompProperties_Refuelable"]</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMAD_ShrinkTurret"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMAD_ShrinkTurret"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>1.0</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BMAD_Gun_ShrinkTurret</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>0.69</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.91</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_ShrinkRay</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>19</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>3</burstShotCount>
-						<soundCast>Resurrect_Resolve</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_ShrinkRay</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!-- === Growth Turret === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMAD_GrowthTurret"]/description</xpath>
-					<value>
-						<description>A portable automatic turret with growth ray attached. Its dumb AI brain can't be directly controlled, so beware of friendly fire.</description>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMAD_Gun_GrowthTurret"]/verbs</xpath>
-					<value>
-						<verbs Inherit="False">
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>0.91</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Projectile_GrowthRay</defaultProjectile>
-								<warmupTime>1.3</warmupTime>
-								<range>19</range>
-								<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-								<burstShotCount>3</burstShotCount>
-								<soundCast>Resurrect_Resolve</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<recoilPattern>Mounted</recoilPattern>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMAD_Gun_GrowthTurret"]</xpath>
-					<value>
-						<comps Inherit="False">
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>50</magazineSize>
-								<reloadTime>7.8</reloadTime>
-								<ammoSet>AmmoSet_GrowthRay</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-								<noSnapshot>true</noSnapshot>
-								<noSingleShot>true</noSingleShot>
-							</li>
-							<li Class="CompProperties_Forbiddable" />
-							<li>
-								<compClass>CompEquippable</compClass>
-							</li>
-							<li Class="CompProperties_Styleable" />
-
-						</comps>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Big and Small/Big and Small Genes/Weapons/ThingDef_MeleeWeapons.xml b/Patches/Big and Small/Big and Small Genes/Weapons/ThingDef_MeleeWeapons.xml
deleted file mode 100644
index c32a3d6e35..0000000000
--- a/Patches/Big and Small/Big and Small Genes/Weapons/ThingDef_MeleeWeapons.xml	
+++ /dev/null
@@ -1,426 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Big and Small Genes</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== Ogre Club ====== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BS_OgreClub"]/statBases</xpath>
-					<value>
-						<Bulk>35</Bulk>
-						<MeleeCounterParryBonus>0.04</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BS_OgreClub"]/statBases/WorkToMake</xpath>
-					<value>
-						<WorkToMake>2700</WorkToMake>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BS_OgreClub"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.5</MeleeCritChance>
-							<MeleeParryChance>0.04</MeleeParryChance>
-							<MeleeDodgeChance>0.6</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BS_OgreClub"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BS_OgreClub"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>2.95</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Demolish</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>3.06</cooldownTime>
-								<chanceFactor>0.90</chanceFactor>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ====== Giant Hammer ====== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BS_GiantHammer"]/statBases</xpath>
-					<value>
-						<Bulk>35</Bulk>
-						<MeleeCounterParryBonus>0.04</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BS_GiantHammer"]/statBases/WorkToMake</xpath>
-					<value>
-						<WorkToMake>3600</WorkToMake>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BS_GiantHammer"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>2</MeleeCritChance>
-						<MeleeParryChance>0.04</MeleeParryChance>
-						<MeleeDodgeChance>0.4</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BS_GiantHammer"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BS_GiantHammer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>2.95</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Demolish</li>
-								</capacities>
-								<power>34</power>
-								<cooldownTime>3.23</cooldownTime>
-								<chanceFactor>0.90</chanceFactor>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BS_GiantHammer"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>140</costStuffCount>
-					</value>
-				</li>
-
-				<!-- ====== Jotun War Hammer ====== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BS_JotunHammer"]/statBases</xpath>
-					<value>
-						<Bulk>50</Bulk>
-						<MeleeCounterParryBonus>0.18</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BS_JotunHammer"]/statBases/WorkToMake</xpath>
-					<value>
-						<WorkToMake>27000</WorkToMake>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BS_JotunHammer"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>3</MeleeCritChance>
-							<MeleeParryChance>0.13</MeleeParryChance>
-							<MeleeDodgeChance>0.8</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BS_JotunHammer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>2.95</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Demolish</li>
-								</capacities>
-								<power>51</power>
-								<cooldownTime>3.92</cooldownTime>
-								<chanceFactor>0.90</chanceFactor>
-								<armorPenetrationBlunt>81</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ====== Jotun Sword ====== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BS_JotunSword"]/statBases</xpath>
-					<value>
-						<Bulk>30</Bulk>
-						<MeleeCounterParryBonus>0.08</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BS_JotunSword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.02</MeleeCritChance>
-							<MeleeParryChance>0.08</MeleeParryChance>
-							<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BS_JotunSword"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BS_JotunSword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2.52</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>44</power>
-								<cooldownTime>2.52</cooldownTime>
-								<chanceFactor>0.50</chanceFactor>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<armorPenetrationSharp>3.34</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>3.03</cooldownTime>
-								<chanceFactor>0.45</chanceFactor>
-								<armorPenetrationBlunt>9</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.38</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ====== Surtr Sword ====== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BS_SurtrSword"]/statBases</xpath>
-					<value>
-						<Bulk>30</Bulk>
-						<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BS_SurtrSword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1</MeleeCritChance>
-							<MeleeParryChance>0.4</MeleeParryChance>
-							<MeleeDodgeChance>0.27</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BS_SurtrSword"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BS_SurtrSword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>2.79</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>76</power>
-								<cooldownTime>2.33</cooldownTime>
-								<chanceFactor>0.50</chanceFactor>
-								<armorPenetrationBlunt>8.64</armorPenetrationBlunt>
-								<armorPenetrationSharp>168.69</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-								<extraMeleeDamages>
-									<li>
-										<def>Flame</def>
-										<amount>20</amount>
-										<chance>0.75</chance>
-									</li>
-								</extraMeleeDamages>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>87</power>
-								<cooldownTime>2.07</cooldownTime>
-								<chanceFactor>0.45</chanceFactor>
-								<armorPenetrationBlunt>19.44</armorPenetrationBlunt>
-								<armorPenetrationSharp>121.5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-								<extraMeleeDamages>
-									<li>
-										<def>Flame</def>
-										<amount>20</amount>
-										<chance>0.75</chance>
-									</li>
-								</extraMeleeDamages>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ====== Skrymir Hammer ====== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BS_SkrymirHammer"]/statBases</xpath>
-					<value>
-						<Bulk>60</Bulk>
-						<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BS_SkrymirHammer"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1</MeleeCritChance>
-							<MeleeParryChance>0.45</MeleeParryChance>
-							<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BS_SkrymirHammer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>3.09</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Demolish</li>
-								</capacities>
-								<power>70</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Frostbite</def>
-										<amount>9</amount>
-										<chance>0.75</chance>
-									</li>
-									<li>
-										<def>EMP</def>
-										<amount>9</amount>
-									</li>
-									<li>
-										<def>Stun</def>
-										<amount>9</amount>
-										<chance>0.25</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>3.21</cooldownTime>
-								<chanceFactor>0.90</chanceFactor>
-								<armorPenetrationBlunt>200</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Big and Small/Big and Small Genes/Weapons/ThingDef_Ranged.xml b/Patches/Big and Small/Big and Small Genes/Weapons/ThingDef_Ranged.xml
deleted file mode 100644
index dcd7257a1d..0000000000
--- a/Patches/Big and Small/Big and Small Genes/Weapons/ThingDef_Ranged.xml	
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Big and Small Genes</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BS_JotunRifle"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.70</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>4.03</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>2.44</cooldownTime>
-								<armorPenetrationBlunt>16</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BS_GiantMinigun" or defName="BS_JotunRocketLauncher"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>2.44</cooldownTime>
-								<armorPenetrationBlunt>16</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Jotun WarMech Rifle -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BS_JotunRifle</defName>
-					<statBases>
-						<Bulk>45</Bulk>
-						<Mass>35</Mass>
-						<SwayFactor>2</SwayFactor>
-						<ShotSpread>0.05</ShotSpread>
-						<SightsEfficiency>2</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>200</Steel>
-						<ComponentIndustrial>10</ComponentIndustrial>
-						<Chemfuel>30</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_25x137mmNATO_AP</defaultProjectile>
-						<warmupTime>3.2</warmupTime>
-						<range>100</range>
-						<soundCast>Shot_TurretSniper</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>20</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>2</reloadTime>
-						<ammoSet>AmmoSet_25x137mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>RangedHeavyGiant</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BS_JotunRifle"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.00,1.00</DrawSize>
-							<DrawOffset>0.0,-0.4</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<!-- Jotun Minigun -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BS_GiantMinigun</defName>
-					<statBases>
-						<Bulk>60</Bulk>
-						<Mass>40</Mass>
-						<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.9</SightsEfficiency>
-						<ShotSpread>0.3</ShotSpread>
-						<SwayFactor>2.32</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_470NitroExpress_FMJ</defaultProjectile>
-						<warmupTime>2</warmupTime>
-						<burstShotCount>60</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<range>57</range>
-						<soundCast>BS_GiantMinigunShot</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>20</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>300</magazineSize>
-						<reloadTime>10</reloadTime>
-						<ammoSet>AmmoSet_470NitroExpress</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>true</aiUseBurstMode>
-						<aimedBurstShotCount>30</aimedBurstShotCount>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>RangedHeavyGiant</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BS_GiantMinigun"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.00,1.00</DrawSize>
-							<DrawOffset>0.0,-0.4</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<!-- Jotun Minigun -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BS_JotunRocketLauncher</defName>
-					<statBases>
-						<Bulk>30</Bulk>
-						<Mass>40</Mass>
-						<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.9</SightsEfficiency>
-						<ShotSpread>2</ShotSpread>
-						<SwayFactor>2.32</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_RPG7Grenade_HEAT</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<burstShotCount>4</burstShotCount>
-						<ticksBetweenBurstShots>20</ticksBetweenBurstShots>
-						<range>30</range>
-						<minRange>8</minRange>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<soundCast>BS_JotunRocketLauncher_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>20</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>4</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>2</reloadTime>
-						<ammoSet>AmmoSet_RPG7Grenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>true</aiUseBurstMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>RangedHeavyGiant</li>
-						<li>CE_AI_AOE</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BS_JotunRocketLauncher"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.00,1.00</DrawSize>
-							<DrawOffset>0.0,-0.4</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BS_JotunRocketLauncher"]/recipeMaker/researchPrerequisite</xpath>
-					<value>
-						<researchPrerequisite>CE_AdvancedLaunchers</researchPrerequisite>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Big and Small/Big and Small Genes/Weapons/ThingDef_RangedNeolithic.xml b/Patches/Big and Small/Big and Small Genes/Weapons/ThingDef_RangedNeolithic.xml
deleted file mode 100644
index c6586b8c5f..0000000000
--- a/Patches/Big and Small/Big and Small Genes/Weapons/ThingDef_RangedNeolithic.xml	
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Big and Small Genes</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== Giant Javelin ====== -->
-
-				<!-- == Weapon == -->
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="BS_JotunJavelin"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>BaseWeapon</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="BS_JotunJavelin"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BS_JotunJavelin"]</xpath>
-					<value>
-						<stackLimit>5</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-						<techLevel>Medieval</techLevel>
-						<tradeNeverStack>true</tradeNeverStack>
-						<burnableByRecipe>true</burnableByRecipe>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="BS_JotunJavelin"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BS_JotunJavelin</defName>
-					<statBases>
-						<MarketValue>50</MarketValue>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<Bulk>5</Bulk>
-						<Mass>5</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<MeleeCounterParryBonus>0.36</MeleeCounterParryBonus>
-					</statBases>
-					<Properties>
-						<label>Throw huge javelin</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Projectile_GiantThrown</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>20</range>
-						<soundCast>BS_JotunJavelinThrow_Sound</soundCast>
-						<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-					</Properties>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BS_JotunJavelin"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.17</MeleeCritChance>
-							<MeleeDodgeChance>0.6</MeleeDodgeChance>
-							<MeleeParryChance>0.5</MeleeParryChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BS_JotunJavelin"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>2.95</cooldownTime>
-								<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>37</power>
-								<cooldownTime>3.4</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>9</armorPenetrationBlunt>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Big Rock Chuck -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseWeaponAndAmmoNeolithic">
-							<defName>BS_OgreThrowinRock</defName>
-							<label>Throwing Chunks</label>
-							<description>These large rocks have been crudely chiseled for throwing at enemies.\n\nCan be wielded by giant, herculean, or warcasket pawns.</description>
-							<graphicData>
-								<texPath>Item/BS_ThrowableChunk_projectile</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>1.4</drawSize>
-							</graphicData>
-							<soundInteract>Interact_BeatFire</soundInteract>
-							<relicChance>0</relicChance>
-							<statBases>
-								<MarketValue>50</MarketValue>
-								<SightsEfficiency>1.0</SightsEfficiency>
-								<ShotSpread>1.5</ShotSpread>
-								<SwayFactor>2.5</SwayFactor>
-								<Bulk>5</Bulk>
-								<Mass>20</Mass>
-								<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
-							</statBases>
-							<equippedAngleOffset>30</equippedAngleOffset>
-							<stackLimit>25</stackLimit>
-							<weaponClasses Inherit="False">
-								<li>BS_GiantWeapon</li>
-							</weaponClasses>
-							<weaponTags Inherit="False">
-								<li>RangedMedievalGiant</li>
-							</weaponTags>
-							<tradeability>All</tradeability>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Rock_GiantThrown</defaultProjectile>
-									<soundCast>BS_JotunJavelinThrow_Sound</soundCast>
-									<warmupTime>3</warmupTime>
-									<range>12</range>
-									<!--<soundCast>Interact_BeatFire</soundCast>-->
-								</li>
-							</verbs>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>rock</label>
-									<capacities>
-										<li>Demolish</li>
-									</capacities>
-									<power>13.4</power>
-									<cooldownTime>2.95</cooldownTime>
-									<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								</li>
-							</tools>
-							<ammoClass>Javelin</ammoClass>
-						</ThingDef>
-
-						<ThingDef ParentName="BasePilumProjectile">
-							<defName>Rock_GiantThrown</defName>
-							<label>rock (thrown)</label>
-							<graphicData>
-								<texPath>Item/BS_ThrowableChunk_projectile</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>1.4</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Demolish</damageDef>
-								<damageAmountBase>30</damageAmountBase>
-								<speed>25</speed>
-								<armorPenetrationBlunt>60</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<arcHeightFactor>1.5</arcHeightFactor>
-								<explosionRadius>0.9</explosionRadius>
-								<soundExplode>BuildingDestroyed_Stone_Medium</soundExplode>
-								<preExplosionSpawnThingDef>Filth_RubbleRock</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="BS_OgreThrowinRockRecipe"]/workAmount</xpath>
-					<value>
-						<workAmount>1600</workAmount>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Big and Small/Big and Small Genes/Weapons/ThingDef_Royalty_Weapons.xml b/Patches/Big and Small/Big and Small Genes/Weapons/ThingDef_Royalty_Weapons.xml
deleted file mode 100644
index 910c04444d..0000000000
--- a/Patches/Big and Small/Big and Small Genes/Weapons/ThingDef_Royalty_Weapons.xml	
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Big and Small Genes</li>
-		</mods>
-		
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Royalty</li>
-			</mods>
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<!-- ====== Persona Surtr Sword ====== -->
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="BS_SurtrSword_Persona"]/statBases</xpath>
-						<value>
-							<Bulk>30</Bulk>
-							<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="BS_SurtrSword_Persona"]/weaponTags</xpath>
-						<value>
-							<li>CE_OneHandedWeapon</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="BS_SurtrSword_Persona"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>handle</label>
-									<capacities>
-										<li>Poke</li>
-									</capacities>
-									<power>16</power>
-									<cooldownTime>2.51</cooldownTime>
-									<chanceFactor>0.05</chanceFactor>
-									<armorPenetrationBlunt>7.26</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>point</label>
-									<capacities>
-										<li>Stab</li>
-									</capacities>
-									<power>76</power>
-									<cooldownTime>2.10</cooldownTime>
-									<chanceFactor>0.50</chanceFactor>
-									<armorPenetrationBlunt>10.45</armorPenetrationBlunt>
-									<armorPenetrationSharp>203.28</armorPenetrationSharp>
-									<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									<extraMeleeDamages>
-										<li>
-											<def>Flame</def>
-											<amount>20</amount>
-											<chance>0.75</chance>
-										</li>
-									</extraMeleeDamages>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>edge</label>
-									<capacities>
-										<li>Cut</li>
-									</capacities>
-									<power>87</power>
-									<cooldownTime>1.86</cooldownTime>
-									<chanceFactor>0.45</chanceFactor>
-									<armorPenetrationBlunt>23.52</armorPenetrationBlunt>
-									<armorPenetrationSharp>147.01</armorPenetrationSharp>
-									<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									<extraMeleeDamages>
-										<li>
-											<def>Flame</def>
-											<amount>20</amount>
-											<chance>0.75</chance>
-										</li>
-									</extraMeleeDamages>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<!-- ====== Persona Skrymir Hammer ====== -->
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="BS_SkrymirHammer_Persona"]/statBases</xpath>
-						<value>
-							<Bulk>60</Bulk>
-							<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="BS_SkrymirHammer_Persona"]</xpath>
-						<value>
-							<equippedStatOffsets>
-								<MeleeCritChance>1</MeleeCritChance>
-								<MeleeParryChance>0.45</MeleeParryChance>
-								<MeleeDodgeChance>0.3</MeleeDodgeChance>
-							</equippedStatOffsets>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="BS_SkrymirHammer_Persona"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>handle</label>
-									<capacities>
-										<li>Poke</li>
-									</capacities>
-									<power>22</power>
-									<cooldownTime>2.78</cooldownTime>
-									<chanceFactor>0.10</chanceFactor>
-									<armorPenetrationBlunt>18.15</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Demolish</li>
-									</capacities>
-									<power>77</power>
-									<extraMeleeDamages>
-										<li>
-											<def>Frostbite</def>
-											<amount>9</amount>
-											<chance>0.75</chance>
-										</li>
-										<li>
-											<def>EMP</def>
-											<amount>9</amount>
-										</li>
-										<li>
-											<def>Stun</def>
-											<amount>9</amount>
-											<chance>0.25</chance>
-										</li>
-									</extraMeleeDamages>
-									<cooldownTime>2.59</cooldownTime>
-									<chanceFactor>0.90</chanceFactor>
-									<armorPenetrationBlunt>242</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Big and Small/Big and Small Genes/Weapons/ThingDef_Shrink.xml b/Patches/Big and Small/Big and Small Genes/Weapons/ThingDef_Shrink.xml
deleted file mode 100644
index 51ce50b094..0000000000
--- a/Patches/Big and Small/Big and Small Genes/Weapons/ThingDef_Shrink.xml	
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Big and Small Genes</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMad_ShrinkRay" or defName="BMad_GrowthRay"]/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>
-				</li>
-
-				<!-- Mod Extensions -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMad_ShrinkRay" or defName="BMad_GrowthRay"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.16,1.16</DrawSize>
-							<DrawOffset>0.08,0.0</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Shrink Ray === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BMad_ShrinkRay</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>10</Bulk>
-						<Mass>8</Mass>
-						<WorkToMake>45000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>50</Steel>
-						<Plasteel>30</Plasteel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-						<ComponentSpacer>3</ComponentSpacer>
-					</costList>
-					<Properties>
-						<recoilAmount>1.50</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_ShrinkRay</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>19</range>
-						<soundCast>Resurrect_Resolve</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_ShrinkRay</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- === Growth Ray === -->
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="BMad_GrowthRay"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>BaseHumanMakeableGun</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMad_GrowthRay"]</xpath>
-					<value>
-						<recipeMaker>
-							<skillRequirements>
-								<Crafting>7</Crafting>
-							</skillRequirements>
-							<displayPriority>400</displayPriority>
-							<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-							<researchPrerequisites>
-								<li>GunTurrets</li>
-								<li>BS_MadScienceField</li>
-							</researchPrerequisites>
-						</recipeMaker>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BMad_GrowthRay</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>10</Bulk>
-						<Mass>8</Mass>
-						<WorkToMake>45000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>50</Steel>
-						<Plasteel>30</Plasteel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-						<ComponentSpacer>3</ComponentSpacer>
-					</costList>
-					<Properties>
-						<recoilAmount>1.50</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_GrowthRay</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>19</range>
-						<soundCast>Resurrect_Resolve</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_GrowthRay</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Big and Small/Big and Small Races/ThingDef_Armor.xml b/Patches/Big and Small/Big and Small Races/ThingDef_Armor.xml
deleted file mode 100644
index 831292fd9d..0000000000
--- a/Patches/Big and Small/Big and Small Races/ThingDef_Armor.xml	
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Big and Small Races</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Red Bandana-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BS_Nisse_Cap"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BS_Nisse_Cap"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Big and Small/Big and Small Weapons/BS_Medieval_Weapons.xml b/Patches/Big and Small/Big and Small Weapons/BS_Medieval_Weapons.xml
deleted file mode 100644
index 1b3ded632d..0000000000
--- a/Patches/Big and Small/Big and Small Weapons/BS_Medieval_Weapons.xml	
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Big and Small - Weapons</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== Giant Medieval Hammer ====== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BS_GiantMedievalHammer"]/statBases</xpath>
-					<value>
-						<Bulk>35</Bulk>
-						<MeleeCounterParryBonus>0.04</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BS_GiantMedievalHammer"]/statBases/WorkToMake</xpath>
-					<value>
-						<WorkToMake>2700</WorkToMake>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BS_GiantMedievalHammer"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>2</MeleeCritChance>
-						<MeleeParryChance>0.04</MeleeParryChance>
-						<MeleeDodgeChance>0.4</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BS_GiantMedievalHammer"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BS_GiantMedievalHammer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>2.95</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Demolish</li>
-								</capacities>
-								<power>34</power>
-								<cooldownTime>3.23</cooldownTime>
-								<chanceFactor>0.90</chanceFactor>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BS_GiantScythe"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>160</costStuffCount>
-					</value>
-				</li>
-
-				<!-- ====== Giant Scythe ====== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BS_GiantScythe"]/statBases</xpath>
-					<value>
-						<Bulk>50</Bulk>
-						<MeleeCounterParryBonus>1.85</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BS_GiantScythe"]/statBases/WorkToMake</xpath>
-					<value>
-						<WorkToMake>3600</WorkToMake>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BS_GiantScythe"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.02</MeleeCritChance>
-						<MeleeParryChance>0.18</MeleeParryChance>
-						<MeleeDodgeChance>2.5</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BS_GiantScythe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2.95</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>5.65</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>37</power>
-								<cooldownTime>4.2</cooldownTime>
-								<armorPenetrationBlunt>12.96</armorPenetrationBlunt>
-								<armorPenetrationSharp>25.92</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>45</power>
-								<cooldownTime>10.1</cooldownTime>
-								<armorPenetrationBlunt>12.1</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.69</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ====== Oni Club ====== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BS_OniClub"]/statBases</xpath>
-					<value>
-						<Bulk>40</Bulk>
-						<MeleeCounterParryBonus>0.13</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BS_OniClub"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>2</MeleeCritChance>
-							<MeleeParryChance>0.1</MeleeParryChance>
-							<MeleeDodgeChance>0.6</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BS_OniClub"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>3.09</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>9</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Demolish</li>
-								</capacities>
-								<power>60</power>
-								<cooldownTime>4.94</cooldownTime>
-								<chanceFactor>0.90</chanceFactor>
-								<armorPenetrationBlunt>45</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Big and Small/Big and Small Weapons/BS_Modern.xml b/Patches/Big and Small/Big and Small Weapons/BS_Modern.xml
deleted file mode 100644
index 7cfb50fbe5..0000000000
--- a/Patches/Big and Small/Big and Small Weapons/BS_Modern.xml	
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Big and Small - Weapons</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BS_GiantMusket"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>2.02</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>11.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>2.20</cooldownTime>
-								<armorPenetrationBlunt>9</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>2.02</cooldownTime>
-								<armorPenetrationBlunt>11.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BS_GiantMusket</defName>
-					<statBases>
-						<Mass>10</Mass>
-						<RangedWeapon_Cooldown>0.93</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.9</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.68</SwayFactor>
-						<Bulk>30</Bulk>
-						<WorkToMake>36000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>150</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_MiniCannonBall_Round</defaultProjectile>
-						<warmupTime>1.26</warmupTime>
-						<range>55</range>
-						<soundCast>BS_GiantMusketShot</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>13</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>7.11</reloadTime>
-						<ammoSet>AmmoSet_MiniCannonBall</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_AI_SR</li>
-					</weaponTags>
-					<researchPrerequisite>CE_Gunpowder</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BS_GiantMusket"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>2,2</DrawSize>
-							<DrawOffset>0.25,0.0</DrawOffset>
-							<CasingOffset>-0.1,0.1</CasingOffset>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Big and Small/Big and Small Weapons/BS_Neolithic.xml b/Patches/Big and Small/Big and Small Weapons/BS_Neolithic.xml
deleted file mode 100644
index 2da82b80d1..0000000000
--- a/Patches/Big and Small/Big and Small Weapons/BS_Neolithic.xml	
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Big and Small - Weapons</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== Giant Salvage Club ====== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BS_GiantSalvageClub"]/statBases</xpath>
-					<value>
-						<Bulk>35</Bulk>
-						<MeleeCounterParryBonus>0.04</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BS_GiantSalvageClub"]/statBases/WorkToMake</xpath>
-					<value>
-						<WorkToMake>2700</WorkToMake>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BS_GiantSalvageClub"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.5</MeleeCritChance>
-							<MeleeParryChance>0.04</MeleeParryChance>
-							<MeleeDodgeChance>0.6</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BS_GiantSalvageClub"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BS_GiantSalvageClub"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>2.95</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Demolish</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>3.23</cooldownTime>
-								<chanceFactor>0.90</chanceFactor>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ====== Giant Shard Knife ====== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BS_GiantShard"]/statBases</xpath>
-					<value>
-						<Bulk>50</Bulk>
-						<MeleeCounterParryBonus>1.85</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BS_GiantShard"]/statBases/WorkToMake</xpath>
-					<value>
-						<WorkToMake>3600</WorkToMake>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BS_GiantShard"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.02</MeleeCritChance>
-							<MeleeParryChance>0.18</MeleeParryChance>
-							<MeleeDodgeChance>2.5</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BS_GiantShard"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BS_GiantShard"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2.52</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>41</power>
-								<cooldownTime>2.89</cooldownTime>
-								<armorPenetrationBlunt>5.76</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.66</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>2.52</cooldownTime>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<armorPenetrationSharp>3.34</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Big and Small/Big and Small Weapons/BS_Royalty_Weapons.xml b/Patches/Big and Small/Big and Small Weapons/BS_Royalty_Weapons.xml
deleted file mode 100644
index 2b9481003a..0000000000
--- a/Patches/Big and Small/Big and Small Weapons/BS_Royalty_Weapons.xml	
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Big and Small - Weapons</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Royalty</li>
-			</mods>
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<!-- ====== Persona Giant Plasma Spear ====== -->
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="BS_VaeSuis_Persona"]/statBases</xpath>
-						<value>
-							<Bulk>45</Bulk>
-							<MeleeCounterParryBonus>0.28</MeleeCounterParryBonus>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="BS_VaeSuis_Persona"]</xpath>
-						<value>
-							<equippedStatOffsets>
-								<MeleeCritChance>0.03</MeleeCritChance>
-								<MeleeParryChance>0.24</MeleeParryChance>
-								<MeleeDodgeChance>0.9</MeleeDodgeChance>
-							</equippedStatOffsets>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="BS_VaeSuis_Persona"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>handle</label>
-									<capacities>
-										<li>Poke</li>
-									</capacities>
-									<power>18</power>
-									<cooldownTime>2.28</cooldownTime>
-									<chanceFactor>0.10</chanceFactor>
-									<armorPenetrationBlunt>7.97</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Cut</li>
-									</capacities>
-									<power>74</power>
-									<cooldownTime>1.926</cooldownTime>
-									<armorPenetrationBlunt>46</armorPenetrationBlunt>
-									<armorPenetrationSharp>239.5</armorPenetrationSharp>
-									<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Stab</li>
-									</capacities>
-									<power>14</power>
-									<cooldownTime>1.43</cooldownTime>
-									<armorPenetrationBlunt>20.43</armorPenetrationBlunt>
-									<armorPenetrationSharp>319</armorPenetrationSharp>
-									<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<!-- ====== Persona Skarstind ====== -->
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="BS_Skarstind_Persona"]/statBases</xpath>
-						<value>
-							<Bulk>50</Bulk>
-							<MeleeCounterParryBonus>0.13</MeleeCounterParryBonus>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="BS_Skarstind_Persona"]</xpath>
-						<value>
-							<equippedStatOffsets>
-								<MeleeCritChance>0.03</MeleeCritChance>
-								<MeleeParryChance>0.01</MeleeParryChance>
-								<MeleeDodgeChance>0.83</MeleeDodgeChance>
-							</equippedStatOffsets>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="BS_Skarstind_Persona"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>handle</label>
-									<capacities>
-										<li>Poke</li>
-									</capacities>
-									<power>16</power>
-									<cooldownTime>2.51</cooldownTime>
-									<chanceFactor>0.15</chanceFactor>
-									<armorPenetrationBlunt>6.6</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Cut</li>
-									</capacities>
-									<power>32</power>
-									<cooldownTime>1.97</cooldownTime>
-									<armorPenetrationBlunt>42.24</armorPenetrationBlunt>
-									<armorPenetrationSharp>824.68</armorPenetrationSharp>
-									<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Big and Small/Big and Small Weapons/BS_Ultratech.xml b/Patches/Big and Small/Big and Small Weapons/BS_Ultratech.xml
deleted file mode 100644
index f36ad78076..0000000000
--- a/Patches/Big and Small/Big and Small Weapons/BS_Ultratech.xml	
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Big and Small - Weapons</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== Giant Plasma Spear ====== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BS_VaeSuis"]/statBases</xpath>
-					<value>
-						<Bulk>45</Bulk>
-						<MeleeCounterParryBonus>0.28</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BS_VaeSuis"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.03</MeleeCritChance>
-							<MeleeParryChance>0.24</MeleeParryChance>
-							<MeleeDodgeChance>0.9</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BS_VaeSuis"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2.54</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>7.26</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>74</power>
-								<cooldownTime>2.14</cooldownTime>
-								<armorPenetrationBlunt>41.82</armorPenetrationBlunt>
-								<armorPenetrationSharp>217.8</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.59</cooldownTime>
-								<armorPenetrationBlunt>18.58</armorPenetrationBlunt>
-								<armorPenetrationSharp>290</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ====== Skarstind ====== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BS_Skarstind"]/statBases</xpath>
-					<value>
-						<Bulk>50</Bulk>
-						<MeleeCounterParryBonus>0.13</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BS_Skarstind"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.03</MeleeCritChance>
-							<MeleeParryChance>0.01</MeleeParryChance>
-							<MeleeDodgeChance>0.83</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BS_Skarstind"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>2.79</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>32</power>
-								<cooldownTime>2.19</cooldownTime>
-								<armorPenetrationBlunt>38.4</armorPenetrationBlunt>
-								<armorPenetrationSharp>749.71</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/BodyDefs/Bodies_CE.xml b/Patches/Biomes Caverns/BodyDefs/Bodies_CE.xml
deleted file mode 100644
index efb0ec3b6e..0000000000
--- a/Patches/Biomes Caverns/BodyDefs/Bodies_CE.xml	
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== Moff ====== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="BMT_MothLike"]//*[
-						def="Shell" or
-						def="Pronotum" or
-						def="InsectHead" or
-						def="InsectMouth" or
-						def="InsectLeg"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- ====== beetle ====== -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="BeetleLikeWithHorn"]//*[
-						def="Shell" or
-						def="Elytra" or
-						def="Pronotum" or
-						def="InsectNostril" or
-						def="Antenna" or
-						def="Eye" or
-						def="InsectLeg"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="BeetleLikeWithHorn"]//*[
-						def="InsectMouth" or
-						def="Eye"]/groups
-					</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="BeetleLikeWithHorn"]//*[
-						def="Body" or
-						def="Elytra" or
-						def="Pronotum" or
-						def="InsectHead" or
-						def="InsectNostril" or
-						def="Horn" or
-						def="InsectMouth" or
-						def="InsectLeg"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<!-- ====== freaky bipeds ====== -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="HunchedBipedWithTail"]//*[
-						def="Body" or
-						def="Tail" or
-						def="Neck" or
-						def="Leg"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="HunchedBipedWithTail"]//*[
-						def="Body" or
-						def="Tail" or
-						def="Neck" or
-						def="Head" or
-						def="Leg" or
-						def="Foot"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- ====== baffling bats ====== -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="BMT_BatBird"]//*[
-						def="Body" or
-						def="Shoulder" or
-						def="Neck" or
-						def="Nose" or
-						def="Ear" or
-						def="Eye" or
-						def="Leg"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="BMT_BatBird"]//*[
-						def="AnimalJaw" or
-						def="Nose" or
-						def="Eye"]/groups
-					</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="BMT_BatBird"]//*[
-						def="Body" or
-						def="Shoulder" or
-						def="Neck" or
-						def="Head" or
-						def="Ear" or
-						def="Nose" or
-						def="Paw" or
-						def="AnimalJaw" or
-						def="Leg"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/Plants/CE_ExplodingAngel.xml b/Patches/Biomes Caverns/Plants/CE_ExplodingAngel.xml
deleted file mode 100644
index 011ab5fecf..0000000000
--- a/Patches/Biomes Caverns/Plants/CE_ExplodingAngel.xml	
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_ExplodingAngel"]/comps</xpath>
-					<value>
-						<comps>
-							<li Class="BiomesCore.CompProperties_PlantProximityExplosive">
-								<explosiveRadius>3.9</explosiveRadius>
-								<explosiveDamageType>Bomb</explosiveDamageType>
-								<proxiGroup>Pawn</proxiGroup>
-								<minBodySize>0.9</minBodySize>
-								<proxiRadius>3.9</proxiRadius>
-								<growthProgress>0.6</growthProgress>
-								<growthAfterExplosion>0.4</growthAfterExplosion>
-								<explodeOnKilled>true</explodeOnKilled>
-								<chanceToStartFire>0.5</chanceToStartFire>
-								<detonateOnDamageTaken>
-									<li>Bullet</li>
-									<li>Arrow</li>
-									<li>ArrowHighVelocity</li>
-								</detonateOnDamageTaken>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Misc/Biomes_Cavern_CE_Patch_Resources_Leathers.xml b/Patches/Biomes Caverns/ThingDefs_Misc/Biomes_Cavern_CE_Patch_Resources_Leathers.xml
deleted file mode 100644
index 6d74d79aa7..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Misc/Biomes_Cavern_CE_Patch_Resources_Leathers.xml	
+++ /dev/null
@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Remove RoyalRhinohorn and Spiderhead as a weapon -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="BMT_RoyalRhinoHorn" or defName="BMT_CaveSpiderHead"]/tools</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="BMT_RoyalRhinoHorn" or defName="BMT_CaveSpiderHead"]/weaponClasses</xpath>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="BMT_RoyalRhinoHorn" or defName="BMT_CaveSpiderHead"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>ResourceBase</value>
-				</li>
-
-				<!-- MothSilk -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_CrimsonSilk"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.09</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_CrimsonSilk"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.015</StuffPower_Armor_Heat>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_CrimsonSilk"]/statBases</xpath>
-					<value>
-						<Bulk>0.025</Bulk>
-					</value>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="BMT_CrimsonSilk"]/stuffProps/categories</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="BMT_CrimsonSilk"]/stuffProps</xpath>
-						<value>
-							<categories>
-								<li>SoftArmor</li>
-							</categories>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="BMT_CrimsonSilk"]/stuffProps/categories</xpath>
-						<value>
-							<li>SoftArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_BatWool"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.04</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_BatWool"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.05</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_BatWool"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.06</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_SpiderSilk"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.5</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_SpiderSilk"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.12</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_SpiderSilk"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.06</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="BMT_SpiderSilk"]/stuffProps/categories</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="BMT_SpiderSilk"]/stuffProps</xpath>
-						<value>
-							<categories>
-								<li>SoftArmor</li>
-							</categories>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="BMT_SpiderSilk"]/stuffProps/categories</xpath>
-						<value>
-							<li>SoftArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_SpiderSilk"]/statBases</xpath>
-					<value>
-						<Bulk>0.025</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_WeakChitin"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.21</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_MediumChitin"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1.1</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_MediumChitin"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.5</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_WeakChitin"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.09</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_CrystalChitin"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1.7</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_CrystalChitin"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.9</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_RoyalChitin"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>2.2</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_RoyalChitin"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1.1</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_DeepChitin"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>2.0</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_DeepChitin"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.95</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Leather_Mushroom"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.03</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Leather_Mushroom"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.032</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_MoonlessSilk"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.25</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_MoonlessSilk"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.4</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Misc/CE_Chitin_armor.xml b/Patches/Biomes Caverns/ThingDefs_Misc/CE_Chitin_armor.xml
deleted file mode 100644
index 7cefc658a6..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Misc/CE_Chitin_armor.xml	
+++ /dev/null
@@ -1,256 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Plate Shoulderpads === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinLightArmor"]/statBases/Mass</xpath>
-					<value>
-						<Bulk>6.0</Bulk>
-						<WornBulk>3.0</WornBulk>
-						<Mass>3.0</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinLightArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="BMT_Apparel_ChitinMediumArmor" or
-						defName="BMT_Apparel_ChitinHeavyArmor" or
-						defName="BMT_Apparel_ChitinFullArmor"]/apparel/layers </xpath>
-					<value>
-						<layers>
-							<li>Shell</li>
-						</layers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinMediumArmor"]/statBases</xpath>
-					<value>
-						<Bulk>40</Bulk>
-						<WornBulk>8</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinMediumArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.0</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinHeavyArmor"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinHeavyArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3.0</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinHeavyArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinHeavyArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeDodgeChance>-0.15</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinHeavyArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinHeavyArmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinFullArmor"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>14</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinFullArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinFullArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinFullArmor"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>-0.2</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinFullArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinFullArmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinFullHelmet"
-						or defName="BMT_Apparel_ChitinBeetleHelmet"
-						or defName="BMT_Apparel_ChitinSpiderHelmet"]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinFullHelmet"
-						or defName="BMT_Apparel_ChitinBeetleHelmet"
-						or defName="BMT_Apparel_ChitinSpiderHelmet"] </xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Misc/CE_DamageDef.xml b/Patches/Biomes Caverns/ThingDefs_Misc/CE_DamageDef.xml
deleted file mode 100644
index ee080228a8..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Misc/CE_DamageDef.xml	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Buffing -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[defName="BMT_BloodSuck"]/additionalHediffs/li[hediff="BloodLoss"]/severityPerDamageDealt</xpath>
-					<value>
-						<severityPerDamageDealt>0.03</severityPerDamageDealt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Misc/Items_Resource_Stuff.xml b/Patches/Biomes Caverns/ThingDefs_Misc/Items_Resource_Stuff.xml
deleted file mode 100644
index a277be1d06..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Misc/Items_Resource_Stuff.xml	
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======== bulk  ======== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_AmbrosyxShroom"]/statBases</xpath>
-					<value>
-						<Bulk>0.05</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_GlowGoo"]/statBases</xpath>
-					<value>
-						<Bulk>0.05</Bulk>
-					</value>
-				</li>
-
-				<!-- ======== Red, Crystal and Mushroom Wood ======== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_MushroomLog"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.99</cooldownTime>
-								<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_MushroomLog"]</xpath>
-					<value>
-						<li Class="CombatExtended.StuffToughnessMultiplierExtensionCE">
-							<toughnessMultiplier>4</toughnessMultiplier>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_MushroomLog"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>1</MeleeParryChance>
-							<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_MushroomLog"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<Bulk>0.07</Bulk>
-						<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
-						<StuffPower_Armor_Sharp>0.1</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_MushroomLog"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.2</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_MushroomLog"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.025</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_AaroxisDendoria.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_AaroxisDendoria.xml
deleted file mode 100644
index 4abb45ac89..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_AaroxisDendoria.xml	
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Larvae -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_AaroxisDendoriaLarvae"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_AaroxisDendoriaLarvae"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.00</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_AaroxisDendoriaLarvae"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_AaroxisDendoriaPupa"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_AaroxisDendoriaPupa"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.00</MeleeDodgeChance>
-						<MeleeCritChance>0.00</MeleeCritChance>
-						<MeleeParryChance>0.00</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_AaroxisDendoriaPupa"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_AaroxisDendoria"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_AaroxisDendoria"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<!-- Atispec -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_AaroxisDendoria"]/tools</xpath>
-					<value>
-						<tools>
-
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_AcidSlug.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_AcidSlug.xml
deleted file mode 100644
index 3d7c894e70..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_AcidSlug.xml	
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_AcidSlug"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Serpentine</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_AcidSlug"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_AcidSlug"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_AcidSlug"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_AcidSlug"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>acidic bite</label>
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>38</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>30</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>40</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_Basilisk.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_Basilisk.xml
deleted file mode 100644
index 016e9e0a41..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_Basilisk.xml	
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_Basilisk"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_Basilisk"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-						<ArmorRating_Blunt>0.75</ArmorRating_Blunt>
-						<MeleeDodgeChance>0.01</MeleeDodgeChance>
-						<MeleeCritChance>0.20</MeleeCritChance>
-						<MeleeParryChance>0.28</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Basilisk"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<extraMeleeDamages>
-									<li>
-										<def>Stun</def>
-										<amount>6</amount>
-									</li>
-								</extraMeleeDamages>
-								<armorPenetrationSharp>5.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>6</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>5.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.1</chanceFactor>
-								<armorPenetrationBlunt>2.50</armorPenetrationBlunt>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>bite</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>2.6</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-
-								<extraMeleeDamages>
-									<li>
-										<def>Stun</def>
-										<amount>6</amount>
-									</li>
-								</extraMeleeDamages>
-								<armorPenetrationSharp>7.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_BlooddropMoth.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_BlooddropMoth.xml
deleted file mode 100644
index 4ae529afba..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_BlooddropMoth.xml	
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Larvae -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_BloodropLarvae"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_BloodropLarvae"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.00</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_BloodropLarvae"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandible</label>
-								<capacities>
-									<li>BMT_BloodSuck</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationSharp>1.0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>3.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_BloodropPupa"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_BloodropPupa"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.00</MeleeDodgeChance>
-						<MeleeCritChance>0.00</MeleeCritChance>
-						<MeleeParryChance>0.00</MeleeParryChance>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_BloodropMoth"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_BloodropMoth"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-						<ArmorRating_Blunt>0.2</ArmorRating_Blunt>
-						<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- Atispec -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_BloodropMoth"]/tools</xpath>
-					<value>
-						<tools>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>proboscis</label>
-								<capacities>
-									<li>BMT_BloodSuck</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>6.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_Boommoth.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_Boommoth.xml
deleted file mode 100644
index bc3c3d4f29..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_Boommoth.xml	
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Larvae -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_Boomapillar"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_Boomapillar"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ShearableRenameable">
-							<compClass>CombatExtended.CompShearableRenameable</compClass>
-							<growthLabel>Secretion level</growthLabel>
-							<shearIntervalDays>3</shearIntervalDays>
-							<woolAmount>2</woolAmount>
-							<woolDef>FSX</woolDef>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_Boomapillar"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.00</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Boomapillar"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_BoomPupa"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_BoomPupa"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.00</MeleeDodgeChance>
-						<MeleeCritChance>0.00</MeleeCritChance>
-						<MeleeParryChance>0.00</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_BoomMoth"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_BoomMoth"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_BoomMoth"]/tools</xpath>
-					<value>
-						<tools>
-
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_BovineBeetle.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_BovineBeetle.xml
deleted file mode 100644
index 40c070867d..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_BovineBeetle.xml	
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Larvae -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_BovineBeetleLarvae"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_BovineBeetleLarvae"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.00</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_BovineBeetleLarvae"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_BovineBeetlePupa"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_BovineBeetlePupa"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.00</MeleeDodgeChance>
-						<MeleeCritChance>0.00</MeleeCritChance>
-						<MeleeParryChance>0.00</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_BovineBeetlePupa"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_BovineBeetle"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_BovineBeetle"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.24</MeleeCritChance>
-						<MeleeParryChance>0.13</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_BovineBeetle"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Mandibles</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<chanceFactor>0.7</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>2.9</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_CaveCricket.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_CaveCricket.xml
deleted file mode 100644
index 1b9f3edef3..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_CaveCricket.xml	
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_CaveCricket"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_CaveCricket"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_CaveCricket"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_CaveCricket"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.18</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_CaveCricket"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.34</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_CaveSpider.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_CaveSpider.xml
deleted file mode 100644
index 4e00290fca..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_CaveSpider.xml	
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_CaveSpider"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_CaveSpider"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_CaveSpider"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>12.0</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_CaveSpider"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>7.0</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_CaveSpider"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>venom-fangs</label>
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>45</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left leg</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right leg</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_ChemSnail.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_ChemSnail.xml
deleted file mode 100644
index 3cae32261e..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_ChemSnail.xml	
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_ChemSnail"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Serpentine</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_ChemSnail"]/tradeTags</xpath>
-					<value>
-						<li>CE_AnimalBoom</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_ChemSnail"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ShearableRenameable">
-							<compClass>CombatExtended.CompShearableRenameable</compClass>
-							<growthLabel>Secretion level</growthLabel>
-							<shearIntervalDays>10</shearIntervalDays>
-							<woolAmount>6</woolAmount>
-							<woolDef>FSX</woolDef>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_ChemSnail"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-						<ArmorRating_Blunt>4</ArmorRating_Blunt>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_ChemSnail"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.97</cooldownTime>
-								<chanceFactor>0.2</chanceFactor>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_CrystalCrab.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_CrystalCrab.xml
deleted file mode 100644
index c9a96a13f7..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_CrystalCrab.xml	
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="BMT_CrystalCrab_Base"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="BMT_CrystalCrab_Base"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.00</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.34</MeleeParryChance>
-						<ArmorRating_Blunt>30</ArmorRating_Blunt>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="BMT_CrystalCrab_Base"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claw</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>32</power>
-								<cooldownTime>3.1</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>6.55</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_CrystalFairyMole.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_CrystalFairyMole.xml
deleted file mode 100644
index 0e93e51cdb..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_CrystalFairyMole.xml	
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_CrystalFairyMole"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_CrystalFairyMole"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>8.15</ArmorRating_Sharp>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_CrystalFairyMole"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2.35</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>5</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2.35</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>5</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>13</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.54</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_CrystalMantis.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_CrystalMantis.xml
deleted file mode 100644
index 9cbe4a0a60..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_CrystalMantis.xml	
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_CrystalMantis"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_CrystalMantis"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_CrystalMantis"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_CrystalMantis"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						<MeleeCritChance>0.34</MeleeCritChance>
-						<MeleeParryChance>0.4</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_CrystalMantis"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>48</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>BMT_FrontLeftScythe</linkedBodyPartsGroup>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>48</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>BMT_FrontRightScythe</linkedBodyPartsGroup>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.750</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.750</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_CrystalbackBeetle.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_CrystalbackBeetle.xml
deleted file mode 100644
index 7c78ae5518..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_CrystalbackBeetle.xml	
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Larvae -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_CrystalBeetleLarvae"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_CrystalBeetleLarvae"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.00</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_CrystalBeetleLarvae"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>mandible</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationSharp>1.0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_CrystalBeetlePupa"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_CrystalBeetlePupa"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.00</MeleeDodgeChance>
-						<MeleeCritChance>0.00</MeleeCritChance>
-						<MeleeParryChance>0.00</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_CrystalBeetlePupa"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_CrystalBeetle"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_CrystalBeetle"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.24</MeleeCritChance>
-						<MeleeParryChance>0.13</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_CrystalBeetle"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>12</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_CrystalBeetle"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_CrystalBeetle"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Mandibles</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<chanceFactor>0.7</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2.9</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_Crystalope.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_Crystalope.xml
deleted file mode 100644
index 3ad81bf1a7..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_Crystalope.xml	
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_Crystalope"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_Crystalope"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						<MeleeCritChance>0.07</MeleeCritChance>
-						<MeleeParryChance>0.16</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Crystalope"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5.0</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.8</cooldownTime>
-								<chanceFactor>0.5</chanceFactor>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_DarkAxolotl.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_DarkAxolotl.xml
deleted file mode 100644
index b2df91e3af..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_DarkAxolotl.xml	
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Lizard Doggo ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_DarkAxolotl"]</xpath>
-
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_DarkAxolotl"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0.04</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_DarkAxolotl"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.8</cooldownTime>
-								<armorPenetrationBlunt>0.400</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.55</armorPenetrationSharp>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.8</cooldownTime>
-								<armorPenetrationBlunt>0.400</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.55</armorPenetrationSharp>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.63</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.10</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.20</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.230</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_FacetMoth.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_FacetMoth.xml
deleted file mode 100644
index ea2d95a2f6..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_FacetMoth.xml	
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Larvae -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_FacetMothLarvae"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_FacetMothLarvae"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.00</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-						<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
-						<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_FacetMothLarvae"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_FacetMothLarvae"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_FacetMothLarvae"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>proboscis</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationSharp>1.0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>3.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_FacetMothPupa"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_FacetMothPupa"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.00</MeleeDodgeChance>
-						<MeleeCritChance>0.00</MeleeCritChance>
-						<MeleeParryChance>0.00</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_FacetMothPupa"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_FacetMothPupa"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_FacetMoth"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_FacetMoth"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-						<ArmorRating_Blunt>0.3</ArmorRating_Blunt>
-						<ArmorRating_Sharp>2.2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_FacetMoth"]/tools</xpath>
-					<value>
-						<tools>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>proboscis</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>6.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_FireSalamander.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_FireSalamander.xml
deleted file mode 100644
index fe898fca94..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_FireSalamander.xml	
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_FireSalamander"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_FireSalamander"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>3.00</ArmorRating_Sharp>
-						<ArmorRating_Blunt>3.00</ArmorRating_Blunt>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_FireSalamander"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.35</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>11</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>5</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.35</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>11</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>5</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>13</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.54</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_FoundryBeetle.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_FoundryBeetle.xml
deleted file mode 100644
index 795b8881f3..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_FoundryBeetle.xml	
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Larvae -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_FoundryBeetleLarvae"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_FoundryBeetleLarvae"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.00</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_FoundryBeetleLarvae"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_FoundryBeetlePupa"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_FoundryBeetlePupa"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.00</MeleeDodgeChance>
-						<MeleeCritChance>0.00</MeleeCritChance>
-						<MeleeParryChance>0.00</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_FoundryBeetlePupa"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_FoundryBeetle"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_FoundryBeetle"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.24</MeleeCritChance>
-						<MeleeParryChance>0.13</MeleeParryChance>
-						<ArmorRating_Sharp>3.5</ArmorRating_Sharp>
-						<ArmorRating_Blunt>1.0</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_FoundryBeetle"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Head Claw</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<chanceFactor>0.7</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>2.9</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_FungalFerret.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_FungalFerret.xml
deleted file mode 100644
index 6b0f4139c9..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_FungalFerret.xml	
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_FungalFerret"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_FungalFerret"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.36</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_FungalFerret"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.9</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.18</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.9</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.18</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_FungalWeevil.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_FungalWeevil.xml
deleted file mode 100644
index d149605073..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_FungalWeevil.xml	
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_FungalWeevil"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_FungalWeevil"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_FungalWeevil"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.65</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_FungalWeevil"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.03</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_FungalWeevil"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.65</cooldownTime>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_GiantSlug.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_GiantSlug.xml
deleted file mode 100644
index 311c3ea921..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_GiantSlug.xml	
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_GiantSlug"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Serpentine</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_GiantSlug"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.00</MeleeDodgeChance>
-						<MeleeCritChance>0.5</MeleeCritChance>
-						<MeleeParryChance>0.16</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_GiantSlug"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>3.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>12</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_GiantSnail.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_GiantSnail.xml
deleted file mode 100644
index be3789d1ed..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_GiantSnail.xml	
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_GiantSnail"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Serpentine</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_GiantSnail"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_GiantSnail"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4.0</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_GiantSnail"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>12.0</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_GiantSnail"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.97</cooldownTime>
-								<chanceFactor>0.2</chanceFactor>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_GlowSlug.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_GlowSlug.xml
deleted file mode 100644
index 3040921fcb..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_GlowSlug.xml	
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_GlowSlug"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Serpentine</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_GlowSlug"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.00</MeleeDodgeChance>
-						<MeleeCritChance>0.5</MeleeCritChance>
-						<MeleeParryChance>0.16</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_GlowSlug"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>3.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>12</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_GlowSnail.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_GlowSnail.xml
deleted file mode 100644
index 7aebdcd417..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_GlowSnail.xml	
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_GlowSnail"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Serpentine</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_GlowSnail"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_GlowSnail"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2.0</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_GlowSnail"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8.0</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_GlowSnail"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.97</cooldownTime>
-								<chanceFactor>0.2</chanceFactor>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_GoetoToad.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_GoetoToad.xml
deleted file mode 100644
index d8f2dae8ef..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_GoetoToad.xml	
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_Goeto"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_Goeto"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.24</MeleeCritChance>
-						<MeleeParryChance>0.13</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Goeto"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<chanceFactor>0.7</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.9</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_Jellypot.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_Jellypot.xml
deleted file mode 100644
index a1ae1b06d7..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_Jellypot.xml	
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes!1 Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Jellypot"]/statBases/MoveSpeed</xpath>
-
-					<value>
-						<MoveSpeed>2.0</MoveSpeed>
-						<MeleeDodgeChance>0.04</MeleeDodgeChance>
-						<MeleeCritChance>0.10</MeleeCritChance>
-						<MeleeParryChance>0.24</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Jellypot"]/statBases/ArmorRating_Blunt</xpath>
-
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Jellypot"]/statBases/ArmorRating_Sharp</xpath>
-
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Jellypot"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.97</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>4.79</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.32</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_Jewelbug.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_Jewelbug.xml
deleted file mode 100644
index 44a1192e67..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_Jewelbug.xml	
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_Jewelbug"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Jewelbug"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Jewelbug"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_Jewelbug"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.02</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Jewelbug"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_MagmaLizard.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_MagmaLizard.xml
deleted file mode 100644
index 9bfeb4633d..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_MagmaLizard.xml	
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_MagmaLizard"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_MagmaLizard"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.11</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_MagmaLizard"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_MagmaLizard"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>1.85</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_MagmaLizard"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<armorPenetrationSharp>5</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<armorPenetrationSharp>5</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.4</chanceFactor>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.350</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_Maxolotl.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_Maxolotl.xml
deleted file mode 100644
index a51124c348..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_Maxolotl.xml	
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_Maxolotl"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_Maxolotl"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.11</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_Maxolotl"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_Maxolotl"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>1.85</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Maxolotl"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.4</chanceFactor>
-								<armorPenetrationBlunt>16</armorPenetrationBlunt>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.350</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_Megabat.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_Megabat.xml
deleted file mode 100644
index fb94d28c05..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_Megabat.xml	
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_Megabat"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_Megabat"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						<MeleeCritChance>0.33</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Megabat"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left wing</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.24</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.7</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right wing</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.24</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.7</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>2.1</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.75</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>9</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_Megapleura.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_Megapleura.xml
deleted file mode 100644
index e4983a4576..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_Megapleura.xml	
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Megapleura"]/statBases/MoveSpeed</xpath>
-
-					<value>
-						<MoveSpeed>7.5</MoveSpeed>
-						<MeleeDodgeChance>0.06</MeleeDodgeChance>
-						<MeleeCritChance>0.20</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Megapleura"]/statBases/ArmorRating_Blunt</xpath>
-
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Megapleura"]/statBases/ArmorRating_Sharp</xpath>
-
-					<value>
-						<ArmorRating_Sharp>3</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Megapleura"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>32</power>
-								<cooldownTime>2.52</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.6</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2.35</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_MetalloSnail.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_MetalloSnail.xml
deleted file mode 100644
index 9b23b3cb5b..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_MetalloSnail.xml	
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_MetalloSnail"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Serpentine</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_MetalloSnail"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_MetalloSnail"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>12.0</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_MetalloSnail"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>15.0</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_MetalloSnail"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.97</cooldownTime>
-								<chanceFactor>0.2</chanceFactor>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_Mole.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_Mole.xml
deleted file mode 100644
index 83959900b6..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_Mole.xml	
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === bodyShape === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_Mole"]</xpath>
-
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_Mole"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.22</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="BMT_Mole"]/combatPower</xpath>
-					<value>
-						<combatPower>20</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Mole"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.91</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.198</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.91</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.198</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.49</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>1.440</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_MossBeetle.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_MossBeetle.xml
deleted file mode 100644
index cef045a72c..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_MossBeetle.xml	
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Larvae -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_MossBeetleLarvae"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_MossBeetleLarvae"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.00</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_MossBeetleLarvae"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_MossBeetlePupa"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_MossBeetlePupa"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.00</MeleeDodgeChance>
-						<MeleeCritChance>0.00</MeleeCritChance>
-						<MeleeParryChance>0.00</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_MossBeetlePupa"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_MossBeetle"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_MossBeetle"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.24</MeleeCritChance>
-						<MeleeParryChance>0.13</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_MossBeetle"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Mandibles</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<chanceFactor>0.7</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2.9</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_MossFenec.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_MossFenec.xml
deleted file mode 100644
index ae2d3aa25e..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_MossFenec.xml	
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_MossyFennec"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_MossyFennec"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.36</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_MossyFennec"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.9</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.18</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.9</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.18</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_Owlbear.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_Owlbear.xml
deleted file mode 100644
index d9195be8a8..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_Owlbear.xml	
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_Owlbear"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_Owlbear"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.11</MeleeDodgeChance>
-						<MeleeCritChance>0.35</MeleeCritChance>
-						<MeleeParryChance>0.21</MeleeParryChance>
-						<ArmorRating_Blunt>1.65</ArmorRating_Blunt>
-						<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Owlbear"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>1.48</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>1.48</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>39</power>
-								<cooldownTime>1.95</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2.44</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_Pillbug.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_Pillbug.xml
deleted file mode 100644
index 54cd586bb6..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_Pillbug.xml	
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Pillbug"]/statBases/MoveSpeed</xpath>
-
-					<value>
-						<MoveSpeed>2.3</MoveSpeed>
-						<MeleeDodgeChance>0.11</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Pillbug"]/race/baseHealthScale</xpath>
-
-					<value>
-						<baseHealthScale>0.3</baseHealthScale>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Pillbug"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2.12</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.51</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.7</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_Podworm.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_Podworm.xml
deleted file mode 100644
index 31093b2105..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_Podworm.xml	
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_PodWorm"]/statBases/MoveSpeed</xpath>
-
-					<value>
-						<MoveSpeed>2.5</MoveSpeed>
-						<MeleeDodgeChance>0.04</MeleeDodgeChance>
-						<MeleeCritChance>0.10</MeleeCritChance>
-						<MeleeParryChance>0.24</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_PodWorm"]/statBases/ArmorRating_Blunt</xpath>
-
-					<value>
-						<ArmorRating_Blunt>4.65</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_PodWorm"]/statBases/ArmorRating_Sharp</xpath>
-
-					<value>
-						<ArmorRating_Sharp>2.25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_PodWorm"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.97</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>4.79</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.32</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_RoyalRhino.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_RoyalRhino.xml
deleted file mode 100644
index 912dd18123..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_RoyalRhino.xml	
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Larvae -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_RoyalRhinoLarvae"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_RoyalRhinoLarvae"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.00</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_RoyalRhinoLarvae"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5.0</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_RoyalRhinoLarvae"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>5.0</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_RoyalRhinoLarvae"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>2.9</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_RoyalRhinoPupa"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_RoyalRhinoPupa"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.00</MeleeDodgeChance>
-						<MeleeCritChance>0.00</MeleeCritChance>
-						<MeleeParryChance>0.00</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_RoyalRhinoPupa"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>30.0</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_RoyalRhinoPupa"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>30.0</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_RoyalRhino"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_RoyalRhino"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.24</MeleeCritChance>
-						<MeleeParryChance>0.13</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_RoyalRhino"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>25.0</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_RoyalRhino"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>5.0</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_RoyalRhino"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Horn</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Stab</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<armorPenetrationSharp>16</armorPenetrationSharp>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<chanceFactor>0.7</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>2.9</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>9</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Mandibles</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<chanceFactor>0.7</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_ShatterjawBeetle.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_ShatterjawBeetle.xml
deleted file mode 100644
index 91239d1383..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_ShatterjawBeetle.xml	
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Larvae -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_ShatterjawBeetleLarvae"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_ShatterjawBeetleLarvae"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.00</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_ShatterjawBeetleLarvae"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2.9</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_ShatterjawBeetlePupa"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_ShatterjawBeetlePupa"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.00</MeleeDodgeChance>
-						<MeleeCritChance>0.00</MeleeCritChance>
-						<MeleeParryChance>0.00</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_ShatterjawBeetlePupa"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>10</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_ShatterjawBeetlePupa"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_ShatterjawBeetle"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_ShatterjawBeetle"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.24</MeleeCritChance>
-						<MeleeParryChance>0.13</MeleeParryChance>
-						<ArmorRating_Sharp>12.5</ArmorRating_Sharp>
-						<ArmorRating_Blunt>2.0</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_ShatterjawBeetle"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>45</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<chanceFactor>0.7</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>2.9</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_SonarRabbit.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_SonarRabbit.xml
deleted file mode 100644
index 96c2a6f0a8..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_SonarRabbit.xml	
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_SonarRabbit"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_SonarRabbit"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.24</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_SonarRabbit"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_Thrumbungus.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_Thrumbungus.xml
deleted file mode 100644
index ebdb89d6ab..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_Thrumbungus.xml	
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_Thrumbungus"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_Thrumbungus"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.75</MeleeCritChance>
-						<MeleeParryChance>0.5</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Thrumbungus"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>21</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Thrumbungus"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Thrumbungus"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mushrooms</label>
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>46</power>
-								<cooldownTime>0.9</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>16</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>bite</label>
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>41</power>
-								<cooldownTime>0.9</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left paw</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>14</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right paw</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>14</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_TruffleMole.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_TruffleMole.xml
deleted file mode 100644
index c8d70c2323..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_TruffleMole.xml	
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_TruffleMole"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_TruffleMole"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.07</MeleeDodgeChance>
-						<MeleeCritChance>0.06</MeleeCritChance>
-						<MeleeParryChance>0.08</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_TruffleMole"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2.35</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>5</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2.35</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>5</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.5</cooldownTime>
-								<chanceFactor>0.7</chanceFactor>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.12</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_WoollySpider.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_WoollySpider.xml
deleted file mode 100644
index c81e3c220b..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_WoollySpider.xml	
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_WoollySpider"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_WoollySpider"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.26</MeleeDodgeChance>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_WoollySpider"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.02</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_WoolyBat.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_WoolyBat.xml
deleted file mode 100644
index da1852a8dc..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_WoolyBat.xml	
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_Woolybat"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_Woolybat"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.14</MeleeDodgeChance>
-						<MeleeCritChance>0.32</MeleeCritChance>
-						<MeleeParryChance>0.24</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Woolybat"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left wing</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.24</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right wing</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.24</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2.1</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.75</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_Xyrion.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_Xyrion.xml
deleted file mode 100644
index e3bb26d9e2..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_Xyrion.xml	
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BMT_Xyrion"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_Xyrion"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.07</MeleeDodgeChance>
-						<MeleeCritChance>0.06</MeleeCritChance>
-						<MeleeParryChance>0.08</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Xyrion"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2.35</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>5</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2.35</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>5</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.5</cooldownTime>
-								<chanceFactor>0.7</chanceFactor>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.12</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/ThingDefs_Races/CE_Yooka.xml b/Patches/Biomes Caverns/ThingDefs_Races/CE_Yooka.xml
deleted file mode 100644
index 238fc38db1..0000000000
--- a/Patches/Biomes Caverns/ThingDefs_Races/CE_Yooka.xml	
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_Yooka"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.38</MeleeCritChance>
-						<MeleeParryChance>0.18</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Yooka"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/Weapons/CE_Boomshroom.xml b/Patches/Biomes Caverns/Weapons/CE_Boomshroom.xml
deleted file mode 100644
index ea043277d0..0000000000
--- a/Patches/Biomes Caverns/Weapons/CE_Boomshroom.xml	
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Proj_BMT_BoomSporeSac"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>0.5</explosionRadius>
-							<damageDef>Flame</damageDef>
-							<damageAmountBase>10</damageAmountBase>
-							<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
-							<preExplosionSpawnChance>1</preExplosionSpawnChance>
-							<speed>10</speed>
-							<ai_IsIncendiary>true</ai_IsIncendiary>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Proj_BMT_BoomSporeSac"]</xpath>
-					<value>
-						<thingClass>CombatExtended.Projectile_FireTrail</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="BMT_BoomSpore"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_BoomSpore"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>1</damageAmountBase>
-							<explosiveDamageType>Flame</explosiveDamageType>
-							<explosiveRadius>0.5</explosiveRadius>
-							<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
-							<preExplosionSpawnChance>1</preExplosionSpawnChance>
-						</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BMT_BoomSpore</defName>
-					<statBases>
-						<Mass>0.6</Mass>
-						<Bulk>1.8</Bulk>
-						<MarketValue>3</MarketValue>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<label>throw firebomb</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<range>10</range>
-						<minRange>3</minRange>
-						<warmupTime>1.8</warmupTime>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<soundCast>ThrowMolotovCocktail</soundCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<defaultProjectile>Proj_BMT_BoomSporeSac</defaultProjectile>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_BoomSpore"]</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Body</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.75</cooldownTime>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/Weapons/CE_MushroomWine.xml b/Patches/Biomes Caverns/Weapons/CE_MushroomWine.xml
deleted file mode 100644
index 4def8353f5..0000000000
--- a/Patches/Biomes Caverns/Weapons/CE_MushroomWine.xml	
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Give Wine Bulk and Melee tools. -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "BMT_MushroomWine"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_MushroomWine"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2.22</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>neck</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>3.33</cooldownTime>
-								<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Neck</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_MushroomWine"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.1</MeleeCritChance>
-							<MeleeParryChance>0.33</MeleeParryChance>
-							<MeleeDodgeChance>0.07</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Caverns/Weapons/CE_Thrumbungushroom.xml b/Patches/Biomes Caverns/Weapons/CE_Thrumbungushroom.xml
deleted file mode 100644
index 5d5f0ac48d..0000000000
--- a/Patches/Biomes Caverns/Weapons/CE_Thrumbungushroom.xml	
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Caverns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Proj_BMT_ThrumbungusShroom"]</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Proj_BMT_ThrumbungusShroom"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<damageDef>ToxGas</damageDef>
-							<explosionRadius>1.1</explosionRadius>
-							<damageAmountBase>1</damageAmountBase>
-							<explosionDelay>100</explosionDelay>
-							<flyOverhead>false</flyOverhead>
-							<soundExplode>Explosion_Smoke</soundExplode>
-							<postExplosionGasType>RotStink</postExplosionGasType>
-							<postExplosionSpawnChance>1</postExplosionSpawnChance>
-							<postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
-						</projectile>
-					</value>
-				</li>
-
-				<!-- == Grenade == -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_ThrumbungusShroom"]</xpath>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="BMT_ThrumbungusShroom"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BMT_ThrumbungusShroom</defName>
-					<statBases>
-						<Mass>1</Mass>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<label>throw toxic shroom</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Proj_BMT_ThrumbungusShroom</defaultProjectile>
-						<range>12</range>
-						<warmupTime>1.8</warmupTime>
-						<soundCast>ThrowGrenade</soundCast>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-						<onlyManualCast>true</onlyManualCast>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_ThrumbungusShroom"]</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Body</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.75</cooldownTime>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Core/Bodies_Core_CE.xml b/Patches/Biomes Core/Bodies_Core_CE.xml
deleted file mode 100644
index ff101c3e61..0000000000
--- a/Patches/Biomes Core/Bodies_Core_CE.xml	
+++ /dev/null
@@ -1,319 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Core</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- beetle -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="BMT_BeetleLike"]//*[
-						def="Shell" or
-						def="Pronotum" or
-						def="InsectLeg"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="BMT_BeetleLike"]//*[
-						def="Shell" or
-						def="Pronotum" or
-						def="InsectHead" or
-						def="InsectMouth" or
-						def="InsectLeg"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="BMT_BeetleLikeWithStinger"]//*[
-						def="Shell" or
-						def="Pronotum" or
-						def="InsectLeg"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="BMT_BeetleLikeWithStinger"]//*[
-						def="Shell" or
-						def="Pronotum" or
-						def="InsectHead" or
-						def="InsectMouth" or
-						def="InsectLeg" or
-						def="BMT_Stinger"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<!-- spidew -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="BMT_GiantSpider"]//*[
-						def="Body" or
-						def="BMT_Cephalothorax" or
-						def="Pronotum" or
-						def="InsectNostril" or
-						def="Eye" or
-						def="BMT_SpiderAbdomen"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="BMT_GiantSpider"]//*[
-						def="InsectMouth" or
-						def="InsectNostril" or
-						def="Eye"]/groups
-					</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="BMT_GiantSpider"]//*[
-						def="Body" or
-						def="BMT_Cephalothorax" or
-						def="Pronotum" or
-						def="InsectHead" or
-						def="BMT_SpiderAbdomen" or
-						def="BMT_Spinneret"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- disgusting larvae -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="BMT_LarvaLike"]//*[
-						def="SnakeBody" or
-						def="Pronotum"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="BMT_LarvaLike"]//*[
-						def="SnakeBody" or
-						def="Pronotum" or
-						def="InsectHead" or
-						def="InsectMouth"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- cruel mantid -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="BMT_MantisLike"]/corePart/parts/li[def="InsectLeg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="BMT_MantisLike"]/corePart/parts/li[def="InsectLeg"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="BMT_MantisLike"]/corePart/parts/li[def="InsectLeg"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="BMT_MantisLike"]//*[
-						def="Shell" or
-						def="Pronotum"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="BMT_MantisLike"]//*[
-						def="Shell" or
-						def="Pronotum" or
-						def="InsectHead" or
-						def="InsectMouth"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- some weird dinobird -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="BMT_QuadrupedWithWingsBeakAndTailWeapon"]//*[
-						def="Body" or
-						def="BMT_Osteoderm" or
-						def="Neck" or
-						def="Nose" or
-						def="Ear" or
-						def="Eye" or
-						def="Leg" or
-						def="BMT_Tail"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="BMT_QuadrupedWithWingsBeakAndTailWeapon"]//*[
-						def="Nose" or
-						def="Eye"]/groups
-					</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="BMT_QuadrupedWithWingsBeakAndTailWeapon"]//*[
-						def="Body" or
-						def="BMT_Osteoderm" or
-						def="Neck" or
-						def="Head" or
-						def="Ear" or
-						def="Paw" or
-						def="BMT_DinoBeak" or
-						def="Leg" or
-						def="BMT_Tail" or
-						def="BMT_TailWeapon"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- scorpion -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="BMT_Scorpion"]//*[
-						def="Shell" or
-						def="BMT_Cephalothorax" or
-						def="BMT_SpiderAbdomen"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="BMT_Scorpion"]//*[
-						def="Shell" or
-						def="BMT_Stinger" or
-						def="InsectHead" or
-						def="InsectMouth" or
-						def="BMT_Cephalothorax" or
-						def="BMT_SpiderAbdomen" or
-						def="FrontClaw"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="BiomesCore_Slug"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="BiomesCore_Slug"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="BiomesCore_Slug"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="BiomesCore_Slug"]/corePart/parts/li[def="SnakeHead"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="BiomesCore_Slug"]/corePart/parts/li[def="SnakeHead"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="BiomesCore_Slug"]/corePart/parts/li[def="SnakeHead"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="BiomesCore_Snail"]//*[
-						def="RWBLeftEyeStalk" or
-						def="RWBRightEyeStalk" or
-						def="Eye"]/groups
-					</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="BiomesCore_Snail"]//*[
-						def="Shell" or
-						def="RWBSnailFoot" or
-						def="RWBSnailMouth" or
-						def="Head"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Core/CE_Biomes_Core_Leathers.xml b/Patches/Biomes Core/CE_Biomes_Core_Leathers.xml
deleted file mode 100644
index 08755f9d53..0000000000
--- a/Patches/Biomes Core/CE_Biomes_Core_Leathers.xml	
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Crab leather -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BiomesCore_CrabShell"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1.0</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BiomesCore_CrabShell"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.2</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!--greenchitin -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BiomesCore_GreenChitin"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.6</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BiomesCore_GreenChitin"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.6</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<!-- gray chitin -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_GrayChitin"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.4</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_GrayChitin"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.7</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- mollusk Leather -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Molluskshell"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1.3</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Molluskshell"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.4</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- gastropoda stuff-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Leather_Gastropoda"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.03</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Leather_Gastropoda"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.032</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Leather_Amphibian"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.16</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Leather_Amphibian"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.09</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Leather_Magma"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.5</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_Leather_Magma"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.2</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- tough Leather-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BMT_ToughLeather"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.70</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BMT_ToughLeather"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.125</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- flamingo Leather-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BiomesIslands_Leather_Flamingo"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.04</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BiomesIslands_Leather_Flamingo"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.03</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biomes Core/CE_Flamingo.xml b/Patches/Biomes Core/CE_Flamingo.xml
deleted file mode 100644
index 6b5cfa596b..0000000000
--- a/Patches/Biomes Core/CE_Flamingo.xml	
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biomes! Core</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BiomesIslands_Flamingo"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BiomesIslands_Flamingo"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.24</MeleeDodgeChance>
-						<MeleeCritChance>0.03</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BiomesIslands_Flamingo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>12</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>4</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.68</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biotech Expansion - Mammalia/BEMam_Hediffs_BodyParts.xml b/Patches/Biotech Expansion - Mammalia/BEMam_Hediffs_BodyParts.xml
deleted file mode 100644
index e1bf967924..0000000000
--- a/Patches/Biotech Expansion - Mammalia/BEMam_Hediffs_BodyParts.xml	
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biotech Expansion - Mammalia</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BTEMa_SharpClaws"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>8</power>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.18</armorPenetrationSharp>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<cooldownTime>1.4</cooldownTime>
-								<soundMeleeHit>MeleeHit_BionicSlash</soundMeleeHit>
-								<soundMeleeMiss>MeleeMiss_BionicSlash</soundMeleeMiss>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BTEMa_HeavyHooves"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<cooldownTime>2</cooldownTime>
-								<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
-								<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BTEMa_ElongatedFangs"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>bite</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<soundMeleeHit>MeleeHit_BionicSlash</soundMeleeHit>
-								<soundMeleeMiss>MeleeMiss_BionicSlash</soundMeleeMiss>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BTEMa_FerociousRazorTeeth"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>razor tooth</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>15</power>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<cooldownTime>2</cooldownTime>
-								<soundMeleeHit>MeleeHit_BionicSlash</soundMeleeHit>
-								<soundMeleeMiss>MeleeMiss_BionicSlash</soundMeleeMiss>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biotech Expansion - Mythic/BEM_AbilityDefs_Patch.xml b/Patches/Biotech Expansion - Mythic/BEM_AbilityDefs_Patch.xml
deleted file mode 100644
index a7271494e8..0000000000
--- a/Patches/Biotech Expansion - Mythic/BEM_AbilityDefs_Patch.xml	
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biotech Expansion - Mythic</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BTEMy_BrilliantBlast"]</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BTEMy_BrilliantBlast"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>3</explosionRadius>
-							<damageDef>Bomb</damageDef>
-							<damageAmountBase>56</damageAmountBase>
-							<explosionDelay>0</explosionDelay>
-							<dropsCasings>false</dropsCasings>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							<speed>80</speed>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BTEMy_Punish"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<damageDef>RangedStab</damageDef>
-							<speed>120</speed>
-							<damageAmountBase>20</damageAmountBase>
-							<armorPenetrationSharp>6</armorPenetrationSharp>
-							<armorPenetrationBlunt>6</armorPenetrationBlunt>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AbilityDef[defName="BTEMy_Punish"]/verbProperties/range</xpath>
-					<value>
-						<range>21</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AbilityDef[defName="BTEMy_BrilliantBlast"]/verbProperties/range</xpath>
-					<value>
-						<range>36</range>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biotech Expansion - Mythic/BEM_Hediffs_BodyParts.xml b/Patches/Biotech Expansion - Mythic/BEM_Hediffs_BodyParts.xml
deleted file mode 100644
index 093a10fa51..0000000000
--- a/Patches/Biotech Expansion - Mythic/BEM_Hediffs_BodyParts.xml	
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biotech Expansion - Mythic</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BTEMy_BlazingClaws"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>15</power>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.22</armorPenetrationSharp>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<cooldownTime>1.4</cooldownTime>
-								<extraMeleeDamages>
-									<li>
-										<def>Flame</def>
-										<amount>10</amount>
-										<chance>0.25</chance>
-									</li>
-								</extraMeleeDamages>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BTEMy_AdamantScales"]/stages/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ArmorRating_Sharp>6</ArmorRating_Sharp>
-							<ArmorRating_Blunt>9</ArmorRating_Blunt>
-							<ArmorRating_Heat>0.8</ArmorRating_Heat>
-							<PawnBeauty>1</PawnBeauty>
-						</statOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_HeavyUltraHeavy/HeavyUltraHeavy_ArmorBlunt.xml b/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_HeavyUltraHeavy/HeavyUltraHeavy_ArmorBlunt.xml
deleted file mode 100644
index 0be56bc36d..0000000000
--- a/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_HeavyUltraHeavy/HeavyUltraHeavy_ArmorBlunt.xml	
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biotech Mech Stuff Elongated - Mechanoid Upgrades V2</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BMU_MechBoost_Armor_HeavyUltraHeavy_Blunt"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<label>level 1</label>
-								<minSeverity>1</minSeverity>
-								<statOffsets>
-									<ArmorRating_Blunt>1.0</ArmorRating_Blunt>
-									<MoveSpeed>-0.0625</MoveSpeed>
-								</statOffsets>
-							</li>
-							<li>
-								<label>level 2</label>
-								<minSeverity>2</minSeverity>
-								<statOffsets>
-									<ArmorRating_Blunt>2.0</ArmorRating_Blunt>
-									<MoveSpeed>-0.125</MoveSpeed>
-								</statOffsets>
-							</li>
-							<li>
-								<label>level 3</label>
-								<minSeverity>3</minSeverity>
-								<statOffsets>
-									<ArmorRating_Blunt>3.0</ArmorRating_Blunt>
-									<MoveSpeed>-0.1875</MoveSpeed>
-								</statOffsets>
-							</li>
-							<li>
-								<label>level 4</label>
-								<minSeverity>4</minSeverity>
-								<statOffsets>
-									<ArmorRating_Blunt>4.0</ArmorRating_Blunt>
-									<MoveSpeed>-0.250</MoveSpeed>
-								</statOffsets>
-							</li>
-							<li>
-								<label>level 5</label>
-								<minSeverity>5</minSeverity>
-								<statOffsets>
-									<ArmorRating_Blunt>5.0</ArmorRating_Blunt>
-									<MoveSpeed>-0.3125</MoveSpeed>
-								</statOffsets>
-							</li>
-							<li>
-								<label>level 6</label>
-								<minSeverity>6</minSeverity>
-								<statOffsets>
-									<ArmorRating_Blunt>6.0</ArmorRating_Blunt>
-									<MoveSpeed>-0.375</MoveSpeed>
-								</statOffsets>
-							</li>
-							<li>
-								<label>level 7</label>
-								<minSeverity>7</minSeverity>
-								<statOffsets>
-									<ArmorRating_Blunt>7.0</ArmorRating_Blunt>
-									<MoveSpeed>-0.4375</MoveSpeed>
-								</statOffsets>
-							</li>
-							<li>
-								<label>level 8</label>
-								<minSeverity>8</minSeverity>
-								<statOffsets>
-									<ArmorRating_Blunt>8.0</ArmorRating_Blunt>
-									<MoveSpeed>-0.5</MoveSpeed>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_HeavyUltraHeavy/HeavyUltraHeavy_ArmorSharp.xml b/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_HeavyUltraHeavy/HeavyUltraHeavy_ArmorSharp.xml
deleted file mode 100644
index 14628ec3ff..0000000000
--- a/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_HeavyUltraHeavy/HeavyUltraHeavy_ArmorSharp.xml	
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biotech Mech Stuff Elongated - Mechanoid Upgrades V2</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BMU_MechBoost_Armor_HeavyUltraHeavy_Sharp"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<label>level 1</label>
-								<minSeverity>1</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-									<MoveSpeed>-0.0625</MoveSpeed>
-								</statOffsets>
-							</li>
-							<li>
-								<label>level 2</label>
-								<minSeverity>2</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>1.0</ArmorRating_Sharp>
-									<MoveSpeed>-0.125</MoveSpeed>
-								</statOffsets>
-							</li>
-							<li>
-								<label>level 3</label>
-								<minSeverity>3</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-									<MoveSpeed>-0.1875</MoveSpeed>
-								</statOffsets>
-							</li>
-							<li>
-								<label>level 4</label>
-								<minSeverity>4</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>2.0</ArmorRating_Sharp>
-									<MoveSpeed>-0.250</MoveSpeed>
-								</statOffsets>
-							</li>
-							<li>
-								<label>level 5</label>
-								<minSeverity>5</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
-									<MoveSpeed>-0.3125</MoveSpeed>
-								</statOffsets>
-							</li>
-							<li>
-								<label>level 6</label>
-								<minSeverity>6</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>3.0</ArmorRating_Sharp>
-									<MoveSpeed>-0.375</MoveSpeed>
-								</statOffsets>
-							</li>
-							<li>
-								<label>level 7</label>
-								<minSeverity>7</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>3.5</ArmorRating_Sharp>
-									<MoveSpeed>-0.4375</MoveSpeed>
-								</statOffsets>
-							</li>
-							<li>
-								<label>level 8</label>
-								<minSeverity>8</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>4.0</ArmorRating_Sharp>
-									<MoveSpeed>-0.5</MoveSpeed>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_HeavyUltraHeavy/HeavyUltraHeavy_CombatMelee.xml b/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_HeavyUltraHeavy/HeavyUltraHeavy_CombatMelee.xml
deleted file mode 100644
index 45f8fd4354..0000000000
--- a/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_HeavyUltraHeavy/HeavyUltraHeavy_CombatMelee.xml	
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biotech Mech Stuff Elongated - Mechanoid Upgrades V2</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BMU_MechBoost_Armor_HeavyUltraHeavy_CombatMelee"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<label>level 1</label>
-								<minSeverity>1</minSeverity>
-								<statFactors>
-									<MeleeDamageFactor>1.05</MeleeDamageFactor>
-									<MeleeDodgeChance>1.025</MeleeDodgeChance>
-									<MeleeHitChance>1.025</MeleeHitChance>
-									<MeleeCritChance>1.025</MeleeCritChance>
-									<MeleeParryChance>1.025</MeleeParryChance>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 2</label>
-								<minSeverity>2</minSeverity>
-								<statFactors>
-									<MeleeDamageFactor>1.1</MeleeDamageFactor>
-									<MeleeDodgeChance>1.05</MeleeDodgeChance>
-									<MeleeHitChance>1.05</MeleeHitChance>
-									<MeleeCritChance>1.05</MeleeCritChance>
-									<MeleeParryChance>1.05</MeleeParryChance>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 3</label>
-								<minSeverity>3</minSeverity>
-								<statFactors>
-									<MeleeDamageFactor>1.15</MeleeDamageFactor>
-									<MeleeDodgeChance>1.075</MeleeDodgeChance>
-									<MeleeHitChance>1.075</MeleeHitChance>
-									<MeleeCritChance>1.075</MeleeCritChance>
-									<MeleeParryChance>1.075</MeleeParryChance>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 4</label>
-								<minSeverity>4</minSeverity>
-								<statFactors>
-									<MeleeDamageFactor>1.2</MeleeDamageFactor>
-									<MeleeDodgeChance>1.1</MeleeDodgeChance>
-									<MeleeHitChance>1.1</MeleeHitChance>
-									<MeleeCritChance>1.1</MeleeCritChance>
-									<MeleeParryChance>1.1</MeleeParryChance>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 5</label>
-								<minSeverity>5</minSeverity>
-								<statFactors>
-									<MeleeDamageFactor>1.25</MeleeDamageFactor>
-									<MeleeDodgeChance>1.125</MeleeDodgeChance>
-									<MeleeHitChance>1.125</MeleeHitChance>
-									<MeleeCritChance>1.125</MeleeCritChance>
-									<MeleeParryChance>1.125</MeleeParryChance>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 6</label>
-								<minSeverity>6</minSeverity>
-								<statFactors>
-									<MeleeDamageFactor>1.3</MeleeDamageFactor>
-									<MeleeDodgeChance>1.15</MeleeDodgeChance>
-									<MeleeHitChance>1.15</MeleeHitChance>
-									<MeleeCritChance>1.15</MeleeCritChance>
-									<MeleeParryChance>1.15</MeleeParryChance>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 7</label>
-								<minSeverity>7</minSeverity>
-								<statFactors>
-									<MeleeDamageFactor>1.35</MeleeDamageFactor>
-									<MeleeDodgeChance>1.175</MeleeDodgeChance>
-									<MeleeHitChance>1.175</MeleeHitChance>
-									<MeleeCritChance>1.175</MeleeCritChance>
-									<MeleeParryChance>1.175</MeleeParryChance>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 8</label>
-								<minSeverity>8</minSeverity>
-								<statFactors>
-									<MeleeDamageFactor>1.4</MeleeDamageFactor>
-									<MeleeDodgeChance>1.2</MeleeDodgeChance>
-									<MeleeHitChance>1.2</MeleeHitChance>
-									<MeleeCritChance>1.2</MeleeCritChance>
-									<MeleeParryChance>1.2</MeleeParryChance>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 9</label>
-								<minSeverity>9</minSeverity>
-								<statFactors>
-									<MeleeDamageFactor>1.45</MeleeDamageFactor>
-									<MeleeDodgeChance>1.225</MeleeDodgeChance>
-									<MeleeHitChance>1.225</MeleeHitChance>
-									<MeleeCritChance>1.225</MeleeCritChance>
-									<MeleeParryChance>1.225</MeleeParryChance>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 10</label>
-								<minSeverity>10</minSeverity>
-								<statFactors>
-									<MeleeDamageFactor>1.5</MeleeDamageFactor>
-									<MeleeDodgeChance>1.25</MeleeDodgeChance>
-									<MeleeHitChance>1.25</MeleeHitChance>
-									<MeleeCritChance>1.25</MeleeCritChance>
-									<MeleeParryChance>1.25</MeleeParryChance>
-								</statFactors>
-							</li>
-						</stages>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_HeavyUltraHeavy/HeavyUltraHeavy_CombatRanged.xml b/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_HeavyUltraHeavy/HeavyUltraHeavy_CombatRanged.xml
deleted file mode 100644
index 05aa4d0b42..0000000000
--- a/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_HeavyUltraHeavy/HeavyUltraHeavy_CombatRanged.xml	
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biotech Mech Stuff Elongated - Mechanoid Upgrades V2</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BMU_MechBoost_Armor_HeavyUltraHeavy_CombatRanged"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<label>level 1</label>
-								<minSeverity>1</minSeverity>
-								<statFactors>
-									<ShootingAccuracyPawn>1.025</ShootingAccuracyPawn>
-									<AimingAccuracy>1.025</AimingAccuracy>
-									<AimingDelayFactor>0.975</AimingDelayFactor>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 2</label>
-								<minSeverity>2</minSeverity>
-								<statFactors>
-									<ShootingAccuracyPawn>1.05</ShootingAccuracyPawn>
-									<AimingAccuracy>1.05</AimingAccuracy>
-									<AimingDelayFactor>0.95</AimingDelayFactor>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 3</label>
-								<minSeverity>3</minSeverity>
-								<statFactors>
-									<ShootingAccuracyPawn>1.075</ShootingAccuracyPawn>
-									<AimingAccuracy>1.075</AimingAccuracy>
-									<AimingDelayFactor>0.925</AimingDelayFactor>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 4</label>
-								<minSeverity>4</minSeverity>
-								<statFactors>
-									<ShootingAccuracyPawn>1.1</ShootingAccuracyPawn>
-									<AimingAccuracy>1.1</AimingAccuracy>
-									<AimingDelayFactor>0.9</AimingDelayFactor>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 5</label>
-								<minSeverity>5</minSeverity>
-								<statFactors>
-									<ShootingAccuracyPawn>1.125</ShootingAccuracyPawn>
-									<AimingAccuracy>1.125</AimingAccuracy>
-									<AimingDelayFactor>0.875</AimingDelayFactor>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 6</label>
-								<minSeverity>6</minSeverity>
-								<statFactors>
-									<ShootingAccuracyPawn>1.15</ShootingAccuracyPawn>
-									<AimingAccuracy>1.15</AimingAccuracy>
-									<AimingDelayFactor>0.85</AimingDelayFactor>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 7</label>
-								<minSeverity>7</minSeverity>
-								<statFactors>
-									<ShootingAccuracyPawn>1.175</ShootingAccuracyPawn>
-									<AimingAccuracy>1.175</AimingAccuracy>
-									<AimingDelayFactor>0.825</AimingDelayFactor>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 8</label>
-								<minSeverity>8</minSeverity>
-								<statFactors>
-									<ShootingAccuracyPawn>1.2</ShootingAccuracyPawn>
-									<AimingAccuracy>1.2</AimingAccuracy>
-									<AimingDelayFactor>0.8</AimingDelayFactor>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 9</label>
-								<minSeverity>9</minSeverity>
-								<statFactors>
-									<ShootingAccuracyPawn>1.225</ShootingAccuracyPawn>
-									<AimingAccuracy>1.225</AimingAccuracy>
-									<AimingDelayFactor>0.775</AimingDelayFactor>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 10</label>
-								<minSeverity>10</minSeverity>
-								<statFactors>
-									<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
-									<AimingAccuracy>1.25</AimingAccuracy>
-									<AimingDelayFactor>0.75</AimingDelayFactor>
-								</statFactors>
-							</li>
-						</stages>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_HeavyUltraHeavy/HeavyUltraHeavy_Default.xml b/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_HeavyUltraHeavy/HeavyUltraHeavy_Default.xml
deleted file mode 100644
index 2fcccdfe9d..0000000000
--- a/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_HeavyUltraHeavy/HeavyUltraHeavy_Default.xml	
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biotech Mech Stuff Elongated - Mechanoid Upgrades V2</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BMU_MechBoost_Armor_HeavyUltraHeavy_Default"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<label>level 1</label>
-								<minSeverity>1</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.2</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.3</ArmorRating_Blunt>
-								</statOffsets>
-								<capMods>
-									<li>
-										<capacity>Manipulation</capacity>
-										<offset>0.05</offset>
-									</li>
-									<li>
-										<capacity>Moving</capacity>
-										<offset>0.05</offset>
-									</li>
-								</capMods>
-							</li>
-							<li>
-								<label>level 2</label>
-								<minSeverity>2</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.4</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.6</ArmorRating_Blunt>
-								</statOffsets>
-								<capMods>
-									<li>
-										<capacity>Manipulation</capacity>
-										<offset>0.1</offset>
-									</li>
-									<li>
-										<capacity>Moving</capacity>
-										<offset>0.1</offset>
-									</li>
-								</capMods>
-							</li>
-							<li>
-								<label>level 3</label>
-								<minSeverity>3</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.6</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.9</ArmorRating_Blunt>
-								</statOffsets>
-								<capMods>
-									<li>
-										<capacity>Manipulation</capacity>
-										<offset>0.15</offset>
-									</li>
-									<li>
-										<capacity>Moving</capacity>
-										<offset>0.15</offset>
-									</li>
-								</capMods>
-							</li>
-							<li>
-								<label>level 4</label>
-								<minSeverity>4</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.8</ArmorRating_Sharp>
-									<ArmorRating_Blunt>1.2</ArmorRating_Blunt>
-								</statOffsets>
-								<capMods>
-									<li>
-										<capacity>Manipulation</capacity>
-										<offset>0.2</offset>
-									</li>
-									<li>
-										<capacity>Moving</capacity>
-										<offset>0.2</offset>
-									</li>
-								</capMods>
-							</li>
-							<li>
-								<label>level 5</label>
-								<minSeverity>5</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>1.0</ArmorRating_Sharp>
-									<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-								</statOffsets>
-								<capMods>
-									<li>
-										<capacity>Manipulation</capacity>
-										<offset>0.25</offset>
-									</li>
-									<li>
-										<capacity>Moving</capacity>
-										<offset>0.25</offset>
-									</li>
-								</capMods>
-							</li>
-						</stages>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_HeavyUltraHeavy/HeavyUltraHeavy_Defense.xml b/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_HeavyUltraHeavy/HeavyUltraHeavy_Defense.xml
deleted file mode 100644
index 294a2cc354..0000000000
--- a/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_HeavyUltraHeavy/HeavyUltraHeavy_Defense.xml	
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biotech Mech Stuff Elongated - Mechanoid Upgrades V2</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BMU_MechBoost_Armor_HeavyUltraHeavy_ImpactDampener"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<label>level 1</label>
-								<minSeverity>1</minSeverity>
-								<statFactors>
-									<IncomingDamageFactor>0.95</IncomingDamageFactor>
-									<StaggerDurationFactor>0.9</StaggerDurationFactor>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 2</label>
-								<minSeverity>2</minSeverity>
-								<statFactors>
-									<IncomingDamageFactor>0.9</IncomingDamageFactor>
-									<StaggerDurationFactor>0.8</StaggerDurationFactor>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 3</label>
-								<minSeverity>3</minSeverity>
-								<statFactors>
-									<IncomingDamageFactor>0.85</IncomingDamageFactor>
-									<StaggerDurationFactor>0.7</StaggerDurationFactor>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 4</label>
-								<minSeverity>4</minSeverity>
-								<statFactors>
-									<IncomingDamageFactor>0.8</IncomingDamageFactor>
-									<StaggerDurationFactor>0.6</StaggerDurationFactor>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 5</label>
-								<minSeverity>5</minSeverity>
-								<statFactors>
-									<IncomingDamageFactor>0.75</IncomingDamageFactor>
-									<StaggerDurationFactor>0.5</StaggerDurationFactor>
-								</statFactors>
-							</li>
-						</stages>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_HeavyUltraHeavy/HeavyUltraHeavy_EMPResistance.xml b/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_HeavyUltraHeavy/HeavyUltraHeavy_EMPResistance.xml
deleted file mode 100644
index be8b9411ee..0000000000
--- a/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_HeavyUltraHeavy/HeavyUltraHeavy_EMPResistance.xml	
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biotech Mech Stuff Elongated - Mechanoid Upgrades V2</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BMU_MechBoost_Armor_HeavyUltraHeavy_EMPResistance"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<label>level 1</label>
-								<minSeverity>1</minSeverity>
-								<statOffsets>
-									<EMPResistance>0.125</EMPResistance>
-									<ArmorRating_Electric>0.125</ArmorRating_Electric>
-								</statOffsets>
-							</li>
-							<li>
-								<label>level 2</label>
-								<minSeverity>2</minSeverity>
-								<statOffsets>
-									<EMPResistance>0.25</EMPResistance>
-									<ArmorRating_Electric>0.25</ArmorRating_Electric>
-								</statOffsets>
-							</li>
-							<li>
-								<label>level 3</label>
-								<minSeverity>3</minSeverity>
-								<statOffsets>
-									<EMPResistance>0.375</EMPResistance>
-									<ArmorRating_Electric>0.375</ArmorRating_Electric>
-								</statOffsets>
-							</li>
-							<li>
-								<label>level 4</label>
-								<minSeverity>4</minSeverity>
-								<statOffsets>
-									<EMPResistance>0.5</EMPResistance>
-									<ArmorRating_Electric>0.5</ArmorRating_Electric>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_LightMedium/LightMedium_ArmorBlunt.xml b/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_LightMedium/LightMedium_ArmorBlunt.xml
deleted file mode 100644
index 131c232956..0000000000
--- a/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_LightMedium/LightMedium_ArmorBlunt.xml	
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biotech Mech Stuff Elongated - Mechanoid Upgrades V2</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BMU_MechBoost_Armor_LightMedium_Blunt"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<label>level 1</label>
-								<minSeverity>1</minSeverity>
-								<statOffsets>
-									<ArmorRating_Blunt>0.375</ArmorRating_Blunt>
-									<MoveSpeed>-0.0625</MoveSpeed>
-								</statOffsets>
-							</li>
-							<li>
-								<label>level 2</label>
-								<minSeverity>2</minSeverity>
-								<statOffsets>
-									<ArmorRating_Blunt>0.75</ArmorRating_Blunt>
-									<MoveSpeed>-0.125</MoveSpeed>
-								</statOffsets>
-							</li>
-							<li>
-								<label>level 3</label>
-								<minSeverity>3</minSeverity>
-								<statOffsets>
-									<ArmorRating_Blunt>1.125</ArmorRating_Blunt>
-									<MoveSpeed>-0.1875</MoveSpeed>
-								</statOffsets>
-							</li>
-							<li>
-								<label>level 4</label>
-								<minSeverity>4</minSeverity>
-								<statOffsets>
-									<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-									<MoveSpeed>-0.250</MoveSpeed>
-								</statOffsets>
-							</li>
-							<li>
-								<label>level 5</label>
-								<minSeverity>5</minSeverity>
-								<statOffsets>
-									<ArmorRating_Blunt>1.875</ArmorRating_Blunt>
-									<MoveSpeed>-0.3125</MoveSpeed>
-								</statOffsets>
-							</li>
-							<li>
-								<label>level 6</label>
-								<minSeverity>6</minSeverity>
-								<statOffsets>
-									<ArmorRating_Blunt>2.25</ArmorRating_Blunt>
-									<MoveSpeed>-0.375</MoveSpeed>
-								</statOffsets>
-							</li>
-							<li>
-								<label>level 7</label>
-								<minSeverity>7</minSeverity>
-								<statOffsets>
-									<ArmorRating_Blunt>2.625</ArmorRating_Blunt>
-									<MoveSpeed>-0.4375</MoveSpeed>
-								</statOffsets>
-							</li>
-							<li>
-								<label>level 8</label>
-								<minSeverity>8</minSeverity>
-								<statOffsets>
-									<ArmorRating_Blunt>3.0</ArmorRating_Blunt>
-									<MoveSpeed>-0.5</MoveSpeed>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_LightMedium/LightMedium_ArmorSharp.xml b/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_LightMedium/LightMedium_ArmorSharp.xml
deleted file mode 100644
index 31fe78e15f..0000000000
--- a/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_LightMedium/LightMedium_ArmorSharp.xml	
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biotech Mech Stuff Elongated - Mechanoid Upgrades V2</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BMU_MechBoost_Armor_LightMedium_Sharp"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<label>level 1</label>
-								<minSeverity>1</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
-									<MoveSpeed>-0.0625</MoveSpeed>
-								</statOffsets>
-							</li>
-							<li>
-								<label>level 2</label>
-								<minSeverity>2</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-									<MoveSpeed>-0.125</MoveSpeed>
-								</statOffsets>
-							</li>
-							<li>
-								<label>level 3</label>
-								<minSeverity>3</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
-									<MoveSpeed>-0.1875</MoveSpeed>
-								</statOffsets>
-							</li>
-							<li>
-								<label>level 4</label>
-								<minSeverity>4</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>1.0</ArmorRating_Sharp>
-									<MoveSpeed>-0.250</MoveSpeed>
-								</statOffsets>
-							</li>
-							<li>
-								<label>level 5</label>
-								<minSeverity>5</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>1.25</ArmorRating_Sharp>
-									<MoveSpeed>-0.3125</MoveSpeed>
-								</statOffsets>
-							</li>
-							<li>
-								<label>level 6</label>
-								<minSeverity>6</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-									<MoveSpeed>-0.375</MoveSpeed>
-								</statOffsets>
-							</li>
-							<li>
-								<label>level 7</label>
-								<minSeverity>7</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>1.75</ArmorRating_Sharp>
-									<MoveSpeed>-0.4375</MoveSpeed>
-								</statOffsets>
-							</li>
-							<li>
-								<label>level 8</label>
-								<minSeverity>8</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>2.0</ArmorRating_Sharp>
-									<MoveSpeed>-0.5</MoveSpeed>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_LightMedium/LightMedium_CombatMelee.xml b/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_LightMedium/LightMedium_CombatMelee.xml
deleted file mode 100644
index 8b012be26d..0000000000
--- a/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_LightMedium/LightMedium_CombatMelee.xml	
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biotech Mech Stuff Elongated - Mechanoid Upgrades V2</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BMU_MechBoost_Armor_LightMedium_CombatMelee"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<label>level 1</label>
-								<minSeverity>1</minSeverity>
-								<statFactors>
-									<MeleeDamageFactor>1.05</MeleeDamageFactor>
-									<MeleeDodgeChance>1.025</MeleeDodgeChance>
-									<MeleeHitChance>1.025</MeleeHitChance>
-									<MeleeCritChance>1.025</MeleeCritChance>
-									<MeleeParryChance>1.025</MeleeParryChance>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 2</label>
-								<minSeverity>2</minSeverity>
-								<statFactors>
-									<MeleeDamageFactor>1.1</MeleeDamageFactor>
-									<MeleeDodgeChance>1.05</MeleeDodgeChance>
-									<MeleeHitChance>1.05</MeleeHitChance>
-									<MeleeCritChance>1.05</MeleeCritChance>
-									<MeleeParryChance>1.05</MeleeParryChance>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 3</label>
-								<minSeverity>3</minSeverity>
-								<statFactors>
-									<MeleeDamageFactor>1.15</MeleeDamageFactor>
-									<MeleeDodgeChance>1.075</MeleeDodgeChance>
-									<MeleeHitChance>1.075</MeleeHitChance>
-									<MeleeCritChance>1.075</MeleeCritChance>
-									<MeleeParryChance>1.075</MeleeParryChance>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 4</label>
-								<minSeverity>4</minSeverity>
-								<statFactors>
-									<MeleeDamageFactor>1.2</MeleeDamageFactor>
-									<MeleeDodgeChance>1.1</MeleeDodgeChance>
-									<MeleeHitChance>1.1</MeleeHitChance>
-									<MeleeCritChance>1.1</MeleeCritChance>
-									<MeleeParryChance>1.1</MeleeParryChance>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 5</label>
-								<minSeverity>5</minSeverity>
-								<statFactors>
-									<MeleeDamageFactor>1.25</MeleeDamageFactor>
-									<MeleeDodgeChance>1.125</MeleeDodgeChance>
-									<MeleeHitChance>1.125</MeleeHitChance>
-									<MeleeCritChance>1.125</MeleeCritChance>
-									<MeleeParryChance>1.125</MeleeParryChance>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 6</label>
-								<minSeverity>6</minSeverity>
-								<statFactors>
-									<MeleeDamageFactor>1.3</MeleeDamageFactor>
-									<MeleeDodgeChance>1.15</MeleeDodgeChance>
-									<MeleeHitChance>1.15</MeleeHitChance>
-									<MeleeCritChance>1.15</MeleeCritChance>
-									<MeleeParryChance>1.15</MeleeParryChance>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 7</label>
-								<minSeverity>7</minSeverity>
-								<statFactors>
-									<MeleeDamageFactor>1.35</MeleeDamageFactor>
-									<MeleeDodgeChance>1.175</MeleeDodgeChance>
-									<MeleeHitChance>1.175</MeleeHitChance>
-									<MeleeCritChance>1.175</MeleeCritChance>
-									<MeleeParryChance>1.175</MeleeParryChance>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 8</label>
-								<minSeverity>8</minSeverity>
-								<statFactors>
-									<MeleeDamageFactor>1.4</MeleeDamageFactor>
-									<MeleeDodgeChance>1.2</MeleeDodgeChance>
-									<MeleeHitChance>1.2</MeleeHitChance>
-									<MeleeCritChance>1.2</MeleeCritChance>
-									<MeleeParryChance>1.2</MeleeParryChance>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 9</label>
-								<minSeverity>9</minSeverity>
-								<statFactors>
-									<MeleeDamageFactor>1.45</MeleeDamageFactor>
-									<MeleeDodgeChance>1.225</MeleeDodgeChance>
-									<MeleeHitChance>1.225</MeleeHitChance>
-									<MeleeCritChance>1.225</MeleeCritChance>
-									<MeleeParryChance>1.225</MeleeParryChance>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 10</label>
-								<minSeverity>10</minSeverity>
-								<statFactors>
-									<MeleeDamageFactor>1.5</MeleeDamageFactor>
-									<MeleeDodgeChance>1.25</MeleeDodgeChance>
-									<MeleeHitChance>1.25</MeleeHitChance>
-									<MeleeCritChance>1.25</MeleeCritChance>
-									<MeleeParryChance>1.25</MeleeParryChance>
-								</statFactors>
-							</li>
-						</stages>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_LightMedium/LightMedium_CombatRanged.xml b/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_LightMedium/LightMedium_CombatRanged.xml
deleted file mode 100644
index 4979db8bef..0000000000
--- a/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_LightMedium/LightMedium_CombatRanged.xml	
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biotech Mech Stuff Elongated - Mechanoid Upgrades V2</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BMU_MechBoost_Armor_LightMedium_CombatRanged"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<label>level 1</label>
-								<minSeverity>1</minSeverity>
-								<statFactors>
-									<ShootingAccuracyPawn>1.025</ShootingAccuracyPawn>
-									<AimingAccuracy>1.025</AimingAccuracy>
-									<AimingDelayFactor>0.975</AimingDelayFactor>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 2</label>
-								<minSeverity>2</minSeverity>
-								<statFactors>
-									<ShootingAccuracyPawn>1.05</ShootingAccuracyPawn>
-									<AimingAccuracy>1.05</AimingAccuracy>
-									<AimingDelayFactor>0.95</AimingDelayFactor>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 3</label>
-								<minSeverity>3</minSeverity>
-								<statFactors>
-									<ShootingAccuracyPawn>1.075</ShootingAccuracyPawn>
-									<AimingAccuracy>1.075</AimingAccuracy>
-									<AimingDelayFactor>0.925</AimingDelayFactor>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 4</label>
-								<minSeverity>4</minSeverity>
-								<statFactors>
-									<ShootingAccuracyPawn>1.1</ShootingAccuracyPawn>
-									<AimingAccuracy>1.1</AimingAccuracy>
-									<AimingDelayFactor>0.9</AimingDelayFactor>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 5</label>
-								<minSeverity>5</minSeverity>
-								<statFactors>
-									<ShootingAccuracyPawn>1.125</ShootingAccuracyPawn>
-									<AimingAccuracy>1.125</AimingAccuracy>
-									<AimingDelayFactor>0.875</AimingDelayFactor>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 6</label>
-								<minSeverity>6</minSeverity>
-								<statFactors>
-									<ShootingAccuracyPawn>1.15</ShootingAccuracyPawn>
-									<AimingAccuracy>1.15</AimingAccuracy>
-									<AimingDelayFactor>0.85</AimingDelayFactor>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 7</label>
-								<minSeverity>7</minSeverity>
-								<statFactors>
-									<ShootingAccuracyPawn>1.175</ShootingAccuracyPawn>
-									<AimingAccuracy>1.175</AimingAccuracy>
-									<AimingDelayFactor>0.825</AimingDelayFactor>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 8</label>
-								<minSeverity>8</minSeverity>
-								<statFactors>
-									<ShootingAccuracyPawn>1.2</ShootingAccuracyPawn>
-									<AimingAccuracy>1.2</AimingAccuracy>
-									<AimingDelayFactor>0.8</AimingDelayFactor>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 9</label>
-								<minSeverity>9</minSeverity>
-								<statFactors>
-									<ShootingAccuracyPawn>1.225</ShootingAccuracyPawn>
-									<AimingAccuracy>1.225</AimingAccuracy>
-									<AimingDelayFactor>0.775</AimingDelayFactor>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 10</label>
-								<minSeverity>10</minSeverity>
-								<statFactors>
-									<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
-									<AimingAccuracy>1.25</AimingAccuracy>
-									<AimingDelayFactor>0.75</AimingDelayFactor>
-								</statFactors>
-							</li>
-						</stages>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_LightMedium/LightMedium_Default.xml b/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_LightMedium/LightMedium_Default.xml
deleted file mode 100644
index 0cbfa1e2e5..0000000000
--- a/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_LightMedium/LightMedium_Default.xml	
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biotech Mech Stuff Elongated - Mechanoid Upgrades V2</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BMU_MechBoost_Armor_LightMedium_Default"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<label>level 1</label>
-								<minSeverity>1</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.2</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.3</ArmorRating_Blunt>
-								</statOffsets>
-								<capMods>
-									<li>
-										<capacity>Manipulation</capacity>
-										<offset>0.05</offset>
-									</li>
-									<li>
-										<capacity>Moving</capacity>
-										<offset>0.05</offset>
-									</li>
-								</capMods>
-							</li>
-							<li>
-								<label>level 2</label>
-								<minSeverity>2</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.4</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.6</ArmorRating_Blunt>
-								</statOffsets>
-								<capMods>
-									<li>
-										<capacity>Manipulation</capacity>
-										<offset>0.1</offset>
-									</li>
-									<li>
-										<capacity>Moving</capacity>
-										<offset>0.1</offset>
-									</li>
-								</capMods>
-							</li>
-							<li>
-								<label>level 3</label>
-								<minSeverity>3</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.6</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.9</ArmorRating_Blunt>
-								</statOffsets>
-								<capMods>
-									<li>
-										<capacity>Manipulation</capacity>
-										<offset>0.15</offset>
-									</li>
-									<li>
-										<capacity>Moving</capacity>
-										<offset>0.15</offset>
-									</li>
-								</capMods>
-							</li>
-							<li>
-								<label>level 4</label>
-								<minSeverity>4</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.8</ArmorRating_Sharp>
-									<ArmorRating_Blunt>1.2</ArmorRating_Blunt>
-								</statOffsets>
-								<capMods>
-									<li>
-										<capacity>Manipulation</capacity>
-										<offset>0.2</offset>
-									</li>
-									<li>
-										<capacity>Moving</capacity>
-										<offset>0.2</offset>
-									</li>
-								</capMods>
-							</li>
-							<li>
-								<label>level 5</label>
-								<minSeverity>5</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>1.0</ArmorRating_Sharp>
-									<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-								</statOffsets>
-								<capMods>
-									<li>
-										<capacity>Manipulation</capacity>
-										<offset>0.25</offset>
-									</li>
-									<li>
-										<capacity>Moving</capacity>
-										<offset>0.25</offset>
-									</li>
-								</capMods>
-							</li>
-						</stages>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_LightMedium/LightMedium_Defense.xml b/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_LightMedium/LightMedium_Defense.xml
deleted file mode 100644
index 339e2472ab..0000000000
--- a/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_LightMedium/LightMedium_Defense.xml	
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biotech Mech Stuff Elongated - Mechanoid Upgrades V2</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BMU_MechBoost_Armor_LightMedium_ImpactDampener"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<label>level 1</label>
-								<minSeverity>1</minSeverity>
-								<statFactors>
-									<IncomingDamageFactor>0.95</IncomingDamageFactor>
-									<StaggerDurationFactor>0.9</StaggerDurationFactor>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 2</label>
-								<minSeverity>2</minSeverity>
-								<statFactors>
-									<IncomingDamageFactor>0.9</IncomingDamageFactor>
-									<StaggerDurationFactor>0.8</StaggerDurationFactor>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 3</label>
-								<minSeverity>3</minSeverity>
-								<statFactors>
-									<IncomingDamageFactor>0.85</IncomingDamageFactor>
-									<StaggerDurationFactor>0.7</StaggerDurationFactor>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 4</label>
-								<minSeverity>4</minSeverity>
-								<statFactors>
-									<IncomingDamageFactor>0.8</IncomingDamageFactor>
-									<StaggerDurationFactor>0.6</StaggerDurationFactor>
-								</statFactors>
-							</li>
-							<li>
-								<label>level 5</label>
-								<minSeverity>5</minSeverity>
-								<statFactors>
-									<IncomingDamageFactor>0.75</IncomingDamageFactor>
-									<StaggerDurationFactor>0.5</StaggerDurationFactor>
-								</statFactors>
-							</li>
-						</stages>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_LightMedium/LightMedium_EMPResistance.xml b/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_LightMedium/LightMedium_EMPResistance.xml
deleted file mode 100644
index 0941bd3477..0000000000
--- a/Patches/Biotech Mech Stuff Elongated - Mechanoid Upgrades V2/Booster_LightMedium/LightMedium_EMPResistance.xml	
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biotech Mech Stuff Elongated - Mechanoid Upgrades V2</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BMU_MechBoost_Armor_LightMedium_EMPResistance"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<label>level 1</label>
-								<minSeverity>1</minSeverity>
-								<statOffsets>
-									<EMPResistance>0.125</EMPResistance>
-									<ArmorRating_Electric>0.125</ArmorRating_Electric>
-								</statOffsets>
-							</li>
-							<li>
-								<label>level 2</label>
-								<minSeverity>2</minSeverity>
-								<statOffsets>
-									<EMPResistance>0.25</EMPResistance>
-									<ArmorRating_Electric>0.25</ArmorRating_Electric>
-								</statOffsets>
-							</li>
-							<li>
-								<label>level 3</label>
-								<minSeverity>3</minSeverity>
-								<statOffsets>
-									<EMPResistance>0.375</EMPResistance>
-									<ArmorRating_Electric>0.375</ArmorRating_Electric>
-								</statOffsets>
-							</li>
-							<li>
-								<label>level 4</label>
-								<minSeverity>4</minSeverity>
-								<statOffsets>
-									<EMPResistance>0.5</EMPResistance>
-									<ArmorRating_Electric>0.5</ArmorRating_Electric>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Biotech Prestige Mechlord Armor 1.4/Apparel_Mech.xml b/Patches/Biotech Prestige Mechlord Armor 1.4/Apparel_Mech.xml
deleted file mode 100644
index d9e4af05b7..0000000000
--- a/Patches/Biotech Prestige Mechlord Armor 1.4/Apparel_Mech.xml	
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Biotech Prestige Mechlord Armor 1.4</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Prestige Mechlord Suit ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_PrestigeMechlordSuit"]/statBases</xpath>
-					<value>
-						<Bulk>90</Bulk>
-						<WornBulk>13</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_PrestigeMechlordSuit"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_PrestigeMechlordSuit"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>34</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ========== Prestige Mechlord Helmet ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_ArmorHelmetPrestigeMechlordHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_ArmorHelmetPrestigeMechlordHelmet"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>12</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_ArmorHelmetPrestigeMechlordHelmet"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>26</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ========== Prestige Mechcommander Helmet ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_ArmorHelmetPrestigeMechCommander"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ArmorHelmetPrestigeMechCommander"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ArmorHelmetPrestigeMechCommander"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Birds Beyond - Temperate Forest/Races_Animal_Birds.xml b/Patches/Birds Beyond - Temperate Forest/Races_Animal_Birds.xml
deleted file mode 100644
index 1f32e84c18..0000000000
--- a/Patches/Birds Beyond - Temperate Forest/Races_Animal_Birds.xml	
+++ /dev/null
@@ -1,286 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Birds Beyond: Temperate Forest</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ================== Barn Owl ===================-->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BB_BarnOwl"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BB_BarnOwl"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.24</MeleeDodgeChance>
-						<MeleeCritChance>0.03</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BB_BarnOwl"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>talons</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>beak</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.20</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>20</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.30</armorPenetrationBlunt>
-								<chanceFactor>0.8</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ================== Eagle Owl ===================-->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BB_EagleOwl"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BB_EagleOwl"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.24</MeleeDodgeChance>
-						<MeleeCritChance>0.03</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BB_EagleOwl"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>talons</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>beak</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.20</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>20</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.30</armorPenetrationBlunt>
-								<chanceFactor>0.8</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ================== Kestrel ===================-->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BB_Kestrel"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BB_Kestrel"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.24</MeleeDodgeChance>
-						<MeleeCritChance>0.03</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BB_Kestrel"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>talons</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>beak</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.20</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>20</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.30</armorPenetrationBlunt>
-								<chanceFactor>0.8</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ================== Crow ===================-->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BB_Crow"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BB_Crow"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.24</MeleeDodgeChance>
-						<MeleeCritChance>0.03</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BB_Crow"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>talons</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>beak</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.20</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>20</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.30</armorPenetrationBlunt>
-								<chanceFactor>0.8</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Black Widows/BodyDefs/Patch_BlackWidow_Body.xml b/Patches/Black Widows/BodyDefs/Patch_BlackWidow_Body.xml
deleted file mode 100644
index 8c5e1a1a66..0000000000
--- a/Patches/Black Widows/BodyDefs/Patch_BlackWidow_Body.xml	
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Black Widows 2.0</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======== Black Widow alien race. ======== -->
-				<!-- ==== Natural armor coverage. ==== -->
-				<!-- The torso and some of its children. -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "BlackWidow"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "BlackWidow"]/corePart/parts/li[def = "BlackWidow_Waist"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "BlackWidow"]/corePart/parts/li[def = "BlackWidow_Abdomen"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- The head. -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "BlackWidow"]/corePart/parts/li[def = "Neck"]/parts/li[def = "Head"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- ==== Know your left and right arms. ==== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "BlackWidow"]/corePart/parts/li[def = "BWTLShoulder" or def = "BWBLShoulder"]/parts/li[customLabel = "left arm" or customLabel = "left pedipalp"]/groups</xpath>
-					<value>
-						<li>LeftArm</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "BlackWidow"]/corePart/parts/li[def = "BWTRShoulder" or def = "BWBRShoulder"]/parts/li[customLabel = "right arm" or customLabel = "right pedipalp"]/groups</xpath>
-					<value>
-						<li>RightArm</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "BlackWidow"]/corePart/parts/li[def = "BWTLShoulder" or def = "BWBLShoulder"]/groups</xpath>
-					<value>
-						<li>LeftShoulder</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "BlackWidow"]/corePart/parts/li[def = "BWTRShoulder" or def = "BWBRShoulder"]/groups</xpath>
-					<value>
-						<li>RightShoulder</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Black Widows/BodyPartDefs/Patch_BlackWidows_Bodyparts.xml b/Patches/Black Widows/BodyPartDefs/Patch_BlackWidows_Bodyparts.xml
deleted file mode 100644
index 89c083361d..0000000000
--- a/Patches/Black Widows/BodyPartDefs/Patch_BlackWidows_Bodyparts.xml	
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Black Widows 2.0</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==== BionicPedipalp ==== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "BionicRightPedipalp" or defName = "BionicLeftPedipalp"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>bionic pedipalp</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.29</cooldownTime>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.484</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ==== BlackWidowShredderLeg ==== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "BlackWidowShredderLeg"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shredder leg</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>33</power>
-								<cooldownTime>2.13</cooldownTime>
-								<armorPenetrationSharp>3.63</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.63</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ==== BlackWidowSleipnirArm ==== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "BlackWidowSleipnirArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.08</cooldownTime>
-								<armorPenetrationBlunt>2.723</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Black Widows/PawnKindDefs/Patch_PawnKinds_BlackWidow.xml b/Patches/Black Widows/PawnKindDefs/Patch_PawnKinds_BlackWidow.xml
deleted file mode 100644
index 462232be06..0000000000
--- a/Patches/Black Widows/PawnKindDefs/Patch_PawnKinds_BlackWidow.xml	
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Black Widows (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======== Black Widow faction. ======== -->
-				<!-- ==== BlackWidowMatron ==== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="BlackWidowMatron"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>999999</min>
-								<max>3000000</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.9</shieldChance>
-						</li>
-					</value>
-				</li>
-
-				<!-- ==== BlackWidowTrader ==== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="BlackWidowTrader"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>1</min>
-								<max>3</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>100</min>
-								<max>200</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.6</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>50</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- ==== BlackWidowReaver ==== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="BlackWidowReaver"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>300</min>
-								<max>800</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.8</shieldChance>
-						</li>
-					</value>
-				</li>
-
-				<!-- ==== BlackWidowSniper ==== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="BlackWidowSniper"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>4</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>2000</min>
-								<max>3000</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.2</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>1000</min>
-										<max>2000</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- ==== BlackWidowSlasher ==== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="BlackWidowSlasher"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>400</min>
-								<max>999999</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.8</shieldChance>
-						</li>
-					</value>
-				</li>
-
-				<!-- ==== BlackWidowGrenadier ==== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="BlackWidowGrenadier"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>10</min>
-								<max>30</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>250</min>
-								<max>1000</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>200</min>
-									<max>600</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>CE_Sidearm_Melee</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Black Widows/ThingDefs_Buildings/Patch_Buildings_Widows.xml b/Patches/Black Widows/ThingDefs_Buildings/Patch_Buildings_Widows.xml
deleted file mode 100644
index 29576962ee..0000000000
--- a/Patches/Black Widows/ThingDefs_Buildings/Patch_Buildings_Widows.xml	
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Black Widows (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==== Turret_BWWebcannon ==== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Turret_BWWebcannon"]/statBases</xpath>
-					<value>
-						<Bulk>200</Bulk>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Turret_BWWebcannon"]</xpath>
-					<value>
-						<tradeTags>
-							<li>CE_Turret</li>
-						</tradeTags>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Turret_BWWebcannon"]/researchPrerequisites</xpath>
-					<value>
-						<researchPrerequisites>
-							<li>GunTurrets</li>
-						</researchPrerequisites>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Black Widows/ThingDefs_Items/Patch_Items_Resources.xml b/Patches/Black Widows/ThingDefs_Items/Patch_Items_Resources.xml
deleted file mode 100644
index 8737b6d2f2..0000000000
--- a/Patches/Black Widows/ThingDefs_Items/Patch_Items_Resources.xml	
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Black Widows (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==== WidowSilk ==== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WidowSilk"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.3</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WidowSilk"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.06</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WidowSilk"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<!-- ==== ThroneSilk ==== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ThroneSilk"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.5</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ThroneSilk"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ThroneSilk"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<!-- ==== AbyssSilk ==== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AbyssSilk"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.7</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AbyssSilk"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.14</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AbyssSilk"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<!-- ==== WidowSilk, ThroneSilk, AbyssSilk new thingCategory ==== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WidowSilk" or defName="ThroneSilk" or defName="AbyssSilk"]/stuffProps/categories</xpath>
-					<value>
-						<li>SoftArmor</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Black Widows/ThingDefs_Misc/Patch_Apparel_Various.xml b/Patches/Black Widows/ThingDefs_Misc/Patch_Apparel_Various.xml
deleted file mode 100644
index 271408ea57..0000000000
--- a/Patches/Black Widows/ThingDefs_Misc/Patch_Apparel_Various.xml	
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Black Widows (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==== Apparel_HoverThrone ==== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparel_HoverThrone"]/statBases/Mass</xpath>
-					<value>
-						<Mass>8</Mass>
-						<Bulk>60</Bulk>
-						<WornBulk>8</WornBulk>
-					</value>
-				</li>
-
-				<!-- ==== Apparel_BWSpiderFurs ==== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparel_BWSpiderFurs"]/statBases/Mass</xpath>
-					<value>
-						<Mass>4</Mass>
-						<Bulk>40</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-
-				<!-- ==== Apparel_MAGISuit ==== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparel_MAGISuit"]/statBases/Mass</xpath>
-					<value>
-						<Mass>40</Mass>
-						<Bulk>80</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparel_MAGISuit"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparel_MAGISuit"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>40.5</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparel_MAGISuit"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MoveSpeed>1</MoveSpeed>
-							<CarryWeight>60</CarryWeight>
-							<CarryBulk>8</CarryBulk>
-							<AimingDelayFactor>-0.2</AimingDelayFactor>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- ==== Apparel_BWDuster ==== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparel_BWDuster"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
-						<Bulk>7.5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<!-- ==== Apparel_BWWidowVeil ==== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparel_BWWidowVeil"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<!-- ==== Apparel_BWMAGISuitHelm ==== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparel_BWMAGISuitHelm"]/statBases/Mass</xpath>
-					<value>
-						<Mass>4</Mass>
-						<Bulk>8</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparel_BWMAGISuitHelm"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14.4</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparel_BWMAGISuitHelm"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>32.4</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparel_BWMAGISuitHelm"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<AimingAccuracy>0.2</AimingAccuracy>
-					</value>
-				</li>
-
-				<!-- ==== Apparel_BWReaverHelm ==== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparel_BWReaverHelm"]/statBases/Mass</xpath>
-					<value>
-						<Mass>6</Mass>
-						<Bulk>12</Bulk>
-						<WornBulk>4</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparel_BWReaverHelm"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparel_BWReaverHelm"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>37.8</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparel_BWReaverHelm"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>-0.3</AimingAccuracy>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Black Widows/ThingDefs_Races/Patch_Races_BlackWidow.xml b/Patches/Black Widows/ThingDefs_Races/Patch_Races_BlackWidow.xml
deleted file mode 100644
index 72ff416b4d..0000000000
--- a/Patches/Black Widows/ThingDefs_Races/Patch_Races_BlackWidow.xml	
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Black Widows (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Races_BlackWidow -->
-				<!-- Combat -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Races_BlackWidow"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Races_BlackWidow"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Races_BlackWidow"]/statBases/MeleeDodgeChance</xpath>
-					<value>
-						<AimingAccuracy>1</AimingAccuracy>
-						<MeleeCritChance>1.68</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<Suppressability>0.9</Suppressability>
-						<ReloadSpeed>1.1</ReloadSpeed>
-						<MeleeDodgeChance>1.41</MeleeDodgeChance>
-					</value>
-				</li>
-				<!-- Unarmed -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Races_BlackWidow"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.08</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>18</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.243</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.08</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>18</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.243</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Brood Mind</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>2.13</cooldownTime>
-								<linkedBodyPartsGroup>Torso</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>45</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>3.652</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Black Widows/ThingDefs_Races/Patch_Races_BlackWidow_Animal.xml b/Patches/Black Widows/ThingDefs_Races/Patch_Races_BlackWidow_Animal.xml
deleted file mode 100644
index f37fec2b66..0000000000
--- a/Patches/Black Widows/ThingDefs_Races/Patch_Races_BlackWidow_Animal.xml	
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Black Widows (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- BWFlooferMoth  -->
-				<!-- Combat -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BWFlooferMoth"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "BWFlooferMoth"]/statBases</xpath>
-					<value>
-						<MeleeCritChance>0.38</MeleeCritChance>
-						<MeleeParryChance>0.46</MeleeParryChance>
-						<MeleeDodgeChance>0.07</MeleeDodgeChance>
-					</value>
-				</li>
-				<!-- Unarmed -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BWFlooferMoth"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>psionic gem</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>2.52</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>45</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2.07</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<armorPenetrationBlunt>1.8</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left wing</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>3.09</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right wing</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>3.09</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>5.05</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- BWShadowWorm -->
-				<!-- Combat -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BWShadowWorm"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "BWShadowWorm"]/statBases</xpath>
-					<value>
-						<MeleeCritChance>0.18</MeleeCritChance>
-						<MeleeParryChance>0.27</MeleeParryChance>
-						<MeleeDodgeChance>0.07</MeleeDodgeChance>
-					</value>
-				</li>
-				<!-- Unarmed -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BWShadowWorm"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2.23</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<armorPenetrationBlunt>0.64</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.93</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.92</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2.65</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2.65</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Black Widows/ThingDefs_Weapons/Patch_Weapons.xml b/Patches/Black Widows/ThingDefs_Weapons/Patch_Weapons.xml
deleted file mode 100644
index 50ddd98037..0000000000
--- a/Patches/Black Widows/ThingDefs_Weapons/Patch_Weapons.xml	
+++ /dev/null
@@ -1,386 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Black Widows (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationInsert">
-					<xpath>Defs/ThingCategoryDef[defName="AmmoGreatArrows"]</xpath>
-					<value>
-						<!-- ==== Ammo ==== -->
-						<ThingCategoryDef>
-							<defName>AmmoBlackWidowArrows</defName>
-							<label>black widow arrows</label>
-							<parent>AmmoNeolithic</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberArrow</iconPath>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_BlackWidowArrow</defName>
-							<label>black widow arrows</label>
-							<ammoTypes>
-								<Ammo_BlackWidowArrow_Steel>Projectile_BlackWidowArrow_Steel</Ammo_BlackWidowArrow_Steel>
-								<Ammo_BlackWidowArrow_Plasteel>Projectile_BlackWidowArrow_Plasteel</Ammo_BlackWidowArrow_Plasteel>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="AmmoBlackWidowArrowBase" ParentName="NeolithicAmmoBase" Abstract="True">
-							<description>Special arrow designed by black widows for use in their bow.</description>
-							<statBases>
-								<Mass>0.2</Mass>
-								<Bulk>0.2</Bulk>
-								<Flammability>0.8</Flammability>
-							</statBases>
-							<thingCategories>
-								<li>AmmoBlackWidowArrows</li>
-							</thingCategories>
-							<stackLimit>200</stackLimit>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_FueledSmithy</li>
-								<li>CE_AutoEnableCrafting_ElectricSmithy</li>
-							</tradeTags>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoBlackWidowArrowBase">
-							<defName>Ammo_BlackWidowArrow_Steel</defName>
-							<label>black widow arrow (steel)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Medieval/Bolt/Steel</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>1.32</MarketValue>
-							</statBases>
-							<ammoClass>SteelArrow</ammoClass>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoBlackWidowArrowBase">
-							<defName>Ammo_BlackWidowArrow_Plasteel</defName>
-							<label>black widow arrow (plasteel)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Neolithic/Bolt/Plasteel</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>6.12</MarketValue>
-							</statBases>
-							<ammoClass>PlasteelArrow</ammoClass>
-							<generateAllowChance>0.5</generateAllowChance>
-						</ThingDef>
-						<!-- ================== Projectiles ================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="BaseBlackWidowArrowProjectile" ParentName="BaseBulletCE" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Arrow_Small</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Arrow</damageDef>
-								<speed>30</speed>
-							</projectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseBlackWidowArrowProjectile">
-							<defName>Projectile_BlackWidowArrow_Steel</defName>
-							<label>black widow arrow (steel)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationBlunt>6.686</armorPenetrationBlunt>
-								<armorPenetrationSharp>5.714</armorPenetrationSharp>
-								<preExplosionSpawnChance>0.8</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Ammo_BlackWidowArrow_Steel</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseBlackWidowArrowProjectile">
-							<defName>Projectile_BlackWidowArrow_Plasteel</defName>
-							<label>black widow arrow (plasteel)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Plasteel</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>24</damageAmountBase>
-								<armorPenetrationBlunt>8.56</armorPenetrationBlunt>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<preExplosionSpawnChance>0.9</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Ammo_BlackWidowArrow_Plasteel</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>MakeAmmo_BlackWidowArrow_Steel</defName>
-							<label>make steel black widow arrows x10</label>
-							<description>Craft 10 steel black widow arrows.</description>
-							<jobString>Making steel black widow arrows.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>3</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_BlackWidowArrow_Steel>10</Ammo_BlackWidowArrow_Steel>
-							</products>
-						</RecipeDef>
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>MakeAmmo_BlackWidowArrow_Plasteel</defName>
-							<label>make plasteel black widow arrows x10</label>
-							<description>Craft 10 plasteel black widow arrows.</description>
-							<jobString>Making plasteel black widow arrows.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-									<li>Plasteel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_BlackWidowArrow_Plasteel>10</Ammo_BlackWidowArrow_Plasteel>
-							</products>
-						</RecipeDef>
-					</value>
-				</li>
-
-				<!-- ==== Black Widow Rifle. ==== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_BWRifle</defName>
-					<statBases>
-						<Mass>10</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>10</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.73</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_5x35mmCharged</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>59</range>
-						<soundCast>ChargeLance_Fire</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<reloadTime>4</reloadTime><!-- ep... -->
-						<magazineSize>20</magazineSize><!-- ...ic -->
-						<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>BWRifle</li>
-						<li>BlackWidowRanged</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_BWRifle"]/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.63</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.55</cooldownTime>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ==== Black Widow Bow. ==== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Bow_BWBow</defName>
-					<statBases>
-						<Mass>8</Mass>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.8</ShotSpread>
-						<SwayFactor>3</SwayFactor>
-						<Bulk>7.5</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_BlackWidowArrow_Steel</defaultProjectile>
-						<warmupTime>8.5</warmupTime>
-						<range>54</range>
-						<soundCast>Bow_Large</soundCast>
-					</Properties>
-					<AmmoUser>
-						<ammoSet>AmmoSet_BlackWidowArrow</ammoSet>
-					</AmmoUser>
-					<weaponTags>
-						<li>BWBow</li>
-						<li>BlackWidowRanged</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bow_BWBow"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>upper blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.43</cooldownTime>
-								<armorPenetrationSharp>0.16</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.563</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>lower blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.43</cooldownTime>
-								<armorPenetrationSharp>0.16</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.563</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ==== Black Widow Scythe ==== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_bwscythe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>hand guard</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>hook</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.11</cooldownTime>
-								<armorPenetrationSharp>2.82</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>1.32</cooldownTime>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.375</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_bwscythe"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>0.5</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_bwscythe"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.6</MeleeDodgeChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_bwscythe"]/statBases/Mass</xpath>
-					<value>
-						<Mass>4</Mass>
-						<Bulk>8</Bulk>
-						<MeleeCounterParryBonus>0.54</MeleeCounterParryBonus>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_bwscythe" or defName="Bow_BWBow"]/stuffCategories</xpath>
-					<value>
-						<stuffCategories>
-							<li>Metallic_Weapon</li>
-						</stuffCategories>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Bori Race/PawnKindDefs/Bori_PawnKind.xml b/Patches/Bori Race/PawnKindDefs/Bori_PawnKind.xml
deleted file mode 100644
index 09e87335b6..0000000000
--- a/Patches/Bori Race/PawnKindDefs/Bori_PawnKind.xml	
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Bori race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--Ammo-->
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[
-								@Name="BoriCivBase"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>0</min>
-										<max>1</max>
-									</primaryMagazineCount>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[
-								defName="Bori_Soldier_Light" or
-								defName="Bori_Soldier"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>5</max>
-									</primaryMagazineCount>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[
-								defName="Bori_Soldier_Elite" or
-								defName="Bori_Soldier" or
-								defName="Bori_Soldier_MachineGun"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>3</min>
-										<max>7</max>
-									</primaryMagazineCount>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/PawnKindDef[defName="Bori_Soldier_MachineGun"]/weaponMoney</xpath>
-							<value>
-								<weaponMoney>
-									<min>600</min>
-									<max>2000</max>
-								</weaponMoney>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[
-								defName="Bori_Soldier_Boom"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>5</min>
-										<max>10</max>
-									</primaryMagazineCount>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[
-								defName="Bori_Space_Soldier" or
-								defName="Bori_0_Sniper" or
-								defName="Bori_0_SMG"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>6</max>
-									</primaryMagazineCount>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[
-								defName="Bori_Soldier_Boom"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>15</min>
-										<max>20</max>
-									</primaryMagazineCount>
-								</li>
-							</value>
-						</li>
-
-						<!--Backpack-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/PawnKindDef[
-								defName="Bori_Soldier_Light" or
-								defName="Bori_Soldier" or
-								defName="Bori_Soldier_Elite" or
-								defName="Bori_Soldier_MachineGun" or
-								defName="Bori_Assult" or
-								defName="Bori_Assult_Rocketeer" or
-								defName="Bori_Soldier_Boom" or
-								defName="Bori_Space_Soldier" or
-								defName="Bori_0_Sniper" or
-								defName="Bori_0_SMG"
-								]/apparelRequired </xpath>
-							<value>
-								<li>CE_Apparel_Backpack</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Bori Race/Scenario/Bori_Scenario.xml b/Patches/Bori Race/Scenario/Bori_Scenario.xml
deleted file mode 100644
index c6f3e24b5d..0000000000
--- a/Patches/Bori Race/Scenario/Bori_Scenario.xml	
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Bori race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ScenarioDef[defName="BoriStart"]/scenario/parts</xpath>
-							<value>
-								<li Class="ScenPart_StartingThing_Defined">
-									<def>StartingThing_Defined</def>
-									<thingDef>Ammo_8x22mmNambu_FMJ</thingDef>
-									<count>210</count>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ScenarioDef[defName="BoriStart"]/scenario/parts</xpath>
-							<value>
-								<li Class="ScenPart_StartingThing_Defined">
-									<def>StartingThing_Defined</def>
-									<thingDef>Ammo_30Carbine_FMJ</thingDef>
-									<count>120</count>
-								</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Bori Race/ThingDefs_Items/Items_Resources.xml b/Patches/Bori Race/ThingDefs_Items/Items_Resources.xml
deleted file mode 100644
index e07d149256..0000000000
--- a/Patches/Bori Race/ThingDefs_Items/Items_Resources.xml	
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Bori race</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!-- ==========  Chiffron Wool  =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="SP_Weave"]/statBases/StuffPower_Armor_Sharp</xpath>
-							<value>
-								<StuffPower_Armor_Sharp>0.05</StuffPower_Armor_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="SP_Weave"]/statBases/StuffPower_Armor_Blunt</xpath>
-							<value>
-								<StuffPower_Armor_Blunt>0.08</StuffPower_Armor_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="SP_Weave"]/statBases/StuffPower_Armor_Heat</xpath>
-							<value>
-								<StuffPower_Armor_Heat>0.10</StuffPower_Armor_Heat>
-								<StuffPower_Armor_Electric>0.05</StuffPower_Armor_Electric>
-							</value>
-						</li>
-
-						<!-- ==========  Orion  =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="SPBD_Orion"]/statBases/StuffPower_Armor_Sharp</xpath>
-							<value>
-								<StuffPower_Armor_Sharp>2.50</StuffPower_Armor_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="SPBD_Orion"]/statBases/StuffPower_Armor_Blunt</xpath>
-							<value>
-								<StuffPower_Armor_Blunt>3</StuffPower_Armor_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="SPBD_Orion"]/statBases/StuffPower_Armor_Heat</xpath>
-							<value>
-								<StuffPower_Armor_Heat>0.15</StuffPower_Armor_Heat>
-								<StuffPower_Armor_Electric>0.05</StuffPower_Armor_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="SPBD_Orion"]/stuffProps/statFactors</xpath>
-							<value>
-								<Mass>0.65</Mass>
-								<MeleePenetrationFactor>1.2</MeleePenetrationFactor>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="SPBD_Orion"]/stuffProps/categories</xpath>
-							<value>
-								<li>Metallic_Weapon</li>
-								<li>Steeled</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[
-								defName="SPBD_Orion"
-								]/statBases </xpath>
-							<value>
-								<Bulk>0.03</Bulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[
-								defName="SP_Weave"
-								]/statBases </xpath>
-							<value>
-								<Bulk>0.04</Bulk>
-								<WornBulk>0.0</WornBulk>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Bori Race/ThingDefs_Misc/Bori_Apparel.xml b/Patches/Bori Race/ThingDefs_Misc/Bori_Apparel.xml
deleted file mode 100644
index 9fe6e3cd17..0000000000
--- a/Patches/Bori Race/ThingDefs_Misc/Bori_Apparel.xml	
+++ /dev/null
@@ -1,326 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Bori race</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--========= Stuffable =========-->
-
-						<!--Basic-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="BD_CasualClothes" or defName="BD_WorkClothes"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
-								<Bulk>2</Bulk>
-								<WornBulk>0</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="BD_NewsboyCap"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-								<Bulk>1</Bulk>
-								<WornBulk>0</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="BD_NewsboyCap"]/statBases/ArmorRating_Blunt</xpath>
-						</li>
-
-						<!--Armor-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="BD_IndSoldierUniform"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-								<Bulk>8</Bulk>
-								<WornBulk>5</WornBulk>
-								<ArmorRating_Sharp>4</ArmorRating_Sharp>
-								<ArmorRating_Blunt>2</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="BD_IndSoldierUniform"]/statBases/Mass</xpath>
-							<value>
-								<Mass>8</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="BD_IndHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-								<Bulk>2</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<!--Armor-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="BD_IndSoldierArmour"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<Bulk>20</Bulk>
-								<WornBulk>8</WornBulk>
-								<ArmorRating_Sharp>10</ArmorRating_Sharp>
-								<ArmorRating_Blunt>14</ArmorRating_Blunt>
-								<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="BD_IndSoldierArmour"]/statBases/Mass</xpath>
-							<value>
-								<Mass>15</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="BD_IndSoldierArmour"]/equippedStatOffsets/MoveSpeed</xpath>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[defName="BD_IndSoldierArmour"]</xpath>
-							<value>
-								<li Class="CombatExtended.PartialArmorExt">
-									<stats>
-										<li>
-											<ArmorRating_Sharp>1.2</ArmorRating_Sharp>
-											<parts>
-												<li>Torso</li>
-											</parts>
-										</li>
-										<li>
-											<ArmorRating_Blunt>1.2</ArmorRating_Blunt>
-											<parts>
-												<li>Torso</li>
-											</parts>
-										</li>
-										<li>
-											<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-											<parts>
-												<li>Neck</li>
-												<li>Foot</li>
-											</parts>
-										</li>
-										<li>
-											<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-											<parts>
-												<li>Neck</li>
-												<li>Foot</li>
-											</parts>
-										</li>
-										<li>
-											<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-											<parts>
-												<li>Arm</li>
-											</parts>
-										</li>
-										<li>
-											<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-											<parts>
-												<li>Arm</li>
-											</parts>
-										</li>
-										<li>
-											<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-											<parts>
-												<li>Leg</li>
-											</parts>
-										</li>
-										<li>
-											<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-											<parts>
-												<li>Leg</li>
-											</parts>
-										</li>
-										<li>
-											<ArmorRating_Sharp>0.40</ArmorRating_Sharp>
-											<parts>
-												<li>Hand</li>
-											</parts>
-										</li>
-										<li>
-											<ArmorRating_Blunt>0.40</ArmorRating_Blunt>
-											<parts>
-												<li>Hand</li>
-											</parts>
-										</li>
-									</stats>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="BD_IndArmHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
-								<ArmorRating_Sharp>2</ArmorRating_Sharp>
-								<ArmorRating_Blunt>3</ArmorRating_Blunt>
-								<Bulk>4</Bulk>
-								<WornBulk>2</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="BD_MilitaryStyleCoat"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-								<Bulk>5</Bulk>
-								<WornBulk>2</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="BD_PeakedCap"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-								<ArmorRating_Sharp>1</ArmorRating_Sharp>
-								<Bulk>1</Bulk>
-								<WornBulk>0</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="BD_PeakedCap"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="BD_WindbreakPoncho"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>5.5</StuffEffectMultiplierArmor>
-								<Bulk>7</Bulk>
-								<WornBulk>4</WornBulk>
-							</value>
-						</li>
-
-						<!--Sheep-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="SP_ChroniclerUniform" or defName="SP_WorkClothes"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
-								<Bulk>2</Bulk>
-								<WornBulk>0</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="SP_ChroniclerCap"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-								<Bulk>1</Bulk>
-								<WornBulk>0</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="SP_ChroniclerCap"]/statBases/ArmorRating_Blunt</xpath>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="SP_WorkHairband"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-								<Bulk>1</Bulk>
-								<WornBulk>0</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="SP_SummerDress"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>0.75</StuffEffectMultiplierArmor>
-								<Bulk>2</Bulk>
-								<WornBulk>0</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="SP_SummerDress"]/statBases/Mass</xpath>
-							<value>
-								<Mass>0.65</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="SP_PiknicStrawHat"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>0.01</ArmorRating_Sharp>
-								<Bulk>1</Bulk>
-								<WornBulk>0</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="SP_PiknicStrawHat"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.01</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="SP_NurseUniform"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-								<Bulk>5</Bulk>
-								<WornBulk>3</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="SP_NurseCap"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-								<Bulk>1</Bulk>
-								<WornBulk>0.5</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="SP_NurseCap"]/statBases/ArmorRating_Blunt</xpath>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="SP_Special"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>4</ArmorRating_Sharp>
-								<Bulk>1</Bulk>
-								<WornBulk>0</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="SP_Special"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>2</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="SP_BellTag"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-								<Bulk>0.1</Bulk>
-								<WornBulk>0</WornBulk>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Bori Race/ThingDefs_Misc/Bori_Explosives.xml b/Patches/Bori Race/ThingDefs_Misc/Bori_Explosives.xml
deleted file mode 100644
index 5dc4dcc2be..0000000000
--- a/Patches/Bori Race/ThingDefs_Misc/Bori_Explosives.xml	
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Bori race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Remove Recipe Maker & Verbs ========== -->
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="BD_GrenadeFrag"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>BaseWeapon</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="BD_GrenadeFrag"]/recipeMaker</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="BD_GrenadeFrag"]/costList</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="BD_GrenadeFrag"]/verbs</xpath>
-				</li>
-
-				<!-- ========== Projectile thingClass ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Proj_BR_Fr"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<!-- ========== Projectile ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Proj_BR_Fr"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>1.5</explosionRadius>
-							<damageDef>Bomb</damageDef>
-							<damageAmountBase>80</damageAmountBase>
-							<explosionDelay>80</explosionDelay>
-							<dropsCasings>false</dropsCasings>
-							<speed>10</speed>
-							<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-							<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
-						</projectile>
-					</value>
-				</li>
-
-				<!-- ========== Check Comp ========== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Proj_BR_Fr"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Proj_BR_Fr"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<!-- ========== Add Fragmentation ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Proj_BR_Fr"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>60</Fragment_Small>
-							</fragments>
-						</li>
-					</value>
-				</li>
-				<!-- Weapon Stack and Appearance -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BD_GrenadeFrag"]/graphicData</xpath>
-					<value>
-						<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BD_GrenadeFrag"]</xpath>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<stackLimit>75</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="BD_GrenadeFrag"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<!-- Weapon Check Comps -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="BD_GrenadeFrag"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="BD_GrenadeFrag"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<!-- Weapon Values -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BD_GrenadeFrag"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>80</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>1.5</explosiveRadius>
-
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>60</Fragment_Small>
-							</fragments>
-						</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BD_GrenadeFrag</defName>
-					<statBases>
-						<Mass>1.08</Mass>
-						<MarketValue>7.42</MarketValue>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<label>throw grenade</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<range>10.0</range>
-						<minRange>4</minRange>
-						<warmupTime>0.8</warmupTime>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<soundCast>ThrowGrenade</soundCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<defaultProjectile>Proj_BR_Fr</defaultProjectile>
-						<onlyManualCast>true</onlyManualCast>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<weaponTags>
-						<li>CE_AI_Grenade</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>Craft_10_BR_Grenade</defName>
-							<label>Craft 10 frag grenades</label>
-							<description>Craft 10 frag grenades charges.</description>
-							<jobString>Crafting frag grenades</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>30</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-							</ingredients>
-							<researchPrerequisite>Bori_B3</researchPrerequisite>
-							<skillRequirements>
-								<Crafting>4</Crafting>
-							</skillRequirements>
-							<products>
-								<BD_GrenadeFrag>10</BD_GrenadeFrag>
-							</products>
-							<workAmount>20000</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Bori Race/ThingDefs_Misc/Weapons.xml b/Patches/Bori Race/ThingDefs_Misc/Weapons.xml
deleted file mode 100644
index 45bbb249e3..0000000000
--- a/Patches/Bori Race/ThingDefs_Misc/Weapons.xml	
+++ /dev/null
@@ -1,921 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Bori race</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!-- ========== Rifle =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>BD_BoltActionRifle</defName>
-							<statBases>
-								<SightsEfficiency>1.00</SightsEfficiency>
-								<ShotSpread>0.05</ShotSpread>
-								<SwayFactor>1.49</SwayFactor>
-								<Bulk>11.0</Bulk>
-								<Mass>3.90</Mass>
-								<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-							</statBases>
-							<costList>
-								<Steel>50</Steel>
-								<WoodLog>15</WoodLog>
-								<ComponentIndustrial>1</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>55</range>
-								<soundCast>Shot_BoltActionRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>7</muzzleFlashScale>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>5</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_3006Springfield</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== Light Rifle =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>BD_LightWeightedBoltActionRifle</defName>
-							<statBases>
-								<SightsEfficiency>1.00</SightsEfficiency>
-								<ShotSpread>0.08</ShotSpread>
-								<SwayFactor>1.14</SwayFactor>
-								<Bulk>9.00</Bulk>
-								<Mass>2.4</Mass>
-								<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-							</statBases>
-							<costList>
-								<Steel>50</Steel>
-								<WoodLog>5</WoodLog>
-								<ComponentIndustrial>3</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_30Carbine_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>37</range>
-								<soundCast>Shot_BoltActionRifle</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>7</muzzleFlashScale>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>25</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_30Carbine</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== SMG =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>BD_SdangSMG</defName>
-							<statBases>
-								<SightsEfficiency>1</SightsEfficiency>
-								<ShotSpread>0.14</ShotSpread>
-								<SwayFactor>0.96</SwayFactor>
-								<Bulk>4.81</Bulk>
-								<Mass>2.7</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							</statBases>
-							<costList>
-								<Steel>40</Steel>
-								<ComponentIndustrial>5</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<recoilAmount>1.44</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<burstShotCount>5</burstShotCount>
-								<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-								<range>25</range>
-								<soundCast>Shot_HeavySMG</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>35</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>Snapshot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== LMG =========== -->
-						<!--			
-			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-				<defName>BD_HeavyMachineGun</defName>
-				<statBases>
-					<SightsEfficiency>1.00</SightsEfficiency>
-					<ShotSpread>0.05</ShotSpread>
-					<SwayFactor>2.61</SwayFactor>
-					<Bulk>15.46</Bulk>
-					<Mass>12.60</Mass>
-					<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-				</statBases>
-				<costList>
-				  <Steel>105</Steel>
-				  <ComponentIndustrial>5</ComponentIndustrial>
-				</costList>
-				<Properties>
-					<recoilAmount>1.19</recoilAmount>
-					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-					<hasStandardCommand>true</hasStandardCommand>
-					<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
-					<warmupTime>1.3</warmupTime>
-					<burstShotCount>10</burstShotCount>
-					<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-					<range>44</range>
-					<soundCast>Shot_Minigun</soundCast>
-					<soundCastTail>GunTail_Medium</soundCastTail>
-					<muzzleFlashScale>9</muzzleFlashScale>
-				</Properties>
-				
-				<AmmoUser>
-					<magazineSize>100</magazineSize>
-					<reloadTime>7.8</reloadTime>
-					<ammoSet>AmmoSet_3006Springfield</ammoSet>
-				</AmmoUser>
-				<FireModes>
-					<aimedBurstShotCount>5</aimedBurstShotCount>
-					<aiUseBurstMode>FALSE</aiUseBurstMode>
-					<aiAimMode>SuppressFire</aiAimMode>
-				</FireModes>
-			</li>
--->
-						<!-- ========== LMG - Tripod=========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>BD_MtHeavyMachineGun</defName>
-							<statBases>
-								<SightsEfficiency>1.00</SightsEfficiency>
-								<ShotSpread>0.05</ShotSpread>
-								<SwayFactor>1.04</SwayFactor>
-								<Bulk>18.00</Bulk>
-								<Mass>16.00</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							</statBases>
-							<costList>
-								<Steel>145</Steel>
-								<ComponentIndustrial>6</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<recoilAmount>0.98</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
-								<warmupTime>0.8</warmupTime>
-								<burstShotCount>10</burstShotCount>
-								<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-								<range>44</range>
-								<soundCast>Shot_Minigun</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<weaponTags>
-								<li>Bipod_ATR</li>
-							</weaponTags>
-							<AmmoUser>
-								<magazineSize>100</magazineSize>
-								<reloadTime>7.8</reloadTime>
-								<ammoSet>AmmoSet_3006Springfield</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>5</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>SuppressFire</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== Rifle =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>BD_AssaultRifle</defName>
-							<statBases>
-								<SightsEfficiency>1.00</SightsEfficiency>
-								<ShotSpread>0.09</ShotSpread>
-								<SwayFactor>1.22</SwayFactor>
-								<Bulk>8.89</Bulk>
-								<Mass>3.5</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							</statBases>
-							<costList>
-								<Steel>45</Steel>
-								<WoodLog>10</WoodLog>
-								<ComponentIndustrial>6</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<recoilAmount>1.56</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_30Carbine_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-								<range>61</range>
-								<soundCast>Shot_AssaultRifle</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>30</magazineSize>
-								<reloadTime>4.5</reloadTime>
-								<ammoSet>AmmoSet_30Carbine</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== Plamsa Pistol =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>BD_Autopistol</defName>
-							<statBases>
-								<SightsEfficiency>0.70</SightsEfficiency>
-								<ShotSpread>0.17</ShotSpread>
-								<SwayFactor>1.00</SwayFactor>
-								<Bulk>1.90</Bulk>
-								<Mass>1.11</Mass>
-								<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-							</statBases>
-
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>15</range>
-								<soundCast>Shot_Autopistol</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>9</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiAimMode>Snapshot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="BD_Autopistol"]/weaponTags</xpath>
-							<value>
-								<li>CE_OneHandedWeapon</li>
-							</value>
-						</li>
-
-						<!-- ========== Auto Heavy Rifle =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>BD_AutoBoltActionRifle</defName>
-							<statBases>
-								<SightsEfficiency>1.00</SightsEfficiency>
-								<ShotSpread>0.09</ShotSpread>
-								<SwayFactor>1.56</SwayFactor>
-								<Bulk>11.50</Bulk>
-								<Mass>4.12</Mass>
-								<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-							</statBases>
-							<costList>
-								<Steel>55</Steel>
-								<WoodLog>15</WoodLog>
-								<ComponentIndustrial>6</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<recoilAmount>2.08</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-								<range>55</range>
-								<soundCast>Shot_SniperRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>7</muzzleFlashScale>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>20</magazineSize>
-								<reloadTime>4.5</reloadTime>
-								<ammoSet>AmmoSet_3006Springfield</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== Sniper Rifle =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>BD_Sniper</defName>
-							<statBases>
-								<SightsEfficiency>2.26</SightsEfficiency>
-								<ShotSpread>0.05</ShotSpread>
-								<SwayFactor>1.65</SwayFactor>
-								<Bulk>11.0</Bulk>
-								<Mass>4.72</Mass>
-								<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-							</statBases>
-							<costList>
-								<Steel>55</Steel>
-								<WoodLog>15</WoodLog>
-								<ComponentIndustrial>3</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
-								<warmupTime>1.5</warmupTime>
-								<range>75</range>
-								<soundCast>Shot_BoltActionRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>7</muzzleFlashScale>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>6</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_3006Springfield</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== Charge Sniper Rifle =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>BD_ChargeLance</defName>
-							<statBases>
-								<SightsEfficiency>2.26</SightsEfficiency>
-								<ShotSpread>0.05</ShotSpread>
-								<SwayFactor>1.65</SwayFactor>
-								<Bulk>11.0</Bulk>
-								<Mass>5.60</Mass>
-								<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-							</statBases>
-							<costList>
-								<Steel>60</Steel>
-								<Plasteel>30</Plasteel>
-								<Chemfuel>25</Chemfuel>
-								<ComponentIndustrial>11</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_8x50mmCharged</defaultProjectile>
-								<warmupTime>1.9</warmupTime>
-								<range>86</range>
-								<soundCast>ChargeLance_Fire</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>15</magazineSize>
-								<reloadTime>4.5</reloadTime>
-								<ammoSet>AmmoSet_8x50mmCharged</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== Charge Rifle =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>BD_ChargeRifle</defName>
-							<statBases>
-								<SightsEfficiency>1.00</SightsEfficiency>
-								<ShotSpread>0.09</ShotSpread>
-								<SwayFactor>1.56</SwayFactor>
-								<Bulk>9.50</Bulk>
-								<Mass>4.12</Mass>
-								<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-							</statBases>
-							<costList>
-								<Steel>60</Steel>
-								<Plasteel>30</Plasteel>
-								<Chemfuel>25</Chemfuel>
-								<ComponentIndustrial>11</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<recoilAmount>1.23</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
-								<warmupTime>1.0</warmupTime>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-								<range>65</range>
-								<soundCast>Shot_ChargeRifle</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>7</muzzleFlashScale>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>30</magazineSize>
-								<reloadTime>4.5</reloadTime>
-								<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="BD_ChargeRifle"]/weaponTags</xpath>
-							<value>
-								<li>NoSwitch</li>
-							</value>
-						</li>
-
-						<!-- ========== Charge SMG =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>BD_ChargeSMG</defName>
-							<statBases>
-								<SightsEfficiency>1</SightsEfficiency>
-								<ShotSpread>0.14</ShotSpread>
-								<SwayFactor>1.21</SwayFactor>
-								<Bulk>7.85</Bulk>
-								<Mass>4.25</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							</statBases>
-							<costList>
-								<Steel>60</Steel>
-								<Plasteel>30</Plasteel>
-								<Chemfuel>25</Chemfuel>
-								<ComponentIndustrial>11</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<recoilAmount>1.06</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
-								<warmupTime>0.5</warmupTime>
-								<burstShotCount>5</burstShotCount>
-								<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-								<range>31</range>
-								<soundCast>Shot_ChargeRifle</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>40</magazineSize>
-								<reloadTime>4.5</reloadTime>
-								<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>Snapshot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== Heavy SMG =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>BD_HeavySMG</defName>
-							<statBases>
-								<SightsEfficiency>1</SightsEfficiency>
-								<ShotSpread>0.14</ShotSpread>
-								<SwayFactor>0.97</SwayFactor>
-								<Bulk>4.81</Bulk>
-								<Mass>3.2</Mass>
-								<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-							</statBases>
-							<costList>
-								<Steel>40</Steel>
-								<ComponentIndustrial>5</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<recoilAmount>1.27</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_357Magnum_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<burstShotCount>5</burstShotCount>
-								<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-								<range>21</range>
-								<soundCast>Shot_HeavySMG</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>25</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_357Magnum</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>Snapshot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!-- ==========  Claymore  =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="BD_Claymore"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>5</power>
-										<cooldownTime>2.01</cooldownTime>
-										<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>point</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>47</power>
-										<cooldownTime>2.01</cooldownTime>
-										<chanceFactor>1.165</chanceFactor>
-										<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
-										<armorPenetrationSharp>1.2</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>edge</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>60</power>
-										<cooldownTime>3.12</cooldownTime>
-										<chanceFactor>1.165</chanceFactor>
-										<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.8</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="BD_Claymore"]/statBases</xpath>
-							<value>
-								<Bulk>12</Bulk>
-								<MeleeCounterParryBonus>0.59</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="BD_Claymore"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.08</MeleeCritChance>
-									<MeleeParryChance>0.5</MeleeParryChance>
-									<MeleeDodgeChance>0.5</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-						<!-- ==========  Halberd  =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="BD_halberd"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>Blade</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>47</power>
-										<cooldownTime>2.9</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>27</power>
-										<cooldownTime>1.16</cooldownTime>
-										<chanceFactor>1.165</chanceFactor>
-										<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
-										<armorPenetrationSharp>2.03</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>Shaft</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>6</power>
-										<cooldownTime>1.31</cooldownTime>
-										<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="BD_halberd"]/statBases</xpath>
-							<value>
-								<Bulk>10</Bulk>
-								<MeleeCounterParryBonus>1.08</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="BD_halberd"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.22</MeleeCritChance>
-									<MeleeParryChance>1.53</MeleeParryChance>
-									<MeleeDodgeChance>0.67</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-						<!-- ==========  Spear  =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="BD_Spear"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>shaft</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>7</power>
-										<cooldownTime>1.35</cooldownTime>
-										<chanceFactor>0.15</chanceFactor>
-										<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>shaft</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>4</power>
-										<cooldownTime>1.78</cooldownTime>
-										<chanceFactor>0.05</chanceFactor>
-										<armorPenetrationBlunt>1</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>18</power>
-										<cooldownTime>1.19</cooldownTime>
-										<chanceFactor>1.00</chanceFactor>
-										<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-										<armorPenetrationSharp>2.5</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="BD_Spear"]/statBases</xpath>
-							<value>
-								<Bulk>10</Bulk>
-								<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="BD_Spear"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.24</MeleeCritChance>
-									<MeleeParryChance>1.45</MeleeParryChance>
-									<MeleeDodgeChance>0.9</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-						<!-- ==========  Cane  =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="SP_Staff"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>shaft</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>7</power>
-										<cooldownTime>1.35</cooldownTime>
-										<chanceFactor>0.15</chanceFactor>
-										<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>shaft</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>4</power>
-										<cooldownTime>1.78</cooldownTime>
-										<chanceFactor>0.05</chanceFactor>
-										<armorPenetrationBlunt>1</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="SP_Staff"]/statBases</xpath>
-							<value>
-								<Bulk>6</Bulk>
-								<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="SP_Staff"]/equippedStatOffsets</xpath>
-							<value>
-								<MeleeCritChance>0.24</MeleeCritChance>
-								<MeleeParryChance>1.45</MeleeParryChance>
-								<MeleeDodgeChance>0.9</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<!-- ==========  Melee Tools  =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="BD_BoltActionRifle" or
-								defName="BD_LightWeightedBoltActionRifle" or
-								defName="BD_SdangSMG" or
-								defName="BD_MtHeavyMachineGun" or
-								defName="BD_AssaultRifle" or
-								defName="BD_AutoBoltActionRifle" or
-								defName="BD_Sniper" or
-								defName="BD_HeavySMG" or
-								defName="BD_ChargeLance" or
-								defName="BD_ChargeSMG"
-								]/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>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="BD_Autopistol"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>grip</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>1.54</cooldownTime>
-										<chanceFactor>1.5</chanceFactor>
-										<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>muzzle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>1.54</cooldownTime>
-										<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="BD_ChargeRifle"]/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</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>
-										<chanceFactor>0.5</chanceFactor>
-										<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>bayonet</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>10</power>
-										<cooldownTime>1.62</cooldownTime>
-										<armorPenetrationBlunt>2.304</armorPenetrationBlunt>
-										<armorPenetrationSharp>1.5</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Bori Race/ThingDefs_Races/AlienRace_Bori.xml b/Patches/Bori Race/ThingDefs_Races/AlienRace_Bori.xml
deleted file mode 100644
index be2bdd3fb1..0000000000
--- a/Patches/Bori Race/ThingDefs_Races/AlienRace_Bori.xml	
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Bori race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="BaseBoriPawn"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="BaseBoriPawn"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Bori"]/statBases/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>1.5</MeleeDodgeChance>
-						<Suppressability>0.8</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Bori"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.375</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.375</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>3.9</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Bori"]/alienRace/raceRestriction/whiteApparelList</xpath>
-					<value>
-						<li>CE_Apparel_TacVest</li>
-						<li>CE_Apparel_Backpack</li>
-						<li>CE_Apparel_TribalBackpack</li>
-						<li>CE_Apparel_BallisticShield</li>
-						<li>CE_Apparel_MeleeShield</li>
-						<li>CE_Apparel_GasMask</li>
-						<li>CE_Apparel_ImprovGasMask</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="BaseSPPawn"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="BaseSPPawn"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_SP"]/statBases/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>1.2</MeleeDodgeChance>
-						<Suppressability>1</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_SP"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.44</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.200</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.44</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.200</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.75</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.500</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_SP"]/alienRace/raceRestriction</xpath>
-					<value>
-						<whiteApparelList>
-							<li>CE_Apparel_TacVest</li>
-							<li>CE_Apparel_Backpack</li>
-							<li>CE_Apparel_TribalBackpack</li>
-							<li>CE_Apparel_BallisticShield</li>
-							<li>CE_Apparel_MeleeShield</li>
-							<li>CE_Apparel_GasMask</li>
-							<li>CE_Apparel_ImprovGasMask</li>
-						</whiteApparelList>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Bori Race/ThingDefs_Races/Race_Realyangdang.xml b/Patches/Bori Race/ThingDefs_Races/Race_Realyangdang.xml
deleted file mode 100644
index 14a8db126c..0000000000
--- a/Patches/Bori Race/ThingDefs_Races/Race_Realyangdang.xml	
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-
-		<mods>
-			<li>Bori race</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Canis_Lupus_Crinitus"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Canis_Lupus_Crinitus"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.8</cooldownTime>
-								<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.8</cooldownTime>
-								<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>1.63</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.380</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Canis_Lupus_Crinitus"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/British Weapons Set/British_weapon_set.xml b/Patches/British Weapons Set/British_weapon_set.xml
deleted file mode 100644
index 875067f88b..0000000000
--- a/Patches/British Weapons Set/British_weapon_set.xml	
+++ /dev/null
@@ -1,774 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>British Weapon Set</li>
-		</mods>
-		<match Class='PatchOperationSequence'>
-
-			<operations>
-
-				<!-- Bren Gun -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BWS_Bren</defName>
-					<statBases>
-						<Mass>11</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.53</SwayFactor>
-						<Bulk>12</Bulk>
-						<WorkToMake>30500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>85</Steel>
-						<WoodLog>10</WoodLog>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.32</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>60</range>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_303British</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_MachineGun</li>
-						<li>CE_AI_LMG</li>
-						<li>Bipod_LMG</li>
-					</weaponTags>
-					<researchPrerequisite>GasOperation</researchPrerequisite>
-					<AllowWithRunAndGun>FALSE</AllowWithRunAndGun>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BWS_Bren"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.35,1.18</DrawSize>
-							<DrawOffset>0.13,-0.03</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<!-- Browning HP -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BWP_Browning</defName>
-					<statBases>
-						<Mass>1</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.07</SwayFactor>
-						<Bulk>1.90</Bulk>
-						<WorkToMake>5000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>20</Steel>
-						<WoodLog>5</WoodLog>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_BROOM</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-					<researchPrerequisite>BlowbackOperation</researchPrerequisite>
-					<AllowWithRunAndGun>true</AllowWithRunAndGun>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BWP_Browning"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.00,1.00</DrawSize>
-							<DrawOffset>0.0,0.0</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<!-- EM-2 -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BWP_EM</defName>
-					<statBases>
-						<Mass>3.5</Mass>
-						<RangedWeapon_Cooldown>0.40</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.35</SwayFactor>
-						<Bulk>8.30</Bulk>
-						<WorkToMake>50000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>50</Steel>
-						<WoodLog>35</WoodLog>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>50</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>6</burstShotCount>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4.4</reloadTime>
-						<ammoSet>AmmoSet_303British</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>true</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AR</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-					<AllowWithRunAndGun>true</AllowWithRunAndGun>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BWP_EM"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.25,1.33</DrawSize>
-							<DrawOffset>0.12,-0.10</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<!-- Lee-3 -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BWS_LeeA</defName>
-					<statBases>
-						<Mass>3.80</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.30</SwayFactor>
-						<Bulk>10.60</Bulk>
-						<WorkToMake>11000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>50</Steel>
-						<WoodLog>25</WoodLog>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>50</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_303British</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_SR</li>
-					</weaponTags>
-					<researchPrerequisite>Gunsmithing</researchPrerequisite>
-					<AllowWithRunAndGun>FALSE</AllowWithRunAndGun>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BWS_LeeA"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.34,1.34</DrawSize>
-							<DrawOffset>0.12,-0.10</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<!-- Lee-4 -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BWS_LeeB</defName>
-					<statBases>
-						<Mass>4</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.40</SwayFactor>
-						<Bulk>11.30</Bulk>
-						<WorkToMake>12000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>60</Steel>
-						<WoodLog>10</WoodLog>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>53</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_303British</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_SR</li>
-					</weaponTags>
-					<researchPrerequisite>Gunsmithing</researchPrerequisite>
-					<AllowWithRunAndGun>FALSE</AllowWithRunAndGun>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BWS_LeeB"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.34,1.34</DrawSize>
-							<DrawOffset>0.12,-0.10</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<!-- Lewis Gun -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BWS_LewisGun</defName>
-					<statBases>
-						<Mass>13</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.5</ShotSpread>
-						<SwayFactor>1.83</SwayFactor>
-						<Bulk>18</Bulk>
-						<WorkToMake>34000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>110</Steel>
-						<WoodLog>20</WoodLog>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.32</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>65</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>47</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_3006Springfield</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_MachineGun</li>
-						<li>CE_AI_LMG</li>
-						<li>Bipod_LMG</li>
-					</weaponTags>
-					<researchPrerequisite>GasOperation</researchPrerequisite>
-					<AllowWithRunAndGun>FALSE</AllowWithRunAndGun>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BWS_LewisGun"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.35,1.18</DrawSize>
-							<DrawOffset>0.13,-0.03</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<!-- Martini Henry -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BWP_MartiniHenry</defName>
-					<statBases>
-						<Mass>3.8</Mass>
-						<RangedWeapon_Cooldown>0.75</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1.30</SwayFactor>
-						<Bulk>11</Bulk>
-						<WorkToMake>8000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<WoodLog>40</WoodLog>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>60</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>10</AmmoGenPerMagOverride>
-						<reloadTime>2</reloadTime>
-						<ammoSet>AmmoSet_303British</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_SR</li>
-					</weaponTags>
-					<researchPrerequisite>Gunsmithing</researchPrerequisite>
-					<AllowWithRunAndGun>FALSE</AllowWithRunAndGun>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BWP_MartiniHenry"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.34,1.34</DrawSize>
-							<DrawOffset>0.12,0.0</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<!-- Sten -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BWS_Sten</defName>
-					<statBases>
-						<Mass>3.2</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>0.80</SwayFactor>
-						<Bulk>5</Bulk>
-						<WorkToMake>15000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>6</burstShotCount>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-					<researchPrerequisite>BlowbackOperation</researchPrerequisite>
-					<AllowWithRunAndGun>true</AllowWithRunAndGun>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BWS_Sten"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>0.85,0.85</DrawSize>
-							<DrawOffset>0.00,-0.03</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<!-- Sterling -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BWS_Sterling</defName>
-					<statBases>
-						<Mass>2.7</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>0.80</SwayFactor>
-						<Bulk>4</Bulk>
-						<WorkToMake>21000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>24</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-					<researchPrerequisite>BlowbackOperation</researchPrerequisite>
-					<AllowWithRunAndGun>true</AllowWithRunAndGun>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BWS_Sterling"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>0.85,0.85</DrawSize>
-							<DrawOffset>0.00,-0.03</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<!-- Tommy Gun -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BWP_TommyB</defName>
-					<statBases>
-						<Mass>5</Mass>
-						<RangedWeapon_Cooldown>0.40</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.10</ShotSpread>
-						<SwayFactor>1.14</SwayFactor>
-						<Bulk>8.50</Bulk>
-						<WorkToMake>27000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<WoodLog>25</WoodLog>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.18</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>25</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>Shot_HeavySMG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-					<researchPrerequisite>BlowbackOperation</researchPrerequisite>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BWP_TommyB"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>0.85,0.85</DrawSize>
-							<DrawOffset>0.00,-0.03</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<!-- Webley -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BWS_Webley</defName>
-					<statBases>
-						<Mass>1.1</Mass>
-						<RangedWeapon_Cooldown>0.49</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>2.41</Bulk>
-						<WorkToMake>7000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>20</Steel>
-						<WoodLog>10</WoodLog>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_455Webley_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Revolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_455Webley</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_BROOM</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-					<researchPrerequisite>Gunsmithing</researchPrerequisite>
-					<AllowWithRunAndGun>true</AllowWithRunAndGun>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BWS_Webley"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.00,1.00</DrawSize>
-							<DrawOffset>0.0,0.0</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<!-- L1A1 -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BWP_FAL</defName>
-					<statBases>
-						<Mass>4.3</Mass>
-						<RangedWeapon_Cooldown>0.40</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.52</SwayFactor>
-						<Bulk>10.90</Bulk>
-						<WorkToMake>28000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>55</Steel>
-						<WoodLog>10</WoodLog>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.07</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>6</burstShotCount>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>true</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AR</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-					<AllowWithRunAndGun>true</AllowWithRunAndGun>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BWP_FAL"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.25,1.33</DrawSize>
-							<DrawOffset>0.12,-0.10</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<!-- Tools -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BWP_Browning" or defName="BWS_Webley"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName="BWS_Bren" or
-						defName="BWS_LeeA" or
-						defName="BWS_LeeB" or
-						defName="BWS_LewisGun" or
-						defName="BWS_Sten" or
-						defName="BWS_Sterling" or
-						defName="BWP_EM" or
-						defName="BWP_MartiniHenry" or
-						defName="BWP_TommyB" or
-						defName="BWP_FAL"
-						]/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>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Bulgarian Imperial Uniforms/Apparel_Industrial.xml b/Patches/Bulgarian Imperial Uniforms/Apparel_Industrial.xml
deleted file mode 100644
index fd8bd173d7..0000000000
--- a/Patches/Bulgarian Imperial Uniforms/Apparel_Industrial.xml	
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Bulgarian Imperial Uniforms</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Uniform -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Hessian_Bulgarian_Uniform"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Hessian_Bulgarian_Uniform"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Hessian_Bulgarian_Uniform"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Uniform Cap -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Hessian_Bulgarian_Cap"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.02</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Hessian_Bulgarian_Cap"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.03</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Webbing -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Hessian_Bulgarian_Webbing"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.02</ArmorRating_Sharp>
-						<Bulk>5</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Hessian_Bulgarian_Webbing"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.03</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Hessian_Bulgarian_Webbing"]/equippedStatOffsets/CarryingCapacity</xpath>
-					<value>
-						<CarryBulk>45</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Hessian_Bulgarian_Webbing"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Hessian_Bulgarian_Webbing"]/apparel/layers/li[.="Belt"]</xpath>
-					<value>
-						<li>Webbing</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Hessian_Bulgarian_Webbing"]/apparel/bodyPartGroups/li[.="Waist"]</xpath>
-					<value>
-						<li>Shoulders</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Bulgarian Imperial Uniforms/RangedIndustrial.xml b/Patches/Bulgarian Imperial Uniforms/RangedIndustrial.xml
deleted file mode 100644
index 1550f78ba3..0000000000
--- a/Patches/Bulgarian Imperial Uniforms/RangedIndustrial.xml	
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Bulgarian Imperial Uniforms</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_M1879_Peabody_Martini"]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_M1879_Peabody_Martini_Bayonet"]/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>bayonet</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>2.14</cooldownTime>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>bayonet</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.49</cooldownTime>
-								<armorPenetrationBlunt>2.16</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.44</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_M1879_Peabody_Martini</defName>
-					<statBases>
-						<Mass>3.83</Mass>
-						<Bulk>12.45</Bulk>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.63</SwayFactor>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.87</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>10</AmmoGenPerMagOverride>
-						<reloadTime>2</reloadTime>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<ammoSet>AmmoSet_303British</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_M1879_Peabody_Martini_Bayonet</defName>
-					<statBases>
-						<Mass>4.40</Mass>
-						<Bulk>14.85</Bulk>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.71</SwayFactor>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.87</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>10</AmmoGenPerMagOverride>
-						<reloadTime>2</reloadTime>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<ammoSet>AmmoSet_303British</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_AI_Rifle</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Gun_M1879_Peabody_Martini_Bayonet" or defName="Gun_M1879_Peabody_Martini"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.34,1.84</DrawSize>
-							<DrawOffset>0.12,-0.10</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_Armor.xml b/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_Armor.xml
deleted file mode 100644
index d7f17edf1d..0000000000
--- a/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_Armor.xml	
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] British Military Kit</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== load carrying Jerkin (RAF) ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_LoadCarryingVest_RAF"]/statBases</xpath>
-					<value>
-						<Bulk>2.5</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_LoadCarryingVest_RAF"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>10</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_LoadCarryingVest_RAF"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>3.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_LoadCarryingVest_RAF"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_LoadCarryingVest_RAF"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.36</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!-- ========== Osprey body armour ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_Osprey_Vest"]/statBases</xpath>
-					<value>
-						<Bulk>7.5</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_Osprey_Vest"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>10</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_Osprey_Vest"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_Osprey_Vest"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>25</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_Osprey_Vest"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.36</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!-- ========== VIRTUS STV body armor ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_VIRTUSSTV_Vest"]/statBases</xpath>
-					<value>
-						<Bulk>6.5</Bulk>
-						<WornBulk>4</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_VIRTUSSTV_Vest"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>10</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_VIRTUSSTV_Vest"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_VIRTUSSTV_Vest"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>28</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_VIRTUSSTV_Vest"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.36</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!-- ========== Crye JPC body armor (UKSF) ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_CryeJPC_UKSF"]/statBases</xpath>
-					<value>
-						<Bulk>5.5</Bulk>
-						<WornBulk>3.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_CryeJPC_UKSF"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>10</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_CryeJPC_UKSF"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_CryeJPC_UKSF"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>28</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_CryeJPC_UKSF"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.36</ArmorRating_Heat>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_Armor_Headgear.xml b/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_Armor_Headgear.xml
deleted file mode 100644
index 9c8b9ed783..0000000000
--- a/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_Armor_Headgear.xml	
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] British Military Kit</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== AFV crew helmet ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_AFV_CrewHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1.5</WornBulk>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-						<ArmorRating_Blunt>13</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.54</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_AFV_CrewHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>0.20</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== aircrew helmet (RAF) ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_RAFAircrewHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>3.75</Bulk>
-						<WornBulk>1.5</WornBulk>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-						<ArmorRating_Blunt>13</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.54</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_RAFAircrewHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>0.20</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Mk 7 helmet ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_MK7Helmet"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1.25</WornBulk>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-						<ArmorRating_Blunt>13</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.54</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_MK7Helmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>0.20</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== VIRTUS helmet (standard, goggle up, goggle down, masked, full masked, GSR gasmask, para, marine variants) ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_VIRTUSHelmet" or
-						defName="RNApparel_VIRTUSHelmet_GoggleUp" or
-						defName="RNApparel_VIRTUSHelmet_GoggleDown" or
-						defName="RNApparel_VIRTUSHelmet_Masked" or
-						defName="RNApparel_VIRTUSHelmet_FullMasked" or
-						defName="RNApparel_VIRTUSHelmet_GSRGasmask" or
-						defName="RNApparel_VIRTUSHelmet_Scrim" or
-						defName="RNApparel_VIRTUSHelmet_CamCream"
-						]/statBases </xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.54</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_VIRTUSHelmet" or
-						defName="RNApparel_VIRTUSHelmet_GoggleUp" or
-						defName="RNApparel_VIRTUSHelmet_GoggleDown" or
-						defName="RNApparel_VIRTUSHelmet_Masked" or
-						defName="RNApparel_VIRTUSHelmet_FullMasked" or
-						defName="RNApparel_VIRTUSHelmet_GSRGasmask" or
-						defName="RNApparel_VIRTUSHelmet_Scrim" or
-						defName="RNApparel_VIRTUSHelmet_CamCream"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>0.20</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_VIRTUSHelmet_GSRGasmask"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RNApparel_VIRTUSHelmet_GSRGasmask"]</xpath>
-					<value>
-						<li Class="CombatExtended.ApparelHediffExtension">
-							<hediff>WearingGasMask</hediff>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== FAST helmet UKSF (A, B, C variants) ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_FASTHelmetUKSF_A" or
-						defName="RNApparel_FASTHelmetUKSF_B" or
-						defName="RNApparel_FASTHelmetUKSF_C"
-						]/statBases </xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>7</ArmorRating_Sharp>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.54</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_FASTHelmetUKSF_A" or
-						defName="RNApparel_FASTHelmetUKSF_B" or
-						defName="RNApparel_FASTHelmetUKSF_C"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>0.20</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_Backpacks.xml b/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_Backpacks.xml
deleted file mode 100644
index b64a0e4276..0000000000
--- a/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_Backpacks.xml	
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] British Military Kit</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Bergen rucksack ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_Rucksack_Bergen"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_Rucksack_Bergen"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>35</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_Rucksack_Bergen"]/apparel
-					</xpath>
-					<value>
-						<apparel>
-							<careIfWornByCorpse>false</careIfWornByCorpse>
-							<bodyPartGroups>
-								<li>Shoulders</li>
-							</bodyPartGroups>
-							<layers>
-								<li>Backpack</li>
-							</layers>
-							<tags>
-								<li>RN_Backpack</li>
-							</tags>
-							<defaultOutfitTags>
-								<li>Soldier</li>
-							</defaultOutfitTags>
-							<wornGraphicPath>Things/Apparel/Belt/MTP_Bergen</wornGraphicPath>
-						</apparel>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_Belts.xml b/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_Belts.xml
deleted file mode 100644
index 7f1f611a8a..0000000000
--- a/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_Belts.xml	
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] British Military Kit</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Webbing PLCE ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_Harness_PLCE_MTP"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_Harness_PLCE_MTP"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>10</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_Harness_PLCE_MTP"]/apparel
-					</xpath>
-					<value>
-						<apparel>
-							<bodyPartGroups>
-								<li>Shoulders</li>
-							</bodyPartGroups>
-							<layers>
-								<li>Webbing</li>
-							</layers>
-							<tags>
-								<li>IndustrialAdvanced</li>
-							</tags>
-							<defaultOutfitTags>
-								<li>Soldier</li>
-							</defaultOutfitTags>
-							<wornGraphicPath>Things/Apparel/Belt/PLCE_MTP_Harness</wornGraphicPath>
-						</apparel>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_Headgear.xml b/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_Headgear.xml
deleted file mode 100644
index 02d7b1f0bc..0000000000
--- a/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_Headgear.xml	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] British Military Kit</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== ghillie suit hood (British) ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_British_GhillieHood"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_OnSkin.xml b/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_OnSkin.xml
deleted file mode 100644
index e5e111cc06..0000000000
--- a/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_OnSkin.xml	
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] British Military Kit</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Combat Uniform MTP, Combat Uniform MTP UBAC, RAF Nomex flight suit ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_combats_MTP_British" or
-						defName="RNApparel_combats_MTP_UBAC_British" or
-						defName="RNApparel_Nomex_FlightSuit_RAF"
-						]/statBases </xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>3</WornBulk>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-						<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_combats_MTP_British" or
-						defName="RNApparel_combats_MTP_UBAC_British" or
-						defName="RNApparel_Nomex_FlightSuit_RAF"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<!-- Slightly tougher than vanilla pants, T-shirt and button-down shirt -->
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_Shell.xml b/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_Shell.xml
deleted file mode 100644
index 920ca7a3c7..0000000000
--- a/Patches/CP British Military Kit/CP_BMK_CE_Patch_Apparel_Shell.xml	
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] British Military Kit</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== pcs smock MTP ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_PcsParka_MTP"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_PcsParka_MTP"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== pcs smock MTP (PLCE) ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_PcsParka_MTP_PLCE"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<WornBulk>7</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_PcsParka_MTP_PLCE"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>10</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_PcsParka_MTP_PLCE"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== ghillie suit British ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_GhillieSuit_British"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>7.5</WornBulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_CE_Patch_Ammo_12Gauge_Dual.xml b/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_CE_Patch_Ammo_12Gauge_Dual.xml
deleted file mode 100644
index bbe6abab82..0000000000
--- a/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_CE_Patch_Ammo_12Gauge_Dual.xml	
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] DOOM</li>
-			<li>[CP] The DOOM Kit - Classic</li>
-			<li>[RH] Faction: UAC</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ========== Custom variants of the standard 12 Gauge shotgun projectiles, emulating the effect of two ordinary 12 Gauge shotgun shells being fired side-by-side simultaneously ========== -->
-
-						<ThingDef ParentName="Base12GaugeBullet">
-							<defName>Bullet_12Gauge_DoubleBarreled_Buck</defName>
-							<label>buckshot pellet</label>
-							<graphicData>
-								<texPath>Things/Projectile/Shotgun_Pellet</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>18</damageAmountBase>
-								<pelletCount>18</pelletCount><!-- Twice the usual number of buckshot pellets -->
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.7</armorPenetrationBlunt>
-								<spreadMult>17.8</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base12GaugeBullet">
-							<defName>Bullet_12Gauge_DoubleBarreled_Slug</defName>
-							<label>shotgun slug</label>
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_big</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>92</speed>
-								<damageAmountBase>46</damageAmountBase>
-								<pelletCount>2</pelletCount><!-- Double slugs -->
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<armorPenetrationBlunt>48.04</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base12GaugeBullet">
-							<defName>Bullet_12Gauge_DoubleBarreled_Beanbag</defName>
-							<label>beanbag</label>
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_big</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>30</speed>
-								<damageDef>Beanbag</damageDef>
-								<damageAmountBase>18</damageAmountBase>
-								<pelletCount>2</pelletCount><!-- Double beanbags -->
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.240</armorPenetrationBlunt>
-								<spreadMult>2</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base12GaugeBullet">
-							<defName>Bullet_12Gauge_DoubleBarreled_ElectroSlug</defName>
-							<label>EMP slug</label>
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_big</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>43</speed>
-								<damageDef>EMP</damageDef>
-								<damageAmountBase>24</damageAmountBase>
-								<pelletCount>2</pelletCount><!-- Double EMP slugs -->
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>8.509</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<!-- ========== Custom AmmoSet for the double-barreled Super Shotgun, which maps the custom 12 Gauge shotgun projectiles to standard versions of their craftable ammo ========== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_12Gauge_CP_DOOM_SuperShotgun</defName>
-							<label>12 Gauge</label>
-							<ammoTypes>
-								<Ammo_12Gauge_Buck>Bullet_12Gauge_DoubleBarreled_Buck</Ammo_12Gauge_Buck>
-								<Ammo_12Gauge_Slug>Bullet_12Gauge_DoubleBarreled_Slug</Ammo_12Gauge_Slug>
-								<Ammo_12Gauge_Beanbag>Bullet_12Gauge_DoubleBarreled_Beanbag</Ammo_12Gauge_Beanbag>
-								<Ammo_12Gauge_ElectroSlug>Bullet_12Gauge_DoubleBarreled_ElectroSlug</Ammo_12Gauge_ElectroSlug>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_CE_Patch_Ammo_BfgCell.xml b/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_CE_Patch_Ammo_BfgCell.xml
deleted file mode 100644
index 9c9c05f47c..0000000000
--- a/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_CE_Patch_Ammo_BfgCell.xml	
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH] Faction: UAC</li>
-			<li>[CP] DOOM</li>
-		</mods>
-
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<!-- There is only one type of UAC BFG Cell for CE, no subcategory for variants required -->
-
-				<!-- ==================== AmmoSets ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_Doom2016Bfg9000Gun</defName>
-					<label>UAC BFG Cell</label>
-					<ammoTypes>
-						<Ammo_Doom2016BfgCell>Bullet_Doom2016Bfg9000Gun</Ammo_Doom2016BfgCell>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerAmmoBase">
-					<defName>Ammo_Doom2016BfgCell</defName>
-					<label>UAC BFG Cell</label>
-					<description>Plasma containment power cell developed by the Union Aerospace Corporation for the BFG 9000, utilizing the compression of Argent energy</description>
-					<statBases>
-						<Mass>0.5</Mass>
-						<Bulk>1.21</Bulk>
-						<MarketValue>31.92</MarketValue>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-						<!-- Plasma ammo can't be handloaded, and the containment cell must be precision-machined anyway -->
-					</tradeTags>
-					<thingCategories>
-						<li>AmmoAdvanced</li>
-					</thingCategories>
-					<stackLimit>25</stackLimit>
-					<graphicData>
-						<texPath>ThirdParty/CP DOOM and DOOM Kit Classic/Doom2016BfgCell</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<ammoClass>Plasma</ammoClass>
-					<comps>
-						<!-- Arbitarily defined cookoff explosive stats; represents a plasma containment system failing -->
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>20</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>0.5</explosiveRadius>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>2</Fragment_Large>
-								<Fragment_Small>10</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<!-- Workaround for conditionally-patched projectiles: use an existing abstract class from the generic ammo library (In this case, Base6x24mmChargedBullet) -->
-
-				<ThingDef ParentName="Base6x24mmChargedBullet">
-					<defName>Bullet_Doom2016Bfg9000Gun</defName>
-					<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					<label>BFG Plasma Shot</label>
-					<graphicData>
-						<texPath>Things/Projectile/BFGPLAZMA</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>200</speed>
-						<damageDef>Bomb</damageDef>
-						<damageAmountBase>500</damageAmountBase>
-						<explosionRadius>2.5</explosionRadius>
-						<suppressionFactor>3.0</suppressionFactor>
-						<dangerFactor>2.0</dangerFactor>
-						<soundExplode>RHHit_DOOMBFG</soundExplode>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						<secondaryDamage>
-							<li>
-								<def>Flame_Secondary</def>
-								<amount>600</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="ChargeAmmoRecipeBase">
-					<defName>MakeAmmo_Doom2016BfgCell</defName>
-					<label>make UAC BFG Cells x25</label>
-					<description>Craft 25 UAC BFG Cells.</description>
-					<jobString>Making UAC BFG Cells.</jobString>
-					<workAmount>33000</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>26</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Plasteel</li>
-								</thingDefs>
-							</filter>
-							<count>73</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Plasteel</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_Doom2016BfgCell>25</Ammo_Doom2016BfgCell>
-					</products>
-				</RecipeDef>
-
-			</value>
-
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_CE_Patch_Ammo_EmgMkVPistol.xml b/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_CE_Patch_Ammo_EmgMkVPistol.xml
deleted file mode 100644
index 2429578827..0000000000
--- a/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_CE_Patch_Ammo_EmgMkVPistol.xml	
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH] Faction: UAC</li>
-			<li>[CP] DOOM</li>
-		</mods>
-
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<!-- There is only one type of UAC EMG Cell for CE, no subcategory for variants required -->
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_Doom2016EmgMkVPistol</defName>
-					<label>UAC EMG Cell</label>
-					<ammoTypes>
-						<Ammo_Doom2016EmgMkVPistol>Bullet_Doom2016EmgMkVPistol</Ammo_Doom2016EmgMkVPistol>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-					<defName>Ammo_Doom2016EmgMkVPistol</defName>
-					<label>UAC EMG Cell</label>
-					<description>Plasma containment power cell developed by the Union Aerospace Corporation for directed-energy sidearms, utilizing the compression of Argent energy into a kinetic slug</description>
-					<statBases>
-						<Mass>0.004</Mass>
-						<Bulk>0.01</Bulk>
-						<MarketValue>0.21</MarketValue>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-						<!-- Plasma ammo can't be handloaded, and the containment cell must be precision-machined anyway -->
-					</tradeTags>
-					<thingCategories>
-						<li>AmmoAdvanced</li>
-					</thingCategories>
-					<graphicData>
-						<texPath>Things/Ammo/Charged/Concentrated</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<ammoClass>Plasma</ammoClass>
-					<comps>
-						<!-- Arbitarily defined cookoff explosive stats; represents a plasma containment system failing -->
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>20</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>0.5</explosiveRadius>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>2</Fragment_Large>
-								<Fragment_Small>10</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<!-- Workaround for conditionally-patched projectiles: use an existing abstract class from the generic ammo library (In this case, Base6x24mmChargedBullet) -->
-
-				<ThingDef ParentName="Base6x24mmChargedBullet">
-					<defName>Bullet_Doom2016EmgMkVPistol</defName>
-					<label>EMG Bolt</label>
-					<graphicData>
-						<texPath>Things/Projectile/EMGMarkV</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>140</speed>
-						<damageDef>Bomb</damageDef>
-						<damageAmountBase>3</damageAmountBase>
-						<explosionRadius>0.5</explosionRadius>
-						<suppressionFactor>3.0</suppressionFactor>
-						<dangerFactor>2.0</dangerFactor>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						<secondaryDamage>
-							<li>
-								<def>Flame_Secondary</def>
-								<amount>12</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="ChargeAmmoRecipeBase">
-					<defName>MakeAmmo_Doom2016EmgMkVPistol</defName>
-					<label>make UAC EMG Cells</label>
-					<description>Craft 500 shots' worth of UAC EMG Cells.</description>
-					<jobString>Making UAC EMG Cells.</jobString>
-					<workAmount>2800</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>4</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Plasteel</li>
-								</thingDefs>
-							</filter>
-							<count>3</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Plasteel</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_Doom2016EmgMkVPistol>500</Ammo_Doom2016EmgMkVPistol>
-					</products>
-				</RecipeDef>
-
-			</value>
-
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_CE_Patch_Ammo_EmgPistol.xml b/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_CE_Patch_Ammo_EmgPistol.xml
deleted file mode 100644
index eca915ff55..0000000000
--- a/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_CE_Patch_Ammo_EmgPistol.xml	
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH] Faction: UAC</li>
-			<li>[CP] DOOM</li>
-		</mods>
-
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<!-- Projectile-only definition for the weaker infinite-ammo EMG Pistol; uses same stats as the generic Plasma Pistol projectile -->
-
-				<!-- ================== Projectiles ================== -->
-
-				<!-- Workaround for conditionally-patched projectiles: use an existing abstract class from the generic ammo library (In this case, Base6x24mmChargedBullet) -->
-
-				<ThingDef ParentName="Base6x24mmChargedBullet">
-					<defName>Bullet_Doom2016EmgPistol</defName>
-					<label>EMG Bolt</label>
-					<graphicData>
-						<texPath>Things/Projectile/UACSidearmProj</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>140</speed>
-						<damageDef>Bomb</damageDef>
-						<damageAmountBase>2</damageAmountBase>
-						<explosionRadius>0.5</explosionRadius>
-						<suppressionFactor>3.0</suppressionFactor>
-						<dangerFactor>2.0</dangerFactor>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						<secondaryDamage>
-							<li>
-								<def>Flame_Secondary</def>
-								<amount>9</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-			</value>
-
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_CE_Patch_Ammo_GaussCannonFlechette.xml b/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_CE_Patch_Ammo_GaussCannonFlechette.xml
deleted file mode 100644
index e7c52ef2d7..0000000000
--- a/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_CE_Patch_Ammo_GaussCannonFlechette.xml	
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH] Faction: UAC</li>
-			<li>[CP] DOOM</li>
-		</mods>
-
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<!-- DOOM 2016 specifies that the Guass Cannon uses Plasma Cells as ammo, but fires steel (railgun) flechettes instead -->
-
-				<!-- ==================== AmmoSets ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_Doom2016GaussCannon</defName>
-					<label>UAC Plasma Cell</label>
-					<ammoTypes>
-						<Ammo_Doom2016PlasmaCell>Bullet_Doom2016GaussCannonFlechette</Ammo_Doom2016PlasmaCell>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<!-- Workaround for conditionally-patched projectiles: use an existing abstract class from the generic ammo library (In this case, Base6x24mmChargedBullet) -->
-
-				<ThingDef ParentName="Base6x24mmChargedBullet">
-					<defName>Bullet_Doom2016GaussCannonFlechette</defName>
-					<label>UAC Gauss Cannon Flechette</label>
-					<graphicData>
-						<texPath>Things/Projectile/GAUSSBeam</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bullet</damageDef>
-						<damageAmountBase>121</damageAmountBase>
-						<armorPenetrationSharp>160</armorPenetrationSharp>
-						<armorPenetrationBlunt>11348.10</armorPenetrationBlunt>
-						<speed>500</speed>
-					</projectile>
-				</ThingDef>
-
-			</value>
-
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_CE_Patch_Ammo_PlasmaCell.xml b/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_CE_Patch_Ammo_PlasmaCell.xml
deleted file mode 100644
index 86eebca195..0000000000
--- a/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_CE_Patch_Ammo_PlasmaCell.xml	
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH] Faction: UAC</li>
-			<li>[CP] DOOM</li>
-		</mods>
-
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<!-- There is only one type of UAC Plasma Cell for CE, no subcategory for variants required -->
-
-				<!-- ==================== AmmoSets ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_Doom2016PlasmaGun</defName>
-					<label>UAC Plasma Cell</label>
-					<ammoTypes>
-						<Ammo_Doom2016PlasmaCell>Bullet_Doom2016PlasmaGun</Ammo_Doom2016PlasmaCell>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_Doom2016VortexRifle</defName>
-					<label>UAC Plasma Cell</label>
-					<ammoTypes>
-						<Ammo_Doom2016PlasmaCell>Bullet_Doom2016VortexRifle</Ammo_Doom2016PlasmaCell>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_Doom2016Hellshot</defName>
-					<label>UAC Plasma Cell</label>
-					<ammoTypes>
-						<Ammo_Doom2016PlasmaCell>Bullet_Doom2016Hellshot</Ammo_Doom2016PlasmaCell>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-					<defName>Ammo_Doom2016PlasmaCell</defName>
-					<label>UAC Plasma Cell</label>
-					<description>Plasma containment power cell developed by the Union Aerospace Corporation for heavy energy weapons, utilizing the compression of Argent energy</description>
-					<statBases>
-						<Mass>0.002</Mass>
-						<Bulk>0.01</Bulk>
-						<MarketValue>0.84</MarketValue>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-						<!-- Plasma ammo can't be handloaded, and the containment cell must be precision-machined anyway -->
-					</tradeTags>
-					<thingCategories>
-						<li>AmmoAdvanced</li>
-					</thingCategories>
-					<stackLimit>450</stackLimit>
-					<graphicData>
-						<texPath>ThirdParty/CP DOOM and DOOM Kit Classic/Doom2016PlasmaCell</texPath>
-						<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-					</graphicData>
-					<ammoClass>Plasma</ammoClass>
-					<comps>
-						<!-- Arbitarily defined cookoff explosive stats; represents a plasma containment system failing -->
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>80</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>0.5</explosiveRadius>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>2</Fragment_Large>
-								<Fragment_Small>10</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<!-- Workaround for conditionally-patched projectiles: use an existing abstract class from the generic ammo library (In this case, Base6x24mmChargedBullet) -->
-
-				<ThingDef ParentName="Base6x24mmChargedBullet">
-					<defName>Bullet_Doom2016PlasmaGun</defName>
-					<label>Plasma Shot</label>
-					<graphicData>
-						<texPath>Things/Projectile/Plasma2016</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>200</speed>
-						<damageDef>Bomb</damageDef>
-						<damageAmountBase>12</damageAmountBase>
-						<explosionRadius>0.5</explosionRadius>
-						<suppressionFactor>3.0</suppressionFactor>
-						<dangerFactor>2.0</dangerFactor>
-						<soundExplode>MortarBomb_Explode</soundExplode>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						<secondaryDamage>
-							<li>
-								<def>Flame_Secondary</def>
-								<amount>22</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmChargedBullet">
-					<defName>Bullet_Doom2016VortexRifle</defName>
-					<label>Plasma Shot</label>
-					<graphicData>
-						<texPath>Things/Projectile/Vortexbeam</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>200</speed>
-						<damageDef>Bomb</damageDef>
-						<damageAmountBase>12</damageAmountBase>
-						<explosionRadius>0.5</explosionRadius>
-						<suppressionFactor>3.0</suppressionFactor>
-						<dangerFactor>2.0</dangerFactor>
-						<soundExplode>MortarBomb_Explode</soundExplode>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						<secondaryDamage>
-							<li>
-								<def>Flame_Secondary</def>
-								<amount>22</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmChargedBullet">
-					<defName>Bullet_Doom2016Hellshot</defName>
-					<label>Plasma Shot</label>
-					<graphicData>
-						<texPath>Things/Projectile/HellshotPlasma</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>200</speed>
-						<damageDef>Bomb</damageDef>
-						<damageAmountBase>12</damageAmountBase>
-						<explosionRadius>0.5</explosionRadius>
-						<suppressionFactor>3.0</suppressionFactor>
-						<dangerFactor>2.0</dangerFactor>
-						<soundExplode>MortarBomb_Explode</soundExplode>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						<secondaryDamage>
-							<li>
-								<def>Flame_Secondary</def>
-								<amount>22</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="ChargeAmmoRecipeBase">
-					<defName>MakeAmmo_Doom2016PlasmaCell</defName>
-					<label>make UAC Plasma Cells x450 shots</label>
-					<description>Craft 450 shots' worth of UAC Plasma Cells.</description>
-					<jobString>Making UAC Plasma Cells.</jobString>
-					<workAmount>12600</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Plasteel</li>
-								</thingDefs>
-							</filter>
-							<count>33</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Plasteel</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_Doom2016PlasmaCell>450</Ammo_Doom2016PlasmaCell>
-					</products>
-				</RecipeDef>
-
-			</value>
-		</match>
-
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_CE_Patch_Ammo_Rocket.xml b/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_CE_Patch_Ammo_Rocket.xml
deleted file mode 100644
index 7dd1725d7a..0000000000
--- a/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_CE_Patch_Ammo_Rocket.xml	
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH] Faction: UAC</li>
-			<li>[CP] DOOM</li>
-		</mods>
-
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>AmmoDoom2016Rockets</defName>
-					<label>UAC Rocket Mk VI</label>
-					<parent>AmmoRockets</parent>
-					<iconPath>ThirdParty/CP DOOM and DOOM Kit Classic/Doom2016Rocket/Doom2016Rocket_c</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_Doom2016Rocket</defName>
-					<label>UAC Rocket Mk VI</label>
-					<ammoTypes>
-						<Ammo_Doom2016Rocket_HEAT>Bullet_Doom2016Rocket_HEAT</Ammo_Doom2016Rocket_HEAT>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="Doom2016RocketBase" ParentName="MediumAmmoBase" Abstract="True">
-					<description>Compact 60mm rocket developed by the Union Aerospace Corporation for infantry rocket launchers.</description>
-					<statBases>
-						<MaxHitPoints>150</MaxHitPoints>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-					</tradeTags>
-					<thingCategories>
-						<li>AmmoDoom2016Rockets</li>
-					</thingCategories>
-					<stackLimit>9</stackLimit>
-					<cookOffFlashScale>40</cookOffFlashScale>
-					<cookOffSound>MortarBomb_Explode</cookOffSound>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="Doom2016RocketBase">
-					<defName>Ammo_Doom2016Rocket_HEAT</defName>
-					<label>UAC Rocket Mk VI (HEAT)</label>
-					<graphicData>
-						<texPath>ThirdParty/CP DOOM and DOOM Kit Classic/Doom2016Rocket</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>22.42</MarketValue>
-						<Mass>0.75</Mass>
-						<Bulk>1.53</Bulk>
-					</statBases>
-					<ammoClass>RocketHEAT</ammoClass>
-					<detonateProjectile>Bullet_Doom2016Rocket_HEAT</detonateProjectile>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<!-- Workaround for conditionally-patched projectiles: use an existing abstract class from the generic ammo library (In this case, BaseM6Rocket) -->
-
-				<ThingDef ParentName="BaseM6Rocket">
-					<defName>Bullet_Doom2016Rocket_HEAT</defName>
-					<label>UAC Rocket Mk VI (HEAT)</label>
-					<graphicData>
-						<texPath>Things/Projectile/UACRocket2016</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bullet</damageDef>
-						<damageAmountBase>225</damageAmountBase>
-						<armorPenetrationSharp>76</armorPenetrationSharp>
-						<armorPenetrationBlunt>19.178</armorPenetrationBlunt>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>64</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>1</explosiveRadius>
-							<explosionSound>RHHit_DOOMRocketLauncher</explosionSound>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>1</Fragment_Large>
-								<Fragment_Small>12</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_Doom2016Rocket_HEAT</defName>
-					<label>make UAC Rocket Mk VI (HEAT) rockets x9</label>
-					<description>Craft 9 UAC Rocket Mk VI (HEAT) rockets.</description>
-					<jobString>Making UAC Rocket Mk VI (HEAT) rockets.</jobString>
-					<workAmount>6200</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>14</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>6</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>4</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_Doom2016Rocket_HEAT>9</Ammo_Doom2016Rocket_HEAT>
-					</products>
-				</RecipeDef>
-
-			</value>
-
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_CE_Patch_Apparel_Armor.xml b/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_CE_Patch_Apparel_Armor.xml
deleted file mode 100644
index 64ebee0dab..0000000000
--- a/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_CE_Patch_Apparel_Armor.xml	
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH] Faction: UAC</li>
-			<li>[CP] DOOM</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Praetor Suit ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_DOOM2016_PraetorSuit"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_DOOM2016_PraetorSuit"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>40</CarryBulk>
-						<CarryWeight>90</CarryWeight>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_DOOM2016_PraetorSuit"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_DOOM2016_PraetorSuit"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>40</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_DOOM2016_PraetorSuit"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>1.0</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_DOOM2016_PraetorSuit"]/statBases</xpath>
-					<value>
-						<ArmorRating_Electric>0.975</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_DOOM2016_PraetorSuit"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_CE_Patch_Apparel_Armor_Headgear.xml b/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_CE_Patch_Apparel_Armor_Headgear.xml
deleted file mode 100644
index 31ed7d6ae5..0000000000
--- a/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_CE_Patch_Apparel_Armor_Headgear.xml	
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH] Faction: UAC</li>
-			<li>[CP] DOOM</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Praetor Suit helmet ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_DOOM2016_PraetorSuitHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_DOOM2016_PraetorSuitHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_DOOM2016_PraetorSuitHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>40</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_DOOM2016_PraetorSuitHelmet"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>1.0</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_DOOM2016_PraetorSuitHelmet"]/statBases</xpath>
-					<value>
-						<ArmorRating_Electric>0.975</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="RHApparel_DOOM2016_PraetorSuitHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="RHApparel_DOOM2016_PraetorSuitHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_DOOM2016_PraetorSuitHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<!-- WearingGasMask Hediff not applicable -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_DOOM2016_PraetorSuitHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_CE_Patch_LauncherDOOM_Weapons.xml b/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_CE_Patch_LauncherDOOM_Weapons.xml
deleted file mode 100644
index 1016313dbe..0000000000
--- a/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_CE_Patch_LauncherDOOM_Weapons.xml	
+++ /dev/null
@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH] Faction: UAC</li>
-			<li>[CP] DOOM</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== UAC Gauss Cannon ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHEx_DOOM_GAUSSCannon</defName>
-					<statBases>
-						<Mass>12.50</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.20</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.78</SwayFactor>
-						<Bulk>12</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Doom2016GaussCannonFlechette</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<ammoConsumedPerShotCount>30</ammoConsumedPerShotCount>
-						<range>126</range>
-						<soundCast>RHShot_DOOMGAUSS</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<muzzleFlashScale>15</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>150</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_Doom2016GaussCannon</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== BFG 9000 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHEx_DOOM_BFG9000Gun</defName>
-					<statBases>
-						<Mass>10.00</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>0.88</SwayFactor>
-						<Bulk>13.00</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Doom2016Bfg9000Gun</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<soundAiming>RHGun_DOOMBFGAiming</soundAiming>
-						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-						<range>62</range>
-						<soundCast>RHShot_DOOMBFG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>false</onlyManualCast>
-						<muzzleFlashScale>20</muzzleFlashScale>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>3</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_Doom2016Bfg9000Gun</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== UAC Rocket Launcher ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHEx_DOOM_RocketLauncher</defName>
-					<statBases>
-						<Mass>8.00</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.82</SwayFactor>
-						<Bulk>11.20</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Doom2016Rocket_HEAT</defaultProjectile>
-						<warmupTime>1.9</warmupTime>
-						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-						<range>40</range>
-						<soundCast>RHShot_DOOMRocketLauncher</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>15</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>5.1</reloadTime>
-						<ammoSet>AmmoSet_Doom2016Rocket</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-				</li>
-
-				<!-- ========== UAC Grenade Launcher ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHEx_UACGrenadeLauncher</defName>
-					<statBases>
-						<Mass>5.30</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>1.31</SwayFactor>
-						<Bulk>7.67</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>40</range>
-						<soundCast>RHShot_DOOMGrenadeLauncher</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>15</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>5.1</reloadTime>
-						<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHEx_DOOM_GAUSSCannon" or
-						defName="RHEx_UACGrenadeLauncher"
-						]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHEx_DOOM_BFG9000Gun" or
-						defName="RHEx_DOOM_RocketLauncher"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_CE_Patch_MeleeDOOM_Weapons.xml b/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_CE_Patch_MeleeDOOM_Weapons.xml
deleted file mode 100644
index 35e4669653..0000000000
--- a/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_CE_Patch_MeleeDOOM_Weapons.xml	
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH] Faction: UAC</li>
-			<li>[CP] DOOM</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Mixom Beavertooth Painsaw (Chainsaw) ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHMelee_DOOM_Chainsaw"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>RHMelee_ChainsawSlash</li>
-								</capacities>
-								<power>38</power>
-								<cooldownTime>4.36</cooldownTime>
-								<armorPenetrationBlunt>3.7</armorPenetrationBlunt>
-								<armorPenetrationSharp>14.8</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>RHMelee_ChainsawStab</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>2.47</cooldownTime>
-								<armorPenetrationBlunt>3.7</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.65</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHMelee_DOOM_Chainsaw"]/statBases</xpath>
-					<value>
-						<Bulk>9</Bulk>
-						<MeleeCounterParryBonus>0.14</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHMelee_DOOM_Chainsaw"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.04</MeleeCritChance>
-							<MeleeParryChance>0.1</MeleeParryChance>
-							<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- ========== Crucible Blade ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHMelee_DOOMCrucible"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.69</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.80</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>40</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Flame</def>
-										<amount>5</amount>
-										<chance>0.3</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>2.06</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>3.20</armorPenetrationBlunt>
-								<armorPenetrationSharp>16</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>17</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Flame</def>
-										<amount>3</amount>
-										<chance>0.2</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>0.99</cooldownTime>
-								<armorPenetrationBlunt>3.24</armorPenetrationBlunt>
-								<armorPenetrationSharp>32.4</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHMelee_DOOMCrucible"]/statBases</xpath>
-					<value>
-						<Bulk>8.5</Bulk>
-						<MeleeCounterParryBonus>0.80</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHMelee_DOOMCrucible"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.00</MeleeCritChance>
-							<MeleeParryChance>0.60</MeleeParryChance>
-							<MeleeDodgeChance>0.40</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_CE_Patch_RangedDOOM_Weapons.xml b/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_CE_Patch_RangedDOOM_Weapons.xml
deleted file mode 100644
index 643f47f81d..0000000000
--- a/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_CE_Patch_RangedDOOM_Weapons.xml	
+++ /dev/null
@@ -1,558 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH] Faction: UAC</li>
-			<li>[CP] DOOM</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== UAC EMG Sidearm ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHGun_DOOM_UACEMGPistol</defName>
-					<statBases>
-						<Mass>1.35</Mass>
-						<RangedWeapon_Cooldown>0.05</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.176</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>2.45</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Doom2016EmgPistol</defaultProjectile>
-						<warmupTime>0.0</warmupTime>
-						<range>12</range>
-						<soundCast>RHShot_DOOMEMGPistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<!-- Infinite ammo -->
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-				</li>
-
-				<!-- ========== UAC EMG Mk V Pistol ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHGun_DOOM_UACEMGMarkVPistol</defName>
-					<statBases>
-						<Mass>1.35</Mass>
-						<RangedWeapon_Cooldown>0.05</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.176</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>2.45</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Doom2016EmgMkVPistol</defaultProjectile>
-						<warmupTime>0.0</warmupTime>
-						<range>12</range>
-						<soundCast>RHShot_DOOMEMGMarkVPistol</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_Doom2016EmgMkVPistol</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== UAC Combat Shotgun ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHGun_DOOM_CombatShotgun</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.49</SwayFactor>
-						<Bulk>7.67</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.26</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>RHShot_DOOMCombatShotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-				</li>
-
-				<!-- ========== UAC Combat Shotgun - Eternal ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHGun_DOOM_CombatShotgunEternal</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.68</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.49</SwayFactor>
-						<Bulk>7.67</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.26</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.7</warmupTime>
-						<range>26</range>
-						<soundCast>RHShot_DOOMCombatShotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-				</li>
-
-				<!-- ========== Super Shotgun ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHGun_DOOM_SuperShotgun</defName>
-					<statBases>
-						<Mass>1.90</Mass>
-						<RangedWeapon_Cooldown>0.93</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>2.73</SwayFactor>
-						<Bulk>6.29</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_DoubleBarreled_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<range>11</range>
-						<soundCast>RHShot_DOOMSuperShotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>2</magazineSize>
-						<reloadTime>1.7</reloadTime>
-						<ammoSet>AmmoSet_12Gauge_CP_DOOM_SuperShotgun</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== UAC Heavy Assault Rifle ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHGun_DOOM_HeavyAssaultRifle</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>9.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.48</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>6</burstShotCount>
-						<soundCast>RHShot_DOOMHeavyAssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>90</magazineSize>
-						<reloadTime>7.80</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!-- ========== UAC Heavy Assault Rifle ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHGun_DOOM_HeavyCannon</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.01</SwayFactor>
-						<Bulk>10.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.45</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>82</range>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>RHShot_EternalHeavyCannon</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.80</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!-- ========== UAC D12 Chaingun ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHGun_DOOM_Chaingun</defName>
-					<statBases>
-						<Mass>39.00</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>9.5</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.58</recoilAmount>
-						<recoilPattern>Mounted</recoilPattern>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>2.3</warmupTime>
-						<range>62</range>
-						<burstShotCount>150</burstShotCount>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<soundCast>RHFire_DOOMChaingun</soundCast>
-						<soundAiming>RHGun_DOOMChaingunAiming</soundAiming>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>150</magazineSize>
-						<reloadTime>9.2</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!-- ========== UAC Plasma Rifle ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHGun_DOOM_PlasmaRifle</defName>
-					<statBases>
-						<Mass>8.20</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>13.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.48</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Doom2016PlasmaGun</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>RHShot_DOOMPlasmaRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>150</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_Doom2016PlasmaGun</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- ========== UAC Plasma Gun ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHGun_DOOM_PlasmaGun</defName>
-					<statBases>
-						<Mass>8.20</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>10.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.48</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Doom2016PlasmaGun</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>RHShot_DOOMPlasmaGun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>150</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_Doom2016PlasmaGun</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- ========== UAC Vortex Rifle ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHGun_DOOM_VortexRifle</defName>
-					<statBases>
-						<Mass>7.51</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.60</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.76</SwayFactor>
-						<Bulk>9.05</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Doom2016VortexRifle</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>68</range>
-						<soundCast>RHFire_DOOMVortexRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_Doom2016VortexRifle</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== UAC Hellshot ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHGun_DOOM_Hellshot</defName>
-					<statBases>
-						<Mass>6.35</Mass>
-						<RangedWeapon_Cooldown>0.05</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.42</SwayFactor>
-						<Bulk>7.49</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Doom2016Hellshot</defaultProjectile>
-						<warmupTime>0.0</warmupTime>
-						<range>48</range>
-						<soundCast>RHFire_DOOMHellshot</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>60</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_Doom2016Hellshot</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHGun_DOOM_UACEMGPistol" or
-						defName="RHGun_DOOM_UACEMGMarkVPistol"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHGun_DOOM_CombatShotgun" or
-						defName="RHGun_DOOM_CombatShotgunEternal" or
-						defName="RHGun_DOOM_SuperShotgun" or
-						defName="RHGun_DOOM_HeavyAssaultRifle" or
-						defName="RHGun_DOOM_PlasmaRifle" or
-						defName="RHGun_DOOM_PlasmaGun" or
-						defName="RHGun_DOOM_VortexRifle" or
-						defName="RHGun_DOOM_HeavyCannon" or
-						defName="RHGun_DOOM_Hellshot"
-						]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHGun_DOOM_Chaingun"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_KitClassic_CE_Patch_Ammo_ClassicEnergyCell.xml b/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_KitClassic_CE_Patch_Ammo_ClassicEnergyCell.xml
deleted file mode 100644
index c544b05185..0000000000
--- a/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_KitClassic_CE_Patch_Ammo_ClassicEnergyCell.xml	
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] The DOOM Kit - Classic</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- There is only one type of UAC Energy Cell for CE, no subcategory for variants required -->
-
-						<!-- ==================== AmmoSets ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_DoomClassicPlasmaGun</defName>
-							<label>UAC Energy Cell</label>
-							<ammoTypes>
-								<Ammo_DoomClassicEnergyCell>Bullet_DoomClassicPlasmaGun</Ammo_DoomClassicEnergyCell>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_DoomClassicBfg9000Gun</defName>
-							<label>UAC Energy Cell</label>
-							<ammoTypes>
-								<Ammo_DoomClassicEnergyCell>Bullet_DoomClassicBfg9000Gun</Ammo_DoomClassicEnergyCell>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_DoomClassicEnergyCell</defName>
-							<label>UAC Energy Cell</label>
-							<description>Plasma containment power cell developed by the Union Aerospace Corporation for experimental energy weapons</description>
-							<statBases>
-								<Mass>0.013</Mass>
-								<Bulk>0.03</Bulk>
-								<MarketValue>1.48</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_TableMachining</li>
-								<!-- Plasma ammo can't be handloaded, and the containment cell must be precision-machined anyway -->
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoAdvanced</li>
-							</thingCategories>
-							<stackLimit>100</stackLimit>
-							<graphicData>
-								<texPath>ThirdParty/CP DOOM and DOOM Kit Classic/DoomClassicEnergyCell</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>Plasma</ammoClass>
-							<comps>
-								<!-- Arbitarily defined cookoff explosive stats; represents a plasma containment system failing -->
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>20</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>0.5</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Large>2</Fragment_Large>
-										<Fragment_Small>10</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<!-- Workaround for conditionally-patched projectiles: use an existing abstract class from the generic ammo library (In this case, Base6x24mmChargedBullet) -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmChargedBullet">
-							<defName>Bullet_DoomClassicPlasmaGun</defName>
-							<label>Plasma Shot</label>
-							<graphicData>
-								<texPath>Things/Projectile/Plasma_Classic</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>200</speed>
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>14</damageAmountBase>
-								<explosionRadius>0.5</explosionRadius>
-								<suppressionFactor>3.0</suppressionFactor>
-								<dangerFactor>2.0</dangerFactor>
-								<soundExplode>MortarBomb_Explode</soundExplode>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>67</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmChargedBullet">
-							<defName>Bullet_DoomClassicBfg9000Gun</defName>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<label>BFG Plasma Shot</label>
-							<graphicData>
-								<texPath>Things/Projectile/BFGPLAZMA</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>200</speed>
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>560</damageAmountBase>
-								<explosionRadius>2.5</explosionRadius>
-								<suppressionFactor>3.0</suppressionFactor>
-								<dangerFactor>2.0</dangerFactor>
-								<soundExplode>RHHit_DOOMClassicBFG</soundExplode>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>2680</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_DoomClassicEnergyCell</defName>
-							<label>make UAC Energy Cells x100 shots</label>
-							<description>Craft 100 shots' worth of UAC Energy Cells.</description>
-							<jobString>Making UAC Energy Cells.</jobString>
-							<workAmount>4800</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Plasteel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_DoomClassicEnergyCell>100</Ammo_DoomClassicEnergyCell>
-							</products>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_KitClassic_CE_Patch_Ammo_ClassicRocket.xml b/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_KitClassic_CE_Patch_Ammo_ClassicRocket.xml
deleted file mode 100644
index 54a29b719f..0000000000
--- a/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_KitClassic_CE_Patch_Ammo_ClassicRocket.xml	
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] The DOOM Kit - Classic</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingCategoryDef>
-							<defName>AmmoDoomClassicRockets</defName>
-							<label>UAC Rocket Mk I</label>
-							<parent>AmmoRockets</parent>
-							<iconPath>ThirdParty/CP DOOM and DOOM Kit Classic/DoomClassicRocket/DoomClassicRocket_c</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_DoomClassicRocket</defName>
-							<label>UAC Rocket Mk I</label>
-							<ammoTypes>
-								<Ammo_DoomClassicRocket_HEAT>Bullet_DoomClassicRocket_HEAT</Ammo_DoomClassicRocket_HEAT>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="DoomClassicRocketBase" ParentName="MediumAmmoBase" Abstract="True">
-							<description>Compact 60mm rocket developed by the Union Aerospace Corporation for infantry rocket launchers.</description>
-							<statBases>
-								<MaxHitPoints>150</MaxHitPoints>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_TableMachining</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoDoomClassicRockets</li>
-							</thingCategories>
-							<stackLimit>5</stackLimit>
-							<cookOffFlashScale>40</cookOffFlashScale>
-							<cookOffSound>MortarBomb_Explode</cookOffSound>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="DoomClassicRocketBase">
-							<defName>Ammo_DoomClassicRocket_HEAT</defName>
-							<label>UAC Rocket Mk I (HEAT)</label>
-							<graphicData>
-								<texPath>ThirdParty/CP DOOM and DOOM Kit Classic/DoomClassicRocket</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>34.44</MarketValue>
-								<Mass>0.75</Mass>
-								<Bulk>1.53</Bulk>
-							</statBases>
-							<ammoClass>RocketHEAT</ammoClass>
-							<detonateProjectile>Bullet_DoomClassicRocket_HEAT</detonateProjectile>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<!-- Workaround for conditionally-patched projectiles: use an existing abstract class from the generic ammo library (In this case, BaseM6Rocket) -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseM6Rocket">
-							<defName>Bullet_DoomClassicRocket_HEAT</defName>
-							<label>UAC Rocket Mk I (HEAT)</label>
-							<graphicData>
-								<texPath>Things/Projectile/DOOM_Rocket</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>60</speed>
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>225</damageAmountBase>
-								<armorPenetrationSharp>76</armorPenetrationSharp>
-								<armorPenetrationBlunt>19.178</armorPenetrationBlunt>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>64</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>1</explosiveRadius>
-									<explosionSound>RHHit_DOOMClassicRocketLauncher</explosionSound>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Large>1</Fragment_Large>
-										<Fragment_Small>12</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_DoomClassicRocket_HEAT</defName>
-							<label>make UAC Rocket Mk I (HEAT) rockets x5</label>
-							<description>Craft 5 UAC Rocket Mk I (HEAT) rockets.</description>
-							<jobString>Making UAC Rocket Mk I (HEAT) rockets.</jobString>
-							<workAmount>4800</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>FSX</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_DoomClassicRocket_HEAT>5</Ammo_DoomClassicRocket_HEAT>
-							</products>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_KitClassic_CE_Patch_Apparel_Armor.xml b/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_KitClassic_CE_Patch_Apparel_Armor.xml
deleted file mode 100644
index 613e19b087..0000000000
--- a/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_KitClassic_CE_Patch_Apparel_Armor.xml	
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] The DOOM Kit - Classic</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Praetor Suit (classic) ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_PraetorSuit"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_PraetorSuit"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>40</CarryBulk>
-						<CarryWeight>90</CarryWeight>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_PraetorSuit"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_PraetorSuit"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>40</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_PraetorSuit"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>1.0</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_PraetorSuit"]/statBases</xpath>
-					<value>
-						<ArmorRating_Electric>0.975</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_PraetorSuit"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_KitClassic_CE_Patch_Apparel_Armor_Headgear.xml b/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_KitClassic_CE_Patch_Apparel_Armor_Headgear.xml
deleted file mode 100644
index 0bc7ba3cac..0000000000
--- a/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_KitClassic_CE_Patch_Apparel_Armor_Headgear.xml	
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] The DOOM Kit - Classic</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Praetor Suit helmet (classic) ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_PraetorSuitHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_PraetorSuitHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_PraetorSuitHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>40</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_PraetorSuitHelmet"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>1.0</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_PraetorSuitHelmet"]/statBases</xpath>
-					<value>
-						<ArmorRating_Electric>0.975</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_PraetorSuitHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_PraetorSuitHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_PraetorSuitHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<!-- WearingGasMask Hediff not applicable -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_PraetorSuitHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!-- ========== Security Helmet (DOOM) ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_OriginalSecurityHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_OriginalSecurityHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_OriginalSecurityHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>32</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_OriginalSecurityHelmet"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.76</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_OriginalSecurityHelmet"]/statBases</xpath>
-					<value>
-						<ArmorRating_Electric>0.75</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_OriginalSecurityHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_OriginalSecurityHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_OriginalSecurityHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_DOOMClassic_OriginalSecurityHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_KitClassic_CE_Patch_LauncherDOOM_Weapons.xml b/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_KitClassic_CE_Patch_LauncherDOOM_Weapons.xml
deleted file mode 100644
index bb7c5355dc..0000000000
--- a/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_KitClassic_CE_Patch_LauncherDOOM_Weapons.xml	
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] The DOOM Kit - Classic</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== BFG 9000 (DOOM) ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHEx_DOOMClassic_BFG9000Gun</defName>
-					<statBases>
-						<Mass>10.00</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>0.88</SwayFactor>
-						<Bulk>13.00</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_DoomClassicBfg9000Gun</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<ammoConsumedPerShotCount>40</ammoConsumedPerShotCount>
-						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-						<range>62</range>
-						<soundCast>RHShot_DOOMClassicBFG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<muzzleFlashScale>20</muzzleFlashScale>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>40</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_DoomClassicBfg9000Gun</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== Rocket Launcher (DOOM) ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHEx_DOOMClassic_RocketLauncher</defName>
-					<statBases>
-						<Mass>8.00</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.82</SwayFactor>
-						<Bulk>11.20</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_DoomClassicRocket_HEAT</defaultProjectile>
-						<warmupTime>1.9</warmupTime>
-						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-						<range>40</range>
-						<soundCast>RHShot_DOOMClassicRocketLauncher</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>15</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>5.1</reloadTime>
-						<ammoSet>AmmoSet_DoomClassicRocket</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHEx_DOOMClassic_BFG9000Gun" or
-						defName="RHEx_DOOMClassic_RocketLauncher"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_KitClassic_CE_Patch_MeleeDOOM_Weapons.xml b/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_KitClassic_CE_Patch_MeleeDOOM_Weapons.xml
deleted file mode 100644
index 56bac2f089..0000000000
--- a/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_KitClassic_CE_Patch_MeleeDOOM_Weapons.xml	
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] The DOOM Kit - Classic</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Mixom Beavertooth Painsaw (chainsaw) ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHMelee_DOOMClassic_Chainsaw"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>RHMelee_ClassicChainsawSlash</li>
-								</capacities>
-								<power>38</power>
-								<cooldownTime>4.36</cooldownTime>
-								<armorPenetrationBlunt>3.7</armorPenetrationBlunt>
-								<armorPenetrationSharp>14.8</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>RHMelee_ClassicChainsawStab</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>2.47</cooldownTime>
-								<armorPenetrationBlunt>3.7</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.65</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHMelee_DOOMClassic_Chainsaw"]/statBases</xpath>
-					<value>
-						<Bulk>9</Bulk>
-						<MeleeCounterParryBonus>0.14</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHMelee_DOOMClassic_Chainsaw"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.04</MeleeCritChance>
-							<MeleeParryChance>0.1</MeleeParryChance>
-							<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_KitClassic_CE_Patch_RangedDOOM_Weapons.xml b/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_KitClassic_CE_Patch_RangedDOOM_Weapons.xml
deleted file mode 100644
index 81c50e6deb..0000000000
--- a/Patches/CP DOOM & DOOM Kit Classic/CP_DOOM_KitClassic_CE_Patch_RangedDOOM_Weapons.xml	
+++ /dev/null
@@ -1,297 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] The DOOM Kit - Classic</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Pistol (DOOM) ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_DOOMClassic_Pistol</defName>
-					<statBases>
-						<Mass>0.97</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.05</SwayFactor>
-						<Bulk>2.17</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RHShot_DOOMClassic_Pistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== Shotgun (DOOM) ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHGun_DOOMClassic_Shotgun</defName>
-					<statBases>
-						<Mass>3.40</Mass>
-						<RangedWeapon_Cooldown>1.00</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.55</SwayFactor>
-						<Bulk>12.07</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RHShot_DOOMClassicShotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>5.1</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== Super Shotgun (DOOM) ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHGun_DOOMClassic_SuperShotgun</defName>
-					<statBases>
-						<Mass>1.90</Mass>
-						<RangedWeapon_Cooldown>0.93</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>2.73</SwayFactor>
-						<Bulk>6.29</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_DoubleBarreled_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<range>11</range>
-						<soundCast>RHShot_DOOMClassicSuperShotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>2</magazineSize>
-						<reloadTime>1.7</reloadTime>
-						<ammoSet>AmmoSet_12Gauge_CP_DOOM_SuperShotgun</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== Chaingun (DOOM) ========== -->
-				<!-- Note: In-game lore explicitly states that the chaingun uses the same ammo as the pistol -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHGun_DOOMClassic_Chaingun</defName>
-					<statBases>
-						<Mass>39.00</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>8.02</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.58</recoilAmount>
-						<recoilPattern>Mounted</recoilPattern>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>2.3</warmupTime>
-						<range>62</range>
-						<burstShotCount>200</burstShotCount>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<soundCast>RHShot_DOOMClassic_Pistol</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>200</magazineSize>
-						<reloadTime>9.2</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHGun_DOOMClassic_Chaingun"]/description</xpath>
-					<value>
-						<description>The chaingun (also known as "gatling gun") is a rapid-firing, multi-barrelled automatic weapon that uses the same ammunition as the pistol. A high velocity heavy weapon capable of suppressing multiple targets at once.</description>
-					</value>
-				</li>
-
-				<!-- ========== Plasma Gun (DOOM) ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHGun_DOOMClassic_PlasmaGun</defName>
-					<statBases>
-						<Mass>8.20</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>13.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.48</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_DoomClassicPlasmaGun</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>RHShot_DOOMClassicPlasmaGun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>40</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_DoomClassicPlasmaGun</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNGun_DOOMClassic_Pistol"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHGun_DOOMClassic_Shotgun" or
-						defName="RHGun_DOOMClassic_SuperShotgun" or
-						defName="RHGun_DOOMClassic_PlasmaGun"
-						]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHGun_DOOMClassic_Chaingun"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP Metal Gear Solid/CP_MGS_CE_Patch_Ammo_NonLethal.xml b/Patches/CP Metal Gear Solid/CP_MGS_CE_Patch_Ammo_NonLethal.xml
deleted file mode 100644
index 7755bbbf48..0000000000
--- a/Patches/CP Metal Gear Solid/CP_MGS_CE_Patch_Ammo_NonLethal.xml	
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Metal Gear Solid</li>
-			<li>[RH] Faction: Militaires Sans Frontieres</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Non-lethal tranquilizer 9x19mm Parabellum pistol cartridge and ammoset for non-lethal pistols -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_9x19mmPara_NonLethal</defName>
-							<label>9x19mm Para (Tranq)</label>
-							<ammoTypes>
-								<Ammo_9x19mmPara_NL>Bullet_9x19mmPara_NL</Ammo_9x19mmPara_NL>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="9x19mmParaBase">
-							<defName>Ammo_9x19mmPara_NL</defName>
-							<label>9x19mm Para cartridge (Tranq)</label>
-							<graphicData>
-								<texPath>ThirdParty/CP Metal Gear Solid/Pistol/NL</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.31</MarketValue>
-							</statBases>
-							<ammoClass>TranqNonLethal</ammoClass>
-							<cookOffProjectile>Bullet_9x19mmPara_NL</cookOffProjectile>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<!-- Workaround for conditionally-patched projectiles: use an existing abstract class from the generic ammo library (In this case, Base9x19mmParaBullet) -->
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base9x19mmParaBullet">
-							<defName>Bullet_9x19mmPara_NL</defName>
-							<label>9mm Para bullet (Tranq)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Tranquilizer</damageDef>
-								<damageAmountBase>1</damageAmountBase>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>10.820</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_9x19mmPara_NL</defName>
-							<label>make 9x19mm Parabellum (Tranq) cartridge x500</label>
-							<description>Craft 500 9x19mm Parabellum (Tranq) cartridges.</description>
-							<jobString>Making 9x19mm Parabellum (Tranq) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>14</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>MedicineHerbal</li>
-										</thingDefs>
-									</filter>
-									<count>12</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>MedicineHerbal</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_9x19mmPara_NL>500</Ammo_9x19mmPara_NL>
-							</products>
-							<workAmount>5000</workAmount>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-				<!-- Non-lethal tranquilizer 7.62x51mm NATO rifle cartridge and ammoset for non-lethal rifles -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_762x51mmNATO_NonLethal</defName>
-							<label>7.62x51mm NATO (Tranq)</label>
-							<ammoTypes>
-								<Ammo_762x51mmNATO_NL>Bullet_762x51mmNATO_NL</Ammo_762x51mmNATO_NL>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x51mmNATOBase">
-							<defName>Ammo_762x51mmNATO_NL</defName>
-							<label>7.62x51mm NATO cartridge (Tranq)</label>
-							<graphicData>
-								<texPath>ThirdParty/CP Metal Gear Solid/Rifle/NL</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.5</MarketValue>
-							</statBases>
-							<ammoClass>TranqNonLethal</ammoClass>
-							<cookOffProjectile>Bullet_762x51mmNATO_NL</cookOffProjectile>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<!-- Workaround for conditionally-patched projectiles: use an existing abstract class from the generic ammo library (In this case, Base762x51mmNATOBullet) -->
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base762x51mmNATOBullet">
-							<defName>Bullet_762x51mmNATO_NL</defName>
-							<label>7.62mm NATO bullet (Tranq)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Tranquilizer</damageDef>
-								<damageAmountBase>1</damageAmountBase>
-								<armorPenetrationSharp>21</armorPenetrationSharp>
-								<armorPenetrationBlunt>86.28</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_762x51mmNATO_NL</defName>
-							<label>make 7.62x51mm NATO (Tranq) cartridge x500</label>
-							<description>Craft 500 7.62x51mm NATO (Tranq) cartridges.</description>
-							<jobString>Making 7.62x51mm NATO (Tranq) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>22</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>MedicineHerbal</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>MedicineHerbal</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_762x51mmNATO_NL>500</Ammo_762x51mmNATO_NL>
-							</products>
-							<workAmount>8200</workAmount>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP Metal Gear Solid/CP_MGS_CE_Patch_Apparel_Armor.xml b/Patches/CP Metal Gear Solid/CP_MGS_CE_Patch_Apparel_Armor.xml
deleted file mode 100644
index 483a466bbc..0000000000
--- a/Patches/CP Metal Gear Solid/CP_MGS_CE_Patch_Apparel_Armor.xml	
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Metal Gear Solid</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Exo Suit THI ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_ExoSuit_GrayFox"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_ExoSuit_GrayFox"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_ExoSuit_GrayFox"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>30</CarryWeight>
-						<!-- Essentially cancel out the added bulk of the exosuit -->
-						<CarryBulk>10</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_ExoSuit_GrayFox"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_ExoSuit_GrayFox"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>40</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_ExoSuit_GrayFox"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.8</ArmorRating_Heat>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP Metal Gear Solid/CP_MGS_CE_Patch_Apparel_Armor_Headgear.xml b/Patches/CP Metal Gear Solid/CP_MGS_CE_Patch_Apparel_Armor_Headgear.xml
deleted file mode 100644
index fc689ebcb5..0000000000
--- a/Patches/CP Metal Gear Solid/CP_MGS_CE_Patch_Apparel_Armor_Headgear.xml	
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Metal Gear Solid</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== PASGT helmet FOXHOUND ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_PASGTFOXHOUNDHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-						<ArmorRating_Blunt>13</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.54</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_PASGTFOXHOUNDHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>0.20</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Exo Suit Helmet THI ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_ExoSuitHelmet_GrayFox"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_ExoSuitHelmet_GrayFox"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_ExoSuitHelmet_GrayFox"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>32</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_ExoSuitHelmet_GrayFox"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>1</ArmorRating_Heat>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP Metal Gear Solid/CP_MGS_CE_Patch_Apparel_Headgear.xml b/Patches/CP Metal Gear Solid/CP_MGS_CE_Patch_Apparel_Headgear.xml
deleted file mode 100644
index eb73617f29..0000000000
--- a/Patches/CP Metal Gear Solid/CP_MGS_CE_Patch_Apparel_Headgear.xml	
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Metal Gear Solid</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== bandana FOX & bandana FOXHOUND ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Bandana_FOX" or
-						defName="RNApparel_Bandana_FOX_II"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<!-- Equivalent to vanilla pants, T-shirt and button-down shirt -->
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== beret (FOXHOUND) ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_Beret_FOXHOUND"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_Beret_FOXHOUND"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<!-- Equivalent to vanilla fabric hats -->
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP Metal Gear Solid/CP_MGS_CE_Patch_Apparel_OnSkin.xml b/Patches/CP Metal Gear Solid/CP_MGS_CE_Patch_Apparel_OnSkin.xml
deleted file mode 100644
index 0ce48a9846..0000000000
--- a/Patches/CP Metal Gear Solid/CP_MGS_CE_Patch_Apparel_OnSkin.xml	
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Metal Gear Solid</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== sneaking suit FOX & sneaking suit FOXHOUND ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_SneakingSuit_FOX" or
-						defName="RNApparel_SneakingSuit_FOXHOUND"
-						]/apparel/bodyPartGroups </xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_SneakingSuit_FOX" or
-						defName="RNApparel_SneakingSuit_FOXHOUND"
-						]/equippedStatOffsets </xpath>
-					<value>
-						<CarryBulk>15</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_SneakingSuit_FOX" or
-						defName="RNApparel_SneakingSuit_FOXHOUND"
-						]/statBases </xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_SneakingSuit_FOX" or
-						defName="RNApparel_SneakingSuit_FOXHOUND"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_SneakingSuit_FOX" or
-						defName="RNApparel_SneakingSuit_FOXHOUND"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>13</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP Metal Gear Solid/CP_MGS_CE_Patch_MeleeWeapon.xml b/Patches/CP Metal Gear Solid/CP_MGS_CE_Patch_MeleeWeapon.xml
deleted file mode 100644
index 36ff156447..0000000000
--- a/Patches/CP Metal Gear Solid/CP_MGS_CE_Patch_MeleeWeapon.xml	
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Metal Gear Solid</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Longsword / Katana ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHMelee_MGS_HFBlade"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<chanceFactor>0.33</chanceFactor>
-								<cooldownTime>1.52</cooldownTime>
-								<armorPenetrationBlunt>0.500</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>RHMelee_HFBladeStab</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1</cooldownTime>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<armorPenetrationSharp>85</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>RHMelee_HFBladeSlash</li>
-								</capacities>
-								<power>42</power>
-								<cooldownTime>0.5</cooldownTime>
-								<armorPenetrationBlunt>40</armorPenetrationBlunt>
-								<armorPenetrationSharp>75</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHMelee_MGS_HFBlade"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<MeleeCounterParryBonus>0.78</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHMelee_MGS_HFBlade"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>4</MeleeCritChance>
-							<MeleeParryChance>1.2</MeleeParryChance>
-							<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP Metal Gear Solid/CP_MGS_CE_Patch_PawnKindDefs.xml b/Patches/CP Metal Gear Solid/CP_MGS_CE_Patch_PawnKindDefs.xml
deleted file mode 100644
index b9155ea877..0000000000
--- a/Patches/CP Metal Gear Solid/CP_MGS_CE_Patch_PawnKindDefs.xml	
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Metal Gear Solid</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Reduce meals and medicine carried by all pawns ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[@Name="RH_FOX_Bare"]/invNutrition</xpath>
-					<value>
-						<invNutrition>1</invNutrition>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[
-						defName="RH_FOX_Infiltrator" or
-						defName="RH_FOX_QRF" or
-						defName="RH_FOX_CyborgNinja"
-						]/inventoryOptions/subOptionsChooseOne/li/countRange </xpath>
-					<value>
-						<countRange>
-							<min>0</min>
-							<max>1</max>
-						</countRange>
-					</value>
-				</li>
-
-				<!-- ========== FOX / FOXHOUND QRF Operator pawns should spawn with ammo appropriate to their primary weapon, as well as a sidearm (and its own ammo) ========== -->
-
-				<!-- First remove redundant MK23 from pawn's existing primary weaponTags -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/PawnKindDef[defName="RH_FOX_QRF"]/weaponTags/li[.="RN_MK23_Loud"]</xpath>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RH_FOX_QRF"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>1</generateChance>
-									<magazineCount>
-										<min>2</min>
-										<max>3</max>
-									</magazineCount>
-									<weaponTags>
-										<li>RN_MK23_Loud</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP Metal Gear Solid/CP_MGS_CE_Patch_RangedIndustrial_Pistols.xml b/Patches/CP Metal Gear Solid/CP_MGS_CE_Patch_RangedIndustrial_Pistols.xml
deleted file mode 100644
index 9968390d2a..0000000000
--- a/Patches/CP Metal Gear Solid/CP_MGS_CE_Patch_RangedIndustrial_Pistols.xml	
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Metal Gear Solid</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== M9A1-S Tranq ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M9NLPistol</defName>
-					<statBases>
-						<Mass>1.13</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.64</SwayFactor>
-						<Bulk>3.80</Bulk>
-						<WorkToMake>7500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_NL</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShotWUSPistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>2</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara_NonLethal</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== SOCOM Mk 23 MOD 0 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_MK23P_Loud</defName>
-					<statBases>
-						<Mass>1.35</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.176</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>2.45</Bulk>
-						<WorkToMake>7500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShot_1911Hellfighter</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNGun_M9NLPistol" or
-						defName="RNGun_MK23P_Loud"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP Metal Gear Solid/CP_MGS_CE_Patch_RangedIndustrial_R_Bullpup_Style.xml b/Patches/CP Metal Gear Solid/CP_MGS_CE_Patch_RangedIndustrial_R_Bullpup_Style.xml
deleted file mode 100644
index ecdda0b4ad..0000000000
--- a/Patches/CP Metal Gear Solid/CP_MGS_CE_Patch_RangedIndustrial_R_Bullpup_Style.xml	
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-Chicken Plucker's Project Red Horse mods often have duplicate items, apparels and defs shared between them,
-so this patch will only be applied if:
-
-Metal Gear Solid is active && Rimmu-Nation Weapons is NOT active
-
-If both mods are active, the CE patch from Rimmu-Nation Weapons should automatically take over
--->
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Metal Gear Solid</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>[CP] Rimmu-Nation - Weapons</li>
-			</mods>
-			<nomatch Class="PatchOperationSequence">
-				<operations>
-
-					<!-- ========== FAMAS ========== -->
-
-					<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-						<defName>RNGun_FAMASAR</defName>
-						<statBases>
-							<Mass>3.61</Mass>
-							<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.07</ShotSpread>
-							<SwayFactor>1.12</SwayFactor>
-							<Bulk>7.57</Bulk>
-							<WorkToMake>37500</WorkToMake>
-						</statBases>
-						<costList>
-							<Chemfuel>10</Chemfuel>
-							<Steel>45</Steel>
-							<ComponentIndustrial>6</ComponentIndustrial>
-						</costList>
-						<Properties>
-							<recoilAmount>1.44</recoilAmount>
-							<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-							<hasStandardCommand>true</hasStandardCommand>
-							<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-							<warmupTime>1.1</warmupTime>
-							<range>40</range>
-							<burstShotCount>6</burstShotCount>
-							<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-							<soundCast>RNShot_GenericBullpup_II</soundCast>
-							<soundCastTail>GunTail_Medium</soundCastTail>
-							<muzzleFlashScale>9</muzzleFlashScale>
-						</Properties>
-
-						<AmmoUser>
-							<magazineSize>25</magazineSize>
-							<reloadTime>4.5</reloadTime>
-							<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-						</AmmoUser>
-
-						<FireModes>
-							<aiUseBurstMode>FALSE</aiUseBurstMode>
-							<aiAimMode>AimedShot</aiAimMode>
-							<aimedBurstShotCount>3</aimedBurstShotCount>
-						</FireModes>
-
-						<!-- No additional CE weaponTags needed -->
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="RNGun_FAMASAR"]/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>
-					</li>
-
-				</operations>
-			</nomatch>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP Metal Gear Solid/CP_MGS_CE_Patch_Scenario.xml b/Patches/CP Metal Gear Solid/CP_MGS_CE_Patch_Scenario.xml
deleted file mode 100644
index c68eaf55f3..0000000000
--- a/Patches/CP Metal Gear Solid/CP_MGS_CE_Patch_Scenario.xml	
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Metal Gear Solid</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="RH_Scenario_FOX"]/scenario/parts</xpath>
-					<value>
-
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_9x19mmPara_NL</thingDef>
-							<count>500</count>
-						</li>
-
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_45ACP_FMJ</thingDef>
-							<count>500</count>
-						</li>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_Apparel_Armor.xml b/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_Apparel_Armor.xml
deleted file mode 100644
index 6202263535..0000000000
--- a/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_Apparel_Armor.xml	
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Spec Ops: The Line</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Crye JPC body armor (Delta) ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_CryeJPC_SOTL_Delta"]/statBases</xpath>
-					<value>
-						<Bulk>6.5</Bulk>
-						<WornBulk>4.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_CryeJPC_SOTL_Delta"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>10</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_CryeJPC_SOTL_Delta"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_CryeJPC_SOTL_Delta"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>31</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_CryeJPC_SOTL_Delta"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.36</ArmorRating_Heat>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_Apparel_Armor_Headgear.xml b/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_Apparel_Armor_Headgear.xml
deleted file mode 100644
index ada36f24b0..0000000000
--- a/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_Apparel_Armor_Headgear.xml	
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Spec Ops: The Line</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== PT A-Bravo helmet Delta ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_PTABravoHelmet_SOTL_Delta"]/statBases</xpath>
-					<value>
-						<Bulk>4.5</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.54</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_PTABravoHelmet_SOTL_Delta"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>0.20</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_Apparel_Backpacks.xml b/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_Apparel_Backpacks.xml
deleted file mode 100644
index e596dcf94a..0000000000
--- a/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_Apparel_Backpacks.xml	
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Spec Ops: The Line</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Messenger Bag Tactical ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_Backpack_Tactical_ShoulderBag"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_Backpack_Tactical_ShoulderBag"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>15</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_Backpack_Tactical_ShoulderBag"]/apparel
-					</xpath>
-					<value>
-						<apparel>
-							<careIfWornByCorpse>false</careIfWornByCorpse>
-							<bodyPartGroups>
-								<li>Shoulders</li>
-							</bodyPartGroups>
-							<layers>
-								<li>Backpack</li>
-							</layers>
-							<tags>
-								<li>RH_Backpack_ShoulderBag</li>
-								<li>PassiveCamo_Desert_Med</li>
-							</tags>
-							<defaultOutfitTags>
-								<li>Soldier</li>
-							</defaultOutfitTags>
-							<wornGraphicPath>Things/Apparel/Belt/MessengerBag_Tactical</wornGraphicPath>
-						</apparel>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_Apparel_Headgear.xml b/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_Apparel_Headgear.xml
deleted file mode 100644
index b891f08f53..0000000000
--- a/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_Apparel_Headgear.xml	
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Spec Ops: The Line</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Shemagh scarf (Walker) & Shemagh mask (Walker) ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_Shemagh_Scarf_Delta" or
-						defName="RHApparel_Shemagh_Mask_Delta"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<!-- Equivalent to vanilla pants, T-shirt and button-down shirt -->
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Baseball Cap Backwards (Delta), Baseball Cap (Lugo), Boonie Hat A-TACS AU (Delta) ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_BackwardsCap_ATACSAU_Delta" or
-						defName="RHApparel_LugoCap" or
-						defName="RHApparel_ATACSAUBoonie_Delta"
-						]/statBases </xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_BackwardsCap_ATACSAU_Delta" or
-						defName="RHApparel_LugoCap" or
-						defName="RHApparel_ATACSAUBoonie_Delta"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<!-- Equivalent to vanilla fabric hats -->
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_Apparel_OnSkin.xml b/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_Apparel_OnSkin.xml
deleted file mode 100644
index 8898393abc..0000000000
--- a/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_Apparel_OnSkin.xml	
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Spec Ops: The Line</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Combat UBAC A-TACS AU, Combats A-TACS AU (Delta) ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_combats_ATACSAU_Delta" or
-						defName="RHApparel_combats_ATACSAU_DeltaII"
-						]/statBases </xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>3</WornBulk>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-						<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_combats_ATACSAU_Delta" or
-						defName="RHApparel_combats_ATACSAU_DeltaII"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<!-- Slightly tougher than vanilla pants, T-shirt and button-down shirt -->
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_PawnKindDefs.xml b/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_PawnKindDefs.xml
deleted file mode 100644
index ef64e56acf..0000000000
--- a/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_PawnKindDefs.xml	
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Spec Ops: The Line</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Reduce meals and medicine carried by all pawns ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[@Name="RH_DeltaSOTL_Bare"]/invNutrition</xpath>
-					<value>
-						<invNutrition>1</invNutrition>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RH_SOTL_Delta_Operator"]/inventoryOptions/subOptionsChooseOne/li/countRange</xpath>
-					<value>
-						<countRange>
-							<min>0</min>
-							<max>1</max>
-						</countRange>
-					</value>
-				</li>
-
-				<!-- ========== Delta QRF Operator pawns should spawn backpacks, allowing them to carry their (huge) inventory ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[defName="RH_SOTL_Delta_QRF"]/apparelRequired</xpath>
-					<value>
-						<li>RHApparel_Backpack_Tactical_ShoulderBag</li>
-					</value>
-				</li>
-
-				<!-- ========== Delta QRF Operator pawns should spawn with ammo appropriate to their primary weapon ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RH_SOTL_Delta_QRF"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Delta Rogue Operator pawns should spawn with ammo appropriate to their primary weapon ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RH_SOTL_Delta_Rogue"]/inventoryOptions/subOptionsChooseOne/li/countRange</xpath>
-					<value>
-						<countRange>0~2</countRange>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RH_SOTL_Delta_Rogue"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_RangedIndustrial_LMG.xml b/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_RangedIndustrial_LMG.xml
deleted file mode 100644
index cf2cc9170d..0000000000
--- a/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_RangedIndustrial_LMG.xml	
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-Chicken Plucker's Project Red Horse mods often have duplicate items, apparels and defs shared between them,
-so this patch will only be applied if:
-
-Spec Ops: The Line is active && Rimmu-Nation Weapons is NOT active
-
-If both mods are active, the CE patch from Rimmu-Nation Weapons should automatically take over
--->
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Spec Ops: The Line</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>[CP] Rimmu-Nation - Weapons (1.0)</li>
-			</mods>
-			<nomatch Class="PatchOperationSequence">
-				<operations>
-
-					<!-- ========== M249 ========== -->
-
-					<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-						<defName>RNGun_M249LMG</defName>
-						<statBases>
-							<Mass>7.5</Mass>
-							<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
-							<SightsEfficiency>2.21</SightsEfficiency>
-							<ShotSpread>0.06</ShotSpread>
-							<SwayFactor>1.27</SwayFactor>
-							<Bulk>13.35</Bulk>
-							<WorkToMake>42500</WorkToMake>
-						</statBases>
-						<costList>
-							<Chemfuel>15</Chemfuel>
-							<Steel>70</Steel>
-							<ComponentIndustrial>7</ComponentIndustrial>
-						</costList>
-						<Properties>
-							<recoilAmount>0.94</recoilAmount>
-							<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-							<hasStandardCommand>true</hasStandardCommand>
-							<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-							<warmupTime>1.475</warmupTime>
-							<range>75</range>
-							<burstShotCount>10</burstShotCount>
-							<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-							<soundCast>RNShotL86LMG</soundCast>
-							<soundCastTail>GunTail_Medium</soundCastTail>
-							<muzzleFlashScale>9</muzzleFlashScale>
-						</Properties>
-
-						<AmmoUser>
-							<magazineSize>200</magazineSize>
-							<reloadTime>7.8</reloadTime>
-							<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-						</AmmoUser>
-
-						<FireModes>
-							<aiUseBurstMode>FALSE</aiUseBurstMode>
-							<aiAimMode>SuppressFire</aiAimMode>
-							<aimedBurstShotCount>5</aimedBurstShotCount>
-						</FireModes>
-
-						<!-- No additional CE weaponTags needed -->
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="RNGun_M249LMG"]/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>
-					</li>
-
-				</operations>
-			</nomatch>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_RangedIndustrial_M_BoltAction.xml b/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_RangedIndustrial_M_BoltAction.xml
deleted file mode 100644
index 7c3129607b..0000000000
--- a/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_RangedIndustrial_M_BoltAction.xml	
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Spec Ops: The Line</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Steyr Scout ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_SteyrScoutSn</defName>
-					<statBases>
-						<Mass>3.20</Mass>
-						<RangedWeapon_Cooldown>1.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.15</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>0.93</SwayFactor>
-						<Bulk>10.80</Bulk>
-						<WorkToMake>21500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.425</warmupTime>
-						<range>75</range>
-						<soundCast>RNShot_SSG08Sn</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNGun_SteyrScoutSn"]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_RangedIndustrial_R_AR_Style.xml b/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_RangedIndustrial_R_AR_Style.xml
deleted file mode 100644
index 727db1fcae..0000000000
--- a/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_RangedIndustrial_R_AR_Style.xml	
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Spec Ops: The Line</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== M4A1 Walker ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M4A1Walker</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>
-						<WorkToMake>32000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.58</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR_II</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNGun_M4A1Walker"]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_RangedIndustrial_SF_Pack.xml b/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_RangedIndustrial_SF_Pack.xml
deleted file mode 100644
index 08a49625de..0000000000
--- a/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_RangedIndustrial_SF_Pack.xml	
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Spec Ops: The Line</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== M4A1 SD Delta ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M4A1Delta</defName>
-					<statBases>
-						<Mass>3.52</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.40</SwayFactor>
-						<Bulk>9.21</Bulk>
-						<WorkToMake>37000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.44</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_SDAR_III</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== HK416 SD Wolfpack ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_HK416SD_Wolfpack</defName>
-					<statBases>
-						<Mass>4.38</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.54</SwayFactor>
-						<Bulk>10.10</Bulk>
-						<WorkToMake>35500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>55</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.27</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>62</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_SDAR</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNGun_M4A1Delta" or
-						defName="RNGun_HK416SD_Wolfpack"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_RangedSpecial_AirSupport.xml b/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_RangedSpecial_AirSupport.xml
deleted file mode 100644
index 9a80e9091c..0000000000
--- a/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_RangedSpecial_AirSupport.xml	
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Spec Ops: The Line</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Adjust mass and bulk of SOFLAM based on real-life stats for the AN/PEQ-1 -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNAir_SOFLAM"]</xpath>
-					<value>
-						<statBases>
-							<Mass>5.2</Mass>
-							<Bulk>2.5</Bulk>
-						</statBases>
-					</value>
-				</li>
-
-				<!-- Increase SOFLAM range, to match its real-life performance relative to RimWorld-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNAir_SOFLAM"]/verbs/li/range</xpath>
-					<value>
-						<range>700</range>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_Scenario.xml b/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_Scenario.xml
deleted file mode 100644
index 96d69110a8..0000000000
--- a/Patches/CP Spec Ops The Line/CP_SOTL_CE_Patch_Scenario.xml	
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Spec Ops: The Line</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="RH_Scenario_SOTL_Delta"]/scenario/parts</xpath>
-					<value>
-
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_556x45mmNATO_FMJ</thingDef>
-							<count>1000</count>
-						</li>
-
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_762x51mmNATO_FMJ</thingDef>
-							<count>500</count>
-						</li>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Cthulhu - Cosmic Horrors/Ammo.xml b/Patches/Call of Cthulhu - Cosmic Horrors/Ammo.xml
deleted file mode 100644
index 01cb2b587c..0000000000
--- a/Patches/Call of Cthulhu - Cosmic Horrors/Ammo.xml	
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Cthulhu - Cosmic Horrors</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingCategoryDef>
-							<defName>AmmoMiGoCastingWeapon</defName>
-							<label>MiGo Casting Weapon</label>
-							<parent>AmmoAdvanced</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_MiGoCastingWeapon</defName>
-							<label>MiGo Casting Weapon ammo</label>
-							<ammoTypes>
-								<Ammo_MiGoCastingWeapon>Bullet_MiGoCastingWeapon</Ammo_MiGoCastingWeapon>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="MiGoCastingWeaponBase" ParentName="AmmoBase" Abstract="True">
-							<description>MiGo Casting Weapon ammo</description>
-							<statBases>
-								<Mass>0.01</Mass>
-								<Bulk>0.02</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade_Sellable</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoMiGoCastingWeapon</li>
-							</thingCategories>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="MiGoCastingWeaponBase">
-							<defName>Ammo_MiGoCastingWeapon</defName>
-							<label>MiGo Casting Weapon cartridge</label>
-							<graphicData>
-								<texPath>Item/Weapon/MiGoCasterWeapon</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.95</MarketValue>
-							</statBases>
-							<ammoClass>FullMetalJacket</ammoClass>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="BaseMiGoCastingWeapon" ParentName="BaseBulletCE" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Charge_Small</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-								<drawSize>(10,10)</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>120</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseMiGoCastingWeapon">
-							<defName>Bullet_MiGoCastingWeapon</defName>
-							<label>Rhombohedral Energy blast</label>
-							<thingClass>CombatExtended.BulletCE</thingClass>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>27</damageAmountBase>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-								<armorPenetrationBlunt>30.6</armorPenetrationBlunt>
-								<damageDef>Bullet</damageDef>
-								<speed>120</speed>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== Recipes ================== -->
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_MiGoCastingWeapon</defName>
-							<label>make MiGo Casting Weapon cartridge x50</label>
-							<description>Craft 50 MiGo Casting Weapon cartridges.</description>
-							<jobString>Making MiGo Casting Weapon cartridge.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Plasteel</li>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_MiGoCastingWeapon>50</Ammo_MiGoCastingWeapon>
-							</products>
-							<workAmount>2600</workAmount>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Cthulhu - Cosmic Horrors/BodyDefs_CosmicHorrors/Bodies_BlackTree.xml b/Patches/Call of Cthulhu - Cosmic Horrors/BodyDefs_CosmicHorrors/Bodies_BlackTree.xml
deleted file mode 100644
index e4ef56ce52..0000000000
--- a/Patches/Call of Cthulhu - Cosmic Horrors/BodyDefs_CosmicHorrors/Bodies_BlackTree.xml	
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Cthulhu - Cosmic Horrors</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="ROM_DarkYoungBody"]//*[
-						def="Body"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="ROM_DarkYoungBody"]//*[
-						def="Body" or
-						def="ROM_TentacleFirst" or
-						def="ROM_TentacleSecond" or
-						def="ROM_TentacleThird" or
-						def="ROM_TentacleFourth" or
-						def="ROM_TentacleFifth" or
-						def="ROM_TentacleSixth" or
-						def="ROM_TentacleSeventh" or
-						def="ROM_LegFirst" or
-						def="ROM_LegSecond" or
-						def="ROM_LegThird"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Cthulhu - Cosmic Horrors/BodyDefs_CosmicHorrors/Bodies_Fishboy.xml b/Patches/Call of Cthulhu - Cosmic Horrors/BodyDefs_CosmicHorrors/Bodies_Fishboy.xml
deleted file mode 100644
index 809faf33d8..0000000000
--- a/Patches/Call of Cthulhu - Cosmic Horrors/BodyDefs_CosmicHorrors/Bodies_Fishboy.xml	
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Cthulhu - Cosmic Horrors</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ROM_DeepOneBody"]//*[
-						def="Torso" or
-						def="Head" or
-						def="Shoulder" or
-						def="Neck" or
-						def="Arm" or
-						def="Leg"]/groups </xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Cthulhu - Cosmic Horrors/BodyDefs_CosmicHorrors/Bodies_Migo.xml b/Patches/Call of Cthulhu - Cosmic Horrors/BodyDefs_CosmicHorrors/Bodies_Migo.xml
deleted file mode 100644
index 1fc3eb7de0..0000000000
--- a/Patches/Call of Cthulhu - Cosmic Horrors/BodyDefs_CosmicHorrors/Bodies_Migo.xml	
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Cthulhu - Cosmic Horrors</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="ROM_MiGoBody"]//*[
-						def="Body" or
-						def="Pronotum" or
-						def="ROM_SporeHead"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="ROM_MiGoBody"]//*[
-						def="Body" or
-						def="Pronotum" or
-						def="ROM_SporeHead" or
-						def="InsectLeg"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Cthulhu - Cosmic Horrors/BodyDefs_CosmicHorrors/Bodies_Shoggoth.xml b/Patches/Call of Cthulhu - Cosmic Horrors/BodyDefs_CosmicHorrors/Bodies_Shoggoth.xml
deleted file mode 100644
index 9f1e84c6e5..0000000000
--- a/Patches/Call of Cthulhu - Cosmic Horrors/BodyDefs_CosmicHorrors/Bodies_Shoggoth.xml	
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Cthulhu - Cosmic Horrors</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="ROM_ShoggothBody"]//*[
-						def="Body" or
-						def="Leg"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="ROM_ShoggothBody"]//*[
-						def="Body" or
-						def="ROM_Tentacle" or
-						def="Shoulder" or
-						def="Arm" or
-						def="Hand" or
-						def="Paws" or
-						def="Leg"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Cthulhu - Cosmic Horrors/BodyDefs_CosmicHorrors/Bodies_Squidward.xml b/Patches/Call of Cthulhu - Cosmic Horrors/BodyDefs_CosmicHorrors/Bodies_Squidward.xml
deleted file mode 100644
index d43787c2df..0000000000
--- a/Patches/Call of Cthulhu - Cosmic Horrors/BodyDefs_CosmicHorrors/Bodies_Squidward.xml	
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Cthulhu - Cosmic Horrors</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ROM_CthulhidBody"]//*[
-						def="Torso" or
-						def="Neck" or
-						def="Shoulder" or
-						def="Arm" or
-						def="Hand" or
-						def="ROM_RightWing" or
-						def="ROM_LeftWing" or
-						def="Leg"]/groups </xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Cthulhu - Cosmic Horrors/BodyDefs_CosmicHorrors/Bodies_Wormy.xml b/Patches/Call of Cthulhu - Cosmic Horrors/BodyDefs_CosmicHorrors/Bodies_Wormy.xml
deleted file mode 100644
index 19a171a66b..0000000000
--- a/Patches/Call of Cthulhu - Cosmic Horrors/BodyDefs_CosmicHorrors/Bodies_Wormy.xml	
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Cthulhu - Cosmic Horrors</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ROM_ChthonianBody"]//*[
-						def="ROM_ChthonianFirstRing" or
-						def="ROM_ChthonianThirdRing" or
-						def="ROM_ChthonianFourthRing" or
-						def="ROM_ChthonianFifthRing" or
-						def="ROM_ChthonianSixthRing"] </xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ROM_ChthonianBody"]//*[
-						def="ROM_ChthonianFirstRing" or
-						def="ROM_ChthonianSecondRing" or
-						def="ROM_ChthonianThirdRing" or
-						def="ROM_ChthonianFourthRing" or
-						def="ROM_ChthonianFifthRing" or
-						def="Head" or
-						def="ROM_ChthonianSixthRing"]/groups </xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Cthulhu - Cosmic Horrors/Leather/ROM_CosmicHorrors_Resources_Leathers.xml b/Patches/Call of Cthulhu - Cosmic Horrors/Leather/ROM_CosmicHorrors_Resources_Leathers.xml
deleted file mode 100644
index f767f03354..0000000000
--- a/Patches/Call of Cthulhu - Cosmic Horrors/Leather/ROM_CosmicHorrors_Resources_Leathers.xml	
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Cthulhu - Cosmic Horrors</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CH_Leather_Chthonian"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.25</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CH_Leather_Chthonian"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.18</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CH_Leather_Cthulhid"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.4</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CH_Leather_Cthulhid"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.28</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CH_Leather_Cthulhid"]/stuffProps</xpath>
-					<value>
-						<categories>
-							<li>SoftArmor</li>
-						</categories>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CH_Leather_DarkYoung"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.1</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CH_Leather_DarkYoung"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.07</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CH_Leather_DeepOne"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.12</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CH_Leather_DeepOne"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.06</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CH_Leather_StarVampire"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.08</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CH_Leather_StarVampire"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.04</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Cthulhu - Cosmic Horrors/MiGo_Weapons.xml b/Patches/Call of Cthulhu - Cosmic Horrors/MiGo_Weapons.xml
deleted file mode 100644
index 81c67db345..0000000000
--- a/Patches/Call of Cthulhu - Cosmic Horrors/MiGo_Weapons.xml	
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Cthulhu - Cosmic Horrors</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ROM_MiGoCastingWeapon</defName>
-					<statBases>
-						<Mass>1.50</Mass>
-						<RangedWeapon_Cooldown>0.48</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.50</SwayFactor>
-						<Bulk>5</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_MiGoCastingWeapon</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>60</range>
-						<soundCast>Shot_ChargeBlaster</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>18</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_MiGoCastingWeapon</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>MiGoGunLow</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsChthonian.xml b/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsChthonian.xml
deleted file mode 100644
index a349f656d2..0000000000
--- a/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsChthonian.xml	
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Cthulhu - Cosmic Horrors</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ROM_Chthonian"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ROM_Chthonian"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.01</MeleeDodgeChance>
-						<MeleeCritChance>0.9</MeleeCritChance>
-						<MeleeParryChance>0.5</MeleeParryChance>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-						<ArmorRating_Blunt>32</ArmorRating_Blunt>
-						<SmokeSensitivity>0</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ROM_Chthonian"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tentacles</label>
-								<capacities>
-									<li>ROM_BluntMonstrous</li>
-								</capacities>
-								<power>38</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>ROM_Tentacles</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>40.8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>coiling tentacles</label>
-								<capacities>
-									<li>ROM_ConstrictMonstrous</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>ROM_Tentacles</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>75.6</armorPenetrationBlunt>
-								<chanceFactor>0.25</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>overwhelming mind</label>
-								<capacities>
-									<li>ROM_Psychic</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>ROM_Mind</linkedBodyPartsGroup>
-								<armorPenetrationSharp>100</armorPenetrationSharp>
-								<armorPenetrationBlunt>100.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>body</label>
-								<capacities>
-									<li>ROM_BluntMonstrous</li>
-								</capacities>
-								<power>64</power>
-								<cooldownTime>3.4</cooldownTime>
-								<linkedBodyPartsGroup>ROM_BodyAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>65.6</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ROM_ChthonianLarva"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ROM_ChthonianLarva"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.08</MeleeDodgeChance>
-						<MeleeCritChance>0.24</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-						<SmokeSensitivity>0</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ROM_ChthonianLarva"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ROM_ChthonianLarva"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ROM_ChthonianLarva"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tentacles</label>
-								<capacities>
-									<li>ROM_BluntMonstrous</li>
-									<li>ROM_ConstrictMonstrous</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>ROM_Tentacles</linkedBodyPartsGroup>
-								<armorPenetrationSharp>7</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>overwhelming mind</label>
-								<capacities>
-									<li>ROM_Psychic</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.55</cooldownTime>
-								<linkedBodyPartsGroup>ROM_Mind</linkedBodyPartsGroup>
-								<armorPenetrationSharp>32</armorPenetrationSharp>
-								<armorPenetrationBlunt>50.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>body</label>
-								<capacities>
-									<li>ROM_BluntMonstrous</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>2.45</cooldownTime>
-								<linkedBodyPartsGroup>ROM_BodyAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>5</armorPenetrationSharp>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsCthulhids.xml b/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsCthulhids.xml
deleted file mode 100644
index c1dfd58057..0000000000
--- a/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsCthulhids.xml	
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Cthulhu - Cosmic Horrors</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ROM_Cthulhid"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ROM_Cthulhid"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.08</MeleeDodgeChance>
-						<MeleeCritChance>0.68</MeleeCritChance>
-						<MeleeParryChance>0.5</MeleeParryChance>
-						<SmokeSensitivity>0</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ROM_Cthulhid"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>17</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ROM_Cthulhid"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>34</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ROM_Cthulhid"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>wings</label>
-								<capacities>
-									<li>ROM_BluntMonstrous</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>ROM_Wings</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>18.6</armorPenetrationBlunt>
-								<chanceFactor>0.25</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>ROM_ScratchMonstrous</li>
-								</capacities>
-								<power>48</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<armorPenetrationBlunt>40.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>ROM_ScratchMonstrous</li>
-								</capacities>
-								<power>48</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<armorPenetrationBlunt>40.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>overwhelming mind</label>
-								<capacities>
-									<li>ROM_Psychic</li>
-								</capacities>
-								<power>60</power>
-								<cooldownTime>1.55</cooldownTime>
-								<linkedBodyPartsGroup>ROM_Mind</linkedBodyPartsGroup>
-								<armorPenetrationSharp>100</armorPenetrationSharp>
-								<armorPenetrationBlunt>155.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>maw</label>
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>54</power>
-								<cooldownTime>1.55</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>24</armorPenetrationSharp>
-								<armorPenetrationBlunt>36.6</armorPenetrationBlunt>
-								<chanceFactor>0.33</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsDarkYoung.xml b/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsDarkYoung.xml
deleted file mode 100644
index f749d8c628..0000000000
--- a/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsDarkYoung.xml	
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Cthulhu - Cosmic Horrors</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ROM_DarkYoung"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ROM_DarkYoung"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.48</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ROM_DarkYoung"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>hooves</label>
-								<capacities>
-									<li>ROM_BluntMonstrous</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.55</cooldownTime>
-								<linkedBodyPartsGroup>ROM_Hooves</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>15.6</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>tentacles</label>
-								<capacities>
-									<li>ROM_BluntMonstrous</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>ROM_Tentacles</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>14.8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>coiling tentacles</label>
-								<capacities>
-									<li>ROM_ConstrictMonstrous</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>ROM_Tentacles</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>28.8</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>maw</label>
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>1.75</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>7</armorPenetrationSharp>
-								<armorPenetrationBlunt>18.6</armorPenetrationBlunt>
-								<chanceFactor>0.4</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsDeepOne.xml b/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsDeepOne.xml
deleted file mode 100644
index 5a3a0ef4b9..0000000000
--- a/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsDeepOne.xml	
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Cthulhu - Cosmic Horrors</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ROM_DeepOne"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ROM_DeepOne"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.24</MeleeDodgeChance>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>0.28</MeleeParryChance>
-						<SmokeSensitivity>0.25</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ROM_DeepOne"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>3</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ROM_DeepOne"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ROM_DeepOne"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>ROM_ScratchMonstrous</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>ROM_LeftClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<armorPenetrationBlunt>13.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>ROM_ScratchMonstrous</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>ROM_RightClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<armorPenetrationBlunt>13.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.75</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>24.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>15.6</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ROM_DeepOneGreat"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ROM_DeepOneGreat"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.48</MeleeCritChance>
-						<MeleeParryChance>0.45</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ROM_DeepOneGreat"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ROM_DeepOneGreat"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>7</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ROM_DeepOneGreat"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>ROM_ScratchMonstrous</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>ROM_LeftClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>13</armorPenetrationSharp>
-								<armorPenetrationBlunt>30.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>ROM_ScratchMonstrous</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>ROM_RightClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>13</armorPenetrationSharp>
-								<armorPenetrationBlunt>30.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<armorPenetrationBlunt>50.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsMiGo.xml b/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsMiGo.xml
deleted file mode 100644
index b0dde989f5..0000000000
--- a/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsMiGo.xml	
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Cthulhu - Cosmic Horrors</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ROM_MiGo"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ROM_MiGo"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.8</MeleeDodgeChance>
-						<MeleeCritChance>0.22</MeleeCritChance>
-						<MeleeParryChance>0.8</MeleeParryChance>
-						<SmokeSensitivity>0.5</SmokeSensitivity>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>2</ShootingAccuracyPawn>
-						<Suppressability>0.2</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ROM_MiGo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>legs</label>
-								<capacities>
-									<li>ROM_ScratchMonstrous</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>0.55</cooldownTime>
-								<linkedBodyPartsGroup>Legs</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>overwhelming mind</label>
-								<capacities>
-									<li>ROM_Psychic</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>ROM_Mind</linkedBodyPartsGroup>
-								<armorPenetrationSharp>65</armorPenetrationSharp>
-								<armorPenetrationBlunt>85.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>body</label>
-								<capacities>
-									<li>ROM_BluntMonstrous</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>ROM_Wings</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="ROM_MiGoCaster"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="ROM_MiGoCaster"]/aiAvoidCover</xpath>
-					<value>
-						<aiAvoidCover>false</aiAvoidCover>
-					</value>
-				</li>
-
-				<li Class="PatchOperationSequence">
-					<success>Always</success>
-					<operations>
-						<li Class="PatchOperationTest">
-							<xpath>Defs/ThingDef[defName="ROM_MiGo"]/comps</xpath>
-							<success>Invert</success>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ROM_MiGo"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</li>
-					</operations>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ROM_MiGo"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsShoggoths.xml b/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsShoggoths.xml
deleted file mode 100644
index 82091b2054..0000000000
--- a/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsShoggoths.xml	
+++ /dev/null
@@ -1,247 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Cthulhu - Cosmic Horrors</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ROM_Shoggoth"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ROM_Shoggoth"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						<MeleeCritChance>0.68</MeleeCritChance>
-						<SmokeSensitivity>0</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ROM_ShoggothColossal"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<SmokeSensitivity>0</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ROM_ShoggothTiny"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.35</MeleeDodgeChance>
-						<MeleeCritChance>0.38</MeleeCritChance>
-						<SmokeSensitivity>0</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ROM_ShoggothTiny"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ROM_ShoggothTiny"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ROM_Shoggoth"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ROM_Shoggoth"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>20</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ROM_ShoggothColossal"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ROM_ShoggothColossal"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>38</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ROM_Shoggoth"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tentacles</label>
-								<capacities>
-									<li>ROM_BluntMonstrous</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>1.75</cooldownTime>
-								<linkedBodyPartsGroup>ROM_Tentacles</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>29.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>ROM_BluntMonstrous</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>20.8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>ROM_BluntMonstrous</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>20.8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>maw</label>
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>23.6</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ROM_ShoggothTiny"]/tools</xpath>
-					<value>
-						<tools Inherit="False">
-							<li Class="CombatExtended.ToolCE">
-								<label>tentacles</label>
-								<capacities>
-									<li>ROM_BluntMonstrous</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>ROM_Tentacles</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>ROM_BluntMonstrous</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.55</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<chanceFactor>0.25</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>ROM_BluntMonstrous</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.55</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<chanceFactor>0.25</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>maw</label>
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>2.08</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ROM_ShoggothColossal"]/tools</xpath>
-					<value>
-						<tools Inherit="False">
-							<li Class="CombatExtended.ToolCE">
-								<label>tentacles</label>
-								<capacities>
-									<li>ROM_BluntMonstrous</li>
-								</capacities>
-								<power>38</power>
-								<cooldownTime>2.38</cooldownTime>
-								<linkedBodyPartsGroup>ROM_Tentacles</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>64.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>ROM_BluntMonstrous</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>30.6</armorPenetrationBlunt>
-								<chanceFactor>0.25</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>ROM_BluntMonstrous</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>30.6</armorPenetrationBlunt>
-								<chanceFactor>0.25</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>maw</label>
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>50</power>
-								<cooldownTime>2.68</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>24</armorPenetrationSharp>
-								<armorPenetrationBlunt>52.8</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsStarVampire.xml b/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsStarVampire.xml
deleted file mode 100644
index b420150221..0000000000
--- a/Patches/Call of Cthulhu - Cosmic Horrors/PawnKindDefs_CosmicHorrors/CH_KindsStarVampire.xml	
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Cthulhu - Cosmic Horrors</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ROM_StarVampire"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ROM_StarVampire"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.9</MeleeDodgeChance>
-						<MeleeCritChance>0.7</MeleeCritChance>
-						<MeleeParryChance>0.5</MeleeParryChance>
-						<SmokeSensitivity>0</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ROM_StarVampire"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>needles</label>
-								<capacities>
-									<li>ROM_ScratchMonstrous</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>0.95</cooldownTime>
-								<linkedBodyPartsGroup>ROM_Tentacles</linkedBodyPartsGroup>
-								<armorPenetrationSharp>14</armorPenetrationSharp>
-								<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>tentacles</label>
-								<capacities>
-									<li>ROM_BluntMonstrous</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>0.95</cooldownTime>
-								<linkedBodyPartsGroup>ROM_Tentacles</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>20.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>coiling tentacles</label>
-								<capacities>
-									<li>ROM_ConstrictMonstrous</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>ROM_Tentacles</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>24.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>ROM_Exsanguination</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.75</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>7</armorPenetrationSharp>
-								<armorPenetrationBlunt>14</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Blunders/Acidgat.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Blunders/Acidgat.xml
deleted file mode 100644
index 09e2cb8b07..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Blunders/Acidgat.xml	
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Wonder Weapons</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoAcidgat</defName>
-							<label>Acidgat</label>
-							<parent>AmmoWonders</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberShotgun</iconPath>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Acidgat</defName>
-							<label>Acidgat</label>
-							<ammoTypes>
-								<Ammo_Acidgat_Buck>Bullet_Acidgat_Buck</Ammo_Acidgat_Buck>
-								<Ammo_Acidgat_Slug>Bullet_Acidgat_Slug</Ammo_Acidgat_Slug>
-							</ammoTypes>
-							<similarTo>AmmoSet_Blundergat</similarTo>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="AcidgatBase" ParentName="SmallAmmoBase" Abstract="True">
-							<description>Wear protective goggles when using in battle.</description>
-							<statBases>
-								<Mass>0.023</Mass>
-								<Bulk>0.06</Bulk>
-							</statBases>
-							<graphicData>
-								<texPath>ThirdParty/CoD Zombies Pack/Acidgat</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<tradeTags>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoAcidgat</li>
-							</thingCategories>
-							<stackLimit>100</stackLimit>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="AcidgatBase">
-							<defName>Ammo_Acidgat_Buck</defName>
-							<label>Acidgat shell (Buck)</label>
-							<statBases>
-								<MarketValue>0.2</MarketValue>
-							</statBases>
-							<ammoClass>BuckShot</ammoClass>
-							<cookOffProjectile>Bullet_Acidgat_Buck</cookOffProjectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="AcidgatBase">
-							<defName>Ammo_Acidgat_Slug</defName>
-							<label>Acidgat shell (Slug)</label>
-							<statBases>
-								<Mass>0.048</Mass>
-								<MarketValue>0.4</MarketValue>
-							</statBases>
-							<ammoClass>Slug</ammoClass>
-							<cookOffProjectile>Bullet_Acidgat_Slug</cookOffProjectile>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef ParentName="CODZP_BlunderBulletBase">
-							<defName>Bullet_Acidgat_Buck</defName>
-							<label>buckshot pellet</label>
-							<graphicData>
-								<texPath>Things/Projectile/Shotgun_Pellet</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<color>(0, 160, 20)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>11</damageAmountBase>
-								<damageDef>CodZP_Toxic_Burn</damageDef>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.52</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="CODZP_BlunderBulletBase">
-							<defName>Bullet_Acidgat_Slug</defName>
-							<label>Slug shot</label>
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_big</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<color>(0, 160, 20)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>44</damageAmountBase>
-								<damageDef>CodZP_Toxic_Burn</damageDef>
-								<pelletCount>1</pelletCount>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.52</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeAmmo">
-							<defName>MakeAmmo_Acidgat_Buck</defName>
-							<label>make Acidgat (Buck) shell x20</label>
-							<description>Craft 20 Acidgat (Buck) shells .</description>
-							<jobString>Making Acidgat (Buck) shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_Blundergat_Buck</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Uranium</li>
-										</thingDefs>
-									</filter>
-									<count>5</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_Blundergat_Buck</li>
-									<li>Uranium</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Acidgat_Buck>20</Ammo_Acidgat_Buck>
-							</products>
-							<workAmount>1000</workAmount>
-						</RecipeDef>
-						<RecipeDef ParentName="CODZP_AmmoRecipeAmmo">
-							<defName>MakeAmmo_Acidgat_Slug</defName>
-							<label>make Acidgat (Slug) shell x20</label>
-							<description>Craft 20 Acidgat (Slug) shells .</description>
-							<jobString>Making Acidgat (Slug) shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_Blundergat_Slug</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Uranium</li>
-										</thingDefs>
-									</filter>
-									<count>5</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_Blundergat_Slug</li>
-									<li>Uranium</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Acidgat_Slug>20</Ammo_Acidgat_Slug>
-							</products>
-							<workAmount>1000</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Blunders/Acidgat_Punched.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Blunders/Acidgat_Punched.xml
deleted file mode 100644
index 81f996a561..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Blunders/Acidgat_Punched.xml	
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoAcidgat_Punched</defName>
-							<label>Vitriolic Withering</label>
-							<parent>AmmoWonders_Punched</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberShotgun</iconPath>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Acidgat_Punched</defName>
-							<label>Vitriolic Withering Ammo Set</label>
-							<ammoTypes>
-								<Ammo_Acidgat_Buck_Punched>Bullet_Acidgat_Buck_Punched</Ammo_Acidgat_Buck_Punched>
-								<Ammo_Acidgat_Slug_Punched>Bullet_Acidgat_Slug_Punched</Ammo_Acidgat_Slug_Punched>
-							</ammoTypes>
-							<similarTo>AmmoSet_Blundergat_Punched</similarTo>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="AcidgatPunched" ParentName="SmallAmmoBase" Abstract="True">
-							<description>A highly acidic chemical reaction.</description>
-							<statBases>
-								<Mass>0.023</Mass>
-								<Bulk>0.06</Bulk>
-							</statBases>
-							<graphicData>
-								<texPath>ThirdParty/CoD Zombies Pack/Acidgat</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(200,200,200)</color>
-							</graphicData>
-							<tradeTags>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoAcidgat_Punched</li>
-							</thingCategories>
-							<stackLimit>150</stackLimit>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="AcidgatPunched">
-							<defName>Ammo_Acidgat_Buck_Punched</defName>
-							<label>Vitriolic Withering shell (Buck)</label>
-							<statBases>
-								<MarketValue>0.2</MarketValue>
-							</statBases>
-							<ammoClass>BuckShot</ammoClass>
-							<cookOffProjectile>Bullet_Acidgat_Buck_Punched</cookOffProjectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="AcidgatPunched">
-							<defName>Ammo_Acidgat_Slug_Punched</defName>
-							<label>Vitriolic Withering shell (Slug)</label>
-							<statBases>
-								<Mass>0.048</Mass>
-								<MarketValue>0.4</MarketValue>
-							</statBases>
-							<ammoClass>Slug</ammoClass>
-							<cookOffProjectile>Bullet_Acidgat_Slug_Punched</cookOffProjectile>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef ParentName="CODZP_BlunderBulletPunched">
-							<defName>Bullet_Acidgat_Buck_Punched</defName>
-							<label>buckshot pellet</label>
-							<graphicData>
-								<texPath>Things/Projectile/Shotgun_Pellet</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<color>(0, 160, 20)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>22</damageAmountBase>
-								<damageDef>CodZP_Toxic_Burn</damageDef>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<armorPenetrationBlunt>9</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="CODZP_BlunderBulletPunched">
-							<defName>Bullet_Acidgat_Slug_Punched</defName>
-							<label>Slug shot</label>
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_big</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<color>(0, 160, 20)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>88</damageAmountBase>
-								<damageDef>CodZP_Toxic_Burn</damageDef>
-								<pelletCount>1</pelletCount>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<armorPenetrationBlunt>9</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonderAmmo_Punched">
-							<defName>MakeAmmo_Acidgat_Buck_Punched</defName>
-							<label>make Vitriolic Withering (Buck) shell x20</label>
-							<description>Craft 20 Vitriolic Withering (Buck) shells .</description>
-							<jobString>Making Vitriolic Withering (Buck) shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_Acidgat_Buck</li>
-										</thingDefs>
-									</filter>
-									<count>80</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_Acidgat_Buck</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Acidgat_Buck_Punched>20</Ammo_Acidgat_Buck_Punched>
-							</products>
-							<workAmount>1000</workAmount>
-						</RecipeDef>
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonderAmmo_Punched">
-							<defName>MakeAmmo_Acidgat_Slug_Punched</defName>
-							<label>make Vitriolic Withering (Slug) shell x20</label>
-							<description>Craft 20 Vitriolic Withering (Slug) shells .</description>
-							<jobString>Making Vitriolic Withering (Slug) shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_Acidgat_Slug</li>
-										</thingDefs>
-									</filter>
-									<count>80</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_Acidgat_Slug</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Acidgat_Slug_Punched>20</Ammo_Acidgat_Slug_Punched>
-							</products>
-							<workAmount>1000</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Blunders/Blundergat.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Blunders/Blundergat.xml
deleted file mode 100644
index d12bf74b19..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Blunders/Blundergat.xml	
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Wonder Weapons</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoBlundergat</defName>
-							<label>Blundergat</label>
-							<parent>AmmoWonders</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberShotgun</iconPath>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Blundergat</defName>
-							<label>Blundergat</label>
-							<ammoTypes>
-								<Ammo_Blundergat_Buck>Bullet_Blundergat_Buck</Ammo_Blundergat_Buck>
-								<Ammo_Blundergat_Slug>Bullet_Blundergat_Slug</Ammo_Blundergat_Slug>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="BlundergatBase" ParentName="SmallAmmoBase" Abstract="True">
-							<description>Not heavily different from a 12-Guage.</description>
-							<statBases>
-								<Mass>0.023</Mass>
-								<Bulk>0.06</Bulk>
-							</statBases>
-							<graphicData>
-								<texPath>ThirdParty/CoD Zombies Pack/Blundergat</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<tradeTags>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoBlundergat</li>
-							</thingCategories>
-							<stackLimit>100</stackLimit>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BlundergatBase">
-							<defName>Ammo_Blundergat_Buck</defName>
-							<label>Blundergat shell (Buck)</label>
-							<statBases>
-								<MarketValue>0.2</MarketValue>
-							</statBases>
-							<ammoClass>BuckShot</ammoClass>
-							<cookOffProjectile>Bullet_Blundergat_Buck</cookOffProjectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BlundergatBase">
-							<defName>Ammo_Blundergat_Slug</defName>
-							<label>Blundergat shell (Slug)</label>
-							<statBases>
-								<Mass>0.048</Mass>
-								<MarketValue>0.4</MarketValue>
-							</statBases>
-							<ammoClass>Slug</ammoClass>
-							<cookOffProjectile>Bullet_Blundergat_Slug</cookOffProjectile>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef Name="CODZP_BlunderBulletBase" ParentName="Base12GaugeBullet" Abstract="true">
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>92</speed>
-								<dropsCasings>true</dropsCasings>
-								<damageDef>Bullet</damageDef>
-								<pelletCount>4</pelletCount>
-								<spreadMult>15</spreadMult>
-								<casingMoteDefname>Fleck_ShotgunShell</casingMoteDefname>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="CODZP_BlunderBulletBase">
-							<defName>Bullet_Blundergat_Buck</defName>
-							<label>buckshot pellet</label>
-							<graphicData>
-								<texPath>Things/Projectile/Shotgun_Pellet</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<color>(255, 0, 0)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>11</damageAmountBase>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.52</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="CODZP_BlunderBulletBase">
-							<defName>Bullet_Blundergat_Slug</defName>
-							<label>Slug shot</label>
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_big</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<color>(255, 0, 0)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>44</damageAmountBase>
-								<pelletCount>1</pelletCount>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.52</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonder">
-							<defName>MakeAmmo_Blundergat_Buck</defName>
-							<label>make Blundergat (Buck) shell x20</label>
-							<description>Craft 20 Blundergat (Buck) shells .</description>
-							<jobString>Making Blundergat (Buck) shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Blundergat_Buck>20</Ammo_Blundergat_Buck>
-							</products>
-							<workAmount>1000</workAmount>
-						</RecipeDef>
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonder">
-							<defName>MakeAmmo_Blundergat_Slug</defName>
-							<label>make Blundergat (Slug) shell x20</label>
-							<description>Craft 20 Blundergat (Slug) shells .</description>
-							<jobString>Making Blundergat (Slug) shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Blundergat_Slug>20</Ammo_Blundergat_Slug>
-							</products>
-							<workAmount>1000</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Blunders/Blundergat_Punched.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Blunders/Blundergat_Punched.xml
deleted file mode 100644
index 26babf58f7..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Blunders/Blundergat_Punched.xml	
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoBlundergat_Punched</defName>
-							<label>Sweeper</label>
-							<parent>AmmoWonders_Punched</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberShotgun</iconPath>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Blundergat_Punched</defName>
-							<label>Sweeper Ammo Set</label>
-							<ammoTypes>
-								<Ammo_Blundergat_Buck_Punched>Bullet_Blundergat_Buck_Punched</Ammo_Blundergat_Buck_Punched>
-								<Ammo_Blundergat_Slug_Punched>Bullet_Blundergat_Slug_Punched</Ammo_Blundergat_Slug_Punched>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="BlundergatPunched" ParentName="SmallAmmoBase" Abstract="True">
-							<description>A tale from an bygone age.</description>
-							<statBases>
-								<Mass>0.023</Mass>
-								<Bulk>0.06</Bulk>
-							</statBases>
-							<graphicData>
-								<texPath>ThirdParty/CoD Zombies Pack/Blundergat</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(200,200,200)</color>
-							</graphicData>
-							<tradeTags>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoBlundergat_Punched</li>
-							</thingCategories>
-							<stackLimit>150</stackLimit>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BlundergatPunched">
-							<defName>Ammo_Blundergat_Buck_Punched</defName>
-							<label>Sweeper shell (Buck)</label>
-							<statBases>
-								<MarketValue>0.2</MarketValue>
-							</statBases>
-							<ammoClass>BuckShot</ammoClass>
-							<cookOffProjectile>Bullet_Blundergat_Buck_Punched</cookOffProjectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BlundergatPunched">
-							<defName>Ammo_Blundergat_Slug_Punched</defName>
-							<label>Sweeper shell (Slug)</label>
-							<statBases>
-								<Mass>0.048</Mass>
-								<MarketValue>0.4</MarketValue>
-							</statBases>
-							<ammoClass>Slug</ammoClass>
-							<cookOffProjectile>Bullet_Blundergat_Slug_Punched</cookOffProjectile>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef Name="CODZP_BlunderBulletPunched" ParentName="CODZP_BlunderBulletBase" Abstract="true">
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>102</speed>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="CODZP_BlunderBulletPunched">
-							<defName>Bullet_Blundergat_Buck_Punched</defName>
-							<label>buckshot pellet</label>
-							<graphicData>
-								<texPath>Things/Projectile/Shotgun_Pellet</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<color>(255, 0, 0)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>22</damageAmountBase>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<armorPenetrationBlunt>9</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="CODZP_BlunderBulletPunched">
-							<defName>Bullet_Blundergat_Slug_Punched</defName>
-							<label>Slug shot</label>
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_big</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<color>(255, 0, 0)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>88</damageAmountBase>
-								<pelletCount>1</pelletCount>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<armorPenetrationBlunt>9</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonder_Punched">
-							<defName>MakeAmmo_Blundergat_Buck_Punched</defName>
-							<label>make Sweeper (Buck) shell x20</label>
-							<description>Craft 20 Sweeper (Buck) shells .</description>
-							<jobString>Making Sweeper (Buck) shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_Blundergat_Buck</li>
-										</thingDefs>
-									</filter>
-									<count>80</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_Blundergat_Buck</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Blundergat_Buck_Punched>20</Ammo_Blundergat_Buck_Punched>
-							</products>
-							<workAmount>1000</workAmount>
-						</RecipeDef>
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonder_Punched">
-							<defName>MakeAmmo_Blundergat_Slug_Punched</defName>
-							<label>make Sweeper (Slug) shell x20</label>
-							<description>Craft 20 Sweeper (Slug) shells .</description>
-							<jobString>Making Sweeper (Slug) shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_Blundergat_Slug</li>
-										</thingDefs>
-									</filter>
-									<count>80</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_Blundergat_Slug</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Blundergat_Slug_Punched>20</Ammo_Blundergat_Slug_Punched>
-							</products>
-							<workAmount>1000</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Blunders/Magmagat.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Blunders/Magmagat.xml
deleted file mode 100644
index 12fe6b50b5..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Blunders/Magmagat.xml	
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Wonder Weapons</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoMagmagat</defName>
-							<label>Magmagat</label>
-							<parent>AmmoWonders</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberShotgun</iconPath>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Magmagat</defName>
-							<label>Magmagat</label>
-							<ammoTypes>
-								<Ammo_Magmagat_Buck>Bullet_Magmagat_Buck</Ammo_Magmagat_Buck>
-								<Ammo_Magmagat_Slug>Bullet_Magmagat_Slug</Ammo_Magmagat_Slug>
-							</ammoTypes>
-							<similarTo>AmmoSet_Blundergat</similarTo>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="MagmagatBase" ParentName="SmallAmmoBase" Abstract="True">
-							<description>A single touch from this fiery will light all.</description>
-							<statBases>
-								<Mass>0.023</Mass>
-								<Bulk>0.06</Bulk>
-							</statBases>
-							<graphicData>
-								<texPath>ThirdParty/CoD Zombies Pack/Magmagat</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<tradeTags>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoMagmagat</li>
-							</thingCategories>
-							<stackLimit>100</stackLimit>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="MagmagatBase">
-							<defName>Ammo_Magmagat_Buck</defName>
-							<label>Magmagat shell (Buck)</label>
-							<statBases>
-								<MarketValue>0.2</MarketValue>
-							</statBases>
-							<ammoClass>BuckShot</ammoClass>
-							<cookOffProjectile>Bullet_Magmagat_Buck</cookOffProjectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="MagmagatBase">
-							<defName>Ammo_Magmagat_Slug</defName>
-							<label>Magmagat shell (Slug)</label>
-							<statBases>
-								<Mass>0.048</Mass>
-								<MarketValue>0.4</MarketValue>
-							</statBases>
-							<ammoClass>Slug</ammoClass>
-							<cookOffProjectile>Bullet_Magmagat_Slug</cookOffProjectile>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef ParentName="CODZP_BlunderBulletBase">
-							<defName>Bullet_Magmagat_Buck</defName>
-							<label>buckshot pellet</label>
-							<graphicData>
-								<texPath>Things/Projectile/Shotgun_Pellet</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<color>(255, 100, 0)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>11</damageAmountBase>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.52</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>8</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="CODZP_BlunderBulletBase">
-							<defName>Bullet_Magmagat_Slug</defName>
-							<label>Slug shot</label>
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_big</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<color>(255, 100, 0)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>44</damageAmountBase>
-								<pelletCount>1</pelletCount>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.52</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>14</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeAmmo">
-							<defName>MakeAmmo_Magmagat_Buck</defName>
-							<label>make Magmagat (Buck) shell x20</label>
-							<description>Craft 20 Magmagat (Buck) shells .</description>
-							<jobString>Making Magmagat (Buck) shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_Blundergat_Buck</li>
-										</thingDefs>
-									</filter>
-									<count>5</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_Blundergat_Buck</li>
-									<li>Prometheum</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Magmagat_Buck>20</Ammo_Magmagat_Buck>
-							</products>
-							<workAmount>1000</workAmount>
-						</RecipeDef>
-						<RecipeDef ParentName="CODZP_AmmoRecipeAmmo">
-							<defName>MakeAmmo_Magmagat_Slug</defName>
-							<label>make Magmagat (Slug) shell x20</label>
-							<description>Craft 20 Magmagat (Slug) shells .</description>
-							<jobString>Making Magmagat (Slug) shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_Blundergat_Slug</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Prometheum</li>
-										</thingDefs>
-									</filter>
-									<count>5</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_Blundergat_Slug</li>
-									<li>Prometheum</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Magmagat_Slug>20</Ammo_Magmagat_Slug>
-							</products>
-							<workAmount>1000</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Blunders/Magmagat_Punched.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Blunders/Magmagat_Punched.xml
deleted file mode 100644
index 0228dd304e..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Blunders/Magmagat_Punched.xml	
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoMagmagat_Punched</defName>
-							<label>Magmus Operandi</label>
-							<parent>AmmoWonders_Punched</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberShotgun</iconPath>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Magmagat_Punched</defName>
-							<label>Magmus Operandi Ammo Set</label>
-							<ammoTypes>
-								<Ammo_Magmagat_Buck_Punched>Bullet_Magmagat_Buck_Punched</Ammo_Magmagat_Buck_Punched>
-								<Ammo_Magmagat_Slug_Punched>Bullet_Magmagat_Slug_Punched</Ammo_Magmagat_Slug_Punched>
-							</ammoTypes>
-							<similarTo>AmmoSet_Blundergat_Punched</similarTo>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="MagmagatPunched" ParentName="SmallAmmoBase" Abstract="True">
-							<description>Extremely flamable, burning everything in it's wake.</description>
-							<statBases>
-								<Mass>0.023</Mass>
-								<Bulk>0.06</Bulk>
-							</statBases>
-							<graphicData>
-								<texPath>ThirdParty/CoD Zombies Pack/Magmagat</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(200,200,200)</color>
-							</graphicData>
-							<tradeTags>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoMagmagat_Punched</li>
-							</thingCategories>
-							<stackLimit>150</stackLimit>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="MagmagatPunched">
-							<defName>Ammo_Magmagat_Buck_Punched</defName>
-							<label>Magmus Operandi shell (Buck)</label>
-							<statBases>
-								<MarketValue>0.2</MarketValue>
-							</statBases>
-							<ammoClass>BuckShot</ammoClass>
-							<cookOffProjectile>Bullet_Magmagat_Buck_Punched</cookOffProjectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="MagmagatPunched">
-							<defName>Ammo_Magmagat_Slug_Punched</defName>
-							<label>Magmus Operandi shell (Slug)</label>
-							<statBases>
-								<Mass>0.048</Mass>
-								<MarketValue>0.4</MarketValue>
-							</statBases>
-							<ammoClass>Slug</ammoClass>
-							<cookOffProjectile>Bullet_Magmagat_Slug_Punched</cookOffProjectile>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef ParentName="CODZP_BlunderBulletPunched">
-							<defName>Bullet_Magmagat_Buck_Punched</defName>
-							<label>buckshot pellet</label>
-							<graphicData>
-								<texPath>Things/Projectile/Shotgun_Pellet</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<color>(255, 100, 0)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>22</damageAmountBase>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<armorPenetrationBlunt>9</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>10</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="CODZP_BlunderBulletPunched">
-							<defName>Bullet_Magmagat_Slug_Punched</defName>
-							<label>Slug shot</label>
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_big</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<color>(255, 100, 0)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>88</damageAmountBase>
-								<pelletCount>1</pelletCount>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<armorPenetrationBlunt>9</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>16</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonderAmmo_Punched">
-							<defName>MakeAmmo_Magmagat_Buck_Punched</defName>
-							<label>make Magmus Operandi (Buck) shell x20</label>
-							<description>Craft 20 Magmus Operandi (Buck) shells .</description>
-							<jobString>Making Magmus Operandi (Buck) shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_Magmagat_Buck</li>
-										</thingDefs>
-									</filter>
-									<count>80</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_Magmagat_Buck</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Magmagat_Buck_Punched>20</Ammo_Magmagat_Buck_Punched>
-							</products>
-							<workAmount>1000</workAmount>
-						</RecipeDef>
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonderAmmo_Punched">
-							<defName>MakeAmmo_Magmagat_Slug_Punched</defName>
-							<label>make Magmus Operandi (Slug) shell x20</label>
-							<description>Craft 20 Magmus Operandi (Slug) shells .</description>
-							<jobString>Making Magmus Operandi (Slug) shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_Magmagat_Slug</li>
-										</thingDefs>
-									</filter>
-									<count>80</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_Magmagat_Slug</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Magmagat_Slug_Punched>20</Ammo_Magmagat_Slug_Punched>
-							</products>
-							<workAmount>1000</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Hells/Hells Retriever.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Hells/Hells Retriever.xml
deleted file mode 100644
index f38cb05226..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Hells/Hells Retriever.xml	
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Wonder Weapons</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingDef Name="BaseHellsRetriever" ParentName="Base44MagnumBullet" Abstract="true">
-							<graphicData>
-								<shaderType>TransparentPostLight</shaderType>
-								<graphicClass>Graphic_Random</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Blunt</damageDef>
-								<dropsCasings>false</dropsCasings>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseHellsRetriever">
-							<defName>Bullet_Hells_Retriever</defName>
-							<label>Hells Retriever</label>
-							<graphicData>
-								<texPath>Things/Projectile/CODZP_Hell_Retriever</texPath>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>144</speed>
-								<damageAmountBase>60</damageAmountBase>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Hells/Hells Retriever_Punched.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Hells/Hells Retriever_Punched.xml
deleted file mode 100644
index 71df1e75ca..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Hells/Hells Retriever_Punched.xml	
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingDef ParentName="BaseHellsRetriever">
-							<defName>Bullet_Hells_Retriever_Punched</defName>
-							<label>Hells Redeemer</label>
-							<graphicData>
-								<texPath>Things/Projectile/CODZP_Hell_Redeemer</texPath>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>165</speed>
-								<damageAmountBase>80</damageAmountBase>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<armorPenetrationBlunt>40</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun.xml
deleted file mode 100644
index 599d24f12e..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun.xml	
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Wonder Weapons</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoRaygun</defName>
-							<label>Raygun</label>
-							<parent>AmmoWonders</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Raygun</defName>
-							<label>Raygun</label>
-							<ammoTypes>
-								<Ammo_Raygun>Bullet_Raygun</Ammo_Raygun>
-							</ammoTypes>
-							<similarTo>AmmoSet_Pistol</similarTo>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="RaygunBase" ParentName="SmallAmmoBase" Abstract="True">
-							<description>Pistol cartridge favoured for its above average stopping power.</description>
-							<statBases>
-								<Mass>0.02</Mass>
-								<Bulk>0.02</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoRaygun</li>
-							</thingCategories>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="RaygunBase">
-							<defName>Ammo_Raygun</defName>
-							<label>Raygun cartridge</label>
-							<graphicData>
-								<texPath>ThirdParty/CoD Zombies Pack/Raygun/1</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>ExplosiveAP</ammoClass>
-							<cookOffProjectile>Bullet_Raygun</cookOffProjectile>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef Name="BaseRaygunBullet" ParentName="Base44MagnumBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/CodZP_Bullet_Plasma_Normal</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>67</speed>
-								<dropsCasings>true</dropsCasings>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="BaseRaygunBullet">
-							<defName>Bullet_Raygun</defName>
-							<label>Raygun Plasma</label>
-							<graphicData>
-								<color>(100,255,60)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>10.860</armorPenetrationBlunt>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>107</damageAmountBase>
-									<explosiveDamageType>CodZP_RaygunGreenBomb</explosiveDamageType>
-									<explosiveRadius>1</explosiveRadius>
-									<explosionSound>MortarBomb_Explode</explosionSound>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-							</comps>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonder">
-							<defName>MakeAmmo_Raygun</defName>
-							<label>make Raygun cartridge x500</label>
-							<description>Craft 500 Raygun cartridges.</description>
-							<jobString>Making Raygun cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>22</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Raygun>500</Ammo_Raygun>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2.xml
deleted file mode 100644
index baa1142b1e..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2.xml	
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Wonder Weapons</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoRaygun_two</defName>
-							<label>Raygun Mk.2</label>
-							<parent>AmmoWonders</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Raygun_two</defName>
-							<label>Raygun Mk.2 Cartridge</label>
-							<ammoTypes>
-								<Ammo_Raygun_two>Bullet_Raygun_two</Ammo_Raygun_two>
-							</ammoTypes>
-							<similarTo>AmmoSet_Pistol</similarTo>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="Raygun_twoBase" ParentName="SmallAmmoBase" Abstract="True">
-							<description>Raygun 2 cartridges</description>
-							<statBases>
-								<Mass>0.02</Mass>
-								<Bulk>0.02</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoRaygun_two</li>
-							</thingCategories>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Raygun_twoBase">
-							<defName>Ammo_Raygun_two</defName>
-							<label>Raygun Mk.2 Cartridge</label>
-							<graphicData>
-								<texPath>ThirdParty/CoD Zombies Pack/Raygun/2/Base</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>FullMetalJacket</ammoClass>
-							<cookOffProjectile>Bullet_Raygun_two</cookOffProjectile>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef Name="Raygun2Bullet" ParentName="Base44MagnumBullet" Abstract="true">
-							<graphicData>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>242</speed>
-								<dropsCasings>false</dropsCasings>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="Raygun2Bullet">
-							<defName>Bullet_Raygun_two</defName>
-							<label>Raygun Mk.2 Plasma</label>
-							<graphicData>
-								<texPath>Things/Projectile/CodZP_Bullet_Plasma_Normal</texPath>
-								<color>(100,255,60)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationSharp>27</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.4</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonder">
-							<defName>MakeAmmo_Raygun_two</defName>
-							<label>make Raygun Mk.2 Cartridge x500</label>
-							<description>Craft 500 Raygun Mk.2 Cartridge.</description>
-							<jobString>Making Raygun_two cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>22</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Raygun_two>500</Ammo_Raygun_two>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2V.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2V.xml
deleted file mode 100644
index 07025861b2..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2V.xml	
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Wonder Weapons</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoRaygun_two_v</defName>
-							<label>Raygun Mk.2 V</label>
-							<parent>AmmoWonders</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Raygun_two_v</defName>
-							<label>Raygun Mk.2 V Cartridge</label>
-							<ammoTypes>
-								<Ammo_Raygun_two_v>Bullet_Raygun_two_v</Ammo_Raygun_two_v>
-							</ammoTypes>
-							<similarTo>AmmoSet_Pistol</similarTo>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="Raygun_two_vBase" ParentName="SmallAmmoBase" Abstract="True">
-							<description>Pistol cartridge favoured for its above average stopping power.</description>
-							<statBases>
-								<Mass>0.02</Mass>
-								<Bulk>0.02</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoRaygun_two_v</li>
-							</thingCategories>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Raygun_two_vBase">
-							<defName>Ammo_Raygun_two_v</defName>
-							<label>Raygun Mk.2 V Cartridge</label>
-							<graphicData>
-								<texPath>ThirdParty/CoD Zombies Pack/Raygun/2/V</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>FullMetalJacket</ammoClass>
-							<cookOffProjectile>Bullet_Raygun_two_v</cookOffProjectile>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef ParentName="Raygun2Bullet">
-							<defName>Bullet_Raygun_two_v</defName>
-							<label>Raygun Mk.2 V Plasma</label>
-							<graphicData>
-								<texPath>Things/Projectile/CodZP_Bullet_Plasma_Straight</texPath>
-								<color>(255, 255, 31)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Electrical</damageDef>
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationSharp>27</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.4</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeAmmo">
-							<defName>MakeAmmo_Raygun_two_v</defName>
-							<label>make Raygun Mk.2 V Cartridge x500</label>
-							<description>Craft 500 Raygun Mk.2 V Cartridges.</description>
-							<jobString>Making Raygun Mk.2 V Cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>22</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Raygun_two_v>500</Ammo_Raygun_two_v>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2V_Punched.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2V_Punched.xml
deleted file mode 100644
index bf8b47829e..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2V_Punched.xml	
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoRaygun_two_v_Punched</defName>
-							<label>Porter's Raygun Mk.2 V</label>
-							<parent>AmmoWonders_Punched</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Raygun_two_v_Punched</defName>
-							<label>Porter's Raygun Mk.2 V Ammo Set</label>
-							<ammoTypes>
-								<Ammo_Raygun_two_v_Punched>Bullet_Raygun_two_v_Punched</Ammo_Raygun_two_v_Punched>
-							</ammoTypes>
-							<similarTo>AmmoSet_Pistol</similarTo>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="Raygun_two_vPunched" ParentName="SmallAmmoBase" Abstract="True">
-							<description>Pistol cartridge favoured for its above average stopping power.</description>
-							<statBases>
-								<Mass>0.02</Mass>
-								<Bulk>0.02</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoRaygun_two_v_Punched</li>
-							</thingCategories>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Raygun_two_vPunched">
-							<defName>Ammo_Raygun_two_v_Punched</defName>
-							<label>Porter's Raygun Mk.2 V Cartridge</label>
-							<graphicData>
-								<texPath>ThirdParty/CoD Zombies Pack/Raygun/2/V</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>FullMetalJacket</ammoClass>
-							<cookOffProjectile>Bullet_Raygun_two_v_Punched</cookOffProjectile>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef ParentName="Raygun2BulletPunched">
-							<defName>Bullet_Raygun_two_v_Punched</defName>
-							<label>Porter's Raygun Mk.2 V Plasma</label>
-							<graphicData>
-								<texPath>Things/Projectile/CodZP_Bullet_Plasma_Straight</texPath>
-								<color>(255, 255, 31)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Electrical</damageDef>
-								<damageAmountBase>40</damageAmountBase>
-								<armorPenetrationSharp>54</armorPenetrationSharp>
-								<armorPenetrationBlunt>8.8</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonderAmmo_Punched">
-							<defName>MakeAmmo_Raygun_two_v_Punched</defName>
-							<label>make Porter's Raygun Mk.2 V Cartridge x500</label>
-							<description>Craft 500 Porter's Raygun Mk.2 V Cartridges.</description>
-							<jobString>Making Porter's Raygun Mk.2 V Cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>22</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Raygun_two_v_Punched>500</Ammo_Raygun_two_v_Punched>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2X.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2X.xml
deleted file mode 100644
index 62c3e4cc58..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2X.xml	
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Wonder Weapons</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoRaygun_two_x</defName>
-							<label>Raygun Mk.2 X</label>
-							<parent>AmmoWonders</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Raygun_two_x</defName>
-							<label>Raygun Mk.2 X Cartridge</label>
-							<ammoTypes>
-								<Ammo_Raygun_two_x>Bullet_Raygun_two_x</Ammo_Raygun_two_x>
-							</ammoTypes>
-							<similarTo>AmmoSet_Pistol</similarTo>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="Raygun_two_xBase" ParentName="SmallAmmoBase" Abstract="True">
-							<description>Pistol cartridge favoured for its above average stopping power.</description>
-							<statBases>
-								<Mass>0.02</Mass>
-								<Bulk>0.02</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoRaygun_two_x</li>
-							</thingCategories>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Raygun_two_xBase">
-							<defName>Ammo_Raygun_two_x</defName>
-							<label>Raygun Mk.2 X Cartridge</label>
-							<graphicData>
-								<texPath>ThirdParty/CoD Zombies Pack/Raygun/2/X</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>FullMetalJacket</ammoClass>
-							<cookOffProjectile>Bullet_Raygun_two_x</cookOffProjectile>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef ParentName="Raygun2Bullet">
-							<defName>Bullet_Raygun_two_x</defName>
-							<label>Raygun Mk.2 X Plasma</label>
-							<graphicData>
-								<texPath>Things/Projectile/CodZP_Bullet_Plasma_Normal</texPath>
-								<color>(0, 70, 230)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationSharp>27</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.4</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeAmmo">
-							<defName>MakeAmmo_Raygun_two_x</defName>
-							<label>make Raygun Mk.2 X Cartridge x500</label>
-							<description>Craft 500 Raygun Mk.2 X Cartridges.</description>
-							<jobString>Making Raygun Mk.2 X Cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>22</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Raygun_two_x>500</Ammo_Raygun_two_x>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2X_Punched.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2X_Punched.xml
deleted file mode 100644
index effa1b21ab..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2X_Punched.xml	
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoRaygun_two_x_Punched</defName>
-							<label>Porter's Raygun Mk.2 X</label>
-							<parent>AmmoWonders_Punched</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Raygun_two_x_Punched</defName>
-							<label>Porter's Raygun Mk.2 X Ammo Set</label>
-							<ammoTypes>
-								<Ammo_Raygun_two_x_Punched>Bullet_Raygun_two_x_Punched</Ammo_Raygun_two_x_Punched>
-							</ammoTypes>
-							<similarTo>AmmoSet_Pistol</similarTo>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="Raygun_two_xPunched" ParentName="SmallAmmoBase" Abstract="True">
-							<description>Pistol cartridge favoured for its above average stopping power.</description>
-							<statBases>
-								<Mass>0.02</Mass>
-								<Bulk>0.02</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoRaygun_two_x_Punched</li>
-							</thingCategories>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Raygun_two_xPunched">
-							<defName>Ammo_Raygun_two_x_Punched</defName>
-							<label>Porter's Raygun Mk.2 X Cartridge</label>
-							<graphicData>
-								<texPath>ThirdParty/CoD Zombies Pack/Raygun/2/X</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>FullMetalJacket</ammoClass>
-							<cookOffProjectile>Bullet_Raygun_two_x_Punched</cookOffProjectile>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef ParentName="Raygun2BulletPunched">
-							<defName>Bullet_Raygun_two_x_Punched</defName>
-							<label>Porter's Raygun Mk.2 X Plasma</label>
-							<graphicData>
-								<texPath>Things/Projectile/CodZP_Bullet_Plasma_Normal</texPath>
-								<color>(0, 70, 230)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>40</damageAmountBase>
-								<armorPenetrationSharp>54</armorPenetrationSharp>
-								<armorPenetrationBlunt>8.8</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonderAmmo_Punched">
-							<defName>MakeAmmo_Raygun_two_x_Punched</defName>
-							<label>make Porter's Raygun Mk.2 X Cartridge x500</label>
-							<description>Craft 500 Porter's Raygun Mk.2 X Cartridges.</description>
-							<jobString>Making Porter's Raygun Mk.2 X Cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>22</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Raygun_two_x_Punched>500</Ammo_Raygun_two_x_Punched>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2Y.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2Y.xml
deleted file mode 100644
index fd43e9c7cc..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2Y.xml	
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Wonder Weapons</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoRaygun_two_y</defName>
-							<label>Raygun Mk.2 Y</label>
-							<parent>AmmoWonders</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Raygun_two_y</defName>
-							<label>Raygun Mk.2 Y Cartridge</label>
-							<ammoTypes>
-								<Ammo_Raygun_two_y>Bullet_Raygun_two_y</Ammo_Raygun_two_y>
-							</ammoTypes>
-							<similarTo>AmmoSet_Pistol</similarTo>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="Raygun_two_yBase" ParentName="SmallAmmoBase" Abstract="True">
-							<description>Pistol cartridge favoured for its above average stopping power.</description>
-							<statBases>
-								<Mass>0.02</Mass>
-								<Bulk>0.02</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoRaygun_two_y</li>
-							</thingCategories>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Raygun_two_yBase">
-							<defName>Ammo_Raygun_two_y</defName>
-							<label>Raygun Mk.2 Y Cartridge</label>
-							<graphicData>
-								<texPath>ThirdParty/CoD Zombies Pack/Raygun/2/Y</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>ExplosiveAP</ammoClass>
-							<cookOffProjectile>Bullet_Raygun_two_y</cookOffProjectile>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef ParentName="Raygun2Bullet">
-							<defName>Bullet_Raygun_two_y</defName>
-							<label>Raygun Mk.2 Y Plasma</label>
-							<graphicData>
-								<texPath>Things/Projectile/CodZP_Bullet_Plasma_Trail</texPath>
-								<color>(250, 90, 10)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationSharp>27</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.4</armorPenetrationBlunt>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>107</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>1</explosiveRadius>
-									<explosionSound>MortarBomb_Explode</explosionSound>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-							</comps>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeAmmo">
-							<defName>MakeAmmo_Raygun_two_y</defName>
-							<label>make Raygun Mk.2 Y Cartridge x500</label>
-							<description>Craft 500 Raygun Mk.2 Y Cartridges.</description>
-							<jobString>Making Raygun Mk.2 Y Cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>22</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Raygun_two_y>500</Ammo_Raygun_two_y>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2Y_Punched.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2Y_Punched.xml
deleted file mode 100644
index c122c08b73..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2Y_Punched.xml	
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoRaygun_two_y_Punched</defName>
-							<label>Porter's Raygun Mk.2 Y</label>
-							<parent>AmmoWonders_Punched</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Raygun_two_y_Punched</defName>
-							<label>Porter's Raygun Mk.2 Y Ammo Set</label>
-							<ammoTypes>
-								<Ammo_Raygun_two_y_Punched>Bullet_Raygun_two_y_Punched</Ammo_Raygun_two_y_Punched>
-							</ammoTypes>
-							<similarTo>AmmoSet_Pistol</similarTo>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="Raygun_two_yPunched" ParentName="SmallAmmoBase" Abstract="True">
-							<description>Pistol cartridge favoured for its above average stopping power.</description>
-							<statBases>
-								<Mass>0.02</Mass>
-								<Bulk>0.02</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoRaygun_two_y_Punched</li>
-							</thingCategories>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Raygun_two_yPunched">
-							<defName>Ammo_Raygun_two_y_Punched</defName>
-							<label>Porter's Raygun Mk.2 Y Cartridge</label>
-							<graphicData>
-								<texPath>ThirdParty/CoD Zombies Pack/Raygun/2/Y</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>ExplosiveAP</ammoClass>
-							<cookOffProjectile>Bullet_Raygun_two_y_Punched</cookOffProjectile>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef ParentName="Raygun2BulletPunched">
-							<defName>Bullet_Raygun_two_y_Punched</defName>
-							<label>Porter's Raygun Mk.2 Y Plasma</label>
-							<graphicData>
-								<texPath>Things/Projectile/CodZP_Bullet_Plasma_Trail</texPath>
-								<color>(250, 90, 10)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>40</damageAmountBase>
-								<armorPenetrationSharp>54</armorPenetrationSharp>
-								<armorPenetrationBlunt>8.8</armorPenetrationBlunt>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>214</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>1</explosiveRadius>
-									<explosionSound>MortarBomb_Explode</explosionSound>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-							</comps>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonderAmmo_Punched">
-							<defName>MakeAmmo_Raygun_two_y_Punched</defName>
-							<label>make Porter's Raygun Mk.2 Y Cartridge x500</label>
-							<description>Craft 500 Porter's Raygun Mk.2 Y Cartridges.</description>
-							<jobString>Making Porter's Raygun Mk.2 Y Cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>22</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Raygun_two_y_Punched>500</Ammo_Raygun_two_y_Punched>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2Z.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2Z.xml
deleted file mode 100644
index 6ee6f73228..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2Z.xml	
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Wonder Weapons</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoRaygun_two_z</defName>
-							<label>Raygun Mk.2 Z</label>
-							<parent>AmmoWonders</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Raygun_two_z</defName>
-							<label>Raygun Mk.2 Z Cartridge</label>
-							<ammoTypes>
-								<Ammo_Raygun_two_z>Bullet_Raygun_two_z</Ammo_Raygun_two_z>
-							</ammoTypes>
-							<similarTo>AmmoSet_Pistol</similarTo>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="Raygun_two_zBase" ParentName="SmallAmmoBase" Abstract="True">
-							<description>Pistol cartridge favoured for its above average stopping power.</description>
-							<statBases>
-								<Mass>0.02</Mass>
-								<Bulk>0.02</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoRaygun_two_z</li>
-							</thingCategories>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Raygun_two_zBase">
-							<defName>Ammo_Raygun_two_z</defName>
-							<label>Raygun Mk.2 Z Cartridge</label>
-							<graphicData>
-								<texPath>ThirdParty/CoD Zombies Pack/Raygun/2/Z</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>FullMetalJacket</ammoClass>
-							<cookOffProjectile>Bullet_Raygun_two_z</cookOffProjectile>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef ParentName="Raygun2Bullet">
-							<defName>Bullet_Raygun_two_z</defName>
-							<label>Raygun Mk.2 Z Plasma</label>
-							<graphicData>
-								<texPath>Things/Projectile/CodZP_Bullet_Plasma_Ringed</texPath>
-								<color>(140, 0, 255)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationSharp>27</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.4</armorPenetrationBlunt>
-								<pelletCount>3</pelletCount>
-								<spreadMult>20</spreadMult>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeAmmo">
-							<defName>MakeAmmo_Raygun_two_z</defName>
-							<label>make Raygun Mk.2 Z Cartridge x500</label>
-							<description>Craft 500 Raygun Mk.2 Z Cartridges.</description>
-							<jobString>Making Raygun Mk.2 Z Cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>22</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Raygun_two_z>500</Ammo_Raygun_two_z>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2Z_Punched.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2Z_Punched.xml
deleted file mode 100644
index ffa802e33b..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2Z_Punched.xml	
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoRaygun_two_z_Punched</defName>
-							<label>Porter's Raygun Mk.2 Z</label>
-							<parent>AmmoWonders_Punched</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Raygun_two_z_Punched</defName>
-							<label>Porter's Raygun Mk.2 Z Ammo Set</label>
-							<ammoTypes>
-								<Ammo_Raygun_two_z_Punched>Bullet_Raygun_two_z_Punched</Ammo_Raygun_two_z_Punched>
-							</ammoTypes>
-							<similarTo>AmmoSet_Pistol</similarTo>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="Raygun_two_zPunched" ParentName="SmallAmmoBase" Abstract="True">
-							<description>Pistol cartridge favoured for its above average stopping power.</description>
-							<statBases>
-								<Mass>0.02</Mass>
-								<Bulk>0.02</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoRaygun_two_z_Punched</li>
-							</thingCategories>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Raygun_two_zPunched">
-							<defName>Ammo_Raygun_two_z_Punched</defName>
-							<label>Porter's Raygun Mk.2 Z Cartridge</label>
-							<graphicData>
-								<texPath>ThirdParty/CoD Zombies Pack/Raygun/2/Z</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>FullMetalJacket</ammoClass>
-							<cookOffProjectile>Bullet_Raygun_two_z_Punched</cookOffProjectile>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef ParentName="Raygun2BulletPunched">
-							<defName>Bullet_Raygun_two_z_Punched</defName>
-							<label>Porter's Raygun Mk.2 Z Plasma</label>
-							<graphicData>
-								<texPath>Things/Projectile/CodZP_Bullet_Plasma_Ringed</texPath>
-								<color>(140, 0, 255)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>40</damageAmountBase>
-								<armorPenetrationSharp>54</armorPenetrationSharp>
-								<armorPenetrationBlunt>8.8</armorPenetrationBlunt>
-								<pelletCount>3</pelletCount>
-								<spreadMult>20</spreadMult>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonderAmmo_Punched">
-							<defName>MakeAmmo_Raygun_two_z_Punched</defName>
-							<label>make Porter's Raygun Mk.2 Z Cartridge x500</label>
-							<description>Craft 500 Porter's Raygun Mk.2 Z Cartridges.</description>
-							<jobString>Making Porter's Raygun Mk.2 Z Cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>22</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Raygun_two_z_Punched>500</Ammo_Raygun_two_z_Punched>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2_Punched.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2_Punched.xml
deleted file mode 100644
index 47208a91fb..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun2_Punched.xml	
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoRaygun_two_Punched</defName>
-							<label>Porter's Raygun Mk.2</label>
-							<parent>AmmoWonders_Punched</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Raygun_two_Punched</defName>
-							<label>Porter's Raygun Mk.2 Ammo Set</label>
-							<ammoTypes>
-								<Ammo_Raygun_two_Punched>Bullet_Raygun_two_Punched</Ammo_Raygun_two_Punched>
-							</ammoTypes>
-							<similarTo>AmmoSet_Pistol</similarTo>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="Raygun_twoPunched" ParentName="SmallAmmoBase" Abstract="True">
-							<description>Raygun 2 cartridges</description>
-							<statBases>
-								<Mass>0.02</Mass>
-								<Bulk>0.02</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoRaygun_two_Punched</li>
-							</thingCategories>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Raygun_twoPunched">
-							<defName>Ammo_Raygun_two_Punched</defName>
-							<label>Porter's Raygun Mk.2 Cartridge</label>
-							<graphicData>
-								<texPath>ThirdParty/CoD Zombies Pack/Raygun/2/Porter</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>FullMetalJacket</ammoClass>
-							<cookOffProjectile>Bullet_Raygun_two_Punched</cookOffProjectile>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef Name="Raygun2BulletPunched" ParentName="Raygun2Bullet" Abstract="true">
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>268</speed>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="Raygun2BulletPunched">
-							<defName>Bullet_Raygun_two_Punched</defName>
-							<label>Porter's Raygun Mk.2 Plasma</label>
-							<graphicData>
-								<texPath>Things/Projectile/CodZP_Bullet_Plasma_Normal</texPath>
-								<color>(255,31,31)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>40</damageAmountBase>
-								<armorPenetrationSharp>54</armorPenetrationSharp>
-								<armorPenetrationBlunt>8.8</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonder_Punched">
-							<defName>MakeAmmo_Raygun_two_Punched</defName>
-							<label>make Porter's Raygun Mk.2 Cartridge x500</label>
-							<description>Craft 500 Porter's Raygun Mk.2 Cartridge.</description>
-							<jobString>Making Porter's Raygun_two cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>22</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Raygun_two_Punched>500</Ammo_Raygun_two_Punched>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun3.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun3.xml
deleted file mode 100644
index fc19357a57..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun3.xml	
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Wonder Weapons</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoRaygun_three</defName>
-							<label>Raygun Mk.3</label>
-							<parent>AmmoWonders</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Raygun_three</defName>
-							<label>Raygun Mk.3</label>
-							<ammoTypes>
-								<Ammo_Raygun_three>Bullet_Raygun_three</Ammo_Raygun_three>
-							</ammoTypes>
-							<similarTo>AmmoSet_Pistol</similarTo>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="Raygun_threeBase" ParentName="SmallAmmoBase" Abstract="True">
-							<description>Pistol cartridge favoured for its above average stopping power.</description>
-							<statBases>
-								<Mass>0.02</Mass>
-								<Bulk>0.02</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoRaygun_three</li>
-							</thingCategories>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Raygun_threeBase">
-							<defName>Ammo_Raygun_three</defName>
-							<label>Raygun Mk.3 cartridge</label>
-							<graphicData>
-								<texPath>Things/Ammo/Pistol/FMJ</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>FullMetalJacket</ammoClass>
-							<cookOffProjectile>Bullet_Raygun_three</cookOffProjectile>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef ParentName="BaseRaygunBullet">
-							<defName>Bullet_Raygun_three</defName>
-							<label>Raygun Mark 3 Plasma</label>
-							<graphicData>
-								<color>(100,255,60)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>10.860</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonder">
-							<defName>MakeAmmo_Raygun_three</defName>
-							<label>make Raygun Mk.3 cartridge x500</label>
-							<description>Craft 500 Raygun Mk.3 cartridges.</description>
-							<jobString>Making Raygun Mk.3 cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>22</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Raygun_three>500</Ammo_Raygun_three>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun3GKZ.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun3GKZ.xml
deleted file mode 100644
index 875ab4e581..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun3GKZ.xml	
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Wonder Weapons</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoRaygun_three_GKZ</defName>
-							<label>GKZ-45</label>
-							<parent>AmmoWonders</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Raygun_three_GKZ</defName>
-							<label>GKZ-45</label>
-							<ammoTypes>
-								<Ammo_Raygun_three_GKZ>Bullet_Raygun_three_GKZ</Ammo_Raygun_three_GKZ>
-							</ammoTypes>
-							<similarTo>AmmoSet_Pistol</similarTo>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="Raygun_three_GKZBase" ParentName="SmallAmmoBase" Abstract="True">
-							<description>Pistol cartridge favoured for its above average stopping power.</description>
-							<statBases>
-								<Mass>0.02</Mass>
-								<Bulk>0.02</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoRaygun_three_GKZ</li>
-							</thingCategories>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Raygun_three_GKZBase">
-							<defName>Ammo_Raygun_three_GKZ</defName>
-							<label>GKZ-45 cartridge</label>
-							<graphicData>
-								<texPath>Things/Ammo/Pistol/FMJ</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>ExplosiveAP</ammoClass>
-							<cookOffProjectile>Bullet_Raygun_three_GKZ</cookOffProjectile>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef ParentName="BaseRaygunBullet">
-							<defName>Bullet_Raygun_three_GKZ</defName>
-							<label>GKZ-45 Plasma</label>
-							<graphicData>
-								<color>(255,255,31)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>10.860</armorPenetrationBlunt>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>107</damageAmountBase>
-									<explosiveDamageType>CodZP_RaygunYellowBomb</explosiveDamageType>
-									<explosiveRadius>1</explosiveRadius>
-									<explosionSound>MortarBomb_Explode</explosionSound>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-							</comps>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonder">
-							<defName>MakeAmmo_Raygun_three_GKZ</defName>
-							<label>make GKZ-45 cartridge x500</label>
-							<description>Craft 500 GKZ-45 cartridges.</description>
-							<jobString>Making GKZ-45 cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>22</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Raygun_three_GKZ>500</Ammo_Raygun_three_GKZ>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun3GKZ_Punched.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun3GKZ_Punched.xml
deleted file mode 100644
index 30f9e9bbdd..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun3GKZ_Punched.xml	
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoRaygun_three_GKZ_Punched</defName>
-							<label>Maelstorm</label>
-							<parent>AmmoWonders_Punched</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Raygun_three_GKZ_Punched</defName>
-							<label>Maelstorm Cartridge</label>
-							<ammoTypes>
-								<Ammo_Raygun_three_GKZ_Punched>Bullet_Raygun_three_GKZ_Punched</Ammo_Raygun_three_GKZ_Punched>
-							</ammoTypes>
-							<similarTo>AmmoSet_Pistol</similarTo>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="Raygun_three_GKZPunched" ParentName="SmallAmmoBase" Abstract="True">
-							<description>Pistol cartridge favoured for its above average stopping power.</description>
-							<statBases>
-								<Mass>0.02</Mass>
-								<Bulk>0.02</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoRaygun_three_GKZ_Punched</li>
-							</thingCategories>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Raygun_three_GKZPunched">
-							<defName>Ammo_Raygun_three_GKZ_Punched</defName>
-							<label>Maelstorm cartridge</label>
-							<graphicData>
-								<texPath>Things/Ammo/Pistol/FMJ</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>ExplosiveAP</ammoClass>
-							<cookOffProjectile>Bullet_Raygun_three_GKZ_Punched</cookOffProjectile>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef ParentName="RaygunBulletPunched">
-							<defName>Bullet_Raygun_three_GKZ_Punched</defName>
-							<label>Maelstorm Plasma</label>
-							<graphicData>
-								<color>(255,255,31)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>24</damageAmountBase>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<armorPenetrationBlunt>20.860</armorPenetrationBlunt>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>214</damageAmountBase>
-									<explosiveDamageType>CodZP_RaygunYellowBomb</explosiveDamageType>
-									<explosiveRadius>1</explosiveRadius>
-									<explosionSound>MortarBomb_Explode</explosionSound>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-							</comps>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonder_Punched">
-							<defName>MakeAmmo_Raygun_three_GKZ_Punched</defName>
-							<label>make Maelstorm cartridge x500</label>
-							<description>Craft 500 Maelstorm cartridges.</description>
-							<jobString>Making Maelstorm cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>22</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Raygun_three_GKZ_Punched>500</Ammo_Raygun_three_GKZ_Punched>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun3_Punched.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun3_Punched.xml
deleted file mode 100644
index 599bb7aebd..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun3_Punched.xml	
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoRaygun_three_Punched</defName>
-							<label>Eris</label>
-							<parent>AmmoWonders_Punched</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Raygun_three_Punched</defName>
-							<label>Eris Cartridge</label>
-							<ammoTypes>
-								<Ammo_Raygun_three_Punched>Bullet_Raygun_three_Punched</Ammo_Raygun_three_Punched>
-							</ammoTypes>
-							<similarTo>AmmoSet_Pistol</similarTo>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="Raygun_threePunched" ParentName="SmallAmmoBase" Abstract="True">
-							<description>Pistol cartridge favoured for its above average stopping power.</description>
-							<statBases>
-								<Mass>0.02</Mass>
-								<Bulk>0.02</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoRaygun_three_Punched</li>
-							</thingCategories>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Raygun_threePunched">
-							<defName>Ammo_Raygun_three_Punched</defName>
-							<label>Eris Cartridge</label>
-							<graphicData>
-								<texPath>Things/Ammo/Pistol/FMJ</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>FullMetalJacket</ammoClass>
-							<cookOffProjectile>Bullet_Raygun_three_Punched</cookOffProjectile>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef ParentName="RaygunBulletPunched">
-							<defName>Bullet_Raygun_three_Punched</defName>
-							<label>Eris Plasma</label>
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_Small</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-								<color>(255,31,31)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>24</damageAmountBase>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<armorPenetrationBlunt>20.860</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonder_Punched">
-							<defName>MakeAmmo_Raygun_three_Punched</defName>
-							<label>make Eris cartridge x50</label>
-							<description>Craft 50 Eris cartridges.</description>
-							<jobString>Making Eris cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_Raygun_three</li>
-										</thingDefs>
-									</filter>
-									<count>200</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_Raygun_three</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Raygun_three_Punched>50</Ammo_Raygun_three_Punched>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun_Punched.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun_Punched.xml
deleted file mode 100644
index 4327d5e25f..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Rayguns/Raygun_Punched.xml	
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoRaygun_Punched</defName>
-							<label>Porter's Raygun</label>
-							<parent>AmmoWonders_Punched</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Raygun_Punched</defName>
-							<label>Porter's Raygun Ammo Set</label>
-							<ammoTypes>
-								<Ammo_Raygun_Punched>Bullet_Raygun_Punched</Ammo_Raygun_Punched>
-							</ammoTypes>
-							<similarTo>AmmoSet_Pistol</similarTo>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="RaygunPunched" ParentName="SmallAmmoBase" Abstract="True">
-							<description>Pistol cartridge favoured for its above average stopping power.</description>
-							<statBases>
-								<Mass>0.02</Mass>
-								<Bulk>0.02</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoRaygun_Punched</li>
-							</thingCategories>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="RaygunPunched">
-							<defName>Ammo_Raygun_Punched</defName>
-							<label>Porter's Raygun cartridge</label>
-							<graphicData>
-								<texPath>ThirdParty/CoD Zombies Pack/Raygun/1</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(200,200,200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>ExplosiveAP</ammoClass>
-							<cookOffProjectile>Bullet_Raygun_Punched</cookOffProjectile>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef Name="RaygunBulletPunched" ParentName="BaseRaygunBullet" Abstract="true">
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>78</speed>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="RaygunBulletPunched">
-							<defName>Bullet_Raygun_Punched</defName>
-							<label>Porter's Raygun Plasma</label>
-							<graphicData>
-								<color>(255,31,31)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>24</damageAmountBase>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<armorPenetrationBlunt>20.860</armorPenetrationBlunt>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>214</damageAmountBase>
-									<explosiveDamageType>CodZP_RaygunRedBomb</explosiveDamageType>
-									<explosiveRadius>1</explosiveRadius>
-									<explosionSound>MortarBomb_Explode</explosionSound>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-							</comps>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonder_Punched">
-							<defName>MakeAmmo_Raygun_Punched</defName>
-							<label>make Porter's Raygun cartridge x500</label>
-							<description>Craft 500 Porter's Raygun cartridges.</description>
-							<jobString>Making Porter's Raygun cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>22</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Raygun_Punched>500</Ammo_Raygun_Punched>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Recipe/12Gauge-Punched.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Recipe/12Gauge-Punched.xml
deleted file mode 100644
index 223c4807d4..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Recipe/12Gauge-Punched.xml	
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Pack A Punch</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>Ammo12Gauge_Punched</defName>
-							<label>Punched 12 gauge</label>
-							<parent>AmmoShotguns_Punched</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberShotgun</iconPath>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_12Gauge_Punched</defName>
-							<label>Punched 12 Gauge</label>
-							<ammoTypes>
-								<Ammo_12Gauge_Buck_Punched>Bullet_12Gauge_Buck_Punched</Ammo_12Gauge_Buck_Punched>
-								<Ammo_12Gauge_Slug_Punched>Bullet_12Gauge_Slug_Punched</Ammo_12Gauge_Slug_Punched>
-								<Ammo_12Gauge_ElectroSlug_Punched>Bullet_12Gauge_ElectroSlug_Punched</Ammo_12Gauge_ElectroSlug_Punched>
-							</ammoTypes>
-							<similarTo>AmmoSet_12Gauge</similarTo>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="12GaugePunched" ParentName="SmallAmmoBase" Abstract="True">
-							<description>Extremely common shotgun caliber used in almost every application, from hunting over riot control to military firearms.</description>
-							<statBases>
-								<Mass>0.023</Mass>
-								<Bulk>0.06</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>Ammo12Gauge_Punched</li>
-							</thingCategories>
-							<stackLimit>5000</stackLimit>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="12GaugePunched">
-							<defName>Ammo_12Gauge_Buck_Punched</defName>
-							<label>12 gauge shell (Buck) (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Shotgun/Shot</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.2</MarketValue>
-							</statBases>
-							<ammoClass>BuckShot</ammoClass>
-							<cookOffProjectile>Bullet_12Gauge_Buck_Punched</cookOffProjectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="12GaugePunched">
-							<defName>Ammo_12Gauge_Slug_Punched</defName>
-							<label>12 gauge shell (Slug) (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Shotgun/Slug</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<statBases>
-								<Mass>0.048</Mass>
-								<MarketValue>0.4</MarketValue>
-							</statBases>
-							<ammoClass>Slug</ammoClass>
-							<cookOffProjectile>Bullet_12Gauge_Slug_Punched</cookOffProjectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="12GaugePunched">
-							<defName>Ammo_12Gauge_ElectroSlug_Punched</defName>
-							<label>12 gauge shell (EMP) (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Shotgun/EMP</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<statBases>
-								<Mass>0.054</Mass>
-								<MarketValue>1.74</MarketValue>
-							</statBases>
-							<ammoClass>ElectroSlug</ammoClass>
-							<cookOffProjectile>Bullet_12Gauge_ElectroSlug_Punched</cookOffProjectile>
-						</ThingDef>
-						<!-- ==================== Projectiles ==================== -->
-						<ThingDef Name="Punched12GaugeBullet" ParentName="BaseBulletCE" Abstract="true">
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>92</speed>
-								<dropsCasings>true</dropsCasings>
-								<casingMoteDefname>Fleck_ShotgunShell</casingMoteDefname>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="Punched12GaugeBullet">
-							<defName>Bullet_12Gauge_Buck_Punched</defName>
-							<label>buckshot pellet (Punched)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Shotgun_Pellet</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>16</damageAmountBase>
-								<pelletCount>9</pelletCount>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.52</armorPenetrationBlunt>
-								<spreadMult>17.8</spreadMult>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="Punched12GaugeBullet">
-							<defName>Bullet_12Gauge_Slug_Punched</defName>
-							<label>shotgun slug (Punched)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_big</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>126</speed>
-								<damageAmountBase>56</damageAmountBase>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<armorPenetrationBlunt>85.2</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="Punched12GaugeBullet">
-							<defName>Bullet_12Gauge_ElectroSlug_Punched</defName>
-							<label>EMP slug (Punched)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_big</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>43</speed>
-								<damageDef>EMP</damageDef>
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0</armorPenetrationBlunt>
-								<empShieldBreakChance>0.2</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ==================== -->
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_12Gauge_Buck_Punched</defName>
-							<label>make 12 gauge (Buck) shell (Punched) x200</label>
-							<description>Craft 200 12 gauge (Buck) shells (Punched).</description>
-							<jobString>Making 12 gauge (Buck) shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_12Gauge_Buck</li>
-										</thingDefs>
-									</filter>
-									<count>800</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_12Gauge_Buck</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_12Gauge_Buck_Punched>200</Ammo_12Gauge_Buck_Punched>
-							</products>
-							<workAmount>1000</workAmount>
-						</RecipeDef>
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_12Gauge_Slug_Punched</defName>
-							<label>make 12 gauge (Slug) shell (Punched) x200</label>
-							<description>Craft 200 12 gauge (Slug) shells (Punched).</description>
-							<jobString>Making 12 gauge (Slug) shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_12Gauge_Slug</li>
-										</thingDefs>
-									</filter>
-									<count>800</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_12Gauge_Slug</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_12Gauge_Slug_Punched>200</Ammo_12Gauge_Slug_Punched>
-							</products>
-							<workAmount>2000</workAmount>
-						</RecipeDef>
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_12Gauge_ElectroSlug_Punched</defName>
-							<label>make 12 gauge (EMP) shell (Punched) x200</label>
-							<description>Craft 200 12 gauge (EMP) shells (Punched).</description>
-							<jobString>Making 12 gauge (EMP) shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_12Gauge_ElectroSlug</li>
-										</thingDefs>
-									</filter>
-									<count>800</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_12Gauge_ElectroSlug</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_12Gauge_ElectroSlug_Punched>200</Ammo_12Gauge_ElectroSlug_Punched>
-							</products>
-							<workAmount>4600</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Recipe/303British-Punched.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Recipe/303British-Punched.xml
deleted file mode 100644
index 5d7e8d58ec..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Recipe/303British-Punched.xml	
+++ /dev/null
@@ -1,368 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Pack A Punch</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>Ammo303British_Punched</defName>
-							<label>Punched .303 British</label>
-							<parent>AmmoRifles_Punched</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_303British_Punched</defName>
-							<label>Punched .303 British</label>
-							<ammoTypes>
-								<Ammo_303British_FMJ_Punched>Bullet_303British_FMJ_Punched</Ammo_303British_FMJ_Punched>
-								<Ammo_303British_AP_Punched>Bullet_303British_AP_Punched</Ammo_303British_AP_Punched>
-								<Ammo_303British_HP_Punched>Bullet_303British_HP_Punched</Ammo_303British_HP_Punched>
-								<Ammo_303British_Incendiary_Punched>Bullet_303British_Incendiary_Punched</Ammo_303British_Incendiary_Punched>
-								<Ammo_303British_HE_Punched>Bullet_303British_HE_Punched</Ammo_303British_HE_Punched>
-								<Ammo_303British_Sabot_Punched>Bullet_303British_Sabot_Punched</Ammo_303British_Sabot_Punched>
-							</ammoTypes>
-							<similarTo>AmmoSet_303British</similarTo>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="303BritishPunched" ParentName="SmallAmmoBase" Abstract="True">
-							<description>Large rifle bullet found mostly in outdated bolt-action firearms.</description>
-							<statBases>
-								<Mass>0.026</Mass>
-								<Bulk>0.03</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>Ammo303British_Punched</li>
-							</thingCategories>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="303BritishPunched">
-							<defName>Ammo_303British_FMJ_Punched</defName>
-							<label>.303 British cartridge (FMJ) (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Rifle/FMJ</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.24</MarketValue>
-							</statBases>
-							<ammoClass>FullMetalJacket</ammoClass>
-							<cookOffProjectile>Bullet_303British_FMJ_Punched</cookOffProjectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="303BritishPunched">
-							<defName>Ammo_303British_AP_Punched</defName>
-							<label>.303 British cartridge (AP) (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Rifle/AP</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.24</MarketValue>
-							</statBases>
-							<ammoClass>ArmorPiercing</ammoClass>
-							<cookOffProjectile>Bullet_303British_AP_Punched</cookOffProjectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="303BritishPunched">
-							<defName>Ammo_303British_HP_Punched</defName>
-							<label>.303 British cartridge (HP) (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Rifle/HP</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.24</MarketValue>
-							</statBases>
-							<ammoClass>HollowPoint</ammoClass>
-							<cookOffProjectile>Bullet_303British_HP_Punched</cookOffProjectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="303BritishPunched">
-							<defName>Ammo_303British_Incendiary_Punched</defName>
-							<label>.303 British cartridge (AP-I) (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Rifle/Incendiary</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.30</MarketValue>
-							</statBases>
-							<ammoClass>IncendiaryAP</ammoClass>
-							<cookOffProjectile>Bullet_303British_Incendiary_Punched</cookOffProjectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="303BritishPunched">
-							<defName>Ammo_303British_HE_Punched</defName>
-							<label>.303 British cartridge (HE) (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Rifle/HE</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.52</MarketValue>
-							</statBases>
-							<ammoClass>ExplosiveAP</ammoClass>
-							<cookOffProjectile>Bullet_303British_HE_Punched</cookOffProjectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="303BritishPunched">
-							<defName>Ammo_303British_Sabot_Punched</defName>
-							<label>.303 British cartridge (Sabot) (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Rifle/Sabot</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.28</MarketValue>
-								<Mass>0.022</Mass>
-							</statBases>
-							<ammoClass>Sabot</ammoClass>
-							<cookOffProjectile>Bullet_303British_Sabot_Punched</cookOffProjectile>
-						</ThingDef>
-						<!-- ==================== Projectiles ==================== -->
-						<ThingDef Name="Punched303BritishBullet" ParentName="BaseBulletCE" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_Small</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>159</speed>
-								<dropsCasings>true</dropsCasings>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="Punched303BritishBullet">
-							<defName>Bullet_303British_FMJ_Punched</defName>
-							<label>.303 British bullet (FMJ) (Punched)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>38</damageAmountBase>
-								<armorPenetrationSharp>14</armorPenetrationSharp>
-								<armorPenetrationBlunt>62.540</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="Punched303BritishBullet">
-							<defName>Bullet_303British_AP_Punched</defName>
-							<label>.303 British bullet (AP) (Punched)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>24</damageAmountBase>
-								<armorPenetrationSharp>28</armorPenetrationSharp>
-								<armorPenetrationBlunt>62.540</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="Punched303BritishBullet">
-							<defName>Bullet_303British_HP_Punched</defName>
-							<label>.303 British bullet (HP) (Punched)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>48</damageAmountBase>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>62.540</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="Punched303BritishBullet">
-							<defName>Bullet_303British_Incendiary_Punched</defName>
-							<label>.303 British bullet (AP-I) (Punched)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>24</damageAmountBase>
-								<armorPenetrationSharp>28</armorPenetrationSharp>
-								<armorPenetrationBlunt>62.540</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>16</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="Punched303BritishBullet">
-							<defName>Bullet_303British_HE_Punched</defName>
-							<label>.303 British bullet (HE) (Punched)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>38</damageAmountBase>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<armorPenetrationBlunt>62.540</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>24</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="Punched303BritishBullet">
-							<defName>Bullet_303British_Sabot_Punched</defName>
-							<label>.303 British bullet (Sabot) (Punched)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationSharp>42</armorPenetrationSharp>
-								<armorPenetrationBlunt>80.960</armorPenetrationBlunt>
-								<speed>215</speed>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ==================== -->
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_303British_FMJ_Punched</defName>
-							<label>make .303 British (FMJ) cartridge (Punched) x500</label>
-							<description>Craft 500 .303 British (FMJ) cartridges (Punched).</description>
-							<jobString>Making .303 British (FMJ) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_303British_FMJ</li>
-										</thingDefs>
-									</filter>
-									<count>2000</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_303British_FMJ</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_303British_FMJ_Punched>500</Ammo_303British_FMJ_Punched>
-							</products>
-							<workAmount>2800</workAmount>
-						</RecipeDef>
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_303British_AP_Punched</defName>
-							<label>make .303 British (AP) cartridge (Punched) x500</label>
-							<description>Craft 500 .303 British (AP) cartridges (Punched).</description>
-							<jobString>Making .303 British (AP) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_303British_AP</li>
-										</thingDefs>
-									</filter>
-									<count>2000</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_303British_AP</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_303British_AP_Punched>500</Ammo_303British_AP_Punched>
-							</products>
-							<workAmount>2800</workAmount>
-						</RecipeDef>
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_303British_HP_Punched</defName>
-							<label>make .303 British (HP) cartridge (Punched) x500</label>
-							<description>Craft 500 .303 British (HP) cartridges (Punched).</description>
-							<jobString>Making .303 British (HP) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_303British_HP</li>
-										</thingDefs>
-									</filter>
-									<count>2000</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_303British_HP</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_303British_HP_Punched>500</Ammo_303British_HP_Punched>
-							</products>
-							<workAmount>2800</workAmount>
-						</RecipeDef>
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_303British_Incendiary_Punched</defName>
-							<label>make .303 British (AP-I) cartridge (Punched) x500</label>
-							<description>Craft 500 .303 British (AP-I) cartridges (Punched).</description>
-							<jobString>Making .303 British (AP-I) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_303British_Incendiary</li>
-										</thingDefs>
-									</filter>
-									<count>2000</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_303British_Incendiary</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_303British_Incendiary_Punched>500</Ammo_303British_Incendiary_Punched>
-							</products>
-							<workAmount>4000</workAmount>
-						</RecipeDef>
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_303British_HE_Punched</defName>
-							<label>make .303 British (HE) cartridge (Punched) x500</label>
-							<description>Craft 500 .303 British (HE) cartridges (Punched).</description>
-							<jobString>Making .303 British (HE) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_303British_HE</li>
-										</thingDefs>
-									</filter>
-									<count>2000</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_303British_HE</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_303British_HE_Punched>500</Ammo_303British_HE_Punched>
-							</products>
-							<workAmount>5600</workAmount>
-						</RecipeDef>
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_303British_Sabot_Punched</defName>
-							<label>make .303 British (Sabot) cartridge (Punched) x500</label>
-							<description>Craft 500 .303 British (Sabot) cartridges (Punched).</description>
-							<jobString>Making .303 British (Sabot) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_303British_Sabot</li>
-										</thingDefs>
-									</filter>
-									<count>2000</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_303British_Sabot</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_303British_Sabot_Punched>500</Ammo_303British_Sabot_Punched>
-							</products>
-							<workAmount>4000</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Recipe/30x64mmFuelCell-Punched.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Recipe/30x64mmFuelCell-Punched.xml
deleted file mode 100644
index 7dfa78bc6e..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Recipe/30x64mmFuelCell-Punched.xml	
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Pack A Punch</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>Ammo30x64mmFuelCell_Punched</defName>
-							<label>Punched 30x64mm Fuel Cell</label>
-							<parent>AmmoAdvanced_Punched</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberFuel</iconPath>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_30x64mmFuel_Punched</defName>
-							<label>Punched 30x64mm Fuel Cell</label>
-							<ammoTypes>
-								<Ammo_30x64mmFuel_Incendiary_Punched>Bullet_30x64mmFuel_Incendiary_Punched</Ammo_30x64mmFuel_Incendiary_Punched>
-								<Ammo_30x64mmFuel_Thermobaric_Punched>Bullet_30x64mmFuel_Thermobaric_Punched</Ammo_30x64mmFuel_Thermobaric_Punched>
-								<Ammo_30x64mmFuel_Foam_Punched>Bullet_30x64mmFuel_Foam_Punched</Ammo_30x64mmFuel_Foam_Punched>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="30x64mmFuelpunched" ParentName="SpacerSmallAmmoBase" Abstract="True">
-							<description>Container holding fuel for incendiary shot firearms.</description>
-							<statBases>
-								<Mass>0.08</Mass>
-								<Bulk>0.14</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>Ammo30x64mmFuelCell_Punched</li>
-							</thingCategories>
-							<stackLimit>3000</stackLimit>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="30x64mmFuelpunched">
-							<defName>Ammo_30x64mmFuel_Incendiary_Punched</defName>
-							<label>30x64mm fuel cell (Incendiary) (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/FuelCell/Incendiary</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>6.8</MarketValue>
-							</statBases>
-							<ammoClass>IncendiaryFuel</ammoClass>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="30x64mmFuelpunched">
-							<defName>Ammo_30x64mmFuel_Thermobaric_Punched</defName>
-							<label>30x64mm fuel cell (Thermobaric) (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/FuelCell/Thermobaric</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>11.92</MarketValue>
-							</statBases>
-							<ammoClass>ThermobaricFuel</ammoClass>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="30x64mmFuelpunched">
-							<defName>Ammo_30x64mmFuel_Foam_Punched</defName>
-							<label>30x64mm fuel cell (Foam) (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/FuelCell/Foam</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>7.32</MarketValue>
-							</statBases>
-							<ammoClass>FoamFuel</ammoClass>
-							<generateAllowChance>0</generateAllowChance>
-						</ThingDef>
-						<!-- ==================== Projectiles ==================== -->
-						<ThingDef Name="punched30x64mmFuelBullet" ParentName="BaseBulletCE" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/LauncherShot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>60</speed>
-								<flyOverhead>false</flyOverhead>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="punched30x64mmFuelBullet">
-							<defName>Bullet_30x64mmFuel_Incendiary_Punched</defName>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<label>incendiary bolt (Punched)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>PrometheumFlame</damageDef>
-								<damageAmountBase>10</damageAmountBase>
-								<explosionRadius>6.5</explosionRadius>
-								<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
-								<preExplosionSpawnChance>0.25</preExplosionSpawnChance>
-								<ai_IsIncendiary>true</ai_IsIncendiary>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="punched30x64mmFuelBullet">
-							<defName>Bullet_30x64mmFuel_Thermobaric_Punched</defName>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<label>thermobaric bolt (Punched)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>2.0</explosionRadius>
-								<damageDef>Thermobaric</damageDef>
-								<damageAmountBase>64</damageAmountBase>
-								<soundExplode>MortarBomb_Explode</soundExplode>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<ai_IsIncendiary>true</ai_IsIncendiary>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="punched30x64mmFuelBullet">
-							<defName>Bullet_30x64mmFuel_Foam_Punched</defName>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<label>foam bolt (Punched)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Extinguish</damageDef>
-								<explosionRadius>6.5</explosionRadius>
-								<postExplosionSpawnThingDef>Filth_FireFoam</postExplosionSpawnThingDef>
-								<preExplosionSpawnChance>1</preExplosionSpawnChance>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ==================== -->
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_30x64mmFuel_Incendiary_Punched</defName>
-							<label>make 30x64mm fuel cell (Incendiary) (Punched) x50</label>
-							<description>Craft 50 30x64mm incendiary fuel cells (Punched).</description>
-							<jobString>Making incendiary fuel cells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_30x64mmFuel_Incendiary</li>
-										</thingDefs>
-									</filter>
-									<count>200</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_30x64mmFuel_Incendiary</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_30x64mmFuel_Incendiary_Punched>50</Ammo_30x64mmFuel_Incendiary_Punched>
-							</products>
-							<workAmount>7600</workAmount>
-						</RecipeDef>
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_30x64mmFuel_Thermobaric_Punched</defName>
-							<label>make 30x64mm fuel cell (Thermobaric) (Punched) x50</label>
-							<description>Craft 50 30x64mm thermobaric fuel cells (Punched).</description>
-							<jobString>Making thermobaric fuel cells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_30x64mmFuel_Thermobaric</li>
-										</thingDefs>
-									</filter>
-									<count>200</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_30x64mmFuel_Thermobaric</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_30x64mmFuel_Thermobaric_Punched>50</Ammo_30x64mmFuel_Thermobaric_Punched>
-							</products>
-							<workAmount>10400</workAmount>
-						</RecipeDef>
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_30x64mmFuel_Foam_Punched</defName>
-							<label>make 30x64mm fuel cell (Foam) (Punched) x50</label>
-							<description>Craft 50 30x64mm foam fuel cells (Punched).</description>
-							<jobString>Making foam fuel cells.</jobString>
-							<researchPrerequisite>Firefoam</researchPrerequisite>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_30x64mmFuel_Foam</li>
-										</thingDefs>
-									</filter>
-									<count>200</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_30x64mmFuel_Foam</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_30x64mmFuel_Foam_Punched>50</Ammo_30x64mmFuel_Foam_Punched>
-							</products>
-							<workAmount>11400</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Recipe/44Magnum-Punched.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Recipe/44Magnum-Punched.xml
deleted file mode 100644
index 3735531c88..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Recipe/44Magnum-Punched.xml	
+++ /dev/null
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Pack A Punch</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>Ammo44Magnum_Punched</defName>
-							<label>Punched .44 Magnum</label>
-							<parent>AmmoPistols_Punched</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_44Magnum_Punched</defName>
-							<label>Punched .44 Magnum</label>
-							<ammoTypes>
-								<Ammo_44Magnum_FMJ_Punched>Bullet_44Magnum_FMJ_Punched</Ammo_44Magnum_FMJ_Punched>
-								<Ammo_44Magnum_AP_Punched>Bullet_44Magnum_AP_Punched</Ammo_44Magnum_AP_Punched>
-								<Ammo_44Magnum_HP_Punched>Bullet_44Magnum_HP_Punched</Ammo_44Magnum_HP_Punched>
-							</ammoTypes>
-							<similarTo>AmmoSet_44Magnum</similarTo>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="44MagnumPunched" ParentName="SmallAmmoBase" Abstract="True">
-							<description>Ancient pistol cartridge originally designed for revolvers.</description>
-							<statBases>
-								<Mass>0.023</Mass>
-								<Bulk>0.02</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>Ammo44Magnum_Punched</li>
-							</thingCategories>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="44MagnumPunched">
-							<defName>Ammo_44Magnum_FMJ_Punched</defName>
-							<label>.44 Magnum cartridge (FMJ) (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Pistol/FMJ</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.2</MarketValue>
-							</statBases>
-							<ammoClass>FullMetalJacket</ammoClass>
-							<cookOffProjectile>Bullet_44Magnum_FMJ_Punched</cookOffProjectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="44MagnumPunched">
-							<defName>Ammo_44Magnum_AP_Punched</defName>
-							<label>.44 Magnum cartridge (AP) (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Pistol/AP</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.2</MarketValue>
-							</statBases>
-							<ammoClass>ArmorPiercing</ammoClass>
-							<cookOffProjectile>Bullet_44Magnum_AP_Punched</cookOffProjectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="44MagnumPunched">
-							<defName>Ammo_44Magnum_HP_Punched</defName>
-							<label>.44 Magnum cartridge (HP) (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Pistol/HP</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.2</MarketValue>
-							</statBases>
-							<ammoClass>HollowPoint</ammoClass>
-							<cookOffProjectile>Bullet_44Magnum_HP_Punched</cookOffProjectile>
-						</ThingDef>
-						<!-- ==================== Projectiles ==================== -->
-						<ThingDef Name="Punched44MagnumBullet" ParentName="BaseBulletCE" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_Small</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>98</speed>
-								<dropsCasings>true</dropsCasings>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="Punched44MagnumBullet">
-							<defName>Bullet_44Magnum_FMJ_Punched</defName>
-							<label>.44 Magnum bullet (FMJ) (Punched)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>30</damageAmountBase>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<armorPenetrationBlunt>23.280</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="Punched44MagnumBullet">
-							<defName>Bullet_44Magnum_AP_Punched</defName>
-							<label>.44 Magnum bullet (AP) (Punched)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationSharp>24</armorPenetrationSharp>
-								<armorPenetrationBlunt>23.280</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="Punched44MagnumBullet">
-							<defName>Bullet_44Magnum_HP_Punched</defName>
-							<label>.44 Magnum bullet (HP) (Punched)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>38</damageAmountBase>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<armorPenetrationBlunt>23.280</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ==================== -->
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_44Magnum_FMJ_Punched</defName>
-							<label>make .44 Magnum (FMJ) cartridge (Punched) x500</label>
-							<description>Craft 500 .44 Magnum (FMJ) cartridges (Punched).</description>
-							<jobString>Making .44 Magnum (FMJ) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_44Magnum_FMJ</li>
-										</thingDefs>
-									</filter>
-									<count>2000</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_44Magnum_FMJ</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_44Magnum_FMJ_Punched>500</Ammo_44Magnum_FMJ_Punched>
-							</products>
-							<workAmount>2400</workAmount>
-						</RecipeDef>
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_44Magnum_AP_Punched</defName>
-							<label>make .44 Magnum (AP) cartridge (Punched) x500</label>
-							<description>Craft 500 .44 Magnum (AP) cartridges (Punched).</description>
-							<jobString>Making .44 Magnum (AP) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_44Magnum_AP</li>
-										</thingDefs>
-									</filter>
-									<count>2000</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_44Magnum_AP</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_44Magnum_AP_Punched>500</Ammo_44Magnum_AP_Punched>
-							</products>
-							<workAmount>2400</workAmount>
-						</RecipeDef>
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_44Magnum_HP_Punched</defName>
-							<label>make .44 Magnum (HP) cartridge (Punched) x500</label>
-							<description>Craft 500 .44 Magnum (HP) cartridges (Punched).</description>
-							<jobString>Making .44 Magnum (HP) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_44Magnum_HP</li>
-										</thingDefs>
-									</filter>
-									<count>2000</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_44Magnum_HP</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_44Magnum_HP_Punched>500</Ammo_44Magnum_HP_Punched>
-							</products>
-							<workAmount>2400</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Recipe/45ACP-Punched.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Recipe/45ACP-Punched.xml
deleted file mode 100644
index 17a5ef583c..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Recipe/45ACP-Punched.xml	
+++ /dev/null
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Pack A Punch</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>Ammo45ACP_Punched</defName>
-							<label>Punched .45 ACP</label>
-							<parent>AmmoPistols_Punched</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_45ACP_Punched</defName>
-							<label>Punched .45 ACP</label>
-							<ammoTypes>
-								<Ammo_45ACP_FMJ_Punched>Bullet_45ACP_FMJ_Punched</Ammo_45ACP_FMJ_Punched>
-								<Ammo_45ACP_AP_Punched>Bullet_45ACP_AP_Punched</Ammo_45ACP_AP_Punched>
-								<Ammo_45ACP_HP_Punched>Bullet_45ACP_HP_Punched</Ammo_45ACP_HP_Punched>
-							</ammoTypes>
-							<similarTo>AmmoSet_45ACP</similarTo>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="45ACPPunched" ParentName="SmallAmmoBase" Abstract="True">
-							<description>Pistol cartridge favoured for its above average stopping power.</description>
-							<statBases>
-								<Mass>0.02</Mass>
-								<Bulk>0.02</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>Ammo45ACP_Punched</li>
-							</thingCategories>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="45ACPPunched">
-							<defName>Ammo_45ACP_FMJ_Punched</defName>
-							<label>.45 ACP cartridge (FMJ) (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Pistol/FMJ</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.18</MarketValue>
-							</statBases>
-							<ammoClass>FullMetalJacket</ammoClass>
-							<cookOffProjectile>Bullet_45ACP_FMJ_Punched</cookOffProjectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="45ACPPunched">
-							<defName>Ammo_45ACP_AP_Punched</defName>
-							<label>.45 ACP cartridge (AP) (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Pistol/AP</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.18</MarketValue>
-							</statBases>
-							<ammoClass>ArmorPiercing</ammoClass>
-							<cookOffProjectile>Bullet_45ACP_AP_Punched</cookOffProjectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="45ACPPunched">
-							<defName>Ammo_45ACP_HP_Punched</defName>
-							<label>.45 ACP cartridge (HP) (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Pistol/HP</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.18</MarketValue>
-							</statBases>
-							<ammoClass>HollowPoint</ammoClass>
-							<cookOffProjectile>Bullet_45ACP_HP_Punched</cookOffProjectile>
-						</ThingDef>
-						<!-- ==================== Projectiles ==================== -->
-						<ThingDef Name="Punched45ACPBullet" ParentName="BaseBulletCE" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_Small</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>74</speed>
-								<dropsCasings>true</dropsCasings>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="Punched45ACPBullet">
-							<defName>Bullet_45ACP_FMJ_Punched</defName>
-							<label>.45 ACP bullet (FMJ) (Punched)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>24</damageAmountBase>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<armorPenetrationBlunt>10.860</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="Punched45ACPBullet">
-							<defName>Bullet_45ACP_AP_Punched</defName>
-							<label>.45 ACP bullet (AP) (Punched)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>14</damageAmountBase>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<armorPenetrationBlunt>10.860</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="Punched45ACPBullet">
-							<defName>Bullet_45ACP_HP_Punched</defName>
-							<label>.45 ACP bullet (HP) (Punched)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>30</damageAmountBase>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<armorPenetrationBlunt>10.860</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ==================== -->
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_45ACP_FMJ_Punched</defName>
-							<label>make .45 ACP (FMJ) cartridge (Punched) x500</label>
-							<description>Craft 500 .45 ACP (FMJ) cartridges (Punched).</description>
-							<jobString>Making .45 ACP (FMJ) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_45ACP_FMJ</li>
-										</thingDefs>
-									</filter>
-									<count>2000</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_45ACP_FMJ</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_45ACP_FMJ_Punched>500</Ammo_45ACP_FMJ_Punched>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_45ACP_AP_Punched</defName>
-							<label>make .45 ACP (AP) cartridge (Punched) x500</label>
-							<description>Craft 500 .45 ACP (AP) cartridges (Punched).</description>
-							<jobString>Making .45 ACP (AP) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_45ACP_AP</li>
-										</thingDefs>
-									</filter>
-									<count>2000</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_45ACP_AP</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_45ACP_AP_Punched>500</Ammo_45ACP_AP_Punched>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_45ACP_HP_Punched</defName>
-							<label>make .45 ACP (HP) cartridge (Punched) x500</label>
-							<description>Craft 500 .45 ACP (HP) cartridges (Punched).</description>
-							<jobString>Making .45 ACP (HP) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_45ACP_HP</li>
-										</thingDefs>
-									</filter>
-									<count>2000</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_45ACP_HP</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_45ACP_HP_Punched>500</Ammo_45ACP_HP_Punched>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Recipe/556x45mmNATO-Punched.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Recipe/556x45mmNATO-Punched.xml
deleted file mode 100644
index 83eb840f2a..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Recipe/556x45mmNATO-Punched.xml	
+++ /dev/null
@@ -1,368 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Pack A Punch</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>Ammo556x45mmNATO_Punched</defName>
-							<label>Punched 5.56x45mm NATO</label>
-							<parent>AmmoRifles_Punched</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_556x45mmNATO_Punched</defName>
-							<label>Punched 5.56x45mm NATO</label>
-							<ammoTypes>
-								<Ammo_556x45mmNATO_FMJ_Punched>Bullet_556x45mmNATO_FMJ_Punched</Ammo_556x45mmNATO_FMJ_Punched>
-								<Ammo_556x45mmNATO_AP_Punched>Bullet_556x45mmNATO_AP_Punched</Ammo_556x45mmNATO_AP_Punched>
-								<Ammo_556x45mmNATO_HP_Punched>Bullet_556x45mmNATO_HP_Punched</Ammo_556x45mmNATO_HP_Punched>
-								<Ammo_556x45mmNATO_Incendiary_Punched>Bullet_556x45mmNATO_Incendiary_Punched</Ammo_556x45mmNATO_Incendiary_Punched>
-								<Ammo_556x45mmNATO_HE_Punched>Bullet_556x45mmNATO_HE_Punched</Ammo_556x45mmNATO_HE_Punched>
-								<Ammo_556x45mmNATO_Sabot_Punched>Bullet_556x45mmNATO_Sabot_Punched</Ammo_556x45mmNATO_Sabot_Punched>
-							</ammoTypes>
-							<similarTo>AmmoSet_556x45mmNATO</similarTo>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="556x45mmNATOPunched" ParentName="SmallAmmoBase" Abstract="True">
-							<description>Small, high-velocity rifle bullet used in a variety of assault rifles.</description>
-							<statBases>
-								<Mass>0.013</Mass>
-								<Bulk>0.02</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>Ammo556x45mmNATO</li>
-							</thingCategories>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="556x45mmNATOPunched">
-							<defName>Ammo_556x45mmNATO_FMJ_Punched</defName>
-							<label>5.56x45mm NATO cartridge (FMJ) (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Rifle/FMJ</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.12</MarketValue>
-							</statBases>
-							<ammoClass>FullMetalJacket</ammoClass>
-							<cookOffProjectile>Bullet_556x45mmNATO_FMJ_Punched</cookOffProjectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="556x45mmNATOPunched">
-							<defName>Ammo_556x45mmNATO_AP_Punched</defName>
-							<label>5.56x45mm NATO cartridge (AP) (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Rifle/AP</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.12</MarketValue>
-							</statBases>
-							<ammoClass>ArmorPiercing</ammoClass>
-							<cookOffProjectile>Bullet_556x45mmNATO_AP_Punched</cookOffProjectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="556x45mmNATOPunched">
-							<defName>Ammo_556x45mmNATO_HP_Punched</defName>
-							<label>5.56x45mm NATO cartridge (HP) (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Rifle/HP</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.18</MarketValue>
-							</statBases>
-							<ammoClass>HollowPoint</ammoClass>
-							<cookOffProjectile>Bullet_556x45mmNATO_HP_Punched</cookOffProjectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="556x45mmNATOPunched">
-							<defName>Ammo_556x45mmNATO_Incendiary_Punched</defName>
-							<label>5.56x45mm NATO cartridge (AP-I) (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Rifle/Incendiary</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.24</MarketValue>
-							</statBases>
-							<ammoClass>IncendiaryAP</ammoClass>
-							<cookOffProjectile>Bullet_556x45mmNATO_Incendiary_Punched</cookOffProjectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="556x45mmNATOPunched">
-							<defName>Ammo_556x45mmNATO_HE_Punched</defName>
-							<label>5.56x45mm NATO cartridge (HE) (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Rifle/HE</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.14</MarketValue>
-							</statBases>
-							<ammoClass>ExplosiveAP</ammoClass>
-							<cookOffProjectile>Bullet_556x45mmNATO_HE_Punched</cookOffProjectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="556x45mmNATOPunched">
-							<defName>Ammo_556x45mmNATO_Sabot_Punched</defName>
-							<label>5.56x45mm NATO cartridge (Sabot) (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Rifle/Sabot</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.14</MarketValue>
-								<Mass>0.011</Mass>
-							</statBases>
-							<ammoClass>Sabot</ammoClass>
-							<cookOffProjectile>Bullet_556x45mmNATO_Sabot_Punched</cookOffProjectile>
-						</ThingDef>
-						<!-- ==================== Projectiles ==================== -->
-						<ThingDef Name="Punched556x45mmNATOBullet" ParentName="BaseBulletCE" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_Small</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>186</speed>
-								<dropsCasings>true</dropsCasings>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="Punched556x45mmNATOBullet">
-							<defName>Bullet_556x45mmNATO_FMJ_Punched</defName>
-							<label>5.56mm NATO bullet (FMJ) (Punched)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>28</damageAmountBase>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<armorPenetrationBlunt>34.18</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="Punched556x45mmNATOBullet">
-							<defName>Bullet_556x45mmNATO_AP_Punched</defName>
-							<label>5.56mm NATO bullet (AP) (Punched)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>18</damageAmountBase>
-								<armorPenetrationSharp>24</armorPenetrationSharp>
-								<armorPenetrationBlunt>34.18</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="Punched556x45mmNATOBullet">
-							<defName>Bullet_556x45mmNATO_HP_Punched</defName>
-							<label>5.56mm NATO bullet (HP) (Punched)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>36</damageAmountBase>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<armorPenetrationBlunt>34.18</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="Punched556x45mmNATOBullet">
-							<defName>Bullet_556x45mmNATO_Incendiary_Punched</defName>
-							<label>5.56mm NATO bullet (AP-I) (Punched)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>18</damageAmountBase>
-								<armorPenetrationSharp>24</armorPenetrationSharp>
-								<armorPenetrationBlunt>34.18</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>10</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="Punched556x45mmNATOBullet">
-							<defName>Bullet_556x45mmNATO_HE_Punched</defName>
-							<label>5.56mm NATO bullet (HE) (Punched)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>28</damageAmountBase>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<armorPenetrationBlunt>34.18</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>16</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="Punched556x45mmNATOBullet">
-							<defName>Bullet_556x45mmNATO_Sabot_Punched</defName>
-							<label>5.56mm NATO bullet (Sabot) (Punched)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>14</damageAmountBase>
-								<armorPenetrationSharp>42</armorPenetrationSharp>
-								<armorPenetrationBlunt>44.18</armorPenetrationBlunt>
-								<speed>252</speed>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ==================== -->
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_556x45mmNATO_FMJ_Punched</defName>
-							<label>make 5.56x45mm NATO (FMJ) cartridge (Punched) x500</label>
-							<description>Craft 500 5.56x45mm NATO (FMJ) cartridges (Punched).</description>
-							<jobString>Making 5.56x45mm NATO (FMJ) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_556x45mmNATO_FMJ</li>
-										</thingDefs>
-									</filter>
-									<count>2000</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_556x45mmNATO_FMJ</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_556x45mmNATO_FMJ_Punched>500</Ammo_556x45mmNATO_FMJ_Punched>
-							</products>
-							<workAmount>1400</workAmount>
-						</RecipeDef>
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_556x45mmNATO_AP_Punched</defName>
-							<label>make 5.56x45mm NATO (AP) cartridge (Punched) x500</label>
-							<description>Craft 500 5.56x45mm NATO (AP) cartridges (Punched).</description>
-							<jobString>Making 5.56x45mm NATO (AP) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_556x45mmNATO_AP</li>
-										</thingDefs>
-									</filter>
-									<count>2000</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_556x45mmNATO_AP</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_556x45mmNATO_AP_Punched>500</Ammo_556x45mmNATO_AP_Punched>
-							</products>
-							<workAmount>1400</workAmount>
-						</RecipeDef>
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_556x45mmNATO_HP_Punched</defName>
-							<label>make 5.56x45mm NATO (HP) cartridge (Punched) x500</label>
-							<description>Craft 500 5.56x45mm NATO (HP) cartridges (Punched).</description>
-							<jobString>Making 5.56x45mm NATO (HP) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_556x45mmNATO_HP</li>
-										</thingDefs>
-									</filter>
-									<count>2000</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_556x45mmNATO_HP</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_556x45mmNATO_HP_Punched>500</Ammo_556x45mmNATO_HP_Punched>
-							</products>
-							<workAmount>1400</workAmount>
-						</RecipeDef>
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_556x45mmNATO_Incendiary_Punched</defName>
-							<label>make 5.56x45mm NATO (AP-I) cartridge (Punched) x500</label>
-							<description>Craft 500 5.56x45mm NATO (AP-I) cartridges (Punched).</description>
-							<jobString>Making 5.56x45mm NATO (AP-I) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_556x45mmNATO_Incendiary</li>
-										</thingDefs>
-									</filter>
-									<count>2000</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_556x45mmNATO_Incendiary</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_556x45mmNATO_Incendiary_Punched>500</Ammo_556x45mmNATO_Incendiary_Punched>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_556x45mmNATO_HE_Punched</defName>
-							<label>make 5.56x45mm NATO (HE) cartridge (Punched) x500</label>
-							<description>Craft 500 5.56x45mm NATO (HE) cartridges (Punched).</description>
-							<jobString>Making 5.56x45mm NATO (HE) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_556x45mmNATO_HE</li>
-										</thingDefs>
-									</filter>
-									<count>2000</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_556x45mmNATO_HE</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_556x45mmNATO_HE_Punched>500</Ammo_556x45mmNATO_HE_Punched>
-							</products>
-							<workAmount>3000</workAmount>
-						</RecipeDef>
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_556x45mmNATO_Sabot_Punched</defName>
-							<label>make 5.56x45mm NATO (Sabot) cartridge (Punched) x500</label>
-							<description>Craft 500 5.56x45mm NATO (Sabot) cartridges (Punched).</description>
-							<jobString>Making 5.56x45mm NATO (Sabot) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_556x45mmNATO_Sabot</li>
-										</thingDefs>
-									</filter>
-									<count>2000</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_556x45mmNATO_Sabot</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_556x45mmNATO_Sabot_Punched>500</Ammo_556x45mmNATO_Sabot_Punched>
-							</products>
-							<workAmount>2000</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Recipe/6x24mmCharged-Punched.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Recipe/6x24mmCharged-Punched.xml
deleted file mode 100644
index 32ac5af281..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Recipe/6x24mmCharged-Punched.xml	
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Pack A Punch</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>Ammo6x24mmCharged_Punched</defName>
-							<label>Punched 6x24mm Charged</label>
-							<parent>AmmoAdvanced_Punched</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_6x24mmCharged_Punched</defName>
-							<label>Punched 6x24mm Charged</label>
-							<ammoTypes>
-								<Ammo_6x24mmCharged_Punched>Bullet_6x24mmCharged_Punched</Ammo_6x24mmCharged_Punched>
-								<Ammo_6x24mmCharged_AP_Punched>Bullet_6x24mmCharged_AP_Punched</Ammo_6x24mmCharged_AP_Punched>
-								<Ammo_6x24mmCharged_Ion_Punched>Bullet_6x24mmCharged_Ion_Punched</Ammo_6x24mmCharged_Ion_Punched>
-							</ammoTypes>
-							<similarTo>AmmoSet_6x24mmCharged</similarTo>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="6x24mmChargedPunched" ParentName="SpacerSmallAmmoBase" Abstract="True">
-							<description>Charged shot ammo used by advanced assault rifle designs.</description>
-							<statBases>
-								<Mass>0.01</Mass>
-								<Bulk>0.01</Bulk>
-								<MarketValue>1.4</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableCrafting_FabricationBench</li>
-							</tradeTags>
-							<thingCategories>
-								<li>Ammo6x24mmCharged_Punched</li>
-							</thingCategories>
-							<stackLimit>5000</stackLimit>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="6x24mmChargedPunched">
-							<defName>Ammo_6x24mmCharged_Punched</defName>
-							<label>6x24mm Charged cartridge (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Charged/MediumRegular</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<ammoClass>Charged</ammoClass>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="6x24mmChargedPunched">
-							<defName>Ammo_6x24mmCharged_AP_Punched</defName>
-							<label>6x24mm Charged cartridge (Conc.) (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Charged/MediumConc</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<ammoClass>ChargedAP</ammoClass>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="6x24mmChargedPunched">
-							<defName>Ammo_6x24mmCharged_Ion_Punched</defName>
-							<label>6x24mm Charged cartridge (Ion) (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Charged/MediumIon</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<ammoClass>Ionized</ammoClass>
-							<generateAllowChance>0</generateAllowChance>
-						</ThingDef>
-						<!-- ==================== Projectiles ==================== -->
-						<ThingDef Name="Punched6x24mmChargedBullet" ParentName="BaseBulletCE" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Charge_Small</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>168</speed>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="Punched6x24mmChargedBullet">
-							<defName>Bullet_6x24mmCharged_Punched</defName>
-							<label>6x24mm Charged bullet (Punched)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>26</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>8</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-								<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="Punched6x24mmChargedBullet">
-							<defName>Bullet_6x24mmCharged_AP_Punched</defName>
-							<label>6x24mm Charged bullet (Conc.) (Punched)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>20</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>4</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-								<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="Punched6x24mmChargedBullet">
-							<defName>Bullet_6x24mmCharged_Ion_Punched</defName>
-							<label>6x24mm Charged bullet (Ion) (Punched)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>20</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>12</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>22.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
-								<empShieldBreakChance>0.2</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ==================== -->
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_6x24mmCharged_Punched</defName>
-							<label>make 6x24mm Charged cartridge (Punched) x500</label>
-							<description>Craft 500 6x24mm Charged cartridges (Punched).</description>
-							<jobString>Making 6x24mm Charged cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_6x24mmCharged</li>
-										</thingDefs>
-									</filter>
-									<count>2000</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_6x24mmCharged</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_6x24mmCharged_Punched>500</Ammo_6x24mmCharged_Punched>
-							</products>
-							<workAmount>8600</workAmount>
-						</RecipeDef>
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_6x24mmCharged_AP_Punched</defName>
-							<label>make 6x24mm Charged (Conc.) cartridge (Punched) x500</label>
-							<description>Craft 500 6x24mm Charged (Conc.) cartridges (Punched).</description>
-							<jobString>Making 6x24mm Charged (Conc.) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_6x24mmCharged_AP</li>
-										</thingDefs>
-									</filter>
-									<count>2000</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_6x24mmCharged_AP</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_6x24mmCharged_AP_Punched>500</Ammo_6x24mmCharged_AP_Punched>
-							</products>
-							<workAmount>8600</workAmount>
-						</RecipeDef>
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_6x24mmCharged_Ion_Punched</defName>
-							<label>make 6x24mm Charged (Ion) cartridge (Punched) x500</label>
-							<description>Craft 500 6x24mm Charged (Ion) cartridges (Punched).</description>
-							<jobString>Making 6x24mm Charged (Ion) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_6x24mmCharged_Ion</li>
-										</thingDefs>
-									</filter>
-									<count>2000</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_6x24mmCharged_Ion</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_6x24mmCharged_Ion_Punched>500</Ammo_6x24mmCharged_Ion_Punched>
-							</products>
-							<workAmount>8600</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Recipe/762x51mmNATO-Punched.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Recipe/762x51mmNATO-Punched.xml
deleted file mode 100644
index 356893a2b2..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Recipe/762x51mmNATO-Punched.xml	
+++ /dev/null
@@ -1,368 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Pack A Punch</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>Ammo762x51mmNATO_Punched</defName>
-							<label>Punched 7.62x51mm NATO</label>
-							<parent>AmmoRifles_Punched</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_762x51mmNATO_Punched</defName>
-							<label>Punched 7.62x51mm NATO</label>
-							<ammoTypes>
-								<Ammo_762x51mmNATO_FMJ_Punched>Bullet_762x51mmNATO_FMJ_Punched</Ammo_762x51mmNATO_FMJ_Punched>
-								<Ammo_762x51mmNATO_AP_Punched>Bullet_762x51mmNATO_AP_Punched</Ammo_762x51mmNATO_AP_Punched>
-								<Ammo_762x51mmNATO_HP_Punched>Bullet_762x51mmNATO_HP_Punched</Ammo_762x51mmNATO_HP_Punched>
-								<Ammo_762x51mmNATO_Incendiary_Punched>Bullet_762x51mmNATO_Incendiary_Punched</Ammo_762x51mmNATO_Incendiary_Punched>
-								<Ammo_762x51mmNATO_HE_Punched>Bullet_762x51mmNATO_HE_Punched</Ammo_762x51mmNATO_HE_Punched>
-								<Ammo_762x51mmNATO_Sabot_Punched>Bullet_762x51mmNATO_Sabot_Punched</Ammo_762x51mmNATO_Sabot_Punched>
-							</ammoTypes>
-							<similarTo>AmmoSet_762x51mmNATO</similarTo>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="762x51mmNATOPunched" ParentName="SmallAmmoBase" Abstract="True">
-							<description>Large rifle bullet used in machine guns, sniper rifles and the occasional assault rifle.</description>
-							<statBases>
-								<Mass>0.025</Mass>
-								<Bulk>0.03</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>Ammo762x51mmNATO</li>
-							</thingCategories>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x51mmNATOPunched">
-							<defName>Ammo_762x51mmNATO_FMJ_Punched</defName>
-							<label>7.62x51mm NATO cartridge (FMJ) (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Rifle/FMJ</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.22</MarketValue>
-							</statBases>
-							<ammoClass>FullMetalJacket</ammoClass>
-							<cookOffProjectile>Bullet_762x51mmNATO_FMJ_Punched</cookOffProjectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x51mmNATOPunched">
-							<defName>Ammo_762x51mmNATO_AP_Punched</defName>
-							<label>7.62x51mm NATO cartridge (AP) (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Rifle/AP</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.22</MarketValue>
-							</statBases>
-							<ammoClass>ArmorPiercing</ammoClass>
-							<cookOffProjectile>Bullet_762x51mmNATO_AP_Punched</cookOffProjectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x51mmNATOPunched">
-							<defName>Ammo_762x51mmNATO_HP_Punched</defName>
-							<label>7.62x51mm NATO cartridge (HP) (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Rifle/HP</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.22</MarketValue>
-							</statBases>
-							<ammoClass>HollowPoint</ammoClass>
-							<cookOffProjectile>Bullet_762x51mmNATO_HP_Punched</cookOffProjectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x51mmNATOPunched">
-							<defName>Ammo_762x51mmNATO_Incendiary_Punched</defName>
-							<label>7.62x51mm NATO cartridge (AP-I) (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Rifle/Incendiary</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.30</MarketValue>
-							</statBases>
-							<ammoClass>IncendiaryAP</ammoClass>
-							<cookOffProjectile>Bullet_762x51mmNATO_Incendiary_Punched</cookOffProjectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x51mmNATOPunched">
-							<defName>Ammo_762x51mmNATO_HE_Punched</defName>
-							<label>7.62x51mm NATO cartridge (HE) (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Rifle/HE</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.42</MarketValue>
-							</statBases>
-							<ammoClass>ExplosiveAP</ammoClass>
-							<cookOffProjectile>Bullet_762x51mmNATO_HE_Punched</cookOffProjectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x51mmNATOPunched">
-							<defName>Ammo_762x51mmNATO_Sabot_Punched</defName>
-							<label>7.62x51mm NATO cartridge (Sabot) (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Rifle/Sabot</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.24</MarketValue>
-								<Mass>0.02</Mass>
-							</statBases>
-							<ammoClass>Sabot</ammoClass>
-							<cookOffProjectile>Bullet_762x51mmNATO_Sabot_Punched</cookOffProjectile>
-						</ThingDef>
-						<!-- ==================== Projectiles ==================== -->
-						<ThingDef Name="Punched762x51mmNATOBullet" ParentName="BaseBulletCE" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_Small</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>174</speed>
-								<dropsCasings>true</dropsCasings>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="Punched762x51mmNATOBullet">
-							<defName>Bullet_762x51mmNATO_FMJ_Punched</defName>
-							<label>7.62mm NATO bullet (FMJ) (Punched)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>40</damageAmountBase>
-								<armorPenetrationSharp>14</armorPenetrationSharp>
-								<armorPenetrationBlunt>66.72</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="Punched762x51mmNATOBullet">
-							<defName>Bullet_762x51mmNATO_AP_Punched</defName>
-							<label>7.62mm NATO bullet (AP) (Punched)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>24</damageAmountBase>
-								<armorPenetrationSharp>28</armorPenetrationSharp>
-								<armorPenetrationBlunt>66.72</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="Punched762x51mmNATOBullet">
-							<defName>Bullet_762x51mmNATO_HP_Punched</defName>
-							<label>7.62mm NATO bullet (HP) (Punched)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>50</damageAmountBase>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>66.72</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="Punched762x51mmNATOBullet">
-							<defName>Bullet_762x51mmNATO_Incendiary_Punched</defName>
-							<label>7.62mm NATO bullet (AP-I) (Punched)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>24</damageAmountBase>
-								<armorPenetrationSharp>28</armorPenetrationSharp>
-								<armorPenetrationBlunt>66.72</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>16</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="Punched762x51mmNATOBullet">
-							<defName>Bullet_762x51mmNATO_HE_Punched</defName>
-							<label>7.62mm NATO bullet (HE) (Punched)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>40</damageAmountBase>
-								<armorPenetrationSharp>14</armorPenetrationSharp>
-								<armorPenetrationBlunt>66.72</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>24</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="Punched762x51mmNATOBullet">
-							<defName>Bullet_762x51mmNATO_Sabot_Punched</defName>
-							<label>7.62mm NATO bullet (Sabot) (Punched)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationSharp>50</armorPenetrationSharp>
-								<armorPenetrationBlunt>86.28</armorPenetrationBlunt>
-								<speed>235</speed>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ==================== -->
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_762x51mmNATO_FMJ_Punched</defName>
-							<label>make 7.62x51mm NATO (FMJ) cartridge (Punched) x500</label>
-							<description>Craft 500 7.62x51mm NATO (FMJ) cartridges (Punched).</description>
-							<jobString>Making 7.62x51mm NATO (FMJ) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_762x51mmNATO_FMJ</li>
-										</thingDefs>
-									</filter>
-									<count>2000</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_762x51mmNATO_FMJ</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_762x51mmNATO_FMJ_Punched>500</Ammo_762x51mmNATO_FMJ_Punched>
-							</products>
-							<workAmount>2600</workAmount>
-						</RecipeDef>
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_762x51mmNATO_AP_Punched</defName>
-							<label>make 7.62x51mm NATO (AP) cartridge (Punched) x500</label>
-							<description>Craft 500 7.62x51mm NATO (AP) cartridges (Punched).</description>
-							<jobString>Making 7.62x51mm NATO (AP) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_762x51mmNATO_AP</li>
-										</thingDefs>
-									</filter>
-									<count>2000</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_762x51mmNATO_AP</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_762x51mmNATO_AP_Punched>500</Ammo_762x51mmNATO_AP_Punched>
-							</products>
-							<workAmount>2600</workAmount>
-						</RecipeDef>
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_762x51mmNATO_HP_Punched</defName>
-							<label>make 7.62x51mm NATO (HP) cartridge (Punched) x500</label>
-							<description>Craft 500 7.62x51mm NATO (HP) cartridges (Punched).</description>
-							<jobString>Making 7.62x51mm NATO (HP) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_762x51mmNATO_HP</li>
-										</thingDefs>
-									</filter>
-									<count>2000</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_762x51mmNATO_HP</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_762x51mmNATO_HP_Punched>500</Ammo_762x51mmNATO_HP_Punched>
-							</products>
-							<workAmount>2600</workAmount>
-						</RecipeDef>
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_762x51mmNATO_Incendiary_Punched</defName>
-							<label>make 7.62x51mm NATO (AP-I) cartridge (Punched) x500</label>
-							<description>Craft 500 7.62x51mm NATO (AP-I) cartridges (Punched).</description>
-							<jobString>Making 7.62x51mm NATO (AP-I) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_762x51mmNATO_Incendiary</li>
-										</thingDefs>
-									</filter>
-									<count>2000</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_762x51mmNATO_Incendiary</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_762x51mmNATO_Incendiary_Punched>500</Ammo_762x51mmNATO_Incendiary_Punched>
-							</products>
-							<workAmount>3800</workAmount>
-						</RecipeDef>
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_762x51mmNATO_HE_Punched</defName>
-							<label>make 7.62x51mm NATO (HE) cartridge (Punched) x500</label>
-							<description>Craft 500 7.62x51mm NATO (HE) cartridges (Punched).</description>
-							<jobString>Making 7.62x51mm NATO (HE) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_762x51mmNATO_HE</li>
-										</thingDefs>
-									</filter>
-									<count>2000</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_762x51mmNATO_HE</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_762x51mmNATO_HE_Punched>500</Ammo_762x51mmNATO_HE_Punched>
-							</products>
-							<workAmount>4600</workAmount>
-						</RecipeDef>
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_762x51mmNATO_Sabot_Punched</defName>
-							<label>make 7.62x51mm NATO (Sabot) cartridge (Punched) x500</label>
-							<description>Craft 500 7.62x51mm NATO (Sabot) cartridges (Punched).</description>
-							<jobString>Making 7.62x51mm NATO (Sabot) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_762x51mmNATO_Sabot</li>
-										</thingDefs>
-									</filter>
-									<count>2000</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_762x51mmNATO_Sabot</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_762x51mmNATO_Sabot_Punched>500</Ammo_762x51mmNATO_Sabot_Punched>
-							</products>
-							<workAmount>3400</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Recipe/762x54mmR-Punched.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Recipe/762x54mmR-Punched.xml
deleted file mode 100644
index ced8e5ebd7..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Recipe/762x54mmR-Punched.xml	
+++ /dev/null
@@ -1,368 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Pack A Punch</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>Ammo762x54mmR_Punched</defName>
-							<label>Punched 7.62x54mmR</label>
-							<parent>AmmoRifles_Punched</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_762x54mmR_Punched</defName>
-							<label>Punched 7.62x54mmR</label>
-							<ammoTypes>
-								<Ammo_762x54mmR_FMJ_Punched>Bullet_762x54mmR_FMJ_Punched</Ammo_762x54mmR_FMJ_Punched>
-								<Ammo_762x54mmR_AP_Punched>Bullet_762x54mmR_AP_Punched</Ammo_762x54mmR_AP_Punched>
-								<Ammo_762x54mmR_HP_Punched>Bullet_762x54mmR_HP_Punched</Ammo_762x54mmR_HP_Punched>
-								<Ammo_762x54mmR_Incendiary_Punched>Bullet_762x54mmR_Incendiary_Punched</Ammo_762x54mmR_Incendiary_Punched>
-								<Ammo_762x54mmR_HE_Punched>Bullet_762x54mmR_HE_Punched</Ammo_762x54mmR_HE_Punched>
-								<Ammo_762x54mmR_Sabot_Punched>Bullet_762x54mmR_Sabot_Punched</Ammo_762x54mmR_Sabot_Punched>
-							</ammoTypes>
-							<similarTo>AmmoSet_762x54mmR</similarTo>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="762x54mmRPunched" ParentName="SmallAmmoBase" Abstract="True">
-							<description>Rimmed rifle cartridge used by many machine guns, bolt-action and sniper rifles.</description>
-							<statBases>
-								<Mass>0.026</Mass>
-								<Bulk>0.03</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>Ammo762x54mmR_Punched</li>
-							</thingCategories>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x54mmRPunched">
-							<defName>Ammo_762x54mmR_FMJ_Punched</defName>
-							<label>7.62x54mmR cartridge (FMJ) (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Rifle/FMJ</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.24</MarketValue>
-							</statBases>
-							<ammoClass>FullMetalJacket</ammoClass>
-							<cookOffProjectile>Bullet_762x54mmR_FMJ_Punched</cookOffProjectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x54mmRPunched">
-							<defName>Ammo_762x54mmR_AP_Punched</defName>
-							<label>7.62x54mmR cartridge (AP) (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Rifle/AP</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.24</MarketValue>
-							</statBases>
-							<ammoClass>ArmorPiercing</ammoClass>
-							<cookOffProjectile>Bullet_762x54mmR_AP_Punched</cookOffProjectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x54mmRPunched">
-							<defName>Ammo_762x54mmR_HP_Punched</defName>
-							<label>7.62x54mmR cartridge (HP) (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Rifle/HP</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.24</MarketValue>
-							</statBases>
-							<ammoClass>HollowPoint</ammoClass>
-							<cookOffProjectile>Bullet_762x54mmR_HP_Punched</cookOffProjectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x54mmRPunched">
-							<defName>Ammo_762x54mmR_Incendiary_Punched</defName>
-							<label>7.62x54mmR cartridge (AP-I) (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Rifle/Incendiary</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.30</MarketValue>
-							</statBases>
-							<ammoClass>IncendiaryAP</ammoClass>
-							<cookOffProjectile>Bullet_762x54mmR_Incendiary_Punched</cookOffProjectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x54mmRPunched">
-							<defName>Ammo_762x54mmR_HE_Punched</defName>
-							<label>7.62x54mmR cartridge (HE) (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Rifle/HE</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.44</MarketValue>
-							</statBases>
-							<ammoClass>ExplosiveAP</ammoClass>
-							<cookOffProjectile>Bullet_762x54mmR_HE_Punched</cookOffProjectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x54mmRPunched">
-							<defName>Ammo_762x54mmR_Sabot_Punched</defName>
-							<label>7.62x54mmR cartridge (Sabot) (Punched)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Rifle/Sabot</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.26</MarketValue>
-								<Mass>0.022</Mass>
-							</statBases>
-							<ammoClass>Sabot</ammoClass>
-							<cookOffProjectile>Bullet_762x54mmR_Sabot_Punched</cookOffProjectile>
-						</ThingDef>
-						<!-- ==================== Projectiles ==================== -->
-						<ThingDef Name="Punched762x54mmRBullet" ParentName="BaseBulletCE" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_Small</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>172</speed>
-								<dropsCasings>true</dropsCasings>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="Punched762x54mmRBullet">
-							<defName>Bullet_762x54mmR_FMJ_Punched</defName>
-							<label>7.62mmR bullet (FMJ) (Punched)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>40</damageAmountBase>
-								<armorPenetrationSharp>14</armorPenetrationSharp>
-								<armorPenetrationBlunt>67.340</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="Punched762x54mmRBullet">
-							<defName>Bullet_762x54mmR_AP_Punched</defName>
-							<label>7.62mmR bullet (AP) (Punched)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>24</damageAmountBase>
-								<armorPenetrationSharp>28</armorPenetrationSharp>
-								<armorPenetrationBlunt>67.340</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="Punched762x54mmRBullet">
-							<defName>Bullet_762x54mmR_HP_Punched</defName>
-							<label>7.62mmR bullet (HP) (Punched)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>50</damageAmountBase>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>67.340</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="Punched762x54mmRBullet">
-							<defName>Bullet_762x54mmR_Incendiary_Punched</defName>
-							<label>7.62mmR bullet (AP-I) (Punched)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>24</damageAmountBase>
-								<armorPenetrationSharp>28</armorPenetrationSharp>
-								<armorPenetrationBlunt>67.340</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>16</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="Punched762x54mmRBullet">
-							<defName>Bullet_762x54mmR_HE_Punched</defName>
-							<label>7.62mmR bullet (HE) (Punched)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>40</damageAmountBase>
-								<armorPenetrationSharp>14</armorPenetrationSharp>
-								<armorPenetrationBlunt>67.340</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>24</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="Punched762x54mmRBullet">
-							<defName>Bullet_762x54mmR_Sabot_Punched</defName>
-							<label>7.62mmR bullet (Sabot) (Punched)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationSharp>50</armorPenetrationSharp>
-								<armorPenetrationBlunt>87.280</armorPenetrationBlunt>
-								<speed>233</speed>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ==================== -->
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_762x54mmR_FMJ_Punched</defName>
-							<label>make 7.62x54mmR (FMJ) cartridge (Punched) x500</label>
-							<description>Craft 500 7.62x54mmR (FMJ) cartridges (Punched).</description>
-							<jobString>Making 7.62x54mmR (FMJ) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_762x54mmR_FMJ</li>
-										</thingDefs>
-									</filter>
-									<count>2000</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_762x54mmR_FMJ</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_762x54mmR_FMJ_Punched>500</Ammo_762x54mmR_FMJ_Punched>
-							</products>
-							<workAmount>2800</workAmount>
-						</RecipeDef>
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_762x54mmR_AP_Punched</defName>
-							<label>make 7.62x54mmR (AP) cartridge (Punched) x500</label>
-							<description>Craft 500 7.62x54mmR (AP) cartridges (Punched).</description>
-							<jobString>Making 7.62x54mmR (AP) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_762x54mmR_AP</li>
-										</thingDefs>
-									</filter>
-									<count>2000</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_762x54mmR_AP</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_762x54mmR_AP_Punched>500</Ammo_762x54mmR_AP_Punched>
-							</products>
-							<workAmount>2800</workAmount>
-						</RecipeDef>
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_762x54mmR_HP_Punched</defName>
-							<label>make 7.62x54mmR (HP) cartridge (Punched) x500</label>
-							<description>Craft 500 7.62x54mmR (HP) cartridges (Punched).</description>
-							<jobString>Making 7.62x54mmR (HP) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_762x54mmR_HP</li>
-										</thingDefs>
-									</filter>
-									<count>2000</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_762x54mmR_HP</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_762x54mmR_HP_Punched>500</Ammo_762x54mmR_HP_Punched>
-							</products>
-							<workAmount>2800</workAmount>
-						</RecipeDef>
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_762x54mmR_Incendiary_Punched</defName>
-							<label>make 7.62x54mmR (AP-I) cartridge (Punched) x500</label>
-							<description>Craft 500 7.62x54mmR (AP-I) cartridges (Punched).</description>
-							<jobString>Making 7.62x54mmR (AP-I) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_762x54mmR_Incendiary</li>
-										</thingDefs>
-									</filter>
-									<count>2000</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_762x54mmR_Incendiary</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_762x54mmR_Incendiary_Punched>500</Ammo_762x54mmR_Incendiary_Punched>
-							</products>
-							<workAmount>4000</workAmount>
-						</RecipeDef>
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_762x54mmR_HE_Punched</defName>
-							<label>make 7.62x54mmR (HE) cartridge (Punched) x500</label>
-							<description>Craft 500 7.62x54mmR (HE) cartridges (Punched).</description>
-							<jobString>Making 7.62x54mmR (HE) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_762x54mmR_HE</li>
-										</thingDefs>
-									</filter>
-									<count>2000</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_762x54mmR_HE</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_762x54mmR_HE_Punched>500</Ammo_762x54mmR_HE_Punched>
-							</products>
-							<workAmount>4800</workAmount>
-						</RecipeDef>
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_762x54mmR_Sabot_Punched</defName>
-							<label>make 7.62x54mmR (Sabot) cartridge (Punched) x500</label>
-							<description>Craft 500 7.62x54mmR (Sabot) cartridges (Punched).</description>
-							<jobString>Making 7.62x54mmR (Sabot) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_762x54mmR_Sabot</li>
-										</thingDefs>
-									</filter>
-									<count>2000</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_762x54mmR_Sabot</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_762x54mmR_Sabot_Punched>500</Ammo_762x54mmR_Sabot_Punched>
-							</products>
-							<workAmount>3600</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Fire.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Fire.xml
deleted file mode 100644
index 2f4b7c4180..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Fire.xml	
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Wonder Weapons</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoElementalStaff</defName>
-							<label>Elemental Staffs</label>
-							<parent>AmmoWonders</parent>
-						</ThingCategoryDef>
-						<ThingCategoryDef>
-							<defName>AmmoElementalStaff_Fire</defName>
-							<label>Fire Staff</label>
-							<parent>AmmoElementalStaff</parent>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Elemental_Staff_Fire</defName>
-							<label>Elemental fire crystal set</label>
-							<ammoTypes>
-								<Ammo_Elemental_Staff_Fire>Bullet_Elemental_Staff_Fire</Ammo_Elemental_Staff_Fire>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="ElementalStaffBase" ParentName="SmallAmmoBase" Abstract="True">
-							<description>A brilliant coloured Gem that radiates power</description>
-							<statBases>
-								<Mass>0.2</Mass>
-								<Bulk>0.2</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="ElementalStaffBase">
-							<defName>Ammo_Elemental_Staff_Fire</defName>
-							<label>Elemental Fire Crystal</label>
-							<graphicData>
-								<texPath>ThirdParty/CoD Zombies Pack/Crystal_Fire</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>ExplosiveAP</ammoClass>
-							<cookOffProjectile>Bullet_Elemental_Staff_Fire</cookOffProjectile>
-							<thingCategories>
-								<li>AmmoElementalStaff_Fire</li>
-							</thingCategories>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef Name="BaseElementalStaffBullet" ParentName="Base44MagnumBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/CodZP_StaffProjectile</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>50</speed>
-								<dropsCasings>false</dropsCasings>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="BaseElementalStaffBullet">
-							<defName>Bullet_Elemental_Staff_Fire</defName>
-							<label>Fire Projectile</label>
-							<graphicData>
-								<color>(255,48,48)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<pelletCount>3</pelletCount>
-								<damageAmountBase>1</damageAmountBase>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<spreadMult>45</spreadMult>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>30</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>1.9</explosiveRadius>
-									<explosionSound>MortarBomb_Explode</explosionSound>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-							</comps>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonder">
-							<defName>MakeAmmo_Elemental_Staff_Fire</defName>
-							<label>make Elemental Fire Crystal x5</label>
-							<description>Craft 5 Elemental Fire Crystals.</description>
-							<jobString>Making Elemental Fire Crystals.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>22</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Elemental_Staff_Fire>5</Ammo_Elemental_Staff_Fire>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Fire_Punched.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Fire_Punched.xml
deleted file mode 100644
index 333eba4c71..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Fire_Punched.xml	
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoElementalStaff_Punched</defName>
-							<label>Elemental Staffs</label>
-							<parent>AmmoWonders_Punched</parent>
-						</ThingCategoryDef>
-						<ThingCategoryDef>
-							<defName>AmmoElementalStaff_Fire_Punched</defName>
-							<label>Fire Staff</label>
-							<parent>AmmoElementalStaff_Punched</parent>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Elemental_Staff_Fire_Punched</defName>
-							<label>Empowered elemental fire crystal set</label>
-							<ammoTypes>
-								<Ammo_Elemental_Staff_Fire_Punched>Bullet_Elemental_Staff_Fire_Punched</Ammo_Elemental_Staff_Fire_Punched>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="ElementalStaffPunched" ParentName="SpacerSmallAmmoBase" Abstract="True">
-							<description>A Blue Gem</description>
-							<statBases>
-								<Mass>0.2</Mass>
-								<Bulk>0.2</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="ElementalStaffPunched">
-							<defName>Ammo_Elemental_Staff_Fire_Punched</defName>
-							<label>Empowered Elemental Fire Crystal</label>
-							<graphicData>
-								<texPath>ThirdParty/CoD Zombies Pack/Crystal_Fire</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>ExplosiveAP</ammoClass>
-							<cookOffProjectile>Bullet_Elemental_Staff_Fire_Punched</cookOffProjectile>
-							<thingCategories>
-								<li>AmmoElementalStaff_Fire_Punched</li>
-							</thingCategories>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef Name="PunchedElementalStaffBullet" ParentName="BaseElementalStaffBullet" Abstract="true">
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>64</speed>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="PunchedElementalStaffBullet">
-							<defName>Bullet_Elemental_Staff_Fire_Punched</defName>
-							<label>Empowered Fire Projectile</label>
-							<graphicData>
-								<color>(255,48,48)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>1</damageAmountBase>
-								<pelletCount>3</pelletCount>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<spreadMult>30</spreadMult>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>45</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>1.9</explosiveRadius>
-									<explosionSound>MortarBomb_Explode</explosionSound>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-							</comps>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonder_Punched">
-							<defName>MakeAmmo_Elemental_Staff_Fire_Punched</defName>
-							<label>make Empowered Elemental Fire Crystal x5</label>
-							<description>Craft 5 Empowered Elemental Fire Crystals.</description>
-							<jobString>Making Empowered Elemental Fire Crystals.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_Elemental_Staff_Fire</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_Elemental_Staff_Fire</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Elemental_Staff_Fire_Punched>5</Ammo_Elemental_Staff_Fire_Punched>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Ice.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Ice.xml
deleted file mode 100644
index 680942e941..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Ice.xml	
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Wonder Weapons</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoElementalStaff_Ice</defName>
-							<label>Ice Staff</label>
-							<parent>AmmoElementalStaff</parent>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Elemental_Staff_Ice</defName>
-							<label>Elemental ice crystal set</label>
-							<ammoTypes>
-								<Ammo_Elemental_Staff_Ice>Bullet_Elemental_Staff_Ice</Ammo_Elemental_Staff_Ice>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="ElementalStaffBase">
-							<defName>Ammo_Elemental_Staff_Ice</defName>
-							<label>Elemental Ice Crystal</label>
-							<graphicData>
-								<texPath>ThirdParty/CoD Zombies Pack/Crystal_Ice</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>FullMetalJacket</ammoClass>
-							<cookOffProjectile>Bullet_Elemental_Staff_Ice</cookOffProjectile>
-							<thingCategories>
-								<li>AmmoElementalStaff_Ice</li>
-							</thingCategories>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef ParentName="BaseElementalStaffBullet">
-							<defName>Bullet_Elemental_Staff_Ice</defName>
-							<label>Ice Projectile</label>
-							<graphicData>
-								<color>(220,243,255)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>CodZP_Frostbite</damageDef>
-								<damageAmountBase>1</damageAmountBase>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonder">
-							<defName>MakeAmmo_Elemental_Staff_Ice</defName>
-							<label>make Elemental Ice Crystal x5</label>
-							<description>Craft 5 Elemental Ice Crystals.</description>
-							<jobString>Making Elemental Ice Crystals.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>22</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Elemental_Staff_Ice>5</Ammo_Elemental_Staff_Ice>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Ice_Punched.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Ice_Punched.xml
deleted file mode 100644
index b3a0791bdb..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Ice_Punched.xml	
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoElementalStaff_Ice_Punched</defName>
-							<label>Ice Staff</label>
-							<parent>AmmoElementalStaff_Punched</parent>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Elemental_Staff_Ice_Punched</defName>
-							<label>Empowered elemental ice crystal set</label>
-							<ammoTypes>
-								<Ammo_Elemental_Staff_Ice_Punched>Bullet_Elemental_Staff_Ice_Punched</Ammo_Elemental_Staff_Ice_Punched>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="ElementalStaffPunched">
-							<defName>Ammo_Elemental_Staff_Ice_Punched</defName>
-							<label>Empowered Elemental Ice Crystal</label>
-							<graphicData>
-								<texPath>ThirdParty/CoD Zombies Pack/Crystal_Ice</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(200,200,255)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>FullMetalJacket</ammoClass>
-							<cookOffProjectile>Bullet_Elemental_Staff_Ice_Punched</cookOffProjectile>
-							<thingCategories>
-								<li>AmmoElementalStaff_Ice_Punched</li>
-							</thingCategories>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef ParentName="PunchedElementalStaffBullet">
-							<defName>Bullet_Elemental_Staff_Ice_Punched</defName>
-							<label>Empowered Ice Projectile</label>
-							<graphicData>
-								<color>(162,210,223)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>CodZP_Frostbite</damageDef>
-								<damageAmountBase>1</damageAmountBase>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonder_Punched">
-							<defName>MakeAmmo_Elemental_Staff_Ice_Punched</defName>
-							<label>make Empowered Elemental Ice Crystal x5</label>
-							<description>Craft 5 Empowered Elemental Ice Crystals.</description>
-							<jobString>Making Empowered Elemental Ice Crystals.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_Elemental_Staff_Ice</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_Elemental_Staff_Ice</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Elemental_Staff_Ice_Punched>5</Ammo_Elemental_Staff_Ice_Punched>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Lightning.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Lightning.xml
deleted file mode 100644
index 16790fe6ed..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Lightning.xml	
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Wonder Weapons</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoElementalStaff_Lightning</defName>
-							<label>Lightning Staff</label>
-							<parent>AmmoElementalStaff</parent>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Elemental_Staff_Lightning</defName>
-							<label>Elemental lightning crystal set</label>
-							<ammoTypes>
-								<Ammo_Elemental_Staff_Lightning>Bullet_Elemental_Staff_Lightning</Ammo_Elemental_Staff_Lightning>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="ElementalStaffBase">
-							<defName>Ammo_Elemental_Staff_Lightning</defName>
-							<label>Elemental Lightning Crystal</label>
-							<graphicData>
-								<texPath>ThirdParty/CoD Zombies Pack/Crystal_Lightning</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>FullMetalJacket</ammoClass>
-							<cookOffProjectile>Bullet_Elemental_Staff_Lightning</cookOffProjectile>
-							<thingCategories>
-								<li>AmmoElementalStaff_Lightning</li>
-							</thingCategories>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef ParentName="BaseElementalStaffBullet">
-							<defName>Bullet_Elemental_Staff_Lightning</defName>
-							<label>Lightning Projectile</label>
-							<graphicData>
-								<shaderType>TransparentPostLight</shaderType>
-								<color>(113, 4, 255)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Electrical</damageDef>
-								<pelletCount>2</pelletCount>
-								<damageAmountBase>1</damageAmountBase>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<spreadMult>10</spreadMult>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonder">
-							<defName>MakeAmmo_Elemental_Staff_Lightning</defName>
-							<label>make Elemental Lightning Crystal x5</label>
-							<description>Craft 5 Elemental Lightning Crystals.</description>
-							<jobString>Making Elemental Lightning Crystals.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>22</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Elemental_Staff_Lightning>5</Ammo_Elemental_Staff_Lightning>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Lightning_Punched.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Lightning_Punched.xml
deleted file mode 100644
index bffba38157..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Lightning_Punched.xml	
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoElementalStaff_Lightning_Punched</defName>
-							<label>Lightning Staff</label>
-							<parent>AmmoElementalStaff_Punched</parent>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Elemental_Staff_Lightning_Punched</defName>
-							<label>Empowered elemental lightning crystal set</label>
-							<ammoTypes>
-								<Ammo_Elemental_Staff_Lightning_Punched>Bullet_Elemental_Staff_Lightning_Punched</Ammo_Elemental_Staff_Lightning_Punched>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="ElementalStaffPunched">
-							<defName>Ammo_Elemental_Staff_Lightning_Punched</defName>
-							<label>Empowered Elemental Lightning Crystal</label>
-							<graphicData>
-								<texPath>ThirdParty/CoD Zombies Pack/Crystal_Lightning</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(255,200,200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>FullMetalJacket</ammoClass>
-							<cookOffProjectile>Bullet_Elemental_Staff_Lightning_Punched</cookOffProjectile>
-							<thingCategories>
-								<li>AmmoElementalStaff_Lightning_Punched</li>
-							</thingCategories>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef ParentName="PunchedElementalStaffBullet">
-							<defName>Bullet_Elemental_Staff_Lightning_Punched</defName>
-							<label>Empowered Lightning Projectile</label>
-							<graphicData>
-								<shaderType>TransparentPostLight</shaderType>
-								<color>(113, 4, 255)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Electrical</damageDef>
-								<pelletCount>2</pelletCount>
-								<damageAmountBase>1</damageAmountBase>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<spreadMult>10</spreadMult>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonder_Punched">
-							<defName>MakeAmmo_Elemental_Staff_Lightning_Punched</defName>
-							<label>make Empowered elemental lightning crystal x5</label>
-							<description>Craft 5 Empowered elemental lightning crystals.</description>
-							<jobString>Making Empowered elemental lightning crystals.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_Elemental_Staff_Lightning</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_Elemental_Staff_Lightning</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Elemental_Staff_Lightning_Punched>5</Ammo_Elemental_Staff_Lightning_Punched>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Wind.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Wind.xml
deleted file mode 100644
index 75f9c004a1..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Wind.xml	
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Wonder Weapons</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoElementalStaff_Wind</defName>
-							<label>Wind Staff</label>
-							<parent>AmmoElementalStaff</parent>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Elemental_Staff_Wind</defName>
-							<label>Elemental wind crystal set</label>
-							<ammoTypes>
-								<Ammo_Elemental_Staff_Wind>Bullet_Elemental_Staff_Wind</Ammo_Elemental_Staff_Wind>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="ElementalStaffBase">
-							<defName>Ammo_Elemental_Staff_Wind</defName>
-							<label>Elemental Wind Crystal</label>
-							<graphicData>
-								<texPath>ThirdParty/CoD Zombies Pack/Crystal_Wind</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>FullMetalJacket</ammoClass>
-							<cookOffProjectile>Bullet_Elemental_Staff_Wind</cookOffProjectile>
-							<thingCategories>
-								<li>AmmoElementalStaff_Wind</li>
-							</thingCategories>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef ParentName="BaseElementalStaffBullet">
-							<defName>Bullet_Elemental_Staff_Wind</defName>
-							<label>Wind Projectile</label>
-							<graphicData>
-								<color>(0, 255, 0)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>1</damageAmountBase>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonder">
-							<defName>MakeAmmo_Elemental_Staff_Wind</defName>
-							<label>make Elemental Wind Crystal x5</label>
-							<description>Craft 5 Elemental Wind Crystals.</description>
-							<jobString>Making Elemental Wind Crystals.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>22</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Elemental_Staff_Wind>5</Ammo_Elemental_Staff_Wind>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Wind_Punched.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Wind_Punched.xml
deleted file mode 100644
index 8f8053e31d..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Staffs/Staff of Wind_Punched.xml	
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoElementalStaff_Wind_Punched</defName>
-							<label>Wind Staff</label>
-							<parent>AmmoElementalStaff_Punched</parent>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Elemental_Staff_Wind_Punched</defName>
-							<label>Empowered elemental wind crystal set</label>
-							<ammoTypes>
-								<Ammo_Elemental_Staff_Wind_Punched>Bullet_Elemental_Staff_Wind_Punched</Ammo_Elemental_Staff_Wind_Punched>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="ElementalStaffPunched">
-							<defName>Ammo_Elemental_Staff_Wind_Punched</defName>
-							<label>Empowered Elemental Wind Crystal</label>
-							<graphicData>
-								<texPath>ThirdParty/CoD Zombies Pack/Crystal_Wind</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(200,255,200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>FullMetalJacket</ammoClass>
-							<cookOffProjectile>Bullet_Elemental_Staff_Wind_Punched</cookOffProjectile>
-							<thingCategories>
-								<li>AmmoElementalStaff_Wind_Punched</li>
-							</thingCategories>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef ParentName="PunchedElementalStaffBullet">
-							<defName>Bullet_Elemental_Staff_Wind_Punched</defName>
-							<label>Empowered Wind Projectile</label>
-							<graphicData>
-								<color>(0, 255, 0)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>1</damageAmountBase>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonder_Punched">
-							<defName>MakeAmmo_Elemental_Staff_Wind_Punched</defName>
-							<label>make Empowered elemental wind crystal x5</label>
-							<description>Craft 5 Empowered elemental wind crystals.</description>
-							<jobString>Making Empowered elemental wind crystals.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_Elemental_Staff_Wind</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_Elemental_Staff_Wind</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Elemental_Staff_Wind_Punched>5</Ammo_Elemental_Staff_Wind_Punched>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Thunders/Thunders.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Thunders/Thunders.xml
deleted file mode 100644
index 25003c7b03..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Thunders/Thunders.xml	
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Wonder Weapons</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoThunder</defName>
-							<label>Thunder</label>
-							<parent>AmmoWonders</parent>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Thunder</defName>
-							<label>Thundergun Ammo Set</label>
-							<ammoTypes>
-								<Ammo_Thunder>Bullet_Thunder</Ammo_Thunder>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="ThunderBase" ParentName="SmallAmmoBase" Abstract="True">
-							<statBases>
-								<Mass>0.2</Mass>
-								<Bulk>0.2</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="ThunderBase">
-							<defName>Ammo_Thunder</defName>
-							<label>Thundergun Cannister</label>
-							<description>A large compressed air cannister used for the Thundergun</description>
-							<graphicData>
-								<texPath>ThirdParty/CoD Zombies Pack/Thunder</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>FullMetalJacket</ammoClass>
-							<cookOffProjectile>Bullet_Thunder</cookOffProjectile>
-							<thingCategories>
-								<li>AmmoThunder</li>
-							</thingCategories>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef Name="ThunderBullet" ParentName="Base44MagnumBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/CodZP_ThunderShot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<dropsCasings>false</dropsCasings>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="ThunderBullet">
-							<defName>Bullet_Thunder</defName>
-							<label>Air Projectile</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationSharp>27</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.4</armorPenetrationBlunt>
-								<damageDef>CodZP_Stun_Bullet</damageDef>
-								<speed>300</speed>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonder">
-							<defName>MakeAmmo_Thunder</defName>
-							<label>make Thundergun Cannister x5</label>
-							<description>Craft 5 Thundergun Cannister.</description>
-							<jobString>Making Thundergun Cannister.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>22</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Thunder>5</Ammo_Thunder>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Thunders/Thunders_Punched.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Thunders/Thunders_Punched.xml
deleted file mode 100644
index ae56564e9e..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Thunders/Thunders_Punched.xml	
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoThunder_Punched</defName>
-							<label>Zeus Cannon</label>
-							<parent>AmmoWonders_Punched</parent>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Thunder_Punched</defName>
-							<label>Zeus Cannon Ammo set</label>
-							<ammoTypes>
-								<Ammo_Thunder_Punched>Bullet_Thunder_Punched</Ammo_Thunder_Punched>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="ThunderPunched" ParentName="SmallAmmoBase" Abstract="True">
-							<statBases>
-								<Mass>0.2</Mass>
-								<Bulk>0.2</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="ThunderPunched">
-							<defName>Ammo_Thunder_Punched</defName>
-							<label>ZeusCannon Cannister</label>
-							<description>A large compressed air cannister used for the Zeus Cannon</description>
-							<graphicData>
-								<texPath>ThirdParty/CoD Zombies Pack/Thunder</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(200, 200, 200)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>FullMetalJacket</ammoClass>
-							<cookOffProjectile>Bullet_Thunder_Punched</cookOffProjectile>
-							<thingCategories>
-								<li>AmmoThunder_Punched</li>
-							</thingCategories>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef ParentName="ThunderBullet">
-							<defName>Bullet_Thunder_Punched</defName>
-							<label>Air Projectile</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>40</damageAmountBase>
-								<armorPenetrationSharp>54</armorPenetrationSharp>
-								<armorPenetrationBlunt>8.8</armorPenetrationBlunt>
-								<damageDef>CodZP_Stun_Bullet</damageDef>
-								<speed>345</speed>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonder_Punched">
-							<defName>MakeAmmo_Thunder_Punched</defName>
-							<label>make Zeus Cannon Cannister x5</label>
-							<description>Craft 5 Zeus Cannon Cannisters.</description>
-							<jobString>Making Zeus Cannon Cannisters.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_Thunder</li>
-										</thingDefs>
-									</filter>
-									<count>50</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_Thunder</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Thunder_Punched>5</Ammo_Thunder_Punched>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Thunders/Tundra.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Thunders/Tundra.xml
deleted file mode 100644
index a3b8f477e7..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Thunders/Tundra.xml	
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Wonder Weapons</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoTundra</defName>
-							<label>Tundragun</label>
-							<parent>AmmoWonders</parent>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Tundra</defName>
-							<label>Tundra</label>
-							<ammoTypes>
-								<Ammo_Tundra>Bullet_Tundra</Ammo_Tundra>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="TundraBase" ParentName="SmallAmmoBase" Abstract="True">
-							<statBases>
-								<Mass>0.2</Mass>
-								<Bulk>0.2</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="TundraBase">
-							<defName>Ammo_Tundra</defName>
-							<label>Tundragun Cannister</label>
-							<description>A large compressed air cannister used for the Tundragun</description>
-							<graphicData>
-								<texPath>ThirdParty/CoD Zombies Pack/Tundra</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>FullMetalJacket</ammoClass>
-							<cookOffProjectile>Bullet_Tundra</cookOffProjectile>
-							<thingCategories>
-								<li>AmmoTundra</li>
-							</thingCategories>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef ParentName="ThunderBullet">
-							<defName>Bullet_Tundra</defName>
-							<label>Chilled Air Projectile</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationSharp>27</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.4</armorPenetrationBlunt>
-								<damageDef>CodZP_Frostbite</damageDef>
-								<speed>300</speed>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeAmmo">
-							<defName>MakeAmmo_Tundra</defName>
-							<label>make Tundragun Cannister x5</label>
-							<description>Craft 5 Tundragun Cannister.</description>
-							<jobString>Making Tundragun Cannister.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_Thunder</li>
-										</thingDefs>
-									</filter>
-									<count>5</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>5</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_Thunder</li>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Tundra>5</Ammo_Tundra>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Thunders/Tundra_Punched.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Thunders/Tundra_Punched.xml
deleted file mode 100644
index 7b5c0f81be..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Thunders/Tundra_Punched.xml	
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoTundra_Punched</defName>
-							<label>Boreas Blizzard</label>
-							<parent>AmmoWonders_Punched</parent>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Tundra_Punched</defName>
-							<label>Boreas Blizzard set</label>
-							<ammoTypes>
-								<Ammo_Tundra_Punched>Bullet_Tundra_Punched</Ammo_Tundra_Punched>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="TundraPunched" ParentName="SmallAmmoBase" Abstract="True">
-							<statBases>
-								<Mass>0.2</Mass>
-								<Bulk>0.2</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="TundraPunched">
-							<defName>Ammo_Tundra_Punched</defName>
-							<label>Boreas Blizzard Cannister</label>
-							<description>A large compressed air cannister used for the Boreas Blizzard</description>
-							<graphicData>
-								<texPath>ThirdParty/CoD Zombies Pack/Blizzard</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>FullMetalJacket</ammoClass>
-							<cookOffProjectile>Bullet_Tundra_Punched</cookOffProjectile>
-							<thingCategories>
-								<li>AmmoTundra_Punched</li>
-							</thingCategories>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef ParentName="ThunderBullet">
-							<defName>Bullet_Tundra_Punched</defName>
-							<label>Chilled Air Projectile</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>40</damageAmountBase>
-								<armorPenetrationSharp>54</armorPenetrationSharp>
-								<armorPenetrationBlunt>8.8</armorPenetrationBlunt>
-								<damageDef>CodZP_Frostbite</damageDef>
-								<speed>345</speed>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonderAmmo_Punched">
-							<defName>MakeAmmo_Tundra_Punched</defName>
-							<label>make Boreas Blizzard Cannister x5</label>
-							<description>Craft 5 Boreas Blizzard Cannister.</description>
-							<jobString>Making Boreas Blizzard Cannister.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_Tundra</li>
-										</thingDefs>
-									</filter>
-									<count>50</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_Tundra</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Tundra_Punched>5</Ammo_Tundra_Punched>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Winters/WintersHowl.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Winters/WintersHowl.xml
deleted file mode 100644
index 22f65d4175..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Winters/WintersHowl.xml	
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Wonder Weapons</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoWinters</defName>
-							<label>Winter's Howl</label>
-							<parent>AmmoWonders</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Winters</defName>
-							<label>Winter's Howl set</label>
-							<ammoTypes>
-								<Ammo_Winters_Cryo>Bullet_Winters_Cryo</Ammo_Winters_Cryo>
-							</ammoTypes>
-							<similarTo>AmmoSet_Pistol</similarTo>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="WintersBase" ParentName="SmallAmmoBase" Abstract="True">
-							<description>Pistol cartridge favoured for its above average stopping power.</description>
-							<statBases>
-								<Mass>0.02</Mass>
-								<Bulk>0.02</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoWinters</li>
-							</thingCategories>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="WintersBase">
-							<defName>Ammo_Winters_Cryo</defName>
-							<label>Winters cartridge</label>
-							<graphicData>
-								<texPath>Things/Ammo/Pistol/FMJ</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>FullMetalJacket</ammoClass>
-							<cookOffProjectile>Bullet_Winters_Cryo</cookOffProjectile>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef Name="BaseWintersBullet" ParentName="Base44MagnumBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/CodZP_StaffProjectile</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<dropsCasings>true</dropsCasings>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="BaseWintersBullet">
-							<defName>Bullet_Winters_Cryo</defName>
-							<label>Winters Howl bullet</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase>
-								<speed>54</speed>
-								<damageDef>CodZP_Frostbite</damageDef>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>10.860</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonder">
-							<defName>MakeAmmo_Winters_Cryo</defName>
-							<label>make Winter's Howl cartridge x75</label>
-							<description>Craft 75 Winter's Howl cartridges.</description>
-							<jobString>Making Winter's Howl cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>22</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Winters_Cryo>75</Ammo_Winters_Cryo>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Winters/WintersHowl_Punched.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Winters/WintersHowl_Punched.xml
deleted file mode 100644
index 61ed6fae8f..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Winters/WintersHowl_Punched.xml	
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoWinters_Punched</defName>
-							<label>Winter's Fury</label>
-							<parent>AmmoWonders_Punched</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Winters_Punched</defName>
-							<label>Winter's Fury set</label>
-							<ammoTypes>
-								<Ammo_Winters_Cryo_Punched>Bullet_Winters_Cryo_Punched</Ammo_Winters_Cryo_Punched>
-							</ammoTypes>
-							<similarTo>AmmoSet_Pistol</similarTo>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="WintersPunched" ParentName="SmallAmmoBase" Abstract="True">
-							<description>Pistol cartridge favoured for its above average stopping power.</description>
-							<statBases>
-								<Mass>0.02</Mass>
-								<Bulk>0.02</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoWinters_Punched</li>
-							</thingCategories>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="WintersPunched">
-							<defName>Ammo_Winters_Cryo_Punched</defName>
-							<label>Winter's Fury cartridge</label>
-							<graphicData>
-								<texPath>Things/Ammo/Pistol/FMJ</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>FullMetalJacket</ammoClass>
-							<cookOffProjectile>Bullet_Winters_Cryo_Punched</cookOffProjectile>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef ParentName="BaseWintersBullet">
-							<defName>Bullet_Winters_Cryo_Punched</defName>
-							<label>Winters Fury bullet</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>24</damageAmountBase>
-								<speed>66</speed>
-								<damageDef>CodZP_Frostbite</damageDef>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<armorPenetrationBlunt>21.720</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="AmmoRecipePunched">
-							<defName>MakeAmmo_Winters_Cryo_Punched</defName>
-							<label>make Winter's Fury cartridge x75</label>
-							<description>Craft 75 Winter's Fury cartridges.</description>
-							<jobString>Making Winter's Fury cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_Winters_Cryo</li>
-										</thingDefs>
-									</filter>
-									<count>300</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_Winters_Cryo</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Winters_Cryo_Punched>75</Ammo_Winters_Cryo_Punched>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Wunders/Wunders.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Wunders/Wunders.xml
deleted file mode 100644
index 1715de975b..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Wunders/Wunders.xml	
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Wonder Weapons</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoWunder</defName>
-							<label>Wunderwaffle</label>
-							<parent>AmmoWonders</parent>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Wunder</defName>
-							<label>Wunderwaffe DG-2 Ammo Set</label>
-							<ammoTypes>
-								<Ammo_Wunder>Bullet_Wunder</Ammo_Wunder>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef Name="WunderBullet" ParentName="Base44MagnumBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/CodZP_ShockBolt</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<dropsCasings>false</dropsCasings>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="WunderBullet">
-							<defName>Bullet_Wunder</defName>
-							<label>Wunder Electrical Volt</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>300</speed>
-								<damageDef>Electrical</damageDef>
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationSharp>27</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.4</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="WunderBase" ParentName="SmallAmmoBase" Abstract="True">
-							<statBases>
-								<Mass>0.2</Mass>
-								<Bulk>0.2</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="WunderBase">
-							<defName>Ammo_Wunder</defName>
-							<label>Wunderwaffe DG-2 Bulbs</label>
-							<description>A large compressed air Bulbs used for the Wundergun</description>
-							<graphicData>
-								<texPath>ThirdParty/CoD Zombies Pack/Wunder</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>FullMetalJacket</ammoClass>
-							<cookOffProjectile>Bullet_Wunder</cookOffProjectile>
-							<thingCategories>
-								<li>AmmoWunder</li>
-							</thingCategories>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonder">
-							<defName>MakeAmmo_Wunder</defName>
-							<label>make Wunderwaffe DG-2 Bulbs x20</label>
-							<description>Craft 20 Wunderwaffe DG-2 Bulbs.</description>
-							<jobString>Making Wunderwaffe DG-2 Bulbs.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>22</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Wunder>20</Ammo_Wunder>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Wunders/WundersS.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Wunders/WundersS.xml
deleted file mode 100644
index 5389afec63..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Wunders/WundersS.xml	
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Wonder Weapons</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoWunder_s</defName>
-							<label>DG-Scharfschutze</label>
-							<parent>AmmoWonders</parent>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Wunder_s</defName>
-							<label>DG-Scharfschutze Ammo Set</label>
-							<ammoTypes>
-								<Ammo_Wunder_s>Bullet_Wunder_s</Ammo_Wunder_s>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="Wunder_sBase" ParentName="SmallAmmoBase" Abstract="True">
-							<statBases>
-								<Mass>0.2</Mass>
-								<Bulk>0.2</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Wunder_sBase">
-							<defName>Ammo_Wunder_s</defName>
-							<label>DG-Scharfschutze Bulbs</label>
-							<description>Bulbs used for the DG-Scharfschutze</description>
-							<graphicData>
-								<texPath>ThirdParty/CoD Zombies Pack/Wunder</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>ExplosiveAP</ammoClass>
-							<cookOffProjectile>Bullet_Wunder_s</cookOffProjectile>
-							<thingCategories>
-								<li>AmmoWunder_s</li>
-							</thingCategories>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef ParentName="WunderBullet">
-							<defName>Bullet_Wunder_s</defName>
-							<label>Wunder Explosive Volt</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>300</speed>
-								<damageDef>Electrical</damageDef>
-								<damageAmountBase>10</damageAmountBase>
-								<armorPenetrationSharp>27</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.4</armorPenetrationBlunt>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>107</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>1</explosiveRadius>
-									<explosionSound>MortarBomb_Explode</explosionSound>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-							</comps>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeAmmo">
-							<defName>MakeAmmo_Wunder_s</defName>
-							<label>make DG-Scharfschutze Bulbs x5</label>
-							<description>Craft 5 DG-Scharfschutze Bulbs.</description>
-							<jobString>Making DG-Scharfschutze Bulbs.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>22</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Wunder_s>5</Ammo_Wunder_s>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Wunders/WundersS_Punched.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Wunders/WundersS_Punched.xml
deleted file mode 100644
index ad11f78eae..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Wunders/WundersS_Punched.xml	
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoWunder_s_Punched</defName>
-							<label>DG-Funkenschutze</label>
-							<parent>AmmoWonders_Punched</parent>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Wunder_s_Punched</defName>
-							<label>DG-Funkenschutze Ammo Set</label>
-							<ammoTypes>
-								<Ammo_Wunder_s_Punched>Bullet_Wunder_s_Punched</Ammo_Wunder_s_Punched>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="Wunder_sPunched" ParentName="SmallAmmoBase" Abstract="True">
-							<statBases>
-								<Mass>0.2</Mass>
-								<Bulk>0.2</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Wunder_sPunched">
-							<defName>Ammo_Wunder_s_Punched</defName>
-							<label>DG-Funkenschutze Bulbs</label>
-							<description>Bulbs used for the Funkenschutze</description>
-							<graphicData>
-								<texPath>ThirdParty/CoD Zombies Pack/Wunder</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>ExplosiveAP</ammoClass>
-							<cookOffProjectile>Bullet_Wunder_s_Punched</cookOffProjectile>
-							<thingCategories>
-								<li>AmmoWunder_s_Punched</li>
-							</thingCategories>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef ParentName="WunderBullet">
-							<defName>Bullet_Wunder_s_Punched</defName>
-							<label>Wunder Explosive Volt</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>345</speed>
-								<damageDef>Electrical</damageDef>
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationSharp>54</armorPenetrationSharp>
-								<armorPenetrationBlunt>8.8</armorPenetrationBlunt>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>214</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>1</explosiveRadius>
-									<explosionSound>MortarBomb_Explode</explosionSound>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-							</comps>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonderAmmo_Punched">
-							<defName>MakeAmmo_Wunder_s_Punched</defName>
-							<label>make DG-Scharfschutze Bulbs x5</label>
-							<description>Craft 5 DG-Funkenschutze Bulbs.</description>
-							<jobString>Making DG-Funkenschutze Bulbs.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_Wunder_s</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_Wunder_s</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Wunder_s_Punched>5</Ammo_Wunder_s_Punched>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Wunders/Wunders_Punched.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Wunders/Wunders_Punched.xml
deleted file mode 100644
index 3d971e231a..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Wunders/Wunders_Punched.xml	
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoWunder_Punched</defName>
-							<label>Wunderwaffe DG-3 JZ</label>
-							<parent>AmmoWonders_Punched</parent>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Wunder_Punched</defName>
-							<label>Wunderwaffe DG-3 JZ Ammo Set</label>
-							<ammoTypes>
-								<Ammo_Wunder_Punched>Bullet_Wunder_Punched</Ammo_Wunder_Punched>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="WunderPunched" ParentName="SmallAmmoBase" Abstract="True">
-							<statBases>
-								<Mass>0.2</Mass>
-								<Bulk>0.2</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="WunderPunched">
-							<defName>Ammo_Wunder_Punched</defName>
-							<label>Wunderwaffe DG-3 JZ Bulbs</label>
-							<description>A large compressed air Bulbs used for the Wundergun</description>
-							<graphicData>
-								<texPath>ThirdParty/CoD Zombies Pack/Wunder</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>FullMetalJacket</ammoClass>
-							<cookOffProjectile>Bullet_Wunder_Punched</cookOffProjectile>
-							<thingCategories>
-								<li>AmmoWunder_Punched</li>
-							</thingCategories>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef ParentName="WunderBullet">
-							<defName>Bullet_Wunder_Punched</defName>
-							<label>Wunder Electrical Volt</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>345</speed>
-								<damageDef>Electrical</damageDef>
-								<damageAmountBase>40</damageAmountBase>
-								<armorPenetrationSharp>54</armorPenetrationSharp>
-								<armorPenetrationBlunt>8.8</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonder_Punched">
-							<defName>MakeAmmo_Wunder_Punched</defName>
-							<label>make Wunderwaffe DG-3 JZ Bulbs x20</label>
-							<description>Craft 20 Wunderwaffe DG-3 JZ Bulbs.</description>
-							<jobString>Making Wunderwaffe DG-3 JZ Bulbs.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_Wunder</li>
-										</thingDefs>
-									</filter>
-									<count>80</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_Wunder</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Wunder_Punched>20</Ammo_Wunder_Punched>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Zaps/Waveguns.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Zaps/Waveguns.xml
deleted file mode 100644
index c540658b4f..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Zaps/Waveguns.xml	
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Wonder Weapons</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoWavegun</defName>
-							<label>Wavegun</label>
-							<parent>AmmoWonders</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Wavegun</defName>
-							<label>Wavegun</label>
-							<ammoTypes>
-								<Ammo_Wavegun>Bullet_Wavegun</Ammo_Wavegun>
-							</ammoTypes>
-							<similarTo>AmmoSet_Pistol</similarTo>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="WavegunBase" ParentName="SmallAmmoBase" Abstract="True">
-							<description>Pistol cartridge favoured for its above average stopping power.</description>
-							<statBases>
-								<Mass>0.02</Mass>
-								<Bulk>0.02</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoWavegun</li>
-							</thingCategories>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="WavegunBase">
-							<defName>Ammo_Wavegun</defName>
-							<label>Wavegun cartridge</label>
-							<graphicData>
-								<texPath>Things/Ammo/Pistol/FMJ</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>ExplosiveAP</ammoClass>
-							<cookOffProjectile>Bullet_Wavegun</cookOffProjectile>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef Name="BaseZapGun" ParentName="Base44MagnumBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/CodZP_ShockBolt</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>150</speed>
-								<dropsCasings>false</dropsCasings>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="BaseZapGun">
-							<defName>Bullet_Wavegun</defName>
-							<label>Wave Blast</label>
-							<graphicData>
-								<color>(167, 0, 207)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>10</damageAmountBase>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>107</damageAmountBase>
-									<explosiveDamageType>CodZP_WavegunPurpleBomb</explosiveDamageType>
-									<explosiveRadius>1</explosiveRadius>
-									<explosionSound>MortarBomb_Explode</explosionSound>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-							</comps>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonder">
-							<defName>MakeAmmo_Wavegun</defName>
-							<label>make Wavegun cartridge x500</label>
-							<description>Craft 500 Wavegun cartridges.</description>
-							<jobString>Making Wavegun cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>22</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Wavegun>500</Ammo_Wavegun>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Zaps/Waveguns_Punched.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Zaps/Waveguns_Punched.xml
deleted file mode 100644
index f5116bc4dc..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Zaps/Waveguns_Punched.xml	
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoWavegun_Punched</defName>
-							<label>Max Wavegun</label>
-							<parent>AmmoWonders_Punched</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Wavegun_Punched</defName>
-							<label>Max Wavegun Ammo Set</label>
-							<ammoTypes>
-								<Ammo_Wavegun_Punched>Bullet_Wavegun_Punched</Ammo_Wavegun_Punched>
-							</ammoTypes>
-							<similarTo>AmmoSet_Pistol</similarTo>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="WavegunPunched" ParentName="SmallAmmoBase" Abstract="True">
-							<description>Pistol cartridge favoured for its above average stopping power.</description>
-							<statBases>
-								<Mass>0.02</Mass>
-								<Bulk>0.02</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoWavegun_Punched</li>
-							</thingCategories>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="WavegunPunched">
-							<defName>Ammo_Wavegun_Punched</defName>
-							<label>Max Wavegun cartridge</label>
-							<graphicData>
-								<texPath>Things/Ammo/Pistol/FMJ</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>ExplosiveAP</ammoClass>
-							<cookOffProjectile>Bullet_Wavegun_Punched</cookOffProjectile>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef ParentName="BaseZapGun">
-							<defName>Bullet_Zapgun_Punched</defName>
-							<label>Purple Zap Bolt</label>
-							<graphicData>
-								<color>(167, 0, 207)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>180</speed>
-								<damageAmountBase>30</damageAmountBase>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonder_Punched">
-							<defName>MakeAmmo_Wavegun_Punched</defName>
-							<label>make Max Wavegun cartridge x500</label>
-							<description>Craft 500 Max Wavegun cartridges.</description>
-							<jobString>Making Max Wavegun cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>22</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Wavegun_Punched>500</Ammo_Wavegun_Punched>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Zaps/Zapgun Blue.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Zaps/Zapgun Blue.xml
deleted file mode 100644
index 3a3d934e18..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Zaps/Zapgun Blue.xml	
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Wonder Weapons</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoZapgun</defName>
-							<label>Zapgun</label>
-							<parent>AmmoWonders</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Zapgun_blue</defName>
-							<label>Blue Zapgun Ammo Set</label>
-							<ammoTypes>
-								<Ammo_Zapgun_blue>Bullet_Zapgun_blue</Ammo_Zapgun_blue>
-							</ammoTypes>
-							<similarTo>AmmoSet_Pistol</similarTo>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="ZapgunBase" ParentName="SmallAmmoBase" Abstract="True">
-							<description>Pistol cartridge favoured for its above average stopping power.</description>
-							<statBases>
-								<Mass>0.02</Mass>
-								<Bulk>0.02</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoZapgun</li>
-							</thingCategories>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="ZapgunBase">
-							<defName>Ammo_Zapgun_blue</defName>
-							<label>Blue Zapgun cartridge</label>
-							<graphicData>
-								<texPath>Things/Ammo/Pistol/FMJ</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>FullMetalJacket</ammoClass>
-							<cookOffProjectile>Bullet_Zapgun_blue</cookOffProjectile>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef ParentName="BaseZapGun">
-							<defName>Bullet_Zapgun_blue</defName>
-							<label>Blue Zap Bolt</label>
-							<graphicData>
-								<color>(68, 85, 206)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>15</damageAmountBase>
-								<armorPenetrationSharp>5</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonder">
-							<defName>MakeAmmo_Zapgun_blue</defName>
-							<label>make Blue Zapgun cartridge x500</label>
-							<description>Craft 500 Blue Zapgun cartridges.</description>
-							<jobString>Making Blue Zapgun cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>22</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Zapgun_blue>500</Ammo_Zapgun_blue>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Zaps/Zapgun Red.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Zaps/Zapgun Red.xml
deleted file mode 100644
index 7f2b417ee2..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Zaps/Zapgun Red.xml	
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Wonder Weapons</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Zapgun_red</defName>
-							<label>Red Zapgun Ammo Set</label>
-							<ammoTypes>
-								<Ammo_Zapgun_red>Bullet_Zapgun_red</Ammo_Zapgun_red>
-							</ammoTypes>
-							<similarTo>AmmoSet_Pistol</similarTo>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="ZapgunBase">
-							<defName>Ammo_Zapgun_red</defName>
-							<label>Red Zapgun Cartridge</label>
-							<graphicData>
-								<texPath>Things/Ammo/Pistol/FMJ</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>FullMetalJacket</ammoClass>
-							<cookOffProjectile>Bullet_Zapgun_red</cookOffProjectile>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef ParentName="BaseZapGun">
-							<defName>Bullet_Zapgun_red</defName>
-							<label>Red Zap Bolt</label>
-							<graphicData>
-								<color>(209, 39, 74)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>15</damageAmountBase>
-								<armorPenetrationSharp>5</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonder">
-							<defName>MakeAmmo_Zapgun_red</defName>
-							<label>make Red Zapgun cartridge x500</label>
-							<description>Craft 500 Red Zapgun cartridges.</description>
-							<jobString>Making Red Zapgun cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>22</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Zapgun_red>500</Ammo_Zapgun_red>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Ammo/Zaps/Zapguns Punched.xml b/Patches/Call of Duty - Zombies Pack/Ammo/Zaps/Zapguns Punched.xml
deleted file mode 100644
index 415090d45c..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Ammo/Zaps/Zapguns Punched.xml	
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoZapgun_Punched</defName>
-							<label>Porter's X2 Zapgun</label>
-							<parent>AmmoWonders_Punched</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
-						</ThingCategoryDef>
-						<!-- ==================== AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Zapgun_Punched</defName>
-							<label>Porter's X2 Zapgun Ammo Set</label>
-							<ammoTypes>
-								<Ammo_Zapgun_Punched>Bullet_Zapgun_Punched</Ammo_Zapgun_Punched>
-							</ammoTypes>
-							<similarTo>AmmoSet_Pistol</similarTo>
-						</CombatExtended.AmmoSetDef>
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="ZapgunPunched" ParentName="SmallAmmoBase" Abstract="True">
-							<description>A electrical battery that is used for both the blue and red zap guns</description>
-							<statBases>
-								<Mass>0.02</Mass>
-								<Bulk>0.02</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoZapgun_Punched</li>
-							</thingCategories>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="ZapgunPunched">
-							<defName>Ammo_Zapgun_Punched</defName>
-							<label>Porter's X2 Zapgun cartridge</label>
-							<graphicData>
-								<texPath>Things/Ammo/Pistol/FMJ</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>FullMetalJacket</ammoClass>
-							<cookOffProjectile>Bullet_Zapgun_Punched</cookOffProjectile>
-						</ThingDef>
-						<!-- ==================== Projectiles ========================== -->
-						<ThingDef ParentName="BaseZapGun">
-							<defName>Bullet_Wavegun_Punched</defName>
-							<label>Max Wave Blast</label>
-							<graphicData>
-								<color>(255,31,31)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationSharp>5</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>214</damageAmountBase>
-									<explosiveDamageType>CodZP_RaygunRedBomb</explosiveDamageType>
-									<explosiveRadius>1.9</explosiveRadius>
-									<explosionSound>MortarBomb_Explode</explosionSound>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-							</comps>
-						</ThingDef>
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="CODZP_AmmoRecipeWonder_Punched">
-							<defName>MakeAmmo_Zapgun_Punched</defName>
-							<label>make Porter's X2 Zapgun cartridge x500</label>
-							<description>Craft 500 Porter's X2 Zapgun cartridges.</description>
-							<jobString>Making Porter's X2 Zapgun cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>22</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Zapgun_Punched>500</Ammo_Zapgun_Punched>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/MysteryBox.xml b/Patches/Call of Duty - Zombies Pack/MysteryBox.xml
deleted file mode 100644
index 2ab0ce6cef..0000000000
--- a/Patches/Call of Duty - Zombies Pack/MysteryBox.xml	
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Mystery Box</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/MysteryBoxFrameWork.ItemReplacerDef[defName="Replacer_RandomWeapons"]/producedItems/Gun_SmokeLauncher</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/MysteryBoxFrameWork.ItemReplacerDef[defName="Replacer_RandomWeapons"]/producedItems/Gun_EmpLauncher</xpath>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Punched Wonders.xml b/Patches/Call of Duty - Zombies Pack/Punched Wonders.xml
deleted file mode 100644
index d45f39726e..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Punched Wonders.xml	
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<RecipeDef Name="CODZP_AmmoRecipeWonder_Punched" ParentName="AmmoRecipeBase" Abstract="true">
-							<researchPrerequisites>
-								<li>CodZP_WonderWorks</li>
-								<li>CodZP_PackAPunch</li>
-							</researchPrerequisites>
-						</RecipeDef>
-
-						<RecipeDef Name="CODZP_AmmoRecipeWonderAmmo_Punched" ParentName="AmmoRecipeBase" Abstract="true">
-							<researchPrerequisites>
-								<li>CodZP_AmmoMatic</li>
-								<li>CodZP_PackAPunch</li>
-							</researchPrerequisites>
-						</RecipeDef>
-
-						<ThingCategoryDef>
-							<defName>AmmoWonders_Punched</defName>
-							<label>Wonder</label>
-							<parent>AmmoPunched</parent>
-						</ThingCategoryDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Punched.xml b/Patches/Call of Duty - Zombies Pack/Punched.xml
deleted file mode 100644
index 113cfcc25f..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Punched.xml	
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Pack A Punch</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<RecipeDef Name="AmmoRecipePunched" ParentName="AmmoRecipeBase" Abstract="true">
-							<researchPrerequisite>
-								<li>CodZP_PackAPunch</li>
-							</researchPrerequisite>
-						</RecipeDef>
-
-						<ThingCategoryDef>
-							<defName>AmmoPunched</defName>
-							<label>Pack a Punched</label>
-							<parent>Ammo</parent>
-						</ThingCategoryDef>
-
-						<ThingCategoryDef>
-							<defName>AmmoAdvanced_Punched</defName>
-							<label>advanced</label>
-							<parent>AmmoPunched</parent>
-						</ThingCategoryDef>
-
-						<ThingCategoryDef>
-							<defName>AmmoPistols_Punched</defName>
-							<label>pistol</label>
-							<parent>AmmoPunched</parent>
-						</ThingCategoryDef>
-
-						<ThingCategoryDef>
-							<defName>AmmoRifles_Punched</defName>
-							<label>rifle</label>
-							<parent>AmmoPunched</parent>
-						</ThingCategoryDef>
-
-						<ThingCategoryDef>
-							<defName>AmmoShotguns_Punched</defName>
-							<label>shotgun</label>
-							<parent>AmmoPunched</parent>
-						</ThingCategoryDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Weapons/Base-Persona.xml b/Patches/Call of Duty - Zombies Pack/Weapons/Base-Persona.xml
deleted file mode 100644
index d342731a37..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Weapons/Base-Persona.xml	
+++ /dev/null
@@ -1,604 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationFindMod">
-					<mods>
-						<li>Persona Bond Forge</li>
-					</mods>
-					<match Class="PatchOperationSequence">
-						<operations>
-							<!-- tools -->
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[
-									defName="CodZP_Gun_Revolver-Persona" or
-									defName="CodZP_Gun_Autopistol-Persona" or
-									defName="CodZP_Gun_MachinePistol-Persona" or
-									defName="CodZP_Gun_HeavySMG-Persona" or
-									defName="CodZP_Gun_AssaultRifle-Persona"]/tools </xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>grip</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>12</power>
-											<cooldownTime>2</cooldownTime>
-											<chanceFactor>1.5</chanceFactor>
-											<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-											<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>barrel</label>
-											<capacities>
-												<li>Blunt</li>
-												<li>Poke</li>
-											</capacities>
-											<power>3</power>
-											<cooldownTime>2</cooldownTime>
-											<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-											<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-										</li>
-									</tools>
-								</value>
-							</li>
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[
-									defName="CodZP_Gun_IncendiaryLauncher-Persona" or
-									defName="CodZP_Gun_BoltActionRifle-Persona" or
-									defName="CodZP_Gun_PumpShotgun-Persona" or
-									defName="CodZP_Gun_ChainShotgun-Persona" or
-									defName="CodZP_Gun_LMG-Persona" or
-									defName="CodZP_Gun_SniperRifle-Persona" or
-									defName="CodZP_Gun_ChargeRifle-Persona"]/tools </xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>stock</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>12</power>
-											<cooldownTime>2</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>12</power>
-											<cooldownTime>2</cooldownTime>
-											<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
-											<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-										</li>
-									</tools>
-								</value>
-							</li>
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[
-									defName="CodZP_Gun_Minigun-Persona"]/tools </xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>barrel</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>15</power>
-											<cooldownTime>2</cooldownTime>
-											<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
-											<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-										</li>
-									</tools>
-								</value>
-							</li>
-							<!--Pistols-->
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>CodZP_Gun_Revolver-Persona</defName>
-								<statBases>
-									<Mass>1.39</Mass>
-									<RangedWeapon_Cooldown>0.31</RangedWeapon_Cooldown>
-									<SightsEfficiency>0.93</SightsEfficiency>
-									<ShotSpread>0.13</ShotSpread>
-									<SwayFactor>0.9</SwayFactor>
-									<Bulk>2.1</Bulk>
-								</statBases>
-								<Properties>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_44Magnum_FMJ_Punched</defaultProjectile>
-									<warmupTime>0.49</warmupTime>
-									<range>17</range>
-									<soundCast>CodZP_Shot_PAP</soundCast>
-									<soundCastTail>GunTail_Light</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<AmmoUser>
-									<magazineSize>12</magazineSize>
-									<reloadTime>2.94</reloadTime>
-									<ammoSet>AmmoSet_44Magnum_Punched</ammoSet>
-								</AmmoUser>
-								<FireModes>
-									<aiUseBurstMode>FALSE</aiUseBurstMode>
-								</FireModes>
-								<weaponTags>
-									<li>CE_Sidearm</li>
-									<li>CE_AI_BROOM</li>
-									<li>CE_OneHandedWeapon</li>
-								</weaponTags>
-							</li>
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>CodZP_Gun_Autopistol-Persona</defName>
-								<statBases>
-									<Mass>1.11</Mass>
-									<RangedWeapon_Cooldown>0.24</RangedWeapon_Cooldown>
-									<SightsEfficiency>0.93</SightsEfficiency>
-									<ShotSpread>0.12</ShotSpread>
-									<SwayFactor>0.8</SwayFactor>
-									<Bulk>2.10</Bulk>
-								</statBases>
-								<Properties>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_45ACP_FMJ_Punched</defaultProjectile>
-									<warmupTime>0.49</warmupTime>
-									<range>17</range>
-									<soundCast>CodZP_Shot_PAP</soundCast>
-									<soundCastTail>GunTail_Light</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<AmmoUser>
-									<magazineSize>15</magazineSize>
-									<reloadTime>2.56</reloadTime>
-									<ammoSet>AmmoSet_45ACP_Punched</ammoSet>
-								</AmmoUser>
-								<FireModes>
-									<aiUseBurstMode>FALSE</aiUseBurstMode>
-								</FireModes>
-								<weaponTags>
-									<li>CE_Sidearm</li>
-									<li>CE_AI_BROOM</li>
-									<li>CE_OneHandedWeapon</li>
-								</weaponTags>
-							</li>
-
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>CodZP_Gun_MachinePistol-Persona</defName>
-								<statBases>
-									<Mass>2.84</Mass>
-									<RangedWeapon_Cooldown>0.23</RangedWeapon_Cooldown>
-									<SightsEfficiency>0.93</SightsEfficiency>
-									<ShotSpread>0.12</ShotSpread>
-									<SwayFactor>1.4</SwayFactor>
-									<Bulk>2.95</Bulk>
-								</statBases>
-								<Properties>
-									<recoilAmount>1.3</recoilAmount>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_45ACP_FMJ_Punched</defaultProjectile>
-									<warmupTime>0.49</warmupTime>
-									<range>17</range>
-									<burstShotCount>6</burstShotCount>
-									<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-									<soundCast>CodZP_Shot_PAP</soundCast>
-									<soundCastTail>GunTail_Light</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<AmmoUser>
-									<magazineSize>45</magazineSize>
-									<reloadTime>2.56</reloadTime>
-									<ammoSet>AmmoSet_45ACP_Punched</ammoSet>
-								</AmmoUser>
-								<FireModes>
-									<aimedBurstShotCount>2</aimedBurstShotCount>
-									<aiUseBurstMode>FALSE</aiUseBurstMode>
-								</FireModes>
-								<weaponTags>
-									<li>CE_SMG</li>
-									<li>CE_AI_BROOM</li>
-									<li>CE_OneHandedWeapon</li>
-								</weaponTags>
-							</li>
-							<!--Launchers-->
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>CodZP_Gun_IncendiaryLauncher-Persona</defName>
-								<statBases>
-									<Mass>8</Mass>
-									<RangedWeapon_Cooldown>0.28</RangedWeapon_Cooldown>
-									<SightsEfficiency>1.32</SightsEfficiency>
-									<ShotSpread>0.11</ShotSpread>
-									<SwayFactor>1.3</SwayFactor>
-									<Bulk>10</Bulk>
-								</statBases>
-								<Properties>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_30x64mmFuel_Incendiary_Punched</defaultProjectile>
-									<warmupTime>0.89</warmupTime>
-									<range>58</range>
-									<burstShotCount>3</burstShotCount>
-									<soundCast>Shot_IncendiaryLauncher</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>14</muzzleFlashScale>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-								</Properties>
-								<AmmoUser>
-									<magazineSize>9</magazineSize>
-									<reloadTime>2.56</reloadTime>
-									<ammoSet>AmmoSet_30x64mmFuel_Punched</ammoSet>
-								</AmmoUser>
-								<FireModes>
-									<aiUseBurstMode>FALSE</aiUseBurstMode>
-									<aiAimMode>SuppressFire</aiAimMode>
-								</FireModes>
-								<weaponTags>
-									<li>CE_AI_AOE</li>
-									<li>EliteGun</li>
-								</weaponTags>
-								<AllowWithRunAndGun>false</AllowWithRunAndGun>
-							</li>
-							<!-- Remove Smoke and EMP Launchers -->
-							<li Class="PatchOperationRemove">
-								<xpath>Defs/ThingDef[defName="CodZP_Gun_SmokeLauncher-Persona"]</xpath>
-							</li>
-
-							<li Class="PatchOperationRemove">
-								<xpath>Defs/RecipeDef[defName="CodZP_make_BondPAPSmokeLauncher"]</xpath>
-							</li>
-
-							<li Class="PatchOperationRemove">
-								<xpath>Defs/ThingDef[defName="CodZP_Gun_EmpLauncher-Persona"]</xpath>
-							</li>
-
-							<li Class="PatchOperationRemove">
-								<xpath>Defs/RecipeDef[defName="CodZP_make_BondPAPEMPLauncher"]</xpath>
-							</li>
-							<!--Snipers-->
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>CodZP_Gun_BoltActionRifle-Persona</defName>
-								<statBases>
-									<Mass>4.19</Mass>
-									<RangedWeapon_Cooldown>0.75</RangedWeapon_Cooldown>
-									<SightsEfficiency>1.32</SightsEfficiency>
-									<ShotSpread>0.01</ShotSpread>
-									<SwayFactor>1.2</SwayFactor>
-									<Bulk>12.60</Bulk>
-								</statBases>
-								<Properties>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_303British_FMJ_Punched</defaultProjectile>
-									<warmupTime>0.89</warmupTime>
-									<range>79</range>
-									<soundCast>CodZP_Shot_PAP</soundCast>
-									<soundCastTail>GunTail_Heavy</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<AmmoUser>
-									<magazineSize>10</magazineSize>
-									<reloadTime>2.75</reloadTime>
-									<ammoSet>AmmoSet_303British_Punched</ammoSet>
-								</AmmoUser>
-								<FireModes>
-									<aiAimMode>AimedShot</aiAimMode>
-								</FireModes>
-								<weaponTags>
-									<li>CE_AI_SR</li>
-								</weaponTags>
-								<AllowWithRunAndGun>false</AllowWithRunAndGun>
-							</li>
-
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>CodZP_Gun_SniperRifle-Persona</defName>
-								<statBases>
-									<Mass>7.30</Mass>
-									<RangedWeapon_Cooldown>0.87</RangedWeapon_Cooldown>
-									<SightsEfficiency>3.44</SightsEfficiency>
-									<ShotSpread>0.04</ShotSpread>
-									<SwayFactor>1.0</SwayFactor>
-									<Bulk>11.92</Bulk>
-								</statBases>
-								<Properties>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_762x51mmNATO_FMJ_Punched</defaultProjectile>
-									<warmupTime>1.46</warmupTime>
-									<range>108</range>
-									<soundCast>CodZP_Shot_PAP</soundCast>
-									<soundCastTail>GunTail_Heavy</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<AmmoUser>
-									<magazineSize>10</magazineSize>
-									<reloadTime>2.56</reloadTime>
-									<ammoSet>AmmoSet_762x51mmNATO_Punched</ammoSet>
-								</AmmoUser>
-								<FireModes>
-									<aiAimMode>AimedShot</aiAimMode>
-								</FireModes>
-								<weaponTags>
-									<li>CE_AI_SR</li>
-									<li>Bipod_DMR</li>
-								</weaponTags>
-								<AllowWithRunAndGun>false</AllowWithRunAndGun>
-							</li>
-							<!--Shotguns-->
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>CodZP_Gun_PumpShotgun-Persona</defName>
-								<statBases>
-									<Mass>3.00</Mass>
-									<RangedWeapon_Cooldown>0.64</RangedWeapon_Cooldown>
-									<SightsEfficiency>0.19</SightsEfficiency>
-									<ShotSpread>0.87</ShotSpread>
-									<SwayFactor>6.5</SwayFactor>
-									<Bulk>9.0</Bulk>
-								</statBases>
-								<Properties>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_12Gauge_Buck_Punched</defaultProjectile>
-									<warmupTime>0.49</warmupTime>
-									<range>23</range>
-									<soundCast>CodZP_Shot_PAP</soundCast>
-									<soundCastTail>GunTail_Heavy</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<AmmoUser>
-									<magazineSize>15</magazineSize>
-									<reloadOneAtATime>true</reloadOneAtATime>
-									<reloadTime>0.54</reloadTime>
-									<ammoSet>AmmoSet_12Gauge_Punched</ammoSet>
-								</AmmoUser>
-								<FireModes />
-								<weaponTags>
-									<li>CE_AI_BROOM</li>
-								</weaponTags>
-							</li>
-
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>CodZP_Gun_ChainShotgun-Persona</defName>
-								<statBases>
-									<Mass>3.50</Mass>
-									<RangedWeapon_Cooldown>0.25</RangedWeapon_Cooldown>
-									<SightsEfficiency>1.32</SightsEfficiency>
-									<ShotSpread>0.11</ShotSpread>
-									<SwayFactor>0.9</SwayFactor>
-									<Bulk>6.7</Bulk>
-								</statBases>
-								<Properties>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_12Gauge_Buck_Punched</defaultProjectile>
-									<warmupTime>0.49</warmupTime>
-									<range>23</range>
-									<soundCast>CodZP_Shot_PAP</soundCast>
-									<soundCastTail>GunTail_Heavy</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-									<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
-								</Properties>
-								<AmmoUser>
-									<magazineSize>20</magazineSize>
-									<reloadTime>2.56</reloadTime>
-									<ammoSet>AmmoSet_12Gauge_Punched</ammoSet>
-								</AmmoUser>
-								<FireModes />
-								<weaponTags>
-									<li>CE_AI_BROOM</li>
-								</weaponTags>
-							</li>
-							<!--Misc-->
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>CodZP_Gun_HeavySMG-Persona</defName>
-								<statBases>
-									<Mass>2.50</Mass>
-									<RangedWeapon_Cooldown>0.24</RangedWeapon_Cooldown>
-									<SightsEfficiency>1.32</SightsEfficiency>
-									<ShotSpread>0.10</ShotSpread>
-									<SwayFactor>0.70</SwayFactor>
-									<Bulk>4.50</Bulk>
-								</statBases>
-								<Properties>
-									<recoilAmount>1.5</recoilAmount>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_45ACP_FMJ_Punched</defaultProjectile>
-									<warmupTime>0.49</warmupTime>
-									<range>36</range>
-									<burstShotCount>6</burstShotCount>
-									<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-									<soundCast>CodZP_Shot_PAP</soundCast>
-									<soundCastTail>GunTail_Heavy</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<AmmoUser>
-									<magazineSize>50</magazineSize>
-									<reloadTime>2.56</reloadTime>
-									<ammoSet>AmmoSet_45ACP_Punched</ammoSet>
-								</AmmoUser>
-								<FireModes>
-									<aimedBurstShotCount>6</aimedBurstShotCount>
-									<aiUseBurstMode>FALSE</aiUseBurstMode>
-								</FireModes>
-								<weaponTags>
-									<li>CE_SMG</li>
-									<li>CE_AI_BROOM</li>
-								</weaponTags>
-							</li>
-
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>CodZP_Gun_LMG-Persona</defName>
-								<statBases>
-									<Mass>9.12</Mass>
-									<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-									<SightsEfficiency>1.32</SightsEfficiency>
-									<ShotSpread>0.04</ShotSpread>
-									<SwayFactor>1.1</SwayFactor>
-									<Bulk>14.7</Bulk>
-								</statBases>
-								<Properties>
-									<recoilAmount>1.0</recoilAmount>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_762x54mmR_FMJ_Punched</defaultProjectile>
-									<warmupTime>1.05</warmupTime>
-									<range>89</range>
-									<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-									<burstShotCount>10</burstShotCount>
-									<soundCast>CodZP_Shot_PAP</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<recoilPattern>Mounted</recoilPattern>
-								</Properties>
-								<AmmoUser>
-									<magazineSize>100</magazineSize>
-									<reloadTime>3.14</reloadTime>
-									<ammoSet>AmmoSet_762x54mmR_Punched</ammoSet>
-								</AmmoUser>
-								<FireModes>
-									<aimedBurstShotCount>10</aimedBurstShotCount>
-									<aiUseBurstMode>FALSE</aiUseBurstMode>
-									<aiAimMode>SuppressFire</aiAimMode>
-								</FireModes>
-								<weaponTags>
-									<li>CE_MachineGun</li>
-									<li>CE_AI_LMG</li>
-									<li>Bipod_LMG</li>
-								</weaponTags>
-								<AllowWithRunAndGun>false</AllowWithRunAndGun>
-							</li>
-
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>CodZP_Gun_AssaultRifle-Persona</defName>
-								<statBases>
-									<Mass>3.26</Mass>
-									<RangedWeapon_Cooldown>0.23</RangedWeapon_Cooldown>
-									<SightsEfficiency>1.32</SightsEfficiency>
-									<ShotSpread>0.05</ShotSpread>
-									<SwayFactor>1.0</SwayFactor>
-									<Bulk>10.03</Bulk>
-								</statBases>
-								<Properties>
-									<recoilAmount>1.10</recoilAmount>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_556x45mmNATO_FMJ_Punched</defaultProjectile>
-									<warmupTime>0.89</warmupTime>
-									<range>79</range>
-									<burstShotCount>6</burstShotCount>
-									<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-									<soundCast>CodZP_Shot_PAP</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<AmmoUser>
-									<magazineSize>60</magazineSize>
-									<reloadTime>2.56</reloadTime>
-									<ammoSet>AmmoSet_556x45mmNATO_Punched</ammoSet>
-								</AmmoUser>
-								<FireModes>
-									<aimedBurstShotCount>2</aimedBurstShotCount>
-									<aiUseBurstMode>TRUE</aiUseBurstMode>
-									<aiAimMode>AimedShot</aiAimMode>
-								</FireModes>
-								<weaponTags>
-									<li>CE_AI_AR</li>
-								</weaponTags>
-							</li>
-
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>CodZP_Gun_Minigun-Persona</defName>
-								<statBases>
-									<Mass>30.00</Mass>
-									<RangedWeapon_Cooldown>0.22</RangedWeapon_Cooldown>
-									<SightsEfficiency>1.32</SightsEfficiency>
-									<ShotSpread>0.04</ShotSpread>
-									<SwayFactor>3.9</SwayFactor>
-									<Bulk>10</Bulk>
-								</statBases>
-								<Properties>
-									<recoilAmount>0.5</recoilAmount>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_762x51mmNATO_FMJ_Punched</defaultProjectile>
-									<warmupTime>1.86</warmupTime>
-									<range>81</range>
-									<burstShotCount>100</burstShotCount>
-									<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-									<soundCast>CodZP_Shot_PAP</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<AmmoUser>
-									<magazineSize>500</magazineSize>
-									<reloadTime>5.89</reloadTime>
-									<ammoSet>AmmoSet_762x51mmNATO_Punched</ammoSet>
-								</AmmoUser>
-								<FireModes>
-									<aiAimMode>SuppressFire</aiAimMode>
-									<aimedBurstShotCount>50</aimedBurstShotCount>
-								</FireModes>
-								<weaponTags>
-									<li>CE_AI_Suppressive</li>
-									<li>GunMinigun</li>
-								</weaponTags>
-							</li>
-
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>CodZP_Gun_ChargeRifle-Persona</defName>
-								<statBases>
-									<Mass>3.0</Mass>
-									<RangedWeapon_Cooldown>0.23</RangedWeapon_Cooldown>
-									<SightsEfficiency>1.45</SightsEfficiency>
-									<ShotSpread>0.06</ShotSpread>
-									<SwayFactor>0.9</SwayFactor>
-									<Bulk>7.00</Bulk>
-								</statBases>
-								<Properties>
-									<recoilAmount>1.1</recoilAmount>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_6x24mmCharged_Punched</defaultProjectile>
-									<warmupTime>0.81</warmupTime>
-									<range>79</range>
-									<burstShotCount>6</burstShotCount>
-									<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-									<soundCast>CodZP_Shot_PAP</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<AmmoUser>
-									<magazineSize>60</magazineSize>
-									<reloadTime>2.56</reloadTime>
-									<ammoSet>AmmoSet_6x24mmCharged_Punched</ammoSet>
-								</AmmoUser>
-								<FireModes>
-									<aimedBurstShotCount>3</aimedBurstShotCount>
-									<aiUseBurstMode>TRUE</aiUseBurstMode>
-									<aiAimMode>AimedShot</aiAimMode>
-								</FireModes>
-								<weaponTags>
-									<li>CE_AI_AR</li>
-								</weaponTags>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Weapons/Base.xml b/Patches/Call of Duty - Zombies Pack/Weapons/Base.xml
deleted file mode 100644
index c279d09d1a..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Weapons/Base.xml	
+++ /dev/null
@@ -1,588 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Pack A Punch</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!--tools-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="CodZP_Gun_Revolver-PAP" or
-						defName="CodZP_Gun_Autopistol-PAP" or
-						defName="CodZP_Gun_MachinePistol-PAP" or
-						defName="CodZP_Gun_HeavySMG-PAP" or
-						defName="CodZP_Gun_AssaultRifle-PAP"]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="CodZP_Gun_IncendiaryLauncher-PAP" or
-						defName="CodZP_Gun_BoltActionRifle-PAP" or
-						defName="CodZP_Gun_PumpShotgun-PAP" or
-						defName="CodZP_Gun_ChainShotgun-PAP" or
-						defName="CodZP_Gun_LMG-PAP" or
-						defName="CodZP_Gun_SniperRifle-PAP" or
-						defName="CodZP_Gun_ChargeRifle-PAP"]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</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>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="CodZP_Gun_Minigun-PAP"]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!--Pistols-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_Revolver-PAP</defName>
-					<statBases>
-						<Mass>1.39</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.81</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.1</SwayFactor>
-						<Bulk>2.1</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_44Magnum_FMJ_Punched</defaultProjectile>
-						<warmupTime>0.54</warmupTime>
-						<range>14</range>
-						<soundCast>CodZP_Shot_PAP</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>3.68</reloadTime>
-						<ammoSet>AmmoSet_44Magnum_Punched</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_BROOM</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_Autopistol-PAP</defName>
-					<statBases>
-						<Mass>1.11</Mass>
-						<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.81</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>0.9</SwayFactor>
-						<Bulk>2.10</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ_Punched</defaultProjectile>
-						<warmupTime>0.54</warmupTime>
-						<range>14</range>
-						<soundCast>CodZP_Shot_PAP</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>3.2</reloadTime>
-						<ammoSet>AmmoSet_45ACP_Punched</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_BROOM</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_MachinePistol-PAP</defName>
-					<statBases>
-						<Mass>2.84</Mass>
-						<RangedWeapon_Cooldown>0.29</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.81</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.64</SwayFactor>
-						<Bulk>2.95</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.49</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ_Punched</defaultProjectile>
-						<warmupTime>0.54</warmupTime>
-						<range>14</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<soundCast>CodZP_Shot_PAP</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>45</magazineSize>
-						<reloadTime>3.2</reloadTime>
-						<ammoSet>AmmoSet_45ACP_Punched</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_BROOM</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-				<!--Launchers-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_IncendiaryLauncher-PAP</defName>
-					<statBases>
-						<Mass>8</Mass>
-						<RangedWeapon_Cooldown>0.34</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.15</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.53</SwayFactor>
-						<Bulk>10</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_30x64mmFuel_Incendiary_Punched</defaultProjectile>
-						<warmupTime>0.99</warmupTime>
-						<range>48</range>
-						<burstShotCount>3</burstShotCount>
-						<soundCast>Shot_IncendiaryLauncher</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>9</magazineSize>
-						<reloadTime>3.2</reloadTime>
-						<ammoSet>AmmoSet_30x64mmFuel_Punched</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AOE</li>
-						<li>EliteGun</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-				<!-- Remove Smoke and EMP Launchers -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CodZP_Gun_SmokeLauncher-PAP"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CodZP_Gun_EmpLauncher-PAP"]</xpath>
-				</li>
-				<!--Snipers-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_BoltActionRifle-PAP</defName>
-					<statBases>
-						<Mass>4.19</Mass>
-						<RangedWeapon_Cooldown>0.94</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.15</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1.43</SwayFactor>
-						<Bulk>12.60</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_303British_FMJ_Punched</defaultProjectile>
-						<warmupTime>0.99</warmupTime>
-						<range>66</range>
-						<soundCast>CodZP_Shot_PAP</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>3.44</reloadTime>
-						<ammoSet>AmmoSet_303British_Punched</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_SR</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_SniperRifle-PAP</defName>
-					<statBases>
-						<Mass>7.30</Mass>
-						<RangedWeapon_Cooldown>1.09</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.99</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.15</SwayFactor>
-						<Bulk>11.92</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ_Punched</defaultProjectile>
-						<warmupTime>1.62</warmupTime>
-						<range>90</range>
-						<soundCast>CodZP_Shot_PAP</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>3.2</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO_Punched</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_SR</li>
-						<li>Bipod_DMR</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-				<!--Shotguns-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_PumpShotgun-PAP</defName>
-					<statBases>
-						<Mass>3.00</Mass>
-						<RangedWeapon_Cooldown>0.8</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.16</SightsEfficiency>
-						<ShotSpread>1.02</ShotSpread>
-						<SwayFactor>7.65</SwayFactor>
-						<Bulk>9.0</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck_Punched</defaultProjectile>
-						<warmupTime>0.54</warmupTime>
-						<range>19</range>
-						<soundCast>CodZP_Shot_PAP</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>0.68</reloadTime>
-						<ammoSet>AmmoSet_12Gauge_Punched</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_ChainShotgun-PAP</defName>
-					<statBases>
-						<Mass>3.50</Mass>
-						<RangedWeapon_Cooldown>0.31</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.15</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.07</SwayFactor>
-						<Bulk>6.7</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck_Punched</defaultProjectile>
-						<warmupTime>0.54</warmupTime>
-						<range>19</range>
-						<soundCast>CodZP_Shot_PAP</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>3.2</reloadTime>
-						<ammoSet>AmmoSet_12Gauge_Punched</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-				<!--Misc-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_HeavySMG-PAP</defName>
-					<statBases>
-						<Mass>2.50</Mass>
-						<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.15</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>0.80</SwayFactor>
-						<Bulk>4.50</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.77</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ_Punched</defaultProjectile>
-						<warmupTime>0.54</warmupTime>
-						<range>30</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>CodZP_Shot_PAP</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>3.2</reloadTime>
-						<ammoSet>AmmoSet_45ACP_Punched</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>6</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_LMG-PAP</defName>
-					<statBases>
-						<Mass>9.12</Mass>
-						<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.15</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.30</SwayFactor>
-						<Bulk>14.7</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.12</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ_Punched</defaultProjectile>
-						<warmupTime>1.17</warmupTime>
-						<range>74</range>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>CodZP_Shot_PAP</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>3.92</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR_Punched</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>10</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_MachineGun</li>
-						<li>CE_AI_LMG</li>
-						<li>Bipod_LMG</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_AssaultRifle-PAP</defName>
-					<statBases>
-						<Mass>3.26</Mass>
-						<RangedWeapon_Cooldown>0.29</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.15</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.13</SwayFactor>
-						<Bulk>10.03</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.30</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ_Punched</defaultProjectile>
-						<warmupTime>0.99</warmupTime>
-						<range>66</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<soundCast>CodZP_Shot_PAP</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>60</magazineSize>
-						<reloadTime>3.2</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO_Punched</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AR</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_Minigun-PAP</defName>
-					<statBases>
-						<Mass>30.00</Mass>
-						<RangedWeapon_Cooldown>0.28</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.15</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>4.6</SwayFactor>
-						<Bulk>10</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.64</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ_Punched</defaultProjectile>
-						<warmupTime>2.07</warmupTime>
-						<range>67</range>
-						<burstShotCount>100</burstShotCount>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<soundCast>CodZP_Shot_PAP</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>500</magazineSize>
-						<reloadTime>7.36</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO_Punched</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>50</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Suppressive</li>
-						<li>GunMinigun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_ChargeRifle-PAP</defName>
-					<statBases>
-						<Mass>3.0</Mass>
-						<RangedWeapon_Cooldown>0.29</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.27</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.02</SwayFactor>
-						<Bulk>7.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.28</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x24mmCharged_Punched</defaultProjectile>
-						<warmupTime>0.9</warmupTime>
-						<range>66</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>CodZP_Shot_PAP</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>60</magazineSize>
-						<reloadTime>3.2</reloadTime>
-						<ammoSet>AmmoSet_6x24mmCharged_Punched</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AR</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Weapons/Melee-Persona.xml b/Patches/Call of Duty - Zombies Pack/Weapons/Melee-Persona.xml
deleted file mode 100644
index ecf60fe040..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Weapons/Melee-Persona.xml	
+++ /dev/null
@@ -1,297 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationFindMod">
-					<mods>
-						<li>Persona Bond Forge</li>
-					</mods>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<!--Mono Sword-->
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_MonoSword-Persona"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>handle</label>
-											<capacities>
-												<li>Poke</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>1.5</cooldownTime>
-											<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-											<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>edge</label>
-											<capacities>
-												<li>Cut</li>
-											</capacities>
-											<power>35</power>
-											<cooldownTime>0.83</cooldownTime>
-											<chanceFactor>1.33</chanceFactor>
-											<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
-											<armorPenetrationSharp>18</armorPenetrationSharp>
-											<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>point</label>
-											<capacities>
-												<li>Stab</li>
-											</capacities>
-											<power>16</power>
-											<cooldownTime>0.94</cooldownTime>
-											<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
-											<armorPenetrationSharp>25</armorPenetrationSharp>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_MonoSword-Persona"]/statBases</xpath>
-								<value>
-									<Bulk>4</Bulk>
-									<MeleeCounterParryBonus>0.40</MeleeCounterParryBonus>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_MonoSword-Persona"]</xpath>
-								<value>
-									<equippedStatOffsets>
-										<MeleeCritChance>1.00</MeleeCritChance>
-										<MeleeParryChance>0.40</MeleeParryChance>
-										<MeleeDodgeChance>0.27</MeleeDodgeChance>
-									</equippedStatOffsets>
-								</value>
-							</li>
-
-							<!--Zeus hammer-->
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_Zeushammer-Persona"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>handle</label>
-											<capacities>
-												<li>Poke</li>
-											</capacities>
-											<power>4</power>
-											<cooldownTime>1.78</cooldownTime>
-											<chanceFactor>0.10</chanceFactor>
-											<armorPenetrationBlunt>1.000</armorPenetrationBlunt>
-											<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>41</power>
-											<extraMeleeDamages>
-												<li>
-													<def>EMP</def>
-													<amount>5</amount>
-												</li>
-											</extraMeleeDamages>
-											<cooldownTime>2.76</cooldownTime>
-											<armorPenetrationBlunt>157.5</armorPenetrationBlunt>
-											<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-											<chanceFactor>0.30</chanceFactor>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_Zeushammer-Persona"]/statBases</xpath>
-								<value>
-									<Bulk>8</Bulk>
-									<MeleeCounterParryBonus>0.40</MeleeCounterParryBonus>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_Zeushammer-Persona"]</xpath>
-								<value>
-									<equippedStatOffsets>
-										<MeleeCritChance>1.50</MeleeCritChance>
-										<MeleeParryChance>0.30</MeleeParryChance>
-										<MeleeDodgeChance>0.30</MeleeDodgeChance>
-									</equippedStatOffsets>
-								</value>
-							</li>
-							<!--Plasma Sword-->
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_PlasmaSword-Persona"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>handle</label>
-											<capacities>
-												<li>Poke</li>
-											</capacities>
-											<power>3</power>
-											<cooldownTime>1.69</cooldownTime>
-											<chanceFactor>0.10</chanceFactor>
-											<armorPenetrationBlunt>0.80</armorPenetrationBlunt>
-											<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>edge</label>
-											<capacities>
-												<li>Cut</li>
-											</capacities>
-											<power>47</power>
-											<extraMeleeDamages>
-												<li>
-													<def>Flame</def>
-													<amount>5</amount>
-													<chance>0.3</chance>
-												</li>
-											</extraMeleeDamages>
-											<cooldownTime>1.17</cooldownTime>
-											<chanceFactor>0.66</chanceFactor>
-											<armorPenetrationBlunt>4.06</armorPenetrationBlunt>
-											<armorPenetrationSharp>24</armorPenetrationSharp>
-											<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>point</label>
-											<capacities>
-												<li>Stab</li>
-											</capacities>
-											<power>25</power>
-											<extraMeleeDamages>
-												<li>
-													<def>Flame</def>
-													<amount>3</amount>
-													<chance>0.2</chance>
-												</li>
-											</extraMeleeDamages>
-											<cooldownTime>1.05</cooldownTime>
-											<armorPenetrationBlunt>2.048</armorPenetrationBlunt>
-											<armorPenetrationSharp>32</armorPenetrationSharp>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_PlasmaSword-Persona"]/statBases</xpath>
-								<value>
-									<Bulk>8.5</Bulk>
-									<MeleeCounterParryBonus>0.80</MeleeCounterParryBonus>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_PlasmaSword-Persona"]</xpath>
-								<value>
-									<equippedStatOffsets>
-										<MeleeCritChance>1.00</MeleeCritChance>
-										<MeleeParryChance>0.60</MeleeParryChance>
-										<MeleeDodgeChance>0.40</MeleeDodgeChance>
-									</equippedStatOffsets>
-								</value>
-							</li>
-
-							<!--Spork-->
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_Spoon-PAP"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>handle</label>
-											<capacities>
-												<li>Poke</li>
-											</capacities>
-											<power>3</power>
-											<cooldownTime>1.5</cooldownTime>
-											<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-											<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>edge</label>
-											<capacities>
-												<li>Cut</li>
-											</capacities>
-											<power>50</power>
-											<cooldownTime>0.83</cooldownTime>
-											<chanceFactor>1.33</chanceFactor>
-											<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
-											<armorPenetrationSharp>18</armorPenetrationSharp>
-											<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>point</label>
-											<capacities>
-												<li>Stab</li>
-											</capacities>
-											<power>24</power>
-											<cooldownTime>0.94</cooldownTime>
-											<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
-											<armorPenetrationSharp>25</armorPenetrationSharp>
-										</li>
-									</tools>
-								</value>
-							</li>
-							<li Class="PatchOperationConditional">
-								<xpath>Defs/ThingDef[defName = "CodZP_MeleeWeapon_Spoon-Persona"]/statBases</xpath>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/ThingDef[defName = "CodZP_MeleeWeapon_Spoon-Persona"]</xpath>
-									<value>
-										<statBases />
-									</value>
-								</nomatch>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_Spoon-Persona"]/statBases</xpath>
-								<value>
-									<Bulk>1</Bulk>
-									<MeleeCounterParryBonus>0.60</MeleeCounterParryBonus>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_Spoon-Persona"]</xpath>
-								<value>
-									<equippedStatOffsets>
-										<MeleeCritChance>1.30</MeleeCritChance>
-										<MeleeParryChance>0.60</MeleeParryChance>
-										<MeleeDodgeChance>0.42</MeleeDodgeChance>
-									</equippedStatOffsets>
-								</value>
-							</li>
-
-							<li Class="PatchOperationConditional">
-								<xpath>Defs/ThingDef[defName = "CodZP_MeleeWeapon_Spoon-Persona"]/weaponTags</xpath>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/ThingDef[defName = "CodZP_MeleeWeapon_Spoon-Persona"]</xpath>
-									<value>
-										<weaponTags />
-									</value>
-								</nomatch>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_Spoon-Persona"]/weaponTags</xpath>
-								<value>
-									<li>CE_OneHandedWeapon</li>
-								</value>
-							</li>
-						</operations>
-					</match>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Weapons/Melee.xml b/Patches/Call of Duty - Zombies Pack/Weapons/Melee.xml
deleted file mode 100644
index 13cf8a66e6..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Weapons/Melee.xml	
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Wonder Weapons></li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!--Spoon-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_Spoon"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>0.83</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>0.94</cooldownTime>
-								<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
-								<armorPenetrationSharp>25</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "CodZP_MeleeWeapon_Spoon"]/statBases</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "CodZP_MeleeWeapon_Spoon"]</xpath>
-						<value>
-							<statBases />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_Spoon"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<MeleeCounterParryBonus>0.40</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_Spoon"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.00</MeleeCritChance>
-							<MeleeParryChance>0.40</MeleeParryChance>
-							<MeleeDodgeChance>0.27</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "CodZP_MeleeWeapon_Spoon"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "CodZP_MeleeWeapon_Spoon"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_Spoon"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Weapons/Melee_Punched.xml b/Patches/Call of Duty - Zombies Pack/Weapons/Melee_Punched.xml
deleted file mode 100644
index 2675f82917..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Weapons/Melee_Punched.xml	
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!--Spork-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_Spoon-PAP"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>0.83</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>0.94</cooldownTime>
-								<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
-								<armorPenetrationSharp>25</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "CodZP_MeleeWeapon_Spoon-PAP"]/statBases</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "CodZP_MeleeWeapon_Spoon-PAP"]</xpath>
-						<value>
-							<statBases />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_Spoon-PAP"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<MeleeCounterParryBonus>0.40</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_Spoon-PAP"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.00</MeleeCritChance>
-							<MeleeParryChance>0.40</MeleeParryChance>
-							<MeleeDodgeChance>0.27</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "CodZP_MeleeWeapon_Spoon-PAP"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "CodZP_MeleeWeapon_Spoon-PAP"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_Spoon-PAP"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Weapons/Melee_Royalty.xml b/Patches/Call of Duty - Zombies Pack/Weapons/Melee_Royalty.xml
deleted file mode 100644
index cab5262bbd..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Weapons/Melee_Royalty.xml	
+++ /dev/null
@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Pack A Punch</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationFindMod">
-					<mods>
-						<li>Royalty</li>
-					</mods>
-					<match Class="PatchOperationSequence">
-						<operations>
-							<!--===== Start of Patch =====-->
-							<!--Mono Sword-->
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_MonoSword"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>handle</label>
-											<capacities>
-												<li>Poke</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>1.5</cooldownTime>
-											<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-											<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>edge</label>
-											<capacities>
-												<li>Cut</li>
-											</capacities>
-											<power>35</power>
-											<cooldownTime>0.83</cooldownTime>
-											<chanceFactor>1.33</chanceFactor>
-											<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
-											<armorPenetrationSharp>18</armorPenetrationSharp>
-											<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>point</label>
-											<capacities>
-												<li>Stab</li>
-											</capacities>
-											<power>16</power>
-											<cooldownTime>0.94</cooldownTime>
-											<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
-											<armorPenetrationSharp>25</armorPenetrationSharp>
-										</li>
-									</tools>
-								</value>
-							</li>
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_MonoSword"]/statBases</xpath>
-								<value>
-									<Bulk>4</Bulk>
-									<MeleeCounterParryBonus>0.40</MeleeCounterParryBonus>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_MonoSword"]</xpath>
-								<value>
-									<equippedStatOffsets>
-										<MeleeCritChance>1.00</MeleeCritChance>
-										<MeleeParryChance>0.40</MeleeParryChance>
-										<MeleeDodgeChance>0.27</MeleeDodgeChance>
-									</equippedStatOffsets>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_MonoSword"]/weaponTags</xpath>
-								<value>
-									<li>CE_OneHandedWeapon</li>
-								</value>
-							</li>
-							<!--Zeus hammer-->
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_Zeushammer"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>handle</label>
-											<capacities>
-												<li>Poke</li>
-											</capacities>
-											<power>4</power>
-											<cooldownTime>1.78</cooldownTime>
-											<chanceFactor>0.10</chanceFactor>
-											<armorPenetrationBlunt>1.000</armorPenetrationBlunt>
-											<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>41</power>
-											<extraMeleeDamages>
-												<li>
-													<def>EMP</def>
-													<amount>5</amount>
-												</li>
-											</extraMeleeDamages>
-											<cooldownTime>2.76</cooldownTime>
-											<armorPenetrationBlunt>157.5</armorPenetrationBlunt>
-											<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-											<chanceFactor>0.30</chanceFactor>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_Zeushammer"]/statBases</xpath>
-								<value>
-									<Bulk>8</Bulk>
-									<MeleeCounterParryBonus>0.40</MeleeCounterParryBonus>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_Zeushammer"]</xpath>
-								<value>
-									<equippedStatOffsets>
-										<MeleeCritChance>1.50</MeleeCritChance>
-										<MeleeParryChance>0.30</MeleeParryChance>
-										<MeleeDodgeChance>0.30</MeleeDodgeChance>
-									</equippedStatOffsets>
-								</value>
-							</li>
-							<!--Plasma Sword-->
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_PlasmaSword"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>handle</label>
-											<capacities>
-												<li>Poke</li>
-											</capacities>
-											<power>3</power>
-											<cooldownTime>1.69</cooldownTime>
-											<chanceFactor>0.10</chanceFactor>
-											<armorPenetrationBlunt>0.80</armorPenetrationBlunt>
-											<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>edge</label>
-											<capacities>
-												<li>Cut</li>
-											</capacities>
-											<power>47</power>
-											<extraMeleeDamages>
-												<li>
-													<def>Flame</def>
-													<amount>5</amount>
-													<chance>0.3</chance>
-												</li>
-											</extraMeleeDamages>
-											<cooldownTime>1.17</cooldownTime>
-											<chanceFactor>0.66</chanceFactor>
-											<armorPenetrationBlunt>4.06</armorPenetrationBlunt>
-											<armorPenetrationSharp>24</armorPenetrationSharp>
-											<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>point</label>
-											<capacities>
-												<li>Stab</li>
-											</capacities>
-											<power>25</power>
-											<extraMeleeDamages>
-												<li>
-													<def>Flame</def>
-													<amount>3</amount>
-													<chance>0.2</chance>
-												</li>
-											</extraMeleeDamages>
-											<cooldownTime>1.05</cooldownTime>
-											<armorPenetrationBlunt>2.048</armorPenetrationBlunt>
-											<armorPenetrationSharp>32</armorPenetrationSharp>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_PlasmaSword"]/statBases</xpath>
-								<value>
-									<Bulk>8.5</Bulk>
-									<MeleeCounterParryBonus>0.80</MeleeCounterParryBonus>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="CodZP_MeleeWeapon_PlasmaSword"]</xpath>
-								<value>
-									<equippedStatOffsets>
-										<MeleeCritChance>1.00</MeleeCritChance>
-										<MeleeParryChance>0.60</MeleeParryChance>
-										<MeleeDodgeChance>0.40</MeleeDodgeChance>
-									</equippedStatOffsets>
-								</value>
-							</li>
-							<!--===== End of Patch =====-->
-						</operations>
-					</match>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Weapons/Wonder-Persona.xml b/Patches/Call of Duty - Zombies Pack/Weapons/Wonder-Persona.xml
deleted file mode 100644
index bf205b7fbd..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Weapons/Wonder-Persona.xml	
+++ /dev/null
@@ -1,884 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationFindMod">
-					<mods>
-						<li>Persona Bond Forge</li>
-					</mods>
-					<match Class="PatchOperationSequence">
-						<operations>
-							<!--Tools-->
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[
-									defName="CodZP_Gun_RayGun-Persona" or
-									defName="CodZP_Gun_RayGunMkThree-Persona" or
-									defName="CODZP_Gun_Zapgun_Red-Persona" or
-									defName="CODZP_Gun_Zapgun_Blue-Persona" or
-									defName="CodZP_Gun_WintersHowl-Persona" or
-									defName="CodZP_Gun_GKZ-Persona"]/tools </xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>grip</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>12</power>
-											<cooldownTime>2</cooldownTime>
-											<chanceFactor>1.5</chanceFactor>
-											<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-											<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>barrel</label>
-											<capacities>
-												<li>Blunt</li>
-												<li>Poke</li>
-											</capacities>
-											<power>3</power>
-											<cooldownTime>2</cooldownTime>
-											<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-											<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-										</li>
-									</tools>
-								</value>
-							</li>
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[
-									defName="CodZP_Gun_Blundergat-Persona" or
-									defName="CodZP_Gun_Acidgat-Persona" or
-									defName="CodZP_Gun_Magmagat-Persona" or
-									defName="CodZP_Gun_RayGunMkTwo-Persona" or
-									defName="CodZP_Gun_RayGunMkTwo-V-Persona" or
-									defName="CodZP_Gun_RayGunMkTwo-X-Persona" or
-									defName="CodZP_Gun_RayGunMkTwo-Y-Persona" or
-									defName="CodZP_Gun_RayGunMkTwo-Z-Persona" or
-									defName="CodZP_Gun_Wunderwaffe-Persona" or
-									defName="CodZP_Gun_Wunderwaffe_Scharf-Persona" or
-									defName="CodZP_Gun_Wavegun-Persona"]/tools </xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>stock</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>12</power>
-											<cooldownTime>2</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>12</power>
-											<cooldownTime>2</cooldownTime>
-											<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
-											<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-										</li>
-									</tools>
-								</value>
-							</li>
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[
-									defName="CodZP_Gun_Thundergun-Persona" or
-									defName="CodZP_Gun_Tundragun-Persona"]/tools </xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>barrel</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>15</power>
-											<cooldownTime>2</cooldownTime>
-											<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
-											<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-										</li>
-									</tools>
-								</value>
-							</li>
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[
-									defName="CodZP_Gun_Staff-Ice-Persona" or
-									defName="CodZP_Gun_Staff-Wind-Persona" or
-									defName="CodZP_Gun_Staff-Fire-Persona" or
-									defName="CodZP_Gun_Staff-Lightning-Persona"]/tools </xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>Sekhmet's Vigor</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>12</power>
-											<cooldownTime>1</cooldownTime>
-											<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
-											<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-										</li>
-									</tools>
-								</value>
-							</li>
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="CodZP_Hells_Retriever-Persona"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>Retriever's Cinder</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>60</power>
-											<cooldownTime>9</cooldownTime>
-											<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
-											<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-										</li>
-									</tools>
-								</value>
-							</li>
-							<!--Wonder Weapons-->
-							<!--Blunders-->
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>CodZP_Gun_Blundergat-Persona</defName>
-								<statBases>
-									<Mass>3.94</Mass>
-									<RangedWeapon_Cooldown>0.23</RangedWeapon_Cooldown>
-									<SightsEfficiency>1.06</SightsEfficiency>
-									<ShotSpread>0.10</ShotSpread>
-									<SwayFactor>1.1</SwayFactor>
-									<Bulk>10.92</Bulk>
-								</statBases>
-								<Properties>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_Blundergat_Buck_Punched</defaultProjectile>
-									<warmupTime>0.49</warmupTime>
-									<range>36</range>
-									<soundCast>CodZP_Shot_Blundergat</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<AmmoUser>
-									<magazineSize>2</magazineSize>
-									<reloadOneAtATime>true</reloadOneAtATime>
-									<reloadTime>1.6</reloadTime>
-									<ammoSet>AmmoSet_Blundergat_Punched</ammoSet>
-								</AmmoUser>
-								<FireModes />
-								<weaponTags>
-									<li>CE_AI_BROOM</li>
-								</weaponTags>
-							</li>
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>CodZP_Gun_Acidgat-Persona</defName>
-								<statBases>
-									<Mass>3.94</Mass>
-									<RangedWeapon_Cooldown>0.23</RangedWeapon_Cooldown>
-									<SightsEfficiency>1.06</SightsEfficiency>
-									<ShotSpread>0.10</ShotSpread>
-									<SwayFactor>1.1</SwayFactor>
-									<Bulk>10.92</Bulk>
-								</statBases>
-								<Properties>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_Acidgat_Buck_Punched</defaultProjectile>
-									<warmupTime>0.49</warmupTime>
-									<range>36</range>
-									<soundCast>CodZP_Shot_Blundergat</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<AmmoUser>
-									<magazineSize>2</magazineSize>
-									<reloadOneAtATime>true</reloadOneAtATime>
-									<reloadTime>1.6</reloadTime>
-									<ammoSet>AmmoSet_Acidgat_Punched</ammoSet>
-								</AmmoUser>
-								<FireModes />
-								<weaponTags>
-									<li>CE_AI_BROOM</li>
-								</weaponTags>
-							</li>
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>CodZP_Gun_Magmagat-Persona</defName>
-								<statBases>
-									<Mass>3.94</Mass>
-									<RangedWeapon_Cooldown>0.23</RangedWeapon_Cooldown>
-									<SightsEfficiency>1.06</SightsEfficiency>
-									<ShotSpread>0.10</ShotSpread>
-									<SwayFactor>1.1</SwayFactor>
-									<Bulk>10.92</Bulk>
-								</statBases>
-								<Properties>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_Magmagat_Buck_Punched</defaultProjectile>
-									<warmupTime>0.49</warmupTime>
-									<range>36</range>
-									<soundCast>CodZP_Shot_Blundergat</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<AmmoUser>
-									<magazineSize>2</magazineSize>
-									<reloadOneAtATime>true</reloadOneAtATime>
-									<reloadTime>1.6</reloadTime>
-									<ammoSet>AmmoSet_Magmagat_Punched</ammoSet>
-								</AmmoUser>
-								<FireModes />
-								<weaponTags>
-									<li>CE_AI_BROOM</li>
-								</weaponTags>
-							</li>
-							<!--Elemental Staffs-->
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>CodZP_Gun_Staff-Ice-Persona</defName>
-								<statBases>
-									<Mass>8</Mass>
-									<RangedWeapon_Cooldown>0.74</RangedWeapon_Cooldown>
-									<SightsEfficiency>1.06</SightsEfficiency>
-									<ShotSpread>0.14</ShotSpread>
-									<SwayFactor>1.5</SwayFactor>
-									<Bulk>13</Bulk>
-								</statBases>
-								<Properties>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_Elemental_Staff_Ice_Punched</defaultProjectile>
-									<warmupTime>2.11</warmupTime>
-									<range>29</range>
-									<soundCast>Shot_ChargeBlaster</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<AmmoUser>
-									<magazineSize>9</magazineSize>
-									<reloadTime>1.6</reloadTime>
-									<ammoSet>AmmoSet_Elemental_Staff_Ice_Punched</ammoSet>
-								</AmmoUser>
-								<FireModes />
-							</li>
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>CodZP_Gun_Staff-Wind-Persona</defName>
-								<statBases>
-									<Mass>8</Mass>
-									<RangedWeapon_Cooldown>0.74</RangedWeapon_Cooldown>
-									<SightsEfficiency>1.06</SightsEfficiency>
-									<ShotSpread>0.14</ShotSpread>
-									<SwayFactor>1.5</SwayFactor>
-									<Bulk>13</Bulk>
-								</statBases>
-								<Properties>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_Elemental_Staff_Wind_Punched</defaultProjectile>
-									<warmupTime>2.11</warmupTime>
-									<range>29</range>
-									<soundCast>Shot_ChargeBlaster</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<AmmoUser>
-									<magazineSize>6</magazineSize>
-									<reloadTime>1.6</reloadTime>
-									<ammoSet>AmmoSet_Elemental_Staff_Wind_Punched</ammoSet>
-								</AmmoUser>
-								<FireModes />
-							</li>
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>CodZP_Gun_Staff-Fire-Persona</defName>
-								<statBases>
-									<Mass>8</Mass>
-									<RangedWeapon_Cooldown>0.74</RangedWeapon_Cooldown>
-									<SightsEfficiency>1.06</SightsEfficiency>
-									<ShotSpread>0.14</ShotSpread>
-									<SwayFactor>1.5</SwayFactor>
-									<Bulk>13</Bulk>
-								</statBases>
-								<Properties>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_Elemental_Staff_Fire_Punched</defaultProjectile>
-									<warmupTime>2.11</warmupTime>
-									<range>29</range>
-									<soundCast>Shot_ChargeBlaster</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<AmmoUser>
-									<magazineSize>9</magazineSize>
-									<reloadTime>1.6</reloadTime>
-									<ammoSet>AmmoSet_Elemental_Staff_Fire_Punched</ammoSet>
-								</AmmoUser>
-								<FireModes />
-							</li>
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>CodZP_Gun_Staff-Lightning-Persona</defName>
-								<statBases>
-									<Mass>8</Mass>
-									<RangedWeapon_Cooldown>0.74</RangedWeapon_Cooldown>
-									<SightsEfficiency>1.06</SightsEfficiency>
-									<ShotSpread>0.14</ShotSpread>
-									<SwayFactor>1.5</SwayFactor>
-									<Bulk>13</Bulk>
-								</statBases>
-								<Properties>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_Elemental_Staff_Lightning_Punched</defaultProjectile>
-									<warmupTime>2.11</warmupTime>
-									<range>29</range>
-									<soundCast>Shot_ChargeBlaster</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<AmmoUser>
-									<magazineSize>18</magazineSize>
-									<reloadTime>1.6</reloadTime>
-									<ammoSet>AmmoSet_Elemental_Staff_Lightning_Punched</ammoSet>
-								</AmmoUser>
-								<FireModes />
-							</li>
-							<!--Hells-->
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>CodZP_Hells_Retriever-Persona</defName>
-								<statBases>
-									<Mass>2</Mass>
-									<RangedWeapon_Cooldown>8</RangedWeapon_Cooldown>
-									<SightsEfficiency>0.66</SightsEfficiency>
-									<ShotSpread>0.14</ShotSpread>
-									<SwayFactor>0.6</SwayFactor>
-									<Bulk>0.5</Bulk>
-								</statBases>
-								<Properties>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_Hells_Retriever_Punched</defaultProjectile>
-									<warmupTime>0.16</warmupTime>
-									<range>66</range>
-									<soundCast>CodZP_Shot_Hells</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<FireModes />
-								<weaponTags>
-									<li>CE_OneHandedWeapon</li>
-									<li>CE_AI_Pistol</li>
-								</weaponTags>
-							</li>
-							<!--Ray Guns-->
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>CodZP_Gun_RayGun-Persona</defName>
-								<statBases>
-									<Mass>1.36</Mass>
-									<RangedWeapon_Cooldown>0.24</RangedWeapon_Cooldown>
-									<SightsEfficiency>0.66</SightsEfficiency>
-									<ShotSpread>0.12</ShotSpread>
-									<SwayFactor>1.2</SwayFactor>
-									<Bulk>3</Bulk>
-								</statBases>
-								<Properties>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_Raygun_Punched</defaultProjectile>
-									<warmupTime>0.49</warmupTime>
-									<range>79</range>
-									<soundCast>CodZP_Shot_Raygun</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<AmmoUser>
-									<magazineSize>40</magazineSize>
-									<reloadTime>1.92</reloadTime>
-									<ammoSet>AmmoSet_Raygun_Punched</ammoSet>
-								</AmmoUser>
-								<FireModes />
-								<weaponTags>
-									<li>CE_OneHandedWeapon</li>
-									<li>CE_AI_Pistol</li>
-								</weaponTags>
-							</li>
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>CodZP_Gun_RayGunMkTwo-Persona</defName>
-								<statBases>
-									<Mass>3.45</Mass>
-									<RangedWeapon_Cooldown>0.23</RangedWeapon_Cooldown>
-									<SightsEfficiency>1.45</SightsEfficiency>
-									<ShotSpread>0.08</ShotSpread>
-									<SwayFactor>0.9</SwayFactor>
-									<Bulk>10.03</Bulk>
-								</statBases>
-								<Properties>
-									<recoilAmount>1.0</recoilAmount>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_Raygun_two_Punched</defaultProjectile>
-									<warmupTime>0.81</warmupTime>
-									<range>79</range>
-									<soundCast>CodZP_Shot_Raygun2</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-									<burstShotCount>3</burstShotCount>
-									<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-								</Properties>
-								<AmmoUser>
-									<magazineSize>42</magazineSize>
-									<reloadTime>1.91</reloadTime>
-									<ammoSet>AmmoSet_Raygun_two_Punched</ammoSet>
-								</AmmoUser>
-								<FireModes>
-									<aimedBurstShotCount>3</aimedBurstShotCount>
-								</FireModes>
-								<weaponTags>
-								</weaponTags>
-							</li>
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>CodZP_Gun_RayGunMkThree-Persona</defName>
-								<statBases>
-									<Mass>1.36</Mass>
-									<RangedWeapon_Cooldown>0.23</RangedWeapon_Cooldown>
-									<SightsEfficiency>0.66</SightsEfficiency>
-									<ShotSpread>0.1</ShotSpread>
-									<SwayFactor>1.7</SwayFactor>
-									<Bulk>3</Bulk>
-								</statBases>
-								<Properties>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_Raygun_three_Punched</defaultProjectile>
-									<warmupTime>0.49</warmupTime>
-									<range>108</range>
-									<soundCast>CodZP_Shot_Raygun</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<AmmoUser>
-									<magazineSize>30</magazineSize>
-									<reloadTime>1.92</reloadTime>
-									<ammoSet>AmmoSet_Raygun_three_Punched</ammoSet>
-								</AmmoUser>
-								<FireModes />
-								<weaponTags>
-									<li>CE_OneHandedWeapon</li>
-									<li>CE_AI_Pistol</li>
-								</weaponTags>
-							</li>
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>CodZP_Gun_GKZ-Persona</defName>
-								<statBases>
-									<Mass>2.67</Mass>
-									<RangedWeapon_Cooldown>0.61</RangedWeapon_Cooldown>
-									<SightsEfficiency>0.66</SightsEfficiency>
-									<ShotSpread>0.14</ShotSpread>
-									<SwayFactor>1.6</SwayFactor>
-									<Bulk>4</Bulk>
-								</statBases>
-								<Properties>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_Raygun_three_GKZ_Punched</defaultProjectile>
-									<warmupTime>0.49</warmupTime>
-									<range>48</range>
-									<soundCast>CodZP_Shot_Raygun</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<AmmoUser>
-									<magazineSize>5</magazineSize>
-									<reloadTime>1.92</reloadTime>
-									<ammoSet>AmmoSet_Raygun_three_GKZ_Punched</ammoSet>
-								</AmmoUser>
-								<FireModes />
-								<weaponTags>
-									<li>CE_OneHandedWeapon</li>
-									<li>CE_AI_Pistol</li>
-								</weaponTags>
-							</li>
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>CodZP_Gun_RayGunMkTwo-V-Persona</defName>
-								<statBases>
-									<Mass>3.45</Mass>
-									<RangedWeapon_Cooldown>7</RangedWeapon_Cooldown><!--Would normally be 0.22-->
-									<SightsEfficiency>1.45</SightsEfficiency>
-									<ShotSpread>0.08</ShotSpread>
-									<SwayFactor>0.9</SwayFactor>
-									<Bulk>10.03</Bulk>
-								</statBases>
-								<Properties>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_Raygun_two_v_Punched</defaultProjectile>
-									<warmupTime>0.81</warmupTime>
-									<range>79</range>
-									<soundCast>CodZP_Shot_Raygun2</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-									<burstShotCount>3</burstShotCount>
-								</Properties><!--
-                    <AmmoUser>
-                        <magazineSize>150</magazineSize>
-                        <reloadTime>5.76</reloadTime>
-                        <AmmoSet>SlowPassiveRefilling</AmmoSet>
-                    </AmmoUser>-->
-								<FireModes>
-									<aimedBurstShotCount>2</aimedBurstShotCount>
-								</FireModes>
-								<weaponTags>
-									<li />
-								</weaponTags>
-							</li>
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>CodZP_Gun_RayGunMkTwo-X-Persona</defName>
-								<statBases>
-									<Mass>3.45</Mass>
-									<RangedWeapon_Cooldown>0.14</RangedWeapon_Cooldown>
-									<SightsEfficiency>1.45</SightsEfficiency>
-									<ShotSpread>0.08</ShotSpread>
-									<SwayFactor>0.9</SwayFactor>
-									<Bulk>10.03</Bulk>
-								</statBases>
-								<Properties>
-									<recoilAmount>1.0</recoilAmount>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_Raygun_two_x_Punched</defaultProjectile>
-									<warmupTime>0.81</warmupTime>
-									<range>79</range>
-									<soundCast>CodZP_Shot_Raygun2</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-									<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-								</Properties>
-								<AmmoUser>
-									<magazineSize>66</magazineSize>
-									<reloadTime>1.91</reloadTime>
-									<ammoSet>AmmoSet_Raygun_two_x_Punched</ammoSet>
-								</AmmoUser>
-								<FireModes />
-								<weaponTags>
-									<li>CE_AI_AR</li>
-								</weaponTags>
-							</li>
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>CodZP_Gun_RayGunMkTwo-Y-Persona</defName>
-								<statBases>
-									<Mass>3.45</Mass>
-									<RangedWeapon_Cooldown>0.61</RangedWeapon_Cooldown>
-									<SightsEfficiency>1.45</SightsEfficiency>
-									<ShotSpread>0.13</ShotSpread>
-									<SwayFactor>0.9</SwayFactor>
-									<Bulk>10.03</Bulk>
-								</statBases>
-								<Properties>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_Raygun_two_y_Punched</defaultProjectile>
-									<warmupTime>0.81</warmupTime>
-									<range>58</range>
-									<soundCast>CodZP_Shot_Raygun2</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<AmmoUser>
-									<magazineSize>6</magazineSize>
-									<reloadTime>1.91</reloadTime>
-									<ammoSet>AmmoSet_Raygun_two_y_Punched</ammoSet>
-								</AmmoUser>
-								<FireModes />
-								<weaponTags>
-									<li />
-								</weaponTags>
-							</li>
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>CodZP_Gun_RayGunMkTwo-Z-Persona</defName>
-								<statBases>
-									<Mass>3.45</Mass>
-									<RangedWeapon_Cooldown>0.61</RangedWeapon_Cooldown>
-									<SightsEfficiency>1.45</SightsEfficiency>
-									<ShotSpread>0.12</ShotSpread>
-									<SwayFactor>0.9</SwayFactor>
-									<Bulk>10.03</Bulk>
-								</statBases>
-								<Properties>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_Raygun_two_z_Punched</defaultProjectile>
-									<warmupTime>0.81</warmupTime>
-									<range>58</range>
-									<soundCast>CodZP_Shot_Raygun2</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<AmmoUser>
-									<magazineSize>18</magazineSize>
-									<reloadTime>1.91</reloadTime>
-									<ammoSet>AmmoSet_Raygun_two_z_Punched</ammoSet>
-								</AmmoUser>
-								<FireModes />
-								<weaponTags>
-									<li>CE_AI_BROOM</li>
-								</weaponTags>
-							</li>
-							<!--Thunder Guns-->
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>CodZP_Gun_Thundergun-Persona</defName>
-								<statBases>
-									<Mass>10.7</Mass>
-									<RangedWeapon_Cooldown>0.24</RangedWeapon_Cooldown>
-									<SightsEfficiency>1.32</SightsEfficiency>
-									<ShotSpread>0.09</ShotSpread>
-									<SwayFactor>1.7</SwayFactor>
-									<Bulk>13</Bulk>
-								</statBases>
-								<Properties>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_Thunder_Punched</defaultProjectile>
-									<warmupTime>1.7</warmupTime>
-									<range>17</range>
-									<soundCast>CodZP_Shot_Thundergun</soundCast>
-									<soundCastTail>GunTail_Heavy</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<AmmoUser>
-									<magazineSize>4</magazineSize>
-									<reloadTime>1.28</reloadTime>
-									<ammoSet>AmmoSet_Thunder_Punched</ammoSet>
-								</AmmoUser>
-								<FireModes />
-								<weaponTags>
-									<li />
-								</weaponTags>
-							</li>
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>CodZP_Gun_Tundragun-Persona</defName>
-								<statBases>
-									<Mass>10.7</Mass>
-									<RangedWeapon_Cooldown>0.24</RangedWeapon_Cooldown>
-									<SightsEfficiency>1.32</SightsEfficiency>
-									<ShotSpread>0.09</ShotSpread>
-									<SwayFactor>1.7</SwayFactor>
-									<Bulk>13</Bulk>
-								</statBases>
-								<Properties>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_Tundra_Punched</defaultProjectile>
-									<warmupTime>1.7</warmupTime>
-									<range>17</range>
-									<soundCast>CodZP_Shot_Thundergun</soundCast>
-									<soundCastTail>GunTail_Heavy</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<AmmoUser>
-									<magazineSize>4</magazineSize>
-									<reloadTime>1.28</reloadTime>
-									<ammoSet>AmmoSet_Tundra_Punched</ammoSet>
-								</AmmoUser>
-								<FireModes />
-								<weaponTags>
-									<li />
-								</weaponTags>
-							</li>
-							<!--Winters-->
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>CodZP_Gun_WintersHowl-Persona</defName>
-								<statBases>
-									<Mass>1.78</Mass>
-									<RangedWeapon_Cooldown>0.23</RangedWeapon_Cooldown>
-									<SightsEfficiency>0.93</SightsEfficiency>
-									<ShotSpread>0.13</ShotSpread>
-									<SwayFactor>1.1</SwayFactor>
-									<Bulk>3</Bulk>
-								</statBases>
-								<Properties>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_Winters_Cryo_Punched</defaultProjectile>
-									<warmupTime>0.49</warmupTime>
-									<range>73</range>
-									<soundCast>CodZP_Shot_Wintershowl</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<AmmoUser>
-									<magazineSize>9</magazineSize>
-									<reloadTime>2.43</reloadTime>
-									<ammoSet>AmmoSet_Winters_Punched</ammoSet>
-								</AmmoUser>
-								<FireModes />
-								<weaponTags>
-									<li>CE_OneHandedWeapon</li>
-									<li>CE_AI_Pistol</li>
-								</weaponTags>
-							</li>
-							<!--Wunderwaffes-->
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>CodZP_Gun_Wunderwaffe-Persona</defName>
-								<statBases>
-									<Mass>4.3</Mass>
-									<RangedWeapon_Cooldown>0.23</RangedWeapon_Cooldown>
-									<SightsEfficiency>1.32</SightsEfficiency>
-									<ShotSpread>0.04</ShotSpread>
-									<SwayFactor>1.2</SwayFactor>
-									<Bulk>13</Bulk>
-								</statBases>
-								<Properties>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_Wunder_Punched</defaultProjectile>
-									<warmupTime>0.89</warmupTime>
-									<range>73</range>
-									<soundCast>CodZP_Shot_Wunderwaffe</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<AmmoUser>
-									<magazineSize>6</magazineSize>
-									<reloadTime>3.97</reloadTime>
-									<ammoSet>AmmoSet_Wunder_Punched</ammoSet>
-								</AmmoUser>
-								<FireModes />
-								<weaponTags>
-									<li />
-								</weaponTags>
-							</li>
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>CodZP_Gun_Wunderwaffe_Scharf-Persona</defName>
-								<statBases>
-									<Mass>4.3</Mass>
-									<RangedWeapon_Cooldown>0.61</RangedWeapon_Cooldown>
-									<SightsEfficiency>1.32</SightsEfficiency>
-									<ShotSpread>0.04</ShotSpread>
-									<SwayFactor>1.2</SwayFactor>
-									<Bulk>13</Bulk>
-								</statBases>
-								<Properties>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_Wunder_s_Punched</defaultProjectile>
-									<warmupTime>0.89</warmupTime>
-									<range>73</range>
-									<soundCast>CodZP_Shot_Wunderwaffe</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<AmmoUser>
-									<magazineSize>8</magazineSize>
-									<reloadTime>3.97</reloadTime>
-									<ammoSet>AmmoSet_Wunder_s_Punched</ammoSet>
-								</AmmoUser>
-								<FireModes />
-								<weaponTags>
-									<li />
-								</weaponTags>
-							</li>
-							<!--Zap Guns-->
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>CODZP_Gun_Zapgun_Red-Persona</defName>
-								<statBases>
-									<Mass>2.63</Mass>
-									<RangedWeapon_Cooldown>0.23</RangedWeapon_Cooldown>
-									<SightsEfficiency>0.66</SightsEfficiency>
-									<ShotSpread>0.14</ShotSpread>
-									<SwayFactor>1.4</SwayFactor>
-									<Bulk>3</Bulk>
-								</statBases>
-								<Properties>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_Zapgun_Punched</defaultProjectile>
-									<warmupTime>0.49</warmupTime>
-									<range>69</range>
-									<soundCast>CodZP_Shot_Zapgun</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<AmmoUser>
-									<magazineSize>12</magazineSize>
-									<reloadTime>1.6</reloadTime>
-									<ammoSet>AmmoSet_Zapgun_Punched</ammoSet>
-								</AmmoUser>
-								<FireModes />
-								<weaponTags>
-									<li>CE_OneHandedWeapon</li>
-									<li>CE_AI_Pistol</li>
-								</weaponTags>
-							</li>
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>CODZP_Gun_Zapgun_Blue-Persona</defName>
-								<statBases>
-									<Mass>2.63</Mass>
-									<RangedWeapon_Cooldown>0.23</RangedWeapon_Cooldown>
-									<SightsEfficiency>0.66</SightsEfficiency>
-									<ShotSpread>0.14</ShotSpread>
-									<SwayFactor>1.4</SwayFactor>
-									<Bulk>3</Bulk>
-								</statBases>
-								<Properties>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_Zapgun_Punched</defaultProjectile>
-									<warmupTime>0.49</warmupTime>
-									<range>69</range>
-									<soundCast>CodZP_Shot_Zapgun</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<AmmoUser>
-									<magazineSize>12</magazineSize>
-									<reloadTime>1.6</reloadTime>
-									<ammoSet>AmmoSet_Zapgun_Punched</ammoSet>
-								</AmmoUser>
-								<FireModes />
-								<weaponTags>
-									<li>CE_OneHandedWeapon</li>
-									<li>CE_AI_Pistol</li>
-								</weaponTags>
-							</li>
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>CodZP_Gun_Wavegun-Persona</defName>
-								<statBases>
-									<Mass>5.26</Mass>
-									<RangedWeapon_Cooldown>0.23</RangedWeapon_Cooldown>
-									<SightsEfficiency>1.45</SightsEfficiency>
-									<ShotSpread>0.14</ShotSpread>
-									<SwayFactor>0.8</SwayFactor>
-									<Bulk>6</Bulk>
-								</statBases>
-								<Properties>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_Wavegun_Punched</defaultProjectile>
-									<warmupTime>0.41</warmupTime>
-									<range>45</range>
-									<soundCast>CodZP_Shot_Zapgun</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<AmmoUser>
-									<magazineSize>4</magazineSize>
-									<reloadTime>1.92</reloadTime>
-									<ammoSet>AmmoSet_Wavegun_Punched</ammoSet>
-								</AmmoUser>
-								<FireModes />
-								<weaponTags>
-									<li />
-								</weaponTags>
-							</li>
-						</operations>
-					</match>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Weapons/Wonder.xml b/Patches/Call of Duty - Zombies Pack/Weapons/Wonder.xml
deleted file mode 100644
index 926a7356db..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Weapons/Wonder.xml	
+++ /dev/null
@@ -1,876 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Wonder Weapons</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!--Tools -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="CodZP_Gun_RayGun" or
-						defName="CodZP_Gun_RayGunMkThree" or
-						defName="CODZP_Gun_Zapgun_Red" or
-						defName="CODZP_Gun_Zapgun_Blue" or
-						defName="CodZP_Gun_WintersHowl" or
-						defName="CodZP_Gun_GKZ"]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="CodZP_Gun_Blundergat" or
-						defName="CodZP_Gun_Acidgat" or
-						defName="CodZP_Gun_Magmagat" or
-						defName="CodZP_Gun_RayGunMkTwo" or
-						defName="CodZP_Gun_RayGunMkTwo-V" or
-						defName="CodZP_Gun_RayGunMkTwo-X" or
-						defName="CodZP_Gun_RayGunMkTwo-Y" or
-						defName="CodZP_Gun_RayGunMkTwo-Z" or
-						defName="CodZP_Gun_Wunderwaffe" or
-						defName="CodZP_Gun_Wunderwaffe_Scharf" or
-						defName="CodZP_Gun_Wavegun"]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</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>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="CodZP_Gun_Thundergun" or
-						defName="CodZP_Gun_Tundragun"]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="CodZP_Gun_Staff-Ice" or
-						defName="CodZP_Gun_Staff-Wind" or
-						defName="CodZP_Gun_Staff-Fire" or
-						defName="CodZP_Gun_Staff-Lightning"]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Sekhmet's Vigor</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1</cooldownTime>
-								<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CodZP_Hells_Retriever"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Retriever's Cinder</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>60</power>
-								<cooldownTime>9</cooldownTime>
-								<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!--Wonder Weapons-->
-				<!--Blunders-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_Blundergat</defName>
-					<statBases>
-						<Mass>3.94</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.49</SwayFactor>
-						<Bulk>10.92</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Blundergat_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>25</range>
-						<soundCast>CodZP_Shot_Blundergat</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>2.5</reloadTime>
-						<ammoSet>AmmoSet_Blundergat</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_Acidgat</defName>
-					<statBases>
-						<Mass>3.94</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.49</SwayFactor>
-						<Bulk>10.92</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Acidgat_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>25</range>
-						<soundCast>CodZP_Shot_Blundergat</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>2.5</reloadTime>
-						<ammoSet>AmmoSet_Acidgat</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_Magmagat</defName>
-					<statBases>
-						<Mass>3.94</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.49</SwayFactor>
-						<Bulk>10.92</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Magmagat_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>25</range>
-						<soundCast>CodZP_Shot_Blundergat</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>2.5</reloadTime>
-						<ammoSet>AmmoSet_Magmagat</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-				<!--Elemental Staffs-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_Staff-Ice</defName>
-					<statBases>
-						<Mass>8</Mass>
-						<RangedWeapon_Cooldown>1.15</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>2.1</SwayFactor>
-						<Bulk>13</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Elemental_Staff_Ice</defaultProjectile>
-						<warmupTime>2.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_ChargeBlaster</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>2.5</reloadTime>
-						<ammoSet>AmmoSet_Elemental_Staff_Ice</ammoSet>
-					</AmmoUser>
-					<FireModes />
-				</li>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_Staff-Wind</defName>
-					<statBases>
-						<Mass>8</Mass>
-						<RangedWeapon_Cooldown>1.15</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>2.1</SwayFactor>
-						<Bulk>13</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Elemental_Staff_Wind</defaultProjectile>
-						<warmupTime>2.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_ChargeBlaster</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>3</magazineSize>
-						<reloadTime>2.5</reloadTime>
-						<ammoSet>AmmoSet_Elemental_Staff_Wind</ammoSet>
-					</AmmoUser>
-					<FireModes />
-				</li>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_Staff-Fire</defName>
-					<statBases>
-						<Mass>8</Mass>
-						<RangedWeapon_Cooldown>1.15</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>2.1</SwayFactor>
-						<Bulk>13</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Elemental_Staff_Fire</defaultProjectile>
-						<warmupTime>2.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_ChargeBlaster</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>9</magazineSize>
-						<reloadTime>2.5</reloadTime>
-						<ammoSet>AmmoSet_Elemental_Staff_Fire</ammoSet>
-					</AmmoUser>
-					<FireModes />
-				</li>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_Staff-Lightning</defName>
-					<statBases>
-						<Mass>8</Mass>
-						<RangedWeapon_Cooldown>1.15</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>2.1</SwayFactor>
-						<Bulk>13</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Elemental_Staff_Lightning</defaultProjectile>
-						<warmupTime>2.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_ChargeBlaster</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>9</magazineSize>
-						<reloadTime>2.5</reloadTime>
-						<ammoSet>AmmoSet_Elemental_Staff_Lightning</ammoSet>
-					</AmmoUser>
-					<FireModes />
-				</li>
-				<!--Hells-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Hells_Retriever</defName>
-					<statBases>
-						<Mass>2</Mass>
-						<RangedWeapon_Cooldown>10</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>0.83</SwayFactor>
-						<Bulk>0.5</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Hells_Retriever</defaultProjectile>
-						<warmupTime>0.2</warmupTime>
-						<range>46</range>
-						<soundCast>CodZP_Shot_Hells</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<FireModes />
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-				<!--Ray Guns-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_RayGun</defName>
-					<statBases>
-						<Mass>1.36</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.67</SwayFactor>
-						<Bulk>3</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Raygun</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>55</range>
-						<soundCast>CodZP_Shot_Raygun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_Raygun</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_RayGunMkTwo</defName>
-					<statBases>
-						<Mass>3.45</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.3</SwayFactor>
-						<Bulk>10.03</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.41</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Raygun_two</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>55</range>
-						<soundCast>CodZP_Shot_Raygun2</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>21</magazineSize>
-						<reloadTime>2.98</reloadTime>
-						<ammoSet>AmmoSet_Raygun_two</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-					</weaponTags>
-				</li>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_RayGunMkThree</defName>
-					<statBases>
-						<Mass>1.36</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>2.33</SwayFactor>
-						<Bulk>3</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Raygun_three</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>75</range>
-						<soundCast>CodZP_Shot_Raygun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_Raygun_three</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_GKZ</defName>
-					<statBases>
-						<Mass>2.67</Mass>
-						<RangedWeapon_Cooldown>0.96</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>2.22</SwayFactor>
-						<Bulk>4</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Raygun_three_GKZ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>29</range>
-						<soundCast>CodZP_Shot_Raygun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>3</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_Raygun_three_GKZ</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_RayGunMkTwo-V</defName>
-					<statBases>
-						<Mass>3.45</Mass>
-						<RangedWeapon_Cooldown>9</RangedWeapon_Cooldown><!--Would normally be 0.35-->
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.3</SwayFactor>
-						<Bulk>10.03</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Raygun_two_v</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>55</range>
-						<soundCast>CodZP_Shot_Raygun2</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<burstShotCount>3</burstShotCount>
-					</Properties><!--
-                    <AmmoUser>
-                        <magazineSize>100</magazineSize>
-                        <reloadTime>9</reloadTime>
-                        <AmmoSet>SlowPassiveRefilling</AmmoSet>
-                    </AmmoUser>-->
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li />
-					</weaponTags>
-				</li>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_RayGunMkTwo-X</defName>
-					<statBases>
-						<Mass>3.45</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.3</SwayFactor>
-						<Bulk>10.03</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.41</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Raygun_two_x</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>55</range>
-						<soundCast>CodZP_Shot_Raygun2</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>33</magazineSize>
-						<reloadTime>2.98</reloadTime>
-						<ammoSet>AmmoSet_Raygun_two_x</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_AI_AR</li>
-					</weaponTags>
-				</li>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_RayGunMkTwo-Y</defName>
-					<statBases>
-						<Mass>3.45</Mass>
-						<RangedWeapon_Cooldown>0.96</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>1.3</SwayFactor>
-						<Bulk>10.03</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Raygun_two_y</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>40</range>
-						<soundCast>CodZP_Shot_Raygun2</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>3</magazineSize>
-						<reloadTime>2.98</reloadTime>
-						<ammoSet>AmmoSet_Raygun_two_y</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li />
-					</weaponTags>
-				</li>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_RayGunMkTwo-Z</defName>
-					<statBases>
-						<Mass>3.45</Mass>
-						<RangedWeapon_Cooldown>0.96</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.3</SwayFactor>
-						<Bulk>10.03</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Raygun_two_z</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>40</range>
-						<soundCast>CodZP_Shot_Raygun2</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>9</magazineSize>
-						<reloadTime>2.98</reloadTime>
-						<ammoSet>AmmoSet_Raygun_two_z</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-				<!--Thunder Guns-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_Thundergun</defName>
-					<statBases>
-						<Mass>10.7</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>2.37</SwayFactor>
-						<Bulk>13</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Thunder</defaultProjectile>
-						<warmupTime>2.1</warmupTime>
-						<range>12</range>
-						<soundCast>CodZP_Shot_Thundergun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>2</magazineSize>
-						<reloadTime>2</reloadTime>
-						<ammoSet>AmmoSet_Thunder</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li />
-					</weaponTags>
-				</li>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_Tundragun</defName>
-					<statBases>
-						<Mass>10.7</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>2.37</SwayFactor>
-						<Bulk>13</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Tundra</defaultProjectile>
-						<warmupTime>2.1</warmupTime>
-						<range>12</range>
-						<soundCast>CodZP_Shot_Thundergun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>2</magazineSize>
-						<reloadTime>2</reloadTime>
-						<ammoSet>AmmoSet_Tundra</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li />
-					</weaponTags>
-				</li>
-				<!--Winters-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_WintersHowl</defName>
-					<statBases>
-						<Mass>1.78</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>1.59</SwayFactor>
-						<Bulk>3</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Winters_Cryo</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>51</range>
-						<soundCast>CodZP_Shot_Wintershowl</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>3.8</reloadTime>
-						<ammoSet>AmmoSet_Winters</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-				<!--Wunderwaffes-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_Wunderwaffe</defName>
-					<statBases>
-						<Mass>4.3</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.73</SwayFactor>
-						<Bulk>13</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Wunder</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>51</range>
-						<soundCast>CodZP_Shot_Wunderwaffe</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>3</magazineSize>
-						<reloadTime>6.2</reloadTime>
-						<ammoSet>AmmoSet_Wunder</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li />
-					</weaponTags>
-				</li>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_Wunderwaffe_Scharf</defName>
-					<statBases>
-						<Mass>4.3</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>2.73</SwayFactor>
-						<Bulk>13</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Wunder_s</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>51</range>
-						<soundCast>CodZP_Shot_Wunderwaffe</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>6.2</reloadTime>
-						<ammoSet>AmmoSet_Wunder_s</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li />
-					</weaponTags>
-				</li>
-				<!--Zap Guns-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CODZP_Gun_Zapgun_Red</defName>
-					<statBases>
-						<Mass>2.63</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.88</SwayFactor>
-						<Bulk>3</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Zapgun_red</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>48</range>
-						<soundCast>CodZP_Shot_Zapgun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>2.5</reloadTime>
-						<ammoSet>AmmoSet_Zapgun_red</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CODZP_Gun_Zapgun_Blue</defName>
-					<statBases>
-						<Mass>2.63</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.88</SwayFactor>
-						<Bulk>3</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Zapgun_blue</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>48</range>
-						<soundCast>CodZP_Shot_Zapgun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>2.5</reloadTime>
-						<ammoSet>AmmoSet_Zapgun_blue</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_Wavegun</defName>
-					<statBases>
-						<Mass>5.26</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.13</SwayFactor>
-						<Bulk>6</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Wavegun</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>31</range>
-						<soundCast>CodZP_Shot_Zapgun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>2</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_Wavegun</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li />
-					</weaponTags>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Weapons/Wonder_Punched.xml b/Patches/Call of Duty - Zombies Pack/Weapons/Wonder_Punched.xml
deleted file mode 100644
index a64e105371..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Weapons/Wonder_Punched.xml	
+++ /dev/null
@@ -1,875 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!--Tools-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="CodZP_Gun_RayGun-PAP" or
-						defName="CodZP_Gun_RayGunMkThree-PAP" or
-						defName="CODZP_Gun_Zapgun_Red-PAP" or
-						defName="CODZP_Gun_Zapgun_Blue-PAP" or
-						defName="CodZP_Gun_WintersHowl-PAP" or
-						defName="CodZP_Gun_GKZ-PAP"]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="CodZP_Gun_Blundergat-PAP" or
-						defName="CodZP_Gun_Acidgat-PAP" or
-						defName="CodZP_Gun_Magmagat-PAP" or
-						defName="CodZP_Gun_RayGunMkTwo-PAP" or
-						defName="CodZP_Gun_RayGunMkTwo-V-PAP" or
-						defName="CodZP_Gun_RayGunMkTwo-X-PAP" or
-						defName="CodZP_Gun_RayGunMkTwo-Y-PAP" or
-						defName="CodZP_Gun_RayGunMkTwo-Z-PAP" or
-						defName="CodZP_Gun_Wunderwaffe-PAP" or
-						defName="CodZP_Gun_Wunderwaffe_Scharf-PAP" or
-						defName="CodZP_Gun_Wavegun-PAP"]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</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>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="CodZP_Gun_Thundergun-PAP" or
-						defName="CodZP_Gun_Tundragun-PAP"]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="CodZP_Gun_Staff-Ice-PAP" or
-						defName="CodZP_Gun_Staff-Wind-PAP" or
-						defName="CodZP_Gun_Staff-Fire-PAP" or
-						defName="CodZP_Gun_Staff-Lightning-PAP"]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Sekhmet's Vigor</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1</cooldownTime>
-								<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CodZP_Hells_Retriever-PAP"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Retriever's Cinder</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>60</power>
-								<cooldownTime>9</cooldownTime>
-								<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!--Wonder Weapons-->
-				<!--Blunders-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_Blundergat-PAP</defName>
-					<statBases>
-						<Mass>3.94</Mass>
-						<RangedWeapon_Cooldown>0.29</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.92</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>10.92</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Blundergat_Buck_Punched</defaultProjectile>
-						<warmupTime>0.54</warmupTime>
-						<range>30</range>
-						<soundCast>CodZP_Shot_Blundergat</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>2</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>2</reloadTime>
-						<ammoSet>AmmoSet_Blundergat_Punched</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_Acidgat-PAP</defName>
-					<statBases>
-						<Mass>3.94</Mass>
-						<RangedWeapon_Cooldown>0.29</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.92</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>10.92</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Acidgat_Buck_Punched</defaultProjectile>
-						<warmupTime>0.54</warmupTime>
-						<range>30</range>
-						<soundCast>CodZP_Shot_Blundergat</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>2</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>2</reloadTime>
-						<ammoSet>AmmoSet_Acidgat_Punched</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_Magmagat-PAP</defName>
-					<statBases>
-						<Mass>3.94</Mass>
-						<RangedWeapon_Cooldown>0.29</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.92</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>10.92</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Magmagat_Buck_Punched</defaultProjectile>
-						<warmupTime>0.54</warmupTime>
-						<range>30</range>
-						<soundCast>CodZP_Shot_Blundergat</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>2</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>2</reloadTime>
-						<ammoSet>AmmoSet_Magmagat_Punched</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-				<!--Elemental Staffs-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_Staff-Ice-PAP</defName>
-					<statBases>
-						<Mass>8</Mass>
-						<RangedWeapon_Cooldown>0.92</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.92</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.79</SwayFactor>
-						<Bulk>13</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Elemental_Staff_Ice_Punched</defaultProjectile>
-						<warmupTime>2.34</warmupTime>
-						<range>24</range>
-						<soundCast>Shot_ChargeBlaster</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>9</magazineSize>
-						<reloadTime>2</reloadTime>
-						<ammoSet>AmmoSet_Elemental_Staff_Ice_Punched</ammoSet>
-					</AmmoUser>
-					<FireModes />
-				</li>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_Staff-Wind-PAP</defName>
-					<statBases>
-						<Mass>8</Mass>
-						<RangedWeapon_Cooldown>0.92</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.92</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.79</SwayFactor>
-						<Bulk>13</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Elemental_Staff_Wind_Punched</defaultProjectile>
-						<warmupTime>2.34</warmupTime>
-						<range>24</range>
-						<soundCast>Shot_ChargeBlaster</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>2</reloadTime>
-						<ammoSet>AmmoSet_Elemental_Staff_Wind_Punched</ammoSet>
-					</AmmoUser>
-					<FireModes />
-				</li>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_Staff-Fire-PAP</defName>
-					<statBases>
-						<Mass>8</Mass>
-						<RangedWeapon_Cooldown>0.92</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.92</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.79</SwayFactor>
-						<Bulk>13</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Elemental_Staff_Fire_Punched</defaultProjectile>
-						<warmupTime>2.34</warmupTime>
-						<range>24</range>
-						<soundCast>Shot_ChargeBlaster</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>9</magazineSize>
-						<reloadTime>2</reloadTime>
-						<ammoSet>AmmoSet_Elemental_Staff_Fire_Punched</ammoSet>
-					</AmmoUser>
-					<FireModes />
-				</li>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_Staff-Lightning-PAP</defName>
-					<statBases>
-						<Mass>8</Mass>
-						<RangedWeapon_Cooldown>0.92</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.92</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.79</SwayFactor>
-						<Bulk>13</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Elemental_Staff_Lightning_Punched</defaultProjectile>
-						<warmupTime>2.34</warmupTime>
-						<range>24</range>
-						<soundCast>Shot_ChargeBlaster</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>18</magazineSize>
-						<reloadTime>2</reloadTime>
-						<ammoSet>AmmoSet_Elemental_Staff_Lightning_Punched</ammoSet>
-					</AmmoUser>
-					<FireModes />
-				</li>
-				<!--Hells-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Hells_Retriever-PAP</defName>
-					<statBases>
-						<Mass>2</Mass>
-						<RangedWeapon_Cooldown>8</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.58</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.71</SwayFactor>
-						<Bulk>0.5</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Hells_Retriever_Punched</defaultProjectile>
-						<warmupTime>0.18</warmupTime>
-						<range>55</range>
-						<soundCast>CodZP_Shot_Hells</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<FireModes />
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-				<!--Ray Guns-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_RayGun-PAP</defName>
-					<statBases>
-						<Mass>1.36</Mass>
-						<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.58</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.42</SwayFactor>
-						<Bulk>3</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Raygun_Punched</defaultProjectile>
-						<warmupTime>0.54</warmupTime>
-						<range>66</range>
-						<soundCast>CodZP_Shot_Raygun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>40</magazineSize>
-						<reloadTime>2.4</reloadTime>
-						<ammoSet>AmmoSet_Raygun_Punched</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_RayGunMkTwo-PAP</defName>
-					<statBases>
-						<Mass>3.45</Mass>
-						<RangedWeapon_Cooldown>0.29</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.27</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.11</SwayFactor>
-						<Bulk>10.03</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.20</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Raygun_two_Punched</defaultProjectile>
-						<warmupTime>0.9</warmupTime>
-						<range>66</range>
-						<soundCast>CodZP_Shot_Raygun2</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>42</magazineSize>
-						<reloadTime>2.38</reloadTime>
-						<ammoSet>AmmoSet_Raygun_two_Punched</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-					</weaponTags>
-				</li>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_RayGunMkThree-PAP</defName>
-					<statBases>
-						<Mass>1.36</Mass>
-						<RangedWeapon_Cooldown>0.29</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.58</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.98</SwayFactor>
-						<Bulk>3</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Raygun_three_Punched</defaultProjectile>
-						<warmupTime>0.54</warmupTime>
-						<range>90</range>
-						<soundCast>CodZP_Shot_Raygun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>2.4</reloadTime>
-						<ammoSet>AmmoSet_Raygun_three_Punched</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_GKZ-PAP</defName>
-					<statBases>
-						<Mass>2.67</Mass>
-						<RangedWeapon_Cooldown>0.77</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.58</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.89</SwayFactor>
-						<Bulk>4</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Raygun_three_GKZ_Punched</defaultProjectile>
-						<warmupTime>0.54</warmupTime>
-						<range>35</range>
-						<soundCast>CodZP_Shot_Raygun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>2.4</reloadTime>
-						<ammoSet>AmmoSet_Raygun_three_GKZ_Punched</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_RayGunMkTwo-V-PAP</defName>
-					<statBases>
-						<Mass>3.45</Mass>
-						<RangedWeapon_Cooldown>9</RangedWeapon_Cooldown><!--Would normally be 0.35-->
-						<SightsEfficiency>1.27</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.11</SwayFactor>
-						<Bulk>10.03</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Raygun_two_v_Punched</defaultProjectile>
-						<warmupTime>0.9</warmupTime>
-						<range>66</range>
-						<soundCast>CodZP_Shot_Raygun2</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<burstShotCount>3</burstShotCount>
-					</Properties><!--
-                    <AmmoUser>
-                        <magazineSize>150</magazineSize>
-                        <reloadTime>7.2</reloadTime>
-                        <AmmoSet>SlowPassiveRefilling</AmmoSet>
-                    </AmmoUser>-->
-					<FireModes>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li />
-					</weaponTags>
-				</li>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_RayGunMkTwo-X-PAP</defName>
-					<statBases>
-						<Mass>3.45</Mass>
-						<RangedWeapon_Cooldown>0.18</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.27</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.11</SwayFactor>
-						<Bulk>10.03</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.20</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Raygun_two_x_Punched</defaultProjectile>
-						<warmupTime>0.9</warmupTime>
-						<range>66</range>
-						<soundCast>CodZP_Shot_Raygun2</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>66</magazineSize>
-						<reloadTime>2.38</reloadTime>
-						<ammoSet>AmmoSet_Raygun_two_x_Punched</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_AI_AR</li>
-					</weaponTags>
-				</li>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_RayGunMkTwo-Y-PAP</defName>
-					<statBases>
-						<Mass>3.45</Mass>
-						<RangedWeapon_Cooldown>0.77</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.27</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.11</SwayFactor>
-						<Bulk>10.03</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Raygun_two_y_Punched</defaultProjectile>
-						<warmupTime>0.9</warmupTime>
-						<range>48</range>
-						<soundCast>CodZP_Shot_Raygun2</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>2.38</reloadTime>
-						<ammoSet>AmmoSet_Raygun_two_y_Punched</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li />
-					</weaponTags>
-				</li>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_RayGunMkTwo-Z-PAP</defName>
-					<statBases>
-						<Mass>3.45</Mass>
-						<RangedWeapon_Cooldown>0.77</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.27</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.11</SwayFactor>
-						<Bulk>10.03</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Raygun_two_z_Punched</defaultProjectile>
-						<warmupTime>0.9</warmupTime>
-						<range>48</range>
-						<soundCast>CodZP_Shot_Raygun2</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>18</magazineSize>
-						<reloadTime>2.38</reloadTime>
-						<ammoSet>AmmoSet_Raygun_two_z_Punched</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-				<!--Thunder Guns-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_Thundergun-PAP</defName>
-					<statBases>
-						<Mass>10.7</Mass>
-						<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.15</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>2.01</SwayFactor>
-						<Bulk>13</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Thunder_Punched</defaultProjectile>
-						<warmupTime>1.89</warmupTime>
-						<range>14</range>
-						<soundCast>CodZP_Shot_Thundergun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>4</magazineSize>
-						<reloadTime>1.6</reloadTime>
-						<ammoSet>AmmoSet_Thunder_Punched</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li />
-					</weaponTags>
-				</li>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_Tundragun-PAP</defName>
-					<statBases>
-						<Mass>10.7</Mass>
-						<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.15</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>2.01</SwayFactor>
-						<Bulk>13</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Tundra_Punched</defaultProjectile>
-						<warmupTime>1.89</warmupTime>
-						<range>14</range>
-						<soundCast>CodZP_Shot_Thundergun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>4</magazineSize>
-						<reloadTime>1.6</reloadTime>
-						<ammoSet>AmmoSet_Tundra_Punched</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li />
-					</weaponTags>
-				</li>
-				<!--Winters-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_WintersHowl-PAP</defName>
-					<statBases>
-						<Mass>1.78</Mass>
-						<RangedWeapon_Cooldown>0.29</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.81</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.35</SwayFactor>
-						<Bulk>3</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Winters_Cryo_Punched</defaultProjectile>
-						<warmupTime>0.54</warmupTime>
-						<range>61</range>
-						<soundCast>CodZP_Shot_Wintershowl</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>9</magazineSize>
-						<reloadTime>3.04</reloadTime>
-						<ammoSet>AmmoSet_Winters_Punched</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-				<!--Wunderwaffes-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_Wunderwaffe-PAP</defName>
-					<statBases>
-						<Mass>4.3</Mass>
-						<RangedWeapon_Cooldown>0.29</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.15</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.47</SwayFactor>
-						<Bulk>13</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Wunder_Punched</defaultProjectile>
-						<warmupTime>0.99</warmupTime>
-						<range>61</range>
-						<soundCast>CodZP_Shot_Wunderwaffe</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4.96</reloadTime>
-						<ammoSet>AmmoSet_Wunder_Punched</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li />
-					</weaponTags>
-				</li>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_Wunderwaffe_Scharf-PAP</defName>
-					<statBases>
-						<Mass>4.3</Mass>
-						<RangedWeapon_Cooldown>0.76</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.15</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>2.32</SwayFactor>
-						<Bulk>13</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Wunder_s_Punched</defaultProjectile>
-						<warmupTime>0.99</warmupTime>
-						<range>61</range>
-						<soundCast>CodZP_Shot_Wunderwaffe</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4.96</reloadTime>
-						<ammoSet>AmmoSet_Wunder_s_Punched</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li />
-					</weaponTags>
-				</li>
-				<!--Zap Guns-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CODZP_Gun_Zapgun_Red-PAP</defName>
-					<statBases>
-						<Mass>2.63</Mass>
-						<RangedWeapon_Cooldown>0.29</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.58</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.60</SwayFactor>
-						<Bulk>3</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Zapgun_Punched</defaultProjectile>
-						<warmupTime>0.54</warmupTime>
-						<range>54</range>
-						<soundCast>CodZP_Shot_Zapgun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>2</reloadTime>
-						<ammoSet>AmmoSet_Zapgun_Punched</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CODZP_Gun_Zapgun_Blue-PAP</defName>
-					<statBases>
-						<Mass>2.63</Mass>
-						<RangedWeapon_Cooldown>0.29</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.58</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.60</SwayFactor>
-						<Bulk>3</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Zapgun_Punched</defaultProjectile>
-						<warmupTime>0.54</warmupTime>
-						<range>54</range>
-						<soundCast>CodZP_Shot_Zapgun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>2</reloadTime>
-						<ammoSet>AmmoSet_Zapgun_Punched</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CodZP_Gun_Wavegun-PAP</defName>
-					<statBases>
-						<Mass>5.26</Mass>
-						<RangedWeapon_Cooldown>0.29</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.27</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.96</SwayFactor>
-						<Bulk>6</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Wavegun_Punched</defaultProjectile>
-						<warmupTime>0.45</warmupTime>
-						<range>37</range>
-						<soundCast>CodZP_Shot_Zapgun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>4</magazineSize>
-						<reloadTime>2.4</reloadTime>
-						<ammoSet>AmmoSet_Wavegun_Punched</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li />
-					</weaponTags>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Call of Duty - Zombies Pack/Wonders.xml b/Patches/Call of Duty - Zombies Pack/Wonders.xml
deleted file mode 100644
index 8d20dee20f..0000000000
--- a/Patches/Call of Duty - Zombies Pack/Wonders.xml	
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Call of Duty: Wonder Weapons</li>
-			<li>Call of Duty: Zombies Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<RecipeDef Name="CODZP_AmmoRecipeWonder" ParentName="AmmoRecipeBase" Abstract="true">
-							<researchPrerequisite>
-								<li>CodZP_WonderWorks</li>
-							</researchPrerequisite>
-						</RecipeDef>
-
-						<RecipeDef Name="CODZP_AmmoRecipeAmmo" ParentName="AmmoRecipeBase" Abstract="true">
-							<researchPrerequisite>
-								<li>CodZP_AmmoMatic</li>
-							</researchPrerequisite>
-						</RecipeDef>
-
-						<ThingCategoryDef>
-							<defName>AmmoWonders</defName>
-							<label>Wonder</label>
-							<parent>Ammo</parent>
-						</ThingCategoryDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Carbon/Items_Resource_Stuff.xml b/Patches/Carbon/Items_Resource_Stuff.xml
deleted file mode 100644
index 9af05a0c54..0000000000
--- a/Patches/Carbon/Items_Resource_Stuff.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Carbon</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Item Bulk === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CarbonWeave" or defName="CarbonFiber" or defName="CarbonDiamond"]/statBases</xpath>
-					<value>
-						<Bulk>0.3</Bulk>
-					</value>
-				</li>
-
-				<!-- === Carbon Weave === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CarbonWeave"]/stuffProps</xpath>
-					<value>
-						<statOffsets>
-							<Mass>0.325</Mass>
-							<WornBulk>0.25</WornBulk>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CarbonWeave"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>1.65</Mass>
-						<WornBulk>1.65</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CarbonWeave"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.6</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CarbonWeave"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CarbonWeave"]/stuffProps/categories</xpath>
-					<value>
-						<li>SoftArmor</li>
-					</value>
-				</li>
-
-				<!-- === Carbon Fiber === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CarbonFiber"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1.2</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CarbonFiber"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1.6</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CarbonFiber"]/stuffProps/categories</xpath>
-					<value>
-						<li>Metallic_Weapon</li>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<!-- === Carbon Diamond === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CarbonDiamond"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>2.2</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CarbonDiamond"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.6</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Censored Armory/30mm Rifle Grenade.xml b/Patches/Censored Armory/30mm Rifle Grenade.xml
deleted file mode 100644
index 22a526d48d..0000000000
--- a/Patches/Censored Armory/30mm Rifle Grenade.xml	
+++ /dev/null
@@ -1,301 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Censored Armory</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>Ammo30mmRifleGrenades</defName>
-					<label>30mm rifleGrenade</label>
-					<parent>AmmoGrenades</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberGrenade</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_30mmRifleGrenade</defName>
-					<label>30mm Rifle Grenades</label>
-					<ammoTypes>
-						<Ammo_30mmRifleGrenade_HE>Bullet_30mmRifleGrenade_HE</Ammo_30mmRifleGrenade_HE>
-						<Ammo_30mmRifleGrenade_EMP>Bullet_30mmRifleGrenade_EMP</Ammo_30mmRifleGrenade_EMP>
-						<Ammo_30mmRifleGrenade_Smoke>Bullet_30mmRifleGrenade_Smoke</Ammo_30mmRifleGrenade_Smoke>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="30mmRifleGrenadeBase" ParentName="MediumAmmoBase" Abstract="True">
-					<description>A small, low velocity rifle grenade propelled with a blank cartridge.</description>
-					<statBases>
-						<Mass>0.36</Mass>
-						<Bulk>0.28</Bulk>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-					</tradeTags>
-					<thingCategories>
-						<li>Ammo30mmRifleGrenades</li>
-					</thingCategories>
-					<stackLimit>2000</stackLimit>
-					<cookOffFlashScale>20</cookOffFlashScale>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="30mmRifleGrenadeBase">
-					<defName>Ammo_30mmRifleGrenade_HE</defName>
-					<label>30mm rifle grenade (HE)</label>
-					<graphicData>
-						<texPath>Things/Ammo/GrenadeLauncher/HE</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>2.62</MarketValue>
-					</statBases>
-					<ammoClass>GrenadeHE</ammoClass>
-					<detonateProjectile>Bullet_30mmRifleGrenade_HE</detonateProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="30mmRifleGrenadeBase">
-					<defName>Ammo_30mmRifleGrenade_EMP</defName>
-					<label>30mm rifle grenade (EMP)</label>
-					<graphicData>
-						<texPath>Things/Ammo/GrenadeLauncher/EMP</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>4.72</MarketValue>
-					</statBases>
-					<ammoClass>GrenadeEMP</ammoClass>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>5</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>0.75</explosiveRadius>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>1</Fragment_Large>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="30mmRifleGrenadeBase">
-					<defName>Ammo_30mmRifleGrenade_Smoke</defName>
-					<label>30mm riflegrenade (Smoke)</label>
-					<graphicData>
-						<texPath>Things/Ammo/GrenadeLauncher/SMK</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>2.31</MarketValue>
-					</statBases>
-					<ammoClass>Smoke</ammoClass>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>5</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>0.75</explosiveRadius>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>1</Fragment_Large>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef Name="Base30mmRifleGrenadeBullet" ParentName="BaseExplosiveBullet" Abstract="true">
-					<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					<graphicData>
-						<texPath>Things/Projectile/Bullet_Big</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>26</speed>
-						<flyOverhead>false</flyOverhead>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base30mmRifleGrenadeBullet">
-					<defName>Bullet_30mmRifleGrenade_HE</defName>
-					<label>30mm riflegrenade (HE)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<explosionRadius>1</explosionRadius>
-						<damageDef>Bomb</damageDef>
-						<damageAmountBase>18</damageAmountBase>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>1</Fragment_Large>
-								<Fragment_Small>3</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<ThingDef ParentName="Base30mmRifleGrenadeBullet">
-					<defName>Bullet_30mmRifleGrenade_EMP</defName>
-					<label>30mm riflegrenade (EMP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<explosionRadius>1.25</explosionRadius>
-						<damageDef>EMP</damageDef>
-						<damageAmountBase>18</damageAmountBase>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base30mmRifleGrenadeBullet">
-					<defName>Bullet_30mmRifleGrenade_Smoke</defName>
-					<label>30mm riflegrenade (Smoke)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<explosionRadius>1.5</explosionRadius>
-						<damageDef>Smoke</damageDef>
-						<suppressionFactor>0.0</suppressionFactor>
-						<dangerFactor>0.0</dangerFactor>
-						<postExplosionGasType>BlindSmoke</postExplosionGasType>
-						<preExplosionSpawnChance>1</preExplosionSpawnChance>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_30mmRifleGrenade_HE</defName>
-					<label>make 30mm rifleHE grenades x100</label>
-					<description>Craft 100 30mm rifleHE grenades.</description>
-					<jobString>Making 30mm rifleHE grenades.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>70</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>6</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_30mmRifleGrenade_HE>100</Ammo_30mmRifleGrenade_HE>
-					</products>
-					<workAmount>11000</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_30mmRifleGrenade_EMP</defName>
-					<label>make 30mm rifleEMP grenades x100</label>
-					<description>Craft 100 30mm rifleEMP grenades.</description>
-					<jobString>Making 30mm rifleEMP grenades.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>70</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>8</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_30mmRifleGrenade_EMP>100</Ammo_30mmRifleGrenade_EMP>
-					</products>
-					<workAmount>13000</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_30mmRifleGrenade_Smoke</defName>
-					<label>make 30mm riflesmoke grenades x100</label>
-					<description>Craft 100 30mm riflesmoke grenades.</description>
-					<jobString>Making 30mm riflesmoke grenades.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>70</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Prometheum</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_30mmRifleGrenade_Smoke>100</Ammo_30mmRifleGrenade_Smoke>
-					</products>
-					<workAmount>9400</workAmount>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Censored Armory/37x249mmR.xml b/Patches/Censored Armory/37x249mmR.xml
deleted file mode 100644
index c6aeac19b8..0000000000
--- a/Patches/Censored Armory/37x249mmR.xml	
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Censored Armory</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>Ammo37x249mmR</defName>
-					<label>37x249mmR</label>
-					<parent>AmmoShells</parent>
-					<iconPath>Turret/PaK_36/Projectile/Shell_HE/Shell_PaK_36_HE</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_37x249mmR</defName>
-					<label>37x249mmR</label>
-					<ammoTypes>
-						<Ammo_37x249mmR_HE>Bullet_37x249mmR_HE</Ammo_37x249mmR_HE>
-						<Ammo_37x249mmR_AP>Bullet_37x249mmR_AP</Ammo_37x249mmR_AP>
-					</ammoTypes>
-					<isMortarAmmoSet>true</isMortarAmmoSet>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="Ammo37x249mmRBase" ParentName="MediumAmmoBase" Abstract="True">
-					<description>Medium caliber cannon shell used by light, quick-firing anti-tank guns.</description>
-					<statBases>
-						<Mass>1.305</Mass>
-						<Bulk>1.41</Bulk>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-					</tradeTags>
-					<thingCategories>
-						<li>Ammo37x249mmR</li>
-					</thingCategories>
-					<stackLimit>150</stackLimit>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo37x249mmRBase">
-					<defName>Ammo_37x249mmR_HE</defName>
-					<label>37x249mmR cartridge (APHE)</label>
-					<graphicData>
-						<texPath>Turret/PaK_36/Projectile/Shell_HE/Shell_PaK_36_HE</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-						<drawSize>1.50</drawSize>
-					</graphicData>
-					<statBases>
-						<MarketValue>7.75</MarketValue>
-					</statBases>
-					<ammoClass>ExplosiveAP</ammoClass>
-					<cookOffProjectile>Bullet_37x249mmR_HE</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo37x249mmRBase">
-					<defName>Ammo_37x249mmR_AP</defName>
-					<label>37x249mmR cartridge (AP)</label>
-					<graphicData>
-						<texPath>Turret/PaK_36/Projectile/Shell_APCR/Shell_PaK_36_APCR</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-						<drawSize>1.50</drawSize>
-					</graphicData>
-					<statBases>
-						<MarketValue>5.24</MarketValue>
-					</statBases>
-					<ammoClass>ArmorPiercing</ammoClass>
-					<cookOffProjectile>Bullet_37x249mmR_AP</cookOffProjectile>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef ParentName="Base40x365mmBoforsBullet">
-					<defName>Bullet_37x249mmR_HE</defName>
-					<label>37x249mmR shell (APHE)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>146</speed>
-						<damageAmountBase>155</damageAmountBase>
-						<armorPenetrationSharp>54</armorPenetrationSharp>
-						<armorPenetrationBlunt>5574.18</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Bomb_Secondary</def>
-								<amount>93</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base40x365mmBoforsBullet">
-					<defName>Bullet_37x249mmR_AP</defName>
-					<label>37x249mmR shell (AP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>146</speed>
-						<damageAmountBase>97</damageAmountBase>
-						<armorPenetrationSharp>77</armorPenetrationSharp>
-						<armorPenetrationBlunt>5574.18</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_37x249mmR_HE</defName>
-					<label>make 37x249mmR (HE) cartridge x25</label>
-					<description>Craft 25 37x249mmR (HE) cartridges.</description>
-					<jobString>Making 37x249mmR (HE) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>66</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>23</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_37x249mmR_HE>25</Ammo_37x249mmR_HE>
-					</products>
-					<workAmount>15800</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_37x249mmR_AP</defName>
-					<label>make 37x249mmR (AP) cartridge x25</label>
-					<description>Craft 25 37x249mmR (AP) cartridges.</description>
-					<jobString>Making 37x249mmR (AP) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>66</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_37x249mmR_AP>25</Ammo_37x249mmR_AP>
-					</products>
-					<workAmount>10800</workAmount>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Censored Armory/75cm leIG18.xml b/Patches/Censored Armory/75cm leIG18.xml
deleted file mode 100644
index bdc8908715..0000000000
--- a/Patches/Censored Armory/75cm leIG18.xml	
+++ /dev/null
@@ -1,232 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Censored Armory</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>Ammo75cmleIG18CannonShells</defName>
-					<label>7.5 cm Cannon shell</label>
-					<parent>AmmoShells</parent>
-					<iconPath>Turret/le.IG_18/Projectile/Shell_le.IG_18_HE</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_75cmleIG18Shell</defName>
-					<label>7.5 cm Cannon shells</label>
-					<ammoTypes>
-						<Ammo_75cmleIG18CannonShell_HE>Bullet_75cmleIG18CannonShell_HE</Ammo_75cmleIG18CannonShell_HE>
-						<Ammo_75cmleIG18CannonShell_EMP>Bullet_75cmleIG18CannonShell_EMP</Ammo_75cmleIG18CannonShell_EMP>
-					</ammoTypes>
-					<isMortarAmmoSet>true</isMortarAmmoSet>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="75cmleIG18CannonShellBase" ParentName="HeavyAmmoBase" Abstract="True">
-					<description>Light cannon shell used in field guns.</description>
-					<thingCategories>
-						<li>Ammo75cmleIG18CannonShells</li>
-					</thingCategories>
-					<stackLimit>25</stackLimit>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-					</tradeTags>
-					<statBases>
-						<MaxHitPoints>150</MaxHitPoints>
-						<Mass>6.62</Mass>
-						<Bulk>13</Bulk>
-					</statBases>
-					<cookOffFlashScale>20</cookOffFlashScale>
-					<cookOffSound>MortarBomb_Explode</cookOffSound>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="75cmleIG18CannonShellBase">
-					<defName>Ammo_75cmleIG18CannonShell_HE</defName>
-					<label>7.5cm cannon shell (HE)</label>
-					<graphicData>
-						<texPath>Turret/le.IG_18/Projectile/Shell_le.IG_18_HE</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>88.82</MarketValue>
-					</statBases>
-					<ammoClass>GrenadeHE</ammoClass>
-					<detonateProjectile>Bullet_75cmleIG18CannonShell_HE</detonateProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="75cmleIG18CannonShellBase">
-					<defName>Ammo_75cmleIG18CannonShell_EMP</defName>
-					<label>7.5cm cannon shell (EMP)</label>
-					<graphicData>
-						<texPath>Turret/le.IG_18/Projectile/Shell_HEAT/Shell_le.IG_18_HEAT</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>162.07</MarketValue>
-					</statBases>
-					<ammoClass>GrenadeEMP</ammoClass>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>99</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>3</explosiveRadius>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>20</Fragment_Large>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef Name="Base75cmleIG18CannonShell" ParentName="BaseExplosiveBullet" Abstract="true">
-					<graphicData>
-						<shaderType>TransparentPostLight</shaderType>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>56</speed>
-						<soundExplode>MortarBomb_Explode</soundExplode>
-						<flyOverhead>false</flyOverhead>
-						<dropsCasings>true</dropsCasings>
-						<casingMoteDefname>Fleck_BigShell</casingMoteDefname>
-						<casingFilthDefname>Filth_CannonAmmoCasings</casingFilthDefname>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base75cmleIG18CannonShell">
-					<defName>Bullet_75cmleIG18CannonShell_HE</defName>
-					<label>7.5 cm shell (HE)</label>
-					<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					<graphicData>
-						<texPath>Turret/le.IG_18/Projectile/Bullet_le.IG_18_HE</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bomb</damageDef>
-						<damageAmountBase>184</damageAmountBase>
-						<explosionRadius>3</explosionRadius>
-						<soundExplode>MortarBomb_Explode</soundExplode>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>17</Fragment_Large>
-								<Fragment_Small>40</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<ThingDef ParentName="Base75cmleIG18CannonShell">
-					<defName>Bullet_75cmleIG18CannonShell_EMP</defName>
-					<label>7.5 cm shell (EMP)</label>
-					<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					<graphicData>
-						<texPath>Turret/le.IG_18/Projectile/Bullet_le.IG_18_HEAT</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>EMP</damageDef>
-						<damageAmountBase>99</damageAmountBase>
-						<explosionRadius>6</explosionRadius>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_75cmleIG18CannonShell_HE</defName>
-					<label>make 7.5 cm HE cannon shells x5</label>
-					<description>Craft 5 7.5 cm HE cannon shells.</description>
-					<jobString>Making 7.5 cm HE cannon shells.</jobString>
-					<workAmount>13000</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>130</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>14</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_75cmleIG18CannonShell_HE>5</Ammo_75cmleIG18CannonShell_HE>
-					</products>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_75cmleIG18CannonShell_EMP</defName>
-					<label>make 7.5 cm EMP cannon shells x5</label>
-					<description>Craft 5 7.5 cm EMP cannon shells.</description>
-					<jobString>Making 7.5 cm EMP cannon shells.</jobString>
-					<workAmount>13800</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>130</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>17</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_75cmleIG18CannonShell_EMP>5</Ammo_75cmleIG18CannonShell_EMP>
-					</products>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Censored Armory/75x714mmR.xml b/Patches/Censored Armory/75x714mmR.xml
deleted file mode 100644
index 4e66057ecc..0000000000
--- a/Patches/Censored Armory/75x714mmR.xml	
+++ /dev/null
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Censored Armory</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>Ammo75x714mmRShells</defName>
-					<label>75x714mmR shell</label>
-					<parent>AmmoShells</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberCannon</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_75x714mmRShell</defName>
-					<label>75x714mmR shells</label>
-					<ammoTypes>
-						<Ammo_75x714mmRShell_AP>Bullet_75x714mmRShell_AP</Ammo_75x714mmRShell_AP>
-						<Ammo_75x714mmRShell_HE>Bullet_75x714mmRShell_HE</Ammo_75x714mmRShell_HE>
-					</ammoTypes>
-					<isMortarAmmoSet>true</isMortarAmmoSet>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="75x714mmRShellBase" ParentName="HeavyAmmoBase" Abstract="True">
-					<description>A relatively powerful, high-velocity shell designed to destroy heavily armored targets.</description>
-					<thingCategories>
-						<li>Ammo75x714mmRShells</li>
-					</thingCategories>
-					<stackLimit>25</stackLimit>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-					</tradeTags>
-					<statBases>
-						<MaxHitPoints>200</MaxHitPoints>
-						<Mass>6.1</Mass>
-						<Bulk>22.84</Bulk>
-					</statBases>
-					<cookOffFlashScale>30</cookOffFlashScale>
-					<cookOffSound>MortarBomb_Explode</cookOffSound>
-					<isMortarAmmo>true</isMortarAmmo>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="75x714mmRShellBase">
-					<defName>Ammo_75x714mmRShell_AP</defName>
-					<label>75x714mmR shell (AP)</label>
-					<graphicData>
-						<texPath>Turret/PaK_40/Projectile/Shell_APCR/Shell_PaK_40_APCR</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-						<drawSize>1.50</drawSize>
-					</graphicData>
-					<statBases>
-						<MarketValue>50</MarketValue>
-					</statBases>
-					<ammoClass>ArmorPiercing</ammoClass>
-					<detonateProjectile>Bullet_75x714mmRShell_AP</detonateProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="75x714mmRShellBase">
-					<defName>Ammo_75x714mmRShell_HE</defName>
-					<label>75x714mmR shell (HE)</label>
-					<graphicData>
-						<texPath>Turret/PaK_40/Projectile/Shell_HE/Shell_PaK_40_HE</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-						<drawSize>1.50</drawSize>
-					</graphicData>
-					<statBases>
-						<MarketValue>47.5</MarketValue>
-					</statBases>
-					<ammoClass>GrenadeHE</ammoClass>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>285</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>2.5</explosiveRadius>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>5</Fragment_Large>
-								<Fragment_Small>18</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef ParentName="Base90mmCannonShell">
-					<defName>Bullet_75x714mmRShell_AP</defName>
-					<label>75x714mmR shell (AP)</label>
-					<graphicData>
-						<texPath>Turret/PaK_40/Projectile/Bullet_PaK_40_APCR</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>98</speed>
-						<dropsCasings>true</dropsCasings>
-						<damageDef>Bullet</damageDef>
-						<damageAmountBase>248</damageAmountBase>
-						<soundExplode>MortarBomb_Explode</soundExplode>
-						<armorPenetrationSharp>400</armorPenetrationSharp>
-						<armorPenetrationBlunt>33.339</armorPenetrationBlunt>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>111</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>1</explosiveRadius>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>3</Fragment_Large>
-								<Fragment_Small>8</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<ThingDef ParentName="Base90mmCannonShell">
-					<defName>Bullet_75x714mmRShell_HE</defName>
-					<label>75x714mmR shell (HE)</label>
-					<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					<graphicData>
-						<texPath>Turret/PaK_40/Projectile/Bullet_PaK_40_HE</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>98</speed>
-						<dropsCasings>true</dropsCasings>
-						<damageDef>Bomb</damageDef>
-						<damageAmountBase>111</damageAmountBase>
-						<armorPenetrationSharp>0</armorPenetrationSharp>
-						<armorPenetrationBlunt>0</armorPenetrationBlunt>
-						<explosionRadius>2</explosionRadius>
-						<soundExplode>MortarBomb_Explode</soundExplode>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>15</Fragment_Large>
-								<Fragment_Small>57</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_75x714mmRShell_AP</defName>
-					<label>make 75x714mm AP cannon shells x5</label>
-					<description>Craft 5 75x714mm AP cannon shells.</description>
-					<jobString>Making 75x714mm AP cannon shells.</jobString>
-					<workAmount>9800</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>62</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>6</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_75x714mmRShell_AP>5</Ammo_75x714mmRShell_AP>
-					</products>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_75x714mmRShell_HE</defName>
-					<label>make 75x714mm HE cannon shells x5</label>
-					<description>Craft 5 75x714mm HE cannon shells.</description>
-					<jobString>Making 75x714mm HE cannon shells.</jobString>
-					<workAmount>9800</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>62</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>6</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_75x714mmRShell_HE>5</Ammo_75x714mmRShell_HE>
-					</products>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Censored Armory/80mm Panzerfaust.xml b/Patches/Censored Armory/80mm Panzerfaust.xml
deleted file mode 100644
index 1397dd0ce4..0000000000
--- a/Patches/Censored Armory/80mm Panzerfaust.xml	
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Censored Armory</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef ParentName="BaseRPG7Grenade">
-					<defName>Bullet_Panzerfaust60_HEAT</defName>
-					<label>Panzerfaust 60 rocket</label>
-					<graphicData>
-						<texPath>Weapon/Heavy/Projectile/Bullet_Faustpatrone</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>34</speed>
-						<damageDef>Bullet</damageDef>
-						<damageAmountBase>208</damageAmountBase>
-						<armorPenetrationSharp>200</armorPenetrationSharp>
-						<armorPenetrationBlunt>37.321</armorPenetrationBlunt>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>124</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>1</explosiveRadius>
-							<explosionSound>MortarBomb_Explode</explosionSound>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-					</comps>
-				</ThingDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Censored Armory/Recipes_Grenades.xml b/Patches/Censored Armory/Recipes_Grenades.xml
deleted file mode 100644
index 21a707269c..0000000000
--- a/Patches/Censored Armory/Recipes_Grenades.xml	
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Censored Armory</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>MakeM24Grenade</defName>
-							<label>make M24 grenades x10</label>
-							<description>Craft 10 M24 grenades.</description>
-							<jobString>Making M24 grenades.</jobString>
-							<workAmount>3400</workAmount>
-							<recipeUsers Inherit="False">
-								<li>TableRA</li>
-							</recipeUsers>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>6</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>6</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>WoodLog</li>
-									<li>FSX</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<researchPrerequisite>Stage0b_RA</researchPrerequisite>
-							<products>
-								<Weapon_M24_RA>10</Weapon_M24_RA>
-							</products>
-						</RecipeDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Censored Armory/Weapons_Guns.xml b/Patches/Censored Armory/Weapons_Guns.xml
deleted file mode 100644
index 90ade39a35..0000000000
--- a/Patches/Censored Armory/Weapons_Guns.xml	
+++ /dev/null
@@ -1,1356 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Censored Armory</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Remove Recipes ========== -->
-
-				<!-- <li Class="PatchOperationRemove">
-					<xpath>Defs/RecipeDef[defName="Make_Kar98K_Ammo_RA"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="TableRA"]/recipes/li[text()="Make_Kar98K_Ammo_RA"]</xpath>
-				</li> -->
-
-				<!-- ========== Tools ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName="Gun_P08_RA" or
-						defName="Gun_P38_RA" or
-						defName="Gun_PPK_RA" or
-						defName="Gun_Volkspistole_RA"
-						]/tools
-					</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName="Gun_StG_44_Scope_RA" or
-						defName="Gun_StG_44_RA" or
-						defName="Gun_FG_42_RA" or
-						defName="Gun_MP_507_RA" or
-						defName="Gun_MP_40_RA" or
-						defName="Gun_MP_35_RA" or
-						defName="Gun_MP_3008_RA" or
-						defName="Gun_MG_42_RA" or
-						defName="Gun_MG_34_RA" or
-						defName="Gun_Kar98K_Sniper_RA" or
-						defName="Gun_Kar98K_Schiessbecher_RA" or
-						defName="Gun_Kar98K_RA" or
-						defName="Gun_VG1_RA" or
-						defName="Gun_Gew_Scope_43_RA" or
-						defName="Gun_Gew_43_RA" or
-						defName="Gun_PzB_39_RA"
-						]/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>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Gun_Panzerfaust_60_RA" or defName="Gun_Eintossflammenwerfer_46_RA"]</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>
-				</li>
-
-				<!-- ========== STG 44 w/ Scope ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_StG_44_Scope_RA</defName>
-					<statBases>
-						<Mass>4.80</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.46</SwayFactor>
-						<Bulk>9.40</Bulk>
-						<WorkToMake>500</WorkToMake>
-					</statBases>
-					<costList>
-						<Gun_StG_44_RA>1</Gun_StG_44_RA>
-						<Steel>10</Steel>
-					</costList>
-					<Properties>
-						<recoilAmount>1.51</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_792x33mmKurz_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<soundCast>Shot_StG_44</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_792x33mmKurz</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<researchPrerequisite>Stage2b_RA</researchPrerequisite>
-				</li>
-
-				<!-- ========== STG 44 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_StG_44_RA</defName>
-					<statBases>
-						<Mass>4.60</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.40</SwayFactor>
-						<Bulk>9.35</Bulk>
-						<WorkToMake>20000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>90</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-						<WoodLog>5</WoodLog>
-					</costList>
-					<Properties>
-						<recoilAmount>1.54</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_792x33mmKurz_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<soundCast>Shot_StG_44</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_792x33mmKurz</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<researchPrerequisite>Stage2b_RA</researchPrerequisite>
-				</li>
-
-				<!-- ========== FG 42 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_FG_42_RA</defName>
-					<statBases>
-						<Mass>4.20</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.41</SwayFactor>
-						<Bulk>9.45</Bulk>
-						<WorkToMake>24000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>120</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-						<WoodLog>10</WoodLog>
-					</costList>
-					<Properties>
-						<recoilAmount>2.14</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>Shot_FG_42</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<researchPrerequisite>Stage1b_RA</researchPrerequisite>
-				</li>
-
-				<!-- ========== MP 507 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MP_507_RA</defName>
-					<statBases>
-						<Mass>4.60</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.35</SwayFactor>
-						<Bulk>8.85</Bulk>
-						<WorkToMake>12000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>50</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-						<WoodLog>10</WoodLog>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_792x33mmKurz_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>40</range>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<soundCast>Shot_MP_507</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_792x33mmKurz</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<researchPrerequisite>Stage2c_RA</researchPrerequisite>
-				</li>
-
-				<!-- ========== MP 40 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MP_40_RA</defName>
-					<statBases>
-						<Mass>3.97</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<Bulk>6.30</Bulk>
-						<WorkToMake>14000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>70</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.16</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<soundCast>Shot_MP_40</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<researchPrerequisite>Stage1b_RA</researchPrerequisite>
-				</li>
-
-				<!-- ========== MP 35 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MP_35_RA</defName>
-					<statBases>
-						<Mass>4.24</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.26</SwayFactor>
-						<Bulk>8.40</Bulk>
-						<WorkToMake>18000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>60</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-						<WoodLog>10</WoodLog>
-					</costList>
-					<Properties>
-						<recoilAmount>1.12</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<soundCast>Shot_MP_35</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>24</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<researchPrerequisite>Stage0b_RA</researchPrerequisite>
-				</li>
-
-				<!-- ========== MP 3008 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MP_3008_RA</defName>
-					<statBases>
-						<Mass>4.24</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.08</SwayFactor>
-						<Bulk>7.60</Bulk>
-						<WorkToMake>8000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.29</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<soundCast>Shot_MP_3008</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<researchPrerequisite>Stage2c_RA</researchPrerequisite>
-				</li>
-
-				<!-- ========== P38 (Walther) ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_P38_RA</defName>
-					<statBases>
-						<Mass>0.84</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.00</SwayFactor>
-						<Bulk>2.16</Bulk>
-						<WorkToMake>10000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_P38</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<researchPrerequisite>Stage1b_RA</researchPrerequisite>
-				</li>
-
-				<!-- ========== P08 (Luger) ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_P08_RA</defName>
-					<statBases>
-						<Mass>0.87</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.03</SwayFactor>
-						<Bulk>2.22</Bulk>
-						<WorkToMake>14000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_P08</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<researchPrerequisite>Stage0b_RA</researchPrerequisite>
-				</li>
-
-				<!-- ========== PPK ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PPK_RA</defName>
-					<statBases>
-						<Mass>0.59</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.19</ShotSpread>
-						<SwayFactor>0.71</SwayFactor>
-						<Bulk>1.55</Bulk>
-						<WorkToMake>10000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_32ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_PPK</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_32ACP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<researchPrerequisite>Stage0b_RA</researchPrerequisite>
-				</li>
-
-				<!-- ========== Volkspistole ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Volkspistole_RA</defName>
-					<statBases>
-						<Mass>1.10</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.08</SwayFactor>
-						<Bulk>2.15</Bulk>
-						<WorkToMake>6000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Volkspistole</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<researchPrerequisite>Stage2c_RA</researchPrerequisite>
-				</li>
-
-				<!-- ========== MG 42 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MG_42_RA</defName>
-					<statBases>
-						<Mass>15.20</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.67</SwayFactor>
-						<Bulk>11.60</Bulk>
-						<WorkToMake>18000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>140</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-						<WoodLog>5</WoodLog>
-					</costList>
-					<Properties>
-						<recoilAmount>1.25</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>65</range>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>Shot_MG_42</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<researchPrerequisite>Stage0b_RA</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== MG 34 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MG_34_RA</defName>
-					<statBases>
-						<Mass>15.20</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.70</SwayFactor>
-						<Bulk>12.10</Bulk>
-						<WorkToMake>18000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>130</Steel>
-						<ComponentIndustrial>8</ComponentIndustrial>
-						<WoodLog>5</WoodLog>
-					</costList>
-					<Properties>
-						<recoilAmount>1.22</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>68</range>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>Shot_MG_34</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<researchPrerequisite>Stage0b_RA</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Kar98k with Scope ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Kar98K_Sniper_RA</defName>
-					<statBases>
-						<Mass>4.20</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.56</SwayFactor>
-						<Bulk>11.00</Bulk>
-						<WorkToMake>500</WorkToMake>
-					</statBases>
-					<costList>
-						<Gun_Kar98K_RA>1</Gun_Kar98K_RA>
-						<Steel>10</Steel>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>68</range>
-						<soundCast>Shot_Kar98K</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<researchPrerequisite>Stage0b_RA</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Kar98k with Grenade Launcher ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Kar98K_Schiessbecher_RA</defName>
-					<statBases>
-						<Mass>4.20</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.56</SwayFactor>
-						<Bulk>11.00</Bulk>
-						<WorkToMake>500</WorkToMake>
-					</statBases>
-					<costList>
-						<Gun_Kar98K_RA>1</Gun_Kar98K_RA>
-						<FSX>7</FSX>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_30mmRifleGrenade_HE</defaultProjectile>
-						<warmupTime>1.8</warmupTime>
-						<minRange>6</minRange>
-						<range>44</range>
-						<soundCast>Shot_Schiessbecher</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<requireLineOfSight>false</requireLineOfSight>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>2</AmmoGenPerMagOverride>
-						<reloadTime>6</reloadTime>
-						<ammoSet>AmmoSet_30mmRifleGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<researchPrerequisite>Stage1b_RA</researchPrerequisite>
-				</li>
-
-				<!-- ========== Kar98k with Bayonet ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Kar98K_Bayonet_RA</defName>
-					<statBases>
-						<Mass>4.10</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.90</SwayFactor>
-						<Bulk>14.85</Bulk>
-						<WorkToMake>500</WorkToMake>
-					</statBases>
-					<costList>
-						<Gun_Kar98K_RA>1</Gun_Kar98K_RA>
-						<MeleeWeapon_S84_98_III_RA>1</MeleeWeapon_S84_98_III_RA>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_Kar98K</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>IndustrialGunAdvanced</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-					<researchPrerequisite>Stage0b_RA</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Gun_Kar98K_Bayonet_RA"]/equippedStatOffsets/MentalBreakThreshold</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Kar98K_Bayonet_RA"]/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>bayonet</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>2.14</cooldownTime>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>bayonet</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.49</cooldownTime>
-								<armorPenetrationBlunt>2.16</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.44</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Kar98k ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Kar98K_RA</defName>
-					<statBases>
-						<Mass>4.00</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.50</SwayFactor>
-						<Bulk>11.00</Bulk>
-						<WorkToMake>12000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>50</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-						<WoodLog>20</WoodLog>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_Kar98K</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<researchPrerequisite>Stage0b_RA</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Walther VG-1 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_VG1_RA</defName>
-					<statBases>
-						<Mass>3.76</Mass>
-						<RangedWeapon_Cooldown>1.18</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.47</SwayFactor>
-						<Bulk>10.92</Bulk>
-						<WorkToMake>8000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>50</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-						<WoodLog>20</WoodLog>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_VG1</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.0</reloadTime>
-						<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<researchPrerequisite>Stage2c_RA</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== G43 w/ Scope ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Gew_Scope_43_RA</defName>
-					<statBases>
-						<Mass>4.60</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.61</SwayFactor>
-						<Bulk>11.30</Bulk>
-						<WorkToMake>500</WorkToMake>
-					</statBases>
-					<costList>
-						<Gun_Gew_43_RA>1</Gun_Gew_43_RA>
-						<Steel>10</Steel>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>68</range>
-						<soundCast>Shot_Gew_43</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<researchPrerequisite>Stage1b_RA</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== G43 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Gew_43_RA</defName>
-					<statBases>
-						<Mass>4.40</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.57</SwayFactor>
-						<Bulk>11.30</Bulk>
-						<WorkToMake>18000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>70</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-						<WoodLog>20</WoodLog>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_Gew_43</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<researchPrerequisite>Stage1b_RA</researchPrerequisite>
-				</li>
-
-				<!-- ========== PzB 38 Anti-tank Rifle ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PzB_39_RA</defName>
-					<statBases>
-						<Mass>11.60</Mass>
-						<RangedWeapon_Cooldown>1.05</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.95</SwayFactor>
-						<Bulk>17.20</Bulk>
-						<WorkToMake>8000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>50</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-						<WoodLog>20</WoodLog>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_792x94mmPatronen_FMJ</defaultProjectile>
-						<warmupTime>2.8</warmupTime>
-						<range>62</range>
-						<soundCast>Shot_PzB_39</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>8</AmmoGenPerMagOverride>
-						<reloadTime>1.6</reloadTime>
-						<ammoSet>AmmoSet_792x94mmPatronen</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<researchPrerequisite>Stage2c_RA</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Panzerfaust 60 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Panzerfaust_60_RA</defName>
-					<statBases>
-						<Mass>6.80</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.80</SightsEfficiency>
-						<ShotSpread>0.6</ShotSpread>
-						<SwayFactor>1.65</SwayFactor>
-						<Bulk>11.40</Bulk>
-						<WorkToMake>6000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-						<FSX>4</FSX>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Panzerfaust60_HEAT</defaultProjectile>
-						<warmupTime>1.8</warmupTime>
-						<range>14</range>
-						<soundCast>Shot_Panzerfaust</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes />
-					<weaponTags>
-						<li>GunHeavy</li>
-					</weaponTags>
-					<researchPrerequisite>Stage2b_RA</researchPrerequisite>
-				</li>
-
-				<!-- ========== Eintossflammenwerfer 46 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Eintossflammenwerfer_46_RA</defName>
-					<statBases>
-						<Mass>3.60</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.80</SightsEfficiency>
-						<ShotSpread>0.6</ShotSpread>
-						<SwayFactor>1.65</SwayFactor>
-						<Bulk>7.50</Bulk>
-						<WorkToMake>6000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-						<Chemfuel>40</Chemfuel>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Flamethrower_Napalm</defaultProjectile>
-						<warmupTime>1.8</warmupTime>
-						<range>11</range>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>25</burstShotCount>
-						<soundCast>Shot_Eintoss</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<muzzleFlashScale>14</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>GunHeavy</li>
-					</weaponTags>
-					<researchPrerequisite>Stage2c_RA</researchPrerequisite>
-				</li>
-
-				<!-- M24 Stielhandgranate Concussion Grenade -->
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="Weapon_M24_RA"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>BaseWeapon</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Weapon_M24_RA"]/label</xpath>
-					<value>
-						<label>M24 concussion grenade</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Weapon_M24_RA"]</xpath>
-					<value>
-						<equippedAngleOffset>90</equippedAngleOffset>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Weapon_M24_RA"]</xpath>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<stackLimit>75</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="Weapon_M24_RA"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Weapon_M24_RA"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Weapon_M24_RA"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Weapon_M24_RA"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>60</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>2</explosiveRadius>
-						</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Weapon_M24_RA</defName>
-					<statBases>
-						<Mass>0.82</Mass>
-						<Bulk>0.36</Bulk>
-						<MarketValue>12.22</MarketValue>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<label>throw concussion grenade</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<range>13.0</range>
-						<minRange>2</minRange>
-						<warmupTime>0.8</warmupTime>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<soundCast>ThrowGrenade</soundCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<defaultProjectile>Proj_M24_RA</defaultProjectile>
-						<onlyManualCast>true</onlyManualCast>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<weaponTags>
-						<li>CE_AI_Grenade</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-					<researchPrerequisite>Stage0b_RA</researchPrerequisite>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Weapon_M24_RA"]/recipeMaker</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Weapon_M24_RA"]/costList</xpath>
-				</li>
-
-				<!-- Projectile -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Proj_M24_RA"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Proj_M24_RA"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>2</explosionRadius>
-							<damageDef>Bomb</damageDef>
-							<damageAmountBase>56</damageAmountBase>
-							<explosionDelay>60</explosionDelay>
-							<dropsCasings>false</dropsCasings>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							<speed>19</speed>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Proj_M24_RA"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Proj_M24_RA"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Censored Armory/Weapons_Melee.xml b/Patches/Censored Armory/Weapons_Melee.xml
deleted file mode 100644
index a444e26740..0000000000
--- a/Patches/Censored Armory/Weapons_Melee.xml	
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Censored Armory</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Shovel === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="Feldspaten_RA"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<MeleeCounterParryBonus>0.40</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="Feldspaten_RA"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>0.40</MeleeParryChance>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Feldspaten_RA"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.28</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Bayonet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_S84_98_III_RA"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<MeleeCounterParryBonus>0.30</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_S84_98_III_RA"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.10</MeleeCritChance>
-						<MeleeParryChance>0.30</MeleeParryChance>
-						<MeleeDodgeChance>0.010</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_S84_98_III_RA"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_S84_98_III_RA"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1</cooldownTime>
-								<armorPenetrationBlunt>0.56</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.72</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1</cooldownTime>
-								<chanceFactor>1.88</chanceFactor>
-								<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.76</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Censored Armory/Weapons_Turrets.xml b/Patches/Censored Armory/Weapons_Turrets.xml
deleted file mode 100644
index 57b35246c8..0000000000
--- a/Patches/Censored Armory/Weapons_Turrets.xml	
+++ /dev/null
@@ -1,570 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Censored Armory</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Common to all Turrets ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						@Name="Base_PaK_36_RA" or
-						@Name="Base_leIG_18_RA" or
-						@Name="Base_Nebelwerfer_41_RA" or
-						@Name="Base_PaK_40_RA" or
-						defName="Turret_Flak_38_Panzergrau_RA" or
-						defName="Turret_Flak_38_Dunkelgelb_RA" or
-						defName="Turret_Flak_38_Camo_RA" or
-						defName="Turret_MG_42_RA"
-						]/thingClass
-					</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="Base_PaK_40_Weapon_RA"]/building/defaultStorageSettings/filter/disallowedThingDefs</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="Base_PaK_40_RA"]/inspectorTabs</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>
-						Defs/ThingDef[
-						defName="Turret_Flak_38_Panzergrau_RA" or
-						defName="Turret_Flak_38_Dunkelgelb_RA" or
-						defName="Turret_Flak_38_Camo_RA" or
-						defName="Turret_MG_42_RA"
-						]/comps/li[@Class = "CompProperties_Refuelable"]
-					</xpath>
-				</li>
-
-				<!-- ========== Remove Vanilla Shells & Ammo & References ========== -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>
-						Defs/ThingDef[defName="Shell_PaK_36_HE_RA"] |
-						Defs/ThingDef[defName="Shell_PaK_36_APCR_RA"] |
-						Defs/ThingDef[defName="Shell_leIG_18_HE_RA"] |
-						Defs/ThingDef[defName="Shell_leIG_18_HEAT_RA"] |
-						Defs/ThingDef[defName="Shell_Nebelwerfer_41_HE_RA"] |
-						Defs/ThingDef[defName="Belt_Flak_38_HEFIT_RA"] |
-						Defs/ThingDef[defName="Shell_PaK_40_HE_RA"] |
-						Defs/ThingDef[defName="Shell_PaK_40_APHECBC_RA"] |
-						Defs/ThingDef[defName="Shell_PaK_40_APCR_RA"]
-					</xpath>
-				</li>
-
-				<!-- ========== MG 42 (Static) ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MG_42_T_RA</defName>
-					<statBases>
-						<Mass>15.20</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>0.94</SwayFactor>
-						<Bulk>11.60</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.25</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>62</range>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>Shot_MG_42</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Flak 38 ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Flak_38_Camo_RA</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>2.3</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.18</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>3.07</SwayFactor>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_20x138mmB_AP</defaultProjectile>
-						<warmupTime>4.45</warmupTime>
-						<range>72</range>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
-						<soundCast>Shot_Flak_38</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>6</reloadTime>
-						<ammoSet>AmmoSet_20x138mmB</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>4</aimedBurstShotCount>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Flak_38_Panzergrau_RA</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>2.3</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.18</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>3.07</SwayFactor>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_20x138mmB_AP</defaultProjectile>
-						<warmupTime>4.45</warmupTime>
-						<range>72</range>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
-						<soundCast>Shot_Flak_38</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>6</reloadTime>
-						<ammoSet>AmmoSet_20x138mmB</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>4</aimedBurstShotCount>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Flak_38_Dunkelgelb_RA</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>2.3</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.18</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>3.07</SwayFactor>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_20x138mmB_AP</defaultProjectile>
-						<warmupTime>4.45</warmupTime>
-						<range>72</range>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
-						<soundCast>Shot_Flak_38</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>6</reloadTime>
-						<ammoSet>AmmoSet_20x138mmB</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>4</aimedBurstShotCount>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== PaK 36 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Artillery_PaK_36_RA</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>1.6</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.5</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1.89</SwayFactor>
-						<Bulk>40.00</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_37x249mmR_HE</defaultProjectile>
-						<warmupTime>1.4</warmupTime>
-						<range>78</range>
-						<soundCast>Shot_PaK_36</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_37x249mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Flak 40 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Artillery_PaK_40_Panzergrau_RA</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>2.5</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.01</SwayFactor>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_75x714mmRShell_HE</defaultProjectile>
-						<warmupTime>3.7</warmupTime>
-						<range>94</range>
-						<soundCast>Shot_PaK_40</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>29</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>10</reloadTime>
-						<ammoSet>AmmoSet_75x714mmRShell</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Artillery_PaK_40_Camo_RA</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>2.5</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.01</SwayFactor>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_75x714mmRShell_HE</defaultProjectile>
-						<warmupTime>3.7</warmupTime>
-						<range>94</range>
-						<soundCast>Shot_PaK_40</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>29</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>10</reloadTime>
-						<ammoSet>AmmoSet_75x714mmRShell</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Artillery_PaK_40_Dunkelgelb_RA</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>2.5</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.01</SwayFactor>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_75x714mmRShell_HE</defaultProjectile>
-						<warmupTime>3.7</warmupTime>
-						<range>94</range>
-						<soundCast>Shot_PaK_40</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>29</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>10</reloadTime>
-						<ammoSet>AmmoSet_75x714mmRShell</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== leIG 18 ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Artillery_leIG_18_RA"]</xpath>
-					<value>
-						<statBases>
-							<SightsEfficiency>0.8</SightsEfficiency>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Artillery_leIG_18_RA"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Artillery_leIG_18_RA"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Artillery_leIG_18_RA"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Charges">
-							<chargeSpeeds>
-								<li>30</li>
-								<li>42</li>
-								<li>70</li>
-								<li>80</li>
-							</chargeSpeeds>
-						</li>
-						<li Class="CombatExtended.CompProperties_AmmoUser">
-							<magazineSize>1</magazineSize>
-							<reloadTime>5</reloadTime>
-							<ammoSet>AmmoSet_75cmleIG18Shell</ammoSet>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Artillery_leIG_18_RA"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-								<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-								<hasStandardCommand>true</hasStandardCommand>
-								<requireLineOfSight>false</requireLineOfSight>
-								<defaultProjectile>Bullet_75cmleIG18CannonShell_HE</defaultProjectile>
-								<warmupTime>10</warmupTime>
-								<minRange>10</minRange>
-								<range>95</range>
-								<burstShotCount>1</burstShotCount>
-								<soundCast>Shot_le.IG_18</soundCast>
-								<muzzleFlashScale>39</muzzleFlashScale>
-								<circularError>1</circularError>
-								<indirectFirePenalty>0.15</indirectFirePenalty>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Patch base -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Base_leIG_18_RA"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Base_leIG_18_RA"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>5</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="Base_leIG_18_RA"]/building</xpath>
-					<value>
-						<spawnedConceptLearnOpportunity>CE_MortarDirectFire</spawnedConceptLearnOpportunity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="Base_leIG_18_RA"]/inspectorTabs</xpath>
-				</li>
-
-				<!-- ========== Nebelwerfer 41 ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Artillery_Nebelwerfer_41_RA"]</xpath>
-					<value>
-						<statBases>
-							<SightsEfficiency>0.8</SightsEfficiency>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Artillery_Nebelwerfer_41_RA"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Artillery_Nebelwerfer_41_RA"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Artillery_Nebelwerfer_41_RA"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Charges">
-							<chargeSpeeds>
-								<li>30</li>
-								<li>50</li>
-								<li>70</li>
-								<li>90</li>
-							</chargeSpeeds>
-						</li>
-						<li Class="CombatExtended.CompProperties_AmmoUser">
-							<magazineSize>6</magazineSize>
-							<reloadTime>8.5</reloadTime>
-							<ammoSet>AmmoSet_15cmNebelwerfer</ammoSet>
-						</li>
-						<li Class="CombatExtended.CompProperties_FireModes">
-							<aimedBurstShotCount>3</aimedBurstShotCount>
-							<aiUseBurstMode>FALSE</aiUseBurstMode>
-							<aiAimMode>AimedShot</aiAimMode>
-							<noSnapshot>true</noSnapshot>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Artillery_Nebelwerfer_41_RA"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-								<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-								<hasStandardCommand>true</hasStandardCommand>
-								<requireLineOfSight>false</requireLineOfSight>
-								<defaultProjectile>Bullet_15cmNebelwerfer_HE</defaultProjectile>
-								<warmupTime>10</warmupTime>
-								<minRange>40</minRange>
-								<range>1000</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-								<soundCast>Shot_Nebelwerfer_41</soundCast>
-								<muzzleFlashScale>39</muzzleFlashScale>
-								<circularError>1</circularError>
-								<indirectFirePenalty>0.15</indirectFirePenalty>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Patch base -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Base_Nebelwerfer_41_RA"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Base_Nebelwerfer_41_RA"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>5</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="Base_Nebelwerfer_41_RA"]/building</xpath>
-					<value>
-						<spawnedConceptLearnOpportunity>CE_MortarDirectFire</spawnedConceptLearnOpportunity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="Base_Nebelwerfer_41_RA"]/inspectorTabs</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Charge-Loading Lee-Enfield/ThingDefs_Weapons.xml b/Patches/Charge-Loading Lee-Enfield/ThingDefs_Weapons.xml
deleted file mode 100644
index 64c3631c40..0000000000
--- a/Patches/Charge-Loading Lee-Enfield/ThingDefs_Weapons.xml	
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Charge-Loading Lee-Enfield 1.4 Fork</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-			<!-- Melee Tools -->
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="Gun_ChargeEnfield" or defName="Gun_ChargeLewis"]/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>
-			</li>
-
-			<!-- Charge Enfield -->
-			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-				<defName>Gun_ChargeEnfield</defName>
-				<statBases>
-					<Mass>4.19</Mass>
-					<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-					<SightsEfficiency>1</SightsEfficiency>
-					<ShotSpread>0.02</ShotSpread>
-					<SwayFactor>1.68</SwayFactor>
-					<Bulk>12.60</Bulk>
-				</statBases>
-				<Properties>
-					<recoilAmount>1.75</recoilAmount>
-					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-					<hasStandardCommand>true</hasStandardCommand>
-					<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
-					<warmupTime>1.1</warmupTime>
-					<range>55</range>
-					<soundCast>Shot_ChargeEnfield</soundCast>
-					<soundCastTail>GunTail_Medium</soundCastTail>
-					<muzzleFlashScale>9</muzzleFlashScale>
-				</Properties>
-				<AmmoUser>
-					<magazineSize>10</magazineSize>
-					<reloadTime>4.3</reloadTime>
-					<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
-				</AmmoUser>
-				<FireModes>
-					<aiAimMode>AimedShot</aiAimMode>
-				</FireModes>
-				<weaponTags>
-					<li>CE_AI_SR</li>
-				</weaponTags>
-				<AllowWithRunAndGun>false</AllowWithRunAndGun>
-			</li>
-
-			<li Class="PatchOperationAddModExtension">
-				<xpath>Defs/ThingDef[defName="Gun_ChargeEnfield"]</xpath>
-				<value>
-					<li Class="CombatExtended.GunDrawExtension">
-						<DrawSize>1.15,1.15</DrawSize>
-						<DrawOffset>0.02,0.04</DrawOffset>
-						<CasingOffset>-0.1,0.1</CasingOffset>
-					</li>
-				</value>
-			</li>
-
-			<!-- Charge Lewis Gun -->
-			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-				<defName>Gun_ChargeLewis</defName>
-				<statBases>
-					<Mass>8.7</Mass>
-					<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					<SightsEfficiency>1</SightsEfficiency>
-					<ShotSpread>0.05</ShotSpread>
-					<SwayFactor>1.37</SwayFactor>
-					<Bulk>12.9</Bulk>
-				</statBases>
-				<Properties>
-					<recoilAmount>1.17</recoilAmount>
-					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-					<hasStandardCommand>true</hasStandardCommand>
-					<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
-					<warmupTime>1.3</warmupTime>
-					<range>62</range>
-					<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-					<burstShotCount>10</burstShotCount>
-					<soundCast>Shot_ChargeBlaster</soundCast>
-					<soundCastTail>GunTail_Medium</soundCastTail>
-					<muzzleFlashScale>9</muzzleFlashScale>
-					<targetParams>
-						<canTargetLocations>true</canTargetLocations>
-					</targetParams>
-					<recoilPattern>Mounted</recoilPattern>
-				</Properties>
-				<AmmoUser>
-					<magazineSize>50</magazineSize>
-					<reloadTime>4.9</reloadTime>
-					<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
-				</AmmoUser>
-				<FireModes>
-					<aimedBurstShotCount>5</aimedBurstShotCount>
-					<aiUseBurstMode>FALSE</aiUseBurstMode>
-					<aiAimMode>SuppressFire</aiAimMode>
-				</FireModes>
-				<weaponTags>
-					<li>CE_MachineGun</li>
-					<li>CE_AI_LMG</li>
-					<li>Bipod_LMG</li>
-				</weaponTags>
-			</li>
-
-			<li Class="PatchOperationAddModExtension">
-				<xpath>Defs/ThingDef[defName="Gun_ChargeLewis"]</xpath>
-				<value>
-					<li Class="CombatExtended.GunDrawExtension">
-						<DrawSize>1.2,1.14</DrawSize>
-						<DrawOffset>0.08,-0.03</DrawOffset>
-					</li>
-				</value>
-			</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Civilization Beyond Earth Armor Sets/Ammo.xml b/Patches/Civilization Beyond Earth Armor Sets/Ammo.xml
deleted file mode 100644
index d4c61030d9..0000000000
--- a/Patches/Civilization Beyond Earth Armor Sets/Ammo.xml	
+++ /dev/null
@@ -1,741 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Civilization Beyond Earth Armor Sets</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<CombatExtended.AmmoCategoryDef>
-					<defName>HarmonyCharged</defName>
-					<label>Harmony</label>
-					<description>The charged particle coating disrupts armor and tissue in equal measure. Harmony infused.</description>
-				</CombatExtended.AmmoCategoryDef>
-
-				<CombatExtended.AmmoCategoryDef>
-					<defName>PurityCharged</defName>
-					<label>Purity</label>
-					<description>The charged particle coating disrupts armor and tissue in equal measure. Purity infused.</description>
-				</CombatExtended.AmmoCategoryDef>
-
-				<CombatExtended.AmmoCategoryDef>
-					<defName>SupremacyCharged</defName>
-					<label>Supremacy</label>
-					<description>The charged particle coating disrupts armor and tissue in equal measure. Supremacy infused</description>
-				</CombatExtended.AmmoCategoryDef>
-
-				<DamageDef ParentName="Arrow">
-					<defName>HarmonyVenom</defName>
-					<label>Venom</label>
-					<hediff>HarmonyBullet</hediff>
-				</DamageDef>
-
-				<HediffDef ParentName="Cut">
-					<defName>HarmonyBullet</defName>
-					<label>harmony toxin</label>
-					<labelNoun>harmony toxin</labelNoun>
-					<comps>
-						<li Class="CombatExtended.HediffCompProperties_Venom">
-							<VenomPerSeverity>0.0000230</VenomPerSeverity>
-							<MinTicks>10000</MinTicks>
-							<MaxTicks>17500</MaxTicks>
-						</li>
-					</comps>
-				</HediffDef>
-
-				<ThingCategoryDef>
-					<defName>Ammo6x24mmHarmonyCharged</defName>
-					<label>6x24mm Harmony Charged</label>
-					<parent>AmmoAdvanced</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
-				</ThingCategoryDef>
-
-				<ThingCategoryDef>
-					<defName>Ammo6x24mmPurityCharged</defName>
-					<label>6x24mm Purity Charged</label>
-					<parent>AmmoAdvanced</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
-				</ThingCategoryDef>
-
-				<ThingCategoryDef>
-					<defName>Ammo6x24mmSupremacyCharged</defName>
-					<label>6x24mm Supremacy Charged</label>
-					<parent>AmmoAdvanced</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
-				</ThingCategoryDef>
-
-				<ThingCategoryDef>
-					<defName>Ammo8x35mmHarmonyCharged</defName>
-					<label>8x35mm Harmony Charged</label>
-					<parent>AmmoAdvanced</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
-				</ThingCategoryDef>
-
-				<ThingCategoryDef>
-					<defName>Ammo8x35mmPurityCharged</defName>
-					<label>8x35mm Purity Charged</label>
-					<parent>AmmoAdvanced</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
-				</ThingCategoryDef>
-
-				<ThingCategoryDef>
-					<defName>Ammo8x35mmSupremacyCharged</defName>
-					<label>8x35mm Supremacy Charged</label>
-					<parent>AmmoAdvanced</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_6x24mmHarmonyCharged</defName>
-					<label>6x24mm Harmony Charged</label>
-					<ammoTypes>
-						<Ammo_6x24mmHarmonyCharged>Bullet_6x24mmHarmonyCharged</Ammo_6x24mmHarmonyCharged>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_6x24mmPurityCharged</defName>
-					<label>6x24mm Purity Charged</label>
-					<ammoTypes>
-						<Ammo_6x24mmPurityCharged>Bullet_6x24mmPurityCharged</Ammo_6x24mmPurityCharged>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_6x24mmSupremacyCharged</defName>
-					<label>6x24mm Supremacy Charged</label>
-					<ammoTypes>
-						<Ammo_6x24mmSupremacyCharged>Bullet_6x24mmSupremacyCharged</Ammo_6x24mmSupremacyCharged>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_8x35mmHarmonyCharged</defName>
-					<label>8x35mm Harmony Charged</label>
-					<ammoTypes>
-						<Ammo_8x35mmHarmonyCharged>Bullet_8x35mmHarmonyCharged</Ammo_8x35mmHarmonyCharged>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_8x35mmPurityCharged</defName>
-					<label>8x35mm Purity Charged</label>
-					<ammoTypes>
-						<Ammo_8x35mmPurityCharged>Bullet_8x35mmPurityCharged</Ammo_8x35mmPurityCharged>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_8x35mmSupremacyCharged</defName>
-					<label>8x35mm Supremacy Charged</label>
-					<ammoTypes>
-						<Ammo_8x35mmSupremacyCharged>Bullet_8x35mmSupremacyCharged</Ammo_8x35mmSupremacyCharged>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!--===== Tier4_Purity+Supremacy_Gun =====-->
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_6x24mmPuritySupremacyCharged</defName>
-					<label>6x24mm Purity/Supremacy Charged</label>
-					<ammoTypes>
-						<Ammo_6x24mmPurityCharged>Bullet_6x24mmPurityCharged</Ammo_6x24mmPurityCharged>
-						<Ammo_8x35mmPurityCharged>Bullet_8x35mmPurityCharged</Ammo_8x35mmPurityCharged>
-						<Ammo_6x24mmSupremacyCharged>Bullet_6x24mmSupremacyCharged</Ammo_6x24mmSupremacyCharged>
-						<Ammo_8x35mmSupremacyCharged>Bullet_8x35mmSupremacyCharged</Ammo_8x35mmSupremacyCharged>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!--===== Tier4_Purity+Harmony_Gun =====-->
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_6x24mmPurityHarmonyCharged</defName>
-					<label>6x24mm Purity/Harmony Charged</label>
-					<ammoTypes>
-						<Ammo_6x24mmPurityCharged>Bullet_6x24mmPurityCharged</Ammo_6x24mmPurityCharged>
-						<Ammo_8x35mmPurityCharged>Bullet_8x35mmPurityCharged</Ammo_8x35mmPurityCharged>
-						<Ammo_6x24mmHarmonyCharged>Bullet_6x24mmHarmonyCharged</Ammo_6x24mmHarmonyCharged>
-						<Ammo_8x35mmHarmonyCharged>Bullet_8x35mmHarmonyCharged</Ammo_8x35mmHarmonyCharged>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!--===== Tier4_Harmony+Supremacy_Gun =====-->
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_6x24mmHarmonySupremacyCharged</defName>
-					<label>6x24mm Harmony/Supremacy Charged</label>
-					<ammoTypes>
-						<Ammo_6x24mmHarmonyCharged>Bullet_6x24mmHarmonyCharged</Ammo_6x24mmHarmonyCharged>
-						<Ammo_8x35mmHarmonyCharged>Bullet_8x35mmHarmonyCharged</Ammo_8x35mmHarmonyCharged>
-						<Ammo_6x24mmSupremacyCharged>Bullet_6x24mmSupremacyCharged</Ammo_6x24mmSupremacyCharged>
-						<Ammo_8x35mmSupremacyCharged>Bullet_8x35mmSupremacyCharged</Ammo_8x35mmSupremacyCharged>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-				<ThingDef Class="CombatExtended.AmmoDef" Name="6x24mmBEChargedBase" ParentName="SpacerSmallAmmoBase" Abstract="True">
-					<statBases>
-						<Mass>0.01</Mass>
-						<Bulk>0.01</Bulk>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_FabricationBench</li>
-					</tradeTags>
-					<stackLimit>5000</stackLimit>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="6x24mmBEChargedBase">
-					<defName>Ammo_6x24mmHarmonyCharged</defName>
-					<label>6x24mm Harmony Charged cartridge</label>
-					<description>Charged shot ammo used by advanced Harmony infused assault rifle designs.</description>
-					<graphicData>
-						<texPath>Things/Ammo/Charged/MediumIon</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.7</MarketValue>
-					</statBases>
-					<thingCategories>
-						<li>Ammo6x24mmHarmonyCharged</li>
-					</thingCategories>
-					<ammoClass>HarmonyCharged</ammoClass>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="6x24mmBEChargedBase">
-					<defName>Ammo_6x24mmPurityCharged</defName>
-					<label>6x24mm Purity Charged cartridge</label>
-					<description>Charged shot ammo used by advanced Purity infused assault rifle designs.</description>
-					<graphicData>
-						<texPath>Things/Ammo/Charged/MediumConc</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.7</MarketValue>
-					</statBases>
-					<thingCategories>
-						<li>Ammo6x24mmPurityCharged</li>
-					</thingCategories>
-					<ammoClass>PurityCharged</ammoClass>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="6x24mmBEChargedBase">
-					<defName>Ammo_6x24mmSupremacyCharged</defName>
-					<label>6x24mm Supremacy Charged cartridge</label>
-					<description>Charged shot ammo used by advanced Supremacy infused assault rifle designs.</description>
-					<graphicData>
-						<texPath>Things/Ammo/Charged/MediumRegular</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.7</MarketValue>
-					</statBases>
-					<thingCategories>
-						<li>Ammo6x24mmSupremacyCharged</li>
-					</thingCategories>
-					<ammoClass>SupremacyCharged</ammoClass>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="8x35mmBEChargedBase" ParentName="SpacerSmallAmmoBase" Abstract="True">
-					<statBases>
-						<Mass>0.018</Mass>
-						<Bulk>0.01</Bulk>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_FabricationBench</li>
-					</tradeTags>
-					<stackLimit>5000</stackLimit>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="8x35mmBEChargedBase">
-					<defName>Ammo_8x35mmHarmonyCharged</defName>
-					<label>8x35mm Harmony Charged cartridge</label>
-					<description>Charged shot ammo used by advanced Harmony battle rifle designs.</description>
-					<graphicData>
-						<texPath>Things/Ammo/Charged/MediumIon</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>1.55</MarketValue>
-					</statBases>
-					<thingCategories>
-						<li>Ammo8x35mmHarmonyCharged</li>
-					</thingCategories>
-					<ammoClass>HarmonyCharged</ammoClass>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="8x35mmBEChargedBase">
-					<defName>Ammo_8x35mmPurityCharged</defName>
-					<label>8x35mm Purity Charged cartridge</label>
-					<description>Charged shot ammo used by advanced Purity battle rifle designs.</description>
-					<graphicData>
-						<texPath>Things/Ammo/Charged/MediumConc</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>1.55</MarketValue>
-					</statBases>
-					<thingCategories>
-						<li>Ammo8x35mmPurityCharged</li>
-					</thingCategories>
-					<ammoClass>PurityCharged</ammoClass>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="8x35mmBEChargedBase">
-					<defName>Ammo_8x35mmSupremacyCharged</defName>
-					<label>8x35mm Supremacy Charged cartridge</label>
-					<description>Charged shot ammo used by advanced Supremacy battle rifle designs.</description>
-					<graphicData>
-						<texPath>Things/Ammo/Charged/MediumRegular</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>1.55</MarketValue>
-					</statBases>
-					<thingCategories>
-						<li>Ammo8x35mmSupremacyCharged</li>
-					</thingCategories>
-					<ammoClass>SupremacyCharged</ammoClass>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-				<ThingDef Name="Base6x24mmBEChargedBullet" ParentName="BaseBullet" Abstract="true">
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bullet</damageDef>
-						<speed>160</speed>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base6x24mmBEChargedBullet">
-					<defName>Bullet_6x24mmHarmonyCharged</defName>
-					<label>6x24mm Harmony Charged bullet</label>
-					<graphicData>
-						<texPath>Things/Projectile/Harmony</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>13</damageAmountBase>
-						<secondaryDamage>
-							<li>
-								<def>Bomb_Secondary</def>
-								<amount>2</amount>
-							</li>
-							<li>
-								<def>HarmonyVenom</def>
-								<amount>2</amount>
-							</li>
-						</secondaryDamage>
-						<armorPenetrationSharp>15</armorPenetrationSharp>
-						<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base6x24mmBEChargedBullet">
-					<defName>Bullet_6x24mmPurityCharged</defName>
-					<label>6x24mm Purity Charged bullet</label>
-					<graphicData>
-						<texPath>Things/Projectile/Purity</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>13</damageAmountBase>
-						<secondaryDamage>
-							<li>
-								<def>Bomb_Secondary</def>
-								<amount>2</amount>
-							</li>
-							<li>
-								<def>Flame_Secondary</def>
-								<amount>5</amount>
-							</li>
-						</secondaryDamage>
-						<armorPenetrationSharp>15</armorPenetrationSharp>
-						<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base6x24mmBEChargedBullet">
-					<defName>Bullet_6x24mmSupremacyCharged</defName>
-					<label>6x24mm Supremacy Charged bullet</label>
-					<graphicData>
-						<texPath>Things/Projectile/Supremacy</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>13</damageAmountBase>
-						<secondaryDamage>
-							<li>
-								<def>Bomb_Secondary</def>
-								<amount>2</amount>
-							</li>
-							<li>
-								<def>EMP</def>
-								<amount>6</amount>
-							</li>
-						</secondaryDamage>
-						<armorPenetrationSharp>15</armorPenetrationSharp>
-						<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
-						<empShieldBreakChance>0.2</empShieldBreakChance>
-					</projectile>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-				<ThingDef Name="Base8x35mmBEChargedBullet" ParentName="BaseBullet" Abstract="true">
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bullet</damageDef>
-						<speed>160</speed>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base8x35mmBEChargedBullet">
-					<defName>Bullet_8x35mmHarmonyCharged</defName>
-					<label>8x35mm Harmony Charged bullet</label>
-					<graphicData>
-						<texPath>Things/Projectile/Harmony</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>19</damageAmountBase>
-						<secondaryDamage>
-							<li>
-								<def>Bomb_Secondary</def>
-								<amount>3</amount>
-							</li>
-							<li>
-								<def>HarmonyVenom</def>
-								<amount>4</amount>
-							</li>
-						</secondaryDamage>
-						<armorPenetrationSharp>16</armorPenetrationSharp>
-						<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base8x35mmBEChargedBullet">
-					<defName>Bullet_8x35mmPurityCharged</defName>
-					<label>8x35mm Purity Charged bullet</label>
-					<graphicData>
-						<texPath>Things/Projectile/Purity</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>19</damageAmountBase>
-						<secondaryDamage>
-							<li>
-								<def>Bomb_Secondary</def>
-								<amount>3</amount>
-							</li>
-							<li>
-								<def>Flame_Secondary</def>
-								<amount>8</amount>
-							</li>
-						</secondaryDamage>
-						<armorPenetrationSharp>16</armorPenetrationSharp>
-						<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base8x35mmBEChargedBullet">
-					<defName>Bullet_8x35mmSupremacyCharged</defName>
-					<label>8x35mm Supremacy Charged bullet</label>
-					<graphicData>
-						<texPath>Things/Projectile/Supremacy</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>19</damageAmountBase>
-						<secondaryDamage>
-							<li>
-								<def>Bomb_Secondary</def>
-								<amount>3</amount>
-							</li>
-							<li>
-								<def>EMP</def>
-								<amount>9</amount>
-							</li>
-						</secondaryDamage>
-						<armorPenetrationSharp>16</armorPenetrationSharp>
-						<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
-						<empShieldBreakChance>0.33</empShieldBreakChance>
-					</projectile>
-				</ThingDef>
-
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="ChargeAmmoRecipeBase">
-					<defName>MakeAmmo_6x24mmHarmonyCharged</defName>
-					<label>make 6x24mm Harmony Charged cartridge x500</label>
-					<description>Craft 500 6x24mm Harmony Charged cartridges.</description>
-					<jobString>Making 6x24mm Harmony Charged cartridges.</jobString>
-					<researchPrerequisite>CBEATier3Harmony</researchPrerequisite>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Plasteel</li>
-								</thingDefs>
-							</filter>
-							<count>8</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>6</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>5</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Plasteel</li>
-							<li>Steel</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_6x24mmHarmonyCharged>500</Ammo_6x24mmHarmonyCharged>
-					</products>
-					<workAmount>6800</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="ChargeAmmoRecipeBase">
-					<defName>MakeAmmo_6x24mmPurityCharged</defName>
-					<label>make 6x24mm Purity Charged cartridge x500</label>
-					<description>Craft 500 6x24mm Purity Charged cartridges.</description>
-					<jobString>Making 6x24mm Purity Charged cartridges.</jobString>
-					<researchPrerequisite>CBEATier3Purity</researchPrerequisite>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Plasteel</li>
-								</thingDefs>
-							</filter>
-							<count>8</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>6</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>5</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Plasteel</li>
-							<li>Steel</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_6x24mmPurityCharged>500</Ammo_6x24mmPurityCharged>
-					</products>
-					<workAmount>6800</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="ChargeAmmoRecipeBase">
-					<defName>MakeAmmo_6x24mmSupremacyCharged</defName>
-					<label>make 6x24mm Supremacy Charged cartridge x500</label>
-					<description>Craft 500 6x24mm Supremacy Charged cartridges.</description>
-					<jobString>Making 6x24mm Supremacy Charged cartridges.</jobString>
-					<researchPrerequisite>CBEATier3Supremacy</researchPrerequisite>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Plasteel</li>
-								</thingDefs>
-							</filter>
-							<count>8</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>6</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>5</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Plasteel</li>
-							<li>Steel</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_6x24mmSupremacyCharged>500</Ammo_6x24mmSupremacyCharged>
-					</products>
-					<workAmount>6800</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="ChargeAmmoRecipeBase">
-					<defName>MakeAmmo_8x35mmHarmonyCharged</defName>
-					<label>make 8x35mm Harmony Charged cartridge x500</label>
-					<description>Craft 500 8x35mm Harmony Charged cartridges.</description>
-					<jobString>Making 8x35mm Harmony Charged cartridges.</jobString>
-					<researchPrerequisite>CBEATier4Harmony</researchPrerequisite>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Plasteel</li>
-								</thingDefs>
-							</filter>
-							<count>18</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>10</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>9</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Plasteel</li>
-							<li>Steel</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_8x35mmCharged>500</Ammo_8x35mmCharged>
-					</products>
-					<workAmount>13600</workAmount>
-				</RecipeDef>
-			
-				<RecipeDef ParentName="ChargeAmmoRecipeBase">
-					<defName>MakeAmmo_8x35mmPurityCharged</defName>
-					<label>make 8x35mm Purity Charged cartridge x500</label>
-					<description>Craft 500 8x35mm Purity Charged cartridges.</description>
-					<jobString>Making 8x35mm Purity Charged cartridges.</jobString>
-					<researchPrerequisite>CBEATier4Purity</researchPrerequisite>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Plasteel</li>
-								</thingDefs>
-							</filter>
-							<count>18</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>10</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>9</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Plasteel</li>
-							<li>Steel</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_8x35mmPurityCharged>500</Ammo_8x35mmPurityCharged>
-					</products>
-					<workAmount>13600</workAmount>
-				</RecipeDef>
-			
-				<RecipeDef ParentName="ChargeAmmoRecipeBase">
-					<defName>MakeAmmo_8x35mmSupremacyCharged</defName>
-					<label>make 8x35mm Supremacy Charged cartridge x500</label>
-					<description>Craft 500 8x35mm Supremacy Charged cartridges.</description>
-					<jobString>Making 8x35mm Supremacy Charged cartridges.</jobString>
-					<researchPrerequisite>CBEATier4Supremacy</researchPrerequisite>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Plasteel</li>
-								</thingDefs>
-							</filter>
-							<count>18</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>10</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>9</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Plasteel</li>
-							<li>Steel</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_8x35mmSupremacyCharged>500</Ammo_8x35mmSupremacyCharged>
-					</products>
-					<workAmount>13600</workAmount>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Civilization Beyond Earth Armor Sets/Apparels.xml b/Patches/Civilization Beyond Earth Armor Sets/Apparels.xml
deleted file mode 100644
index f1cd166a81..0000000000
--- a/Patches/Civilization Beyond Earth Armor Sets/Apparels.xml	
+++ /dev/null
@@ -1,537 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Civilization Beyond Earth Armor Sets</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!--===== Add Smoke res =====-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="Tier1_Helmet" or
-						@Name="Tier2_Helmet" or
-						@Name="Tier3_Helmet" or
-						@Name="Tier4_Helmet"]/statBases</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<!--===== Add NV =====-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="Tier2_Helmet" or @Name="Tier3_Helmet"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency_Apparel>0.4</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="Tier4_Helmet"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<!--===== Set Flammability =====-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="Tier1_Helmet" or
-						@Name="Tier2_Helmet" or
-						@Name="Tier3_Helmet" or
-						@Name="Tier4_Helmet"]/statBases</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<!--===== Parts & Layers=====-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="Tier1_Helmet" or
-						@Name="Tier2_Helmet" or
-						@Name="Tier3_Helmet" or
-						@Name="Tier4_Helmet"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Eyes</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="Tier1_Helmet" or
-						@Name="Tier2_Helmet" or
-						@Name="Tier3_Helmet" or
-						@Name="Tier4_Helmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!--===== Partial Armor Coverage =====-->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="Tier1_Helmet" or @Name="Tier2_Helmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.50</ArmorRating_Sharp>
-									<parts>
-										<li>Nose</li>
-										<li>Jaw</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.50</ArmorRating_Blunt>
-									<parts>
-										<li>Nose</li>
-										<li>Jaw</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="Tier3_Helmet" or @Name="Tier4_Helmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!--===== Add RadioPack =====-->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="Tier1_Helmet" or
-						@Name="Tier2_Helmet" or
-						@Name="Tier3_Helmet" or
-						@Name="Tier4_Helmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.ApparelDefExtension">
-							<isRadioPack>true</isRadioPack>
-						</li>
-					</value>
-				</li>
-
-				<!--===== Helmet =====-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="Tier1_Helmet"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Tier1_Helmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Tier1_Helmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>27</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tier1_Modded_Helmet_Soldier"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tier1_Modded_Helmet_Soldier"]/statBases</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tier1_Modded_Helmet_Soldier"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>11</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tier1_Modded_Helmet_Soldier"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>27.7</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="Tier2_Helmet"]/statBases</xpath>
-					<value>
-						<Bulk>4.5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Tier2_Helmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>12.8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Tier2_Helmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>28</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Tier2_Helmet"]/statBases/Mass</xpath>
-					<value>
-						<Mass>3</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="Tier3_Helmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Tier3_Helmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Tier3_Helmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>36</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Tier3_Helmet"]/statBases/Mass</xpath>
-					<value>
-						<Mass>4.8</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="Tier4_Helmet"]/statBases</xpath>
-					<value>
-						<Bulk>7</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Tier4_Helmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>21</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Tier4_Helmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>50</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Tier4_Helmet"]/statBases/Mass</xpath>
-					<value>
-						<Mass>6.6</Mass>
-					</value>
-				</li>
-
-				<!--===== Armor =====-->
-				<!--===== Set Flammability =====-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						@Name="Tier1_Armor" or
-						defName="Tier1_Modded_Armor_Soldier" or
-						@Name="Tier2_Armor" or
-						@Name="Tier3_Armor" or
-						@Name="Tier4_Armor"]/statBases</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<!--===== Hands and Feet =====-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						@Name="Tier1_Armor" or
-						defName="Tier1_Modded_Armor_Soldier" or
-						@Name="Tier2_Armor" or
-						@Name="Tier3_Armor" or
-						@Name="Tier4_Armor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<!--===== Partial Armor =====-->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[
-						@Name="Tier1_Armor" or
-						defName="Tier1_Modded_Armor_Soldier" or
-						@Name="Tier2_Armor" or
-						@Name="Tier3_Armor" or
-						@Name="Tier4_Armor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!--===== Remove Boots & Glove =====-->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Tier1_Boots" or defName="Tier1_Glove"]</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="Tier1_Armor"]/statBases</xpath>
-					<value>
-						<Bulk>46.67</Bulk>
-						<WornBulk>7</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Tier1_Armor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>12</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Tier1_Armor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>33.75</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="Tier1_Armor"]/equippedStatOffsets</xpath>
-					<value>
-						<Bulk>50</Bulk>
-						<CarryBulk>7</CarryBulk>
-					</value>
-				</li>
-
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tier1_Modded_Armor_Soldier"]/statBases</xpath>
-					<value>
-						<Bulk>46.67</Bulk>
-						<WornBulk>7</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tier1_Modded_Armor_Soldier"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tier1_Modded_Armor_Soldier"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>35</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="Tier2_Armor"]/statBases</xpath>
-					<value>
-						<Bulk>80</Bulk>
-						<WornBulk>12</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Tier2_Armor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Tier2_Armor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>40</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Tier2_Armor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>30</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="Tier2_Armor"]/equippedStatOffsets</xpath>
-					<value>
-						<Bulk>60</Bulk>
-						<CarryBulk>8</CarryBulk>
-						<CarryWeight>50</CarryWeight>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="Tier3_Armor"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Tier3_Armor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Tier3_Armor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>45</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Tier3_Armor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>50</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="Tier3_Armor"]/equippedStatOffsets</xpath>
-					<value>
-						<Bulk>80</Bulk>
-						<CarryBulk>10</CarryBulk>
-						<CarryWeight>80</CarryWeight>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="Tier4_Armor"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Tier4_Armor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>26</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Tier4_Armor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>55</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Tier4_Armor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>80</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="Tier4_Armor"]/equippedStatOffsets</xpath>
-					<value>
-						<Bulk>80</Bulk>
-						<CarryBulk>20</CarryBulk>
-						<CarryWeight>80</CarryWeight>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Civilization Beyond Earth Armor Sets/Weapons.xml b/Patches/Civilization Beyond Earth Armor Sets/Weapons.xml
deleted file mode 100644
index 9d7a0cecaf..0000000000
--- a/Patches/Civilization Beyond Earth Armor Sets/Weapons.xml	
+++ /dev/null
@@ -1,614 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Civilization Beyond Earth Armor Sets</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Tier1_Carbine_Soldier" or
-						defName="Tier1_Carbine_Soldier_Modded" or
-						@Name="Tier2_Weapon" or
-						@Name="Tier3_Weapon" or
-						@Name="Tier4_Weapon"]/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>
-				</li>
-
-				<!--===== Tier1_Carbine_Soldier =====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Tier1_Carbine_Soldier</defName>
-					<statBases>
-						<Mass>2.50</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>0.94</SwayFactor>
-						<Bulk>4.50</Bulk>
-						<WorkToMake>25500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<Chemfuel>10</Chemfuel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.08</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>25</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>Tier1_SMG_Gun_Sound</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!--===== Tier1_Carbine_Soldier_Modded =====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Tier1_Carbine_Soldier_Modded</defName>
-					<statBases>
-						<Mass>2.50</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>0.94</SwayFactor>
-						<Bulk>4.50</Bulk>
-						<WorkToMake>25500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>45</Steel>
-						<Chemfuel>12</Chemfuel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.08</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_300AACBlackout_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>25</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>Tier1_silenced-pistol-sound-effect</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_300AACBlackout</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!--===== Tier2_Soldier_Gun =====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Tier2_Soldier_Gun</defName>
-					<statBases>
-						<Mass>3.26</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>10.03</Bulk>
-						<WorkToMake>30000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>55</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-						<Chemfuel>10</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>Tier2_Rifle_Gun_Sound</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>45</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!--===== Tier3_Harmony_Gun =====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Tier3_Harmony_Gun</defName>
-					<statBases>
-						<Mass>3.0</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.20</SwayFactor>
-						<Bulk>7.00</Bulk>
-						<WorkToMake>50000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>50</Steel>
-						<Plasteel>30</Plasteel>
-						<ComponentIndustrial>11</ComponentIndustrial>
-						<Chemfuel>10</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>1.51</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x24mmHarmonyCharged</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>55</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>6</burstShotCount>
-						<soundCast>Tier3_Harmony_Rifle_Sound</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>45</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_6x24mmHarmonyCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!--===== Tier3_Supremacy_Gun =====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Tier3_Supremacy_Gun</defName>
-					<statBases>
-						<Mass>3.0</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.20</SwayFactor>
-						<Bulk>7.00</Bulk>
-						<WorkToMake>50000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>50</Steel>
-						<Plasteel>30</Plasteel>
-						<ComponentIndustrial>11</ComponentIndustrial>
-						<Chemfuel>10</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>1.51</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x24mmSupremacyCharged</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>55</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>6</burstShotCount>
-						<soundCast>Tier3_Supremacy_Rifle_Sound</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>45</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_6x24mmSupremacyCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!--===== Tier3_Purity_Gun =====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Tier3_Purity_Gun</defName>
-					<statBases>
-						<Mass>3.0</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.20</SwayFactor>
-						<Bulk>7.00</Bulk>
-						<WorkToMake>50000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>50</Steel>
-						<Plasteel>30</Plasteel>
-						<ComponentIndustrial>11</ComponentIndustrial>
-						<Chemfuel>10</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>1.51</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x24mmPurityCharged</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>55</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>6</burstShotCount>
-						<soundCast>Tier3_Purity_Rifle_Sound</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>45</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_6x24mmPurityCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!--===== Tier4_Harmony_Gun =====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Tier4_Harmony_Gun</defName>
-					<statBases>
-						<WorkToMake>60000</WorkToMake>
-						<Mass>9.0</Mass>
-						<Bulk>16.46</Bulk>
-						<SwayFactor>1.26</SwayFactor>
-						<ShotSpread>0.05</ShotSpread>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>70</Steel>
-						<Plasteel>35</Plasteel>
-						<Chemfuel>15</Chemfuel>
-						<ComponentIndustrial>11</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_8x35mmHarmonyCharged</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>1.2</warmupTime>
-						<range>62</range>
-						<soundCast>Tier3_Harmony_Rifle_Sound</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilAmount>1.16</recoilAmount>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_8x35mmHarmonyCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!--===== Tier4_Supremacy_Gun =====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Tier4_Supremacy_Gun</defName>
-					<statBases>
-						<WorkToMake>60000</WorkToMake>
-						<Mass>9.0</Mass>
-						<Bulk>16.46</Bulk>
-						<SwayFactor>1.26</SwayFactor>
-						<ShotSpread>0.05</ShotSpread>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>70</Steel>
-						<Plasteel>35</Plasteel>
-						<Chemfuel>15</Chemfuel>
-						<ComponentIndustrial>11</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_8x35mmSupremacyCharged</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>1.2</warmupTime>
-						<range>62</range>
-						<soundCast>Tier3_Supremacy_Rifle_Sound</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilAmount>1.16</recoilAmount>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_8x35mmSupremacyCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!--===== Tier4_Purity_Gun =====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Tier4_Purity_Gun</defName>
-					<statBases>
-						<WorkToMake>60000</WorkToMake>
-						<Mass>9.0</Mass>
-						<Bulk>16.46</Bulk>
-						<SwayFactor>1.26</SwayFactor>
-						<ShotSpread>0.05</ShotSpread>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>70</Steel>
-						<Plasteel>35</Plasteel>
-						<Chemfuel>15</Chemfuel>
-						<ComponentIndustrial>11</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_8x35mmPurityCharged</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>1.2</warmupTime>
-						<range>62</range>
-						<soundCast>Tier4_Purity_Rifle_Sound</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilAmount>1.16</recoilAmount>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_8x35mmPurityCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!--===== Tier4_Purity+Supremacy_Gun =====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Tier4_Eidolon_Gun</defName>
-					<statBases>
-						<WorkToMake>60000</WorkToMake>
-						<Mass>9.0</Mass>
-						<Bulk>16.46</Bulk>
-						<SwayFactor>1.26</SwayFactor>
-						<ShotSpread>0.05</ShotSpread>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>70</Steel>
-						<Plasteel>35</Plasteel>
-						<Chemfuel>15</Chemfuel>
-						<ComponentIndustrial>11</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_6x24mmPurityCharged</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>1.2</warmupTime>
-						<range>62</range>
-						<soundCast>Tier3_Purity_Rifle_Sound</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilAmount>1.16</recoilAmount>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_6x24mmPuritySupremacyCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!--===== Tier4_Purity+Harmony_Gun =====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Tier4_Champion_Gun</defName>
-					<statBases>
-						<WorkToMake>60000</WorkToMake>
-						<Mass>9.0</Mass>
-						<Bulk>16.46</Bulk>
-						<SwayFactor>1.26</SwayFactor>
-						<ShotSpread>0.05</ShotSpread>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>70</Steel>
-						<Plasteel>35</Plasteel>
-						<Chemfuel>15</Chemfuel>
-						<ComponentIndustrial>11</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_6x24mmPurityCharged</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>1.2</warmupTime>
-						<range>62</range>
-						<soundCast>Tier3_Purity_Rifle_Sound</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilAmount>1.16</recoilAmount>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_6x24mmPurityHarmonyCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!--===== Tier4_Harmony+Supremacy_Gun =====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Tier4_Hellion_Gun</defName>
-					<statBases>
-						<WorkToMake>60000</WorkToMake>
-						<Mass>9.0</Mass>
-						<Bulk>16.46</Bulk>
-						<SwayFactor>1.26</SwayFactor>
-						<ShotSpread>0.05</ShotSpread>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>70</Steel>
-						<Plasteel>35</Plasteel>
-						<Chemfuel>15</Chemfuel>
-						<ComponentIndustrial>11</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_6x24mmSupremacyCharged</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>1.2</warmupTime>
-						<range>62</range>
-						<soundCast>Tier3_Purity_Rifle_Sound</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilAmount>1.16</recoilAmount>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_6x24mmHarmonySupremacyCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Clay Soldier Race/Bodies/Golem_Bodytype.xml b/Patches/Clay Soldier Race/Bodies/Golem_Bodytype.xml
deleted file mode 100644
index 33073c124c..0000000000
--- a/Patches/Clay Soldier Race/Bodies/Golem_Bodytype.xml	
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Clay Soldier Race</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--Arm Groups-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>
-								Defs/BodyDef[defName="CM_Golem"]//*[
-								customLabel="left shoulder"
-								]/groups
-							</xpath>
-							<value>
-								<li>LeftShoulder</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>
-								Defs/BodyDef[defName="CM_Golem"]//*[
-								customLabel="right shoulder"
-								]/groups
-							</xpath>
-							<value>
-								<li>RightShoulder</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>
-								Defs/BodyDef[defName="CM_Golem"]//*[
-								customLabel="left arm"
-								]/groups
-							</xpath>
-							<value>
-								<li>LeftArm</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>
-								Defs/BodyDef[defName="CM_Golem"]//*[
-								customLabel="right arm"
-								]/groups
-							</xpath>
-							<value>
-								<li>RightArm</li>
-							</value>
-						</li>
-
-						<!--Natural Armor-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>
-								Defs/BodyDef[defName="CM_Golem"]//*[
-								def="CM_Torso" or
-								def="CM_Neck" or
-								def="Head" or
-								def="CM_Ear" or
-								def="CM_Nose" or
-								def="CM_Jaw" or
-								def="CM_Shoulder" or
-								def="CM_Arm" or
-								def="CM_Hand" or
-								def="CM_Finger" or
-								def="CM_Leg" or
-								def="CM_Foot" or
-								def="CM_Toe"
-								]/groups
-							</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>
-								Defs/BodyDef[defName="CM_Golem"]//*[
-								def="CM_Nose" or
-								def="CM_Jaw" or
-								def="CM_Eye" ]/groups
-							</xpath>
-							<value>
-								<li>OutsideSquishy</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Clay Soldier Race/ThingDefs_Races/AlienRace_Claygolem.xml b/Patches/Clay Soldier Race/ThingDefs_Races/AlienRace_Claygolem.xml
deleted file mode 100644
index b313fc12a3..0000000000
--- a/Patches/Clay Soldier Race/ThingDefs_Races/AlienRace_Claygolem.xml	
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Clay Soldier Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Claymanman"]/comps</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Claymanman"]</xpath>
-								<value>
-									<comps />
-								</value>
-							</nomatch>
-							<match Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Claymanman"]</xpath>
-								<value>
-								</value>
-							</match>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Claymanman"]/comps</xpath>
-							<value>
-								<li Class="CombatExtended.CompProperties_Inventory" />
-								<li>
-									<compClass>CombatExtended.CompPawnGizmo</compClass>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Claymanman"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Humanoid</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Claymanman"]/statBases</xpath>
-							<value>
-								<MeleeCritChance>1</MeleeCritChance>
-								<MeleeParryChance>1</MeleeParryChance>
-								<Suppressability>0</Suppressability>
-								<SmokeSensitivity>0</SmokeSensitivity>
-							</value>
-						</li>
-
-						<!--Human-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Claymanman"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>1.26</cooldownTime>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>right fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>1.26</cooldownTime>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>4.49</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<!-- ========== Add loadout update behavior ========== -->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThinkTreeDef[defName="CL_Golem"]/thinkRoot/subNodes/li[@Class="ThinkNode_ConditionalColonist"]/subNodes</xpath>
-							<value>
-								<li Class="CombatExtended.JobGiver_UpdateLoadout" />
-								<li Class="CombatExtended.JobGiver_CheckReload" />
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Colony Leadership/WarriorLeadership.xml b/Patches/Colony Leadership/WarriorLeadership.xml
deleted file mode 100644
index 28b6febb59..0000000000
--- a/Patches/Colony Leadership/WarriorLeadership.xml	
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Colony Leadership</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="leader2"]/stages/li[1]/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<TradePriceImprovement>+0.05</TradePriceImprovement>
-							<NegotiationAbility>+0.05</NegotiationAbility>
-							<MoveSpeed>+0.10</MoveSpeed>
-							<MeleeHitChance>+0.05</MeleeHitChance>
-							<MedicalTendQualityOffset>+0.05</MedicalTendQualityOffset>
-							<Suppressability>-0.12</Suppressability>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="leader2"]/stages/li[1]/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<TradePriceImprovement>+0.10</TradePriceImprovement>
-							<NegotiationAbility>+0.10</NegotiationAbility>
-							<MoveSpeed>+0.20</MoveSpeed>
-							<MeleeHitChance>+0.15</MeleeHitChance>
-							<MedicalTendQualityOffset>+0.10</MedicalTendQualityOffset>
-							<Suppressability>-0.25</Suppressability>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="leader2"]/stages/li[1]/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<TradePriceImprovement>+0.15</TradePriceImprovement>
-							<NegotiationAbility>+0.15</NegotiationAbility>
-							<MoveSpeed>+0.3</MoveSpeed>
-							<MeleeHitChance>+0.30</MeleeHitChance>
-							<MedicalTendQualityOffset>+0.2</MedicalTendQualityOffset>
-							<Suppressability>-0.4</Suppressability>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="leaderAura2"]/stages/li[1]/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<MoveSpeed>+0.10</MoveSpeed>
-							<MeleeHitChance>+0.05</MeleeHitChance>
-							<MeleeWeapon_CooldownMultiplier>0.96</MeleeWeapon_CooldownMultiplier>
-							<MedicalTendQualityOffset>+0.05</MedicalTendQualityOffset>
-							<Suppressability>-0.1</Suppressability>
-							<ShootingAccuracyPawn>0.1</ShootingAccuracyPawn>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="leaderAura2"]/stages/li[2]/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<MoveSpeed>+0.20</MoveSpeed>
-							<MeleeHitChance>+0.15</MeleeHitChance>
-							<MeleeWeapon_CooldownMultiplier>0.92</MeleeWeapon_CooldownMultiplier>
-							<MedicalTendQualityOffset>+0.1</MedicalTendQualityOffset>
-							<Suppressability>-0.2</Suppressability>
-							<ShootingAccuracyPawn>0.2</ShootingAccuracyPawn>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="leaderAura2"]/stages/li[3]/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<MoveSpeed>+0.30</MoveSpeed>
-							<MeleeHitChance>+0.25</MeleeHitChance>
-							<MeleeWeapon_CooldownMultiplier>0.87</MeleeWeapon_CooldownMultiplier>
-							<MedicalTendQualityOffset>+0.15</MedicalTendQualityOffset>
-							<Suppressability>-0.35</Suppressability>
-							<ShootingAccuracyPawn>0.35</ShootingAccuracyPawn>
-						</statOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Combat Enthusiast's Collection/ThingDefs_Weapons.xml b/Patches/Combat Enthusiast's Collection/ThingDefs_Weapons.xml
deleted file mode 100644
index 6f42ea81eb..0000000000
--- a/Patches/Combat Enthusiast's Collection/ThingDefs_Weapons.xml	
+++ /dev/null
@@ -1,1115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Combat Enthusiast's Collection</li>
-			<li>Combat Enthusiast's Collection (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--  ==========Guns==========  -->
-
-				<!-- AN-94 -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CEC_BurstRifle</defName>
-					<statBases>
-						<Mass>3.85</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>7.28</Bulk>
-						<WorkToMake>48000</WorkToMake>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.29</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>CEC_AN94Shot</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>false</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-				</li>
-
-				<!-- HK G11 -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CEC_ClockworkAR</defName>
-					<statBases>
-						<Bulk>7.50</Bulk>
-						<Mass>3.65</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.25</SightsEfficiency>
-						<SwayFactor>1.15</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<WorkToMake>55000</WorkToMake>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.30</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_473x33mmCaseless_FMJ</defaultProjectile>
-						<warmupTime>1.225</warmupTime>
-						<range>48</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<soundCast>CEC_G11Shot</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>45</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_473x33mmCaseless</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<researchPrerequisite>Fabrication</researchPrerequisite>
-				</li>
-
-				<!-- AS Val -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CEC_SSRifle</defName>
-					<statBases>
-						<Mass>2.50</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.13</SwayFactor>
-						<Bulk>6.15</Bulk>
-						<WorkToMake>35000</WorkToMake>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.94</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<burstShotCount>4</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>CEC_SuppressedShot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-				</li>
-
-				<!-- A-545 -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CEC_MRS</defName>
-					<statBases>
-						<Mass>3.30</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.29</SwayFactor>
-						<Bulk>7.20</Bulk>
-						<WorkToMake>43000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<recoilAmount>1.39</recoilAmount>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>CEC_A545Shot</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>false</noSnapshot>
-						<noSingleShot>false</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-				</li>
-
-				<!-- AKS-47UN -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CEC_CompactSR</defName>
-					<statBases>
-						<Mass>2.49</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>0.98</SwayFactor>
-						<Bulk>4.90</Bulk>
-						<WorkToMake>28000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<recoilAmount>1.60</recoilAmount>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>0.9</warmupTime>
-						<range>31</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>CEC_AKS74UShot</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<noSnapshot>false</noSnapshot>
-						<noSingleShot>false</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-					<researchPrerequisite>GasOperation</researchPrerequisite>
-				</li>
-
-				<!-- Zip 22 -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CEC_Zipper</defName>
-					<statBases>
-						<Mass>0.43</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.28</ShotSpread>
-						<SwayFactor>0.76</SwayFactor>
-						<Bulk>1.84</Bulk>
-						<WorkToMake>3000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_22LR_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_22LR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<noSnapshot>false</noSnapshot>
-						<noSingleShot>false</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-					<researchPrerequisite>Gunsmithing</researchPrerequisite>
-				</li>
-
-				<!-- Colt Dragoon -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CEC_BigIron</defName>
-					<statBases>
-						<Mass>1.90</Mass>
-						<RangedWeapon_Cooldown>0.88</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.88</SwayFactor>
-						<Bulk>3.75</Bulk>
-						<WorkToMake>6000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_44Magnum_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>CEC_DragoonShot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>5.1</reloadTime>
-						<ammoSet>AmmoSet_44Magnum</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<noSnapshot>false</noSnapshot>
-						<noSingleShot>false</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-					<researchPrerequisite>Gunsmithing</researchPrerequisite>
-				</li>
-
-				<!-- THUN-DER! -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CEC_Thunder</defName>
-					<statBases>
-						<Mass>5.44</Mass>
-						<RangedWeapon_Cooldown>0.92</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.10</ShotSpread>
-						<SwayFactor>3.25</SwayFactor>
-						<Bulk>4.30</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>1.85</warmupTime>
-						<range>16</range>
-						<soundCast>Shot_TurretSniper</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>4</AmmoGenPerMagOverride>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>false</noSnapshot>
-						<noSingleShot>false</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>SimpleGun</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CEC_Thunder"]/recipeMaker</xpath>
-				</li>
-
-				<!-- FiveSeven -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CEC_FiveSeven</defName>
-					<statBases>
-						<Mass>0.61</Mass>
-						<RangedWeapon_Cooldown>0.836</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.90</SwayFactor>
-						<Bulk>2.08</Bulk>
-						<WorkToMake>10000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>18.5</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_FN57x28mm</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<noSnapshot>false</noSnapshot>
-						<noSingleShot>false</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-					<researchPrerequisite>BlowbackOperation</researchPrerequisite>
-				</li>
-
-				<!-- P90 -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CEC_PDW</defName>
-					<statBases>
-						<WorkToMake>34000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>0.93</SwayFactor>
-						<Bulk>6.67</Bulk>
-						<Mass>2.6</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
-						<warmupTime>0.4</warmupTime>
-						<range>15</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>Shot_HeavySMG</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-						<recoilAmount>0.66</recoilAmount>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_FN57x28mm</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-					<researchPrerequisite>BlowbackOperation</researchPrerequisite>
-				</li>
-
-				<!-- Suomi KP-31 -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CEC_WoodlandSMG</defName>
-					<statBases>
-						<Mass>4.60</Mass>
-						<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>8.70</Bulk>
-						<WorkToMake>26000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<recoilAmount>1.08</recoilAmount>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>CEC_SuomiShot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>36</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>4</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<noSnapshot>false</noSnapshot>
-						<noSingleShot>false</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-					<researchPrerequisite>BlowbackOperation</researchPrerequisite>
-				</li>
-
-				<!-- Skorpion Evo -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CEC_SkorpionEvo</defName>
-					<statBases>
-						<Mass>2.60</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>0.93</SwayFactor>
-						<Bulk>4.10</Bulk>
-						<WorkToMake>26000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<recoilAmount>1.44</recoilAmount>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<noSnapshot>false</noSnapshot>
-						<noSingleShot>false</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<researchPrerequisite>BlowbackOperation</researchPrerequisite>
-				</li>
-
-				<!-- MG-42 -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CEC_TMG</defName>
-					<statBases>
-						<Mass>15.20</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.67</SwayFactor>
-						<Bulk>11.60</Bulk>
-						<WorkToMake>18000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>140</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-						<WoodLog>5</WoodLog>
-					</costList>
-					<Properties>
-						<recoilAmount>1.25</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>65</range>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>CEC_MG42Shot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>Bipod_LMG</li>
-					</weaponTags>
-					<researchPrerequisite>GasOperation</researchPrerequisite>
-				</li>
-
-				<!-- LWAMG -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CEC_LWAMG</defName>
-					<statBases>
-						<Mass>8.20</Mass>
-						<RangedWeapon_Cooldown>0.58</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>13.0</Bulk>
-						<WorkToMake>42000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<recoilAmount>1.4</recoilAmount>
-						<recoilPattern>Mounted</recoilPattern>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>68</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>CEC_KnightsLWAMGShot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<noSnapshot>false</noSnapshot>
-						<noSingleShot>false</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>CE_MachineGun</li>
-						<li>CE_AI_Suppressive</li>
-						<li>Bipod_SAW</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-				</li>
-
-				<!-- M14 -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CEC_BattleRifle</defName>
-					<statBases>
-						<Mass>4.10</Mass>
-						<RangedWeapon_Cooldown>0.41</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.54</SwayFactor>
-						<Bulk>11.26</Bulk>
-						<WorkToMake>16000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<recoilAmount>3.38</recoilAmount>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>59</range>
-						<burstShotCount>4</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>CEC_M14Shot</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4.0</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>false</noSnapshot>
-						<noSingleShot>false</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>IndustrialGunAdvanced</li>
-						<li>SniperRifle</li>
-					</weaponTags>
-					<researchPrerequisite>GasOperation</researchPrerequisite>
-				</li>
-
-				<!-- M200 Intervention -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CEC_Intervention</defName>
-					<statBases>
-						<Mass>14.10</Mass>
-						<RangedWeapon_Cooldown>1.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.72</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1.98</SwayFactor>
-						<Bulk>12.87</Bulk>
-						<WorkToMake>59000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_408CheyenneTactical_FMJ</defaultProjectile>
-						<warmupTime>1.90</warmupTime>
-						<range>75</range>
-						<soundCast>CEC_InterventionShot</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>4.0</reloadTime>
-						<ammoSet>AmmoSet_408CheyenneTactical</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>false</noSnapshot>
-						<noSingleShot>false</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>SniperRifle</li>
-						<li>IndustrialGunAdvanced</li>
-						<li>Bipod_AMR</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-				</li>
-
-				<!-- NTW-20 -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CEC_AntiMaterielRifle</defName>
-					<statBases>
-						<Mass>31.0</Mass>
-						<RangedWeapon_Cooldown>1.08</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.72</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>3.51</SwayFactor>
-						<Bulk>18.95</Bulk>
-						<WorkToMake>64000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<recoilPattern>Mounted</recoilPattern>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_20x110mmHispano_AP</defaultProjectile>
-						<warmupTime>1.90</warmupTime>
-						<range>86</range>
-						<soundCast>CEC_NTW20Shot</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
-						<reloadTime>1</reloadTime>
-						<ammoSet>AmmoSet_20x110mmHispano</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>false</noSnapshot>
-						<noSingleShot>false</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>SniperRifle</li>
-						<li>Bipod_ATR</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-				</li>
-
-				<!-- DVL-10 Saboteur -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CEC_DVLTen</defName>
-					<statBases>
-						<Mass>4.80</Mass>
-						<RangedWeapon_Cooldown>1.40</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.60</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.11</SwayFactor>
-						<Bulk>11.04</Bulk>
-						<WorkToMake>47000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.46</warmupTime>
-						<range>75</range>
-						<soundCast>CEC_DVL10Shot</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.0</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>false</noSnapshot>
-						<noSingleShot>false</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>SniperRifle</li>
-						<li>Bipod_DMR</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-				</li>
-
-				<!-- WA 2000 -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CEC_BullpupSniper</defName>
-					<statBases>
-						<Mass>7.20</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.7</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.73</SwayFactor>
-						<Bulk>9.05</Bulk>
-						<WorkToMake>52000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.60</warmupTime>
-						<range>75</range>
-						<soundCast>CEC_WA2000Shot</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>false</noSnapshot>
-						<noSingleShot>false</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>SniperRifle</li>
-						<li>Bipod_DMR</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-				</li>
-
-				<!-- Super Shorty -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CEC_MuffaloCannon</defName>
-					<statBases>
-						<Mass>1.80</Mass>
-						<RangedWeapon_Cooldown>1.01</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>2.00</SwayFactor>
-						<Bulk>4.19</Bulk>
-						<WorkToMake>10000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.60</warmupTime>
-						<range>12</range>
-						<soundCast>CEC_SuperShortyShot</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>2</magazineSize>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-						<reloadOneAtATime>true</reloadOneAtATime>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<noSnapshot>false</noSnapshot>
-						<noSingleShot>false</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_Pistol</li>
-						<li>IndustrialGunAdvanced</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-					<researchPrerequisite>Gunsmithing</researchPrerequisite>
-				</li>
-
-				<!-- UTS-15 -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CEC_CombatShotgun</defName>
-					<statBases>
-						<Mass>3.10</Mass>
-						<RangedWeapon_Cooldown>0.99</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.03</SwayFactor>
-						<Bulk>7.20</Bulk>
-						<WorkToMake>27000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.60</warmupTime>
-						<range>16</range>
-						<soundCast>CEC_UTS15Shot</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>14</magazineSize>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-						<reloadOneAtATime>true</reloadOneAtATime>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<noSnapshot>false</noSnapshot>
-						<noSingleShot>false</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<researchPrerequisite>GasOperation</researchPrerequisite>
-				</li>
-
-				<!-- PAW-20 -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CEC_Neopup</defName>
-					<statBases>
-						<Mass>5.90</Mass>
-						<RangedWeapon_Cooldown>0.41</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.10</ShotSpread>
-						<SwayFactor>1.44</SwayFactor>
-						<Bulk>7.70</Bulk>
-						<WorkToMake>22000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<recoilAmount>0.41</recoilAmount>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_20x42mmGrenade_HE</defaultProjectile>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<warmupTime>1</warmupTime>
-						<range>62</range>
-						<minRange>4</minRange>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_20x42mmGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<noSnapshot>false</noSnapshot>
-						<noSingleShot>false</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Launcher</li>
-					</weaponTags>
-					<researchPrerequisite>CE_Launchers</researchPrerequisite>
-				</li>
-
-				<!-- Tactical Sledgehammer -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CEC_TacticalSledgeHammer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.78</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>1.000</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>2.36</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>12.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CEC_TacticalSledgeHammer"]/statBases/Mass</xpath>
-					<value>
-						<Mass>5.76</Mass>
-						<Bulk>9</Bulk>
-						<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CEC_TacticalSledgeHammer"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>2.30</MeleeCritChance>
-							<MeleeParryChance>0.18</MeleeParryChance>
-							<MeleeDodgeChance>0.30</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- ========== Tools ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="CEC_Zipper" or
-						defName="CEC_MuffaloCannon" or
-						defName="CEC_FiveSeven" or
-						defName="CEC_Thunder" or
-						defName="CEC_BigIron"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="CEC_BurstRifle" or
-						defName="CEC_ClockworkAR" or
-						defName="CEC_MRS" or
-						defName="CEC_SSRifle" or
-						defName="CEC_CompactSR" or
-						defName="CEC_Neopup" or
-						defName="CEC_CombatShotgun" or
-						defName="CEC_BullpupSniper" or
-						defName="CEC_DVLTen" or
-						defName="CEC_AntiMaterielRifle" or
-						defName="CEC_Intervention" or
-						defName="CEC_BattleRifle" or
-						defName="CEC_LWAMG" or
-						defName="CEC_WoodlandSMG" or
-						defName="CEC_PDW" or
-						defName="CEC_TMG" or
-						defName="CEC_SkorpionEvo"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Comigo's Fancy Floating Turrets/ThingDefs_Turrets.xml b/Patches/Comigo's Fancy Floating Turrets/ThingDefs_Turrets.xml
deleted file mode 100644
index e3e31ee33e..0000000000
--- a/Patches/Comigo's Fancy Floating Turrets/ThingDefs_Turrets.xml	
+++ /dev/null
@@ -1,263 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Comigo's Fancy Floating Turrets</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Remove refuelable property -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName = "COMIGO_FloatingTurret_Simple" or
-						defName = "COMIGO_FloatingTurret_Double" or
-						defName = "COMIGO_FloatingTurret_Slug" or
-						defName = "COMIGO_FloatingTurret_EMP"
-						]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
-				</li>
-
-				<!-- Replace vanilla thingClass -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "COMIGO_FloatingTurret_Simple" or
-						defName = "COMIGO_FloatingTurret_Slug" or
-						defName = "COMIGO_FloatingTurret_Double" or
-						defName = "COMIGO_FloatingTurret_EMP"
-						]/thingClass </xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<!-- Make turrets taller -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "COMIGO_FloatingTurret_Simple" or
-						defName = "COMIGO_FloatingTurret_Double" or
-						defName = "COMIGO_FloatingTurret_Slug" or
-						defName = "COMIGO_FloatingTurret_EMP"
-						]/fillPercent </xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName = "COMIGO_FloatingTurret_Simple" or
-						defName = "COMIGO_FloatingTurret_Double" or
-						defName = "COMIGO_FloatingTurret_Slug" or
-						defName = "COMIGO_FloatingTurret_EMP"
-						]/statBases </xpath>
-					<value>
-						<AimingAccuracy>0.25</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "COMIGO_FloatingTurret_Simple" or
-						defName = "COMIGO_FloatingTurret_Double" or
-						defName = "COMIGO_FloatingTurret_Slug" or
-						defName = "COMIGO_FloatingTurret_EMP"
-						]/statBases/ShootingAccuracyTurret </xpath>
-					<value>
-						<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "COMIGO_FloatingTurret_Simple" or
-						defName = "COMIGO_FloatingTurret_Double" or
-						defName = "COMIGO_FloatingTurret_Slug" or
-						defName = "COMIGO_FloatingTurret_EMP"
-						]/building/turretBurstCooldownTime </xpath>
-					<value>
-						<turretBurstCooldownTime>1.6</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<!-- Simple Turret -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>COMIGO_FloatingTurret_Simple_Gun</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.65</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>0.82</SwayFactor>
-						<Bulk>10.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.76</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>48</range>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<burstShotCount>5</burstShotCount>
-						<soundCast>GunShotA</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!-- Double Simple Turret -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>COMIGO_FloatingTurret_Double_Gun</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.65</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>0.82</SwayFactor>
-						<Bulk>10.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.76</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>48</range>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>GunShotA</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>200</magazineSize>
-						<reloadTime>12</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!-- Slug Turret -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="COMIGO_FloatingTurret_Slug"]/description</xpath>
-					<value>
-						<description>An anchored turret that can float on water and fires a heavy round, capable of defeating armor at long distance.</description>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "COMIGO_FloatingTurret_Slug"]/researchPrerequisites</xpath>
-					<value>
-						<researchPrerequisites>
-							<li>CE_TurretHeavyWeapons</li>
-						</researchPrerequisites>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>COMIGO_FloatingTurret_Slug_Gun</defName>
-					<statBases>
-						<MarketValue>2000</MarketValue>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.6</SwayFactor>
-						<RangedWeapon_Cooldown>0.76</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.52</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_145x114mm_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
-						<burstShotCount>8</burstShotCount>
-						<soundCast>HeavyMG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>16</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>40</magazineSize>
-						<reloadTime>8.4</reloadTime>
-						<ammoSet>AmmoSet_145x114mm</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!-- EMP Turret -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="COMIGO_FloatingTurret_EMP"]/description</xpath>
-					<value>
-						<description>An anchored turret that can float and that launches various explosive shells.</description>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="COMIGO_FloatingTurret_EMP"]/label</xpath>
-					<value>
-						<label>Floating turret with a grenade launcher</label>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>COMIGO_FloatingTurret_EMP_Gun</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.20</SwayFactor>
-						<Bulk>8.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.83</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_25x40mmGrenade_HE</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>3</burstShotCount>
-						<soundCast>Shot_IncendiaryLauncher</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>18</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_25x40mmGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Communitable Diseases/Communitable_Disease_Apparel.xml b/Patches/Communitable Diseases/Communitable_Disease_Apparel.xml
deleted file mode 100644
index 7cac236c41..0000000000
--- a/Patches/Communitable Diseases/Communitable_Disease_Apparel.xml	
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Communicable Diseases [1.4]</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====================== Dust Mask ===================== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_DustMask"]/apparel/layers</xpath>
-					<value>
-						<layers>
-							<li>Overhead</li>
-						</layers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_DustMask"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>Teeth</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-				<!-- ====================== Respirator ===================== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Respirator"]/apparel/layers</xpath>
-					<value>
-						<layers>
-							<li>Overhead</li>
-						</layers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Respirator"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>Teeth</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-			</operations>
-
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Core/BackstoryDefs/Patch_Backstories.xml b/Patches/Core/BackstoryDefs/Patch_Backstories.xml
index acaa27bff9..2bb2793b90 100644
--- a/Patches/Core/BackstoryDefs/Patch_Backstories.xml
+++ b/Patches/Core/BackstoryDefs/Patch_Backstories.xml
@@ -3,26 +3,23 @@
 
 	<!-- Tribal / Medieval -->
 	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/BackstoryDef[defName="Warrior94"]/possessions/li[key="Pila"]/value</xpath>
+		<xpath>Defs/BackstoryDef[defName="Warrior94"]/possessions/Pila</xpath>
 		<value>
-			<value>3</value>
+			<Pila>3</Pila>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/BackstoryDef[defName="Warrior73"]/possessions/li[key="Pila"]/value</xpath>
+		<xpath>Defs/BackstoryDef[defName="Warrior73"]/possessions/Pila</xpath>
 		<value>
-			<value>3</value>
+			<Pila>3</Pila>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/BackstoryDef[defName="Archer25"]/possessions</xpath>
 		<value>
-			<li>
-				<key>Ammo_Arrow_Stone</key>
-				<value>12</value>
-			</li>
+      <Ammo_Arrow_Stone>12</Ammo_Arrow_Stone>
 		</value>
 	</Operation>
 
@@ -31,40 +28,28 @@
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/BackstoryDef[defName="Bodyguard58"]/possessions</xpath>
 		<value>
-			<li>
-				<key>Ammo_45ACP_FMJ</key>
-				<value>21</value>
-			</li>
+      <Ammo_45ACP_FMJ>21</Ammo_45ACP_FMJ>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/BackstoryDef[defName="OverwatchSniper42"]/possessions</xpath>
 		<value>
-			<li>
-				<key>Ammo_762x51mmNATO_FMJ</key>
-				<value>15</value>
-			</li>
+      <Ammo_762x51mmNATO_FMJ>15</Ammo_762x51mmNATO_FMJ>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/BackstoryDef[defName="BushSniper94"]/possessions</xpath>
 		<value>
-			<li>
-				<key>Ammo_762x51mmNATO_FMJ</key>
-				<value>15</value>
-			</li>
+      <Ammo_762x51mmNATO_FMJ>15</Ammo_762x51mmNATO_FMJ>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/BackstoryDef[defName="Gunfighter51"]/possessions</xpath>
 		<value>
-			<li>
-				<key>Ammo_44Magnum_FMJ</key>
-				<value>18</value>
-			</li>
+      <Ammo_44Magnum_FMJ>18</Ammo_44Magnum_FMJ>
 		</value>
 	</Operation>
 
diff --git a/Patches/Core/Bodies/Bodies_Humanlike/Human.xml b/Patches/Core/Bodies/Bodies_Humanlike/Human.xml
index 05e78b68d8..3d92c53430 100644
--- a/Patches/Core/Bodies/Bodies_Humanlike/Human.xml
+++ b/Patches/Core/Bodies/Bodies_Humanlike/Human.xml
@@ -5,27 +5,6 @@
 
 	<!-- ========== Add groups ========== -->
 
-	<!--TOOK OUT because it breaks Character editor apparel screen-->
-	<!--nose, because it wasn't there before for some reason
-  <Operation Class="PatchOperationAdd"> 
-    <xpath>Defs/BodyDef[defName="Human"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
-    <value>
-      <li>Nose</li>
-    </value>
-  </Operation>
-
-  <Operation Class="PatchOperationAdd">
-      <xpath>Defs</xpath>
-      <value>
-        <BodyPartGroupDef>
-            <defName>Nose</defName>
-            <label>nose</label>
-            <listOrder>678</listOrder>
-        </BodyPartGroupDef>
-      </value>
-  </Operation>
--->
-
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/BodyDef[defName="Human"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel="right eye"]/groups</xpath>
 		<value>
diff --git a/Patches/Core/ThingDefs_Buildings/Buildings_Security.xml b/Patches/Core/ThingDefs_Buildings/Buildings_Security.xml
index dfbc1c00b6..b2d738bbc1 100644
--- a/Patches/Core/ThingDefs_Buildings/Buildings_Security.xml
+++ b/Patches/Core/ThingDefs_Buildings/Buildings_Security.xml
@@ -299,7 +299,7 @@
 	</Operation>
 
 	<Operation Class="PatchOperationRemove">
-		<xpath>Defs/ThingDef[defName="Turret_RocketswarmLauncher"]/comps/li[@Class="CompProperties_Activable"]</xpath>
+		<xpath>Defs/ThingDef[defName="Turret_RocketswarmLauncher"]/comps/li[@Class="CompProperties_Interactable"]</xpath>
 	</Operation>
 
 	<Operation Class="PatchOperationRemove">
diff --git a/Patches/Core/ThingDefs_Items/Items_Books.xml b/Patches/Core/ThingDefs_Items/Items_Books.xml
new file mode 100644
index 0000000000..1cc20038c3
--- /dev/null
+++ b/Patches/Core/ThingDefs_Items/Items_Books.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Book ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="BookBase"]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/Patches/Core/ThingDefs_Misc/Apparel_Belts.xml b/Patches/Core/ThingDefs_Misc/Apparel_Belts.xml
index 0cbd7d118f..ba59eff8bc 100644
--- a/Patches/Core/ThingDefs_Misc/Apparel_Belts.xml
+++ b/Patches/Core/ThingDefs_Misc/Apparel_Belts.xml
@@ -36,14 +36,14 @@
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="Apparel_SmokepopBelt"]/comps/li[@Class="CompProperties_Reloadable"]/ammoDef</xpath>
+		<xpath>Defs/ThingDef[defName="Apparel_SmokepopBelt"]/comps/li[@Class="CompProperties_ApparelReloadable"]/ammoDef</xpath>
 		<value>
 			<ammoDef>Weapon_GrenadeSmoke</ammoDef>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="Apparel_SmokepopBelt"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountToRefill</xpath>
+		<xpath>Defs/ThingDef[defName="Apparel_SmokepopBelt"]/comps/li[@Class="CompProperties_ApparelReloadable"]/ammoCountToRefill</xpath>
 		<value>
 			<ammoCountToRefill>3</ammoCountToRefill>
 		</value>
@@ -60,14 +60,14 @@
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="Apparel_FirefoampopPack"]/comps/li[@Class="CompProperties_Reloadable"]/ammoDef</xpath>
+		<xpath>Defs/ThingDef[defName="Apparel_FirefoampopPack"]/comps/li[@Class="CompProperties_ApparelReloadable"]/ammoDef</xpath>
 		<value>
 			<ammoDef>Weapon_GrenadeFirefoam</ammoDef>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="Apparel_FirefoampopPack"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountToRefill</xpath>
+		<xpath>Defs/ThingDef[defName="Apparel_FirefoampopPack"]/comps/li[@Class="CompProperties_ApparelReloadable"]/ammoCountToRefill</xpath>
 		<value>
 			<ammoCountToRefill>3</ammoCountToRefill>
 		</value>
diff --git a/Patches/Core/ThingDefs_Misc/Weapons_Guns.xml b/Patches/Core/ThingDefs_Misc/Weapons_Guns.xml
index 9869f19562..40c541e3d6 100644
--- a/Patches/Core/ThingDefs_Misc/Weapons_Guns.xml
+++ b/Patches/Core/ThingDefs_Misc/Weapons_Guns.xml
@@ -640,36 +640,37 @@
 		<statBases>
 			<Mass>8</Mass>
 			<RangedWeapon_Cooldown>0.43</RangedWeapon_Cooldown>
-			<SightsEfficiency>1</SightsEfficiency>
+			<SightsEfficiency>1.1</SightsEfficiency>
 			<ShotSpread>0.15</ShotSpread>
 			<SwayFactor>1.8</SwayFactor>
 			<Bulk>10</Bulk>
-			<WorkToMake>39500</WorkToMake>
+			<WorkToMake>35500</WorkToMake>
 		</statBases>
 		<costList>
 			<Steel>65</Steel>
 			<Plasteel>30</Plasteel>
-			<ComponentIndustrial>7</ComponentIndustrial>
+			<ComponentIndustrial>1</ComponentIndustrial>
+			<ComponentSpacer>1</ComponentSpacer>
 			<Chemfuel>10</Chemfuel>
 		</costList>
 		<Properties>
-			<recoilAmount>1.0</recoilAmount>
+			<recoilAmount>3.87</recoilAmount>
 			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
 			<hasStandardCommand>true</hasStandardCommand>
 			<defaultProjectile>Bullet_30x64mmFuel_Incendiary</defaultProjectile>
-			<warmupTime>1.1</warmupTime>
+			<warmupTime>1.0</warmupTime>
 			<range>40</range>
-			<burstShotCount>0</burstShotCount>
 			<soundCast>Shot_IncendiaryLauncher</soundCast>
 			<soundCastTail>GunTail_Medium</soundCastTail>
-			<muzzleFlashScale>14</muzzleFlashScale>
+			<muzzleFlashScale>9</muzzleFlashScale>
 			<targetParams>
 				<canTargetLocations>true</canTargetLocations>
 			</targetParams>
 		</Properties>
 		<AmmoUser>
 			<magazineSize>5</magazineSize>
-			<reloadTime>4</reloadTime>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>0.85</reloadTime>
 			<ammoSet>AmmoSet_30x64mmFuel</ammoSet>
 		</AmmoUser>
 		<FireModes>
@@ -684,6 +685,13 @@
 		<AllowWithRunAndGun>false</AllowWithRunAndGun>
 	</Operation>
 
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Gun_IncendiaryLauncher"]</xpath>
+		<value>
+			<techLevel>Spacer</techLevel>
+		</value>
+	</Operation>
+
 	<Operation Class="PatchOperationAddModExtension">
 		<xpath>Defs/ThingDef[defName="Gun_IncendiaryLauncher"]</xpath>
 		<value>
diff --git a/Patches/Cossacks of the Rim/Cossack_Apparel.xml b/Patches/Cossacks of the Rim/Cossack_Apparel.xml
deleted file mode 100644
index 37aac5e5f0..0000000000
--- a/Patches/Cossacks of the Rim/Cossack_Apparel.xml	
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Cossacks of the Rim</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= Cossack headgear ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Cossack_floppy_cap" or defName="Cossack_noble_fur_hat"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Cossack_floppy_cap" or defName="Cossack_noble_fur_hat"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ======= Cossack garment ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Cossack_garment" or defName="Cossack_noble_garment"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Cossack_garment" or defName="Cossack_noble_garment"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ======= Cossack fur coat ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Cossack_fur_coat" or defName="Cossack_royal_cloak"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Cossack_fur_coat" or defName="Cossack_royal_cloak"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Cossacks of the Rim/Cossack_MeleeMedieval.xml b/Patches/Cossacks of the Rim/Cossack_MeleeMedieval.xml
deleted file mode 100644
index 24c4b98186..0000000000
--- a/Patches/Cossacks of the Rim/Cossack_MeleeMedieval.xml	
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Cossacks of the Rim</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Cossack Mace === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_CossackNobleMace"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_CossackNobleMace"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.42</MeleeCritChance>
-							<MeleeParryChance>0.24</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_CossackNobleMace"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_CossackNobleMace"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>2</cooldownTime>
-								<chanceFactor>0.90</chanceFactor>
-								<armorPenetrationBlunt>7.125</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Cossacks Saber === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_CossackSabre"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_CossackSabre"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>0.35</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_CossackSabre"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_CossackSabre"]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Cossacks of the Rim/Cossack_Pawnkinds.xml b/Patches/Cossacks of the Rim/Cossack_Pawnkinds.xml
deleted file mode 100644
index 18c1a30537..0000000000
--- a/Patches/Cossacks of the Rim/Cossack_Pawnkinds.xml	
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Cossacks of the Rim</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[@Name="Cossack_NobleBase" or @Name="Cossack_CommonBase"]/apparelRequired</xpath>
-					<value>
-						<li>CE_Apparel_TribalBackpack</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/PawnKindDef[@Name="Cossack_CommonBase" or defName="Cossack_Private" or defName="Cossack_Private2" or defName="Cossack_Peasant" or defName="Cossack_Trader"]/itemQuality</xpath>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Cossack_Captain2" or defName="Cossack_Private2" or defName="Cossack_Peasant"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>15</min>
-								<max>30</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>200</min>
-									<max>300</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>NeolithicMeleeBasic</li>
-									<li>MedievalMeleeDecent</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationFindMod">
-					<mods>
-						<li>Vanilla Weapons Expanded</li>
-					</mods>
-					<match Class="PatchOperationSequence">
-						<operations>
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/PawnKindDef[@Name="Cossack_NobleBase" or @Name="Cossack_CommonBase" or defName="Cossack_Private2" or defName="Cossack_Captain2"]</xpath>
-								<value>
-									<li Class="CombatExtended.LoadoutPropertiesExtension">
-										<primaryMagazineCount>
-											<min>15</min>
-											<max>20</max>
-										</primaryMagazineCount>
-										<forcedSidearm>
-											<sidearmMoney>
-												<min>200</min>
-												<max>450</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CossackSabre</li>
-											</weaponTags>
-										</forcedSidearm>
-									</li>
-								</value>
-							</li>
-						</operations>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Crowns and Regalia/ThingDefs_Crowns.xml b/Patches/Crowns and Regalia/ThingDefs_Crowns.xml
deleted file mode 100644
index 51e1299e20..0000000000
--- a/Patches/Crowns and Regalia/ThingDefs_Crowns.xml	
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Crowns and Regalia</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Byzantine Imperial Crown -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Canon_Crown_Byzantine"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Canon_Crown_Byzantine"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>1.8</ArmorRating_Sharp>
-						<ArmorRating_Blunt>2.4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Byzantine Imperial Crown (Stuffable) -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Canon_Crown_Byzantine_Stuffable"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Canon_Crown_Byzantine_Stuffable"]/statBases</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Emerald Crown -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Canon_Crown_Emerald"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Canon_Crown_Emerald"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>1.8</ArmorRating_Sharp>
-						<ArmorRating_Blunt>2.4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Emerald Crown (Stuffable) -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Canon_Crown_Emerald_Stuffable"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Canon_Crown_Emerald_Stuffable"]/statBases</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Holy Roman Reichskrone -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Canon_Crown_Reichskrone"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Canon_Crown_Reichskrone"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>1.8</ArmorRating_Sharp>
-						<ArmorRating_Blunt>2.4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Holy Roman Reichskrone (Stuffable) -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Canon_Crown_Reichskrone_Stuffable"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Canon_Crown_Reichskrone_Stuffable"]/statBases</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CuprosAlloys/ThingDefs/Patch_Materials_Alloy_Advanced.xml b/Patches/CuprosAlloys/ThingDefs/Patch_Materials_Alloy_Advanced.xml
deleted file mode 100644
index 5efce08260..0000000000
--- a/Patches/CuprosAlloys/ThingDefs/Patch_Materials_Alloy_Advanced.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Cupro's Alloys (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======== CAL_BlackSteel ======== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_BlackSteel"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>1.2</MeleePenetrationFactor>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_BlackSteel"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>2.2</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_BlackSteel"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1.4</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_BlackSteel"]/statBases/SharpDamageMultiplier</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_BlackSteel"]/statBases/BluntDamageMultiplier</xpath>
-				</li>
-
-				<!-- ======== CAL_Plastin ======== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Plastin"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>1.4</MeleePenetrationFactor>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Plastin"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>3.6</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Plastin"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>2.4</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_Plastin"]/statBases/SharpDamageMultiplier</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_Plastin"]/statBases/BluntDamageMultiplier</xpath>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CuprosAlloys/ThingDefs/Patch_Materials_Alloy_Decorative.xml b/Patches/CuprosAlloys/ThingDefs/Patch_Materials_Alloy_Decorative.xml
deleted file mode 100644
index e5c8f8b03a..0000000000
--- a/Patches/CuprosAlloys/ThingDefs/Patch_Materials_Alloy_Decorative.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Cupro's Alloys (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======== CAL_ShinyIngotBase ======== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="CAL_ShinyIngotBase"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0</StuffPower_Armor_Heat>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="CAL_ShinyIngotBase"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1.5</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="CAL_ShinyIngotBase"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<!-- ======== CAL_Brass ======== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CAL_Brass"]/stuffProps/statFactors/ArmorRating_Sharp</xpath>
-					<value>
-						<MeleePenetrationFactor>0.9</MeleePenetrationFactor>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_Brass"]/stuffProps/statFactors/ArmorRating_Blunt</xpath>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Brass"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.8</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Brass"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.62</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_Brass"]/statBases/SharpDamageMultiplier</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_Brass"]/statBases/BluntDamageMultiplier</xpath>
-				</li>
-
-				<!-- ======== CAL_ChromePlatedSteel ======== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_ChromePlatedSteel"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>1.02</MeleePenetrationFactor>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_ChromePlatedSteel"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1.55</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_ChromePlatedSteel"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1.04</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_ChromePlatedSteel"]/statBases/SharpDamageMultiplier</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_ChromePlatedSteel"]/statBases/BluntDamageMultiplier</xpath>
-				</li>
-
-				<!-- ======== CAL_Aurichalcum ======== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Aurichalcum"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>0.88</MeleePenetrationFactor>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Aurichalcum"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.74</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Aurichalcum"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.38</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_Aurichalcum"]/statBases/SharpDamageMultiplier</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_Aurichalcum"]/statBases/BluntDamageMultiplier</xpath>
-				</li>
-
-				<!-- ======== CAL_SterlingSilver ======== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_SterlingSilver"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>0.9</MeleePenetrationFactor>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_SterlingSilver"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.71</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_SterlingSilver"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.42</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CAL_SterlingSilver"]/statBases/SharpDamageMultiplier</xpath>
-					<value>
-						<SharpDamageMultiplier>0.952</SharpDamageMultiplier>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CAL_SterlingSilver"]/statBases/BluntDamageMultiplier</xpath>
-					<value>
-						<BluntDamageMultiplier>1.05</BluntDamageMultiplier>
-					</value>
-				</li>
-
-				<!-- ======== CAL_RoseGold ======== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_RoseGold"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>0.86</MeleePenetrationFactor>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_RoseGold"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.9</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_RoseGold"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.32</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CAL_RoseGold"]/statBases/SharpDamageMultiplier</xpath>
-					<value>
-						<SharpDamageMultiplier>0.909</SharpDamageMultiplier>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CAL_RoseGold"]/statBases/BluntDamageMultiplier</xpath>
-					<value>
-						<BluntDamageMultiplier>1.1</BluntDamageMultiplier>
-					</value>
-				</li>
-
-				<!-- ======== CAL_Electrum ======== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Electrum"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>0.82</MeleePenetrationFactor>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Electrum"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.66</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Electrum"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.34</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_Electrum"]/statBases/SharpDamageMultiplier</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_Electrum"]/statBases/BluntDamageMultiplier</xpath>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CuprosAlloys/ThingDefs/Patch_Materials_Alloy_Utility.xml b/Patches/CuprosAlloys/ThingDefs/Patch_Materials_Alloy_Utility.xml
deleted file mode 100644
index c476589b5a..0000000000
--- a/Patches/CuprosAlloys/ThingDefs/Patch_Materials_Alloy_Utility.xml
+++ /dev/null
@@ -1,276 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Cupro's Alloys (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======== CAL_DullIngotBase ======== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="CAL_DullIngotBase"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0</StuffPower_Armor_Heat>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="CAL_DullIngotBase"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1.5</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="CAL_DullIngotBase"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<!-- ======== CAL_Plumchalcum ======== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Plumchalcum"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>0.9</MeleePenetrationFactor>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Plumchalcum"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.96</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Plumchalcum"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.44</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CAL_Plumchalcum"]/statBases/SharpDamageMultiplier</xpath>
-					<value>
-						<SharpDamageMultiplier>0.909</SharpDamageMultiplier>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CAL_Plumchalcum"]/statBases/BluntDamageMultiplier</xpath>
-					<value>
-						<BluntDamageMultiplier>1.1</BluntDamageMultiplier>
-					</value>
-				</li>
-
-				<!-- ======== CAL_Duralumin ======== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Duralumin"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>0.92</MeleePenetrationFactor>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Duralumin"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.86</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Duralumin"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.6</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_Duralumin"]/statBases/SharpDamageMultiplier</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_Duralumin"]/statBases/BluntDamageMultiplier</xpath>
-				</li>
-
-				<!-- ======== CAL_Zamak ======== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Zamak"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>0.94</MeleePenetrationFactor>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Zamak"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.82</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Zamak"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.64</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_Zamak"]/statBases/SharpDamageMultiplier</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_Zamak"]/statBases/BluntDamageMultiplier</xpath>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Zamak"]/stuffProps/categories</xpath>
-					<value>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<!-- ======== CAL_BismuthBronze ======== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_BismuthBronze"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>0.96</MeleePenetrationFactor>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_BismuthBronze"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.88</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_BismuthBronze"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.68</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_BismuthBronze"]/statBases/SharpDamageMultiplier</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_BismuthBronze"]/statBases/BluntDamageMultiplier</xpath>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_BismuthBronze"]/stuffProps/categories</xpath>
-					<value>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<!-- ======== CAL_Bronze ======== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Bronze"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>0.80</MeleePenetrationFactor>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Bronze"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.84</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Bronze"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.7</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_Bronze"]/statBases/SharpDamageMultiplier</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_Bronze"]/statBases/BluntDamageMultiplier</xpath>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Bronze"]/stuffProps/categories</xpath>
-					<value>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<!-- ======== CAL_Cupronickel ======== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Cupronickel"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>0.98</MeleePenetrationFactor>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Cupronickel"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.76</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Cupronickel"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.72</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_Cupronickel"]/statBases/SharpDamageMultiplier</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_Cupronickel"]/statBases/BluntDamageMultiplier</xpath>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Cupronickel"]/stuffProps/categories</xpath>
-					<value>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<!-- ======== CAL_StainlessSteel ======== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_StainlessSteel"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>1.06</MeleePenetrationFactor>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_StainlessSteel"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1.7</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_StainlessSteel"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1.16</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_StainlessSteel"]/statBases/SharpDamageMultiplier</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_StainlessSteel"]/statBases/BluntDamageMultiplier</xpath>
-				</li>
-
-				<!-- ======== CAL_Hepatzion ======== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Hepatzion"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>0.8</MeleePenetrationFactor>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Hepatzion"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.8</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Hepatzion"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.66</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_Hepatzion"]/statBases/SharpDamageMultiplier</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_Hepatzion"]/statBases/BluntDamageMultiplier</xpath>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Hepatzion"]/stuffProps/categories</xpath>
-					<value>
-						<li>Steeled</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/CuprosAlloys/ThingDefs/Patch_Materials_BaseMetal.xml b/Patches/CuprosAlloys/ThingDefs/Patch_Materials_BaseMetal.xml
deleted file mode 100644
index de4ac8bee7..0000000000
--- a/Patches/CuprosAlloys/ThingDefs/Patch_Materials_BaseMetal.xml
+++ /dev/null
@@ -1,250 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Cupro's Alloys (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======== CAL_OreBase ======== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="CAL_OreBase"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0</StuffPower_Armor_Heat>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="CAL_OreBase"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="CAL_OreBase"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.5</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<!-- ======== CAL_Copper ======== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Copper"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>0.86</MeleePenetrationFactor>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Copper"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.7</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Copper"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.46</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_Copper"]/statBases/SharpDamageMultiplier</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_Copper"]/statBases/BluntDamageMultiplier</xpath>
-				</li>
-
-				<!-- ======== CAL_Lead ======== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Lead"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>0.8</MeleePenetrationFactor>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CAL_Lead"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.6</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CAL_Lead"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.14</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_Lead"]/statBases/StuffPower_Armor_Heat</xpath>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CAL_Lead"]/statBases/SharpDamageMultiplier</xpath>
-					<value>
-						<SharpDamageMultiplier>0.909</SharpDamageMultiplier>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CAL_Lead"]/statBases/BluntDamageMultiplier</xpath>
-					<value>
-						<BluntDamageMultiplier>1.1</BluntDamageMultiplier>
-					</value>
-				</li>
-
-				<!-- ======== CAL_Tin ======== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Tin"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>0.82</MeleePenetrationFactor>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CAL_Tin"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.55</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CAL_Tin"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.45</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_Tin"]/statBases/StuffPower_Armor_Heat</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_Tin"]/statBases/SharpDamageMultiplier</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_Tin"]/statBases/BluntDamageMultiplier</xpath>
-				</li>
-
-				<!-- ======== CAL_Aluminum ======== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Aluminum"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>0.7</MeleePenetrationFactor>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CAL_Aluminum"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.325</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CAL_Aluminum"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.33</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_Aluminum"]/statBases/StuffPower_Armor_Heat</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_Aluminum"]/statBases/SharpDamageMultiplier</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_Aluminum"]/statBases/BluntDamageMultiplier</xpath>
-				</li>
-
-				<!-- ======== CAL_Nickel ======== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Nickel"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>0.92</MeleePenetrationFactor>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CAL_Nickel"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.55</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<!-- !! Nickel already has the correct sharp protection lol !! -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_Nickel"]/statBases/StuffPower_Armor_Heat</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_Nickel"]/statBases/SharpDamageMultiplier</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_Nickel"]/statBases/BluntDamageMultiplier</xpath>
-				</li>
-
-				<!-- ======== CAL_Zinc ======== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Zinc"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>0.8</MeleePenetrationFactor>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CAL_Zinc"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.525</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CAL_Zinc"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.38</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_Zinc"]/statBases/StuffPower_Armor_Heat</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_Zinc"]/statBases/SharpDamageMultiplier</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_Zinc"]/statBases/BluntDamageMultiplier</xpath>
-				</li>
-
-				<!-- ======== CAL_Bismuth ======== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Bismuth"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>0.76</MeleePenetrationFactor>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Bismuth"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.95</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Bismuth"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.16</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<!-- ======== CAL_Chromium ======== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Chromium"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>1.02</MeleePenetrationFactor>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Chromium"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1.01</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CAL_Chromium"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1.08</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_Chromium"]/statBases/SharpDamageMultiplier</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CAL_Chromium"]/statBases/BluntDamageMultiplier</xpath>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Cursed Guns/CursedAmmo.xml b/Patches/Cursed Guns/CursedAmmo.xml
deleted file mode 100644
index 5e231d3b8c..0000000000
--- a/Patches/Cursed Guns/CursedAmmo.xml	
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Cursed Guns</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_40x46mmGrenade"]/ammoTypes</xpath>
-					<value>
-						<Ammo_40x46mmGrenade_Rubber>Bullet_40x46mmGrenade_Rubber</Ammo_40x46mmGrenade_Rubber>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>GrenadeRubber</defName>
-							<label>Rubberised slug</label>
-							<description>A rubber slug with a metal core inside. Less lethal than usual ammunition, but can still maim or kill someone.</description>
-							<advanced>true</advanced>
-						</CombatExtended.AmmoCategoryDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="40x46mmGrenadeBase">
-							<defName>Ammo_40x46mmGrenade_Rubber</defName>
-							<label>40x46mm grenade (Rubber)</label>
-							<graphicData>
-								<texPath>Things/Ammo/GrenadeLauncher/HE</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>2.37</MarketValue>
-							</statBases>
-							<ammoClass>GrenadeRubber</ammoClass>
-							<cookOffProjectile>Bullet_40x46mmGrenade_Rubber</cookOffProjectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base12GaugeBullet">
-							<defName>Bullet_40x46mmGrenade_Rubber</defName>
-							<label>Rubberised slug</label>
-							<graphicData>
-								<texPath>Rubberdong</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>27</speed>
-								<damageDef>Beanbag</damageDef>
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.240</armorPenetrationBlunt>
-								<spreadMult>2</spreadMult>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_40x46mmGrenade_Rubber</defName>
-							<label>make 40x46mm Rubber grenades x100</label>
-							<description>Craft 100 40x46mm Rubber grenades.</description>
-							<jobString>Making 40x46mm Rubber grenades.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>50</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Chemfuel</li>
-										</thingDefs>
-									</filter>
-									<count>7</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Chemfuel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_40x46mmGrenade_Rubber>100</Ammo_40x46mmGrenade_Rubber>
-							</products>
-							<workAmount>9000</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>KniperBlade</defName>
-							<label>Blade</label>
-							<description>A ballistic knife blade.</description>
-							<advanced>false</advanced>
-						</CombatExtended.AmmoCategoryDef>
-
-						<ThingCategoryDef>
-							<defName>KniperBlade</defName>
-							<label>Blade</label>
-							<parent>AmmoNeolithic</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberArrow</iconPath>
-						</ThingCategoryDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Ballistic_Blade</defName>
-							<label>kniper blades</label>
-							<ammoTypes>
-								<Ammo_kniper_blade>Projectile_kniper_blade</Ammo_kniper_blade>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoArrowBase">
-							<defName>Ammo_kniper_blade</defName>
-							<label>kniper blade</label>
-							<description>A ballistic knife blade.</description>
-							<statBases>
-								<Mass>0.014</Mass>
-								<Bulk>0.04</Bulk>
-								<Flammability>0</Flammability>
-							</statBases>
-							<graphicData>
-								<texPath>Things/Ammo/Neolithic/Dart</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<ammoClass>KniperBlade</ammoClass>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseArrowProjectile">
-							<defName>Projectile_kniper_blade</defName>
-							<label>Blade</label>
-							<graphicData>
-								<texPath>Knife</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>55</speed>
-								<damageDef>RangedStab</damageDef>
-								<damageAmountBase>9</damageAmountBase>
-								<armorPenetrationSharp>0.65</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.60</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>MakeAmmo_kniper_blade</defName>
-							<label>make kniper blades x10</label>
-							<description>Craft 10 kniper blades.</description>
-							<jobString>Making kniper blades.</jobString>
-							<workAmount>960</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<recipeUsers>
-								<li>TableMachining</li>
-							</recipeUsers>
-							<products>
-								<Ammo_kniper_blade>10</Ammo_kniper_blade>
-							</products>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Cursed Guns/CursedGuns.xml b/Patches/Cursed Guns/CursedGuns.xml
deleted file mode 100644
index 20970c196f..0000000000
--- a/Patches/Cursed Guns/CursedGuns.xml	
+++ /dev/null
@@ -1,1344 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Cursed Guns</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Tools ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName="CursedGun_MacSixTeen" or
-						defName="CursedGun_Lugernikov" or
-						defName="CursedGun_PKMini" or
-						defName="CursedGun_GSTFourFour" or
-						defName="CursedGun_AmericanNinety" or
-						defName="CursedGun_TomNine" or
-						defName="CursedGun_PPCyka" or
-						defName="CursedGun_Khaukhat" or
-						defName="CursedGun_KammyGun" or
-						defName="CursedGun_ASFAL" or
-						defName="CursedGun_Bossmerg" or
-						defName="CursedGun_Fringspield"
-						]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName="CursedGun_Deaglov" or
-						defName="CursedGun_MPZweiundvierzig" or
-						defName="CursedGun_SaigaEleven" or
-						defName="CursedGun_Obrez" or
-						defName="CursedGun_ZipTwoTwo" or
-						defName="CursedGun_ZipTwoTwoThrown" or
-						defName="CursedGun_SawPoint" or
-						defName="CursedGun_Makeagle" or
-						defName="CursedGun_Gluger" or
-						defName="CursedGun_Llock" or
-						defName="CursedGun_ScopedPistol"
-						]/tools
-					</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[defName="CursedGun_Kniper"]/tools
-					</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Stab</li>
-									<li>Cut</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Guns ========== -->
-
-				<!-- MAC-16 -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CursedGun_MacSixTeen</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>0.90</SwayFactor>
-						<Bulk>2.50</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.3</warmupTime>
-						<range>28</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<!-- Lugernikov -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CursedGun_Lugernikov</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>0.85</SwayFactor>
-						<Bulk>4.5</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.3</warmupTime>
-						<range>28</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>9</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<!-- PKMini -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CursedGun_PKMini</defName>
-					<statBases>
-						<Bulk>10.00</Bulk>
-						<SwayFactor>1.6</SwayFactor>
-						<ShotSpread>0.6</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>0.7</warmupTime>
-						<range>45</range>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilAmount>1.6</recoilAmount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-						<li>CE_MachineGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- GSt 44 -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CursedGun_GSTFourFour</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>0.90</SwayFactor>
-						<Bulk>2.50</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_792x33mmKurz_FMJ</defaultProjectile>
-						<warmupTime>0.3</warmupTime>
-						<range>33</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>Shot_HeavySMG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>31</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_792x33mmKurz</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<!-- MP42 -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CursedGun_MPZweiundvierzig</defName>
-					<statBases>
-						<Bulk>7.5</Bulk>
-						<SwayFactor>2</SwayFactor>
-						<ShotSpread>0.6</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>0.7</warmupTime>
-						<range>45</range>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilAmount>2</recoilAmount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-						<li>CE_MachineGun</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- Saiga 11 -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CursedGun_SaigaEleven</defName>
-					<statBases>
-						<Mass>2.84</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.93</SwayFactor>
-						<Bulk>2.95</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>4</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_BROOM</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- Obrez -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CursedGun_Obrez</defName>
-					<statBases>
-						<Mass>1.5</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.1</SightsEfficiency>
-						<ShotSpread>0.7</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>2.95</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- American-90 -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CursedGun_AmericanNinety</defName>
-					<statBases>
-						<Bulk>5.00</Bulk>
-						<SwayFactor>1.6</SwayFactor>
-						<ShotSpread>0.6</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_22LR_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<warmupTime>0.2</warmupTime>
-						<range>45</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilAmount>0.1</recoilAmount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>83</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_22LR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- Tom-9 -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CursedGun_TomNine</defName>
-					<statBases>
-						<Bulk>5.00</Bulk>
-						<SwayFactor>1.6</SwayFactor>
-						<ShotSpread>0.6</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<burstShotCount>8</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<warmupTime>0.2</warmupTime>
-						<range>45</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilAmount>0.8</recoilAmount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aimedBurstShotCount>4</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- Deaglov -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CursedGun_Deaglov</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.9</SwayFactor>
-						<Bulk>1.5</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>9</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_BROOM</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- Skorpiov -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CursedGun_Skorpiov</defName>
-					<statBases>
-						<Bulk>2</Bulk>
-						<SwayFactor>0.9</SwayFactor>
-						<ShotSpread>0.17</ShotSpread>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.46</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_9x18mmMakarov_FMJ</defaultProjectile>
-						<burstShotCount>8</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<warmupTime>0.2</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilAmount>0.8</recoilAmount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aimedBurstShotCount>4</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-						<li>CE_SMG</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- AK4.7 -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CursedGun_AKFourPointSeven</defName>
-					<statBases>
-						<Bulk>4.4</Bulk>
-						<SwayFactor>0.9</SwayFactor>
-						<ShotSpread>0.17</ShotSpread>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.46</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<burstShotCount>8</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>0.2</warmupTime>
-						<range>22</range>
-						<soundCast>Shot_HeavySMG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilAmount>0.8</recoilAmount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aimedBurstShotCount>4</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-						<li>CE_SMG</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- PPCyka -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CursedGun_PPCyka</defName>
-					<statBases>
-						<Bulk>3.00</Bulk>
-						<SwayFactor>1.6</SwayFactor>
-						<ShotSpread>0.3</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<warmupTime>0.2</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilAmount>0.1</recoilAmount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>71</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- Khaukhat -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CursedGun_Khaukhat</defName>
-					<statBases>
-						<Bulk>3.50</Bulk>
-						<SwayFactor>1.6</SwayFactor>
-						<ShotSpread>0.1</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<warmupTime>0.2</warmupTime>
-						<range>75</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilAmount>1.1</recoilAmount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>34</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-						<li>CE_MachineGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- Kammy Gun -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CursedGun_KammyGun</defName>
-					<statBases>
-						<Bulk>8.8</Bulk>
-						<SwayFactor>1.19</SwayFactor>
-						<ShotSpread>0.09</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>0.2</warmupTime>
-						<range>44</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilAmount>1.8</recoilAmount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<!-- AS FAL -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CursedGun_ASFAL</defName>
-					<statBases>
-						<Bulk>6</Bulk>
-						<SwayFactor>1.04</SwayFactor>
-						<ShotSpread>0.08</ShotSpread>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_9x39mmSoviet_FMJ</defaultProjectile>
-						<burstShotCount>4</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>1</warmupTime>
-						<range>48</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilAmount>1.1</recoilAmount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<!-- Zip 22 -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CursedGun_ZipTwoTwo</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.1</SightsEfficiency>
-						<ShotSpread>0.5</ShotSpread>
-						<SwayFactor>0.9</SwayFactor>
-						<Bulk>0.5</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_22LR_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_22LR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_BROOM</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- Zip 22 Thrown -->
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="CursedGun_ZipTwoTwoThrown"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>BaseWeapon</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CursedGun_ZipTwoTwoThrown"]</xpath>
-					<value>
-						<thingCategories>
-							<li>WeaponsRanged</li>
-						</thingCategories>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CursedGun_ZipTwoTwoThrown"]</xpath>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<stackLimit>75</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-						<techLevel>Industrial</techLevel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CursedGun_ZipTwoTwoThrown"]/recipeMaker</xpath>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="CursedGun_ZipTwoTwoThrown"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CursedGun_ZipTwoTwoThrown</defName>
-					<statBases>
-						<SightsEfficiency>0.5</SightsEfficiency>
-						<ShotSpread>1.5</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>0.5</Bulk>
-						<RangedWeapon_Cooldown>0.48</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<label>Throw Zip 22</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_ZipTwoTwoThrown</defaultProjectile>
-						<warmupTime>0.66</warmupTime>
-						<range>10</range>
-						<soundCast>ThrowGrenade</soundCast>
-						<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-					</Properties>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_ZipTwoTwoThrown"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<damageDef>Blunt</damageDef>
-							<damageAmountBase>20</damageAmountBase>
-							<flyOverhead>false</flyOverhead>
-							<speed>35</speed>
-							<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-							<armorPenetrationSharp>0</armorPenetrationSharp>
-							<preExplosionSpawnChance>1</preExplosionSpawnChance>
-							<preExplosionSpawnThingDef>CursedGun_ZipTwoTwoThrown</preExplosionSpawnThingDef>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeZipTwoTwoThrown</defName>
-							<label>make Yeep 22</label>
-							<description>Craft 10 Yeep 22.</description>
-							<jobString>Making Yeep 22.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>15</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<recipeUsers>
-								<li>TableMachining</li>
-							</recipeUsers>
-							<products>
-								<CursedGun_ZipTwoTwoThrown>1</CursedGun_ZipTwoTwoThrown>
-							</products>
-							<workAmount>1500</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeZipTwoTwoThrownX10</defName>
-							<label>make Yeep 22 x10</label>
-							<description>Craft 10 Yeep 22s.</description>
-							<jobString>Making Yeep 22s.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>150</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<recipeUsers>
-								<li>TableMachining</li>
-							</recipeUsers>
-							<products>
-								<CursedGun_ZipTwoTwoThrown>10</CursedGun_ZipTwoTwoThrown>
-							</products>
-							<workAmount>15000</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-
-				<!-- Makeagle -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CursedGun_Makeagle</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.9</SwayFactor>
-						<Bulk>1.7</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50AE_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_50AE</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_BROOM</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- SawPoint -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CursedGun_SawPoint</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.9</SwayFactor>
-						<Bulk>2</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_380ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_380ACP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<!-- Kniper -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CursedGun_Kniper</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.67</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.75</SightsEfficiency>
-						<ShotSpread>0.32</ShotSpread>
-						<SwayFactor>1.3</SwayFactor>
-						<Bulk>1.2</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_kniper_blade</defaultProjectile>
-						<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-						<warmupTime>0.5</warmupTime>
-						<range>25</range>
-						<soundCast>Bow_Large</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>2</AmmoGenPerMagOverride>
-						<reloadTime>1.2</reloadTime>
-						<ammoSet>AmmoSet_Ballistic_Blade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_BROOM</li>
-						<li>Bipod_DMR</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- Gluger	-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CursedGun_Gluger</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.03</SwayFactor>
-						<Bulk>1.7</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_BROOM</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- Llock -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CursedGun_Llock</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.2</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.00</SwayFactor>
-						<Bulk>1.5</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>17</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_BROOM</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- Bossmerg -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CursedGun_Bossmerg</defName>
-					<statBases>
-						<Bulk>8.50</Bulk>
-						<SwayFactor>1.0</SwayFactor>
-						<ShotSpread>0.14</ShotSpread>
-						<SightsEfficiency>1.2</SightsEfficiency>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilAmount>1.1</recoilAmount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>False</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<!-- Dongopod -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CursedGun_Dongopod</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.75</SightsEfficiency>
-						<ShotSpread>0.32</ShotSpread>
-						<SwayFactor>1.3</SwayFactor>
-						<Bulk>5</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<warmupTime>1.1</warmupTime>
-						<range>33</range>
-						<minRange>5</minRange>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
-						<reloadTime>2.2</reloadTime>
-						<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>GunGrenadeLauncher</li>
-						<li>GrenadeEMP</li>
-						<li>CE_AI_SMOKE</li>
-					</weaponTags>
-				</li>
-
-				<!-- Dongopod Rubber -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="CursedGun_DongopodRubber"]</xpath>
-				</li>
-
-				<!-- Fringspield -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CursedGun_Fringspield</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1.68</SwayFactor>
-						<Bulk>12</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_3006Springfield</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<!-- Scoped Pistol -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CursedGun_ScopedPistol</defName>
-					<statBases>
-						<Mass>1.5</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.01</SightsEfficiency>
-						<ShotSpread>0.7</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>4</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_303British</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>Bipod_DMR</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Cursed Guns/Fedora.xml b/Patches/Cursed Guns/Fedora.xml
deleted file mode 100644
index 80e2678ed2..0000000000
--- a/Patches/Cursed Guns/Fedora.xml	
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Cursed Guns</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_FedoraCursedGun"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Cybernet/HediffDefs/Hediffs_CyberNet_BodyParts.xml b/Patches/Cybernet/HediffDefs/Hediffs_CyberNet_BodyParts.xml
deleted file mode 100644
index e247829077..0000000000
--- a/Patches/Cybernet/HediffDefs/Hediffs_CyberNet_BodyParts.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>CyberNet</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!--Base version is comparable to bionic arm-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="CNNetworkedArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.11</cooldownTime>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="CNAdvancedNetworkedArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.98</cooldownTime>
-								<armorPenetrationBlunt>2.168</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Cybernet/HediffDefs/Hediffs_CyberNet_Brain.xml b/Patches/Cybernet/HediffDefs/Hediffs_CyberNet_Brain.xml
deleted file mode 100644
index 2ab2926134..0000000000
--- a/Patches/Cybernet/HediffDefs/Hediffs_CyberNet_Brain.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>CyberNet</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!--Combat Implant-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="CNCombatOptimizationImplant"]/stages/li[label="disconnected"]/statOffsets/MeleeArmorPenetration</xpath>
-					<value>
-						<MeleeCritChance>-0.05</MeleeCritChance>
-						<MeleeParryChance>-0.0625</MeleeParryChance>
-						<Suppressability>0.25</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="CNCombatOptimizationImplant"]/stages/li[label="disconnected"]/statOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>-0.2</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="CNCombatOptimizationImplant"]/stages/li[label="disconnected"]/statOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<ShootingAccuracyPawn>-0.4</ShootingAccuracyPawn>
-						<AimingAccuracy>-0.2</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="CNCombatOptimizationImplant"]/stages/li[label="throttled"]/statOffsets/MeleeArmorPenetration</xpath>
-					<value>
-						<MeleeCritChance>0.025</MeleeCritChance>
-						<MeleeParryChance>0.03125</MeleeParryChance>
-						<Suppressability>0</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="CNCombatOptimizationImplant"]/stages/li[label="throttled"]/statOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="CNCombatOptimizationImplant"]/stages/li[label="throttled"]/statOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<ShootingAccuracyPawn>0</ShootingAccuracyPawn>
-						<AimingAccuracy>0</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="CNCombatOptimizationImplant"]/stages/li[label="sluggish"]/statOffsets/MeleeArmorPenetration</xpath>
-					<value>
-						<MeleeCritChance>0.075</MeleeCritChance>
-						<MeleeParryChance>0.09375</MeleeParryChance>
-						<Suppressability>-0.25</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="CNCombatOptimizationImplant"]/stages/li[label="sluggish"]/statOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="CNCombatOptimizationImplant"]/stages/li[label="sluggish"]/statOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<ShootingAccuracyPawn>0.4</ShootingAccuracyPawn>
-						<AimingAccuracy>0.2</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="CNCombatOptimizationImplant"]/stages/li[label="connected"]/statOffsets/MeleeArmorPenetration</xpath>
-					<value>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.1875</MeleeParryChance>
-						<Suppressability>-0.50</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="CNCombatOptimizationImplant"]/stages/li[label="connected"]/statOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.5</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="CNCombatOptimizationImplant"]/stages/li[label="connected"]/statOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<AimingAccuracy>0.5</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="CNCombatOptimizationImplant"]/stages/li[label="overclocked"]/statOffsets/MeleeArmorPenetration</xpath>
-					<value>
-						<MeleeCritChance>0.175</MeleeCritChance>
-						<MeleeParryChance>0.219</MeleeParryChance>
-						<Suppressability>-0.75</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="CNCombatOptimizationImplant"]/stages/li[label="overclocked"]/statOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.65</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="CNCombatOptimizationImplant"]/stages/li[label="overclocked"]/statOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<ShootingAccuracyPawn>1.3</ShootingAccuracyPawn>
-						<AimingAccuracy>0.65</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="CNCombatOptimizationImplant"]/stages/li[label="supercharged"]/statOffsets/MeleeArmorPenetration</xpath>
-					<value>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-						<Suppressability>-1</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="CNCombatOptimizationImplant"]/stages/li[label="supercharged"]/statOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.8</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="CNCombatOptimizationImplant"]/stages/li[label="supercharged"]/statOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<ShootingAccuracyPawn>1.6</ShootingAccuracyPawn>
-						<AimingAccuracy>0.8</AimingAccuracy>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Cybernetic Organism and Neural Network/Hediffs/CONN_CombatAdvancedBionics.xml b/Patches/Cybernetic Organism and Neural Network/Hediffs/CONN_CombatAdvancedBionics.xml
deleted file mode 100644
index 45c6cadb9e..0000000000
--- a/Patches/Cybernetic Organism and Neural Network/Hediffs/CONN_CombatAdvancedBionics.xml	
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Cybernetic Organism and Neural Network</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Robotic eye -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="CONN_hediff_IndependentEye"]/stages/li</xpath>
-					<value>
-						<statOffsets>
-							<NightVisionEfficiency_Implant>0.4</NightVisionEfficiency_Implant>
-						</statOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CONN_IndependentEye"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency_Implant>0.4</NightVisionEfficiency_Implant>
-					</value>
-				</li>
-
-				<!-- Outer blade -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="CONN_hediff_OuterBlade"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<statOffsets>
-									<MeleeDodgeChance>0.4</MeleeDodgeChance>
-									<MeleeCritChance>0.14</MeleeCritChance>
-									<MeleeParryChance>0.4</MeleeParryChance>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="CONN_hediff_OuterBlade"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>32</power>
-								<cooldownTime>0.83</cooldownTime>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Power arm -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/HediffDef[defName="CONN_hediff_PowerArms"]/stages</xpath>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="CONN_hediff_PowerArms"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>0.5</cooldownTime>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Exoskeleton armor -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="CONN_hediff_ExoskeletonArmor"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<statOffsets>
-									<ArmorRating_Blunt>4</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.1</ArmorRating_Heat>
-									<ArmorRating_Sharp>2</ArmorRating_Sharp>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-
-				<!-- Dermalplating -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="CONN_hediff_Dermalplating"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<statOffsets>
-									<ArmorRating_Blunt>8</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.2</ArmorRating_Heat>
-									<ArmorRating_Sharp>4</ArmorRating_Sharp>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-
-				<!-- Lionheart -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="CONN_hediff_Lionheart"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Cybernetic Organism and Neural Network/Hediffs/CONN_CombatBionics.xml b/Patches/Cybernetic Organism and Neural Network/Hediffs/CONN_CombatBionics.xml
deleted file mode 100644
index e9b7d180e6..0000000000
--- a/Patches/Cybernetic Organism and Neural Network/Hediffs/CONN_CombatBionics.xml	
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Cybernetic Organism and Neural Network</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Zomm (eye replacement) -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="CONN_hediff_Zoom"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<NightVisionEfficiency_Implant>0.3</NightVisionEfficiency_Implant>
-						<AimingAccuracy>0.6</AimingAccuracy><!-- I did the math, and with an aiming accuracy bonus of this, with two of these, a level 20 shooter basically has a sniper rifle scope on 100% sight efficiency guns. -->
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CONN_Zoom"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency_Implant>0.3</NightVisionEfficiency_Implant>
-					</value>
-				</li>
-
-				<!-- Energy fist -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="CONN_hediff_EnergyFist"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.3</cooldownTime>
-								<armorPenetrationBlunt>1.531</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Elastic achilles (foot? replacement) -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="CONN_hediff_ElasticAchilles"]/stages/li/statOffsets/MeleeHitChance</xpath><!-- Why does it have an increased melee hit chance in vanilla and not increased dodge chance? -->
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance><!-- A bit better than an archotech leg at giving dodge chance -->
-					</value>
-				</li>
-
-				<!-- Cyclops visor -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="CONN_hediff_CyclopsVisor"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<AimingAccuracy>0.1</AimingAccuracy>
-						<ShootingAccuracyPawn>0.1</ShootingAccuracyPawn>
-					</value>
-				</li>
-
-				<!-- Laser detection (ear implant) -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="CONN_hediff_LaserDetection"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<AimingAccuracy>0.15</AimingAccuracy>
-					</value>
-				</li>
-
-				<!-- Sensoric earside (ear replacement) -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="CONN_hediff_SensoricEarside"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Cybernetic Organism and Neural Network/Hediffs/CONN_MindAlteringBionics.xml b/Patches/Cybernetic Organism and Neural Network/Hediffs/CONN_MindAlteringBionics.xml
deleted file mode 100644
index f55c51b4dc..0000000000
--- a/Patches/Cybernetic Organism and Neural Network/Hediffs/CONN_MindAlteringBionics.xml	
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Cybernetic Organism and Neural Network</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Berserker chip -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="CONN_hediff_BerserkerChip"]/stages/li/statOffsets/MeleeHitChance</xpath>
-					<value>
-						<MeleeHitChance>12</MeleeHitChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="CONN_hediff_BerserkerChip"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.4</MeleeDodgeChance>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="CONN_hediff_BerserkerChip"]/stages/li</xpath>
-					<value>
-						<statFactors>
-							<Suppressability>0</Suppressability>
-						</statFactors>
-					</value>
-				</li>
-
-				<!-- Combat AI -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="CONN_hediff_CombatAI"]/stages/li/statOffsets</xpath>
-					<value>
-						<Suppressability>-0.25</Suppressability>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Cybernetic Organism and Neural Network/Hediffs/CONN_ProductiveBionics.xml b/Patches/Cybernetic Organism and Neural Network/Hediffs/CONN_ProductiveBionics.xml
deleted file mode 100644
index 6b58b1b63c..0000000000
--- a/Patches/Cybernetic Organism and Neural Network/Hediffs/CONN_ProductiveBionics.xml	
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Cybernetic Organism and Neural Network</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Black pearl -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="CONN_hediff_BlackPearl"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<statOffsets>
-									<NightVisionEfficiency_Implant>0.4</NightVisionEfficiency_Implant><!-- With both eyes, the same night vision as mechanoids -->
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CONN_BlackPearl"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency_Implant>0.4</NightVisionEfficiency_Implant>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Cybernetic Warfare and Special Weapons/CyberneticWarfare_Melee.xml b/Patches/Cybernetic Warfare and Special Weapons/CyberneticWarfare_Melee.xml
deleted file mode 100644
index 3647626a55..0000000000
--- a/Patches/Cybernetic Warfare and Special Weapons/CyberneticWarfare_Melee.xml	
+++ /dev/null
@@ -1,333 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Cybernetic Warfare and Special Weapons (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- =========== DamageDefs =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/DamageDef[defName="CW_ElectroBurn"]</xpath>
-					<value>
-						<soundExplosion>CW_PowerSpark</soundExplosion>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/DamageDef[defName="CW_ElectroCharge"]</xpath>
-					<value>
-						<soundExplosion>CW_ContinousSpark</soundExplosion>
-					</value>
-				</li>
-
-				<!-- =========== Melee Weapons =========== -->
-
-				<!-- =============== Power Fist =============== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CW_PowerFist"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Pummel</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<armorPenetrationBlunt>70</armorPenetrationBlunt>
-								<cooldownTime>0.25</cooldownTime>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Crush</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9.3</power>
-								<armorPenetrationBlunt>150</armorPenetrationBlunt>
-								<cooldownTime>0.25</cooldownTime>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Knockback</label>
-								<capacities>
-									<li>BluntKnockback</li>
-								</capacities>
-								<power>11.3</power>
-								<armorPenetrationBlunt>90</armorPenetrationBlunt>
-								<cooldownTime>0.25</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CW_PowerFist"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CW_PowerFist"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>0.75</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "CW_PowerFist"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "CW_PowerFist"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CW_PowerFist"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- =============== Energy Claw =============== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CW_EnergyClaw"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>energy burst</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>50</armorPenetrationSharp>
-								<cooldownTime>0.25</cooldownTime>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>0.25</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<armorPenetrationSharp>50</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>claw</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>10</power>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<armorPenetrationSharp>50</armorPenetrationSharp>
-								<cooldownTime>0.25</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>sidestep stab</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>12</power>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<cooldownTime>0.25</cooldownTime>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CW_EnergyClaw"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CW_EnergyClaw"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.25</MeleeCritChance>
-							<MeleeParryChance>0.75</MeleeParryChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "CW_EnergyClaw"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "CW_EnergyClaw"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CW_EnergyClaw"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- =============== Energy Sword =============== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CW_EnergySword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<armorPenetrationBlunt>0.500</armorPenetrationBlunt>
-								<cooldownTime>1</cooldownTime>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>1</cooldownTime>
-								<armorPenetrationBlunt>11.250</armorPenetrationBlunt>
-								<armorPenetrationSharp>90</armorPenetrationSharp>
-								<armorPenetration>0.33</armorPenetration>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1</cooldownTime>
-								<armorPenetrationBlunt>45</armorPenetrationBlunt>
-								<armorPenetrationSharp>80</armorPenetrationSharp>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetration>0.33</armorPenetration>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CW_EnergySword"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CW_EnergySword"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>0.5</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "CW_EnergySword"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "CW_EnergySword"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CW_EnergySword"]/weaponTags</xpath>
-					<value>
-						<li>CE_Sidearm_Melee</li>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- =============== Chain Sword =============== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CW_ChainSword"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CW_ChainSword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.5</MeleeCritChance>
-							<MeleeParryChance>0.25</MeleeParryChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "CW_ChainSword"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "CW_ChainSword"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CW_ChainSword"]/weaponTags</xpath>
-					<value>
-						<li>CE_Sidearm_Melee</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CW_ChainSword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Uppercut</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<armorPenetrationBlunt>0.500</armorPenetrationBlunt>
-								<cooldownTime>0.5</cooldownTime>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Shocker</label>
-								<capacities>
-									<li>CW_Shock</li>
-								</capacities>
-								<power>5</power>
-								<armorPenetrationBlunt>7.250</armorPenetrationBlunt>
-								<armorPenetrationSharp>75</armorPenetrationSharp>
-								<cooldownTime>0.5</cooldownTime>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Punch</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>7</power>
-								<armorPenetrationBlunt>35</armorPenetrationBlunt>
-								<armorPenetrationSharp>70</armorPenetrationSharp>
-								<cooldownTime>0.5</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Cybernetic Warfare and Special Weapons/CyberneticWarfare_Ranged_Industrial.xml b/Patches/Cybernetic Warfare and Special Weapons/CyberneticWarfare_Ranged_Industrial.xml
deleted file mode 100644
index f4306d1572..0000000000
--- a/Patches/Cybernetic Warfare and Special Weapons/CyberneticWarfare_Ranged_Industrial.xml	
+++ /dev/null
@@ -1,448 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Cybernetic Warfare and Special Weapons (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Riot Breaker -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CW_RiotBreaker</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>0.85</SwayFactor>
-						<Bulk>9</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_20Gauge_Beanbag</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>14</range>
-						<minRange>1.5</minRange>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>1.5</reloadTime>
-						<ammoSet>AmmoSet_20Gauge</ammoSet>
-						<reloadOneAtATime>true</reloadOneAtATime>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CW_RiotBreaker"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Ballistic Shredder -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CW_BallisticShredder</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.19</ShotSpread>
-						<SwayFactor>1.06</SwayFactor>
-						<Bulk>6</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>22</range>
-						<minRange>1.5</minRange>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>2.25</reloadTime>
-						<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_SMG</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CW_BallisticShredder"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Ballistic Combat Gun -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CW_BallisticCombatGun</defName>
-					<statBases>
-						<SightsEfficiency>0.85</SightsEfficiency>
-						<ShotSpread>0.55</ShotSpread>
-						<SwayFactor>1.46</SwayFactor>
-						<Bulk>5</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>22</range>
-						<minRange>1.5</minRange>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>2.25</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_SMG</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CW_BallisticCombatGun"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Ballistic Enforcer -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CW_BallisticEnforcer</defName>
-					<statBases>
-						<SightsEfficiency>0.85</SightsEfficiency>
-						<ShotSpread>0.55</ShotSpread>
-						<SwayFactor>1.46</SwayFactor>
-						<Bulk>5</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.8</warmupTime>
-						<range>39.9</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<soundCast>Shot_SniperRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>1.75</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_SMG</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CW_BallisticEnforcer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Havoc Launcher -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CW_HavocLauncher</defName>
-					<statBases>
-						<SightsEfficiency>0.85</SightsEfficiency>
-						<ShotSpread>0.55</ShotSpread>
-						<SwayFactor>1.25</SwayFactor>
-						<Bulk>8</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_RPG7Grenade_HEAT</defaultProjectile>
-						<warmupTime>1.8</warmupTime>
-						<range>39.9</range>
-						<soundCast>Shot_SniperRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_RPG7Grenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CW_HavocLauncher"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>2.3</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.3</cooldownTime>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2.3</cooldownTime>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Recon Bolter -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CW_ReconBolter</defName>
-					<statBases>
-						<SightsEfficiency>1.75</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1.5</SwayFactor>
-						<Bulk>3</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_30x64mmFuel_Thermobaric</defaultProjectile>
-						<warmupTime>1.8</warmupTime>
-						<range>39.9</range>
-						<soundCast>Shot_SniperRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>4</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_30x64mmFuel</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CW_ReconBolter"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>2.4</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2.4</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2.4</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Cybernetic Warfare and Special Weapons/CyberneticWarfare_Ranged_Spacer.xml b/Patches/Cybernetic Warfare and Special Weapons/CyberneticWarfare_Ranged_Spacer.xml
deleted file mode 100644
index 96d7ad752d..0000000000
--- a/Patches/Cybernetic Warfare and Special Weapons/CyberneticWarfare_Ranged_Spacer.xml	
+++ /dev/null
@@ -1,549 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Cybernetic Warfare and Special Weapons (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Gun Blade -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CW_GunBlade</defName>
-					<statBases>
-						<Bulk>3</Bulk>
-						<SightsEfficiency>0.9</SightsEfficiency>
-						<ShotSpread>0.25</ShotSpread>
-						<SwayFactor>0.45</SwayFactor>
-						<RangedWeapon_Cooldown>0.1</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_PlasmaCellPistol</defaultProjectile>
-						<warmupTime>2</warmupTime>
-						<range>14.9</range>
-						<burstShotCount>7</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>Shot_Revolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>21</magazineSize>
-						<reloadTime>2.45</reloadTime>
-						<ammoSet>AmmoSet_PlasmaCellPistol</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags Inherit="False">
-						<li>CE_Sidearm</li>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CW_GunBlade"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<cooldownTime>1.6</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.555</armorPenetrationSharp>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>25</power>
-								<armorPenetrationBlunt>3.275</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.255</armorPenetrationSharp>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Disruptor -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CW_Disruptor</defName>
-					<statBases>
-						<Bulk>6</Bulk>
-						<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>0.25</SwayFactor>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_PlasmaCellHeavy</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>39.9</range>
-						<minRange>1.5</minRange>
-						<soundCast>CW_ElectricPulse</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_PlasmaCellHeavy</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags Inherit="False">
-						<li>AdvancedGun</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CW_Disruptor"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<cooldownTime>1.6</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<cooldownTime>1.6</cooldownTime>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>21</power>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<cooldownTime>1.6</cooldownTime>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Napalm Blaster -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CW_NapalmBlaster</defName>
-					<statBases>
-						<Bulk>12</Bulk>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>1.5</ShotSpread>
-						<SwayFactor>0.1</SwayFactor>
-						<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Flamethrower_Napalm</defaultProjectile>
-						<warmupTime>2.5</warmupTime>
-						<range>14.9</range>
-						<minRange>1.5</minRange>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<soundCast>CW_NapalmFlame</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_Flamethrower</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>true</aiUseBurstMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags Inherit="False">
-						<li>SpacerGun</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CW_NapalmBlaster"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<cooldownTime>1.7</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<cooldownTime>1.7</cooldownTime>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<cooldownTime>1.7</cooldownTime>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Dual Eraser -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CW_DualEraser</defName>
-					<statBases>
-						<Bulk>4.5</Bulk>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.75</ShotSpread>
-						<SwayFactor>0.95</SwayFactor>
-						<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_44Magnum_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>19.9</range>
-						<burstShotCount>24</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>24</magazineSize>
-						<reloadTime>0.5</reloadTime>
-						<ammoSet>AmmoSet_44Magnum</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>12</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags Inherit="False">
-						<li>CE_Sidearm</li>
-						<li>CE_SMG</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CW_DualEraser"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<cooldownTime>1.5</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Accelerator -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CW_Accelerator</defName>
-					<statBases>
-						<Bulk>5</Bulk>
-						<SightsEfficiency>1.5</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>0.50</SwayFactor>
-						<RangedWeapon_Cooldown>2.5</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x24mmCharged_Ion</defaultProjectile>
-						<warmupTime>3.5</warmupTime>
-						<range>49.9</range>
-						<minRange>1.5</minRange>
-						<burstShotCount>12</burstShotCount>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<soundCast>CW_GaussProjectile</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>24</magazineSize>
-						<reloadTime>0.5</reloadTime>
-						<ammoSet>AmmoSet_44Magnum</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>8</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags Inherit="False">
-						<li>CE_Sidearm</li>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CW_Accelerator"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<cooldownTime>1.9</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<cooldownTime>1.9</cooldownTime>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<cooldownTime>1.9</cooldownTime>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Plasma Gun -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CW_PlasmaGun</defName>
-					<statBases>
-						<Bulk>5</Bulk>
-						<SightsEfficiency>1.25</SightsEfficiency>
-						<ShotSpread>0.33</ShotSpread>
-						<SwayFactor>0.66</SwayFactor>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_PlasmaCellRifle</defaultProjectile>
-						<warmupTime>3</warmupTime>
-						<range>35.9</range>
-						<burstShotCount>12</burstShotCount>
-						<soundCast>CW_FuturisticWeapon</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>1.5</reloadTime>
-						<ammoSet>AmmoSet_PlasmaCellRifle</ammoSet>
-					</AmmoUser>
-					<weaponTags Inherit="False">
-						<li>CE_Sidearm</li>
-						<li>AdvancedGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CW_PlasmaGun"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<cooldownTime>1.6</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>17</power>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<cooldownTime>1.6</cooldownTime>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Coil Gun -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CW_CoilGun</defName>
-					<statBases>
-						<Bulk>5</Bulk>
-						<Bulk>6</Bulk>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>0.01</SwayFactor>
-						<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>59.9</range>
-						<minRange>1.5</minRange>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<soundCast>CW_RailGun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>0.5</reloadTime>
-						<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>1</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags Inherit="False">
-						<li>CE_Sidearm</li>
-						<li>AdvancedGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CW_CoilGun"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/DD Elves/AnimalDefs.xml b/Patches/DD Elves/AnimalDefs.xml
deleted file mode 100644
index 21ad66344f..0000000000
--- a/Patches/DD Elves/AnimalDefs.xml	
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ↁ Elves</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ===== Body Type ===== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="DevDesigner_AncientDeer"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="DevDesigner_ColdOne"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Ancient Deer === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_AncientDeer"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.07</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_AncientDeer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.27</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="DevDesigner_AncientDeer"]/combatPower</xpath>
-					<value>
-						<combatPower>60</combatPower>
-					</value>
-				</li>
-
-				<!-- === Cold One === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_ColdOne"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.31</MeleeDodgeChance>
-						<MeleeCritChance>0.07</MeleeCritChance>
-						<MeleeParryChance>0.03</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_ColdOne"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>venom-fangs</label>
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>0.7</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.925</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.925</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="DevDesigner_ColdOne"]/combatPower</xpath>
-					<value>
-						<combatPower>145</combatPower>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/DD Elves/PawnKindDefs.xml b/Patches/DD Elves/PawnKindDefs.xml
deleted file mode 100644
index 8651886f0f..0000000000
--- a/Patches/DD Elves/PawnKindDefs.xml	
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ↁ Elves</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Spearman === -->
-				<!-- Give Shields -->
-
-				<!-- Dark elves -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="DevDesigner_DarkElves_DreadspearBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>100</min>
-								<max>2000</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>DevDesigner_DarkElves_Shield</li>
-							</shieldTags>
-							<shieldChance>0.65</shieldChance>
-						</li>
-					</value>
-				</li>
-
-				<!-- High elves -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="DevDesigner_HighElves_SpearmanBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>100</min>
-								<max>2000</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>DevDesigner_HighElves_Shield</li>
-							</shieldTags>
-							<shieldChance>0.65</shieldChance>
-						</li>
-					</value>
-				</li>
-
-				<!-- Wood elves -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="DevDesigner_WoodElves_StagKnigthBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>100</min>
-								<max>2000</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>DevDesigner_WoodElves_Shield</li>
-							</shieldTags>
-							<shieldChance>0.65</shieldChance>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Ranged === -->
-
-				<!-- Dark elves -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="DevDesigner_DarkElves_DarkshardBase" or @Name="DevDesigner_DarkElves_DarkRiderBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>12</min>
-								<max>15</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>150</min>
-									<max>250</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>NeolithicMeleeBasic</li>
-									<li>MedievalMeleeDecent</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<!-- High elves -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="DevDesigner_HighElves_ArcherBase" or @Name="DevDesigner_HighElves_ShadowWarriorBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>15</min>
-								<max>30</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>150</min>
-									<max>250</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>NeolithicMeleeBasic</li>
-									<li>MedievalMeleeDecent</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<!-- Wood elves -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="DevDesigner_WoodElves_ArcherBase" or @Name="DevDesigner_WoodElves_GuardBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>15</min>
-								<max>30</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>150</min>
-									<max>250</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>NeolithicMeleeBasic</li>
-									<li>MedievalMeleeDecent</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[@Name="DevDesigner_DarkElves_DarkshardBase" or @Name="DevDesigner_DarkElves_DarkRiderBase" or @Name="DevDesigner_HighElves_ArcherBase" or @Name="DevDesigner_HighElves_ShadowWarriorBase" or @Name="DevDesigner_WoodElves_ArcherBase" or @Name="DevDesigner_WoodElves_GuardBase"]</xpath>
-					<value>
-						<apparelRequired>
-							<li>CE_Apparel_TribalBackpack</li>
-						</apparelRequired>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/DD Elves/ThingDefs_Apparel.xml b/Patches/DD Elves/ThingDefs_Apparel.xml
deleted file mode 100644
index 67a57ea46e..0000000000
--- a/Patches/DD Elves/ThingDefs_Apparel.xml	
+++ /dev/null
@@ -1,276 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ↁ Elves</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ===== Common ===== -->
-				<!-- === Breast Plate === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="DevDesigner_Elves_BreastplateBase"]/statBases</xpath>
-					<value>
-						<Bulk>25</Bulk>
-						<WornBulk>7</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="DevDesigner_Elves_BreastplateBase"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.8</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="DevDesigner_Elves_BreastplateBase"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<!-- === Chainmail === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Elves_Chainmail"]/statBases/Mass</xpath>
-					<value>
-						<Mass>3</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Elves_Chainmail"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Elves_Chainmail"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.45</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- === Gambeson === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Elves_Gambeson"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>6</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Elves_Gambeson"]/statBases/Mass</xpath>
-					<value>
-						<Mass>3</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Elves_Gambeson"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ===== Dark Elves ===== -->
-				<!-- === Leather Armor === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_LeatherArmor"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_LeatherArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>7</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- === Cloak ===-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_ColdOneKnightCloak" or defName="DevDesigner_DarkElves_BlackGuardCloak" or defName="DevDesigner_DarkElves_Cape"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_ColdOneKnightCloak" or defName="DevDesigner_DarkElves_BlackGuardCloak" or defName="DevDesigner_DarkElves_Cape"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- === Breast Plate === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_ColdOneKnightArmor" or defName="DevDesigner_DarkElves_BlackGuardArmor"]/statBases</xpath>
-					<value>
-						<Bulk>25</Bulk>
-						<WornBulk>7</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_ColdOneKnightArmor" or defName="DevDesigner_DarkElves_BlackGuardArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3.4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_ColdOneKnightArmor" or defName="DevDesigner_DarkElves_BlackGuardArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<!-- === Clothing ===-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_MorathiRobe" or defName="DevDesigner_DarkElves_SorceressRobe" or defName="DevDesigner_DarkElves_WitchBikini"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_MorathiRobe" or defName="DevDesigner_DarkElves_SorceressRobe" or defName="DevDesigner_DarkElves_WitchBikini"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ===== High Elves ===== -->
-				<!-- === Cloak ===-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_Cloak" or defName="DevDesigner_HighElves_WhiteLionPelt" or defName="DevDesigner_HighElves_LordCloak"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_Cloak" or defName="DevDesigner_HighElves_WhiteLionPelt" or defName="DevDesigner_HighElves_LordCloak"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- === Breast Plate === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_WhiteLionArmor" or defName="DevDesigner_HighElves_DragonPrinceArmor" or defName="DevDesigner_HighElves_LordArmor"]/statBases</xpath>
-					<value>
-						<Bulk>25</Bulk>
-						<WornBulk>7</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_WhiteLionArmor" or defName="DevDesigner_HighElves_DragonPrinceArmor" or defName="DevDesigner_HighElves_LordArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3.4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_WhiteLionArmor" or defName="DevDesigner_HighElves_DragonPrinceArmor" or defName="DevDesigner_HighElves_LordArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<!-- === Clothing ===-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_AlarielleRobe"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_AlarielleRobe"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ===== Wood Elves ===== -->
-				<!-- === Leather Armor === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_LeatherArmor"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_LeatherArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>7</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- === Cloak ===-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_Cloak" or defName="DevDesigner_WoodElves_ShamanCloak" or defName="DevDesigner_HighElves_LordCloak"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_Cloak" or defName="DevDesigner_WoodElves_ShamanCloak" or defName="DevDesigner_HighElves_LordCloak"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- === Chainmail === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_Scalemail"]/statBases/Mass</xpath>
-					<value>
-						<Mass>3</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_Scalemail"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Elves_Chainmail"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.45</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- === Clothing ===-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_Tunic" or defName="DevDesigner_WoodElves_ShamanRobe" or defName="DevDesigner_WoodElves_Bikini" or defName="DevDesigner_WoodElves_Lioncloth" or defName="DevDesigner_WoodElves_Corset"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_Tunic" or defName="DevDesigner_WoodElves_ShamanRobe" or defName="DevDesigner_WoodElves_Bikini" or defName="DevDesigner_WoodElves_Lioncloth" or defName="DevDesigner_WoodElves_Corset"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/DD Elves/ThingDefs_Headgear.xml b/Patches/DD Elves/ThingDefs_Headgear.xml
deleted file mode 100644
index 22f89a6fce..0000000000
--- a/Patches/DD Elves/ThingDefs_Headgear.xml	
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ↁ Elves</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ===== Dark Elves ===== -->
-				<!-- === Deadspear Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_DreadspearHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_DreadspearHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.0</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- === Hood === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_MaskedHoodA" or defName="DevDesigner_DarkElves_MaskedHoodB"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_MaskedHoodA" or defName="DevDesigner_DarkElves_MaskedHoodB"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- === Knight Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_ColdOneKnightHelmet" or defName="DevDesigner_DarkElves_BlackGuardHelmet" or defName="DevDesigner_DarkElves_MorathiHelmet" or defName="DevDesigner_DarkElves_WitchHelmet" or defName="DevDesigner_DarkElves_SorceressHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_ColdOneKnightHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<AimingAccuracy>-0.3</AimingAccuracy>
-						<MeleeHitChance>-1.5</MeleeHitChance>
-						<Suppressability>-0.15</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_ColdOneKnightHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.7</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ===== High Elves ===== -->
-				<!-- === Spearman Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_SpearmanHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_SpearmanHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.0</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- === Knight Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_ShadowWarriorHelmet" or defName="DevDesigner_HighElves_WhiteLionHelmet" or defName="DevDesigner_HighElves_DragonPrinceHelmet" or defName="DevDesigner_HighElves_AlarielleHelmet" or defName="DevDesigner_HighElves_LordHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_ShadowWarriorHelmet" or defName="DevDesigner_HighElves_WhiteLionHelmet" or defName="DevDesigner_HighElves_DragonPrinceHelmet" or defName="DevDesigner_HighElves_AlarielleHelmet" or defName="DevDesigner_HighElves_LordHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<AimingAccuracy>-0.3</AimingAccuracy>
-						<MeleeHitChance>-1.5</MeleeHitChance>
-						<Suppressability>-0.15</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_ShadowWarriorHelmet" or defName="DevDesigner_HighElves_WhiteLionHelmet" or defName="DevDesigner_HighElves_DragonPrinceHelmet" or defName="DevDesigner_HighElves_AlarielleHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.7</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_LordHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3.0</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ===== Wood Elves ===== -->
-				<!-- === Stag Knight Helmet and Shaman Crown === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_StagKnightHelmet" or @Name="DevDesigner_WoodElves_ShamanCrownBase"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_StagKnightHelmet" or @Name="DevDesigner_WoodElves_ShamanCrownBase"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.25</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- === Hood === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_Hood" or defName="DevDesigner_WoodElves_MaskedHood"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_ArmoredHood"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_Hood" or defName="DevDesigner_WoodElves_MaskedHood"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_ArmoredHood"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.25</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- === Bladedancer Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_BladeDancerHelmetA"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_BladeDancerHelmetA"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.55</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/DD Elves/ThingDefs_MeleeWeapon.xml b/Patches/DD Elves/ThingDefs_MeleeWeapon.xml
deleted file mode 100644
index e334ddecf1..0000000000
--- a/Patches/DD Elves/ThingDefs_MeleeWeapon.xml	
+++ /dev/null
@@ -1,617 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ↁ Elves</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Spear === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Spear" or defName="DevDesigner_HighElves_Spear" or defName="DevDesigner_WoodElves_Spear"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>4</Bulk>
-							<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Spear" or defName="DevDesigner_HighElves_Spear" or defName="DevDesigner_WoodElves_Spear"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.17</MeleeCritChance>
-							<MeleeParryChance>0.5</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Spear" or defName="DevDesigner_HighElves_Spear" or defName="DevDesigner_WoodElves_Spear"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Spear" or defName="DevDesigner_HighElves_Spear" or defName="DevDesigner_WoodElves_Spear"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.50</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.6</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.6</cooldownTime>
-								<chanceFactor>0.90</chanceFactor>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.75</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Greatsword === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Greatsword" or defName="DevDesigner_HighElves_Greatsword" or defName="DevDesigner_WoodElves_Greatsword"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>12</Bulk>
-							<MeleeCounterParryBonus>0.70</MeleeCounterParryBonus>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Greatsword" or defName="DevDesigner_HighElves_Greatsword" or defName="DevDesigner_WoodElves_Greatsword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.30</MeleeCritChance>
-							<MeleeParryChance>1.20</MeleeParryChance>
-							<MeleeDodgeChance>0.50</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Greatsword" or defName="DevDesigner_HighElves_Greatsword" or defName="DevDesigner_WoodElves_Greatsword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.69</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.98</cooldownTime>
-								<chanceFactor>0.50</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.90</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>48</power>
-								<cooldownTime>2.86</cooldownTime>
-								<chanceFactor>0.45</chanceFactor>
-								<armorPenetrationBlunt>3.592</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.58</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Halberd === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Halberd"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>10</Bulk>
-							<MeleeCounterParryBonus>1.08</MeleeCounterParryBonus>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Halberd"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.22</MeleeCritChance>
-							<MeleeParryChance>1.53</MeleeParryChance>
-							<MeleeDodgeChance>0.67</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Halberd"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.31</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>2.9</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>
-				</li>
-
-				<!-- === Longsword === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_Longsword"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_Longsword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.63</MeleeCritChance>
-							<MeleeParryChance>0.75</MeleeParryChance>
-							<MeleeDodgeChance>0.40</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_Longsword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.69</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.60</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>1.56</cooldownTime>
-								<chanceFactor>0.35</chanceFactor>
-								<armorPenetrationBlunt>2.592</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.58</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Sword === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Sword" or defName="DevDesigner_HighElves_Sword" or defName="DevDesigner_WoodElves_Sword"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Sword" or defName="DevDesigner_HighElves_Sword" or defName="DevDesigner_WoodElves_Sword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.40</MeleeCritChance>
-							<MeleeParryChance>0.60</MeleeParryChance>
-							<MeleeDodgeChance>0.30</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Sword" or defName="DevDesigner_HighElves_Sword" or defName="DevDesigner_WoodElves_Sword"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Sword" or defName="DevDesigner_HighElves_Sword" or defName="DevDesigner_WoodElves_Sword"]/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.05</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.46</cooldownTime>
-								<chanceFactor>0.50</chanceFactor>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.40</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.45</chanceFactor>
-								<armorPenetrationBlunt>1.1</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.58</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Dagger === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Dagger"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>0.3</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Dagger"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.40</MeleeCritChance>
-							<MeleeParryChance>0.60</MeleeParryChance>
-							<MeleeDodgeChance>0.30</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Dagger"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Dagger"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.46</cooldownTime>
-								<chanceFactor>0.50</chanceFactor>
-								<armorPenetrationBlunt>0.685</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.75</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.45</chanceFactor>
-								<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.725</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Axe === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_Axe"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<MeleeCounterParryBonus>0.22</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_Axe"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.31</MeleeCritChance>
-							<MeleeParryChance>0.22</MeleeParryChance>
-							<MeleeDodgeChance>0.22</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_Axe"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_Axe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>0.95</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>15</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.25</chanceFactor>
-								<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.32</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.58</cooldownTime>
-								<chanceFactor>0.70</chanceFactor>
-								<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Greataxe === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_Greataxe" or defName="DevDesigner_WoodElves_Greataxe"]/statBases</xpath>
-					<value>
-						<Bulk>7</Bulk>
-						<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_Greataxe" or defName="DevDesigner_WoodElves_Greataxe"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.30</MeleeCritChance>
-							<MeleeParryChance>0.40</MeleeParryChance>
-							<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_Greataxe" or defName="DevDesigner_WoodElves_Greataxe"]/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>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2.18</cooldownTime>
-								<chanceFactor>0.25</chanceFactor>
-								<armorPenetrationBlunt>9.6</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>37</power>
-								<cooldownTime>2.18</cooldownTime>
-								<chanceFactor>0.70</chanceFactor>
-								<armorPenetrationBlunt>9.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.95</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Staff === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_AlarielleStaff" or defName="DevDesigner_WoodElves_ShamanStaff"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<MeleeCounterParryBonus>1.56</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_AlarielleStaff" or defName="DevDesigner_WoodElves_ShamanStaff"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.6</MeleeCritChance>
-							<MeleeParryChance>1.17</MeleeParryChance>
-							<MeleeDodgeChance>0.47</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_AlarielleStaff" or defName="DevDesigner_WoodElves_ShamanStaff"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_AlarielleStaff" or defName="DevDesigner_WoodElves_ShamanStaff"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.3</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.3</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.84</cooldownTime>
-								<armorPenetrationBlunt>4.28</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/DD Elves/ThingDefs_Misc.xml b/Patches/DD Elves/ThingDefs_Misc.xml
deleted file mode 100644
index 5d2caa9484..0000000000
--- a/Patches/DD Elves/ThingDefs_Misc.xml	
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ↁ Elves</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Pauldrons === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_BlackGuardPauldrons" or defName="DevDesigner_DarkElves_MorathiPauldrons" or defName="DevDesigner_HighElves_ShadowWarriorPauldrons" or defName="DevDesigner_HighElves_DragonPrincePauldrons" or defName="DevDesigner_HighElves_LordPauldrons" or defName="DevDesigner_WoodElves_StagKnightPauldrons"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_HighElves_ShadowWarriorPauldrons"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.25</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_BlackGuardPauldrons" or defName="DevDesigner_DarkElves_MorathiPauldrons" or defName="DevDesigner_HighElves_DragonPrincePauldrons" or defName="DevDesigner_HighElves_LordPauldrons"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.7</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_StagKnightPauldrons"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3.35</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- === Gloves and Boots === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_Boots" or defName="DevDesigner_WoodElves_Gloves"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_Boots" or defName="DevDesigner_WoodElves_Gloves"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- === Quiver === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="DevDesigner_Utility_QuiverBase"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="DevDesigner_Utility_QuiverBase"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>15</CarryBulk>
-							<ReloadSpeed>0.4</ReloadSpeed>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/DD Elves/ThingDefs_RangedWeapon.xml b/Patches/DD Elves/ThingDefs_RangedWeapon.xml
deleted file mode 100644
index 127994c296..0000000000
--- a/Patches/DD Elves/ThingDefs_RangedWeapon.xml	
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ↁ Elves</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Crossbow"]/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>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_Bow" or defName="DevDesigner_WoodElves_Greatbow" or defName="DevDesigner_WoodElves_RecurveBow" or defName="DevDesigner_HighElves_Longbow"]/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>
-
-				<!-- === Dark Elves Repeating Crossbow === -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="DevDesigner_DarkElves_Crossbow"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DevDesigner_DarkElves_Crossbow</defName>
-					<statBases>
-						<Bulk>10</Bulk>
-						<SwayFactor>1.2</SwayFactor>
-						<ShotSpread>0.25</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Projectile_CrossbowBolt_Steel</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>23</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
-						<soundCast>Bow_Large</soundCast>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>3</magazineSize>
-						<reloadTime>7</reloadTime>
-						<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- === Wood Elves Bow === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DevDesigner_WoodElves_Bow</defName>
-					<statBases>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.85</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>5.00</Bulk>
-						<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>50</WoodLog>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_StreamlinedArrow_Stone</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>26</range>
-						<soundCast>Bow_Recurve</soundCast>
-					</Properties>
-					<AmmoUser>
-						<ammoSet>AmmoSet_StreamlinedArrow</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- === Wood Elves Greatbow === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DevDesigner_WoodElves_Greatbow</defName>
-					<statBases>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.85</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>5.00</Bulk>
-						<RangedWeapon_Cooldown>0.75</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>70</WoodLog>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_GreatArrow_Stone</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>33</range>
-						<soundCast>Bow_Large</soundCast>
-					</Properties>
-					<AmmoUser>
-						<ammoSet>AmmoSet_GreatArrow</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- === Wood Elves Recurve Bow === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DevDesigner_WoodElves_RecurveBow</defName>
-					<statBases>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.85</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>6.00</Bulk>
-						<RangedWeapon_Cooldown>0.8</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>50</WoodLog>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_StreamlinedArrow_Stone</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>35</range>
-						<soundCast>Bow_Recurve</soundCast>
-					</Properties>
-					<AmmoUser>
-						<ammoSet>AmmoSet_StreamlinedArrow</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- === High Elves Longbow === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DevDesigner_HighElves_Longbow</defName>
-					<statBases>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.9</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>7.50</Bulk>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>85</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 />
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/DD Elves/ThingDefs_Shields.xml b/Patches/DD Elves/ThingDefs_Shields.xml
deleted file mode 100644
index ffe66f2ce3..0000000000
--- a/Patches/DD Elves/ThingDefs_Shields.xml	
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ↁ Elves</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Replace ThingClass === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="DevDesigner_BaseShield"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Apparel_Shield</thingClass>
-					</value>
-				</li>
-
-				<!-- === Replace Parent === -->
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[@Name="DevDesigner_BaseShield"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>ArmorSmithableBase</value>
-				</li>
-
-				<!-- === Replace Apparel Layer & BodyPart Group === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="DevDesigner_BaseShield"]/apparel/layers</xpath>
-					<value>
-						<layers>
-							<li>Shield</li>
-						</layers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="DevDesigner_BaseShield"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>LeftShoulder</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-				<!-- === Remove VFE Shield Stuff === -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="DevDesigner_BaseShield"]/tools</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_Shield" or defName="DevDesigner_HighElves_Shield" or defName="DevDesigner_HighElves_DragonPrinceShield" or defName="DevDesigner_DarkElves_Shield"]/comps/li[@Class="VFECore.CompProperties_Shield"]</xpath>
-				</li>
-
-				<!-- === Add CE Shield Stuff === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="DevDesigner_BaseShield"]</xpath>
-					<value>
-						<li Class="CombatExtended.ShieldDefExtension">
-							<shieldCoverage>
-								<li>Hands</li>
-								<li>Arms</li>
-								<li>Shoulders</li>
-								<li>Torso</li>
-								<li>Neck</li>
-							</shieldCoverage>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Add Bulk === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_Shield" or defName="DevDesigner_HighElves_Shield" or defName="DevDesigner_HighElves_DragonPrinceShield" or defName="DevDesigner_DarkElves_Shield"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<!-- === Replace Stat Offsets === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="DevDesigner_BaseShield"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<ReloadSpeed>-0.2</ReloadSpeed>
-							<MeleeHitChance>-1</MeleeHitChance>
-							<ShootingAccuracyPawn>-0.15</ShootingAccuracyPawn>
-							<AimingAccuracy>-0.08</AimingAccuracy>
-							<Suppressability>-0.25</Suppressability>
-							<MeleeCritChance>-0.05</MeleeCritChance>
-							<MeleeParryChance>1.0</MeleeParryChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- === Replace Stuff Thickness === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_WoodElves_Shield" or defName="DevDesigner_HighElves_Shield" or defName="DevDesigner_HighElves_DragonPrinceShield" or defName="DevDesigner_DarkElves_Shield"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/DD House Sanguin/Mods/Medieval Overhaul/Bloodwine_MO.xml b/Patches/DD House Sanguin/Mods/Medieval Overhaul/Bloodwine_MO.xml
deleted file mode 100644
index c5d00e05b6..0000000000
--- a/Patches/DD House Sanguin/Mods/Medieval Overhaul/Bloodwine_MO.xml	
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ↁ House Sanguin</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Medieval Overhaul</li>
-			</mods>
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<!-- === Blood Wine === -->
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="DevDesigner_BloodWine"]/statBases</xpath>
-						<value>
-							<Bulk>1.5</Bulk>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/DD House Sanguin/Mods/RimFantasy - Medeival Overhaul/Blood Weapons.xml b/Patches/DD House Sanguin/Mods/RimFantasy - Medeival Overhaul/Blood Weapons.xml
deleted file mode 100644
index 96349fb2ee..0000000000
--- a/Patches/DD House Sanguin/Mods/RimFantasy - Medeival Overhaul/Blood Weapons.xml	
+++ /dev/null
@@ -1,270 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ↁ House Sanguin</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>RimFantasy - Medieval Overhaul Edition</li>
-			</mods>
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<!-- === Blood Longsword === -->
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_BloodLongsword"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>handle</label>
-									<capacities>
-										<li>Poke</li>
-									</capacities>
-									<power>4</power>
-									<cooldownTime>1.78</cooldownTime>
-									<chanceFactor>0.10</chanceFactor>
-									<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>point</label>
-									<capacities>
-										<li>Stab</li>
-									</capacities>
-									<power>20</power>
-									<cooldownTime>1.80</cooldownTime>
-									<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-									<armorPenetrationSharp>2.25</armorPenetrationSharp>
-									<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>edge</label>
-									<capacities>
-										<li>Cut</li>
-									</capacities>
-									<power>44</power>
-									<cooldownTime>1.68</cooldownTime>
-									<armorPenetrationBlunt>3.44</armorPenetrationBlunt>
-									<armorPenetrationSharp>0.86</armorPenetrationSharp>
-									<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_BloodLongsword"]/statBases</xpath>
-						<value>
-							<Bulk>8</Bulk>
-							<MeleeCounterParryBonus>0.8</MeleeCounterParryBonus>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_BloodLongsword"]</xpath>
-						<value>
-							<equippedStatOffsets>
-								<MeleeCritChance>0.5</MeleeCritChance>
-								<MeleeParryChance>0.6</MeleeParryChance>
-								<MeleeDodgeChance>0.4</MeleeDodgeChance>
-							</equippedStatOffsets>
-						</value>
-					</li>
-
-					<!-- === Blood Executioner's Greatsword === -->
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_BloodExecutionerGreatsword"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>handle</label>
-									<capacities>
-										<li>Poke</li>
-									</capacities>
-									<power>5</power>
-									<cooldownTime>1.99</cooldownTime>
-									<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
-									<chanceFactor>0.15</chanceFactor>
-									<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>point</label>
-									<capacities>
-										<li>Stab</li>
-									</capacities>
-									<power>60</power>
-									<cooldownTime>1.99</cooldownTime>
-									<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
-									<armorPenetrationSharp>0.87</armorPenetrationSharp>
-									<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>edge</label>
-									<capacities>
-										<li>Cut</li>
-									</capacities>
-									<power>49</power>
-									<cooldownTime>3.18</cooldownTime>
-									<armorPenetrationBlunt>3.888</armorPenetrationBlunt>
-									<armorPenetrationSharp>0.48</armorPenetrationSharp>
-									<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_BloodExecutionerGreatsword"]/statBases</xpath>
-						<value>
-							<Bulk>8</Bulk>
-							<MeleeCounterParryBonus>0.65</MeleeCounterParryBonus>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_BloodExecutionerGreatsword"]</xpath>
-						<value>
-							<equippedStatOffsets>
-								<MeleeCritChance>0.08</MeleeCritChance>
-								<MeleeParryChance>0.54</MeleeParryChance>
-								<MeleeDodgeChance>0.45</MeleeDodgeChance>
-							</equippedStatOffsets>
-						</value>
-					</li>
-
-					<!-- === Blood Arming Sword === -->
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_BloodSword"]/statBases</xpath>
-						<value>
-							<Bulk>6</Bulk>
-							<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_BloodSword"]</xpath>
-						<value>
-							<equippedStatOffsets>
-								<MeleeCritChance>0.46</MeleeCritChance>
-								<MeleeParryChance>0.60</MeleeParryChance>
-								<MeleeDodgeChance>0.34</MeleeDodgeChance>
-							</equippedStatOffsets>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_BloodSword"]/weaponTags</xpath>
-						<value>
-							<li>CE_OneHandedWeapon</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_BloodSword"]/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.05</chanceFactor>
-									<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>point</label>
-									<capacities>
-										<li>Stab</li>
-									</capacities>
-									<power>22</power>
-									<cooldownTime>1.46</cooldownTime>
-									<chanceFactor>0.50</chanceFactor>
-									<armorPenetrationBlunt>0.62</armorPenetrationBlunt>
-									<armorPenetrationSharp>1.48</armorPenetrationSharp>
-									<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>edge</label>
-									<capacities>
-										<li>Cut</li>
-									</capacities>
-									<power>25</power>
-									<cooldownTime>1.63</cooldownTime>
-									<chanceFactor>0.45</chanceFactor>
-									<armorPenetrationBlunt>1.08</armorPenetrationBlunt>
-									<armorPenetrationSharp>0.63</armorPenetrationSharp>
-									<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<!-- === Void Longsword === -->
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_VoidLongsword"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>handle</label>
-									<capacities>
-										<li>Poke</li>
-									</capacities>
-									<power>4</power>
-									<cooldownTime>1.78</cooldownTime>
-									<chanceFactor>0.10</chanceFactor>
-									<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>point</label>
-									<capacities>
-										<li>Stab</li>
-									</capacities>
-									<power>20</power>
-									<cooldownTime>1.80</cooldownTime>
-									<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-									<armorPenetrationSharp>2.25</armorPenetrationSharp>
-									<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>edge</label>
-									<capacities>
-										<li>Cut</li>
-									</capacities>
-									<power>44</power>
-									<cooldownTime>1.68</cooldownTime>
-									<armorPenetrationBlunt>3.44</armorPenetrationBlunt>
-									<armorPenetrationSharp>0.86</armorPenetrationSharp>
-									<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_VoidLongsword"]/statBases</xpath>
-						<value>
-							<Bulk>8</Bulk>
-							<MeleeCounterParryBonus>0.8</MeleeCounterParryBonus>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_VoidLongsword"]/equippedStatOffsets</xpath>
-						<value>
-							<MeleeCritChance>0.5</MeleeCritChance>
-							<MeleeParryChance>0.6</MeleeParryChance>
-							<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/DD House Sanguin/Mods/Vanilla Faction Expanded Medieval/BloodWine_VFEM.xml b/Patches/DD House Sanguin/Mods/Vanilla Faction Expanded Medieval/BloodWine_VFEM.xml
deleted file mode 100644
index 1b4475e6bf..0000000000
--- a/Patches/DD House Sanguin/Mods/Vanilla Faction Expanded Medieval/BloodWine_VFEM.xml	
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ↁ House Sanguin</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Medieval Overhaul</li>
-			</mods>
-			<nomatch Class="PatchOperationFindMod">
-				<mods>
-					<li>Vanilla Factions Expanded - Medieval</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!-- === Blood Wine === -->
-						<li Class="PatchOperationAdd" MayRequire="oskarpotocki.vanillafactionsexpanded.medievalmodule">
-							<xpath>Defs/ThingDef[defName="DevDesigner_VFEM_BloodWine"]/statBases</xpath>
-							<value>
-								<Bulk>1.5</Bulk>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace" MayRequire="oskarpotocki.vanillafactionsexpanded.medievalmodule">
-							<xpath>Defs/ThingDef[defName="DevDesigner_VFEM_BloodWine"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>2.22</cooldownTime>
-										<chanceFactor>1.33</chanceFactor>
-										<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>neck</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>3.33</cooldownTime>
-										<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Neck</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-					</operations>
-				</match>
-			</nomatch>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/DD House Sanguin/ThingDefs_Apparel.xml b/Patches/DD House Sanguin/ThingDefs_Apparel.xml
deleted file mode 100644
index fafea72b52..0000000000
--- a/Patches/DD House Sanguin/ThingDefs_Apparel.xml	
+++ /dev/null
@@ -1,254 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ↁ House Sanguin</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Heavy Hauberk === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_HeraldicHeavyHauberk"]/statBases</xpath>
-					<value>
-						<Bulk>30</Bulk>
-						<WornBulk>8</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_HeraldicHeavyHauberk"]/statBases/Mass</xpath>
-					<value>
-						<Mass>9</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_HeraldicHeavyHauberk"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_HeraldicHeavyHauberk"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>Torso</li>
-							<li>Shoulders</li>
-							<li>Arms</li>
-							<li>Legs</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_HeraldicHeavyHauberk"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_HeraldicHeavyHauberk"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeDodgeChance>-0.10</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<!-- === Full Plate === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_FullPlate"]/statBases</xpath>
-					<value>
-						<Bulk>110</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_FullPlate"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3.8</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_FullPlate"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_FullPlate"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeDodgeChance>-0.15</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_FullPlate"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_FullPlate"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Lord Full Plate === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_LordFullPlate"]/statBases</xpath>
-					<value>
-						<Bulk>110</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_LordFullPlate"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6.8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_LordFullPlate"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>10.2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_LordFullPlate"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_LordFullPlate"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeDodgeChance>-0.15</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_LordFullPlate"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_LordFullPlate"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/DD House Sanguin/ThingDefs_Headgear.xml b/Patches/DD House Sanguin/ThingDefs_Headgear.xml
deleted file mode 100644
index 01bd99747a..0000000000
--- a/Patches/DD House Sanguin/ThingDefs_Headgear.xml	
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ↁ House Sanguin</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Hood === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_Hood"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_Hood"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- === Great & Armet Helmets === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="DevDesigner_Blood_Apparel_HeraldicGreatHelm" or
-						defName="DevDesigner_Blood_Apparel_ArmetNormal" or
-						defName="DevDesigner_Blood_Apparel_Armet" or
-						defName="DevDesigner_Blood_Apparel_ArmetWinged"
-						]/statBases </xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="DevDesigner_Blood_Apparel_HeraldicGreatHelm" or
-						defName="DevDesigner_Blood_Apparel_ArmetNormal" or
-						defName="DevDesigner_Blood_Apparel_Armet" or
-						defName="DevDesigner_Blood_Apparel_ArmetWinged"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_HeraldicGreatHelm"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>-0.4</AimingAccuracy>
-							<MeleeHitChance>-2</MeleeHitChance>
-							<PainShockThreshold>0.15</PainShockThreshold>
-							<MentalBreakThreshold>-0.15</MentalBreakThreshold>
-							<NegotiationAbility>0.05</NegotiationAbility>
-							<SocialImpact>0.30</SocialImpact>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="DevDesigner_Blood_Apparel_ArmetNormal" or
-						defName="DevDesigner_Blood_Apparel_Armet" or
-						defName="DevDesigner_Blood_Apparel_ArmetWinged"
-						]/equippedStatOffsets </xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>-0.4</AimingAccuracy>
-							<MeleeHitChance>-2</MeleeHitChance>
-							<PainShockThreshold>0.15</PainShockThreshold>
-							<MentalBreakThreshold>-0.15</MentalBreakThreshold>
-							<NegotiationAbility>0.05</NegotiationAbility>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[
-						defName="DevDesigner_Blood_Apparel_HeraldicGreatHelm" or
-						defName="DevDesigner_Blood_Apparel_ArmetNormal" or
-						defName="DevDesigner_Blood_Apparel_Armet" or
-						defName="DevDesigner_Blood_Apparel_ArmetWinged"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Jaw</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Jaw</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Lord Armet Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_ArmetLord"]/statBases</xpath>
-					<value>
-						<Bulk>7</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_ArmetLord"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>-0.4</AimingAccuracy>
-							<MeleeHitChance>-2</MeleeHitChance>
-							<PainShockThreshold>0.20</PainShockThreshold>
-							<MentalBreakThreshold>-0.18</MentalBreakThreshold>
-							<NegotiationAbility>0.10</NegotiationAbility>
-							<SocialImpact>0.35</SocialImpact>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_ArmetLord"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Jaw</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Jaw</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/DD House Sanguin/ThingDefs_HorseApparel.xml b/Patches/DD House Sanguin/ThingDefs_HorseApparel.xml
deleted file mode 100644
index 2fa71a3594..0000000000
--- a/Patches/DD House Sanguin/ThingDefs_HorseApparel.xml	
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ↁ House Sanguin</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Animal Gear</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<!-- === Caparison === -->
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[@Name="DevDesigner_Apparel_Horse_CaparisonBase" or @Name="DevDesigner_Apparel_Horse_DarkCaparisonBase"]/statBases</xpath>
-						<value>
-							<Bulk>5</Bulk>
-							<WornBulk>1</WornBulk>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[@Name="DevDesigner_Apparel_Horse_CaparisonBase" or @Name="DevDesigner_Apparel_Horse_DarkCaparisonBase"]/statBases/StuffEffectMultiplierArmor</xpath>
-						<value>
-							<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-						</value>
-					</li>
-
-					<!-- === Horse Plate Armor === -->
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[@Name="DevDesigner_Apparel_Horse_PlateBase"]/statBases</xpath>
-						<value>
-							<Bulk>100</Bulk>
-							<WornBulk>5</WornBulk>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[@Name="DevDesigner_Apparel_Horse_PlateBase"]/statBases/StuffEffectMultiplierArmor</xpath>
-						<value>
-							<StuffEffectMultiplierArmor>2.85</StuffEffectMultiplierArmor>
-						</value>
-					</li>
-
-					<!-- === Horse Bone Armor === -->
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[@Name="DevDesigner_Apparel_Horse_BoneBase"]/statBases</xpath>
-						<value>
-							<Bulk>100</Bulk>
-							<WornBulk>5</WornBulk>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[@Name="DevDesigner_Apparel_Horse_BoneBase"]/statBases/StuffEffectMultiplierArmor</xpath>
-						<value>
-							<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/DD House Sanguin/ThingDefs_MeleeWeapons.xml b/Patches/DD House Sanguin/ThingDefs_MeleeWeapons.xml
deleted file mode 100644
index 7e3fcdcd81..0000000000
--- a/Patches/DD House Sanguin/ThingDefs_MeleeWeapons.xml	
+++ /dev/null
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ↁ House Sanguin</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Longsword === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_Longsword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.78</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.78</cooldownTime>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.80</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>42</power>
-								<cooldownTime>1.64</cooldownTime>
-								<armorPenetrationBlunt>3.24</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.82</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_Longsword"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<MeleeCounterParryBonus>0.75</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_Longsword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.46</MeleeCritChance>
-							<MeleeParryChance>0.57</MeleeParryChance>
-							<MeleeDodgeChance>0.43</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- === Executioner's Greatsword === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_ExecutionerGreatsword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.99</cooldownTime>
-								<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>47</power>
-								<cooldownTime>3.0</cooldownTime>
-								<armorPenetrationBlunt>3.688</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.42</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_ExecutionerGreatsword"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<MeleeCounterParryBonus>0.62</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_ExecutionerGreatsword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.082</MeleeCritChance>
-							<MeleeParryChance>0.55</MeleeParryChance>
-							<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- === Arming Sword === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_Sword"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_Sword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.40</MeleeCritChance>
-							<MeleeParryChance>0.60</MeleeParryChance>
-							<MeleeDodgeChance>0.30</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_Sword"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_Sword"]/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.05</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.46</cooldownTime>
-								<chanceFactor>0.50</chanceFactor>
-								<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.40</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.45</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.58</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Polearm: Pike-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_PikeStandard"]</xpath>
-					<value>
-						<tools Inherit="False">
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.3</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>1.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.5</cooldownTime>
-								<chanceFactor>0.95</chanceFactor>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_PikeStandard"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.08</MeleeCritChance>
-							<MeleeParryChance>0.95</MeleeParryChance>
-							<MeleeDodgeChance>1.27</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_MeleeWeapon_PikeStandard"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>12</Bulk>
-							<MeleeCounterParryBonus>1.27</MeleeCounterParryBonus>
-						</statBases>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/DD House Sanguin/ThingDefs_Misc.xml b/Patches/DD House Sanguin/ThingDefs_Misc.xml
deleted file mode 100644
index a49369f527..0000000000
--- a/Patches/DD House Sanguin/ThingDefs_Misc.xml	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ↁ House Sanguin</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Cape === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_Cape"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/DD House Sanguin/ThingDefs_Shields.xml b/Patches/DD House Sanguin/ThingDefs_Shields.xml
deleted file mode 100644
index 4d75587cc0..0000000000
--- a/Patches/DD House Sanguin/ThingDefs_Shields.xml	
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ↁ House Sanguin</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_KiteShield"]</xpath>
-					<value>
-						<ThingDef ParentName="ShieldBase">
-							<defName>DevDesigner_Blood_Apparel_KiteShield</defName>
-							<label>kite shield (Sanguin)</label>
-							<description>An elongated shield that offers a wide area of protection. Somewhat bulky for close combat.  \n\nThis kite shield carries the colors of house Sanguin.</description>
-							<techLevel>Medieval</techLevel>
-							<graphicData>
-								<texPath>Apparel/Utility/BloodKiteShield</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>0.83</drawSize>
-							</graphicData>
-							<possessionCount>1</possessionCount>
-							<costStuffCount>80</costStuffCount>
-							<stuffCategories>
-								<li>Steeled</li>
-								<li>Woody</li>
-							</stuffCategories>
-							<costList Inherit="False">
-							  <HemogenPack>1</HemogenPack>
-							</costList>
-							<recipeMaker>
-								<researchPrerequisite>Smithing</researchPrerequisite>
-								<recipeUsers>
-									<li>FueledSmithy</li>
-									<li>ElectricSmithy</li>
-								</recipeUsers>
-							</recipeMaker>
-							<statBases>
-								<WorkToMake>9500</WorkToMake>
-								<MaxHitPoints>125</MaxHitPoints>
-								<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-								<Mass>7</Mass>
-								<Bulk>8</Bulk>
-								<WornBulk>5</WornBulk>
-							</statBases>
-							<equippedStatOffsets>
-								<ReloadSpeed>-0.2</ReloadSpeed>
-								<MeleeHitChance>-1</MeleeHitChance>
-								<ShootingAccuracyPawn>-0.15</ShootingAccuracyPawn>
-								<AimingAccuracy>-0.08</AimingAccuracy>
-								<Suppressability>-0.25</Suppressability>
-								<MeleeCritChance>-0.05</MeleeCritChance>
-								<MeleeParryChance>1.0</MeleeParryChance>
-							</equippedStatOffsets>
-							<apparel>
-								<developmentalStageFilter>Child, Adult</developmentalStageFilter>
-								<tags>
-									<li>TribalShield</li>
-								</tags>
-							</apparel>
-							<modExtensions>
-								<li Class="CombatExtended.ShieldDefExtension">
-									<shieldCoverage>
-										<li>Hands</li>
-										<li>Arms</li>
-										<li>Shoulders</li>
-										<li>Torso</li>
-										<li>Neck</li>
-									</shieldCoverage>
-								</li>
-							</modExtensions>
-							<tradeTags>
-								<li>Armor</li>
-							</tradeTags>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DevDesigner_Blood_Apparel_Kite2Shield"]</xpath>
-					<value>
-						<ThingDef ParentName="ShieldBase">
-							<defName>DevDesigner_Blood_Apparel_Kite2Shield</defName>
-							<label>kite shield (Sanguin)</label>
-							<description>An elongated shield that offers a wide area of protection. Somewhat bulky for close combat.  \n\nThis kite shield carries the colors of house Sanguin.</description>
-							<techLevel>Medieval</techLevel>
-							<graphicData>
-								<texPath>Apparel/Utility/Kite2/Shield</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>0.83</drawSize>
-							</graphicData>
-							<possessionCount>1</possessionCount>
-							<costStuffCount>80</costStuffCount>
-							<stuffCategories>
-								<li>Steeled</li>
-								<li>Woody</li>
-							</stuffCategories>
-							<costList Inherit="False">
-							  <HemogenPack>1</HemogenPack>
-							</costList>
-							<recipeMaker>
-								<researchPrerequisite>Smithing</researchPrerequisite>
-								<recipeUsers>
-									<li>FueledSmithy</li>
-									<li>ElectricSmithy</li>
-								</recipeUsers>
-							</recipeMaker>
-							<statBases>
-								<WorkToMake>9500</WorkToMake>
-								<MaxHitPoints>125</MaxHitPoints>
-								<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-								<Mass>7</Mass>
-								<Bulk>8</Bulk>
-								<WornBulk>5</WornBulk>
-							</statBases>
-							<equippedStatOffsets>
-								<ReloadSpeed>-0.2</ReloadSpeed>
-								<MeleeHitChance>-1</MeleeHitChance>
-								<ShootingAccuracyPawn>-0.15</ShootingAccuracyPawn>
-								<AimingAccuracy>-0.08</AimingAccuracy>
-								<Suppressability>-0.25</Suppressability>
-								<MeleeCritChance>-0.05</MeleeCritChance>
-								<MeleeParryChance>1.0</MeleeParryChance>
-							</equippedStatOffsets>
-							<apparel>
-								<developmentalStageFilter>Child, Adult</developmentalStageFilter>
-								<tags>
-									<li>TribalShield</li>
-								</tags>
-							</apparel>
-							<modExtensions>
-								<li Class="CombatExtended.ShieldDefExtension">
-									<shieldCoverage>
-										<li>Hands</li>
-										<li>Arms</li>
-										<li>Shoulders</li>
-										<li>Torso</li>
-										<li>Neck</li>
-									</shieldCoverage>
-								</li>
-							</modExtensions>
-							<tradeTags>
-								<li>Armor</li>
-							</tradeTags>
-						</ThingDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/DMWands/Patch_Weapons.xml b/Patches/DMWands/Patch_Weapons.xml
deleted file mode 100644
index 2dbce6bf0b..0000000000
--- a/Patches/DMWands/Patch_Weapons.xml
+++ /dev/null
@@ -1,304 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Magic Wands</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="DM_BasicMagicWand" or
-						defName="DM_LesserMagicWand" or
-						defName="DM_MagicWand" or
-						defName="DM_GreaterMagicWand" or
-						defName="DM_FireWand" or
-						defName="DM_PoisonWand"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>wand</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="DM_MagicBolt"]</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="BaseExplosiveBullet">
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<defName>DM_MagicBolt</defName>
-							<label>magic bolt</label>
-							<graphicData>
-								<texPath>Things/Item/Equipment/WeaponRanged/DM_MagicBolts/DM_LesserMagicBolt</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-								<color>(120,255,255)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>DM_Arcane</damageDef>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<speed>50</speed>
-								<dropsCasings>false</dropsCasings>
-								<ai_IsIncendiary>false</ai_IsIncendiary>
-								<arcHeightFactor>1</arcHeightFactor>
-								<shadowSize>1</shadowSize>
-								<explosionRadius>1</explosionRadius>
-								<damageAmountBase>8</damageAmountBase>
-								<soundExplode>Explosion_EMP</soundExplode>
-								<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="DM_FireBolt"]</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="BaseExplosiveBullet">
-							<thingClass>CombatExtended.Projectile_FireTrail</thingClass>
-							<defName>DM_FireBolt</defName>
-							<label>fire bolt</label>
-							<graphicData>
-								<texPath>Things/Item/Equipment/WeaponRanged/DM_MagicBolts/DM_FireBolt</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-								<color>(254,189,58)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>DM_Fire</damageDef>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<speed>20</speed>
-								<dropsCasings>false</dropsCasings>
-								<ai_IsIncendiary>true</ai_IsIncendiary>
-								<arcHeightFactor>1</arcHeightFactor>
-								<shadowSize>1.5</shadowSize>
-								<damageAmountBase>5</damageAmountBase>
-								<explosionRadius>2</explosionRadius>
-								<flyOverhead>false</flyOverhead>
-								<soundExplode>Explosion_Flame</soundExplode>
-								<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="DM_PoisonBolt"]</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="BaseExplosiveBullet">
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<defName>DM_PoisonBolt</defName>
-							<label>poison bolt</label>
-							<graphicData>
-								<texPath>Things/Item/Equipment/WeaponRanged/DM_MagicBolts/DM_PoisonBolt</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-								<color>(100,255,100)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>DM_Poison</damageDef>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<speed>17.5</speed>
-								<dropsCasings>false</dropsCasings>
-								<ai_IsIncendiary>false</ai_IsIncendiary>
-								<arcHeightFactor>-1</arcHeightFactor>
-								<shadowSize>0.5</shadowSize>
-								<damageAmountBase>3</damageAmountBase>
-								<explosionRadius>3</explosionRadius>
-								<soundExplode>Hive_Spawn</soundExplode>
-								<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DM_BasicMagicWand</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.3</ShotSpread>
-						<SwayFactor>1.01</SwayFactor>
-						<Bulk>1</Bulk>
-						<Mass>1</Mass>
-						<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>DM_MagicBolt</defaultProjectile>
-						<warmupTime>2</warmupTime>
-						<range>20</range>
-						<soundCast>BuildingDestroyed_Wood_Big</soundCast>
-						<muzzleFlashScale>5</muzzleFlashScale>
-						<soundCastTail>GunTail_Light</soundCastTail>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DM_LesserMagicWand</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.25</ShotSpread>
-						<SwayFactor>1.01</SwayFactor>
-						<Bulk>1</Bulk>
-						<Mass>1</Mass>
-						<RangedWeapon_Cooldown>1.8</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>DM_MagicBolt</defaultProjectile>
-						<warmupTime>1.8</warmupTime>
-						<range>22</range>
-						<soundCast>BuildingDestroyed_Wood_Big</soundCast>
-						<muzzleFlashScale>5</muzzleFlashScale>
-						<soundCastTail>GunTail_Light</soundCastTail>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DM_MagicWand</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.01</SwayFactor>
-						<Bulk>1</Bulk>
-						<Mass>1</Mass>
-						<RangedWeapon_Cooldown>1.6</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>DM_MagicBolt</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>24</range>
-						<soundCast>BuildingDestroyed_Wood_Big</soundCast>
-						<muzzleFlashScale>5</muzzleFlashScale>
-						<soundCastTail>GunTail_Light</soundCastTail>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DM_GreaterMagicWand</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.1</ShotSpread>
-						<SwayFactor>0.7</SwayFactor>
-						<Bulk>1</Bulk>
-						<Mass>1</Mass>
-						<RangedWeapon_Cooldown>1.4</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>DM_MagicBolt</defaultProjectile>
-						<warmupTime>1.4</warmupTime>
-						<range>26</range>
-						<soundCast>BuildingDestroyed_Wood_Big</soundCast>
-						<muzzleFlashScale>5</muzzleFlashScale>
-						<soundCastTail>GunTail_Light</soundCastTail>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DM_PoisonWand</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.4</ShotSpread>
-						<SwayFactor>1.4</SwayFactor>
-						<Bulk>1</Bulk>
-						<Mass>1</Mass>
-						<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>DM_PoisonBolt</defaultProjectile>
-						<warmupTime>1.4</warmupTime>
-						<range>26</range>
-						<soundCast>BuildingDestroyed_Wood_Big</soundCast>
-						<muzzleFlashScale>5</muzzleFlashScale>
-						<soundCastTail>GunTail_Light</soundCastTail>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DM_FireWand</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.01</SwayFactor>
-						<Bulk>1</Bulk>
-						<Mass>1</Mass>
-						<RangedWeapon_Cooldown>1.9</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>DM_FireBolt</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>25</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<soundCast>BuildingDestroyed_Wood_Big</soundCast>
-						<muzzleFlashScale>5</muzzleFlashScale>
-						<soundCastTail>GunTail_Light</soundCastTail>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dark Ages - Medieval Tools/MeleeMedieval.xml b/Patches/Dark Ages - Medieval Tools/MeleeMedieval.xml
deleted file mode 100644
index 7423ac4813..0000000000
--- a/Patches/Dark Ages - Medieval Tools/MeleeMedieval.xml	
+++ /dev/null
@@ -1,322 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dark Ages : Medieval Tools</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Hammer -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DA_MeleeWeapon_Hammer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5.0</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.1</chanceFactor>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9.0</power>
-								<cooldownTime>2.0</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DA_MeleeWeapon_Hammer"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DA_MeleeWeapon_Hammer"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>0.20</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DA_MeleeWeapon_Hammer"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- Pickaxe -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DA_MeleeWeapon_Pickaxe"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>0.22</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DA_MeleeWeapon_Pickaxe"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.9</MeleeCritChance>
-						<MeleeParryChance>0.22</MeleeParryChance>
-						<MeleeDodgeChance>0.23</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DA_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>head</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>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Cleaver -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DA_MeleeWeapon_Cleaver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.656</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.43</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DA_MeleeWeapon_Cleaver"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DA_MeleeWeapon_Cleaver"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.4</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-						<MeleeDodgeChance>0.05</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DA_MeleeWeapon_Cleaver"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- Hacksaw -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DA_MeleeWeapon_Hacksaw"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.6</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.65</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.55</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DA_MeleeWeapon_Hacksaw"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DA_MeleeWeapon_Hacksaw"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-						<MeleeDodgeChance>0.05</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DA_MeleeWeapon_Hacksaw"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- Scythe -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DA_MeleeWeapon_Scythe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.78</cooldownTime>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>29</power>
-								<cooldownTime>3.57</cooldownTime>
-								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>3.57</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DA_MeleeWeapon_Scythe"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<MeleeCounterParryBonus>0.33</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<!-- Broom -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DA_MeleeWeapon_Broom"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.21</cooldownTime>
-								<chanceFactor>1.43</chanceFactor>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.64</cooldownTime>
-								<armorPenetrationBlunt>1.26</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DA_MeleeWeapon_Broom"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DA_MeleeWeapon_Broom"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>1.4</MeleeParryChance>
-						<MeleeDodgeChance>0.8</MeleeDodgeChance>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Darkest Night SK Steam/Darkest_Void_CE.xml b/Patches/Darkest Night SK Steam/Darkest_Void_CE.xml
deleted file mode 100644
index 74639bcd28..0000000000
--- a/Patches/Darkest Night SK Steam/Darkest_Void_CE.xml	
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Darkest Night SK Steam</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/Verse.ThingDef[defName="Void"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Verse.ThingDef[defName="Void"]/statBases/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.33</MeleeDodgeChance>
-						<MeleeCritChance>0.36</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Verse.ThingDef[defName="Void"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.9</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Cut</li>
-									<li>Stab</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>1.18</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Verse.ThingDef[defName="Void"]/race/baseBodySize</xpath>
-					<value>
-						<baseBodySize>0.6</baseBodySize>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Void"]/combatPower</xpath>
-					<value>
-						<combatPower>100</combatPower>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Darkest Rim Core/Apparel_DarkestCE.xml b/Patches/Darkest Rim Core/Apparel_DarkestCE.xml
deleted file mode 100644
index 366e975c33..0000000000
--- a/Patches/Darkest Rim Core/Apparel_DarkestCE.xml	
+++ /dev/null
@@ -1,290 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Darkest Rim: Core</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Highwayman Mask === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_HighwaymanMask"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-						<Bulk>1</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_HighwaymanMask"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>FullHead</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_HighwaymanMask"]/apparel/layers</xpath>
-					<value>
-						<layers>
-							<li>StrappedHead</li>
-						</layers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_HighwaymanMask"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-0.3</SmokeSensitivity>
-					</value>
-				</li>
-
-				<!-- === Highwayman Apparel === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Highwayman"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>7</StuffEffectMultiplierArmor>
-						<Bulk>8</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Highwayman"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- === Crusader Helmet === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_CrusaderHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_CrusaderHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_CrusaderHelmet"]/recipeMaker/skillRequirements</xpath>
-					<value>
-						<skillRequirements>
-							<Crafting>8</Crafting>
-						</skillRequirements>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_CrusaderHelmet"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>65</Steel>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_CrusaderHelmet"]/statBases/WorkToMake</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_CrusaderHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<AimingAccuracy>-0.4</AimingAccuracy>
-						<MeleeHitChance>-2</MeleeHitChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_CrusaderHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!-- === Crusader Armour === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_PlateArmorCrusader"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_PlateArmorCrusader"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4</ArmorRating_Blunt>
-						<Bulk>100</Bulk>
-						<WornBulk>8</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_PlateArmorCrusader"]/recipeMaker/skillRequirements</xpath>
-					<value>
-						<skillRequirements>
-							<Crafting>7</Crafting>
-						</skillRequirements>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_PlateArmorCrusader"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<MeleeDodgeChance>-0.15</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_PlateArmorCrusader"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<!-- === Vestal Hood === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_VestalHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.2</ArmorRating_Sharp>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_VestalHelmet"]/recipeMaker/skillRequirements</xpath>
-					<value>
-						<skillRequirements>
-							<Crafting>3</Crafting>
-						</skillRequirements>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_VestalHelmet"]/costList</xpath>
-					<value>
-						<costList>
-							<Cloth>20</Cloth>
-							<Steel>25</Steel>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_VestalHelmet"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>UpperHead</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-				<!-- === Vestal Armor === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_PlateArmorVestal"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.85</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_PlateArmorVestal"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2.35</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_PlateArmorVestal"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeDodgeChance>-0.07</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_PlateArmorVestal"]/costList</xpath>
-					<value>
-						<costList>
-							<Cloth>40</Cloth>
-							<Steel>110</Steel>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_PlateArmorVestal"]/statBases/Mass</xpath>
-					<value>
-						<Mass>10</Mass>
-						<Bulk>50</Bulk>
-						<WornBulk>8</WornBulk>
-					</value>
-				</li>
-
-				<!-- === Plague Doctor Mask === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_PlagueMask"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-						<Bulk>2</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_PlagueMask"]/recipeMaker/skillRequirements</xpath>
-					<value>
-						<skillRequirements>
-							<Crafting>5</Crafting>
-						</skillRequirements>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_PlagueMask"]/apparel/layers</xpath>
-					<value>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_PlagueMask"]/equippedStatOffsets/ToxicResistance</xpath>
-					<value>
-						<ToxicEnvironmentResistance>0.33</ToxicEnvironmentResistance>
-						<SmokeSensitivity>-0.60</SmokeSensitivity>
-					</value>
-				</li>
-
-				<!-- === Plague Doctor Apparel === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_PlagueDoctor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
-						<Bulk>8</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Det's Energy Weapons/EnergyBoltAmmoSet.XML b/Patches/Det's Energy Weapons/EnergyBoltAmmoSet.XML
deleted file mode 100644
index 6aa80003ba..0000000000
--- a/Patches/Det's Energy Weapons/EnergyBoltAmmoSet.XML	
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Det's Energy Weapons</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_LaserBoltPistol</defName>
-					<label>laser charge</label>
-					<ammoTypes>
-						<Ammo_LaserChargePack>Bullet_Bolt_LaserPistol</Ammo_LaserChargePack>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_LaserBoltRifle</defName>
-					<label>laser charge</label>
-					<ammoTypes>
-						<Ammo_LaserChargePack>Bullet_Bolt_LaserRifle</Ammo_LaserChargePack>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_LaserBoltSniperRifle</defName>
-					<label>laser charge</label>
-					<ammoTypes>
-						<Ammo_LaserChargePack>Bullet_Bolt_LaserSniperRifle</Ammo_LaserChargePack>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ================== Projectiles ================== -->
-				<ThingDef Name="BaseEnergyBoltBullet" ParentName="BaseBulletCE" Abstract="true">
-					<label>laser bolt</label>
-					<graphicData>
-						<texPath>Things/EnergyBolt</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>CE_Laser</damageDef>
-						<speed>156</speed>
-						<dropsCasings>false</dropsCasings>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseEnergyBoltBullet">
-					<defName>Bullet_Bolt_LaserPistol</defName>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>10</damageAmountBase>
-						<armorPenetrationSharp>17.5</armorPenetrationSharp>
-						<armorPenetrationBlunt>1</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseEnergyBoltBullet">
-					<defName>Bullet_Bolt_LaserRifle</defName>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>18</damageAmountBase>
-						<armorPenetrationSharp>17.5</armorPenetrationSharp>
-						<armorPenetrationBlunt>1</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseEnergyBoltBullet">
-					<defName>Bullet_Bolt_LaserSniperRifle</defName>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>20</damageAmountBase>
-						<armorPenetrationSharp>20.25</armorPenetrationSharp>
-						<armorPenetrationBlunt>1</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-			</value>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Det's Energy Weapons/Guns_Defs.XML b/Patches/Det's Energy Weapons/Guns_Defs.XML
deleted file mode 100644
index 389216c12b..0000000000
--- a/Patches/Det's Energy Weapons/Guns_Defs.XML	
+++ /dev/null
@@ -1,254 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Det's Energy Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Damage -->
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/DamageDef[defName="EnergyDamage"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>Flame</value>
-				</li>
-
-				<!-- Weapons -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Energy_Rifle</defName>
-					<statBases>
-						<Mass>6</Mass>
-						<Bulk>9</Bulk>
-						<SwayFactor>1.30</SwayFactor>
-						<ShotSpread>0.07</ShotSpread>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.3</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.24</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Bolt_LaserRifle</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>52</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-						<soundCast>Shot_EnergyRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_LaserBoltRifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Energy_Gattler</defName>
-					<statBases>
-						<Mass>10</Mass>
-						<Bulk>15.0</Bulk>
-						<SwayFactor>2.0</SwayFactor>
-						<ShotSpread>0.3</ShotSpread>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<RangedWeapon_Cooldown>3</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.09</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Bolt_LaserRifle</defaultProjectile>
-						<warmupTime>2</warmupTime>
-						<range>48</range>
-						<burstShotCount>20</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<soundCast>Shot_EnergyRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>80</magazineSize>
-						<reloadTime>6</reloadTime>
-						<ammoSet>AmmoSet_LaserBoltRifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>10</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Energy_Revolver</defName>
-					<statBases>
-						<Mass>1.8</Mass>
-						<Bulk>3.0</Bulk>
-						<SwayFactor>1.0</SwayFactor>
-						<ShotSpread>0.1</ShotSpread>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.6</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Bolt_LaserPistol</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_EnergyRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>9</magazineSize>
-						<reloadTime>3.50</reloadTime>
-						<ammoSet>AmmoSet_LaserBoltPistol</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Energy_PrecisionRifle</defName>
-					<statBases>
-						<Mass>8</Mass>
-						<Bulk>13.0</Bulk>
-						<SwayFactor>1.70</SwayFactor>
-						<ShotSpread>0.04</ShotSpread>
-						<SightsEfficiency>2.10</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.50</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.4</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Bolt_LaserSniperRifle</defaultProjectile>
-						<warmupTime>1.4</warmupTime>
-						<range>70</range>
-						<soundCast>Shot_EnergyRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_LaserBoltSniperRifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-				</li>
-
-				<!-- Melee Tools -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Energy_Rifle" or defName="Energy_PrecisionRifle"]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Energy_Gattler"]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Energy_Revolver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Devilstrand Animals/Devilstrand_Animals.xml b/Patches/Devilstrand Animals/Devilstrand_Animals.xml
deleted file mode 100644
index 0ca955f45a..0000000000
--- a/Patches/Devilstrand Animals/Devilstrand_Animals.xml	
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Devilstrand Animals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Animal stats are identical to Vanilla equivalents. Devilhare is already covered by @BaseHare patches in Core. ========== -->
-
-				<!-- ========== Devilbex ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ATK_Devilbex"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATK_Devilbex"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4.4</MoveSpeed>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.08</MeleeCritChance>
-						<MeleeParryChance>0.07</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATK_Devilbex"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2.13</cooldownTime>
-								<restrictedGender>Female</restrictedGender>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3.630</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>antlers</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2.13</cooldownTime>
-								<restrictedGender>Male</restrictedGender>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.630</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATK_Devilbex"]/race/baseBodySize</xpath>
-					<value>
-						<baseBodySize>0.9</baseBodySize>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="ATK_Devilbex"]/combatPower</xpath>
-					<value>
-						<combatPower>55</combatPower>
-					</value>
-				</li>
-
-				<!-- ========== DevilATK_Devilyak ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATK_Devilyak"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>5</MoveSpeed>
-						<MeleeDodgeChance>0.11</MeleeDodgeChance>
-						<MeleeCritChance>0.30</MeleeCritChance>
-						<MeleeParryChance>0.19</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATK_Devilyak"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.66</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>horns</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>2.05</cooldownTime>
-								<restrictedGender>Female</restrictedGender>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>horns</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>2.05</cooldownTime>
-								<restrictedGender>Male</restrictedGender>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATK_Devilyak"]/race/baseBodySize</xpath>
-					<value>
-						<baseBodySize>1.65</baseBodySize>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ATK_Devilyak"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="ATK_Devilyak"]/combatPower</xpath>
-					<value>
-						<combatPower>75</combatPower>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Devilstrand Colour Bundle/Items_Resources_Stuff.xml b/Patches/Devilstrand Colour Bundle/Items_Resources_Stuff.xml
deleted file mode 100644
index 12be4d287d..0000000000
--- a/Patches/Devilstrand Colour Bundle/Items_Resources_Stuff.xml	
+++ /dev/null
@@ -1,461 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Devilstrand Colour Bundle</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==========  Devilstrand_Blue  =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DS-B_DEVILSTRAND-B_CLOTH_DEF"]/statBases</xpath>
-					<value>
-						<Bulk>0.3</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DS-B_DEVILSTRAND-B_CLOTH_DEF"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>0.95</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DS-B_DEVILSTRAND-B_CLOTH_DEF"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.5</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DS-B_DEVILSTRAND-B_CLOTH_DEF"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DS-B_DEVILSTRAND-B_CLOTH_DEF"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
-						<StuffPower_Armor_Electric>0.05</StuffPower_Armor_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DS-B_DEVILSTRAND-B_CLOTH_DEF"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="DS-B_DEVILSTRAND-B_CLOTH_DEF"]/stuffProps/categories</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="DS-B_DEVILSTRAND-B_DEF"]/stuffProps</xpath>
-						<value>
-							<categories>
-								<li>SoftArmor</li>
-							</categories>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="DS-B_DEVILSTRAND-B_CLOTH_DEF"]/stuffProps/categories</xpath>
-						<value>
-							<li>SoftArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<!-- ==========  Devilstrand_Cyan  =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DS-C_DEVILSTRAND-C_CLOTH_DEF"]/statBases</xpath>
-					<value>
-						<Bulk>0.3</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DS-C_DEVILSTRAND-C_CLOTH_DEF"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>0.95</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DS-C_DEVILSTRAND-C_CLOTH_DEF"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.5</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DS-C_DEVILSTRAND-C_CLOTH_DEF"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DS-C_DEVILSTRAND-C_CLOTH_DEF"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
-						<StuffPower_Armor_Electric>0.05</StuffPower_Armor_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DS-C_DEVILSTRAND-C_CLOTH_DEF"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="DS-C_DEVILSTRAND-C_CLOTH_DEF"]/stuffProps/categories</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="DS-C_DEVILSTRAND-C_CLOTH_DEF"]/stuffProps</xpath>
-						<value>
-							<categories>
-								<li>SoftArmor</li>
-							</categories>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="DS-C_DEVILSTRAND-C_CLOTH_DEF"]/stuffProps/categories</xpath>
-						<value>
-							<li>SoftArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<!-- ==========  Devilstrand_Green  =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DS-G_DEVILSTRAND-G_CLOTH_DEF"]/statBases</xpath>
-					<value>
-						<Bulk>0.3</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DS-G_DEVILSTRAND-G_CLOTH_DEF"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>0.95</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DS-G_DEVILSTRAND-G_CLOTH_DEF"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.5</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DS-G_DEVILSTRAND-G_CLOTH_DEF"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DS-G_DEVILSTRAND-G_CLOTH_DEF"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
-						<StuffPower_Armor_Electric>0.05</StuffPower_Armor_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DS-G_DEVILSTRAND-G_CLOTH_DEF"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="DS-G_DEVILSTRAND-G_CLOTH_DEF"]/stuffProps/categories</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="DS-G_DEVILSTRAND-G_CLOTH_DEF"]/stuffProps</xpath>
-						<value>
-							<categories>
-								<li>SoftArmor</li>
-							</categories>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="DS-G_DEVILSTRAND-G_CLOTH_DEF"]/stuffProps/categories</xpath>
-						<value>
-							<li>SoftArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<!-- ==========  Devilstrand_Pink  =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DS-K_DEVILSTRAND-K_CLOTH_DEF"]/statBases</xpath>
-					<value>
-						<Bulk>0.3</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DS-K_DEVILSTRAND-K_CLOTH_DEF"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>0.95</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DS-K_DEVILSTRAND-K_CLOTH_DEF"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.5</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DS-K_DEVILSTRAND-K_CLOTH_DEF"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DS-K_DEVILSTRAND-K_CLOTH_DEF"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
-						<StuffPower_Armor_Electric>0.05</StuffPower_Armor_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DS-K_DEVILSTRAND-K_CLOTH_DEF"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="DS-K_DEVILSTRAND-K_CLOTH_DEF"]/stuffProps/categories</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="DS-K_DEVILSTRAND-K_CLOTH_DEF"]/stuffProps</xpath>
-						<value>
-							<categories>
-								<li>SoftArmor</li>
-							</categories>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="DS-K_DEVILSTRAND-K_CLOTH_DEF"]/stuffProps/categories</xpath>
-						<value>
-							<li>SoftArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<!-- ==========  Devilstrand_Orange  =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DS-O_DEVILSTRAND-O_CLOTH_DEF"]/statBases</xpath>
-					<value>
-						<Bulk>0.3</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DS-O_DEVILSTRAND-O_CLOTH_DEF"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>0.95</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DS-O_DEVILSTRAND-O_CLOTH_DEF"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.5</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DS-O_DEVILSTRAND-O_CLOTH_DEF"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DS-O_DEVILSTRAND-O_CLOTH_DEF"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
-						<StuffPower_Armor_Electric>0.05</StuffPower_Armor_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DS-O_DEVILSTRAND-O_CLOTH_DEF"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="DS-O_DEVILSTRAND-O_CLOTH_DEF"]/stuffProps/categories</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="DS-O_DEVILSTRAND-O_CLOTH_DEF"]/stuffProps</xpath>
-						<value>
-							<categories>
-								<li>SoftArmor</li>
-							</categories>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="DS-O_DEVILSTRAND-O_CLOTH_DEF"]/stuffProps/categories</xpath>
-						<value>
-							<li>SoftArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<!-- ==========  Devilstrand_Purple  =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DS-P_DEVILSTRAND-P_CLOTH_DEF"]/statBases</xpath>
-					<value>
-						<Bulk>0.3</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DS-P_DEVILSTRAND-P_CLOTH_DEF"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>0.95</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DS-P_DEVILSTRAND-P_CLOTH_DEF"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.5</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DS-P_DEVILSTRAND-P_CLOTH_DEF"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DS-P_DEVILSTRAND-P_CLOTH_DEF"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
-						<StuffPower_Armor_Electric>0.05</StuffPower_Armor_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DS-P_DEVILSTRAND-P_CLOTH_DEF"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="DS-P_DEVILSTRAND-P_CLOTH_DEF"]/stuffProps/categories</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="DS-P_DEVILSTRAND-P_CLOTH_DEF"]/stuffProps</xpath>
-						<value>
-							<categories>
-								<li>SoftArmor</li>
-							</categories>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="DS-P_DEVILSTRAND-P_CLOTH_DEF"]/stuffProps/categories</xpath>
-						<value>
-							<li>SoftArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<!-- ==========  Devilstrand_Yellow  =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DS-Y_DEVILSTRAND-Y_CLOTH_DEF"]/statBases</xpath>
-					<value>
-						<Bulk>0.3</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DS-Y_DEVILSTRAND-Y_CLOTH_DEF"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>0.95</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DS-Y_DEVILSTRAND-Y_CLOTH_DEF"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.5</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DS-Y_DEVILSTRAND-Y_CLOTH_DEF"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DS-Y_DEVILSTRAND-Y_CLOTH_DEF"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
-						<StuffPower_Armor_Electric>0.05</StuffPower_Armor_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DS-Y_DEVILSTRAND-Y_CLOTH_DEF"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="DS-Y_DEVILSTRAND-Y_CLOTH_DEF"]/stuffProps/categories</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="DS-Y_DEVILSTRAND-Y_CLOTH_DEF"]/stuffProps</xpath>
-						<value>
-							<categories>
-								<li>SoftArmor</li>
-							</categories>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="DS-Y_DEVILSTRAND-Y_CLOTH_DEF"]/stuffProps/categories</xpath>
-						<value>
-							<li>SoftArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dinosauria/Dino_Bodies.xml b/Patches/Dinosauria/Dino_Bodies.xml
deleted file mode 100644
index 321221a4f3..0000000000
--- a/Patches/Dinosauria/Dino_Bodies.xml
+++ /dev/null
@@ -1,325 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dinosauria</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Natural Armor -->
-				<!-- Theropod -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Theropod"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Tail"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Theropod"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Tail" or
-						def="AnimalJaw" or
-						def="Head" or
-						def="Leg" or
-						def="Foot"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- Natural Armor -->
-				<!-- Theropod wit claws -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="TheropodWithClaws"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Leg" or
-						def="Tail"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="TheropodWithClaws"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Tail" or
-						def="AnimalJaw" or
-						def="Head" or
-						def="Leg" or
-						def="FootClaw" or
-						def="Foot"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- Natural Armor -->
-				<!-- kNUCKLES -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Knucklehead"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Leg" or
-						def="Tail"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Knucklehead"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Tail" or
-						def="AnimalJaw" or
-						def="Head" or
-						def="Leg" or
-						def="Foot"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- BipedalRunner -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="BipedalRunner"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Tail"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="BipedalRunner"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Tail" or
-						def="AnimalJaw" or
-						def="Head" or
-						def="Leg" or
-						def="Foot"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- BipedalOther -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="BipedalOther"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Tail"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="BipedalOther"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Tail" or
-						def="AnimalJaw" or
-						def="Head" or
-						def="Leg" or
-						def="Foot"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- BirdMimic -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="BirdMimic"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Shoulder" or
-						def="Arm" or
-						def="Tail"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="BirdMimic"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Tail" or
-						def="AnimalJaw" or
-						def="Head" or
-						def="Shoulder" or
-						def="Arm" or
-						def="FrontClaw" or
-						def="Leg" or
-						def="Foot"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- BipedalOther -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Ceratopsid"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Crest" or
-						def="Foot" or
-						def="Tail"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Ceratopsid"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Tail" or
-						def="Beak" or
-						def="Horn" or
-						def="Head" or
-						def="Crest" or
-						def="Leg" or
-						def="Foot"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- Sauropod -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Sauropod"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Foot"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Sauropod"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Tail" or
-						def="AnimalJaw" or
-						def="Head" or
-						def="Leg" or
-						def="Foot"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- ThyreophoraeWithSpikes -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="ThyreophoraeWithSpikes"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Foot" or
-						def="Tail"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="ThyreophoraeWithSpikes"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Tail" or
-						def="Spikes" or
-						def="AnimalJaw" or
-						def="Head" or
-						def="Leg" or
-						def="Foot"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!--ThyreophoraeWithClub -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="ThyreophoraeWithClub"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Foot" or
-						def="Tail"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="ThyreophoraeWithClub"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Tail" or
-						def="Club" or
-						def="AnimalJaw" or
-						def="Head" or
-						def="Leg" or
-						def="Foot"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dinosauria/Items_Resource_Dinosauria_Items.xml b/Patches/Dinosauria/Items_Resource_Dinosauria_Items.xml
deleted file mode 100644
index 8ec58e3060..0000000000
--- a/Patches/Dinosauria/Items_Resource_Dinosauria_Items.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dinosauria</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== Triceratops Horn ====== -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="TriceratopsHorn"]/tools</xpath>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="TriceratopsHorn"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>ResourceBase</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dinosauria/Items_Resource_Dinosauria_Stuff_Leather.xml b/Patches/Dinosauria/Items_Resource_Dinosauria_Stuff_Leather.xml
deleted file mode 100644
index 321c6e6af0..0000000000
--- a/Patches/Dinosauria/Items_Resource_Dinosauria_Stuff_Leather.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dinosauria</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--========== Basic leathers ============-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Raptor" or defName="Leather_DinosaurFuzz" or defName="Leather_DinosaurHide"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.05</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<!--========== Thin leathers ============-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_DinosaurSkin" or defName="Leather_PterosaurSkin"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.03</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_DinosaurSkin" or defName="Leather_PterosaurSkin"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.02</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!--========== Tough leathers ============-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Theropod" or defName="Leather_Sauropod" or defName="Leather_Redhide"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.06</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Theropod" or defName="Leather_Redhide"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.04</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!--========== Super leathers ============-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Tyrannosaurus" or defName="Leather_Spinosaurus"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.72</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Tyrannosaurus" or defName="Leather_Spinosaurus"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Bluefuzz"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.7</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Bluefuzz"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.09</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_ArmoredDino"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.75</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_ArmoredDino"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.14</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!--========== Leather_Tyrannosaurus, Leather_Spinosaurus, Leather_Bluefuzz, Leather_ArmoredDino ============-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Leather_Tyrannosaurus" or defName="Leather_Spinosaurus" or defName="Leather_Bluefuzz" or defName="Leather_ArmoredDino"]/stuffProps</xpath>
-					<value>
-						<categories>
-							<li>SoftArmor</li>
-						</categories>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dinosauria/Races_Animal_Dinosauria.xml b/Patches/Dinosauria/Races_Animal_Dinosauria.xml
deleted file mode 100644
index ceae0df349..0000000000
--- a/Patches/Dinosauria/Races_Animal_Dinosauria.xml
+++ /dev/null
@@ -1,2556 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Spreadsheets for this patch can be found here: https://drive.google.com/open?id=1YHXVEMYF5HC62COJoguEQQ8l5P6O7_FIeNbnokURlnM
-https://drive.google.com/open?id=1ah4ESB3nCYnbxtD4sf7uyXvWi301o0vr1yNwt1jS6io
--->
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dinosauria</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========= TYRANNOSAURUS REX ========= -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="TyrannosaurusRex"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TyrannosaurusRex"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.06</MeleeDodgeChance>
-						<MeleeCritChance>1.15</MeleeCritChance>
-						<MeleeParryChance>0.83</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TyrannosaurusRex"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>5</MoveSpeed>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TyrannosaurusRex"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>8</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TyrannosaurusRex"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TyrannosaurusRex"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left leg</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>129</power>
-								<cooldownTime>3.85</cooldownTime>
-								<linkedBodyPartsGroup>LeftLeg</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>64.8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right leg</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>129</power>
-								<cooldownTime>3.85</cooldownTime>
-								<linkedBodyPartsGroup>RightLeg</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>64.8</armorPenetrationBlunt>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>136</power>
-								<cooldownTime>3.7</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>2.07</armorPenetrationSharp>
-								<armorPenetrationBlunt>207</armorPenetrationBlunt>
-								<chanceFactor>0.7</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= YUTYRANNUS ========= -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Yutyrannus"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Yutyrannus"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.16</MeleeDodgeChance>
-						<MeleeCritChance>0.62</MeleeCritChance>
-						<MeleeParryChance>0.42</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Yutyrannus"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>6.5</MoveSpeed>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Yutyrannus"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>5</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Yutyrannus"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.10</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Yutyrannus"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left leg</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>LeftLeg</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>11.76</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right leg</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>RightLeg</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>11.76</armorPenetrationBlunt>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>44</power>
-								<cooldownTime>2.8</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>17.664</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.23</armorPenetrationSharp>
-								<chanceFactor>0.7</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= CARNOTAURUS ========= -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Carnotaurus"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Carnotaurus"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.14</MeleeDodgeChance>
-						<MeleeCritChance>0.66</MeleeCritChance>
-						<MeleeParryChance>0.53</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Carnotaurus"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>6</MoveSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Carnotaurus"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Carnotaurus"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Carnotaurus"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left leg</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>34</power>
-								<cooldownTime>2.35</cooldownTime>
-								<linkedBodyPartsGroup>LeftLeg</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>14.486</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right leg</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>34</power>
-								<cooldownTime>2.35</cooldownTime>
-								<linkedBodyPartsGroup>RightLeg</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>14.486</armorPenetrationBlunt>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>51</power>
-								<cooldownTime>3.05</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.32</armorPenetrationSharp>
-								<armorPenetrationBlunt>25.234</armorPenetrationBlunt>
-								<chanceFactor>0.7</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= ALLOSAURUS ========= -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Allosaurus"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Allosaurus"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						<MeleeCritChance>0.43</MeleeCritChance>
-						<MeleeParryChance>0.43</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Allosaurus"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>5</MoveSpeed>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Allosaurus"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>5</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Allosaurus"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.10</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Allosaurus"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left leg</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>2.6</cooldownTime>
-								<linkedBodyPartsGroup>LeftLeg</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>7.779</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right leg</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>2.6</cooldownTime>
-								<linkedBodyPartsGroup>RightLeg</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>7.779</armorPenetrationBlunt>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>45</power>
-								<cooldownTime>2.85</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.24</armorPenetrationSharp>
-								<armorPenetrationBlunt>18.926</armorPenetrationBlunt>
-								<chanceFactor>0.7</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= SPINOSAURUS ========= -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Spinosaurus"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Spinosaurus"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						<MeleeCritChance>0.35</MeleeCritChance>
-						<MeleeParryChance>0.75</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Spinosaurus"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>2.6</MoveSpeed>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Spinosaurus"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Spinosaurus"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.12</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Spinosaurus"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left leg</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>43</power>
-								<cooldownTime>5.2</cooldownTime>
-								<linkedBodyPartsGroup>LeftLeg</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>19.2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right leg</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>43</power>
-								<cooldownTime>5.2</cooldownTime>
-								<linkedBodyPartsGroup>RightLeg</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>19.2</armorPenetrationBlunt>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>111</power>
-								<cooldownTime>3.3</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.38</armorPenetrationSharp>
-								<armorPenetrationBlunt>138</armorPenetrationBlunt>
-								<chanceFactor>0.7</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= BARYONYX ========= -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Baryonyx"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Baryonyx"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.14</MeleeDodgeChance>
-						<MeleeCritChance>0.53</MeleeCritChance>
-						<MeleeParryChance>0.42</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Baryonyx"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Baryonyx"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left leg</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>2.3</cooldownTime>
-								<linkedBodyPartsGroup>LeftLeg</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>8.64</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right leg</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>2.3</cooldownTime>
-								<linkedBodyPartsGroup>RightLeg</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>8.64</armorPenetrationBlunt>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>44</power>
-								<cooldownTime>2.8</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.23</armorPenetrationSharp>
-								<armorPenetrationBlunt>17.664</armorPenetrationBlunt>
-								<chanceFactor>0.7</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= ANKYLOSAURUS ========= -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Ankylosaurus"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Ankylosaurus"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						<MeleeCritChance>0.42</MeleeCritChance>
-						<MeleeParryChance>0.54</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Ankylosaurus"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>3</MoveSpeed>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Ankylosaurus"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>18</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Ankylosaurus"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Ankylosaurus"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tail</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>63</power>
-								<cooldownTime>5.1</cooldownTime>
-								<linkedBodyPartsGroup>TailAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>29.153</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>5.9</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>8.957</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= MINMI ========= -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Minmi"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Minmi"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						<MeleeCritChance>0.18</MeleeCritChance>
-						<MeleeParryChance>0.17</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Minmi"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>10</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Minmi"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.40</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Minmi"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tail</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2.95</cooldownTime>
-								<linkedBodyPartsGroup>TailAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>7.2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>2.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= BRACHIOSAURUS ========= -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Brachiosaurus"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Brachiosaurus"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.77</MeleeCritChance>
-						<MeleeParryChance>0.156</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Brachiosaurus"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>2.4</MoveSpeed>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Brachiosaurus"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Brachiosaurus"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Brachiosaurus"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tail</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>151</power>
-								<cooldownTime>11.4</cooldownTime>
-								<linkedBodyPartsGroup>TailAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>77.4</armorPenetrationBlunt>
-								<chanceFactor>0.3</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left leg</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>61</power>
-								<cooldownTime>8.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>27.864</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right leg</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>61</power>
-								<cooldownTime>8.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>27.864</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= BRONTOSAURUS ========= -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Brontosaurus"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Brontosaurus"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.04</MeleeDodgeChance>
-						<MeleeCritChance>0.44</MeleeCritChance>
-						<MeleeParryChance>1.18</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Brontosaurus"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>2.4</MoveSpeed>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Brontosaurus"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Brontosaurus"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Brontosaurus"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tail</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>55</power>
-								<cooldownTime>8.6</cooldownTime>
-								<linkedBodyPartsGroup>TailAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>25.2</armorPenetrationBlunt>
-								<chanceFactor>0.3</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left leg</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>6.65</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>9.072</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right leg</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>6.65</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>9.072</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= DIPLODOCUS ========= -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Diplodocus"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Diplodocus"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.04</MeleeDodgeChance>
-						<MeleeCritChance>0.42</MeleeCritChance>
-						<MeleeParryChance>1.15</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Diplodocus"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>2.4</MoveSpeed>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Diplodocus"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Diplodocus"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Diplodocus"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tail</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>52</power>
-								<cooldownTime>8.45</cooldownTime>
-								<linkedBodyPartsGroup>TailAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>23.4</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left leg</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>6.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>8.424</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right leg</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>6.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>8.424</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= MAGYAROSAURUS ========= -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Magyarosaurus"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Magyarosaurus"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.10</MeleeDodgeChance>
-						<MeleeCritChance>0.27</MeleeCritChance>
-						<MeleeParryChance>0.35</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Magyarosaurus"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4</MoveSpeed>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Magyarosaurus"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Magyarosaurus"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.00</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Magyarosaurus"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tail</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>3.25</cooldownTime>
-								<linkedBodyPartsGroup>TailAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>11</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left leg</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>2.7</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right leg</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>2.7</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= UTAHRAPTOR ========= -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Utahraptor"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Utahraptor"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.31</MeleeCritChance>
-						<MeleeParryChance>0.19</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Utahraptor"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>6</MoveSpeed>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Utahraptor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Utahraptor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.01</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Utahraptor"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>41</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>FootClawAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.94</armorPenetrationSharp>
-								<armorPenetrationBlunt>8.438</armorPenetrationBlunt>
-								<chanceFactor>0.25</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>41</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>FootClawAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.94</armorPenetrationSharp>
-								<armorPenetrationBlunt>8.438</armorPenetrationBlunt>
-								<chanceFactor>0.25</chanceFactor>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>29</power>
-								<cooldownTime>1.7</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.41</armorPenetrationSharp>
-								<armorPenetrationBlunt>9</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= DAKOTARAPTOR ========= -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Dakotaraptor"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Dakotaraptor"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.23</MeleeCritChance>
-						<MeleeParryChance>0.16</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Dakotaraptor"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>6</MoveSpeed>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Dakotaraptor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Dakotaraptor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.01</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Dakotaraptor"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>32</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>FootClawAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.52</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.68</armorPenetrationBlunt>
-								<chanceFactor>0.25</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>32</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>FootClawAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.52</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.68</armorPenetrationBlunt>
-								<chanceFactor>0.25</chanceFactor>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.79</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= DILOPHOSAURUS ========= -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Dilophosaurus"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Dilophosaurus"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.16</MeleeDodgeChance>
-						<MeleeCritChance>0.27</MeleeCritChance>
-						<MeleeParryChance>0.18</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Dilophosaurus"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>6</MoveSpeed>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Dilophosaurus"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Dilophosaurus"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.01</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Dilophosaurus"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>1.55</cooldownTime>
-								<linkedBodyPartsGroup>FootClawAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.73</armorPenetrationSharp>
-								<armorPenetrationBlunt>6.525</armorPenetrationBlunt>
-								<chanceFactor>0.25</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>1.55</cooldownTime>
-								<linkedBodyPartsGroup>FootClawAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.73</armorPenetrationSharp>
-								<armorPenetrationBlunt>6.525</armorPenetrationBlunt>
-								<chanceFactor>0.25</chanceFactor>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>7.031</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= VELOCIRAPTOR ========= -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Velociraptor"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Velociraptor"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.31</MeleeDodgeChance>
-						<MeleeCritChance>0.07</MeleeCritChance>
-						<MeleeParryChance>0.03</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Velociraptor"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>7.2</MoveSpeed>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Velociraptor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.00</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Velociraptor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.00</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Velociraptor"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.7</cooldownTime>
-								<linkedBodyPartsGroup>FootClawAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.281</armorPenetrationBlunt>
-								<chanceFactor>0.3</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.7</cooldownTime>
-								<linkedBodyPartsGroup>FootClawAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.281</armorPenetrationBlunt>
-								<chanceFactor>0.3</chanceFactor>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.7</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-								<chanceFactor>0.4</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Velociraptor"]/race/manhunterOnDamageChance</xpath>
-					<value>
-						<manhunterOnDamageChance>0.75</manhunterOnDamageChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Velociraptor"]/combatPower</xpath>
-					<value>
-						<combatPower>70</combatPower>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Velociraptor"]/wildGroupSize/min</xpath>
-					<value>
-						<min>5</min>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Velociraptor"]/wildGroupSize/max</xpath>
-					<value>
-						<max>7</max>
-					</value>
-				</li>
-
-				<!-- ========= COMPSOGNATHUS ========= -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Compsognathus"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Compsognathus"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.32</MeleeDodgeChance>
-						<MeleeCritChance>0.03</MeleeCritChance>
-						<MeleeParryChance>0.00</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Compsognathus"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>6</MoveSpeed>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Compsognathus"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>0.5</cooldownTime>
-								<linkedBodyPartsGroup>FootClawAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>5</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.049</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>0.5</cooldownTime>
-								<linkedBodyPartsGroup>FootClawAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>5</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.049</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.6</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.038</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Compsognathus"]/combatPower</xpath>
-					<value>
-						<combatPower>25</combatPower>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Compsognathus"]/wildGroupSize/min</xpath>
-					<value>
-						<min>2</min>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Compsognathus"]/wildGroupSize/max</xpath>
-					<value>
-						<max>3</max>
-					</value>
-				</li>
-
-				<!-- ========= GALLIMIMUS ========= -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Gallimimus"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Gallimimus"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.17</MeleeDodgeChance>
-						<MeleeCritChance>0.29</MeleeCritChance>
-						<MeleeParryChance>0.24</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gallimimus"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>5.8</MoveSpeed>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gallimimus"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left leg</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>2.1</cooldownTime>
-								<linkedBodyPartsGroup>LeftLeg</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.39</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.91</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right leg</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>2.1</cooldownTime>
-								<linkedBodyPartsGroup>RightLeg</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.39</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.91</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Gallimimus"]/combatPower</xpath>
-					<value>
-						<combatPower>150</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Gallimimus"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========= GIGANTORAPTOR ========= -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Gigantoraptor"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Gigantoraptor"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						<MeleeCritChance>0.47</MeleeCritChance>
-						<MeleeParryChance>0.32</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gigantoraptor"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>5.4</MoveSpeed>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gigantoraptor"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left leg</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>31</power>
-								<cooldownTime>2.8</cooldownTime>
-								<linkedBodyPartsGroup>LeftLeg</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.22</armorPenetrationSharp>
-								<armorPenetrationBlunt>6.085</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right leg</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>31</power>
-								<cooldownTime>2.8</cooldownTime>
-								<linkedBodyPartsGroup>RightLeg</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.22</armorPenetrationSharp>
-								<armorPenetrationBlunt>6.085</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= IGUANODON ========= -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Iguanodon"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Iguanodon"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.07</MeleeDodgeChance>
-						<MeleeCritChance>0.36</MeleeCritChance>
-						<MeleeParryChance>0.45</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Iguanodon"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>3.5</MoveSpeed>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Iguanodon"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Iguanodon"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Iguanodon"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>37</power>
-								<cooldownTime>4.2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>12</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>16.2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= PARASAUR ========= -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Parasaur"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Parasaur"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.07</MeleeDodgeChance>
-						<MeleeCritChance>0.33</MeleeCritChance>
-						<MeleeParryChance>0.43</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Parasaur"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>3.5</MoveSpeed>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Parasaur"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Parasaur"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Parasaur"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>32</power>
-								<cooldownTime>4</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>12</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>13.478</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= CORYTHOSAURUS ========= -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Corythosaurus"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Corythosaurus"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.09</MeleeDodgeChance>
-						<MeleeCritChance>0.69</MeleeCritChance>
-						<MeleeParryChance>0.48</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Corythosaurus"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>5</MoveSpeed>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Corythosaurus"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Corythosaurus"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Corythosaurus"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>55</power>
-								<cooldownTime>4</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>12</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>25.2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= DEINOCHEIRUS ========= -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Deinocheirus"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Deinocheirus"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.06</MeleeDodgeChance>
-						<MeleeCritChance>0.52</MeleeCritChance>
-						<MeleeParryChance>0.61</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Deinocheirus"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>3.5</MoveSpeed>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Deinocheirus"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>5</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Deinocheirus"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Deinocheirus"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>33</power>
-								<cooldownTime>2.7</cooldownTime>
-								<linkedBodyPartsGroup>ArmClawAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.425</armorPenetrationBlunt>
-								<chanceFactor>0.4</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>33</power>
-								<cooldownTime>2.7</cooldownTime>
-								<linkedBodyPartsGroup>ArmClawAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.425</armorPenetrationBlunt>
-								<chanceFactor>0.4</chanceFactor>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>2.8</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>6.2</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= THERIZINOSAURUS ========= -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Therizinosaurus"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Therizinosaurus"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.07</MeleeDodgeChance>
-						<MeleeCritChance>0.46</MeleeCritChance>
-						<MeleeParryChance>0.56</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Therizinosaurus"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>3.6</MoveSpeed>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Therizinosaurus"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>5</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Therizinosaurus"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Therizinosaurus"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>41</power>
-								<cooldownTime>2.5</cooldownTime>
-								<linkedBodyPartsGroup>ArmClawAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.99</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
-								<chanceFactor>0.4</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>41</power>
-								<cooldownTime>2.5</cooldownTime>
-								<linkedBodyPartsGroup>ArmClawAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.99</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
-								<chanceFactor>0.4</chanceFactor>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= PACHYCEPHALOSAURUS ========= -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Pachycephalosaurus"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Pachycephalosaurus"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.14</MeleeDodgeChance>
-						<MeleeCritChance>0.31</MeleeCritChance>
-						<MeleeParryChance>0.16</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Pachycephalosaurus"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Pachycephalosaurus"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>2.95</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= STYGIMOLOCH ========= -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Stygimoloch"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Stygimoloch"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.04</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Stygimoloch"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.1</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>1.95</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= DRYOSAURUS ========= -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Dryosaurus"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Dryosaurus"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.04</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Dryosaurus"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.9</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.3</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= STEGOSAURUS ========= -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Stegosaurus"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Stegosaurus"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.22</MeleeCritChance>
-						<MeleeParryChance>0.57</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Stegosaurus"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>2</MoveSpeed>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Stegosaurus"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>7</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Stegosaurus"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.12</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Stegosaurus"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tail</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>63</power>
-								<cooldownTime>2.8</cooldownTime>
-								<linkedBodyPartsGroup>TailAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>29.153</armorPenetrationBlunt>
-								<chanceFactor>0.8</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>4.7</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>12</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>12.8</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= TRICERATOPS ========= -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Triceratops"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Triceratops"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.06</MeleeDodgeChance>
-						<MeleeCritChance>0.76</MeleeCritChance>
-						<MeleeParryChance>0.70</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Triceratops"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4</MoveSpeed>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Triceratops"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>8</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Triceratops"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.13</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Triceratops"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horns</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>38</power>
-								<cooldownTime>2.5</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<chanceFactor>0.8</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>3.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= PROTOCERATOPS ========= -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Protoceratops"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Protoceratops"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.09</MeleeDodgeChance>
-						<MeleeCritChance>0.07</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Protoceratops"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2.35</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= QUETZALCOATLUS ========= -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Quetzalcoatlus"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Quetzalcoatlus"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.09</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0.29</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Quetzalcoatlus"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Quetzalcoatlus"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Quetzalcoatlus"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>beak</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>2.3</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>7.92</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= PTERANODON ========= -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Pteranodon"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Pteranodon"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.07</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-						<MeleeParryChance>0.04</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Pteranodon"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>beak</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2.24</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dishonored Assassin Coat/ThingDefs_Misc/Apparel.xml b/Patches/Dishonored Assassin Coat/ThingDefs_Misc/Apparel.xml
deleted file mode 100644
index 67a8d3a9dc..0000000000
--- a/Patches/Dishonored Assassin Coat/ThingDefs_Misc/Apparel.xml	
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dishonored Assassin Coat</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- recipeEdits -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_AssassinCoatMale"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>100</costStuffCount>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_AssassinCoatMale"]</xpath>
-					<value>
-						<costList>
-							<Cloth>25</Cloth>
-						</costList>
-					</value>
-				</li>
-				<!-- statBases -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_AssassinCoatMale"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>1.5</Bulk>
-						<WornBulk>2</WornBulk>
-						<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				<!-- Misc -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_AssassinCoatMale"]/apparel/layers</xpath>
-					<value>
-						<li>Webbing</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_AssassinCoatMale"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<ReloadSpeed>0.1</ReloadSpeed>
-							<MoveSpeed>0.15</MoveSpeed>
-							<CarryBulk>15</CarryBulk>
-							<ToxicEnvironmentResistance>0.3</ToxicEnvironmentResistance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dishonored Assassin Mask/ThingDefs_Misc/Apparel_Headhear.xml b/Patches/Dishonored Assassin Mask/ThingDefs_Misc/Apparel_Headhear.xml
deleted file mode 100644
index 70f89c0232..0000000000
--- a/Patches/Dishonored Assassin Mask/ThingDefs_Misc/Apparel_Headhear.xml	
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dishonored Assassin Mask</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Recipe edits -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_AssasssinMask"]/costList</xpath>
-					<value>
-						<costList>
-							<Cloth>20</Cloth>
-							<Steel>15</Steel>
-							<ComponentIndustrial>3</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-				<!-- statBases -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_AssasssinMask"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>1.5</Bulk>
-						<WornBulk>3.0</WornBulk>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				<!-- Misc -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_AssasssinMask"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<SmokeSensitivity>-0.6</SmokeSensitivity>
-							<ToxicEnvironmentResistance>0.20</ToxicEnvironmentResistance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_AssasssinMask"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_AssasssinMask"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Eyes</li>
-						<li>Teeth</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Divine Order/PawnKindDefs/Divine_Order_CE_Pawnkinds.xml b/Patches/Divine Order/PawnKindDefs/Divine_Order_CE_Pawnkinds.xml
deleted file mode 100644
index 8e329fad93..0000000000
--- a/Patches/Divine Order/PawnKindDefs/Divine_Order_CE_Pawnkinds.xml	
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Divine Order</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Give ammo to crosbowman-->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="BotchJob_DivineOrderScout"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>12</min>
-								<max>20</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>100</min>
-									<max>200</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>MedievalMeleeDecent</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="BotchJob_DivineOrderSharpshooter" or defName="BotchJob_DivineOrderInquisitor"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>12</min>
-								<max>20</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>100</min>
-									<max>200</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>MedievalMeleeDecent</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="BotchJob_DivineOrderHerald" or defName="BotchJob_DivineOrderMerchant"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>10</min>
-								<max>30</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>100</min>
-									<max>200</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>MedievalMeleeDecent</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="BotchJob_DivineOrderConscript"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>30</min>
-								<max>40</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[
-						defName="BotchJob_DivineOrderScout" or
-						defName="BotchJob_DivineOrderSharpshooter" or
-						defName="BotchJob_DivineOrderInquisitor" or
-						defName="BotchJob_DivineOrderMerchant" or
-						defName="BotchJob_DivineOrderConscript"]
-					</xpath>
-					<value>
-						<apparelRequired>
-							<li>CE_Apparel_TribalBackpack</li>
-						</apparelRequired>
-					</value>
-				</li>
-
-				<li Class="PatchOperationFindMod">
-					<mods>
-						<li>Vanilla Expanded Framework</li>
-					</mods>
-					<match Class="PatchOperationAddModExtension">
-						<xpath>Defs/PawnKindDef[defName="BotchJob_DivineOrderKnight"]</xpath>
-						<value>
-							<li Class="CombatExtended.LoadoutPropertiesExtension">
-								<shieldMoney>
-									<min>100</min>
-									<max>350</max>
-								</shieldMoney>
-								<shieldTags>
-									<li>BotchJob_DivineOrderShield</li>
-								</shieldTags>
-								<shieldChance>0.65</shieldChance>
-							</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[defName="BotchJob_DivineOrderHerald"]/apparelRequired</xpath>
-					<value>
-						<li>CE_Apparel_TribalBackpack</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Divine Order/Scenario/DivineOrder_CE_Scenario_Patch.xml b/Patches/Divine Order/Scenario/DivineOrder_CE_Scenario_Patch.xml
deleted file mode 100644
index 8956a6ab4b..0000000000
--- a/Patches/Divine Order/Scenario/DivineOrder_CE_Scenario_Patch.xml	
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Divine Order</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs/ScenarioDef[defName="BotchJob_DivineOrderStart"]/scenario/parts</xpath>
-			<value>
-				<li Class="ScenPart_StartingThing_Defined">
-					<def>StartingThing_Defined</def>
-					<thingDef>Ammo_CrossbowBolt_Steel</thingDef>
-					<count>50</count>
-				</li>
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Apparel.xml b/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Apparel.xml
deleted file mode 100644
index 7b5823577a..0000000000
--- a/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Apparel.xml	
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Divine Order</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Cloak  -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderCloak" or defName="BotchJob_InquisitorCloak"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderCloak" or defName="BotchJob_InquisitorCloak"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Fur Cloak -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderFurCloak"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderFurCloak"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				
-				<!-- Zealot Robes -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderZealotRobes"]/statBases</xpath>
-					<value>
-						<Bulk>20</Bulk>
-						<WornBulk>6</WornBulk>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderZealotRobes"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Headstuff -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderHood" or defName="BotchJob_DivineOrderFurHood"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderHood" or defName="BotchJob_DivineOrderFurHood"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Merchant Hat -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderMerchantHat"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderMerchantHat"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Tunic (But its really a gambeson) -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderTunic"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>6</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderTunic"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Arms</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderTunic"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>10</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Breeches -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderBreeches"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderBreeches"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Armor.xml b/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Armor.xml
deleted file mode 100644
index a96a6696d4..0000000000
--- a/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Armor.xml	
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Divine Order</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Skirmisher Armor -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderSkirmisherArmor"]/statBases</xpath>
-					<value>
-						<Bulk>18</Bulk>
-						<WornBulk>4</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderSkirmisherArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderSkirmisherArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderSkirmisherArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Inquisitor Garb -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_InquisitorArmor"]/statBases</xpath>
-					<value>
-						<Bulk>18</Bulk>
-						<WornBulk>4</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_InquisitorArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_InquisitorArmor"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_InquisitorArmor"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Inquisitor Garb -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_HeraldRobes"]/statBases</xpath>
-					<value>
-						<Bulk>20</Bulk>
-						<WornBulk>6</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_HeraldRobes"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>10</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_HeraldRobes"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_HeraldRobes"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!--Breast Plate-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderBreastplate"]/statBases</xpath>
-					<value>
-						<Bulk>25</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderBreastplate"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3.2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderBreastplate"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<!-- Plate Armor -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderPlateArmor" or defName="BotchJob_CrusaderArmor"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderPlateArmor" or defName="BotchJob_CrusaderArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderPlateArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>15</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderPlateArmor" or defName="BotchJob_CrusaderArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<MeleeDodgeChance>-0.15</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderPlateArmor" or defName="BotchJob_CrusaderArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderPlateArmor" or defName="BotchJob_CrusaderArmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- Elite Armor -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_CrusaderArmor"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_CrusaderArmor"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Headgear.xml b/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Headgear.xml
deleted file mode 100644
index 84597f2466..0000000000
--- a/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Headgear.xml	
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Divine Order</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Cowled Helmet -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderCowledHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderCowledHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderCowledHelmet"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderCowledHelmet"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Plate Helmet -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderOpenHelmet"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>100</costStuffCount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderPlateHelmet" or defName="BotchJob_DivineOrderOpenHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderPlateHelmet" or defName="BotchJob_DivineOrderOpenHelmet"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>FullHead</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderPlateHelmet"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderPlateHelmet" or defName="BotchJob_DivineOrderOpenHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<AimingAccuracy>-0.4</AimingAccuracy><!--CE Bascinet-->
-						<MeleeHitChance>-2</MeleeHitChance>
-						<Suppressability>-0.20</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderPlateHelmet" or defName="BotchJob_DivineOrderOpenHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3.75</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Light Helmet -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderLightHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderLightHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Crusader Helmet -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_CrusaderHelmet" or defName="BotchJob_HeraldHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_CrusaderHelmet" or defName="BotchJob_HeraldHelmet"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>FullHead</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-				<!-- Slightly Better than Plate Helm for hitting -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_CrusaderHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>-0.4</AimingAccuracy><!--CE Bascinet-->
-							<Suppressability>-0.20</Suppressability>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_HeraldHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<AimingAccuracy>-0.4</AimingAccuracy><!--CE Bascinet-->
-						<MeleeHitChance>-2</MeleeHitChance>
-						<Suppressability>-0.20</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_CrusaderHelmet" or defName="BotchJob_HeraldHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3.75</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_CrusaderHelmet" or defName="BotchJob_HeraldHelmet"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_CrusaderHelmet"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Inquisitor Helmet -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_InquisitorHat"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_InquisitorHat"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_InquisitorHat"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_InquisitorHat"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Shield.xml b/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Shield.xml
deleted file mode 100644
index 17c62f04d5..0000000000
--- a/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Shield.xml	
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Divine Order</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderShield"]</xpath>
-					<value>
-
-						<ThingDef ParentName="ShieldBase">
-							<defName>BotchJob_DivineOrderShield</defName>
-							<label>divine order shield</label>
-							<description>A sturdy, reinforced shield that bears the insignia of the Divine Order.</description>
-							<techLevel>Medieval</techLevel>
-							<graphicData>
-								<texPath>Things/Pawn/Humanlike/Apparel/Other/DivineOrderShield</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>1</drawSize>
-								<shaderType>CutoutComplex</shaderType>
-							</graphicData>
-							<thingCategories Inherit="False">
-								<li>Shields</li>
-							</thingCategories>
-							<stuffCategories>
-								<li>Metallic</li>
-							</stuffCategories>
-							<costStuffCount>150</costStuffCount>
-							<costList>
-								<Gold>5</Gold>
-							</costList>
-							<recipeMaker>
-								<researchPrerequisite>BotchJob_DivineOrderSmithing</researchPrerequisite>
-								<recipeUsers>
-									<li>FueledSmithy</li>
-									<li>ElectricSmithy</li>
-								</recipeUsers>
-								<skillRequirements>
-									<Crafting>8</Crafting>
-								</skillRequirements>
-							</recipeMaker>
-							<statBases>
-								<WorkToMake>3000</WorkToMake>
-								<MaxHitPoints>145</MaxHitPoints>
-								<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-								<Mass>8</Mass>
-								<Bulk>9</Bulk>
-								<WornBulk>6</WornBulk>
-							</statBases>
-							<equippedStatOffsets>
-								<ReloadSpeed>-0.2</ReloadSpeed>
-								<MeleeHitChance>-1</MeleeHitChance>
-								<ShootingAccuracyPawn>-0.15</ShootingAccuracyPawn>
-								<AimingAccuracy>-0.08</AimingAccuracy>
-								<Suppressability>-0.25</Suppressability>
-								<MeleeCritChance>-0.05</MeleeCritChance>
-								<MeleeParryChance>1.0</MeleeParryChance>
-							</equippedStatOffsets>
-							<apparel>
-								<tags>
-									<li>KiteShield</li>
-								</tags>
-								<defaultOutfitTags>
-									<li>Soldier</li>
-								</defaultOutfitTags>
-								<countsAsClothingForNudity>false</countsAsClothingForNudity>
-								<canBeDesiredForIdeo>false</canBeDesiredForIdeo>
-							</apparel>
-							<comps>
-								<li>
-									<compClass>CompColorable</compClass>
-								</li>
-							</comps>
-							<modExtensions>
-								<li Class="CombatExtended.ShieldDefExtension">
-									<shieldCoverage>
-										<li>Hands</li>
-										<li>Arms</li>
-										<li>Shoulders</li>
-										<li>Torso</li>
-										<li>Neck</li>
-									</shieldCoverage>
-									<drawAsTall>false</drawAsTall>
-								</li>
-							</modExtensions>
-						</ThingDef>
-
-					</value>
-				</li>
-
-				<li Class="PatchOperationFindMod">
-					<mods>
-						<li>Vanilla Expanded Framework</li>
-					</mods>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/PawnKindDef[defName="BotchJob_DivineOrderKnight"]</xpath>
-						<value>
-							<apparelRequired>
-								<li>BotchJob_DivineOrderShield</li>
-							</apparelRequired>
-						</value>
-					</nomatch>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Divine Order/ThingDef_Misc/Weapons/Divine_Order_CE_Grenades.xml b/Patches/Divine Order/ThingDef_Misc/Weapons/Divine_Order_CE_Grenades.xml
deleted file mode 100644
index 42720e8639..0000000000
--- a/Patches/Divine Order/ThingDef_Misc/Weapons/Divine_Order_CE_Grenades.xml	
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Divine Order</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Grenade Base ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderCleansingConcoction"]</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Body</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.75</cooldownTime>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Fire Bomb ========== -->
-
-				<!-- Projectile -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderCleansingConcoctionThrown"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>3</explosionRadius>
-							<damageDef>BotchJob_DivineOrderCleansingBlast</damageDef>
-							<speed>15</speed>
-							<ai_IsIncendiary>true</ai_IsIncendiary>
-							<shadowSize>0.6</shadowSize>
-							<screenShakeFactor>0.5</screenShakeFactor>
-							<explosionDelay>200</explosionDelay>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderCleansingConcoctionThrown"]</xpath>
-					<value>
-						<thingClass>CombatExtended.Projectile_FireTrail</thingClass>
-					</value>
-				</li>
-
-				<!-- Grenade -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderCleansingConcoction"]</xpath>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<stackLimit>50</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderCleansingConcoction"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderCleansingConcoction"]/comps</xpath>
-					<value>
-						<comps>
-							<li Class="CompProperties_Explosive">
-								<explosiveRadius>3</explosiveRadius>
-								<explosiveDamageType>BotchJob_DivineOrderCleansingBlast</explosiveDamageType>
-								<startWickHitPointsPercent>0.7</startWickHitPointsPercent>
-								<explodeOnKilled>True</explodeOnKilled>
-								<wickTicks>60~100</wickTicks>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BotchJob_DivineOrderCleansingConcoction</defName>
-					<statBases>
-						<Mass>0.6</Mass>
-						<Bulk>1.8</Bulk>
-						<MarketValue>3</MarketValue>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<label>throw cleansing bomb</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<range>10</range>
-						<minRange>3</minRange>
-						<warmupTime>1.8</warmupTime>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<soundCast>ThrowMolotovCocktail</soundCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<defaultProjectile>BotchJob_DivineOrderCleansingConcoctionThrown</defaultProjectile>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Divine Order/ThingDef_Misc/Weapons/Divine_Order_CE_Melee.xml b/Patches/Divine Order/ThingDef_Misc/Weapons/Divine_Order_CE_Melee.xml
deleted file mode 100644
index 7ce2a46383..0000000000
--- a/Patches/Divine Order/ThingDef_Misc/Weapons/Divine_Order_CE_Melee.xml	
+++ /dev/null
@@ -1,332 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Divine Order</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Divine Order Mace -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderMace"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderMace"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.42</MeleeCritChance>
-							<MeleeParryChance>0.24</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderMace"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderMace"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>2.1</cooldownTime>
-								<chanceFactor>0.90</chanceFactor>
-								<armorPenetrationBlunt>7.625</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Divine Order Shortsword -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderShortsword"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderShortsword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.40</MeleeCritChance>
-							<MeleeParryChance>0.60</MeleeParryChance>
-							<MeleeDodgeChance>0.30</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderShortsword"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderShortsword"]/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.05</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.46</cooldownTime>
-								<chanceFactor>0.50</chanceFactor>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.40</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.45</chanceFactor>
-								<armorPenetrationBlunt>1.1</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.58</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Divine Order Longsword -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderLongsword"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<MeleeCounterParryBonus>0.8</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderLongsword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.5</MeleeCritChance>
-							<MeleeParryChance>0.6</MeleeParryChance>
-							<MeleeDodgeChance>0.40</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderLongsword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.78</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.78</cooldownTime>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.0</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>1.64</cooldownTime>
-								<chanceFactor>0.35</chanceFactor>
-								<armorPenetrationBlunt>3.24</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.72</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderLongsword"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- Battle Standard -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderBattleStandard"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<MeleeCounterParryBonus>1.27</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderBattleStandard"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.08</MeleeCritChance>
-							<MeleeParryChance>0.95</MeleeParryChance>
-							<MeleeDodgeChance>1.27</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderBattleStandard"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.3</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>1.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.5</cooldownTime>
-								<chanceFactor>0.95</chanceFactor>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Divine Order Greatsword -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderGreatsword"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<MeleeCounterParryBonus>0.70</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderGreatsword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.30</MeleeCritChance>
-							<MeleeParryChance>1.20</MeleeParryChance>
-							<MeleeDodgeChance>0.50</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderGreatsword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.69</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.98</cooldownTime>
-								<chanceFactor>0.50</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.90</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>48</power>
-								<cooldownTime>2.86</cooldownTime>
-								<chanceFactor>0.45</chanceFactor>
-								<armorPenetrationBlunt>3.592</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.58</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Divine Order/ThingDef_Misc/Weapons/Divine_Order_CE_Ranged.xml b/Patches/Divine Order/ThingDef_Misc/Weapons/Divine_Order_CE_Ranged.xml
deleted file mode 100644
index 5fe956f930..0000000000
--- a/Patches/Divine Order/ThingDef_Misc/Weapons/Divine_Order_CE_Ranged.xml	
+++ /dev/null
@@ -1,234 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Divine Order</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Tools -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderPistol"]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderCrossbow" or defName="BotchJob_DivineOrderHandCrossbow"]/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>
-
-				<!-- === Divine Order Pistol === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BotchJob_DivineOrderPistol</defName>
-					<statBases>
-						<Bulk>7</Bulk>
-						<SwayFactor>1.22</SwayFactor>
-						<ShotSpread>0.36</ShotSpread>
-						<SightsEfficiency>0.85</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_SlowMusketBall</defaultProjectile>
-						<warmupTime>1.66</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Shotgun_NoRack</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<ammoConsumedPerShotCount>4</ammoConsumedPerShotCount>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>4</magazineSize>
-						<reloadTime>5.1</reloadTime>
-						<ammoSet>AmmoSet_SlowMusketBall</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>NeolithicRangedHeavy</li>
-						<li>NeolithicRangedChief</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Crossbow === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BotchJob_DivineOrderCrossbow</defName>
-					<statBases>
-						<Bulk>6</Bulk>
-						<SwayFactor>1.2</SwayFactor>
-						<ShotSpread>0.25</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Projectile_CrossbowBolt_Steel</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>23</range>
-						<soundCast>Bow_Large</soundCast>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_XBow</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Hand Crossbow === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BotchJob_DivineOrderHandCrossbow</defName>
-					<statBases>
-						<Bulk>2.5</Bulk>
-						<SwayFactor>1.2</SwayFactor>
-						<ShotSpread>0.35</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Projectile_CrossbowBolt_Steel</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>10</range>
-						<soundCast>Bow_Large</soundCast>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- Divine Judgement Staff -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BotchJob_DivineJudgementStaff</defName>
-					<statBases>
-						<Bulk>6</Bulk>
-						<SwayFactor>0</SwayFactor>
-						<ShotSpread>0.0</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>6</RangedWeapon_Cooldown>
-						<MeleeCounterParryBonus>0.93</MeleeCounterParryBonus>
-					</statBases>
-					<Properties>
-						<verbClass>Verb_Shoot</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>BotchJob_DivineOrderStaffThrown</defaultProjectile>
-						<warmupTime>12</warmupTime>
-						<range>35</range>
-						<forcedMissRadius>1</forcedMissRadius>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-							<canTargetPawns>false</canTargetPawns>
-						</targetParams>
-						<aimingChargeMote>BotchJob_StaffChargeMote</aimingChargeMote>
-						<aimingTargetMote>BotchJob_StaffTargetMote</aimingTargetMote>
-						<beamTargetsGround>true</beamTargetsGround>
-						<soundAiming>BotchJob_DivineStaffCharge</soundAiming>
-						<minRange>5.9</minRange>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineJudgementStaff"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2.85</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>1.69</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineJudgementStaff"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.00</MeleeCritChance>
-							<MeleeParryChance>0.70</MeleeParryChance>
-							<MeleeDodgeChance>0.47</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Divine Order/ThingDef_Races/Divine_Order_CE_Horse.xml b/Patches/Divine Order/ThingDef_Races/Divine_Order_CE_Horse.xml
deleted file mode 100644
index f8aa6dde9e..0000000000
--- a/Patches/Divine Order/ThingDef_Races/Divine_Order_CE_Horse.xml	
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Divine Order</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Divine Order Horse ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderHorse"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderHorse"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>6</MoveSpeed>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.39</MeleeCritChance>
-						<MeleeParryChance>0.24</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_DivineOrderHorse"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.97</cooldownTime>
-								<chanceFactor>0.5</chanceFactor>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.12</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Divine Order/TraderDefs/Divine_Order_CE_Traders.xml b/Patches/Divine Order/TraderDefs/Divine_Order_CE_Traders.xml
deleted file mode 100644
index eb1830ec47..0000000000
--- a/Patches/Divine Order/TraderDefs/Divine_Order_CE_Traders.xml	
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Divine Order</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="BotchJob_DivineOrderBaseTrader"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_Category">
-							<categoryDef>CannonBall</categoryDef>
-							<countRange>
-								<min>12</min>
-								<max>36</max>
-							</countRange>
-							<price>Expensive</price>
-							<thingDefCountRange>
-								<min>1</min>
-								<max>3</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Category">
-							<categoryDef>MiniCannonBall</categoryDef>
-							<countRange>
-								<min>50</min>
-								<max>100</max>
-							</countRange>
-							<price>Normal</price>
-							<thingDefCountRange>
-								<min>1</min>
-								<max>2</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_PreIndustrialAmmo</tradeTag>
-							<countRange>
-								<min>300</min>
-								<max>1200</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>2</min>
-								<max>4</max>
-							</thingDefCountRange>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="BotchJob_DivineOrderCaravanTrader"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_Category">
-							<categoryDef>MiniCannonBall</categoryDef>
-							<countRange>
-								<min>25</min>
-								<max>50</max>
-							</countRange>
-							<price>Normal</price>
-							<thingDefCountRange>
-								<min>1</min>
-								<max>2</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_PreIndustrialAmmo</tradeTag>
-							<countRange>
-								<min>100</min>
-								<max>200</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>1</min>
-								<max>3</max>
-							</thingDefCountRange>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Doom Factions/DoomFactions_Ammo.xml b/Patches/Doom Factions/DoomFactions_Ammo.xml
deleted file mode 100644
index c8a22705ee..0000000000
--- a/Patches/Doom Factions/DoomFactions_Ammo.xml	
+++ /dev/null
@@ -1,258 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>DOOM - Factions (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ========== AmmoSet ========== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_PlasmaRifle</defName>
-							<label>Energy Cell</label>
-							<ammoTypes>
-								<Ammo_PlasmaCellRifle>Bullet_UACPlasmaRifle</Ammo_PlasmaCellRifle>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_GaussCannon</defName>
-							<label>Energy Cell</label>
-							<ammoTypes>
-								<Ammo_PlasmaCellRifle>Bullet_UACGaussCannonFlechette</Ammo_PlasmaCellRifle>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_VortexRifle</defName>
-							<label>Energy Cell</label>
-							<ammoTypes>
-								<Ammo_PlasmaCellRifle>Bullet_UACVortexRiflePlasma</Ammo_PlasmaCellRifle>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Hellshot</defName>
-							<label>Energy Cell</label>
-							<ammoTypes>
-								<Ammo_PlasmaCellRifle>Bullet_UACHellshotBolt</Ammo_PlasmaCellRifle>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_BFG</defName>
-							<label>Energy Cell</label>
-							<ammoTypes>
-								<Ammo_80x256mmFuel_Incendiary>Bullet_UACBFG</Ammo_80x256mmFuel_Incendiary>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ========== Projectiles ========== -->
-						<ThingDef ParentName="Base6x24mmChargedBullet">
-							<defName>Bullet_PlasmaCellPistol</defName>
-							<label>Plasma</label>
-							<graphicData>
-								<texPath>Things/Projectile/UACSidearmProj</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>140</speed>
-								<damageDef>UAC_Plasm</damageDef>
-								<damageAmountBase>8</damageAmountBase>
-								<armorPenetrationSharp>25</armorPenetrationSharp>
-								<armorPenetrationBlunt>65.6</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base6x24mmChargedBullet">
-							<defName>Bullet_UACPlasmaRifle</defName>
-							<label>Plasma</label>
-							<graphicData>
-								<texPath>Things/Projectile/Plasma2016</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>(0.5,0.5)</drawSize><!-- this is assuming you are running TasteofVanillaish Doom Faction -->
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>200</speed>
-								<damageDef>UAC_Plasm</damageDef>
-								<damageAmountBase>10</damageAmountBase>
-								<armorPenetrationSharp>25</armorPenetrationSharp>
-								<armorPenetrationBlunt>165.6</armorPenetrationBlunt>
-								<!--explosionRadius>0.9</explosionRadius>
-							<soundExplode>Hit_UACBFG9000</soundExplode-->
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>3</damageAmountBase>
-									<explosiveDamageType>UAC_Plasm</explosiveDamageType>
-									<explosiveRadius>0.5</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-									<explosionSound>Hit_UACBFG9000</explosionSound>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="Base6x24mmChargedBullet">
-							<defName>Bullet_UACVortexRiflePlasma</defName>
-							<label>Plasma</label>
-							<graphicData>
-								<texPath>Things/Projectile/Vortexbeam</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>200</speed>
-								<damageDef>UAC_Plasm</damageDef>
-								<damageAmountBase>40</damageAmountBase>
-								<armorPenetrationSharp>60</armorPenetrationSharp>
-								<armorPenetrationBlunt>165.6</armorPenetrationBlunt>
-								<!--explosionRadius>0.9</explosionRadius>
-							<soundExplode>Hit_UACBFG9000</soundExplode-->
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>5</damageAmountBase>
-									<explosiveDamageType>UAC_Plasm</explosiveDamageType>
-									<explosiveRadius>0.5</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-									<explosionSound>Hit_UACBFG9000</explosionSound>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="Base6x24mmChargedBullet">
-							<defName>Bullet_UACHellshotBolt</defName>
-							<label>Plasma</label>
-							<graphicData>
-								<texPath>Things/Projectile/HellshotPlasma</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>(0.75,0.75)</drawSize><!-- this is assuming you are running TasteofVanillaish Doom Faction -->
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>200</speed>
-								<damageDef>UAC_Plasm</damageDef>
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationSharp>25</armorPenetrationSharp>
-								<armorPenetrationBlunt>165.6</armorPenetrationBlunt>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>20</damageAmountBase>
-									<explosiveDamageType>Flame_Secondary</explosiveDamageType>
-									<explosiveRadius>0.5</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-									<explosionSound>Explosion_EMP</explosionSound>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="Base6x24mmChargedBullet">
-							<defName>Bullet_UACGaussCannonFlechette</defName>
-							<label>Gauss Cannon Flechette</label>
-							<graphicData>
-								<texPath>Things/Projectile/GAUSSBeam</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>150</damageAmountBase>
-								<armorPenetrationSharp>130</armorPenetrationSharp>
-								<armorPenetrationBlunt>7250</armorPenetrationBlunt>
-								<speed>500</speed>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>150</damageAmountBase>
-									<explosiveDamageType>UAC_GAUSS</explosiveDamageType>
-									<explosiveRadius>1.9</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="Base6x24mmChargedBullet">
-							<defName>Bullet_UACBFG</defName>
-							<label>BFG Plasma</label>
-							<graphicData>
-								<texPath>Things/Projectile/BFGPLAZMA</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>9000</damageAmountBase>
-								<armorPenetrationSharp>9000</armorPenetrationSharp>
-								<armorPenetrationBlunt>9000</armorPenetrationBlunt>
-								<speed>30</speed>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>9000</damageAmountBase>
-									<explosiveDamageType>UAC_BFG</explosiveDamageType>
-									<explosiveRadius>3.9</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-							</comps>
-						</ThingDef>
-
-					</value>
-				</li>
-
-				<!-- ========== Change the damagedefs ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[defName="UAC_Plasm"]/label</xpath>
-					<value>
-						<label>Plasma</label>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[defName="UAC_GAUSS"]/label</xpath>
-					<value>
-						<label>Plasma</label>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[defName="UAC_BFG"]/label</xpath>
-					<value>
-						<label>BFG Plasma</label>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[defName="UAC_Plasm" or defName="UAC_GAUSS" or defName="UAC_BFG"]/hediff</xpath>
-					<value>
-						<hediff>BurnSecondary</hediff>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/DamageDef[defName="UAC_Plasm"]</xpath>
-					<value>
-						<explosionCellMote>UACMote_BlastGAUSS</explosionCellMote>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/DamageDef[defName="UAC_GAUSS"]</xpath>
-					<value>
-						<minDamageToFragment>15</minDamageToFragment>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/DamageDef[defName="UAC_BFG"]</xpath>
-					<value>
-						<minDamageToFragment>150</minDamageToFragment>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/DamageDef[defName="UAC_Plasm"]</xpath>
-					<value>
-						<li Class="CombatExtended.DamageDefExtensionCE">
-							<harmOnlyOutsideLayers>true</harmOnlyOutsideLayers>
-							<isAmbientDamage>true</isAmbientDamage>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Doom Factions/DoomFactions_Apperal.xml b/Patches/Doom Factions/DoomFactions_Apperal.xml
deleted file mode 100644
index 5b6b9d2f08..0000000000
--- a/Patches/Doom Factions/DoomFactions_Apperal.xml	
+++ /dev/null
@@ -1,317 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>DOOM - Factions (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== Armor ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_UACRavenArmor" or defName="Apparel_UACTrackerArmor" or defName="Apparel_UACFractalArmor" or defName="Apparel_UACLEETArmor" or defName="Apparel_UACSheperdArmor"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>20</WornBulk>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_UACRavenArmor" or defName="Apparel_UACTrackerArmor" or defName="Apparel_UACFractalArmor" or defName="Apparel_UACLEETArmor" or defName="Apparel_UACSheperdArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>800</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_UACRavenArmor" or defName="Apparel_UACTrackerArmor" or defName="Apparel_UACFractalArmor" or defName="Apparel_UACLEETArmor" or defName="Apparel_UACSheperdArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>80</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_UACRavenArmor" or defName="Apparel_UACTrackerArmor" or defName="Apparel_UACFractalArmor" or defName="Apparel_UACLEETArmor" or defName="Apparel_UACSheperdArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>30</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_UACRavenArmor" or defName="Apparel_UACTrackerArmor" or defName="Apparel_UACFractalArmor" or defName="Apparel_UACLEETArmor" or defName="Apparel_UACSheperdArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>75</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_UACRavenArmor" or defName="Apparel_UACTrackerArmor" or defName="Apparel_UACFractalArmor" or defName="Apparel_UACLEETArmor" or defName="Apparel_UACSheperdArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>150</CarryWeight><!-- Has a built-in exoskeleton -->
-						<CarryBulk>120</CarryBulk><!-- has a TacVest and backpack -->
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_UACRavenArmor" or defName="Apparel_UACTrackerArmor" or defName="Apparel_UACFractalArmor" or defName="Apparel_UACLEETArmor" or defName="Apparel_UACSheperdArmor"]/apparel/layers</xpath>
-					<value>
-						<li>Webbing</li>
-					</value>
-				</li>
-
-				<!-- ========== Helmet ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_UACWildcatHelm" or defName="Apparel_UACSheperdHelm" or defName="Apparel_UACRavenHelm" or defName="Apparel_UACLEETHelm" or defName="Apparel_UACASPHelm"]/statBases</xpath>
-					<value>
-						<Bulk>7</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_UACWildcatHelm" or defName="Apparel_UACSheperdHelm" or defName="Apparel_UACRavenHelm" or defName="Apparel_UACLEETHelm" or defName="Apparel_UACASPHelm"]/statBases/Mass</xpath>
-					<value>
-						<Mass>6</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_UACWildcatHelm" or defName="Apparel_UACSheperdHelm" or defName="Apparel_UACRavenHelm" or defName="Apparel_UACLEETHelm" or defName="Apparel_UACASPHelm"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>300</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_UACWildcatHelm" or defName="Apparel_UACSheperdHelm" or defName="Apparel_UACRavenHelm" or defName="Apparel_UACLEETHelm" or defName="Apparel_UACASPHelm"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>24</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_UACWildcatHelm" or defName="Apparel_UACSheperdHelm" or defName="Apparel_UACRavenHelm" or defName="Apparel_UACLEETHelm" or defName="Apparel_UACASPHelm"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>60</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Apparel_UACWildcatHelm" or defName="Apparel_UACSheperdHelm" or defName="Apparel_UACRavenHelm" or defName="Apparel_UACLEETHelm" or defName="Apparel_UACASPHelm"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Apparel_UACWildcatHelm" or defName="Apparel_UACSheperdHelm" or defName="Apparel_UACRavenHelm" or defName="Apparel_UACLEETHelm" or defName="Apparel_UACASPHelm"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_UACWildcatHelm" or defName="Apparel_UACSheperdHelm" or defName="Apparel_UACRavenHelm" or defName="Apparel_UACLEETHelm" or defName="Apparel_UACASPHelm"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>0.15</AimingAccuracy>
-							<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-							<MoveSpeed>-0.02</MoveSpeed>
-							<ShootingAccuracyPawn>0.40</ShootingAccuracyPawn>
-							<AimingDelayFactor>-0.10</AimingDelayFactor>
-							<MentalBreakThreshold>-0.04</MentalBreakThreshold>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_UACWildcatHelm" or defName="Apparel_UACSheperdHelm" or defName="Apparel_UACRavenHelm" or defName="Apparel_UACLEETHelm" or defName="Apparel_UACASPHelm"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!-- ========== Praetor Suit ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_DOOMPraetorSuit"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>20</WornBulk>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_DOOMPraetorSuit"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>1000</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_DOOMPraetorSuit"]/statBases/Mass</xpath>
-					<value>
-						<Mass>60</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_DOOMPraetorSuit"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>34</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_DOOMPraetorSuit"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>90</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_DOOMPraetorSuit"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>150</CarryWeight><!-- Built-in exoskeleton -->
-							<CarryBulk>150</CarryBulk><!-- has a TacVest and backpack -->
-							<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-							<MoveSpeed>1</MoveSpeed>
-							<MeleeHitChance>1</MeleeHitChance>
-							<MeleeDodgeChance>1</MeleeDodgeChance>
-							<MedicalTendQualityOffset>0.25</MedicalTendQualityOffset>
-							<AimingDelayFactor>-0.10</AimingDelayFactor>
-							<ShootingAccuracyPawn>0.10</ShootingAccuracyPawn>
-							<MentalBreakThreshold>-0.07</MentalBreakThreshold>
-							<WorkSpeedGlobal>1</WorkSpeedGlobal>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_DOOMPraetorSuit"]/apparel/layers</xpath>
-					<value>
-						<li>Webbing</li>
-					</value>
-				</li>
-
-				<!-- ========== Praetor Helmet & DOOMGuy Helmet ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_DOOMPraetorHelm" or defName="Apparel_DOOMGuyHelm"]/statBases</xpath>
-					<value>
-						<Bulk>7</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_DOOMPraetorHelm" or defName="Apparel_DOOMGuyHelm"]/statBases/Mass</xpath>
-					<value>
-						<Mass>6.2</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_DOOMPraetorHelm" or defName="Apparel_DOOMGuyHelm"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>400</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_DOOMPraetorHelm" or defName="Apparel_DOOMGuyHelm"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>26</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_DOOMPraetorHelm" or defName="Apparel_DOOMGuyHelm"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>60</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Apparel_DOOMPraetorHelm" or defName="Apparel_DOOMGuyHelm"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Apparel_DOOMPraetorHelm" or defName="Apparel_DOOMGuyHelm"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_DOOMPraetorHelm" or defName="Apparel_DOOMGuyHelm"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<ShootingAccuracyPawn>0.30</ShootingAccuracyPawn>
-							<AimingDelayFactor>-0.05</AimingDelayFactor>
-							<MentalBreakThreshold>-0.04</MentalBreakThreshold>
-							<AimingAccuracy>0.15</AimingAccuracy>
-							<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_DOOMPraetorHelm" or defName="Apparel_DOOMGuyHelm"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!-- ========== Apparel ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_UACCsuit" or defName="Apparel_UACVIPSuit" or defName="Apparel_UACBusinessSuit" or defName="Apparel_UACLabcoat"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_UACCsuit" or defName="Apparel_UACLabcoat"]/statBases</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor><!-- Slightly tougher than vanilla pants, T-shirt and button-down shirt -->
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_UACVIPSuit" or defName="Apparel_UACBusinessSuit"]/statBases</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor><!-- Slightly tougher than vanilla pants, T-shirt and button-down shirt -->
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_UACVIPSuit" or defName="Apparel_UACBusinessSuit"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>26</ArmorRating_Blunt><!-- Slightly tougher than vanilla pants, T-shirt and button-down shirt -->
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_UACShades"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_UACShades"]/apparel</xpath>
-					<value>
-						<hatRenderedFrontOfFace>true</hatRenderedFrontOfFace>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Doom Factions/DoomFactions_Hediff.xml b/Patches/Doom Factions/DoomFactions_Hediff.xml
deleted file mode 100644
index 66fbd282ce..0000000000
--- a/Patches/Doom Factions/DoomFactions_Hediff.xml	
+++ /dev/null
@@ -1,27 +0,0 @@
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>DOOM - Factions (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="UACSyntheticArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/verbs</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.11</cooldownTime>
-								<armorPenetrationBlunt>3.00</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Doom Factions/DoomFactions_PawnKinds.xml b/Patches/Doom Factions/DoomFactions_PawnKinds.xml
deleted file mode 100644
index 4f11882037..0000000000
--- a/Patches/Doom Factions/DoomFactions_PawnKinds.xml	
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>DOOM - Factions (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="UAC_FBase" or defName="UAC_Scientist" or defName="UAC_Wildcat" or defName="UAC_Sheperd" or defName="UAC_Raven" or defName="UAC_ASP" or defName="UAC_XO" or defName="UAC_EliteLight" or defName="UAC_EliteSniper" or defName="UAC_EliteHeavy"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>10</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>300</min>
-									<max>1200</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>UACMelee</li>
-									<li>CE_Sidearm_Melee</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="SpaceMarine_FBase" or defName="Doom_MarineBerserker" or defName="Doom_MarineLight" or defName="Doom_MarineHeavy" or defName="Doom_MarineSniper" or defName="Doom_MarineBoss"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>7</min>
-								<max>13</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>300</min>
-									<max>1200</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>UACMelee</li>
-									<li>CE_Sidearm_Melee</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Doom Factions/DoomFactions_Traders.xml b/Patches/Doom Factions/DoomFactions_Traders.xml
deleted file mode 100644
index 7f499dfb51..0000000000
--- a/Patches/Doom Factions/DoomFactions_Traders.xml	
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>DOOM - Factions (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/TraderKindDef[defName="SpaceMarine_Base"]/stockGenerators/li[thingDef="Shell_HighExplosive"]</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/TraderKindDef[defName="SpaceMarine_CombatSupplier"]/stockGenerators/li[thingDef="Shell_HighExplosive"]</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/TraderKindDef[defName="SpaceMarine_Supplier"]/stockGenerators/li[thingDef="Shell_HighExplosive"]</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/TraderKindDef[defName="UAC_Base"]/stockGenerators/li[thingDef="Shell_HighExplosive"]</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/TraderKindDef[defName="UAC_CombatSupplier"]/stockGenerators/li[thingDef="Shell_HighExplosive"]</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/TraderKindDef[defName="UAC_Supplier"]/stockGenerators/li[thingDef="Shell_HighExplosive"]</xpath>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Doom Factions/DoomFactions_Weapons.xml b/Patches/Doom Factions/DoomFactions_Weapons.xml
deleted file mode 100644
index 925674a247..0000000000
--- a/Patches/Doom Factions/DoomFactions_Weapons.xml	
+++ /dev/null
@@ -1,499 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>DOOM - Factions (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Remove Unneccessary ========== -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="Bullet_UACPistol" or
-						defName="Bullet_UACCombatShotgun" or
-						defName="UAC_BulletSuperShotgun" or
-						defName="Bullet_UACHeavyAssaultRifle" or
-						defName="Bullet_UACChaingun" or
-						defName="UAC_GAUSSBEAM" or
-						defName="Bullet_UACPlasmaGun" or
-						defName="UAC_RocketLauncher" or
-						defName="Bullet_UACHellshot" or
-						defName="Bullet_UACVortexRifle" or
-						defName="Proj_UACBFG"
-						] </xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Gun_UACChaingun"]/recipeMaker/researchPrerequisite</xpath>
-				</li>
-
-				<!-- ========== Chainsaw ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_UACSaw"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_UACSaw"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>chainsaw</label>
-								<capacities>
-									<li>Saw</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>0.5</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>9.290</armorPenetrationBlunt>
-								<armorPenetrationSharp>7.6</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Melee Tools for weapons ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="UACBaseHumanMakeableGun"]</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Guns ========== -->
-
-				<!-- ========== UAC Pistol ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>UAC_Pistol</defName>
-					<statBases>
-						<Mass>1</Mass>
-						<Bulk>2.20</Bulk>
-						<SwayFactor>1.07</SwayFactor>
-						<ShotSpread>0.15</ShotSpread>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_PlasmaCellPistol</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>25</range>
-						<soundCast>Fire_UACPistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<!-- ========== Supposedly has infinite ammo ========== -->
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>UAC_Pistol</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== UAC Combat Shotgun ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>UAC_CombatShotgun</defName>
-					<statBases>
-						<Mass>3</Mass>
-						<Bulk>7.67</Bulk>
-						<SwayFactor>1.49</SwayFactor>
-						<ShotSpread>0.14</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.26</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>21</range>
-						<soundCast>Fire_UACCombatShotgun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>UAC_Shotgun</li>
-						<li>UAC_Wildcat</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Super Shotgun ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>UAC_SuperShotgun</defName>
-					<statBases>
-						<Mass>1.9</Mass>
-						<Bulk>6.9</Bulk>
-						<SwayFactor>1.25</SwayFactor>
-						<ShotSpread>0.18</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.9</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_23x75mmR_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<burstShotCount>2</burstShotCount>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<soundCast>Fire_UACCombatShotgun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>2</magazineSize>
-						<reloadTime>1</reloadTime>
-						<ammoSet>AmmoSet_23x75mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>UACGun</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Heavy Assault Rifle ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>UAC_HeavyAssaultRifle</defName>
-					<statBases>
-						<Mass>6</Mass>
-						<Bulk>9</Bulk>
-						<SwayFactor>1.27</SwayFactor>
-						<ShotSpread>0.07</ShotSpread>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.48</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>1.2</warmupTime>
-						<range>60</range>
-						<soundCast>Fire_UACHeavyAssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>90</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>UAC_Wildcat</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Chaingun ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_UACChaingun</defName>
-					<statBases>
-						<Mass>39</Mass>
-						<Bulk>9.5</Bulk>
-						<SwayFactor>1.32</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.58</recoilAmount>
-						<recoilPattern>Mounted</recoilPattern>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<burstShotCount>150</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>2.3</warmupTime>
-						<range>62</range>
-						<soundCast>Fire_UACChaingun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>150</magazineSize>
-						<reloadTime>9.2</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>UAC_Sheperd</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Plasma Rifle ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>UAC_PlasmaGun</defName>
-					<statBases>
-						<Mass>8.2</Mass>
-						<Bulk>7.67</Bulk>
-						<SwayFactor>1.27</SwayFactor>
-						<ShotSpread>0.07</ShotSpread>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.48</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_UACPlasmaRifle</defaultProjectile>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>1.2</warmupTime>
-						<range>62</range>
-						<soundCast>Fire_UACPlasmagun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>150</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_PlasmaRifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>UAC_Wildcat</li>
-						<li>UAC_EliteLight</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Hellshot ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>UAC_Hellshot</defName>
-					<statBases>
-						<Mass>6.35</Mass>
-						<Bulk>7.49</Bulk>
-						<SwayFactor>1.42</SwayFactor>
-						<ShotSpread>0.2</ShotSpread>
-						<SightsEfficiency>1.24</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_UACHellshotBolt</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>48</range>
-						<soundCast>Fire_UACHellshot</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>60</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_Hellshot</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>UAC_ASP</li>
-						<li>UAC_EliteLight</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Vortex Rifle ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>UAC_VortexRifle</defName>
-					<statBases>
-						<Mass>7.51</Mass>
-						<Bulk>9.05</Bulk>
-						<SwayFactor>1.76</SwayFactor>
-						<ShotSpread>0.04</ShotSpread>
-						<SightsEfficiency>2.6</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_UACVortexRiflePlasma</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>75</range>
-						<soundCast>Fire_UACVortex</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_VortexRifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>UAC_Raven</li>
-						<li>UAC_EliteSniper</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Gauss cannon ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_GAUSSCannon</defName>
-					<statBases>
-						<Mass>12.5</Mass>
-						<Bulk>12.20</Bulk>
-						<SwayFactor>1.78</SwayFactor>
-						<ShotSpread>0.04</ShotSpread>
-						<SightsEfficiency>2.2</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_UACGaussCannonFlechette</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>86</range>
-						<ammoConsumedPerShotCount>15</ammoConsumedPerShotCount>
-						<soundCast>Fire_UACGAUSS</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>15</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>150</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_GaussCannon</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>UAC_Sheperd</li>
-						<li>UAC_EliteHeavy</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Rocket Launcher ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_UACRocketLauncher</defName>
-					<statBases>
-						<Mass>8</Mass>
-						<Bulk>11.2</Bulk>
-						<SwayFactor>1.82</SwayFactor>
-						<ShotSpread>0.2</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_84x246mmR_HEAT</defaultProjectile>
-						<warmupTime>1.9</warmupTime>
-						<range>40</range>
-						<soundCast>Fire_UACRocketLauncher</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>15</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>5.1</reloadTime>
-						<ammoSet>AmmoSet_84x246mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>UAC_Sheperd</li>
-						<li>UAC_EliteHeavy</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== BFG ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>UAC_BFG</defName>
-					<statBases>
-						<Mass>10</Mass>
-						<Bulk>13</Bulk>
-						<SwayFactor>0.88</SwayFactor>
-						<ShotSpread>0.01</ShotSpread>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_UACBFG</defaultProjectile>
-						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-						<warmupTime>1.3</warmupTime>
-						<range>62</range>
-						<soundCast>Shot_UACBFG9000</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>20</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>3</magazineSize>
-						<reloadTime>10</reloadTime>
-						<ammoSet>AmmoSet_BFG</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>UAC_XO</li>
-						<li>MarineBoss</li>
-						<li>CE_AI_Launcher</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dragonian Race/ThingDefs_Bodies/Dragonian_Bodytype.xml b/Patches/Dragonian Race/ThingDefs_Bodies/Dragonian_Bodytype.xml
deleted file mode 100644
index 16098b7cd0..0000000000
--- a/Patches/Dragonian Race/ThingDefs_Bodies/Dragonian_Bodytype.xml	
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dragonian Race</li>
-			<li>Dragonian GaramRace</li>
-			<li>Dragonian Race 1.4(unofficial)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Patch Dragonian Bodytype-->
-
-				<!--Arm Groups-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Dragonian"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
-					<value>
-						<li>LeftArm</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Dragonian"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
-					<value>
-						<li>RightArm</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Dragonian"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
-					<value>
-						<li>LeftShoulder</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Dragonian"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
-					<value>
-						<li>RightShoulder</li>
-					</value>
-				</li>
-
-				<!--Natural Armor-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Dragonian"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Dragonian"]/corePart/parts/li[def="DR_Tail"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Dragonian"]/corePart/parts/li[def="Neck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Dragonian"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Dragonian"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Dragonian"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Dragonian"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Dragonian"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Dragonian"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Dragonian"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Dragonian"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Dragonian"]/corePart/parts/li[def="Leg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Dragonian"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Dragonian"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dragonian Race/ThingDefs_Items/Items_Resource_Stuff.xml b/Patches/Dragonian Race/ThingDefs_Items/Items_Resource_Stuff.xml
deleted file mode 100644
index b091a6196b..0000000000
--- a/Patches/Dragonian Race/ThingDefs_Items/Items_Resource_Stuff.xml	
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dragonian Race</li>
-			<li>Dragonian GaramRace</li>
-			<li>Dragonian Race 1.4(unofficial)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoolDragonian"]/statBases</xpath>
-					<value>
-						<Bulk>0.3</Bulk>
-						<WornBulk>0.3</WornBulk>
-						<StuffPower_Armor_Electric>0.10</StuffPower_Armor_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoolDragonian"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.675</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoolDragonian"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.85</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoolDragonian"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.15</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoolDragonian"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>0.90</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="WoolDragonian"]/stuffProps/categories</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="WoolDragonian"]/stuffProps</xpath>
-						<value>
-							<categories>
-								<li>SoftArmor</li>
-							</categories>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="WoolDragonian"]/stuffProps/categories</xpath>
-						<value>
-							<li>SoftArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dragonian Race/ThingDefs_Misc/DR_Apparel.xml b/Patches/Dragonian Race/ThingDefs_Misc/DR_Apparel.xml
deleted file mode 100644
index 5aec75a894..0000000000
--- a/Patches/Dragonian Race/ThingDefs_Misc/DR_Apparel.xml	
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Dragonian Race</li>
-					<li>Dragonian GaramRace</li>
-					<li>Dragonian Race 1.4(unofficial)</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!-- ========== Basic Wears ========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="DR_BasicWear" or defName="DR_BasicDress"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<!-- ========== Regular ========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="DR_GreekDress" or
-								defName="DR_GreekHanZo" or
-								defName="DR_GreekPriest" or
-								defName="DR_GreekSexyDress" or
-								defName="DR_GreekString" or
-								defName="DR_JapaneseDress" or
-								defName="DR_Onepiece" or
-								defName="DR_EveningDress"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="DR_GreekDress" or
-								defName="DR_GreekHanZo" or
-								defName="DR_GreekPriest" or
-								defName="DR_GreekSexyDress" or
-								defName="DR_GreekString" or
-								defName="DR_JapaneseDress" or
-								defName="DR_Onepiece" or
-								defName="DR_EveningDress"
-								]/statBases/ArmorRating_Sharp </xpath>
-							<value>
-								<ArmorRating_Sharp>4.05</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="DR_GreekDress" or
-								defName="DR_GreekHanZo" or
-								defName="DR_GreekPriest" or
-								defName="DR_GreekSexyDress" or
-								defName="DR_GreekString" or
-								defName="DR_JapaneseDress" or
-								defName="DR_Onepiece" or
-								defName="DR_EveningDress"
-								]/statBases/ArmorRating_Blunt </xpath>
-							<value>
-								<ArmorRating_Blunt>5.1</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!-- ========== Armor ========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="DR_BattleDress"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-								<Bulk>15</Bulk>
-								<WornBulk>7.5</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="DR_BattleDress"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>4.05</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="DR_BattleDress"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>5.1</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="DR_BattleDress"]/apparel/bodyPartGroups</xpath>
-							<value>
-								<li>Hands</li>
-								<li>Feet</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="DR_BattleHelm" or defName="DR_BattleHelmMale"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-								<Bulk>3</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="DR_BattleHelm" or defName="DR_BattleHelmMale"
-								]/statBases/ArmorRating_Sharp </xpath>
-							<value>
-								<ArmorRating_Sharp>1</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="DR_BattleHelm" or defName="DR_BattleHelmMale"
-								]/statBases/ArmorRating_Blunt </xpath>
-							<value>
-								<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Dragonian Race</li>
-					<li>Dragonian Race 1.4(unofficial)</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!-- ========== Basic Wears ========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="DR_MaleDress"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<!-- ========== Armor ========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="DR_BattleDressMale"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-								<Bulk>15</Bulk>
-								<WornBulk>7.5</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="DR_BattleDressMale"
-								]/statBases/ArmorRating_Sharp </xpath>
-							<value>
-								<ArmorRating_Sharp>4.05</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="DR_BattleDressMale"
-								]/statBases/ArmorRating_Blunt </xpath>
-							<value>
-								<ArmorRating_Blunt>5.1</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="DR_BattleDressMale"
-								]/apparel/bodyPartGroups </xpath>
-							<value>
-								<li>Hands</li>
-								<li>Feet</li>
-							</value>
-						</li>
-					</operations>
-				</match>
-
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dragonian Race/ThingDefs_Misc/DR_Weapon.xml b/Patches/Dragonian Race/ThingDefs_Misc/DR_Weapon.xml
deleted file mode 100644
index bdac631898..0000000000
--- a/Patches/Dragonian Race/ThingDefs_Misc/DR_Weapon.xml	
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Dragonian GaramRace</li>
-					<li>Dragonian Race</li>
-					<li>Dragonian Race 1.4(unofficial)</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--Base ver is pretty much comparable to a zeushammer (slightly less damage on swing, more damage on poke, better EMP effect)-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="DR_BattleHammer"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>5</power>
-										<extraMeleeDamages>
-											<li>
-												<def>EMP</def>
-												<amount>5</amount>
-											</li>
-										</extraMeleeDamages>
-										<cooldownTime>1.37</cooldownTime>
-										<chanceFactor>0.10</chanceFactor>
-										<armorPenetrationBlunt>8.688</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>32</power>
-										<extraMeleeDamages>
-											<li>
-												<def>EMP</def>
-												<amount>15</amount>
-											</li>
-										</extraMeleeDamages>
-										<cooldownTime>2.57</cooldownTime>
-										<armorPenetrationBlunt>118.25</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-										<chanceFactor>0.30</chanceFactor>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="DR_BattleHammer"]/statBases</xpath>
-							<value>
-								<Bulk>8</Bulk>
-								<MeleeCounterParryBonus>0.40</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName = "DR_BattleHammer"]/equippedStatOffsets</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName = "DR_BattleHammer"]</xpath>
-								<value>
-									<equippedStatOffsets />
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="DR_BattleHammer"]/equippedStatOffsets</xpath>
-							<value>
-								<MeleeCritChance>1.50</MeleeCritChance>
-								<MeleeParryChance>0.30</MeleeParryChance>
-								<MeleeDodgeChance>0.30</MeleeDodgeChance>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Dragonian GaramRace</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--Equivalent to hammer-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="DR_BattleBlade"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>5</power>
-										<cooldownTime>1.97</cooldownTime>
-										<chanceFactor>0.10</chanceFactor>
-										<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>blade</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>51</power>
-										<extraMeleeDamages>
-											<li>
-												<def>Flame</def>
-												<amount>8</amount>
-												<chance>0.3</chance>
-											</li>
-										</extraMeleeDamages>
-										<cooldownTime>1.97</cooldownTime>
-										<armorPenetrationSharp>6.67</armorPenetrationSharp>
-										<armorPenetrationBlunt>6</armorPenetrationBlunt>
-										<chanceFactor>1</chanceFactor>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>point</label>
-										<labelUsedInLogging>false</labelUsedInLogging>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>24</power>
-										<extraMeleeDamages>
-											<li>
-												<def>Flame</def>
-												<amount>8</amount>
-												<chance>0.3</chance>
-											</li>
-										</extraMeleeDamages>
-										<cooldownTime>1.57</cooldownTime>
-										<armorPenetrationSharp>11.25</armorPenetrationSharp>
-										<armorPenetrationBlunt>3.375</armorPenetrationBlunt>
-										<chanceFactor>1.2</chanceFactor>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="DR_BattleBlade"]/statBases</xpath>
-							<value>
-								<Bulk>8</Bulk>
-								<MeleeCounterParryBonus>0.40</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName = "DR_BattleBlade"]/equippedStatOffsets</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName = "DR_BattleBlade"]</xpath>
-								<value>
-									<equippedStatOffsets />
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="DR_BattleBlade"]/equippedStatOffsets</xpath>
-							<value>
-								<MeleeCritChance>1.50</MeleeCritChance>
-								<MeleeParryChance>0.30</MeleeParryChance>
-								<MeleeDodgeChance>0.30</MeleeDodgeChance>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dragonian Race/ThingDefs_Races/Race_Dragonian.xml b/Patches/Dragonian Race/ThingDefs_Races/Race_Dragonian.xml
deleted file mode 100644
index 2c1f3d13f1..0000000000
--- a/Patches/Dragonian Race/ThingDefs_Races/Race_Dragonian.xml	
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dragonian Race</li>
-			<li>Dragonian Race 1.4(unofficial)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Dragonian_Male"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Dragonian_Female"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Dragonian_Female" or defName="Dragonian_Male"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- 5.2 Speed/0.8 Size/60 kg -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Dragonian_Female" or defName="Dragonian_Male"]/statBases</xpath>
-					<value>
-						<MeleeCritChance>1.08</MeleeCritChance>
-						<MeleeParryChance>1.06</MeleeParryChance>
-						<Suppressability>1</Suppressability>
-						<!--Innate toxic resistance of 0.6-->
-						<SmokeSensitivity>0.6</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Dragonian_Female" or defName="Dragonian_Male"]/statBases/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>1.18</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<!--4mm Wool (skin+scales), their vanilla armor is thrumbo level-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Dragonian_Female" or defName="Dragonian_Male"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2.7</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Dragonian_Female" or defName="Dragonian_Male"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3.4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Dragonian_Female" or defName="Dragonian_Male"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.6</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!--Their vanilla melee is very strong (18 verus 8.2 for humanlike)-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Dragonian_Female" or defName="Dragonian_Male"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.89</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.47</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.89</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.47</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>tail</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>2.28</cooldownTime>
-								<linkedBodyPartsGroup>Tail</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>7.875</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Dragonian_Female" or defName="Dragonian_Male"]/alienRace/raceRestriction/whiteApparelList</xpath>
-					<value>
-						<li>CE_Apparel_TacVest</li>
-						<li>CE_Apparel_Backpack</li>
-						<li>CE_Apparel_TribalBackpack</li>
-						<li>CE_Apparel_BallisticShield</li>
-						<li>CE_Apparel_MeleeShield</li>
-						<li>CE_Apparel_GasMask</li>
-						<li>CE_Apparel_ImprovGasMask</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dragonian Race/ThingDefs_Races/Race_Dragonian_Garam.xml b/Patches/Dragonian Race/ThingDefs_Races/Race_Dragonian_Garam.xml
deleted file mode 100644
index 61742c8f5f..0000000000
--- a/Patches/Dragonian Race/ThingDefs_Races/Race_Dragonian_Garam.xml	
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dragonian GaramRace</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/Garam_RaceAddon.RaceAddonThingDef[@Name="DR_RaceBase"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/Garam_RaceAddon.RaceAddonThingDef[@Name="DR_RaceBase"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/Garam_RaceAddon.RaceAddonThingDef[@Name="DR_RaceBase"]</xpath>
-						<value>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/Garam_RaceAddon.RaceAddonThingDef[@Name="DR_RaceBase"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/Garam_RaceAddon.RaceAddonThingDef[@Name="DR_RaceBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- 5.2 Speed/0.8 Size/60 kg -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/Garam_RaceAddon.RaceAddonThingDef[@Name="DR_RaceBase"]/statBases</xpath>
-					<value>
-						<MeleeCritChance>1.08</MeleeCritChance>
-						<MeleeParryChance>1.06</MeleeParryChance>
-						<Suppressability>1</Suppressability>
-						<!--Innate toxic resistance of 0.6-->
-						<SmokeSensitivity>0.6</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Garam_RaceAddon.RaceAddonThingDef[@Name="DR_RaceBase"]/statBases/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>1.18</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<!--4mm Wool (skin+scales), their vanilla armor is thrumbo level-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Garam_RaceAddon.RaceAddonThingDef[@Name="DR_RaceBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2.7</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Garam_RaceAddon.RaceAddonThingDef[@Name="DR_RaceBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3.4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Garam_RaceAddon.RaceAddonThingDef[@Name="DR_RaceBase"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.6</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!--Their vanilla melee is very strong (18 verus 8.2 for humanlike)-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Garam_RaceAddon.RaceAddonThingDef[@Name="DR_RaceBase"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.89</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.47</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.89</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.47</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>tail</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>2.28</cooldownTime>
-								<linkedBodyPartsGroup>Tail</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>7.875</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/Garam_RaceAddon.RaceAddonThingDef[@Name="DR_RaceBase"]/raceAddonSettings/apparelRestrictionSetting/allAllow_Exceptions</xpath>
-					<value>
-						<li>CE_Apparel_TacVest</li>
-						<li>CE_Apparel_Backpack</li>
-						<li>CE_Apparel_TribalBackpack</li>
-						<li>CE_Apparel_BallisticShield</li>
-						<li>CE_Apparel_MeleeShield</li>
-						<li>CE_Apparel_GasMask</li>
-						<li>CE_Apparel_ImprovGasMask</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dragons Descent/BodyDefs/Bodies_Animal_Dragon.xml b/Patches/Dragons Descent/BodyDefs/Bodies_Animal_Dragon.xml
deleted file mode 100644
index 4575f5ca1b..0000000000
--- a/Patches/Dragons Descent/BodyDefs/Bodies_Animal_Dragon.xml	
+++ /dev/null
@@ -1,233 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dragons Descent</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Wing"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Wing"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Wing"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Tail"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Tail"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Tail"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Neck"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Neck"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Neck"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Shoulder"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Paw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Paw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Paw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Leg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Leg"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Leg"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="QuadrupedeAnimalWithClawsDragon"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dragons Descent/DamageDefs/DamageDef_DraconicFlame.xml b/Patches/Dragons Descent/DamageDefs/DamageDef_DraconicFlame.xml
deleted file mode 100644
index 0c836c8ee1..0000000000
--- a/Patches/Dragons Descent/DamageDefs/DamageDef_DraconicFlame.xml	
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dragons Descent</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!--=== Draconic Flame ===-->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/DamageDef[defName="DraconicFlame"]</xpath>
-					<value>
-						<li Class="CombatExtended.DamageDefExtensionCE">
-							<isAmbientDamage>true</isAmbientDamage>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[defName="DraconicFlame"]/defaultArmorPenetration</xpath>
-					<value>
-						<defaultArmorPenetration>2</defaultArmorPenetration>
-					</value>
-				</li>
-				<!--=== Draconic Explosion ===-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[defName="DraconicExplosion"]/defaultArmorPenetration</xpath>
-					<value>
-						<defaultArmorPenetration>2</defaultArmorPenetration>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/DamageDef[defName="DraconicExplosion"]</xpath>
-					<value>
-						<li Class="CombatExtended.DamageDefExtensionCE">
-							<!-- <harmOnlyOutsideLayers>true</harmOnlyOutsideLayers> -->
-							<isAmbientDamage>true</isAmbientDamage>
-						</li>
-					</value>
-				</li>
-				<!-- I think buffing damage is probably good -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[defName="DraconicExplosion"]/defaultDamage</xpath>
-					<value>
-						<defaultDamage>17</defaultDamage>
-					</value>
-				</li>
-				<!--=== Draconic Blunt (Probably not used) ===-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[defName="DraconicBlunt"]/defaultArmorPenetration</xpath>
-					<value>
-						<defaultArmorPenetration>25</defaultArmorPenetration>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[defName="DraconicBlunt"]/armorCategory</xpath>
-					<value>
-						<armorCategory>Blunt</armorCategory>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dragons Descent/DamageDefs/DamageDef_DragonMelee.xml b/Patches/Dragons Descent/DamageDefs/DamageDef_DragonMelee.xml
deleted file mode 100644
index 7445c49f8c..0000000000
--- a/Patches/Dragons Descent/DamageDefs/DamageDef_DragonMelee.xml	
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dragons Descent</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/DamageDef[defName="Pyro_Bite"]</xpath>
-					<value>
-						<li Class="CombatExtended.DamageDefExtensionCE">
-							<isAmbientDamage>true</isAmbientDamage>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dragons Descent/Drugs/Draconic_Ambrosia.xml b/Patches/Dragons Descent/Drugs/Draconic_Ambrosia.xml
deleted file mode 100644
index 055b56a9a5..0000000000
--- a/Patches/Dragons Descent/Drugs/Draconic_Ambrosia.xml	
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<!-- Hooray, more updating -->
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dragons Descent</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ======== DraconicAmbrosia (Draconic ambrosia) ======== -->
-				<!-- ====== statBases ====== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DraconicAmbrosia"]/statBases</xpath>
-					<value>
-						<Bulk>0.2</Bulk>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dragons Descent/Drugs/Dragon_Blood_Potion.xml b/Patches/Dragons Descent/Drugs/Dragon_Blood_Potion.xml
deleted file mode 100644
index efa7ab60c7..0000000000
--- a/Patches/Dragons Descent/Drugs/Dragon_Blood_Potion.xml	
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<!-- Hooray, more updating -->
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dragons Descent</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ======== DragonsBlood (Dragon's blood potion) ======== -->
-				<!-- ====== statBases ====== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DragonsBlood"]/statBases</xpath>
-					<value>
-						<Bulk>0.5</Bulk>
-					</value>
-				</li>
-				<!-- ======== DragonsBloodHigh ======== -->
-				<!-- ====== stages ====== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="DragonsBloodHigh"]/stages/li[1]</xpath>
-					<value>
-						<statOffsets>
-							<Suppressability>-0.25</Suppressability>
-						</statOffsets>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dragons Descent/Drugs/Moon_Stone.xml b/Patches/Dragons Descent/Drugs/Moon_Stone.xml
deleted file mode 100644
index 20704a3dcf..0000000000
--- a/Patches/Dragons Descent/Drugs/Moon_Stone.xml	
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<!-- Hooray, more updating -->
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dragons Descent</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ======== MoonStone ======== -->
-				<!-- ====== statBases ====== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MoonStone"]/statBases</xpath>
-					<value>
-						<Bulk>0.2</Bulk>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dragons Descent/HediffDefs/Hediff_Attacks.xml b/Patches/Dragons Descent/HediffDefs/Hediff_Attacks.xml
deleted file mode 100644
index 50d8373b4a..0000000000
--- a/Patches/Dragons Descent/HediffDefs/Hediff_Attacks.xml	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dragons Descent</li>
-		</mods>
-		<!-- === Filthy_Wound === -->
-		<match Class="PatchOperationReplace">
-			<xpath>Defs/HediffDef[defName="Filthy_Wound"]/comps/li[@Class="HediffCompProperties_Infecter"]</xpath>
-			<value>
-				<li Class="CombatExtended.HediffCompProperties_InfecterCE">
-					<infectionChancePerHourUntended>0.1</infectionChancePerHourUntended>
-				</li>
-			</value>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dragons Descent/Projectiles/Projectile_Dragon.xml b/Patches/Dragons Descent/Projectiles/Projectile_Dragon.xml
deleted file mode 100644
index bb05b71d39..0000000000
--- a/Patches/Dragons Descent/Projectiles/Projectile_Dragon.xml	
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dragons Descent</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Spit Blunt -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Projectile_DragonSpitBlunt"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Projectile_DragonSpitBlunt"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<speed>26</speed>
-							<damageDef>DraconicFlame</damageDef>
-							<damageAmountBase>30</damageAmountBase>
-							<soundExplode>DragonBreathFire</soundExplode>
-							<preExplosionSpawnThingDef>Filth_Dirt</preExplosionSpawnThingDef>
-							<preExplosionSpawnChance>0.3</preExplosionSpawnChance>
-							<explosionRadius>4</explosionRadius>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<ai_IsIncendiary>true</ai_IsIncendiary>
-							<shadowSize>1</shadowSize>
-						</projectile>
-					</value>
-				</li>
-				<!-- Fire Spit (Probably not used) -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Projectile_DragonSpit"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Projectile_DragonSpit"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<speed>38</speed>
-							<damageDef>Flame</damageDef>
-							<explosionRadius>4.5</explosionRadius>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<damageAmountBase>27</damageAmountBase>
-							<preExplosionSpawnThingDef>Filth_Ash</preExplosionSpawnThingDef>
-							<preExplosionSpawnChance>0.3</preExplosionSpawnChance>
-							<ai_IsIncendiary>true</ai_IsIncendiary>
-							<arcHeightFactor>0.2</arcHeightFactor>
-							<shadowSize>1</shadowSize>
-							<explosionDamageFalloff>false</explosionDamageFalloff>
-							<armorPenetrationBase>20</armorPenetrationBase>
-						</projectile>
-					</value>
-				</li>
-				<!-- Placeholder Spit -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Projectile_DragonBreath_AOE"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Projectile_DragonBreath_AOE"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<speed>38</speed>
-							<damageDef>DraconicFlame</damageDef>
-							<explosionRadius>4.5</explosionRadius>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<damageAmountBase>27</damageAmountBase>
-							<preExplosionSpawnThingDef>Filth_Ash</preExplosionSpawnThingDef>
-							<preExplosionSpawnChance>0.3</preExplosionSpawnChance>
-							<ai_IsIncendiary>true</ai_IsIncendiary>
-							<arcHeightFactor>0.2</arcHeightFactor>
-							<shadowSize>1</shadowSize>
-						</projectile>
-					</value>
-				</li>
-				<!-- New CE projectile to try to counter DD's animation -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="BaseBulletCE">
-							<defName>Projectile_RedDragonBreath_Fire_CE</defName>
-							<label>Fire_Breath</label>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<!-- Not sure if comps is needed, only kept for the MoteGlow -->
-							<comps>
-								<li Class="CompProperties_Glower">
-									<overlightRadius>1.0</overlightRadius>
-									<glowRadius>1</glowRadius>
-									<glowColor>(255, 161, 0, 0.19)</glowColor>
-								</li>
-							</comps>
-							<graphicData>
-								<texPath>AnimalProjectile/DragonBreath_Fire</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>MoteGlow</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<flyOverhead>false</flyOverhead>
-								<damageDef>DraconicFlame</damageDef>
-								<explosionRadius>3</explosionRadius>
-								<suppressionFactor>3.0</suppressionFactor>
-								<dangerFactor>2.0</dangerFactor>
-								<damageAmountBase>8</damageAmountBase>
-								<stoppingPower>3.5</stoppingPower>
-								<ai_IsIncendiary>true</ai_IsIncendiary>
-								<preExplosionSpawnThingDef>Filth_Ash</preExplosionSpawnThingDef>
-								<preExplosionSpawnChance>.3</preExplosionSpawnChance>
-								<speed>30</speed>
-								<extraDamages>
-									<li>
-										<def>Flame</def>
-										<amount>6</amount>
-										<armorPenetration>4</armorPenetration>
-										<chance>0.3</chance>
-									</li>
-								</extraDamages>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dragons Descent/Scenarios/Scenarios_DragonsDescent.xml b/Patches/Dragons Descent/Scenarios/Scenarios_DragonsDescent.xml
deleted file mode 100644
index deab1ea65d..0000000000
--- a/Patches/Dragons Descent/Scenarios/Scenarios_DragonsDescent.xml	
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dragons Descent</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="DragonThieves"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_Arrow_Stone</thingDef>
-							<count>100</count>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dragons Descent/ThingDefs_Items/Items_Exotic.xml b/Patches/Dragons Descent/ThingDefs_Items/Items_Exotic.xml
deleted file mode 100644
index 45ef453813..0000000000
--- a/Patches/Dragons Descent/ThingDefs_Items/Items_Exotic.xml	
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dragons Descent</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === DragonHorn === -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="DragonHorn"]/tools</xpath>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DragonHorn"]/statBases/Mass</xpath>
-					<value>
-						<Mass>50</Mass>
-						<Bulk>25</Bulk>
-					</value>
-				</li>
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="DragonHorn"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>ResourceBase</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dragons Descent/ThingDefs_Items/Items_Resource_Leather.xml b/Patches/Dragons Descent/ThingDefs_Items/Items_Resource_Leather.xml
deleted file mode 100644
index bcb01cfaf1..0000000000
--- a/Patches/Dragons Descent/ThingDefs_Items/Items_Resource_Leather.xml	
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dragons Descent</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Dragon_Leather === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Dragon_Leather"]/statBases/StuffPower_Armor_Sharp</xpath>
-
-					<value>
-						<StuffPower_Armor_Sharp>0.907</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Dragon_Leather"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.24</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Dragon_Leather"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.178</StuffPower_Armor_Heat>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Dragon_Leather"]/stuffProps</xpath>
-					<value>
-						<categories>
-							<li>SoftArmor</li>
-						</categories>
-					</value>
-				</li>
-				<!-- === Rare_Dragon_Leather === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Rare_Dragon_Leather"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1.079</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Rare_Dragon_Leather"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.279</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Rare_Dragon_Leather"]/statBases/StuffPower_Armor_Heat</xpath>
-
-					<value>
-						<StuffPower_Armor_Heat>0.2</StuffPower_Armor_Heat>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Rare_Dragon_Leather"]/stuffProps</xpath>
-					<value>
-						<categories>
-							<li>SoftArmor</li>
-						</categories>
-					</value>
-				</li>
-				<!-- === True_Dragon_Leather === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="True_Dragon_Leather"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1.282</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="True_Dragon_Leather"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.324</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="True_Dragon_Leather"]/statBases/StuffPower_Armor_Heat</xpath>
-
-					<value>
-						<StuffPower_Armor_Heat>0.226</StuffPower_Armor_Heat>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="True_Dragon_Leather"]/stuffProps</xpath>
-					<value>
-						<categories>
-							<li>SoftArmor</li>
-						</categories>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dragons Descent/ThingDefs_Items/Items_Resource_Scale.xml b/Patches/Dragons Descent/ThingDefs_Items/Items_Resource_Scale.xml
deleted file mode 100644
index 1fa9c7477c..0000000000
--- a/Patches/Dragons Descent/ThingDefs_Items/Items_Resource_Scale.xml	
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dragons Descent</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Hard Scale === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="HardScale"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="HardScale"]/stuffProps/categories</xpath>
-					<value>
-						<li>Metallic_Weapon</li>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="HardScale"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1.02</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="HardScale"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1.6</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="HardScale"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.2</StuffPower_Armor_Heat>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dragons Descent/ThingDefs_Misc/Apparel_Headgear.xml b/Patches/Dragons Descent/ThingDefs_Misc/Apparel_Headgear.xml
deleted file mode 100644
index d45c0b0d1d..0000000000
--- a/Patches/Dragons Descent/ThingDefs_Misc/Apparel_Headgear.xml	
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dragons Descent</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- scale helmet -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DD_Apparel_ScaleHelm"]/statBases</xpath>
-					<value>
-						<Bulk>4.25</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DD_Apparel_ScaleHelm"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DD_Apparel_ScaleHelm"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>UpperHead</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-				<!-- dragon crown -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DD_Apparel_DragonCrown"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DD_Apparel_DragonCrown"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<AimingAccuracy>-0.1</AimingAccuracy>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dragons Descent/ThingDefs_Misc/Apparel_Various.xml b/Patches/Dragons Descent/ThingDefs_Misc/Apparel_Various.xml
deleted file mode 100644
index bb01c5c4b3..0000000000
--- a/Patches/Dragons Descent/ThingDefs_Misc/Apparel_Various.xml	
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dragons Descent</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- scale mail -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DD_Apparel_ScaleMail"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DD_Apparel_ScaleMail"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DD_Apparel_ScaleMail"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeDodgeChance>-0.1</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<!-- wing cape -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DD_Apparel_WingCape"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>7</Bulk>
-						<WornBulk>2.5</WornBulk>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dragons Descent/ThingDefs_Misc/Weapons/MeleeDD.xml b/Patches/Dragons Descent/ThingDefs_Misc/Weapons/MeleeDD.xml
deleted file mode 100644
index b646661e99..0000000000
--- a/Patches/Dragons Descent/ThingDefs_Misc/Weapons/MeleeDD.xml	
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dragons Descent</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- horned lance -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DD_MeleeWeapon_HornedLance"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<MeleeCounterParryBonus>1.34</MeleeCounterParryBonus>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DD_MeleeWeapon_HornedLance"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.11</MeleeCritChance>
-							<MeleeParryChance>1.16</MeleeParryChance>
-							<MeleeDodgeChance>0.9</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DD_MeleeWeapon_HornedLance"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.43</cooldownTime>
-								<armorPenetrationBlunt>2.813</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.89</cooldownTime>
-								<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.25</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>6.98</cooldownTime>
-								<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- drachen sword -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DD_MeleeWeapon_DrachenSword"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>1.04</MeleeCounterParryBonus>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DD_MeleeWeapon_DrachenSword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.37</MeleeCritChance>
-							<MeleeParryChance>0.78</MeleeParryChance>
-							<MeleeDodgeChance>0.47</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DD_MeleeWeapon_DrachenSword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.81</cooldownTime>
-								<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>1.74</cooldownTime>
-								<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.8</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>1.72</cooldownTime>
-								<armorPenetrationBlunt>2.916</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.65</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- thrumbo battle axe -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DDMeleeWeapon_ThrumboBattleAxe"]/statBases</xpath>
-					<value>
-						<Bulk>13</Bulk>
-						<MeleeCounterParryBonus>1.5</MeleeCounterParryBonus>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DDMeleeWeapon_ThrumboBattleAxe"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.3</MeleeCritChance>
-							<MeleeParryChance>1.6</MeleeParryChance>
-							<MeleeDodgeChance>0.56</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DDMeleeWeapon_ThrumboBattleAxe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.93</cooldownTime>
-								<armorPenetrationBlunt>3.8</armorPenetrationBlunt>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>60</power>
-								<cooldownTime>4.82</cooldownTime>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-								<armorPenetrationSharp>18.62</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- focusing tome -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DDMeleeWeapon_FocusingTome"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<MeleeCounterParryBonus>0.14</MeleeCounterParryBonus>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DDMeleeWeapon_FocusingTome"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.23</MeleeCritChance>
-						<MeleeParryChance>0.14</MeleeParryChance>
-						<MeleeDodgeChance>0.07</MeleeDodgeChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DDMeleeWeapon_FocusingTome"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>spine</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2.0</cooldownTime>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DDMeleeWeapon_FocusingTome"]</xpath>
-					<value>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dragons Descent/ThingDefs_Misc/Weapons/RangedDD.xml b/Patches/Dragons Descent/ThingDefs_Misc/Weapons/RangedDD.xml
deleted file mode 100644
index 3a5086ae89..0000000000
--- a/Patches/Dragons Descent/ThingDefs_Misc/Weapons/RangedDD.xml	
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dragons Descent</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- dragonfire launcher -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DD_Gun_DragonfireLauncher</defName>
-					<statBases>
-						<MarketValue>3000</MarketValue>
-						<WorkToMake>43000</WorkToMake>
-						<Mass>8.9</Mass>
-						<RangedWeapon_Cooldown>0.52</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.82</SwayFactor>
-						<Bulk>11</Bulk>
-					</statBases>
-					<costList>
-						<Steel>75</Steel>
-						<Plasteel>30</Plasteel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-						<Chemfuel>11</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>2.9</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_30x64mmFuel_Incendiary</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>43</range>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<burstShotCount>3</burstShotCount>
-						<soundCast>Shot_IncendiaryLauncher</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>9</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_30x64mmFuel</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AOE</li>
-						<li>EliteGun</li>
-					</weaponTags>
-					<researchPrerequisite>CE_AdvancedLaunchers</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DD_Gun_DragonfireLauncher"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.55</cooldownTime>
-								<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>
-				</li>
-				<!-- double crossbow -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DD_Bow_DoubleCrossbow</defName>
-					<statBases>
-						<MarketValue>300</MarketValue>
-						<WorkToMake>19000</WorkToMake>
-						<Mass>5.9</Mass>
-						<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.58</ShotSpread>
-						<SwayFactor>1.10</SwayFactor>
-						<Bulk>9</Bulk>
-					</statBases>
-					<costList>
-						<Steel>35</Steel>
-						<WoodLog>70</WoodLog>
-					</costList>
-					<Properties>
-						<recoilAmount>2.3</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_CrossbowBolt_Steel</defaultProjectile>
-						<warmupTime>1.4</warmupTime>
-						<range>21</range>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<burstShotCount>2</burstShotCount>
-						<soundCast>Bow_Recurve</soundCast>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>2</magazineSize>
-						<reloadTime>6.5</reloadTime>
-						<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>NeolithicRangedHeavy</li>
-						<li>NeolithicRangedChief</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DD_Bow_DoubleCrossbow"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.65</cooldownTime>
-								<armorPenetrationBlunt>0.67</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dragons Descent/ThingDefs_Races/Races_Animal_Common_Dragon.xml b/Patches/Dragons Descent/ThingDefs_Races/Races_Animal_Common_Dragon.xml
deleted file mode 100644
index 1c200a9d3f..0000000000
--- a/Patches/Dragons Descent/ThingDefs_Races/Races_Animal_Common_Dragon.xml	
+++ /dev/null
@@ -1,485 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dragons Descent</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ======== Common Dragons ======== -->
-				<!-- ====== Tools ====== -->
-				<!-- ==== Base Tools ==== -->
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName="Black_Dragon" or
-						defName="Blue_Dragon" or
-						defName="Green_Dragon" or
-						defName="Purple_Dragon" or
-						defName="Red_Dragon" or
-						defName="White_Dragon" or
-						defName="Yellow_Dragon"]/tools
-					</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>DD_Knockback</label>
-								<capacities>
-									<li>DD_Knockback</li>
-								</capacities>
-								<power>110</power>
-								<armorPenetrationBlunt>115.115</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-								<cooldownTime>4.0</cooldownTime>
-								<linkedBodyPartsGroup>Tail</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ==== Blue, Green, Purple, White, Yellow Claws and Horns ==== -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/ThingDef[
-						defName="Blue_Dragon" or
-						defName="Green_Dragon" or
-						defName="Purple_Dragon" or
-						defName="White_Dragon" or
-						defName="Yellow_Dragon"]/tools
-					</xpath>
-					<value>
-						<li Class="CombatExtended.ToolCE">
-							<label>left claw</label>
-							<capacities>
-								<li>Scratch</li>
-								<li>Cut</li>
-								<li>Stab</li>
-							</capacities>
-							<power>76</power>
-							<cooldownTime>3</cooldownTime>
-							<armorPenetrationSharp>16.09</armorPenetrationSharp>
-							<armorPenetrationBlunt>120.417</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>right claw</label>
-							<capacities>
-								<li>Scratch</li>
-								<li>Cut</li>
-								<li>Stab</li>
-							</capacities>
-							<power>76</power>
-							<cooldownTime>3</cooldownTime>
-							<armorPenetrationSharp>16.09</armorPenetrationSharp>
-							<armorPenetrationBlunt>120.417</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>horn</label>
-							<capacities>
-								<li>Cut</li>
-							</capacities>
-							<surpriseAttack>
-								<extraMeleeDamages>
-									<li>
-										<def>Stun</def>
-										<amount>30</amount>
-									</li>
-								</extraMeleeDamages>
-							</surpriseAttack>
-							<power>69</power>
-							<cooldownTime>5.68</cooldownTime>
-							<armorPenetrationSharp>3</armorPenetrationSharp>
-							<armorPenetrationBlunt>24.725</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Horns</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>horn</label>
-							<capacities>
-								<li>Stab</li>
-							</capacities>
-							<surpriseAttack>
-								<extraMeleeDamages>
-									<li>
-										<def>Stun</def>
-										<amount>30</amount>
-									</li>
-								</extraMeleeDamages>
-							</surpriseAttack>
-							<power>38</power>
-							<cooldownTime>5.68</cooldownTime>
-							<armorPenetrationSharp>14</armorPenetrationSharp>
-							<armorPenetrationBlunt>21.725</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Horns</linkedBodyPartsGroup>
-						</li>
-					</value>
-				</li>
-				<!-- ==== Black, Purple, Yellow Dragon Teeth === -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/ThingDef[
-						defName="Black_Dragon" or
-						defName="Purple_Dragon" or
-						defName="Yellow_Dragon"]/tools
-					</xpath>
-					<value>
-						<li Class="CombatExtended.ToolCE">
-							<label>teeth</label>
-							<capacities>
-								<li>Bite</li>
-								<li>Cut</li>
-								<li>Stab</li>
-							</capacities>
-							<power>86</power>
-							<cooldownTime>3.7</cooldownTime>
-							<armorPenetrationSharp>26.75</armorPenetrationSharp>
-							<armorPenetrationBlunt>301.042</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-						</li>
-					</value>
-				</li>
-				<!-- ==== Purple, White, Yellow Dragon Skull bash -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/ThingDef[
-						defName="Purple_Dragon" or
-						defName="White_Dragon" or
-						defName="Yellow_Dragon"]/tools
-					</xpath>
-					<value>
-						<li Class="CombatExtended.ToolCE">
-							<cooldownTime>5.48</cooldownTime>
-							<power>120</power>
-							<capacities>
-								<li>Skull_Bash</li>
-							</capacities>
-							<surpriseAttack>
-								<extraMeleeDamages>
-									<li>
-										<def>Stun</def>
-										<amount>20</amount>
-									</li>
-								</extraMeleeDamages>
-							</surpriseAttack>
-							<linkedBodyPartsGroup>Horns</linkedBodyPartsGroup>
-							<label>head</label>
-							<armorPenetrationBlunt>75.26</armorPenetrationBlunt>
-						</li>
-					</value>
-				</li>
-				<!-- ==== Purple, Red, White, Yellow Tail whip replace ==== -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/ThingDef[
-						defName="Purple_Dragon" or
-						defName="Red_Dragon" or
-						defName="White_Dragon" or
-						defName="Yellow_Dragon"]/tools
-					</xpath>
-					<value>
-						<li Class="CombatExtended.ToolCE">
-							<cooldownTime>4.66</cooldownTime>
-							<power>107</power>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<surpriseAttack>
-								<extraMeleeDamages>
-									<li>
-										<def>Stun</def>
-										<amount>20</amount>
-									</li>
-								</extraMeleeDamages>
-							</surpriseAttack>
-							<linkedBodyPartsGroup>Tail</linkedBodyPartsGroup>
-							<label>tail</label>
-							<armorPenetrationBlunt>54.611</armorPenetrationBlunt>
-						</li>
-					</value>
-				</li>
-				<!-- ==== Base Verbs ==== -->
-				<!-- In game only one projectile gets chosen for the dragons when tamed deselect/select options -->
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName="Black_Dragon" or
-						defName="Blue_Dragon" or
-						defName="Green_Dragon" or
-						defName="Purple_Dragon" or
-						defName="Red_Dragon" or
-						defName="White_Dragon" or
-						defName="Yellow_Dragon"]/verbs
-					</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Projectile_RedDragonBreath_Fire_CE</defaultProjectile>
-								<warmupTime>1.4</warmupTime>
-								<burstShotCount>10</burstShotCount>
-								<minRange>4</minRange>
-								<range>24</range>
-								<soundCast>DragonBreathShot</soundCast>
-								<muzzleFlashScale>2</muzzleFlashScale>
-								<label>Fire Breath</label>
-								<commonality>0.2</commonality>
-								<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-							</li>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Projectile_DragonSpitBlunt</defaultProjectile>
-								<warmupTime>2.2</warmupTime>
-								<minRange>5</minRange>
-								<range>32</range>
-								<burstShotCount>2</burstShotCount>
-								<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
-								<soundCast>DragonBreathFire</soundCast>
-								<muzzleFlashScale>1</muzzleFlashScale>
-								<label>Dragon Spit</label>
-								<commonality>0.3</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-				<!-- ==== Unique Tools and Verbs ==== -->
-				<!-- == Black Dragon == -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Black_Dragon"]/tools</xpath>
-					<value>
-						<li Class="CombatExtended.ToolCE">
-							<label>left claw</label>
-							<capacities>
-								<li>Scratch</li>
-								<li>Cut</li>
-								<li>Stab</li>
-							</capacities>
-							<power>73</power>
-							<cooldownTime>3</cooldownTime>
-							<armorPenetrationSharp>15.93</armorPenetrationSharp>
-							<armorPenetrationBlunt>120.350</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>right claw</label>
-							<capacities>
-								<li>Scratch</li>
-								<li>Cut</li>
-								<li>Stab</li>
-							</capacities>
-							<power>73</power>
-							<cooldownTime>3</cooldownTime>
-							<armorPenetrationSharp>15.93</armorPenetrationSharp>
-							<armorPenetrationBlunt>120.350</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>horn</label>
-							<capacities>
-								<li>Cut</li>
-							</capacities>
-							<surpriseAttack>
-								<extraMeleeDamages>
-									<li>
-										<def>Stun</def>
-										<amount>30</amount>
-									</li>
-								</extraMeleeDamages>
-							</surpriseAttack>
-							<power>66</power>
-							<cooldownTime>5.68</cooldownTime>
-							<armorPenetrationSharp>2.98</armorPenetrationSharp>
-							<armorPenetrationBlunt>24.718</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Horns</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>horn</label>
-							<capacities>
-								<li>Stab</li>
-							</capacities>
-							<surpriseAttack>
-								<extraMeleeDamages>
-									<li>
-										<def>Stun</def>
-										<amount>30</amount>
-									</li>
-								</extraMeleeDamages>
-							</surpriseAttack>
-							<power>35</power>
-							<cooldownTime>5.68</cooldownTime>
-							<armorPenetrationSharp>13.89</armorPenetrationSharp>
-							<armorPenetrationBlunt>21.709</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Horns</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<cooldownTime>3.04</cooldownTime>
-							<power>100</power>
-							<capacities>
-								<li>Rend</li>
-							</capacities>
-							<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-							<label>teeth</label>
-							<armorPenetrationSharp>30.67</armorPenetrationSharp>
-							<armorPenetrationBlunt>677.344</armorPenetrationBlunt>
-						</li>
-					</value>
-				</li>
-				<!-- == Blue Dragon == -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Blue_Dragon"]/tools</xpath>
-					<value>
-						<li Class="CombatExtended.ToolCE">
-							<cooldownTime>2.86</cooldownTime>
-							<power>90</power>
-							<capacities>
-								<li>Frost_Bite</li>
-							</capacities>
-							<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-							<label>teeth</label>
-							<armorPenetrationSharp>25.26</armorPenetrationSharp>
-							<armorPenetrationBlunt>460.97</armorPenetrationBlunt>
-						</li>
-					</value>
-				</li>
-				<!-- == Green Dragon == -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Green_Dragon"]/tools</xpath>
-					<value>
-						<li Class="CombatExtended.ToolCE">
-							<cooldownTime>3.6</cooldownTime>
-							<power>100</power>
-							<capacities>
-								<li>ToxicBite</li>
-							</capacities>
-							<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-							<label>teeth</label>
-							<armorPenetrationSharp>24.26</armorPenetrationSharp>
-							<armorPenetrationBlunt>460.97</armorPenetrationBlunt>
-						</li>
-					</value>
-				</li>
-				<!-- == Purple Dragon == -->
-
-				<!-- == Red Dragon == -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Red_Dragon"]/tools</xpath>
-					<value>
-						<li Class="CombatExtended.ToolCE">
-							<label>left claw</label>
-							<capacities>
-								<li>Scratch</li>
-								<li>Cut</li>
-								<li>Stab</li>
-							</capacities>
-							<power>81</power>
-							<cooldownTime>3</cooldownTime>
-							<armorPenetrationSharp>16.32</armorPenetrationSharp>
-							<armorPenetrationBlunt>120.447</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>right claw</label>
-							<capacities>
-								<li>Scratch</li>
-								<li>Cut</li>
-								<li>Stab</li>
-							</capacities>
-							<power>81</power>
-							<cooldownTime>3</cooldownTime>
-							<armorPenetrationSharp>16.32</armorPenetrationSharp>
-							<armorPenetrationBlunt>120.447</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>horn</label>
-							<capacities>
-								<li>Cut</li>
-							</capacities>
-							<surpriseAttack>
-								<extraMeleeDamages>
-									<li>
-										<def>Stun</def>
-										<amount>30</amount>
-									</li>
-								</extraMeleeDamages>
-							</surpriseAttack>
-							<power>74</power>
-							<cooldownTime>5.68</cooldownTime>
-							<armorPenetrationSharp>3.016</armorPenetrationSharp>
-							<armorPenetrationBlunt>24.760</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Horns</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>horn</label>
-							<capacities>
-								<li>Stab</li>
-							</capacities>
-							<surpriseAttack>
-								<extraMeleeDamages>
-									<li>
-										<def>Stun</def>
-										<amount>30</amount>
-									</li>
-								</extraMeleeDamages>
-							</surpriseAttack>
-							<power>41</power>
-							<cooldownTime>5.68</cooldownTime>
-							<armorPenetrationSharp>14.025</armorPenetrationSharp>
-							<armorPenetrationBlunt>21.760</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Horns</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<cooldownTime>3.3</cooldownTime>
-							<power>100</power>
-							<capacities>
-								<li>Pyro_Bite</li>
-							</capacities>
-							<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-							<label>teeth</label>
-							<armorPenetrationSharp>24.26</armorPenetrationSharp>
-							<armorPenetrationBlunt>460.97</armorPenetrationBlunt>
-							<chanceFactor>0.1</chanceFactor>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<cooldownTime>4.66</cooldownTime>
-							<power>130</power>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<surpriseAttack>
-								<extraMeleeDamages>
-									<li>
-										<def>Stun</def>
-										<amount>20</amount>
-									</li>
-								</extraMeleeDamages>
-							</surpriseAttack>
-							<linkedBodyPartsGroup>Tail</linkedBodyPartsGroup>
-							<label>tail</label>
-							<armorPenetrationBlunt>60.233</armorPenetrationBlunt>
-						</li>
-					</value>
-				</li>
-
-				<!-- == White Dragon == -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="White_Dragon"]/tools</xpath>
-					<value>
-						<li Class="CombatExtended.ToolCE">
-							<cooldownTime>2.12</cooldownTime>
-							<power>111</power>
-							<capacities>
-								<li>Frost_Bite</li>
-							</capacities>
-							<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-							<label>teeth</label>
-							<armorPenetrationSharp>7.26</armorPenetrationSharp>
-							<armorPenetrationBlunt>460.97</armorPenetrationBlunt>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dragons Descent/ThingDefs_Races/Races_Animal_Dragon_Base.xml b/Patches/Dragons Descent/ThingDefs_Races/Races_Animal_Dragon_Base.xml
deleted file mode 100644
index 9b0cfd9162..0000000000
--- a/Patches/Dragons Descent/ThingDefs_Races/Races_Animal_Dragon_Base.xml	
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dragons Descent</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======== BaseDragon (Dragon Base) ======== -->
-				<!-- ====== ModExtension ====== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="BaseDragon"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- ======== DragonRaceBase (Common Dragon Base) ======== -->
-				<!-- ====== statBases ====== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="DragonRaceBase"]/statBases</xpath>
-					<value>
-						<MeleeCritChance>1.75</MeleeCritChance>
-						<MeleeParryChance>0.54</MeleeParryChance>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="DragonRaceBase"]/statBases/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.13</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="DragonRaceBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>40</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="DragonRaceBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="DragonRaceBase"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>4250</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<!-- ======== RDragonRaceBase (Rare Dragon Base) ======== -->
-				<!-- ====== statBases ====== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RDragonRaceBase"]/statBases</xpath>
-					<value>
-						<MeleeCritChance>1.96</MeleeCritChance>
-						<MeleeParryChance>0.64</MeleeParryChance>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1.75</ShootingAccuracyPawn>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RDragonRaceBase"]/statBases/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.13</MeleeDodgeChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RDragonRaceBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>48</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RDragonRaceBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>19.2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RDragonRaceBase"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>5075</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dragons Descent/ThingDefs_Races/Races_Animal_Rare_Dragon.xml b/Patches/Dragons Descent/ThingDefs_Races/Races_Animal_Rare_Dragon.xml
deleted file mode 100644
index cf099b162f..0000000000
--- a/Patches/Dragons Descent/ThingDefs_Races/Races_Animal_Rare_Dragon.xml	
+++ /dev/null
@@ -1,442 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dragons Descent</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ======== Rare Dragons ======== -->
-				<!-- ====== Tools ====== -->
-				<!-- ==== Base Tools ==== -->
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName="Gold_Dragon" or
-						defName="Silver_Dragon" or
-						defName="Jade_Dragon" or
-						defName="True_Dragon"]/tools
-					</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>DD_Knockback</label>
-								<capacities>
-									<li>DD_Knockback</li>
-								</capacities>
-								<power>110</power>
-								<armorPenetrationBlunt>115.115</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-								<cooldownTime>4.0</cooldownTime>
-								<linkedBodyPartsGroup>Tail</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/ThingDef[
-						defName="Gold_Dragon" or
-						defName="Silver_Dragon" or
-						defName="True_Dragon"]/tools
-					</xpath>
-					<value>
-						<li Class="CombatExtended.ToolCE">
-							<label>left claw</label>
-							<capacities>
-								<li>Scratch</li>
-								<li>Cut</li>
-								<li>Stab</li>
-							</capacities>
-							<power>100</power>
-							<cooldownTime>3.01</cooldownTime>
-							<chanceFactor>0.3</chanceFactor>
-							<armorPenetrationSharp>22.11</armorPenetrationSharp>
-							<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-							<armorPenetrationBlunt>150.521</armorPenetrationBlunt>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>right claw</label>
-							<capacities>
-								<li>Scratch</li>
-								<li>Cut</li>
-								<li>Stab</li>
-							</capacities>
-							<power>100</power>
-							<cooldownTime>3.01</cooldownTime>
-							<chanceFactor>0.3</chanceFactor>
-							<armorPenetrationSharp>22.11</armorPenetrationSharp>
-							<armorPenetrationBlunt>150.521</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/ThingDef[
-						defName="Gold_Dragon" or
-						defName="Silver_Dragon"]/tools
-					</xpath>
-					<value>
-						<li Class="CombatExtended.ToolCE">
-							<cooldownTime>5.64</cooldownTime>
-							<power>100</power>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<surpriseAttack>
-								<extraMeleeDamages>
-									<li>
-										<def>Stun</def>
-										<amount>20</amount>
-									</li>
-								</extraMeleeDamages>
-							</surpriseAttack>
-							<linkedBodyPartsGroup>Tail</linkedBodyPartsGroup>
-							<label>tail</label>
-							<armorPenetrationBlunt>62.365</armorPenetrationBlunt>
-							<chanceFactor>0.1</chanceFactor>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>horn</label>
-							<capacities>
-								<li>Cut</li>
-							</capacities>
-							<surpriseAttack>
-								<extraMeleeDamages>
-									<li>
-										<def>Stun</def>
-										<amount>30</amount>
-									</li>
-								</extraMeleeDamages>
-							</surpriseAttack>
-							<power>100</power>
-							<cooldownTime>5.75</cooldownTime>
-							<chanceFactor>0.1</chanceFactor>
-							<armorPenetrationSharp>13.162</armorPenetrationSharp>
-							<armorPenetrationBlunt>26.345</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Horns</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>horn</label>
-							<capacities>
-								<li>Stab</li>
-							</capacities>
-							<surpriseAttack>
-								<extraMeleeDamages>
-									<li>
-										<def>Stun</def>
-										<amount>30</amount>
-									</li>
-								</extraMeleeDamages>
-							</surpriseAttack>
-							<power>65</power>
-							<cooldownTime>5.75</cooldownTime>
-							<chanceFactor>0.1</chanceFactor>
-							<armorPenetrationSharp>22.869</armorPenetrationSharp>
-							<armorPenetrationBlunt>22.795</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Horns</linkedBodyPartsGroup>
-						</li>
-					</value>
-				</li>
-				<!-- ==== Common Verbs ==== -->
-				<!-- In game only one projectile gets chosen for the dragons when tamed deselect/select options -->
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName="Gold_Dragon" or
-						defName="Silver_Dragon" or
-						defName="Jade_Dragon" or
-						defName="True_Dragon"]/verbs
-					</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Projectile_RedDragonBreath_Fire_CE</defaultProjectile>
-								<warmupTime>1.2</warmupTime>
-								<burstShotCount>10</burstShotCount>
-								<minRange>4</minRange>
-								<range>24</range>
-								<soundCast>DragonBreathShot</soundCast>
-								<muzzleFlashScale>2</muzzleFlashScale>
-								<label>Fire Breath</label>
-								<commonality>0.2</commonality>
-								<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-							</li>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Projectile_DragonSpitBlunt</defaultProjectile>
-								<warmupTime>2.0</warmupTime>
-								<minRange>5</minRange>
-								<range>34</range>
-								<burstShotCount>2</burstShotCount>
-								<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
-								<soundCast>DragonBreathFire</soundCast>
-								<muzzleFlashScale>1</muzzleFlashScale>
-								<label>Dragon Spit</label>
-								<commonality>0.3</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-				<!-- ==== Unique Tools ==== -->
-				<!-- == Gold Dragon == -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Gold_Dragon"]/tools</xpath>
-					<value>
-						<li Class="CombatExtended.ToolCE">
-							<cooldownTime>2.84</cooldownTime>
-							<power>122</power>
-							<capacities>
-								<li>Pyro_Bite</li>
-							</capacities>
-							<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-							<label>teeth</label>
-							<armorPenetrationSharp>31.08</armorPenetrationSharp>
-							<armorPenetrationBlunt>576.213</armorPenetrationBlunt>
-							<chanceFactor>0.1</chanceFactor>
-						</li>
-					</value>
-				</li>
-				<!-- == Silver Dragon == -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Silver_Dragon"]/tools</xpath>
-					<value>
-						<li Class="CombatExtended.ToolCE">
-							<cooldownTime>2.84</cooldownTime>
-							<power>122</power>
-							<capacities>
-								<li>Frost_Bite</li>
-							</capacities>
-							<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-							<label>teeth</label>
-							<armorPenetrationSharp>24.08</armorPenetrationSharp>
-							<armorPenetrationBlunt>576.213</armorPenetrationBlunt>
-							<chanceFactor>0.1</chanceFactor>
-						</li>
-					</value>
-				</li>
-				<!-- == Jade Dragon == -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Jade_Dragon"]/tools</xpath>
-					<value>
-						<li Class="CombatExtended.ToolCE">
-							<label>left claw</label>
-							<capacities>
-								<li>Scratch</li>
-							</capacities>
-							<power>98</power>
-							<cooldownTime>3.01</cooldownTime>
-							<chanceFactor>0.3</chanceFactor>
-							<armorPenetrationSharp>26.50</armorPenetrationSharp>
-							<armorPenetrationBlunt>150.496</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>right claw</label>
-							<capacities>
-								<li>Scratch</li>
-							</capacities>
-							<power>98</power>
-							<cooldownTime>3.01</cooldownTime>
-							<chanceFactor>0.3</chanceFactor>
-							<armorPenetrationSharp>26.50</armorPenetrationSharp>
-							<armorPenetrationBlunt>150.496</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>teeth</label>
-							<capacities>
-								<li>ToxicBite</li>
-							</capacities>
-							<power>122</power>
-							<cooldownTime>2.84</cooldownTime>
-							<chanceFactor>0.1</chanceFactor>
-							<armorPenetrationSharp>24.08</armorPenetrationSharp>
-							<armorPenetrationBlunt>576.213</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>horn</label>
-							<capacities>
-								<li>Cut</li>
-							</capacities>
-							<surpriseAttack>
-								<extraMeleeDamages>
-									<li>
-										<def>Stun</def>
-										<amount>30</amount>
-									</li>
-								</extraMeleeDamages>
-							</surpriseAttack>
-							<power>72</power>
-							<cooldownTime>5.75</cooldownTime>
-							<chanceFactor>0.1</chanceFactor>
-							<armorPenetrationSharp>9.356</armorPenetrationSharp>
-							<armorPenetrationBlunt>19.867</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Horns</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>horn</label>
-							<capacities>
-								<li>Stab</li>
-							</capacities>
-							<surpriseAttack>
-								<extraMeleeDamages>
-									<li>
-										<def>Stun</def>
-										<amount>30</amount>
-									</li>
-								</extraMeleeDamages>
-							</surpriseAttack>
-							<power>38</power>
-							<cooldownTime>5.75</cooldownTime>
-							<chanceFactor>0.1</chanceFactor>
-							<armorPenetrationSharp>18.265</armorPenetrationSharp>
-							<armorPenetrationBlunt>18.186</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Horns</linkedBodyPartsGroup>
-						</li>
-					</value>
-				</li>
-
-				<!-- ======== True Dragon ======== -->
-				<!-- ====== statBases ====== -->
-				<!-- <li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="True_Dragon"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.14</MeleeDodgeChance>
-						<MeleeCritChance>2.34</MeleeCritChance>
-						<MeleeParryChance>0.64</MeleeParryChance>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>2.0</ShootingAccuracyPawn>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="True_Dragon"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>57.5</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="True_Dragon"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>23</ArmorRating_Sharp>
-					</value>
-				</li> -->
-
-				<!-- ====== Tools ====== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="True_Dragon"]/tools</xpath>
-					<value>
-						<li Class="CombatExtended.ToolCE">
-							<label>teeth</label>
-							<capacities>
-								<li>Pyro_Bite</li>
-							</capacities>
-							<power>128</power>
-							<cooldownTime>3.0</cooldownTime>
-							<chanceFactor>0.2</chanceFactor>
-							<armorPenetrationSharp>36.18</armorPenetrationSharp>
-							<armorPenetrationBlunt>645.996</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>teeth</label>
-							<capacities>
-								<li>ToxicBite</li>
-							</capacities>
-							<power>128</power>
-							<cooldownTime>3.0</cooldownTime>
-							<chanceFactor>0.2</chanceFactor>
-							<armorPenetrationSharp>36.18</armorPenetrationSharp>
-							<armorPenetrationBlunt>645.996</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>horn</label>
-							<capacities>
-								<li>Cut</li>
-							</capacities>
-							<surpriseAttack>
-								<extraMeleeDamages>
-									<li>
-										<def>Stun</def>
-										<amount>30</amount>
-									</li>
-								</extraMeleeDamages>
-							</surpriseAttack>
-							<power>80</power>
-							<cooldownTime>5.1</cooldownTime>
-							<chanceFactor>0.05</chanceFactor>
-							<armorPenetrationSharp>16.18</armorPenetrationSharp>
-							<armorPenetrationBlunt>30.438</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Horns</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>horn</label>
-							<capacities>
-								<li>Stab</li>
-							</capacities>
-							<surpriseAttack>
-								<extraMeleeDamages>
-									<li>
-										<def>Stun</def>
-										<amount>30</amount>
-									</li>
-								</extraMeleeDamages>
-							</surpriseAttack>
-							<power>43</power>
-							<cooldownTime>5.1</cooldownTime>
-							<chanceFactor>0.1</chanceFactor>
-							<armorPenetrationSharp>24.35</armorPenetrationSharp>
-							<armorPenetrationBlunt>23.438</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Horns</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>skull bash</label>
-							<capacities>
-								<li>Skull_Bash</li>
-							</capacities>
-							<surpriseAttack>
-								<extraMeleeDamages>
-									<li>
-										<def>Stun</def>
-										<amount>20</amount>
-									</li>
-								</extraMeleeDamages>
-							</surpriseAttack>
-							<power>148</power>
-							<cooldownTime>7.8</cooldownTime>
-							<chanceFactor>0.05</chanceFactor>
-							<armorPenetrationBlunt>105.469</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Horns</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>tail</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<surpriseAttack>
-								<extraMeleeDamages>
-									<li>
-										<def>Stun</def>
-										<amount>20</amount>
-									</li>
-								</extraMeleeDamages>
-							</surpriseAttack>
-							<power>124</power>
-							<cooldownTime>5.65</cooldownTime>
-							<chanceFactor>0.1</chanceFactor>
-							<armorPenetrationBlunt>76.531</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Tail</linkedBodyPartsGroup>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dubs Rimatomics/Apparel_Atomic.xml b/Patches/Dubs Rimatomics/Apparel_Atomic.xml
deleted file mode 100644
index aac912a6fc..0000000000
--- a/Patches/Dubs Rimatomics/Apparel_Atomic.xml	
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dubs Rimatomics</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Radiation Suits === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RadSuitBodyBase" or defName = "Apparel_RadiationSuit"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="MopSuitBodyBase" or defName = "Apparel_RadiationSuit"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>4</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="MopSuitBodyBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="MopSuitBodyBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- === Radiation Masks === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RadSuitMaskBase"]/equippedStatOffsets</xpath>
-					<value>
-						<AimingAccuracy>-0.1</AimingAccuracy>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[@Name="RadSuitMaskBase"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[@Name="RadSuitMaskBase"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RadSuitMaskBase"]/apparel/layers</xpath>
-					<value>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="RadSuitMaskBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.ApparelHediffExtension">
-							<hediff>WearingGasMask</hediff>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_RadiationMask"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.35</ArmorRating_Sharp>
-						<Bulk>4</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_RadiationMask"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="MopSuitMaskBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-						<Bulk>7</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="MopSuitMaskBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dubs Rimatomics/Atomics_Trader.xml b/Patches/Dubs Rimatomics/Atomics_Trader.xml
deleted file mode 100644
index 5d47b3ec20..0000000000
--- a/Patches/Dubs Rimatomics/Atomics_Trader.xml	
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dubs Rimatomics</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="Orbital_Rimatomics"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>FSX</thingDef>
-							<countRange>
-								<min>75</min>
-								<max>300</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>Prometheum</thingDef>
-							<countRange>
-								<min>75</min>
-								<max>300</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Ammo</tradeTag>
-							<countRange>
-								<min>500</min>
-								<max>2000</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>6</min>
-								<max>11</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_MediumAmmo</tradeTag>
-							<countRange>
-								<min>70</min>
-								<max>250</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>5</min>
-								<max>10</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_HeavyAmmo</tradeTag>
-							<countRange>
-								<min>20</min>
-								<max>120</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>5</min>
-								<max>8</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Category">
-							<categoryDef>Ammo</categoryDef>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>0</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Turret</tradeTag>
-							<thingDefCountRange>
-								<min>-2</min>
-								<max>4</max>
-							</thingDefCountRange>
-							<countRange>
-								<min>1</min>
-								<max>2</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_Category">
-							<categoryDef>WeaponsTurrets</categoryDef>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>0</max>
-							</thingDefCountRange>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dubs Rimatomics/Damages_LocalInjury.xml b/Patches/Dubs Rimatomics/Damages_LocalInjury.xml
deleted file mode 100644
index de00cab25f..0000000000
--- a/Patches/Dubs Rimatomics/Damages_LocalInjury.xml	
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dubs Rimatomics</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/DamageDef[defName="ArcDischarge"]</xpath>
-					<value>
-						<li Class="CombatExtended.DamageDefExtensionCE">
-							<isAmbientDamage>true</isAmbientDamage>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/DamageDef[defName="LaserDischarge"]</xpath>
-					<value>
-						<li Class="CombatExtended.DamageDefExtensionCE">
-							<harmOnlyOutsideLayers>true</harmOnlyOutsideLayers>
-							<isAmbientDamage>true</isAmbientDamage>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dubs Rimatomics/Turrets_Rimatomics.xml b/Patches/Dubs Rimatomics/Turrets_Rimatomics.xml
deleted file mode 100644
index 292490b33f..0000000000
--- a/Patches/Dubs Rimatomics/Turrets_Rimatomics.xml	
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dubs Rimatomics</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Sabots : Damage Stuff-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[defName="Bomb_Sabot"]/defaultDamage</xpath>
-					<value>
-						<defaultDamage>200</defaultDamage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[defName="Bomb_Sabot"]/defaultArmorPenetration</xpath>
-					<value>
-						<defaultArmorPenetration>120000</defaultArmorPenetration>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[defName="Bomb_DUSabot"]/defaultDamage</xpath>
-					<value>
-						<defaultDamage>800</defaultDamage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[defName="Bomb_DUSabot"]/defaultArmorPenetration</xpath>
-					<value>
-						<defaultArmorPenetration>240000</defaultArmorPenetration>
-					</value>
-				</li>
-
-				<!--Sabots : Projectile Tweaks-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_Sabot"]/projectile/speed</xpath>
-					<value>
-						<speed>500</speed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_Sabot_DU"]/projectile/speed</xpath>
-					<value>
-						<speed>500</speed>
-					</value>
-				</li>
-
-				<!--Sabots : Fire Mission Tweaks-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SabotRoundIncoming"]/skyfaller/explosionDamage</xpath>
-					<value>
-						<explosionDamage>Bomb_Sabot</explosionDamage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DUSabotRoundIncoming"]/skyfaller/explosionDamage</xpath>
-					<value>
-						<explosionDamage>Bomb_DUSabot</explosionDamage>
-					</value>
-				</li>
-
-				<!--Marauder : Damage Stuff-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[defName="Bomb_PlasmaToroid"]/defaultDamage</xpath>
-					<value>
-						<defaultDamage>70</defaultDamage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[defName="Bomb_PlasmaToroid"]/defaultArmorPenetration</xpath>
-					<value>
-						<defaultArmorPenetration>80</defaultArmorPenetration>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_PlasmaToroid"]/projectile/speed</xpath>
-					<value>
-						<speed>300</speed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Bullet_PlasmaToroid"]/projectile/damageAmountBase</xpath>
-				</li>
-
-				<!--Marauder : Range-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Marauder_Railgun"]/verbs/li/range</xpath>
-					<value>
-						<range>86</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Marauder_Railgun"]/EnergyWep/range</xpath>
-					<value>
-						<range>86</range>
-					</value>
-				</li>
-
-				<!--Turrets : Stats-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PPCMarauder" or defName="PPCRailgun"]/statBases</xpath>
-					<value>
-						<ShootingAccuracyTurret>5</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PPCMarauder"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>86</specialDisplayRadius>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="HEL_Laser"]/EnergyWep/range</xpath>
-					<value>
-						<range>62</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="HEL_Laser"]/EnergyWep/cooldownForShot</xpath>
-					<value>
-						<cooldownForShot>8</cooldownForShot>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="HEL_Laser"]/verbs/li/ticksBetweenBurstShots</xpath>
-					<value>
-						<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dumbs' Dachshunds/ThingDefs_Dachshund.xml b/Patches/Dumbs' Dachshunds/ThingDefs_Dachshund.xml
deleted file mode 100644
index 7744d1a6be..0000000000
--- a/Patches/Dumbs' Dachshunds/ThingDefs_Dachshund.xml	
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dumbs' Dachshunds</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ERN_DachshundShorthair" or defName="ERN_DachshundLonghair" or defName="ERN_DachshundWirehair"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.17</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ERN_DachshundShorthair" or defName="ERN_DachshundLonghair" or defName="ERN_DachshundWirehair"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.62</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.62</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.66</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>0.62</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ERN_DachshundShorthair" or defName="ERN_DachshundLonghair" or defName="ERN_DachshundWirehair"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dusk Armory/Apparel_Dusk_Armor.xml b/Patches/Dusk Armory/Apparel_Dusk_Armor.xml
deleted file mode 100644
index f824074a70..0000000000
--- a/Patches/Dusk Armory/Apparel_Dusk_Armor.xml	
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dusk Armory</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DF_Dusk_Reactive" or defName="DF_Dusk_Mesh"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DF_Dusk_Reactive" or defName="DF_Dusk_Mesh"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>400</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DF_Dusk_Reactive" or defName="DF_Dusk_Mesh"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DF_Dusk_Reactive" or defName="DF_Dusk_Mesh"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>36</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dusk Armory/Apparel_Dusk_Cloak.xml b/Patches/Dusk Armory/Apparel_Dusk_Cloak.xml
deleted file mode 100644
index 6257f43021..0000000000
--- a/Patches/Dusk Armory/Apparel_Dusk_Cloak.xml	
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dusk Armory</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DF_Dusk_Cloak" or defName="DF_Dusk_Cloak_Fur"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DF_Dusk_Cloak" or defName="DF_Dusk_Cloak_Fur"]/statBases</xpath>
-					<value>
-						<Bulk>4.5</Bulk>
-						<WornBulk>1.0</WornBulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dusk Armory/Apparel_Dusk_Helmet.xml b/Patches/Dusk Armory/Apparel_Dusk_Helmet.xml
deleted file mode 100644
index cd9e427f89..0000000000
--- a/Patches/Dusk Armory/Apparel_Dusk_Helmet.xml	
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dusk Armory</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DF_Dusk_Helmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.7</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DF_Dusk_Helmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DF_Dusk_Helmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>240</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DF_Dusk_Helmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DF_Dusk_Helmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>36</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DF_Dusk_Helmet"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<PsychicSensitivity>-0.2</PsychicSensitivity>
-							<AimingAccuracy>0.15</AimingAccuracy>
-							<ToxicResistance>0.50</ToxicResistance>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-							<SocialImpact>0.10</SocialImpact>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DF_Dusk_Helmet"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>45</Plasteel>
-						<DevilstrandCloth>20</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DF_Dusk_Helmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dusk Armory/Apparel_Dusk_Hood.xml b/Patches/Dusk Armory/Apparel_Dusk_Hood.xml
deleted file mode 100644
index 49ba96ff60..0000000000
--- a/Patches/Dusk Armory/Apparel_Dusk_Hood.xml	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dusk Armory</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="DF_Hood" or @Name="DF_Hood_Fur"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-						<Bulk>1</Bulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dusk Armory/Apparel_Dusk_Hooded_Helmet.xml b/Patches/Dusk Armory/Apparel_Dusk_Hooded_Helmet.xml
deleted file mode 100644
index 792b5cb0eb..0000000000
--- a/Patches/Dusk Armory/Apparel_Dusk_Hooded_Helmet.xml	
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dusk Armory</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DF_Dusk_Helmet_Hooded"]/statBases</xpath>
-					<value>
-						<Bulk>5.5</Bulk>
-						<WornBulk>1.5</WornBulk>
-						<NightVisionEfficiency_Apparel>0.7</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DF_Dusk_Helmet_Hooded"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DF_Dusk_Helmet_Hooded" or defName="DF_Dusk_Helmet_Hooded_Fur"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>240</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DF_Dusk_Helmet_Hooded"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DF_Dusk_Helmet_Hooded"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>36</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DF_Dusk_Helmet_Hooded"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<PsychicSensitivity>-0.2</PsychicSensitivity>
-							<AimingAccuracy>0.15</AimingAccuracy>
-							<ToxicResistance>0.50</ToxicResistance>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-							<SocialImpact>0.15</SocialImpact>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DF_Dusk_Helmet_Hooded"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>45</Plasteel>
-						<DevilstrandCloth>20</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DF_Dusk_Helmet_Hooded"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DF_Dusk_Helmet_Hooded" or defName="DF_Dusk_Helmet_Hooded_Fur"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dusk Armory/Weapons_Dusk_Melee.xml b/Patches/Dusk Armory/Weapons_Dusk_Melee.xml
deleted file mode 100644
index e5d168eafd..0000000000
--- a/Patches/Dusk Armory/Weapons_Dusk_Melee.xml	
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dusk Armory</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--===== Dusk Kris =====-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DF_Dusk_Kris"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Dusk Kris handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<chanceFactor>0.33</chanceFactor>
-								<cooldownTime>1.34</cooldownTime>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Dusk Kris point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>31</power>
-								<cooldownTime>1.34</cooldownTime>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.2</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Dusk Kris edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.24</cooldownTime>
-								<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.6</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DF_Dusk_Kris"]/statBases</xpath>
-					<value>
-						<Bulk>3.4</Bulk>
-						<MeleeCounterParryBonus>0.45</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DF_Dusk_Kris"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.3</MeleeCritChance>
-							<MeleeParryChance>0.45</MeleeParryChance>
-							<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DF_Dusk_Kris"]/weaponTags</xpath>
-					<value>
-						<li>CE_Sidearm_Melee</li>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!--===== Dusk Razor =====-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DF_Dusk_Razor"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Dusk Razor handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.33</chanceFactor>
-								<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Dusk Razor point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.59</cooldownTime>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>3.0</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Dusk Razor edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>38</power>
-								<cooldownTime>1.46</cooldownTime>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DF_Dusk_Razor"]/statBases</xpath>
-					<value>
-						<Bulk>7.9</Bulk>
-						<MeleeCounterParryBonus>1.2</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DF_Dusk_Razor"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.73</MeleeCritChance>
-							<MeleeParryChance>0.85</MeleeParryChance>
-							<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!--===== Dusk Saw =====-->
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="DF_Dusk_Saw"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Dusk Saw chain</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.1</cooldownTime>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="DF_Dusk_Saw"]/statBases/Mass</xpath>
-					<value>
-						<Bulk>6.5</Bulk>
-						<Mass>5</Mass>
-						<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DF_Dusk_Saw"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.15</MeleeCritChance>
-							<MeleeParryChance>0.3</MeleeParryChance>
-							<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Dusk Armory/Weapons_Dusk_Ranged.xml b/Patches/Dusk Armory/Weapons_Dusk_Ranged.xml
deleted file mode 100644
index 60c698d808..0000000000
--- a/Patches/Dusk Armory/Weapons_Dusk_Ranged.xml	
+++ /dev/null
@@ -1,340 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Dusk Armory</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--===== TOOLS FOR THE TOOL GOD =====-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DF_Dusk_Enforcer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						/Defs/ThingDef[
-						defName = "DF_Dusk_Carbine" or
-						defName = "DF_Dusk_Launcher" or
-						defName = "DF_Dusk_MAG" or
-						defName = "DF_Dusk_SMG" or
-						defName = "DF_Dusk_Striker"]/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>
-				</li>
-
-				<!--===== Dusk Carbine =====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DF_Dusk_Carbine</defName>
-					<statBases>
-						<Mass>3.16</Mass>
-						<Bulk>9.93</Bulk>
-						<SwayFactor>1.33</SwayFactor>
-						<ShotSpread>0.07</ShotSpread>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_9x39mmSoviet_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>DF_Shot_Dusk_Carbine</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilAmount>1.53</recoilAmount>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>60</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!--===== Dusk Enforcer =====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DF_Dusk_Enforcer</defName>
-					<statBases>
-						<Mass>1.29</Mass>
-						<Bulk>2.31</Bulk>
-						<SwayFactor>1.27</SwayFactor>
-						<ShotSpread>0.18</ShotSpread>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_500SWMagnum_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>DF_Shot_Dusk_Enforcer</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_500SWMagnum</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!--===== Dusk Launcher =====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DF_Dusk_Launcher</defName>
-					<statBases>
-						<Mass>7.9</Mass>
-						<Bulk>9.9</Bulk>
-						<SwayFactor>1.8</SwayFactor>
-						<ShotSpread>0.15</ShotSpread>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.43</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>45</range>
-						<soundCast>DF_Shot_Dusk_Launcher</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>CE_AI_Launcher</li>
-						<li>EliteGun</li>
-					</weaponTags>
-				</li>
-
-				<!--===== Dusk MAG =====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DF_Dusk_MAG</defName>
-					<statBases>
-						<Mass>9.11</Mass>
-						<Bulk>14.6</Bulk>
-						<SwayFactor>1.53</SwayFactor>
-						<ShotSpread>0.05</ShotSpread>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Silver>65</Silver>
-						<Plasteel>65</Plasteel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_127x55mm_FMJ</defaultProjectile>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<warmupTime>1.3</warmupTime>
-						<range>68</range>
-						<soundCast>DF_Shot_Dusk_MAG</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilAmount>1.32</recoilAmount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>250</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_127x55mm</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_MachineGun</li>
-						<li>CE_AI_Suppressive</li>
-					</weaponTags>
-				</li>
-
-				<!--===== Dusk SMG =====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DF_Dusk_SMG</defName>
-					<statBases>
-						<Mass>2.4</Mass>
-						<Bulk>4.4</Bulk>
-						<SwayFactor>0.94</SwayFactor>
-						<ShotSpread>0.14</ShotSpread>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Silver>35</Silver>
-						<Plasteel>35</Plasteel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_50AE_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>25</range>
-						<soundCast>DF_Shot_Dusk_SMG</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilAmount>2.08</recoilAmount>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>80</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_50AE</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!--===== Dusk Striker =====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DF_Dusk_Striker</defName>
-					<statBases>
-						<Mass>3.40</Mass>
-						<Bulk>6.6</Bulk>
-						<SwayFactor>1.26</SwayFactor>
-						<ShotSpread>0.15</ShotSpread>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Silver>60</Silver>
-						<Plasteel>60</Plasteel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>DF_Shot_Dusk_Striker</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/EPOE Forked Royalty DLC expansion/Bionics_Patch.xml b/Patches/EPOE Forked Royalty DLC expansion/Bionics_Patch.xml
deleted file mode 100644
index dfb858ba9b..0000000000
--- a/Patches/EPOE Forked Royalty DLC expansion/Bionics_Patch.xml	
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>EPOE-Forked: Royalty DLC expansion</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EPOE_AdvancedDrillArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>drill arm</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.88</cooldownTime>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.32</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<soundMeleeHit>MeleeHit_DrillArm</soundMeleeHit>
-								<soundMeleeMiss>MeleeMiss_DrillArm</soundMeleeMiss>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EPOE_AdvancedFieldHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>knuckle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.66</cooldownTime>
-								<armorPenetrationSharp>0.00</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<soundMeleeHit>MeleeHit_FieldHand</soundMeleeHit>
-								<soundMeleeMiss>MeleeMiss_FieldHand</soundMeleeMiss>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EPOE_AdvancedHandTalon"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>talon</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>0.99</cooldownTime>
-								<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.58</armorPenetrationSharp>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<soundMeleeHit>MeleeHit_BionicSlash</soundMeleeHit>
-								<soundMeleeMiss>MeleeMiss_BionicSlash</soundMeleeMiss>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EPOE_AdvancedHandTalon"]/stages/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<MeleeHitChance>5</MeleeHitChance>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EPOE_AdvancedElbowBlade"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.0</cooldownTime>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<soundMeleeHit>MeleeHit_BionicSlash</soundMeleeHit>
-								<soundMeleeMiss>MeleeMiss_BionicSlash</soundMeleeMiss>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EPOE_AdvancedKneeSpike"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>spike</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.0</cooldownTime>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.0</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<soundMeleeHit>MeleeHit_BionicSlash</soundMeleeHit>
-								<soundMeleeMiss>MeleeMiss_BionicSlash</soundMeleeMiss>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EPOE_ScytherHandTalon"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>talon</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.05</cooldownTime>
-								<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.36</armorPenetrationSharp>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<soundMeleeHit>MeleeHit_BionicSlash</soundMeleeHit>
-								<soundMeleeMiss>MeleeMiss_BionicSlash</soundMeleeMiss>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EPOE_ScytherHandTalon"]/stages/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<MeleeHitChance>2.5</MeleeHitChance>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EPOE_ScytherElbowBlade"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.1</cooldownTime>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<soundMeleeHit>MeleeHit_BionicSlash</soundMeleeHit>
-								<soundMeleeMiss>MeleeMiss_BionicSlash</soundMeleeMiss>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EPOE_ScytherKneeSpike"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>spike</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.1</cooldownTime>
-								<armorPenetrationBlunt>0.65</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<soundMeleeHit>MeleeHit_BionicSlash</soundMeleeHit>
-								<soundMeleeMiss>MeleeMiss_BionicSlash</soundMeleeMiss>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/EPOE Forked/Bionics_Patch.xml b/Patches/EPOE Forked/Bionics_Patch.xml
deleted file mode 100644
index 12d43b200e..0000000000
--- a/Patches/EPOE Forked/Bionics_Patch.xml	
+++ /dev/null
@@ -1,326 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Prosthetics and Organ Engineering - Forked</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EPOE_ScytherBlade"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>23</power>
-								<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.8</armorPenetrationSharp>
-								<cooldownTime>1.29</cooldownTime>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-								<soundMeleeHit>MeleeHit_BionicSlash</soundMeleeHit>
-								<soundMeleeMiss>MeleeMiss_BionicSlash</soundMeleeMiss>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>19</power>
-								<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.56</armorPenetrationSharp>
-								<cooldownTime>1.29</cooldownTime>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-								<soundMeleeHit>MeleeHit_BionicSlash</soundMeleeHit>
-								<soundMeleeMiss>MeleeMiss_BionicSlash</soundMeleeMiss>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="HookHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>hook hand</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>5</power>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<cooldownTime>1.26</cooldownTime>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BionicHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.11</cooldownTime>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-								<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
-								<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AdvancedBionicArm" or defName="AdvancedBionicHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.11</cooldownTime>
-								<armorPenetrationBlunt>1.988</armorPenetrationBlunt>
-								<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
-								<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="PowerArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>0.89</cooldownTime>
-								<armorPenetrationSharp>0.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-								<soundMeleeHit>Pawn_Melee_PowerClaw_Hit</soundMeleeHit>
-								<soundMeleeMiss>Pawn_Melee_PowerClaw_Miss</soundMeleeMiss>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AdvancedPowerArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>0.89</cooldownTime>
-								<armorPenetrationSharp>0.96</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.75</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-								<soundMeleeHit>Pawn_Melee_PowerClaw_Hit</soundMeleeHit>
-								<soundMeleeMiss>Pawn_Melee_PowerClaw_Miss</soundMeleeMiss>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="TacticalCorneaImplant" or defName="EPIA_TacticalBionicEye"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.05</MeleeDodgeChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="TacticalCorneaImplant" or defName="EPIA_TacticalBionicEye"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<AimingAccuracy>0.5</AimingAccuracy>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EPIA_AuxiliaryAI_Sharpshooter"]/stages/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ShootingAccuracyPawn>+3</ShootingAccuracyPawn>
-							<AimingAccuracy>+1.5</AimingAccuracy>
-							<AimingDelayFactor>0.20</AimingDelayFactor>
-							<MeleeHitChance>-3</MeleeHitChance>
-							<MeleeCritChance>-0.15</MeleeCritChance>
-							<MeleeParryChance>-0.15</MeleeParryChance>
-							<MeleeDodgeChance>-0.15</MeleeDodgeChance>
-						</statOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EPIA_AuxiliaryAI_Commando"]/stages/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ShootingAccuracyPawn>+1</ShootingAccuracyPawn>
-							<AimingAccuracy>0.5</AimingAccuracy>
-							<AimingDelayFactor>-0.15</AimingDelayFactor>
-							<MentalBreakThreshold>-0.06</MentalBreakThreshold>
-							<Suppressability>-0.50</Suppressability>
-						</statOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EPIA_AuxiliaryAI_Brawler"]/stages/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ShootingAccuracyPawn>-1.2</ShootingAccuracyPawn>
-							<AimingAccuracy>-0.6</AimingAccuracy>
-							<MentalBreakThreshold>-0.14</MentalBreakThreshold>
-							<MeleeHitChance>8</MeleeHitChance>
-							<MeleeCritChance>0.50</MeleeCritChance>
-							<MeleeParryChance>0.50</MeleeParryChance>
-							<MeleeDodgeChance>0.50</MeleeDodgeChance>
-							<Suppressability>-1</Suppressability>
-						</statOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EPOE_InstinctOptimizedEyes"]/stages/li[minSeverity="0.99"]/statOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.05</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/HediffDef[defName="EPOE_InstinctOptimizedEyes"]/stages/li[minSeverity="0.99"]/statOffsets/MeleeCritChance</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/HediffDef[defName="EPOE_InstinctOptimizedEyes"]/stages/li[minSeverity="0.99"]/statOffsets</xpath>
-						<value>
-							<MeleeCritChance>0.075</MeleeCritChance>
-							<MeleeParryChance>0.075</MeleeParryChance>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/HediffDef[defName="EPOE_InstinctOptimizedEyes"]/stages/li[minSeverity="0.99"]/statOffsets</xpath>
-						<value>
-						</value>
-					</match>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EPOE_InstinctOptimizedEyes"]/stages/li[label="Optimizing"]/statOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<AimingAccuracy>0.1</AimingAccuracy>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EPOE_InstinctOptimizedEyes"]/stages/li[minSeverity="0.99"]/statOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<AimingAccuracy>0.25</AimingAccuracy>
-					</value>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/HediffDef[defName="EPOE_InstinctOptimizedHand"]/stages/li[label="Optimizing"]/statOffsets/MeleeCritChance</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/HediffDef[defName="EPOE_InstinctOptimizedHand"]/stages/li[label="Optimizing"]/statOffsets</xpath>
-						<value>
-							<MeleeCritChance>0.15</MeleeCritChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/HediffDef[defName="EPOE_InstinctOptimizedHand"]/stages/li[label="Optimizing"]/statOffsets</xpath>
-						<value>
-						</value>
-					</match>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/HediffDef[defName="EPOE_InstinctOptimizedHand"]/stages/li[minSeverity="0.99"]/statOffsets/MeleeCritChance</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/HediffDef[defName="EPOE_InstinctOptimizedHand"]/stages/li[minSeverity="0.99"]/statOffsets</xpath>
-						<value>
-							<MeleeCritChance>0.25</MeleeCritChance>
-							<MeleeParryChance>0.25</MeleeParryChance>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/HediffDef[defName="EPOE_InstinctOptimizedHand"]/stages/li[minSeverity="0.99"]/statOffsets</xpath>
-						<value>
-						</value>
-					</match>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EPOE_InstinctOptimizedFoot"]/stages/li[label="Optimizing"]/statOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.075</MeleeDodgeChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EPOE_InstinctOptimizedFoot"]/stages/li[minSeverity="0.99"]/statOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="SimpleProstheticHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Jaws -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AdvancedBionicJaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.25</cooldownTime>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BionicJaw" or defName="SilentJaw" or defName="HydraulicJaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.25</cooldownTime>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.0</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/EPOE/Bionics.xml b/Patches/EPOE/Bionics.xml
deleted file mode 100644
index 1671512fea..0000000000
--- a/Patches/EPOE/Bionics.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Prosthetics and Organ Engineering</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Basic prosthetics ========== -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/HediffDef[defName="SteelArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="WoodenHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>hook hand</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>5</power>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<cooldownTime>1.26</cooldownTime>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Simple prosthetics ========== -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/HediffDef[defName="SimpleProstheticHand" or defName="SimpleProstheticArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]</xpath>
-				</li>
-
-				<!-- ========== Bionics ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BionicHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>bionic fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-								<cooldownTime>1.66</cooldownTime>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="PowerArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>bionic fist</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>9</power>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<cooldownTime>1.66</cooldownTime>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Advanced Bionics ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AdvancedPowerArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>bionic fist</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>22</power>
-								<armorPenetrationBlunt>4.75</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.96</armorPenetrationSharp>
-								<cooldownTime>0.76</cooldownTime>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AdvancedBionicArm" or defName="AdvancedBionicHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>bionic fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<cooldownTime>0.83</cooldownTime>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/ESCP - Spriggans/ESCP_BodyDefs_Spriggan.xml b/Patches/ESCP - Spriggans/ESCP_BodyDefs_Spriggan.xml
deleted file mode 100644
index 4ad3adfb0d..0000000000
--- a/Patches/ESCP - Spriggans/ESCP_BodyDefs_Spriggan.xml	
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ESCP - Spriggan</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Bipedal -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="ECP_Spriggan"]//*[
-						def="Body" or
-						def="Ear" or
-						def="Nose" or
-						def="Neck" or
-						def="Leg"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="ECP_Spriggan"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Head" or
-						def="Ear" or
-						def="Nose" or
-						def="AnimalJaw" or
-						def="Shoulder" or
-						def="Arm" or
-						def="Hand" or
-						def="FrontClaw" or
-						def="Leg" or
-						def="Foot"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/ESCP - Spriggans/ESCP_Projectiles_Spriggan.xml b/Patches/ESCP - Spriggans/ESCP_Projectiles_Spriggan.xml
deleted file mode 100644
index 841d035304..0000000000
--- a/Patches/ESCP - Spriggans/ESCP_Projectiles_Spriggan.xml	
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ESCP - Spriggan</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Spriggan Fireball -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ESCP_SprigganFireball"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.BulletCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ESCP_SprigganFireball"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>Flame</damageDef>
-							<damageAmountBase>10</damageAmountBase>
-							<speed>50</speed>
-							<ai_IsIncendiary>true</ai_IsIncendiary>
-						</projectile>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/ESCP - Spriggans/ESCP_Spriggan_Scenario.xml b/Patches/ESCP - Spriggans/ESCP_Spriggan_Scenario.xml
deleted file mode 100644
index 9d1aee70ab..0000000000
--- a/Patches/ESCP - Spriggans/ESCP_Spriggan_Scenario.xml	
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ESCP - Spriggan</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="ESCP_SprigganScenario"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_Arrow_Stone</thingDef>
-							<count>100</count>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/ESCP - Spriggans/ESCP_ThingDef_Spriggan.xml b/Patches/ESCP - Spriggans/ESCP_ThingDef_Spriggan.xml
deleted file mode 100644
index bffb4bdef4..0000000000
--- a/Patches/ESCP - Spriggans/ESCP_ThingDef_Spriggan.xml	
+++ /dev/null
@@ -1,594 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ESCP - Spriggan</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Spriggan Base -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="ESCP_SprigganThingBase"]/tools</xpath>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="ESCP_SprigganThingBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- Spriggan and Anima Spriggan -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ESCP_Spriggan" or defName="ESCP_Spriggan_Anima" or defName="ESCP_Spriggan_Parasol"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.33</MeleeCritChance>
-						<MeleeParryChance>0.33</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ESCP_Spriggan" or defName="ESCP_Spriggan_Anima" or defName="ESCP_Spriggan_Parasol"]</xpath>
-					<value>
-						<tools Inherit="False">
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.7</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>14</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.7</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>14</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Spriggan Bog -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ESCP_Spriggan_Bog"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.33</MeleeCritChance>
-						<MeleeParryChance>0.33</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ESCP_Spriggan_Bog"]/tools</xpath>
-					<value>
-						<tools Inherit="False">
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>ScratchToxic</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.7</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>14</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>ScratchToxic</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.7</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>14</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Burnt Spriggan -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ESCP_Spriggan_Burnt"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.33</MeleeCritChance>
-						<MeleeParryChance>0.33</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ESCP_Spriggan_Burnt"]/tools</xpath>
-					<value>
-						<tools Inherit="False">
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.7</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<extraMeleeDamages>
-									<li>
-										<def>Flame</def>
-										<amount>10</amount>
-										<chance>0.2</chance>
-									</li>
-								</extraMeleeDamages>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>14</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.7</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<extraMeleeDamages>
-									<li>
-										<def>Flame</def>
-										<amount>10</amount>
-										<chance>0.2</chance>
-									</li>
-								</extraMeleeDamages>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>14</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ESCP_Spriggan_Burnt"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>ESCP_SprigganFireball</defaultProjectile>
-								<warmupTime>1.8</warmupTime>
-								<range>19.9</range>
-								<minRange>2</minRange>
-								<soundCast>ESCP_Spriggan_Fireball</soundCast>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<label>spriggan fireball</label>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Spriggan Earth Mother -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ESCP_Spriggan_EarthMother"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.58</MeleeCritChance>
-						<MeleeParryChance>0.66</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ESCP_Spriggan_EarthMother"]/tools</xpath>
-					<value>
-						<tools Inherit="False">
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>17</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Blunt</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>17</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.9</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>17</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Spriggan Matron -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ESCP_Spriggan_Matron"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.58</MeleeCritChance>
-						<MeleeParryChance>0.66</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ESCP_Spriggan_Matron"]/tools</xpath>
-					<value>
-						<tools Inherit="False">
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>17</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Blunt</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>17</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.9</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>17</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Spriggan Thorny -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ESCP_Spriggan_Thorni"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.33</MeleeCritChance>
-						<MeleeParryChance>0.33</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ESCP_Spriggan_Thorni"]/tools</xpath>
-					<value>
-						<tools Inherit="False">
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Spriggan Tundra -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ESCP_Spriggan_Tundra"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.33</MeleeCritChance>
-						<MeleeParryChance>0.33</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ESCP_Spriggan_Tundra"]/tools</xpath>
-					<value>
-						<tools Inherit="False">
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.7</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>14</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.7</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>14</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/ESCP - Trolls/ESCP_BodyDefs_Trolls.xml b/Patches/ESCP - Trolls/ESCP_BodyDefs_Trolls.xml
deleted file mode 100644
index b515790965..0000000000
--- a/Patches/ESCP - Trolls/ESCP_BodyDefs_Trolls.xml	
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ESCP - Trolls</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Bipedal -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="ESCP_Troll"]//*[
-						def="Body" or
-						def="Ear" or
-						def="Nose" or
-						def="Neck" or
-						def="Leg"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="ESCP_Troll"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Head" or
-						def="Ear" or
-						def="Nose" or
-						def="AnimalJaw" or
-						def="Shoulder" or
-						def="Arm" or
-						def="Hand" or
-						def="FrontClaw" or
-						def="Leg" or
-						def="Foot"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="ESCP_TrollTusked"]//*[
-						def="Body" or
-						def="Ear" or
-						def="Nose" or
-						def="Neck" or
-						def="Leg"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="ESCP_TrollTusked"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Head" or
-						def="Ear" or
-						def="Nose" or
-						def="AnimalJaw" or
-						def="Tusk" or
-						def="Shoulder" or
-						def="Arm" or
-						def="Hand" or
-						def="FrontClaw" or
-						def="Leg" or
-						def="Foot"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/ESCP - Trolls/ESCP_Hediff_TrollAffliction.xml b/Patches/ESCP - Trolls/ESCP_Hediff_TrollAffliction.xml
deleted file mode 100644
index 13d061ba3d..0000000000
--- a/Patches/ESCP - Trolls/ESCP_Hediff_TrollAffliction.xml	
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ESCP - Trolls</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ESCP_AfflictedTroll"]/stages/li[1]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ESCP_AfflictedTroll"]/stages/li[1]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/ESCP - Trolls/ESCP_Item_TrollLeather.xml b/Patches/ESCP - Trolls/ESCP_Item_TrollLeather.xml
deleted file mode 100644
index 279c637724..0000000000
--- a/Patches/ESCP - Trolls/ESCP_Item_TrollLeather.xml	
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ESCP - Trolls</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ESCP_GrahlTusk -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="ESCP_GrahlTusk"]/tools</xpath>
-				</li>
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="ESCP_GrahlTusk"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>ResourceBase</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ESCP_GrahlTusk"]/description</xpath>
-					<value>
-						<description>A grahl's tusk. It is very durable and valuable. While somewhat unwieldy as a melee weapon, it can still be deadly. Traders and collectors might pay a high price for this.</description>
-					</value>
-				</li>
-
-				<!-- ESCP_UderfrykteTusk -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="ESCP_UderfrykteTusk"]/tools</xpath>
-				</li>
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="ESCP_UderfrykteTusk"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>ResourceBase</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ESCP_UderfrykteTusk"]/description</xpath>
-					<value>
-						<description>An udyrfrykte 's tusk. It is very durable and valuable, and works reasonably well as a weapon.</description>
-					</value>
-				</li>
-
-				<!--Trolls -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ESCP_Leather_LightTroll"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.07</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ESCP_Leather_LightTroll"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.056</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!--Big Troll -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ESCP_Leather_HeavyTroll"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.09</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ESCP_Leather_HeavyTroll"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.06</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!--Grahl -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ESCP_Leather_Grahl"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.11</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ESCP_Leather_Grahl"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.064</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/ESCP - Trolls/ESCP_Item_TrollTusk.xml b/Patches/ESCP - Trolls/ESCP_Item_TrollTusk.xml
deleted file mode 100644
index 2db165dd03..0000000000
--- a/Patches/ESCP - Trolls/ESCP_Item_TrollTusk.xml	
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ESCP - Trolls</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ESCP_GrahlTusk -->
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="ESCP_GrahlTusk"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>ResourceBase</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ESCP_GrahlTusk"]/description</xpath>
-					<value>
-						<description>A grahl's tusk. It is very durable and valuable. While somewhat unwieldy as a melee weapon, it can still be deadly. Traders and collectors might pay a high price for this.</description>
-					</value>
-				</li>
-
-				<!-- ESCP_UderfrykteTusk -->
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="ESCP_UderfrykteTusk"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>ResourceBase</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ESCP_UderfrykteTusk"]/description</xpath>
-					<value>
-						<description>An udyrfrykte 's tusk. It is very durable and valuable, and works reasonably well as a weapon.</description>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/ESCP - Trolls/ESCP_ThingDef_Trolls.xml b/Patches/ESCP - Trolls/ESCP_ThingDef_Trolls.xml
deleted file mode 100644
index 255c28c4d9..0000000000
--- a/Patches/ESCP - Trolls/ESCP_ThingDef_Trolls.xml	
+++ /dev/null
@@ -1,1399 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ESCP - Trolls</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Tier 1 Trolls -->
-				<!-- Barren Troll -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollBarren"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.33</MeleeCritChance>
-						<MeleeParryChance>0.33</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollBarren"]</xpath>
-					<value>
-						<tools Inherit="False">
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.7</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>14</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.7</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>14</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.95</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollBarren"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- Forest Troll -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollForest"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.33</MeleeCritChance>
-						<MeleeParryChance>0.33</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollForest"]</xpath>
-					<value>
-						<tools Inherit="False">
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.7</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>14</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.7</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>14</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.95</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollForest"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- Pygmy Troll -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollPygmy"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.33</MeleeCritChance>
-						<MeleeParryChance>0.33</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollPygmy"]</xpath>
-					<value>
-						<tools Inherit="False">
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollPygmy"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- Swamp Troll -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollSwamp"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.33</MeleeCritChance>
-						<MeleeParryChance>0.33</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollSwamp"]</xpath>
-					<value>
-						<tools Inherit="False">
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.7</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>14</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.7</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>14</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.95</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollSwamp"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- Fungal Troll -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollFungal"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.33</MeleeCritChance>
-						<MeleeParryChance>0.33</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollFungal"]</xpath>
-					<value>
-						<tools Inherit="False">
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.7</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>14</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.7</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>14</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.95</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollFungal"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- Boom Troll -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollBoom"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.33</MeleeCritChance>
-						<MeleeParryChance>0.33</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollBoom"]</xpath>
-					<value>
-						<tools Inherit="False">
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.7</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>14</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.7</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>14</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.95</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollBoom"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- Coastal Troll -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollCoastal"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.33</MeleeCritChance>
-						<MeleeParryChance>0.33</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollCoastal"]</xpath>
-					<value>
-						<tools Inherit="False">
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.7</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>14</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.7</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>14</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.95</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollCoastal"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- Tier 2 Trolls -->
-				<!-- Frost Troll -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollFrost"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.58</MeleeCritChance>
-						<MeleeParryChance>0.66</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollFrost"]</xpath>
-					<value>
-						<tools Inherit="False">
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>17</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Blunt</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>17</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.9</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>17</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollFrost"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- Hill Troll -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollHill"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.58</MeleeCritChance>
-						<MeleeParryChance>0.66</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollHill"]</xpath>
-					<value>
-						<tools Inherit="False">
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>17</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Blunt</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>17</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.9</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>17</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollHill"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- River Troll -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollRiver"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.58</MeleeCritChance>
-						<MeleeParryChance>0.66</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollRiver"]</xpath>
-					<value>
-						<tools Inherit="False">
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>17</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Blunt</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>17</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.9</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>17</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollRiver"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- Cave Troll -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollCave"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.58</MeleeCritChance>
-						<MeleeParryChance>0.66</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollCave"]</xpath>
-					<value>
-						<tools Inherit="False">
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>17</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Blunt</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>17</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.9</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>17</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollCave"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- Anima Troll -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollAnima"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.58</MeleeCritChance>
-						<MeleeParryChance>0.66</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollAnima"]</xpath>
-					<value>
-						<tools Inherit="False">
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>17</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Blunt</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>17</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.9</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>17</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollAnima"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- Tier 3 Trolls -->
-				<!-- Grahl Troll -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollGrahl"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>31</power>
-								<cooldownTime>1.65</cooldownTime>
-								<chanceFactor>0.7</chanceFactor>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>2.25</cooldownTime>
-								<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>18</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>31</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>1.9</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollGrahl"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollGrahl"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.22</MeleeDodgeChance>
-						<MeleeCritChance>0.58</MeleeCritChance>
-						<MeleeParryChance>0.99</MeleeParryChance>
-					</value>
-				</li>
-				<!-- Udyrfrykte Troll -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollUdyrfrykte"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.45</cooldownTime>
-								<chanceFactor>0.7</chanceFactor>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>17</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>18</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>16</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Blunt</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>17</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollUdyrfrykte"]/race</xpath>
-					<value>
-						<baseHealthScale>2</baseHealthScale>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollUdyrfrykte"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ESCP_TrollUdyrfrykte"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.22</MeleeDodgeChance>
-						<MeleeCritChance>0.58</MeleeCritChance>
-						<MeleeParryChance>0.99</MeleeParryChance>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/ESCP - Trolls/Mods/ESCP_BioTechTrolls.xml b/Patches/ESCP - Trolls/Mods/ESCP_BioTechTrolls.xml
deleted file mode 100644
index a74fe67deb..0000000000
--- a/Patches/ESCP - Trolls/Mods/ESCP_BioTechTrolls.xml	
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ESCP - Trolls</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Biotech</li>
-			</mods>
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<!-- Toxic Troll -->
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="ESCP_TrollToxi"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-							<MeleeCritChance>0.58</MeleeCritChance>
-							<MeleeParryChance>0.66</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="ESCP_TrollToxi"]</xpath>
-						<value>
-							<tools Inherit="False">
-								<li Class="CombatExtended.ToolCE">
-									<label>left claw</label>
-									<capacities>
-										<li>Scratch</li>
-									</capacities>
-									<power>26</power>
-									<cooldownTime>1.6</cooldownTime>
-									<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>14</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>2.4</armorPenetrationSharp>
-									<armorPenetrationBlunt>17</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>right claw</label>
-									<capacities>
-										<li>Scratch</li>
-										<li>Blunt</li>
-									</capacities>
-									<power>26</power>
-									<cooldownTime>1.6</cooldownTime>
-									<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>14</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>2.4</armorPenetrationSharp>
-									<armorPenetrationBlunt>17</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<capacities>
-										<li>Bite</li>
-									</capacities>
-									<power>24</power>
-									<cooldownTime>1.9</cooldownTime>
-									<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-									<chanceFactor>0.7</chanceFactor>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>14</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>2.8</armorPenetrationSharp>
-									<armorPenetrationBlunt>17</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>8</power>
-									<cooldownTime>2</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>1</armorPenetrationBlunt>
-									<chanceFactor>0.2</chanceFactor>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="ESCP_TrollToxi"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Humanoid</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<!-- Haemo Troll -->
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="ESCP_TrollHaemo"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-							<MeleeCritChance>0.58</MeleeCritChance>
-							<MeleeParryChance>0.66</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="ESCP_TrollHaemo"]</xpath>
-						<value>
-							<tools Inherit="False">
-								<li Class="CombatExtended.ToolCE">
-									<label>left claw</label>
-									<capacities>
-										<li>Scratch</li>
-									</capacities>
-									<power>26</power>
-									<cooldownTime>1.6</cooldownTime>
-									<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>14</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>2.4</armorPenetrationSharp>
-									<armorPenetrationBlunt>17</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>right claw</label>
-									<capacities>
-										<li>Scratch</li>
-										<li>Blunt</li>
-									</capacities>
-									<power>26</power>
-									<cooldownTime>1.6</cooldownTime>
-									<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>14</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>2.4</armorPenetrationSharp>
-									<armorPenetrationBlunt>17</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<capacities>
-										<li>Bite</li>
-									</capacities>
-									<power>24</power>
-									<cooldownTime>1.9</cooldownTime>
-									<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-									<chanceFactor>0.7</chanceFactor>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>14</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>2.8</armorPenetrationSharp>
-									<armorPenetrationBlunt>17</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>8</power>
-									<cooldownTime>2</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>1</armorPenetrationBlunt>
-									<chanceFactor>0.2</chanceFactor>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="ESCP_TrollHaemo"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Humanoid</bodyShape>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Eccentric Militor/Eccentric_Militor_Ability.xml b/Patches/Eccentric Militor/Eccentric_Militor_Ability.xml
deleted file mode 100644
index 14f820c0e1..0000000000
--- a/Patches/Eccentric Militor/Eccentric_Militor_Ability.xml	
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Eccentric Militors</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Jolly Militor -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AbilityDef[defName="JollyLauncher_Militor"]/comps/li[@Class="CompProperties_AbilityLaunchProjectile"]/projectileDef</xpath>
-					<value>
-						<projectileDef>Bullet_30x29mmGrenade_HE</projectileDef>
-					</value>
-				</li>
-
-				<!-- Holy Blades -->
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="HolyBlade"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>BaseBulletCE</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="HolyBlade"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<damageDef>HolyFire_Greater</damageDef>
-							<damageAmountBase>17.0</damageAmountBase>
-							<armorPenetrationSharp>25.5</armorPenetrationSharp>
-							<armorPenetrationBlunt>1</armorPenetrationBlunt>
-						</projectile>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Eccentric Militor/Eccentric_Militor_Ammo.xml b/Patches/Eccentric Militor/Eccentric_Militor_Ammo.xml
deleted file mode 100644
index b4aca43247..0000000000
--- a/Patches/Eccentric Militor/Eccentric_Militor_Ammo.xml	
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Eccentric Militors</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- Double Barrel Ammo Set -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_12Gauge_Eccentric_Militor_Double</defName>
-							<label>12 Gauge</label>
-							<ammoTypes>
-								<Ammo_12Gauge_Buck>Bullet_12Gauge_Eccentric_Militor_Double_Buck</Ammo_12Gauge_Buck>
-								<Ammo_12Gauge_Slug>Bullet_12Gauge_Eccentric_Militor_Double_Slug</Ammo_12Gauge_Slug>
-								<Ammo_12Gauge_Beanbag>Bullet_12Gauge_Eccentric_Militor_Double_Beanbag</Ammo_12Gauge_Beanbag>
-								<Ammo_12Gauge_ElectroSlug>Bullet_12Gauge_Eccentric_Militor_Double_ElectroSlug</Ammo_12Gauge_ElectroSlug>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- Double Barrel Fire -->
-						<ThingDef ParentName="Base12GaugeBullet">
-							<defName>Bullet_12Gauge_Eccentric_Militor_Double_Buck</defName>
-							<label>buckshot pellet</label>
-							<graphicData>
-								<texPath>Things/Projectile/Shotgun_Pellet</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>8</damageAmountBase>
-								<pelletCount>18</pelletCount><!-- Twice the usual number of buckshot pellets -->
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.52</armorPenetrationBlunt>
-								<spreadMult>17.8</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base12GaugeBullet">
-							<defName>Bullet_12Gauge_Eccentric_Militor_Double_Slug</defName>
-							<label>shotgun slug</label>
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_big</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>106</speed>
-								<damageAmountBase>28</damageAmountBase>
-								<pelletCount>2</pelletCount><!-- Double slugs -->
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<armorPenetrationBlunt>85.2</armorPenetrationBlunt>
-								<casingMoteDefname>Fleck_ShotgunShell_Green</casingMoteDefname>
-								<casingFilthDefname>Filth_ShotgunAmmoCasings_Green</casingFilthDefname>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base12GaugeBullet">
-							<defName>Bullet_12Gauge_Eccentric_Militor_Double_Beanbag</defName>
-							<label>beanbag</label>
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_big</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>30</speed>
-								<damageDef>Beanbag</damageDef>
-								<damageAmountBase>9</damageAmountBase>
-								<pelletCount>2</pelletCount><!-- Double beanbags -->
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.240</armorPenetrationBlunt>
-								<spreadMult>2</spreadMult>
-								<casingMoteDefname>Fleck_ShotgunShell_White</casingMoteDefname>
-								<casingFilthDefname>Filth_ShotgunAmmoCasings_White</casingFilthDefname>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base12GaugeBullet">
-							<defName>Bullet_12Gauge_Eccentric_Militor_Double_ElectroSlug</defName>
-							<label>EMP slug</label>
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_big</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<color>(68,210,215)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>EMP</damageDef>
-								<speed>43</speed>
-								<damageAmountBase>12</damageAmountBase>
-								<pelletCount>2</pelletCount><!-- Double EMP slugs -->
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0</armorPenetrationBlunt>
-								<empShieldBreakChance>0.2</empShieldBreakChance>
-								<casingMoteDefname>Fleck_ShotgunShell_Black</casingMoteDefname>
-								<casingFilthDefname>Filth_ShotgunAmmoCasings_Black</casingFilthDefname>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Eccentric Militor/Eccentric_Militor_Building.xml b/Patches/Eccentric Militor/Eccentric_Militor_Building.xml
deleted file mode 100644
index 7c704110a7..0000000000
--- a/Patches/Eccentric Militor/Eccentric_Militor_Building.xml	
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Eccentric Militors</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Mini-turret ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_DualBarreledChristmasTurret"]/comps/li[@Class="CompProperties_Power"]/basePowerConsumption</xpath>
-					<value>
-						<basePowerConsumption>120</basePowerConsumption>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_DualBarreledChristmasTurret"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Turret_DualBarreledChristmasTurret"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.25</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_DualBarreledChristmasTurret"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_DualBarreledChristmasTurret"]/statBases/Mass</xpath>
-					<value>
-						<Mass>25</Mass>
-						<Bulk>15</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Turret_DualBarreledChristmasTurret"]/comps/li[@Class="CompProperties_Explosive"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Turret_DualBarreledChristmasTurret"]/comps/li[@Class="CompProperties_Refuelable"]</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_DualBarreledChristmasTurret"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_DualBarreledChristmasTurret"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>1.0</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<!-- Add trade tags -->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Turret_DualBarreledChristmasTurret"]/tradeTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Turret_DualBarreledChristmasTurret"]</xpath>
-						<value>
-							<tradeTags/>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Turret_DualBarreledChristmasTurret"]/tradeTags</xpath>
-					<value>
-						<li>CE_Turret</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_DualBarrelledTurret</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.3</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>2.1</warmupTime>
-						<range>54</range>
-						<burstShotCount>25</burstShotCount>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>250</magazineSize>
-						<reloadTime>9.2</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags Inherit="False">
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Eccentric Militor/Eccentric_Militor_Races.xml b/Patches/Eccentric Militor/Eccentric_Militor_Races.xml
deleted file mode 100644
index 5d2b51f522..0000000000
--- a/Patches/Eccentric Militor/Eccentric_Militor_Races.xml	
+++ /dev/null
@@ -1,306 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Eccentric Militors</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Eccentric Militor Base -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[@Name="EccentricMilitorKind"]/combatPower</xpath>
-					<value>
-						<combatPower>60</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="EccentricMilitor"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="EccentricMilitor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="EccentricMilitor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="EccentricMilitor"]/statBases</xpath>
-					<value>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.04</MeleeCritChance>
-						<MeleeParryChance>0.04</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="EccentricMilitor"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[@Name="EccentricMilitor"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[@Name="EccentricMilitor"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="EccentricMilitor"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>700</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>70</MaxOverHeal>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<!-- Militor Ammo Loadout -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-					defName="Mech_ArchotechMilitor" or
-					defName="Mech_BochiMilitor" or
-					defName="Mech_ChickenCrusaderMilitor" or
-					defName="Mech_EasterBunnyMilitor" or
-					defName="Mech_GuraMilitor" or
-					defName="Mech_JorisMilitor" or
-					defName="Mech_KnightMilitor"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Mech_PMCSantaMilitor"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>20</min>
-								<max>30</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- Mini Mechs -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Mech_ChristmasUrchin"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>3</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Mech_ChristmasUrchin"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Inventory" />
-						<li Class="CombatExtended.CompProperties_TacticalManager" />
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[
-					defName="Mech_ChristmasUrchin" or
-					defName="Mech_MiniShark" or
-					defName="Mech_MiniChicken"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Vehicle</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-					defName="Mech_ChristmasUrchin" or
-					defName="Mech_MiniShark" or
-					defName="Mech_MiniChicken"]/statBases/ArmorRating_Blunt
-					</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-					defName="Mech_ChristmasUrchin" or
-					defName="Mech_MiniShark" or
-					defName="Mech_MiniChicken"]/statBases/ArmorRating_Sharp
-					</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-					defName="Mech_ChristmasUrchin" or
-					defName="Mech_MiniShark" or
-					defName="Mech_MiniChicken"]/statBases
-					</xpath>
-					<value>
-						<CarryWeight>30</CarryWeight>
-						<CarryBulk>15</CarryBulk>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.04</MeleeCritChance>
-						<MeleeParryChance>0.04</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-					defName="Mech_ChristmasUrchin" or
-					defName="Mech_MiniShark"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>16</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mech_MiniChicken"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>peck</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>3.0</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>8.0</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Mech_ChristmasUrchin"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Mech_ChristmasUrchin"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Mech_MiniShark"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Mech_MiniShark"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Mech_MiniChicken"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Mech_MiniChicken"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-					defName="Mech_ChristmasUrchin" or
-					defName="Mech_MiniShark" or
-					defName="Mech_MiniChicken"]/comps
-					</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>700</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>70</MaxOverHeal>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Eccentric Militor/Eccentric_Militor_Weapons.xml b/Patches/Eccentric Militor/Eccentric_Militor_Weapons.xml
deleted file mode 100644
index 6ef44a88aa..0000000000
--- a/Patches/Eccentric Militor/Eccentric_Militor_Weapons.xml	
+++ /dev/null
@@ -1,338 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Eccentric Militors</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Archotech Shotgun ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_ArchotechShotgun</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>0.53</SwayFactor>
-						<Bulk>7.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.42</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_410Bore_Buck</defaultProjectile>
-						<warmupTime>0.8</warmupTime>
-						<range>14</range>
-						<soundCast>Shot_Shotgun_NoRack</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>6</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_410Bore</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Bochi Shotgun ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_BochiShotgun</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>0.53</SwayFactor>
-						<Bulk>7.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.42</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_410Bore_Buck</defaultProjectile>
-						<warmupTime>0.8</warmupTime>
-						<range>14</range>
-						<soundCast>Shot_Shotgun_NoRack</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>6</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_410Bore</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Carrot Shotgun ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_CarrotShotgun</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>0.53</SwayFactor>
-						<Bulk>7.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.42</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_410Bore_Buck</defaultProjectile>
-						<warmupTime>0.8</warmupTime>
-						<range>14</range>
-						<soundCast>Shot_Shotgun_NoRack</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>6</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_410Bore</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Cluck Shotgun ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_CluckShotgun</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>0.53</SwayFactor>
-						<Bulk>7.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.42</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_410Bore_Buck</defaultProjectile>
-						<warmupTime>0.8</warmupTime>
-						<range>14</range>
-						<soundCast>Shot_Shotgun_NoRack</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>6</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_410Bore</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Shark Shotgun ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SharkShotgun</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>0.53</SwayFactor>
-						<Bulk>7.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.42</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_410Bore_Buck</defaultProjectile>
-						<warmupTime>0.8</warmupTime>
-						<range>14</range>
-						<soundCast>Shot_Shotgun_NoRack</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>6</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_410Bore</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Knight Shotgun ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_KnightShotgun</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>0.53</SwayFactor>
-						<Bulk>7.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.42</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_410Bore_Buck</defaultProjectile>
-						<warmupTime>0.8</warmupTime>
-						<range>14</range>
-						<soundCast>Shot_Shotgun_NoRack</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>6</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_410Bore</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== RimRim Shotgun ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_RimRimShotgun</defName>
-					<statBases>
-						<Mass>3.50</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.26</SwayFactor>
-						<Bulk>6.7</Bulk>
-						<SightsEfficiency>1</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.54</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>Shot_Shotgun_NoRack</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Santa's DoubleBarrel Shotgun ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SantasDoubleBarrel</defName>
-					<statBases>
-						<Mass>1.90</Mass>
-						<RangedWeapon_Cooldown>0.93</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>2.73</SwayFactor>
-						<Bulk>6.29</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Eccentric_Militor_Double_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<range>11</range>
-						<soundCast>Shot_Shotgun_NoRack</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>2</magazineSize>
-						<reloadTime>1.7</reloadTime>
-						<ammoSet>AmmoSet_12Gauge_Eccentric_Militor_Double</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Christmas AK Spiner ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_ChristmasAKSpiner</defName>
-					<statBases>
-						<Mass>3.30</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.21</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.86</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>44</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>Shot_CE_AssaultRifleSlow</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<ai_AvoidFriendlyFireRadius>4</ai_AvoidFriendlyFireRadius>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Edge of Descension - Monoblades/EoD_BladelinksWeaponsDefs.xml b/Patches/Edge of Descension - Monoblades/EoD_BladelinksWeaponsDefs.xml
deleted file mode 100644
index ab7f25a486..0000000000
--- a/Patches/Edge of Descension - Monoblades/EoD_BladelinksWeaponsDefs.xml	
+++ /dev/null
@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Edge of Descension - Monoblades</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ===== Persona Monoblade ===== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_MonobladeBladelink"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>0.50</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_MonobladeBladelink"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.10</MeleeCritChance>
-							<MeleeParryChance>0.50</MeleeParryChance>
-							<MeleeDodgeChance>0.37</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_MonobladeBladelink"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.4</cooldownTime>
-								<armorPenetrationBlunt>0.7</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>0.78</cooldownTime>
-								<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
-								<armorPenetrationSharp>34.77</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>33</power>
-								<cooldownTime>0.67</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>4.18</armorPenetrationBlunt>
-								<armorPenetrationSharp>25.3</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Persona Prestige Monoblade ===== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_MonobladePrestigeBladelink"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>0.50</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_MonobladePrestigeBladelink"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>1.10</MeleeCritChance>
-						<MeleeParryChance>0.53</MeleeParryChance>
-						<MeleeDodgeChance>0.40</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_MonobladePrestigeBladelink"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.4</cooldownTime>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>0.76</cooldownTime>
-								<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
-								<armorPenetrationSharp>34.77</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>0.65</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>4.18</armorPenetrationBlunt>
-								<armorPenetrationSharp>25.3</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Archoblade ===== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Archoblade"]/statBases</xpath>
-					<value>
-						<Bulk>7</Bulk>
-						<MeleeCounterParryBonus>1.20</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Archoblade"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>2.50</MeleeCritChance>
-							<MeleeParryChance>1.0</MeleeParryChance>
-							<MeleeDodgeChance>0.45</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Archoblade"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.4</cooldownTime>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Stun</def>
-										<amount>5</amount>
-										<chance>0.3</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>0.71</cooldownTime>
-								<armorPenetrationBlunt>3.72</armorPenetrationBlunt>
-								<armorPenetrationSharp>63.25</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>37</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Stun</def>
-										<amount>5</amount>
-										<chance>0.3</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>0.6</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>8.28</armorPenetrationBlunt>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Edge of Descension - Monoblades/EoD_WeaponsDefs.xml b/Patches/Edge of Descension - Monoblades/EoD_WeaponsDefs.xml
deleted file mode 100644
index 00b8093bd0..0000000000
--- a/Patches/Edge of Descension - Monoblades/EoD_WeaponsDefs.xml	
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Edge of Descension - Monoblades</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ===== Monoblade ===== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Monoblade"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>0.40</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Monoblade"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.00</MeleeCritChance>
-							<MeleeParryChance>0.40</MeleeParryChance>
-							<MeleeDodgeChance>0.27</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Monoblade"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.4</cooldownTime>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>0.8</cooldownTime>
-								<armorPenetrationBlunt>1.18</armorPenetrationBlunt>
-								<armorPenetrationSharp>31.25</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>0.71</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>2.48</armorPenetrationBlunt>
-								<armorPenetrationSharp>21</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Prestige Monoblade ===== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_MonobladePrestige"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>0.40</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_MonobladePrestige"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>1.00</MeleeCritChance>
-						<MeleeParryChance>0.45</MeleeParryChance>
-						<MeleeDodgeChance>0.3</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_MonobladePrestige"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.4</cooldownTime>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>0.8</cooldownTime>
-								<armorPenetrationBlunt>1.18</armorPenetrationBlunt>
-								<armorPenetrationSharp>31.25</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>0.71</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>2.48</armorPenetrationBlunt>
-								<armorPenetrationSharp>21</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Luciblade ===== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_LuciBlade"]/statBases</xpath>
-					<value>
-						<Bulk>7</Bulk>
-						<MeleeCounterParryBonus>0.60</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_LuciBlade"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeCritChance>1.50</MeleeCritChance>
-						<MeleeParryChance>0.45</MeleeParryChance>
-						<MeleeDodgeChance>0.5</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_LuciBlade"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.4</cooldownTime>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>15</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Flame</def>
-										<amount>5</amount>
-										<chance>0.4</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>0.65</cooldownTime>
-								<armorPenetrationBlunt>1.72</armorPenetrationBlunt>
-								<armorPenetrationSharp>33.75</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>26</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Flame</def>
-										<amount>5</amount>
-										<chance>0.4</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>0.57</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>3.98</armorPenetrationBlunt>
-								<armorPenetrationSharp>24.3</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Eisenhans Power Armor/ThingDefs_Various.xml b/Patches/Eisenhans Power Armor/ThingDefs_Various.xml
deleted file mode 100644
index edeafae99f..0000000000
--- a/Patches/Eisenhans Power Armor/ThingDefs_Various.xml	
+++ /dev/null
@@ -1,303 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Iron Harvest Pkp 17 "Eisenhans" Powerarmor</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Helmet"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Helmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Helmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>150</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Helmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>12</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Helmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>20</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Helmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Helmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Helmet"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<PsychicSensitivity>-0.1</PsychicSensitivity>
-							<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-							<ShootingAccuracyPawn>-0.10</ShootingAccuracyPawn>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Helmet"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>80</Steel>
-							<Cloth>20</Cloth>
-							<ComponentIndustrial>2</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Helmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!-- === Armor === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Powerarmor"]/statBases</xpath>
-					<value>
-						<Bulk>120</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Powerarmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>300</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Powerarmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>50</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Powerarmor"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Powerarmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>13</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Powerarmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>24</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Powerarmor"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>180</Steel>
-							<Cloth>40</Cloth>
-							<ComponentIndustrial>5</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Powerarmor"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>80</CarryWeight>
-							<CarryBulk>15</CarryBulk>
-							<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-							<MoveSpeed>-2</MoveSpeed>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Powerarmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>
-						Defs/ThingDef[defName="Proj_IncendiaryMortarEisenhand"] |
-						Defs/ThingDef[defName="Proj_ExplosiveMortarEisenhans"] |
-						Defs/ThingDef[defName="Proj_EmpMortarEisenhans"] |
-						Defs/ThingDef[defName="Proj_SmokeMortarEisenhans"]
-					</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Powerarmor"]/comps/li[@Class="CompProperties_Reloadable"]/ammoDef</xpath>
-					<value>
-						<ammoDef>Shell_60mmMortar_HE</ammoDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Powerarmor"]/comps/li[@Class="CompProperties_Reloadable"]/maxCharges</xpath>
-					<value>
-						<maxCharges>2</maxCharges>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Powerarmor"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountPerCharge</xpath>
-					<value>
-						<ammoCountPerCharge>1</ammoCountPerCharge>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Powerarmor"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Charges">
-							<chargeSpeeds>
-								<li>30</li>
-								<li>50</li>
-								<li>70</li>
-								<li>90</li>
-							</chargeSpeeds>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Eisenhans_Powerarmor"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<label>launch 60mm shell</label>
-								<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<onlyManualCast>True</onlyManualCast>
-								<warmupTime>2</warmupTime>
-								<range>40</range>
-								<minRange>5</minRange>
-								<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-								<soundAiming>EisenhansMortar_Aiming</soundAiming>
-								<soundCast>Shot_EisenhansMortar</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>14</muzzleFlashScale>
-								<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-								<defaultProjectile>Bullet_60mmMortarShell_HE</defaultProjectile>
-								<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- === Battering Ram === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_EisenhansBatteringRam"]/stuffCategories</xpath>
-					<value>
-						<stuffCategories>
-							<li>Metallic_Weapon</li>
-						</stuffCategories>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_EisenhansBatteringRam"]/costList/ComponentIndustrial</xpath>
-					<value>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_EisenhansBatteringRam"]/statBases/Mass</xpath>
-					<value>
-						<Mass>12</Mass>
-						<Bulk>14</Bulk>
-						<MeleeCounterParryBonus>0.38</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_EisenhansBatteringRam"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.42</MeleeCritChance>
-							<MeleeParryChance>0.24</MeleeParryChance>
-							<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_EisenhansBatteringRam"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2.1</cooldownTime>
-								<armorPenetrationBlunt>8.625</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-								<extraMeleeDamages>
-									<li>
-										<def>EMP</def>
-										<amount>6</amount>
-										<chance>0.75</chance>
-									</li>
-								</extraMeleeDamages>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Eltex Bodysuit/Apparel_Various.xml b/Patches/Eltex Bodysuit/Apparel_Various.xml
deleted file mode 100644
index 0a92d43329..0000000000
--- a/Patches/Eltex Bodysuit/Apparel_Various.xml	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Eltex Bodysuit</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- == Eltex Bodysuit == -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="eltex_bodysuit"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>1.5</WornBulk>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Epona Race/Ammo/Ammo_Epona.xml b/Patches/Epona Race/Ammo/Ammo_Epona.xml
deleted file mode 100644
index b34f51fec4..0000000000
--- a/Patches/Epona Race/Ammo/Ammo_Epona.xml	
+++ /dev/null
@@ -1,248 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Epona Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!-- ==================== Plasma Cell Variants ========================== -->
-
-						<!--Shock-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<CombatExtended.AmmoSetDef>
-									<defName>AmmoSet_Epona_Shock</defName>
-									<label>toxic pulse</label>
-									<ammoTypes>
-										<Ammo_PlasmaCellRifle>Bullet_Epona_Shock</Ammo_PlasmaCellRifle>
-									</ammoTypes>
-								</CombatExtended.AmmoSetDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-
-								<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmChargedBullet">
-									<defName>Bullet_Epona_Shock</defName>
-									<label>vaporized toxin pulse</label>
-									<graphicData>
-										<texPath>Things/WeaponRanged/Projectile/PoisonProjectile</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<speed>160</speed>
-										<damageAmountBase>15</damageAmountBase>
-										<damageDef>EponaShocker</damageDef>
-										<armorPenetrationSharp>28</armorPenetrationSharp>
-										<armorPenetrationBlunt>40</armorPenetrationBlunt>
-									</projectile>
-								</ThingDef>
-
-							</value>
-						</li>
-
-						<!--Shard-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<CombatExtended.AmmoSetDef>
-									<defName>AmmoSet_Epona_Shard</defName>
-									<label>shard pulse</label>
-									<ammoTypes>
-										<Ammo_PlasmaCellRifle>Bullet_Epona_Shock</Ammo_PlasmaCellRifle>
-									</ammoTypes>
-								</CombatExtended.AmmoSetDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base30x64mmFuelBullet">
-									<defName>Bullet_Epona_Shard</defName>
-									<label>shard pulse</label>
-									<graphicData>
-										<texPath>Things/WeaponRanged/Projectile/ShardProjectile</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-										<shaderType>TransparentPostLight</shaderType>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<speed>100</speed>
-										<damageDef>EponaPegasusShard</damageDef>
-										<damageAmountBase>25</damageAmountBase>
-										<explosionRadius>1.4</explosionRadius>
-										<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-									</projectile>
-								</ThingDef>
-
-							</value>
-						</li>
-
-						<!--Molten-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<CombatExtended.AmmoSetDef>
-									<defName>AmmoSet_Epona_Molten</defName>
-									<label>plasma pulse</label>
-									<ammoTypes>
-										<Ammo_PlasmaCellHeavy>Bullet_Epona_Molten</Ammo_PlasmaCellHeavy>
-									</ammoTypes>
-								</CombatExtended.AmmoSetDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base30x64mmFuelBullet">
-									<defName>Bullet_Epona_Molten</defName>
-									<label>plasma pulse</label>
-									<graphicData>
-										<texPath>Things/WeaponRanged/Projectile/SunProjectile</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-										<shaderType>TransparentPostLight</shaderType>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<speed>10</speed>
-										<damageDef>Bomb</damageDef>
-										<damageAmountBase>300</damageAmountBase>
-										<explosionRadius>5</explosionRadius>
-										<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-									</projectile>
-								</ThingDef>
-
-							</value>
-						</li>
-
-						<!--plasma-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<CombatExtended.AmmoSetDef>
-									<defName>AmmoSet_Epona_Plasma</defName>
-									<label>shard pulse</label>
-									<ammoTypes>
-										<Ammo_PlasmaCellRifle>Bullet_Epona_Plasma</Ammo_PlasmaCellRifle>
-									</ammoTypes>
-								</CombatExtended.AmmoSetDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base30x64mmFuelBullet">
-									<defName>Bullet_Epona_Plasma</defName>
-									<label>plasma</label>
-									<graphicData>
-										<texPath>Things/WeaponRanged/Projectile/Plasmasperm</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-										<shaderType>TransparentPostLight</shaderType>
-										<drawSize>0.8</drawSize>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<speed>100</speed>
-										<damageDef>EponaLancePlasma</damageDef>
-										<damageAmountBase>5</damageAmountBase>
-										<explosionRadius>0.5</explosionRadius>
-										<applyDamageToExplosionCellsNeighbors>false</applyDamageToExplosionCellsNeighbors>
-									</projectile>
-								</ThingDef>
-
-							</value>
-						</li>
-
-						<!-- ==================== Flamer Variant ========================== -->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<CombatExtended.AmmoSetDef>
-									<defName>AmmoSet_NuckelaveeShotgun</defName>
-									<label>Thermal Shot</label>
-									<ammoTypes>
-										<Ammo_30x64mmFuel_Incendiary>Bullet_Epona_NapalmShotgun</Ammo_30x64mmFuel_Incendiary>
-									</ammoTypes>
-								</CombatExtended.AmmoSetDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x18mmChargedBullet">
-									<defName>Bullet_Epona_NapalmShotgun</defName>
-									<label>shotgun_blast</label>
-									<graphicData>
-										<texPath>Things/WeaponRanged/Projectile/DragonbreathProjectile</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<speed>70</speed>
-										<damageDef>EponaFlameshot</damageDef>
-										<damageAmountBase>4</damageAmountBase>
-										<pelletCount>6</pelletCount>
-										<spreadMult>17.8</spreadMult>
-										<armorPenetrationSharp>0</armorPenetrationSharp>
-										<armorPenetrationBlunt>0</armorPenetrationBlunt>
-									</projectile>
-								</ThingDef>
-							</value>
-						</li>
-
-						<!-- ==================== Railgun Variant ========================== -->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<CombatExtended.AmmoSetDef>
-									<defName>AmmoSet_6mmEponaShock</defName>
-									<label>6mm Railgun</label>
-									<ammoTypes>
-										<Ammo_6mmRailgun_Sabot>Bullet_6mmEponaShock</Ammo_6mmRailgun_Sabot>
-									</ammoTypes>
-								</CombatExtended.AmmoSetDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x18mmChargedBullet">
-									<defName>Bullet_6mmEponaShock</defName>
-									<label>6mm Railgun bullet (Neurotoxin)</label>
-									<graphicData>
-										<texPath>Things/Projectile/Bullet_Small</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageDef>EponaShocker</damageDef>
-										<damageAmountBase>7</damageAmountBase>
-										<armorPenetrationSharp>24</armorPenetrationSharp>
-										<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
-										<speed>120</speed>
-									</projectile>
-								</ThingDef>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Epona Race/Bodies/Epona_Bodytype.xml b/Patches/Epona Race/Bodies/Epona_Bodytype.xml
deleted file mode 100644
index 8b24c5420d..0000000000
--- a/Patches/Epona Race/Bodies/Epona_Bodytype.xml	
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Epona Race</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--Arm Groups-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>
-								Defs/BodyDef[defName="Centaur"]//*[
-								customLabel="왼쪽 어깨"
-								]/groups
-							</xpath>
-							<value>
-								<li>LeftShoulder</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>
-								Defs/BodyDef[defName="Centaur"]//*[
-								customLabel="오른쪽 어깨"
-								]/groups
-							</xpath>
-							<value>
-								<li>RightShoulder</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>
-								Defs/BodyDef[defName="Centaur"]//*[
-								customLabel="왼팔"
-								]/groups
-							</xpath>
-							<value>
-								<li>LeftArm</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>
-								Defs/BodyDef[defName="Centaur"]//*[
-								customLabel="오른팔"
-								]/groups
-							</xpath>
-							<value>
-								<li>RightArm</li>
-							</value>
-						</li>
-
-						<!--Natural Armor-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>
-								Defs/BodyDef[defName="Centaur"]//*[
-								def="Torso" or
-								def="CentaurTail" or
-								def="Neck" or
-								def="Head" or
-								def="Nose" or
-								def="Jaw" or
-								def="Shoulder" or
-								def="Arm" or
-								def="Hand" or
-								def="Finger" or
-								def="Leg" or
-								def="Foot"
-								]/groups
-							</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Epona Race/Bodies/Epona_Hediff.xml b/Patches/Epona Race/Bodies/Epona_Hediff.xml
deleted file mode 100644
index 4b41317fd3..0000000000
--- a/Patches/Epona Race/Bodies/Epona_Hediff.xml	
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Epona Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/HediffDef[defName="WarHorse"]/stages/li/statOffsets</xpath>
-							<value>
-								<Suppressability>-0.25</Suppressability>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="SmallHorse"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>1.2</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="WarHorse"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>0.2</MeleeDodgeChance>
-								<MeleeCritChance>0.2</MeleeCritChance>
-								<MeleeParryChance>0.1</MeleeParryChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="RoyalHorse"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>0.5</MeleeDodgeChance>
-								<MeleeParryChance>0.4</MeleeParryChance>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Epona Race/PawnKindDefs/Epona_PawnKind.xml b/Patches/Epona Race/PawnKindDefs/Epona_PawnKind.xml
deleted file mode 100644
index 1473dffc99..0000000000
--- a/Patches/Epona Race/PawnKindDefs/Epona_PawnKind.xml	
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Epona Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--Ammo-->
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[
-								defName="EponaMerchant" or
-								defName="EponaDemiLancer" or
-								defName="EponaHarquebusier" or
-								defName="EponaKnight" or
-								defName="EponaKnightCaptain" or
-								defName="EponaHighlander" or
-								defName="EponaHighlanderRanger" or
-								defName="EponaHighlanderCaptain" or
-								defName="EponaSenator" or
-								defName="EponaPaladin"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>5</max>
-									</primaryMagazineCount>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[
-								defName="Epona_BattleRamNPC"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>4</min>
-										<max>4</max>
-									</primaryMagazineCount>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[defName="EponaArcher"]</xpath>
-							<value>
-								<li Inherit="False" Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>15</min>
-										<max>25</max>
-									</primaryMagazineCount>
-									<forcedSidearm>
-										<sidearmMoney>
-											<min>500</min>
-											<max>1200</max>
-										</sidearmMoney>
-										<weaponTags>
-											<li>EponaCommon</li>
-										</weaponTags>
-									</forcedSidearm>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[defName="EponaHighlanderGrenade"]</xpath>
-							<value>
-								<li Inherit="False" Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>4</min>
-										<max>15</max>
-									</primaryMagazineCount>
-									<forcedSidearm>
-										<sidearmMoney>
-											<min>500</min>
-											<max>1200</max>
-										</sidearmMoney>
-										<weaponTags>
-											<li>EponaCommon</li>
-										</weaponTags>
-									</forcedSidearm>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[defName="EponaTankDestroyer"]</xpath>
-							<value>
-								<li Inherit="False" Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>5</max>
-									</primaryMagazineCount>
-									<forcedSidearm>
-										<sidearmMoney>
-											<min>500</min>
-											<max>1200</max>
-										</sidearmMoney>
-										<weaponTags>
-											<li>EponaCommon</li>
-										</weaponTags>
-									</forcedSidearm>
-								</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Epona Race/Scenario/Epona_Scenario.xml b/Patches/Epona Race/Scenario/Epona_Scenario.xml
deleted file mode 100644
index 7772673384..0000000000
--- a/Patches/Epona Race/Scenario/Epona_Scenario.xml	
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Epona Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ScenarioDef[defName="EponaNomadStart"]/scenario/parts</xpath>
-							<value>
-								<li Class="ScenPart_StartingThing_Defined">
-									<def>StartingThing_Defined</def>
-									<thingDef>Ammo_44-40Winchester_FMJ</thingDef>
-									<count>100</count>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ScenarioDef[defName="EponaNomadStart"]/scenario/parts</xpath>
-							<value>
-								<li Class="ScenPart_StartingThing_Defined">
-									<def>StartingThing_Defined</def>
-									<thingDef>Ammo_Arrow_Steel</thingDef>
-									<count>30</count>
-								</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Epona Race/ThingDefs_Items/Items_Resources.xml b/Patches/Epona Race/ThingDefs_Items/Items_Resources.xml
deleted file mode 100644
index a9c481009a..0000000000
--- a/Patches/Epona Race/ThingDefs_Items/Items_Resources.xml	
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Epona Race</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!-- ==========  Giant Sheep Wool  =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Epona_Sheep_Wool"]/statBases/StuffPower_Armor_Sharp</xpath>
-							<value>
-								<StuffPower_Armor_Sharp>0.45</StuffPower_Armor_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Epona_Sheep_Wool"]/statBases/StuffPower_Armor_Blunt</xpath>
-							<value>
-								<StuffPower_Armor_Blunt>0.18</StuffPower_Armor_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Epona_Sheep_Wool"]/statBases/StuffPower_Armor_Heat</xpath>
-							<value>
-								<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
-								<StuffPower_Armor_Electric>0.05</StuffPower_Armor_Electric>
-								<Bulk>0.3</Bulk>
-								<WornBulk>0.5</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="Epona_Sheep_Wool"]/stuffProps/categories</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="Epona_Sheep_Wool"]/stuffProps</xpath>
-								<value>
-									<categories>
-										<li>SoftArmor</li>
-									</categories>
-								</value>
-							</nomatch>
-							<match Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="Epona_Sheep_Wool"]/stuffProps/categories</xpath>
-								<value>
-									<li>SoftArmor</li>
-								</value>
-							</match>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Epona Race/ThingDefs_Misc/Epona_Apparel.xml b/Patches/Epona Race/ThingDefs_Misc/Epona_Apparel.xml
deleted file mode 100644
index 019a042e35..0000000000
--- a/Patches/Epona Race/ThingDefs_Misc/Epona_Apparel.xml	
+++ /dev/null
@@ -1,379 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Epona Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--========= Stuffable =========-->
-
-						<!--Shirt-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_EponaShirt" or
-								defName="Apparel_EponaShirtNoSleeves" or
-								defName="Apparel_EponaThighSocks" or
-								defName="Apparel_EponaThighSocksSkirt"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<!--Beret-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_EponaHelmetBeret"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<!--Shirt-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_EponaRibbonRed" or
-								defName="Apparel_EponaRibbonBlue" or
-								defName="Apparel_EponaHairbandMaid"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>0.25</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<!--Barding-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="Apparel_EponaCoatBardPlain" or
-								defName="Apparel_EponaCoatBardBavaria" or
-								defName="Apparel_EponaCoatBardQuarter" or
-								defName="Apparel_EponaCoatBardCross" or
-								defName="Apparel_EponaCoatBardFleur" or
-								defName="Apparel_EponaCoatBardStripes" or
-								defName="Apparel_EponaCoatBardEagle" or
-								defName="Apparel_EponaCoatBardLion" or
-								defName="Apparel_EponaCoatBardClover" or
-								defName="Apparel_EponaCoatBardDiamond" or
-								defName="Apparel_EponaCoatBardHeart" or
-								defName="Apparel_EponaCoatBardSpade"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-								<Bulk>12.5</Bulk>
-								<WornBulk>4</WornBulk>
-							</value>
-						</li>
-
-						<!--Maid Coat-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="Apparel_EponaCoatMaid"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
-								<Bulk>7.5</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<!--Buff Coat-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="Apparel_EponaCoatBuff"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>7.5</StuffEffectMultiplierArmor>
-								<Bulk>12.5</Bulk>
-								<WornBulk>4</WornBulk>
-							</value>
-						</li>
-
-						<!--Robe-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="Apparel_EponaRobeArctic"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
-								<Bulk>7.5</Bulk>
-								<WornBulk>3</WornBulk>
-							</value>
-						</li>
-
-						<!--Cloak-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="Apparel_EponaRobeCloak"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-								<Bulk>5</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<!--Breastplate-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="Apparel_EponaArmorBreastplate"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-								<Bulk>5</Bulk>
-								<WornBulk>3</WornBulk>
-							</value>
-						</li>
-
-						<!--Full Plate-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="Apparel_EponaArmorFullPlate"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>2.7</StuffEffectMultiplierArmor>
-								<Bulk>100</Bulk>
-								<WornBulk>6</WornBulk>
-							</value>
-						</li>
-
-						<!--Plate Leggings-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="Apparel_EponaThighGreaves"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-								<Bulk>5</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<!--Plate Helmets-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="Apparel_EponaHelmetLobster"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-								<Bulk>3</Bulk>
-								<WornBulk>0.5</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="Apparel_EponaHelmetBurgonet"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>4.5</StuffEffectMultiplierArmor>
-								<Bulk>3</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="Apparel_EponaHelmetArmet"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
-								<Bulk>3</Bulk>
-								<WornBulk>2</WornBulk>
-							</value>
-						</li>
-
-						<!--Metallic Armor Adjustments-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="Apparel_EponaHelmetArmet" or
-								defName="Apparel_EponaHelmetBurgonet" or
-								defName="Apparel_EponaHelmetLobster" or
-								defName="Apparel_EponaThighGreaves" or
-								defName="Apparel_EponaArmorFullPlate" or
-								defName="Apparel_EponaArmorBreastplate"
-								]/stuffCategories </xpath>
-							<value>
-								<stuffCategories>
-									<li>Steeled</li>
-								</stuffCategories>
-							</value>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[
-								defName="Apparel_EponaHelmetArmet" or
-								defName="Apparel_EponaHelmetBurgonet" or
-								defName="Apparel_EponaThighGreaves" or
-								defName="Apparel_EponaArmorFullPlate" or
-								defName="Apparel_EponaArmorBreastplate"
-								]/equippedStatOffsets/MoveSpeed </xpath>
-						</li>
-
-						<!--========= Fixed Armor Value =========-->
-
-						<!--Royalrobe-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Apparel_EponaRobeRoyalRed" or
-								defName="Apparel_EponaRobeRoyalBlue"
-								]/statBases </xpath>
-							<value>
-								<Bulk>5</Bulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_EponaRobeRoyalRed" or
-								defName="Apparel_EponaRobeRoyalBlue"]/statBases/ArmorRating_Sharp </xpath>
-							<value>
-								<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_EponaRobeRoyalRed" or
-								defName="Apparel_EponaRobeRoyalBlue"]/statBases/ArmorRating_Blunt </xpath>
-							<value>
-								<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--EVA Coat-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Apparel_EponaSpaceSuitRobe"]/statBases</xpath>
-							<value>
-								<Bulk>10</Bulk>
-								<WornBulk>5</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_EponaSpaceSuitRobe"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>5</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_EponaSpaceSuitRobe"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--EVA-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_EponaEVASuit"]/statBases/Mass</xpath>
-							<value>
-								<Bulk>100</Bulk>
-								<WornBulk>15</WornBulk>
-								<Mass>50</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_EponaEVASuit"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>20</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_EponaEVASuit"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>45</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_EponaEVASuit"]/equippedStatOffsets/MoveSpeed</xpath>
-							<value>
-								<CarryWeight>80</CarryWeight>
-								<CarryBulk>10</CarryBulk>
-								<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-								<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-								<MoveSpeed>-0.8</MoveSpeed>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Apparel_EponaEVASuit"]/costList</xpath>
-							<value>
-								<DevilstrandCloth>50</DevilstrandCloth>
-							</value>
-						</li>
-
-						<!--EVA Helmet-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Apparel_EponaSpaceSuitHelmet"]/statBases</xpath>
-							<value>
-								<Bulk>5</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_EponaSpaceSuitHelmet"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>16</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_EponaSpaceSuitHelmet"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>36</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="Apparel_EponaSpaceSuitHelmet"]/apparel/immuneToToxGasExposure</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="Apparel_EponaSpaceSuitHelmet"]/apparel</xpath>
-								<value>
-									<immuneToToxGasExposure>true</immuneToToxGasExposure>
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_EponaSpaceSuitHelmet"]/equippedStatOffsets/MoveSpeed</xpath>
-							<value>
-								<AimingAccuracy>0.15</AimingAccuracy>
-								<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-								<SmokeSensitivity>-1</SmokeSensitivity>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Apparel_EponaSpaceSuitHelmet"]/costList</xpath>
-							<value>
-								<DevilstrandCloth>20</DevilstrandCloth>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Epona Race/ThingDefs_Misc/Weapons.xml b/Patches/Epona Race/ThingDefs_Misc/Weapons.xml
deleted file mode 100644
index 20f3d98b68..0000000000
--- a/Patches/Epona Race/ThingDefs_Misc/Weapons.xml	
+++ /dev/null
@@ -1,939 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Epona Race</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!-- ========== Dirk =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Epona_SwordDirk"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>1.26</cooldownTime>
-										<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>blade</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>10</power>
-										<cooldownTime>1.18</cooldownTime>
-										<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.32</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>point</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>11</power>
-										<cooldownTime>1.26</cooldownTime>
-										<chanceFactor>1.33</chanceFactor>
-										<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.42</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Epona_SwordDirk"]/statBases</xpath>
-							<value>
-								<MeleeCounterParryBonus>0.39</MeleeCounterParryBonus>
-								<Bulk>1.5</Bulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Epona_SwordDirk"]/equippedStatOffsets</xpath>
-							<value>
-								<MeleeCritChance>0.08</MeleeCritChance>
-								<MeleeParryChance>0.24</MeleeParryChance>
-								<MeleeDodgeChance>1.07</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<!-- ========== Falchion =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Epona_SwordFalchion"]/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>32</power>
-										<cooldownTime>1.34</cooldownTime>
-										<chanceFactor>1.33</chanceFactor>
-										<armorPenetrationBlunt>0.956</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.43</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Epona_SwordFalchion"]/statBases</xpath>
-							<value>
-								<Bulk>3.5</Bulk>
-								<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Epona_SwordFalchion"]/equippedStatOffsets</xpath>
-							<value>
-								<MeleeCritChance>0.2</MeleeCritChance>
-								<MeleeParryChance>0.35</MeleeParryChance>
-								<MeleeDodgeChance>0.2</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<!-- ========== Sabre =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Epona_SwordSabre"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>3</power>
-										<cooldownTime>1.69</cooldownTime>
-										<chanceFactor>0.10</chanceFactor>
-										<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>point</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>18</power>
-										<cooldownTime>1.69</cooldownTime>
-										<chanceFactor>0.60</chanceFactor>
-										<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-										<armorPenetrationSharp>1.6</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>edge</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>36</power>
-										<cooldownTime>1.56</cooldownTime>
-										<chanceFactor>0.30</chanceFactor>
-										<armorPenetrationBlunt>2.592</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.58</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Epona_SwordSabre"]/statBases</xpath>
-							<value>
-								<Bulk>8</Bulk>
-								<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Epona_SwordSabre"]/equippedStatOffsets</xpath>
-							<value>
-								<MeleeCritChance>0.63</MeleeCritChance>
-								<MeleeParryChance>0.75</MeleeParryChance>
-								<MeleeDodgeChance>0.4</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<!-- ========== Epona_SwordClaymore =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Epona_SwordClaymore"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>5</power>
-										<cooldownTime>2.01</cooldownTime>
-										<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>point</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>60</power>
-										<cooldownTime>2.01</cooldownTime>
-										<chanceFactor>1.165</chanceFactor>
-										<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.89</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>edge</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>47</power>
-										<cooldownTime>3.12</cooldownTime>
-										<chanceFactor>1.165</chanceFactor>
-										<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.4</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Epona_SwordClaymore"]/statBases</xpath>
-							<value>
-								<Bulk>12</Bulk>
-								<MeleeCounterParryBonus>0.59</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Epona_SwordClaymore"]/equippedStatOffsets</xpath>
-							<value>
-								<MeleeCritChance>0.08</MeleeCritChance>
-								<MeleeParryChance>0.5</MeleeParryChance>
-								<MeleeDodgeChance>0.5</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<!-- ========== Dane Axe =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Epona_AxeDaneAxe"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>4</power>
-										<cooldownTime>1.78</cooldownTime>
-										<chanceFactor>0.10</chanceFactor>
-										<armorPenetrationBlunt>1</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>edge</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>31</power>
-										<cooldownTime>4.09</cooldownTime>
-										<chanceFactor>0.30</chanceFactor>
-										<armorPenetrationBlunt>4.84</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.97</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Epona_AxeDaneAxe"]/statBases</xpath>
-							<value>
-								<Bulk>8</Bulk>
-								<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Epona_AxeDaneAxe"]/equippedStatOffsets/MeleeHitChance</xpath>
-							<value>
-								<MeleeCritChance>0.06</MeleeCritChance>
-								<MeleeParryChance>0.75</MeleeParryChance>
-								<MeleeDodgeChance>0.50</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<!-- ========== Holy Axe =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Epona_EponaAxeHoly"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>shaft</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>6</power>
-										<cooldownTime>1.31</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>2.9</cooldownTime>
-										<chanceFactor>1.165</chanceFactor>
-										<armorPenetrationBlunt>8.1</armorPenetrationBlunt>
-										<armorPenetrationSharp>3.42</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>point</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>35</power>
-										<cooldownTime>1.16</cooldownTime>
-										<chanceFactor>1.165</chanceFactor>
-										<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
-										<armorPenetrationSharp>4.06</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Epona_EponaAxeHoly"]/statBases</xpath>
-							<value>
-								<Bulk>10</Bulk>
-								<MeleeCounterParryBonus>1.08</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Epona_EponaAxeHoly"]/equippedStatOffsets</xpath>
-							<value>
-								<MeleeCritChance>0.22</MeleeCritChance>
-								<MeleeParryChance>1.53</MeleeParryChance>
-								<MeleeDodgeChance>0.67</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<!-- ========== Lance =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Epona_Lance"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>point</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>47</power>
-										<cooldownTime>3.5</cooldownTime>
-										<chanceFactor>1.165</chanceFactor>
-										<armorPenetrationBlunt>9.06</armorPenetrationBlunt>
-										<armorPenetrationSharp>4.06</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Epona_Lance"]/statBases</xpath>
-							<value>
-								<Bulk>18</Bulk>
-								<MeleeCounterParryBonus>0.12</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Epona_Lance"]/equippedStatOffsets</xpath>
-							<value>
-								<MeleeCritChance>2.11</MeleeCritChance>
-								<MeleeParryChance>0.95</MeleeParryChance>
-								<MeleeDodgeChance>0.33</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<!-- ========== Shotgun =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Epona_PonyShotgun</defName>
-							<statBases>
-								<Mass>3.00</Mass>
-								<RangedWeapon_Cooldown>0.8</RangedWeapon_Cooldown>
-								<ShotSpread>0.14</ShotSpread>
-								<SwayFactor>1.20</SwayFactor>
-								<Bulk>9.0</Bulk>
-								<SightsEfficiency>1</SightsEfficiency>
-								<WorkToMake>9500</WorkToMake>
-							</statBases>
-							<costList>
-								<Steel>45</Steel>
-								<WoodLog>10</WoodLog>
-								<ComponentIndustrial>1</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>16</range>
-								<soundCast>Shot_Shotgun</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>5</magazineSize>
-								<reloadOneAtATime>true</reloadOneAtATime>
-								<reloadTime>0.85</reloadTime>
-								<ammoSet>AmmoSet_12Gauge</ammoSet>
-							</AmmoUser>
-							<FireModes />
-							<weaponTags>
-							</weaponTags>
-						</li>
-
-						<!-- ========== Repeater =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Epona_PonyRifle</defName>
-							<statBases>
-								<WorkToMake>11500</WorkToMake>
-								<SightsEfficiency>2.12</SightsEfficiency>
-								<ShotSpread>0.02</ShotSpread>
-								<SwayFactor>1.68</SwayFactor>
-								<Bulk>12.50</Bulk>
-								<Mass>4.30</Mass>
-								<RangedWeapon_Cooldown>0.80</RangedWeapon_Cooldown>
-							</statBases>
-							<costList>
-								<Steel>60</Steel>
-								<ComponentIndustrial>1</ComponentIndustrial>
-								<WoodLog>10</WoodLog>
-							</costList>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_44-40Winchester_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>55</range>
-								<soundCast>Shot_Shotgun</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>15</magazineSize>
-								<reloadOneAtATime>true</reloadOneAtATime>
-								<reloadTime>0.85</reloadTime>
-								<ammoSet>AmmoSet_44-40Winchester</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-							<weaponTags>
-							</weaponTags>
-						</li>
-
-						<!-- ========== Repeating shotgun =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Epona_ZebraShotgun</defName>
-							<statBases>
-								<Mass>3.50</Mass>
-								<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-								<ShotSpread>0.15</ShotSpread>
-								<SwayFactor>1.26</SwayFactor>
-								<Bulk>6.7</Bulk>
-								<SightsEfficiency>1</SightsEfficiency>
-								<WorkToMake>22500</WorkToMake>
-							</statBases>
-							<costList>
-								<Steel>40</Steel>
-								<ComponentIndustrial>3</ComponentIndustrial>
-								<Chemfuel>10</Chemfuel>
-							</costList>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>16</range>
-								<soundCast>Shot_Shotgun</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>20</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_12Gauge</ammoSet>
-							</AmmoUser>
-							<FireModes />
-						</li>
-
-						<!-- ========== Repeating shotgun =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Epona_ZebraShotgunExplosive</defName>
-							<statBases>
-								<Mass>5.50</Mass>
-								<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-								<ShotSpread>0.15</ShotSpread>
-								<SwayFactor>1.41</SwayFactor>
-								<Bulk>6.7</Bulk>
-								<SightsEfficiency>1</SightsEfficiency>
-								<WorkToMake>25500</WorkToMake>
-							</statBases>
-							<costList>
-								<Steel>40</Steel>
-								<ComponentIndustrial>3</ComponentIndustrial>
-								<Chemfuel>10</Chemfuel>
-							</costList>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<recoilAmount>2.93</recoilAmount>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_20x42mmGrenade_HE</defaultProjectile>
-								<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-								<warmupTime>1.1</warmupTime>
-								<range>25</range>
-								<minRange>5</minRange>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<soundCast>Shot_Shotgun</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>14</muzzleFlashScale>
-								<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>8</magazineSize>
-								<reloadTime>5.1</reloadTime>
-								<ammoSet>AmmoSet_20x42mmGrenade</ammoSet>
-							</AmmoUser>
-							<FireModes />
-						</li>
-
-						<!-- ========== Nuckelavee =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Epona_NuckelaveeShotgun</defName>
-							<statBases>
-								<Mass>4.50</Mass>
-								<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-								<ShotSpread>0.15</ShotSpread>
-								<SwayFactor>1.29</SwayFactor>
-								<Bulk>7.7</Bulk>
-								<SightsEfficiency>1</SightsEfficiency>
-								<WorkToMake>22500</WorkToMake>
-							</statBases>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_Epona_NapalmShotgun</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>16</range>
-								<soundCast>Shot_Minigun</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>5</magazineSize>
-								<reloadOneAtATime>true</reloadOneAtATime>
-								<reloadTime>0.85</reloadTime>
-								<ammoSet>AmmoSet_NuckelaveeShotgun</ammoSet>
-							</AmmoUser>
-							<FireModes />
-						</li>
-
-						<!-- ========== Assault Rifle =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Epona_ColtTacticalRifle</defName>
-							<statBases>
-								<Mass>3.0</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-								<SightsEfficiency>1</SightsEfficiency>
-								<ShotSpread>0.07</ShotSpread>
-								<SwayFactor>1.31</SwayFactor>
-								<Bulk>10.03</Bulk>
-								<WorkToMake>30000</WorkToMake>
-							</statBases>
-							<costList>
-								<Steel>50</Steel>
-								<ComponentIndustrial>5</ComponentIndustrial>
-								<Chemfuel>10</Chemfuel>
-							</costList>
-							<Properties>
-								<recoilAmount>1.53</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>55</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-								<soundCast>Shot_HeavySMG</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>30</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== LMG =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Epona_DestrierTacticalMachinegun</defName>
-							<statBases>
-								<WorkToMake>40500</WorkToMake>
-								<SightsEfficiency>1</SightsEfficiency>
-								<ShotSpread>0.06</ShotSpread>
-								<SwayFactor>1.48</SwayFactor>
-								<Bulk>12.05</Bulk>
-								<Mass>10.50</Mass>
-								<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-							</statBases>
-							<costList>
-								<Steel>85</Steel>
-								<ComponentIndustrial>6</ComponentIndustrial>
-								<Chemfuel>15</Chemfuel>
-							</costList>
-							<Properties>
-								<recoilAmount>1.3</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-								<warmupTime>1.2</warmupTime>
-								<range>62</range>
-								<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-								<burstShotCount>10</burstShotCount>
-								<soundCast>Shot_Minigun</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<recoilPattern>Mounted</recoilPattern>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>45</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>SuppressFire</aiAimMode>
-								<aimedBurstShotCount>5</aimedBurstShotCount>
-							</FireModes>
-						</li>
-
-						<!-- ========== Rail Rifle =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Epona_CourserRailgun</defName>
-							<statBases>
-								<Mass>4.2</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.1</SightsEfficiency>
-								<ShotSpread>0.07</ShotSpread>
-								<SwayFactor>1.43</SwayFactor>
-								<Bulk>11.12</Bulk>
-							</statBases>
-							<Properties>
-								<recoilAmount>2.25</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_6mmRailgun_Sabot</defaultProjectile>
-								<warmupTime>1.0</warmupTime>
-								<range>62</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-								<soundCast>Epona_RailgunSound</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>30</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_6mmRailgun</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== Ram HMG =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Epona_BattleRamHMG</defName>
-							<statBases>
-								<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-								<SightsEfficiency>0.8</SightsEfficiency>
-								<ShotSpread>0.8</ShotSpread>
-								<SwayFactor>1.89</SwayFactor>
-								<Bulk>18</Bulk>
-							</statBases>
-							<Properties>
-								<recoilAmount>1.88</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-								<warmupTime>2.5</warmupTime>
-								<range>51</range>
-								<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-								<burstShotCount>20</burstShotCount>
-								<soundCast>Shot_SniperRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>14</muzzleFlashScale>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<recoilPattern>Mounted</recoilPattern>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>200</magazineSize>
-								<reloadTime>20</reloadTime>
-								<ammoSet>AmmoSet_50BMG</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>10</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>SuppressFire</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== Ram Mortar =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Epona_BattleRamGL</defName>
-							<statBases>
-								<SightsEfficiency>1</SightsEfficiency>
-								<ShotSpread>0.30</ShotSpread>
-								<SwayFactor>1.00</SwayFactor>
-								<Bulk>7.31</Bulk>
-								<Mass>20.00</Mass>
-								<RangedWeapon_Cooldown>6</RangedWeapon_Cooldown>
-							</statBases>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-								<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_60mmMortarShell_HE</defaultProjectile>
-								<warmupTime>3</warmupTime>
-								<minRange>10</minRange>
-								<range>40</range>
-								<burstShotCount>3</burstShotCount>
-								<ticksBetweenBurstShots>120</ticksBetweenBurstShots>
-								<soundCast>Shot_IncendiaryLauncher</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>16</muzzleFlashScale>
-								<circularError>2.5</circularError>
-								<indirectFirePenalty>0.2</indirectFirePenalty>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>6</magazineSize>
-								<reloadTime>12</reloadTime>
-								<ammoSet>AmmoSet_60mmMortarShell</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>2</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>SuppressFire</aiAimMode>
-							</FireModes>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Epona_BattleRamGL"]/comps</xpath>
-							<value>
-								<li Class="CombatExtended.CompProperties_Charges">
-									<chargeSpeeds>
-										<li>30</li>
-										<li>50</li>
-										<li>70</li>
-										<li>90</li>
-									</chargeSpeeds>
-								</li>
-							</value>
-						</li>
-
-						<!-- ========== Melee Attacks =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Epona_CourserRailgun" or
-								defName="Epona_DestrierTacticalMachinegun" or
-								defName="Epona_ZebraShotgunExplosive" or
-								defName="Epona_ZebraShotgun" or
-								defName="Epona_PonyRifle" or
-								defName="Epona_PonyShotgun"
-								]/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>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Epona_ColtTacticalRifle"
-								]/tools </xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>stock</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>8</power>
-										<cooldownTime>1.55</cooldownTime>
-										<chanceFactor>0.5</chanceFactor>
-										<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>point</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>14</power>
-										<cooldownTime>1.69</cooldownTime>
-										<chanceFactor>1</chanceFactor>
-										<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-										<armorPenetrationSharp>1.6</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Epona_NuckelaveeShotgun"
-								]/tools </xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>stock</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>8</power>
-										<cooldownTime>1.55</cooldownTime>
-										<chanceFactor>0.5</chanceFactor>
-										<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>point</label>
-										<capacities>
-											<li>Stab</li>
-											<li>Cut</li>
-										</capacities>
-										<power>14</power>
-										<cooldownTime>1.69</cooldownTime>
-										<chanceFactor>1</chanceFactor>
-										<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-										<armorPenetrationSharp>1.6</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Epona Race/ThingDefs_Misc/Weapons_Spacer.xml b/Patches/Epona Race/ThingDefs_Misc/Weapons_Spacer.xml
deleted file mode 100644
index 28905e04a3..0000000000
--- a/Patches/Epona Race/ThingDefs_Misc/Weapons_Spacer.xml	
+++ /dev/null
@@ -1,309 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Epona Race</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!-- ========== Shock =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Epona_PegasusShock</defName>
-							<statBases>
-								<SightsEfficiency>2.12</SightsEfficiency>
-								<ShotSpread>0.1</ShotSpread>
-								<SwayFactor>1.60</SwayFactor>
-								<Bulk>7</Bulk>
-								<Mass>9</Mass>
-								<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-							</statBases>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_Epona_Shock</defaultProjectile>
-								<warmupTime>1.35</warmupTime>
-								<range>62</range>
-								<soundCast>Epona_Pulsecarbine</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>15</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_Epona_Shock</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-							<weaponTags>
-							</weaponTags>
-						</li>
-
-						<!-- ========== Shard =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Epona_PegasusShards</defName>
-							<statBases>
-								<Mass>5.0</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.1</SightsEfficiency>
-								<ShotSpread>0.11</ShotSpread>
-								<SwayFactor>1.15</SwayFactor>
-								<Bulk>6.50</Bulk>
-							</statBases>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<recoilAmount>2.05</recoilAmount>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_Epona_Shard</defaultProjectile>
-								<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-								<warmupTime>0.5</warmupTime>
-								<range>31</range>
-								<burstShotCount>3</burstShotCount>
-								<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<soundCast>Epona_ShardsSound</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>14</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>15</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_Epona_Shard</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>2</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== Plasma =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Epona_PegasusMolten</defName>
-							<statBases>
-								<Mass>15</Mass>
-								<RangedWeapon_Cooldown>1.57</RangedWeapon_Cooldown>
-								<ShotSpread>0.15</ShotSpread>
-								<SwayFactor>2.55</SwayFactor>
-								<Bulk>11.50</Bulk>
-								<SightsEfficiency>1.10</SightsEfficiency>
-							</statBases>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<recoilAmount>2.93</recoilAmount>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_Epona_Molten</defaultProjectile>
-								<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-								<warmupTime>1.1</warmupTime>
-								<range>51</range>
-								<minRange>5</minRange>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<soundCast>Epona_SunmakerSound</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>11</muzzleFlashScale>
-								<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-								<ammoConsumedPerShotCount>25</ammoConsumedPerShotCount>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>25</magazineSize>
-								<reloadTime>5.2</reloadTime>
-								<ammoSet>AmmoSet_Epona_Molten</ammoSet>
-							</AmmoUser>
-							<FireModes />
-						</li>
-
-						<!-- ========== Lance =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Epona_LancePlasma</defName>
-							<statBases>
-								<Mass>21</Mass>
-								<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-								<SightsEfficiency>1</SightsEfficiency>
-								<ShotSpread>0.11</ShotSpread>
-								<SwayFactor>3.50</SwayFactor>
-								<Bulk>14</Bulk>
-							</statBases>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<recoilAmount>0.05</recoilAmount>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_Epona_Shard</defaultProjectile>
-								<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-								<warmupTime>2.5</warmupTime>
-								<range>12</range>
-								<burstShotCount>60</burstShotCount>
-								<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<soundCast>Epona_PlasmaSound</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>11</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>120</magazineSize>
-								<reloadTime>7.8</reloadTime>
-								<ammoSet>AmmoSet_Epona_Plasma</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>30</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<noSingleShot>true</noSingleShot>
-							</FireModes>
-						</li>
-
-						<!-- ========== Hippogryph Railgun =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Epona_HippogryphRailgun</defName>
-							<statBases>
-								<Mass>8.5</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-								<SightsEfficiency>2.60</SightsEfficiency>
-								<ShotSpread>0.07</ShotSpread>
-								<SwayFactor>1.89</SwayFactor>
-								<Bulk>12.85</Bulk>
-							</statBases>
-							<Properties>
-								<recoilAmount>2.25</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_6mmRailgun_Sabot</defaultProjectile>
-								<warmupTime>1.5</warmupTime>
-								<range>75</range>
-								<soundCast>Epona_RailgunSound</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>5</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_8mmRailgun</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== Nightmare =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Epona_NightmareShock</defName>
-							<statBases>
-								<Mass>2.0</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-								<SightsEfficiency>1</SightsEfficiency>
-								<ShotSpread>0.07</ShotSpread>
-								<SwayFactor>0.85</SwayFactor>
-								<Bulk>6.25</Bulk>
-							</statBases>
-							<Properties>
-								<recoilAmount>2.52</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_6mmEponaShock</defaultProjectile>
-								<warmupTime>0.50</warmupTime>
-								<range>31</range>
-								<burstShotCount>5</burstShotCount>
-								<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-								<soundCast>Epona_SilencerSound</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>30</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_6mmEponaShock</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== Melee Attacks =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Epona_PegasusShock" or
-								defName="Epona_PegasusShards" or
-								defName="Epona_PegasusMolten" or
-								defName="Epona_HippogryphRailgun" or
-								defName="Epona_NightmareShock"
-								]/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>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Epona_LancePlasma"
-								]/tools </xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>point</label>
-										<capacities>
-											<li>MeleePlasma</li>
-										</capacities>
-										<power>30</power>
-										<cooldownTime>4</cooldownTime>
-										<chanceFactor>1</chanceFactor>
-										<armorPenetrationBlunt>25</armorPenetrationBlunt>
-										<armorPenetrationSharp>30</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Epona Race/ThingDefs_Races/AlienRace_Epona.xml b/Patches/Epona Race/ThingDefs_Races/AlienRace_Epona.xml
deleted file mode 100644
index 5f6e46cc02..0000000000
--- a/Patches/Epona Race/ThingDefs_Races/AlienRace_Epona.xml	
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Epona Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="EponaCentaur_PawnBase"]/comps</xpath>
-							<value>
-								<li>
-									<compClass>CombatExtended.CompPawnGizmo</compClass>
-								</li>
-								<li Class="CombatExtended.CompProperties_Suppressable" />
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="EponaCentaur_PawnBase"]/inspectorTabs/li[.="ITab_Pawn_Gear"]</xpath>
-							<value>
-								<li>CombatExtended.ITab_Inventory</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="EponaCentaur_PawnBase"]/comps</xpath>
-							<value>
-								<li Class="CombatExtended.CompProperties_Inventory" />
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Eponalike"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Humanoid</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Eponalike"]/statBases</xpath>
-							<value>
-								<!--Quadruped means better leverage, especially on offense.-->
-								<MeleeCritChance>1.15</MeleeCritChance>
-								<MeleeParryChance>1.10</MeleeParryChance>
-								<Suppressability>1</Suppressability>
-								<SmokeSensitivity>1</SmokeSensitivity>
-								<CarryBulk>32</CarryBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Eponalike"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>1.25</cooldownTime>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.313</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>right fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>1.25</cooldownTime>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.313</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>hooves</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>10</power>
-										<cooldownTime>2.5</cooldownTime>
-										<chanceFactor>0.5</chanceFactor>
-										<linkedBodyPartsGroup>CentaurHooves</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>3.850</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<!--Quadruped means better leverage, especially on offense.-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Eponalike"]/alienRace/raceRestriction/whiteApparelList</xpath>
-							<value>
-								<li>CE_Apparel_BallisticShield</li>
-								<li>CE_Apparel_MeleeShield</li>
-								<li>CE_Apparel_GasMask</li>
-								<li>CE_Apparel_ImprovGasMask</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Epona Race/ThingDefs_Races/Race_Sheep.xml b/Patches/Epona Race/ThingDefs_Races/Race_Sheep.xml
deleted file mode 100644
index ac44ed894e..0000000000
--- a/Patches/Epona Race/ThingDefs_Races/Race_Sheep.xml	
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Epona Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--Giant Sheep-->
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[defName="Epona_Sheep"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Quadruped</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Epona_Sheep"]/statBases</xpath>
-							<value>
-								<MeleeDodgeChance>0.08</MeleeDodgeChance>
-								<MeleeCritChance>0.79</MeleeCritChance>
-								<MeleeParryChance>0.51</MeleeParryChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Epona_Sheep"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>55</power>
-										<cooldownTime>3.99</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationBlunt>25</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Epona_Sheep"]/race/baseBodySize</xpath>
-							<value>
-								<baseBodySize>3</baseBodySize>
-							</value>
-						</li>
-
-						<!--Giant War Sheep-->
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[defName="Epona_WarRam"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Quadruped</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Epona_WarRam"]/statBases</xpath>
-							<value>
-								<MeleeDodgeChance>0.12</MeleeDodgeChance>
-								<MeleeCritChance>0.85</MeleeCritChance>
-								<MeleeParryChance>0.55</MeleeParryChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Epona_WarRam"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>3</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Epona_WarRam"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>4.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="Epona_WarRam"]/statBases/ArmorRating_Heat</xpath>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Epona_WarRam"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>55</power>
-										<cooldownTime>3.99</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationBlunt>25</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Epona_WarRam"]/race/baseBodySize</xpath>
-							<value>
-								<baseBodySize>3</baseBodySize>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Equium/Equium_Race.xml b/Patches/Equium/Equium_Race.xml
deleted file mode 100644
index 4ac9953bf0..0000000000
--- a/Patches/Equium/Equium_Race.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Equiums</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Turn our horse boys into horse *boys* ========== -->
-				<!-- ========== To be human is to be a tall brick 	  ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<!-- === Note to future furball compatibility nerds: 		=== -->
-					<!-- === Paste the defName of your horrible alien there   |	=== -->
-					<!-- === 												  V	=== -->
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Equium"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Gives Gun Gizmos to Equium HUD thing ========== -->
-				<!-- ========== Also Makes Em Suppressable		   ========== -->
-
-				<li Class="PatchOperationAdd">
-					<!-- === Shouldn't need to change this at all		  === -->
-					<!-- === Unless you changed the name of your BasePawn === -->
-					<!-- === In which case change "BasePawn" to that name === -->
-					<xpath>Defs/ThingDef[@Name="BaseEquium"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-				<!-- === Patch Equium default melee attacks === -->
-				<!-- === For the most part, it adds the CE melee handler thing 	=== -->
-				<!-- === And also defines armor penetration, which allows them	=== -->
-				<!-- === to actually do damage. Try attacking a raccoon with an === -->
-				<!-- === unpatched melee attack. I'll wait.						=== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Equium"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.9</AimingAccuracy>
-						<MeleeCritChance>1.5</MeleeCritChance>
-						<MeleeParryChance>01.1</MeleeParryChance>
-						<ReloadSpeed>0.9</ReloadSpeed>
-						<Suppressability>0.85</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Equium"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left handnhoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>LeftHandnHoof</linkedBodyPartsGroup>
-								<armorPenetration>0.12</armorPenetration>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right handnhoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>RightHandnHoof</linkedBodyPartsGroup>
-								<armorPenetration>0.12</armorPenetration>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.9</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetration>0.20</armorPenetration>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ===================================== -->
-				<!-- === BaseBodySize, ArmorRatings, MoveSpeed, and BaseHealth should already be set. I think. === -->
-				<!-- ===================================== -->
-				<!-- === Adds In Inspector Tabs 	   === -->
-				<!-- === Inventory and all that jazz   === -->
-				<!-- === Again, no need to change 'em  === -->
-				<!-- === Unless you changed it         === -->
-				<!-- === then change 'em			   === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="BaseEquium"]/inspectorTabs/li[.="ITab_Pawn_Gear"]</xpath>
-					<value>
-						<li>CombatExtended.ITab_Inventory</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-
-					<xpath>Defs/ThingDef[@Name="BaseEquium"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Inventory" />
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-	<!-- === Congratulations! Your alien is Combat Ready!	 === -->
-	<!-- === If your alien comes with extra guns and gear,	 === -->
-	<!-- === Congratulations! You're not even close to done! === -->
-</Patch>
\ No newline at end of file
diff --git a/Patches/Equium/PawnKinds_Equium.xml b/Patches/Equium/PawnKinds_Equium.xml
deleted file mode 100644
index 7af35b391b..0000000000
--- a/Patches/Equium/PawnKinds_Equium.xml
+++ /dev/null
@@ -1,323 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Equiums</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== Scoot ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="EquiumVillager"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="EquiumPackLeader"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="EquiumElder"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="EquiumTrader"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="EquiumSlave"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="HorseInBlack"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>8</min>
-								<max>9</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="HorseInBlackJoin"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="EquiumRefugee"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="EquiumHunter"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="EquiumSecurityGuard"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Equium/PawnKinds_Equium_Gangs.xml b/Patches/Equium/PawnKinds_Equium_Gangs.xml
deleted file mode 100644
index 48263e8504..0000000000
--- a/Patches/Equium/PawnKinds_Equium_Gangs.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Equiums</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== Scoot ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="EquiumThug"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="EquiumBully"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="EquiumGangLeader"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="EquiumDealer"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Equium/PawnKinds_Equium_Military.xml b/Patches/Equium/PawnKinds_Equium_Military.xml
deleted file mode 100644
index 58bdace1e8..0000000000
--- a/Patches/Equium/PawnKinds_Equium_Military.xml
+++ /dev/null
@@ -1,292 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Equiums</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== Scoot ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="EquiumRecruitUnarmed"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="EquiumRecruit"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="EquiumPrivateUnarmed"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="EquiumPrivate"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="EquiumCombatSpecialist"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="EquiumMilitaryTrader"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>8</min>
-								<max>9</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="EquiumExplosiveSpecialist"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="EquiumXO"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="EquiumCommander"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Equium/PawnKinds_Equium_Tribal.xml b/Patches/Equium/PawnKinds_Equium_Tribal.xml
deleted file mode 100644
index cd402cf7a8..0000000000
--- a/Patches/Equium/PawnKinds_Equium_Tribal.xml
+++ /dev/null
@@ -1,323 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Equiums</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== Scoot ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="EquiumTribalMember"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>30</min>
-								<max>50</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="EquiumTribalElder"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>30</min>
-								<max>50</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="EquiumTribalWarrior"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>30</min>
-								<max>50</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="EquiumTribalTrader"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>30</min>
-								<max>50</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="EquiumTribalArcher"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>30</min>
-								<max>50</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="EquiumTribalHunter"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>8</min>
-								<max>9</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="EquiumTribalHeavyArcher"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>30</min>
-								<max>50</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="EquiumTribalBerserker"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>30</min>
-								<max>50</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="EquiumTribalChiefMelee"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>30</min>
-								<max>50</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="EquiumTribalChiefRanged"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>30</min>
-								<max>50</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Au Ra/Patch_Bodies.xml b/Patches/Erin's Au Ra/Patch_Bodies.xml
deleted file mode 100644
index a785156849..0000000000
--- a/Patches/Erin's Au Ra/Patch_Bodies.xml	
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Au Ra</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "AURA_AuRa"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "right eye"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "AURA_AuRa"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "left eye"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "AURA_AuRa"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "AURA_AuRa"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "AURA_AuRa"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "AURA_AuRa"]/corePart/parts/li[def = "Neck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "AURA_AuRa"]/corePart/parts/li[def = "AURA_AuRaTail"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "AURA_AuRa"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "AURA_AuRa"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Jaw"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "AURA_AuRa"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Nose"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "AURA_AuRa"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Ear"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "AURA_AuRa"]/corePart/parts/li[def = "Shoulder"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "AURA_AuRa"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "AURA_AuRa"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "AURA_AuRa"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/parts/li[def = "Finger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "AURA_AuRa"]/corePart/parts/li[def = "Leg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "AURA_AuRa"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "AURA_AuRa"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/parts/li[def = "Toe"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Au Ra/PawnKinds.xml b/Patches/Erin's Au Ra/PawnKinds.xml
deleted file mode 100644
index a168427242..0000000000
--- a/Patches/Erin's Au Ra/PawnKinds.xml	
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Au Ra</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Give ammo to pawns. ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="AURA_RaenTribalBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>12</min>
-								<max>20</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>100</min>
-										<max>600</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>NeolithicMeleeBasic</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						@Name="AURA_RaenOutlanderBase" or
-						@Name="AURA_RaenMercenaryMercenaryBase" or
-						@Name="AURA_RaenPirateBase" or
-						defName="AURA_RaenAncientSoldier"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>8</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Au Ra/Race_AuRa.xml b/Patches/Erin's Au Ra/Race_AuRa.xml
deleted file mode 100644
index 18bac8e978..0000000000
--- a/Patches/Erin's Au Ra/Race_AuRa.xml	
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Au Ra</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="AURA_AuRa"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="AURA_AuRa"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="AURA_AuRa"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="AURA_AuRa"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<CarryWeight>35</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="AURA_AuRa"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="AURA_AuRa"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Auronya Biotech/Auronya_Hediffs_BodyParts.xml b/Patches/Erin's Auronya Biotech/Auronya_Hediffs_BodyParts.xml
deleted file mode 100644
index b9a0cad5da..0000000000
--- a/Patches/Erin's Auronya Biotech/Auronya_Hediffs_BodyParts.xml	
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Auronya</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ERN_AuronyaClaws"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>8</power>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.18</armorPenetrationSharp>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<cooldownTime>1.5</cooldownTime>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Auronya/PawnKinds_Auronya.xml b/Patches/Erin's Auronya/PawnKinds_Auronya.xml
deleted file mode 100644
index bd329c1d8d..0000000000
--- a/Patches/Erin's Auronya/PawnKinds_Auronya.xml	
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Auronya - HAR Edition</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Give ammo to pawns. ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="ERN_KoyanTribalBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>12</min>
-								<max>20</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>100</min>
-										<max>600</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>NeolithicMeleeBasic</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						@Name="ERN_KoyanOutlanderBase" or
-						@Name="ERN_KoyanMercenaryBase" or
-						@Name="ERN_KoyanPirateBase" or
-						defName="ERN_KoyanAncientSoldier"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>8</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Auronya/Race_Auronya.xml b/Patches/Erin's Auronya/Race_Auronya.xml
deleted file mode 100644
index 5989859b91..0000000000
--- a/Patches/Erin's Auronya/Race_Auronya.xml	
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Auronya - HAR Edition</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Koyan"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Koyan"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Koyan"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Koyan"]/statBases/MeleeDodgeChance</xpath>
-					<value>
-						<NightVisionEfficiency>0.4</NightVisionEfficiency>
-						<MeleeDodgeChance>1.25</MeleeDodgeChance>
-						<MeleeCritChance>0.8</MeleeCritChance>
-						<MeleeParryChance>0.85</MeleeParryChance>
-						<CarryWeight>35</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Koyan"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.07</chanceFactor>
-								<armorPenetrationSharp>0.9</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
-								<soundMeleeHit>Pawn_Melee_HumanBite_Hit</soundMeleeHit>
-								<soundMeleeMiss>Pawn_Melee_HumanBite_Miss</soundMeleeMiss>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Koyan"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Azaphrae/Animal_Nuzox.xml b/Patches/Erin's Azaphrae/Animal_Nuzox.xml
deleted file mode 100644
index 8ffcd58cae..0000000000
--- a/Patches/Erin's Azaphrae/Animal_Nuzox.xml	
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Azaphrae</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= Nuzox Animal Stats ======= -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ERN_Nuzox"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ERN_Nuzox"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.28</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-						<MeleeParryChance>0.02</MeleeParryChance>
-						<SightsEfficiency>1</SightsEfficiency>
-						<AimingAccuracy>0.8</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ERN_Nuzox"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>false</hasStandardCommand>
-								<defaultProjectile>ERN_NuzoxSpit</defaultProjectile>
-								<burstShotCount>1</burstShotCount>
-								<warmupTime>1.5</warmupTime>
-								<range>10</range>
-								<minRange>2</minRange>
-								<muzzleFlashScale>1</muzzleFlashScale>
-								<label>Nuzox Spit</label>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- ======= Nuzox Projectile Stats ======= -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ERN_NuzoxSpit"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ERN_NuzoxSpit"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<damageDef>ERN_NuzoxSpit</damageDef>
-							<damageAmountBase>2</damageAmountBase>
-							<explosionRadius>0.5</explosionRadius>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<speed>18</speed>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							<postExplosionSpawnThingDef>ERN_NuzoxSlime</postExplosionSpawnThingDef>
-							<preExplosionSpawnChance>1</preExplosionSpawnChance>
-							<postExplosionSpawnThingCount>2</postExplosionSpawnThingCount>
-							<explosionEffect>ExtinguisherExplosion</explosionEffect>
-						</projectile>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Azaphrae/Hediff_Racial_Azaphrae.xml b/Patches/Erin's Azaphrae/Hediff_Racial_Azaphrae.xml
deleted file mode 100644
index 227b2e7ddb..0000000000
--- a/Patches/Erin's Azaphrae/Hediff_Racial_Azaphrae.xml	
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Azaphrae</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= Adjusted Hediff Stats ======= -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ERN_AzaphraeMale"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.10</MeleeDodgeChance>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Azaphrae/PawnKinds.xml b/Patches/Erin's Azaphrae/PawnKinds.xml
deleted file mode 100644
index a1743a277b..0000000000
--- a/Patches/Erin's Azaphrae/PawnKinds.xml	
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Azaphrae</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= Give Ammo to PawnKinds ======= -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="ERN_MercenaryMercenaryBase" or @Name="ERN_AzaphraeOutlanderBase" or @Name="ERN_AzaphraePirateBase" or defName="ERN_AzaphraeAncientSoldier"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>8</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="ERN_AzaphraeTribalBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>12</min>
-								<max>20</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>100</min>
-										<max>600</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>NeolithicMeleeBasic</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Azaphrae/Race_Azaphrae.xml b/Patches/Erin's Azaphrae/Race_Azaphrae.xml
deleted file mode 100644
index a39e2c4afa..0000000000
--- a/Patches/Erin's Azaphrae/Race_Azaphrae.xml	
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Azaphrae</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Azaphrae"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Azaphrae"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Azaphrae"]</xpath>
-						<value>
-							<comps>
-								<li>
-									<compClass>CombatExtended.CompPawnGizmo</compClass>
-								</li>
-								<li Class="CombatExtended.CompProperties_Suppressable" />
-							</comps>
-						</value>
-					</nomatch>
-
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Azaphrae"]/comps</xpath>
-						<value>
-							<li>
-								<compClass>CombatExtended.CompPawnGizmo</compClass>
-							</li>
-							<li Class="CombatExtended.CompProperties_Suppressable" />
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Azaphrae"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<CarryWeight>35</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Azaphrae"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.89</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.07</chanceFactor>
-								<armorPenetrationSharp>0.725</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.150</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.35</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.850</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Azaphrae/Scenarios_Azaphrae.xml b/Patches/Erin's Azaphrae/Scenarios_Azaphrae.xml
deleted file mode 100644
index 75407392d0..0000000000
--- a/Patches/Erin's Azaphrae/Scenarios_Azaphrae.xml	
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Azaphrae</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="ERN_AzaphraeCrashlanded"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_303British_FMJ</thingDef>
-							<count>100</count>
-						</li>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_44Magnum_FMJ</thingDef>
-							<count>120</count>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ScenarioDef[defName="ERN_AzaphraeCrashlanded"]/scenario/parts/li[thingDef="Apparel_FlakPants"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ScenarioDef[defName="ERN_AzaphraeCrashlanded"]/scenario/parts/li[thingDef="Apparel_FlakVest"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ScenarioDef[defName="ERN_AzaphraeCrashlanded"]/scenario/parts/li[thingDef="Apparel_AdvancedHelmet"]</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Chocobos/Erin_Chocobos.xml b/Patches/Erin's Chocobos/Erin_Chocobos.xml
deleted file mode 100644
index 8a3c3c5bad..0000000000
--- a/Patches/Erin's Chocobos/Erin_Chocobos.xml	
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Chocobos</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ERN_Chocobo"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ERN_Chocobo"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.22</MeleeDodgeChance>
-						<MeleeCritChance>0.11</MeleeCritChance>
-						<MeleeParryChance>0.03</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ERN_Chocobo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.52</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.52</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>8.3</power>
-								<cooldownTime>1.93</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.350</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.82</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.05</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Critter Collection/ThingDefs_Races.xml b/Patches/Erin's Critter Collection/ThingDefs_Races.xml
deleted file mode 100644
index cf3b0ef556..0000000000
--- a/Patches/Erin's Critter Collection/ThingDefs_Races.xml	
+++ /dev/null
@@ -1,421 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Critter Collection</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === bodyShape === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Greyfox" or defName="Fisher" or defName="Hedgehog" or defName="Armadillo"]</xpath>
-
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Gartersnake"]</xpath>
-
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Serpentine</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Grey Fox === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Greyfox"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.24</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.02</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Greyfox"]/combatPower</xpath>
-
-					<value>
-						<combatPower>25</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Greyfox"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.91</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.198</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.91</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.198</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.49</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>1.440</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Fisher === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Fisher"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						<MeleeCritChance>0.07</MeleeCritChance>
-						<MeleeParryChance>0.16</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Fisher"]/combatPower</xpath>
-
-					<value>
-						<combatPower>60</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Fisher"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.67</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.67</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.88</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>3.00</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Hedgehog === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Hedgehog"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.17</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Hedgehog"]/combatPower</xpath>
-
-					<value>
-						<combatPower>5</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Hedgehog"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.67</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.67</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.88</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>3.00</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Garter Snake === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Gartersnake"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.20</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Gartersnake"]/combatPower</xpath>
-
-					<value>
-						<combatPower>5</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gartersnake"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fangs</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2.4</cooldownTime>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>9</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Armadillo === -->
-				<li Class="PatchOperationRemove">
-					<xpath>
-						Defs/ThingDef[defName="Armadillo"]/statBases/ArmorRating_Blunt |
-						Defs/ThingDef[defName="Armadillo"]/statBases/ArmorRating_Sharp
-					</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Armadillo"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.17</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0.13</MeleeParryChance>
-						<ArmorRating_Blunt>0.36</ArmorRating_Blunt>
-						<ArmorRating_Sharp>0.36</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Armadillo"]/combatPower</xpath>
-
-					<value>
-						<combatPower>25</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Armadillo"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.55</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.55</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.85</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>8</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.254</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.55</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Final Fantasy Races/PatchBodies_AuRa.xml b/Patches/Erin's Final Fantasy Races/PatchBodies_AuRa.xml
deleted file mode 100644
index 577a13e53b..0000000000
--- a/Patches/Erin's Final Fantasy Races/PatchBodies_AuRa.xml	
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Final Fantasy Races</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="AURA_AuRa"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel="right eye"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="AURA_AuRa"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel="left eye"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="AURA_AuRa"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="AURA_AuRa"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="AURA_AuRa"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="AURA_AuRa"]/corePart/parts/li[def="Neck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="AURA_AuRa"]/corePart/parts/li[def="AURA_AuRaTail"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="AURA_AuRa"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="AURA_AuRa"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="AURA_AuRa"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="AURA_AuRa"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="AURA_AuRa"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="AURA_AuRa"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="AURA_AuRa"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="AURA_AuRa"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="AURA_AuRa"]/corePart/parts/li[def="Leg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="AURA_AuRa"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="AURA_AuRa"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Final Fantasy Races/PatchBodies_MQ.xml b/Patches/Erin's Final Fantasy Races/PatchBodies_MQ.xml
deleted file mode 100644
index d2844f910a..0000000000
--- a/Patches/Erin's Final Fantasy Races/PatchBodies_MQ.xml	
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Final Fantasy Races</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MQT_Miqote"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel="right eye"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MQT_Miqote"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel="left eye"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MQT_Miqote"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MQT_Miqote"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MQT_Miqote"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MQT_Miqote"]/corePart/parts/li[def="Neck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MQT_Miqote"]/corePart/parts/li[def="MQT_MiqoteTail"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MQT_Miqote"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MQT_Miqote"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MQT_Miqote"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MQT_Miqote"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MQT_Miqote"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MQT_Miqote"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MQT_Miqote"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MQT_Miqote"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MQT_Miqote"]/corePart/parts/li[def="Leg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MQT_Miqote"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MQT_Miqote"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Final Fantasy Races/PawnKinds_AuRa.xml b/Patches/Erin's Final Fantasy Races/PawnKinds_AuRa.xml
deleted file mode 100644
index c1d29d606c..0000000000
--- a/Patches/Erin's Final Fantasy Races/PawnKinds_AuRa.xml	
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Final Fantasy Races</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Give ammo to pawns. ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="AURA_RaenTribalBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>12</min>
-								<max>20</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>100</min>
-										<max>600</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>NeolithicMeleeBasic</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						@Name="AURA_RaenOutlanderBase" or
-						@Name="AURA_RaenMercenaryMercenaryBase" or
-						@Name="AURA_RaenPirateBase" or
-						defName="AURA_RaenAncientSoldier"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>8</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Final Fantasy Races/PawnKinds_MQ.xml b/Patches/Erin's Final Fantasy Races/PawnKinds_MQ.xml
deleted file mode 100644
index efddb9c1a7..0000000000
--- a/Patches/Erin's Final Fantasy Races/PawnKinds_MQ.xml	
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Final Fantasy Races</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Give ammo to pawns. ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="MQT_MiqoteTribalBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>12</min>
-								<max>20</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>100</min>
-										<max>600</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>NeolithicMeleeBasic</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						@Name="MQT_MiqoteOutlanderBase" or
-						@Name="MQT_MercenaryMercenaryBase" or
-						@Name="MQT_MiqotePirateBase" or
-						defName="MQT_MiqoteAncientSoldier"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>8</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Final Fantasy Races/PawnKinds_Viera.xml b/Patches/Erin's Final Fantasy Races/PawnKinds_Viera.xml
deleted file mode 100644
index c93a74f229..0000000000
--- a/Patches/Erin's Final Fantasy Races/PawnKinds_Viera.xml	
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Final Fantasy Races</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Give ammo to pawns. ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="ERN_VieraTribalBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>12</min>
-								<max>20</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>100</min>
-										<max>600</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>NeolithicMeleeBasic</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						@Name="ERN_MercenaryMercenaryBase" or
-						@Name="ERN_VieraOutlanderBase" or
-						@Name="ERN_VieraPirateBase" or
-						@Name="ERN_MercenaryMidTierBase" or
-						defName="ERN_VieraAncientSoldier"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>8</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Final Fantasy Races/Race_AuRa.xml b/Patches/Erin's Final Fantasy Races/Race_AuRa.xml
deleted file mode 100644
index 89b8d9a000..0000000000
--- a/Patches/Erin's Final Fantasy Races/Race_AuRa.xml	
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Final Fantasy Races</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="AURA_AuRa"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="AURA_AuRa"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="AURA_AuRa"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="AURA_AuRa"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<CarryWeight>35</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="AURA_AuRa"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="AURA_AuRa"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Final Fantasy Races/Race_MQ.xml b/Patches/Erin's Final Fantasy Races/Race_MQ.xml
deleted file mode 100644
index dcf462dc2c..0000000000
--- a/Patches/Erin's Final Fantasy Races/Race_MQ.xml	
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Final Fantasy Races</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="MQT_Miqote"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="MQT_Miqote"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="MQT_Miqote"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="MQT_Miqote"]/statBases/MeleeDodgeChance</xpath>
-					<value>
-						<NightVisionEfficiency>0.4</NightVisionEfficiency>
-						<MeleeDodgeChance>1.1</MeleeDodgeChance>
-						<MeleeCritChance>0.8</MeleeCritChance>
-						<MeleeParryChance>0.85</MeleeParryChance>
-						<CarryWeight>35</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="MQT_Miqote"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="MQT_Miqote"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Final Fantasy Races/Race_Viera.xml b/Patches/Erin's Final Fantasy Races/Race_Viera.xml
deleted file mode 100644
index 2100670345..0000000000
--- a/Patches/Erin's Final Fantasy Races/Race_Viera.xml	
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Final Fantasy Races</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Viera"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Viera"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Viera"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Viera"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<CarryWeight>35</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Viera"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Viera"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Forest Critters/ThingDefs_Races.xml b/Patches/Erin's Forest Critters/ThingDefs_Races.xml
deleted file mode 100644
index a9783c4981..0000000000
--- a/Patches/Erin's Forest Critters/ThingDefs_Races.xml	
+++ /dev/null
@@ -1,276 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forest Critters</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === bodyShape === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Redpanda" or defName="beaver" or defName="frog"]</xpath>
-
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ptarmigan"]</xpath>
-
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Red Panda === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Redpanda"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.16</MeleeDodgeChance>
-						<MeleeCritChance>0.03</MeleeCritChance>
-						<MeleeParryChance>0.02</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Redpanda"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.55</cooldownTime>
-								<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.55</cooldownTime>
-								<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.85</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>8</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.254</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.55</cooldownTime>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Beaver === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="beaver"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.22</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="beaver"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.18</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.18</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.65</cooldownTime>
-								<armorPenetrationBlunt>3.375</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.35</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.65</cooldownTime>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Frog === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="frog"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="frog"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hand</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.10</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hand</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.10</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.65</cooldownTime>
-								<armorPenetrationBlunt>1.375</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.35</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.65</cooldownTime>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.06</armorPenetrationSharp>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Ptarmigan === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ptarmigan"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.22</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ptarmigan"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.85</cooldownTime>
-								<armorPenetrationBlunt>0.096</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.65</cooldownTime>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.480</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Fox Squirrel/ThingDefs_Races.xml b/Patches/Erin's Fox Squirrel/ThingDefs_Races.xml
deleted file mode 100644
index 90d6cd377e..0000000000
--- a/Patches/Erin's Fox Squirrel/ThingDefs_Races.xml	
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Fox Squirrel</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === bodyShape === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="FoxSquirrel"]</xpath>
-
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="FoxSquirrel"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.22</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="FoxSquirrel"]/combatPower</xpath>
-					<value>
-						<combatPower>20</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FoxSquirrel"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.91</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.198</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.91</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.198</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.49</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>1.440</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Friendly Ferrets/ThingDefs_Races.xml b/Patches/Erin's Friendly Ferrets/ThingDefs_Races.xml
deleted file mode 100644
index 3b09fec178..0000000000
--- a/Patches/Erin's Friendly Ferrets/ThingDefs_Races.xml	
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Friendly Ferrets</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Ferret === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ERN_Ferret"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ERN_Ferret"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.27</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.02</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ERN_Ferret"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.67</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.67</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.88</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>3.00</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Lizard Doggo/ThingDefs_Races.xml b/Patches/Erin's Lizard Doggo/ThingDefs_Races.xml
deleted file mode 100644
index f084c8b2b0..0000000000
--- a/Patches/Erin's Lizard Doggo/ThingDefs_Races.xml	
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Lizard Doggo</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Lizard Doggo ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ERN_lizarddoggo"]</xpath>
-
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ERN_lizarddoggo"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.22</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0.04</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="ERN_lizarddoggo"]/combatPower</xpath>
-					<value>
-						<combatPower>50</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ERN_lizarddoggo"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.8</cooldownTime>
-								<armorPenetrationBlunt>0.400</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.045</armorPenetrationSharp>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.8</cooldownTime>
-								<armorPenetrationBlunt>0.400</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.045</armorPenetrationSharp>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.63</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.10</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.20</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.230</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Miqo'te/Patch_Bodies.xml b/Patches/Erin's Miqo'te/Patch_Bodies.xml
deleted file mode 100644
index f74fb994ca..0000000000
--- a/Patches/Erin's Miqo'te/Patch_Bodies.xml	
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Miqo'te</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MQT_Miqote"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "right eye"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MQT_Miqote"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "left eye"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MQT_Miqote"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MQT_Miqote"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MQT_Miqote"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MQT_Miqote"]/corePart/parts/li[def = "Neck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MQT_Miqote"]/corePart/parts/li[def = "MQT_MiqoteTail"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MQT_Miqote"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MQT_Miqote"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Jaw"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MQT_Miqote"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Nose"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MQT_Miqote"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Ear"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MQT_Miqote"]/corePart/parts/li[def = "Shoulder"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MQT_Miqote"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MQT_Miqote"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MQT_Miqote"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/parts/li[def = "Finger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MQT_Miqote"]/corePart/parts/li[def = "Leg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MQT_Miqote"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MQT_Miqote"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/parts/li[def = "Toe"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Miqo'te/PawnKinds.xml b/Patches/Erin's Miqo'te/PawnKinds.xml
deleted file mode 100644
index 3089aaed95..0000000000
--- a/Patches/Erin's Miqo'te/PawnKinds.xml	
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Miqo'te</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Give ammo to pawns. ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="MQT_MiqoteTribalBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>12</min>
-								<max>20</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>100</min>
-										<max>600</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>NeolithicMeleeBasic</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						@Name="MQT_MiqoteOutlanderBase" or
-						@Name="MQT_MercenaryMercenaryBase" or
-						@Name="MQT_MiqotePirateBase" or
-						defName="MQT_MiqoteAncientSoldier"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>8</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Miqo'te/Race_MQ.xml b/Patches/Erin's Miqo'te/Race_MQ.xml
deleted file mode 100644
index ca642bc492..0000000000
--- a/Patches/Erin's Miqo'te/Race_MQ.xml	
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Miqo'te</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="MQT_Miqote"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="MQT_Miqote"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="MQT_Miqote"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="MQT_Miqote"]/statBases/MeleeDodgeChance</xpath>
-					<value>
-						<NightVisionEfficiency>0.4</NightVisionEfficiency>
-						<MeleeDodgeChance>1.1</MeleeDodgeChance>
-						<MeleeCritChance>0.8</MeleeCritChance>
-						<MeleeParryChance>0.85</MeleeParryChance>
-						<CarryWeight>35</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="MQT_Miqote"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="MQT_Miqote"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Mountain Animals/ThingDefs_Races.xml b/Patches/Erin's Mountain Animals/ThingDefs_Races.xml
deleted file mode 100644
index 019a1af858..0000000000
--- a/Patches/Erin's Mountain Animals/ThingDefs_Races.xml	
+++ /dev/null
@@ -1,366 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Mountain Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === bodyShape === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Pika"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Snow_leopard" or defName="Pallas_cat" or defName="Argali"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Pallas Cat ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Pallas_cat"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Pallas_cat"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.55</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.55</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.85</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.254</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>0.55</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Snow Leopard ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Snow_leopard"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.26</MeleeDodgeChance>
-						<MeleeCritChance>0.20</MeleeCritChance>
-						<MeleeParryChance>0.07</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Snow_leopard"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>0.92</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>0.92</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.690</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Pika ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Pika"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>2.3</MoveSpeed>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.0</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Pika"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.69</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.013</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.69</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.013</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.95</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>3</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Argali ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Argali"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4.4</MoveSpeed>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.08</MeleeCritChance>
-						<MeleeParryChance>0.07</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Argali"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>antlers</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2.13</cooldownTime>
-								<restrictedGender>Female</restrictedGender>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3.630</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>antlers</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2.13</cooldownTime>
-								<restrictedGender>Male</restrictedGender>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.630</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Argali"]/race/baseBodySize</xpath>
-					<value>
-						<baseBodySize>0.9</baseBodySize>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Sephyr/Hediff_Racial_Sephyr.xml b/Patches/Erin's Sephyr/Hediff_Racial_Sephyr.xml
deleted file mode 100644
index 02959c3706..0000000000
--- a/Patches/Erin's Sephyr/Hediff_Racial_Sephyr.xml	
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Sephyr</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= Adjust Hediff Stats ======= -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ERN_SephyrToughen"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ERN_SephyrToughen"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ERN_SephyrToughen"]/stages/li/statOffsets/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.35</ArmorRating_Heat>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Sephyr/PawnKinds_Sephyr.xml b/Patches/Erin's Sephyr/PawnKinds_Sephyr.xml
deleted file mode 100644
index a71575b06a..0000000000
--- a/Patches/Erin's Sephyr/PawnKinds_Sephyr.xml	
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Sephyr</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= Give ammo to Pawnkinds ======= -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="ERN_SephyrTribalBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>12</min>
-								<max>20</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>100</min>
-										<max>600</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>NeolithicMeleeBasic</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						@Name="ERN_SephyrOutlanderBase" or
-						@Name="ERN_SephyrMercenaryBase" or
-						@Name="ERN_SephyrPirateBase" or
-						defName="ERN_SephyrAncientSoldier"] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>8</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Sephyr/Race_Sephyr.xml b/Patches/Erin's Sephyr/Race_Sephyr.xml
deleted file mode 100644
index fa4766146f..0000000000
--- a/Patches/Erin's Sephyr/Race_Sephyr.xml	
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Sephyr</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Sephyr"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Sephyr"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Sephyr"]</xpath>
-						<value>
-							<comps>
-								<li>
-									<compClass>CombatExtended.CompPawnGizmo</compClass>
-								</li>
-								<li Class="CombatExtended.CompProperties_Suppressable" />
-							</comps>
-						</value>
-					</nomatch>
-
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Sephyr"]/comps</xpath>
-						<value>
-							<li>
-								<compClass>CombatExtended.CompPawnGizmo</compClass>
-							</li>
-							<li Class="CombatExtended.CompProperties_Suppressable" />
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Sephyr"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<CarryWeight>35</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Sephyr"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Sephyr"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Sephyr"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.35</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Sephyr"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Sephyr/Scenarios_Sephyr.xml b/Patches/Erin's Sephyr/Scenarios_Sephyr.xml
deleted file mode 100644
index 928a24c417..0000000000
--- a/Patches/Erin's Sephyr/Scenarios_Sephyr.xml	
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Sephyr</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="ERN_SephyrCrashlanded"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_303British_FMJ</thingDef>
-							<count>100</count>
-						</li>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_44Magnum_FMJ</thingDef>
-							<count>120</count>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ScenarioDef[defName="ERN_SephyrCrashlanded"]/scenario/parts/li[thingDef="Apparel_FlakPants"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ScenarioDef[defName="ERN_SephyrCrashlanded"]/scenario/parts/li[thingDef="Apparel_FlakVest"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ScenarioDef[defName="ERN_SephyrCrashlanded"]/scenario/parts/li[thingDef="Apparel_AdvancedHelmet"]</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Shisune/Shisune_Hediffs_BodyParts.xml b/Patches/Erin's Shisune/Shisune_Hediffs_BodyParts.xml
deleted file mode 100644
index 38416b7a4b..0000000000
--- a/Patches/Erin's Shisune/Shisune_Hediffs_BodyParts.xml	
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Shisune</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ERN_Fangs"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fangs</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Valheim Creatures/Races_Animal_Frostwolf.xml b/Patches/Erin's Valheim Creatures/Races_Animal_Frostwolf.xml
deleted file mode 100644
index d2fb8f1039..0000000000
--- a/Patches/Erin's Valheim Creatures/Races_Animal_Frostwolf.xml	
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Valheim Creatures</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ERN_FrostWolf"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ERN_FrostWolf"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.27</MeleeDodgeChance>
-						<MeleeCritChance>0.10</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ERN_FrostWolf"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>1.73</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.55</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.225</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Valheim Creatures/Races_Animal_Lox.xml b/Patches/Erin's Valheim Creatures/Races_Animal_Lox.xml
deleted file mode 100644
index cc3f11385d..0000000000
--- a/Patches/Erin's Valheim Creatures/Races_Animal_Lox.xml	
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Valheim Creatures</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ERN_Lox"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4.5</MoveSpeed>
-						<MeleeDodgeChance>0.36</MeleeDodgeChance>
-						<MeleeCritChance>0.12</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ERN_Lox"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>3.17</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>0.8</cooldownTime>
-								<chanceFactor>0.5</chanceFactor>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ERN_Lox"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="ERN_Lox"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="ERN_Lox"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ERN_Lox"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1500</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>8</RegenValue>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Valheim Creatures/Races_Animal_Misthare.xml b/Patches/Erin's Valheim Creatures/Races_Animal_Misthare.xml
deleted file mode 100644
index 5cc36693c7..0000000000
--- a/Patches/Erin's Valheim Creatures/Races_Animal_Misthare.xml	
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Valheim Creatures</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ERN_Misthare"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.36</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ERN_Misthare"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ERN_Misthare"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Valheim Creatures/Races_Animal_Neck.xml b/Patches/Erin's Valheim Creatures/Races_Animal_Neck.xml
deleted file mode 100644
index 63d6f25e76..0000000000
--- a/Patches/Erin's Valheim Creatures/Races_Animal_Neck.xml	
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Valheim Creatures</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ERN_Neck"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-						<MeleeParryChance>0.08</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ERN_Neck"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.89</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.24</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ERN_Neck"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Serpentine</bodyShape>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Valheim Creatures/Races_Animal_Valboar.xml b/Patches/Erin's Valheim Creatures/Races_Animal_Valboar.xml
deleted file mode 100644
index 7cc2f31faf..0000000000
--- a/Patches/Erin's Valheim Creatures/Races_Animal_Valboar.xml	
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Valheim Creatures</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ERN_Valboar"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ERN_Valboar"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.14</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.07</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ERN_Valboar"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tusk</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.89</cooldownTime>
-								<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>tusk</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.41</cooldownTime>
-								<chanceFactor>0.65</chanceFactor>
-								<linkedBodyPartsGroup>TuskAttackTool_2</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.57</cooldownTime>
-								<chanceFactor>0.6</chanceFactor>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2.12</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Viera/PawnKinds.xml b/Patches/Erin's Viera/PawnKinds.xml
deleted file mode 100644
index f10e3e8a34..0000000000
--- a/Patches/Erin's Viera/PawnKinds.xml	
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Viera</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Give ammo to pawns. ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="ERN_VieraTribalBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>12</min>
-								<max>20</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>100</min>
-										<max>600</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>NeolithicMeleeBasic</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						@Name="ERN_MercenaryMercenaryBase" or
-						@Name="ERN_VieraOutlanderBase" or
-						@Name="ERN_VieraPirateBase" or
-						@Name="ERN_MercenaryMidTierBase" or
-						defName="ERN_VieraAncientSoldier"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>8</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Erin's Viera/Race_Viera.xml b/Patches/Erin's Viera/Race_Viera.xml
deleted file mode 100644
index 4459cdc19c..0000000000
--- a/Patches/Erin's Viera/Race_Viera.xml	
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Erin's Viera</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Viera"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Viera"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Viera"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Viera"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<CarryWeight>35</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Viera"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ERN_Viera"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/EvolvedOrgansRedux/Brain_Evo_CE.xml b/Patches/EvolvedOrgansRedux/Brain_Evo_CE.xml
deleted file mode 100644
index 8621373538..0000000000
--- a/Patches/EvolvedOrgansRedux/Brain_Evo_CE.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>EvolvedOrgansRedux</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EVOR_Hediff_Brain_ButchersNails"]/stages/li[1]/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-							<MeleeHitChance>1</MeleeHitChance>
-							<MentalBreakThreshold>0.05</MentalBreakThreshold>
-							<NegotiationAbility>-1.5</NegotiationAbility>
-							<SocialImpact>-1.5</SocialImpact>
-							<AimingDelayFactor>-0.15</AimingDelayFactor>
-							<Suppressability>-0.4</Suppressability>
-						</statOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EVOR_Hediff_Brain_ReptilianFrontalCortex"]/stages/li[1]/statOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EVOR_Hediff_Brain_ReptilianFrontalCortex"]/stages/li[1]/statOffsets/MeleeHitChance</xpath>
-					<value>
-						<MeleeHitChance>0.5</MeleeHitChance>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/EvolvedOrgansRedux/Ideological_organs.xml b/Patches/EvolvedOrgansRedux/Ideological_organs.xml
deleted file mode 100644
index a1be34f080..0000000000
--- a/Patches/EvolvedOrgansRedux/Ideological_organs.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>EvolvedOrgansRedux</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Ideology</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="EVOR_Item_Eye_EyeOfTheVoid"]</xpath>
-						<value>
-							<statBases>
-								<NightVisionEfficiency_Implant>0.3</NightVisionEfficiency_Implant>
-							</statBases>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/HediffDef[defName="EVOR_Hediff_Eye_EyeOfTheVoid"]/stages/li[1]/statOffsets</xpath>
-						<value>
-							<statOffsets>
-								<MeleeHitChanceOutdoorsDarkOffset>0.3</MeleeHitChanceOutdoorsDarkOffset>
-								<MeleeHitChanceIndoorsDarkOffset>0.3</MeleeHitChanceIndoorsDarkOffset>
-								<MeleeDodgeChanceOutdoorsDarkOffset>0.15</MeleeDodgeChanceOutdoorsDarkOffset>
-								<MeleeDodgeChanceIndoorsDarkOffset>0.15</MeleeDodgeChanceIndoorsDarkOffset>
-								<NightVisionEfficiency_Implant>0.4</NightVisionEfficiency_Implant>
-							</statOffsets>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/EvolvedOrgansRedux/Limbs_Evo_CE.xml b/Patches/EvolvedOrgansRedux/Limbs_Evo_CE.xml
deleted file mode 100644
index 748442af9e..0000000000
--- a/Patches/EvolvedOrgansRedux/Limbs_Evo_CE.xml
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>EvolvedOrgansRedux</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EVOR_Hediff_Appendage_ExtradextrousArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.11</cooldownTime>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EVOR_Hediff_Appendage_RendingClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.23</cooldownTime>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>1.29</cooldownTime>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EVOR_Hediff_Appendage_HighPressurePincer"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>pinchy</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>2.3</cooldownTime>
-								<armorPenetrationBlunt>14</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>pinchy</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>2.1</cooldownTime>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EVOR_Hediff_Appendage_SonicImpactMace"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<chanceFactor>10</chanceFactor>
-								<capacities>
-									<li>Blunt</li>
-									<li>EVOR_Cap_Sonic</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetrationBlunt>9</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>35</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EVOR_Hediff_Appendage_VenopillarArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>ScratchToxic</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.11</cooldownTime>
-								<armorPenetrationSharp>1.0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EVOR_Hediff_Appendage_FrostMantisHook"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>EVOR_Frostbite</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2.4</cooldownTime>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EVOR_Hediff_Appendage_SalamanderWhip"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>EVOR_Burn</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2.4</cooldownTime>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EVOR_Hediff_Appendage_OssifiedBoneSaber"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Stab</li>
-									<li>Cut</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>0.88</cooldownTime>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EVOR_Hediff_Appendage_TriPlacedLimb"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EVOR_Hediff_Tail_VenomousStinger"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>ScratchToxic</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.11</cooldownTime>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EVOR_Hediff_Appendage_WeightedTail"]/stages/li[1]/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						</statOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/EvolvedOrgansRedux/Organ_Evo_CE.xml b/Patches/EvolvedOrgansRedux/Organ_Evo_CE.xml
deleted file mode 100644
index ede9be45f3..0000000000
--- a/Patches/EvolvedOrgansRedux/Organ_Evo_CE.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>EvolvedOrgansRedux</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="EVOR_Item_Eye_MultispectrumEye"]</xpath>
-					<value>
-						<statBases>
-							<NightVisionEfficiency_Implant>0.3</NightVisionEfficiency_Implant>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EVOR_Hediff_Eye_MultispectrumEye"]/stages/li[1]/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<AimingDelayFactor>-0.10</AimingDelayFactor>
-							<ShootingAccuracyPawn>0.2</ShootingAccuracyPawn>
-							<NightVisionEfficiency_Implant>0.3</NightVisionEfficiency_Implant>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EVOR_Hediff_Ear_MultifrequencyEar"]/stages/li[1]/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EVOR_Hediff_Jaw_DistendableJaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Stab</li>
-									<li>Bite</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2.4</cooldownTime>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EVOR_Hediff_Jaw_VenomousFangs"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>EVOR_Cap_Toxic</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2.4</cooldownTime>
-								<armorPenetrationSharp>0.6</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/EvolvedOrgansRedux/Protec_Evo_CE.xml b/Patches/EvolvedOrgansRedux/Protec_Evo_CE.xml
deleted file mode 100644
index c1c3da2431..0000000000
--- a/Patches/EvolvedOrgansRedux/Protec_Evo_CE.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>EvolvedOrgansRedux</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EVOR_Hediff_Protection_Skull_CranialPlating"]/stages/li[1]/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-							<ArmorRating_Heat>0.10</ArmorRating_Heat>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EVOR_Hediff_Protection_Torso_MultilayeredDermalPlating"]/stages/li[1]/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-							<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
-							<ArmorRating_Heat>0.20</ArmorRating_Heat>
-							<ComfyTemperatureMin>-5</ComfyTemperatureMin>
-							<ComfyTemperatureMax>10</ComfyTemperatureMax>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EVOR_Hediff_Protection_Skin_FlameRetardantSkin"]/stages/li[1]/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ArmorRating_Sharp>1</ArmorRating_Sharp>
-							<ArmorRating_Heat>0.20</ArmorRating_Heat>
-							<ComfyTemperatureMax>50</ComfyTemperatureMax>
-							<Flammability>-.6</Flammability>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EVOR_Hediff_Protection_Skin_VariableInsulationSkin"]/stages/li[1]/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ArmorRating_Sharp>0.40</ArmorRating_Sharp>
-							<ArmorRating_Heat>0.10</ArmorRating_Heat>
-							<ComfyTemperatureMin>-35</ComfyTemperatureMin>
-							<ComfyTemperatureMax>30</ComfyTemperatureMax>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EVOR_Hediff_Protection_Ribcage_CalciumAlloyRibcage"]/stages/li[1]/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ArmorRating_Blunt>2</ArmorRating_Blunt>
-							<ArmorRating_Sharp>4</ArmorRating_Sharp>
-							<ArmorRating_Heat>0.20</ArmorRating_Heat>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EVOR_Hediff_Protection_Neck_ReinforcedNeckMuscles"]/stages/li[1]/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ArmorRating_Blunt>4</ArmorRating_Blunt>
-							<ArmorRating_Sharp>1</ArmorRating_Sharp>
-						</statOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/EvolvedOrgansRedux/Royal_organs.xml b/Patches/EvolvedOrgansRedux/Royal_organs.xml
deleted file mode 100644
index 94a4ae5623..0000000000
--- a/Patches/EvolvedOrgansRedux/Royal_organs.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>EvolvedOrgansRedux</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Royalty</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/HediffDef[defName="EVOR_Hediff_Torso_MucousGland"]/stages/li[1]/statOffsets/MeleeDodgeChance</xpath>
-						<value>
-							<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/EvolvedOrgansRedux/Torso_Evo_CE.xml b/Patches/EvolvedOrgansRedux/Torso_Evo_CE.xml
deleted file mode 100644
index d33d4c6177..0000000000
--- a/Patches/EvolvedOrgansRedux/Torso_Evo_CE.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>EvolvedOrgansRedux</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EVOR_Hediff_AbdominalAndChestcavity_CombatSerumGland"]/stages/li[1]/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<MeleeDodgeChance>0.18</MeleeDodgeChance>
-							<MeleeHitChance>2</MeleeHitChance>
-						</statOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Exotic Arsenal/Exotic_Ammo_Energy.xml b/Patches/Exotic Arsenal/Exotic_Ammo_Energy.xml
deleted file mode 100644
index d671f13f5a..0000000000
--- a/Patches/Exotic Arsenal/Exotic_Ammo_Energy.xml	
+++ /dev/null
@@ -1,754 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Exotic Arsenal</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ==================== Ammo Cat========================== -->
-
-						<ThingCategoryDef>
-							<defName>Exotic_Ars</defName>
-							<label>Exotic Ammo</label>
-							<parent>AmmoAdvanced</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberPlasmaMedium</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Equilibrium</defName>
-							<label>Exotic energy cells</label>
-							<ammoTypes>
-								<Ammo_Exotic_Energy>Bullet_Equilibrium_CE</Ammo_Exotic_Energy>
-								<Ammo_Exotic_Energy_HI>Bullet_Equilibrium_HI</Ammo_Exotic_Energy_HI>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Aesa</defName>
-							<label>Exotic energy cells</label>
-							<ammoTypes>
-								<Ammo_Exotic_Energy>Bullet_Aesa_CE</Ammo_Exotic_Energy>
-								<Ammo_Exotic_Energy_HI>Bullet_Aesa_HI</Ammo_Exotic_Energy_HI>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Shiver</defName>
-							<label>Exotic energy cells</label>
-							<ammoTypes>
-								<Ammo_Exotic_Energy>Bullet_Shiver_CE</Ammo_Exotic_Energy>
-								<Ammo_Exotic_Energy_HI>Bullet_Shiver_HI</Ammo_Exotic_Energy_HI>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Slashfire</defName>
-							<label>Exotic energy cells</label>
-							<ammoTypes>
-								<Ammo_Exotic_Energy>Bullet_Slashfire_CE</Ammo_Exotic_Energy>
-								<Ammo_Exotic_Energy_HI>Bullet_Slashfire_HI</Ammo_Exotic_Energy_HI>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_GlacialSF</defName>
-							<label>Exotic energy cells</label>
-							<ammoTypes>
-								<Ammo_Exotic_Energy>Bullet_GlacialSF_CE</Ammo_Exotic_Energy>
-								<Ammo_Exotic_Energy_HI>Bullet_GlacialSF_HI</Ammo_Exotic_Energy_HI>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_celsius</defName>
-							<label>Exotic energy cells</label>
-							<ammoTypes>
-								<Ammo_Exotic_Energy>Bullet_celsius_CE</Ammo_Exotic_Energy>
-								<Ammo_Exotic_Energy_HI>Bullet_celsius_HI</Ammo_Exotic_Energy_HI>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Oberon</defName>
-							<label>Toxic energy bolts</label>
-							<ammoTypes>
-								<Ammo_Exotic_Energy>Bullet_Oberon_CE</Ammo_Exotic_Energy>
-								<Ammo_Exotic_Energy_HI>Bullet_Oberon_HI</Ammo_Exotic_Energy_HI>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Paladin</defName>
-							<label>Hard light</label>
-							<ammoTypes>
-								<Ammo_Exotic_Energy>Bullet_Paladin_CE</Ammo_Exotic_Energy>
-								<Ammo_Exotic_Energy_HI>Bullet_Paladin_HI</Ammo_Exotic_Energy_HI>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_BFaith</defName>
-							<label>Plasma incinerator</label>
-							<ammoTypes>
-								<Ammo_Exotic_Energy>Bullet_BFaith_CE</Ammo_Exotic_Energy>
-								<Ammo_Exotic_Energy_HI>Bullet_BFaith_HI</Ammo_Exotic_Energy_HI>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Unleashed</defName>
-							<label>Exotic energy cells</label>
-							<ammoTypes>
-								<Ammo_Exotic_Energy>Bullet_Unleashed_CE</Ammo_Exotic_Energy>
-								<Ammo_Exotic_Energy_HI>Bullet_Unleashed_HI</Ammo_Exotic_Energy_HI>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== AmmoClass========================== -->
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>Exotic_Normal</defName>
-							<label>Exotic energy cell</label>
-							<labelShort>EEC</labelShort>
-							<description>The exotic energy cell does a funni.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>Exotic_Hipower</defName>
-							<label>Overcharged exotic energy cell</label>
-							<labelShort>OEEC</labelShort>
-							<description>Overcharge the energy cell to increase its power output at the cost of making it unstable and volatile. Its effects are weapon dependent, it is also usually less accurate than thr regular version.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<!-- ==================== Ammo Type ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_Exotic_Energy</defName>
-							<label>Exotic energy cells</label>
-							<description>Exotic energy cell used by rare glitterworld energy weapons.</description>
-							<statBases>
-								<Mass>0.014</Mass>
-								<Bulk>0.014</Bulk>
-								<MarketValue>0.95</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<!-- Plasma ammo can't be handloaded, and the containment cell must be precision-machined anyway -->
-							</tradeTags>
-							<thingCategories>
-								<li>Exotic_Ars</li>
-							</thingCategories>
-							<graphicData>
-								<texPath>Things/Ammo/PlasmaCell/Rifle</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>Exotic_Normal</ammoClass>
-							<generateAllowChance>0.4</generateAllowChance>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_Exotic_Energy_HI</defName>
-							<label>Overcharged Exotic energy cells</label>
-							<description>Exotic energy cell used by rare glitterworld energy weapons. These cells in particular, exudes big dick energy.</description>
-							<statBases>
-								<Mass>0.018</Mass>
-								<Bulk>0.014</Bulk>
-								<MarketValue>1.57</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<!-- Plasma ammo can't be handloaded, and the containment cell must be precision-machined anyway -->
-							</tradeTags>
-							<thingCategories>
-								<li>Exotic_Ars</li>
-							</thingCategories>
-							<graphicData>
-								<texPath>Things/Ammo/PlasmaCell/Rifle</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>Exotic_Hipower</ammoClass>
-							<generateAllowChance>0.2</generateAllowChance>
-							<comps>
-								<!-- Arbitarily defined cookoff explosive stats; represents a plasma containment system failing -->
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>12</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>0.4</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Small>1</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<!-- ================== New DMG================== -->
-
-						<DamageDef ParentName="Flame">
-							<defName>ExoticFlame</defName>
-							<label>prometheum flame</label>
-							<additionalHediffs>
-								<li>
-									<hediff>PrometheumSoaked</hediff>
-									<severityPerDamageDealt>0.02</severityPerDamageDealt>
-								</li>
-							</additionalHediffs>
-						</DamageDef>
-
-						<!-- ================== Projectiles Equilibrium================== -->
-
-						<ThingDef Name="BaseEquilibriumBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Equilibrium</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>1.2</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Energy_Damage</damageDef>
-								<speed>90</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseEquilibriumBullet">
-							<defName>Bullet_Equilibrium_CE</defName>
-							<label>Equilibrium shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Energy_Damage</damageDef>
-								<damageAmountBase>23</damageAmountBase>
-								<armorPenetrationSharp>24</armorPenetrationSharp>
-								<armorPenetrationBlunt>36</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>13</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseEquilibriumBullet">
-							<defName>Bullet_Equilibrium_HI</defName>
-							<label>equilibrium shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>23</damageAmountBase>
-								<armorPenetrationSharp>24</armorPenetrationSharp>
-								<armorPenetrationBlunt>36</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>20</amount>
-									</li>
-								</secondaryDamage>
-								<spreadMult>3.0</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== Aesa ================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="BaseAesaBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Aesa</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>1.2</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>ExoticFlame</damageDef>
-								<speed>168</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseAesaBullet">
-							<defName>Bullet_Aesa_CE</defName>
-							<label>aesa p40 shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>30</damageAmountBase>
-								<armorPenetrationSharp>50</armorPenetrationSharp>
-								<armorPenetrationBlunt>50</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseAesaBullet">
-							<defName>Bullet_Aesa_HI</defName>
-							<label>aesa p40 shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationSharp>50</armorPenetrationSharp>
-								<armorPenetrationBlunt>50</armorPenetrationBlunt>
-								<spreadMult>2.0</spreadMult>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<explosiveDamageType>ExoticFlame</explosiveDamageType>
-									<damageAmountBase>20</damageAmountBase>
-									<explosiveRadius>0.9</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<!-- ================== Shiver ================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="BaseShiverBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Shiver</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Stasis_Damage</damageDef>
-								<speed>150</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseShiverBullet">
-							<defName>Bullet_Shiver_CE</defName>
-							<label>frostmourne shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>18</damageAmountBase>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseShiverBullet">
-							<defName>Bullet_Shiver_HI</defName>
-							<label>frostmourne shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>23</damageAmountBase>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<spreadMult>2.5</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== Slashfire ================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="BaseSlashfireBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_Small</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>88</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseSlashfireBullet">
-							<defName>Bullet_Slashfire_CE</defName>
-							<label>Slashfire bullet</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>5</amount>
-									</li>
-									<li>
-										<def>Flame</def>
-										<amount>1</amount>
-										<chance>0.15</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseSlashfireBullet">
-							<defName>Bullet_Slashfire_HI</defName>
-							<label>Slashfire bullet</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>8</amount>
-									</li>
-									<li>
-										<def>ExoticFlame</def>
-										<amount>1</amount>
-										<chance>0.15</chance>
-									</li>
-								</secondaryDamage>
-								<spreadMult>2.5</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== GlacialSF ================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="BaseGlacialSFBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_Small</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>88</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGlacialSFBullet">
-							<defName>Bullet_GlacialSF_CE</defName>
-							<label>Slashfire bullet</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationSharp>16</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Stasis_Damage</def>
-										<amount>6</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGlacialSFBullet">
-							<defName>Bullet_GlacialSF_HI</defName>
-							<label>Slashfire bullet</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationSharp>16</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Stasis_Damage</def>
-										<amount>9</amount>
-									</li>
-								</secondaryDamage>
-								<spreadMult>2.5</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== celsius ================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="BasecelsiusBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Celsius1</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Flame</damageDef>
-								<speed>144</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BasecelsiusBullet">
-							<defName>Bullet_celsius_CE</defName>
-							<label>plasma blast</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>16</damageAmountBase>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BasecelsiusBullet">
-							<defName>Bullet_celsius_HI</defName>
-							<label>stasis blast</label>
-							<graphicData>
-								<texPath>Things/Projectile/Celsius2</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Stasis_Damage</damageDef>
-								<damageAmountBase>16</damageAmountBase>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== Oberon ================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="BaseOberonBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Oberon</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Oberon_damage</damageDef>
-								<speed>90</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseOberonBullet">
-							<defName>Bullet_Oberon_CE</defName>
-							<label>Oberon Toxin Bolt</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>24</damageAmountBase>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-								<armorPenetrationBlunt>40</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseOberonBullet">
-							<defName>Bullet_Oberon_HI</defName>
-							<label>Oberon Toxin Bolt</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>30</damageAmountBase>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<armorPenetrationBlunt>40</armorPenetrationBlunt>
-								<spreadMult>2.0</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== Paladin ================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="BasePaladinBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Paladin</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>2</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>HL_Bullet</damageDef>
-								<speed>400</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BasePaladinBullet">
-							<defName>Bullet_Paladin_CE</defName>
-							<label>mox8 paladin javelin shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>16</damageAmountBase>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<armorPenetrationBlunt>40</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BasePaladinBullet">
-							<defName>Bullet_Paladin_HI</defName>
-							<label>mox8 paladin javelin shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>21</damageAmountBase>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<armorPenetrationBlunt>40</armorPenetrationBlunt>
-								<spreadMult>2.5</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== BFaith ================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="BaseBFaithBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/BFBullet</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>1.2</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Flame</damageDef>
-								<speed>148</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseBFaithBullet">
-							<defName>Bullet_BFaith_CE</defName>
-							<label>blinding faith plasma</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>16</damageAmountBase>
-								<armorPenetrationSharp>24</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseBFaithBullet">
-							<defName>Bullet_BFaith_HI</defName>
-							<label>blinding faith plasma</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>11</damageAmountBase>
-								<armorPenetrationSharp>32</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ExoticFlame</def>
-										<amount>5</amount>
-									</li>
-								</secondaryDamage>
-								<spreadMult>2.5</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== Unleashed ================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="BaseUnleashedBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/ChargeBlaster</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>88</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseUnleashedBullet">
-							<defName>Bullet_Unleashed_CE</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>41</damageAmountBase>
-								<soundExplode>MortarBomb_Explode</soundExplode>
-								<armorPenetrationSharp>60</armorPenetrationSharp>
-								<armorPenetrationBlunt>38.005</armorPenetrationBlunt>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<explosiveDamageType>UnleashedCE</explosiveDamageType>
-									<explosiveRadius>2.5</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseUnleashedBullet">
-							<defName>Bullet_Unleashed_HI</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>41</damageAmountBase>
-								<soundExplode>MortarBomb_Explode</soundExplode>
-								<armorPenetrationSharp>60</armorPenetrationSharp>
-								<armorPenetrationBlunt>38.005</armorPenetrationBlunt>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<explosiveDamageType>UnleashedCE</explosiveDamageType>
-									<explosiveRadius>3.5</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<!-- ================== Ammo make ================== -->
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_Exotic_Energy</defName>
-							<label>make exotic energy cell x100</label>
-							<description>Craft 100 exotic energy cell.</description>
-							<jobString>Making exotic energy cell.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Prometheum</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Plasteel</li>
-									<li>FSX</li>
-									<li>Prometheum</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Exotic_Energy>100</Ammo_Exotic_Energy>
-							</products>
-							<workAmount>4000</workAmount>
-							<researchPrerequisite>Exotic_Decoding</researchPrerequisite>
-							<recipeUsers>
-								<li>Exotic_Bench</li>
-							</recipeUsers>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_Exotic_Energy_HI</defName>
-							<label>make overcharged exotic energy cell x100</label>
-							<description>Craft 100 overcharged exotic energy cell.</description>
-							<jobString>Making overcharged exotic energy cell.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>3</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Prometheum</li>
-										</thingDefs>
-									</filter>
-									<count>3</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>3</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Plasteel</li>
-									<li>FSX</li>
-									<li>Prometheum</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Exotic_Energy_HI>100</Ammo_Exotic_Energy_HI>
-							</products>
-							<workAmount>8000</workAmount>
-							<researchPrerequisite>Exotic_Decoding</researchPrerequisite>
-							<recipeUsers>
-								<li>Exotic_Bench</li>
-							</recipeUsers>
-						</RecipeDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Exotic Arsenal/Exotic_Ammo_Others.xml b/Patches/Exotic Arsenal/Exotic_Ammo_Others.xml
deleted file mode 100644
index 13181cd11d..0000000000
--- a/Patches/Exotic Arsenal/Exotic_Ammo_Others.xml	
+++ /dev/null
@@ -1,600 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Exotic Arsenal</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_5mmMono</defName>
-							<label>Monomolecular shards</label>
-							<ammoTypes>
-								<Ammo_5mmMono_Steel>Bullet_5mm_MonoSteel</Ammo_5mmMono_Steel>
-								<Ammo_5mmMono_Plasteel>Bullet_5mm_MonoPlasteel</Ammo_5mmMono_Plasteel>
-								<Ammo_5mmMono_Uranium>Bullet_5mm_MonoUranium</Ammo_5mmMono_Uranium>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Judgment</defName>
-							<label>8 gauge cluster shells</label>
-							<ammoTypes>
-								<Ammo_Judgment_Buck>Bullet_Judgment_CE</Ammo_Judgment_Buck>
-								<Ammo_Judgment_HE>Bullet_Judgment_HE</Ammo_Judgment_HE>
-								<Ammo_Judgment_Mayhem>Bullet_Judgment_Mayhem</Ammo_Judgment_Mayhem>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== AmmoClass========================== -->
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>Exotic_Monoshard</defName>
-							<label>Monosteel</label>
-							<labelShort>Monosteel</labelShort>
-							<description>Wickedly sharp and resilient monomolecular bullets.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>Exotic_Monoshard2</defName>
-							<label>MonoPlasteel</label>
-							<labelShort>MonoPlasteel</labelShort>
-							<description>Wickedly sharp and resilient monomolecular bullets. This one is made out of plasteel.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>Exotic_Monoshard3</defName>
-							<label>MonoUranium</label>
-							<labelShort>MonoUranium</labelShort>
-							<description>Wickedly sharp and resilient monomolecular bullets. This one features a heavy depleted uranium core.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>Exotic_Buck</defName>
-							<label>High Explosive Buckshot</label>
-							<labelShort>HE buckshot</labelShort>
-							<description>Large scattershot pellets tipped with a small explosive charge.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>Exotic_Cluster</defName>
-							<label>Cluster shot</label>
-							<labelShort>Cluster</labelShort>
-							<description>You should test fire it inside your base and see what it does.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>Exotic_Mayhem</defName>
-							<label>Mayhem shot</label>
-							<labelShort>Mayhem</labelShort>
-							<description>Fuck around and find out.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="5mmMonoBase" ParentName="SmallAmmoBase" Abstract="True">
-							<description>This high-velocity monomolecular shard is only fired by exotic glitterworld weapons.</description>
-							<statBases>
-								<Mass>0.007</Mass>
-								<Bulk>0.007</Bulk>
-							</statBases>
-							<thingCategories>
-								<li>Exotic_Ars</li>
-							</thingCategories>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="5mmMonoBase">
-							<defName>Ammo_5mmMono_Steel</defName>
-							<label>5mm Monoshard</label>
-							<graphicData>
-								<texPath>Things/Ammo/Rifle/FMJ</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.08</MarketValue>
-							</statBases>
-							<ammoClass>Exotic_Monoshard</ammoClass>
-							<generateAllowChance>0.1</generateAllowChance>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="5mmMonoBase">
-							<defName>Ammo_5mmMono_Plasteel</defName>
-							<label>5mm Monoshard (plasteel)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Rifle/AP</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.18</MarketValue>
-							</statBases>
-							<ammoClass>Exotic_Monoshard2</ammoClass>
-							<generateAllowChance>0</generateAllowChance>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="5mmMonoBase">
-							<defName>Ammo_5mmMono_Uranium</defName>
-							<label>5mm Monoshard (uranium)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Rifle/Sabot</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<Mass>0.012</Mass>
-								<MarketValue>0.18</MarketValue>
-							</statBases>
-							<ammoClass>Exotic_Monoshard3</ammoClass>
-							<generateAllowChance>0</generateAllowChance>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="JudgmentBase" ParentName="SmallAmmoBase" Abstract="True">
-							<description>Exotic shotgunshell, contains multiple high explosive submunition within.</description>
-							<statBases>
-								<Mass>0.05</Mass>
-								<Bulk>0.1</Bulk>
-							</statBases>
-							<thingCategories>
-								<li>Exotic_Ars</li>
-							</thingCategories>
-							<stackLimit>1000</stackLimit>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="12GaugeBase">
-							<defName>Ammo_Judgment_Buck</defName>
-							<label>8 gauge Judgment shell (APHE)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Shotgun/Shot</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.18</MarketValue>
-							</statBases>
-							<ammoClass>Exotic_Buck</ammoClass>
-							<generateAllowChance>0.1</generateAllowChance>
-							<cookOffProjectile>Bullet_Judgment_CE</cookOffProjectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="12GaugeBase">
-							<defName>Ammo_Judgment_HE</defName>
-							<label>8 gauge Judgment shell (Cluster HE)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Shotgun/Shot</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.32</MarketValue>
-							</statBases>
-							<ammoClass>Exotic_Cluster</ammoClass>
-							<generateAllowChance>0.05</generateAllowChance>
-							<cookOffProjectile>Bullet_Judgment_HE</cookOffProjectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="12GaugeBase">
-							<defName>Ammo_Judgment_Mayhem</defName>
-							<label>8 gauge Judgment shell (Mayhem)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Shotgun/Slug</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.45</MarketValue>
-							</statBases>
-							<ammoClass>Exotic_Mayhem</ammoClass>
-							<generateAllowChance>0</generateAllowChance>
-							<cookOffProjectile>Bullet_Judgment_Mayhem</cookOffProjectile>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseFragment">
-							<defName>Mayhem_Bomblet</defName>
-							<label>bomblet</label>
-							<graphicData>
-								<texPath>Things/Projectile/Sling/Stone</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Fragment</damageDef>
-								<damageAmountBase>5</damageAmountBase>
-								<speed>10</speed>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<gravityFactor>15</gravityFactor>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>38</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>0.9</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Small>9</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="Base5mmMonoBullet" ParentName="BaseBulletCE" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Tyrant</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>200</speed>
-								<dropsCasings>false</dropsCasings>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base5mmMonoBullet">
-							<defName>Bullet_5mm_MonoSteel</defName>
-							<label>5mm monoshard</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<armorPenetrationBlunt>31.980</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base5mmMonoBullet">
-							<defName>Bullet_5mm_MonoPlasteel</defName>
-							<label>5mm monoshard(plasteel)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>300</speed>
-								<damageAmountBase>10</damageAmountBase>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<armorPenetrationBlunt>24.80</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base5mmMonoBullet">
-							<defName>Bullet_5mm_MonoUranium</defName>
-							<label>5mm monoshard (uranium)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>260</speed>
-								<damageAmountBase>10</damageAmountBase>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-								<armorPenetrationBlunt>51.980</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base12GaugeBullet">
-							<defName>Bullet_Judgment_CE</defName>
-							<label>buckshot pellet</label>
-							<graphicData>
-								<texPath>Things/Projectile/Shotgun_Pellet</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>9</damageAmountBase>
-								<pelletCount>8</pelletCount>
-								<armorPenetrationSharp>5</armorPenetrationSharp>
-								<armorPenetrationBlunt>6.52</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>4</amount>
-									</li>
-								</secondaryDamage>
-								<spreadMult>17.8</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base12GaugeBullet">
-							<defName>Bullet_Judgment_HE</defName>
-							<label>Cluster</label>
-							<graphicData>
-								<texPath>Things/Projectile/Shotgun_Pellet</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>3</damageAmountBase>
-								<pelletCount>7</pelletCount>
-								<armorPenetrationSharp>5</armorPenetrationSharp>
-								<armorPenetrationBlunt>6.52</armorPenetrationBlunt>
-								<spreadMult>36.6</spreadMult>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>30</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>0.9</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Small>1</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base12GaugeBullet">
-							<defName>Bullet_Judgment_Mayhem</defName>
-							<label>Mayhem</label>
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_big</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>10</damageAmountBase>
-								<armorPenetrationSharp>5</armorPenetrationSharp>
-								<armorPenetrationBlunt>7.52</armorPenetrationBlunt>
-								<speed>24</speed>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>10</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>0.9</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Mayhem_Bomblet>7</Mayhem_Bomblet>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_5mmMono_Steel</defName>
-							<label>make 5mm Monoshard x500</label>
-							<description>Craft 500 5mm Monoshard.</description>
-							<jobString>Making 5mm Monoshard.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_5mmMono_Steel>500</Ammo_5mmMono_Steel>
-							</products>
-							<workAmount>2500</workAmount>
-							<researchPrerequisite>Exotic_Decoding</researchPrerequisite>
-							<recipeUsers>
-								<li>Exotic_Bench</li>
-							</recipeUsers>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_5mmMono_Plasteel</defName>
-							<label>make 5mm Monoshard (plasteel) x500</label>
-							<description>Craft 5mm Monoshard (plasteel).</description>
-							<jobString>Making 5mm Monoshard (plasteel).</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_5mmMono_Plasteel>500</Ammo_5mmMono_Plasteel>
-							</products>
-							<workAmount>5000</workAmount>
-							<researchPrerequisite>Exotic_Decoding</researchPrerequisite>
-							<recipeUsers>
-								<li>Exotic_Bench</li>
-							</recipeUsers>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_5mmMono_Uranium</defName>
-							<label>make 5mm monoshard (uranium) x500</label>
-							<description>Craft 5mm monoshard (uranium).</description>
-							<jobString>Making 5mm monoshard (uranium).</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Uranium</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Uranium</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_5mmMono_Uranium>500</Ammo_5mmMono_Uranium>
-							</products>
-							<workAmount>5000</workAmount>
-							<researchPrerequisite>Exotic_Decoding</researchPrerequisite>
-							<recipeUsers>
-								<li>Exotic_Bench</li>
-							</recipeUsers>
-						</RecipeDef>
-
-						<!-- ==================== Shotty Recipes ========================== -->
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_Judgment_Buck</defName>
-							<label>make APHE buckshot x100</label>
-							<description>Craft 100 APHE buckshot.</description>
-							<jobString>Making APHE buckshot.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>15</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>7</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>FSX</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Judgment_Buck>100</Ammo_Judgment_Buck>
-							</products>
-							<workAmount>2500</workAmount>
-							<researchPrerequisite>Exotic_Decoding</researchPrerequisite>
-							<recipeUsers>
-								<li>Exotic_Bench</li>
-							</recipeUsers>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_Judgment_HE</defName>
-							<label>make HE cluster shot x50</label>
-							<description>Craft 50 HE cluster shot.</description>
-							<jobString>Making HE cluster shot.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>15</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>7</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>FSX</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Judgment_HE>50</Ammo_Judgment_HE>
-							</products>
-							<workAmount>5000</workAmount>
-							<researchPrerequisite>Exotic_Decoding</researchPrerequisite>
-							<recipeUsers>
-								<li>Exotic_Bench</li>
-							</recipeUsers>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_Judgment_Mayhem</defName>
-							<label>make Mayhem Shot x25</label>
-							<description>Craft 25 Mayhem Shot.</description>
-							<jobString>Making Mayhem Shot.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>15</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>9</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>7</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>FSX</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Judgment_Mayhem>25</Ammo_Judgment_Mayhem>
-							</products>
-							<workAmount>7500</workAmount>
-							<researchPrerequisite>Exotic_Decoding</researchPrerequisite>
-							<recipeUsers>
-								<li>Exotic_Bench</li>
-							</recipeUsers>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Exotic Arsenal/Exotic_Damage_CE.xml b/Patches/Exotic Arsenal/Exotic_Damage_CE.xml
deleted file mode 100644
index 7beed7ff78..0000000000
--- a/Patches/Exotic Arsenal/Exotic_Damage_CE.xml	
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Exotic Arsenal</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="Hard_Burn"]/injuryProps/painPerSeverity</xpath>
-					<value>
-						<painPerSeverity>0.025</painPerSeverity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="Energy_Burn"]/injuryProps/painPerSeverity</xpath>
-					<value>
-						<painPerSeverity>0.025</painPerSeverity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<DamageDef Name="Gauss">
-							<defName>UnleashedCE</defName>
-							<label>charge blaster shot</label>
-							<workerClass>DamageWorker_AddInjury</workerClass>
-							<externalViolence>true</externalViolence>
-							<isExplosive>true</isExplosive>
-							<deathMessage>{0} has died in an explosion.</deathMessage>
-							<hediff>Shredded</hediff>
-							<hediffSolid>Crack</hediffSolid>
-							<harmAllLayersUntilOutside>true</harmAllLayersUntilOutside>
-							<impactSoundType>Electric</impactSoundType>
-							<armorCategory>Blunt</armorCategory>
-							<minDamageToFragment>15</minDamageToFragment>
-							<defaultDamage>200</defaultDamage>
-							<defaultStoppingPower>1</defaultStoppingPower>
-							<defaultArmorPenetration>96</defaultArmorPenetration>
-							<buildingDamageFactor>4</buildingDamageFactor>
-							<plantDamageFactor>4</plantDamageFactor>
-							<explosionAffectOutsidePartsOnly>false</explosionAffectOutsidePartsOnly>
-							<explosionHeatEnergyPerCell>5</explosionHeatEnergyPerCell>
-							<explosionCellMote>UnleashedMote</explosionCellMote>
-							<soundExplosion>Explosion_EMP</soundExplosion>
-							<combatLogRules>Damage_Bomb</combatLogRules>
-						</DamageDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Exotic Arsenal/Exotic_Weapons_CE.xml b/Patches/Exotic Arsenal/Exotic_Weapons_CE.xml
deleted file mode 100644
index f594bd084d..0000000000
--- a/Patches/Exotic Arsenal/Exotic_Weapons_CE.xml	
+++ /dev/null
@@ -1,863 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Exotic Arsenal</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!--  ==========Remove vanilla comp==========  -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Xedos_celsius" or defName="Xedos_BFaith" or defName="Xedos_SniperRifle"]/comps</xpath>
-				</li>
-				<!--  ==========Resize==========  -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Xedos_Aesa" or defName="Xedos_Equilibrium" or
-						defName="Xedos_Tyrant" or
-						defName="Xedos_Shiver" or
-						defName="Xedos_celsius" or
-						defName="Xedos_Oberon" or
-						defName="Xedos_Judgement" or
-						defName="Xedos_Paladin" or
-						defName="Xedos_Unleashed" or
-						defName="Xedos_BlazeSF" or
-						defName="Xedos_GlacialSF"] </xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>0.9,0.9</DrawSize>
-							<DrawOffset>0.0,0.0</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Xedos_BFaith"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>0.95,0.95</DrawSize>
-							<DrawOffset>0.0,0.0</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Xedos_SniperRifle"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.1,1.1</DrawSize>
-							<DrawOffset>0.15,0.15</DrawOffset>
-						</li>
-					</value>
-				</li>
-				<!--  ==========Space guns==========  -->
-
-				<!-- equilibrium -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Xedos_Equilibrium</defName>
-					<statBases>
-						<Mass>0.85</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.19</SwayFactor>
-						<Bulk>2.5</Bulk>
-						<WorkToMake>29000</WorkToMake>
-					</statBases>
-					<costList>
-						<Plasteel>40</Plasteel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-						<ComponentSpacer>1</ComponentSpacer>
-						<ExoticEngram>1</ExoticEngram>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Equilibrium_CE</defaultProjectile>
-						<warmupTime>0.55</warmupTime>
-						<range>24</range>
-						<soundCast>Equilibrium_Sound</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_Equilibrium</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- Xedos_Aesa -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Xedos_Aesa</defName>
-					<statBases>
-						<Mass>4.8</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.9</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.5</SwayFactor>
-						<Bulk>9.95</Bulk>
-						<WorkToMake>60000</WorkToMake>
-					</statBases>
-					<costList>
-						<Plasteel>80</Plasteel>
-						<Uranium>40</Uranium>
-						<ComponentSpacer>3</ComponentSpacer>
-						<ExoticEngram>1</ExoticEngram>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Aesa_CE</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>80</range>
-						<soundCast>Aesa_Sound</soundCast>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>16</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>40</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_Aesa</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- Tyrant -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Xedos_Tyrant</defName>
-					<statBases>
-						<Mass>3.6</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.1</ShotSpread>
-						<SwayFactor>1.37</SwayFactor>
-						<Bulk>7.5</Bulk>
-						<WorkToMake>55000</WorkToMake>
-					</statBases>
-					<costList>
-						<Plasteel>80</Plasteel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-						<ComponentSpacer>3</ComponentSpacer>
-						<ExoticEngram>1</ExoticEngram>
-					</costList>
-					<Properties>
-						<recoilAmount>1.16</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_5mm_MonoSteel</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>55</range>
-						<burstShotCount>20</burstShotCount>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>150</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_5mmMono</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>10</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- Xedos_Shiver -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Xedos_Shiver</defName>
-					<statBases>
-						<Mass>4.40</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.29</SwayFactor>
-						<Bulk>7.20</Bulk>
-						<WorkToMake>50000</WorkToMake>
-					</statBases>
-					<costList>
-						<Plasteel>65</Plasteel>
-						<Silver>500</Silver>
-						<ComponentIndustrial>4</ComponentIndustrial>
-						<ComponentSpacer>3</ComponentSpacer>
-						<ExoticEngram>1</ExoticEngram>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<recoilAmount>1.27</recoilAmount>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Shiver_CE</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>Frostmourne_Sound</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>45</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_Shiver</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- Xedos_BlazeSF -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Xedos_BlazeSF</defName>
-					<statBases>
-						<Mass>1</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.1</SwayFactor>
-						<Bulk>3.50</Bulk>
-						<WorkToMake>29000</WorkToMake>
-					</statBases>
-					<costList>
-						<Plasteel>30</Plasteel>
-						<Uranium>10</Uranium>
-						<ComponentIndustrial>3</ComponentIndustrial>
-						<ComponentSpacer>1</ComponentSpacer>
-						<ExoticEngram>1</ExoticEngram>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<recoilAmount>1.50</recoilAmount>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Slashfire_CE</defaultProjectile>
-						<warmupTime>0.35</warmupTime>
-						<range>16</range>
-						<burstShotCount>4</burstShotCount>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>6</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>18</magazineSize>
-						<reloadTime>3.0</reloadTime>
-						<ammoSet>AmmoSet_Slashfire</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- Xedos_GlacialSF -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Xedos_GlacialSF</defName>
-					<statBases>
-						<Mass>1</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.1</SwayFactor>
-						<Bulk>3.5</Bulk>
-						<WorkToMake>29000</WorkToMake>
-					</statBases>
-					<costList>
-						<Plasteel>30</Plasteel>
-						<Silver>200</Silver>
-						<ComponentIndustrial>3</ComponentIndustrial>
-						<ComponentSpacer>1</ComponentSpacer>
-						<ExoticEngram>1</ExoticEngram>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<recoilAmount>1.50</recoilAmount>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_GlacialSF_CE</defaultProjectile>
-						<warmupTime>0.35</warmupTime>
-						<range>16</range>
-						<burstShotCount>4</burstShotCount>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>18</magazineSize>
-						<reloadTime>3.0</reloadTime>
-						<ammoSet>AmmoSet_GlacialSF</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- Xedos_celsius -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Xedos_celsius</defName>
-					<statBases>
-						<Mass>4.20</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.3</SwayFactor>
-						<Bulk>7.66</Bulk>
-						<WorkToMake>45000</WorkToMake>
-					</statBases>
-					<costList>
-						<Plasteel>60</Plasteel>
-						<Uranium>20</Uranium>
-						<ComponentSpacer>3</ComponentSpacer>
-						<ExoticEngram>1</ExoticEngram>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<recoilAmount>1.2</recoilAmount>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_celsius_CE</defaultProjectile>
-						<warmupTime>0.75</warmupTime>
-						<range>40</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>Celsius_Sound</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>40</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_celsius</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-					<researchPrerequisite>GasOperation</researchPrerequisite>
-				</li>
-
-				<!-- Xedos_Oberon -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Xedos_Oberon</defName>
-					<statBases>
-						<Mass>5.00</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.4</SwayFactor>
-						<Bulk>10.00</Bulk>
-						<WorkToMake>29000</WorkToMake>
-					</statBases>
-					<costList>
-						<Plasteel>75</Plasteel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-						<ComponentSpacer>1</ComponentSpacer>
-						<ExoticEngram>1</ExoticEngram>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Oberon_CE</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>68</range>
-						<soundCast>Oberon_Sound</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>0</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>3.0</reloadTime>
-						<ammoSet>AmmoSet_Oberon</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- Xedos_Judgement -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Xedos_Judgement</defName>
-					<statBases>
-						<Mass>4.8</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.40</SwayFactor>
-						<Bulk>7.73</Bulk>
-						<WorkToMake>55000</WorkToMake>
-					</statBases>
-					<costList>
-						<Plasteel>60</Plasteel>
-						<Uranium>20</Uranium>
-						<ComponentIndustrial>4</ComponentIndustrial>
-						<ComponentSpacer>3</ComponentSpacer>
-						<ExoticEngram>1</ExoticEngram>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Judgment_CE</defaultProjectile>
-						<warmupTime>0.60</warmupTime>
-						<range>20</range>
-						<minRange>1.5</minRange>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>18</ticksBetweenBurstShots>
-						<soundCast>Judgment_Sound</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_Judgment</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- Xedos_Paladin -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Xedos_Paladin</defName>
-					<statBases>
-						<Mass>3.2</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.29</SwayFactor>
-						<Bulk>8.60</Bulk>
-						<WorkToMake>55000</WorkToMake>
-					</statBases>
-					<costList>
-						<Plasteel>60</Plasteel>
-						<Uranium>20</Uranium>
-						<ComponentIndustrial>4</ComponentIndustrial>
-						<ComponentSpacer>3</ComponentSpacer>
-						<ExoticEngram>1</ExoticEngram>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<recoilAmount>1.0</recoilAmount>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Paladin_CE</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>60</range>
-						<burstShotCount>8</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>Aesa_Sound</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>60</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_Paladin</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>4</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- Blinding Faith -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Xedos_BFaith</defName>
-					<statBases>
-						<Mass>5</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.37</SwayFactor>
-						<Bulk>8.0</Bulk>
-						<WorkToMake>55000</WorkToMake>
-					</statBases>
-					<costList>
-						<Plasteel>60</Plasteel>
-						<Uranium>20</Uranium>
-						<ComponentIndustrial>4</ComponentIndustrial>
-						<ComponentSpacer>3</ComponentSpacer>
-						<ExoticEngram>1</ExoticEngram>
-					</costList>
-					<Properties>
-						<recoilAmount>1.1</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BFaith_CE</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>50</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<soundCast>Aesa_Sound</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>35</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_BFaith</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- Blaster -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Xedos_Unleashed</defName>
-					<statBases>
-						<Mass>6.4</Mass>
-						<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.62</SwayFactor>
-						<Bulk>11.87</Bulk>
-						<WorkToMake>64000</WorkToMake>
-					</statBases>
-					<costList>
-						<Plasteel>75</Plasteel>
-						<Uranium>25</Uranium>
-						<ComponentIndustrial>6</ComponentIndustrial>
-						<ComponentSpacer>4</ComponentSpacer>
-						<ExoticEngram>1</ExoticEngram>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Unleashed_CE</defaultProjectile>
-						<warmupTime>1.4</warmupTime>
-						<range>42</range>
-						<minRange>1.5</minRange>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<ammoConsumedPerShotCount>6</ammoConsumedPerShotCount>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>24</magazineSize>
-						<reloadTime>4.8</reloadTime>
-						<ammoSet>AmmoSet_Unleashed</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- Xedos_SniperRifle -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Xedos_SniperRifle</defName>
-					<statBases>
-						<Mass>5.5</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>3.6</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>0.88</SwayFactor>
-						<Bulk>10.80</Bulk>
-						<WorkToMake>55000</WorkToMake>
-					</statBases>
-					<costList>
-						<Plasteel>60</Plasteel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-						<ComponentSpacer>3</ComponentSpacer>
-						<ExoticEngram>1</ExoticEngram>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_338Norma_FMJ</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>86</range>
-						<soundCast>Shot_SniperRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>3.0</reloadTime>
-						<ammoSet>AmmoSet_338Norma</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Tools ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Xedos_BlazeSF" or defName="Xedos_GlacialSF"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.6</MeleeCritChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-							<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Xedos_BlazeSF" or defName="Xedos_GlacialSF"]/statBases</xpath>
-					<value>
-						<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Xedos_Equilibrium"]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Xedos_BlazeSF"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.24</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.24</cooldownTime>
-								<extraMeleeDamages>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>7</amount>
-										<chance>1</chance>
-									</li>
-								</extraMeleeDamages>
-								<armorPenetrationSharp>5</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle blade</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.24</cooldownTime>
-								<extraMeleeDamages>
-									<li>
-										<def>Flame</def>
-										<amount>6</amount>
-										<chance>0.6</chance>
-									</li>
-								</extraMeleeDamages>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Xedos_GlacialSF"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.24</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.24</cooldownTime>
-								<extraMeleeDamages>
-									<li>
-										<def>Stasis_Damage</def>
-										<amount>7</amount>
-										<chance>1</chance>
-									</li>
-								</extraMeleeDamages>
-								<armorPenetrationSharp>5</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle blade</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.24</cooldownTime>
-								<extraMeleeDamages>
-									<li>
-										<def>Stasis_Damage</def>
-										<amount>6</amount>
-										<chance>1</chance>
-									</li>
-								</extraMeleeDamages>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Xedos_Aesa" or
-						defName="Xedos_Tyrant" or
-						defName="Xedos_Shiver" or
-						defName="Xedos_celsius" or
-						defName="Xedos_Oberon" or
-						defName="Xedos_Judgement" or
-						defName="Xedos_Paladin" or
-						defName="Xedos_BFaith" or
-						defName="Xedos_Unleashed" or
-						defName="Xedos_SniperRifle"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Arrows_ExpandedMetals.xml b/Patches/Expanded Materials - Metals/Ammo/Arrows_ExpandedMetals.xml
deleted file mode 100644
index 6294e40063..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Arrows_ExpandedMetals.xml	
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_Arrow"]/ammoTypes</xpath>
-					<value>
-						<Ammo_Arrow_Iron>Projectile_Arrow_Iron</Ammo_Arrow_Iron>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_StreamlinedArrow"]/ammoTypes</xpath>
-					<value>
-						<Ammo_Arrow_Iron>Projectile_StreamlinedArrow_Iron</Ammo_Arrow_Iron>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_GreatArrow"]/ammoTypes</xpath>
-					<value>
-						<Ammo_GreatArrow_Iron>Projectile_GreatArrow_Iron</Ammo_GreatArrow_Iron>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ==================== Arrows & Streamlined Arrows ========================== -->
-
-						<!-- ==================== Ammo Category ========================== -->
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>IronArrow</defName>
-							<label>iron arrow</label>
-							<labelShort>iron</labelShort>
-							<description>The arrow head is made from iron, capable of punching through shields and leather armor.</description>
-							<advanced>true</advanced>
-						</CombatExtended.AmmoCategoryDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoArrowBase">
-							<defName>Ammo_Arrow_Iron</defName>
-							<label>arrow (iron)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Neolithic/Arrow/Steel</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<Mass>0.034</Mass>
-								<MarketValue>0.53</MarketValue>
-							</statBases>
-							<ammoClass>IronArrow</ammoClass>
-						</ThingDef>
-
-						<!-- ================== Projectiles (short bow) ================== -->
-
-						<ThingDef ParentName="BaseArrowProjectile">
-							<defName>Projectile_Arrow_Iron</defName>
-							<label>arrow (iron)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>37</speed>
-								<damageAmountBase>7</damageAmountBase>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.02</armorPenetrationBlunt>
-								<preExplosionSpawnChance>0.666</preExplosionSpawnChance><!-- 29.94 arrows per resource -->
-								<preExplosionSpawnThingDef>Ammo_Arrow_Iron</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== Projectiles (Recurve Bow) ================== -->
-
-						<ThingDef ParentName="BaseStreamlinedArrowProjectile">
-							<defName>Projectile_StreamlinedArrow_Iron</defName>
-							<label>streamlined arrow (iron)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>47</speed>
-								<damageAmountBase>9</damageAmountBase>
-								<armorPenetrationSharp>1.0</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.9</armorPenetrationBlunt>
-								<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Ammo_Arrow_Iron</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>MakeAmmo_Arrow_Iron</defName>
-							<label>make iron arrows x10</label>
-							<description>Craft 10 iron arrows.</description>
-							<jobString>Making iron arrows.</jobString>
-							<workAmount>300</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>VMEu_Iron</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-									<li>VMEu_Iron</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Arrow_Iron>10</Ammo_Arrow_Iron>
-							</products>
-						</RecipeDef>
-
-						<!-- ==================== Great Arrows ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoGreatArrowBase">
-							<defName>Ammo_GreatArrow_Iron</defName>
-							<label>great arrow (iron)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Neolithic/Arrow/Steel</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<Mass>0.115</Mass>
-								<MarketValue>0.66</MarketValue>
-							</statBases>
-							<ammoClass>IronArrow</ammoClass>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGreatArrowProjectile">
-							<defName>Projectile_GreatArrow_Iron</defName>
-							<label>great arrow (iron)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>7</damageAmountBase>
-								<armorPenetrationBlunt>2.340</armorPenetrationBlunt>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<preExplosionSpawnChance>0.6</preExplosionSpawnChance><!-- 25 arrows per resource -->
-								<preExplosionSpawnThingDef>Ammo_GreatArrow_Iron</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>MakeAmmo_GreatArrow_Iron</defName>
-							<label>make steel great arrows x10</label>
-							<description>Craft 10 steel great arrows.</description>
-							<jobString>Making steel great arrows.</jobString>
-							<workAmount>400</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>VMEu_Iron</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_GreatArrow_Iron>10</Ammo_GreatArrow_Iron>
-							</products>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/HighCaliber/127x108mm.xml b/Patches/Expanded Materials - Metals/Ammo/HighCaliber/127x108mm.xml
deleted file mode 100644
index b12b368a66..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/HighCaliber/127x108mm.xml	
+++ /dev/null
@@ -1,289 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_127x108mm_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>17</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>15</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_127x108mm_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_127x108mm_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>17</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>15</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_127x108mm_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing incendiary -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_127x108mm_Incendiary"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>17</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>15</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Prometheum</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_127x108mm_Incendiary"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- High-8 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_127x108mm_HE"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>13</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>15</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>FSX</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_127x108mm_HE"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Sabot -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_127x108mm_Sabot"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>17</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>15</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Uranium</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_127x108mm_Sabot"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/HighCaliber/145x114mm.xml b/Patches/Expanded Materials - Metals/Ammo/HighCaliber/145x114mm.xml
deleted file mode 100644
index 87baefb567..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/HighCaliber/145x114mm.xml	
+++ /dev/null
@@ -1,289 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_145x114mm_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>26</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>17</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>23</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_145x114mm_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_145x114mm_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>26</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>17</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>23</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_145x114mm_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing incendiary -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_145x114mm_Incendiary"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>26</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>17</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>23</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Prometheum</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_145x114mm_Incendiary"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- High-8 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_145x114mm_HE"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>20</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>17</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>23</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>FSX</li>
-									</thingDefs>
-								</filter>
-								<count>14</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_145x114mm_HE"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Sabot -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_145x114mm_Sabot"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>26</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>23</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Uranium</li>
-									</thingDefs>
-								</filter>
-								<count>9</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_145x114mm_Sabot"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/HighCaliber/20x102mmNATO.xml b/Patches/Expanded Materials - Metals/Ammo/HighCaliber/20x102mmNATO.xml
deleted file mode 100644
index c8a620892a..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/HighCaliber/20x102mmNATO.xml	
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_20x102mmNATO_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>36</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>1.1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>23</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>31</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_20x102mmNATO_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing incendiary -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_20x102mmNATO_Incendiary"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>36</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>1.1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>23</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>31</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Prometheum</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_20x102mmNATO_Incendiary"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- High-8 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_20x102mmNATO_HE"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>29</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>1.1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>23</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>31</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>FSX</li>
-									</thingDefs>
-								</filter>
-								<count>20</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_20x102mmNATO_HE"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Sabot -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_20x102mmNATO_Sabot"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>36</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>31</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Uranium</li>
-									</thingDefs>
-								</filter>
-								<count>12</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_20x102mmNATO_Sabot"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/HighCaliber/20x110mmHispano.xml b/Patches/Expanded Materials - Metals/Ammo/HighCaliber/20x110mmHispano.xml
deleted file mode 100644
index 8dae73d8b7..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/HighCaliber/20x110mmHispano.xml	
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_20x110mmHispano_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>36</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>1.1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>23</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>31</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_20x110mmHispano_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing incendiary -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_20x110mmHispano_Incendiary"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>36</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>1.1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>23</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>31</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Prometheum</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_20x110mmHispano_Incendiary"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- High-8 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_20x110mmHispano_HE"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>29</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>1.1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>23</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>31</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>FSX</li>
-									</thingDefs>
-								</filter>
-								<count>20</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_20x110mmHispano_HE"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Sabot -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_20x110mmHispano_Sabot"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>36</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>31</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Uranium</li>
-									</thingDefs>
-								</filter>
-								<count>12</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_20x110mmHispano_Sabot"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/HighCaliber/25x137mmNATO.xml b/Patches/Expanded Materials - Metals/Ammo/HighCaliber/25x137mmNATO.xml
deleted file mode 100644
index 04478d7c31..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/HighCaliber/25x137mmNATO.xml	
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_25x137mmNATO_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>71</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>2.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>44</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>61</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_25x137mmNATO_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing incendiary -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_25x137mmNATO_Incendiary"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>71</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>2.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>44</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>61</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Prometheum</li>
-									</thingDefs>
-								</filter>
-								<count>20</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_25x137mmNATO_Incendiary"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- High-8 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_25x137mmNATO_HE"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>55</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>2.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>44</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>61</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>FSX</li>
-									</thingDefs>
-								</filter>
-								<count>40</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_25x137mmNATO_HE"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Sabot -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_25x137mmNATO_Sabot"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>71</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>61</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Uranium</li>
-									</thingDefs>
-								</filter>
-								<count>24</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_25x137mmNATO_Sabot"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/HighCaliber/300WinchesterMagnum.xml b/Patches/Expanded Materials - Metals/Ammo/HighCaliber/300WinchesterMagnum.xml
deleted file mode 100644
index 7668c26cb7..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/HighCaliber/300WinchesterMagnum.xml	
+++ /dev/null
@@ -1,289 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_300WinchesterMagnum_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_300WinchesterMagnum_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_300WinchesterMagnum_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_300WinchesterMagnum_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing incendiary -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_300WinchesterMagnum_Incendiary"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Prometheum</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_300WinchesterMagnum_Incendiary"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- High-8 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_300WinchesterMagnum_HE"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>FSX</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_300WinchesterMagnum_HE"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Sabot -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_300WinchesterMagnum_Sabot"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Uranium</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_300WinchesterMagnum_Sabot"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/HighCaliber/30x173mmNATO.xml b/Patches/Expanded Materials - Metals/Ammo/HighCaliber/30x173mmNATO.xml
deleted file mode 100644
index f478cb77bb..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/HighCaliber/30x173mmNATO.xml	
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_30x173mmNATO_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>59</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>1.8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>37</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>50</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_30x173mmNATO_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing incendiary -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_30x173mmNATO_Incendiary"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>59</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>1.8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>37</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>50</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Prometheum</li>
-									</thingDefs>
-								</filter>
-								<count>17</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_30x173mmNATO_Incendiary"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- High-8 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_30x173mmNATO_HE"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>46</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>1.8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>37</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>50</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>FSX</li>
-									</thingDefs>
-								</filter>
-								<count>34</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_30x173mmNATO_HE"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Sabot -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_30x173mmNATO_Sabot"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>59</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>50</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Uranium</li>
-									</thingDefs>
-								</filter>
-								<count>20</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_30x173mmNATO_Sabot"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/HighCaliber/338Lapua.xml b/Patches/Expanded Materials - Metals/Ammo/HighCaliber/338Lapua.xml
deleted file mode 100644
index 86213e8e66..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/HighCaliber/338Lapua.xml	
+++ /dev/null
@@ -1,289 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_338Lapua_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_338Lapua_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_338Lapua_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_338Lapua_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing incendiary -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_338Lapua_Incendiary"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Prometheum</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_338Lapua_Incendiary"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- High-8 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_338Lapua_HE"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>FSX</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_338Lapua_HE"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Sabot -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_338Lapua_Sabot"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Uranium</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_338Lapua_Sabot"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/HighCaliber/338Norma.xml b/Patches/Expanded Materials - Metals/Ammo/HighCaliber/338Norma.xml
deleted file mode 100644
index 9b46f133b8..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/HighCaliber/338Norma.xml	
+++ /dev/null
@@ -1,289 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_338Norma_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_338Norma_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_338Norma_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_338Norma_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing incendiary -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_338Norma_Incendiary"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Prometheum</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_338Norma_Incendiary"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- High-8 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_338Norma_HE"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>FSX</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_338Norma_HE"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Sabot -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_338Norma_Sabot"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Uranium</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_338Norma_Sabot"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/HighCaliber/408CheyenneTactical.xml b/Patches/Expanded Materials - Metals/Ammo/HighCaliber/408CheyenneTactical.xml
deleted file mode 100644
index 20c06b72c2..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/HighCaliber/408CheyenneTactical.xml	
+++ /dev/null
@@ -1,289 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_408CheyenneTactical_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_408CheyenneTactical_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_408CheyenneTactical_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_408CheyenneTactical_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing incendiary -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_408CheyenneTactical_Incendiary"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Prometheum</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_408CheyenneTactical_Incendiary"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- High-8 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_408CheyenneTactical_HE"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>9</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>FSX</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_408CheyenneTactical_HE"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Sabot -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_408CheyenneTactical_Sabot"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Uranium</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_408CheyenneTactical_Sabot"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/HighCaliber/40x311mmR.xml b/Patches/Expanded Materials - Metals/Ammo/HighCaliber/40x311mmR.xml
deleted file mode 100644
index 498a3e4d25..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/HighCaliber/40x311mmR.xml	
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_40x311mmR_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>76</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>2.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>48</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>65</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_40x311mmR_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing incendiary -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_40x311mmR_Incendiary"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>76</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>2.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>48</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>65</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Prometheum</li>
-									</thingDefs>
-								</filter>
-								<count>22</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_40x311mmR_Incendiary"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- High-8 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_40x311mmR_HE"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>60</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>2.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>48</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>65</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>FSX</li>
-									</thingDefs>
-								</filter>
-								<count>43</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_40x311mmR_HE"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Sabot -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_40x311mmR_Sabot"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>76</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>65</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Uranium</li>
-									</thingDefs>
-								</filter>
-								<count>26</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_40x311mmR_Sabot"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/HighCaliber/50BMG.xml b/Patches/Expanded Materials - Metals/Ammo/HighCaliber/50BMG.xml
deleted file mode 100644
index 95ee42eda4..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/HighCaliber/50BMG.xml	
+++ /dev/null
@@ -1,289 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_50BMG_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>17</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>15</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_50BMG_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_50BMG_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>17</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>15</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_50BMG_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing incendiary -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_50BMG_Incendiary"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>17</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>15</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Prometheum</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_50BMG_Incendiary"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- High-8 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_50BMG_HE"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>13</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>15</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>FSX</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_50BMG_HE"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Sabot -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_50BMG_Sabot"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>17</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>15</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Uranium</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_50BMG_Sabot"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_10mmAuto.xml b/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_10mmAuto.xml
deleted file mode 100644
index 65ad10a260..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_10mmAuto.xml	
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_10mmAuto_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_10mmAuto_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_10mmAuto_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_10mmAuto_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_10mmAuto_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_10mmAuto_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_22LR.xml b/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_22LR.xml
deleted file mode 100644
index be328d7bb3..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_22LR.xml	
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_22LR_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_22LR_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_22LR_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_22LR_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_22LR_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_22LR_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_32ACP.xml b/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_32ACP.xml
deleted file mode 100644
index d97b9478b5..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_32ACP.xml	
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_32ACP_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_32ACP_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_32ACP_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_32ACP_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_32ACP_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_32ACP_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_357Magnum.xml b/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_357Magnum.xml
deleted file mode 100644
index 7ccd7a206b..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_357Magnum.xml	
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_357Magnum_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_357Magnum_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_357Magnum_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_357Magnum_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_357Magnum_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_357Magnum_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_357SIG.xml b/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_357SIG.xml
deleted file mode 100644
index 1f8bb49d81..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_357SIG.xml	
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_357SIG_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_357SIG_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_357SIG_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_357SIG_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_357SIG_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_357SIG_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_40SW.xml b/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_40SW.xml
deleted file mode 100644
index e5602ca566..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_40SW.xml	
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_40SW_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_40SW_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_40SW_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_40SW_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_40SW_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_40SW_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_44Magnum.xml b/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_44Magnum.xml
deleted file mode 100644
index 817f7d8fee..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_44Magnum.xml	
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_44Magnum_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_44Magnum_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_44Magnum_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_44Magnum_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_44Magnum_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_44Magnum_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_454Casull.xml b/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_454Casull.xml
deleted file mode 100644
index c945d260a3..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_454Casull.xml	
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_454Casull_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>14</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_454Casull_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_454Casull_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>14</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_454Casull_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_454Casull_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>14</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_454Casull_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_455Webley.xml b/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_455Webley.xml
deleted file mode 100644
index abe70eccfa..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_455Webley.xml	
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_455Webley_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_455Webley_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_455Webley_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_455Webley_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_455Webley_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_455Webley_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_45ACP.xml b/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_45ACP.xml
deleted file mode 100644
index f326f3f583..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_45ACP.xml	
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_45ACP_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>9</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_45ACP_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_45ACP_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>9</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_45ACP_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_45ACP_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>9</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_45ACP_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_45Colt.xml b/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_45Colt.xml
deleted file mode 100644
index f918364950..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_45Colt.xml	
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_45Colt_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_45Colt_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_45Colt_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_45Colt_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_45Colt_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_45Colt_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_46x30mm.xml b/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_46x30mm.xml
deleted file mode 100644
index ed6d9aaee6..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_46x30mm.xml	
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_46x30mm_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_46x30mm_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_46x30mm_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_46x30mm_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_46x30mm_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_46x30mm_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_500SWMagnum.xml b/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_500SWMagnum.xml
deleted file mode 100644
index 8bb28a9f49..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_500SWMagnum.xml	
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_500SWMagnum_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>15</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>12</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_500SWMagnum_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_500SWMagnum_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>15</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>12</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_500SWMagnum_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_500SWMagnum_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>15</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>12</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_500SWMagnum_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_50AE.xml b/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_50AE.xml
deleted file mode 100644
index 98df7b3040..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_50AE.xml	
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_50AE_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>12</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_50AE_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_50AE_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>12</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_50AE_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_50AE_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>12</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_50AE_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_58x21mmDAP92.xml b/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_58x21mmDAP92.xml
deleted file mode 100644
index af54c109f4..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_58x21mmDAP92.xml	
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_58x21mmDAP92_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_58x21mmDAP92_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_58x21mmDAP92_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_58x21mmDAP92_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_58x21mmDAP92_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_58x21mmDAP92_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_762x25mmTokarev.xml b/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_762x25mmTokarev.xml
deleted file mode 100644
index 642deb3400..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_762x25mmTokarev.xml	
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x25mmTokarev_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x25mmTokarev_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x25mmTokarev_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x25mmTokarev_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x25mmTokarev_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x25mmTokarev_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_762x38mmR.xml b/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_762x38mmR.xml
deleted file mode 100644
index efbcd6c565..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_762x38mmR.xml	
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x38mmR_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x38mmR_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x38mmR_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x38mmR_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x38mmR_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x38mmR_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_763x25mmMauser.xml b/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_763x25mmMauser.xml
deleted file mode 100644
index bd328bc4f2..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_763x25mmMauser.xml	
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_763x25mmMauser_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_763x25mmMauser_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_763x25mmMauser_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_763x25mmMauser_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_763x25mmMauser_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_763x25mmMauser_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_765x20mmLongue.xml b/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_765x20mmLongue.xml
deleted file mode 100644
index 256bcaba23..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_765x20mmLongue.xml	
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_765x20mmLongue_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_765x20mmLongue_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_765x20mmLongue_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_765x20mmLongue_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_765x20mmLongue_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_765x20mmLongue_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_9x18mmMakarov.xml b/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_9x18mmMakarov.xml
deleted file mode 100644
index c0d15597d4..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_9x18mmMakarov.xml	
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_9x18mmMakarov_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_9x18mmMakarov_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_9x18mmMakarov_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_9x18mmMakarov_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_9x18mmMakarov_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_9x18mmMakarov_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_9x19mmPara.xml b/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_9x19mmPara.xml
deleted file mode 100644
index 151faed87a..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_9x19mmPara.xml	
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_9x19mmPara_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_9x19mmPara_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_9x19mmPara_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_9x19mmPara_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_9x19mmPara_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_9x19mmPara_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_9x21mmGyurza.xml b/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_9x21mmGyurza.xml
deleted file mode 100644
index 41fd2dfb9f..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_9x21mmGyurza.xml	
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_9x21mmGyurza_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_9x21mmGyurza_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_9x21mmGyurza_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_9x21mmGyurza_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_9x21mmGyurza_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_9x21mmGyurza_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_FN57x28mm.xml b/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_FN57x28mm.xml
deleted file mode 100644
index 42203440bd..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_FN57x28mm.xml	
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_FN57x28mm_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_FN57x28mm_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_FN57x28mm_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_FN57x28mm_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_FN57x28mm_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_FN57x28mm_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_127x55mmAR.xml b/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_127x55mmAR.xml
deleted file mode 100644
index 50243ba579..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_127x55mmAR.xml	
+++ /dev/null
@@ -1,342 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_127x55mmAR_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>25</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>1.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>12</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>25</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_127x55mmAR_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_127x55mmAR_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>25</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>1.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>12</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>25</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_127x55mmAR_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_127x55mmAR_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>25</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>1.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>12</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>25</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_127x55mmAR_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing incendiary -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_127x55mmAR_Incendiary"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>25</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>1.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>12</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>25</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Prometheum</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_127x55mmAR_Incendiary"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- High-8 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_127x55mmAR_HE"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>20</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>1.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>12</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>25</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>FSX</li>
-									</thingDefs>
-								</filter>
-								<count>15</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_127x55mmAR_HE"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Sabot -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_127x55mmAR_Sabot"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>24</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>30</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Uranium</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_127x55mmAR_Sabot"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_277Fury.xml b/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_277Fury.xml
deleted file mode 100644
index e495b9b3ea..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_277Fury.xml	
+++ /dev/null
@@ -1,342 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_277Fury_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_277Fury_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_277Fury_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_277Fury_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_277Fury_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_277Fury_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing incendiary -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_277Fury_Incendiary"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Prometheum</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_277Fury_Incendiary"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- High-8 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_277Fury_HE"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>FSX</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_277Fury_HE"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Sabot -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_277Fury_Sabot"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Uranium</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_277Fury_Sabot"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_3006Springfield.xml b/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_3006Springfield.xml
deleted file mode 100644
index ee7d758551..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_3006Springfield.xml	
+++ /dev/null
@@ -1,342 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_3006Springfield_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>9</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_3006Springfield_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_3006Springfield_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>9</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_3006Springfield_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_3006Springfield_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>9</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_3006Springfield_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing incendiary -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_3006Springfield_Incendiary"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>9</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Prometheum</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_3006Springfield_Incendiary"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- High-8 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_3006Springfield_HE"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>FSX</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_3006Springfield_HE"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Sabot -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_3006Springfield_Sabot"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Uranium</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_3006Springfield_Sabot"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_300AACBlackout.xml b/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_300AACBlackout.xml
deleted file mode 100644
index 78e6dc684d..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_300AACBlackout.xml	
+++ /dev/null
@@ -1,342 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_300AACBlackout_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_300AACBlackout_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_300AACBlackout_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_300AACBlackout_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_300AACBlackout_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_300AACBlackout_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing incendiary -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_300AACBlackout_Incendiary"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Prometheum</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_300AACBlackout_Incendiary"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- High-8 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_300AACBlackout_HE"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>FSX</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_300AACBlackout_HE"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Sabot -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_300AACBlackout_Sabot"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Uranium</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_300AACBlackout_Sabot"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_303British.xml b/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_303British.xml
deleted file mode 100644
index 366f0d1175..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_303British.xml	
+++ /dev/null
@@ -1,342 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_303British_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_303British_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_303British_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_303British_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_303British_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_303British_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing incendiary -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_303British_Incendiary"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Prometheum</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_303British_Incendiary"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- High-8 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_303British_HE"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>FSX</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_303British_HE"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Sabot -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_303British_Sabot"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Uranium</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_303British_Sabot"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_30Carbine.xml b/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_30Carbine.xml
deleted file mode 100644
index 5bb499fb4a..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_30Carbine.xml	
+++ /dev/null
@@ -1,342 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_30Carbine_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_30Carbine_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_30Carbine_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_30Carbine_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_30Carbine_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_30Carbine_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing incendiary -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_30Carbine_Incendiary"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Prometheum</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_30Carbine_Incendiary"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- High-8 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_30Carbine_HE"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>FSX</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_30Carbine_HE"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Sabot -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_30Carbine_Sabot"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Uranium</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_30Carbine_Sabot"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_545x39mmSoviet.xml b/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_545x39mmSoviet.xml
deleted file mode 100644
index 83471658e0..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_545x39mmSoviet.xml	
+++ /dev/null
@@ -1,342 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_545x39mmSoviet_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_545x39mmSoviet_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_545x39mmSoviet_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_545x39mmSoviet_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_545x39mmSoviet_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_545x39mmSoviet_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing incendiary -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_545x39mmSoviet_Incendiary"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Prometheum</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_545x39mmSoviet_Incendiary"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- High-8 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_545x39mmSoviet_HE"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>FSX</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_545x39mmSoviet_HE"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Sabot -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_545x39mmSoviet_Sabot"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Uranium</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_545x39mmSoviet_Sabot"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_556x45mmNATO.xml b/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_556x45mmNATO.xml
deleted file mode 100644
index 8a40fa631c..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_556x45mmNATO.xml	
+++ /dev/null
@@ -1,342 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_556x45mmNATO_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_556x45mmNATO_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_556x45mmNATO_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_556x45mmNATO_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_556x45mmNATO_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_556x45mmNATO_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing incendiary -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_556x45mmNATO_Incendiary"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Prometheum</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_556x45mmNATO_Incendiary"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- High-8 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_556x45mmNATO_HE"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>FSX</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_556x45mmNATO_HE"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Sabot -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_556x45mmNATO_Sabot"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Uranium</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_556x45mmNATO_Sabot"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_58x42mmDBP10.xml b/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_58x42mmDBP10.xml
deleted file mode 100644
index 112353fd93..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_58x42mmDBP10.xml	
+++ /dev/null
@@ -1,342 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_58x42mmDBP10_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_58x42mmDBP10_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_58x42mmDBP10_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_58x42mmDBP10_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_58x42mmDBP10_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_58x42mmDBP10_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing incendiary -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_58x42mmDBP10_Incendiary"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Prometheum</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_58x42mmDBP10_Incendiary"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- High-8 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_58x42mmDBP10_HE"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>FSX</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_58x42mmDBP10_HE"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Sabot -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_58x42mmDBP10_Sabot"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Uranium</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_58x42mmDBP10_Sabot"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_65x52mmCarcano.xml b/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_65x52mmCarcano.xml
deleted file mode 100644
index fa6ea80ddf..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_65x52mmCarcano.xml	
+++ /dev/null
@@ -1,342 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_65x52mmCarcano_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>9</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_65x52mmCarcano_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_65x52mmCarcano_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>9</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_65x52mmCarcano_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_65x52mmCarcano_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>9</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_65x52mmCarcano_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing incendiary -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_65x52mmCarcano_Incendiary"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>9</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Prometheum</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_65x52mmCarcano_Incendiary"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- High-8 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_65x52mmCarcano_HE"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>FSX</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_65x52mmCarcano_HE"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Sabot -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_65x52mmCarcano_Sabot"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Uranium</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_65x52mmCarcano_Sabot"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_75x54mmFrench.xml b/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_75x54mmFrench.xml
deleted file mode 100644
index de6db390b4..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_75x54mmFrench.xml	
+++ /dev/null
@@ -1,342 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_75x54mmFrench_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_75x54mmFrench_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_75x54mmFrench_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_75x54mmFrench_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_75x54mmFrench_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_75x54mmFrench_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing incendiary -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_75x54mmFrench_Incendiary"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Prometheum</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_75x54mmFrench_Incendiary"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- High-8 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_75x54mmFrench_HE"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>FSX</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_75x54mmFrench_HE"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Sabot -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_75x54mmFrench_Sabot"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Uranium</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_75x54mmFrench_Sabot"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_762x39mmSoviet.xml b/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_762x39mmSoviet.xml
deleted file mode 100644
index f899a01c8b..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_762x39mmSoviet.xml	
+++ /dev/null
@@ -1,342 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x39mmSoviet_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x39mmSoviet_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x39mmSoviet_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x39mmSoviet_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x39mmSoviet_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x39mmSoviet_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing incendiary -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x39mmSoviet_Incendiary"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Prometheum</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x39mmSoviet_Incendiary"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- High-8 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x39mmSoviet_HE"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>FSX</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x39mmSoviet_HE"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Sabot -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x39mmSoviet_Sabot"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Uranium</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x39mmSoviet_Sabot"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_762x51mmNATO.xml b/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_762x51mmNATO.xml
deleted file mode 100644
index baa56a87aa..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_762x51mmNATO.xml	
+++ /dev/null
@@ -1,342 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x51mmNATO_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x51mmNATO_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x51mmNATO_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x51mmNATO_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x51mmNATO_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x51mmNATO_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing incendiary -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x51mmNATO_Incendiary"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Prometheum</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x51mmNATO_Incendiary"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- High-8 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x51mmNATO_HE"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>FSX</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x51mmNATO_HE"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Sabot -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x51mmNATO_Sabot"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Uranium</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x51mmNATO_Sabot"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_762x54mmR.xml b/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_762x54mmR.xml
deleted file mode 100644
index 8c572c4c36..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_762x54mmR.xml	
+++ /dev/null
@@ -1,342 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x54mmR_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x54mmR_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x54mmR_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x54mmR_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x54mmR_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x54mmR_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing incendiary -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x54mmR_Incendiary"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Prometheum</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x54mmR_Incendiary"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- High-8 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x54mmR_HE"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>FSX</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x54mmR_HE"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Sabot -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x54mmR_Sabot"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Uranium</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_762x54mmR_Sabot"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_77x58mmArisaka.xml b/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_77x58mmArisaka.xml
deleted file mode 100644
index 10593c9c64..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_77x58mmArisaka.xml	
+++ /dev/null
@@ -1,342 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_77x58mmArisaka_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>9</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_77x58mmArisaka_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_77x58mmArisaka_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>9</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_77x58mmArisaka_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_77x58mmArisaka_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>9</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_77x58mmArisaka_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing incendiary -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_77x58mmArisaka_Incendiary"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>9</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Prometheum</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_77x58mmArisaka_Incendiary"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- High-8 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_77x58mmArisaka_HE"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>FSX</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_77x58mmArisaka_HE"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Sabot -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_77x58mmArisaka_Sabot"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Uranium</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_77x58mmArisaka_Sabot"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_792x33mmKurz.xml b/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_792x33mmKurz.xml
deleted file mode 100644
index 71bf1071d1..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_792x33mmKurz.xml	
+++ /dev/null
@@ -1,342 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_792x33mmKurz_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_792x33mmKurz_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_792x33mmKurz_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_792x33mmKurz_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_792x33mmKurz_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_792x33mmKurz_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing incendiary -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_792x33mmKurz_Incendiary"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Prometheum</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_792x33mmKurz_Incendiary"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- High-8 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_792x33mmKurz_HE"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>FSX</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_792x33mmKurz_HE"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Sabot -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_792x33mmKurz_Sabot"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Uranium</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_792x33mmKurz_Sabot"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_792x57mmMauser.xml b/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_792x57mmMauser.xml
deleted file mode 100644
index 9f94249f27..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_792x57mmMauser.xml	
+++ /dev/null
@@ -1,342 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_792x57mmMauser_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>9</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_792x57mmMauser_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_792x57mmMauser_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>9</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_792x57mmMauser_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_792x57mmMauser_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>9</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_792x57mmMauser_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing incendiary -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_792x57mmMauser_Incendiary"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>9</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Prometheum</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_792x57mmMauser_Incendiary"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- High-8 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_792x57mmMauser_HE"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>FSX</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_792x57mmMauser_HE"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Sabot -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_792x57mmMauser_Sabot"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Uranium</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_792x57mmMauser_Sabot"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_8x50mmRLebel.xml b/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_8x50mmRLebel.xml
deleted file mode 100644
index 675600c300..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_8x50mmRLebel.xml	
+++ /dev/null
@@ -1,342 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_8x50mmRLebel_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>9</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_8x50mmRLebel_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_8x50mmRLebel_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>9</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_8x50mmRLebel_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_8x50mmRLebel_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>9</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_8x50mmRLebel_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing incendiary -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_8x50mmRLebel_Incendiary"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>9</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Prometheum</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_8x50mmRLebel_Incendiary"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- High-8 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_8x50mmRLebel_HE"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>FSX</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_8x50mmRLebel_HE"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Sabot -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_8x50mmRLebel_Sabot"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Uranium</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_8x50mmRLebel_Sabot"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_9x39mmSoviet.xml b/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_9x39mmSoviet.xml
deleted file mode 100644
index fe00a67e87..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_9x39mmSoviet.xml	
+++ /dev/null
@@ -1,342 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Full Metal Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_9x39mmSoviet_FMJ"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>9</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_9x39mmSoviet_FMJ"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Hollow Point -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_9x39mmSoviet_HP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>9</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_9x39mmSoviet_HP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_9x39mmSoviet_AP"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>9</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_9x39mmSoviet_AP"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Armor-piercing incendiary -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_9x39mmSoviet_Incendiary"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>9</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Prometheum</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_9x39mmSoviet_Incendiary"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- High-8 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_9x39mmSoviet_HE"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>7</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Copper</li>
-									</thingDefs>
-								</filter>
-								<count>0.4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>FSX</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_9x39mmSoviet_HE"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Sabot -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_9x39mmSoviet_Sabot"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Uranium</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_9x39mmSoviet_Sabot"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Sabot.xml b/Patches/Expanded Materials - Metals/Ammo/Sabot.xml
deleted file mode 100644
index f665d692a7..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Sabot.xml	
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[
-						defName="MakeAmmo_127x55mmAR_Sabot" or
-						defName="MakeAmmo_3006Springfield_Sabot" or
-						defName="MakeAmmo_300AACBlackout_Sabot" or
-						defName="MakeAmmo_303British_Sabot" or
-						defName="MakeAmmo_30Carbine_Sabot" or
-						defName="MakeAmmo_545x39mmSoviet_Sabot" or
-						defName="MakeAmmo_556x45mmNATO_Sabot" or
-						defName="MakeAmmo_58x42mmDBP10_Sabot" or
-						defName="MakeAmmo_65x52mmCarcano_Sabot" or
-						defName="MakeAmmo_75x54mmFrench_Sabot" or
-						defName="MakeAmmo_762x51mmNATO_Sabot" or
-						defName="MakeAmmo_762x39mmSoviet_Sabot" or
-						defName="MakeAmmo_762x54mmR_Sabot" or
-						defName="MakeAmmo_77x58mmArisaka_Sabot" or
-						defName="MakeAmmo_792x33mmKurz_Sabot" or
-						defName="MakeAmmo_792x57mmMauser_Sabot" or
-						defName="MakeAmmo_8x50mmRLebel_Sabot" or
-						defName="MakeAmmo_9x39mmSoviet_Sabot" or
-						defName="MakeAmmo_300WinchesterMagnum_Sabot" or
-						defName="MakeAmmo_338Lapua_Sabot" or
-						defName="MakeAmmo_338Norma_Sabot" or
-						defName="MakeAmmo_408CheyenneTactical_Sabot" or
-						defName="MakeAmmo_50BMG_Sabot" or
-						defName="MakeAmmo_127x108mm_Sabot" or
-						defName="MakeAmmo_145x114mm_Sabot" or
-						defName="MakeAmmo_20x102mmNATO_Sabot" or
-						defName="MakeAmmo_20x110mmHispano_Sabot" or
-						defName="MakeAmmo_25x137mmNATO_Sabot" or
-						defName="MakeAmmo_30x173mmNATO_Sabot" or
-						defName="MakeAmmo_40x311mmR_Sabot"]/ingredients/li[3]/filter
-					</xpath>
-					<value>
-						<filter>
-							<thingDefs>
-								<li>VMEu_Tungsten</li>
-								<li>Uranium</li>
-							</thingDefs>
-						</filter>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[
-						defName="MakeAmmo_127x55mmAR_Sabot" or
-						defName="MakeAmmo_3006Springfield_Sabot" or
-						defName="MakeAmmo_300AACBlackout_Sabot" or
-						defName="MakeAmmo_303British_Sabot" or
-						defName="MakeAmmo_30Carbine_Sabot" or
-						defName="MakeAmmo_545x39mmSoviet_Sabot" or
-						defName="MakeAmmo_556x45mmNATO_Sabot" or
-						defName="MakeAmmo_58x42mmDBP10_Sabot" or
-						defName="MakeAmmo_65x52mmCarcano_Sabot" or
-						defName="MakeAmmo_75x54mmFrench_Sabot" or
-						defName="MakeAmmo_762x51mmNATO_Sabot" or
-						defName="MakeAmmo_762x39mmSoviet_Sabot" or
-						defName="MakeAmmo_762x54mmR_Sabot" or
-						defName="MakeAmmo_77x58mmArisaka_Sabot" or
-						defName="MakeAmmo_792x33mmKurz_Sabot" or
-						defName="MakeAmmo_792x57mmMauser_Sabot" or
-						defName="MakeAmmo_8x50mmRLebel_Sabot" or
-						defName="MakeAmmo_9x39mmSoviet_Sabot" or
-						defName="MakeAmmo_300WinchesterMagnum_Sabot" or
-						defName="MakeAmmo_338Lapua_Sabot" or
-						defName="MakeAmmo_338Norma_Sabot" or
-						defName="MakeAmmo_408CheyenneTactical_Sabot" or
-						defName="MakeAmmo_50BMG_Sabot" or
-						defName="MakeAmmo_127x108mm_Sabot" or
-						defName="MakeAmmo_145x114mm_Sabot" or
-						defName="MakeAmmo_20x102mmNATO_Sabot" or
-						defName="MakeAmmo_20x110mmHispano_Sabot" or
-						defName="MakeAmmo_25x137mmNATO_Sabot" or
-						defName="MakeAmmo_30x173mmNATO_Sabot" or
-						defName="MakeAmmo_40x311mmR_Sabot"]/fixedIngredientFilter
-					</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-								<li>VMEu_Tungsten</li>
-								<li>Uranium</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Shotgun/12Gauge.xml b/Patches/Expanded Materials - Metals/Ammo/Shotgun/12Gauge.xml
deleted file mode 100644
index 3cb4b0ac2f..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Shotgun/12Gauge.xml	
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Buckshot -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_12Gauge_Buck"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>13</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_12Gauge_Buck"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Slug -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_12Gauge_Slug"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>12</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_12Gauge_Slug"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Beanbag -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_12Gauge_Beanbag"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>5</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>11</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Cloth</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_12Gauge_Beanbag"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- ElectroSlug -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_12Gauge_ElectroSlug"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>6</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>ComponentIndustrial</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_12Gauge_ElectroSlug"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Shotgun/20Gauge.xml b/Patches/Expanded Materials - Metals/Ammo/Shotgun/20Gauge.xml
deleted file mode 100644
index 23618e8fe7..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Shotgun/20Gauge.xml	
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Buckshot -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_20Gauge_Buck"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>9</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_20Gauge_Buck"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Slug -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_20Gauge_Slug"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_20Gauge_Slug"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Beanbag -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_20Gauge_Beanbag"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Cloth</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_20Gauge_Beanbag"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- ElectroSlug -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_20Gauge_ElectroSlug"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>ComponentIndustrial</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_20Gauge_ElectroSlug"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Shotgun/23x75mmR.xml b/Patches/Expanded Materials - Metals/Ammo/Shotgun/23x75mmR.xml
deleted file mode 100644
index d733fc7576..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Shotgun/23x75mmR.xml	
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Buckshot -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_23x75mmR_Buck"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>13</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>18</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>50</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_23x75mmR_Buck"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Slug -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_23x75mmR_Slug"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>13</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>18</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>46</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_23x75mmR_Slug"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- Beanbag -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_23x75mmR_Beanbag"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>13</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>18</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>42</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Cloth</li>
-									</thingDefs>
-								</filter>
-								<count>23</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_23x75mmR_Beanbag"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-				<!-- ElectroSlug -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_23x75mmR_ElectroSlug"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>13</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>23</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>ComponentIndustrial</li>
-									</thingDefs>
-								</filter>
-								<count>12</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_23x75mmR_ElectroSlug"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Ammo/Shotgun/410Bore.xml b/Patches/Expanded Materials - Metals/Ammo/Shotgun/410Bore.xml
deleted file mode 100644
index 800741cf1b..0000000000
--- a/Patches/Expanded Materials - Metals/Ammo/Shotgun/410Bore.xml	
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Always</success>
-			<operations>
-
-				<!-- Buckshot -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_410Bore_Buck"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Bronze</li>
-										<li>Steel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Chemfuel</li>
-									</thingDefs>
-								</filter>
-								<count>1</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>VMEu_Lead</li>
-									</thingDefs>
-								</filter>
-								<count>3</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_410Bore_Buck"]/fixedIngredientFilter</xpath>
-					<value>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>VMEu_Bronze</li>
-								<li>Steel</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/Items_Resource_Stuff.xml b/Patches/Expanded Materials - Metals/Items_Resource_Stuff.xml
deleted file mode 100644
index 5b8dc47aac..0000000000
--- a/Patches/Expanded Materials - Metals/Items_Resource_Stuff.xml	
+++ /dev/null
@@ -1,292 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Iron === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VMEu_Iron"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VMEu_Iron"]/stuffProps/categories</xpath>
-					<value>
-						<li>Metallic_Weapon</li>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VMEu_Iron"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.8</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VMEu_Iron"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1.2</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- === Lead === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VMEu_Lead"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VMEu_Lead"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.3</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VMEu_Lead"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.3</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VMEu_Lead"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>1.4</Mass>
-						<MeleePenetrationFactor>1.05</MeleePenetrationFactor>
-					</value>
-				</li>
-
-				<!-- === Bronze === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VMEu_Bronze"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VMEu_Bronze"]/stuffProps/categories</xpath>
-					<value>
-						<li>Metallic_Weapon</li>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VMEu_Bronze"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.83</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VMEu_Bronze"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1.24</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VMEu_Bronze"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>1.1</Mass>
-						<MeleePenetrationFactor>0.80</MeleePenetrationFactor>
-					</value>
-				</li>
-
-				<!-- === Tin === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VMEu_Tin"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VMEu_Tin"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.13</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VMEu_Tin"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.2</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- === Copper === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VMEu_Copper"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VMEu_Copper"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.25</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VMEu_Copper"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.32</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- === Tungsten === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VMEu_Tungsten"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VMEu_Tungsten"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1.3</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VMEu_Tungsten"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1.8</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VMEu_Tungsten"]/stuffProps/statFactors/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>3</MaxHitPoints>
-						<Mass>2.1</Mass>
-					</value>
-				</li>
-
-				<!-- === Chromium === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VMEu_Chromium"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VMEu_Chromium"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.6</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VMEu_Chromium"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.8</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- === Stainless Steel === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VMEu_StainlessSteel"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VMEu_StainlessSteel"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1.2</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VMEu_StainlessSteel"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1.65</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VMEu_StainlessSteel"]/stuffProps/categories</xpath>
-					<value>
-						<li>Metallic_Weapon</li>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<!-- === Titanium === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VMEu_Titanium"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VMEu_Titanium"]/stuffProps/categories</xpath>
-					<value>
-						<li>Metallic_Weapon</li>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VMEu_Titanium"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1.9</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VMEu_Titanium"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>2.75</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VMEu_Titanium"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>0.7</Mass>
-						<MeleePenetrationFactor>1.2</MeleePenetrationFactor>
-					</value>
-				</li>
-
-				<!-- === Lithium and Germanium === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VMEu_Lithium" or defName="VMEu_Germanium"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-
-				<!-- === Concrete, Rock Powder, and Fossil === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VMEu_Concrete" or defName="VMEu_RockPowder" or defName="VMEu_Fossil"]/statBases</xpath>
-					<value>
-						<Bulk>0.2</Bulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Metals/LITE_Items_Resource_Stuff.xml b/Patches/Expanded Materials - Metals/LITE_Items_Resource_Stuff.xml
deleted file mode 100644
index c1109bc512..0000000000
--- a/Patches/Expanded Materials - Metals/LITE_Items_Resource_Stuff.xml	
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[LITE]Expanded Materials - Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Iron === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VMEu_Iron"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VMEu_Iron"]/stuffProps/categories</xpath>
-					<value>
-						<li>Metallic_Weapon</li>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VMEu_Iron"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.8</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VMEu_Iron"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1.2</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- === Lead === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VMEu_Lead"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VMEu_Lead"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.3</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VMEu_Lead"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.3</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VMEu_Lead"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>1.4</Mass>
-						<MeleePenetrationFactor>1.05</MeleePenetrationFactor>
-					</value>
-				</li>
-
-				<!-- === Bronze === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VMEu_Bronze"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VMEu_Bronze"]/stuffProps/categories</xpath>
-					<value>
-						<li>Metallic_Weapon</li>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VMEu_Bronze"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.83</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VMEu_Bronze"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1.24</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- === Tin === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VMEu_Tin"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VMEu_Tin"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.13</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VMEu_Tin"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.2</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- === Copper === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VMEu_Copper"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VMEu_Copper"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.25</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VMEu_Copper"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.32</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- === Concrete, Rock Powder, and Fossil === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VMEu_Concrete" or defName="VMEu_RockPowder" or defName="VMEu_Fossil"]/statBases</xpath>
-					<value>
-						<Bulk>0.2</Bulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Plastics/Items_Resource_Addon.xml b/Patches/Expanded Materials - Plastics/Items_Resource_Addon.xml
deleted file mode 100644
index 668cbadeb5..0000000000
--- a/Patches/Expanded Materials - Plastics/Items_Resource_Addon.xml	
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Plastics</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Expanded Materials - Metals</li>
-			</mods>
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VMEu_CarbonFiber"]/statBases</xpath>
-						<value>
-							<Bulk>0.05</Bulk>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VMEu_CarbonFiber"]/stuffProps/categories</xpath>
-						<value>
-							<li>Metallic_Weapon</li>
-							<li>Steeled</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VMEu_CarbonFiber"]/statBases/StuffPower_Armor_Sharp</xpath>
-						<value>
-							<StuffPower_Armor_Sharp>1.4</StuffPower_Armor_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VMEu_CarbonFiber"]/statBases/StuffPower_Armor_Blunt</xpath>
-						<value>
-							<StuffPower_Armor_Blunt>1.5</StuffPower_Armor_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VMEu_CarbonFiber"]/statBases/StuffPower_Armor_Heat</xpath>
-						<value>
-							<StuffPower_Armor_Heat>0.08</StuffPower_Armor_Heat>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VMEu_CarbonFiber"]/stuffProps/statFactors</xpath>
-						<value>
-							<Mass>0.4</Mass>
-							<MeleePenetrationFactor>0.8</MeleePenetrationFactor>
-						</value>
-					</li>
-				</operations>
-			</match>
-			<nomatch Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VMEu_Fossil"]/statBases</xpath>
-						<value>
-							<Bulk>0.2</Bulk>
-						</value>
-					</li>
-
-				</operations>
-			</nomatch>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Materials - Plastics/Items_Resource_Stuff.xml b/Patches/Expanded Materials - Plastics/Items_Resource_Stuff.xml
deleted file mode 100644
index bde929776f..0000000000
--- a/Patches/Expanded Materials - Plastics/Items_Resource_Stuff.xml	
+++ /dev/null
@@ -1,373 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Materials - Plastics</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Polyester Cloth === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VMEu_PolyesterCloth" or @Name="SynthleatherBase"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="VMEu_PolyesterCloth"]/statBases/StuffPower_Armor_Sharp </xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.012</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VMEu_PolyesterCloth"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.015</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						@Name="SynthleatherBase"]/statBases/StuffPower_Armor_Sharp </xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.06</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="SynthleatherBase"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.07</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- === Plastic Pellets - T1 === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VMEu_PlasticPellets_TierOne"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VMEu_PlasticPellets_TierOne"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.4</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VMEu_PlasticPellets_TierOne"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.6</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VMEu_PlasticPellets_TierOne"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>0.75</Mass>
-						<MeleePenetrationFactor>0.5</MeleePenetrationFactor>
-					</value>
-				</li>
-
-				<!-- === Plastic Pellets - T2 === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VMEu_PlasticPellets_TierTwo"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VMEu_PlasticPellets_TierTwo"]/stuffProps/categories</xpath>
-					<value>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VMEu_PlasticPellets_TierTwo"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.8</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VMEu_PlasticPellets_TierTwo"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1.2</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- UHMWPE is a fairly good thermal conductor, making it poor thermal armor. === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VMEu_PlasticPellets_TierTwo"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.01</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VMEu_PlasticPellets_TierTwo"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>0.8</Mass>
-						<MeleePenetrationFactor>0.7</MeleePenetrationFactor>
-					</value>
-				</li>
-
-				<!-- === Misc. === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VMEu_AsphaltMix" or defName="VMEu_LiquidPlastic_TierOne" or defName="VMEu_LiquidPlastic_TierTwo"]/statBases</xpath>
-					<value>
-						<Bulk>0.1</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VMEu_NylonRoll"]/statBases</xpath>
-					<value>
-						<Bulk>0.05</Bulk>
-					</value>
-				</li>
-
-				<!-- === Shell Recipes === -->
-
-				<!-- === HE === -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_HighExplosive"]/ingredients/li[2]</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_HighExplosive"]/fixedIngredientFilter/thingDefs/li[.="Chemfuel"]</xpath>
-					<value>
-						<li>FSX</li>
-						<li>ComponentIndustrial</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_HighExplosive"]/workAmount</xpath>
-					<value>
-						<workAmount>10600</workAmount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_HighExplosive"]/products</xpath>
-					<value>
-						<products>
-							<Shell_HighExplosive>5</Shell_HighExplosive>
-						</products>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_HighExplosive"]/ingredients</xpath>
-					<value>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>10</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Incendiary === -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_Incendiary"]/ingredients/li[2]</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_Incendiary"]/fixedIngredientFilter/thingDefs/li[.="Chemfuel"]</xpath>
-					<value>
-						<li>Prometheum</li>
-						<li>ComponentIndustrial</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_Incendiary"]/workAmount</xpath>
-					<value>
-						<workAmount>9000</workAmount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_Incendiary"]/products</xpath>
-					<value>
-						<products>
-							<Shell_Incendiary>5</Shell_Incendiary>
-						</products>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_Incendiary"]/ingredients</xpath>
-					<value>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>1</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>1</count>
-						</li>
-					</value>
-				</li>
-
-				<!-- === EMP === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_EMP"]/workAmount</xpath>
-					<value>
-						<workAmount>13800</workAmount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_EMP"]/products</xpath>
-					<value>
-						<products>
-							<Shell_EMP>5</Shell_EMP>
-						</products>
-					</value>
-				</li>
-
-				<!-- === Smoke === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_Smoke"]/fixedIngredientFilter/thingDefs</xpath>
-					<value>
-						<li>Prometheum</li>
-						<li>ComponentIndustrial</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_Smoke"]/workAmount</xpath>
-					<value>
-						<workAmount>6600</workAmount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_Smoke"]/products</xpath>
-					<value>
-						<products>
-							<Shell_Smoke>5</Shell_Smoke>
-						</products>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_Smoke"]/ingredients</xpath>
-					<value>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Firefoam === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_Firefoam"]/fixedIngredientFilter/thingDefs</xpath>
-					<value>
-						<li>ComponentIndustrial</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_Firefoam"]/fixedIngredientFilter</xpath>
-					<value>
-						<categories>
-							<li>MeatRaw</li>
-						</categories>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_Firefoam"]/workAmount</xpath>
-					<value>
-						<workAmount>8800</workAmount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_Firefoam"]/products</xpath>
-					<value>
-						<products>
-							<Shell_Firefoam>5</Shell_Firefoam>
-						</products>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/RecipeDef[defName="VMEu_MakePolymerShell_Firefoam"]/ingredients</xpath>
-					<value>
-						<li>
-							<filter>
-								<categories>
-									<li>MeatRaw</li>
-								</categories>
-							</filter>
-							<count>17</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Anti-Grain === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="VMEu_MakeAntigrainWarhead"]/workAmount</xpath>
-					<value>
-						<workAmount>4750</workAmount>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Patchleather/Items_Resource_ExpPatchleather_Stuff_Leather.xml b/Patches/Expanded Patchleather/Items_Resource_ExpPatchleather_Stuff_Leather.xml
deleted file mode 100644
index a969128748..0000000000
--- a/Patches/Expanded Patchleather/Items_Resource_ExpPatchleather_Stuff_Leather.xml	
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Patchleather v0.14</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--========== Refined Patchleather ============-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Refined_PatchLeather"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.03</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Refined_PatchLeather"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.04</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Refined_PatchLeather"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.01</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<!--========== Padded Patchleather ============-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Padded_PatchLeather"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.02</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Padded_PatchLeather"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Padded_PatchLeather"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.001</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<!--========== Studded Patchleather ============-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Studded_PatchLeather"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.3</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Studded_PatchLeather"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.2</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Studded_PatchLeather"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.005</StuffPower_Armor_Heat>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Studded_PatchLeather"]/stuffProps/categories</xpath>
-					<value>
-						<li>SoftArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Expanded Woodworking/Items_Resources.xml b/Patches/Expanded Woodworking/Items_Resources.xml
deleted file mode 100644
index 6bf1fe8f24..0000000000
--- a/Patches/Expanded Woodworking/Items_Resources.xml	
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Expanded Woodworking (Forked)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WoodLumberBase" or @Name="WoodLogBase"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.99</cooldownTime>
-								<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="WoodLumberBase" or @Name="WoodLogBase"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>1</MeleeParryChance>
-							<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="WoodLumberBase" or @Name="WoodLogBase"]/statBases</xpath>
-					<value>
-						<Bulk>0.07</Bulk>
-						<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WoodLumberBase" or @Name="WoodLogBase"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.1</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WoodLumberBase" or @Name="WoodLogBase"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.2</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WoodLumberBase" or @Name="WoodLogBase"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.025</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WoodLumberBase" or @Name="WoodLogBase"]/statBases/SharpDamageMultiplier</xpath>
-					<value>
-						<SharpDamageMultiplier>0.7</SharpDamageMultiplier>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WoodLumberBase" or @Name="WoodLogBase"]/statBases/BluntDamageMultiplier</xpath>
-					<value>
-						<BluntDamageMultiplier>0.5</BluntDamageMultiplier>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="WoodLumberBase" or @Name="WoodLogBase"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>0.3</Mass>
-						<MeleePenetrationFactor>0.3</MeleePenetrationFactor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Extended Storage/Storage.xml b/Patches/Extended Storage/Storage.xml
deleted file mode 100644
index d1876ec199..0000000000
--- a/Patches/Extended Storage/Storage.xml	
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Extended Storage</li>
-			<li>Extended Storage (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Storage_WoodenPallet"]/building/fixedStorageSettings/filter/categories</xpath>
-					<value>
-						<li>Ammo</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/FF Bushi!/Headgear_Bushi.xml b/Patches/FF Bushi!/Headgear_Bushi.xml
deleted file mode 100644
index da94b4b891..0000000000
--- a/Patches/FF Bushi!/Headgear_Bushi.xml	
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[FF]Bushi!</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Masks === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="FFApparel_Samurai_mask_of_perseverance" or
-						defName="FFApparel_Samurai_mask_of_Destruction" or
-						defName="FFApparel_Samurai_mask_of_Communicating"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/FF Bushi!/Melee_Bushi.xml b/Patches/FF Bushi!/Melee_Bushi.xml
deleted file mode 100644
index e89f5a2af2..0000000000
--- a/Patches/FF Bushi!/Melee_Bushi.xml	
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[FF]Bushi!</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === One-handed Tags === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "MeleeWeapon_Wakizashi" or defName="MeleeWeapon_Tanto"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- === Katana === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Katana"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.33</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.936</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.33</cooldownTime>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>0.936</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.88</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>31</power>
-								<cooldownTime>1.28</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>2.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.65</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Katana"]/statBases</xpath>
-					<value>
-						<Bulk>7.85</Bulk>
-						<MeleeCounterParryBonus>1.38</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Katana"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.85</MeleeCritChance>
-							<MeleeParryChance>0.69</MeleeParryChance>
-							<MeleeDodgeChance>0.37</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- === Wakizashi === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Wakizashi"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.18</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.339</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.18</cooldownTime>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>0.339</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.05</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>0.717</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.36</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Wakizashi"]/statBases</xpath>
-					<value>
-						<Bulk>6.4</Bulk>
-						<MeleeCounterParryBonus>0.43</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Wakizashi"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.60</MeleeCritChance>
-							<MeleeParryChance>0.43</MeleeParryChance>
-							<MeleeDodgeChance>0.16</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- === Tanto === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Tanto"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>0.97</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.259</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>0.97</cooldownTime>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>0.259</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.48</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.05</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>0.304</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.28</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Tanto"]/statBases</xpath>
-					<value>
-						<Bulk>4.2</Bulk>
-						<MeleeCounterParryBonus>0.38</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Tanto"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.93</MeleeCritChance>
-							<MeleeParryChance>0.38</MeleeParryChance>
-							<MeleeDodgeChance>0.09</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/FFGermanSheperd/Races_Animal_FFGermanShepherd.xml b/Patches/FFGermanSheperd/Races_Animal_FFGermanShepherd.xml
deleted file mode 100644
index 7fd7e113a7..0000000000
--- a/Patches/FFGermanSheperd/Races_Animal_FFGermanShepherd.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>FFGermanShepherd</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Quadruped === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GermanShepherd"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GermanShepherd"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						<MeleeCritChance>0.06</MeleeCritChance>
-						<MeleeParryChance>0.06</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="GermanShepherd"]/combatPower</xpath>
-					<value>
-						<combatPower>60</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GermanShepherd"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.7</cooldownTime>
-								<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.7</cooldownTime>
-								<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.50</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.410</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.20</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.3</chanceFactor>
-								<armorPenetrationBlunt>0.280</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/FROG Suit Set/Armor_Spacer.xml b/Patches/FROG Suit Set/Armor_Spacer.xml
deleted file mode 100644
index f421e69ae7..0000000000
--- a/Patches/FROG Suit Set/Armor_Spacer.xml	
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>FROG Suit Set</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Frog Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="FROG_Helmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FROG_Helmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FROG_Helmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>38</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="FROG_Helmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="FROG_Helmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="FROG_Helmet"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<!-- === Frog Suit === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="FROG_Suit"]/statBases</xpath>
-					<value>
-						<Bulk>40</Bulk>
-						<WornBulk>4</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FROG_Suit"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FROG_Suit"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>32</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="FROG_Suit"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>25</CarryWeight>
-						<CarryBulk>10</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="FROG_Suit"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/FROG Suit Set/Industrial_Ranged.xml b/Patches/FROG Suit Set/Industrial_Ranged.xml
deleted file mode 100644
index aeaf369de1..0000000000
--- a/Patches/FROG Suit Set/Industrial_Ranged.xml	
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>FROG Suit Set</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Tools === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Gewehr3_Rifle"]/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>
-				</li>
-
-				<!-- ========== Gewehr 3 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gewehr3_Rifle</defName>
-					<statBases>
-						<Mass>4.38</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.46</SwayFactor>
-						<Bulk>10.25</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.91</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<burstShotCount>4</burstShotCount>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/FSF More Psycasts Powers/AbilitiesPatch.xml b/Patches/FSF More Psycasts Powers/AbilitiesPatch.xml
deleted file mode 100644
index c2eecc3253..0000000000
--- a/Patches/FSF More Psycasts Powers/AbilitiesPatch.xml	
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[FSF] More Psycast Powers</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Psyblade ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="FSFPsyblade"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>0.83</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>3.46</armorPenetrationBlunt>
-								<armorPenetrationSharp>21.6</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>0.94</cooldownTime>
-								<armorPenetrationBlunt>1.54</armorPenetrationBlunt>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/FSF Vanilla Bionics Expansion/HediffDefs/FSFAdvancedBionics_AddedParts.xml b/Patches/FSF Vanilla Bionics Expansion/HediffDefs/FSFAdvancedBionics_AddedParts.xml
deleted file mode 100644
index f13d8d275c..0000000000
--- a/Patches/FSF Vanilla Bionics Expansion/HediffDefs/FSFAdvancedBionics_AddedParts.xml	
+++ /dev/null
@@ -1,465 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[FSF] Advanced Bionics Expansion</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="FSFAdvBionicPowerArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.21</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
-								<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>1.21</cooldownTime>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<armorPenetrationBlunt>6.25</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
-								<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.21</cooldownTime>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.75</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
-								<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="FSFArchotechPowerArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>0.71</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>120</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
-								<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>0.71</cooldownTime>
-								<armorPenetrationSharp>24</armorPenetrationSharp>
-								<armorPenetrationBlunt>6.25</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
-								<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.21</cooldownTime>
-								<armorPenetrationSharp>48</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.75</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
-								<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="FSFAdvBionicArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.92</cooldownTime>
-								<armorPenetrationBlunt>2.43</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="FSFAdvBionicTaserArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.92</cooldownTime>
-								<armorPenetrationBlunt>2.43</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<extraMeleeDamages>
-									<li>
-										<def>EMP</def>
-										<amount>12.5</amount>
-									</li>
-								</extraMeleeDamages>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="FSFAdvBionicJaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.25</cooldownTime>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="FSFAdvBionicFieldArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.98</cooldownTime>
-								<armorPenetrationBlunt>2.168</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="FSFAdvBionicConstructionArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.98</cooldownTime>
-								<armorPenetrationBlunt>2.168</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="FSFAdvBionicDrillArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.07</cooldownTime>
-								<armorPenetrationSharp>0.13</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.98</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Implants-->
-
-				<!--Tone down Speed torso implant dodge chance to be more inline with CE stats (also so it doesn't instantly max out dodge)-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="FSFImplantMechanitesSpeed"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<!--Archotech Armor implant : Slightly better sharp (1 vs 0.7), much better blunt (1 vs 0.3)-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="FSFArchotechSkinI"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="FSFArchotechSkinI"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>15</ArmorRating_Blunt>
-						<ArmorRating_Electric>0.5</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="FSFImplantBrainMeleeCombat"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>1.5</MeleeDodgeChance>
-						<MeleeCritChance>0.40</MeleeCritChance>
-						<MeleeParryChance>0.50</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="FSFImplantBrainRangedCombat"]/stages/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ShootingAccuracyPawn>+1</ShootingAccuracyPawn>
-							<AimingAccuracy>+0.5</AimingAccuracy>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="FSFImplantTorsoRespirator"]/stages/li/statOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1.0</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="FSFAdvBionicEye"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency_Implant>0.4</NightVisionEfficiency_Implant>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="FSFAdvBionicEye"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<statOffsets>
-									<NightVisionEfficiency_Implant>0.4</NightVisionEfficiency_Implant>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="FSFAdvBionicTaserJaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.25</cooldownTime>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<extraMeleeDamages>
-									<li>
-										<def>EMP</def>
-										<amount>12.5</amount>
-									</li>
-								</extraMeleeDamages>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="FSFAdvBionicBreachArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Demolish</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.48</cooldownTime>
-								<armorPenetrationBlunt>60</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace" MayRequire="Ludeon.Rimworld.Biotech">
-					<xpath>Defs/HediffDef[defName="FSFAdvBionicMedicArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>2.0</armorPenetrationBlunt>
-								<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
-								<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace" MayRequire="Ludeon.Rimworld.Biotech">
-					<xpath>Defs/HediffDef[defName="FSFArchotechMedicArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>3.0</armorPenetrationBlunt>
-								<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
-								<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace" MayRequire="Ludeon.Rimworld.Royalty">
-					<xpath>Defs/HediffDef[defName="FSFBionicConstructionArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>2.0</armorPenetrationBlunt>
-								<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
-								<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace" MayRequire="Ludeon.Rimworld.Royalty">
-					<xpath>Defs/HediffDef[defName="FSFAdvBionicConstructionArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>2.0</armorPenetrationBlunt>
-								<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
-								<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace" MayRequire="Ludeon.Rimworld.Royalty">
-					<xpath>Defs/HediffDef[defName="FSFAdvBionicDrillArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>drill</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>6.0</armorPenetrationBlunt>
-								<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
-								<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace" MayRequire="Ludeon.Rimworld.Royalty">
-					<xpath>Defs/HediffDef[defName="FSFAdvBionicFieldArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>knuckle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.66</cooldownTime>
-								<armorPenetrationSharp>0.00</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<soundMeleeHit>MeleeHit_FieldHand</soundMeleeHit>
-								<soundMeleeMiss>MeleeMiss_FieldHand</soundMeleeMiss>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace" MayRequire="Ludeon.Rimworld.Royalty">
-					<xpath>Defs/HediffDef[defName="FSFArchotechSkinI"]/stages/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ArmorRating_Sharp>7</ArmorRating_Sharp>
-							<ArmorRating_Blunt>12</ArmorRating_Blunt>
-							<ArmorRating_Heat>1.5</ArmorRating_Heat>
-							<PawnBeauty>1</PawnBeauty>
-						</statOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/FSF Vanilla Bionics Expansion/HediffDefs/FSFBionics_AddedParts.xml b/Patches/FSF Vanilla Bionics Expansion/HediffDefs/FSFBionics_AddedParts.xml
deleted file mode 100644
index 813d3a17df..0000000000
--- a/Patches/FSF Vanilla Bionics Expansion/HediffDefs/FSFBionics_AddedParts.xml	
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[FSF] Vanilla Bionics Expansion</li>
-			<li>[FSF] Advanced Bionics Expansion</li>
-			<li>[FSF] Vanilla Bionics Expansion (Legacy Version)</li>
-			<li>[FSF] Advanced Bionics Expansion Legacy Version</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Power Arm-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="FSFBionicPowerArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>0.89</cooldownTime>
-								<armorPenetrationSharp>0.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Prosthetics -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="FSFProstheticHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="FSFBionicJaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.0</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="FSFArchotechJaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.0</cooldownTime>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.0</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[FSF] Vanilla Bionics Expansion</li>
-			<li>[FSF] Advanced Bionics Expansion</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="FSFBionicFieldArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.11</cooldownTime>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="FSFBionicDrillArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>drill</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.25</cooldownTime>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.72</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Faction - Mafia/Apparel_Industrial.xml b/Patches/Faction - Mafia/Apparel_Industrial.xml
deleted file mode 100644
index 82be18b634..0000000000
--- a/Patches/Faction - Mafia/Apparel_Industrial.xml	
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Faction : Mafia</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="survetement" or defName="Bonnet_mafieux"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Faction - Mafia/Industrial_Melee.xml b/Patches/Faction - Mafia/Industrial_Melee.xml
deleted file mode 100644
index e660ce51c8..0000000000
--- a/Patches/Faction - Mafia/Industrial_Melee.xml	
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Faction : Mafia</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Mafia Knife === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="indus_couteau_poissoir"]/statBases</xpath>
-					<value>
-						<Bulk>0.25</Bulk>
-						<MeleeCounterParryBonus>0.30</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="indus_couteau_poissoir"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.10</MeleeCritChance>
-							<MeleeParryChance>0.30</MeleeParryChance>
-							<MeleeDodgeChance>0.010</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="indus_couteau_poissoir"]/weaponTags</xpath>
-					<value>
-						<li>CE_Sidearm_Melee</li>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="indus_couteau_poissoir"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.06</cooldownTime>
-								<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.99</cooldownTime>
-								<armorPenetrationBlunt>0.38</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.20</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.06</cooldownTime>
-								<chanceFactor>1.88</chanceFactor>
-								<armorPenetrationBlunt>0.42</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.76</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Faction - Mafia/PawnKinds_Mafia.xml b/Patches/Faction - Mafia/PawnKinds_Mafia.xml
deleted file mode 100644
index 242c778291..0000000000
--- a/Patches/Faction - Mafia/PawnKinds_Mafia.xml	
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Faction : Mafia</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Leader & Trader === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Mafia_leader" or defName="Mafia_trader"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>200</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>Mafiamelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Molotov === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Mafia_molotov"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>100</min>
-										<max>200</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>Mafiamelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Fusil & Pompe === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Mafia_fusil" or defName="Mafia_pompe"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.3</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>200</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>Mafiamelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Faction - Mafia/Traders_Mafia.xml b/Patches/Faction - Mafia/Traders_Mafia.xml
deleted file mode 100644
index bdeecb3fca..0000000000
--- a/Patches/Faction - Mafia/Traders_Mafia.xml	
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Faction : Mafia</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Base Mafia ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="Base_Mafia"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>FSX</thingDef>
-							<countRange>
-								<min>25</min>
-								<max>90</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>Prometheum</thingDef>
-							<countRange>
-								<min>25</min>
-								<max>90</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Ammo</tradeTag>
-							<countRange>
-								<min>200</min>
-								<max>1000</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>1</min>
-								<max>4</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_MediumAmmo</tradeTag>
-							<countRange>
-								<min>30</min>
-								<max>60</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>1</min>
-								<max>3</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_HeavyAmmo</tradeTag>
-							<countRange>
-								<min>10</min>
-								<max>25</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>2</max>
-							</thingDefCountRange>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Fallout New Vegas - Elite Riot Gear/Apparel_RiotGear.xml b/Patches/Fallout New Vegas - Elite Riot Gear/Apparel_RiotGear.xml
deleted file mode 100644
index c368fd6374..0000000000
--- a/Patches/Fallout New Vegas - Elite Riot Gear/Apparel_RiotGear.xml	
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Fallout New Vegas - Elite Riot Gear (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Stranger -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Stranger"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- Riot Armor -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "ZSP_EliteRiotArmor" or defName = "ZSP_StuffableEliteRiotArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>10</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "ZSP_EliteRiotArmor" or defName = "ZSP_StuffableEliteRiotArmor"]/statBases</xpath>
-					<value>
-						<Bulk>40</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "ZSP_EliteRiotArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "ZSP_EliteRiotArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>18</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName= "ZSP_StuffableEliteRiotArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>12</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Riot Helmet -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName= "ZSP_StuffableEliteRiotHelmet" or defName= "ZSP_EliteRiotHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName= "ZSP_StuffableEliteRiotHelmet" or defName= "ZSP_EliteRiotHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName= "ZSP_StuffableEliteRiotHelmet" or defName= "ZSP_EliteRiotHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "ZSP_StuffableEliteRiotHelmet" or defName= "ZSP_EliteRiotHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "ZSP_EliteRiotHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "ZSP_EliteRiotHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>15</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName= "ZSP_StuffableEliteRiotHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>10</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Riot Armor Jacket -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "ZSP_StuffableEliteRiotJacket" or defName = "ZSP_EliteRiotJacket"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>10</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName= "ZSP_StuffableEliteRiotJacket" or defName = "ZSP_EliteRiotJacket"]/statBases</xpath>
-					<value>
-						<Bulk>7.5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "ZSP_EliteRiotJacket"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "ZSP_EliteRiotJacket"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName= "ZSP_StuffableEliteRiotJacket"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/FalloutTraits/Traits_Patch_CE.xml b/Patches/FalloutTraits/Traits_Patch_CE.xml
deleted file mode 100644
index ecadc83af2..0000000000
--- a/Patches/FalloutTraits/Traits_Patch_CE.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Fallout Traits (Continued)</li>
-			<!--<li>Fallout Traits</li>-->
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/TraitDef[defName = "FT_FrailBack"]/degreeDatas/li/statOffsets/CarryingCapacity</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraitDef[defName = "FT_FrailBack"]/degreeDatas/li/statOffsets</xpath>
-					<value>
-						<CarryWeight>-10</CarryWeight>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraitDef[defName = "FT_FrailBack"]/degreeDatas/li/statOffsets</xpath>
-					<value>
-						<CarryBulk>-10</CarryBulk>
-					</value>
-				</li>
-
-				<!-- -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/TraitDef[defName = "FT_StrongBack"]/degreeDatas/li[1]/statOffsets/CarryingCapacity</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraitDef[defName = "FT_StrongBack"]/degreeDatas/li[1]/statOffsets</xpath>
-					<value>
-						<CarryWeight>+20</CarryWeight>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraitDef[defName = "FT_StrongBack"]/degreeDatas/li[1]/statOffsets</xpath>
-					<value>
-						<CarryBulk>+20</CarryBulk>
-					</value>
-				</li>
-
-				<!-- -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/TraitDef[defName = "FT_StrongBack"]/degreeDatas/li[2]/statOffsets/CarryingCapacity</xpath>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraitDef[defName = "FT_StrongBack"]/degreeDatas/li[2]/statOffsets</xpath>
-					<value>
-						<CarryWeight>+40</CarryWeight>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraitDef[defName = "FT_StrongBack"]/degreeDatas/li[2]/statOffsets</xpath>
-					<value>
-						<CarryBulk>+40</CarryBulk>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Fantasy Metals Reforged/Fantasy Metals Reforged.xml b/Patches/Fantasy Metals Reforged/Fantasy Metals Reforged.xml
deleted file mode 100644
index a29b9793c7..0000000000
--- a/Patches/Fantasy Metals Reforged/Fantasy Metals Reforged.xml	
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Fantasy Metals Reforged</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Add Bulk and thingCategories -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="Mithril" or
-						defName="Orichalcum" or
-						defName="Adamantite" or
-						defName="Tozra" or
-						defName="Solorite" or
-						defName="Skelsshkrum"
-						]/statBases </xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="Mithril" or
-						defName="Orichalcum" or
-						defName="Adamantite" or
-						defName="Tozra" or
-						defName="Solorite" or
-						defName="Skelsshkrum"
-						]/stuffProps/categories </xpath>
-					<value>
-						<li>Metallic_Weapon</li>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<!-- Mithril -->
-
-				<!-- From 'The Hobbit,' Mithril is described as triple the strength of steel. -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mithril"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>3</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mithril"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>3.2</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Mithril"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>0.7</Mass>
-					</value>
-				</li>
-
-				<!-- Orichalcum -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Orichalcum"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1.3</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Orichalcum"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1.5</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Orichalcum"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>1.4</Mass>
-					</value>
-				</li>
-
-				<!-- Adamantite -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Adamantite"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>3.4</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Adamantite"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>4.2</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- Tozra -->
-
-				<!-- Nothing to indicate it's any good as armor, so we'll say it's not. -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tozra"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.7</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tozra"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.9</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tozra"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>1.5</MeleePenetrationFactor>
-					</value>
-				</li>
-
-				<!-- Solorite -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Solorite"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.3</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Solorite"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.2</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Solorite"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>0.7</MeleePenetrationFactor>
-					</value>
-				</li>
-
-				<!-- Skelsshkrum -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Skelsshkrum"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.8</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Skelsshkrum"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>4.6</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Farming Expansion/Race_CropEaterInsect.xml b/Patches/Farming Expansion/Race_CropEaterInsect.xml
deleted file mode 100644
index 6b5295f2b4..0000000000
--- a/Patches/Farming Expansion/Race_CropEaterInsect.xml	
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Farming Expansion</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="FE_CropEaterInsect"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FE_CropEaterInsect"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>3</MoveSpeed>
-						<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						<MeleeCritChance>0.00</MeleeCritChance>
-						<MeleeParryChance>0.00</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FE_CropEaterInsect"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.00</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FE_CropEaterInsect"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.00</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FE_CropEaterInsect"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>2.50</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.00</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.02</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/FashionRIMsta/ThingsDefs_Misc/FashionRIMsta_Apparel.xml b/Patches/FashionRIMsta/ThingsDefs_Misc/FashionRIMsta_Apparel.xml
deleted file mode 100644
index 380dd04af4..0000000000
--- a/Patches/FashionRIMsta/ThingsDefs_Misc/FashionRIMsta_Apparel.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>FashionRIMsta</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Coats -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_FSFurCoat"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<WornBulk>6</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Apparel_FSFurCoat"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Apparel_FSFurCoat"]/equippedStatOffsets/WorkSpeedGlobal</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_FSDesertRobe"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_FSGardeningVest"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_FSGardeningVest"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>5</CarryBulk>
-					</value>
-				</li>
-
-				<!-- Pants -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_FSThermalPants"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Apparel_FSCargoShorts"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Apparel_FSCargoShorts"]/equippedStatOffsets/WorkSpeedGlobal</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_FSCargoShorts"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>5</CarryBulk>
-					</value>
-				</li>
-
-				<!-- Middle -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_FSOveralls"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Apparel_FSOveralls"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Apparel_FSOveralls"]/equippedStatOffsets/WorkSpeedGlobal</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_FSOveralls"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>5</CarryBulk>
-					</value>
-				</li>
-
-				<!-- Hats -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_FSFurHat"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_FSDesertWrap"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<!-- Stuff-less Apparel -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_FSChefJacket"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_FSScrubs"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_FSConstructionJacket"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_FSConstructionJacket"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>5</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_FSGasmask"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_FSGasmask"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Apparel_FSGasmask"]</xpath>
-					<value>
-						<li Class="CombatExtended.ApparelHediffExtension">
-							<hediff>WearingGasMask</hediff>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_FSGasmask"]/apparel/layers</xpath>
-					<value>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Fate Grand Order Styles Pack/ThingDefs_Misc/Apparel_FGO.xml b/Patches/Fate Grand Order Styles Pack/ThingDefs_Misc/Apparel_FGO.xml
deleted file mode 100644
index 5b4a7612ff..0000000000
--- a/Patches/Fate Grand Order Styles Pack/ThingDefs_Misc/Apparel_FGO.xml	
+++ /dev/null
@@ -1,297 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[FGO]Fate Grand Order - Styles Apparel Pack</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--Joan Hat/High-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="FateGrandOrder_HATjoan"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>11.4</ArmorRating_Sharp>
-								<Bulk>5</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="FateGrandOrder_HATjoan"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>14.25</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--Hoksai Hat/Low-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="FateGrandOrder_HAThokusai"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="FateGrandOrder_HAThokusai"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.42</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--Hoksai C Hat/Low-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="FateGrandOrder_HAThokusaiC"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>3.125</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="FateGrandOrder_HAThokusaiC"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.54</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="FateGrandOrder_HAThokusaiC"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>0.05</MeleeDodgeChance>
-
-							</value>
-						</li>
-
-						<!--Saber Uniform/High-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="FateGrandOrder_Saberarmour"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>18</ArmorRating_Sharp>
-								<Bulk>50</Bulk>
-								<WornBulk>15</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="FateGrandOrder_Saberarmour"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>36</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="FateGrandOrder_Saberarmour"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>0.25</MeleeDodgeChance>
-								<MeleeParryChance>0.025</MeleeParryChance>
-							</value>
-						</li>
-
-						<!--Mash Uniform/Low-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="FateGrandOrder_Mashtights"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>6.56</ArmorRating_Sharp>
-								<Bulk>7</Bulk>
-								<WornBulk>5</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="FateGrandOrder_Mashtights"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.36</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--Assasin Uniform/Low-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="FateGrandOrder_AssassinUndies"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>3.44</ArmorRating_Sharp>
-								<Bulk>5</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="FateGrandOrder_AssassinUndies"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.24</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="FateGrandOrder_AssassinUndies"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>0.15</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<!--Joan Uniform/High-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="FateGrandOrder_Joanarmour"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>16</ArmorRating_Sharp>
-								<Bulk>50</Bulk>
-								<WornBulk>15</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="FateGrandOrder_Joanarmour"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>52</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--Arthur Mantle/Low-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="FateGrandOrder_ArthurMantle"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>4.56</ArmorRating_Sharp>
-								<Bulk>5</Bulk>
-								<WornBulk>3</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="FateGrandOrder_ArthurMantle"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.744</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--Hoksai Uniform/Low-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="FateGrandOrder_KimonoHokusai"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>5.3</ArmorRating_Sharp>
-								<Bulk>5</Bulk>
-								<WornBulk>3</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="FateGrandOrder_KimonoHokusai"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>1.08</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="FateGrandOrder_KimonoHokusai"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>0.15</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<!--Astolfo Uniform/High-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="FateGrandOrder_Astolfoarmour"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>13</ArmorRating_Sharp>
-								<Bulk>50</Bulk>
-								<WornBulk>15</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="FateGrandOrder_Astolfoarmour"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>36</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--Astolfo Cloak/Low-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="FateGrandOrder_Astolfocloak"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>2.7</ArmorRating_Sharp>
-								<Bulk>5</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="FateGrandOrder_Astolfocloak"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.42</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--Joan New Uniform/High-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="FateGrandOrder_JoanNewArmour"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>18</ArmorRating_Sharp>
-								<Bulk>50</Bulk>
-								<WornBulk>15</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="FateGrandOrder_JoanNewArmour"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>48</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--Joan Mantle/Low-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="FateGrandOrder_JoanNewMantle"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>3.5</ArmorRating_Sharp>
-								<Bulk>5</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="FateGrandOrder_JoanNewMantle"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.3</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--Mash Tasset/Mid-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="FateGrandOrder_MashTasset"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>3</ArmorRating_Sharp>
-								<Bulk>5</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="FateGrandOrder_MashTasset"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>4.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Feles - Felines of the Rim [1.3]/Bodies_Feles.xml b/Patches/Feles - Felines of the Rim [1.3]/Bodies_Feles.xml
deleted file mode 100644
index 5c73dc7264..0000000000
--- a/Patches/Feles - Felines of the Rim [1.3]/Bodies_Feles.xml	
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Feles - Felines of the Rim [1.4]</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Add groups ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Feles"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "right eye"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Feles"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "left eye"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Feles"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Feles"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Feles"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Feles"]/corePart/parts/li[def = "Neck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Feles"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Feles"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Jaw"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Feles"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Nose"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Feles"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Ear"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Feles"]/corePart/parts/li[def = "Shoulder"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Feles"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Feles"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Feles"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/parts/li[def = "Finger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Feles"]/corePart/parts/li[def = "Leg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Feles"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Feles"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/parts/li[def = "Toe"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Feles - Felines of the Rim [1.3]/Feles_Leather.xml b/Patches/Feles - Felines of the Rim [1.3]/Feles_Leather.xml
deleted file mode 100644
index 713a92ce71..0000000000
--- a/Patches/Feles - Felines of the Rim [1.3]/Feles_Leather.xml	
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Feles - Felines of the Rim [1.4]</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Leo_leather" or
-						defName="Tigris_leather" or
-						defName="Jaguar_leather" or
-						defName="Cheetah_leather" or
-						defName="Panther_leather"
-						]/statBases/StuffPower_Armor_Sharp </xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.04</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Leo_leather" or
-						defName="Tigris_leather" or
-						defName="Jaguar_leather" or
-						defName="Cheetah_leather" or
-						defName="Panther_leather"
-						]/statBases/StuffPower_Armor_Blunt </xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.03</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Feles - Felines of the Rim [1.3]/Races_Feles.xml b/Patches/Feles - Felines of the Rim [1.3]/Races_Feles.xml
deleted file mode 100644
index be405998e5..0000000000
--- a/Patches/Feles - Felines of the Rim [1.3]/Races_Feles.xml	
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Feles - Felines of the Rim [1.4]</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="YanzihkoJaguar" or
-						defName="YanzihkoLeo" or
-						defName="YanzihkoPanther" or
-						defName="YanzihkoTigris" or
-						defName="YanzihkoCheetah"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="YanzihkoJaguar" or
-						defName="YanzihkoLeo" or
-						defName="YanzihkoPanther" or
-						defName="YanzihkoTigris" or
-						defName="YanzihkoCheetah"
-						]/statBases </xpath>
-					<value>
-						<MeleeDodgeChance>1.1</MeleeDodgeChance>
-						<MeleeCritChance>0.85</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<Suppressability>1</Suppressability>
-						<SmokeSensitivity>1</SmokeSensitivity>
-						<NightVisionEfficiency_Apparel>0.4</NightVisionEfficiency_Apparel>
-						<CarryWeight>40</CarryWeight>
-						<CarryBulk>30</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="YanzihkoJaguar" or
-						defName="YanzihkoLeo" or
-						defName="YanzihkoPanther" or
-						defName="YanzihkoTigris" or
-						defName="YanzihkoCheetah"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.91</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.20</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.91</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.20</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.49</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.640</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>4.29</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.525</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="YanzihkoJaguar" or
-						defName="YanzihkoLeo" or
-						defName="YanzihkoPanther" or
-						defName="YanzihkoTigris" or
-						defName="YanzihkoCheetah"
-						]/comps </xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[
-							defName="YanzihkoJaguar" or
-							defName="YanzihkoLeo" or
-							defName="YanzihkoPanther" or
-							defName="YanzihkoTigris" or
-							defName="YanzihkoCheetah"
-							] </xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="YanzihkoJaguar" or
-						defName="YanzihkoLeo" or
-						defName="YanzihkoPanther" or
-						defName="YanzihkoTigris" or
-						defName="YanzihkoCheetah"
-						]/comps </xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Feles - Felines of the Rim [1.3]/Scenarios_Feles.xml b/Patches/Feles - Felines of the Rim [1.3]/Scenarios_Feles.xml
deleted file mode 100644
index 28c25e504a..0000000000
--- a/Patches/Feles - Felines of the Rim [1.3]/Scenarios_Feles.xml	
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Feles - Felines of the Rim [1.4]</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="FelesScenario1"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_45ACP_FMJ</thingDef>
-							<count>350</count>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="FelesScenario2"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_Arrow_Stone</thingDef>
-							<count>100</count>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="FelesScenario2"]/scenario/parts/li[thingDef="Pila"]</xpath>
-					<value>
-						<count>20</count>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Fell Tribes/PawnkindDefs/PawnKinds_Fell.xml b/Patches/Fell Tribes/PawnkindDefs/PawnKinds_Fell.xml
deleted file mode 100644
index b43ad04c21..0000000000
--- a/Patches/Fell Tribes/PawnkindDefs/PawnKinds_Fell.xml	
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Fell Tribes</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Give ammo to bowman ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>
-						Defs/PawnKindDef[
-						defName="FellFox" or
-						defName="FellWolf" or
-						defName="FellLynx" or
-						defName="FellServal" or
-						defName="FellBear"]
-					</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>12</min>
-								<max>20</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Fell Tribes/ThingDefs_Races/Bear.xml b/Patches/Fell Tribes/ThingDefs_Races/Bear.xml
deleted file mode 100644
index c42391133c..0000000000
--- a/Patches/Fell Tribes/ThingDefs_Races/Bear.xml	
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Fell Tribes</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== Found the mod ========== -->
-
-				<!-- ========== Now patch the basics... ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<!-- === Note to future furball compatibility nerds: 		=== -->
-					<!-- === Paste the defName of your horrible alien there   |	=== -->
-					<!-- === 												  V	=== -->
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Bear"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Done! ========== -->
-				<!-- ========== Now for the gun settings and suppression ========== -->
-
-				<li Class="PatchOperationAdd">
-					<!-- === Shouldn't need to change this at all		  === -->
-					<!-- === Unless you changed the name of your BasePawn === -->
-					<!-- === In which case change "BasePawn" to that name === -->
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Bear"]</xpath>
-					<value>
-						<comps>
-							<li>
-								<compClass>CombatExtended.CompPawnGizmo</compClass>
-							</li>
-							<li Class="CombatExtended.CompProperties_Suppressable" />
-						</comps>
-					</value>
-				</li>
-
-				<!-- === Patch their default melee attacks === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Bear"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1</AimingAccuracy>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1.15</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<ReloadSpeed>1</ReloadSpeed>
-						<Suppressability>1</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Bear"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.15</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.15</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.923</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Fell Tribes/ThingDefs_Races/Fox.xml b/Patches/Fell Tribes/ThingDefs_Races/Fox.xml
deleted file mode 100644
index 238deda4cb..0000000000
--- a/Patches/Fell Tribes/ThingDefs_Races/Fox.xml	
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Fell Tribes</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Now patch the basics... ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<!-- === Note to future furball compatibility nerds: 		=== -->
-					<!-- === Paste the defName of your horrible alien there   |	=== -->
-					<!-- === 												  V	=== -->
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Fox"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Done! ========== -->
-				<!-- ========== Now for the gun settings and suppression ========== -->
-
-				<li Class="PatchOperationAdd">
-					<!-- === Shouldn't need to change this at all		  === -->
-					<!-- === Unless you changed the name of your BasePawn === -->
-					<!-- === In which case change "BasePawn" to that name === -->
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Fox"]</xpath>
-					<value>
-						<comps>
-							<li>
-								<compClass>CombatExtended.CompPawnGizmo</compClass>
-							</li>
-							<li Class="CombatExtended.CompProperties_Suppressable" />
-						</comps>
-					</value>
-				</li>
-
-				<!-- === Patch their default melee attacks === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Fox"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1</AimingAccuracy>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1.15</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<ReloadSpeed>1</ReloadSpeed>
-						<Suppressability>1</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Fox"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.15</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.15</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.923</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Fell Tribes/ThingDefs_Races/Lynx.xml b/Patches/Fell Tribes/ThingDefs_Races/Lynx.xml
deleted file mode 100644
index aa2823327c..0000000000
--- a/Patches/Fell Tribes/ThingDefs_Races/Lynx.xml	
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Fell Tribes</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Now patch the basics... ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<!-- === Note to future furball compatibility nerds: 		=== -->
-					<!-- === Paste the defName of your horrible alien there   |	=== -->
-					<!-- === 												  V	=== -->
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Lynx"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Done! ========== -->
-				<!-- ========== Now for the gun settings and suppression ========== -->
-
-				<li Class="PatchOperationAdd">
-					<!-- === Shouldn't need to change this at all		  === -->
-					<!-- === Unless you changed the name of your BasePawn === -->
-					<!-- === In which case change "BasePawn" to that name === -->
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Lynx"]</xpath>
-					<value>
-						<comps>
-							<li>
-								<compClass>CombatExtended.CompPawnGizmo</compClass>
-							</li>
-							<li Class="CombatExtended.CompProperties_Suppressable" />
-						</comps>
-					</value>
-				</li>
-
-				<!-- === Patch their default melee attacks === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Lynx"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1</AimingAccuracy>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1.15</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<ReloadSpeed>1</ReloadSpeed>
-						<Suppressability>1</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Lynx"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.15</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.15</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.923</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Fell Tribes/ThingDefs_Races/Serval.xml b/Patches/Fell Tribes/ThingDefs_Races/Serval.xml
deleted file mode 100644
index 07d9635454..0000000000
--- a/Patches/Fell Tribes/ThingDefs_Races/Serval.xml	
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Fell Tribes</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Now patch the basics... ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<!-- === Note to future furball compatibility nerds: 		=== -->
-					<!-- === Paste the defName of your horrible alien there   |	=== -->
-					<!-- === 												  V	=== -->
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Serval"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Done! ========== -->
-				<!-- ========== Now for the gun settings and suppression ========== -->
-
-				<li Class="PatchOperationAdd">
-					<!-- === Shouldn't need to change this at all		  === -->
-					<!-- === Unless you changed the name of your BasePawn === -->
-					<!-- === In which case change "BasePawn" to that name === -->
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Serval"]</xpath>
-					<value>
-						<comps>
-							<li>
-								<compClass>CombatExtended.CompPawnGizmo</compClass>
-							</li>
-							<li Class="CombatExtended.CompProperties_Suppressable" />
-						</comps>
-					</value>
-				</li>
-
-				<!-- === Patch their default melee attacks === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Serval"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1</AimingAccuracy>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1.15</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<ReloadSpeed>1</ReloadSpeed>
-						<Suppressability>1</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Serval"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.15</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.15</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.923</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Fell Tribes/ThingDefs_Races/Wolf.xml b/Patches/Fell Tribes/ThingDefs_Races/Wolf.xml
deleted file mode 100644
index 57031e9364..0000000000
--- a/Patches/Fell Tribes/ThingDefs_Races/Wolf.xml	
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Fell Tribes</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Now patch the basics... ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<!-- === Note to future furball compatibility nerds: 		=== -->
-					<!-- === Paste the defName of your horrible alien there   |	=== -->
-					<!-- === 												  V	=== -->
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Wolf"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Done! ========== -->
-				<!-- ========== Now for the gun settings and suppression ========== -->
-
-				<li Class="PatchOperationAdd">
-					<!-- === Shouldn't need to change this at all		  === -->
-					<!-- === Unless you changed the name of your BasePawn === -->
-					<!-- === In which case change "BasePawn" to that name === -->
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Wolf"]</xpath>
-					<value>
-						<comps>
-							<li>
-								<compClass>CombatExtended.CompPawnGizmo</compClass>
-							</li>
-							<li Class="CombatExtended.CompProperties_Suppressable" />
-						</comps>
-					</value>
-				</li>
-
-				<!-- === Patch their default melee attacks === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Wolf"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1</AimingAccuracy>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1.15</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<ReloadSpeed>1</ReloadSpeed>
-						<Suppressability>1</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Wolf"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.15</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.15</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.923</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Ferrex/Ferrex_Weapons.xml b/Patches/Ferrex/Ferrex_Weapons.xml
deleted file mode 100644
index 91b6724abb..0000000000
--- a/Patches/Ferrex/Ferrex_Weapons.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Ferrex Race (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Ferrex F90 (P90) -->
-				<!-- Stolen from CE Guns' Vector until I can figure out how to make it P90-y -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Ferrex_P90x</defName>
-					<!-- Cute -->
-					<statBases>
-						<Bulk>4.1</Bulk>
-						<Mass>2.7</Mass>
-						<SwayFactor>0.89</SwayFactor>
-						<ShotSpread>0.16</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<WorkToMake>28000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>35</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>14</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<researchPrerequisite>GasOperation</researchPrerequisite>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Ferrex_P90x"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>magazine</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Magazine</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Ferrex Vactor -->
-				<!-- Stolen from CE Guns' Vector, fullstop -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Ferrex_Vac</defName>
-					<statBases>
-						<Bulk>4.1</Bulk>
-						<Mass>2.7</Mass>
-						<SwayFactor>0.89</SwayFactor>
-						<ShotSpread>0.16</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<WorkToMake>28000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>35</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.84</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>14</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>Xen_SD</soundCast>
-						<muzzleFlashScale>4</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<researchPrerequisite>GasOperation</researchPrerequisite>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Ferrex_Vac"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>magazine</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Magazine</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Ferrex/PawnKinds_Ferrex.xml b/Patches/Ferrex/PawnKinds_Ferrex.xml
deleted file mode 100644
index c3ffa15508..0000000000
--- a/Patches/Ferrex/PawnKinds_Ferrex.xml
+++ /dev/null
@@ -1,324 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Ferrex Race (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== Scoot ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FerrexColonist"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FerrexExecutive"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FerrexTrader"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FerrexSlave"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FerrexRefugee"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FerrexSecurityGuard"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FerrexMerc"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FerrexSurveyor"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FerrexProfessional"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FerrexNinja"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Ferrex/Race_Ferrex.xml b/Patches/Ferrex/Race_Ferrex.xml
deleted file mode 100644
index 4ae21a3587..0000000000
--- a/Patches/Ferrex/Race_Ferrex.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Ferrex Race (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Ferrex"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Gives Gun Gizmos to Ferrex HUD thing ========== -->
-				<!-- ========== Also Makes Em Suppressable ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="BaseFerretPawn"]</xpath>
-					<value>
-						<comps>
-							<li>
-								<compClass>CombatExtended.CompPawnGizmo</compClass>
-							</li>
-							<li Class="CombatExtended.CompProperties_Suppressable" />
-						</comps>
-					</value>
-				</li>
-				<!-- ========== Patch Ferrex Melee Attacks ========== -->
-				<!-- ========== Punch punch, no claws or teeth. Fair enough! ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Ferrex"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1</AimingAccuracy>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<ReloadSpeed>1</ReloadSpeed>
-						<Suppressability>1</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Ferrex"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetration>0.12</armorPenetration>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.690</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== BaseBodySize, ArmorRatings, MoveSpeed, and BaseHealth are already set. I think. ========== -->
-				<!-- ========== Thanks Xenn! ========== -->
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Filthy Orc Invasion/FilthyOrcInvasion_AmmoPatch.xml b/Patches/Filthy Orc Invasion/FilthyOrcInvasion_AmmoPatch.xml
deleted file mode 100644
index 62280ff9c0..0000000000
--- a/Patches/Filthy Orc Invasion/FilthyOrcInvasion_AmmoPatch.xml	
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Filthy Orc Invasion (Continued)</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingDef ParentName="BaseBulletCE">
-					<defName>Javelin_Thrown_CE</defName>
-					<graphicData>
-						<texPath>Things/Projectile/Javelin_Thrown</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<label>Javelin</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>RangedStab</damageDef>
-						<speed>35</speed>
-						<damageAmountBase>20</damageAmountBase>
-						<armorPenetrationSharp>3.25</armorPenetrationSharp>
-						<armorPenetrationBlunt>5.44</armorPenetrationBlunt>
-						<preExplosionSpawnChance>0.65</preExplosionSpawnChance><!-- 4 javelins per resource -->
-						<preExplosionSpawnThingDef>Javelin</preExplosionSpawnThingDef>
-					</projectile>
-				</ThingDef>
-
-				<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-					<defName>MakeAmmo_Javelin</defName>
-					<label>make javelin x5</label>
-					<description>Craft 5 javelins.</description>
-					<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-					<workSkill>Crafting</workSkill>
-					<recipeUsers>
-						<li>ElectricSmithy</li>
-						<li>FueledSmithy</li>
-						<li>CraftingSpot</li>
-					</recipeUsers>
-					<effectWorking>Smelt</effectWorking>
-					<unfinishedThingDef>UnfinishedAmmo</unfinishedThingDef>
-					<workAmount>2500</workAmount>
-					<jobString>Making javelins.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>WoodLog</li>
-								</thingDefs>
-							</filter>
-							<count>45</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>WoodLog</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Javelin>5</Javelin>
-					</products>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Filthy Orc Invasion/FilthyOrcInvasion_Orc_Race.xml b/Patches/Filthy Orc Invasion/FilthyOrcInvasion_Orc_Race.xml
deleted file mode 100644
index 38d2ecae50..0000000000
--- a/Patches/Filthy Orc Invasion/FilthyOrcInvasion_Orc_Race.xml	
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Filthy Orc Invasion (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="OrcScenario"]/scenario/parts/li[thingDef="Javelin"]</xpath>
-					<value>
-						<count>20</count>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Orc"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Orc"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetration>0.1</armorPenetration>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetration>0.1</armorPenetration>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Orc"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Orc"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Orc"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Filthy Orc Invasion/FilthyOrcInvasion_Orc_Weapons.xml b/Patches/Filthy Orc Invasion/FilthyOrcInvasion_Orc_Weapons.xml
deleted file mode 100644
index 63d1f12599..0000000000
--- a/Patches/Filthy Orc Invasion/FilthyOrcInvasion_Orc_Weapons.xml	
+++ /dev/null
@@ -1,359 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Filthy Orc Invasion (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_HandCannon</defName>
-					<statBases>
-						<Mass>1.50</Mass>
-						<RangedWeapon_Cooldown>12.0</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.9</SightsEfficiency>
-						<ShotSpread>0.22</ShotSpread>
-						<SwayFactor>1.50</SwayFactor>
-						<Bulk>1.50</Bulk>
-						<WorkToMake>22000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>400</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>0.60</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_CannonBall_Round</defaultProjectile>
-						<warmupTime>4.6</warmupTime>
-						<range>40</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>6.75</reloadTime>
-						<ammoSet>AmmoSet_CannonBall</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_HandCannon"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Javelin"]</xpath>
-					<value>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseWeaponAndAmmoNeolithic">
-							<defName>Javelin</defName>
-							<label>javelin</label>
-							<description>light spears designed for throwing. Its weight allows for quick throwing, useful for skirmishing at close range.</description>
-							<graphicData>
-								<texPath>Things/Item/Equipment/WeaponRanged/Javelin</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
-							</graphicData>
-							<soundInteract>Interact_BeatFire</soundInteract>
-							<statBases>
-								<MarketValue>7.26</MarketValue>
-								<SightsEfficiency>1.0</SightsEfficiency>
-								<ShotSpread>1.5</ShotSpread>
-								<SwayFactor>2.5</SwayFactor>
-								<Bulk>3.5</Bulk>
-								<Mass>2.00</Mass>
-								<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-							</statBases>
-							<equippedAngleOffset>30</equippedAngleOffset>
-							<stackLimit>25</stackLimit>
-							<weaponTags>
-								<li>NeolithicRangedHeavy</li>
-								<li>CE_Pila</li>
-								<li>CE_OneHandedWeapon</li>
-							</weaponTags>
-							<tradeability>All</tradeability>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Javelin_Thrown_CE</defaultProjectile>
-									<warmupTime>0.8</warmupTime>
-									<range>14</range>
-									<!--<soundCast>Interact_BeatFire</soundCast>-->
-								</li>
-							</verbs>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>shaft</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>7</power>
-									<cooldownTime>1.35</cooldownTime>
-									<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>point</label>
-									<capacities>
-										<li>Stab</li>
-									</capacities>
-									<power>15</power>
-									<cooldownTime>1.37</cooldownTime>
-									<chanceFactor>1.5</chanceFactor>
-									<armorPenetrationBlunt>1.69</armorPenetrationBlunt>
-									<armorPenetrationSharp>0.34</armorPenetrationSharp>
-									<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-								</li>
-							</tools>
-							<ammoClass>Javelin</ammoClass>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>HeavySling</defName>
-					<statBases>
-						<Mass>0.5</Mass>
-						<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.1</ShotSpread>
-						<SwayFactor>1</SwayFactor>
-						<Bulk>2</Bulk>
-						<WorkToMake>12000</WorkToMake>
-					</statBases>
-					<Properties>
-						<recoilAmount>0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Ammo_SlingBullet_Stone</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>20</range>
-						<soundAiming>Sling_Aiming</soundAiming>
-						<soundCast>Sling_Firing</soundCast>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>3.25</reloadTime>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="HeavySling"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>sling</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_GreatMaul"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>hammer</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>2.0</cooldownTime>
-								<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>pick</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>3.5</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_GreatMaul"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_GreatMaul"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.4</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_GreatMaul"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="MeleeWeapon_GreatMaul"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_GreatMaul"]/weaponTags</xpath>
-					<value>
-						<li>GiantMelee</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_GreatClub"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2.0</cooldownTime>
-								<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.46</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_GreatClub"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_GreatClub"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.4</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_GreatClub"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="MeleeWeapon_GreatClub"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_GreatClub"]/weaponTags</xpath>
-					<value>
-						<li>GiantMelee</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_GreatAxe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>3.2</cooldownTime>
-								<armorPenetrationBlunt>0.956</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.43</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_GreatAxe"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_GreatAxe"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.4</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_GreatAxe"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="MeleeWeapon_GreatAxe"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_GreatAxe"]/weaponTags</xpath>
-					<value>
-						<li>GiantMelee</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Filthy Orc Invasion/FilthyOrcInvasion_PawnKind_Player_Orc.xml b/Patches/Filthy Orc Invasion/FilthyOrcInvasion_PawnKind_Player_Orc.xml
deleted file mode 100644
index d9beb3649b..0000000000
--- a/Patches/Filthy Orc Invasion/FilthyOrcInvasion_PawnKind_Player_Orc.xml	
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Filthy Orc Invasion (Continued)</li>
-		</mods>
-		<match Class="PatchOperationAddModExtension">
-			<xpath>Defs/PawnKindDef[defName="OrcPlayer"]</xpath>
-			<value>
-				<li Class="CombatExtended.LoadoutPropertiesExtension">
-					<primaryMagazineCount>
-						<min>4</min>
-						<max>5</max>
-					</primaryMagazineCount>
-					<forcedSidearm>
-						<sidearmMoney>
-							<min>80</min>
-							<max>500</max>
-						</sidearmMoney>
-						<weaponTags>
-							<li>GiantMelee</li>
-							<li>GiantRanged</li>
-							<li>CE_Sidearm_Melee</li>
-						</weaponTags>
-					</forcedSidearm>
-				</li>
-
-			</value>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Filthy Orc Invasion/FilthyOrcInvasion_PawnKinds_Orc.xml b/Patches/Filthy Orc Invasion/FilthyOrcInvasion_PawnKinds_Orc.xml
deleted file mode 100644
index 6501ef09f3..0000000000
--- a/Patches/Filthy Orc Invasion/FilthyOrcInvasion_PawnKinds_Orc.xml	
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Filthy Orc Invasion (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Alien_Orc"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>80</min>
-									<max>500</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>GiantMelee</li>
-									<li>GiantRanged</li>
-									<li>CE_Sidearm_Melee</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="OrcRaider"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>80</min>
-									<max>500</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>GiantMelee</li>
-									<li>GiantRanged</li>
-									<li>CE_Sidearm_Melee</li>
-								</weaponTags>
-								<magazineCount>
-									<min>4</min>
-									<max>5</max>
-								</magazineCount>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="OrcScrounger"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>80</min>
-									<max>500</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>CE_Sidearm_Melee</li>
-								</weaponTags>
-								<magazineCount>
-									<min>3</min>
-									<max>5</max>
-								</magazineCount>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Flak Dusters/ThingDefs_Misc/Apparel_FD.xml b/Patches/Flak Dusters/ThingDefs_Misc/Apparel_FD.xml
deleted file mode 100644
index 19e7656499..0000000000
--- a/Patches/Flak Dusters/ThingDefs_Misc/Apparel_FD.xml	
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Flak Dusters</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_FlakDuster"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>2</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_FlakDuster"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="Apparel_FlakDuster"]/statBases/ArmorRating_Heat</xpath>
-						</li>
-
-						<!--Not stuffable as leather in CE-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_FlakDuster"]/costList</xpath>
-							<value>
-								<costList>
-									<Steel>32</Steel>
-								</costList>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_FlakDuster"]/stuffCategories</xpath>
-							<value>
-								<stuffCategories>
-									<li>Fabric</li>
-								</stuffCategories>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_FlakDuster"]/costStuffCount</xpath>
-							<value>
-								<costStuffCount>90</costStuffCount>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_FlakDuster"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-								<Bulk>7</Bulk>
-								<WornBulk>5</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_FlakDuster"]/statBases/StuffEffectMultiplierInsulation_Cold</xpath>
-							<value>
-								<StuffEffectMultiplierInsulation_Cold>0.9</StuffEffectMultiplierInsulation_Cold>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_FlakDuster"]/statBases/StuffEffectMultiplierInsulation_Heat</xpath>
-							<value>
-								<StuffEffectMultiplierInsulation_Heat>0.4</StuffEffectMultiplierInsulation_Heat>
-							</value>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="Apparel_FlakDuster"]/equippedStatOffsets/MoveSpeed</xpath>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="Apparel_FlakDuster"]/statBases/Insulation_Cold</xpath>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="Apparel_FlakDuster"]/statBases/Insulation_Heat</xpath>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Forgelings race/Apparel_Forge.xml b/Patches/Forgelings race/Apparel_Forge.xml
deleted file mode 100644
index 364117df11..0000000000
--- a/Patches/Forgelings race/Apparel_Forge.xml	
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forgelings race</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Crusader Helmet === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Forge_Apparel_Helmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3.0</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Forge_Apparel_Helmet"]/recipeMaker</xpath>
-					<value>
-						<skillRequirements>
-							<Crafting>8</Crafting>
-						</skillRequirements>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Forge_Apparel_Helmet"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>60</costStuffCount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Forge_Apparel_Helmet"]/statBases/WorkToMake</xpath>
-					<value>
-						<WorkToMake>6400</WorkToMake>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Forge_Apparel_Helmet"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>-0.4</AimingAccuracy>
-							<MeleeHitChance>-2</MeleeHitChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Forge_Apparel_Helmet"]/apparel/layers</xpath>
-					<value>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Forge_Apparel_Helmet"]/stuffCategories</xpath>
-					<value>
-						<stuffCategories>
-							<li>Steeled</li>
-						</stuffCategories>
-					</value>
-				</li>
-
-				<!-- === Crusader Armour === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Forge_Apparel_CruciblePlate"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
-						<Bulk>100</Bulk>
-						<WornBulk>12</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Forge_Apparel_CruciblePlate"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>200</costStuffCount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Forge_Apparel_CruciblePlate"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<MeleeDodgeChance>-0.15</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Forge_Apparel_CruciblePlate"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Forge_Apparel_CruciblePlate"]/stuffCategories</xpath>
-					<value>
-						<stuffCategories>
-							<li>Steeled</li>
-						</stuffCategories>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Forgelings race/Forgling_Melee.xml b/Patches/Forgelings race/Forgling_Melee.xml
deleted file mode 100644
index 89f8a549fb..0000000000
--- a/Patches/Forgelings race/Forgling_Melee.xml	
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forgelings race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Forge_ForgeDagger"]/statBases</xpath>
-					<value>
-						<statBases>
-							<WorkToMake>25500</WorkToMake>
-							<Mass>0.6</Mass>
-							<Bulk>5</Bulk>
-							<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Forge_ForgeDagger"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.9</MeleeCritChance>
-							<MeleeParryChance>0.69</MeleeParryChance>
-							<MeleeDodgeChance>0.33</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Forge_ForgeDagger"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.27</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.7</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.33</cooldownTime>
-								<extraMeleeDamages>
-									<li>
-										<def>Flame</def>
-										<amount>6</amount>
-									</li>
-								</extraMeleeDamages>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>0.459</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.4</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>1.4</cooldownTime>
-								<extraMeleeDamages>
-									<li>
-										<def>Flame</def>
-										<amount>8</amount>
-									</li>
-								</extraMeleeDamages>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>0.674</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.0</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Forgelings race/Races_Forgeling.xml b/Patches/Forgelings race/Races_Forgeling.xml
deleted file mode 100644
index 196dc5a243..0000000000
--- a/Patches/Forgelings race/Races_Forgeling.xml	
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forgelings race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Forge_Forgeling_Race"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Forge_Forgeling_Race"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2.25</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Forge_Forgeling_Race"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Forge_Forgeling_Race"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.8</ArmorRating_Heat>
-						<ToxicResistance>0.4</ToxicResistance>
-						<SmokeSensitivity>0.5</SmokeSensitivity>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Forge_Forgeling_Race"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Burn</def>
-										<amount>3</amount>
-										<chance>0.4</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>1.96</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Burn</def>
-										<amount>3</amount>
-										<chance>0.4</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>1.96</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Burn</def>
-										<amount>3</amount>
-										<chance>0.6</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>4.59</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>5.825</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Forge_Forgeling_Race"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Forge_Forgeling_Race"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Forge_Forgeling_Race"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Forgotten Realms - Lizardfolk/Patch_Lizardfolk_Race.xml b/Patches/Forgotten Realms - Lizardfolk/Patch_Lizardfolk_Race.xml
deleted file mode 100644
index d0c82a1550..0000000000
--- a/Patches/Forgotten Realms - Lizardfolk/Patch_Lizardfolk_Race.xml	
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forgotten Realms - Lizardfolk</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Squamata" or defName="FR_Alien_Croco"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Squamata"]/statBases/Mass</xpath>
-					<value>
-						<Mass>45</Mass>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Croco"]/statBases/Mass</xpath>
-					<value>
-						<Mass>60</Mass>
-						<MeleeDodgeChance>0.8</MeleeDodgeChance>
-						<MeleeCritChance>1.2</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<Suppressability>0.75</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Squamata"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4.6</MoveSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Croco"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4.1</MoveSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Squamata" or defName="FR_Alien_Croco"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0.5</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Squamata"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Croco"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.35</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Squamata"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.15</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Croco"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Squamata" or defName="FR_Alien_Croco"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.1</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Squamata"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>1.15</baseHealthScale>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Croco"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>1.4</baseHealthScale>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Squamata"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.55</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.0</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Croco"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>2.5</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.0</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Squamata" or defName="FR_Alien_Croco"]</xpath>
-					<value>
-						<comps>
-							<li>
-								<compClass>CombatExtended.CompPawnGizmo</compClass>
-							</li>
-							<li Class="CombatExtended.CompProperties_Suppressable" />
-						</comps>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Forgotten Realms - Lizardfolk/Patch_Lizardfolk_Skin.xml b/Patches/Forgotten Realms - Lizardfolk/Patch_Lizardfolk_Skin.xml
deleted file mode 100644
index 30db3f13f4..0000000000
--- a/Patches/Forgotten Realms - Lizardfolk/Patch_Lizardfolk_Skin.xml	
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forgotten Realms - Lizardfolk</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Leather -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Squamata"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.08</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Squamata"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.064</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Croco"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.1</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Croco"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.068</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Forgotten Realms - Lizardfolk/Patch_PawnKinds_Lizardfolk.xml b/Patches/Forgotten Realms - Lizardfolk/Patch_PawnKinds_Lizardfolk.xml
deleted file mode 100644
index 003bc090b4..0000000000
--- a/Patches/Forgotten Realms - Lizardfolk/Patch_PawnKinds_Lizardfolk.xml	
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forgotten Realms - Lizardfolk</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Tribal -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="FR_SquamataTribes_Peasant" or defName="FR_CrocoTribes_Peasant"]/combatPower</xpath>
-					<value>
-						<combatPower>25</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="FR_CrocoTribes_Fighter" or defName="FR_SquamataTribes_Fighter"]/combatPower</xpath>
-					<value>
-						<combatPower>30</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="FR_SquamataTribes_Warrior" or defName="FR_CrocoTribes_Warrior"]/combatPower</xpath>
-					<value>
-						<combatPower>40</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="FR_CrocoTribes_Bowman" or defName="FR_SquamataTribes_Bowman"]/combatPower</xpath>
-					<value>
-						<combatPower>40</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="FR_SquamataTribes_Champion" or defName="FR_SquamataTribes_Chief" or defName="FR_CrocoTribes_Champion" or defName="FR_CrocoTribes_Chief"]/combatPower</xpath>
-					<value>
-						<combatPower>70</combatPower>
-					</value>
-				</li>
-
-				<!-- Hive_Archer -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FR_CrocoTribes_Bowman" or defName="FR_SquamataTribes_Bowman"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>20</min>
-								<max>40</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>100</min>
-								<max>140</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>40</min>
-										<max>80</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Tribal</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- Hiver_Warrior -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FR_SquamataTribes_Warrior" or defName="FR_CrocoTribes_Warrior" or defName="FR_CrocoTribes_Fighter" or defName="FR_SquamataTribes_Fighter"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>100</min>
-								<max>200</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.75</shieldChance>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Forgotten Realms - Lizardfolk/Patch_Scenarios_Squamata.xml b/Patches/Forgotten Realms - Lizardfolk/Patch_Scenarios_Squamata.xml
deleted file mode 100644
index a22e73d289..0000000000
--- a/Patches/Forgotten Realms - Lizardfolk/Patch_Scenarios_Squamata.xml	
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forgotten Realms - Lizardfolk</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Squamata === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="FR_CrashlandedSquamata"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_303British_FMJ</thingDef>
-							<count>100</count>
-						</li>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_44Magnum_FMJ</thingDef>
-							<count>60</count>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="FR_LostTribeSquamata"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_Arrow_Stone</thingDef>
-							<count>100</count>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="FR_LostTribeSquamata"]/scenario/parts/li[thingDef="Pila"]</xpath>
-					<value>
-						<count>20</count>
-					</value>
-				</li>
-
-				<!-- === Crocodillian === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="FR_CrashlandedCroco"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_303British_FMJ</thingDef>
-							<count>100</count>
-						</li>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_44Magnum_FMJ</thingDef>
-							<count>60</count>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="FR_LostTribeCroco"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_Arrow_Stone</thingDef>
-							<count>100</count>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="FR_LostTribeCroco"]/scenario/parts/li[thingDef="Pila"]</xpath>
-					<value>
-						<count>20</count>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Forgotten Realms - Lizardfolk/PawnKinds_Crocodillian.xml b/Patches/Forgotten Realms - Lizardfolk/PawnKinds_Crocodillian.xml
deleted file mode 100644
index 384ff37bd7..0000000000
--- a/Patches/Forgotten Realms - Lizardfolk/PawnKinds_Crocodillian.xml	
+++ /dev/null
@@ -1,198 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forgotten Realms - Lizardfolk</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ========== Tribals ========== -->
-
-						<PawnKindDef>
-							<defName>CrocoGrenadier</defName>
-							<race>FR_Alien_Croco</race>
-							<label>growler</label>
-							<combatPower>70</combatPower>
-							<defaultFactionType>FR_CrocoTribes</defaultFactionType>
-							<backstoryCategories>
-								<li>Tribal</li>
-							</backstoryCategories>
-							<maxGenerationAge>60</maxGenerationAge>
-							<chemicalAddictionChance>0.05</chemicalAddictionChance>
-							<invNutrition>2.55</invNutrition>
-							<invFoodDef>Pemmican</invFoodDef>
-							<canBeSapper>true</canBeSapper>
-							<gearHealthRange>
-								<min>0.5</min>
-								<max>1.8</max>
-							</gearHealthRange>
-							<apparelMoney>
-								<min>180</min>
-								<max>350</max>
-							</apparelMoney>
-							<apparelRequired>
-								<li>Apparel_WarVeil</li>
-								<li>CE_Apparel_TribalBackpack</li>
-							</apparelRequired>
-							<apparelTags>
-								<li>Tribal</li>
-							</apparelTags>
-							<weaponMoney>
-								<min>60</min>
-								<max>400</max>
-							</weaponMoney>
-							<weaponTags>
-								<li>CE_GrenadeNeolithic</li>
-							</weaponTags>
-							<techHediffsMoney>
-								<min>50</min>
-								<max>800</max>
-							</techHediffsMoney>
-							<techHediffsTags>
-								<li>Poor</li>
-								<li>Simple</li>
-							</techHediffsTags>
-							<techHediffsChance>0.33</techHediffsChance>
-							<modExtensions>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>6</min>
-										<max>18</max>
-									</primaryMagazineCount>
-									<forcedSidearm>
-										<sidearmMoney>
-											<min>80</min>
-											<max>160</max>
-										</sidearmMoney>
-										<weaponTags>
-											<li>CE_Sidearm_Tribal</li>
-										</weaponTags>
-									</forcedSidearm>
-								</li>
-							</modExtensions>
-						</PawnKindDef>
-
-						<PawnKindDef>
-							<defName>CrocoGunner</defName>
-							<race>FR_Alien_Croco</race>
-							<label>hisser</label>
-							<combatPower>75</combatPower>
-							<defaultFactionType>FR_CrocoTribes</defaultFactionType>
-							<backstoryCategories>
-								<li>Tribal</li>
-							</backstoryCategories>
-							<maxGenerationAge>60</maxGenerationAge>
-							<chemicalAddictionChance>0.05</chemicalAddictionChance>
-							<invNutrition>2.55</invNutrition>
-							<invFoodDef>Pemmican</invFoodDef>
-							<gearHealthRange>
-								<min>0.5</min>
-								<max>1.8</max>
-							</gearHealthRange>
-							<apparelMoney>
-								<min>180</min>
-								<max>350</max>
-							</apparelMoney>
-							<apparelTags>
-								<li>Tribal</li>
-							</apparelTags>
-							<apparelRequired>
-								<li>Apparel_WarMask</li>
-							</apparelRequired>
-							<weaponMoney>
-								<min>180</min>
-								<max>290</max>
-							</weaponMoney>
-							<weaponTags>
-								<li>Gun</li>
-							</weaponTags>
-							<techHediffsMoney>
-								<min>50</min>
-								<max>800</max>
-							</techHediffsMoney>
-							<techHediffsTags>
-								<li>Poor</li>
-								<li>Simple</li>
-							</techHediffsTags>
-							<techHediffsChance>0.20</techHediffsChance>
-							<modExtensions>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>4</max>
-									</primaryMagazineCount>
-									<shieldMoney>
-										<min>120</min>
-										<max>160</max>
-									</shieldMoney>
-									<shieldTags>
-										<li>TribalShield</li>
-									</shieldTags>
-									<shieldChance>0.8</shieldChance>
-									<sidearms>
-										<li>
-											<sidearmMoney>
-												<min>100</min>
-												<max>600</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_Sidearm_Tribal</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</modExtensions>
-						</PawnKindDef>
-					</value>
-				</li>
-
-				<!-- ========== Add tribal grenadies ========== -->
-
-				<li Class="PatchOperationAdd"><!-- Combat -->
-					<xpath>Defs/FactionDef[defName="FR_CrocoTribes"]/pawnGroupMakers/li[1]/options</xpath>
-					<value>
-						<CrocoGrenadier>10</CrocoGrenadier>
-						<CrocoGunner>20</CrocoGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Normal fights, ranged only -->
-					<xpath>Defs/FactionDef[defName="FR_CrocoTribes"]/pawnGroupMakers/li[2]/options</xpath>
-					<value>
-						<CrocoGrenadier>20</CrocoGrenadier>
-						<CrocoGunner>25</CrocoGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!--Peaceful-->
-					<xpath>Defs/FactionDef[defName="FR_CrocoTribes"]/pawnGroupMakers/li[4]/options</xpath>
-					<value>
-						<CrocoGrenadier>5</CrocoGrenadier>
-						<CrocoGunner>20</CrocoGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!--Trader-->
-					<xpath>Defs/FactionDef[defName="FR_CrocoTribes"]/pawnGroupMakers/li[5]/guards</xpath>
-					<value>
-						<CrocoGrenadier>7</CrocoGrenadier>
-						<CrocoGunner>20</CrocoGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Settlement -->
-					<xpath>Defs/FactionDef[defName="FR_CrocoTribes"]/pawnGroupMakers/li[6]/options</xpath>
-					<value>
-						<CrocoGrenadier>20</CrocoGrenadier>
-						<CrocoGunner>40</CrocoGunner>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Forgotten Realms - Lizardfolk/PawnKinds_Squadmata.xml b/Patches/Forgotten Realms - Lizardfolk/PawnKinds_Squadmata.xml
deleted file mode 100644
index 8de8eaebf2..0000000000
--- a/Patches/Forgotten Realms - Lizardfolk/PawnKinds_Squadmata.xml	
+++ /dev/null
@@ -1,198 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forgotten Realms - Lizardfolk</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ========== Tribals ========== -->
-
-						<PawnKindDef>
-							<defName>LizoGrenadier</defName>
-							<race>FR_Alien_Squamata</race>
-							<label>boomer</label>
-							<combatPower>65</combatPower>
-							<defaultFactionType>FR_SquamataTribes</defaultFactionType>
-							<backstoryCategories>
-								<li>Tribal</li>
-							</backstoryCategories>
-							<maxGenerationAge>60</maxGenerationAge>
-							<chemicalAddictionChance>0.05</chemicalAddictionChance>
-							<invNutrition>2.55</invNutrition>
-							<invFoodDef>Pemmican</invFoodDef>
-							<canBeSapper>true</canBeSapper>
-							<gearHealthRange>
-								<min>0.5</min>
-								<max>1.8</max>
-							</gearHealthRange>
-							<apparelMoney>
-								<min>180</min>
-								<max>350</max>
-							</apparelMoney>
-							<apparelRequired>
-								<li>Apparel_WarVeil</li>
-								<li>CE_Apparel_TribalBackpack</li>
-							</apparelRequired>
-							<apparelTags>
-								<li>Tribal</li>
-							</apparelTags>
-							<weaponMoney>
-								<min>60</min>
-								<max>400</max>
-							</weaponMoney>
-							<weaponTags>
-								<li>CE_GrenadeNeolithic</li>
-							</weaponTags>
-							<techHediffsMoney>
-								<min>50</min>
-								<max>800</max>
-							</techHediffsMoney>
-							<techHediffsTags>
-								<li>Poor</li>
-								<li>Simple</li>
-							</techHediffsTags>
-							<techHediffsChance>0.33</techHediffsChance>
-							<modExtensions>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>6</min>
-										<max>18</max>
-									</primaryMagazineCount>
-									<forcedSidearm>
-										<sidearmMoney>
-											<min>80</min>
-											<max>160</max>
-										</sidearmMoney>
-										<weaponTags>
-											<li>CE_Sidearm_Tribal</li>
-										</weaponTags>
-									</forcedSidearm>
-								</li>
-							</modExtensions>
-						</PawnKindDef>
-
-						<PawnKindDef>
-							<defName>LizoGunner</defName>
-							<race>FR_Alien_Squamata</race>
-							<label>thunderer</label>
-							<combatPower>65</combatPower>
-							<defaultFactionType>FR_SquamataTribes</defaultFactionType>
-							<backstoryCategories>
-								<li>Tribal</li>
-							</backstoryCategories>
-							<maxGenerationAge>60</maxGenerationAge>
-							<chemicalAddictionChance>0.05</chemicalAddictionChance>
-							<invNutrition>2.55</invNutrition>
-							<invFoodDef>Pemmican</invFoodDef>
-							<gearHealthRange>
-								<min>0.5</min>
-								<max>1.8</max>
-							</gearHealthRange>
-							<apparelMoney>
-								<min>180</min>
-								<max>350</max>
-							</apparelMoney>
-							<apparelTags>
-								<li>Tribal</li>
-							</apparelTags>
-							<apparelRequired>
-								<li>Apparel_WarMask</li>
-							</apparelRequired>
-							<weaponMoney>
-								<min>180</min>
-								<max>290</max>
-							</weaponMoney>
-							<weaponTags>
-								<li>Gun</li>
-							</weaponTags>
-							<techHediffsMoney>
-								<min>50</min>
-								<max>800</max>
-							</techHediffsMoney>
-							<techHediffsTags>
-								<li>Poor</li>
-								<li>Simple</li>
-							</techHediffsTags>
-							<techHediffsChance>0.20</techHediffsChance>
-							<modExtensions>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>4</max>
-									</primaryMagazineCount>
-									<shieldMoney>
-										<min>120</min>
-										<max>160</max>
-									</shieldMoney>
-									<shieldTags>
-										<li>TribalShield</li>
-									</shieldTags>
-									<shieldChance>0.8</shieldChance>
-									<sidearms>
-										<li>
-											<sidearmMoney>
-												<min>100</min>
-												<max>600</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_Sidearm_Tribal</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</modExtensions>
-						</PawnKindDef>
-					</value>
-				</li>
-
-				<!-- ========== Add tribal grenadies ========== -->
-
-				<li Class="PatchOperationAdd"><!-- Combat -->
-					<xpath>Defs/FactionDef[defName="FR_SquamataTribes"]/pawnGroupMakers/li[1]/options</xpath>
-					<value>
-						<LizoGrenadier>10</LizoGrenadier>
-						<LizoGunner>20</LizoGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Normal fights, ranged only -->
-					<xpath>Defs/FactionDef[defName="FR_SquamataTribes"]/pawnGroupMakers/li[2]/options</xpath>
-					<value>
-						<LizoGrenadier>15</LizoGrenadier>
-						<LizoGunner>30</LizoGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!--Peaceful-->
-					<xpath>Defs/FactionDef[defName="FR_SquamataTribes"]/pawnGroupMakers/li[4]/options</xpath>
-					<value>
-						<LizoGrenadier>5</LizoGrenadier>
-						<LizoGunner>20</LizoGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!--Trader-->
-					<xpath>Defs/FactionDef[defName="FR_SquamataTribes"]/pawnGroupMakers/li[5]/guards</xpath>
-					<value>
-						<LizoGrenadier>7</LizoGrenadier>
-						<LizoGunner>20</LizoGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Settlement -->
-					<xpath>Defs/FactionDef[defName="FR_SquamataTribes"]/pawnGroupMakers/li[6]/options</xpath>
-					<value>
-						<LizoGrenadier>20</LizoGrenadier>
-						<LizoGunner>40</LizoGunner>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Forgotten Realms - Minotaur/Patch_Mino_Leather.xml b/Patches/Forgotten Realms - Minotaur/Patch_Mino_Leather.xml
deleted file mode 100644
index aa9b7b7803..0000000000
--- a/Patches/Forgotten Realms - Minotaur/Patch_Mino_Leather.xml	
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forgotten Realms - Minotaur</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Leather -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Minotaur"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.07</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Minotaur"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.056</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Forgotten Realms - Minotaur/Patch_Mino_Race.xml b/Patches/Forgotten Realms - Minotaur/Patch_Mino_Race.xml
deleted file mode 100644
index 75854e5003..0000000000
--- a/Patches/Forgotten Realms - Minotaur/Patch_Mino_Race.xml	
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forgotten Realms - Minotaur</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Minotaur"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Minotaur"]/statBases/Mass</xpath>
-					<value>
-						<Mass>75</Mass>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1.66</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<AimingAccuracy>0.66</AimingAccuracy>
-						<Suppressability>0.66</Suppressability>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>30</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Minotaur"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4.8</MoveSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Minotaur"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0.6</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Minotaur"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>1.75</baseHealthScale>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Minotaur"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.0</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.0</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Horn</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>3</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.33</chanceFactor>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FR_Alien_Minotaur"]</xpath>
-					<value>
-						<comps>
-							<li>
-								<compClass>CombatExtended.CompPawnGizmo</compClass>
-							</li>
-							<li Class="CombatExtended.CompProperties_Suppressable" />
-						</comps>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Forgotten Realms - Minotaur/Patch_PawnKinds_Mino.xml b/Patches/Forgotten Realms - Minotaur/Patch_PawnKinds_Mino.xml
deleted file mode 100644
index c56a36ba55..0000000000
--- a/Patches/Forgotten Realms - Minotaur/Patch_PawnKinds_Mino.xml	
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forgotten Realms - Minotaur</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Tribal -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="FR_MinotaurTribes_Peasant"]/combatPower</xpath>
-					<value>
-						<combatPower>25</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="FR_MinotaurTribes_Fighter"]/combatPower</xpath>
-					<value>
-						<combatPower>32</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="FR_MinotaurTribes_Warrior"]/combatPower</xpath>
-					<value>
-						<combatPower>40</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="FR_MinotaurTribes_Bowman"]/combatPower</xpath>
-					<value>
-						<combatPower>40</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="FR_MinotaurTribes_Champion" or defName="FR_MinotaurTribes_Chief"]/combatPower</xpath>
-					<value>
-						<combatPower>70</combatPower>
-					</value>
-				</li>
-
-				<!-- Hive_Archer -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FR_MinotaurTribes_Bowman"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>20</min>
-								<max>40</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>100</min>
-								<max>140</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.6</shieldChance>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>40</min>
-										<max>80</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Tribal</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- Hiver_Warrior -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FR_MinotaurTribes_Fighter" or defName="FR_MinotaurTribes_Warrior"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>100</min>
-								<max>200</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.75</shieldChance>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Forgotten Realms - Minotaur/PawnKinds_Minos.xml b/Patches/Forgotten Realms - Minotaur/PawnKinds_Minos.xml
deleted file mode 100644
index 797b33416b..0000000000
--- a/Patches/Forgotten Realms - Minotaur/PawnKinds_Minos.xml	
+++ /dev/null
@@ -1,198 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forgotten Realms - Minotaur</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ========== Tribals ========== -->
-
-						<PawnKindDef>
-							<defName>MinoGrenadier</defName>
-							<race>FR_Alien_Minotaur</race>
-							<label>kara boomer</label>
-							<combatPower>70</combatPower>
-							<defaultFactionType>FR_MinotaurTribes</defaultFactionType>
-							<backstoryCategories>
-								<li>Tribal</li>
-							</backstoryCategories>
-							<maxGenerationAge>60</maxGenerationAge>
-							<chemicalAddictionChance>0.05</chemicalAddictionChance>
-							<invNutrition>2.55</invNutrition>
-							<invFoodDef>Pemmican</invFoodDef>
-							<canBeSapper>true</canBeSapper>
-							<gearHealthRange>
-								<min>0.5</min>
-								<max>1.8</max>
-							</gearHealthRange>
-							<apparelMoney>
-								<min>180</min>
-								<max>350</max>
-							</apparelMoney>
-							<apparelRequired>
-								<li>Apparel_WarVeil</li>
-								<li>CE_Apparel_TribalBackpack</li>
-							</apparelRequired>
-							<apparelTags>
-								<li>Tribal</li>
-							</apparelTags>
-							<weaponMoney>
-								<min>60</min>
-								<max>400</max>
-							</weaponMoney>
-							<weaponTags>
-								<li>CE_GrenadeNeolithic</li>
-							</weaponTags>
-							<techHediffsMoney>
-								<min>50</min>
-								<max>800</max>
-							</techHediffsMoney>
-							<techHediffsTags>
-								<li>Poor</li>
-								<li>Simple</li>
-							</techHediffsTags>
-							<techHediffsChance>0.33</techHediffsChance>
-							<modExtensions>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>6</min>
-										<max>18</max>
-									</primaryMagazineCount>
-									<forcedSidearm>
-										<sidearmMoney>
-											<min>80</min>
-											<max>160</max>
-										</sidearmMoney>
-										<weaponTags>
-											<li>CE_Sidearm_Tribal</li>
-										</weaponTags>
-									</forcedSidearm>
-								</li>
-							</modExtensions>
-						</PawnKindDef>
-
-						<PawnKindDef>
-							<defName>MinoGunner</defName>
-							<race>FR_Alien_Minotaur</race>
-							<label>boga thunderer</label>
-							<combatPower>75</combatPower>
-							<defaultFactionType>FR_MinotaurTribes</defaultFactionType>
-							<backstoryCategories>
-								<li>Tribal</li>
-							</backstoryCategories>
-							<maxGenerationAge>60</maxGenerationAge>
-							<chemicalAddictionChance>0.05</chemicalAddictionChance>
-							<invNutrition>2.55</invNutrition>
-							<invFoodDef>Pemmican</invFoodDef>
-							<gearHealthRange>
-								<min>0.5</min>
-								<max>1.8</max>
-							</gearHealthRange>
-							<apparelMoney>
-								<min>180</min>
-								<max>350</max>
-							</apparelMoney>
-							<apparelTags>
-								<li>Tribal</li>
-							</apparelTags>
-							<apparelRequired>
-								<li>Apparel_WarMask</li>
-							</apparelRequired>
-							<weaponMoney>
-								<min>180</min>
-								<max>290</max>
-							</weaponMoney>
-							<weaponTags>
-								<li>Gun</li>
-							</weaponTags>
-							<techHediffsMoney>
-								<min>50</min>
-								<max>800</max>
-							</techHediffsMoney>
-							<techHediffsTags>
-								<li>Poor</li>
-								<li>Simple</li>
-							</techHediffsTags>
-							<techHediffsChance>0.20</techHediffsChance>
-							<modExtensions>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>4</max>
-									</primaryMagazineCount>
-									<shieldMoney>
-										<min>120</min>
-										<max>160</max>
-									</shieldMoney>
-									<shieldTags>
-										<li>TribalShield</li>
-									</shieldTags>
-									<shieldChance>0.8</shieldChance>
-									<sidearms>
-										<li>
-											<sidearmMoney>
-												<min>100</min>
-												<max>600</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_Sidearm_Tribal</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</modExtensions>
-						</PawnKindDef>
-					</value>
-				</li>
-
-				<!-- ========== Add tribal grenadies ========== -->
-
-				<li Class="PatchOperationAdd"><!-- Combat -->
-					<xpath>Defs/FactionDef[defName="FR_MinotaurTribes"]/pawnGroupMakers/li[1]/options</xpath>
-					<value>
-						<MinoGrenadier>10</MinoGrenadier>
-						<MinoGunner>20</MinoGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Normal fights, ranged only -->
-					<xpath>Defs/FactionDef[defName="FR_MinotaurTribes"]/pawnGroupMakers/li[2]/options</xpath>
-					<value>
-						<MinoGrenadier>15</MinoGrenadier>
-						<MinoGunner>30</MinoGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!--Peaceful-->
-					<xpath>Defs/FactionDef[defName="FR_MinotaurTribes"]/pawnGroupMakers/li[4]/options</xpath>
-					<value>
-						<MinoGrenadier>5</MinoGrenadier>
-						<MinoGunner>20</MinoGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!--Trader-->
-					<xpath>Defs/FactionDef[defName="FR_MinotaurTribes"]/pawnGroupMakers/li[5]/guards</xpath>
-					<value>
-						<MinoGrenadier>7</MinoGrenadier>
-						<MinoGunner>20</MinoGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Settlement -->
-					<xpath>Defs/FactionDef[defName="FR_MinotaurTribes"]/pawnGroupMakers/li[6]/options</xpath>
-					<value>
-						<MinoGrenadier>20</MinoGrenadier>
-						<MinoGunner>40</MinoGunner>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Forgotten Realms - Minotaur/Scenarios_Mino.xml b/Patches/Forgotten Realms - Minotaur/Scenarios_Mino.xml
deleted file mode 100644
index 147b763a97..0000000000
--- a/Patches/Forgotten Realms - Minotaur/Scenarios_Mino.xml	
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forgotten Realms - Minotaur</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Add ammo to scenario === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="FR_CrashlandedMinotaur"]/scenario/parts</xpath>
-
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_303British_FMJ</thingDef>
-							<count>100</count>
-						</li>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_44Magnum_FMJ</thingDef>
-							<count>60</count>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="FR_LostTribeMinotaur"]/scenario/parts</xpath>
-
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_Arrow_Stone</thingDef>
-							<count>100</count>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="FR_LostTribeMinotaur"]/scenario/parts/li[thingDef="Pila"]</xpath>
-
-					<value>
-						<count>20</count>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Forsakens/Forsakens_CE_Patch_Ammo_ForsakensArrows.xml b/Patches/Forsakens/Forsakens_CE_Patch_Ammo_ForsakensArrows.xml
deleted file mode 100644
index 19cc669a9d..0000000000
--- a/Patches/Forsakens/Forsakens_CE_Patch_Ammo_ForsakensArrows.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forsakens</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- There is only one type of Forsaken arrow, no subcategory for variants required -->
-
-						<!--==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_ForsakensArrows</defName>
-							<label>forsakens arrows</label>
-							<ammoTypes>
-								<Ammo_ForsakensArrows>Projectile_ForsakensArrows</Ammo_ForsakensArrows>
-								<Ammo_GreatArrow_Stone>Projectile_GreatArrow_StoneFO</Ammo_GreatArrow_Stone>
-								<Ammo_GreatArrow_Steel>Projectile_GreatArrow_SteelFO</Ammo_GreatArrow_Steel>
-								<Ammo_GreatArrow_Plasteel>Projectile_GreatArrow_PlasteelFO</Ammo_GreatArrow_Plasteel>
-								<Ammo_GreatArrow_Venom>Projectile_GreatArrow_VenomFO</Ammo_GreatArrow_Venom>
-								<Ammo_GreatArrow_Flame>Projectile_GreatArrow_Flame</Ammo_GreatArrow_Flame>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!--==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoGreatArrowBase">
-							<defName>Ammo_ForsakensArrows</defName>
-							<label>forsakens arrow</label>
-							<description>Heavy arrow designed to be fired from a forsaken bow.</description>
-							<graphicData>
-								<texPath>ThirdParty/Forsakens/FAmmoArrow</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<Mass>0.115</Mass>
-								<MarketValue>0.66</MarketValue>
-								<Flammability>0</Flammability>
-							</statBases>
-							<ammoClass>ForsakenArrow</ammoClass>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<!-- Workaround for conditionally-patched projectiles: use an existing abstract class from the generic ammo library (In this case, BaseGreatArrowProjectile) -->
-
-						<ThingDef ParentName="BaseGreatArrowProjectile">
-							<defName>Projectile_ForsakensArrows</defName>
-							<label>forsakens arrow</label>
-							<graphicData>
-								<texPath>Weapons/Bow/FArrow</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>5</armorPenetrationSharp>
-								<preExplosionSpawnChance>0.5</preExplosionSpawnChance>
-								<speed>39</speed>
-								<!-- 25 arrows per resource -->
-								<preExplosionSpawnThingDef>Ammo_ForsakensArrows</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGreatArrowProjectile">
-							<defName>Projectile_GreatArrow_StoneFO</defName>
-							<label>great arrow (stone)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Stone</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>26</speed>
-								<damageAmountBase>8</damageAmountBase>
-								<armorPenetrationBlunt>1.660</armorPenetrationBlunt>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<preExplosionSpawnChance>0.2</preExplosionSpawnChance><!-- 12.5 arrows per resource -->
-								<preExplosionSpawnThingDef>Ammo_GreatArrow_Stone</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGreatArrowProjectile">
-							<defName>Projectile_GreatArrow_SteelFO</defName>
-							<label>great arrow (steel)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>31</speed>
-								<damageAmountBase>10</damageAmountBase>
-								<armorPenetrationBlunt>2.340</armorPenetrationBlunt>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<preExplosionSpawnChance>0.6</preExplosionSpawnChance><!-- 25 arrows per resource -->
-								<preExplosionSpawnThingDef>Ammo_GreatArrow_Steel</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGreatArrowProjectile">
-							<defName>Projectile_GreatArrow_PlasteelFO</defName>
-							<label>great arrow (plasteel)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Plasteel</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>36</speed>
-								<damageAmountBase>9</damageAmountBase>
-								<armorPenetrationBlunt>2.140</armorPenetrationBlunt>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<preExplosionSpawnChance>0.75</preExplosionSpawnChance><!-- 40 arrows per resource -->
-								<preExplosionSpawnThingDef>Ammo_GreatArrow_Plasteel</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGreatArrowProjectile">
-							<defName>Projectile_GreatArrow_VenomFO</defName>
-							<label>great arrow (venom)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Venom</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>31</speed>
-								<damageDef>Arrow</damageDef>
-								<damageAmountBase>10</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>ArrowVenom</def>
-										<amount>2</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationBlunt>2.340</armorPenetrationBlunt>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<preExplosionSpawnChance>0.6</preExplosionSpawnChance><!-- 25 arrows per resource -->
-								<preExplosionSpawnThingDef>Ammo_GreatArrow_Steel</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>MakeAmmo_ForsakensArrows</defName>
-							<label>make forsakens arrows x10</label>
-							<description>Craft 10 forsakens arrows.</description>
-							<jobString>Making forsaken arrows.</jobString>
-							<workAmount>400</workAmount>
-							<ingredients>
-								<!-- Stats manually specified due to alien nature of ammo -->
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_ForsakensArrows>10</Ammo_ForsakensArrows>
-							</products>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Forsakens/Forsakens_CE_Patch_Ammo_ProjReskin.xml b/Patches/Forsakens/Forsakens_CE_Patch_Ammo_ProjReskin.xml
deleted file mode 100644
index a7076dfa37..0000000000
--- a/Patches/Forsakens/Forsakens_CE_Patch_Ammo_ProjReskin.xml
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forsakens</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Custom ammoset and projectile definitions for Forsaken ranged weapons, allowing them to use existing generic CE charged ammo while firing mod-unique projectiles -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ========== 8x35mm Charged cartridge for Forsaken Sniping Rifle ========== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_8x35mmCharged_ForsakenSniper</defName>
-							<label>8x35mm Charged</label>
-							<ammoTypes>
-								<Ammo_8x35mmCharged>Bullet_8x35mmCharged_ForsakenSniper</Ammo_8x35mmCharged>
-								<Ammo_8x35mmCharged_AP>Bullet_8x35mmCharged_AP_ForsakenSniper</Ammo_8x35mmCharged_AP>
-								<Ammo_8x35mmCharged_Ion>Bullet_8x35mmCharged_Ion_ForsakenSniper</Ammo_8x35mmCharged_Ion>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef ParentName="Base8x35mmChargedBullet">
-							<defName>Bullet_8x35mmCharged_ForsakenSniper</defName>
-							<label>8x35mm Charged bullet</label>
-							<graphicData>
-								<texPath>Weapons/Sniper/SnipPulse</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>19</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>6</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>16</armorPenetrationSharp>
-								<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base8x35mmChargedBullet">
-							<defName>Bullet_8x35mmCharged_AP_ForsakenSniper</defName>
-							<label>8x35mm Charged bullet</label>
-							<graphicData>
-								<texPath>Weapons/Sniper/SnipPulse</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>15</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>2</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-								<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base8x35mmChargedBullet">
-							<defName>Bullet_8x35mmCharged_Ion_ForsakenSniper</defName>
-							<label>8x35mm Charged bullet</label>
-							<graphicData>
-								<texPath>Weapons/Sniper/SnipPulse</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>15</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>9</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>22.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
-								<empShieldBreakChance>0.2</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-
-						<!-- ========== 12 Gauge Charged shotgun cartridge for Forsaken ShotGun ========== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_12GaugeCharged_ForsakenShotGun</defName>
-							<label>12 Gauge Charged</label>
-							<ammoTypes>
-								<Ammo_12GaugeCharged>Bullet_12GaugeCharged_ForsakenShotGun</Ammo_12GaugeCharged>
-								<Ammo_12GaugeCharged_Slug>Bullet_12GaugeCharged_Slug_ForsakenShotGun</Ammo_12GaugeCharged_Slug>
-								<Ammo_12GaugeCharged_Ion>Bullet_12GaugeCharged_Ion_ForsakenShotGun</Ammo_12GaugeCharged_Ion>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef ParentName="Base12GaugeChargedBullet">
-							<defName>Bullet_12GaugeCharged_ForsakenShotGun</defName>
-							<label>charge shot pellet</label>
-							<graphicData>
-								<texPath>Weapons/Shotgun/ShotPulse</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-								<drawSize>0.5,0.5</drawSize>
-							</graphicData>
-							<!-- Original mod implemented the shotgun blast as a slug  -->
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>15</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>5</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>24.4</armorPenetrationBlunt>
-								<pelletCount>4</pelletCount>
-								<spreadMult>17.8</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base12GaugeChargedBullet">
-							<defName>Bullet_12GaugeCharged_Slug_ForsakenShotGun</defName>
-							<label>charge shot (Slug)</label>
-							<graphicData>
-								<texPath>Weapons/Shotgun/ShotPulse</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>25</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>13</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<armorPenetrationBlunt>90</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base12GaugeChargedBullet">
-							<defName>Bullet_12GaugeCharged_Ion_ForsakenShotGun</defName>
-							<label>charge shot (Ion slug)</label>
-							<graphicData>
-								<texPath>Weapons/Shotgun/ShotPulse</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>10</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>6</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
-								<pelletCount>4</pelletCount>
-								<spreadMult>17.8</spreadMult>
-								<empShieldBreakChance>0.025</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-
-						<!-- ========== 5x35mm Charged cartridge for Forsaken Assault Rifle ========== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_5x35mmCharged_ForsakenAR</defName>
-							<label>5x35mm Charged</label>
-							<ammoTypes>
-								<Ammo_5x35mmCharged>Bullet_5x35mmCharged_ForsakenAR</Ammo_5x35mmCharged>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- Workaround for conditionally-patched projectiles: use an existing abstract class from the generic ammo library (In this case, Base8x35mmChargedBullet) -->
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base8x35mmChargedBullet">
-							<defName>Bullet_5x35mmCharged_ForsakenAR</defName>
-							<label>5x35mm Charged bullet</label>
-							<graphicData>
-								<texPath>Weapons/AssaultRifle/SmolPulse</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>13</damageAmountBase>
-								<speed>200</speed>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>2</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-								<armorPenetrationBlunt>40</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Forsakens/Forsakens_CE_Patch_ApparelDefs.xml b/Patches/Forsakens/Forsakens_CE_Patch_ApparelDefs.xml
deleted file mode 100644
index 9654609821..0000000000
--- a/Patches/Forsakens/Forsakens_CE_Patch_ApparelDefs.xml
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forsakens</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Forsaken Hood and Cloak ========== -->
-
-				<!-- Note: Forsaken fabric apparel are only craftable from Synthread -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Forsaken_Hood"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Forsaken_Cloak"]/statBases</xpath>
-					<value>
-						<Bulk>7.5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Forsaken_Hood" or
-						defName="Forsaken_Cloak"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<!-- Equvalent to vanilla Synthread duster at normal quality -->
-						<ArmorRating_Sharp>1.25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Forsaken_Hood" or
-						defName="Forsaken_Cloak"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<!-- Equvalent to vanilla Synthread duster at normal quality -->
-						<ArmorRating_Blunt>0.35</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ========== Forsaken Helmet ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="FF_ForsakenH"]/statBases</xpath>
-					<value>
-						<!-- No night vision stats as Forsakens already have night vision >:( -->
-						<Bulk>6</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FF_ForsakenH"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<!-- Equvalent to vanilla Power armor helmet at normal quality -->
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FF_ForsakenH"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<!-- Equvalent to vanilla Power armor helmet at normal quality -->
-						<ArmorRating_Blunt>36</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="FF_ForsakenH"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="FF_ForsakenH"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="FF_ForsakenH"]/equippedStatOffsets</xpath>
-					<value>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="FF_ForsakenH"]/statBases</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FF_ForsakenH"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>250</MaxHitPoints>
-					</value>
-				</li>
-
-				<!-- ========== Forsaken Armor ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="FF_ForsakenA"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="FF_ForsakenA"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>20</CarryBulk>
-						<CarryWeight>80</CarryWeight>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FF_ForsakenA"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<!-- Equvalent to vanilla Power armor at normal quality -->
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FF_ForsakenA"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<!-- Equvalent to vanilla Power armor at normal quality -->
-						<ArmorRating_Blunt>45</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FF_ForsakenA"]/statBases/Mass</xpath>
-					<value>
-						<Mass>40</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FF_ForsakenA"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-				<!-- ========== Ultima Plant ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Ultima"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<!-- Equvalent to vanilla Power armor at normal quality -->
-						<StuffPower_Armor_Sharp>0.2</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Ultima"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<!-- Equvalent to vanilla Power armor at normal quality -->
-						<StuffPower_Armor_Blunt>0.18</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Ultima"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<!-- Equvalent to vanilla Power armor at normal quality -->
-						<StuffPower_Armor_Heat>0.08</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Forsakens/Forsakens_CE_Patch_Drugs.xml b/Patches/Forsakens/Forsakens_CE_Patch_Drugs.xml
deleted file mode 100644
index b87bc245fa..0000000000
--- a/Patches/Forsakens/Forsakens_CE_Patch_Drugs.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forsakens</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Patch item bulk ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="FF_Razor" or
-						defName="FF_Vitaminf"
-						]/statBases </xpath>
-					<value>
-						<!-- Equivalent to vanilla pill drugs -->
-						<Bulk>0.01</Bulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Forsakens/Forsakens_CE_Patch_PawnKinds_Forsaken.xml b/Patches/Forsakens/Forsakens_CE_Patch_PawnKinds_Forsaken.xml
deleted file mode 100644
index ade0700aeb..0000000000
--- a/Patches/Forsakens/Forsakens_CE_Patch_PawnKinds_Forsaken.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forsakens</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Reduce meals and medicine carried by all pawns ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[@Name="ForsakenBase"]/invNutrition</xpath>
-					<value>
-						<invNutrition>1</invNutrition>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[@Name="ForsakenBase"]/inventoryOptions/subOptionsChooseOne</xpath>
-					<value>
-						<subOptionsChooseOne>
-							<li>
-								<thingDef>Silver</thingDef>
-								<countRange>
-									<min>180</min>
-									<max>400</max>
-								</countRange>
-							</li>
-							<li>
-								<thingDef>MedicineIndustrial</thingDef>
-								<countRange>
-									<min>0</min>
-									<max>1</max>
-								</countRange>
-							</li>
-						</subOptionsChooseOne>
-					</value>
-				</li>
-
-				<!-- ========== Remove smokepop belt ========== -->
-
-				<!-- <li Class="PatchOperationRemove">
-					<xpath>Defs/PawnKindDef[
-					defName="ForsakenGunner" or
-					defName="KingOfTheLostOnes" or
-					defName="Town_GuardF" or
-					defName="Town_TraderF"
-				]/apparelTags/li[.="BeltDefensePop"]</xpath>
-				</li> -->
-
-				<!-- ========== Forsaken faction pawns should spawn backpacks, allowing them to carry their inventory ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[
-						defName="Town_GuardF" or
-						defName="VillagerF" or
-						defName="ForsakenGunner" or
-						defName="Town_TraderF"
-						] </xpath>
-					<value>
-						<apparelRequired>
-							<li>CE_Apparel_Backpack</li>
-						</apparelRequired>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[
-						defName="ForsakenSniper" or
-						defName="ForsakenSlasher" or
-						defName="KingOfTheLostOnes"
-						]/apparelRequired </xpath>
-					<value>
-						<li>CE_Apparel_Backpack</li>
-					</value>
-				</li>
-
-				<!-- ========== Forsaken faction pawns should spawn with ammo appropriate to their primary weapon ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="ForsakenSniper" or
-						defName="ForsakenSlasher" or
-						defName="ForsakenGunner" or
-						defName="KingOfTheLostOnes" or
-						defName="Town_GuardF" or
-						defName="VillagerF" or
-						defName="Town_TraderF"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Forsakens/Forsakens_CE_Patch_Race_Forsaken.xml b/Patches/Forsakens/Forsakens_CE_Patch_Race_Forsaken.xml
deleted file mode 100644
index 94ed53150e..0000000000
--- a/Patches/Forsakens/Forsakens_CE_Patch_Race_Forsaken.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forsakens</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Forsaken"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Forsaken"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency>0.66</NightVisionEfficiency>
-						<AimingAccuracy>1</AimingAccuracy>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<ReloadSpeed>1</ReloadSpeed>
-						<Suppressability>1</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Forsaken"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Forsaken"][not(comp)]</xpath>
-					<value>
-						<comps />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Forsaken"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Forsakens/Forsakens_CE_Patch_Race_Nightling.xml b/Patches/Forsakens/Forsakens_CE_Patch_Race_Nightling.xml
deleted file mode 100644
index f12ace7fe8..0000000000
--- a/Patches/Forsakens/Forsakens_CE_Patch_Race_Nightling.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forsakens</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="NightlingF"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="NightlingF"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency>0.75</NightVisionEfficiency>
-						<MeleeDodgeChance>0.69</MeleeDodgeChance>
-						<MeleeCritChance>0.33</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="NightlingF"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.900</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.900</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>razorfangs</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.46</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<chanceFactor>2</chanceFactor>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.063</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>3.2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.225</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Forsakens/Forsakens_CE_Patch_Scenario.xml b/Patches/Forsakens/Forsakens_CE_Patch_Scenario.xml
deleted file mode 100644
index 55295199a7..0000000000
--- a/Patches/Forsakens/Forsakens_CE_Patch_Scenario.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forsakens</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="ForsakenCrashlanded"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_ForsakensArrows</thingDef>
-							<count>500</count>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Forsakens/Forsakens_CE_Patch_ThingDefs_Weapons.xml b/Patches/Forsakens/Forsakens_CE_Patch_ThingDefs_Weapons.xml
deleted file mode 100644
index b5a930266a..0000000000
--- a/Patches/Forsakens/Forsakens_CE_Patch_ThingDefs_Weapons.xml
+++ /dev/null
@@ -1,557 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forsakens</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Forsaken Sniping Rifle ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ForsakenSniper</defName>
-					<statBases>
-						<Mass>7.18</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.80</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1.6</SwayFactor>
-						<Bulk>12.60</Bulk>
-						<WorkToMake>50500</WorkToMake>
-					</statBases>
-					<costList>
-						<!-- from original mod -->
-						<Steel>200</Steel>
-						<Plasteel>75</Plasteel>
-						<ComponentIndustrial>12</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8x35mmCharged_ForsakenSniper</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>86</range>
-						<soundCast>Shot_SniperRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_8x35mmCharged_ForsakenSniper</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>ForsakenSniper</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Forsaken ShotGun ========== -->
-
-				<!-- (CE implementation based on UTS-15 shotgun from RN Weapons, chambered for 12 Gauge Charged shotgun cartridge) -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ForsakenShotGun</defName>
-					<statBases>
-						<Mass>3.10</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.03</SwayFactor>
-						<Bulk>7.20</Bulk>
-						<WorkToMake>54500</WorkToMake>
-					</statBases>
-					<costList>
-						<!-- from original mod -->
-						<Steel>200</Steel>
-						<Plasteel>120</Plasteel>
-						<ComponentIndustrial>14</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12GaugeCharged_ForsakenShotGun</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>18</range>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<!-- Reduced magazine size -->
-						<magazineSize>8</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_12GaugeCharged_ForsakenShotGun</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>ForsakenGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Forsaken Assault Rifle ========== -->
-
-				<!-- (CE implementation based on M16A1 assault rifle from RN Weapons, chambered for 5x35mm Charged cartridge) -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ForsakenAR</defName>
-					<statBases>
-						<Mass>3</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.1</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>10.03</Bulk>
-						<WorkToMake>60500</WorkToMake>
-					</statBases>
-					<costList>
-						<!-- from original mod -->
-						<Steel>200</Steel>
-						<Plasteel>100</Plasteel>
-						<ComponentIndustrial>12</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.29</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_5x35mmCharged_ForsakenAR</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<burstShotCount>8</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>1</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>40</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_5x35mmCharged_ForsakenAR</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>4</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>ForsakenGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="ForsakenSniper" or
-						defName="ForsakenShotGun" or
-						defName="ForsakenAR"
-						]/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>
-				</li>
-
-				<!-- ========== Forsaken Long Blade ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ForsakenLongBlade"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<chanceFactor>0.33</chanceFactor>
-								<cooldownTime>1.52</cooldownTime>
-								<armorPenetrationBlunt>0.500</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1</cooldownTime>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>34</power>
-								<cooldownTime>0.88</cooldownTime>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ForsakenLongBlade"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ForsakenLongBlade"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.6</MeleeCritChance>
-							<MeleeParryChance>1.0</MeleeParryChance>
-							<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- ========== Forsaken Combat Blade ========== -->
-
-				<!-- (CE implementation based on vanilla CE knife with armor penetration of CE Melee Wraithblade) -->
-				<!--<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ForsakenCombatBlade"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.18</cooldownTime>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.26</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>6.250</armorPenetrationBlunt>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ForsakenCombatBlade"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ForsakenCombatBlade"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.5</MeleeCritChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-							<MeleeDodgeChance>0.05</MeleeDodgeChance>	
-						</equippedStatOffsets>
-					</value>
-				</li> -->
-
-				<!-- ========== Forsaken Battle Axe ========== -->
-
-				<!-- (CE implementation based on Vanilla Weapons Expanded Battle Axe) -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ForsakenBattle"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.35</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>45</power>
-								<cooldownTime>2.2</cooldownTime>
-								<chanceFactor>1.165</chanceFactor>
-								<armorPenetrationBlunt>25.4</armorPenetrationBlunt>
-								<armorPenetrationSharp>16</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ForsakenBattle"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<MeleeCounterParryBonus>1.08</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ForsakenBattle"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.33</MeleeCritChance>
-							<MeleeParryChance>1.2</MeleeParryChance>
-							<MeleeDodgeChance>0.6</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- ========== Forsaken Bulk Sword ========== -->
-
-				<!-- (Weaker than vanilla CE longsword, but low cooldown time) -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ForsakenBulksword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>0.5</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>0.6</cooldownTime>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<armorPenetrationSharp>14</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>0.6</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>2.592</armorPenetrationBlunt>
-								<armorPenetrationSharp>7</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ForsakenBulksword"]/statBases</xpath>
-					<value>
-						<!-- Slightly bulkier than vanilla CE longsword -->
-						<Bulk>9</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ForsakenBulksword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.63</MeleeCritChance>
-							<MeleeParryChance>0.75</MeleeParryChance>
-							<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- ========== Forsaken Spear ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FSpear"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.35</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.78</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.18</cooldownTime>
-								<chanceFactor>1.00</chanceFactor>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="FSpear"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="FSpear"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.17</MeleeCritChance>
-							<MeleeParryChance>1.45</MeleeParryChance>
-							<MeleeDodgeChance>0.9</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- ========== Forsaken Bow ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>FBow</defName>
-					<statBases>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.75</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>4.00</Bulk>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>100</Steel>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_ForsakensArrows</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>26</range>
-						<soundCast>Bow_Large</soundCast>
-					</Properties>
-					<AmmoUser>
-						<ammoSet>AmmoSet_ForsakensArrows</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<researchPrerequisite>RecurveBow</researchPrerequisite>
-					<AllowWithRunAndGun>true</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FBow"]/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>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Forsakens/Forsakens_CE_Patch_ThingDefs_Weapons_BlackHydra.xml b/Patches/Forsakens/Forsakens_CE_Patch_ThingDefs_Weapons_BlackHydra.xml
deleted file mode 100644
index cfb05869aa..0000000000
--- a/Patches/Forsakens/Forsakens_CE_Patch_ThingDefs_Weapons_BlackHydra.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forsakens</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Forsaken Black Hydra ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ForsakenHydra</defName>
-					<statBases>
-						<Mass>10.00</Mass>
-						<RangedWeapon_Cooldown>1.20</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>13.00</Bulk>
-						<WorkToMake>80000</WorkToMake>
-					</statBases>
-					<costList>
-						<Silver>100</Silver>
-						<Plasteel>100</Plasteel>
-						<ComponentSpacer>6</ComponentSpacer>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_HydraBlast</defaultProjectile>
-						<warmupTime>3</warmupTime>
-						<ai_AvoidFriendlyFireRadius>4</ai_AvoidFriendlyFireRadius>
-						<range>62</range>
-						<soundCast>ChargeLance_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>false</onlyManualCast>
-						<muzzleFlashScale>1</muzzleFlashScale>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>6</reloadTime>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>ForsakenGun</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ForsakenHydra"]</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>
-				</li>
-
-				<!-- Patch Hydra Blast projectile to be CE compatible, with armor penetration and blast damage stats similar to vanilla CE M6 HEAT rockets
-				
-				Note that the lightning strike effect has been removed, as the Forsaken.Linking Class required is incompatible with CombatExtended.AmmoDef -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_HydraBlast"]</xpath>
-					<value>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base8x35mmChargedBullet">
-							<defName>Bullet_HydraBlast</defName>
-							<label>Hydra Blast</label>
-							<graphicData>
-								<texPath>Weapons/BigPulse</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>50</damageAmountBase>
-								<armorPenetrationSharp>76</armorPenetrationSharp>
-								<armorPenetrationBlunt>42.273</armorPenetrationBlunt>
-								<speed>90</speed>
-								<ai_IsIncendiary>true</ai_IsIncendiary>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>120</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>3</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-									<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
-									<preExplosionSpawnChance>0.5</preExplosionSpawnChance>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Fort's Firefighter Gadget/Apparel_Industrial.xml b/Patches/Fort's Firefighter Gadget/Apparel_Industrial.xml
deleted file mode 100644
index c27a6c2f31..0000000000
--- a/Patches/Fort's Firefighter Gadget/Apparel_Industrial.xml	
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Fort's Firefighter gadget</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Firefighter Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="Apparel_FirefighterHelmetA" or
-						defName="Apparel_FirefighterHelmetB" or
-						defName="Apparel_FirefighterHelmetC" or
-						defName="Apparel_FirefighterHelmetG"
-						]/statBases </xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Apparel_FirefighterHelmetA" or
-						defName="Apparel_FirefighterHelmetB" or
-						defName="Apparel_FirefighterHelmetC" or
-						defName="Apparel_FirefighterHelmetG"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.8</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="Apparel_FirefighterHelmetA" or
-						defName="Apparel_FirefighterHelmetB" or
-						defName="Apparel_FirefighterHelmetC" or
-						defName="Apparel_FirefighterHelmetG"
-						]/statBases </xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[
-						defName="Apparel_FirefighterHelmetA" or
-						defName="Apparel_FirefighterHelmetB" or
-						defName="Apparel_FirefighterHelmetC" or
-						defName="Apparel_FirefighterHelmetG"]/apparel/immuneToToxGasExposure </xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[
-							defName="Apparel_FirefighterHelmetA" or
-							defName="Apparel_FirefighterHelmetB" or
-							defName="Apparel_FirefighterHelmetC" or
-							defName="Apparel_FirefighterHelmetG"]/apparel </xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="Apparel_FirefighterHelmetA" or
-						defName="Apparel_FirefighterHelmetB" or
-						defName="Apparel_FirefighterHelmetC" or
-						defName="Apparel_FirefighterHelmetG"
-						]/equippedStatOffsets </xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[
-						defName="Apparel_FirefighterHelmetA" or
-						defName="Apparel_FirefighterHelmetB" or
-						defName="Apparel_FirefighterHelmetC" or
-						defName="Apparel_FirefighterHelmetG"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.50</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-										<li>Jaw</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.50</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-										<li>Jaw</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Firefighter Jacket === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="Apparel_Firefighter_A" or
-						defName="Apparel_Firefighter_B" or
-						defName="Apparel_Firefighter_R"
-						]/statBases </xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>7.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Apparel_Firefighter_A" or
-						defName="Apparel_Firefighter_B" or
-						defName="Apparel_Firefighter_R"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Apparel_Firefighter_A" or
-						defName="Apparel_Firefighter_B" or
-						defName="Apparel_Firefighter_R"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Apparel_Firefighter_A" or
-						defName="Apparel_Firefighter_B" or
-						defName="Apparel_Firefighter_R"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>2.25</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Fort's Firefighter Gadget/Industrial_Melee.xml b/Patches/Fort's Firefighter Gadget/Industrial_Melee.xml
deleted file mode 100644
index 03c7314778..0000000000
--- a/Patches/Fort's Firefighter Gadget/Industrial_Melee.xml	
+++ /dev/null
@@ -1,353 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Fort's Firefighter gadget</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Bolt Cutters -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Boltcutter"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.32</cooldownTime>
-								<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-								<armorPenetrationSharp>5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>2.81</cooldownTime>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Boltcutter"]/statBases</xpath>
-					<value>
-						<Bulk>5.25</Bulk>
-						<MeleeCounterParryBonus>0.34</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Boltcutter"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.40</MeleeCritChance>
-						<MeleeParryChance>0.16</MeleeParryChance>
-						<MeleeDodgeChance>0.21</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<!-- Crowbar -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Crowbar"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.32</cooldownTime>
-								<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>0.63</cooldownTime>
-								<armorPenetrationBlunt>5.625</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>prying</label>
-								<capacities>
-									<li>Demolish</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.63</cooldownTime>
-								<armorPenetrationBlunt>5.625</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Crowbar"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Crowbar"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.42</MeleeCritChance>
-							<MeleeParryChance>0.24</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Halligan Bar -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Halligan_Bar"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>pick</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.68</cooldownTime>
-								<armorPenetrationBlunt>2.34</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.34</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.63</cooldownTime>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>prying</label>
-								<capacities>
-									<li>Demolish</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.43</cooldownTime>
-								<armorPenetrationBlunt>2.625</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Halligan_Bar"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>0.40</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Halligan_Bar"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.22</MeleeCritChance>
-						<MeleeParryChance>0.30</MeleeParryChance>
-						<MeleeDodgeChance>0.30</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<!-- Fire Axe -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_FireAxe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.3</cooldownTime>
-								<armorPenetrationBlunt>3.263</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>pick</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.96</cooldownTime>
-								<armorPenetrationBlunt>13.05</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.31</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>41</power>
-								<cooldownTime>2.41</cooldownTime>
-								<armorPenetrationBlunt>13.05</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.16</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_FireAxe"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.28</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_FireAxe"]/statBases/Mass</xpath>
-					<value>
-						<Mass>2.9</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_FireAxe"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.11</MeleeCritChance>
-							<MeleeParryChance>0.28</MeleeParryChance>
-							<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Sledgehammer -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Sledgehammer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.87</cooldownTime>
-								<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Demolish</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>2.43</cooldownTime>
-								<armorPenetrationBlunt>10.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Sledgehammer"]/statBases</xpath>
-					<value>
-						<Bulk>7</Bulk>
-						<MeleeCounterParryBonus>0.38</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Sledgehammer"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.2</MeleeCritChance>
-							<MeleeParryChance>0.5</MeleeParryChance>
-							<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Hydraulic Rescue Tool -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_HydraulicRescueTool"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>body</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>3.33</cooldownTime>
-								<armorPenetrationBlunt>3.2</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.33</cooldownTime>
-								<armorPenetrationBlunt>3.45</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.23</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>cut and spread</label>
-								<capacities>
-									<li>Demolish</li>
-								</capacities>
-								<power>50</power>
-								<cooldownTime>3.63</cooldownTime>
-								<armorPenetrationBlunt>8.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_HydraulicRescueTool"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<MeleeCounterParryBonus>0.38</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_HydraulicRescueTool"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>1.2</MeleeCritChance>
-						<MeleeParryChance>0.5</MeleeParryChance>
-						<MeleeDodgeChance>0.3</MeleeDodgeChance>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Frontline Collection/Frontline - Additional Guns For Bunkers/FrontlineAdditionalGunsForBunkers_GA_TRLMGII.xml b/Patches/Frontline Collection/Frontline - Additional Guns For Bunkers/FrontlineAdditionalGunsForBunkers_GA_TRLMGII.xml
deleted file mode 100644
index 7796d3e26c..0000000000
--- a/Patches/Frontline Collection/Frontline - Additional Guns For Bunkers/FrontlineAdditionalGunsForBunkers_GA_TRLMGII.xml	
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Frontline - Additional Guns for Bunkers (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BK_Base_LMGII"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="BK_Base_LMGII"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="BK_Base_LMGII"]/tradeTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="BK_Base_LMGII"]</xpath>
-						<value>
-							<tradeTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BK_Base_LMGII"]/tradeTags</xpath>
-					<value>
-						<li>CE_Turret</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BK_Gun_LMGII</defName>
-					<statBases>
-						<MarketValue>800</MarketValue>
-						<RangedWeapon_Cooldown>3</RangedWeapon_Cooldown>
-						<Mass>20</Mass>
-						<Bulk>10.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.7</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
-						<warmupTime>3</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
-						<burstShotCount>6</burstShotCount>
-						<soundCast>BK_LMGII_Fire</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>20</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_303British</ammoSet>
-					</AmmoUser>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Frontline Collection/Frontline - Additional Guns For Bunkers/FrontlineAdditionalGunsForBunkers_HA_TRMMGII.xml b/Patches/Frontline Collection/Frontline - Additional Guns For Bunkers/FrontlineAdditionalGunsForBunkers_HA_TRMMGII.xml
deleted file mode 100644
index 0e5f3ffe6c..0000000000
--- a/Patches/Frontline Collection/Frontline - Additional Guns For Bunkers/FrontlineAdditionalGunsForBunkers_HA_TRMMGII.xml	
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Frontline - Additional Guns for Bunkers (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BK_Base_MMGII"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="BK_Base_MMGII"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="BK_Base_MMGII"]/tradeTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="BK_Base_MMGII"]</xpath>
-						<value>
-							<tradeTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BK_Base_MMGII"]/tradeTags</xpath>
-					<value>
-						<li>CE_Turret</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BK_Gun_MMGII</defName>
-					<statBases>
-						<MarketValue>800</MarketValue>
-						<RangedWeapon_Cooldown>3</RangedWeapon_Cooldown>
-						<Mass>20</Mass>
-						<Bulk>10.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.3</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>3</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>6</burstShotCount>
-						<soundCast>BK_MMGII_Fire</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>20</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Frontline Collection/Frontline - Additional Guns For Bunkers/FrontlineAdditionalGunsForBunkers_IA_TRHMGII.xml b/Patches/Frontline Collection/Frontline - Additional Guns For Bunkers/FrontlineAdditionalGunsForBunkers_IA_TRHMGII.xml
deleted file mode 100644
index b268c65284..0000000000
--- a/Patches/Frontline Collection/Frontline - Additional Guns For Bunkers/FrontlineAdditionalGunsForBunkers_IA_TRHMGII.xml	
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Frontline - Additional Guns for Bunkers (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BK_Base_HMGII"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="BK_Base_HMGII"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="BK_Base_HMGII"]/tradeTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="BK_Base_HMGII"]</xpath>
-						<value>
-							<tradeTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BK_Base_HMGII"]/tradeTags</xpath>
-					<value>
-						<li>CE_Turret</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BK_Gun_HMGII</defName>
-					<statBases>
-						<MarketValue>800</MarketValue>
-						<RangedWeapon_Cooldown>3</RangedWeapon_Cooldown>
-						<Mass>20</Mass>
-						<Bulk>10.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>3</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>BK_HMGII_Fire</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>20</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Frontline Collection/Frontline - Additional Guns For Trenches/FrontlineAdditionalGunsForTrenches_GA_TRLMGII.xml b/Patches/Frontline Collection/Frontline - Additional Guns For Trenches/FrontlineAdditionalGunsForTrenches_GA_TRLMGII.xml
deleted file mode 100644
index 57a4b83e37..0000000000
--- a/Patches/Frontline Collection/Frontline - Additional Guns For Trenches/FrontlineAdditionalGunsForTrenches_GA_TRLMGII.xml	
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Frontline - Additional Guns for Trenches (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TR_Base_LMGII" or defName="TR_Base_LMGIISB"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="TR_Base_LMGII" or defName="TR_Base_LMGIISB"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="TR_Base_LMGII" or defName="TR_Base_LMGIISB"]/tradeTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="TR_Base_LMGII" or defName="TR_Base_LMGIISB"]</xpath>
-						<value>
-							<tradeTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TR_Base_LMGII" or defName="TR_Base_LMGIISB"]/tradeTags</xpath>
-					<value>
-						<li>CE_Turret</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>TR_Gun_LMGII</defName>
-					<statBases>
-						<MarketValue>800</MarketValue>
-						<RangedWeapon_Cooldown>3</RangedWeapon_Cooldown>
-						<Mass>20</Mass>
-						<Bulk>10.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.7</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
-						<warmupTime>3</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
-						<burstShotCount>6</burstShotCount>
-						<soundCast>TR_LMGII_Fire</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>20</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_303British</ammoSet>
-					</AmmoUser>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Frontline Collection/Frontline - Additional Guns For Trenches/FrontlineAdditionalGunsForTrenches_HA_TRMMGII.xml b/Patches/Frontline Collection/Frontline - Additional Guns For Trenches/FrontlineAdditionalGunsForTrenches_HA_TRMMGII.xml
deleted file mode 100644
index 0435d4ed9f..0000000000
--- a/Patches/Frontline Collection/Frontline - Additional Guns For Trenches/FrontlineAdditionalGunsForTrenches_HA_TRMMGII.xml	
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Frontline - Additional Guns for Trenches (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TR_Base_MMGII" or defName="TR_Base_MMGIISB"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="TR_Base_MMGII" or defName="TR_Base_MMGIISB"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="TR_Base_MMGII" or defName="TR_Base_MMGIISB"]/tradeTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="TR_Base_MMGII" or defName="TR_Base_MMGIISB"]</xpath>
-						<value>
-							<tradeTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TR_Base_MMGII" or defName="TR_Base_MMGIISB"]/tradeTags</xpath>
-					<value>
-						<li>CE_Turret</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>TR_Gun_MMGII</defName>
-					<statBases>
-						<MarketValue>800</MarketValue>
-						<RangedWeapon_Cooldown>3</RangedWeapon_Cooldown>
-						<Mass>20</Mass>
-						<Bulk>10.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.3</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>3</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>6</burstShotCount>
-						<soundCast>TR_MMGII_Fire</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>20</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Frontline Collection/Frontline - Additional Guns For Trenches/FrontlineAdditionalGunsForTrenches_IA_TRHMGII.xml b/Patches/Frontline Collection/Frontline - Additional Guns For Trenches/FrontlineAdditionalGunsForTrenches_IA_TRHMGII.xml
deleted file mode 100644
index 058abb9cb3..0000000000
--- a/Patches/Frontline Collection/Frontline - Additional Guns For Trenches/FrontlineAdditionalGunsForTrenches_IA_TRHMGII.xml	
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Frontline - Additional Guns for Trenches (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TR_Base_HMGII" or defName="TR_Base_HMGIISB"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="TR_Base_HMGII" or defName="TR_Base_HMGIISB"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="TR_Base_HMGII" or defName="TR_Base_HMGIISB"]/tradeTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="TR_Base_HMGII" or defName="TR_Base_HMGIISB"]</xpath>
-						<value>
-							<tradeTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TR_Base_HMGII" or defName="TR_Base_HMGIISB"]/tradeTags</xpath>
-					<value>
-						<li>CE_Turret</li>
-					</value>
-				</li>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>TR_Gun_HMGII</defName>
-					<statBases>
-						<MarketValue>800</MarketValue>
-						<RangedWeapon_Cooldown>3</RangedWeapon_Cooldown>
-						<Mass>20</Mass>
-						<Bulk>10.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>3</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>TR_HMGII_Fire</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>20</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Frontline Collection/Frontline - Bunkers/FrontlineBunkers_G_TRLMG.xml b/Patches/Frontline Collection/Frontline - Bunkers/FrontlineBunkers_G_TRLMG.xml
deleted file mode 100644
index a539448096..0000000000
--- a/Patches/Frontline Collection/Frontline - Bunkers/FrontlineBunkers_G_TRLMG.xml	
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Frontline - Bunkers (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BK_Base_LMG"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="BK_Base_LMG"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="BK_Base_LMG"]/tradeTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="BK_Base_LMG"]</xpath>
-						<value>
-							<tradeTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BK_Base_LMG"]/tradeTags</xpath>
-					<value>
-						<li>CE_Turret</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BK_Gun_LMG</defName>
-					<statBases>
-						<MarketValue>800</MarketValue>
-						<RangedWeapon_Cooldown>4</RangedWeapon_Cooldown>
-						<Mass>20</Mass>
-						<Bulk>10.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.7</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>3</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
-						<burstShotCount>12</burstShotCount>
-						<soundCast>BK_LMG_Fire</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>20</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Frontline Collection/Frontline - Bunkers/FrontlineBunkers_H_TRMMG.xml b/Patches/Frontline Collection/Frontline - Bunkers/FrontlineBunkers_H_TRMMG.xml
deleted file mode 100644
index 1986c28539..0000000000
--- a/Patches/Frontline Collection/Frontline - Bunkers/FrontlineBunkers_H_TRMMG.xml	
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Frontline - Bunkers (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BK_Base_MMG"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="BK_Base_MMG"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="BK_Base_MMG"]/tradeTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="BK_Base_MMG"]</xpath>
-						<value>
-							<tradeTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BK_Base_MMG"]/tradeTags</xpath>
-					<value>
-						<li>CE_Turret</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BK_Gun_MMG</defName>
-					<statBases>
-						<MarketValue>800</MarketValue>
-						<RangedWeapon_Cooldown>4</RangedWeapon_Cooldown>
-						<Mass>14</Mass>
-						<Bulk>10.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.3</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>3</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>12</burstShotCount>
-						<soundCast>BK_MMG_Fire</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>20</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Frontline Collection/Frontline - Bunkers/FrontlineBunkers_I_TRHMG.xml b/Patches/Frontline Collection/Frontline - Bunkers/FrontlineBunkers_I_TRHMG.xml
deleted file mode 100644
index 0bae473b9c..0000000000
--- a/Patches/Frontline Collection/Frontline - Bunkers/FrontlineBunkers_I_TRHMG.xml	
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Frontline - Bunkers (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BK_Base_HMG"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="BK_Base_HMG"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="BK_Base_HMG"]/tradeTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="BK_Base_HMG"]</xpath>
-						<value>
-							<tradeTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BK_Base_HMG"]/tradeTags</xpath>
-					<value>
-						<li>CE_Turret</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BK_Gun_HMG</defName>
-					<statBases>
-						<MarketValue>800</MarketValue>
-						<RangedWeapon_Cooldown>4</RangedWeapon_Cooldown>
-						<Mass>12</Mass>
-						<Bulk>10.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.6</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>3</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<burstShotCount>24</burstShotCount>
-						<soundCast>BK_HMG_Fire</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>20</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Frontline Collection/Frontline - Trenches/FrontlineTrenches_AmmoPatch.xml b/Patches/Frontline Collection/Frontline - Trenches/FrontlineTrenches_AmmoPatch.xml
deleted file mode 100644
index 974447fb67..0000000000
--- a/Patches/Frontline Collection/Frontline - Trenches/FrontlineTrenches_AmmoPatch.xml	
+++ /dev/null
@@ -1,453 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Frontline - Trenches (Continued)</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>AmmoTRMortarGrenades</defName>
-					<label>TR Mortar Grenade</label>
-					<parent>AmmoShells</parent>
-					<iconPath>Things/Building/Mounted/Ammo/Ammo-Mortar</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet TRMortarGrenade ========================== -->
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_TRMortarGrenade</defName>
-					<label>TRMortar Grenades</label>
-					<ammoTypes>
-						<Ammo_TRMortarGrenade_HE>Bullet_TRMortarGrenade_HE</Ammo_TRMortarGrenade_HE>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-				<ThingDef Class="CombatExtended.AmmoDef" Name="TRMortarGrenadesBase" ParentName="MediumAmmoBase" Abstract="True">
-					<description>Grenades for your Mortar.</description>
-					<thingCategories>
-						<li>AmmoTRMortarGrenades</li>
-					</thingCategories>
-					<stackLimit>25</stackLimit>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-					</tradeTags>
-					<statBases>
-						<MaxHitPoints>100</MaxHitPoints>
-						<Mass>0.4</Mass>
-						<Bulk>0.5</Bulk>
-					</statBases>
-					<cookOffFlashScale>20</cookOffFlashScale>
-					<cookOffSound>MortarBomb_Explode</cookOffSound>
-					<destroyOnDrop>False</destroyOnDrop>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="TRMortarGrenadesBase">
-					<defName>Ammo_TRMortarGrenade_HE</defName>
-					<label>Mortar Round (HE)</label>
-					<graphicData>
-						<texPath>Things/Building/Mounted/Ammo/Ammo-Mortar</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>3.2</MarketValue>
-					</statBases>
-					<ammoClass>GrenadeHE</ammoClass>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>25</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>3</explosiveRadius>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>120</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-				<ThingDef Class="CombatExtended.AmmoDef" Name="BaseTRMortarGrenade" ParentName="BaseExplosiveBullet" Abstract="true">
-					<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					<graphicData>
-						<shaderType>TransparentPostLight</shaderType>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>29</speed>
-						<soundExplode>TR_ExplosionMortar</soundExplode>
-						<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-						<flyOverhead>true</flyOverhead>
-						<dropsCasings>false</dropsCasings>
-						<gravityFactor>5</gravityFactor>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseTRMortarGrenade">
-					<defName>Bullet_TRMortarGrenade_HE</defName>
-					<label>Mortar round (HE)</label>
-					<graphicData>
-						<texPath>Things/Building/Mounted/Bullets/Mortarbullet</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<explosionRadius>2.5</explosionRadius>
-						<damageDef>Bomb</damageDef>
-						<damageAmountBase>80</damageAmountBase>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						<soundExplode>TR_ExplosionMortar</soundExplode>
-						<soundAmbient>MortarRound_Ambient</soundAmbient>
-						<soundImpactAnticipate>TR_IncomingMortar</soundImpactAnticipate>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>80</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>2.5</explosiveRadius>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>120</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-				<RecipeDef ParentName="GrenadeRecipeBase">
-					<defName>MakeAmmo_TRMortarGrenade_HE</defName>
-					<label>make TR-Mortar rounds x5</label>
-					<description>Craft 5 TR-Mortar rounds.</description>
-					<jobString>Making TR-Mortar rounds.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>50</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Chemfuel</li>
-								</thingDefs>
-							</filter>
-							<count>20</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Chemfuel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_TRMortarGrenade_HE>5</Ammo_TRMortarGrenade_HE>
-					</products>
-				</RecipeDef>
-				<ThingCategoryDef>
-					<defName>AmmoTRHowitzerShells</defName>
-					<label>TRHowitzer Shell</label>
-					<parent>AmmoShells</parent>
-					<iconPath>Things/Building/Mounted/Ammo/Ammo-Howitzer</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet TRHowitzerShell ========================== -->
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_TRHowitzerShell</defName>
-					<label>TRHowitzer Shells</label>
-					<ammoTypes>
-						<Ammo_TRHowitzerShell_HE>Bullet_TRHowitzerShell_HE</Ammo_TRHowitzerShell_HE>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-				<ThingDef Class="CombatExtended.AmmoDef" Name="TRHowitzerShellsBase" ParentName="HeavyAmmoBase" Abstract="True">
-					<description>Shells for your Howitzer.</description>
-					<thingCategories>
-						<li>AmmoTRHowitzerShells</li>
-					</thingCategories>
-					<stackLimit>10</stackLimit>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-					</tradeTags>
-					<statBases>
-						<MaxHitPoints>200</MaxHitPoints>
-						<Mass>4</Mass>
-						<Bulk>5</Bulk>
-					</statBases>
-					<cookOffFlashScale>30</cookOffFlashScale>
-					<cookOffSound>MortarBomb_Explode</cookOffSound>
-					<destroyOnDrop>False</destroyOnDrop>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="TRHowitzerShellsBase">
-					<defName>Ammo_TRHowitzerShell_HE</defName>
-					<label>Howitzer Shell (HE)</label>
-					<graphicData>
-						<texPath>Things/Building/Mounted/Ammo/Ammo-Howitzer</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>27.83</MarketValue>
-					</statBases>
-					<ammoClass>GrenadeHE</ammoClass>
-					<detonateProjectile>Bullet_TRHowitzerShell_HE</detonateProjectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>50</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>4</explosiveRadius>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>70</Fragment_Large>
-								<Fragment_Small>130</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-				<ThingDef Class="CombatExtended.AmmoDef" Name="BaseTRHowitzerShell" ParentName="BaseBulletCE" Abstract="true">
-					<graphicData>
-						<shaderType>TransparentPostLight</shaderType>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>180</speed>
-						<soundExplode>TR_ExplosionHowitzer</soundExplode>
-						<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-						<flyOverhead>true</flyOverhead>
-						<dropsCasings>true</dropsCasings>
-						<casingMoteDefname>Fleck_BigShell</casingMoteDefname>
-						<casingFilthDefname>Filth_CannonAmmoCasings</casingFilthDefname>
-						<gravityFactor>5</gravityFactor>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseTRHowitzerShell">
-					<defName>Bullet_TRHowitzerShell_HE</defName>
-					<label>Howitzer Shell (HE)</label>
-					<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					<graphicData>
-						<texPath>Things/Building/Mounted/Bullets/Howitzerbullet</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bomb</damageDef>
-						<damageAmountBase>150</damageAmountBase>
-						<explosionRadius>4</explosionRadius>
-						<soundExplode>TR_ExplosionHowitzer</soundExplode>
-						<soundAmbient>MortarRound_Ambient</soundAmbient>
-						<soundImpactAnticipate>TR_IncomingHowitzer</soundImpactAnticipate>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>100</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>4</explosiveRadius>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>70</Fragment_Large>
-								<Fragment_Small>120</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-				<RecipeDef ParentName="GrenadeRecipeBase">
-					<defName>MakeAmmo_TRHowitzerShell_HE</defName>
-					<label>make TR-Howitzer shells x5</label>
-					<description>Craft 5 TR-Howitzer shells.</description>
-					<jobString>Making TR-Howitzer shells.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>75</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Chemfuel</li>
-								</thingDefs>
-							</filter>
-							<count>50</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Chemfuel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_TRHowitzerShell_HE>5</Ammo_TRHowitzerShell_HE>
-					</products>
-				</RecipeDef>
-
-				<ThingCategoryDef>
-					<defName>AmmoTRPAKShells</defName>
-					<label>TRPAK Shell</label>
-					<parent>AmmoShells</parent>
-					<iconPath>Things/Building/Mounted/Ammo/Ammo-PAK</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet TRPAKShell ========================== -->
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_TRPAKShell</defName>
-					<label>TRPAK Shells</label>
-					<ammoTypes>
-						<Ammo_TRPAKShell_HEAT>Bullet_TRPAKShell_HEAT</Ammo_TRPAKShell_HEAT>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-				<ThingDef Class="CombatExtended.AmmoDef" Name="TRPAKShellsBase" ParentName="HeavyAmmoBase" Abstract="True">
-					<description>Shell for your PAK.</description>
-					<thingCategories>
-						<li>AmmoTRPAKShells</li>
-					</thingCategories>
-					<stackLimit>25</stackLimit>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-					</tradeTags>
-					<statBases>
-						<MaxHitPoints>200</MaxHitPoints>
-						<Mass>5</Mass>
-						<Bulk>6</Bulk>
-					</statBases>
-					<cookOffFlashScale>30</cookOffFlashScale>
-					<cookOffSound>MortarBomb_Explode</cookOffSound>
-					<destroyOnDrop>False</destroyOnDrop>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="TRPAKShellsBase">
-					<defName>Ammo_TRPAKShell_HEAT</defName>
-					<label>PAK Shell (HEAT)</label>
-					<graphicData>
-						<texPath>Things/Building/Mounted/Ammo/Ammo-PAK</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>48.7</MarketValue>
-						<Mass>8.8</Mass>
-					</statBases>
-					<ammoClass>RocketHEAT</ammoClass>
-					<detonateProjectile>Bullet_TRPAKShell_HEAT</detonateProjectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>50</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>2</explosiveRadius>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>30</Fragment_Large>
-								<Fragment_Small>70</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-				<ThingDef Class="CombatExtended.AmmoDef" Name="BasePAKShell" ParentName="BaseBulletCE" Abstract="true">
-					<graphicData>
-						<shaderType>TransparentPostLight</shaderType>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>290</speed>
-						<soundExplode>TR_ExplosionHowitzer</soundExplode>
-						<flyOverhead>false</flyOverhead>
-						<dropsCasings>true</dropsCasings>
-						<casingMoteDefname>Fleck_BigShell</casingMoteDefname>
-						<casingFilthDefname>Filth_CannonAmmoCasings</casingFilthDefname>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="BasePAKShell">
-					<defName>Bullet_TRPAKShell_HEAT</defName>
-					<label>PAK Shell (HEAT)</label>
-					<graphicData>
-						<texPath>Things/Building/Mounted/Bullets/Howitzerbullet</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bullet</damageDef>
-						<damageAmountBase>200</damageAmountBase>
-						<soundExplode>TR_ExplosionHowitzer</soundExplode>
-						<armorPenetrationBase>7.0</armorPenetrationBase>
-						<armorPenetrationSharp>300</armorPenetrationSharp>
-						<armorPenetrationBlunt>18.005</armorPenetrationBlunt>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>70</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>2</explosiveRadius>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>22</Fragment_Large>
-								<Fragment_Small>36</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-				<RecipeDef ParentName="GrenadeRecipeBase">
-					<defName>MakeAmmo_TRPAKShell_HEAT</defName>
-					<label>make TR-PAK shells x5</label>
-					<description>Craft 5 TR-PAK shells.</description>
-					<jobString>Making TR-PAK shells.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>150</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Chemfuel</li>
-								</thingDefs>
-							</filter>
-							<count>50</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Chemfuel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_TRPAKShell_HEAT>5</Ammo_TRPAKShell_HEAT>
-					</products>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Frontline Collection/Frontline - Trenches/FrontlineTrenches_G_TRLMG.xml b/Patches/Frontline Collection/Frontline - Trenches/FrontlineTrenches_G_TRLMG.xml
deleted file mode 100644
index b229efe4d5..0000000000
--- a/Patches/Frontline Collection/Frontline - Trenches/FrontlineTrenches_G_TRLMG.xml	
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Frontline - Trenches (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TR_Base_LMG" or defName="TR_Base_LMGSB"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="TR_Base_LMG" or defName="TR_Base_LMGSB"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="TR_Base_LMG" or defName="TR_Base_LMGSB"]/tradeTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="TR_Base_LMG" or defName="TR_Base_LMGSB"]</xpath>
-						<value>
-							<tradeTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TR_Base_LMG" or defName="TR_Base_LMGSB"]/tradeTags</xpath>
-					<value>
-						<li>CE_Turret</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>TR_Gun_LMG</defName>
-					<statBases>
-						<MarketValue>800</MarketValue>
-						<RangedWeapon_Cooldown>4</RangedWeapon_Cooldown>
-						<Mass>20</Mass>
-						<Bulk>10.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.7</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>3</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
-						<burstShotCount>12</burstShotCount>
-						<soundCast>TR_LMG_Fire</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>20</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Frontline Collection/Frontline - Trenches/FrontlineTrenches_H_TRMMG.xml b/Patches/Frontline Collection/Frontline - Trenches/FrontlineTrenches_H_TRMMG.xml
deleted file mode 100644
index 7dd1fcf8d1..0000000000
--- a/Patches/Frontline Collection/Frontline - Trenches/FrontlineTrenches_H_TRMMG.xml	
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Frontline - Trenches (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TR_Base_MMG" or defName="TR_Base_MMGSB"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="TR_Base_MMG" or defName="TR_Base_MMGSB"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="TR_Base_MMG" or defName="TR_Base_MMGSB"]/tradeTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="TR_Base_MMG" or defName="TR_Base_MMGSB"]</xpath>
-						<value>
-							<tradeTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TR_Base_MMG" or defName="TR_Base_MMGSB"]/tradeTags</xpath>
-					<value>
-						<li>CE_Turret</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>TR_Gun_MMG</defName>
-					<statBases>
-						<MarketValue>800</MarketValue>
-						<RangedWeapon_Cooldown>4</RangedWeapon_Cooldown>
-						<Mass>14</Mass>
-						<Bulk>10.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.3</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>3</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>12</burstShotCount>
-						<soundCast>TR_MMG_Fire</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>20</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Frontline Collection/Frontline - Trenches/FrontlineTrenches_I_TRHMG.xml b/Patches/Frontline Collection/Frontline - Trenches/FrontlineTrenches_I_TRHMG.xml
deleted file mode 100644
index 5813af137d..0000000000
--- a/Patches/Frontline Collection/Frontline - Trenches/FrontlineTrenches_I_TRHMG.xml	
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Frontline - Trenches (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TR_Base_HMG" or defName="TR_Base_HMGSB"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="TR_Base_HMG" or defName="TR_Base_HMGSB"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="TR_Base_HMG" or defName="TR_Base_HMGSB"]/tradeTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="TR_Base_HMG" or defName="TR_Base_HMGSB"]</xpath>
-						<value>
-							<tradeTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TR_Base_HMG" or defName="TR_Base_HMGSB"]/tradeTags</xpath>
-					<value>
-						<li>CE_Turret</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>TR_Gun_HMG</defName>
-					<statBases>
-						<MarketValue>800</MarketValue>
-						<RangedWeapon_Cooldown>4</RangedWeapon_Cooldown>
-						<Mass>12</Mass>
-						<Bulk>10.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.6</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>3</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<burstShotCount>24</burstShotCount>
-						<soundCast>TR_HMG_Fire</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>20</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Frontline Collection/Frontline - Trenches/FrontlineTrenches_J_TRHowitzer.xml b/Patches/Frontline Collection/Frontline - Trenches/FrontlineTrenches_J_TRHowitzer.xml
deleted file mode 100644
index 2bed2789dd..0000000000
--- a/Patches/Frontline Collection/Frontline - Trenches/FrontlineTrenches_J_TRHowitzer.xml	
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Frontline - Trenches (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TR_Base_Howitzer"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="TR_Base_Howitzer"]/tradeTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="TR_Base_Howitzer"]</xpath>
-						<value>
-							<tradeTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TR_Base_Howitzer"]/tradeTags</xpath>
-					<value>
-						<li>CE_Turret</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>TR_Gun_Howitzer</defName>
-					<statBases>
-						<DeteriorationRate>0</DeteriorationRate>
-						<Flammability>0</Flammability>
-						<MarketValue>2500</MarketValue>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>0.9</SwayFactor>
-						<RangedWeapon_Cooldown>15</RangedWeapon_Cooldown>
-						<MaxHitPoints>800</MaxHitPoints>
-						<Bulk>30.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.78</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_TRHowitzerShell_HE</defaultProjectile>
-						<warmupTime>5</warmupTime>
-						<range>2000</range>
-						<minRange>25</minRange>
-						<ticksBetweenBurstShots>25</ticksBetweenBurstShots>
-						<burstShotCount>1</burstShotCount>
-						<soundCast>TR_Howitzer_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>16</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_TRHowitzerShell</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "TR_Gun_Howitzer"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Charges">
-							<chargeSpeeds>
-								<li>30</li>
-								<li>50</li>
-								<li>70</li>
-								<li>90</li>
-							</chargeSpeeds>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Frontline Collection/Frontline - Trenches/FrontlineTrenches_K_TRMortar.xml b/Patches/Frontline Collection/Frontline - Trenches/FrontlineTrenches_K_TRMortar.xml
deleted file mode 100644
index 827e37a225..0000000000
--- a/Patches/Frontline Collection/Frontline - Trenches/FrontlineTrenches_K_TRMortar.xml	
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Frontline - Trenches (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TR_Base_Mortar"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="TR_Base_Mortar"]/tradeTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="TR_Base_Mortar"]</xpath>
-						<value>
-							<tradeTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TR_Base_Mortar"]/tradeTags</xpath>
-					<value>
-						<li>CE_Turret</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>TR_Gun_Mortar</defName>
-					<statBases>
-						<DeteriorationRate>0</DeteriorationRate>
-						<Flammability>0</Flammability>
-						<MarketValue>2500</MarketValue>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>0.4</SwayFactor>
-						<RangedWeapon_Cooldown>2.0</RangedWeapon_Cooldown>
-						<MaxHitPoints>400</MaxHitPoints>
-						<Bulk>20.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_TRMortarGrenade_HE</defaultProjectile>
-						<warmupTime>2</warmupTime>
-						<range>65</range>
-						<minRange>3</minRange>
-						<ticksBetweenBurstShots>25</ticksBetweenBurstShots>
-						<burstShotCount>1</burstShotCount>
-						<soundCast>TR_Mortar_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>16</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>0.5</reloadTime>
-						<ammoSet>AmmoSet_TRMortarGrenade</ammoSet>
-					</AmmoUser>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Frontline Collection/Frontline - Trenches/FrontlineTrenches_L_TRPak5cm.xml b/Patches/Frontline Collection/Frontline - Trenches/FrontlineTrenches_L_TRPak5cm.xml
deleted file mode 100644
index 1eceea8e81..0000000000
--- a/Patches/Frontline Collection/Frontline - Trenches/FrontlineTrenches_L_TRPak5cm.xml	
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Frontline - Trenches (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TR_Base_Pak"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="TR_Base_Pak"]/tradeTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="TR_Base_Pak"]</xpath>
-						<value>
-							<tradeTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TR_Base_Pak"]/tradeTags</xpath>
-					<value>
-						<li>CE_Turret</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TR_Base_Pak"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>TR_Gun_Pak</defName>
-					<statBases>
-						<DeteriorationRate>0</DeteriorationRate>
-						<Flammability>0</Flammability>
-						<MarketValue>2500</MarketValue>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>0.2</SwayFactor>
-						<RangedWeapon_Cooldown>10</RangedWeapon_Cooldown>
-						<MaxHitPoints>600</MaxHitPoints>
-						<Bulk>15.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_TRPAKShell_HEAT</defaultProjectile>
-						<warmupTime>2</warmupTime>
-						<range>2000</range>
-						<minRange>3</minRange>
-						<ticksBetweenBurstShots>25</ticksBetweenBurstShots>
-						<burstShotCount>1</burstShotCount>
-						<soundCast>TR_Pak_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>16</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_TRPAKShell</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Frontline Collection/Frontline - Trenches/FrontlineTrenches_TRWizz_Patch.xml b/Patches/Frontline Collection/Frontline - Trenches/FrontlineTrenches_TRWizz_Patch.xml
deleted file mode 100644
index 9f45c29d25..0000000000
--- a/Patches/Frontline Collection/Frontline - Trenches/FrontlineTrenches_TRWizz_Patch.xml	
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Frontline - Trenches (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationRemove">
-					<success>Always</success>
-					<xpath>Defs/ThingDef[defName="Bullet_762x51mmNATO_FMJ" or defName="Bullet_762x51mmNATO_AP" or defName="Bullet_762x51mmNATO_HP" or defName="Bullet_303British_FMJ" or defName="Bullet_303British_AP" or defName="Bullet_303British_HP" or defName="Bullet_762x54mmR_FMJ" or defName="Bullet_762x54mmR_AP" or defName="Bullet_762x54mmR_HP" or defName="Bullet_4570Gov_FMJ" or defName="Bullet_4570Gov_AP" or defName="Bullet_4570Gov_HP"]/projectile/soundImpactAnticipate</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Bullet_762x51mmNATO_FMJ" or defName="Bullet_762x51mmNATO_AP" or defName="Bullet_762x51mmNATO_HP" or defName="Bullet_303British_FMJ" or defName="Bullet_303British_AP" or defName="Bullet_303British_HP" or defName="Bullet_762x54mmR_FMJ" or defName="Bullet_762x54mmR_AP" or defName="Bullet_762x54mmR_HP" or defName="Bullet_4570Gov_FMJ" or defName="Bullet_4570Gov_AP" or defName="Bullet_4570Gov_HP"]/projectile</xpath>
-					<value>
-						<soundImpactAnticipate>TR_Wizz</soundImpactAnticipate>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Fuck it Unboomas your Lope/Noboom.xml b/Patches/Fuck it Unboomas your Lope/Noboom.xml
deleted file mode 100644
index 8221b4fd5b..0000000000
--- a/Patches/Fuck it Unboomas your Lope/Noboom.xml	
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Fuck it *Unboomas your Lope*</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Boomalope"]/butcherProducts</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Boomalope"]/comps/li[@Class ="CombatExtended.CompProperties_ShearableRenameable"]</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Gas Traps and Shells/Patch_60mm.xml b/Patches/Gas Traps and Shells/Patch_60mm.xml
deleted file mode 100644
index b949f00620..0000000000
--- a/Patches/Gas Traps and Shells/Patch_60mm.xml	
+++ /dev/null
@@ -1,699 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Gas Traps And Shells</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Add Shells to AmmoSet -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_60mmMortarShell"]/ammoTypes</xpath>
-					<value>
-						<Shell_60mmMortar_ToxicGas>Bullet_60mmMortarShell_60mmMortar_ToxicGas</Shell_60mmMortar_ToxicGas>
-						<Shell_60mmMortar_RageGas>Bullet_60mmMortarShell_60mmMortar_RageGas</Shell_60mmMortar_RageGas>
-						<Shell_60mmMortar_TearGas>Bullet_60mmMortarShell_60mmMortar_TearGas</Shell_60mmMortar_TearGas>
-						<Shell_60mmMortar_SleepGas>Bullet_60mmMortarShell_60mmMortar_SleepGas</Shell_60mmMortar_SleepGas>
-						<Shell_60mmMortar_FearGas>Bullet_60mmMortarShell_60mmMortar_FearGas</Shell_60mmMortar_FearGas>
-						<Shell_60mmMortar_AcidGas>Bullet_60mmMortarShell_60mmMortar_AcidGas</Shell_60mmMortar_AcidGas>
-					</value>
-				</li>
-
-				<!-- Ammo -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="60mmMortarShellBase">
-							<defName>Shell_60mmMortar_ToxicGas</defName>
-							<label>60mm mortar shell (Toxic)</label>
-							<graphicData>
-								<texPath>ThirdParty/GasTraps/Mortar</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(70,183,79)</color>
-								<shaderType>CutoutComplex</shaderType>
-							</graphicData>
-							<statBases>
-								<MarketValue>22.20</MarketValue>
-								<Mass>4.1</Mass>
-								<Bulk>10.01</Bulk>
-							</statBases>
-							<ammoClass>Toxic</ammoClass>
-							<detonateProjectile>Bullet_60mmMortarShell_60mmMortar_ToxicGas</detonateProjectile>
-							<comps>
-								<!-- Vanilla values -->
-								<li Class="CompProperties_Explosive">
-									<explosiveRadius>4.5</explosiveRadius>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<startWickHitPointsPercent>0.7</startWickHitPointsPercent>
-									<postExplosionSpawnThingDef>ToxicGas</postExplosionSpawnThingDef>
-									<preExplosionSpawnChance>1</preExplosionSpawnChance>
-									<explodeOnKilled>True</explodeOnKilled>
-									<wickTicks>30~60</wickTicks>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="60mmMortarShellBase">
-							<defName>Shell_60mmMortar_RageGas</defName>
-							<label>60mm mortar shell (Rage)</label>
-							<graphicData>
-								<texPath>ThirdParty/GasTraps/Mortar</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<shaderType>CutoutComplex</shaderType>
-								<color>(200,112,112)</color>
-							</graphicData>
-							<statBases>
-								<MarketValue>22.20</MarketValue>
-								<Mass>4.1</Mass>
-								<Bulk>10.01</Bulk>
-							</statBases>
-							<ammoClass>Rage</ammoClass>
-							<detonateProjectile>Bullet_60mmMortarShell_60mmMortar_RageGas</detonateProjectile>
-							<comps>
-								<!-- Vanilla values -->
-								<li Class="CompProperties_Explosive">
-									<explosiveRadius>4.5</explosiveRadius>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<startWickHitPointsPercent>0.7</startWickHitPointsPercent>
-									<postExplosionSpawnThingDef>RageGas</postExplosionSpawnThingDef>
-									<preExplosionSpawnChance>1</preExplosionSpawnChance>
-									<explodeOnKilled>True</explodeOnKilled>
-									<wickTicks>30~60</wickTicks>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="60mmMortarShellBase">
-							<defName>Shell_60mmMortar_TearGas</defName>
-							<label>60mm mortar shell (Tear)</label>
-							<graphicData>
-								<texPath>ThirdParty/GasTraps/Mortar</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(181,151,185)</color>
-								<shaderType>CutoutComplex</shaderType>
-							</graphicData>
-							<statBases>
-								<MarketValue>22.20</MarketValue>
-								<Mass>4.1</Mass>
-								<Bulk>10.01</Bulk>
-							</statBases>
-							<ammoClass>TearGas</ammoClass>
-							<detonateProjectile>Bullet_60mmMortarShell_60mmMortar_TearGas</detonateProjectile>
-							<comps>
-								<!-- Vanilla values -->
-								<li Class="CompProperties_Explosive">
-									<explosiveRadius>4.5</explosiveRadius>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<startWickHitPointsPercent>0.7</startWickHitPointsPercent>
-									<postExplosionSpawnThingDef>TearGas</postExplosionSpawnThingDef>
-									<preExplosionSpawnChance>1</preExplosionSpawnChance>
-									<explodeOnKilled>True</explodeOnKilled>
-									<wickTicks>30~60</wickTicks>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="60mmMortarShellBase">
-							<defName>Shell_60mmMortar_SleepGas</defName>
-							<label>60mm mortar shell (Sleep)</label>
-							<graphicData>
-								<texPath>ThirdParty/GasTraps/Mortar</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(113,154,208)</color>
-								<shaderType>CutoutComplex</shaderType>
-							</graphicData>
-							<statBases>
-								<MarketValue>22.20</MarketValue>
-								<Mass>4.1</Mass>
-								<Bulk>10.01</Bulk>
-							</statBases>
-							<ammoClass>Sleep</ammoClass>
-							<detonateProjectile>Bullet_60mmMortarShell_60mmMortar_SleepGas</detonateProjectile>
-							<comps>
-								<!-- Vanilla values -->
-								<li Class="CompProperties_Explosive">
-									<explosiveRadius>4.5</explosiveRadius>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<startWickHitPointsPercent>0.7</startWickHitPointsPercent>
-									<postExplosionSpawnThingDef>SleepGas</postExplosionSpawnThingDef>
-									<preExplosionSpawnChance>1</preExplosionSpawnChance>
-									<explodeOnKilled>True</explodeOnKilled>
-									<wickTicks>30~60</wickTicks>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="60mmMortarShellBase">
-							<defName>Shell_60mmMortar_FearGas</defName>
-							<label>60mm mortar shell (Fear)</label>
-							<graphicData>
-								<texPath>ThirdParty/GasTraps/Mortar</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(185,142,132)</color>
-								<shaderType>CutoutComplex</shaderType>
-							</graphicData>
-							<statBases>
-								<MarketValue>22.20</MarketValue>
-								<Mass>4.1</Mass>
-								<Bulk>10.01</Bulk>
-							</statBases>
-							<ammoClass>Fear</ammoClass>
-							<detonateProjectile>Bullet_60mmMortarShell_60mmMortar_FearGas</detonateProjectile>
-							<comps>
-								<!-- Vanilla values -->
-								<li Class="CompProperties_Explosive">
-									<explosiveRadius>4.5</explosiveRadius>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<startWickHitPointsPercent>0.7</startWickHitPointsPercent>
-									<postExplosionSpawnThingDef>FearGas</postExplosionSpawnThingDef>
-									<preExplosionSpawnChance>1</preExplosionSpawnChance>
-									<explodeOnKilled>True</explodeOnKilled>
-									<wickTicks>30~60</wickTicks>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="60mmMortarShellBase">
-							<defName>Shell_60mmMortar_AcidGas</defName>
-							<label>60mm mortar shell (Acid)</label>
-							<graphicData>
-								<texPath>ThirdParty/GasTraps/Mortar</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<color>(179,178,119)</color>
-								<shaderType>CutoutComplex</shaderType>
-							</graphicData>
-							<statBases>
-								<MarketValue>22.20</MarketValue>
-								<Mass>4.1</Mass>
-								<Bulk>10.01</Bulk>
-							</statBases>
-							<ammoClass>Acid</ammoClass>
-							<detonateProjectile>Bullet_60mmMortarShell_60mmMortar_AcidGas</detonateProjectile>
-							<comps>
-								<!-- Vanilla values -->
-								<li Class="CompProperties_Explosive">
-									<explosiveRadius>4.5</explosiveRadius>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<startWickHitPointsPercent>0.7</startWickHitPointsPercent>
-									<postExplosionSpawnThingDef>AcidGas</postExplosionSpawnThingDef>
-									<preExplosionSpawnChance>1</preExplosionSpawnChance>
-									<explodeOnKilled>True</explodeOnKilled>
-									<wickTicks>30~60</wickTicks>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- Projectile -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="Base60mmMortarShell">
-							<defName>Bullet_60mmMortarShell_60mmMortar_ToxicGas</defName>
-							<label>60mm mortar shell (Toxic)</label>
-							<graphicData>
-								<texPath>ThirdParty/GasTraps/gas_mortar_projectile</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<color>(70,183,79)</color>
-								<shaderType>CutoutComplex</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>5</damageAmountBase>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0</armorPenetrationBlunt>
-								<explosionRadius>4.5</explosionRadius>
-								<flyOverhead>true</flyOverhead>
-								<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-								<soundExplode>Explosion_EMP</soundExplode>
-								<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
-								<soundAmbient>MortarRound_Ambient</soundAmbient>
-								<postExplosionSpawnThingDef>ToxicGas</postExplosionSpawnThingDef>
-								<preExplosionSpawnChance>1</preExplosionSpawnChance>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<explosionEffect>ExtinguisherExplosion</explosionEffect>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="Base60mmMortarShell">
-							<defName>Bullet_60mmMortarShell_60mmMortar_RageGas</defName>
-							<label>60mm mortar shell (Rage)</label>
-							<graphicData>
-								<texPath>ThirdParty/GasTraps/gas_mortar_projectile</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<color>(200,112,112)</color>
-								<shaderType>CutoutComplex</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>5</damageAmountBase>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0</armorPenetrationBlunt>
-								<explosionRadius>4.5</explosionRadius>
-								<flyOverhead>true</flyOverhead>
-								<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-								<soundExplode>Explosion_EMP</soundExplode>
-								<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
-								<soundAmbient>MortarRound_Ambient</soundAmbient>
-								<postExplosionSpawnThingDef>RageGas</postExplosionSpawnThingDef>
-								<preExplosionSpawnChance>1</preExplosionSpawnChance>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<explosionEffect>ExtinguisherExplosion</explosionEffect>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="Base60mmMortarShell">
-							<defName>Bullet_60mmMortarShell_60mmMortar_TearGas</defName>
-							<label>60mm mortar shell (Tear)</label>
-							<graphicData>
-								<texPath>ThirdParty/GasTraps/gas_mortar_projectile</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<color>(181,151,185)</color>
-								<shaderType>CutoutComplex</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>5</damageAmountBase>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0</armorPenetrationBlunt>
-								<explosionRadius>4.5</explosionRadius>
-								<flyOverhead>true</flyOverhead>
-								<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-								<soundExplode>Explosion_EMP</soundExplode>
-								<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
-								<soundAmbient>MortarRound_Ambient</soundAmbient>
-								<postExplosionSpawnThingDef>TearGas</postExplosionSpawnThingDef>
-								<preExplosionSpawnChance>1</preExplosionSpawnChance>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<explosionEffect>ExtinguisherExplosion</explosionEffect>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="Base60mmMortarShell">
-							<defName>Bullet_60mmMortarShell_60mmMortar_SleepGas</defName>
-							<label>60mm mortar shell (Sleep)</label>
-							<graphicData>
-								<texPath>ThirdParty/GasTraps/gas_mortar_projectile</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<color>(113,154,208)</color>
-								<shaderType>CutoutComplex</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>5</damageAmountBase>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0</armorPenetrationBlunt>
-								<explosionRadius>4.5</explosionRadius>
-								<flyOverhead>true</flyOverhead>
-								<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-								<soundExplode>Explosion_EMP</soundExplode>
-								<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
-								<soundAmbient>MortarRound_Ambient</soundAmbient>
-								<postExplosionSpawnThingDef>SleepGas</postExplosionSpawnThingDef>
-								<preExplosionSpawnChance>1</preExplosionSpawnChance>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<explosionEffect>ExtinguisherExplosion</explosionEffect>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="Base60mmMortarShell">
-							<defName>Bullet_60mmMortarShell_60mmMortar_FearGas</defName>
-							<label>60mm mortar shell (Fear)</label>
-							<graphicData>
-								<texPath>ThirdParty/GasTraps/gas_mortar_projectile</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<color>(185,142,132)</color>
-								<shaderType>CutoutComplex</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>5</damageAmountBase>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0</armorPenetrationBlunt>
-								<explosionRadius>4.5</explosionRadius>
-								<flyOverhead>true</flyOverhead>
-								<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-								<soundExplode>Explosion_EMP</soundExplode>
-								<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
-								<soundAmbient>MortarRound_Ambient</soundAmbient>
-								<postExplosionSpawnThingDef>FearGas</postExplosionSpawnThingDef>
-								<preExplosionSpawnChance>1</preExplosionSpawnChance>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<explosionEffect>ExtinguisherExplosion</explosionEffect>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="Base60mmMortarShell">
-							<defName>Bullet_60mmMortarShell_60mmMortar_AcidGas</defName>
-							<label>60mm mortar shell (Acid)</label>
-							<graphicData>
-								<texPath>ThirdParty/GasTraps/gas_mortar_projectile</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<color>(179,178,119)</color>
-								<shaderType>CutoutComplex</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>5</damageAmountBase>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0</armorPenetrationBlunt>
-								<explosionRadius>4.5</explosionRadius>
-								<flyOverhead>true</flyOverhead>
-								<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-								<soundExplode>Explosion_EMP</soundExplode>
-								<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
-								<soundAmbient>MortarRound_Ambient</soundAmbient>
-								<postExplosionSpawnThingDef>AcidGas</postExplosionSpawnThingDef>
-								<preExplosionSpawnChance>1</preExplosionSpawnChance>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<explosionEffect>ExtinguisherExplosion</explosionEffect>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- Recipes -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeShell_60mmMortar_ToxicGas</defName>
-							<label>make 60mm toxic gas mortar shells x5</label>
-							<description>Craft 5 60mm toxic gas mortar shells.</description>
-							<jobString>Making 60mm toxic gas mortar shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Canister_ToxicGas</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-									<li>Canister_ToxicGas</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Shell_60mmMortar_ToxicGas>5</Shell_60mmMortar_ToxicGas>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeShell_60mmMortar_RageGas</defName>
-							<label>make 60mm rage gas mortar shells x5</label>
-							<description>Craft 5 60mm rage gas mortar shells.</description>
-							<jobString>Making 60mm rage gas mortar shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Canister_RageGas</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-									<li>Canister_RageGas</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Shell_60mmMortar_RageGas>5</Shell_60mmMortar_RageGas>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeShell_60mmMortar_TearGas</defName>
-							<label>make 60mm tear gas mortar shells x5</label>
-							<description>Craft 5 60mm tear gas mortar shells.</description>
-							<jobString>Making 60mm tear gas mortar shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Canister_TearGas</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-									<li>Canister_TearGas</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Shell_60mmMortar_TearGas>5</Shell_60mmMortar_TearGas>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeShell_60mmMortar_SleepGas</defName>
-							<label>make 60mm sleep gas mortar shells x5</label>
-							<description>Craft 5 60mm sleep gas mortar shells.</description>
-							<jobString>Making 60mm sleep gas mortar shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Canister_SleepGas</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-									<li>Canister_SleepGas</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Shell_60mmMortar_SleepGas>5</Shell_60mmMortar_SleepGas>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeShell_60mmMortar_FearGas</defName>
-							<label>make 60mm fear gas mortar shells x5</label>
-							<description>Craft 5 60mm fear gas mortar shells.</description>
-							<jobString>Making 60mm fear gas mortar shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Canister_FearGas</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-									<li>Canister_FearGas</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Shell_60mmMortar_FearGas>5</Shell_60mmMortar_FearGas>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeShell_60mmMortar_AcidGas</defName>
-							<label>make 60mm corrosive acid mortar shells x5</label>
-							<description>Craft 5 60mm corrosive acid mortar shells.</description>
-							<jobString>Making 60mm corrosive acid mortar shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Canister_AcidGas</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-									<li>Canister_AcidGas</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Shell_60mmMortar_AcidGas>5</Shell_60mmMortar_AcidGas>
-							</products>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Gas Traps and Shells/Patch_81mm.xml b/Patches/Gas Traps and Shells/Patch_81mm.xml
deleted file mode 100644
index 79bdb79046..0000000000
--- a/Patches/Gas Traps and Shells/Patch_81mm.xml	
+++ /dev/null
@@ -1,719 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Gas Traps And Shells</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Add Shell Recipes -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeShell_GasToxic</defName>
-							<label>make 81mm toxic gas mortar shells x5</label>
-							<description>Craft 5 81mm toxic gas mortar shells.</description>
-							<jobString>Making 81mm toxic gas mortar shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Canister_ToxicGas</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-									<li>Canister_ToxicGas</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Shell_GasToxic>5</Shell_GasToxic>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeShell_GasRage</defName>
-							<label>make 81mm rage gas mortar shells x5</label>
-							<description>Craft 5 81mm rage gas mortar shells.</description>
-							<jobString>Making 81mm rage gas mortar shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Canister_RageGas</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-									<li>Canister_RageGas</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Shell_GasRage>5</Shell_GasRage>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeShell_GasTear</defName>
-							<label>make 81mm tear gas mortar shells x5</label>
-							<description>Craft 5 81mm tear gas mortar shells.</description>
-							<jobString>Making 81mm tear gas mortar shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Canister_TearGas</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-									<li>Canister_TearGas</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Shell_GasTear>5</Shell_GasTear>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeShell_GasSleep</defName>
-							<label>make 81mm sleep gas mortar shells x5</label>
-							<description>Craft 5 81mm sleep gas mortar shells.</description>
-							<jobString>Making 81mm sleep gas mortar shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Canister_SleepGas</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-									<li>Canister_SleepGas</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Shell_GasSleep>5</Shell_GasSleep>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeShell_GasFear</defName>
-							<label>make 81mm fear gas mortar shells x5</label>
-							<description>Craft 5 81mm fear gas mortar shells.</description>
-							<jobString>Making 81mm fear gas mortar shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Canister_FearGas</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-									<li>Canister_FearGas</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Shell_GasFear>5</Shell_GasFear>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeShell_GasAcid</defName>
-							<label>make 81mm corrosive acid mortar shells x5</label>
-							<description>Craft 5 81mm corrosive acid mortar shells.</description>
-							<jobString>Making 81mm corrosive acid mortar shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Canister_AcidGas</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-									<li>Canister_AcidGas</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Shell_GasAcid>5</Shell_GasAcid>
-							</products>
-						</RecipeDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeShell_MechVirus</defName>
-							<label>make 81mm nanomachines mortar shells x5</label>
-							<description>Craft 5 81mm nanomachines mortar shells.</description>
-							<jobString>Making 81mm nanomachines mortar shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Canister_MechVirusGas</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-									<li>Canister_MechVirusGas</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Shell_MechVirus>5</Shell_MechVirus>
-							</products>
-						</RecipeDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeShell_GasAntiBug</defName>
-							<label>make 81mm insecticide mortar shells x5</label>
-							<description>Craft 5 81mm insecticide mortar shells.</description>
-							<jobString>Making 81mm insecticide mortar shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Canister_AntibugGas</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-									<li>Canister_AntibugGas</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Shell_GasAntiBug>5</Shell_GasAntiBug>
-							</products>
-						</RecipeDef>
-					</value>
-				</li>
-
-				<!-- Add Shells to AmmoSet -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_81mmMortarShell"]/ammoTypes</xpath>
-					<value>
-						<Shell_MechVirus>Bullet_Shell_MechVirus</Shell_MechVirus>
-						<Shell_GasAntiBug>Bullet_Shell_GasAntiBug</Shell_GasAntiBug>
-						<Shell_GasToxic>Bullet_Shell_GasToxic</Shell_GasToxic>
-						<Shell_GasRage>Bullet_Shell_GasRage</Shell_GasRage>
-						<Shell_GasTear>Bullet_Shell_GasTear</Shell_GasTear>
-						<Shell_GasSleep>Bullet_Shell_GasSleep</Shell_GasSleep>
-						<Shell_GasFear>Bullet_Shell_GasFear</Shell_GasFear>
-						<Shell_GasAcid>Bullet_Shell_GasAcid</Shell_GasAcid>
-					</value>
-				</li>
-
-				<!-- Add CE Ammo.Def to Shells & Ammo-->
-
-				<li Class="PatchOperationAttributeAdd">
-					<xpath>Defs/ThingDef[
-						defName="Shell_GasToxic" or
-						defName="Shell_GasRage" or
-						defName="Shell_GasTear" or
-						defName="Shell_GasSleep" or
-						defName="Shell_GasFear" or
-						defName="Shell_GasAcid" or
-						defName="Shell_GasAntiBug" or
-						defName="Shell_MechVirus" or
-						defName="Bullet_Shell_GasToxic" or
-						defName="Bullet_Shell_GasRage" or
-						defName="Bullet_Shell_GasTear" or
-						defName="Bullet_Shell_GasSleep" or
-						defName="Bullet_Shell_GasFear" or
-						defName="Bullet_Shell_GasAcid" or
-						defName="Bullet_Shell_MechVirus" or
-						defName="Bullet_Shell_GasAntiBug"] </xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<!-- Add New Shell Base-->
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[
-						defName="Shell_GasToxic" or
-						defName="Shell_GasRage" or
-						defName="Shell_GasTear" or
-						defName="Shell_GasSleep" or
-						defName="Shell_GasFear" or
-						defName="Shell_GasAcid" or
-						defName="Shell_GasAntiBug" or
-						defName="Shell_MechVirus"] </xpath>
-					<attribute>ParentName</attribute>
-					<value>81mmMortarShellBaseCraftableBase</value>
-				</li>
-
-				<!-- Remove Stuff -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="Shell_GasToxic" or
-						defName="Shell_GasRage" or
-						defName="Shell_GasTear" or
-						defName="Shell_GasSleep" or
-						defName="Shell_GasFear" or
-						defName="Shell_GasAcid" or
-						defName="Shell_GasAntiBug" or
-						defName="Shell_MechVirus"]/projectileWhenLoaded </xpath>
-				</li>
-
-				<!-- Add Shell Mass-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="Shell_GasToxic" or
-						defName="Shell_GasRage" or
-						defName="Shell_GasTear" or
-						defName="Shell_GasSleep" or
-						defName="Shell_GasFear" or
-						defName="Shell_GasAcid" or
-						defName="Shell_GasAntiBug" or
-						defName="Shell_MechVirus"] </xpath>
-					<value>
-						<statBases>
-							<Mass>4.3</Mass>
-							<Bulk>5</Bulk>
-						</statBases>
-					</value>
-				</li>
-
-				<!-- Add Shell Ammo Type-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Shell_GasToxic"]</xpath>
-					<value>
-						<ammoClass>GasToxic</ammoClass>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Shell_GasRage"]</xpath>
-					<value>
-						<ammoClass>GasRage</ammoClass>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Shell_GasTear"]</xpath>
-					<value>
-						<ammoClass>GasTear</ammoClass>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Shell_GasFear"]</xpath>
-					<value>
-						<ammoClass>GasFear</ammoClass>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Shell_GasSleep"]</xpath>
-					<value>
-						<ammoClass>GasSleep</ammoClass>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Shell_GasAcid"]</xpath>
-					<value>
-						<ammoClass>GasAcid</ammoClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Shell_MechVirus"]</xpath>
-					<value>
-						<ammoClass>MechVirus</ammoClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Shell_GasAntiBug"]</xpath>
-					<value>
-						<ammoClass>AntiBug</ammoClass>
-					</value>
-				</li>
-
-				<!-- Add CE Explosives Comps to Shells -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Shell_GasToxic"]/comps</xpath>
-					<value>
-						<comps>
-							<li Class="CompProperties_Explosive">
-								<explosiveRadius>5.9</explosiveRadius>
-								<explosiveDamageType>Smoke</explosiveDamageType>
-								<explosiveExpandPerStackcount>0.4</explosiveExpandPerStackcount>
-								<startWickHitPointsPercent>0.333</startWickHitPointsPercent>
-								<postExplosionSpawnThingDef>ToxicGas</postExplosionSpawnThingDef>
-								<postExplosionSpawnChance>1.0</postExplosionSpawnChance>
-								<wickTicks>
-									<min>10</min>
-									<max>30</max>
-								</wickTicks>
-							</li>
-						</comps>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Shell_GasRage"]/comps</xpath>
-					<value>
-						<comps>
-							<li Class="CompProperties_Explosive">
-								<explosiveRadius>5.9</explosiveRadius>
-								<explosiveDamageType>Smoke</explosiveDamageType>
-								<explosiveExpandPerStackcount>0.4</explosiveExpandPerStackcount>
-								<startWickHitPointsPercent>0.333</startWickHitPointsPercent>
-								<postExplosionSpawnThingDef>RageGas</postExplosionSpawnThingDef>
-								<postExplosionSpawnChance>1.0</postExplosionSpawnChance>
-								<wickTicks>
-									<min>10</min>
-									<max>30</max>
-								</wickTicks>
-							</li>
-						</comps>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Shell_GasTear"]/comps</xpath>
-					<value>
-						<comps>
-							<li Class="CompProperties_Explosive">
-								<explosiveRadius>5.9</explosiveRadius>
-								<explosiveDamageType>Smoke</explosiveDamageType>
-								<explosiveExpandPerStackcount>0.4</explosiveExpandPerStackcount>
-								<startWickHitPointsPercent>0.333</startWickHitPointsPercent>
-								<postExplosionSpawnThingDef>TearGas</postExplosionSpawnThingDef>
-								<postExplosionSpawnChance>1.0</postExplosionSpawnChance>
-								<wickTicks>
-									<min>10</min>
-									<max>30</max>
-								</wickTicks>
-							</li>
-						</comps>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Shell_GasSleep"]/comps</xpath>
-					<value>
-						<comps>
-							<li Class="CompProperties_Explosive">
-								<explosiveRadius>5.9</explosiveRadius>
-								<explosiveDamageType>Smoke</explosiveDamageType>
-								<explosiveExpandPerStackcount>0.4</explosiveExpandPerStackcount>
-								<startWickHitPointsPercent>0.333</startWickHitPointsPercent>
-								<postExplosionSpawnThingDef>SleepGas</postExplosionSpawnThingDef>
-								<postExplosionSpawnChance>1.0</postExplosionSpawnChance>
-								<wickTicks>
-									<min>10</min>
-									<max>30</max>
-								</wickTicks>
-							</li>
-						</comps>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Shell_GasFear"]/comps</xpath>
-					<value>
-						<comps>
-							<li Class="CompProperties_Explosive">
-								<explosiveRadius>5.9</explosiveRadius>
-								<explosiveDamageType>Smoke</explosiveDamageType>
-								<explosiveExpandPerStackcount>0.4</explosiveExpandPerStackcount>
-								<startWickHitPointsPercent>0.333</startWickHitPointsPercent>
-								<postExplosionSpawnThingDef>FearGas</postExplosionSpawnThingDef>
-								<postExplosionSpawnChance>1.0</postExplosionSpawnChance>
-								<wickTicks>
-									<min>10</min>
-									<max>30</max>
-								</wickTicks>
-							</li>
-						</comps>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Shell_GasAcid"]/comps</xpath>
-					<value>
-						<comps>
-							<li Class="CompProperties_Explosive">
-								<explosiveRadius>5.9</explosiveRadius>
-								<explosiveDamageType>Smoke</explosiveDamageType>
-								<explosiveExpandPerStackcount>0.4</explosiveExpandPerStackcount>
-								<startWickHitPointsPercent>0.333</startWickHitPointsPercent>
-								<postExplosionSpawnThingDef>AcidGas</postExplosionSpawnThingDef>
-								<postExplosionSpawnChance>1.0</postExplosionSpawnChance>
-								<wickTicks>
-									<min>10</min>
-									<max>30</max>
-								</wickTicks>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Shell_MechVirus"]/comps</xpath>
-					<value>
-						<comps>
-							<li Class="CompProperties_Explosive">
-								<explosiveRadius>5.9</explosiveRadius>
-								<explosiveDamageType>Smoke</explosiveDamageType>
-								<explosiveExpandPerStackcount>0.4</explosiveExpandPerStackcount>
-								<startWickHitPointsPercent>0.333</startWickHitPointsPercent>
-								<postExplosionSpawnThingDef>MechanoidVirusGas</postExplosionSpawnThingDef>
-								<postExplosionSpawnChance>1.0</postExplosionSpawnChance>
-								<wickTicks>
-									<min>10</min>
-									<max>30</max>
-								</wickTicks>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Shell_GasAntiBug"]/comps</xpath>
-					<value>
-						<comps>
-							<li Class="CompProperties_Explosive">
-								<explosiveRadius>5.9</explosiveRadius>
-								<explosiveDamageType>Smoke</explosiveDamageType>
-								<explosiveExpandPerStackcount>0.4</explosiveExpandPerStackcount>
-								<startWickHitPointsPercent>0.333</startWickHitPointsPercent>
-								<postExplosionSpawnThingDef>AntiBugGas</postExplosionSpawnThingDef>
-								<postExplosionSpawnChance>1.0</postExplosionSpawnChance>
-								<wickTicks>
-									<min>10</min>
-									<max>30</max>
-								</wickTicks>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- Add New Bullet Base-->
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[
-						defName="Bullet_Shell_GasToxic" or
-						defName="Bullet_Shell_GasRage" or
-						defName="Bullet_Shell_GasTear" or
-						defName="Bullet_Shell_GasSleep" or
-						defName="Bullet_Shell_GasFear" or
-						defName="Bullet_Shell_GasAcid" or
-						defName="Bullet_Shell_MechVirus" or
-						defName="Bullet_Shell_GasAntiBug"] </xpath>
-					<attribute>ParentName</attribute>
-					<value>Base81mmMortarShell</value>
-				</li>
-
-				<!-- Projectiles -->
-				<li Class="PatchOperationAttributeAdd">
-					<xpath>Defs/ThingDef[
-						defName="Bullet_Shell_GasToxic" or
-						defName="Bullet_Shell_GasRage" or
-						defName="Bullet_Shell_GasTear" or
-						defName="Bullet_Shell_GasSleep" or
-						defName="Bullet_Shell_GasFear" or
-						defName="Bullet_Shell_GasAcid" or
-						defName="Bullet_Shell_MechVirus" or
-						defName="Bullet_Shell_GasAntiBug"]/projectile </xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.ProjectilePropertiesCE</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Bullet_Shell_GasToxic" or
-						defName="Bullet_Shell_GasRage" or
-						defName="Bullet_Shell_GasTear" or
-						defName="Bullet_Shell_GasSleep" or
-						defName="Bullet_Shell_GasFear" or
-						defName="Bullet_Shell_GasAcid" or
-						defName="Bullet_Shell_MechVirus" or
-						defName="Bullet_Shell_GasAntiBug"]/thingClass </xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Gas Traps and Shells/Patch_AmmoCategories_Gas.xml b/Patches/Gas Traps and Shells/Patch_AmmoCategories_Gas.xml
deleted file mode 100644
index f161809050..0000000000
--- a/Patches/Gas Traps and Shells/Patch_AmmoCategories_Gas.xml	
+++ /dev/null
@@ -1,341 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Gas Traps And Shells</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Change gas colors to better fit gaz type/texture colors... -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MechanoidVirusGas"]/graphicData/color</xpath>
-					<value>
-						<color>(0.6,0.7,0.7,0.3)</color>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AntiBugGas"]/graphicData/color</xpath>
-					<value>
-						<color>(0.7,0.6,0.0,0.3)</color>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ToxicGas"]/graphicData/color</xpath>
-					<value>
-						<color>(0.2,0.4,0.2,0.3)</color>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SleepGas"]/graphicData/color</xpath>
-					<value>
-						<color>(0.4,0.3,0.9,0.3)</color>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RageGas"]/graphicData/color</xpath>
-					<value>
-						<color>(1.0,0.3,0.4,0.3)</color>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AcidGas"]/graphicData/color</xpath>
-					<value>
-						<color>(0.6,0.8,0.1,0.3)</color>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FearGas"]/graphicData/color</xpath>
-					<value>
-						<color>(0.7,0.3,0.3,0.3)</color>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TearGas"]/graphicData/color</xpath>
-					<value>
-						<color>(0.6,0.2,0.9,0.3)</color>
-					</value>
-				</li>
-
-				<!-- Change damage type of certain shells, to be used in sieges -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_Shell_GasToxic"]/projectile/damageDef</xpath>
-					<value>
-						<damageDef>Bomb</damageDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_Shell_GasAcid"]/projectile/damageDef</xpath>
-					<value>
-						<damageDef>Bomb</damageDef>
-					</value>
-				</li>
-
-				<!-- Change shell textures -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Shell_GasToxic"]/graphicData</xpath>
-					<value>
-						<graphicData>
-							<texPath>ThirdParty/GasTraps/Mortar</texPath>
-							<graphicClass>Graphic_StackCount</graphicClass>
-							<shaderType>CutoutComplex</shaderType>
-							<color>(70,183,79)</color>
-						</graphicData>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Shell_GasRage"]/graphicData</xpath>
-					<value>
-						<graphicData>
-							<texPath>ThirdParty/GasTraps/Mortar</texPath>
-							<graphicClass>Graphic_StackCount</graphicClass>
-							<shaderType>CutoutComplex</shaderType>
-							<color>(200,112,112)</color>
-						</graphicData>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Shell_GasTear"]/graphicData</xpath>
-					<value>
-						<graphicData>
-							<texPath>ThirdParty/GasTraps/Mortar</texPath>
-							<graphicClass>Graphic_StackCount</graphicClass>
-							<shaderType>CutoutComplex</shaderType>
-							<color>(181,151,185)</color>
-						</graphicData>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Shell_GasFear"]/graphicData</xpath>
-					<value>
-						<graphicData>
-							<texPath>ThirdParty/GasTraps/Mortar</texPath>
-							<graphicClass>Graphic_StackCount</graphicClass>
-							<shaderType>CutoutComplex</shaderType>
-							<color>(185,142,132)</color>
-						</graphicData>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Shell_GasSleep"]/graphicData</xpath>
-					<value>
-						<graphicData>
-							<texPath>ThirdParty/GasTraps/Mortar</texPath>
-							<graphicClass>Graphic_StackCount</graphicClass>
-							<shaderType>CutoutComplex</shaderType>
-							<color>(113,154,208)</color>
-						</graphicData>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Shell_GasAcid"]/graphicData</xpath>
-					<value>
-						<graphicData>
-							<texPath>ThirdParty/GasTraps/Mortar</texPath>
-							<graphicClass>Graphic_StackCount</graphicClass>
-							<shaderType>CutoutComplex</shaderType>
-							<color>(179,178,119)</color>
-						</graphicData>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Shell_MechVirus"]/graphicData</xpath>
-					<value>
-						<graphicData>
-							<texPath>ThirdParty/GasTraps/Mortar</texPath>
-							<graphicClass>Graphic_StackCount</graphicClass>
-							<shaderType>CutoutComplex</shaderType>
-							<color>(220,220,220)</color>
-						</graphicData>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Shell_GasAntiBug"]/graphicData</xpath>
-					<value>
-						<graphicData>
-							<texPath>ThirdParty/GasTraps/Mortar</texPath>
-							<graphicClass>Graphic_StackCount</graphicClass>
-							<shaderType>CutoutComplex</shaderType>
-							<color>(70,183,79)</color>
-						</graphicData>
-					</value>
-				</li>
-
-				<!-- Change projectile textures -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_Shell_GasToxic"]/graphicData</xpath>
-					<value>
-						<graphicData>
-							<texPath>ThirdParty/GasTraps/gas_mortar_projectile</texPath>
-							<graphicClass>Graphic_Single</graphicClass>
-							<shaderType>CutoutComplex</shaderType>
-							<color>(70,183,79)</color>
-						</graphicData>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_Shell_GasRage"]/graphicData</xpath>
-					<value>
-						<graphicData>
-							<texPath>ThirdParty/GasTraps/gas_mortar_projectile</texPath>
-							<graphicClass>Graphic_Single</graphicClass>
-							<shaderType>CutoutComplex</shaderType>
-							<color>(200,112,112)</color>
-						</graphicData>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_Shell_GasTear"]/graphicData</xpath>
-					<value>
-						<graphicData>
-							<texPath>ThirdParty/GasTraps/gas_mortar_projectile</texPath>
-							<graphicClass>Graphic_Single</graphicClass>
-							<shaderType>CutoutComplex</shaderType>
-							<color>(181,151,185)</color>
-						</graphicData>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_Shell_GasFear"]/graphicData</xpath>
-					<value>
-						<graphicData>
-							<texPath>ThirdParty/GasTraps/gas_mortar_projectile</texPath>
-							<graphicClass>Graphic_Single</graphicClass>
-							<shaderType>CutoutComplex</shaderType>
-							<color>(185,142,132)</color>
-						</graphicData>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_Shell_GasSleep"]/graphicData</xpath>
-					<value>
-						<graphicData>
-							<texPath>ThirdParty/GasTraps/gas_mortar_projectile</texPath>
-							<graphicClass>Graphic_Single</graphicClass>
-							<shaderType>CutoutComplex</shaderType>
-							<color>(113,154,208)</color>
-						</graphicData>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_Shell_GasAcid"]/graphicData</xpath>
-					<value>
-						<graphicData>
-							<texPath>ThirdParty/GasTraps/gas_mortar_projectile</texPath>
-							<graphicClass>Graphic_Single</graphicClass>
-							<shaderType>CutoutComplex</shaderType>
-							<color>(179,178,119)</color>
-						</graphicData>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_Shell_MechVirus"]/graphicData</xpath>
-					<value>
-						<graphicData>
-							<texPath>ThirdParty/GasTraps/gas_mortar_projectile</texPath>
-							<graphicClass>Graphic_Single</graphicClass>
-							<shaderType>CutoutComplex</shaderType>
-							<color>(220,220,220)</color>
-						</graphicData>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_Shell_GasAntiBug"]/graphicData</xpath>
-					<value>
-						<graphicData>
-							<texPath>ThirdParty/GasTraps/gas_mortar_projectile</texPath>
-							<graphicClass>Graphic_Single</graphicClass>
-							<shaderType>CutoutComplex</shaderType>
-							<color>(70,183,79)</color>
-						</graphicData>
-					</value>
-				</li>
-
-				<!-- Change shell names to better fit Combat Extended -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Shell_GasToxic"]/label</xpath>
-					<value>
-						<label>81mm mortar shell (Toxic)</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Shell_GasRage"]/label</xpath>
-					<value>
-						<label>81mm mortar shell (Rage)</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Shell_GasTear"]/label</xpath>
-					<value>
-						<label>81mm mortar shell (Tear gas)</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Shell_GasSleep"]/label</xpath>
-					<value>
-						<label>81mm mortar shell (Sleep)</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Shell_GasFear"]/label</xpath>
-					<value>
-						<label>81mm mortar shell (Fear)</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Shell_GasAcid"]/label</xpath>
-					<value>
-						<label>81mm mortar shell (Acid)</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Shell_MechVirus"]/label</xpath>
-					<value>
-						<label>81mm mortar shell (Nanomachines)</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Shell_GasAntiBug"]/label</xpath>
-					<value>
-						<label>81mm mortar shell (Insecticide)</label>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Gas Traps and Shells/Patch_AmmoCategories_Grenades.xml b/Patches/Gas Traps and Shells/Patch_AmmoCategories_Grenades.xml
deleted file mode 100644
index 6f5737c8b2..0000000000
--- a/Patches/Gas Traps and Shells/Patch_AmmoCategories_Grenades.xml	
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Gas Traps And Shells</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<CombatExtended.AmmoCategoryDef>
-							<defName>Toxic</defName>
-							<label>Toxic gas</label>
-							<description>Filled with a potent nerve agent harmful to most complex forms of organic life.</description>
-							<advanced>true</advanced>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>Rage</defName>
-							<label>Rage gas</label>
-							<description>Filled with a specialized airbone agent that induces a blind, uncontrollable rage.</description>
-							<advanced>true</advanced>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>TearGas</defName>
-							<label>Tear gas</label>
-							<description>Filled with a specialized airbone agent that attacks the sensitive membranes of the eyes and nose, making it difficult to see or breathe.</description>
-							<advanced>true</advanced>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>Sleep</defName>
-							<label>Sleep gas</label>
-							<description>Filled with a powerful sedative, capable of knocking unconscious anyone exposed to it.</description>
-							<advanced>true</advanced>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>Fear</defName>
-							<label>Fear gas</label>
-							<description>Filled with a specialized airbone agent that induces an extremely strong feeling of dread and terror.</description>
-							<advanced>true</advanced>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>Acid</defName>
-							<label>Corrosive gas</label>
-							<description>Filled with an extremely strong acid, capable of quickly burning flesh and metal alike.</description>
-							<advanced>true</advanced>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>MechVirus</defName>
-							<label>Nanomachine</label>
-							<description>Contains nanomachines designed to latch onto and wreck havoc on the systems of mechanoids. Ineffective against organic life.</description>
-							<advanced>true</advanced>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>AntiInsect</defName>
-							<label>Insecticide</label>
-							<description>Filled with a special aerosol designed to kill insectoids.</description>
-							<advanced>true</advanced>
-						</CombatExtended.AmmoCategoryDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Gas Traps and Shells/Patch_Ammo_Gas.xml b/Patches/Gas Traps and Shells/Patch_Ammo_Gas.xml
deleted file mode 100644
index de250d5227..0000000000
--- a/Patches/Gas Traps and Shells/Patch_Ammo_Gas.xml	
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Gas Traps And Shells</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-				<CombatExtended.AmmoCategoryDef>
-					<defName>GasToxic</defName>
-					<label>toxic gas</label>
-					<labelShort>Toxic</labelShort>
-					<description>This shell contains a potent, nerve agent, harmful to most complex forms of organic life.</description>
-				</CombatExtended.AmmoCategoryDef>
-
-				<CombatExtended.AmmoCategoryDef>
-					<defName>GasRage</defName>
-					<label>rage gas</label>
-					<labelShort>Rage</labelShort>
-					<description>This shell contains a potent, specialized airborne agent that induces blind, uncontrollable rage.</description>
-				</CombatExtended.AmmoCategoryDef>
-
-				<CombatExtended.AmmoCategoryDef>
-					<defName>GasTear</defName>
-					<label>tear gas</label>
-					<labelShort>CN</labelShort>
-					<description>This shell contains a potent, specialized airborne agent that attacks the sensitive membranes of the eyes and nose, making it difficult to see or breathe.</description>
-				</CombatExtended.AmmoCategoryDef>
-
-				<CombatExtended.AmmoCategoryDef>
-					<defName>GasFear</defName>
-					<label>fear gas</label>
-					<labelShort>Fear</labelShort>
-					<description>This shell contains a potent, specialized airborne agent that induces an extremely strong feeling of dread and terror.</description>
-				</CombatExtended.AmmoCategoryDef>
-
-				<CombatExtended.AmmoCategoryDef>
-					<defName>GasSleep</defName>
-					<label>sleeping gas</label>
-					<labelShort>sleep</labelShort>
-					<description>This shell contains a potent sedative, capable of quickly knocking unconscious anyone exposed to it.</description>
-				</CombatExtended.AmmoCategoryDef>
-
-				<CombatExtended.AmmoCategoryDef>
-					<defName>GasAcid</defName>
-					<label>acid</label>
-					<labelShort>acid</labelShort>
-					<description>This shell contains an extremely strong acid, capable of quickly burning away flesh and metal alike.</description>
-				</CombatExtended.AmmoCategoryDef>
-
-				<CombatExtended.AmmoCategoryDef>
-					<defName>MechVirus</defName>
-					<label>Nanomachines</label>
-					<labelShort>Nano</labelShort>
-					<description>This shell contains nanomachines designed to latch onto and wreck havoc on the systems of mechanoids. Ineffective against organic life.</description>
-				</CombatExtended.AmmoCategoryDef>
-
-				<CombatExtended.AmmoCategoryDef>
-					<defName>AntiBug</defName>
-					<label>Insecticide</label>
-					<labelShort>Anti-Bug</labelShort>
-					<description>This shell is filled with a special aerosol specially designed to kill insectoids.</description>
-				</CombatExtended.AmmoCategoryDef>
-			</value>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Gas Traps and Shells/Patch_Buildings_GasTrap.xml b/Patches/Gas Traps and Shells/Patch_Buildings_GasTrap.xml
deleted file mode 100644
index 0aa85ca4aa..0000000000
--- a/Patches/Gas Traps and Shells/Patch_Buildings_GasTrap.xml	
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Gas Traps And Shells</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Changing names & descs of gas traps -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GasTrap"]/label</xpath>
-					<value>
-						<label>IED toxic gas trap</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GasTrapRage"]/label</xpath>
-					<value>
-						<label>IED rage gas trap</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GasTrapSleepGas"]/label</xpath>
-					<value>
-						<label>IED sleep gas trap</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GasTrapFearGas"]/label</xpath>
-					<value>
-						<label>IED fear gas trap</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GasTrapAcid"]/label</xpath>
-					<value>
-						<label>IED corrosive gas trap</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GasTrapMechanoidVirus"]/label</xpath>
-					<value>
-						<label>IED nanomachine trap</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GasTrapAntiBugGas"]/label</xpath>
-					<value>
-						<label>IED insecticide gas trap</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GasTrap"]/description</xpath>
-					<value>
-						<description>A toxic gas shell connected to a trigger which detonates on touch or bullet impact. Since it is hidden in the surrounding terrain, it cannot be placed adjacent to other traps. Animals can sense these when calm.</description>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GasTrapRage"]/description</xpath>
-					<value>
-						<description>Ar rage gas shell connected to a trigger which detonates on touch or bullet impact. Since it is hidden in the surrounding terrain, it cannot be placed adjacent to other traps. Animals can sense these when calm.</description>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GasTrapSleepGas"]/description</xpath>
-					<value>
-						<description>A sleep gas shell connected to a trigger which detonates on touch or bullet impact. Since it is hidden in the surrounding terrain, it cannot be placed adjacent to other traps. Animals can sense these when calm.</description>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GasTrapFearGas"]/description</xpath>
-					<value>
-						<description>A fear gas shell connected to a trigger which detonates on touch or bullet impact. Since it is hidden in the surrounding terrain, it cannot be placed adjacent to other traps. Animals can sense these when calm.</description>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GasTrapAcid"]/description</xpath>
-					<value>
-						<description>A corrosive gas shell connected to a trigger which detonates on touch or bullet impact. Since it is hidden in the surrounding terrain, it cannot be placed adjacent to other traps. Animals can sense these when calm.</description>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GasTrapMechanoidVirus"]/description</xpath>
-					<value>
-						<description>A nanomachine shell connected to a trigger which detonates on touch or bullet impact. Since it is hidden in the surrounding terrain, it cannot be placed adjacent to other traps. Animals can sense these when calm.</description>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GasTrapAntiBugGas"]/description</xpath>
-					<value>
-						<description>A insecticide gas shell connected to a trigger which detonates on touch or bullet impact. Since it is hidden in the surrounding terrain, it cannot be placed adjacent to other traps. Animals can sense these when calm.</description>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Gas Traps and Shells/Patch_Hediff_Gas.xml b/Patches/Gas Traps and Shells/Patch_Hediff_Gas.xml
deleted file mode 100644
index d97adda690..0000000000
--- a/Patches/Gas Traps and Shells/Patch_Hediff_Gas.xml	
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Gas Traps And Shells</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Change Mechanoid Virus to [pending], and make descriptions less cringy... -->
-				<!--	
-		<li Class="PatchOperationReplace">
-				<xpath>Defs/HediffDef[defName="ToxicGas"]/description</xpath>
-				<value>
-				<description>Potent nerve agent in the lungs. Affects consciousness and most bodily functions. Can cause dementia and carcinoma at moderate doses, and death at extreme doses.</description>
-				</value>
-			</li>
-			
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/HediffDef[defName="RageGas"]/description</xpath>
-				<value>
-				<description>Induces a blind, uncontrollable rage at moderate doses. Moderately affects bodily functions.</description>
-				</value>
-			</li>
-			
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/HediffDef[defName="TearGas"]/description</xpath>
-				<value>
-				<description>Specialized airbone agent that attacks the sensitive membranes of the eyes and nose, making it difficult to see or breathe.</description>
-				</value>
-			</li>
-			
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/HediffDef[defName="SleepGas"]/description</xpath>
-				<value>
-				<description>Powerful sedative in the lungs, affects consciousness.</description>
-				</value>
-			</li>
-			
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/HediffDef[defName="FearGas"]/description</xpath>
-				<value>
-				<description>Induces an extremely strong feeling of dread and terror.</description>
-				</value>
-			</li>
-			
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/HediffDef[defName="AcidGas"]/description</xpath>
-				<value>
-				<description>Severely irritate and dissolves the lungs. Causes excrutiating pain, vomiting, and death.</description>
-				</value>
-			</li>
-			
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/HediffDef[defName="MechanoidVirus"]/description</xpath>
-				<value>
-				<description>A special blend of mechanites nanomachines that cause chaos inside mechanoids. Causes various and unpredictable effects on mechanoids. Otherwise useless.</description>
-				</value>
-			</li>
-			
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/HediffDef[defName="MechanoidVirus"]/label</xpath>
-				<value>
-				<label>Nanomachine invasion</label>
-				</value>
-			</li>
-			
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/HediffDef[defName="MechStunLoop"]/description</xpath>
-				<value>
-				<description>A failure in the power core is causing this mechanoid to reboot constantly.</description>
-				</value>
-			</li>
-			
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/HediffDef[defName="MechStunLoop"]/label</xpath>
-				<value>
-				<label>Power core failure</label>
-				</value>
-			</li>
-			
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/HediffDef[defName="AntiBugPoison"]/description</xpath>
-				<value>
-				<description>Powerful neurotoxin specifically designed to progessively destroy all bodily functions of insectoids.</description>
-				</value>
-			</li>
-	-->
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Gas Traps and Shells/Patch_PawnKinds_CE.xml b/Patches/Gas Traps and Shells/Patch_PawnKinds_CE.xml
deleted file mode 100644
index 8f2d25ae9b..0000000000
--- a/Patches/Gas Traps and Shells/Patch_PawnKinds_CE.xml	
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Gas Traps And Shells</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Mercenary chemical grenadier -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<PawnKindDef ParentName="MercenaryGunnerBase">
-							<defName>MercenaryChemGrenadier</defName>
-							<label>mercenary chemical grenadier</label>
-							<combatPower>60</combatPower>
-							<canBeSapper>true</canBeSapper>
-							<weaponTags Inherit="False">
-								<li>GrenadeSmoke</li>
-							</weaponTags>
-							<initialResistanceRange>10~20</initialResistanceRange>
-							<weaponMoney>500~500</weaponMoney>
-							<apparelRequired>
-								<li>CE_Apparel_GasMask</li>
-							</apparelRequired>
-							<techHediffsTags>
-								<li>Advanced</li>
-							</techHediffsTags>
-							<techHediffsChance>0.01</techHediffsChance>
-							<modExtensions>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>10</min>
-										<max>30</max>
-									</primaryMagazineCount>
-									<forcedSidearm>
-										<sidearmMoney>
-											<min>100</min>
-											<max>200</max>
-										</sidearmMoney>
-										<weaponTags>
-											<li>CE_Sidearm</li>
-										</weaponTags>
-									</forcedSidearm>
-								</li>
-							</modExtensions>
-						</PawnKindDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<PawnKindDef ParentName="PirateScavTierBase">
-							<defName>Noxxer</defName>
-							<label>scavenger noxxer</label>
-							<combatPower>40</combatPower>
-							<canBeSapper>true</canBeSapper>
-							<apparelMoney>300~500</apparelMoney>
-							<apparelRequired>
-								<li>CE_Apparel_GasMask</li>
-							</apparelRequired>
-							<weaponMoney>200~300</weaponMoney>
-							<weaponTags>
-								<li>GrenadeSmoke</li>
-							</weaponTags>
-							<initialResistanceRange>10~20</initialResistanceRange>
-							<modExtensions>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>10</min>
-										<max>30</max>
-									</primaryMagazineCount>
-									<forcedSidearm>
-										<sidearmMoney>
-											<min>100</min>
-											<max>200</max>
-										</sidearmMoney>
-										<weaponTags>
-											<li>CE_Sidearm_Melee</li>
-										</weaponTags>
-									</forcedSidearm>
-								</li>
-							</modExtensions>
-						</PawnKindDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Gas Traps and Shells/Patch_Recipes_HandGrenades.xml b/Patches/Gas Traps and Shells/Patch_Recipes_HandGrenades.xml
deleted file mode 100644
index bb8028d60e..0000000000
--- a/Patches/Gas Traps and Shells/Patch_Recipes_HandGrenades.xml	
+++ /dev/null
@@ -1,423 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Gas Traps And Shells</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>MakeToxicGasGrenade</defName>
-							<label>make toxic gas grenades x10</label>
-							<description>Craft 10 toxic gas grenades.</description>
-							<jobString>Making toxic gas grenades.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Canister_ToxicGas</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-									<li>Canister_ToxicGas</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Weapon_GrenadeToxic>10</Weapon_GrenadeToxic>
-							</products>
-							<workAmount>3600</workAmount>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>MakeRageGasGrenade</defName>
-							<label>make rage gas grenades x10</label>
-							<description>Craft 10 rage gas grenades.</description>
-							<jobString>Making rage gas grenades.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Canister_RageGas</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-									<li>Canister_RageGas</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Weapon_GrenadeRage>10</Weapon_GrenadeRage>
-							</products>
-							<workAmount>3600</workAmount>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>MakeTearGasGrenade</defName>
-							<label>make tear gas grenades x10</label>
-							<description>Craft 10 tear gas grenades.</description>
-							<jobString>Making tear gas grenades.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Canister_TearGas</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-									<li>Canister_TearGas</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Weapon_GrenadeTearGas>10</Weapon_GrenadeTearGas>
-							</products>
-							<workAmount>3600</workAmount>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>MakeSleepGasGrenade</defName>
-							<label>make sleep gas grenades x10</label>
-							<description>Craft 10 sleep gas grenades.</description>
-							<jobString>Making sleep gas grenades.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Canister_SleepGas</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-									<li>Canister_SleepGas</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Weapon_GrenadeSleep>10</Weapon_GrenadeSleep>
-							</products>
-							<workAmount>3600</workAmount>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>MakeFearGasGrenade</defName>
-							<label>make fear gas grenades x10</label>
-							<description>Craft 10 fear gas grenades.</description>
-							<jobString>Making fear gas grenades.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Canister_FearGas</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-									<li>Canister_FearGas</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Weapon_GrenadeFear>10</Weapon_GrenadeFear>
-							</products>
-							<workAmount>3600</workAmount>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>MakeAcidGasGrenade</defName>
-							<label>make corrosive gas grenades x10</label>
-							<description>Craft 10 corrosive gas grenades.</description>
-							<jobString>Making corrosive gas grenades.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Canister_AcidGas</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-									<li>Canister_AcidGas</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Weapon_GrenadeAcid>10</Weapon_GrenadeAcid>
-							</products>
-							<workAmount>3600</workAmount>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>MakeMechVirusGrenade</defName>
-							<label>make nanomachine canisters x10</label>
-							<description>Craft 10 nanomachine canisters.</description>
-							<jobString>Making nanomachine canisters.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Canister_MechVirusGas</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>3</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-									<li>Canister_MechVirusGas</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Weapon_GrenadeMechVirus>10</Weapon_GrenadeMechVirus>
-							</products>
-							<workAmount>3600</workAmount>
-						</RecipeDef>
-					</value>
-
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>MakeAntiBugGrenade</defName>
-							<label>make insecticide gas grenades x10</label>
-							<description>Craft 10 insecticide gas grenades.</description>
-							<jobString>Making insecticide gas grenades.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Canister_AntibugGas</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-									<li>Canister_AntibugGas</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Weapon_GrenadeAntiBug>10</Weapon_GrenadeAntiBug>
-							</products>
-							<workAmount>3600</workAmount>
-						</RecipeDef>
-					</value>
-
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Gas Traps and Shells/Patch_Weapons_Grenades.xml b/Patches/Gas Traps and Shells/Patch_Weapons_Grenades.xml
deleted file mode 100644
index 88da956dde..0000000000
--- a/Patches/Gas Traps and Shells/Patch_Weapons_Grenades.xml	
+++ /dev/null
@@ -1,693 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Gas Traps And Shells</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==================== Toxic Gas Grenade ========================== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="BaseGrenadeProjectile">
-							<defName>Proj_GrenadeToxic</defName>
-							<label>toxic gas grenade</label>
-							<graphicData>
-								<texPath>ThirdParty/GasTraps/gas_grenade_projectile</texPath>
-								<color>(70,183,79)</color>
-								<shaderType>CutoutComplex</shaderType>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>4</explosionRadius>
-								<damageDef>Smoke</damageDef>
-								<suppressionFactor>0.0</suppressionFactor>
-								<dangerFactor>0.0</dangerFactor>
-								<explosionDelay>30</explosionDelay>
-								<dropsCasings>true</dropsCasings>
-								<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-								<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-								<postExplosionSpawnThingDef>ToxicGas</postExplosionSpawnThingDef>
-								<preExplosionSpawnChance>1</preExplosionSpawnChance>
-								<speed>10</speed>
-							</projectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGrenadeEquipment">
-							<defName>Weapon_GrenadeToxic</defName>
-							<equipmentType>Primary</equipmentType>
-							<label>toxic gas grenade</label>
-							<description>Releases a large cloud of a potent nerve agent harmful to most complex forms of organic life.</description>
-							<graphicData>
-								<texPath>ThirdParty/GasTraps/HandGrenade</texPath>
-								<color>(70,183,79)</color>
-								<shaderType>CutoutComplex</shaderType>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<soundInteract>Interact_Grenade</soundInteract>
-							<techLevel>Industrial</techLevel>
-							<statBases>
-								<Mass>0.539</Mass>
-								<Bulk>1.05</Bulk>
-								<MarketValue>10.15</MarketValue>
-								<SightsEfficiency>1.0</SightsEfficiency>
-								<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-							</statBases>
-							<weaponTags>
-								<li>CE_OneHandedWeapon</li>
-								<li>CE_AI_Grenade</li>
-								<li>GrenadeSmoke</li>
-							</weaponTags>
-							<thingCategories>
-								<li>Grenades</li>
-							</thingCategories>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<label>throw toxic gas grenade</label>
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<range>10</range>
-									<warmupTime>1.8</warmupTime>
-									<noiseRadius>4</noiseRadius>
-									<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-									<soundCast>ThrowGrenade</soundCast>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<defaultProjectile>Proj_GrenadeToxic</defaultProjectile>
-									<onlyManualCast>true</onlyManualCast>
-									<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-								</li>
-							</verbs>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>4</damageAmountBase>
-									<explosiveDamageType>Smoke</explosiveDamageType>
-									<postExplosionSpawnThingDef>ToxicGas</postExplosionSpawnThingDef>
-									<preExplosionSpawnChance>1</preExplosionSpawnChance>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- ==================== Rage Gas Grenade ========================== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="BaseGrenadeProjectile">
-							<defName>Proj_GrenadeRage</defName>
-							<label>rage gas grenade</label>
-							<graphicData>
-								<texPath>ThirdParty/GasTraps/gas_grenade_projectile</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>CutoutComplex</shaderType>
-								<color>(200,112,112)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>4</explosionRadius>
-								<damageDef>Smoke</damageDef>
-								<suppressionFactor>0.0</suppressionFactor>
-								<dangerFactor>0.0</dangerFactor>
-								<explosionDelay>30</explosionDelay>
-								<dropsCasings>true</dropsCasings>
-								<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-								<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-								<postExplosionSpawnThingDef>RageGas</postExplosionSpawnThingDef>
-								<preExplosionSpawnChance>1</preExplosionSpawnChance>
-								<speed>10</speed>
-							</projectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGrenadeEquipment">
-							<defName>Weapon_GrenadeRage</defName>
-							<equipmentType>Primary</equipmentType>
-							<label>rage gas grenade</label>
-							<description>Releases a large cloud of a specialized airbone agent that induces a blind, uncontrollable rage..</description>
-							<graphicData>
-								<texPath>ThirdParty/GasTraps/HandGrenade</texPath>
-								<color>(200,112,112)</color>
-								<shaderType>CutoutComplex</shaderType>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<soundInteract>Interact_Grenade</soundInteract>
-							<techLevel>Industrial</techLevel>
-							<statBases>
-								<Mass>0.539</Mass>
-								<Bulk>1.05</Bulk>
-								<MarketValue>10.15</MarketValue>
-								<SightsEfficiency>1.0</SightsEfficiency>
-								<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-							</statBases>
-							<weaponTags>
-								<li>CE_AI_Nonlethal</li>
-								<li>GrenadeSmoke</li>
-							</weaponTags>
-							<thingCategories>
-								<li>Grenades</li>
-							</thingCategories>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<label>throw rage gas grenade</label>
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<range>10</range>
-									<warmupTime>1.8</warmupTime>
-									<noiseRadius>4</noiseRadius>
-									<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-									<soundCast>ThrowGrenade</soundCast>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<defaultProjectile>Proj_GrenadeRage</defaultProjectile>
-									<onlyManualCast>true</onlyManualCast>
-									<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-								</li>
-							</verbs>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>4</damageAmountBase>
-									<explosiveDamageType>Smoke</explosiveDamageType>
-									<postExplosionSpawnThingDef>RageGas</postExplosionSpawnThingDef>
-									<preExplosionSpawnChance>1</preExplosionSpawnChance>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- ==================== Tear Gas Grenade ========================== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="BaseGrenadeProjectile">
-							<defName>Proj_GrenadeTearGas</defName>
-							<label>tear gas grenade</label>
-							<graphicData>
-								<texPath>ThirdParty/GasTraps/gas_grenade_projectile</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>CutoutComplex</shaderType>
-								<color>(181,151,185)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>4</explosionRadius>
-								<damageDef>Smoke</damageDef>
-								<suppressionFactor>0.0</suppressionFactor>
-								<dangerFactor>0.0</dangerFactor>
-								<explosionDelay>30</explosionDelay>
-								<dropsCasings>true</dropsCasings>
-								<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-								<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-								<postExplosionSpawnThingDef>TearGas</postExplosionSpawnThingDef>
-								<preExplosionSpawnChance>1</preExplosionSpawnChance>
-								<speed>10</speed>
-							</projectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGrenadeEquipment">
-							<defName>Weapon_GrenadeTearGas</defName>
-							<equipmentType>Primary</equipmentType>
-							<label>tear gas grenade</label>
-							<description>Releases a large cloud of a specialized airbone agent that attacks the sensitive membranes of the eyes and nose, making it difficult to see or breathe..</description>
-							<graphicData>
-								<texPath>ThirdParty/GasTraps/HandGrenade</texPath>
-								<color>(181,151,185)</color>
-								<shaderType>CutoutComplex</shaderType>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<soundInteract>Interact_Grenade</soundInteract>
-							<techLevel>Industrial</techLevel>
-							<statBases>
-								<Mass>0.539</Mass>
-								<Bulk>1.05</Bulk>
-								<MarketValue>10.15</MarketValue>
-								<SightsEfficiency>1.0</SightsEfficiency>
-								<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-							</statBases>
-							<weaponTags>
-								<li>CE_AI_Nonlethal</li>
-								<li>GrenadeSmoke</li>
-							</weaponTags>
-							<thingCategories>
-								<li>Grenades</li>
-							</thingCategories>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<label>throw tear gas grenade</label>
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<range>10</range>
-									<warmupTime>1.8</warmupTime>
-									<noiseRadius>4</noiseRadius>
-									<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-									<soundCast>ThrowGrenade</soundCast>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<defaultProjectile>Proj_GrenadeTearGas</defaultProjectile>
-									<onlyManualCast>true</onlyManualCast>
-									<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-								</li>
-							</verbs>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>4</damageAmountBase>
-									<explosiveDamageType>Smoke</explosiveDamageType>
-									<postExplosionSpawnThingDef>TearGas</postExplosionSpawnThingDef>
-									<preExplosionSpawnChance>1</preExplosionSpawnChance>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- ==================== Sleep Gas Grenade ========================== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="BaseGrenadeProjectile">
-							<defName>Proj_GrenadeSleep</defName>
-							<label>sleep gas grenade</label>
-							<graphicData>
-								<texPath>ThirdParty/GasTraps/gas_grenade_projectile</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<color>(113,154,208)</color>
-								<shaderType>CutoutComplex</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>4</explosionRadius>
-								<damageDef>Smoke</damageDef>
-								<suppressionFactor>0.0</suppressionFactor>
-								<dangerFactor>0.0</dangerFactor>
-								<explosionDelay>30</explosionDelay>
-								<dropsCasings>true</dropsCasings>
-								<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-								<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-								<postExplosionSpawnThingDef>SleepGas</postExplosionSpawnThingDef>
-								<preExplosionSpawnChance>1</preExplosionSpawnChance>
-								<speed>10</speed>
-							</projectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGrenadeEquipment">
-							<defName>Weapon_GrenadeSleep</defName>
-							<equipmentType>Primary</equipmentType>
-							<label>sleep gas grenade</label>
-							<description>Releases a large cloud of powerful sedatives, capable of knocking unconscious anyone exposed to it.</description>
-							<graphicData>
-								<texPath>ThirdParty/GasTraps/HandGrenade</texPath>
-								<color>(113,154,208)</color>
-								<shaderType>CutoutComplex</shaderType>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<soundInteract>Interact_Grenade</soundInteract>
-							<techLevel>Industrial</techLevel>
-							<statBases>
-								<Mass>0.539</Mass>
-								<Bulk>1.05</Bulk>
-								<MarketValue>10.15</MarketValue>
-								<SightsEfficiency>1.0</SightsEfficiency>
-								<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-							</statBases>
-							<weaponTags>
-								<li>CE_AI_Nonlethal</li>
-								<li>GrenadeSmoke</li>
-							</weaponTags>
-							<thingCategories>
-								<li>Grenades</li>
-							</thingCategories>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<label>throw sleep gas grenade</label>
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<range>10</range>
-									<warmupTime>1.8</warmupTime>
-									<noiseRadius>4</noiseRadius>
-									<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-									<soundCast>ThrowGrenade</soundCast>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<defaultProjectile>Proj_GrenadeSleep</defaultProjectile>
-									<onlyManualCast>true</onlyManualCast>
-									<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-								</li>
-							</verbs>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>4</damageAmountBase>
-									<explosiveDamageType>Smoke</explosiveDamageType>
-									<postExplosionSpawnThingDef>SleepGas</postExplosionSpawnThingDef>
-									<preExplosionSpawnChance>1</preExplosionSpawnChance>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- ==================== Fear Gas Grenade ========================== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="BaseGrenadeProjectile">
-							<defName>Proj_GrenadeFear</defName>
-							<label>fear gas grenade</label>
-							<graphicData>
-								<texPath>ThirdParty/GasTraps/gas_grenade_projectile</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>CutoutComplex</shaderType>
-								<color>(185,142,132)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>4</explosionRadius>
-								<damageDef>Smoke</damageDef>
-								<suppressionFactor>0.0</suppressionFactor>
-								<dangerFactor>0.0</dangerFactor>
-								<explosionDelay>30</explosionDelay>
-								<dropsCasings>true</dropsCasings>
-								<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-								<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-								<postExplosionSpawnThingDef>FearGas</postExplosionSpawnThingDef>
-								<preExplosionSpawnChance>1</preExplosionSpawnChance>
-								<speed>10</speed>
-							</projectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGrenadeEquipment">
-							<defName>Weapon_GrenadeFear</defName>
-							<equipmentType>Primary</equipmentType>
-							<label>fear gas grenade</label>
-							<description>Releases a large cloud of a specialized airbone agent that induces an extremely strong feeling of dread and terror.</description>
-							<graphicData>
-								<texPath>ThirdParty/GasTraps/HandGrenade</texPath>
-								<color>(185,142,132)</color>
-								<shaderType>CutoutComplex</shaderType>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<soundInteract>Interact_Grenade</soundInteract>
-							<techLevel>Industrial</techLevel>
-							<statBases>
-								<Mass>0.539</Mass>
-								<Bulk>1.05</Bulk>
-								<MarketValue>10.15</MarketValue>
-								<SightsEfficiency>1.0</SightsEfficiency>
-								<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-							</statBases>
-							<weaponTags>
-								<li>CE_AI_Nonlethal</li>
-								<li>GrenadeSmoke</li>
-							</weaponTags>
-							<thingCategories>
-								<li>Grenades</li>
-							</thingCategories>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<label>throw fear gas grenade</label>
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<range>10</range>
-									<warmupTime>1.8</warmupTime>
-									<noiseRadius>4</noiseRadius>
-									<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-									<soundCast>ThrowGrenade</soundCast>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<defaultProjectile>Proj_GrenadeFear</defaultProjectile>
-									<onlyManualCast>true</onlyManualCast>
-									<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-								</li>
-							</verbs>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>4</damageAmountBase>
-									<explosiveDamageType>Smoke</explosiveDamageType>
-									<postExplosionSpawnThingDef>FearGas</postExplosionSpawnThingDef>
-									<preExplosionSpawnChance>1</preExplosionSpawnChance>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- ==================== Corrosive Gas Grenade ========================== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="BaseGrenadeProjectile">
-							<defName>Proj_GrenadeAcid</defName>
-							<label>corrosive gas grenade</label>
-							<graphicData>
-								<texPath>ThirdParty/GasTraps/gas_grenade_projectile</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<color>(179,178,119)</color>
-								<shaderType>CutoutComplex</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>4</explosionRadius>
-								<damageDef>Smoke</damageDef>
-								<suppressionFactor>0.0</suppressionFactor>
-								<dangerFactor>0.0</dangerFactor>
-								<explosionDelay>30</explosionDelay>
-								<dropsCasings>true</dropsCasings>
-								<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-								<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-								<postExplosionSpawnThingDef>AcidGas</postExplosionSpawnThingDef>
-								<preExplosionSpawnChance>1</preExplosionSpawnChance>
-								<speed>10</speed>
-							</projectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGrenadeEquipment">
-							<defName>Weapon_GrenadeAcid</defName>
-							<equipmentType>Primary</equipmentType>
-							<label>corrosive gas grenade</label>
-							<description>Releases a large cloud of an extremely strong acid, capable of quickly burning flesh and metal alike.</description>
-							<graphicData>
-								<texPath>ThirdParty/GasTraps/HandGrenade</texPath>
-								<color>(179,178,119)</color>
-								<shaderType>CutoutComplex</shaderType>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<soundInteract>Interact_Grenade</soundInteract>
-							<techLevel>Industrial</techLevel>
-							<statBases>
-								<Mass>0.539</Mass>
-								<Bulk>1.05</Bulk>
-								<MarketValue>10.15</MarketValue>
-								<SightsEfficiency>1.0</SightsEfficiency>
-								<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-							</statBases>
-							<weaponTags>
-								<li>CE_OneHandedWeapon</li>
-								<li>CE_AI_Grenade</li>
-								<li>GrenadeSmoke</li>
-							</weaponTags>
-							<thingCategories>
-								<li>Grenades</li>
-							</thingCategories>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<label>throw corrosive gas grenade</label>
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<range>10</range>
-									<warmupTime>1.8</warmupTime>
-									<noiseRadius>4</noiseRadius>
-									<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-									<soundCast>ThrowGrenade</soundCast>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<defaultProjectile>Proj_GrenadeAcid</defaultProjectile>
-									<onlyManualCast>true</onlyManualCast>
-									<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-								</li>
-							</verbs>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>4</damageAmountBase>
-									<explosiveDamageType>Smoke</explosiveDamageType>
-									<postExplosionSpawnThingDef>AcidGas</postExplosionSpawnThingDef>
-									<preExplosionSpawnChance>1</preExplosionSpawnChance>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- ==================== Nanomachine canister ========================== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="BaseGrenadeProjectile">
-							<defName>Proj_GrenadeMechVirus</defName>
-							<label>nanomachine canister</label>
-							<graphicData>
-								<texPath>ThirdParty/GasTraps/gas_grenade_projectile</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>CutoutComplex</shaderType>
-								<color>(220,220,220)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>4</explosionRadius>
-								<damageDef>Smoke</damageDef>
-								<suppressionFactor>0.0</suppressionFactor>
-								<dangerFactor>0.0</dangerFactor>
-								<explosionDelay>30</explosionDelay>
-								<dropsCasings>true</dropsCasings>
-								<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-								<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-								<postExplosionSpawnThingDef>MechanoidVirusGas</postExplosionSpawnThingDef>
-								<preExplosionSpawnChance>1</preExplosionSpawnChance>
-								<speed>10</speed>
-							</projectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGrenadeEquipment">
-							<defName>Weapon_GrenadeMechVirus</defName>
-							<equipmentType>Primary</equipmentType>
-							<label>nanomachine canister</label>
-							<description>Releases a large cloud of nanomachines designed to latch onto and wreck havoc on the systems of mechanoids. Ineffective against organic life.</description>
-							<graphicData>
-								<texPath>ThirdParty/GasTraps/HandGrenade</texPath>
-								<color>(220,220,220)</color>
-								<shaderType>CutoutComplex</shaderType>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<soundInteract>Interact_Grenade</soundInteract>
-							<techLevel>Industrial</techLevel>
-							<statBases>
-								<Mass>0.539</Mass>
-								<Bulk>1.05</Bulk>
-								<MarketValue>15</MarketValue>
-								<SightsEfficiency>1.0</SightsEfficiency>
-								<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-							</statBases>
-							<weaponTags>
-								<li>GrenadeMech</li>
-							</weaponTags>
-							<thingCategories>
-								<li>Grenades</li>
-							</thingCategories>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<label>throw nanomachine canister</label>
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<range>10</range>
-									<warmupTime>1.8</warmupTime>
-									<noiseRadius>4</noiseRadius>
-									<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-									<soundCast>ThrowGrenade</soundCast>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<defaultProjectile>Proj_GrenadeMechVirus</defaultProjectile>
-									<onlyManualCast>true</onlyManualCast>
-									<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-								</li>
-							</verbs>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>4</damageAmountBase>
-									<explosiveDamageType>Smoke</explosiveDamageType>
-									<postExplosionSpawnThingDef>MechanoidVirusGas</postExplosionSpawnThingDef>
-									<preExplosionSpawnChance>1</preExplosionSpawnChance>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- ==================== Insecticide Gas Grenade ========================== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="BaseGrenadeProjectile">
-							<defName>Proj_GrenadeAntiBug</defName>
-							<label>insecticide gas grenade</label>
-							<graphicData>
-								<texPath>ThirdParty/GasTraps/gas_grenade_projectile</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>CutoutComplex</shaderType>
-								<color>(70,183,79)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>4</explosionRadius>
-								<damageDef>Smoke</damageDef>
-								<suppressionFactor>0.0</suppressionFactor>
-								<dangerFactor>0.0</dangerFactor>
-								<explosionDelay>30</explosionDelay>
-								<dropsCasings>true</dropsCasings>
-								<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-								<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-								<postExplosionSpawnThingDef>AntiBugGas</postExplosionSpawnThingDef>
-								<preExplosionSpawnChance>1</preExplosionSpawnChance>
-								<speed>10</speed>
-							</projectile>
-						</ThingDef>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGrenadeEquipment">
-							<defName>Weapon_GrenadeAntiBug</defName>
-							<equipmentType>Primary</equipmentType>
-							<label>insecticide gas grenade</label>
-							<description>Releases a large cloud of a special aerosol designed to kill insectoids.</description>
-							<graphicData>
-								<texPath>ThirdParty/GasTraps/HandGrenade</texPath>
-								<color>(70,183,79)</color>
-								<shaderType>CutoutComplex</shaderType>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<soundInteract>Interact_Grenade</soundInteract>
-							<techLevel>Industrial</techLevel>
-							<statBases>
-								<Mass>0.539</Mass>
-								<Bulk>1.05</Bulk>
-								<MarketValue>10.15</MarketValue>
-								<SightsEfficiency>1.0</SightsEfficiency>
-								<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-							</statBases>
-							<weaponTags>
-								<li>GrenadeAntiBug</li>
-							</weaponTags>
-							<thingCategories>
-								<li>Grenades</li>
-							</thingCategories>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<label>throw insecticide gas grenade</label>
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<range>10</range>
-									<warmupTime>1.8</warmupTime>
-									<noiseRadius>4</noiseRadius>
-									<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-									<soundCast>ThrowGrenade</soundCast>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<defaultProjectile>Proj_GrenadeAntiBug</defaultProjectile>
-									<onlyManualCast>true</onlyManualCast>
-									<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-								</li>
-							</verbs>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>4</damageAmountBase>
-									<explosiveDamageType>Smoke</explosiveDamageType>
-									<postExplosionSpawnThingDef>AntiBugGas</postExplosionSpawnThingDef>
-									<preExplosionSpawnChance>1</preExplosionSpawnChance>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Gestalt Engine/ThingDefs_Races/Matriach.xml b/Patches/Gestalt Engine/ThingDefs_Races/Matriach.xml
deleted file mode 100644
index 681615c534..0000000000
--- a/Patches/Gestalt Engine/ThingDefs_Races/Matriach.xml	
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Gestalt Engine</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Matriarch"]/statBases</xpath>
-					<value>
-						<PartialArmorBody>0</PartialArmorBody>
-					</value>
-				</li>
-
-				<!--Consistency with vanilla mechs-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Matriarch"]/statBases</xpath>
-					<value>
-						<SmokeSensitivity>0</SmokeSensitivity>
-						<NightVisionEfficiency>0.80</NightVisionEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Matriarch"]/statBases</xpath>
-					<value>
-						<CarryWeight>30</CarryWeight>
-						<CarryBulk>40</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.06</MeleeCritChance>
-						<MeleeParryChance>0.12</MeleeParryChance>
-						<MaxHitPoints>100</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Matriarch"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Matriarch"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Matriarch"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>3.51</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>false</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2.51</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2.51</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Giddy-Up 2/Job_Patch.xml b/Patches/Giddy-Up 2/Job_Patch.xml
deleted file mode 100644
index 5aec78239c..0000000000
--- a/Patches/Giddy-Up 2/Job_Patch.xml	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Giddy-Up 2</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/JobDef[defName="ReloadWeapon"]</xpath>
-					<value>
-						<li Class="GiddyUp.CanDoMounted" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Gimmicks/Gimmicks_CE_Compatibility.xml b/Patches/Gimmicks/Gimmicks_CE_Compatibility.xml
deleted file mode 100644
index 04c14fb676..0000000000
--- a/Patches/Gimmicks/Gimmicks_CE_Compatibility.xml
+++ /dev/null
@@ -1,888 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<!-- Mod Support for Gimmicks -->
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Gimmicks (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Chef's Knife -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Chefs_Knife"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>8.0</power>
-								<cooldownTime>1.28</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.54</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>11.0</power>
-								<cooldownTime>2.0</cooldownTime>
-								<chanceFactor>1.34</chanceFactor>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.65</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Chefs_Knife"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.17</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Chefs_Knife"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.30</MeleeCritChance>
-						<MeleeParryChance>0.17</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Chefs_Knife"]</xpath>
-					<value>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<!-- Encyclopedia, How-To, Coupon Book -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Encyclopedia"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>cover</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.0</chanceFactor>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Encyclopedia"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>0.05</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_How_To"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>cover</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.0</chanceFactor>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_How_To"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Coupon_Book"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>cover</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.0</chanceFactor>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Coupon_Book"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>0.05</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<!-- Pillow -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Pillow"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>cover</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.0</chanceFactor>
-								<armorPenetrationBlunt>0.0</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Pillow"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<MeleeCounterParryBonus>0.0</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<!-- Fan -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Fan"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>cover</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>0.5</power>
-								<cooldownTime>0.4</cooldownTime>
-								<chanceFactor>1.0</chanceFactor>
-								<armorPenetrationBlunt>0.0</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Fan"]/statBases</xpath>
-					<value>
-						<Bulk>0.2</Bulk>
-						<MeleeCounterParryBonus>0.0</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Fan"]</xpath>
-					<value>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<!-- Flowers -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Flowers"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>0.5</power>
-								<cooldownTime>0.4</cooldownTime>
-								<chanceFactor>1.0</chanceFactor>
-								<armorPenetrationBlunt>0.0</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Flowers"]/statBases</xpath>
-					<value>
-						<Bulk>0.2</Bulk>
-						<MeleeCounterParryBonus>0.0</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Flowers"]</xpath>
-					<value>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<!-- Laptop -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Laptop"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Side</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.0</chanceFactor>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Laptop"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>0.1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<!-- Saw -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Saw"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5.0</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.1</chanceFactor>
-								<armorPenetration>0.09</armorPenetration>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>10.0</power>
-								<cooldownTime>2.2</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.8</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Saw"]/statBases</xpath>
-					<value>
-						<Bulk>7</Bulk>
-						<MeleeCounterParryBonus>0.1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Saw"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.20</MeleeCritChance>
-						<MeleeParryChance>0.20</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Saw"]</xpath>
-					<value>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<!-- Power Drill -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Power_Drill"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5.0</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.1</chanceFactor>
-								<armorPenetration>0.09</armorPenetration>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>drill</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>26.0</power>
-								<cooldownTime>5.5</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Power_Drill"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>0.1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Power_Drill"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.50</MeleeCritChance>
-						<MeleeParryChance>0.10</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Power_Drill"]</xpath>
-					<value>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<!-- Scissors -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Scissors"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>7.0</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Scissors"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<MeleeCounterParryBonus>0.05</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Scissors"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.10</MeleeCritChance>
-						<MeleeParryChance>0.10</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Scissors"]</xpath>
-					<value>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<!-- Whistle -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Whistle"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>body</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.85</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Whistle"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<MeleeCounterParryBonus>0</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Whistle"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Whistle"]</xpath>
-					<value>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<!-- Screwdriver -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Screwdriver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5.0</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.1</chanceFactor>
-								<armorPenetration>0.09</armorPenetration>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>7.0</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.1</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Screwdriver"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<MeleeCounterParryBonus>0.1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Screwdriver"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Screwdriver"]</xpath>
-					<value>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<!-- Skill Saw -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Skill_Saw"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6.0</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.1</chanceFactor>
-								<armorPenetration>0.09</armorPenetration>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>34.0</power>
-								<cooldownTime>5.0</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-								<armorPenetrationSharp>3.1</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Skill_Saw"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Skill_Saw"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.50</MeleeCritChance>
-						<MeleeParryChance>-0.20</MeleeParryChance>
-						<MeleeDodgeChance>-0.10</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Skill_Saw"]</xpath>
-					<value>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<!-- Skinning Knife -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Skinning_Knife"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>8.0</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.11</chanceFactor>
-								<armorPenetrationBlunt>0.20</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.48</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>9.0</power>
-								<cooldownTime>1.9</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.1</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Skinning_Knife"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<MeleeCounterParryBonus>0.1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Skinning_Knife"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.30</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Skinning_Knife"]</xpath>
-					<value>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<!-- Sickle -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Sickle"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5.0</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.1</chanceFactor>
-								<armorPenetration>0.09</armorPenetration>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>11.0</power>
-								<cooldownTime>2.1</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.1</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Sickle"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<MeleeCounterParryBonus>0.2</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Sickle"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.20</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Sickle"]</xpath>
-					<value>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<!-- Shovel -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Shovel"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5.0</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.1</chanceFactor>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>9.0</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.2</chanceFactor>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.9</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>11.0</power>
-								<cooldownTime>2.0</cooldownTime>
-								<chanceFactor>1.3</chanceFactor>
-								<armorPenetration>0.180</armorPenetration>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14.0</power>
-								<cooldownTime>2.5</cooldownTime>
-								<chanceFactor>1.34</chanceFactor>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.1</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Shovel"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<MeleeCounterParryBonus>0.1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Shovel"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.20</MeleeCritChance>
-						<MeleeParryChance>0.20</MeleeParryChance>
-					</value>
-				</li>
-
-				<!-- === Whip === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Tool_Whip</defName>
-					<statBases>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.5</ShotSpread>
-						<SwayFactor>0.26</SwayFactor>
-						<Bulk>1.5</Bulk>
-						<Mass>0.9</Mass>
-						<RangedWeapon_Cooldown>.48</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Whip</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>6</range>
-						<soundCast>Shot_Autopistol</soundCast>
-					</Properties>
-				</li>
-
-				<!-- Tools -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Whip"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Projectile === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="BaseBulletCE">
-							<thingClass>CombatExtended.BulletCE</thingClass>
-							<defName>Bullet_Whip</defName>
-							<label>whip slash</label>
-							<graphicData>
-								<texPath>Tools/WhipSlash</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>80</speed>
-								<damageDef>RangedCut</damageDef>
-								<damageAmountBase>8</damageAmountBase>
-								<armorPenetrationSharp>0.65</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<DamageDef>
-							<defName>RangedCut</defName>
-							<label>cut</label>
-							<workerClass>DamageWorker_Cut</workerClass>
-							<externalViolence>true</externalViolence>
-							<deathMessage>{0} has been cut to death.</deathMessage>
-							<hediff>Cut</hediff>
-							<hediffSkin>Cut</hediffSkin>
-							<hediffSolid>Crack</hediffSolid>
-							<impactSoundType>Slice</impactSoundType>
-							<armorCategory>Sharp</armorCategory>
-							<isRanged>true</isRanged>
-							<makesAnimalsFlee>true</makesAnimalsFlee>
-							<overkillPctToDestroyPart>0~0.1</overkillPctToDestroyPart>
-						</DamageDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Girls Frontline Apparel Pack/ThingDefs_Misc/ThingDef_Apparel.xml b/Patches/Girls Frontline Apparel Pack/ThingDefs_Misc/ThingDef_Apparel.xml
deleted file mode 100644
index 204cec8484..0000000000
--- a/Patches/Girls Frontline Apparel Pack/ThingDefs_Misc/ThingDef_Apparel.xml	
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Girls' frontline Apparel Pack</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="AR_ApparelMakeableBase"]/recipeMaker/recipeUsers</xpath>
-							<value>
-								<recipeUsers>
-									<li>TableMachining</li>
-								</recipeUsers>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="AR_ApparelMakeableBase"]/recipeMaker</xpath>
-							<value>
-								<researchPrerequisite>FlakArmor</researchPrerequisite>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AR_M4Costume" or
-								defName="AR_M16A1Costume" or
-								defName="AR_M16A1Costume_b" or
-								defName="AR_M4SOPIIcoutume" or
-								defName="AR_AR15costume" or
-								defName="AR_RO635costume" or
-								defName="404_HK416costume" or
-								defName="404_G11costume" or
-								defName="404_UMP9costume" or
-								defName="404_UMP40costume" or
-								defName="404_UMP45costume" or
-								defName="Defy_AK12costume" or
-								defName="Defy_AN94costume" or
-								defName="Kanade_NEGEVcostume" or
-								defName="Kanade_IWS2000costume" or
-								defName="Kanade_JERICHOcostume"
-								]/statBases/ArmorRating_Sharp </xpath>
-							<value>
-								<Bulk>5</Bulk>
-								<WornBulk>5</WornBulk>
-								<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-								<ArmorRating_Sharp>2</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AR_M4Costume" or
-								defName="AR_M16A1Costume" or
-								defName="AR_M16A1Costume_b" or
-								defName="AR_M4SOPIIcoutume" or
-								defName="AR_AR15costume" or
-								defName="AR_RO635costume" or
-								defName="404_HK416costume" or
-								defName="404_G11costume" or
-								defName="404_UMP9costume" or
-								defName="404_UMP40costume" or
-								defName="404_UMP45costume" or
-								defName="Defy_AK12costume" or
-								defName="Defy_AN94costume" or
-								defName="Kanade_NEGEVcostume" or
-								defName="Kanade_IWS2000costume" or
-								defName="Kanade_JERICHOcostume"
-								]/statBases/ArmorRating_Blunt </xpath>
-							<value>
-								<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AR_M4Costume" or
-								defName="AR_M16A1Costume" or
-								defName="AR_M16A1Costume_b" or
-								defName="AR_M4SOPIIcoutume" or
-								defName="AR_AR15costume" or
-								defName="AR_RO635costume" or
-								defName="404_HK416costume" or
-								defName="404_G11costume" or
-								defName="404_UMP9costume" or
-								defName="404_UMP40costume" or
-								defName="404_UMP45costume" or
-								defName="Defy_AK12costume" or
-								defName="Defy_AN94costume" or
-								defName="Kanade_NEGEVcostume" or
-								defName="Kanade_IWS2000costume" or
-								defName="Kanade_JERICHOcostume"
-								]/statBases/WorkToMake </xpath>
-							<value>
-								<WorkToMake>16000</WorkToMake>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AR_M4Costume" or
-								defName="AR_M16A1Costume" or
-								defName="AR_M16A1Costume_b" or
-								defName="AR_M4SOPIIcoutume" or
-								defName="AR_AR15costume" or
-								defName="AR_RO635costume" or
-								defName="404_HK416costume" or
-								defName="404_G11costume" or
-								defName="404_UMP9costume" or
-								defName="404_UMP40costume" or
-								defName="404_UMP45costume" or
-								defName="Defy_AK12costume" or
-								defName="Defy_AN94costume" or
-								defName="Kanade_NEGEVcostume" or
-								defName="Kanade_IWS2000costume" or
-								defName="Kanade_JERICHOcostume"
-								]/costList </xpath>
-							<value>
-								<costList>
-									<Steel>35</Steel>
-								</costList>
-								<stuffCategories>
-									<li>Fabric</li>
-								</stuffCategories>
-								<costStuffCount>100</costStuffCount>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AR_M4SOPIIcoutume" or
-								defName="Kanade_JERICHOcostume"
-								]/equippedStatOffsets/MeleeDodgeChance </xpath>
-							<value>
-								<MeleeDodgeChance>0.25</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AR_M4SOPIIcoutume"]/equippedStatOffsets/MeleeHitChance</xpath>
-							<value>
-								<MeleeHitChance>1</MeleeHitChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kanade_JERICHOcostume"]/equippedStatOffsets/MeleeHitChance</xpath>
-							<value>
-								<MeleeHitChance>1.5</MeleeHitChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Defy_AN94_Mask" or defName="Defy_AK12_Mask"]/equippedStatOffsets</xpath>
-							<value>
-								<SmokeSensitivity>-0.25</SmokeSensitivity>
-							</value>
-						</li>
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Girls Frontline Styles 404 Team/ThingDefs_Misc/Apparel_404Team.xml b/Patches/Girls Frontline Styles 404 Team/ThingDefs_Misc/Apparel_404Team.xml
deleted file mode 100644
index b48664cbf5..0000000000
--- a/Patches/Girls Frontline Styles 404 Team/ThingDefs_Misc/Apparel_404Team.xml	
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[GF]Girls' Frontline Styles - 404 Team</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--416 Hat-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RFGirlsFrontline_HK416hat"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>9.5</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RFGirlsFrontline_HK416hat"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-							<value>
-								<ShootingAccuracyPawn>0.05</ShootingAccuracyPawn>
-								<AimingAccuracy>0.025</AimingAccuracy>
-							</value>
-						</li>
-
-						<!--G11 Hat-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RFGirlsFrontline_G11hat"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>6.5</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<!--All Uniforms-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RFGirlsFrontline_HK416uni" or
-								defName="RFGirlsFrontline_G11uni" or
-								defName="RFGirlsFrontline_UMP9uni" or
-								defName="RFGirlsFrontline_UMP45uni"
-								]/statBases </xpath>
-							<value>
-								<Bulk>10</Bulk>
-								<WornBulk>8</WornBulk>
-							</value>
-						</li>
-
-						<!--416 Uniform-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RFGirlsFrontline_HK416uni"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>8</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RFGirlsFrontline_HK416uni"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.696</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RFGirlsFrontline_HK416uni"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-							<value>
-								<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-								<AimingAccuracy>0.075</AimingAccuracy>
-							</value>
-						</li>
-
-						<!--G11 Uniform-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RFGirlsFrontline_G11uni"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>5.25</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RFGirlsFrontline_G11uni"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.168</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--UMP9 Uniform-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RFGirlsFrontline_UMP9uni"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>6.56</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RFGirlsFrontline_UMP9uni"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.36</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--UMP45 Uniform-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RFGirlsFrontline_UMP45uni"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>9.06</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RFGirlsFrontline_UMP45uni"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.48</ArmorRating_Blunt>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Girls Frontline Styles AR Team/ThingDefs_Misc/Apparel_ARTeam.xml b/Patches/Girls Frontline Styles AR Team/ThingDefs_Misc/Apparel_ARTeam.xml
deleted file mode 100644
index 53dce40788..0000000000
--- a/Patches/Girls Frontline Styles AR Team/ThingDefs_Misc/Apparel_ARTeam.xml	
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[GF]Girls' Frontline Styles - AR Team</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--M4A1 Hat-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RFGirlsFrontline_M4A1headset"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>9</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RFGirlsFrontline_M4A1headset"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>11</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--M4SOP2 Hat-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RFGirlsFrontline_M4SOP2headset"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>10.2</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RFGirlsFrontline_M4SOP2headset"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>8.1</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RFGirlsFrontline_M4SOP2headset"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-							<value>
-								<ShootingAccuracyPawn>0.05</ShootingAccuracyPawn>
-								<AimingAccuracy>0.025</AimingAccuracy>
-							</value>
-						</li>
-
-						<!--All Uniforms-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RFGirlsFrontline_M4A1uni" or
-								defName="RFGirlsFrontline_AR15uni" or
-								defName="RFGirlsFrontline_M4SOP2uni" or
-								defName="RFGirlsFrontline_RO635uni" or
-								defName="RFGirlsFrontline_M16A1uni"
-								]/statBases </xpath>
-							<value>
-								<Bulk>10</Bulk>
-								<WornBulk>8</WornBulk>
-							</value>
-						</li>
-
-						<!--M4A1 Uniform-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RFGirlsFrontline_M4A1uni"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>6.25</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RFGirlsFrontline_M4A1uni"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.84</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RFGirlsFrontline_M4A1uni"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-							<value>
-								<ShootingAccuracyPawn>0.08</ShootingAccuracyPawn>
-								<AimingAccuracy>0.04</AimingAccuracy>
-							</value>
-						</li>
-
-						<!--AR15 Uniform-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RFGirlsFrontline_AR15uni"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>5.65</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RFGirlsFrontline_AR15uni"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.48</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--M4SOP2 Uniform-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RFGirlsFrontline_M4SOP2uni"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>7.20</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RFGirlsFrontline_M4SOP2uni"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.96</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RFGirlsFrontline_M4SOP2uni"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-							<value>
-								<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-								<AimingAccuracy>0.075</AimingAccuracy>
-							</value>
-						</li>
-
-						<!--RO635 Uniform-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RFGirlsFrontline_RO635uni"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>5.95</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RFGirlsFrontline_RO635uni"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.72</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RFGirlsFrontline_RO635uni"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>0.0635</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<!--M16A4 Uniform-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RFGirlsFrontline_M16A1uni"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>5</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RFGirlsFrontline_M16A1uni"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>1.39</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RFGirlsFrontline_M16A1uni"]/equippedStatOffsets/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Girls Frontline Weapon Pack/ThingsDef_Misc/GFWeapons.xml b/Patches/Girls Frontline Weapon Pack/ThingsDef_Misc/GFWeapons.xml
deleted file mode 100644
index e365d22653..0000000000
--- a/Patches/Girls Frontline Weapon Pack/ThingsDef_Misc/GFWeapons.xml	
+++ /dev/null
@@ -1,796 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Girls' frontline Weapon Pack</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="G_M4A1_AR" or
-								defName="G_M16A1_AR" or
-								defName="G_AR15_AR" or
-								defName="G_SOPMODII_AR" or
-								defName="G_HK416_AR" or
-								defName="G_NEGEV_MG" or
-								defName="G_G11_AR" or
-								defName="G_AK12_AR" or
-								defName="G_AN94_AR" or
-								defName="G_RO635_SMG" or
-								defName="G_UMP9_SMG" or
-								defName="G_UMP40_SMG" or
-								defName="G_UMP45_SMG" or
-								defName="G_IWS2000_RF" or
-								defName="G_MobileFireSupportPlatform"]/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>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="G_JERICHO_HG"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>grip</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>1.54</cooldownTime>
-										<chanceFactor>1.5</chanceFactor>
-										<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>muzzle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>1.54</cooldownTime>
-										<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<!--M4A1-->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>G_M4A1_AR</defName>
-							<statBases>
-								<Bulk>7.56</Bulk>
-								<Mass>3.01</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.1</SightsEfficiency>
-								<SwayFactor>1.14</SwayFactor>
-								<ShotSpread>0.1</ShotSpread>
-								<WorkToMake>33500</WorkToMake>
-							</statBases>
-							<costList>
-								<Steel>40</Steel>
-								<Chemfuel>10</Chemfuel>
-								<ComponentIndustrial>6</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<recoilAmount>1.60</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-								<warmupTime>1</warmupTime>
-								<range>55</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-								<soundCast>GF556NatoFire</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>30</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-							<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-						</li>
-
-						<!--M16A1-->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>G_M16A1_AR</defName>
-							<statBases>
-								<Bulk>10.03</Bulk>
-								<Mass>3.26</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.1</SightsEfficiency>
-								<SwayFactor>1.33</SwayFactor>
-								<ShotSpread>0.07</ShotSpread>
-								<WorkToMake>30000</WorkToMake>
-							</statBases>
-							<costList>
-								<Steel>50</Steel>
-								<Chemfuel>10</Chemfuel>
-								<ComponentIndustrial>5</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<recoilAmount>1.53</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>55</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-								<soundCast>GF556NatoFire</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>30</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-							<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-						</li>
-
-						<!--AR 15-->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>G_AR15_AR</defName>
-							<statBases>
-								<Bulk>9.05</Bulk>
-								<Mass>3.26</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-								<SightsEfficiency>2.48</SightsEfficiency>
-								<SwayFactor>1.31</SwayFactor>
-								<ShotSpread>0.09</ShotSpread>
-								<WorkToMake>37000</WorkToMake>
-							</statBases>
-							<costList>
-								<Steel>45</Steel>
-								<Chemfuel>10</Chemfuel>
-								<ComponentIndustrial>7</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<recoilAmount>1.53</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-								<warmupTime>1.5</warmupTime>
-								<range>55</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-								<soundCast>AR15Fire</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>30</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-							<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-						</li>
-
-						<!--SOPMODII-->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>G_SOPMODII_AR</defName>
-							<statBases>
-								<Bulk>7.56</Bulk>
-								<Mass>3.01</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.1</SightsEfficiency>
-								<SwayFactor>1.14</SwayFactor>
-								<ShotSpread>0.1</ShotSpread>
-								<WorkToMake>33500</WorkToMake>
-							</statBases>
-							<costList>
-								<Steel>40</Steel>
-								<Chemfuel>10</Chemfuel>
-								<ComponentIndustrial>6</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<recoilAmount>1.60</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-								<warmupTime>1</warmupTime>
-								<range>55</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-								<soundCast>GF556NatoFire</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>30</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-							<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-						</li>
-
-						<!--HK416_AR-->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>G_HK416_AR</defName>
-							<statBases>
-								<Bulk>7.09</Bulk>
-								<Mass>3.12</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.1</SightsEfficiency>
-								<SwayFactor>1.12</SwayFactor>
-								<ShotSpread>0.12</ShotSpread>
-								<WorkToMake>32500</WorkToMake>
-							</statBases>
-							<costList>
-								<Steel>45</Steel>
-								<Chemfuel>5</Chemfuel>
-								<ComponentIndustrial>6</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<recoilAmount>1.57</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-								<warmupTime>1</warmupTime>
-								<range>48</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-								<soundCast>GF556NatoFire</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>30</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-							<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-						</li>
-
-						<!--Negev-->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>G_NEGEV_MG</defName>
-							<statBases>
-								<Bulk>11.10</Bulk>
-								<Mass>7.65</Mass>
-								<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.0</SightsEfficiency>
-								<SwayFactor>1.25</SwayFactor>
-								<ShotSpread>0.08</ShotSpread>
-								<WorkToMake>38500</WorkToMake>
-							</statBases>
-							<costList>
-								<Steel>80</Steel>
-								<ComponentIndustrial>6</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<recoilAmount>0.93</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-								<warmupTime>1.3</warmupTime>
-								<range>55</range>
-								<burstShotCount>10</burstShotCount>
-								<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-								<soundCast>GF556NatoFire</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>150</magazineSize>
-								<reloadTime>7.8</reloadTime>
-								<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>5</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>SuppressFire</aiAimMode>
-							</FireModes>
-							<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-						</li>
-
-						<!--G 11-->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>G_G11_AR</defName>
-							<statBases>
-								<Bulk>7.50</Bulk>
-								<Mass>3.65</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-								<SightsEfficiency>2.21</SightsEfficiency>
-								<SwayFactor>1.15</SwayFactor>
-								<ShotSpread>0.06</ShotSpread>
-								<WorkToMake>34000</WorkToMake>
-							</statBases>
-							<costList>
-								<Steel>45</Steel>
-								<Chemfuel>10</Chemfuel>
-								<ComponentIndustrial>8</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<recoilAmount>1.30</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_473x33mmCaseless_FMJ</defaultProjectile>
-								<warmupTime>1.275</warmupTime>
-								<range>48</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-								<soundCast>G11Fire</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>50</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_473x33mmCaseless</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-							<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-						</li>
-
-						<!--AK12-->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>G_AK12_AR</defName>
-							<statBases>
-								<Bulk>7.25</Bulk>
-								<Mass>3.3</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.1</SightsEfficiency>
-								<SwayFactor>1.28</SwayFactor>
-								<ShotSpread>0.09</ShotSpread>
-								<WorkToMake>32500</WorkToMake>
-							</statBases>
-							<costList>
-								<Steel>40</Steel>
-								<Chemfuel>10</Chemfuel>
-								<ComponentIndustrial>6</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<recoilAmount>1.38</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-								<warmupTime>1</warmupTime>
-								<range>51</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-								<soundCast>AK12Fire</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>60</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-							<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-						</li>
-
-						<!--AN94-->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>G_AN94_AR</defName>
-							<statBases>
-								<Bulk>9.43</Bulk>
-								<Mass>3.85</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.1</SightsEfficiency>
-								<SwayFactor>1.33</SwayFactor>
-								<ShotSpread>0.09</ShotSpread>
-								<WorkToMake>32500</WorkToMake>
-							</statBases>
-							<costList>
-								<Steel>40</Steel>
-								<Chemfuel>10</Chemfuel>
-								<ComponentIndustrial>6</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<recoilAmount>1.38</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-								<warmupTime>1</warmupTime>
-								<range>64</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-								<soundCast>AN94Fire</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>45</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-							<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-						</li>
-
-						<!--RO365-->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>G_RO635_SMG</defName>
-							<statBases>
-								<Bulk>6.50</Bulk>
-								<Mass>2.61</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.0</SightsEfficiency>
-								<SwayFactor>0.99</SwayFactor>
-								<ShotSpread>0.12</ShotSpread>
-								<WorkToMake>29500</WorkToMake>
-							</statBases>
-							<costList>
-								<Steel>45</Steel>
-								<ComponentIndustrial>5</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<recoilAmount>1.46</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>20</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-								<soundCast>9MMFIRE</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>32</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>Snapshot</aiAimMode>
-							</FireModes>
-							<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-						</li>
-
-						<!--UMP9-->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>G_UMP9_SMG</defName>
-							<statBases>
-								<Bulk>4.50</Bulk>
-								<Mass>2.3</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.1</SightsEfficiency>
-								<SwayFactor>0.92</SwayFactor>
-								<ShotSpread>0.14</ShotSpread>
-								<WorkToMake>30500</WorkToMake>
-							</statBases>
-							<costList>
-								<Steel>30</Steel>
-								<Chemfuel>10</Chemfuel>
-								<ComponentIndustrial>6</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<recoilAmount>1.41</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-								<warmupTime>0.5</warmupTime>
-								<range>20</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-								<soundCast>9MMFIRE</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>30</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>Snapshot</aiAimMode>
-							</FireModes>
-							<researchPrerequisite>BlowbackOperation</researchPrerequisite>
-						</li>
-
-						<!--Jericho-->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>G_JERICHO_HG</defName>
-							<statBases>
-								<Bulk>2.07</Bulk>
-								<Mass>1.05</Mass>
-								<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-								<SightsEfficiency>0.7</SightsEfficiency>
-								<SwayFactor>1.04</SwayFactor>
-								<ShotSpread>0.17</ShotSpread>
-								<WorkToMake>7000</WorkToMake>
-							</statBases>
-							<costList>
-								<Steel>25</Steel>
-								<ComponentIndustrial>3</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>12</range>
-								<soundCast>9MMFIRE</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>16</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiAimMode>Snapshot</aiAimMode>
-							</FireModes>
-							<weaponTags>
-								<li>CE_OneHandedWeapon</li>
-							</weaponTags>
-							<researchPrerequisite>BlowbackOperation</researchPrerequisite>
-						</li>
-
-						<!--UMP40-->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>G_UMP40_SMG</defName>
-							<statBases>
-								<Bulk>4.50</Bulk>
-								<Mass>2.3</Mass>
-								<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.1</SightsEfficiency>
-								<SwayFactor>0.92</SwayFactor>
-								<ShotSpread>0.14</ShotSpread>
-								<WorkToMake>30500</WorkToMake>
-							</statBases>
-							<costList>
-								<Steel>30</Steel>
-								<Chemfuel>10</Chemfuel>
-								<ComponentIndustrial>6</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<recoilAmount>1.78</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_40SW_FMJ</defaultProjectile>
-								<warmupTime>0.5</warmupTime>
-								<range>20</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-								<soundCast>45ACPFIRE</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>30</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_40SW</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>Snapshot</aiAimMode>
-							</FireModes>
-							<researchPrerequisite>BlowbackOperation</researchPrerequisite>
-						</li>
-
-						<!--UMP45-->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>G_UMP45_SMG</defName>
-							<statBases>
-								<Bulk>4.50</Bulk>
-								<Mass>2.5</Mass>
-								<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.1</SightsEfficiency>
-								<SwayFactor>0.92</SwayFactor>
-								<ShotSpread>0.14</ShotSpread>
-								<WorkToMake>30500</WorkToMake>
-							</statBases>
-							<costList>
-								<Steel>30</Steel>
-								<Chemfuel>10</Chemfuel>
-								<ComponentIndustrial>6</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<recoilAmount>2.08</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-								<warmupTime>0.5</warmupTime>
-								<range>15</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-								<soundCast>45ACPFIRE</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>25</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_45ACP</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>Snapshot</aiAimMode>
-							</FireModes>
-							<researchPrerequisite>BlowbackOperation</researchPrerequisite>
-						</li>
-
-						<!--IWS2000-->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>G_IWS2000_RF</defName>
-							<statBases>
-								<Bulk>19.00</Bulk>
-								<Mass>18.00</Mass>
-								<RangedWeapon_Cooldown>1.37</RangedWeapon_Cooldown>
-								<SightsEfficiency>2.6</SightsEfficiency>
-								<SwayFactor>2.59</SwayFactor>
-								<ShotSpread>0.01</ShotSpread>
-								<WorkToMake>45500</WorkToMake>
-							</statBases>
-							<costList>
-								<Steel>110</Steel>
-								<Chemfuel>30</Chemfuel>
-								<ComponentIndustrial>5</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_152x169mm_Sabot</defaultProjectile>
-								<warmupTime>3.3</warmupTime>
-								<range>86</range>
-								<soundCast>GF50SniperFire</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>5</magazineSize>
-								<reloadTime>4.5</reloadTime>
-								<ammoSet>AmmoSet_152x169mm</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-							<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-						</li>
-
-						<!--Mobile Fire Support Platform-->
-
-						<li Class="PatchOperationFindMod">
-							<mods>
-								<li>SheathYourSword</li>
-							</mods>
-							<nomatch Class="PatchOperationRemove">
-								<xpath>Defs/ThingDef[defName="G_MobileFireSupportPlatform"]/comps/li[@Class="SYS.CompProperties_Sheath"]</xpath>
-							</nomatch>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>G_MobileFireSupportPlatform</defName>
-							<statBases>
-								<Bulk>20.00</Bulk>
-								<Mass>15.00</Mass>
-								<RangedWeapon_Cooldown>2.17</RangedWeapon_Cooldown>
-								<SightsEfficiency>1</SightsEfficiency>
-								<SwayFactor>3.20</SwayFactor>
-								<ShotSpread>0.07</ShotSpread>
-							</statBases>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_80x256mmFuel_Incendiary</defaultProjectile>
-								<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-								<warmupTime>1.9</warmupTime>
-								<range>48</range>
-								<soundCast>MFSP</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>1</magazineSize>
-								<reloadTime>9.1</reloadTime>
-								<ammoSet>AmmoSet_80x256mmFuel</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Glitter Tech/GlitterTech_CE_Patch_Ammo_Shells.xml b/Patches/Glitter Tech/GlitterTech_CE_Patch_Ammo_Shells.xml
deleted file mode 100644
index 42d1f1c980..0000000000
--- a/Patches/Glitter Tech/GlitterTech_CE_Patch_Ammo_Shells.xml	
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Glitter Tech</li>
-			<li>Glitter Tech (No Surgery)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Dynamically create new ammosets for GT mortar turrets ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<!-- Automatic Mortar -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_81mmMortarShell_GlitterTechAutoMortar</defName>
-							<label>81mm mortar shells</label>
-							<ammoTypes>
-								<Shell_HighExplosive>Bullet_81mmMortarShell_HE</Shell_HighExplosive>
-								<Shell_Incendiary>Bullet_81mmMortarShell_Incendiary</Shell_Incendiary>
-								<Shell_Firefoam>Bullet_81mmMortarShell_Firefoam</Shell_Firefoam>
-								<Shell_AntigrainWarhead>Bullet_81mmMortarShell_Antigrain</Shell_AntigrainWarhead>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- Automatic Cluster Mortar -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_81mmMortarShell_GlitterTechClusterMortar</defName>
-							<label>81mm mortar shells</label>
-							<ammoTypes>
-								<Shell_HighExplosive>Bullet_81mmMortarShell_HE</Shell_HighExplosive>
-								<Shell_Incendiary>Bullet_81mmMortarShell_Incendiary</Shell_Incendiary>
-								<Shell_Firefoam>Bullet_81mmMortarShell_Firefoam</Shell_Firefoam>
-								<Shell_AntigrainWarhead>Bullet_81mmMortarShell_Antigrain</Shell_AntigrainWarhead>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- Automatic EMP Mortar -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_81mmMortarShell_GlitterTechEMPAMortar</defName>
-							<label>81mm mortar shells</label>
-							<ammoTypes>
-								<Shell_EMP>Bullet_81mmMortarShell_EMP</Shell_EMP>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Glitter Tech/GlitterTech_CE_Patch_Apparel_AdvancedShield.xml b/Patches/Glitter Tech/GlitterTech_CE_Patch_Apparel_AdvancedShield.xml
deleted file mode 100644
index c78c8f8378..0000000000
--- a/Patches/Glitter Tech/GlitterTech_CE_Patch_Apparel_AdvancedShield.xml	
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Glitter Tech</li>
-			<li>Glitter Tech (No Surgery)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== HC-1 shield ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_HC1Shield"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<!-- ========== Orion Corp defense shield ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_OCShield"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Glitter Tech/GlitterTech_CE_Patch_Apparel_NanoSuitArmour.xml b/Patches/Glitter Tech/GlitterTech_CE_Patch_Apparel_NanoSuitArmour.xml
deleted file mode 100644
index 042070627e..0000000000
--- a/Patches/Glitter Tech/GlitterTech_CE_Patch_Apparel_NanoSuitArmour.xml	
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Glitter Tech</li>
-			<li>Glitter Tech (No Surgery)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Nano Suit ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_NanoSuit"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_NanoSuit"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>15</CarryBulk>
-						<CarryWeight>50</CarryWeight>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_NanoSuit"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>32</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_NanoSuit"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_NanoSuit"]/statBases</xpath>
-					<value>
-						<ArmorRating_Electric>0.8</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<!-- ========== Nano Suit helmet ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_NanoSuitHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_NanoSuitHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>24</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_NanoSuitHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>12</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_NanoSuitHelmet"]/statBases</xpath>
-					<value>
-						<ArmorRating_Electric>0.8</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<!-- ========== Reactive Suit ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_Reactive"]/statBases</xpath>
-					<value>
-						<Bulk>20</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Reactive"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>40</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Reactive"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- ========== Fibre Skin Suit ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_NanoSkin"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>28</ArmorRating_Blunt>
-						<Bulk>3</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_NanoSkin"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- ========== Speed Skin Suit ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_NanoSpeed"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>20</ArmorRating_Blunt>
-						<Bulk>3</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_NanoSpeed"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Glitter Tech/GlitterTech_CE_Patch_Apparel_OrionCo.xml b/Patches/Glitter Tech/GlitterTech_CE_Patch_Apparel_OrionCo.xml
deleted file mode 100644
index 2b0ea26f5f..0000000000
--- a/Patches/Glitter Tech/GlitterTech_CE_Patch_Apparel_OrionCo.xml	
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Glitter Tech</li>
-			<li>Glitter Tech (No Surgery)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Orion Corporation Helmet ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_OCHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_OCHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>22</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_OCHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- ========== Orion Unfiorm Shirt and Pants ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Apparel_OCShirt" or
-						defName="Apparel_OCPants"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-						<Bulk>1</Bulk>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Apparel_OCShirt" or
-						defName="Apparel_OCPants"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Glitter Tech/GlitterTech_CE_Patch_HeDiffs_AddedParts.xml b/Patches/Glitter Tech/GlitterTech_CE_Patch_HeDiffs_AddedParts.xml
deleted file mode 100644
index 0f63d7cc1e..0000000000
--- a/Patches/Glitter Tech/GlitterTech_CE_Patch_HeDiffs_AddedParts.xml	
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Glitter Tech</li>
-			<!-- Current patch not applicable to Glitter Tech (No Surgery) -->
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Advanced bionic arm ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GTArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/verbs</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power><!-- between vanilla Bionic and Archotech Arms -->
-								<cooldownTime>1.11</cooldownTime>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Advanced bionic hand ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GTHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/verbs</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power><!-- between vanilla Bionic and Archotech Arms -->
-								<cooldownTime>1.11</cooldownTime>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Glitter Tech/GlitterTech_CE_Patch_HeDiffs_OCAddedParts.xml b/Patches/Glitter Tech/GlitterTech_CE_Patch_HeDiffs_OCAddedParts.xml
deleted file mode 100644
index 9725a9b1e3..0000000000
--- a/Patches/Glitter Tech/GlitterTech_CE_Patch_HeDiffs_OCAddedParts.xml	
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Glitter Tech</li>
-			<li>Glitter Tech (No Surgery)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Orion Exoskeleton ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="OCExo"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/verbs</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>0.83</cooldownTime>
-								<armorPenetrationBlunt>3.00</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Glitter Tech/GlitterTech_CE_Patch_PawnKindDefs.xml b/Patches/Glitter Tech/GlitterTech_CE_Patch_PawnKindDefs.xml
deleted file mode 100644
index 75fdefc06e..0000000000
--- a/Patches/Glitter Tech/GlitterTech_CE_Patch_PawnKindDefs.xml	
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Glitter Tech</li>
-			<li>Glitter Tech (No Surgery)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Commandos and Orion Corp faction pawns should spawn with ammo appropriate to their primary weapon ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="ComBase" or @Name="OCBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Commandos and Orion Corp faction pawns should spawn backpacks, allowing them to carry extra inventory such as ammo ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[defName="Commando" or
-						defName="CommandoH" or
-						defName="CommandoScout" or
-						defName="OCSoldier" or
-						defName="OCHeavy" or
-						defName="OCPeaceKeeper" or
-						defName="OCDirector"] </xpath>
-					<value>
-						<apparelRequired>
-							<li>CE_Apparel_Backpack</li>
-						</apparelRequired>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Glitter Tech/GlitterTech_CE_Patch_TraderKinds.xml b/Patches/Glitter Tech/GlitterTech_CE_Patch_TraderKinds.xml
deleted file mode 100644
index 4bc9f456f3..0000000000
--- a/Patches/Glitter Tech/GlitterTech_CE_Patch_TraderKinds.xml	
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Glitter Tech</li>
-			<li>Glitter Tech (No Surgery)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Allow Black Market traders to sell (lots!) of CE ammo and turrets -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="BlackMarket"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Ammo</tradeTag>
-							<countRange>
-								<min>1000</min>
-								<max>3000</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>18</min>
-								<max>24</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_HeavyAmmo</tradeTag>
-							<countRange>
-								<min>10</min>
-								<max>50</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>4</min>
-								<max>6</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_MediumAmmo</tradeTag>
-							<countRange>
-								<min>30</min>
-								<max>60</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>3</min>
-								<max>6</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Category">
-							<categoryDef>Ammo</categoryDef>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>0</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Turret</tradeTag>
-							<thingDefCountRange>
-								<min>-2</min>
-								<max>4</max>
-							</thingDefCountRange>
-							<countRange>
-								<min>1</min>
-								<max>2</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_Category">
-							<categoryDef>WeaponsTurrets</categoryDef>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>0</max>
-							</thingDefCountRange>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Glitter Tech/GlitterTech_CE_Patch_Turrets.xml b/Patches/Glitter Tech/GlitterTech_CE_Patch_Turrets.xml
deleted file mode 100644
index 2dbb800eef..0000000000
--- a/Patches/Glitter Tech/GlitterTech_CE_Patch_Turrets.xml	
+++ /dev/null
@@ -1,418 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Glitter Tech</li>
-			<li>Glitter Tech (No Surgery)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== EMRG turret ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_EMRGTurret</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.19</SwayFactor>
-						<Bulk>8.94</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12mmRailgun_Sabot</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>86</range>
-						<soundCast>EM</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<requireLineOfSight>false</requireLineOfSight>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>200</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_12mmRailgun</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="EMTurret"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>2.5</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="EMTurret"]/statBases</xpath>
-					<value>
-						<WorkToBuild>83500</WorkToBuild>
-						<Bulk>15</Bulk>
-					</value>
-				</li>
-
-				<!-- ========== Canister turret ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_CanisterTurret</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>2.02</SwayFactor>
-						<Bulk>10.66</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.34</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<burstShotCount>6</burstShotCount>
-						<soundCast>Shot_IncendiaryLauncher</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<requireLineOfSight>false</requireLineOfSight>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>6</aimedBurstShotCount>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CanisterTurret"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>1.1</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CanisterTurret"]/statBases</xpath>
-					<value>
-						<WorkToBuild>89500</WorkToBuild>
-						<Bulk>20</Bulk>
-					</value>
-				</li>
-
-				<!-- ========== Automatic mortar ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Auto_Artillery_Mortar</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>0.1</SwayFactor>
-						<Bulk>12.9</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-						<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_81mmMortarShell_HE</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<minRange>30</minRange>
-						<range>500</range>
-						<burstShotCount>1</burstShotCount>
-						<soundCast>Mortar_LaunchA</soundCast>
-						<muzzleFlashScale>16</muzzleFlashScale>
-						<requireLineOfSight>false</requireLineOfSight>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_81mmMortarShell_GlitterTechAutoMortar</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== Automatic cluster mortar ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Auto_Cluster_Mortar</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>0.1</SwayFactor>
-						<Bulk>12.9</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-						<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_81mmMortarShell_HE</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<minRange>30</minRange>
-						<range>500</range>
-						<burstShotCount>5</burstShotCount>
-						<soundCast>Mortar_LaunchA</soundCast>
-						<muzzleFlashScale>16</muzzleFlashScale>
-						<requireLineOfSight>false</requireLineOfSight>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_81mmMortarShell_GlitterTechClusterMortar</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!-- ========== Automatic EMP mortar ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Auto_EMP_Mortar</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>0.1</SwayFactor>
-						<Bulk>12.9</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-						<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_81mmMortarShell_EMP</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<minRange>30</minRange>
-						<range>500</range>
-						<burstShotCount>5</burstShotCount>
-						<soundCast>Mortar_LaunchA</soundCast>
-						<muzzleFlashScale>16</muzzleFlashScale>
-						<requireLineOfSight>false</requireLineOfSight>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_81mmMortarShell_GlitterTechEMPAMortar</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!-- ========== Long range missile turret ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_RocketswarmLauncher_GT</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>0.1</SwayFactor>
-						<Bulk>12.9</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-						<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_70mmAPKWS_HEAT</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<minRange>30</minRange>
-						<range>500</range>
-						<burstShotCount>25</burstShotCount>
-						<soundCast>Missile_small</soundCast>
-						<muzzleFlashScale>16</muzzleFlashScale>
-						<requireLineOfSight>false</requireLineOfSight>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_70mmAPKWS</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!-- ========== Cruise missile turret ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_CMissileTurret</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>0.1</SwayFactor>
-						<Bulk>12.9</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-						<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_TomahawkLAM</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<minRange>30</minRange>
-						<range>500</range>
-						<burstShotCount>1</burstShotCount>
-						<soundCast>Missile_large</soundCast>
-						<muzzleFlashScale>16</muzzleFlashScale>
-						<requireLineOfSight>false</requireLineOfSight>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_TomahawkLAM</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-					</FireModes>
-				</li>
-
-				<!-- ========== Shared settings for direct-fire turrets ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="EMTurret" or
-						defName="CanisterTurret"
-						] </xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="EMTurret" or
-						defName="CanisterTurret"
-						]/statBases/ShootingAccuracyTurret </xpath>
-					<value>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyTurret>1.0</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<!-- Allows turrets to be fired from behind CE embrasures -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="EMTurret" or
-						defName="CanisterTurret"
-						] </xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<!-- ========== Shared settings for mortar and missile Turrets ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="Auto_Artillery_Mortar" or
-						defName="Auto_Cluster_Mortar" or
-						defName="Auto_EMP_Mortar" or
-						defName="Gun_RocketswarmLauncher_GT" or
-						defName="Gun_CMissileTurret"
-						]/comps </xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Charges">
-							<chargeSpeeds>
-								<li>30</li>
-								<li>50</li>
-								<li>70</li>
-								<li>90</li>
-							</chargeSpeeds>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="AutoMortarBase_GT"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name = "AutoMortarBase_GT"]/statBases/WorkToBuild</xpath>
-					<value>
-						<WorkToBuild>58500</WorkToBuild>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name = "AutoMortarBase_GT"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>0.875</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name = "AutoMortarBase_GT"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1</AimingAccuracy>
-						<Bulk>25</Bulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_APB-1Group.xml b/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_APB-1Group.xml
deleted file mode 100644
index 6cbdde99d9..0000000000
--- a/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_APB-1Group.xml	
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Glitter Tech</li>
-			<li>Glitter Tech (No Surgery)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== APB-1 Pistol ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_APB-1Pistol</defName>
-					<statBases>
-						<Mass>0.66</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.80</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.84</SwayFactor>
-						<Bulk>1.86</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.00</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_PlasmaCellPistol</defaultProjectile>
-						<warmupTime>0.1</warmupTime>
-						<range>12</range>
-						<soundCast>PB</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_PlasmaCellPistol</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_APB-1Pistol"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_PlasmaCellPistol"]/graphicData/texPath</xpath>
-					<value>
-						<texPath>Things/Projectile/APBP</texPath>
-					</value>
-				</li>
-
-				<!-- ========== APB-1 Projector ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_APB-1Projector</defName>
-					<statBases>
-						<Mass>6.35</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.38</SwayFactor>
-						<Bulk>7.49</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.00</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_PlasmaCellHeavy</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>48</range>
-						<soundCast>PBP</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_PlasmaCellHeavy</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_APB-1Projector"]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_PlasmaCellHeavy"]/graphicData/texPath</xpath>
-					<value>
-						<texPath>Things/Projectile/APBProj</texPath>
-					</value>
-				</li>
-
-				<!-- ========== APB-1 Rifle ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_APB-1Rifle</defName>
-					<statBases>
-						<Mass>3.00</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.20</SwayFactor>
-						<Bulk>9.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.00</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_PlasmaCellRifle</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>PB</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_PlasmaCellRifle</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_APB-1Rifle"]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_PlasmaCellRifle"]/graphicData/texPath</xpath>
-					<value>
-						<texPath>Things/Projectile/APBR</texPath>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_EMRG-1.xml b/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_EMRG-1.xml
deleted file mode 100644
index 3106bfc34b..0000000000
--- a/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_EMRG-1.xml	
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Glitter Tech</li>
-			<li>Glitter Tech (No Surgery)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== EMRG-1 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_EMRifle</defName>
-					<statBases>
-						<Mass>2.6</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.19</SwayFactor>
-						<Bulk>8.94</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12mmRailgun_Sabot</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>86</range>
-						<soundCast>EM</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_12mmRailgun</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_EMRifle"]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_12mmRailgun_Sabot"]/graphicData/texPath</xpath>
-					<value>
-						<texPath>Things/Projectile/EM_Small</texPath>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_MRG-5Group.xml b/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_MRG-5Group.xml
deleted file mode 100644
index 82e612a572..0000000000
--- a/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_MRG-5Group.xml	
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Glitter Tech</li>
-			<li>Glitter Tech (No Surgery)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== MRG-5 Pistol ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MRGPistol</defName>
-					<statBases>
-						<Mass>1.01</Mass>
-						<RangedWeapon_Cooldown>0.40</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.06</SwayFactor>
-						<Bulk>2.17</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.1</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8mmRailgun_Sabot</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>EM_small</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_8mmRailgun</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_MRGPistol"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_8mmRailgun_Sabot"]/graphicData/texPath</xpath>
-					<value>
-						<texPath>Things/Projectile/MRGP</texPath>
-					</value>
-				</li>
-
-				<!-- ========== MRG-5 Rifle ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MRGRifle</defName>
-					<statBases>
-						<Mass>3.60</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.05</SwayFactor>
-						<Bulk>6.88</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.43</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6mmRailgun_Sabot</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>86</range>
-						<soundCast>EM_small</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_6mmRailgun</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_MRGRifle"]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_6mmRailgun_Sabot"]/graphicData/texPath</xpath>
-					<value>
-						<texPath>Things/Projectile/MRGP</texPath>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_OCGroup.xml b/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_OCGroup.xml
deleted file mode 100644
index 39db404948..0000000000
--- a/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_OCGroup.xml	
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Glitter Tech</li>
-			<li>Glitter Tech (No Surgery)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== OC Defense Pistol ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_OCPDPistol</defName>
-					<statBases>
-						<Mass>0.97</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.05</SwayFactor>
-						<Bulk>2.17</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<burstShotCount>2</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>OCDRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_OCPDPistol"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== OC Defense Rifle ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_OCPDRifle</defName>
-					<statBases>
-						<Mass>3.20</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.22</SwayFactor>
-						<Bulk>9.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.49</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>OCDRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_OCPDRifle"]/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>
-				</li>
-
-				<!-- ========== Orion rocket launcher ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_OCRocket</defName>
-					<statBases>
-						<Mass>12.00</Mass>
-						<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.10</SwayFactor>
-						<Bulk>13.00</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Rocket</defaultProjectile>
-						<warmupTime>1.9</warmupTime>
-						<range>60</range>
-						<ticksBetweenBurstShots>20</ticksBetweenBurstShots>
-						<burstShotCount>3</burstShotCount>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_OCRocket"]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_OCTurrets.xml b/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_OCTurrets.xml
deleted file mode 100644
index a345bb0b47..0000000000
--- a/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_OCTurrets.xml	
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Glitter Tech</li>
-			<li>Glitter Tech (No Surgery)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== OC Tank Cannon ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_OCTurret</defName>
-					<statBases>
-						<Mass>1120</Mass>
-						<RangedWeapon_Cooldown>2.61</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>3.04</SwayFactor>
-						<Bulk>54.83</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>4.61</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_90mmCannonShell_HEAT</defaultProjectile>
-						<warmupTime>4</warmupTime>
-						<range>86</range>
-						<soundCast>TCannon</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>9.8</reloadTime>
-						<ammoSet>AmmoSet_90mmCannonShell</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- Change cannon name and description to something other than the placeholder "inferno cannon" -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_OCTurret"]/label</xpath>
-					<value>
-						<label>OC tank cannon</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_OCTurret"]/description</xpath>
-					<value>
-						<description>90mm cannon mounted on Orion Corp tanks.</description>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Glitter Weaponry/Ammo.xml b/Patches/Glitter Weaponry/Ammo.xml
deleted file mode 100644
index 111475e8f5..0000000000
--- a/Patches/Glitter Weaponry/Ammo.xml	
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Glitter Weaponry</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- === Ammo Sets === -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Laser_Handcannon</defName>
-							<label>laser charge</label>
-							<ammoTypes>
-								<Ammo_LaserChargePack>Bullet_Laser_Laser_Handcannon</Ammo_LaserChargePack>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Laser_Carbine</defName>
-							<label>laser charge</label>
-							<ammoTypes>
-								<Ammo_LaserChargePack>Bullet_Laser_Laser_Carbine</Ammo_LaserChargePack>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Laser_Scatterer</defName>
-							<label>laser charge</label>
-							<ammoTypes>
-								<Ammo_LaserChargePack>Bullet_Laser_Laser_Scatterer</Ammo_LaserChargePack>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_DestructorLaser</defName>
-							<label>laser charge</label>
-							<ammoTypes>
-								<Ammo_LaserChargePack>Bullet_Laser_DestructorLaser</Ammo_LaserChargePack>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- === Projectiles === -->
-						<ThingDef ParentName="BaseBulletCE">
-							<defName>Bullet_Laser_Laser_Carbine</defName>
-							<label>laser bolt</label>
-							<graphicData>
-								<texPath>Things/LaserBolt</texPath>
-								<shaderType>TransparentPostLight</shaderType>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>DV_Laser</damageDef>
-								<speed>125</speed>
-								<damageAmountBase>16</damageAmountBase>
-								<armorPenetrationBase>0.35</armorPenetrationBase>
-							</projectile>
-							<comps>
-								<li Class="AthenaFramework.CompProperties_ProjectileImpactEffect">
-									<fleck>Fleck_Burn</fleck>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBulletCE">
-							<defName>Bullet_Laser_Laser_Handcannon</defName>
-							<label>small laser bolt</label>
-							<graphicData>
-								<texPath>Things/LaserBolt</texPath>
-								<shaderType>TransparentPostLight</shaderType>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>DV_Laser</damageDef>
-								<speed>125</speed>
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationBase>0.3</armorPenetrationBase>
-							</projectile>
-							<comps>
-								<li Class="AthenaFramework.CompProperties_ProjectileImpactEffect">
-									<fleck>Fleck_Burn</fleck>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBulletCE">
-							<defName>Bullet_Laser_Laser_Scatterer</defName>
-							<label>laser bolt</label>
-							<graphicData>
-								<texPath>Things/LaserBolt</texPath>
-								<shaderType>TransparentPostLight</shaderType>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>DV_Laser</damageDef>
-								<speed>125</speed>
-								<damageAmountBase>10</damageAmountBase>
-								<armorPenetrationBase>0.3</armorPenetrationBase>
-								<pelletCount>6</pelletCount>
-								<spreadMult>8.9</spreadMult>
-							</projectile>
-							<comps>
-								<li Class="AthenaFramework.CompProperties_ProjectileImpactEffect">
-									<fleck>Fleck_Burn</fleck>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBulletCE">
-							<defName>Bullet_Laser_DestructorLaser</defName>
-							<label>laser bolt</label>
-							<graphicData>
-								<texPath>Things/LaserBig</texPath>
-								<shaderType>TransparentPostLight</shaderType>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>DV_Laser</damageDef>
-								<speed>125</speed>
-								<damageAmountBase>10</damageAmountBase>
-								<armorPenetrationBase>0.15</armorPenetrationBase>
-								<explosionRadius>1.8</explosionRadius>
-								<explosionEffect>LaserBlast</explosionEffect>
-								<preExplosionSpawnThingDef>Filth_Ash</preExplosionSpawnThingDef>
-								<preExplosionSpawnChance>0.27</preExplosionSpawnChance>
-								<screenShakeFactor>0.5</screenShakeFactor>
-								<pelletCount>3</pelletCount>
-								<spreadMult>5.9</spreadMult>
-							</projectile>
-							<comps>
-								<li Class="AthenaFramework.CompProperties_ProjectileImpactEffect">
-									<fleck>Fleck_Burn</fleck>
-								</li>
-							</comps>
-						</ThingDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Glitter Weaponry/RangedSpacer.xml b/Patches/Glitter Weaponry/RangedSpacer.xml
deleted file mode 100644
index a865fbdff6..0000000000
--- a/Patches/Glitter Weaponry/RangedSpacer.xml	
+++ /dev/null
@@ -1,295 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Glitter Weaponry</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/DamageDef[defName="DV_Laser"]</xpath>
-					<value>
-						<li Class="CombatExtended.DamageDefExtensionCE">
-							<harmOnlyOutsideLayers>true</harmOnlyOutsideLayers>
-							<isAmbientDamage>true</isAmbientDamage>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Laser_Saber"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<chanceFactor>0.33</chanceFactor>
-								<cooldownTime>1.52</cooldownTime>
-								<armorPenetrationBlunt>0.500</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.24</cooldownTime>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<armorPenetrationSharp>42</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-								<extraMeleeDamages>
-									<li>
-										<def>DV_Laser</def>
-										<amount>10</amount>
-										<chance>0.5</chance>
-									</li>
-								</extraMeleeDamages>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>1.14</cooldownTime>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-								<extraMeleeDamages>
-									<li>
-										<def>DV_Laser</def>
-										<amount>10</amount>
-										<chance>0.5</chance>
-									</li>
-								</extraMeleeDamages>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Laser_Saber"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Laser_Saber"]/equippedAngleOffset</xpath>
-					<value>
-						<equippedAngleOffset>-45</equippedAngleOffset>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Laser_Saber"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.63</MeleeCritChance>
-							<MeleeParryChance>0.75</MeleeParryChance>
-							<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Laser_Saber"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Laser_Handcannon"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Laser_Carbine" or defName = "Laser_Scatterer"]/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>
-				</li>
-
-				<!-- === Remove Shotgun Gizmo === -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName = "Laser_Scatterer"]/verbs</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName = "Laser_Scatterer"]/modExtensions/li[@Class="AthenaFramework.AngularShotgunExtension"]</xpath>
-				</li>
-
-				<!-- === Laser Handcannon === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Laser_Handcannon</defName>
-					<statBases>
-						<Mass>1.20</Mass>
-						<Bulk>2.30</Bulk>
-						<SwayFactor>1.17</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Laser_Laser_Handcannon</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>22</range>
-						<soundCast>Laser_Woop</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>2.5</reloadTime>
-						<ammoSet>AmmoSet_Laser_Handcannon</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Laser Rifle === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Laser_Carbine</defName>
-					<statBases>
-						<Mass>3.50</Mass>
-						<Bulk>10.00</Bulk>
-						<SwayFactor>1.35</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.01</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Laser_Laser_Carbine</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>62</range>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>Laser_Woop</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>40</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_Laser_Carbine</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- === Laser Shotgun === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Laser_Scatterer</defName>
-					<statBases>
-						<Mass>3.40</Mass>
-						<Bulk>9.00</Bulk>
-						<SwayFactor>1.24</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.01</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Laser_Laser_Scatterer</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>22</range>
-						<soundCast>Laser_Woop</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_Laser_Scatterer</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-					</FireModes>
-
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Glitter Weaponry/RangedSpacer_Heavy.xml b/Patches/Glitter Weaponry/RangedSpacer_Heavy.xml
deleted file mode 100644
index 0135c0997c..0000000000
--- a/Patches/Glitter Weaponry/RangedSpacer_Heavy.xml	
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Glitter Weaponry</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Weapons Expanded - Heavy Weapons</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<!-- === Tools === -->
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="Laser_Destructor"]/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>
-					</li>
-
-					<!-- === Remove Shotgun Gizmo === -->
-					<li Class="PatchOperationRemove">
-						<xpath>Defs/ThingDef[defName = "Laser_Destructor"]/verbs</xpath>
-					</li>
-
-					<li Class="PatchOperationRemove">
-						<xpath>Defs/ThingDef[defName = "Laser_Destructor"]/modExtensions/li[@Class="AthenaFramework.AngularShotgunExtension"]</xpath>
-					</li>
-
-					<!-- === Laser Destructor === -->
-					<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-						<defName>Laser_Destructor</defName>
-						<statBases>
-							<Mass>3</Mass>
-							<Bulk>15</Bulk>
-							<SwayFactor>1.24</SwayFactor>
-							<ShotSpread>0.06</ShotSpread>
-							<SightsEfficiency>1.10</SightsEfficiency>
-							<RangedWeapon_Cooldown>1.58</RangedWeapon_Cooldown>
-						</statBases>
-						<Properties>
-							<recoilAmount>0.01</recoilAmount>
-							<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-							<hasStandardCommand>True</hasStandardCommand>
-							<defaultProjectile>Bullet_Laser_DestructorLaser</defaultProjectile>
-							<warmupTime>1.2</warmupTime>
-							<range>45</range>
-							<soundCast>Laser_Woop</soundCast>
-							<soundCastTail>GunTail_Heavy</soundCastTail>
-							<muzzleFlashScale>9</muzzleFlashScale>
-							<targetParams>
-								<canTargetLocations>true</canTargetLocations>
-							</targetParams>
-						</Properties>
-						<AmmoUser>
-							<magazineSize>20</magazineSize>
-							<reloadTime>4</reloadTime>
-							<ammoSet>AmmoSet_DestructorLaser</ammoSet>
-						</AmmoUser>
-						<FireModes>
-							<aiAimMode>AimedShot</aiAimMode>
-							<aiUseBurstMode>True</aiUseBurstMode>
-						</FireModes>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Gloomy Dragonian Race/ThingDefs_Bodies/Dragonian_Bodytype.xml b/Patches/Gloomy Dragonian Race/ThingDefs_Bodies/Dragonian_Bodytype.xml
deleted file mode 100644
index c1da50d0ef..0000000000
--- a/Patches/Gloomy Dragonian Race/ThingDefs_Bodies/Dragonian_Bodytype.xml	
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationSequence">
-		<operations>
-
-			<!--Patch Dragonian Bodytype-->
-
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Gloomy Dragonian race</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--Arm Groups-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Dragonian_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="Left arm"]/groups</xpath>
-							<value>
-								<li>LeftArm</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Dragonian_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="Right arm"]/groups</xpath>
-							<value>
-								<li>RightArm</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Dragonian_Body"]/corePart/parts/li[customLabel="Left shoulder"]/groups</xpath>
-							<value>
-								<li>LeftShoulder</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Dragonian_Body"]/corePart/parts/li[customLabel="Right shoulder"]/groups</xpath>
-							<value>
-								<li>RightShoulder</li>
-							</value>
-						</li>
-
-						<!--Natural Armor-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Dragonian_Body"]/corePart/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Dragonian_Body"]/corePart/parts/li[def="Neck"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Dragonian_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Dragonian_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Dragonian_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Dragonian_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Dragonian_Body"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Dragonian_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Dragonian_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Dragonian_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Dragonian_Body"]/corePart/parts/li[def="Leg"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Dragonian_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Dragonian_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Gloomy Dragonian Race/ThingDefs_Items/Items_Resource_Stuff.xml b/Patches/Gloomy Dragonian Race/ThingDefs_Items/Items_Resource_Stuff.xml
deleted file mode 100644
index 34975b801d..0000000000
--- a/Patches/Gloomy Dragonian Race/ThingDefs_Items/Items_Resource_Stuff.xml	
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Gloomy Dragonian race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="WoolDragonian"]/statBases</xpath>
-							<value>
-								<Bulk>0.3</Bulk>
-								<WornBulk>0.3</WornBulk>
-								<StuffPower_Armor_Electric>0.10</StuffPower_Armor_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="WoolDragonian"]/statBases/StuffPower_Armor_Sharp</xpath>
-							<value>
-								<StuffPower_Armor_Sharp>0.675</StuffPower_Armor_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="WoolDragonian"]/statBases/StuffPower_Armor_Blunt</xpath>
-							<value>
-								<StuffPower_Armor_Blunt>0.85</StuffPower_Armor_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="WoolDragonian"]/statBases/StuffPower_Armor_Heat</xpath>
-							<value>
-								<StuffPower_Armor_Heat>0.15</StuffPower_Armor_Heat>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="WoolDragonian"]/stuffProps/statFactors</xpath>
-							<value>
-								<Mass>0.90</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="WoolDragonian"]/stuffProps/categories</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="WoolDragonian"]/stuffProps</xpath>
-								<value>
-									<categories>
-										<li>SoftArmor</li>
-									</categories>
-								</value>
-							</nomatch>
-							<match Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="WoolDragonian"]/stuffProps/categories</xpath>
-								<value>
-									<li>SoftArmor</li>
-								</value>
-							</match>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Gloomy Dragonian Race/ThingDefs_Misc/DR_Apparel.xml b/Patches/Gloomy Dragonian Race/ThingDefs_Misc/DR_Apparel.xml
deleted file mode 100644
index 7b0d9695f8..0000000000
--- a/Patches/Gloomy Dragonian Race/ThingDefs_Misc/DR_Apparel.xml	
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Gloomy Dragonian race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!-- ========== Basic Wears ========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="DR_BasicWear" or defName="DR_BasicDress"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<!-- ========== Regular ========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="DR_OpenDress" or
-								defName="DR_SideDress" or
-								defName="DR_OffshoulderDress" or
-								defName="DR_Seethrough" or
-								defName="DR_MidOff" or
-								defName="DR_SlaveCloth"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-								<WornBulk>0</WornBulk>
-							</value>
-						</li>
-
-						<!-- ========== Armor ========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="DR_BattleDress"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-								<Bulk>15</Bulk>
-								<WornBulk>7.5</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="DR_BattleDress"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>4.05</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="DR_BattleDress"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>5.1</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="DR_BattleDress"]/apparel/bodyPartGroups</xpath>
-							<value>
-								<li>Hands</li>
-								<li>Feet</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="DR_BattleHelmA"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-								<Bulk>3</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="DR_BattleHelmA"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>1</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="DR_BattleHelmA"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="DR_PsychicDress"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-								<Bulk>7.5</Bulk>
-								<WornBulk>5</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="DR_PsychicDress"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>2</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="DR_PsychicDress"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>2.6</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="DR_PsychicDress"]/apparel/bodyPartGroups</xpath>
-							<value>
-								<li>Hands</li>
-								<li>Feet</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="DR_PsychicHelm"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-								<Bulk>3</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="DR_PsychicHelm"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="DR_PsychicHelm"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.75</ArmorRating_Blunt>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Gloomy Dragonian Race/ThingDefs_Misc/DR_Weapon.xml b/Patches/Gloomy Dragonian Race/ThingDefs_Misc/DR_Weapon.xml
deleted file mode 100644
index 45eaaaea3e..0000000000
--- a/Patches/Gloomy Dragonian Race/ThingDefs_Misc/DR_Weapon.xml	
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Gloomy Dragonian race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="DR_BattleMace"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>5</power>
-										<cooldownTime>1.37</cooldownTime>
-										<armorPenetrationBlunt>0.87</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-											<li>Demolish</li>
-										</capacities>
-										<power>38</power>
-										<cooldownTime>2.59</cooldownTime>
-										<armorPenetrationBlunt>16.38</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="DR_BattleMace"]/statBases</xpath>
-							<value>
-								<Bulk>8</Bulk>
-								<MeleeCounterParryBonus>0.40</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName = "DR_BattleMace"]/equippedStatOffsets</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName = "DR_BattleMace"]</xpath>
-								<value>
-									<equippedStatOffsets />
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="DR_BattleMace"]/equippedStatOffsets</xpath>
-							<value>
-								<MeleeCritChance>1.50</MeleeCritChance>
-								<MeleeParryChance>0.30</MeleeParryChance>
-								<MeleeDodgeChance>0.30</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="DR_Battlesword"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>5</power>
-										<cooldownTime>1.37</cooldownTime>
-										<armorPenetrationBlunt>0.87</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>Blunt blade</label>
-										<labelUsedInLogging>false</labelUsedInLogging>
-										<capacities>
-											<li>Blunt</li>
-											<li>Demolish</li>
-											<li>Cut</li>
-										</capacities>
-										<power>40</power>
-										<cooldownTime>2.23</cooldownTime>
-										<armorPenetrationBlunt>11.5</armorPenetrationBlunt>
-										<armorPenetrationSharp>2.32</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="DR_Battlesword"]/statBases</xpath>
-							<value>
-								<Bulk>8</Bulk>
-								<MeleeCounterParryBonus>0.67</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName = "DR_Battlesword"]/equippedStatOffsets</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName = "DR_Battlesword"]</xpath>
-								<value>
-									<equippedStatOffsets />
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="DR_Battlesword"]/equippedStatOffsets</xpath>
-							<value>
-								<MeleeCritChance>0.16</MeleeCritChance>
-								<MeleeParryChance>0.50</MeleeParryChance>
-								<MeleeDodgeChance>0.50</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="DR_BattleStaff"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>5</power>
-										<cooldownTime>1.37</cooldownTime>
-										<armorPenetrationBlunt>0.87</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-											<li>Demolish</li>
-										</capacities>
-										<power>45</power>
-										<extraMeleeDamages>
-											<li>
-												<def>EMP</def>
-												<amount>4.5</amount>
-											</li>
-											<li>
-												<def>Stun</def>
-												<amount>1.5</amount>
-												<chance>0.25</chance>
-											</li>
-										</extraMeleeDamages>
-										<cooldownTime>5.14</cooldownTime>
-										<armorPenetrationBlunt>22.94</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="DR_BattleStaff"]/statBases</xpath>
-							<value>
-								<Bulk>8</Bulk>
-								<MeleeCounterParryBonus>0.50</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName = "DR_BattleStaff"]/equippedStatOffsets</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName = "DR_BattleStaff"]</xpath>
-								<value>
-									<equippedStatOffsets />
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="DR_BattleStaff"]/equippedStatOffsets</xpath>
-							<value>
-								<MeleeCritChance>1.60</MeleeCritChance>
-								<MeleeParryChance>0.38</MeleeParryChance>
-								<MeleeDodgeChance>0.40</MeleeDodgeChance>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Gloomy Dragonian Race/ThingDefs_Races/Race_Dragonian.xml b/Patches/Gloomy Dragonian Race/ThingDefs_Races/Race_Dragonian.xml
deleted file mode 100644
index c4065897fb..0000000000
--- a/Patches/Gloomy Dragonian Race/ThingDefs_Races/Race_Dragonian.xml	
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Gloomy Dragonian race</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Dragonian_Race"]/comps</xpath>
-							<value>
-								<li>
-									<compClass>CombatExtended.CompPawnGizmo</compClass>
-								</li>
-								<li Class="CombatExtended.CompProperties_Suppressable" />
-								<li Class="CombatExtended.CompProperties_ArmorDurability">
-									<Durability>500</Durability>
-									<Regenerates>true</Regenerates>
-									<RegenInterval>600</RegenInterval>
-									<RegenValue>5</RegenValue>
-									<MinArmorPct>0.75</MinArmorPct>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Dragonian_Race"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Humanoid</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<!-- 5.2 Speed/0.8 Size/60 kg -->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Dragonian_Race"]/statBases</xpath>
-							<value>
-								<MeleeCritChance>1.08</MeleeCritChance>
-								<MeleeParryChance>1.06</MeleeParryChance>
-								<Suppressability>1</Suppressability>
-								<!--Innate toxic resistance of 0.6-->
-								<SmokeSensitivity>0.6</SmokeSensitivity>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Dragonian_Race"]/statBases/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>1.18</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<!--4mm Wool (skin+scales), their vanilla armor is thrumbo level-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Dragonian_Race"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>2.7</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Dragonian_Race"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>3.4</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Dragonian_Race"]/statBases/ArmorRating_Heat</xpath>
-							<value>
-								<ArmorRating_Heat>0.6</ArmorRating_Heat>
-							</value>
-						</li>
-
-						<!--Their vanilla melee is very strong (18 verus 8.2 for humanlike)-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Dragonian_Race"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left fist</label>
-										<capacities>
-											<li>Scratch</li>
-										</capacities>
-										<power>7</power>
-										<cooldownTime>0.89</cooldownTime>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationSharp>0.47</armorPenetrationSharp>
-										<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>right fist</label>
-										<capacities>
-											<li>Scratch</li>
-										</capacities>
-										<power>7</power>
-										<cooldownTime>0.89</cooldownTime>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationSharp>0.47</armorPenetrationSharp>
-										<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>tail</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>20</power>
-										<cooldownTime>2.28</cooldownTime>
-										<linkedBodyPartsGroup>Dragonian_Tail</linkedBodyPartsGroup>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationBlunt>7.875</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Dragonian_Race"]/alienRace/raceRestriction/whiteApparelList</xpath>
-							<value>
-								<li>CE_Apparel_TacVest</li>
-								<li>CE_Apparel_Backpack</li>
-								<li>CE_Apparel_TribalBackpack</li>
-								<li>CE_Apparel_BallisticShield</li>
-								<li>CE_Apparel_MeleeShield</li>
-								<li>CE_Apparel_GasMask</li>
-								<li>CE_Apparel_ImprovGasMask</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/GouRIMet/Items_GouRIMet.xml b/Patches/GouRIMet/Items_GouRIMet.xml
deleted file mode 100644
index f5950ca5e1..0000000000
--- a/Patches/GouRIMet/Items_GouRIMet.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>GouRIMet</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Sweets -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CaramelBalls" or
-						defName="HotCocoa" or
-						defName="HotTea"
-						]/statBases </xpath>
-					<value>
-						<Bulk>0.05</Bulk>
-					</value>
-				</li>
-
-				<!-- Resources -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="ResourceBaseGRM"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>0.1</Bulk>
-						</statBases>
-					</value>
-				</li>
-
-				<!-- Smoked Meat -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SmokedMeat"]/statBases</xpath>
-					<value>
-						<Bulk>0.1</Bulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Grimworld Autoguns/Autoguns.xml b/Patches/Grimworld Autoguns/Autoguns.xml
deleted file mode 100644
index e9e33051a9..0000000000
--- a/Patches/Grimworld Autoguns/Autoguns.xml	
+++ /dev/null
@@ -1,414 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Grimworld: Autoguns</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Agripinaamkii" or
-						defName="Gun_Agripinaamkiitanker" or
-						defName="Gun_OrlockAutogun" or
-						defName="Gun_Heavystubber" or
-						defName="Gun_MilitarumShotgun" or
-						defName="Gun_MilitarumShotgunSawn"]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Zarona" or
-						defName="Gun_Hiveworldautopistol"]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Agripinaa-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Agripinaamkii</defName>
-					<statBases>
-						<Bulk>10.9</Bulk>
-						<Mass>6.2</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<SwayFactor>1.71</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<WorkToMake>41000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>60</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.71</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>68</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!--Agripinaa Tanker-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Agripinaamkiitanker</defName>
-					<statBases>
-						<Bulk>6.84</Bulk>
-						<Mass>3.9</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<SwayFactor>1.07</SwayFactor>
-						<ShotSpread>0.09</ShotSpread>
-						<WorkToMake>39000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>60</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.79</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>6</ticksBetweenBurstShots>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!--Orlock Autogun-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_OrlockAutogun</defName>
-					<statBases>
-						<Bulk>9.38</Bulk>
-						<Mass>5.70</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<SwayFactor>1.41</SwayFactor>
-						<ShotSpread>0.09</ShotSpread>
-						<WorkToMake>30000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>60</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.48</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>14</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>40</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!--Zarona-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Zarona</defName>
-					<statBases>
-						<Bulk>0.9</Bulk>
-						<Mass>0.3</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<SwayFactor>0.4</SwayFactor>
-						<ShotSpread>0.2</ShotSpread>
-						<WorkToMake>4000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_44Magnum_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Revolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_44Magnum</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!--Hiveworld Autopistol-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Hiveworldautopistol</defName>
-					<statBases>
-						<Bulk>1.8</Bulk>
-						<Mass>0.80</Mass>
-						<RangedWeapon_Cooldown>0.41</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<SwayFactor>0.26</SwayFactor>
-						<ShotSpread>0.19</ShotSpread>
-						<WorkToMake>11000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>58</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>3.35</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!--Heavy Stubber-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Heavystubber</defName>
-					<statBases>
-						<Bulk>15.2</Bulk>
-						<Mass>7.80</Mass>
-						<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<SwayFactor>0.55</SwayFactor>
-						<ShotSpread>0.05</ShotSpread>
-						<WorkToMake>38000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>120</Steel>
-						<ComponentIndustrial>10</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>0.82</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>65</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!--Militarum Shotgun-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MilitarumShotgun</defName>
-					<statBases>
-						<Bulk>9.2</Bulk>
-						<Mass>5.60</Mass>
-						<RangedWeapon_Cooldown>0.98</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<SwayFactor>1.48</SwayFactor>
-						<ShotSpread>0.15</ShotSpread>
-						<WorkToMake>14000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>60</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>5.1</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!--Militarum Shotgun Sawn-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MilitarumShotgunSawn</defName>
-					<statBases>
-						<Bulk>7.68</Bulk>
-						<Mass>4.68</Mass>
-						<RangedWeapon_Cooldown>0.98</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<SwayFactor>1.24</SwayFactor>
-						<ShotSpread>0.16</ShotSpread>
-						<WorkToMake>13000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</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>6</magazineSize>
-						<reloadTime>5.1</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Grimworld Lasguns/lasguns.xml b/Patches/Grimworld Lasguns/lasguns.xml
deleted file mode 100644
index 3b7c1ba113..0000000000
--- a/Patches/Grimworld Lasguns/lasguns.xml	
+++ /dev/null
@@ -1,528 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Grimworld: Lasguns</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Tools === -->
-
-				<!-- == Rifles == -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "Gun_Kantrael" or
-						defName = "Gun_Kantraelsanctified" or
-						defName = "Gun_Kantraelt" or
-						defName = "Gun_Lascarbinefour" or
-						defName = "Gun_Lascarbinefoursanctified" or
-						defName = "Gun_VossPattern" or
-						defName = "Gun_VossPatternsanctified" or
-						defName = "Gun_Accatranfive" or
-						defName = "Gun_Lucius" or
-						defName = "Gun_Hellgun" or
-						defName = "Gun_Locke" or
-						defName = "Gun_LongLas"
-						]/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>
-				</li>
-
-				<!-- == Pistols == -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "Gun_Kantraeldefender" or
-						defName = "Gun_Kantraeldefendert"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Kantrael MG === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Kantrael</defName>
-					<statBases>
-						<Mass>3.80</Mass>
-						<Bulk>15.00</Bulk>
-						<SwayFactor>1.35</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Lasgun_Rifle</defaultProjectile>
-						<warmupTime>0.75</warmupTime>
-						<range>60</range>
-						<soundCast>VWE_LaserShot_Rifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>150</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_Lasgun_Rifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- === Sanctified Kantrael MG === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Kantraelsanctified</defName>
-					<statBases>
-						<Mass>3.80</Mass>
-						<Bulk>15.00</Bulk>
-						<SwayFactor>1.25</SwayFactor>
-						<ShotSpread>0.03</ShotSpread>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Lasgun_Rifle</defaultProjectile>
-						<warmupTime>0.75</warmupTime>
-						<range>60</range>
-						<soundCast>VWE_LaserShot_Rifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>150</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_Lasgun_Rifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- === Kantrael MG-t === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Kantraelt</defName>
-					<statBases>
-						<Mass>3.80</Mass>
-						<Bulk>15.00</Bulk>
-						<SwayFactor>1.2</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Lasgun_Rifle</defaultProjectile>
-						<warmupTime>0.7</warmupTime>
-						<range>60</range>
-						<soundCast>VWE_LaserShot_Rifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>150</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_Lasgun_Rifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- === MK4 Lascarbine === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Lascarbinefour</defName>
-					<statBases>
-						<Mass>3.40</Mass>
-						<Bulk>13.50</Bulk>
-						<SwayFactor>1.25</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Lasgun_Rifle</defaultProjectile>
-						<warmupTime>0.2</warmupTime>
-						<range>45</range>
-						<soundCast>VWE_LaserShot_Rifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_Lasgun_Rifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- === Sanctified MK4 Lascarbine === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Lascarbinefoursanctified</defName>
-					<statBases>
-						<Mass>3.40</Mass>
-						<Bulk>13.50</Bulk>
-						<SwayFactor>1.15</SwayFactor>
-						<ShotSpread>0.03</ShotSpread>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Lasgun_Rifle</defaultProjectile>
-						<warmupTime>0.2</warmupTime>
-						<range>45</range>
-						<soundCast>VWE_LaserShot_Rifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_Lasgun_Rifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- === Voss MKI === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_VossPattern</defName>
-					<statBases>
-						<Mass>3.20</Mass>
-						<Bulk>12.0</Bulk>
-						<SwayFactor>1.15</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.7</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Lasgun_Rifle</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>40</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<soundCast>VWE_LaserShot_Rifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>150</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_Lasgun_Rifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- === Sanctified Voss MKI === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_VossPatternsanctified</defName>
-					<statBases>
-						<Mass>3.20</Mass>
-						<Bulk>12.0</Bulk>
-						<SwayFactor>1.05</SwayFactor>
-						<ShotSpread>0.03</ShotSpread>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Lasgun_Rifle</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>45</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<soundCast>VWE_LaserShot_Rifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>150</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_Lasgun_Rifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- === Accatran MKIV === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Accatranfive</defName><!-- I know that IV is 4, this is the mod dev's mistake -FT -->
-					<statBases>
-						<Mass>3.20</Mass>
-						<Bulk>10.0</Bulk>
-						<SwayFactor>1.3</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.7</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Lasgun_Rifle</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>45</range>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>VWE_LaserShot_Rifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>150</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_Lasgun_Rifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- === Lucius MKI === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Lucius</defName>
-					<statBases>
-						<Mass>3.80</Mass>
-						<Bulk>16.00</Bulk>
-						<SwayFactor>1.35</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.9</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Lasgun_HellGun</defaultProjectile>
-						<warmupTime>0.75</warmupTime>
-						<range>70</range>
-						<soundCast>VWE_LaserShot_Rifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>80</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_Lasgun_HellGun</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- === Kantrael MG Defender === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Kantraeldefender</defName>
-					<statBases>
-						<Mass>1.20</Mass>
-						<Bulk>3.20</Bulk>
-						<SwayFactor>1.2</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Lasgun_Pistol</defaultProjectile>
-						<warmupTime>0.3</warmupTime>
-						<range>20</range>
-						<soundCast>VWE_LaserShot_Light</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>80</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_Lasgun_Pistol</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>LaserGun</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Kantrael MG-t Defender === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Kantraeldefendert</defName>
-					<statBases>
-						<Mass>1.20</Mass>
-						<Bulk>3.20</Bulk>
-						<SwayFactor>1.15</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.2</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Lasgun_Pistol</defaultProjectile>
-						<warmupTime>0.25</warmupTime>
-						<range>20</range>
-						<soundCast>VWE_LaserShot_Light</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>80</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_Lasgun_Pistol</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>LaserGun</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Ryza Hellgun === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Hellgun</defName>
-					<statBases>
-						<Mass>3.80</Mass>
-						<Bulk>16.00</Bulk>
-						<SwayFactor>1.35</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.9</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Lasgun_HellGun</defaultProjectile>
-						<warmupTime>0.75</warmupTime>
-						<range>70</range>
-						<soundCast>VWE_LaserShot_Rifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>80</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_Lasgun_HellGun</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- === MK4 Lascarbine === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Locke</defName>
-					<statBases>
-						<Mass>3.40</Mass>
-						<Bulk>13.50</Bulk>
-						<SwayFactor>1.25</SwayFactor>
-						<ShotSpread>0.07</ShotSpread>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Lasgun_Rifle</defaultProjectile>
-						<warmupTime>0.18</warmupTime>
-						<range>45</range>
-						<soundCast>VWE_LaserShot_Rifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_Lasgun_Rifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Grimworld Melee/IndustrialMelee.xml b/Patches/Grimworld Melee/IndustrialMelee.xml
deleted file mode 100644
index 41c9d635d4..0000000000
--- a/Patches/Grimworld Melee/IndustrialMelee.xml	
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Grimworld: Melee</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === One-handed Tags === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "MeleeWeapon_TrenchShovel" and "MeleeWeapon_Chainshortsword"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- ========== Chainsword ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Chainsword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.33</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.936</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>45</power>
-								<cooldownTime>2.0</cooldownTime>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>18.55</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Chainsword"]/statBases</xpath>
-					<value>
-						<Bulk>15.50</Bulk>
-						<MeleeCounterParryBonus>1.38</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Chainsword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.86</MeleeCritChance>
-							<MeleeParryChance>0.69</MeleeParryChance>
-							<MeleeDodgeChance>0.37</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- ========== Short Chainsword ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Chainshortsword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.45</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.936</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>1.0</cooldownTime>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>18.55</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Chainshortsword"]/statBases</xpath>
-					<value>
-						<Bulk>9.50</Bulk>
-						<MeleeCounterParryBonus>0.76</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Chainshortsword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.56</MeleeCritChance>
-							<MeleeParryChance>0.45</MeleeParryChance>
-							<MeleeDodgeChance>0.41</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- ========== Trench Shovel ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_TrenchShovel"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.37</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.936</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.0</cooldownTime>
-								<armorPenetrationBlunt>9.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_TrenchShovel"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>0.38</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_TrenchShovel"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.46</MeleeCritChance>
-							<MeleeParryChance>0.35</MeleeParryChance>
-							<MeleeDodgeChance>0.50</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Grimworld Melee/SpacerMelee.xml b/Patches/Grimworld Melee/SpacerMelee.xml
deleted file mode 100644
index 70c47cac82..0000000000
--- a/Patches/Grimworld Melee/SpacerMelee.xml	
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Grimworld: Melee</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === One-handed Tags === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "MeleeWeapon_PowerFist"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- ========== PowerFist ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_PowerFist"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.33</cooldownTime>
-								<armorPenetrationBlunt>14.00</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_PowerFist"]/statBases</xpath>
-					<value>
-						<Bulk>5.50</Bulk>
-						<MeleeCounterParryBonus>0.25</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_PowerFist"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.86</MeleeCritChance>
-							<MeleeParryChance>0.69</MeleeParryChance>
-							<MeleeDodgeChance>0.37</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- ========== Power Sword ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_PowerSword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.35</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.936</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>47</power>
-								<extraMeleeDamages>
-									<li>
-										<def>EMP</def>
-										<amount>3</amount>
-										<chance>0.2</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>1.45</cooldownTime>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>27.35</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>50</power>
-								<extraMeleeDamages>
-									<li>
-										<def>EMP</def>
-										<amount>3</amount>
-										<chance>0.3</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>2.00</cooldownTime>
-								<armorPenetrationBlunt>3.00</armorPenetrationBlunt>
-								<armorPenetrationSharp>32.00</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_PowerSword"]/statBases</xpath>
-					<value>
-						<Bulk>9.50</Bulk>
-						<MeleeCounterParryBonus>0.85</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_PowerSword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.00</MeleeCritChance>
-							<MeleeParryChance>0.55</MeleeParryChance>
-							<MeleeDodgeChance>0.45</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- ========== Power Sword Crossguard ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_PowerSwordtwo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.35</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.936</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>47</power>
-								<extraMeleeDamages>
-									<li>
-										<def>EMP</def>
-										<amount>3</amount>
-										<chance>0.2</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>1.45</cooldownTime>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>27.35</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>50</power>
-								<extraMeleeDamages>
-									<li>
-										<def>EMP</def>
-										<amount>3</amount>
-										<chance>0.3</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>2.0</cooldownTime>
-								<armorPenetrationBlunt>3.00</armorPenetrationBlunt>
-								<armorPenetrationSharp>32.00</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_PowerSwordtwo"]/statBases</xpath>
-					<value>
-						<Bulk>10.50</Bulk>
-						<MeleeCounterParryBonus>0.95</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_PowerSwordtwo"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.00</MeleeCritChance>
-							<MeleeParryChance>0.75</MeleeParryChance>
-							<MeleeDodgeChance>0.45</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Gulden Mod/GuldenSheep.xml b/Patches/Gulden Mod/GuldenSheep.xml
deleted file mode 100644
index 6149afae70..0000000000
--- a/Patches/Gulden Mod/GuldenSheep.xml	
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Gulden Mod</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GuldenSheep"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GuldenSheep"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.11</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.03</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GuldenSheep"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.60</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Gulden Mod/Gulden_Forest_Resources_Leather.xml b/Patches/Gulden Mod/Gulden_Forest_Resources_Leather.xml
deleted file mode 100644
index 4de26213c4..0000000000
--- a/Patches/Gulden Mod/Gulden_Forest_Resources_Leather.xml	
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Gulden Mod</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Runic Pelt-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RuneBearLeatherBase"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>5</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RuneBearLeatherBase"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GuldenWoolSheep"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.06</StuffPower_Armor_Sharp>
-						<StuffPower_Armor_Blunt>0.05</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Gulden Mod/Horse_Named_Norman.xml b/Patches/Gulden Mod/Horse_Named_Norman.xml
deleted file mode 100644
index c11b2a546e..0000000000
--- a/Patches/Gulden Mod/Horse_Named_Norman.xml	
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Gulden Mod</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Gulden_Animal_Capricorn"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Gulden_Animal_Capricorn"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.04</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.4</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gulden_Animal_Capricorn"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.700</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>2.2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.125</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Gulden Mod/Rabitgaroo.xml b/Patches/Gulden Mod/Rabitgaroo.xml
deleted file mode 100644
index 51e0d0aaee..0000000000
--- a/Patches/Gulden Mod/Rabitgaroo.xml	
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Gulden Mod</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="BaseRabbitgaroo"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="BaseRabbitgaroo"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="BaseRabbitgaroo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.85</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Gulden Mod/RuneBear.xml b/Patches/Gulden Mod/RuneBear.xml
deleted file mode 100644
index 639e890bb3..0000000000
--- a/Patches/Gulden Mod/RuneBear.xml	
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Gulden Mod</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="RuneBear"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RuneBear"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>32</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RuneBear"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>15</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RuneBear"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.02</MeleeDodgeChance>
-						<MeleeCritChance>1.75</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RuneBear"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Cut</li>
-								</capacities>
-								<power>65</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>35</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>25</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Cut</li>
-								</capacities>
-								<power>65</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>35</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>25</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>56</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<armorPenetrationBlunt>40</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>47</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>45</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/HLX ReGrowth - Extinct Animals Pack/Extinct_Birdlike.xml b/Patches/HLX ReGrowth - Extinct Animals Pack/Extinct_Birdlike.xml
deleted file mode 100644
index a0ab2dd88e..0000000000
--- a/Patches/HLX ReGrowth - Extinct Animals Pack/Extinct_Birdlike.xml	
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[HLX] ReGrowth - Extinct Animals Pack</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RG-EAP_Dodo" or defName="RG-EAP_ArcticDrak"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RG-EAP_ArcticDrak"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.37</MeleeDodgeChance>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>0.08</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG-EAP_ArcticDrak"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>RG-EAP_FootClawAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.37</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>RG-EAP_FootClawAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.37</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.75</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>tail</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.78</cooldownTime>
-								<linkedBodyPartsGroup>RG-EAP_TailAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RG-EAP_ArcticDrak"]/combatPower</xpath>
-					<value>
-						<combatPower>120</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RG-EAP_Dodo"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.07</MeleeDodgeChance>
-						<MeleeCritChance>0.03</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG-EAP_Dodo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.55</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.08</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.16</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RG-EAP_Dodo"]/combatPower</xpath>
-					<value>
-						<combatPower>30</combatPower>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/HLX ReGrowth - Extinct Animals Pack/Extinct_Bodies.xml b/Patches/HLX ReGrowth - Extinct Animals Pack/Extinct_Bodies.xml
deleted file mode 100644
index 18d2772596..0000000000
--- a/Patches/HLX ReGrowth - Extinct Animals Pack/Extinct_Bodies.xml	
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[HLX] ReGrowth - Extinct Animals Pack</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Natural Armor -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="RG-EAP-TheropodWithClaws"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Leg" ]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="RG-EAP-TheropodWithClaws"]//*[
-						def="Body" or
-						def="Tail" or
-						def="Neck" or
-						def="Head" or
-						def="AnimalJaw" or
-						def="RG-EAP_FootClaw" or
-						def="Leg" or
-						def="Foot"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/HLX ReGrowth - Extinct Animals Pack/Extinct_Mammals.xml b/Patches/HLX ReGrowth - Extinct Animals Pack/Extinct_Mammals.xml
deleted file mode 100644
index 618e5a411b..0000000000
--- a/Patches/HLX ReGrowth - Extinct Animals Pack/Extinct_Mammals.xml	
+++ /dev/null
@@ -1,243 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[HLX] ReGrowth - Extinct Animals Pack</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RG-EAP-Protoceratidae" or defName="RG-EAP_WoollyRhino" or defName="RG-EAP_WoollyMammoth"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG-EAP-Protoceratidae"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>6.8</MoveSpeed>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.07</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG-EAP-Protoceratidae"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.27</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.700</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RG-EAP-Protoceratidae"]/combatPower</xpath>
-					<value>
-						<combatPower>50</combatPower>
-					</value>
-				</li>
-
-				<!-- === Wooly Rhino === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG-EAP_WoollyRhino"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>5.1</MoveSpeed>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.62</MeleeCritChance>
-						<MeleeParryChance>0.3</MeleeParryChance>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-						<ArmorRating_Sharp>0.4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG-EAP_WoollyRhino"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>2.37</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>21</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Poke</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>2.37</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>21</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>2.7</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>24</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RG-EAP_WoollyRhino"]/combatPower</xpath>
-					<value>
-						<combatPower>240</combatPower>
-					</value>
-				</li>
-
-				<!-- === Wooly Mammoth === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RG-EAP_WoollyMammoth"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.90</MeleeCritChance>
-						<MeleeParryChance>0.33</MeleeParryChance>
-						<ArmorRating_Blunt>5</ArmorRating_Blunt>
-						<ArmorRating_Sharp>0.22</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG-EAP_WoollyMammoth"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tusk</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>68</power>
-								<cooldownTime>3.37</cooldownTime>
-								<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>46.226</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>2.47</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>28.96</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>2.47</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>28.960</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>56</power>
-								<cooldownTime>3.69</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>40</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RG-EAP_WoollyMammoth"]/combatPower</xpath>
-					<value>
-						<combatPower>280</combatPower>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/HLX ReGrowth - Extinct Animals Pack/Extinct_Resources.xml b/Patches/HLX ReGrowth - Extinct Animals Pack/Extinct_Resources.xml
deleted file mode 100644
index 5cbe669878..0000000000
--- a/Patches/HLX ReGrowth - Extinct Animals Pack/Extinct_Resources.xml	
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[HLX] ReGrowth - Extinct Animals Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Remove tusk as a weapon -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RG-EAP_WoollyMammothTusk"]/tools</xpath>
-				</li>
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="RG-EAP_WoollyMammothTusk"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>ResourceBase</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG-EAP_WoollyMammothTusk"]/statBases/MarketValue</xpath>
-					<value>
-						<MarketValue>120</MarketValue>
-					</value>
-				</li>
-
-				<!--wooly wool -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG-EAP_WoollyRhinoWool"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.036</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/HLX ReGrowth - Mutated Animals Pack/Bodies.xml b/Patches/HLX ReGrowth - Mutated Animals Pack/Bodies.xml
deleted file mode 100644
index d40236e47a..0000000000
--- a/Patches/HLX ReGrowth - Mutated Animals Pack/Bodies.xml	
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[HLX] ReGrowth - Mutated Animals Pack</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Natural Armor -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="RG-WF_HumanoidWithHornsAndClaws"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Leg" or
-						def="Paw" or
-						def="Arm"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="RG-WF_HumanoidWithHornsAndClaws"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Head" or
-						def="Horn" or
-						def="Arm" or
-						def="FrontClaw" or
-						def="Leg" or
-						def="Paw"
-						]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/HLX ReGrowth - Mutated Animals Pack/Deffclaw.xml b/Patches/HLX ReGrowth - Mutated Animals Pack/Deffclaw.xml
deleted file mode 100644
index 6bc9ca056f..0000000000
--- a/Patches/HLX ReGrowth - Mutated Animals Pack/Deffclaw.xml	
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[HLX] ReGrowth - Mutated Animals Pack</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RG-WF_WastelandDeathclaw"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG-WF_WastelandDeathclaw"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG-WF_WastelandDeathclaw"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>9</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RG-WF_WastelandDeathclaw"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						<MeleeCritChance>0.46</MeleeCritChance>
-						<MeleeParryChance>0.78</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG-WF_WastelandDeathclaw"]/race/baseBodySize</xpath>
-					<value>
-						<baseBodySize>2.5</baseBodySize>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG-WF_WastelandDeathclaw"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>6.75</MoveSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG-WF_WastelandDeathclaw"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Stab</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>7.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>16</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right blade</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Stab</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>7.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>16</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>6.750</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Horn</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Stab</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<armorPenetrationBlunt>8.750</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.750</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/HLX ReGrowth - Mutated Animals Pack/Mutant_Beaver.xml b/Patches/HLX ReGrowth - Mutated Animals Pack/Mutant_Beaver.xml
deleted file mode 100644
index 42ad7b2ab3..0000000000
--- a/Patches/HLX ReGrowth - Mutated Animals Pack/Mutant_Beaver.xml	
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[HLX] ReGrowth - Mutated Animals Pack</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RG-WF_WastelandBeaver"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RG-WF_WastelandBeaver"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.36</MeleeDodgeChance>
-						<MeleeCritChance>0.03</MeleeCritChance>
-						<MeleeParryChance>0.00</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG-WF_WastelandBeaver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.03</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.03</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/HLX ReGrowth - Mutated Animals Pack/Mutant_Deer.xml b/Patches/HLX ReGrowth - Mutated Animals Pack/Mutant_Deer.xml
deleted file mode 100644
index ad48ee890e..0000000000
--- a/Patches/HLX ReGrowth - Mutated Animals Pack/Mutant_Deer.xml	
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[HLX] ReGrowth - Mutated Animals Pack</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RG-WF_WastelandDeer"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RG-WF_WastelandDeer"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.11</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG-WF_WastelandDeer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Right head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>RG-WF_RightHeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Left head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>RG-WF_LeftHeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>antlers</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.66</cooldownTime>
-								<restrictedGender>Male</restrictedGender>
-								<linkedBodyPartsGroup>RG-WF_RightHeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.750</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>antlers</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.66</cooldownTime>
-								<restrictedGender>Male</restrictedGender>
-								<linkedBodyPartsGroup>RG-WF_LeftHeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.750</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/HLX ReGrowth - Mutated Animals Pack/Mutant_Rat.xml b/Patches/HLX ReGrowth - Mutated Animals Pack/Mutant_Rat.xml
deleted file mode 100644
index 882cab5630..0000000000
--- a/Patches/HLX ReGrowth - Mutated Animals Pack/Mutant_Rat.xml	
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[HLX] ReGrowth - Mutated Animals Pack</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RG-WF_WastelandSquirrel"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RG-WF_WastelandSquirrel"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.52</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.00</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG-WF_WastelandSquirrel"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.03</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.03</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Half Dragons/Apparel_Various.xml b/Patches/Half Dragons/Apparel_Various.xml
deleted file mode 100644
index 7fb8e9e450..0000000000
--- a/Patches/Half Dragons/Apparel_Various.xml	
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Half dragons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Dragon Power Armor -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="ApparelDragonArmorPowerBase"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="ApparelDragonArmorPowerBase"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>500</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="ApparelDragonArmorPowerBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="ApparelDragonArmorPowerBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>45</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="ApparelDragonArmorPowerBase"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>50</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="ApparelDragonArmorPowerBase"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="ApparelDragonArmorPowerBase"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>80</CarryWeight>
-						<CarryBulk>10</CarryBulk>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="ApparelDragonArmorPowerBase"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<!-- Dragon Power Armor Helmet -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="ApparelDragonArmorHelmetPowerBase"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>240</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="ApparelDragonArmorHelmetPowerBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="ApparelDragonArmorHelmetPowerBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>36</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[@Name="ApparelDragonArmorHelmetPowerBase"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[@Name="ApparelDragonArmorHelmetPowerBase"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="ApparelDragonArmorHelmetPowerBase"]/equippedStatOffsets</xpath>
-					<value>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="ApparelDragonArmorHelmetPowerBase"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>60</Plasteel>
-						<DevilstrandCloth>20</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="ApparelDragonArmorHelmetPowerBase"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Half Dragons/HalfDragons_Body.xml b/Patches/Half Dragons/HalfDragons_Body.xml
deleted file mode 100644
index 6414d856c1..0000000000
--- a/Patches/Half Dragons/HalfDragons_Body.xml	
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Half dragons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Outside Squishy-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "halfdragonbody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "right eye"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "halfdragonbody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "left eye"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "halfdragonbody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "halfdragonbody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<!--Arm Groups-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="halfdragonbody"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
-					<value>
-						<li>LeftArm</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="halfdragonbody"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
-					<value>
-						<li>RightArm</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="halfdragonbody"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
-					<value>
-						<li>LeftShoulder</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="halfdragonbody"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
-					<value>
-						<li>RightShoulder</li>
-					</value>
-				</li>
-
-				<!--Natural Armor-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="halfdragonbody"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="halfdragonbody"]/corePart/parts/li[def="Pelvis"]/parts/li[def="Tail"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="halfdragonbody"]/corePart/parts/li[def="Neck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="halfdragonbody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="halfdragonbody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="halfdragonbody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="halfdragonbody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="halfdragonbody"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="halfdragonbody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="halfdragonbody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="halfdragonbody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="halfdragonbody"]/corePart/parts/li[def="Leg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="halfdragonbody"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="halfdragonbody"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Half Dragons/HalfDragons_Scenario.xml b/Patches/Half Dragons/HalfDragons_Scenario.xml
deleted file mode 100644
index 7e16257719..0000000000
--- a/Patches/Half Dragons/HalfDragons_Scenario.xml	
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Half dragons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ScenarioDef[defName="Half-Dragon_Scenario"]/scenario/parts/li[thingDef="Apparel_FlakVest"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ScenarioDef[defName="Half-Dragon_Scenario"]/scenario/parts/li[thingDef="Apparel_FlakPants"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ScenarioDef[defName="Half-Dragon_Scenario"]/scenario/parts/li[thingDef="Apparel_AdvancedHelmet"]</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Half Dragons/Patch_Weapons.xml b/Patches/Half Dragons/Patch_Weapons.xml
deleted file mode 100644
index 920c7d178d..0000000000
--- a/Patches/Half Dragons/Patch_Weapons.xml	
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Half dragons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Base -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="BaseDragonMeleeWeapon"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.24</MeleeCritChance>
-							<MeleeParryChance>1.45</MeleeParryChance>
-							<MeleeDodgeChance>0.9</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="BaseDragonMeleeWeapon"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<!-- Double Lance -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="HD_doublelance"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.35</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>2.05</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.85</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>2.125</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.55</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>2.95</armorPenetrationBlunt>
-								<armorPenetrationSharp>4.5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Piercer Lance -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="HD_piercerlance"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.35</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>3.25</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.70</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.16</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>2.95</armorPenetrationBlunt>
-								<armorPenetrationSharp>8.5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Average Lance -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="HD_averagelance"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.35</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>3.33</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>4.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.25</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.19</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>3.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>5.5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Half Dragons/Race_HalfDragons.xml b/Patches/Half Dragons/Race_HalfDragons.xml
deleted file mode 100644
index c80aeae682..0000000000
--- a/Patches/Half Dragons/Race_HalfDragons.xml	
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Half dragons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="BaseDragon"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="BaseDragon"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="BaseDragon"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="BaseDragon"]/statBases/MeleeDodgeChance</xpath>
-					<value>
-						<NightVisionEfficiency>0.4</NightVisionEfficiency>
-						<MeleeDodgeChance>1.1</MeleeDodgeChance>
-						<MeleeCritChance>0.8</MeleeCritChance>
-						<MeleeParryChance>0.85</MeleeParryChance>
-						<CarryWeight>35</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="BaseDragon"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="BaseDragon"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Halo - Rimworld Auxiliary Combat Armory/Ammo/105mmShapedCharge.xml b/Patches/Halo - Rimworld Auxiliary Combat Armory/Ammo/105mmShapedCharge.xml
deleted file mode 100644
index 072871dbbd..0000000000
--- a/Patches/Halo - Rimworld Auxiliary Combat Armory/Ammo/105mmShapedCharge.xml	
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>HALO: Rimworld Auxiliary Combat Armory</li>
-		</mods>
-
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-
-			<value>
-				<!-- === ThingCategory === -->
-				<ThingCategoryDef>
-					<defName>Ammo105mmShapedCharges</defName>
-					<label>105mm HEAT missiles</label>
-					<parent>AmmoRockets</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberRocket</iconPath>
-				</ThingCategoryDef>
-
-				<!-- === AmmoSet === -->
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_105mmShapedCharge</defName>
-					<label>105mm HEAT missile</label>
-					<ammoTypes>
-						<Ammo_105mmShapedCharge>Bullet_105mmShapedCharge</Ammo_105mmShapedCharge>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- === Ammo === -->
-				<ThingDef Class="CombatExtended.AmmoDef" Name="105ShapedChargeBase" ParentName="MediumAmmoBase" Abstract="True">
-					<description>Rocket-propelled grenade designed for the Charge Launcher.</description>
-					<statBases>
-						<MaxHitPoints>150</MaxHitPoints>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-					</tradeTags>
-					<thingCategories>
-						<li>Ammo105mmShapedCharges</li>
-					</thingCategories>
-					<stackLimit>25</stackLimit>
-					<cookOffFlashScale>40</cookOffFlashScale>
-					<cookOffSound>MortarBomb_Explode</cookOffSound>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="105ShapedChargeBase">
-					<defName>Ammo_105mmShapedCharge</defName>
-					<label>105mm HEAT missile</label>
-					<graphicData>
-						<texPath>Things/Ammo/RPG/RPG32_HEAT</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>57.78</MarketValue>
-						<Mass>2.8</Mass>
-						<Bulk>6.94</Bulk>
-					</statBases>
-					<ammoClass>RocketHEAT</ammoClass>
-					<detonateProjectile>Bullet_105mmShapedCharge</detonateProjectile>
-				</ThingDef>
-
-				<!-- === Projectile === -->
-				<ThingDef Name="Base105ShapedCharge" ParentName="BaseBulletCE" Abstract="true">
-					<graphicData>
-						<shaderType>TransparentPostLight</shaderType>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>73</speed>
-						<soundAmbient>RocketPropelledLoop_Small</soundAmbient>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base105ShapedCharge">
-					<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					<defName>Bullet_105mmShapedCharge</defName>
-					<label>105mm HEAT Shaped Charge</label>
-					<graphicData>
-						<texPath>Things/Projectile/RPG/RPG32_Thermobaric</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bullet</damageDef>
-						<damageAmountBase>550</damageAmountBase>
-						<armorPenetrationSharp>500</armorPenetrationSharp>
-						<armorPenetrationBlunt>64.956</armorPenetrationBlunt>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>350</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>4</explosiveRadius>
-							<explosionSound>MortarBomb_Explode</explosionSound>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>6</Fragment_Large>
-								<Fragment_Small>56</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<!-- === Recipe === -->
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_105mmShapedCharge</defName>
-					<label>make 105mm HEAT missiles x4</label>
-					<description>Craft 4 105mm HEAT missiles.</description>
-					<jobString>Making 105mm HEAT missiles.</jobString>
-					<workAmount>9200</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>28</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>10</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>4</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_105mmShapedCharge>4</Ammo_105mmShapedCharge>
-					</products>
-				</RecipeDef>
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Halo - Rimworld Auxiliary Combat Armory/Ammo/PlasmaCellShotgun.xml b/Patches/Halo - Rimworld Auxiliary Combat Armory/Ammo/PlasmaCellShotgun.xml
deleted file mode 100644
index eb5cdcf1ec..0000000000
--- a/Patches/Halo - Rimworld Auxiliary Combat Armory/Ammo/PlasmaCellShotgun.xml	
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>HALO: Rimworld Auxiliary Combat Armory</li>
-		</mods>
-
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-
-			<value>
-				<!-- === ThingCategory === -->
-				<ThingCategoryDef>
-					<defName>AmmoPlasmaCellShotgun</defName>
-					<label>Plasma Shotgun Power Cell</label>
-					<parent>AmmoAdvanced</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberPlasmaMedium</iconPath>
-				</ThingCategoryDef>
-
-				<!-- === AmmoSet === -->
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_PlasmaCellShotgun</defName>
-					<label>Plasma Shotgun Power Cell</label>
-					<ammoTypes>
-						<Ammo_PlasmaCellShotgun>Bullet_PlasmaCellShotgun</Ammo_PlasmaCellShotgun>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- === Ammo === -->
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-					<defName>Ammo_PlasmaCellShotgun</defName>
-					<label>Plasma Shotgun Power Cell</label>
-					<description>Plasma containment power cell optimized for shotguns</description>
-					<statBases>
-						<Mass>0.017</Mass>
-						<Bulk>0.01</Bulk>
-						<MarketValue>0.24</MarketValue>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-					</tradeTags>
-					<thingCategories>
-						<li>AmmoPlasmaCellShotgun</li>
-					</thingCategories>
-					<graphicData>
-						<texPath>Things/Ammo/PlasmaCell/Heavy</texPath>
-						<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-					</graphicData>
-					<ammoClass>Plasma</ammoClass>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>20</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>0.5</explosiveRadius>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>2</Fragment_Large>
-								<Fragment_Small>10</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<!-- === Projectile === -->
-				<ThingDef ParentName="BaseBulletCE">
-					<defName>Bullet_PlasmaCellShotgun</defName>
-					<label>Plasma Bolt</label>
-					<graphicData>
-						<texPath>Things/Projectile/Charged/charge_regular</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Burn</damageDef>
-						<damageAmountBase>18</damageAmountBase>
-						<pelletCount>9</pelletCount>
-						<spreadMult>13</spreadMult>
-						<armorPenetrationSharp>8</armorPenetrationSharp>
-						<armorPenetrationBlunt>8</armorPenetrationBlunt>
-						<speed>140</speed>
-					</projectile>
-				</ThingDef>
-
-				<!-- === Recipe === -->
-				<RecipeDef ParentName="ChargeAmmoRecipeBase">
-					<defName>MakeAmmo_PlasmaCellShotgun</defName>
-					<label>make Plasma Shotgun Power Cells</label>
-					<description>Craft 500 shots worth of Plasma Shotgun Power Cells.</description>
-					<jobString>Making Plasma Shotgun Power Cells.</jobString>
-					<workAmount>3800</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>18</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Plasteel</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Plasteel</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_PlasmaCellShotgun>500</Ammo_PlasmaCellShotgun>
-					</products>
-				</RecipeDef>
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Halo - Rimworld Auxiliary Combat Armory/Weapons_Ranged.xml b/Patches/Halo - Rimworld Auxiliary Combat Armory/Weapons_Ranged.xml
deleted file mode 100644
index 684ef580db..0000000000
--- a/Patches/Halo - Rimworld Auxiliary Combat Armory/Weapons_Ranged.xml	
+++ /dev/null
@@ -1,739 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>HALO: Rimworld Auxiliary Combat Armory</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						@Name="HRACA_Gun_charge_pistol_base" or
-						defName="HRACA_Gun_Charge_SMG" or
-						defName="HRACA_Gun_Plasma_Pistol"]/tools
-					</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName="HRACA_Gun_Charge_Shotgun" or
-						defName="HRACA_Gun_Charge_Rifle" or
-						defName="HRACA_Gun_Charge_BR" or
-						defName="HRACA_Gun_Charge_DMR" or
-						defName="HRACA_Gun_Charge_Sniper" or
-						defName="HRACA_EmpLauncher" or
-						defName="HRACA_Gun_Plasma_Rifle" or
-						defName="HRACA_Gun_Plasma_BR" or
-						defName="HRACA_Gun_Plasma_DMR" or
-						defName="HRACA_Gun_Plasma_Shotgun"]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="HRACA_Gun_Charge_Launcher"]/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>
-				</li>
-
-				<!-- === Spacer Ranged === -->
-				<!-- == Charge Pistol == -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>HRACA_Gun_Charge_Pistol</defName>
-
-					<statBases>
-						<WorkToMake>25500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.5</ShotSpread>
-						<SwayFactor>1.00</SwayFactor>
-						<Bulk>2.10</Bulk>
-						<Mass>1.05</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>0.5</warmupTime>
-						<range>15</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>1.90</reloadTime>
-						<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<!-- == Charge Magnum == -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>HRACA_Gun_Charge_Magnum</defName>
-
-					<statBases>
-						<WorkToMake>25500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.5</ShotSpread>
-						<SwayFactor>1.10</SwayFactor>
-						<Bulk>2.10</Bulk>
-						<Mass>1.05</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
-						<warmupTime>0.7</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>1.90</reloadTime>
-						<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<!-- == Charge SMG == -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>HRACA_Gun_Charge_SMG</defName>
-
-					<statBases>
-						<WorkToMake>52000</WorkToMake>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>0.80</SwayFactor>
-						<Bulk>5.00</Bulk>
-						<Mass>2.60</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-
-					<costList>
-						<Steel>45</Steel>
-						<Plasteel>25</Plasteel>
-						<ComponentIndustrial>10</ComponentIndustrial>
-						<Chemfuel>15</Chemfuel>
-					</costList>
-
-					<Properties>
-						<recoilAmount>1.60</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>0.5</warmupTime>
-						<range>24</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>60</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>true</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- == Charge Shotgun == -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>HRACA_Gun_Charge_Shotgun</defName>
-
-					<statBases>
-						<WorkToMake>44000</WorkToMake>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.5</ShotSpread>
-						<SwayFactor>1.9</SwayFactor>
-						<Bulk>9.0</Bulk>
-						<Mass>4.0</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12GaugeCharged</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>18</range>
-						<soundCast>HRACA_Shot_ChargeShotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>6</reloadTime>
-						<ammoSet>AmmoSet_12GaugeCharged</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- == Charge Rifle == -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>HRACA_Gun_Charge_Rifle</defName>
-
-					<statBases>
-						<WorkToMake>48000</WorkToMake>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.10</ShotSpread>
-						<SwayFactor>1.30</SwayFactor>
-						<Bulk>7</Bulk>
-						<Mass>4.32</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<recoilAmount>1.51</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>1.0</warmupTime>
-						<range>44</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>true</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- == Charge BR == -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>HRACA_Gun_Charge_BR</defName>
-
-					<statBases>
-						<WorkToMake>48000</WorkToMake>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>7</Bulk>
-						<Mass>3</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<recoilAmount>1.20</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>1</warmupTime>
-						<range>48</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>36</magazineSize>
-						<reloadTime>4.00</reloadTime>
-						<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>true</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- == Charge DMR == -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>HRACA_Gun_Charge_DMR</defName>
-
-					<statBases>
-						<WorkToMake>48000</WorkToMake>
-						<SightsEfficiency>1.5</SightsEfficiency>
-						<ShotSpread>0.10</ShotSpread>
-						<SwayFactor>1.40</SwayFactor>
-						<Bulk>12.0</Bulk>
-						<Mass>6.0</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>SniperRifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- == Charge Sniper == -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>HRACA_Gun_Charge_Sniper</defName>
-
-					<statBases>
-						<WorkToMake>50500</WorkToMake>
-						<SightsEfficiency>2.6</SightsEfficiency>
-						<ShotSpread>0.5</ShotSpread>
-						<SwayFactor>1.9</SwayFactor>
-						<Bulk>13.0</Bulk>
-						<Mass>7.0</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-
-					<costList>
-						<Steel>60</Steel>
-						<Plasteel>45</Plasteel>
-						<ComponentIndustrial>10</ComponentIndustrial>
-						<Chemfuel>15</Chemfuel>
-					</costList>
-
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12x72mmCharged</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>75</range>
-						<soundCast>HRACA_Shot_ChargeSniper</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_12x72mmCharged</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>SniperRifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- == EMP Launcher == -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>HRACA_EmpLauncher</defName>
-
-					<statBases>
-						<WorkToMake>25500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.5</ShotSpread>
-						<SwayFactor>1.4</SwayFactor>
-						<Bulk>5.25</Bulk>
-						<Mass>5.12</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<recoilAmount>2.66</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_40x46mmGrenade_EMP</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>40</range>
-						<soundCast>Shot_IncendiaryLauncher</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_HRACA_EMP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- == Charge Launcher == -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>HRACA_Gun_Charge_Launcher</defName>
-
-					<statBases>
-						<WorkToMake>78000</WorkToMake>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.10</ShotSpread>
-						<SwayFactor>1.30</SwayFactor>
-						<Bulk>15</Bulk>
-						<Mass>7.32</Mass>
-						<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_105mmShapedCharge</defaultProjectile>
-						<warmupTime>2.5</warmupTime>
-						<range>55</range>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>2</magazineSize>
-						<reloadTime>10</reloadTime>
-						<ammoSet>AmmoSet_105mmShapedCharge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- === Ultratech Ranged === -->
-				<!-- == Plasma Rifle == -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>HRACA_Gun_Plasma_Rifle</defName>
-
-					<statBases>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.10</ShotSpread>
-						<SwayFactor>1.30</SwayFactor>
-						<Bulk>7</Bulk>
-						<Mass>4.32</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<recoilAmount>1.21</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_PlasmaCellRifle</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>1.0</warmupTime>
-						<range>55</range>
-						<soundCast>HRACA_Shot_Plasma</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4.2</reloadTime>
-						<ammoSet>AmmoSet_PlasmaCellRifle</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- == Plasma BR == -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>HRACA_Gun_Plasma_BR</defName>
-
-					<statBases>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>7</Bulk>
-						<Mass>3</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<recoilAmount>1.20</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_PlasmaCellRifle</defaultProjectile>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>1</warmupTime>
-						<range>55</range>
-						<soundCast>HRACA_Shot_Plasma</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>36</magazineSize>
-						<reloadTime>4.2</reloadTime>
-						<ammoSet>AmmoSet_PlasmaCellRifle</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- == Plasma DMR == -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>HRACA_Gun_Plasma_DMR</defName>
-
-					<statBases>
-						<SightsEfficiency>1.5</SightsEfficiency>
-						<ShotSpread>0.10</ShotSpread>
-						<SwayFactor>1.40</SwayFactor>
-						<Bulk>12.0</Bulk>
-						<Mass>6.0</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_PlasmaCellRifle</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>60</range>
-						<soundCast>HRACA_Shot_Plasma</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4.2</reloadTime>
-						<ammoSet>AmmoSet_PlasmaCellRifle</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- == Plasma Shotgun == -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>HRACA_Gun_Plasma_Shotgun</defName>
-
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.5</ShotSpread>
-						<SwayFactor>1.5</SwayFactor>
-						<Bulk>9.0</Bulk>
-						<Mass>4.0</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<recoilAmount>1.36</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_PlasmaCellShotgun</defaultProjectile>
-						<!-- <burstShotCount>2</burstShotCount> -->
-						<!-- <ticksBetweenBurstShots>9</ticksBetweenBurstShots> -->
-						<warmupTime>0.9</warmupTime>
-						<range>18</range>
-						<soundCast>HRACA_Shot_Plasma</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>6</reloadTime>
-						<ammoSet>AmmoSet_PlasmaCellShotgun</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>true</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- == Plasma Pistol == -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>HRACA_Gun_Plasma_Pistol</defName>
-
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.5</ShotSpread>
-						<SwayFactor>1.00</SwayFactor>
-						<Bulk>2.10</Bulk>
-						<Mass>1.05</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_PlasmaCellPistol</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>15</range>
-						<soundCast>HRACA_Shot_Plasma</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>1.90</reloadTime>
-						<ammoSet>AmmoSet_PlasmaCellPistol</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Halo - UNSC Armoury/Ammo_UNSC.xml b/Patches/Halo - UNSC Armoury/Ammo_UNSC.xml
deleted file mode 100644
index 28e730f33f..0000000000
--- a/Patches/Halo - UNSC Armoury/Ammo_UNSC.xml	
+++ /dev/null
@@ -1,415 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>HALO: UNSC Armoury</li>
-		</mods>
-
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>Ammo95x40mm</defName>
-					<label>9.5x40mm</label>
-					<parent>AmmoRifles</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_95x40mm</defName>
-					<label>9.5x40mm</label>
-					<ammoTypes>
-						<Ammo_95x40mm_FMJ>Bullet_95x40mm_FMJ</Ammo_95x40mm_FMJ>
-						<Ammo_95x40mm_AP>Bullet_95x40mm_AP</Ammo_95x40mm_AP>
-						<Ammo_95x40mm_HP>Bullet_95x40mm_HP</Ammo_95x40mm_HP>
-						<Ammo_95x40mm_Incendiary>Bullet_95x40mm_Incendiary</Ammo_95x40mm_Incendiary>
-						<Ammo_95x40mm_HE>Bullet_95x40mm_HE</Ammo_95x40mm_HE>
-						<Ammo_95x40mm_Sabot>Bullet_95x40mm_Sabot</Ammo_95x40mm_Sabot>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="95x40mmBase" ParentName="SmallAmmoBase" Abstract="True">
-					<description>A high-velocity rifle round, used in machine guns and battle rifles.</description>
-					<statBases>
-						<Mass>0.022</Mass>
-						<Bulk>0.03</Bulk>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting</li>
-					</tradeTags>
-					<thingCategories>
-						<li>Ammo95x40mm</li>
-					</thingCategories>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="95x40mmBase">
-					<defName>Ammo_95x40mm_FMJ</defName>
-					<label>9.5x40mm cartridge (FMJ)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/FMJ</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.1</MarketValue>
-					</statBases>
-					<ammoClass>FullMetalJacket</ammoClass>
-					<cookOffProjectile>Bullet_95x40mm_FMJ</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="95x40mmBase">
-					<defName>Ammo_95x40mm_AP</defName>
-					<label>9.5x40mm cartridge (AP)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/AP</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.1</MarketValue>
-					</statBases>
-					<ammoClass>ArmorPiercing</ammoClass>
-					<cookOffProjectile>Bullet_95x40mm_AP</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="95x40mmBase">
-					<defName>Ammo_95x40mm_HP</defName>
-					<label>9.5x40mm cartridge (HP)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/HP</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.1</MarketValue>
-					</statBases>
-					<ammoClass>HollowPoint</ammoClass>
-					<cookOffProjectile>Bullet_95x40mm_HP</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="95x40mmBase">
-					<defName>Ammo_95x40mm_Incendiary</defName>
-					<label>9.5x40mm cartridge (AP-I)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/Incendiary</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.14</MarketValue>
-					</statBases>
-					<ammoClass>IncendiaryAP</ammoClass>
-					<cookOffProjectile>Bullet_95x40mm_Incendiary</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="95x40mmBase">
-					<defName>Ammo_95x40mm_HE</defName>
-					<label>9.5x40mm cartridge (HE)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/HE</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.18</MarketValue>
-					</statBases>
-					<ammoClass>ExplosiveAP</ammoClass>
-					<cookOffProjectile>Bullet_95x40mm_HE</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="95x40mmBase">
-					<defName>Ammo_95x40mm_Sabot</defName>
-					<label>9.5x40mm cartridge (Sabot)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/Sabot</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.11</MarketValue>
-						<Mass>0.017</Mass>
-					</statBases>
-					<ammoClass>Sabot</ammoClass>
-					<cookOffProjectile>Bullet_95x40mm_Sabot</cookOffProjectile>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef ParentName="Base762x51mmNATOBullet">
-					<defName>Bullet_95x40mm_FMJ</defName>
-					<label>7.62mm bullet (FMJ)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>174</speed>
-						<damageAmountBase>23</damageAmountBase>
-						<armorPenetrationSharp>8</armorPenetrationSharp>
-						<armorPenetrationBlunt>82.8</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base762x51mmNATOBullet">
-					<defName>Bullet_95x40mm_AP</defName>
-					<label>7.62mm bullet (AP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>174</speed>
-						<damageAmountBase>14</damageAmountBase>
-						<armorPenetrationSharp>16</armorPenetrationSharp>
-						<armorPenetrationBlunt>82.8</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base762x51mmNATOBullet">
-					<defName>Bullet_95x40mm_HP</defName>
-					<label>7.62mm bullet (HP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>174</speed>
-						<damageAmountBase>29</damageAmountBase>
-						<armorPenetrationSharp>4</armorPenetrationSharp>
-						<armorPenetrationBlunt>82.8</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base762x51mmNATOBullet">
-					<defName>Bullet_95x40mm_Incendiary</defName>
-					<label>7.62mm bullet (AP-I)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>174</speed>
-						<damageAmountBase>14</damageAmountBase>
-						<armorPenetrationSharp>16</armorPenetrationSharp>
-						<armorPenetrationBlunt>82.8</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Flame_Secondary</def>
-								<amount>9</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base762x51mmNATOBullet">
-					<defName>Bullet_95x40mm_HE</defName>
-					<label>7.62mm bullet (HE)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>174</speed>
-						<damageAmountBase>23</damageAmountBase>
-						<armorPenetrationSharp>8</armorPenetrationSharp>
-						<armorPenetrationBlunt>82.8</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Bomb_Secondary</def>
-								<amount>14</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base762x51mmNATOBullet">
-					<defName>Bullet_95x40mm_Sabot</defName>
-					<label>7.62mm bullet (Sabot)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>11</damageAmountBase>
-						<armorPenetrationSharp>25</armorPenetrationSharp>
-						<armorPenetrationBlunt>86.28</armorPenetrationBlunt>
-						<speed>236</speed>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_95x40mm_FMJ</defName>
-					<label>make 9.5x40mm (FMJ) cartridge x500</label>
-					<description>Craft 500 9.5x40mm (FMJ) cartridges.</description>
-					<jobString>Making 9.5x40mm (FMJ) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>24</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_95x40mm_FMJ>500</Ammo_95x40mm_FMJ>
-					</products>
-					<workAmount>2400</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_95x40mm_AP</defName>
-					<label>make 9.5x40mm (AP) cartridge x500</label>
-					<description>Craft 500 9.5x40mm (AP) cartridges.</description>
-					<jobString>Making 9.5x40mm (AP) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>24</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_95x40mm_AP>500</Ammo_95x40mm_AP>
-					</products>
-					<workAmount>2400</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_95x40mm_HP</defName>
-					<label>make 9.5x40mm (HP) cartridge x500</label>
-					<description>Craft 500 9.5x40mm (HP) cartridges.</description>
-					<jobString>Making 9.5x40mm (HP) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>24</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_95x40mm_HP>500</Ammo_95x40mm_HP>
-					</products>
-					<workAmount>2400</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AdvancedAmmoRecipeBase">
-					<defName>MakeAmmo_95x40mm_Incendiary</defName>
-					<label>make 9.5x40mm (AP-I) cartridge x500</label>
-					<description>Craft 500 9.5x40mm (AP-I) cartridges.</description>
-					<jobString>Making 9.5x40mm (AP-I) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>24</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>3</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Prometheum</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_95x40mm_Incendiary>500</Ammo_95x40mm_Incendiary>
-					</products>
-					<workAmount>3600</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AdvancedAmmoRecipeBase">
-					<defName>MakeAmmo_95x40mm_HE</defName>
-					<label>make 9.5x40mm (HE) cartridge x500</label>
-					<description>Craft 500 9.5x40mm (HE) cartridges.</description>
-					<jobString>Making 9.5x40mm (HE) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>24</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>5</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_95x40mm_HE>500</Ammo_95x40mm_HE>
-					</products>
-					<workAmount>4400</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AdvancedAmmoRecipeBase">
-					<defName>MakeAmmo_95x40mm_Sabot</defName>
-					<label>make 9.5x40mm (Sabot) cartridge x500</label>
-					<description>Craft 500 9.5x40mm (Sabot) cartridges.</description>
-					<jobString>Making 9.5x40mm (Sabot) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>14</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Uranium</li>
-								</thingDefs>
-							</filter>
-							<count>3</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Chemfuel</li>
-								</thingDefs>
-							</filter>
-							<count>3</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Uranium</li>
-							<li>Chemfuel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_95x40mm_Sabot>500</Ammo_95x40mm_Sabot>
-					</products>
-					<workAmount>3200</workAmount>
-				</RecipeDef>
-
-			</value>
-
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Halo - UNSC Armoury/Apparel_Headgear.xml b/Patches/Halo - UNSC Armoury/Apparel_Headgear.xml
deleted file mode 100644
index dc445bdeb0..0000000000
--- a/Patches/Halo - UNSC Armoury/Apparel_Headgear.xml	
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>HALO: UNSC Armoury</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Combat Helmet === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="HUA_Apparel_CombatHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>2</WornBulk>
-						<ArmorRating_Heat>0.54</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="HUA_Apparel_CombatHelmet"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-						<ArmorRating_Blunt>14</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="HUA_Apparel_CombatHelmet"]/description</xpath>
-					<value>
-						<description>A heavy combat helmet with a complex design, reinforced with plasteel.</description>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="HUA_Apparel_CombatHelmet"]/stuffCategories/li[.="Metallic"]</xpath>
-					<value>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="HUA_Apparel_CombatHelmet"]/costList</xpath>
-					<value>
-						<costList>
-							<Plasteel>20</Plasteel>
-							<DevilstrandCloth>15</DevilstrandCloth>
-						</costList>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Halo - UNSC Armoury/Weapons_Laser.xml b/Patches/Halo - UNSC Armoury/Weapons_Laser.xml
deleted file mode 100644
index 1657d50841..0000000000
--- a/Patches/Halo - UNSC Armoury/Weapons_Laser.xml	
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>HALO: UNSC Armoury</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Weapons Expanded - Laser</li>
-			</mods>
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<!-- === Melee === -->
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="HUA_Gun_Anti-TankLaserRifle"]/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>
-					</li>
-
-					<!-- === Remove Vanilla Expanded Laser Stuff & MoveSpeed Penalty. === -->
-					<li Class="PatchOperationRemove">
-						<xpath>Defs/ThingDef[defName = "HUA_Gun_Anti-TankLaserRifle"]/comps/li[@Class="VanillaWeaponsExpandedLaser.CompProperties_LaserCapacitor"]</xpath>
-					</li>
-
-					<li Class="PatchOperationRemove">
-						<xpath>Defs/ThingDef[defName = "HUA_Gun_Anti-TankLaserRifle"]/equippedStatOffsets</xpath>
-					</li>
-
-					<!-- === Spartan Laser === -->
-					<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-						<defName>HUA_Gun_Anti-TankLaserRifle</defName>
-						<statBases>
-							<Mass>22</Mass>
-							<Bulk>16.00</Bulk>
-							<SwayFactor>3.42</SwayFactor>
-							<ShotSpread>0.01</ShotSpread>
-							<SightsEfficiency>2.15</SightsEfficiency>
-							<RangedWeapon_Cooldown>2.65</RangedWeapon_Cooldown>
-						</statBases>
-						<Properties>
-							<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-							<hasStandardCommand>True</hasStandardCommand>
-							<defaultProjectile>Bullet_Laser_SpartanLaser</defaultProjectile>
-							<warmupTime>2.2</warmupTime>
-							<range>65</range>
-							<soundCast>VWE_LaserShot_Heavy</soundCast>
-							<soundCastTail>GunTail_Heavy</soundCastTail>
-							<muzzleFlashScale>9</muzzleFlashScale>
-						</Properties>
-						<AmmoUser>
-							<magazineSize>4</magazineSize>
-							<reloadTime>8.6</reloadTime>
-							<ammoSet>AmmoSet_SpartanLaser</ammoSet>
-						</AmmoUser>
-						<FireModes>
-							<aiAimMode>AimedShot</aiAimMode>
-						</FireModes>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs</xpath>
-						<value>
-
-							<!-- === Spartan Laser Beam === -->
-
-							<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletRed">
-								<defName>Bullet_Laser_SpartanLaser</defName>
-								<label>laser beam</label>
-								<projectile Class="CombatExtended.ProjectilePropertiesCE">
-									<damageDef>CE_Laser</damageDef>
-									<damageAmountBase>300</damageAmountBase>
-									<armorPenetrationSharp>600</armorPenetrationSharp>
-									<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-								</projectile>
-								<seam>2</seam>
-							</ThingDef>
-
-							<!-- === Spartan Laser Battery === -->
-
-							<ThingCategoryDef>
-								<defName>AmmoHeavyLaserChargePack</defName>
-								<label>heavy laser charge pack</label>
-								<parent>AmmoAdvanced</parent>
-								<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
-							</ThingCategoryDef>
-
-							<!-- ==================== AmmoSet ========================== -->
-
-							<CombatExtended.AmmoSetDef>
-								<defName>AmmoSet_SpartanLaser</defName>
-								<label>heavy laser rifle charge</label>
-								<ammoTypes>
-									<Ammo_HeavyLaserChargePack>Bullet_Laser_SpartanLaser</Ammo_HeavyLaserChargePack>
-								</ammoTypes>
-							</CombatExtended.AmmoSetDef>
-
-							<!-- ==================== Ammo ========================== -->
-
-							<ThingDef Class="CombatExtended.AmmoDef" Name="HeavyLaserChargePackBase" ParentName="SpacerMediumAmmoBase" Abstract="True">
-								<description>A battery pack for a heavy laser weapon.</description>
-								<statBases>
-									<Mass>0.5</Mass>
-									<Bulk>2</Bulk>
-								</statBases>
-								<tradeTags>
-									<li>CE_AutoEnableTrade</li>
-									<li>CE_AutoEnableCrafting_FabricationBench</li>
-								</tradeTags>
-								<thingCategories>
-									<li>AmmoHeavyLaserChargePack</li>
-								</thingCategories>
-								<stackLimit>200</stackLimit>
-							</ThingDef>
-
-							<ThingDef Class="CombatExtended.AmmoDef" ParentName="LaserChargePackBase">
-								<defName>Ammo_HeavyLaserChargePack</defName>
-								<label>heavy laser charge pack</label>
-								<graphicData>
-									<texPath>Things/Ammo/PlasmaCell/Heavy</texPath>
-									<graphicClass>Graphic_StackCount</graphicClass>
-								</graphicData>
-								<statBases>
-									<MarketValue>4.69</MarketValue>
-								</statBases>
-								<ammoClass>Charged</ammoClass>
-							</ThingDef>
-
-							<!-- ==================== Recipes ========================== -->
-
-							<RecipeDef ParentName="ChargeAmmoRecipeBase">
-								<defName>MakeAmmo_HeavyLaserChargePack</defName>
-								<label>make laser charge pack x40</label>
-								<description>Craft 40 laser charge pack.</description>
-								<jobString>Making laser charge pack.</jobString>
-								<ingredients>
-									<li>
-										<filter>
-											<thingDefs>
-												<li>Plasteel</li>
-											</thingDefs>
-										</filter>
-										<count>8</count>
-									</li>
-									<li>
-										<filter>
-											<thingDefs>
-												<li>Steel</li>
-											</thingDefs>
-										</filter>
-										<count>4</count>
-									</li>
-									<li>
-										<filter>
-											<thingDefs>
-												<li>ComponentIndustrial</li>
-											</thingDefs>
-										</filter>
-										<count>8</count>
-									</li>
-								</ingredients>
-								<fixedIngredientFilter>
-									<thingDefs>
-										<li>Plasteel</li>
-										<li>Steel</li>
-										<li>ComponentIndustrial</li>
-									</thingDefs>
-								</fixedIngredientFilter>
-								<products>
-									<Ammo_HeavyLaserChargePack>40</Ammo_HeavyLaserChargePack>
-								</products>
-								<workAmount>8400</workAmount>
-							</RecipeDef>
-
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Halo - UNSC Armoury/Weapons_Ranged.xml b/Patches/Halo - UNSC Armoury/Weapons_Ranged.xml
deleted file mode 100644
index 3eec86658d..0000000000
--- a/Patches/Halo - UNSC Armoury/Weapons_Ranged.xml	
+++ /dev/null
@@ -1,402 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>HALO: UNSC Armoury</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="HUA_Gun_AdvancedMagnum"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "HUA_Gun_AdvancedAssaultRifle" or
-						defName = "HUA_Gun_AdvancedBattleRifle" or
-						defName = "HUA_Gun_AdvancedDMR" or
-						defName = "HUA_Gun_AdvancedShotgun" or
-						defName = "HUA_Gun_AdvancedSniperRifle" or
-						defName = "HUA_Gun_HeavyChargeRifle" or
-						defName = "HUA_Gun_ChargeStanchion"
-						]/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>
-				</li>
-
-				<!-- === Industrial === -->
-
-				<!-- == Advanced Pistol == -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>HUA_Gun_AdvancedMagnum</defName>
-					<statBases>
-						<WorkToMake>9000</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.5</ShotSpread>
-						<SwayFactor>1.10</SwayFactor>
-						<Bulk>2.10</Bulk>
-						<Mass>1.05</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_500SWMagnum_FMJ</defaultProjectile>
-						<warmupTime>0.7</warmupTime>
-						<range>12</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>Shot_Revolver</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>1.90</reloadTime>
-						<ammoSet>AmmoSet_500SWMagnum</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>1</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>HUA_Gun</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<!-- == Advanced Assault Rifle == -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>HUA_Gun_AdvancedAssaultRifle</defName>
-					<statBases>
-						<WorkToMake>48000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.10</ShotSpread>
-						<SwayFactor>1.30</SwayFactor>
-						<Bulk>7</Bulk>
-						<Mass>4.32</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.51</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>1.0</warmupTime>
-						<range>48</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>true</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- == Advanced Battle Rifle == -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>HUA_Gun_AdvancedBattleRifle</defName>
-					<statBases>
-						<WorkToMake>44000</WorkToMake>
-						<SightsEfficiency>1.2</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<Bulk>6</Bulk>
-						<Mass>5</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.35</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_95x40mm_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>36</magazineSize>
-						<reloadTime>4.00</reloadTime>
-						<ammoSet>AmmoSet_95x40mm</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>true</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- == Advanced Marksman Rifle == -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>HUA_Gun_AdvancedDMR</defName>
-					<statBases>
-						<WorkToMake>42000</WorkToMake>
-						<SightsEfficiency>1.5</SightsEfficiency>
-						<ShotSpread>0.10</ShotSpread>
-						<SwayFactor>1.40</SwayFactor>
-						<Bulk>11.9</Bulk>
-						<Mass>4.75</Mass>
-						<RangedWeapon_Cooldown>0.48</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>62</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>14</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SniperRifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- == Advanced Shotgun == -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>HUA_Gun_AdvancedShotgun</defName>
-					<statBases>
-						<WorkToMake>44000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.5</ShotSpread>
-						<SwayFactor>1.9</SwayFactor>
-						<Bulk>9.0</Bulk>
-						<Mass>4.0</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.7</warmupTime>
-						<range>18</range>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>1.7</reloadTime>
-						<reloadOneAtATime>True</reloadOneAtATime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- == Advanced Sniper Rifle == -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>HUA_Gun_AdvancedSniperRifle</defName>
-					<statBases>
-						<WorkToMake>48000</WorkToMake>
-						<SightsEfficiency>3.5</SightsEfficiency>
-						<ShotSpread>0.5</ShotSpread>
-						<SwayFactor>1.9</SwayFactor>
-						<Bulk>16</Bulk>
-						<Mass>9</Mass>
-						<RangedWeapon_Cooldown>1.28</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>60</Steel>
-						<Plasteel>40</Plasteel>
-						<ComponentIndustrial>8</ComponentIndustrial>
-						<Chemfuel>10</Chemfuel>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_145x114mm_FMJ</defaultProjectile>
-						<warmupTime>3</warmupTime>
-						<range>96</range>
-						<soundCast>Shot_SniperRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>4</magazineSize>
-						<reloadTime>5.6</reloadTime>
-						<ammoSet>AmmoSet_145x114mm</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags Inherit="False">
-						<li>SniperRifle</li>
-						<li>HUA_Gun</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Spacer === -->
-
-				<!-- == Heavy Charge Rifle == -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>HUA_Gun_HeavyChargeRifle</defName>
-					<statBases>
-						<WorkToMake>50000</WorkToMake>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.52</SwayFactor>
-						<Bulk>11.6</Bulk>
-						<Mass>8</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.43</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
-						<burstShotCount>2</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>1.3</warmupTime>
-						<range>62</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>5.5</reloadTime>
-						<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>true</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- == Stanchion Sniper Rifle == -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>HUA_Gun_ChargeStanchion</defName>
-					<statBases>
-						<WorkToMake>50000</WorkToMake>
-						<SightsEfficiency>4</SightsEfficiency>
-						<ShotSpread>0.5</ShotSpread>
-						<SwayFactor>1.9</SwayFactor>
-						<Bulk>17</Bulk>
-						<Mass>9</Mass>
-						<RangedWeapon_Cooldown>1.56</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<Plasteel>50</Plasteel>
-						<ComponentSpacer>5</ComponentSpacer>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6mmRailgun_Sabot</defaultProjectile>
-						<warmupTime>4</warmupTime>
-						<range>100</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>5.6</reloadTime>
-						<ammoSet>AmmoSet_6mmRailgun</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags Inherit="False">
-						<li>SpacerGun</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Halo Ammo/102mmM41Rockets.xml b/Patches/Halo Ammo/102mmM41Rockets.xml
deleted file mode 100644
index b3e41eb17a..0000000000
--- a/Patches/Halo Ammo/102mmM41Rockets.xml	
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Halo UNSC Weapon Pack</li>
-		</mods>
-
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>AmmoM41Rockets</defName>
-					<label>M41 rockets</label>
-					<parent>AmmoRockets</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberRocket</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_M41Rocket</defName>
-					<label>M41 Rockets</label>
-					<ammoTypes>
-						<Ammo_M41Rocket_HEAT>Bullet_M41Rocket_HEAT</Ammo_M41Rocket_HEAT>
-						<Ammo_M41Rocket_HE>Bullet_M41Rocket_HE</Ammo_M41Rocket_HE>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="M41RocketBase" ParentName="HeavyAmmoBase" Abstract="True">
-					<description>Rockets designed for the M41 launcher. After being fired, a rocket motor kicks in to propel the Rocket further.</description>
-					<statBases>
-						<MaxHitPoints>150</MaxHitPoints>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-					</tradeTags>
-					<thingCategories>
-						<li>AmmoM41Rockets</li>
-					</thingCategories>
-					<stackLimit>25</stackLimit>
-					<cookOffFlashScale>40</cookOffFlashScale>
-					<cookOffSound>MortarBomb_Explode</cookOffSound>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="M41RocketBase">
-					<defName>Ammo_M41Rocket_HEAT</defName>
-					<label>M41 rocket (HEAT)</label>
-					<graphicData>
-						<texPath>Things/Ammo/RPG/RPG32_HEAT</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>90.61</MarketValue>
-						<Mass>5.5</Mass>
-						<Bulk>9.45</Bulk>
-					</statBases>
-					<ammoClass>RocketHEAT</ammoClass>
-					<generateAllowChance>0.2</generateAllowChance>
-					<detonateProjectile>Bullet_M41Rocket_HEAT</detonateProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="M41RocketBase">
-					<defName>Ammo_M41Rocket_HE</defName>
-					<label>M41 Rocket (Anti-personnel)</label>
-					<graphicData>
-						<texPath>Things/Ammo/RPG/RPG32_Thermobaric</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>99.15</MarketValue>
-						<Mass>5.5</Mass>
-						<Bulk>9.45</Bulk>
-					</statBases>
-					<ammoClass>GrenadeHE</ammoClass>
-					<generateAllowChance>0.2</generateAllowChance>
-					<detonateProjectile>Bullet_M41Rocket_HE</detonateProjectile>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef ParentName="BaseRPG7Grenade">
-					<defName>Bullet_M41Rocket_HEAT</defName>
-					<label>M19 102mm missile (HEAT)</label>
-					<graphicData>
-						<texPath>Things/Projectile/Rocket/SMAW_Thermobaric</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bullet</damageDef>
-						<damageAmountBase>264</damageAmountBase>
-						<armorPenetrationSharp>650</armorPenetrationSharp>
-						<armorPenetrationBlunt>41.818</armorPenetrationBlunt>
-						<speed>51</speed>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>139</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>1</explosiveRadius>
-							<explosionSound>MortarBomb_Explode</explosionSound>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>6</Fragment_Large>
-								<Fragment_Small>42</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseRPG7Grenade">
-					<defName>Bullet_M41Rocket_HE</defName>
-					<label>M21 102mm missile (Anti-Personnel)</label>
-					<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					<graphicData>
-						<texPath>Things/Projectile/Rocket/SMAW_Thermobaric</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<explosionRadius>3.5</explosionRadius>
-						<damageDef>Bomb</damageDef>
-						<damageAmountBase>240</damageAmountBase>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						<speed>51</speed>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>24</Fragment_Large>
-								<Fragment_Small>148</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_M41Rocket_HEAT</defName>
-					<label>make M19 HEAT rockets x5</label>
-					<description>Craft 5 M19 HEAT rockets.</description>
-					<jobString>Making M19 HEAT rockets.</jobString>
-					<workAmount>13000</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>80</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>10</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>4</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_M41Rocket_HEAT>5</Ammo_M41Rocket_HEAT>
-					</products>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_M41Rocket_HE</defName>
-					<label>make M21 Anti-personnel rockets x5</label>
-					<description>Craft 5 M21 Anti-personnel rockets.</description>
-					<jobString>Making M21 Anti-personnel rockets.</jobString>
-					<workAmount>25000</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>80</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>16</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>4</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_M41Rocket_HE>5</Ammo_M41Rocket_HE>
-					</products>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Halo Ammo/12.7x40mm.xml b/Patches/Halo Ammo/12.7x40mm.xml
deleted file mode 100644
index 4f97fdaea5..0000000000
--- a/Patches/Halo Ammo/12.7x40mm.xml	
+++ /dev/null
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Halo UNSC Weapon Pack</li>
-		</mods>
-
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>Ammo127x40mm</defName>
-					<label>12.7x40mm</label>
-					<parent>AmmoPistols</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_127x40mmUNSC</defName>
-					<label>12.7x40mm</label>
-					<ammoTypes>
-						<Ammo_127x40mm_FMJ>Bullet_127x40mm_FMJ</Ammo_127x40mm_FMJ>
-						<Ammo_127x40mm_AP>Bullet_127x40mm_AP</Ammo_127x40mm_AP>
-						<Ammo_127x40mm_HP>Bullet_127x40mm_HP</Ammo_127x40mm_HP>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_127x40mmUNSCLight</defName>
-					<label>12.7x40mm</label>
-					<ammoTypes>
-						<Ammo_127x40mm_FMJ>Bullet_127x40mm_FMJ_Light</Ammo_127x40mm_FMJ>
-						<Ammo_127x40mm_AP>Bullet_127x40mm_AP_Light</Ammo_127x40mm_AP>
-						<Ammo_127x40mm_HP>Bullet_127x40mm_HP_Light</Ammo_127x40mm_HP>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="127x40mmBase" ParentName="AmmoBase" Abstract="True">
-					<description>This high-powered cartridge is one of the largest calibers found in handguns. Commonly used by UNSC magnum pistols.</description>
-					<statBases>
-						<Mass>0.029</Mass>
-						<Bulk>0.02</Bulk>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting</li>
-					</tradeTags>
-					<thingCategories>
-						<li>Ammo127x40mm</li>
-					</thingCategories>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="127x40mmBase">
-					<defName>Ammo_127x40mm_FMJ</defName>
-					<label>12.7x40mm cartridge (FMJ)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Pistol/FMJ</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.12</MarketValue>
-					</statBases>
-					<ammoClass>FullMetalJacket</ammoClass>
-					<cookOffProjectile>Bullet_127x40mm_FMJ</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="127x40mmBase">
-					<defName>Ammo_127x40mm_AP</defName>
-					<label>12.7x40mm cartridge (AP)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Pistol/AP</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.12</MarketValue>
-					</statBases>
-					<ammoClass>ArmorPiercing</ammoClass>
-					<cookOffProjectile>Bullet_127x40mm_AP</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="127x40mmBase">
-					<defName>Ammo_127x40mm_HP</defName>
-					<label>12.7x40mm cartridge (HP)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Pistol/HP</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.12</MarketValue>
-					</statBases>
-					<ammoClass>HollowPoint</ammoClass>
-					<cookOffProjectile>Bullet_127x40mm_HP</cookOffProjectile>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef ParentName="Base50AEBullet">
-					<defName>Bullet_127x40mm_FMJ</defName>
-					<label>12.7x40mm bullet (FMJ)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>19</damageAmountBase>
-						<armorPenetrationSharp>9</armorPenetrationSharp>
-						<armorPenetrationBlunt>38.480</armorPenetrationBlunt>
-						<speed>105</speed>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base50AEBullet">
-					<defName>Bullet_127x40mm_AP</defName>
-					<label>12.7x40mm bullet (AP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>12</damageAmountBase>
-						<armorPenetrationSharp>18</armorPenetrationSharp>
-						<armorPenetrationBlunt>38.480</armorPenetrationBlunt>
-						<speed>105</speed>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base50AEBullet">
-					<defName>Bullet_127x40mm_HP</defName>
-					<label>12.7x40mm bullet (HP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>24</damageAmountBase>
-						<armorPenetrationSharp>4.5</armorPenetrationSharp>
-						<armorPenetrationBlunt>38.480</armorPenetrationBlunt>
-						<speed>105</speed>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base50AEBullet">
-					<defName>Bullet_127x40mm_FMJ_Light</defName>
-					<label>12.7x40mm bullet (FMJ)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>17</damageAmountBase>
-						<armorPenetrationSharp>8</armorPenetrationSharp>
-						<armorPenetrationBlunt>32.480</armorPenetrationBlunt>
-						<speed>105</speed>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base50AEBullet">
-					<defName>Bullet_127x40mm_AP_Light</defName>
-					<label>12.7x40mm bullet (AP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>11</damageAmountBase>
-						<armorPenetrationSharp>16</armorPenetrationSharp>
-						<armorPenetrationBlunt>32.480</armorPenetrationBlunt>
-						<speed>105</speed>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base50AEBullet">
-					<defName>Bullet_127x40mm_HP_Light</defName>
-					<label>12.7x40mm bullet (HP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>22</damageAmountBase>
-						<armorPenetrationSharp>4</armorPenetrationSharp>
-						<armorPenetrationBlunt>32.480</armorPenetrationBlunt>
-						<speed>105</speed>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="UNAmmoRecipeBase">
-					<defName>MakeAmmo_127x40mm_FMJ</defName>
-					<label>make 12.7x40mm (FMJ) cartridge x500</label>
-					<description>Craft 500 12.7x40mm (FMJ) cartridges.</description>
-					<jobString>Making 12.7x40mm (FMJ) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>30</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_127x40mm_FMJ>500</Ammo_127x40mm_FMJ>
-					</products>
-					<workAmount>3000</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="UNAmmoRecipeBase">
-					<defName>MakeAmmo_127x40mm_HP</defName>
-					<label>make 12.7x40mm (HP) cartridge x500</label>
-					<description>Craft 500 12.7x40mm (HP) cartridges.</description>
-					<jobString>Making 12.7x40mm (HP) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>30</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_127x40mm_HP>500</Ammo_127x40mm_HP>
-					</products>
-					<workAmount>3000</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="UNAmmoRecipeBase">
-					<defName>MakeAmmo_127x40mm_AP</defName>
-					<label>make 12.7x40mm (AP) cartridge x500</label>
-					<description>Craft 500 12.7x40mm (AP) cartridges.</description>
-					<jobString>Making 12.7x40mm (AP) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>30</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_127x40mm_AP>500</Ammo_127x40mm_AP>
-					</products>
-					<workAmount>3000</workAmount>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Halo Ammo/12.7x99mm.xml b/Patches/Halo Ammo/12.7x99mm.xml
deleted file mode 100644
index be6d0703f4..0000000000
--- a/Patches/Halo Ammo/12.7x99mm.xml	
+++ /dev/null
@@ -1,310 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Halo UNSC Weapon Pack</li>
-		</mods>
-
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>Ammo127x99mm</defName>
-					<label>12.7x99mm</label>
-					<parent>AmmoHighCaliber</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberHighCaliber</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_127x99mm</defName>
-					<label>12.7x99mm</label>
-					<ammoTypes>
-						<Ammo_127x99mm_FMJ>Bullet_127x99mm_FMJ</Ammo_127x99mm_FMJ>
-						<Ammo_127x99mm_Incendiary>Bullet_127x99mm_Incendiary</Ammo_127x99mm_Incendiary>
-						<Ammo_127x99mm_HE>Bullet_127x99mm_HE</Ammo_127x99mm_HE>
-						<Ammo_127x99mm_Sabot>Bullet_127x99mm_Sabot</Ammo_127x99mm_Sabot>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="Ammo127x99mmBase" ParentName="MediumAmmoBase" Abstract="True">
-					<description>Large caliber bullet used by many UNSC heavy machine guns.</description>
-					<statBases>
-						<Mass>0.115</Mass>
-						<Bulk>0.14</Bulk>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting</li>
-					</tradeTags>
-					<thingCategories>
-						<li>Ammo127x99mm</li>
-					</thingCategories>
-					<stackLimit>5000</stackLimit>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo127x99mmBase">
-					<defName>Ammo_127x99mm_FMJ</defName>
-					<label>12.7x99mm cartridge (FMJ)</label>
-					<graphicData>
-						<texPath>Things/Ammo/HighCaliber/FMJ</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.48</MarketValue>
-					</statBases>
-					<ammoClass>FullMetalJacket</ammoClass>
-					<cookOffProjectile>Bullet_127x99mm_FMJ</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo127x99mmBase">
-					<defName>Ammo_127x99mm_Incendiary</defName>
-					<label>12.7x99mm cartridge (AP-I)</label>
-					<graphicData>
-						<texPath>Things/Ammo/HighCaliber/Incendiary</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.8</MarketValue>
-						<Mass>0.112</Mass>
-					</statBases>
-					<ammoClass>IncendiaryAP</ammoClass>
-					<cookOffProjectile>Bullet_127x99mm_Incendiary</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo127x99mmBase">
-					<defName>Ammo_127x99mm_HE</defName>
-					<label>12.7x99mm cartridge (AP-HE)</label>
-					<graphicData>
-						<texPath>Things/Ammo/HighCaliber/HE</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.95</MarketValue>
-					</statBases>
-					<ammoClass>ExplosiveAP</ammoClass>
-					<cookOffProjectile>Bullet_127x99mm_HE</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo127x99mmBase">
-					<defName>Ammo_127x99mm_Sabot</defName>
-					<label>12.7x99mm cartridge (Sabot)</label>
-					<graphicData>
-						<texPath>Things/Ammo/HighCaliber/Sabot</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.78</MarketValue>
-						<Mass>0.095</Mass>
-					</statBases>
-					<ammoClass>Sabot</ammoClass>
-					<cookOffProjectile>Bullet_127x99mm_Sabot</cookOffProjectile>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef ParentName="Base50BMGBullet">
-					<defName>Bullet_127x99mm_FMJ</defName>
-					<label>12.7x99mm bullet (FMJ)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>40</damageAmountBase>
-						<armorPenetrationSharp>18</armorPenetrationSharp>
-						<armorPenetrationBlunt>356.380</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base50BMGBullet">
-					<defName>Bullet_127x99mm_Incendiary</defName>
-					<label>12.7x99mm bullet (AP-I)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>25</damageAmountBase>
-						<armorPenetrationSharp>36</armorPenetrationSharp>
-						<armorPenetrationBlunt>356.7</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Flame_Secondary</def>
-								<amount>15</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base50BMGBullet">
-					<defName>Bullet_127x99mm_HE</defName>
-					<label>12.7x99mm bullet (AP-HE)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>40</damageAmountBase>
-						<armorPenetrationSharp>18</armorPenetrationSharp>
-						<armorPenetrationBlunt>356.380</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Bomb_Secondary</def>
-								<amount>24</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base50BMGBullet">
-					<defName>Bullet_127x99mm_Sabot</defName>
-					<label>12.7x99mm bullet (Sabot)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>19</damageAmountBase>
-						<armorPenetrationSharp>55</armorPenetrationSharp>
-						<armorPenetrationBlunt>384.780</armorPenetrationBlunt>
-						<speed>207</speed>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="UNAmmoRecipeBase">
-					<defName>MakeAmmo_127x99mm_FMJ</defName>
-					<label>make 12.7x99mm (FMJ) cartridge x200</label>
-					<description>Craft 200 12.7x99mm (FMJ) cartridges.</description>
-					<jobString>Making 12.7x99mm (FMJ) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>48</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_127x99mm_FMJ>200</Ammo_127x99mm_FMJ>
-					</products>
-					<workAmount>6000</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AdvancedAmmoRecipeBase">
-					<defName>MakeAmmo_127x99mm_Incendiary</defName>
-					<label>make 12.7x99mm (AP-I) cartridge x200</label>
-					<description>Craft 200 12.7x99mm (AP-I) cartridges.</description>
-					<jobString>Making 12.7x99mm (AP-I) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>46</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>4</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Prometheum</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_127x99mm_Incendiary>200</Ammo_127x99mm_Incendiary>
-					</products>
-					<workAmount>8200</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AdvancedAmmoRecipeBase">
-					<defName>MakeAmmo_127x99mm_HE</defName>
-					<label>make 12.7x99mm (AP-HE) cartridge x200</label>
-					<description>Craft 200 12.7x99mm (HE) cartridges.</description>
-					<jobString>Making 12.7x99mm (HE) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>48</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>10</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_127x99mm_HE>200</Ammo_127x99mm_HE>
-					</products>
-					<workAmount>10800</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AdvancedAmmoRecipeBase">
-					<defName>MakeAmmo_127x99mm_Sabot</defName>
-					<label>make 12.7x99mm (Sabot) cartridge x200</label>
-					<description>Craft 200 12.7x99mm (Sabot) cartridges.</description>
-					<jobString>Making 12.7x99mm (Sabot) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>30</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Uranium</li>
-								</thingDefs>
-							</filter>
-							<count>5</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Chemfuel</li>
-								</thingDefs>
-							</filter>
-							<count>5</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Uranium</li>
-							<li>Chemfuel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_127x99mm_Sabot>200</Ammo_127x99mm_Sabot>
-					</products>
-					<workAmount>8000</workAmount>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Halo Ammo/14.5x114mmUNSC.xml b/Patches/Halo Ammo/14.5x114mmUNSC.xml
deleted file mode 100644
index ffdd13c15b..0000000000
--- a/Patches/Halo Ammo/14.5x114mmUNSC.xml	
+++ /dev/null
@@ -1,313 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Halo UNSC Weapon Pack</li>
-		</mods>
-
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>Ammo145x114mmUNSC</defName>
-					<label>14.5x114mmUNSC</label>
-					<parent>AmmoHighCaliber</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberHighCaliber</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_145x114mmUNSC</defName>
-					<label>14.5x114mmUNSC</label>
-					<ammoTypes>
-						<Ammo_145x114mmUNSC_FMJ>Bullet_145x114mmUNSC_FMJ</Ammo_145x114mmUNSC_FMJ>
-						<Ammo_145x114mmUNSC_Incendiary>Bullet_145x114mmUNSC_Incendiary</Ammo_145x114mmUNSC_Incendiary>
-						<Ammo_145x114mmUNSC_HE>Bullet_145x114mmUNSC_HE</Ammo_145x114mmUNSC_HE>
-						<Ammo_145x114mmUNSC_Sabot>Bullet_145x114mmUNSC_Sabot</Ammo_145x114mmUNSC_Sabot>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="Ammo145x114mmUNSCBase" ParentName="MediumAmmoBase" Abstract="True">
-					<description>Old-school anti-tank cartridge originally designed for AT rifles, it is now used by UNSC heavy sniper rifles.</description>
-					<statBases>
-						<Mass>0.186</Mass>
-						<Bulk>0.27</Bulk>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting</li>
-					</tradeTags>
-					<thingCategories>
-						<li>Ammo145x114mmUNSC</li>
-					</thingCategories>
-					<stackLimit>2000</stackLimit>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo145x114mmUNSCBase">
-					<defName>Ammo_145x114mmUNSC_FMJ</defName>
-					<label>14.5x114mmUNSC cartridge (FMJ)</label>
-					<graphicData>
-						<texPath>Things/Ammo/HighCaliber/FMJ</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.86</MarketValue>
-					</statBases>
-					<ammoClass>FullMetalJacket</ammoClass>
-					<generateAllowChance>0.3</generateAllowChance>
-					<cookOffProjectile>Bullet_145x114mmUNSC_FMJ</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo145x114mmUNSCBase">
-					<defName>Ammo_145x114mmUNSC_Incendiary</defName>
-					<label>14.5x114mmUNSC cartridge (AP-I)</label>
-					<graphicData>
-						<texPath>Things/Ammo/HighCaliber/Incendiary</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>1.1</MarketValue>
-					</statBases>
-					<ammoClass>IncendiaryAP</ammoClass>
-					<generateAllowChance>0.15</generateAllowChance>
-					<cookOffProjectile>Bullet_145x114mmUNSC_Incendiary</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo145x114mmUNSCBase">
-					<defName>Ammo_145x114mmUNSC_HE</defName>
-					<label>14.5x114mmUNSC cartridge (HE)</label>
-					<graphicData>
-						<texPath>Things/Ammo/HighCaliber/HE</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>1.48</MarketValue>
-					</statBases>
-					<ammoClass>ExplosiveAP</ammoClass>
-					<generateAllowChance>0.15</generateAllowChance>
-					<cookOffProjectile>Bullet_145x114mmUNSC_HE</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo145x114mmUNSCBase">
-					<defName>Ammo_145x114mmUNSC_Sabot</defName>
-					<label>14.5x114mmUNSC cartridge (Sabot)</label>
-					<graphicData>
-						<texPath>Things/Ammo/HighCaliber/Sabot</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.95</MarketValue>
-						<Mass>0.159</Mass>
-					</statBases>
-					<ammoClass>Sabot</ammoClass>
-					<generateAllowChance>0.1</generateAllowChance>
-					<cookOffProjectile>Bullet_145x114mmUNSC_Sabot</cookOffProjectile>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef ParentName="Base145x114mmBullet">
-					<defName>Bullet_145x114mmUNSC_FMJ</defName>
-					<label>14.5x114mmUNSC bullet (FMJ)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>52</damageAmountBase>
-						<armorPenetrationSharp>24</armorPenetrationSharp>
-						<armorPenetrationBlunt>678</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base145x114mmBullet">
-					<defName>Bullet_145x114mmUNSC_Incendiary</defName>
-					<label>14.5x114mmUNSC bullet (AP-I)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>33</damageAmountBase>
-						<armorPenetrationSharp>48</armorPenetrationSharp>
-						<armorPenetrationBlunt>678</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Flame_Secondary</def>
-								<amount>19</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base145x114mmBullet">
-					<defName>Bullet_145x114mmUNSC_HE</defName>
-					<label>14.5x114mmUNSC bullet (HE)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>52</damageAmountBase>
-						<armorPenetrationSharp>24</armorPenetrationSharp>
-						<armorPenetrationBlunt>678</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Bomb_Secondary</def>
-								<amount>30</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base145x114mmBullet">
-					<defName>Bullet_145x114mmUNSC_Sabot</defName>
-					<label>14.5x114mmUNSC bullet (Sabot)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>242</speed>
-						<damageAmountBase>27</damageAmountBase>
-						<armorPenetrationSharp>74</armorPenetrationSharp>
-						<armorPenetrationBlunt>860.360</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="UNAmmoRecipeBase">
-					<defName>MakeAmmo_145x114mmUNSC_FMJ</defName>
-					<label>make 14.5x114mmUNSC (FMJ) cartridge x200</label>
-					<description>Craft 200 14.5x114mmUNSC (FMJ) cartridges.</description>
-					<jobString>Making 14.5x114mmUNSC (FMJ) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>76</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_145x114mmUNSC_FMJ>200</Ammo_145x114mmUNSC_FMJ>
-					</products>
-					<workAmount>10000</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AdvancedAmmoRecipeBase">
-					<defName>MakeAmmo_145x114mmUNSC_Incendiary</defName>
-					<label>make 14.5x114mmUNSC (AP-I) cartridge x200</label>
-					<description>Craft 200 14.5x114mmUNSC (AP-I) cartridges.</description>
-					<jobString>Making 14.5x114mmUNSC (AP-I) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>76</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>7</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Prometheum</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_145x114mmUNSC_Incendiary>200</Ammo_145x114mmUNSC_Incendiary>
-					</products>
-					<workAmount>13600</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AdvancedAmmoRecipeBase">
-					<defName>MakeAmmo_145x114mmUNSC_HE</defName>
-					<label>make 14.5x114mmUNSC (HE) cartridge x200</label>
-					<description>Craft 200 14.5x114mmUNSC (HE) cartridges.</description>
-					<jobString>Making 14.5x114mmUNSC (HE) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>76</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>13</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_145x114mmUNSC_HE>200</Ammo_145x114mmUNSC_HE>
-					</products>
-					<workAmount>16000</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AdvancedAmmoRecipeBase">
-					<defName>MakeAmmo_145x114mmUNSC_Sabot</defName>
-					<label>make 14.5x114mmUNSC (Sabot) cartridge x200</label>
-					<description>Craft 200 14.5x114mmUNSC (Sabot) cartridges.</description>
-					<jobString>Making 14.5x114mmUNSC (Sabot) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>50</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Uranium</li>
-								</thingDefs>
-							</filter>
-							<count>8</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Chemfuel</li>
-								</thingDefs>
-							</filter>
-							<count>8</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Chemfuel</li>
-							<li>Steel</li>
-							<li>Uranium</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_145x114mmUNSC_Sabot>200</Ammo_145x114mmUNSC_Sabot>
-					</products>
-					<workAmount>13000</workAmount>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Halo Ammo/16x65mm.xml b/Patches/Halo Ammo/16x65mm.xml
deleted file mode 100644
index 2e23e449dd..0000000000
--- a/Patches/Halo Ammo/16x65mm.xml	
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Halo UNSC Weapon Pack</li>
-		</mods>
-
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>Ammo16x65mm</defName>
-					<label>16x65mm</label>
-					<parent>AmmoHighCaliber</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberHighCaliber</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_16x65mm</defName>
-					<label>16x65mm</label>
-					<ammoTypes>
-						<Ammo_16x65mm_HE>Bullet_16x65mm_HE</Ammo_16x65mm_HE>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="Ammo16x65mmBase" ParentName="SpacerAmmoBase" Abstract="True">
-					<description>The M645 Ferric-Tungsten Projectile - High Explosive is a 16x65mm slug round used by Acheron Security's ARC-920 railgun.</description>
-					<statBases>
-						<Mass>0.12</Mass>
-						<Bulk>0.24</Bulk>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_FabricationBench</li>
-					</tradeTags>
-					<thingCategories>
-						<li>Ammo16x65mm</li>
-					</thingCategories>
-					<stackLimit>2000</stackLimit>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo16x65mmBase">
-					<defName>Ammo_16x65mm_HE</defName>
-					<label>16x65mm cartridge (HE)</label>
-					<graphicData>
-						<texPath>Things/Ammo/HighCaliber/HE</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>11</MarketValue>
-					</statBases>
-					<ammoClass>ExplosiveAP</ammoClass>
-					<cookOffProjectile>Bullet_16x65mm_HE</cookOffProjectile>
-				</ThingDef>
-
-				<!-- ================== Projectile ================== -->
-
-				<ThingDef ParentName="Base145x114mmBullet">
-					<defName>Bullet_16x65mm_HE</defName>
-					<label>16x65mm bullet (HE)</label>
-					<graphicData>
-						<texPath>Things/Projectile/Bullet_Big</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bullet</damageDef>
-						<speed>406</speed>
-						<damageAmountBase>72</damageAmountBase>
-						<armorPenetrationSharp>300</armorPenetrationSharp>
-						<armorPenetrationBlunt>920.88</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Bomb_Secondary</def>
-								<amount>36</amount>
-							</li>
-						</secondaryDamage>
-						<dropsCasings>false</dropsCasings>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>30</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>0.9</explosiveRadius>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="AdvancedAmmoRecipeBase">
-					<defName>MakeAmmo_16x65mm_HE</defName>
-					<label>make 16x65mm (HE) cartridge x100</label>
-					<description>Craft 100 16x65mm (HE) cartridges.</description>
-					<jobString>Making 16x65mm (HE) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>40</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Uranium</li>
-								</thingDefs>
-							</filter>
-							<count>10</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>8</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Uranium</li>
-							<li>FSX</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_16x65mm_HE>100</Ammo_16x65mm_HE>
-					</products>
-					<workAmount>10000</workAmount>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Halo Ammo/40x46mmGrenadesUNSC.xml b/Patches/Halo Ammo/40x46mmGrenadesUNSC.xml
deleted file mode 100644
index dc490edbb8..0000000000
--- a/Patches/Halo Ammo/40x46mmGrenadesUNSC.xml	
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Halo UNSC Weapon Pack</li>
-		</mods>
-
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_40mmGrenade</defName>
-					<label>40x46mm Grenades</label>
-					<ammoTypes>
-						<Ammo_40mmGrenade_UNSCHEDP>Bullet_40mmGrenade_UNSCHEDP</Ammo_40mmGrenade_UNSCHEDP>
-						<Ammo_40x46mmGrenade_HE>Bullet_40x46mmGrenade_UNSCHE</Ammo_40x46mmGrenade_HE>
-						<Ammo_40x46mmGrenade_EMP>Bullet_40x46mmGrenade_UNSCEMP</Ammo_40x46mmGrenade_EMP>
-						<Ammo_40x46mmGrenade_Smoke>Bullet_40x46mmGrenade_UNSCSmoke</Ammo_40x46mmGrenade_Smoke>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="40mmGrenadeBase" ParentName="MediumAmmoBase" Abstract="True">
-					<description>Medium velocity grenade fired from handheld grenade launchers. This one features a heat warhead.</description>
-					<statBases>
-						<Mass>0.2</Mass>
-						<Bulk>0.36</Bulk>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-					</tradeTags>
-					<thingCategories>
-						<li>Ammo40x46mmGrenades</li>
-					</thingCategories>
-					<stackLimit>500</stackLimit>
-					<cookOffFlashScale>100</cookOffFlashScale>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="40mmGrenadeBase">
-					<defName>Ammo_40mmGrenade_UNSCHEDP</defName>
-					<label>40mm grenade UNSC (HEDP)</label>
-					<graphicData>
-						<texPath>Things/Ammo/GrenadeLauncher/HE</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>6.01</MarketValue>
-					</statBases>
-					<ammoClass>GrenadeHEDP</ammoClass>
-					<detonateProjectile>Bullet_40x46mmGrenade_HE</detonateProjectile>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef ParentName="Base40x46mmGrenadeBullet">
-					<defName>Bullet_40mmGrenade_UNSCHEDP</defName>
-					<label>40x46mm grenade (HEDP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bullet</damageDef>
-						<damageAmountBase>48</damageAmountBase>
-						<armorPenetrationSharp>50</armorPenetrationSharp>
-						<armorPenetrationBlunt>31.584</armorPenetrationBlunt>
-						<speed>33</speed>
-						<secondaryDamage>
-							<li>
-								<def>EMP</def>
-								<amount>12</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>40</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>1.5</explosiveRadius>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>14</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<ThingDef ParentName="Base40x46mmGrenadeBullet">
-					<defName>Bullet_40x46mmGrenade_UNSCHE</defName>
-					<label>40x46mm grenade (HE)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<explosionRadius>1.0</explosionRadius>
-						<damageDef>Bomb</damageDef>
-						<damageAmountBase>25</damageAmountBase>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						<speed>33</speed>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>19</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<ThingDef ParentName="Base40x46mmGrenadeBullet">
-					<defName>Bullet_40x46mmGrenade_UNSCEMP</defName>
-					<label>40x46mm grenade (EMP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<explosionRadius>1.5</explosionRadius>
-						<damageDef>EMP</damageDef>
-						<damageAmountBase>25</damageAmountBase>
-						<speed>33</speed>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base40x46mmGrenadeBullet">
-					<defName>Bullet_40x46mmGrenade_UNSCSmoke</defName>
-					<label>40x46mm grenade (Smoke)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<explosionRadius>2</explosionRadius>
-						<damageDef>Smoke</damageDef>
-						<suppressionFactor>0.0</suppressionFactor>
-						<dangerFactor>0.0</dangerFactor>
-						<postExplosionGasType>BlindSmoke</postExplosionGasType>
-						<preExplosionSpawnChance>1</preExplosionSpawnChance>
-						<speed>33</speed>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="UNAmmoRecipeBase">
-					<defName>MakeAmmo_40mmGrenade_UNSCHEDP</defName>
-					<label>make 40mm UNSC HEDP grenades x100</label>
-					<description>Craft 100 40mm UNSC HEDP grenades.</description>
-					<jobString>Making 40mm UNSC HEDP grenades.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>50</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>10</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>4</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_40mmGrenade_UNSCHEDP>100</Ammo_40mmGrenade_UNSCHEDP>
-					</products>
-					<workAmount>12000</workAmount>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Halo Ammo/5x23mmCaseless.xml b/Patches/Halo Ammo/5x23mmCaseless.xml
deleted file mode 100644
index b172aaf7b0..0000000000
--- a/Patches/Halo Ammo/5x23mmCaseless.xml	
+++ /dev/null
@@ -1,256 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Halo UNSC Weapon Pack</li>
-		</mods>
-
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>Ammo5x23mmCaseless</defName>
-					<label>5x23mm Caseless</label>
-					<parent>AmmoRifles</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_5x23mmCaseless</defName>
-					<label>5x23mm Caseless</label>
-					<ammoTypes>
-						<Ammo_5x23mmCaseless_FMJ>Bullet_5x23mmCaseless_FMJ</Ammo_5x23mmCaseless_FMJ>
-						<Ammo_5x23mmCaseless_AP>Bullet_5x23mmCaseless_AP</Ammo_5x23mmCaseless_AP>
-						<Ammo_5x23mmCaseless_HP>Bullet_5x23mmCaseless_HP</Ammo_5x23mmCaseless_HP>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="5x23mmCaselessBase" ParentName="SmallAmmoBase" Abstract="True">
-					<description>Caseless bullet with a solid propellant enveloping the projectile. It is used by UNSC SMGs.</description>
-					<statBases>
-						<Mass>0.008</Mass>
-						<Bulk>0.009</Bulk>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting</li>
-					</tradeTags>
-					<thingCategories>
-						<li>Ammo5x23mmCaseless</li>
-					</thingCategories>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="5x23mmCaselessBase">
-					<defName>Ammo_5x23mmCaseless_FMJ</defName>
-					<label>5x23mm Caseless cartridge (FMJ)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/FMJ</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.08</MarketValue>
-					</statBases>
-					<ammoClass>FullMetalJacket</ammoClass>
-					<cookOffProjectile>Bullet_5x23mmCaseless_FMJ</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="5x23mmCaselessBase">
-					<defName>Ammo_5x23mmCaseless_AP</defName>
-					<label>5x23mm Caseless cartridge (AP)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/AP</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.08</MarketValue>
-					</statBases>
-					<ammoClass>ArmorPiercing</ammoClass>
-					<cookOffProjectile>Bullet_5x23mmCaseless_AP</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="5x23mmCaselessBase">
-					<defName>Ammo_5x23mmCaseless_HP</defName>
-					<label>5x23mm Caseless cartridge (HP)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/HP</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.08</MarketValue>
-					</statBases>
-					<ammoClass>HollowPoint</ammoClass>
-					<cookOffProjectile>Bullet_5x23mmCaseless_HP</cookOffProjectile>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef ParentName="BaseFN57x28mmBullet">
-					<defName>Bullet_5x23mmCaseless_FMJ</defName>
-					<label>5mm Caseless bullet (FMJ)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>11</damageAmountBase>
-						<armorPenetrationSharp>7</armorPenetrationSharp>
-						<armorPenetrationBlunt>24.5</armorPenetrationBlunt>
-						<dropsCasings>false</dropsCasings>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseFN57x28mmBullet">
-					<defName>Bullet_5x23mmCaseless_AP</defName>
-					<label>5mm Caseless bullet (AP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>7</damageAmountBase>
-						<armorPenetrationSharp>14</armorPenetrationSharp>
-						<armorPenetrationBlunt>24.5</armorPenetrationBlunt>
-						<dropsCasings>false</dropsCasings>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseFN57x28mmBullet">
-					<defName>Bullet_5x23mmCaseless_HP</defName>
-					<label>5mm Caseless bullet (HP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>15</damageAmountBase>
-						<armorPenetrationSharp>3.5</armorPenetrationSharp>
-						<armorPenetrationBlunt>24.5</armorPenetrationBlunt>
-						<dropsCasings>false</dropsCasings>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseFN57x28mmBullet">
-					<defName>Bullet_5x23mmCaseless_Incendiary</defName>
-					<label>5mm Caseless bullet (AP-I)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>8</damageAmountBase>
-						<armorPenetrationSharp>12</armorPenetrationSharp>
-						<armorPenetrationBlunt>28.5</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Flame_Secondary</def>
-								<amount>4</amount>
-							</li>
-						</secondaryDamage>
-						<dropsCasings>false</dropsCasings>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseFN57x28mmBullet">
-					<defName>Bullet_5x23mmCaseless_HE</defName>
-					<label>5mm Caseless bullet (HE)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>12</damageAmountBase>
-						<armorPenetrationSharp>6</armorPenetrationSharp>
-						<armorPenetrationBlunt>28.5</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Bomb_Secondary</def>
-								<amount>7</amount>
-							</li>
-						</secondaryDamage>
-						<dropsCasings>false</dropsCasings>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseFN57x28mmBullet">
-					<defName>Bullet_5x23mmCaseless_Sabot</defName>
-					<label>5mm Caseless bullet (Sabot)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>6</damageAmountBase>
-						<armorPenetrationSharp>21</armorPenetrationSharp>
-						<armorPenetrationBlunt>36.58</armorPenetrationBlunt>
-						<speed>205</speed>
-						<dropsCasings>false</dropsCasings>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="UNAmmoRecipeBase">
-					<defName>MakeAmmo_5x23mmCaseless_FMJ</defName>
-					<label>make 5x23mm Caseless (FMJ) cartridge x500</label>
-					<description>Craft 500 5x23mm Caseless (FMJ) cartridges.</description>
-					<jobString>Making 5x23mm Caseless (FMJ) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>10</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_5x23mmCaseless_FMJ>500</Ammo_5x23mmCaseless_FMJ>
-					</products>
-					<workAmount>1500</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="UNAmmoRecipeBase">
-					<defName>MakeAmmo_5x23mmCaseless_AP</defName>
-					<label>make 5x23mm Caseless (AP) cartridge x500</label>
-					<description>Craft 500 5x23mm Caseless (AP) cartridges.</description>
-					<jobString>Making 5x23mm Caseless (AP) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>10</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_5x23mmCaseless_AP>500</Ammo_5x23mmCaseless_AP>
-					</products>
-					<workAmount>1500</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="UNAmmoRecipeBase">
-					<defName>MakeAmmo_5x23mmCaseless_HP</defName>
-					<label>make 5x23mm Caseless (HP) cartridge x500</label>
-					<description>Craft 500 5x23mm Caseless (HP) cartridges.</description>
-					<jobString>Making 5x23mm Caseless (HP) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>10</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_5x23mmCaseless_HP>500</Ammo_5x23mmCaseless_HP>
-					</products>
-					<workAmount>1500</workAmount>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Halo Ammo/7.62x51mmUNSC.xml b/Patches/Halo Ammo/7.62x51mmUNSC.xml
deleted file mode 100644
index c1451521f4..0000000000
--- a/Patches/Halo Ammo/7.62x51mmUNSC.xml	
+++ /dev/null
@@ -1,598 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Halo UNSC Weapon Pack</li>
-		</mods>
-
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>Ammo762x51mmUNSC</defName>
-					<label>7.62x51mm UNSC</label>
-					<parent>AmmoRifles</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_762x51mmUNSC</defName>
-					<label>7.62x51mm UNSC</label>
-					<ammoTypes>
-						<Ammo_762x51mmUNSC_FMJ>Bullet_762x51mmUNSC_FMJ</Ammo_762x51mmUNSC_FMJ>
-						<Ammo_762x51mmUNSC_AP>Bullet_762x51mmUNSC_AP</Ammo_762x51mmUNSC_AP>
-						<Ammo_762x51mmUNSC_HP>Bullet_762x51mmUNSC_HP</Ammo_762x51mmUNSC_HP>
-						<Ammo_762x51mmUNSC_Shredder>Bullet_762x51mmUNSC_Shredder</Ammo_762x51mmUNSC_Shredder>
-						<Ammo_762x51mmUNSC_Incendiary>Bullet_762x51mmUNSC_Incendiary</Ammo_762x51mmUNSC_Incendiary>
-						<Ammo_762x51mmUNSC_HE>Bullet_762x51mmUNSC_HE</Ammo_762x51mmUNSC_HE>
-						<Ammo_762x51mmUNSC_Sabot>Bullet_762x51mmUNSC_Sabot</Ammo_762x51mmUNSC_Sabot>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_762x51mmUNSC_DMR</defName>
-					<label>7.62x51mm UNSC</label>
-					<ammoTypes>
-						<Ammo_762x51mmUNSC_FMJ>Bullet_762x51mmUNSC_FMJ_DMR</Ammo_762x51mmUNSC_FMJ>
-						<Ammo_762x51mmUNSC_AP>Bullet_762x51mmUNSC_AP_DMR</Ammo_762x51mmUNSC_AP>
-						<Ammo_762x51mmUNSC_HP>Bullet_762x51mmUNSC_HP_DMR</Ammo_762x51mmUNSC_HP>
-						<Ammo_762x51mmUNSC_Shredder>Bullet_762x51mmUNSC_Shredder_DMR</Ammo_762x51mmUNSC_Shredder>
-						<Ammo_762x51mmUNSC_Incendiary>Bullet_762x51mmUNSC_Incendiary_DMR</Ammo_762x51mmUNSC_Incendiary>
-						<Ammo_762x51mmUNSC_HE>Bullet_762x51mmUNSC_HE_DMR</Ammo_762x51mmUNSC_HE>
-						<Ammo_762x51mmUNSC_Sabot>Bullet_762x51mmUNSC_Sabot_DMR</Ammo_762x51mmUNSC_Sabot>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_762x51mmExtra</defName>
-					<label>7.62x51mm UNSC Extra</label>
-					<ammoTypes>
-						<Ammo_762x51mmUNSC_FMJ>Bullet_762x51mmUNSC_FMJ</Ammo_762x51mmUNSC_FMJ>
-						<Ammo_762x51mmUNSC_AP>Bullet_762x51mmUNSC_AP</Ammo_762x51mmUNSC_AP>
-						<Ammo_762x51mmUNSC_HP>Bullet_762x51mmUNSC_HP</Ammo_762x51mmUNSC_HP>
-						<Ammo_762x51mmUNSC_Shredder>Bullet_762x51mmUNSC_Shredder</Ammo_762x51mmUNSC_Shredder>
-						<Ammo_762x51mmUNSC_Incendiary>Bullet_762x51mmUNSC_Incendiary</Ammo_762x51mmUNSC_Incendiary>
-						<Ammo_762x51mmUNSC_HE>Bullet_762x51mmUNSC_HE</Ammo_762x51mmUNSC_HE>
-						<Ammo_762x51mmUNSC_Sabot>Bullet_762x51mmUNSC_Sabot</Ammo_762x51mmUNSC_Sabot>
-						<Ammo_762x51mmNATO_FMJ>Bullet_762x51mmNATO_FMJ</Ammo_762x51mmNATO_FMJ>
-						<Ammo_762x51mmNATO_AP>Bullet_762x51mmNATO_AP</Ammo_762x51mmNATO_AP>
-						<Ammo_762x51mmNATO_HP>Bullet_762x51mmNATO_HP</Ammo_762x51mmNATO_HP>
-						<Ammo_762x51mmNATO_Incendiary>Bullet_762x51mmNATO_Incendiary</Ammo_762x51mmNATO_Incendiary>
-						<Ammo_762x51mmNATO_HE>Bullet_762x51mmNATO_HE</Ammo_762x51mmNATO_HE>
-						<Ammo_762x51mmNATO_Sabot>Bullet_762x51mmNATO_Sabot</Ammo_762x51mmNATO_Sabot>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="762x51mmUNSCBase" ParentName="SmallAmmoBase" Abstract="True">
-					<description>An improved version of the ancient 7.62x51mm cartridge, featuring a hardened penetrator and better propellent to counter advancements in body armour. A tiny amount of stopping power is sacrificed to achieve this superior penetrative capability. It is used by a large number of UNSC weaponry.</description>
-					<statBases>
-						<Mass>0.025</Mass>
-						<Bulk>0.03</Bulk>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting</li>
-					</tradeTags>
-					<thingCategories>
-						<li>Ammo762x51mmUNSC</li>
-					</thingCategories>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x51mmUNSCBase">
-					<defName>Ammo_762x51mmUNSC_FMJ</defName>
-					<label>7.62x51mm UNSC cartridge (FMJ)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/FMJ</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.12</MarketValue>
-					</statBases>
-					<ammoClass>FullMetalJacket</ammoClass>
-					<generateAllowChance>0.4</generateAllowChance>
-					<cookOffProjectile>Bullet_762x51mmUNSC_FMJ</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x51mmUNSCBase">
-					<defName>Ammo_762x51mmUNSC_AP</defName>
-					<label>7.62x51mm UNSC cartridge (AP)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/AP</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.12</MarketValue>
-					</statBases>
-					<ammoClass>ArmorPiercing</ammoClass>
-					<generateAllowChance>0.4</generateAllowChance>
-					<cookOffProjectile>Bullet_762x51mmUNSC_AP</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x51mmUNSCBase">
-					<defName>Ammo_762x51mmUNSC_HP</defName>
-					<label>7.62x51mm UNSC cartridge (HP)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/HP</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.12</MarketValue>
-					</statBases>
-					<ammoClass>HollowPoint</ammoClass>
-					<generateAllowChance>0.1</generateAllowChance>
-					<cookOffProjectile>Bullet_762x51mmUNSC_HP</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x51mmUNSCBase">
-					<defName>Ammo_762x51mmUNSC_Shredder</defName>
-					<label>7.62x51mm UNSC cartridge (Shredder)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/HP</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.13</MarketValue>
-					</statBases>
-					<ammoClass>Shredder</ammoClass>
-					<generateAllowChance>0.1</generateAllowChance>
-					<cookOffProjectile>Bullet_762x51mmUNSC_Shredder</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x51mmUNSCBase">
-					<defName>Ammo_762x51mmUNSC_Incendiary</defName>
-					<label>7.62x51mm UNSC cartridge (AP-I)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/Incendiary</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.17</MarketValue>
-					</statBases>
-					<ammoClass>IncendiaryAP</ammoClass>
-					<generateAllowChance>0.2</generateAllowChance>
-					<cookOffProjectile>Bullet_762x51mmUNSC_Incendiary</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x51mmUNSCBase">
-					<defName>Ammo_762x51mmUNSC_HE</defName>
-					<label>7.62x51mm UNSC cartridge (HEDP)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/HE</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.20</MarketValue>
-					</statBases>
-					<ammoClass>ExplosiveAP</ammoClass>
-					<generateAllowChance>0.2</generateAllowChance>
-					<cookOffProjectile>Bullet_762x51mmUNSC_HE</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x51mmUNSCBase">
-					<defName>Ammo_762x51mmUNSC_Sabot</defName>
-					<label>7.62x51mm UNSC cartridge (Sabot)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/Sabot</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.13</MarketValue>
-						<Mass>0.02</Mass>
-					</statBases>
-					<ammoClass>Sabot</ammoClass>
-					<generateAllowChance>0.2</generateAllowChance>
-					<cookOffProjectile>Bullet_762x51mmUNSC_Sabot</cookOffProjectile>
-				</ThingDef>
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef ParentName="Base762x51mmNATOBullet">
-					<defName>Bullet_762x51mmUNSC_FMJ</defName>
-					<label>7.62mm UNSC bullet (FMJ)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>19</damageAmountBase>
-						<armorPenetrationSharp>10</armorPenetrationSharp>
-						<armorPenetrationBlunt>69.72</armorPenetrationBlunt>
-						<speed>170</speed>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base762x51mmNATOBullet">
-					<defName>Bullet_762x51mmUNSC_AP</defName>
-					<label>7.62mm UNSC bullet (AP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>12</damageAmountBase>
-						<armorPenetrationSharp>20</armorPenetrationSharp>
-						<armorPenetrationBlunt>69.72</armorPenetrationBlunt>
-						<speed>170</speed>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base762x51mmNATOBullet">
-					<defName>Bullet_762x51mmUNSC_HP</defName>
-					<label>7.62mm UNSC bullet (HP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>24</damageAmountBase>
-						<armorPenetrationSharp>5</armorPenetrationSharp>
-						<armorPenetrationBlunt>69.72</armorPenetrationBlunt>
-						<speed>170</speed>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base762x51mmNATOBullet">
-					<defName>Bullet_762x51mmUNSC_Shredder</defName>
-					<label>7.62mm UNSC bullet (Shredder)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>22</damageAmountBase>
-						<damageDef>Fragment</damageDef>
-						<armorPenetrationSharp>5</armorPenetrationSharp>
-						<armorPenetrationBlunt>69.72</armorPenetrationBlunt>
-						<speed>170</speed>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base762x51mmNATOBullet">
-					<defName>Bullet_762x51mmUNSC_Incendiary</defName>
-					<label>7.62mm UNSC bullet (AP-I)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>12</damageAmountBase>
-						<armorPenetrationSharp>20</armorPenetrationSharp>
-						<armorPenetrationBlunt>69.72</armorPenetrationBlunt>
-						<speed>170</speed>
-						<secondaryDamage>
-							<li>
-								<def>Flame_Secondary</def>
-								<amount>7</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base762x51mmNATOBullet">
-					<defName>Bullet_762x51mmUNSC_HE</defName>
-					<label>7.62mm UNSC bullet (HEDP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>19</damageAmountBase>
-						<armorPenetrationSharp>10</armorPenetrationSharp>
-						<armorPenetrationBlunt>69.72</armorPenetrationBlunt>
-						<speed>170</speed>
-						<secondaryDamage>
-							<li>
-								<def>Bomb_Secondary</def>
-								<amount>11</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base762x51mmNATOBullet">
-					<defName>Bullet_762x51mmUNSC_Sabot</defName>
-					<label>7.62mm UNSC bullet (Sabot)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>10</damageAmountBase>
-						<armorPenetrationSharp>30</armorPenetrationSharp>
-						<armorPenetrationBlunt>92.28</armorPenetrationBlunt>
-						<speed>228</speed>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base762x51mmNATOBullet">
-					<defName>Bullet_762x51mmUNSC_FMJ_DMR</defName>
-					<label>7.62mm UNSC bullet (FMJ)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>21</damageAmountBase>
-						<armorPenetrationSharp>11</armorPenetrationSharp>
-						<armorPenetrationBlunt>74.72</armorPenetrationBlunt>
-						<speed>184</speed>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base762x51mmNATOBullet">
-					<defName>Bullet_762x51mmUNSC_AP_DMR</defName>
-					<label>7.62mm UNSC bullet (AP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>13</damageAmountBase>
-						<armorPenetrationSharp>22</armorPenetrationSharp>
-						<armorPenetrationBlunt>74.72</armorPenetrationBlunt>
-						<speed>184</speed>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base762x51mmNATOBullet">
-					<defName>Bullet_762x51mmUNSC_HP_DMR</defName>
-					<label>7.62mm UNSC bullet (HP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>25</damageAmountBase>
-						<armorPenetrationSharp>5.5</armorPenetrationSharp>
-						<armorPenetrationBlunt>74.72</armorPenetrationBlunt>
-						<speed>184</speed>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base762x51mmNATOBullet">
-					<defName>Bullet_762x51mmUNSC_Shredder_DMR</defName>
-					<label>7.62mm UNSC bullet (Shredder)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>23</damageAmountBase>
-						<damageDef>Fragment</damageDef>
-						<armorPenetrationSharp>5.5</armorPenetrationSharp>
-						<armorPenetrationBlunt>74.72</armorPenetrationBlunt>
-						<speed>184</speed>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base762x51mmNATOBullet">
-					<defName>Bullet_762x51mmUNSC_Incendiary_DMR</defName>
-					<label>7.62mm UNSC bullet (AP-I)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>13</damageAmountBase>
-						<armorPenetrationSharp>22</armorPenetrationSharp>
-						<armorPenetrationBlunt>74.72</armorPenetrationBlunt>
-						<speed>184</speed>
-						<secondaryDamage>
-							<li>
-								<def>Flame_Secondary</def>
-								<amount>7</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base762x51mmNATOBullet">
-					<defName>Bullet_762x51mmUNSC_HE_DMR</defName>
-					<label>7.62mm UNSC bullet (HEDP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>21</damageAmountBase>
-						<armorPenetrationSharp>11</armorPenetrationSharp>
-						<armorPenetrationBlunt>74.72</armorPenetrationBlunt>
-						<speed>184</speed>
-						<secondaryDamage>
-							<li>
-								<def>Bomb_Secondary</def>
-								<amount>12</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base762x51mmNATOBullet">
-					<defName>Bullet_762x51mmUNSC_Sabot_DMR</defName>
-					<label>7.62mm UNSC bullet (Sabot)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>11</damageAmountBase>
-						<armorPenetrationSharp>33</armorPenetrationSharp>
-						<armorPenetrationBlunt>100.28</armorPenetrationBlunt>
-						<speed>228</speed>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="UNAmmoRecipeBase">
-					<defName>MakeAmmo_762x51mmUNSC_FMJ</defName>
-					<label>make 7.62x51mm UNSC (FMJ) cartridge x500</label>
-					<description>Craft 500 7.62x51mm UNSC (FMJ) cartridges.</description>
-					<jobString>Making 7.62x51mm UNSC (FMJ) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>26</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_762x51mmUNSC_FMJ>500</Ammo_762x51mmUNSC_FMJ>
-					</products>
-					<workAmount>3400</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="UNAmmoRecipeBase">
-					<defName>MakeAmmo_762x51mmUNSC_AP</defName>
-					<label>make 7.62x51mm UNSC (AP) cartridge x500</label>
-					<description>Craft 500 7.62x51mm UNSC (AP) cartridges.</description>
-					<jobString>Making 7.62x51mm UNSC (AP) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>26</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_762x51mmUNSC_AP>500</Ammo_762x51mmUNSC_AP>
-					</products>
-					<workAmount>3400</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="UNAmmoRecipeBase">
-					<defName>MakeAmmo_762x51mmUNSC_HP</defName>
-					<label>make 7.62x51mm UNSC (HP) cartridge x500</label>
-					<description>Craft 500 7.62x51mm UNSC (HP) cartridges.</description>
-					<jobString>Making 7.62x51mm UNSC (HP) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>26</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_762x51mmUNSC_HP>500</Ammo_762x51mmUNSC_HP>
-					</products>
-					<workAmount>3400</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="UNAmmoRecipeBase">
-					<defName>MakeAmmo_762x51mmUNSC_Shredder</defName>
-					<label>make 7.62x51mm UNSC (Shredder) cartridge x500</label>
-					<description>Craft 500 7.62x51mm UNSC (Shredder) cartridges.</description>
-					<jobString>Making 7.62x51mm UNSC (Shredder) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>30</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_762x51mmUNSC_Shredder>500</Ammo_762x51mmUNSC_Shredder>
-					</products>
-					<workAmount>4000</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AdvancedAmmoRecipeBase">
-					<defName>MakeAmmo_762x51mmUNSC_Incendiary</defName>
-					<label>make 7.62x51mm UNSC (AP-I) cartridge x500</label>
-					<description>Craft 500 7.62x51mm UNSC (AP-I) cartridges.</description>
-					<jobString>Making 7.62x51mm UNSC (AP-I) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>26</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>3</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Prometheum</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_762x51mmUNSC_Incendiary>500</Ammo_762x51mmUNSC_Incendiary>
-					</products>
-					<workAmount>5000</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AdvancedAmmoRecipeBase">
-					<defName>MakeAmmo_762x51mmUNSC_HE</defName>
-					<label>make 7.62x51mm UNSC (HEDP) cartridge x500</label>
-					<description>Craft 500 7.62x51mm UNSC (HEDP) cartridges.</description>
-					<jobString>Making 7.62x51mm UNSC (HEDP) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>26</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>5</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_762x51mmUNSC_HE>500</Ammo_762x51mmUNSC_HE>
-					</products>
-					<workAmount>6000</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AdvancedAmmoRecipeBase">
-					<defName>MakeAmmo_762x51mmUNSC_Sabot</defName>
-					<label>make 7.62x51mm UNSC (Sabot) cartridge x500</label>
-					<description>Craft 500 7.62x51mm UNSC (Sabot) cartridges.</description>
-					<jobString>Making 7.62x51mm UNSC (Sabot) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>16</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Uranium</li>
-								</thingDefs>
-							</filter>
-							<count>3</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Chemfuel</li>
-								</thingDefs>
-							</filter>
-							<count>3</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Uranium</li>
-							<li>Chemfuel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_762x51mmUNSC_Sabot>500</Ammo_762x51mmUNSC_Sabot>
-					</products>
-					<workAmount>4000</workAmount>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Halo Ammo/8 Gauge.xml b/Patches/Halo Ammo/8 Gauge.xml
deleted file mode 100644
index 9af6a1d3fa..0000000000
--- a/Patches/Halo Ammo/8 Gauge.xml	
+++ /dev/null
@@ -1,294 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Halo UNSC Weapon Pack</li>
-		</mods>
-
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>Ammo8Gauge</defName>
-					<label>8 gauge</label>
-					<parent>AmmoShotguns</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberShotgun</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_8GaugeUNSC</defName>
-					<label>8 Gauge</label>
-					<ammoTypes>
-						<Ammo_8Gauge_Buck>Bullet_8Gauge_Buck</Ammo_8Gauge_Buck>
-						<Ammo_8Gauge_Slug>Bullet_8Gauge_Slug</Ammo_8Gauge_Slug>
-						<Ammo_8Gauge_ElectroSlug>Bullet_8Gauge_ElectroSlug</Ammo_8Gauge_ElectroSlug>
-						<Ammo_8Gauge_Flechette>Bullet_8Gauge_Flechette</Ammo_8Gauge_Flechette>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="8GaugeBase" ParentName="MediumAmmoBase" Abstract="True">
-					<description>An uncommon, oversized shotgun shell used primarily in military application.</description>
-					<statBases>
-						<Mass>0.04</Mass>
-						<Bulk>0.08</Bulk>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting</li>
-					</tradeTags>
-					<thingCategories>
-						<li>Ammo8Gauge</li>
-					</thingCategories>
-					<stackLimit>3000</stackLimit>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="8GaugeBase">
-					<defName>Ammo_8Gauge_Buck</defName>
-					<label>Soellkraft 8 gauge shell (Buck)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Shotgun/Shot</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.2</MarketValue>
-					</statBases>
-					<ammoClass>BuckShot</ammoClass>
-					<cookOffProjectile>Bullet_8Gauge_Buck</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="8GaugeBase">
-					<defName>Ammo_8Gauge_Flechette</defName>
-					<label>Soellkraft 8 gauge shell (Flechette)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Shotgun/Shot</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.2</MarketValue>
-					</statBases>
-					<ammoClass>Sabot</ammoClass>
-					<cookOffProjectile>Bullet_8Gauge_Flechette</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="8GaugeBase">
-					<defName>Ammo_8Gauge_Slug</defName>
-					<label>Soellkraft 8 gauge shell (Slug)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Shotgun/Slug</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<Mass>0.08</Mass>
-						<MarketValue>0.3</MarketValue>
-					</statBases>
-					<ammoClass>Slug</ammoClass>
-					<cookOffProjectile>Bullet_8Gauge_Slug</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="8GaugeBase">
-					<defName>Ammo_8Gauge_ElectroSlug</defName>
-					<label>Soellkraft 8 gauge shell (EMP)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Shotgun/EMP</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<Mass>0.08</Mass>
-						<MarketValue>1.2</MarketValue>
-					</statBases>
-					<ammoClass>ElectroSlug</ammoClass>
-					<cookOffProjectile>Bullet_8Gauge_ElectroSlug</cookOffProjectile>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef ParentName="Base12GaugeBullet">
-					<defName>Bullet_8Gauge_Buck</defName>
-					<label>buckshot pellet</label>
-					<graphicData>
-						<texPath>Things/Projectile/Shotgun_Pellet</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>9</damageAmountBase>
-						<pelletCount>15</pelletCount>
-						<armorPenetrationSharp>5.5</armorPenetrationSharp>
-						<armorPenetrationBlunt>6.52</armorPenetrationBlunt>
-						<spreadMult>17.8</spreadMult>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base12GaugeBullet">
-					<defName>Bullet_8Gauge_Flechette</defName>
-					<label>Flechette</label>
-					<graphicData>
-						<texPath>Things/Projectile/Shotgun_Pellet</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>5</damageAmountBase>
-						<pelletCount>15</pelletCount>
-						<armorPenetrationSharp>11</armorPenetrationSharp>
-						<armorPenetrationBlunt>7.52</armorPenetrationBlunt>
-						<spreadMult>17.8</spreadMult>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base12GaugeBullet">
-					<defName>Bullet_8Gauge_Slug</defName>
-					<label>shotgun slug</label>
-					<graphicData>
-						<texPath>Things/Projectile/Bullet_big</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>114</speed>
-						<damageAmountBase>39</damageAmountBase>
-						<armorPenetrationSharp>8</armorPenetrationSharp>
-						<armorPenetrationBlunt>98.2</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base12GaugeBullet">
-					<defName>Bullet_8Gauge_ElectroSlug</defName>
-					<label>EMP slug</label>
-					<graphicData>
-						<texPath>Things/Projectile/Bullet_big</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>54</speed>
-						<damageDef>EMP</damageDef>
-						<damageAmountBase>22</damageAmountBase>
-						<armorPenetrationSharp>0</armorPenetrationSharp>
-						<armorPenetrationBlunt>0</armorPenetrationBlunt>
-						<empShieldBreakChance>0.35</empShieldBreakChance>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== Recipe ========================== -->
-
-				<RecipeDef ParentName="UNAmmoRecipeBase">
-					<defName>MakeAmmo_8Gauge_Buck</defName>
-					<label>make 8 gauge (Buck) shell x200</label>
-					<description>Craft 200 8 gauge (Buck) shells.</description>
-					<jobString>Making 8 gauge (Buck) shells.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>20</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_8Gauge_Buck>200</Ammo_8Gauge_Buck>
-					</products>
-					<workAmount>2500</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="UNAmmoRecipeBase">
-					<defName>MakeAmmo_8Gauge_Slug</defName>
-					<label>make 8 gauge (Slug) shell x200</label>
-					<description>Craft 200 8 gauge (Slug) shells.</description>
-					<jobString>Making 8 gauge (Slug) shells.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>36</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_8Gauge_Slug>200</Ammo_8Gauge_Slug>
-					</products>
-					<workAmount>4000</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AdvancedAmmoRecipeBase">
-					<defName>MakeAmmo_8Gauge_Flechette</defName>
-					<label>make 8 gauge (Flechette) shell x200</label>
-					<description>Craft 200 8 gauge (Flechette) shells.</description>
-					<jobString>Making 8 gauge (Flechette) shells.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>30</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_8Gauge_Flechette>200</Ammo_8Gauge_Flechette>
-					</products>
-					<workAmount>9000</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="UNAmmoRecipeBase">
-					<defName>MakeAmmo_8Gauge_ElectroSlug</defName>
-					<label>make 8 gauge (EMP) shell x200</label>
-					<description>Craft 200 8 gauge (EMP) shells.</description>
-					<jobString>Making 8 gauge (EMP) shells.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>36</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>6</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_8Gauge_ElectroSlug>200</Ammo_8Gauge_ElectroSlug>
-					</products>
-					<workAmount>9000</workAmount>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Halo Ammo/9.5x40mm.xml b/Patches/Halo Ammo/9.5x40mm.xml
deleted file mode 100644
index 90db163280..0000000000
--- a/Patches/Halo Ammo/9.5x40mm.xml	
+++ /dev/null
@@ -1,421 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Halo UNSC Weapon Pack</li>
-		</mods>
-
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>Ammo95x40mmUNSC</defName>
-					<label>9.5x40mm UNSC</label>
-					<parent>AmmoRifles</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_95x40mmUNSC</defName>
-					<label>9.5x40mm UNSC</label>
-					<ammoTypes>
-						<Ammo_95x40mmUNSC_FMJ>Bullet_95x40mmUNSC_FMJ</Ammo_95x40mmUNSC_FMJ>
-						<Ammo_95x40mmUNSC_AP>Bullet_95x40mmUNSC_AP</Ammo_95x40mmUNSC_AP>
-						<Ammo_95x40mmUNSC_HP>Bullet_95x40mmUNSC_HP</Ammo_95x40mmUNSC_HP>
-						<Ammo_95x40mmUNSC_Incendiary>Bullet_95x40mmUNSC_Incendiary</Ammo_95x40mmUNSC_Incendiary>
-						<Ammo_95x40mmUNSC_HE>Bullet_95x40mmUNSC_HE</Ammo_95x40mmUNSC_HE>
-						<Ammo_95x40mmUNSC_Sabot>Bullet_95x40mmUNSC_Sabot</Ammo_95x40mmUNSC_Sabot>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="95x40mmUNSCBase" ParentName="SmallAmmoBase" Abstract="True">
-					<description>A relatively rare large diameter rifle cartridge, advanced propellents allow it to be shortened consideraly without any loss of power. It is currently only used by UNSC battlerifles.</description>
-					<statBases>
-						<Mass>0.024</Mass>
-						<Bulk>0.02</Bulk>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting</li>
-					</tradeTags>
-					<thingCategories>
-						<li>Ammo95x40mmUNSC</li>
-					</thingCategories>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="95x40mmUNSCBase">
-					<defName>Ammo_95x40mmUNSC_FMJ</defName>
-					<label>9.5x40mm UNSC cartridge (FMJ)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/FMJ</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.12</MarketValue>
-					</statBases>
-					<ammoClass>FullMetalJacket</ammoClass>
-					<generateAllowChance>0.4</generateAllowChance>
-					<cookOffProjectile>Bullet_95x40mmUNSC_FMJ</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="95x40mmUNSCBase">
-					<defName>Ammo_95x40mmUNSC_AP</defName>
-					<label>9.5x40mm UNSC cartridge (AP)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/AP</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.12</MarketValue>
-					</statBases>
-					<ammoClass>ArmorPiercing</ammoClass>
-					<generateAllowChance>0.4</generateAllowChance>
-					<cookOffProjectile>Bullet_95x40mmUNSC_AP</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="95x40mmUNSCBase">
-					<defName>Ammo_95x40mmUNSC_HP</defName>
-					<label>9.5x40mm UNSC cartridge (HP)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/HP</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.12</MarketValue>
-					</statBases>
-					<ammoClass>HollowPoint</ammoClass>
-					<generateAllowChance>0.1</generateAllowChance>
-					<cookOffProjectile>Bullet_95x40mmUNSC_HP</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="95x40mmUNSCBase">
-					<defName>Ammo_95x40mmUNSC_Incendiary</defName>
-					<label>9.5x40mm UNSC cartridge (AP-I)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/Incendiary</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.17</MarketValue>
-					</statBases>
-					<ammoClass>IncendiaryAP</ammoClass>
-					<generateAllowChance>0.2</generateAllowChance>
-					<cookOffProjectile>Bullet_95x40mmUNSC_Incendiary</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="95x40mmUNSCBase">
-					<defName>Ammo_95x40mmUNSC_HE</defName>
-					<label>9.5x40mm UNSC cartridge (HEDP)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/HE</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.20</MarketValue>
-					</statBases>
-					<ammoClass>ExplosiveAP</ammoClass>
-					<generateAllowChance>0.2</generateAllowChance>
-					<cookOffProjectile>Bullet_95x40mmUNSC_HE</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="95x40mmUNSCBase">
-					<defName>Ammo_95x40mmUNSC_Sabot</defName>
-					<label>9.5x40mm UNSC cartridge (Sabot)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/Sabot</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.13</MarketValue>
-						<Mass>0.02</Mass>
-					</statBases>
-					<ammoClass>Sabot</ammoClass>
-					<generateAllowChance>0.2</generateAllowChance>
-					<cookOffProjectile>Bullet_95x40mmUNSC_Sabot</cookOffProjectile>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef ParentName="Base762x51mmNATOBullet">
-					<defName>Bullet_95x40mmUNSC_FMJ</defName>
-					<label>9.5mm UNSC bullet (FMJ)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>23</damageAmountBase>
-						<armorPenetrationSharp>12</armorPenetrationSharp>
-						<armorPenetrationBlunt>80.72</armorPenetrationBlunt>
-						<speed>176</speed>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base762x51mmNATOBullet">
-					<defName>Bullet_95x40mmUNSC_AP</defName>
-					<label>9.5mm UNSC bullet (AP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>15</damageAmountBase>
-						<armorPenetrationSharp>24</armorPenetrationSharp>
-						<armorPenetrationBlunt>80.72</armorPenetrationBlunt>
-						<speed>176</speed>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base762x51mmNATOBullet">
-					<defName>Bullet_95x40mmUNSC_HP</defName>
-					<label>9.5mm UNSC bullet (HP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>28</damageAmountBase>
-						<armorPenetrationSharp>6</armorPenetrationSharp>
-						<armorPenetrationBlunt>80.72</armorPenetrationBlunt>
-						<speed>176</speed>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base762x51mmNATOBullet">
-					<defName>Bullet_95x40mmUNSC_Incendiary</defName>
-					<label>9.5mm UNSC bullet (AP-I)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>15</damageAmountBase>
-						<armorPenetrationSharp>24</armorPenetrationSharp>
-						<armorPenetrationBlunt>80.72</armorPenetrationBlunt>
-						<speed>176</speed>
-						<secondaryDamage>
-							<li>
-								<def>Flame_Secondary</def>
-								<amount>8</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base762x51mmNATOBullet">
-					<defName>Bullet_95x40mmUNSC_HE</defName>
-					<label>9.5mm UNSC bullet (HEDP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>23</damageAmountBase>
-						<armorPenetrationSharp>12</armorPenetrationSharp>
-						<armorPenetrationBlunt>80.72</armorPenetrationBlunt>
-						<speed>176</speed>
-						<secondaryDamage>
-							<li>
-								<def>Bomb_Secondary</def>
-								<amount>13</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base762x51mmNATOBullet">
-					<defName>Bullet_95x40mmUNSC_Sabot</defName>
-					<label>9.5mm UNSC bullet (Sabot)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>11</damageAmountBase>
-						<armorPenetrationSharp>35</armorPenetrationSharp>
-						<armorPenetrationBlunt>101.28</armorPenetrationBlunt>
-						<speed>228</speed>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="UNAmmoRecipeBase">
-					<defName>MakeAmmo_95x40mmUNSC_FMJ</defName>
-					<label>make 9.5x40mm UNSC (FMJ) cartridge x500</label>
-					<description>Craft 500 9.5x40mm UNSC (FMJ) cartridges.</description>
-					<jobString>Making 9.5x40mm UNSC (FMJ) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>29</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_95x40mmUNSC_FMJ>500</Ammo_95x40mmUNSC_FMJ>
-					</products>
-					<workAmount>5000</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="UNAmmoRecipeBase">
-					<defName>MakeAmmo_95x40mmUNSC_AP</defName>
-					<label>make 9.5x40mm UNSC (AP) cartridge x500</label>
-					<description>Craft 500 9.5x40mm UNSC (AP) cartridges.</description>
-					<jobString>Making 9.5x40mm UNSC (AP) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>29</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_95x40mmUNSC_AP>500</Ammo_95x40mmUNSC_AP>
-					</products>
-					<workAmount>5000</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="UNAmmoRecipeBase">
-					<defName>MakeAmmo_95x40mmUNSC_HP</defName>
-					<label>make 9.5x40mm UNSC (HP) cartridge x500</label>
-					<description>Craft 500 9.5x40mm UNSC (HP) cartridges.</description>
-					<jobString>Making 9.5x40mm UNSC (HP) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>29</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_95x40mmUNSC_HP>500</Ammo_95x40mmUNSC_HP>
-					</products>
-					<workAmount>5000</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AdvancedAmmoRecipeBase">
-					<defName>MakeAmmo_95x40mmUNSC_Incendiary</defName>
-					<label>make 9.5x40mm UNSC (AP-I) cartridge x500</label>
-					<description>Craft 500 9.5x40mm UNSC (AP-I) cartridges.</description>
-					<jobString>Making 9.5x40mm UNSC (AP-I) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>29</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>3</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Prometheum</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_95x40mmUNSC_Incendiary>500</Ammo_95x40mmUNSC_Incendiary>
-					</products>
-					<workAmount>6900</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AdvancedAmmoRecipeBase">
-					<defName>MakeAmmo_95x40mmUNSC_HE</defName>
-					<label>make 9.5x40mm UNSC (HEDP) cartridge x500</label>
-					<description>Craft 500 9.5x40mm UNSC (HEDP) cartridges.</description>
-					<jobString>Making 9.5x40mm UNSC (HEDP) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>29</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>5</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_95x40mmUNSC_HE>500</Ammo_95x40mmUNSC_HE>
-					</products>
-					<workAmount>6900</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AdvancedAmmoRecipeBase">
-					<defName>MakeAmmo_95x40mmUNSC_Sabot</defName>
-					<label>make 9.5x40mm UNSC (Sabot) cartridge x500</label>
-					<description>Craft 500 9.5x40mm UNSC (Sabot) cartridges.</description>
-					<jobString>Making 9.5x40mm UNSC (Sabot) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>18</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Uranium</li>
-								</thingDefs>
-							</filter>
-							<count>4</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Chemfuel</li>
-								</thingDefs>
-							</filter>
-							<count>3</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Uranium</li>
-							<li>Chemfuel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_95x40mmUNSC_Sabot>500</Ammo_95x40mmUNSC_Sabot>
-					</products>
-					<workAmount>5000</workAmount>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Halo Ammo/Ammo_UNSC_Misc.xml b/Patches/Halo Ammo/Ammo_UNSC_Misc.xml
deleted file mode 100644
index 89e9fac048..0000000000
--- a/Patches/Halo Ammo/Ammo_UNSC_Misc.xml	
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Halo UNSC Weapon Pack</li>
-		</mods>
-
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<RecipeDef Name="UNAmmoRecipeBase" ParentName="AmmoRecipeBase" Abstract="true">
-					<researchPrerequisite>MicroelectronicsBasics</researchPrerequisite>
-				</RecipeDef>
-
-				<CombatExtended.AmmoCategoryDef>
-					<defName>Shredder</defName>
-					<label>Shredder</label>
-					<labelShort>Shredder</labelShort>
-					<description>Splinters on impact in many small fragments, tearing through light armor and "shredding" targets into ribbons. Increasing tissue damage at the cost of armor penetration.</description>
-				</CombatExtended.AmmoCategoryDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Halo UNSC Weapon Pack/UNSC_CE.xml b/Patches/Halo UNSC Weapon Pack/UNSC_CE.xml
deleted file mode 100644
index b4a3b015f7..0000000000
--- a/Patches/Halo UNSC Weapon Pack/UNSC_CE.xml	
+++ /dev/null
@@ -1,775 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Halo UNSC Weapon Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ResearchProjectDef[defName="UNSC_RocketLauncher"]/prerequisites</xpath>
-					<value>
-						<prerequisites>
-							<li>CE_Launchers</li>
-							<li>Basic_UNSCWeapons</li>
-						</prerequisites>
-					</value>
-				</li>
-
-				<!-- ========== Melee Tools ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="M7_SubmachineGun" or defName="M6D_Personal_Defense_Weapon_System"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MA5D_ICWS" or defName="BR85_Service_Rifle" or defName="M90-CAWS_Shotgun"
-						or defName="SRS99C-S2_AM" or defName="M392_Designated_Marksman_Rifle" or defName="M41_SSR_MAV_AW" or defName="M319_Individual_Grenade_Launcher" or defName="M739_SAW" or defName="Asymmetric_Recoilless_Carbine" or defName="W-AV_M6_G-NR"]/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>7</power>
-								<cooldownTime>1.55</cooldownTime>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='M6D_Personal_Defense_Weapon_System' or defName='M7_SubmachineGun' or defName='M319_Individual_Grenade_Launcher']/recipeMaker/skillRequirements</xpath>
-					<value>
-						<skillRequirements>
-							<Crafting>5</Crafting>
-						</skillRequirements>
-					</value>
-				</li>
-
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='MA5D_ICWS' or defName='BR85_Service_Rifle' or defName='M392_Designated_Marksman_Rifle']/recipeMaker/skillRequirements</xpath>
-					<value>
-						<skillRequirements>
-							<Crafting>6</Crafting>
-						</skillRequirements>
-					</value>
-				</li>
-
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='SRS99C-S2_AM' or defName='M739_SAW' or defName='Asymmetric_Recoilless_Carbine']/recipeMaker/skillRequirements</xpath>
-					<value>
-						<skillRequirements>
-							<Crafting>7</Crafting>
-						</skillRequirements>
-					</value>
-				</li>
-
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='W-AV_M6_G-NR']/recipeMaker/skillRequirements</xpath>
-					<value>
-						<skillRequirements>
-							<Crafting>8</Crafting>
-						</skillRequirements>
-					</value>
-				</li>
-
-				<li Class='PatchOperationRemove'>
-					<xpath>Defs/ThingDef[defName='SRS99C-S2_AM' or defName='M739_SAW' or defName='Asymmetric_Recoilless_Carbine' or defName='MA5D_ICWS' or defName='BR85_Service_Rifle' or defName='M392_Designated_Marksman_Rifle' or defName='W-AV_M6_G-NR' or defName='M6D_Personal_Defense_Weapon_System' or defName='M7_SubmachineGun' or defName='M319_Individual_Grenade_Launcher' or defName='M41_SSR_MAV_AW'or defName='M90-CAWS_Shotgun']/statBases/MarketValue</xpath>
-				</li>
-
-				<!-- === Spartan Laser === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>W-AV_M6_G-NR</defName>
-					<statBases>
-						<WorkToMake>100000</WorkToMake>
-						<Mass>19.07</Mass>
-						<Bulk>18.00</Bulk>
-						<SwayFactor>2</SwayFactor>
-						<ShotSpread>0.01</ShotSpread>
-						<SightsEfficiency>2.25</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.6</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>100</Steel>
-						<Chemfuel>60</Chemfuel>
-						<Plasteel>100</Plasteel>
-						<ComponentSpacer>6</ComponentSpacer>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Laser_SpartanLaserInf</defaultProjectile>
-						<warmupTime>2.6</warmupTime>
-						<range>86</range>
-						<soundCast>Shot_SpartanLaser</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>18</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>4</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_SpartanLaserInf</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- === Spartan Laser Beam === -->
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletRed">
-							<defName>Bullet_Laser_SpartanLaserInf</defName>
-							<label>laser beam</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>CE_Laser</damageDef>
-								<damageAmountBase>100</damageAmountBase>
-								<armorPenetrationSharp>600</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Burn</def>
-										<amount>100</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>100</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>1.0</explosiveRadius>
-									<explosionSound>MortarBomb_Explode</explosionSound>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-							</comps>
-							<seam>2</seam>
-						</ThingDef>
-
-						<!-- === Spartan Laser Battery === -->
-
-						<ThingCategoryDef>
-							<defName>AmmoHeavyLaserChargePack</defName>
-							<label>heavy laser charge pack</label>
-							<parent>AmmoAdvanced</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_SpartanLaserInf</defName>
-							<label>Spartan laser battery cell</label>
-							<ammoTypes>
-								<Ammo_HeavyLaserChargePack>Bullet_Laser_SpartanLaserInf</Ammo_HeavyLaserChargePack>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="HeavyLaserChargePackBase" ParentName="SpacerMediumAmmoBase" Abstract="True">
-							<description>A battery pack for a heavy laser weapon.</description>
-							<statBases>
-								<Mass>0.5</Mass>
-								<Bulk>1</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade_Sellable</li>
-								<li>CE_AutoEnableCrafting_FabricationBench</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoHeavyLaserChargePack</li>
-							</thingCategories>
-							<stackLimit>200</stackLimit>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="LaserChargePackBase">
-							<defName>Ammo_HeavyLaserChargePack</defName>
-							<label>heavy laser charge pack</label>
-							<graphicData>
-								<texPath>Things/Ammo/PlasmaCell/Heavy</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>10.69</MarketValue>
-							</statBases>
-							<ammoClass>Charged</ammoClass>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_HeavyLaserChargePack</defName>
-							<label>make laser charge pack x10</label>
-							<description>Craft 10 laser charge pack.</description>
-							<jobString>Making laser charge pack.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>6</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Plasteel</li>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_HeavyLaserChargePack>10</Ammo_HeavyLaserChargePack>
-							</products>
-							<workAmount>8400</workAmount>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-				<!-- ========== MA5C ========== -->
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>MA5D_ICWS</defName>
-					<statBases>
-						<WorkToMake>31000</WorkToMake>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>8</Bulk>
-						<Mass>3.8</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmUNSC_FMJ</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>Shot_MA5D</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-						<recoilAmount>1.8</recoilAmount>
-					</Properties>
-					<costList>
-						<Steel>60</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-						<Chemfuel>20</Chemfuel>
-					</costList>
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_762x51mmUNSC</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- ========== BR85 ========== -->
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>BR85_Service_Rifle</defName>
-					<statBases>
-						<WorkToMake>35000</WorkToMake>
-						<SightsEfficiency>1.5</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.4</SwayFactor>
-						<Bulk>8</Bulk>
-						<Mass>3.8</Mass>
-						<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_95x40mmUNSC_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>60</range>
-						<soundCast>Shot_BattleRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilAmount>1.67</recoilAmount>
-					</Properties>
-					<costList>
-						<Steel>60</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-						<Chemfuel>20</Chemfuel>
-					</costList>
-					<AmmoUser>
-						<magazineSize>36</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_95x40mmUNSC</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== SAW ========== -->
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>M739_SAW</defName>
-					<statBases>
-						<WorkToMake>56000</WorkToMake>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.43</SwayFactor>
-						<Bulk>12</Bulk>
-						<Mass>6</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmUNSC_FMJ</defaultProjectile>
-						<warmupTime>1.25</warmupTime>
-						<range>62</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>Shot_SAW</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-						<recoilAmount>1.33</recoilAmount>
-					</Properties>
-					<costList>
-						<Steel>90</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-						<Chemfuel>30</Chemfuel>
-					</costList>
-					<AmmoUser>
-						<magazineSize>128</magazineSize>
-						<reloadTime>6.0</reloadTime>
-						<ammoSet>AmmoSet_762x51mmUNSC</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- ========== M-7 ========== -->
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>M7_SubmachineGun</defName>
-					<statBases>
-						<WorkToMake>18000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.24</SwayFactor>
-						<Bulk>3.75</Bulk>
-						<Mass>1.8</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_5x23mmCaseless_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>26</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>Shot_SMG</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-						<recoilAmount>1.17</recoilAmount>
-					</Properties>
-					<costList>
-						<Steel>35</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-						<Chemfuel>10</Chemfuel>
-					</costList>
-					<AmmoUser>
-						<magazineSize>60</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_5x23mmCaseless</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== SRS99 ========== -->
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>SRS99C-S2_AM</defName>
-					<statBases>
-						<WorkToMake>56000</WorkToMake>
-						<SightsEfficiency>3.5</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.88</SwayFactor>
-						<Bulk>15.0</Bulk>
-						<Mass>8.20</Mass>
-						<RangedWeapon_Cooldown>1.0</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_145x114mmUNSC_FMJ</defaultProjectile>
-						<warmupTime>3.2</warmupTime>
-						<range>90</range>
-						<soundCast>Shot_SRS99C-S2_AM</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<costList>
-						<Steel>80</Steel>
-						<Plasteel>20</Plasteel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-						<Chemfuel>30</Chemfuel>
-					</costList>
-					<AmmoUser>
-						<magazineSize>4</magazineSize>
-						<reloadTime>4.8</reloadTime>
-						<ammoSet>AmmoSet_145x114mmUNSC</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== Shotgun ========== -->
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>M90-CAWS_Shotgun</defName>
-					<statBases>
-						<WorkToMake>25000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.28</SwayFactor>
-						<Bulk>8</Bulk>
-						<Mass>3.4</Mass>
-						<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_8Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>18</range>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<costList>
-						<Steel>60</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-						<Chemfuel>20</Chemfuel>
-					</costList>
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_8GaugeUNSC</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>False</aiUseBurstMode>
-					</FireModes>
-				</li>
-
-				<!-- ==========heavy Magnum ========== -->
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>M6D_Personal_Defense_Weapon_System</defName>
-					<statBases>
-						<WorkToMake>13000</WorkToMake>
-						<SightsEfficiency>0.75</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.35</SwayFactor>
-						<Bulk>2.5</Bulk>
-						<Mass>1</Mass>
-						<RangedWeapon_Cooldown>0.48</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_127x40mm_FMJ</defaultProjectile>
-						<warmupTime>0.66</warmupTime>
-						<range>15</range>
-						<soundCast>Shot_Magnum</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-						<Chemfuel>10</Chemfuel>
-					</costList>
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_127x40mmUNSC</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>False</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Grenadier === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>M319_Individual_Grenade_Launcher</defName>
-					<statBases>
-						<WorkToMake>12000</WorkToMake>
-						<Mass>3</Mass>
-						<Bulk>7.0</Bulk>
-						<SwayFactor>1</SwayFactor>
-						<ShotSpread>0.12</ShotSpread>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>50</Steel>
-						<Chemfuel>20</Chemfuel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_40mmGrenade_UNSCHEDP</defaultProjectile>
-						<burstShotCount>1</burstShotCount>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<ai_AvoidFriendlyFireRadius>4</ai_AvoidFriendlyFireRadius>
-						<minRange>4</minRange>
-						<soundCast>Shot_Halo_GrenadeLauncher</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<magazineSize>1</magazineSize>
-						<reloadTime>2</reloadTime>
-						<ammoSet>AmmoSet_40mmGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- === Railgun === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Asymmetric_Recoilless_Carbine</defName>
-					<statBases>
-						<WorkToMake>60000</WorkToMake>
-						<Mass>14.9</Mass>
-						<Bulk>12.0</Bulk>
-						<SwayFactor>1.5</SwayFactor>
-						<ShotSpread>0.01</ShotSpread>
-						<SightsEfficiency>1.6</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>60</Steel>
-						<Chemfuel>40</Chemfuel>
-						<Plasteel>50</Plasteel>
-						<ComponentSpacer>2</ComponentSpacer>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_16x65mm_HE</defaultProjectile>
-						<burstShotCount>1</burstShotCount>
-						<warmupTime>1.45</warmupTime>
-						<range>78</range>
-						<minRange>1.5</minRange>
-						<soundCast>Shot_Halo_Railgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-							<canTargetPawns>true</canTargetPawns>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>2</reloadTime>
-						<ammoSet>AmmoSet_16x65mm</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- === Rocket Launcher === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>M41_SSR_MAV_AW</defName>
-					<statBases>
-						<WorkToMake>45000</WorkToMake>
-						<Mass>8</Mass>
-						<Bulk>12.0</Bulk>
-						<SwayFactor>2</SwayFactor>
-						<ShotSpread>0.03</ShotSpread>
-						<SightsEfficiency>2</SightsEfficiency>
-						<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>100</Steel>
-						<Chemfuel>30</Chemfuel>
-						<Plasteel>20</Plasteel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_M41Rocket_HEAT</defaultProjectile>
-						<burstShotCount>1</burstShotCount>
-						<warmupTime>2</warmupTime>
-						<range>62</range>
-						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-						<minRange>4</minRange>
-						<soundCast>Shot_Halo_Rocketlauncher</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<onlyManualCast>True</onlyManualCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-							<canTargetPawns>true</canTargetPawns>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<magazineSize>2</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_M41Rocket</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== M392 DMR========== -->
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>M392_Designated_Marksman_Rifle</defName>
-					<statBases>
-						<WorkToMake>35000</WorkToMake>
-						<SightsEfficiency>2.4</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.47</SwayFactor>
-						<Bulk>10.0</Bulk>
-						<Mass>4.40</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmUNSC_FMJ_DMR</defaultProjectile>
-						<burstShotCount>2</burstShotCount>
-						<ticksBetweenBurstShots>45</ticksBetweenBurstShots>
-						<recoilAmount>1.56</recoilAmount>
-						<warmupTime>1.2</warmupTime>
-						<range>72</range>
-						<soundCast>Shot_DMR</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<costList>
-						<Steel>60</Steel>
-						<Chemfuel>20</Chemfuel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_762x51mmUNSC_DMR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Heavy Melee Weapons/ThingDefs_Misc/Weapons.xml b/Patches/Heavy Melee Weapons/ThingDefs_Misc/Weapons.xml
deleted file mode 100644
index 39c2f2e82d..0000000000
--- a/Patches/Heavy Melee Weapons/ThingDefs_Misc/Weapons.xml	
+++ /dev/null
@@ -1,466 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Heavy Melee Weapons</li>
-					<li>Heavy Melee Weapons (Continued)</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!-- ==========  Maul  =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_PsychicWarhammer" or
-								defName="HMW_MeleeWeapon_PersonaPsychicWarhammer"]/tools </xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>4</power>
-										<cooldownTime>1.78</cooldownTime>
-										<armorPenetrationBlunt>1</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>40</power>
-										<cooldownTime>2.75</cooldownTime>
-										<chanceFactor>1.5</chanceFactor>
-										<armorPenetrationBlunt>1200</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_PsychicWarhammer"]/statBases</xpath>
-							<value>
-								<MeleeCounterParryBonus>0.10</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_PsychicWarhammer"]/equippedStatOffsets</xpath>
-							<value>
-								<MeleeCritChance>0.05</MeleeCritChance>
-								<MeleeParryChance>0.50</MeleeParryChance>
-								<MeleeDodgeChance>0.05</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_PersonaPsychicWarhammer"]/statBases</xpath>
-							<value>
-								<MeleeCounterParryBonus>0.30</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_PersonaPsychicWarhammer"]/equippedStatOffsets</xpath>
-							<value>
-								<MeleeCritChance>0.25</MeleeCritChance>
-								<MeleeParryChance>0.70</MeleeParryChance>
-								<MeleeDodgeChance>0.25</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_PsychicWarhammer" or
-								defName="HMW_MeleeWeapon_PersonaPsychicWarhammer"]/statBases/Mass </xpath>
-							<value>
-								<Mass>25</Mass>
-								<Bulk>20</Bulk>
-							</value>
-						</li>
-
-						<!-- ==========  Heavy Monosword  =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_HeavyMonoSword" or
-								defName="HMW_MeleeWeapon_PersonaHeavyMonoSword"]/tools </xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>9</power>
-										<cooldownTime>1.32</cooldownTime>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationBlunt>3.375</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>point</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>29</power>
-										<cooldownTime>3.12</cooldownTime>
-										<chanceFactor>1.2</chanceFactor>
-										<armorPenetrationBlunt>5.415</armorPenetrationBlunt>
-										<armorPenetrationSharp>67.7</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>edge</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>80</power>
-										<cooldownTime>3.36</cooldownTime>
-										<chanceFactor>1</chanceFactor>
-										<armorPenetrationBlunt>12.5</armorPenetrationBlunt>
-										<armorPenetrationSharp>35.72</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_HeavyMonoSword"]/statBases</xpath>
-							<value>
-								<MeleeCounterParryBonus>0.10</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_HeavyMonoSword"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.05</MeleeCritChance>
-									<MeleeParryChance>0.50</MeleeParryChance>
-									<MeleeDodgeChance>0.05</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_PersonaHeavyMonoSword"]/statBases</xpath>
-							<value>
-								<MeleeCounterParryBonus>0.30</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_PersonaHeavyMonoSword"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.25</MeleeCritChance>
-									<MeleeParryChance>0.70</MeleeParryChance>
-									<MeleeDodgeChance>0.25</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_HeavyMonoSword" or
-								defName="HMW_MeleeWeapon_PersonaHeavyMonoSword"]/statBases/Mass </xpath>
-							<value>
-								<Mass>25</Mass>
-								<Bulk>20</Bulk>
-							</value>
-						</li>
-
-						<!-- ==========  Zeusblade  =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_ZeusSword" or
-								defName="HMW_MeleeWeapon_PersonaZeusSword"]/tools </xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>Point</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>38</power>
-										<extraMeleeDamages>
-											<li>
-												<def>EMP</def>
-												<amount>15</amount>
-											</li>
-										</extraMeleeDamages>
-										<cooldownTime>3.12</cooldownTime>
-										<chanceFactor>1</chanceFactor>
-										<armorPenetrationBlunt>5.415</armorPenetrationBlunt>
-										<armorPenetrationSharp>43.32</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>blade</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>68</power>
-										<extraMeleeDamages>
-											<li>
-												<def>EMP</def>
-												<amount>15</amount>
-											</li>
-										</extraMeleeDamages>
-										<cooldownTime>3.94</cooldownTime>
-										<chanceFactor>1</chanceFactor>
-										<armorPenetrationBlunt>9.68</armorPenetrationBlunt>
-										<armorPenetrationSharp>32.7</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-											<li>Blunt</li>
-										</capacities>
-										<power>24</power>
-										<cooldownTime>1.12</cooldownTime>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationBlunt>4.05</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_ZeusSword"]/statBases</xpath>
-							<value>
-								<MeleeCounterParryBonus>0.10</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_ZeusSword"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.05</MeleeCritChance>
-									<MeleeParryChance>0.50</MeleeParryChance>
-									<MeleeDodgeChance>0.05</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_PersonaZeusSword"]/statBases</xpath>
-							<value>
-								<MeleeCounterParryBonus>0.30</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_PersonaZeusSword"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.25</MeleeCritChance>
-									<MeleeParryChance>0.70</MeleeParryChance>
-									<MeleeDodgeChance>0.25</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_ZeusSword" or
-								defName="HMW_MeleeWeapon_PersonaZeusSword"]/statBases/Mass </xpath>
-							<value>
-								<Mass>25</Mass>
-								<Bulk>20</Bulk>
-							</value>
-						</li>
-
-						<!-- ==========  Flame Lance  =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_FlameLance" or
-								defName="HMW_MeleeWeapon_PersonaFlameLance"]/tools </xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>Point</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>48</power>
-										<extraMeleeDamages>
-											<li>
-												<def>Flame</def>
-												<amount>10</amount>
-											</li>
-										</extraMeleeDamages>
-										<cooldownTime>3.91</cooldownTime>
-										<chanceFactor>1</chanceFactor>
-										<armorPenetrationBlunt>9.72</armorPenetrationBlunt>
-										<armorPenetrationSharp>97.2</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>blade</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>55</power>
-										<extraMeleeDamages>
-											<li>
-												<def>Flame</def>
-												<amount>10</amount>
-											</li>
-										</extraMeleeDamages>
-										<cooldownTime>3.68</cooldownTime>
-										<chanceFactor>1</chanceFactor>
-										<armorPenetrationBlunt>9.68</armorPenetrationBlunt>
-										<armorPenetrationSharp>27.6</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>9</power>
-										<cooldownTime>1.32</cooldownTime>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationBlunt>3.375</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_FlameLance"]/statBases</xpath>
-							<value>
-								<MeleeCounterParryBonus>0.10</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_FlameLance"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.05</MeleeCritChance>
-									<MeleeParryChance>0.50</MeleeParryChance>
-									<MeleeDodgeChance>0.05</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_PersonaFlameLance"]/statBases</xpath>
-							<value>
-								<MeleeCounterParryBonus>0.30</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_PersonaFlameLance"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.25</MeleeCritChance>
-									<MeleeParryChance>0.70</MeleeParryChance>
-									<MeleeDodgeChance>0.25</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_FlameLance" or
-								defName="HMW_MeleeWeapon_PersonaFlameLance"]/statBases/Mass </xpath>
-							<value>
-								<Mass>25</Mass>
-								<Bulk>20</Bulk>
-							</value>
-						</li>
-
-						<!-- ==========  Heavy Zeushammer  =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_HeavyZeushammer"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>4</power>
-										<cooldownTime>1.78</cooldownTime>
-										<armorPenetrationBlunt>1</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>72</power>
-										<extraMeleeDamages>
-											<li>
-												<def>EMP</def>
-												<amount>20</amount>
-											</li>
-										</extraMeleeDamages>
-										<cooldownTime>5.17</cooldownTime>
-										<chanceFactor>1.5</chanceFactor>
-										<armorPenetrationBlunt>412.5</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_HeavyZeushammer"]/statBases</xpath>
-							<value>
-								<MeleeCounterParryBonus>0.10</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_HeavyZeushammer"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.05</MeleeCritChance>
-									<MeleeParryChance>0.50</MeleeParryChance>
-									<MeleeDodgeChance>0.05</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-						<!--		
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_PersonaHeavyZeushammer"]/statBases</xpath>
-				<value>
-					<MeleeCounterParryBonus>0.30</MeleeCounterParryBonus>
-				</value>
-			</li>
-			
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_PersonaHeavyZeushammer"]</xpath>
-				<value>
-					<equippedStatOffsets>
-					  <MeleeCritChance>0.25</MeleeCritChance>
-					  <MeleeParryChance>0.70</MeleeParryChance>
-					  <MeleeDodgeChance>0.25</MeleeDodgeChance>
-					</equippedStatOffsets>
-				</value>
-			</li>
-	-->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HMW_MeleeWeapon_HeavyZeushammer"]/statBases/Mass</xpath>
-							<value>
-								<Mass>25</Mass>
-								<Bulk>20</Bulk>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Heyra the Horned/Bodydef/Heyra_Bodytype.xml b/Patches/Heyra the Horned/Bodydef/Heyra_Bodytype.xml
deleted file mode 100644
index 5a4892859a..0000000000
--- a/Patches/Heyra the Horned/Bodydef/Heyra_Bodytype.xml	
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Heyra the Horned</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!--Arm Groups-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="HeyraBody"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
-					<value>
-						<li>LeftArm</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="HeyraBody"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
-					<value>
-						<li>RightArm</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="HeyraBody"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
-					<value>
-						<li>LeftShoulder</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="HeyraBody"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
-					<value>
-						<li>RightShoulder</li>
-					</value>
-				</li>
-
-				<!--Natural Armor-->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="HeyraBody"]//*[
-						def="Torso" or
-						def="Neck" or
-						def="Head" or
-						def="Heyra_Horn" or
-						def="Nose" or
-						def="Jaw" or
-						def="Ear" or
-						def="Shoulder" or
-						def="Arm" or
-						def="Hand" or
-						def="Finger" or
-						def="Leg" or
-						def="Foot" or
-						def="Toe"]/groups
-					</xpath>
-
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/High Caliber/HighCaliber_CE_Patch_Weapons.xml b/Patches/High Caliber/HighCaliber_CE_Patch_Weapons.xml
deleted file mode 100644
index 00cceedcdc..0000000000
--- a/Patches/High Caliber/HighCaliber_CE_Patch_Weapons.xml	
+++ /dev/null
@@ -1,2161 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>High Caliber</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== XM25 CDTE ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_XM25_HC</defName>
-					<statBases>
-						<Mass>6.35</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.42</SwayFactor>
-						<Bulk>7.49</Bulk>
-						<WorkToMake>31000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.67</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_25x40mmGrenade_HE</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>48</range>
-						<soundCast>Shot_IncendiaryLauncher</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_25x40mmGrenade</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Launcher</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_XM25_HC"]/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>
-				</li>
-
-				<!-- ========== Saiga-12 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Saiga12K_HC</defName>
-					<statBases>
-						<Mass>3.50</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.26</SwayFactor>
-						<Bulk>9.10</Bulk>
-						<WorkToMake>20500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.93</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>ShotSaiga12K</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Saiga12K_HC"]/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>
-				</li>
-
-				<!-- ========== Accuracy International AWM ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AWM_HC</defName>
-					<statBases>
-						<Mass>7.18</Mass>
-						<RangedWeapon_Cooldown>1.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>3.50</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.61</SwayFactor>
-						<Bulk>15.60</Bulk>
-						<WorkToMake>42000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>20</Chemfuel>
-						<Steel>70</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.02</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
-						<warmupTime>2.35</warmupTime>
-						<range>107</range>
-						<soundCast>ShotAWM</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_338Lapua</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_AWM_HC"]/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>
-				</li>
-
-				<!-- ========== Barrett M82A1 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_M82_HC</defName>
-					<statBases>
-						<Mass>13.50</Mass>
-						<RangedWeapon_Cooldown>0.58</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.84</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.87</SwayFactor>
-						<Bulk>13.00</Bulk>
-						<WorkToMake>38500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>105</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.49</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>3.3</warmupTime>
-						<range>126</range>
-						<soundCast>RNShot50Cal</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_M82_HC"]/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>
-				</li>
-
-				<!-- ========== Dragunov SVU ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_DragunovSVU_HC</defName>
-					<statBases>
-						<Mass>4.10</Mass>
-						<RangedWeapon_Cooldown>0.57</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>0.92</SwayFactor>
-						<Bulk>9.70</Bulk>
-						<WorkToMake>31000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.99</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>97</range>
-						<soundCast>ShotSVU</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_DragunovSVU_HC"]/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>
-				</li>
-
-				<!-- ========== FN P90TR ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_P90_HC</defName>
-					<statBases>
-						<Mass>2.60</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>0.77</SwayFactor>
-						<Bulk>5.05</Bulk>
-						<WorkToMake>37000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>30</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.05</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>31</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>ShotP90</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_FN57x28mm</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_P90_HC"]/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>
-				</li>
-
-				<!-- ========== Heckler Koch MP5A3 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MP5_HC</defName>
-					<statBases>
-						<Mass>3.10</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.01</SwayFactor>
-						<Bulk>5.50</Bulk>
-						<WorkToMake>30500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.44</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>31</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>ShotMP5</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_MP5_HC"]/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>
-				</li>
-
-				<!-- ========== UMP45 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_UMP45_HC</defName>
-					<statBases>
-						<Mass>2.50</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>0.94</SwayFactor>
-						<Bulk>4.50</Bulk>
-						<WorkToMake>30500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>30</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.85</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>15</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>ShotUMP45</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_UMP45_HC"]/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>
-				</li>
-
-				<!-- ========== AKS-74U ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AKS74U_HC</defName>
-					<statBases>
-						<Mass>2.70</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.00</SwayFactor>
-						<Bulk>4.90</Bulk>
-						<WorkToMake>29000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.38</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>0.9</warmupTime>
-						<range>31</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>ShotAKS74U</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_AKS74U_HC"]/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>
-				</li>
-
-				<!-- ========== FATAL 515 (Based on Bushmaster / Remington ACR) ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_FATAL515_HC</defName>
-					<statBases>
-						<Mass>3.30</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>7.16</Bulk>
-						<WorkToMake>35500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-						<Chemfuel>10</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>1.55</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>ShotG36</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_FATAL515_HC"]/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>
-				</li>
-
-				<!-- ========== FAMAS ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_FAMAS_HC</defName>
-					<statBases>
-						<Mass>3.61</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.12</SwayFactor>
-						<Bulk>7.17</Bulk>
-						<WorkToMake>37500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.44</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>40</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericBullpup_II</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_FAMAS_HC"]/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>
-				</li>
-
-				<!-- ========== M4A1 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_M4A1_HC</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>
-						<WorkToMake>32000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-						<Chemfuel>10</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>1.58</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>ShotM4A1</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_M4A1_HC"]/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>
-				</li>
-
-				<!-- ========== SIG SG553 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SG553_HC</defName>
-					<statBases>
-						<Mass>3.20</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.05</SwayFactor>
-						<Bulk>5.03</Bulk>
-						<WorkToMake>30500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-						<Chemfuel>5</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>1.35</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>ShotSG553</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_SG553_HC"]/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>
-				</li>
-
-				<!-- ========== Steyr AUG A3 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AUG_HC</defName>
-					<statBases>
-						<Mass>3.65</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.09</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.17</SwayFactor>
-						<Bulk>7.90</Bulk>
-						<WorkToMake>39500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>45</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-						<Chemfuel>10</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>1.56</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.175</warmupTime>
-						<range>40</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>ShotAUG</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_AUG_HC"]/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>
-				</li>
-
-				<!-- ========== Heckler Koch G36 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_G36_HC</defName>
-					<statBases>
-						<Mass>2.82</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.18</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.03</SwayFactor>
-						<Bulk>5.00</Bulk>
-						<WorkToMake>34000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-						<Chemfuel>10</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>1.43</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>0.9</warmupTime>
-						<range>31</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>ShotG36</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_G36_HC"]/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>
-				</li>
-
-				<!-- ========== Heckler Koch MG4 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MG4_HC</defName>
-					<statBases>
-						<Mass>8.15</Mass>
-						<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.18</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.31</SwayFactor>
-						<Bulk>11.30</Bulk>
-						<WorkToMake>44500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>65</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-						<Chemfuel>15</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>0.90</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.25</warmupTime>
-						<range>75</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>ShotMG4</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>200</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_MachineGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_MG4_HC"]/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>
-				</li>
-
-				<!-- ========== AK47 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AK47_HC</defName>
-					<statBases>
-						<Mass>3.47</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<Bulk>8.80</Bulk>
-						<WorkToMake>27000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>45</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-						<WoodLog>10</WoodLog>
-					</costList>
-					<Properties>
-						<recoilAmount>1.82</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>44</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>ShotAK47</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_AK47_HC"]/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>
-				</li>
-
-				<!-- ========== FN SCAR-H ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SCAR-H_HC</defName>
-					<statBases>
-						<Mass>3.58</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.36</SwayFactor>
-						<Bulk>7.11</Bulk>
-						<WorkToMake>35500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-						<Chemfuel>10</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>2.09</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>62</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>ShotSCAR_H</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_SCAR-H_HC"]/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>
-				</li>
-
-				<!-- ========== Mk14 EBR ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Mk14EBR_HC</defName>
-					<statBases>
-						<Mass>6.75</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.60</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>9.89</Bulk>
-						<WorkToMake>33500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>70</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.64</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>75</range>
-						<soundCast>ShotMk14EBR</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Mk14EBR_HC"]/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>
-				</li>
-
-				<!-- ========== Glock 17 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Glock17_HC</defName>
-					<statBases>
-						<Mass>0.63</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.83</SwayFactor>
-						<Bulk>1.86</Bulk>
-						<WorkToMake>7500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>20</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>3.11</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>17</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Glock17_HC"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Desert Eagle ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_DesertEagle_HC</defName>
-					<statBases>
-						<Mass>1.63</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.58</SwayFactor>
-						<Bulk>3.92</Bulk>
-						<WorkToMake>7500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>3.01</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50AE_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot50AE500MAG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_50AE</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_DesertEagle_HC"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Smith & Wesson Model 500 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SW500_HC</defName>
-					<statBases>
-						<Mass>1.96</Mass>
-						<RangedWeapon_Cooldown>0.41</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.92</SwayFactor>
-						<Bulk>3.81</Bulk>
-						<WorkToMake>5000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>35</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>3.52</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_500SWMagnum_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot50AE500MAG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_500SWMagnum</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_SW500_HC"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== SIG Sauer P226 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_P226_HC</defName>
-					<statBases>
-						<Mass>0.96</Mass>
-						<RangedWeapon_Cooldown>0.40</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.97</SwayFactor>
-						<Bulk>1.96</Bulk>
-						<WorkToMake>7000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>3.10</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>ShotP226</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>17</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_P226_HC"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Heckler Koch HK45 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_HK45_HC</defName>
-					<statBases>
-						<Mass>0.77</Mass>
-						<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.94</SwayFactor>
-						<Bulk>2.04</Bulk>
-						<WorkToMake>7000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>20</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-						<Chemfuel>5</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>3.76</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>ShotHK45</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_HK45_HC"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== FN Five-seven ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Fiveseven_HC</defName>
-					<statBases>
-						<Mass>0.61</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.90</SwayFactor>
-						<Bulk>2.08</Bulk>
-						<WorkToMake>7500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>20</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.87</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>ShotFiveseven</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_FN57x28mm</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Fiveseven_HC"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/High Tech Laboratory Facilities/ThingDef_Apparel.xml b/Patches/High Tech Laboratory Facilities/ThingDef_Apparel.xml
deleted file mode 100644
index 15afa17208..0000000000
--- a/Patches/High Tech Laboratory Facilities/ThingDef_Apparel.xml	
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>High Tech Laboratory Facilities (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Leviathan"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>30</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Leviathan"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>12</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Apparel_Leviathan"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
-									<parts>
-										<li>Shoulder</li>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.85</ArmorRating_Blunt>
-									<parts>
-										<li>Shoulder</li>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.75</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-										<li>Arm</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_Leviathan"]/statBases</xpath>
-					<value>
-						<Bulk>90</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_Leviathan"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>25</CarryBulk>
-						<CarryWeight>75</CarryWeight>
-						<ShootingAccuracyPawn>1.0</ShootingAccuracyPawn>
-						<ToxicResistance>0.75</ToxicResistance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Leviathan"]/statBases/Mass</xpath>
-					<value>
-						<Mass>35</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Leviathan"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>125</Steel>
-							<ComponentSpacer>2</ComponentSpacer>
-							<Plasteel>250</Plasteel>
-						</costList>
-					</value>
-				</li>
-
-				<!-- ============================= Helmet ============================= -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_LeviathanH"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>25</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_LeviathanH"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Apparel_LeviathanH"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.85</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_LeviathanH"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>450</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_LeviathanH"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_LeviathanH"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>2</WornBulk>
-						<NightVisionEfficiency_Apparel>0.80</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_LeviathanH"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>100</Steel>
-							<ComponentSpacer>1</ComponentSpacer>
-							<Plasteel>200</Plasteel>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_LeviathanH"]/equippedStatOffsets</xpath>
-					<value>
-						<PsychicSensitivity>-0.25</PsychicSensitivity>
-						<AimingAccuracy>0.20</AimingAccuracy>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-						<ToxicResistance>0.75</ToxicResistance>
-					</value>
-				</li>
-
-				<!-- ============================= Lab Coat ============================= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="LabCoat"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<!-- ============================= Cyber Suit ============================= -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_CyberSuit"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_CyberSuit"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>3</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_CyberSuit"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_CyberSuit"]/costList/ComponentIndustrial</xpath>
-					<value>
-						<ComponentSpacer>1</ComponentSpacer>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Hive Armory/HiveArmory_Armor.xml b/Patches/Hive Armory/HiveArmory_Armor.xml
deleted file mode 100644
index aa07d11cad..0000000000
--- a/Patches/Hive Armory/HiveArmory_Armor.xml	
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Hive Armory</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!--Hive Heavy Armor-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Kenshi_HiverHeavyArmor"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>12</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_HiverHeavyArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_HiverHeavyArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>10</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_HiverHeavyArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeDodgeChance>-0.1</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!--Hive plate Helmet-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Kenshi_HiverHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_HiverHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.25</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_HiverHelmet"]/statBases/Mass</xpath>
-					<value>
-						<Mass>2</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kenshi_HiverHelmet"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>50</costStuffCount>
-					</value>
-				</li>
-
-				<!-- Hive Chain Vest -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kenshi_HiverChainVest"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>4</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kenshi_HiverChainVest"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_HiverChainVest"]/statBases/Mass</xpath>
-					<value>
-						<Mass>6</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_HiverChainVest"]/statBases/WorkToMake</xpath>
-					<value>
-						<WorkToMake>12000</WorkToMake>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kenshi_HiverChainVest"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>75</costStuffCount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName = "Kenshi_HiverChainVest"]/equippedStatOffsets</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kenshi_HiverChainVest" or defName="Kenshi_HiverLeatherVest"]/apparel/layers</xpath>
-					<value>
-						<layers>
-							<li>Middle</li>
-						</layers>
-					</value>
-				</li>
-
-				<!-- Hive Leather Vest -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kenshi_HiverLeatherVest"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kenshi_HiverLeatherVest"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_HiverLeatherVest"]/statBases/Mass</xpath>
-					<value>
-						<Mass>2.4</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kenshi_HiverLeatherVest"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>60</costStuffCount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_HiverLeatherVest"]/statBases/WorkToMake</xpath>
-					<value>
-						<WorkToMake>8000</WorkToMake>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName = "Kenshi_HiverLeatherVest"]/equippedStatOffsets</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Hive Armory/HiveArmory_Weapons.xml b/Patches/Hive Armory/HiveArmory_Weapons.xml
deleted file mode 100644
index 8f111b12b2..0000000000
--- a/Patches/Hive Armory/HiveArmory_Weapons.xml	
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Hive Armory</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kenshi_Polearm"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.31</cooldownTime>
-								<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>2.08</cooldownTime>
-								<chanceFactor>1.165</chanceFactor>
-								<armorPenetrationBlunt>4.8</armorPenetrationBlunt>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.64</cooldownTime>
-								<chanceFactor>1.165</chanceFactor>
-								<armorPenetrationBlunt>2.4</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.33</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kenshi_Polearm"]/statBases</xpath>
-					<value>
-						<Bulk>11</Bulk>
-						<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kenshi_Polearm"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.21</MeleeCritChance>
-							<MeleeParryChance>1.1</MeleeParryChance>
-							<MeleeDodgeChance>0.8</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kenshi_Polearm"]/stuffCategories</xpath>
-					<value>
-						<stuffCategories>
-							<li>Metallic_Weapon</li>
-						</stuffCategories>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kenshi_Staff"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.31</cooldownTime>
-								<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetrationBlunt>6.0</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Head</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetrationBlunt>3.0</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kenshi_Staff"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>1.2</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kenshi_Staff"]/stuffCategories</xpath>
-					<value>
-						<stuffCategories>
-							<li>Metallic_Weapon</li>
-							<li>Woody</li>
-						</stuffCategories>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Idhale Race/Bodies/Idhale_Bodytype.xml b/Patches/Idhale Race/Bodies/Idhale_Bodytype.xml
deleted file mode 100644
index 0cc6fcbd21..0000000000
--- a/Patches/Idhale Race/Bodies/Idhale_Bodytype.xml	
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-
-			<!--Nearmare Bodytype-->
-
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>[1.4]Idhale Race</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--Arm Groups-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
-							<value>
-								<li>LeftArm</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
-							<value>
-								<li>RightArm</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
-							<value>
-								<li>LeftShoulder</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
-							<value>
-								<li>RightShoulder</li>
-							</value>
-						</li>
-
-						<!--Natural Armor-->
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/parts/li[def="Idhale_DevilFire_B"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/parts/li[def="Neck"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Eye"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Idhale_DevilFire_F"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/parts/li[def="Leg"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Idhale_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Idhale Race/PawnKindDefs/Idhale_PawnKind.xml b/Patches/Idhale Race/PawnKindDefs/Idhale_PawnKind.xml
deleted file mode 100644
index 0ce8a8e35c..0000000000
--- a/Patches/Idhale Race/PawnKindDefs/Idhale_PawnKind.xml	
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[1.4]Idhale Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--Ammo-->
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[@Name="HAR_Idhale_KindBase"]</xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>6</max>
-									</primaryMagazineCount>
-								</li>
-							</value>
-						</li>
-
-						<!--Backpack-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="CE_Apparel_Backpack"]/apparel/tags</xpath>
-							<value>
-								<li>HAR_IH_AT_e</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Idhale Race/ThingDefs_Misc/Idhale_Apparel.xml b/Patches/Idhale Race/ThingDefs_Misc/Idhale_Apparel.xml
deleted file mode 100644
index d425dbf624..0000000000
--- a/Patches/Idhale Race/ThingDefs_Misc/Idhale_Apparel.xml	
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[1.4]Idhale Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--========= Stuffable =========-->
-
-						<!--Skin Layer minimum protection-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_IH_AO_a"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>0.25</StuffEffectMultiplierArmor>
-								<Bulk>0.5</Bulk>
-								<WornBulk>0.25</WornBulk>
-							</value>
-						</li>
-
-						<!--Middle Mid-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_IH_AT_a" or
-								defName="HAR_IH_AT_b" or
-								defName="HAR_IH_AT_c" or
-								defName="HAR_IH_AT_d" or
-								defName="HAR_IH_AT_e"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-								<Bulk>3</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<!--Shell-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_IH_AS_a"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>10</StuffEffectMultiplierArmor>
-								<Bulk>10</Bulk>
-								<WornBulk>5</WornBulk>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Idhale Race/ThingDefs_Races/AlienRace_Idhale.xml b/Patches/Idhale Race/ThingDefs_Races/AlienRace_Idhale.xml
deleted file mode 100644
index 0413e83605..0000000000
--- a/Patches/Idhale Race/ThingDefs_Races/AlienRace_Idhale.xml	
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[1.4]Idhale Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="HAR_Idhale_BaseNRPawn"]/inspectorTabs/li[.="ITab_Pawn_Gear"]</xpath>
-							<value>
-								<li>CombatExtended.ITab_Inventory</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="HAR_Idhale_BaseNRPawn"]/comps</xpath>
-							<value>
-								<li Class="CombatExtended.CompProperties_Inventory" />
-								<li Class="CombatExtended.CompProperties_TacticalManager" />
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="HAR_Idhale_BaseNRPawn"]/comps</xpath>
-							<value>
-								<li>
-									<compClass>CombatExtended.CompPawnGizmo</compClass>
-								</li>
-								<li Class="CombatExtended.CompProperties_Suppressable" />
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="HAR_Idhale_Base"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Humanoid</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="HAR_Idhale_Base"]/statBases</xpath>
-							<value>
-								<Suppressability>1</Suppressability>
-								<SmokeSensitivity>1.2</SmokeSensitivity>
-								<ArmorRating_Electric>10</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="HAR_Idhale_Base"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>1000</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="HAR_Idhale_Base"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>100000</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="HAR_Idhale_Base"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>1.26</cooldownTime>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.005</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>right fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>1.26</cooldownTime>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.005</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>4.49</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationBlunt>0.005</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="HAR_Idhale_Base"]/alienRace/raceRestriction/whiteApparelList</xpath>
-							<value>
-								<li>CE_Apparel_TacVest</li>
-								<li>CE_Apparel_Backpack</li>
-								<li>CE_Apparel_TribalBackpack</li>
-								<li>CE_Apparel_BallisticShield</li>
-								<li>CE_Apparel_MeleeShield</li>
-								<li>CE_Apparel_GasMask</li>
-								<li>CE_Apparel_ImprovGasMask</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Impact Weaponry/Addon Weapons/AthenaRanged.xml b/Patches/Impact Weaponry/Addon Weapons/AthenaRanged.xml
deleted file mode 100644
index cc6e04cc9a..0000000000
--- a/Patches/Impact Weaponry/Addon Weapons/AthenaRanged.xml	
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Impact Weaponry</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Athena Framework</li>
-			</mods>
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName = "DV_ImpactSlugger"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>stock</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>12</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>10</power>
-									<cooldownTime>1.55</cooldownTime>
-									<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationRemove">
-						<xpath>Defs/ThingDef[defName = "DV_ImpactSlugger"]/verbs</xpath>
-					</li>
-
-					<!-- === Slugger === -->
-					<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-						<defName>DV_ImpactSlugger</defName>
-						<statBases>
-							<SightsEfficiency>0.85</SightsEfficiency>
-							<ShotSpread>0.01</ShotSpread>
-							<SwayFactor>2.55</SwayFactor>
-							<Bulk>10.5</Bulk>
-							<Mass>5.6</Mass>
-							<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
-						</statBases>
-						<Properties>
-							<recoilAmount>3.22</recoilAmount>
-							<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-							<hasStandardCommand>true</hasStandardCommand>
-							<defaultProjectile>Bullet_ImpactShellsSlugger</defaultProjectile>
-							<warmupTime>1.3</warmupTime>
-							<range>22</range>
-							<soundCast>Shot_ImpactSlugger</soundCast>
-							<soundCastTail>GunTail_Heavy</soundCastTail>
-							<muzzleFlashScale>9</muzzleFlashScale>
-							<targetParams>
-								<canTargetLocations>true</canTargetLocations>
-							</targetParams>
-						</Properties>
-						<AmmoUser>
-							<magazineSize>5</magazineSize>
-							<reloadTime>6.2</reloadTime>
-							<ammoSet>AmmoSet_ImpactShellsSlugger</ammoSet>
-						</AmmoUser>
-						<FireModes>
-							<aiAimMode>AimedShot</aiAimMode>
-						</FireModes>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Impact Weaponry/Addon Weapons/ImpactMelee.xml b/Patches/Impact Weaponry/Addon Weapons/ImpactMelee.xml
deleted file mode 100644
index bcebb685f2..0000000000
--- a/Patches/Impact Weaponry/Addon Weapons/ImpactMelee.xml	
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Impact Weaponry</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Royalty</li>
-			</mods>
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="DV_ChainswordBladelink"]/statBases</xpath>
-						<value>
-							<Bulk>15</Bulk>
-							<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-							<ToughnessRating>24</ToughnessRating>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="DV_ChainswordBladelink"]</xpath>
-						<value>
-							<equippedStatOffsets>
-								<MeleeCritChance>0.11</MeleeCritChance>
-								<MeleeParryChance>0.47</MeleeParryChance>
-								<MeleeDodgeChance>0.15</MeleeDodgeChance>
-							</equippedStatOffsets>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName = "DV_ChainswordBladelink"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>handle</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>12</power>
-									<cooldownTime>1.6</cooldownTime>
-									<armorPenetrationBlunt>2</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									<chanceFactor>0.33</chanceFactor>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>teeth</label>
-									<capacities>
-										<li>Cut</li>
-									</capacities>
-									<power>25</power>
-									<cooldownTime>2.8</cooldownTime>
-									<chanceFactor>0.60</chanceFactor>
-									<armorPenetrationBlunt>11.5</armorPenetrationBlunt>
-									<armorPenetrationSharp>12</armorPenetrationSharp>
-									<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									<extraMeleeDamages>
-										<li>
-											<def>Shred</def>
-											<amount>10</amount>
-											<chance>0.4</chance>
-										</li>
-									</extraMeleeDamages>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>point</label>
-									<capacities>
-										<li>Cut</li>
-									</capacities>
-									<power>25</power>
-									<cooldownTime>2.8</cooldownTime>
-									<chanceFactor>0.30</chanceFactor>
-									<armorPenetrationBlunt>17</armorPenetrationBlunt>
-									<armorPenetrationSharp>18</armorPenetrationSharp>
-									<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									<extraMeleeDamages>
-										<li>
-											<def>Shred</def>
-											<amount>10</amount>
-											<chance>0.5</chance>
-										</li>
-									</extraMeleeDamages>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Impact Weaponry/Addon Weapons/PiratesRanged.xml b/Patches/Impact Weaponry/Addon Weapons/PiratesRanged.xml
deleted file mode 100644
index aec7063cb3..0000000000
--- a/Patches/Impact Weaponry/Addon Weapons/PiratesRanged.xml	
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Impact Weaponry</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Factions Expanded - Pirates</li>
-			</mods>
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName = "DV_WarcasketGun_ImpactBolter"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>barrel</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>35</power>
-									<cooldownTime>2.44</cooldownTime>
-									<armorPenetrationBlunt>16</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<!-- === Bolter === -->
-					<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-						<defName>DV_WarcasketGun_ImpactBolter</defName>
-						<statBases>
-							<SightsEfficiency>1</SightsEfficiency>
-							<ShotSpread>0.01</ShotSpread>
-							<SwayFactor>2.55</SwayFactor>
-							<Bulk>16.5</Bulk>
-							<Mass>59</Mass>
-							<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
-						</statBases>
-						<Properties>
-							<recoilAmount>3.22</recoilAmount>
-							<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-							<hasStandardCommand>true</hasStandardCommand>
-							<defaultProjectile>Bullet_ImpactShellsBolter</defaultProjectile>
-							<warmupTime>1.3</warmupTime>
-							<burstShotCount>5</burstShotCount>
-							<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-							<range>52</range>
-							<soundCast>Shot_Autocannon</soundCast>
-							<soundCastTail>GunTail_Heavy</soundCastTail>
-							<muzzleFlashScale>9</muzzleFlashScale>
-							<targetParams>
-								<canTargetLocations>true</canTargetLocations>
-							</targetParams>
-						</Properties>
-						<AmmoUser>
-							<magazineSize>40</magazineSize>
-							<reloadTime>6.2</reloadTime>
-							<ammoSet>AmmoSet_ImpactShellsBolter</ammoSet>
-						</AmmoUser>
-						<FireModes>
-							<aimedBurstShotCount>4</aimedBurstShotCount>
-							<aiUseBurstMode>FALSE</aiUseBurstMode>
-							<aiAimMode>AimedShot</aiAimMode>
-						</FireModes>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Impact Weaponry/ImpactAmmo.xml b/Patches/Impact Weaponry/ImpactAmmo.xml
deleted file mode 100644
index c8cda1b09e..0000000000
--- a/Patches/Impact Weaponry/ImpactAmmo.xml	
+++ /dev/null
@@ -1,601 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Impact Weaponry</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>Impact_Rounds</defName>
-					<label>Impact Shells</label>
-					<parent>AmmoAdvanced</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberHighCaliber</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSets ========================== -->
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_ImpactShellsSmall</defName>
-					<label>Impact Shells (Small)</label>
-					<ammoTypes>
-						<Ammo_ImpactShellsSmall>Bullet_ImpactShellsSmall</Ammo_ImpactShellsSmall>
-					</ammoTypes>
-					<similarTo>AmmoSet_AntiMateriel</similarTo>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_ImpactShellsBig</defName>
-					<label>Impact Shells (Big)</label>
-					<ammoTypes>
-						<Ammo_ImpactShellsBig>Bullet_ImpactShellsBig</Ammo_ImpactShellsBig>
-					</ammoTypes>
-					<similarTo>AmmoSet_AntiMateriel</similarTo>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_ImpactShellsShell</defName>
-					<label>Impact Shells (Shell)</label>
-					<ammoTypes>
-						<Ammo_ImpactShellsShell>Bullet_ImpactShellsShell</Ammo_ImpactShellsShell>
-					</ammoTypes>
-					<similarTo>AmmoSet_AntiMateriel</similarTo>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_ImpactShellsSniper</defName>
-					<label>Impact Shells (Sniper)</label>
-					<ammoTypes>
-						<Ammo_ImpactShellsSniper>Bullet_ImpactShellsSniper</Ammo_ImpactShellsSniper>
-					</ammoTypes>
-					<similarTo>AmmoSet_AntiMateriel</similarTo>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_ImpactShellsBolter</defName>
-					<label>Impact Shells (Bolter)</label>
-					<ammoTypes>
-						<Ammo_ImpactShellsBolter>Bullet_ImpactShellsBolter</Ammo_ImpactShellsBolter>
-					</ammoTypes>
-					<similarTo>AmmoSet_AntiMateriel</similarTo>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_ImpactShellsSlugger</defName>
-					<label>Impact Shells (Slugger)</label>
-					<ammoTypes>
-						<Ammo_ImpactShellsSlugger>Bullet_ImpactShellsSlugger</Ammo_ImpactShellsSlugger>
-					</ammoTypes>
-					<similarTo>AmmoSet_AntiMateriel</similarTo>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-				<ThingDef Class="CombatExtended.AmmoDef" Name="AmmoImpactBase" ParentName="SmallAmmoBase" Abstract="True">
-					<description>A Large caliber, gryojet-stabilized projectile with an explosive charge.</description>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting</li>
-					</tradeTags>
-					<thingCategories>
-						<li>Impact_Rounds</li>
-					</thingCategories>
-					<stackLimit>5000</stackLimit>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoImpactBase">
-					<defName>Ammo_ImpactShellsSmall</defName>
-					<label>Impact Shells (Small)</label>
-					<statBases>
-						<Mass>0.151</Mass>
-						<Bulk>0.06</Bulk>
-					</statBases>
-					<graphicData>
-						<texPath>ThirdParty/Warhammer/Bolter/Standard</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<ammoClass>GrenadeHE</ammoClass>
-					<detonateProjectile>Bullet_ImpactShellsSmall</detonateProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoImpactBase">
-					<defName>Ammo_ImpactShellsBig</defName>
-					<label>Impact Shells (Big)</label>
-					<statBases>
-						<Mass>0.201</Mass>
-						<Bulk>0.09</Bulk>
-					</statBases>
-					<graphicData>
-						<texPath>ThirdParty/Warhammer/Bolter/Standard</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<ammoClass>GrenadeHE</ammoClass>
-					<detonateProjectile>Bullet_ImpactShellsBig</detonateProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoImpactBase">
-					<defName>Ammo_ImpactShellsShell</defName>
-					<label>Impact Shells (Shell)</label>
-					<statBases>
-						<Mass>0.251</Mass>
-						<Bulk>0.12</Bulk>
-					</statBases>
-					<graphicData>
-						<texPath>ThirdParty/Warhammer/Bolter/Standard</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<ammoClass>GrenadeHE</ammoClass>
-					<detonateProjectile>Bullet_ImpactShellsShell</detonateProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoImpactBase">
-					<defName>Ammo_ImpactShellsSniper</defName>
-					<label>Impact Shells (Sniper)</label>
-					<statBases>
-						<Mass>0.221</Mass>
-						<Bulk>0.10</Bulk>
-					</statBases>
-					<graphicData>
-						<texPath>ThirdParty/Warhammer/Bolter/Standard</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<ammoClass>GrenadeHE</ammoClass>
-					<detonateProjectile>Bullet_ImpactShellsSniper</detonateProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoImpactBase">
-					<defName>Ammo_ImpactShellsBolter</defName>
-					<label>Impact Shells (Bolter)</label>
-					<statBases>
-						<Mass>0.251</Mass>
-						<Bulk>0.12</Bulk>
-					</statBases>
-					<graphicData>
-						<texPath>ThirdParty/Warhammer/Bolter/Standard</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<ammoClass>GrenadeHE</ammoClass>
-					<detonateProjectile>Bullet_ImpactShellsBolter</detonateProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoImpactBase">
-					<defName>Ammo_ImpactShellsSlugger</defName>
-					<label>Impact Shells (Slugger)</label>
-					<statBases>
-						<Mass>0.61</Mass>
-						<Bulk>0.18</Bulk>
-					</statBases>
-					<graphicData>
-						<texPath>ThirdParty/Warhammer/Bolter/Standard</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<ammoClass>GrenadeHE</ammoClass>
-					<detonateProjectile>Bullet_ImpactShellsSlugger</detonateProjectile>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-				<ThingDef Name="BaseImpactShellCE" ParentName="BaseBulletCE" Abstract="true">
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<dropsCasings>true</dropsCasings>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseImpactShellCE">
-					<defName>Bullet_ImpactShellsSmall</defName>
-					<graphicData>
-						<texPath>Things/ImpactBullet</texPath>
-						<shaderType>TransparentPostLight</shaderType>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<label>Impact Shells (Small)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bullet</damageDef>
-						<speed>90</speed>
-						<damageAmountBase>18</damageAmountBase>
-						<armorPenetrationSharp>6</armorPenetrationSharp>
-						<armorPenetrationBlunt>2.131</armorPenetrationBlunt>
-						<casingMoteDefname>Mote_BolterCasing</casingMoteDefname>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>15</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>0.6</explosiveRadius>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseImpactShellCE">
-					<defName>Bullet_ImpactShellsBig</defName>
-					<graphicData>
-						<texPath>Things/ImpactBulletBig</texPath>
-						<shaderType>TransparentPostLight</shaderType>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<label>Impact Shells (Big)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bullet</damageDef>
-						<damageAmountBase>37</damageAmountBase>
-						<armorPenetrationSharp>14</armorPenetrationSharp>
-						<armorPenetrationBlunt>2.931</armorPenetrationBlunt>
-						<speed>86</speed>
-						<casingMoteDefname>Mote_BolterCasing</casingMoteDefname>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<explosiveRadius>1.5</explosiveRadius>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<damageAmountBase>17</damageAmountBase>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseImpactShellCE">
-					<defName>Bullet_ImpactShellsShell</defName>
-					<graphicData>
-						<texPath>Things/ImpactBulletShell</texPath>
-						<shaderType>TransparentPostLight</shaderType>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<label>Impact Shells (Shell)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>64</damageAmountBase>
-						<armorPenetrationSharp>20</armorPenetrationSharp>
-						<armorPenetrationBlunt>5.101</armorPenetrationBlunt>
-						<speed>81</speed>
-						<damageDef>Bullet</damageDef>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<explosiveRadius>2.2</explosiveRadius>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<damageAmountBase>18</damageAmountBase>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseImpactShellCE">
-					<defName>Bullet_ImpactShellsSniper</defName>
-					<graphicData>
-						<texPath>Things/ImpactBulletSniper</texPath>
-						<shaderType>TransparentPostLight</shaderType>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<label>Impact Shells (Sniper)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>88</speed>
-						<damageDef>Bullet</damageDef>
-						<damageAmountBase>56</damageAmountBase>
-						<armorPenetrationSharp>18</armorPenetrationSharp>
-						<armorPenetrationBlunt>4.801</armorPenetrationBlunt>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<explosiveRadius>1.6</explosiveRadius>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<damageAmountBase>24</damageAmountBase>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseImpactShellCE">
-					<defName>Bullet_ImpactShellsBolter</defName>
-					<graphicData>
-						<texPath>Things/ImpactBolterShell</texPath>
-						<shaderType>TransparentPostLight</shaderType>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<label>Impact Shells (Bolter)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>88</speed>
-						<damageDef>Bullet</damageDef>
-						<damageAmountBase>24</damageAmountBase>
-						<armorPenetrationSharp>8</armorPenetrationSharp>
-						<armorPenetrationBlunt>2.831</armorPenetrationBlunt>
-						<casingMoteDefname>Mote_BolterCasing</casingMoteDefname>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>18</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>1.8</explosiveRadius>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseImpactShellCE">
-					<defName>Bullet_ImpactShellsSlugger</defName>
-					<graphicData>
-						<texPath>Things/ImpactBulletSlugger</texPath>
-						<shaderType>TransparentPostLight</shaderType>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<label>Impact Shells (Slugger)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>86</speed>
-						<pelletCount>3</pelletCount>
-						<explosionRadius>0.4</explosionRadius>
-						<damageDef>Bomb</damageDef>
-						<damageAmountBase>16</damageAmountBase>
-						<spreadMult>9.9</spreadMult>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						<casingMoteDefname>Mote_HeavyBolterCasing</casingMoteDefname>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_ImpactShellsSmall</defName>
-					<label>make Impact Shells (Small) x200</label>
-					<description>Craft Impact Shells (Small).</description>
-					<jobString>Making Impact Shells (Small).</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>31</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>7</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_ImpactShellsSmall>200</Ammo_ImpactShellsSmall>
-					</products>
-					<workAmount>10400</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_ImpactShellsBig</defName>
-					<label>make Impact Shells (Big) x200</label>
-					<description>Craft Impact Shells (Big).</description>
-					<jobString>Making Impact Shells (Big).</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>35</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>10</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_ImpactShellsBig>200</Ammo_ImpactShellsBig>
-					</products>
-					<workAmount>10400</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_ImpactShellsShell</defName>
-					<label>make Impact Shells (Shell) x200</label>
-					<description>Craft Impact Shells (Shell).</description>
-					<jobString>Making Impact Shells (Shell).</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>45</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>12</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_ImpactShellsShell>200</Ammo_ImpactShellsShell>
-					</products>
-					<workAmount>10400</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_ImpactShellsSniper</defName>
-					<label>make Impact Shells (Sniper) x200</label>
-					<description>Craft Impact Shells (Sniper).</description>
-					<jobString>Making Impact Shells (Sniper).</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>42</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>10</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_ImpactShellsSniper>200</Ammo_ImpactShellsSniper>
-					</products>
-					<workAmount>10400</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_ImpactShellsBolter</defName>
-					<label>make Impact Shells (Bolter) x200</label>
-					<description>Craft Impact Shells (Bolter).</description>
-					<jobString>Making Impact Shells (Bolter).</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>45</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>12</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_ImpactShellsBolter>200</Ammo_ImpactShellsBolter>
-					</products>
-					<workAmount>10400</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_ImpactShellsSlugger</defName>
-					<label>make Impact Shells (Slugger) x200</label>
-					<description>Craft Impact Shells (Slugger).</description>
-					<jobString>Making Impact Shells (Slugger).</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>55</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>15</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>4</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_ImpactShellsSlugger>200</Ammo_ImpactShellsSlugger>
-					</products>
-					<workAmount>10400</workAmount>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Impact Weaponry/ImpactMelee.xml b/Patches/Impact Weaponry/ImpactMelee.xml
deleted file mode 100644
index 0292de686e..0000000000
--- a/Patches/Impact Weaponry/ImpactMelee.xml	
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Impact Weaponry</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DV_Chainsword"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-						<ToughnessRating>20</ToughnessRating>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DV_Chainsword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.11</MeleeCritChance>
-							<MeleeParryChance>0.47</MeleeParryChance>
-							<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "DV_Chainsword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-								<chanceFactor>0.33</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>2.8</cooldownTime>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>11.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-								<extraMeleeDamages>
-									<li>
-										<def>Shred</def>
-										<amount>10</amount>
-										<chance>0.4</chance>
-									</li>
-								</extraMeleeDamages>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>2.8</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>17</armorPenetrationBlunt>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-								<extraMeleeDamages>
-									<li>
-										<def>Shred</def>
-										<amount>10</amount>
-										<chance>0.5</chance>
-									</li>
-								</extraMeleeDamages>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Impact Weaponry/ImpactRanged.xml b/Patches/Impact Weaponry/ImpactRanged.xml
deleted file mode 100644
index 1cea20823b..0000000000
--- a/Patches/Impact Weaponry/ImpactRanged.xml	
+++ /dev/null
@@ -1,328 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Impact Weaponry</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "DV_ImpactStubber"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[
-						defName = "DV_ImpactRifle" or
-						defName = "DV_ImpactCannon" or
-						defName = "DV_ImpactSlinger" or
-						defName = "DV_ImpactSniper"]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</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>10</power>
-								<cooldownTime>1.55</cooldownTime>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Impact Rifle === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DV_ImpactRifle</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.88</SwayFactor>
-						<Bulk>10.5</Bulk>
-						<Mass>5.2</Mass>
-						<RangedWeapon_Cooldown>0.43</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.27</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_ImpactShellsSmall</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>14</ticksBetweenBurstShots>
-						<range>42</range>
-						<soundCast>Shot_ImpactRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_ImpactShellsSmall</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AOE</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Impact Stubber === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DV_ImpactStubber</defName>
-					<statBases>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>2.87</SwayFactor>
-						<Bulk>8.5</Bulk>
-						<Mass>4.2</Mass>
-						<RangedWeapon_Cooldown>0.58</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>3.38</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_ImpactShellsSmall</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>14</ticksBetweenBurstShots>
-						<range>38</range>
-						<soundCast>Shot_ImpactSmall</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>6</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_ImpactShellsSmall</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AOE</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Impact Cannon === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DV_ImpactCannon</defName>
-					<statBases>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>14.5</Bulk>
-						<Mass>6.6</Mass>
-						<RangedWeapon_Cooldown>0.68</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.38</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_ImpactShellsBig</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>45</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>25</ticksBetweenBurstShots>
-						<soundCast>Shot_ImpactCannon</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>7.5</reloadTime>
-						<ammoSet>AmmoSet_ImpactShellsBig</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AOE</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="DV_ImpactCannon"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.35,1.35</DrawSize>
-							<DrawOffset>0.0,0.0</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Impact Slinger === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DV_ImpactSlinger</defName>
-					<statBases>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>10.5</Bulk>
-						<Mass>5.7</Mass>
-						<RangedWeapon_Cooldown>0.68</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.38</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_ImpactShellsShell</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<burstShotCount>4</burstShotCount>
-						<ticksBetweenBurstShots>20</ticksBetweenBurstShots>
-						<soundCast>Shot_ImpactRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>5.5</reloadTime>
-						<ammoSet>AmmoSet_ImpactShellsShell</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AOE</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="DV_ImpactSlinger"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.25,1.25</DrawSize>
-							<DrawOffset>0.0,0.0</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Impact Sniper === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DV_ImpactSniper</defName>
-					<statBases>
-						<SightsEfficiency>1.8</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>14.5</Bulk>
-						<Mass>5.6</Mass>
-						<RangedWeapon_Cooldown>0.68</RangedWeapon_Cooldown>
-						<NightVisionEfficiency_Weapon>0.6</NightVisionEfficiency_Weapon>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.38</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_ImpactShellsSniper</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>86</range>
-						<soundCast>Shot_ImpactSniper</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>5.5</reloadTime>
-						<ammoSet>AmmoSet_ImpactShellsSniper</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>Bipod_AMR</li>
-						<li>CE_AI_SR</li>
-						<li>CE_AI_AOE</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="DV_ImpactSniper"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.20,1.20</DrawSize>
-							<DrawOffset>0.0,0.0</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Imperial Arsenal Royal Warcasket/Ammo/AmmoCategories_Bolts.xml b/Patches/Imperial Arsenal Royal Warcasket/Ammo/AmmoCategories_Bolts.xml
deleted file mode 100644
index c56d26f156..0000000000
--- a/Patches/Imperial Arsenal Royal Warcasket/Ammo/AmmoCategories_Bolts.xml	
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Imperial Arsenal: Royal Warcasket</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<CombatExtended.AmmoCategoryDef>
-					<defName>Standard</defName>
-					<label>Standard</label>
-					<labelShort>Standard</labelShort>
-					<description>A gyro-stabilized projectile equipped with a hardened tip for penetrating armor and laden with a small explosive charge.</description>
-				</CombatExtended.AmmoCategoryDef>
-
-				<CombatExtended.AmmoCategoryDef>
-					<defName>Inferno</defName>
-					<label>Inferno</label>
-					<labelShort>Inferno</labelShort>
-					<description>A gyro-stabilized projectile equipped with the explosive filler replaced with sticky, highly flammable prometheum.</description>
-				</CombatExtended.AmmoCategoryDef>
-
-				<CombatExtended.AmmoCategoryDef>
-					<defName>MetalStorm</defName>
-					<label>Metal Storm</label>
-					<labelShort>Metal Storm</labelShort>
-					<description>A gyro-stabilized equipped with a proximity fuse, designed to shower lighly armored targets with a devestating shower of fragmention when it detonates.</description>
-				</CombatExtended.AmmoCategoryDef>
-
-				<CombatExtended.AmmoCategoryDef>
-					<defName>Kraken</defName>
-					<label>Kraken</label>
-					<labelShort>Kraken</labelShort>
-					<description>A gyro-stabilized projectile with hardened penetrator and explosive 'kicker' charge, designed to punch through heavy armor.</description>
-				</CombatExtended.AmmoCategoryDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Imperial Arsenal Royal Warcasket/Ammo/Xonus.xml b/Patches/Imperial Arsenal Royal Warcasket/Ammo/Xonus.xml
deleted file mode 100644
index 694f290c55..0000000000
--- a/Patches/Imperial Arsenal Royal Warcasket/Ammo/Xonus.xml	
+++ /dev/null
@@ -1,395 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Imperial Arsenal: Royal Warcasket</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>AmmoBoltXonus</defName>
-					<label>Xonus Bolt</label>
-					<parent>AmmoAdvanced</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberHighCaliber</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_BoltXonus</defName>
-					<label>Xonus Bolt</label>
-					<ammoTypes>
-						<Ammo_BoltXonus_Standard>Bullet_BoltXonus_Standard</Ammo_BoltXonus_Standard>
-						<Ammo_BoltXonus_Inferno>Bullet_BoltXonus_Inferno</Ammo_BoltXonus_Inferno>
-						<Ammo_BoltXonus_MetalStorm>Bullet_BoltXonus_MetalStorm</Ammo_BoltXonus_MetalStorm>
-						<Ammo_BoltXonus_Kraken>Bullet_BoltXonus_Kraken</Ammo_BoltXonus_Kraken>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="AmmoBoltXonusBase" ParentName="AmmoBase" Abstract="True">
-					<description>A .998 caliber, gryojet-stabilized projectile with an explosive charge and hardened tip, fired from most patterns of Astartes heavy bolters.</description>
-					<statBases>
-						<Mass>0.385</Mass>
-						<Bulk>0.15</Bulk>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting</li>
-					</tradeTags>
-					<thingCategories>
-						<li>AmmoBoltXonus</li>
-					</thingCategories>
-					<stackLimit>2000</stackLimit>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoBoltXonusBase">
-					<defName>Ammo_BoltXonus_Standard</defName>
-					<label>Xonus bolt shell (Standard)</label>
-					<graphicData>
-						<texPath>ThirdParty/Warhammer/HeavyBolter/Standard</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>4.44</MarketValue>
-					</statBases>
-					<ammoClass>Standard</ammoClass>
-					<cookOffProjectile>Bullet_BoltXonus_Standard</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoBoltXonusBase">
-					<defName>Ammo_BoltXonus_Inferno</defName>
-					<label>Xonus bolt shell (Inferno)</label>
-					<graphicData>
-						<texPath>ThirdParty/Warhammer/HeavyBolter/Inferno</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>2.28</MarketValue>
-					</statBases>
-					<ammoClass>Inferno</ammoClass>
-					<cookOffProjectile>Bullet_BoltXonus_Inferno</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoBoltXonusBase">
-					<defName>Ammo_BoltXonus_MetalStorm</defName>
-					<label>Xonus bolt shell (Metal Storm)</label>
-					<graphicData>
-						<texPath>ThirdParty/Warhammer/HeavyBolter/MetalStorm</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>2.70</MarketValue>
-					</statBases>
-					<ammoClass>MetalStorm</ammoClass>
-					<cookOffProjectile>Bullet_BoltXonus_MetalStorm</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoBoltXonusBase">
-					<defName>Ammo_BoltXonus_Kraken</defName>
-					<label>Xonus bolt shell (Kraken)</label>
-					<graphicData>
-						<texPath>ThirdParty/Warhammer/HeavyBolter/Kraken</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>2.37</MarketValue>
-					</statBases>
-					<ammoClass>Kraken</ammoClass>
-					<cookOffProjectile>Bullet_BoltXonus_Kraken</cookOffProjectile>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef Name="BaseBoltXonusBullet" ParentName="BaseExplosiveBullet" Abstract="true">
-					<graphicData>
-						<texPath>Things/Projectile/Bullet_Big</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<thingClass>CombatExtended.BulletCE</thingClass>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bullet</damageDef>
-						<speed>96</speed>
-						<dropsCasings>true</dropsCasings>
-						<casingMoteDefname>Fleck_RifleAmmoCasings_HighCal</casingMoteDefname>
-						<casingFilthDefname>Filth_RifleAmmoCasings_HighCal</casingFilthDefname>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseBoltXonusBullet">
-					<defName>Bullet_BoltXonus_Standard</defName>
-					<label>.998 cal bolt (Standard)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>64</damageAmountBase>
-						<armorPenetrationSharp>20</armorPenetrationSharp>
-						<armorPenetrationBlunt>5.101</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Bomb_Secondary</def>
-								<amount>38</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseBoltXonusBullet">
-					<defName>Bullet_BoltXonus_Inferno</defName>
-					<label>.998 cal bolt (Inferno)</label>
-					<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>PrometheumFlame</damageDef>
-						<damageAmountBase>5</damageAmountBase>
-						<explosionRadius>1.5</explosionRadius>
-						<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
-						<preExplosionSpawnChance>0.7</preExplosionSpawnChance>
-						<soundExplode>MortarIncendiary_Explode</soundExplode>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>7</damageAmountBase>
-							<explosiveDamageType>Thermobaric</explosiveDamageType>
-							<explosiveRadius>1</explosiveRadius>
-							<explosionSound>MortarIncendiary_Explode</explosionSound>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseBoltXonusBullet">
-					<defName>Bullet_BoltXonus_MetalStorm</defName>
-					<thingClass>CombatExtended.ProjectileCE_Bursting</thingClass>
-					<label>.998 cal bolt (Metal Storm)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<explosionRadius>1</explosionRadius>
-						<damageDef>Bomb</damageDef>
-						<damageAmountBase>17</damageAmountBase>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						<aimHeightOffset>1.05</aimHeightOffset>
-						<armingDelay>1.75</armingDelay>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>6</Fragment_Small>
-							</fragments>
-							<fragAngleRange>-89~-5</fragAngleRange>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseBoltXonusBullet">
-					<defName>Bullet_BoltXonus_Kraken</defName>
-					<label>.998 cal bolt (Kraken)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bullet</damageDef>
-						<damageAmountBase>142</damageAmountBase>
-						<armorPenetrationSharp>46</armorPenetrationSharp>
-						<armorPenetrationBlunt>5.101</armorPenetrationBlunt>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>17</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>0.5</explosiveRadius>
-							<explosionSound>MortarBomb_Explode</explosionSound>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_BoltXonus_Standard</defName>
-					<label>make Xonus bolt (standard) shell x200</label>
-					<description>Craft 200 Xonus bolt (standard) shells.</description>
-					<jobString>Making Xonus bolt (standard) shells.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>154</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>18</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>4</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_BoltXonus_Standard>200</Ammo_BoltXonus_Standard>
-					</products>
-					<workAmount>36600</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_BoltXonus_Inferno</defName>
-					<label>make Xonus bolt (inferno) shell x200</label>
-					<description>Craft 200 Xonus bolt (inferno) shells.</description>
-					<jobString>Making Xonus bolt (inferno) shells.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>154</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>12</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>6</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Prometheum</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_BoltXonus_Inferno>200</Ammo_BoltXonus_Inferno>
-					</products>
-					<workAmount>19400</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_BoltXonus_MetalStorm</defName>
-					<label>make Xonus bolt (metal storm) shell x200</label>
-					<description>Craft 200 Xonus bolt (metal storm) shells.</description>
-					<jobString>Making Xonus bolt (metal storm) shells.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>154</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>8</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>8</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_BoltXonus_MetalStorm>200</Ammo_BoltXonus_MetalStorm>
-					</products>
-					<workAmount>21800</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_BoltXonus_Kraken</defName>
-					<label>make Xonus bolt (kraken) shell x200</label>
-					<description>Craft 200 Xonus bolt (kraken) shells.</description>
-					<jobString>Making Xonus bolt (kraken) shells.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>154</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>6</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>6</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Uranium</li>
-								</thingDefs>
-							</filter>
-							<count>8</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-							<li>Uranium</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_BoltXonus_Kraken>200</Ammo_BoltXonus_Kraken>
-					</products>
-					<workAmount>20600</workAmount>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Imperial Arsenal Royal Warcasket/Apparel_Royal_Warcaskets.xml b/Patches/Imperial Arsenal Royal Warcasket/Apparel_Royal_Warcaskets.xml
deleted file mode 100644
index 51518952b3..0000000000
--- a/Patches/Imperial Arsenal Royal Warcasket/Apparel_Royal_Warcaskets.xml	
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Imperial Arsenal: Royal Warcasket</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Royal Warcasket ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Royal"]/statBases</xpath>
-					<value>
-						<Bulk>250</Bulk>
-						<WornBulk>25</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Royal"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>34</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Royal"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>86</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Royal"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>250</CarryWeight>
-						<CarryBulk>200</CarryBulk>
-						<Suppressability>-100</Suppressability>
-					</value>
-				</li>
-
-				<!-- ========== Royal Warcasket - Shoulders ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_Royal"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_Royal"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>34</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_Royal"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>86</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- === Royal Warcasket Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Royal"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>8</WornBulk>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Royal"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Royal"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Royal"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Royal"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>30</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Royal"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>68</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Imperial Arsenal Royal Warcasket/RangedWeapons.xml b/Patches/Imperial Arsenal Royal Warcasket/RangedWeapons.xml
deleted file mode 100644
index a38ae380ae..0000000000
--- a/Patches/Imperial Arsenal Royal Warcasket/RangedWeapons.xml	
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Imperial Arsenal: Royal Warcasket</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "RWC_Halberd"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>VFEP_GravityHammerAttack</li>
-								</capacities>
-								<power>135</power>
-								<cooldownTime>2.14</cooldownTime>
-								<armorPenetrationBlunt>16</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>75</power>
-								<cooldownTime>1.34</cooldownTime>
-								<armorPenetrationBlunt>16</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-								<extraMeleeDamages>
-									<li>
-										<def>Flame</def>
-										<amount>25</amount>
-										<chance>1</chance>
-									</li>
-								</extraMeleeDamages>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===  Halberd === -->
-				<li Class="PatchOperationRemove">
-					<xpath>/Defs/ThingDef[defName="RWC_Halberd"]/verbs</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>/Defs/ThingDef[defName="RWC_Halberd"]/comps/li[@Class="CompToggleFireMode.CompProperties_ToggleFireMode"]</xpath>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RWC_Halberd</defName>
-					<statBases>
-						<Bulk>15</Bulk>
-						<SwayFactor>1.2</SwayFactor>
-						<ShotSpread>0.08</ShotSpread>
-						<SightsEfficiency>2.20</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.40</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.19</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_BoltXonus_Standard</defaultProjectile>
-						<warmupTime>0.8</warmupTime>
-						<range>68</range>
-						<soundCast>Xonus_ShotHeavy</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>16</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>3.0</reloadTime>
-						<ammoSet>AmmoSet_BoltXonus</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RWC_Halberd"]</xpath>
-					<value>
-						<equippedAngleOffset>-90</equippedAngleOffset>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>/Defs/ThingDef[defName="RWC_Halberd"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.9,1.9</DrawSize>
-							<DrawOffset>0.0,0.0</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Individuality/Traits_Patch_CE.xml b/Patches/Individuality/Traits_Patch_CE.xml
deleted file mode 100644
index b2caba698d..0000000000
--- a/Patches/Individuality/Traits_Patch_CE.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[SYR] Individuality</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ===== Trait: Stealthy ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraitDef[defName = "SYR_Agile"]/degreeDatas/li/statOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.35</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<!-- ===== Trait: Hand-eye Coordination ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraitDef[defName = "SYR_HandEyeCoordination"]/degreeDatas/li/statOffsets/MeleeHitChance</xpath>
-					<value>
-						<MeleeHitChance>2.5</MeleeHitChance>
-					</value>
-				</li>
-
-				<!-- ===== Trait: Steady Hands ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraitDef[defName = "SYR_SteadyHands"]/degreeDatas/li/statOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-					</value>
-				</li>
-
-				<!-- ===== Trait: Strong Back ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraitDef[defName = "SYR_StrongBack"]/degreeDatas/li/statOffsets/CarryingCapacity</xpath>
-					<value>
-						<CarryWeight>+20</CarryWeight>
-						<CarryBulk>+20</CarryBulk>
-					</value>
-				</li>
-
-			</operations>
-
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Industrial Melee Weaponry/Weapons_Melee.xml b/Patches/Industrial Melee Weaponry/Weapons_Melee.xml
deleted file mode 100644
index c4e25af6da..0000000000
--- a/Patches/Industrial Melee Weaponry/Weapons_Melee.xml	
+++ /dev/null
@@ -1,590 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Industrial Melee Weaponry</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Baseball Bat -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="IMW_BaseballBat"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.46</cooldownTime>
-								<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>6.0</armorPenetrationBlunt>
-								<chanceFactor>2</chanceFactor>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="IMW_BaseballBat"]/statBases</xpath>
-					<value>
-						<Bulk>7.5</Bulk>
-						<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="IMW_BaseballBat"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.5</MeleeCritChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-							<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Machete -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="IMW_Machete"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.3</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.70</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="IMW_Machete"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="IMW_Machete"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="IMW_Machete"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.5</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-						<MeleeDodgeChance>0.05</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<!-- Crowbar -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="IMW_Crowbar"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.32</cooldownTime>
-								<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>0.63</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>5.625</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>prying</label>
-								<capacities>
-									<li>Demolish</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.63</cooldownTime>
-								<armorPenetrationBlunt>5.625</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="IMW_Crowbar"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="IMW_Crowbar"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.42</MeleeCritChance>
-							<MeleeParryChance>0.24</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Claw Hammer -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="IMW_ClawHammer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5.0</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.1</chanceFactor>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9.0</power>
-								<cooldownTime>2.0</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="IMW_ClawHammer"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="IMW_ClawHammer"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>0.20</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="IMW_ClawHammer"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- Sledgehammer -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="IMW_Sledgehammer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.87</cooldownTime>
-								<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Demolish</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>2.43</cooldownTime>
-								<armorPenetrationBlunt>10.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="IMW_Sledgehammer"]/statBases</xpath>
-					<value>
-						<Bulk>7</Bulk>
-						<MeleeCounterParryBonus>0.38</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="IMW_Sledgehammer"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.2</MeleeCritChance>
-							<MeleeParryChance>0.5</MeleeParryChance>
-							<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Spiked Baseball Bat -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="IMW_SpikedBat"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.46</cooldownTime>
-								<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Stab</def>
-										<amount>6</amount>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>6.0</armorPenetrationBlunt>
-								<chanceFactor>2</chanceFactor>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="IMW_SpikedBat"]/statBases</xpath>
-					<value>
-						<Bulk>7.5</Bulk>
-						<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="IMW_SpikedBat"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.5</MeleeCritChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-							<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Knuckleduster -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="IMW_Knuckleduster"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.46</cooldownTime>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="IMW_Knuckleduster"]/statBases</xpath>
-					<value>
-						<Bulk>0.25</Bulk>
-						<MeleeCounterParryBonus>0.01</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="IMW_Knuckleduster"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>0.01</MeleeParryChance>
-							<MeleeDodgeChance>0</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="IMW_Knuckleduster"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- Boxing Glove -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="IMW_BoxingGlove"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Stun</def>
-										<amount>14</amount>
-										<chance>0.3</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>1.85</cooldownTime>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="IMW_BoxingGlove"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<MeleeCounterParryBonus>0.01</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="IMW_BoxingGlove"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.01</MeleeCritChance>
-							<MeleeParryChance>0.05</MeleeParryChance>
-							<MeleeDodgeChance>0</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="IMW_BoxingGlove"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- Pocket Knife -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="IMW_PocketKnife"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<chanceFactor>0.33</chanceFactor>
-								<cooldownTime>0.4</cooldownTime>
-								<armorPenetrationBlunt>0.007</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.06</cooldownTime>
-								<armorPenetrationBlunt>0.01</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.12</cooldownTime>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="IMW_PocketKnife"]/statBases</xpath>
-					<value>
-						<Bulk>0.1</Bulk>
-						<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="IMW_PocketKnife"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.33</MeleeCritChance>
-							<MeleeParryChance>0.01</MeleeParryChance>
-							<MeleeDodgeChance>0.04</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="IMW_PocketKnife"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- Sock Mace -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="IMW_SockMace"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>heavy end</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Stun</def>
-										<amount>6</amount>
-										<chance>0.2</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>3.16</cooldownTime>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="IMW_SockMace"]/statBases</xpath>
-					<value>
-						<Bulk>0.2</Bulk>
-						<MeleeCounterParryBonus>0</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="IMW_SockMace"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.28</MeleeCritChance>
-							<MeleeParryChance>0</MeleeParryChance>
-							<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="IMW_SockMace"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- Brief Case -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="IMW_Briefcase"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>case</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>3.46</cooldownTime>
-								<armorPenetrationBlunt>0.85</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="IMW_Briefcase"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<MeleeCounterParryBonus>0</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="IMW_Briefcase"]/equippedStatOffsets/CarryingCapacity</xpath>
-					<value>
-						<CarryBulk>15</CarryBulk>
-						<MeleeCritChance>0.28</MeleeCritChance>
-						<MeleeParryChance>0.3</MeleeParryChance>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Infinity Rim Ariadna/Ammo/AmmoClass.xml b/Patches/Infinity Rim Ariadna/Ammo/AmmoClass.xml
deleted file mode 100644
index 1415d12f06..0000000000
--- a/Patches/Infinity Rim Ariadna/Ammo/AmmoClass.xml	
+++ /dev/null
@@ -1,30 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Infinity Rim: Ariadna (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<CombatExtended.AmmoCategoryDef>
-							<defName>Teseum</defName>
-							<label>teseum</label>
-							<labelShort>Teseum</labelShort>
-							<description>This teseum coated projectile offers more penetration without compromizing damage potential. Can only be fired from teseum reinforced guns.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>TeseumArrow</defName>
-							<label>teseum arrow</label>
-							<labelShort>teseum</labelShort>
-							<description>The arrow head is made from teseum.</description>
-						</CombatExtended.AmmoCategoryDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Infinity Rim Ariadna/Ammo/Arrow.xml b/Patches/Infinity Rim Ariadna/Ammo/Arrow.xml
deleted file mode 100644
index 537cea41ef..0000000000
--- a/Patches/Infinity Rim Ariadna/Ammo/Arrow.xml	
+++ /dev/null
@@ -1,93 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Infinity Rim: Ariadna (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<!-- ==================== Arrow - AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_GreatArrowAntipode</defName>
-							<label>great arrows</label>
-							<ammoTypes>
-								<Ammo_GreatArrow_Flame>Projectile_GreatArrow_Flame</Ammo_GreatArrow_Flame>
-								<Ammo_GreatArrow_Teseum>Projectile_GreatArrow_Teseum</Ammo_GreatArrow_Teseum>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoGreatArrowBase">
-							<defName>Ammo_GreatArrow_Teseum</defName>
-							<label>great arrow (Teseum)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Neolithic/Arrow/Plasteel</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<Mass>0.108</Mass>
-								<MarketValue>3.06</MarketValue>
-							</statBases>
-							<ammoClass>TeseumArrow</ammoClass>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseGreatArrowProjectile">
-							<defName>Projectile_GreatArrow_Teseum</defName>
-							<label>great arrow (Teseum)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Plasteel</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>70</speed>
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationBlunt>2.340</armorPenetrationBlunt>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Ammo_GreatArrow_Teseum</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>MakeAmmo_GreatArrow_Teseum</defName>
-							<label>make teseum great arrows x10</label>
-							<description>Craft 10 teseum great arrows.</description>
-							<jobString>Making teseum great arrows.</jobString>
-							<workAmount>1000</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Teseum</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-									<li>Teseum</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_GreatArrow_Teseum>10</Ammo_GreatArrow_Teseum>
-							</products>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Infinity Rim Ariadna/Ammo/Autocannon.xml b/Patches/Infinity Rim Ariadna/Ammo/Autocannon.xml
deleted file mode 100644
index d7df959dde..0000000000
--- a/Patches/Infinity Rim Ariadna/Ammo/Autocannon.xml	
+++ /dev/null
@@ -1,150 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Infinity Rim: Ariadna (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<!-- ==================== Autocamnon - AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-
-							<defName>AmmoSet_TeseumAutocannon</defName>
-							<label>20x99mmR Ariadnan</label>
-							<ammoTypes>
-								<Ammo_20x99mmRShVAK_AP>Bullet_20x99mmRShVAK_AP</Ammo_20x99mmRShVAK_AP>
-								<Ammo_20x99mmRShVAK_Teseum>Bullet_20x99mmRShVAK_Teseum</Ammo_20x99mmRShVAK_Teseum>
-							</ammoTypes>
-							<similarTo>AmmoSet_TeseumAutocannonGeneric</similarTo>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_TeseumAutocannonGeneric</defName>
-							<label>autocannon shell</label>
-							<ammoTypes>
-								<Ammo_Autocannon_AP>Bullet_20x110mmHispano_AP</Ammo_Autocannon_AP>
-								<Ammo_Autocannon_Teseum>Bullet_20x99mmRShVAK_Teseum</Ammo_Autocannon_Teseum>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo20x99mmRShVAKBase">
-							<defName>Ammo_20x99mmRShVAK_Teseum</defName>
-							<label>20x99mmR ShVAK cartridge (Teseum)</label>
-							<graphicData>
-								<texPath>ThirdParty/InfinityRimAriadna/TeseumAC</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>1.86</MarketValue>
-							</statBases>
-							<ammoClass>Teseum</ammoClass>
-							<cookOffProjectile>Bullet_20x99mmRShVAK_Teseum</cookOffProjectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoAutocannonShellBase">
-							<defName>Ammo_Autocannon_Teseum</defName>
-							<label>autocannon shell (Teseum)</label>
-							<graphicData>
-								<texPath>ThirdParty/InfinityRimAriadna/TeseumAC</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>1.86</MarketValue>
-							</statBases>
-							<ammoClass>Teseum</ammoClass>
-							<cookOffProjectile>Bullet_20x99mmRShVAK_Teseum</cookOffProjectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base20x99mmRShVAKBullet">
-							<defName>Bullet_20x99mmRShVAK_Teseum</defName>
-							<label>20mmR ShVAK bullet (Teseum)</label>
-							<graphicData>
-								<color>(170,170,210)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>225</speed>
-								<damageAmountBase>35</damageAmountBase>
-								<armorPenetrationSharp>47</armorPenetrationSharp>
-								<armorPenetrationBlunt>696.1</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_20x99mmRShVAK_Teseum</defName>
-							<label>make 20x99mmR ShVAK cartridge (Teseum) x200</label>
-							<description>Craft 20x99mmR ShVAK cartridge (Teseum).</description>
-							<jobString>Making 20x99mmR ShVAK cartridge (Teseum).</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>194</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Teseum</li>
-										</thingDefs>
-									</filter>
-									<count>40</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Teseum</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_20x99mmRShVAK_Teseum>200</Ammo_20x99mmRShVAK_Teseum>
-							</products>
-							<workAmount>19600</workAmount>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_Autocannon_Teseum</defName>
-							<label>make autocannon shell (Teseum) x200</label>
-							<description>Craft 200 autocannon shell (Teseum).</description>
-							<jobString>Making autocannon shell (Teseum).</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>194</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Teseum</li>
-										</thingDefs>
-									</filter>
-									<count>40</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Teseum</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Autocannon_Teseum>200</Ammo_Autocannon_Teseum>
-							</products>
-							<workAmount>19600</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Infinity Rim Ariadna/Ammo/MicroMissile.xml b/Patches/Infinity Rim Ariadna/Ammo/MicroMissile.xml
deleted file mode 100644
index 71b40d8a41..0000000000
--- a/Patches/Infinity Rim Ariadna/Ammo/MicroMissile.xml	
+++ /dev/null
@@ -1,143 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Infinity Rim: Ariadna (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoAriadnanMicroMissile</defName>
-							<label>Ariadnan micro missiles</label>
-							<parent>AmmoRockets</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberRocket</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== Autocamnon - AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_AriadnanMicroMissile</defName>
-							<label>Ariadnan micro missiles</label>
-							<ammoTypes>
-								<Ammo_AriadnanMicroMissile_HE>Bullet_BaseAriadnanMicroMissile_HE</Ammo_AriadnanMicroMissile_HE>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="AmmoAriadnanMicroMissileBase" ParentName="MediumAmmoBase" Abstract="True">
-							<description>Ariadnan micro missiles that is small enough to be carried by the missile launcher.</description>
-							<statBases>
-								<MaxHitPoints>150</MaxHitPoints>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_TableMachining</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoAriadnanMicroMissile</li>
-							</thingCategories>
-							<stackLimit>75</stackLimit>
-							<cookOffFlashScale>25</cookOffFlashScale>
-							<cookOffSound>MortarBomb_Explode</cookOffSound>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoAriadnanMicroMissileBase">
-							<defName>Ammo_AriadnanMicroMissile_HE</defName>
-							<label>Ariadnan micro missile (HE)</label>
-							<graphicData>
-								<texPath>ThirdParty/InfinityRimAriadna/Micro_Missile</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<drawSize>0.75</drawSize>
-							</graphicData>
-							<statBases>
-								<MarketValue>13.64</MarketValue>
-								<Mass>0.52</Mass>
-								<Bulk>0.88</Bulk>
-							</statBases>
-							<ammoClass>GrenadeHE</ammoClass>
-							<detonateProjectile>Bullet_BaseAriadnanMicroMissile_HE</detonateProjectile>
-						</ThingDef>
-
-						<ThingDef Name="BaseAriadnanMicroMissile" ParentName="BaseExplosiveBullet" Abstract="true">
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<graphicData>
-								<texPath>ThirdParty/InfinityRimAriadna/MicroMissile_projectile</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-								<drawSize>0.75</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>70</speed>
-								<soundAmbient>RocketPropelledLoop_Small</soundAmbient>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseAriadnanMicroMissile">
-							<defName>Bullet_BaseAriadnanMicroMissile_HE</defName>
-							<label>Ariadnan micro missile (HE)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>28</damageAmountBase>
-								<explosionRadius>1.5</explosionRadius>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Small>25</Fragment_Small>
-										<Fragment_Large>8</Fragment_Large>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<RecipeDef ParentName="LauncherAmmoRecipeBase">
-							<defName>MakeAmmo_AriadnanMicroMissile_HE</defName>
-							<label>make Ariadnan micro missile (HE) x10</label>
-							<description>Craft 10 Ariadnan HE micro missile.</description>
-							<jobString>Making Ariadnan micro missile (HE).</jobString>
-							<workAmount>4200</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>18</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>5</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>FSX</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_AriadnanMicroMissile_HE>10</Ammo_AriadnanMicroMissile_HE>
-							</products>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Infinity Rim Ariadna/Ammo/Pistol.xml b/Patches/Infinity Rim Ariadna/Ammo/Pistol.xml
deleted file mode 100644
index 7216422dd1..0000000000
--- a/Patches/Infinity Rim Ariadna/Ammo/Pistol.xml	
+++ /dev/null
@@ -1,286 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Infinity Rim: Ariadna (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<!-- ==================== Pistol - Normal ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_TeseumPistol</defName>
-							<label>9x19mm Ariadnan</label>
-							<ammoTypes>
-								<Ammo_9x19mmPara_FMJ>Bullet_9x19mmPara_FMJ</Ammo_9x19mmPara_FMJ>
-								<Ammo_9x19mmPara_AP>Bullet_9x19mmPara_AP</Ammo_9x19mmPara_AP>
-								<Ammo_9x19mmPara_HP>Bullet_9x19mmPara_HP</Ammo_9x19mmPara_HP>
-								<Ammo_9x19mmPara_Teseum>Bullet_9x19mmPara_Teseum</Ammo_9x19mmPara_Teseum>
-							</ammoTypes>
-							<similarTo>AmmoSet_TeseumPistolGeneric</similarTo>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_TeseumPistolGeneric</defName>
-							<label>pistol</label>
-							<ammoTypes>
-								<Ammo_Pistol_FMJ>Bullet_9x19mmPara_FMJ</Ammo_Pistol_FMJ>
-								<Ammo_Pistol_AP>Bullet_9x19mmPara_AP</Ammo_Pistol_AP>
-								<Ammo_Pistol_HP>Bullet_9x19mmPara_HP</Ammo_Pistol_HP>
-								<Ammo_Pistol_Teseum>Bullet_9x19mmPara_Teseum</Ammo_Pistol_Teseum>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="9x19mmParaBase">
-							<defName>Ammo_9x19mmPara_Teseum</defName>
-							<label>9x19mm Para cartridge (Teseum)</label>
-							<graphicData>
-								<texPath>ThirdParty/InfinityRimAriadna/TeseumPistol</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.1</MarketValue>
-							</statBases>
-							<ammoClass>Teseum</ammoClass>
-							<cookOffProjectile>Bullet_9x19mmPara_Teseum</cookOffProjectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoPistolBase">
-							<defName>Ammo_Pistol_Teseum</defName>
-							<label>pistol cartridge (Teseum)</label>
-							<graphicData>
-								<texPath>ThirdParty/InfinityRimAriadna/TeseumPistol</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.1</MarketValue>
-							</statBases>
-							<ammoClass>Teseum</ammoClass>
-							<cookOffProjectile>Bullet_9x19mmPara_Teseum</cookOffProjectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base9x19mmParaBullet">
-							<defName>Bullet_9x19mmPara_Teseum</defName>
-							<label>9mm Para bullet (Teseum)</label>
-							<graphicData>
-								<color>(170,170,210)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>13</damageAmountBase>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>9.66</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_9x19mmPara_Teseum</defName>
-							<label>make 9x19mm Parabellum (Teseum) cartridge x500</label>
-							<description>Craft 500 9x19mm Parabellum (Teseum) cartridges.</description>
-							<jobString>Making 9x19mm Parabellum (Teseum) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>14</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Teseum</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Teseum</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_9x19mmPara_Teseum>500</Ammo_9x19mmPara_Teseum>
-							</products>
-							<workAmount>1400</workAmount>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_Pistol_Teseum</defName>
-							<label>make pistol (Teseum) cartridge x500</label>
-							<description>Craft 500 pistol (Teseum) cartridges.</description>
-							<jobString>Making pistol (Teseum) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>14</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Teseum</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Teseum</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Pistol_Teseum>500</Ammo_Pistol_Teseum>
-							</products>
-							<workAmount>1400</workAmount>
-						</RecipeDef>
-
-						<!-- ==================== Pistol - magnum ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_TeseumPistolMagnum</defName>
-							<label>.44 Magnum Ariadnan</label>
-							<ammoTypes>
-								<Ammo_44Magnum_FMJ>Bullet_44Magnum_FMJ</Ammo_44Magnum_FMJ>
-								<Ammo_44Magnum_AP>Bullet_44Magnum_AP</Ammo_44Magnum_AP>
-								<Ammo_44Magnum_HP>Bullet_44Magnum_HP</Ammo_44Magnum_HP>
-								<Ammo_44Magnum_Teseum>Bullet_44Magnum_Teseum</Ammo_44Magnum_Teseum>
-							</ammoTypes>
-							<similarTo>AmmoSet_TeseumPistolMagnumGeneric</similarTo>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_TeseumPistolMagnumGeneric</defName>
-							<label>magnum pistol</label>
-							<ammoTypes>
-								<Ammo_PistolMagnum_FMJ>Bullet_44Magnum_FMJ</Ammo_PistolMagnum_FMJ>
-								<Ammo_PistolMagnum_AP>Bullet_44Magnum_AP</Ammo_PistolMagnum_AP>
-								<Ammo_PistolMagnum_HP>Bullet_44Magnum_HP</Ammo_PistolMagnum_HP>
-								<Ammo_PistolMagnum_Teseum>Bullet_44Magnum_Teseum</Ammo_PistolMagnum_Teseum>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="44MagnumBase">
-							<defName>Ammo_44Magnum_Teseum</defName>
-							<label>.44 Magnum cartridge (Teseum)</label>
-							<graphicData>
-								<texPath>ThirdParty/InfinityRimAriadna/TeseumPistol</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.1</MarketValue>
-							</statBases>
-							<ammoClass>Teseum</ammoClass>
-							<cookOffProjectile>Bullet_44Magnum_Teseum</cookOffProjectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoPistomMagnum">
-							<defName>Ammo_PistolMagnum_Teseum</defName>
-							<label>magnum pistol cartridge (Teseum)</label>
-							<graphicData>
-								<texPath>ThirdParty/InfinityRimAriadna/TeseumPistol</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.1</MarketValue>
-							</statBases>
-							<ammoClass>Teseum</ammoClass>
-							<cookOffProjectile>Bullet_44Magnum_Teseum</cookOffProjectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base44MagnumBullet">
-							<defName>Bullet_44Magnum_Teseum</defName>
-							<label>.44 Magnum bullet (Teseum)</label>
-							<graphicData>
-								<color>(170,170,210)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>19</damageAmountBase>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-								<armorPenetrationBlunt>23.280</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_44Magnum_Teseum</defName>
-							<label>make .44 Magnum (Teseum) cartridge x500</label>
-							<description>Craft 500 .44 Magnum (Teseum) cartridges.</description>
-							<jobString>Making .44 Magnum (Teseum) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>24</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Teseum</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Teseum</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_44Magnum_Teseum>500</Ammo_44Magnum_Teseum>
-							</products>
-							<workAmount>2400</workAmount>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_PistolMagnum_Teseum</defName>
-							<label>make magnum pistol (Teseum) cartridge x500</label>
-							<description>Craft 500 magnum pistol (Teseum) cartridges.</description>
-							<jobString>Making magnum pistol (Teseum) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>24</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Teseum</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Teseum</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_PistolMagnum_Teseum>500</Ammo_PistolMagnum_Teseum>
-							</products>
-							<workAmount>2400</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Infinity Rim Ariadna/Ammo/Rifle.xml b/Patches/Infinity Rim Ariadna/Ammo/Rifle.xml
deleted file mode 100644
index ccc5390ce5..0000000000
--- a/Patches/Infinity Rim Ariadna/Ammo/Rifle.xml	
+++ /dev/null
@@ -1,287 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Infinity Rim: Ariadna (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<!-- ==================== Rifle - SmallCal ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_TeseumRifleIntermediate</defName>
-							<label>5.45x39mm Ariadnan</label>
-							<ammoTypes>
-								<Ammo_545x39mmSoviet_FMJ>Bullet_545x39mmSoviet_FMJ</Ammo_545x39mmSoviet_FMJ>
-								<Ammo_545x39mmSoviet_AP>Bullet_545x39mmSoviet_AP</Ammo_545x39mmSoviet_AP>
-								<Ammo_545x39mmSoviet_HP>Bullet_545x39mmSoviet_HP</Ammo_545x39mmSoviet_HP>
-								<Ammo_545x39mmSoviet_Teseum>Bullet_545x39mmSoviet_Teseum</Ammo_545x39mmSoviet_Teseum>
-							</ammoTypes>
-							<similarTo>AmmoSet_TeseumRifleIntermediateGeneric</similarTo>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_TeseumRifleIntermediateGeneric</defName>
-							<label>intermediate rifle</label>
-							<ammoTypes>
-								<Ammo_RifleIntermediate_FMJ>Bullet_545x39mmSoviet_FMJ</Ammo_RifleIntermediate_FMJ>
-								<Ammo_RifleIntermediate_AP>Bullet_545x39mmSoviet_AP</Ammo_RifleIntermediate_AP>
-								<Ammo_RifleIntermediate_HP>Bullet_545x39mmSoviet_HP</Ammo_RifleIntermediate_HP>
-								<Ammo_RifleIntermediate_Teseum>Bullet_545x39mmSoviet_Teseum</Ammo_RifleIntermediate_Teseum>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="545x39mmSovietBase">
-							<defName>Ammo_545x39mmSoviet_Teseum</defName>
-							<label>5.45x39mm Soviet cartridge (Teseum)</label>
-							<graphicData>
-								<texPath>ThirdParty/InfinityRimAriadna/TeseumRifle</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.14</MarketValue>
-							</statBases>
-							<ammoClass>Teseum</ammoClass>
-							<cookOffProjectile>Bullet_545x39mmSoviet_Teseum</cookOffProjectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoRifleIntermediateBase">
-							<defName>Ammo_RifleIntermediate_Teseum</defName>
-							<label>intermediate rifle cartridge (Teseum)</label>
-							<graphicData>
-								<texPath>ThirdParty/InfinityRimAriadna/TeseumRifle</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.14</MarketValue>
-							</statBases>
-							<ammoClass>Teseum</ammoClass>
-							<cookOffProjectile>Bullet_545x39mmSoviet_Teseum</cookOffProjectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base545x39mmSovietBullet">
-							<defName>Bullet_545x39mmSoviet_Teseum</defName>
-							<label>5.45mm Soviet bullet (Teseum)</label>
-							<graphicData>
-								<color>(170,170,210)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>16</damageAmountBase>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<armorPenetrationBlunt>28.04</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_545x39mmSoviet_Teseum</defName>
-							<label>make 5.45x39mm Soviet (Teseum) cartridge x500</label>
-							<description>Craft 500 5.45x39mm Soviet (Teseum) cartridges.</description>
-							<jobString>Making 5.45x39mm Soviet (Teseum) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>12</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Teseum</li>
-										</thingDefs>
-									</filter>
-									<count>6</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Teseum</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_545x39mmSoviet_Teseum>500</Ammo_545x39mmSoviet_Teseum>
-							</products>
-							<workAmount>2400</workAmount>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_RifleIntermediate_Teseum</defName>
-							<label>make intermediate rifle (Teseum) cartridge x500</label>
-							<description>Craft 500 intermediate rifle (Teseum) cartridges.</description>
-							<jobString>Making intermediate rifle (Teseum) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>12</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Teseum</li>
-										</thingDefs>
-									</filter>
-									<count>6</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Teseum</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_545x39mmSoviet_Teseum>500</Ammo_545x39mmSoviet_Teseum>
-							</products>
-							<workAmount>2400</workAmount>
-						</RecipeDef>
-
-						<!-- ==================== Rifle - FullPower ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_TeseumRifleFullPower</defName>
-							<label>7.62x54mm Ariadnan</label>
-							<ammoTypes>
-								<Ammo_762x54mmR_FMJ>Bullet_762x54mmR_FMJ</Ammo_762x54mmR_FMJ>
-								<Ammo_762x54mmR_AP>Bullet_762x54mmR_AP</Ammo_762x54mmR_AP>
-								<Ammo_762x54mmR_HP>Bullet_762x54mmR_HP</Ammo_762x54mmR_HP>
-								<Ammo_762x54mmR_Teseum>Bullet_762x54mmR_Teseum</Ammo_762x54mmR_Teseum>
-							</ammoTypes>
-							<similarTo>AmmoSet_TeseumRifleFullPowerGeneric</similarTo>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_TeseumRifleFullPowerGeneric</defName>
-							<label>full power rifle</label>
-							<ammoTypes>
-								<Ammo_Rifle_FMJ>Bullet_762x51mmNATO_FMJ</Ammo_Rifle_FMJ>
-								<Ammo_Rifle_AP>Bullet_762x51mmNATO_AP</Ammo_Rifle_AP>
-								<Ammo_Rifle_HP>Bullet_762x51mmNATO_HP</Ammo_Rifle_HP>
-								<Ammo_Rifle_Teseum>Bullet_762x54mmR_Teseum</Ammo_Rifle_Teseum>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x54mmRBase">
-							<defName>Ammo_762x54mmR_Teseum</defName>
-							<label>7.62x54mmR cartridge (Teseum)</label>
-							<graphicData>
-								<texPath>ThirdParty/InfinityRimAriadna/TeseumRifle</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.22</MarketValue>
-							</statBases>
-							<ammoClass>Teseum</ammoClass>
-							<cookOffProjectile>Bullet_762x54mmR_Teseum</cookOffProjectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoRifleBase">
-							<defName>Ammo_Rifle_Teseum</defName>
-							<label>rifle cartridge (Teseum)</label>
-							<graphicData>
-								<texPath>ThirdParty/InfinityRimAriadna/TeseumRifle</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.22</MarketValue>
-							</statBases>
-							<ammoClass>Teseum</ammoClass>
-							<cookOffProjectile>Bullet_762x54mmR_Teseum</cookOffProjectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base762x54mmRBullet">
-							<defName>Bullet_762x54mmR_Teseum</defName>
-							<label>7.62mmR bullet (Teseum)</label>
-							<graphicData>
-								<color>(170,170,210)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>25</damageAmountBase>
-								<armorPenetrationSharp>24</armorPenetrationSharp>
-								<armorPenetrationBlunt>67.340</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_762x54mmR_Teseum</defName>
-							<label>make 7.62x54mmR (Teseum) cartridge x500</label>
-							<description>Craft 500 7.62x54mmR (Teseum) cartridges.</description>
-							<jobString>Making 7.62x54mmR (Teseum) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>28</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Teseum</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Teseum</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_762x54mmR_Teseum>500</Ammo_762x54mmR_Teseum>
-							</products>
-							<workAmount>5600</workAmount>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_Rifle_Teseum</defName>
-							<label>make rifle (Teseum) cartridge x500</label>
-							<description>Craft 500 rifle (Teseum) cartridges.</description>
-							<jobString>Making rifle (Teseum) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>26</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Teseum</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Teseum</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Rifle_Teseum>500</Ammo_Rifle_Teseum>
-							</products>
-							<workAmount>5600</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Infinity Rim Ariadna/Ammo/Shotgun.xml b/Patches/Infinity Rim Ariadna/Ammo/Shotgun.xml
deleted file mode 100644
index ee23b2586b..0000000000
--- a/Patches/Infinity Rim Ariadna/Ammo/Shotgun.xml	
+++ /dev/null
@@ -1,229 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Infinity Rim: Ariadna (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<!-- ==================== Shotgun - AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_12GaugeTeseum</defName>
-							<label>12 Gauge Ariadnan</label>
-							<ammoTypes>
-								<Ammo_12Gauge_Buck>Bullet_12Gauge_Buck</Ammo_12Gauge_Buck>
-								<Ammo_12Gauge_Slug>Bullet_12Gauge_Slug</Ammo_12Gauge_Slug>
-								<Ammo_12Gauge_Teseum>Bullet_12Gauge_Teseum</Ammo_12Gauge_Teseum>
-							</ammoTypes>
-							<similarTo>AmmoSet_12GaugeTeseumGeneric</similarTo>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_12GaugeTeseumGeneric</defName>
-							<label>shotgun shell</label>
-							<ammoTypes>
-								<Ammo_Shotgun_Buck>Bullet_12Gauge_Buck</Ammo_Shotgun_Buck>
-								<Ammo_Shotgun_Slug>Bullet_12Gauge_Slug</Ammo_Shotgun_Slug>
-								<Ammo_Shotgun_Teseum>Bullet_12Gauge_Teseum</Ammo_Shotgun_Teseum>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="12GaugeBase">
-							<defName>Ammo_12Gauge_Teseum</defName>
-							<label>12 gauge shell (Teseum)</label>
-							<graphicData>
-								<texPath>ThirdParty/InfinityRimAriadna/TeseumHeavy</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<Mass>0.054</Mass>
-								<MarketValue>0.87</MarketValue>
-							</statBases>
-							<ammoClass>ElectroSlug</ammoClass>
-							<cookOffProjectile>Bullet_12Gauge_Teseum</cookOffProjectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoShotgunBase">
-							<defName>Ammo_Shotgun_Teseum</defName>
-							<label>shotgun shell (Teseum)</label>
-							<graphicData>
-								<texPath>ThirdParty/InfinityRimAriadna/TeseumHeavy</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<Mass>0.054</Mass>
-								<MarketValue>0.87</MarketValue>
-							</statBases>
-							<ammoClass>ElectroSlug</ammoClass>
-							<cookOffProjectile>Bullet_12Gauge_Teseum</cookOffProjectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base12GaugeBullet">
-							<defName>Bullet_12Gauge_Teseum</defName>
-							<label>buckshot pellet</label>
-							<graphicData>
-								<texPath>Things/Projectile/Shotgun_Pellet</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<color>(170,170,210)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>8</damageAmountBase>
-								<pelletCount>9</pelletCount>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.52</armorPenetrationBlunt>
-								<spreadMult>17.8</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_12Gauge_Teseum</defName>
-							<label>make 12 gauge (Teseum) shell x200</label>
-							<description>Craft 200 12 gauge (Teseum) shells.</description>
-							<jobString>Making 12 gauge (Teseum) shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>22</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Teseum</li>
-										</thingDefs>
-									</filter>
-									<count>5</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Teseum</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_12Gauge_Teseum>200</Ammo_12Gauge_Teseum>
-							</products>
-							<workAmount>4400</workAmount>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_Shotgun_Teseum</defName>
-							<label>make shotgun (Teseum) shell x200</label>
-							<description>Craft 200 shotgun (Teseum) shells.</description>
-							<jobString>Making shotgun (Teseum) shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>22</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Teseum</li>
-										</thingDefs>
-									</filter>
-									<count>5</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Teseum</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Shotgun_Teseum>200</Ammo_Shotgun_Teseum>
-							</products>
-							<workAmount>4400</workAmount>
-						</RecipeDef>
-
-						<!-- ==================== Chaingun - AmmoSet ========================== -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_AriadnanChainGun</defName>
-							<label>Ariadnan chain rifle</label>
-							<ammoTypes>
-								<Ammo_AriadnanChainGun>Bullet_AriadnanChainGun</Ammo_AriadnanChainGun>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="12GaugeBase">
-							<defName>Ammo_AriadnanChainGun</defName>
-							<label>chain rifle segments</label>
-							<graphicData>
-								<texPath>ThirdParty/InfinityRimAriadna/Chain</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<stackLimit>75</stackLimit>
-							<statBases>
-								<Mass>0.1</Mass>
-								<Bulk>0.1</Bulk>
-								<MarketValue>0.08</MarketValue>
-							</statBases>
-							<ammoClass>BuckShot</ammoClass>
-						</ThingDef>
-
-						<ThingDef ParentName="Base12GaugeBullet">
-							<defName>Bullet_AriadnanChainGun</defName>
-							<label>molten metal</label>
-							<graphicData>
-								<texPath>Things/Projectile/Shotgun_Pellet</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<color>(200,150,100)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>4</damageAmountBase>
-								<pelletCount>9</pelletCount>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.52</armorPenetrationBlunt>
-								<spreadMult>37.8</spreadMult>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>5</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_AriadnanChainGun</defName>
-							<label>make chain rifle segments x200</label>
-							<description>Craft 100 chain rifle segments.</description>
-							<jobString>Making chain rifle segments.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>25</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_AriadnanChainGun>75</Ammo_AriadnanChainGun>
-							</products>
-							<workAmount>1000</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Infinity Rim Ariadna/Antipode.xml b/Patches/Infinity Rim Ariadna/Antipode.xml
deleted file mode 100644
index 7313976c83..0000000000
--- a/Patches/Infinity Rim Ariadna/Antipode.xml	
+++ /dev/null
@@ -1,223 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Infinity Rim: Ariadna (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Race_Antipode"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Race_Antipode"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.17</MeleeDodgeChance>
-						<MeleeCritChance>0.21</MeleeCritChance>
-						<MeleeParryChance>0.17</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Race_Antipode"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Race_Antipode"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Race_Antipode"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-						<li>
-							<compClass>CombatExtended.CompAmmoGiver</compClass>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Race_Antipode"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>9.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2.22</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>4.235</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[defName="AntipodeWarrior"]/weaponTags</xpath>
-					<value>
-						<li>MedievalMeleeDecent</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="AntipodeWarrior"]/weaponMoney</xpath>
-					<value>
-						<weaponMoney>
-							<min>200</min>
-							<max>400</max>
-						</weaponMoney>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[defName="AntipodeHunter"]/weaponTags</xpath>
-					<value>
-						<li>CE_Bow</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="AntipodeHunter" or defName="AntipodeChampion"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>20</min>
-								<max>40</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>100</min>
-								<max>130</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.6</shieldChance>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>80</min>
-										<max>160</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Tribal</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="AntipodeWarrior"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>100</min>
-								<max>130</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.6</shieldChance>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>80</min>
-										<max>160</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Tribal</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/PawnKindDef[
-						defName="AntipodeWarrior" or
-						defName="AntipodeHunter" or
-						defName="AntipodeChampion"
-						]
-					</xpath>
-					<value>
-						<combatEnhancingDrugsChance>1</combatEnhancingDrugsChance>
-						<combatEnhancingDrugsCount>1</combatEnhancingDrugsCount>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Infinity Rim Ariadna/Apparel.xml b/Patches/Infinity Rim Ariadna/Apparel.xml
deleted file mode 100644
index 87db3e1060..0000000000
--- a/Patches/Infinity Rim Ariadna/Apparel.xml	
+++ /dev/null
@@ -1,276 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Infinity Rim: Ariadna (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ==================== Armor =====================-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_LightArmor"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_LightArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>11</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_LightArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_LightArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>20</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Apparel_LightArmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Shoulder</li>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Shoulder</li>
-										<li>Leg</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ==================== Various =====================-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_Telnyashka" or defName="Apparel_ArmyFatigue" or defName="Apparel_SpetsnazBeret"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>0.3</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_SpetsnazBeret"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<!-- ==================== Armor =====================-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_Cherkesska"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>20</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Cherkesska"]/statBases/WorkToMake</xpath>
-					<value>
-						<WorkToMake>75000</WorkToMake>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_Cherkesska"]/statBases</xpath>
-					<value>
-						<Flammability>0.2</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Cherkesska"]/statBases/Mass</xpath>
-					<value>
-						<Mass>50</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Cherkesska"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Cherkesska"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>35</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_Cherkesska"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>65</CarryWeight>
-						<CarryBulk>15</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Cherkesska"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>-0.3</MoveSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_Cherkesska"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Apparel_Cherkesska"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.50</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.50</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.40</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.40</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_CherkesskaHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_CherkesskaHelmet"]/statBases/WorkToMake</xpath>
-					<value>
-						<WorkToMake>35000</WorkToMake>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_CherkesskaHelmet"]/statBases</xpath>
-					<value>
-						<Flammability>0.2</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_CherkesskaHelmet"]/statBases/Mass</xpath>
-					<value>
-						<Mass>8</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_CherkesskaHelmet"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_CherkesskaHelmet"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>28</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Apparel_CherkesskaHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_CherkesskaHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Apparel_CherkesskaHelmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.30</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.30</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Infinity Rim Ariadna/Weapons/AntipodeWeapon.xml b/Patches/Infinity Rim Ariadna/Weapons/AntipodeWeapon.xml
deleted file mode 100644
index ac94362856..0000000000
--- a/Patches/Infinity Rim Ariadna/Weapons/AntipodeWeapon.xml	
+++ /dev/null
@@ -1,91 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Infinity Rim: Ariadna (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Bow_Antipode</defName>
-					<statBases>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>1</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>5.00</Bulk>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_GreatArrow_Teseum</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>30</range>
-						<soundCast>Bow_Large</soundCast>
-					</Properties>
-					<AmmoUser>
-						<ammoSet>AmmoSet_GreatArrowAntipode</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Bow_Antipode"]</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>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AntipodeCCW"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>0.83</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>0.94</cooldownTime>
-								<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Infinity Rim Ariadna/Weapons/Heavy.xml b/Patches/Infinity Rim Ariadna/Weapons/Heavy.xml
deleted file mode 100644
index 7e2cd4037c..0000000000
--- a/Patches/Infinity Rim Ariadna/Weapons/Heavy.xml	
+++ /dev/null
@@ -1,198 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Infinity Rim: Ariadna (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Gun_MissileLauncher" or defName="Gun_AutoCannon"]/statBases/MarketValue</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_MissileLauncher" or defName="Gun_AutoCannon"]/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>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Gun_AutoCannon"]/graphicData</xpath>
-					<value>
-						<drawSize>(1.5, 1)</drawSize>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MissileLauncher</defName>
-					<statBases>
-						<Mass>5.80</Mass>
-						<RangedWeapon_Cooldown>1.6</RangedWeapon_Cooldown>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>0.5</SwayFactor>
-						<Bulk>9.0</Bulk>
-						<SightsEfficiency>1.4</SightsEfficiency>
-						<WorkToMake>56000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>45</Steel>
-						<Plasteel>55</Plasteel>
-						<Teseum>25</Teseum>
-						<ComponentIndustrial>8</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>0.5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BaseAriadnanMicroMissile_HE</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>55</range>
-						<soundCast>ShotMissileLauncher</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_AriadnanMicroMissile</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AOE</li>
-						<li>AdvancedGun</li>
-						<li>GunHeavy</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AutoCannon</defName>
-					<statBases>
-						<Mass>25.80</Mass>
-						<RangedWeapon_Cooldown>2.5</RangedWeapon_Cooldown>
-						<ShotSpread>0.1</ShotSpread>
-						<SwayFactor>2.5</SwayFactor>
-						<Bulk>29.0</Bulk>
-						<SightsEfficiency>1.4</SightsEfficiency>
-						<WorkToMake>88000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>60</Steel>
-						<Plasteel>85</Plasteel>
-						<Teseum>50</Teseum>
-						<ComponentIndustrial>15</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_20x99mmRShVAK_Teseum</defaultProjectile>
-						<warmupTime>2.5</warmupTime>
-						<range>55</range>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<soundCast>ShotAutoCannon</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>16</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>12.5</reloadTime>
-						<ammoSet>AmmoSet_TeseumAutocannon</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>Bipod_ATR</li>
-						<li>AdvancedGun</li>
-						<li>GunHeavy</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Gun_AutoCannon"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.5,1</DrawSize>
-							<DrawOffset>0.05,0.0</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Gun_MissileLauncher"]</xpath>
-					<value>
-						<recipeMaker>
-							<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-							<workSkill>Crafting</workSkill>
-							<effectWorking>Smith</effectWorking>
-							<soundWorking>Recipe_Smith</soundWorking>
-							<recipeUsers>
-								<li>TableMachining</li>
-							</recipeUsers>
-							<unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
-							<researchPrerequisite>CE_Launchers</researchPrerequisite>
-						</recipeMaker>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Gun_AutoCannon"]</xpath>
-					<value>
-						<recipeMaker>
-							<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-							<workSkill>Crafting</workSkill>
-							<effectWorking>Smith</effectWorking>
-							<soundWorking>Recipe_Smith</soundWorking>
-							<recipeUsers>
-								<li>TableMachining</li>
-							</recipeUsers>
-							<unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
-							<researchPrerequisite>CE_TurretHeavyWeapons</researchPrerequisite>
-						</recipeMaker>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Infinity Rim Ariadna/Weapons/Machinegun.xml b/Patches/Infinity Rim Ariadna/Weapons/Machinegun.xml
deleted file mode 100644
index c21e36d18e..0000000000
--- a/Patches/Infinity Rim Ariadna/Weapons/Machinegun.xml	
+++ /dev/null
@@ -1,178 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Infinity Rim: Ariadna (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Molotok" or defName="Gun_Hishchnik"]/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>
-				</li>
-
-				<!--Compact, thus low weight, low bulk, but high recoil and spread-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Molotok</defName>
-					<statBases>
-						<Mass>6.12</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.83</SwayFactor>
-						<Bulk>10.03</Bulk>
-						<WorkToMake>64000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>80</Steel>
-						<Plasteel>20</Plasteel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-						<Teseum>20</Teseum>
-					</costList>
-					<Properties>
-						<recoilAmount>1.8</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_Teseum</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>72</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>ShotMolotok</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_TeseumRifleIntermediate</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_MachineGun</li>
-						<li>CE_AI_LMG</li>
-						<li>Bipod_LMG</li>
-					</weaponTags>
-					<researchPrerequisite>GasOperation</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Gun_Molotok"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.16,1.25</DrawSize>
-							<DrawOffset>0.05,-0.07</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Hishchnik</defName>
-					<statBases>
-						<Mass>12.5</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.53</SwayFactor>
-						<Bulk>16.7</Bulk>
-						<WorkToMake>58000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>150</Steel>
-						<ComponentIndustrial>12</ComponentIndustrial>
-						<Teseum>30</Teseum>
-					</costList>
-					<Properties>
-						<recoilAmount>1.5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_Teseum</defaultProjectile>
-						<warmupTime>1.8</warmupTime>
-						<range>62</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>15</burstShotCount>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_TeseumRifleFullPower</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_MachineGun</li>
-						<li>CE_AI_LMG</li>
-						<li>Bipod_LMG</li>
-						<li>AdvancedGun</li>
-						<li>GunHeavy</li>
-					</weaponTags>
-					<researchPrerequisite>GasOperation</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Gun_Hishchnik"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.35,1.18</DrawSize>
-							<DrawOffset>0.13,-0.03</DrawOffset>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Infinity Rim Ariadna/Weapons/Melee.xml b/Patches/Infinity Rim Ariadna/Weapons/Melee.xml
deleted file mode 100644
index 87c521a2ae..0000000000
--- a/Patches/Infinity Rim Ariadna/Weapons/Melee.xml	
+++ /dev/null
@@ -1,120 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Infinity Rim: Ariadna (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_APKnife"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.18</cooldownTime>
-								<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
-								<armorPenetrationSharp>5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_APCCW"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>0.83</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>0.94</cooldownTime>
-								<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="IRA_Vodka"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2.22</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>neck</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>3.33</cooldownTime>
-								<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Neck</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Infinity Rim Ariadna/Weapons/Pistols.xml b/Patches/Infinity Rim Ariadna/Weapons/Pistols.xml
deleted file mode 100644
index 78a186c148..0000000000
--- a/Patches/Infinity Rim Ariadna/Weapons/Pistols.xml	
+++ /dev/null
@@ -1,141 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Infinity Rim: Ariadna (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_HeavyPistol" or defName="Gun_AssaultPistol"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_HeavyPistol</defName>
-					<statBases>
-						<Mass>2.39</Mass>
-						<RangedWeapon_Cooldown>0.49</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>3.41</Bulk>
-						<WorkToMake>14000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>55</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-						<Teseum>10</Teseum>
-					</costList>
-					<Properties>
-						<recoilAmount>2.96</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_44Magnum_Teseum</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>15</range>
-						<soundCast>ShotHeavyPistol</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>0.8</reloadTime>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<ammoSet>AmmoSet_TeseumPistolMagnum</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_BROOM</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-					<researchPrerequisite>Gunsmithing</researchPrerequisite>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AssaultPistol</defName>
-					<statBases>
-						<Mass>1.35</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.07</SwayFactor>
-						<Bulk>2.5</Bulk>
-						<WorkToMake>14000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>90</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-						<Teseum>5</Teseum>
-					</costList>
-					<Properties>
-						<recoilAmount>1.72</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_Teseum</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>ShotAssaultPistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_TeseumPistol</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_BROOM</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-					<researchPrerequisite>BlowbackOperation</researchPrerequisite>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Gun_AssaultPistol"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>0.93,0.93</DrawSize>
-							<DrawOffset>0.0,0.0</DrawOffset>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Infinity Rim Ariadna/Weapons/Rifles.xml b/Patches/Infinity Rim Ariadna/Weapons/Rifles.xml
deleted file mode 100644
index 226315408c..0000000000
--- a/Patches/Infinity Rim Ariadna/Weapons/Rifles.xml	
+++ /dev/null
@@ -1,211 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Infinity Rim: Ariadna (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_APRifle" or defName="Gun_APSniperRifle" or defName="Gun_Ohotnik"]/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>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_APRifle</defName>
-					<statBases>
-						<Mass>3.26</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>10.03</Bulk>
-						<WorkToMake>60000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>80</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-						<Teseum>10</Teseum>
-					</costList>
-					<Properties>
-						<recoilAmount>1.50</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_Teseum</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>65</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>ShotAPRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_TeseumRifleIntermediate</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AR</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Gun_APRifle"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.16,1.25</DrawSize>
-							<DrawOffset>0.05,-0.07</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_APSniperRifle</defName>
-					<statBases>
-						<Mass>7.30</Mass>
-						<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.6</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.35</SwayFactor>
-						<Bulk>11.92</Bulk>
-						<WorkToMake>60000</WorkToMake>
-					</statBases>
-					<costList>
-						<Teseum>18</Teseum>
-						<Steel>100</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.50</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_Teseum</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>86</range>
-						<soundCast>ShotAPSniperRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_TeseumRifleIntermediate</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_SR</li>
-						<li>Bipod_DMR</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Gun_APSniperRifle"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.25,1.45</DrawSize>
-							<DrawOffset>0.15,-0.05</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Ohotnik</defName>
-					<statBases>
-						<Mass>4.19</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1.68</SwayFactor>
-						<Bulk>12.60</Bulk>
-						<WorkToMake>24000</WorkToMake>
-					</statBases>
-					<costList>
-						<Teseum>15</Teseum>
-						<Steel>70</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-						<WoodLog>15</WoodLog>
-					</costList>
-					<Properties>
-						<recoilAmount>2.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_Teseum</defaultProjectile>
-						<warmupTime>1.9</warmupTime>
-						<range>65</range>
-						<soundCast>ShotAPSniperRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_TeseumRifleFullPower</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_SR</li>
-					</weaponTags>
-					<researchPrerequisite>Gunsmithing</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Gun_Ohotnik"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.34,1.34</DrawSize>
-							<DrawOffset>0.12,-0.10</DrawOffset>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Infinity Rim Ariadna/Weapons/Shotguns.xml b/Patches/Infinity Rim Ariadna/Weapons/Shotguns.xml
deleted file mode 100644
index d011c3b389..0000000000
--- a/Patches/Infinity Rim Ariadna/Weapons/Shotguns.xml	
+++ /dev/null
@@ -1,143 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Infinity Rim: Ariadna (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_BoardingShotgun" or defName="Gun_ChainRifle"]/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>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_BoardingShotgun</defName>
-					<statBases>
-						<Mass>2.50</Mass>
-						<RangedWeapon_Cooldown>1.0</RangedWeapon_Cooldown>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.20</SwayFactor>
-						<Bulk>7.0</Bulk>
-						<SightsEfficiency>1</SightsEfficiency>
-						<WorkToMake>20500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>65</Steel>
-						<Teseum>8</Teseum>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>3.15</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Teseum</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>16</range>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>4</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_12GaugeTeseum</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-					<researchPrerequisite>Gunsmithing</researchPrerequisite>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Gun_BoardingShotgun"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.03,1.25</DrawSize>
-							<DrawOffset>0.05,0.0</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_ChainRifle</defName>
-					<statBases>
-						<Mass>4.50</Mass>
-						<RangedWeapon_Cooldown>1.3</RangedWeapon_Cooldown>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.5</SwayFactor>
-						<Bulk>11.0</Bulk>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<WorkToMake>5800</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>65</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>3.15</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_AriadnanChainGun</defaultProjectile>
-						<warmupTime>0.8</warmupTime>
-						<range>10</range>
-						<soundCast>ShotAssaultPistol</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>5</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>4</AmmoGenPerMagOverride>
-						<reloadTime>2.5</reloadTime>
-						<ammoSet>AmmoSet_AriadnanChainGun</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-					<researchPrerequisite>Gunsmithing</researchPrerequisite>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Infused 2 Expansion/Infused2_anyTier.xml b/Patches/Infused 2 Expansion/Infused2_anyTier.xml
deleted file mode 100644
index 5c3f2be4dd..0000000000
--- a/Patches/Infused 2 Expansion/Infused2_anyTier.xml	
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Infused 2 Expansion</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Uncommon tier ========== -->
-
-				<!-- ======= Apparel =======-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Infusion.InfusionDef[defName="Pocketed"]/stats</xpath>
-					<value>
-						<stats>
-							<li>
-								<key>CarryBulk</key>
-								<value>
-									<offset>5</offset>
-								</value>
-							</li>
-						</stats>
-					</value>
-				</li>
-
-				<!-- ======= Melee Weapon =======-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Infusion.InfusionDef[defName="Speedy"]/stats/li[3]/value/offset</xpath>
-					<value>
-						<offset>0.10</offset>
-					</value>
-				</li>
-
-				<!-- ======= Ranged Weapon ======= -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Infusion.InfusionDef[defName="AimAssist"]/stats</xpath>
-					<value>
-						<stats>
-							<li>
-								<key>SightsEfficiency</key>
-								<value>
-									<offset>0.10</offset>
-								</value>
-							</li>
-						</stats>
-					</value>
-				</li>
-
-				<!-- ========== Rare tier ========== -->
-
-				<!-- ======= Apparel =======-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Infusion.InfusionDef[defName="DeepPocketed"]/stats</xpath>
-					<value>
-						<stats>
-							<li>
-								<key>CarryBulk</key>
-								<value>
-									<offset>15</offset>
-								</value>
-							</li>
-						</stats>
-					</value>
-				</li>
-
-				<!-- ======= Melee Weapon =======-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Infusion.InfusionDef[defName="Jock"]/stats/li[3]/value/offset</xpath>
-					<value>
-						<offset>0.12</offset>
-					</value>
-				</li>
-
-				<!-- ========== Legendary tier ========== -->
-
-				<!-- ======= Melee Weapon =======-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Infusion.InfusionDef[defName="Doppelganger"]/stats/li[1]/value/offset</xpath>
-					<value>
-						<offset>0.35</offset>
-					</value>
-				</li>
-
-				<!-- ======= Ranged Weapon ======= -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Infusion.InfusionDef[defName="TrueShot"]/stats</xpath>
-					<value>
-						<stats>
-							<li>
-								<key>SightsEfficiency</key>
-								<value>
-									<offset>0.25</offset>
-								</value>
-							</li>
-						</stats>
-					</value>
-				</li>
-
-				<!-- ========== Cursed tier ========== -->
-
-				<!-- ======= Ranged Weapon ======= -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Infusion.InfusionDef[defName="CurseOfGambling"]/stats</xpath>
-					<value>
-						<stats>
-							<li>
-								<key>SightsEfficiency</key>
-								<value>
-									<offset>-0.95</offset>
-								</value>
-							</li>
-						</stats>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Infusion 2/Common_tier.xml b/Patches/Infusion 2/Common_tier.xml
deleted file mode 100644
index 616f49c415..0000000000
--- a/Patches/Infusion 2/Common_tier.xml	
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Infusion 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Common tier ========== -->
-
-				<!-- ======= Apparel =======-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Infusion.InfusionDef[defName="Absorbing"]/stats/li[1]/value/offset</xpath>
-					<value>
-						<offset>0.75</offset>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Infusion.InfusionDef[defName="Hardened"]/stats/li[1]/value/offset</xpath>
-					<value>
-						<offset>0.75</offset>
-					</value>
-				</li>
-
-				<!-- ======= Melee Weapon ======= -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Infusion.InfusionDef[defName="Keen"]/stats/li[1]/value/offset</xpath>
-					<value>
-						<offset>0.10</offset>
-					</value>
-				</li>
-
-				<!-- ======= Ranged Weapon ======= -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Infusion.InfusionDef[defName="Accurate"]/stats</xpath>
-					<value>
-						<stats>
-							<li>
-								<key>SightsEfficiency</key>
-								<value>
-									<offset>0.05</offset>
-								</value>
-							</li>
-						</stats>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Infusion 2/Legendary_tier.xml b/Patches/Infusion 2/Legendary_tier.xml
deleted file mode 100644
index 2633545a96..0000000000
--- a/Patches/Infusion 2/Legendary_tier.xml	
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Infusion 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Legendary tier ========== -->
-
-				<!-- ======= Apparel =======-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Infusion.InfusionDef[defName="Protective"]/stats/li[1]/value/offset</xpath>
-					<value>
-						<offset>4.15</offset>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Infusion.InfusionDef[defName="Protective"]/stats/li[2]/value/offset</xpath>
-					<value>
-						<offset>4.15</offset>
-					</value>
-				</li>
-
-				<!-- ======= Melee Weapon =======-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Infusion.InfusionDef[defName="Accelerated"]/stats/li[3]/value/offset</xpath>
-					<value>
-						<offset>0.25</offset>
-					</value>
-				</li>
-
-				<!-- ======= Ranged Weapon ======= -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Infusion.InfusionDef[defName="Homing"]/stats</xpath>
-					<value>
-						<stats>
-							<li>
-								<key>SightsEfficiency</key>
-								<value>
-									<offset>0.16</offset>
-								</value>
-							</li>
-						</stats>
-					</value>
-				</li>
-
-				<!-- ======= Weapons Infusion =======-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Infusion.InfusionDef[defName="Guardian"]/stats/li[2]/value/offset</xpath>
-					<value>
-						<offset>2.75</offset>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Infusion.InfusionDef[defName="Guardian"]/stats/li[3]/value/offset</xpath>
-					<value>
-						<offset>2.75</offset>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Infusion 2/Rare_tier.xml b/Patches/Infusion 2/Rare_tier.xml
deleted file mode 100644
index 6ffdabe6b6..0000000000
--- a/Patches/Infusion 2/Rare_tier.xml	
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Infusion 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Rare tier ========== -->
-
-				<!-- ======= Apparel =======-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Infusion.InfusionDef[defName="Deflecting"]/stats/li[2]/value/offset</xpath>
-					<value>
-						<offset>2.75</offset>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Infusion.InfusionDef[defName="Dispersing"]/stats/li[2]/value/offset</xpath>
-					<value>
-						<offset>2.75</offset>
-					</value>
-				</li>
-
-				<!-- ======= Melee Weapon =======-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Infusion.InfusionDef[defName="Dancing"]/stats/li[2]/value/offset</xpath>
-					<value>
-						<offset>0.20</offset>
-					</value>
-				</li>
-
-				<!-- ======= Ranged Weapon ======= -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Infusion.InfusionDef[defName="Optimized"]/stats</xpath>
-					<value>
-						<stats>
-							<li>
-								<key>SightsEfficiency</key>
-								<value>
-									<offset>0.08</offset>
-								</value>
-							</li>
-						</stats>
-					</value>
-				</li>
-
-				<!-- ======= Weapons Infusion =======-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Infusion.InfusionDef[defName="Shielding"]/stats/li[2]/value/offset</xpath>
-					<value>
-						<offset>1.45</offset>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Infusion.InfusionDef[defName="Shielding"]/stats/li[3]/value/offset</xpath>
-					<value>
-						<offset>1.45</offset>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Infusion 2/Uncommon_tier.xml b/Patches/Infusion 2/Uncommon_tier.xml
deleted file mode 100644
index 9a0f6d9d57..0000000000
--- a/Patches/Infusion 2/Uncommon_tier.xml	
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Infusion 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Uncommon tier ========== -->
-
-				<!-- ======= Apparel ======= -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Infusion.InfusionDef[defName="Padded"]/stats/li[1]/value/offset</xpath>
-					<value>
-						<offset>1.45</offset>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Infusion.InfusionDef[defName="Plated"]/stats/li[1]/value/offset</xpath>
-					<value>
-						<offset>1.45</offset>
-					</value>
-				</li>
-
-				<!-- ======= Melee Weapon ======= -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Infusion.InfusionDef[defName="Nimble"]/stats/li[1]/value/offset</xpath>
-					<value>
-						<offset>0.15</offset>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Insects have chitin/ThingDefs_Items/Chitin.xml b/Patches/Insects have chitin/ThingDefs_Items/Chitin.xml
deleted file mode 100644
index b54c2cad35..0000000000
--- a/Patches/Insects have chitin/ThingDefs_Items/Chitin.xml	
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<!-- Finding the mod -->
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Insects have chitin</li>
-		</mods>
-		<!-- Once found, patching -->
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- InsectChitin -->
-				<!-- statBases. Armor values are based on the Alpha Animals patch. -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="InsectChitin"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.25</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="InsectChitin"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.05</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="InsectChitin"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.025</StuffPower_Armor_Heat>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="InsectChitin"]/statBases/SharpDamageMultiplier</xpath>
-					<value>
-						<SharpDamageMultiplier>0.6</SharpDamageMultiplier>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="InsectChitin"]/statBases/BluntDamageMultiplier</xpath>
-					<value>
-						<BluntDamageMultiplier>0.7</BluntDamageMultiplier>
-					</value>
-				</li>
-				<!-- StuffProps -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="InsectChitin"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>0.6</MeleePenetrationFactor>
-						<Mass>0.2</Mass>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/JDS Blastech Industries/CE_Patch.xml b/Patches/JDS Blastech Industries/CE_Patch.xml
deleted file mode 100644
index c5d25d3cdc..0000000000
--- a/Patches/JDS Blastech Industries/CE_Patch.xml	
+++ /dev/null
@@ -1,1186 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[JDS] Star Wars BlasTech Industries</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- DC Series -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="DC-17_Blaster_Pistol" or
-						defName="DC17B_Blaster_Pistol"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="DC-15S_Blaster_Carbine" or
-						defName="DC-15A_Blaster_Rifle" or
-						defName="Z6_Rotary_Blaster_Cannon" or
-						defName="DC-17M_Repeating_Blaster_Rifle" or
-						defName="DC15x_Sinper_Rifle"
-						]/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>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DC-15S_Blaster_Carbine</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.01</SwayFactor>
-						<Bulk>6.35</Bulk>
-						<Mass>3.5</Mass>
-						<RangedWeapon_Cooldown>.065</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Blaster_Blue_Mid</defaultProjectile>
-						<warmupTime>0.8</warmupTime>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<range>40</range>
-						<soundCast>DC-15S_Blaster_Carbine_Shot</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-					</Properties>
-					<FireModes>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DC-15A_Blaster_Rifle</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.70</SwayFactor>
-						<Bulk>12.25</Bulk>
-						<Mass>4.3</Mass>
-						<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.73</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Blaster_Blue_Mid</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
-						<range>55</range>
-						<soundCast>DC-15A_Blaster_Rifle_Shot</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<soundCastTail>GunTail_Light</soundCastTail>
-					</Properties>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DC-17M_Repeating_Blaster_Rifle</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.34</SwayFactor>
-						<Bulk>7.20</Bulk>
-						<Mass>3.5</Mass>
-						<RangedWeapon_Cooldown>.5</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.48</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Blaster_Blue_Mid</defaultProjectile>
-						<warmupTime>0.8</warmupTime>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<range>30</range>
-						<soundCast>DC-17_Blaster_Pistol_Shot</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-					</Properties>
-					<FireModes>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DC15x_Sinper_Rifle</defName>
-					<statBases>
-						<SightsEfficiency>2.3</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.7</SwayFactor>
-						<Bulk>12.25</Bulk>
-						<Mass>5</Mass>
-						<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.48</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Blaster_Blue_High</defaultProjectile>
-						<warmupTime>3</warmupTime>
-						<range>75</range>
-						<soundCast>38x-targeting-rifle-sound-effects-battlefront-ii</soundCast>
-						<muzzleFlashScale>10</muzzleFlashScale>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Z6_Rotary_Blaster_Cannon</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>8.02</Bulk>
-						<Mass>30</Mass>
-						<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.68</recoilAmount>
-						<recoilPattern>Mounted</recoilPattern>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Blaster_Blue_Low</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<burstShotCount>100</burstShotCount>
-						<range>60</range>
-						<soundCast>Z6_Rotary_Blaster_Cannon_Shot</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-					</Properties>
-					<FireModes>
-						<aimedBurstShotCount>50</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DC-17_Blaster_Pistol</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>0.87</SwayFactor>
-						<Bulk>1.75</Bulk>
-						<Mass>1.5</Mass>
-						<RangedWeapon_Cooldown>.9</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.48</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Blaster_Blue_Low</defaultProjectile>
-						<warmupTime>0.05</warmupTime>
-						<range>15</range>
-						<soundCast>DC-17_Blaster_Pistol_Shot</soundCast>
-						<muzzleFlashScale>7</muzzleFlashScale>
-						<soundCastTail>GunTail_Light</soundCastTail>
-					</Properties>
-					<FireModes />
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DC17B_Blaster_Pistol</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>0.87</SwayFactor>
-						<Bulk>1.75</Bulk>
-						<Mass>1.5</Mass>
-						<RangedWeapon_Cooldown>.9</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.48</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Blaster_Blue_Low</defaultProjectile>
-						<warmupTime>0.05</warmupTime>
-						<range>20</range>
-						<soundCast>DC-17_Blaster_Pistol_Shot</soundCast>
-						<muzzleFlashScale>7</muzzleFlashScale>
-						<soundCastTail>GunTail_Light</soundCastTail>
-					</Properties>
-					<FireModes />
-				</li>
-
-				<!-- E Series -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="SE-14_Light_Blaster_Pistol"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="E-5_Blaster_Rifle" or
-						defName="EE-3_Carbine_Rifle" or
-						defName="E-5S_Sniper_Rifle"
-						]/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>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>SE-14_Light_Blaster_Pistol</defName>
-					<statBases>
-						<SightsEfficiency>1.5</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>0.87</SwayFactor>
-						<Bulk>1.75</Bulk>
-						<Mass>1.5</Mass>
-						<RangedWeapon_Cooldown>.4</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.48</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Blaster_Red_Low</defaultProjectile>
-						<warmupTime>0.25</warmupTime>
-						<range>20</range>
-						<soundCast>E-5_Bblaster_Rifle_Shot</soundCast>
-						<muzzleFlashScale>7</muzzleFlashScale>
-						<soundCastTail>GunTail_Light</soundCastTail>
-					</Properties>
-					<FireModes />
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>E-5_Blaster_Rifle</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.34</SwayFactor>
-						<Bulk>7.20</Bulk>
-						<Mass>2.2</Mass>
-						<RangedWeapon_Cooldown>.65</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.48</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Blaster_Red_Mid</defaultProjectile>
-						<warmupTime>0.8</warmupTime>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<range>35</range>
-						<soundCast>E-5_Bblaster_Rifle_Shot</soundCast>
-						<muzzleFlashScale>6</muzzleFlashScale>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>EE-3_Carbine_Rifle</defName>
-					<statBases>
-						<SightsEfficiency>1.5</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.34</SwayFactor>
-						<Bulk>7.20</Bulk>
-						<Mass>2.2</Mass>
-						<RangedWeapon_Cooldown>.65</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.48</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Blaster_Red_Mid</defaultProjectile>
-						<warmupTime>0.8</warmupTime>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<range>40</range>
-						<soundCast>16_Carbine_Rifle_Shot</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>E-5S_Sniper_Rifle</defName>
-					<statBases>
-						<SightsEfficiency>2.5</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.34</SwayFactor>
-						<Bulk>7.20</Bulk>
-						<Mass>2.2</Mass>
-						<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.48</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Blaster_Red_High</defaultProjectile>
-						<warmupTime>3</warmupTime>
-						<range>75</range>
-						<soundCast>E-5_Bblaster_Rifle_Shot</soundCast>
-						<muzzleFlashScale>10</muzzleFlashScale>
-						<soundCastTail>GunTail_Light</soundCastTail>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- Westar Series-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Westar-34_Blaster_Pistol" or
-						defName="Westar-35_Blaster_Pistol"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Westar-M5_Blaster_Rifle"
-						]/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>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Westar-34_Blaster_Pistol</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>0.87</SwayFactor>
-						<Bulk>1.75</Bulk>
-						<Mass>1.5</Mass>
-						<RangedWeapon_Cooldown>.4</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.48</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Blaster_Red_Mid</defaultProjectile>
-						<warmupTime>0.25</warmupTime>
-						<range>15</range>
-						<soundCast>1Mandalorian_Blaster_Weapon_Shot</soundCast>
-						<muzzleFlashScale>7</muzzleFlashScale>
-						<soundCastTail>GunTail_Light</soundCastTail>
-					</Properties>
-					<FireModes />
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Westar-35_Blaster_Pistol</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>0.87</SwayFactor>
-						<Bulk>1.75</Bulk>
-						<Mass>1.5</Mass>
-						<RangedWeapon_Cooldown>.4</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.48</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Blaster_Red_Mid</defaultProjectile>
-						<warmupTime>0.25</warmupTime>
-						<range>20</range>
-						<soundCast>1Mandalorian_Blaster_Weapon_Shot</soundCast>
-						<muzzleFlashScale>7</muzzleFlashScale>
-						<soundCastTail>GunTail_Light</soundCastTail>
-					</Properties>
-					<FireModes />
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Westar-M5_Blaster_Rifle</defName>
-					<statBases>
-						<SightsEfficiency>1.3</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.34</SwayFactor>
-						<Bulk>7.20</Bulk>
-						<Mass>3.5</Mass>
-						<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.48</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Blaster_Red_Mid</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
-						<range>35</range>
-						<soundCast>DC-15A_Blaster_Rifle_Shot</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<soundCastTail>GunTail_Light</soundCastTail>
-					</Properties>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- Droid -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="B-2_Super_Droid_Wrist_Blaster" or
-						defName="Droidekas_Blaster" or
-						defName="B-2_Super_Droid_Wrist_Cannon"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>2</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>B-2_Super_Droid_Wrist_Blaster</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.01</SwayFactor>
-						<Bulk>10</Bulk>
-						<Mass>5</Mass>
-						<RangedWeapon_Cooldown>.4</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Blaster_Red_Mid</defaultProjectile>
-						<warmupTime>0.25</warmupTime>
-						<burstShotCount>2</burstShotCount>
-						<ticksBetweenBurstShots>14</ticksBetweenBurstShots>
-						<range>40</range>
-						<soundCast>B-2_Wrist_Blaster_Shot</soundCast>
-						<muzzleFlashScale>7</muzzleFlashScale>
-						<soundCastTail>GunTail_Light</soundCastTail>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Droidekas_Blaster</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.01</SwayFactor>
-						<Bulk>10</Bulk>
-						<Mass>5</Mass>
-						<RangedWeapon_Cooldown>.4</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Blaster_Red_Mid</defaultProjectile>
-						<warmupTime>0.25</warmupTime>
-						<burstShotCount>2</burstShotCount>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<range>25</range>
-						<soundCast>Droidek_Shot</soundCast>
-						<muzzleFlashScale>7</muzzleFlashScale>
-						<soundCastTail>GunTail_Light</soundCastTail>
-					</Properties>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>B-2_Super_Droid_Wrist_Cannon</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.24</ShotSpread>
-						<SwayFactor>1.48</SwayFactor>
-						<Bulk>12.70</Bulk>
-						<Mass>7.50</Mass>
-						<RangedWeapon_Cooldown>1.9</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.58</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_B2Cannon</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<ticksBetweenBurstShots>50</ticksBetweenBurstShots>
-						<range>38</range>
-						<soundCast>B-2_Wrist_Cannon_Shot</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- Mando -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Mando_Blaster_Carbine" or
-						defName="Mando_Heavy_Weapon" or
-						defName="Amban_Rifle"
-						]/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>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Mando_Blaster_Carbine</defName>
-					<statBases>
-						<SightsEfficiency>1.5</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>0.87</SwayFactor>
-						<Bulk>3.75</Bulk>
-						<Mass>2.5</Mass>
-						<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.48</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Blaster_Red_Mid</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<range>35</range>
-						<soundCast>3Mandalorian_Blaster_Weapon_Shot</soundCast>
-						<muzzleFlashScale>7</muzzleFlashScale>
-						<soundCastTail>GunTail_Light</soundCastTail>
-					</Properties>
-					<FireModes>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Mando_Heavy_Weapon</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>8.02</Bulk>
-						<Mass>30</Mass>
-						<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.78</recoilAmount>
-						<recoilPattern>Mounted</recoilPattern>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Blaster_Red_Low</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<burstShotCount>100</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<range>62</range>
-						<soundCast>4Mandalorian_Blaster_Weapon_Shot</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-					</Properties>
-					<FireModes>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Amban_Rifle</defName>
-					<statBases>
-						<SightsEfficiency>1.5</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.34</SwayFactor>
-						<Bulk>7.20</Bulk>
-						<Mass>2.2</Mass>
-						<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.48</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Blaster_Red_High</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>60</range>
-						<soundCast>3Mandalorian_Blaster_Weapon_Shot</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<soundCastTail>GunTail_Light</soundCastTail>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- Ammo -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/DamageDef[
-						defName="Blaster_Damage"
-						] </xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<DamageDef>
-							<defName>Blaster_Damage</defName>
-							<label>blaster bolt</label>
-							<workerClass>DamageWorker_AddInjury</workerClass>
-							<externalViolence>true</externalViolence>
-							<isExplosive>true</isExplosive>
-							<deathMessage>{0} has been shot to death.</deathMessage>
-							<hediff>Burn</hediff>
-							<harmAllLayersUntilOutside>true</harmAllLayersUntilOutside>
-							<impactSoundType>Blunt</impactSoundType>
-							<armorCategory>Sharp</armorCategory>
-							<minDamageToFragment>15</minDamageToFragment>
-							<defaultDamage>3</defaultDamage>
-							<buildingDamageFactor>3</buildingDamageFactor>
-							<plantDamageFactor>3</plantDamageFactor>
-							<explosionAffectOutsidePartsOnly>false</explosionAffectOutsidePartsOnly>
-							<explosionHeatEnergyPerCell>5</explosionHeatEnergyPerCell>
-							<explosionCellFleck>BlastFlame</explosionCellFleck>
-							<explosionColorCenter>(1, 0.5, 0.3)</explosionColorCenter>
-							<explosionColorEdge>(0.6, 0.5, 0.4)</explosionColorEdge>
-							<soundExplosion>Explosion_Flame</soundExplosion>
-							<combatLogRules>Damage_Flame</combatLogRules>
-							<canUseDeflectMetalEffect>false</canUseDeflectMetalEffect>
-						</DamageDef>
-
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingDef ParentName="Base556x45mmNATOBullet">
-							<defName>Bullet_Blaster_Blue_Mid</defName>
-							<label>blaster bolt</label>
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_Laser</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Blaster_Damage</damageDef>
-								<speed>150</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>13</damageAmountBase>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base762x51mmNATOBullet">
-							<defName>Bullet_Blaster_Blue_High</defName>
-							<label>blaster bolt</label>
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_Laser</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Blaster_Damage</damageDef>
-								<speed>150</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>25</damageAmountBase>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<armorPenetrationSharp>23</armorPenetrationSharp>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base45ACPBullet">
-							<defName>Bullet_Blaster_Blue_Low</defName>
-							<label>blaster bolt</label>
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_Laser</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Blaster_Damage</damageDef>
-								<speed>130</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>8</damageAmountBase>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base45ACPBullet">
-							<defName>Bullet_Blaster_Red_Low</defName>
-							<label>blaster bolt</label>
-							<graphicData>
-								<texPath>Things/Projectile/Red_Bullet_Laser</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Blaster_Damage</damageDef>
-								<speed>130</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>7</damageAmountBase>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base556x45mmNATOBullet">
-							<defName>Bullet_Blaster_Red_Mid</defName>
-							<label>blaster bolt</label>
-							<graphicData>
-								<texPath>Things/Projectile/Red_Bullet_Laser</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Blaster_Damage</damageDef>
-								<speed>150</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>10</damageAmountBase>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base556x45mmNATOBullet">
-							<defName>Bullet_Blaster_Red_High</defName>
-							<label>blaster bolt</label>
-							<graphicData>
-								<texPath>Things/Projectile/Red_Bullet_Laser</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Blaster_Damage</damageDef>
-								<speed>150</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>23</damageAmountBase>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<armorPenetrationSharp>23</armorPenetrationSharp>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base40x365mmBoforsBullet">
-							<defName>Bullet_B2Cannon</defName>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<label>b-2 droid wrist cannon shot</label>
-							<graphicData>
-								<texPath>Things/Projectile/Red_Bullet_cannon</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Blaster_Damage</damageDef>
-								<speed>80</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>60</damageAmountBase>
-								<armorPenetrationBlunt>35</armorPenetrationBlunt>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-								<explosionRadius>1.0</explosionRadius>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="DC-15A_Blaster_Rifle"
-						] </xpath>
-					<value>
-						<modExtensions>
-							<li Class="CombatExtended.GunDrawExtension">
-								<DrawSize>1.5,1.5</DrawSize>
-								<DrawOffset>0,0</DrawOffset>
-							</li>
-						</modExtensions>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="Mando_Heavy_Weapon"
-						] </xpath>
-					<value>
-						<modExtensions>
-							<li Class="CombatExtended.GunDrawExtension">
-								<DrawSize>1.35,1.35</DrawSize>
-								<DrawOffset>.5,.15</DrawOffset>
-							</li>
-						</modExtensions>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Mando_Heavy_Weapon"
-						]/graphicData/drawSize </xpath>
-					<value>
-						<drawSize>1.6</drawSize>
-					</value>
-				</li>
-
-				<!-- Melee -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Electrostaff"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>jab</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.35</cooldownTime>
-								<chanceFactor>1.6</chanceFactor>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Electrostaff_Stun</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.00</chanceFactor>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Electrostaff"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Electrostaff"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.17</MeleeCritChance>
-							<MeleeParryChance>1.45</MeleeParryChance>
-							<MeleeDodgeChance>0.9</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Vibrosword"]/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>12</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>9</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Vibrosword"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Vibrosword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>0.35</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/JDS Blastech Industries/Patch_Blastech.xml b/Patches/JDS Blastech Industries/Patch_Blastech.xml
deleted file mode 100644
index f48e843bd7..0000000000
--- a/Patches/JDS Blastech Industries/Patch_Blastech.xml	
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[JDS] Star Wars BlasTech Industries</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Blue-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="DC-15S_Blaster_Carbine" or
-						defName="DC-15A_Blaster_Rifle" or
-						defName="DC-17M_Repeating_Blaster_Rifle" or
-						defName="DC15x_Sinper_Rifle" or
-						defName="Z6_Rotary_Blaster_Cannon" or
-						defName="DC-17_Blaster_Pistol" or
-						defName="DC17B_Blaster_Pistol"
-						]/verbs/li[@Class="CombatExtended.VerbPropertiesCE"]/defaultProjectile </xpath>
-					<value>
-						<defaultProjectile>Bullet_SWPlasmaGasCartridgeBlue</defaultProjectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="DC-15S_Blaster_Carbine" or
-						defName="DC-15A_Blaster_Rifle" or
-						defName="DC-17M_Repeating_Blaster_Rifle" or
-						defName="DC15x_Sinper_Rifle" or
-						defName="Z6_Rotary_Blaster_Cannon" or
-						defName="DC-17_Blaster_Pistol" or
-						defName="DC17B_Blaster_Pistol"
-						]/comps </xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_AmmoUser">
-							<ammoSet>AmmoSet_SWPlasmaGasCartridgeBlue</ammoSet>
-						</li>
-					</value>
-				</li>
-
-				<!--Red-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="B-2_Super_Droid_Wrist_Blaster" or
-						defName="SE-14_Light_Blaster_Pistol" or
-						defName="E-5_Blaster_Rifle" or
-						defName="EE-3_Carbine_Rifle" or
-						defName="E-5S_Sniper_Rifle" or
-						defName="Droidekas_Blaster" or
-						defName="B-2_Super_Droid_Wrist_Cannon" or
-						defName="Mando_Blaster_Carbine" or
-						defName="Mando_Heavy_Weapon" or
-						defName="Westar-M5_Blaster_Rifle"
-						]/verbs/li[@Class="CombatExtended.VerbPropertiesCE"]/defaultProjectile </xpath>
-					<value>
-						<defaultProjectile>Bullet_SWPlasmaGasCartridge</defaultProjectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="B-2_Super_Droid_Wrist_Blaster" or
-						defName="SE-14_Light_Blaster_Pistol" or
-						defName="E-5_Blaster_Rifle" or
-						defName="EE-3_Carbine_Rifle" or
-						defName="E-5S_Sniper_Rifle" or
-						defName="Droidekas_Blaster" or
-						defName="B-2_Super_Droid_Wrist_Cannon" or
-						defName="Mando_Blaster_Carbine" or
-						defName="Mando_Heavy_Weapon" or
-						defName="Westar-M5_Blaster_Rifle"
-						]/comps </xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_AmmoUser">
-							<ammoSet>AmmoSet_SWPlasmaGasCartridge</ammoSet>
-						</li>
-					</value>
-				</li>
-
-				<!--Yellow-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Amban_Rifle" or
-						defName="Westar-34_Blaster_Pistol" or
-						defName="Westar-35_Blaster_Pistol"
-						]/verbs/li[@Class="CombatExtended.VerbPropertiesCE"]/defaultProjectile </xpath>
-					<value>
-						<defaultProjectile>Bullet_SWPlasmaGasCartridgeYellow</defaultProjectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="Amban_Rifle" or
-						defName="Westar-34_Blaster_Pistol" or
-						defName="Westar-35_Blaster_Pistol"
-						]/comps </xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_AmmoUser">
-							<ammoSet>AmmoSet_SWPlasmaGasCartridgeYellow</ammoSet>
-						</li>
-					</value>
-				</li>
-
-				<!-- Ammo and Reload -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="DC-15S_Blaster_Carbine" or
-						defName="DC-17M_Repeating_Blaster_Rifle" or
-						defName="E-5_Blaster_Rifle"
-						]/comps/li[@Class="CombatExtended.CompProperties_AmmoUser"] </xpath>
-					<value>
-						<magazineSize>24</magazineSize>
-						<reloadTime>3</reloadTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="Westar-M5_Blaster_Rifle" or
-						defName="DC-15A_Blaster_Rifle"
-						]/comps/li[@Class="CombatExtended.CompProperties_AmmoUser"] </xpath>
-					<value>
-						<magazineSize>20</magazineSize>
-						<reloadTime>2.4</reloadTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="DC15x_Sinper_Rifle" or
-						defName="Amban_Rifle" or
-						defName="E-5S_Sniper_Rifle"
-						]/comps/li[@Class="CombatExtended.CompProperties_AmmoUser"] </xpath>
-					<value>
-						<magazineSize>10</magazineSize>
-						<reloadTime>3</reloadTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="Z6_Rotary_Blaster_Cannon" or
-						defName="Mando_Heavy_Weapon"
-						]/comps/li[@Class="CombatExtended.CompProperties_AmmoUser"] </xpath>
-					<value>
-						<magazineSize>300</magazineSize>
-						<reloadTime>9.2</reloadTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="DC-17_Blaster_Pistol" or
-						defName="DC17B_Blaster_Pistol" or
-						defName="Mando_Blaster_Carbine" or
-						defName="SE-14_Light_Blaster_Pistol" or
-						defName="EE-3_Carbine_Rifle" or
-						defName="Westar-34_Blaster_Pistol" or
-						defName="Westar-35_Blaster_Pistol"
-						]/comps/li[@Class="CombatExtended.CompProperties_AmmoUser"] </xpath>
-					<value>
-						<magazineSize>15</magazineSize>
-						<reloadTime>2</reloadTime>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/JDS Castle Walls/ThingDefs_Tower.xml b/Patches/JDS Castle Walls/ThingDefs_Tower.xml
deleted file mode 100644
index 0fb8dca1b4..0000000000
--- a/Patches/JDS Castle Walls/ThingDefs_Tower.xml	
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[JDS] Castle Walls</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Remove refuelable property -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name = "CaslteDefendsBase"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
-				</li>
-
-				<!-- Replace vanilla thingClass -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name = "CaslteDefendsBase"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name = "CaslteDefendsBase"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name = "CaslteDefendsBase"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>5</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<!-- Tower Turret -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Defend_Tower_GreatBow</defName>
-					<statBases>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>1</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>5.00</Bulk>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_GreatArrow_Stone</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>32</range>
-						<soundCast>Bow_Large</soundCast>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>10</reloadTime>
-						<ammoSet>AmmoSet_GreatArrow</ammoSet>
-					</AmmoUser>
-					<weaponTags Inherit="False">
-						<li>TurretGun</li>
-					</weaponTags>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/JDS EFT Apparel/Apparel_Armor.xml b/Patches/JDS EFT Apparel/Apparel_Armor.xml
deleted file mode 100644
index 63a7621502..0000000000
--- a/Patches/JDS EFT Apparel/Apparel_Armor.xml	
+++ /dev/null
@@ -1,336 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[JDS] EFT Apparel</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Class 2 === -->
-
-				<!-- == Module-3M / PAC SA / 6B2 == -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_Module-3M" or
-						defName = "JDSTarkov_PACA_Soft_Armor" or
-						defName = "JDSTarkov_6B2_Armor"
-						]/statBases
-					</xpath>
-					<value>
-						<Bulk>4.5</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<!-- == statBases == -->
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_Module-3M" or
-						defName = "JDSTarkov_PACA_Soft_Armor" or
-						defName = "JDSTarkov_6B2_Armor"
-						]/statBases/ArmorRating_Sharp
-					</xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_Module-3M" or
-						defName = "JDSTarkov_PACA_Soft_Armor" or
-						defName = "JDSTarkov_6B2_Armor"
-						]/statBases/ArmorRating_Blunt
-					</xpath>
-					<value>
-						<ArmorRating_Blunt>8</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_Module-3M" or
-						defName = "JDSTarkov_PACA_Soft_Armor" or
-						defName = "JDSTarkov_6B2_Armor"
-						]/statBases/ArmorRating_Heat
-					</xpath>
-					<value>
-						<ArmorRating_Heat>0.24</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!-- === Class 3 === -->
-
-				<!-- == MF-UNTAR / Zhuk-3 PA / 6B23-1 / BNTI Kirasa-N == -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_MF-UNTAR_Armor_Vest" or
-						defName = "JDSTarkov_Zhuk-3_Press_Armor" or
-						defName = "JDSTarkov_6B23-1_Armor" or
-						defName = "JDSTarkov_BNTI_Kirasa-N_Armor"
-						]/statBases
-					</xpath>
-					<value>
-						<Bulk>6.5</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-
-				<!-- == statBases == -->
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_MF-UNTAR_Armor_Vest" or
-						defName = "JDSTarkov_Zhuk-3_Press_Armor" or
-						defName = "JDSTarkov_6B23-1_Armor" or
-						defName = "JDSTarkov_BNTI_Kirasa-N_Armor"
-						]/statBases/ArmorRating_Sharp
-					</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_MF-UNTAR_Armor_Vest" or
-						defName = "JDSTarkov_Zhuk-3_Press_Armor" or
-						defName = "JDSTarkov_6B23-1_Armor" or
-						defName = "JDSTarkov_BNTI_Kirasa-N_Armor"
-						]/statBases/ArmorRating_Blunt
-					</xpath>
-					<value>
-						<ArmorRating_Blunt>18</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_MF-UNTAR_Armor_Vest" or
-						defName = "JDSTarkov_Zhuk-3_Press_Armor" or
-						defName = "JDSTarkov_6B23-1_Armor" or
-						defName = "JDSTarkov_BNTI_Kirasa-N_Armor"
-						]/statBases/ArmorRating_Heat
-					</xpath>
-					<value>
-						<ArmorRating_Heat>0.36</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!-- === Class 4 === -->
-
-				<!-- == Highcom Trooper TFO / 6B13 / 6B23-2 == -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_Highcom_Trooper_TFO_Armor" or
-						defName = "JDSTarkov_6B13_Assault_Armor" or
-						defName = "JDSTarkov_6B23-2_Armor"
-						]/statBases
-					</xpath>
-					<value>
-						<Bulk>7</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-
-				<!-- == statBases == -->
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_Highcom_Trooper_TFO_Armor" or
-						defName = "JDSTarkov_6B13_Assault_Armor" or
-						defName = "JDSTarkov_6B23-2_Armor"
-						]/statBases/ArmorRating_Sharp
-					</xpath>
-					<value>
-						<ArmorRating_Sharp>15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_Highcom_Trooper_TFO_Armor" or
-						defName = "JDSTarkov_6B13_Assault_Armor" or
-						defName = "JDSTarkov_6B23-2_Armor"
-						]/statBases/ArmorRating_Blunt
-					</xpath>
-					<value>
-						<ArmorRating_Blunt>26</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_Highcom_Trooper_TFO_Armor" or
-						defName = "JDSTarkov_6B13_Assault_Armor" or
-						defName = "JDSTarkov_6B23-2_Armor"
-						]/statBases/ArmorRating_Heat
-					</xpath>
-					<value>
-						<ArmorRating_Heat>0.36</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!-- === Class 5 === -->
-
-				<!-- == FORT Redut-M / 6B13 M / IOTV Gen4 / BNTI Gzhel-K / FORT Defender-2 == -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_FORT_Redut-M_Body_Armor" or
-						defName = "JDSTarkov_6B13_M_Assault_Armor" or
-						defName = "JDSTarkov_IOTV_Gen4_Armor" or
-						defName = "JDSTarkov_BNTI_Gzhel-K_Armor" or
-						defName = "JDSTarkov_FORT_Defender-2_Body_Armor"
-						]/statBases
-					</xpath>
-					<value>
-						<Bulk>7</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<!-- == IOTV Gen4 Armor (Assault) / IOTV Gen4 Armor (Assault) / FORT Redut-T5 == -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_IOTV_Gen4_ArmorAssaultkit" or
-						defName = "JDSTarkov_IOTV_Gen4_ArmorFullProtection" or
-						defName = "JDSTarkov_FORT_Redut-T5_Body_Armor"
-						]/statBases
-					</xpath>
-					<value>
-						<Bulk>8.5</Bulk>
-						<WornBulk>3.5</WornBulk>
-					</value>
-				</li>
-
-				<!-- == statBases == -->
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_FORT_Redut-M_Body_Armor" or
-						defName = "JDSTarkov_6B13_M_Assault_Armor" or
-						defName = "JDSTarkov_IOTV_Gen4_Armor" or
-						defName = "JDSTarkov_BNTI_Gzhel-K_Armor" or
-						defName = "JDSTarkov_FORT_Defender-2_Body_Armor" or
-						defName = "JDSTarkov_IOTV_Gen4_ArmorAssaultkit" or
-						defName = "JDSTarkov_IOTV_Gen4_ArmorFullProtection" or
-						defName = "JDSTarkov_FORT_Redut-T5_Body_Armor"
-						]/statBases/ArmorRating_Sharp
-					</xpath>
-					<value>
-						<ArmorRating_Sharp>14.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_FORT_Redut-M_Body_Armor" or
-						defName = "JDSTarkov_6B13_M_Assault_Armor" or
-						defName = "JDSTarkov_IOTV_Gen4_Armor" or
-						defName = "JDSTarkov_BNTI_Gzhel-K_Armor" or
-						defName = "JDSTarkov_FORT_Defender-2_Body_Armor" or
-						defName = "JDSTarkov_IOTV_Gen4_ArmorAssaultkit" or
-						defName = "JDSTarkov_IOTV_Gen4_ArmorFullProtection" or
-						defName = "JDSTarkov_FORT_Redut-T5_Body_Armor"
-						]/statBases/ArmorRating_Blunt
-					</xpath>
-					<value>
-						<ArmorRating_Blunt>26</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_FORT_Redut-M_Body_Armor" or
-						defName = "JDSTarkov_6B13_M_Assault_Armor" or
-						defName = "JDSTarkov_IOTV_Gen4_Armor" or
-						defName = "JDSTarkov_BNTI_Gzhel-K_Armor" or
-						defName = "JDSTarkov_FORT_Defender-2_Body_Armor" or
-						defName = "JDSTarkov_IOTV_Gen4_ArmorAssaultkit" or
-						defName = "JDSTarkov_IOTV_Gen4_ArmorFullProtection" or
-						defName = "JDSTarkov_FORT_Redut-T5_Body_Armor"
-						]/statBases/ArmorRating_Heat
-					</xpath>
-					<value>
-						<ArmorRating_Heat>0.36</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!-- === Class 6 === -->
-
-				<!-- == LBT 6094A SPC == -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "JDSTarkov_LBT_6094A_Slick_Plate_Carrier"]/statBases</xpath>
-					<value>
-						<Bulk>7.5</Bulk>
-						<WornBulk>4</WornBulk>
-					</value>
-				</li>
-
-				<!-- == 6B43 Z-Sh 6A == -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "JDSTarkov_6B43_Zabralo-Sh_6A_Armor"]/statBases</xpath>
-					<value>
-						<Bulk>9</Bulk>
-						<WornBulk>5.5</WornBulk>
-					</value>
-				</li>
-
-				<!-- == statBases == -->
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_6B43_Zabralo-Sh_6A_Armor" or
-						defName = "JDSTarkov_LBT_6094A_Slick_Plate_Carrier"
-						]/statBases/ArmorRating_Sharp
-					</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_6B43_Zabralo-Sh_6A_Armor" or
-						defName = "JDSTarkov_LBT_6094A_Slick_Plate_Carrier"
-						]/statBases/ArmorRating_Blunt
-					</xpath>
-					<value>
-						<ArmorRating_Blunt>32</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_6B43_Zabralo-Sh_6A_Armor" or
-						defName = "JDSTarkov_LBT_6094A_Slick_Plate_Carrier"
-						]/statBases/ArmorRating_Heat
-					</xpath>
-					<value>
-						<ArmorRating_Heat>0.36</ArmorRating_Heat>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/JDS EFT Apparel/Apparel_Backpacks.xml b/Patches/JDS EFT Apparel/Apparel_Backpacks.xml
deleted file mode 100644
index 24f3563a1a..0000000000
--- a/Patches/JDS EFT Apparel/Apparel_Backpacks.xml	
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[JDS] EFT Apparel</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Backpacks  === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="JDSFrontierBackpackBase"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Shoulders</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="JDSFrontierBackpackBase"]/apparel/layers</xpath>
-					<value>
-						<li>Backpack</li>
-					</value>
-				</li>
-
-				<!-- == statBases == -->
-				<!-- Sling / Small Packs -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_Backpack_TacticalSling" or
-						defName = "JDSTarkov_Backpack_T-Bag" or
-						defName = "JDSTarkov_Backpack_Beta2Bag" or
-						defName = "JDSTarkov_Backpack_MBSS" or
-						defName = "JDSTarkov_Backpack_DayPack" or
-						defName = "JDSTarkov_Backpack_SFMP"
-						]/statBases
-					</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<!-- Medium Packs -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_Backpack_Paratus" or
-						defName = "JDSTarkov_Backpack_Tri-Zip" or
-						defName = "JDSTarkov_Backpack_F5bag" or
-						defName = "JDSTarkov_Backpack_Mechanism" or
-						defName = "JDSTarkov_Backpack_AttackTwo" or
-						defName = "JDSTarkov_Backpack_ArmyBag" or
-						defName = "JDSTarkov_Backpack_Berkut" or
-						defName = "JDSTarkov_Backpack_ScavBP"
-						]/statBases
-					</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<!-- Large Packs -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_Backpack_6SH118bag" or
-						defName = "JDSTarkov_Backpack_F4Bag" or
-						defName = "JDSTarkov_Backpack_Blackjack50Bag" or
-						defName = "JDSTarkov_Backpack_Pilgrim"
-						]/statBases
-					</xpath>
-					<value>
-						<Bulk>20</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<!-- == CarryBulk == -->
-				<!-- Sling Packs -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JDSTarkov_Backpack_TacticalSling" or defName="JDSTarkov_Backpack_T-Bag"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>10</CarryBulk>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Small Packs -->
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_Backpack_Beta2Bag" or
-						defName = "JDSTarkov_Backpack_MBSS" or
-						defName = "JDSTarkov_Backpack_DayPack" or
-						defName = "JDSTarkov_Backpack_SFMP"
-						]/equippedStatOffsets
-					</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>20</CarryBulk>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Medium Packs -->
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_Backpack_Paratus" or
-						defName = "JDSTarkov_Backpack_Tri-Zip" or
-						defName = "JDSTarkov_Backpack_F5bag" or
-						defName = "JDSTarkov_Backpack_Mechanism" or
-						defName = "JDSTarkov_Backpack_AttackTwo" or
-						defName = "JDSTarkov_Backpack_ArmyBag" or
-						defName = "JDSTarkov_Backpack_Berkut" or
-						defName = "JDSTarkov_Backpack_ScavBP"
-						]/equippedStatOffsets
-					</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>30</CarryBulk>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Large Packs -->
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_Backpack_6SH118bag" or
-						defName = "JDSTarkov_Backpack_F4Bag" or
-						defName = "JDSTarkov_Backpack_Blackjack50Bag" or
-						defName = "JDSTarkov_Backpack_Pilgrim"
-						]/equippedStatOffsets
-					</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>50</CarryBulk>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/JDS EFT Apparel/Apparel_ChestRigs.xml b/Patches/JDS EFT Apparel/Apparel_ChestRigs.xml
deleted file mode 100644
index 48dcb67a04..0000000000
--- a/Patches/JDS EFT Apparel/Apparel_ChestRigs.xml	
+++ /dev/null
@@ -1,368 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[JDS] EFT Apparel</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Armored === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="JDSFrontierChestRigBase"]/apparel/layers</xpath>
-					<value>
-						<li>Webbing</li>
-					</value>
-				</li>
-
-				<!-- == Remove CarryingCapacity == -->
-				<li Class="PatchOperationRemove">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_6B5-16_Zh-86_rig" or
-						defName = "JDSTarkov_6B3TM-01M" or
-						defName = "JDSTarkov_6B5-15_Zh-86_rig" or
-						defName = "JDSTarkov_ANA_Tactical_M2_rig" or
-						defName = "JDSTarkov_ANA_Tactical_M1_rig" or
-						defName = "JDSTarkov_Crye_Precision_AVS" or
-						defName = "JDSTarkov_Ars_Arma_A18_Skanda" or
-						defName = "JDSTarkov_Wartech_TV-110_rig" or
-						defName = "JDSTarkov_5_11_Tactec_plate_carrier" or
-						defName = "JDSTarkov_Ars_Arma_CPC_MOD_2_rig"
-						]/equippedStatOffsets/CarryingCapacity
-					</xpath>
-				</li>
-
-				<!-- == Add CarryBulk == -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_6B5-16_Zh-86_rig" or
-						defName = "JDSTarkov_6B3TM-01M" or
-						defName = "JDSTarkov_6B5-15_Zh-86_rig" or
-						defName = "JDSTarkov_ANA_Tactical_M2_rig" or
-						defName = "JDSTarkov_5_11_Tactec_plate_carrier" or
-						defName = "JDSTarkov_ANA_Tactical_M1_rig" or
-						defName = "JDSTarkov_Crye_Precision_AVS" or
-						defName = "JDSTarkov_Ars_Arma_A18_Skanda" or
-						defName = "JDSTarkov_Wartech_TV-110_rig" or
-						defName = "JDSTarkov_Ars_Arma_CPC_MOD_2_rig"
-						]/equippedStatOffsets
-					</xpath>
-					<value>
-						<CarryBulk>15</CarryBulk>
-					</value>
-				</li>
-
-				<!-- === ReloadSpeed === -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_6B5-16_Zh-86_rig" or
-						defName = "JDSTarkov_6B3TM-01M" or
-						defName = "JDSTarkov_6B5-15_Zh-86_rig" or
-						defName = "JDSTarkov_5_11_Tactec_plate_carrier"
-						]/equippedStatOffsets
-					</xpath>
-					<value>
-						<ReloadSpeed>0.05</ReloadSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_ANA_Tactical_M2_rig" or
-						defName = "JDSTarkov_ANA_Tactical_M1_rig" or
-						defName = "JDSTarkov_Crye_Precision_AVS" or
-						defName = "JDSTarkov_Ars_Arma_A18_Skanda" or
-						defName = "JDSTarkov_Wartech_TV-110_rig" or
-						defName = "JDSTarkov_Ars_Arma_CPC_MOD_2_rig"
-						]/equippedStatOffsets
-					</xpath>
-					<value>
-						<ReloadSpeed>0.1</ReloadSpeed>
-					</value>
-				</li>
-
-				<!-- == 6B5-16 / 6B3TM-01M / 6B5-15 / ANA Tactical M2 / ANA Tactical M1 / Cry Precn AVS ==  -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_6B5-16_Zh-86_rig" or
-						defName = "JDSTarkov_6B3TM-01M" or
-						defName = "JDSTarkov_6B5-15_Zh-86_rig" or
-						defName = "JDSTarkov_ANA_Tactical_M2_rig" or
-						defName = "JDSTarkov_ANA_Tactical_M1_rig" or
-						defName = "JDSTarkov_Crye_Precision_AVS"
-						]/statBases
-					</xpath>
-					<value>
-						<Bulk>7.5</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<!-- == 6B5-16 / 6B3TM-01M / 6B5-15 / ANA Tactical M2 / ANA Tactical M1 / Cry Prec AVS / Ars Arma A18 / Wartech TV-110 ==  -->
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_6B5-16_Zh-86_rig" or
-						defName = "JDSTarkov_6B3TM-01M" or
-						defName = "JDSTarkov_6B5-15_Zh-86_rig" or
-						defName = "JDSTarkov_ANA_Tactical_M2_rig" or
-						defName = "JDSTarkov_ANA_Tactical_M1_rig" or
-						defName = "JDSTarkov_Crye_Precision_AVS" or
-						defName = "JDSTarkov_Ars_Arma_A18_Skanda" or
-						defName = "JDSTarkov_Wartech_TV-110_rig"
-						]/statBases/ArmorRating_Sharp
-					</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_6B5-16_Zh-86_rig" or
-						defName = "JDSTarkov_6B3TM-01M" or
-						defName = "JDSTarkov_6B5-15_Zh-86_rig" or
-						defName = "JDSTarkov_ANA_Tactical_M2_rig" or
-						defName = "JDSTarkov_ANA_Tactical_M1_rig" or
-						defName = "JDSTarkov_Crye_Precision_AVS" or
-						defName = "JDSTarkov_Ars_Arma_A18_Skanda" or
-						defName = "JDSTarkov_Wartech_TV-110_rig"
-						]/statBases/ArmorRating_Blunt
-					</xpath>
-					<value>
-						<ArmorRating_Blunt>24</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_6B5-16_Zh-86_rig" or
-						defName = "JDSTarkov_6B3TM-01M" or
-						defName = "JDSTarkov_6B5-15_Zh-86_rig" or
-						defName = "JDSTarkov_ANA_Tactical_M2_rig" or
-						defName = "JDSTarkov_ANA_Tactical_M1_rig" or
-						defName = "JDSTarkov_Crye_Precision_AVS" or
-						defName = "JDSTarkov_Ars_Arma_A18_Skanda" or
-						defName = "JDSTarkov_Wartech_TV-110_rig"
-						]/statBases/ArmorRating_Heat
-					</xpath>
-					<value>
-						<ArmorRating_Heat>0.36</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!-- == Ars Arma A18 / Wartech TV-110 / 5.11 Tactec / Ars Arma CPC == -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_Ars_Arma_A18_Skanda" or
-						defName = "JDSTarkov_Wartech_TV-110_rig" or
-						defName = "JDSTarkov_5_11_Tactec_plate_carrier" or
-						defName = "JDSTarkov_Ars_Arma_CPC_MOD_2_rig"
-						]/statBases
-					</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-
-				<!-- == 5.11 Tactec / Ars Arma CPC == -->
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_5_11_Tactec_plate_carrier" or
-						defName = "JDSTarkov_Ars_Arma_CPC_MOD_2_rig"
-						]/statBases/ArmorRating_Sharp
-					</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_5_11_Tactec_plate_carrier" or
-						defName = "JDSTarkov_Ars_Arma_CPC_MOD_2_rig"
-						]/statBases/ArmorRating_Blunt
-					</xpath>
-					<value>
-						<ArmorRating_Blunt>28</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_5_11_Tactec_plate_carrier" or
-						defName = "JDSTarkov_Ars_Arma_CPC_MOD_2_rig"
-						]/statBases/ArmorRating_Heat
-					</xpath>
-					<value>
-						<ArmorRating_Heat>0.36</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!-- === Unarmored === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef Name="EFTWebbingBase" ParentName="JDSFrontierChestRigBase" Abstract="True">
-							<apparel Inherit="False">
-								<bodyPartGroups>
-									<li>Shoulders</li>
-								</bodyPartGroups>
-								<layers>
-									<li>Webbing</li>
-								</layers>
-								<tags>
-									<li>MilitaryArmor</li>
-								</tags>
-								<defaultOutfitTags>
-									<li>Soldier</li>
-								</defaultOutfitTags>
-							</apparel>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_Scav_Vest" or
-						defName = "JDSTarkov_Spiritus_Systems" or
-						defName = "JDSTarkov_SOE_Micro" or
-						defName = "JDSTarkov_Wartech_TV-109_Rig" or
-						defName = "JDSTarkov_UMTBS_6sh112_Rig" or
-						defName = "JDSTarkov_Splav_Tarzan_M22_Rig" or
-						defName = "JDSTarkov_Haley_Strategic_D3CRX" or
-						defName = "JDSTarkov_Triton_M43-A" or
-						defName = "JDSTarkov_Commando_Chest_Harness" or
-						defName = "JDSTarkov_Direct_Action_Compact" or
-						defName = "JDSTarkov_LBT-1961A_Load_Bearing" or
-						defName = "JDSTarkov_BlackRock" or
-						defName = "JDSTarkov_Wartech_MK3_Rig" or
-						defName = "JDSTarkov_ANA_Tactical" or
-						defName = "JDSTarkov_Velocity_Systems" or
-						defName = "JDSTarkov_Belt-A"
-						]
-					</xpath>
-					<attribute>ParentName</attribute>
-					<value>EFTWebbingBase</value>
-				</li>
-
-				<!-- == Remove Stuff  == -->
-				<li Class="PatchOperationRemove">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_Scav_Vest" or
-						defName = "JDSTarkov_Spiritus_Systems" or
-						defName = "JDSTarkov_SOE_Micro" or
-						defName = "JDSTarkov_Wartech_TV-109_Rig" or
-						defName = "JDSTarkov_UMTBS_6sh112_Rig" or
-						defName = "JDSTarkov_Splav_Tarzan_M22_Rig" or
-						defName = "JDSTarkov_Haley_Strategic_D3CRX" or
-						defName = "JDSTarkov_Triton_M43-A" or
-						defName = "JDSTarkov_Commando_Chest_Harness" or
-						defName = "JDSTarkov_Direct_Action_Compact" or
-						defName = "JDSTarkov_LBT-1961A_Load_Bearing" or
-						defName = "JDSTarkov_BlackRock" or
-						defName = "JDSTarkov_Wartech_MK3_Rig" or
-						defName = "JDSTarkov_ANA_Tactical" or
-						defName = "JDSTarkov_Velocity_Systems" or
-						defName = "JDSTarkov_Belt-A"
-						]/statBases/ArmorRating_Sharp |
-						Defs/ThingDef[
-						defName = "JDSTarkov_Triton_M43-A" or
-						defName = "JDSTarkov_BlackRock" or
-						defName = "JDSTarkov_Wartech_MK3_Rig" or
-						defName = "JDSTarkov_ANA_Tactical" or
-						defName = "JDSTarkov_Velocity_Systems" or
-						defName = "JDSTarkov_Belt-A"
-						]/statBases/ArmorRating_Blunt |
-						Defs/ThingDef[
-						defName = "JDSTarkov_Scav_Vest" or
-						defName = "JDSTarkov_Spiritus_Systems" or
-						defName = "JDSTarkov_SOE_Micro" or
-						defName = "JDSTarkov_Wartech_TV-109_Rig" or
-						defName = "JDSTarkov_UMTBS_6sh112_Rig" or
-						defName = "JDSTarkov_Splav_Tarzan_M22_Rig" or
-						defName = "JDSTarkov_Haley_Strategic_D3CRX" or
-						defName = "JDSTarkov_Triton_M43-A" or
-						defName = "JDSTarkov_Commando_Chest_Harness" or
-						defName = "JDSTarkov_Direct_Action_Compact" or
-						defName = "JDSTarkov_LBT-1961A_Load_Bearing" or
-						defName = "JDSTarkov_BlackRock" or
-						defName = "JDSTarkov_Wartech_MK3_Rig" or
-						defName = "JDSTarkov_ANA_Tactical" or
-						defName = "JDSTarkov_Velocity_Systems" or
-						defName = "JDSTarkov_Belt-A"
-						]/equippedStatOffsets/CarryingCapacity
-					</xpath>
-				</li>
-
-				<!-- == Add CarryBulk == -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_Scav_Vest" or
-						defName = "JDSTarkov_Spiritus_Systems" or
-						defName = "JDSTarkov_SOE_Micro" or
-						defName = "JDSTarkov_Wartech_TV-109_Rig" or
-						defName = "JDSTarkov_UMTBS_6sh112_Rig" or
-						defName = "JDSTarkov_Splav_Tarzan_M22_Rig"
-						]/equippedStatOffsets
-					</xpath>
-					<value>
-						<CarryBulk>10</CarryBulk>
-						<ReloadSpeed>0.06</ReloadSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_Haley_Strategic_D3CRX" or
-						defName = "JDSTarkov_Triton_M43-A" or
-						defName = "JDSTarkov_Commando_Chest_Harness" or
-						defName = "JDSTarkov_Direct_Action_Compact" or
-						defName = "JDSTarkov_LBT-1961A_Load_Bearing"
-						]/equippedStatOffsets
-					</xpath>
-					<value>
-						<CarryBulk>18</CarryBulk>
-						<ReloadSpeed>0.1</ReloadSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_BlackRock" or
-						defName = "JDSTarkov_Wartech_MK3_Rig" or
-						defName = "JDSTarkov_ANA_Tactical" or
-						defName = "JDSTarkov_Velocity_Systems" or
-						defName = "JDSTarkov_Belt-A"
-						]/equippedStatOffsets
-					</xpath>
-					<value>
-						<CarryBulk>30</CarryBulk>
-						<ReloadSpeed>0.12</ReloadSpeed>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/JDS EFT Apparel/Apparel_Headgear.xml b/Patches/JDS EFT Apparel/Apparel_Headgear.xml
deleted file mode 100644
index aa915cc8fb..0000000000
--- a/Patches/JDS EFT Apparel/Apparel_Headgear.xml	
+++ /dev/null
@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[JDS] EFT Apparel</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Balaclavas === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="JDSFrontierFaceMaskBase"]/apparel/layers</xpath>
-					<value>
-						<layers>
-							<li>OnHead</li>
-						</layers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="JDSFrontierFaceMaskBase"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>UpperHead</li>
-							<li>Teeth</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_Headgear_Balaclava" or
-						defName = "JDSTarkov_Headwear_Balaclava2_Mask" or
-						defName = "JDSTarkov_Headwear_Balaclava3_Mask" or
-						defName = "JDSTarkov_Headwear_Balaclava4_Mask" or
-						defName = "JDSTarkov_Headwear_Balaclava5_Mask" or
-						defName = "JDSTarkov_Headwear_Balaclava6_Mask" or
-						defName = "JDSTarkov_Headwear_Balaclava7_Mask"
-						]/statBases/ArmorRating_Sharp |
-						Defs/ThingDef[
-						defName = "JDSTarkov_Headgear_Balaclava" or
-						defName = "JDSTarkov_Headwear_Balaclava2_Mask" or
-						defName = "JDSTarkov_Headwear_Balaclava3_Mask" or
-						defName = "JDSTarkov_Headwear_Balaclava4_Mask" or
-						defName = "JDSTarkov_Headwear_Balaclava5_Mask" or
-						defName = "JDSTarkov_Headwear_Balaclava6_Mask" or
-						defName = "JDSTarkov_Headwear_Balaclava7_Mask"
-						]/statBases/ArmorRating_Blunt |
-						Defs/ThingDef[
-						defName = "JDSTarkov_Headgear_Balaclava" or
-						defName = "JDSTarkov_Headwear_Balaclava2_Mask" or
-						defName = "JDSTarkov_Headwear_Balaclava3_Mask" or
-						defName = "JDSTarkov_Headwear_Balaclava4_Mask" or
-						defName = "JDSTarkov_Headwear_Balaclava5_Mask" or
-						defName = "JDSTarkov_Headwear_Balaclava6_Mask" or
-						defName = "JDSTarkov_Headwear_Balaclava7_Mask"
-						]/statBases/ArmorRating_Heat |
-						Defs/ThingDef[
-						defName = "JDSTarkov_Headgear_Balaclava" or
-						defName = "JDSTarkov_Headwear_Balaclava2_Mask" or
-						defName = "JDSTarkov_Headwear_Balaclava3_Mask" or
-						defName = "JDSTarkov_Headwear_Balaclava4_Mask" or
-						defName = "JDSTarkov_Headwear_Balaclava5_Mask" or
-						defName = "JDSTarkov_Headwear_Balaclava6_Mask" or
-						defName = "JDSTarkov_Headwear_Balaclava7_Mask"
-						]/statBases/Insulation_Cold
-					</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_Headgear_Balaclava" or
-						defName = "JDSTarkov_Headwear_Balaclava2_Mask" or
-						defName = "JDSTarkov_Headwear_Balaclava3_Mask" or
-						defName = "JDSTarkov_Headwear_Balaclava4_Mask" or
-						defName = "JDSTarkov_Headwear_Balaclava5_Mask" or
-						defName = "JDSTarkov_Headwear_Balaclava6_Mask" or
-						defName = "JDSTarkov_Headwear_Balaclava7_Mask"
-						]/statBases
-					</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Blunt>0.01</ArmorRating_Blunt>
-						<ArmorRating_Sharp>0.01</ArmorRating_Sharp>
-						<Insulation_Cold>2</Insulation_Cold>
-						<Insulation_Heat>0.5</Insulation_Heat>
-					</value>
-				</li>
-
-				<!-- === Caps / Ushanka / Beanie  ===  -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef Name="EFTHeadgearCaps" ParentName="JDSFrontierFaceMaskBase" Abstract="True">
-							<apparel Inherit="False">
-								<bodyPartGroups>
-									<li>UpperHead</li>
-								</bodyPartGroups>
-								<layers>
-									<li>Overhead</li>
-								</layers>
-								<tags>
-									<li>MilitaryHeadgear</li>
-								</tags>
-								<defaultOutfitTags>
-									<li>Soldier</li>
-								</defaultOutfitTags>
-							</apparel>
-						</ThingDef>
-
-						<ThingDef Name="EFTHeadgearBeanie" ParentName="JDSFrontierFaceMaskBase" Abstract="True">
-							<apparel Inherit="False">
-								<bodyPartGroups>
-									<li>UpperHead</li>
-								</bodyPartGroups>
-								<layers>
-									<li>OnHead</li>
-								</layers>
-								<tags>
-									<li>MilitaryHeadgear</li>
-								</tags>
-								<defaultOutfitTags>
-									<li>Soldier</li>
-								</defaultOutfitTags>
-							</apparel>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- === Beanie === -->
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="JDSTarkov_Headwear_Beanie"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>EFTHeadgearBeanie</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>
-						Defs/ThingDef[defName="JDSTarkov_Headwear_Beanie"]/statBases/ArmorRating_Sharp |
-						Defs/ThingDef[defName="JDSTarkov_Headwear_Beanie"]/statBases/ArmorRating_Blunt |
-						Defs/ThingDef[defName="JDSTarkov_Headwear_Beanie"]/statBases/ArmorRating_Heat |
-						Defs/ThingDef[defName="JDSTarkov_Headwear_Beanie"]/statBases/Insulation_Cold
-					</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="JDSTarkov_Headwear_Beanie"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>0.01</ArmorRating_Sharp>
-						<ArmorRating_Blunt>0.01</ArmorRating_Blunt>
-						<Insulation_Heat>5</Insulation_Heat>
-						<Insulation_Cold>10</Insulation_Cold><!-- Personally i think 22 is too much -->
-					</value>
-				</li>
-
-				<!-- === Caps / Ushanka === -->
-				<li Class="PatchOperationAttributeSet">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_Headwear_Army_Cap" or
-						defName = "JDSTarkov_Headwear_Baseball_Cap_Black" or
-						defName = "JDSTarkov_Headwear_Baseball_Cap_Green" or
-						defName = "JDSTarkov_Headwear_Baseball_Cap_Tan" or
-						defName = "JDSTarkov_Headwear_Ushanka_Cap"
-						]
-					</xpath>
-					<attribute>ParentName</attribute>
-					<value>EFTHeadgearCaps</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_Headwear_Army_Cap" or
-						defName = "JDSTarkov_Headwear_Baseball_Cap_Black" or
-						defName = "JDSTarkov_Headwear_Baseball_Cap_Green" or
-						defName = "JDSTarkov_Headwear_Baseball_Cap_Tan" or
-						defName = "JDSTarkov_Headwear_Ushanka_Cap"
-						]/statBases/ArmorRating_Sharp |
-						Defs/ThingDef[
-						defName = "JDSTarkov_Headwear_Army_Cap" or
-						defName = "JDSTarkov_Headwear_Baseball_Cap_Black" or
-						defName = "JDSTarkov_Headwear_Baseball_Cap_Green" or
-						defName = "JDSTarkov_Headwear_Baseball_Cap_Tan" or
-						defName = "JDSTarkov_Headwear_Ushanka_Cap"
-						]/statBases/ArmorRating_Blunt |
-						Defs/ThingDef[
-						defName = "JDSTarkov_Headwear_Army_Cap" or
-						defName = "JDSTarkov_Headwear_Baseball_Cap_Black" or
-						defName = "JDSTarkov_Headwear_Baseball_Cap_Green" or
-						defName = "JDSTarkov_Headwear_Baseball_Cap_Tan" or
-						defName = "JDSTarkov_Headwear_Ushanka_Cap"
-						]/statBases/ArmorRating_Heat |
-						Defs/ThingDef[
-						defName = "JDSTarkov_Headwear_Army_Cap" or
-						defName = "JDSTarkov_Headwear_Baseball_Cap_Black" or
-						defName = "JDSTarkov_Headwear_Baseball_Cap_Green" or
-						defName = "JDSTarkov_Headwear_Baseball_Cap_Tan"
-						]/statBases/Insulation_Cold
-					</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_Headwear_Army_Cap" or
-						defName = "JDSTarkov_Headwear_Baseball_Cap_Black" or
-						defName = "JDSTarkov_Headwear_Baseball_Cap_Green" or
-						defName = "JDSTarkov_Headwear_Baseball_Cap_Tan"
-						]/statBases
-					</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>0.01</ArmorRating_Sharp>
-						<ArmorRating_Blunt>0.01</ArmorRating_Blunt>
-						<Insulation_Cold>0.50</Insulation_Cold>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="JDSTarkov_Headwear_Ushanka_Cap"]/statBases</xpath>
-					<value>
-						<Bulk>2.5</Bulk>
-						<WornBulk>1.5</WornBulk>
-						<ArmorRating_Sharp>0.06</ArmorRating_Sharp>
-						<ArmorRating_Blunt>0.10</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/JDS EFT Apparel/Apparel_HeadgearArmor.xml b/Patches/JDS EFT Apparel/Apparel_HeadgearArmor.xml
deleted file mode 100644
index 0b656511cd..0000000000
--- a/Patches/JDS EFT Apparel/Apparel_HeadgearArmor.xml	
+++ /dev/null
@@ -1,394 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[JDS] EFT Apparel</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Helmets - Shieldless Base === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="JDSFrontierHeadgearBase"]/apparel</xpath>
-					<value>
-						<apparel>
-							<bodyPartGroups>
-								<li>UpperHead</li>
-							</bodyPartGroups>
-							<layers>
-								<li>Overhead</li>
-							</layers>
-							<tags>
-								<li>MilitaryHeadgear</li>
-							</tags>
-							<defaultOutfitTags>
-								<li>Soldier</li>
-							</defaultOutfitTags>
-							<useDeflectMetalEffect>true</useDeflectMetalEffect>
-						</apparel>
-					</value>
-				</li>
-
-				<!-- === Helmets - Face Shield / Eye Shield Base === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef Name="EFTHeadgearShield" ParentName="JDSFrontierHeadgearBase" Abstract="True">
-							<apparel Inherit="False">
-								<bodyPartGroups>
-									<li>FullHead</li>
-								</bodyPartGroups>
-								<layers>
-									<li>Overhead</li>
-								</layers>
-								<tags>
-									<li>MilitaryHeadgear</li>
-								</tags>
-								<defaultOutfitTags>
-									<li>Soldier</li>
-								</defaultOutfitTags>
-								<useDeflectMetalEffect>true</useDeflectMetalEffect>
-							</apparel>
-						</ThingDef>
-
-						<ThingDef Name="EFTHeadgearEyeShield" ParentName="JDSFrontierHeadgearBase" Abstract="True">
-							<apparel Inherit="False">
-								<bodyPartGroups>
-									<li>UpperHead</li>
-									<li>Eyes</li>
-								</bodyPartGroups>
-								<layers>
-									<li>Overhead</li>
-								</layers>
-								<tags>
-									<li>MilitaryHeadgear</li>
-								</tags>
-								<defaultOutfitTags>
-									<li>Soldier</li>
-								</defaultOutfitTags>
-								<useDeflectMetalEffect>true</useDeflectMetalEffect>
-							</apparel>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- === Helmets - Face Shield === -->
-				<li Class="PatchOperationAttributeSet">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_Headgear_Kolpak-1S_Riot_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_SHPM_Firefighter_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_PSH-97_Djeta_Helmet_Shield_UI" or
-						defName = "JDSTarkov_Headgear_Kiver_M_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_ZSh-1-2M_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_BNTI_LSHZ-2DTM_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_BNTI_LSHZ-2DTM_Helmet_Full" or
-						defName = "JDSTarkov_Headgear_Maska_1Sch_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_Altyn_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_Vulkan-5_Heavy_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_Tac-Kek_Fast_MT_Mando" or
-						defName = "JDSTarkov_Headgear_Ops-Core_Fast_mod_MT" or
-						defName = "JDSTarkov_Headgear_Ops-Core_Fast_MT_Mando" or
-						defName = "JDSTarkov_Headgear_Ops-Core_Fast_Full_MT" or
-						defName = "JDSTarkov_Headgear_Rys-T_Helmet_Shield"
-						]
-					</xpath>
-					<attribute>ParentName</attribute>
-					<value>EFTHeadgearShield</value>
-				</li>
-
-				<!-- === Helmets - Eye Shield === -->
-				<li Class="PatchOperationAttributeSet">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_Headgear_Ops-Core_Fast_MT_Helmet_Shield"
-						]
-					</xpath>
-					<attribute>ParentName</attribute>
-					<value>EFTHeadgearEyeShield</value>
-				</li>
-
-				<!-- === Remove ===  -->
-				<li Class="PatchOperationRemove">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_Headgear_Soft_Tank_Crew" or
-						defName = "JDSTarkov_Headgear_Kolpak-1S_Riot_Helmet" or
-						defName = "JDSTarkov_Headgear_Kolpak-1S_Riot_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_PSH-97_Djeta_Helmet_UI" or
-						defName = "JDSTarkov_Headgear_PSH-97_Djeta_Helmet_Shield_UI" or
-						defName = "JDSTarkov_Headgear_SHPM_Firefighter_Helmet" or
-						defName = "JDSTarkov_Headgear_SHPM_Firefighter_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_UNTAR_Helmet" or
-						defName = "JDSTarkov_Headgear_Ratnik-BSh_Helmet" or
-						defName = "JDSTarkov_Headgear_LZSh_Light_Helmet" or
-						defName = "JDSTarkov_Headgear_SSh-68_Helmet" or
-						defName = "JDSTarkov_Headgear_Kiver_M_Helmet" or
-						defName = "JDSTarkov_Headgear_Kiver_M_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_Kiver_M_Helmet_Shieldup" or
-						defName = "JDSTarkov_Headgear_SSSh_95_Sfera_S" or
-						defName = "JDSTarkov_Headgear_MSA_TC_800_Helmet" or
-						defName = "JDSTarkov_Headgear_MSA_TC_2001_Helmet" or
-						defName = "JDSTarkov_Headgear_MSA_TC_2002_Helmet" or
-						defName = "JDSTarkov_Headgear_Highcom_Striker_ACHHC_IIIA_Helmet" or
-						defName = "JDSTarkov_Headgear_Highcom_Striker_ACHHC_IIIA_Helmet_Black" or
-						defName = "JDSTarkov_Headgear_Highcom_Striker_ULACH_IIIA_Helmet" or
-						defName = "JDSTarkov_Headgear_ZSh-1-2M_Helmet" or
-						defName = "JDSTarkov_Headgear_ZSh-1-2M_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_Ops-Core_Fast_MT_Helmet" or
-						defName = "JDSTarkov_Headgear_Ops-Core_Fast_MT_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_Ops-Core_Fast_MT_Mando" or
-						defName = "JDSTarkov_Headgear_Ops-Core_Fast_mod_MT" or
-						defName = "JDSTarkov_Headgear_Ops-Core_Fast_Full_MT" or
-						defName = "JDSTarkov_Headgear_Ops-Core_Fast_MT_Ten" or
-						defName = "JDSTarkov_Headgear_BNTI_LSHZ-2DTM_Helmet" or
-						defName = "JDSTarkov_Headgear_BNTI_LSHZ-2DTM_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_BNTI_LSHZ-2DTM_Helmet_Full" or
-						defName = "JDSTarkov_Headgear_Maska_1Sch_Helmet" or
-						defName = "JDSTarkov_Headgear_Maska_1Sch_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_Maska_1Sch_Helmet_Shieldup" or
-						defName = "JDSTarkov_Headgear_Tac-Kek_Fast_MT" or
-						defName = "JDSTarkov_Headgear_Tac-Kek_Fast_MT_Mando" or
-						defName = "JDSTarkov_Headgear_Altyn_Helmet" or
-						defName = "JDSTarkov_Headgear_Altyn_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_Altyn_Helmet_Shieldup" or
-						defName = "JDSTarkov_Headgear_Rys-T_Helme" or
-						defName = "JDSTarkov_Headgear_Rys-T_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_Rys-T_Helmet_up_Shield" or
-						defName = "JDSTarkov_Headgear_Vulkan-5_Heavy_Helmet" or
-						defName = "JDSTarkov_Headgear_Vulkan-5_Heavy_Helmet_Shield"
-						]/statBases/ArmorRating_Sharp |
-						Defs/ThingDef[
-						defName = "JDSTarkov_Headgear_Soft_Tank_Crew" or
-						defName = "JDSTarkov_Headgear_Kolpak-1S_Riot_Helmet" or
-						defName = "JDSTarkov_Headgear_Kolpak-1S_Riot_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_PSH-97_Djeta_Helmet_UI" or
-						defName = "JDSTarkov_Headgear_PSH-97_Djeta_Helmet_Shield_UI" or
-						defName = "JDSTarkov_Headgear_SHPM_Firefighter_Helmet" or
-						defName = "JDSTarkov_Headgear_SHPM_Firefighter_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_UNTAR_Helmet" or
-						defName = "JDSTarkov_Headgear_Ratnik-BSh_Helmet" or
-						defName = "JDSTarkov_Headgear_LZSh_Light_Helmet" or
-						defName = "JDSTarkov_Headgear_SSh-68_Helmet" or
-						defName = "JDSTarkov_Headgear_Kiver_M_Helmet" or
-						defName = "JDSTarkov_Headgear_Kiver_M_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_Kiver_M_Helmet_Shieldup" or
-						defName = "JDSTarkov_Headgear_SSSh_95_Sfera_S" or
-						defName = "JDSTarkov_Headgear_MSA_TC_800_Helmet" or
-						defName = "JDSTarkov_Headgear_MSA_TC_2001_Helmet" or
-						defName = "JDSTarkov_Headgear_MSA_TC_2002_Helmet" or
-						defName = "JDSTarkov_Headgear_Highcom_Striker_ACHHC_IIIA_Helmet" or
-						defName = "JDSTarkov_Headgear_Highcom_Striker_ACHHC_IIIA_Helmet_Black" or
-						defName = "JDSTarkov_Headgear_Highcom_Striker_ULACH_IIIA_Helmet" or
-						defName = "JDSTarkov_Headgear_ZSh-1-2M_Helmet" or
-						defName = "JDSTarkov_Headgear_ZSh-1-2M_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_Ops-Core_Fast_MT_Helmet" or
-						defName = "JDSTarkov_Headgear_Ops-Core_Fast_MT_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_Ops-Core_Fast_MT_Mando" or
-						defName = "JDSTarkov_Headgear_Ops-Core_Fast_mod_MT" or
-						defName = "JDSTarkov_Headgear_Ops-Core_Fast_Full_MT" or
-						defName = "JDSTarkov_Headgear_Ops-Core_Fast_MT_Ten" or
-						defName = "JDSTarkov_Headgear_BNTI_LSHZ-2DTM_Helmet" or
-						defName = "JDSTarkov_Headgear_BNTI_LSHZ-2DTM_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_BNTI_LSHZ-2DTM_Helmet_Full" or
-						defName = "JDSTarkov_Headgear_Maska_1Sch_Helmet" or
-						defName = "JDSTarkov_Headgear_Maska_1Sch_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_Maska_1Sch_Helmet_Shieldup" or
-						defName = "JDSTarkov_Headgear_Tac-Kek_Fast_MT" or
-						defName = "JDSTarkov_Headgear_Tac-Kek_Fast_MT_Mando" or
-						defName = "JDSTarkov_Headgear_Altyn_Helmet" or
-						defName = "JDSTarkov_Headgear_Altyn_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_Altyn_Helmet_Shieldup" or
-						defName = "JDSTarkov_Headgear_Rys-T_Helme" or
-						defName = "JDSTarkov_Headgear_Rys-T_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_Rys-T_Helmet_up_Shield" or
-						defName = "JDSTarkov_Headgear_Vulkan-5_Heavy_Helmet" or
-						defName = "JDSTarkov_Headgear_Vulkan-5_Heavy_Helmet_Shield"
-						]/statBases/ArmorRating_Blunt |
-						Defs/ThingDef[
-						defName = "JDSTarkov_Headgear_Soft_Tank_Crew" or
-						defName = "JDSTarkov_Headgear_Kolpak-1S_Riot_Helmet" or
-						defName = "JDSTarkov_Headgear_Kolpak-1S_Riot_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_PSH-97_Djeta_Helmet_UI" or
-						defName = "JDSTarkov_Headgear_PSH-97_Djeta_Helmet_Shield_UI" or
-						defName = "JDSTarkov_Headgear_SHPM_Firefighter_Helmet" or
-						defName = "JDSTarkov_Headgear_SHPM_Firefighter_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_UNTAR_Helmet" or
-						defName = "JDSTarkov_Headgear_Ratnik-BSh_Helmet" or
-						defName = "JDSTarkov_Headgear_LZSh_Light_Helmet" or
-						defName = "JDSTarkov_Headgear_SSh-68_Helmet" or
-						defName = "JDSTarkov_Headgear_Kiver_M_Helmet" or
-						defName = "JDSTarkov_Headgear_Kiver_M_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_Kiver_M_Helmet_Shieldup" or
-						defName = "JDSTarkov_Headgear_SSSh_95_Sfera_S" or
-						defName = "JDSTarkov_Headgear_MSA_TC_800_Helmet" or
-						defName = "JDSTarkov_Headgear_MSA_TC_2001_Helmet" or
-						defName = "JDSTarkov_Headgear_MSA_TC_2002_Helmet" or
-						defName = "JDSTarkov_Headgear_Highcom_Striker_ACHHC_IIIA_Helmet" or
-						defName = "JDSTarkov_Headgear_Highcom_Striker_ACHHC_IIIA_Helmet_Black" or
-						defName = "JDSTarkov_Headgear_Highcom_Striker_ULACH_IIIA_Helmet" or
-						defName = "JDSTarkov_Headgear_ZSh-1-2M_Helmet" or
-						defName = "JDSTarkov_Headgear_ZSh-1-2M_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_Ops-Core_Fast_MT_Helmet" or
-						defName = "JDSTarkov_Headgear_Ops-Core_Fast_MT_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_Ops-Core_Fast_MT_Mando" or
-						defName = "JDSTarkov_Headgear_Ops-Core_Fast_mod_MT" or
-						defName = "JDSTarkov_Headgear_Ops-Core_Fast_Full_MT" or
-						defName = "JDSTarkov_Headgear_Ops-Core_Fast_MT_Ten" or
-						defName = "JDSTarkov_Headgear_BNTI_LSHZ-2DTM_Helmet" or
-						defName = "JDSTarkov_Headgear_BNTI_LSHZ-2DTM_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_BNTI_LSHZ-2DTM_Helmet_Full" or
-						defName = "JDSTarkov_Headgear_Maska_1Sch_Helmet" or
-						defName = "JDSTarkov_Headgear_Maska_1Sch_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_Maska_1Sch_Helmet_Shieldup" or
-						defName = "JDSTarkov_Headgear_Tac-Kek_Fast_MT" or
-						defName = "JDSTarkov_Headgear_Tac-Kek_Fast_MT_Mando" or
-						defName = "JDSTarkov_Headgear_Altyn_Helmet" or
-						defName = "JDSTarkov_Headgear_Altyn_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_Altyn_Helmet_Shieldup" or
-						defName = "JDSTarkov_Headgear_Rys-T_Helme" or
-						defName = "JDSTarkov_Headgear_Rys-T_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_Rys-T_Helmet_up_Shield" or
-						defName = "JDSTarkov_Headgear_Vulkan-5_Heavy_Helmet" or
-						defName = "JDSTarkov_Headgear_Vulkan-5_Heavy_Helmet_Shield"
-						]/statBases/ArmorRating_Heat
-					</xpath>
-				</li>
-
-				<!-- === Class 1 === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="JDSTarkov_Headgear_Soft_Tank_Crew"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>0.10</ArmorRating_Sharp>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.2</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!-- === Class 2 === -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_Headgear_Kolpak-1S_Riot_Helmet" or
-						defName = "JDSTarkov_Headgear_Kolpak-1S_Riot_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_PSH-97_Djeta_Helmet_UI" or
-						defName = "JDSTarkov_Headgear_PSH-97_Djeta_Helmet_Shield_UI" or
-						defName = "JDSTarkov_Headgear_SHPM_Firefighter_Helmet" or
-						defName = "JDSTarkov_Headgear_SHPM_Firefighter_Helmet_Shield"
-						]/statBases
-					</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
-						<ArmorRating_Blunt>4</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.4</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!-- === Class 3 === -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_Headgear_UNTAR_Helmet" or
-						defName = "JDSTarkov_Headgear_Ratnik-BSh_Helmet" or
-						defName = "JDSTarkov_Headgear_LZSh_Light_Helmet" or
-						defName = "JDSTarkov_Headgear_SSh-68_Helmet" or
-						defName = "JDSTarkov_Headgear_Kiver_M_Helmet" or
-						defName = "JDSTarkov_Headgear_Kiver_M_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_Kiver_M_Helmet_Shieldup" or
-						defName = "JDSTarkov_Headgear_SSSh_95_Sfera_S"
-						]/statBases
-					</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-						<ArmorRating_Blunt>8</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.4</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!-- === Class 4 === -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_Headgear_MSA_TC_800_Helmet" or
-						defName = "JDSTarkov_Headgear_MSA_TC_2001_Helmet" or
-						defName = "JDSTarkov_Headgear_MSA_TC_2002_Helmet" or
-						defName = "JDSTarkov_Headgear_Highcom_Striker_ACHHC_IIIA_Helmet" or
-						defName = "JDSTarkov_Headgear_Highcom_Striker_ACHHC_IIIA_Helmet_Black" or
-						defName = "JDSTarkov_Headgear_Highcom_Striker_ULACH_IIIA_Helmet" or
-						defName = "JDSTarkov_Headgear_ZSh-1-2M_Helmet" or
-						defName = "JDSTarkov_Headgear_ZSh-1-2M_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_Ops-Core_Fast_MT_Helmet" or
-						defName = "JDSTarkov_Headgear_Ops-Core_Fast_MT_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_Ops-Core_Fast_MT_Mando" or
-						defName = "JDSTarkov_Headgear_Ops-Core_Fast_mod_MT" or
-						defName = "JDSTarkov_Headgear_Ops-Core_Fast_Full_MT" or
-						defName = "JDSTarkov_Headgear_Ops-Core_Fast_MT_Ten" or
-						defName = "JDSTarkov_Headgear_BNTI_LSHZ-2DTM_Helmet" or
-						defName = "JDSTarkov_Headgear_BNTI_LSHZ-2DTM_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_BNTI_LSHZ-2DTM_Helmet_Full" or
-						defName = "JDSTarkov_Headgear_Maska_1Sch_Helmet" or
-						defName = "JDSTarkov_Headgear_Maska_1Sch_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_Maska_1Sch_Helmet_Shieldup" or
-						defName = "JDSTarkov_Headgear_Tac-Kek_Fast_MT" or
-						defName = "JDSTarkov_Headgear_Tac-Kek_Fast_MT_Mando"
-						]/statBases
-					</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-						<ArmorRating_Blunt>10</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.45</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!-- === Class 5 === -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_Headgear_Altyn_Helmet" or
-						defName = "JDSTarkov_Headgear_Altyn_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_Altyn_Helmet_Shieldup" or
-						defName = "JDSTarkov_Headgear_Rys-T_Helme" or
-						defName = "JDSTarkov_Headgear_Rys-T_Helmet_Shield" or
-						defName = "JDSTarkov_Headgear_Rys-T_Helmet_up_Shield"
-						]/statBases
-					</xpath>
-					<value>
-						<Bulk>4.5</Bulk>
-						<WornBulk>1.5</WornBulk>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-						<ArmorRating_Blunt>13</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.6</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!-- === Class 6 === -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/ThingDef[
-						defName = "JDSTarkov_Headgear_Vulkan-5_Heavy_Helmet" or
-						defName = "JDSTarkov_Headgear_Vulkan-5_Heavy_Helmet_Shield"
-						]/statBases
-					</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>2</WornBulk>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-						<ArmorRating_Blunt>22</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.6</ArmorRating_Heat>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/JDS Exiled Dawn/Ammo/Ammo_ExilePlasma.xml b/Patches/JDS Exiled Dawn/Ammo/Ammo_ExilePlasma.xml
deleted file mode 100644
index 4dbc14e257..0000000000
--- a/Patches/JDS Exiled Dawn/Ammo/Ammo_ExilePlasma.xml	
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[JDS] Exiled Dawn</li>
-					<li>[JDS] The Forge - Exiled Dawn Armory</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<CombatExtended.AmmoSetDef>
-									<defName>AmmoSet_ExileLight</defName>
-									<label>Light Plasma Cell</label>
-									<ammoTypes>
-										<Ammo_PlasmaCellPistol>Bullet_ExilePlasmaPistol</Ammo_PlasmaCellPistol>
-									</ammoTypes>
-								</CombatExtended.AmmoSetDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<CombatExtended.AmmoSetDef>
-									<defName>AmmoSet_ExileMid</defName>
-									<label>Rifle Plasma Cell</label>
-									<ammoTypes>
-										<Ammo_PlasmaCellRifle>Bullet_ExilePlasmaMid</Ammo_PlasmaCellRifle>
-									</ammoTypes>
-								</CombatExtended.AmmoSetDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<CombatExtended.AmmoSetDef>
-									<defName>AmmoSet_ExileRifle</defName>
-									<label>Rifle Plasma Cell (Accelerated)</label>
-									<ammoTypes>
-										<Ammo_PlasmaCellRifle>Bullet_ExilePlasmaHeavy</Ammo_PlasmaCellRifle>
-									</ammoTypes>
-								</CombatExtended.AmmoSetDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<CombatExtended.AmmoSetDef>
-									<defName>AmmoSet_ExileAccelerated</defName>
-									<label>Heavy Plasma Cell</label>
-									<ammoTypes>
-										<Ammo_PlasmaCellHeavy>Bullet_ExilePlasmaAccelerated</Ammo_PlasmaCellHeavy>
-									</ammoTypes>
-								</CombatExtended.AmmoSetDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<ThingDef ParentName="Base556x45mmNATOBullet">
-									<defName>Bullet_ExilePlasmaPistol</defName>
-									<label>Low Density Plasma Bolt</label>
-									<graphicData>
-										<texPath>Things/Misc/Plasma_Bullet</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<speed>100</speed>
-										<damageAmountBase>10</damageAmountBase>
-										<secondaryDamage>
-											<li>
-												<def>Flame_Secondary</def>
-												<amount>2</amount>
-											</li>
-										</secondaryDamage>
-										<armorPenetrationSharp>19</armorPenetrationSharp>
-										<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-									</projectile>
-								</ThingDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<ThingDef ParentName="Base556x45mmNATOBullet">
-									<defName>Bullet_ExilePlasmaMid</defName>
-									<label>Medium Density Plasma Bolt</label>
-									<graphicData>
-										<texPath>Things/Misc/Plasma_Bullet</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<speed>150</speed>
-										<damageAmountBase>12</damageAmountBase>
-										<secondaryDamage>
-											<li>
-												<def>Flame_Secondary</def>
-												<amount>2</amount>
-											</li>
-										</secondaryDamage>
-										<armorPenetrationSharp>26</armorPenetrationSharp>
-										<armorPenetrationBlunt>4</armorPenetrationBlunt>
-									</projectile>
-								</ThingDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<ThingDef ParentName="Base556x45mmNATOBullet">
-									<defName>Bullet_ExilePlasmaHeavy</defName>
-									<label>High Density Plasma Bolt</label>
-									<graphicData>
-										<texPath>Things/Misc/Plasma_Bullet</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<speed>150</speed>
-										<damageAmountBase>17</damageAmountBase>
-										<secondaryDamage>
-											<li>
-												<def>Flame_Secondary</def>
-												<amount>3</amount>
-											</li>
-										</secondaryDamage>
-										<armorPenetrationSharp>30</armorPenetrationSharp>
-										<armorPenetrationBlunt>9</armorPenetrationBlunt>
-									</projectile>
-								</ThingDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<ThingDef ParentName="Base556x45mmNATOBullet">
-									<defName>Bullet_ExilePlasmaAccelerated</defName>
-									<label>Accelerated Plasma Bolt</label>
-									<graphicData>
-										<texPath>Things/Misc/Plasma_Bullet</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<speed>200</speed>
-										<damageAmountBase>24</damageAmountBase>
-										<secondaryDamage>
-											<li>
-												<def>Flame_Secondary</def>
-												<amount>4</amount>
-											</li>
-										</secondaryDamage>
-										<armorPenetrationSharp>41</armorPenetrationSharp>
-										<armorPenetrationBlunt>23</armorPenetrationBlunt>
-									</projectile>
-								</ThingDef>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/JDS Exiled Dawn/PawnKindDefs/PawnKinds_Exile.xml b/Patches/JDS Exiled Dawn/PawnKindDefs/PawnKinds_Exile.xml
deleted file mode 100644
index 2b39cff105..0000000000
--- a/Patches/JDS Exiled Dawn/PawnKindDefs/PawnKinds_Exile.xml	
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[JDS] Exiled Dawn</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[defName="ExiledDawn_Common_Trader" or
-								defName="ExiledDawn_Fighter_FieldMarshalRanged" or
-								defName="ExiledDawn_Fighter_KnightCaptainRanged" or
-								@Name="ExiledDawnRangedBase" or
-								@Name="ExiledDawnGrenadierBase" or
-								@Name="ExiledDawnScholarBase"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>6</min>
-										<max>8</max>
-									</primaryMagazineCount>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[defName="ExiledDawn_Fighter_Knight" or
-								defName="ExiledDawn_Fighter_FieldMarshalMelee" or
-								@Name="ExiledDawnMeleeBase"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<shieldMoney>
-										<min>800</min>
-										<max>2000</max>
-									</shieldMoney>
-									<shieldTags>
-										<li>OutlanderShield</li>
-									</shieldTags>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/PawnKindDef[@Name="ExiledDawnFighterBase"]</xpath>
-							<value>
-								<apparelTags>
-									<li>IndustrialBasic</li>
-								</apparelTags>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/PawnKindDef[
-								defName="ExiledDawn_Fighter_KnightCaptainRanged"
-								] </xpath>
-							<value>
-								<apparelRequired />
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/PawnKindDef[defName="ExiledDawn_Common_Trader" or
-								defName="ExiledDawn_Fighter_1TrooperRanged" or
-								defName="ExiledDawn_Fighter_2TrooperRanged" or
-								defName="ExiledDawn_Fighter_3TrooperRanged" or
-								defName="ExiledDawn_Fighter_1Grenadier" or
-								defName="ExiledDawn_Fighter_2Grenadier" or
-								defName="ExiledDawn_Fighter_3Grenadier" or
-								defName="ExiledDawn_Fighter_FieldMarshalRanged" or
-								defName="ExiledDawn_Fighter_KnightCaptainRanged" or
-								defName="ExiledDawn_Fighter_KnightCaptainMelee" or
-								@Name="ExiledDawnScholarBase"
-								]/apparelRequired </xpath>
-							<value>
-								<li>CE_Apparel_Backpack</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/PawnKindDef[@Name="ExiledDawnMeleeBase"]/combatPower</xpath>
-							<value>
-								<combatPower>135</combatPower>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/PawnKindDef[@Name="ExiledDawnRangedBase"]/combatPower</xpath>
-							<value>
-								<combatPower>145</combatPower>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/PawnKindDef[@Name="ExiledDawnGrenadierBase"]/combatPower</xpath>
-							<value>
-								<combatPower>145</combatPower>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/PawnKindDef[@Name="ExiledDawnFieldMarshalBase"]/combatPower</xpath>
-							<value>
-								<combatPower>155</combatPower>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/PawnKindDef[@Name="ExiledDawnScholarBase"]/combatPower</xpath>
-							<value>
-								<combatPower>225</combatPower>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/PawnKindDef[defName="ExiledDawn_Fighter_Knight"]/combatPower</xpath>
-							<value>
-								<combatPower>250</combatPower>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/PawnKindDef[@Name="ExiledDawnKnightCaptainBase"]/combatPower</xpath>
-							<value>
-								<combatPower>265</combatPower>
-							</value>
-						</li>
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/JDS Exiled Dawn/Thingdefs_Misc/Apparel.xml b/Patches/JDS Exiled Dawn/Thingdefs_Misc/Apparel.xml
deleted file mode 100644
index a46d6b76e6..0000000000
--- a/Patches/JDS Exiled Dawn/Thingdefs_Misc/Apparel.xml	
+++ /dev/null
@@ -1,466 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[JDS] Exiled Dawn</li>
-					<li>[JDS] The Forge - Exiled Dawn Armory</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--Chestplate-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="JDSExiledChestPlate(AR)ArmorBase" or
-								@Name="JDSExiledChestPlateArmorBase"]/statBases/ArmorRating_Sharp </xpath>
-							<value>
-								<ArmorRating_Sharp>9.6</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="JDSExiledChestPlate(AR)ArmorBase" or
-								@Name="JDSExiledChestPlateArmorBase"]/statBases/ArmorRating_Blunt </xpath>
-							<value>
-								<ArmorRating_Blunt>24</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="JDSExiledChestPlateArmorBase"]/statBases/Mass</xpath>
-							<value>
-								<Mass>14</Mass>
-								<Bulk>25</Bulk>
-								<WornBulk>12</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="JDSExiledChestPlate(AR)ArmorBase"]/statBases/Mass</xpath>
-							<value>
-								<Mass>15</Mass>
-								<Bulk>25</Bulk>
-								<WornBulk>12</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[@Name="JDSExiledChestPlate(AR)ArmorBase" or
-								@Name="JDSExiledChestPlateArmorBase"]/equippedStatOffsets/MoveSpeed </xpath>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="JDSExiledChestPlate(AR)ArmorBase"]/equippedStatOffsets</xpath>
-							<value>
-								<CarryBulk>10</CarryBulk>
-								<ReloadSpeed>0.1</ReloadSpeed>
-							</value>
-						</li>
-
-						<!--Field Marshal Armor-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="JDSExiledFieldMarshalARArmorBase" or
-								@Name="JDSExiledFieldMarshalArmorBase"]/statBases/ArmorRating_Sharp </xpath>
-							<value>
-								<ArmorRating_Sharp>9.6</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="JDSExiledFieldMarshalARArmorBase" or
-								@Name="JDSExiledFieldMarshalArmorBase"]/statBases/ArmorRating_Blunt </xpath>
-							<value>
-								<ArmorRating_Blunt>24</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="JDSExiledFieldMarshalArmorBase"]/statBases/Mass</xpath>
-							<value>
-								<Mass>15</Mass>
-								<Bulk>30</Bulk>
-								<WornBulk>13</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="JDSExiledFieldMarshalARArmorBase"]/statBases/Mass</xpath>
-							<value>
-								<Mass>16</Mass>
-								<Bulk>30</Bulk>
-								<WornBulk>13</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[@Name="JDSExiledFieldMarshalARArmorBase" or
-								@Name="JDSExiledFieldMarshalArmorBase"]/equippedStatOffsets/MoveSpeed </xpath>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="JDSExiledFieldMarshalARArmorBase"]/equippedStatOffsets</xpath>
-							<value>
-								<CarryBulk>10</CarryBulk>
-								<ReloadSpeed>0.1</ReloadSpeed>
-							</value>
-						</li>
-
-						<!--Foot Soldier-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="JDSExiledFootSoldierARArmorBase" or
-								@Name="JDSExiledFootSoldierArmorBase"]/statBases/ArmorRating_Sharp </xpath>
-							<value>
-								<ArmorRating_Sharp>9.6</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="JDSExiledFootSoldierARArmorBase" or
-								@Name="JDSExiledFootSoldierArmorBase"]/statBases/ArmorRating_Blunt </xpath>
-							<value>
-								<ArmorRating_Blunt>24</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="JDSExiledFootSoldierArmorBase"]/statBases/Mass</xpath>
-							<value>
-								<Mass>15</Mass>
-								<Bulk>30</Bulk>
-								<WornBulk>13</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="JDSExiledFootSoldierARArmorBase"]/statBases/Mass</xpath>
-							<value>
-								<Mass>16</Mass>
-								<Bulk>30</Bulk>
-								<WornBulk>13</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[@Name="JDSExiledFootSoldierARArmorBase" or
-								@Name="JDSExiledFootSoldierArmorBase"]/equippedStatOffsets/MoveSpeed </xpath>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="JDSExiledFootSoldierARArmorBase"]/equippedStatOffsets</xpath>
-							<value>
-								<CarryBulk>10</CarryBulk>
-								<ReloadSpeed>0.1</ReloadSpeed>
-							</value>
-						</li>
-
-						<!--Plate Gambeson : Stronger in vanilla but costs less. No idea why.-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="JDSExiledPlateGambesonARArmorBase" or
-								@Name="JDSExiledPlateGambesonArmorBase"]/statBases/ArmorRating_Sharp </xpath>
-							<value>
-								<ArmorRating_Sharp>12</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="JDSExiledPlateGambesonARArmorBase" or
-								@Name="JDSExiledPlateGambesonArmorBase"]/statBases/ArmorRating_Blunt </xpath>
-							<value>
-								<ArmorRating_Blunt>30</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="JDSExiledPlateGambesonArmorBase"]/statBases/Mass</xpath>
-							<value>
-								<Mass>22</Mass>
-								<Bulk>30</Bulk>
-								<WornBulk>22</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="JDSExiledPlateGambesonARArmorBase"]/statBases/Mass</xpath>
-							<value>
-								<Mass>23</Mass>
-								<Bulk>30</Bulk>
-								<WornBulk>22</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[@Name="JDSExiledPlateGambesonARArmorBase" or
-								@Name="JDSExiledPlateGambesonArmorBase"]/equippedStatOffsets/MoveSpeed </xpath>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="JDSExiledPlateGambesonARArmorBase"]/equippedStatOffsets</xpath>
-							<value>
-								<CarryBulk>10</CarryBulk>
-								<ReloadSpeed>0.1</ReloadSpeed>
-							</value>
-						</li>
-
-						<!--King Armor-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="JDSExiledKingArmorBase"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>24</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="JDSExiledKingArmorBase"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>65</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="JDSExiledKingArmorBase"]/statBases/Mass</xpath>
-							<value>
-								<Mass>65</Mass>
-								<Bulk>100</Bulk>
-								<WornBulk>25</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="JDSExiledKingArmorBase"]/equippedStatOffsets/MoveSpeed</xpath>
-							<value>
-								<CarryBulk>10</CarryBulk>
-								<CarryWeight>60</CarryWeight>
-							</value>
-						</li>
-
-						<!--Knight Armor-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="JDSExiledKnightArmorBase"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>24</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="JDSExiledKnightArmorBase"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>55</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="JDSExiledKnightArmorBase"]/statBases/Mass</xpath>
-							<value>
-								<Mass>60</Mass>
-								<Bulk>100</Bulk>
-								<WornBulk>25</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="JDSExiledKnightArmorBase"]/equippedStatOffsets/MoveSpeed</xpath>
-							<value>
-								<CarryBulk>10</CarryBulk>
-								<CarryWeight>50</CarryWeight>
-							</value>
-						</li>
-
-						<!--Knight Captain Armor-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="JDSExiledKnightCaptainArmorBase"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>24</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="JDSExiledKnightCaptainArmorBase"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>55</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="JDSExiledKnightCaptainArmorBase"]/statBases/Mass</xpath>
-							<value>
-								<Mass>60</Mass>
-								<Bulk>100</Bulk>
-								<WornBulk>25</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="JDSExiledKnightCaptainArmorBase"]/equippedStatOffsets/MoveSpeed</xpath>
-							<value>
-								<CarryBulk>10</CarryBulk>
-								<CarryWeight>65</CarryWeight>
-							</value>
-						</li>
-
-						<!--Price Change-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Colored_King_Armor" or
-								defName="Colored_Knight_Armor" or
-								defName="Colored_Knight_Captain"
-								]/costList/Plasteel </xpath>
-							<value>
-								<Plasteel>190</Plasteel>
-								<DevilstrandCloth>50</DevilstrandCloth>
-							</value>
-						</li>
-
-						<!--Scholar Armor-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="JDSExiledScholarArmorBase"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>18</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="JDSExiledScholarArmorBase"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>45</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="JDSExiledScholarArmorBase"]/statBases/Mass</xpath>
-							<value>
-								<Mass>50</Mass>
-								<Bulk>100</Bulk>
-								<WornBulk>25</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="JDSExiledScholarArmorBase"]/equippedStatOffsets/MoveSpeed</xpath>
-							<value>
-								<CarryBulk>10</CarryBulk>
-								<CarryWeight>60</CarryWeight>
-							</value>
-						</li>
-
-						<!--Price Change-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Colored_Scholar_Armor"
-								]/costList/Steel </xpath>
-							<value>
-								<Plasteel>100</Plasteel>
-								<Steel>200</Steel>
-								<DevilstrandCloth>40</DevilstrandCloth>
-							</value>
-						</li>
-
-						<!--Helmets-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ExiledDawn_Casque_Helmet"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>7</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ExiledDawn_Casque_Helmet"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>17.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ExiledDawn_Casque_Helmet"]/statBases</xpath>
-							<value>
-								<Bulk>5</Bulk>
-								<WornBulk>2</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ExiledDawn_FootSoldier_Headgear" or
-								defName="ExiledDawn_Defender_Helmet" or
-								defName="ExiledDawn_Headguard"
-								]/statBases/ArmorRating_Sharp </xpath>
-							<value>
-								<ArmorRating_Sharp>9</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ExiledDawn_FootSoldier_Headgear" or
-								defName="ExiledDawn_Defender_Helmet" or
-								defName="ExiledDawn_Headguard"
-								]/statBases/ArmorRating_Blunt </xpath>
-							<value>
-								<ArmorRating_Blunt>22.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ExiledDawn_FootSoldier_Headgear" or
-								defName="ExiledDawn_Defender_Helmet" or
-								defName="ExiledDawn_Headguard"
-								]/statBases </xpath>
-							<value>
-								<Bulk>5</Bulk>
-								<WornBulk>3</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ExiledDawn_Knight_Headgear"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>19.8</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ExiledDawn_Knight_Headgear"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>49.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ExiledDawn_Knight_Headgear"]/statBases</xpath>
-							<value>
-								<Bulk>5</Bulk>
-								<WornBulk>3</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="ExiledDawn_Knight_Headgear"]/apparel/immuneToToxGasExposure</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="ExiledDawn_Knight_Headgear"]/apparel</xpath>
-								<value>
-									<immuneToToxGasExposure>true</immuneToToxGasExposure>
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ExiledDawn_Knight_Headgear"]/equippedStatOffsets</xpath>
-							<value>
-								<SmokeSensitivity>-1</SmokeSensitivity>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/JDS Exiled Dawn/Thingdefs_Misc/Weapons_Melee.xml b/Patches/JDS Exiled Dawn/Thingdefs_Misc/Weapons_Melee.xml
deleted file mode 100644
index 89b3af07b0..0000000000
--- a/Patches/JDS Exiled Dawn/Thingdefs_Misc/Weapons_Melee.xml	
+++ /dev/null
@@ -1,373 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[JDS] Exiled Dawn</li>
-					<li>[JDS] The Forge - Exiled Dawn Armory</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_Eternal_Glory" or
-								defName="JDSExiledDawn_Melee_Reforged_WarCleaver" or
-								defName="JDSExiledDawn_Melee_Reforged_Oathkeeper" or
-								defName="JDSExiledDawn_Melee_Reforged_Bludgeon"
-								]/weaponTags </xpath>
-							<value>
-								<li>CE_OneHandedWeapon</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_Eternal_Glory"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>1.54</cooldownTime>
-										<chanceFactor>0.5</chanceFactor>
-										<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>point</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>11</power>
-										<cooldownTime>1.18</cooldownTime>
-										<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
-										<armorPenetrationSharp>9.30</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_Eternal_Glory"]/statBases</xpath>
-							<value>
-								<Bulk>6.5</Bulk>
-								<MeleeCounterParryBonus>0.65</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_Eternal_Glory"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>1.82</MeleeCritChance>
-									<MeleeParryChance>0.45</MeleeParryChance>
-									<MeleeDodgeChance>0.4</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_WarCleaver"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>1.54</cooldownTime>
-										<chanceFactor>0.5</chanceFactor>
-										<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>blade</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>25</power>
-										<cooldownTime>1.54</cooldownTime>
-										<armorPenetrationBlunt>1.238</armorPenetrationBlunt>
-										<armorPenetrationSharp>4.95</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_WarCleaver"]/statBases</xpath>
-							<value>
-								<Bulk>6.5</Bulk>
-								<MeleeCounterParryBonus>0.82</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_WarCleaver"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.45</MeleeCritChance>
-									<MeleeParryChance>0.36</MeleeParryChance>
-									<MeleeDodgeChance>0.4</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_Oathkeeper"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>3</power>
-										<cooldownTime>1.69</cooldownTime>
-										<chanceFactor>0.5</chanceFactor>
-										<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>blade</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>26</power>
-										<cooldownTime>3.75</cooldownTime>
-										<armorPenetrationBlunt>2.592</armorPenetrationBlunt>
-										<armorPenetrationSharp>7.65</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_Oathkeeper"]/statBases</xpath>
-							<value>
-								<Bulk>7</Bulk>
-								<MeleeCounterParryBonus>0.59</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_Oathkeeper"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.21</MeleeCritChance>
-									<MeleeParryChance>0.38</MeleeParryChance>
-									<MeleeDodgeChance>0.5</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_Bludgeon"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>3</power>
-										<cooldownTime>1.69</cooldownTime>
-										<chanceFactor>0.5</chanceFactor>
-										<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>18</power>
-										<cooldownTime>2.19</cooldownTime>
-										<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_Bludgeon"]/statBases</xpath>
-							<value>
-								<Bulk>7</Bulk>
-								<MeleeCounterParryBonus>0.78</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_Bludgeon"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.53</MeleeCritChance>
-									<MeleeParryChance>0.28</MeleeParryChance>
-									<MeleeDodgeChance>0.5</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_WarSpear"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>8</power>
-										<cooldownTime>2.87</cooldownTime>
-										<chanceFactor>0.5</chanceFactor>
-										<armorPenetrationBlunt>2.588</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>point</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>26</power>
-										<cooldownTime>1.23</cooldownTime>
-										<armorPenetrationBlunt>2.588</armorPenetrationBlunt>
-										<armorPenetrationSharp>12.95</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_WarSpear"]/statBases</xpath>
-							<value>
-								<Bulk>12</Bulk>
-								<MeleeCounterParryBonus>1.42</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_WarSpear"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.29</MeleeCritChance>
-									<MeleeParryChance>1.39</MeleeParryChance>
-									<MeleeDodgeChance>0.93</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_Headhunter"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>8</power>
-										<cooldownTime>2.22</cooldownTime>
-										<chanceFactor>0.5</chanceFactor>
-										<armorPenetrationBlunt>2.588</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>blade</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>43</power>
-										<cooldownTime>2.51</cooldownTime>
-										<armorPenetrationBlunt>3.726</armorPenetrationBlunt>
-										<armorPenetrationSharp>11.18</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_Headhunter"]/statBases</xpath>
-							<value>
-								<Bulk>12</Bulk>
-								<MeleeCounterParryBonus>3.02</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_Headhunter"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.09</MeleeCritChance>
-									<MeleeParryChance>0.52</MeleeParryChance>
-									<MeleeDodgeChance>0.83</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_Alpha"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>3</power>
-										<cooldownTime>1.55</cooldownTime>
-										<chanceFactor>0.5</chanceFactor>
-										<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>blade</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>55</power>
-										<cooldownTime>2.03</cooldownTime>
-										<armorPenetrationBlunt>4.6</armorPenetrationBlunt>
-										<armorPenetrationSharp>9.207</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_Alpha"]/statBases</xpath>
-							<value>
-								<Bulk>12</Bulk>
-								<MeleeCounterParryBonus>1.39</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="JDSExiledDawn_Melee_Reforged_Alpha"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.17</MeleeCritChance>
-									<MeleeParryChance>1.04</MeleeParryChance>
-									<MeleeDodgeChance>0.8</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/JDS Exiled Dawn/Thingdefs_Misc/Weapons_Ranged.xml b/Patches/JDS Exiled Dawn/Thingdefs_Misc/Weapons_Ranged.xml
deleted file mode 100644
index 0474b20617..0000000000
--- a/Patches/JDS Exiled Dawn/Thingdefs_Misc/Weapons_Ranged.xml	
+++ /dev/null
@@ -1,296 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[JDS] Exiled Dawn</li>
-					<li>[JDS] The Forge - Exiled Dawn Armory</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="JDSExiledDawn_Reforged_Plasma_Shortstop" or
-								defName="JDSExiledDawn_Reforged_Plasma_Shooter" or
-								defName="JDSExiledDawn_Reforged_Plasma_Rifle" or
-								defName="JDSExiledDawn_Reforged_Plasma_Rail" or
-								defName="JDSExiledDawn_Reforged_Cannon"]/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>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="JDSExiledDawn_Reforged_Plasma_Minigun"]/tools</xpath>
-							<value>
-								<tools>
-									<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>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>JDSExiledDawn_Reforged_Plasma_Shortstop</defName>
-							<statBases>
-								<Bulk>6.50</Bulk>
-								<Mass>2.50</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.00</SightsEfficiency>
-								<SwayFactor>0.90</SwayFactor>
-								<ShotSpread>0.09</ShotSpread>
-							</statBases>
-							<Properties>
-								<recoilAmount>1.55</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>31</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-								<soundCast>reforged_plasma_shortstop_shot</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>30</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_ExileLight</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>Snapshot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>JDSExiledDawn_Reforged_Plasma_Shooter</defName>
-							<statBases>
-								<Bulk>8.50</Bulk>
-								<Mass>3.50</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.00</SightsEfficiency>
-								<SwayFactor>1.20</SwayFactor>
-								<ShotSpread>0.05</ShotSpread>
-							</statBases>
-							<Properties>
-								<recoilAmount>1.79</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_ExilePlasmaMid</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>51</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-								<soundCast>reforged_plasma_shooter_shot</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>30</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_ExileMid</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>JDSExiledDawn_Reforged_Plasma_Rifle</defName>
-							<statBases>
-								<Bulk>10.50</Bulk>
-								<Mass>4.50</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.00</SightsEfficiency>
-								<SwayFactor>1.50</SwayFactor>
-								<ShotSpread>0.04</ShotSpread>
-							</statBases>
-							<Properties>
-								<recoilAmount>1.85</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_ExilePlasmaHeavy</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>55</range>
-								<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-								<soundCast>reforged_Plasma_rifle_shot</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>40</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_ExileRifle</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>JDSExiledDawn_Reforged_Plasma_Rail</defName>
-							<statBases>
-								<Bulk>12.50</Bulk>
-								<Mass>10.50</Mass>
-								<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-								<SightsEfficiency>2.24</SightsEfficiency>
-								<SwayFactor>2.34</SwayFactor>
-								<ShotSpread>0.01</ShotSpread>
-							</statBases>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_ExilePlasmaAccelerated</defaultProjectile>
-								<warmupTime>2.8</warmupTime>
-								<range>86</range>
-								<soundCast>reforged_plasma_rail_shot</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>8</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_ExileAccelerated</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>JDSExiledDawn_Reforged_Cannon</defName>
-							<statBases>
-								<Bulk>8.00</Bulk>
-								<Mass>5.00</Mass>
-								<RangedWeapon_Cooldown>0.46</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.00</SightsEfficiency>
-								<SwayFactor>1.35</SwayFactor>
-								<ShotSpread>0.16</ShotSpread>
-							</statBases>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_30x64mmFuel_Incendiary</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>40</range>
-								<soundCast>Shot_IncendiaryLauncher</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>8</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_30x64mmFuel</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>JDSExiledDawn_Reforged_Plasma_Minigun</defName>
-							<statBases>
-								<Bulk>14.50</Bulk>
-								<Mass>18</Mass>
-								<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.00</SightsEfficiency>
-								<SwayFactor>3.25</SwayFactor>
-								<ShotSpread>0.05</ShotSpread>
-							</statBases>
-							<Properties>
-								<recoilAmount>0.79</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_ExilePlasmaPistol</defaultProjectile>
-								<warmupTime>2.1</warmupTime>
-								<range>55</range>
-								<burstShotCount>50</burstShotCount>
-								<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-								<soundCast>reforged_plasma_minigun_shot</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<recoilPattern>Mounted</recoilPattern>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>150</magazineSize>
-								<reloadTime>9.2</reloadTime>
-								<ammoSet>AmmoSet_ExileLight</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>25</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>SuppressFire</aiAimMode>
-							</FireModes>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/JDS The Forge - NCR Armory/Defs_Apparel.xml b/Patches/JDS The Forge - NCR Armory/Defs_Apparel.xml
deleted file mode 100644
index 5640dc6772..0000000000
--- a/Patches/JDS The Forge - NCR Armory/Defs_Apparel.xml	
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[JDS] The Forge - NCR Armory</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Fatigues ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_FatiguesArmor"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_FatiguesArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_FatiguesArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2.8</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_FatiguesArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<CarryBulk>5</CarryBulk>
-					</value>
-				</li>
-
-				<!-- ========== Trooper ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_TrooperArmor"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>4</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_TrooperArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4.75</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_TrooperArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>10</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_TrooperArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<CarryBulk>5</CarryBulk>
-					</value>
-				</li>
-
-				<!-- ========== Bandoleer ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_BandoleerArmor"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<WornBulk>2.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_BandoleerArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4.75</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_BandoleerArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>10</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_BandoleerArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<CarryBulk>5</CarryBulk>
-					</value>
-				</li>
-
-				<!-- ========== Mantle ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_MantleArmor"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<WornBulk>2.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_MantleArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4.75</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_MantleArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>10</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_MantleArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<CarryBulk>5</CarryBulk>
-					</value>
-				</li>
-
-				<!-- ========== Ranger Patrol ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_RangerPatrolArmor"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_RangerPatrolArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_RangerPatrolArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>22</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_RangerPatrolArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<CarryBulk>5</CarryBulk>
-					</value>
-				</li>
-
-				<!-- ========== Ranger Combat ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_RangerCombatArmor"]/statBases</xpath>
-					<value>
-						<Bulk>30</Bulk>
-						<WornBulk>12</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_RangerCombatArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_RangerCombatArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>32</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_RangerCombatArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<CarryBulk>10</CarryBulk>
-					</value>
-				</li>
-
-				<!-- ========== Salvaged Power Armor ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_SalvagedPowerArmor"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>20</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_SalvagedPowerArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_SalvagedPowerArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>42</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_SalvagedPowerArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/JDS The Forge - NCR Armory/Defs_Headgear.xml b/Patches/JDS The Forge - NCR Armory/Defs_Headgear.xml
deleted file mode 100644
index 73a60e6355..0000000000
--- a/Patches/JDS The Forge - NCR Armory/Defs_Headgear.xml	
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[JDS] The Forge - NCR Armory</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Pith and Ranger Hats ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_Pith_Hat" or defName="JDS_NCR_Pith2_Hat" or defName="JDS_NCR_Ranger_Hat"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_Pith_Hat" or defName="JDS_NCR_Pith2_Hat" or defName="JDS_NCR_Ranger_Hat"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_Pith_Hat" or defName="JDS_NCR_Pith2_Hat" or defName="JDS_NCR_Ranger_Hat"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ========== Pith Hats w/ Face Wrap ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_Wrap_Pith_Hat" or defName="JDS_NCR_Wrap2_Pith_Hat"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_Wrap_Pith_Hat" or defName="JDS_NCR_Wrap2_Pith_Hat"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_Wrap_Pith_Hat" or defName="JDS_NCR_Wrap2_Pith_Hat"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_Wrap_Pith_Hat" or defName="JDS_NCR_Wrap2_Pith_Hat"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<SmokeSensitivity>-0.10</SmokeSensitivity>
-							<ToxicEnvironmentResistance>0.10</ToxicEnvironmentResistance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- ========== Beret ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_Beret"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_Beret"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.02</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_Beret"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.03</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ========== Ranger Combat Helmet ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_Ranger_Combat_Helmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_Ranger_Combat_Helmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_Ranger_Combat_Helmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>32</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_Ranger_Combat_Helmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="JDS_NCR_Ranger_Combat_Helmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_Ranger_Combat_Helmet"]/equippedStatOffsets/ToxicResistance</xpath>
-					<value>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_Ranger_Combat_Helmet"]/apparel</xpath>
-					<value>
-						<layers>
-							<li>OnHead</li>
-							<li>StrappedHead</li>
-						</layers>
-					</value>
-				</li>
-
-				<!-- ========== Salvaged Power Armor Helmet ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_SalvagedPowerArmor_Helmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_SalvagedPowerArmor_Helmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_SalvagedPowerArmor_Helmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>34</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_SalvagedPowerArmor_Helmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="JDS_NCR_SalvagedPowerArmor_Helmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_SalvagedPowerArmor_Helmet"]/equippedStatOffsets/ToxicResistance</xpath>
-					<value>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_SalvagedPowerArmor_Helmet"]/apparel</xpath>
-					<value>
-						<layers>
-							<li>OnHead</li>
-							<li>StrappedHead</li>
-						</layers>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/JDS The Forge - NCR Armory/Defs_Weapons.xml b/Patches/JDS The Forge - NCR Armory/Defs_Weapons.xml
deleted file mode 100644
index 4d50976a80..0000000000
--- a/Patches/JDS The Forge - NCR Armory/Defs_Weapons.xml	
+++ /dev/null
@@ -1,396 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[JDS] The Forge - NCR Armory</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Tools ========== -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="JDSNCRGunBase"]/tools</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_Weapon_Hunting_Revolver" or defName="JDS_NCR_Weapon_N99_10mm_pistol"]</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="JDS_NCR_Weapon_Anti-Material_Rifle" or
-						defName="SDKS-501 Rifle" or
-						defName="JDS_NCR_Weapon_ServiceRifle" or
-						defName="JDS_NCR_Weapon_Lever_Action_Carbine" or
-						defName="JDS_NCR_Weapon_9mm_SMG"] </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>
-				</li>
-
-				<!-- ========== N99 10mm Pistol ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>JDS_NCR_Weapon_N99_10mm_pistol</defName>
-					<statBases>
-						<Mass>1.36</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.07</SwayFactor>
-						<Bulk>2.10</Bulk>
-						<WorkToMake>4500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>110</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_10mmAuto_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_10mmAuto</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>NCRArmory</li>
-						<li>JDS_NCRArmory_N99_10mm_pistol</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-					<researchPrerequisite>JDSENCRArmoryCraft</researchPrerequisite>
-				</li>
-
-				<!-- ========== Hunting Revolver ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>JDS_NCR_Weapon_Hunting_Revolver</defName>
-					<statBases>
-						<Mass>1.80</Mass>
-						<RangedWeapon_Cooldown>0.41</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>0.50</SwayFactor>
-						<Bulk>3.00</Bulk>
-						<WorkToMake>6000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>100</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_4570Gov_FMJ</defaultProjectile>
-						<warmupTime>0.723</warmupTime>
-						<range>17</range>
-						<soundCast>Shot_Revolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>0.95</reloadTime>
-						<ammoSet>AmmoSet_4570Gov</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>NCRArmory</li>
-						<li>JDS_NCRArmory_Hunting_Revolver</li>
-					</weaponTags>
-					<researchPrerequisite>JDSENCRArmoryCraft</researchPrerequisite>
-				</li>
-
-				<!-- ========== 9mm SMG ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>JDS_NCR_Weapon_9mm_SMG</defName>
-					<statBases>
-						<Mass>3.70</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.11</SwayFactor>
-						<Bulk>5.56</Bulk>
-						<WorkToMake>5000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>120</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.20</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<soundCast>Shot_HeavySMG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>NCRArmory</li>
-						<li>JDS_NCRArmory_9mm_SMG</li>
-					</weaponTags>
-					<researchPrerequisite>JDSENCRArmoryCraft</researchPrerequisite>
-				</li>
-
-				<!-- ========== Brush Gun ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>JDS_NCR_Weapon_Lever_Action_Carbine</defName>
-					<statBases>
-						<WorkToMake>10000</WorkToMake>
-						<Mass>4.10</Mass>
-						<Bulk>11.30</Bulk>
-						<SwayFactor>1.54</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.98</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>200</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_4570Gov_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_4570Gov</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>NCRArmory</li>
-						<li>JDS_NCRArmory_Lever_Action_Carbine</li>
-					</weaponTags>
-					<researchPrerequisite>JDSENCRArmoryCraft</researchPrerequisite>
-				</li>
-
-				<!-- ========== NCR Service Rifle ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>JDS_NCR_Weapon_ServiceRifle</defName>
-					<statBases>
-						<Mass>3.26</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>10.03</Bulk>
-						<WorkToMake>11250</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>250</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>NCRArmory</li>
-						<li>JDS_NCRArmory_ServiceRifle</li>
-					</weaponTags>
-					<researchPrerequisite>JDSENCRArmoryCraft</researchPrerequisite>
-				</li>
-
-				<!-- ========== Sniper Rifle ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>JDS_NCR_Weapon_SDKS-501_Rifle</defName>
-					<statBases>
-						<Mass>7.30</Mass>
-						<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.0</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.35</SwayFactor>
-						<Bulk>11.92</Bulk>
-						<WorkToMake>11000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>300</Steel>
-						<Plasteel>80</Plasteel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.8</warmupTime>
-						<range>75</range>
-						<soundCast>Shot_SniperRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>NCRArmory</li>
-						<li>JDS_NCRArmory_SDKS-501_Rifle</li>
-					</weaponTags>
-					<researchPrerequisite>JDSENCRArmoryCraft</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Anti-Materiel Rifle ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>JDS_NCR_Weapon_Anti-Material_Rifle</defName>
-					<statBases>
-						<Mass>13.80</Mass>
-						<RangedWeapon_Cooldown>1.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.6</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>2.00</SwayFactor>
-						<Bulk>14.80</Bulk>
-						<WorkToMake>12000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>320</Steel>
-						<Plasteel>120</Plasteel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>3.3</warmupTime>
-						<range>86</range>
-						<soundCast>Shot_SniperRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>NCRArmory</li>
-						<li>JDS_NCRArmory_Anti-Material_Rifle</li>
-					</weaponTags>
-					<researchPrerequisite>JDSENCRArmoryCraft</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/JPT Open The Windows/Openvindows.xml b/Patches/JPT Open The Windows/Openvindows.xml
deleted file mode 100644
index ffc27d7db7..0000000000
--- a/Patches/JPT Open The Windows/Openvindows.xml	
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[JPT] Open The Windows</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name = "WindowBase"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.6</fillPercent>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Japanese Dogs/Dogs.xml b/Patches/Japanese Dogs/Dogs.xml
deleted file mode 100644
index 6b22f47f01..0000000000
--- a/Patches/Japanese Dogs/Dogs.xml	
+++ /dev/null
@@ -1,303 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Japanese Dogs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === bodyShape === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Poetik_Shiba" or
-						defName="Poetik_Kai" or
-						defName="Poetik_Hokkaido" or
-						defName="Poetik_Kishu" or
-						defName="Poetik_Shikoku" or
-						defName="Poetik_AkitaJapanese"] </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Shiba and Kai === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Poetik_Shiba" or defName="Poetik_Kai"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.04</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Poetik_Shiba" or defName="Poetik_Kai"]/combatPower</xpath>
-					<value>
-						<combatPower>30</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Poetik_Shiba" ordefName="Poetik_Kai"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.62</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.21</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.62</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.21</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.66</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.76</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Hokkaido === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Poetik_Hokkaido"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.24</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Poetik_Hokkaido"]/combatPower</xpath>
-					<value>
-						<combatPower>40</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Poetik_Hokkaido"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.69</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.24</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.69</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.24</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.66</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.72</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.12</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Kishu and Shikoku === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Poetik_Kishu" ordefName="Poetik_Shikoku"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.19</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0.03</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/PawnKindDef[defName="Poetik_Kishu" ordefName="Poetik_Shikoku"]/combatPower </xpath>
-					<value>
-						<combatPower>50</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Poetik_Kishu" ordefName="Poetik_Shikoku"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.86</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.28</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.86</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.28</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.77</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.72</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Akita === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Poetik_AkitaJapanese"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.24</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0.04</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Poetik_AkitaJapanese"]/combatPower</xpath>
-					<value>
-						<combatPower>65</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Poetik_AkitaJapanese"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.72</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.42</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.72</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.42</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.51</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.15</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.24</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Jernalk's Skeletal Legion/Bodies/Bodies_Skeleton.xml b/Patches/Jernalk's Skeletal Legion/Bodies/Bodies_Skeleton.xml
deleted file mode 100644
index b6125e02fd..0000000000
--- a/Patches/Jernalk's Skeletal Legion/Bodies/Bodies_Skeleton.xml	
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Jernfalk's Skeletal Legion (Continued)</li>
-			<li>Jernalk's Skeletal Legion (continued)</li>
-			<li>Jernalk's Skeletal Legion</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--All bones should be covered-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Skeletal"]//*/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Jernalk's Skeletal Legion/PawnKindDefs/Skeleton_PawnKind.xml b/Patches/Jernalk's Skeletal Legion/PawnKindDefs/Skeleton_PawnKind.xml
deleted file mode 100644
index f9cfed1802..0000000000
--- a/Patches/Jernalk's Skeletal Legion/PawnKindDefs/Skeleton_PawnKind.xml	
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Jernfalk's Skeletal Legion (Continued)</li>
-			<li>Jernalk's Skeletal Legion (continued)</li>
-			<li>Jernalk's Skeletal Legion</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[
-						defName="SL_Peon" or
-						defName="SL_Archer" or
-						defName="SL_Runner"
-						]/combatPower </xpath>
-					<value>
-						<combatPower>28</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="SL_Peon"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>100</min>
-								<max>150</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.9</shieldChance>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="SL_Archer"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>20</min>
-								<max>40</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>100</min>
-								<max>130</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.6</shieldChance>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>80</min>
-										<max>160</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Tribal</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[
-						defName="SL_Hero"
-						]/combatPower </xpath>
-					<value>
-						<combatPower>90</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="SL_Hero"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>20</min>
-								<max>40</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>2000</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>1</shieldChance>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>200</min>
-										<max>2000</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>MedievalMeleeAdvanced</li>
-										<li>NeolithicMeleeAdvanced</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Jernalk's Skeletal Legion/ThingDefs_Races/Skeletons.xml b/Patches/Jernalk's Skeletal Legion/ThingDefs_Races/Skeletons.xml
deleted file mode 100644
index 07fff395cf..0000000000
--- a/Patches/Jernalk's Skeletal Legion/ThingDefs_Races/Skeletons.xml	
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Jernfalk's Skeletal Legion (Continued)</li>
-			<li>Jernalk's Skeletal Legion (continued)</li>
-			<li>Jernalk's Skeletal Legion</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="BaseSkeleton"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="BaseSkeleton"]/statBases</xpath>
-					<value>
-						<Suppressability>0</Suppressability>
-						<SmokeSensitivity>0</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="SL_Runner" or
-						defName="SL_Peon" or
-						defName="SL_Archer"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SL_Runner"]/statBases</xpath>
-					<value>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<MeleeDodgeChance>1.2</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SL_Runner"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
-						<ArmorRating_Electric>0.60</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SL_Runner"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.20</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="SL_Peon" or
-						defName="SL_Archer"
-						]/statBases </xpath>
-					<value>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="SL_Peon" or
-						defName="SL_Archer"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>0.32</ArmorRating_Sharp>
-						<ArmorRating_Electric>0.60</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="SL_Peon" or
-						defName="SL_Archer"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>0.26</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SL_Hero"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2.99</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.406</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SL_Hero"]/statBases</xpath>
-					<value>
-						<MeleeCritChance>1.5</MeleeCritChance>
-						<MeleeParryChance>1.125</MeleeParryChance>
-						<MeleeDodgeChance>1.25</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SL_Hero"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>3</ArmorRating_Sharp>
-						<ArmorRating_Electric>1</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SL_Hero"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Jernfalk Standalone Horses/Races_Animal_Horse.xml b/Patches/Jernfalk Standalone Horses/Races_Animal_Horse.xml
deleted file mode 100644
index 2e32cd847d..0000000000
--- a/Patches/Jernfalk Standalone Horses/Races_Animal_Horse.xml	
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[v1.0] Jernfalk's Standalone Horses</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Jernfalk_Horse"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Jernfalk_Horse"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Jernfalk_Horse"]/tools</xpath>
-					<value>
-						<tools Inherit="False">
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<cooldownTime>1.65</cooldownTime>
-								<power>9</power>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetration>0.102</armorPenetration>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<cooldownTime>1.65</cooldownTime>
-								<power>9</power>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetration>0.102</armorPenetration>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<cooldownTime>1</cooldownTime>
-								<power>4</power>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetration>0.128</armorPenetration>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Jernfalk_WoolyHorse"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Jernfalk_WoolyHorse"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.16</MeleeDodgeChance>
-						<MeleeCritChance>0.22</MeleeCritChance>
-						<MeleeParryChance>0.06</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Jernfalk_WoolyHorse"]/tools</xpath>
-					<value>
-						<tools Inherit="False">
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<cooldownTime>1.65</cooldownTime>
-								<power>9</power>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetration>0.102</armorPenetration>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<cooldownTime>1.65</cooldownTime>
-								<power>9</power>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetration>0.102</armorPenetration>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<cooldownTime>1</cooldownTime>
-								<power>4</power>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetration>0.128</armorPenetration>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Empires of Old - Core/Apparel.xml b/Patches/K4G Empires of Old - Core/Apparel.xml
deleted file mode 100644
index 2c257a9755..0000000000
--- a/Patches/K4G Empires of Old - Core/Apparel.xml	
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] Empires of Old - Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Thawb, Kimono -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-					@Name="K4GThawb" or
-					@Name="K4GKimono"
-					]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>1.5</Bulk>
-						<WornBulk>1</WornBulk>
-						<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Headgear -->
-				<li 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"
-					]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-						<Bulk>1</Bulk>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-
-				<!-- Imperial & Outlander Helmet -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="K4GImperialHelmet" or defName="K4G_Apparel_OutlanderHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="K4GImperialHelmet" or defName="K4G_Apparel_OutlanderHelmet"]/stuffCategories/li[.="Metallic"]</xpath>
-					<value>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<!-- Goggled & Advanced Outlander Helmet -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-					defName="K4G_Apparel_AdvancedOutlanderHelmet" or
-					defName="K4G_Apparel_GoggledHelmet" or
-					defName="K4G_Apparel_LegionaryHelmet"
-					]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-					defName="K4G_Apparel_AdvancedOutlanderHelmet" or
-					defName="K4G_Apparel_GoggledHelmet" or
-					defName="K4G_Apparel_LegionaryHelmet"					
-					]/stuffCategories/li[.="Metallic"]</xpath>
-					<value>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<!-- Flak Mask -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="K4G_Apparel_FlakMask"]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="K4G_Apparel_FlakMask"]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="K4G_Apparel_FlakMask"]/apparel/layers/li[.="EyeCover"] </xpath>
-					<value>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!-- Coveralls & Overcoat-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="K4GCoveralls" or @Name="K4GOvercoat"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Advanced Flak Vest -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="K4G_Apparel_AdvancedFlakVest"]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-						<Bulk>5</Bulk>
-						<WornBulk>3.5</WornBulk>						
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="K4G_Apparel_AdvancedFlakVest"]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>8</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="K4G_Apparel_AdvancedFlakVest"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>150</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="K4G_Apparel_AdvancedFlakVest"]</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>
-
-				<!-- Goggles -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="K4G_Apparel_Goggles"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>0.5</StuffEffectMultiplierArmor>
-						<Bulk>0.5</Bulk>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-
-				<!-- Lab Coat -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="K4G_Apparel_LabCoat"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>7.5</Bulk>
-						<WornBulk>1</WornBulk>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Empires of Old - Core/Apparel_Royalty.xml b/Patches/K4G Empires of Old - Core/Apparel_Royalty.xml
deleted file mode 100644
index 48c01fe9a0..0000000000
--- a/Patches/K4G Empires of Old - Core/Apparel_Royalty.xml	
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] Empires of Old - Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Royalty</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-					<!-- Dynasty Crown -->
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="K4G_Apparel_DynastyCrown"]/statBases/StuffEffectMultiplierArmor</xpath>
-						<value>
-							<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
-						</value>
-					</li>				
-
-					</operations>
-				</match>
-			</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Empires of Old - Core/WeaponsMelee.xml b/Patches/K4G Empires of Old - Core/WeaponsMelee.xml
deleted file mode 100644
index 26fd0b5a94..0000000000
--- a/Patches/K4G Empires of Old - Core/WeaponsMelee.xml	
+++ /dev/null
@@ -1,394 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] Empires of Old - Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-			<!-- === Sabre === -->
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Sabre"]/statBases</xpath>
-				<value>
-					<Bulk>3.5</Bulk>
-					<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-				</value>
-			</li>
-
-			<li 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>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Sabre"]/weaponTags</xpath>
-				<value>
-					<li>CE_OneHandedWeapon</li>
-				</value>
-			</li>
-
-			<li 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>
-			</li>
-
-			<!-- === Katanna === -->
-
-			<li 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>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Katana"]/statBases</xpath>
-				<value>
-					<Bulk>8</Bulk>
-					<MeleeCounterParryBonus>1.27</MeleeCounterParryBonus>
-				</value>
-			</li>
-
-			<li 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>
-			</li>
-
-			<!-- === Cleaver === -->
-
-			<li 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>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Cleaver"]/statBases</xpath>
-				<value>
-					<Bulk>11</Bulk>
-					<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-				</value>
-			</li>
-
-			<li 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>
-			</li>
-
-			<!-- === Scimitar === -->
-
-			<li 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>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Scimitar"]/statBases</xpath>
-				<value>
-					<Bulk>4</Bulk>
-					<MeleeCounterParryBonus>0.38</MeleeCounterParryBonus>
-				</value>
-			</li>
-
-			<li 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>
-			</li>
-
-			<!-- === Glaive === -->
-
-			<li 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>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Glaive"]/statBases</xpath>
-				<value>
-					<Bulk>10</Bulk>
-					<MeleeCounterParryBonus>0.89</MeleeCounterParryBonus>
-				</value>
-			</li>
-
-			<li 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>
-			</li>
-
-			<!-- === Baton === -->
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Baton"]/statBases</xpath>
-				<value>
-					<Bulk>2.75</Bulk>
-					<MeleeCounterParryBonus>0.9</MeleeCounterParryBonus>
-				</value>
-			</li>
-
-			<li 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>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Baton"]/weaponTags</xpath>
-				<value>
-					<li>CE_Sidearm_Melee</li>
-					<li>CE_OneHandedWeapon</li>
-				</value>
-			</li>
-
-			<li 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>
-			</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Empires of Old - Core/WeaponsRanged.xml b/Patches/K4G Empires of Old - Core/WeaponsRanged.xml
deleted file mode 100644
index 633604f989..0000000000
--- a/Patches/K4G Empires of Old - Core/WeaponsRanged.xml	
+++ /dev/null
@@ -1,555 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] Empires of Old - Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-			<!-- ========== Tools ========== -->
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[
-				defName="K4G_Gun_Snubgun" or
-				defName="K4G_Gun_Bolter" or
-				defName="K4G_Gun_AdvancedAutopistol" or
-				defName="K4G_Gun_PrecisionPistol"
-				]/tools</xpath>
-				<value>
-					<tools>
-						<li Class="CombatExtended.ToolCE">
-							<label>grip</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>2</power>
-							<cooldownTime>1.54</cooldownTime>
-							<chanceFactor>1.5</chanceFactor>
-							<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>muzzle</label>
-							<capacities>
-								<li>Poke</li>
-							</capacities>
-							<power>2</power>
-							<cooldownTime>1.54</cooldownTime>
-							<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-						</li>
-					</tools>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[
-				defName="K4G_Gun_LongGun" or
-				defName="K4G_Gun_Carbiner" or
-				defName="K4G_Gun_DuneRifle" or
-				defName="K4G_Gun_HeavyShotgun" or
-				defName="K4G_Gun_LightSMG" or
-				defName="K4G_Gun_AdvancedSMG" or
-				defName="K4G_Gun_CompactRifle" or
-				defName="K4G_Gun_BattleRifle"
-				]/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>
-			</li>
-
-			<!-- ========== Snubgun ========== -->
-
-			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-				<defName>K4G_Gun_Snubgun</defName>
-				<statBases>
-					<Mass>1.42</Mass>
-					<RangedWeapon_Cooldown>0.49</RangedWeapon_Cooldown>
-					<SightsEfficiency>0.7</SightsEfficiency>
-					<ShotSpread>0.18</ShotSpread>
-					<SwayFactor>1.31</SwayFactor>
-					<Bulk>2.41</Bulk>
-				</statBases>
-				<Properties>
-					<recoilAmount>2.96</recoilAmount>
-					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-					<hasStandardCommand>true</hasStandardCommand>
-					<defaultProjectile>Bullet_44Magnum_FMJ</defaultProjectile>
-					<warmupTime>0.6</warmupTime>
-					<range>12</range>
-					<soundCast>Shot_Revolver</soundCast>
-					<soundCastTail>GunTail_Light</soundCastTail>
-					<muzzleFlashScale>9</muzzleFlashScale>
-				</Properties>
-				<AmmoUser>
-					<magazineSize>6</magazineSize>
-					<reloadTime>4.6</reloadTime>
-					<ammoSet>AmmoSet_44Magnum</ammoSet>
-				</AmmoUser>
-				<FireModes>
-					<aiUseBurstMode>FALSE</aiUseBurstMode>
-					<aiAimMode>Snapshot</aiAimMode>
-				</FireModes>
-				<weaponTags>
-					<li>CE_Sidearm</li>
-					<li>CE_AI_BROOM</li>
-					<li>CE_OneHandedWeapon</li>
-				</weaponTags>
-			</li>
-
-			<!-- ========== Bolter (Makeshift 9mm) ========== -->
-			<!-- Mod says it fires 'a sharp metal rod known as a bolt' and is generally junk,
-				easier to make it a sort of 9mm pipe pistol. -->
-
-			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-				<defName>K4G_Gun_Bolter</defName>
-				<statBases>
-					<Mass>1.33</Mass>
-					<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
-					<SightsEfficiency>0.70</SightsEfficiency>
-					<ShotSpread>0.60</ShotSpread>
-					<SwayFactor>1.30</SwayFactor>
-					<Bulk>2.62</Bulk>
-				</statBases>
-				<Properties>
-					<recoilAmount>2.75</recoilAmount>
-					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-					<hasStandardCommand>true</hasStandardCommand>
-					<defaultProjectile>Bullet_9x19mmParaSD_FMJ</defaultProjectile>
-					<warmupTime>0.5</warmupTime>
-					<range>10</range>
-					<soundCast>Shot_Autopistol</soundCast>
-					<soundCastTail>GunTail_Light</soundCastTail>
-					<muzzleFlashScale>9</muzzleFlashScale>
-				</Properties>
-				<AmmoUser>
-					<magazineSize>5</magazineSize>
-					<reloadTime>4</reloadTime>
-					<ammoSet>AmmoSet_9x19mmParaSD</ammoSet> <!-- Simulate low velocity from poor construction.-->
-				</AmmoUser>
-				<FireModes>
-					<aiUseBurstMode>FALSE</aiUseBurstMode>
-					<aiAimMode>Snapshot</aiAimMode>
-				</FireModes>
-				<weaponTags>
-					<li>CE_AI_Pistol</li>
-					<li>CE_OneHandedWeapon</li>
-				</weaponTags>
-			</li>
-
-			<!-- ========== Advanced Autopistol (Glock 21) ========== -->
-
-			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-				<defName>K4G_Gun_AdvancedAutopistol</defName>
-				<statBases>
-					<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-					<SightsEfficiency>0.7</SightsEfficiency>
-					<ShotSpread>0.17</ShotSpread>
-					<SwayFactor>1.07</SwayFactor>
-					<Mass>1.4</Mass>
-					<Bulk>2.0</Bulk>
-				</statBases>
-				<Properties>
-					<recoilAmount>2.72</recoilAmount>
-					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-					<hasStandardCommand>true</hasStandardCommand>
-					<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-					<warmupTime>0.6</warmupTime>
-					<range>12</range>
-					<soundCast>Shot_Autopistol</soundCast>
-					<soundCastTail>GunTail_Light</soundCastTail>
-					<muzzleFlashScale>9</muzzleFlashScale>
-				</Properties>
-				<AmmoUser>
-					<magazineSize>13</magazineSize>
-					<reloadTime>4</reloadTime>
-					<ammoSet>AmmoSet_45ACP</ammoSet>
-				</AmmoUser>
-				<FireModes>
-					<aiUseBurstMode>FALSE</aiUseBurstMode>
-					<aiAimMode>Snapshot</aiAimMode>
-				</FireModes>
-				<weaponTags>
-					<li>CE_Sidearm</li>
-					<li>CE_AI_BROOM</li>
-					<li>CE_OneHandedWeapon</li>
-				</weaponTags>
-			</li>
-
-			<!-- === Precision Pistol (M1911 w/ 3x Scope) === -->
-
-			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-				<defName>K4G_Gun_PrecisionPistol</defName>
-				<statBases>
-					<Mass>1.30</Mass>
-					<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-					<SightsEfficiency>1.88</SightsEfficiency>
-					<ShotSpread>0.17</ShotSpread>
-					<SwayFactor>1.16</SwayFactor>
-					<Bulk>2.20</Bulk>
-				</statBases>
-				<Properties>
-					<recoilAmount>2.51</recoilAmount>
-					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-					<hasStandardCommand>true</hasStandardCommand>
-					<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-					<warmupTime>1.0</warmupTime>
-					<range>18</range>
-					<soundCast>Shot_Autopistol</soundCast>
-					<soundCastTail>GunTail_Light</soundCastTail>
-					<muzzleFlashScale>9</muzzleFlashScale>
-				</Properties>
-				<AmmoUser>
-					<magazineSize>7</magazineSize>
-					<reloadTime>4</reloadTime>
-					<ammoSet>AmmoSet_45ACP</ammoSet>
-				</AmmoUser>
-				<FireModes>
-					<aiUseBurstMode>FALSE</aiUseBurstMode>
-					<aiAimMode>AimedShot</aiAimMode>
-				</FireModes>
-				<weaponTags>
-					<li>CE_Sidearm</li>
-					<li>CE_OneHandedWeapon</li>					
-				</weaponTags>
-			</li>
-
-			<li Class="PatchOperationAddModExtension">
-				<xpath>Defs/ThingDef[defName="K4G_Gun_PrecisionPistol"]</xpath>
-				<value>
-					<li Class="CombatExtended.GunDrawExtension">
-						<DrawSize>0.93,0.93</DrawSize>
-						<DrawOffset>0.0,0.0</DrawOffset>
-					</li>
-				</value>
-			</li>
-
-			<!-- === Long Gun === -->
-
-			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-				<defName>K4G_Gun_LongGun</defName>
-				<statBases>
-					<Mass>4.30</Mass>
-					<Bulk>12.50</Bulk>
-					<SwayFactor>1.67</SwayFactor>
-					<ShotSpread>0.02</ShotSpread>
-					<SightsEfficiency>1</SightsEfficiency>
-					<RangedWeapon_Cooldown>0.77</RangedWeapon_Cooldown>
-				</statBases>
-				<Properties>
-					<recoilAmount>1.75</recoilAmount>
-					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-					<hasStandardCommand>True</hasStandardCommand>
-					<defaultProjectile>Bullet_44-40Winchester_FMJ</defaultProjectile>
-					<warmupTime>1.1</warmupTime>
-					<range>31</range>
-					<soundCast>Shot_BoltActionRifle</soundCast>
-					<soundCastTail>GunTail_Heavy</soundCastTail>
-					<muzzleFlashScale>9</muzzleFlashScale>
-				</Properties>
-				<AmmoUser>
-					<magazineSize>7</magazineSize>
-					<reloadTime>0.85</reloadTime>
-					<ammoSet>AmmoSet_44-40Winchester</ammoSet>
-					<reloadOneAtATime>true</reloadOneAtATime>
-				</AmmoUser>
-				<FireModes>
-					<aiAimMode>AimedShot</aiAimMode>
-				</FireModes>
-			</li>
-
-			<!-- === Carbiner (M1 Carbine) === -->
-
-			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-				<defName>K4G_Gun_Carbiner</defName>
-				<statBases>
-					<Mass>2.40</Mass>
-					<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					<SightsEfficiency>1.00</SightsEfficiency>
-					<ShotSpread>0.08</ShotSpread>
-					<SwayFactor>1.14</SwayFactor>
-					<Bulk>6.00</Bulk>
-				</statBases>
-				<Properties>
-					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-					<hasStandardCommand>true</hasStandardCommand>
-					<defaultProjectile>Bullet_30Carbine_FMJ</defaultProjectile>
-					<warmupTime>1.1</warmupTime>
-					<range>37</range>
-					<soundCast>Shot_BoltActionRifle</soundCast>
-					<soundCastTail>GunTail_Heavy</soundCastTail>
-					<muzzleFlashScale>9</muzzleFlashScale>
-				</Properties>
-				<AmmoUser>
-					<magazineSize>15</magazineSize>
-					<reloadTime>4</reloadTime>
-					<ammoSet>AmmoSet_30Carbine</ammoSet>
-				</AmmoUser>
-				<FireModes>
-					<aiUseBurstMode>FALSE</aiUseBurstMode>
-					<aiAimMode>AimedShot</aiAimMode>
-				</FireModes>
-			</li>
-
-			<!-- === Dune Rifle === -->
-
-			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-				<defName>K4G_Gun_DuneRifle</defName>
-				<statBases>
-					<Mass>4.10</Mass>
-					<Bulk>11.26</Bulk>
-					<SwayFactor>1.54</SwayFactor>
-					<ShotSpread>0.06</ShotSpread>
-					<SightsEfficiency>1</SightsEfficiency>
-					<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-				</statBases>
-				<Properties>
-					<recoilAmount>1.75</recoilAmount>
-					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-					<hasStandardCommand>True</hasStandardCommand>
-					<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
-					<burstShotCount>2</burstShotCount>
-					<ticksBetweenBurstShots>3</ticksBetweenBurstShots>					
-					<warmupTime>1.1</warmupTime>
-					<range>52</range>
-					<soundCast>Shot_BoltActionRifle</soundCast>
-					<soundCastTail>GunTail_Heavy</soundCastTail>
-					<muzzleFlashScale>9</muzzleFlashScale>
-				</Properties>
-				<AmmoUser>
-					<magazineSize>10</magazineSize>
-					<reloadTime>4</reloadTime>
-					<ammoSet>AmmoSet_303British</ammoSet>
-				</AmmoUser>
-				<FireModes>
-					<aiAimMode>AimedShot</aiAimMode>
-					<aiUseBurstMode>TRUE</aiUseBurstMode>
-				</FireModes>
-			</li>
-
-			<!-- ========== Heavy Shotgun (semi-auto USAS) ========== -->
-
-			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-				<defName>K4G_Gun_HeavyShotgun</defName>
-				<statBases>
-					<Mass>5.45</Mass>
-					<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					<SightsEfficiency>1</SightsEfficiency>
-					<ShotSpread>0.14</ShotSpread>
-					<SwayFactor>1.51</SwayFactor>
-					<Bulk>9.60</Bulk>
-				</statBases>
-				<Properties>
-					<recoilAmount>2.36</recoilAmount>
-					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-					<hasStandardCommand>true</hasStandardCommand>
-					<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-					<warmupTime>0.6</warmupTime>
-					<range>16</range>
-					<soundCast>Shot_Shotgun_NoRack</soundCast>
-					<soundCastTail>GunTail_Heavy</soundCastTail>
-					<muzzleFlashScale>9</muzzleFlashScale>
-				</Properties>
-				<AmmoUser>
-					<magazineSize>12</magazineSize>
-					<reloadTime>4</reloadTime>
-					<ammoSet>AmmoSet_12Gauge</ammoSet>
-				</AmmoUser>
-				<FireModes>
-					<aiAimMode>Snapshot</aiAimMode>
-				</FireModes>
-				<weaponTags>
-					<li>CE_AI_AssaultWeapon</li>
-				</weaponTags>
-			</li>
-
-			<!-- === Light SMG (MP5) === -->
-
-			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-				<defName>K4G_Gun_LightSMG</defName>
-				<statBases>
-					<Mass>2.50</Mass>
-					<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					<SightsEfficiency>1.00</SightsEfficiency>
-					<ShotSpread>0.16</ShotSpread>
-					<SwayFactor>0.85</SwayFactor>
-					<Bulk>3.68</Bulk>
-				</statBases>
-				<Properties>
-					<recoilAmount>1.55</recoilAmount>
-					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-					<hasStandardCommand>true</hasStandardCommand>
-					<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-					<warmupTime>0.6</warmupTime>
-					<range>20</range>
-					<burstShotCount>6</burstShotCount>
-					<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-					<soundCast>Shot_HeavySMG</soundCast>
-					<soundCastTail>GunTail_Heavy</soundCastTail>
-					<muzzleFlashScale>9</muzzleFlashScale>
-				</Properties>
-				<AmmoUser>
-					<magazineSize>30</magazineSize>
-					<reloadTime>4</reloadTime>
-					<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-				</AmmoUser>
-				<FireModes>
-					<aiUseBurstMode>FALSE</aiUseBurstMode>
-					<aiAimMode>Snapshot</aiAimMode>
-					<aimedBurstShotCount>3</aimedBurstShotCount>
-				</FireModes>
-				<weaponTags>
-					<li>CE_AI_AssaultWeapon</li>
-					<li>CE_SMG</li>
-				</weaponTags>
-			</li>
-
-			<!-- ========== Advanced SMG (P90) ========== -->
-
-			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-				<defName>K4G_Gun_AdvancedSMG</defName>
-				<statBases>
-					<Mass>2.60</Mass>
-					<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					<SightsEfficiency>1.10</SightsEfficiency>
-					<ShotSpread>0.12</ShotSpread>
-					<SwayFactor>0.77</SwayFactor>
-					<Bulk>5.05</Bulk>
-				</statBases>
-				<Properties>
-					<recoilAmount>1.05</recoilAmount>
-					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-					<hasStandardCommand>true</hasStandardCommand>
-					<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
-					<warmupTime>0.5</warmupTime>
-					<range>31</range>
-					<burstShotCount>6</burstShotCount>
-					<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-					<soundCast>Shot_HeavySMG</soundCast>
-					<soundCastTail>GunTail_Heavy</soundCastTail>
-					<muzzleFlashScale>9</muzzleFlashScale>
-				</Properties>
-				<AmmoUser>
-					<magazineSize>50</magazineSize>
-					<reloadTime>4.5</reloadTime>
-					<ammoSet>AmmoSet_FN57x28mm</ammoSet>
-				</AmmoUser>
-				<FireModes>
-					<aiUseBurstMode>FALSE</aiUseBurstMode>
-					<aiAimMode>Snapshot</aiAimMode>
-					<aimedBurstShotCount>3</aimedBurstShotCount>
-				</FireModes>
-			</li>
-
-			<!-- ========== Compact Rifle (M4A1) ========== -->
-
-			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-				<defName>K4G_Gun_CompactRifle</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>
-				</statBases>
-				<Properties>
-					<recoilAmount>1.58</recoilAmount>
-					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-					<hasStandardCommand>true</hasStandardCommand>
-					<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-					<warmupTime>1.1</warmupTime>
-					<range>55</range>
-					<burstShotCount>6</burstShotCount>
-					<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-					<soundCast>Shot_AssaultRifle</soundCast>
-					<soundCastTail>GunTail_Medium</soundCastTail>
-					<muzzleFlashScale>9</muzzleFlashScale>
-				</Properties>
-				<AmmoUser>
-					<magazineSize>30</magazineSize>
-					<reloadTime>4</reloadTime>
-					<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-				</AmmoUser>
-				<FireModes>
-					<aiUseBurstMode>TRUE</aiUseBurstMode>
-					<aiAimMode>AimedShot</aiAimMode>
-					<aimedBurstShotCount>3</aimedBurstShotCount>
-				</FireModes>
-			</li>
-
-			<!-- ========== Batttle Rifle (G3A2) ========== -->
-
-			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-				<defName>K4G_Gun_BattleRifle</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>
-				</statBases>
-				<Properties>
-					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-					<hasStandardCommand>True</hasStandardCommand>
-					<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-					<recoilAmount>2.00</recoilAmount>
-					<burstShotCount>6</burstShotCount>
-					<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-					<warmupTime>1.1</warmupTime>
-					<range>57</range>
-					<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>
-			</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Empires of Old - Factions/PawnKinds_Dynasty.xml b/Patches/K4G Empires of Old - Factions/PawnKinds_Dynasty.xml
deleted file mode 100644
index 5a6ca4c7ad..0000000000
--- a/Patches/K4G Empires of Old - Factions/PawnKinds_Dynasty.xml	
+++ /dev/null
@@ -1,64 +0,0 @@
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] Empires of Old - The Rising Sun</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-			<!-- === Civilians === -->
-
-			<li Class="PatchOperationAddModExtension">
-				<xpath>Defs/PawnKindDef[defName="K4G_Dynasty_Common_Trader" or defName="K4G_Dynasty_Common_Worker"]</xpath>
-				<value>
-					<li Class="CombatExtended.LoadoutPropertiesExtension">
-						<primaryMagazineCount>
-							<min>3</min>
-							<max>4</max>
-						</primaryMagazineCount>
-					</li>
-				</value>
-			</li>
-
-			<!-- === Fighters === -->
-			
-			<li Class="PatchOperationAddModExtension">
-				<xpath>Defs/PawnKindDef[@Name="K4GDynastyRoninBase" or @Name="K4GDynastyAshigaruBase"]</xpath>
-				<value>
-					<li Class="CombatExtended.LoadoutPropertiesExtension">
-						<primaryMagazineCount>
-							<min>4</min>
-							<max>6</max>
-						</primaryMagazineCount>
-					</li>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAddModExtension">
-				<xpath>Defs/PawnKindDef[defName="K4G_Dynasty_Fighter_Cataphract" or defName="K4G_Dynasty_Fighter_WarriorMonkRanged"]</xpath>
-				<value>
-					<li Class="CombatExtended.LoadoutPropertiesExtension">
-						<primaryMagazineCount>
-							<min>5</min>
-							<max>7</max>
-						</primaryMagazineCount>
-					</li>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAddModExtension">
-				<xpath>Defs/PawnKindDef[defName="K4G_Dynasty_Fighter_Grenadier"]</xpath>
-				<value>
-					<li Class="CombatExtended.LoadoutPropertiesExtension">
-						<primaryMagazineCount>
-							<min>8</min>
-							<max>12</max>
-						</primaryMagazineCount>
-					</li>
-				</value>
-			</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Empires of Old - Factions/PawnKinds_Guild.xml b/Patches/K4G Empires of Old - Factions/PawnKinds_Guild.xml
deleted file mode 100644
index bb6aeff24c..0000000000
--- a/Patches/K4G Empires of Old - Factions/PawnKinds_Guild.xml	
+++ /dev/null
@@ -1,68 +0,0 @@
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] Empires of Old - The Engineers Institute</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-			<!-- === Civilians / Royals === -->
-
-			<li Class="PatchOperationAddModExtension">
-				<xpath>Defs/PawnKindDef[
-				defName="K4G_Guild_Common_Trader" or
-				defName="K4G_Guild_Common_Worker" or
-				@Name="K4GGuildRoyalBase"
-				]</xpath>
-				<value>
-					<li Class="CombatExtended.LoadoutPropertiesExtension">
-						<primaryMagazineCount>
-							<min>3</min>
-							<max>4</max>
-						</primaryMagazineCount>
-					</li>
-				</value>
-			</li>
-
-			<!-- === Fighters === -->
-			
-			<li Class="PatchOperationAddModExtension">
-				<xpath>Defs/PawnKindDef[@Name="K4GGuildGruntBase" or @Name="K4GGuildTrooperBase"]</xpath>
-				<value>
-					<li Class="CombatExtended.LoadoutPropertiesExtension">
-						<primaryMagazineCount>
-							<min>4</min>
-							<max>6</max>
-						</primaryMagazineCount>
-					</li>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAddModExtension">
-				<xpath>Defs/PawnKindDef[defName="K4G_Guild_Fighter_Cataphract" or defName="K4G_Guild_Fighter_SentinelGuardRanged"]</xpath>
-				<value>
-					<li Class="CombatExtended.LoadoutPropertiesExtension">
-						<primaryMagazineCount>
-							<min>5</min>
-							<max>7</max>
-						</primaryMagazineCount>
-					</li>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAddModExtension">
-				<xpath>Defs/PawnKindDef[defName="K4G_Guild_Fighter_Grenadier"]</xpath>
-				<value>
-					<li Class="CombatExtended.LoadoutPropertiesExtension">
-						<primaryMagazineCount>
-							<min>8</min>
-							<max>12</max>
-						</primaryMagazineCount>
-					</li>
-				</value>
-			</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Empires of Old - Factions/PawnKinds_Legion.xml b/Patches/K4G Empires of Old - Factions/PawnKinds_Legion.xml
deleted file mode 100644
index 950fcf00af..0000000000
--- a/Patches/K4G Empires of Old - Factions/PawnKinds_Legion.xml	
+++ /dev/null
@@ -1,64 +0,0 @@
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] Empires of Old - The Polluted Legion</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-			<!-- === Civilians === -->
-
-			<li Class="PatchOperationAddModExtension">
-				<xpath>Defs/PawnKindDef[defName="K4G_Legion_Common_Trader" or defName="K4G_Legion_Common_Worker"]</xpath>
-				<value>
-					<li Class="CombatExtended.LoadoutPropertiesExtension">
-						<primaryMagazineCount>
-							<min>3</min>
-							<max>4</max>
-						</primaryMagazineCount>
-					</li>
-				</value>
-			</li>
-
-			<!-- === Fighters === -->
-			
-			<li Class="PatchOperationAddModExtension">
-				<xpath>Defs/PawnKindDef[@Name="K4GLegionMilitesBase" or @Name="K4GLegionLegionaryBase"]</xpath>
-				<value>
-					<li Class="CombatExtended.LoadoutPropertiesExtension">
-						<primaryMagazineCount>
-							<min>4</min>
-							<max>6</max>
-						</primaryMagazineCount>
-					</li>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAddModExtension">
-				<xpath>Defs/PawnKindDef[defName="K4G_Legion_Fighter_HeavyLegionnaire" or defName="K4G_Legion_Fighter_PraetorianGuardRanged"]</xpath>
-				<value>
-					<li Class="CombatExtended.LoadoutPropertiesExtension">
-						<primaryMagazineCount>
-							<min>5</min>
-							<max>7</max>
-						</primaryMagazineCount>
-					</li>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAddModExtension">
-				<xpath>Defs/PawnKindDef[defName="K4G_Legion_Fighter_Grenadier"]</xpath>
-				<value>
-					<li Class="CombatExtended.LoadoutPropertiesExtension">
-						<primaryMagazineCount>
-							<min>8</min>
-							<max>12</max>
-						</primaryMagazineCount>
-					</li>
-				</value>
-			</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Empires of Old - Factions/PawnKinds_Sultanate.xml b/Patches/K4G Empires of Old - Factions/PawnKinds_Sultanate.xml
deleted file mode 100644
index e9842b97a1..0000000000
--- a/Patches/K4G Empires of Old - Factions/PawnKinds_Sultanate.xml	
+++ /dev/null
@@ -1,67 +0,0 @@
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] Empires of Old - The Faceless Sultanate</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-			<!-- === Civilians / Royals === -->
-
-			<li Class="PatchOperationAddModExtension">
-				<xpath>Defs/PawnKindDef[defName="K4G_Sultanate_Common_Trader" or defName="K4G_Sultanate_Common_Worker"]</xpath>
-				<value>
-					<li Class="CombatExtended.LoadoutPropertiesExtension">
-						<primaryMagazineCount>
-							<min>3</min>
-							<max>4</max>
-						</primaryMagazineCount>
-					</li>
-				</value>
-			</li>
-
-			<!-- === Fighters === -->
-			
-			<li Class="PatchOperationAddModExtension">
-				<xpath>Defs/PawnKindDef[@Name="K4GSultanateGuerrillaBase" or @Name="K4GSultanateJanissaryBase"]</xpath>
-				<value>
-					<li Class="CombatExtended.LoadoutPropertiesExtension">
-						<primaryMagazineCount>
-							<min>4</min>
-							<max>6</max>
-						</primaryMagazineCount>
-					</li>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAddModExtension">
-				<xpath>Defs/PawnKindDef[
-				defName="K4G_Sultanate_Fighter_Cataphract" or
-				defName="K4G_Sultanate_Fighter_KhanGuardRanged" or
-				defName="K4G_Sultanate_Fighter_BlackMarketMercenary"]</xpath>
-				<value>
-					<li Class="CombatExtended.LoadoutPropertiesExtension">
-						<primaryMagazineCount>
-							<min>5</min>
-							<max>7</max>
-						</primaryMagazineCount>
-					</li>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAddModExtension">
-				<xpath>Defs/PawnKindDef[defName="K4G_Sultanate_Fighter_Bomber"]</xpath>
-				<value>
-					<li Class="CombatExtended.LoadoutPropertiesExtension">
-						<primaryMagazineCount>
-							<min>8</min>
-							<max>12</max>
-						</primaryMagazineCount>
-					</li>
-				</value>
-			</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Empires of Old - Factions/TraderKinds_Sultanate.xml b/Patches/K4G Empires of Old - Factions/TraderKinds_Sultanate.xml
deleted file mode 100644
index 519deab863..0000000000
--- a/Patches/K4G Empires of Old - Factions/TraderKinds_Sultanate.xml	
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] Empires of Old - The Faceless Sultanate</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-			<!-- ======= Trader Base =======-->
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/TraderKindDef[defName="K4G_Base_Sultanate_Standard"]/stockGenerators</xpath>
-				<value>
-					<li Class="StockGenerator_SingleDef">
-						<thingDef>FSX</thingDef>
-						<countRange>
-							<min>15</min>
-							<max>40</max>
-						</countRange>
-					</li>
-					<li Class="StockGenerator_SingleDef">
-						<thingDef>Prometheum</thingDef>
-						<countRange>
-							<min>15</min>
-							<max>40</max>
-						</countRange>
-					</li>
-					<li Class="StockGenerator_Tag">
-						<tradeTag>CE_Ammo</tradeTag>
-						<countRange>
-							<min>400</min>
-							<max>1000</max>
-						</countRange>
-						<thingDefCountRange>
-							<min>3</min>
-							<max>8</max>
-						</thingDefCountRange>
-					</li>
-					<li Class="StockGenerator_Tag">
-						<tradeTag>CE_MediumAmmo</tradeTag>
-						<countRange>
-							<min>400</min>
-							<max>1000</max>
-						</countRange>
-						<thingDefCountRange>
-							<min>3</min>
-							<max>8</max>
-						</thingDefCountRange>
-					</li>
-					<li Class="StockGenerator_Tag">
-						<tradeTag>CE_HeavyAmmo</tradeTag>
-						<countRange>
-							<min>10</min>
-							<max>50</max>
-						</countRange>
-						<thingDefCountRange>
-							<min>2</min>
-							<max>5</max>
-						</thingDefCountRange>
-					</li>
-					<li Class="StockGenerator_Category">
-						<categoryDef>Ammo</categoryDef>
-						<thingDefCountRange>
-							<min>0</min>
-							<max>0</max>
-						</thingDefCountRange>
-					</li>
-				</value>
-			</li>
-
-			<!-- ======= Trader Caravan Base =======-->
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/TraderKindDef[defName="K4G_Base_Sultanate_Standard"]/stockGenerators</xpath>
-				<value>
-					<li Class="StockGenerator_SingleDef">
-						<thingDef>FSX</thingDef>
-						<countRange>
-							<min>15</min>
-							<max>40</max>
-						</countRange>
-					</li>
-					<li Class="StockGenerator_SingleDef">
-						<thingDef>Prometheum</thingDef>
-						<countRange>
-							<min>15</min>
-							<max>40</max>
-						</countRange>
-					</li>
-					<li Class="StockGenerator_Tag">
-						<tradeTag>CE_Ammo</tradeTag>
-						<countRange>
-							<min>400</min>
-							<max>1000</max>
-						</countRange>
-						<price>Cheap</price>
-						<thingDefCountRange>
-							<min>3</min>
-							<max>8</max>
-						</thingDefCountRange>
-					</li>
-					<li Class="StockGenerator_Tag">
-						<tradeTag>CE_MediumAmmo</tradeTag>
-						<countRange>
-							<min>10</min>
-							<max>50</max>
-						</countRange>
-						<thingDefCountRange>
-							<min>2</min>
-							<max>4</max>
-						</thingDefCountRange>
-					</li>
-					<li Class="StockGenerator_Tag">
-						<tradeTag>CE_HeavyAmmo</tradeTag>
-						<countRange>
-							<min>5</min>
-							<max>30</max>
-						</countRange>
-						<thingDefCountRange>
-							<min>2</min>
-							<max>6</max>
-						</thingDefCountRange>
-					</li>
-					<li Class="StockGenerator_Category">
-						<categoryDef>Ammo</categoryDef>
-						<thingDefCountRange>
-							<min>0</min>
-							<max>0</max>
-						</thingDefCountRange>
-					</li>
-					<li Class="StockGenerator_Tag">
-						<tradeTag>CE_Turret</tradeTag>
-						<thingDefCountRange>
-							<min>-4</min>
-							<max>2</max>
-						</thingDefCountRange>
-						<countRange>
-							<min>1</min>
-							<max>1</max>
-						</countRange>
-					</li>
-					<li Class="StockGenerator_Category">
-						<categoryDef>WeaponsTurrets</categoryDef>
-						<thingDefCountRange>
-							<min>0</min>
-							<max>0</max>
-						</thingDefCountRange>
-					</li>
-					<li Class="StockGenerator_Animals">
-						<tradeTagsSell>
-							<li>CE_AnimalBoom</li>
-						</tradeTagsSell>
-						<tradeTagsBuy>
-							<li>CE_AnimalBoom</li>
-						</tradeTagsBuy>
-						<kindCountRange>
-							<min>0</min>
-							<max>1</max>
-						</kindCountRange>
-						<countRange>
-							<min>-1</min>
-							<max>2</max>
-						</countRange>
-					</li>
-				</value>
-			</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Equipment of the Weimar Republic/Apparel_Various.xml b/Patches/K4G Equipment of the Weimar Republic/Apparel_Various.xml
deleted file mode 100644
index 93d08d0d48..0000000000
--- a/Patches/K4G Equipment of the Weimar Republic/Apparel_Various.xml	
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] Equipment of the Weimar Republic</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= Uniforms ======= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-					defName="K4G_Apparel_WRSicherheitspolizeiOfficerUniform" or
-					defName="K4G_Apparel_WRReichswehrInfantryUniform"					
-					]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-					defName="K4G_Apparel_WRSicherheitspolizeiOfficerUniform" or
-					defName="K4G_Apparel_WRReichswehrInfantryUniform"
-					]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.03</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-					defName="K4G_Apparel_WRSicherheitspolizeiOfficerUniform" or
-					defName="K4G_Apparel_WRReichswehrInfantryUniform"
-					]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.045</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ======= Coat ======= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Apparel_WRSicherheitspolizeiOfficerTrenchcoat"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="K4G_Apparel_WRSicherheitspolizeiOfficerTrenchcoat"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="K4G_Apparel_WRSicherheitspolizeiOfficerTrenchcoat"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Apparel_WRSicherheitspolizeiOfficerTrenchcoat"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>15</CarryBulk>
-						<ReloadSpeed>0.1</ReloadSpeed>
-					</value>
-				</li>
-
-				<!-- === Backpack === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Apparel_WRReichswehrInfantryRucksack"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="K4G_Apparel_WRReichswehrInfantryRucksack"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>Shoulders</li>
-						</bodyPartGroups>
-						<careIfDamaged>false</careIfDamaged>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="K4G_Apparel_WRReichswehrInfantryRucksack"]/thingCategories</xpath>
-					<value>
-						<thingCategories>
-							<li>Loadout</li>
-						</thingCategories>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="K4G_Apparel_WRReichswehrInfantryRucksack"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>40</CarryBulk>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- === Webbing === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-					defName="K4G_Apparel_WRSicherheitspolizeiOfficerWebbing" or
-					defName="K4G_Apparel_WRReichswehrInfantryWebbing"
-					]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-					defName="K4G_Apparel_WRSicherheitspolizeiOfficerWebbing" or
-					defName="K4G_Apparel_WRReichswehrInfantryWebbing"
-					]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>Shoulders</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-					defName="K4G_Apparel_WRSicherheitspolizeiOfficerWebbing" or
-					defName="K4G_Apparel_WRReichswehrInfantryWebbing"
-					]/apparel/layers</xpath>
-					<value>
-						<layers>
-							<li>Webbing</li>
-						</layers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-					defName="K4G_Apparel_WRSicherheitspolizeiOfficerWebbing" or
-					defName="K4G_Apparel_WRReichswehrInfantryWebbing"
-					]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>15</CarryBulk>
-							<ReloadSpeed>0.1</ReloadSpeed>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- ======= Helmets ======= -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="K4G_Apparel_WRReichswehrInfantryHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="K4G_Apparel_WRReichswehrInfantryHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ======= Caps ======= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Apparel_WRSicherheitspolizeiOfficerShako"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Equipment of the Weimar Republic/WeaponRanged.xml b/Patches/K4G Equipment of the Weimar Republic/WeaponRanged.xml
deleted file mode 100644
index fb3a0fe36a..0000000000
--- a/Patches/K4G Equipment of the Weimar Republic/WeaponRanged.xml	
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] Equipment of the Weimar Republic</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-		<!-- ========== Gewehr 98 ========== -->
-
-		<li Class="PatchOperationReplace">
-			<xpath>
-				Defs/ThingDef[
-				defName="K4G_Gun_WRGewehr98Rifle" or
-				defName="K4G_Gun_WRMP34SMG"
-				]/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>
-		</li>
-
-		<!-- ========== Gewehr 98 ========== -->
-
-		<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-			<defName>K4G_Gun_WRGewehr98Rifle</defName>
-			<statBases>
-				<Mass>4.09</Mass>
-				<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-				<SightsEfficiency>1</SightsEfficiency>
-				<ShotSpread>0.02</ShotSpread>
-				<SwayFactor>1.66</SwayFactor>
-				<Bulk>12.50</Bulk>
-			</statBases>
-			<Properties>
-				<recoilAmount>2.17</recoilAmount>
-				<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-				<hasStandardCommand>true</hasStandardCommand>
-				<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-				<warmupTime>1.1</warmupTime>
-				<range>55</range>
-				<soundCast>Shot_BoltActionRifle</soundCast>
-				<soundCastTail>GunTail_Heavy</soundCastTail>
-				<muzzleFlashScale>9</muzzleFlashScale>
-			</Properties>
-			<AmmoUser>
-				<magazineSize>5</magazineSize>
-				<reloadTime>4.3</reloadTime>
-				<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-			</AmmoUser>
-			<FireModes>
-				<aiAimMode>AimedShot</aiAimMode>
-			</FireModes>
-			<weaponTags>
-				<li>CE_AI_SR</li>
-			</weaponTags>
-			<AllowWithRunAndGun>false</AllowWithRunAndGun>
-		</li>
-
-		<li Class="PatchOperationAddModExtension">
-			<xpath>Defs/ThingDef[defName="K4G_Gun_WRGewehr98Rifle"]</xpath>
-			<value>
-				<li Class="CombatExtended.GunDrawExtension">
-					<DrawSize>1.3,1.3</DrawSize>
-					<DrawOffset>0.12,0.04</DrawOffset>
-					<CasingOffset>-0.1,0.1</CasingOffset>
-				</li>
-			</value>
-		</li>
-
-		<!-- ========== MP 34 ========== -->
-
-		<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-			<defName>K4G_Gun_WRMP34SMG</defName>
-			<statBases>
-				<Mass>4.25</Mass>
-				<RangedWeapon_Cooldown>0.41</RangedWeapon_Cooldown>
-				<SightsEfficiency>0.7</SightsEfficiency>
-				<ShotSpread>0.14</ShotSpread>
-				<SwayFactor>1.28</SwayFactor>
-				<Bulk>8.5</Bulk>
-			</statBases>
-			<Properties>
-				<recoilAmount>1.12</recoilAmount>
-				<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-				<hasStandardCommand>true</hasStandardCommand>
-				<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-				<warmupTime>0.6</warmupTime>
-				<range>25</range>
-				<burstShotCount>5</burstShotCount>
-				<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-				<soundCast>Shot_HeavySMG</soundCast>
-				<soundCastTail>GunTail_Heavy</soundCastTail>
-				<muzzleFlashScale>9</muzzleFlashScale>
-			</Properties>
-			<AmmoUser>
-				<magazineSize>20</magazineSize>
-				<reloadTime>4</reloadTime>
-				<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-			</AmmoUser>
-			<FireModes>
-				<aimedBurstShotCount>3</aimedBurstShotCount>
-				<aiUseBurstMode>FALSE</aiUseBurstMode>
-				<aiAimMode>Snapshot</aiAimMode>
-			</FireModes>
-			<weaponTags>
-				<li>CE_SMG</li>
-				<li>CE_AI_BROOM</li>
-			</weaponTags>
-		</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Rimworld War 2/AmmoDefs/WW2_RocketAmmo.xml b/Patches/K4G Rimworld War 2/AmmoDefs/WW2_RocketAmmo.xml
deleted file mode 100644
index 3aada8a411..0000000000
--- a/Patches/K4G Rimworld War 2/AmmoDefs/WW2_RocketAmmo.xml	
+++ /dev/null
@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] RimWorld War 2</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<!-- ===================== Category Defs =====================-->
-
-				<!-- ======= Type 74mm Rocket ======= -->
-				<ThingCategoryDef>
-					<defName>AmmoK4GType74mmRockets</defName>
-					<label>Type 74mm Rockets</label>
-					<parent>AmmoRockets</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberRocket</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ===================== Ammo Sets ===================== -->
-
-				<!-- ======= Type 74mm Rocket ======= -->
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_K4GType74mmRocket</defName>
-					<label>Type 74mm Rockets</label>
-					<ammoTypes>
-						<Ammo_K4GType74mm_HEAT>Bullet_K4GType74mm_HEAT</Ammo_K4GType74mm_HEAT>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ===================== Rocket Ammo ===================== -->
-
-				<!-- ======= Type 74mm Rocket ======= -->
-				<ThingDef Class="CombatExtended.AmmoDef" Name="K4GType74mmRocketBase" ParentName="MediumAmmoBase" Abstract="True">
-					<description>Outdated 74mm rocket-propelled grenade designed for the Type-4 74mm Rocket Launcher.</description>
-					<statBases>
-						<MaxHitPoints>150</MaxHitPoints>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-					</tradeTags>
-					<thingCategories>
-						<li>AmmoK4GType74mmRockets</li>
-					</thingCategories>
-					<stackLimit>25</stackLimit>
-					<cookOffFlashScale>40</cookOffFlashScale>
-					<cookOffSound>MortarBomb_Explode</cookOffSound>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="K4GType74mmRocketBase">
-					<defName>Ammo_K4GType74mm_HEAT</defName>
-					<label>Type 74mm Rocket (HEAT)</label>
-					<graphicData>
-						<texPath>Things/Ammo/RPG/HEAT</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>47.61</MarketValue>
-						<Mass>1.59</Mass>
-						<Bulk>4.66</Bulk>
-					</statBases>
-					<ammoClass>RocketHEAT</ammoClass>
-					<detonateProjectile>Bullet_K4GType74mm_HEAT</detonateProjectile>
-				</ThingDef>
-
-				<!-- ===================== Projectiles ===================== -->
-
-				<!-- ======= Panzerfaust 80mm Rocket ======= -->
-				<ThingDef ParentName="BaseRPG7Grenade">
-					<defName>Bullet_K4GPanzerFaust60_HEAT</defName>
-					<label>Panzerfaust 60 rocket</label>
-					<graphicData>
-						<texPath>Things/Projectile/WW2GermanServiceDisposableRocket</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>34</speed>
-						<damageDef>Bullet</damageDef>
-						<damageAmountBase>208</damageAmountBase>
-						<armorPenetrationSharp>200</armorPenetrationSharp>
-						<armorPenetrationBlunt>37.321</armorPenetrationBlunt>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>124</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>1</explosiveRadius>
-							<explosionSound>MortarBomb_Explode</explosionSound>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>1</Fragment_Large>
-								<Fragment_Small>19</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<!-- ======= Panzerfaust 60mm Rocket ======= -->
-				<ThingDef ParentName="BaseRPG7Grenade">
-					<defName>Bullet_K4GPanzerFaust50_HEAT</defName>
-					<label>Panzerfaust 50 rocket</label>
-					<graphicData>
-						<texPath>Things/Projectile/WW2GermanServiceDisposableRocketB</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>34</speed>
-						<damageDef>Bullet</damageDef>
-						<damageAmountBase>208</damageAmountBase>
-						<armorPenetrationSharp>150</armorPenetrationSharp>
-						<armorPenetrationBlunt>34.321</armorPenetrationBlunt>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>124</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>1</explosiveRadius>
-							<explosionSound>MortarBomb_Explode</explosionSound>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>1</Fragment_Large>
-								<Fragment_Small>13</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<!-- ======= Type 74mm Rocket ======= -->
-				<ThingDef ParentName="BaseRPG7Grenade">
-					<defName>Bullet_K4GType74mm_HEAT</defName>
-					<label>Type 74mm Rocket (HEAT)</label>
-					<graphicData>
-						<texPath>Things/Projectile/WW2JapaneseServiceRocket</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>31</speed>
-						<damageDef>Bullet</damageDef>
-						<damageAmountBase>208</damageAmountBase>
-						<armorPenetrationSharp>172</armorPenetrationSharp>
-						<armorPenetrationBlunt>39.273</armorPenetrationBlunt>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>132</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>1.2</explosiveRadius>
-							<explosionSound>MortarBomb_Explode</explosionSound>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>2</Fragment_Large>
-								<Fragment_Small>39</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<!-- ======= Type 74mm Rocket ======= -->
-				<RecipeDef ParentName="LauncherAmmoRecipeBase">
-					<defName>MakeAmmo_K4GType74mm_HEAT</defName>
-					<label>make Type 74mm HEAT rockets x5</label>
-					<description>Craft 5 Type 74mm HEAT rockets.</description>
-					<jobString>Making Type 74mm HEAT rockets.</jobString>
-					<workAmount>7900</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>25</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>7</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>4</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_K4GType74mm_HEAT>5</Ammo_K4GType74mm_HEAT>
-					</products>
-				</RecipeDef>
-
-			</value>
-
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FinlandCoBelligerentAllies.xml b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FinlandCoBelligerentAllies.xml
deleted file mode 100644
index 2664061325..0000000000
--- a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FinlandCoBelligerentAllies.xml	
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] RimWorld War 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Private & Medic === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2FinnishPrivateCoBelligerentAllies" or defName="K4G_WW2FinnishMedicCoBelligerentAllies"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Rifleman & Infantry === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2FinnishRiflemanCoBelligerentAllies" or
-						defName="K4G_WW2FinnishRiflemanSharedCoBelligerentAllies" or
-						defName="K4G_WW2FinnishInfantryCoBelligerentAllies"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.25</generateChance>
-									<sidearmMoney>
-										<min>75</min>
-										<max>185</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2FinlandMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Machine Gunner === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2FinnishMachineGunnerCoBelligerentAllies" or
-						defName="K4G_WW2FinnishMachineGunnerSharedCoBelligerentAllies"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>85</min>
-										<max>195</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2FinlandMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Sniper === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2FinnishSniperCoBelligerentAllies"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>95</min>
-										<max>195</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2FinlandMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Grenadier === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2FinnishGrenadierCoBelligerentAllies"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>8</min>
-								<max>14</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>25</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2FinlandPistol</li>
-									</weaponTags>
-									<magazineCount>
-										<min>3</min>
-										<max>5</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Anti-Tank === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2FinnishAntiTankCoBelligerentAllies" or defName="K4G_WW2FinnishAntiTankSharedCoBelligerentAllies"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>25</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2FinlandPistol</li>
-									</weaponTags>
-									<magazineCount>
-										<min>3</min>
-										<max>5</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Officers === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2FinnishOfficerCoBelligerentAllies" or
-						defName="K4G_WW2FinnishOfficerSharedCoBelligerentAllies" or
-						defName="K4G_WW2FinnishLogisticsOfficerCoBelligerentAllies" or
-						defName="K4G_WW2FinnishLogisticsOfficerSharedCoBelligerentAllies" or
-						defName="K4G_WW2FinnishLeaderCoBelligerentAllies" or
-						defName="K4G_WW2FinnishLeaderSharedCoBelligerentAllies"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.33</generateChance>
-									<sidearmMoney>
-										<min>20</min>
-										<max>120</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2FinlandMelee</li>
-									</weaponTags>
-								</li>
-								<li>
-									<generateChance>0.1</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_FlareLauncher</li>
-									</weaponTags>
-									<magazineCount>
-										<min>2</min>
-										<max>4</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FinlandCoBelligerentGermany.xml b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FinlandCoBelligerentGermany.xml
deleted file mode 100644
index 05645bd8ba..0000000000
--- a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FinlandCoBelligerentGermany.xml	
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] RimWorld War 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Private & Medic === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2FinnishPrivateCoBelligerentGermany" or defName="K4G_WW2FinnishMedicCoBelligerentGermany"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Rifleman & Infantry === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2FinnishRiflemanCoBelligerentGermany" or
-						defName="K4G_WW2FinnishRiflemanSharedCoBelligerentGermany" or
-						defName="K4G_WW2FinnishInfantryCoBelligerentGermany"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.25</generateChance>
-									<sidearmMoney>
-										<min>75</min>
-										<max>185</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2FinlandMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Machine Gunner === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2FinnishMachineGunnerCoBelligerentGermany" or
-						defName="K4G_WW2FinnishMachineGunnerSharedCoBelligerentGermany"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>85</min>
-										<max>195</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2FinlandMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Sniper === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2FinnishSniperCoBelligerentGermany"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>95</min>
-										<max>195</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2FinlandMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Grenadier === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2FinnishGrenadierCoBelligerentGermany"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>8</min>
-								<max>14</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>25</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2FinlandPistol</li>
-									</weaponTags>
-									<magazineCount>
-										<min>3</min>
-										<max>5</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Anti-Tank === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2FinnishAntiTankCoBelligerentGermany" or defName="K4G_WW2FinnishAntiTankSharedCoBelligerentGermany"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>25</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2FinlandPistol</li>
-									</weaponTags>
-									<magazineCount>
-										<min>3</min>
-										<max>5</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Officers === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2FinnishOfficerCoBelligerentGermany" or
-						defName="K4G_WW2FinnishOfficerSharedCoBelligerentGermany" or
-						defName="K4G_WW2FinnishLogisticsOfficerCoBelligerentGermany" or
-						defName="K4G_WW2FinnishLogisticsOfficerSharedCoBelligerentGermany" or
-						defName="K4G_WW2FinnishLeaderCoBelligerentGermany" or
-						defName="K4G_WW2FinnishLeaderSharedCoBelligerentGermany"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.33</generateChance>
-									<sidearmMoney>
-										<min>20</min>
-										<max>120</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2FinlandMelee</li>
-									</weaponTags>
-								</li>
-								<li>
-									<generateChance>0.1</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_FlareLauncher</li>
-									</weaponTags>
-									<magazineCount>
-										<min>2</min>
-										<max>4</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FinlandIndependent.xml b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FinlandIndependent.xml
deleted file mode 100644
index 315b108376..0000000000
--- a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FinlandIndependent.xml	
+++ /dev/null
@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] RimWorld War 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Private & Medic === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2FinnishPrivateIndependent" or
-						defName="K4G_WW2FinnishPrivateSharedIndependent" or
-						defName="K4G_WW2FinnishMedicIndependent"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Rifleman & Infantry === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2FinnishRiflemanIndependent" or
-						defName="K4G_WW2FinnishRiflemanSharedIndependent" or
-						defName="K4G_WW2FinnishInfantryIndependent" or
-						defName="K4G_WW2FinnishInfantrySharedIndependent"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.25</generateChance>
-									<sidearmMoney>
-										<min>75</min>
-										<max>185</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2FinlandMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Machine Gunner === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2FinnishMachineGunnerIndependent" or
-						defName="K4G_WW2FinnishMachineGunnerSharedIndependent"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>85</min>
-										<max>195</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2FinlandMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Sniper === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2FinnishSniperIndependent" or defName="K4G_WW2FinnishSniperSharedIndependent"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>95</min>
-										<max>195</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2FinlandMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Grenadier === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2FinnishGrenadierIndependent" or defName="K4G_WW2FinnishGrenadierSharedIndependent"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>8</min>
-								<max>14</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>25</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2FinlandPistol</li>
-									</weaponTags>
-									<magazineCount>
-										<min>3</min>
-										<max>5</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Anti-Tank === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2FinnishAntiTankIndependent" or defName="K4G_WW2FinnishAntiTankSharedIndependent"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>25</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2FinlandPistol</li>
-									</weaponTags>
-									<magazineCount>
-										<min>3</min>
-										<max>5</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Officers === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2FinnishOfficerIndependent" or
-						defName="K4G_WW2FinnishOfficerSharedIndependent" or
-						defName="K4G_WW2FinnishLogisticsOfficerIndependent" or
-						defName="K4G_WW2FinnishLogisticsOfficerSharedIndependent" or
-						defName="K4G_WW2FinnishLeaderIndependent" or
-						defName="K4G_WW2FinnishLeaderSharedIndependent"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.33</generateChance>
-									<sidearmMoney>
-										<min>20</min>
-										<max>120</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2FinlandMelee</li>
-									</weaponTags>
-								</li>
-								<li>
-									<generateChance>0.1</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_FlareLauncher</li>
-									</weaponTags>
-									<magazineCount>
-										<min>2</min>
-										<max>4</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FranceAllies.xml b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FranceAllies.xml
deleted file mode 100644
index 87c447165e..0000000000
--- a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FranceAllies.xml	
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] RimWorld War 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Private & Medic === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2FrenchPrivateAllies" or
-						defName="K4G_WW2FrenchMedicAllies" or
-						defName="K4G_WW2FrenchPrivateSharedAllies"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Rifleman & Infantry === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2FrenchRiflemanAllies" or
-						defName="K4G_WW2FrenchRiflemanSharedAllies" or
-						defName="K4G_WW2FrenchInfantryAllies" or
-						defName="K4G_WW2FrenchInfantrySharedAllies"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.25</generateChance>
-									<sidearmMoney>
-										<min>75</min>
-										<max>185</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2FranceMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Machine Gunner === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2FrenchMachineGunnerAllies" or
-						defName="K4G_WW2FrenchMachineGunnerSharedAllies"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>85</min>
-										<max>195</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2FranceMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Sniper === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2FrenchSniperSharedAllies"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>95</min>
-										<max>195</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2FranceMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Grenadier === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2FrenchGrenadierAllies"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>8</min>
-								<max>14</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>25</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2FrancePistol</li>
-									</weaponTags>
-									<magazineCount>
-										<min>3</min>
-										<max>5</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Anti-Tank === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2FrenchAntiTankSharedAllies"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>25</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2FrancePistol</li>
-									</weaponTags>
-									<magazineCount>
-										<min>3</min>
-										<max>5</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Officers === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2FrenchOfficerAllies" or
-						defName="K4G_WW2FrenchLogisticsOfficerAllies" or
-						defName="K4G_WW2FrenchLeaderAllies"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.33</generateChance>
-									<sidearmMoney>
-										<min>20</min>
-										<max>120</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2FranceMelee</li>
-									</weaponTags>
-								</li>
-								<li>
-									<generateChance>0.1</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_FlareLauncher</li>
-									</weaponTags>
-									<magazineCount>
-										<min>2</min>
-										<max>4</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FranceAxis.xml b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FranceAxis.xml
deleted file mode 100644
index 4cafa549bd..0000000000
--- a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FranceAxis.xml	
+++ /dev/null
@@ -1,229 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] RimWorld War 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Private & Medic === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2FrenchPrivateAxis" or
-						defName="K4G_WW2FrenchPrivateSharedAxis" or
-						defName="K4G_WW2FrenchMedicAxis" or
-						defName="K4G_WW2FrenchMedicSharedAxis"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Rifleman & Infantry === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2FrenchRiflemanAxis" or
-						defName="K4G_WW2FrenchRiflemanSharedAxis" or
-						defName="K4G_WW2FrenchInfantryAxis" or
-						defName="K4G_WW2FrenchInfantrySharedAxis"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.25</generateChance>
-									<sidearmMoney>
-										<min>75</min>
-										<max>185</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2FranceMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Machine Gunner === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2FrenchMachineGunnerAxis" or
-						defName="K4G_WW2FrenchMachineGunnerSharedAxis"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>85</min>
-										<max>195</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2FranceMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Sniper === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2FrenchSniperSharedAxis" or defName="K4G_WW2FrenchGrenadierSharedAxis"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>95</min>
-										<max>195</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2FranceMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Grenadier === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2FrenchGrenadierAxis" or
-						defName="K4G_WW2FrenchGrenadierSharedAxis"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>8</min>
-								<max>14</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>25</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2FrancePistol</li>
-									</weaponTags>
-									<magazineCount>
-										<min>3</min>
-										<max>5</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Anti-Tank === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2FrenchAntiTankSharedAxis" or
-						defName="K4G_WW2FrenchAntiTankBSharedAxis"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>25</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2FrancePistol</li>
-									</weaponTags>
-									<magazineCount>
-										<min>3</min>
-										<max>5</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Officers === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2FrenchOfficerAxis" or
-						defName="K4G_WW2FrenchOfficerSharedAxis" or
-						defName="K4G_WW2FrenchOfficerBSharedAxis" or
-						defName="K4G_WW2FrenchLogisticsOfficerAxis" or
-						defName="K4G_WW2FrenchLogisticsOfficerSharedAxis" or
-						defName="K4G_WW2FrenchLogisticsOfficerBSharedAxis" or
-						defName="K4G_WW2FrenchLeaderAxis" or
-						defName="K4G_WW2FrenchLeaderSharedAxis" or
-						defName="K4G_WW2FrenchLeaderBSharedAxis"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.33</generateChance>
-									<sidearmMoney>
-										<min>20</min>
-										<max>120</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2FranceMelee</li>
-									</weaponTags>
-								</li>
-								<li>
-									<generateChance>0.1</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_FlareLauncher</li>
-									</weaponTags>
-									<magazineCount>
-										<min>2</min>
-										<max>4</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FranceExile.xml b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FranceExile.xml
deleted file mode 100644
index a31cffa573..0000000000
--- a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FranceExile.xml	
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] RimWorld War 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Private & Medic === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2FrenchPrivateExile" or
-						defName="K4G_WW2FrenchPrivateSharedExile" or
-						defName="K4G_WW2FrenchMedicExile" or
-						defName="K4G_WW2FrenchMedicSharedExile"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Rifleman & Infantry === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2FrenchRiflemanExile" or
-						defName="K4G_WW2FrenchRiflemanSharedExile" or
-						defName="K4G_WW2FrenchInfantryExile" or
-						defName="K4G_WW2FrenchInfantrySharedExile"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.25</generateChance>
-									<sidearmMoney>
-										<min>75</min>
-										<max>185</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2FranceMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Machine Gunner === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2FrenchMachineGunnerExile" or
-						defName="K4G_WW2FrenchMachineGunnerSharedExile"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>85</min>
-										<max>195</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2FranceMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Sniper === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2FrenchSniperExile" or
-						defName="K4G_WW2FrenchSniperBSharedExile"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>95</min>
-										<max>195</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2FranceMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Grenadier === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2FrenchGrenadierExile" or defName="K4G_WW2FrenchGrenadierSharedExile"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>8</min>
-								<max>14</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>25</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2FrancePistol</li>
-									</weaponTags>
-									<magazineCount>
-										<min>3</min>
-										<max>5</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Anti-Tank === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2FrenchAntiTankSharedExile" or defName="K4G_WW2FrenchAntiTankSharedExile"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>25</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2FrancePistol</li>
-									</weaponTags>
-									<magazineCount>
-										<min>3</min>
-										<max>5</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Officers === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2FrenchOfficerExile" or
-						defName="K4G_WW2FrenchOfficerSharedExile" or
-						defName="K4G_WW2FrenchOfficerBSharedExile" or
-						defName="K4G_WW2FrenchLogisticsOfficerExile" or
-						defName="K4G_WW2FrenchLogisticsOfficerSharedExile" or
-						defName="K4G_WW2FrenchLogisticsOfficerBSharedExile" or
-						defName="K4G_WW2FrenchLeaderExile" or
-						defName="K4G_WW2FrenchLeaderSharedExile" or
-						defName="K4G_WW2FrenchLeaderBSharedExile"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.33</generateChance>
-									<sidearmMoney>
-										<min>20</min>
-										<max>120</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2FranceMelee</li>
-									</weaponTags>
-								</li>
-								<li>
-									<generateChance>0.1</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_FlareLauncher</li>
-									</weaponTags>
-									<magazineCount>
-										<min>2</min>
-										<max>4</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_Germany.xml b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_Germany.xml
deleted file mode 100644
index 71b826760b..0000000000
--- a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_Germany.xml	
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] RimWorld War 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Private & Medic === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2GermanPrivate" or defName="K4G_WW2GermanMedic"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Rifleman & Infantry === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2GermanRifleman" or
-						defName="K4G_WW2GermanRiflemanShared" or
-						defName="K4G_WW2GermanInfantry"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.25</generateChance>
-									<sidearmMoney>
-										<min>75</min>
-										<max>185</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2GermanyMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Machine Gunner === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2GermanMachineGunner" or
-						defName="K4G_WW2GermanMachineGunnerShared"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>85</min>
-										<max>195</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2GermanyMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Sniper === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2GermanSniper"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>95</min>
-										<max>195</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2GermanyMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Grenadier === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2GermanGrenadier"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>8</min>
-								<max>14</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>25</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2GermanyPistol</li>
-									</weaponTags>
-									<magazineCount>
-										<min>3</min>
-										<max>5</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Anti-Tank === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2GermanAntiTank" or defName="K4G_WW2GermanAntiTankShared"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>25</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2GermanyPistol</li>
-									</weaponTags>
-									<magazineCount>
-										<min>3</min>
-										<max>5</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Officers === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2GermanOfficer" or
-						defName="K4G_WW2GermanOfficerB" or
-						defName="K4G_WW2GermanLogisticsOfficer" or
-						defName="K4G_WW2GermanLogisticsOfficerB" or
-						defName="K4G_WW2GermanLeader" or
-						defName="K4G_WW2GermanLeaderB"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>7</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.25</generateChance>
-									<sidearmMoney>
-										<min>20</min>
-										<max>120</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2GermanyMelee</li>
-									</weaponTags>
-								</li>
-								<li>
-									<generateChance>0.075</generateChance>
-									<sidearmMoney>
-										<min>10</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_FlareLauncher</li>
-									</weaponTags>
-									<magazineCount>
-										<min>1</min>
-										<max>3</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_ItalyAxis.xml b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_ItalyAxis.xml
deleted file mode 100644
index 143fc9df4e..0000000000
--- a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_ItalyAxis.xml	
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] RimWorld War 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Private & Medic === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2ItalianPrivateAxis" or
-						defName="K4G_WW2ItalianMedicAxis" or
-						defName="K4G_WW2ItalianMedicSharedAxis"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Rifleman & Infantry === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2ItalianRiflemanAxis" or
-						defName="K4G_WW2ItalianRiflemanSharedAxis" or
-						defName="K4G_WW2ItalianInfantryAxis"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.25</generateChance>
-									<sidearmMoney>
-										<min>75</min>
-										<max>185</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2ItalyMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Machine Gunner === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2ItalianMachineGunnerAxis" or
-						defName="K4G_WW2ItalianMachineGunnerSharedAxis"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>85</min>
-										<max>195</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2ItalyMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Sniper === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2ItalianSniperSharedAxis"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>95</min>
-										<max>195</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2ItalyMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Grenadier === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2ItalianGrenadierAxis"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>8</min>
-								<max>14</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>25</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2ItalyPistol</li>
-									</weaponTags>
-									<magazineCount>
-										<min>3</min>
-										<max>5</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Anti-Tank === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2ItalianAntiTankSharedAxis"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>25</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2ItalyPistol</li>
-									</weaponTags>
-									<magazineCount>
-										<min>3</min>
-										<max>5</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Officers === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2ItalianOfficerAxis" or
-						defName="K4G_WW2ItalianOfficerSharedAxis" or
-						defName="K4G_WW2ItalianOfficerBAxis" or
-						defName="K4G_WW2ItalianOfficerBSharedAxis" or
-						defName="K4G_WW2ItalianLogisticsOfficerAxis" or
-						defName="K4G_WW2ItalianLogisticsOfficerSharedAxis" or
-						defName="K4G_WW2ItalianLogisticsOfficerBAxis" or
-						defName="K4G_WW2ItalianLogisticsOfficerBSharedAxis" or
-						defName="K4G_WW2ItalianLeaderAxis" or
-						defName="K4G_WW2ItalianLeaderSharedAxis" or
-						defName="K4G_WW2ItalianLeaderBAxis" or
-						defName="K4G_WW2ItalianLeaderBSharedAxis"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.33</generateChance>
-									<sidearmMoney>
-										<min>20</min>
-										<max>120</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2ItalyMelee</li>
-									</weaponTags>
-								</li>
-								<li>
-									<generateChance>0.1</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_FlareLauncher</li>
-									</weaponTags>
-									<magazineCount>
-										<min>2</min>
-										<max>4</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_ItalyAxisB.xml b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_ItalyAxisB.xml
deleted file mode 100644
index a0bd60d46e..0000000000
--- a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_ItalyAxisB.xml	
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] RimWorld War 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Private & Medic === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2ItalianPrivateAxisB" or
-						defName="K4G_WW2ItalianMedicAxisB" or
-						defName="K4G_WW2ItalianMedicSharedAxisB"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Rifleman & Infantry === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2ItalianRiflemanAxisB" or
-						defName="K4G_WW2ItalianRiflemanSharedAxisB" or
-						defName="K4G_WW2ItalianInfantryAxisB"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.25</generateChance>
-									<sidearmMoney>
-										<min>75</min>
-										<max>185</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2ItalyMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Machine Gunner === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2ItalianMachineGunnerAxisB" or
-						defName="K4G_WW2ItalianMachineGunnerSharedAxisB"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>85</min>
-										<max>195</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2ItalyMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Sniper === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2ItalianSniperSharedAxisB"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>95</min>
-										<max>195</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2ItalyMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Grenadier === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2ItalianGrenadierAxisB"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>8</min>
-								<max>14</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>25</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2ItalyPistol</li>
-									</weaponTags>
-									<magazineCount>
-										<min>3</min>
-										<max>5</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Anti-Tank === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2ItalianAntiTankSharedAxisB"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>25</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2ItalyPistol</li>
-									</weaponTags>
-									<magazineCount>
-										<min>3</min>
-										<max>5</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Officers === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2ItalianOfficerAxisB" or
-						defName="K4G_WW2ItalianOfficerSharedAxisB" or
-						defName="K4G_WW2ItalianOfficerBAxisB" or
-						defName="K4G_WW2ItalianOfficerBSharedAxisB" or
-						defName="K4G_WW2ItalianLogisticsOfficerAxisB" or
-						defName="K4G_WW2ItalianLogisticsOfficerSharedAxisB" or
-						defName="K4G_WW2ItalianLogisticsOfficerBAxisB" or
-						defName="K4G_WW2ItalianLogisticsOfficerBSharedAxisB" or
-						defName="K4G_WW2ItalianLeaderAxisB" or
-						defName="K4G_WW2ItalianLeaderSharedAxisB" or
-						defName="K4G_WW2ItalianLeaderBAxisB" or
-						defName="K4G_WW2ItalianLeaderBSharedAxisB"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.33</generateChance>
-									<sidearmMoney>
-										<min>20</min>
-										<max>120</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2ItalyMelee</li>
-									</weaponTags>
-								</li>
-								<li>
-									<generateChance>0.1</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_FlareLauncher</li>
-									</weaponTags>
-									<magazineCount>
-										<min>2</min>
-										<max>4</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_ItalyCoBelligerentAllies.xml b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_ItalyCoBelligerentAllies.xml
deleted file mode 100644
index 8b51a34faf..0000000000
--- a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_ItalyCoBelligerentAllies.xml	
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] RimWorld War 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Private & Medic === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2ItalianPrivateCoBelligerentAllies" or defName="K4G_WW2ItalianMedicCoBelligerentAllies"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Rifleman & Infantry === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2ItalianRiflemanCoBelligerentAllies" or
-						defName="K4G_WW2ItalianRiflemanSharedCoBelligerentAllies" or
-						defName="K4G_WW2ItalianInfantryCoBelligerentAllies" or
-						defName="K4G_WW2ItalianInfantrySharedCoBelligerentAllies"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.25</generateChance>
-									<sidearmMoney>
-										<min>75</min>
-										<max>185</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2ItalyMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Machine Gunner === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2ItalianMachineGunnerCoBelligerentAllies" or
-						defName="K4G_WW2ItalianMachineGunnerSharedCoBelligerentAllies"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>85</min>
-										<max>195</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2ItalyMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Sniper === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2ItalianSniperSharedCoBelligerentAllies"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>95</min>
-										<max>195</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2ItalyMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Grenadier === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2ItalianGrenadierCoBelligerentAllies"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>8</min>
-								<max>14</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>25</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2ItalyPistol</li>
-									</weaponTags>
-									<magazineCount>
-										<min>3</min>
-										<max>5</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Anti-Tank === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2ItalianAntiTankCoBelligerentAllies"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>25</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2ItalyPistol</li>
-									</weaponTags>
-									<magazineCount>
-										<min>3</min>
-										<max>5</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Officers === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2ItalianOfficerCoBelligerentAllies" or
-						defName="K4G_WW2ItalianOfficerBCoBelligerentAllies" or
-						defName="K4G_WW2ItalianLogisticsOfficerCoBelligerentAllies" or
-						defName="K4G_WW2ItalianLogisticsOfficerBCoBelligerentAllies" or
-						defName="K4G_WW2ItalianLeaderCoBelligerentAllies" or
-						defName="K4G_WW2ItalianLeaderBCoBelligerentAllies"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.33</generateChance>
-									<sidearmMoney>
-										<min>20</min>
-										<max>120</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2ItalyMelee</li>
-									</weaponTags>
-								</li>
-								<li>
-									<generateChance>0.1</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_FlareLauncher</li>
-									</weaponTags>
-									<magazineCount>
-										<min>2</min>
-										<max>4</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_Japan.xml b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_Japan.xml
deleted file mode 100644
index 4a74b720d4..0000000000
--- a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_Japan.xml	
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] RimWorld War 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Private & Medic === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2JapanesePrivate" or defName="K4G_WW2JapaneseMedic"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Rifleman & Infantry === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2JapaneseRifleman" or
-						defName="K4G_WW2JapaneseRiflemanShared" or
-						defName="K4G_WW2JapaneseInfantry"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.25</generateChance>
-									<sidearmMoney>
-										<min>75</min>
-										<max>185</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2JapanMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Machine Gunner === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2JapaneseMachineGunner" or
-						defName="K4G_WW2JapaneseMachineGunnerShared"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>85</min>
-										<max>195</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2JapanMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Sniper === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2JapaneseSniper"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>95</min>
-										<max>195</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2JapanMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Grenadier === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2JapaneseGrenadier"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>8</min>
-								<max>14</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>25</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2JapanPistol</li>
-									</weaponTags>
-									<magazineCount>
-										<min>3</min>
-										<max>5</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Anti-Tank === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2JapaneseAntiTank" or defName="K4G_WW2JapaneseAntiTankShared"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>25</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2JapanPistol</li>
-									</weaponTags>
-									<magazineCount>
-										<min>3</min>
-										<max>5</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Officers === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2JapaneseOfficer" or
-						defName="K4G_WW2JapaneseOfficerB" or
-						defName="K4G_WW2JapaneseLogisticsOfficer" or
-						defName="K4G_WW2JapaneseLogisticsOfficerB" or
-						defName="K4G_WW2JapaneseLeader" or
-						defName="K4G_WW2JapaneseLeaderB"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>7</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.25</generateChance>
-									<sidearmMoney>
-										<min>20</min>
-										<max>120</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2JapanMelee</li>
-									</weaponTags>
-								</li>
-								<li>
-									<generateChance>0.075</generateChance>
-									<sidearmMoney>
-										<min>80</min>
-										<max>160</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_FlareLauncher</li>
-									</weaponTags>
-									<magazineCount>
-										<min>1</min>
-										<max>3</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_RussiaAllies.xml b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_RussiaAllies.xml
deleted file mode 100644
index 0582608e31..0000000000
--- a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_RussiaAllies.xml	
+++ /dev/null
@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] RimWorld War 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Private & Medic === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2RussianPrivateAllies" or defName="K4G_WW2RussianMedicAllies"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Rifleman & Infantry === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2RussianRiflemanAllies" or
-						defName="K4G_WW2RussianRiflemanSharedAllies" or
-						defName="K4G_WW2RussianInfantryAllies"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.25</generateChance>
-									<sidearmMoney>
-										<min>75</min>
-										<max>185</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2RussiaMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Machine Gunner === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2RussianMachineGunnerAllies" or
-						defName="K4G_WW2RussianMachineGunnerSharedAllies"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>85</min>
-										<max>195</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2RussiaMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Sniper === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2RussianSniperAllies"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>95</min>
-										<max>195</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2RussiaMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Grenadier === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2RussianGrenadierAllies"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>8</min>
-								<max>14</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>25</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2RussiaPistol</li>
-									</weaponTags>
-									<magazineCount>
-										<min>3</min>
-										<max>5</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Anti-Tank === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2RussianAntiTankAllies" or defName="K4G_WW2RussianAntiTankSharedAllies"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>25</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2RussiaPistol</li>
-									</weaponTags>
-									<magazineCount>
-										<min>3</min>
-										<max>5</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Officers === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2RussianOfficerAllies" or
-						defName="K4G_WW2RussianOfficerBAllies" or
-						defName="K4G_WW2RussianOfficerCAllies" or
-						defName="K4G_WW2RussianLogisticsOfficerAllies" or
-						defName="K4G_WW2RussianLogisticsOfficerBAllies" or
-						defName="K4G_WW2RussianLogisticsOfficerCAllies" or
-						defName="K4G_WW2RussianLeaderAllies" or
-						defName="K4G_WW2RussianLeaderBAllies" or
-						defName="K4G_WW2RussianLeaderCAllies"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.33</generateChance>
-									<sidearmMoney>
-										<min>20</min>
-										<max>120</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2RussiaMelee</li>
-									</weaponTags>
-								</li>
-								<li>
-									<generateChance>0.1</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_FlareLauncher</li>
-									</weaponTags>
-									<magazineCount>
-										<min>2</min>
-										<max>4</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_RussiaCoBelligerentGermany.xml b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_RussiaCoBelligerentGermany.xml
deleted file mode 100644
index 190348a633..0000000000
--- a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_RussiaCoBelligerentGermany.xml	
+++ /dev/null
@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] RimWorld War 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Private & Medic === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2RussianPrivateCoBelligerentGermany" or defName="K4G_WW2RussianMedicCoBelligerentGermany"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Rifleman & Infantry === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2RussianRiflemanCoBelligerentGermany" or
-						defName="K4G_WW2RussianRiflemanSharedCoBelligerentGermany" or
-						defName="K4G_WW2RussianInfantryCoBelligerentGermany"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.25</generateChance>
-									<sidearmMoney>
-										<min>75</min>
-										<max>185</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2RussiaMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Machine Gunner === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2RussianMachineGunnerCoBelligerentGermany" or
-						defName="K4G_WW2RussianMachineGunnerSharedCoBelligerentGermany"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>85</min>
-										<max>195</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2RussiaMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Sniper === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2RussianSniperCoBelligerentGermany"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>95</min>
-										<max>195</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2RussiaMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Grenadier === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2RussianGrenadierCoBelligerentGermany"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>8</min>
-								<max>14</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>25</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2RussiaPistol</li>
-									</weaponTags>
-									<magazineCount>
-										<min>3</min>
-										<max>5</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Anti-Tank === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2RussianAntiTankCoBelligerentGermany" or defName="K4G_WW2RussianAntiTankSharedCoBelligerentGermany"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>25</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2RussiaPistol</li>
-									</weaponTags>
-									<magazineCount>
-										<min>3</min>
-										<max>5</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Officers === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2RussianOfficerCoBelligerentGermany" or
-						defName="K4G_WW2RussianOfficerBCoBelligerentGermany" or
-						defName="K4G_WW2RussianOfficerCCoBelligerentGermany" or
-						defName="K4G_WW2RussianLogisticsOfficerCoBelligerentGermany" or
-						defName="K4G_WW2RussianLogisticsOfficerBCoBelligerentGermany" or
-						defName="K4G_WW2RussianLogisticsOfficerCCoBelligerentGermany" or
-						defName="K4G_WW2RussianLeaderCoBelligerentGermany" or
-						defName="K4G_WW2RussianLeaderBCoBelligerentGermany" or
-						defName="K4G_WW2RussianLeaderCCoBelligerentGermany"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.33</generateChance>
-									<sidearmMoney>
-										<min>20</min>
-										<max>120</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2RussiaMelee</li>
-									</weaponTags>
-								</li>
-								<li>
-									<generateChance>0.1</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_FlareLauncher</li>
-									</weaponTags>
-									<magazineCount>
-										<min>2</min>
-										<max>4</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_UnitedKingdom.xml b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_UnitedKingdom.xml
deleted file mode 100644
index 3759dc4c66..0000000000
--- a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_UnitedKingdom.xml	
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] RimWorld War 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Private & Medic === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2BritishPrivate" or defName="K4G_WW2BritishMedic"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Rifleman & Infantry === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2BritishRifleman" or
-						defName="K4G_WW2BritishRiflemanShared" or
-						defName="K4G_WW2BritishInfantry"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.25</generateChance>
-									<sidearmMoney>
-										<min>75</min>
-										<max>185</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2UnitedKingdomMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Machine Gunner === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2BritishMachineGunner" or
-						defName="K4G_WW2BritishMachineGunnerShared"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>85</min>
-										<max>195</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2UnitedKingdomMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Sniper === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2BritishSniper"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>95</min>
-										<max>195</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2UnitedKingdomMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Grenadier === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2BritishGrenadier"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>8</min>
-								<max>14</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>25</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2UnitedKingdomPistol</li>
-									</weaponTags>
-									<magazineCount>
-										<min>3</min>
-										<max>5</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Anti-Tank === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2BritishAntiTank" or defName="K4G_WW2BritishAntiTankShared"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>25</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2UnitedKingdomPistol</li>
-									</weaponTags>
-									<magazineCount>
-										<min>3</min>
-										<max>5</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Officers === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2BritishOfficer" or
-						defName="K4G_WW2BritishOfficerB" or
-						defName="K4G_WW2BritishLogisticsOfficer" or
-						defName="K4G_WW2BritishLogisticsOfficerB" or
-						defName="K4G_WW2BritishLeader" or
-						defName="K4G_WW2BritishLeaderB"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.33</generateChance>
-									<sidearmMoney>
-										<min>20</min>
-										<max>120</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2UnitedStatesMelee</li>
-									</weaponTags>
-								</li>
-								<li>
-									<generateChance>0.1</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_FlareLauncher</li>
-									</weaponTags>
-									<magazineCount>
-										<min>2</min>
-										<max>4</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_UnitedStates.xml b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_UnitedStates.xml
deleted file mode 100644
index 2fb4df6a39..0000000000
--- a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_UnitedStates.xml	
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] RimWorld War 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Private & Medic === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2AmericanPrivate" or defName="K4G_WW2AmericanMedic"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Rifleman & Infantry === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2AmericanRifleman" or
-						defName="K4G_WW2AmericanRiflemanShared" or
-						defName="K4G_WW2AmericanInfantry"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.25</generateChance>
-									<sidearmMoney>
-										<min>75</min>
-										<max>185</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2UnitedStatesMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Machine Gunner === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2AmericanMachineGunner" or
-						defName="K4G_WW2AmericanMachineGunnerShared"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>85</min>
-										<max>195</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2UnitedStatesMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Sniper === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2AmericanSniper"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>95</min>
-										<max>195</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2UnitedStatesMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Grenadier === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2AmericanGrenadier"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>8</min>
-								<max>14</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>25</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2UnitedStatesPistol</li>
-									</weaponTags>
-									<magazineCount>
-										<min>3</min>
-										<max>5</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Anti-Tank === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="K4G_WW2AmericanAntiTank" or defName="K4G_WW2AmericanAntiTankShared"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>25</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2UnitedStatesPistol</li>
-									</weaponTags>
-									<magazineCount>
-										<min>3</min>
-										<max>5</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Officers === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="K4G_WW2AmericanOfficer" or
-						defName="K4G_WW2AmericanOfficerB" or
-						defName="K4G_WW2AmericanLogisticsOfficer" or
-						defName="K4G_WW2AmericanLogisticsOfficerB" or
-						defName="K4G_WW2AmericanLeader" or
-						defName="K4G_WW2AmericanLeaderB"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.33</generateChance>
-									<sidearmMoney>
-										<min>20</min>
-										<max>120</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>K4GWW2UnitedStatesMelee</li>
-									</weaponTags>
-								</li>
-								<li>
-									<generateChance>0.1</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_FlareLauncher</li>
-									</weaponTags>
-									<magazineCount>
-										<min>2</min>
-										<max>4</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_WW2Base.xml b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_WW2Base.xml
deleted file mode 100644
index 0a6cf7fa66..0000000000
--- a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_WW2Base.xml	
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] RimWorld War 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Assign SoldierBase some ammo. -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="WW2SoldierBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Rimworld War 2/RecipeDefs/WW2_GrenadeRecipes.xml b/Patches/K4G Rimworld War 2/RecipeDefs/WW2_GrenadeRecipes.xml
deleted file mode 100644
index 455f2ff347..0000000000
--- a/Patches/K4G Rimworld War 2/RecipeDefs/WW2_GrenadeRecipes.xml	
+++ /dev/null
@@ -1,974 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] RimWorld War 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ======= Grenades Recipes ======= -->
-
-						<!-- ===== Service Grenades ===== -->
-
-						<!-- === British No. 36M Mk I Mills Bomb Grenades === -->
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>K4GWW2_Make_BritishServiceGrenade</defName>
-							<label>make British No. 36M Mk I Mills Bomb grenades x10</label>
-							<description>Craft 10 British No. 36M Mk I Mills Bomb grenades.</description>
-							<jobString>Making british no. 36M Mk I Mills bomb grenades.</jobString>
-							<workAmount>4200</workAmount>
-							<researchPrerequisite>K4G_WW2InfantryHandGrenades</researchPrerequisite>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>FSX</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<K4G_Weapon_WW2BritishServiceGrenades>10</K4G_Weapon_WW2BritishServiceGrenades>
-							</products>
-						</RecipeDef>
-
-						<!-- === Finnish Mk II Grenades === -->
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>K4GWW2_Make_FinnishServiceGrenade</defName>
-							<label>make Finnish Mk II grenades x10</label>
-							<description>Craft 10 Finnish Mk II grenades.</description>
-							<jobString>Making finnish Mk II grenades.</jobString>
-							<workAmount>4200</workAmount>
-							<researchPrerequisite>K4G_WW2InfantryHandGrenades</researchPrerequisite>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>FSX</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<K4G_Weapon_WW2FinnishServiceGrenades>10</K4G_Weapon_WW2FinnishServiceGrenades>
-							</products>
-						</RecipeDef>
-
-						<!-- === French F1 Grenades === -->
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>K4GWW2_Make_FrenchServiceGrenade</defName>
-							<label>make French F1 grenades x10</label>
-							<description>Craft 10 French F1 grenades.</description>
-							<jobString>Making french F1 grenades.</jobString>
-							<workAmount>4200</workAmount>
-							<researchPrerequisite>K4G_WW2InfantryHandGrenades</researchPrerequisite>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>FSX</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<K4G_Weapon_WW2FrenchServiceGrenades>10</K4G_Weapon_WW2FrenchServiceGrenades>
-							</products>
-						</RecipeDef>
-
-						<!-- === German M24 Stielhandgranate Grenades === -->
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>K4GWW2_Make_GermanServiceGrenade</defName>
-							<label>make German M24 Stielhandgranate grenades x10</label>
-							<description>Craft 10 German M24 Stielhandgranate grenades.</description>
-							<jobString>Making german M24 stielhandgranate grenades.</jobString>
-							<workAmount>4200</workAmount>
-							<researchPrerequisite>K4G_WW2InfantryHandGrenades</researchPrerequisite>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-									<li>Steel</li>
-									<li>FSX</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<K4G_Weapon_WW2GermanServiceGrenades>10</K4G_Weapon_WW2GermanServiceGrenades>
-							</products>
-						</RecipeDef>
-
-						<!-- === German M39 Grenades === -->
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>K4GWW2_Make_GermanServiceGrenadeB</defName>
-							<label>make German M39 grenades x10</label>
-							<description>Craft 10 German M39 grenades.</description>
-							<jobString>Making german M39 grenades.</jobString>
-							<workAmount>4500</workAmount>
-							<researchPrerequisite>K4G_WW2InfantryHandGrenades</researchPrerequisite>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>FSX</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<K4G_Weapon_WW2GermanServiceGrenadesB>10</K4G_Weapon_WW2GermanServiceGrenadesB>
-							</products>
-						</RecipeDef>
-
-						<!-- === Italian SRCM Mod.35 Grenades === -->
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>K4GWW2_Make_ItalianServiceGrenade</defName>
-							<label>make Italian SRCM Mod.35 grenades x10</label>
-							<description>Craft 10 Italian SRCM Mod.35 grenades.</description>
-							<jobString>Making italian SRCM Mod.35 grenades.</jobString>
-							<workAmount>4200</workAmount>
-							<researchPrerequisite>K4G_WW2InfantryHandGrenades</researchPrerequisite>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>FSX</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<K4G_Weapon_WW2GermanServiceGrenades>10</K4G_Weapon_WW2GermanServiceGrenades>
-							</products>
-						</RecipeDef>
-
-						<!-- === Italian OTO Mod.35 Grenades === -->
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>K4GWW2_Make_ItalianServiceGrenadeB</defName>
-							<label>make italian OTO Mod.35 grenades x10</label>
-							<description>Craft 10 Italian OTO Mod.35 grenades.</description>
-							<jobString>Making Italian OTO Mod.35 grenades.</jobString>
-							<workAmount>4350</workAmount>
-							<researchPrerequisite>K4G_WW2InfantryHandGrenades</researchPrerequisite>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>9</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>FSX</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<K4G_Weapon_WW2ItalianServiceGrenadesB>10</K4G_Weapon_WW2ItalianServiceGrenadesB>
-							</products>
-						</RecipeDef>
-
-						<!-- === Italian Breda Mod.35 Grenades === -->
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>K4GWW2_Make_ItalianServiceGrenadeC</defName>
-							<label>make italian breda Mod.35 grenades x10</label>
-							<description>Craft 10 Italian Breda Mod.35 grenades.</description>
-							<jobString>Making Italian Breda Mod.35 grenades.</jobString>
-							<workAmount>4500</workAmount>
-							<researchPrerequisite>K4G_WW2InfantryHandGrenades</researchPrerequisite>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>FSX</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<K4G_Weapon_WW2ItalianServiceGrenadesC>10</K4G_Weapon_WW2ItalianServiceGrenadesC>
-							</products>
-						</RecipeDef>
-
-						<!-- === Japanese Type 97 Grenades === -->
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>K4GWW2_Make_JapaneseServiceGrenade</defName>
-							<label>make Japanese Type 97 grenades x10</label>
-							<description>Craft Japanese Type 97 grenades.</description>
-							<jobString>Making japanese type 97 grenades.</jobString>
-							<workAmount>4200</workAmount>
-							<researchPrerequisite>K4G_WW2InfantryHandGrenades</researchPrerequisite>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>FSX</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<K4G_Weapon_WW2JapaneseServiceGrenades>10</K4G_Weapon_WW2JapaneseServiceGrenades>
-							</products>
-						</RecipeDef>
-
-						<!-- === Russian F1 Grenades === -->
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>K4GWW2_Make_RussianServiceGrenade</defName>
-							<label>make Russian F1 grenades x10</label>
-							<description>Craft 10 Russian F1 grenades.</description>
-							<jobString>Making russian F1 grenades.</jobString>
-							<workAmount>4200</workAmount>
-							<researchPrerequisite>K4G_WW2InfantryHandGrenades</researchPrerequisite>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>FSX</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<K4G_Weapon_WW2RussianServiceGrenades>10</K4G_Weapon_WW2RussianServiceGrenades>
-							</products>
-						</RecipeDef>
-
-						<!-- === Russian RG-42 Grenades === -->
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>K4GWW2_Make_RussianServiceGrenadeB</defName>
-							<label>make Russian RG-42 grenades x10</label>
-							<description>Craft 10 russian RG-42 grenades.</description>
-							<jobString>Making Russian RG-42 grenades.</jobString>
-							<workAmount>4350</workAmount>
-							<researchPrerequisite>K4G_WW2InfantryHandGrenades</researchPrerequisite>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>9</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>FSX</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<K4G_Weapon_WW2RussianServiceGrenadesB>10</K4G_Weapon_WW2RussianServiceGrenadesB>
-							</products>
-						</RecipeDef>
-
-						<!-- === Russian RGD-33 Grenades === -->
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>K4GWW2_Make_RussianServiceGrenadeC</defName>
-							<label>make Russian RGD-33 grenades x10</label>
-							<description>Craft 10 Russian RGD-33 grenades.</description>
-							<jobString>Making russian RGD-33 grenades.</jobString>
-							<workAmount>4500</workAmount>
-							<researchPrerequisite>K4G_WW2InfantryHandGrenades</researchPrerequisite>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>FSX</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<K4G_Weapon_WW2RussianServiceGrenadesC>10</K4G_Weapon_WW2RussianServiceGrenadesC>
-							</products>
-						</RecipeDef>
-
-						<!-- === American Mk II Grenades === -->
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>K4GWW2_Make_AmericanServiceGrenade</defName>
-							<label>make American Mk II grenades x10</label>
-							<description>Craft 10 American Mk II grenades.</description>
-							<jobString>Making american Mk II grenades.</jobString>
-							<workAmount>4200</workAmount>
-							<researchPrerequisite>K4G_WW2InfantryHandGrenades</researchPrerequisite>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>FSX</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<K4G_Weapon_WW2AmericanServiceGrenades>10</K4G_Weapon_WW2AmericanServiceGrenades>
-							</products>
-						</RecipeDef>
-
-						<!-- ===== Anti-Tank Grenades ===== -->
-
-						<!-- === British No. 73 Anti-Tank Grenades === -->
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>K4GWW2_Make_BritishATGrenade</defName>
-							<label>make British No. 73 Anti-Tank grenades x10</label>
-							<description>Craft 10 british no. 73 anti-tank grenades.</description>
-							<jobString>Making british no. 73 anti-tank grenades.</jobString>
-							<workAmount>4200</workAmount>
-							<researchPrerequisite>K4G_WW2AntiTankEquipment</researchPrerequisite>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>12</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>FSX</li>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<K4G_Weapon_WW2BritishServiceAntiTankGrenades>10</K4G_Weapon_WW2BritishServiceAntiTankGrenades>
-							</products>
-						</RecipeDef>
-
-						<!-- === British No. 74 Sticky Bomb Anti-Tank Grenades === -->
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>K4GWW2_Make_BritishATGrenadeB</defName>
-							<label>make British No. 74 Sticky Bomb Anti-Tank grenades x10</label>
-							<description>Craft 10 british no. 74 sticky bomb anti-tank grenades.</description>
-							<jobString>Making british no. 74 sticky bomb anti-tank grenades.</jobString>
-							<workAmount>4600</workAmount>
-							<researchPrerequisite>K4G_WW2AntiTankEquipment</researchPrerequisite>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>12</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>22</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>FSX</li>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<K4G_Weapon_WW2BritishServiceAntiTankGrenadesB>10</K4G_Weapon_WW2BritishServiceAntiTankGrenadesB>
-							</products>
-						</RecipeDef>
-
-						<!-- === German M24 Stielhandgranate Bundle Anti-Tank Grenades === -->
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>K4GWW2_Make_GermanATGrenade</defName>
-							<label>make German M24 Stielhandgranate Bundle Anti-Tank grenades x10</label>
-							<description>Craft 10 german M24 stielhandgranate bundle anti-tank grenades.</description>
-							<jobString>Making german M24 stielhandgranate bundle anti-tank grenades.</jobString>
-							<workAmount>4600</workAmount>
-							<researchPrerequisite>K4G_WW2AntiTankEquipment</researchPrerequisite>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>12</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>22</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-									<li>FSX</li>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<K4G_Weapon_WW2GermanServiceAntiTankGrenades>10</K4G_Weapon_WW2GermanServiceAntiTankGrenades>
-							</products>
-						</RecipeDef>
-
-						<!-- === Italian Type L Anti-Tank Grenades === -->
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>K4GWW2_Make_ItalianATGrenade</defName>
-							<label>make Italian Type L Anti-Tank grenades x10</label>
-							<description>Craft 10 italian type L 73 anti-tank grenades.</description>
-							<jobString>Making italian type L 73 anti-tank grenades.</jobString>
-							<workAmount>4200</workAmount>
-							<researchPrerequisite>K4G_WW2AntiTankEquipment</researchPrerequisite>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>12</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>FSX</li>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<K4G_Weapon_WW2ItalianServiceAntiTankGrenades>10</K4G_Weapon_WW2ItalianServiceAntiTankGrenades>
-							</products>
-						</RecipeDef>
-
-						<!-- === Russian RPG-40 Anti-Tank Grenades === -->
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>K4GWW2_Make_RussianATGrenade</defName>
-							<label>make Russian RPG-40 Anti-Tank grenades x10</label>
-							<description>Craft 10 russian RPG-40 anti-tank grenades.</description>
-							<jobString>Making russian RPG-40 anti-tank grenades.</jobString>
-							<workAmount>4200</workAmount>
-							<researchPrerequisite>K4G_WW2AntiTankEquipment</researchPrerequisite>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>12</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>FSX</li>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<K4G_Weapon_WW2RussianServiceAntiTankGrenades>10</K4G_Weapon_WW2RussianServiceAntiTankGrenades>
-							</products>
-						</RecipeDef>
-
-						<!-- === Russian RPG-43 Anti-Tank Grenades === -->
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>K4GWW2_Make_RussianATGrenadeB</defName>
-							<label>make Russian RPG-43 Anti-Tank grenades x10</label>
-							<description>Craft 10 russian RPG-43 anti-tank grenades.</description>
-							<jobString>Making russian RPG-43 anti-tank grenades.</jobString>
-							<workAmount>4400</workAmount>
-							<researchPrerequisite>K4G_WW2AntiTankEquipment</researchPrerequisite>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>5</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>12</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>22</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-									<li>FSX</li>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<K4G_Weapon_WW2RussianServiceAntiTankGrenadesB>10</K4G_Weapon_WW2RussianServiceAntiTankGrenadesB>
-							</products>
-						</RecipeDef>
-
-						<!-- === Russian RPG-6 Anti-Tank Grenades === -->
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>K4GWW2_Make_RussianATGrenadeC</defName>
-							<label>make Russian RPG-6 Anti-Tank grenades x10</label>
-							<description>Craft 10 russian RPG-6 anti-tank grenades.</description>
-							<jobString>Making russian RPG-6 anti-tank grenades.</jobString>
-							<workAmount>4600</workAmount>
-							<researchPrerequisite>K4G_WW2AntiTankEquipment</researchPrerequisite>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>12</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>25</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>FSX</li>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<K4G_Weapon_WW2RussianServiceAntiTankGrenadesC>10</K4G_Weapon_WW2RussianServiceAntiTankGrenadesC>
-							</products>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Rimworld War 2/ResearchProjectDefs/ResearchProjects.xml b/Patches/K4G Rimworld War 2/ResearchProjectDefs/ResearchProjects.xml
deleted file mode 100644
index ee7983da61..0000000000
--- a/Patches/K4G Rimworld War 2/ResearchProjectDefs/ResearchProjects.xml	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] RimWorld War 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ResearchProjectDef[defName="K4G_WW2AntiTankEquipment"]/prerequisites</xpath>
-					<value>
-						<li>CE_Launchers</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Rimworld War 2/Scenarios/Scenarios_Classic.xml b/Patches/K4G Rimworld War 2/Scenarios/Scenarios_Classic.xml
deleted file mode 100644
index 2d8465f82e..0000000000
--- a/Patches/K4G Rimworld War 2/Scenarios/Scenarios_Classic.xml	
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] RimWorld War 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="K4G_WW2NewAllies" or defName="K4G_WW2NewAxis"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_303British_FMJ</thingDef>
-							<count>150</count>
-						</li>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_44Magnum_FMJ</thingDef>
-							<count>60</count>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Rimworld War 2/ThingDefs_Misc/BaseWeapons.xml b/Patches/K4G Rimworld War 2/ThingDefs_Misc/BaseWeapons.xml
deleted file mode 100644
index c8f78f037f..0000000000
--- a/Patches/K4G Rimworld War 2/ThingDefs_Misc/BaseWeapons.xml	
+++ /dev/null
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] RimWorld War 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Remove Vanilla Verbs ========== -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						@Name="WW2ServiceRevolver" or
-						@Name="WW2ServicePistol" or
-						@Name="WW2ServiceSemiAutomaticPistol" or
-						@Name="WW2ServiceRifle" or
-						@Name="WW2ServiceSemiAutomaticRifle" or
-						@Name="WW2ServiceCarbine" or
-						@Name="WW2ServiceShotgun" or
-						@Name="WW2ServiceSMG" or
-						@Name="WW2ServiceLMG" or
-						@Name="WW2ServiceAutomaticRifle" or
-						@Name="WW2ServiceSniperRifle" or
-						@Name="WW2ServiceSemiAutomaticSniperRifle" or
-						@Name="WW2ServiceAntiTankRifle"
-						]/verbs</xpath>
-				</li>
-
-				<!-- ========== One-handed Weapons ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						@Name="WW2ServiceRevolver" or
-						@Name="WW2SingleShotPistol" or
-						@Name="WW2ServicePistol" or
-						@Name="WW2ServiceSemiAutomaticPistol"
-						]</xpath>
-					<value>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<!-- ========== Melee Tools ========== -->
-
-				<!-- Handguns -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						@Name="WW2ServiceRevolver" or
-						@Name="WW2SingleShotPistol" or
-						@Name="WW2ServicePistol" or
-						@Name="WW2ServiceSemiAutomaticPistol"
-						]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Rifles -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						@Name="WW2ServiceRifle" or
-						@Name="WW2ServiceSemiAutomaticRifle" or
-						@Name="WW2ServiceSMG" or
-						@Name="WW2ServiceLMG" or
-						@Name="WW2ServiceCarbine" or
-						@Name="WW2ServiceShotgun" or
-						@Name="WW2ServiceAutomaticRifle" or
-						@Name="WW2ServiceSniperRifle" or
-						@Name="WW2ServiceSemiAutomaticSniperRifle"
-						]/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>
-				</li>
-
-				<!-- Rifles (Bayonet)-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						@Name="WW2ServiceRifleBayonet" or
-						@Name="WW2ServiceSemiAutomaticRifleBayonet" or
-						@Name="WW2ServiceShotgunBayonet"
-						]/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>bayonet</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>2.14</cooldownTime>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>bayonet</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.49</cooldownTime>
-								<armorPenetrationBlunt>2.16</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.44</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Heavy Weapons -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WW2ServiceAntiTankRifle"]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Rimworld War 2/ThingDefs_Misc/BritishWeapons_Ranged.xml b/Patches/K4G Rimworld War 2/ThingDefs_Misc/BritishWeapons_Ranged.xml
deleted file mode 100644
index b5ee6d22e8..0000000000
--- a/Patches/K4G Rimworld War 2/ThingDefs_Misc/BritishWeapons_Ranged.xml	
+++ /dev/null
@@ -1,444 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] RimWorld War 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Melee Tools ========== -->
-
-				<!-- Heavy Weapons -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceRocketLauncher"]/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>
-				</li>
-
-				<!-- ========== Weapons ========== -->
-
-				<!-- Webley Mk VI -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceRevolver"]</xpath>
-					<value>
-						<statBases>
-							<SightsEfficiency>0.7</SightsEfficiency>
-							<ShotSpread>0.18</ShotSpread>
-							<SwayFactor>1.2</SwayFactor>
-							<Bulk>2.2</Bulk>
-							<Mass>1.1</Mass>
-							<RangedWeapon_Cooldown>0.50</RangedWeapon_Cooldown>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.57</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_455Webley_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>12</range>
-								<soundCast>Shot_Revolver</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>6</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_455Webley</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- Enfield No. 2 Revolver -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceRevolverB"]</xpath>
-					<value>
-						<statBases>
-							<SightsEfficiency>0.7</SightsEfficiency>
-							<ShotSpread>0.18</ShotSpread>
-							<SwayFactor>1.2</SwayFactor>
-							<Bulk>2.2</Bulk>
-							<Mass>1.1</Mass>
-							<RangedWeapon_Cooldown>0.50</RangedWeapon_Cooldown>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.62</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_38SW_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>12</range>
-								<soundCast>Shot_Revolver</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>6</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_38SW</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- Lee Enfield No. 4 Mk I-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceRifle"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.19</Mass>
-							<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-							<SightsEfficiency>1</SightsEfficiency>
-							<ShotSpread>0.02</ShotSpread>
-							<SwayFactor>1.68</SwayFactor>
-							<Bulk>12.60</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.04</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>55</range>
-								<soundCast>Shot_BoltActionRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>10</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_303British</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- Lee Enfield No. 4 Mk I with Bayonet-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceRifleBayonet"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.30</Mass>
-							<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-							<SightsEfficiency>1</SightsEfficiency>
-							<ShotSpread>0.02</ShotSpread>
-							<SwayFactor>1.74</SwayFactor>
-							<Bulk>12.80</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.03</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>55</range>
-								<soundCast>Shot_BoltActionRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>10</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_303British</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- Lanchester SMG -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceSMG"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.3</Mass>
-							<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.14</ShotSpread>
-							<SwayFactor>1.21</SwayFactor>
-							<Bulk>8.43</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>0.95</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>24</range>
-								<burstShotCount>5</burstShotCount>
-								<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-								<soundCast>Shot_HeavySMG</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>32</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>Snapshot</aiAimMode>
-								<aimedBurstShotCount>4</aimedBurstShotCount>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- Sten Mk II SMG -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceSMGB"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.3</Mass>
-							<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.16</ShotSpread>
-							<SwayFactor>0.80</SwayFactor>
-							<Bulk>8.43</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>0.95</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>24</range>
-								<burstShotCount>5</burstShotCount>
-								<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-								<soundCast>Shot_HeavySMG</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>32</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>Snapshot</aiAimMode>
-								<aimedBurstShotCount>4</aimedBurstShotCount>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- Bren Mk IV LMG -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceLMG"]</xpath>
-					<value>
-						<statBases>
-							<Mass>8.7</Mass>
-							<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-							<SightsEfficiency>1</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.37</SwayFactor>
-							<Bulk>12.9</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.38</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
-								<warmupTime>1.3</warmupTime>
-								<range>62</range>
-								<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-								<burstShotCount>10</burstShotCount>
-								<soundCast>Shot_CE_BattleRifle</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<recoilPattern>Mounted</recoilPattern>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>50</magazineSize>
-								<reloadTime>4.9</reloadTime>
-								<ammoSet>AmmoSet_303British</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aimedBurstShotCount>5</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>SuppressFire</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceLMG"]/weaponTags</xpath>
-					<value>
-						<li>Bipod_LMG</li>
-					</value>
-				</li>
-
-				<!-- Lee Enfield No. 4 Mk I (T) Sniper Rifle -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceSniperRifle"]</xpath>
-					<value>
-						<statBases>
-							<Mass>5.19</Mass>
-							<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-							<SightsEfficiency>2.21</SightsEfficiency>
-							<ShotSpread>0.02</ShotSpread>
-							<SwayFactor>1.68</SwayFactor>
-							<Bulk>12.60</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
-								<warmupTime>1.27</warmupTime>
-								<range>75</range>
-								<soundCast>Shot_BoltActionRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>10</magazineSize>
-								<reloadOneAtATime>True</reloadOneAtATime>
-								<reloadTime>0.85</reloadTime>
-								<ammoSet>AmmoSet_303British</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- PIAT -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>K4G_Gun_WW2BritishServiceRocketLauncher</defName>
-					<statBases>
-						<Mass>15.00</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>2.49</SwayFactor>
-						<Bulk>10.90</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_83mmPIATGrenade_HEAT</defaultProjectile>
-						<warmupTime>1.9</warmupTime>
-						<range>20</range>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>5.6</reloadTime>
-						<ammoSet>AmmoSet_83mmPIATGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- Boys Anti-Tank Rifle -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceAntiTankRifle"]</xpath>
-					<value>
-						<statBases>
-							<SightsEfficiency>1.0</SightsEfficiency>
-							<ShotSpread>0.01</ShotSpread>
-							<SwayFactor>2.89</SwayFactor>
-							<Bulk>22.0</Bulk>
-							<Mass>20.30</Mass>
-							<RangedWeapon_Cooldown>0.58</RangedWeapon_Cooldown>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_55Boys_FMJ</defaultProjectile>
-								<warmupTime>2.8</warmupTime>
-								<range>62</range>
-								<soundCast>HeavyMG</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>5</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_55Boys</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceAntiTankRifle"]/weaponTags</xpath>
-					<value>
-						<li>Bipod_ATR</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Rimworld War 2/ThingDefs_Misc/FinnishWeapons_Ranged.xml b/Patches/K4G Rimworld War 2/ThingDefs_Misc/FinnishWeapons_Ranged.xml
deleted file mode 100644
index 902b82b91b..0000000000
--- a/Patches/K4G Rimworld War 2/ThingDefs_Misc/FinnishWeapons_Ranged.xml	
+++ /dev/null
@@ -1,541 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] RimWorld War 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Weapons ========== -->
-
-				<!-- Finnish Lahti L-35 Pistol -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FinnishServicePistol"]</xpath>
-					<value>
-						<statBases>
-							<Mass>0.87</Mass>
-							<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-							<SightsEfficiency>0.7</SightsEfficiency>
-							<ShotSpread>0.16</ShotSpread>
-							<SwayFactor>1.07</SwayFactor>
-							<Bulk>1.9</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.57</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-								<warmupTime>0.5</warmupTime>
-								<range>12</range>
-								<soundCast>Shot_Autopistol</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>8</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- Finnish Mosin Nagant M/27 Rifle -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceRifleB"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.00</Mass>
-							<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.68</SwayFactor>
-							<Bulk>12.32</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.04</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>55</range>
-								<soundCast>Shot_BoltActionRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>5</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_762x54mmR</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- Finnish Mosin Nagant M/39 Rifle -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceRifleC"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.00</Mass>
-							<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.63</SwayFactor>
-							<Bulk>12.32</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.04</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>55</range>
-								<soundCast>Shot_BoltActionRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>5</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_762x54mmR</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- Finnish Mosin Nagant Rifle M/91 (Bayonet) -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceRifleBayonet"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.2</Mass>
-							<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.68</SwayFactor>
-							<Bulk>12.5</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>55</range>
-								<soundCast>Shot_BoltActionRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>5</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_762x54mmR</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- Finnish Mosin Nagant Rifle M/27 (Bayonet) -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceRifleBayonetB"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.2</Mass>
-							<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.68</SwayFactor>
-							<Bulk>12.5</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>55</range>
-								<soundCast>Shot_BoltActionRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>5</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_762x54mmR</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- Finnish Mosin Nagant M/39 Rifle (Bayonet) -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceRifleBayonetC"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.2</Mass>
-							<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.68</SwayFactor>
-							<Bulk>12.5</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>55</range>
-								<soundCast>Shot_BoltActionRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>5</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_762x54mmR</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- Finnish Suomi KP/-31 SMG -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceSMG"]</xpath>
-					<value>
-						<statBases>
-							<Mass>3.63</Mass>
-							<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.14</ShotSpread>
-							<SwayFactor>1.21</SwayFactor>
-							<Bulk>8.43</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.22</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>23</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-								<soundCast>Shot_HeavySMG</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>71</magazineSize>
-								<reloadTime>4.9</reloadTime>
-								<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>Snapshot</aiAimMode>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- Finnish KP m/44 SMG -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceSMGB"]</xpath>
-					<value>
-						<statBases>
-							<Mass>3.9</Mass>
-							<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.14</ShotSpread>
-							<SwayFactor>1.21</SwayFactor>
-							<Bulk>7</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>0.8</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>23</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-								<soundCast>Shot_HeavySMG</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>36</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>Snapshot</aiAimMode>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= Finnish Lahti-Saloranta M/26 LMG ======= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceLMG"]</xpath>
-					<value>
-						<statBases>
-							<Mass>8.72</Mass>
-							<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-							<SightsEfficiency>1</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.43</SwayFactor>
-							<Bulk>14.3</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.32</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-								<warmupTime>1.3</warmupTime>
-								<range>62</range>
-								<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-								<burstShotCount>5</burstShotCount>
-								<soundCast>Shot_Minigun</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<recoilPattern>Mounted</recoilPattern>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>20</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_762x54mmR</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aimedBurstShotCount>5</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>SuppressFire</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceLMG"]/weaponTags</xpath>
-					<value>
-						<li>Bipod_LMG</li>
-					</value>
-				</li>
-
-				<!-- Finnish Mosin Nagant M/91 Sniper Rifle -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceSniperRifle"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.1</Mass>
-							<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-							<SightsEfficiency>2.3</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.53</SwayFactor>
-							<Bulk>11.00</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.1</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-								<warmupTime>1.5</warmupTime>
-								<range>75</range>
-								<soundCast>Shot_BoltActionRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>5</magazineSize>
-								<reloadOneAtATime>True</reloadOneAtATime>
-								<reloadTime>0.85</reloadTime>
-								<ammoSet>AmmoSet_762x54mmR</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- Finnish Mosin Nagant M/27 Sniper Rifle -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceSniperRifleB"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.1</Mass>
-							<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-							<SightsEfficiency>2.3</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.53</SwayFactor>
-							<Bulk>11.00</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.1</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-								<warmupTime>1.5</warmupTime>
-								<range>75</range>
-								<soundCast>Shot_BoltActionRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>5</magazineSize>
-								<reloadOneAtATime>True</reloadOneAtATime>
-								<reloadTime>0.85</reloadTime>
-								<ammoSet>AmmoSet_762x54mmR</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- Finnish Mosin Nagant M/39 Sniper Rifle -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceSniperRifleC"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.1</Mass>
-							<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-							<SightsEfficiency>2.3</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.48</SwayFactor>
-							<Bulk>11.00</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.1</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-								<warmupTime>1.5</warmupTime>
-								<range>75</range>
-								<soundCast>Shot_BoltActionRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>5</magazineSize>
-								<reloadOneAtATime>True</reloadOneAtATime>
-								<reloadTime>0.85</reloadTime>
-								<ammoSet>AmmoSet_762x54mmR</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= Finnish Lahti L-39 Anti-Tank Rifle ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceAntiTankRifle"]</xpath>
-					<value>
-						<statBases>
-							<SightsEfficiency>1.0</SightsEfficiency>
-							<ShotSpread>0.01</ShotSpread>
-							<SwayFactor>2.79</SwayFactor>
-							<Bulk>24.0</Bulk>
-							<Mass>20.80</Mass>
-							<RangedWeapon_Cooldown>0.58</RangedWeapon_Cooldown>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.52</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_20x138mmB_AP</defaultProjectile>
-								<warmupTime>2.8</warmupTime>
-								<range>62</range>
-								<soundCast>HeavyMG</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>10</magazineSize>
-								<reloadTime>4.7</reloadTime>
-								<ammoSet>AmmoSet_20x138mmB</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Rimworld War 2/ThingDefs_Misc/FrenchWeapons_Ranged.xml b/Patches/K4G Rimworld War 2/ThingDefs_Misc/FrenchWeapons_Ranged.xml
deleted file mode 100644
index 2dcec6c6f2..0000000000
--- a/Patches/K4G Rimworld War 2/ThingDefs_Misc/FrenchWeapons_Ranged.xml	
+++ /dev/null
@@ -1,503 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] RimWorld War 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- French MAS 1873 Revolver -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceRevolver"]</xpath>
-					<value>
-						<statBases>
-							<SightsEfficiency>0.7</SightsEfficiency>
-							<ShotSpread>0.18</ShotSpread>
-							<SwayFactor>1.2</SwayFactor>
-							<Bulk>2.2</Bulk>
-							<Mass>1.1</Mass>
-							<RangedWeapon_Cooldown>0.50</RangedWeapon_Cooldown>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.57</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_765x20mmLongue_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>12</range>
-								<soundCast>Shot_Revolver</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>6</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_765x20mmLongue</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- French Model 1892 Revolver -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceRevolverB"]</xpath>
-					<value>
-						<statBases>
-							<SightsEfficiency>0.7</SightsEfficiency>
-							<ShotSpread>0.18</ShotSpread>
-							<SwayFactor>1.2</SwayFactor>
-							<Bulk>2.2</Bulk>
-							<Mass>1.1</Mass>
-							<RangedWeapon_Cooldown>0.50</RangedWeapon_Cooldown>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.57</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_765x20mmLongue_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>12</range>
-								<soundCast>Shot_Revolver</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>6</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_765x20mmLongue</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- French MAB Model D Pistol -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FrenchServicePistol"]</xpath>
-					<value>
-						<statBases>
-							<Mass>0.87</Mass>
-							<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-							<SightsEfficiency>0.7</SightsEfficiency>
-							<ShotSpread>0.16</ShotSpread>
-							<SwayFactor>1.07</SwayFactor>
-							<Bulk>1.9</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.57</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_765x20mmLongue_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>12</range>
-								<soundCast>Shot_Autopistol</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>8</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_765x20mmLongue</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- French Lebel M1886 Rifle -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceRifle"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.19</Mass>
-							<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.39</SwayFactor>
-							<Bulk>12.60</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.04</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_8x50mmRLebel_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>55</range>
-								<soundCast>Shot_BoltActionRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>8</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_8x50mmRLebel</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- French MAS-36 Rifle -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceRifleB"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.19</Mass>
-							<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.39</SwayFactor>
-							<Bulk>12.60</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.04</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_8x50mmRLebel_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>55</range>
-								<soundCast>Shot_BoltActionRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>8</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_8x50mmRLebel</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- French Lebel M1886 Rifle (Bayonet) -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceRifleBayonet"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.19</Mass>
-							<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.39</SwayFactor>
-							<Bulk>12.60</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.04</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_8x50mmRLebel_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>55</range>
-								<soundCast>Shot_BoltActionRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>8</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_8x50mmRLebel</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- French Lebel M1886 Rifle (Bayonet B) -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceRifleBayonetB"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.6</Mass>
-							<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.39</SwayFactor>
-							<Bulk>12.60</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.04</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_8x50mmRLebel_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>55</range>
-								<soundCast>Shot_BoltActionRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>8</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_8x50mmRLebel</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- French MAS-36 Rifle (Bayonet) -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceRifleBBayonet"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.6</Mass>
-							<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.39</SwayFactor>
-							<Bulk>12.60</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.04</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_75x54mmFrench_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>55</range>
-								<soundCast>Shot_BoltActionRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>5</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_75x54mmFrench</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- French Berthier M1916 Carbine -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceCarbine"]</xpath>
-					<value>
-						<statBases>
-							<Mass>3.7</Mass>
-							<SightsEfficiency>1</SightsEfficiency>
-							<ShotSpread>0.06</ShotSpread>
-							<SwayFactor>1.25</SwayFactor>
-							<Bulk>9</Bulk>
-							<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.4</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_8x50mmRLebel_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>47</range>
-								<soundCast>Shot_AssaultRifle</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>5</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_8x50mmRLebel</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- French MAS-38 SMG -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceSMG"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.3</Mass>
-							<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.14</ShotSpread>
-							<SwayFactor>1.21</SwayFactor>
-							<Bulk>8.43</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>0.90</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_765x20mmLongue_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>27</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-								<soundCast>Shot_HeavySMG</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>32</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_765x20mmLongue</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>Snapshot</aiAimMode>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- French FM 24/29 LMG -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceLMG"]</xpath>
-					<value>
-						<statBases>
-							<Mass>8.68</Mass>
-							<Bulk>16.56</Bulk>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.42</SwayFactor>
-							<SightsEfficiency>1.2</SightsEfficiency>
-							<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.28</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_75x54mmFrench_FMJ</defaultProjectile>
-								<warmupTime>1.3</warmupTime>
-								<range>62</range>
-								<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-								<burstShotCount>10</burstShotCount>
-								<soundCast>Shot_Minigun</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<recoilPattern>Mounted</recoilPattern>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>25</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_75x54mmFrench</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aimedBurstShotCount>5</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>SuppressFire</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- French Chauchat LMG -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceLMGB"]</xpath>
-					<value>
-						<statBases>
-							<Mass>8.68</Mass>
-							<Bulk>16.56</Bulk>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.42</SwayFactor>
-							<SightsEfficiency>1.2</SightsEfficiency>
-							<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.32</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_8x50mmRLebel_FMJ</defaultProjectile>
-								<warmupTime>1.3</warmupTime>
-								<range>65</range>
-								<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
-								<burstShotCount>10</burstShotCount>
-								<soundCast>Shot_Minigun</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<recoilPattern>Mounted</recoilPattern>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>19</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_8x50mmRLebel</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aimedBurstShotCount>5</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>SuppressFire</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Rimworld War 2/ThingDefs_Misc/GermanWeapons_Ranged.xml b/Patches/K4G Rimworld War 2/ThingDefs_Misc/GermanWeapons_Ranged.xml
deleted file mode 100644
index 387b953307..0000000000
--- a/Patches/K4G Rimworld War 2/ThingDefs_Misc/GermanWeapons_Ranged.xml	
+++ /dev/null
@@ -1,797 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] RimWorld War 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--  German Luger P08 Pistol  -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2GermanServicePistol"]</xpath>
-					<value>
-						<statBases>
-							<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-							<SightsEfficiency>0.7</SightsEfficiency>
-							<ShotSpread>0.16</ShotSpread>
-							<SwayFactor>1.07</SwayFactor>
-							<Bulk>1.9</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.57</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>12</range>
-								<soundCast>Shot_Autopistol</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>8</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>Snapshot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!--  German Mauser HSc Pistol  -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2GermanServicePistolB"]</xpath>
-					<value>
-						<statBases>
-							<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-							<SightsEfficiency>0.7</SightsEfficiency>
-							<ShotSpread>0.16</ShotSpread>
-							<SwayFactor>1.07</SwayFactor>
-							<Bulk>1.9</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.55</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_32ACP_FMJ</defaultProjectile>
-								<warmupTime>0.5</warmupTime>
-								<range>14</range>
-								<soundCast>Shot_Autopistol</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>8</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_32ACP</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>Snapshot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-				<!--  German Walther P38 Pistol  -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2GermanServicePistolC"]</xpath>
-					<value>
-						<statBases>
-							<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-							<SightsEfficiency>0.7</SightsEfficiency>
-							<ShotSpread>0.16</ShotSpread>
-							<SwayFactor>1.07</SwayFactor>
-							<Bulk>1.9</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.55</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-								<warmupTime>0.5</warmupTime>
-								<range>12</range>
-								<soundCast>Shot_Autopistol</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>8</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>Snapshot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!--  German Mauser C96 Semi-Automatic Pistol  -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceSemiAutomaticPistol"]</xpath>
-					<value>
-						<statBases>
-							<RangedWeapon_Cooldown>0.05</RangedWeapon_Cooldown>
-							<SightsEfficiency>0.7</SightsEfficiency>
-							<ShotSpread>0.16</ShotSpread>
-							<SwayFactor>1.4</SwayFactor>
-							<Bulk>1.9</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.2</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_763x25mmMauser_FMJ</defaultProjectile>
-								<warmupTime>0.5</warmupTime>
-								<range>12</range>
-								<soundCast>Shot_Autopistol</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>20</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_763x25mmMauser</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>Snapshot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!--  German Karabiner K98 Rifle  -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceRifle"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.30</Mass>
-							<RangedWeapon_Cooldown>1.16</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.0</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.48</SwayFactor>
-							<Bulk>11</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.04</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>55</range>
-								<soundCast>Shot_BoltActionRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>5</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!--  German Karabiner K98 Rifle (Bayonet)  -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceRifleBayonet"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.30</Mass>
-							<RangedWeapon_Cooldown>1.16</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.0</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.48</SwayFactor>
-							<Bulk>13</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.04</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>55</range>
-								<soundCast>Shot_BoltActionRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>5</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!--  German Gewehr 43 Semi-Automatic Rifle  -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceSemiAutomaticRifle"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.20</Mass>
-							<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.04</ShotSpread>
-							<SwayFactor>1.61</SwayFactor>
-							<Bulk>12.26</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.04</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>55</range>
-								<soundCast>Shot_HeavySMG</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>7</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>10</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!--  German Gewehr 43 Semi-Automatic Rifle (Bayonet)  -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceSemiAutomaticRifleBayonet"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.20</Mass>
-							<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.04</ShotSpread>
-							<SwayFactor>1.61</SwayFactor>
-							<Bulk>12.26</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.04</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>55</range>
-								<soundCast>Shot_HeavySMG</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>7</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>10</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!--  German MP 40 SMG  -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceSMG"]</xpath>
-					<value>
-						<statBases>
-							<Mass>3.9</Mass>
-							<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.14</ShotSpread>
-							<SwayFactor>1.21</SwayFactor>
-							<Bulk>7</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>0.6</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-								<range>23</range>
-								<soundCast>Shot_HeavySMG</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>7</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>32</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>Snapshot</aiAimMode>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!--  German MP 28 SMG  -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceSMGB"]</xpath>
-					<value>
-						<statBases>
-							<Mass>3.9</Mass>
-							<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.14</ShotSpread>
-							<SwayFactor>1.21</SwayFactor>
-							<Bulk>7</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>0.6</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-								<range>21</range>
-								<soundCast>Shot_HeavySMG</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>7</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>32</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>Snapshot</aiAimMode>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!--  German MP 38 SMG  -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceSMGC"]</xpath>
-					<value>
-						<statBases>
-							<Mass>3.9</Mass>
-							<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.14</ShotSpread>
-							<SwayFactor>1.21</SwayFactor>
-							<Bulk>7</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>0.6</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-								<range>23</range>
-								<soundCast>Shot_HeavySMG</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>7</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>32</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>Snapshot</aiAimMode>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!--  German MP 18 SMG  -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceSMGD"]</xpath>
-					<value>
-						<statBases>
-							<Mass>3.9</Mass>
-							<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.14</ShotSpread>
-							<SwayFactor>1.21</SwayFactor>
-							<Bulk>7</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>0.6</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-								<range>21</range>
-								<soundCast>Shot_HeavySMG</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>7</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>32</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>Snapshot</aiAimMode>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!--  German MG-42 LMG  -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceLMG"]</xpath>
-					<value>
-						<statBases>
-							<Mass>11.60</Mass>
-							<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.06</ShotSpread>
-							<SwayFactor>1.67</SwayFactor>
-							<Bulk>15.20</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.36</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-								<range>64</range>
-								<soundCast>Shot_Minigun</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>150</magazineSize>
-								<reloadTime>7.8</reloadTime>
-								<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aimedBurstShotCount>5</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>SuppressFire</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceLMG"]/weaponTags</xpath>
-					<value>
-						<li>Bipod_LMG</li>
-					</value>
-				</li>
-
-				<!--  German StG 44 Automatic Rifle  -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceAutomaticRifle"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.60</Mass>
-							<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.07</ShotSpread>
-							<SwayFactor>1.40</SwayFactor>
-							<Bulk>9.40</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.54</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_792x33mmKurz_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>48</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-								<soundCast>Shot_AssaultRifle</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>30</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_792x33mmKurz</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!--  German Karabiner K98 Sniper Rifle  -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceSniperRifle"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.1</Mass>
-							<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-							<SightsEfficiency>2.3</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.48</SwayFactor>
-							<Bulk>11.00</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.04</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-								<warmupTime>1.5</warmupTime>
-								<range>75</range>
-								<soundCast>Shot_BoltActionRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>5</magazineSize>
-								<reloadOneAtATime>True</reloadOneAtATime>
-								<reloadTime>0.85</reloadTime>
-								<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!--  German Gewehr 43 Semi-Automatic Sniper Rifle  -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceSemiAutomaticSniperRifle"]</xpath>
-					<value>
-						<statBases>
-							<Mass>3.85</Mass>
-							<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.04</ShotSpread>
-							<SwayFactor>1.61</SwayFactor>
-							<Bulk>12.26</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.04</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-								<warmupTime>1.5</warmupTime>
-								<range>75</range>
-								<soundCast>Shot_HeavySMG</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>7</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>10</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!--  German Panzerschreck Rocket Launcher  -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>K4G_Gun_WW2GermanServiceRocketLauncher</defName>
-					<statBases>
-						<Mass>11</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.15</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.68</SwayFactor>
-						<Bulk>12.50</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_88mmRPzB_HEAT</defaultProjectile>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<warmupTime>2.01</warmupTime>
-						<range>40</range>
-						<minRange>5</minRange>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>5.6</reloadTime>
-						<ammoSet>AmmoSet_88mmRPzBRocket</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!--  German Panzerfaust Gross Rocket Launcher  -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>K4G_Gun_WW2GermanServiceDisposableRocketLauncher</defName>
-					<statBases>
-						<Mass>5.1</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.15</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.68</SwayFactor>
-						<Bulk>12.50</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_K4GPanzerFaust60_HEAT</defaultProjectile>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<warmupTime>1.9</warmupTime>
-						<range>31</range>
-						<minRange>5</minRange>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!--  German Panzerfaust Klein Rocket Launcher  -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>K4G_Gun_WW2GermanServiceDisposableRocketLauncherB</defName>
-					<statBases>
-						<Mass>3.4</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.68</SwayFactor>
-						<Bulk>6.25</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_K4GPanzerFaust50_HEAT</defaultProjectile>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<warmupTime>1.9</warmupTime>
-						<range>31</range>
-						<minRange>5</minRange>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!--  German Panzerbusche 39 Anti-Tank Rifle  -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceAntiTankRifle"]</xpath>
-					<value>
-						<statBases>
-							<SightsEfficiency>1.0</SightsEfficiency>
-							<ShotSpread>0.01</ShotSpread>
-							<SwayFactor>2.89</SwayFactor>
-							<Bulk>22.0</Bulk>
-							<Mass>16.20</Mass>
-							<RangedWeapon_Cooldown>0.58</RangedWeapon_Cooldown>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_792x94mmPatronen_FMJ</defaultProjectile>
-								<warmupTime>2.8</warmupTime>
-								<range>62</range>
-								<soundCast>HeavyMG</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>1</magazineSize>
-								<AmmoGenPerMagOverride>8</AmmoGenPerMagOverride>
-								<reloadTime>3.8</reloadTime>
-								<ammoSet>AmmoSet_792x94mmPatronen</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceAntiTankRifle"]/weaponTags</xpath>
-					<value>
-						<li>Bipod_ATR</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Rimworld War 2/ThingDefs_Misc/ItalianWeapons_Ranged.xml b/Patches/K4G Rimworld War 2/ThingDefs_Misc/ItalianWeapons_Ranged.xml
deleted file mode 100644
index 519bba2d30..0000000000
--- a/Patches/K4G Rimworld War 2/ThingDefs_Misc/ItalianWeapons_Ranged.xml	
+++ /dev/null
@@ -1,378 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] RimWorld War 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= Italian Bodeo Model 1889 Revolver ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2ItalianServiceRevolver"]</xpath>
-					<value>
-						<statBases>
-							<Mass>0.95</Mass>
-							<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-							<SightsEfficiency>0.7</SightsEfficiency>
-							<ShotSpread>0.17</ShotSpread>
-							<SwayFactor>1.03</SwayFactor>
-							<Bulk>2.22</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<recoilAmount>2.57</recoilAmount>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>16</range>
-								<soundCast>Shot_Revolver</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>6</magazineSize>
-								<reloadTime>4.6</reloadTime>
-								<ammoSet>AmmoSet_45ACP</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= Italian Beretta M1934 Pistol ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2ItalianServicePistol"]</xpath>
-					<value>
-						<statBases>
-							<Mass>0.66</Mass>
-							<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-							<SightsEfficiency>0.7</SightsEfficiency>
-							<ShotSpread>0.17</ShotSpread>
-							<SwayFactor>1.07</SwayFactor>
-							<Bulk>1.7</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<recoilAmount>2.27</recoilAmount>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_380ACP_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>16</range>
-								<soundCast>Shot_Autopistol</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>8</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_380ACP</ammoSet>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= Italian Carcano Rifle  ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2ItalianServiceRifle"]</xpath>
-					<value>
-						<statBases>
-							<Mass>3.8</Mass>
-							<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.63</SwayFactor>
-							<Bulk>12.00</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.04</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_65x52mmCarcano_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>55</range>
-								<soundCast>Shot_BoltActionRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>6</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_65x52mmCarcano</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= Italian Carcano Rifle (Bayonet) ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2ItalianServiceRifleBayonet"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.05</Mass>
-							<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.63</SwayFactor>
-							<Bulk>12.00</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.04</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_65x52mmCarcano_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>55</range>
-								<soundCast>Shot_BoltActionRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>6</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_65x52mmCarcano</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= Italian Carcano Carbine ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2ItalianServiceCarbine"]</xpath>
-					<value>
-						<statBases>
-							<Mass>3</Mass>
-							<RangedWeapon_Cooldown>0.97</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.06</ShotSpread>
-							<SwayFactor>1.4</SwayFactor>
-							<Bulk>9.5</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.04</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_65x52mmCarcano_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>48</range>
-								<soundCast>Shot_BoltActionRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>6</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_65x52mmCarcano</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= Italian Beretta M1918 SMG ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2ItalianServiceSMG"]</xpath>
-					<value>
-						<statBases>
-							<Mass>3.3</Mass>
-							<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.14</ShotSpread>
-							<SwayFactor>1.21</SwayFactor>
-							<Bulk>8.1</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.05</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_22LR_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>21</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-								<soundCast>Shot_MachinePistol</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>25</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_22LR</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>Snapshot</aiAimMode>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= Italian MAB 38/42 SMG ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2ItalianServiceSMGB"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.2</Mass>
-							<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.14</ShotSpread>
-							<SwayFactor>1.21</SwayFactor>
-							<Bulk>9.1</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.22</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>23</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-								<soundCast>Shot_HeavySMG</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>20</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>Snapshot</aiAimMode>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= Italian FNAB-43 SMG ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2ItalianServiceSMGC"]</xpath>
-					<value>
-						<statBases>
-							<Mass>3.9</Mass>
-							<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.14</ShotSpread>
-							<SwayFactor>1.21</SwayFactor>
-							<Bulk>7.5</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.05</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>23</range>
-								<burstShotCount>8</burstShotCount>
-								<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-								<soundCast>Shot_HeavySMG</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>20</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>Snapshot</aiAimMode>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= Italian Breda 30 LMG ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2ItalianServiceLMG"]</xpath>
-					<value>
-						<statBases>
-							<Mass>10.6</Mass>
-							<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-							<SightsEfficiency>1</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.53</SwayFactor>
-							<Bulk>15.7</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.22</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_65x52mmCarcano_FMJ</defaultProjectile>
-								<warmupTime>1.3</warmupTime>
-								<range>62</range>
-								<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-								<burstShotCount>6</burstShotCount>
-								<soundCast>Shot_Minigun</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<recoilPattern>Mounted</recoilPattern>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>20</magazineSize>
-								<reloadTime>7.5</reloadTime>
-								<ammoSet>AmmoSet_65x52mmCarcano</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiAimMode>SuppressFire</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2ItalianServiceLMG"]/weaponTags</xpath>
-					<value>
-						<li>Bipod_LMG</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Rimworld War 2/ThingDefs_Misc/JapaneseWeapons_Ranged.xml b/Patches/K4G Rimworld War 2/ThingDefs_Misc/JapaneseWeapons_Ranged.xml
deleted file mode 100644
index 6fedb79c04..0000000000
--- a/Patches/K4G Rimworld War 2/ThingDefs_Misc/JapaneseWeapons_Ranged.xml	
+++ /dev/null
@@ -1,366 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] RimWorld War 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= Japanese Type 14 Nambu Pistol ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2JapaneseServicePistol"]</xpath>
-					<value>
-						<statBases>
-							<Mass>0.9</Mass>
-							<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-							<SightsEfficiency>0.7</SightsEfficiency>
-							<ShotSpread>0.17</ShotSpread>
-							<SwayFactor>1.07</SwayFactor>
-							<Bulk>2</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_8x22mmNambu_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>16</range>
-								<soundCast>Shot_Autopistol</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>8</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_8x22mmNambu</ammoSet>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= Japanese Type 26 Revolver ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2JapaneseServiceRevolver"]</xpath>
-					<value>
-						<statBases>
-							<Mass>0.95</Mass>
-							<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-							<SightsEfficiency>0.7</SightsEfficiency>
-							<ShotSpread>0.17</ShotSpread>
-							<SwayFactor>1.03</SwayFactor>
-							<Bulk>2.22</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_38SW_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>16</range>
-								<soundCast>Shot_Revolver</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>6</magazineSize>
-								<reloadTime>4.6</reloadTime>
-								<ammoSet>AmmoSet_38SW</ammoSet>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= Japanese Type 99 Rifle ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2JapaneseServiceRifle"]</xpath>
-					<value>
-						<statBases>
-							<Mass>3.75</Mass>
-							<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.63</SwayFactor>
-							<Bulk>12.00</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.04</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_77x58mmArisaka_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>55</range>
-								<soundCast>Shot_BoltActionRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>5</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_77x58mmArisaka</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ========== Japanese Type 99 Rifle (Bayonet)  ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2JapaneseServiceRifleBayonet"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4</Mass>
-							<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.63</SwayFactor>
-							<Bulk>12.00</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.04</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_77x58mmArisaka_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>55</range>
-								<soundCast>Shot_BoltActionRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>5</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_77x58mmArisaka</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= Japanese Type 38 Carbine ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2JapaneseServiceCarbine"]</xpath>
-					<value>
-						<statBases>
-							<Mass>3.3</Mass>
-							<RangedWeapon_Cooldown>0.97</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.06</ShotSpread>
-							<SwayFactor>1.4</SwayFactor>
-							<Bulk>9.5</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.04</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-								<warmupTime>0.85</warmupTime>
-								<range>48</range>
-								<soundCast>Shot_BoltActionRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>5</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= Japanese Type 100 SMG ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2JapaneseServiceSMG"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.3</Mass>
-							<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.14</ShotSpread>
-							<SwayFactor>1.21</SwayFactor>
-							<Bulk>8.43</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>0.8</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_8x22mmNambu_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>23</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-								<soundCast>Shot_HeavySMG</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>30</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_8x22mmNambu</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>Snapshot</aiAimMode>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= Japanese Type 99 LMG ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2JapaneseServiceLMG"]</xpath>
-					<value>
-						<statBases>
-							<Mass>10.4</Mass>
-							<Bulk>16.56</Bulk>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.42</SwayFactor>
-							<SightsEfficiency>1.2</SightsEfficiency>
-							<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.34</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_77x58mmArisaka_FMJ</defaultProjectile>
-								<warmupTime>1.3</warmupTime>
-								<range>62</range>
-								<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-								<burstShotCount>10</burstShotCount>
-								<soundCast>Shot_Minigun</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<recoilPattern>Mounted</recoilPattern>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>30</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_77x58mmArisaka</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aimedBurstShotCount>5</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>SuppressFire</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2JapaneseServiceLMG"]/weaponTags</xpath>
-					<value>
-						<li>Bipod_LMG</li>
-					</value>
-				</li>
-
-				<!-- ======= Japanese Type 99 Sniper Rifle ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2JapaneseServiceSniperRifle"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4</Mass>
-							<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-							<SightsEfficiency>2.21</SightsEfficiency>
-							<ShotSpread>0.04</ShotSpread>
-							<SwayFactor>1.63</SwayFactor>
-							<Bulk>12.00</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.04</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_77x58mmArisaka_FMJ</defaultProjectile>
-								<warmupTime>1.4</warmupTime>
-								<range>75</range>
-								<soundCast>Shot_BoltActionRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>5</magazineSize>
-								<reloadOneAtATime>True</reloadOneAtATime>
-								<reloadTime>0.85</reloadTime>
-								<ammoSet>AmmoSet_77x58mmArisaka</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= Japanese Type 4 Rocket Launcher ======= -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>K4G_Gun_WW2JapaneseServiceRocketLauncher</defName>
-					<statBases>
-						<Mass>7.20</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.15</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.68</SwayFactor>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_K4GType74mm_HEAT</defaultProjectile>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<warmupTime>2.01</warmupTime>
-						<range>40</range>
-						<minRange>5</minRange>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>5.6</reloadTime>
-						<ammoSet>AmmoSet_K4GType74mmRocket</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Rimworld War 2/ThingDefs_Misc/RussianWeapons_Ranged.xml b/Patches/K4G Rimworld War 2/ThingDefs_Misc/RussianWeapons_Ranged.xml
deleted file mode 100644
index 655cd03db4..0000000000
--- a/Patches/K4G Rimworld War 2/ThingDefs_Misc/RussianWeapons_Ranged.xml	
+++ /dev/null
@@ -1,623 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] RimWorld War 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= Russian Nagant M1895 Revolver ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceRevolver"]</xpath>
-					<value>
-						<statBases>
-							<SightsEfficiency>0.7</SightsEfficiency>
-							<ShotSpread>0.18</ShotSpread>
-							<SwayFactor>1.2</SwayFactor>
-							<Bulk>2.2</Bulk>
-							<Mass>0.82</Mass>
-							<RangedWeapon_Cooldown>0.50</RangedWeapon_Cooldown>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.57</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_762x38mmR_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>16</range>
-								<soundCast>Shot_Revolver</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>7</magazineSize>
-								<reloadOneAtATime>True</reloadOneAtATime>
-								<reloadTime>0.85</reloadTime>
-								<ammoSet>AmmoSet_762x38mmR</ammoSet>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= Russian TT-33 Pistol ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2RussianServicePistol"]</xpath>
-					<value>
-						<statBases>
-							<Mass>0.85</Mass>
-							<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-							<SightsEfficiency>0.7</SightsEfficiency>
-							<ShotSpread>0.17</ShotSpread>
-							<SwayFactor>1.07</SwayFactor>
-							<Bulk>1.7</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.05</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>16</range>
-								<soundCast>Shot_Autopistol</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>8</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= Russian Mosin-Nagant Model 1891/30 Rifle ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceRifle"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.00</Mass>
-							<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.63</SwayFactor>
-							<Bulk>12.32</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.04</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>55</range>
-								<soundCast>Shot_BoltActionRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>5</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_762x54mmR</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= Russian Mosin-Nagant Model 1891/30 Rifle (Bayonet) ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceRifleBayonet"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.2</Mass>
-							<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.63</SwayFactor>
-							<Bulk>12.32</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.04</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>55</range>
-								<soundCast>Shot_BoltActionRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>5</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_762x54mmR</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= Russian SVT-40 Semi-Automatic Rifle ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceSemiAutomaticRifle"]</xpath>
-					<value>
-						<statBases>
-							<Mass>3.85</Mass>
-							<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.04</ShotSpread>
-							<SwayFactor>1.61</SwayFactor>
-							<Bulk>12.26</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.04</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>55</range>
-								<soundCast>Shot_HeavySMG</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>7</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>10</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_762x54mmR</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= Russian SVT-40 Semi-Automatic Rifle (Bayonet) ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceSemiAutomaticRifleBayonet"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.05</Mass>
-							<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.04</ShotSpread>
-							<SwayFactor>1.61</SwayFactor>
-							<Bulk>12.26</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.04</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>55</range>
-								<soundCast>Shot_HeavySMG</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>7</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>10</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_762x54mmR</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= Russian PPSh-41 Stick Mag SMG ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceSMG"]</xpath>
-					<value>
-						<statBases>
-							<Mass>3.63</Mass>
-							<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.14</ShotSpread>
-							<SwayFactor>1.21</SwayFactor>
-							<Bulk>8.43</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.22</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>23</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-								<soundCast>Shot_HeavySMG</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>35</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>Snapshot</aiAimMode>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= Russian PPSh-41 Drum Mag SMG ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceSMGB"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.03</Mass>
-							<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.14</ShotSpread>
-							<SwayFactor>1.21</SwayFactor>
-							<Bulk>8.43</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.22</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>23</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-								<soundCast>Shot_HeavySMG</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>71</magazineSize>
-								<reloadTime>4.9</reloadTime>
-								<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>Snapshot</aiAimMode>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= Russian PPS-43 SMG ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceSMGC"]</xpath>
-					<value>
-						<statBases>
-							<Mass>3.23</Mass>
-							<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.13</ShotSpread>
-							<SwayFactor>1.12</SwayFactor>
-							<Bulk>6.43</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.35</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>23</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-								<soundCast>Shot_HeavySMG</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>35</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>Snapshot</aiAimMode>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= Russian DP-27 LMG ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceLMG"]</xpath>
-					<value>
-						<statBases>
-							<Mass>9.12</Mass>
-							<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-							<SightsEfficiency>1</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.53</SwayFactor>
-							<Bulk>14.7</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.32</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-								<warmupTime>1.3</warmupTime>
-								<range>62</range>
-								<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-								<burstShotCount>10</burstShotCount>
-								<soundCast>Shot_Minigun</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<recoilPattern>Mounted</recoilPattern>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>47</magazineSize>
-								<reloadTime>4.9</reloadTime>
-								<ammoSet>AmmoSet_762x54mmR</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aimedBurstShotCount>5</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>SuppressFire</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceLMG"]/weaponTags</xpath>
-					<value>
-						<li>Bipod_LMG</li>
-					</value>
-				</li>
-
-				<!-- ======= Russian Fedorov Avtomat Automatic Rifle ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceAutomaticRifle"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.60</Mass>
-							<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.03</ShotSpread>
-							<SwayFactor>1.49</SwayFactor>
-							<Bulk>9.40</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.68</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>48</range>
-								<burstShotCount>5</burstShotCount>
-								<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-								<soundCast>Shot_AssaultRifle</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>25</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_762x54mmR</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= Russian Mosin-Nagant Model 1891/30 Sniper Rifle ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceSniperRifle"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.27</Mass>
-							<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-							<SightsEfficiency>2.21</SightsEfficiency>
-							<ShotSpread>0.04</ShotSpread>
-							<SwayFactor>1.63</SwayFactor>
-							<Bulk>12.32</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.04</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-								<warmupTime>1.4</warmupTime>
-								<range>75</range>
-								<soundCast>Shot_BoltActionRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>5</magazineSize>
-								<reloadOneAtATime>True</reloadOneAtATime>
-								<reloadTime>0.85</reloadTime>
-								<ammoSet>AmmoSet_762x54mmR</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= Russian SVT-40 Semi-Automatic Sniper Rifle ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceSemiAutomaticSniperRifle"]</xpath>
-					<value>
-						<statBases>
-							<Mass>3.85</Mass>
-							<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.04</ShotSpread>
-							<SwayFactor>1.61</SwayFactor>
-							<Bulk>12.26</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.68</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>75</range>
-								<soundCast>Shot_HeavySMG</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>7</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>10</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_762x54mmR</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= Russian PTRD-41 Anti-Tank Rifle ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceAntiTankRifle"]</xpath>
-					<value>
-						<statBases>
-							<SightsEfficiency>1.0</SightsEfficiency>
-							<ShotSpread>0.01</ShotSpread>
-							<SwayFactor>2.89</SwayFactor>
-							<Bulk>22.0</Bulk>
-							<Mass>20.30</Mass>
-							<RangedWeapon_Cooldown>0.58</RangedWeapon_Cooldown>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_145x114mm_FMJ</defaultProjectile>
-								<warmupTime>2.8</warmupTime>
-								<range>62</range>
-								<soundCast>HeavyMG</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>1</magazineSize>
-								<AmmoGenPerMagOverride>4</AmmoGenPerMagOverride>
-								<reloadTime>3.8</reloadTime>
-								<ammoSet>AmmoSet_145x114mm</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceAntiTankRifle"]/weaponTags</xpath>
-					<value>
-						<li>Bipod_ATR</li>
-					</value>
-				</li>
-
-				<!-- ======= Russian PTRS-41 Anti-Tank Rifle ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceAntiTankRifleB"]</xpath>
-					<value>
-						<statBases>
-							<SightsEfficiency>1.0</SightsEfficiency>
-							<ShotSpread>0.01</ShotSpread>
-							<SwayFactor>2.89</SwayFactor>
-							<Bulk>22.0</Bulk>
-							<Mass>20.30</Mass>
-							<RangedWeapon_Cooldown>0.58</RangedWeapon_Cooldown>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_145x114mm_FMJ</defaultProjectile>
-								<warmupTime>2.8</warmupTime>
-								<range>62</range>
-								<soundCast>HeavyMG</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>5</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_145x114mm</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceAntiTankRifleB"]/weaponTags</xpath>
-					<value>
-						<li>Bipod_ATR</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Rimworld War 2/ThingDefs_Misc/UnitedStatesWeapons_Ranged.xml b/Patches/K4G Rimworld War 2/ThingDefs_Misc/UnitedStatesWeapons_Ranged.xml
deleted file mode 100644
index 61486007bf..0000000000
--- a/Patches/K4G Rimworld War 2/ThingDefs_Misc/UnitedStatesWeapons_Ranged.xml	
+++ /dev/null
@@ -1,850 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] RimWorld War 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= American FP-45 Liberator Single-Shot Pistol ======= -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>K4G_Gun_WW2AmericanSingleShotPistol</defName>
-					<statBases>
-						<Mass>0.5</Mass>
-						<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>1.41</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.3</warmupTime>
-						<range>10</range>
-						<soundCast>Shot_Revolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ======= American M1917 Revolver ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceRevolver"]</xpath>
-					<value>
-						<statBases>
-							<SightsEfficiency>0.7</SightsEfficiency>
-							<ShotSpread>0.18</ShotSpread>
-							<SwayFactor>1.2</SwayFactor>
-							<Bulk>2.1</Bulk>
-							<Mass>1.1</Mass>
-							<RangedWeapon_Cooldown>0.50</RangedWeapon_Cooldown>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.57</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>16</range>
-								<soundCast>Shot_Revolver</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>6</magazineSize>
-								<reloadTime>4.6</reloadTime>
-								<ammoSet>AmmoSet_45ACP</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= American M1911 Pistol ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServicePistol"]</xpath>
-					<value>
-						<statBases>
-							<Mass>1.11</Mass>
-							<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-							<SightsEfficiency>0.7</SightsEfficiency>
-							<ShotSpread>0.17</ShotSpread>
-							<SwayFactor>1.07</SwayFactor>
-							<Bulk>2.10</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.05</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>16</range>
-								<soundCast>Shot_Autopistol</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>8</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_45ACP</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= American M1903 Springfield Rifle ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceRifle"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.19</Mass>
-							<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.63</SwayFactor>
-							<Bulk>12.60</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.04</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>55</range>
-								<soundCast>Shot_BoltActionRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>5</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_3006Springfield</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= American M1917 Endfield Rifle ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceRifleB"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.19</Mass>
-							<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.63</SwayFactor>
-							<Bulk>12.60</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.04</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>55</range>
-								<soundCast>Shot_BoltActionRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>6</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_3006Springfield</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= American M1903 Springfield Rifle (Bayonet) ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceRifleBayonet"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.35</Mass>
-							<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.63</SwayFactor>
-							<Bulk>12.60</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.04</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>55</range>
-								<soundCast>Shot_BoltActionRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>5</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_3006Springfield</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= American M1917 Endfield Rifle (Bayonet) ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceRifleBBayonet"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.35</Mass>
-							<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.63</SwayFactor>
-							<Bulk>12.60</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.04</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>55</range>
-								<soundCast>Shot_BoltActionRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>6</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_3006Springfield</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= American M1 Garand Semi-Automatic Rifle ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceSemiAutomaticRifle"]</xpath>
-					<value>
-						<statBases>
-							<SightsEfficiency>1</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.41</SwayFactor>
-							<Bulk>11.2</Bulk>
-							<Mass>4.5</Mass>
-							<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.72</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>55</range>
-								<soundCast>Shot_SniperRifle</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>8</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_3006Springfield</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= American M1 Garand Semi-Automatic Rifle (Bayonet) ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceSemiAutomaticRifleBayonet"]</xpath>
-					<value>
-						<statBases>
-							<SightsEfficiency>1</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.41</SwayFactor>
-							<Bulk>11.2</Bulk>
-							<Mass>4.7</Mass>
-							<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.72</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>55</range>
-								<soundCast>Shot_SniperRifle</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>8</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_3006Springfield</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= American M1 Carbine ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceCarbine"]</xpath>
-					<value>
-						<statBases>
-							<SightsEfficiency>1</SightsEfficiency>
-							<ShotSpread>0.06</ShotSpread>
-							<SwayFactor>1.25</SwayFactor>
-							<Bulk>9</Bulk>
-							<Mass>2.4</Mass>
-							<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.3</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_30Carbine_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>42</range>
-								<soundCast>Shot_AssaultRifle</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>15</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_30Carbine</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= American M12 Shotgun ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceShotgun"]</xpath>
-					<value>
-						<statBases>
-							<Mass>3.2</Mass>
-							<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
-							<ShotSpread>0.20</ShotSpread>
-							<SwayFactor>1.20</SwayFactor>
-							<Bulk>9.5</Bulk>
-							<SightsEfficiency>0.7</SightsEfficiency>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.5</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-								<warmupTime>0.3</warmupTime>
-								<range>16</range>
-								<soundCast>Shot_Shotgun</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>6</magazineSize>
-								<reloadOneAtATime>true</reloadOneAtATime>
-								<reloadTime>0.9</reloadTime>
-								<ammoSet>AmmoSet_12Gauge</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes" />
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= American M12 Shotgun (Bayonet) ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceShotgunBayonet"]</xpath>
-					<value>
-						<statBases>
-							<Mass>3.5</Mass>
-							<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
-							<ShotSpread>0.20</ShotSpread>
-							<SwayFactor>1.20</SwayFactor>
-							<Bulk>9.5</Bulk>
-							<SightsEfficiency>0.7</SightsEfficiency>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.5</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-								<warmupTime>0.3</warmupTime>
-								<range>16</range>
-								<soundCast>Shot_Shotgun</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>6</magazineSize>
-								<reloadOneAtATime>true</reloadOneAtATime>
-								<reloadTime>0.9</reloadTime>
-								<ammoSet>AmmoSet_12Gauge</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes" />
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= American M1 Thompson SMG ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceSMG"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.5</Mass>
-							<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.13</ShotSpread>
-							<SwayFactor>1.21</SwayFactor>
-							<Bulk>8.9</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.22</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>26</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-								<soundCast>Shot_HeavySMG</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>30</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_45ACP</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>Snapshot</aiAimMode>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= American M3 SMG ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceSMGB"]</xpath>
-					<value>
-						<statBases>
-							<Mass>3.61</Mass>
-							<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.14</ShotSpread>
-							<SwayFactor>1.21</SwayFactor>
-							<Bulk>6</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.1</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>26</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-								<soundCast>Shot_HeavySMG</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>20</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_45ACP</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>Snapshot</aiAimMode>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= American M2 Hyde SMG ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceSMGC"]</xpath>
-					<value>
-						<statBases>
-							<Mass>4.2</Mass>
-							<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.14</ShotSpread>
-							<SwayFactor>1.21</SwayFactor>
-							<Bulk>8.4</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.20</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>26</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-								<soundCast>Shot_HeavySMG</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>30</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_45ACP</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>Snapshot</aiAimMode>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= American M1928 Thompson SMG ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceSMGD"]</xpath>
-					<value>
-						<statBases>
-							<Mass>5</Mass>
-							<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.13</ShotSpread>
-							<SwayFactor>1.21</SwayFactor>
-							<Bulk>8.9</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.45</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>26</range>
-								<burstShotCount>10</burstShotCount>
-								<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-								<soundCast>Shot_HeavySMG</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>30</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_45ACP</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>Snapshot</aiAimMode>
-								<aimedBurstShotCount>5</aimedBurstShotCount>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= American Johnson M1941 LMG ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceLMG"]</xpath>
-					<value>
-						<statBases>
-							<Mass>5.9</Mass>
-							<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-							<SightsEfficiency>1</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.40</SwayFactor>
-							<Bulk>13</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.32</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
-								<warmupTime>1.3</warmupTime>
-								<range>62</range>
-								<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-								<burstShotCount>6</burstShotCount>
-								<soundCast>Shot_Minigun</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<recoilPattern>Mounted</recoilPattern>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>20</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_3006Springfield</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>SuppressFire</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceLMG"]/weaponTags</xpath>
-					<value>
-						<li>Bipod_LMG</li>
-					</value>
-				</li>
-
-				<!-- ======= American Browning Automatic Rifle ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceAutomaticRifle"]</xpath>
-					<value>
-						<statBases>
-							<Mass>7.25</Mass>
-							<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.34</SwayFactor>
-							<Bulk>12.94</Bulk>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.51</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
-								<warmupTime>1.3</warmupTime>
-								<range>58</range>
-								<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-								<burstShotCount>6</burstShotCount>
-								<soundCast>Shot_SniperRifle</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>20</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_3006Springfield</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>SuppressFire</aiAimMode>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= American M1903A4 Springfield Sniper Rifle ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceSniperRifle"]</xpath>
-					<value>
-						<statBases>
-							<SightsEfficiency>2.4</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.41</SwayFactor>
-							<Bulk>13.60</Bulk>
-							<Mass>4.9</Mass>
-							<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.72</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
-								<warmupTime>1.4</warmupTime>
-								<range>74</range>
-								<soundCast>Shot_SniperRifle</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>5</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_3006Springfield</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= American M1903 Springfield Sniper Rifle ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceSniperRifleB"]</xpath>
-					<value>
-						<statBases>
-							<SightsEfficiency>2.3</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.41</SwayFactor>
-							<Bulk>13.60</Bulk>
-							<Mass>4.8</Mass>
-							<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						</statBases>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.72</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
-								<warmupTime>1.4</warmupTime>
-								<range>74</range>
-								<soundCast>Shot_SniperRifle</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>5</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_3006Springfield</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= American M1 Bazooka Rocket Launcher ======= -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>K4G_Gun_WW2AmericanServiceRocketLauncher</defName>
-					<statBases>
-						<Mass>7.20</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.15</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.68</SwayFactor>
-						<Bulk>12.50</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_M6_HEAT</defaultProjectile>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<warmupTime>2.01</warmupTime>
-						<range>40</range>
-						<minRange>5</minRange>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>5.6</reloadTime>
-						<ammoSet>AmmoSet_M6Rocket</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Rimworld War 2/ThingDefs_Misc/WW2_Apparel.xml b/Patches/K4G Rimworld War 2/ThingDefs_Misc/WW2_Apparel.xml
deleted file mode 100644
index 51b66a76e4..0000000000
--- a/Patches/K4G Rimworld War 2/ThingDefs_Misc/WW2_Apparel.xml	
+++ /dev/null
@@ -1,411 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] RimWorld War 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= Uniforms ======= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="WW2Uniform" or @Name="WW2OfficerUniform"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WW2Uniform" or @Name="WW2OfficerUniform"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.03</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WW2Uniform" or @Name="WW2OfficerUniform"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.045</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ======= Coat ======= -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WW2Coat"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>						
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WW2Coat"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ======= Rain Cape ======= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="WW2RainCape" or @Name="WW2StuffableRainCape"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WW2StuffableRainCape"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WW2RainCape"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.01</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WW2RainCape"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.015</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ======= Winter Parka ======= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="WW2WinterParka"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WW2WinterParka"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.04</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WW2WinterParka"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.06</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ======= Winter Coat ======= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="WW2WinterCoat"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<WornBulk>7</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WW2WinterCoat"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.06</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WW2WinterCoat"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.08</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ======= Loadbearings ======= -->
-
-				<!-- === Backpack === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="WW2Rucksack"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WW2Rucksack"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>Shoulders</li>
-						</bodyPartGroups>
-						<careIfDamaged>false</careIfDamaged>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WW2Rucksack"]/apparel/layers</xpath>
-					<value>
-						<layers>
-							<li>Backpack</li>
-						</layers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WW2Rucksack"]/costList</xpath>
-					<value>
-						<costStuffCount>40</costStuffCount>
-						<stuffCategories>
-							<li>Fabric</li>
-							<li>Leathery</li>
-						</stuffCategories>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WW2Rucksack"]/thingCategories</xpath>
-					<value>
-						<thingCategories>
-							<li>Loadout</li>
-						</thingCategories>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WW2Rucksack"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>40</CarryBulk>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- === Satchel === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="WW2Satchel"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WW2Satchel"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>Shoulders</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WW2Satchel"]/apparel/layers</xpath>
-					<value>
-						<layers>
-							<li>Webbing</li>
-						</layers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="WW2Satchel"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>15</CarryBulk>
-					</value>
-				</li>
-
-				<!-- === Field Gear === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="WW2FieldGear"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WW2FieldGear"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>Shoulders</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WW2FieldGear"]/apparel/layers</xpath>
-					<value>
-						<layers>
-							<li>Webbing</li>
-						</layers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WW2FieldGear"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>15</CarryBulk>
-							<ReloadSpeed>0.1</ReloadSpeed>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- ======= Helmets ======= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						@Name="WW2Helmet" or
-						@Name="WW2StuffableHelmet" or
-						@Name="WW2StuffablePithHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WW2StuffableHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WW2StuffablePithHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>3</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WW2StuffablePithHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WW2Helmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WW2Helmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ======= Gas Masks ======= -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WW2GasMask"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WW2GasMask"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>UpperHead</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WW2GasMask"]/apparel/layers</xpath>
-					<value>
-						<layers>
-							<li>Overhead</li>
-							<li>StrappedHead</li>
-						</layers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="WW2GasMask"]/apparel</xpath>
-					<value>
-						<tags>
-							<li>IndustrialMilitaryBasic</li>
-							<li>GasMask</li>
-						</tags>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="WW2GasMask"]</xpath>
-					<value>
-						<modExtensions>
-							<li Class="CombatExtended.ApparelHediffExtension">
-								<hediff>WearingGasMask</hediff>
-							</li>
-							<li Class="CombatExtended.ApperalRenderingExtension">
-								<HideHair>false</HideHair>
-								<HideBeard>true</HideBeard>
-							</li>
-						</modExtensions>
-					</value>
-				</li>
-
-				<!-- ======= Caps ======= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						@Name="WW2PeakedCap" or
-						@Name="WW2FieldCap" or
-						@Name="WW2SideCap" or
-						@Name="WW2FurHat" or
-						@Name="WW2Kepi"
-						]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-
-				<!-- === Stuffable Hats === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						@Name="WW2StuffableKepi" or
-						@Name="WW2StuffablePeakedCap" or
-						@Name="WW2StuffableFieldCap" or
-						@Name="WW2StuffableSideCap"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WW2StuffableFurHat"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-						<Bulk>1</Bulk>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Rimworld War 2/ThingDefs_Misc/WW2_Grenades.xml b/Patches/K4G Rimworld War 2/ThingDefs_Misc/WW2_Grenades.xml
deleted file mode 100644
index 01537f65ab..0000000000
--- a/Patches/K4G Rimworld War 2/ThingDefs_Misc/WW2_Grenades.xml	
+++ /dev/null
@@ -1,1676 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] RimWorld War 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= Projectiles ======= -->
-
-				<!-- ===== ThingClass ===== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="K4G_Proj_WW2BritishServiceGrenade" or
-						defName="K4G_Proj_WW2FinnishServiceGrenade" or
-						defName="K4G_Proj_WW2FrenchServiceGrenade" or
-						defName="K4G_Proj_WW2GermanServiceGrenade" or
-						defName="K4G_Proj_WW2GermanServiceGrenade" or
-						defName="K4G_Proj_WW2ItalianServiceGrenade" or
-						defName="K4G_Proj_WW2ItalianServiceGrenadeB" or
-						defName="K4G_Proj_WW2ItalianServiceGrenadeC" or
-						defName="K4G_Proj_WW2JapaneseServiceGrenade" or
-						defName="K4G_Proj_WW2RussianServiceGrenade" or
-						defName="K4G_Proj_WW2RussianServiceGrenadeB" or
-						defName="K4G_Proj_WW2RussianServiceGrenadeC" or
-						defName="K4G_Proj_WW2AmericanServiceGrenade" or
-						defName="K4G_Proj_WW2BritishServiceAntiTankGrenade" or
-						defName="K4G_Proj_WW2BritishServiceAntiTankGrenadeB" or
-						defName="K4G_Proj_WW2GermanServiceAntiTankGrenade" or
-						defName="K4G_Proj_WW2ItalianServiceAntiTankGrenade" or
-						defName="K4G_Proj_WW2RussianServiceAntiTankGrenade" or
-						defName="K4G_Proj_WW2RussianServiceAntiTankGrenadeB" or
-						defName="K4G_Proj_WW2RussianServiceAntiTankGrenadeC"
-						]</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<!-- ===== Fragmentation ===== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="K4G_Proj_WW2BritishServiceGrenade" or
-						defName="K4G_Proj_WW2FinnishServiceGrenade" or
-						defName="K4G_Proj_WW2FrenchServiceGrenade" or
-						defName="K4G_Proj_WW2GermanServiceGrenade" or
-						defName="K4G_Proj_WW2GermanServiceGrenade" or
-						defName="K4G_Proj_WW2ItalianServiceGrenade" or
-						defName="K4G_Proj_WW2ItalianServiceGrenadeB" or
-						defName="K4G_Proj_WW2ItalianServiceGrenadeC" or
-						defName="K4G_Proj_WW2JapaneseServiceGrenade" or
-						defName="K4G_Proj_WW2RussianServiceGrenade" or
-						defName="K4G_Proj_WW2RussianServiceGrenadeB" or
-						defName="K4G_Proj_WW2RussianServiceGrenadeC" or
-						defName="K4G_Proj_WW2AmericanServiceGrenade"
-						]</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>1.5</explosionRadius>
-							<damageDef>Bomb</damageDef>
-							<damageAmountBase>56</damageAmountBase>
-							<explosionDelay>60</explosionDelay>
-							<dropsCasings>true</dropsCasings>
-							<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-							<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							<speed>12</speed>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="K4G_Proj_WW2BritishServiceGrenade" or
-						defName="K4G_Proj_WW2FinnishServiceGrenade" or
-						defName="K4G_Proj_WW2FrenchServiceGrenade" or
-						defName="K4G_Proj_WW2GermanServiceGrenade" or
-						defName="K4G_Proj_WW2ItalianServiceGrenade" or
-						defName="K4G_Proj_WW2ItalianServiceGrenadeB" or
-						defName="K4G_Proj_WW2ItalianServiceGrenadeC" or
-						defName="K4G_Proj_WW2JapaneseServiceGrenade" or
-						defName="K4G_Proj_WW2RussianServiceGrenade" or
-						defName="K4G_Proj_WW2RussianServiceGrenadeB" or
-						defName="K4G_Proj_WW2RussianServiceGrenadeC" or
-						defName="K4G_Proj_WW2AmericanServiceGrenade"
-						]</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_Fragments">
-								<fragments>
-									<Fragment_Small>40</Fragment_Small>
-								</fragments>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ===== Anti-Tank ===== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="K4G_Proj_WW2BritishServiceAntiTankGrenade" or
-						defName="K4G_Proj_WW2BritishServiceAntiTankGrenadeB" or
-						defName="K4G_Proj_WW2GermanServiceAntiTankGrenade" or
-						defName="K4G_Proj_WW2ItalianServiceAntiTankGrenade" or
-						defName="K4G_Proj_WW2RussianServiceAntiTankGrenade" or
-						defName="K4G_Proj_WW2RussianServiceAntiTankGrenadeB" or
-						defName="K4G_Proj_WW2RussianServiceAntiTankGrenadeC"
-						]</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>1.5</explosionRadius>
-							<damageDef>Bomb</damageDef>
-							<damageAmountBase>56</damageAmountBase>
-							<explosionDelay>60</explosionDelay>
-							<dropsCasings>true</dropsCasings>
-							<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-							<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							<speed>12</speed>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="K4G_Proj_WW2BritishServiceAntiTankGrenade" or
-						defName="K4G_Proj_WW2BritishServiceAntiTankGrenadeB" or
-						defName="K4G_Proj_WW2GermanServiceAntiTankGrenade" or
-						defName="K4G_Proj_WW2ItalianServiceAntiTankGrenade" or
-						defName="K4G_Proj_WW2RussianServiceAntiTankGrenade" or
-						defName="K4G_Proj_WW2RussianServiceAntiTankGrenadeB" or
-						defName="K4G_Proj_WW2RussianServiceAntiTankGrenadeC"
-						]</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_Fragments">
-								<fragments>
-									<Fragment_Small>5</Fragment_Small>
-								</fragments>
-							</li>
-							<li Class="CombatExtended.CompProperties_ExplosiveCE">
-								<damageAmountBase>100</damageAmountBase>
-								<explosiveDamageType>Bomb</explosiveDamageType>
-								<explosiveRadius>0.5</explosiveRadius>
-								<explosionSound>Explosion_Thump</explosionSound>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ======= Grenades Equipment ======= -->
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[
-						defName="K4G_Weapon_WW2BritishServiceGrenades" or
-						defName="K4G_Weapon_WW2BritishServiceAntiTankGrenades" or
-						defName="K4G_Weapon_WW2BritishServiceAntiTankGrenadesB" or
-						defName="K4G_Weapon_WW2FinnishServiceGrenades" or
-						defName="K4G_Weapon_WW2FrenchServiceGrenades" or
-						defName="K4G_Weapon_WW2GermanServiceGrenades" or
-						defName="K4G_Weapon_WW2GermanServiceGrenadesB" or
-						defName="K4G_Weapon_WW2GermanServiceAntiTankGrenades" or
-						defName="K4G_Weapon_WW2ItalianServiceGrenades" or
-						defName="K4G_Weapon_WW2ItalianServiceGrenadesB" or
-						defName="K4G_Weapon_WW2ItalianServiceGrenadesC" or
-						defName="K4G_Weapon_WW2ItalianServiceAntiTankGrenades" or
-						defName="K4G_Weapon_WW2JapaneseServiceGrenades" or
-						defName="K4G_Weapon_WW2RussianServiceGrenades" or
-						defName="K4G_Weapon_WW2RussianServiceGrenadesB" or
-						defName="K4G_Weapon_WW2RussianServiceGrenadesC" or
-						defName="K4G_Weapon_WW2RussianServiceAntiTankGrenades" or
-						defName="K4G_Weapon_WW2RussianServiceAntiTankGrenadesB" or
-						defName="K4G_Weapon_WW2RussianServiceAntiTankGrenadesC" or
-						defName="K4G_Weapon_WW2AmericanServiceGrenades"
-						]</xpath>
-					<attribute>ParentName</attribute>
-					<value>BaseWeapon</value>
-				</li>
-
-				<!-- Grenade -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="K4G_Weapon_WW2BritishServiceGrenades" or
-						defName="K4G_Weapon_WW2BritishServiceAntiTankGrenades" or
-						defName="K4G_Weapon_WW2BritishServiceAntiTankGrenadesB" or
-						defName="K4G_Weapon_WW2FinnishServiceGrenades" or
-						defName="K4G_Weapon_WW2FrenchServiceGrenades" or
-						defName="K4G_Weapon_WW2GermanServiceGrenades" or
-						defName="K4G_Weapon_WW2GermanServiceGrenadesB" or
-						defName="K4G_Weapon_WW2GermanServiceAntiTankGrenades" or
-						defName="K4G_Weapon_WW2ItalianServiceGrenades" or
-						defName="K4G_Weapon_WW2ItalianServiceGrenadesB" or
-						defName="K4G_Weapon_WW2ItalianServiceGrenadesC" or
-						defName="K4G_Weapon_WW2ItalianServiceAntiTankGrenades" or
-						defName="K4G_Weapon_WW2JapaneseServiceGrenades" or
-						defName="K4G_Weapon_WW2RussianServiceGrenades" or
-						defName="K4G_Weapon_WW2RussianServiceGrenadesB" or
-						defName="K4G_Weapon_WW2RussianServiceGrenadesC" or
-						defName="K4G_Weapon_WW2RussianServiceAntiTankGrenades" or
-						defName="K4G_Weapon_WW2RussianServiceAntiTankGrenadesB" or
-						defName="K4G_Weapon_WW2RussianServiceAntiTankGrenadesC" or
-						defName="K4G_Weapon_WW2AmericanServiceGrenades"
-						]</xpath>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<stackLimit>75</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[
-						defName="K4G_Weapon_WW2BritishServiceGrenades" or
-						defName="K4G_Weapon_WW2BritishServiceAntiTankGrenades" or
-						defName="K4G_Weapon_WW2BritishServiceAntiTankGrenadesB" or
-						defName="K4G_Weapon_WW2FinnishServiceGrenades" or
-						defName="K4G_Weapon_WW2FrenchServiceGrenades" or
-						defName="K4G_Weapon_WW2GermanServiceGrenades" or
-						defName="K4G_Weapon_WW2GermanServiceGrenadesB" or
-						defName="K4G_Weapon_WW2GermanServiceAntiTankGrenades" or
-						defName="K4G_Weapon_WW2ItalianServiceGrenades" or
-						defName="K4G_Weapon_WW2ItalianServiceGrenadesB" or
-						defName="K4G_Weapon_WW2ItalianServiceGrenadesC" or
-						defName="K4G_Weapon_WW2ItalianServiceAntiTankGrenades" or
-						defName="K4G_Weapon_WW2JapaneseServiceGrenades" or
-						defName="K4G_Weapon_WW2RussianServiceGrenades" or
-						defName="K4G_Weapon_WW2RussianServiceGrenadesB" or
-						defName="K4G_Weapon_WW2RussianServiceGrenadesC" or
-						defName="K4G_Weapon_WW2RussianServiceAntiTankGrenades" or
-						defName="K4G_Weapon_WW2RussianServiceAntiTankGrenadesB" or
-						defName="K4G_Weapon_WW2RussianServiceAntiTankGrenadesC" or
-						defName="K4G_Weapon_WW2AmericanServiceGrenades"
-						]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="K4G_Weapon_WW2BritishServiceGrenades" or
-						defName="K4G_Weapon_WW2BritishServiceAntiTankGrenades" or
-						defName="K4G_Weapon_WW2BritishServiceAntiTankGrenadesB" or
-						defName="K4G_Weapon_WW2FinnishServiceGrenades" or
-						defName="K4G_Weapon_WW2FrenchServiceGrenades" or
-						defName="K4G_Weapon_WW2GermanServiceGrenades" or
-						defName="K4G_Weapon_WW2GermanServiceGrenadesB" or
-						defName="K4G_Weapon_WW2GermanServiceAntiTankGrenades" or
-						defName="K4G_Weapon_WW2ItalianServiceGrenades" or
-						defName="K4G_Weapon_WW2ItalianServiceGrenadesB" or
-						defName="K4G_Weapon_WW2ItalianServiceGrenadesC" or
-						defName="K4G_Weapon_WW2ItalianServiceAntiTankGrenades" or
-						defName="K4G_Weapon_WW2JapaneseServiceGrenades" or
-						defName="K4G_Weapon_WW2RussianServiceGrenades" or
-						defName="K4G_Weapon_WW2RussianServiceGrenadesB" or
-						defName="K4G_Weapon_WW2RussianServiceGrenadesC" or
-						defName="K4G_Weapon_WW2RussianServiceAntiTankGrenades" or
-						defName="K4G_Weapon_WW2RussianServiceAntiTankGrenadesB" or
-						defName="K4G_Weapon_WW2RussianServiceAntiTankGrenadesC" or
-						defName="K4G_Weapon_WW2AmericanServiceGrenades"
-						]/comps</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_ExplosiveCE">
-								<damageAmountBase>56</damageAmountBase>
-								<explosiveDamageType>Bomb</explosiveDamageType>
-								<explosiveRadius>1.5</explosiveRadius>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ===== British ===== -->
-
-				<!-- === British No. 36M Mk I Mills Bomb Grenades === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2BritishServiceGrenades"]</xpath>
-					<value>
-						<ThingDef ParentName="BaseGrenadeEquipment">
-							<defName>K4G_Weapon_WW2BritishServiceGrenades</defName>
-							<label>British No. 36M Mk I Mills Bomb Grenades</label>
-							<description>Old-school fragmentation grenades used during WW2. They can be thrown a short distance, where they'll explode, damaging anything and anyone nearby.</description>
-							<graphicData>
-								<texPath>Things/Item/Equipment/WeaponRanged/UnitedKingdom/WW2BritishServiceGrenades</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<weaponTags Inherit="False">
-								<li>CE_AI_AOE</li>
-								<li>CE_OneHandedWeapon</li>
-								<li>K4GWW2UnitedKingdomTrading</li>
-								<li>K4GWW2UnitedKingdomGrenade</li>
-							</weaponTags>
-							<soundInteract>Interact_Grenade</soundInteract>
-							<techLevel>Industrial</techLevel>
-							<statBases>
-								<Mass>0.6</Mass>
-								<Bulk>0.87</Bulk>
-								<MarketValue>12.22</MarketValue>
-								<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.0</SightsEfficiency>
-							</statBases>
-							<thingCategories>
-								<li>Grenades</li>
-							</thingCategories>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<label>throw frag grenade</label>
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<range>11</range>
-									<minRange>4</minRange>
-									<warmupTime>1.2</warmupTime>
-									<noiseRadius>4</noiseRadius>
-									<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-									<soundCast>ThrowGrenade</soundCast>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<defaultProjectile>K4G_Proj_WW2BritishServiceGrenade</defaultProjectile>
-									<onlyManualCast>true</onlyManualCast>
-									<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-									<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-								</li>
-							</verbs>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>56</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>1.5</explosiveRadius>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Small>40</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- === British No. 73 Anti-Tank Grenades === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2BritishServiceAntiTankGrenades"]</xpath>
-					<value>
-						<ThingDef ParentName="BaseEquipment">
-							<defName>K4G_Weapon_WW2BritishServiceAntiTankGrenades</defName>
-							<label>British No. 73 Anti-Tank Grenade</label>
-							<description>Heavy explosive grenades used during WW2. They can be thrown a short distance and are designed to damage or destroy armored targets.</description>
-							<graphicData>
-								<texPath>Things/Item/Equipment/WeaponRanged/UnitedKingdom/WW2BritishServiceAntiTankGrenades</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<soundInteract>Interact_Grenade</soundInteract>
-							<techLevel>Industrial</techLevel>
-							<stackLimit>25</stackLimit>
-							<statBases>
-								<Mass>1.36</Mass>
-								<Bulk>10</Bulk>
-								<MarketValue>25</MarketValue>
-								<SightsEfficiency>1.0</SightsEfficiency>
-								<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-							</statBases>
-							<weaponTags>
-								<li>CE_AI_Grenade</li>
-								<li>CE_OneHandedWeapon</li>
-								<li>GrenadeDestructive</li>
-								<li>K4GWW2UnitedKingdomTrading</li>
-								<li>K4GWW2UnitedKingdomAntiTankGrenade</li>
-							</weaponTags>
-							<thingCategories>
-								<li>Grenades</li>
-							</thingCategories>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<label>throw anti-tank grenade</label>
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<range>16.0</range>
-									<warmupTime>1.4</warmupTime>
-									<noiseRadius>4</noiseRadius>
-									<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-									<soundCast>ThrowGrenade</soundCast>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<defaultProjectile>K4G_Proj_WW2BritishServiceAntiTankGrenade</defaultProjectile>
-									<onlyManualCast>true</onlyManualCast>
-									<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-									<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-								</li>
-							</verbs>
-							<comps>
-								<li Class="CombatExtended.CompProperties_FireModes">
-									<aiUseBurstMode>FALSE</aiUseBurstMode>
-									<aiAimMode>AimedShot</aiAimMode>
-								</li>
-							</comps>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>Body</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>2</power>
-									<cooldownTime>1.75</cooldownTime>
-									<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
-								</li>
-							</tools>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- === British No. 74 Sticky Bomb Anti-Tank Grenades === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2BritishServiceAntiTankGrenadesB"]</xpath>
-					<value>
-						<ThingDef ParentName="BaseEquipment">
-							<defName>K4G_Weapon_WW2BritishServiceAntiTankGrenadesB</defName>
-							<label>British No. 74 Sticky Bomb Anti-Tank Grenades</label>
-							<description>Heavy explosive grenades used during WW2. They can be thrown a short distance and are designed to damage or destroy armored targets.</description>
-							<graphicData>
-								<texPath>Things/Item/Equipment/WeaponRanged/UnitedKingdom/WW2BritishServiceAntiTankGrenadesB</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<weaponTags Inherit="False">
-								<li>CE_AI_Grenade</li>
-								<li>CE_OneHandedWeapon</li>
-								<li>GrenadeDestructive</li>
-								<li>K4GWW2UnitedKingdomTrading</li>
-								<li>K4GWW2UnitedKingdomAntiTankGrenade</li>
-							</weaponTags>
-							<soundInteract>Interact_Grenade</soundInteract>
-							<techLevel>Industrial</techLevel>
-							<stackLimit>25</stackLimit>
-							<statBases>
-								<Mass>1.36</Mass>
-								<Bulk>10</Bulk>
-								<MarketValue>27</MarketValue>
-								<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.0</SightsEfficiency>
-							</statBases>
-							<thingCategories>
-								<li>Grenades</li>
-							</thingCategories>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<label>throw anti-tank grenade</label>
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<range>16</range>
-									<warmupTime>1.2</warmupTime>
-									<noiseRadius>4</noiseRadius>
-									<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-									<soundCast>ThrowGrenade</soundCast>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<defaultProjectile>K4G_Proj_WW2BritishServiceAntiTankGrenadeB</defaultProjectile>
-									<onlyManualCast>true</onlyManualCast>
-									<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-									<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-								</li>
-							</verbs>
-							<comps>
-								<li Class="CombatExtended.CompProperties_FireModes">
-									<aiUseBurstMode>FALSE</aiUseBurstMode>
-									<aiAimMode>AimedShot</aiAimMode>
-								</li>
-							</comps>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>Body</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>2</power>
-									<cooldownTime>1.75</cooldownTime>
-									<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
-								</li>
-							</tools>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- ===== Finnish ===== -->
-
-				<!-- === Finnish Mk II Grenades === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2FinnishServiceGrenades"]</xpath>
-					<value>
-						<ThingDef ParentName="BaseGrenadeEquipment">
-							<defName>K4G_Weapon_WW2FinnishServiceGrenades</defName>
-							<label>Finnish M32 Mortar Shell Grenades</label>
-							<description>Old-school fragmentation grenades used during WW2. They can be thrown a short distance, where they'll explode, damaging anything and anyone nearby.</description>
-							<graphicData>
-								<texPath>Things/Item/Equipment/WeaponRanged/Finland/WW2FinnishServiceGrenades</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<weaponTags Inherit="False">
-								<li>CE_AI_AOE</li>
-								<li>CE_OneHandedWeapon</li>
-								<li>K4GWW2FinlandTrading</li>
-								<li>K4GWW2FinlandGrenade</li>
-							</weaponTags>
-							<soundInteract>Interact_Grenade</soundInteract>
-							<techLevel>Industrial</techLevel>
-							<statBases>
-								<Mass>0.6</Mass>
-								<Bulk>0.87</Bulk>
-								<MarketValue>12.22</MarketValue>
-								<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.0</SightsEfficiency>
-							</statBases>
-							<thingCategories>
-								<li>Grenades</li>
-							</thingCategories>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<label>throw frag grenade</label>
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<range>11</range>
-									<minRange>4</minRange>
-									<warmupTime>1.2</warmupTime>
-									<noiseRadius>4</noiseRadius>
-									<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-									<soundCast>ThrowGrenade</soundCast>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<defaultProjectile>K4G_Proj_WW2FinnishServiceGrenade</defaultProjectile>
-									<onlyManualCast>true</onlyManualCast>
-									<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-									<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-								</li>
-							</verbs>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>56</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>1.5</explosiveRadius>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Small>40</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- ===== France ===== -->
-
-				<!-- === French F1 Grenades === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2FrenchServiceGrenades"]</xpath>
-					<value>
-						<ThingDef ParentName="BaseGrenadeEquipment">
-							<defName>K4G_Weapon_WW2FrenchServiceGrenades</defName>
-							<label>French F1 Grenades</label>
-							<description>Old-school fragmentation grenades used during WW2. They can be thrown a short distance, where they'll explode, damaging anything and anyone nearby.</description>
-							<graphicData>
-								<texPath>Things/Item/Equipment/WeaponRanged/France/WW2FrenchServiceGrenades</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<weaponTags Inherit="False">
-								<li>CE_AI_AOE</li>
-								<li>CE_OneHandedWeapon</li>
-								<li>K4GWW2FranceTrading</li>
-								<li>K4GWW2FranceGrenade</li>
-							</weaponTags>
-							<soundInteract>Interact_Grenade</soundInteract>
-							<techLevel>Industrial</techLevel>
-							<statBases>
-								<Mass>0.6</Mass>
-								<Bulk>0.87</Bulk>
-								<MarketValue>12.22</MarketValue>
-								<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.0</SightsEfficiency>
-							</statBases>
-							<thingCategories>
-								<li>Grenades</li>
-							</thingCategories>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<label>throw frag grenade</label>
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<range>11</range>
-									<minRange>4</minRange>
-									<warmupTime>1.2</warmupTime>
-									<noiseRadius>4</noiseRadius>
-									<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-									<soundCast>ThrowGrenade</soundCast>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<defaultProjectile>K4G_Proj_WW2FrenchServiceGrenade</defaultProjectile>
-									<onlyManualCast>true</onlyManualCast>
-									<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-									<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-								</li>
-							</verbs>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>56</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>1.5</explosiveRadius>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Small>40</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- ===== Germany ===== -->
-
-				<!-- === German M24 Stielhandgranate Grenades === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2GermanServiceGrenades"]</xpath>
-					<value>
-						<ThingDef ParentName="BaseGrenadeEquipment">
-							<defName>K4G_Weapon_WW2GermanServiceGrenades</defName>
-							<label>German M24 Stielhandgranate Grenades</label>
-							<description>Old-school fragmentation grenades used during WW2. They can be thrown a short distance, where they'll explode, damaging anything and anyone nearby.</description>
-							<graphicData>
-								<texPath>Things/Item/Equipment/WeaponRanged/Germany/WW2GermanServiceGrenades</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<weaponTags Inherit="False">
-								<li>CE_AI_AOE</li>
-								<li>CE_OneHandedWeapon</li>
-								<li>K4GWW2GermanyTrading</li>
-								<li>K4GWW2GermanyGrenade</li>
-							</weaponTags>
-							<soundInteract>Interact_Grenade</soundInteract>
-							<techLevel>Industrial</techLevel>
-							<statBases>
-								<Mass>0.6</Mass>
-								<Bulk>0.87</Bulk>
-								<MarketValue>12.22</MarketValue>
-								<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.0</SightsEfficiency>
-							</statBases>
-							<thingCategories>
-								<li>Grenades</li>
-							</thingCategories>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<label>throw frag grenade</label>
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<range>11</range>
-									<minRange>4</minRange>
-									<warmupTime>1.2</warmupTime>
-									<noiseRadius>4</noiseRadius>
-									<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-									<soundCast>ThrowGrenade</soundCast>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<defaultProjectile>K4G_Proj_WW2GermanServiceGrenade</defaultProjectile>
-									<onlyManualCast>true</onlyManualCast>
-									<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-									<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-								</li>
-							</verbs>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>56</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>1.5</explosiveRadius>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Small>40</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- === German M39 Grenades === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2GermanServiceGrenadesB"]</xpath>
-					<value>
-						<ThingDef ParentName="BaseGrenadeEquipment">
-							<defName>K4G_Weapon_WW2GermanServiceGrenadesB</defName>
-							<label>German M39 Grenades</label>
-							<description>Old-school fragmentation grenades used during WW2. They can be thrown a short distance, where they'll explode, damaging anything and anyone nearby.</description>
-							<graphicData>
-								<texPath>Things/Item/Equipment/WeaponRanged/Germany/WW2GermanServiceGrenadesB</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<weaponTags Inherit="False">
-								<li>CE_AI_AOE</li>
-								<li>CE_OneHandedWeapon</li>
-								<li>K4GWW2GermanyTrading</li>
-								<li>K4GWW2GermanyGrenade</li>
-								<li>K4GWW2RussiaGrenadeSharedAllies</li>
-								<li>K4GWW2RussiaGrenadeSharedCoBelligerentGermany</li>
-							</weaponTags>
-							<soundInteract>Interact_Grenade</soundInteract>
-							<techLevel>Industrial</techLevel>
-							<statBases>
-								<Mass>0.6</Mass>
-								<Bulk>0.87</Bulk>
-								<MarketValue>13.22</MarketValue>
-								<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.0</SightsEfficiency>
-							</statBases>
-							<thingCategories>
-								<li>Grenades</li>
-							</thingCategories>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<label>throw frag grenade</label>
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<range>11</range>
-									<minRange>4</minRange>
-									<warmupTime>1.2</warmupTime>
-									<noiseRadius>4</noiseRadius>
-									<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-									<soundCast>ThrowGrenade</soundCast>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<defaultProjectile>K4G_Proj_WW2GermanServiceGrenade</defaultProjectile>
-									<onlyManualCast>true</onlyManualCast>
-									<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-									<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-								</li>
-							</verbs>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>56</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>1.5</explosiveRadius>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Small>40</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- === German M24 Stielhandgranate Bundle Anti-Tank Grenades === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2GermanServiceAntiTankGrenades"]</xpath>
-					<value>
-						<ThingDef ParentName="BaseEquipment">
-							<defName>K4G_Weapon_WW2GermanServiceAntiTankGrenades</defName>
-							<label>German M24 Stielhandgranate Bundle Anti-Tank Grenades</label>
-							<description>Heavy explosive grenades used during WW2. They can be thrown a short distance and are designed to damage or destroy armored targets.</description>
-							<graphicData>
-								<texPath>Things/Item/Equipment/WeaponRanged/Germany/WW2GermanServiceAntiTankGrenades</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<weaponTags Inherit="False">
-								<li>CE_AI_Grenade</li>
-								<li>CE_OneHandedWeapon</li>
-								<li>GrenadeDestructive</li>
-								<li>K4GWW2GermanyTrading</li>
-								<li>K4GWW2GermanyAntiTankGrenade</li>
-							</weaponTags>
-							<soundInteract>Interact_Grenade</soundInteract>
-							<techLevel>Industrial</techLevel>
-							<stackLimit>25</stackLimit>
-							<statBases>
-								<Mass>1.36</Mass>
-								<Bulk>10</Bulk>
-								<MarketValue>28</MarketValue>
-								<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.0</SightsEfficiency>
-							</statBases>
-							<thingCategories>
-								<li>Grenades</li>
-							</thingCategories>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<label>throw anti-tank grenade</label>
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<range>16</range>
-									<warmupTime>1.2</warmupTime>
-									<noiseRadius>4</noiseRadius>
-									<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-									<soundCast>ThrowGrenade</soundCast>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<defaultProjectile>K4G_Proj_WW2GermanServiceAntiTankGrenade</defaultProjectile>
-									<onlyManualCast>true</onlyManualCast>
-									<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-									<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-								</li>
-							</verbs>
-							<comps>
-								<li Class="CombatExtended.CompProperties_FireModes">
-									<aiUseBurstMode>FALSE</aiUseBurstMode>
-									<aiAimMode>AimedShot</aiAimMode>
-								</li>
-							</comps>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>Body</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>2</power>
-									<cooldownTime>1.75</cooldownTime>
-									<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
-								</li>
-							</tools>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- ===== Italy ===== -->
-
-				<!-- === Italian SRCM Mod.35 Grenades === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2ItalianServiceGrenades"]</xpath>
-					<value>
-						<ThingDef ParentName="BaseGrenadeEquipment">
-							<defName>K4G_Weapon_WW2ItalianServiceGrenades</defName>
-							<label>Italian SRCM Mod.35 Grenades</label>
-							<description>Old-school fragmentation grenades used during WW2. They can be thrown a short distance, where they'll explode, damaging anything and anyone nearby.</description>
-							<graphicData>
-								<texPath>Things/Item/Equipment/WeaponRanged/Italy/WW2ItalianServiceGrenades</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<weaponTags Inherit="False">
-								<li>CE_AI_AOE</li>
-								<li>CE_OneHandedWeapon</li>
-								<li>K4GWW2ItalyTrading</li>
-								<li>K4GWW2ItalyGrenade</li>
-							</weaponTags>
-							<soundInteract>Interact_Grenade</soundInteract>
-							<techLevel>Industrial</techLevel>
-							<statBases>
-								<Mass>0.6</Mass>
-								<Bulk>0.87</Bulk>
-								<MarketValue>11.22</MarketValue>
-								<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.0</SightsEfficiency>
-							</statBases>
-							<thingCategories>
-								<li>Grenades</li>
-							</thingCategories>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<label>throw frag grenade</label>
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<range>11</range>
-									<minRange>4</minRange>
-									<warmupTime>1.2</warmupTime>
-									<noiseRadius>4</noiseRadius>
-									<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-									<soundCast>ThrowGrenade</soundCast>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<defaultProjectile>K4G_Proj_WW2ItalianServiceGrenade</defaultProjectile>
-									<onlyManualCast>true</onlyManualCast>
-									<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-									<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-								</li>
-							</verbs>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>56</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>1.5</explosiveRadius>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Small>30</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- === Italian OTO Mod.35 Grenades === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2ItalianServiceGrenadesB"]</xpath>
-					<value>
-						<ThingDef ParentName="BaseGrenadeEquipment">
-							<defName>K4G_Weapon_WW2ItalianServiceGrenadesB</defName>
-							<label>Italian OTO Mod.35 Grenades</label>
-							<description>Old-school fragmentation grenades used during WW2. They can be thrown a short distance, where they'll explode, damaging anything and anyone nearby.</description>
-							<graphicData>
-								<texPath>Things/Item/Equipment/WeaponRanged/Italy/WW2ItalianServiceGrenadesB</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<weaponTags Inherit="False">
-								<li>CE_AI_AOE</li>
-								<li>CE_OneHandedWeapon</li>
-								<li>K4GWW2ItalyTrading</li>
-								<li>K4GWW2ItalyGrenade</li>
-							</weaponTags>
-							<soundInteract>Interact_Grenade</soundInteract>
-							<techLevel>Industrial</techLevel>
-							<statBases>
-								<Mass>0.6</Mass>
-								<Bulk>0.87</Bulk>
-								<MarketValue>12.22</MarketValue>
-								<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.0</SightsEfficiency>
-							</statBases>
-							<thingCategories>
-								<li>Grenades</li>
-							</thingCategories>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<label>throw frag grenade</label>
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<range>11</range>
-									<minRange>4</minRange>
-									<warmupTime>1.2</warmupTime>
-									<noiseRadius>4</noiseRadius>
-									<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-									<soundCast>ThrowGrenade</soundCast>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<defaultProjectile>K4G_Proj_WW2ItalianServiceGrenadeB</defaultProjectile>
-									<onlyManualCast>true</onlyManualCast>
-									<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-									<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-								</li>
-							</verbs>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>56</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>1.5</explosiveRadius>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Small>35</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- === Italian Breda Mod.35 Grenades === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2ItalianServiceGrenadesC"]</xpath>
-					<value>
-						<ThingDef ParentName="BaseGrenadeEquipment">
-							<defName>K4G_Weapon_WW2ItalianServiceGrenadesC</defName>
-							<label>Italian Breda Mod.35 Grenades</label>
-							<description>Old-school fragmentation grenades used during WW2. They can be thrown a short distance, where they'll explode, damaging anything and anyone nearby.</description>
-							<graphicData>
-								<texPath>Things/Item/Equipment/WeaponRanged/Italy/WW2ItalianServiceGrenadesC</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<weaponTags Inherit="False">
-								<li>CE_AI_AOE</li>
-								<li>CE_OneHandedWeapon</li>
-								<li>K4GWW2ItalyTrading</li>
-								<li>K4GWW2ItalyGrenade</li>
-							</weaponTags>
-							<soundInteract>Interact_Grenade</soundInteract>
-							<techLevel>Industrial</techLevel>
-							<statBases>
-								<Mass>0.6</Mass>
-								<Bulk>0.87</Bulk>
-								<MarketValue>13.22</MarketValue>
-								<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.0</SightsEfficiency>
-							</statBases>
-							<thingCategories>
-								<li>Grenades</li>
-							</thingCategories>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<label>throw frag grenade</label>
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<range>11</range>
-									<minRange>4</minRange>
-									<warmupTime>1.2</warmupTime>
-									<noiseRadius>4</noiseRadius>
-									<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-									<soundCast>ThrowGrenade</soundCast>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<defaultProjectile>K4G_Proj_WW2ItalianServiceGrenadeC</defaultProjectile>
-									<onlyManualCast>true</onlyManualCast>
-									<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-									<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-								</li>
-							</verbs>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>56</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>1.5</explosiveRadius>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Small>40</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- === Italian Type L Anti-Tank Grenades === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2ItalianServiceAntiTankGrenades"]</xpath>
-					<value>
-						<ThingDef ParentName="BaseEquipment">
-							<defName>K4G_Weapon_WW2ItalianServiceAntiTankGrenades</defName>
-							<label>Italian Type L Anti-Tank Grenades</label>
-							<description>Heavy explosive grenades used during WW2. They can be thrown a short distance and are designed to damage or destroy armored targets.</description>
-							<graphicData>
-								<texPath>Things/Item/Equipment/WeaponRanged/Italy/WW2ItalianServiceAntiTankGrenades</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<weaponTags Inherit="False">
-								<li>CE_AI_Grenade</li>
-								<li>CE_OneHandedWeapon</li>
-								<li>GrenadeDestructive</li>
-								<li>K4GWW2ItalyTrading</li>
-								<li>K4GWW2ItalyAntiTankGrenade</li>
-							</weaponTags>
-							<soundInteract>Interact_Grenade</soundInteract>
-							<techLevel>Industrial</techLevel>
-							<stackLimit>25</stackLimit>
-							<statBases>
-								<Mass>1.36</Mass>
-								<Bulk>10</Bulk>
-								<MarketValue>25</MarketValue>
-								<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.0</SightsEfficiency>
-							</statBases>
-							<thingCategories>
-								<li>Grenades</li>
-							</thingCategories>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<label>throw anti-tank grenade</label>
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<range>16</range>
-									<warmupTime>1.2</warmupTime>
-									<noiseRadius>4</noiseRadius>
-									<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-									<soundCast>ThrowGrenade</soundCast>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<defaultProjectile>K4G_Proj_WW2ItalianServiceAntiTankGrenade</defaultProjectile>
-									<onlyManualCast>true</onlyManualCast>
-									<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-									<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-								</li>
-							</verbs>
-							<comps>
-								<li Class="CombatExtended.CompProperties_FireModes">
-									<aiUseBurstMode>FALSE</aiUseBurstMode>
-									<aiAimMode>AimedShot</aiAimMode>
-								</li>
-							</comps>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>Body</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>2</power>
-									<cooldownTime>1.75</cooldownTime>
-									<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
-								</li>
-							</tools>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- ===== Japan ===== -->
-
-				<!-- === Japanese Type 97 Grenades === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2JapaneseServiceGrenades"]</xpath>
-					<value>
-						<ThingDef ParentName="BaseGrenadeEquipment">
-							<defName>K4G_Weapon_WW2JapaneseServiceGrenades</defName>
-							<label>Japanese Type 97 Grenades</label>
-							<description>Old-school fragmentation grenades used during WW2. They can be thrown a short distance, where they'll explode, damaging anything and anyone nearby.</description>
-							<graphicData>
-								<texPath>Things/Item/Equipment/WeaponRanged/Japan/WW2JapaneseServiceGrenades</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<weaponTags Inherit="False">
-								<li>CE_AI_AOE</li>
-								<li>CE_OneHandedWeapon</li>
-								<li>K4GWW2JapanTrading</li>
-								<li>K4GWW2JapanGrenade</li>
-							</weaponTags>
-							<soundInteract>Interact_Grenade</soundInteract>
-							<techLevel>Industrial</techLevel>
-							<statBases>
-								<Mass>0.6</Mass>
-								<Bulk>0.87</Bulk>
-								<MarketValue>12.22</MarketValue>
-								<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.0</SightsEfficiency>
-							</statBases>
-							<thingCategories>
-								<li>Grenades</li>
-							</thingCategories>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<label>throw frag grenade</label>
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<range>11</range>
-									<minRange>4</minRange>
-									<warmupTime>1.2</warmupTime>
-									<noiseRadius>4</noiseRadius>
-									<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-									<soundCast>ThrowGrenade</soundCast>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<defaultProjectile>K4G_Proj_WW2JapaneseServiceGrenade</defaultProjectile>
-									<onlyManualCast>true</onlyManualCast>
-									<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-									<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-								</li>
-							</verbs>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>56</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>1.5</explosiveRadius>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Small>40</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- ===== Russia ===== -->
-
-				<!-- === Russian F1 Grenades === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2RussianServiceGrenades"]</xpath>
-					<value>
-						<ThingDef ParentName="BaseGrenadeEquipment">
-							<defName>K4G_Weapon_WW2RussianServiceGrenades</defName>
-							<label>Russian F1 Grenades</label>
-							<description>Old-school fragmentation grenades used during WW2. They can be thrown a short distance, where they'll explode, damaging anything and anyone nearby.</description>
-							<graphicData>
-								<texPath>Things/Item/Equipment/WeaponRanged/Russia/WW2RussianServiceGrenades</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<weaponTags Inherit="False">
-								<li>CE_AI_AOE</li>
-								<li>CE_OneHandedWeapon</li>
-								<li>K4GWW2RussiaTrading</li>
-								<li>K4GWW2RussiaGrenade</li>
-							</weaponTags>
-							<soundInteract>Interact_Grenade</soundInteract>
-							<techLevel>Industrial</techLevel>
-							<statBases>
-								<Mass>0.6</Mass>
-								<Bulk>0.87</Bulk>
-								<MarketValue>11.22</MarketValue>
-								<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.0</SightsEfficiency>
-							</statBases>
-							<thingCategories>
-								<li>Grenades</li>
-							</thingCategories>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<label>throw frag grenade</label>
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<range>11</range>
-									<minRange>4</minRange>
-									<warmupTime>1.2</warmupTime>
-									<noiseRadius>4</noiseRadius>
-									<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-									<soundCast>ThrowGrenade</soundCast>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<defaultProjectile>K4G_Proj_WW2RussianServiceGrenade</defaultProjectile>
-									<onlyManualCast>true</onlyManualCast>
-									<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-									<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-								</li>
-							</verbs>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>56</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>1.5</explosiveRadius>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Small>30</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- === Russian RG-42 Grenades === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2RussianServiceGrenadesB"]</xpath>
-					<value>
-						<ThingDef ParentName="BaseGrenadeEquipment">
-							<defName>K4G_Weapon_WW2RussianServiceGrenadesB</defName>
-							<label>Russian RG-42 Grenades</label>
-							<description>Old-school fragmentation grenades used during WW2. They can be thrown a short distance, where they'll explode, damaging anything and anyone nearby.</description>
-							<graphicData>
-								<texPath>Things/Item/Equipment/WeaponRanged/Russia/WW2RussianServiceGrenadesB</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<weaponTags Inherit="False">
-								<li>CE_AI_AOE</li>
-								<li>CE_OneHandedWeapon</li>
-								<li>K4GWW2RussiaTrading</li>
-								<li>K4GWW2RussiaGrenade</li>
-							</weaponTags>
-							<soundInteract>Interact_Grenade</soundInteract>
-							<techLevel>Industrial</techLevel>
-							<statBases>
-								<Mass>0.6</Mass>
-								<Bulk>0.87</Bulk>
-								<MarketValue>12.22</MarketValue>
-								<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.0</SightsEfficiency>
-							</statBases>
-							<thingCategories>
-								<li>Grenades</li>
-							</thingCategories>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<label>throw frag grenade</label>
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<range>11</range>
-									<minRange>4</minRange>
-									<warmupTime>1.2</warmupTime>
-									<noiseRadius>4</noiseRadius>
-									<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-									<soundCast>ThrowGrenade</soundCast>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<defaultProjectile>K4G_Proj_WW2RussianServiceGrenadeB</defaultProjectile>
-									<onlyManualCast>true</onlyManualCast>
-									<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-									<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-								</li>
-							</verbs>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>56</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>1.5</explosiveRadius>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Small>35</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- === Russian RGD-33 Grenades === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2RussianServiceGrenadesC"]</xpath>
-					<value>
-						<ThingDef ParentName="BaseGrenadeEquipment">
-							<defName>K4G_Weapon_WW2RussianServiceGrenadesC</defName>
-							<label>Russian RGD-33 Grenades</label>
-							<description>Old-school fragmentation grenades used during WW2. They can be thrown a short distance, where they'll explode, damaging anything and anyone nearby.</description>
-							<graphicData>
-								<texPath>Things/Item/Equipment/WeaponRanged/Russia/WW2RussianServiceGrenadesC</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<weaponTags Inherit="False">
-								<li>CE_AI_AOE</li>
-								<li>CE_OneHandedWeapon</li>
-								<li>K4GWW2RussiaTrading</li>
-								<li>K4GWW2RussiaGrenade</li>
-							</weaponTags>
-							<soundInteract>Interact_Grenade</soundInteract>
-							<techLevel>Industrial</techLevel>
-							<statBases>
-								<Mass>0.6</Mass>
-								<Bulk>0.87</Bulk>
-								<MarketValue>13.22</MarketValue>
-								<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.0</SightsEfficiency>
-							</statBases>
-							<thingCategories>
-								<li>Grenades</li>
-							</thingCategories>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<label>throw frag grenade</label>
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<range>11</range>
-									<minRange>4</minRange>
-									<warmupTime>1.2</warmupTime>
-									<noiseRadius>4</noiseRadius>
-									<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-									<soundCast>ThrowGrenade</soundCast>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<defaultProjectile>K4G_Proj_WW2RussianServiceGrenadeC</defaultProjectile>
-									<onlyManualCast>true</onlyManualCast>
-									<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-									<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-								</li>
-							</verbs>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>56</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>1.5</explosiveRadius>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Small>40</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- === Russian RPG-40 Anti-Tank Grenades === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2RussianServiceAntiTankGrenades"]</xpath>
-					<value>
-						<ThingDef ParentName="BaseEquipment">
-							<defName>K4G_Weapon_WW2RussianServiceAntiTankGrenades</defName>
-							<label>Russian RPG-40 Anti-Tank Grenades</label>
-							<description>Heavy explosive grenades used during WW2. They can be thrown a short distance and are designed to damage or destroy armored targets.</description>
-							<graphicData>
-								<texPath>Things/Item/Equipment/WeaponRanged/Russia/WW2RussianServiceAntiTankGrenades</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<weaponTags Inherit="False">
-								<li>CE_AI_Grenade</li>
-								<li>CE_OneHandedWeapon</li>
-								<li>GrenadeDestructive</li>
-								<li>K4GWW2RussiaTrading</li>
-								<li>K4GWW2RussiaAntiTankGrenade</li>
-							</weaponTags>
-							<soundInteract>Interact_Grenade</soundInteract>
-							<techLevel>Industrial</techLevel>
-							<stackLimit>25</stackLimit>
-							<statBases>
-								<Mass>1.36</Mass>
-								<Bulk>10</Bulk>
-								<MarketValue>25</MarketValue>
-								<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.0</SightsEfficiency>
-							</statBases>
-							<thingCategories>
-								<li>Grenades</li>
-							</thingCategories>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<label>throw anti-tank grenade</label>
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<range>16</range>
-									<warmupTime>1.2</warmupTime>
-									<noiseRadius>4</noiseRadius>
-									<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-									<soundCast>ThrowGrenade</soundCast>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<defaultProjectile>K4G_Proj_WW2RussianServiceAntiTankGrenade</defaultProjectile>
-									<onlyManualCast>true</onlyManualCast>
-									<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-									<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-								</li>
-							</verbs>
-							<comps>
-								<li Class="CombatExtended.CompProperties_FireModes">
-									<aiUseBurstMode>FALSE</aiUseBurstMode>
-									<aiAimMode>AimedShot</aiAimMode>
-								</li>
-							</comps>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>Body</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>2</power>
-									<cooldownTime>1.75</cooldownTime>
-									<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
-								</li>
-							</tools>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- === Russian RPG-43 Anti-Tank Grenades === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2RussianServiceAntiTankGrenadesB"]</xpath>
-					<value>
-						<ThingDef ParentName="BaseEquipment">
-							<defName>K4G_Weapon_WW2RussianServiceAntiTankGrenadesB</defName>
-							<label>Russian RPG-43 Anti-Tank Grenades</label>
-							<description>Heavy explosive grenades used during WW2. They can be thrown a short distance and are designed to damage or destroy armored targets.</description>
-							<graphicData>
-								<texPath>Things/Item/Equipment/WeaponRanged/Russia/WW2RussianServiceAntiTankGrenadesB</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<weaponTags Inherit="False">
-								<li>CE_AI_Grenade</li>
-								<li>CE_OneHandedWeapon</li>
-								<li>GrenadeDestructive</li>
-								<li>K4GWW2RussiaTrading</li>
-								<li>K4GWW2RussiaAntiTankGrenade</li>
-							</weaponTags>
-							<soundInteract>Interact_Grenade</soundInteract>
-							<techLevel>Industrial</techLevel>
-							<stackLimit>25</stackLimit>
-							<statBases>
-								<Mass>1.36</Mass>
-								<Bulk>10</Bulk>
-								<MarketValue>27</MarketValue>
-								<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.0</SightsEfficiency>
-							</statBases>
-							<thingCategories>
-								<li>Grenades</li>
-							</thingCategories>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<label>throw anti-tank grenade</label>
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<range>16</range>
-									<warmupTime>1.2</warmupTime>
-									<noiseRadius>4</noiseRadius>
-									<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-									<soundCast>ThrowGrenade</soundCast>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<defaultProjectile>K4G_Proj_WW2RussianServiceAntiTankGrenadeB</defaultProjectile>
-									<onlyManualCast>true</onlyManualCast>
-									<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-									<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-								</li>
-							</verbs>
-							<comps>
-								<li Class="CombatExtended.CompProperties_FireModes">
-									<aiUseBurstMode>FALSE</aiUseBurstMode>
-									<aiAimMode>AimedShot</aiAimMode>
-								</li>
-							</comps>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>Body</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>2</power>
-									<cooldownTime>1.75</cooldownTime>
-									<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
-								</li>
-							</tools>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- === Russian RPG-6 Anti-Tank Grenades === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2RussianServiceAntiTankGrenadesC"]</xpath>
-					<value>
-						<ThingDef ParentName="BaseEquipment">
-							<defName>K4G_Weapon_WW2RussianServiceAntiTankGrenadesC</defName>
-							<label>Russian RPG-6 Anti-Tank Grenades</label>
-							<description>Heavy explosive grenades used during WW2. They can be thrown a short distance and are designed to damage or destroy armored targets.</description>
-							<graphicData>
-								<texPath>Things/Item/Equipment/WeaponRanged/Russia/WW2RussianServiceAntiTankGrenadesC</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<weaponTags Inherit="False">
-								<li>CE_AI_Grenade</li>
-								<li>CE_OneHandedWeapon</li>
-								<li>GrenadeDestructive</li>
-								<li>K4GWW2RussiaTrading</li>
-								<li>K4GWW2RussiaAntiTankGrenade</li>
-							</weaponTags>
-							<soundInteract>Interact_Grenade</soundInteract>
-							<techLevel>Industrial</techLevel>
-							<stackLimit>25</stackLimit>
-							<statBases>
-								<Mass>1.36</Mass>
-								<Bulk>10</Bulk>
-								<MarketValue>28</MarketValue>
-								<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.0</SightsEfficiency>
-							</statBases>
-							<thingCategories>
-								<li>Grenades</li>
-							</thingCategories>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<label>throw anti-tank grenade</label>
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<range>16</range>
-									<warmupTime>1.2</warmupTime>
-									<noiseRadius>4</noiseRadius>
-									<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-									<soundCast>ThrowGrenade</soundCast>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<defaultProjectile>K4G_Proj_WW2RussianServiceAntiTankGrenadeC</defaultProjectile>
-									<onlyManualCast>true</onlyManualCast>
-									<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-									<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-								</li>
-							</verbs>
-							<comps>
-								<li Class="CombatExtended.CompProperties_FireModes">
-									<aiUseBurstMode>FALSE</aiUseBurstMode>
-									<aiAimMode>AimedShot</aiAimMode>
-								</li>
-							</comps>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>Body</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>2</power>
-									<cooldownTime>1.75</cooldownTime>
-									<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
-								</li>
-							</tools>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- ===== United States ===== -->
-
-				<!-- === American Mk II Grenades === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="K4G_Weapon_WW2AmericanServiceGrenades"]</xpath>
-					<value>
-						<ThingDef ParentName="BaseGrenadeEquipment">
-							<defName>K4G_Weapon_WW2AmericanServiceGrenades</defName>
-							<label>American Mk II Grenades</label>
-							<description>Old-school fragmentation grenades used during WW2. They can be thrown a short distance, where they'll explode, damaging anything and anyone nearby.</description>
-							<graphicData>
-								<texPath>Things/Item/Equipment/WeaponRanged/UnitedStates/WW2AmericanServiceGrenades</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<weaponTags Inherit="False">
-								<li>CE_AI_AOE</li>
-								<li>CE_OneHandedWeapon</li>
-								<li>K4GWW2UnitedStatesTrading</li>
-								<li>K4GWW2UnitedStatesGrenade</li>
-							</weaponTags>
-							<soundInteract>Interact_Grenade</soundInteract>
-							<techLevel>Industrial</techLevel>
-							<statBases>
-								<Mass>0.6</Mass>
-								<Bulk>0.87</Bulk>
-								<MarketValue>12.22</MarketValue>
-								<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.0</SightsEfficiency>
-							</statBases>
-							<thingCategories>
-								<li>Grenades</li>
-							</thingCategories>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<label>throw frag grenade</label>
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<range>11</range>
-									<minRange>4</minRange>
-									<warmupTime>1.2</warmupTime>
-									<noiseRadius>4</noiseRadius>
-									<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-									<soundCast>ThrowGrenade</soundCast>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<defaultProjectile>K4G_Proj_WW2AmericanServiceGrenade</defaultProjectile>
-									<onlyManualCast>true</onlyManualCast>
-									<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-									<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-								</li>
-							</verbs>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>56</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>1.5</explosiveRadius>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Small>40</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Rimworld War 2/ThingDefs_Misc/WW2_Melee.xml b/Patches/K4G Rimworld War 2/ThingDefs_Misc/WW2_Melee.xml
deleted file mode 100644
index bf09a20e01..0000000000
--- a/Patches/K4G Rimworld War 2/ThingDefs_Misc/WW2_Melee.xml	
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] RimWorld War 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= Bayonet (Identical to Vanilla Knife) ======= -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WW2ServiceBayonet"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<chanceFactor>0.33</chanceFactor>
-								<cooldownTime>1.26</cooldownTime>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.18</cooldownTime>
-								<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.32</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.42</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="WW2ServiceBayonet"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="WW2ServiceBayonet"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.5</MeleeCritChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-							<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="WW2ServiceBayonet"]</xpath>
-					<value>
-						<weaponTags>
-							<li>CE_Sidearm_Melee</li>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<!-- ===== Japanese Shin Gunto Service Sword ===== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="WW2ServiceSword"]/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.05</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.46</cooldownTime>
-								<chanceFactor>0.50</chanceFactor>
-								<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.20</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.39</cooldownTime>
-								<chanceFactor>0.45</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.48</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="WW2ServiceSword"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="WW2ServiceSword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.63</MeleeCritChance>
-							<MeleeParryChance>0.75</MeleeParryChance>
-							<MeleeDodgeChance>0.40</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="WW2ServiceSword"]</xpath>
-					<value>
-						<weaponTags>
-							<li>CE_Sidearm_Melee</li>
-						</weaponTags>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/K4G Rimworld War 2/TraderKinds_Defs/TraderKinds_Defs.xml b/Patches/K4G Rimworld War 2/TraderKinds_Defs/TraderKinds_Defs.xml
deleted file mode 100644
index 94c9a32aae..0000000000
--- a/Patches/K4G Rimworld War 2/TraderKinds_Defs/TraderKinds_Defs.xml	
+++ /dev/null
@@ -1,250 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[K4G] RimWorld War 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= Remove Vanilla Mortar Shells. =======-->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/TraderKindDef[@Name="WW2BaseTrader"]/stockGenerators/li[thingDef="Shell_HighExplosive"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/TraderKindDef[@Name="WW2BaseTrader"]/stockGenerators/li[thingDef="Shell_Incendiary"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/TraderKindDef[@Name="WW2BaseTrader"]/stockGenerators/li[thingDef="Shell_Smoke"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/TraderKindDef[@Name="WW2CaravanTrader"]/stockGenerators/li[thingDef="Shell_HighExplosive"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/TraderKindDef[@Name="WW2CaravanTrader"]/stockGenerators/li[thingDef="Shell_Incendiary"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/TraderKindDef[@Name="WW2CaravanTrader"]/stockGenerators/li[thingDef="Shell_Smoke"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/TraderKindDef[@Name="WW2VisitorTrader"]/stockGenerators/li[thingDef="Shell_HighExplosive"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/TraderKindDef[@Name="WW2VisitorTrader"]/stockGenerators/li[thingDef="Shell_Incendiary"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/TraderKindDef[@Name="WW2VisitorTrader"]/stockGenerators/li[thingDef="Shell_Smoke"]</xpath>
-				</li>
-
-				<!-- ======= Trader Base =======-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[@Name="WW2BaseTrader"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>FSX</thingDef>
-							<countRange>
-								<min>15</min>
-								<max>40</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>Prometheum</thingDef>
-							<countRange>
-								<min>15</min>
-								<max>40</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Ammo</tradeTag>
-							<countRange>
-								<min>400</min>
-								<max>1000</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>3</min>
-								<max>8</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_MediumAmmo</tradeTag>
-							<countRange>
-								<min>400</min>
-								<max>1000</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>3</min>
-								<max>8</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_HeavyAmmo</tradeTag>
-							<countRange>
-								<min>10</min>
-								<max>50</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>2</min>
-								<max>5</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Category">
-							<categoryDef>Ammo</categoryDef>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>0</max>
-							</thingDefCountRange>
-						</li>
-					</value>
-				</li>
-
-				<!-- ======= Trader Caravan Base =======-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[@Name="WW2CaravanTrader"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>FSX</thingDef>
-							<countRange>
-								<min>15</min>
-								<max>40</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>Prometheum</thingDef>
-							<countRange>
-								<min>15</min>
-								<max>40</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Ammo</tradeTag>
-							<countRange>
-								<min>400</min>
-								<max>1000</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>3</min>
-								<max>8</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_MediumAmmo</tradeTag>
-							<countRange>
-								<min>10</min>
-								<max>50</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>2</min>
-								<max>4</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_HeavyAmmo</tradeTag>
-							<countRange>
-								<min>5</min>
-								<max>30</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>2</min>
-								<max>6</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Category">
-							<categoryDef>Ammo</categoryDef>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>0</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Turret</tradeTag>
-							<thingDefCountRange>
-								<min>-4</min>
-								<max>2</max>
-							</thingDefCountRange>
-							<countRange>
-								<min>1</min>
-								<max>1</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_Category">
-							<categoryDef>WeaponsTurrets</categoryDef>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>0</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Animals">
-							<tradeTagsSell>
-								<li>CE_AnimalBoom</li>
-							</tradeTagsSell>
-							<tradeTagsBuy>
-								<li>CE_AnimalBoom</li>
-							</tradeTagsBuy>
-							<kindCountRange>
-								<min>0</min>
-								<max>1</max>
-							</kindCountRange>
-							<countRange>
-								<min>-1</min>
-								<max>2</max>
-							</countRange>
-						</li>
-					</value>
-				</li>
-
-				<!-- ======= Trader Visitor Base =======-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[@Name="WW2VisitorTrader"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>FSX</thingDef>
-							<countRange>
-								<min>0</min>
-								<max>15</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>Prometheum</thingDef>
-							<countRange>
-								<min>0</min>
-								<max>15</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Ammo</tradeTag>
-							<countRange>
-								<min>100</min>
-								<max>250</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>4</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Category">
-							<categoryDef>Ammo</categoryDef>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>0</max>
-							</thingDefCountRange>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/KV Hand n Footwear/HnF_Apparel_Footwear.xml b/Patches/KV Hand n Footwear/HnF_Apparel_Footwear.xml
deleted file mode 100644
index 251cc6d24c..0000000000
--- a/Patches/KV Hand n Footwear/HnF_Apparel_Footwear.xml	
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[KV] Hand 'n' Footwear</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== All footwear ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="FootArmorMakeableBase"]/apparel/layers</xpath>
-					<value>
-						<layers>
-							<li>Shell</li>
-						</layers>
-					</value>
-				</li>
-
-				<!-- ========== Tribal Boots ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_TribalBoots"]/statBases</xpath>
-					<value>
-						<Bulk>1.5</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_TribalBoots"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Cowboy Boots ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_CowboyBoots"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_CowboyBoots"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Plated Boots ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_CombatBoots"]/statBases</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-						<Bulk>3</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Apparel_CombatBoots"]/equippedStatOffsets</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_CombatBoots"]/statBases/Mass</xpath>
-					<value>
-						<Mass>3</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_CombatBoots"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.35</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_CombatBoots"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.125</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ========== Power Boots ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_PowerBoots"]/statBases/Mass</xpath>
-					<value>
-						<Mass>3</Mass>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_PowerBoots"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_PowerBoots"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>40.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_PowerBoots"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>6</CarryWeight>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/KV Hand n Footwear/HnF_Apparel_Handwear.xml b/Patches/KV Hand n Footwear/HnF_Apparel_Handwear.xml
deleted file mode 100644
index cc8c4edff0..0000000000
--- a/Patches/KV Hand n Footwear/HnF_Apparel_Handwear.xml	
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[KV] Hand 'n' Footwear</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== All handwear ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "Apparel_Gloves" or
-						defName = "Apparel_DexterousGloves" or
-						defName = "Apparel_PlatedGloves" or
-						defName = "Apparel_PowerGloves"
-						]/apparel/layers/li
-					</xpath>
-					<value>
-						<li>Shell</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Gloves"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_DexterousGloves"]/statBases</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Dexterous Gloves ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_DexterousGloves"]/equippedStatOffsets</xpath>
-					<value>
-						<ReloadSpeed>0.1</ReloadSpeed>
-					</value>
-				</li>
-
-				<!-- ========== Plated Gloves ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_PlatedGloves"]/statBases</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-						<Bulk>3</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Apparel_PlatedGloves"]/equippedStatOffsets</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_PlatedGloves"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.35</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_PlatedGloves"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.125</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ========== Power Gloves ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_PowerGloves"]/statBases/Mass</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-						<Mass>3</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_PowerGloves"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_PowerGloves"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>40.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kaiser Armory/105x155mmR.xml b/Patches/Kaiser Armory/105x155mmR.xml
deleted file mode 100644
index c77276ab4f..0000000000
--- a/Patches/Kaiser Armory/105x155mmR.xml	
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Kaiser Armory</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>Ammo105x155mmRCannonShells</defName>
-					<label>105x155mmR cannon shell</label>
-					<parent>AmmoShells</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberCannon</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_105x155mmRCannonShell</defName>
-					<label>105x155mmR howitzer shells</label>
-					<ammoTypes>
-						<Ammo_105x155mmRCannonShell_HE>Bullet_105x155mmRCannonShell_HE</Ammo_105x155mmRCannonShell_HE>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="105x155mmRCannonShellBase" ParentName="HeavyAmmoBase" Abstract="True">
-					<description>Light howitzer shell used in field guns.</description>
-					<thingCategories>
-						<li>Ammo105x155mmRCannonShells</li>
-					</thingCategories>
-					<stackLimit>25</stackLimit>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-					</tradeTags>
-					<statBases>
-						<MaxHitPoints>150</MaxHitPoints>
-						<Mass>14.81</Mass>
-						<Bulk>10.40</Bulk>
-					</statBases>
-					<cookOffFlashScale>20</cookOffFlashScale>
-					<cookOffSound>MortarBomb_Explode</cookOffSound>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="105x155mmRCannonShellBase">
-					<defName>Ammo_105x155mmRCannonShell_HE</defName>
-					<label>105x155mmR Cannon shell (HE)</label>
-					<graphicData>
-						<texPath>Turret/leFH_16/Projectile/Shell_HE</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-						<drawSize>1.30</drawSize>
-					</graphicData>
-					<statBases>
-						<MarketValue>96.36</MarketValue>
-					</statBases>
-					<ammoClass>GrenadeHE</ammoClass>
-					<detonateProjectile>Bullet_105x155mmRCannonShell_HE</detonateProjectile>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef Name="Base105x155mmRCannonShell" ParentName="BaseExplosiveBullet" Abstract="true">
-					<graphicData>
-						<shaderType>TransparentPostLight</shaderType>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>0</speed>
-						<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-						<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
-						<soundAmbient>MortarRound_Ambient</soundAmbient>
-						<flyOverhead>true</flyOverhead>
-						<dropsCasings>true</dropsCasings>
-						<casingMoteDefname>Fleck_BigShell</casingMoteDefname>
-						<casingFilthDefname>Filth_CannonAmmoCasings</casingFilthDefname>
-						<gravityFactor>5</gravityFactor>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base105x155mmRCannonShell">
-					<defName>Bullet_105x155mmRCannonShell_HE</defName>
-					<label>105x155mmR Cannon shell (HE)</label>
-					<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					<graphicData>
-						<texPath>Turret/leFH_16/Projectile/Bullet_10,5cm_HE</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-						<shaderType>TransparentPostLight</shaderType>
-						<drawSize>0.80</drawSize>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bomb</damageDef>
-						<damageAmountBase>190</damageAmountBase>
-						<explosionRadius>3.5</explosionRadius>
-						<soundExplode>MortarBomb_Explode</soundExplode>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>15</Fragment_Large>
-								<Fragment_Small>50</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_105x155mmRCannonShell_HE</defName>
-					<label>make 105x155mmR HE cannon shells x5</label>
-					<description>Craft 5 105x155mmR HE cannon shells.</description>
-					<jobString>Making 105x155mmR HE cannon shells.</jobString>
-					<workAmount>9000</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>70</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_105x155mmRCannonShell_HE>5</Ammo_105x155mmRCannonShell_HE>
-					</products>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kaiser Armory/77x230mmR.xml b/Patches/Kaiser Armory/77x230mmR.xml
deleted file mode 100644
index 733902f34a..0000000000
--- a/Patches/Kaiser Armory/77x230mmR.xml	
+++ /dev/null
@@ -1,234 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Kaiser Armory</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>Ammo77x230mmRCannonShells</defName>
-					<label>77x230mmR cannon shell</label>
-					<parent>AmmoShells</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberCannon</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_77x230mmRCannonShell</defName>
-					<label>77x230mmR Cannon shells</label>
-					<ammoTypes>
-						<Ammo_77x230mmRCannonShell_HE>Bullet_77x230mmRCannonShell_HE</Ammo_77x230mmRCannonShell_HE>
-						<Ammo_77x230mmRCannonShell_EMP>Bullet_77x230mmRCannonShell_EMP</Ammo_77x230mmRCannonShell_EMP>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="77x230mmRCannonShellBase" ParentName="HeavyAmmoBase" Abstract="True">
-					<description>Light shell used in field guns.</description>
-					<thingCategories>
-						<li>Ammo77x230mmRCannonShells</li>
-					</thingCategories>
-					<stackLimit>25</stackLimit>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-					</tradeTags>
-					<statBases>
-						<MaxHitPoints>150</MaxHitPoints>
-						<Mass>6.85</Mass>
-						<Bulk>9.32</Bulk>
-					</statBases>
-					<cookOffFlashScale>20</cookOffFlashScale>
-					<cookOffSound>MortarBomb_Explode</cookOffSound>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="77x230mmRCannonShellBase">
-					<defName>Ammo_77x230mmRCannonShell_HE</defName>
-					<label>77x230mmR Cannon shell (HE)</label>
-					<graphicData>
-						<texPath>Turret/FK_96/Projectile/Shell_HE</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-						<drawSize>1.60</drawSize>
-					</graphicData>
-					<statBases>
-						<MarketValue>41.3</MarketValue>
-					</statBases>
-					<ammoClass>GrenadeHE</ammoClass>
-					<detonateProjectile>Bullet_77x230mmRCannonShell_HE</detonateProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="77x230mmRCannonShellBase">
-					<defName>Ammo_77x230mmRCannonShell_EMP</defName>
-					<label>77x230mmR Cannon shell (EMP)</label>
-					<graphicData>
-						<texPath>Turret/FK_96/Projectile/Shell_AP</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-						<drawSize>1.60</drawSize>
-					</graphicData>
-					<statBases>
-						<MarketValue>60.27</MarketValue>
-					</statBases>
-					<ammoClass>GrenadeEMP</ammoClass>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>99</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>2</explosiveRadius>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>22</Fragment_Large>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef Name="Base77x230mmRCannonShell" ParentName="BaseExplosiveBullet" Abstract="true">
-					<graphicData>
-						<shaderType>TransparentPostLight</shaderType>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>101</speed>
-						<soundExplode>MortarBomb_Explode</soundExplode>
-						<flyOverhead>false</flyOverhead>
-						<dropsCasings>true</dropsCasings>
-						<casingMoteDefname>Fleck_BigShell</casingMoteDefname>
-						<casingFilthDefname>Filth_CannonAmmoCasings</casingFilthDefname>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base77x230mmRCannonShell">
-					<defName>Bullet_77x230mmRCannonShell_HE</defName>
-					<label>77x230mmR Cannon shell (HE)</label>
-					<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					<graphicData>
-						<texPath>Turret/FK_96/Projectile/Bullet_7,7cm_HE</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bomb</damageDef>
-						<damageAmountBase>57</damageAmountBase>
-						<explosionRadius>1.5</explosionRadius>
-						<soundExplode>MortarBomb_Explode</soundExplode>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>20</Fragment_Large>
-								<Fragment_Small>19</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<ThingDef ParentName="Base77x230mmRCannonShell">
-					<defName>Bullet_77x230mmRCannonShell_EMP</defName>
-					<label>77x230mmR Cannon shell (EMP)</label>
-					<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					<graphicData>
-						<texPath>Turret/FK_96/Projectile/Bullet_7,7cm_AP</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>EMP</damageDef>
-						<damageAmountBase>99</damageAmountBase>
-						<explosionRadius>3</explosionRadius>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_77x230mmRCannonShell_HE</defName>
-					<label>make 77x230mmR HE cannon shells x5</label>
-					<description>Craft 5 77x230mmR HE cannon shells.</description>
-					<jobString>Making 77x230mmR HE cannon shells.</jobString>
-					<workAmount>9000</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>70</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_77x230mmRCannonShell_HE>5</Ammo_77x230mmRCannonShell_HE>
-					</products>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_77x230mmRCannonShell_EMP</defName>
-					<label>make 77x230mmR EMP cannon shells x5</label>
-					<description>Craft 5 77x230mmR EMP cannon shells.</description>
-					<jobString>Making 77x230mmR EMP cannon shells.</jobString>
-					<workAmount>10000</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>70</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>5</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_77x230mmRCannonShell_EMP>5</Ammo_77x230mmRCannonShell_EMP>
-					</products>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kaiser Armory/KaiserArmory_GrenadeRecipe.xml b/Patches/Kaiser Armory/KaiserArmory_GrenadeRecipe.xml
deleted file mode 100644
index 61e09f2d8a..0000000000
--- a/Patches/Kaiser Armory/KaiserArmory_GrenadeRecipe.xml	
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Kaiser Armory</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>MakeM1915Grenade</defName>
-							<label>make M1915 grenades x10</label>
-							<description>Craft 10 M1915 grenades.</description>
-							<jobString>Making M1915 grenades.</jobString>
-							<workAmount>3400</workAmount>
-							<recipeUsers Inherit="False">
-								<li>TableKA</li>
-							</recipeUsers>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>6</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>6</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>WoodLog</li>
-									<li>FSX</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Weapon_M1915_KA>10</Weapon_M1915_KA>
-							</products>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kaiser Armory/KaiserArmory_Guns.xml b/Patches/Kaiser Armory/KaiserArmory_Guns.xml
deleted file mode 100644
index 7c829c7abd..0000000000
--- a/Patches/Kaiser Armory/KaiserArmory_Guns.xml	
+++ /dev/null
@@ -1,695 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Kaiser Armory</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Tools ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_C96_KA" or defName="Gun_P08_KA"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_MP_18_KA" or
-						defName="Gun_Gew_98_KA" or
-						defName="Gun_P08_Artillerie_KA" or
-						defName="Gun_MG_15_KA" or
-						defName="Gun_M1916_Selbstlader_KA"]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_WEX_KA"]/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>
-				</li>
-
-				<!-- ========== MP 18 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MP_18_KA</defName>
-					<statBases>
-						<Mass>4.18</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.25</SwayFactor>
-						<Bulk>8.32</Bulk>
-						<WorkToMake>18000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>70</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-						<WoodLog>10</WoodLog>
-					</costList>
-					<Properties>
-						<recoilAmount>1.13</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<soundCast>Shot_MP_18</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>4</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<researchPrerequisite>Stage2b_KA</researchPrerequisite>
-				</li>
-
-				<!-- ========== Gew 98 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Gew_98_KA</defName>
-					<statBases>
-						<Mass>4.10</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1.66</SwayFactor>
-						<Bulk>12.50</Bulk>
-						<WorkToMake>12000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>50</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-						<WoodLog>20</WoodLog>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_Gew_98</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<researchPrerequisite>Stage0b_KA</researchPrerequisite>
-				</li>
-
-				<!-- ========== Gew 98 with Bayonet ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Gew_98_Bayonet_KA</defName>
-					<statBases>
-						<Mass>4.40</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>2.06</SwayFactor>
-						<Bulk>16.50</Bulk>
-						<WorkToMake>500</WorkToMake>
-					</statBases>
-					<costList>
-						<Gun_Gew_98_KA>1</Gun_Gew_98_KA>
-						<MeleeWeapon_S98_05_KA>1</MeleeWeapon_S98_05_KA>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_Gew_98</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-					<researchPrerequisite>Stage0b_KA</researchPrerequisite>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Gew_98_Bayonet_KA"]/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>bayonet</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>2.14</cooldownTime>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.17</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>bayonet</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.49</cooldownTime>
-								<armorPenetrationBlunt>2.16</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.44</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Mauser 1916 Selbstlader ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_M1916_Selbstlader_KA</defName>
-					<statBases>
-						<Mass>4.90</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.64</SwayFactor>
-						<Bulk>11.50</Bulk>
-						<WorkToMake>20000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>80</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-						<WoodLog>20</WoodLog>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_Gew_98</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<researchPrerequisite>Stage2b_KA</researchPrerequisite>
-				</li>
-
-				<!-- ========== Mauser C96 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_C96_KA</defName>
-					<statBases>
-						<Mass>1.13</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.42</SwayFactor>
-						<Bulk>3.12</Bulk>
-						<WorkToMake>8000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-						<WoodLog>5</WoodLog>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_763x25mmMauser_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_C96</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_763x25mmMauser</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<researchPrerequisite>Stage0b_KA</researchPrerequisite>
-				</li>
-
-				<!-- ========== WEX (Flamethrower) ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_WEX_KA</defName>
-					<statBases>
-						<Mass>24</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.35</SwayFactor>
-						<Bulk>24</Bulk>
-						<WorkToMake>14000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>120</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>0.85</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<defaultProjectile>Bullet_Flamethrower_Prometheum</defaultProjectile>
-						<hasStandardCommand>true</hasStandardCommand>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<warmupTime>1.1</warmupTime>
-						<range>11</range>
-						<minRange>3</minRange>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<soundCast>Shot_WEX</soundCast>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<muzzleFlashScale>0</muzzleFlashScale>
-						<burstShotCount>20</burstShotCount>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>80</magazineSize>
-						<reloadTime>10</reloadTime>
-						<ammoSet>AmmoSet_Flamethrower</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>true</aiUseBurstMode>
-						<aimedBurstShotCount>10</aimedBurstShotCount>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>GunHeavy</li>
-					</weaponTags>
-					<researchPrerequisite>Stage1b_KA</researchPrerequisite>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Gun_WEX_KA"]/equippedStatOffsets</xpath>
-				</li>
-
-				<!-- ========== P08 (Luger) ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_P08_KA</defName>
-					<statBases>
-						<Mass>0.87</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.03</SwayFactor>
-						<Bulk>2.22</Bulk>
-						<WorkToMake>14000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_P08</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<researchPrerequisite>Stage1b_KA</researchPrerequisite>
-				</li>
-
-				<!-- ========== P08 (Artillery Luger) ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_P08_Artillerie_KA</defName>
-					<statBases>
-						<Mass>2.20</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>0.97</SwayFactor>
-						<Bulk>7.50</Bulk>
-						<WorkToMake>16000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>50</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-						<WoodLog>5</WoodLog>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_P08</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4.8</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<researchPrerequisite>Stage1b_KA</researchPrerequisite>
-				</li>
-
-				<!-- ========== MG 15 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MG_15_KA</defName>
-					<statBases>
-						<Mass>11.80</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.62</SwayFactor>
-						<Bulk>12.40</Bulk>
-						<WorkToMake>22000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>140</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-						<WoodLog>5</WoodLog>
-					</costList>
-					<Properties>
-						<recoilAmount>1.20</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>62</range>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>Shot_MG_15</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>75</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<researchPrerequisite>Stage2b_KA</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Gun_MG_15_KA"]/equippedStatOffsets</xpath>
-				</li>
-
-				<!-- ========== M1914 Concussion Grenade ========== -->
-
-				<!-- Projectile -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Proj_M1915_KA"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Proj_M1915_KA"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>2</explosionRadius>
-							<damageDef>Bomb</damageDef>
-							<damageAmountBase>60</damageAmountBase>
-							<explosionDelay>100</explosionDelay>
-							<dropsCasings>true</dropsCasings>
-							<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-							<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							<speed>12</speed>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Proj_M1915_KA"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Proj_M1915_KA"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<!-- M1915 Concussion Grenade -->
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="Weapon_M1915_KA"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>BaseWeapon</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Weapon_M1915_KA"]/recipeMaker</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Weapon_M1915_KA"]/costList</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Weapon_M1915_KA"]/label</xpath>
-					<value>
-						<label>M1915 concussion grenade</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Weapon_M1915_KA"]</xpath>
-					<value>
-						<equippedAngleOffset>90</equippedAngleOffset>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Weapon_M1915_KA"]</xpath>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<stackLimit>75</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="Weapon_M1915_KA"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Weapon_M1915_KA"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Weapon_M1915_KA"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Weapon_M1915_KA"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>60</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>2</explosiveRadius>
-						</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Weapon_M1915_KA</defName>
-					<statBases>
-						<Mass>0.82</Mass>
-						<Bulk>0.36</Bulk>
-						<MarketValue>12.22</MarketValue>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<label>throw concussion grenade</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<range>13.0</range>
-						<minRange>2</minRange>
-						<warmupTime>0.8</warmupTime>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<soundCast>ThrowGrenade</soundCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<defaultProjectile>Proj_M1915_KA</defaultProjectile>
-						<onlyManualCast>true</onlyManualCast>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<weaponTags>
-						<li>CE_AI_Grenade</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kaiser Armory/KaiserArmory_Melee.xml b/Patches/Kaiser Armory/KaiserArmory_Melee.xml
deleted file mode 100644
index 498bc5a73c..0000000000
--- a/Patches/Kaiser Armory/KaiserArmory_Melee.xml	
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Kaiser Armory</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Shovel === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="Feldspaten_KA"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<MeleeCounterParryBonus>0.40</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="Feldspaten_KA"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>0.40</MeleeParryChance>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Feldspaten_KA"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.28</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Bayonet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_S98_05_KA"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<MeleeCounterParryBonus>0.30</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_S98_05_KA"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.10</MeleeCritChance>
-						<MeleeParryChance>0.30</MeleeParryChance>
-						<MeleeDodgeChance>0.010</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_S98_05_KA"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_S98_05_KA"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1</cooldownTime>
-								<armorPenetrationBlunt>0.56</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.72</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1</cooldownTime>
-								<chanceFactor>1.88</chanceFactor>
-								<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.76</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Saber === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Sabel"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Sabel"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>0.35</MeleeParryChance>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Sabel"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Sabel"]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kaiser Armory/KaiserArmory_Turrets.xml b/Patches/Kaiser Armory/KaiserArmory_Turrets.xml
deleted file mode 100644
index 1465680d78..0000000000
--- a/Patches/Kaiser Armory/KaiserArmory_Turrets.xml	
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Kaiser Armory</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Common to all Turrets ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						@Name="Base_FK_96_KA" or
-						@Name="Base_leFH_16_KA" or
-						defName="Turret_MG_08_KA"
-						]/thingClass </xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<!-- ========== Remove Vanilla Ammo Shells ========== -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Shell_77cm_AP_KA"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Shell_77cm_HE_KA"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Shell_105cm_HE_KA"]</xpath>
-				</li>
-				<!-- ========== MG 08 ========== -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Turret_MG_08_KA"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MG_08_KA</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.66</SwayFactor>
-						<Bulk>13.75</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.40</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>62</range>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>Shot_MG_08</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>250</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== FK 96 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Artillery_FK_96_KA</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>2.75</RangedWeapon_Cooldown>
-						<SightsEfficiency>2</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.14</SwayFactor>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_77x230mmRCannonShell_HE</defaultProjectile>
-						<warmupTime>4.55</warmupTime>
-						<range>78</range>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>Shot_FK_96</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>20</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>9.8</reloadTime>
-						<ammoSet>AmmoSet_77x230mmRCannonShell</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== leFH 16 ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Artillery_leFH_16_KA"]</xpath>
-					<value>
-						<statBases>
-							<SightsEfficiency>0.8</SightsEfficiency>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Artillery_leFH_16_KA"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Artillery_leFH_16_KA"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Artillery_leFH_16_KA"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Charges">
-							<chargeSpeeds>
-								<li>30</li>
-								<li>50</li>
-								<li>70</li>
-								<li>90</li>
-							</chargeSpeeds>
-						</li>
-						<li Class="CombatExtended.CompProperties_AmmoUser">
-							<magazineSize>1</magazineSize>
-							<reloadTime>5</reloadTime>
-							<ammoSet>AmmoSet_105x155mmRCannonShell</ammoSet>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Artillery_leFH_16_KA"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-								<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-								<hasStandardCommand>true</hasStandardCommand>
-								<requireLineOfSight>false</requireLineOfSight>
-								<defaultProjectile>Bullet_105x155mmRCannonShell_HE</defaultProjectile>
-								<warmupTime>10</warmupTime>
-								<minRange>32</minRange>
-								<range>1000</range>
-								<burstShotCount>1</burstShotCount>
-								<soundCast>Shot_leFH_16</soundCast>
-								<muzzleFlashScale>39</muzzleFlashScale>
-								<circularError>1</circularError>
-								<indirectFirePenalty>0.15</indirectFirePenalty>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Patch base -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Base_leFH_16_KA"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Base_leFH_16_KA"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>5</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="Base_leFH_16_KA"]/building</xpath>
-					<value>
-						<spawnedConceptLearnOpportunity>CE_MortarDirectFire</spawnedConceptLearnOpportunity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="Base_leFH_16_KA"]/inspectorTabs</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kemomimihouse/ThingDefs_Misc/Weapons_kemomimiMelee.xml b/Patches/Kemomimihouse/ThingDefs_Misc/Weapons_kemomimiMelee.xml
deleted file mode 100644
index 7964c8bb49..0000000000
--- a/Patches/Kemomimihouse/ThingDefs_Misc/Weapons_kemomimiMelee.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>kemomimihouse</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_konkatana"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.69</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.69</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationSharp>1.6</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>38</power>
-								<cooldownTime>1.05</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationSharp>0.97</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.872</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_konkatana"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<MeleeCounterParryBonus>1.19</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_konkatana"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.43</MeleeCritChance>
-							<MeleeParryChance>0.57</MeleeParryChance>
-							<MeleeDodgeChance>0.33</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_sirokatana"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.19</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.8</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>0.63</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationSharp>0.84</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_sirokatana"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<MeleeCounterParryBonus>1.43</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_sirokatana"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.48</MeleeCritChance>
-							<MeleeParryChance>1.07</MeleeParryChance>
-							<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kemomimihouse/ThingDefs_Races/Race_Animals.xml b/Patches/Kemomimihouse/ThingDefs_Races/Race_Animals.xml
deleted file mode 100644
index 2b41c8876a..0000000000
--- a/Patches/Kemomimihouse/ThingDefs_Races/Race_Animals.xml
+++ /dev/null
@@ -1,777 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>kemomimihouse</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[
-								defName="akame" or
-								defName="aome" or
-								defName="hana" or
-								defName="kon" or
-								defName="kuro" or
-								defName="miko" or
-								defName="siro" or
-								defName="yuki" or
-								defName="kohime" or
-								defName="konf" or
-								defName="sirof"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Humanoid</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[
-								defName="akame" or
-								defName="aome" or
-								defName="hana" or
-								defName="kon" or
-								defName="kuro" or
-								defName="miko" or
-								defName="siro" or
-								defName="yuki" or
-								defName="kohime" or
-								defName="konf" or
-								defName="sirof"
-								]/comps </xpath>
-							<value>
-								<li Class="CombatExtended.CompProperties_Inventory" />
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="akame" or
-								defName="aome" or
-								defName="hana" or
-								defName="kon" or
-								defName="kuro" or
-								defName="miko" or
-								defName="siro" or
-								defName="yuki" or
-								defName="kohime" or
-								defName="konf" or
-								defName="sirof"
-								]/statBases </xpath>
-							<value>
-								<Suppressability>0</Suppressability>
-								<SmokeSensitivity>1</SmokeSensitivity>
-							</value>
-						</li>
-
-						<!-- Siro-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="siro"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>4</ArmorRating_Sharp>
-								<MeleeCritChance>0.75</MeleeCritChance>
-								<MeleeParryChance>0.75</MeleeParryChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="siro"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>1.4</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="siro"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>忍刀</label>
-										<capacities>
-											<li>Cut</li>
-											<li>Stab</li>
-										</capacities>
-										<cooldownTime>0.53</cooldownTime>
-										<power>25</power>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-										<armorPenetrationSharp>2.82</armorPenetrationSharp>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>忍刀</label>
-										<capacities>
-											<li>Cut</li>
-											<li>Stab</li>
-										</capacities>
-										<cooldownTime>0.53</cooldownTime>
-										<power>25</power>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-										<armorPenetrationSharp>2.82</armorPenetrationSharp>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<!-- Kon -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="kon"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>5</ArmorRating_Sharp>
-								<MeleeCritChance>0.80</MeleeCritChance>
-								<MeleeParryChance>0.60</MeleeParryChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="kon"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="kon"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>刀</label>
-										<capacities>
-											<li>Cut</li>
-											<li>Stab</li>
-										</capacities>
-										<cooldownTime>1</cooldownTime>
-										<power>35</power>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-										<armorPenetrationSharp>3.5</armorPenetrationSharp>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>刀</label>
-										<capacities>
-											<li>Cut</li>
-											<li>Stab</li>
-										</capacities>
-										<cooldownTime>1</cooldownTime>
-										<power>35</power>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-										<armorPenetrationSharp>3.5</armorPenetrationSharp>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<!-- Hana -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="hana"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
-								<MeleeCritChance>0.2</MeleeCritChance>
-								<MeleeParryChance>0.3</MeleeParryChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="hana"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="hana"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>パンチ</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<cooldownTime>2</cooldownTime>
-										<power>1</power>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>パンチ</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<cooldownTime>2</cooldownTime>
-										<power>1</power>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<!-- Miko -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="miko"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>4</ArmorRating_Sharp>
-								<MeleeCritChance>1.20</MeleeCritChance>
-								<MeleeParryChance>1.00</MeleeParryChance>
-								<ShotSpread>2</ShotSpread>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="miko"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>6</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="miko"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>パンチ</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<cooldownTime>0.8</cooldownTime>
-										<power>30</power>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>16</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>パンチ</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<cooldownTime>0.8</cooldownTime>
-										<power>30</power>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>16</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<!-- Akame/Aome -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="akame" or defName="aome"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
-								<MeleeCritChance>0.25</MeleeCritChance>
-								<MeleeParryChance>0.25</MeleeParryChance>
-								<ShotSpread>1</ShotSpread>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="akame" or defName="aome"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="akame" or defName="aome"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>クマゴン</label>
-										<capacities>
-											<li>Cut</li>
-											<li>Stab</li>
-										</capacities>
-										<cooldownTime>1.2</cooldownTime>
-										<power>15</power>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>1.8</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.7</armorPenetrationSharp>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>クマゴン</label>
-										<capacities>
-											<li>Cut</li>
-											<li>Stab</li>
-										</capacities>
-										<cooldownTime>1.2</cooldownTime>
-										<power>15</power>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>1.8</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.7</armorPenetrationSharp>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<!-- Kuro -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="kuro"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>5</ArmorRating_Sharp>
-								<MeleeCritChance>0.75</MeleeCritChance>
-								<MeleeParryChance>0.90</MeleeParryChance>
-								<ShotSpread>2</ShotSpread>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="kuro"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="kuro"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>忍刀</label>
-										<capacities>
-											<li>Cut</li>
-											<li>Stab</li>
-										</capacities>
-										<cooldownTime>0.25</cooldownTime>
-										<power>10</power>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>2.00</armorPenetrationBlunt>
-										<armorPenetrationSharp>2.25</armorPenetrationSharp>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>忍刀</label>
-										<capacities>
-											<li>Cut</li>
-											<li>Stab</li>
-										</capacities>
-										<cooldownTime>0.25</cooldownTime>
-										<power>10</power>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>2.00</armorPenetrationBlunt>
-										<armorPenetrationSharp>2.25</armorPenetrationSharp>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<!-- yuki -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="yuki"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>80</ArmorRating_Sharp>
-								<MeleeCritChance>0.6</MeleeCritChance>
-								<MeleeParryChance>0.6</MeleeParryChance>
-								<ShotSpread>1</ShotSpread>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="yuki"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>200</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="yuki"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>ドラゴンクロー</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<cooldownTime>2</cooldownTime>
-										<power>1</power>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>ドラゴンクロー</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<cooldownTime>2</cooldownTime>
-										<power>1</power>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<!-- konf-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="konf"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>10</ArmorRating_Sharp>
-								<MeleeCritChance>0.8</MeleeCritChance>
-								<MeleeParryChance>0.6</MeleeParryChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="konf"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>15</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="konf"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>刀</label>
-										<capacities>
-											<li>Cut</li>
-											<li>Stab</li>
-										</capacities>
-										<cooldownTime>1</cooldownTime>
-										<power>35</power>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-										<armorPenetrationSharp>3.5</armorPenetrationSharp>
-									</li>
-
-									<li Class="CombatExtended.ToolCE">
-										<label>刀</label>
-										<capacities>
-											<li>Cut</li>
-											<li>Stab</li>
-										</capacities>
-										<cooldownTime>1</cooldownTime>
-										<power>35</power>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-										<armorPenetrationSharp>3.5</armorPenetrationSharp>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<!-- Sirof-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="sirof"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>8</ArmorRating_Sharp>
-								<MeleeCritChance>0.75</MeleeCritChance>
-								<MeleeParryChance>0.75</MeleeParryChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="sirof"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>4</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="sirof"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>忍刀</label>
-										<capacities>
-											<li>Cut</li>
-											<li>Stab</li>
-										</capacities>
-										<cooldownTime>0.53</cooldownTime>
-										<power>25</power>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-										<armorPenetrationSharp>2.82</armorPenetrationSharp>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>忍刀</label>
-										<capacities>
-											<li>Cut</li>
-											<li>Stab</li>
-										</capacities>
-										<cooldownTime>0.53</cooldownTime>
-										<power>25</power>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-										<armorPenetrationSharp>2.82</armorPenetrationSharp>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<!-- Kohime-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="kohime"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>2</ArmorRating_Sharp>
-								<MeleeCritChance>0.6</MeleeCritChance>
-								<MeleeParryChance>0.75</MeleeParryChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="kohime"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.8</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="kohime"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>パンチ</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<cooldownTime>1</cooldownTime>
-										<power>20</power>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>12</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>パンチ</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<cooldownTime>1</cooldownTime>
-										<power>20</power>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>12</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-						<!-- verbs -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="miko"]/verbs/li</xpath>
-							<value>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Projectile_mikoshot</defaultProjectile>
-									<warmupTime>1.6</warmupTime>
-									<burstShotCount>6</burstShotCount>
-									<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-									<minRange>1</minRange>
-									<range>36</range>
-									<soundCast>BulletImpact_Wood</soundCast>
-									<soundCastTail>GunTail_Heavy</soundCastTail>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="kohime"]/verbs/li</xpath>
-							<value>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Projectile_kohimeshot</defaultProjectile>
-									<warmupTime>2</warmupTime>
-									<burstShotCount>1</burstShotCount>
-									<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-									<minRange>1</minRange>
-									<range>30</range>
-									<soundCast>ThrowGrenade</soundCast>
-									<soundCastTail>GunTail_Heavy</soundCastTail>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="akame"]/verbs/li</xpath>
-							<value>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Projectile_kumagonshot</defaultProjectile>
-									<warmupTime>2</warmupTime>
-									<burstShotCount>1</burstShotCount>
-									<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-									<minRange>1</minRange>
-									<range>30</range>
-									<soundCast>ThrowGrenade</soundCast>
-									<soundCastTail>GunTail_Heavy</soundCastTail>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="aome"]/verbs/li</xpath>
-							<value>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Projectile_kumagoroushot</defaultProjectile>
-									<warmupTime>2</warmupTime>
-									<burstShotCount>1</burstShotCount>
-									<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-									<minRange>1</minRange>
-									<range>30</range>
-									<soundCast>Pawn_Melee_Punch_HitPawn</soundCast>
-									<soundCastTail>GunTail_Light</soundCastTail>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="kuro"]/verbs/li</xpath>
-							<value>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Projectile_kuroshot</defaultProjectile>
-									<warmupTime>1.6</warmupTime>
-									<burstShotCount>8</burstShotCount>
-									<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-									<minRange>1</minRange>
-									<range>25</range>
-									<soundCast>BulletImpact_Wood</soundCast>
-									<soundCastTail>GunTail_Light</soundCastTail>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="yuki"]/verbs/li</xpath>
-							<value>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Projectile_yukishot</defaultProjectile>
-									<warmupTime>3</warmupTime>
-									<burstShotCount>1</burstShotCount>
-									<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-									<minRange>1</minRange>
-									<range>30</range>
-									<soundCast>ThrowGrenade</soundCast>
-									<soundCastTail>GunTail_Light</soundCastTail>
-								</li>
-							</value>
-						</li>
-
-						<!-- Projectile -->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Projectile_mikoshot" or
-								defName="Projectile_kumagonshot" or
-								defName="Projectile_kumagoroushot" or
-								defName="Projectile_kuroshot" or
-								defName="Projectile_yukishot" or
-								defName="Projectile_kohimeshot"
-								] </xpath>
-							<value>
-								<thingClass>CombatExtended.BulletCE</thingClass>
-							</value>
-						</li>
-
-						<!-- Projectile -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Projectile_mikoshot"]/projectile</xpath>
-							<value>
-								<projectile Class="CombatExtended.ProjectilePropertiesCE">
-									<speed>30</speed>
-									<flyOverhead>false</flyOverhead>
-									<damageDef>Flame</damageDef>
-									<damageAmountBase>8</damageAmountBase>
-								</projectile>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Projectile_kumagonshot"]/projectile</xpath>
-							<value>
-								<projectile Class="CombatExtended.ProjectilePropertiesCE">
-									<flyOverhead>false</flyOverhead>
-									<speed>15</speed>
-									<damageDef>Bullet</damageDef>
-									<stoppingPower>1.5</stoppingPower>
-									<armorPenetrationBase>0.25</armorPenetrationBase>
-									<damageAmountBase>16</damageAmountBase>
-									<armorPenetrationSharp>3</armorPenetrationSharp>
-									<armorPenetrationBlunt>25</armorPenetrationBlunt>
-								</projectile>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Projectile_kumagoroushot"]/projectile</xpath>
-							<value>
-								<projectile Class="CombatExtended.ProjectilePropertiesCE">
-									<flyOverhead>false</flyOverhead>
-									<speed>25</speed>
-									<damageDef>Bullet_harapan</damageDef>
-									<stoppingPower>1.5</stoppingPower>
-									<armorPenetrationBase>0.25</armorPenetrationBase>
-									<damageAmountBase>16</damageAmountBase>
-									<armorPenetrationSharp>3</armorPenetrationSharp>
-									<armorPenetrationBlunt>25</armorPenetrationBlunt>
-								</projectile>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Projectile_kuroshot"]/projectile</xpath>
-							<value>
-								<projectile Class="CombatExtended.ProjectilePropertiesCE">
-									<flyOverhead>false</flyOverhead>
-									<speed>20</speed>
-									<damageDef>Bullet</damageDef>
-									<stoppingPower>1.5</stoppingPower>
-									<armorPenetrationBase>0.25</armorPenetrationBase>
-									<damageAmountBase>10</damageAmountBase>
-									<armorPenetrationSharp>3</armorPenetrationSharp>
-									<armorPenetrationBlunt>25</armorPenetrationBlunt>
-								</projectile>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Projectile_yukishot"]/projectile</xpath>
-							<value>
-								<projectile Class="CombatExtended.ProjectilePropertiesCE">
-									<flyOverhead>false</flyOverhead>
-									<speed>20</speed>
-									<damageDef>Frostbite</damageDef>
-									<stoppingPower>0.1</stoppingPower>
-									<damageAmountBase>1</damageAmountBase>
-								</projectile>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Projectile_kohimeshot"]/projectile</xpath>
-							<value>
-								<projectile Class="CombatExtended.ProjectilePropertiesCE">
-									<speed>20</speed>
-									<flyOverhead>false</flyOverhead>
-									<damageDef>Flame</damageDef>
-									<damageAmountBase>40</damageAmountBase>
-								</projectile>
-							</value>
-						</li>
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kemomimihouse/ThingDes_Items/Items_Resource_Stuff.xml b/Patches/Kemomimihouse/ThingDes_Items/Items_Resource_Stuff.xml
deleted file mode 100644
index 5dfa3df72c..0000000000
--- a/Patches/Kemomimihouse/ThingDes_Items/Items_Resource_Stuff.xml
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>kemomimihouse</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="hanaWool" or
-								defName="akameWool" or
-								defName="aomeWool" or
-								defName="konWool"
-								]/statBases/StuffPower_Armor_Sharp </xpath>
-							<value>
-								<StuffPower_Armor_Sharp>0.30</StuffPower_Armor_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="hanaWool" or
-								defName="akameWool" or
-								defName="aomeWool" or
-								defName="siroWool"
-								]/statBases/StuffPower_Armor_Blunt </xpath>
-							<value>
-								<StuffPower_Armor_Blunt>0.15</StuffPower_Armor_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="siroWool"]/statBases/StuffPower_Armor_Sharp</xpath>
-							<value>
-								<StuffPower_Armor_Sharp>0.5</StuffPower_Armor_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="konWool"]/statBases/StuffPower_Armor_Blunt</xpath>
-							<value>
-								<StuffPower_Armor_Blunt>0.30</StuffPower_Armor_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="kuroWool"]/statBases/StuffPower_Armor_Sharp</xpath>
-							<value>
-								<StuffPower_Armor_Sharp>0.65</StuffPower_Armor_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="kuroWool"]/statBases/StuffPower_Armor_Blunt</xpath>
-							<value>
-								<StuffPower_Armor_Blunt>0.35</StuffPower_Armor_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="mikoWool"]/statBases/StuffPower_Armor_Sharp</xpath>
-							<value>
-								<StuffPower_Armor_Sharp>0.75</StuffPower_Armor_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="mikoWool"]/statBases/StuffPower_Armor_Blunt</xpath>
-							<value>
-								<StuffPower_Armor_Blunt>0.5</StuffPower_Armor_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="yukiwool"]/statBases/StuffPower_Armor_Sharp</xpath>
-							<value>
-								<StuffPower_Armor_Sharp>1.75</StuffPower_Armor_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="yukiwool"]/statBases/StuffPower_Armor_Blunt</xpath>
-							<value>
-								<StuffPower_Armor_Blunt>2.25</StuffPower_Armor_Blunt>
-								<WornBulk>0.75</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="kohimeWool"]/statBases/StuffPower_Armor_Sharp</xpath>
-							<value>
-								<StuffPower_Armor_Sharp>0.6</StuffPower_Armor_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="kohimeWool"]/statBases/StuffPower_Armor_Blunt</xpath>
-							<value>
-								<StuffPower_Armor_Blunt>0.45</StuffPower_Armor_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="siroWool" or
-								defName="mikoWool" or
-								defName="akameWool" or
-								defName="aomeWool" or
-								defName="kohimeWool"
-								]/statBases/StuffPower_Armor_Heat </xpath>
-							<value>
-								<StuffPower_Armor_Heat>0.20</StuffPower_Armor_Heat>
-								<StuffPower_Armor_Electric>0.10</StuffPower_Armor_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="hanaWool" or
-								defName="yukiwool"
-								]/statBases/StuffPower_Armor_Heat </xpath>
-							<value>
-								<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="konWool"]/statBases/StuffPower_Armor_Heat</xpath>
-							<value>
-								<StuffPower_Armor_Heat>0.10</StuffPower_Armor_Heat>
-								<StuffPower_Armor_Electric>0.05</StuffPower_Armor_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="kuroWool"]/statBases/StuffPower_Armor_Heat</xpath>
-							<value>
-								<StuffPower_Armor_Heat>0.40</StuffPower_Armor_Heat>
-								<StuffPower_Armor_Electric>0.20</StuffPower_Armor_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="yukiwool"]/stuffProps/statFactors</xpath>
-							<value>
-								<Mass>1.2</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="siroWool"]/stuffProps/categories</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="siroWool"]/stuffProps</xpath>
-								<value>
-									<categories>
-										<li>SoftArmor</li>
-									</categories>
-								</value>
-							</nomatch>
-							<match Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="siroWool"]/stuffProps/categories</xpath>
-								<value>
-									<li>SoftArmor</li>
-								</value>
-							</match>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="konWool"]/stuffProps/categories</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="konWool"]/stuffProps</xpath>
-								<value>
-									<categories>
-										<li>SoftArmor</li>
-									</categories>
-								</value>
-							</nomatch>
-							<match Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="konWool"]/stuffProps/categories</xpath>
-								<value>
-									<li>SoftArmor</li>
-								</value>
-							</match>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="kuroWool"]/stuffProps/categories</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="kuroWool"]/stuffProps</xpath>
-								<value>
-									<categories>
-										<li>SoftArmor</li>
-									</categories>
-								</value>
-							</nomatch>
-							<match Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="kuroWool"]/stuffProps/categories</xpath>
-								<value>
-									<li>SoftArmor</li>
-								</value>
-							</match>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="mikoWool"]/stuffProps/categories</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="mikoWool"]/stuffProps</xpath>
-								<value>
-									<categories>
-										<li>SoftArmor</li>
-									</categories>
-								</value>
-							</nomatch>
-							<match Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="mikoWool"]/stuffProps/categories</xpath>
-								<value>
-									<li>SoftArmor</li>
-								</value>
-							</match>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="yukiwool"]/stuffProps/categories</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="yukiwool"]/stuffProps</xpath>
-								<value>
-									<categories>
-										<li>SoftArmor</li>
-									</categories>
-								</value>
-							</nomatch>
-							<match Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="yukiwool"]/stuffProps/categories</xpath>
-								<value>
-									<li>SoftArmor</li>
-								</value>
-							</match>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="kohimeWool"]/stuffProps/categories</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="kohimeWool"]/stuffProps</xpath>
-								<value>
-									<categories>
-										<li>SoftArmor</li>
-									</categories>
-								</value>
-							</nomatch>
-							<match Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="kohimeWool"]/stuffProps/categories</xpath>
-								<value>
-									<li>SoftArmor</li>
-								</value>
-							</match>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kenshi Armory/KenshiArmory_Apparel.xml b/Patches/Kenshi Armory/KenshiArmory_Apparel.xml
deleted file mode 100644
index 28aabfc26d..0000000000
--- a/Patches/Kenshi Armory/KenshiArmory_Apparel.xml	
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Kenshi Armory</li>
-			<li>Kenshi Armory (1.4)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Iron Hat -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Kenshi_IronHat"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_IronHat"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_IronHat"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2.25</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Ninja Mask -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Kenshi_NinjaMask"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_NinjaMask"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.8</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Kusari Zukin -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Kenshi_KusariZukin"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_KusariZukin"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Armored Hood -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Kenshi_ArmouredHood"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_ArmouredHood"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.7</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Basket Hat -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Kenshi_BasketHat"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_BasketHat"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kenshi Armory/KenshiArmory_Armour.xml b/Patches/Kenshi Armory/KenshiArmory_Armour.xml
deleted file mode 100644
index d99ad12347..0000000000
--- a/Patches/Kenshi Armory/KenshiArmory_Armour.xml	
+++ /dev/null
@@ -1,1332 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Kenshi Armory</li>
-			<li>Kenshi Armory (1.4)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Holy Chest Plate -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Kenshi_HolyChestPlate"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_HolyChestPlate"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_HolyChestPlate"]/statBases/Mass</xpath>
-					<value>
-						<Mass>6</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_HolyChestPlate"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeDodgeChance>-0.05</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Heavy Hachigane -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Kenshi_HeavyHachigane"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_HeavyHachigane"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Holy Full Plate -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Kenshi_HeavyHolyChestPlate"]/statBases</xpath>
-					<value>
-						<Bulk>115</Bulk>
-						<WornBulk>12</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_HeavyHolyChestPlate"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3.25</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_HeavyHolyChestPlate"]/statBases/Mass</xpath>
-					<value>
-						<Mass>20</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_HeavyHolyChestPlate"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeDodgeChance>-0.35</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Kenshi_HeavyHolyChestPlate"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- Holy Full Helmet -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Kenshi_HeavyPaladinsHelm"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_HeavyPaladinsHelm"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_HeavyPaladinsHelm"]/statBases/Mass</xpath>
-					<value>
-						<Mass>3.5</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_HeavyPaladinsHelm"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>-0.4</AimingAccuracy>
-							<MeleeHitChance>-2</MeleeHitChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Kenshi_HeavyPaladinsHelm"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- Samurai Plate -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Kenshi_SamuraiPlateArmor"]/statBases</xpath>
-					<value>
-						<Bulk>95</Bulk>
-						<WornBulk>8</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_SamuraiPlateArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_SamuraiPlateArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>12</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_SamuraiPlateArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeDodgeChance>-0.08</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Kenshi_SamuraiPlateArmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- Samurai Helmet -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Kenshi_SamuraiHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_SamuraiHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_SamuraiHelmet"]/statBases/Mass</xpath>
-					<value>
-						<Mass>2.5</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_SamuraiHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>-0.6</AimingAccuracy>
-							<ShootingAccuracyPawn>-0.3</ShootingAccuracyPawn>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Kenshi_SamuraiHelmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- Mercenary Plate -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Kenshi_UnstrainedMercenaryPlate"]/statBases</xpath>
-					<value>
-						<Bulk>85</Bulk>
-						<WornBulk>6</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_UnstrainedMercenaryPlate"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_UnstrainedMercenaryPlate"]/statBases/Mass</xpath>
-					<value>
-						<Mass>9.5</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_UnstrainedMercenaryPlate"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeDodgeChance>-0.02</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Kenshi_UnstrainedMercenaryPlate"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- Tin Can -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Kenshi_UnstrainedTinCan"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_UnstrainedTinCan"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_UnstrainedTinCan"]/statBases/Mass</xpath>
-					<value>
-						<Mass>3</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_UnstrainedTinCan"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>-0.4</AimingAccuracy>
-							<MeleeHitChance>-2</MeleeHitChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Kenshi_SamuraiHelmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- Factional Ver -->
-
-				<!-- Holy Chest Plate -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Kenshi_PaladinsHolyChestPlate"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_PaladinsHolyChestPlate"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>3</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_PaladinsHolyChestPlate"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_PaladinsHolyChestPlate"]/statBases/Mass</xpath>
-					<value>
-						<Mass>6</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_PaladinsHolyChestPlate"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeDodgeChance>-0.05</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Heavy Hachigane -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Kenshi_PaladinsHeavyHachigane"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_PaladinsHeavyHachigane"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_PaladinsHeavyHachigane"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Holy Full Plate -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Kenshi_PaladinsHeavyPlate"]/statBases</xpath>
-					<value>
-						<Bulk>115</Bulk>
-						<WornBulk>12</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_PaladinsHeavyPlate"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>3.25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_PaladinsHeavyPlate"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4.875</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_PaladinsHeavyPlate"]/statBases/Mass</xpath>
-					<value>
-						<Mass>20</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_PaladinsHeavyPlate"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeDodgeChance>-0.35</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Kenshi_PaladinsHeavyPlate"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- Holy Full Helmet -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Kenshi_PaladinsHeavyHelm"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_PaladinsHeavyHelm"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_PaladinsHeavyHelm"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_PaladinsHeavyHelm"]/statBases/Mass</xpath>
-					<value>
-						<Mass>3.5</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_PaladinsHeavyHelm"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>-0.4</AimingAccuracy>
-							<MeleeHitChance>-2</MeleeHitChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Kenshi_PaladinsHeavyHelm"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- Samurai Plate -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Kenshi_EmpireSamuraiPlateArmor"]/statBases</xpath>
-					<value>
-						<Bulk>95</Bulk>
-						<WornBulk>8</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_EmpireSamuraiPlateArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_EmpireSamuraiPlateArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3.75</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_EmpireSamuraiPlateArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>12</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_EmpireSamuraiPlateArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeDodgeChance>-0.08</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Kenshi_EmpireSamuraiPlateArmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- Samurai Helmet -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Kenshi_EmpireSamuraiHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_EmpireSamuraiHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_EmpireSamuraiHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_EmpireSamuraiHelmet"]/statBases/Mass</xpath>
-					<value>
-						<Mass>2.5</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_EmpireSamuraiHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>-0.6</AimingAccuracy>
-							<ShootingAccuracyPawn>-0.3</ShootingAccuracyPawn>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Kenshi_EmpireSamuraiHelmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- Crab Plate -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Kenshi_CrabArmor"]/statBases</xpath>
-					<value>
-						<Bulk>115</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_CrabArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>3</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_CrabArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_CrabArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>18</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_CrabArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeDodgeChance>-0.30</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Kenshi_CrabArmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- Crab Helmet -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Kenshi_CrabRaiderHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_CrabRaiderHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_CrabRaiderHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_CrabRaiderHelmet"]/statBases/Mass</xpath>
-					<value>
-						<Mass>3.5</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_CrabRaiderHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>-0.4</AimingAccuracy>
-							<MeleeHitChance>-2</MeleeHitChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Kenshi_CrabRaiderHelmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- Mercenary Plate -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Kenshi_GuildMercenaryPlate"]/statBases</xpath>
-					<value>
-						<Bulk>85</Bulk>
-						<WornBulk>6</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_GuildMercenaryPlate"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_GuildMercenaryPlate"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_GuildMercenaryPlate"]/statBases/Mass</xpath>
-					<value>
-						<Mass>9.5</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_GuildMercenaryPlate"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeDodgeChance>-0.02</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Kenshi_GuildMercenaryPlate"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- Tin Can -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Kenshi_TinCan"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_TinCan"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_TinCan"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6.75</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_TinCan"]/statBases/Mass</xpath>
-					<value>
-						<Mass>3</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_TinCan"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>-0.4</AimingAccuracy>
-							<MeleeHitChance>-2</MeleeHitChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Kenshi_TinCan"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- Hack Stopper Jacket -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Kenshi_HackStopperJacket"]/statBases</xpath>
-					<value>
-						<Bulk>95</Bulk>
-						<WornBulk>8</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_HackStopperJacket"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2.25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_HackStopperJacket"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_HackStopperJacket"]/statBases/Mass</xpath>
-					<value>
-						<Mass>7</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_HackStopperJacket"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeDodgeChance>-0.02</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Kenshi_HackStopperJacket"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- Hack Stopper Helmet -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Kenshi_HackStopperHat"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_HackStopperHat"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_HackStopperHat"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.3</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Kenshi_HackStopperHat"]/statBases/Mass</xpath>
-					<value>
-						<Mass>1</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Kenshi_HackStopperHat"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kenshi Armory/KenshiArmory_Weapons.xml b/Patches/Kenshi Armory/KenshiArmory_Weapons.xml
deleted file mode 100644
index 8ecc6bb4b2..0000000000
--- a/Patches/Kenshi Armory/KenshiArmory_Weapons.xml	
+++ /dev/null
@@ -1,736 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Kenshi Armory</li>
-			<li>Kenshi Armory (1.4)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Paladin's Cross -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kenshi_PaladinsCross"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2.24</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.94</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationBlunt>8.1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>60</power>
-								<cooldownTime>3.2</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.61</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kenshi_PaladinsCross"]/statBases</xpath>
-					<value>
-						<Bulk>16</Bulk>
-						<MeleeCounterParryBonus>0.43</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kenshi_PaladinsCross"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeCritChance>0.10</MeleeCritChance>
-						<MeleeParryChance>0.32</MeleeParryChance>
-						<MeleeDodgeChance>0.53</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<!-- Combat Cleaver -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kenshi_CombatCleaver"]/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>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kenshi_CombatCleaver"]/statBases</xpath>
-					<value>
-						<Bulk>11</Bulk>
-						<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kenshi_CombatCleaver"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.50</MeleeCritChance>
-							<MeleeParryChance>0.4</MeleeParryChance>
-							<MeleeDodgeChance>0.27</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Katana -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kenshi_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>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kenshi_Katana"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<MeleeCounterParryBonus>1.27</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kenshi_Katana"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeCritChance>0.95</MeleeCritChance>
-						<MeleeParryChance>0.54</MeleeParryChance>
-						<MeleeDodgeChance>0.33</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<!-- Guardless Katana -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kenshi_GuardlessKatana"]/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>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kenshi_GuardlessKatana"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<MeleeCounterParryBonus>0.89</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kenshi_GuardlessKatana"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeCritChance>1.48</MeleeCritChance>
-						<MeleeParryChance>0.07</MeleeParryChance>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<!-- Naginata -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kenshi_Naginata"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.76</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>0.95</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.76</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationSharp>1.9</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.95</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>32</power>
-								<cooldownTime>1.41</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationSharp>1.27</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kenshi_Naginata"]/statBases</xpath>
-					<value>
-						<Bulk>14</Bulk>
-						<MeleeCounterParryBonus>1.78</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kenshi_Naginata"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.56</MeleeCritChance>
-						<MeleeParryChance>0.75</MeleeParryChance>
-						<MeleeDodgeChance>0.6</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<!-- Naginata Katana -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kenshi_NaginataKatana"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.87</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.76</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationSharp>2.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>42</power>
-								<cooldownTime>1.49</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationSharp>1.6</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kenshi_NaginataKatana"]/statBases</xpath>
-					<value>
-						<Bulk>18</Bulk>
-						<MeleeCounterParryBonus>1.03</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kenshi_NaginataKatana"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.42</MeleeCritChance>
-						<MeleeParryChance>0.73</MeleeParryChance>
-						<MeleeDodgeChance>0.6</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<!-- Falling Sun -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kenshi_FallingSun"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2.31</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>2.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.85</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationSharp>2.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.15</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>65</power>
-								<cooldownTime>1.7</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationSharp>1.78</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kenshi_FallingSun"]/statBases</xpath>
-					<value>
-						<Bulk>22</Bulk>
-						<MeleeCounterParryBonus>0.43</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kenshi_FallingSun"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.71</MeleeCritChance>
-							<MeleeParryChance>0.32</MeleeParryChance>
-							<MeleeDodgeChance>0.6</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Fragment Axe -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kenshi_FragmentAxe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>2.79</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>2.79</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationSharp>1.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>71</power>
-								<cooldownTime>4.13</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationSharp>1.02</armorPenetrationSharp>
-								<armorPenetrationBlunt>10.14</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kenshi_FragmentAxe"]/statBases</xpath>
-					<value>
-						<Bulk>22</Bulk>
-						<MeleeCounterParryBonus>0.32</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kenshi_FragmentAxe"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.06</MeleeCritChance>
-							<MeleeParryChance>0.2</MeleeParryChance>
-							<MeleeDodgeChance>0.58</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Ringed Sabre -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kenshi_RingedSabre"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.74</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>1.41</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationSharp>2.31</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.152</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>38</power>
-								<cooldownTime>0.99</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationSharp>0.65</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.872</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kenshi_RingedSabre"]/statBases</xpath>
-					<value>
-						<Bulk>9</Bulk>
-						<MeleeCounterParryBonus>1.07</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kenshi_RingedSabre"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeCritChance>0.74</MeleeCritChance>
-						<MeleeParryChance>0.56</MeleeParryChance>
-						<MeleeDodgeChance>0.4</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<!-- Foreign Sabre -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kenshi_ForeignSabre"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.02</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationSharp>1.24</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.238</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>34</power>
-								<cooldownTime>0.89</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationSharp>0.6</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.662</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kenshi_ForeignSabre"]/statBases</xpath>
-					<value>
-						<Bulk>9</Bulk>
-						<MeleeCounterParryBonus>2</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kenshi_ForeignSabre"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeCritChance>0.28</MeleeCritChance>
-						<MeleeParryChance>1.5</MeleeParryChance>
-						<MeleeDodgeChance>0.3</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<!-- Merc Club -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kenshi_MercenaryClub"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.97</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1</cooldownTime>
-								<armorPenetrationBlunt>10.95</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kenshi_MercenaryClub"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>0.67</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kenshi_MercenaryClub"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>1.2</MeleeCritChance>
-						<MeleeParryChance>0.50</MeleeParryChance>
-						<MeleeDodgeChance>0.4</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<!-- Jitte -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kenshi_Jitte"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.68</cooldownTime>
-								<armorPenetrationBlunt>2.188</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kenshi_Jitte"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kenshi_Jitte"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<MeleeDodgeChance>0.4</MeleeDodgeChance>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kijin 2.0/Ammo/Ammo_Kijin_Misc.xml b/Patches/Kijin 2.0/Ammo/Ammo_Kijin_Misc.xml
deleted file mode 100644
index 37110e1bed..0000000000
--- a/Patches/Kijin 2.0/Ammo/Ammo_Kijin_Misc.xml	
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Kijin Race 2.0</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<ThingDef>
-									<category>Projectile</category>
-									<altitudeLayer>Projectile</altitudeLayer>
-									<thingClass>CombatExtended.BulletCE</thingClass>
-									<tickerType>Normal</tickerType>
-									<useHitPoints>False</useHitPoints>
-									<neverMultiSelect>True</neverMultiSelect>
-									<defName>Projectile_KijinDarkmatter</defName>
-									<label>dark matter</label>
-									<graphicData>
-										<texPath>Kijin/Projectile/Projectile_Darkmatter</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageDef>KijinDarkMatter</damageDef>
-										<speed>6</speed>
-										<damageAmountBase>1</damageAmountBase>
-										<armorPenetrationSharp>0.25</armorPenetrationSharp>
-										<armorPenetrationBlunt>2</armorPenetrationBlunt>
-										<flyOverhead>false</flyOverhead>
-									</projectile>
-								</ThingDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<ThingDef ParentName="BaseFlamethrowerBullet">
-									<defName>Bullet_KijinFlame</defName>
-									<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-									<label>Blazing Orb</label>
-									<graphicData>
-										<texPath>Kijin/Projectile/FireA</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageDef>Flame</damageDef>
-										<damageAmountBase>3</damageAmountBase>
-										<soundExplode>CE_FlamethrowerExplosion</soundExplode>
-										<explosionRadius>1.0</explosionRadius>
-										<ai_IsIncendiary>true</ai_IsIncendiary>
-									</projectile>
-								</ThingDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<ThingDef ParentName="BaseGrenadeProjectile">
-									<defName>Proj_KijinSmoke</defName>
-									<label>smoke grenade</label>
-									<graphicData>
-										<texPath>Kijin/Projectile/SmokeBomb</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<explosionRadius>3.5</explosionRadius>
-										<damageDef>Smoke</damageDef>
-										<suppressionFactor>0.0</suppressionFactor>
-										<dangerFactor>0.0</dangerFactor>
-										<explosionDelay>30</explosionDelay>
-										<dropsCasings>true</dropsCasings>
-										<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-										<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-										<postExplosionGasType>BlindSmoke</postExplosionGasType>
-										<preExplosionSpawnChance>1</preExplosionSpawnChance>
-										<speed>8</speed>
-									</projectile>
-								</ThingDef>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kijin 2.0/Bodies/Mod_Bodies_Kijin.xml b/Patches/Kijin 2.0/Bodies/Mod_Bodies_Kijin.xml
deleted file mode 100644
index b90fc99c8e..0000000000
--- a/Patches/Kijin 2.0/Bodies/Mod_Bodies_Kijin.xml	
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-
-			<!--Kijin Bodytype-->
-
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Kijin Race 2.0</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--Arm Groups-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Kijin_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
-							<value>
-								<li>LeftArm</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Kijin_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
-							<value>
-								<li>RightArm</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Kijin_Body"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
-							<value>
-								<li>LeftShoulder</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Kijin_Body"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
-							<value>
-								<li>RightShoulder</li>
-							</value>
-						</li>
-
-						<!--Natural Armor-->
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Kijin_Body"]/corePart/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Kijin_Body"]/corePart/parts/li[def="Neck"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Kijin_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Kijin_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Kijin_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Kijin_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Kijin_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Kijin_Horn"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Kijin_Body"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Kijin_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Kijin_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Kijin_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Kijin_Body"]/corePart/parts/li[def="Leg"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Kijin_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Kijin_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kijin 2.0/PawnKindDefs/PawnKind_Kijin.xml b/Patches/Kijin 2.0/PawnKindDefs/PawnKind_Kijin.xml
deleted file mode 100644
index 6bc7b6c2a2..0000000000
--- a/Patches/Kijin 2.0/PawnKindDefs/PawnKind_Kijin.xml	
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Kijin Race 2.0</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[
-								@Name="KijinOutlanderBase" or
-								@Name="KijinMercenaryBase"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>45</min>
-										<max>60</max>
-									</primaryMagazineCount>
-									<sidearms>
-										<li>
-											<generateChance>0.5</generateChance>
-											<sidearmMoney>
-												<min>20</min>
-												<max>120</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_Sidearm_Melee</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kijin 2.0/Scenario/Kijin_Scenario.xml b/Patches/Kijin 2.0/Scenario/Kijin_Scenario.xml
deleted file mode 100644
index 82555851c8..0000000000
--- a/Patches/Kijin 2.0/Scenario/Kijin_Scenario.xml	
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Kijin Race 2.0</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ScenarioDef[defName="Kijin_Scenario"]/scenario/parts</xpath>
-							<value>
-								<li Class="ScenPart_StartingThing_Defined">
-									<def>StartingThing_Defined</def>
-									<thingDef>Ammo_Arrow_Venom</thingDef>
-									<count>150</count>
-								</li>
-							</value>
-						</li>
-
-						<!--Couldn't get it to play nicely with a conditional-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/FactionDef[defName="Kijin_Player"]/apparelStuffFilter/thingDefs</xpath>
-							<value>
-								<li>Steel</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kijin 2.0/ThingDef_Misc/Kijin_Apparel.xml b/Patches/Kijin 2.0/ThingDef_Misc/Kijin_Apparel.xml
deleted file mode 100644
index 089ea526e2..0000000000
--- a/Patches/Kijin 2.0/ThingDef_Misc/Kijin_Apparel.xml	
+++ /dev/null
@@ -1,249 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Kijin Race 2.0</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--========= Vest =========-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kijin_FlakVest"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<Bulk>5</Bulk>
-								<WornBulk>3</WornBulk>
-								<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-								<ArmorRating_Sharp>6</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kijin_FlakVest"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>9</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kijin_FlakVest"]/statBases/Mass</xpath>
-							<value>
-								<Mass>13.5</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kijin_FlakVest"]/costStuffCount</xpath>
-							<value>
-								<costStuffCount>50</costStuffCount>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kijin_FlakVest"]/costList/Steel</xpath>
-							<value>
-								<Steel>70</Steel>
-							</value>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="Kijin_FlakVest"]/equippedStatOffsets/MoveSpeed</xpath>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="Kijin_FlakVest"]/statBases/ArmorRating_Heat</xpath>
-						</li>
-
-						<!--========= Inferno Armor =========-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kijin_EpicArmor"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<Bulk>120</Bulk>
-								<WornBulk>15</WornBulk>
-								<ArmorRating_Sharp>14</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kijin_EpicArmor"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>21</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kijin_EpicArmor"]/statBases/Mass</xpath>
-							<value>
-								<Mass>25</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Kijin_EpicArmor"]/apparel/bodyPartGroups</xpath>
-							<value>
-								<li>Hands</li>
-								<li>Feet</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kijin_EpicHelm"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<Bulk>10</Bulk>
-								<WornBulk>3</WornBulk>
-								<ArmorRating_Sharp>12</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kijin_EpicHelm"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>18</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kijin_EpicHelm"]/statBases/Mass</xpath>
-							<value>
-								<Mass>5</Mass>
-							</value>
-						</li>
-
-						<!--========= Dark Power Armor =========-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_PowerArmorDK"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<Bulk>100</Bulk>
-								<WornBulk>15</WornBulk>
-								<ArmorRating_Sharp>20</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_PowerArmorDK"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>45</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_PowerArmorDK"]/statBases/Mass</xpath>
-							<value>
-								<Mass>50</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_PowerArmorDK"]/statBases/MaxHitPoints</xpath>
-							<value>
-								<MaxHitPoints>500</MaxHitPoints>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_PowerArmorDK"]/statBases/Flammability</xpath>
-							<value>
-								<Flammability>0</Flammability>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Apparel_PowerArmorDK"]/costList</xpath>
-							<value>
-								<DevilstrandCloth>50</DevilstrandCloth>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Apparel_PowerArmorDK"]/equippedStatOffsets</xpath>
-							<value>
-								<CarryWeight>80</CarryWeight>
-								<CarryBulk>10</CarryBulk>
-								<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-								<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="Apparel_PowerArmorDK"]/equippedStatOffsets/MoveSpeed</xpath>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Apparel_PowerArmorDK"]/apparel/bodyPartGroups</xpath>
-							<value>
-								<li>Hands</li>
-								<li>Feet</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_PowerArmorHelmetDK"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<Bulk>5</Bulk>
-								<WornBulk>1</WornBulk>
-								<ArmorRating_Sharp>16</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_PowerArmorHelmetDK"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>36</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_PowerArmorHelmetDK"]/statBases/MaxHitPoints</xpath>
-							<value>
-								<MaxHitPoints>240</MaxHitPoints>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_PowerArmorHelmetDK"]/statBases/Flammability</xpath>
-							<value>
-								<Flammability>0</Flammability>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_PowerArmorHelmetDK"]/costList/Plasteel</xpath>
-							<value>
-								<Plasteel>45</Plasteel>
-								<DevilstrandCloth>20</DevilstrandCloth>
-							</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="Apparel_PowerArmorHelmetDK"]/apparel/immuneToToxGasExposure</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="Apparel_PowerArmorHelmetDK"]/apparel</xpath>
-								<value>
-									<immuneToToxGasExposure>true</immuneToToxGasExposure>
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Apparel_PowerArmorHelmetDK"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<AimingAccuracy>0.15</AimingAccuracy>
-									<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-									<SmokeSensitivity>-1</SmokeSensitivity>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kijin 2.0/ThingDef_Misc/Kijin_Weapons_Melee.xml b/Patches/Kijin 2.0/ThingDef_Misc/Kijin_Weapons_Melee.xml
deleted file mode 100644
index 555fa910e8..0000000000
--- a/Patches/Kijin 2.0/ThingDef_Misc/Kijin_Weapons_Melee.xml	
+++ /dev/null
@@ -1,281 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Kijin Race 2.0</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--========= Melee =========-->
-
-						<!--Polearm counts as Glaive-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kijin_Polearm"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>shaft</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>6</power>
-										<cooldownTime>1.31</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>2.9</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>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Kijin_Polearm"]/statBases</xpath>
-							<value>
-								<MeleeCounterParryBonus>1.08</MeleeCounterParryBonus>
-								<Bulk>10</Bulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Kijin_Polearm"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.22</MeleeCritChance>
-									<MeleeParryChance>1.53</MeleeParryChance>
-									<MeleeDodgeChance>0.67</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-						<!--Mace with 2kg mass-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kijin_Mace"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>4</power>
-										<cooldownTime>1.78</cooldownTime>
-										<armorPenetrationBlunt>1</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>22</power>
-										<cooldownTime>1.9</cooldownTime>
-										<chanceFactor>2.14</chanceFactor>
-										<armorPenetrationBlunt>9</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Kijin_Mace"]/statBases</xpath>
-							<value>
-								<Bulk>5.5</Bulk>
-								<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Kijin_Mace"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.42</MeleeCritChance>
-									<MeleeParryChance>0.24</MeleeParryChance>
-									<MeleeDodgeChance>0.2</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-						<!--30kg, 12.5m/s swing, top heavy-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kijin_100tHammer"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>52</power>
-										<cooldownTime>8.43</cooldownTime>
-										<chanceFactor>1</chanceFactor>
-										<armorPenetrationBlunt>23.438</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Kijin_100tHammer"]/statBases</xpath>
-							<value>
-								<Bulk>15.5</Bulk>
-								<MeleeCounterParryBonus>0.07</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Kijin_100tHammer"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<!--Crit is technically 15 according to sheet. Toned down for obvious reasons-->
-									<MeleeCritChance>2</MeleeCritChance>
-									<MeleeParryChance>0.05</MeleeParryChance>
-									<MeleeDodgeChance>0.05</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-						<!--Dagger : Double Parry length, two handed-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kijin_PoisonDagger"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>point</label>
-										<capacities>
-											<li>KijinPoisonDagger</li>
-										</capacities>
-										<power>6</power>
-										<cooldownTime>1.26</cooldownTime>
-										<chanceFactor>1.33</chanceFactor>
-										<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.42</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Kijin_PoisonDagger"]/statBases</xpath>
-							<value>
-								<Bulk>3</Bulk>
-								<MeleeCounterParryBonus>0.2</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Kijin_PoisonDagger"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>1</MeleeCritChance>
-									<MeleeParryChance>0.6</MeleeParryChance>
-									<MeleeDodgeChance>0.05</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-						<!--Fireblade : Royalty Only-->
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="Kijin_FlameSword"]</xpath>
-							<match Class="PatchOperationSequence">
-								<operations>
-									<li Class="PatchOperationReplace">
-										<xpath>Defs/ThingDef[defName="Kijin_FlameSword"]/tools</xpath>
-										<value>
-											<tools>
-												<li Class="CombatExtended.ToolCE">
-													<label>edge</label>
-													<capacities>
-														<li>KijinSword</li>
-													</capacities>
-													<power>22</power>
-													<cooldownTime>2.06</cooldownTime>
-													<chanceFactor>1.33</chanceFactor>
-													<armorPenetrationBlunt>0</armorPenetrationBlunt>
-													<armorPenetrationSharp>0</armorPenetrationSharp>
-													<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-												</li>
-											</tools>
-										</value>
-									</li>
-
-									<li Class="PatchOperationAdd">
-										<xpath>Defs</xpath>
-										<value>
-											<DamageDef ParentName="Flame">
-												<defName>Flame_Nopenetration</defName>
-												<harmAllLayersUntilOutside>false</harmAllLayersUntilOutside>
-											</DamageDef>
-										</value>
-									</li>
-
-									<li Class="PatchOperationReplace">
-										<xpath>Defs/ManeuverDef[defName="Kijin_Sword"]/verb/verbClass</xpath>
-										<value>
-											<verbClass>CombatExtended.Verb_MeleeAttackCE</verbClass>
-										</value>
-									</li>
-
-									<li Class="PatchOperationAdd">
-										<xpath>Defs/ThingDef[defName="Kijin_FlameSword"]/statBases</xpath>
-										<value>
-											<Bulk>8.5</Bulk>
-											<MeleeCounterParryBonus>0.90</MeleeCounterParryBonus>
-										</value>
-									</li>
-
-									<li Class="PatchOperationAdd">
-										<xpath>Defs/ThingDef[defName="Kijin_FlameSword"]</xpath>
-										<value>
-											<equippedStatOffsets>
-												<MeleeCritChance>1.10</MeleeCritChance>
-												<MeleeParryChance>0.70</MeleeParryChance>
-												<MeleeDodgeChance>0.50</MeleeDodgeChance>
-											</equippedStatOffsets>
-										</value>
-									</li>
-
-								</operations>
-							</match>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kijin 2.0/ThingDef_Misc/Kijin_Weapons_Ranged.xml b/Patches/Kijin 2.0/ThingDef_Misc/Kijin_Weapons_Ranged.xml
deleted file mode 100644
index 6ec8808401..0000000000
--- a/Patches/Kijin 2.0/ThingDef_Misc/Kijin_Weapons_Ranged.xml	
+++ /dev/null
@@ -1,354 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Kijin Race 2.0</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--========= Ranged =========-->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Kijin_Fan</defName>
-							<statBases>
-								<SightsEfficiency>0.8</SightsEfficiency>
-								<ShotSpread>1</ShotSpread>
-								<SwayFactor>2</SwayFactor>
-								<Bulk>4.00</Bulk>
-								<RangedWeapon_Cooldown>0.8</RangedWeapon_Cooldown>
-							</statBases>
-							<costList>
-								<WoodLog>30</WoodLog>
-								<DevilstrandCloth>60</DevilstrandCloth>
-								<Prometheum>10</Prometheum>
-							</costList>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_KijinFlame</defaultProjectile>
-								<warmupTime>1.2</warmupTime>
-								<range>12</range>
-								<soundCast>ThrowMolotovCocktail</soundCast>
-								<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</Properties>
-							<FireModes />
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kijin_Fan"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>8</power>
-										<cooldownTime>1.6</cooldownTime>
-										<armorPenetration>0.102</armorPenetration>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>8</power>
-										<cooldownTime>1.6</cooldownTime>
-										<armorPenetration>0.075</armorPenetration>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<CombatExtended.AmmoSetDef>
-									<defName>AmmoSet_ArrowKijinFlame</defName>
-									<label>flame arrows</label>
-									<ammoTypes>
-										<Ammo_Arrow_Flame>Projectile_StreamlinedArrow_Flame</Ammo_Arrow_Flame>
-									</ammoTypes>
-								</CombatExtended.AmmoSetDef>
-							</value>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Kijin_FlameBow</defName>
-							<statBases>
-								<SightsEfficiency>0.8</SightsEfficiency>
-								<ShotSpread>1</ShotSpread>
-								<SwayFactor>2</SwayFactor>
-								<Bulk>4.00</Bulk>
-								<RangedWeapon_Cooldown>0.8</RangedWeapon_Cooldown>
-							</statBases>
-							<costList>
-								<WoodLog>35</WoodLog>
-							</costList>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Projectile_StreamlinedArrow_Flame</defaultProjectile>
-								<warmupTime>0.8</warmupTime>
-								<range>32</range>
-								<soundCast>Bow_Small</soundCast>
-							</Properties>
-							<AmmoUser>
-								<ammoSet>AmmoSet_ArrowKijinFlame</ammoSet>
-							</AmmoUser>
-							<FireModes />
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kijin_FlameBow"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>limb</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>8</power>
-										<cooldownTime>1.6</cooldownTime>
-										<armorPenetration>0.102</armorPenetration>
-										<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>nock</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>8</power>
-										<cooldownTime>1.6</cooldownTime>
-										<armorPenetration>0.075</armorPenetration>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<CombatExtended.AmmoSetDef>
-									<defName>AmmoSet_ArrowKijinVenom</defName>
-									<label>venom arrows</label>
-									<ammoTypes>
-										<Ammo_Arrow_Venom>Projectile_StreamlinedArrow_Venom</Ammo_Arrow_Venom>
-									</ammoTypes>
-								</CombatExtended.AmmoSetDef>
-							</value>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Kijin_PosionBow</defName>
-							<statBases>
-								<SightsEfficiency>0.8</SightsEfficiency>
-								<ShotSpread>0.5</ShotSpread>
-								<SwayFactor>1</SwayFactor>
-								<Bulk>4.00</Bulk>
-								<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-							</statBases>
-							<costList>
-								<WoodLog>35</WoodLog>
-							</costList>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Projectile_StreamlinedArrow_Venom</defaultProjectile>
-								<warmupTime>1</warmupTime>
-								<range>35</range>
-								<soundCast>Bow_Small</soundCast>
-							</Properties>
-							<AmmoUser>
-								<ammoSet>AmmoSet_ArrowKijinVenom</ammoSet>
-							</AmmoUser>
-							<FireModes />
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kijin_PosionBow"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>limb</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>8</power>
-										<cooldownTime>1.6</cooldownTime>
-										<armorPenetration>0.102</armorPenetration>
-										<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>nock</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>8</power>
-										<cooldownTime>1.6</cooldownTime>
-										<armorPenetration>0.075</armorPenetration>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kijin_PosionBow"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>limb</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>8</power>
-										<cooldownTime>1.6</cooldownTime>
-										<armorPenetration>0.102</armorPenetration>
-										<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>nock</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>8</power>
-										<cooldownTime>1.6</cooldownTime>
-										<armorPenetration>0.075</armorPenetration>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kijin_SmokeBomb"]</xpath>
-							<value>
-								<ThingDef ParentName="KijinWeapon">
-									<defName>Kijin_SmokeBomb</defName>
-									<equipmentType>Primary</equipmentType>
-									<label>kijin smokebomb</label>
-									<tickerType>Normal</tickerType>
-									<description>It will release a cloud of smoke, obscuring incoming shots and preventing turrets from locking on.</description>
-									<graphicData>
-										<texPath>Kijin/Item/SmokeBomb</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<soundInteract>Interact_Grenade</soundInteract>
-									<statBases>
-										<Mass>0.539</Mass>
-										<Bulk>1.05</Bulk>
-										<MarketValue>8.88</MarketValue>
-										<SightsEfficiency>1.0</SightsEfficiency>
-										<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-										<WorkToMake>24000</WorkToMake>
-									</statBases>
-									<recipeMaker>
-										<researchPrerequisite>KijinSmokeWeapons</researchPrerequisite>
-										<skillRequirements>
-											<Crafting>6</Crafting>
-										</skillRequirements>
-										<soundWorking>Recipe_Tailor</soundWorking>
-										<unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
-									</recipeMaker>
-									<costStuffCount>25</costStuffCount>
-									<stuffCategories>
-										<li>Fabric</li>
-										<li>Leathery</li>
-									</stuffCategories>
-									<costList>
-										<SmokeleafLeaves>25</SmokeleafLeaves>
-									</costList>
-									<weaponTags>
-										<li>KijinGrenadeSmoke</li>
-									</weaponTags>
-									<thingCategories>
-										<li>Grenades</li>
-									</thingCategories>
-									<verbs>
-										<li Class="CombatExtended.VerbPropertiesCE">
-											<label>throw smoke grenade</label>
-											<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-											<hasStandardCommand>true</hasStandardCommand>
-											<range>10</range>
-											<warmupTime>0.8</warmupTime>
-											<noiseRadius>4</noiseRadius>
-											<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-											<soundCast>ThrowGrenade</soundCast>
-											<targetParams>
-												<canTargetLocations>true</canTargetLocations>
-											</targetParams>
-											<defaultProjectile>Proj_KijinSmoke</defaultProjectile>
-											<onlyManualCast>true</onlyManualCast>
-											<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-										</li>
-									</verbs>
-									<comps>
-										<li Class="CombatExtended.CompProperties_ExplosiveCE">
-											<explosiveDamageType>Smoke</explosiveDamageType>
-											<explosiveRadius>3</explosiveRadius>
-											<postExplosionGasType>BlindSmoke</postExplosionGasType>
-											<preExplosionSpawnChance>1</preExplosionSpawnChance>
-										</li>
-									</comps>
-								</ThingDef>
-							</value>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>KijinDarkMatter</defName>
-							<statBases>
-								<SightsEfficiency>1.0</SightsEfficiency>
-								<ShotSpread>1</ShotSpread>
-								<SwayFactor>2</SwayFactor>
-								<Bulk>1</Bulk>
-								<RangedWeapon_Cooldown>0.8</RangedWeapon_Cooldown>
-							</statBases>
-							<Properties>
-								<label>throw dark matter</label>
-								<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<range>10</range>
-								<warmupTime>0.8</warmupTime>
-								<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-								<soundCast>ThrowGrenade</soundCast>
-								<defaultProjectile>Projectile_KijinDarkmatter</defaultProjectile>
-								<onlyManualCast>true</onlyManualCast>
-							</Properties>
-							<FireModes />
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="KijinDarkMatter"]/verbs</xpath>
-							<value>
-								<verbs>
-									<li Class="CombatExtended.VerbPropertiesCE">
-										<label>throw dark matter</label>
-										<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-										<hasStandardCommand>true</hasStandardCommand>
-										<range>10</range>
-										<warmupTime>0.8</warmupTime>
-										<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-										<soundCast>ThrowGrenade</soundCast>
-										<defaultProjectile>Projectile_KijinDarkmatter</defaultProjectile>
-										<onlyManualCast>true</onlyManualCast>
-										<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-									</li>
-								</verbs>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kijin 2.0/ThingDefs_Races/Race_Kijin.xml b/Patches/Kijin 2.0/ThingDefs_Races/Race_Kijin.xml
deleted file mode 100644
index 9a69d18fa1..0000000000
--- a/Patches/Kijin 2.0/ThingDefs_Races/Race_Kijin.xml	
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Kijin Race 2.0</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Kijin"]/comps</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Kijin"]</xpath>
-								<value>
-									<comps />
-								</value>
-							</nomatch>
-							<match Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Kijin"]</xpath>
-								<value>
-								</value>
-							</match>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Kijin"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Humanoid</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Kijin"]/comps</xpath>
-							<value>
-								<li>
-									<compClass>CombatExtended.CompPawnGizmo</compClass>
-								</li>
-								<li Class="CombatExtended.CompProperties_Suppressable" />
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Kijin"]/statBases</xpath>
-							<value>
-								<MeleeCritChance>1</MeleeCritChance>
-								<MeleeParryChance>1.25</MeleeParryChance>
-								<Suppressability>1</Suppressability>
-								<SmokeSensitivity>1</SmokeSensitivity>
-								<CarryBulk>30</CarryBulk>
-								<CarryWeight>60</CarryWeight>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Kijin"]/statBases/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>1.10</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Kijin"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left fist</label>
-										<capacities>
-											<li>KijinFlameSmash</li>
-										</capacities>
-										<extraMeleeDamages>
-											<li>
-												<def>Flame</def>
-												<amount>1</amount>
-												<chance>0.3</chance>
-											</li>
-										</extraMeleeDamages>
-										<power>2</power>
-										<cooldownTime>1.12</cooldownTime>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.586</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>right fist</label>
-										<capacities>
-											<li>KijinStunPunch</li>
-										</capacities>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>5</amount>
-												<chance>0.3</chance>
-											</li>
-										</extraMeleeDamages>
-										<power>2</power>
-										<cooldownTime>1.12</cooldownTime>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.586</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>5</power>
-										<cooldownTime>2.99</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ManeuverDef[defName="KijinFlameSmash"]/verb/meleeDamageDef</xpath>
-							<value>
-								<meleeDamageDef>Flame_Secondary</meleeDamageDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ManeuverDef[defName="KijinStunPunch"]/verb/meleeDamageDef</xpath>
-							<value>
-								<meleeDamageDef>Blunt</meleeDamageDef>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kill la Kill Styles Pack/ThingDefs_Misc/Apparel_KLK.xml b/Patches/Kill la Kill Styles Pack/ThingDefs_Misc/Apparel_KLK.xml
deleted file mode 100644
index 8c59b677b9..0000000000
--- a/Patches/Kill la Kill Styles Pack/ThingDefs_Misc/Apparel_KLK.xml	
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>K.L.K - Styles Apparel Pack</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--Senketsu-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="KLK_SYBbase"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>6</ArmorRating_Sharp>
-								<Bulk>5</Bulk>
-								<WornBulk>3</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="KLK_SYBbase"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>5.4</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--Active-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="KLK_SYBactive"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>16.8</ArmorRating_Sharp>
-								<Bulk>5</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="KLK_SYBactive"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>27</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="KLK_SYBactive"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>0.94</MeleeDodgeChance>
-								<Suppressability>-0.8</Suppressability>
-								<MeleeCritChance>0.08</MeleeCritChance>
-								<MeleeParryChance>0.1</MeleeParryChance>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kill la Kill Styles Pack/ThingDefs_Misc/ScissorBlade.xml b/Patches/Kill la Kill Styles Pack/ThingDefs_Misc/ScissorBlade.xml
deleted file mode 100644
index f62df0b9cf..0000000000
--- a/Patches/Kill la Kill Styles Pack/ThingDefs_Misc/ScissorBlade.xml	
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>K.L.K - Styles Apparel Pack</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ScissorBlade"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>3</power>
-										<cooldownTime>0.95</cooldownTime>
-										<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-										<armorPenetrationSharp>0</armorPenetrationSharp>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>blade</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>11</power>
-										<cooldownTime>0.95</cooldownTime>
-										<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-										<armorPenetrationSharp>18</armorPenetrationSharp>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>Ultimate Skill - The Scissor Blade Decapitation Mode</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>22</power>
-										<cooldownTime>2.36</cooldownTime>
-										<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
-										<armorPenetrationSharp>6.4</armorPenetrationSharp>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>Fiber Lost</label>
-										<capacities>
-											<li>KLKSBCut</li>
-										</capacities>
-										<power>26</power>
-										<cooldownTime>2.36</cooldownTime>
-										<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
-										<armorPenetrationSharp>6.4</armorPenetrationSharp>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ScissorBlade"]/statBases</xpath>
-							<value>
-								<Bulk>5</Bulk>
-								<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ScissorBlade"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>0.58</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ScissorBlade"]/equippedStatOffsets/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>2</ArmorRating_Sharp>
-								<MeleeCritChance>1.25</MeleeCritChance>
-								<MeleeParryChance>1.44</MeleeParryChance>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Killzone Concept Armor Set/Apparel_Armor.xml b/Patches/Killzone Concept Armor Set/Apparel_Armor.xml
deleted file mode 100644
index 45733ca907..0000000000
--- a/Patches/Killzone Concept Armor Set/Apparel_Armor.xml	
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Killzone Concept Armor Set</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Heavy Trooper Armor === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Bot_Soldier_Armor"]/statBases</xpath>
-					<value>
-						<Bulk>75</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bot_Soldier_Armor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14.7</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bot_Soldier_Armor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>28.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Bot_Soldier_Armor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>20</CarryBulk>
-						<CarryWeight>25</CarryWeight>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Bot_Soldier_Armor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Bot_Soldier_Armor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Heavy Trooper Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Bot_Soldier_Helmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.50</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Bot_Soldier_Helmet"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bot_Soldier_Helmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bot_Soldier_Helmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>20</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Bot_Soldier_Helmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Killzone Concept Armor Set/Ranged_Industrial.xml b/Patches/Killzone Concept Armor Set/Ranged_Industrial.xml
deleted file mode 100644
index 54870ba394..0000000000
--- a/Patches/Killzone Concept Armor Set/Ranged_Industrial.xml	
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Killzone Concept Armor Set</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "StA25_SMG" or
-						defName = "StA-3_HMG"
-						]/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>
-				</li>
-
-				<!-- StA25 Vlug -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>StA25_SMG</defName>
-					<statBases>
-						<Mass>3.0</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>0.49</SwayFactor>
-						<Bulk>7.5</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.04</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_46x30mm_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>35</range>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.0</reloadTime>
-						<ammoSet>AmmoSet_46x30mm</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>10</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- StA-3 Light Machine Gun -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>StA-3_HMG</defName>
-					<statBases>
-						<Mass>8.50</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.65</SwayFactor>
-						<Bulk>11.0</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.25</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>60</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>5.2</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_MachineGun</li>
-						<li>CE_AI_Suppressive</li>
-						<li>Bipod_LMG</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kit's Gunpowder Weapons/Ammo_KitsGunpowder.xml b/Patches/Kit's Gunpowder Weapons/Ammo_KitsGunpowder.xml
deleted file mode 100644
index 6ecb3e1a8e..0000000000
--- a/Patches/Kit's Gunpowder Weapons/Ammo_KitsGunpowder.xml	
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Kit's Gunpowder Weapons</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ==================== ThingCategories ========================== -->
-
-						<ThingCategoryDef>
-							<defName>LargeCannonBall</defName>
-							<label>Large Cannon Ball</label>
-							<parent>AmmoShells</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberMortar</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_BlunderShot</defName>
-							<label>Blunder Shot</label>
-							<ammoTypes>
-								<Ammo_MusketBall>Bullet_BlunderShot_Ball</Ammo_MusketBall>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_LargeCannonBall</defName>
-							<label>Large Cannon Ball</label>
-							<ammoTypes>
-								<Shell_LargeCannonBall_Steel>Bullet_LargeCannonBall_Steel</Shell_LargeCannonBall_Steel>
-							</ammoTypes>
-							<isMortarAmmoSet>true</isMortarAmmoSet>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<!-- ==== Large Steel Cannon Ball	==== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBaseCraftableBase">
-							<defName>Shell_LargeCannonBall_Steel</defName>
-							<label>Large Cannon Ball</label>
-							<graphicData>
-								<texPath>Things/Ammo/Cannon/BlackPowder/Cannon_Round</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.5</MarketValue>
-								<Mass>16</Mass>
-								<Bulk>12</Bulk>
-							</statBases>
-							<ammoClass>CannonBall</ammoClass>
-							<detonateProjectile>Bullet_LargeCannonBall_Steel</detonateProjectile>
-							<comps>
-								<!-- Vanilla values -->
-								<li Class="CompProperties_Explosive">
-									<explosiveRadius>4</explosiveRadius>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<!--<explosiveExpandPerStackcount>0.4</explosiveExpandPerStackcount>-->
-									<startWickHitPointsPercent>0.7</startWickHitPointsPercent>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-									<explodeOnKilled>True</explodeOnKilled>
-									<wickTicks>30~60</wickTicks>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<!-- ==== Blunder Shot ==== -->
-						<ThingDef ParentName="Base12GaugeBullet">
-							<defName>Bullet_BlunderShot_Ball</defName>
-							<label>lead ball</label>
-							<graphicData>
-								<texPath>Things/Projectile/Shotgun_Pellet</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>10</damageAmountBase>
-								<pelletCount>10</pelletCount>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-								<spreadMult>22.5</spreadMult>
-								<speed>76</speed>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==== Large Steel Cannon Ball ==== -->
-						<ThingDef ParentName="Base81mmMortarShell">
-							<defName>Bullet_LargeCannonBall_Steel</defName>
-							<label>Large Cannon Ball</label>
-							<graphicData>
-								<texPath>Things/Projectile/Mortar/Illumination</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>56</damageAmountBase>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>128</armorPenetrationBlunt>
-								<explosionRadius>2.5</explosionRadius>
-								<flyOverhead>true</flyOverhead>
-								<soundExplode>MortarBomb_Explode</soundExplode>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<ai_IsIncendiary>false</ai_IsIncendiary>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Large>4</Fragment_Large>
-										<Fragment_Small>15</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<!-- ==== Mortar Grenade ==== -->
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_MortarGrenade</defName>
-							<label>Make Mortar Grenade x5</label>
-							<description>Craft 5 Mortar Grenades</description>
-							<jobString>Making Mortar Grenades</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>15</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>FSX</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_MortarGrenade>5</Ammo_MortarGrenade>
-							</products>
-							<workAmount>8500</workAmount>
-						</RecipeDef>
-
-						<!-- ==== Large Steel Cannon Ball ==== -->
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeShell_LargeCannonBall_Steel</defName>
-							<label>Make Steel Large Cannon Balls x5</label>
-							<description>Craft 5 Steel Large Cannon Balls</description>
-							<jobString>Making Steel Large Cannon Balls</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>100</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Shell_LargeCannonBall_Steel>5</Shell_LargeCannonBall_Steel>
-							</products>
-							<workAmount>28000</workAmount>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kit's Gunpowder Weapons/KitsGunpowder_Guns.xml b/Patches/Kit's Gunpowder Weapons/KitsGunpowder_Guns.xml
deleted file mode 100644
index 11e650208e..0000000000
--- a/Patches/Kit's Gunpowder Weapons/KitsGunpowder_Guns.xml	
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Kit's Gunpowder Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Tools ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="KIT_Gun_Arquebus" or
-						defName="KIT_Gun_Blunderbuss" or
-						defName="KIT_Gun_HandMortar"
-						]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="KIT_Gun_BayonetMusket"]/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>bayonet</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.49</cooldownTime>
-								<armorPenetrationBlunt>2.16</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.44</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="KIT_Gun_BayonetMusket"]/weaponTags</xpath>
-					<value>
-						<li>NoSwitch</li>
-					</value>
-				</li>
-
-				<!-- ========== Guns ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>KIT_Gun_Arquebus</defName>
-					<statBases>
-						<Mass>5</Mass>
-						<Bulk>14</Bulk>
-						<SwayFactor>1.90</SwayFactor>
-						<ShotSpread>0.18</ShotSpread>
-						<SightsEfficiency>0.80</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_FastMusketBall</defaultProjectile>
-						<warmupTime>2</warmupTime>
-						<range>34</range>
-						<soundCast>KIT_Arquebus</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>5</AmmoGenPerMagOverride>
-						<reloadTime>8</reloadTime>
-						<ammoSet>AmmoSet_FastMusketBall</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>KIT_Gun_BayonetMusket</defName>
-					<statBases>
-						<Mass>5.2</Mass>
-						<Bulk>15</Bulk>
-						<SwayFactor>2.02</SwayFactor>
-						<ShotSpread>0.10</ShotSpread>
-						<SightsEfficiency>0.80</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_FastMusketBall</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>40</range>
-						<soundCast>KIT_BayonetMusket</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>5</AmmoGenPerMagOverride>
-						<reloadTime>8</reloadTime>
-						<ammoSet>AmmoSet_FastMusketBall</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>KIT_Gun_Blunderbuss</defName>
-					<statBases>
-						<Mass>4.8</Mass>
-						<Bulk>14.9</Bulk>
-						<SwayFactor>1.20</SwayFactor>
-						<ShotSpread>0.24</ShotSpread>
-						<SightsEfficiency>0.80</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.35</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_BlunderShot_Ball</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>16</range>
-						<soundCast>Shot_Shotgun_NoRack</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<ammoConsumedPerShotCount>7</ammoConsumedPerShotCount>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>7</reloadTime>
-						<ammoSet>AmmoSet_BlunderShot</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>KIT_Gun_HandMortar</defName>
-					<statBases>
-						<Mass>4.8</Mass>
-						<Bulk>14.9</Bulk>
-						<SwayFactor>1.92</SwayFactor>
-						<ShotSpread>0.30</ShotSpread>
-						<SightsEfficiency>0.85</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.35</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_MortarGrenade</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>20</range>
-						<soundCast>KIT_HandMortar</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>True</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>8</reloadTime>
-						<ammoSet>AmmoSet_MortarGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kit's Gunpowder Weapons/KitsGunpowder_Security.xml b/Patches/Kit's Gunpowder Weapons/KitsGunpowder_Security.xml
deleted file mode 100644
index 5b35eb7480..0000000000
--- a/Patches/Kit's Gunpowder Weapons/KitsGunpowder_Security.xml	
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Kit's Gunpowder Weapons</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName = "KIT_Turret_Organ" or
-						defName = "KIT_Turret_12Pounder"or
-						defName = "KIT_Turret_Bombard"
-						]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "KIT_Turret_Organ" or
-						defName = "KIT_Turret_12Pounder" or
-						defName = "KIT_Turret_Bombard"
-						]/thingClass </xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "KIT_Turret_Organ" or
-						defName = "KIT_Turret_12Pounder"or
-						defName = "KIT_Turret_Bombard"
-						]/fillPercent </xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName = "KIT_Turret_Bombard"
-						]/placeWorkers/li["PlaceWorker_ShowTurretRadius"] </xpath>
-				</li>
-
-				<!-- ========== 12 Pounder ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>KIT_Gun_12Pounder</defName>
-					<statBases>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.4</ShotSpread>
-						<SwayFactor>1</SwayFactor>
-						<Bulk>18</Bulk>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_CannonBall_Round</defaultProjectile>
-						<warmupTime>1.4</warmupTime>
-						<range>108</range>
-						<soundCast>KIT_Shot_12Pounder</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<recoilPattern>Mounted</recoilPattern>
-						<targetParams>
-							<canTargetLocations>True</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>9.6</reloadTime>
-						<ammoSet>AmmoSet_CannonBall</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>false</noSingleShot>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "KIT_Gun_12Pounder"]/weaponTags</xpath>
-					<value>
-						<li>TurretGun</li>
-					</value>
-				</li>
-
-				<!-- Organ Gun -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>KIT_Gun_Organ</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.59</SwayFactor>
-						<Bulk>15.54</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_FastMusketBall</defaultProjectile>
-						<warmupTime>3.2</warmupTime>
-						<range>54</range>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>KIT_Shot_Organ</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-						<targetParams>
-							<canTargetLocations>True</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>9.6</reloadTime>
-						<ammoSet>AmmoSet_FastMusketBall</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags Inherit="False">
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Bombard - Weapon ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>KIT_Gun_Bombard</defName>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-						<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_LargeCannonBall_Steel</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<minRange>15</minRange>
-						<range>156</range>
-						<burstShotCount>1</burstShotCount>
-						<soundCast>KIT_Shot_Bombard</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>8</muzzleFlashScale>
-						<circularError>1.2</circularError>
-						<requireLineOfSight>false</requireLineOfSight>
-						<indirectFirePenalty>0.3</indirectFirePenalty>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>7.5</reloadTime>
-						<ammoSet>AmmoSet_LargeCannonBall</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "KIT_Gun_Bombard"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Charges">
-							<chargeSpeeds>
-								<li>30</li>
-								<li>50</li>
-								<li>70</li>
-								<li>90</li>
-							</chargeSpeeds>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "KIT_Gun_Bombard"]/weaponTags</xpath>
-					<value>
-						<li>TurretGun</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kit's Industrial Weapons/KitsIndustrial_Guns.xml b/Patches/Kit's Industrial Weapons/KitsIndustrial_Guns.xml
deleted file mode 100644
index 36e69164e0..0000000000
--- a/Patches/Kit's Industrial Weapons/KitsIndustrial_Guns.xml	
+++ /dev/null
@@ -1,367 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Kit's Industrial Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Tools ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="KIT_Gun_SemiAutomaticPistol"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="KIT_Gun_PrecisionLMG" or
-						defName="KIT_Gun_BoltSMG" or
-						defName="KIT_Gun_AntiqueSniperRifle"
-						]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="KIT_Gun_BayonetRifle"]/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>bayonet</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>2.14</cooldownTime>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>bayonet</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.49</cooldownTime>
-								<armorPenetrationBlunt>2.16</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.44</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="KIT_Bazooka"]/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>
-				</li>
-
-				<!-- ========== Mauser C96 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>KIT_Gun_SemiAutomaticPistol</defName>
-					<statBases>
-						<Mass>1.13</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.42</SwayFactor>
-						<Bulk>3.12</Bulk>
-						<WorkToMake>8000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_763x25mmMauser_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>KIT_SemiAutomaticPistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_763x25mmMauser</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-						<li>SimpleGun</li>
-						<li>Pistol</li>
-					</weaponTags>
-					<researchPrerequisite>KIT_EarlyGunsmithing</researchPrerequisite>
-				</li>
-
-				<!-- ========== Bren LMG ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>KIT_Gun_PrecisionLMG</defName>
-					<statBases>
-						<Mass>10.35</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.53</SwayFactor>
-						<Bulk>12.56</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.22</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>59</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_303British</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- ========== Mosin-Nagant scoped ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>KIT_Gun_AntiqueSniperRifle</defName>
-					<statBases>
-						<Mass>4.27</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.21</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.69</SwayFactor>
-						<Bulk>12.32</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.275</warmupTime>
-						<range>75</range>
-						<soundCast>KIT_AntiqueSniperRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Bayonet Rifle ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>KIT_Gun_BayonetRifle</defName>
-					<statBases>
-						<Mass>3.85</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.41</SwayFactor>
-						<Bulk>10.20</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<soundCast>KIT_BayonetRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Bolt SMG ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>KIT_Gun_BoltSMG</defName>
-					<statBases>
-						<Mass>3.63</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.21</SwayFactor>
-						<Bulk>9.43</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.22</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>23</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>36</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>KIT_Bazooka</defName>
-					<statBases>
-						<Mass>7.20</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>2.27</SwayFactor>
-						<Bulk>16.50</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_M6A3_HEAT</defaultProjectile>
-						<warmupTime>1.9</warmupTime>
-						<range>40</range>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kit's Industrial Weapons/KitsIndustrial_Melee.xml b/Patches/Kit's Industrial Weapons/KitsIndustrial_Melee.xml
deleted file mode 100644
index c9c05d5279..0000000000
--- a/Patches/Kit's Industrial Weapons/KitsIndustrial_Melee.xml	
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Kit's Industrial Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Utility Knife === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="KIT_MeleeWeapon_UtilityKnife"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<MeleeCounterParryBonus>0.30</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="KIT_MeleeWeapon_UtilityKnife"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.10</MeleeCritChance>
-						<MeleeParryChance>0.30</MeleeParryChance>
-						<MeleeDodgeChance>0.010</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="KIT_MeleeWeapon_UtilityKnife"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="KIT_MeleeWeapon_UtilityKnife"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1</cooldownTime>
-								<armorPenetrationBlunt>0.56</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.72</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1</cooldownTime>
-								<chanceFactor>1.88</chanceFactor>
-								<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.76</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kit's Roman Weapons/Roman_Security.xml b/Patches/Kit's Roman Weapons/Roman_Security.xml
deleted file mode 100644
index f66e5f528b..0000000000
--- a/Patches/Kit's Roman Weapons/Roman_Security.xml	
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Kit's Roman Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName = "KIT_Turret_Scorpio"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "KIT_Turret_Scorpio"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "KIT_Turret_Scorpio"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<!-- ========== Scorpio - Weapon ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>KIT_Gun_Scorpio</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>1</ShotSpread>
-						<SwayFactor>1</SwayFactor>
-						<Bulk>4.00</Bulk>
-						<RangedWeapon_Cooldown>1.8</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Pilum_Fired</defaultProjectile>
-						<warmupTime>1.4</warmupTime>
-						<range>40</range>
-						<soundCast>KIT_Shot_Scorpio</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>6</reloadTime>
-						<ammoSet>AmmoSet_Javelins</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>false</noSingleShot>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "KIT_Gun_Scorpio"]/weaponTags</xpath>
-					<value>
-						<li>TurretGun</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kit's Roman Weapons/Roman_Shields.xml b/Patches/Kit's Roman Weapons/Roman_Shields.xml
deleted file mode 100644
index e6c9a6f0b2..0000000000
--- a/Patches/Kit's Roman Weapons/Roman_Shields.xml	
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Kit's Roman Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Scutum -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="KIT_Shield_Scutum"]</xpath>
-					<value>
-						<ThingDef ParentName="ShieldBase">
-							<defName>KIT_Shield_Scutum</defName>
-							<label>scutum shield</label>
-							<description>A large stony shield, with the front decoratively painted. Offers a great amount of protection against melee and ranged attacks.</description>
-							<techLevel>Medieval</techLevel>
-							<graphicData>
-								<texPath>Things/Shield/ScutumShield</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>0.83</drawSize>
-							</graphicData>
-							<thingCategories Inherit="False">
-								<li>Shields</li>
-							</thingCategories>
-							<stuffCategories>
-								<li>Stony</li>
-							</stuffCategories>
-							<costStuffCount>80</costStuffCount>
-							<recipeMaker>
-								<researchPrerequisite>Smithing</researchPrerequisite>
-								<recipeUsers>
-									<li>FueledSmithy</li>
-									<li>ElectricSmithy</li>
-								</recipeUsers>
-							</recipeMaker>
-							<statBases>
-								<WorkToMake>12000</WorkToMake>
-								<MaxHitPoints>145</MaxHitPoints>
-								<ArmorRating_Sharp>1.75</ArmorRating_Sharp>
-								<ArmorRating_Blunt>6</ArmorRating_Blunt>
-								<Mass>8</Mass>
-								<Bulk>8</Bulk>
-								<WornBulk>6</WornBulk>
-							</statBases>
-							<equippedStatOffsets>
-								<ReloadSpeed>-0.1</ReloadSpeed>
-								<MeleeHitChance>-1</MeleeHitChance>
-								<ShootingAccuracyPawn>-0.2</ShootingAccuracyPawn>
-								<AimingAccuracy>-0.05</AimingAccuracy>
-								<Suppressability>-0.25</Suppressability>
-								<MeleeCritChance>-0.08</MeleeCritChance>
-								<MeleeParryChance>1.0</MeleeParryChance>
-							</equippedStatOffsets>
-							<apparel>
-								<tags>
-									<li>ClassicalShield</li>
-								</tags>
-							</apparel>
-							<modExtensions>
-								<li Class="CombatExtended.ShieldDefExtension">
-									<shieldCoverage>
-										<li>Hands</li>
-										<li>Arms</li>
-										<li>Shoulders</li>
-										<li>Torso</li>
-										<li>Neck</li>
-									</shieldCoverage>
-									<crouchCoverage>
-										<li>Legs</li>
-									</crouchCoverage>
-									<drawAsTall>false</drawAsTall>
-								</li>
-							</modExtensions>
-						</ThingDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kit's Roman Weapons/Roman_Weapons.xml b/Patches/Kit's Roman Weapons/Roman_Weapons.xml
deleted file mode 100644
index 46f231fc74..0000000000
--- a/Patches/Kit's Roman Weapons/Roman_Weapons.xml	
+++ /dev/null
@@ -1,385 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Kit's Roman Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Dolabra === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="KIT_MeleeWeapon_Dolabra"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.78</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>2.79</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>6.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.63</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>spike</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>3.49</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>6.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.09</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="KIT_MeleeWeapon_Dolabra"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.20</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="KIT_MeleeWeapon_Dolabra"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.03</MeleeCritChance>
-						<MeleeParryChance>0.20</MeleeParryChance>
-						<MeleeDodgeChance>0.27</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<!-- === Pugio === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="KIT_MeleeWeapon_Pugio"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.29</cooldownTime>
-								<armorPenetrationBlunt>0.275</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.42</cooldownTime>
-								<armorPenetrationBlunt>0.396</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.35</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.29</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.275</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.31</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="KIT_MeleeWeapon_Pugio"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="KIT_MeleeWeapon_Pugio"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.63</MeleeCritChance>
-							<MeleeParryChance>0.5</MeleeParryChance>
-							<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="KIT_MeleeWeapon_Pugio"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- Hasta -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="KIT_MeleeWeapon_Hasta"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.35</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.78</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.19</cooldownTime>
-								<chanceFactor>1.00</chanceFactor>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.75</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="KIT_MeleeWeapon_Hasta"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="KIT_MeleeWeapon_Hasta"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.17</MeleeCritChance>
-							<MeleeParryChance>1.45</MeleeParryChance>
-							<MeleeDodgeChance>0.9</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Falx -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="KIT_MeleeWeapon_Falx"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.63</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.7</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>32</power>
-								<cooldownTime>1.56</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>2.268</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.51</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="KIT_MeleeWeapon_Falx"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.29</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<MeleeDodgeChance>0.47</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="KIT_MeleeWeapon_Falx"]/statBases</xpath>
-					<value>
-						<Bulk>7</Bulk>
-						<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<!-- === Plumbata === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="KIT_WeaponRanged_Plumbatae"]</xpath>
-					<value>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseWeaponAndAmmoNeolithic">
-							<defName>KIT_WeaponRanged_Plumbatae</defName>
-							<label>plumbata</label>
-							<description>A handful of darts. Can inflict injuries in close range. Simple but effective.</description>
-							<graphicData>
-								<texPath>Things/Projectile/PlumbataeThrown</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
-							</graphicData>
-							<soundInteract>Interact_Grenade</soundInteract>
-							<statBases>
-								<MarketValue>2.36</MarketValue>
-								<SightsEfficiency>1.0</SightsEfficiency>
-								<ShotSpread>1.5</ShotSpread>
-								<SwayFactor>2.5</SwayFactor>
-								<Bulk>3.5</Bulk>
-								<Mass>0.5</Mass>
-								<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-							</statBases>
-							<equippedAngleOffset>30</equippedAngleOffset>
-							<stackLimit>50</stackLimit>
-							<weaponTags>
-								<li>NeolithicRanged</li>
-								<li>MedievalRangedBasic</li>
-								<li>CE_OneHandedWeapon</li>
-								<li>CE_AI_Rifle</li>
-							</weaponTags>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-							</tradeTags>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>KitPlumbata_Thrown</defaultProjectile>
-									<warmupTime>1.5</warmupTime>
-									<range>14</range>
-									<soundCast>Interact_Grenade</soundCast>
-								</li>
-							</verbs>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>handle</label>
-									<capacities>
-										<li>Poke</li>
-									</capacities>
-									<power>1</power>
-									<cooldownTime>1.26</cooldownTime>
-									<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>point</label>
-									<capacities>
-										<li>Stab</li>
-									</capacities>
-									<power>8</power>
-									<cooldownTime>1.26</cooldownTime>
-									<chanceFactor>1.33</chanceFactor>
-									<armorPenetrationBlunt>0.20</armorPenetrationBlunt>
-									<armorPenetrationSharp>0.42</armorPenetrationSharp>
-									<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-								</li>
-							</tools>
-							<ammoClass>Javelin</ammoClass>
-						</ThingDef>
-
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>MakeAmmo_KIT_WeaponRanged_Plumbatae</defName>
-							<label>make plumbata x10</label>
-							<description>Craft 10 plumbata.</description>
-							<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-							<workSkill>Crafting</workSkill>
-							<recipeUsers>
-								<li>ElectricSmithy</li>
-								<li>FueledSmithy</li>
-								<li>CraftingSpot</li>
-							</recipeUsers>
-							<effectWorking>Smelt</effectWorking>
-							<unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
-							<workAmount>2500</workAmount>
-							<jobString>Making plumbata.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<KIT_WeaponRanged_Plumbatae>10</KIT_WeaponRanged_Plumbatae>
-							</products>
-						</RecipeDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BasePilumProjectile">
-							<defName>KitPlumbata_Thrown</defName>
-							<label>plumbata</label>
-							<graphicData>
-								<texPath>Things/Projectile/PlumbataeThrown</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>8</damageAmountBase>
-								<speed>18</speed>
-								<armorPenetrationBlunt>2.36</armorPenetrationBlunt>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<preExplosionSpawnChance>0.65</preExplosionSpawnChance><!-- 4 javelins per resource -->
-								<preExplosionSpawnThingDef>KIT_WeaponRanged_Plumbatae</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kit's VFE Weapons/Ammo/Ammo_KitPlasma.xml b/Patches/Kit's VFE Weapons/Ammo/Ammo_KitPlasma.xml
deleted file mode 100644
index 4952dd650b..0000000000
--- a/Patches/Kit's VFE Weapons/Ammo/Ammo_KitPlasma.xml	
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Kit's VFE Weapons</li>
-					<li>Kit's VFE Weapons Continued </li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!-- ==================== Boltcaster ========================== -->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<!-- ==================== AmmoSets ========================== -->
-
-								<CombatExtended.AmmoSetDef>
-									<defName>AmmoSet_KIT_PlasmaPistol</defName>
-									<label>Plasma Pistol Power Cell</label>
-									<ammoTypes>
-										<Ammo_PlasmaCellPistol>Bullet_KIT_PlasmaPistol</Ammo_PlasmaCellPistol>
-									</ammoTypes>
-								</CombatExtended.AmmoSetDef>
-
-								<CombatExtended.AmmoSetDef>
-									<defName>AmmoSet_KIT_PlasmaSMG</defName>
-									<label>Plasma Pistol Power Cell</label>
-									<ammoTypes>
-										<Ammo_PlasmaCellPistol>Bullet_KIT_PlasmaSMG</Ammo_PlasmaCellPistol>
-									</ammoTypes>
-								</CombatExtended.AmmoSetDef>
-
-								<CombatExtended.AmmoSetDef>
-									<defName>AmmoSet_KIT_PlasmaRifle</defName>
-									<label>Plasma Rifle Power Cell</label>
-									<ammoTypes>
-										<Ammo_PlasmaCellRifle>Bullet_KIT_PlasmaRifle</Ammo_PlasmaCellRifle>
-									</ammoTypes>
-								</CombatExtended.AmmoSetDef>
-
-								<CombatExtended.AmmoSetDef>
-									<defName>AmmoSet_KIT_PlasmaRifle</defName>
-									<label>Plasma Rifle Power Cell</label>
-									<ammoTypes>
-										<Ammo_PlasmaCellRifle>Bullet_KIT_PlasmaSniper</Ammo_PlasmaCellRifle>
-									</ammoTypes>
-								</CombatExtended.AmmoSetDef>
-
-								<!-- ==================== Ammo ========================== -->
-
-								<!-- ================== Projectiles ================== -->
-
-								<ThingDef ParentName="BaseVFEIPlasmaBullet">
-									<defName>Bullet_KIT_PlasmaPistol</defName>
-									<label>plasma pistol shot</label>
-									<graphicData>
-										<texPath>Things/Item/Weapons/Plasma_Beam</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageAmountBase>15</damageAmountBase>
-										<armorPenetrationSharp>10</armorPenetrationSharp>
-										<armorPenetrationBlunt>10</armorPenetrationBlunt>
-										<empShieldBreakChance>0.2</empShieldBreakChance>
-										<secondaryDamage>
-											<li>
-												<def>EMP</def>
-												<amount>3</amount>
-											</li>
-										</secondaryDamage>
-									</projectile>
-								</ThingDef>
-
-								<ThingDef ParentName="BaseVFEIPlasmaBullet">
-									<defName>Bullet_KIT_PlasmaRifle</defName>
-									<label>plasma rifle shot</label>
-									<graphicData>
-										<texPath>Things/Item/Weapons/Plasma_Nail</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageAmountBase>30</damageAmountBase>
-										<armorPenetrationSharp>10</armorPenetrationSharp>
-										<armorPenetrationBlunt>10</armorPenetrationBlunt>
-										<empShieldBreakChance>0.5</empShieldBreakChance>
-										<secondaryDamage>
-											<li>
-												<def>EMP</def>
-												<amount>9</amount>
-											</li>
-										</secondaryDamage>
-									</projectile>
-								</ThingDef>
-
-								<ThingDef ParentName="BaseVFEIPlasmaBullet">
-									<defName>Bullet_KIT_PlasmaSMG</defName>
-									<label>plasma submachine gun shot</label>
-									<graphicData>
-										<texPath>Things/Item/Weapons/Plasma_Beam</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageAmountBase>6</damageAmountBase>
-										<armorPenetrationSharp>10</armorPenetrationSharp>
-										<armorPenetrationBlunt>10</armorPenetrationBlunt>
-										<empShieldBreakChance>0.05</empShieldBreakChance>
-										<secondaryDamage>
-											<li>
-												<def>EMP</def>
-												<amount>1</amount>
-											</li>
-										</secondaryDamage>
-									</projectile>
-								</ThingDef>
-
-								<ThingDef ParentName="BaseVFEIPlasmaBullet">
-									<defName>Bullet_KIT_PlasmaSniper</defName>
-									<label>plasma rifle shot</label>
-									<graphicData>
-										<texPath>Things/Item/Weapons/Plasma_Nail</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageAmountBase>45</damageAmountBase>
-										<armorPenetrationSharp>10</armorPenetrationSharp>
-										<armorPenetrationBlunt>10</armorPenetrationBlunt>
-										<empShieldBreakChance>1</empShieldBreakChance>
-										<secondaryDamage>
-											<li>
-												<def>EMP</def>
-												<amount>12</amount>
-											</li>
-										</secondaryDamage>
-									</projectile>
-								</ThingDef>
-
-								<!-- ==================== Recipes ========================== -->
-
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kit's VFE Weapons/DamageDefs/DamageDefs_Vikings.xml b/Patches/Kit's VFE Weapons/DamageDefs/DamageDefs_Vikings.xml
deleted file mode 100644
index de39839ab4..0000000000
--- a/Patches/Kit's VFE Weapons/DamageDefs/DamageDefs_Vikings.xml	
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Kit's VFE Weapons</li>
-			<li>Kit's VFE Weapons Continued </li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ToolCapacityDef>
-					<defName>CE_CryptoBlunt</defName>
-					<label>blunt</label>
-				</ToolCapacityDef>
-
-				<DamageDef ParentName="BluntBase">
-					<defName>CE_CryptoBlunt</defName>
-					<label>the crushing and hypothermic damage of advanced crypto weaponry</label>
-					<additionalHediffs>
-						<li>
-							<hediff>Hypothermia</hediff>
-							<severityPerDamageDealt>0.01</severityPerDamageDealt>
-						</li>
-					</additionalHediffs>
-				</DamageDef>
-
-				<ManeuverDef>
-					<defName>CE_Cryptosmash</defName>
-					<requiredCapacity>CE_CryptoBlunt</requiredCapacity>
-					<verb>
-						<verbClass Class="CombatExtended.VerbPropertiesCE">CombatExtended.Verb_MeleeAttackCE</verbClass>
-						<meleeDamageDef>CE_CryptoBlunt</meleeDamageDef>
-					</verb>
-					<logEntryDef>MeleeAttack</logEntryDef>
-					<combatLogRulesHit>Maneuver_Smash_MeleeHit</combatLogRulesHit>
-					<combatLogRulesDeflect>Maneuver_Smash_MeleeDeflect</combatLogRulesDeflect>
-					<combatLogRulesMiss>Maneuver_Smash_MeleeMiss</combatLogRulesMiss>
-					<combatLogRulesDodge>Maneuver_Smash_MeleeDodge</combatLogRulesDodge>
-				</ManeuverDef>
-
-			</value>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kit's VFE Weapons/ThingDefs_Misc/Weapons.xml b/Patches/Kit's VFE Weapons/ThingDefs_Misc/Weapons.xml
deleted file mode 100644
index 7b0565f1ff..0000000000
--- a/Patches/Kit's VFE Weapons/ThingDefs_Misc/Weapons.xml	
+++ /dev/null
@@ -1,446 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Kit's VFE Weapons</li>
-					<li>Kit's VFE Weapons Continued </li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!-- ==========  Hammer  =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="KIT_CryptoHammer"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>4</power>
-										<cooldownTime>1.84</cooldownTime>
-										<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>CE_CryptoBlunt</li>
-										</capacities>
-										<power>36</power>
-										<cooldownTime>2.61</cooldownTime>
-										<chanceFactor>1.5</chanceFactor>
-										<armorPenetrationBlunt>135</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="KIT_CryptoHammer"]/statBases</xpath>
-							<value>
-								<MeleeCounterParryBonus>0.25</MeleeCounterParryBonus>
-								<Bulk>3.5</Bulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="KIT_CryptoHammer"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.67</MeleeCritChance>
-									<MeleeParryChance>0.25</MeleeParryChance>
-									<MeleeDodgeChance>0.33</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-						<!-- ==========  Knife  =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="KIT_CryptoKnife"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>5</power>
-										<cooldownTime>2.01</cooldownTime>
-										<chanceFactor>0.4</chanceFactor>
-										<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>edge</label>
-										<capacities>
-											<li>VFEV_Cut</li>
-										</capacities>
-										<power>11</power>
-										<cooldownTime>0.72</cooldownTime>
-										<chanceFactor>1</chanceFactor>
-										<armorPenetrationBlunt>1</armorPenetrationBlunt>
-										<armorPenetrationSharp>8</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="KIT_CryptoKnife"]/statBases</xpath>
-							<value>
-								<MeleeCounterParryBonus>0.39</MeleeCounterParryBonus>
-								<Bulk>1.5</Bulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="KIT_CryptoKnife"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.08</MeleeCritChance>
-									<MeleeParryChance>0.24</MeleeParryChance>
-									<MeleeDodgeChance>1.07</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-						<!-- ========== Glaive  =========== -->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="KIT_CryptoSpear"]/statBases</xpath>
-							<value>
-								<MeleeCounterParryBonus>1.08</MeleeCounterParryBonus>
-								<Bulk>12.50</Bulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="KIT_CryptoSpear"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.22</MeleeCritChance>
-									<MeleeParryChance>1.53</MeleeParryChance>
-									<MeleeDodgeChance>0.67</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="KIT_CryptoSpear"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>blade</label>
-										<capacities>
-											<li>VFEV_Cut</li>
-										</capacities>
-										<power>37</power>
-										<cooldownTime>3.16</cooldownTime>
-										<chanceFactor>1</chanceFactor>
-										<armorPenetrationBlunt>5</armorPenetrationBlunt>
-										<armorPenetrationSharp>25</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-											<li>Blunt</li>
-										</capacities>
-										<power>11</power>
-										<cooldownTime>1.38</cooldownTime>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationBlunt>4.05</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<!-- ==========  Sword  =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="KIT_CryptoSword"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>5</power>
-										<cooldownTime>2.01</cooldownTime>
-										<chanceFactor>0.4</chanceFactor>
-										<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>edge</label>
-										<capacities>
-											<li>VFEV_Cut</li>
-										</capacities>
-										<power>44</power>
-										<cooldownTime>0.99</cooldownTime>
-										<chanceFactor>1</chanceFactor>
-										<armorPenetrationBlunt>4.05</armorPenetrationBlunt>
-										<armorPenetrationSharp>13.35</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="KIT_CryptoSword"]/statBases</xpath>
-							<value>
-								<MeleeCounterParryBonus>0.39</MeleeCounterParryBonus>
-								<Bulk>1.5</Bulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="KIT_CryptoSword"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.08</MeleeCritChance>
-									<MeleeParryChance>0.24</MeleeParryChance>
-									<MeleeDodgeChance>1.07</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-						<!-- ========== Pistol =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>KIT_Gun_PlasmaPistol</defName>
-							<statBases>
-								<SightsEfficiency>0.70</SightsEfficiency>
-								<ShotSpread>0.15</ShotSpread>
-								<SwayFactor>1.72</SwayFactor>
-								<Bulk>3.21</Bulk>
-								<Mass>2.65</Mass>
-								<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-							</statBases>
-
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_KIT_PlasmaPistol</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>16</range>
-								<soundCast>VFE_PlasmaShot_Cutter</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>12</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_KIT_PlasmaPistol</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiAimMode>Snapshot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="KIT_Gun_PlasmaPistol"]/weaponTags</xpath>
-							<value>
-								<li>CE_OneHandedWeapon</li>
-							</value>
-						</li>
-
-						<!-- ========== SMG =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>KIT_Gun_PlasmaSMG</defName>
-							<statBases>
-								<SightsEfficiency>1.00</SightsEfficiency>
-								<ShotSpread>0.17</ShotSpread>
-								<SwayFactor>0.84</SwayFactor>
-								<Bulk>6.80</Bulk>
-								<Mass>3.00</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							</statBases>
-
-							<Properties>
-								<recoilAmount>0.76</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_KIT_PlasmaSMG</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<burstShotCount>5</burstShotCount>
-								<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-								<range>31</range>
-								<soundCast>VFE_PlasmaShot_Scattergun</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>35</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_KIT_PlasmaSMG</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>Snapshot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== Rifle =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>KIT_Gun_PlasmaRifle</defName>
-							<statBases>
-								<SightsEfficiency>1.00</SightsEfficiency>
-								<ShotSpread>0.09</ShotSpread>
-								<SwayFactor>1.41</SwayFactor>
-								<Bulk>9.85</Bulk>
-								<Mass>4.21</Mass>
-								<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-							</statBases>
-
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_KIT_PlasmaRifle</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>51</range>
-								<soundCast>VFE_PlasmaShot_Piercer</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>27</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_KIT_PlasmaRifle</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== Sniper Rifle =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>KIT_Gun_PlasmaSniper</defName>
-							<statBases>
-								<SightsEfficiency>4.36</SightsEfficiency>
-								<ShotSpread>0.01</ShotSpread>
-								<SwayFactor>1.78</SwayFactor>
-								<Bulk>9.95</Bulk>
-								<Mass>4.79</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							</statBases>
-
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_KIT_PlasmaSniper</defaultProjectile>
-								<warmupTime>2.1</warmupTime>
-								<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-								<range>78</range>
-								<soundCast>VFE_PlasmaShot_Beam</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>20</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_KIT_PlasmaRifle</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== Melee Attacks =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="KIT_Gun_PlasmaSniper" or
-								defName="KIT_Gun_PlasmaSMG" or
-								defName="KIT_Gun_PlasmaRifle"
-								]/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>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="KIT_Gun_PlasmaPistol"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>grip</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>1.54</cooldownTime>
-										<chanceFactor>1.5</chanceFactor>
-										<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>muzzle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>1.54</cooldownTime>
-										<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kobold Factions/Kobold_Kamikaze_Pawnkind.xml b/Patches/Kobold Factions/Kobold_Kamikaze_Pawnkind.xml
deleted file mode 100644
index e22c6813a6..0000000000
--- a/Patches/Kobold Factions/Kobold_Kamikaze_Pawnkind.xml	
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Kobold Factions</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!--Medieval Kobold with Sticky Bomb -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<PawnKindDef>
-							<defName>Kobold_Kamikaze</defName>
-							<race>Alien_Kobold</race>
-							<label>Blaster</label>
-							<combatPower>65</combatPower>
-							<defaultFactionType>LTS_MedboldEmpireFriendly</defaultFactionType>
-							<backstoryCategories>
-								<li>MedboldBackstory</li>
-							</backstoryCategories>
-							<maxGenerationAge>10</maxGenerationAge>
-							<chemicalAddictionChance>0.05</chemicalAddictionChance>
-							<invNutrition>1.8</invNutrition>
-							<invFoodDef>Pemmican</invFoodDef>
-							<canBeSapper>true</canBeSapper>
-							<gearHealthRange>
-								<min>0.5</min>
-								<max>1.8</max>
-							</gearHealthRange>
-							<apparelMoney>
-								<min>180</min>
-								<max>350</max>
-							</apparelMoney>
-							<apparelRequired>
-								<li>Apparel_Pants</li>
-								<li>CE_Apparel_TribalBackpack</li>
-							</apparelRequired>
-							<apparelTags>
-								<li>IndustrialBasic</li>
-							</apparelTags>
-							<weaponMoney>
-								<min>120</min>
-								<max>400</max>
-							</weaponMoney>
-							<weaponTags>
-								<li>CE_GrenadeNeolithic</li>
-							</weaponTags>
-							<techHediffsMoney>
-								<min>50</min>
-								<max>800</max>
-							</techHediffsMoney>
-							<techHediffsTags>
-								<li>Poor</li>
-								<li>Simple</li>
-							</techHediffsTags>
-							<techHediffsChance>0.33</techHediffsChance>
-							<disallowedTraits>
-								<li>Brawler</li>
-							</disallowedTraits>
-							<initialWillRange>2~4</initialWillRange>
-							<initialResistanceRange>14~22</initialResistanceRange>
-							<modExtensions>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>6</min>
-										<max>18</max>
-									</primaryMagazineCount>
-									<!-- No sidearms, these guys are literally just sticky-bomb launchers-->
-								</li>
-							</modExtensions>
-						</PawnKindDef>
-					</value>
-				</li>
-				<!-- Adding Kobold Kamikazes -->
-				<li Class="PatchOperationAdd"><!-- Combat -->
-					<xpath>Defs/FactionDef[@Name="Medbold_FactionBase"]/pawnGroupMakers/li[1]/options</xpath>
-					<value>
-						<Kobold_Kamikaze>10</Kobold_Kamikaze>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd"><!--Peaceful-->
-					<xpath>Defs/FactionDef[@Name="Medbold_FactionBase"]/pawnGroupMakers/li[2]/options</xpath>
-					<value>
-						<Kobold_Kamikaze>5</Kobold_Kamikaze>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd"><!--Trader-->
-					<xpath>Defs/FactionDef[@Name="Medbold_FactionBase"]/pawnGroupMakers/li[3]/guards</xpath>
-					<value>
-						<Kobold_Kamikaze>7</Kobold_Kamikaze>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd"><!-- Settlement -->
-					<xpath>Defs/FactionDef[@Name="Medbold_FactionBase"]/pawnGroupMakers/li[4]/options</xpath>
-					<value>
-						<Kobold_Kamikaze>20</Kobold_Kamikaze>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd"><!--Adding Kamikaze ONLY raid -->
-					<xpath>Defs/FactionDef[@Name="Medbold_FactionBase"]/pawnGroupMakers</xpath>
-					<value>
-						<li>
-							<kindDef>Combat</kindDef>
-							<commonality>30</commonality>
-							<options>
-								<Kobold_Kamikaze>20</Kobold_Kamikaze>
-							</options>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kobold Factions/Medieval_Kobold_Pawnkind.xml b/Patches/Kobold Factions/Medieval_Kobold_Pawnkind.xml
deleted file mode 100644
index 1978807458..0000000000
--- a/Patches/Kobold Factions/Medieval_Kobold_Pawnkind.xml	
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Kobold Factions</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[ @Name="MedboldBase"]/apparelRequired</xpath>
-					<value>
-						<li>CE_Apparel_TribalBackpack</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[ defName="LTS_MedboldScout" or defName="LTS_MedboldRanger" or defName="LTS_MedboldLord"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>15</min>
-								<max>30</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kobolds of the Rim/Apparel_Kobold.xml b/Patches/Kobolds of the Rim/Apparel_Kobold.xml
deleted file mode 100644
index 5c69f9e5f9..0000000000
--- a/Patches/Kobolds of the Rim/Apparel_Kobold.xml	
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Kobolds of the Rim</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Simple Shirt -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kobold_SimpleShirt"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Tribal Armor -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Kobold_TribalArmor"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName= "Kobold_TribalArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-						<ArmorRating_Sharp>0.30</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- Scout Armor -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Kobold_ScoutArmor"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName= "Kobold_ScoutArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-						<ArmorRating_Blunt>1.3</ArmorRating_Blunt>
-						<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- Tribal Hat -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kobold_TribalHat"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Paint & Earrings -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kobold_ScoutPaint" or defName="Kobold_WarlordPaint" or defName="Kobold_GeneralEarring"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>0.05</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Kobold_ScoutPaint" or defName="Kobold_WarlordPaint" or defName="Kobold_GeneralEarring"]/statBases/StuffEffectMultiplierArmor</xpath>
-				</li>
-
-				<!-- Shoulder Fur -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kobold_ShoulderFur"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kobold_ShoulderFur"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- General & Warlord Armor -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Kobold_GeneralArmor" or defName ="Kobold_WarlordArmor"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName= "Kobold_GeneralArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-						<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName= "Kobold_WarlordArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
-						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-						<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kobolds of the Rim/Melee_Kobold.xml b/Patches/Kobolds of the Rim/Melee_Kobold.xml
deleted file mode 100644
index 399c674f1b..0000000000
--- a/Patches/Kobolds of the Rim/Melee_Kobold.xml	
+++ /dev/null
@@ -1,303 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Kobolds of the Rim</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Bone -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kobold_Bone"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.78</cooldownTime>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>3.01</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kobold_Bone"]/statBases</xpath>
-					<value>
-						<Bulk>3.75</Bulk>
-						<MeleeCounterParryBonus>0.14</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kobold_Bone"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.58</MeleeCritChance>
-							<MeleeParryChance>0.14</MeleeParryChance>
-							<MeleeDodgeChance>0.16</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kobold_Bone"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- Bone Dagger -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kobold_BoneDagger"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetration>0.071</armorPenetration>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Kobold_StabToxic</li>
-								</capacities>
-								<power>9.5</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetration>0.208</armorPenetration>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kobold_BoneDagger"]/statBases</xpath>
-					<value>
-						<Bulk>0.15</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kobold_BoneDagger"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.1</MeleeCritChance>
-							<MeleeParryChance>0.1</MeleeParryChance>
-							<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kobold_BoneDagger"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- Ceremonial Dagger -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kobold_Dagger"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Kobold_CutToxic</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.18</cooldownTime>
-								<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.32</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Kobold_StabToxic</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.26</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.42</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kobold_Dagger"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kobold_Dagger"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.5</MeleeCritChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-							<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Bone Sword -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kobold_BoneSword"]/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>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kobold_BoneSword"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kobold_BoneSword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>0.35</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Bone Spear -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kobold_Spear"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.35</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Kobold_StabToxic</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.19</cooldownTime>
-								<chanceFactor>1.00</chanceFactor>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kobold_Spear"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kobold_Spear"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.17</MeleeCritChance>
-							<MeleeParryChance>1.45</MeleeParryChance>
-							<MeleeDodgeChance>0.9</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kobolds of the Rim/Patch_Body_Kobold.xml b/Patches/Kobolds of the Rim/Patch_Body_Kobold.xml
deleted file mode 100644
index 36ba8c8ec4..0000000000
--- a/Patches/Kobolds of the Rim/Patch_Body_Kobold.xml	
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Kobolds of the Rim</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Add armor coverage (for pawns with non-zero armor that use human body) ========== -->
-
-				<!-- Kobold -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Kobold"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Kobold"]/corePart/parts/li[def = "Tail"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Kobold"]/corePart/parts/li[def = "Neck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Kobold"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Kobold"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Jaw"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Kobold"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Nose"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Kobold"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Ear"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Kobold"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="KoboldLeftHorn"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Kobold"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="KoboldRightHorn"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Kobold"]/corePart/parts/li[def = "Shoulder"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Kobold"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Kobold"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Kobold"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/parts/li[def = "Finger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Kobold"]/corePart/parts/li[def = "Leg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Kobold"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Kobold"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/parts/li[def = "Toe"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kobolds of the Rim/PawnKinds_Kobold.xml b/Patches/Kobolds of the Rim/PawnKinds_Kobold.xml
deleted file mode 100644
index e74ae9a07b..0000000000
--- a/Patches/Kobolds of the Rim/PawnKinds_Kobold.xml	
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Kobolds of the Rim</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Give ammo to pawns with bows ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>
-						Defs/PawnKindDef[defName="LTS_KoboldSkirmisher" or defName="LTS_KoboldWarlord"]
-					</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>12</min>
-								<max>20</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kobolds of the Rim/Race_Kobold.xml b/Patches/Kobolds of the Rim/Race_Kobold.xml
deleted file mode 100644
index 83ccd81493..0000000000
--- a/Patches/Kobolds of the Rim/Race_Kobold.xml	
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Kobolds of the Rim</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Kobold"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Kobold"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Kobold"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Kobold"]/alienRace/generalSettings</xpath>
-					<value>
-						<forcedRaceTraitEntries>
-							<li>
-								<defName>Xenophobia</defName>
-								<degree>1</degree>
-								<chance>20</chance>
-							</li>
-						</forcedRaceTraitEntries>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Kobold"]/race/baseBodySize</xpath>
-					<value>
-						<baseBodySize>0.6</baseBodySize>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Kobold"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency>0.4</NightVisionEfficiency>
-						<CarryWeight>40</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-						<MeleeDodgeChance>1.1</MeleeDodgeChance>
-						<MeleeCritChance>0.4</MeleeCritChance>
-						<MeleeParryChance>0.5</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Kobold"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.57</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.57</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.46</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Kobold"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kurin Deluxe Patch/Ammo/Ammo_Kurin.xml b/Patches/Kurin Deluxe Patch/Ammo/Ammo_Kurin.xml
deleted file mode 100644
index c3b1e103af..0000000000
--- a/Patches/Kurin Deluxe Patch/Ammo/Ammo_Kurin.xml	
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Kurin, The Three Tailed Fox [Deluxe Edition]</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- 8x35mmChargedkurin -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_8x35mmChargedK</defName>
-							<label>8x35mm Charged K</label>
-							<ammoTypes>
-								<Ammo_8x35mmCharged>Bullet_8x35mmChargedK</Ammo_8x35mmCharged>
-								<Ammo_8x35mmCharged_AP>Bullet_8x35mmChargedK_AP</Ammo_8x35mmCharged_AP>
-								<Ammo_8x35mmCharged_Ion>Bullet_8x35mmChargedK_Ion</Ammo_8x35mmCharged_Ion>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- normal charged bullets -->
-						<ThingDef Name="Bullet_8x35mmChargedK" ParentName="Base8x35mmChargedBullet">
-							<defName>Bullet_8x35mmChargedK</defName>
-							<label>8x35mm Charged bullet K</label>
-							<graphicData>
-								<texPath>Kurin/Projectile/Charge_Rifle_Bullet/Texture</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-
-								<damageDef>Bullet</damageDef>
-								<speed>144</speed>
-								<damageAmountBase>18</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>8</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-								<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<!-- concentrated bullets -->
-						<ThingDef Name="Bullet_8x35mmChargedK_AP" ParentName="Base8x35mmChargedBullet">
-							<defName>Bullet_8x35mmChargedK_AP</defName>
-							<label>8x35mm Charged bullet K (Conc.)</label>
-							<graphicData>
-								<texPath>Kurin/Projectile/Charge_Rifle_Bullet/Texture</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>144</speed>
-								<damageAmountBase>14</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>4</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-								<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<!-- ion bullets -->
-						<ThingDef Name="Bullet_8x35mmChargedK_Ion" ParentName="Base8x35mmChargedBullet">
-							<defName>Bullet_8x35mmChargedK_Ion</defName>
-							<label>8x35mm Charged bullet K (Ion)</label>
-							<graphicData>
-								<texPath>Kurin/Projectile/Charge_Rifle_Bullet/Texture</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>144</speed>
-								<damageAmountBase>14</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>12</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>22.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
-								<empShieldBreakChance>0.2</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-				<!-- 12mmRailgunkurin -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_12mmRailgunK</defName>
-							<label>12mm Railgun K</label>
-							<ammoTypes>
-								<Ammo_12mmRailgun_Sabot>Bullet_12mmRailgun_K_Sabot</Ammo_12mmRailgun_Sabot>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="BaseBulletCE">
-							<defName>Bullet_12mmRailgun_K_Sabot</defName>
-							<label>12mm Railgun bullet K (Sabot)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Charged/ChargeLanceShot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>40</damageAmountBase>
-								<armorPenetrationSharp>70</armorPenetrationSharp>
-								<armorPenetrationBlunt>500</armorPenetrationBlunt>
-								<speed>144</speed>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-				<!-- Surigum -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingDef ParentName="BaseBulletCE">
-							<defName>Bullet_Kurin_Surigum_CE</defName>
-							<thingClass>CombatExtended.BulletCE</thingClass>
-							<label>Surigum</label>
-							<graphicData>
-								<texPath>Kurin/Projectile/Surigum_Bullet/Texture</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>RangedStab</damageDef>
-								<damageAmountBase>15</damageAmountBase>
-								<speed>32</speed>
-								<armorPenetrationBlunt>2.22</armorPenetrationBlunt>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-				<!-- Unmaker -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_PlasmaCellHeavy_K</defName>
-							<label>Plasma Heavy Power Cell</label>
-							<ammoTypes>
-								<Ammo_PlasmaCellHeavy>Bullet_Unmakerblast_Standard</Ammo_PlasmaCellHeavy>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-						<ThingDef ParentName="BaseExplosiveBullet">
-							<defName>Bullet_Unmakerblast_Standard</defName>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<label>Unmaker blast shell</label>
-							<graphicData>
-								<texPath>Kurin/Projectile/Unmaker_Bullet/Texture</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Kurin_Damage_Unmaker</damageDef>
-								<damageAmountBase>175</damageAmountBase>
-								<speed>98</speed>
-								<flyOverhead>false</flyOverhead>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<explosionRadius>3.9</explosionRadius>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>200</damageAmountBase>
-									<explosiveDamageType>EMP</explosiveDamageType>
-									<explosiveRadius>3.9</explosiveRadius>
-								</li>
-							</comps>
-						</ThingDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kurin Deluxe Patch/ScenarioDef/Scenarios_DRNTF.xml b/Patches/Kurin Deluxe Patch/ScenarioDef/Scenarios_DRNTF.xml
deleted file mode 100644
index 4f43e65733..0000000000
--- a/Patches/Kurin Deluxe Patch/ScenarioDef/Scenarios_DRNTF.xml	
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Kurin, The Three Tailed Fox [Deluxe Edition]</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Add ammo to scenario === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="Kurin_Scenario_1"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_556x45mmNATO_FMJ</thingDef>
-							<count>200</count>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="Kurin_Scenario_2"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_556x45mmNATO_FMJ</thingDef>
-							<count>200</count>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="Kurin_Scenario_3"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_556x45mmNATO_FMJ</thingDef>
-							<count>200</count>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kurin Deluxe Patch/ThingDefs_Misc/DRNTF_Apparel.xml b/Patches/Kurin Deluxe Patch/ThingDefs_Misc/DRNTF_Apparel.xml
deleted file mode 100644
index bb606610de..0000000000
--- a/Patches/Kurin Deluxe Patch/ThingDefs_Misc/DRNTF_Apparel.xml	
+++ /dev/null
@@ -1,455 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Kurin, The Three Tailed Fox [Deluxe Edition]</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--========= Underwear/On Skin =========-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="Kurin_UnderwearBase" or @Name="Kurin_StockingBase"]/statBases</xpath>
-					<value>
-						<Bulk>0.5</Bulk>
-						<WornBulk>0.25</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Kurin_UnderwearBase" or @Name="Kurin_StockingBase"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="Kurin_ApparelBase"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Shirt" or
-						defName="Kurin_OnSkin_T_Shirt" or
-						defName="Kurin_Legs_Shorts" or
-						defName="Kurin_Legs_Pants" or
-						defName="Kurin_OnSkin_Hot_Pants" or
-						defName="Kurin_OnSkin_Pajama_A" or
-						defName="Kurin_OnSkin_Pajama_B" or
-						defName="Kurin_OnSkin_Pajama_C" or
-						defName="Kurin_OnSkin_One_Piece_Dress" or
-						defName="Kurin_OnSkin_Open_Back_Knit" or
-						defName="Kurin_OnSkin_Open_Front_Knit" or
-						defName="Kurin_OnSkin_Open_Shoulder_Knit" or
-						defName="Kurin_OnSkin_Casual_Wear" or
-						defName="Kurin_Legs_Long_Skirt" or
-						defName="Kurin_Legs_Skirt" or
-						defName="Kurin_OnSkin_Hoodie"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Gothic_Dress" or
-						defName="Kurin_OnSkin_Nun_Dress" or
-						defName="Kurin_OnSkin_Work_Jumpsuit" or
-						defName="Kurin_OnSkin_Traditional_Simple_Dress" or
-						defName="Kurin_OnSkin_Traditional_Fancy_Dress" or
-						defName="Kurin_OnSkin_Traditional_Luxury_Dress" or
-						defName="Kurin_OnSkin_Cute_Dress" or
-						defName="Kurin_OnSkin_Seductive_White_Dress" or
-						defName="Kurin_OnSkin_Seductive_Black_Dress"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Short_Jumpsuit"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Short_Jumpsuit"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!--========= Onskin Armor =========-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Armored_Gothic_Dress" or
-						defName="Kurin_OnSkin_Military_Uniform"
-						]/statBases </xpath>
-					<value>
-						<Bulk>20</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Armored_Gothic_Dress" or
-						defName="Kurin_OnSkin_Military_Uniform"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Military_Uniform" or
-						defName="Kurin_OnSkin_Spaceship_Crew_Suit"
-						]/equippedStatOffsets/ShootingAccuracyPawn </xpath>
-					<value>
-						<ShootingAccuracyPawn>0.4</ShootingAccuracyPawn>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Armored_Gothic_Dress"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.75</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Armored_Gothic_Dress"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2.30</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Military_Uniform" or
-						defName="Kurin_OnSkin_Spaceship_Crew_Suit"]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>2.25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Military_Uniform" or
-						defName="Kurin_OnSkin_Spaceship_Crew_Suit"]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>3.05</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Bikini_Armor"
-						]/statBases </xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Bikini_Armor"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Bikini_Armor"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.6</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<!--========= Hats =========-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kurin_Overhead_Winter_Hat" or
-						defName="Kurin_Overhead_Summer_Hat" or
-						defName="Kurin_Overhead_Cap" or
-						defName="Kurin_Overhead_Sunglasses" or
-						defName="Kurin_Overhead_Goggles" or
-						defName="Kurin_Overhead_Casual_Hair_Pin"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kurin_Overhead_Gothic_Hair_Pin" or
-						defName="Kurin_Overhead_Traditional_Hair_Pin" or
-						defName="Kurin_Overhead_Cute_Hair_Pin"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!--========= Overhead Armor =========-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kurin_Overhead_Goggles"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kurin_Overhead_Goggles"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kurin_Overhead_Bikini_Armor_Headgear"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>7.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kurin_Overhead_Bikini_Armor_Headgear" or
-						defName="Kurin_OnSkin_Spaceship_Crew_Suit"]/statBases </xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kurin_Overhead_Military_Helmet_A" or
-						defName="Kurin_Overhead_Military_Helmet_B"]/statBases </xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kurin_Overhead_Military_Helmet_A"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kurin_Overhead_Military_Helmet_B"]/statBases</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kurin_Overhead_Military_Helmet_A"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingDelayFactor>-0.1</AimingDelayFactor>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kurin_Overhead_Military_Helmet_B"]/equippedStatOffsets</xpath>
-					<value>
-						<AimingDelayFactor>-0.1</AimingDelayFactor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kurin_Middle_Scarf"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kurin_Middle_Scarf"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kurin_Power_Armor_Helmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20.4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kurin_Power_Armor_Helmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>50</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kurin_Heavy_Power_Armor_Helmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kurin_Heavy_Power_Armor_Helmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>60</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kurin_Power_Armor_Helmet" or
-						defName="Kurin_Heavy_Power_Armor_Helmet"]/statBases </xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kurin_Power_Armor_Helmet" or
-						defName="Kurin_Heavy_Power_Armor_Helmet"]/statBases </xpath>
-					<value>
-						<NightVisionEfficiency_Apparel>0.8</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kurin_Power_Armor_Helmet" or
-						defName="Kurin_Heavy_Power_Armor_Helmet"]/equippedStatOffsets </xpath>
-					<value>
-						<AimingDelayFactor>-0.15</AimingDelayFactor>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kurin_Backpack_Civil"]/equippedStatOffsets/CarryingCapacity</xpath>
-					<value>
-						<CarryBulk>40</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kurin_Backpack_Military"]/equippedStatOffsets/CarryingCapacity</xpath>
-					<value>
-						<CarryBulk>60</CarryBulk>
-					</value>
-				</li>
-
-				<!--========= Middle Apparel =========-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kurin_Middle_Body_Armor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!--========= Middle_Heavy =========-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kurin_Middle_Heavy_Body_Armor"]/statBases</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!--========= Shell Apparel =========-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kurin_Shell_Cardigan" or
-						defName="Kurin_Shell_Duster" or
-						defName="Kurin_Shell_Winter_Padding"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kurin_Shell_Cardigan" or
-						defName="Kurin_Shell_Duster" or
-						defName="Kurin_Shell_Winter_Padding"
-						]/statBases </xpath>
-					<value>
-						<Bulk>7.5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kurin_Shell_Traditional_Coat"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>6.25</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kurin_Shell_Traditional_Coat"]/statBases</xpath>
-					<value>
-						<Bulk>7.5</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<!--========= Power Armor =========-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/KurinDeluxeEdition.PowerArmor.KurinPowerArmorThingDef[defName="Kurin_Power_Armor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>26</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/KurinDeluxeEdition.PowerArmor.KurinPowerArmorThingDef[defName="Kurin_Heavy_Power_Armor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>30</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/KurinDeluxeEdition.PowerArmor.KurinPowerArmorThingDef[defName="Kurin_Power_Armor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>64</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/KurinDeluxeEdition.PowerArmor.KurinPowerArmorThingDef[defName="Kurin_Heavy_Power_Armor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>76</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/KurinDeluxeEdition.PowerArmor.KurinPowerArmorThingDef[defName="Kurin_Power_Armor" or "Kurin_Heavy_Power_Armor"]/statBases</xpath>
-					<value>
-						<Bulk>45.5</Bulk>
-						<WornBulk>6.5</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/KurinDeluxeEdition.PowerArmor.KurinPowerArmorThingDef[defName="Kurin_Power_Armor"
-						or "Kurin_Heavy_Power_Armor"
-						]/equippedStatOffsets </xpath>
-					<value>
-						<CarryWeight>120</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kurin Deluxe Patch/ThingDefs_Misc/DRNTF_Weapon.xml b/Patches/Kurin Deluxe Patch/ThingDefs_Misc/DRNTF_Weapon.xml
deleted file mode 100644
index 4618ffc776..0000000000
--- a/Patches/Kurin Deluxe Patch/ThingDefs_Misc/DRNTF_Weapon.xml	
+++ /dev/null
@@ -1,1015 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Kurin, The Three Tailed Fox [Deluxe Edition]</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--========= Rifle : K2 as a Basis =========-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Kurin_Gun_Assault_Rifle</defName>
-					<statBases>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.31</SwayFactor>
-						<Bulk>7.30</Bulk>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.50</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<range>60</range>
-						<soundCast>Kurin_Sound_Assault_Rifle</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Kurin_Gun_Heavy_Assault_Rifle</defName>
-					<statBases>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.60</SwayFactor>
-						<Bulk>8.30</Bulk>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.50</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<range>58</range>
-						<soundCast>Kurin_Sound_Heavy_Assault_Rifle</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Kurin_Gun_Sniper_Rifle</defName>
-					<statBases>
-						<SightsEfficiency>2.0</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.60</SwayFactor>
-						<Bulk>8.30</Bulk>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.4</warmupTime>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<range>75</range>
-						<soundCast>Kurin_Sound_Sniper_Rifle</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Kurin_Gun_Auto_Shotgun</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.49</SwayFactor>
-						<Bulk>10.66</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.26</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>18</range>
-						<soundCast>Kurin_Sound_Auto_Shotgun</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Kurin_Gun_Heavy_Sniper_Rifle</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.80</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.5</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1.92</SwayFactor>
-						<Bulk>13.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.00</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>3.2</warmupTime>
-						<range>86</range>
-						<soundCast>Kurin_Sound_Heavy_Sniper_Rifle</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Kurin_Gun_Heavy_Sniper_Rifle_HE</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.80</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.5</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1.92</SwayFactor>
-						<Bulk>13.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.60</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_127x108mm_FMJ</defaultProjectile>
-						<warmupTime>3.2</warmupTime>
-						<range>86</range>
-						<soundCast>Kurin_Sound_Heavy_Sniper_Rifle</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_127x108mm</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Kurin_Gun_Hunting_Shotgun</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.10</ShotSpread>
-						<SwayFactor>1.36</SwayFactor>
-						<Bulk>8.25</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.80</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>Kurin_Sound_Hunting_Shotgun</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>2</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>1</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Kurin_Gun_Heavy_SMG</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.00</SwayFactor>
-						<Bulk>4.90</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.90</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_AP</defaultProjectile>
-						<warmupTime>0.8</warmupTime>
-						<range>32</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>Kurin_Sound_Heavy_SMG</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Kurin_Gun_Pistol</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.90</SwayFactor>
-						<Bulk>2.08</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.60</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>12</range>
-						<soundCast>Kurin_Sound_Pistol</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_FN57x28mm</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Kurin_Gun_Charge_LMG</defName>
-					<statBases>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.50</SwayFactor>
-						<Bulk>11.00</Bulk>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>70</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>Kurin_Sound_Charge_LMG</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>200</magazineSize>
-						<reloadTime>6</reloadTime>
-						<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_MachineGun</li>
-						<li>CE_AI_Suppressive</li>
-						<li>AdvancedGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Kurin_Gun_Charge_Rifle</defName>
-					<statBases>
-						<SightsEfficiency>1.2</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.30</SwayFactor>
-						<Bulk>9.60</Bulk>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.3</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8x35mmChargedK</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>62</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>Kurin_Sound_Charge_Rifle</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>36</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_8x35mmChargedK</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>AdvancedGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Kurin_Gun_Sniper_Charge_Rifle</defName>
-					<statBases>
-						<SightsEfficiency>3.0</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>2.08</SwayFactor>
-						<Bulk>12.00</Bulk>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.3</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12x72mmCharged</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>86</range>
-						<soundCast>Kurin_Sound_Sniper_Charge_Rifle</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_12x72mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>SniperRifle</li>
-						<li>AdvancedGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Kurin_Gun_Flamethrower</defName>
-					<statBases>
-						<SwayFactor>2.10</SwayFactor>
-						<ShotSpread>3.00</ShotSpread>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.55</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Flamethrower_Prometheum</defaultProjectile>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<warmupTime>1.3</warmupTime>
-						<range>25</range>
-						<minRange>3</minRange>
-						<soundCast>Kurin_Sound_Flamethrower</soundCast>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>200</magazineSize>
-						<reloadTime>6.6</reloadTime>
-						<ammoSet>AmmoSet_Flamethrower</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<noSingleShot>True</noSingleShot>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Kurin_Gun_Gauss_Rifle</defName>
-					<statBases>
-						<SightsEfficiency>3.5</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.95</SwayFactor>
-						<Bulk>12.00</Bulk>
-						<RangedWeapon_Cooldown>1.10</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.00</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12mmRailgun_K_Sabot</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>86</range>
-						<soundCast>Kurin_Sound_Gauss_Rifle</soundCast>
-						<muzzleFlashScale>15</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_12mmRailgunK</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>SniperRifle</li>
-						<li>AdvancedGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Kurin_Special_Rocket_Launcher</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.16</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.68</SwayFactor>
-						<Bulk>10.50</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_RPG32Rocket_HEAT</defaultProjectile>
-						<warmupTime>2.5</warmupTime>
-						<range>40</range>
-						<minRange>3</minRange>
-						<onlyManualCast>true</onlyManualCast>
-						<soundCast>Kurin_Sound_Rocket_Launcher</soundCast>
-						<muzzleFlashScale>15</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>8.4</reloadTime>
-						<ammoSet>AmmoSet_RPG32Rocket</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Kurin_Special_Rocket_Launcher_Typhoon</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.5</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.68</SwayFactor>
-						<Bulk>10.50</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_RPG32Rocket_HEAT</defaultProjectile>
-						<warmupTime>2.5</warmupTime>
-						<range>40</range>
-						<minRange>3</minRange>
-						<onlyManualCast>true</onlyManualCast>
-						<soundCast>Kurin_Sound_Rocket_Launcher_Various</soundCast>
-						<muzzleFlashScale>15</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>4</magazineSize>
-						<reloadTime>12.6</reloadTime>
-						<ammoSet>AmmoSet_RPG32Rocket</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Kurin_Gun_Unmaker</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.5</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.0</SwayFactor>
-						<Bulk>10.50</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Unmakerblast_Standard</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<range>86</range>
-						<onlyManualCast>true</onlyManualCast>
-						<soundCast>Kurin_Sound_Unmaker</soundCast>
-						<muzzleFlashScale>15</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_PlasmaCellHeavy_K</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Kurin_Gun_Grenade_Launcher</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.10</ShotSpread>
-						<SwayFactor>1.00</SwayFactor>
-						<Bulk>7.31</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.50</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>42</range>
-						<minRange>3</minRange>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<soundCast>Kurin_Sound_Grenade_Launcher</soundCast>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Kurin_Gun_Grenade_Launcher_IM</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>1.0</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.00</SwayFactor>
-						<Bulk>7.31</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.50</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_30x64mmFuel_Incendiary</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>40</range>
-						<minRange>3</minRange>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<onlyManualCast>true</onlyManualCast>
-						<soundCast>Kurin_Sound_Grenade_Launcher</soundCast>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Kurin_Gun_Grenade_Launcher_EMPM</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>1.0</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.00</SwayFactor>
-						<Bulk>7.31</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.50</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_40x46mmGrenade_EMP</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>40</range>
-						<minRange>3</minRange>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<onlyManualCast>true</onlyManualCast>
-						<soundCast>Kurin_Sound_Grenade_Launcher</soundCast>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Kurin_Gun_Grenade_Launcher_FEM</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>1.0</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.00</SwayFactor>
-						<Bulk>7.31</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.50</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_30x64mmFuel_Foam</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>40</range>
-						<minRange>3</minRange>
-						<onlyManualCast>true</onlyManualCast>
-						<soundCast>Kurin_Sound_Grenade_Launcher</soundCast>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Kurin_Gun_Grenade_Launcher_SM</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>1.0</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.00</SwayFactor>
-						<Bulk>7.31</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.50</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_40x46mmGrenade_Smoke</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>40</range>
-						<minRange>3</minRange>
-						<onlyManualCast>true</onlyManualCast>
-						<soundCast>Kurin_Sound_Grenade_Launcher</soundCast>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kurin_Gun_Assault_Rifle" or
-						defName="Kurin_Gun_Heavy_Assault_Rifle" or
-						defName="Kurin_Gun_Auto_Shotgun" or
-						defName="Kurin_Gun_Heavy_Sniper_Rifle" or
-						defName="Kurin_Gun_Heavy_Sniper_Rifle_HE" or
-						defName="Kurin_Gun_Hunting_Shotgun" or
-						defName="Kurin_Gun_Heavy_SMG" or
-						defName="Kurin_Gun_Pistol" or
-						defName="Kurin_Gun_Charge_LMG" or
-						defName="Kurin_Gun_Charge_Rifle" or
-						defName="Kurin_Gun_Sniper_Charge_Rifle" or
-						defName="Kurin_Gun_Flamethrower" or
-						defName="Kurin_Gun_Gauss_Rifle" or
-						defName="Kurin_Special_Rocket_Launcher" or
-						defName="Kurin_Special_Rocket_Launcher_Typhoon" or
-						defName="Kurin_Gun_Unmaker" or
-						defName="Kurin_Gun_Sniper_Rifle"]/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>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Kurin_GrenadeLauncherBase"]/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>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kurin_MeleeWeapon_Katana" or defName="Kimiri_MeleeWeapon_Katana"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>0.80</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.5</cooldownTime>
-								<chanceFactor>0.50</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.4</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>31</power>
-								<cooldownTime>1.5</cooldownTime>
-								<chanceFactor>0.50</chanceFactor>
-								<armorPenetrationBlunt>3.8</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.8</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kurin_MeleeWeapon_Ceremonial_Sword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>47</power>
-								<cooldownTime>2.5</cooldownTime>
-								<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kurin_MeleeWeapon_Katana" or defName="Kimiri_MeleeWeapon_Katana"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.5</MeleeCritChance>
-							<MeleeParryChance>0.45</MeleeParryChance>
-							<MeleeDodgeChance>0.45</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kurin_MeleeWeapon_Ceremonial_Sword"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.08</MeleeCritChance>
-						<MeleeParryChance>0.5</MeleeParryChance>
-						<MeleeDodgeChance>0.5</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Kurin_Gun_Surigum</defName>
-					<statBases>
-						<SightsEfficiency>0.50</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.0</SwayFactor>
-						<Bulk>2.00</Bulk>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.50</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Kurin_Surigum_CE</defaultProjectile>
-						<warmupTime>0.3</warmupTime>
-						<range>15</range>
-						<soundCast>ThrowGrenade</soundCast>
-						<muzzleFlashScale>0</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kurin_Gun_Surigum"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.5</MeleeCritChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-							<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kurin_Gun_Surigum"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>0.5</cooldownTime>
-								<armorPenetrationBlunt>4.44</armorPenetrationBlunt>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kurin_MeleeWeapon_Ceremonial_Sword"]/statBases</xpath>
-					<value>
-						<Bulk>20.00</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kurin_MeleeWeapon_Katana" or defName="Kimiri_MeleeWeapon_Katana"]/statBases</xpath>
-					<value>
-						<Bulk>5.00</Bulk>
-					</value>
-				</li>
-
-				<!--========= Turret =========-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Kurin_Ship_Turret</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.00</SwayFactor>
-						<Bulk>40.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.00</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Unmakerblast_Standard</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>86</range>
-						<soundCast>Kurin_Sound_Unmaker</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kurin Deluxe Patch/ThingDefs_Races/Race_DRNTF.xml b/Patches/Kurin Deluxe Patch/ThingDefs_Races/Race_DRNTF.xml
deleted file mode 100644
index 1041976f12..0000000000
--- a/Patches/Kurin Deluxe Patch/ThingDefs_Races/Race_DRNTF.xml	
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Kurin, The Three Tailed Fox [Deluxe Edition]</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Kurin" or defName="Kimiri"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Kurin" or defName="Kimiri"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Kurin" or defName="Kimiri"]</xpath>
-						<value>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Kurin" or defName="Kimiri"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Kurin" or defName="Kimiri"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Kurin" or defName="Kimiri"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<Suppressability>1</Suppressability>
-						<SmokeSensitivity>1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Kurin"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>0.5</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>0.5</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2.14</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.245</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Kimiri"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>0.5</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>0.5</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2.14</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.245</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>tail</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>3</cooldownTime>
-								<linkedBodyPartsGroup>Kimiri_Tail</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationBlunt>2.625</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left horn</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationSharp>2.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.245</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right horn</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationSharp>2.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.245</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kurin/Bodies/Mod_Bodies_Kurin.xml b/Patches/Kurin/Bodies/Mod_Bodies_Kurin.xml
deleted file mode 100644
index bacace3897..0000000000
--- a/Patches/Kurin/Bodies/Mod_Bodies_Kurin.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-
-			<!--Kurin Bodytype-->
-
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Kurin, The Three Tailed Fox</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--Arm Groups-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Kurin"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
-							<value>
-								<li>LeftArm</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Kurin"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
-							<value>
-								<li>RightArm</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Kurin"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
-							<value>
-								<li>LeftShoulder</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Kurin"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
-							<value>
-								<li>RightShoulder</li>
-							</value>
-						</li>
-
-						<!--Natural Armor-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Kurin"]/corePart/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Kurin"]/corePart/parts/li[def="Kurin_Tail"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Kurin"]/corePart/parts/li[def="Neck"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Kurin"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Kurin"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Kurin"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Kurin"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Kurin_Ear"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Kurin"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Kurin"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Kurin"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Kurin"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Kurin"]/corePart/parts/li[def="Leg"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Kurin"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Kurin"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kurin/PawnKindDefs/DRNTF_PawnKind.xml b/Patches/Kurin/PawnKindDefs/DRNTF_PawnKind.xml
deleted file mode 100644
index 6350df7848..0000000000
--- a/Patches/Kurin/PawnKindDefs/DRNTF_PawnKind.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Kurin, The Three Tailed Fox</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/Garam_RaceAddon.RaceAddonPawnKindDef[
-								defName="Kurin_Vigilante" or
-								defName="Kurin_Soldier" or
-								defName="Kurin_EliteSoldier" or
-								defName="Kurin_Sniper"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>4</min>
-										<max>6</max>
-									</primaryMagazineCount>
-									<sidearms>
-										<li>
-											<generateChance>0.5</generateChance>
-											<sidearmMoney>
-												<min>20</min>
-												<max>120</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_Sidearm_Melee</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/Garam_RaceAddon.RaceAddonPawnKindDef[defName="Kurin_Vigilante"]/weaponTags</xpath>
-							<value>
-								<weaponTags>
-									<li>CE_AI_Pistol</li>
-								</weaponTags>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/Garam_RaceAddon.RaceAddonPawnKindDef[
-								defName="Kurin_Soldier" or
-								defName="Kurin_EliteSoldier" or
-								defName="Kurin_Sniper"
-								]/apparelRequired </xpath>
-							<value>
-								<li>CE_Apparel_Backpack</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kurin/Scenario/DRNTF_Scenario.xml b/Patches/Kurin/Scenario/DRNTF_Scenario.xml
deleted file mode 100644
index c11c8d3f00..0000000000
--- a/Patches/Kurin/Scenario/DRNTF_Scenario.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Kurin, The Three Tailed Fox</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ScenarioDef[defName="Kurin_Scenario"]/scenario/parts</xpath>
-							<value>
-								<li Class="ScenPart_StartingThing_Defined">
-									<def>StartingThing_Defined</def>
-									<thingDef>Ammo_556x45mmNATO_FMJ</thingDef>
-									<count>150</count>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/FactionDef[defName="Kurin_PlayerFaction"]/apparelStuffFilter/thingDefs</xpath>
-							<value>
-								<li>Steel</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kurin/ThingDef_Misc/DRNTF_Apparel.xml b/Patches/Kurin/ThingDef_Misc/DRNTF_Apparel.xml
deleted file mode 100644
index be41ac6182..0000000000
--- a/Patches/Kurin/ThingDef_Misc/DRNTF_Apparel.xml
+++ /dev/null
@@ -1,337 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Kurin, The Three Tailed Fox</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--========= Underwear/On Skin =========-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="Kurin_UnderwearBase" or @Name="Kurin_StockingBase"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<Bulk>0.5</Bulk>
-								<WornBulk>0.25</WornBulk>
-								<StuffEffectMultiplierArmor>0.25</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="Kurin_ApparelBase"]/statBases</xpath>
-							<value>
-								<Bulk>1</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Shirt" or
-								defName="Kurin_OnSkin_T_Shirt" or
-								defName="Kurin_OnSkin_Hot_Pants" or
-								defName="Kurin_OnSkin_Pajamas" or
-								defName="Kurin_OnSkin_One_Piece_Dress" or
-								defName="Kurin_OnSkin_Open_Back_Knit" or
-								defName="Kurin_OnSkin_Open_Shoulder_Knit" or
-								defName="Kurin_OnSkin_Hoodie" or
-								defName="Kurin_OnSkin_Casual_Wear"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Gothic_Dress" or
-								defName="Kurin_OnSkin_Nun_Dress" or
-								defName="Kurin_OnSkin_Work_Jumpsuit" or
-								defName="Kurin_OnSkin_Traditional_Simple_Dress" or
-								defName="Kurin_OnSkin_Traditional_Fancy_Dress" or
-								defName="Kurin_OnSkin_Traditional_Luxury_Dress" or
-								defName="Kurin_OnSkin_Cute_Dress" or
-								defName="Kurin_OnSkin_Seductive_White_Dress" or
-								defName="Kurin_OnSkin_Seductive_Black_Dress"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<!--========= Onskin Armor =========-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Armored_Gothic_Dress" or
-								defName="Kurin_OnSkin_Military_Uniform"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-								<Bulk>24</Bulk>
-								<WornBulk>10</WornBulk>
-								<Mass>6</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Armored_Gothic_Dress"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>0.2</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Military_Uniform"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-							<value>
-								<ShootingAccuracyPawn>0.4</ShootingAccuracyPawn>
-								<AimingAccuracy>0.2</AimingAccuracy>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Armored_Gothic_Dress"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>1.75</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Armored_Gothic_Dress"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>2.30</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Military_Uniform"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>2.25</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Military_Uniform"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>3.05</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Bikini_Armor"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-								<Bulk>100</Bulk>
-								<WornBulk>15</WornBulk>
-								<Mass>15</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Bikini_Armor"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>0.6</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Military_Uniform" or defName="Kurin_OnSkin_Bikini_Armor"]/apparel</xpath>
-							<value>
-								<bodyPartGroups>
-									<li>Torso</li>
-									<li>Neck</li>
-									<li>Shoulders</li>
-									<li>Arms</li>
-									<li>Legs</li>
-									<li>Hands</li>
-									<li>Feet</li>
-								</bodyPartGroups>
-							</value>
-						</li>
-
-						<!--========= Hats =========-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kurin_Overhead_Winter_Hat" or
-								defName="Kurin_Overhead_Summer_Hat" or
-								defName="Kurin_Overhead_Casual_Hair_Pin"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kurin_Overhead_Gothic_Hair_Pin" or
-								defName="Kurin_Overhead_Traditional_Hair_Pin" or
-								defName="Kurin_Overhead_Cute_Hair_Pin"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<!--========= Overhead Armor =========-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kurin_Overhead_Goggles"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>4</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kurin_Overhead_Goggles"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>6</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kurin_Overhead_Bikini_Armor_Headgear"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>7.5</StuffEffectMultiplierArmor>
-								<ArmorRating_Heat>0.20</ArmorRating_Heat>
-								<Bulk>5</Bulk>
-								<WornBulk>3</WornBulk>
-								<Mass>3</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kurin_Overhead_Bikini_Armor_Headgear"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>0.2</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kurin_Overhead_Military_Helmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>5.5</StuffEffectMultiplierArmor>
-								<Bulk>5</Bulk>
-								<WornBulk>3</WornBulk>
-								<Mass>3</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kurin_Overhead_Military_Helmet"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>4</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kurin_Overhead_Military_Helmet"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>6</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--========= Middle Apparel =========-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kurin_Middle_Body_Armor"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
-								<Bulk>5</Bulk>
-								<WornBulk>3</WornBulk>
-								<Mass>13</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kurin_Middle_Body_Armor"]/statBases/MaxHitPoints</xpath>
-							<value>
-								<MaxHitPoints>125</MaxHitPoints>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kurin_Middle_Body_Armor"]/statBases/WorkToMake</xpath>
-							<value>
-								<WorkToMake>9000</WorkToMake>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kurin_Middle_Body_Armor"]/stuffCategories</xpath>
-							<value>
-								<stuffCategories>
-									<li>Steeled</li>
-								</stuffCategories>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kurin_Middle_Body_Armor"]/costList</xpath>
-							<value>
-								<costList>
-									<Cloth>30</Cloth>
-								</costList>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kurin_Middle_Body_Armor"]/costStuffCount</xpath>
-							<value>
-								<costStuffCount>90</costStuffCount>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Kurin_Middle_Body_Armor"]/apparel</xpath>
-							<value>
-								<bodyPartGroups>
-									<li>Torso</li>
-									<li>Neck</li>
-									<li>Shoulders</li>
-								</bodyPartGroups>
-							</value>
-						</li>
-
-						<!--========= Shell Apparel =========-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kurin_Shell_Cardigan" or
-								defName="Kurin_Shell_Duster" or
-								defName="Kurin_Shell_Winter_Padding"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Kurin_Shell_Cardigan" or
-								defName="Kurin_Shell_Duster" or
-								defName="Kurin_Shell_Winter_Padding"]/statBases </xpath>
-							<value>
-								<Bulk>7.5</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Traditional_Coat"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>6.25</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Kurin_OnSkin_Traditional_Coat"]/statBases</xpath>
-							<value>
-								<Bulk>7.5</Bulk>
-								<WornBulk>1.5</WornBulk>
-							</value>
-						</li>
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kurin/ThingDef_Misc/DRNTF_Weapon.xml b/Patches/Kurin/ThingDef_Misc/DRNTF_Weapon.xml
deleted file mode 100644
index ee82483eea..0000000000
--- a/Patches/Kurin/ThingDef_Misc/DRNTF_Weapon.xml
+++ /dev/null
@@ -1,276 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Kurin, The Three Tailed Fox</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--========= Rifle : K2 as a Basis =========-->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Kurin_Gun_Assault_Rifle</defName>
-							<statBases>
-								<SightsEfficiency>1.00</SightsEfficiency>
-								<ShotSpread>0.07</ShotSpread>
-								<SwayFactor>1.31</SwayFactor>
-								<Bulk>8.30</Bulk>
-								<Mass>3.26</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							</statBases>
-
-							<Properties>
-								<recoilAmount>1.50</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-								<range>48</range>
-								<soundCast>Kurin_Shot_Tactical_Rifle</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>30</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-							</FireModes>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Kurin_Gun_Sniper_Rifle</defName>
-							<statBases>
-								<SightsEfficiency>2.36</SightsEfficiency>
-								<ShotSpread>0.07</ShotSpread>
-								<SwayFactor>1.50</SwayFactor>
-								<Bulk>8.30</Bulk>
-								<Mass>3.78</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							</statBases>
-
-							<Properties>
-								<recoilAmount>1.39</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-								<warmupTime>1.4</warmupTime>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-								<range>62</range>
-								<soundCast>Kurin_Shot_Tactical_Rifle</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>30</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-							</FireModes>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kurin_Gun_Assault_Rifle" or
-								defName="Kurin_Gun_Sniper_Rifle"]/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>
-						</li>
-
-						<!--========= Ceremonial Sword : Changed to Zweihandler Clone =========-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kurin_MeleeWeapon_Ceremonial_Sword"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>5</power>
-										<cooldownTime>2.01</cooldownTime>
-										<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>point</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>60</power>
-										<cooldownTime>2.01</cooldownTime>
-										<chanceFactor>1.165</chanceFactor>
-										<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.89</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>edge</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>47</power>
-										<cooldownTime>3.12</cooldownTime>
-										<chanceFactor>1.165</chanceFactor>
-										<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.4</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kurin_MeleeWeapon_Ceremonial_Sword"]/statBases</xpath>
-							<value>
-								<statBases>
-									<WorkToMake>25000</WorkToMake>
-									<Mass>3.2</Mass>
-									<Bulk>12</Bulk>
-									<MeleeCounterParryBonus>0.59</MeleeCounterParryBonus>
-								</statBases>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kurin_MeleeWeapon_Ceremonial_Sword"]/costStuffCount</xpath>
-							<value>
-								<costStuffCount>150</costStuffCount>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Kurin_MeleeWeapon_Ceremonial_Sword"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.08</MeleeCritChance>
-									<MeleeParryChance>0.5</MeleeParryChance>
-									<MeleeDodgeChance>0.5</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-						<!--========= Surigum : Changed to Dagger, thrown property removed =========-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Kurin_Gun_Surigum"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.5</MeleeCritChance>
-									<MeleeParryChance>0.15</MeleeParryChance>
-									<MeleeDodgeChance>0.05</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kurin_Gun_Surigum"]/statBases</xpath>
-							<value>
-								<statBases>
-									<WorkToMake>8000</WorkToMake>
-									<Mass>0.4</Mass>
-									<Bulk>1</Bulk>
-									<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-								</statBases>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Kurin_Gun_Surigum"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>1.26</cooldownTime>
-										<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>blade</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>10</power>
-										<cooldownTime>1.18</cooldownTime>
-										<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.32</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>point</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>11</power>
-										<cooldownTime>1.26</cooldownTime>
-										<chanceFactor>1.33</chanceFactor>
-										<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.42</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="Kurin_Gun_Surigum"]/verbs</xpath>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Kurin/ThingDefs_Races/Race_DRNTF.xml b/Patches/Kurin/ThingDefs_Races/Race_DRNTF.xml
deleted file mode 100644
index 33e51b12cc..0000000000
--- a/Patches/Kurin/ThingDefs_Races/Race_DRNTF.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Kurin, The Three Tailed Fox</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/Garam_RaceAddon.RaceAddonThingDef[defName="Kurin"]/comps</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/Garam_RaceAddon.RaceAddonThingDef[defName="Kurin"]</xpath>
-								<value>
-									<comps />
-								</value>
-							</nomatch>
-							<match Class="PatchOperationAdd">
-								<xpath>Defs/Garam_RaceAddon.RaceAddonThingDef[defName="Kurin"]</xpath>
-								<value>
-								</value>
-							</match>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/Garam_RaceAddon.RaceAddonThingDef[defName="Kurin"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Humanoid</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/Garam_RaceAddon.RaceAddonThingDef[defName="Kurin"]/comps</xpath>
-							<value>
-								<li>
-									<compClass>CombatExtended.CompPawnGizmo</compClass>
-								</li>
-								<li Class="CombatExtended.CompProperties_Suppressable" />
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/Garam_RaceAddon.RaceAddonThingDef[defName="Kurin"]/statBases</xpath>
-							<value>
-								<MeleeDodgeChance>1</MeleeDodgeChance>
-								<MeleeCritChance>1</MeleeCritChance>
-								<MeleeParryChance>1</MeleeParryChance>
-								<Suppressability>1</Suppressability>
-								<SmokeSensitivity>1</SmokeSensitivity>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/Garam_RaceAddon.RaceAddonThingDef[defName="Kurin"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>1.26</cooldownTime>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>right fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>1.26</cooldownTime>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>teeth</label>
-										<capacities>
-											<li>Bite</li>
-										</capacities>
-										<power>4</power>
-										<cooldownTime>2.14</cooldownTime>
-										<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationSharp>0.01</armorPenetrationSharp>
-										<armorPenetrationBlunt>0.245</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>4.49</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/Garam_RaceAddon.RaceAddonThingDef[defName="Kurin"]/raceAddonSettings/apparelRestrictionSetting/allAllow_Exceptions</xpath>
-							<value>
-								<li>CE_Apparel_TacVest</li>
-								<li>CE_Apparel_Backpack</li>
-								<li>CE_Apparel_TribalBackpack</li>
-								<li>CE_Apparel_BallisticShield</li>
-								<li>CE_Apparel_MeleeShield</li>
-								<li>CE_Apparel_GasMask</li>
-								<li>CE_Apparel_ImprovGasMask</li>
-							</value>
-						</li>
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/LF Command And Conquer NOD Combat Armor/CE_Nod.xml b/Patches/LF Command And Conquer NOD Combat Armor/CE_Nod.xml
deleted file mode 100644
index 67c41e5ee7..0000000000
--- a/Patches/LF Command And Conquer NOD Combat Armor/CE_Nod.xml	
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[LF] Command And Conquer NOD Combat Armor</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="NOD_Militant_Helmet"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>2</WornBulk>
-						<Flammability>0.4</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="NOD_Militant_Helmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>130</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="NOD_Militant_Helmet"]/statBases/WorkToMake</xpath>
-					<value>
-						<WorkToMake>11000</WorkToMake>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="NOD_Militant_Helmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="NOD_Militant_Helmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>15</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="NOD_Militant_Helmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="NOD_Militant_Helmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="NOD_Militant_Helmet"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<PsychicSensitivity>-0.1</PsychicSensitivity>
-							<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-							<ShootingAccuracyPawn>0.1</ShootingAccuracyPawn>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="NOD_Militant_Helmet"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>40</Steel>
-							<Plasteel>10</Plasteel>
-							<Cloth>5</Cloth>
-							<DevilstrandCloth>15</DevilstrandCloth>
-							<ComponentSpacer>1</ComponentSpacer>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="NOD_Militant_Helmet"]/apparel/layers</xpath>
-					<value>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!-- === Armor === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CNC_NOD_Militant_Armor"]/statBases</xpath>
-					<value>
-						<Bulk>50</Bulk>
-						<WornBulk>12</WornBulk>
-						<Flammability>0.4</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CNC_NOD_Militant_Armor"]/statBases/WorkToMake</xpath>
-					<value>
-						<WorkToMake>34000</WorkToMake>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CNC_NOD_Militant_Armor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>18</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CNC_NOD_Militant_Armor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>300</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CNC_NOD_Militant_Armor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CNC_NOD_Militant_Armor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>22</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CNC_NOD_Militant_Armor"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>80</Steel>
-							<Plasteel>40</Plasteel>
-							<Cloth>20</Cloth>
-							<DevilstrandCloth>40</DevilstrandCloth>
-							<ComponentIndustrial>4</ComponentIndustrial>
-							<ComponentSpacer>1</ComponentSpacer>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CNC_NOD_Militant_Armor"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>8</CarryBulk>
-							<ToxicEnvironmentResistance>0.20</ToxicEnvironmentResistance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/LF Red Dawn/135mm9M113Konkur.xml b/Patches/LF Red Dawn/135mm9M113Konkur.xml
deleted file mode 100644
index c51591c2c3..0000000000
--- a/Patches/LF Red Dawn/135mm9M113Konkur.xml	
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[LF] Red Dawn</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>Ammo9M113</defName>
-					<label>9M113 Konkur Missile</label>
-					<parent>AmmoRockets</parent>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_Konkur</defName>
-					<label>9M113 Missiles</label>
-					<ammoTypes>
-						<Ammo_9M113_HEAT>Bullet_9M113_HEAT</Ammo_9M113_HEAT>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="9M113Base" ParentName="HeavyAmmoBase" Abstract="True">
-					<description>135mm Anti-tank guided missiles for use in Konkur system.</description>
-					<statBases>
-						<MaxHitPoints>200</MaxHitPoints>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade_Sellable</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-					</tradeTags>
-					<thingCategories>
-						<li>Ammo9M113</li>
-					</thingCategories>
-					<stackLimit>10</stackLimit>
-					<cookOffFlashScale>30</cookOffFlashScale>
-					<cookOffSound>MortarBomb_Explode</cookOffSound>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="9M113Base">
-					<defName>Ammo_9M113_HEAT</defName>
-					<label>9M113 Missile (HEAT)</label>
-					<graphicData>
-						<texPath>Things\Projectile\Konkurs_Shell\Shell_HE\Shell_Konkurs</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-						<drawSize>1.0</drawSize>
-					</graphicData>
-					<statBases>
-						<MarketValue>170</MarketValue>
-						<Mass>14.1</Mass>
-						<Bulk>27.17</Bulk>
-					</statBases>
-					<ammoClass>RocketHEAT</ammoClass>
-					<detonateProjectile>Bullet_9M113_HEAT</detonateProjectile>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseRPG7Grenade">
-					<defName>Bullet_9M113_HEAT</defName>
-					<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					<label>9M113 Missile (HEAT)</label>
-					<graphicData>
-						<texPath>Things/Projectile/Rocket_Big</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-						<shaderType>TransparentPostLight</shaderType>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>56</speed>
-						<damageDef>Bullet</damageDef>
-						<damageAmountBase>300</damageAmountBase>
-						<armorPenetrationSharp>800</armorPenetrationSharp>
-						<armorPenetrationBlunt>151.584</armorPenetrationBlunt>
-						<soundAmbient>RocketPropelledLoop_Small</soundAmbient>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>240</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>1.5</explosiveRadius>
-							<explosionSound>MortarBomb_Explode</explosionSound>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>10</Fragment_Large>
-								<Fragment_Small>50</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_9M113_HEAT</defName>
-					<label>make 9M113 HEAT Missile</label>
-					<description>Craft 5 9M113 HEAT Missiles.</description>
-					<jobString>Making 9M113 HEAT Missiles.</jobString>
-					<workAmount>42000</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>190</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>12</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>20</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>ComponentIndustrial</li>
-							<li>FSX</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_9M113_HEAT>5</Ammo_9M113_HEAT>
-					</products>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/LF Red Dawn/82mmMortar.xml b/Patches/LF Red Dawn/82mmMortar.xml
deleted file mode 100644
index ba53dce061..0000000000
--- a/Patches/LF Red Dawn/82mmMortar.xml	
+++ /dev/null
@@ -1,532 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[LF] Red Dawn</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-				<ThingCategoryDef>
-					<defName>Ammo82mmMortarShells</defName>
-					<label>82mm mortar shell</label>
-					<parent>AmmoShells</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberMortar</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_82mmMortarShell</defName>
-					<label>82mm mortar shells</label>
-					<ammoTypes>
-						<!-- Overrides vanilla artillery shell -->
-						<Shell_82mmMortar_HE>Bullet_82mmMortarShell_HE</Shell_82mmMortar_HE>
-						<Shell_82mmMortar_Incendiary>Bullet_82mmMortarShell_Incendiary</Shell_82mmMortar_Incendiary>
-						<Shell_82mmMortar_EMP>Bullet_82mmMortarShell_EMP</Shell_82mmMortar_EMP>
-						<Shell_82mmMortar_Firefoam>Bullet_82mmMortarShell_Firefoam</Shell_82mmMortar_Firefoam>
-						<Shell_82mmMortar_Smoke>Bullet_82mmMortarShell_82mmMortar_Smoke</Shell_82mmMortar_Smoke>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="82mmMortarShellBase" ParentName="HeavyAmmoBase" Abstract="True">
-					<description>Low-velocity shell designed to be fired from a mortar.</description>
-					<graphicData>
-						<drawSize>0.80</drawSize>
-					</graphicData>
-					<statBases>
-						<MaxHitPoints>200</MaxHitPoints>
-						<Mass>5.27</Mass>
-						<Bulk>8.17</Bulk>
-					</statBases>
-					<thingCategories>
-						<li>Ammo82mmMortarShells</li>
-					</thingCategories>
-					<stackLimit>25</stackLimit>
-					<cookOffFlashScale>30</cookOffFlashScale>
-					<cookOffSound>MortarBomb_Explode</cookOffSound>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="82mmMortarShellBaseCraftableBase" ParentName="82mmMortarShellBase" Abstract="True">
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-					</tradeTags>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="82mmMortarShellBaseCraftableBase">
-					<defName>Shell_82mmMortar_HE</defName>
-					<label>82mm mortar shell (HE)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Mortar/HE</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>50.68</MarketValue>
-					</statBases>
-					<ammoClass>GrenadeHE</ammoClass>
-					<detonateProjectile>Bullet_82mmMortarShell_HE</detonateProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="82mmMortarShellBaseCraftableBase">
-					<defName>Shell_82mmMortar_Incendiary</defName>
-					<label>82mm mortar shell (Incendiary)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Mortar/Incendiary</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>42.34</MarketValue>
-						<Mass>4.1</Mass>
-						<Bulk>10.01</Bulk>
-					</statBases>
-					<ammoClass>GrenadeIncendiary</ammoClass>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>11</damageAmountBase>
-							<explosiveDamageType>PrometheumFlame</explosiveDamageType>
-							<explosiveRadius>5</explosiveRadius>
-							<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
-							<preExplosionSpawnChance>0.5</preExplosionSpawnChance>
-							<explosionSound>MortarIncendiary_Explode</explosionSound>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="82mmMortarShellBaseCraftableBase">
-					<defName>Shell_82mmMortar_EMP</defName>
-					<label>82mm mortar shell (EMP)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Mortar/EMP</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>112.42</MarketValue>
-						<Mass>5.27</Mass>
-						<Bulk>8.17</Bulk>
-					</statBases>
-					<ammoClass>GrenadeEMP</ammoClass>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>34</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>5.5</explosiveRadius>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="82mmMortarShellBaseCraftableBase">
-					<defName>Shell_82mmMortar_Firefoam</defName>
-					<label>82mm mortar shell (Foam)</label>
-					<generateAllowChance>0</generateAllowChance>
-					<graphicData>
-						<texPath>Things/Ammo/Mortar/Firefoam</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>37.03</MarketValue>
-						<Mass>4.1</Mass>
-						<Bulk>10.01</Bulk>
-					</statBases>
-					<ammoClass>FoamFuel</ammoClass>
-					<detonateProjectile>Bullet_82mmMortarShell_Firefoam</detonateProjectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>7</damageAmountBase>
-							<explosiveDamageType>Extinguish</explosiveDamageType>
-							<postExplosionSpawnThingDef>Filth_FireFoam</postExplosionSpawnThingDef>
-							<postExplosionSpawnChance>1</postExplosionSpawnChance>
-							<postExplosionSpawnThingCount>3</postExplosionSpawnThingCount>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="82mmMortarShellBaseCraftableBase">
-					<defName>Shell_82mmMortar_Smoke</defName>
-					<label>82mm mortar shell (Smoke)</label>
-					<generateAllowChance>0</generateAllowChance>
-					<graphicData>
-						<texPath>Things/Ammo/Mortar/Smoke</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>37.03</MarketValue>
-						<Mass>4.1</Mass>
-						<Bulk>10.01</Bulk>
-					</statBases>
-					<ammoClass>Smoke</ammoClass>
-					<detonateProjectile>Bullet_82mmMortarShell_82mmMortar_Smoke</detonateProjectile>
-					<comps>
-						<!-- Vanilla values -->
-						<li Class="CompProperties_Explosive">
-							<explosiveRadius>6</explosiveRadius>
-							<explosiveDamageType>Smoke</explosiveDamageType>
-							<startWickHitPointsPercent>0.7</startWickHitPointsPercent>
-							<postExplosionGasType>BlindSmoke</postExplosionGasType>
-							<preExplosionSpawnChance>1</preExplosionSpawnChance>
-							<explodeOnKilled>True</explodeOnKilled>
-							<wickTicks>30~82</wickTicks>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef Name="Base82mmMortarShell" ParentName="BaseExplosiveBullet" Abstract="true">
-					<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					<graphicData>
-						<shaderType>TransparentPostLight</shaderType>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>0</speed>
-						<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-						<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
-						<soundAmbient>MortarRound_Ambient</soundAmbient>
-						<flyOverhead>true</flyOverhead>
-						<dropsCasings>false</dropsCasings>
-						<gravityFactor>5</gravityFactor>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base82mmMortarShell">
-					<defName>Bullet_82mmMortarShell_HE</defName>
-					<label>82mm mortar shell (HE)</label>
-					<graphicData>
-						<texPath>Things/Projectile/Mortar/HE</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bomb</damageDef>
-						<damageAmountBase>156</damageAmountBase>
-						<armorPenetrationSharp>0</armorPenetrationSharp>
-						<armorPenetrationBlunt>0</armorPenetrationBlunt>
-						<explosionRadius>2.5</explosionRadius>
-						<flyOverhead>true</flyOverhead>
-						<soundExplode>MortarBomb_Explode</soundExplode>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						<ai_IsIncendiary>true</ai_IsIncendiary>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>16</Fragment_Large>
-								<Fragment_Small>100</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<ThingDef ParentName="Base82mmMortarShell">
-					<defName>Bullet_82mmMortarShell_Incendiary</defName>
-					<label>82mm mortar shell (Incendiary)</label>
-					<graphicData>
-						<texPath>Things/Projectile/Mortar/Incendiary</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>PrometheumFlame</damageDef>
-						<damageAmountBase>11</damageAmountBase>
-						<explosionRadius>6.5</explosionRadius>
-						<flyOverhead>true</flyOverhead>
-						<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
-						<preExplosionSpawnChance>0.15</preExplosionSpawnChance>
-						<soundExplode>MortarIncendiary_Explode</soundExplode>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base82mmMortarShell">
-					<defName>Bullet_82mmMortarShell_EMP</defName>
-					<label>82mm mortar shell (EMP)</label>
-					<graphicData>
-						<texPath>Things/Projectile/Mortar/EMP</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>EMP</damageDef>
-						<damageAmountBase>156</damageAmountBase>
-						<armorPenetrationSharp>0</armorPenetrationSharp>
-						<armorPenetrationBlunt>0</armorPenetrationBlunt>
-						<flyOverhead>true</flyOverhead>
-						<explosionRadius>5.5</explosionRadius>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base82mmMortarShell">
-					<defName>Bullet_82mmMortarShell_Firefoam</defName>
-					<label>82mm mortar shell (Foam)</label>
-					<graphicData>
-						<texPath>Things/Projectile/Mortar/Firefoam</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Extinguish</damageDef>
-						<suppressionFactor>0.0</suppressionFactor>
-						<dangerFactor>0.0</dangerFactor>
-						<armorPenetrationSharp>0</armorPenetrationSharp>
-						<armorPenetrationBlunt>0</armorPenetrationBlunt>
-						<explosionRadius>4.75</explosionRadius>
-						<flyOverhead>true</flyOverhead>
-						<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-						<soundExplode>Explosion_EMP</soundExplode>
-						<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
-						<soundAmbient>MortarRound_Ambient</soundAmbient>
-						<postExplosionSpawnThingDef>Filth_FireFoam</postExplosionSpawnThingDef>
-						<postExplosionSpawnChance>1</postExplosionSpawnChance>
-						<postExplosionSpawnThingCount>3</postExplosionSpawnThingCount>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						<explosionEffect>ExtinguisherExplosion</explosionEffect>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base82mmMortarShell">
-					<defName>Bullet_82mmMortarShell_82mmMortar_Smoke</defName>
-					<label>82mm mortar shell (Smoke)</label>
-					<graphicData>
-						<texPath>Things/Projectile/Mortar/Smoke</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Smoke</damageDef>
-						<suppressionFactor>0.0</suppressionFactor>
-						<dangerFactor>0.0</dangerFactor>
-						<armorPenetrationSharp>0</armorPenetrationSharp>
-						<armorPenetrationBlunt>0</armorPenetrationBlunt>
-						<explosionRadius>6</explosionRadius>
-						<flyOverhead>true</flyOverhead>
-						<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-						<soundExplode>Explosion_EMP</soundExplode>
-						<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
-						<soundAmbient>MortarRound_Ambient</soundAmbient>
-						<postExplosionGasType>BlindSmoke</postExplosionGasType>
-						<preExplosionSpawnChance>1</preExplosionSpawnChance>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						<explosionEffect>ExtinguisherExplosion</explosionEffect>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeShell_82mmMortar_HE</defName>
-					<label>make 82mm HE mortar shells x5</label>
-					<description>Craft 5 82mm HE mortar shells.</description>
-					<jobString>Making 82mm HE mortar shells.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>54</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>10</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Shell_82mmMortar_HE>5</Shell_82mmMortar_HE>
-					</products>
-					<workAmount>10600</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeShell_82mmMortar_Incendiary</defName>
-					<label>make 82mm incendiary mortar shells x5</label>
-					<description>Craft 5 82mm incendiary mortar shells.</description>
-					<jobString>Making 82mm incendiary mortar shells.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>58</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>5</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Prometheum</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Shell_82mmMortar_Incendiary>5</Shell_82mmMortar_Incendiary>
-					</products>
-					<workAmount>9000</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeShell_82mmMortar_EMP</defName>
-					<label>make 82mm EMP mortar shells x5</label>
-					<description>Craft 5 82mm EMP mortar shells.</description>
-					<jobString>Making 82mm EMP mortar shells.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>54</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>14</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Shell_82mmMortar_EMP>5</Shell_82mmMortar_EMP>
-					</products>
-					<workAmount>13800</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeShell_82mmMortar_Firefoam</defName>
-					<label>make 82mm firefoam mortar shells x5</label>
-					<description>Craft 5 82mm firefoam mortar shells.</description>
-					<jobString>Making 82mm firefoam mortar shells.</jobString>
-					<researchPrerequisite>Firefoam</researchPrerequisite>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>42</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<categories>
-									<li>MeatRaw</li>
-								</categories>
-							</filter>
-							<count>17</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-						<categories>
-							<li>MeatRaw</li>
-						</categories>
-					</fixedIngredientFilter>
-					<products>
-						<Shell_82mmMortar_Firefoam>5</Shell_82mmMortar_Firefoam>
-					</products>
-					<workAmount>8800</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeShell_82mmMortar_Smoke</defName>
-					<label>make 82mm smoke mortar shells x5</label>
-					<description>Craft 5 82mm smoke mortar shells.</description>
-					<jobString>Making 82mm smoke mortar shells.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>42</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Prometheum</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Shell_82mmMortar_Smoke>5</Shell_82mmMortar_Smoke>
-					</products>
-					<workAmount>6600</workAmount>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/LF Red Dawn/Armors_RD.xml b/Patches/LF Red Dawn/Armors_RD.xml
deleted file mode 100644
index 82b4b97430..0000000000
--- a/Patches/LF Red Dawn/Armors_RD.xml	
+++ /dev/null
@@ -1,582 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[LF] Red Dawn</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--========================= Helmets ========================-->
-				<!--Ssh60-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_Ssh60helmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<WornBulk>1</WornBulk>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_Ssh60helmet"]/stuffCategories/li[.="Metallic"]</xpath>
-					<value>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<!--Ssh68-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_Ssh68helmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>7</ArmorRating_Sharp>
-						<ArmorRating_Blunt>10.5</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.36</ArmorRating_Heat>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_Ssh68helmet"]/stuffCategories/li[.="Metallic"]</xpath>
-					<value>
-						<li>Steeled</li>
-					</value>
-				</li>
-				<!--Sfera-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_SferaHelmt"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_SferaHelmt"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>12</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_SferaHelmt"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.386</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!--Altyn no mask-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_AltynMaskless"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1.5</WornBulk>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_AltynMaskless"]/statBases/Mass</xpath>
-					<value>
-						<Mass>4</Mass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_AltynMaskless"]/stuffCategories/li[.="Metallic"]</xpath>
-					<value>
-						<li>Steeled</li>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_AltynMaskless"]/costList</xpath>
-					<value>
-						<costList>
-							<ComponentIndustrial>1</ComponentIndustrial>
-							<Plasteel>10</Plasteel>
-						</costList>
-					</value>
-				</li>
-
-				<!--Altyn mask down-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_AltynMaskDown"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1.5</WornBulk>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_AltynMaskDown"]/statBases/Mass</xpath>
-					<value>
-						<Mass>4</Mass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_AltynMaskDown"]/stuffCategories/li[.="Metallic"]</xpath>
-					<value>
-						<li>Steeled</li>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_AltynMaskDown"]/costList</xpath>
-					<value>
-						<costList>
-							<ComponentIndustrial>1</ComponentIndustrial>
-							<Plasteel>10</Plasteel>
-						</costList>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_AltynMaskDown"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>FullHead</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RD_AltynMaskDown"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>-0.4</AimingAccuracy>
-							<MeleeHitChance>-2</MeleeHitChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!--Altyn mask up-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_AltynMaskUP"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1.5</WornBulk>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_AltynMaskUP"]/statBases/Mass</xpath>
-					<value>
-						<Mass>4</Mass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_AltynMaskUP"]/stuffCategories/li[.="Metallic"]</xpath>
-					<value>
-						<li>Steeled</li>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_AltynMaskUP"]/costList</xpath>
-					<value>
-						<costList>
-							<ComponentIndustrial>1</ComponentIndustrial>
-							<Plasteel>10</Plasteel>
-						</costList>
-					</value>
-				</li>
-
-				<!--PSH77 Maskless-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_PSHMaskless"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1.5</WornBulk>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_PSHMaskless"]/statBases/Mass</xpath>
-					<value>
-						<Mass>4</Mass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_PSHMaskless"]/stuffCategories/li[.="Metallic"]</xpath>
-					<value>
-						<li>Steeled</li>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_PSHMaskless"]/costList</xpath>
-					<value>
-						<costList>
-							<ComponentIndustrial>1</ComponentIndustrial>
-							<Plasteel>10</Plasteel>
-						</costList>
-					</value>
-				</li>
-
-				<!--PSH77 mask down-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_PSHMaskDown"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1.5</WornBulk>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_PSHMaskDown"]/statBases/Mass</xpath>
-					<value>
-						<Mass>4</Mass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_PSHMaskDown"]/stuffCategories/li[.="Metallic"]</xpath>
-					<value>
-						<li>Steeled</li>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_PSHMaskDown"]/costList</xpath>
-					<value>
-						<costList>
-							<ComponentIndustrial>1</ComponentIndustrial>
-							<Plasteel>10</Plasteel>
-						</costList>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_PSHMaskDown"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>FullHead</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RD_PSHMaskDown"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>-0.4</AimingAccuracy>
-							<MeleeHitChance>-2</MeleeHitChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!--PSHMaskUP mask up-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_PSHMaskUP"]/statBases/Mass</xpath>
-					<value>
-						<Mass>4</Mass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_PSHMaskUP"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1.5</WornBulk>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_PSHMaskUP"]/stuffCategories/li[.="Metallic"]</xpath>
-					<value>
-						<li>Steeled</li>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_PSHMaskUP"]/costList</xpath>
-					<value>
-						<costList>
-							<ComponentIndustrial>1</ComponentIndustrial>
-							<Plasteel>10</Plasteel>
-						</costList>
-					</value>
-				</li>
-
-				<!--SSh-68 Helmet-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_DesertHelmet" or defName="RD_KLMKHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<WornBulk>1</WornBulk>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_DesertHelmet" or defName="RD_KLMKHelmet"]/stuffCategories/li[.="Metallic"]</xpath>
-					<value>
-						<li>Steeled</li>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_DesertHelmet" or defName="RD_KLMKHelmet"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>30</costStuffCount>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_DesertHelmet" or defName="RD_KLMKHelmet"]/costList</xpath>
-					<value>
-						<costList>
-							<Plasteel>10</Plasteel>
-						</costList>
-					</value>
-				</li>
-
-				<!--========================== Body Armors =====================================-->
-				<!--6b2-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RD_6b2FlakVest"]/statBases/Mass</xpath>
-					<value>
-						<Mass>13</Mass>
-						<Bulk>5</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_6b2FlakVest"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>125</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_6b2FlakVest"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_6b2FlakVest"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>14</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_6b2FlakVest"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0</ArmorRating_Heat>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_6b2FlakVest"]/costList</xpath>
-					<value>
-						<costList>
-							<Cloth>10</Cloth>
-							<Steel>80</Steel>
-						</costList>
-					</value>
-				</li>
-
-				<!--6B3-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RD_6b3FlakVest"]/statBases/Mass</xpath>
-					<value>
-						<Mass>10.4</Mass>
-						<Bulk>5</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_6b3FlakVest"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>250</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_6b3FlakVest"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_6b3FlakVest"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>24</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_6b3FlakVest"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0</ArmorRating_Heat>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_6b3FlakVest"]/costList</xpath>
-					<value>
-						<costList>
-							<Cloth>10</Cloth>
-							<Plasteel>90</Plasteel>
-						</costList>
-					</value>
-				</li>
-
-				<!--Very Heavy-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RD_BzhVest"]/statBases/Mass</xpath>
-					<value>
-						<Mass>20</Mass>
-						<Bulk>8</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_BzhVest"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>250</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_BzhVest"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_BzhVest"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>26</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_BzhVest"]/costList</xpath>
-					<value>
-						<costList>
-							<Cloth>10</Cloth>
-							<Plasteel>110</Plasteel>
-						</costList>
-					</value>
-				</li>
-				<!--Light-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_LightPilotFlightVest"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>100</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_LightPilotFlightVest"]/statBases/Mass</xpath>
-					<value>
-						<Mass>8</Mass>
-						<Bulk>5</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_LightPilotFlightVest"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6.5</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_LightPilotFlightVest"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>10</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_LightPilotFlightVest"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.1</ArmorRating_Heat>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_LightPilotFlightVest"]/costList</xpath>
-					<value>
-						<costList>
-							<Cloth>5</Cloth>
-							<Steel>65</Steel>
-						</costList>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_VDBVest"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>100</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_VDBVest"]/statBases/Mass</xpath>
-					<value>
-						<Mass>7.5</Mass>
-						<Bulk>5</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_LightPilotFlightVest"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_VDBVest"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>9</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_VDBVest"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.12</ArmorRating_Heat>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_VDBVest"]/costList</xpath>
-					<value>
-						<costList>
-							<Cloth>20</Cloth>
-							<Steel>60</Steel>
-						</costList>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RD_VDBVest"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>6</CarryBulk>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_LightPilotFlightVestCamo"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>100</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_LightPilotFlightVestCamo"]/statBases/Mass</xpath>
-					<value>
-						<Mass>7.5</Mass>
-						<Bulk>5</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_LightPilotFlightVestCamo"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_LightPilotFlightVestCamo"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>9</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_LightPilotFlightVestCamo"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.12</ArmorRating_Heat>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_LightPilotFlightVestCamo"]/costList</xpath>
-					<value>
-						<costList>
-							<Cloth>10</Cloth>
-							<Steel>60</Steel>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RD_6b2FlakVest" or defName="RD_6b3FlakVest" or defName="RD_BzhVest"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/LF Red Dawn/Jacket_Pants_Boots.xml b/Patches/LF Red Dawn/Jacket_Pants_Boots.xml
deleted file mode 100644
index 52088467b0..0000000000
--- a/Patches/LF Red Dawn/Jacket_Pants_Boots.xml	
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[LF] Red Dawn</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ==================== Jackets ========================== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_SovietCoat"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>110</costStuffCount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_SovietCoat"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>7.5</StuffEffectMultiplierArmor>
-						<WornBulk>2</WornBulk>
-						<Bulk>5</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_SovietOfficerJacket"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>75</costStuffCount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_SovietOfficerJacket"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
-						<Bulk>2</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_SovietOfficerJacket"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<SocialImpact>0.15</SocialImpact>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<!-- ==================== PANTS ========================== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_AFGHANKACombatPants"
-						or defName="RD_OfficerPants"
-						or defName="RNApparel_Pants_HelikonPilgrim"
-						or defName="RNApparel_Pants_511StrykeMulticam"
-						or defName="RNApparel_Pants_FjallravenKeb"
-						or defName="RNApparel_Pants_BearGryllsSurvivor"
-						or defName="RNApparel_Pants_GORKA3Pants"
-						or defName="RNApparel_Jeans_Generic"
-						or defName="RNApparel_Pants_ACUUCP"
-						or defName="RNApparel_Pants_BDUDMARPAT"
-						or defName="RNApparel_Pants_CombatsDDPM"]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-						<Bulk>1</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_AFGHANKACombatPants"
-						or defName="RD_OfficerPants"
-						or defName="RNApparel_Pants_HelikonPilgrim"
-						or defName="RNApparel_Pants_511StrykeMulticam"
-						or defName="RNApparel_Pants_FjallravenKeb"
-						or defName="RNApparel_Pants_BearGryllsSurvivor"
-						or defName="RNApparel_Pants_GORKA3Pants"
-						or defName="RNApparel_Jeans_Generic"
-						or defName="RNApparel_Pants_ACUUCP"
-						or defName="RNApparel_Pants_BDUDMARPAT"
-						or defName="RNApparel_Pants_CombatsDDPM"]/costStuffCount </xpath>
-					<value>
-						<costStuffCount>20</costStuffCount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RD_AFGHANKACombatPants"
-						or defName="RD_OfficerPants"
-						or defName="RNApparel_Pants_HelikonPilgrim"]/equippedStatOffsets </xpath>
-				</li>
-
-				<!-- ==================== Carriers ========================== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_Lifchik"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>25</CarryBulk>
-							<ReloadSpeed>0.1</ReloadSpeed>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_LifchikWithPoyasB"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>25</CarryBulk>
-							<ReloadSpeed>0.1</ReloadSpeed>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_ChiCom"
-						or defName="RD_RPGbackpackGunnerAssistant"
-						or defName="RD_RPGbackpackGunner"]/equippedStatOffsets </xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>20</CarryBulk>
-							<ReloadSpeed>0.1</ReloadSpeed>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_SovietHarness"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>15</CarryBulk>
-							<ReloadSpeed>0.1</ReloadSpeed>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_RDBackpack"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>25</CarryBulk>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- ==================== Boots ========================== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RDFootwear_SovCombatBoots"
-						or defName="RDFootwear_SovSpetnazBoots"
-						or defName="RDFootwear_SovJackBoots"
-						]/statBases </xpath>
-					<value>
-						<Bulk>2</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="RDFootwear_SovCombatBoots"
-						or defName="RDFootwear_SovSpetnazBoots"
-						or defName="RDFootwear_SovJackBoots"
-						]/equippedStatOffsets/Flammability </xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/LF Red Dawn/RD_CE_Fixed_Weapons.xml b/Patches/LF Red Dawn/RD_CE_Fixed_Weapons.xml
deleted file mode 100644
index b38e4c71d2..0000000000
--- a/Patches/LF Red Dawn/RD_CE_Fixed_Weapons.xml	
+++ /dev/null
@@ -1,425 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[LF] Red Dawn</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Mounted DShK Gun ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Sov_Gun_DShK</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.57</SwayFactor>
-						<Bulk>18.54</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.33</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_127x108mm_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>DSHKshoot</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<muzzleFlashScale>18</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>5.8</reloadTime>
-						<ammoSet>AmmoSet_127x108mm</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Sov_Turret_DShK"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>75</specialDisplayRadius>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Sov_Turret_DShK"]/statBases</xpath>
-					<value>
-						<statBases>
-							<MaxHitPoints>150</MaxHitPoints>
-							<WorkToBuild>60000</WorkToBuild>
-							<Mass>52</Mass>
-							<Beauty>-20</Beauty>
-						</statBases>
-					</value>
-				</li>
-
-				<!-- ========== Mounted NSV Gun ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Sov_Gun_NSV</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.41</SwayFactor>
-						<Bulk>18.54</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_127x108mm_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>NSVshoot</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_127x108mm</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Sov_Turret_NSV"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>75</specialDisplayRadius>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Sov_Turret_NSV"]/statBases</xpath>
-					<value>
-						<statBases>
-							<MaxHitPoints>150</MaxHitPoints>
-							<WorkToBuild>60000</WorkToBuild>
-							<Mass>41</Mass>
-							<Beauty>-20</Beauty>
-						</statBases>
-					</value>
-				</li>
-
-				<!-- ========== Mounted AGS-17 Turret ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Sov_Gun_AGS</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.49</SwayFactor>
-						<Bulk>12.90</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.57</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_30x29mmGrenade_HE</defaultProjectile>
-						<warmupTime>1.35</warmupTime>
-						<range>62</range>
-						<minRange>6</minRange>
-						<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
-						<burstShotCount>6</burstShotCount>
-						<soundCast>AGSshoot</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<muzzleFlashScale>16</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>29</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_30x29mmGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_Turret_AGS"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>62</specialDisplayRadius>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_Turret_AGS"]/statBases</xpath>
-					<value>
-						<statBases>
-							<MaxHitPoints>150</MaxHitPoints>
-							<WorkToBuild>41000</WorkToBuild>
-							<Mass>31</Mass>
-							<Beauty>-20</Beauty>
-						</statBases>
-					</value>
-				</li>
-
-				<!-- ========== Konkur launcher ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Artillery_KonkursGun</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>2.5</RangedWeapon_Cooldown>
-						<SightsEfficiency>4.0</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.87</SwayFactor>
-						<Bulk>12.90</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9M113_HEAT</defaultProjectile>
-						<warmupTime>2.80</warmupTime>
-						<ai_AvoidFriendlyFireRadius>3</ai_AvoidFriendlyFireRadius>
-						<range>100</range>
-						<minRange>6</minRange>
-						<soundCast>KonkursFire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<muzzleFlashScale>16</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>8.9</reloadTime>
-						<ammoSet>AmmoSet_Konkur</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Turret_KonkursATGM"]</xpath>
-					<value>
-						<specialDisplayRadius>100</specialDisplayRadius>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Turret_KonkursATGM"]</xpath>
-					<value>
-						<statBases>
-							<MaxHitPoints>120</MaxHitPoints>
-							<WorkToBuild>55000</WorkToBuild>
-							<Mass>22.5</Mass>
-							<Beauty>-20</Beauty>
-						</statBases>
-					</value>
-				</li>
-
-				<!-- ========== SPG ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Artillery_SPG9Gun</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.50</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.68</SwayFactor>
-						<Bulk>12.90</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_SPG9Grenade_HEAT</defaultProjectile>
-						<warmupTime>3.0</warmupTime>
-						<ai_AvoidFriendlyFireRadius>3</ai_AvoidFriendlyFireRadius>
-						<range>100</range>
-						<minRange>4.9</minRange>
-						<soundCast>SPGFire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<muzzleFlashScale>18</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>7.9</reloadTime>
-						<ammoSet>AmmoSet_SPG9Grenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Turret_SPG9AT"]</xpath>
-					<value>
-						<specialDisplayRadius>100</specialDisplayRadius>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Base_SPG9AT"]/statBases</xpath>
-					<value>
-						<statBases>
-							<MaxHitPoints>175</MaxHitPoints>
-							<Flammability>0.4</Flammability>
-							<WorkToBuild>32000</WorkToBuild>
-							<Mass>59.5</Mass>
-							<Beauty>-10</Beauty>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Base_SPG9AT"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>200</Steel>
-							<ComponentIndustrial>4</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<!-- == Shared patches == -->
-
-				<!-- === Remove Shells === -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Shell_SACLOS_HE" or defName="Shell_SPG_HE"]</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Sov_Turret_DShK"
-						or defName="Sov_Turret_NSV"
-						or defName="RD_Turret_AGS"
-						or defName="Turret_KonkursATGM"
-						or defName="Turret_SPG9AT"]/statBases </xpath>
-					<value>
-						<ShootingAccuracyTurret>2.0</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Sov_Turret_DShK"
-						or defName="Sov_Turret_NSV"
-						or defName="RD_Turret_AGS"
-						or @Name="Base_KonkursAT"
-						or @Name="Base_SPG9AT"]/thingClass </xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Sov_Turret_DShK"
-						or defName="Sov_Turret_NSV"
-						or defName="RD_Turret_AGS"
-						]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Sov_Turret_DShK"
-						or defName="Sov_Turret_NSV"
-						or defName="RD_Turret_AGS"]/researchPrerequisites </xpath>
-					<value>
-						<researchPrerequisites>
-							<li>CE_TurretHeavyWeapons</li>
-						</researchPrerequisites>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Base_KonkursAT"]/researchPrerequisites</xpath>
-					<value>
-						<researchPrerequisites>
-							<li>CE_TurretHeavyWeapons</li>
-							<li>CE_Launchers</li>
-						</researchPrerequisites>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Base_SPG9AT"]/researchPrerequisites</xpath>
-					<value>
-						<researchPrerequisites>
-							<li>CE_TurretHeavyWeapons</li>
-							<li>CE_Launchers</li>
-						</researchPrerequisites>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Sov_Gun_DShK"
-						or defName="Sov_Gun_NSV"
-						or defName="Sov_Gun_AGS"
-						or @Name="Base_KonkursAT_Weapon"
-						or @Name="Base_PodnosMortar_Weapon"
-						or @Name="Base_SPG9AT_Weapon"]/menuHidden </xpath>
-					<value>
-						<modExtensions>
-							<li Class="CombatExtended.ThingDefExtensionCE">
-								<MenuHidden>True</MenuHidden>
-							</li>
-						</modExtensions>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Base_KonkursAT"
-						or @Name="Base_SPG9AT"]/fillPercent </xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/LF Red Dawn/RD_CE_mortars.xml b/Patches/LF Red Dawn/RD_CE_mortars.xml
deleted file mode 100644
index 6a42e7a626..0000000000
--- a/Patches/LF Red Dawn/RD_CE_mortars.xml	
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[LF] Red Dawn</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Remove 82mm Mortar Shell === -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Shell_Sov82mm_HE"]</xpath>
-				</li>
-
-				<!-- === Patch Base === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name = "Base_PodnosMortar"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name = "Base_PodnosMortar"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>2.0</turretBurstCooldownTime>
-						<spawnedConceptLearnOpportunity>CE_MortarDirectFire</spawnedConceptLearnOpportunity>
-					</value>
-				</li>
-
-				<!-- === Mortar === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Artillery_PodnosGun"]</xpath>
-					<value>
-						<statBases>
-							<SightsEfficiency>0.5</SightsEfficiency>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Artillery_PodnosGun"]</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_Charges">
-								<chargeSpeeds>
-									<li>30</li>
-									<li>50</li>
-									<li>70</li>
-									<li>90</li>
-								</chargeSpeeds>
-							</li>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>1</magazineSize>
-								<reloadTime>5</reloadTime>
-								<ammoSet>AmmoSet_82mmMortarShell</ammoSet>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Artillery_PodnosGun"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-								<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_82mmMortarShell_HE</defaultProjectile>
-								<warmupTime>5.5</warmupTime>
-								<minRange>32</minRange>
-								<range>500</range>
-								<burstShotCount>1</burstShotCount>
-								<soundCast>SovMortarFire</soundCast>
-								<muzzleFlashScale>19</muzzleFlashScale>
-								<circularError>1</circularError>
-								<indirectFirePenalty>0.2</indirectFirePenalty>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Artillery_PodnosGun"]</xpath>
-					<value>
-						<weaponTags>
-							<li>TurretGun</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<!-- === Turret === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Turret_Podnos"]</xpath>
-					<value>
-						<tradeTags>
-							<li>CE_Turret</li>
-						</tradeTags>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/LF Red Dawn/RD_Grenade.xml b/Patches/LF Red Dawn/RD_Grenade.xml
deleted file mode 100644
index 37a8e8ae96..0000000000
--- a/Patches/LF Red Dawn/RD_Grenade.xml	
+++ /dev/null
@@ -1,644 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[LF] Red Dawn</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--
-					RGD5
-					RGN
-					RGO
-					F-1
-					RKG-3 AT
-				-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingDef ParentName="BaseGrenadeProjectile">
-							<defName>RD_Proj_RGD5Grenade</defName>
-							<label>RG5 grenade (HE)</label>
-							<graphicData>
-								<texPath>Things/Projectile/RGD</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>1.5</explosionRadius>
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>40</damageAmountBase>
-								<explosionDelay>60</explosionDelay>
-								<dropsCasings>true</dropsCasings>
-								<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-								<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<speed>10</speed>
-								<suppressionFactor>3.0</suppressionFactor>
-								<dangerFactor>2.0</dangerFactor>
-								<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Small>30</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseGrenadeProjectile">
-							<defName>RD_Proj_RGNGrenade</defName>
-							<label>RGN grenade</label>
-							<graphicData>
-								<texPath>Things/Projectile/RGNB</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>1.5</explosionRadius>
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>40</damageAmountBase>
-								<explosionDelay>60</explosionDelay>
-								<dropsCasings>true</dropsCasings>
-								<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-								<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<speed>10</speed>
-								<suppressionFactor>3.0</suppressionFactor>
-								<dangerFactor>2.0</dangerFactor>
-								<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Small>30</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseGrenadeProjectile">
-							<defName>RD_Proj_RGOGrenade</defName>
-							<label>RGO grenade</label>
-							<graphicData>
-								<texPath>Things/Projectile/RGOB</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>2</explosionRadius>
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>69</damageAmountBase>
-								<explosionDelay>60</explosionDelay>
-								<dropsCasings>true</dropsCasings>
-								<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-								<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<speed>10</speed>
-								<suppressionFactor>3.0</suppressionFactor>
-								<dangerFactor>2.0</dangerFactor>
-								<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Small>49</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseGrenadeProjectile">
-							<defName>RD_Proj_F1Grenade</defName>
-							<label>F1 grenade</label>
-							<graphicData>
-								<texPath>Things/Projectile/FG</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>1</explosionRadius>
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>20</damageAmountBase>
-								<explosionDelay>60</explosionDelay>
-								<dropsCasings>true</dropsCasings>
-								<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-								<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<speed>10</speed>
-								<suppressionFactor>3.0</suppressionFactor>
-								<dangerFactor>2.0</dangerFactor>
-								<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Small>40</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseGrenadeProjectile">
-							<defName>RD_Proj_RKGATGrenade</defName>
-							<label>RKG-3 grenade</label>
-							<graphicData>
-								<texPath>Weapons/RKG3</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>90</damageAmountBase>
-								<armorPenetrationSharp>125</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.995</armorPenetrationBlunt>
-								<speed>7</speed>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>40</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>1</explosiveRadius>
-									<explosionSound>MortarBomb_Explode</explosionSound>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Small>20</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-					</value>
-				</li>
-
-				<!-- ======== Setting Grenade attributes ======== -->
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="Weapon_RGD5Grenade"
-						or defName="Weapon_RGNGrenade"
-						or defName="Weapon_RGOGrenade"
-						or defName="Weapon_F1Grenade"
-						or defName="Weapon_RKGATGrenade"] </xpath>
-					<attribute>ParentName</attribute>
-					<value>BaseWeapon</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Weapon_RGD5Grenade"
-						or defName="Weapon_RGNGrenade"
-						or defName="Weapon_RGOGrenade"
-						or defName="Weapon_F1Grenade"
-						or defName="Weapon_RKGATGrenade"] </xpath>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<stackLimit>75</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Weapon_RGD5Grenade"]/comps</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_ExplosiveCE">
-								<damageAmountBase>56</damageAmountBase>
-								<explosiveDamageType>Bomb</explosiveDamageType>
-								<explosiveRadius>1.5</explosiveRadius>
-							</li>
-						</comps>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Weapon_RGNGrenade"]/comps</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_ExplosiveCE">
-								<damageAmountBase>56</damageAmountBase>
-								<explosiveDamageType>Bomb</explosiveDamageType>
-								<explosiveRadius>1.5</explosiveRadius>
-							</li>
-						</comps>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Weapon_RGOGrenade"]/comps</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_ExplosiveCE">
-								<damageAmountBase>56</damageAmountBase>
-								<explosiveDamageType>Bomb</explosiveDamageType>
-								<explosiveRadius>1.5</explosiveRadius>
-							</li>
-						</comps>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Weapon_F1Grenade"]/comps</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_ExplosiveCE">
-								<damageAmountBase>56</damageAmountBase>
-								<explosiveDamageType>Bomb</explosiveDamageType>
-								<explosiveRadius>1.5</explosiveRadius>
-							</li>
-						</comps>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Weapon_RKGATGrenade"]/comps</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_ExplosiveCE">
-								<damageAmountBase>56</damageAmountBase>
-								<explosiveDamageType>Bomb</explosiveDamageType>
-								<explosiveRadius>1.5</explosiveRadius>
-							</li>
-						</comps>
-					</value>
-				</li>
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="Weapon_F1Grenade"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="Weapon_RKGATGrenade"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<!-- ======== Throwing data ======== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Weapon_RGD5Grenade</defName>
-					<statBases>
-						<Mass>0.31</Mass>
-						<Bulk>1.5</Bulk>
-						<MarketValue>4.55</MarketValue>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<label>throw grenade</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<range>11</range>
-						<minRange>1.5</minRange>
-						<warmupTime>0.6</warmupTime>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<soundCast>ThrowGrenade</soundCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<defaultProjectile>RD_Proj_RGD5Grenade</defaultProjectile>
-						<onlyManualCast>true</onlyManualCast>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<weaponTags>
-						<li>CE_AI_Grenade</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Weapon_RGNGrenade</defName>
-					<statBases>
-						<Mass>0.29</Mass>
-						<Bulk>1.5</Bulk>
-						<MarketValue>4.55</MarketValue>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<label>throw grenade</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<range>12</range>
-						<minRange>1.5</minRange>
-						<warmupTime>0.6</warmupTime>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<soundCast>ThrowGrenade</soundCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<defaultProjectile>RD_Proj_RGNGrenade</defaultProjectile>
-						<onlyManualCast>true</onlyManualCast>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<weaponTags>
-						<li>CE_AI_Grenade</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Weapon_RGOGrenade</defName>
-					<statBases>
-						<Mass>0.53</Mass>
-						<Bulk>1.5</Bulk>
-						<MarketValue>4.55</MarketValue>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<label>throw grenade</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<range>10</range>
-						<minRange>1.5</minRange>
-						<warmupTime>0.9</warmupTime>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<soundCast>ThrowGrenade</soundCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<defaultProjectile>RD_Proj_RGOGrenade</defaultProjectile>
-						<onlyManualCast>true</onlyManualCast>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<weaponTags>
-						<li>CE_AI_Grenade</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Weapon_F1Grenade</defName>
-					<statBases>
-						<Mass>0.31</Mass>
-						<Bulk>1.5</Bulk>
-						<MarketValue>4.55</MarketValue>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<label>throw grenade</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<range>10</range>
-						<minRange>1.5</minRange>
-						<warmupTime>0.8</warmupTime>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<soundCast>ThrowGrenade</soundCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<defaultProjectile>RD_Proj_F1Grenade</defaultProjectile>
-						<onlyManualCast>true</onlyManualCast>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<weaponTags>
-						<li>CE_AI_Grenade</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Weapon_RKGATGrenade</defName>
-					<statBases>
-						<Mass>1.07</Mass>
-						<Bulk>1.5</Bulk>
-						<MarketValue>4.55</MarketValue>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<label>throw an AT grenade</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<range>7</range>
-						<minRange>1.5</minRange>
-						<warmupTime>0.8</warmupTime>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<soundCast>ThrowGrenade</soundCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<defaultProjectile>RD_Proj_RKGATGrenade</defaultProjectile>
-						<onlyManualCast>true</onlyManualCast>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<weaponTags>
-						<li>CE_AI_Grenade</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Remove cost========== -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Weapon_RGD5Grenade" or
-						defName="Weapon_RGNGrenade" or
-						defName="Weapon_RGOGrenade" or
-						defName="Weapon_F1Grenade" or
-						defName="Weapon_RKGATGrenade"
-						]/costList </xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- 10 RGD-5 -->
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>Craft_10_Weapon_RGD5Grenade</defName>
-							<label>Craft 10 RGD-5 grenades</label>
-							<description>Craft 10 10 RGD-5 grenades.</description>
-							<jobString>Crafting microwave grenades</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>5</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>3</count>
-								</li>
-							</ingredients>
-							<products>
-								<Weapon_RGD5Grenade>10</Weapon_RGD5Grenade>
-							</products>
-							<workAmount>2400</workAmount>
-						</RecipeDef>
-
-						<!-- RGN -->
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>Craft_10_Weapon_RGNGrenade</defName>
-							<label>Craft 10 RGN grenade</label>
-							<description>Craft 10 Dunder satchel charges.</description>
-							<jobString>Crafting satchel charges</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>3</count>
-								</li>
-							</ingredients>
-							<products>
-								<Weapon_RGNGrenade>10</Weapon_RGNGrenade>
-							</products>
-							<workAmount>2000</workAmount>
-						</RecipeDef>
-
-						<!--RGO -->
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>Craft_10_Weapon_RGOGrenade</defName>
-							<label>Craft 10 RGO grenades</label>
-							<description>Craft 10 Bobcat RGO grenades.</description>
-							<jobString>Crafting RGO grenades</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>5</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<products>
-								<Weapon_RGOGrenade>10</Weapon_RGOGrenade>
-							</products>
-							<workAmount>20000</workAmount>
-						</RecipeDef>
-
-						<!-- F1 -->
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>Craft_10_Weapon_F1Grenade</defName>
-							<label>Craft 10 F1 grenades</label>
-							<description>Craft 10 Grief F1 grenades.</description>
-							<jobString>Crafting F1 grenades</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>25</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<products>
-								<Weapon_F1Grenade>10</Weapon_F1Grenade>
-							</products>
-							<workAmount>20000</workAmount>
-						</RecipeDef>
-
-						<!-- RKG-3 -->
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>Craft_10_Weapon_RKGATGrenade</defName>
-							<label>Craft 10 RKG-3 AT grenades</label>
-							<description>Craft 10 10 RKG AT-3 grenades.</description>
-							<jobString>Crafting RKG-3 AT grenades</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>5</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>3</count>
-								</li>
-							</ingredients>
-							<products>
-								<Weapon_RKGATGrenade>10</Weapon_RKGATGrenade>
-							</products>
-							<workAmount>2400</workAmount>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/LF Red Dawn/RD_LMG.xml b/Patches/LF Red Dawn/RD_LMG.xml
deleted file mode 100644
index 90a73ccfe0..0000000000
--- a/Patches/LF Red Dawn/RD_LMG.xml	
+++ /dev/null
@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[LF] Red Dawn</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== PK ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PKGPMG</defName>
-					<statBases>
-						<Mass>9.00</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.37</SwayFactor>
-						<Bulk>14.92</Bulk>
-						<WorkToMake>36000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>80</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.45</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<warmupTime>1.3</warmupTime>
-						<range>62</range>
-						<soundCast>PKshoot</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_MachineGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== RPD ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_RPDLMG</defName>
-					<statBases>
-						<Mass>7.40</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.24</SwayFactor>
-						<Bulk>13.37</Bulk>
-						<WorkToMake>35000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>70</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.24</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>48</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>PKshoot</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_MachineGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== RPK-47 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_RPKMMG</defName>
-					<statBases>
-						<Mass>4.80</Mass>
-						<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.2</SwayFactor>
-						<Bulk>12.40</Bulk>
-						<WorkToMake>29500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>65</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.24</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>48</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>Ak47Shoot</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>75</magazineSize>
-						<reloadTime>4.8</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_MachineGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== RPK-74 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_RPKLMG</defName>
-					<statBases>
-						<Mass>4.80</Mass>
-						<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.2</SwayFactor>
-						<Bulk>12.40</Bulk>
-						<WorkToMake>29500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>65</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.10</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>58</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>Ak74Shoot</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>75</magazineSize>
-						<reloadTime>4.8</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_MachineGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Gun_PKGPMG" or
-						defName="Gun_RPDLMG" or
-						defName="Gun_RPKMMG" or
-						defName="Gun_RPKLMG"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/LF Red Dawn/RD_Launchers.xml b/Patches/LF Red Dawn/RD_Launchers.xml
deleted file mode 100644
index 0d8633c14c..0000000000
--- a/Patches/LF Red Dawn/RD_Launchers.xml	
+++ /dev/null
@@ -1,414 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[LF] Red Dawn</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== RPG18 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_RPG18D</defName>
-					<statBases>
-						<MarketValue>33.72</MarketValue>
-						<Mass>2.60</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.24</SwayFactor>
-						<Bulk>7.05</Bulk>
-						<WorkToMake>12000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>50</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-						<FSX>3</FSX>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_RPG18_HEAT</defaultProjectile>
-						<warmupTime>1.9</warmupTime>
-						<range>31</range>
-						<minRange>2</minRange>
-						<soundCast>LauncherFire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>15</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== RPG22 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_RPG22D</defName>
-					<statBases>
-						<MarketValue>33.72</MarketValue>
-						<Mass>2.80</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.24</SwayFactor>
-						<Bulk>7.85</Bulk>
-						<WorkToMake>12000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>50</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-						<FSX>3</FSX>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_RPG22_HEAT</defaultProjectile>
-						<warmupTime>1.9</warmupTime>
-						<range>32</range>
-						<minRange>2</minRange>
-						<soundCast>LauncherFire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>15</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== RPG26 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_RPG26D</defName>
-					<statBases>
-						<MarketValue>33.72</MarketValue>
-						<Mass>2.90</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.24</SwayFactor>
-						<Bulk>7.70</Bulk>
-						<WorkToMake>12000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>50</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-						<FSX>3</FSX>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_RPG26_HEAT</defaultProjectile>
-						<warmupTime>1.9</warmupTime>
-						<range>32</range>
-						<minRange>2</minRange>
-						<soundCast>RPGHeavyFire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>15</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== RPG27 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_RPG27D</defName>
-					<statBases>
-						<MarketValue>33.72</MarketValue>
-						<Mass>7.60</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.57</SwayFactor>
-						<Bulk>11.55</Bulk>
-						<WorkToMake>12000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>50</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-						<FSX>4</FSX>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_RPG27_HEAT</defaultProjectile>
-						<warmupTime>2.05</warmupTime>
-						<range>31</range>
-						<minRange>2</minRange>
-						<soundCast>LauncherFire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>19</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== RPG-7 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_RPG7v</defName>
-					<statBases>
-						<Mass>7.00</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.16</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.68</SwayFactor>
-						<Bulk>10.50</Bulk>
-						<WorkToMake>25500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>70</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_RPG7Grenade_HEAT</defaultProjectile>
-						<warmupTime>2.035</warmupTime>
-						<range>40</range>
-						<minRange>3</minRange>
-						<soundCast>RPGFire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>15</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>5.6</reloadTime>
-						<ammoSet>AmmoSet_RPG7Grenade</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== RPG-16 ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_RPG16v</defName>
-					<statBases>
-						<Mass>9.40</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.16</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.43</SwayFactor>
-						<Bulk>10.50</Bulk>
-						<WorkToMake>27500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>75</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_RPG16Grenade_HEAT</defaultProjectile>
-						<warmupTime>2</warmupTime>
-						<ai_AvoidFriendlyFireRadius>2</ai_AvoidFriendlyFireRadius>
-						<range>46</range>
-						<minRange>3</minRange>
-						<soundCast>RPGFire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>15</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>5.6</reloadTime>
-						<ammoSet>AmmoSet_RPG16Grenade</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== RPG-29 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_RPG29v</defName>
-					<statBases>
-						<Mass>12.10</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.16</SightsEfficiency>
-						<ShotSpread>0.1</ShotSpread>
-						<SwayFactor>1.68</SwayFactor>
-						<Bulk>10.50</Bulk>
-						<WorkToMake>35000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>120</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_RPG29_HEAT</defaultProjectile>
-						<warmupTime>3</warmupTime>
-						<ai_AvoidFriendlyFireRadius>2</ai_AvoidFriendlyFireRadius>
-						<range>52</range>
-						<minRange>3</minRange>
-						<soundCast>RPGALTFire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>20</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>5.9</reloadTime>
-						<ammoSet>AmmoSet_RPG29</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Gun_RPG18D" or
-						defName="Gun_RPG16v" or
-						defName="Gun_RPG22D" or
-						defName="Gun_RPG26D" or
-						defName="Gun_RPG27D" or
-						defName="Gun_RPG16v" or
-						defName="Gun_RPG29v"]/recipeMaker </xpath>
-					<value>
-						<researchPrerequisite>CE_Launchers</researchPrerequisite>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_RPG18D" or
-						defName="Gun_RPG16v" or
-						defName="Gun_RPG22D" or
-						defName="Gun_RPG26D" or
-						defName="Gun_RPG27D" or
-						defName="Gun_RPG16v" or
-						defName="Gun_RPG29v"]/weaponTags </xpath>
-					<value>
-						<weaponTags>
-							<li>GunHeavy</li>
-							<li>CE_AI_AOE</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Gun_RPG18D" or
-						defName="Gun_RPG16v" or
-						defName="Gun_RPG22D" or
-						defName="Gun_RPG26D" or
-						defName="Gun_RPG27D" or
-						defName="Gun_RPG16v" or
-						defName="Gun_RPG29v"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/LF Red Dawn/RD_Pistols.xml b/Patches/LF Red Dawn/RD_Pistols.xml
deleted file mode 100644
index 387468e783..0000000000
--- a/Patches/LF Red Dawn/RD_Pistols.xml	
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[LF] Red Dawn</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Makarov (PM) ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MakarovPistol</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>
-						<WorkToMake>7000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x18mmMakarov_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Makarov</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<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>
-				</li>
-
-				<!-- ========== Steckin ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_APSPistol</defName>
-					<statBases>
-						<Mass>1.22</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.90</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>0.78</SwayFactor>
-						<Bulk>2.25</Bulk>
-						<WorkToMake>20000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.41</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x18mmMakarov_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>Makarov</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== TT-33 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_TokarevPistol</defName>
-					<statBases>
-						<Mass>0.85</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.93</SwayFactor>
-						<Bulk>1.94</Bulk>
-						<WorkToMake>7000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Makarov</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Gun_MakarovPistol" or
-						defName="Gun_APSPistol" or
-						defName="Gun_TokarevPistol"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/LF Red Dawn/RD_RifleS.xml b/Patches/LF Red Dawn/RD_RifleS.xml
deleted file mode 100644
index 586aa20d11..0000000000
--- a/Patches/LF Red Dawn/RD_RifleS.xml	
+++ /dev/null
@@ -1,605 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[LF] Red Dawn</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== AK-47 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Ak47Normal</defName>
-					<statBases>
-						<Mass>3.47</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<Bulk>8.80</Bulk>
-						<WorkToMake>27000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>45</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.82</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>44</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>Ak47Shoot</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== AK-74 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Ak74Normal</defName>
-					<statBases>
-						<Mass>3.07</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.25</SwayFactor>
-						<Bulk>9.43</Bulk>
-						<WorkToMake>27500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.43</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>Ak74Shoot</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== AKS-47 ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Ak47Short</defName>
-					<statBases>
-						<Mass>3.20</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<Bulk>6.80</Bulk>
-						<WorkToMake>27000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>45</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.82</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>44</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>Ak47Shoot</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== AKS-74 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Ak74paratrooper</defName>
-					<statBases>
-						<Mass>2.87</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.25</SwayFactor>
-						<Bulk>7.23</Bulk>
-						<WorkToMake>27500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.43</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>Ak74Shoot</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== AKM ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AkM</defName>
-					<statBases>
-						<Mass>3.47</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<Bulk>8.80</Bulk>
-						<WorkToMake>27000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>45</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.82</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>44</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>Ak47Shoot</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== SKS ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SKS</defName>
-					<statBases>
-						<Mass>3.85</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.41</SwayFactor>
-						<Bulk>10.20</Bulk>
-						<WorkToMake>15000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.72</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<soundCast>SVDshoot</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== AK-74U ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Ak74U</defName>
-					<statBases>
-						<Mass>2.85</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.02</SwayFactor>
-						<Bulk>4.90</Bulk>
-						<WorkToMake>29000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>0.66</warmupTime>
-						<range>40</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>ModelUshoot</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Kiparis ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Kiparis</defName>
-					<statBases>
-						<Mass>1.60</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>0.94</SwayFactor>
-						<Bulk>4.52</Bulk>
-						<WorkToMake>22000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>30</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.22</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x18mmMakarov_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>25</range>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>OTSshoot</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- AS Val -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_ASVal</defName>
-					<statBases>
-						<Mass>2.50</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.17</SwayFactor>
-						<Bulk>6.15</Bulk>
-						<WorkToMake>35000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.94</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>31</range>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>ASVSSshoot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>1</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-				</li>
-
-				<!-- ========== VSS Vintorez ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_VssVintz</defName>
-					<statBases>
-						<Mass>2.60</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.19</SwayFactor>
-						<Bulk>8.94</Bulk>
-						<WorkToMake>40000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Chemfuel>5</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.94</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>48</range>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>Shot_VSS</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ==========SVD Dragunov ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Dragunov</defName>
-					<statBases>
-						<Mass>4.30</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.70</SwayFactor>
-						<Bulk>12.25</Bulk>
-						<WorkToMake>23000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>60</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<soundCast>SVDshoot</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Gun_Ak47Normal" or
-						defName="Gun_Ak74Normal" or
-						defName="Gun_AkM" or
-						defName="Gun_SKS" or
-						defName="Gun_Ak74U" or
-						defName="Gun_Kiparis" or
-						defName="Gun_ASVal" or
-						defName="Gun_VssVintz" or
-						defName="Gun_Dragunov"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/LF Red Dawn/RPG123456789_Projectiles.xml b/Patches/LF Red Dawn/RPG123456789_Projectiles.xml
deleted file mode 100644
index 43ae9e64d7..0000000000
--- a/Patches/LF Red Dawn/RPG123456789_Projectiles.xml	
+++ /dev/null
@@ -1,512 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[LF] Red Dawn</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseRPG7Grenade">
-					<defName>Bullet_RPG18_HEAT</defName>
-					<label>RPG18 grenade</label>
-					<graphicData>
-						<texPath>Things/Projectile/RPG</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-						<shaderType>TransparentPostLight</shaderType>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>42</speed>
-						<damageDef>Bullet</damageDef>
-						<damageAmountBase>248</damageAmountBase>
-						<armorPenetrationSharp>300</armorPenetrationSharp>
-						<armorPenetrationBlunt>31.584</armorPenetrationBlunt>
-						<soundAmbient>RocketPropelledLoop_Small</soundAmbient>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>105</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>1</explosiveRadius>
-							<explosionSound>MortarBomb_Explode</explosionSound>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>3</Fragment_Large>
-								<Fragment_Small>26</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseRPG7Grenade">
-					<defName>Bullet_RPG22_HEAT</defName>
-					<label>RPG22 grenade</label>
-					<graphicData>
-						<texPath>Things/Projectile/RPG</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-						<shaderType>TransparentPostLight</shaderType>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>42</speed>
-						<damageDef>Bullet</damageDef>
-						<damageAmountBase>268</damageAmountBase>
-						<armorPenetrationSharp>400</armorPenetrationSharp>
-						<armorPenetrationBlunt>31.584</armorPenetrationBlunt>
-						<soundAmbient>RocketPropelledLoop_Small</soundAmbient>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>105</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>1</explosiveRadius>
-							<explosionSound>MortarBomb_Explode</explosionSound>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>3</Fragment_Large>
-								<Fragment_Small>26</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseRPG7Grenade">
-					<defName>Bullet_RPG26_HEAT</defName>
-					<label>RPG26 grenade</label>
-					<graphicData>
-						<texPath>Things/Projectile/RocketS</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-						<shaderType>TransparentPostLight</shaderType>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>42</speed>
-						<damageDef>Bullet</damageDef>
-						<damageAmountBase>268</damageAmountBase>
-						<armorPenetrationSharp>440</armorPenetrationSharp>
-						<armorPenetrationBlunt>31.584</armorPenetrationBlunt>
-						<soundAmbient>RocketPropelledLoop_Small</soundAmbient>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>105</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>1</explosiveRadius>
-							<explosionSound>MortarBomb_Explode</explosionSound>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>3</Fragment_Large>
-								<Fragment_Small>26</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseRPG7Grenade">
-					<defName>Bullet_RPG27_HEAT</defName>
-					<label>RPG27 grenade</label>
-					<graphicData>
-						<texPath>Things/Projectile/RocketS</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-						<shaderType>TransparentPostLight</shaderType>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>50</speed>
-						<damageDef>Bullet</damageDef>
-						<damageAmountBase>375</damageAmountBase>
-						<armorPenetrationSharp>750</armorPenetrationSharp>
-						<armorPenetrationBlunt>31.584</armorPenetrationBlunt>
-						<soundAmbient>RocketPropelledLoop_Small</soundAmbient>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>150</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>1.5</explosiveRadius>
-							<explosionSound>MortarBomb_Explode</explosionSound>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>4</Fragment_Large>
-								<Fragment_Small>47</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="GrenadeRecipeBase">
-					<defName>MakeGun_RPG18D</defName>
-					<label>make RPG18 LAW launchers x5</label>
-					<description>Craft 5 RPG18 launchers.</description>
-					<jobString>Making RPG 18 LAW launchers.</jobString>
-					<workAmount>32500</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>100</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>6</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>5</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Gun_RPG18D>5</Gun_RPG18D>
-					</products>
-					<researchPrerequisite>CE_Launchers</researchPrerequisite>
-				</RecipeDef>
-
-				<RecipeDef ParentName="GrenadeRecipeBase">
-					<defName>MakeGun_RPG18D_x1</defName>
-					<label>make RPG18 LAW launchers x1</label>
-					<description>Craft one RPG18 launcher.</description>
-					<jobString>Making RPG 18 LAW launcher.</jobString>
-					<workAmount>8125</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>25</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>1</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Gun_RPG18D>1</Gun_RPG18D>
-					</products>
-					<researchPrerequisite>CE_Launchers</researchPrerequisite>
-				</RecipeDef>
-
-				<RecipeDef ParentName="GrenadeRecipeBase">
-					<defName>MakeGun_RPG22D</defName>
-					<label>make RPG22 x5</label>
-					<description>Craft 5 RPG22 launchers.</description>
-					<jobString>Making RPG22 launchers.</jobString>
-					<workAmount>32500</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>100</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>6</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>5</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Gun_RPG22D>5</Gun_RPG22D>
-					</products>
-					<researchPrerequisite>CE_Launchers</researchPrerequisite>
-				</RecipeDef>
-
-				<RecipeDef ParentName="GrenadeRecipeBase">
-					<defName>MakeGun_RPG22D_x1</defName>
-					<label>make RPG22 x1</label>
-					<description>Craft one RPG22 launcher.</description>
-					<jobString>Making RPG22 launcher.</jobString>
-					<workAmount>8125</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>25</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>1</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Gun_RPG22D>1</Gun_RPG22D>
-					</products>
-					<researchPrerequisite>CE_Launchers</researchPrerequisite>
-				</RecipeDef>
-
-				<RecipeDef ParentName="GrenadeRecipeBase">
-					<defName>MakeGun_RPG26D</defName>
-					<label>make RPG26 x5</label>
-					<description>Craft 5 RPG26 launchers.</description>
-					<jobString>Making RPG26 launchers.</jobString>
-					<workAmount>32500</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>100</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>6</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>5</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Gun_RPG26D>5</Gun_RPG26D>
-					</products>
-					<researchPrerequisite>CE_Launchers</researchPrerequisite>
-				</RecipeDef>
-
-				<RecipeDef ParentName="GrenadeRecipeBase">
-					<defName>MakeGun_RPG26D_x1</defName>
-					<label>make RPG26 x1</label>
-					<description>Craft one RPG26 launcher.</description>
-					<jobString>Making RPG26 launcher.</jobString>
-					<workAmount>8125</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>25</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>1</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Gun_RPG26D>1</Gun_RPG26D>
-					</products>
-					<researchPrerequisite>CE_Launchers</researchPrerequisite>
-				</RecipeDef>
-
-				<RecipeDef ParentName="GrenadeRecipeBase">
-					<defName>MakeGun_RPG27D</defName>
-					<label>make RPG27 x5</label>
-					<description>Craft 5 RPG27 launchers.</description>
-					<jobString>Making RPG27 launchers.</jobString>
-					<workAmount>32500</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>100</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>6</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>5</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Gun_RPG27D>5</Gun_RPG27D>
-					</products>
-					<researchPrerequisite>CE_Launchers</researchPrerequisite>
-				</RecipeDef>
-
-				<RecipeDef ParentName="GrenadeRecipeBase">
-					<defName>MakeGun_RPG27D_x1</defName>
-					<label>make RPG27 x1</label>
-					<description>Craft one RPG27 launcher.</description>
-					<jobString>Making RPG27 launcher.</jobString>
-					<workAmount>8125</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>25</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>1</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Gun_RPG27D>1</Gun_RPG27D>
-					</products>
-					<researchPrerequisite>CE_Launchers</researchPrerequisite>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/LF Red Dawn/RPG16.xml b/Patches/LF Red Dawn/RPG16.xml
deleted file mode 100644
index 5230bf56d6..0000000000
--- a/Patches/LF Red Dawn/RPG16.xml	
+++ /dev/null
@@ -1,243 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[LF] Red Dawn</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>AmmoRPG16Grenades</defName>
-					<label>RPG-16 grenades</label>
-					<parent>AmmoRockets</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberRocket</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_RPG16Grenade</defName>
-					<label>RPG-16 Grenades</label>
-					<ammoTypes>
-						<Ammo_RPG16Grenade_HEAT>Bullet_RPG16Grenade_HEAT</Ammo_RPG16Grenade_HEAT>
-						<Ammo_RPG16Grenade_Frag>Bullet_RPG16Grenade_Frag</Ammo_RPG16Grenade_Frag>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="RPG16GrenadeBase" ParentName="MediumAmmoBase" Abstract="True">
-					<description>Rocket-propelled grenade designed for the RPG-16 launcher. After being fired a rocket motor kicks in to propel the grenade further.</description>
-					<statBases>
-						<MaxHitPoints>150</MaxHitPoints>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-					</tradeTags>
-					<thingCategories>
-						<li>AmmoRPG16Grenades</li>
-					</thingCategories>
-					<stackLimit>25</stackLimit>
-					<cookOffFlashScale>40</cookOffFlashScale>
-					<cookOffSound>MortarBomb_Explode</cookOffSound>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="RPG16GrenadeBase">
-					<defName>Ammo_RPG16Grenade_HEAT</defName>
-					<label>RPG-16 grenade (HEAT)</label>
-					<graphicData>
-						<texPath>Things/Ammo/RPG/HEAT</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>55.78</MarketValue>
-						<Mass>2.8</Mass>
-						<Bulk>9.37</Bulk>
-					</statBases>
-					<ammoClass>RocketHEAT</ammoClass>
-					<detonateProjectile>Bullet_RPG16Grenade_HEAT</detonateProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="RPG16GrenadeBase">
-					<defName>Ammo_RPG16Grenade_Frag</defName>
-					<label>RPG-16 grenade (Frag)</label>
-					<graphicData>
-						<texPath>Things/Ammo/RPG/Frag</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>36.96</MarketValue>
-						<Mass>2.2</Mass>
-						<Bulk>1.89</Bulk>
-					</statBases>
-					<stackLimit>100</stackLimit>
-					<ammoClass>RocketFrag</ammoClass>
-					<detonateProjectile>Bullet_RPG16Grenade_Frag</detonateProjectile>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="BaseRPG16Grenade" ParentName="BaseExplosiveBullet" Abstract="true">
-					<graphicData>
-						<shaderType>TransparentPostLight</shaderType>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>83</speed>
-						<soundAmbient>RocketPropelledLoop_Small</soundAmbient>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseRPG16Grenade">
-					<defName>Bullet_RPG16Grenade_HEAT</defName>
-					<label>RPG-16 grenade (HEAT)</label>
-					<graphicData>
-						<texPath>Things/Projectile/RPG/HEAT</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bullet</damageDef>
-						<damageAmountBase>200</damageAmountBase>
-						<armorPenetrationSharp>300</armorPenetrationSharp>
-						<armorPenetrationBlunt>44.956</armorPenetrationBlunt>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>90</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>1.5</explosiveRadius>
-							<explosionSound>MortarBomb_Explode</explosionSound>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>2</Fragment_Large>
-								<Fragment_Small>31</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseRPG16Grenade">
-					<defName>Bullet_RPG16Grenade_Frag</defName>
-					<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					<label>RPG-16 grenade (Frag)</label>
-					<graphicData>
-						<texPath>Things/Projectile/RPG/Frag</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<explosionRadius>1.5</explosionRadius>
-						<damageDef>Bomb</damageDef>
-						<armorPenetrationSharp>0</armorPenetrationSharp>
-						<damageAmountBase>40</damageAmountBase>
-						<armorPenetrationBlunt>0</armorPenetrationBlunt>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>120</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_RPG16Grenade_HEAT</defName>
-					<label>make RPG-16 HEAT grenades x5</label>
-					<description>Craft 5 RPG-16 HEAT grenades.</description>
-					<jobString>Making RPG-16 HEAT grenades.</jobString>
-					<workAmount>9200</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>28</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>9</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>5</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_RPG16Grenade_HEAT>5</Ammo_RPG16Grenade_HEAT>
-					</products>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_RPG16Grenade_Frag</defName>
-					<label>make RPG-16 frag grenades x5</label>
-					<description>Craft 5 RPG-16 frag grenades.</description>
-					<jobString>Making RPG-16 frag grenades.</jobString>
-					<workAmount>5400</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>22</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>5</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_RPG16Grenade_Frag>5</Ammo_RPG16Grenade_Frag>
-					</products>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/LF Red Dawn/RPG29.xml b/Patches/LF Red Dawn/RPG29.xml
deleted file mode 100644
index 8955fe9cac..0000000000
--- a/Patches/LF Red Dawn/RPG29.xml	
+++ /dev/null
@@ -1,229 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[LF] Red Dawn</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>AmmoRPG29</defName>
-					<label>RPG29 Rocket</label>
-					<parent>AmmoRockets</parent>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_RPG29</defName>
-					<label>RPG29 Missiles</label>
-					<ammoTypes>
-						<Ammo_RPG29_HEAT>Bullet_RPG29_HEAT</Ammo_RPG29_HEAT>
-						<Ammo_RPG29_Thermobaric>Bullet_RPG29_Thermobaric</Ammo_RPG29_Thermobaric>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="RPG29Base" ParentName="HeavyAmmoBase" Abstract="True">
-					<description>Rocket propelled grenades for use in RPG-29.</description>
-					<statBases>
-						<MaxHitPoints>200</MaxHitPoints>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade_Sellable</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-					</tradeTags>
-					<thingCategories>
-						<li>AmmoRPG29</li>
-					</thingCategories>
-					<stackLimit>20</stackLimit>
-					<cookOffFlashScale>30</cookOffFlashScale>
-					<cookOffSound>MortarBomb_Explode</cookOffSound>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="RPG29Base">
-					<defName>Ammo_RPG29_HEAT</defName>
-					<label>PG-29V grenade (HEAT)</label>
-					<graphicData>
-						<texPath>Things/Ammo/RPG/RPG32_Thermobaric</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-						<drawSize>1.65</drawSize>
-					</graphicData>
-					<statBases>
-						<MarketValue>95</MarketValue>
-						<Mass>6.7</Mass>
-						<Bulk>9.17</Bulk>
-					</statBases>
-					<ammoClass>RocketHEAT</ammoClass>
-					<detonateProjectile>Bullet_RPG29_HEAT</detonateProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="RPG29Base">
-					<defName>Ammo_RPG29_Thermobaric</defName>
-					<label>TPG-29V grenade (Thermobaric)</label>
-					<graphicData>
-						<texPath>Things/Ammo/RPG/Thermobaric</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>119.58</MarketValue>
-						<Mass>6.7</Mass>
-						<Bulk>9.99</Bulk>
-					</statBases>
-					<ammoClass>RocketThermobaric</ammoClass>
-					<detonateProjectile>Bullet_RPG29_Thermobaric</detonateProjectile>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseRPG7Grenade">
-					<defName>Bullet_RPG29_HEAT</defName>
-					<label>PG-29V (HEAT)</label>
-					<graphicData>
-						<texPath>Things/Projectile/Rocket29M</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-						<shaderType>TransparentPostLight</shaderType>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>76</speed>
-						<damageDef>Bullet</damageDef>
-						<damageAmountBase>380</damageAmountBase>
-						<armorPenetrationSharp>750</armorPenetrationSharp>
-						<armorPenetrationBlunt>151.584</armorPenetrationBlunt>
-						<soundAmbient>RocketPropelledLoop_Small</soundAmbient>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>200</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>1.5</explosiveRadius>
-							<explosionSound>MortarBomb_Explode</explosionSound>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>4</Fragment_Large>
-								<Fragment_Small>60</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseRPG7Grenade">
-					<defName>Bullet_RPG29_Thermobaric</defName>
-					<label>TPG-29V grenade (Thermobaric)</label>
-					<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					<graphicData>
-						<texPath>Things/Projectile/RPG/Thermobaric</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<explosionRadius>5.5</explosionRadius>
-						<damageDef>Thermobaric</damageDef>
-						<damageAmountBase>300</damageAmountBase>
-						<armorPenetrationSharp>0</armorPenetrationSharp>
-						<armorPenetrationBlunt>0</armorPenetrationBlunt>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						<ai_IsIncendiary>true</ai_IsIncendiary>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_RPG29_HEAT</defName>
-					<label>make RPG29 HEAT Missile</label>
-					<description>Craft 5 RPG29 HEAT Missiles.</description>
-					<jobString>Making RPG29 HEAT Missiles.</jobString>
-					<workAmount>13000</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>40</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>5</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>13</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>ComponentIndustrial</li>
-							<li>FSX</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_RPG29_HEAT>5</Ammo_RPG29_HEAT>
-					</products>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_RPG29_Thermobaric</defName>
-					<label>make RPG-29 thermobaric grenades x5</label>
-					<description>Craft 5 RPG-29 thermobaric grenades.</description>
-					<jobString>Making RPG-29 thermobaric grenades.</jobString>
-					<workAmount>23400</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>54</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>38</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>5</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_RPG29_Thermobaric>5</Ammo_RPG29_Thermobaric>
-					</products>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/LF Red Dawn/RespiratorsHelmets_RD.xml b/Patches/LF Red Dawn/RespiratorsHelmets_RD.xml
deleted file mode 100644
index 949b3303fe..0000000000
--- a/Patches/LF Red Dawn/RespiratorsHelmets_RD.xml	
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[LF] Red Dawn</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName = "RD_PMK"
-						or defName = "RD_MMGasMask"
-						or defName = "RD_GPgasmask"]/statBases </xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "RD_PMK"
-						or defName = "RD_MMGasMask"
-						or defName = "RD_GPgasmask"
-						]/equippedStatOffsets </xpath>
-					<value>
-						<equippedStatOffsets>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "RD_PMK"
-						or defName = "RD_MMGasMask"
-						or defName = "RD_GPgasmask"
-						]/apparel/layers </xpath>
-					<value>
-						<layers>
-							<li>StrappedHead</li>
-						</layers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName = "RD_PMK"
-						or defName = "RD_MMGasMask"
-						] </xpath>
-					<value>
-						<modExtensions>
-							<li Class="CombatExtended.ApparelHediffExtension">
-								<hediff>WearingGasMask</hediff>
-							</li>
-							<li Class="CombatExtended.ApperalRenderingExtension">
-								<HideHair>false</HideHair>
-								<HideBeard>true</HideBeard>
-							</li>
-						</modExtensions>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "RD_GPgasmask"]</xpath>
-					<value>
-						<modExtensions>
-							<li Class="CombatExtended.ApparelHediffExtension">
-								<hediff>WearingGasMask</hediff>
-							</li>
-							<li Class="CombatExtended.ApperalRenderingExtension">
-								<HideHair>true</HideHair>
-								<HideBeard>true</HideBeard>
-							</li>
-						</modExtensions>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "RD_PMK"
-						or defName = "RD_MMGasMask"
-						or defName = "RD_GPgasmask"]/recipeMaker </xpath>
-					<value>
-						<recipeMaker>
-							<skillRequirements>
-								<Crafting>8</Crafting>
-							</skillRequirements>
-							<unfinishedThingDef>UnfinishedTechArmor</unfinishedThingDef>
-							<recipeUsers>
-								<li>TableMachining</li>
-							</recipeUsers>
-						</recipeMaker>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "RD_PMK"
-						or defName = "RD_MMGasMask"
-						or defName = "RD_GPgasmask"
-						]/costList </xpath>
-					<value>
-						<costList>
-							<ComponentIndustrial>2</ComponentIndustrial>
-							<Chemfuel>10</Chemfuel>
-						</costList>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/LF Red Dawn/Shirt_RD.xml b/Patches/LF Red Dawn/Shirt_RD.xml
deleted file mode 100644
index 17041e8485..0000000000
--- a/Patches/LF Red Dawn/Shirt_RD.xml	
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[LF] Red Dawn</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RD_SovietAfghan"
-						or defName="RD_SovietTTsKoMarine"
-						or defName="RD_SovietEuropeUniform"
-						or defName="RD_SovietOMONuniform"
-						or defName="RD_SovietMabuta"
-						or defName="RD_SovietColdWarUniEarly"
-						or defName="RD_SovietColdWarUniLate"
-						or defName="RD_SovietGymnaEarly"
-						or defName="RD_SovietGymnaLate"
-						or defName="RD_SovietGorkaBeryozka"
-						or defName="RD_SovietTelogreika"
-						or defName="RD_GulagTelogreika"
-						or defName="RD_SovietGorkaKLMK"
-						or defName="RD_SovietGorkaDesert"
-						or defName="RD_SovietPilotUni"
-						or defName="RD_SovietPilotUniJET"
-						or defName="RD_SovietEuroTanker"
-						or defName="RD_SovietAfghanTanker"
-						or defName="RD_RussianKLMKparka"
-						or defName="RD_GorkaKGB"
-						or defName="RD_GorkaEUROPE"]/costStuffCount </xpath>
-					<value>
-						<costStuffCount>65</costStuffCount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RD_RussianTenyanska"]/costStuffCount </xpath>
-					<value>
-						<costStuffCount>24</costStuffCount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_RussianTenyanska"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>0.75</StuffEffectMultiplierArmor>
-						<Bulk>0.5</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RD_SovietAfghan"
-						or defName="RD_SovietTTsKoMarine"
-						or defName="RD_SovietEuropeUniform"
-						or defName="RD_SovietOMONuniform"
-						or defName="RD_SovietMabuta"
-						or defName="RD_SovietColdWarUniEarly"
-						or defName="RD_SovietColdWarUniLate"
-						or defName="RD_SovietGymnaEarly"
-						or defName="RD_SovietGymnaLate"
-						or defName="RD_SovietGorkaBeryozka"
-						or defName="RD_SovietTelogreika"
-						or defName="RD_GulagTelogreika"
-						or defName="RD_SovietGorkaKLMK"
-						or defName="RD_SovietGorkaDesert"
-						or defName="RD_SovietPilotUni"
-						or defName="RD_SovietPilotUniJET"
-						or defName="RD_SovietEuroTanker"
-						or defName="RD_SovietAfghanTanker"
-						or defName="RD_RussianKLMKparka"
-						or defName="RD_GorkaKGB"
-						or defName="RD_GorkaEUROPE"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-						<Bulk>2</Bulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/LF Red Dawn/Softhead.xml b/Patches/LF Red Dawn/Softhead.xml
deleted file mode 100644
index 977ec4dfd4..0000000000
--- a/Patches/LF Red Dawn/Softhead.xml	
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[LF] Red Dawn</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Beanie === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_GRUBeanie"
-						or defName="RD_HoodNormal"
-						or defName="RD_HoodZKS"
-						or defName="RD_HoodKLMK"
-						or defName="RD_Panama"
-						or defName="RD_Afgcap"
-						or defName="RD_Facemask"
-						or defName="RD_Mabutacap"
-						or defName="RD_Sovhat"]/costStuffCount </xpath>
-					<value>
-						<costStuffCount>20</costStuffCount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_TKDVDHelmet"
-						or defName="RD_SovEurTankerHelm"
-						or defName="RD_TankerHelmCamo"]/costStuffCount </xpath>
-					<value>
-						<costStuffCount>30</costStuffCount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_GRUBeanie"
-						or defName="RD_HoodNormal"
-						or defName="RD_HoodZKS"
-						or defName="RD_HoodKLMK"
-						or defName="RD_Panama"
-						or defName="RD_Afgcap"
-						or defName="RD_OfficerCap"
-						or defName="RD_NCOCap"
-						or defName="RD_Facemask"
-						or defName="RD_Mabutacap"
-						or defName="RD_SovUshanka"
-						or defName="RD_SovBeret"
-						or defName="RD_Sovhat"
-						or defName="RD_SovEurTankerHelm"
-						or defName="RD_TKDVDHelmet"
-						or defName="RD_TankerHelmCamo"]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
-						<Bulk>0.5</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RD_HoodNormal"
-						or defName="RD_HoodZKS"
-						or defName="RD_HoodKLMK"
-						or defName="RD_HoodZKS"]/equippedStatOffsets </xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RD_Facemask"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<ToxicEnvironmentResistance>0.05</ToxicEnvironmentResistance>
-							<SmokeSensitivity>-0.1</SmokeSensitivity>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "RD_Facemask" ]/apparel/layers</xpath>
-					<value>
-						<layers>
-							<li>StrappedHead</li>
-						</layers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName = "RD_Facemask"]</xpath>
-					<value>
-						<li Class="CombatExtended.ApperalRenderingExtension">
-							<HideHair>false</HideHair>
-							<HideBeard>false</HideBeard>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RD_PVNHelmet"]/equippedStatOffsets</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RD_PVNHelmet"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency_Apparel>0.4</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "RD_PVNHelmet" ]/apparel/layers</xpath>
-					<value>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName = "RD_PVNHelmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.ApperalRenderingExtension">
-							<HideHair>true</HideHair>
-							<HideBeard>false</HideBeard>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "RD_PVNHelmet" ]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>40</Steel>
-							<ComponentIndustrial>5</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "RD_PVNHelmet" ]/recipeMaker/researchPrerequisite</xpath>
-					<value>
-						<researchPrerequisite>CE_SimpleNV</researchPrerequisite>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "RD_PVNHelmet" ]/recipeMaker/skillRequirements</xpath>
-					<value>
-						<skillRequirements>
-							<Crafting>6</Crafting>
-						</skillRequirements>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/LTS Military/Apparel.xml b/Patches/LTS Military/Apparel.xml
deleted file mode 100644
index 82e69af403..0000000000
--- a/Patches/LTS Military/Apparel.xml	
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[LTS]Military</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== M90 Uniform ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="LTS_Uniform" or defName="LTS_UniformPants"]/statBases/Mass</xpath>
-					<value>
-						<Mass>0.5</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="LTS_Uniform" or defName="LTS_UniformPants"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Cap / Beret ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="LTS_UniformCap" or defName="LTS_UniformBeret"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>0.5</WornBulk>
-						<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/LTS Military/Weapons.xml b/Patches/LTS Military/Weapons.xml
deleted file mode 100644
index 42e11d47d4..0000000000
--- a/Patches/LTS Military/Weapons.xml	
+++ /dev/null
@@ -1,811 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[LTS]Military</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Tools ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="LTS_KPist" or defName="LTS_MP5SD" or defName="LTS_Glock"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName="LTS_UMP" or
-						defName="LTS_PSG" or
-						defName="LTS_AKIV" or
-						defName="LTS_AKV" or
-						defName="LTS_G36Rifle" or
-						defName="LTS_KSP" or
-						defName="LTS_PKM"
-						]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="LTS_AT" or defName="LTS_grg"]/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>
-				</li>
-
-				<!-- ========== KPIST ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>LTS_KPist</defName>
-					<statBases>
-						<Mass>3.35</Mass>
-						<Bulk>5.50</Bulk>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.14</SwayFactor>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.95</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>35</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>SMG_Fire</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== UMP45 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>LTS_UMP</defName>
-					<statBases>
-						<Mass>2.50</Mass>
-						<Bulk>4.50</Bulk>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>0.94</SwayFactor>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.08</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>25</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>HeavySMG_Fire</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== MP5SD ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>LTS_MP5SD</defName>
-					<statBases>
-						<Mass>3.10</Mass>
-						<Bulk>7.90</Bulk>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.10</SwayFactor>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.21</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmParaSD_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>26</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>Silenced_Fire</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>1</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmParaSD</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== PSG90 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>LTS_PSG</defName>
-					<statBases>
-						<Mass>6.5</Mass>
-						<Bulk>11.80</Bulk>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.83</SwayFactor>
-						<SightsEfficiency>2.8</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.56</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_300WinchesterMagnum_FMJ</defaultProjectile>
-						<warmupTime>2</warmupTime>
-						<range>80</range>
-						<soundCast>DMR_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_300WinchesterMagnum</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_SNIPER</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== AK4 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>LTS_AKIV</defName>
-					<statBases>
-						<Mass>4.10</Mass>
-						<Bulk>10.45</Bulk>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.46</SwayFactor>
-						<SightsEfficiency>1.5</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.07</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>58</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>AssaultRifle_Fire</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AR</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== AK5 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>LTS_AKV</defName>
-					<statBases>
-						<Mass>3.90</Mass>
-						<Bulk>7.60</Bulk>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.40</SwayFactor>
-						<SightsEfficiency>1.5</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.38</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>58</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>AssaultRifle_Fire</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AR</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== G36 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>LTS_G36Rifle</defName>
-					<statBases>
-						<Mass>3.63</Mass>
-						<Bulk>7.58</Bulk>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.37</SwayFactor>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.38</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>58</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>Rifle_Fire</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AR</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Glock 19 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>LTS_Glock</defName>
-					<statBases>
-						<Mass>0.78</Mass>
-						<Bulk>1.86</Bulk>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.88</SwayFactor>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.4</warmupTime>
-						<range>12</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>Handgun_Fire</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-						<recoilAmount>2.74</recoilAmount>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>17</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== KSP58 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>LTS_KSP</defName>
-					<statBases>
-						<Mass>11.80</Mass>
-						<Bulk>15.63</Bulk>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.71</SwayFactor>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.21</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>75</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>LMG_Fire</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_LMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== PKM ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>LTS_PKM</defName>
-					<statBases>
-						<Mass>7.50</Mass>
-						<Bulk>14.92</Bulk>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.36</SwayFactor>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.45</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>62</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>LMG_Fire</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_LMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== AT4 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>LTS_AT</defName>
-					<statBases>
-						<Mass>6.7</Mass>
-						<Bulk>16.50</Bulk>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>2.27</SwayFactor>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_84mmAT4_HEAT</defaultProjectile>
-						<warmupTime>1.9</warmupTime>
-						<range>40</range>
-						<soundCast>Recoilless_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AOE</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== GRG ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>LTS_grg</defName>
-					<statBases>
-						<Mass>10</Mass>
-						<Bulk>11.3</Bulk>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>2.58</SwayFactor>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_84x246mmR_HEAT</defaultProjectile>
-						<warmupTime>2</warmupTime>
-						<range>55</range>
-						<soundCast>Recoilless_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>8.6</reloadTime>
-						<ammoSet>AmmoSet_84x246mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>false</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AOE</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== M59 ========== -->
-
-				<!-- = Projectile = -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Proj_Handgranat"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Proj_Handgranat"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>2</explosionRadius>
-							<damageDef>Bomb</damageDef>
-							<damageAmountBase>60</damageAmountBase>
-							<explosionDelay>100</explosionDelay>
-							<dropsCasings>true</dropsCasings>
-							<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-							<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							<speed>12</speed>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Proj_Handgranat"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Proj_Handgranat"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Proj_Handgranat"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>40</Fragment_Small>
-							</fragments>
-						</li>
-					</value>
-				</li>
-
-				<!-- = Grenade = -->
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="LTS_Handgranat"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>BaseWeapon</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="LTS_Handgranat"]/graphicData</xpath>
-					<value>
-						<graphicData>
-							<texPath>Projectiles/SpranghandgranatM59_Projectile</texPath>
-							<graphicClass>Graphic_Single</graphicClass>
-							<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
-						</graphicData>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="LTS_Handgranat"]/recipeMaker</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="LTS_Handgranat"]/costList</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="LTS_Handgranat"]</xpath>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<stackLimit>75</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="LTS_Handgranat"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="LTS_Handgranat"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="LTS_Handgranat"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="LTS_Handgranat"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>60</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>2</explosiveRadius>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>40</Fragment_Small>
-							</fragments>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="LTS_Handgranat"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>40</Fragment_Small>
-							</fragments>
-						</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>LTS_Handgranat</defName>
-					<statBases>
-						<Mass>0.82</Mass>
-						<Bulk>0.36</Bulk>
-						<MarketValue>11.22</MarketValue>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<label>throw grenade</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<range>13.0</range>
-						<minRange>2</minRange>
-						<warmupTime>0.8</warmupTime>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<soundCast>ThrowGrenade</soundCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<defaultProjectile>Proj_Handgranat</defaultProjectile>
-						<onlyManualCast>true</onlyManualCast>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<weaponTags>
-						<li>CE_AI_AOE</li>
-						<li>CE_AI_Grenade</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- = Recipe = -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>LTS_Handgranat</defName>
-							<label>make M59 grenades x10</label>
-							<description>Craft 10 M59 grenades.</description>
-							<jobString>Making M59 grenades.</jobString>
-							<workAmount>3800</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>FSX</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<LTS_Handgranat>10</LTS_Handgranat>
-							</products>
-						</RecipeDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Leeani/Apparel_Various.xml b/Patches/Leeani/Apparel_Various.xml
deleted file mode 100644
index 443f8d79c7..0000000000
--- a/Patches/Leeani/Apparel_Various.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Leeani Playable Race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== The Bycocket ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "LeeaniBycocket"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Leeani/PawnKindDefs_Humanlikes/PawnKinds_Leeani.xml b/Patches/Leeani/PawnKindDefs_Humanlikes/PawnKinds_Leeani.xml
deleted file mode 100644
index c8b36047c7..0000000000
--- a/Patches/Leeani/PawnKindDefs_Humanlikes/PawnKinds_Leeani.xml
+++ /dev/null
@@ -1,375 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Leeani Playable Race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== Scoot ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="LeeaniScout"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<!-- ========== LeeaniMercenary ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="LeeaniMercenary"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Soldier ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="LeeaniSoldier"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>1</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.8</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.3</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Champion ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="LeeaniChampion"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>1</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>600</min>
-								<max>2000</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.9</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>1</generateChance>
-									<sidearmMoney>
-										<min>1000</min>
-										<max>3000</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Captain ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="LeeaniCaptain"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>1</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>600</min>
-								<max>2000</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.3</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.3</generateChance>
-									<sidearmMoney>
-										<min>200</min>
-										<max>400</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Civvies! ========== -->
-				<!-- ========== Peasant ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="LeeaniPeasant"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>1</min>
-								<max>4</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.2</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>60</min>
-										<max>150</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Noble ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="LeeaniNoble"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>1</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Trader ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="LeeaniTrader"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>1</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.8</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.3</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== LeeaniTradie? ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="LeeaniTradie"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>1</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>600</min>
-								<max>2000</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.9</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>1</generateChance>
-									<sidearmMoney>
-										<min>1000</min>
-										<max>3000</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Archvile ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="LeeaniArkhaevest"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>1</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>600</min>
-								<max>2000</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.3</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.3</generateChance>
-									<sidearmMoney>
-										<min>200</min>
-										<max>400</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Lourde ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="LeeaniLoord"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>1</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>600</min>
-								<max>2000</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.3</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.3</generateChance>
-									<sidearmMoney>
-										<min>200</min>
-										<max>400</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Leeani/Race_Leeani.xml b/Patches/Leeani/Race_Leeani.xml
deleted file mode 100644
index f7d60cad1a..0000000000
--- a/Patches/Leeani/Race_Leeani.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Leeani Playable Race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Leeani"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Gives Gun Gizmos to Leeani HUD thing ========== -->
-				<!-- ========== Also Makes Em Suppressable ========== -->
-
-				<!-- ========== Patch Leeani Melee Attacks ========== -->
-				<!-- ========== Also Sharpens Their Slashers ========== -->
-				<!-- ========== And adds fists and chompers ========== -->
-				<!-- ========== A bit more robust than ferians ========== -->
-				<!-- ========== We'll see how that works out? ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Leeani"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1</AimingAccuracy>
-						<MeleeDodgeChance>1.5</MeleeDodgeChance>
-						<MeleeCritChance>1.3</MeleeCritChance>
-						<MeleeParryChance>1.2</MeleeParryChance>
-						<ReloadSpeed>1</ReloadSpeed>
-						<Suppressability>1</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Leeani"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetration>0.12</armorPenetration>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetration>0.12</armorPenetration>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetration>0.10</armorPenetration>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetration>0.10</armorPenetration>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.7</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetration>0.16</armorPenetration>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== BaseBodySize, ArmorRatings, MoveSpeed, and BaseHealth are already set. I think. ========== -->
-				<!-- ========== Thanks Mike! ========== -->
-
-				<!-- ========== Adds In Inspector Tabs ========== -->
-				<!-- ========== Inventory and all that jazz ========== -->
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Leeani/Weapons_Leeani.xml b/Patches/Leeani/Weapons_Leeani.xml
deleted file mode 100644
index f74def8218..0000000000
--- a/Patches/Leeani/Weapons_Leeani.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Leeani Playable Race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== Quarterstaff ========== -->
-				<!-- ========== Lifted wholesale from VFWE_MELEE ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>/ThingDefs/ThingDef[defName = "MeleeWeapon_Quarterstaff"]/statBases/MeleeWeapon_DamageAmount</xpath>
-					<value>
-						<MeleeWeapon_DamageAmount>11</MeleeWeapon_DamageAmount>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>/ThingDefs/ThingDef[defName = "MeleeWeapon_Quarterstaff"]/statBases/MeleeWeapon_Cooldown</xpath>
-					<value>
-						<MeleeWeapon_Cooldown>0.92</MeleeWeapon_Cooldown>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>/ThingDefs/ThingDef[defName = "MeleeWeapon_Quarterstaff"]/statBases</xpath>
-					<value>
-						<MeleeWeapon_Penetration>0.16</MeleeWeapon_Penetration>
-						<Bulk>6</Bulk>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>/ThingDefs/ThingDef[defName = "MeleeWeapon_Quarterstaff"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.5</MeleeCritChance>
-							<MeleeParryChance>0.8</MeleeParryChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>/ThingDefs/ThingDef[defName = "MeleeWeapon_Quarterstaff"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li>
-								<verbClass>CombatExtended.Verb_MeleeAttackCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<meleeDamageDef>Blunt</meleeDamageDef>
-							</li>
-						</verbs>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Lemolim Race/Lemolim_Leather.xml b/Patches/Lemolim Race/Lemolim_Leather.xml
deleted file mode 100644
index 860dcecd99..0000000000
--- a/Patches/Lemolim Race/Lemolim_Leather.xml	
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Lemolim Race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Lemolim"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.06</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Leather_Lemolim"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.05</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Lemolim Race/Lemolim_Race.xml b/Patches/Lemolim Race/Lemolim_Race.xml
deleted file mode 100644
index 319e014001..0000000000
--- a/Patches/Lemolim Race/Lemolim_Race.xml	
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Lemolim Race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Lemolim"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Lemolim"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<MeleeDodgeChance>1.1</MeleeDodgeChance>
-						<MeleeCritChance>1.1</MeleeCritChance>
-						<MeleeParryChance>0.7</MeleeParryChance>
-						<ReloadSpeed>1.1</ReloadSpeed>
-						<Suppressability>0.9</Suppressability>
-						<SmokeSensitivity>1</SmokeSensitivity>
-					</value>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Lemolim"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Lemolim"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Lemolim"]/race/baseBodySize</xpath>
-					<value>
-						<baseBodySize>0.8</baseBodySize>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Lemolim"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>12</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>12</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.80</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Lemolim"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Lemolim Race/Lemonim_Body.xml b/Patches/Lemolim Race/Lemonim_Body.xml
deleted file mode 100644
index fa348ff97b..0000000000
--- a/Patches/Lemolim Race/Lemonim_Body.xml	
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Lemolim Race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- patch for body armor -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName ="Bodies_Lemolim"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Bodies_Lemolim"]/corePart/parts/li[def = "Neck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Bodies_Lemolim"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Bodies_Lemolim"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Jaw"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Bodies_Lemolim"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Nose"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Bodies_Lemolim"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Ear"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Bodies_Lemolim"]/corePart/parts/li[def = "Shoulder"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Bodies_Lemolim"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Bodies_Lemolim"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Bodies_Lemolim"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/parts/li[def = "Finger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Bodies_Lemolim"]/corePart/parts/li[def = "Leg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Bodies_Lemolim"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Bodies_Lemolim"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/parts/li[def = "Toe"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Lemolim Race/Lemonim_Pawnkind.xml b/Patches/Lemolim Race/Lemonim_Pawnkind.xml
deleted file mode 100644
index 6d804705d2..0000000000
--- a/Patches/Lemolim Race/Lemonim_Pawnkind.xml	
+++ /dev/null
@@ -1,251 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Lemolim Race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Tribal Pawns-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[ @Name="LemolimTribalBase" or defName="LemolimTribal"]</xpath>
-					<value>
-						<apparelRequired>
-							<li>CE_Apparel_TribalBackpack</li>
-						</apparelRequired>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[ @Name="LemolimTribalBase"]/invNutrition</xpath>
-					<value>
-						<invNutrition>1.8</invNutrition>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[ defName="LemolimTribal_Archer" or defName="LemolimTribal_Hunter" or defName="LemolimTribal_HeavyArcher" or defName="LemolimTribal_ChiefRanged"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>15</min>
-								<max>30</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>500</min>
-									<max>700</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>CE_Sidearm_Tribal</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<!-- Pirate Pawns -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[ @Name="LemolimPirateBase" or @Name="LemolimMercenaryBase" or defName="LemolimColonist"]</xpath>
-					<value>
-						<apparelRequired>
-							<li>CE_Apparel_Backpack</li>
-						</apparelRequired>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="LemolimPirate_Renegade"]/weaponMoney</xpath>
-					<value>
-						<weaponMoney>
-							<min>147</min>
-							<max>250</max>
-						</weaponMoney>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[ defName="LemolimPirate_Scavenger" or defName="LemolimPirate_Conscript"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>3</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>50</min>
-									<max>120</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>MedievalMeleeBasic</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[ defName="LemolimPirate_Scavenger" or defName="LemolimPirate_Conscript"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>3</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>50</min>
-									<max>120</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>MedievalMeleeBasic</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[defName="LemolimPirate_Captain"]/weaponTags</xpath>
-					<value>
-						<li>SpacerGun</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[ defName="LemolimPirate_Captain"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>4</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>150</min>
-									<max>320</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>CE_Sidearm_Melee</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<!-- Mercenaries Pawnkinds -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[ defName="LemolimMercenary_Zapper"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>10</min>
-								<max>15</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>150</min>
-									<max>320</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>CE_Sidearm_Melee</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[ defName="LemolimMercenary_ZapperEmp"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>10</min>
-								<max>15</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>100</min>
-									<max>250</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>CE_Sidearm</li>
-								</weaponTags>
-								<magazineCount>
-									<min>2</min>
-									<max>5</max>
-								</magazineCount>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="LemolimMercenary_ZapperEmp"]/label</xpath>
-					<value>
-						<label>advanced grenadier</label>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[defName="LemolimMercenary_ZapperEmp"]/weaponTags</xpath>
-					<value>
-						<li>CE_GrenadeFlashbang</li>
-						<li>GrenadeSmoke</li>
-						<li>GrenadeDestructive</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="LemolimMercenary_ZapperEmp"]/combatPower</xpath>
-					<value>
-						<combatPower>85</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[ defName="LemolimMercenary_Hitman" or defName="LemolimMercenary_Shocktrooper"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>4</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>250</min>
-									<max>420</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>CE_Sidearm_Melee</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[ defName="LemolimMercenary_Headhunter"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>1</min>
-								<max>3</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>200</min>
-									<max>450</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>CE_Sidearm</li>
-								</weaponTags>
-								<magazineCount>
-									<min>2</min>
-									<max>4</max>
-								</magazineCount>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Lemolim Race/Pawnkind_LemolimGrenadier.xml b/Patches/Lemolim Race/Pawnkind_LemolimGrenadier.xml
deleted file mode 100644
index 5c56dff5e5..0000000000
--- a/Patches/Lemolim Race/Pawnkind_LemolimGrenadier.xml	
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Lemolim Race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!--Lemolim Tribal with Sticky Bomb -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<PawnKindDef>
-							<defName>Lemolim_Grenadier</defName>
-							<race>Lemolim</race>
-							<label>blaster</label>
-							<combatPower>65</combatPower>
-							<defaultFactionType>LemolimTribeCautious</defaultFactionType>
-							<backstoryCategories>
-								<li>Tribal</li>
-							</backstoryCategories>
-							<maxGenerationAge>30</maxGenerationAge>
-							<chemicalAddictionChance>0.05</chemicalAddictionChance>
-							<invNutrition>1.8</invNutrition>
-							<invFoodDef>Pemmican</invFoodDef>
-							<canBeSapper>true</canBeSapper>
-							<gearHealthRange>
-								<min>0.5</min>
-								<max>1.8</max>
-							</gearHealthRange>
-							<apparelMoney>
-								<min>180</min>
-								<max>350</max>
-							</apparelMoney>
-							<apparelRequired>
-								<li>Apparel_WarVeil</li>
-								<li>CE_Apparel_TribalBackpack</li>
-							</apparelRequired>
-							<apparelTags>
-								<li>Tribal</li>
-							</apparelTags>
-							<weaponMoney>
-								<min>60</min>
-								<max>400</max>
-							</weaponMoney>
-							<weaponTags>
-								<li>CE_GrenadeNeolithic</li>
-							</weaponTags>
-							<techHediffsMoney>
-								<min>50</min>
-								<max>800</max>
-							</techHediffsMoney>
-							<techHediffsTags>
-								<li>Poor</li>
-								<li>Simple</li>
-							</techHediffsTags>
-							<techHediffsChance>0.33</techHediffsChance>
-							<disallowedTraits>
-								<li>Brawler</li>
-							</disallowedTraits>
-							<initialWillRange>2~4</initialWillRange>
-							<initialResistanceRange>14~22</initialResistanceRange>
-							<modExtensions>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>6</min>
-										<max>18</max>
-									</primaryMagazineCount>
-									<forcedSidearm>
-										<sidearmMoney>
-											<min>80</min>
-											<max>160</max>
-										</sidearmMoney>
-										<weaponTags>
-											<li>CE_Sidearm_Tribal</li>
-										</weaponTags>
-									</forcedSidearm>
-								</li>
-							</modExtensions>
-						</PawnKindDef>
-					</value>
-				</li>
-				<!-- Adding Lemonim Boomers -->
-				<li Class="PatchOperationAdd"><!-- Combat -->
-					<xpath>Defs/FactionDef[@Name="LemolimFactionTribalBase"]/pawnGroupMakers/li[1]/options</xpath>
-					<value>
-						<Lemolim_Grenadier>10</Lemolim_Grenadier>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd"><!-- Normal fights, ranged only -->
-					<xpath>Defs/FactionDef[@Name="LemolimFactionTribalBase"]/pawnGroupMakers/li[2]/options</xpath>
-					<value>
-						<Lemolim_Grenadier>15</Lemolim_Grenadier>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd"><!--Peaceful-->
-					<xpath>Defs/FactionDef[@Name="LemolimFactionTribalBase"]/pawnGroupMakers/li[4]/options</xpath>
-					<value>
-						<Lemolim_Grenadier>5</Lemolim_Grenadier>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd"><!--Trader-->
-					<xpath>Defs/FactionDef[@Name="LemolimFactionTribalBase"]/pawnGroupMakers/li[5]/guards</xpath>
-					<value>
-						<Lemolim_Grenadier>7</Lemolim_Grenadier>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd"><!-- Settlement -->
-					<xpath>Defs/FactionDef[@Name="LemolimFactionTribalBase"]/pawnGroupMakers/li[6]/options</xpath>
-					<value>
-						<Lemolim_Grenadier>20</Lemolim_Grenadier>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Lemolim Race/Scenarios_Patch.xml b/Patches/Lemolim Race/Scenarios_Patch.xml
deleted file mode 100644
index f244190bae..0000000000
--- a/Patches/Lemolim Race/Scenarios_Patch.xml	
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Lemolim Race</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="LemolimTribe"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_Arrow_Stone</thingDef>
-							<count>50</count>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="LemolimColony"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_45ACP_FMJ</thingDef>
-							<count>70</count>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Let's Have a Cat!/LHaC_CE_Patch_Races_Animal_NEKO.xml b/Patches/Let's Have a Cat!/LHaC_CE_Patch_Races_Animal_NEKO.xml
deleted file mode 100644
index 3042bac6fe..0000000000
--- a/Patches/Let's Have a Cat!/LHaC_CE_Patch_Races_Animal_NEKO.xml	
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Let's Have a Cat!</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Same stats and melee tools as cats from the vanilla game (Core) -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="akaNEKO_A_Shorthair" or
-						defName="akaNEKO_J_Bobtail" or
-						defName="akaNEKO_kijitora" or
-						defName="akaNEKO_kuroneko" or
-						defName="akaNEKO_Maine_Coon" or
-						defName="akaNEKO_N_Forest_Cat" or
-						defName="akaNEKO_Persian" or
-						defName="akaNEKO_Russian_Blue" or
-						defName="akaNEKO_Scottish_Fold" or
-						defName="akaNEKO_Scottish_Fold_Long" or
-						defName="akaNEKO_shironeko" or
-						defName="akaNEKO_Siamese"
-						]/statBases </xpath>
-					<value>
-						<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="akaNEKO_A_Shorthair" or
-						defName="akaNEKO_J_Bobtail" or
-						defName="akaNEKO_kijitora" or
-						defName="akaNEKO_kuroneko" or
-						defName="akaNEKO_Maine_Coon" or
-						defName="akaNEKO_N_Forest_Cat" or
-						defName="akaNEKO_Persian" or
-						defName="akaNEKO_Russian_Blue" or
-						defName="akaNEKO_Scottish_Fold" or
-						defName="akaNEKO_Scottish_Fold_Long" or
-						defName="akaNEKO_shironeko" or
-						defName="akaNEKO_Siamese"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.55</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.55</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.85</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.254</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>0.55</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[
-						defName="akaNEKO_A_Shorthair" or
-						defName="akaNEKO_J_Bobtail" or
-						defName="akaNEKO_kijitora" or
-						defName="akaNEKO_kuroneko" or
-						defName="akaNEKO_Maine_Coon" or
-						defName="akaNEKO_N_Forest_Cat" or
-						defName="akaNEKO_Persian" or
-						defName="akaNEKO_Russian_Blue" or
-						defName="akaNEKO_Scottish_Fold" or
-						defName="akaNEKO_Scottish_Fold_Long" or
-						defName="akaNEKO_shironeko" or
-						defName="akaNEKO_Siamese"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[
-						defName="akaNEKO_A_Shorthair" or
-						defName="akaNEKO_J_Bobtail" or
-						defName="akaNEKO_kijitora" or
-						defName="akaNEKO_kuroneko" or
-						defName="akaNEKO_Maine_Coon" or
-						defName="akaNEKO_N_Forest_Cat" or
-						defName="akaNEKO_Persian" or
-						defName="akaNEKO_Russian_Blue" or
-						defName="akaNEKO_Scottish_Fold" or
-						defName="akaNEKO_Scottish_Fold_Long" or
-						defName="akaNEKO_shironeko" or
-						defName="akaNEKO_Siamese"
-						]/combatPower </xpath>
-					<value>
-						<combatPower>14</combatPower>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Littluna Race/Bodies/Bodies_Summon.xml b/Patches/Littluna Race/Bodies/Bodies_Summon.xml
deleted file mode 100644
index d40dfb0873..0000000000
--- a/Patches/Littluna Race/Bodies/Bodies_Summon.xml	
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[1.4]Littluna Race</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Nearmare Summon === -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="HAR_LL_M_Body"]//*[
-						def="Body" or
-						def="Tail" or
-						def="Neck" or
-						def="Nose" or
-						def="Leg" or
-						customLabel="rear left paw" or
-						customLabel="rear right paw" or
-						def="Eye" or
-						def="Ear"]
-					</xpath>
-
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="HAR_LL_M_Body"]//*[
-						def="Body" or
-						def="Tail" or
-						def="Neck" or
-						def="Head" or
-						def="Leg" or
-						def="Paw" or
-						def="Eye" or
-						def="Ear" or
-						def="AnimalJaw"]/groups
-					</xpath>
-
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Littluna Race/Bodies/Littluna_Bodytype.xml b/Patches/Littluna Race/Bodies/Littluna_Bodytype.xml
deleted file mode 100644
index 84288a3115..0000000000
--- a/Patches/Littluna Race/Bodies/Littluna_Bodytype.xml	
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-
-			<!--Nearmare Bodytype-->
-
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>[1.4]Littluna Race</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--Arm Groups-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Littluna_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
-							<value>
-								<li>LeftArm</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Littluna_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
-							<value>
-								<li>RightArm</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Littluna_Body"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
-							<value>
-								<li>LeftShoulder</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Littluna_Body"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
-							<value>
-								<li>RightShoulder</li>
-							</value>
-						</li>
-
-						<!--Natural Armor-->
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Littluna_Body"]/corePart/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Littluna_Body"]/corePart/parts/li[def="Littluna_Wing"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Littluna_Body"]/corePart/parts/li[def="Neck"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Littluna_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Littluna_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Littluna_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Littluna_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Littluna_Body"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Littluna_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Littluna_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Littluna_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Littluna_Body"]/corePart/parts/li[def="Leg"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Littluna_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Littluna_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Littluna Race/PawnKindDefs/Littluna_PawnKind.xml b/Patches/Littluna Race/PawnKindDefs/Littluna_PawnKind.xml
deleted file mode 100644
index edb6fa10b2..0000000000
--- a/Patches/Littluna Race/PawnKindDefs/Littluna_PawnKind.xml	
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[1.4]Littluna Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--Ammo-->
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[
-								@Name="HAR_Littluna_KindBase"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>6</max>
-									</primaryMagazineCount>
-								</li>
-							</value>
-						</li>
-
-						<!--Backpack-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="CE_Apparel_Backpack"]/apparel/tags</xpath>
-							<value>
-								<li>HAR_LL_Apparel</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Littluna Race/ThingDefs_Misc/Littluna_Apparel.xml b/Patches/Littluna Race/ThingDefs_Misc/Littluna_Apparel.xml
deleted file mode 100644
index 5567ed156a..0000000000
--- a/Patches/Littluna Race/ThingDefs_Misc/Littluna_Apparel.xml	
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[1.4]Littluna Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--========= Stuffable =========-->
-
-						<!--Skin Layer minimum protection-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_LL_O_a"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>0.25</StuffEffectMultiplierArmor>
-								<Bulk>0.5</Bulk>
-								<WornBulk>0</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_LL_T_a" or
-								defName="HAR_LL_T_b" or
-								defName="HAR_LL_T_c" or
-								defName="HAR_LL_T_e"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-								<Bulk>2</Bulk>
-								<WornBulk>0</WornBulk>
-							</value>
-						</li>
-
-						<!--Shell-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_LL_S_a" or
-								defName="HAR_LL_S_b" or
-								defName="HAR_LL_S_c" or
-								defName="HAR_LL_S_e"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>10</StuffEffectMultiplierArmor>
-								<Bulk>10</Bulk>
-								<WornBulk>5</WornBulk>
-							</value>
-						</li>
-
-						<!--Overhead-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_LL_H_a" or
-								defName="HAR_LL_H_b" or
-								defName="HAR_LL_H_e"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-								<Bulk>1</Bulk>
-								<WornBulk>0</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_LL_H_c"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-								<Bulk>1</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Littluna Race/ThingDefs_Races/AlienRace_Littluna.xml b/Patches/Littluna Race/ThingDefs_Races/AlienRace_Littluna.xml
deleted file mode 100644
index 1587c20471..0000000000
--- a/Patches/Littluna Race/ThingDefs_Races/AlienRace_Littluna.xml	
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[1.4]Littluna Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="HAR_Littluna_BaseNRPawn"]/inspectorTabs/li[.="ITab_Pawn_Gear"]</xpath>
-							<value>
-								<li>CombatExtended.ITab_Inventory</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="HAR_Littluna_BaseNRPawn"]</xpath>
-							<value>
-								<comps>
-									<li>
-										<compClass>CombatExtended.CompPawnGizmo</compClass>
-									</li>
-									<li Class="CombatExtended.CompProperties_Suppressable" />
-									<li Class="CombatExtended.CompProperties_Inventory" />
-									<li Class="CombatExtended.CompProperties_TacticalManager" />
-								</comps>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="HAR_Littluna_Race_Base"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Humanoid</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="HAR_Littluna_Race_Base"]/statBases</xpath>
-							<value>
-								<Suppressability>1</Suppressability>
-								<SmokeSensitivity>1.2</SmokeSensitivity>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="HAR_Littluna_Race_Base"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>1.33</cooldownTime>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.162</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>right fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>1.33</cooldownTime>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.162</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>4.49</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="HAR_Littluna_Race_Base"]/alienRace/raceRestriction/whiteApparelList</xpath>
-							<value>
-								<li>CE_Apparel_TacVest</li>
-								<li>CE_Apparel_Backpack</li>
-								<li>CE_Apparel_TribalBackpack</li>
-								<li>CE_Apparel_BallisticShield</li>
-								<li>CE_Apparel_MeleeShield</li>
-								<li>CE_Apparel_GasMask</li>
-								<li>CE_Apparel_ImprovGasMask</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Littluna Race/ThingDefs_Races/Race_Summons.xml b/Patches/Littluna Race/ThingDefs_Races/Race_Summons.xml
deleted file mode 100644
index 84592c4786..0000000000
--- a/Patches/Littluna Race/ThingDefs_Races/Race_Summons.xml	
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[1.4]Littluna Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!-- Super Summon -->
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[@Name="LL_Summon_PawnBase"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Quadruped</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="LL_Summon_PawnBase"]/statBases</xpath>
-							<value>
-								<Suppressability>0</Suppressability>
-								<SmokeSensitivity>0</SmokeSensitivity>
-
-								<MeleeDodgeChance>0</MeleeDodgeChance>
-								<MeleeCritChance>3</MeleeCritChance>
-								<MeleeParryChance>3</MeleeParryChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HAR_LL_M_a"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left claw</label>
-										<capacities>
-											<li>ScratchToxic</li>
-										</capacities>
-										<power>26</power>
-										<cooldownTime>1.5</cooldownTime>
-										<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-										<armorPenetrationSharp>6.25</armorPenetrationSharp>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>right claw</label>
-										<capacities>
-											<li>ScratchToxic</li>
-										</capacities>
-										<power>26</power>
-										<cooldownTime>1.5</cooldownTime>
-										<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-										<armorPenetrationSharp>6.25</armorPenetrationSharp>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HAR_LL_M_a"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>600</ArmorRating_Sharp>
-								<ArmorRating_Electric>1</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HAR_LL_M_a"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>1800</ArmorRating_Blunt>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Logann/PawnKinds_Wolv.xml b/Patches/Logann/PawnKinds_Wolv.xml
deleted file mode 100644
index b8864cced8..0000000000
--- a/Patches/Logann/PawnKinds_Wolv.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Logann Race (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Civilians ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="WolvxCivBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>4</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Security ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="WolvxSecurityGuard"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.2</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="WolvxMilBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.3</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.6</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="WolvxNinja"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Logann/Race_Wolvx.xml b/Patches/Logann/Race_Wolvx.xml
deleted file mode 100644
index e2a491eaf5..0000000000
--- a/Patches/Logann/Race_Wolvx.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Logann Race (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Wolvx"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Gives Gun Gizmos to Wolvx HUD thing ========== -->
-				<!-- ========== Also Makes Em Suppressable ========== -->
-				<!-- ========== Wait is it wolvx or logann ========== -->
-				<!-- ========== Question for the ages! \o/ ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="BaseWolvPawn"]</xpath>
-					<value>
-						<comps>
-							<li>
-								<compClass>CombatExtended.CompPawnGizmo</compClass>
-							</li>
-							<li Class="CombatExtended.CompProperties_Suppressable" />
-						</comps>
-					</value>
-				</li>
-				<!-- ========== Patch Wolvx Melee Attacks ========== -->
-				<!-- ========== Big fuckin large boys (and girls) ========== -->
-				<!-- ========== Hit hard, and prefer to hit hard ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Wolvx"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.8</AimingAccuracy>
-						<MeleeDodgeChance>0.8</MeleeDodgeChance>
-						<MeleeCritChance>1.75</MeleeCritChance>
-						<MeleeParryChance>1.75</MeleeParryChance>
-						<ReloadSpeed>0.8</ReloadSpeed>
-						<Suppressability>0.15</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Wolvx"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.0</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2.5</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.40</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== BaseBodySize, ArmorRatings, MoveSpeed, and BaseHealth are already set. I think. ========== -->
-				<!-- ========== Thanks Xenn! ========== -->
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Logann/Wolv_Weapons.xml b/Patches/Logann/Wolv_Weapons.xml
deleted file mode 100644
index 71023085fa..0000000000
--- a/Patches/Logann/Wolv_Weapons.xml
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Logann Race (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Wolverine Supershotgun -->
-				<!-- Big dumb shotgun for big dumb animals -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_WolvShotgun</defName>
-					<statBases>
-						<Bulk>8</Bulk>
-						<Mass>5</Mass>
-						<SwayFactor>0.5</SwayFactor>
-						<ShotSpread>0.16</ShotSpread>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<WorkToMake>31000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>4</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>Shot_Shotgun</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>40</magazineSize>
-						<reloadTime>5.2</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>WolvWep</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_WolvShotgun"]/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>bayonet</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.38</cooldownTime>
-								<armorPenetrationBlunt>1.08</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.72</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- To be expected from a gun designed by wild animals -->
-
-				<!-- ========== Wolverine Katana ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Wolv_Katana"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Wolv_Katana"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1</MeleeCritChance>
-							<MeleeParryChance>0.8</MeleeParryChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Wolv_Katana"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1</cooldownTime>
-								<armorPenetration>0.15</armorPenetration>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Wolverine Axe ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Wolv_Axe"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Wolv_Axe"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.3</MeleeCritChance>
-							<MeleeParryChance>1.6</MeleeParryChance>
-							<MeleeDodgeChance>0.56</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Wolv_Axe"]/tools</xpath>
-					<value>
-						<tools>
-							<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>
-
-				<!-- ========== Wolverine Mace ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Wolv_Mace"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Wolv_Mace"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.8</MeleeCritChance>
-							<MeleeParryChance>0.7</MeleeParryChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Wolv_Mace"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>3.51</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>9.375</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Wolverine Sword ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Wolv_Sword"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Wolv_Sword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1</MeleeCritChance>
-							<MeleeParryChance>1.5</MeleeParryChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Wolv_Sword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Logistics_Mechanoid/Bodies_Mechanoid_Heavy.xml b/Patches/Logistics_Mechanoid/Bodies_Mechanoid_Heavy.xml
deleted file mode 100644
index ffe9521922..0000000000
--- a/Patches/Logistics_Mechanoid/Bodies_Mechanoid_Heavy.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Logistics_Mechanoid</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==================== Logistic Mech ==================== -->
-
-				<!-- ========== Add groups entry if it doesn't exist already ========== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/parts/li[def="MechanicalNeck"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/parts/li[def="MechanicalShoulder"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="PowerClaw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="PowerClaw"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/parts/li[def="MechanicalLeg"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<!-- ========== Add armor coverage ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="PowerClaw"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Mech_Logistic"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Logistics_Mechanoid/MeleeMechanoid.xml b/Patches/Logistics_Mechanoid/MeleeMechanoid.xml
deleted file mode 100644
index b53cbded4e..0000000000
--- a/Patches/Logistics_Mechanoid/MeleeMechanoid.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Logistics_Mechanoid</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Hydraulic Claws -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "MeleeWeapon_HydraulicClaw"]/statBases</xpath>
-					<value>
-						<MeleeCounterParryBonus>0.28</MeleeCounterParryBonus>
-						<Bulk>0</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_HydraulicClaw"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>base</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>3.51</cooldownTime>
-								<armorPenetrationBlunt>13</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>pincer</label>
-								<labelUsedInLogging>false</labelUsedInLogging>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>3.51</cooldownTime>
-								<armorPenetrationBlunt>13</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Logistics_Mechanoid/Races_Mechanoids_Heavy.xml b/Patches/Logistics_Mechanoid/Races_Mechanoids_Heavy.xml
deleted file mode 100644
index a9b93b014c..0000000000
--- a/Patches/Logistics_Mechanoid/Races_Mechanoids_Heavy.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Logistics_Mechanoid</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Logistics ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Mech_Logistic"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mech_Logistic"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>12</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mech_Logistic"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Mech_Logistic"]/statBases</xpath>
-					<value>
-						<CarryWeight>250</CarryWeight>
-						<CarryBulk>60</CarryBulk>
-						<MeleeDodgeChance>0.09</MeleeDodgeChance>
-						<MeleeCritChance>0.21</MeleeCritChance>
-						<MeleeParryChance>0.44</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mech_Logistic"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2.51</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/MH Android Tiers Core/Hediffs/Hediffs_Android.xml b/Patches/MH Android Tiers Core/Hediffs/Hediffs_Android.xml
deleted file mode 100644
index eeac0cd1ae..0000000000
--- a/Patches/MH Android Tiers Core/Hediffs/Hediffs_Android.xml	
+++ /dev/null
@@ -1,254 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MH: Android Tiers Core</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ATR_CombatAssistant"]/stages/li/statOffsets</xpath>
-					<value>
-						<Suppressability>-0.25</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ATR_CombatAssistant"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<ShootingAccuracyPawn>1.0</ShootingAccuracyPawn>
-						<AimingAccuracy>0.4</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ATR_CombatAssistant"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ATR_PlatingPlasteel"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ATR_PlatingPlasteel"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ATR_CompositePlating"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-						<ArmorRating_Heat>0.1</ArmorRating_Heat>
-						<ArmorRating_Electric>0.1</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ATR_CompositePlating"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ATR_HydraulicFrame"]/stages/li/statOffsets</xpath>
-					<value>
-						<CarryWeight>10</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ATR_MobilityFrame"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.5</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ATR_SuppressorFrame"]/stages/li/statOffsets</xpath>
-					<value>
-						<Suppressability>1</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ATR_MiningArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>drill</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.25</cooldownTime>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ATR_AgriArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>scythe</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.25</cooldownTime>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ATR_PacificationArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>charged fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.0</cooldownTime>
-								<extraMeleeDamages>
-									<li>
-										<def>Flame</def>
-										<amount>10</amount>
-									</li>
-									<li>
-										<def>EMP</def>
-										<amount>5</amount>
-									</li>
-								</extraMeleeDamages>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ATR_ScalpelArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>scalpel</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationSharp>1.0</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>scalpel</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.0</cooldownTime>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ATR_RendingArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>carver</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>1.25</cooldownTime>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>carver</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>0.75</cooldownTime>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>carver</label>
-								<capacities>
-									<li>Demolish</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2.0</cooldownTime>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ATR_MakeshiftMechArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ATR_AdvancedArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.25</cooldownTime>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/MH Android Tiers/Bodies/Bodies_Android.xml b/Patches/MH Android Tiers/Bodies/Bodies_Android.xml
deleted file mode 100644
index 98c9ef8a40..0000000000
--- a/Patches/MH Android Tiers/Bodies/Bodies_Android.xml	
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MH: Military Tier</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
-					<value>
-						<li>LeftShoulder</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
-					<value>
-						<li>RightShoulder</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalShoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
-					<value>
-						<li>LeftArm</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalShoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
-					<value>
-						<li>RightArm</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_Framework"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalNeck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_VoiceSynthesizer"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_MechanicalAudioSensor"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_SmellSensor"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalShoulder"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalShoulder"]/parts/li[def="ATR_MechanicalArm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalShoulder"]/parts/li[def="ATR_MechanicalArm"]/parts/li[def="ATR_MechanicalHand"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalShoulder"]/parts/li[def="ATR_MechanicalArm"]/parts/li[def="ATR_MechanicalHand"]/parts/li[def="ATR_MechanicalFinger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalLeg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATR_AndroidBody"]/corePart/parts/li[def="ATR_MechanicalLeg"]/parts/li[def="ATR_MechanicalFoot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="ATR_AndroidBody"]//*[
-						def="ATR_VoiceSynthesizer" or
-						def="ATR_SmellSensor" or
-						def="ATR_MechanicalVisualSensor"]/groups
-					</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/MH Android Tiers/PawnkindDefs/PawnKinds_Android.xml b/Patches/MH Android Tiers/PawnkindDefs/PawnKinds_Android.xml
deleted file mode 100644
index d1b4b48a7b..0000000000
--- a/Patches/MH Android Tiers/PawnkindDefs/PawnKinds_Android.xml	
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationSequence">
-		<operations>
-
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>MH: Android Tiers</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[
-								defName="ATR_RaiderSoldierT1" or
-								defName="ATR_RaiderSoldierT2" or
-								defName="ATR_AndroidT2CollectiveTrader" or
-								defName="ATR_AndroidT1CollectiveSoldier" or
-								defName="ATR_AndroidT2CollectiveSoldier"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>3</max>
-									</primaryMagazineCount>
-									<sidearms>
-										<li>
-											<generateChance>0.5</generateChance>
-											<sidearmMoney>
-												<min>20</min>
-												<max>120</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_Sidearm_Melee</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[
-								defName="ATR_RaiderSoldierT3" or
-								defName="ATR_RaiderSoldierT4" or
-								defName="ATR_AndroidT3CollectiveSoldier" or
-								defName="ATR_AndroidT4CollectiveSoldier" or
-								defName="ATR_AndroidT4CollectiveLeader"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>4</min>
-										<max>6</max>
-									</primaryMagazineCount>
-									<sidearms>
-										<li>
-											<generateChance>0.25</generateChance>
-											<sidearmMoney>
-												<min>20</min>
-												<max>120</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_Sidearm_Melee</li>
-											</weaponTags>
-										</li>
-										<li>
-											<generateChance>0.075</generateChance>
-											<sidearmMoney>
-												<min>80</min>
-												<max>160</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_FlareLauncher</li>
-											</weaponTags>
-											<magazineCount>
-												<min>1</min>
-												<max>1</max>
-											</magazineCount>
-										</li>
-										<li>
-											<generateChance>0.125</generateChance>
-											<sidearmMoney>
-												<min>10</min>
-												<max>100</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>GrenadeDestructive</li>
-											</weaponTags>
-											<magazineCount>
-												<min>1</min>
-												<max>1</max>
-											</magazineCount>
-										</li>
-									</sidearms>
-								</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/MH Android Tiers/ScenarioDefs/Scenarios_Androids.xml b/Patches/MH Android Tiers/ScenarioDefs/Scenarios_Androids.xml
deleted file mode 100644
index 290b82f196..0000000000
--- a/Patches/MH Android Tiers/ScenarioDefs/Scenarios_Androids.xml	
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MH: Android Tiers</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Add ammo to scenario === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="ATR_CrashlandedAndroids"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_303British_FMJ</thingDef>
-							<count>100</count>
-						</li>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_44Magnum_FMJ</thingDef>
-							<count>60</count>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/MH Android Tiers/ThingDef_Misc/Apparel_Packs.xml b/Patches/MH Android Tiers/ThingDef_Misc/Apparel_Packs.xml
deleted file mode 100644
index e31e5ee535..0000000000
--- a/Patches/MH Android Tiers/ThingDef_Misc/Apparel_Packs.xml	
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MH: Android Tiers</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ATR_Apparel_ScorchPack"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Shoulders</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ATR_Apparel_ScorchPack"]/apparel/layers</xpath>
-					<value>
-						<li>Backpack</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ATR_Apparel_ScorchPack"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/MH Android Tiers/ThingDef_Races/AlienRace_Androids.xml b/Patches/MH Android Tiers/ThingDef_Races/AlienRace_Androids.xml
deleted file mode 100644
index fbc7a05ead..0000000000
--- a/Patches/MH Android Tiers/ThingDef_Races/AlienRace_Androids.xml	
+++ /dev/null
@@ -1,378 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MH: Android Tiers</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Test for comps-->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier1Android"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier1Android"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier2Android"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier2Android"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier3Android"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier3Android"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier4Android"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier4Android"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier1Android" or
-						defName="ATR_Tier2Android" or
-						defName="ATR_Tier3Android" or
-						defName="ATR_Tier4Android"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier1Android" or
-						defName="ATR_Tier2Android" or
-						defName="ATR_Tier3Android" or
-						defName="ATR_Tier4Android"
-						]/comps </xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li>
-							<compClass>CombatExtended.CompAmmoGiver</compClass>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier2Android" or
-						defName="ATR_Tier3Android" or
-						defName="ATR_Tier4Android"
-						]/comps </xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-				<!--T1-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier1Android"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						<MeleeCritChance>0.5</MeleeCritChance>
-						<MeleeParryChance>0.5</MeleeParryChance>
-						<SmokeSensitivity>0.5</SmokeSensitivity>
-						<AimingAccuracy>0.75</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier1Android"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.0</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier1Android"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier1Android"]/race/baseBodySize</xpath>
-					<value>
-						<baseBodySize>0.8</baseBodySize>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier1Android"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>2.14</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.245</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>2.14</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.245</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>5.61</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.40</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--T2-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier2Android"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.8</MeleeDodgeChance>
-						<MeleeCritChance>0.8</MeleeCritChance>
-						<MeleeParryChance>0.8</MeleeParryChance>
-						<Suppressability>0.15</Suppressability>
-						<AimingAccuracy>0.9</AimingAccuracy>
-						<SmokeSensitivity>0.25</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier2Android"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier2Android"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier2Android"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.67</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.67</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier2Android"]/race/baseBodySize</xpath>
-					<value>
-						<baseBodySize>1</baseBodySize>
-					</value>
-				</li>
-
-				<!--T3-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier3Android"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency>0.25</NightVisionEfficiency>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1.1</MeleeCritChance>
-						<MeleeParryChance>1.1</MeleeParryChance>
-						<Suppressability>0.2</Suppressability>
-						<SmokeSensitivity>0</SmokeSensitivity>
-						<CarryWeight>45</CarryWeight>
-						<CarryBulk>22.5</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier3Android"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier3Android"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier3Android"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.44</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.44</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2.8</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--T4-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier4Android"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency>0.4</NightVisionEfficiency>
-						<AimingAccuracy>1.1</AimingAccuracy>
-						<MeleeDodgeChance>1.2</MeleeDodgeChance>
-						<MeleeCritChance>1.2</MeleeCritChance>
-						<MeleeParryChance>1.2</MeleeParryChance>
-						<Suppressability>0.33</Suppressability>
-						<SmokeSensitivity>0</SmokeSensitivity>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>25</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier4Android"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier4Android"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>7.8</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATR_Tier4Android"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.68</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.68</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/MH Android Tiers/TraderKindDefs/Android_TraderKinds.xml b/Patches/MH Android Tiers/TraderKindDefs/Android_TraderKinds.xml
deleted file mode 100644
index 71609396ff..0000000000
--- a/Patches/MH Android Tiers/TraderKindDefs/Android_TraderKinds.xml	
+++ /dev/null
@@ -1,332 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MH: Android Tiers</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Android Base ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="ATR_Base_AndroidCollective_Standard"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>FSX</thingDef>
-							<countRange>
-								<min>25</min>
-								<max>100</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>Prometheum</thingDef>
-							<countRange>
-								<min>25</min>
-								<max>100</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Ammo</tradeTag>
-							<countRange>
-								<min>500</min>
-								<max>2000</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>5</min>
-								<max>9</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_MediumAmmo</tradeTag>
-							<countRange>
-								<min>30</min>
-								<max>100</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>5</min>
-								<max>8</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_HeavyAmmo</tradeTag>
-							<countRange>
-								<min>10</min>
-								<max>50</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>4</min>
-								<max>6</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Category">
-							<categoryDef>Ammo</categoryDef>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>0</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Turret</tradeTag>
-							<thingDefCountRange>
-								<min>-2</min>
-								<max>4</max>
-							</thingDefCountRange>
-							<countRange>
-								<min>1</min>
-								<max>2</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_Category">
-							<categoryDef>WeaponsTurrets</categoryDef>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>0</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Animals">
-							<tradeTagsSell>
-								<li>CE_AnimalBoom</li>
-							</tradeTagsSell>
-							<tradeTagsBuy>
-								<li>CE_AnimalBoom</li>
-							</tradeTagsBuy>
-							<kindCountRange>
-								<min>1</min>
-								<max>2</max>
-							</kindCountRange>
-							<countRange>
-								<min>-2</min>
-								<max>4</max>
-							</countRange>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Andro Caravan ========== -->
-
-				<!-- Pirate Merchant and Bulk Goods ammo -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="ATR_Caravan_AndroidCollective_BulkGoods" or defName="Caravan_AndroidCollective_AndroidMerchant" or defName="Caravan_AndroidCollective_HighTech"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Ammo</tradeTag>
-							<countRange>
-								<min>200</min>
-								<max>400</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>1</min>
-								<max>4</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_MediumAmmo</tradeTag>
-							<countRange>
-								<min>20</min>
-								<max>40</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>2</min>
-								<max>6</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_HeavyAmmo</tradeTag>
-							<countRange>
-								<min>5</min>
-								<max>10</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>2</min>
-								<max>4</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Category">
-							<categoryDef>Ammo</categoryDef>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>0</max>
-							</thingDefCountRange>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="ATR_Caravan_AndroidCollective_BulkGoods"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>FSX</thingDef>
-							<countRange>
-								<min>25</min>
-								<max>65</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>Prometheum</thingDef>
-							<countRange>
-								<min>25</min>
-								<max>65</max>
-							</countRange>
-						</li>
-					</value>
-				</li>
-
-				<!-- Combat Supplier -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="Caravan_AndroidCollective_CombatSupplier"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>FSX</thingDef>
-							<countRange>
-								<min>15</min>
-								<max>40</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>Prometheum</thingDef>
-							<countRange>
-								<min>15</min>
-								<max>40</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Ammo</tradeTag>
-							<countRange>
-								<min>400</min>
-								<max>1000</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>3</min>
-								<max>8</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_MediumAmmo</tradeTag>
-							<countRange>
-								<min>30</min>
-								<max>60</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>3</min>
-								<max>6</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_HeavyAmmo</tradeTag>
-							<countRange>
-								<min>10</min>
-								<max>15</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>4</min>
-								<max>6</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Category">
-							<categoryDef>Ammo</categoryDef>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>0</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Turret</tradeTag>
-							<thingDefCountRange>
-								<min>-4</min>
-								<max>2</max>
-							</thingDefCountRange>
-							<countRange>
-								<min>1</min>
-								<max>1</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_Category">
-							<categoryDef>WeaponsTurrets</categoryDef>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>0</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Animals">
-							<tradeTagsSell>
-								<li>CE_AnimalBoom</li>
-							</tradeTagsSell>
-							<tradeTagsBuy>
-								<li>CE_AnimalBoom</li>
-							</tradeTagsBuy>
-							<kindCountRange>
-								<min>1</min>
-								<max>1</max>
-							</kindCountRange>
-							<countRange>
-								<min>-1</min>
-								<max>2</max>
-							</countRange>
-						</li>
-					</value>
-				</li>
-
-				<!-- Orbital Mechanized Trader -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="ATR_Orbital_Mechanized"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Ammo</tradeTag>
-							<countRange>
-								<min>400</min>
-								<max>1000</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>2</min>
-								<max>4</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_MediumAmmo</tradeTag>
-							<countRange>
-								<min>60</min>
-								<max>120</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>4</min>
-								<max>7</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_HeavyAmmo</tradeTag>
-							<countRange>
-								<min>15</min>
-								<max>50</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>2</min>
-								<max>4</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Category">
-							<categoryDef>Ammo</categoryDef>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>0</max>
-							</thingDefCountRange>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/MH Mechanical Biomimetics/Ammo/81mmMortar_SwarmShell.xml b/Patches/MH Mechanical Biomimetics/Ammo/81mmMortar_SwarmShell.xml
deleted file mode 100644
index a861e1673a..0000000000
--- a/Patches/MH Mechanical Biomimetics/Ammo/81mmMortar_SwarmShell.xml	
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MH: Mechanical Biomimetics</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<CombatExtended.AmmoCategoryDef>
-							<defName>SwarmShell</defName>
-							<label>swarm shell</label>
-							<description>Releases several pre-programmed microscythers on impact.</description>
-							<advanced>true</advanced>
-						</CombatExtended.AmmoCategoryDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBaseCraftableBase">
-							<defName>Swarm_shell_81mm</defName>
-							<label>81mm mortar shell (Swarm)</label>
-							<graphicData>
-								<texPath>Things/Items/Shells/Microscyther_shell</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>60</MarketValue>
-								<Mass>4.1</Mass>
-								<Bulk>11.34</Bulk>
-							</statBases>
-							<ammoClass>SwarmShell</ammoClass>
-							<comps>
-								<li Class="CompProperties_Explosive">
-									<explosiveRadius>2</explosiveRadius>
-									<explosiveDamageType>Smoke</explosiveDamageType>
-									<explosiveExpandPerStackcount>0.4</explosiveExpandPerStackcount>
-									<startWickHitPointsPercent>0.333</startWickHitPointsPercent>
-									<postExplosionSpawnThingDef>Filth_FireFoam</postExplosionSpawnThingDef>
-									<postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-									<explosionEffect>ExtinguisherExplosion</explosionEffect>
-									<wickTicks>
-										<min>10</min>
-										<max>30</max>
-									</wickTicks>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="Base81mmMortarShell">
-							<defName>Bullet_81mmMortarShell_Swarm</defName>
-							<label>81mm mortar shell (Swarm)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Mortar/EMP</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Smoke</damageDef>
-								<suppressionFactor>0.0</suppressionFactor>
-								<dangerFactor>0.0</dangerFactor>
-								<damageAmountBase>0</damageAmountBase>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>39.493</armorPenetrationBlunt>
-								<explosionRadius>1.9</explosionRadius>
-								<soundExplode>Explosion_EMP</soundExplode>
-								<postExplosionSpawnThingDef>ATB_MicroScytherGenerator</postExplosionSpawnThingDef>
-								<postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<explosionEffect>ExtinguisherExplosion</explosionEffect>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_81mmMortarShell"]/ammoTypes</xpath>
-					<value>
-						<Swarm_shell_81mm>Bullet_81mmMortarShell_Swarm</Swarm_shell_81mm>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeSwarm_shell_81mm</defName>
-							<label>make 81mm Swarm mortar shell x1</label>
-							<description>Craft 1 81mm Swarm shell.</description>
-							<jobString>Making 81mm Swarm shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>50</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Swarm_shell_81mm>1</Swarm_shell_81mm>
-							</products>
-							<workAmount>3000</workAmount>
-							<recipeUsers Inherit="False">
-								<li>ATR_MechanicalAssemblyPod</li>
-							</recipeUsers>
-							<researchPrerequisite>ATB_MilitaryBiomimetics</researchPrerequisite>
-						</RecipeDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="ATB_MicroscytherShell"]</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATB_TrapIED_Microscyther"]/costList</xpath>
-					<value>
-						<costList>
-							<Swarm_shell_81mm>2</Swarm_shell_81mm>
-						</costList>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MH: Mechanical Biomimetics</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>MH: Android Tiers</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationRemove">
-						<xpath>Defs/TraderKindDef[defName="ATR_Orbital_Mechanized"]/stockGenerators/li[thingDef="ATB_MicroscytherShell"]</xpath>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/MH Mechanical Biomimetics/Bodies/Bodies_Animal_Airborne.xml b/Patches/MH Mechanical Biomimetics/Bodies/Bodies_Animal_Airborne.xml
deleted file mode 100644
index 319f9eedc2..0000000000
--- a/Patches/MH Mechanical Biomimetics/Bodies/Bodies_Animal_Airborne.xml	
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MH: Mechanical Biomimetics</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATB_MechAirborne"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATB_MechAirborne"]/corePart/parts/li[def="ATR_Framework"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATB_MechAirborne"]/corePart/parts/li[def="ATR_MechanicalNeck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATB_MechAirborne"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATB_MechAirborne"]/corePart/parts/li[def="ATR_MechanicalWing"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATB_MechAirborne"]/corePart/parts/li[def="ATR_MechanicalPropeller"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATB_MechAirborne"]/corePart/parts/li[def="ATR_MechanicalPropeller"]/parts/li[def="ATR_CounterWeightTop"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/MH Mechanical Biomimetics/Bodies/Bodies_Animal_Bipedal.xml b/Patches/MH Mechanical Biomimetics/Bodies/Bodies_Animal_Bipedal.xml
deleted file mode 100644
index 1e2bf1d0e5..0000000000
--- a/Patches/MH Mechanical Biomimetics/Bodies/Bodies_Animal_Bipedal.xml	
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MH: Mechanical Biomimetics</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATB_MechBipedal"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATB_MechBipedal"]/corePart/parts/li[def="ATR_Framework"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATB_MechBipedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATB_MechBipedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATB_MechBipedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_MechanicalAudioSensor"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATB_MechBipedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_SmellSensor"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATB_MechBipedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_MechanicalJaw"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATB_MechBipedal"]/corePart/parts/li[def="ATR_MechanicalLeg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATB_MechBipedal"]/corePart/parts/li[def="ATR_MechanicalLeg"]/parts/li[def="ATR_MechanicalFoot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="ATB_MechBipedal"]//*[
-						def="ATR_MechanicalJaw" or
-						def="ATR_SmellSensor" or
-						def="ATR_MechanicalVisualSensor"]/groups
-					</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/MH Mechanical Biomimetics/Bodies/Bodies_Animal_Quadrupedal.xml b/Patches/MH Mechanical Biomimetics/Bodies/Bodies_Animal_Quadrupedal.xml
deleted file mode 100644
index 9ea406b18c..0000000000
--- a/Patches/MH Mechanical Biomimetics/Bodies/Bodies_Animal_Quadrupedal.xml	
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MH: Mechanical Biomimetics</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="ATB_MechQuadrupedal"]/corePart/parts/li[12]/parts/li[def="ATR_MechanicalFoot"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="ATB_MechQuadrupedal"]/corePart/parts/li[12]/parts/li[def="ATR_MechanicalFoot"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="ATB_MechQuadrupedal"]/corePart/parts/li[13]/parts/li[def="ATR_MechanicalFoot"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="ATB_MechQuadrupedal"]/corePart/parts/li[13]/parts/li[def="ATR_MechanicalFoot"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATB_MechQuadrupedal"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATB_MechQuadrupedal"]/corePart/parts/li[def="ATR_Framework"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATB_MechQuadrupedal"]/corePart/parts/li[def="ATR_CounterWeightTail"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATB_MechQuadrupedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATB_MechQuadrupedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATB_MechQuadrupedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_MechanicalAudioSensor"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATB_MechQuadrupedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_SmellSensor"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATB_MechQuadrupedal"]/corePart/parts/li[def="ATR_MechanicalNeck"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_MechanicalJaw"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATB_MechQuadrupedal"]/corePart/parts/li[def="ATR_MechanicalLeg"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATB_MechQuadrupedal"]/corePart/parts/li[def="ATR_MechanicalLeg"]/parts/li[def="ATR_MechanicalFoot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="ATB_MechQuadrupedal"]//*[
-						def="ATR_MechanicalJaw" or
-						def="ATR_SmellSensor" or
-						def="ATR_MechanicalVisualSensor"]/groups
-					</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/MH Mechanical Biomimetics/ThingDef_Races/Races_Animals.xml b/Patches/MH Mechanical Biomimetics/ThingDef_Races/Races_Animals.xml
deleted file mode 100644
index 59e2de52f0..0000000000
--- a/Patches/MH Mechanical Biomimetics/ThingDef_Races/Races_Animals.xml	
+++ /dev/null
@@ -1,351 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MH: Mechanical Biomimetics</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Bodytype-->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ATB_MicroScyther"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ATB_DroneTORT" or
-						defName="ATB_DroneMineralUnit" or
-						defName="ATB_DroneNutritionUnit" or
-						defName="ATB_DroneWatchdog"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ATB_DroneChemUnit"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- Micro Scyther-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ATB_MicroScyther"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.26</MeleeDodgeChance>
-						<MeleeCritChance>0.03</MeleeCritChance>
-						<SmokeSensitivity>0</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATB_MicroScyther"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left wing</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.54</cooldownTime>
-								<linkedBodyPartsGroup>ATB_MechanicalLeftWing</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.303</armorPenetrationBlunt>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>right wing</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.54</cooldownTime>
-								<linkedBodyPartsGroup>ATB_MechanicalRightWing</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.303</armorPenetrationBlunt>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.05</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Chemical Processing Unit-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ATB_DroneChemUnit"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.0</MeleeCritChance>
-						<SmokeSensitivity>0.05</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATB_DroneChemUnit"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Mineral unit -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ATB_DroneMineralUnit"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.08</MeleeDodgeChance>
-						<MeleeCritChance>0.13</MeleeCritChance>
-						<MeleeParryChance>0.18</MeleeParryChance>
-						<SmokeSensitivity>0.05</SmokeSensitivity>
-						<CarryWeight>60</CarryWeight>
-						<CarryBulk>30</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATB_DroneMineralUnit"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.12</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Nutrition unit -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ATB_DroneNutritionUnit"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						<MeleeCritChance>0.28</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-						<SmokeSensitivity>0.05</SmokeSensitivity>
-						<CarryWeight>60</CarryWeight>
-						<CarryBulk>30</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATB_DroneNutritionUnit"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.12</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- TORT unit -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ATB_DroneTORT"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.17</MeleeDodgeChance>
-						<MeleeCritChance>0.23</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-						<SmokeSensitivity>0.05</SmokeSensitivity>
-						<CarryWeight>100</CarryWeight>
-						<CarryBulk>50</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATB_DroneTORT"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>2.12</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATB_DroneTORT"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>12</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATB_DroneTORT"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>36</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATB_DroneTORT"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!-- Watchdog unit -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ATB_DroneWatchdog"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.16</MeleeDodgeChance>
-						<MeleeCritChance>0.21</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-						<SmokeSensitivity>0</SmokeSensitivity>
-						<CarryWeight>60</CarryWeight>
-						<CarryBulk>30</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATB_DroneWatchdog"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATB_DroneWatchdog"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATB_DroneWatchdog"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>26</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.475</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>26</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.475</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2.5</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>32</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>12.8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/MH Military Tiers/Ammo/RotaryShrapnelcannonShell.xml b/Patches/MH Military Tiers/Ammo/RotaryShrapnelcannonShell.xml
deleted file mode 100644
index 8f91ff7b00..0000000000
--- a/Patches/MH Military Tiers/Ammo/RotaryShrapnelcannonShell.xml	
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MH: Military Tiers</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingCategoryDef>
-							<defName>AmmoRotaryShrapnelcannonShell</defName>
-							<label>Rotary Shrapnelcannon shell</label>
-							<parent>AmmoShotguns</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberShotgun</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_RotaryShrapnelcannonShell</defName>
-							<label>Rotary Shrapnelcannon shell</label>
-							<ammoTypes>
-								<Ammo_RotaryShrapnelcannonShell>Bullet_RotaryShrapnelcannonShell</Ammo_RotaryShrapnelcannonShell>
-							</ammoTypes>
-							<similarTo>AmmoSet_Shotgun</similarTo>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="RotaryShrapnelcannonShellBase" ParentName="HeavyAmmoBase" Abstract="True">
-							<description>Very large caliber buckshot shell designed specifically for the mech-operated Rotary Shrapnelcannon.</description>
-							<statBases>
-								<Mass>1.072</Mass>
-								<Bulk>5.9</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_TableMachining</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoRotaryShrapnelcannonShell</li>
-							</thingCategories>
-							<stackLimit>25</stackLimit>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="RotaryShrapnelcannonShellBase">
-							<defName>Ammo_RotaryShrapnelcannonShell</defName>
-							<label>Shrapnelcannon shell (Buck)</label>
-							<graphicData>
-								<texPath>ThirdParty/Android Tiers/ShrapnelcannonShell</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>4.37</MarketValue>
-							</statBases>
-							<ammoClass>BuckShot</ammoClass>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="Base12GaugeBullet">
-							<defName>Bullet_RotaryShrapnelcannonShell</defName>
-							<label>Shrapnelcannon buckshot pellet</label>
-							<graphicData>
-								<texPath>Things/Projectile/Shotgun_Pellet</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>117</speed>
-								<damageAmountBase>57</damageAmountBase>
-								<damageDef>Fragment</damageDef>
-								<pelletCount>6</pelletCount>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<armorPenetrationBlunt>526.34</armorPenetrationBlunt>
-								<spreadMult>7.9</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_RotaryShrapnelcannonShell</defName>
-							<label>make Shrapnelcannon (Buck) shell x10</label>
-							<description>Craft 10 Shrapnelcannon (Buck) shells.</description>
-							<jobString>Making Shrapnelcannon (Buck) shells.</jobString>
-							<workAmount>2200</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>22</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_RotaryShrapnelcannonShell>10</Ammo_RotaryShrapnelcannonShell>
-							</products>
-						</RecipeDef>
-
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/MH Military Tiers/Bodies/Bodies_MK1.xml b/Patches/MH Military Tiers/Bodies/Bodies_MK1.xml
deleted file mode 100644
index 9efad0f5a6..0000000000
--- a/Patches/MH Military Tiers/Bodies/Bodies_MK1.xml	
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MH: Military Tiers</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark1Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[customLabel="left shoulder"]/groups</xpath>
-					<value>
-						<li>LeftShoulder</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark1Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[customLabel="right shoulder"]/groups</xpath>
-					<value>
-						<li>RightShoulder</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark1Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalShoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
-					<value>
-						<li>LeftArm</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark1Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalShoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
-					<value>
-						<li>RightArm</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark1Body"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark1Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark1Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_Framework"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark1Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalHead"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark1Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_VoiceSynthesizer"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark1Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_MechanicalAudioSensor"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark1Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_SmellSensor"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark1Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalShoulder"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark1Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalShoulder"]/parts/li[def="ATR_MechanicalArm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark1Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalShoulder"]/parts/li[def="ATR_MechanicalArm"]/parts/li[def="ATR_MechanicalHand"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark1Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalShoulder"]/parts/li[def="ATR_MechanicalArm"]/parts/li[def="ATR_MechanicalHand"]/parts/li[def="ATR_MechanicalFinger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark1Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalLeg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark1Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalLeg"]/parts/li[def="ATR_MechanicalFoot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="ATM_Mark1Body"]//*[
-						def="ATR_VoiceSynthesizer" or
-						def="ATR_SmellSensor" or
-						def="ATR_MechanicalVisualSensor"]/groups
-					</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/MH Military Tiers/Bodies/Bodies_MK2.xml b/Patches/MH Military Tiers/Bodies/Bodies_MK2.xml
deleted file mode 100644
index 30f26b022d..0000000000
--- a/Patches/MH Military Tiers/Bodies/Bodies_MK2.xml	
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MH: Military Tiers</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark2Body"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark2Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark2Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_Framework"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark2Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalHead"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark2Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_VoiceSynthesizer"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark2Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_MechanicalAudioSensor"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark2Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_SmellSensor"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark2Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATM_MechanicalLimb"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark2Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATM_MechanicalLimb"]/parts/li[def="ATM_MechanicalManipulator"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="ATM_Mark2Body"]//*[
-						def="ATR_VoiceSynthesizer" or
-						def="ATR_SmellSensor" or
-						def="ATR_MechanicalVisualSensor"]/groups
-					</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/MH Military Tiers/Bodies/Bodies_MK3.xml b/Patches/MH Military Tiers/Bodies/Bodies_MK3.xml
deleted file mode 100644
index dcf8bfc969..0000000000
--- a/Patches/MH Military Tiers/Bodies/Bodies_MK3.xml	
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MH: Military Tiers</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark3Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[customLabel="left shoulder"]/groups</xpath>
-					<value>
-						<li>LeftShoulder</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark3Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[customLabel="right shoulder"]/groups</xpath>
-					<value>
-						<li>RightShoulder</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark3Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalShoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
-					<value>
-						<li>LeftArm</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark3Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalShoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
-					<value>
-						<li>RightArm</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark3Body"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark3Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark3Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_Framework"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark3Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalHead"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark3Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_VoiceSynthesizer"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark3Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_MechanicalAudioSensor"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark3Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalHead"]/parts/li[def="ATR_SmellSensor"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark3Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalShoulder"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark3Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalShoulder"]/parts/li[def="ATR_MechanicalArm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark3Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalShoulder"]/parts/li[def="ATR_MechanicalArm"]/parts/li[def="ATR_MechanicalHand"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark3Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATR_MechanicalShoulder"]/parts/li[def="ATR_MechanicalArm"]/parts/li[def="ATR_MechanicalHand"]/parts/li[def="ATR_MechanicalFinger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark3Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATM_MechanicalLimb"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark3Body"]/corePart/parts/li[def="ATR_MechanicalThorax"]/parts/li[def="ATM_MechanicalLimb"]/parts/li[def="ATM_MechanicalManipulator"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="ATM_Mark3Body"]//*[
-						def="ATR_VoiceSynthesizer" or
-						def="ATR_SmellSensor" or
-						def="ATR_MechanicalVisualSensor"]/groups
-					</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/MH Military Tiers/Bodies/Bodies_MK4.xml b/Patches/MH Military Tiers/Bodies/Bodies_MK4.xml
deleted file mode 100644
index aa59513c09..0000000000
--- a/Patches/MH Military Tiers/Bodies/Bodies_MK4.xml	
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MH: Military Tiers</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark4Body"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark4Body"]/corePart/parts/li[def="ATM_MechaniteTorso"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ATM_Mark4Body"]/corePart/parts/li[def="ATM_MechaniteTorso"]/parts/li[def="ATM_MechaniteHead"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="ATM_Mark4Body"]//*[
-						def="ATR_VoiceSynthesizer" or
-						def="ATR_SmellSensor" or
-						def="ATR_MechanicalVisualSensor"]/groups
-					</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/MH Military Tiers/PawnkindDefs/PawnKinds_Android.xml b/Patches/MH Military Tiers/PawnkindDefs/PawnKinds_Android.xml
deleted file mode 100644
index 92c0427177..0000000000
--- a/Patches/MH Military Tiers/PawnkindDefs/PawnKinds_Android.xml	
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MH: Military Tiers</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>MH: Android Tiers</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/PawnKindDef[
-							defName="ATM_M1WarriorUnion" or
-							defName="ATM_M2BishopUnion"
-							] </xpath>
-						<value>
-							<li Class="CombatExtended.LoadoutPropertiesExtension">
-								<primaryMagazineCount>
-									<min>2</min>
-									<max>3</max>
-								</primaryMagazineCount>
-								<sidearms>
-									<li>
-										<generateChance>0.5</generateChance>
-										<sidearmMoney>
-											<min>20</min>
-											<max>120</max>
-										</sidearmMoney>
-										<weaponTags>
-											<li>CE_Sidearm_Melee</li>
-										</weaponTags>
-									</li>
-								</sidearms>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/PawnKindDef[defName="ATM_M3PaladinUnion"]</xpath>
-						<value>
-							<li Class="CombatExtended.LoadoutPropertiesExtension">
-								<primaryMagazineCount>
-									<min>4</min>
-									<max>6</max>
-								</primaryMagazineCount>
-								<sidearms>
-									<li>
-										<generateChance>0.25</generateChance>
-										<sidearmMoney>
-											<min>20</min>
-											<max>120</max>
-										</sidearmMoney>
-										<weaponTags>
-											<li>CE_Sidearm_Melee</li>
-										</weaponTags>
-									</li>
-									<li>
-										<generateChance>0.075</generateChance>
-										<sidearmMoney>
-											<min>80</min>
-											<max>160</max>
-										</sidearmMoney>
-										<weaponTags>
-											<li>CE_FlareLauncher</li>
-										</weaponTags>
-										<magazineCount>
-											<min>1</min>
-											<max>1</max>
-										</magazineCount>
-									</li>
-									<li>
-										<generateChance>0.125</generateChance>
-										<sidearmMoney>
-											<min>10</min>
-											<max>100</max>
-										</sidearmMoney>
-										<weaponTags>
-											<li>GrenadeDestructive</li>
-										</weaponTags>
-										<magazineCount>
-											<min>1</min>
-											<max>1</max>
-										</magazineCount>
-									</li>
-								</sidearms>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/MH Military Tiers/ThingDef_Misc/Weapons_Mech.xml b/Patches/MH Military Tiers/ThingDef_Misc/Weapons_Mech.xml
deleted file mode 100644
index 19779ce677..0000000000
--- a/Patches/MH Military Tiers/ThingDef_Misc/Weapons_Mech.xml	
+++ /dev/null
@@ -1,345 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MH: Military Tiers</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==========  Rotary Autocannon  =========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ATM_RotaryAutocannon</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.8</SwayFactor>
-						<Bulk>35</Bulk>
-						<Mass>42</Mass>
-						<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.88</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_40x311mmR_AP</defaultProjectile>
-						<warmupTime>1.45</warmupTime>
-						<range>75</range>
-						<soundCast>ATM_AutocannonBlast</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>18</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_40x311mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATM_RotaryAutocannon"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>47</power>
-								<cooldownTime>3.65</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>21</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>47</power>
-								<cooldownTime>3.65</cooldownTime>
-								<armorPenetrationBlunt>21</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>65</power>
-								<cooldownTime>2.81</cooldownTime>
-								<armorPenetrationBlunt>30.24</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ATM_RotaryAutocannon"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>3.0,3.0</DrawSize>
-							<DrawOffset>0.0,0.0</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<!-- ==========  Rotary Shrapnelcannon  =========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ATM_RotaryShrapnelcannon</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.37</SwayFactor>
-						<Bulk>30</Bulk>
-						<Mass>42</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.72</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_RotaryShrapnelcannonShell</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>31</range>
-						<soundCast>ATM_ShrapnelBlast</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>1.7</reloadTime>
-						<ammoSet>AmmoSet_RotaryShrapnelcannonShell</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATM_RotaryShrapnelcannon"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>47</power>
-								<cooldownTime>3.65</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>21</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>47</power>
-								<cooldownTime>3.65</cooldownTime>
-								<armorPenetrationBlunt>21</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>65</power>
-								<cooldownTime>2.81</cooldownTime>
-								<armorPenetrationBlunt>30.24</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ATM_RotaryShrapnelcannon"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>3.0,3.0</DrawSize>
-							<DrawOffset>0.0,0.0</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<!-- ==========  Headhunter Cannon  =========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ATM_HeadhunterCannon</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.17</SwayFactor>
-						<Bulk>20</Bulk>
-						<Mass>30</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_20x102mmNATO_AP</defaultProjectile>
-						<warmupTime>0.7</warmupTime>
-						<range>55</range>
-						<soundCast>ATM_AutocannonBlast</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>20</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_20x102mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ATM_HeadhunterCannon"]</xpath>
-					<value>
-						<weaponTags Inherit="False">
-							<li>CE_Sidearm_M7Mech</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATM_HeadhunterCannon"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>3.51</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>3.51</cooldownTime>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>3.51</cooldownTime>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ATM_HeadhunterCannon"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>4.0,4.0</DrawSize>
-							<DrawOffset>0.0,0.0</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<!-- ==========  Mech Poleaxe  =========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATM_MechPoleaxe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>spike</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>125</power>
-								<cooldownTime>1.92</cooldownTime>
-								<armorPenetrationBlunt>38.28</armorPenetrationBlunt>
-								<armorPenetrationSharp>47.86</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>axe</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>182</power>
-								<cooldownTime>2.0</cooldownTime>
-								<armorPenetrationBlunt>63</armorPenetrationBlunt>
-								<armorPenetrationSharp>14.00</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>hammer</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>182</power>
-								<cooldownTime>2.0</cooldownTime>
-								<armorPenetrationBlunt>150</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ATM_MechPoleaxe"]/weaponTags</xpath>
-					<value>
-						<li>CE_Melee_M7Mech</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ATM_MechPoleaxe"]/statBases</xpath>
-					<value>
-						<Bulk>35</Bulk>
-						<MeleeCounterParryBonus>0.25</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ATM_MechPoleaxe"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.0</MeleeCritChance>
-							<MeleeParryChance>1.0</MeleeParryChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ATM_MechPoleaxe"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>3.5,3.5</DrawSize>
-							<DrawOffset>0.0,0.0</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/MH Military Tiers/ThingDef_Races/AlienRace_Androids.xml b/Patches/MH Military Tiers/ThingDef_Races/AlienRace_Androids.xml
deleted file mode 100644
index 3284faaff4..0000000000
--- a/Patches/MH Military Tiers/ThingDef_Races/AlienRace_Androids.xml	
+++ /dev/null
@@ -1,482 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MH: Military Tiers</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Test for comps-->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark1Warrior"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark1Warrior"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark2Bishop"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark2Bishop"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark3Paladin"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark3Paladin"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark4Jellyman"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark4Jellyman"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark5Titan"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark5Titan"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark1Warrior" or
-						defName="ATM_Mark2Bishop" or
-						defName="ATM_Mark3Paladin" or
-						defName="ATM_Mark4Jellyman" or
-						defName="ATM_Mark5Titan"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark1Warrior" or
-						defName="ATM_Mark2Bishop" or
-						defName="ATM_Mark3Paladin" or
-						defName="ATM_Mark4Jellyman" or
-						defName="ATM_Mark5Titan"
-						]/comps </xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li>
-							<compClass>CombatExtended.CompAmmoGiver</compClass>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="ATM_Mark3Paladin" or
-						defName="ATM_Mark4Jellyman"
-						]/comps </xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-				<!-- MK1 -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark1Warrior"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.8</MeleeDodgeChance>
-						<MeleeCritChance>0.8</MeleeCritChance>
-						<MeleeParryChance>0.8</MeleeParryChance>
-						<SmokeSensitivity>0.5</SmokeSensitivity>
-						<AimingAccuracy>1.0</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark1Warrior"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark1Warrior"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark1Warrior"]/race/baseBodySize</xpath>
-					<value>
-						<baseBodySize>0.85</baseBodySize>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark1Warrior"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.14</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.14</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>body</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>Torso</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>2.0</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- MK2 -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark2Bishop"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.9</MeleeDodgeChance>
-						<MeleeCritChance>0.9</MeleeCritChance>
-						<MeleeParryChance>0.9</MeleeParryChance>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<SmokeSensitivity>0.25</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark2Bishop"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark2Bishop"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark2Bishop"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>manipulator</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>0.75</cooldownTime>
-								<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>manipulator</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.0</cooldownTime>
-								<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.0</armorPenetrationSharp>
-								<chanceFactor>0.75</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>bodyslam</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>Torso</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- MK3 -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark3Paladin"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency>0.25</NightVisionEfficiency>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<Suppressability>0.2</Suppressability>
-						<SmokeSensitivity>0</SmokeSensitivity>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark3Paladin"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark3Paladin"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hand</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.0</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hand</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.0</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>manipulator</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.75</cooldownTime>
-								<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-								<chanceFactor>0.75</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>manipulator</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.0</cooldownTime>
-								<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.0</armorPenetrationSharp>
-								<chanceFactor>0.75</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>bodyslam</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>Torso</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- MK4 -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark4Jellyman"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency>0.4</NightVisionEfficiency>
-						<AimingAccuracy>1.1</AimingAccuracy>
-						<MeleeDodgeChance>1.2</MeleeDodgeChance>
-						<MeleeCritChance>1.2</MeleeCritChance>
-						<MeleeParryChance>1.2</MeleeParryChance>
-						<Suppressability>0.33</Suppressability>
-						<SmokeSensitivity>0</SmokeSensitivity>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>25</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark4Jellyman"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark4Jellyman"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>20</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark4Jellyman"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>bodyslam</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>Torso</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- MK5 -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark5Titan"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>30</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark5Titan"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>67.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark5Titan"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark5Titan"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency>0.4</NightVisionEfficiency>
-						<MeleeDodgeChance>1.0</MeleeDodgeChance>
-						<MeleeCritChance>1.0</MeleeCritChance>
-						<MeleeParryChance>1.0</MeleeParryChance>
-						<SmokeSensitivity>0</SmokeSensitivity>
-						<CarryWeight>200</CarryWeight>
-						<CarryBulk>100</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATM_Mark5Titan"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Demolish</li>
-								</capacities>
-								<power>80</power>
-								<cooldownTime>3.07</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>48.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Demolish</li>
-								</capacities>
-								<power>80</power>
-								<cooldownTime>3.07</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>48.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="ATM_M5TitanColony"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>8</min>
-								<max>10</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>0</min>
-									<max>10000</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>CE_Sidearm_M7Mech</li>
-								</weaponTags>
-								<magazineCount>
-									<min>4</min>
-									<max>5</max>
-								</magazineCount>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ATM_OrbitalTargeterMechFall"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>1</Bulk>
-						</statBases>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Machines of War/BodyDefs/CicadaBody.xml b/Patches/Machines of War/BodyDefs/CicadaBody.xml
deleted file mode 100644
index 4a3086797a..0000000000
--- a/Patches/Machines of War/BodyDefs/CicadaBody.xml	
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Machines of War</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Add groups entry if it doesn't exist already ========== -->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalNeck"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalLeg"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<!-- ========== Add armor coverage ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Machines of War/BodyDefs/DemolisherBody.xml b/Patches/Machines of War/BodyDefs/DemolisherBody.xml
deleted file mode 100644
index fb8a403e01..0000000000
--- a/Patches/Machines of War/BodyDefs/DemolisherBody.xml	
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Machines of War</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Add groups entry if it doesn't exist already ========== -->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalNeck"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalShoulder"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/parts/li[def="MechanicalFinger"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/parts/li[def="MechanicalFinger"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalLeg"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<!-- ========== Add armor coverage ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath> Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/parts/li[def="MechanicalFinger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Machines of War/BodyDefs/EnforcerBody.xml b/Patches/Machines of War/BodyDefs/EnforcerBody.xml
deleted file mode 100644
index 1f34223d74..0000000000
--- a/Patches/Machines of War/BodyDefs/EnforcerBody.xml	
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Machines of War</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Add groups entry if it doesn't exist already ========== -->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalNeck"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MOW_MechanicalShoulderPauldron"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MOW_MechanicalShoulderPauldron"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MOW_MechanicalShoulderPauldron"]/parts/li[def="MechanicalArm"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MOW_MechanicalShoulderPauldron"]/parts/li[def="MechanicalArm"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MOW_MechanicalShoulderPauldron"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MOW_MechanicalShoulderPauldron"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MOW_MechanicalShoulderPauldron"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/parts/li[def="MechanicalFinger"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MOW_MechanicalShoulderPauldron"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/parts/li[def="MechanicalFinger"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalLeg"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<!-- ========== Add armor coverage ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MOW_MechanicalShoulderPauldron"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MOW_MechanicalShoulderPauldron"]/parts/li[def="MechanicalArm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath> Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MOW_MechanicalShoulderPauldron"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MOW_MechanicalShoulderPauldron"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/parts/li[def="MechanicalFinger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Machines of War/ThingDefs_Misc/BreachCharger.xml b/Patches/Machines of War/ThingDefs_Misc/BreachCharger.xml
deleted file mode 100644
index a161be6fec..0000000000
--- a/Patches/Machines of War/ThingDefs_Misc/BreachCharger.xml	
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Machines of War</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[defName = "MOW_Gun_BreachChargeScatter"]/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>Bayonet</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2.02</cooldownTime>
-								<armorPenetrationSharp>5.630</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Charge Shotgun === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>MOW_Gun_BreachChargeScatter</defName>
-					<statBases>
-						<Mass>4.35</Mass>
-						<Bulk>6.0</Bulk>
-						<SwayFactor>1.25</SwayFactor>
-						<ShotSpread>0.14</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.26</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>3.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_12GaugeCharged</defaultProjectile>
-						<warmupTime>0.2</warmupTime>
-						<range>12</range>
-						<soundCast>MOW_Shot_StormChargeScatter</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>24</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_12GaugeCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Machines of War/ThingDefs_Misc/CricketCannon.xml b/Patches/Machines of War/ThingDefs_Misc/CricketCannon.xml
deleted file mode 100644
index 19d7fa9924..0000000000
--- a/Patches/Machines of War/ThingDefs_Misc/CricketCannon.xml	
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Machines of War</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MOW_Gun_ShockaveCannon"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>3.0</cooldownTime>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MOW_Gun_ShockaveCannon"]/statBases/RangedWeapon_Cooldown</xpath>
-					<value>
-						<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MOW_Gun_ShockaveCannon"]/verbs/li/warmupTime</xpath>
-					<value>
-						<warmupTime>0.8</warmupTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MOW_Gun_ShockaveCannon"]/verbs/li/range</xpath>
-					<value>
-						<range>35</range>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Machines of War/ThingDefs_Misc/Demolisherweapon.xml b/Patches/Machines of War/ThingDefs_Misc/Demolisherweapon.xml
deleted file mode 100644
index 6b7d882288..0000000000
--- a/Patches/Machines of War/ThingDefs_Misc/Demolisherweapon.xml	
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Machines of War</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[defName = "MOW_Gun_ParticleLauncher"]/tools
-					</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>1.55</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>30.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>MOW_Gun_ParticleLauncher</defName>
-					<statBases>
-						<Mass>20.00</Mass>
-						<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>0.82</SwayFactor>
-						<Bulk>20.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.01</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_80x256mmFuel_Incendiary</defaultProjectile>
-						<warmupTime>1.7</warmupTime><!-- Intentionally decreased from 4.3s -->
-						<range>40</range>
-						<burstShotCount>1</burstShotCount>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-						<minRange>4</minRange>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<AmmoGenPerMagOverride>15</AmmoGenPerMagOverride>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_80x256mmFuel</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Launcher</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Machines of War/ThingDefs_Misc/StormCharger.xml b/Patches/Machines of War/ThingDefs_Misc/StormCharger.xml
deleted file mode 100644
index d445c8285c..0000000000
--- a/Patches/Machines of War/ThingDefs_Misc/StormCharger.xml	
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Machines of War</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="MOW_Gun_EMMarksmanRifle"]</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[defName = "MOW_Gun_StormChargeScatter"]/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>Bayonet</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2.02</cooldownTime>
-								<armorPenetrationSharp>5.630</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Charge Shotgun === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>MOW_Gun_StormChargeScatter</defName>
-					<statBases>
-						<Mass>4.35</Mass>
-						<Bulk>6.0</Bulk>
-						<SwayFactor>1.25</SwayFactor>
-						<ShotSpread>0.14</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>3.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_12GaugeCharged</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>24</range>
-						<soundCast>MOW_Shot_StormChargeScatter</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_12GaugeCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Machines of War/ThingDefs_Races/CicadaRaces.xml b/Patches/Machines of War/ThingDefs_Races/CicadaRaces.xml
deleted file mode 100644
index 3a54dff6ed..0000000000
--- a/Patches/Machines of War/ThingDefs_Races/CicadaRaces.xml	
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Machines of War</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MOW_Mech_Cicada"]/statBases</xpath>
-					<value>
-						<PartialArmorBody>0</PartialArmorBody>
-					</value>
-				</li>
-
-				<!--Consistency with vanilla mechs-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MOW_Mech_Cicada"]/statBases</xpath>
-					<value>
-						<SmokeSensitivity>0</SmokeSensitivity>
-						<NightVisionEfficiency>0.80</NightVisionEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MOW_Mech_Cicada"]/statBases</xpath>
-					<value>
-						<CarryWeight>200</CarryWeight>
-						<CarryBulk>100</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.26</MeleeCritChance>
-						<MeleeParryChance>0.52</MeleeParryChance>
-						<AimingDelayFactor>1.25</AimingDelayFactor>
-						<MaxHitPoints>300</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MOW_Mech_Cicada"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>20</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MOW_Mech_Cicada"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MOW_Mech_Cicada"]/tools</xpath>
-					<value>
-						<tools>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>3.51</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>false</alwaysTreatAsWeapon>
-							</li>
-
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="MOW_Mech_Cicada"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="MOW_Mech_Cicada"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MOW_Mech_Cicada"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li>
-							<compClass>CombatExtended.CompAmmoGiver</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_MechAmmo">
-							<gizmoIconSetMagCount>UI/Buttons/SetMagCount</gizmoIconSetMagCount>
-							<gizmoIconTakeAmmoNow>UI/Buttons/TakeAmmoNow</gizmoIconTakeAmmoNow>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MOW_Mech_Cicada"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1580</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>158</MaxOverHeal>
-							<MinArmorPct>0.75</MinArmorPct>
-							<MinArmorValueSharp>5</MinArmorValueSharp>
-							<MinArmorValueBlunt>10</MinArmorValueBlunt>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Machines of War/ThingDefs_Races/DemolisherRaces.xml b/Patches/Machines of War/ThingDefs_Races/DemolisherRaces.xml
deleted file mode 100644
index 47c43527b3..0000000000
--- a/Patches/Machines of War/ThingDefs_Races/DemolisherRaces.xml	
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Machines of War</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MOW_Mech_Demolisher"]/statBases</xpath>
-					<value>
-						<PartialArmorBody>0</PartialArmorBody>
-					</value>
-				</li>
-
-				<!--Consistency with vanilla mechs-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MOW_Mech_Demolisher"]/statBases</xpath>
-					<value>
-						<SmokeSensitivity>0</SmokeSensitivity>
-						<NightVisionEfficiency>0.80</NightVisionEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MOW_Mech_Demolisher"]/statBases</xpath>
-					<value>
-						<ArmorRating_Heat>0.25</ArmorRating_Heat>
-						<CarryWeight>200</CarryWeight>
-						<CarryBulk>100</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.26</MeleeCritChance>
-						<MeleeParryChance>0.52</MeleeParryChance>
-						<AimingDelayFactor>1.25</AimingDelayFactor>
-						<MaxHitPoints>600</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MOW_Mech_Demolisher"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>60</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MOW_Mech_Demolisher"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>24</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MOW_Mech_Demolisher"]/tools</xpath>
-					<value>
-						<tools>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>3.51</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>false</alwaysTreatAsWeapon>
-							</li>
-
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="MOW_Mech_Demolisher"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="MOW_Mech_Demolisher"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MOW_Mech_Demolisher"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li>
-							<compClass>CombatExtended.CompAmmoGiver</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_MechAmmo">
-							<gizmoIconSetMagCount>UI/Buttons/SetMagCount</gizmoIconSetMagCount>
-							<gizmoIconTakeAmmoNow>UI/Buttons/TakeAmmoNow</gizmoIconTakeAmmoNow>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MOW_Mech_Demolisher"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>3950</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>395</MaxOverHeal>
-							<MinArmorPct>0.5</MinArmorPct>
-							<MinArmorValueSharp>14</MinArmorValueSharp>
-							<MinArmorValueBlunt>36</MinArmorValueBlunt>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="MOW_Mech_Demolisher"]/combatPower</xpath>
-					<value>
-						<combatPower>1000</combatPower>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Machines of War/ThingDefs_Races/EnforcerBreachRaces .xml b/Patches/Machines of War/ThingDefs_Races/EnforcerBreachRaces .xml
deleted file mode 100644
index 86faabd503..0000000000
--- a/Patches/Machines of War/ThingDefs_Races/EnforcerBreachRaces .xml	
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Machines of War</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer_Breacher"]/statBases</xpath>
-					<value>
-						<PartialArmorBody>0</PartialArmorBody>
-					</value>
-				</li>
-
-				<!--Consistency with vanilla mechs-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer_Breacher"]/statBases</xpath>
-					<value>
-						<SmokeSensitivity>0</SmokeSensitivity>
-						<NightVisionEfficiency>0.80</NightVisionEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer_Breacher"]/statBases</xpath>
-					<value>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>60</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.26</MeleeCritChance>
-						<MeleeParryChance>0.52</MeleeParryChance>
-						<AimingDelayFactor>1.25</AimingDelayFactor>
-						<MaxHitPoints>200</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer_Breacher"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>9</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer_Breacher"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer_Breacher"]/tools</xpath>
-					<value>
-						<tools>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>3.51</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>false</alwaysTreatAsWeapon>
-							</li>
-
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer_Breacher"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer_Breacher"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer_Breacher"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li>
-							<compClass>CombatExtended.CompAmmoGiver</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_MechAmmo">
-							<gizmoIconSetMagCount>UI/Buttons/SetMagCount</gizmoIconSetMagCount>
-							<gizmoIconTakeAmmoNow>UI/Buttons/TakeAmmoNow</gizmoIconTakeAmmoNow>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer_Breacher"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1310</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>131</MaxOverHeal>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Machines of War/ThingDefs_Races/EnforcerRaces.xml b/Patches/Machines of War/ThingDefs_Races/EnforcerRaces.xml
deleted file mode 100644
index dd09c8b880..0000000000
--- a/Patches/Machines of War/ThingDefs_Races/EnforcerRaces.xml	
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Machines of War</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer"]/statBases</xpath>
-					<value>
-						<PartialArmorBody>0</PartialArmorBody>
-					</value>
-				</li>
-
-				<!--Consistency with vanilla mechs-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer"]/statBases</xpath>
-					<value>
-						<SmokeSensitivity>0</SmokeSensitivity>
-						<NightVisionEfficiency>0.80</NightVisionEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer"]/statBases</xpath>
-					<value>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>60</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.26</MeleeCritChance>
-						<MeleeParryChance>0.52</MeleeParryChance>
-						<AimingDelayFactor>1.25</AimingDelayFactor>
-						<MaxHitPoints>200</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>9</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer"]/tools</xpath>
-					<value>
-						<tools>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>3.51</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>false</alwaysTreatAsWeapon>
-							</li>
-
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li>
-							<compClass>CombatExtended.CompAmmoGiver</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_MechAmmo">
-							<gizmoIconSetMagCount>UI/Buttons/SetMagCount</gizmoIconSetMagCount>
-							<gizmoIconTakeAmmoNow>UI/Buttons/TakeAmmoNow</gizmoIconTakeAmmoNow>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1310</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>131</MaxOverHeal>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Makeshift Melee Weapons/DetVisor_MakeshiftMelee.xml b/Patches/Makeshift Melee Weapons/DetVisor_MakeshiftMelee.xml
deleted file mode 100644
index 6adec63c61..0000000000
--- a/Patches/Makeshift Melee Weapons/DetVisor_MakeshiftMelee.xml	
+++ /dev/null
@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[DV] Makeshift Melee Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Makeshift Hammer === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DV_MakeshiftHammer"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>1.52</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DV_MakeshiftHammer"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.9</MeleeCritChance>
-							<MeleeParryChance>1.11</MeleeParryChance>
-							<MeleeDodgeChance>0.65</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DV_MakeshiftHammer"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DV_MakeshiftHammer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>2.42</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>7.6</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>2.22</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>7.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2.02</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>7.05</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Makeshift Mace ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DV_MakeshiftMace"]/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.675</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>3.05</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>3.15</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2.97</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>2.92</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2.79</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>2.7</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DV_MakeshiftMace"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.26</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DV_MakeshiftMace"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.42</MeleeCritChance>
-							<MeleeParryChance>0.24</MeleeParryChance>
-							<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DV_MakeshiftMace"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- ========== Makeshift Scythe ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DV_MakeshiftScythe"]/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>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.976</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.44</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.44</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.916</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.40</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.24</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.81</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.34</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DV_MakeshiftScythe"]/statBases</xpath>
-					<value>
-						<Bulk>3.85</Bulk>
-						<MeleeCounterParryBonus>0.30</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DV_MakeshiftScythe"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>0.35</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DV_MakeshiftScythe"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Mantodean Insectoid Race/Ammo/Projectiles.xml b/Patches/Mantodean Insectoid Race/Ammo/Projectiles.xml
deleted file mode 100644
index de9c2a5c9b..0000000000
--- a/Patches/Mantodean Insectoid Race/Ammo/Projectiles.xml	
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>The Mantodean insectoid race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Bullet_MantoLauncher"]</xpath>
-							<value>
-								<ThingDef ParentName="BaseGreatArrowProjectile">
-									<defName>Bullet_MantoLauncher</defName>
-									<label>incendiary slime</label>
-									<graphicData>
-										<texPath>Things/Weapon/MantoCannonShot</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-										<shaderType>TransparentPostLight</shaderType>
-									</graphicData>
-									<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<speed>49</speed>
-										<damageDef>MantoPoison</damageDef>
-										<damageAmountBase>7</damageAmountBase>
-										<armorPenetrationSharp>0</armorPenetrationSharp>
-										<armorPenetrationBlunt>0</armorPenetrationBlunt>
-										<preExplosionSpawnThingDef>Filth_Slime</preExplosionSpawnThingDef>
-										<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
-										<explosionRadius>1</explosionRadius>
-										<gravityFactor>4</gravityFactor>
-									</projectile>
-								</ThingDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/DamageDef[defName="MantoPoison"]/additionalHediffs/li[hediff="ToxicBuildup"]/severityPerDamageDealt</xpath>
-							<value>
-								<severityPerDamageDealt>0.02</severityPerDamageDealt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<!-- ==================== AmmoSets ========================== -->
-
-								<CombatExtended.AmmoSetDef>
-									<defName>AmmoSet_MantoPoison</defName>
-									<label>mantodean toxic gel</label>
-									<ammoTypes>
-										<Ammo_Mantogel>Bullet_MantoLauncher</Ammo_Mantogel>
-									</ammoTypes>
-								</CombatExtended.AmmoSetDef>
-
-								<CombatExtended.AmmoCategoryDef>
-									<defName>MantoPoisonAmmo</defName>
-									<label>incendiary slime</label>
-									<description>incendiary slime</description>
-								</CombatExtended.AmmoCategoryDef>
-
-								<!-- ==================== Ammo ========================== -->
-
-								<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-									<defName>Ammo_Mantogel</defName>
-									<label>mantodean toxic gel</label>
-									<description>Toxic thermal compound used in mantodean bio-launchers</description>
-									<statBases>
-										<Mass>0.50</Mass>
-										<Bulk>0.50</Bulk>
-										<MarketValue>0.9</MarketValue>
-									</statBases>
-									<tradeTags>
-									</tradeTags>
-									<thingCategories>
-										<li>AmmoAdvanced</li>
-									</thingCategories>
-									<stackLimit>100</stackLimit>
-									<graphicData>
-										<texPath>Things/Ammo/FuelCell/Incendiary</texPath>
-										<graphicClass>Graphic_StackCount</graphicClass>
-									</graphicData>
-									<ammoClass>MantoPoisonAmmo</ammoClass>
-								</ThingDef>
-
-								<!-- ==================== Recipes ========================== -->
-
-								<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-									<defName>MakeAmmo_Mantogel</defName>
-									<label>make mantodean toxic gel x100</label>
-									<description>Craft 100 mantodean toxic gel.</description>
-									<jobString>Making mantodean toxic gel.</jobString>
-									<workAmount>8000</workAmount>
-									<ingredients>
-										<li>
-											<filter>
-												<thingDefs>
-													<li>Chemfuel</li>
-												</thingDefs>
-											</filter>
-											<count>10</count>
-										</li>
-										<li>
-											<filter>
-												<thingDefs>
-													<li>Prometheum</li>
-												</thingDefs>
-											</filter>
-											<count>10</count>
-										</li>
-									</ingredients>
-									<fixedIngredientFilter>
-										<thingDefs>
-											<li>Chemfuel</li>
-											<li>Prometheum</li>
-										</thingDefs>
-									</fixedIngredientFilter>
-									<recipeUsers Inherit="False">
-										<li>RefineryManto</li>
-									</recipeUsers>
-									<products>
-										<Ammo_Mantogel>100</Ammo_Mantogel>
-									</products>
-								</RecipeDef>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Mantodean Insectoid Race/Bodies/Bodies_Mantodean.xml b/Patches/Mantodean Insectoid Race/Bodies/Bodies_Mantodean.xml
deleted file mode 100644
index 3eb4dea835..0000000000
--- a/Patches/Mantodean Insectoid Race/Bodies/Bodies_Mantodean.xml	
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>The Mantodean insectoid race</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Mantodean"]//*[
-						def="Jaw" or
-						def="EyeSet"]/groups
-					</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Mantodean"]//*[
-						def="Torso" or
-						def="Neck" or
-						def="Head" or
-						def="HearingAppendix" or
-						def="HornManto" or
-						def="Jaw" or
-						def="ShoulderManto" or
-						def="Pedipalp" or
-						def="Pincer" or
-						def="InsectLeg" or
-						def="Foot"]/groups
-					</xpath>
-
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Mantodean Insectoid Race/Hediffs/Hediffs.xml b/Patches/Mantodean Insectoid Race/Hediffs/Hediffs.xml
deleted file mode 100644
index 6eb0579495..0000000000
--- a/Patches/Mantodean Insectoid Race/Hediffs/Hediffs.xml	
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>The Mantodean insectoid race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="MutatedMarrowLight"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>4</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="MutatedMarrowLight"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>12</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="MutatedMarrowHeavy"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>16</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="MutatedMarrowHeavy"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>48</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="MutatedCombatPincer"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>pincer</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>24</power>
-										<cooldownTime>1.33</cooldownTime>
-										<armorPenetrationSharp>40</armorPenetrationSharp>
-										<armorPenetrationBlunt>20</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="MutatedPincer"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>5</power>
-										<cooldownTime>1.11</cooldownTime>
-										<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Mantodean Insectoid Race/PawnKindDefs/Manto_PawnKind.xml b/Patches/Mantodean Insectoid Race/PawnKindDefs/Manto_PawnKind.xml
deleted file mode 100644
index 866b1c327c..0000000000
--- a/Patches/Mantodean Insectoid Race/PawnKindDefs/Manto_PawnKind.xml	
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>The Mantodean insectoid race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--Ammo-->
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[
-								defName="MantoAdult" or
-								defName="MantoHiveElder"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>6</max>
-									</primaryMagazineCount>
-								</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Mantodean Insectoid Race/Scenario/Mantodean_Scenario.xml b/Patches/Mantodean Insectoid Race/Scenario/Mantodean_Scenario.xml
deleted file mode 100644
index e50e9d19cd..0000000000
--- a/Patches/Mantodean Insectoid Race/Scenario/Mantodean_Scenario.xml	
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>The Mantodean insectoid race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ScenarioDef[defName="Mantohive"]/scenario/parts</xpath>
-							<value>
-								<li Class="ScenPart_StartingThing_Defined">
-									<def>StartingThing_Defined</def>
-									<thingDef>Ammo_Arrow_Stone</thingDef>
-									<count>100</count>
-								</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Mantodean Insectoid Race/ThingDefs_Misc/Turrets.xml b/Patches/Mantodean Insectoid Race/ThingDefs_Misc/Turrets.xml
deleted file mode 100644
index 77d497e117..0000000000
--- a/Patches/Mantodean Insectoid Race/ThingDefs_Misc/Turrets.xml	
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>The Mantodean insectoid race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BioTurretGun"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BioTurretGun"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.25</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BioTurretGun"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BioTurretGun"]/statBases/Mass</xpath>
-					<value>
-						<Mass>25</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="BioTurretGun"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BioTurretGun"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BioTurretGun"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>1.1</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BioGun_TurretImprovised</defName>
-					<statBases>
-						<Mass>5.35</Mass>
-						<Bulk>5.70</Bulk>
-						<SwayFactor>1.31</SwayFactor>
-						<ShotSpread>0.18</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_MantoLauncher</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>31</range>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<burstShotCount>3</burstShotCount>
-						<soundCast>ShotMantoLauncher</soundCast>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<recoilAmount>2.93</recoilAmount>
-						<ignorePartialLoSBlocker>True</ignorePartialLoSBlocker>
-						<targetParams>
-							<canTargetLocations>True</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>63</magazineSize>
-						<reloadTime>5.1</reloadTime>
-						<ammoSet>AmmoSet_MantoPoison</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<!-- Disallow with Run And Gun -->
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Mantodean Insectoid Race/ThingDefs_Misc/Weapons.xml b/Patches/Mantodean Insectoid Race/ThingDefs_Misc/Weapons.xml
deleted file mode 100644
index 3314811745..0000000000
--- a/Patches/Mantodean Insectoid Race/ThingDefs_Misc/Weapons.xml	
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>The Mantodean insectoid race</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>
-								Defs/ThingDef[defName = "Gun_MantoLauncher"]/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>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Gun_MantoLauncher</defName>
-							<statBases>
-								<Mass>5.35</Mass>
-								<Bulk>5.70</Bulk>
-								<SwayFactor>1.31</SwayFactor>
-								<ShotSpread>0.18</ShotSpread>
-								<SightsEfficiency>1</SightsEfficiency>
-								<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-							</statBases>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_MantoLauncher</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>31</range>
-								<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-								<burstShotCount>3</burstShotCount>
-								<soundCast>ShotMantoLauncher</soundCast>
-								<muzzleFlashScale>14</muzzleFlashScale>
-								<recoilAmount>1.47</recoilAmount>
-								<ignorePartialLoSBlocker>True</ignorePartialLoSBlocker>
-								<targetParams>
-									<canTargetLocations>True</canTargetLocations>
-								</targetParams>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>21</magazineSize>
-								<reloadTime>5.1</reloadTime>
-								<ammoSet>AmmoSet_MantoPoison</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>2</aimedBurstShotCount>
-								<aiAimMode>SuppressFire</aiAimMode>
-							</FireModes>
-							<!-- Disallow with Run And Gun -->
-							<AllowWithRunAndGun>false</AllowWithRunAndGun>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Mantodean Insectoid Race/ThingDefs_Races/AlienRace_Mantodean.xml b/Patches/Mantodean Insectoid Race/ThingDefs_Races/AlienRace_Mantodean.xml
deleted file mode 100644
index 4a5dd7ecce..0000000000
--- a/Patches/Mantodean Insectoid Race/ThingDefs_Races/AlienRace_Mantodean.xml	
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>The Mantodean insectoid race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="BaseMantoPawn"]/inspectorTabs/li[.="ITab_Pawn_Gear"]</xpath>
-							<value>
-								<li>CombatExtended.ITab_Inventory</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="BaseMantoPawn"]/comps</xpath>
-							<value>
-								<li Class="CombatExtended.CompProperties_Inventory" />
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="BaseMantoPawn"]/comps</xpath>
-							<value>
-								<li>
-									<compClass>CombatExtended.CompPawnGizmo</compClass>
-								</li>
-								<li Class="CombatExtended.CompProperties_Suppressable" />
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Mantodean"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Humanoid</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Mantodean"]/statBases</xpath>
-							<value>
-								<ArmorRating_Sharp>1</ArmorRating_Sharp>
-								<ArmorRating_Blunt>1</ArmorRating_Blunt>
-								<MeleeDodgeChance>0.7</MeleeDodgeChance>
-								<MeleeCritChance>1.28</MeleeCritChance>
-								<MeleeParryChance>1</MeleeParryChance>
-								<Suppressability>0.4</Suppressability>
-								<CarryBulk>30</CarryBulk>
-								<SmokeSensitivity>0.5</SmokeSensitivity>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Mantodean"]/race/baseHealthScale</xpath>
-							<value>
-								<baseHealthScale>1.3</baseHealthScale>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Mantodean"]/race/baseBodySize</xpath>
-							<value>
-								<baseBodySize>1.3</baseBodySize>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Mantodean"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left pincer</label>
-										<capacities>
-											<li>Cut</li>
-											<li>ToxicBite</li>
-										</capacities>
-										<power>16</power>
-										<cooldownTime>1.68</cooldownTime>
-										<linkedBodyPartsGroup>Leftpincer</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-										<armorPenetrationSharp>3</armorPenetrationSharp>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>right pincer</label>
-										<capacities>
-											<li>Cut</li>
-											<li>ToxicBite</li>
-										</capacities>
-										<power>16</power>
-										<cooldownTime>1.68</cooldownTime>
-										<linkedBodyPartsGroup>Rightpincer</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-										<armorPenetrationSharp>3</armorPenetrationSharp>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>jaw</label>
-										<capacities>
-											<li>Bite</li>
-										</capacities>
-										<power>28</power>
-										<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-										<cooldownTime>3.17</cooldownTime>
-										<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>20</armorPenetrationBlunt>
-										<armorPenetrationSharp>7</armorPenetrationSharp>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>jaw</label>
-										<capacities>
-											<li>ToxicBite</li>
-										</capacities>
-										<power>20</power>
-										<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-										<cooldownTime>3.17</cooldownTime>
-										<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>20</armorPenetrationBlunt>
-										<armorPenetrationSharp>10</armorPenetrationSharp>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>3</power>
-										<cooldownTime>4.49</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<chanceFactor>0.1</chanceFactor>
-										<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Marilyn the Mincho Worshipper Witch/Hediffs/Hediffs_Biofilm.xml b/Patches/Marilyn the Mincho Worshipper Witch/Hediffs/Hediffs_Biofilm.xml
deleted file mode 100644
index 140d03f5e6..0000000000
--- a/Patches/Marilyn the Mincho Worshipper Witch/Hediffs/Hediffs_Biofilm.xml	
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Marilyn the Mincho Worshipper Witch</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!--Simmilar to Armorskin but less blunt-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="MinchoWitch_MintchocoBiofilm"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="MinchoWitch_MintchocoBiofilm"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.25</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Marilyn the Mincho Worshipper Witch/Scenario/Minchowitch_Scenario.xml b/Patches/Marilyn the Mincho Worshipper Witch/Scenario/Minchowitch_Scenario.xml
deleted file mode 100644
index 149fa875b8..0000000000
--- a/Patches/Marilyn the Mincho Worshipper Witch/Scenario/Minchowitch_Scenario.xml	
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Marilyn the Mincho Worshipper Witch</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ScenarioDef[defName="MinchoWithch_Scenario"]/scenario/parts</xpath>
-							<value>
-								<li Class="ScenPart_StartingThing_Defined">
-									<def>StartingThing_Defined</def>
-									<thingDef>Ammo_303British_FMJ</thingDef>
-									<count>100</count>
-								</li>
-								<li Class="ScenPart_StartingThing_Defined">
-									<def>StartingThing_Defined</def>
-									<thingDef>Ammo_44Magnum_FMJ</thingDef>
-									<count>60</count>
-								</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Marilyn the Mincho Worshipper Witch/ThingDefs_Bodies/MinchoWitch_Bodytype.xml b/Patches/Marilyn the Mincho Worshipper Witch/ThingDefs_Bodies/MinchoWitch_Bodytype.xml
deleted file mode 100644
index 87dd2cc954..0000000000
--- a/Patches/Marilyn the Mincho Worshipper Witch/ThingDefs_Bodies/MinchoWitch_Bodytype.xml	
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Marilyn the Mincho Worshipper Witch</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Arm Groups-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="MinchoWitch"]//*[
-						customLabel="left shoulder"
-						]/groups
-					</xpath>
-					<value>
-						<li>LeftShoulder</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="MinchoWitch"]//*[
-						customLabel="right shoulder"
-						]/groups
-					</xpath>
-					<value>
-						<li>RightShoulder</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="MinchoWitch"]//*[
-						customLabel="left arm"
-						]/groups
-					</xpath>
-					<value>
-						<li>LeftArm</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="MinchoWitch"]//*[
-						customLabel="right arm"
-						]/groups
-					</xpath>
-					<value>
-						<li>RightArm</li>
-					</value>
-				</li>
-
-				<!--Natural Armor-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="MinchoWitch"]//*[
-						def="Torso" or
-						def="Neck" or
-						def="Head" or
-						def="Nose" or
-						def="Jaw" or
-						def="Shoulder" or
-						def="Arm" or
-						def="Hand" or
-						def="Finger" or
-						def="Waist" or
-						def="Leg" or
-						def="Foot" or
-						def="Toe"
-						]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Marilyn the Mincho Worshipper Witch/ThingDefs_Bodies/Mincho_Golem.xml b/Patches/Marilyn the Mincho Worshipper Witch/ThingDefs_Bodies/Mincho_Golem.xml
deleted file mode 100644
index 844e511fbe..0000000000
--- a/Patches/Marilyn the Mincho Worshipper Witch/ThingDefs_Bodies/Mincho_Golem.xml	
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Marilyn the Mincho Worshipper Witch</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Natural Armor-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="MinchoGolem"]//*[
-						def="Torso" or
-						def="MinchoGolem_Head" or
-						def="MinchoGolem_Shoulder" or
-						def="MinchoGolem_Arm" or
-						def="MinchoGolem_Hand" or
-						def="MinchoGolem_Waist" or
-						def="MinchoGolem_Leg" or
-						def="MinchoGolem_Foot" or
-						def="MinchoGolem_Hand"
-						]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Marilyn the Mincho Worshipper Witch/ThingDefs_Misc/Mincho_Apparel.xml b/Patches/Marilyn the Mincho Worshipper Witch/ThingDefs_Misc/Mincho_Apparel.xml
deleted file mode 100644
index 57e8e9c25e..0000000000
--- a/Patches/Marilyn the Mincho Worshipper Witch/ThingDefs_Misc/Mincho_Apparel.xml	
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Marilyn the Mincho Worshipper Witch</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="MinchoWitch_Hat" or
-								defName="MinchoWitch_Lingerie" or
-								defName="MinchoWitch_Robe"
-								]/statBases/ArmorRating_Sharp </xpath>
-							<value>
-								<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-								<WornBulk>0.5</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="MinchoWitch_Hat" or
-								defName="MinchoWitch_Lingerie" or
-								defName="MinchoWitch_Robe"
-								]/statBases/ArmorRating_Blunt </xpath>
-							<value>
-								<ArmorRating_Blunt>0.08</ArmorRating_Blunt>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Marilyn the Mincho Worshipper Witch/ThingDefs_Races/Race_Golem.xml b/Patches/Marilyn the Mincho Worshipper Witch/ThingDefs_Races/Race_Golem.xml
deleted file mode 100644
index 206dd01a00..0000000000
--- a/Patches/Marilyn the Mincho Worshipper Witch/ThingDefs_Races/Race_Golem.xml	
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Marilyn the Mincho Worshipper Witch</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[defName="MinchoWitch_MinchoGolem"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Humanoid</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="MinchoWitch_MinchoGolem"]/statBases</xpath>
-							<value>
-								<!--Innate immunity to toxic fallout, high immunity gain rate-->
-								<SmokeSensitivity>0</SmokeSensitivity>
-								<MeleeDodgeChance>1</MeleeDodgeChance>
-								<MeleeCritChance>2</MeleeCritChance>
-								<MeleeParryChance>1.5</MeleeParryChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="MinchoWitch_MinchoGolem"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>4</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="MinchoWitch_MinchoGolem"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>6</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="MinchoWitch_MinchoGolem"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>63</power>
-										<cooldownTime>1.38</cooldownTime>
-										<armorPenetrationBlunt>29.25</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>right fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>63</power>
-										<cooldownTime>1.38</cooldownTime>
-										<armorPenetrationBlunt>29.25</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>50</power>
-										<cooldownTime>2.11</cooldownTime>
-										<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationBlunt>22.5</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Marilyn the Mincho Worshipper Witch/ThingDefs_Races/Race_Witch.xml b/Patches/Marilyn the Mincho Worshipper Witch/ThingDefs_Races/Race_Witch.xml
deleted file mode 100644
index 1317e2fa94..0000000000
--- a/Patches/Marilyn the Mincho Worshipper Witch/ThingDefs_Races/Race_Witch.xml	
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Marilyn the Mincho Worshipper Witch</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/Garam_RaceAddon.RaceAddonThingDef[defName="MinchoWitch"]/comps</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/Garam_RaceAddon.RaceAddonThingDef[defName="MinchoWitch"]</xpath>
-								<value>
-									<comps />
-								</value>
-							</nomatch>
-							<match Class="PatchOperationAdd">
-								<xpath>Defs/Garam_RaceAddon.RaceAddonThingDef[defName="MinchoWitch"]</xpath>
-								<value>
-								</value>
-							</match>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/Garam_RaceAddon.RaceAddonThingDef[defName="MinchoWitch"]/comps</xpath>
-							<value>
-								<li>
-									<compClass>CombatExtended.CompPawnGizmo</compClass>
-								</li>
-								<li Class="CombatExtended.CompProperties_Suppressable" />
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/Garam_RaceAddon.RaceAddonThingDef[defName="MinchoWitch"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Humanoid</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/Garam_RaceAddon.RaceAddonThingDef[defName="MinchoWitch"]/statBases</xpath>
-							<value>
-								<Suppressability>1</Suppressability>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/Garam_RaceAddon.RaceAddonThingDef[defName="MinchoWitch"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>1.26</cooldownTime>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>right fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>1.26</cooldownTime>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>4.49</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Martens - Nature's Most Adorable Assassins/Marty_Extended.xml b/Patches/Martens - Nature's Most Adorable Assassins/Marty_Extended.xml
deleted file mode 100644
index 966cfd4ed3..0000000000
--- a/Patches/Martens - Nature's Most Adorable Assassins/Marty_Extended.xml	
+++ /dev/null
@@ -1,252 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Martens - Nature's Most Adorable Assassins</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Marts === -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[
-						defName="ZGF_BeechMart" or
-						defName="ZGF_JapaneseMart" or
-						defName="ZGF_NilgiriMart" or
-						defName="ZGF_PineMart" or
-						defName="ZGF_RimMart" or
-						defName="ZGF_Sable" or
-						defName="ZGF_Boommarten" or
-						defName="ZGF_YellowMart"] </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ZGF_MegaMart"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[
-						defName="ZGF_BeechMart" or
-						defName="ZGF_JapaneseMart" or
-						defName="ZGF_NilgiriMart" or
-						defName="ZGF_PineMart" or
-						defName="ZGF_RimMart" or
-						defName="ZGF_Sable" or
-						defName="ZGF_Boommarten" or
-						defName="ZGF_YellowMart"]/combatPower </xpath>
-					<value>
-						<combatPower>30</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="ZGF_MegaMart"]/combatPower</xpath>
-					<value>
-						<combatPower>180</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="ZGF_BeechMart" or
-						defName="ZGF_JapaneseMart" or
-						defName="ZGF_NilgiriMart" or
-						defName="ZGF_PineMart" or
-						defName="ZGF_RimMart" or
-						defName="ZGF_Sable" or
-						defName="ZGF_Boommarten" or
-						defName="ZGF_YellowMart"]/statBases/MeleeDodgeChance </xpath>
-					<value>
-						<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						<MeleeCritChance>0.03</MeleeCritChance>
-						<MeleeParryChance>0.02</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ZGF_MegaMart"]/statBases/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.27</MeleeDodgeChance>
-						<MeleeCritChance>0.5</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="ZGF_BeechMart" or
-						defName="ZGF_JapaneseMart" or
-						efName="ZGF_NilgiriMart" or
-						defName="ZGF_PineMart" or
-						defName="ZGF_Sable" or
-						defName="ZGF_RimMart" or
-						defName="ZGF_Boommarten"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.32</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.06</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.32</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.06</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.14</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ZGF_MegaMart"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Cut</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.18</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.66</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Cut</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.18</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.66</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-									<li>Stab</li>
-								</capacities>
-								<power>43</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Martens - Nature's Most Adorable Assassins/Marty_Resources.xml b/Patches/Martens - Nature's Most Adorable Assassins/Marty_Resources.xml
deleted file mode 100644
index 60300c69f1..0000000000
--- a/Patches/Martens - Nature's Most Adorable Assassins/Marty_Resources.xml	
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Martens - Nature's Most Adorable Assassins</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ZGF_Leather_BeechMartfur" or defName="ZGF_Leather_JapaneseMartfur" or defName="ZGF_Leather_NilgiriMartfur" or defName="ZGF_Leather_SableMartfur"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.036</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ZGF_Leather_BeechMartfur" or defName="ZGF_Leather_JapaneseMartfur" or defName="ZGF_Leather_NilgiriMartfur"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.024</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ZGF_Leather_SableMartfur"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.024</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ZGF_Leather_PineMartfur" or defName="ZGF_Leather_RimMartfur"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.05</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ZGF_Leather_PineMartfur" or defName="ZGF_Leather_RimMartfur"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.036</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ZGF_Leather_MegaMartfur" or defName="ZGF_Leather_YellowMartfur"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.08</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ZGF_Leather_MegaMartfur" or defName="ZGF_Leather_YellowMartfur"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.056</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ZGF_Leather_MegaMartfur"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ZGF_WoolMegamarten"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.036</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ZGF_WoolMegamarten"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.036</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ZGF_WoolMegamarten"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.03</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Mass Effect - Playable Geth/Ammo_ME.xml b/Patches/Mass Effect - Playable Geth/Ammo_ME.xml
deleted file mode 100644
index 7a8f7c7b83..0000000000
--- a/Patches/Mass Effect - Playable Geth/Ammo_ME.xml	
+++ /dev/null
@@ -1,435 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Mass Effect - Playable Geth</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingCategoryDef>
-							<defName>AmmoML77CE</defName>
-							<label>ML-77 Missile</label>
-							<parent>AmmoRockets</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberRocket</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_GethRifle</defName>
-							<label>Geth Thermal Clip</label>
-							<ammoTypes>
-								<Ammo_MEG>Bullet_GethRifle</Ammo_MEG>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_GethSMG</defName>
-							<label>Geth Thermal Clip</label>
-							<ammoTypes>
-								<Ammo_MEG>Bullet_GethSMG</Ammo_MEG>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_GethShotgun</defName>
-							<label>Geth Thermal Clip</label>
-							<ammoTypes>
-								<Ammo_MEG>Bullet_GethShotgun</Ammo_MEG>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_M98_Geth</defName>
-							<label>Geth Thermal Clip</label>
-							<ammoTypes>
-								<Ammo_MEG>Bullet_M98_Geth</Ammo_MEG>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_GethSniper</defName>
-							<label>Geth Thermal Clip</label>
-							<ammoTypes>
-								<Ammo_MEG>Bullet_GethSniper</Ammo_MEG>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_GethSpitfire</defName>
-							<label>Geth Thermal Clip</label>
-							<ammoTypes>
-								<Ammo_MEG>Bullet_GethSpitfire</Ammo_MEG>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_ML77CE</defName>
-							<label>ML-77 Missile</label>
-							<ammoTypes>
-								<Ammo_ML77CE>Bullet_ML77CE</Ammo_ML77CE>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_MEG</defName>
-							<label>Geth Thermal clip</label>
-							<description>Thermal clips designed to fit most geth weapons. They are, however, incompatible with weapons made by other races.</description>
-							<statBases>
-								<Mass>0.01</Mass>
-								<Bulk>0.01</Bulk>
-								<MarketValue>0.24</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade_Sellable</li>
-								<li>CE_AutoEnableCrafting_FabricationBench</li>
-								<!-- Plasma ammo can't be handloaded, and the containment cell must be precision-machined anyway -->
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoPlasmaCellRifle</li>
-							</thingCategories>
-							<graphicData>
-								<texPath>ThirdParty/MassEffect/Heatsink</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>Plasma</ammoClass>
-						</ThingDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="RPG7GrenadeBase" ParentName="MediumAmmoBase" Abstract="True">
-							<description>Rocket-propelled missile designed for the ML-77. After being fired a rocket motor kicks in to propel the grenade further.</description>
-							<statBases>
-								<MaxHitPoints>150</MaxHitPoints>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade_Sellable</li>
-								<li>CE_AutoEnableCrafting_FabricationBench</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoML77CE</li>
-							</thingCategories>
-							<stackLimit>20</stackLimit>
-							<cookOffFlashScale>40</cookOffFlashScale>
-							<cookOffSound>MortarBomb_Explode</cookOffSound>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="RPG7GrenadeBase">
-							<defName>Ammo_ML77CE</defName>
-							<label>ML-77 Missile</label>
-							<graphicData>
-								<texPath>Things/Ammo/RPG/HEAT</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>49.78</MarketValue>
-								<Mass>2.25</Mass>
-								<Bulk>3.5</Bulk>
-							</statBases>
-							<ammoClass>RocketHEAT</ammoClass>
-							<detonateProjectile>Bullet_ML77CE</detonateProjectile>
-						</ThingDef>
-
-						<ThingCategoryDef>
-							<defName>AmmoGeth</defName>
-							<label>Geth thermal clip</label>
-							<parent>AmmoAdvanced</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberPlasmaMedium</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="BaseRPG7Grenade">
-							<defName>Bullet_ML77CE</defName>
-							<label>ML77 Missile</label>
-							<graphicData>
-								<texPath>Things/Projectile/Rocket/M72LAW</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>60</speed>
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>160</damageAmountBase>
-								<armorPenetrationSharp>300</armorPenetrationSharp>
-								<armorPenetrationBlunt>31.584</armorPenetrationBlunt>
-								<soundAmbient>RocketPropelledLoop_Small</soundAmbient>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>90</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>1.5</explosiveRadius>
-									<explosionSound>MortarBomb_Explode</explosionSound>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Large>5</Fragment_Large>
-										<Fragment_Small>33</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="Base6x24mmChargedBullet">
-							<defName>Bullet_GethRifle</defName>
-							<label>phasic slugs</label>
-							<graphicData>
-								<texPath>Projectile/PulseRifleProjectile</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>240</speed>
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>11</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>2</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>13</armorPenetrationSharp>
-								<armorPenetrationBlunt>21.8</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base6x24mmChargedBullet">
-							<defName>Bullet_GethSMG</defName>
-							<label>superconducting toroids</label>
-							<graphicData>
-								<texPath>Projectile/PulseRifleProjectile</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>180</speed>
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>8</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>2</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<armorPenetrationBlunt>15.8</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base6x24mmChargedBullet">
-							<defName>Bullet_GethShotgun</defName>
-							<label>superconducting projectiles</label>
-							<graphicData>
-								<texPath>Things/Projectile/Charged/ChargeShot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>160</speed>
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>22</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>4</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<armorPenetrationBlunt>18.8</armorPenetrationBlunt>
-								<pelletCount>3</pelletCount>
-								<spreadMult>17.8</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base6x24mmChargedBullet">
-							<defName>Bullet_M98_Geth</defName>
-							<label>bullet</label>
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_Big</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>480</speed>
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>70</damageAmountBase>
-								<armorPenetrationSharp>44</armorPenetrationSharp>
-								<armorPenetrationBlunt>734.8</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base6x24mmChargedBullet">
-							<defName>Bullet_GethSniper</defName>
-							<label>ferrofluid</label>
-							<graphicData>
-								<texPath>Projectile/JavelinProjectile</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>360</speed>
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>30</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>11</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>32</armorPenetrationSharp>
-								<armorPenetrationBlunt>48.8</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base6x24mmChargedBullet">
-							<defName>Bullet_GethSpitfire</defName>
-							<label>superconducting toroids</label>
-							<graphicData>
-								<texPath>Things/Projectile/Charged/ChargeShot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>200</speed>
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>13</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>3</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>16</armorPenetrationSharp>
-								<armorPenetrationBlunt>29.8</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseExplosiveBullet">
-							<defName>Bullet_GethCannon</defName>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<label>Geth pulse cannon plasma</label>
-							<graphicData>
-								<texPath>Projectile/ColossusProjectile</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>375</damageAmountBase>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0</armorPenetrationBlunt>
-								<speed>40</speed>
-								<flyOverhead>false</flyOverhead>
-								<explosionRadius>4</explosionRadius>
-								<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-								<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
-								<soundAmbient>MortarRound_Ambient</soundAmbient>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_MEG</defName>
-							<label>make Geth thermal clips</label>
-							<description>Craft 100 shots' worth of thermal clips.</description>
-							<jobString>Making thermal clips.</jobString>
-							<workAmount>5000</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>3</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Plasteel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_MEG>100</Ammo_MEG>
-							</products>
-							<researchPrerequisite>PlasmaSMGTechnology</researchPrerequisite>
-						</RecipeDef>
-
-						<!-- ==================== Recipes ML77========================== -->
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_ML77CE</defName>
-							<label>make ML77 rockets x2</label>
-							<description>Craft 2 ML77 rockets.</description>
-							<jobString>Making ML77 rockets.</jobString>
-							<workAmount>12000</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>100</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>6</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>FSX</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_ML77CE>2</Ammo_ML77CE>
-							</products>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Mass Effect - Playable Geth/Firestorm_M77_CE.xml b/Patches/Mass Effect - Playable Geth/Firestorm_M77_CE.xml
deleted file mode 100644
index ee978cb200..0000000000
--- a/Patches/Mass Effect - Playable Geth/Firestorm_M77_CE.xml	
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Mass Effect - Playable Geth</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== ML-77 Missile Launcher Rocket ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_ML77MissileLauncher</defName>
-					<statBases>
-						<Mass>7</Mass>
-						<RangedWeapon_Cooldown>0.72</RangedWeapon_Cooldown>
-						<SightsEfficiency>2</SightsEfficiency>
-						<ShotSpread>0.1</ShotSpread>
-						<SwayFactor>1.3</SwayFactor>
-						<Bulk>9</Bulk>
-						<WorkToMake>12500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>120</Steel>
-						<ComponentSpacer>2</ComponentSpacer>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_ML77CE</defaultProjectile>
-						<warmupTime>2</warmupTime>
-						<range>50</range>
-						<minRange>5</minRange>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<soundCast>Shot_ML77</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>4.8</reloadTime>
-						<ammoSet>AmmoSet_ML77CE</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>ML77MissileLauncher</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Fire Storm ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Firestorm</defName>
-					<statBases>
-						<Mass>4</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.3</SwayFactor>
-						<Bulk>7.03</Bulk>
-						<WorkToMake>12500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>100</Steel>
-						<ComponentSpacer>2</ComponentSpacer>
-					</costList>
-					<Properties>
-						<recoilAmount>0.6</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Flamethrower_Napalm</defaultProjectile>
-						<warmupTime>0.75</warmupTime>
-						<range>14</range>
-						<minRange>2</minRange>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<burstShotCount>20</burstShotCount>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<soundCast>Shot_Firestorm</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>0</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>60</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_Flamethrower</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>10</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>GethFirestorm</li>
-					</weaponTags>
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Gun_ML77MissileLauncher" or
-						defName="Gun_Firestorm"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Mass Effect - Playable Geth/Geth_Bodies_CE.xml b/Patches/Mass Effect - Playable Geth/Geth_Bodies_CE.xml
deleted file mode 100644
index 730b2ffedf..0000000000
--- a/Patches/Mass Effect - Playable Geth/Geth_Bodies_CE.xml	
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Mass Effect - Playable Geth</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Shoulder & Arm Groups -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Geth"]//*[customLabel="right shoulder"]/groups</xpath>
-					<value>
-						<li>RightShoulder</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Geth"]//*[customLabel="left shoulder"]/groups</xpath>
-					<value>
-						<li>LeftShoulder</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Geth"]//*[customLabel="right arm"]/groups</xpath>
-					<value>
-						<li>RightArm</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Geth"]//*[customLabel="left arm"]/groups</xpath>
-					<value>
-						<li>LeftArm</li>
-					</value>
-				</li>
-
-				<!-- Natural Armor -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Geth"]//*[
-						def="GethTorso" or
-						def="GethShoulder" or
-						def="GethHead" or
-						def="GethLeg"
-						]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Geth"]//*[def="GethVisualReceptor" or
-						def="GethSpeaker"]/groups
-					</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Mass Effect - Playable Geth/Geth_Traits.xml b/Patches/Mass Effect - Playable Geth/Geth_Traits.xml
deleted file mode 100644
index b19e4649a8..0000000000
--- a/Patches/Mass Effect - Playable Geth/Geth_Traits.xml	
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Mass Effect - Playable Geth</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/TraitDef[defName="GethNimble"]/degreeDatas/li/statFactors/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>2</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/TraitDef[defName="GethAimAccuracy"]/degreeDatas/li/statOffsets/ShootingAccuracyPawn</xpath>
-							<value>
-								<ShootingAccuracyPawn>0.2</ShootingAccuracyPawn>
-								<AimingAccuracy>0.5</AimingAccuracy>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/TraitDef[defName="GethReinforcedStructure"]/degreeDatas/li/statFactors</xpath>
-							<value>
-								<statOffsets>
-									<ArmorRating_Sharp>3</ArmorRating_Sharp>
-									<ArmorRating_Blunt>4.5</ArmorRating_Blunt>
-								</statOffsets>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/TraitDef[defName="GethSlowSpeed"]/degreeDatas/li/statOffsets</xpath>
-							<value>
-								<ArmorRating_Sharp>2</ArmorRating_Sharp>
-								<ArmorRating_Blunt>3</ArmorRating_Blunt>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Mass Effect - Playable Geth/Geth_Weapons_CE.xml b/Patches/Mass Effect - Playable Geth/Geth_Weapons_CE.xml
deleted file mode 100644
index 7ae69536c5..0000000000
--- a/Patches/Mass Effect - Playable Geth/Geth_Weapons_CE.xml	
+++ /dev/null
@@ -1,473 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Mass Effect - Playable Geth</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Widow ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_M98Widow</defName>
-					<statBases>
-						<Mass>12</Mass>
-						<RangedWeapon_Cooldown>0.64</RangedWeapon_Cooldown>
-						<SightsEfficiency>3.5</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.88</SwayFactor>
-						<Bulk>16.80</Bulk>
-						<WorkToMake>12500</WorkToMake>
-					</statBases>
-					<costList>
-						<Plasteel>80</Plasteel>
-						<ComponentSpacer>2</ComponentSpacer>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_M98_Geth</defaultProjectile>
-						<warmupTime>2</warmupTime>
-						<range>88</range>
-						<ammoConsumedPerShotCount>10</ammoConsumedPerShotCount>
-						<soundCast>Shot_M98Widow</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>1.5</reloadTime>
-						<ammoSet>AmmoSet_M98_Geth</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>GethM98Widow</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Geth Javelin ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_GethJavelin</defName>
-					<statBases>
-						<Mass>3</Mass>
-						<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.8</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.62</SwayFactor>
-						<Bulk>10.60</Bulk>
-						<WorkToMake>12500</WorkToMake>
-					</statBases>
-					<costList>
-						<Plasteel>60</Plasteel>
-						<ComponentSpacer>2</ComponentSpacer>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_GethSniper</defaultProjectile>
-						<warmupTime>1.45</warmupTime>
-						<range>83</range>
-						<ammoConsumedPerShotCount>5</ammoConsumedPerShotCount>
-						<soundCast>Shot_Javelin</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>1.1</reloadTime>
-						<ammoSet>AmmoSet_GethSniper</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>GethJavelin</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Gun_GethJavelin"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.18,1.12</DrawSize>
-							<DrawOffset>0.0,0.0</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Geth ShotGun ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_GethPlasmaShotgun</defName>
-					<statBases>
-						<Mass>2.4</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.18</SwayFactor>
-						<Bulk>7.20</Bulk>
-						<WorkToMake>12500</WorkToMake>
-					</statBases>
-					<costList>
-						<Plasteel>50</Plasteel>
-						<ComponentSpacer>2</ComponentSpacer>
-					</costList>
-					<Properties>
-						<recoilAmount>2.18</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_GethShotgun</defaultProjectile>
-						<warmupTime>0.7</warmupTime>
-						<range>18</range>
-						<burstShotCount>2</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
-						<soundCast>Shot_PlasmaShotgun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_GethShotgun</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>GethPlasmaShotgun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Geth Pulse Rifle ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_GethPulseRifle</defName>
-					<statBases>
-						<Mass>2.6</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>8.03</Bulk>
-						<WorkToMake>12500</WorkToMake>
-					</statBases>
-					<costList>
-						<Plasteel>40</Plasteel>
-						<ComponentSpacer>2</ComponentSpacer>
-					</costList>
-					<Properties>
-						<recoilAmount>0.9</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_GethRifle</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>52</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>Shot_PulseRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>3</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>80</magazineSize>
-						<reloadTime>5.9</reloadTime>
-						<ammoSet>AmmoSet_GethRifle</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>GethPulseRifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Geth Pulse SMG ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_GethPlasmaSMG</defName>
-					<statBases>
-						<Mass>1.6</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.95</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.14</SwayFactor>
-						<Bulk>3.5</Bulk>
-						<WorkToMake>12000</WorkToMake>
-					</statBases>
-					<costList>
-						<Plasteel>30</Plasteel>
-						<ComponentSpacer>1</ComponentSpacer>
-					</costList>
-					<Properties>
-						<recoilAmount>0.8</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_GethSMG</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>25</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>Shot_PlasmaSMG</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>3</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>80</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_GethSMG</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>GethPlasmaSMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Geth Spitfire ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_GethSpitfire</defName>
-					<statBases>
-						<Mass>18</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.56</SwayFactor>
-						<Bulk>22.03</Bulk>
-						<WorkToMake>70000</WorkToMake>
-					</statBases>
-					<costList>
-						<Plasteel>150</Plasteel>
-						<ComponentSpacer>4</ComponentSpacer>
-					</costList>
-					<Properties>
-						<recoilAmount>0.88</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_GethSpitfire</defaultProjectile>
-						<warmupTime>1.35</warmupTime>
-						<range>62</range>
-						<minRange>1.5</minRange>
-						<burstShotCount>40</burstShotCount>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<soundCast>Shot_Spitfire</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>220</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_GethSpitfire</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>20</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>GethSpitfire</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Gun_GethSpitfire"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.18,1.12</DrawSize>
-							<DrawOffset>0.0,0.0</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Seige Pulse Assault Cannon ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SiegePulseCannon</defName>
-					<statBases>
-						<Mass>15</Mass>
-						<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1.47</SwayFactor>
-						<Bulk>20.03</Bulk>
-						<WorkToMake>50000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_GethCannon</defaultProjectile>
-						<warmupTime>3.2</warmupTime>
-						<minRange>2.5</minRange>
-						<range>78</range>
-						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-						<soundCast>Shot_Colossus</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>6.8</reloadTime>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>SiegePulseAssaultCannon</li>
-					</weaponTags>
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Gun_GethJavelin" or
-						defName="Gun_GethPlasmaShotgun" or
-						defName="Gun_GethSpitfire" or
-						defName="Gun_M98Widow" or
-						defName="Gun_GethPulseRifle"
-						]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Gun_GethPlasmaSMG"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.35</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>2</power>
-								<cooldownTime>1.25</cooldownTime>
-								<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.35</cooldownTime>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Gun_SiegePulseCannon"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>leg</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>43</power>
-								<cooldownTime>2.8</cooldownTime>
-								<armorPenetrationBlunt>46</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Mass Effect - Playable Geth/PawnKinds_Geth_CE.xml b/Patches/Mass Effect - Playable Geth/PawnKinds_Geth_CE.xml
deleted file mode 100644
index c4d5e73f56..0000000000
--- a/Patches/Mass Effect - Playable Geth/PawnKinds_Geth_CE.xml	
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Mass Effect - Playable Geth</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[
-								defName="BaseTraderGeth" or
-								defName="GethTrooper" or
-								defName="GethHunter" or
-								defName="GethHeretic" or
-								defName="GethHereticTrooper" or
-								defName="GethHereticHunter" or
-								defName="GethHereticPyro" or
-								defName="GethPyro"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>1</min>
-										<max>3</max>
-									</primaryMagazineCount>
-									<sidearms>
-										<li>
-											<generateChance>0.33</generateChance>
-											<sidearmMoney>
-												<min>20</min>
-												<max>120</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_Sidearm_Melee</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[
-								defName="GethPrime" or
-								defName="GethHereticPrime"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>3</max>
-									</primaryMagazineCount>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[
-								defName="GethInfiltrator" or
-								defName="GethHereticInfiltrator"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>12</min>
-										<max>20</max>
-									</primaryMagazineCount>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[
-								defName="BaseLegion"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>9</min>
-										<max>16</max>
-									</primaryMagazineCount>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[
-								defName="GethRocketTrooper" or
-								defName="GethHereticRocketTrooper"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>4</min>
-										<max>7</max>
-									</primaryMagazineCount>
-								</li>
-							</value>
-						</li>
-
-						<!-- ======= Combat Power ======= -->
-
-						<!-- Trooper -->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/PawnKindDef[
-								defName="BaseTraderGeth" or
-								defName="GethTrooper" or
-								defName="GethHereticTrooper" or
-								defName="GethHunter" or
-								defName="GethHereticHunter"
-								]/combatPower </xpath>
-							<value>
-								<combatPower>180</combatPower>
-							</value>
-						</li>
-
-						<!-- Infiltrator -->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/PawnKindDef[
-								defName="GethInfiltrator" or
-								defName="GethHereticInfiltrator"
-								]/combatPower </xpath>
-							<value>
-								<combatPower>200</combatPower>
-							</value>
-						</li>
-
-						<!-- Special -->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/PawnKindDef[
-								defName="GethHereticPyro" or
-								defName="GethPyro" or
-								defName="GethRocketTrooper" or
-								defName="GethHereticRocketTrooper"
-								]/combatPower </xpath>
-							<value>
-								<combatPower>200</combatPower>
-							</value>
-						</li>
-
-						<!-- Prime -->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/PawnKindDef[
-								defName="GethPrime" or
-								defName="BaseLegion" or
-								defName="GethHereticPrime"
-								]/combatPower </xpath>
-							<value>
-								<combatPower>300</combatPower>
-							</value>
-						</li>
-
-						<!-- Defender Series -->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/PawnKindDef[
-								defName="BaseGethColossus" or
-								defName="BaseGethColossusHeretic"
-								]/combatPower </xpath>
-							<value>
-								<combatPower>500</combatPower>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Mass Effect - Playable Geth/Races_Geth_CE_.xml b/Patches/Mass Effect - Playable Geth/Races_Geth_CE_.xml
deleted file mode 100644
index b41c0fcf77..0000000000
--- a/Patches/Mass Effect - Playable Geth/Races_Geth_CE_.xml	
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Mass Effect - Playable Geth</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--Bodytype-->
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Geth" or defName="GethPrime"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Humanoid</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="GethColossus"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Birdlike</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="GethPrime"]</xpath>
-							<value>
-								<race>
-									<baseHealthScale>1.5</baseHealthScale>
-									<baseBodySize>1.33</baseBodySize>
-								</race>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="GethColossus"]/race/baseHealthScale</xpath>
-							<value>
-								<baseHealthScale>3.0</baseHealthScale>
-								<baseBodySize>2.5</baseBodySize>
-							</value>
-						</li>
-
-						<!--Geth-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Geth"]</xpath>
-							<value>
-								<statBases>
-									<CarryWeight>50</CarryWeight>
-									<CarryBulk>50</CarryBulk>
-									<MeleeDodgeChance>1</MeleeDodgeChance>
-									<MeleeCritChance>1</MeleeCritChance>
-									<MeleeParryChance>1</MeleeParryChance>
-									<SmokeSensitivity>0</SmokeSensitivity>
-									<Suppressability>0.4</Suppressability>
-									<ArmorRating_Blunt>9</ArmorRating_Blunt>
-									<ArmorRating_Sharp>4.5</ArmorRating_Sharp>
-								</statBases>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="BaseGeth"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>1.26</cooldownTime>
-										<linkedBodyPartsGroup>LeftArm</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>right fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>1.26</cooldownTime>
-										<linkedBodyPartsGroup>RightArm</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-									</li>
-
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>3</power>
-										<cooldownTime>3.05</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>1</armorPenetrationBlunt>
-										<chanceFactor>0.1</chanceFactor>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<!--Colossus-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="GethColossus"]/statBases</xpath>
-							<value>
-								<statBases>
-									<GethLinkRepeater>2</GethLinkRepeater>
-									<MeleeDodgeChance>0.5</MeleeDodgeChance>
-									<MeleeCritChance>0.78</MeleeCritChance>
-									<MeleeParryChance>0.5</MeleeParryChance>
-									<ArmorRating_Blunt>42</ArmorRating_Blunt>
-									<ArmorRating_Sharp>20</ArmorRating_Sharp>
-									<Suppressability>0</Suppressability>
-								</statBases>
-							</value>
-						</li>
-
-						<!--Base melee is exceptionally strong. -->
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="GethColossus"]</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>Smash</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>45</power>
-										<cooldownTime>3.8</cooldownTime>
-										<linkedBodyPartsGroup>LeftArm</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>78.625</armorPenetrationBlunt>
-									</li>
-
-									<li Class="CombatExtended.ToolCE">
-										<label>Smash</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>45</power>
-										<cooldownTime>3.8</cooldownTime>
-										<linkedBodyPartsGroup>RightArm</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>78.625</armorPenetrationBlunt>
-									</li>
-
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>24</power>
-										<cooldownTime>2.05</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>43</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<!--GethPrime-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="GethPrime"]/statBases</xpath>
-							<value>
-								<statBases>
-									<CarryWeight>100</CarryWeight>
-									<CarryBulk>60</CarryBulk>
-									<GethLinkRepeater>1</GethLinkRepeater>
-									<MeleeDodgeChance>1</MeleeDodgeChance>
-									<MeleeCritChance>1.1</MeleeCritChance>
-									<MeleeParryChance>1.1</MeleeParryChance>
-									<SmokeSensitivity>0.0</SmokeSensitivity>
-									<Suppressability>0.2</Suppressability>
-									<ArmorRating_Blunt>18</ArmorRating_Blunt>
-									<ArmorRating_Sharp>10</ArmorRating_Sharp>
-								</statBases>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="GethPrime"]</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>Smash</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>18</power>
-										<cooldownTime>1.56</cooldownTime>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>16.625</armorPenetrationBlunt>
-									</li>
-
-									<li Class="CombatExtended.ToolCE">
-										<label>Smash</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>18</power>
-										<cooldownTime>1.56</cooldownTime>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>16.625</armorPenetrationBlunt>
-									</li>
-
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>10</power>
-										<cooldownTime>3.05</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>10</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Geth"]</xpath>
-							<value>
-								<comps>
-									<li>
-										<compClass>CombatExtended.CompPawnGizmo</compClass>
-									</li>
-									<li Class="CombatExtended.CompProperties_Suppressable" />
-								</comps>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="GethPrime"]</xpath>
-							<value>
-								<comps>
-									<li>
-										<compClass>CombatExtended.CompPawnGizmo</compClass>
-									</li>
-									<li Class="CombatExtended.CompProperties_Suppressable" />
-								</comps>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Matter Manipulator/MatterManipulator.xml b/Patches/Matter Manipulator/MatterManipulator.xml
deleted file mode 100644
index 517be2d8d7..0000000000
--- a/Patches/Matter Manipulator/MatterManipulator.xml	
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Matter Manipulator</li>
-		</mods>
-		<match Class="PatchOperationReplace">
-			<xpath>Defs/ThingDef[defName="Matter_Manipulator_Archotech" or
-				defName="Matter_Manipulator_Standard" or
-				defName="Matter_Manipulator_Prototype"]/tools </xpath>
-			<value>
-				<tools>
-					<li Class="CombatExtended.ToolCE">
-						<label>grip</label>
-						<capacities>
-							<li>Blunt</li>
-						</capacities>
-						<power>2</power>
-						<cooldownTime>1.54</cooldownTime>
-						<chanceFactor>1.5</chanceFactor>
-						<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-						<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-					</li>
-					<li Class="CombatExtended.ToolCE">
-						<label>muzzle</label>
-						<capacities>
-							<li>Poke</li>
-						</capacities>
-						<power>2</power>
-						<cooldownTime>1.54</cooldownTime>
-						<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-						<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-					</li>
-				</tools>
-			</value>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Mechanized Armor Set/Ammo_&_Apparel_Defs.xml b/Patches/Mechanized Armor Set/Ammo_&_Apparel_Defs.xml
deleted file mode 100644
index 272f6065a0..0000000000
--- a/Patches/Mechanized Armor Set/Ammo_&_Apparel_Defs.xml	
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Mechanized Armor Set</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Plate Helm-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Mechanized_Helm_Apparel"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mechanized_Helm_Apparel"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>3.5</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mechanized_Helm_Apparel"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>5.2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Mechanized_Helm_Apparel"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-0.8</SmokeSensitivity>
-					</value>
-				</li>
-
-				<!--Plate Armour-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Mechanized_Plate_Apparel"]/statBases</xpath>
-					<value>
-						<Bulk>90</Bulk>
-						<WornBulk>12</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mechanized_Plate_Apparel"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>7.2</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mechanized_Plate_Apparel"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>10.8</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Mechanized_Plate_Apparel"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Mechanized_Plate_Apparel"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>12</CarryWeight>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Mechanized_Plate_Apparel"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!--Musket-->
-				<!--Tools-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mechanized_Musket"]/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>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2.0</cooldownTime>
-								<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Bayonet</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>2.6</cooldownTime>
-								<armorPenetrationSharp>4.755</armorPenetrationSharp>
-								<armorPenetrationBlunt>6.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!--Shooting-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Mechanized_Musket</defName>
-					<statBases>
-						<Mass>1.25</Mass>
-						<Bulk>3.90</Bulk>
-						<SwayFactor>1.02</SwayFactor>
-						<ShotSpread>0.36</ShotSpread>
-						<SightsEfficiency>0.9</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_FastMusketBall</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>26</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>4</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>10</reloadTime>
-						<ammoSet>AmmoSet_FastMusketBall</ammoSet>
-						<reloadOneAtATime>true</reloadOneAtATime>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Mechanized_Musket"]/weaponTags</xpath>
-					<value>
-						<li>NoSwitch</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Mechanoid Bench 2 JGH/Apparel_MB2.xml b/Patches/Mechanoid Bench 2 JGH/Apparel_MB2.xml
deleted file mode 100644
index c39070c9a2..0000000000
--- a/Patches/Mechanoid Bench 2 JGH/Apparel_MB2.xml	
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Mechanoid Bench 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ===== Mecha Power Armor ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>16</WornBulk>
-						<MaxHitPoints>1000</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>47</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="ApparelMBBase"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>90</CarryWeight>
-							<CarryBulk>13.5</CarryBulk>
-							<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-							<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaArmor"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>100</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>22</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>50</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="ApparelMBBase"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<!-- == Increase Mecha Armor Cost == -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaArmor"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>210</Plasteel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaArmor"]/costList/Uranium</xpath>
-					<value>
-						<Uranium>70</Uranium>
-					</value>
-				</li>
-
-				<!-- ===== Mecha Power Helmet ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<MaxHitPoints>280</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaHelmet"]/statBases/Mass</xpath>
-					<value>
-						<Mass>2.5</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Apparel_MechaHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaHelmet"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>0.20</AimingAccuracy>
-							<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-							<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaHelmet"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>40</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>38</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="ApparelMBHelmetBase"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Mechanoid Bench 2 JGH/Hediff_MB2.xml b/Patches/Mechanoid Bench 2 JGH/Hediff_MB2.xml
deleted file mode 100644
index 0c40da7e01..0000000000
--- a/Patches/Mechanoid Bench 2 JGH/Hediff_MB2.xml	
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Mechanoid Bench 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-
-			<operations>
-
-				<!-- ===== Mecha Bionic Lens ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="JGH_MechaBionicEye"]/stages/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<AimingAccuracy>0.2</AimingAccuracy>
-							<NightVisionEfficiency_Implant>0.4</NightVisionEfficiency_Implant>
-						</statOffsets>
-					</value>
-				</li>
-
-				<!-- ===== Mecha Bionic Ear ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="JGH_MechaBionicEar"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.05</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<!-- ===== Mecha Bionic Spine ===== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="JGH_MechaBionicSpine"]/stages/li/statOffsets</xpath>
-					<value>
-						<CarryWeight>20</CarryWeight>
-					</value>
-				</li>
-
-				<!-- ===== Mecha Bionic Arm ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="JGH_MechaBionicArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.11</cooldownTime>
-								<armorPenetrationBlunt>1.868</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Mechanoid Bench 2 JGH/Weapons_MB2.xml b/Patches/Mechanoid Bench 2 JGH/Weapons_MB2.xml
deleted file mode 100644
index 52adace14a..0000000000
--- a/Patches/Mechanoid Bench 2 JGH/Weapons_MB2.xml	
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Mechanoid Bench 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ===== Mechanoid Bench Weapon Tools ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Gun_MechaMinigun" or defName = "Gun_MechaSniperRifle"]/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>
-				</li>
-
-				<!-- ===== Mecha Minigun ===== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MechaMinigun</defName>
-					<statBases>
-						<WorkToMake>69500</WorkToMake>
-						<Mass>28.0</Mass>
-						<Bulk>26.5</Bulk>
-						<SwayFactor>1.35</SwayFactor>
-						<ShotSpread>0.10</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
-						<burstShotCount>50</burstShotCount>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<warmupTime>2.5</warmupTime>
-						<range>65</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilAmount>1.24</recoilAmount>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>500</magazineSize>
-						<reloadTime>9.2</reloadTime>
-						<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>20</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>GunHeavy</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ===== Mecha Sniper Rifle ===== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MechaSniperRifle</defName>
-					<statBases>
-						<WorkToMake>53500</WorkToMake>
-						<Mass>4.5</Mass>
-						<Bulk>11.0</Bulk>
-						<SwayFactor>1.9</SwayFactor>
-						<ShotSpread>0.05</ShotSpread>
-						<SightsEfficiency>2.6</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>77</range>
-						<soundCast>ChargeLance_Fire</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>SniperRifle</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Mechanoid Bench 3 JGH/Apparel_MB3.xml b/Patches/Mechanoid Bench 3 JGH/Apparel_MB3.xml
deleted file mode 100644
index 0c48aa8e43..0000000000
--- a/Patches/Mechanoid Bench 3 JGH/Apparel_MB3.xml	
+++ /dev/null
@@ -1,329 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Mechanoid Bench 3</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ===== Add Bodypart Groups and Layers ===== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="ApparelMBHelmetBase"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="ApparelMBBase"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<!-- ===== Add Costlist ===== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="ApparelMBHelmetBase"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>40</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="ApparelMBBase"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>100</DevilstrandCloth>
-					</value>
-				</li>
-
-				<!-- ===== Mecha Heavy Helmet ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaHeavyHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>1.5</WornBulk>
-						<MaxHitPoints>350</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaHeavyHelmet"]/statBases/Mass</xpath>
-					<value>
-						<Mass>3</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaHeavyHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Apparel_MechaHeavyHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaHeavyHelmet"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<AimingAccuracy>0.15</AimingAccuracy>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaHeavyHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>22</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaHeavyHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>48</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ===== Mecha Heavy Armor ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaHeavyArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<Bulk>115</Bulk>
-						<WornBulk>16</WornBulk>
-						<MaxHitPoints>1300</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaHeavyArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>55</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaHeavyArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<CarryWeight>95</CarryWeight>
-						<CarryBulk>12.2</CarryBulk>
-						<ShootingAccuracyPawn>0.10</ShootingAccuracyPawn>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaHeavyArmor"]/equippedStatOffsets/WorkSpeedGlobal</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaHeavyArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>28</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaHeavyArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>60</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ===== Mecha Combat Helmet ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaCombatHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<MaxHitPoints>280</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaCombatHelmet"]/statBases/Mass</xpath>
-					<value>
-						<Mass>2.5</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaCombatHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Apparel_MechaCombatHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaCombatHelmet"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<AimingAccuracy>0.20</AimingAccuracy>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaCombatHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaCombatHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>38</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ===== Mecha Combat Armor ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaCombatArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-						<MaxHitPoints>1000</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaCombatArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>47</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaCombatArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<CarryWeight>90</CarryWeight>
-						<CarryBulk>13.5</CarryBulk>
-						<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-						<MoveSpeed>0.1</MoveSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaCombatArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>22</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaCombatArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>50</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ===== Mecha Sniper Helmet ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaSniperHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<MaxHitPoints>280</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaSniperHelmet"]/statBases/Mass</xpath>
-					<value>
-						<Mass>2</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaSniperHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Apparel_MechaSniperHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaSniperHelmet"]/equippedStatOffsets/AimingDelayFactor</xpath>
-					<value>
-						<AimingAccuracy>0.25</AimingAccuracy>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-						<NightVisionEfficiency_Apparel>0.8</NightVisionEfficiency_Apparel>
-						<AimingDelayFactor>-0.1</AimingDelayFactor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaSniperHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaSniperHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>36</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ===== Mecha Sniper Armor ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaSniperArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<Bulk>95</Bulk>
-						<WornBulk>14</WornBulk>
-						<MaxHitPoints>800</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaSniperArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>45</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaSniperArmor"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<CarryWeight>85</CarryWeight>
-						<CarryBulk>12.5</CarryBulk>
-						<ShootingAccuracyPawn>0.4</ShootingAccuracyPawn>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-						<ReloadSpeed>0.2</ReloadSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaSniperArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MechaSniperArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>48</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Mechanoid Bench 3 JGH/Hediff_MB3.xml b/Patches/Mechanoid Bench 3 JGH/Hediff_MB3.xml
deleted file mode 100644
index dec9577893..0000000000
--- a/Patches/Mechanoid Bench 3 JGH/Hediff_MB3.xml	
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Mechanoid Bench 3</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-
-			<operations>
-
-				<!-- ===== Mecha Bionic Lens ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="JGH_MechaBionicEye"]/stages/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<AimingAccuracy>0.2</AimingAccuracy>
-							<NightVisionEfficiency_Implant>0.4</NightVisionEfficiency_Implant>
-						</statOffsets>
-					</value>
-				</li>
-
-				<!-- ===== Mecha Bionic Ear ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="JGH_MechaBionicEar"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.05</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<!-- ===== Mecha Bionic Spine ===== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="JGH_MechaBionicSpine"]/stages/li/statOffsets</xpath>
-					<value>
-						<CarryWeight>20</CarryWeight>
-					</value>
-				</li>
-
-				<!-- ===== Mecha Bionic Arm ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="JGH_MechaBionicArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.11</cooldownTime>
-								<armorPenetrationBlunt>4.868</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Mechanoid Bench 3 JGH/Reverse_Patch_MB3.xml b/Patches/Mechanoid Bench 3 JGH/Reverse_Patch_MB3.xml
deleted file mode 100644
index 9e97a0dc8b..0000000000
--- a/Patches/Mechanoid Bench 3 JGH/Reverse_Patch_MB3.xml	
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Mechanoid Bench 3</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Vanilla Mechanoid Weapon -->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Gun_InfernoCannon" or @Name="Gun_ChargeBlasterHeavyBase"]/destroyOnDrop</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Gun_InfernoCannon" or @Name="Gun_ChargeBlasterHeavyBase"]</xpath>
-						<value>
-							<destroyOnDrop>true</destroyOnDrop>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[@Name="Gun_ChargeBlasterHeavyBase"]/tradeability</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[@Name="Gun_ChargeBlasterHeavyBase"]</xpath>
-						<value>
-							<tradeability>None</tradeability>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[@Name="Gun_ChargeBlasterHeavyBase"]/tradeability</xpath>
-						<value>
-							<tradeability>None</tradeability>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Gun_InfernoCannon"]/tradeability</xpath>
-					<match Class="PatchOperationRemove">
-						<xpath>Defs/ThingDef[defName="Gun_InfernoCannon"]/tradeability</xpath>
-					</match>
-				</li>
-
-				<!-- Redundant RecipeDef -->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="MechanoidBench_Bench"]/recipes/li[7]</xpath>
-					<match Class="PatchOperationRemove">
-						<xpath>Defs/ThingDef[defName="MechanoidBench_Bench"]/recipes/li[7]</xpath>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="MechanoidBench_Bench"]/recipes/li[6]</xpath>
-					<match Class="PatchOperationRemove">
-						<xpath>Defs/ThingDef[defName="MechanoidBench_Bench"]/recipes/li[6]</xpath>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="MechanoidBench_Bench"]/recipes/li[5]</xpath>
-					<match Class="PatchOperationRemove">
-						<xpath>Defs/ThingDef[defName="MechanoidBench_Bench"]/recipes/li[5]</xpath>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/RecipeDef[defName="MechanoidBench_MakeChargeBlaster" or defName="MechanoidBench_MakeInfernoCannon" or defName="MechanoidBench_MakeNeedleGun"]</xpath>
-					<match Class="PatchOperationRemove">
-						<xpath>Defs/RecipeDef[defName="MechanoidBench_MakeChargeBlaster" or defName="MechanoidBench_MakeInfernoCannon" or defName="MechanoidBench_MakeNeedleGun"]</xpath>
-					</match>
-				</li>
-
-				<!-- Redundant ResearchProjectDef -->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/RecipeDef[defName="MechanoidBench_MakeChargeBlaster" or defName="MechanoidBench_MakeInfernoCannon" or defName="MechanoidBench_MakeNeedleGun"]/researchPrerequisite</xpath>
-					<match Class="PatchOperationRemove">
-						<xpath>Defs/RecipeDef[defName="MechanoidBench_MakeChargeBlaster" or defName="MechanoidBench_MakeInfernoCannon" or defName="MechanoidBench_MakeNeedleGun"]/researchPrerequisite</xpath>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ResearchProjectDef[defName="MechanoidBench_Research_Copy"]</xpath>
-					<match Class="PatchOperationRemove">
-						<xpath>Defs/ResearchProjectDef[defName="MechanoidBench_Research_Copy"]</xpath>
-					</match>
-				</li>
-
-				<!-- VFE-Mechanoid - Mech Weapon -->
-				<li Class="PatchOperationFindMod">
-					<mods>
-						<li>Vanilla Factions Expanded - Mechanoids</li>
-					</mods>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationConditional">
-								<xpath>Defs/ThingDef[defName="VFE_Gun_AdvancedChargeLance" or @Name="VFE_Gun_ChargeBlasterLightBase"]/destroyOnDrop</xpath>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/ThingDef[defName="VFE_Gun_AdvancedChargeLance" or @Name="VFE_Gun_ChargeBlasterLightBase"]</xpath>
-									<value>
-										<destroyOnDrop>true</destroyOnDrop>
-									</value>
-								</nomatch>
-								<match Class="PatchOperationReplace">
-									<xpath>Defs/ThingDef[defName="VFE_Gun_AdvancedChargeLance" or @Name="VFE_Gun_ChargeBlasterLightBase"]/destroyOnDrop</xpath>
-									<value>
-										<destroyOnDrop>true</destroyOnDrop>
-									</value>
-								</match>
-							</li>
-
-							<li Class="PatchOperationConditional">
-								<xpath>Defs/ThingDef[defName="VFE_Gun_AdvancedChargeLance" or @Name="VFE_Gun_ChargeBlasterLightBase"]/tradeability</xpath>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/ThingDef[defName="VFE_Gun_AdvancedChargeLance" or @Name="VFE_Gun_ChargeBlasterLightBase"]</xpath>
-									<value>
-										<tradeability>None</tradeability>
-									</value>
-								</nomatch>
-								<match Class="PatchOperationReplace">
-									<xpath>Defs/ThingDef[defName="VFE_Gun_AdvancedChargeLance" or @Name="VFE_Gun_ChargeBlasterLightBase"]/tradeability</xpath>
-									<value>
-										<tradeability>None</tradeability>
-									</value>
-								</match>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Mechanoid Bench 3 JGH/Weapons_MB3.xml b/Patches/Mechanoid Bench 3 JGH/Weapons_MB3.xml
deleted file mode 100644
index 1241e8522f..0000000000
--- a/Patches/Mechanoid Bench 3 JGH/Weapons_MB3.xml	
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Mechanoid Bench 3</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ===== Mechanoid Bench Weapon Tools ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Gun_MechaMinigun" or defName = "Gun_MechaSniperRifle" or defName = "Gun_MechaShotgun"]/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>
-				</li>
-
-				<!-- ===== Mecha Minigun ===== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MechaMinigun</defName>
-					<statBases>
-						<Mass>28.0</Mass>
-						<Bulk>26.5</Bulk>
-						<SwayFactor>1.35</SwayFactor>
-						<ShotSpread>0.10</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
-						<burstShotCount>50</burstShotCount>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<warmupTime>2.5</warmupTime>
-						<range>65</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-						<recoilAmount>1.24</recoilAmount>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>750</magazineSize>
-						<reloadTime>9.2</reloadTime>
-						<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>20</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>GunHeavy</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ===== Mecha Sniper Rifle ===== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MechaSniperRifle</defName>
-					<statBases>
-						<Mass>4.5</Mass>
-						<Bulk>11.0</Bulk>
-						<SwayFactor>1.9</SwayFactor>
-						<ShotSpread>0.05</ShotSpread>
-						<SightsEfficiency>2.6</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<NightVisionEfficiency_Weapon>0.4</NightVisionEfficiency_Weapon>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_8x50mmCharged</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>85</range>
-						<soundCast>ChargeLance_Fire</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_8x50mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>SniperRifle</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ===== Mecha Shotgun ===== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MechaShotgun</defName>
-					<statBases>
-						<Mass>3.45</Mass>
-						<Bulk>5</Bulk>
-						<SwayFactor>1.25</SwayFactor>
-						<ShotSpread>0.14</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_12GaugeCharged</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>22</range>
-						<soundCast>ChargeLance_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_12GaugeCharged</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Mechanoid Master Blaster/MechanoidMasterBlaster_CE_MPC_TE_Patch.xml b/Patches/Mechanoid Master Blaster/MechanoidMasterBlaster_CE_MPC_TE_Patch.xml
deleted file mode 100644
index 7610b75dfb..0000000000
--- a/Patches/Mechanoid Master Blaster/MechanoidMasterBlaster_CE_MPC_TE_Patch.xml	
+++ /dev/null
@@ -1,309 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-	<!-- Mod Support for Combat Extended -->
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Mechanoid Master Blaster (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Remove Explosive comp -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName = "MPC_MechanoidBlasterTurret" or
-						defName = "MPC_MechanoidLaserTurret" or
-						defName = "MPC_MechanoidShockwaveTurret" or
-						defName = "MPC_MechanoidDevastatorTurret" or
-						defName = "MPC_MechanoidMultiTurret" or
-						defName = "MPC_MechanoidTrinityTurret"
-						]/comps/li[@Class = "CompProperties_Explosive"] </xpath>
-				</li>
-
-				<!-- Replace vanilla thingClass -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "MPC_MechanoidBlasterTurret" or
-						defName = "MPC_MechanoidLaserTurret" or
-						defName = "MPC_MechanoidShockwaveTurret" or
-						defName = "MPC_MechanoidDevastatorTurret" or
-						defName = "MPC_MechanoidMultiTurret" or
-						defName = "MPC_MechanoidTrinityTurret"
-						]/thingClass </xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "MPC_MechanoidBlasterTurret" or
-						defName = "MPC_MechanoidLaserTurret" or
-						defName = "MPC_MechanoidShockwaveTurret" or
-						defName = "MPC_MechanoidDevastatorTurret" or
-						defName = "MPC_MechanoidMultiTurret" or
-						defName = "MPC_MechanoidTrinityTurret"
-						]/statBases/ShootingAccuracyTurret </xpath>
-					<value>
-						<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MechanoidBlasterTurret</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>0.5</SwayFactor>
-						<RangedWeapon_Cooldown>0.1</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.69</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_30x64mmFuel_Incendiary</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>52.4</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>12</burstShotCount>
-						<soundCast>MechanoidPoweredNitroRound</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>false</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-						<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_30x64mmFuel</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>10</aimedBurstShotCount>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MechanoidLaserTurret</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>0.35</SwayFactor>
-						<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.69</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_30x64mmFuel_Thermobaric</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>52.4</range>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<burstShotCount>6</burstShotCount>
-						<soundCast>MechanoidLaserPulse</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>false</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-						<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_30x64mmFuel</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MechanoidShockwaveTurret</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>0.75</SwayFactor>
-						<RangedWeapon_Cooldown>0.1</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.39</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_60x225mmGamma_Standard</defaultProjectile>
-						<warmupTime>0.1</warmupTime>
-						<range>52.4</range>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<burstShotCount>2</burstShotCount>
-						<soundCast>MechanoidEnergizedShot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-						<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_60x225mmGamma</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>1</aimedBurstShotCount>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MechanoidDevastatorTurret</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.73</SwayFactor>
-						<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.25</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
-						<warmupTime>1.8</warmupTime>
-						<range>55</range>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<burstShotCount>4</burstShotCount>
-						<soundCast>MechanoidBlizzard</soundCast>
-						<soundCastTail>MechanoidThermal</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>true</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>1</aimedBurstShotCount>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MechanoidMultiTurret</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>0.23</SwayFactor>
-						<RangedWeapon_Cooldown>0.9</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.25</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>55</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>30</burstShotCount>
-						<soundCast>MechanoidPhaserBeam</soundCast>
-						<soundCastTail>MechanoidShredder</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>180</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>true</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>24</aimedBurstShotCount>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MechanoidTrinityTurret</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>0.43</SwayFactor>
-						<RangedWeapon_Cooldown>1.8</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.45</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12x64mmCharged</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<burstShotCount>25</burstShotCount>
-						<soundCast>MechanoidShredder</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>2</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>150</magazineSize>
-						<reloadTime>8.8</reloadTime>
-						<ammoSet>AmmoSet_12x64mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>true</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>15</aimedBurstShotCount>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/MechanoidsExtraordinaire/BodyDefs/Bodies_Mechanoid_Chimera.xml b/Patches/MechanoidsExtraordinaire/BodyDefs/Bodies_Mechanoid_Chimera.xml
deleted file mode 100644
index cf6e23dd43..0000000000
--- a/Patches/MechanoidsExtraordinaire/BodyDefs/Bodies_Mechanoid_Chimera.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Mechanoids Extraordinaire</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== Add armor coverage ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "ChimeraME"]/corePart</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "ChimeraME"]/corePart/parts/li[def = "ExtensionPortME"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "ChimeraME"]/corePart/parts/li[def = "MechanicalChimeraTailME"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "ChimeraME"]/corePart/parts/li[def = "ExtensionPortME"]/parts/li[def = "WeaponHolderME"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "ChimeraME"]/corePart/parts/li[def = "MechanicalNeckME"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "ChimeraME"]/corePart/parts/li[def = "MechanicalNeckME"]/parts/li[def="MechanicalHeadME"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "ChimeraME"]/corePart/parts/li[def = "MechanicalLeg"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "ChimeraME"]/corePart/parts/li[def = "MechanicalLeg"]/parts/li[def = "MechanicalFoot"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/MechanoidsExtraordinaire/BodyDefs/Bodies_Mechanoid_Goliath.xml b/Patches/MechanoidsExtraordinaire/BodyDefs/Bodies_Mechanoid_Goliath.xml
deleted file mode 100644
index fde27f133d..0000000000
--- a/Patches/MechanoidsExtraordinaire/BodyDefs/Bodies_Mechanoid_Goliath.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Mechanoids Extraordinaire</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== Add armor coverage ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "GoliathME"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "GoliathME"]/corePart/parts/li[def = "MechanicalShoulder"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "GoliathME"]/corePart/parts/li[def = "MechanicalShoulder"]/parts/li[def = "MechanicalArm"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "GoliathME"]/corePart/parts/li[def = "MechanicalShoulder"]/parts/li[def = "MechanicalArm"]/parts/li[def = "MechanicalHand"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "GoliathME"]/corePart/parts/li[def = "MechanicalShoulder"]/parts/li[def = "MechanicalArm"]/parts/li[def = "MechanicalHand"]/parts/li[def = "MechanicalFinger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "GoliathME"]/corePart/parts/li[def = "MechanicalLeg"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "GoliathME"]/corePart/parts/li[def = "MechanicalLeg"]/parts/li[def = "MechanicalFoot"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/MechanoidsExtraordinaire/BodyDefs/Bodies_Mechanoid_Hound.xml b/Patches/MechanoidsExtraordinaire/BodyDefs/Bodies_Mechanoid_Hound.xml
deleted file mode 100644
index e378cf1a24..0000000000
--- a/Patches/MechanoidsExtraordinaire/BodyDefs/Bodies_Mechanoid_Hound.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Mechanoids Extraordinaire</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== Add armor coverage ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "HoundME"]/corePart</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "HoundME"]/corePart/parts/li[def = "ExtensionPortME"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "HoundME"]/corePart/parts/li[def = "ExtensionPortME"]/parts/li[def = "WeaponHolderME"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "HoundME"]/corePart/parts/li[def = "MechanicalNeck"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "HoundME"]/corePart/parts/li[def = "MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "HoundME"]/corePart/parts/li[def = "MechanicalLegME"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "HoundME"]/corePart/parts/li[def = "MechanicalLegME"]/parts/li[def = "MechanicalPawME"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/MechanoidsExtraordinaire/BodyDefs/Bodies_Mechanoid_Kraken.xml b/Patches/MechanoidsExtraordinaire/BodyDefs/Bodies_Mechanoid_Kraken.xml
deleted file mode 100644
index 7fdabc9b96..0000000000
--- a/Patches/MechanoidsExtraordinaire/BodyDefs/Bodies_Mechanoid_Kraken.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Mechanoids Extraordinaire</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== Add armor coverage ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "KrakenME"]/corePart</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "KrakenME"]/corePart/parts/li[def = "MechanicalHeadME"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "KrakenME"]/corePart/parts/li[def = "LimbPortME"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "KrakenME"]/corePart/parts/li[def = "LimbPortME"]/parts/li[def = "MechaTentacleME"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/MechanoidsExtraordinaire/BodyDefs/Bodies_Mechanoid_Vespa.xml b/Patches/MechanoidsExtraordinaire/BodyDefs/Bodies_Mechanoid_Vespa.xml
deleted file mode 100644
index b8c28f79f9..0000000000
--- a/Patches/MechanoidsExtraordinaire/BodyDefs/Bodies_Mechanoid_Vespa.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Mechanoids Extraordinaire</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== Add armor coverage ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "VespaME"]/corePart</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "VespaME"]/corePart/parts/li[def = "MechanicalNeck"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "VespaME"]/corePart/parts/li[def = "MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "VespaME"]/corePart/parts/li[def = "MechanicalShoulder"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "VespaME"]/corePart/parts/li[def = "MechanicalShoulder"]/parts/li[def = "MechanicalArm"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "VespaME"]/corePart/parts/li[def = "MechanicalShoulder"]/parts/li[def = "MechanicalArm"]/parts/li[def = "MechanicalHand"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "VespaME"]/corePart/parts/li[def = "MechanicalLeg"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "VespaME"]/corePart/parts/li[def = "MechanicalLeg"]/parts/li[def = "MechanicalFoot"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/MechanoidsExtraordinaire/HediffDefs/Hediffs_Local_AddedParts_MechanoidsExtraordinaire.xml b/Patches/MechanoidsExtraordinaire/HediffDefs/Hediffs_Local_AddedParts_MechanoidsExtraordinaire.xml
deleted file mode 100644
index f4fea4883d..0000000000
--- a/Patches/MechanoidsExtraordinaire/HediffDefs/Hediffs_Local_AddedParts_MechanoidsExtraordinaire.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Mechanoids Extraordinaire</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="MechaTentacleME"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<cooldownTime>1.2</cooldownTime>
-								<power>13</power>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<armorPenetrationBlunt>4.00</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/MechanoidsExtraordinaire/PawnKindDefs/PawnKinds_MechanoidsExtraordinaire.xml b/Patches/MechanoidsExtraordinaire/PawnKindDefs/PawnKinds_MechanoidsExtraordinaire.xml
deleted file mode 100644
index f7e65bf970..0000000000
--- a/Patches/MechanoidsExtraordinaire/PawnKindDefs/PawnKinds_MechanoidsExtraordinaire.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Mechanoids Extraordinaire</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Hound"]/combatPower</xpath>
-					<value>
-						<combatPower>550</combatPower>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Chimera"]/combatPower</xpath>
-					<value>
-						<combatPower>550</combatPower>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Kraken"]/combatPower</xpath>
-					<value>
-						<combatPower>650</combatPower>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Vespa" or defName="Hound" or defName="Chimera" or defName="Kraken"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/MechanoidsExtraordinaire/ThingDefs_Misc/Weapons_Grenades_MechanoidsExtraordinaire.xml b/Patches/MechanoidsExtraordinaire/ThingDefs_Misc/Weapons_Grenades_MechanoidsExtraordinaire.xml
deleted file mode 100644
index 8fea66380b..0000000000
--- a/Patches/MechanoidsExtraordinaire/ThingDefs_Misc/Weapons_Grenades_MechanoidsExtraordinaire.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Mechanoids Extraordinaire</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Weapon_GrenadeLauncher_ME"]/label</xpath>
-					<value>
-						<label>Mechanoid Grenade Launcher</label>
-					</value>
-				</li>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Weapon_GrenadeLauncher_ME</defName>
-					<statBases>
-						<Mass>30.00</Mass>
-						<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.28</SwayFactor>
-						<Bulk>14.50</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_70mmMechanoidGrenade_HE</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>75</range>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<soundCast>ThrowGrenade</soundCast>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_70mmMechanoidGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Launcher</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/MechanoidsExtraordinaire/ThingDefs_Misc/Weapons_Guns_MechanoidsExtraordinaire.xml b/Patches/MechanoidsExtraordinaire/ThingDefs_Misc/Weapons_Guns_MechanoidsExtraordinaire.xml
deleted file mode 100644
index 360bec3750..0000000000
--- a/Patches/MechanoidsExtraordinaire/ThingDefs_Misc/Weapons_Guns_MechanoidsExtraordinaire.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Mechanoids Extraordinaire</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_InfernoCannonChimeraME</defName>
-					<statBases>
-						<Mass>300.00</Mass>
-						<RangedWeapon_Cooldown>2.53</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>0.82</SwayFactor>
-						<Bulk>20.00</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_80x256mmFuel_Incendiary</defaultProjectile>
-						<warmupTime>4.1</warmupTime>
-						<range>86</range>
-						<burstShotCount>1</burstShotCount>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>2</AmmoGenPerMagOverride>
-						<reloadTime>9.8</reloadTime>
-						<ammoSet>AmmoSet_80x256mmFuel</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Launcher</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/MechanoidsExtraordinaire/ThingDefs_Races/Races_Mechanoid_MechanoidsExtraordinaire.xml b/Patches/MechanoidsExtraordinaire/ThingDefs_Races/Races_Mechanoid_MechanoidsExtraordinaire.xml
deleted file mode 100644
index ed1a1c4e4a..0000000000
--- a/Patches/MechanoidsExtraordinaire/ThingDefs_Races/Races_Mechanoid_MechanoidsExtraordinaire.xml
+++ /dev/null
@@ -1,341 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Mechanoids Extraordinaire</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Vespa ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Mechanoid_Vespa"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Mechanoid_Vespa"]/statBases</xpath>
-					<value>
-						<CarryWeight>55</CarryWeight>
-						<CarryBulk>22</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.25</MeleeCritChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mechanoid_Vespa"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mechanoid_Vespa"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>3</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mechanoid_Vespa"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== Hound ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Mechanoid_Hound"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Mechanoid_Hound"]/statBases</xpath>
-					<value>
-						<CarryWeight>200</CarryWeight>
-						<CarryBulk>100</CarryBulk>
-						<AimingAccuracy>0.8</AimingAccuracy>
-						<ShootingAccuracyPawn>0.8</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mechanoid_Hound"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>27</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mechanoid_Hound"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>12</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mechanoid_Hound"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<armorPenetrationSharp>4.5</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<armorPenetrationSharp>4.5</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== Chimera ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Mechanoid_Chimera"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Mechanoid_Chimera"]/statBases</xpath>
-					<value>
-						<CarryWeight>200</CarryWeight>
-						<CarryBulk>120</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.10</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mechanoid_Chimera"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>30</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mechanoid_Chimera"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>12</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mechanoid_Chimera"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.7</cooldownTime>
-								<linkedBodyPartsGroup>TailBladeME</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== Goliath ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Mechanoid_Goliath"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Mechanoid_Goliath"]/statBases</xpath>
-					<value>
-						<CarryWeight>150</CarryWeight>
-						<CarryBulk>40</CarryBulk>
-						<AimingAccuracy>0.8</AimingAccuracy>
-						<ShootingAccuracyPawn>0.8</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.50</MeleeCritChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mechanoid_Goliath"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>45</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mechanoid_Goliath"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mechanoid_Goliath"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== Kraken ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Mechanoid_Kraken"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Mechanoid_Kraken"]/statBases</xpath>
-					<value>
-						<CarryWeight>200</CarryWeight>
-						<CarryBulk>150</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.40</MeleeCritChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mechanoid_Kraken"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>45</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mechanoid_Kraken"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>22</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mechanoid_Kraken"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>first left tentacle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>UpperLeftMechaTentacleME</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>16</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>first right tentacle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>UpperRightMechaTentacleME</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>16</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>second left tentacle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>LowerLeftMechaTentacleME</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>16</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>second right tentacle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>LowerRightMechaTentacleME</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>16</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedModules/Hediffs_AddedModules_Archotech.xml b/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedModules/Hediffs_AddedModules_Archotech.xml
deleted file mode 100644
index 062bbf5836..0000000000
--- a/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedModules/Hediffs_AddedModules_Archotech.xml	
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Medical System Expansion - Revived</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ==== Archotech Modules  ==== -->
-				<!-- MSE_ArchotechArmModule -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="MSE_ArchotechArmModule"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.25</cooldownTime>
-								<armorPenetrationBlunt>1.333</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- MSE_ArchotechHandModule -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="MSE_ArchotechHandModule"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>0.95</cooldownTime>
-								<armorPenetrationBlunt>0.444</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- MSE_ArchotechFingerModule -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="MSE_ArchotechFingerModule"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stinger</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>0.63</cooldownTime>
-								<armorPenetrationBlunt>0.089</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedModules/Hediffs_AddedModules_ArchotechSpecial.xml b/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedModules/Hediffs_AddedModules_ArchotechSpecial.xml
deleted file mode 100644
index 8121525b76..0000000000
--- a/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedModules/Hediffs_AddedModules_ArchotechSpecial.xml	
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Medical System Expansion - Revived</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ==== Special Archotech Modules  ==== -->
-				<!-- MSE_AdvancedRangedPlatformModule -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="MSE_AdvancedRangedPlatformModule"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<capMods>
-									<li>
-										<capacity>Manipulation</capacity>
-										<offset>0.03</offset>
-									</li>
-								</capMods>
-								<statOffsets>
-									<ShootingAccuracyPawn>4</ShootingAccuracyPawn>
-									<AimingAccuracy>0.4</AimingAccuracy>
-									<AimingDelayFactor>-0.2</AimingDelayFactor>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- MSE_AdvancedMeleePlatformModule -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="MSE_AdvancedMeleePlatformModule"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<capMods>
-									<li>
-										<capacity>Manipulation</capacity>
-										<offset>0.03</offset>
-									</li>
-								</capMods>
-								<statOffsets>
-									<MeleeDodgeChance>0.8</MeleeDodgeChance>
-									<MeleeHitChance>8</MeleeHitChance>
-									<MeleeCritChance>0.8</MeleeCritChance>
-									<MeleeParryChance>0.8</MeleeParryChance>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- MSE_AdvancedPowerArmModule -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="MSE_AdvancedPowerArmModule"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.95</cooldownTime>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- MSE_AdvancedPowerClawModule -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="MSE_AdvancedPowerClawModule"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>1</cooldownTime>
-								<armorPenetrationBlunt>3.161</armorPenetrationBlunt>
-								<armorPenetrationSharp>6.33</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- MSE_AdamantiumBoneModule -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="MSE_AdamantiumBoneModule"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<capMods>
-									<li>
-										<capacity>Manipulation</capacity>
-										<offset>0.03</offset>
-									</li>
-								</capMods>
-								<statOffsets>
-									<ArmorRating_Blunt>0.9</ArmorRating_Blunt>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedModules/Hediffs_AddedModules_Bionic.xml b/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedModules/Hediffs_AddedModules_Bionic.xml
deleted file mode 100644
index 9cb3d9a317..0000000000
--- a/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedModules/Hediffs_AddedModules_Bionic.xml	
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Medical System Expansion - Revived</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ==== Bionic Modules  ==== -->
-				<!-- MSE_BionicArmModule -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="MSE_BionicArmModule"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.66</cooldownTime>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- MSE_BionicHandModule -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="MSE_BionicHandModule"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.26</cooldownTime>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- MSE_BionicFingerModule -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="MSE_BionicFingerModule"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stinger</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>0.84</cooldownTime>
-								<armorPenetrationBlunt>0.05</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedModules/Hediffs_AddedModules_BionicSpecial.xml b/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedModules/Hediffs_AddedModules_BionicSpecial.xml
deleted file mode 100644
index dcc5e39d69..0000000000
--- a/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedModules/Hediffs_AddedModules_BionicSpecial.xml	
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Medical System Expansion - Revived</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ==== Special Bionic Modules  ==== -->
-				<!-- MSE_RangedPlatformModule -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="MSE_RangedPlatformModule"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ShootingAccuracyPawn>2</ShootingAccuracyPawn>
-									<AimingAccuracy>0.2</AimingAccuracy>
-									<AimingDelayFactor>-0.1</AimingDelayFactor>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- MSE_MeleePlatformModule -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="MSE_MeleePlatformModule"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<MeleeDodgeChance>0.4</MeleeDodgeChance>
-									<MeleeHitChance>4</MeleeHitChance>
-									<MeleeCritChance>0.4</MeleeCritChance>
-									<MeleeParryChance>0.4</MeleeParryChance>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- MSE_PowerArmModule -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="MSE_PowerArmModule"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.6</cooldownTime>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- MSE_PowerClawModule -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="MSE_PowerClawModule"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.34</cooldownTime>
-								<armorPenetrationBlunt>1.778</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.36</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- MSE_AdamantiumCoatedBoneModule -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="MSE_AdamantiumCoatedBoneModule"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Blunt>0.3</ArmorRating_Blunt>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts.xml b/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts.xml
deleted file mode 100644
index 21ed308092..0000000000
--- a/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts.xml	
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Medical System Expansion - Revived</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ==== Bases ==== -->
-				<!-- Simple -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[@Name="MSE_AddedBodyPartSimpleBase"]/stages/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ArmorRating_Blunt>0.138</ArmorRating_Blunt>
-							<ArmorRating_Sharp>0.075</ArmorRating_Sharp>
-						</statOffsets>
-					</value>
-				</li>
-				<!-- Bionic -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[@Name="MSE_AddedBodyPartBionicBase"]/stages/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ArmorRating_Blunt>0.39</ArmorRating_Blunt>
-							<ArmorRating_Sharp>0.212</ArmorRating_Sharp>
-							<ArmorRating_Heat>0.106</ArmorRating_Heat>
-						</statOffsets>
-					</value>
-				</li>
-				<!-- Archotech -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[@Name="MSE_AddedBodyPartArchotechBase"]/stages/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ArmorRating_Blunt>1.102</ArmorRating_Blunt>
-							<ArmorRating_Sharp>0.6</ArmorRating_Sharp>
-							<ArmorRating_Heat>0.3</ArmorRating_Heat>
-						</statOffsets>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_Archotech.xml b/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_Archotech.xml
deleted file mode 100644
index 542d889e75..0000000000
--- a/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_Archotech.xml	
+++ /dev/null
@@ -1,302 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Medical System Expansion - Revived</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ==== Archotech Prosthesis  ==== -->
-				<!-- ArchotechHeart -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ArchotechHeart"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.48</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.882</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.064</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- ArchotechStomach and ArchotechPelvis -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ArchotechStomach" or defName="ArchotechPelvis"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.6</ArmorRating_Sharp>
-									<ArmorRating_Blunt>1.102</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.08</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- ArchotechLung -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ArchotechLung"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.66</ArmorRating_Sharp>
-									<ArmorRating_Blunt>1.212</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.088</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- ArchotechKidney -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ArchotechKidney"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.36</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.661</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.048</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- ArchotechLiver -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ArchotechLiver"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.72</ArmorRating_Sharp>
-									<ArmorRating_Blunt>1.323</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.096</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- ArchotechEar -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ArchotechEar"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.026</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.048</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.004</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- ArchotechFoot -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ArchotechFoot"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.115</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.212</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.015</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- ArchotechToe -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ArchotechToe"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.008</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.015</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.001</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- ArchotechShoulder -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ArchotechShoulder"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>1.015</ArmorRating_Sharp>
-									<ArmorRating_Blunt>1.865</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.135</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- ArchotechHand -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ArchotechHand"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.107</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.196</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.014</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ArchotechHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>0.63</cooldownTime>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ArchotechFinger -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ArchotechFinger"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.007</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.013</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.001</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- ArchotechJaw -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ArchotechJaw"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.079</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.145</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.011</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- ArchotechSpine -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ArchotechSpine"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.3</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.551</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.04</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- ArchotechClavicle -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ArchotechClavicle"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.061</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.112</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.008</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- ArchotechSternum, ArchotechFemur and ArchotechTibia -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ArchotechSternum" or defName="ArchotechFemur" or defName="ArchotechTibia"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.18</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.331</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.024</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- ArchotechRib -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ArchotechRib"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.144</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.265</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.019</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- ArchotechHumerus and ArchotechRadius -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ArchotechHumerus" or defName="ArchotechRadius"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.118</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.216</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.016</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_ArchotechSpecial.xml b/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_ArchotechSpecial.xml
deleted file mode 100644
index cc5ca078ee..0000000000
--- a/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_ArchotechSpecial.xml	
+++ /dev/null
@@ -1,251 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Medical System Expansion - Revived</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ==== Special Archotech Prosthesis  ==== -->
-				<!-- AdvancedAntitoxinKidney -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AdvancedAntitoxinKidney"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.36</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.661</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.048</ArmorRating_Heat>
-									<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- AdvancedMedicalLiver -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AdvancedMedicalLiver"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.72</ArmorRating_Sharp>
-									<ArmorRating_Blunt>1.323</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.096</ArmorRating_Heat>
-									<ImmunityGainSpeed>0.5</ImmunityGainSpeed>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- AdvancedEnergizedLiver -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AdvancedEnergizedLiver"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.72</ArmorRating_Sharp>
-									<ArmorRating_Blunt>1.323</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.096</ArmorRating_Heat>
-								</statOffsets>
-								<restFallFactor>0.5</restFallFactor>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- AdvancedPowerArm -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="AdvancedPowerArm"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.786</ArmorRating_Sharp>
-									<ArmorRating_Blunt>1.444</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.105</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AdvancedPowerArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>41</power>
-								<cooldownTime>1.3</cooldownTime>
-								<armorPenetrationBlunt>18</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- MSE_AdvancedPowerBlade -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="MSE_AdvancedPowerBlade"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>1.015</ArmorRating_Sharp>
-									<ArmorRating_Blunt>1.865</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.135</ArmorRating_Heat>
-									<MeleeCritChance>0.11</MeleeCritChance>
-									<MeleeParryChance>0.13</MeleeParryChance>
-									<MeleeDodgeChance>0.27</MeleeDodgeChance>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="MSE_AdvancedPowerBlade"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>48</power>
-								<cooldownTime>1.32</cooldownTime>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<armorPenetrationSharp>24</armorPenetrationSharp>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.58</cooldownTime>
-								<armorPenetrationBlunt>2.344</armorPenetrationBlunt>
-								<armorPenetrationSharp>46.88</armorPenetrationSharp>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- AdvancedPowerClaw -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="AdvancedPowerClaw"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.107</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.196</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.014</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AdvancedPowerClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>0.67</cooldownTime>
-								<armorPenetrationSharp>14.23</armorPenetrationSharp>
-								<armorPenetrationBlunt>7.111</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- AdvancedBreathingSupportRib -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AdvancedBreathingSupportRib"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.144</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.265</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.019</ArmorRating_Heat>
-								</statOffsets>
-								<capMods>
-									<li>
-										<capacity>Breathing</capacity>
-										<offset>0.2</offset>
-									</li>
-								</capMods>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- AdvancedRelaxationRib -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AdvancedRelaxationRib"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.144</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.265</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.019</ArmorRating_Heat>
-									<MentalBreakThreshold>-0.2</MentalBreakThreshold>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- AdvancedColdRegulatorRib -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AdvancedColdRegulatorRib"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.144</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.265</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.019</ArmorRating_Heat>
-									<ComfyTemperatureMin>-10</ComfyTemperatureMin>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- AdvancedHeatRegulatorRib -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AdvancedHeatRegulatorRib"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.144</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.265</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.019</ArmorRating_Heat>
-									<ComfyTemperatureMax>10</ComfyTemperatureMax>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_Bionic.xml b/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_Bionic.xml
deleted file mode 100644
index 67ad998238..0000000000
--- a/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_Bionic.xml	
+++ /dev/null
@@ -1,254 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Medical System Expansion - Revived</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ==== Bionic Prosthesis  ==== -->
-				<!-- BionicLung -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="BionicLung"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.233</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.429</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.044</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- BionicKidney -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="BionicKidney"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.127</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.234</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.024</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- BionicLiver -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="BionicLiver"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.255</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.468</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.048</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- BionicFoot -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="BionicFoot"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.041</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.008</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- BionicToe -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="BionicToe"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.003</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.005</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.001</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- BionicShoulder -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="BionicShoulder"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.359</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.659</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.068</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- BionicHand -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="BionicHand"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.038</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.069</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.007</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BionicHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>0.84</cooldownTime>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.563</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- BionicFinger -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="BionicFinger"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.003</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.005</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.0005</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- BionicJaw -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="BionicJaw"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.028</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.051</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.005</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- BionicClavicle -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="BionicClavicle"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.022</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.04</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.004</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- BionicSternum, BionicFemur and BionicTibia -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="BionicSternum" or defName="BionicFemur" or defName="BionicTibia"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.064</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.117</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.012</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- BionicRib -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="BionicRib"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.051</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.094</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.01</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- BionicPelvis -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="BionicPelvis"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.212</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.39</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.04</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- BionicHumerus and BionicRadius -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="BionicHumerus" or defName="BionicRadius"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.042</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.076</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.008</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_BionicSpecial.xml b/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_BionicSpecial.xml
deleted file mode 100644
index 41a933a7c6..0000000000
--- a/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_BionicSpecial.xml	
+++ /dev/null
@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Medical System Expansion - Revived</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ==== Special Bionic Prosthesis  ==== -->
-				<!-- AntitoxinKidney -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AntitoxinKidney"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.127</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.234</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.024</ArmorRating_Heat>
-									<ToxicEnvironmentResistance>0.25</ToxicEnvironmentResistance>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- MedicalLiver -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="MedicalLiver"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.255</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.468</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.048</ArmorRating_Heat>
-									<ImmunityGainSpeed>0.25</ImmunityGainSpeed>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- EnergizedLiver -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EnergizedLiver"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.255</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.468</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.048</ArmorRating_Heat>
-								</statOffsets>
-								<restFallFactor>0.75</restFallFactor>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- PowerArm -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="PowerArm"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.278</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.511</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.052</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="PowerArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>1.73</cooldownTime>
-								<armorPenetrationBlunt>10.125</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- MSE_PowerBlade -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="MSE_PowerBlade"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.359</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.659</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.068</ArmorRating_Heat>
-									<MeleeCritChance>0.11</MeleeCritChance>
-									<MeleeParryChance>0.13</MeleeParryChance>
-									<MeleeDodgeChance>0.27</MeleeDodgeChance>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="MSE_PowerBlade"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>37</power>
-								<cooldownTime>1.32</cooldownTime>
-								<armorPenetrationBlunt>3.375</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.35</armorPenetrationSharp>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>2.11</cooldownTime>
-								<armorPenetrationBlunt>1.318</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.64</armorPenetrationSharp>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- BreathingSupportRib -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BreathingSupportRib"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.051</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.094</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.01</ArmorRating_Heat>
-								</statOffsets>
-								<capMods>
-									<li>
-										<capacity>Breathing</capacity>
-										<offset>0.10</offset>
-									</li>
-								</capMods>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- RelaxationRib -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="RelaxationRib"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.051</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.094</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.01</ArmorRating_Heat>
-									<MentalBreakThreshold>-0.1</MentalBreakThreshold>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- ColdRegulatorRib -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ColdRegulatorRib"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.051</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.094</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.01</ArmorRating_Heat>
-									<ComfyTemperatureMin>-5</ComfyTemperatureMin>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- HeatRegulatorRib -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="HeatRegulatorRib"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.051</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.094</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.01</ArmorRating_Heat>
-									<ComfyTemperatureMax>5</ComfyTemperatureMax>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_Simple.xml b/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_Simple.xml
deleted file mode 100644
index b1c8b0e298..0000000000
--- a/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_Simple.xml	
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Medical System Expansion - Revived</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ==== Simple Prosthesis  ==== -->
-				<!-- SimpleProstheticFoot -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="SimpleProstheticFoot"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Blunt>0.026</ArmorRating_Blunt>
-									<ArmorRating_Sharp>0.014</ArmorRating_Sharp>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- SimpleProstheticToe and SimpleProstheticFinger -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="SimpleProstheticToe" or defName="SimpleProstheticFinger"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Blunt>0.002</ArmorRating_Blunt>
-									<ArmorRating_Sharp>0.001</ArmorRating_Sharp>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- SimpleProstheticHand -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="SimpleProstheticHand"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Blunt>0.025</ArmorRating_Blunt>
-									<ArmorRating_Sharp>0.013</ArmorRating_Sharp>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="SimpleProstheticHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.96</cooldownTime>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.084</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- SimpleProstheticJaw -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="SimpleProstheticJaw"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Blunt>0.018</ArmorRating_Blunt>
-									<ArmorRating_Sharp>0.01</ArmorRating_Sharp>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- SimpleProstheticClavicle -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="SimpleProstheticClavicle"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Blunt>0.014</ArmorRating_Blunt>
-									<ArmorRating_Sharp>0.008</ArmorRating_Sharp>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- SimpleProstheticSternum, SimpleProstheticFemur and SimpleProstheticTibia -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="SimpleProstheticSternum" or defName="SimpleProstheticFemur" or defName="SimpleProstheticTibia"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Blunt>0.041</ArmorRating_Blunt>
-									<ArmorRating_Sharp>0.023</ArmorRating_Sharp>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- SimpleProstheticRib -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="SimpleProstheticRib"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Blunt>0.033</ArmorRating_Blunt>
-									<ArmorRating_Sharp>0.018</ArmorRating_Sharp>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- SimpleProstheticPelvis -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="SimpleProstheticPelvis"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Blunt>0.138</ArmorRating_Blunt>
-									<ArmorRating_Sharp>0.075</ArmorRating_Sharp>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- SimpleProstheticHumerus and SimpleProstheticRadius -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="SimpleProstheticHumerus" or defName="SimpleProstheticRadius"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Blunt>0.027</ArmorRating_Blunt>
-									<ArmorRating_Sharp>0.015</ArmorRating_Sharp>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_VanillaArchotech.xml b/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_VanillaArchotech.xml
deleted file mode 100644
index f268e1a2dc..0000000000
--- a/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_VanillaArchotech.xml	
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Medical System Expansion - Revived</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ==== Vanilla Archotech Prosthesis  ==== -->
-				<!-- ArchotechEye -->
-				<li Class="PatchOperationTest">
-					<xpath>Defs/HediffDef[defName="ArchotechEye"]/stages</xpath>
-					<success>Invert</success>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ArchotechEye"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.026</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.048</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.004</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- ArchotechArm -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ArchotechArm"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.786</ArmorRating_Sharp>
-									<ArmorRating_Blunt>1.444</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.105</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- ArchotechLeg -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ArchotechLeg"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>1.195</ArmorRating_Sharp>
-									<ArmorRating_Blunt>2.196</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.159</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_VanillaBionic.xml b/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_VanillaBionic.xml
deleted file mode 100644
index 57b3d05280..0000000000
--- a/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_VanillaBionic.xml	
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Medical System Expansion - Revived</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ==== Vanilla Bionic Prosthesis  ==== -->
-				<!-- BionicEye and BionicEar -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="BionicEye" or defName="BionicEar"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.009</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.017</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.002</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- BionicArm -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="BionicArm"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.278</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.511</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.052</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- BionicLeg -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="BionicLeg"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.423</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.776</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.08</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- BionicSpine -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="BionicSpine"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.106</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.195</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.02</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- BionicHeart -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="BionicHeart"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.17</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.312</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.032</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- BionicStomach -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="BionicStomach"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Sharp>0.212</ArmorRating_Sharp>
-									<ArmorRating_Blunt>0.39</ArmorRating_Blunt>
-									<ArmorRating_Heat>0.04</ArmorRating_Heat>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- PowerClaw -->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/HediffDef[defName="PowerClaw"]/stages/li</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/HediffDef[defName="PowerClaw"]</xpath>
-						<value>
-							<stages>
-								<li>
-									<minSeverity>0.000001</minSeverity>
-									<statOffsets>
-										<ArmorRating_Sharp>0.038</ArmorRating_Sharp>
-										<ArmorRating_Blunt>0.069</ArmorRating_Blunt>
-										<ArmorRating_Heat>0.007</ArmorRating_Heat>
-									</statOffsets>
-								</li>
-							</stages>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/HediffDef[defName="PowerClaw"]/stages/li</xpath>
-						<value>
-							<minSeverity>0.000001</minSeverity>
-							<statOffsets>
-								<ArmorRating_Sharp>0.038</ArmorRating_Sharp>
-								<ArmorRating_Blunt>0.069</ArmorRating_Blunt>
-								<ArmorRating_Heat>0.007</ArmorRating_Heat>
-							</statOffsets>
-						</value>
-					</match>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_VanillaSimple.xml b/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_VanillaSimple.xml
deleted file mode 100644
index 34189f7780..0000000000
--- a/Patches/Medical System Expansion - Revived/HediffDefs/Hediffs_AddedParts/Hediffs_AddedParts_VanillaSimple.xml	
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Medical System Expansion - Revived</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ==== Vanilla Simple Prosthesis  ==== -->
-				<!-- SimpleProstheticLeg -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="SimpleProstheticLeg"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Blunt>0.274</ArmorRating_Blunt>
-									<ArmorRating_Sharp>0.149</ArmorRating_Sharp>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- SimpleProstheticArm -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="SimpleProstheticArm"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Blunt>0.181</ArmorRating_Blunt>
-									<ArmorRating_Sharp>0.098</ArmorRating_Sharp>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- SimpleProstheticHeart -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="SimpleProstheticHeart"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Blunt>0.11</ArmorRating_Blunt>
-									<ArmorRating_Sharp>0.06</ArmorRating_Sharp>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-				<!-- CochlearImplant -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="CochlearImplant"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<minSeverity>0.000001</minSeverity>
-								<statOffsets>
-									<ArmorRating_Blunt>0.006</ArmorRating_Blunt>
-									<ArmorRating_Sharp>0.003</ArmorRating_Sharp>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Medical System Expansion 2/Defs/HediffDefs/Modules/Hediffs_Modules_Bionics.xml b/Patches/Medical System Expansion 2/Defs/HediffDefs/Modules/Hediffs_Modules_Bionics.xml
deleted file mode 100644
index 4103a8bc6a..0000000000
--- a/Patches/Medical System Expansion 2/Defs/HediffDefs/Modules/Hediffs_Modules_Bionics.xml	
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Medical System Expansion 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- == Combat modules == -->
-				<!-- Ranged platform module -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="RangedPlatformModule"]/stages/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<AimingAccuracy>0.25</AimingAccuracy>
-							<ReloadSpeed>0.25</ReloadSpeed>
-							<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-							<AimingDelayFactor>-0.1</AimingDelayFactor>
-						</statOffsets>
-					</value>
-				</li>
-				<!-- Melee platform module -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="MeleePlatformModule"]/stages/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<MeleeDodgeChance>0.24</MeleeDodgeChance>
-							<MeleeHitChance>4</MeleeHitChance>
-							<MeleeParryChance>0.16</MeleeParryChance>
-							<MeleeCritChance>0.16</MeleeCritChance>
-						</statOffsets>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Medicine Supplements (Continued)/Items_Bandages.xml b/Patches/Medicine Supplements (Continued)/Items_Bandages.xml
deleted file mode 100644
index fb29efa59d..0000000000
--- a/Patches/Medicine Supplements (Continued)/Items_Bandages.xml	
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Medical Supplements (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Give bandages appropriate bulk. -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="MSBandage" or
-						defName="MSASBandage" or
-						defName="MSNanoBandage"
-						]/statBases</xpath>
-					<value>
-						<Bulk>0.1</Bulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Medieval Medicines 1.4 Medieval Overhaul Edition/Hediff_MM.xml b/Patches/Medieval Medicines 1.4 Medieval Overhaul Edition/Hediff_MM.xml
deleted file mode 100644
index 10c284ba2e..0000000000
--- a/Patches/Medieval Medicines 1.4 Medieval Overhaul Edition/Hediff_MM.xml	
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Medieval Medicines 1.4 Medieval Overhaul Edition</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= Medieval Limbs ======= -->
-
-				<!-- ===== Mechanical ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="MechanicalMedHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mechanical hand</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.11</cooldownTime>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="MechanicalMedArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mechanical arm</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.11</cooldownTime>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Basic ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="IronArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>iron fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.11</cooldownTime>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ProstheticHook"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>prosthetic hook</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>5</power>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<cooldownTime>1.26</cooldownTime>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Artificial ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ArtificialMedHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>artificial hand</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.11</cooldownTime>
-								<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ArtificialMedArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>artificial arm</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.11</cooldownTime>
-								<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Ambroisen ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AmbroisenMedHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>ambroisen hand</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.11</cooldownTime>
-								<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AmbroisenMedArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>ambroisen arm</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.11</cooldownTime>
-								<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Medieval Overhaul/MO_Ammo.xml b/Patches/Medieval Overhaul/MO_Ammo.xml
deleted file mode 100644
index d9388b2b4e..0000000000
--- a/Patches/Medieval Overhaul/MO_Ammo.xml	
+++ /dev/null
@@ -1,440 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Medieval Overhaul</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Make ammos craftable with the anvil-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="AmmoGreatArrowBase" or @Name="AmmoArrowBase" or @Name="AmmoCrossbowBoltBase"]/tradeTags</xpath>
-					<value>
-						<li>CE_AutoEnableCrafting_DankPyon_Workbench</li>
-						<li>CE_AutoEnableCrafting_DankPyon_Workbench</li>
-					</value>
-				</li>
-
-				<!--Crossbow Ammos-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_DankPyonCrossbowBolt</defName>
-							<label>crossbow bolts</label>
-							<ammoTypes>
-								<Ammo_CrossbowBolt_Stone>Projectile_DankPyonCrossbowBolt_Stone</Ammo_CrossbowBolt_Stone>
-								<Ammo_CrossbowBolt_Steel>Projectile_DankPyonCrossbowBolt_Steel</Ammo_CrossbowBolt_Steel>
-								<Ammo_CrossbowBolt_Venom>Projectile_DankPyonCrossbowBolt_Venom</Ammo_CrossbowBolt_Venom>
-								<!-- <Ammo_CrossbowBolt_Flame>Projectile_DankPyonCrossbowBolt_Flame</Ammo_CrossbowBolt_Flame> -->
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef ParentName="BaseCrossbowBoltProjectile">
-							<defName>Projectile_DankPyonCrossbowBolt_Stone</defName>
-							<label>normal crossbow bolt (stone)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Stone</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>8</damageAmountBase>
-								<armorPenetrationBlunt>1.4</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.70</armorPenetrationSharp>
-								<preExplosionSpawnChance>0.1</preExplosionSpawnChance>
-								<speed>35</speed>
-								<preExplosionSpawnThingDef>Ammo_CrossbowBolt_Stone</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseCrossbowBoltProjectile">
-							<defName>Projectile_DankPyonCrossbowBolt_Steel</defName>
-							<label>normal crossbow bolt (steel)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase><!-- -2 -->
-								<armorPenetrationBlunt>6</armorPenetrationBlunt><!-- -0.5 -->
-								<armorPenetrationSharp>2.65</armorPenetrationSharp><!-- -0.2 -->
-								<speed>35</speed>
-								<preExplosionSpawnChance>0.333</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Ammo_CrossbowBolt_Steel</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseCrossbowBoltProjectile">
-							<defName>Projectile_DankPyonCrossbowBolt_Venom</defName>
-							<label>normal crossbow bolt (venom)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Venom</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>ArrowVenom</damageDef>
-								<damageAmountBase>10</damageAmountBase>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.3</armorPenetrationSharp>
-								<secondaryDamage>
-									<li>
-										<def>ArrowVenom</def>
-										<amount>3</amount>
-									</li>
-								</secondaryDamage>
-								<speed>35</speed>
-								<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Ammo_CrossbowBolt_Steel</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<!--  Flame bolt ????        
-                    <ThingDef ParentName="BaseCrossbowBoltProjectile">
-                        <defName>Projectile_DankPyonCrossbowBolt_Flame</defName>
-                        <label>normal crossbow bolt (flame)</label>
-                        <graphicData>
-                            <texPath>Things/Projectile/Arrows/Arrow_Flame</texPath>
-                            <graphicClass>Graphic_Single</graphicClass>
-                        </graphicData>
-                        <projectile Class="CombatExtended.ProjectilePropertiesCE">
-                            <damageDef>Flame</damageDef>
-                            <damageAmountBase>4</damageAmountBase>
-                            <armorPenetrationBlunt>3</armorPenetrationBlunt>
-                            <armorPenetrationSharp>1.4</armorPenetrationSharp>
-                            <speed>35</speed>	
-                        </projectile>
-                    </ThingDef>-->
-					</value>
-				</li>
-
-				<!--Heavy Crossbow Ammos-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_ArbalestBolt</defName>
-							<label>crossbow bolts</label>
-							<ammoTypes>
-								<Ammo_CrossbowBolt_Stone>Projectile_ArbalestBolt_Stone</Ammo_CrossbowBolt_Stone>
-								<Ammo_CrossbowBolt_Steel>Projectile_ArbalestBolt_Steel</Ammo_CrossbowBolt_Steel>
-								<Ammo_CrossbowBolt_Venom>Projectile_ArbalestBolt_Venom</Ammo_CrossbowBolt_Venom>
-								<!-- <Ammo_CrossbowBolt_Flame>Projectile_ArbalestBolt_Flame</Ammo_CrossbowBolt_Flame> -->
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef ParentName="BaseCrossbowBoltProjectile">
-							<defName>Projectile_ArbalestBolt_Stone</defName>
-							<label>crossbow bolt (stone)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Stone</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>13</damageAmountBase>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.85</armorPenetrationSharp>
-								<preExplosionSpawnChance>0.1</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Ammo_CrossbowBolt_Stone</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseCrossbowBoltProjectile">
-							<defName>Projectile_ArbalestBolt_Steel</defName>
-							<label>crossbow bolt (steel)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<speed>35</speed>
-								<preExplosionSpawnChance>0.333</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Ammo_CrossbowBolt_Steel</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseCrossbowBoltProjectile">
-							<defName>Projectile_ArbalestBolt_Venom</defName>
-							<label>crossbow bolt (venom)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Venom</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>ArrowVenom</damageDef>
-								<damageAmountBase>15</damageAmountBase>
-								<armorPenetrationBlunt>6.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-								<secondaryDamage>
-									<li>
-										<def>ArrowVenom</def>
-										<amount>4</amount>
-									</li>
-								</secondaryDamage>
-								<speed>35</speed>
-								<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Ammo_CrossbowBolt_Steel</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<!--Flame bolt ?????
-                    <ThingDef ParentName="BaseCrossbowBoltProjectile">
-                        <defName>Projectile_ArbalestBolt_Flame</defName>
-                        <label>crossbow bolt (flame)</label>
-                        <graphicData>
-                            <texPath>Things/Projectile/Arrows/Arrow_Flame</texPath>
-                            <graphicClass>Graphic_Single</graphicClass>
-                        </graphicData>
-                        <projectile Class="CombatExtended.ProjectilePropertiesCE">
-                            <damageDef>Flame</damageDef>
-                            <damageAmountBase>5</damageAmountBase>
-                            <armorPenetrationBlunt>3.28</armorPenetrationBlunt>
-                            <armorPenetrationSharp>1.5</armorPenetrationSharp>
-                            <speed>18</speed>	
-                        </projectile>
-                    </ThingDef>-->
-					</value>
-				</li>
-
-				<!-- Hunting Bow Ammos (base streamline arrows | recurve bow) -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_HuntingArrow</defName>
-							<label>arrows</label>
-							<ammoTypes>
-								<Ammo_Arrow_Stone>Projectile_HuntingArrow_Stone</Ammo_Arrow_Stone>
-								<Ammo_Arrow_Steel>Projectile_HuntingArrow_Steel</Ammo_Arrow_Steel>
-								<Ammo_Arrow_Venom>Projectile_HuntingArrow_Venom</Ammo_Arrow_Venom>
-								<Ammo_Arrow_Flame>Projectile_HuntingArrow_Flame</Ammo_Arrow_Flame>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef ParentName="BaseStreamlinedArrowProjectile">
-							<defName>Projectile_HuntingArrow_Stone</defName>
-							<label>streamlined hunting arrow (stone)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Stone</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>33</speed>
-								<damageAmountBase>9</damageAmountBase>
-								<armorPenetrationSharp>0.6</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.9</armorPenetrationBlunt>
-								<preExplosionSpawnChance>0.2</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Ammo_Arrow_Stone</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseStreamlinedArrowProjectile">
-							<defName>Projectile_HuntingArrow_Steel</defName>
-							<label>streamlined hunting arrow (steel)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>33</speed>
-								<damageAmountBase>12</damageAmountBase><!-- + 1 -->
-								<armorPenetrationSharp>1.5</armorPenetrationSharp><!-- + 0.1 -->
-								<armorPenetrationBlunt>6.4</armorPenetrationBlunt><!-- + 0.5 -->
-								<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Ammo_Arrow_Steel</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseStreamlinedArrowProjectile">
-							<defName>Projectile_HuntingArrow_Venom</defName>
-							<label>streamlined hunting arrow (venom)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Venom</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>33</speed>
-								<damageDef>Arrow</damageDef>
-								<damageAmountBase>10</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>ArrowVenom</def>
-										<amount>2</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>6.4</armorPenetrationBlunt>
-								<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Ammo_Arrow_Steel</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseStreamlinedArrowProjectile">
-							<defName>Projectile_HuntingArrow_Flame</defName>
-							<label>streamlined hunting arrow (flame)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Flame</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>33</speed>
-								<damageDef>Arrow</damageDef>
-								<damageAmountBase>4</damageAmountBase>
-								<armorPenetrationSharp>0.6</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.4</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame</def>
-										<amount>1</amount>
-										<chance>0.33</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- War Bow Ammos (base great arrows | great bow) -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_WarArrow</defName>
-							<label>great arrows</label>
-							<ammoTypes>
-								<Ammo_GreatArrow_Stone>Projectile_WarArrow_Stone</Ammo_GreatArrow_Stone>
-								<Ammo_GreatArrow_Steel>Projectile_WarArrow_Steel</Ammo_GreatArrow_Steel>
-								<Ammo_GreatArrow_Venom>Projectile_WarArrow_Venom</Ammo_GreatArrow_Venom>
-								<Ammo_GreatArrow_Flame>Projectile_WarArrow_Flame</Ammo_GreatArrow_Flame>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef ParentName="BaseGreatArrowProjectile">
-							<defName>Projectile_WarArrow_Stone</defName>
-							<label>great war arrow (stone)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Stone</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>33</speed>
-								<damageAmountBase>10</damageAmountBase>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.1</armorPenetrationSharp>
-								<preExplosionSpawnChance>0.2</preExplosionSpawnChance><!-- 12.5 arrows per resource -->
-								<preExplosionSpawnThingDef>Ammo_GreatArrow_Stone</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseGreatArrowProjectile">
-							<defName>Projectile_WarArrow_Steel</defName>
-							<label>great war arrow (steel)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>33</speed>
-								<damageAmountBase>14</damageAmountBase><!-- + 1 -->
-								<armorPenetrationBlunt>7</armorPenetrationBlunt><!-- + 0.5 -->
-								<armorPenetrationSharp>2</armorPenetrationSharp><!-- + 0.2 -->
-								<preExplosionSpawnChance>0.6</preExplosionSpawnChance><!-- 25 arrows per resource -->
-								<preExplosionSpawnThingDef>Ammo_GreatArrow_Steel</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseGreatArrowProjectile">
-							<defName>Projectile_WarArrow_Venom</defName>
-							<label>great war arrow (venom)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Venom</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>33</speed>
-								<damageDef>Arrow</damageDef>
-								<damageAmountBase>12</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>ArrowVenom</def>
-										<amount>3</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.2</armorPenetrationSharp>
-								<preExplosionSpawnChance>0.6</preExplosionSpawnChance><!-- 25 arrows per resource -->
-								<preExplosionSpawnThingDef>Ammo_GreatArrow_Steel</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseGreatArrowProjectile">
-							<defName>Projectile_WarArrow_Flame</defName>
-							<label>great war arrow (flame)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Flame</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>33</speed>
-								<damageDef>Arrow</damageDef>
-								<damageAmountBase>4</damageAmountBase>
-								<armorPenetrationBlunt>1.48</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.1</armorPenetrationSharp>
-								<secondaryDamage>
-									<li>
-										<def>Flame</def>
-										<amount>1</amount>
-										<chance>0.33</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-				<!-- Handgonne Ammos (1-Handed Blunderbuss) -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_HandgonneShot</defName>
-							<label>Handgonne Shot</label>
-							<ammoTypes>
-								<Ammo_MusketBall>Bullet_Handgonne_Ball</Ammo_MusketBall>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef ParentName="Base12GaugeBullet">
-							<defName>Bullet_Handgonne_Ball</defName>
-							<label>lead pellet</label>
-							<graphicData>
-								<texPath>Things/Projectile/Shotgun_Pellet</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>10</damageAmountBase>
-								<pelletCount>6</pelletCount>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-								<spreadMult>22.5</spreadMult>
-								<speed>64</speed>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Medieval Overhaul/MO_Apparel_Armor.xml b/Patches/Medieval Overhaul/MO_Apparel_Armor.xml
deleted file mode 100644
index 2af1b08964..0000000000
--- a/Patches/Medieval Overhaul/MO_Apparel_Armor.xml	
+++ /dev/null
@@ -1,443 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Medieval Overhaul</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Padded Surcoat, Gambeson-->
-				<!--Surcoat:skin, Gambeson:middle-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Padded_Surcoat" or defName="Dankpyon_Apparel_Gambeson"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>6</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Padded_Surcoat"]/statBases/Mass</xpath>
-					<value>
-						<Mass>2.3</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Dankpyon_Apparel_Gambeson"]/statBases/Mass</xpath>
-					<value>
-						<Mass>3</Mass>
-					</value>
-				</li>
-
-				<!-- Added extra coverage -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Padded_Surcoat" or defName="Dankpyon_Apparel_Gambeson"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Arms</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Padded_Surcoat" or defName="Dankpyon_Apparel_Gambeson"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!--Padded Leather-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Padded_Leather"]/statBases</xpath>
-					<value>
-						<Bulk>18</Bulk>
-						<WornBulk>4</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Padded_Leather"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!--Lamellar-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Light_Lamellar"]/statBases</xpath>
-					<value>
-						<Bulk>20</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Light_Lamellar"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>10</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!--Hauberk, Heavy Hauberk, Heraldic Hauberk-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Hauberk" or defName="DankPyon_Apparel_Heavy_Hauberk" or @Name="DankPyon_HeraldicHauberkBase" or defName="DankPyon_Apparel_AdornedMailShirt"]/statBases</xpath>
-					<value>
-						<Bulk>30</Bulk>
-						<WornBulk>12</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Hauberk"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.85</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Hauberk"]/statBases/Mass</xpath>
-					<value>
-						<Mass>6</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Heavy_Hauberk" or @Name="DankPyon_HeraldicHauberkBase" or defName="DankPyon_Apparel_AdornedMailShirt"]/statBases/Mass</xpath>
-					<value>
-						<Mass>9</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Heavy_Hauberk" or @Name="DankPyon_HeraldicHauberkBase" or defName="DankPyon_Apparel_AdornedMailShirt"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Hauberk" or defName="DankPyon_Apparel_Heavy_Hauberk" or @Name="DankPyon_HeraldicHauberkBase" or defName="DankPyon_Apparel_AdornedMailShirt"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>Torso</li>
-							<li>Shoulders</li>
-							<li>Arms</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Heavy_Hauberk" or @Name="DankPyon_HeraldicHauberkBase" or defName="DankPyon_Apparel_AdornedMailShirt"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Legs</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Hauberk" or defName="DankPyon_Apparel_Heavy_Hauberk" or @Name="DankPyon_HeraldicHauberkBase" or defName="DankPyon_Apparel_AdornedMailShirt"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Heavy_Hauberk" or @Name="DankPyon_HeraldicHauberkBase" or defName="DankPyon_Apparel_AdornedMailShirt"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeDodgeChance>-0.10</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<!--Brigandine (Normal + Adorned)-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Brigandine" or defName="DankPyon_Apparel_AdornedWarriorArmor"]/statBases</xpath>
-					<value>
-						<Bulk>60</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Brigandine" or defName="DankPyon_Apparel_AdornedWarriorArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.35</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Brigandine" or defName="DankPyon_Apparel_AdornedWarriorArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>14</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Brigandine" or defName="DankPyon_Apparel_AdornedWarriorArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<MeleeDodgeChance>-0.10</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<!--Breast Plate-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Breast_Plate"]/statBases</xpath>
-					<value>
-						<Bulk>25</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Breast_Plate"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3.2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Breast_Plate"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<!--Full Plate (Normal + Gilded + Adorned)-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_FullPlate" or defName="DankPyon_Apparel_FullPlateGilded" or defName="DankPyon_Apparel_AdornedHeavyPlate"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_FullPlate" or defName="DankPyon_Apparel_FullPlateGilded" or defName="DankPyon_Apparel_AdornedHeavyPlate"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_FullPlate" or defName="DankPyon_Apparel_FullPlateGilded" or defName="DankPyon_Apparel_AdornedHeavyPlate"]/statBases/Mass</xpath>
-					<value>
-						<Mass>15</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_FullPlate" or defName="DankPyon_Apparel_FullPlateGilded" or defName="DankPyon_Apparel_AdornedHeavyPlate"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<MeleeDodgeChance>-0.15</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_FullPlate" or defName="DankPyon_Apparel_FullPlateGilded" or defName="DankPyon_Apparel_AdornedHeavyPlate"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!--Full Plate - Named-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_FullPlateNamed"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-
-				<!-- Assume thickness of 3.2mm in plasteel -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_FullPlateNamed"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6.4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_FullPlateNamed"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>12.8</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_FullPlateNamed"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.05</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_FullPlateNamed"]/statBases/Mass</xpath>
-					<value>
-						<Mass>15</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_FullPlateNamed"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<MeleeDodgeChance>-0.15</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_FullPlateNamed"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ==== Pants ==== -->
-				<!-- Padded Chausses -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_ChaussesPadded"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_ChaussesPadded"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Splinted Chausses -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_ChaussesSplinted"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_ChaussesSplinted"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.85</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Plated Chausses -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_ChaussesPlate"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>4</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_ChaussesPlate"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.7</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Medieval Overhaul/MO_Apparel_Helmets.xml b/Patches/Medieval Overhaul/MO_Apparel_Helmets.xml
deleted file mode 100644
index 9853a30c37..0000000000
--- a/Patches/Medieval Overhaul/MO_Apparel_Helmets.xml	
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Medieval Overhaul</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Headgear; Helmets include padding-->
-
-				<!--Coverage-->
-
-				<!--Cover top of the head + neck-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[ defName="DankPyon_Headgear_ChainCoif" or defName="DankPyon_Headgear_ChainCoifClosed" or defName="DankPyon_Headgear_ChainCoifFull" or defName="DankPyon_Headgear_PaddedNasalHelmet" or defName="DankPyon_Headgear_PaddedKettle" or defName="DankPyon_Headgear_PaddedFlatTop" or defName="DankPyon_Headgear_ChainNasalHelm" or defName="DankPyon_Headgear_ChainNasalRedHelmet" or defName="DankPyon_Headgear_ChainKettle" or defName="DankPyon_Headgear_ChainClosedFlatTop"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>UpperHead</li>
-							<li>Neck</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-				<!--Cover jaw-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[ defName="DankPyon_Headgear_ChainCoifClosed" or defName="DankPyon_Headgear_ChainCoifFull" or defName="DankPyon_Headgear_ChainClosedFlatTop"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Teeth</li>
-					</value>
-				</li>
-
-				<!--Red Bandana-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Headgear_RedBandana"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Headgear_RedBandana"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.03</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Headgear_RedBandana"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.045</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!--Hood-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Headgear_Hood"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Headgear_Hood"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!--Zweihander's Hat-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Headgear_ZweihandersHat"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Headgear_ZweihandersHat"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!--Arming Cap, Full, Coif-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Headgear_coif" or defName="DankPyon_Headgear_ArmingCap" or defName="DankPyon_Headgear_FullArmingCap"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Headgear_ArmingCap" or defName="DankPyon_Headgear_FullArmingCap"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>10</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!--Chain Coif, Closed, Full-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Headgear_ChainCoif" or defName="DankPyon_Headgear_ChainCoifClosed" or defName="DankPyon_Headgear_ChainCoifFull"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Headgear_ChainCoif" or defName="DankPyon_Headgear_ChainCoifClosed" or defName="DankPyon_Headgear_ChainCoifFull"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.65</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!--Padded Flat Top, Kettle, Nasal,-->
-				<!--Chain Helmet Flat Top, Closed Flat Top, Kettle, Nasal-->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="DankPyon_Headgear_PaddedNasalHelmet" or defName="DankPyon_Headgear_PaddedKettleHelmet" or defName="DankPyon_Headgear_PaddedFlatTopHelmet" or defName="DankPyon_Headgear_ChainNasalHelmet" or defName="DankPyon_Headgear_ChainNasalRedHelmet" or defName="DankPyon_Headgear_ChainKettleHelmet" or defName="DankPyon_Headgear_Chain_FlatTopHelmet" or defName="DankPyon_Headgear_ChainClosedFlatTopHelmet" or defName="DankPyon_Headgear_ClosedChain_FlatTopHelmet" or @Name="DankPyon_ZweihanderHelmBase" or defName="DankPyon_Headgear_HeavyBarbrute" or defName="DankPyon_Headgear_OpenBascinet"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Headgear_PaddedNasalHelmet" or defName="DankPyon_Headgear_PaddedKettleHelmet" or defName="DankPyon_Headgear_PaddedFlatTopHelmet" or defName="DankPyon_Headgear_ChainNasalHelmet" or defName="DankPyon_Headgear_ChainKettleHelmet" or defName="DankPyon_Headgear_ClosedChain_FlatTopHelmet" or defName="DankPyon_Headgear_ChainNasalRedHelmet" or defName="DankPyon_Headgear_ChainClosedFlatTopHelmet" or defName="DankPyon_Headgear_Chain_FlatTopHelmet" or @Name="DankPyon_ZweihanderHelmBase" or defName="DankPyon_Adorned_HeavyMailCoif" or defName="DankPyon_Headgear_HeavyBarbrute" or defName="DankPyon_Headgear_OpenBascinet"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Headgear_PaddedNasalHelmet" or defName="DankPyon_Headgear_PaddedKettleHelmet" or defName="DankPyon_Headgear_PaddedFlatTopHelmet" or @Name="DankPyon_ZweihanderHelmBase"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Headgear_ChainNasalHelmet" or defName="DankPyon_Headgear_ChainNasalRedHelmet" or defName="DankPyon_Headgear_ChainKettleHelmet" or defName="DankPyon_Headgear_Chain_FlatTopHelmet" or defName="DankPyon_Headgear_ClosedChain_FlatTopHelmet" or defName="DankPyon_Adorned_HeavyMailCoif" or defName="DankPyon_Headgear_HeavyBarbrute" or defName="DankPyon_Headgear_OpenBascinet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.7</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!--Great Helm, Horn, Crusader, Royal-->
-				<!--Bascinet, Armet, Sallet, Klappvisier, Klappvisier Open, Honskull, Visored Kettle-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Headgear_ClosedBascinetHelmet" or defName="DankPyon_Headgear_SalletHelmet" or defName="DankPyon_Headgear_Bascinet_KlappvisierHelmetClosed" or defName="DankPyon_Headgear_GreatHelm" or defName="DankPyon_Headgear_HeraldicGreatHelm1c" or defName="DankPyon_Headgear_Armet" or defName="DankPyon_Headgear_ArmetGilded" or defName="DankPyon_Headgear_ArmetNamed" or defName="DankPyon_Adorned_FlatTop" or defName="DankPyon_Adorned_GreatHelm"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Headgear_ClosedBascinetHelmet" or defName="DankPyon_Headgear_SalletHelmet" or defName="DankPyon_Headgear_Bascinet_KlappvisierHelmetClosed" or defName="DankPyon_Headgear_GreatHelm" or defName="DankPyon_Headgear_HeraldicGreatHelm1c" or defName="DankPyon_Headgear_Armet" or defName="DankPyon_Headgear_ArmetGilded" or defName="DankPyon_Headgear_ArmetNamed" or defName="DankPyon_Adorned_FlatTop" or defName="DankPyon_Adorned_GreatHelm"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>FullHead</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="DankPyon_Headgear_ClosedBascinetHelmet" or defName="DankPyon_Headgear_SalletHelmet" or defName="DankPyon_Headgear_Bascinet_KlappvisierHelmetClosed" or defName="DankPyon_Headgear_GreatHelm" or defName="DankPyon_Headgear_HeraldicGreatHelm1c" or defName="DankPyon_Headgear_Armet" or defName="DankPyon_Headgear_ArmetGilded" or defName="DankPyon_Headgear_ArmetNamed" or defName="DankPyon_Adorned_FlatTop" or defName="DankPyon_Adorned_GreatHelm"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Headgear_ClosedBascinetHelmet" or defName="DankPyon_Headgear_SalletHelmet" or defName="DankPyon_Headgear_Bascinet_KlappvisierHelmetClosed" or defName="DankPyon_Headgear_GreatHelm" or defName="DankPyon_Headgear_HeraldicGreatHelm1c" or defName="DankPyon_Headgear_Armet" or defName="DankPyon_Headgear_ArmetGilded" or defName="DankPyon_Headgear_ArmetNamed" or defName="DankPyon_Adorned_FlatTop" or defName="DankPyon_Adorned_GreatHelm"]/equippedStatOffsets</xpath>
-					<value>
-						<AimingAccuracy>-0.4</AimingAccuracy><!--CE Bascinet-->
-						<MeleeHitChance>-2</MeleeHitChance>
-						<Suppressability>-0.20</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[ defName="DankPyon_Headgear_ClosedBascinetHelmet" or defName="DankPyon_Headgear_SalletHelmet" or defName="DankPyon_Headgear_Bascinet_KlappvisierHelmetClosed" or defName="DankPyon_Adorned_FlatTop"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Headgear_GreatHelm" or defName="DankPyon_Headgear_HeraldicGreatHelm1c" or defName="DankPyon_Headgear_Armet" or defName="DankPyon_Headgear_ArmetGilded" or defName="DankPyon_Headgear_ArmetNamed" or defName="DankPyon_Adorned_GreatHelm"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3.75</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Headgear_ZweihandersHat"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Medieval Overhaul/MO_Apparel_Misc.xml b/Patches/Medieval Overhaul/MO_Apparel_Misc.xml
deleted file mode 100644
index 4fa10c44a3..0000000000
--- a/Patches/Medieval Overhaul/MO_Apparel_Misc.xml	
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Medieval Overhaul</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Jewelry-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="DankPyon_NecklaceBase"]/statBases</xpath>
-					<value>
-						<Bulk>0.25</Bulk>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-
-				<!--Utility-->
-				<!--Quiver-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Quiver"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Quiver"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>15</CarryBulk>
-							<ReloadSpeed>0.4</ReloadSpeed>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!--Gloves 'n Boots'-->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="DankPyon_Handwear_GlovesLeather" or defName="DankPyon_Handwear_GlovesSplinted" or defName="DankPyon_Handwear_GlovesPlate" or defName="DankPyon_Footwear_BootsLeather" or defName="DankPyon_Footwear_BootsSplinted" or defName="DankPyon_Footwear_BootsPlate"]/equippedStatOffsets</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Handwear_GlovesLeather" or defName="DankPyon_Handwear_GlovesSplinted" or defName="DankPyon_Handwear_GlovesPlate" or defName="DankPyon_Footwear_BootsLeather" or defName="DankPyon_Footwear_BootsSplinted" or defName="DankPyon_Footwear_BootsPlate"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Handwear_GlovesLeather" or defName="DankPyon_Footwear_BootsLeather"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Handwear_GlovesSplinted" or defName="DankPyon_Footwear_BootsSplinted"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.25</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Handwear_GlovesPlate" or defName="DankPyon_Footwear_BootsPlate"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!--Body-->
-				<!--Sackcloth-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Sackcloth"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Sackcloth"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!--Leather Tunic-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Leather_Tunic"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_Leather_Tunic"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!--Pants-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="DankPyon_Base_Pants"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="DankPyon_Base_Pants"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Attachments -->
-				<!-- ======= Hood ======= -->
-				<!-- === Wolf === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="DankPyon_WolfHoodBase"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="DankPyon_WolfHoodBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.45</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="DankPyon_WolfHoodBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.20</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- === Bear === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="DankPyon_BearHoodBase"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="DankPyon_BearHoodBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.55</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="DankPyon_BearHoodBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.24</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ======= Pelt ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_DirewolfPelt" or defName="DankPyon_Apparel_HyenaPelt"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_DirewolfPelt" or defName="DankPyon_Apparel_HyenaPelt"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_DirewolfPelt" or defName="DankPyon_Apparel_HyenaPelt"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>0.45</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Apparel_DirewolfPelt" or defName="DankPyon_Apparel_HyenaPelt"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>0.20</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Medieval Overhaul/MO_Items.xml b/Patches/Medieval Overhaul/MO_Items.xml
deleted file mode 100644
index 82f69fb527..0000000000
--- a/Patches/Medieval Overhaul/MO_Items.xml	
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Medieval Overhaul</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="DankPyon_DrugBase" or defName="DankPyon_JuiceApple" or defName="DankPyon_JuiceAppleUnfermented"]/statBases</xpath>
-					<value>
-						<Bulk>1.5</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="DankPyon_DrugBase" or defName="DankPyon_JuiceApple" or defName="DankPyon_JuiceAppleUnfermented"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2.22</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>neck</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>3.33</cooldownTime>
-								<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Neck</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Medieval Overhaul/MO_Materials.xml b/Patches/Medieval Overhaul/MO_Materials.xml
deleted file mode 100644
index f587ae482b..0000000000
--- a/Patches/Medieval Overhaul/MO_Materials.xml	
+++ /dev/null
@@ -1,816 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Medieval Overhaul</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Remove and Adjust - Rox Horn, Daer Antler, Scorpio Bolt, Ballista Bolt, And Stone Boulders -->
-				<!-- Scorpio Bolt, Ballista Bolt, and Stone Boulders -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="DankPyon_ScorpioBolt" or defName="DankPyon_BallistaBolt" or defName="DankPyon_StoneBoulder" or defName="DankPyon_StoneBoulderTarred"]</xpath>
-				</li>
-
-				<!-- Rox Horn and Daer Antler -->
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="DankPyon_RoxHorn" or defName="DankPyon_DaerAntler"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>ResourceBase</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="DankPyon_RoxHorn" or defName="DankPyon_DaerAntler"]/tools</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_RoxHorn" or defName="DankPyon_DaerAntler"]/statBases/Mass</xpath>
-					<value>
-						<Mass>30</Mass>
-						<Bulk>20</Bulk>
-					</value>
-				</li>
-
-				<!--Basegame rebalance-->
-				<!--Thrumbo Fur-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Thrumbo"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.60</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Thrumbo"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.20</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!--Cloth-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Cloth"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.03</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Cloth"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.02</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!--Linen-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Linen"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.2</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Linen"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.02</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<!--Silk-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Silk"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.3</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Silk"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.02</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<!--Leathers-->
-				<!--Leather-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Plain"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.08</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Plain"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.055</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<!--Thick Leather-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Bear"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.12</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<!--MO and CE both add blunt armor to this def, so it ends up as a duplicate node-->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Leather_Bear"]/statBases/StuffPower_Armor_Blunt</xpath>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Leather_Bear"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.08</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<!--Soft Fur-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Light"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.03</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Light"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.02</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<!--Heavy Fur-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Bluefur"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.09</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Bluefur"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.06</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<!--Scale Leather-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Lizard"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.08</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Lizard"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.06</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!--Thick Scale Leather-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Rhinoceros"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.14</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<!--MO and CE both add blunt armor to this def, so it ends up as a duplicate node-->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Leather_Rhinoceros"]/statBases/StuffPower_Armor_Blunt</xpath>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Leather_Rhinoceros"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!--Bird Leather-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Bird"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.06</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Bird"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.04</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!--Human Leather-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Human"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.06</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Human"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.04</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!--Patchleather-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Patch"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.08</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Patch"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.055</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!--Rawhide-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Leather_Rawhide"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.08</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Leather_Rawhide"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.055</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="DankPyon_Leather_Rawhide"]/statBases/StuffPower_Armor_Heat</xpath>
-				</li>
-
-				<!-- Unique Leathers
-			<li Class="PatchOperationReplace">
-               <xpath>Defs/ThingDef[defName="DankPyon_Leather_Direwolf"]/statBases/StuffPower_Armor_Sharp</xpath>
-               <value>
-                  <StuffPower_Armor_Sharp>0.14</StuffPower_Armor_Sharp>
-               </value>
-            </li>
-
-            <li Class="PatchOperationAdd">
-               <xpath>Defs/ThingDef[defName="DankPyon_Leather_Direwolf"]/statBases</xpath>
-               <value>
-                  <StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
-               </value>
-            </li>
-			
-			<li Class="PatchOperationReplace">
-               <xpath>Defs/ThingDef[defName="DankPyon_Leather_Hyena"]/statBases/StuffPower_Armor_Sharp</xpath>
-               <value>
-                  <StuffPower_Armor_Sharp>0.12</StuffPower_Armor_Sharp>
-               </value>
-            </li>
-
-            <li Class="PatchOperationAdd">
-               <xpath>Defs/ThingDef[defName="DankPyon_Leather_Hyena"]/statBases</xpath>
-               <value>
-                  <StuffPower_Armor_Blunt>0.08</StuffPower_Armor_Blunt>
-               </value> 
-            </li> -->
-
-				<!-- Rare Creatures -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Leather_Rox" or defName="DankPyon_Leather_Daer" or defName="DankPyon_Leather_Lindwurm"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.3</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Leather_Rox" or defName="DankPyon_Leather_Daer" or defName="DankPyon_Leather_Lindwurm"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.15</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!--Iron, Woods-->
-				<!--Iron-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_IronIngot"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_IronIngot"]/stuffProps/categories</xpath>
-					<value>
-						<li>Metallic_Weapon</li>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_IronIngot"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.85</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_IronIngot"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1.3</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_IronIngot"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="DankPyon_IronIngot"]/statBases/StuffPower_Armor_Heat</xpath>
-				</li>
-
-				<!-- Bone -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Bone"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.99</cooldownTime>
-								<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Bone"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>1</MeleeParryChance>
-							<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Bone"]/statBases</xpath>
-					<value>
-						<Bulk>0.07</Bulk>
-						<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Bone"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.15</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Bone"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.3</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Bone"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.025</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Bone"]/statBases/SharpDamageMultiplier</xpath>
-					<value>
-						<SharpDamageMultiplier>0.7</SharpDamageMultiplier>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Bone"]/statBases/BluntDamageMultiplier</xpath>
-					<value>
-						<BluntDamageMultiplier>0.5</BluntDamageMultiplier>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Bone"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>0.3</Mass>
-						<MeleePenetrationFactor>0.3</MeleePenetrationFactor>
-					</value>
-				</li>
-
-				<!-- Raw Wood -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_RawWood"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.99</cooldownTime>
-								<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_RawWood"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>1</MeleeParryChance>
-							<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_RawWood"]/statBases</xpath>
-					<value>
-						<Bulk>0.07</Bulk>
-						<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_RawWood"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.1</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_RawWood"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.2</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_RawWood"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.025</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_RawWood"]/statBases/SharpDamageMultiplier</xpath>
-					<value>
-						<SharpDamageMultiplier>0.7</SharpDamageMultiplier>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_RawWood"]/statBases/BluntDamageMultiplier</xpath>
-					<value>
-						<BluntDamageMultiplier>0.5</BluntDamageMultiplier>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_RawWood"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>0.3</Mass>
-						<MeleePenetrationFactor>0.3</MeleePenetrationFactor>
-					</value>
-				</li>
-
-				<!-- Dark Wood -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_DarkWoodLog"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.99</cooldownTime>
-								<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_DarkWoodLog"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>1</MeleeParryChance>
-							<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_DarkWoodLog"]/statBases</xpath>
-					<value>
-						<Bulk>0.07</Bulk>
-						<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_DarkWoodLog"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.15</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_DarkWoodLog"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.3</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_DarkWoodLog"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.025</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_DarkWoodLog"]/statBases/SharpDamageMultiplier</xpath>
-					<value>
-						<SharpDamageMultiplier>0.7</SharpDamageMultiplier>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_DarkWoodLog"]/statBases/BluntDamageMultiplier</xpath>
-					<value>
-						<BluntDamageMultiplier>0.5</BluntDamageMultiplier>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_DarkWoodLog"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>0.3</Mass>
-						<MeleePenetrationFactor>0.3</MeleePenetrationFactor>
-					</value>
-				</li>
-
-				<!-- Elven Wood -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_ElvenWoodLog"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.99</cooldownTime>
-								<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_ElvenWoodLog"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>1</MeleeParryChance>
-							<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_ElvenWoodLog"]/statBases</xpath>
-					<value>
-						<Bulk>0.07</Bulk>
-						<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_ElvenWoodLog"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.15</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_ElvenWoodLog"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.3</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_ElvenWoodLog"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.025</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_ElvenWoodLog"]/statBases/SharpDamageMultiplier</xpath>
-					<value>
-						<SharpDamageMultiplier>0.7</SharpDamageMultiplier>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_ElvenWoodLog"]/statBases/BluntDamageMultiplier</xpath>
-					<value>
-						<BluntDamageMultiplier>0.5</BluntDamageMultiplier>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_ElvenWoodLog"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>0.3</Mass>
-						<MeleePenetrationFactor>0.3</MeleePenetrationFactor>
-					</value>
-				</li>
-
-				<!-- Dryad Wood -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_DryadWoodLog"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.99</cooldownTime>
-								<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_DryadWoodLog"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>1</MeleeParryChance>
-							<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_DryadWoodLog"]/statBases</xpath>
-					<value>
-						<Bulk>0.07</Bulk>
-						<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_DryadWoodLog"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.15</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_DryadWoodLog"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.3</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_DryadWoodLog"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.025</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_DryadWoodLog"]/statBases/SharpDamageMultiplier</xpath>
-					<value>
-						<SharpDamageMultiplier>0.7</SharpDamageMultiplier>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_DryadWoodLog"]/statBases/BluntDamageMultiplier</xpath>
-					<value>
-						<BluntDamageMultiplier>0.5</BluntDamageMultiplier>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_DryadWoodLog"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>0.3</Mass>
-						<MeleePenetrationFactor>0.3</MeleePenetrationFactor>
-					</value>
-				</li>
-
-				<!-- Ancient Wood -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_AncientWoodLog"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.99</cooldownTime>
-								<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_AncientWoodLog"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>1</MeleeParryChance>
-							<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_AncientWoodLog"]/statBases</xpath>
-					<value>
-						<Bulk>0.07</Bulk>
-						<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_AncientWoodLog"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.15</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_AncientWoodLog"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.3</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_AncientWoodLog"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.025</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_AncientWoodLog"]/statBases/SharpDamageMultiplier</xpath>
-					<value>
-						<SharpDamageMultiplier>0.7</SharpDamageMultiplier>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_AncientWoodLog"]/statBases/BluntDamageMultiplier</xpath>
-					<value>
-						<BluntDamageMultiplier>0.5</BluntDamageMultiplier>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_AncientWoodLog"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>0.3</Mass>
-						<MeleePenetrationFactor>0.3</MeleePenetrationFactor>
-					</value>
-				</li>
-
-				<!--This thing was also a bit annoying-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "DankPyon_TanningLiquor"]/stackLimit</xpath>
-					<value>
-						<stackLimit>75</stackLimit>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Medieval Overhaul/MO_Pawns_Medieval.xml b/Patches/Medieval Overhaul/MO_Pawns_Medieval.xml
deleted file mode 100644
index 6e50ef3c4b..0000000000
--- a/Patches/Medieval Overhaul/MO_Pawns_Medieval.xml	
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Medieval Overhaul</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--disabled very stupid raid type-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/FactionDef[@Name = "DankPyon_NobleHouseFactionBase"]/pawnGroupMakers/li[2]/commonality</xpath>
-					<value>
-						<commonality>0</commonality>
-					</value>
-				</li>
-
-				<!--Give Shields-->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="DankPyon_Medieval_Mercenary" or
-						defName="DankPyon_Medieval_MercenaryHeavy"] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>100</min>
-								<max>350</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>KiteShield</li>
-								<li>HeaterShield</li>
-								<li>Buckler</li>
-							</shieldTags>
-							<shieldChance>0.35</shieldChance>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="DankPyon_Medieval_Footman"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>100</min>
-								<max>350</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>KiteShield</li>
-								<li>HeaterShield</li>
-								<li>Buckler</li>
-							</shieldTags>
-							<shieldChance>0.65</shieldChance>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="DankPyon_Medieval_Knight" or defName="DankPyon_Medieval_Lord"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>200</min>
-								<max>600</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>HeaterShield</li>
-								<li>KiteShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-						</li>
-					</value>
-				</li>
-
-				<!-- Trying to add shields to Arbalesters, doesn't work
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="DankPyon_Medieval_Arbalester"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>100</min>
-								<max>600</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>Pavise</li>
-								<li>KiteShield</li>
-							</shieldTags>
-							<shieldChance>0.9</shieldChance>
-						</li>
-					</value>
-				</li>-->
-
-				<!--Give ammo to crosbowman-->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="DankPyon_Medieval_Arbalester"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>12</min>
-								<max>20</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>100</min>
-									<max>200</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>NeolithicMeleeBasic</li>
-									<li>MedievalMeleeDecent</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="DankPyon_Medieval_Bowman"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>15</min>
-								<max>30</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>50</min>
-									<max>150</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>NeolithicMeleeBasic</li>
-									<li>MedievalMeleeDecent</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="DankPyon_BrigandMarksman"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>12</min>
-								<max>20</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>50</min>
-									<max>150</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>NeolithicMeleeBasic</li>
-									<li>MedievalMeleeDecent</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[
-						defName="DankPyon_Medieval_Arbalester" or
-						defName="DankPyon_Medieval_Bowman" or
-						defName="DankPyon_BrigandMarksman"] </xpath>
-					<value>
-						<apparelRequired>
-							<li>CE_Apparel_TribalBackpack</li>
-							<li>DankPyon_Apparel_Quiver</li>
-						</apparelRequired>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[defName="DankPyon_Medieval_Arbalester" or defName="DankPyon_BrigandMarksman"]/weaponTags</xpath>
-					<value>
-						<li>CE_XBow</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[defName="DankPyon_Medieval_Bowman" or defName="DankPyon_BrigandMarksman"]/weaponTags</xpath>
-					<value>
-						<li>CE_Bow</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Medieval Overhaul/MO_Races.xml b/Patches/Medieval Overhaul/MO_Races.xml
deleted file mode 100644
index 593530637c..0000000000
--- a/Patches/Medieval Overhaul/MO_Races.xml	
+++ /dev/null
@@ -1,997 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Medieval Overhaul</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= Farm Animal ======= -->
-				<!-- Hampshire, Gloucestershire -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Hampshire" or defName="DankPyon_Gloucestershire"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.07</MeleeDodgeChance>
-						<MeleeCritChance>0.06</MeleeCritChance>
-						<MeleeParryChance>0.08</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Hampshire" or defName="DankPyon_Gloucestershire"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.5</cooldownTime>
-								<chanceFactor>0.7</chanceFactor>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.12</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="DankPyon_Hampshire" or defName="DankPyon_Gloucestershire"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- Ravelder, Angus -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Ravelder" or defName="DankPyon_Angus"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.08</MeleeDodgeChance>
-						<MeleeCritChance>0.13</MeleeCritChance>
-						<MeleeParryChance>0.22</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Ravelder" or defName="DankPyon_Angus"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1</cooldownTime>
-								<chanceFactor>0.7</chanceFactor>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>2.12</cooldownTime>
-								<chanceFactor>0.2</chanceFactor>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>horns</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>2.0</cooldownTime>
-								<chanceFactor>0.65</chanceFactor>
-								<restrictedGender>Male</restrictedGender>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="DankPyon_Ravelder" or defName="DankPyon_Angus"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Rox === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Rox"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.06</MeleeDodgeChance>
-						<MeleeCritChance>0.41</MeleeCritChance>
-						<MeleeParryChance>0.48</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Rox"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>2.52</cooldownTime>
-								<chanceFactor>0.4</chanceFactor>
-								<linkedBodyPartsGroup>HornAttackTool_2</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>2.13</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>14.640</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>2.13</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>14.640</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>1.62</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.016</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2.52</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="DankPyon_Rox"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="DankPyon_Rox"]/combatPower</xpath>
-					<value>
-						<combatPower>375</combatPower>
-					</value>
-				</li>
-
-				<!-- === Direwolf === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="DankPyon_Direwolf"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Direwolf"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>7</MoveSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Direwolf"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-						<MeleeDodgeChance>0.21</MeleeDodgeChance>
-						<MeleeCritChance>0.20</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Direwolf"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.19</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.19</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.46</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<chanceFactor>2</chanceFactor>
-								<armorPenetrationSharp>1.6</armorPenetrationSharp>
-								<armorPenetrationBlunt>8.863</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>3.2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.225</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="DankPyon_Direwolf"]/combatPower</xpath>
-					<value>
-						<combatPower>140</combatPower>
-					</value>
-				</li>
-
-				<!-- === Hyena === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="DankPyon_Hyena"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Hyena"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>6.25</MoveSpeed>
-						<MeleeDodgeChance>0.26</MeleeDodgeChance>
-						<MeleeCritChance>0.09</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Hyena"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.73</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.55</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.225</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="DankPyon_Hyena"]/combatPower</xpath>
-					<value>
-						<combatPower>80</combatPower>
-					</value>
-				</li>
-
-				<!-- === Daer === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Daer"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.14</MeleeDodgeChance>
-						<MeleeCritChance>0.27</MeleeCritChance>
-						<MeleeParryChance>0.3</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Daer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>2.6</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>7</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>7</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2.44</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="DankPyon_Daer"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="DankPyon_Daer"]/combatPower</xpath>
-					<value>
-						<combatPower>300</combatPower>
-					</value>
-				</li>
-
-				<!-- === Dire Boar === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_DireBoar"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						<MeleeCritChance>0.33</MeleeCritChance>
-						<MeleeParryChance>0.34</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_DireBoar"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tusk</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Stab</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>2.6</cooldownTime>
-								<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>2.6</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.92</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="DankPyon_DireBoar"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Schrat === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Schrat"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						<MeleeCritChance>0.14</MeleeCritChance>
-						<MeleeParryChance>0.22</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Schrat"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="DankPyon_Schrat"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- ======= Snakes ======= -->
-				<!-- === Large Cobra === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="DankPyon_LargeCobraBase"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.19</MeleeDodgeChance>
-						<MeleeCritChance>0.18</MeleeCritChance>
-						<MeleeParryChance>0.17</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="DankPyon_LargeCobraBase"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>venom-fangs</label>
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.20</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="DankPyon_LargeCobraBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Serpentine</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Giant Constrictor === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="DankPyon_GiantConstrictorBase"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						<MeleeCritChance>0.12</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="DankPyon_GiantConstrictorBase"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>2.26</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.49</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.92</cooldownTime>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="DankPyon_GiantConstrictorBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Serpentine</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Lindwurm === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="DankPyon_LindwurmBase"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.20</MeleeDodgeChance>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>0.08</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="DankPyon_LindwurmBase"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>32</power>
-								<cooldownTime>2.6</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.7</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.823</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.18</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.823</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.18</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.823</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>tail</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>4</cooldownTime>
-								<linkedBodyPartsGroup>DankPyon_TailAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="DankPyon_LindwurmBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- deathstinger - used Megascarab as reference -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Deathstinger"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>5.1</MoveSpeed>
-						<MeleeDodgeChance>0.22</MeleeDodgeChance>
-						<MeleeCritChance>0.03</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Deathstinger"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.24</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Deathstinger"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2.25</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Deathstinger"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.7</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Deathstinger"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>0.5</baseHealthScale>
-					</value>
-				</li>
-
-				<!-- northern boar - used wildboar as reference -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="DankPyon_NorthernBoar"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_NorthernBoar"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.14</MeleeCritChance>
-						<MeleeParryChance>0.14</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_NorthernBoar"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tusk</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.89</cooldownTime>
-								<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>tusk</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.41</cooldownTime>
-								<chanceFactor>0.65</chanceFactor>
-								<linkedBodyPartsGroup>TuskAttackTool_2</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.940</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>8.7</power>
-								<cooldownTime>1.57</cooldownTime>
-								<chanceFactor>0.6</chanceFactor>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.08</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.12</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Medieval Overhaul/MO_Scenarios.xml b/Patches/Medieval Overhaul/MO_Scenarios.xml
deleted file mode 100644
index c4de1a3011..0000000000
--- a/Patches/Medieval Overhaul/MO_Scenarios.xml	
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Medieval Overhaul</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="DankPyon_TavernOwnerStart"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_ScatterThingsNearPlayerStart">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_Arrow_Steel</thingDef>
-							<count>60</count>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Medieval Overhaul/MO_Shields.xml b/Patches/Medieval Overhaul/MO_Shields.xml
deleted file mode 100644
index c7296c4a99..0000000000
--- a/Patches/Medieval Overhaul/MO_Shields.xml	
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Medieval Overhaul</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Replace ThingClass-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="DankPyon_BaseShield"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Apparel_Shield</thingClass>
-					</value>
-				</li>
-
-				<!--Replace Parent-->
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[@Name="DankPyon_BaseShield"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>ArmorSmithableBase</value>
-				</li>
-
-				<!--Replace Apparel Layer & BodyPart Group-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="DankPyon_BaseShield"]/apparel/layers</xpath>
-					<value>
-						<layers>
-							<li>Shield</li>
-						</layers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="DankPyon_BaseShield"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>LeftShoulder</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-				<!--Remove VFE Shield Stuff-->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="DankPyon_BaseShield"]/tools</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="DankPyon_Shield" or defName="DankPyon_ShieldKite" or defName="DankPyon_ShieldHeater" or defName="DankPyon_ShieldHeater_Amboise" or defName="DankPyon_ShieldHeater_Soren" or defName="DankPyon_ShieldHeater_Oswin" or defName="DankPyon_ShieldHeater_Hesse" ]/comps/li[@Class="VFECore.CompProperties_Shield"]</xpath>
-				</li>
-
-				<!--Add CE Shield Stuff-->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="DankPyon_BaseShield"]</xpath>
-					<value>
-						<li Class="CombatExtended.ShieldDefExtension">
-							<shieldCoverage>
-								<li>Hands</li>
-								<li>Arms</li>
-								<li>Shoulders</li>
-								<li>Torso</li>
-								<li>Neck</li>
-							</shieldCoverage>
-						</li>
-					</value>
-				</li>
-
-				<!--Add Bulk-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[ defName="DankPyon_Shield" or defName="DankPyon_ShieldKite" or defName="DankPyon_ShieldHeater" or @Name="DankPyon_ShieldHeaterBase"
-						]/statBases </xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<!--Replace Stat Offsets-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="DankPyon_BaseShield"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<ReloadSpeed>-0.2</ReloadSpeed>
-							<MeleeHitChance>-1</MeleeHitChance>
-							<ShootingAccuracyPawn>-0.15</ShootingAccuracyPawn>
-							<AimingAccuracy>-0.08</AimingAccuracy>
-							<Suppressability>-0.25</Suppressability>
-							<MeleeCritChance>-0.05</MeleeCritChance>
-							<MeleeParryChance>1.0</MeleeParryChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!--Replace Stuff Thickness-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Shield"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_ShieldKite"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.85</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_ShieldHeater"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.85</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="DankPyon_ShieldHeaterBase"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.85</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Medieval Overhaul/MO_Siege_Ballistas.xml b/Patches/Medieval Overhaul/MO_Siege_Ballistas.xml
deleted file mode 100644
index 9535523baa..0000000000
--- a/Patches/Medieval Overhaul/MO_Siege_Ballistas.xml	
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Medieval Overhaul</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Clean and Replace-->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="DankPyon_Turret_Ballista" or defName="DankPyon_Turret_RepeaterBallista"]/comps/li[@Class="CompProperties_Refuelable"]</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Turret_Ballista" or defName="DankPyon_Turret_RepeaterBallista"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Turret_Ballista" or defName="DankPyon_Turret_RepeaterBallista"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<!--Ballista Ammos-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_BallistaJavelins</defName>
-							<label>javelins</label>
-							<ammoTypes>
-								<Pila>BallistaPilum_Fired</Pila>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BasePilumProjectile">
-							<defName>BallistaPilum_Fired</defName>
-							<label>pilum (fired)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>45</damageAmountBase>
-								<speed>60</speed>
-								<armorPenetrationBlunt>141.12</armorPenetrationBlunt>
-								<armorPenetrationSharp>13</armorPenetrationSharp>
-								<preExplosionSpawnChance>0.4</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Pila</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- ========== Ballista - Weapon ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DankPyon_Gun_BallistaTurret</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>1</ShotSpread>
-						<SwayFactor>0.2</SwayFactor>
-						<Bulk>4.00</Bulk>
-						<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>BallistaPilum_Fired</defaultProjectile>
-						<warmupTime>1.4</warmupTime>
-						<range>45</range>
-						<soundCast>BulletImpact_Wood</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>2.8</reloadTime>
-						<ammoSet>AmmoSet_BallistaJavelins</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>false</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!-- ========== Repeater Ballista - Weapon ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DankPyon_Gun_RepeaterBallistaTurret</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>1</ShotSpread>
-						<SwayFactor>0.2</SwayFactor>
-						<Bulk>4.00</Bulk>
-						<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>BallistaPilum_Fired</defaultProjectile>
-						<warmupTime>1.4</warmupTime>
-						<range>45</range>
-						<burstShotCount>2</burstShotCount>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<soundCast>BulletImpact_Wood</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>2</magazineSize>
-						<reloadTime>3.6</reloadTime>
-						<ammoSet>AmmoSet_BallistaJavelins</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Gun_BallistaTurret" or defName="DankPyon_Gun_RepeaterBallistaTurret"]/weaponTags</xpath>
-					<value>
-						<li>TurretGun</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/RecipeDef[defName="DankPyon_MakeBullet_BallistaBolt" or defName="DankPyon_MakeBullet_BallistaBoltBulk"]</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Medieval Overhaul/MO_Siege_Misc.xml b/Patches/Medieval Overhaul/MO_Siege_Misc.xml
deleted file mode 100644
index 235d49fdf6..0000000000
--- a/Patches/Medieval Overhaul/MO_Siege_Misc.xml	
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Medieval Overhaul</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Adjust palisade embrasure fill.-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_EmbPalisade"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.70</fillPercent>
-					</value>
-				</li>
-
-				<!--Adjust castle embrasure fill.-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_CastleWallEmbrasures"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.70</fillPercent>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Medieval Overhaul/MO_Siege_Scorpio.xml b/Patches/Medieval Overhaul/MO_Siege_Scorpio.xml
deleted file mode 100644
index 76a315fe96..0000000000
--- a/Patches/Medieval Overhaul/MO_Siege_Scorpio.xml	
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Medieval Overhaul</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Clean and Replace-->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="DankPyon_Turret_Scorpio"]/comps/li[@Class="CompProperties_Refuelable"]</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Turret_Scorpio"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Turret_Scorpio"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<!-- === Scorpio Ammo === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_ScorpioBolt</defName>
-							<label>scorpio bolts</label>
-							<ammoTypes>
-								<Ammo_CrossbowBolt_Stone>Projectile_ScorpioBolt_Stone</Ammo_CrossbowBolt_Stone>
-								<Ammo_CrossbowBolt_Steel>Projectile_ScorpioBolt_Steel</Ammo_CrossbowBolt_Steel>
-								<Ammo_CrossbowBolt_Plasteel>Projectile_ScorpioBolt_Plasteel</Ammo_CrossbowBolt_Plasteel>
-								<Ammo_CrossbowBolt_Venom>Projectile_ScorpioBolt_Venom</Ammo_CrossbowBolt_Venom>
-								<Ammo_CrossbowBolt_Flame>Projectile_ScorpioBolt_Flame</Ammo_CrossbowBolt_Flame>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef ParentName="BaseCrossbowBoltProjectile">
-							<defName>Projectile_ScorpioBolt_Stone</defName>
-							<label>scorpio bolt (stone)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Stone</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>9</damageAmountBase>
-								<armorPenetrationBlunt>1.65</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.95</armorPenetrationSharp>
-								<preExplosionSpawnChance>0.05</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Ammo_CrossbowBolt_Stone</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseCrossbowBoltProjectile">
-							<defName>Projectile_ScorpioBolt_Steel</defName>
-							<label>scorpio bolt (steel)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>14</damageAmountBase>
-								<armorPenetrationBlunt>6.85</armorPenetrationBlunt>
-								<armorPenetrationSharp>3.45</armorPenetrationSharp>
-								<speed>22</speed>
-								<preExplosionSpawnChance>0.233</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Ammo_CrossbowBolt_Steel</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseCrossbowBoltProjectile">
-							<defName>Projectile_ScorpioBolt_Plasteel</defName>
-							<label>scorpio bolt (plasteel)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Plasteel</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationBlunt>8.82</armorPenetrationBlunt>
-								<armorPenetrationSharp>4.75</armorPenetrationSharp>
-								<speed>24</speed>
-								<preExplosionSpawnChance>0.5</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Ammo_CrossbowBolt_Plasteel</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseCrossbowBoltProjectile">
-							<defName>Projectile_ScorpioBolt_Venom</defName>
-							<label>scorpio bolt (venom)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Venom</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>ArrowVenom</damageDef>
-								<damageAmountBase>14</damageAmountBase>
-								<armorPenetrationBlunt>6.85</armorPenetrationBlunt>
-								<armorPenetrationSharp>3.25</armorPenetrationSharp>
-								<speed>22</speed>
-								<preExplosionSpawnChance>0.4</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Ammo_CrossbowBolt_Steel</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseCrossbowBoltProjectile">
-							<defName>Projectile_ScorpioBolt_Flame</defName>
-							<label>scorpio bolt (flame)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Flame</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Flame</damageDef>
-								<damageAmountBase>7</damageAmountBase>
-								<armorPenetrationBlunt>3.68</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.25</armorPenetrationSharp>
-								<speed>22</speed>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-				<!-- ========== Scorpio - Weapon ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DankPyon_Gun_ScorpioTurret</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>1</ShotSpread>
-						<SwayFactor>1</SwayFactor>
-						<Bulk>4.00</Bulk>
-						<RangedWeapon_Cooldown>1.8</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_ScorpioBolt_Steel</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>42</range>
-						<soundCast>Bow_Large</soundCast>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_ScorpioBolt</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>false</noSingleShot>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Gun_ScorpioTurret"]/weaponTags</xpath>
-					<value>
-						<li>TurretGun</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/RecipeDef[defName="DankPyon_MakeBullet_ScorpioBolt" or defName="DankPyon_MakeBullet_ScorpioBoltBulk"]</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Medieval Overhaul/MO_Siege_Trebuchet.xml b/Patches/Medieval Overhaul/MO_Siege_Trebuchet.xml
deleted file mode 100644
index 214588676a..0000000000
--- a/Patches/Medieval Overhaul/MO_Siege_Trebuchet.xml	
+++ /dev/null
@@ -1,276 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Medieval Overhaul</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="DankPyon_BaseTrebuchetBuilding"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Turret_Trebuchet"]/building</xpath>
-					<value>
-						<spawnedConceptLearnOpportunity>CE_MortarDirectFire</spawnedConceptLearnOpportunity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="DankPyon_BaseTrebuchetBuilding"]/statBases</xpath>
-					<value>
-						<SightsEfficiency>0.5</SightsEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="DankPyon_Artillery_Trebuchet"]/comps/li[@Class="CompProperties_ChangeableProjectile"]</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Artillery_Trebuchet"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Charges">
-							<chargeSpeeds>
-								<li>30</li>
-								<li>50</li>
-								<li>70</li>
-								<li>90</li>
-							</chargeSpeeds>
-						</li>
-						<li Class="CombatExtended.CompProperties_AmmoUser">
-							<magazineSize>1</magazineSize>
-							<reloadTime>14</reloadTime>
-							<ammoSet>AmmoSet_Trebuchet</ammoSet>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Artillery_Trebuchet"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-								<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Projectile_CatapultBullet_Boulder</defaultProjectile>
-								<warmupTime>4</warmupTime>
-								<minRange>30</minRange>
-								<range>500</range>
-								<burstShotCount>1</burstShotCount>
-								<soundCast>Bow_Recurve</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<indirectFirePenalty>0.2</indirectFirePenalty>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>Catapult_TarBoulder</defName>
-							<label>tarred boulder</label>
-							<labelShort>tarred boulder</labelShort>
-							<description>A large, heavy boulder covered in tar.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Trebuchet</defName>
-							<label>siege engine ammunition</label>
-							<ammoTypes>
-								<Ammo_Catapult_Boulder>Projectile_CatapultBullet_Boulder</Ammo_Catapult_Boulder>
-								<Ammo_Catapult_TarBoulder>Projectile_CatapultBullet_TarBoulder</Ammo_Catapult_TarBoulder>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="CatapultShellBase">
-							<defName>Ammo_Catapult_TarBoulder</defName>
-							<label>tarred boulder</label>
-							<description>A heavy stone, cut to an appropriate size and shape to be thrown by a siege engine. \n\nCovered with tar, which can be lit once ready to be thrown.</description>
-							<graphicData>
-								<texPath>Resources/STarredStoneBoulder</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<Mass>15</Mass>
-								<DeteriorationRate>0</DeteriorationRate>
-							</statBases>
-							<ammoClass>Catapult_TarBoulder</ammoClass>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseCatapultBullet">
-							<defName>Projectile_CatapultBullet_TarBoulder</defName>
-							<label>tar covered boulder</label>
-							<graphicData>
-								<texPath>Projectile/BoulderFlamingBullet</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-								<drawSize>(2.5,2.5)</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Blunt</damageDef>
-								<damageAmountBase>250</damageAmountBase>
-								<explosionRadius>1.5</explosionRadius>
-								<soundExplode>DankPyon_Explosion_Boulder</soundExplode>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<ai_IsIncendiary>true</ai_IsIncendiary>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<explosiveDamageType>Flame</explosiveDamageType>
-									<damageAmountBase>80</damageAmountBase>
-									<explosiveRadius>3</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-									<preExplosionSpawnChance>0.4</preExplosionSpawnChance>
-									<preExplosionSpawnThingDef>DankPyon_Filth_Tar</preExplosionSpawnThingDef>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<RecipeDef ParentName="MakeStoneBlocksBase">
-							<defName>MakeAmmo_Catapult_BoulderBulk</defName>
-							<label>cut stone chunk into boulder x5</label>
-							<workAmount>8000</workAmount>
-							<description>Cuts a stone chunk down to size to be thrown by a siege engine.</description>
-							<ingredients>
-								<li>
-									<filter>
-										<categories>
-											<li>StoneChunks</li>
-										</categories>
-									</filter>
-									<count>5</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<categories>
-									<li>StoneChunks</li>
-								</categories>
-							</fixedIngredientFilter>
-							<recipeUsers Inherit="False">
-								<li>TableStonecutter</li>
-							</recipeUsers>
-							<products>
-								<Ammo_Catapult_Boulder>5</Ammo_Catapult_Boulder>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="MakeStoneBlocksBase">
-							<defName>MakeAmmo_Catapult_TarBoulder</defName>
-							<label>tar a stone boulder</label>
-							<description>Cuts a stone chunk down to size and covers in tar to be thrown by a siege engine.</description>
-							<workAmount>400</workAmount>
-							<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-							<workSkill>Crafting</workSkill>
-							<workSkillLearnFactor>0.25</workSkillLearnFactor>
-							<effectWorking>Smith</effectWorking>
-							<soundWorking>Recipe_Smith</soundWorking>
-							<researchPrerequisites>
-								<li>DankPyon_Tar</li>
-							</researchPrerequisites>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_Catapult_Boulder</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>DankPyon_Tar</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_Catapult_Boulder</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<recipeUsers Inherit="False">
-								<li>DankPyon_Workbench</li>
-							</recipeUsers>
-							<products>
-								<Ammo_Catapult_TarBoulder>1</Ammo_Catapult_TarBoulder>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="MakeStoneBlocksBase">
-							<defName>MakeAmmo_Catapult_TarBoulderBulk</defName>
-							<label>tar a stone boulder x5</label>
-							<description>Cuts a stone chunk down to size and covers in tar to be thrown by a siege engine.</description>
-							<workAmount>2000</workAmount>
-							<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-							<workSkill>Crafting</workSkill>
-							<workSkillLearnFactor>0.25</workSkillLearnFactor>
-							<effectWorking>Smith</effectWorking>
-							<soundWorking>Recipe_Smith</soundWorking>
-							<researchPrerequisites>
-								<li>DankPyon_Tar</li>
-							</researchPrerequisites>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Ammo_Catapult_Boulder</li>
-										</thingDefs>
-									</filter>
-									<count>5</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>DankPyon_Tar</li>
-										</thingDefs>
-									</filter>
-									<count>50</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Ammo_Catapult_Boulder</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<recipeUsers Inherit="False">
-								<li>DankPyon_Workbench</li>
-							</recipeUsers>
-							<products>
-								<Ammo_Catapult_TarBoulder>5</Ammo_Catapult_TarBoulder>
-							</products>
-						</RecipeDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Artillery_Trebuchet"]/weaponTags</xpath>
-					<value>
-						<li>TurretGun</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/RecipeDef[defName="DankPyon_MakeBullet_StoneBoulder" or defName="DankPyon_MakeBullet_StoneBoulderBulk" or defName="DankPyon_MakeBullet_StoneBoulderTarred" or defName="DankPyon_MakeBullet_StoneBoulderTarredBulk"]</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Medieval Overhaul/MO_Traits.xml b/Patches/Medieval Overhaul/MO_Traits.xml
deleted file mode 100644
index 5237c0397a..0000000000
--- a/Patches/Medieval Overhaul/MO_Traits.xml	
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Medieval Overhaul</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/TraitDef[defName="DankPyon_Fighter" or defName="DankPyon_Veteran"]/degreeDatas/li/statOffsets</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraitDef[defName="DankPyon_Fighter"]/degreeDatas/li</xpath>
-					<value>
-						<statOffsets>
-							<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-							<AimingDelayFactor>-0.15</AimingDelayFactor>
-							<MeleeHitChance>3</MeleeHitChance>
-							<MeleeCritChance>0.15</MeleeCritChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-							<MeleeDodgeChance>0.3</MeleeDodgeChance>
-							<PawnTrapSpringChance>0.2</PawnTrapSpringChance>
-							<MentalBreakThreshold>-0.1</MentalBreakThreshold>
-							<PainShockThreshold>0.10</PainShockThreshold>
-							<Suppressability>-0.15</Suppressability>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraitDef[defName="DankPyon_Veteran"]/degreeDatas/li</xpath>
-					<value>
-						<statOffsets>
-							<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
-							<AimingDelayFactor>-0.15</AimingDelayFactor>
-							<MeleeHitChance>4</MeleeHitChance>
-							<MeleeCritChance>0.25</MeleeCritChance>
-							<MeleeParryChance>0.25</MeleeParryChance>
-							<MeleeDodgeChance>0.5</MeleeDodgeChance>
-							<PawnTrapSpringChance>0.1</PawnTrapSpringChance>
-							<MentalBreakThreshold>-0.2</MentalBreakThreshold>
-							<PainShockThreshold>0.10</PainShockThreshold>
-							<Suppressability>-0.25</Suppressability>
-						</statOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Medieval Overhaul/MO_Weapons_Grenades.xml b/Patches/Medieval Overhaul/MO_Weapons_Grenades.xml
deleted file mode 100644
index 28a7a186d5..0000000000
--- a/Patches/Medieval Overhaul/MO_Weapons_Grenades.xml	
+++ /dev/null
@@ -1,487 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Medieval Overhaul</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Grenade Base ========== -->
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[@Name="DankPyon_Medieval_MakeableGrenade"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>BaseWeapon</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="DankPyon_Medieval_MakeableGrenade"]/recipeMaker</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="DankPyon_Medieval_MakeableGrenade"]</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Body</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.75</cooldownTime>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Fire Bomb ========== -->
-
-				<!-- Projectile -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Proj_PotFire"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>0.5</explosionRadius>
-							<damageDef>Flame</damageDef>
-							<damageAmountBase>10</damageAmountBase>
-							<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
-							<preExplosionSpawnChance>1</preExplosionSpawnChance>
-							<speed>10</speed>
-							<ai_IsIncendiary>true</ai_IsIncendiary>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Proj_PotFire"]</xpath>
-					<value>
-						<thingClass>CombatExtended.Projectile_FireTrail</thingClass>
-					</value>
-				</li>
-
-				<!-- Grenade -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="DankPyon_Weapon_PotFire"]/costList</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Weapon_PotFire"]/graphicData/texPath</xpath>
-					<value>
-						<texPath>Projectile/FirePot</texPath>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Weapon_PotFire"]</xpath>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<stackLimit>50</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="DankPyon_Weapon_PotFire"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Weapon_PotFire"]/comps</xpath>
-					<value>
-						<li Class="CompProperties_Explosive">
-							<explosiveDamageType>Flame</explosiveDamageType>
-							<explosiveRadius>0.5</explosiveRadius>
-							<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
-							<preExplosionSpawnChance>1</preExplosionSpawnChance>
-							<startWickHitPointsPercent>0.7</startWickHitPointsPercent>
-							<explodeOnKilled>True</explodeOnKilled>
-							<wickTicks>60~80</wickTicks>
-						</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DankPyon_Weapon_PotFire</defName>
-					<statBases>
-						<Mass>0.6</Mass>
-						<Bulk>1.8</Bulk>
-						<MarketValue>3</MarketValue>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<label>throw fire pot</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<range>10</range>
-						<minRange>3</minRange>
-						<warmupTime>1.8</warmupTime>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<soundCast>ThrowMolotovCocktail</soundCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<defaultProjectile>DankPyon_Proj_PotFire</defaultProjectile>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>MakeFireBomb</defName>
-							<label>make fire bombs x10</label>
-							<description>Craft 10 fire bombs.</description>
-							<jobString>Making fire bombs.</jobString>
-							<workAmount>1200</workAmount>
-							<recipeUsers>
-								<li>CraftingSpot</li>
-							</recipeUsers>
-							<researchPrerequisite>DankPyon_Gunpowder</researchPrerequisite>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Cloth</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>DankPyon_Tar</li>
-										</thingDefs>
-									</filter>
-									<count>26</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Cloth</li>
-									<li>DankPyon_Tar</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<DankPyon_Weapon_PotFire>10</DankPyon_Weapon_PotFire>
-							</products>
-						</RecipeDef>
-					</value>
-				</li>
-
-				<!-- ========== Flash Bomb ========== -->
-
-				<!-- Projectile -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Proj_PotFlash"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>2.5</explosionRadius>
-							<damageDef>Stun</damageDef>
-							<explosionDelay>100</explosionDelay>
-							<speed>10</speed>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Proj_PotFlash"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Projectile_FireTrail</thingClass>
-					</value>
-				</li>
-
-				<!-- Grenade -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="DankPyon_Weapon_PotFlash"]/costList</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Weapon_PotFlash"]/graphicData/texPath</xpath>
-					<value>
-						<texPath>Projectile/FlashPot</texPath>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Weapon_PotFlash"]</xpath>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<stackLimit>50</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="DankPyon_Weapon_PotFlash"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Weapon_PotFlash"]/comps</xpath>
-					<value>
-						<li Class="CompProperties_Explosive">
-							<explosiveRadius>2.5</explosiveRadius>
-							<explosiveDamageType>Stun</explosiveDamageType>
-							<startWickHitPointsPercent>0.7</startWickHitPointsPercent>
-							<explodeOnKilled>True</explodeOnKilled>
-							<wickTicks>60~100</wickTicks>
-						</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DankPyon_Weapon_PotFlash</defName>
-					<statBases>
-						<Mass>0.6</Mass>
-						<Bulk>1.8</Bulk>
-						<MarketValue>3</MarketValue>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<label>throw flash pot</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<range>10</range>
-						<minRange>3</minRange>
-						<warmupTime>1.8</warmupTime>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<soundCast>ThrowMolotovCocktail</soundCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<defaultProjectile>DankPyon_Proj_PotFlash</defaultProjectile>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>MakeSmokeBomb</defName>
-							<label>make smoke bombs x10</label>
-							<description>Craft 10 smoke bombs.</description>
-							<jobString>Making smoke bombs.</jobString>
-							<workAmount>1200</workAmount>
-							<recipeUsers>
-								<li>CraftingSpot</li>
-							</recipeUsers>
-							<researchPrerequisite>DankPyon_Gunpowder</researchPrerequisite>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>DankPyon_Gunpowder</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>DankPyon_ComponentBasic</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>DankPyon_ComponentBasic</li>
-									<li>DankPyon_Gunpowder</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<DankPyon_Weapon_PotFlash>10</DankPyon_Weapon_PotFlash>
-							</products>
-						</RecipeDef>
-					</value>
-				</li>
-
-				<!-- ========== Smoke Bomb ========== -->
-
-				<!-- Projectile -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Proj_PotSmoke"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>3</explosionRadius>
-							<damageDef>Smoke</damageDef>
-							<suppressionFactor>0.0</suppressionFactor>
-							<dangerFactor>0.0</dangerFactor>
-							<explosionDelay>100</explosionDelay>
-							<postExplosionGasType>BlindSmoke</postExplosionGasType>
-							<postExplosionSpawnChance>1</postExplosionSpawnChance>
-							<speed>10</speed>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Proj_PotSmoke"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Projectile_FireTrail</thingClass>
-					</value>
-				</li>
-
-				<!-- Grenade -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="DankPyon_Weapon_PotFlashSmoke"]/costList</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Weapon_PotFlashSmoke"]/graphicData/texPath</xpath>
-					<value>
-						<texPath>Projectile/SmokePot</texPath>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Weapon_PotFlashSmoke"]</xpath>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<stackLimit>50</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="DankPyon_Weapon_PotFlashSmoke"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_Weapon_PotFlashSmoke"]/comps</xpath>
-					<value>
-						<li Class="CompProperties_Explosive">
-							<explosiveRadius>2.5</explosiveRadius>
-							<explosiveDamageType>Stun</explosiveDamageType>
-							<startWickHitPointsPercent>0.7</startWickHitPointsPercent>
-							<postExplosionGasType>BlindSmoke</postExplosionGasType>
-							<preExplosionSpawnChance>1</preExplosionSpawnChance>
-							<explodeOnKilled>True</explodeOnKilled>
-							<wickTicks>60~100</wickTicks>
-						</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DankPyon_Weapon_PotFlashSmoke</defName>
-					<statBases>
-						<Mass>0.6</Mass>
-						<Bulk>1.8</Bulk>
-						<MarketValue>3</MarketValue>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<label>throw smoke pot</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<range>10</range>
-						<minRange>3</minRange>
-						<warmupTime>1.8</warmupTime>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<soundCast>ThrowMolotovCocktail</soundCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<defaultProjectile>DankPyon_Proj_PotSmoke</defaultProjectile>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>MakeSmokeFlashBomb</defName>
-							<label>make smoke bombs x10</label>
-							<description>Craft 10 smoke bombs.</description>
-							<jobString>Making smoke bombs.</jobString>
-							<workAmount>1200</workAmount>
-							<recipeUsers>
-								<li>CraftingSpot</li>
-							</recipeUsers>
-							<researchPrerequisite>DankPyon_Gunpowder</researchPrerequisite>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>DankPyon_Gunpowder</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>DankPyon_ComponentBasic</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>DankPyon_ComponentBasic</li>
-									<li>DankPyon_Gunpowder</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<DankPyon_Weapon_PotFlashSmoke>10</DankPyon_Weapon_PotFlashSmoke>
-							</products>
-						</RecipeDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Medieval Overhaul/MO_Weapons_Melee.xml b/Patches/Medieval Overhaul/MO_Weapons_Melee.xml
deleted file mode 100644
index ac305ac1b6..0000000000
--- a/Patches/Medieval Overhaul/MO_Weapons_Melee.xml	
+++ /dev/null
@@ -1,2678 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Table of contents
-
-        Maces
-            Bludgeon
-            Nomad Mace
-            Morning Star
-            Winged Mace
-
-        Two-Handed Maces
-            Goedendag
-            Two-Handed Mace
-            Two-Handed Flanged Mace
-
-        Spears
-            Militia Spear
-            Boar Spear
-            Fighting Spear
-
-        Two-Handed Spears
-            Warfork
-            Spetum
-
-        Swords
-            Falchion
-            Arming Sword
-            Noble Sword
-            Fencing Sword
-
-        Two-Handed Swords
-            Long Sword
-            Great Sword
-
-        Hammers
-            Military Pick
-            Warhammer
-        
-        Two-Handed Hammers
-            Pickaxe
-            Two-Handed Mallet
-            Two-Handed Hammer
-            Polehammer
-
-        Axes
-            Hatchet
-            Handaxe
-            Fighting Axe
-
-        Two-Handed Axes
-            Woodcutter's Axe
-            Bardiche
-            Great Axe
-            Long Axe
-
-        Polearms
-            Pitchfork
-            Hooked Blade
-            Billhook
-            Pike
-            Swordlance
--->
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Medieval Overhaul</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Maces-->
-				<!--Mace : Bludgeon (Standart CE mace) -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Bludgeon"]/statBases</xpath>
-					<value>
-						<Bulk>3.50</Bulk>
-						<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Bludgeon"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.42</MeleeCritChance>
-							<MeleeParryChance>0.24</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Bludgeon"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Bludgeon"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.9</cooldownTime>
-								<chanceFactor>0.90</chanceFactor>
-								<armorPenetrationBlunt>5.625</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Mace : Nomad Mace (Mace with more pen)-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NomadMace"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NomadMace"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.42</MeleeCritChance>
-							<MeleeParryChance>0.24</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NomadMace"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NomadMace"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>2</cooldownTime>
-								<chanceFactor>0.90</chanceFactor>
-								<armorPenetrationBlunt>6.925</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Mace : Morning Star (tad bit more dmg but less pen)-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_MorningStar"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_MorningStar"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.42</MeleeCritChance>
-							<MeleeParryChance>0.24</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_MorningStar"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_MorningStar"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2.1</cooldownTime>
-								<chanceFactor>0.90</chanceFactor>
-								<armorPenetrationBlunt>6.925</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Mace : Winged Mace (Mace with even more pen)-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_WingedMace"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_WingedMace"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.42</MeleeCritChance>
-							<MeleeParryChance>0.24</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_WingedMace"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_WingedMace"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>2.1</cooldownTime>
-								<chanceFactor>0.90</chanceFactor>
-								<armorPenetrationBlunt>7.625</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Two-Handed Maces-->
-				<!--Two-Handed Mace: Goedendag -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Goedendag"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Goedendag"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.50</MeleeCritChance>
-							<MeleeParryChance>0.9</MeleeParryChance>
-							<MeleeDodgeChance>0.35</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Goedendag"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2.20</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>2.15</cooldownTime>
-								<chanceFactor>0.35</chanceFactor>
-								<armorPenetrationBlunt>8.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>29</power>
-								<cooldownTime>1.80</cooldownTime>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Two-Handed Mace : Common Two-Handed Mace (2handed morningstar)-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_TwoHandedMace"]/statBases</xpath>
-					<value>
-						<Bulk>9</Bulk>
-						<MeleeCounterParryBonus>0.54</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_TwoHandedMace"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.80</MeleeCritChance>
-							<MeleeParryChance>0.40</MeleeParryChance>
-							<MeleeDodgeChance>0.30</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_TwoHandedMace"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>2.40</cooldownTime>
-								<chanceFactor>0.90</chanceFactor>
-								<armorPenetrationBlunt>10.225</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Two-Handed Mace : Two-Handed Flanged Mace (2handed winged mace, more pen a bit less dmg) -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_TwoHandedFlangedMace"]/statBases</xpath>
-					<value>
-						<Bulk>9</Bulk>
-						<MeleeCounterParryBonus>0.54</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_TwoHandedFlangedMace"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>2.30</MeleeCritChance>
-							<MeleeParryChance>0.40</MeleeParryChance>
-							<MeleeDodgeChance>0.30</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_TwoHandedFlangedMace"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>3.30</cooldownTime>
-								<chanceFactor>0.90</chanceFactor>
-								<armorPenetrationBlunt>14.225</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Spears-->
-				<!--Spear : Militia Spear -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_MilitiaSpear"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.58</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_MilitiaSpear"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.17</MeleeCritChance>
-							<MeleeParryChance>0.50</MeleeParryChance>
-							<MeleeDodgeChance>0.27</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_MilitiaSpear"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_MilitiaSpear"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.35</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>0.90</chanceFactor>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.65</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Spear : Boar Spear -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_BoarSpear"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.50</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_BoarSpear"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.17</MeleeCritChance>
-							<MeleeParryChance>0.50</MeleeParryChance>
-							<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_BoarSpear"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_BoarSpear"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.40</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.39</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.60</cooldownTime>
-								<chanceFactor>0.90</chanceFactor>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.71</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Spear : Fighting Spear -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_FightingSpear"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_FightingSpear"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.17</MeleeCritChance>
-							<MeleeParryChance>0.5</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_FightingSpear"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_FightingSpear"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.50</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.6</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.6</cooldownTime>
-								<chanceFactor>0.90</chanceFactor>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.75</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Two-Handed Spears-->
-				<!--Two-Handed Spear : Warfork -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Warfork"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<MeleeCounterParryBonus>0.65</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Warfork"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.17</MeleeCritChance>
-							<MeleeParryChance>1.50</MeleeParryChance>
-							<MeleeDodgeChance>0.9</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Warfork"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2.20</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.79</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>0.90</chanceFactor>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.55</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Two-Handed Spear : Spetum -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Spetum"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<MeleeCounterParryBonus>0.45</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Spetum"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.17</MeleeCritChance>
-							<MeleeParryChance>1.50</MeleeParryChance>
-							<MeleeDodgeChance>0.9</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Spetum"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2.20</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.79</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>0.90</chanceFactor>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.65</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Swords-->
-				<!--Sword : Falchion (sword without Stab and more slash dmg)-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Falchion"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>0.25</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Falchion"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.15</MeleeCritChance>
-							<MeleeParryChance>0.30</MeleeParryChance>
-							<MeleeDodgeChance>0.30</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Falchion"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Falchion"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.69</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>1.36</cooldownTime>
-								<chanceFactor>0.95</chanceFactor>
-								<armorPenetrationBlunt>0.95</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.58</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Sword : Arming Sword -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_ArmingSword"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_ArmingSword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.40</MeleeCritChance>
-							<MeleeParryChance>0.60</MeleeParryChance>
-							<MeleeDodgeChance>0.30</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_ArmingSword"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_ArmingSword"]/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.05</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.46</cooldownTime>
-								<chanceFactor>0.50</chanceFactor>
-								<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.40</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.45</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.58</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Sword : Noble Sword (arming sword with more dmg)-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NobleSword"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NobleSword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.40</MeleeCritChance>
-							<MeleeParryChance>0.60</MeleeParryChance>
-							<MeleeDodgeChance>0.30</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NobleSword"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NobleSword"]/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.05</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.46</cooldownTime>
-								<chanceFactor>0.50</chanceFactor>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.40</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.45</chanceFactor>
-								<armorPenetrationBlunt>1.1</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.58</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Sword : Fencing Sword (low slash dmg & chances, low cd, hight crit and parry, high Stab chances and counter parry)-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_FencingSword"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<MeleeCounterParryBonus>1.75</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_FencingSword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>2.50</MeleeCritChance>
-							<MeleeParryChance>1</MeleeParryChance>
-							<MeleeDodgeChance>0.50</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_FencingSword"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_FencingSword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.29</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.25</cooldownTime>
-								<chanceFactor>0.85</chanceFactor>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.4</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.46</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>1.3</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.58</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Two-Handed Swords-->
-				<!--Two-Handed Sword Sword : Long Sword-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Longsword"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<MeleeCounterParryBonus>0.8</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Longsword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.5</MeleeCritChance>
-							<MeleeParryChance>0.6</MeleeParryChance>
-							<MeleeDodgeChance>0.40</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Longsword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.78</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.78</cooldownTime>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.0</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>1.64</cooldownTime>
-								<chanceFactor>0.35</chanceFactor>
-								<armorPenetrationBlunt>3.24</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.72</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Two-Handed Sword Sword : Great Sword-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Greatsword"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<MeleeCounterParryBonus>0.70</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Greatsword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.30</MeleeCritChance>
-							<MeleeParryChance>1.20</MeleeParryChance>
-							<MeleeDodgeChance>0.50</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Greatsword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.69</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.98</cooldownTime>
-								<chanceFactor>0.50</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.90</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>48</power>
-								<cooldownTime>2.86</cooldownTime>
-								<chanceFactor>0.45</chanceFactor>
-								<armorPenetrationBlunt>3.592</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.58</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Hammers-->
-
-				<!--Hammer: Military Pick-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_MilitaryPick"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>0.22</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_MilitaryPick"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.06</MeleeCritChance>
-						<MeleeParryChance>0.12</MeleeParryChance>
-						<MeleeDodgeChance>0.23</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_MilitaryPick"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_MilitaryPick"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.69</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.80</cooldownTime>
-								<chanceFactor>0.95</chanceFactor>
-								<armorPenetrationBlunt>6.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.8</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Hammer: Warhammer-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Warhammer"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>0.22</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Warhammer"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.06</MeleeCritChance>
-							<MeleeParryChance>0.22</MeleeParryChance>
-							<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Warhammer"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Warhammer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.69</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.85</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>6.7</armorPenetrationBlunt>
-								<armorPenetrationSharp>3.0</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>1.90</cooldownTime>
-								<chanceFactor>0.80</chanceFactor>
-								<armorPenetrationBlunt>8.2</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Two-Handed Hammers-->
-
-				<!--Two-Handed Hammer: Pickaxe-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Pickaxe"]/statBases</xpath>
-					<value>
-						<Bulk>11</Bulk>
-						<MeleeCounterParryBonus>0.22</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Pickaxe"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.9</MeleeCritChance>
-						<MeleeParryChance>0.22</MeleeParryChance>
-						<MeleeDodgeChance>0.23</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_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>head</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>
-						</tools>
-					</value>
-				</li>
-
-				<!--Two-Handed Hammer : Two-Handed Mallet-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_TwoHandedMallet"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>0.54</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_TwoHandedMallet"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>2</MeleeCritChance>
-						<MeleeParryChance>0.40</MeleeParryChance>
-						<MeleeDodgeChance>0.30</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_TwoHandedMallet"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>2.35</cooldownTime>
-								<chanceFactor>0.95</chanceFactor>
-								<armorPenetrationBlunt>9.625</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Two-Handed Hammer : Two-Handed Hammer-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_TwoHandedHammer"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>0.54</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_TwoHandedHammer"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>2.1</MeleeCritChance>
-							<MeleeParryChance>0.50</MeleeParryChance>
-							<MeleeDodgeChance>0.30</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_TwoHandedHammer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>2.86</cooldownTime>
-								<chanceFactor>0.95</chanceFactor>
-								<armorPenetrationBlunt>13.225</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Two-Handed Hammer : Polehammer-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Polehammer"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>0.54</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Polehammer"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>2.40</MeleeCritChance>
-							<MeleeParryChance>1.30</MeleeParryChance>
-							<MeleeDodgeChance>0.30</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Polehammer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>2.7</cooldownTime>
-								<chanceFactor>0.25</chanceFactor>
-								<armorPenetrationBlunt>9.225</armorPenetrationBlunt>
-								<armorPenetrationSharp>4.3</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>2.7</cooldownTime>
-								<chanceFactor>0.70</chanceFactor>
-								<armorPenetrationBlunt>11.825</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Axes-->
-				<!--Axe: Hatchet-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Hatchet"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<MeleeCounterParryBonus>0.22</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Hatchet"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.31</MeleeCritChance>
-						<MeleeParryChance>0.22</MeleeParryChance>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Hatchet"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Hatchet"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>0.95</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.25</chanceFactor>
-								<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.58</cooldownTime>
-								<chanceFactor>0.70</chanceFactor>
-								<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.32</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Axe: Handaxe-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Handaxe"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<MeleeCounterParryBonus>0.22</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Handaxe"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.31</MeleeCritChance>
-						<MeleeParryChance>0.22</MeleeParryChance>
-						<MeleeDodgeChance>0.22</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Handaxe"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Handaxe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>0.95</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.25</chanceFactor>
-								<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.58</cooldownTime>
-								<chanceFactor>0.70</chanceFactor>
-								<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Axe: Fighting Axe-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_FightingAxe"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<MeleeCounterParryBonus>0.22</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_FightingAxe"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.31</MeleeCritChance>
-							<MeleeParryChance>0.22</MeleeParryChance>
-							<MeleeDodgeChance>0.22</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_FightingAxe"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_FightingAxe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>0.95</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>15</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.25</chanceFactor>
-								<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.32</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.58</cooldownTime>
-								<chanceFactor>0.70</chanceFactor>
-								<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Two-Handed Axes-->
-				<!--Two-Handed Axe: Woodcutter's Axe-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_WoodcuttersAxe"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.22</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_WoodcuttersAxe"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.11</MeleeCritChance>
-						<MeleeParryChance>0.28</MeleeParryChance>
-						<MeleeDodgeChance>0.23</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_WoodcuttersAxe"]/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>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.95</cooldownTime>
-								<chanceFactor>0.25</chanceFactor>
-								<armorPenetrationBlunt>9.6</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>29</power>
-								<cooldownTime>2.48</cooldownTime>
-								<chanceFactor>0.70</chanceFactor>
-								<armorPenetrationBlunt>9.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.90</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Two-Handed Axe: Bardiche-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Bardiche"]/statBases</xpath>
-					<value>
-						<Bulk>7</Bulk>
-						<MeleeCounterParryBonus>0.40</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Bardiche"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.30</MeleeCritChance>
-							<MeleeParryChance>0.60</MeleeParryChance>
-							<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Bardiche"]/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>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2.48</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>9.6</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.95</cooldownTime>
-								<chanceFactor>0.20</chanceFactor>
-								<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.32</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>2.48</cooldownTime>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>9.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.95</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Two-Handed Axe: Great Axe-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Greataxe"]/statBases</xpath>
-					<value>
-						<Bulk>7</Bulk>
-						<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Greataxe"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.30</MeleeCritChance>
-							<MeleeParryChance>0.40</MeleeParryChance>
-							<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Greataxe"]/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>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2.18</cooldownTime>
-								<chanceFactor>0.25</chanceFactor>
-								<armorPenetrationBlunt>9.6</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>37</power>
-								<cooldownTime>2.18</cooldownTime>
-								<chanceFactor>0.70</chanceFactor>
-								<armorPenetrationBlunt>9.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.95</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Two-Handed Axe: Long Axe-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Longaxe"]/statBases</xpath>
-					<value>
-						<Bulk>7</Bulk>
-						<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Longaxe"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.30</MeleeCritChance>
-							<MeleeParryChance>0.50</MeleeParryChance>
-							<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Longaxe"]/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>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2.05</cooldownTime>
-								<chanceFactor>0.25</chanceFactor>
-								<armorPenetrationBlunt>9.6</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>32</power>
-								<cooldownTime>2.05</cooldownTime>
-								<chanceFactor>0.70</chanceFactor>
-								<armorPenetrationBlunt>9.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.32</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Polearms-->
-				<!--Polearm: Pitchfork-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Pitchfork"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Pitchfork"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.44</MeleeCritChance>
-							<MeleeParryChance>1.33</MeleeParryChance>
-							<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_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>
-				</li>
-
-				<!--Polearm: Hookedblade (you ugly child)-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_HookedBlade"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_HookedBlade"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.44</MeleeCritChance>
-							<MeleeParryChance>0.90</MeleeParryChance>
-							<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_HookedBlade"]/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>16</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>6.9</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>0.65</chanceFactor>
-								<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Polearm: Billhook-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Billhook"]/statBases</xpath>
-					<value>
-						<Bulk>7</Bulk>
-						<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Billhook"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.60</MeleeCritChance>
-							<MeleeParryChance>1</MeleeParryChance>
-							<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Billhook"]/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>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.4</cooldownTime>
-								<chanceFactor>0.50</chanceFactor>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.1</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>0.45</chanceFactor>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.38</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Polearm: Halberd-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Halberd"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>1.08</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Halberd"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.22</MeleeCritChance>
-							<MeleeParryChance>1.53</MeleeParryChance>
-							<MeleeDodgeChance>0.67</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Halberd"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.31</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>2.9</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>
-				</li>
-
-				<!--Polearm: Pike-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Pike"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<MeleeCounterParryBonus>1.27</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Pike"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.08</MeleeCritChance>
-							<MeleeParryChance>0.95</MeleeParryChance>
-							<MeleeDodgeChance>1.27</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Pike"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.3</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>1.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.5</cooldownTime>
-								<chanceFactor>0.95</chanceFactor>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Polearm: Swordlance-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Swordlance"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<MeleeCounterParryBonus>1.27</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Swordlance"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.08</MeleeCritChance>
-							<MeleeParryChance>0.95</MeleeParryChance>
-							<MeleeDodgeChance>1.27</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_Swordlance"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.3</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>0.20</chanceFactor>
-								<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>2.3</cooldownTime>
-								<chanceFactor>0.75</chanceFactor>
-								<armorPenetrationBlunt>4.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.85</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ======= Named ======= -->
-				<!-- Two-handed Sword: Greatsword -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NamedGreatsword"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<MeleeCounterParryBonus>0.70</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NamedGreatsword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.30</MeleeCritChance>
-							<MeleeParryChance>1.20</MeleeParryChance>
-							<MeleeDodgeChance>0.50</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NamedGreatsword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.69</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>49</power>
-								<cooldownTime>1.98</cooldownTime>
-								<chanceFactor>0.50</chanceFactor>
-								<armorPenetrationBlunt>1.95</armorPenetrationBlunt>
-								<armorPenetrationSharp>4.64</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>99</power>
-								<cooldownTime>2.86</cooldownTime>
-								<chanceFactor>0.45</chanceFactor>
-								<armorPenetrationBlunt>8.75</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.41</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Two-handed Mace: Flanged Mace -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NamedTwoHandedFlangedMace"]/statBases</xpath>
-					<value>
-						<Bulk>9</Bulk>
-						<MeleeCounterParryBonus>0.54</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NamedTwoHandedFlangedMace"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>2.30</MeleeCritChance>
-							<MeleeParryChance>0.40</MeleeParryChance>
-							<MeleeDodgeChance>0.30</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NamedTwoHandedFlangedMace"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>45</power>
-								<cooldownTime>3.30</cooldownTime>
-								<chanceFactor>0.90</chanceFactor>
-								<armorPenetrationBlunt>32.28</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Two-handed Axe: Great Axe-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NamedGreataxe"]/statBases</xpath>
-					<value>
-						<Bulk>7</Bulk>
-						<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NamedGreataxe"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.30</MeleeCritChance>
-							<MeleeParryChance>0.40</MeleeParryChance>
-							<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NamedGreataxe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.3</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>2.18</cooldownTime>
-								<chanceFactor>0.25</chanceFactor>
-								<armorPenetrationBlunt>23.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>76</power>
-								<cooldownTime>2.18</cooldownTime>
-								<chanceFactor>0.70</chanceFactor>
-								<armorPenetrationBlunt>23.4</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.31</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Two-handed Hammer : Two-Handed Hammer-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NamedTwoHandedHammer"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>0.54</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NamedTwoHandedHammer"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>2.1</MeleeCritChance>
-							<MeleeParryChance>0.50</MeleeParryChance>
-							<MeleeDodgeChance>0.30</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NamedTwoHandedHammer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>45</power>
-								<cooldownTime>2.86</cooldownTime>
-								<chanceFactor>0.95</chanceFactor>
-								<armorPenetrationBlunt>32.28</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Polearm: Halberd-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NamedHalberd"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>1.08</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NamedHalberd"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.22</MeleeCritChance>
-							<MeleeParryChance>1.53</MeleeParryChance>
-							<MeleeDodgeChance>0.67</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_MeleeWeapon_NamedHalberd"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.31</cooldownTime>
-								<armorPenetrationBlunt>4.94</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>97</power>
-								<cooldownTime>2.9</cooldownTime>
-								<chanceFactor>1.165</chanceFactor>
-								<armorPenetrationBlunt>19.75</armorPenetrationBlunt>
-								<armorPenetrationSharp>3.95</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>82</power>
-								<cooldownTime>1.16</cooldownTime>
-								<chanceFactor>1.165</chanceFactor>
-								<armorPenetrationBlunt>4.95</armorPenetrationBlunt>
-								<armorPenetrationSharp>4.94</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Medieval Overhaul/MO_Weapons_Ranged.xml b/Patches/Medieval Overhaul/MO_Weapons_Ranged.xml
deleted file mode 100644
index 02ca4f8ff9..0000000000
--- a/Patches/Medieval Overhaul/MO_Weapons_Ranged.xml	
+++ /dev/null
@@ -1,276 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Medieval Overhaul</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DankPyon_Crossbow" or defName="DankPyon_CrossbowHeavy"]/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>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bow_War" or defName="DankPyon_Bow_Hunting"]/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>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "DankPyon_Handgonne"]/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>
-				</li>
-
-				<!-- === Crossbow === -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DankPyon_Crossbow</defName>
-					<statBases>
-						<Bulk>6</Bulk>
-						<SwayFactor>1.2</SwayFactor>
-						<ShotSpread>0.25</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>70</WoodLog>
-						<DankPyon_ComponentBasic>2</DankPyon_ComponentBasic>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Projectile_DankPyonCrossbowBolt_Steel</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>23</range>
-						<soundCast>Bow_Large</soundCast>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_DankPyonCrossbowBolt</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_XBow</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Heavy Crossbow === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DankPyon_CrossbowHeavy</defName>
-					<statBases>
-						<Bulk>6</Bulk>
-						<SwayFactor>1.0</SwayFactor>
-						<ShotSpread>0.20</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>60</WoodLog>
-						<Steel>25</Steel>
-						<DankPyon_ComponentBasic>3</DankPyon_ComponentBasic>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Projectile_ArbalestBolt_Steel</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>26</range>
-						<soundCast>Bow_Large</soundCast>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>5.5</reloadTime>
-						<ammoSet>AmmoSet_ArbalestBolt</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_XBow</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Hunting bow ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DankPyon_Bow_Hunting</defName>
-					<statBases>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>1</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>4.00</Bulk>
-						<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_HuntingArrow_Stone</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>16</range>
-						<soundCast>Bow_Recurve</soundCast>
-					</Properties>
-					<AmmoUser>
-						<ammoSet>AmmoSet_HuntingArrow</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_Bow</li>
-					</weaponTags>
-					<researchPrerequisite>DankPyon_HuntingBow</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== War bow ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Bow_War</defName>
-					<statBases>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>1</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>5.00</Bulk>
-						<RangedWeapon_Cooldown>0.7</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>20</WoodLog>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_WarArrow_Stone</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>32</range>
-						<soundCast>Bow_Large</soundCast>
-					</Properties>
-					<AmmoUser>
-						<ammoSet>AmmoSet_WarArrow</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_Bow</li>
-					</weaponTags>
-					<researchPrerequisite>DankPyon_WarBow</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- === Handgonne === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DankPyon_Handgonne</defName>
-					<statBases>
-						<Bulk>7</Bulk>
-						<SwayFactor>1.22</SwayFactor>
-						<ShotSpread>0.36</ShotSpread>
-						<SightsEfficiency>0.85</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Handgonne_Ball</defaultProjectile>
-						<warmupTime>1.66</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Shotgun_NoRack</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<ammoConsumedPerShotCount>4</ammoConsumedPerShotCount>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>4</magazineSize>
-						<reloadTime>5.1</reloadTime>
-						<ammoSet>AmmoSet_HandgonneShot</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>NeolithicRangedHeavy</li>
-						<li>NeolithicRangedChief</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Let musket ammo by made at Medieval Overhaul anvil. === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="MusketBallBase"]/tradeTags</xpath>
-					<value>
-						<li>CE_AutoEnableCrafting_DankPyon_Anvil</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="MakeAmmo_MusketBall"]/researchPrerequisite</xpath>
-					<value>
-						<researchPrerequisite>DankPyon_Gunpowder</researchPrerequisite>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Medieval Quest Rewards/MagicalWeave.xml b/Patches/Medieval Quest Rewards/MagicalWeave.xml
deleted file mode 100644
index 1ea7b40284..0000000000
--- a/Patches/Medieval Quest Rewards/MagicalWeave.xml	
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Medieval Quest Rewards</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Blessedweave-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Blessedweave"]/statBases</xpath>
-					<value>
-						<Bulk>0.1</Bulk>
-						<WornBulk>0.75</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Blessedweave"]/stuffProps</xpath>
-					<value>
-						<statOffsets>
-							<Mass>0.75</Mass>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Blessedweave"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>1.8</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Blessedweave"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Blessedweave"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1.5</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Blessedweave"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>1.92</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Blessedweave"]/stuffProps/statFactors/Flammability</xpath>
-					<value>
-						<Flammability>0.1</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Blessedweave"]/stuffProps/categories</xpath>
-					<value>
-						<li>SoftArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Medieval Tailor/MO_Tailor_Armor.xml b/Patches/Medieval Tailor/MO_Tailor_Armor.xml
deleted file mode 100644
index 291d4109b9..0000000000
--- a/Patches/Medieval Tailor/MO_Tailor_Armor.xml	
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Medievel Tailor</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Gambeson -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AMT_Apparel_Gambeson" or defName="AMT_Apparel_LongGambeson"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>6</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AMT_Apparel_Gambeson" or defName="AMT_Apparel_LongGambeson"]/statBases/Mass</xpath>
-					<value>
-						<Mass>3</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AMT_Apparel_Gambeson"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Arms</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AMT_Apparel_LongGambeson"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Shoulders</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AMT_Apparel_Gambeson" or defName="AMT_Apparel_LongGambeson"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Medieval Tailor/MO_Tailor_Clothes.xml b/Patches/Medieval Tailor/MO_Tailor_Clothes.xml
deleted file mode 100644
index cf1f3a108d..0000000000
--- a/Patches/Medieval Tailor/MO_Tailor_Clothes.xml	
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Medievel Tailor</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Shirt -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AMT_Apparel_SimpleShirt" or defName="AMT_Apparel_OldShirt" or defName="AMT_Apparel_Doublet" or defName="AMT_Apparel_PaddedLeatherVest" or defName="AMT_Apparel_Jerkin" or defName="AMT_Apparel_CommonerTunic" or defName="AMT_Apparel_FancyTunic" or defName="AMT_Apparel_RoyalTunic" or defName="AMT_Apparel_BarMaidDress"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AMT_Apparel_SimpleShirt" or defName="AMT_Apparel_OldShirt" or defName="AMT_Apparel_Doublet" or defName="AMT_Apparel_PaddedLeatherVest" or defName="AMT_Apparel_CommonerTunic" or defName="AMT_Apparel_FancyTunic" or defName="AMT_Apparel_RoyalTunic" or defName="AMT_Apparel_BarMaidDress"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Arms</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AMT_Apparel_SimpleShirt" or defName="AMT_Apparel_OldShirt" or defName="AMT_Apparel_Doublet" or defName="AMT_Apparel_PaddedLeatherVest" or defName="AMT_Apparel_Jerkin" or defName="AMT_Apparel_CommonerTunic" or defName="AMT_Apparel_FancyTunic" or defName="AMT_Apparel_RoyalTunic" or defName="AMT_Apparel_BarMaidDress"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Short Coat -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AMT_Apparel_ShortCoat"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AMT_Apparel_ShortCoat"]/statBases/Mass</xpath>
-					<value>
-						<Mass>2</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AMT_Apparel_ShortCoat"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Rags -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AMT_Apparel_Rags"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AMT_Apparel_Rags"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Pants -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AMT_Apparel_Trousers" or defName="AMT_Apparel_RoyalHose"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AMT_Apparel_Trousers" or defName="AMT_Apparel_RoyalHose"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Hats -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AMT_Headgear_Chaperon" or defName="AMT_Headgear_ForesterHat" or defName="AMT_Headgear_ForesterHatF" or defName="Df_Headgear_MerchantHat" or defName="AMT_Headgear_Cap" or defName="AMT_Headgear_PiousCap"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AMT_Headgear_Chaperon" or defName="AMT_Headgear_ForesterHat" or defName="AMT_Headgear_ForesterHatF" or defName="Df_Headgear_MerchantHat" or defName="AMT_Headgear_Cap" or defName="AMT_Headgear_PiousCap"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="AMT_Headgear_Chaperon" or defName="AMT_Headgear_ForesterHat" or defName="AMT_Headgear_Cap"]/equippedStatOffsets/PainShockThreshold</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AMT_Headgear_ForesterHatF"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>.1</AimingAccuracy>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Shoes and Boots -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AMT_Handwear_TownGloves" or defName="AMT_Handwear_HuntingGloves" or defName="AMT_Handwear_NobleGloves" or defName="AMT_Handwear_VambraceLeather" or defName="AMT_Handwear_VambraceSplinted" or defName="AMT_Handwear_HandShackles"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AMT_Handwear_HuntingGloves"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>0.2</AimingAccuracy>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AMT_Handwear_BlacksmithGloves"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AMT_Handwear_TownGloves" or defName="AMT_Handwear_HuntingGloves" or defName="AMT_Handwear_BlacksmithGloves" or defName="AMT_Handwear_NobleGloves" or defName="AMT_Handwear_VambraceLeather" or defName="AMT_Handwear_VambraceSplinted" or defName="AMT_Handwear_HandShackles"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AMT_Handwear_VambraceLeather" or defName="AMT_Handwear_VambraceSplinted"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AMT_Handwear_VambraceSplinted"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.25</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AMT_Handwear_VambraceSplinted"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>0.2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Shoes and Boots -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AMT_Footwear_Peasantshoes" or defName="AMT_Footwear_Nobleshoes" or defName="AMT_Footwear_Townboots" or defName="AMT_Footwear_Travelboots" or defName="AMT_Footwear_Nobleboots" or defName="AMT_Footwear_Shackles"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AMT_Footwear_Peasantshoes" or defName="AMT_Footwear_Nobleshoes"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AMT_Footwear_Townboots" or defName="AMT_Footwear_Travelboots" or defName="AMT_Footwear_Nobleboots"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AMT_Footwear_Shackles"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>0.2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Medieval Tailor/MO_Tailor_Outwear.xml b/Patches/Medieval Tailor/MO_Tailor_Outwear.xml
deleted file mode 100644
index 9fd464c492..0000000000
--- a/Patches/Medieval Tailor/MO_Tailor_Outwear.xml	
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Medievel Tailor</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Basically Parka -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AMT_Apparel_Wintercoat"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AMT_Apparel_Wintercoat"]/statBases/Mass</xpath>
-					<value>
-						<Mass>3</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AMT_Apparel_Wintercoat"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Headstuff -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AMT_Headgear_Cowl" or defName="AMT_Apparel_Cloak" or defName="AMT_Apparel_WinterCloak"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AMT_Headgear_Cowl" or defName="AMT_Apparel_Cloak" or defName="AMT_Apparel_WinterCloak"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AMT_Apparel_WinterCloak"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!--Remove Pain Threshold -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="AMT_Apparel_Cloak" or defName="AMT_Apparel_WinterCloak"]/equippedStatOffsets/PainShockThreshold</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Megafauna/Items_Resource_Megafauna_Items.xml b/Patches/Megafauna/Items_Resource_Megafauna_Items.xml
deleted file mode 100644
index bba8904322..0000000000
--- a/Patches/Megafauna/Items_Resource_Megafauna_Items.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Megafauna</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== Mammoth Tusk ====== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MammothTusk"]/description</xpath>
-					<value>
-						<description>A mammoth's tusk. Very durable and valuable. Too unwieldy to be used as a weapon.</description>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="MammothTusk"]/tools</xpath>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="MammothTusk"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>ResourceBase</value>
-				</li>
-
-				<!-- ====== Elasmotherium Horn ====== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ElasmotheriumHorn"]/description</xpath>
-					<value>
-						<description>An elasmotherium's horn. Too unwieldy to be used as a weapon.</description>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="ElasmotheriumHorn"]/tools</xpath>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="ElasmotheriumHorn"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>ResourceBase</value>
-				</li>
-
-				<!-- ====== Smilodon Fangs ====== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SmilodonFangs"]/description</xpath>
-					<value>
-						<description>A dead smilodon's pair of canines.A fantastic trophy.</description>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="SmilodonFangs"]/tools</xpath>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="SmilodonFangs"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>ResourceBase</value>
-				</li>
-
-				<!-- ====== Deinotherium Tusk ====== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DeinotheriumTusk"]/description</xpath>
-					<value>
-						<description>A deinotherium's tusk. Very durable and valuable. Too unwieldy to be used as a weapon.</description>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="DeinotheriumTusk"]/tools</xpath>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="DeinotheriumTusk"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>ResourceBase</value>
-				</li>
-
-				<!-- ====== Zygolophodon Tusk ====== -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="ZygolophodonTusk"]/tools</xpath>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="ZygolophodonTusk"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>ResourceBase</value>
-				</li>
-
-				<!-- ====== PlatybelodonTusk ====== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PlatybelodonTusk"]/description</xpath>
-					<value>
-						<description>A platybelodon's tusk. Somewhat small, compared to those of other proboscidea. Very valuable.</description>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="PlatybelodonTusk"]/tools</xpath>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="PlatybelodonTusk"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>ResourceBase</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Megafauna/Items_Resource_Megafauna_Stuff.xml b/Patches/Megafauna/Items_Resource_Megafauna_Stuff.xml
deleted file mode 100644
index 41170e78c5..0000000000
--- a/Patches/Megafauna/Items_Resource_Megafauna_Stuff.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Megafauna</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--========== Wool ============-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MammothWool" or defName="JosephoartigasiaWool"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.03</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ElasmotheriumWool"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.04</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Megafauna/Mega_Bodies.xml b/Patches/Megafauna/Mega_Bodies.xml
deleted file mode 100644
index 46306839f3..0000000000
--- a/Patches/Megafauna/Mega_Bodies.xml
+++ /dev/null
@@ -1,233 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Megafauna</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Natural Armor -->
-				<!-- Seal -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Seal"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Flipper" or
-						def="Tail"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Seal"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Jaw" or
-						def="Flipper" or
-						def="Tail" or
-						def="Head"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- Natural Armor -->
-				<!-- Centipede -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="CentipedeLike"]//*[
-						def="CentipedeFirstSegment" or
-						def="CentipedeFirstSegment" or
-						def="CentipedeSecondSegment" or
-						def="CentipedeThirdSegment" or
-						def="CentipedeFourthSegment" or
-						def="CentipedeFifthSegment" or
-						def="CentipedeSixthSegment" or
-						def="InsectNostril" or
-						def="Pronotum"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="CentipedeLike"]//*[
-						def="CentipedeFirstSegment" or
-						def="CentipedeSecondSegment" or
-						def="CentipedeThirdSegment" or
-						def="CentipedeFourthSegment" or
-						def="CentipedeFifthSegment" or
-						def="CentipedeSixthSegment" or
-						def="Pronotum" or
-						def="InsectNostril" or
-						def="InsectHead"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- fang -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="QuadrupedAnimalWithPawsTailAndFangs"]//*[
-						def="Body" or
-						def="Tail" or
-						def="Leg" or
-						def="Neck"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="QuadrupedAnimalWithPawsTailAndFangs"]//*[
-						def="Body" or
-						def="Tail" or
-						def="Neck" or
-						def="Head" or
-						def="AnimalJaw" or
-						def="Fangs" or
-						def="Paw" or
-						def="Leg"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="QuadrupedAnimalWithCarapace"]//*[
-						def="GlyptodonCarapace" or
-						def="Leg" or
-						def="Neck"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="QuadrupedAnimalWithCarapace"]//*[
-						def="GlyptodonCarapace" or
-						def="GlyptodonShell" or
-						def="Tail" or
-						def="Neck" or
-						def="Leg" or
-						def="Head"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- KangarooLike -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="KangarooLike"]//*[
-						def="Body" or
-						def="Arm" or
-						def="Leg"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="KangarooLike"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Head" or
-						def="AnimalJaw" or
-						def="Shoulder" or
-						def="Arm" or
-						def="Leg"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- FlyingInsect -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="FlyingInsect"]//*[
-						def="Shell" or
-						def="Pronotum" or
-						def="InsectNostril" or
-						def="InsectLeg"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="FlyingInsect"]//*[
-						def="Shell" or
-						def="Pronotum" or
-						def="InsectHead" or
-						def="InsectNostril" or
-						def="InsectMouth" or
-						def="InsectLeg"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- Scorpion -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Scorpion"]//*[
-						def="Shell" or
-						def="Pronotum" or
-						def="InsectNostril" or
-						def="InsectTail" or
-						def="InsectLeg"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Scorpion"]//*[
-						def="Shell" or
-						def="Pronotum" or
-						def="InsectHead" or
-						def="InsectNostril" or
-						def="InsectMouth" or
-						def="InsectTail" or
-						def="Stinger" or
-						def="Pincer" or
-						def="InsectLeg"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Megafauna/Races_Animal_Megafauna.xml b/Patches/Megafauna/Races_Animal_Megafauna.xml
deleted file mode 100644
index 9d50584952..0000000000
--- a/Patches/Megafauna/Races_Animal_Megafauna.xml
+++ /dev/null
@@ -1,2271 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Spreadsheets for this patch can be found here: https://docs.google.com/spreadsheets/d/1lgGUlbR2BYTUpEYWdTQjbu2sPBYPaLKx8gQRdRrm_TM
-https://docs.google.com/spreadsheets/d/1pnhJUo3bkEPxhpmPrHj4spPdvjifLhOsnfFrZmOovmQ
--->
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Megafauna</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- BODY SHAPES -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>
-						Defs/ThingDef[
-						defName="Gigantopithecus"
-						]
-					</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>
-						Defs/ThingDef[
-						defName="Andrewsarchus" or
-						defName="Aurochs" or
-						defName="Castoroides" or
-						defName="Chalicotherium" or
-						defName="Daeodon" or
-						defName="Deinotherium" or
-						defName="Dinocrocuta" or
-						defName="Dinopithecus" or
-						defName="Diprotodon" or
-						defName="Elasmotherium" or
-						defName="Josephoartigasia" or
-						defName="Macrauchenia" or
-						defName="Megaloceros" or
-						defName="Paraceratherium" or
-						defName="Platybelodon" or
-						defName="Procoptodon" or
-						defName="ShortfacedBear" or
-						defName="Sivatherium" or
-						defName="Smilodon" or
-						defName="Uintatherium" or
-						defName="WoollyMammoth" or
-						defName="Zygolophodon"
-						]
-					</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>
-						Defs/ThingDef[
-						defName="Doedicurus" or
-						defName="Enhydriodon" or
-						defName="Gomphotaria" or
-						defName="Megalania" or
-						defName="Megalochelys" or
-						defName="Pulmonoscorpius" or
-						defName="Purussaurus" or
-						defName="Quinkana"
-						]
-					</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>
-						Defs/ThingDef[
-						defName="Arthropleura" or
-						defName="Gigantophis" or
-						defName="Meganeura" or
-						defName="Titanoboa"
-						]
-					</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Serpentine</bodyShape>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>
-						Defs/ThingDef[
-						defName="Dinornis" or
-						defName="Palaeeudyptes" or
-						defName="Titanis"
-						]
-					</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========= Arthropleura ========= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Arthropleura"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.10</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.27</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arthropleura"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.2</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arthropleura"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arthropleura"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.25</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Doedicurus ========= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Doedicurus"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.04</MeleeDodgeChance>
-						<MeleeCritChance>0.13</MeleeCritChance>
-						<MeleeParryChance>0.35</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Doedicurus"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>18</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Doedicurus"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Doedicurus"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tail</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>4</cooldownTime>
-								<linkedBodyPartsGroup>TailWeapon</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>25</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>10.985</armorPenetrationBlunt>
-								<chanceFactor>0.25</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2.1</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Daeodon ========= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Daeodon"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						<MeleeCritChance>0.39</MeleeCritChance>
-						<MeleeParryChance>0.28</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Daeodon"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>2.05</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5.04</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>2.05</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5.04</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>2.45</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>23</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.22</armorPenetrationSharp>
-								<armorPenetrationBlunt>10.8</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Gigantopithecus ========= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Gigantopithecus"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.11</MeleeDodgeChance>
-						<MeleeCritChance>0.18</MeleeCritChance>
-						<MeleeParryChance>0.19</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gigantopithecus"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>2.05</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5.184</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>2.05</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5.184</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.3</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.7</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Paraceratherium ========= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Paraceratherium"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.07</MeleeDodgeChance>
-						<MeleeCritChance>1.04</MeleeCritChance>
-						<MeleeParryChance>1.24</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Paraceratherium"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>131</power>
-								<cooldownTime>5.1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>66</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>131</power>
-								<cooldownTime>5.1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>66</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>114</power>
-								<cooldownTime>5.15</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>205.2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Titanis ========= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Titanis"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.26</MeleeDodgeChance>
-						<MeleeCritChance>0.23</MeleeCritChance>
-						<MeleeParryChance>0.18</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Titanis"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>33</power>
-								<cooldownTime>2.35</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>22</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.06</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.445</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Titanoboa ========= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Titanoboa"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						<MeleeCritChance>0.27</MeleeCritChance>
-						<MeleeParryChance>0.57</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Titanoboa"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>88</power>
-								<cooldownTime>2.5</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>75</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>42.561</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= WoollyMammoth ========= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoollyMammoth"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.07</MeleeDodgeChance>
-						<MeleeCritChance>0.61</MeleeCritChance>
-						<MeleeParryChance>0.51</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoollyMammoth"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tusk</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>67</power>
-								<cooldownTime>3.55</cooldownTime>
-								<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>31.226</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>31</power>
-								<cooldownTime>2.55</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>12.96</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>31</power>
-								<cooldownTime>2.55</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>12.96</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>55</power>
-								<cooldownTime>4</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Elasmotherium ========= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Elasmotherium"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.08</MeleeDodgeChance>
-						<MeleeCritChance>0.62</MeleeCritChance>
-						<MeleeParryChance>0.48</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Elasmotherium"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>55</power>
-								<cooldownTime>4</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>3.05</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.11</armorPenetrationSharp>
-								<armorPenetrationBlunt>8.75</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>43</power>
-								<cooldownTime>3.7</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>18.75</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Smilodon ========= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Smilodon"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.23</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Smilodon"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.34</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.366</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.34</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.366</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.95</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>22</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.14</armorPenetrationSharp>
-								<armorPenetrationBlunt>6.802</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Chalicotherium ========= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Chalicotherium"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.24</MeleeCritChance>
-						<MeleeParryChance>0.33</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Chalicotherium"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.75</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.06</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.75</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.06</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>2.1</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Megaloceros ========= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Megaloceros"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.14</MeleeDodgeChance>
-						<MeleeCritChance>0.27</MeleeCritChance>
-						<MeleeParryChance>0.3</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Megaloceros"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.55</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>6.75</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.55</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>6.75</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>2.6</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4.75</armorPenetrationBlunt>
-								<chanceFactor>0.25</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2.5</cooldownTime>
-								<restrictedGender>Female</restrictedGender>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>antlers</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>3.65</cooldownTime>
-								<restrictedGender>Male</restrictedGender>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.39</armorPenetrationSharp>
-								<armorPenetrationBlunt>17.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Procoptodon ========= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Procoptodon"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.14</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Procoptodon"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>feet</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>25</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>7.225</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.15</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>22</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>4.335</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.15</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>22</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>4.335</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.9</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Megalania ========= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Megalania"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.09</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Megalania"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>34</power>
-								<cooldownTime>2.05</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.6</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>34</power>
-								<cooldownTime>2.05</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.6</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>toxic bite</label>
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>2.1</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>27</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.08</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.76</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Gomphotaria ========= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Gomphotaria"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>0.43</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gomphotaria"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>37</power>
-								<cooldownTime>3.75</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>36</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.11</armorPenetrationSharp>
-								<armorPenetrationBlunt>10.125</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Diprotodon ========= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Diprotodon"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.06</MeleeDodgeChance>
-						<MeleeCritChance>0.3</MeleeCritChance>
-						<MeleeParryChance>0.45</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Diprotodon"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>2.25</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.13</armorPenetrationSharp>
-								<armorPenetrationBlunt>12.675</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>2.25</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.13</armorPenetrationSharp>
-								<armorPenetrationBlunt>12.675</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>1.95</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>24</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-								<armorPenetrationBlunt>6.76</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= ShortfacedBear ========= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ShortfacedBear"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						<MeleeCritChance>0.34</MeleeCritChance>
-						<MeleeParryChance>0.33</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ShortfacedBear"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>1.55</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>25</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-								<armorPenetrationBlunt>6.75</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>1.55</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>25</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-								<armorPenetrationBlunt>6.75</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>46</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>27</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.23</armorPenetrationSharp>
-								<armorPenetrationBlunt>18</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Dinocrocuta ========= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Dinocrocuta"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.18</MeleeCritChance>
-						<MeleeParryChance>0.18</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Dinocrocuta"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.72</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.72</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>29</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>28</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.96</armorPenetrationSharp>
-								<armorPenetrationBlunt>8.1</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Sivatherium ========= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Sivatherium"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.14</MeleeDodgeChance>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>0.28</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Sivatherium"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5.063</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5.063</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2.45</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2.35</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Andrewsarchus ========= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Andrewsarchus"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						<MeleeCritChance>0.19</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Andrewsarchus"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.925</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.925</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>30</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.07</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Dinornis ========= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Dinornis"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.24</MeleeDodgeChance>
-						<MeleeCritChance>0.21</MeleeCritChance>
-						<MeleeParryChance>0.26</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Dinornis"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>beak</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2.05</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>13</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.025</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Macrauchenia ========= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Macrauchenia"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.49</MeleeCritChance>
-						<MeleeParryChance>0.32</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Macrauchenia"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>2.1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5.976</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>2.1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5.976</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2.55</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4.15</armorPenetrationBlunt>
-								<chanceFactor>0.3</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Quinkana ========= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Quinkana"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						<MeleeCritChance>0.29</MeleeCritChance>
-						<MeleeParryChance>0.26</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Quinkana"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>31</power>
-								<cooldownTime>2.15</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.08</armorPenetrationSharp>
-								<armorPenetrationBlunt>6.48</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>31</power>
-								<cooldownTime>2.15</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.08</armorPenetrationSharp>
-								<armorPenetrationBlunt>6.48</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>32</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>7.84</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Deinotherium ========= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Deinotherium"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.07</MeleeDodgeChance>
-						<MeleeCritChance>0.89</MeleeCritChance>
-						<MeleeParryChance>0.72</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Deinotherium"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tusk</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>85</power>
-								<cooldownTime>3.8</cooldownTime>
-								<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>40.593</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>41</power>
-								<cooldownTime>2.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>18</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>41</power>
-								<cooldownTime>2.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>18</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>79</power>
-								<cooldownTime>4.4</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>37.5</armorPenetrationBlunt>
-								<chanceFactor>0.01</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Aurochs ========= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Aurochs"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.11</MeleeDodgeChance>
-						<MeleeCritChance>0.31</MeleeCritChance>
-						<MeleeParryChance>0.28</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Aurochs"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5.04</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5.04</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.7</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>9</armorPenetrationBlunt>
-								<chanceFactor>0.45</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2.1</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5.76</armorPenetrationBlunt>
-								<chanceFactor>0.25</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Megalochelys ========= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Megalochelys"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.06</MeleeCritChance>
-						<MeleeParryChance>0.44</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Megalochelys"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>20</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Megalochelys"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Megalochelys"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>beak</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>3.25</cooldownTime>
-								<linkedBodyPartsGroup>TurtleBeakAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.11</armorPenetrationSharp>
-								<armorPenetrationBlunt>11</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.65</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Palaeeudyptes ========= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Palaeeudyptes"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.14</MeleeDodgeChance>
-						<MeleeCritChance>0.07</MeleeCritChance>
-						<MeleeParryChance>0.16</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Palaeeudyptes"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>3.85</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.24</armorPenetrationSharp>
-								<armorPenetrationBlunt>11.543</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>3.85</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>19</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>11.543</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Josephoartigasia ========= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Josephoartigasia"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.08</MeleeDodgeChance>
-						<MeleeCritChance>0.19</MeleeCritChance>
-						<MeleeParryChance>0.34</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Josephoartigasia"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.07</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.07</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>52</power>
-								<cooldownTime>2.25</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>18</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.13</armorPenetrationSharp>
-								<armorPenetrationBlunt>12.675</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Gigantophis ========= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Gigantophis"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.16</MeleeDodgeChance>
-						<MeleeCritChance>0.19</MeleeCritChance>
-						<MeleeParryChance>0.43</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gigantophis"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>38</power>
-								<cooldownTime>1.95</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>55</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>16.313</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Meganeura ========= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Meganeura"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.37</MeleeDodgeChance>
-						<MeleeCritChance>0.09</MeleeCritChance>
-						<MeleeParryChance>0.04</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Meganeura"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Meganeura"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Meganeura"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>9</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.605</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Zygolophodon ========= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Zygolophodon"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.06</MeleeDodgeChance>
-						<MeleeCritChance>0.98</MeleeCritChance>
-						<MeleeParryChance>0.97</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Zygolophodon"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tusk</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>179</power>
-								<cooldownTime>4.7</cooldownTime>
-								<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>93.677</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>76</power>
-								<cooldownTime>3.3</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>36</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>76</power>
-								<cooldownTime>3.3</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>36</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>125</power>
-								<cooldownTime>5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>62.5</armorPenetrationBlunt>
-								<chanceFactor>0.01</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Platybelodon ========= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Platybelodon"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.06</MeleeDodgeChance>
-						<MeleeCritChance>0.46</MeleeCritChance>
-						<MeleeParryChance>0.5</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Platybelodon"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tusk</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>3</cooldownTime>
-								<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>15.613</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>29</power>
-								<cooldownTime>2.55</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>12.24</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>29</power>
-								<cooldownTime>2.55</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>12.24</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>50</power>
-								<cooldownTime>3.9</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>22.5</armorPenetrationBlunt>
-								<chanceFactor>0.01</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Purussaurus ========= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Purussaurus"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.08</MeleeDodgeChance>
-						<MeleeCritChance>0.65</MeleeCritChance>
-						<MeleeParryChance>0.62</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Purussaurus"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>65</power>
-								<cooldownTime>3.55</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.47</armorPenetrationSharp>
-								<armorPenetrationBlunt>46.8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>65</power>
-								<cooldownTime>3.55</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.47</armorPenetrationSharp>
-								<armorPenetrationBlunt>46.8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>90</power>
-								<cooldownTime>3.05</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>45</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.99</armorPenetrationSharp>
-								<armorPenetrationBlunt>99</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Uintatherium ========= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Uintatherium"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.08</MeleeDodgeChance>
-						<MeleeCritChance>0.31</MeleeCritChance>
-						<MeleeParryChance>0.41</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Uintatherium"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horns</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>3.35</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>12.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>2.6</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.06</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.375</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>3.1</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>9.375</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Pulmonoscorpius ========= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Pulmonoscorpius"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.19</MeleeDodgeChance>
-						<MeleeCritChance>0.03</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Pulmonoscorpius"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Pulmonoscorpius"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.06</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Pulmonoscorpius"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left pincer</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>LeftPincer</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right pincer</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>RightPincer</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>stinger</label>
-								<capacities>
-									<li>ToxicSting</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.52</cooldownTime>
-								<linkedBodyPartsGroup>Stinger</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>17</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.535</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Dinopithecus ========= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Dinopithecus"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.19</MeleeDodgeChance>
-						<MeleeCritChance>0.08</MeleeCritChance>
-						<MeleeParryChance>0.07</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Dinopithecus"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hand</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.9</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.49</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hand</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.9</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.49</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>19</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.27</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.69</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Castoroides ========= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Castoroides"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						<MeleeCritChance>0.08</MeleeCritChance>
-						<MeleeParryChance>0.08</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Castoroides"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.95</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.32</armorPenetrationBlunt>
-								<chanceFactor>0.7</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.72</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Enhydriodon ========= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Enhydriodon"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.17</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.13</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Enhydriodon"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.59</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.94</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.59</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.94</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.9</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.08</armorPenetrationSharp>
-								<armorPenetrationBlunt>6.338</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Metal Gear Rimworld-Gekko/BodyDefs/GekkoBody.xml b/Patches/Metal Gear Rimworld-Gekko/BodyDefs/GekkoBody.xml
deleted file mode 100644
index d31650205e..0000000000
--- a/Patches/Metal Gear Rimworld-Gekko/BodyDefs/GekkoBody.xml	
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Metal Gear Rimworld-Gekko</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Add groups entry if it doesn't exist already ========== -->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalNeck"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalShoulder"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<!-- ========== Add armor coverage ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MGR_SyntheticalLeg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MGR_SyntheticalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MGR_SyntheticalLeg"]/parts/li[def="PowerClaw"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Mech_Gekko"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Metal Gear Rimworld-Gekko/ThingDefs_Misc/Gekko50call.xml b/Patches/Metal Gear Rimworld-Gekko/ThingDefs_Misc/Gekko50call.xml
deleted file mode 100644
index 81a1b9b807..0000000000
--- a/Patches/Metal Gear Rimworld-Gekko/ThingDefs_Misc/Gekko50call.xml	
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Metal Gear Rimworld-Gekko</li>
-		</mods>
-
-		<match Class="CombatExtended.PatchOperationMakeGunCECompatible">
-			<defName>MGR_Gun_Autocannon</defName>
-			<statBases>
-				<Mass>38.00</Mass>
-				<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-				<SightsEfficiency>1</SightsEfficiency>
-				<ShotSpread>0.05</ShotSpread>
-				<SwayFactor>1.4</SwayFactor>
-				<Bulk>20.00</Bulk>
-			</statBases>
-			<Properties>
-				<recoilAmount>1.58</recoilAmount>
-				<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-				<hasStandardCommand>true</hasStandardCommand>
-				<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-				<warmupTime>1.3</warmupTime>
-				<range>75</range>
-				<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-				<burstShotCount>10</burstShotCount>
-				<soundCast>50Cal_Browning</soundCast>
-				<soundCastTail>GunTail_Heavy</soundCastTail>
-				<muzzleFlashScale>16</muzzleFlashScale>
-				<recoilPattern>Mounted</recoilPattern>
-			</Properties>
-			<AmmoUser>
-				<magazineSize>100</magazineSize>
-				<reloadTime>7.8</reloadTime>
-				<ammoSet>AmmoSet_50BMG</ammoSet>
-			</AmmoUser>
-			<FireModes>
-				<aimedBurstShotCount>5</aimedBurstShotCount>
-				<aiAimMode>SuppressFire</aiAimMode>
-			</FireModes>
-			<weaponTags>
-				<li>CE_AI_Suppressive</li>
-				<li>NoSwitch</li>
-			</weaponTags>
-		</match>
-
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Metal Gear Rimworld-Gekko/ThingDefs_Races/Races_Mechanoid.xml b/Patches/Metal Gear Rimworld-Gekko/ThingDefs_Races/Races_Mechanoid.xml
deleted file mode 100644
index 48b3f3658f..0000000000
--- a/Patches/Metal Gear Rimworld-Gekko/ThingDefs_Races/Races_Mechanoid.xml	
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Metal Gear Rimworld-Gekko</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MGR_Mech_Gekko"]/statBases</xpath>
-					<value>
-						<PartialArmorBody>0</PartialArmorBody>
-					</value>
-				</li>
-
-				<!--Consistency with vanilla mechs-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MGR_Mech_Gekko"]/statBases</xpath>
-					<value>
-						<SmokeSensitivity>0</SmokeSensitivity>
-						<NightVisionEfficiency>0.80</NightVisionEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MGR_Mech_Gekko"]/statBases</xpath>
-					<value>
-						<ArmorRating_Heat>0.25</ArmorRating_Heat>
-						<CarryWeight>75</CarryWeight>
-						<CarryBulk>30</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.26</MeleeCritChance>
-						<MeleeParryChance>0.52</MeleeParryChance>
-						<AimingDelayFactor>1.25</AimingDelayFactor>
-						<MaxHitPoints>500</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MGR_Mech_Gekko"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>38</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MGR_Mech_Gekko"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MGR_Mech_Gekko"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>3.51</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="MGR_Mech_Gekko"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="MGR_Mech_Gekko"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MGR_Mech_Gekko"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li>
-							<compClass>CombatExtended.CompAmmoGiver</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_MechAmmo">
-							<gizmoIconSetMagCount>UI/Buttons/SetMagCount</gizmoIconSetMagCount>
-							<gizmoIconTakeAmmoNow>UI/Buttons/TakeAmmoNow</gizmoIconTakeAmmoNow>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="MGR_Mech_Gekko"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<useStatic>false</useStatic>
-									<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
-									<parts>
-										<li>SightSensor</li>
-									</parts>
-								</li>
-								<li>
-									<useStatic>false</useStatic>
-									<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
-									<parts>
-										<li>SightSensor</li>
-									</parts>
-								</li>
-								<li>
-									<useStatic>false</useStatic>
-									<ArmorRating_Sharp>0.625</ArmorRating_Sharp>
-									<parts>
-										<li>MGR_SyntheticalLeg</li>
-									</parts>
-								</li>
-								<li>
-									<useStatic>true</useStatic>
-									<ArmorRating_Blunt>0.625</ArmorRating_Blunt>
-									<parts>
-										<li>MGR_SyntheticalLeg</li>
-									</parts>
-								</li>
-								<li>
-									<useStatic>false</useStatic>
-									<ArmorRating_Sharp>0.625</ArmorRating_Sharp>
-									<parts>
-										<li>MechanicalFoot</li>
-									</parts>
-								</li>
-								<li>
-									<useStatic>false</useStatic>
-									<ArmorRating_Blunt>0.625</ArmorRating_Blunt>
-									<parts>
-										<li>MechanicalFoot</li>
-									</parts>
-								</li>
-								<li>
-									<useStatic>false</useStatic>
-									<ArmorRating_Sharp>0.625</ArmorRating_Sharp>
-									<parts>
-										<li>PowerClaw</li>
-									</parts>
-								</li>
-								<li>
-									<useStatic>false</useStatic>
-									<ArmorRating_Blunt>0.625</ArmorRating_Blunt>
-									<parts>
-										<li>PowerClaw</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MGR_Mech_Gekko"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>3000</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>300</MaxOverHeal>
-							<MinArmorPct>0.5</MinArmorPct>
-							<MinArmorValueSharp>10</MinArmorValueSharp>
-							<MinArmorValueBlunt>22</MinArmorValueBlunt>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Midworld Expanded Flak Armor/ThingDefs_Misc/ThingDef_Apparel.xml b/Patches/Midworld Expanded Flak Armor/ThingDefs_Misc/ThingDef_Apparel.xml
deleted file mode 100644
index e05489fccd..0000000000
--- a/Patches/Midworld Expanded Flak Armor/ThingDefs_Misc/ThingDef_Apparel.xml	
+++ /dev/null
@@ -1,231 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Midworld Expanded: Flak Armor</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--Bulk/Mass-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_FlakGloves" or
-								defName="Apparel_FlakBoots" or
-								defName="Apparel_FlakMask"
-								]/statBases/Mass </xpath>
-							<value>
-								<Mass>0.50</Mass>
-								<Bulk>3</Bulk>
-								<WornBulk>2</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="FlakShirt"
-								]/statBases/Mass </xpath>
-							<value>
-								<Mass>1.2</Mass>
-								<Bulk>5</Bulk>
-								<WornBulk>3</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="LightFlakVest"
-								]/statBases/Mass </xpath>
-							<value>
-								<Mass>6.25</Mass>
-								<Bulk>5</Bulk>
-								<WornBulk>3</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="LightFlakVest"
-								]/statBases/MaxHitPoints </xpath>
-							<value>
-								<MaxHitPoints>100</MaxHitPoints>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HeavyFlakSuit"
-								]/statBases/Mass </xpath>
-							<value>
-								<Mass>17.5</Mass>
-								<Bulk>60</Bulk>
-								<WornBulk>14</WornBulk>
-							</value>
-						</li>
-
-						<!--Armor Values-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="Apparel_FlakBoots" or
-								defName="Apparel_FlakMask"
-								]/statBases/ArmorRating_Sharp </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-								<ArmorRating_Sharp>2</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="Apparel_FlakGloves" or
-								defName="FlakShirt"
-								]/statBases/ArmorRating_Sharp </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-								<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="LightFlakVest"
-								]/statBases/ArmorRating_Sharp </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HeavyFlakSuit"
-								]/statBases/ArmorRating_Sharp </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>7</StuffEffectMultiplierArmor>
-								<ArmorRating_Sharp>5</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_FlakGloves" or
-								defName="Apparel_FlakBoots" or
-								defName="Apparel_FlakMask" or
-								defName="FlakShirt"
-								]/statBases/ArmorRating_Blunt </xpath>
-							<value>
-								<ArmorRating_Blunt>1</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HeavyFlakSuit"
-								]/statBases/ArmorRating_Blunt </xpath>
-							<value>
-								<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="LightFlakVest"
-								]/statBases/ArmorRating_Blunt </xpath>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="Apparel_FlakGloves" or
-								defName="Apparel_FlakBoots" or
-								defName="Apparel_FlakMask" or
-								defName="FlakShirt" or
-								defName="LightFlakVest" or
-								defName="HeavyFlakSuit"
-								]/statBases/ArmorRating_Heat </xpath>
-						</li>
-
-						<!--Movespeed-->
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[
-								defName="Apparel_FlakBoots" or
-								defName="FlakShirt" or
-								defName="HeavyFlakSuit"
-								]/equippedStatOffsets/MoveSpeed </xpath>
-						</li>
-
-						<!--Costs-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_FlakGloves" or
-								defName="Apparel_FlakBoots" or
-								defName="FlakShirt"
-								]/costList </xpath>
-							<value>
-								<costList>
-									<Steel>15</Steel>
-								</costList>
-								<stuffCategories>
-									<li>Fabric</li>
-								</stuffCategories>
-								<costStuffCount>35</costStuffCount>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="Apparel_FlakMask"
-								]/costList </xpath>
-							<value>
-								<costList>
-									<Plasteel>15</Plasteel>
-								</costList>
-								<stuffCategories>
-									<li>Fabric</li>
-								</stuffCategories>
-								<costStuffCount>35</costStuffCount>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="LightFlakVest"
-								]/costList </xpath>
-							<value>
-								<costList>
-									<Cloth>20</Cloth>
-								</costList>
-								<stuffCategories>
-									<li>Steeled</li>
-								</stuffCategories>
-								<costStuffCount>45</costStuffCount>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HeavyFlakSuit"
-								]/costList </xpath>
-							<value>
-								<costList>
-									<Steel>120</Steel>
-								</costList>
-								<stuffCategories>
-									<li>Fabric</li>
-								</stuffCategories>
-								<costStuffCount>100</costStuffCount>
-							</value>
-						</li>
-
-						<!--Layer-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_FlakMask"
-								]/apparel/layers/li[.="Overhead"] </xpath>
-							<value>
-								<li>StrappedHead</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Midworld Weaponry Expanded/Industrial_Ranged.xml b/Patches/Midworld Weaponry Expanded/Industrial_Ranged.xml
deleted file mode 100644
index 6fb5c60e54..0000000000
--- a/Patches/Midworld Weaponry Expanded/Industrial_Ranged.xml	
+++ /dev/null
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Midworld Weaponry Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Tools === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[defName = "Gun_AdvancedRifle"]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[defName = "Gun_CompactRifle"]/tools
-					</xpath>
-					<value>
-						<tools>
-							<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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_AdvancedGrenadeLauncher"]/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>
-				</li>
-
-				<!-- === Advanced Assault Rifle === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AdvancedRifle</defName>
-					<statBases>
-						<WorkToMake>40000</WorkToMake>
-						<Mass>4.00</Mass>
-						<Bulk>7.50</Bulk>
-						<SwayFactor>1.24</SwayFactor>
-						<ShotSpread>0.11</ShotSpread>
-						<SightsEfficiency>1.2</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.34</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>55</Steel>
-						<Chemfuel>15</Chemfuel>
-						<Gold>7</Gold>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilAmount>2.12</recoilAmount>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>60</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<!-- Required Research Rework -->
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-				</li>
-
-				<!-- === Compact Rifle === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_CompactRifle</defName>
-					<statBases>
-						<WorkToMake>20000</WorkToMake>
-						<Mass>2.65</Mass>
-						<Bulk>4.00</Bulk>
-						<SwayFactor>2.15</SwayFactor>
-						<ShotSpread>0.15</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>45</Steel>
-						<WoodLog>7</WoodLog>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>0.85</warmupTime>
-						<range>35</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilAmount>1.83</recoilAmount>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<!-- Required Research Rework -->
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-				</li>
-
-				<!-- ===Advanced  Grenade Launcher === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AdvancedGrenadeLauncher</defName>
-					<statBases>
-						<WorkToMake>35500</WorkToMake>
-						<Mass>8.50</Mass>
-						<Bulk>9.00</Bulk>
-						<SwayFactor>1.31</SwayFactor>
-						<ShotSpread>0.18</ShotSpread>
-						<SightsEfficiency>1.15</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.40</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>60</Steel>
-						<Chemfuel>10</Chemfuel>
-						<Uranium>15</Uranium>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>50</range>
-						<minRange>4</minRange>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<recoilAmount>2.93</recoilAmount>
-						<ai_IsBuildingDestroyer>True</ai_IsBuildingDestroyer>
-						<ignorePartialLoSBlocker>True</ignorePartialLoSBlocker>
-						<targetParams>
-							<canTargetLocations>True</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>5.1</reloadTime>
-						<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aiUseBurstMode>False</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>GunHeavy</li>
-					</weaponTags>
-					<researchPrerequisite>CE_Launchers</researchPrerequisite>
-
-					<!-- Disallow with Run And Gun -->
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Miho Race/Ammo/Ammo_Miho_Advanced.xml b/Patches/Miho Race/Ammo/Ammo_Miho_Advanced.xml
deleted file mode 100644
index 16a9adf765..0000000000
--- a/Patches/Miho Race/Ammo/Ammo_Miho_Advanced.xml	
+++ /dev/null
@@ -1,459 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Miho, the celestial fox</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<!-- Ammo Categories -->
-
-				<!-- Ammoset -->
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_MihoPlasma</defName>
-					<label>Rifle Plasma Cell</label>
-					<ammoTypes>
-						<Ammo_PlasmaCellRifle>Bullet_MihoPlasma</Ammo_PlasmaCellRifle>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_MihoPlasmaSniper</defName>
-					<label>Rifle Plasma Cell</label>
-					<ammoTypes>
-						<Ammo_PlasmaCellRifle>Bullet_MihoPlasmaSniper</Ammo_PlasmaCellRifle>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- Ammoset -->
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_MihoPlasmaThermo</defName>
-					<label>Thermobaric</label>
-					<ammoTypes>
-						<Ammo_80x256mmFuel_Incendiary>Bullet_75x300mmMiho_Thermobaric</Ammo_80x256mmFuel_Incendiary>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- Psy Shot -->
-
-				<ThingCategoryDef>
-					<defName>AmmoMechPsyShot</defName>
-					<label>Mechite Shot</label>
-					<parent>AmmoAdvanced</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
-				</ThingCategoryDef>
-
-				<CombatExtended.AmmoCategoryDef>
-					<defName>MechaniteMiho</defName>
-					<label>Mechanite (Miholic)</label>
-					<labelShort>MEC-M</labelShort>
-					<description>Mechanite enhanced munitions that are psychically charged. Capable of exotic or distruptive effects to a range of targets.</description>
-				</CombatExtended.AmmoCategoryDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_MechPsyShot</defName>
-					<label>Psychic Shot</label>
-					<ammoTypes>
-						<Ammo_MechPsyShot>Bullet_MechPsyShot</Ammo_MechPsyShot>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-					<description>Multi-pellet mech shot cartridge designed for shotgun-type weapons.</description>
-					<thingCategories>
-						<li>AmmoMechPsyShot</li>
-					</thingCategories>
-					<defName>Ammo_MechPsyShot</defName>
-					<label>Mechanite Psyshot</label>
-					<graphicData>
-						<texPath>Things/Ammo/Charged/ShotgunMech</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>4.29</MarketValue>
-						<Mass>0.047</Mass>
-						<Bulk>0.07</Bulk>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-					</tradeTags>
-					<ammoClass>MechaniteMiho</ammoClass>
-				</ThingDef>
-
-				<ThingDef ParentName="Base12GaugeChargedBullet">
-					<defName>Bullet_MechPsyShot</defName>
-					<label>pellet</label>
-					<graphicData>
-						<texPath>Things/Projectile/MihoThunderSpear</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>3</damageAmountBase>
-						<damageDef>Miho_MagicBombEMP</damageDef>
-						<secondaryDamage>
-							<li>
-								<def>EMP</def>
-								<amount>1</amount>
-								<chance>0.08</chance>
-							</li>
-							<li>
-								<def>Stun</def>
-								<amount>2</amount>
-								<chance>0.05</chance>
-							</li>
-						</secondaryDamage>
-						<armorPenetrationSharp>0</armorPenetrationSharp>
-						<armorPenetrationBlunt>0</armorPenetrationBlunt>
-						<pelletCount>5</pelletCount>
-						<spreadMult>8.9</spreadMult>
-					</projectile>
-				</ThingDef>
-
-				<RecipeDef ParentName="ChargeAmmoRecipeBase">
-					<defName>MakeAmmo_MechPsyShot</defName>
-					<label>make Mechanite Psychic shell x200</label>
-					<description>Craft 200 Mechanite Psychic shells.</description>
-					<jobString>Making Mechanite Psychic shells.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Miho_MilitaryGradeBalisticCeramics</li>
-								</thingDefs>
-							</filter>
-							<count>20</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>10</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>20</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Miho_MilitaryGradeBalisticCeramics</li>
-							<li>Steel</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_MechPsyShot>200</Ammo_MechPsyShot>
-					</products>
-					<workAmount>21000</workAmount>
-					<researchPrerequisite>Miho_MechHack</researchPrerequisite>
-					<recipeUsers Inherit="False">
-						<li>Miho_TableMachining</li>
-					</recipeUsers>
-				</RecipeDef>
-
-				<!-- Heavy Pistol Bolt -->
-
-				<ThingCategoryDef>
-					<defName>Ammo10mmMihogrenade</defName>
-					<label>Miho Minigrenade</label>
-					<parent>AmmoAdvanced</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
-				</ThingCategoryDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_10mmMihogrenade</defName>
-					<label>Mechanite Grenade (Blast)</label>
-					<ammoTypes>
-						<Ammo_10mmMihogrenade>Bullet_10mmMihogrenade</Ammo_10mmMihogrenade>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_10mmMihogrenadeFlechette</defName>
-					<label>Mechanite Grenade (Flechette)</label>
-					<ammoTypes>
-						<Ammo_10mmMihogrenade>Bullet_10mmMihogrenadeFlechette</Ammo_10mmMihogrenade>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_10mmMihogrenadeBarrier</defName>
-					<label>Mechanite Grenade (Barrier)</label>
-					<ammoTypes>
-						<Ammo_10mmMihogrenade>Bullet_10mmMihogrenadeBarrier</Ammo_10mmMihogrenade>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-					<description>Special purpose launcher grenades with variable properties.</description>
-					<thingCategories>
-						<li>Ammo10mmMihogrenade</li>
-					</thingCategories>
-					<defName>Ammo_10mmMihogrenade</defName>
-					<label>Mechanite Grenade</label>
-					<graphicData>
-						<texPath>Things/Ammo/Charged/ShotgunMech</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>17.1</MarketValue>
-						<Mass>0.17</Mass>
-						<Bulk>0.20</Bulk>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-					</tradeTags>
-					<ammoClass>MechaniteMiho</ammoClass>
-				</ThingDef>
-
-				<ThingDef ParentName="Base40x46mmGrenadeBullet">
-					<defName>Bullet_10mmMihogrenade</defName>
-					<label>mechanite smart grenade (Explosive)</label>
-					<graphicData>
-						<texPath>Things/Projectile/Bullet_Big</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>18</damageAmountBase>
-						<damageDef>Miho_MagicBomb</damageDef>
-						<explosionRadius>1</explosionRadius>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Mihomech>20</Fragment_Mihomech>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<RecipeDef ParentName="ChargeAmmoRecipeBase">
-					<defName>MakeAmmo_10mmMihogrenade</defName>
-					<label>make Mechanite Grenade x50</label>
-					<description>Craft 50 Mechanite Grenades.</description>
-					<jobString>Making Mechanite Grenades.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Miho_MilitaryGradeBalisticCeramics</li>
-								</thingDefs>
-							</filter>
-							<count>20</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>8</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>20</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Miho_MilitaryGradeBalisticCeramics</li>
-							<li>Steel</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_10mmMihogrenade>50</Ammo_10mmMihogrenade>
-					</products>
-					<workAmount>20800</workAmount>
-					<researchPrerequisite>Miho_MechHack</researchPrerequisite>
-					<recipeUsers Inherit="False">
-						<li>Miho_TableMachining</li>
-					</recipeUsers>
-				</RecipeDef>
-
-				<!-- Ammoless Projectile -->
-				<ThingDef ParentName="Base556x45mmNATOBullet">
-					<defName>Bullet_MihoPlasma</defName>
-					<label>Plasma Bolt</label>
-					<graphicData>
-						<texPath>Things/Projectile/MihoPlasma</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>100</speed>
-						<damageAmountBase>10</damageAmountBase>
-						<damageDef>MihoPlasma</damageDef>
-						<armorPenetrationSharp>0</armorPenetrationSharp>
-						<armorPenetrationBlunt>200</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base556x45mmNATOBullet">
-					<defName>Bullet_MihoPlasmaSniper</defName>
-					<label>Plasma Bolt</label>
-					<graphicData>
-						<texPath>Things/Projectile/MihoPlasma</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>100</speed>
-						<damageAmountBase>30</damageAmountBase>
-						<damageDef>MihoPlasma</damageDef>
-						<armorPenetrationSharp>0</armorPenetrationSharp>
-						<armorPenetrationBlunt>400</armorPenetrationBlunt>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>60</damageAmountBase>
-							<explosiveDamageType>MihoPlasma</explosiveDamageType>
-							<explosiveRadius>1</explosiveRadius>
-							<explosionSound>Explosion_Bomb</explosionSound>
-							<applyDamageToExplosionCellsNeighbors>false</applyDamageToExplosionCellsNeighbors>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletRed">
-					<defName>Bullet_Laser_MihoMiniGun</defName>
-					<label>laser beam</label>
-					<graphicData>
-						<color>(255,160,46)</color>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>MihoPlasma</damageDef>
-						<damageAmountBase>7</damageAmountBase>
-						<armorPenetrationSharp>0</armorPenetrationSharp>
-						<armorPenetrationBlunt>200</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseExplosiveBullet">
-					<defName>Bullet_60x180mmMiho_Thermobaric</defName>
-					<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					<label>60x180mm fuel shell (Thermobaric)</label>
-					<graphicData>
-						<texPath>Things/Projectile/LauncherShot</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-						<shaderType>TransparentPostLight</shaderType>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Thermobaric</damageDef>
-						<damageAmountBase>160</damageAmountBase>
-						<armorPenetrationSharp>0</armorPenetrationSharp>
-						<armorPenetrationBlunt>0</armorPenetrationBlunt>
-						<speed>60</speed>
-						<flyOverhead>false</flyOverhead>
-						<explosionRadius>3.5</explosionRadius>
-						<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
-						<preExplosionSpawnChance>0.5</preExplosionSpawnChance>
-						<soundExplode>MortarIncendiary_Explode</soundExplode>
-						<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-						<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
-						<soundAmbient>MortarRound_Ambient</soundAmbient>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						<ai_IsIncendiary>true</ai_IsIncendiary>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseExplosiveBullet">
-					<defName>Bullet_75x300mmMiho_Thermobaric</defName>
-					<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					<label>75x300mm plasmanized thermobaric shell</label>
-					<graphicData>
-						<texPath>Things/Projectile/LauncherShot</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-						<shaderType>TransparentPostLight</shaderType>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>MihoPlasma</damageDef>
-						<damageAmountBase>280</damageAmountBase>
-						<armorPenetrationSharp>0</armorPenetrationSharp>
-						<armorPenetrationBlunt>1000</armorPenetrationBlunt>
-						<speed>60</speed>
-						<flyOverhead>false</flyOverhead>
-						<explosionRadius>3.5</explosionRadius>
-						<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
-						<preExplosionSpawnChance>0.5</preExplosionSpawnChance>
-						<soundExplode>MortarIncendiary_Explode</soundExplode>
-						<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-						<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
-						<soundAmbient>MortarRound_Ambient</soundAmbient>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						<ai_IsIncendiary>true</ai_IsIncendiary>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseFragment">
-					<defName>Fragment_Mihomech</defName>
-					<label>fragments</label>
-					<graphicData>
-						<texPath>Things/Projectile/MihoThunderSpear</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-						<drawSize>0.88</drawSize>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Miho_MagicBomb</damageDef>
-						<damageAmountBase>4</damageAmountBase>
-						<speed>35</speed>
-						<gravityFactor>5</gravityFactor>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base12GaugeChargedBullet">
-					<defName>Bullet_10mmMihogrenadeFlechette</defName>
-					<label>flechette</label>
-					<graphicData>
-						<texPath>Things/Projectile/MihoThunderSpear</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-						<drawSize>1.35</drawSize>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>65</speed>
-						<damageAmountBase>10</damageAmountBase>
-						<damageDef>Miho_MagicBombEMP</damageDef>
-						<secondaryDamage>
-							<li>
-								<def>EMP</def>
-								<amount>8</amount>
-								<chance>1</chance>
-							</li>
-						</secondaryDamage>
-						<armorPenetrationSharp>0</armorPenetrationSharp>
-						<armorPenetrationBlunt>0</armorPenetrationBlunt>
-						<pelletCount>6</pelletCount>
-						<spreadMult>8.9</spreadMult>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base40x46mmGrenadeBullet">
-					<defName>Bullet_10mmMihogrenadeBarrier</defName>
-					<label>mechanite smart grenade (barrier)</label>
-					<graphicData>
-						<texPath>Things/Projectile/Bullet_Big</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>0</damageAmountBase>
-						<damageDef>Smoke</damageDef>
-						<explosionRadius>0.5</explosionRadius>
-						<preExplosionSpawnThingDef>Miho_BulletShieldPsychicSmall</preExplosionSpawnThingDef>
-						<preExplosionSpawnChance>1</preExplosionSpawnChance>
-					</projectile>
-				</ThingDef>
-
-			</value>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Miho Race/Ammo/Ammo_Miho_Industrial.xml b/Patches/Miho Race/Ammo/Ammo_Miho_Industrial.xml
deleted file mode 100644
index a00f8352df..0000000000
--- a/Patches/Miho Race/Ammo/Ammo_Miho_Industrial.xml	
+++ /dev/null
@@ -1,908 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Miho, the celestial fox</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<!-- Ammo Categories -->
-				<CombatExtended.AmmoCategoryDef>
-					<defName>IncendiaryMiho</defName>
-					<label>armor-piercing incendiary (Miholic)</label>
-					<labelShort>AP-IM</labelShort>
-					<description>Filled with an high intensity incendiary compound that ignites on impact, burning the target, increasing armor penetration and comprimising the structure of the target.</description>
-				</CombatExtended.AmmoCategoryDef>
-
-				<!-- Ammo -->
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="8x22mmNambuBase">
-					<defName>Ammo_8x22mmNambu_Miho</defName>
-					<label>8x22mm Nambu cartridge (AP-IM)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Pistol/AP</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.12</MarketValue>
-					</statBases>
-					<ammoClass>IncendiaryMiho</ammoClass>
-					<cookOffProjectile>Bullet_8x22mmNambu_Miho</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="65x50mmSRArisakaBase">
-					<defName>Ammo_65x50mmSRArisaka_Miho</defName>
-					<label>6.5x50mmSR cartridge (AP-IM)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/Incendiary</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.14</MarketValue>
-					</statBases>
-					<ammoClass>IncendiaryMiho</ammoClass>
-					<cookOffProjectile>Bullet_65x50mmSRArisaka_Miho</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="77x58mmArisakaBase">
-					<defName>Ammo_77x58mmArisaka_Miho</defName>
-					<label>7.7x58mm Arisaka cartridge (AP-IM)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/Incendiary</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.16</MarketValue>
-					</statBases>
-					<ammoClass>IncendiaryMiho</ammoClass>
-					<cookOffProjectile>Bullet_77x58mmArisaka_Miho</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo132x92mmSRTuFBase">
-					<defName>Ammo_132x92mmSRTuF_Miho</defName>
-					<label>13.2x92mmSR TuF cartridge (AP-IM)</label>
-					<graphicData>
-						<texPath>Things/Ammo/HighCaliber/Incendiary</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.77</MarketValue>
-					</statBases>
-					<ammoClass>IncendiaryMiho</ammoClass>
-					<cookOffProjectile>Bullet_132x92mmSRTuF_Miho</cookOffProjectile>
-				</ThingDef>
-
-				<!-- Projectiles -->
-				<ThingDef ParentName="Base8x22mmNambuBullet">
-					<defName>Bullet_8x22mmNambu_Miho</defName>
-					<label>8x22mm Nambu bullet (AP-IM)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>MihoGunshot</damageDef>
-						<damageAmountBase>5</damageAmountBase>
-						<armorPenetrationSharp>6</armorPenetrationSharp>
-						<armorPenetrationBlunt>5.88</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Flame_Secondary</def>
-								<amount>3</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base8x22mmNambuBullet">
-					<defName>Bullet_65x50mmSRArisaka_Miho</defName>
-					<label>6.5x50mmSR bullet (AP-IM)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>MihoGunshot</damageDef>
-						<damageAmountBase>5</damageAmountBase>
-						<armorPenetrationSharp>6</armorPenetrationSharp>
-						<armorPenetrationBlunt>5.88</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Flame_Secondary</def>
-								<amount>3</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base75x54mmFrenchBullet">
-					<defName>Bullet_77x58mmArisaka_Miho</defName>
-					<label>7.7x58mm Arisaka bullet (AP-IM)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>MihoGunshot</damageDef>
-						<damageAmountBase>6</damageAmountBase>
-						<armorPenetrationSharp>12</armorPenetrationSharp>
-						<armorPenetrationBlunt>60.24</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Flame_Secondary</def>
-								<amount>4</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base132x92mmSRTuFBullet">
-					<defName>Bullet_132x92mmSRTuF_Miho</defName>
-					<label>13.2x92mmSR TuF bullet (AP-IM)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>MihoGunshot</damageDef>
-						<damageAmountBase>25</damageAmountBase>
-						<armorPenetrationSharp>44</armorPenetrationSharp>
-						<armorPenetrationBlunt>317.36</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Flame_Secondary</def>
-								<amount>16</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<!-- Recipes -->
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_8x22mmNambu_Miho</defName>
-					<label>make 8x22mm Nambu (AP-IM) cartridge x500</label>
-					<description>Craft 500 8x22mm Nambu (AP-IM) cartridges.</description>
-					<jobString>Making 8x22mm Nambu (AP-IM) cartridges.</jobString>
-					<researchPrerequisite>Miho_HeavyWeapon</researchPrerequisite>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>14</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>3</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Miho_MilitaryGradeBalisticCeramics</li>
-								</thingDefs>
-							</filter>
-							<count>1</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Prometheum</li>
-							<li>Miho_MilitaryGradeBalisticCeramics</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_8x22mmNambu_Miho>500</Ammo_8x22mmNambu_Miho>
-					</products>
-					<workAmount>3000</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_65x50mmSRArisaka_Miho</defName>
-					<label>make 6.5x50mmSR (AP-IM) cartridge x500</label>
-					<description>Craft 500 6.5x50mmSR Arisaka (AP-IM) cartridges.</description>
-					<jobString>Making 6.5x50mmSR Arisaka (AP-IM) cartridges.</jobString>
-					<researchPrerequisite>Miho_HeavyWeapon</researchPrerequisite>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>24</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>3</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Miho_MilitaryGradeBalisticCeramics</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Prometheum</li>
-							<li>Miho_MilitaryGradeBalisticCeramics</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_65x50mmSRArisaka_Miho>500</Ammo_65x50mmSRArisaka_Miho>
-					</products>
-					<workAmount>4600</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_77x58mmArisaka_Miho</defName>
-					<label>make 7.7x58mm Arisaka (AP-IM) cartridge x500</label>
-					<description>Craft 500 7.7x58mm Arisaka (AP-IM) cartridges.</description>
-					<jobString>Making 7.7x58mm Arisaka (AP-IM) cartridges.</jobString>
-					<researchPrerequisite>Miho_HeavyWeapon</researchPrerequisite>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>30</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>3</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Miho_MilitaryGradeBalisticCeramics</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Prometheum</li>
-							<li>Miho_MilitaryGradeBalisticCeramics</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_77x58mmArisaka_Miho>500</Ammo_77x58mmArisaka_Miho>
-					</products>
-					<workAmount>6000</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AdvancedAmmoRecipeBase">
-					<defName>MakeAmmo_132x92mmSRTuF_Miho</defName>
-					<label>make 13.2x92mmSR TuF (AP-IM) cartridge x200</label>
-					<description>Craft 200 13.2x92mmSR TuF (AP-IM) cartridges.</description>
-					<jobString>Making 13.2x92mmSR TuF (AP-IM) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>58</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>6</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Miho_MilitaryGradeBalisticCeramics</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Prometheum</li>
-							<li>Miho_MilitaryGradeBalisticCeramics</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_132x92mmSRTuF_Miho>200</Ammo_132x92mmSRTuF_Miho>
-					</products>
-					<workAmount>9800</workAmount>
-				</RecipeDef>
-
-				<ThingCategoryDef>
-					<defName>AmmoMiho47x285mm</defName>
-					<label>47x285mm mihoic anti-tank shell</label>
-					<parent>AmmoShells</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberAutocannonLarge</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_Miho47x285mm</defName>
-					<label>47x285mm anti-tank shell</label>
-					<ammoTypes>
-						<Ammo_Miho47x285mm_HE>Bullet_Miho47x285mm_HE</Ammo_Miho47x285mm_HE>
-						<Ammo_Miho47x285mm_AP>Bullet_Miho47x285mm_AP</Ammo_Miho47x285mm_AP>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="AmmoMiho47x285mmBase" ParentName="HeavyAmmoBase" Abstract="True">
-					<description>Large caliber cartridge used by autocannons and anti-aircraft cannons.</description>
-					<statBases>
-						<Mass>1.4</Mass>
-						<Bulk>3.98</Bulk>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-					</tradeTags>
-					<thingCategories>
-						<li>AmmoMiho47x285mm</li>
-					</thingCategories>
-					<stackLimit>25</stackLimit>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoMiho47x285mmBase">
-					<defName>Ammo_Miho47x285mm_HE</defName>
-					<label>47x285mm Mihoic anti-tank shell cartridge (HE)</label>
-					<graphicData>
-						<texPath>Things/Ammo/HighCaliber/Bofors/HE</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>21.21</MarketValue>
-					</statBases>
-					<ammoClass>ExplosiveAP</ammoClass>
-					<cookOffProjectile>Bullet_Miho47x285mm_HE</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoMiho47x285mmBase">
-					<defName>Ammo_Miho47x285mm_AP</defName>
-					<label>47x285mm Mihoic anti-tank shell cartridge (APHE)</label>
-					<graphicData>
-						<texPath>Things/Ammo/HighCaliber/Bofors/AP</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>7.57</MarketValue>
-					</statBases>
-					<ammoClass>ArmorPiercing</ammoClass>
-					<cookOffProjectile>Bullet_Miho47x285mm_AP</cookOffProjectile>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef Name="BaseMiho47x285mmBullet" ParentName="BaseBulletCE" Abstract="true">
-					<graphicData>
-						<texPath>Things/Projectile/Bullet_Big</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bullet</damageDef>
-						<speed>155</speed>
-						<dropsCasings>true</dropsCasings>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseMiho47x285mmBullet">
-					<defName>Bullet_Miho47x285mm_HE</defName>
-					<label>47x285mm Mihoic anti-tank bullet (HE)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>195</damageAmountBase>
-						<armorPenetrationSharp>25</armorPenetrationSharp>
-						<armorPenetrationBlunt>8555.440</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Bomb_Secondary</def>
-								<amount>117</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseMiho47x285mmBullet">
-					<defName>Bullet_Miho47x285mm_AP</defName>
-					<label>47x285mm Mihoic anti-tank bullet (APHE)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>122</damageAmountBase>
-						<armorPenetrationSharp>57</armorPenetrationSharp>
-						<armorPenetrationBlunt>8555.440</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_Miho47x285mm_HE</defName>
-					<label>make 47x285mm Miho (HE) cartridge x25</label>
-					<description>Craft 25 47x285mm Miho (HE) cartridges.</description>
-					<jobString>Making 47x285mm Miho (HE) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>108</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>33</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_Miho47x285mm_HE>25</Ammo_Miho47x285mm_HE>
-					</products>
-					<workAmount>24000</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_Miho47x285mm_AP</defName>
-					<label>make 47x285mm Miho (APHE) cartridge x25</label>
-					<description>Craft 25 47x285mm Miho (APHE) cartridges.</description>
-					<jobString>Making 47x285mm Miho (APHE) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>108</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_Miho47x285mm_AP>25</Ammo_Miho47x285mm_AP>
-					</products>
-					<workAmount>10800</workAmount>
-				</RecipeDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSetMiho100mm_Incendiary</defName>
-					<label>100mm Rocket</label>
-					<ammoTypes>
-						<Ammo_Miho100mm_Incendiary>Bullet_Miho100mm_Incendiary</Ammo_Miho100mm_Incendiary>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<ThingCategoryDef>
-					<defName>AmmoMiho100mm_Incendiary</defName>
-					<label />
-					<parent>AmmoRockets</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberRocket</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="Miho100mm_IncendiaryBase" ParentName="HeavyAmmoBase" Abstract="True">
-					<description>An unguided rocket equipped with an explosive warhead and a contact fuse.</description>
-					<thingCategories>
-						<li>AmmoMiho100mm_Incendiary</li>
-					</thingCategories>
-					<stackLimit>25</stackLimit>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-					</tradeTags>
-					<statBases>
-						<MaxHitPoints>250</MaxHitPoints>
-						<Mass>19</Mass>
-						<Bulk>20</Bulk>
-					</statBases>
-					<cookOffFlashScale>25</cookOffFlashScale>
-					<cookOffSound>MortarBomb_Explode</cookOffSound>
-					<isMortarAmmo>true</isMortarAmmo>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="Miho100mm_IncendiaryBase">
-					<defName>Ammo_Miho100mm_Incendiary</defName>
-					<label>100mm Artillery Rocket (Incendiary)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rocket/M74</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-						<drawSize>0.90</drawSize>
-					</graphicData>
-					<statBases>
-						<MarketValue>41.52</MarketValue>
-					</statBases>
-					<ammoClass>GrenadeIncendiary</ammoClass>
-					<detonateProjectile>Bullet_Miho100mm_Incendiary</detonateProjectile>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef Name="BaseMiho100mm_Incendiary" ParentName="BaseExplosiveBullet" Abstract="true">
-					<graphicData>
-						<shaderType>TransparentPostLight</shaderType>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>0</speed>
-						<soundExplode>MortarBomb_Explode</soundExplode>
-						<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-						<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
-						<soundAmbient>MortarRound_Ambient</soundAmbient>
-						<flyOverhead>true</flyOverhead>
-						<dropsCasings>false</dropsCasings>
-						<gravityFactor>5</gravityFactor>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseMiho100mm_Incendiary">
-					<defName>Bullet_Miho100mm_Incendiary</defName>
-					<label>100mm Rocket (Incendiary)</label>
-					<graphicData>
-						<texPath>Things/Projectile/Rocket/SMAW_Thermobaric</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>PrometheumFlame</damageDef>
-						<damageAmountBase>0</damageAmountBase>
-						<armorPenetrationSharp>0</armorPenetrationSharp>
-						<armorPenetrationBlunt>0</armorPenetrationBlunt>
-						<explosionRadius>5.9</explosionRadius>
-						<flyOverhead>true</flyOverhead>
-						<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
-						<preExplosionSpawnChance>0.15</preExplosionSpawnChance>
-						<soundExplode>MortarIncendiary_Explode</soundExplode>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>75</damageAmountBase>
-							<explosiveDamageType>MihoGunshotDemo</explosiveDamageType>
-							<explosiveRadius>1.9</explosiveRadius>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_Miho100mm_Incendiary</defName>
-					<label>make 100mm Miho Rocket x5</label>
-					<description>Craft 5 100mm Miho Rocket cartridges.</description>
-					<jobString>Making 100mm Miho Rocket cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>3</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>10</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>6</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Prometheum</li>
-							<li>Steel</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_Miho100mm_Incendiary>5</Ammo_Miho100mm_Incendiary>
-					</products>
-					<workAmount>3730</workAmount>
-				</RecipeDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_Miho57x93mmGrenade</defName>
-					<label>57x93mm Grenade</label>
-					<ammoTypes>
-						<Ammo_Miho57x93mmGrenade_HE>Bullet_Miho57x93mmGrenade_HE</Ammo_Miho57x93mmGrenade_HE>
-						<Ammo_Miho57x93mmGrenade_HEDP>Bullet_Miho57x93mmGrenade_HEDP</Ammo_Miho57x93mmGrenade_HEDP>
-						<Ammo_Miho57x93mmGrenade_EMP>Bullet_Miho57x93mmGrenade_EMP</Ammo_Miho57x93mmGrenade_EMP>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-				<ThingCategoryDef>
-					<defName>AmmoMiho57x93mmGrenade</defName>
-					<label>57x93mm mihoic Grenade</label>
-					<parent>AmmoGrenades</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberGrenade</iconPath>
-				</ThingCategoryDef>
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="AmmoMiho57x93mmGrenadeBase" ParentName="MediumAmmoBase" Abstract="True">
-					<description>High velocity grenade fired from mounted and crew-served grenade launchers.</description>
-					<statBases>
-						<Mass>1.6</Mass>
-						<Bulk>0.72</Bulk>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-					</tradeTags>
-					<thingCategories>
-						<li>AmmoMiho57x93mmGrenade</li>
-					</thingCategories>
-					<stackLimit>150</stackLimit>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoMiho57x93mmGrenadeBase">
-					<defName>Ammo_Miho57x93mmGrenade_HE</defName>
-					<label>57x93mm Mihoic Grenade (HE)</label>
-					<graphicData>
-						<texPath>Things/Ammo/GrenadeLauncher/HE</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>10.13</MarketValue>
-					</statBases>
-					<ammoClass>GrenadeHE</ammoClass>
-					<cookOffProjectile>Bullet_Miho57x93mmGrenade_HE</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoMiho57x93mmGrenadeBase">
-					<defName>Ammo_Miho57x93mmGrenade_HEDP</defName>
-					<label>57x93mm Mihoic Grenade (HEDP)</label>
-					<graphicData>
-						<texPath>Things/Ammo/GrenadeLauncher/DP</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>10.13</MarketValue>
-					</statBases>
-					<ammoClass>GrenadeHEDP</ammoClass>
-					<cookOffProjectile>Bullet_Miho57x93mmGrenade_HEDP</cookOffProjectile>
-				</ThingDef>
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoMiho57x93mmGrenadeBase">
-					<defName>Ammo_Miho57x93mmGrenade_EMP</defName>
-					<label>57x93mm Mihoic Grenade (EMP)</label>
-					<graphicData>
-						<texPath>Things/Ammo/GrenadeLauncher/EMP</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>16.1</MarketValue>
-					</statBases>
-					<ammoClass>GrenadeEMP</ammoClass>
-					<cookOffProjectile>Bullet_Miho57x93mmGrenade_EMP</cookOffProjectile>
-				</ThingDef>
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef Name="BaseMiho57x93mmGrenadeBullett" ParentName="BaseExplosiveBullet" Abstract="true">
-					<graphicData>
-						<texPath>Things/Projectile/LauncherShot</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-						<drawSize>(0.5,0.5)</drawSize>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>60</speed>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseMiho57x93mmGrenadeBullett">
-					<defName>Bullet_Miho57x93mmGrenade_HE</defName>
-					<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					<label>57x93mm Mihoic Grenade (HE)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bomb</damageDef>
-						<damageAmountBase>42</damageAmountBase>
-						<explosionRadius>1.5</explosionRadius>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>40</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-
-				</ThingDef>
-
-				<ThingDef ParentName="BaseMiho57x93mmGrenadeBullett">
-					<defName>Bullet_Miho57x93mmGrenade_HEDP</defName>
-					<thingClass>CombatExtended.BulletCE</thingClass>
-					<label>57x93mm Mihoic Grenade (HEDP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bullet</damageDef>
-						<damageAmountBase>96</damageAmountBase>
-						<armorPenetrationSharp>76</armorPenetrationSharp>
-						<armorPenetrationBlunt>12.734</armorPenetrationBlunt>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>42</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>0.5</explosiveRadius>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>25</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseMiho57x93mmGrenadeBullett">
-					<defName>Bullet_Miho57x93mmGrenade_EMP</defName>
-					<label>57x93mm Mihoic Grenade (EMP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<explosionRadius>2.5</explosionRadius>
-						<damageDef>EMP</damageDef>
-						<damageAmountBase>42</damageAmountBase>
-					</projectile>
-				</ThingDef>
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_Miho57x93mmGrenade_HE</defName>
-					<label>make 57x93mm Miho (HE) Grenade x50</label>
-					<description>Craft 50 57x93mm Miho (HE) Grenade.</description>
-					<jobString>Making 57x93mm Miho (HE) Grenade.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>160</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>12</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_Miho57x93mmGrenade_HE>100</Ammo_Miho57x93mmGrenade_HE>
-					</products>
-					<workAmount>22000</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_Miho57x93mmGrenade_HEDP</defName>
-					<label>make 57x93mm Miho (HEDP) Grenade x50</label>
-					<description>Craft 50 57x93mm Miho (HEDP) Grenade.</description>
-					<jobString>Making 57x93mm Miho (HEDP) Grenade.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>160</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>12</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_Miho57x93mmGrenade_HEDP>50</Ammo_Miho57x93mmGrenade_HEDP>
-					</products>
-					<workAmount>17200</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_Miho57x93mmGrenade_EMP</defName>
-					<label>make 57x93mm Miho (EMP) Grenade x50</label>
-					<description>Craft 50 57x93mm Miho (EMP) Grenade.</description>
-					<jobString>Making 57x93mm Miho (EMP) Grenade.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>160</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>15</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_Miho57x93mmGrenade_EMP>50</Ammo_Miho57x93mmGrenade_EMP>
-					</products>
-					<workAmount>25000</workAmount>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Miho Race/Ammo/Ammo_Miho_Neolithic.xml b/Patches/Miho Race/Ammo/Ammo_Miho_Neolithic.xml
deleted file mode 100644
index 5e09544625..0000000000
--- a/Patches/Miho Race/Ammo/Ammo_Miho_Neolithic.xml	
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Miho, the celestial fox</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-			</value>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Miho Race/DamageDefs/AbilityDamage.xml b/Patches/Miho Race/DamageDefs/AbilityDamage.xml
deleted file mode 100644
index fecb86570c..0000000000
--- a/Patches/Miho Race/DamageDefs/AbilityDamage.xml	
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Miho, the celestial fox</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[defName="Miho_MagicBombHawk"]/armorCategory</xpath>
-					<value>
-						<armorCategory>Electric</armorCategory>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[defName="Miho_MagicBomb"]/armorCategory</xpath>
-					<value>
-						<armorCategory>Heat</armorCategory>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/DamageDef[defName="Miho_MagicBomb"]</xpath>
-					<value>
-						<li Class="CombatExtended.DamageDefExtensionCE" Inherit="False">
-							<harmOnlyOutsideLayers>true</harmOnlyOutsideLayers>
-							<isAmbientDamage>true</isAmbientDamage>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[defName="Miho_MagicBomb"]/armorCategory</xpath>
-					<value>
-						<armorCategory>Heat</armorCategory>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[defName="Miho_MagicBomb"]/minDamageToFragment</xpath>
-					<value>
-						<minDamageToFragment>7</minDamageToFragment>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[defName="Miho_MagicBombEMP"]/armorCategory</xpath>
-					<value>
-						<armorCategory>Electric</armorCategory>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/DamageDef[defName="Miho_MagicBombEMP"]</xpath>
-					<value>
-						<li Class="CombatExtended.DamageDefExtensionCE">
-							<isAmbientDamage>true</isAmbientDamage>
-						</li>
-					</value>
-				</li>
-
-				<!-- Abillity Damage Tweaks -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Miho_Fireball_Small_Proj"]/projectile/damageAmountBase</xpath>
-					<value>
-						<damageAmountBase>27</damageAmountBase>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Miho_Fireball_Proj"]/projectile/damageAmountBase</xpath>
-					<value>
-						<damageAmountBase>27</damageAmountBase>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Miho_Fireball_Adept_Proj"]/projectile/damageAmountBase</xpath>
-					<value>
-						<damageAmountBase>44</damageAmountBase>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Miho_Thunder_Proj"]/projectile/damageAmountBase</xpath>
-					<value>
-						<damageAmountBase>55</damageAmountBase>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Miho_TalismanStun_Proj"]/projectile/armorPenetrationBase</xpath>
-					<value>
-						<armorPenetrationBase>20</armorPenetrationBase>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Miho Race/PawnKindDefs/Miho_PawnKind.xml b/Patches/Miho Race/PawnKindDefs/Miho_PawnKind.xml
deleted file mode 100644
index 47547613f5..0000000000
--- a/Patches/Miho Race/PawnKindDefs/Miho_PawnKind.xml	
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Miho, the celestial fox</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Ammo-->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="Miho_Soldier_Adventurer" or
-						defName="Miho_Soldier_Hunter" or
-						defName="Miho_Soldier_Militia"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="Miho_Soldier_Marksman" or
-						defName="Miho_Soldier_PMC_Sniper"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>10</min>
-								<max>15</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="Miho_Soldier_Firepower" or
-						defName="Miho_Soldier_PMC_InfantryBasic" or
-						defName="Miho_Soldier_AssassinRanged"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!--Backpack-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CE_Apparel_Backpack"]/apparel/tags</xpath>
-					<value>
-						<li>MihoCommonNecessary</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[
-						defName="Miho_Soldier_Militia" or
-						defName="Miho_Soldier_Hunter" or
-						defName="Miho_Soldier_Marksman" or
-						defName="Miho_Soldier_Firepower" or
-						defName="Miho_Soldier_PMC_Infantry" or
-						defName="Miho_Soldier_PMC_Sniper" or
-						defName="Miho_Soldier_AssassinRanged"
-						]/apparelRequired </xpath>
-					<value>
-						<li>CE_Apparel_Backpack</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Miho Race/Scenario/Miho_Scenario.xml b/Patches/Miho Race/Scenario/Miho_Scenario.xml
deleted file mode 100644
index 70d39615b9..0000000000
--- a/Patches/Miho Race/Scenario/Miho_Scenario.xml	
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Miho, the celestial fox</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="Miho_Start"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_12Gauge_Buck</thingDef>
-							<count>60</count>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Miho Race/ThingDefs_Items/Items_Resources.xml b/Patches/Miho Race/ThingDefs_Items/Items_Resources.xml
deleted file mode 100644
index e36095d914..0000000000
--- a/Patches/Miho Race/ThingDefs_Items/Items_Resources.xml	
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Miho, the celestial fox</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==========  Ebony Silk  =========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Miho_Ebony_SilkCloth"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.50</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Miho_Ebony_SilkCloth"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.08</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Miho_Ebony_SilkCloth"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.15</StuffPower_Armor_Heat>
-						<StuffPower_Armor_Electric>0.10</StuffPower_Armor_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Miho_Ebony_SilkCloth"]/stuffProps/categories</xpath>
-					<value>
-						<li>SoftArmor</li>
-					</value>
-				</li>
-
-				<!-- ==========  Military Ceramics  =========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Miho_MilitaryGradeBalisticCeramics"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1.75</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Miho_MilitaryGradeBalisticCeramics"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>2.5</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Miho_MilitaryGradeBalisticCeramics"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
-						<StuffPower_Armor_Electric>0.05</StuffPower_Armor_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Miho_MilitaryGradeBalisticCeramics"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>0.8</Mass>
-						<MeleePenetrationFactor>1.1</MeleePenetrationFactor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Miho_MilitaryGradeBalisticCeramics"]/stuffProps/categories</xpath>
-					<value>
-						<li>Metallic_Weapon</li>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<!-- ==========  Celestial Scale  =========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Miho_CelestialScale"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>3</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Miho_CelestialScale"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>6</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Miho_CelestialScale"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.10</StuffPower_Armor_Heat>
-						<StuffPower_Armor_Electric>0.15</StuffPower_Armor_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Miho_CelestialScale"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>0.5</Mass>
-						<MeleePenetrationFactor>1.5</MeleePenetrationFactor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Miho_CelestialScale"]/stuffProps/categories</xpath>
-					<value>
-						<li>Metallic_Weapon</li>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<!-- ==========  Ceramics  =========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Miho_Ceramics"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<!-- ==========  Bulk  =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="Miho_Ceramics" or
-						defName="Miho_MilitaryGradeBalisticCeramics" or
-						defName="Miho_CelestialScale"
-						]/statBases </xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="Miho_Ebony_SilkCloth"
-						]/statBases </xpath>
-					<value>
-						<Bulk>0.04</Bulk>
-						<WornBulk>0.4</WornBulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Miho Race/ThingDefs_Misc/Miho_Apparel.xml b/Patches/Miho Race/ThingDefs_Misc/Miho_Apparel.xml
deleted file mode 100644
index d75d1bfee8..0000000000
--- a/Patches/Miho Race/ThingDefs_Misc/Miho_Apparel.xml	
+++ /dev/null
@@ -1,640 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Miho, the celestial fox</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--========= Stuffable =========-->
-
-						<!--Simple Wear-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_Simple"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-								<Bulk>2</Bulk>
-								<WornBulk>0</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_Regular" or defName="Miho_Apparel_OnSkin_Hoodie"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>1.75</StuffEffectMultiplierArmor>
-								<Bulk>2</Bulk>
-								<WornBulk>0</WornBulk>
-							</value>
-						</li>
-
-						<!--Milita-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_Militia"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-								<Bulk>2</Bulk>
-								<WornBulk>5</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_Militia"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>2</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_Militia"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>1</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--Milita Vests-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="Miho_Apparel_Middle_Militia" or
-								defName="Miho_Apparel_Middle_Militia_Tan" or
-								defName="Miho_Apparel_Middle_MilitiaMedic"]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
-								<Bulk>6</Bulk>
-								<WornBulk>2.7</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="Miho_Apparel_Middle_Militia" or
-								defName="Miho_Apparel_Middle_Militia_Tan" or
-								defName="Miho_Apparel_Middle_MilitiaMedic"]/statBases/Mass </xpath>
-							<value>
-								<Mass>10.5</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[
-								defName="Miho_Apparel_Middle_Militia" or
-								defName="Miho_Apparel_Middle_Militia_Tan" or
-								defName="Miho_Apparel_Middle_MilitiaMedic"]/statBases/ArmorRating_Sharp </xpath>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Middle_Militia" or defName="Miho_Apparel_Middle_Militia_Tan"]/costList/ComponentIndustrial</xpath>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Middle_Militia" or defName="Miho_Apparel_Middle_Militia_Tan"]/equippedStatOffsets/AimingDelayFactor</xpath>
-							<value>
-								<CarryBulk>8</CarryBulk>
-								<ReloadSpeed>0.1</ReloadSpeed>
-							</value>
-						</li>
-
-						<!--Light Milita Vest-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Middle_MilitiaVest"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
-								<Bulk>4</Bulk>
-								<WornBulk>2.7</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Middle_MilitiaVest"]/statBases/Mass</xpath>
-							<value>
-								<Mass>2.7</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Middle_MilitiaVest"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>3</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Middle_MilitiaVest"]/equippedStatOffsets/AimingDelayFactor</xpath>
-							<value>
-								<CarryBulk>8</CarryBulk>
-								<ReloadSpeed>0.1</ReloadSpeed>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Middle_MilitiaVest"]/stuffCategories</xpath>
-							<value>
-								<stuffCategories>
-									<li>SoftArmor</li>
-								</stuffCategories>
-							</value>
-						</li>
-
-						<!--Exosuit-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Middle_Powered"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>9</StuffEffectMultiplierArmor>
-								<Bulk>25</Bulk>
-								<WornBulk>12</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Middle_Powered"]/statBases/Mass</xpath>
-							<value>
-								<Mass>15</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Middle_Powered"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>2</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Middle_Powered"]/equippedStatOffsets</xpath>
-							<value>
-								<CarryBulk>20</CarryBulk>
-								<CarryWeight>35</CarryWeight>
-							</value>
-						</li>
-						
-						<!--Mechniator Exo-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Middle_PoweredMechanitor"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>6.75</StuffEffectMultiplierArmor>
-								<Bulk>25</Bulk>
-								<WornBulk>12</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Middle_PoweredMechanitor"]/statBases/Mass</xpath>
-							<value>
-								<Mass>15</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Middle_PoweredMechanitor"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>2</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Middle_PoweredMechanitor"]/equippedStatOffsets</xpath>
-							<value>
-								<CarryBulk>20</CarryBulk>
-								<CarryWeight>35</CarryWeight>
-							</value>
-						</li>
-
-						<!--Worker Exo-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Middle_PoweredWorker"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>0.5</StuffEffectMultiplierArmor>
-								<Bulk>25</Bulk>
-								<WornBulk>10</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace"><!-- Not actually required, but kept for consistency-->
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Middle_PoweredWorker"]/statBases/Mass</xpath>
-							<value>
-								<Mass>8</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Middle_PoweredWorker"]/equippedStatOffsets</xpath>
-							<value>
-								<CarryBulk>10</CarryBulk>
-								<CarryWeight>35</CarryWeight>
-							</value>
-						</li>
-
-						<!--Pariah-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_Pariah"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
-								<Bulk>40</Bulk>
-								<WornBulk>18</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_Pariah"]/statBases/Mass</xpath>
-							<value>
-								<Mass>25</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_Pariah"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>8</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_Pariah"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>36</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_Pariah"]/equippedStatOffsets</xpath>
-							<value>
-								<CarryBulk>28</CarryBulk>
-								<CarryWeight>40</CarryWeight>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_Pariah"]/apparel/bodyPartGroups</xpath>
-							<value>
-								<li>Hands</li>
-								<li>Feet</li>
-							</value>
-						</li>
-
-						<!--Pariah Helmet-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_Pariah"]/statBases</xpath>
-							<value>
-								<Bulk>6</Bulk>
-								<WornBulk>4</WornBulk>
-								<NightVisionEfficiency_Apparel>0.65</NightVisionEfficiency_Apparel>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_Pariah"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>4</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_Pariah"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>8</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_Pariah"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_Pariah"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-							<value>
-								<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-								<AimingAccuracy>1.25</AimingAccuracy>
-							</value>
-						</li>
-
-						<!-- Winter -->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Shell_Winter"]/statBases</xpath>
-							<value>
-								<Bulk>6</Bulk>
-								<WornBulk>2</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Shell_Winter"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<!-- Padding -->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Shell_Padding"]/statBases</xpath>
-							<value>
-								<Bulk>6</Bulk>
-								<WornBulk>2.5</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Shell_Padding"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Shell_Padding"]/equippedStatOffsets/MoveSpeed</xpath>
-						</li>
-
-						<!-- Ornated Coat -->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Shell_Sorceress"]/statBases</xpath>
-							<value>
-								<Bulk>12</Bulk>
-								<WornBulk>4</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Shell_Sorceress"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Shell_Sorceress"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>2</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<!-- Tuque -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_Winter"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-								<Bulk>1</Bulk>
-								<WornBulk>0</WornBulk>
-							</value>
-						</li>
-
-						<!-- Worker Helmet -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_Worker"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-								<Bulk>3</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_Worker"]/statBases/Mass</xpath>
-							<value>
-								<Mass>1.25</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_Worker"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>4</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_Worker"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>6</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!-- Shooter Helmet -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_ShooterCap"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-								<Bulk>3</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_ShooterCap"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>1</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_ShooterCap"]/statBases/Mass</xpath>
-							<value>
-								<Mass>1.5</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_ShooterCap"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-							<value>
-								<ShootingAccuracyPawn>0.20</ShootingAccuracyPawn>
-							</value>
-						</li>
-
-						<!-- Milita Helmet -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_Militia" or defName="Miho_Apparel_Hat_MilitiaShoot" or defName="Miho_Apparel_Hat_MilitiaMedic"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-								<Bulk>3</Bulk>
-								<WornBulk>2</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_Militia" or defName="Miho_Apparel_Hat_MilitiaShoot" or defName="Miho_Apparel_Hat_MilitiaMedic"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_Militia" or defName="Miho_Apparel_Hat_MilitiaShoot" or defName="Miho_Apparel_Hat_MilitiaMedic"]/statBases/Mass</xpath>
-							<value>
-								<Mass>2</Mass>
-							</value>
-						</li>
-
-						<!-- Miho_Apparel_Hat_MilitiaEar  little better protectin than other Militia series-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_MilitiaEar"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-								<Bulk>3</Bulk>
-								<WornBulk>2</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_MilitiaEar"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>0.55</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_MilitiaEar"]/statBases/Mass</xpath>
-							<value>
-								<Mass>2.1</Mass>
-							</value>
-						</li>
-
-						<!-- PMC Helmet -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_PMC"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-								<Bulk>3</Bulk>
-								<WornBulk>2</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_PMC"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Sharp>2</ArmorRating_Sharp>
-								<ArmorRating_Blunt>6</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_PMC"]/statBases/Mass</xpath>
-							<value>
-								<Mass>2.5</Mass>
-							</value>
-						</li>
-
-						<!--========= Fixed Armor Value =========-->
-
-						<!--Ornated-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_OrnatedOne" or defName="Miho_Apparel_OnSkin_OrnatedTwo"]/statBases</xpath>
-							<value>
-								<Bulk>2</Bulk>
-								<WornBulk>0</WornBulk>
-								<!--<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					<ArmorRating_Blunt>6</ArmorRating_Blunt>-->
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_OrnatedOne" or defName="Miho_Apparel_OnSkin_OrnatedTwo"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>2</ArmorRating_Sharp>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_OrnatedOne" or defName="Miho_Apparel_OnSkin_OrnatedTwo"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>6</ArmorRating_Blunt>
-							</value>
-						</li>
-						<!--Eltex Mask-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Mask_Eltex"]/statBases</xpath>
-							<value>
-								<Bulk>1</Bulk>
-								<WornBulk>0</WornBulk>
-							</value>
-						</li>
-
-						<!--PMC-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_PMC"]/statBases</xpath>
-							<value>
-								<Bulk>8</Bulk>
-								<WornBulk>6</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_PMC"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>3.5</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_PMC"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_PMC"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-							</value>
-						</li>
-						
-						<!--PMC Shell-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Shell_PMC"]/statBases</xpath>
-							<value>
-								<Bulk>8</Bulk>
-								<WornBulk>6</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Shell_PMC"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>2</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Shell_PMC"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Shell_PMC"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>1</ArmorRating_Blunt>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Miho Race/ThingDefs_Misc/Miho_Apparel_Special.xml b/Patches/Miho Race/ThingDefs_Misc/Miho_Apparel_Special.xml
deleted file mode 100644
index 17839c0e89..0000000000
--- a/Patches/Miho Race/ThingDefs_Misc/Miho_Apparel_Special.xml	
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Miho, the celestial fox</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--========= Fixed Armor Value =========-->
-
-						<!--Magnifier-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Special_Magnifier"]/statBases</xpath>
-							<value>
-								<Bulk>6</Bulk>
-								<WornBulk>2</WornBulk>
-								<NightVisionEfficiency_Apparel>0.3</NightVisionEfficiency_Apparel>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Special_Magnifier"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>-0.3</MeleeDodgeChance>
-								<AimingAccuracy>0.25</AimingAccuracy>
-							</value>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Special_Magnifier"]/equippedStatOffsets/MoveSpeed</xpath>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Special_Magnifier"]/equippedStatOffsets/ShootingAccuracyFactor_Long</xpath>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Special_Magnifier"]/equippedStatOffsets/ShootingAccuracyFactor_Medium</xpath>
-						</li>
-
-						<!--TacAssist-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Special_TacticalAssist"]/statBases</xpath>
-							<value>
-								<Bulk>6</Bulk>
-								<WornBulk>2</WornBulk>
-								<NightVisionEfficiency_Apparel>0.8</NightVisionEfficiency_Apparel>
-								<ArmorRating_Sharp>4</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Special_TacticalAssist"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>-0.3</MeleeDodgeChance>
-								<AimingAccuracy>0.35</AimingAccuracy>
-							</value>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Special_TacticalAssist"]/equippedStatOffsets/MoveSpeed</xpath>
-						</li>
-
-						<!--Glasses-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Special_Glasses"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>-0.3</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Special_Glasses"]/statBases</xpath>
-							<value>
-								<Bulk>0.5</Bulk>
-								<WornBulk>0</WornBulk>
-							</value>
-						</li>
-						<!--Toxmask-->
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Special_Toxmask"]/statBases</xpath>
-							<value>
-								<Bulk>0.5</Bulk>
-								<WornBulk>0</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Special_Toxmask"]</xpath>
-							<value>
-								<li Class="CombatExtended.ApparelHediffExtension">
-									<hediff>WearingGasMask</hediff>
-								</li>
-							</value>
-						</li>
-						<!--Visor-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Special_Visor"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-							<value>
-								<ShootingAccuracyPawn>-1</ShootingAccuracyPawn>
-								<AimingAccuracy>-0.5</AimingAccuracy>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Special_Visor"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>8</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Special_Visor"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>12</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Apparel_Special_Visor"]/statBases</xpath>
-							<value>
-								<Bulk>0.5</Bulk>
-								<WornBulk>0</WornBulk>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Miho Race/ThingDefs_Misc/Weapons_Mechanoid.xml b/Patches/Miho Race/ThingDefs_Misc/Weapons_Mechanoid.xml
deleted file mode 100644
index 0841f81b45..0000000000
--- a/Patches/Miho Race/ThingDefs_Misc/Weapons_Mechanoid.xml	
+++ /dev/null
@@ -1,310 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Miho, the celestial fox</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!-- ========== Rifle =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Miho_MechWeapon_Machinegun</defName>
-							<statBases>
-								<SightsEfficiency>1.00</SightsEfficiency>
-								<ShotSpread>0.05</ShotSpread>
-								<SwayFactor>1.01</SwayFactor>
-								<Bulk>13.50</Bulk>
-								<Mass>15</Mass>
-								<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-							</statBases>
-							<Properties>
-								<recoilAmount>0.97</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_77x58mmArisaka_FMJ</defaultProjectile>
-								<warmupTime>1.2</warmupTime>
-								<burstShotCount>10</burstShotCount>
-								<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-								<range>44</range>
-								<soundCast>Miho_SevenSevenRifle</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>30</magazineSize>
-								<reloadTime>4.9</reloadTime>
-								<ammoSet>AmmoSet_77x58mmArisaka</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>5</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-							<weaponTags>
-								<li>NoSwitch</li>
-							</weaponTags>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Miho_MechWeapon_Heavygun</defName>
-							<statBases>
-								<SightsEfficiency>1.56</SightsEfficiency>
-								<ShotSpread>0.07</ShotSpread>
-								<SwayFactor>1.10</SwayFactor>
-								<Bulk>60.00</Bulk>
-								<RangedWeapon_Cooldown>2.51</RangedWeapon_Cooldown>
-							</statBases>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_Miho47x285mm_AP</defaultProjectile>
-								<warmupTime>2.1</warmupTime>
-								<range>86</range>
-								<soundCast>Miho_KineticCannon</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>10</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>1</magazineSize>
-								<AmmoGenPerMagOverride>4</AmmoGenPerMagOverride>
-								<reloadTime>4.5</reloadTime>
-								<ammoSet>AmmoSet_Miho47x285mm</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-							<weaponTags>
-								<li>NoSwitch</li>
-							</weaponTags>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Miho_MechWeapon_PlasmaHowitzer</defName>
-							<statBases>
-								<RangedWeapon_Cooldown>2.50</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.24</SightsEfficiency>
-								<ShotSpread>0.07</ShotSpread>
-								<SwayFactor>1.29</SwayFactor>
-								<Bulk>60.00</Bulk>
-							</statBases>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_75x300mmMiho_Thermobaric</defaultProjectile>
-								<warmupTime>2.5</warmupTime>
-								<range>62</range>
-								<burstShotCount>3</burstShotCount>
-								<ticksBetweenBurstShots>60</ticksBetweenBurstShots>
-								<soundCast>Miho_KineticCannon</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>14</muzzleFlashScale>
-								<ai_AvoidFriendlyFireRadius>3</ai_AvoidFriendlyFireRadius>
-								<minRange>5</minRange>
-								<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>3</magazineSize>
-								<reloadTime>5.6</reloadTime>
-								<ammoSet>AmmoSet_MihoPlasmaThermo</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>2</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-							<weaponTags>
-								<li>CE_AI_Launcher</li>
-								<li>NoSwitch</li>
-							</weaponTags>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Miho_MechWeapon_Rocket</defName>
-							<statBases>
-								<RangedWeapon_Cooldown>2.5</RangedWeapon_Cooldown>
-								<SightsEfficiency>1</SightsEfficiency>
-								<ShotSpread>0.4</ShotSpread>
-								<SwayFactor>2</SwayFactor>
-								<Bulk>40</Bulk>
-							</statBases>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_Miho100mm_Incendiary</defaultProjectile>
-								<warmupTime>4</warmupTime>
-								<minRange>30</minRange>
-								<range>500</range>
-								<burstShotCount>12</burstShotCount>
-								<soundCast>Miho_Rocket</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>16</muzzleFlashScale>
-								<circularError>1.2</circularError>
-								<requireLineOfSight>false</requireLineOfSight>
-								<indirectFirePenalty>0.3</indirectFirePenalty>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>12</magazineSize>
-								<reloadTime>14</reloadTime>
-								<ammoSet>AmmoSetMiho100mm_Incendiary</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aimedBurstShotCount>6</aimedBurstShotCount>
-								<aiAimMode>AimedShot</aiAimMode>
-								<noSingleShot>true</noSingleShot>
-							</FireModes>
-							<weaponTags>
-								<li>CE_AI_Launcher</li>
-								<li>NoSwitch</li>
-							</weaponTags>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_MechWeapon_Rocket"]/comps</xpath>
-							<value>
-								<li Class="CombatExtended.CompProperties_Charges">
-									<chargeSpeeds>
-										<li>30</li>
-										<li>50</li>
-										<li>70</li>
-										<li>90</li>
-									</chargeSpeeds>
-								</li>
-							</value>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Miho_MechWeapon_MachinegunTurret</defName>
-							<statBases>
-								<SightsEfficiency>1</SightsEfficiency>
-								<ShotSpread>0.08</ShotSpread>
-								<SwayFactor>1.56</SwayFactor>
-								<Bulk>6.00</Bulk>
-							</statBases>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_77x58mmArisaka_FMJ</defaultProjectile>
-								<range>40</range>
-								<burstShotCount>4</burstShotCount>
-								<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-								<soundCast>Miho_SevenSevenRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<defaultCooldownTime>5.5</defaultCooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</Properties>
-						</li>
-						<!--Miho_MechWeapon_Heavygrenade-->
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Miho_MechWeapon_Heavygrenade</defName>
-							<statBases>
-								<SightsEfficiency>1.56</SightsEfficiency>
-								<ShotSpread>0.07</ShotSpread>
-								<SwayFactor>1.10</SwayFactor>
-								<Bulk>60.00</Bulk>
-								<RangedWeapon_Cooldown>2.51</RangedWeapon_Cooldown>
-							</statBases>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_Miho57x93mmGrenade_HE</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>62</range>
-								<burstShotCount>3</burstShotCount>
-								<ticksBetweenBurstShots>30</ticksBetweenBurstShots>
-								<soundCast>Miho_GrenadeLauncher</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>10</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>12</magazineSize>
-								<!--<AmmoGenPerMagOverride>4</AmmoGenPerMagOverride>-->
-								<reloadTime>3.5</reloadTime>
-								<ammoSet>AmmoSet_Miho57x93mmGrenade</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-							<weaponTags>
-								<li>NoSwitch</li>
-							</weaponTags>
-						</li>
-						<!--Miho_MechWeapon_Cluster-->
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[ defName="Miho_MechWeapon_CluRocket" ]/verbs/li[@Class="TorgueMiho.Verb_Properties_ShotGun"]</xpath>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Miho_MechWeapon_CluRocket</defName>
-							<statBases>
-								<RangedWeapon_Cooldown>2.5</RangedWeapon_Cooldown>
-								<SightsEfficiency>1</SightsEfficiency>
-								<ShotSpread>0.4</ShotSpread>
-								<SwayFactor>2</SwayFactor>
-								<Bulk>40</Bulk>
-							</statBases>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_50mmRocket_HE</defaultProjectile>
-								<warmupTime>4</warmupTime>
-								<minRange>30</minRange>
-								<range>500</range>
-								<burstShotCount>20</burstShotCount>
-								<soundCast>Miho_Rocket</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>16</muzzleFlashScale>
-								<circularError>1.2</circularError>
-								<requireLineOfSight>false</requireLineOfSight>
-								<indirectFirePenalty>0.3</indirectFirePenalty>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>20</magazineSize>
-								<reloadTime>14</reloadTime>
-								<ammoSet>AmmoSet_50mmRocket</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aimedBurstShotCount>10</aimedBurstShotCount>
-								<aiAimMode>AimedShot</aiAimMode>
-								<noSingleShot>true</noSingleShot>
-							</FireModes>
-							<weaponTags>
-								<li>CE_AI_Launcher</li>
-								<li>NoSwitch</li>
-							</weaponTags>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_MechWeapon_CluRocket"]/comps</xpath>
-							<value>
-								<li Class="CombatExtended.CompProperties_Charges">
-									<chargeSpeeds>
-										<li>30</li>
-										<li>50</li>
-										<li>70</li>
-										<li>90</li>
-									</chargeSpeeds>
-								</li>
-							</value>
-						</li>
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Miho Race/ThingDefs_Misc/Weapons_Melee.xml b/Patches/Miho Race/ThingDefs_Misc/Weapons_Melee.xml
deleted file mode 100644
index 18689bbba0..0000000000
--- a/Patches/Miho Race/ThingDefs_Misc/Weapons_Melee.xml	
+++ /dev/null
@@ -1,438 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Miho, the celestial fox</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!-- ==========  Power Claw =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Weapon_PowerClaw"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>point</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>15</power>
-										<cooldownTime>0.94</cooldownTime>
-										<chanceFactor>1</chanceFactor>
-										<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
-										<armorPenetrationSharp>8</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>edge</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>30</power>
-										<cooldownTime>0.83</cooldownTime>
-										<chanceFactor>1</chanceFactor>
-										<armorPenetrationBlunt>2.28</armorPenetrationBlunt>
-										<armorPenetrationSharp>6</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Weapon_PowerClaw"]/statBases</xpath>
-							<value>
-								<MeleeCounterParryBonus>2.00</MeleeCounterParryBonus>
-								<Bulk>6.5</Bulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Weapon_PowerClaw"]/equippedStatOffsets</xpath>
-							<value>
-								<MeleeCritChance>0.25</MeleeCritChance>
-								<MeleeParryChance>1.50</MeleeParryChance>
-								<MeleeDodgeChance>0.30</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<!-- ==========  Ringed Blade  =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Weapon_RingedBlade"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>1.57</cooldownTime>
-										<chanceFactor>0.4</chanceFactor>
-										<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>point</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>20</power>
-										<cooldownTime>1.12</cooldownTime>
-										<chanceFactor>1</chanceFactor>
-										<armorPenetrationBlunt>1.8</armorPenetrationBlunt>
-										<armorPenetrationSharp>3</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>edge</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>32</power>
-										<cooldownTime>1.28</cooldownTime>
-										<chanceFactor>1</chanceFactor>
-										<armorPenetrationBlunt>2.59</armorPenetrationBlunt>
-										<armorPenetrationSharp>1.3</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Weapon_RingedBlade"]/statBases</xpath>
-							<value>
-								<MeleeCounterParryBonus>0.67</MeleeCounterParryBonus>
-								<Bulk>5</Bulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Weapon_RingedBlade"]/equippedStatOffsets</xpath>
-							<value>
-								<MeleeCritChance>1.20</MeleeCritChance>
-								<MeleeParryChance>0.50</MeleeParryChance>
-								<MeleeDodgeChance>0.40</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<!-- ==========  Tachi  =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Weapon_Tachi"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>1.57</cooldownTime>
-										<chanceFactor>0.4</chanceFactor>
-										<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>point</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>21</power>
-										<cooldownTime>1.45</cooldownTime>
-										<chanceFactor>1</chanceFactor>
-										<armorPenetrationBlunt>1.296</armorPenetrationBlunt>
-										<armorPenetrationSharp>2.16</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>edge</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>45</power>
-										<cooldownTime>1.22</cooldownTime>
-										<chanceFactor>1</chanceFactor>
-										<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
-										<armorPenetrationSharp>1.8</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Weapon_Tachi"]/statBases</xpath>
-							<value>
-								<MeleeCounterParryBonus>1.03</MeleeCounterParryBonus>
-								<Bulk>8</Bulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Weapon_Tachi"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeCritChance>0.40</MeleeCritChance>
-								<MeleeParryChance>0.73</MeleeParryChance>
-								<MeleeDodgeChance>0.60</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<!-- ==========  Breacher  =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Weapon_Sappertool"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>4</power>
-										<cooldownTime>1.78</cooldownTime>
-										<chanceFactor>0.10</chanceFactor>
-										<armorPenetrationBlunt>1.000</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Demolish</li>
-										</capacities>
-										<power>22</power>
-										<cooldownTime>2.36</cooldownTime>
-										<chanceFactor>0.30</chanceFactor>
-										<armorPenetrationBlunt>11.76</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Weapon_Sappertool"]/statBases</xpath>
-							<value>
-								<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
-								<Bulk>8</Bulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Weapon_Sappertool"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeCritChance>2.30</MeleeCritChance>
-								<MeleeParryChance>0.18</MeleeParryChance>
-								<MeleeDodgeChance>0.30</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<!-- ==========  Plasma Tachi  =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Weapon_PlasmaTachi"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>3</power>
-										<cooldownTime>1.69</cooldownTime>
-										<chanceFactor>0.10</chanceFactor>
-										<armorPenetrationBlunt>0.80</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>edge</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>47</power>
-										<extraMeleeDamages>
-											<li>
-												<def>Flame</def>
-												<amount>5</amount>
-												<chance>0.3</chance>
-											</li>
-										</extraMeleeDamages>
-										<cooldownTime>1.17</cooldownTime>
-										<chanceFactor>0.66</chanceFactor>
-										<armorPenetrationBlunt>4.06</armorPenetrationBlunt>
-										<armorPenetrationSharp>24</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>point</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>25</power>
-										<extraMeleeDamages>
-											<li>
-												<def>Flame</def>
-												<amount>3</amount>
-												<chance>0.2</chance>
-											</li>
-										</extraMeleeDamages>
-										<cooldownTime>1.05</cooldownTime>
-										<armorPenetrationBlunt>2.048</armorPenetrationBlunt>
-										<armorPenetrationSharp>32</armorPenetrationSharp>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Weapon_PlasmaTachi"]/statBases</xpath>
-							<value>
-								<Bulk>9</Bulk>
-								<MeleeCounterParryBonus>3.6</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Weapon_PlasmaTachi"]/equippedStatOffsets</xpath>
-							<value>
-								<MeleeCritChance>0.74</MeleeCritChance>
-								<MeleeParryChance>0.53</MeleeParryChance>
-								<MeleeDodgeChance>0.60</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<!-- ==========  Eltex Axe  =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Weapon_EltexAxe"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>blade</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>47</power>
-										<cooldownTime>2.9</cooldownTime>
-										<chanceFactor>1.165</chanceFactor>
-										<armorPenetrationBlunt>8.1</armorPenetrationBlunt>
-										<armorPenetrationSharp>16.2</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>point</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>29</power>
-										<cooldownTime>1.16</cooldownTime>
-										<chanceFactor>1.165</chanceFactor>
-										<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
-										<armorPenetrationSharp>20.3</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Weapon_EltexAxe"]/statBases</xpath>
-							<value>
-								<Bulk>10</Bulk>
-								<MeleeCounterParryBonus>1.08</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Weapon_EltexAxe"]/equippedStatOffsets</xpath>
-							<value>
-								<MeleeCritChance>0.22</MeleeCritChance>
-								<MeleeParryChance>1.53</MeleeParryChance>
-								<MeleeDodgeChance>0.67</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<!-- ==========  Eltex Staff A/B  =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Weapon_EltexA"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>5</power>
-										<cooldownTime>2.85</cooldownTime>
-										<armorPenetrationBlunt>1.69</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Weapon_EltexA"]/statBases</xpath>
-							<value>
-								<Bulk>6</Bulk>
-								<MeleeCounterParryBonus>0.93</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Weapon_EltexA"]/equippedStatOffsets</xpath>
-							<value>
-								<MeleeCritChance>1.00</MeleeCritChance>
-								<MeleeParryChance>0.70</MeleeParryChance>
-								<MeleeDodgeChance>0.47</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Weapon_EltexB"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>5</power>
-										<cooldownTime>2.85</cooldownTime>
-										<armorPenetrationBlunt>1.69</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Weapon_EltexB"]/statBases</xpath>
-							<value>
-								<Bulk>6</Bulk>
-								<MeleeCounterParryBonus>0.93</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Weapon_EltexB"]/equippedStatOffsets</xpath>
-							<value>
-								<MeleeCritChance>1.00</MeleeCritChance>
-								<MeleeParryChance>0.70</MeleeParryChance>
-								<MeleeDodgeChance>0.47</MeleeDodgeChance>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Miho Race/ThingDefs_Misc/Weapons_Other.xml b/Patches/Miho Race/ThingDefs_Misc/Weapons_Other.xml
deleted file mode 100644
index 65a8bcacd9..0000000000
--- a/Patches/Miho Race/ThingDefs_Misc/Weapons_Other.xml	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Miho, the celestial fox</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Miho Race/ThingDefs_Misc/Weapons_Ranged.xml b/Patches/Miho Race/ThingDefs_Misc/Weapons_Ranged.xml
deleted file mode 100644
index 1fc8d456a0..0000000000
--- a/Patches/Miho Race/ThingDefs_Misc/Weapons_Ranged.xml	
+++ /dev/null
@@ -1,628 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Miho, the celestial fox</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!-- ========== Ammoset =========== -->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_8x22mmNambu"]/ammoTypes</xpath>
-							<value>
-								<Ammo_8x22mmNambu_Miho>Bullet_8x22mmNambu_Miho</Ammo_8x22mmNambu_Miho>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_65x50mmSRArisaka"]/ammoTypes</xpath>
-							<value>
-								<Ammo_65x50mmSRArisaka_Miho>Bullet_65x50mmSRArisaka_Miho</Ammo_65x50mmSRArisaka_Miho>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_77x58mmArisaka"]/ammoTypes</xpath>
-							<value>
-								<Ammo_77x58mmArisaka_Miho>Bullet_77x58mmArisaka_Miho</Ammo_77x58mmArisaka_Miho>
-							</value>
-						</li>
-
-						<!-- ========== Remove other verbs =========== -->
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[
-								defName="Miho_Weapon_Shotgun" or
-								defName="Miho_Weapon_ShotgunPsychic" or
-								defName="Miho_Weapon_HeavyPistolFlechette"
-								]/verbs/li[@Class="TorgueMiho.Verb_Properties_ShotGun"] </xpath>
-						</li>
-
-						<!-- ========== SMG =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Miho_Weapon_RifleCQB</defName>
-							<statBases>
-								<SightsEfficiency>0.70</SightsEfficiency>
-								<ShotSpread>0.17</ShotSpread>
-								<SwayFactor>0.77</SwayFactor>
-								<Bulk>2.7</Bulk>
-								<Mass>2.5</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							</statBases>
-							<costList>
-								<Steel>30</Steel>
-								<WoodLog>5</WoodLog>
-								<ComponentIndustrial>5</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<recoilAmount>1.2</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_8x22mmNambu_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-								<range>21</range>
-								<soundCast>Miho_Pistol</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>18</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_8x22mmNambu</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>Snapshot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== Rifle =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Miho_Weapon_RifleDefence</defName>
-							<statBases>
-								<SightsEfficiency>1.00</SightsEfficiency>
-								<ShotSpread>0.09</ShotSpread>
-								<SwayFactor>1.22</SwayFactor>
-								<Bulk>8.15</Bulk>
-								<Mass>4.00</Mass>
-								<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-							</statBases>
-							<costList>
-								<Steel>40</Steel>
-								<WoodLog>10</WoodLog>
-								<ComponentIndustrial>5</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<recoilAmount>1.87</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_65x50mmSRArisaka_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-								<range>48</range>
-								<soundCast>Miho_DefenceRifle</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>20</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_65x50mmSRArisaka</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== MG =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Miho_Weapon_RifleMachinegun</defName>
-							<statBases>
-								<SightsEfficiency>1.00</SightsEfficiency>
-								<ShotSpread>0.06</ShotSpread>
-								<SwayFactor>1.38</SwayFactor>
-								<Bulk>11.70</Bulk>
-								<Mass>9.00</Mass>
-								<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-							</statBases>
-							<costList>
-								<Steel>70</Steel>
-								<WoodLog>15</WoodLog>
-								<ComponentIndustrial>5</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<recoilAmount>1.21</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_65x50mmSRArisaka_FMJ</defaultProjectile>
-								<warmupTime>1.3</warmupTime>
-								<burstShotCount>10</burstShotCount>
-								<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-								<range>62</range>
-								<soundCast>Miho_DefenceRifle</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>30</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_65x50mmSRArisaka</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>5</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>SuppressFire</aiAimMode>
-							</FireModes>
-							<weaponTags>
-								<li>Bipod_LMG</li>
-							</weaponTags>
-						</li>
-
-						<!-- ========== Rifle Old =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Miho_Weapon_RifleOld</defName>
-							<statBases>
-								<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-								<SightsEfficiency>1</SightsEfficiency>
-								<ShotSpread>0.05</ShotSpread>
-								<SwayFactor>1.48</SwayFactor>
-								<Bulk>10.73</Bulk>
-							</statBases>
-							<costList>
-								<Steel>55</Steel>
-								<WoodLog>10</WoodLog>
-								<ComponentIndustrial>2</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_77x58mmArisaka_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>66</range>
-								<soundCast>Miho_SevenSevenRifle</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>10</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_77x58mmArisaka</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== Rifle Grenade =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Miho_Weapon_RifleGrenade</defName>
-							<statBases>
-								<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-								<SightsEfficiency>1</SightsEfficiency>
-								<ShotSpread>0.12</ShotSpread>
-								<SwayFactor>1.48</SwayFactor>
-								<Bulk>9.73</Bulk>
-							</statBases>
-							<costList>
-								<Steel>55</Steel>
-								<WoodLog>10</WoodLog>
-								<ComponentIndustrial>2</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>46</range>
-								<soundCast>Miho_GrenadeLauncher</soundCast>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>1</magazineSize>
-								<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
-								<reloadTime>2.2</reloadTime>
-								<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>SuppressFire</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== Shotgun =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Miho_Weapon_Shotgun</defName>
-							<statBases>
-								<RangedWeapon_Cooldown>0.89</RangedWeapon_Cooldown>
-								<SightsEfficiency>1</SightsEfficiency>
-								<ShotSpread>0.05</ShotSpread>
-								<SwayFactor>1.45</SwayFactor>
-								<Bulk>10.50</Bulk>
-							</statBases>
-							<costList>
-								<Steel>65</Steel>
-								<WoodLog>10</WoodLog>
-								<ComponentIndustrial>1</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<recoilAmount>2.77</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<burstShotCount>2</burstShotCount>
-								<ticksBetweenBurstShots>0</ticksBetweenBurstShots>
-								<range>17</range>
-								<soundCast>Miho_Shotgun</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>2</magazineSize>
-								<reloadTime>1.7</reloadTime>
-								<ammoSet>AmmoSet_12Gauge</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiAimMode>Snapshot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== Heavy 'Pistol' =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Miho_Weapon_HeavyPistol</defName>
-							<statBases>
-								<SightsEfficiency>0.80</SightsEfficiency>
-								<ShotSpread>0.15</ShotSpread>
-								<SwayFactor>1.75</SwayFactor>
-								<Bulk>4.7</Bulk>
-								<Mass>3</Mass>
-								<RangedWeapon_Cooldown>2.1</RangedWeapon_Cooldown>
-							</statBases>
-							<Properties>
-								<recoilAmount>2.71</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_10mmMihogrenade</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>35</range>
-								<soundCast>Miho_Pistol</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<ammoSet>AmmoSet_10mmMihogrenade</ammoSet>
-								<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
-							</AmmoUser>
-							<FireModes>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>Snapshot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Miho_Weapon_HeavyPistolFlechette</defName>
-							<statBases>
-								<SightsEfficiency>0.80</SightsEfficiency>
-								<ShotSpread>0.15</ShotSpread>
-								<SwayFactor>1.75</SwayFactor>
-								<Bulk>4.7</Bulk>
-								<Mass>3</Mass>
-								<RangedWeapon_Cooldown>2.1</RangedWeapon_Cooldown>
-							</statBases>
-							<Properties>
-								<recoilAmount>2.71</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_10mmMihogrenade</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>35</range>
-								<soundCast>Miho_Pistol</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<ammoSet>AmmoSet_10mmMihogrenadeFlechette</ammoSet>
-								<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
-							</AmmoUser>
-							<FireModes>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>Snapshot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Miho_Weapon_HeavyPistolHardkill</defName>
-							<statBases>
-								<SightsEfficiency>0.80</SightsEfficiency>
-								<ShotSpread>0.15</ShotSpread>
-								<SwayFactor>1.75</SwayFactor>
-								<Bulk>4.7</Bulk>
-								<Mass>3</Mass>
-								<RangedWeapon_Cooldown>2.1</RangedWeapon_Cooldown>
-							</statBases>
-							<Properties>
-								<recoilAmount>2.71</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_10mmMihogrenade</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>35</range>
-								<soundCast>Miho_Pistol</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<ammoSet>AmmoSet_10mmMihogrenadeBarrier</ammoSet>
-								<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
-							</AmmoUser>
-							<FireModes>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>Snapshot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== Plamsa Rifle =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Miho_Weapon_RiflePlasma</defName>
-							<statBases>
-								<SightsEfficiency>1.10</SightsEfficiency>
-								<ShotSpread>0.2</ShotSpread>
-								<SwayFactor>1.34</SwayFactor>
-								<Bulk>8.15</Bulk>
-								<Mass>4.00</Mass>
-								<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-							</statBases>
-							<Properties>
-								<recoilAmount>0.27</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_MihoPlasma</defaultProjectile>
-								<warmupTime>1.0</warmupTime>
-								<soundAiming>Miho_Charging</soundAiming>
-								<burstShotCount>4</burstShotCount>
-								<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-								<range>48</range>
-								<soundCast>Miho_RiflePlasmaGun</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>32</magazineSize>
-								<reloadTime>4.5</reloadTime>
-								<ammoSet>AmmoSet_MihoPlasma</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>2</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== Plamsa Sniper =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Miho_Weapon_SniperPlasma</defName>
-							<statBases>
-								<SightsEfficiency>2.60</SightsEfficiency>
-								<ShotSpread>0.02</ShotSpread>
-								<SwayFactor>1.44</SwayFactor>
-								<Bulk>11.15</Bulk>
-								<Mass>7.50</Mass>
-								<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-							</statBases>
-							<Properties>
-								<recoilAmount>1.27</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_MihoPlasma</defaultProjectile>
-								<warmupTime>2.5</warmupTime>
-								<soundAiming>Miho_Charging</soundAiming>
-								<burstShotCount>1</burstShotCount>
-								<ammoConsumedPerShotCount>4</ammoConsumedPerShotCount>
-								<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-								<range>75</range>
-								<soundCast>Miho_CannonPlasma</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>16</magazineSize>
-								<reloadTime>4.5</reloadTime>
-								<ammoSet>AmmoSet_MihoPlasmaSniper</ammoSet>
-							</AmmoUser>
-							<weaponTags>
-								<li>CE_AI_SR</li>
-								<li>Bipod_DMR</li>
-							</weaponTags>
-							<FireModes>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== Shotgun =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Miho_Weapon_ShotgunPsychic</defName>
-							<statBases>
-								<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.1</SightsEfficiency>
-								<ShotSpread>0.09</ShotSpread>
-								<SwayFactor>1.40</SwayFactor>
-								<Bulk>9.80</Bulk>
-							</statBases>
-							<Properties>
-								<recoilAmount>2.70</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_MechPsyShot</defaultProjectile>
-								<warmupTime>0.8</warmupTime>
-								<burstShotCount>3</burstShotCount>
-								<ticksBetweenBurstShots>20</ticksBetweenBurstShots>
-								<range>66</range>
-								<soundCast>Miho_Shotgun</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>12</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_MechPsyShot</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>2</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-						<!-- ========== Miho_Weapon_Pistol =========== -->
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Miho_Weapon_Pistol</defName>
-							<statBases>
-								<SightsEfficiency>0.80</SightsEfficiency>
-								<ShotSpread>0.15</ShotSpread>
-								<SwayFactor>0.75</SwayFactor>
-								<Bulk>2.2</Bulk>
-								<Mass>0.9</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							</statBases>
-							<Properties>
-								<recoilAmount>0.9</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_8x22mmNambu_FMJ</defaultProjectile>
-								<warmupTime>0.5</warmupTime>
-								<range>21</range>
-								<soundCast>Miho_Pistol</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>8</magazineSize>
-								<reloadTime>2</reloadTime>
-								<ammoSet>AmmoSet_8x22mmNambu</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-							</FireModes>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Weapon_Pistol"]/weaponTags</xpath>
-							<value>
-								<li>CE_OneHandedWeapon</li>
-							</value>
-						</li>
-
-						<!-- ========== Melee Attacks =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="Miho_Weapon_RifleDefence" or
-								defName="Miho_Weapon_RifleMachinegun" or
-								defName="Miho_Weapon_RifleOld" or
-								defName="Miho_Weapon_RifleGrenade" or
-								defName="Miho_Weapon_Shotgun" or
-								defName="Miho_Weapon_RiflePlasma" or
-								defName="Miho_Weapon_ShotgunPsychic" or
-								defName="Miho_Weapon_SniperPlasma"
-								]/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>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="Miho_Weapon_HeavyPistol" or
-								defName="Miho_Weapon_HeavyPistolFlechette" or
-								defName="Miho_Weapon_HeavyPistolHardkill" or
-								defName="Miho_Weapon_RifleCQB" or
-								defName="Miho_Weapon_Pistol"
-								]/tools </xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>grip</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>1.54</cooldownTime>
-										<chanceFactor>1.5</chanceFactor>
-										<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>muzzle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>1.54</cooldownTime>
-										<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Miho Race/ThingDefs_Races/AlienRace_Miho.xml b/Patches/Miho Race/ThingDefs_Races/AlienRace_Miho.xml
deleted file mode 100644
index c15bdcfcf1..0000000000
--- a/Patches/Miho Race/ThingDefs_Races/AlienRace_Miho.xml	
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-
-		<mods>
-			<li>Miho, the celestial fox</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Miho"]/comps</xpath>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Miho"]/comps</xpath>
-						<value>
-							<li>
-								<compClass>CombatExtended.CompPawnGizmo</compClass>
-							</li>
-							<li Class="CombatExtended.CompProperties_Suppressable" />
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>500</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>600</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<MinArmorPct>0.75</MinArmorPct>
-							</li>
-						</value>
-					</match>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Miho"]</xpath>
-						<value>
-							<comps>
-								<li>
-									<compClass>CombatExtended.CompPawnGizmo</compClass>
-								</li>
-								<li Class="CombatExtended.CompProperties_Suppressable" />
-								<li Class="CombatExtended.CompProperties_ArmorDurability">
-									<Durability>500</Durability>
-									<Regenerates>true</Regenerates>
-									<RegenInterval>600</RegenInterval>
-									<RegenValue>5</RegenValue>
-									<MinArmorPct>0.75</MinArmorPct>
-								</li>
-							</comps>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Miho"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Miho"]/statBases/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						<Suppressability>1</Suppressability>
-						<SmokeSensitivity>0.5</SmokeSensitivity>
-						<AimingAccuracy>0.75</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Miho"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="MihoPawn"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="MihoPawn"]/damageMultipliers</xpath>
-					<value>
-						<li>
-							<damageDef>PrometheumFlame</damageDef>
-							<multiplier>0.25</multiplier>
-						</li>
-						<li>
-							<damageDef>Flame_Secondary</damageDef>
-							<multiplier>0.25</multiplier>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Miho"]/alienRace/raceRestriction/whiteApparelList</xpath>
-					<value>
-						<li>CE_Apparel_TacVest</li>
-						<li>CE_Apparel_Backpack</li>
-						<li>CE_Apparel_TribalBackpack</li>
-						<li>CE_Apparel_BallisticShield</li>
-						<li>CE_Apparel_MeleeShield</li>
-						<li>CE_Apparel_GasMask</li>
-						<li>CE_Apparel_ImprovGasMask</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/GeneDef[defName="Ears_Arctic_Miho"]/statOffsets</xpath>
-					<value>
-						<CarryWeight>10</CarryWeight>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Miho Race/ThingDefs_Races/Race_MihoHediff.xml b/Patches/Miho Race/ThingDefs_Races/Race_MihoHediff.xml
deleted file mode 100644
index 83aa52a54d..0000000000
--- a/Patches/Miho Race/ThingDefs_Races/Race_MihoHediff.xml	
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Miho, the celestial fox</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Huntress =========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="Miho_Huntress_I_Hediff"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<ShootingAccuracyPawn>0.25</ShootingAccuracyPawn>
-						<AimingAccuracy>0.10</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="Miho_Huntress_II_Hediff"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<ShootingAccuracyPawn>0.75</ShootingAccuracyPawn>
-						<AimingAccuracy>0.30</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="Miho_Huntress_III_Hediff"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<ShootingAccuracyPawn>1.00</ShootingAccuracyPawn>
-						<AimingAccuracy>0.40</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="Miho_Huntress_IV_Hediff"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
-						<AimingAccuracy>0.5</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="Miho_Huntress_V_Hediff"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
-						<AimingAccuracy>0.6</AimingAccuracy>
-					</value>
-				</li>
-
-				<!-- ========== Fatale =========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="Miho_Temptress_I_Hediff"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.10</MeleeCritChance>
-						<MeleeParryChance>0.10</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="Miho_Temptress_II_Hediff"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.75</MeleeDodgeChance>
-						<MeleeCritChance>0.30</MeleeCritChance>
-						<MeleeParryChance>0.30</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="Miho_Temptress_III_Hediff"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>0.4</MeleeCritChance>
-						<MeleeParryChance>0.4</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="Miho_Temptress_IV_Hediff"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>1.25</MeleeDodgeChance>
-						<MeleeCritChance>0.50</MeleeCritChance>
-						<MeleeParryChance>0.50</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="Miho_Temptress_V_Hediff"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>1.5</MeleeDodgeChance>
-						<MeleeCritChance>0.60</MeleeCritChance>
-						<MeleeParryChance>0.60</MeleeParryChance>
-					</value>
-				</li>
-				
-				<!--Tinkerer Abilities-->
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="Miho_Armor_HediffTwo"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="Miho_Armor_HediffTwo"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="Miho_Accuracy_HediffTwo"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<ShootingAccuracyPawn>4.8</ShootingAccuracyPawn>
-						<AimingAccuracy>2.4</AimingAccuracy>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="Miho_BulletHell_HediffTwo"]/stages/li/statOffsets</xpath>
-					<value>
-						<ReloadSpeed>2</ReloadSpeed>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Miho Race/ThingDefs_Races/Race_MihoMech.xml b/Patches/Miho Race/ThingDefs_Races/Race_MihoMech.xml
deleted file mode 100644
index 9b37f92f19..0000000000
--- a/Patches/Miho Race/ThingDefs_Races/Race_MihoMech.xml	
+++ /dev/null
@@ -1,439 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Miho, the celestial fox</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Mech_Sapsal"]</xpath>
-							<value>
-								<comps>
-									<li Class="CombatExtended.CompProperties_ArmorDurability">
-										<Durability>1000</Durability>
-										<Regenerates>true</Regenerates>
-										<RegenInterval>1250</RegenInterval>
-										<RegenValue>5</RegenValue>
-										<Repairable>true</Repairable>
-										<RepairIngredients>
-											<Steel>5</Steel>
-											<Miho_MilitaryGradeBalisticCeramics>5</Miho_MilitaryGradeBalisticCeramics>
-										</RepairIngredients>
-										<RepairTime>300</RepairTime>
-										<RepairValue>200</RepairValue>
-										<CanOverHeal>true</CanOverHeal>
-										<MaxOverHeal>100</MaxOverHeal>
-										<MinArmorPct>0.50</MinArmorPct>
-									</li>
-								</comps>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Mech_Sapsal"]/statBases</xpath>
-							<value>
-								<MeleeDodgeChance>0.05</MeleeDodgeChance>
-								<MeleeCritChance>0.15</MeleeCritChance>
-								<MeleeParryChance>0.30</MeleeParryChance>
-								<NightVisionEfficiency>0.60</NightVisionEfficiency>
-								<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Mech_Sapsal"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>18</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Mech_Sapsal"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>40</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Mech_Sapsal"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>front left leg</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>15</power>
-										<cooldownTime>1.9</cooldownTime>
-										<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>5.5</armorPenetrationBlunt>
-										<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>front right leg</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>15</power>
-										<cooldownTime>1.9</cooldownTime>
-										<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>5.5</armorPenetrationBlunt>
-										<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>blade</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>20</power>
-										<cooldownTime>1.2</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<armorPenetrationSharp>0.5</armorPenetrationSharp>
-										<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-										<chanceFactor>0.6</chanceFactor>
-										<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Mech_DesertSphex"]</xpath>
-							<value>
-								<comps>
-									<li Class="CombatExtended.CompProperties_ArmorDurability">
-										<Durability>500</Durability>
-										<Regenerates>true</Regenerates>
-										<RegenInterval>1250</RegenInterval>
-										<RegenValue>5</RegenValue>
-										<Repairable>true</Repairable>
-										<RepairIngredients>
-											<Steel>5</Steel>
-											<Miho_MilitaryGradeBalisticCeramics>5</Miho_MilitaryGradeBalisticCeramics>
-										</RepairIngredients>
-										<RepairTime>300</RepairTime>
-										<RepairValue>200</RepairValue>
-										<CanOverHeal>true</CanOverHeal>
-										<MaxOverHeal>100</MaxOverHeal>
-										<MinArmorPct>0.50</MinArmorPct>
-									</li>
-								</comps>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Mech_DesertSphex"]/statBases</xpath>
-							<value>
-								<MeleeDodgeChance>0.65</MeleeDodgeChance>
-								<MeleeCritChance>0.05</MeleeCritChance>
-								<MeleeParryChance>0.30</MeleeParryChance>
-								<NightVisionEfficiency>0.60</NightVisionEfficiency>
-								<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Mech_DesertSphex"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>right blade</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>20</power>
-										<cooldownTime>1.2</cooldownTime>
-										<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
-										<armorPenetrationSharp>0.75</armorPenetrationSharp>
-										<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-										<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Mech_DesertSphex"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>4</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Mech_DesertSphex"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>6</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Mech_Bulgasal" or defName="Miho_Mech_BulgasalGrenade"]/comps</xpath>
-							<value>
-								<li Class="CombatExtended.CompProperties_ArmorDurability">
-									<Durability>3500</Durability>
-									<Regenerates>true</Regenerates>
-									<RegenInterval>1250</RegenInterval>
-									<RegenValue>5</RegenValue>
-									<Repairable>true</Repairable>
-									<RepairIngredients>
-										<Steel>5</Steel>
-										<Miho_MilitaryGradeBalisticCeramics>5</Miho_MilitaryGradeBalisticCeramics>
-									</RepairIngredients>
-									<RepairTime>300</RepairTime>
-									<RepairValue>200</RepairValue>
-									<CanOverHeal>true</CanOverHeal>
-									<MaxOverHeal>100</MaxOverHeal>
-									<MinArmorPct>0.50</MinArmorPct>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Mech_BulgasalSiege"]</xpath>
-							<value>
-								<comps>
-									<li Class="CombatExtended.CompProperties_ArmorDurability">
-										<Durability>3500</Durability>
-										<Regenerates>true</Regenerates>
-										<RegenInterval>1250</RegenInterval>
-										<RegenValue>5</RegenValue>
-										<Repairable>true</Repairable>
-										<RepairIngredients>
-											<Steel>5</Steel>
-											<Miho_MilitaryGradeBalisticCeramics>5</Miho_MilitaryGradeBalisticCeramics>
-										</RepairIngredients>
-										<RepairTime>300</RepairTime>
-										<RepairValue>200</RepairValue>
-										<CanOverHeal>true</CanOverHeal>
-										<MaxOverHeal>100</MaxOverHeal>
-										<MinArmorPct>0.50</MinArmorPct>
-									</li>
-								</comps>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Mech_Bulgasal" or defName="Miho_Mech_BulgasalSiege" or defName="Miho_Mech_BulgasalGrenade"]/statBases</xpath>
-							<value>
-								<MeleeDodgeChance>0.05</MeleeDodgeChance>
-								<MeleeCritChance>0.15</MeleeCritChance>
-								<MeleeParryChance>0.30</MeleeParryChance>
-								<NightVisionEfficiency>0.60</NightVisionEfficiency>
-								<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
-								<CarryWeight>50</CarryWeight>
-								<CarryBulk>50</CarryBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Mech_Bulgasal" or defName="Miho_Mech_BulgasalSiege" or defName="Miho_Mech_BulgasalGrenade"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>28</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Mech_Bulgasal" or defName="Miho_Mech_BulgasalSiege" or defName="Miho_Mech_BulgasalGrenade"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>60</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Mech_Bulgasal" or defName="Miho_Mech_BulgasalSiege" or defName="Miho_Mech_BulgasalGrenade"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>front left leg</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>21</power>
-										<cooldownTime>1.9</cooldownTime>
-										<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>5.5</armorPenetrationBlunt>
-										<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>front right leg</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>21</power>
-										<cooldownTime>1.9</cooldownTime>
-										<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>5.5</armorPenetrationBlunt>
-										<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Mech_CataphractRocket" or defName="Miho_Mech_CataphractCluRocket"]/comps</xpath>
-							<value>
-								<li Class="CombatExtended.CompProperties_ArmorDurability">
-									<Durability>5000</Durability>
-									<Regenerates>true</Regenerates>
-									<RegenInterval>1250</RegenInterval>
-									<RegenValue>5</RegenValue>
-									<Repairable>true</Repairable>
-									<RepairIngredients>
-										<Steel>5</Steel>
-										<Miho_MilitaryGradeBalisticCeramics>5</Miho_MilitaryGradeBalisticCeramics>
-									</RepairIngredients>
-									<RepairTime>300</RepairTime>
-									<RepairValue>200</RepairValue>
-									<CanOverHeal>true</CanOverHeal>
-									<MaxOverHeal>100</MaxOverHeal>
-									<MinArmorPct>0.50</MinArmorPct>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Mech_Cataphract"]</xpath>
-							<value>
-								<comps>
-									<li Class="CombatExtended.CompProperties_ArmorDurability">
-										<Durability>5000</Durability>
-										<Regenerates>true</Regenerates>
-										<RegenInterval>1250</RegenInterval>
-										<RegenValue>5</RegenValue>
-										<Repairable>true</Repairable>
-										<RepairIngredients>
-											<Steel>5</Steel>
-											<Miho_MilitaryGradeBalisticCeramics>5</Miho_MilitaryGradeBalisticCeramics>
-										</RepairIngredients>
-										<RepairTime>300</RepairTime>
-										<RepairValue>200</RepairValue>
-										<CanOverHeal>true</CanOverHeal>
-										<MaxOverHeal>100</MaxOverHeal>
-										<MinArmorPct>0.50</MinArmorPct>
-									</li>
-								</comps>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Mech_Cataphract" or defName="Miho_Mech_CataphractRocket" or defName="Miho_Mech_CataphractCluRocket"]/statBases</xpath>
-							<value>
-								<MeleeDodgeChance>0.05</MeleeDodgeChance>
-								<MeleeCritChance>0.15</MeleeCritChance>
-								<MeleeParryChance>0.30</MeleeParryChance>
-								<NightVisionEfficiency>0.60</NightVisionEfficiency>
-								<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
-								<CarryWeight>100</CarryWeight>
-								<CarryBulk>150</CarryBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Mech_Cataphract"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>32</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Mech_Cataphract"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>72</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Mech_Cataphract"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>front left leg</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>21</power>
-										<cooldownTime>1.9</cooldownTime>
-										<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>5.5</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>front right leg</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>21</power>
-										<cooldownTime>1.9</cooldownTime>
-										<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>5.5</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>jaw</label>
-										<capacities>
-											<li>Demolish</li>
-										</capacities>
-										<power>80</power>
-										<cooldownTime>7.06</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>37.5</armorPenetrationBlunt>
-										<chanceFactor>2</chanceFactor>
-										<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Mech_CataphractRocket" or defName="Miho_Mech_CataphractCluRocket"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>10</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Mech_CataphractRocket" or defName="Miho_Mech_CataphractCluRocket"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>22.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Mech_CataphractRocket" or defName="Miho_Mech_CataphractCluRocket"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>front left leg</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>21</power>
-										<cooldownTime>1.9</cooldownTime>
-										<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>5.5</armorPenetrationBlunt>
-										<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>front right leg</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>21</power>
-										<cooldownTime>1.9</cooldownTime>
-										<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>5.5</armorPenetrationBlunt>
-										<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-									</li>
-								</tools>
-							</value>
-						</li>
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Miho Race/ThingDefs_Races/Race_MihoSummon.xml b/Patches/Miho Race/ThingDefs_Races/Race_MihoSummon.xml
deleted file mode 100644
index 092d4d28dc..0000000000
--- a/Patches/Miho Race/ThingDefs_Races/Race_MihoSummon.xml	
+++ /dev/null
@@ -1,276 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Miho, the celestial fox</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Fox"]/statBases</xpath>
-							<value>
-								<MeleeDodgeChance>0.27</MeleeDodgeChance>
-								<MeleeCritChance>0.02</MeleeCritChance>
-								<MeleeParryChance>0.01</MeleeParryChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Fox"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left claw</label>
-										<capacities>
-											<li>Scratch</li>
-										</capacities>
-										<power>4</power>
-										<cooldownTime>0.91</cooldownTime>
-										<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-										<surpriseAttack>
-											<extraMeleeDamages>
-												<li>
-													<def>Stun</def>
-													<amount>20</amount>
-												</li>
-											</extraMeleeDamages>
-										</surpriseAttack>
-										<armorPenetrationBlunt>0.198</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.04</armorPenetrationSharp>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>right claw</label>
-										<capacities>
-											<li>Scratch</li>
-										</capacities>
-										<power>4</power>
-										<cooldownTime>0.91</cooldownTime>
-										<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-										<surpriseAttack>
-											<extraMeleeDamages>
-												<li>
-													<def>Stun</def>
-													<amount>20</amount>
-												</li>
-											</extraMeleeDamages>
-										</surpriseAttack>
-										<armorPenetrationBlunt>0.198</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.04</armorPenetrationSharp>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<capacities>
-											<li>Bite</li>
-										</capacities>
-										<power>9</power>
-										<cooldownTime>1.49</cooldownTime>
-										<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-										<surpriseAttack>
-											<extraMeleeDamages>
-												<li>
-													<def>Stun</def>
-													<amount>20</amount>
-												</li>
-											</extraMeleeDamages>
-										</surpriseAttack>
-										<armorPenetrationBlunt>1.440</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.1</armorPenetrationSharp>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>1.26</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Butterfly"]/statBases</xpath>
-							<value>
-								<MeleeDodgeChance>2</MeleeDodgeChance>
-								<MeleeCritChance>0.75</MeleeCritChance>
-								<MeleeParryChance>0.05</MeleeParryChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Butterfly"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>blades</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>10</power>
-										<cooldownTime>0.89</cooldownTime>
-										<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.05</armorPenetrationBlunt>
-										<armorPenetrationSharp>5.6</armorPenetrationSharp>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Turret_Flame"]/thingClass</xpath>
-							<value>
-								<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Turret_Flame"]/statBases</xpath>
-							<value>
-								<AimingAccuracy>0.25</AimingAccuracy>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Turret_Flame"]/statBases/ShootingAccuracyTurret</xpath>
-							<value>
-								<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
-							</value>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Miho_TurretGun_Flame</defName>
-							<statBases>
-								<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-								<SightsEfficiency>1</SightsEfficiency>
-								<ShotSpread>0.07</ShotSpread>
-								<SwayFactor>0.80</SwayFactor>
-								<Bulk>10.00</Bulk>
-							</statBases>
-							<Properties>
-								<recoilAmount>1</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Miho_TurretGun_Flame_Proj</defaultProjectile>
-								<warmupTime>1.3</warmupTime>
-								<range>40</range>
-								<ticksBetweenBurstShots>16</ticksBetweenBurstShots>
-								<burstShotCount>3</burstShotCount>
-								<soundCast>GunShotA</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<recoilPattern>Mounted</recoilPattern>
-							</Properties>
-							<FireModes>
-								<aiAimMode>AimedShot</aiAimMode>
-								<noSnapshot>true</noSnapshot>
-								<noSingleShot>true</noSingleShot>
-							</FireModes>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_TurretGun_Flame_Proj"]</xpath>
-							<value>
-								<ThingDef ParentName="BaseExplosiveBullet">
-									<defName>Miho_TurretGun_Flame_Proj</defName>
-									<label>fireball</label>
-									<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-									<graphicData>
-										<texPath>Things/Projectile/MihoFireball</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-										<shaderType>TransparentPostLight</shaderType>
-										<drawSize>2.0</drawSize>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageDef>Miho_MagicBomb</damageDef>
-										<damageAmountBase>7</damageAmountBase>
-										<armorPenetrationSharp>0</armorPenetrationSharp>
-										<armorPenetrationBlunt>0</armorPenetrationBlunt>
-										<stoppingPower>3</stoppingPower>
-										<speed>46</speed>
-										<explosionRadius>2</explosionRadius>
-										<alwaysFreeIntercept>false</alwaysFreeIntercept>
-										<flyOverhead>false</flyOverhead>
-										<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-										<soundAmbient>MortarRound_Ambient</soundAmbient>
-									</projectile>
-								</ThingDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Miho_Thrumbo"]/statBases</xpath>
-							<value>
-								<MeleeDodgeChance>0.09</MeleeDodgeChance>
-								<MeleeCritChance>0.76</MeleeCritChance>
-								<MeleeParryChance>0.45</MeleeParryChance>
-								<Flammability>0</Flammability>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Thrumbo"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>63</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Thrumbo"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>28</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Miho_Thrumbo"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>tentacles</label>
-										<capacities>
-											<li>Scratch</li>
-											<li>Stab</li>
-										</capacities>
-										<power>25</power>
-										<cooldownTime>2.64</cooldownTime>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationSharp>26.5</armorPenetrationSharp>
-										<armorPenetrationBlunt>9.11</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>45</power>
-										<cooldownTime>2.52</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<chanceFactor>0.1</chanceFactor>
-										<armorPenetrationBlunt>30</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[defName="Miho_Thrumbo"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Birdlike</bodyShape>
-								</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Mincho, The Mint Choco Slime/Scenario/Mincho_Scenario.xml b/Patches/Mincho, The Mint Choco Slime/Scenario/Mincho_Scenario.xml
deleted file mode 100644
index a0ceda4854..0000000000
--- a/Patches/Mincho, The Mint Choco Slime/Scenario/Mincho_Scenario.xml	
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Mincho, The Mint Choco Slime</li>
-					<li>Mincho, The Mint Choco Slime ~ HAR ver.</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ScenarioDef[defName="Mincho_Scenario"]/scenario/parts</xpath>
-							<value>
-								<li Class="ScenPart_StartingThing_Defined">
-									<def>StartingThing_Defined</def>
-									<thingDef>Ammo_303British_FMJ</thingDef>
-									<count>100</count>
-								</li>
-								<li Class="ScenPart_StartingThing_Defined">
-									<def>StartingThing_Defined</def>
-									<thingDef>Ammo_44Magnum_FMJ</thingDef>
-									<count>60</count>
-								</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Mincho, The Mint Choco Slime/ThingDefs_Bodies/Mincho_Bodytype.xml b/Patches/Mincho, The Mint Choco Slime/ThingDefs_Bodies/Mincho_Bodytype.xml
deleted file mode 100644
index 3e68ac66e2..0000000000
--- a/Patches/Mincho, The Mint Choco Slime/ThingDefs_Bodies/Mincho_Bodytype.xml	
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Mincho, The Mint Choco Slime ~ HAR ver.</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Arm Groups-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Mincho_BodyDef"]//*[
-						def="Mincho_Core"
-						]/groups
-					</xpath>
-					<value>
-						<li>LeftShoulder</li>
-						<li>RightShoulder</li>
-						<li>LeftArm</li>
-						<li>RightArm</li>
-						<li>Shoulders</li>
-					</value>
-				</li>
-
-				<!--Natural Armor-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Mincho_BodyDef"]//*[
-						def="Mincho_Torso" or
-						def="Mincho_Head"
-						]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Mincho, The Mint Choco Slime/ThingDefs_Items/Items_Resource_Stuff.xml b/Patches/Mincho, The Mint Choco Slime/ThingDefs_Items/Items_Resource_Stuff.xml
deleted file mode 100644
index 91ab99951b..0000000000
--- a/Patches/Mincho, The Mint Choco Slime/ThingDefs_Items/Items_Resource_Stuff.xml	
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Mincho, The Mint Choco Slime ~ HAR ver.</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Mincho_ChocoStick"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>0.99</cooldownTime>
-										<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Mincho_ChocoStick"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.2</MeleeCritChance>
-									<MeleeParryChance>1</MeleeParryChance>
-									<MeleeDodgeChance>0.13</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Mincho_ChocoStick"]/statBases</xpath>
-							<value>
-								<Bulk>0.07</Bulk>
-								<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Mincho_ChocoStick"]/statBases/StuffPower_Armor_Sharp</xpath>
-							<value>
-								<StuffPower_Armor_Sharp>0.1</StuffPower_Armor_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Mincho_ChocoStick"]/statBases/StuffPower_Armor_Blunt</xpath>
-							<value>
-								<StuffPower_Armor_Blunt>0.2</StuffPower_Armor_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Mincho_ChocoStick"]/statBases/StuffPower_Armor_Heat</xpath>
-							<value>
-								<StuffPower_Armor_Heat>0.025</StuffPower_Armor_Heat>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Mincho_ChocoStick"]/statBases/SharpDamageMultiplier</xpath>
-							<value>
-								<SharpDamageMultiplier>0.7</SharpDamageMultiplier>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Mincho_ChocoStick"]/statBases/BluntDamageMultiplier</xpath>
-							<value>
-								<BluntDamageMultiplier>0.5</BluntDamageMultiplier>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Mincho_ChocoStick"]/stuffProps/statFactors</xpath>
-							<value>
-								<Mass>0.3</Mass>
-								<MeleePenetrationFactor>0.3</MeleePenetrationFactor>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Mincho, The Mint Choco Slime/ThingDefs_Misc/Mincho_Apparel.xml b/Patches/Mincho, The Mint Choco Slime/ThingDefs_Misc/Mincho_Apparel.xml
deleted file mode 100644
index 8960ef49d9..0000000000
--- a/Patches/Mincho, The Mint Choco Slime/ThingDefs_Misc/Mincho_Apparel.xml	
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Mincho, The Mint Choco Slime ~ HAR ver.</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!-- ========== Regular ========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="Mincho_ChocolateNegligee" or
-								defName="Mincho_CupHat"
-								]/statBases/ArmorRating_Sharp </xpath>
-							<value>
-								<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="Mincho_ChocolateNegligee" or
-								defName="Mincho_CupHat"
-								]/statBases/ArmorRating_Blunt </xpath>
-							<value>
-								<ArmorRating_Blunt>0.125</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="Mincho_ChocolateNegligee" or
-								defName="Mincho_MintchocoDonutTiara"
-								]/statBases/ArmorRating_Sharp </xpath>
-							<value>
-								<ArmorRating_Sharp>0.10</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="Mincho_ChocolateCoatingDress" or
-								defName="Mincho_MintchocoDonutTiara"
-								]/statBases/ArmorRating_Blunt </xpath>
-							<value>
-								<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Mincho_ChocoCrust"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>1.8</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Mincho_ChocoCrust"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>2.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!-- ========== Armor ========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Mincho_KnightlyDress"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-								<Bulk>15</Bulk>
-								<WornBulk>7.5</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Mincho_KnightlyTiara"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-								<Bulk>3</Bulk>
-								<WornBulk>0.5</WornBulk>
-							</value>
-						</li>
-
-						<!-- ========== Regular ========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="Mincho_BaseApparel"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>4.5</StuffEffectMultiplierArmor>
-								<Bulk>5</Bulk>
-								<WornBulk>0</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[@Name="Mincho_BaseApparel"
-								]/statBases/ArmorRating_Sharp </xpath>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[@Name="Mincho_BaseApparel"
-								]/statBases/ArmorRating_Blunt </xpath>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Mincho_PinkFallInLoveHood"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-								<Bulk>5</Bulk>
-								<WornBulk>3</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Mincho_BlouseHighWaistSkirt"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>9</StuffEffectMultiplierArmor>
-								<Bulk>5</Bulk>
-								<WornBulk>5</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="Mincho_CuteHatBase"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-								<Bulk>2</Bulk>
-								<WornBulk>0</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Mincho_KnightlyCloak"
-								]/statBases/ArmorRating_Sharp </xpath>
-							<value>
-								<ArmorRating_Sharp>3</ArmorRating_Sharp>
-								<ArmorRating_Electric>0.25</ArmorRating_Electric>
-								<Bulk>7.5</Bulk>
-								<WornBulk>5</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Mincho_KnightlyCloak"
-								]/statBases/ArmorRating_Blunt </xpath>
-							<value>
-								<ArmorRating_Blunt>0.6</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Mincho_KnightlyCloak"
-								]/statBases/ArmorRating_Heat </xpath>
-							<value>
-								<ArmorRating_Heat>0.25</ArmorRating_Heat>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Mincho, The Mint Choco Slime/ThingDefs_Misc/Mincho_Weapon.xml b/Patches/Mincho, The Mint Choco Slime/ThingDefs_Misc/Mincho_Weapon.xml
deleted file mode 100644
index 5abc5ed64d..0000000000
--- a/Patches/Mincho, The Mint Choco Slime/ThingDefs_Misc/Mincho_Weapon.xml	
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Mincho, The Mint Choco Slime ~ HAR ver.</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Mincho_MintCandy"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<labelUsedInLogging>false</labelUsedInLogging>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>15</power>
-										<cooldownTime>1.9</cooldownTime>
-										<chanceFactor>1.33</chanceFactor>
-										<armorPenetrationBlunt>5.625</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>1.59</cooldownTime>
-										<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Mincho_MintCandy"]/statBases</xpath>
-							<value>
-								<Bulk>3.5</Bulk>
-								<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="Mincho_MintCandy"]/equippedStatOffsets</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="Mincho_MintCandy"]</xpath>
-								<value>
-									<equippedStatOffsets />
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Mincho_MintCandy"]/equippedStatOffsets</xpath>
-							<value>
-								<MeleeCritChance>0.42</MeleeCritChance>
-								<MeleeParryChance>0.24</MeleeParryChance>
-								<MeleeDodgeChance>0.2</MeleeDodgeChance>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Mincho, The Mint Choco Slime/ThingDefs_Races/Race_Mincho.xml b/Patches/Mincho, The Mint Choco Slime/ThingDefs_Races/Race_Mincho.xml
deleted file mode 100644
index 4adefc0c98..0000000000
--- a/Patches/Mincho, The Mint Choco Slime/ThingDefs_Races/Race_Mincho.xml	
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Mincho, The Mint Choco Slime ~ HAR ver.</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Mincho_ThingDef"]/comps</xpath>
-							<value>
-								<li>
-									<compClass>CombatExtended.CompPawnGizmo</compClass>
-								</li>
-								<li Class="CombatExtended.CompProperties_Suppressable" />
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Mincho_ThingDef"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Humanoid</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Mincho_ThingDef"]/statBases</xpath>
-							<value>
-								<Suppressability>0.8</Suppressability>
-								<!--Innate immunity to toxic fallout, high immunity gain rate-->
-								<SmokeSensitivity>0</SmokeSensitivity>
-							</value>
-						</li>
-
-						<!-- -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Mincho_ThingDef"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>1</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Mincho_ThingDef"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Mincho_ThingDef"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>slime fist</label>
-										<capacities>
-											<li>Blunt</li>
-											<li>Poke</li>
-											<li>Cut</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>0.9</cooldownTime>
-										<linkedBodyPartsGroup>Torso</linkedBodyPartsGroup>
-										<armorPenetrationSharp>0.05</armorPenetrationSharp>
-										<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Mincho_ThingDef"]/alienRace/raceRestriction/whiteApparelList</xpath>
-							<value>
-								<li>CE_Apparel_TacVest</li>
-								<li>CE_Apparel_Backpack</li>
-								<li>CE_Apparel_TribalBackpack</li>
-								<li>CE_Apparel_BallisticShield</li>
-								<li>CE_Apparel_MeleeShield</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Mincho, The Mint Choco Slime/ThingDefs_Races/Race_Pets.xml b/Patches/Mincho, The Mint Choco Slime/ThingDefs_Races/Race_Pets.xml
deleted file mode 100644
index 2c511dcc45..0000000000
--- a/Patches/Mincho, The Mint Choco Slime/ThingDefs_Races/Race_Pets.xml	
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Mincho, The Mint Choco Slime ~ HAR ver.</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[defName="Mincho_Minchonyang" or defName="Mincho_Minmoong"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Quadruped</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Mincho_Minchonyang"]/statBases</xpath>
-							<value>
-								<!--Innate immunity to toxic fallout, high immunity gain rate-->
-								<SmokeSensitivity>0</SmokeSensitivity>
-								<MeleeDodgeChance>0.23</MeleeDodgeChance>
-								<MeleeCritChance>0.02</MeleeCritChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Mincho_Minmoong"]/statBases</xpath>
-							<value>
-								<!--Innate immunity to toxic fallout, high immunity gain rate-->
-								<SmokeSensitivity>0</SmokeSensitivity>
-								<MeleeDodgeChance>0.19</MeleeDodgeChance>
-								<MeleeCritChance>0.06</MeleeCritChance>
-								<MeleeParryChance>0.04</MeleeParryChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Mincho_Minchonyang"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>slime fist</label>
-										<capacities>
-											<li>Blunt</li>
-											<li>Poke</li>
-											<li>Cut</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>0.9</cooldownTime>
-										<linkedBodyPartsGroup>Torso</linkedBodyPartsGroup>
-										<armorPenetrationSharp>0.05</armorPenetrationSharp>
-										<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Mincho_Minmoong"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>slime fist</label>
-										<capacities>
-											<li>Blunt</li>
-											<li>Poke</li>
-											<li>Cut</li>
-										</capacities>
-										<power>1.5</power>
-										<cooldownTime>0.9</cooldownTime>
-										<linkedBodyPartsGroup>Torso</linkedBodyPartsGroup>
-										<armorPenetrationSharp>0.05</armorPenetrationSharp>
-										<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/MiningCo. MiningHelmet/MiningCoApparel_HelmetAndVest.xml b/Patches/MiningCo. MiningHelmet/MiningCoApparel_HelmetAndVest.xml
deleted file mode 100644
index db71f881ad..0000000000
--- a/Patches/MiningCo. MiningHelmet/MiningCoApparel_HelmetAndVest.xml	
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MiningCo. MiningHelmet</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- MINING VEST - Cloth, 2mm -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MiningVest"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.02</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MiningVest"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.03</ArmorRating_Blunt>
-					</value>
-				</li>
-				<!-- MINING HELMET - Vanilla Apparel Expanded Hardhat's stats -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MiningHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MiningHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/MiningCo. Spaceship/Airstrike_Damage.xml b/Patches/MiningCo. Spaceship/Airstrike_Damage.xml
deleted file mode 100644
index 71815c2fbf..0000000000
--- a/Patches/MiningCo. Spaceship/Airstrike_Damage.xml	
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MiningCo. Spaceship</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<DamageDef>
-							<defName>MiningCo_Cannon</defName>
-							<label>Autocannon</label>
-							<workerClass>DamageWorker_AddInjury</workerClass>
-							<externalViolence>true</externalViolence>
-							<isExplosive>true</isExplosive>
-							<deathMessage>{0} has died in an explosion.</deathMessage>
-							<hediff>Blast</hediff>
-							<hediffSolid>Crack</hediffSolid>
-							<harmAllLayersUntilOutside>true</harmAllLayersUntilOutside>
-							<impactSoundType>Blunt</impactSoundType>
-							<armorCategory>Blunt</armorCategory>
-							<minDamageToFragment>10</minDamageToFragment>
-							<defaultDamage>56</defaultDamage>
-							<defaultStoppingPower>2</defaultStoppingPower>
-							<defaultArmorPenetration>60</defaultArmorPenetration>
-							<buildingDamageFactor>4</buildingDamageFactor>
-							<plantDamageFactor>4</plantDamageFactor>
-							<explosionAffectOutsidePartsOnly>false</explosionAffectOutsidePartsOnly>
-							<explosionHeatEnergyPerCell>5</explosionHeatEnergyPerCell>
-							<explosionCellFleck>BlastDry</explosionCellFleck>
-							<explosionColorCenter>(1, 0.5, 0.3)</explosionColorCenter>
-							<explosionColorEdge>(0.6, 0.5, 0.4)</explosionColorEdge>
-							<soundExplosion>Explosion_Bomb</soundExplosion>
-							<combatLogRules>Damage_Bomb</combatLogRules>
-						</DamageDef>
-
-						<DamageDef>
-							<defName>MiningCo_Rocket</defName>
-							<label>Rocket</label>
-							<workerClass>DamageWorker_AddInjury</workerClass>
-							<externalViolence>true</externalViolence>
-							<isExplosive>true</isExplosive>
-							<deathMessage>{0} has died in an explosion.</deathMessage>
-							<hediff>Blast</hediff>
-							<hediffSolid>Crack</hediffSolid>
-							<harmAllLayersUntilOutside>true</harmAllLayersUntilOutside>
-							<impactSoundType>Blunt</impactSoundType>
-							<armorCategory>Blunt</armorCategory>
-							<minDamageToFragment>10</minDamageToFragment>
-							<defaultDamage>120</defaultDamage>
-							<defaultStoppingPower>3</defaultStoppingPower>
-							<defaultArmorPenetration>160</defaultArmorPenetration>
-							<buildingDamageFactor>4</buildingDamageFactor>
-							<plantDamageFactor>4</plantDamageFactor>
-							<explosionAffectOutsidePartsOnly>false</explosionAffectOutsidePartsOnly>
-							<explosionHeatEnergyPerCell>5</explosionHeatEnergyPerCell>
-							<explosionCellFleck>BlastDry</explosionCellFleck>
-							<explosionColorCenter>(1, 0.5, 0.3)</explosionColorCenter>
-							<explosionColorEdge>(0.6, 0.5, 0.4)</explosionColorEdge>
-							<soundExplosion>Explosion_Bomb</soundExplosion>
-							<combatLogRules>Damage_Bomb</combatLogRules>
-						</DamageDef>
-
-						<ThingDef ParentName="BaseBullet">
-							<defName>PrometheumBomb</defName>
-							<label>Prometheum bomb</label>
-							<thingClass>Projectile_Explosive</thingClass>
-							<graphicData>
-								<texPath>Things/Projectile/Rocket_Big</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile>
-								<flyOverhead>true</flyOverhead>
-								<damageDef>PrometheumFlame</damageDef>
-								<damageAmountBase>10</damageAmountBase>
-								<explosionRadius>6</explosionRadius>
-								<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
-								<speed>20</speed>
-								<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-							</projectile>
-						</ThingDef>
-
-						<Def Class="Spaceship.WeaponDef">
-							<defName>PrometheumBombWeapon</defName>
-							<label>Prometheum bomb</label>
-							<ammoDef>PrometheumBomb</ammoDef>
-							<soundCastDef>InfernoCannon_Fire</soundCastDef>
-							<ammoQuantity>3</ammoQuantity>
-							<ticksBetweenShots>60</ticksBetweenShots>
-							<startShootingDistance>10</startShootingDistance>
-							<ammoTravelDistance>5</ammoTravelDistance>
-							<isTwinGun>true</isTwinGun>
-							<horizontalPositionOffset>3.0</horizontalPositionOffset>
-							<verticalPositionOffset>0.0</verticalPositionOffset>
-							<disableRainDurationInTicks>30000</disableRainDurationInTicks>
-						</Def>
-
-						<Def Class="Spaceship.AirStrikeDef">
-							<defName>PrometheumRaid</defName>
-							<label>prometheum bombing run</label>
-							<description>PROMETHEUM STICKS TO MECHANOIDS!</description>
-							<runsNumber>1</runsNumber>
-							<costInSilver>3500</costInSilver>
-							<ammoResupplyDays>20</ammoResupplyDays>
-							<cellsTravelledPerTick>0.08</cellsTravelledPerTick>
-							<ticksBeforeOverflightReducedSpeed>60</ticksBeforeOverflightReducedSpeed>
-							<weapons>
-								<li>PrometheumBombWeapon</li>
-							</weapons>
-						</Def>
-
-					</value>
-				</li>
-
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='GatlingRound']/thingClass</xpath>
-					<value>
-						<thingClass>Bullet</thingClass>
-					</value>
-				</li>
-
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='AutocannonRound']/projectile</xpath>
-					<value>
-						<projectile>
-							<flyOverhead>true</flyOverhead>
-							<damageDef>MiningCo_Cannon</damageDef>
-							<explosionRadius>1.5</explosionRadius>
-							<speed>120</speed>
-							<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='RocketAirstrike']/projectile</xpath>
-					<value>
-						<projectile>
-							<flyOverhead>true</flyOverhead>
-							<damageDef>MiningCo_Rocket</damageDef>
-							<explosionRadius>3</explosionRadius>
-							<speed>64</speed>
-							<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='IncendiaryBomb']/projectile</xpath>
-					<value>
-						<projectile>
-							<flyOverhead>true</flyOverhead>
-							<damageDef>Flame</damageDef>
-							<damageAmountBase>20</damageAmountBase>
-							<explosionRadius>6</explosionRadius>
-							<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
-							<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
-							<speed>20</speed>
-							<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-						</projectile>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/MiningCo. Spaceship/Helmet.xml b/Patches/MiningCo. Spaceship/Helmet.xml
deleted file mode 100644
index 336a1bacd5..0000000000
--- a/Patches/MiningCo. Spaceship/Helmet.xml	
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MiningCo. Spaceship</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SimpleHelmetMedic"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SimpleHelmetMedic"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SimpleHelmetMedic"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SimpleHelmetMedic"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>50</Steel>
-						</costList>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/MiningCo. Spaceship/Mining_Trader.xml b/Patches/MiningCo. Spaceship/Mining_Trader.xml
deleted file mode 100644
index c98d3e6a22..0000000000
--- a/Patches/MiningCo. Spaceship/Mining_Trader.xml	
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MiningCo. Spaceship</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==========  ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="SpaceshipCargoPeriodicSupply"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>FSX</thingDef>
-							<countRange>
-								<min>10</min>
-								<max>25</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>Prometheum</thingDef>
-							<countRange>
-								<min>10</min>
-								<max>25</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Ammo</tradeTag>
-							<countRange>
-								<min>500</min>
-								<max>1000</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>2</min>
-								<max>6</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_MediumAmmo</tradeTag>
-							<countRange>
-								<min>20</min>
-								<max>30</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>2</min>
-								<max>5</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_HeavyAmmo</tradeTag>
-							<countRange>
-								<min>10</min>
-								<max>15</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>2</min>
-								<max>3</max>
-							</thingDefCountRange>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="SpaceshipCargoRequestedSupply" or defName="SpaceshipCargoDispatcher"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>FSX</thingDef>
-							<countRange>
-								<min>15</min>
-								<max>45</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>Prometheum</thingDef>
-							<countRange>
-								<min>15</min>
-								<max>45</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Ammo</tradeTag>
-							<countRange>
-								<min>1000</min>
-								<max>3000</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>5</min>
-								<max>12</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_MediumAmmo</tradeTag>
-							<countRange>
-								<min>30</min>
-								<max>60</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>3</min>
-								<max>7</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_HeavyAmmo</tradeTag>
-							<countRange>
-								<min>10</min>
-								<max>30</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>3</min>
-								<max>5</max>
-							</thingDefCountRange>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/TraderKindDef[defName="SpaceshipCargoDispatcher"]/stockGenerators/li[thingDef="Gun_Minigun"]</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="SpaceshipCargoDispatcher"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>Gun_LMG</thingDef>
-							<countRange>
-								<min>-1</min>
-								<max>1</max>
-							</countRange>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="SpaceshipCargoDamaged"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Ammo</tradeTag>
-							<price>Cheap</price>
-							<countRange>
-								<min>100</min>
-								<max>300</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>1</min>
-								<max>3</max>
-							</thingDefCountRange>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="SpaceshipCargoMedical"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Ammo</tradeTag>
-							<countRange>
-								<min>30</min>
-								<max>60</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>-1</min>
-								<max>1</max>
-							</thingDefCountRange>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/MiningCo. Spaceship/ShipTurrets.xml b/Patches/MiningCo. Spaceship/ShipTurrets.xml
deleted file mode 100644
index 57cc01198f..0000000000
--- a/Patches/MiningCo. Spaceship/ShipTurrets.xml	
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MiningCo. Spaceship</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Replace vanilla thingClass -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VulcanTurret"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<!-- Make turrets taller -->
-				<!--<li Class="PatchOperationReplace">
-        		<xpath>Defs/ThingDef[defName = "VulcanTurret"]/fillPercent</xpath>
-        		<value>
-          			<fillPercent>0.85</fillPercent>
-        		</value>
-      		</li>-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName = "VulcanTurret"]/statBases </xpath>
-					<value>
-						<AimingAccuracy>0.25</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "VulcanTurret"]/statBases</xpath>
-					<value>
-						<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VulcanTurret"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>1</turretBurstCooldownTime>
-					</value>
-				</li>
-				<!-- Make the Turret usable -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_VulcanTurret</defName>
-					<statBases>
-						<Mass>50.00</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>1.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.03</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>70</range>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<burstShotCount>20</burstShotCount>
-						<minRange>1.5</minRange>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>10</aimedBurstShotCount>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Misc Core/ThingDefs_Misc/Weapons.xml b/Patches/Misc Core/ThingDefs_Misc/Weapons.xml
deleted file mode 100644
index c3dc116477..0000000000
--- a/Patches/Misc Core/ThingDefs_Misc/Weapons.xml	
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Miscellaneous 'CORE'</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!-- ========== Misc Railgun =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Gun_RailgunMKI</defName>
-							<statBases>
-								<SightsEfficiency>3.50</SightsEfficiency>
-								<ShotSpread>0.01</ShotSpread>
-								<SwayFactor>1.95</SwayFactor>
-								<Bulk>12</Bulk>
-								<Mass>6.25</Mass>
-								<RangedWeapon_Cooldown>1.20</RangedWeapon_Cooldown>
-							</statBases>
-
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_8mmRailgun_Sabot</defaultProjectile>
-								<warmupTime>2.1</warmupTime>
-								<range>86</range>
-								<soundCast>ChargeLance_Fire</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>5</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_8mmRailgun</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== Melee Attacks =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Gun_RailgunMKI"]/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>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Misc MAI/Bodies/Bodies_AIPawn.xml b/Patches/Misc MAI/Bodies/Bodies_AIPawn.xml
deleted file mode 100644
index 89332d9503..0000000000
--- a/Patches/Misc MAI/Bodies/Bodies_AIPawn.xml	
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Misc. MAI</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="AIPawn"]//*[
-						def="AIPawn_Thorax" or
-						def="MechanicalNeck" or
-						def="Head" or
-						def="HearingSensor" or
-						def="SmellSensor" or
-						def="MechanicalShoulder" or
-						def="MechanicalArm" or
-						def="MechanicalHand" or
-						def="MechanicalFinger" or
-						def="MechanicalLeg" or
-						def="MechanicalFoot"]/groups
-					</xpath>
-
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Misc MAI/PawnKindDefs/AI_PawnKind.xml b/Patches/Misc MAI/PawnKindDefs/AI_PawnKind.xml
deleted file mode 100644
index 13c121f6a9..0000000000
--- a/Patches/Misc MAI/PawnKindDefs/AI_PawnKind.xml	
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Misc. MAI</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--Ammo-->
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[
-								defName="AIPawn" or
-								defName="AIPawnE"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>5</min>
-										<max>5</max>
-									</primaryMagazineCount>
-								</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Misc MAI/ThingDefs_Misc/Apparel.xml b/Patches/Misc MAI/ThingDefs_Misc/Apparel.xml
deleted file mode 100644
index 2ad50d169a..0000000000
--- a/Patches/Misc MAI/ThingDefs_Misc/Apparel.xml	
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Misc. MAI</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AIPawn_Apparel_BaseShielding"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>8</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AIPawn_Apparel_BaseShielding"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>12</ArmorRating_Blunt>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Misc MAI/ThingDefs_Races/Race_AIPawn.xml b/Patches/Misc MAI/ThingDefs_Races/Race_AIPawn.xml
deleted file mode 100644
index 140bef5fa9..0000000000
--- a/Patches/Misc MAI/ThingDefs_Races/Race_AIPawn.xml	
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Misc. MAI</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[@Name="BaseAIPawn_MiscMAI"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Humanoid</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="BaseAIPawn_MiscMAI"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>1.26</cooldownTime>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>right fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>1.26</cooldownTime>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>4.49</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="AIPawn" or defName="AIPawnE"]/statBases</xpath>
-							<value>
-								<Suppressability>0</Suppressability>
-								<SmokeSensitivity>0</SmokeSensitivity>
-								<CarryBulk>50</CarryBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AIPawn"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AIPawn"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.75</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AIPawnE"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>1</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="AIPawnE"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!-- ========== Add loadout update behavior ========== -->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThinkTreeDef[defName="AIPawn"]/thinkRoot/subNodes/li[@Class="ThinkNode_ConditionalColonist"]/subNodes</xpath>
-							<value>
-								<li Class="CombatExtended.JobGiver_UpdateLoadout" />
-								<li Class="CombatExtended.JobGiver_CheckReload" />
-							</value>
-						</li>
-
-						<!-- ========== Add additional inventory behavior ========== -->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThinkTreeDef[defName="AIPawnConstant"]/thinkRoot/subNodes/li[@Class="ThinkNode_ConditionalCanDoConstantThinkTreeJobNow"]/subNodes</xpath>
-							<value>
-								<li Class="CombatExtended.JobGiver_TakeAndEquip" />
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/MiscRobots/AIRobot_RacesCE.xml b/Patches/MiscRobots/AIRobot_RacesCE.xml
deleted file mode 100644
index a41a10f5a7..0000000000
--- a/Patches/MiscRobots/AIRobot_RacesCE.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Misc. Robots</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="Base_X2_AIRobot"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="Base_X2_AIRobot"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.24</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-						<SmokeSensitivity>0</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Base_X2_AIRobot"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left manipulator</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right manipulator</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>2.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/MiscTurrets/Patch_Ammo.xml b/Patches/MiscTurrets/Patch_Ammo.xml
deleted file mode 100644
index 607547cea0..0000000000
--- a/Patches/MiscTurrets/Patch_Ammo.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Misc. TurretBase, Objects</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingCategoryDef>
-							<defName>AmmoNanobotsMicroTurret</defName>
-							<label>Nanobots (MicroTurret)</label>
-							<parent>AmmoAdvanced</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_NanobotsMicroTurret</defName>
-							<label>Nanobots (MicroTurret)</label>
-							<ammoTypes>
-								<Ammo_NanobotsMicroTurret>Bullet_NanobotsMicroTurret</Ammo_NanobotsMicroTurret>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="NanobotsMicroTurretBase" ParentName="SpacerSmallAmmoBase" Abstract="True">
-							<description>Nanobot ammo used by highly-advanced designs.</description>
-							<statBases>
-								<Mass>0.025</Mass>
-								<Bulk>0.05</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoNanobotsMicroTurret</li>
-							</thingCategories>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="NanobotsMicroTurretBase">
-							<defName>Ammo_NanobotsMicroTurret</defName>
-							<label>Nanobots (MT) cartridge</label>
-							<graphicData>
-								<texPath>Things/Ammo/Charged/MediumRegular</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>2.5</MarketValue>
-							</statBases>
-							<ammoClass>NanobotsMT</ammoClass>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="BaseNanobotsMicroTurretBullet" ParentName="BaseBulletCE" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Charged/ChargeShot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>170</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Compatibility.AmmoDef_ThingSpawner" ParentName="BaseNanobotsMicroTurretBullet">
-							<defName>Bullet_NanobotsMicroTurret</defName>
-							<label>Nanobots (MT) bullet</label>
-							<thingClass>CombatExtended.Compatibility.BulletCE_ThingSpawner</thingClass>
-							<spawnDef>MicroTurretMKI</spawnDef>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>1</damageAmountBase>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.01</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_NanobotsMicroTurret</defName>
-							<label>make Nanobots (MT) cartridge x50</label>
-							<description>Craft 50 Nanobots (MT) cartridges.</description>
-							<jobString>Making Nanobots (MT) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>3</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_NanobotsMicroTurret>50</Ammo_NanobotsMicroTurret>
-							</products>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/MiscTurrets/ThingDefs_Guns.xml b/Patches/MiscTurrets/ThingDefs_Guns.xml
deleted file mode 100644
index 68e945386d..0000000000
--- a/Patches/MiscTurrets/ThingDefs_Guns.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Misc. TurretBase, Objects</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_MicroTurretLauncher"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11.2</power>
-								<cooldownTime>2.6</cooldownTime>
-								<armorPenetration>0.032</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MicroTurretLauncher</defName>
-					<statBases>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1.35</SwayFactor>
-						<Bulk>12.5</Bulk>
-						<Mass>8</Mass>
-						<RangedWeapon_Cooldown>1.35</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_NanobotsMicroTurret</defaultProjectile>
-						<warmupTime>2.5</warmupTime>
-						<range>25</range>
-						<burstShotCount>1</burstShotCount>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>2</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_NanobotsMicroTurret</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_MicroTurretLauncher"]/thingSetMakerTags</xpath>
-					<value>
-						<thingSetMakerTags>
-							<li>RewardStandardQualitySuper</li>
-						</thingSetMakerTags>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/MiscTurrets/ThingDefs_Turrets.xml b/Patches/MiscTurrets/ThingDefs_Turrets.xml
deleted file mode 100644
index ce6db1faab..0000000000
--- a/Patches/MiscTurrets/ThingDefs_Turrets.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Misc. TurretBase, Objects</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Replace thingClass -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						@Name = "BuildingTurretBase_BuildAutoTurret" or
-						@Name = "BuildingTurretBase_AutoTurret" or
-						defName = "TurretWeaponBaseMannable"
-						]/thingClass </xpath>
-					<value>
-						<thingClass>CombatExtended.Compatibility.MiscTurrets_CE_TurretWeaponBase</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "TurretWeaponBaseMannable" or
-						defName = "TurretWeaponBaseAutomatic" or
-						defName = "TurretWeaponBaseAutomatic_Buildable"
-						]/fillPercent </xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "TurretWeaponBaseMannable" or
-						defName = "TurretWeaponBaseAutomatic" or
-						defName = "TurretWeaponBaseAutomaticPlasteel" or
-						defName = "TurretWeaponBaseAutomatic_Buildable"
-						]/statBases/ShootingAccuracyTurret </xpath>
-					<value>
-						<ShootingAccuracyTurret>0.75</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "TurretWeaponBaseAutomaticHighTechTargeting" or
-						defName = "TurretWeaponBaseAutomaticHighTechTargeting_Buildable"
-						]/statBases/ShootingAccuracyTurret </xpath>
-					<value>
-						<ShootingAccuracyTurret>1.0</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<!-- Micro Turret -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MicroTurretMKI"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.5</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MicroTurretMKI"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>1.1</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MicroTurretMKI"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.25</AimingAccuracy>
-						<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MicroTurretMKI</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.1</ShotSpread>
-						<SwayFactor>0.7</SwayFactor>
-						<Bulk>5.0</Bulk>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.67</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>25</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>2</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Moa/Ce_Moa.xml b/Patches/Moa/Ce_Moa.xml
deleted file mode 100644
index 7af46824fd..0000000000
--- a/Patches/Moa/Ce_Moa.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Moa</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Moa"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Moa"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.33</MeleeDodgeChance>
-						<MeleeCritChance>0.12</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moa"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>5</MoveSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moa"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.4</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>13</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.24</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.88</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>13</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.55</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Moonjelly Race/BodyArmor_Patch.xml b/Patches/Moonjelly Race/BodyArmor_Patch.xml
deleted file mode 100644
index 077c5555c5..0000000000
--- a/Patches/Moonjelly Race/BodyArmor_Patch.xml	
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Moonjelly Race</li>
-			<li>Moonjelly Race (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Add armor coverage (for pawns with non-zero armor that use human body) ========== -->
-
-				<!-- Moonjelly -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def = "Neck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Mouth"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Nose"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Ear"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Eye"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Brain"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def = "Musclering"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def= "Musclering"]/parts/li[def ="Tentacle"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def="Musclering"]/parts/li[def ="Tentacle"]/parts/li[def = "Tentillum"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def="Musclering"]/parts/li[def ="Tentacle"]/parts/li[def = "Nematocyst"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def = "Waist"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def = "Leg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/parts/li[def = "Toe"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def = "Mesoglea"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def = "Pelvis"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def = "NerveNet"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def = "Stomach"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "MoonjellyBody"]/corePart/parts/li[def = "MucusGland"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Moonjelly Race/Moonjelly_Patch.xml b/Patches/Moonjelly Race/Moonjelly_Patch.xml
deleted file mode 100644
index 1e21fa2c7e..0000000000
--- a/Patches/Moonjelly Race/Moonjelly_Patch.xml	
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Moonjelly Race</li>
-			<li>Moonjelly Race (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Add the Humanoid Body Shape to the Moonjelly-->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Moonjelly_Race"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!--Add Stats to the Moonjelly-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Moonjelly_Race"]/statBases</xpath>
-					<value>
-						<!--They aren't as good at range, have terrible meele, and are easily suppressed-->
-						<!--However, they reload quickly and are very reistant to smoke-->
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<MeleeDodgeChance>0.9</MeleeDodgeChance>
-						<MeleeCritChance>0.8</MeleeCritChance>
-						<MeleeParryChance>0.7</MeleeParryChance>
-						<ReloadSpeed>1.3</ReloadSpeed>
-						<Suppressability>2.35</Suppressability>
-						<SmokeSensitivity>0.35</SmokeSensitivity>
-					</value>
-				</li>
-
-				<!--Give the Moon Gelly A toxic sting-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Moonjelly_Race"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>poison sting</label>
-								<capacities>
-									<li>Tentacletox</li>
-								</capacities>
-								<power>0.2</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>Tentacles</linkedBodyPartsGroup>
-								<armorPenetration>0.09</armorPenetration>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<!-- had to add both tentacles hits here because they were not applying the anesthetic effect-->
-							<li Class="CombatExtended.ToolCE">
-								<label>left tentacle</label>
-								<capacities>
-									<li>Tentacletox</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.3</cooldownTime>
-								<armorPenetration>0.09</armorPenetration>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Tentacles</linkedBodyPartsGroup>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>right tentacle</label>
-								<capacities>
-									<li>Tentacletox</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.3</cooldownTime>
-								<armorPenetration>0.09</armorPenetration>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Tentacles</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Had to lower the severity of anesthethic by 10 because they were just downing living creatures in one hit-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[defName="TentacleStrikeDmg"]/additionalHediffs/li[hediff="Anesthetic"]/severityPerDamageDealt</xpath>
-					<value>
-						<severityPerDamageDealt>0.03</severityPerDamageDealt>
-					</value>
-				</li>
-
-				<!--Checks if the Race has comps and if they don't then it adds them-->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Moonjelly_Race"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Moonjelly_Race"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<!--Adds the suppresibility to the moonjellyies-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Moonjelly_Race"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Moonjelly Race/PawnKinds_MoonJelly.xml b/Patches/Moonjelly Race/PawnKinds_MoonJelly.xml
deleted file mode 100644
index f33bc766a6..0000000000
--- a/Patches/Moonjelly Race/PawnKinds_MoonJelly.xml	
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Moonjelly Race</li>
-			<li>Moonjelly Race (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="MoonjellyBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount><!-- Neolithic weapons in this pawnkind, need arrows/pila. -->
-								<min>6</min>
-								<max>20</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="MoonjellyBlackmarket" or defName="MoonjellyTrader"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="MoonjellyMilBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>8</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="MoonjellyMad"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>10</min>
-								<max>20</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/More Archotech Garbage Continued/MAGC_Hediff.xml b/Patches/More Archotech Garbage Continued/MAGC_Hediff.xml
deleted file mode 100644
index 8815e1977e..0000000000
--- a/Patches/More Archotech Garbage Continued/MAGC_Hediff.xml	
+++ /dev/null
@@ -1,36 +0,0 @@
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>More Archotech Garbage Continued</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ProtectionBeaconBoost"]/stages/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ArmorRating_Blunt>5</ArmorRating_Blunt>
-							<ArmorRating_Sharp>7.5</ArmorRating_Sharp>
-							<ArmorRating_Heat>0.40</ArmorRating_Heat>
-							<ToxicResistance>1.0</ToxicResistance>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="CombatBeaconBoost"]/stages/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<MeleeDodgeChance>7.5</MeleeDodgeChance>
-							<MeleeHitChance>2</MeleeHitChance>
-							<AimingDelayFactor>-0.25</AimingDelayFactor>
-							<ShootingAccuracyPawn>+2.5</ShootingAccuracyPawn>
-						</statOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/More Archotech Garbage Continued/MAGC_Resource_Stuff.xml b/Patches/More Archotech Garbage Continued/MAGC_Resource_Stuff.xml
deleted file mode 100644
index f2137f8e4e..0000000000
--- a/Patches/More Archotech Garbage Continued/MAGC_Resource_Stuff.xml	
+++ /dev/null
@@ -1,60 +0,0 @@
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>More Archotech Garbage Continued</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="archotechmatteraddingsomecraptoavoidproblems"]/statBases</xpath>
-					<value>
-						<Bulk>0.01</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="archotechmatteraddingsomecraptoavoidproblems"]/stuffProps/categories</xpath>
-					<value>
-						<li>Metallic_Weapon</li>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="archotechmatteraddingsomecraptoavoidproblems"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>4</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="archotechmatteraddingsomecraptoavoidproblems"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>6</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="archotechmatteraddingsomecraptoavoidproblems"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>2</MeleePenetrationFactor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="archotechmatteraddingsomecraptoavoidproblems"]/statBases/SharpDamageMultiplier</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="archotechmatteraddingsomecraptoavoidproblems"]/statBases/BluntDamageMultiplier</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="archotechmatteraddingsomecraptoavoidproblems"]/statBases/ShootingAccuracyTurret</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/More Consumables And Mutagens/Bodies_Slime.xml b/Patches/More Consumables And Mutagens/Bodies_Slime.xml
deleted file mode 100644
index 99e5a2d66c..0000000000
--- a/Patches/More Consumables And Mutagens/Bodies_Slime.xml	
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>More Consumables and Mutagens Reworked</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Bleed Rates === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyPartDef[defName="SlimeBody"]</xpath>
-					<value>
-						<bleedRate>1.5</bleedRate>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyPartDef[defName="SlimeHeart"]/bleedRate</xpath>
-					<value>
-						<bleedRate>18.75</bleedRate>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/More Consumables And Mutagens/Hediffs_Mutations.xml b/Patches/More Consumables And Mutagens/Hediffs_Mutations.xml
deleted file mode 100644
index c6ba8e2c74..0000000000
--- a/Patches/More Consumables And Mutagens/Hediffs_Mutations.xml	
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>More Consumables and Mutagens Reworked</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Igni Arm === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="IgniArm"]/stages/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
-							<ArmorRating_Blunt>0.06</ArmorRating_Blunt>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="IgniArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Ursa Claws === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="UrsaClaws"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationSharp>0.066</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/More Consumables And Mutagens/Races_Slime.xml b/Patches/More Consumables And Mutagens/Races_Slime.xml
deleted file mode 100644
index 055f4a68a2..0000000000
--- a/Patches/More Consumables And Mutagens/Races_Slime.xml	
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>More Consumables and Mutagens Reworked</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Common === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="CMSlime" or defName="CMSlimeBlue" or defName="CMSlimeRed"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CMSlime" or defName="CMSlimeRed"]</xpath>
-					<value>
-						<damageMultipliers>
-							<li>
-								<damageDef>Bomb</damageDef>
-								<multiplier>1.2</multiplier>
-							</li>
-							<li>
-								<damageDef>Thermobaric</damageDef>
-								<multiplier>1.5</multiplier>
-							</li>
-						</damageMultipliers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CMSlimeBlue"]</xpath>
-					<value>
-						<damageMultipliers>
-							<li>
-								<damageDef>Bomb</damageDef>
-								<multiplier>2.66</multiplier>
-							</li>
-							<li>
-								<damageDef>Flame</damageDef>
-								<multiplier>3</multiplier>
-							</li>
-							<li>
-								<damageDef>Thermobaric</damageDef>
-								<multiplier>3.2</multiplier>
-							</li>
-						</damageMultipliers>
-					</value>
-				</li>
-
-				<!-- === Green Slime === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMSlime"]/statBases/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMSlime"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.55</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMSlime"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.35</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMSlime"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>6</baseHealthScale>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMSlime"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>0.66</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Blue Slime === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMSlimeBlue"]/statBases/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.45</MeleeDodgeChance>
-						<MeleeCritChance>0.66</MeleeCritChance>
-						<MeleeParryChance>0.5</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMSlimeBlue"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2.11</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMSlimeBlue"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.45</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMSlimeBlue"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>14</baseHealthScale>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMSlimeBlue"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2.1</cooldownTime>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>12</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Red Slime === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMSlimeRed"]/statBases/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.36</MeleeDodgeChance>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMSlimeRed"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.35</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMSlimeRed"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMSlimeRed"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>6</baseHealthScale>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMSlimeRed"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.66</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>8</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/More Medieval Helms and Armor/Apparel.xml b/Patches/More Medieval Helms and Armor/Apparel.xml
deleted file mode 100644
index fab0277f62..0000000000
--- a/Patches/More Medieval Helms and Armor/Apparel.xml	
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>More Medieval Helms and Armor</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Aketon =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Domi_Aketon"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Domi_Aketon"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Domi_Aketon"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Cloak =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Domi_Cloak"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Domi_Cloak"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Thick Cloak =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Domi_ThickCloak"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>1.85</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Domi_ThickCloak"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/More Medieval Helms and Armor/Armor.xml b/Patches/More Medieval Helms and Armor/Armor.xml
deleted file mode 100644
index 763226a5ae..0000000000
--- a/Patches/More Medieval Helms and Armor/Armor.xml	
+++ /dev/null
@@ -1,337 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>More Medieval Helms and Armor</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Breast Plate =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Domi_BrestPlate"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>4</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Domi_BrestPlate"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.0</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Lamellar Armor =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Domi_LamellarArmor"]/statBases</xpath>
-					<value>
-						<Bulk>25</Bulk>
-						<WornBulk>6</WornBulk>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-						<ArmorRating_Blunt>4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Domi_LamellarArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Domi_LamellarArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>0.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Domi_LamellarArmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Light Plate Mail =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Domi_LightPlateMail"]/statBases</xpath>
-					<value>
-						<Bulk>40</Bulk>
-						<WornBulk>6</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Domi_LightPlateMail"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Domi_LightPlateMail"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Domi_LightPlateMail"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Domi Plate Mail =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Domi_PlateMail"]/statBases</xpath>
-					<value>
-						<Bulk>70</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Domi_PlateMail"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Domi_PlateMail"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Domi_PlateMail"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeDodgeChance>-0.1</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Domi_PlateMail"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Domi_PlateMail"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Tabard =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Domi_Tabard"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Domi_Tabard"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Heavy Plate Armor =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Domi_KnightArmor"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>12</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Domi_KnightArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Domi_KnightArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Domi_KnightArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeDodgeChance>-0.18</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Domi_KnightArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Domi_KnightArmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/More Medieval Helms and Armor/Footwear.xml b/Patches/More Medieval Helms and Armor/Footwear.xml
deleted file mode 100644
index 93747c9d9a..0000000000
--- a/Patches/More Medieval Helms and Armor/Footwear.xml	
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>More Medieval Helms and Armor</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Work Boots =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Domi_WorkBoots"]/statBases</xpath>
-					<value>
-						<Bulk>1.5</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Domi_WorkBoots"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Light Plate Boots =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Domi_LightPlateBoots"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Domi_LightPlateBoots"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/More Medieval Helms and Armor/Handwear.xml b/Patches/More Medieval Helms and Armor/Handwear.xml
deleted file mode 100644
index 40b56c1a2e..0000000000
--- a/Patches/More Medieval Helms and Armor/Handwear.xml	
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>More Medieval Helms and Armor</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Work Glove =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Domi_WorkGloves"]/statBases</xpath>
-					<value>
-						<Bulk>1.5</Bulk>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Domi_WorkGloves"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Light Gauntlets =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Domi_LightGauntlets"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Domi_LightGauntlets"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.25</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Mitten Gauntlets =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Domi_MittenGauntlets"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Domi_MittenGauntlets"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.75</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/More Medieval Helms and Armor/Headgear.xml b/Patches/More Medieval Helms and Armor/Headgear.xml
deleted file mode 100644
index 432d1b056e..0000000000
--- a/Patches/More Medieval Helms and Armor/Headgear.xml	
+++ /dev/null
@@ -1,467 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>More Medieval Helms and Armor</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Improved Helmet =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Domi_ImprovedHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Domi_ImprovedHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Hood =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Domi_Hood"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Domi_Hood"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Thick Hood =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Domi_ThickHood"]/statBases</xpath>
-					<value>
-						<Bulk>1.5</Bulk>
-						<WornBulk>0.25</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Domi_ThickHood"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Spangen Helm A =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Domi_SpangenHelmA"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Domi_SpangenHelmA"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Spangen Helm B =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Domi_SpangenHelmB"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Domi_SpangenHelmB"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Domi_SpangenHelmB"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>-0.2</AimingAccuracy>
-							<MeleeHitChance>-1</MeleeHitChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Domi_SpangenHelmB"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Spangen Helm C =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Domi_SpangenHelmC"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Domi_SpangenHelmC"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Domi_SpangenHelmC"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>-0.2</AimingAccuracy>
-							<MeleeHitChance>-1</MeleeHitChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Domi_SpangenHelmC"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Morion Helmet =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Domi_MorionHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Domi_MorionHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Kettle Helmet =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Domi_KettleHat"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Domi_KettleHat"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Light Helmet =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Domi_PlateHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Domi_PlateHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.0</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Domi_PlateHelmet"]/equippedStatOffsets</xpath>
-				</li>
-
-				<!-- ========== Great Helm =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Domi_GreatHelm"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Domi_GreatHelm"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3.65</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Domi_GreatHelm"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>-0.5</AimingAccuracy>
-							<MeleeHitChance>-2.5</MeleeHitChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Domi_GreatHelm"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Sallet Helm A =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Domi_SalletHelmA"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Domi_SalletHelmA"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Domi_SalletHelmA"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>-0.3</AimingAccuracy>
-							<MeleeHitChance>-1</MeleeHitChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Domi_SalletHelmA"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Sallet Helm B =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Domi_SalletHelmB"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Domi_SalletHelmB"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Domi_SalletHelmB"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>-0.3</AimingAccuracy>
-							<MeleeHitChance>-1</MeleeHitChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Domi_SalletHelmB"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Sallet Helm C =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Domi_SalletHelmC"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Domi_SalletHelmC"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Domi_SalletHelmC"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>-0.3</AimingAccuracy>
-							<MeleeHitChance>-1</MeleeHitChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Domi_SalletHelmC"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Armet Helm =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Domi_ArmetHelm"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Domi_ArmetHelm"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Domi_ArmetHelm"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>-2</AimingAccuracy>
-							<MeleeHitChance>-1</MeleeHitChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Domi_ArmetHelm"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/More Medieval Helms and Armor/Leggings.xml b/Patches/More Medieval Helms and Armor/Leggings.xml
deleted file mode 100644
index da39ae6f48..0000000000
--- a/Patches/More Medieval Helms and Armor/Leggings.xml	
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>More Medieval Helms and Armor</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Light Leggings =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Domi_LightLeggings"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Domi_LightLeggings"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Domi_PlateLeggings =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Domi_PlateLeggings"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Domi_PlateLeggings"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/More Persona Traits/MorePersonaTraits_Patches.xml b/Patches/More Persona Traits/MorePersonaTraits_Patches.xml
deleted file mode 100644
index ea67b57455..0000000000
--- a/Patches/More Persona Traits/MorePersonaTraits_Patches.xml	
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>More Persona Traits</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MPT_MeleeWeapon_PsyfocusStaffBladelink"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.55</cooldownTime>
-								<armorPenetrationBlunt>1.95</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MPT_MeleeWeapon_PsyfocusStaffBladelink"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<MeleeCounterParryBonus>1.56</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MPT_MeleeWeapon_PsyfocusStaffBladelink"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.6</MeleeCritChance>
-						<MeleeParryChance>1.17</MeleeParryChance>
-						<MeleeDodgeChance>0.47</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/WeaponTraitDef[defName="MPT_Held_MeleeHitChanceUp"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeHitChance>1</MeleeHitChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/WeaponTraitDef[defName="MPT_Held_MeleeHitChanceDown"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeHitChance>-1</MeleeHitChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/WeaponTraitDef[defName="MPT_Held_ArmorRatingUp"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<ArmorRating_Sharp>2</ArmorRating_Sharp>
-							<ArmorRating_Blunt>2</ArmorRating_Blunt>
-							<ArmorRating_Heat>0.15</ArmorRating_Heat>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/WeaponTraitDef[defName="MPT_Held_ArmorRatingUp"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<ArmorRating_Sharp>2</ArmorRating_Sharp>
-							<ArmorRating_Blunt>2</ArmorRating_Blunt>
-							<ArmorRating_Heat>0.15</ArmorRating_Heat>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/WeaponTraitDef[defName="MPT_Held_MeleeDodgeChanceUp"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/WeaponTraitDef[defName="MPT_Held_MeleeDodgeChanceDown"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeDodgeChance>-0.5</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/More Practical Traits/TraitDefs/Traits_MPT.xml b/Patches/More Practical Traits/TraitDefs/Traits_MPT.xml
deleted file mode 100644
index 65727e75f6..0000000000
--- a/Patches/More Practical Traits/TraitDefs/Traits_MPT.xml	
+++ /dev/null
@@ -1,585 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>More Practical Traits</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!-- ========== V ========== -->
-
-						<!--Show Moe-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/TraitDef[defName="VanyaTA01mhgg"]/degreeDatas/li/statOffsets/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>12</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/TraitDef[defName="VanyaTA01mhgg"]/degreeDatas/li/statOffsets/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>18</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--Coordinator-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/TraitDef[defName="VanyaTB01tzz"]/degreeDatas/li/statFactors</xpath>
-							<value>
-								<SmokeSensitivity>0.95</SmokeSensitivity>
-							</value>
-						</li>
-
-						<!--Delicate-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/TraitDef[defName="VanyaTC01rrwg"]/degreeDatas/li/statOffsets/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>17.4</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--Range Telepathy-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/TraitDef[defName="VanyaTC03fwgz"]/degreeDatas/li/statFactors/ShootingAccuracyPawn</xpath>
-							<value>
-								<AimingAccuracy>1.5</AimingAccuracy>
-							</value>
-						</li>
-
-						<!--Gaoshi's Blessing-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/TraitDef[defName="VanyaTE01gsdzf"]/degreeDatas/li/statOffsets</xpath>
-							<value>
-								<SmokeSensitivity>-0.125</SmokeSensitivity>
-							</value>
-						</li>
-
-						<!--Bear-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/TraitDef[defName="VanyaTS01by"]/degreeDatas/li/statOffsets</xpath>
-							<value>
-								<SmokeSensitivity>-0.275</SmokeSensitivity>
-							</value>
-						</li>
-
-						<!-- ========== Sun ========== -->
-
-						<!--Cover Fire-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/TraitDef[defName="PTA01hlzy"]/degreeDatas/li/statOffsets/ShootingAccuracyPawn</xpath>
-							<value>
-								<ShootingAccuracyPawn>0.2</ShootingAccuracyPawn>
-								<AimingAccuracy>0.1</AimingAccuracy>
-								<ReloadSpeed>0.1</ReloadSpeed>
-								<Suppressability>-0.1</Suppressability>
-							</value>
-						</li>
-
-						<!--Excellent nursing-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/TraitDef[defName="PTA10zyhl"]/degreeDatas/li/statOffsets</xpath>
-							<value>
-								<Suppressability>-0.10</Suppressability>
-							</value>
-						</li>
-
-						<!--Brave-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/TraitDef[defName="PTA14yg"]/degreeDatas/li/statOffsets</xpath>
-							<value>
-								<Suppressability>-0.50</Suppressability>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/TraitDef[defName="PTA14yg"]/degreeDatas/li/label</xpath>
-							<value>
-								<label>&lt;color=#33ff00&gt;Valiant&lt;/color&gt;</label>
-							</value>
-						</li>
-
-						<!--Strong-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/TraitDef[defName="PTA15qz"]/degreeDatas/li/statFactors</xpath>
-							<value>
-								<CarryWeight>1.8</CarryWeight>
-							</value>
-						</li>
-
-						<!--Lumberjack-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/TraitDef[defName="PTA18fmg"]/degreeDatas/li/statOffsets</xpath>
-							<value>
-								<CarryWeight>8</CarryWeight>
-								<CarryBulk>8</CarryBulk>
-							</value>
-						</li>
-
-						<!--Handyman-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/TraitDef[defName="PTA19zg"]/degreeDatas/li/statOffsets</xpath>
-							<value>
-								<CarryWeight>6</CarryWeight>
-								<CarryBulk>6</CarryBulk>
-							</value>
-						</li>
-
-						<!--Hunter-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/TraitDef[defName="PTA24lr"]/degreeDatas/li/statFactors/ShootingAccuracyPawn</xpath>
-							<value>
-								<ShootingAccuracyPawn>1.20</ShootingAccuracyPawn>
-								<AimingAccuracy>1.10</AimingAccuracy>
-							</value>
-						</li>
-
-						<!--Ranger-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/TraitDef[defName="PTB01jb"]/degreeDatas/li/statOffsets</xpath>
-							<value>
-								<Suppressability>-0.15</Suppressability>
-							</value>
-						</li>
-
-						<!--Impregnable defense-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/TraitDef[defName="PTB02tb"]/degreeDatas/li/statOffsets/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>3.2</ArmorRating_Sharp>
-								<Suppressability>-0.25</Suppressability>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/TraitDef[defName="PTB02tb"]/degreeDatas/li/statOffsets/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>4.8</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--Seasoned-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/TraitDef[defName="PTB05ll"]/degreeDatas/li/statFactors</xpath>
-							<value>
-								<Suppressability>0.90</Suppressability>
-							</value>
-						</li>
-
-						<!--Cool Headed-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/TraitDef[defName="PTB06lc"]/degreeDatas/li/statFactors</xpath>
-							<value>
-								<AimingAccuracy>1.2</AimingAccuracy>
-								<Suppressability>0.95</Suppressability>
-							</value>
-						</li>
-
-						<!--Assassin-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/TraitDef[defName="PTB22ck"]/degreeDatas/li/statFactors</xpath>
-							<value>
-								<MeleeCritChance>1.3</MeleeCritChance>
-							</value>
-						</li>
-
-						<!--Executioner-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/TraitDef[defName="PTB23gzs"]/degreeDatas/li/statOffsets</xpath>
-							<value>
-								<CarryWeight>10</CarryWeight>
-								<CarryBulk>10</CarryBulk>
-							</value>
-						</li>
-
-						<!--Martial Arts-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/TraitDef[defName="PTB25wx"]/degreeDatas/li</xpath>
-							<value>
-								<statOffsets>
-									<UnarmedDamage>5</UnarmedDamage>
-								</statOffsets>
-							</value>
-						</li>
-
-						<!--Clone-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/TraitDef[defName="PTB27qhr"]/degreeDatas/li/statOffsets/ShootingAccuracyPawn</xpath>
-							<value>
-								<ShootingAccuracyPawn>0.8</ShootingAccuracyPawn>
-								<AimingAccuracy>0.4</AimingAccuracy>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/TraitDef[defName="PTB27qhr"]/degreeDatas/li/statOffsets/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>0.7</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<!--Drilling Expert-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/TraitDef[defName="PTC02wjj"]/degreeDatas/li/statOffsets</xpath>
-							<value>
-								<CarryWeight>5</CarryWeight>
-								<CarryBulk>5</CarryBulk>
-							</value>
-						</li>
-
-						<!--Sower of life-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/TraitDef[defName="PTC04smcbz"]/degreeDatas/li/statOffsets</xpath>
-							<value>
-								<SmokeSensitivity>-0.25</SmokeSensitivity>
-							</value>
-						</li>
-
-						<!--Professional doctor-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/TraitDef[defName="PTC07yl"]/degreeDatas/li/statOffsets</xpath>
-							<value>
-								<Suppressability>-0.10</Suppressability>
-							</value>
-						</li>
-
-						<!--Speeding-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/TraitDef[defName="PTC10cgs"]/degreeDatas/li/statOffsets/ShootingAccuracyPawn</xpath>
-							<value>
-								<ShootingAccuracyPawn>-0.4</ShootingAccuracyPawn>
-								<AimingAccuracy>-0.2</AimingAccuracy>
-							</value>
-						</li>
-
-						<!--Peerless immunity-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/TraitDef[defName="PTC11bdbq"]/degreeDatas/li/statOffsets</xpath>
-							<value>
-								<SmokeSensitivity>-0.50</SmokeSensitivity>
-							</value>
-						</li>
-
-						<!--Arms Dealer-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/TraitDef[defName="PTC12jhsr"]/degreeDatas/li/statOffsets/ShootingAccuracyPawn</xpath>
-							<value>
-								<ShootingAccuracyPawn>0.5</ShootingAccuracyPawn>
-								<AimingAccuracy>0.25</AimingAccuracy>
-							</value>
-						</li>
-
-						<!--Punisher-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/TraitDef[defName="PTC13cjz"]/degreeDatas/li/statOffsets/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>5.6</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/TraitDef[defName="PTC13cjz"]/degreeDatas/li/statOffsets</xpath>
-							<value>
-								<Suppressability>-0.25</Suppressability>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/TraitDef[defName="PTC13cjz"]/degreeDatas/li/statFactors</xpath>
-							<value>
-								<MeleeCritChance>1.05</MeleeCritChance>
-								<MeleeParryChance>1.15</MeleeParryChance>
-								<AimingAccuracy>1.175</AimingAccuracy>
-							</value>
-						</li>
-
-						<!--New Type-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/TraitDef[defName="PTC17xrl"]/degreeDatas/li/statFactors</xpath>
-							<value>
-								<AimingAccuracy>1.225</AimingAccuracy>
-							</value>
-						</li>
-
-						<!--Yandere-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/TraitDef[defName="PTD01bj"]/degreeDatas/li/statFactors</xpath>
-							<value>
-								<Suppressability>0</Suppressability>
-							</value>
-						</li>
-
-						<!--Mukuchi-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/TraitDef[defName="PTD02sw"]/degreeDatas/li/statFactors</xpath>
-							<value>
-								<Suppressability>0.5</Suppressability>
-							</value>
-						</li>
-
-						<!--Cass's handbook-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/TraitDef[defName="PTE03csdsc"]/degreeDatas/li/statOffsets/ShootingAccuracyPawn</xpath>
-							<value>
-								<ShootingAccuracyPawn>-0.4</ShootingAccuracyPawn>
-								<AimingAccuracy>-0.2</AimingAccuracy>
-							</value>
-						</li>
-
-						<!--Oxana's thoughts-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/TraitDef[defName="PTE04aksndgw"]/degreeDatas/li/statOffsets/ShootingAccuracyPawn</xpath>
-							<value>
-								<ShootingAccuracyPawn>0.4</ShootingAccuracyPawn>
-								<AimingAccuracy>0.2</AimingAccuracy>
-							</value>
-						</li>
-
-						<!--Kevin's ideas-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/TraitDef[defName="PTE05kwdxd"]/degreeDatas/li/statOffsets</xpath>
-							<value>
-								<SmokeSensitivity>-0.15</SmokeSensitivity>
-							</value>
-						</li>
-
-						<!--Red moon-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/TraitDef[defName="PTF01hy"]/degreeDatas/li/statOffsets/ShootingAccuracyPawn</xpath>
-							<value>
-								<ShootingAccuracyPawn>0.6</ShootingAccuracyPawn>
-								<AimingAccuracy>0.3</AimingAccuracy>
-								<Suppressability>-0.25</Suppressability>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/TraitDef[defName="PTF01hy"]/degreeDatas/li/statOffsets/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>7.2</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<!--Warrior of the sun-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/TraitDef[defName="PTF02tyqs"]/degreeDatas/li/statOffsets/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>8</ArmorRating_Sharp>
-								<Suppressability>-0.25</Suppressability>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/TraitDef[defName="PTF02tyqs"]/degreeDatas/li/statOffsets/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>12</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/TraitDef[defName="PTF02tyqs"]/degreeDatas/li/statFactors</xpath>
-							<value>
-								<MeleeCritChance>1.5</MeleeCritChance>
-								<MeleeParryChance>1.5</MeleeParryChance>
-							</value>
-						</li>
-
-						<!--Doomsday Boxer-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/TraitDef[defName="PTF03mrqw"]/degreeDatas/li/statOffsets/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>0.6</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/TraitDef[defName="PTF03mrqw"]/degreeDatas/li/statOffsets/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>7.2</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/TraitDef[defName="PTF03mrqw"]/degreeDatas/li/statOffsets</xpath>
-							<value>
-								<MeleeCritChance>0.03</MeleeCritChance>
-								<MeleeParryChance>0.0375</MeleeParryChance>
-								<UnarmedDamage>20</UnarmedDamage>
-								<Suppressability>-0.25</Suppressability>
-								<SmokeSensitivity>-0.3</SmokeSensitivity>
-							</value>
-						</li>
-
-						<!--Swordmaster of Squin-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/TraitDef[defName="PTF04skjs"]/degreeDatas/li/statOffsets/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>8.4</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/TraitDef[defName="PTF04skjs"]/degreeDatas/li/statOffsets</xpath>
-							<value>
-								<Suppressability>-0.25</Suppressability>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/TraitDef[defName="PTF04skjs"]/degreeDatas/li/statFactors</xpath>
-							<value>
-								<MeleeCritChance>1.05</MeleeCritChance>
-								<MeleeParryChance>1.15</MeleeParryChance>
-							</value>
-						</li>
-
-						<!--Diligent fighter-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/TraitDef[defName="PTS01yz"]/degreeDatas/li/statOffsets/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>6</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/TraitDef[defName="PTS01yz"]/degreeDatas/li/statOffsets/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>8.8</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/TraitDef[defName="PTS01yz"]/degreeDatas/li/statOffsets/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>0.8</MeleeDodgeChance>
-								<MeleeCritChance>0.04</MeleeCritChance>
-								<MeleeParryChance>0.05</MeleeParryChance>
-								<Suppressability>-0.75</Suppressability>
-							</value>
-						</li>
-
-						<!--Ranged reaper-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/TraitDef[defName="PTS02ss"]/degreeDatas/li/statOffsets/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>8.8</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/TraitDef[defName="PTS02ss"]/degreeDatas/li/statOffsets/ShootingAccuracyPawn</xpath>
-							<value>
-								<ShootingAccuracyPawn>0.8</ShootingAccuracyPawn>
-								<AimingAccuracy>0.4</AimingAccuracy>
-								<ReloadSpeed>0.2</ReloadSpeed>
-								<Suppressability>-0.50</Suppressability>
-							</value>
-						</li>
-
-						<!--Child of nature-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/TraitDef[defName="PTS04zrzz"]/degreeDatas/li/statOffsets/ShootingAccuracyPawn</xpath>
-							<value>
-								<ShootingAccuracyPawn>-0.7</ShootingAccuracyPawn>
-								<AimingAccuracy>-0.35</AimingAccuracy>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/TraitDef[defName="PTS04zrzz"]/degreeDatas/li/statFactors</xpath>
-							<value>
-								<AimingAccuracy>1.35</AimingAccuracy>
-							</value>
-						</li>
-
-						<!--Whirlwind-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/TraitDef[defName="PTS05jf"]/degreeDatas/li/statOffsets/ShootingAccuracyPawn</xpath>
-							<value>
-								<ShootingAccuracyPawn>-1.2</ShootingAccuracyPawn>
-								<AimingAccuracy>-0.6</AimingAccuracy>
-								<SmokeSensitivity>-0.2</SmokeSensitivity>
-							</value>
-						</li>
-
-						<!--The prophet-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/TraitDef[defName="PTS06fkzs"]/degreeDatas/li/statOffsets/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>1.3</MeleeDodgeChance>
-								<MeleeParryChance>0.65</MeleeParryChance>
-								<Suppressability>-0.50</Suppressability>
-								<SmokeSensitivity>-0.325</SmokeSensitivity>
-							</value>
-						</li>
-
-						<!--The Master-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/TraitDef[defName="PTS07ds"]/degreeDatas/li/statOffsets</xpath>
-							<value>
-								<Suppressability>-0.75</Suppressability>
-								<SmokeSensitivity>-0.25</SmokeSensitivity>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/TraitDef[defName="PTS07ds"]/degreeDatas/li/statFactors</xpath>
-							<value>
-								<MeleeParryChance>1.5</MeleeParryChance>
-							</value>
-						</li>
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/More Psycasts/AbilitiesPatch.xml b/Patches/More Psycasts/AbilitiesPatch.xml
deleted file mode 100644
index 2719e35747..0000000000
--- a/Patches/More Psycasts/AbilitiesPatch.xml	
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>More Psycasts</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AbilityDef[defName="MorePsycasts_HaulSkip"]/verbProperties/range</xpath>
-					<value>
-						<range>6</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AbilityDef[defName="MorePsycasts_Ignite"]/verbProperties/range</xpath>
-					<value>
-						<range>12</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AbilityDef[defName="MorePsycasts_Mending"]/verbProperties/range</xpath>
-					<value>
-						<range>17</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AbilityDef[defName="MorePsycasts_FertilitySkip"]/verbProperties/range</xpath>
-					<value>
-						<range>17</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AbilityDef[
-						defName="MorePsycasts_ArcticPinhole" or
-						defName="MorePsycasts_CleanSkip"]/verbProperties/range </xpath>
-					<value>
-						<range>28</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AbilityDef[defName="MorePsycasts_FlashHeal"]/verbProperties/range</xpath>
-					<value>
-						<range>32</range>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/More Utility Packs/Apparel_Mechanoids.xml b/Patches/More Utility Packs/Apparel_Mechanoids.xml
deleted file mode 100644
index b0b93ddfa8..0000000000
--- a/Patches/More Utility Packs/Apparel_Mechanoids.xml	
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>More Utility Packs</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Factions Expanded - Mechanoids</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<!-- Quality Comp -->
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[
-							defName="SGC_Apparel_CombatMechPack" or
-							defName="SGC_Apparel_INDMechPack"
-							]/comps/li/compClass[.="CompQuality"] </xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="SGC_Apparel_CombatMechPack" or defName="SGC_Apparel_INDMechPack"]/comps</xpath>
-							<value>
-								<li>
-									<compClass>CompQuality</compClass>
-								</li>
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[
-							defName="SGC_Apparel_CombatMechPack" or
-							defName="SGC_Apparel_INDMechPack"
-							]/apparel/layers </xpath>
-						<value>
-							<li>Backpack</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName = "SGC_Apparel_CombatMechPack"]/statBases/EnergyShieldRechargeRate</xpath>
-						<value>
-							<EnergyShieldRechargeRate>0.225</EnergyShieldRechargeRate>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName = "SGC_Apparel_CombatMechPack"]/statBases/EnergyShieldEnergyMax</xpath>
-						<value>
-							<EnergyShieldEnergyMax>1.95</EnergyShieldEnergyMax>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "SGC_Apparel_INDMechPack"]/statBases</xpath>
-						<value>
-							<Bulk>9</Bulk>
-							<WornBulk>6</WornBulk>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/More Utility Packs/Apparel_Packs.xml b/Patches/More Utility Packs/Apparel_Packs.xml
deleted file mode 100644
index 98b0f33715..0000000000
--- a/Patches/More Utility Packs/Apparel_Packs.xml	
+++ /dev/null
@@ -1,285 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>More Utility Packs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Quality Comp -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[
-						defName="SGC_Apparel_RoboticRig" or
-						defName="SGC_Apparel_TraumaKit" or
-						defName="SGC_Apparel_FieldMortar"
-						]/comps/li/compClass[.="CompQuality"] </xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="SGC_Apparel_RoboticRig" or defName="SGC_Apparel_TraumaKit" or defName="SGC_Apparel_FieldMortar"]/comps</xpath>
-						<value>
-							<li>
-								<compClass>CompQuality</compClass>
-							</li>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="SGC_Apparel_RescueFrame"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="SGC_Apparel_RescueFrame"]</xpath>
-						<value>
-							<comps>
-								<li>
-									<compClass>CompQuality</compClass>
-								</li>
-							</comps>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="SGC_Apparel_RescueFrame"]/comps</xpath>
-						<value>
-							<li>
-								<compClass>CompQuality</compClass>
-							</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VAE_Accessories.CaravanCapacityApparelDef[defName="SGC_Apparel_Forklift"]/comps/li/compClass[.="CompQuality"]</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VAE_Accessories.CaravanCapacityApparelDef[defName="SGC_Apparel_Forklift"]/comps</xpath>
-						<value>
-							<li>
-								<compClass>CompQuality</compClass>
-							</li>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VAE_Accessories.CaravanCapacityApparelDef[defName="SGC_Apparel_SurvivalPack"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VAE_Accessories.CaravanCapacityApparelDef[defName="SGC_Apparel_SurvivalPack"]</xpath>
-						<value>
-							<comps>
-								<li>
-									<compClass>CompQuality</compClass>
-								</li>
-							</comps>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/VAE_Accessories.CaravanCapacityApparelDef[defName="SGC_Apparel_SurvivalPack"]/comps</xpath>
-						<value>
-							<li>
-								<compClass>CompQuality</compClass>
-							</li>
-						</value>
-					</match>
-				</li>
-
-				<!-- Change Layer -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="SGC_Apparel_RoboticRig" or
-						defName="SGC_Apparel_TraumaKit" or
-						defName="SGC_Apparel_SurvivalPack" or
-						defName="SGC_Apparel_RescueFrame" or
-						defName="SGC_Apparel_FieldMortar"
-						]/apparel/layers </xpath>
-					<value>
-						<li>Backpack</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VAE_Accessories.CaravanCapacityApparelDef[
-						defName="SGC_Apparel_Forklift" or
-						defName="SGC_Apparel_SurvivalPack"
-						]/apparel/layers </xpath>
-					<value>
-						<li>Backpack</li>
-					</value>
-				</li>
-
-				<!-- Robot Rig -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "SGC_Apparel_RoboticRig"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>7</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "SGC_Apparel_RoboticRig"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>15</CarryBulk>
-						<CarryWeight>25</CarryWeight>
-					</value>
-				</li>
-
-				<!-- Medical Bag -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "SGC_Apparel_TraumaKit"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "SGC_Apparel_TraumaKit"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>20</CarryBulk>
-					</value>
-				</li>
-
-				<!-- Survival Pack -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VAE_Accessories.CaravanCapacityApparelDef[defName = "SGC_Apparel_SurvivalPack"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VAE_Accessories.CaravanCapacityApparelDef[defName = "SGC_Apparel_SurvivalPack"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>25</CarryBulk>
-					</value>
-				</li>
-
-				<!-- Rescue Frame -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "SGC_Apparel_RescueFrame"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<WornBulk>8</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "SGC_Apparel_RescueFrame"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>10</CarryBulk>
-						<CarryWeight>20</CarryWeight>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "SGC_Apparel_RescueFrame"]/statBases/EnergyShieldRechargeRate</xpath>
-					<value>
-						<EnergyShieldRechargeRate>0.75</EnergyShieldRechargeRate>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "SGC_Apparel_RescueFrame"]/statBases/EnergyShieldEnergyMax</xpath>
-					<value>
-						<EnergyShieldEnergyMax>9.0</EnergyShieldEnergyMax>
-					</value>
-				</li>
-
-				<!-- Forklift Rig -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VAE_Accessories.CaravanCapacityApparelDef[defName = "SGC_Apparel_Forklift"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>7</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VAE_Accessories.CaravanCapacityApparelDef[defName = "SGC_Apparel_Forklift"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>15</CarryBulk>
-						<CarryWeight>100</CarryWeight>
-					</value>
-				</li>
-
-				<!-- Mortar Pack -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="SGC_Apparel_FieldMortar"]/equippedStatOffsets</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SGC_Apparel_FieldMortar"]/comps/li[@Class="CompProperties_Reloadable"]/ammoDef</xpath>
-					<value>
-						<ammoDef>Shell_60mmMortar_HE</ammoDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SGC_Apparel_FieldMortar"]/comps/li[@Class="CompProperties_Reloadable"]/maxCharges</xpath>
-					<value>
-						<maxCharges>3</maxCharges>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SGC_Apparel_FieldMortar"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountPerCharge</xpath>
-					<value>
-						<ammoCountPerCharge>1</ammoCountPerCharge>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SGC_Apparel_FieldMortar"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Charges">
-							<chargeSpeeds>
-								<li>30</li>
-								<li>50</li>
-								<li>70</li>
-								<li>90</li>
-							</chargeSpeeds>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SGC_Apparel_FieldMortar"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<label>launch 60mm shell</label>
-								<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<onlyManualCast>True</onlyManualCast>
-								<warmupTime>2</warmupTime>
-								<range>40</range>
-								<minRange>5</minRange>
-								<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-								<soundCast>Mortar_LaunchA</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>14</muzzleFlashScale>
-								<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-								<defaultProjectile>Bullet_60mmMortarShell_HE</defaultProjectile>
-								<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/More Utility Packs/Apparel_Royalty.xml b/Patches/More Utility Packs/Apparel_Royalty.xml
deleted file mode 100644
index a5d0f8d031..0000000000
--- a/Patches/More Utility Packs/Apparel_Royalty.xml	
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>More Utility Packs</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Royalty</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<!-- Quality Comp -->
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[
-							defName="SGC_Apparel_Jetpack" or
-							defName="SGC_Apparel_CommandTower"
-							]/comps/li/compClass[.="CompQuality"] </xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="SGC_Apparel_Jetpack" or defName="SGC_Apparel_CommandTower"]/comps</xpath>
-							<value>
-								<li>
-									<compClass>CompQuality</compClass>
-								</li>
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[
-							defName="SGC_Apparel_Jetpack" or
-							defName="SGC_Apparel_CommandTower"
-							]/apparel/layers </xpath>
-						<value>
-							<li>Backpack</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="SGC_Apparel_Jetpack"]/statBases/EnergyShieldRechargeRate</xpath>
-						<value>
-							<EnergyShieldRechargeRate>0.375</EnergyShieldRechargeRate>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="SGC_Apparel_Jetpack"]/statBases/EnergyShieldEnergyMax</xpath>
-						<value>
-							<EnergyShieldEnergyMax>3.75</EnergyShieldEnergyMax>
-						</value>
-					</li>
-
-					<li Class="PatchOperationFindMod">
-						<mods>
-							<li>Vanilla Factions Expanded - Mechanoids</li>
-						</mods>
-						<match Class="PatchOperationSequence">
-							<operations>
-
-								<li Class="PatchOperationAdd">
-									<xpath>Defs/ThingDef[defName="SGC_Apparel_MechJet"]/apparel/layers</xpath>
-									<value>
-										<li>Backpack</li>
-									</value>
-								</li>
-
-								<!-- Quality Comp -->
-
-								<li Class="PatchOperationConditional">
-									<xpath>Defs/ThingDef[defName="SGC_Apparel_MechJet"]/comps/li/compClass[.="CompQuality"]</xpath>
-									<nomatch Class="PatchOperationAdd">
-										<xpath>Defs/ThingDef[defName="SGC_Apparel_MechJet"]/comps</xpath>
-										<value>
-											<li>
-												<compClass>CompQuality</compClass>
-											</li>
-										</value>
-									</nomatch>
-								</li>
-
-								<li Class="PatchOperationReplace">
-									<xpath>Defs/ThingDef[defName = "SGC_Apparel_MechJet"]/statBases/EnergyShieldRechargeRate</xpath>
-									<value>
-										<EnergyShieldRechargeRate>0.45</EnergyShieldRechargeRate>
-									</value>
-								</li>
-
-								<li Class="PatchOperationReplace">
-									<xpath>Defs/ThingDef[defName = "SGC_Apparel_MechJet"]/statBases/EnergyShieldEnergyMax</xpath>
-									<value>
-										<EnergyShieldEnergyMax>4.5</EnergyShieldEnergyMax>
-									</value>
-								</li>
-
-							</operations>
-						</match>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/More Vanilla Turrets/MVT_CE_Patch_Ammo_Shells.xml b/Patches/More Vanilla Turrets/MVT_CE_Patch_Ammo_Shells.xml
deleted file mode 100644
index 2552b4bb7d..0000000000
--- a/Patches/More Vanilla Turrets/MVT_CE_Patch_Ammo_Shells.xml	
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>More Vanilla Turrets 1.1+</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Define 81mm plasma mortar shell and unique ammoset for Devastator Mortar ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_81mmMortarShell_Plasma</defName>
-							<label>81mm mortar shells</label>
-							<ammoTypes>
-								<Shell_Plasma>Bullet_81mmMortarShell_Plasma</Shell_Plasma>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBaseCraftableBase">
-							<defName>Shell_Plasma</defName>
-							<label>81mm mortar shell (Plasma)</label>
-							<graphicData>
-								<texPath>ThirdParty/More Vanilla Turrets/PlasmaMortarShell</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>237</MarketValue>
-								<Mass>6.5</Mass>
-								<Bulk>8.17</Bulk>
-							</statBases>
-							<ammoClass>Plasma</ammoClass>
-							<detonateProjectile>Bullet_81mmMortarShell_Plasma</detonateProjectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base81mmMortarShell">
-							<defName>Bullet_81mmMortarShell_Plasma</defName>
-							<label>81mm mortar shell (Plasma)</label>
-							<graphicData>
-								<texPath>ThirdParty/More Vanilla Turrets/PlasmaMortarProj</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>524</damageAmountBase>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0</armorPenetrationBlunt>
-								<explosionRadius>5</explosionRadius>
-								<flyOverhead>true</flyOverhead>
-								<explosionChanceToStartFire>0.75</explosionChanceToStartFire>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<explosionEffect>GiantExplosion</explosionEffect>
-								<soundExplode>Explosion_GiantBomb</soundExplode>
-							</projectile>
-						</ThingDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeShell_Plasma</defName>
-							<label>make 81mm Plasma mortar shells x5</label>
-							<description>Craft 5 81mm Plasma mortar shells.</description>
-							<jobString>Making 81mm Plasma mortar shells.</jobString>
-							<workAmount>49200</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>120</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Plasteel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Shell_Plasma>5</Shell_Plasma>
-							</products>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/More Vanilla Turrets/MVT_CE_Patch_Buildings_Security.xml b/Patches/More Vanilla Turrets/MVT_CE_Patch_Buildings_Security.xml
deleted file mode 100644
index 89eb909c33..0000000000
--- a/Patches/More Vanilla Turrets/MVT_CE_Patch_Buildings_Security.xml	
+++ /dev/null
@@ -1,731 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>More Vanilla Turrets 1.1+</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Gun Complex ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_GunComplex</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.59</SwayFactor>
-						<Bulk>18.54</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.83</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>86</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<muzzleFlashScale>18</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_303British</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GunComplex"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>86</specialDisplayRadius>
-					</value>
-				</li>
-
-				<!-- ========== Rocket Complex ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_RocketComplex</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.23</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>2.16</SwayFactor>
-						<Bulk>14.71</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_83mmSMAW_HEAT</defaultProjectile>
-						<warmupTime>2.09</warmupTime>
-						<range>58</range>
-						<minRange>3</minRange>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>30</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>8.6</reloadTime>
-						<ammoSet>AmmoSet_83mmSMAW</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RocketComplex"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>48</specialDisplayRadius>
-					</value>
-				</li>
-
-				<!-- ========== Military Grade Turret ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_TurretMilitary</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>2.13</SwayFactor>
-						<Bulk>37.08</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.84</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>54</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>20</burstShotCount>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>200</magazineSize>
-						<reloadTime>15.6</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MilitaryTurretGun"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>86</specialDisplayRadius>
-					</value>
-				</li>
-
-				<!-- ========== Manned Military Grade Turret ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_TurretMilitaryManned</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>2.13</SwayFactor>
-						<Bulk>37.08</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.84</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>54</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>20</burstShotCount>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>200</magazineSize>
-						<reloadTime>15.6</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>10</aimedBurstShotCount>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MilitaryTurretGunManned"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>86</specialDisplayRadius>
-					</value>
-				</li>
-
-				<!-- ========== Shredder Turret ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_TurretShredder</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>2.02</SwayFactor>
-						<Bulk>10.66</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.34</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<burstShotCount>5</burstShotCount>
-						<soundCast>Shot_Shotgun_NoRack</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>18</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-						<requireLineOfSight>false</requireLineOfSight>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ShredderTurretGun"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>20</specialDisplayRadius>
-					</value>
-				</li>
-
-				<!-- ========== Manned Shredder Turret ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_TurretShredderManned</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>2.02</SwayFactor>
-						<Bulk>10.66</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.34</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<burstShotCount>5</burstShotCount>
-						<soundCast>Shot_Shotgun_NoRack</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>18</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-						<requireLineOfSight>false</requireLineOfSight>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ShredderTurretGunManned"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>20</specialDisplayRadius>
-					</value>
-				</li>
-
-				<!-- ========== Precision Turret ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_TurretPrecision</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.2</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>28.72</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.38</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_145x114mm_FMJ</defaultProjectile>
-						<warmupTime>1.4</warmupTime>
-						<range>89</range>
-						<soundCast>Shot_SniperRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<muzzleFlashScale>45</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_145x114mm</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PrecisionTurretGun"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>89</specialDisplayRadius>
-					</value>
-				</li>
-
-				<!-- ========== Manned Precision Turret ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_TurretPrecisionManned</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>28.72</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.38</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_145x114mm_FMJ</defaultProjectile>
-						<warmupTime>1.4</warmupTime>
-						<range>89</range>
-						<soundCast>Shot_SniperRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<muzzleFlashScale>45</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_145x114mm</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PrecisionTurretGunManned"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>89</specialDisplayRadius>
-					</value>
-				</li>
-
-				<!-- ========== Blast Turret ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_BlastCharge</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>0.99</SwayFactor>
-						<Bulk>12.9</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.21</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_40x53mmGrenade_HE</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>40</range>
-						<minRange>5</minRange>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>3</burstShotCount>
-						<soundCast>Mortar_LaunchA</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>20</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>48</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_40x53mmGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BlastTurretGun"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>40</specialDisplayRadius>
-					</value>
-				</li>
-
-				<!-- ========== Manned Blast Turret ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_BlastChargeManned</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>0.99</SwayFactor>
-						<Bulk>12.9</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.21</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_40x53mmGrenade_HE</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>40</range>
-						<minRange>5</minRange>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>4</burstShotCount>
-						<soundCast>Mortar_LaunchA</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>20</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>48</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_40x53mmGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BlastTurretGunManned"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>40</specialDisplayRadius>
-					</value>
-				</li>
-
-				<!-- ========== Vulcan Cannon ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_VulcanCannon</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.20</SwayFactor>
-						<Bulk>20.27</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.80</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_20x102mmNATO_Sabot</defaultProjectile>
-						<warmupTime>4.1</warmupTime>
-						<range>62</range>
-						<minRange>6</minRange>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<burstShotCount>40</burstShotCount>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>6</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>375</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_20x102mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>20</aimedBurstShotCount>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VulcanCannon"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>62</specialDisplayRadius>
-					</value>
-				</li>
-
-				<!-- ========== Manned Vulcan Cannon ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_VulcanCannonManned</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.20</SwayFactor>
-						<Bulk>20.27</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.80</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_20x102mmNATO_Sabot</defaultProjectile>
-						<warmupTime>4.1</warmupTime>
-						<range>62</range>
-						<minRange>4</minRange>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<burstShotCount>40</burstShotCount>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>6</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>375</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_20x102mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>20</aimedBurstShotCount>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VulcanCannonManned"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>62</specialDisplayRadius>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="VulcanCannon" or
-						defName="VulcanCannonManned"
-						]/passability </xpath>
-					<value>
-						<!-- Turrets must be passable to allow reloading -->
-						<passability>PassThroughOnly</passability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="VulcanCannon" or
-						defName="VulcanCannonManned"
-						] </xpath>
-					<value>
-						<!-- Workaround to replace passability=Impassable -->
-						<pathCost>200</pathCost>
-					</value>
-				</li>
-
-				<!-- ========== Devastator Mortar ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Artillery_DevastatorBomb</defName>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-						<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_81mmMortarShell_Plasma</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<minRange>20</minRange>
-						<range>500</range>
-						<burstShotCount>5</burstShotCount>
-						<soundCast>ChargeLance_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>55</muzzleFlashScale>
-						<circularError>1.2</circularError>
-						<requireLineOfSight>false</requireLineOfSight>
-						<indirectFirePenalty>0.3</indirectFirePenalty>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_81mmMortarShell_Plasma</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Artillery_DevastatorBomb"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Charges">
-							<chargeSpeeds>
-								<li>30</li>
-								<li>50</li>
-								<li>70</li>
-								<li>90</li>
-							</chargeSpeeds>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_DevastatorMortarBomb"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>15</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_81mmMortarShell_Plasma"]/graphicData/texPath</xpath>
-					<value>
-						<texPath>Things/Building/Security/DevastatorShell</texPath>
-					</value>
-				</li>
-
-				<!--<li Class="PatchOperationAdd">
-				<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_81mmMortarShell"]/ammoTypes</xpath>
-				<value>
-					<Shell_Plasma>Bullet_81mmMortarShell_Plasma</Shell_Plasma>
-				</value>
-			</li>-->
-
-				<!-- ========== Common to many or all Turrets ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="GunComplex" or
-						defName="RocketComplex" or
-						defName="MilitaryTurretGun" or
-						defName="MilitaryTurretGunManned" or
-						defName="ShredderTurretGun" or
-						defName="ShredderTurretGunManned" or
-						defName="PrecisionTurretGun" or
-						defName="PrecisionTurretGunManned" or
-						defName="BlastTurretGun" or
-						defName="BlastTurretGunManned" or
-						defName="VulcanCannon" or
-						defName="VulcanCannonManned" or
-						defName="Turret_DevastatorMortarBomb"
-						]/thingClass </xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="MilitaryTurretGun" or
-						defName="MilitaryTurretGunManned" or
-						defName="ShredderTurretGun" or
-						defName="ShredderTurretGunManned" or
-						defName="PrecisionTurretGun" or
-						defName="PrecisionTurretGunManned" or
-						defName="BlastTurretGun" or
-						defName="BlastTurretGunManned"
-						]/fillPercent </xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="GunComplex" or
-						defName="RocketComplex" or
-						defName="MilitaryTurretGun" or
-						defName="MilitaryTurretGunManned" or
-						defName="ShredderTurretGun" or
-						defName="ShredderTurretGunManned" or
-						defName="PrecisionTurretGun" or
-						defName="PrecisionTurretGunManned" or
-						defName="BlastTurretGun" or
-						defName="BlastTurretGunManned" or
-						defName="VulcanCannon" or
-						defName="VulcanCannonManned"
-						]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
-				</li>
-				<!--
-			<li Class="PatchOperationRemove">
-				<xpath>Defs/ThingDef[defName="GunComplex"]/thingCategories/li[text()="BuildingsSecurity"]</xpath>
-			</li>
--->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="GunComplex" or
-						defName="RocketComplex" or
-						defName="MilitaryTurretGun" or
-						defName="MilitaryTurretGunManned" or
-						defName="ShredderTurretGun" or
-						defName="ShredderTurretGunManned" or
-						defName="PrecisionTurretGun" or
-						defName="PrecisionTurretGunManned" or
-						defName="BlastTurretGun" or
-						defName="BlastTurretGunManned" or
-						defName="VulcanCannon" or
-						defName="VulcanCannonManned"
-						]/statBases </xpath>
-					<value>
-						<AimingAccuracy>1</AimingAccuracy>
-						<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/MoreMechanoids/BodyDefs/Armor.xml b/Patches/MoreMechanoids/BodyDefs/Armor.xml
deleted file mode 100644
index d4aa9a4099..0000000000
--- a/Patches/MoreMechanoids/BodyDefs/Armor.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>More Mechanoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Natural armor -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MechanicalCrawler"]//*[def="MechanicalShell" or def="MechanicalCore" or def="MechanicalCrawlerLeg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MechanicalSkullywag"]//*[def="MechanicalThorax" or def="MechanicalCoreSkullywag" or def="MechanicalNeck" or def="MechanicalHead"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MechanicalAssaulter"]//*[def="MechanicalThorax" or def="FrontShield" or def="ShieldWindow" or def="MechanicalNeck" or def="MechanicalHead" or def="MechanicalShoulder" or def="MechanicalArm" or def="MechanicalHand" or def="MechanicalFinger" or def="MechanicalLeg" or def="MechanicalFoot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MechanicalMammoth"]//*[def="MechanicalHead" or def="MetalTusk" or def="MechanicalMammothLeg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MechanicalMammoth"]//*[def="MechanicalBody" or def="ArmorPlating" or def="InternalMetalPlate" or (def="MechanicalMammothLeg" and not(groups)) or def="MechanicalMammothHoof"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MechanicalFlamebot"]//*[def="MechanicalBodySmall" or def="FuelContainer" or def="MechanicalHead"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MechanicalFlamebot"]//*[def="MechanicalCore"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/MoreMechanoids/PawnKinds/PawnKinds.xml b/Patches/MoreMechanoids/PawnKinds/PawnKinds.xml
deleted file mode 100644
index 5405de8e3a..0000000000
--- a/Patches/MoreMechanoids/PawnKinds/PawnKinds.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>More Mechanoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Mech_Assaulter" or defName="Mech_Flamebot"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Mech_Assaulter"]/combatPower</xpath>
-					<value>
-						<combatPower>400</combatPower>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/MoreMechanoids/ThingDefs_Misc/Weapons_Mechanoid.xml b/Patches/MoreMechanoids/ThingDefs_Misc/Weapons_Mechanoid.xml
deleted file mode 100644
index 18f8508765..0000000000
--- a/Patches/MoreMechanoids/ThingDefs_Misc/Weapons_Mechanoid.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>More Mechanoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_ChargeBlasterInternal</defName>
-					<statBases>
-						<Mass>10.00</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>2.0</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>13.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.51</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x22mmCharged</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>31</range>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<burstShotCount>20</burstShotCount>
-						<soundCast>Shot_ChargeBlaster</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>9.2</reloadTime>
-						<ammoSet>AmmoSet_6x22mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Suppressive</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>MechanoidFlameThrower</defName>
-					<statBases>
-						<Mass>2.00</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>5.0</ShotSpread>
-						<SwayFactor>1.00</SwayFactor>
-						<Bulk>1.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Flamethrower_Prometheum</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<burstShotCount>6</burstShotCount>
-						<soundCast>FlameThrower</soundCast>
-						<muzzleFlashScale>5</muzzleFlashScale>
-						<ai_AvoidFriendlyFireRadius>3</ai_AvoidFriendlyFireRadius>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_Flamethrower</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/MoreMechanoids/ThingDefs_Races/Races_Mechanoid.xml b/Patches/MoreMechanoids/ThingDefs_Races/Races_Mechanoid.xml
deleted file mode 100644
index 99dbf7b456..0000000000
--- a/Patches/MoreMechanoids/ThingDefs_Races/Races_Mechanoid.xml
+++ /dev/null
@@ -1,549 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>More Mechanoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Crawler ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Mech_Crawler"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mech_Crawler"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Mech_Crawler"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.26</MeleeDodgeChance>
-						<MeleeCritChance>0.06</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mech_Crawler"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>plasma cutter</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>3.1</cooldownTime>
-								<linkedBodyPartsGroup>PlasmaCutter</linkedBodyPartsGroup>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<armorPenetrationSharp>25</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>front legs</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLegs</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>front legs</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLegs</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationSharp>0.84</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Mech_Crawler"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Mech_Crawler"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Mech_Crawler"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>275</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>27</MaxOverHeal>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Skullywag ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Mech_Skullywag"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mech_Skullywag"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>3</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mech_Skullywag"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Mech_Skullywag"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.19</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.08</MeleeParryChance>
-						<MaxHitPoints>200</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mech_Skullywag"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>front paralyze component</label>
-								<capacities>
-									<li>ParalyzingPoke</li>
-									<li>UnlockDoor</li>
-								</capacities>
-								<power>2.0</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontParalyzeComponent</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<armorPenetration>0.0</armorPenetration>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5.0</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.875</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Mech_Skullywag"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Mech_Skullywag"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Mech_Skullywag"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>850</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>85</MaxOverHeal>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Flamebot ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Mech_Flamebot"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mech_Flamebot"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>3</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mech_Flamebot"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Mech_Flamebot"]/statBases</xpath>
-					<value>
-						<ArmorRating_Heat>0.5</ArmorRating_Heat>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>100</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1.0</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.10</MeleeDodgeChance>
-						<MeleeCritChance>0.04</MeleeCritChance>
-						<MeleeParryChance>0.0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mech_Flamebot"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>igniter</label>
-								<capacities>
-									<li>Stab</li>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>Igniter</linkedBodyPartsGroup>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Mech_Flamebot"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Mech_Flamebot"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Mech_Flamebot"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>400</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>40</MaxOverHeal>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Mammoth ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Mech_Mammoth"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Mech_Mammoth"]/statBases</xpath>
-					<value>
-						<ArmorRating_Heat>0.5</ArmorRating_Heat>
-						<MeleeDodgeChance>0.04</MeleeDodgeChance>
-						<MeleeCritChance>0.64</MeleeCritChance>
-						<MeleeParryChance>0.58</MeleeParryChance>
-						<MaxHitPoints>800</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mech_Mammoth"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>22</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mech_Mammoth"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>50</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mech_Mammoth"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Ram</li>
-								</capacities>
-								<power>72</power>
-								<cooldownTime>7</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>25</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>33.750</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>3.51</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>tusk</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>52</power>
-								<cooldownTime>2.34</cooldownTime>
-								<linkedBodyPartsGroup>Tusk</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>33.750</armorPenetrationBlunt>
-								<armorPenetrationSharp>67.5</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>leg</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>3.51</cooldownTime>
-								<linkedBodyPartsGroup>FrontLegs</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Mech_Mammoth"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Mech_Mammoth"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Mech_Mammoth"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>5500</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>550</MaxOverHeal>
-							<MinArmorPct>0.5</MinArmorPct>
-							<MinArmorValueSharp>12</MinArmorValueSharp>
-							<MinArmorValueBlunt>27</MinArmorValueBlunt>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Assaulter ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Mech_Assaulter"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mech_Assaulter"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mech_Assaulter"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>42</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Mech_Assaulter"]/statBases</xpath>
-					<value>
-						<ArmorRating_Heat>0.25</ArmorRating_Heat>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>40</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						<MeleeCritChance>0.16</MeleeCritChance>
-						<MeleeParryChance>0.12</MeleeParryChance>
-						<MaxHitPoints>300</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mech_Assaulter"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shield</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>2.95</cooldownTime>
-								<linkedBodyPartsGroup>CoveredByShield</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>gun protrusion</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2.24</cooldownTime>
-								<linkedBodyPartsGroup>GunProtrusion</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Mech_Assaulter"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Mech_Assaulter"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Mech_Assaulter"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1525</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>152</MaxOverHeal>
-							<MinArmorPct>0.5</MinArmorPct>
-							<MinArmorValueSharp>10</MinArmorValueSharp>
-							<MinArmorValueBlunt>22</MinArmorValueBlunt>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Morgante Mafia Weapons Pack/Weapons_Guns.xml b/Patches/Morgante Mafia Weapons Pack/Weapons_Guns.xml
deleted file mode 100644
index 093b62f0b3..0000000000
--- a/Patches/Morgante Mafia Weapons Pack/Weapons_Guns.xml	
+++ /dev/null
@@ -1,443 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Morgante Mafia Weapons Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Tools ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName="Morg_Lupara" or
-						defName="Morg_PoketRevolver" or
-						defName="Morg_ServiceRevolver" or
-						defName="Morg_M1911a"
-						]/tools
-					</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName="Morg_TommyGun" or
-						defName="Morg_PumpShotgun" or
-						defName="Morg_BoltActionRifle"
-						]/tools
-					</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</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>2</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>2</power>
-								<cooldownTime>1.55</cooldownTime>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Bolt Action Rifle / Springfield 1903 ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Morg_BoltActionRifle</defName>
-					<statBases>
-						<Mass>3.90</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.49</SwayFactor>
-						<Bulk>11.00</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_3006Springfield</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== Pump Shotgun / Model 1897 ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Morg_PumpShotgun</defName>
-					<statBases>
-						<Mass>3.60</Mass>
-						<RangedWeapon_Cooldown>0.99</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.36</SwayFactor>
-						<Bulk>10.00</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.25</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Sawed Off === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Morg_Lupara</defName>
-					<statBases>
-						<WorkToMake>9500</WorkToMake>
-						<Bulk>4.75</Bulk>
-						<Mass>1.85</Mass>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>2.20</SwayFactor>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.93</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>13</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>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Tommy Gun === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Morg_TommyGun</defName>
-					<statBases>
-						<Mass>4.90</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.35</SwayFactor>
-						<Bulk>8.60</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.32</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>25</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>Shot_HeavySMG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- ========== Pocket Revolver / S&W Model 10, Snubnose ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Morg_PoketRevolver</defName>
-					<statBases>
-						<Mass>0.82</Mass>
-						<RangedWeapon_Cooldown>0.48</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>0.86</SwayFactor>
-						<Bulk>1.77</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_38Special_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>10</range>
-						<soundCast>Shot_Revolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_38Special</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Service Revolver / S&W Model 10, 4" Barrel ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Morg_ServiceRevolver</defName>
-					<statBases>
-						<Mass>0.97</Mass>
-						<RangedWeapon_Cooldown>0.48</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>1.08</SwayFactor>
-						<Bulk>2.28</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_38Special_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Revolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_38Special</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== M1911a1 ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Morg_M1911a</defName>
-					<statBases>
-						<Mass>1.14</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.11</SwayFactor>
-						<Bulk>2.19</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Molotov === -->
-
-				<!-- Projectile -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="BaseIncendiaryProjectile"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>0.5</explosionRadius>
-							<damageDef>PrometheumFlame</damageDef>
-							<damageAmountBase>10</damageAmountBase>
-							<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
-							<preExplosionSpawnChance>1</preExplosionSpawnChance>
-							<speed>12</speed>
-							<ai_IsIncendiary>true</ai_IsIncendiary>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Morg_MolotovCocktailProj"]</xpath>
-					<value>
-						<thingClass>CombatExtended.Projectile_FireTrail</thingClass>
-					</value>
-				</li>
-
-				<!-- Grenade -->
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="Morg_MolotovCocktail"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>BaseWeapon</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Morg_MolotovCocktail"]</xpath>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<stackLimit>50</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="Morg_MolotovCocktail"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Morg_MolotovCocktail"]/comps</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_ExplosiveCE">
-								<damageAmountBase>1</damageAmountBase>
-								<explosiveDamageType>Flame</explosiveDamageType>
-								<explosiveRadius>0.5</explosiveRadius>
-								<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
-								<preExplosionSpawnChance>1</preExplosionSpawnChance>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Morg_MolotovCocktail</defName>
-					<statBases>
-						<Mass>0.6</Mass>
-						<Bulk>2.55</Bulk>
-						<MarketValue>7.05</MarketValue>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<label>throw molotov</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<range>10</range>
-						<minRange>4</minRange>
-						<warmupTime>0.8</warmupTime>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<soundCast>ThrowMolotovCocktail</soundCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<defaultProjectile>Morg_MolotovCocktailProj</defaultProjectile>
-						<onlyManualCast>true</onlyManualCast>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<weaponTags>
-						<li>CE_AI_Grenade</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Morgante WW2 Italian Weapons/Patch_Ammo.xml b/Patches/Morgante WW2 Italian Weapons/Patch_Ammo.xml
deleted file mode 100644
index b5d62aaf42..0000000000
--- a/Patches/Morgante WW2 Italian Weapons/Patch_Ammo.xml	
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Morgante_WW2_Italian_Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingCategoryDef>
-							<defName>Ammo60mmGrenade</defName>
-							<label>60mm Grenade</label>
-							<parent>AmmoGrenades</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberGrenade</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_60mmGrenade</defName>
-							<label>60mm Grenade</label>
-							<ammoTypes>
-								<Ammo_60mmGrenade_HEAT>Bullet_60mmGrenade_HEAT</Ammo_60mmGrenade_HEAT>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="60mmGrenadeBase" ParentName="MediumAmmoBase" Abstract="True">
-							<description>Large spigot grenade designed to be fired at tanks.</description>
-							<statBases>
-								<Mass>2.176</Mass>
-								<Bulk>4.5</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_TableMachining</li>
-							</tradeTags>
-							<thingCategories>
-								<li>Ammo60mmGrenade</li>
-							</thingCategories>
-							<stackLimit>25</stackLimit>
-							<cookOffFlashScale>30</cookOffFlashScale>
-							<cookOffSound>MortarBomb_Explode</cookOffSound>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="60mmGrenadeBase">
-							<defName>Ammo_60mmGrenade_HEAT</defName>
-							<label>60mm Grenade (HEAT)</label>
-							<graphicData>
-								<texPath>Things/Ammo/GrenadeLauncher/HE</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>35.3</MarketValue>
-							</statBases>
-							<ammoClass>RocketHEAT</ammoClass>
-							<detonateProjectile>Bullet_60mmGrenade_HEAT</detonateProjectile>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="Base40x46mmGrenadeBullet">
-							<defName>Bullet_60mmGrenade_HEAT</defName>
-							<label>60mm Grenade(HEAT)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>186</damageAmountBase>
-								<armorPenetrationSharp>70</armorPenetrationSharp>
-								<armorPenetrationBlunt>34.818</armorPenetrationBlunt>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>120</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>1</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-									<explosionSound>MortarBomb_Explode</explosionSound>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Large>1</Fragment_Large>
-										<Fragment_Small>32</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_60mmGrenade_HEAT</defName>
-							<label>make 60mm Grenades x5</label>
-							<description>Craft 5 60mm Grenades.</description>
-							<jobString>Making 60mm Grenades.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>26</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>7</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>FSX</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_60mmGrenade_HEAT>5</Ammo_60mmGrenade_HEAT>
-							</products>
-							<workAmount>6500</workAmount>
-						</RecipeDef>
-
-						<!-- ========== Based off of .44 Magnum ========== -->
-
-						<ThingCategoryDef>
-							<defName>Ammo1035mmOrdinanzaItaliana</defName>
-							<label>10.35mm Ordinanza Italiana</label>
-							<parent>AmmoPistols</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_1035mmOrdinanzaItaliana</defName>
-							<label>10.35mm Ordinanza Italiana</label>
-							<ammoTypes>
-								<Ammo_1035mmOrdinanzaItaliana_FMJ>Bullet_1035mmOrdinanzaItaliana_FMJ</Ammo_1035mmOrdinanzaItaliana_FMJ>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="1035mmOrdinanzaItalianaBase" ParentName="SmallAmmoBase" Abstract="True">
-							<description>Ancient pistol cartridge originally designed for Italian revolvers.</description>
-							<statBases>
-								<Mass>0.02</Mass>
-								<Bulk>0.02</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>Ammo1035mmOrdinanzaItaliana</li>
-							</thingCategories>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="1035mmOrdinanzaItalianaBase">
-							<defName>Ammo_1035mmOrdinanzaItaliana_FMJ</defName>
-							<label>10.35mm Ordinanza Italiana cartridge (FMJ)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Pistol/FMJ</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.1</MarketValue>
-							</statBases>
-							<ammoClass>FullMetalJacket</ammoClass>
-							<cookOffProjectile>Bullet_1035mmOrdinanzaItaliana_FMJ</cookOffProjectile>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="Base44MagnumBullet">
-							<defName>Bullet_1035mmOrdinanzaItaliana_FMJ</defName>
-							<label>10.35mm Ordinanza Italiana bullet (FMJ)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationSharp>6.55</armorPenetrationSharp>
-								<armorPenetrationBlunt>21.280</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_1035mmOrdinanzaItaliana_FMJ</defName>
-							<label>make 10.35mm Ordinanza Italiana (FMJ) cartridge x250</label>
-							<description>Craft 250 10.35mm Ordinanza Italiana (FMJ) cartridges.</description>
-							<jobString>Making 10.35mm Ordinanza Italiana (FMJ) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_1035mmOrdinanzaItaliana_FMJ>250</Ammo_1035mmOrdinanzaItaliana_FMJ>
-							</products>
-							<workAmount>2200</workAmount>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Morgante WW2 Italian Weapons/Weapons_Guns.xml b/Patches/Morgante WW2 Italian Weapons/Weapons_Guns.xml
deleted file mode 100644
index baac97dc5d..0000000000
--- a/Patches/Morgante WW2 Italian Weapons/Weapons_Guns.xml	
+++ /dev/null
@@ -1,349 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Morgante_WW2_Italian_Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Tools ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName="MORG_BODEO" or
-						defName="MORG_GLISENTI1910M"
-						]/tools
-					</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName="MORG_MAB38M" or
-						defName="MORG_FNAB43M" or
-						defName="MORG_60MM" or
-						defName="MORG_BREDA30M"
-						]/tools
-					</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</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>2</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>2</power>
-								<cooldownTime>1.55</cooldownTime>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Beretta Model 38 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>MORG_MAB38M</defName>
-					<statBases>
-						<Mass>3.27</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.13</SwayFactor>
-						<Bulk>8.00</Bulk>
-					</statBases>
-					<costList>
-						<Steel>35</Steel>
-						<WoodLog>20</WoodLog>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.32</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>25</range>
-						<burstShotCount>8</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>40</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== FNAB-43 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>MORG_FNAB43M</defName>
-					<statBases>
-						<Mass>3.90</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.18</SwayFactor>
-						<Bulk>4.80</Bulk>
-						<WorkToMake>40000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>50</Steel>
-						<WoodLog>20</WoodLog>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.20</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>25</range>
-						<burstShotCount>8</burstShotCount>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>40</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Breda Model 30 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>MORG_BREDA30M</defName>
-					<statBases>
-						<Mass>10.60</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.60</SwayFactor>
-						<Bulk>13.30</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.06</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_65x52mmCarcano_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>62</range>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>5.3</reloadTime><!-- Due to the Model 30's questionable design, reloading is more time-consuming.-->
-						<ammoSet>AmmoSet_65x52mmCarcano</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== 60mm Heat Grenade Rifle ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>MORG_60MM</defName>
-					<statBases>
-						<Mass>7.80</Mass>
-						<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.76</SwayFactor>
-						<Bulk>10.80</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_60mmGrenade_HEAT</defaultProjectile>
-						<warmupTime>1.8</warmupTime>
-						<minRange>3</minRange>
-						<range>29</range>
-						<soundCast>Shot_IncendiaryLauncher</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<requireLineOfSight>false</requireLineOfSight>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>6</reloadTime>
-						<ammoSet>AmmoSet_60mmGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Glisenti Model 1910 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>MORG_GLISENTI1910M</defName>
-					<statBases>
-						<Mass>0.82</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>0.96</SwayFactor>
-						<Bulk>2.07</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Bodel Model 1889 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>MORG_BODEO</defName>
-					<statBases>
-						<Mass>0.95</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.03</SwayFactor>
-						<Bulk>2.22</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_1035mmOrdinanzaItaliana_FMJ</defaultProjectile>
-						<warmupTime>0.3</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_Revolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>5.1</reloadTime>
-						<ammoSet>AmmoSet_1035mmOrdinanzaItaliana</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/MorrowRim - Ashlands Swamp/MorrowRim_Lizard.xml b/Patches/MorrowRim - Ashlands Swamp/MorrowRim_Lizard.xml
deleted file mode 100644
index b25390d795..0000000000
--- a/Patches/MorrowRim - Ashlands Swamp/MorrowRim_Lizard.xml	
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MorrowRim - Ashlands Swamp</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="MorrowRim_ArgoBehemoth"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_ArgoBehemoth"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.24</MeleeDodgeChance>
-						<MeleeCritChance>0.38</MeleeCritChance>
-						<MeleeParryChance>0.5</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_ArgoBehemoth"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_ArgoBehemoth"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_ArgoBehemoth"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hand claws</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Blunt</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.02</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hand claws</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Blunt</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.02</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>34</power>
-								<cooldownTime>1.84</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<chanceFactor>0.75</chanceFactor>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Wamasu"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Wamasu"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.34</MeleeCritChance>
-						<MeleeParryChance>0.24</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Wamasu"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hand claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.64</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<extraMeleeDamages>
-									<li>
-										<def>EMP</def>
-										<amount>8</amount>
-										<chance>0.5</chance>
-									</li>
-								</extraMeleeDamages>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hand claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.64</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<extraMeleeDamages>
-									<li>
-										<def>EMP</def>
-										<amount>8</amount>
-										<chance>0.5</chance>
-									</li>
-								</extraMeleeDamages>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>2.05</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<extraMeleeDamages>
-									<li>
-										<def>EMP</def>
-										<amount>14</amount>
-										<chance>0.5</chance>
-									</li>
-								</extraMeleeDamages>
-								<chanceFactor>0.75</chanceFactor>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/MorrowRim - Ashlands Swamp/MySwampBodyisReady.xml b/Patches/MorrowRim - Ashlands Swamp/MySwampBodyisReady.xml
deleted file mode 100644
index 6cf31a5c4f..0000000000
--- a/Patches/MorrowRim - Ashlands Swamp/MySwampBodyisReady.xml	
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MorrowRim - Ashlands Swamp</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Tick-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="MorrowRim_Crab"]//*[
-						def="Shell" or
-						def="Pronotum" or
-						def="InsectLeg" or
-						def="InsectNostril"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="MorrowRim_Crab"]//*[
-						def="Shell" or
-						def="Pronotum" or
-						def="InsectNostril" or
-						def="InsectHead" or
-						def="InsectMouth" or
-						def="InsectLeg"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/MorrowRim - Ashlands Swamp/SwampInsec.xml b/Patches/MorrowRim - Ashlands Swamp/SwampInsec.xml
deleted file mode 100644
index 3627853938..0000000000
--- a/Patches/MorrowRim - Ashlands Swamp/SwampInsec.xml	
+++ /dev/null
@@ -1,273 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MorrowRim - Ashlands Swamp</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="MorrowRim_SwampStrider"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedTall</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_SwampStrider"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.51</MeleeDodgeChance>
-						<MeleeCritChance>0.21</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_SwampStrider"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_SwampStrider"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_SwampStrider"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2.88</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>16</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left scythed arm</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>MorrowRim_InsectArmAttackTool_L</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<armorPenetrationSharp>2.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right scythed arm</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>MorrowRim_InsectArmAttackTool_R</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<armorPenetrationSharp>2.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Thunderbug"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Thunderbug"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						<MeleeCritChance>0.09</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Thunderbug"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.33</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Thunderbug"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.33</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Thunderbug"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>8</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Stun</def>
-										<amount>4</amount>
-										<chance>0.5</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.84</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Hoarvor"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Hoarvor"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						<MeleeCritChance>0.09</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Hoarvor"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>MorrowRim_HoarvorBite</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Mudcrab"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Mudcrab"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.17</MeleeDodgeChance>
-						<MeleeCritChance>0.06</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Mudcrab"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.13</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Mudcrab"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.13</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Mudcrab"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>pincers</label>
-								<capacities>
-									<li>Bite</li>
-									<li>MorrowRim_SwampBite</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.21</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/MorrowRim - Ashlands Swamp/SwampJello.xml b/Patches/MorrowRim - Ashlands Swamp/SwampJello.xml
deleted file mode 100644
index 127a4e04f7..0000000000
--- a/Patches/MorrowRim - Ashlands Swamp/SwampJello.xml	
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MorrowRim - Ashlands Swamp</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="MorrowRim_SwampJelly"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedTall</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_SwampJelly"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.45</MeleeDodgeChance>
-						<MeleeCritChance>0.09</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_SwampJelly"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>front left tentacle</label>
-								<capacities>
-									<li>ScratchToxic</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>MorrowRim_TentacleAttackTool_FL</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>front right tentacle</label>
-								<capacities>
-									<li>ScratchToxic</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>MorrowRim_TentacleAttackTool_FR</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>middle left tentacle</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>MorrowRim_TentacleAttackTool_BL</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>middle right tentacle</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>MorrowRim_TentacleAttackTool_BR</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/MorrowRim - Bloodmoon/Bloodmoon_Deer.xml b/Patches/MorrowRim - Bloodmoon/Bloodmoon_Deer.xml
deleted file mode 100644
index 624d45ab80..0000000000
--- a/Patches/MorrowRim - Bloodmoon/Bloodmoon_Deer.xml	
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MorrowRim - Bloodmoon</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="MorrowRim_AvatarOfHircine"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_AvatarOfHircine"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						<MeleeCritChance>0.33</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_AvatarOfHircine"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>antlers</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Stab</li>
-									<li>Cut</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.42</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/MorrowRim - Bloodmoon/BodyDef_Patches.xml b/Patches/MorrowRim - Bloodmoon/BodyDef_Patches.xml
deleted file mode 100644
index e250fbb8c3..0000000000
--- a/Patches/MorrowRim - Bloodmoon/BodyDef_Patches.xml	
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MorrowRim - Bloodmoon</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Werewolf -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="MorrowRim_Werewolf"]//*[
-						def="Body" or
-						def="Tail" or
-						def="Neck"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="MorrowRim_Werewolf"]//*[
-						def="Body" or
-						def="Tail" or
-						def="Neck" or
-						def="Head" or
-						def="AnimalJaw" or
-						def="FrontClaw" or
-						def="Shoulder" or
-						def="Arm" or
-						def="Hand" or
-						def="Leg" or
-						def="Foot"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/MorrowRim - Bloodmoon/HediffDef_Disease.xml b/Patches/MorrowRim - Bloodmoon/HediffDef_Disease.xml
deleted file mode 100644
index f6b08a61aa..0000000000
--- a/Patches/MorrowRim - Bloodmoon/HediffDef_Disease.xml	
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MorrowRim - Bloodmoon</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="MorrowRim_BloodOfHircine"]/stages/li[1]/statOffsets</xpath>
-					<value>
-						<Suppressability>-0.1</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="MorrowRim_BloodOfHircine"]/stages/li[2]/statOffsets</xpath>
-					<value>
-						<Suppressability>-0.2</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="MorrowRim_BloodOfHircine"]/stages/li[3]/statOffsets</xpath>
-					<value>
-						<Suppressability>-0.3</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="MorrowRim_BloodOfHircine"]/stages/li[4]/statOffsets</xpath>
-					<value>
-						<Suppressability>-0.4</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="MorrowRim_BloodOfHircine"]/stages/li[5]/statOffsets</xpath>
-					<value>
-						<Suppressability>-0.5</Suppressability>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="MorrowRim_BloodOfHircine"]/stages/li[6]/statOffsets</xpath>
-					<value>
-						<Suppressability>-0.6</Suppressability>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="MorrowRim_BloodOfHircine"]/stages/li[7]/statOffsets</xpath>
-					<value>
-						<Suppressability>-0.7</Suppressability>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="MorrowRim_BloodOfHircine"]/stages/li[8]/statOffsets</xpath>
-					<value>
-						<Suppressability>-0.8</Suppressability>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="MorrowRim_BloodOfHircine"]/stages/li[9]/statOffsets</xpath>
-					<value>
-						<Suppressability>-0.9</Suppressability>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="MorrowRim_BloodOfHircine"]/stages/li[10]/statOffsets</xpath>
-					<value>
-						<Suppressability>-1.0</Suppressability>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/MorrowRim - Bloodmoon/Hunter_Ammo.xml b/Patches/MorrowRim - Bloodmoon/Hunter_Ammo.xml
deleted file mode 100644
index c8ed0b1219..0000000000
--- a/Patches/MorrowRim - Bloodmoon/Hunter_Ammo.xml	
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MorrowRim - Bloodmoon</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- There is only one type of Forsaken arrow, no subcategory for variants required -->
-
-						<!--==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_HuntardArrow</defName>
-							<label>arrows</label>
-							<ammoTypes>
-								<Ammo_Arrow_Stone>Projectile_HuntardArrow_Stone</Ammo_Arrow_Stone>
-								<Ammo_Arrow_Steel>Projectile_HuntardArrow_Steel</Ammo_Arrow_Steel>
-								<Ammo_Arrow_Plasteel>Projectile_HuntardArrow_Plasteel</Ammo_Arrow_Plasteel>
-								<Ammo_Arrow_Venom>Projectile_HuntardArrow_Venom</Ammo_Arrow_Venom>
-								<Ammo_Arrow_Flame>Projectile_HuntardArrow_Flame</Ammo_Arrow_Flame>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="BaseStreamlinedArrowProjectile">
-							<defName>Projectile_HuntardArrow_Stone</defName>
-							<label>Hunter arrow (stone)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Stone</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>22</speed>
-								<damageDef>MorrowRim_ArrowHunters</damageDef>
-								<damageAmountBase>7</damageAmountBase>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.740</armorPenetrationBlunt>
-								<preExplosionSpawnChance>0.2</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Ammo_Arrow_Stone</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseStreamlinedArrowProjectile">
-							<defName>Projectile_HuntardArrow_Steel</defName>
-							<label>Hunter arrow (steel)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>33</speed>
-								<damageDef>MorrowRim_ArrowHunters</damageDef>
-								<damageAmountBase>9</damageAmountBase>
-								<armorPenetrationSharp>1.0</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.9</armorPenetrationBlunt>
-								<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Ammo_Arrow_Steel</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseStreamlinedArrowProjectile">
-							<defName>Projectile_HuntardArrow_Plasteel</defName>
-							<label>Hunter arrow (plasteel)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Plasteel</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>37</speed>
-								<damageAmountBase>7</damageAmountBase>
-								<damageDef>MorrowRim_ArrowHunters</damageDef>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.260</armorPenetrationBlunt>
-								<preExplosionSpawnChance>0.75</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Ammo_Arrow_Plasteel</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseStreamlinedArrowProjectile">
-							<defName>Projectile_HuntardArrow_Venom</defName>
-							<label>hunter arrow (venom)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Venom</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>33</speed>
-								<damageDef>MorrowRim_ArrowHunters</damageDef>
-								<damageAmountBase>9</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>ArrowVenom</def>
-										<amount>2</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>1.0</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.9</armorPenetrationBlunt>
-								<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Ammo_Arrow_Steel</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseStreamlinedArrowProjectile">
-							<defName>Projectile_HuntardArrow_Flame</defName>
-							<label>hunter arrow (flame)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Flame</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>33</speed>
-								<damageDef>MorrowRim_ArrowHunters</damageDef>
-								<damageAmountBase>3</damageAmountBase>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.96</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame</def>
-										<amount>1</amount>
-										<chance>0.33</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_3006Springfield_BloodMoon</defName>
-							<label>.30-06 Springfield</label>
-							<ammoTypes>
-								<Ammo_3006Springfield_FMJ>Bullet_3006Springfield_FMJ_BloodMoon</Ammo_3006Springfield_FMJ>
-								<Ammo_3006Springfield_AP>Bullet_3006Springfield_AP_BloodMoon</Ammo_3006Springfield_AP>
-								<Ammo_3006Springfield_HP>Bullet_3006Springfield_HP_BloodMoon</Ammo_3006Springfield_HP>
-								<Ammo_3006Springfield_Incendiary>Bullet_3006Springfield_Incendiary_BloodMoon</Ammo_3006Springfield_Incendiary>
-								<Ammo_3006Springfield_HE>Bullet_3006Springfield_HE_BloodMoon</Ammo_3006Springfield_HE>
-								<Ammo_3006Springfield_Sabot>Bullet_3006Springfield_Sabot_BloodMoon</Ammo_3006Springfield_Sabot>
-							</ammoTypes>
-							<similarTo>AmmoSet_Rifle</similarTo>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="Base3006SpringfieldBullet">
-							<defName>Bullet_3006Springfield_FMJ_BloodMoon</defName>
-							<label>.30-06 Springfield cartridge (FMJ)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>MorrowRim_BulletHunters</damageDef>
-								<damageAmountBase>21</damageAmountBase>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>79.22</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base3006SpringfieldBullet">
-							<defName>Bullet_3006Springfield_AP_BloodMoon</defName>
-							<label>.30-06 Springfield cartridge (AP)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>MorrowRim_BulletHunters</damageDef>
-								<damageAmountBase>13</damageAmountBase>
-								<armorPenetrationSharp>16</armorPenetrationSharp>
-								<armorPenetrationBlunt>79.22</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base3006SpringfieldBullet">
-							<defName>Bullet_3006Springfield_HP_BloodMoon</defName>
-							<label>.30-06 Springfield cartridge (HP)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>MorrowRim_BulletHunters</damageDef>
-								<damageAmountBase>26</damageAmountBase>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<armorPenetrationBlunt>79.22</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base3006SpringfieldBullet">
-							<defName>Bullet_3006Springfield_Incendiary_BloodMoon</defName>
-							<label>.30-06 Springfield bullet (AP-I)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>MorrowRim_BulletHunters</damageDef>
-								<damageAmountBase>13</damageAmountBase>
-								<armorPenetrationSharp>16</armorPenetrationSharp>
-								<armorPenetrationBlunt>79.22</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>8</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base3006SpringfieldBullet">
-							<defName>Bullet_3006Springfield_HE_BloodMoon</defName>
-							<label>.30-06 Springfield bullet (AP-HE)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>MorrowRim_BulletHunters</damageDef>
-								<damageAmountBase>21</damageAmountBase>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>79.22</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>12</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base3006SpringfieldBullet">
-							<defName>Bullet_3006Springfield_Sabot_BloodMoon</defName>
-							<label>.30-06 Springfield bullet (Sabot)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>MorrowRim_BulletHunters</damageDef>
-								<damageAmountBase>11</damageAmountBase>
-								<armorPenetrationSharp>28</armorPenetrationSharp>
-								<armorPenetrationBlunt>101.58</armorPenetrationBlunt>
-								<speed>221</speed>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/MorrowRim - Bloodmoon/Hunter_Grenades.xml b/Patches/MorrowRim - Bloodmoon/Hunter_Grenades.xml
deleted file mode 100644
index 07e4be183c..0000000000
--- a/Patches/MorrowRim - Bloodmoon/Hunter_Grenades.xml	
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MorrowRim - Bloodmoon</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGrenadeEquipment">
-							<defName>Weapon_GrenadeWolfBane</defName>
-							<equipmentType>Primary</equipmentType>
-							<label>wolfsbane vessel</label>
-							<description>Glass vessels filled with a potent mixture of wolfsbane extract. Shatters upon impact, releasing a short lived cloud of gas that burns any werewolves within.</description>
-							<graphicData>
-								<texPath>Things/Projectile/MorrowRim_WolfsBaneBombThrown</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<soundInteract>Interact_Grenade</soundInteract>
-							<techLevel>Medieval</techLevel>
-							<stackLimit>50</stackLimit>
-							<statBases>
-								<Mass>0.436</Mass>
-								<Bulk>1.55</Bulk>
-								<MarketValue>12.4</MarketValue>
-								<SightsEfficiency>1.0</SightsEfficiency>
-								<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-							</statBases>
-							<generateCommonality>2.0</generateCommonality>
-							<weaponTags>
-								<li>CE_AI_AOE</li>
-								<li>GrenadeDestructive</li>
-							</weaponTags>
-							<thingCategories>
-								<li>Grenades</li>
-							</thingCategories>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<label>throw wolfsbane vessel</label>
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<range>12.9</range>
-									<minRange>2.9</minRange>
-									<warmupTime>0.8</warmupTime>
-									<noiseRadius>4</noiseRadius>
-									<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-									<soundCast>ThrowGrenade</soundCast>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<defaultProjectile>Proj_GrenadeWolfBane</defaultProjectile>
-									<onlyManualCast>true</onlyManualCast>
-									<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-									<ai_AvoidFriendlyFireRadius>6</ai_AvoidFriendlyFireRadius>
-								</li>
-							</verbs>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseGrenadeProjectile">
-							<defName>Proj_GrenadeWolfBane</defName>
-							<label>wolfsbane vessel</label>
-							<graphicData>
-								<texPath>Things/Projectile/MorrowRim_WolfsBaneBombThrown</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>3.5</explosionRadius>
-								<damageDef>Burn</damageDef>
-								<damageAmountBase>0</damageAmountBase>
-								<explosionDelay>0</explosionDelay>
-								<postExplosionSpawnThingDef>MorrowRim_Gas_Wolfsbane</postExplosionSpawnThingDef>
-								<postExplosionSpawnChance>1</postExplosionSpawnChance>
-								<speed>10</speed>
-							</projectile>
-						</ThingDef>
-
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>MakeGrenadeWolfBane</defName>
-							<label>make wolfsbane vessel x5</label>
-							<description>Craft 10 wolfsbane vessels.</description>
-							<jobString>Making wolfsbane vessels.</jobString>
-							<researchPrerequisite>MorrowRim_LycanthropicElixirs</researchPrerequisite>
-							<workAmount>2100</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>MorrowRim_WolfsbaneExtract</li>
-										</thingDefs>
-									</filter>
-									<count>60</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>MorrowRim_WolfsbaneExtract</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Weapon_GrenadeWolfBane>5</Weapon_GrenadeWolfBane>
-							</products>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Apparel_WolfsbaneBelt"]/costList</xpath>
-					<value>
-						<costList>
-							<Weapon_GrenadeWolfBane>5</Weapon_GrenadeWolfBane>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Apparel_WolfsbaneBelt"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountToRefill</xpath>
-					<value>
-						<ammoCountPerCharge>1</ammoCountPerCharge>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Apparel_WolfsbaneBelt"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<label>throw wolfsbane grenade</label>
-								<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<onlyManualCast>True</onlyManualCast>
-								<warmupTime>0.8</warmupTime>
-								<range>12.9</range>
-								<minRange>3</minRange>
-								<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-								<soundCast>ThrowGrenade</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-								<defaultProjectile>Proj_GrenadeWolfBane</defaultProjectile>
-								<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/MorrowRim - Bloodmoon/Hunter_Weapons.xml b/Patches/MorrowRim - Bloodmoon/Hunter_Weapons.xml
deleted file mode 100644
index dc4a0bccc0..0000000000
--- a/Patches/MorrowRim - Bloodmoon/Hunter_Weapons.xml	
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MorrowRim - Bloodmoon</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== hunt Spear ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_MeleeWeapon_HuntersSpear"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.35</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>MorrowRim_StabHunters</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.41</cooldownTime>
-								<chanceFactor>1.00</chanceFactor>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_MeleeWeapon_HuntersSpear"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_MeleeWeapon_HuntersSpear"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.17</MeleeCritChance>
-							<MeleeParryChance>1.45</MeleeParryChance>
-							<MeleeDodgeChance>0.9</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- ========== Hunter Bow ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>MorrowRim_Bow_Hunters</defName>
-					<statBases>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.8</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>5.00</Bulk>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_HuntardArrow_Stone</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>26</range>
-						<soundCast>Bow_Recurve</soundCast>
-					</Properties>
-					<AmmoUser>
-						<ammoSet>AmmoSet_HuntardArrow</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<AllowWithRunAndGun>true</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Bow_Hunters"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetrationBlunt>0.65</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Hunter Gun ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>MorrowRim_Gun_Hunters</defName>
-					<statBases>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.8</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>5.00</Bulk>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_3006Springfield_BloodMoon</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<AllowWithRunAndGun>true</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Gun_Hunters"]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/MorrowRim - Bloodmoon/MorrowRim_Werewolf.xml b/Patches/MorrowRim - Bloodmoon/MorrowRim_Werewolf.xml
deleted file mode 100644
index ff303a1cfa..0000000000
--- a/Patches/MorrowRim - Bloodmoon/MorrowRim_Werewolf.xml	
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MorrowRim - Bloodmoon</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Werewolf"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Werewolf"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.36</MeleeDodgeChance>
-						<MeleeCritChance>0.29</MeleeCritChance>
-						<MeleeParryChance>0.5</MeleeParryChance>
-						<ArmorRating_Sharp>0.12</ArmorRating_Sharp>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Werewolf"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hand claws</label>
-								<capacities>
-									<li>MorrowRim_WerewolfScratch</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>0.75</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hand claws</label>
-								<capacities>
-									<li>MorrowRim_WerewolfScratch</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>0.75</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>MorrowRim_WerewolfBite</li>
-								</capacities>
-								<power>29</power>
-								<cooldownTime>1.66</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<chanceFactor>0.75</chanceFactor>
-								<armorPenetrationSharp>2.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/MorrowRim - Bloodmoon/MorrowRim_WerewolfLord.xml b/Patches/MorrowRim - Bloodmoon/MorrowRim_WerewolfLord.xml
deleted file mode 100644
index 9d45493ed3..0000000000
--- a/Patches/MorrowRim - Bloodmoon/MorrowRim_WerewolfLord.xml	
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MorrowRim - Bloodmoon</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="MorrowRim_WerewolfLord"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_WerewolfLord"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.38</MeleeDodgeChance>
-						<MeleeCritChance>0.58</MeleeCritChance>
-						<MeleeParryChance>0.68</MeleeParryChance>
-						<ArmorRating_Sharp>0.45</ArmorRating_Sharp>
-						<ArmorRating_Blunt>2.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_WerewolfLord"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hand claws</label>
-								<capacities>
-									<li>MorrowRim_WerewolfScratch</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>0.75</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hand claws</label>
-								<capacities>
-									<li>MorrowRim_WerewolfScratch</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>0.75</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>MorrowRim_WerewolfBite</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>1.66</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<chanceFactor>0.75</chanceFactor>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/MorrowRim - Colovian Fur Helm/Furr_Helm.xml b/Patches/MorrowRim - Colovian Fur Helm/Furr_Helm.xml
deleted file mode 100644
index ff8b2d9c9f..0000000000
--- a/Patches/MorrowRim - Colovian Fur Helm/Furr_Helm.xml	
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MorrowRim - Colovian Fur Helm</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- == Fur Helm == -->
-				<!-- statBases -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_ColovianFurHelm"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/MorrowRim/MorrowRim_CnidarianCE.xml b/Patches/MorrowRim/MorrowRim_CnidarianCE.xml
deleted file mode 100644
index aea13f7e1e..0000000000
--- a/Patches/MorrowRim/MorrowRim_CnidarianCE.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MorrowRim</li>
-			<li>MorrowRim - Just the Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="MorrowRim_NetchBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="MorrowRim_NetchBase"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.45</MeleeDodgeChance>
-						<MeleeCritChance>0.4</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="MorrowRim_NetchBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="MorrowRim_NetchBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="MorrowRim_NetchBase"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>2.4</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>front left tentacle</label>
-								<capacities>
-									<li>ScratchToxic</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>2.1</cooldownTime>
-								<linkedBodyPartsGroup>MorrowRim_TentacleAttackTool_FL</linkedBodyPartsGroup>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>front right tentacle</label>
-								<capacities>
-									<li>ScratchToxic</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>2.1</cooldownTime>
-								<linkedBodyPartsGroup>MorrowRim_TentacleAttackTool_FR</linkedBodyPartsGroup>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>middle left tentacle</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>2.2</cooldownTime>
-								<linkedBodyPartsGroup>MorrowRim_TentacleAttackTool_ML</linkedBodyPartsGroup>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>middle right tentacle</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>2.2</cooldownTime>
-								<linkedBodyPartsGroup>MorrowRim_TentacleAttackTool_MR</linkedBodyPartsGroup>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>back left tentacle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>2.2</cooldownTime>
-								<linkedBodyPartsGroup>MorrowRim_TentacleAttackTool_BL</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>back right tentacle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>2.2</cooldownTime>
-								<linkedBodyPartsGroup>MorrowRim_TentacleAttackTool_BR</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/MorrowRim/MorrowRim_CorpusCE.xml b/Patches/MorrowRim/MorrowRim_CorpusCE.xml
deleted file mode 100644
index 318fd22250..0000000000
--- a/Patches/MorrowRim/MorrowRim_CorpusCE.xml
+++ /dev/null
@@ -1,279 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MorrowRim</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="MorrowRim_CorprusStalker" or defName="MorrowRim_CorprusLame" or defName="MorrowRim_CorprusBloated"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_CorprusStalker"]</xpath>
-					<value>
-						<statBases>
-							<MoveSpeed>1.33</MoveSpeed>
-							<MeleeDodgeChance>0.5</MeleeDodgeChance>
-							<MeleeCritChance>0.18</MeleeCritChance>
-							<MeleeParryChance>0.3</MeleeParryChance>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_CorprusLame"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						<MeleeCritChance>0.33</MeleeCritChance>
-						<MeleeParryChance>0.4</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_CorprusBloated"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						<MeleeCritChance>0.24</MeleeCritChance>
-						<MeleeParryChance>0.4</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_CorprusStalker"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>MorrowRim_CorprusScratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>MorrowRim_CorprusScratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>MorrowRim_CorprusBite</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_CorprusBloated"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>MorrowRim_CorprusScratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>MorrowRim_CorprusScratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>MorrowRim_CorprusBite</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_CorprusLame"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>MorrowRim_CorprusScratch</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.9</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>MorrowRim_CorprusScratch</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.9</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>MorrowRim_CorprusBite</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/MorrowRim/MorrowRim_DaedraCE.xml b/Patches/MorrowRim/MorrowRim_DaedraCE.xml
deleted file mode 100644
index 2388840428..0000000000
--- a/Patches/MorrowRim/MorrowRim_DaedraCE.xml
+++ /dev/null
@@ -1,545 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MorrowRim</li>
-			<li>MorrowRim - Just the Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Clannfear"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Ogrim" or defName="MorrowRim_Daedroth" or defName="MorrowRim_Scamp" or defName="MorrowRim_Hunger" or defName="MorrowRim_OgrimSmol"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Clannfear"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.78</MeleeDodgeChance>
-						<MeleeCritChance>0.22</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Ogrim"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.66</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_OgrimSmol"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.27</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Ogrim"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Ogrim"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.65</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_OgrimSmol"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3.0</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_OgrimSmol"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Daedroth"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.6</MeleeDodgeChance>
-						<MeleeCritChance>0.33</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Scamp"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Hunger"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.66</MeleeDodgeChance>
-						<MeleeCritChance>0.21</MeleeCritChance>
-						<MeleeParryChance>0.23</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Clannfear"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hand claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>0.9</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.9</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hand claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>0.9</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.9</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<chanceFactor>0.75</chanceFactor>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Daedroth"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hand claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.12</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hand claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.12</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>29</power>
-								<cooldownTime>1.55</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<chanceFactor>0.75</chanceFactor>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>9</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Ogrim"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>24</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>24</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>32</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_OgrimSmol"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>14</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>14</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>16</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Scamp"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hand claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.7</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.26</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hand claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.7</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.26</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<chanceFactor>0.75</chanceFactor>
-								<armorPenetrationSharp>0.36</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Hunger"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hand claws</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Stab</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<extraMeleeDamages>
-									<li>
-										<def>MorrowRim_ScratchParalysis</def>
-										<amount>5</amount>
-										<chance>0.1</chance>
-									</li>
-								</extraMeleeDamages>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.0</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hand claws</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Stab</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<extraMeleeDamages>
-									<li>
-										<def>MorrowRim_ScratchParalysis</def>
-										<amount>5</amount>
-										<chance>0.1</chance>
-									</li>
-								</extraMeleeDamages>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<extraMeleeDamages>
-									<li>
-										<def>MorrowRim_AcidBurn</def>
-										<amount>5</amount>
-										<chance>1</chance>
-									</li>
-								</extraMeleeDamages>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="MorrowRim_TitanMode"]/stages/li[2]/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
-							<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-						</statOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/MorrowRim/MorrowRim_InsectCE.xml b/Patches/MorrowRim/MorrowRim_InsectCE.xml
deleted file mode 100644
index b429ed82c0..0000000000
--- a/Patches/MorrowRim/MorrowRim_InsectCE.xml
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MorrowRim</li>
-			<li>MorrowRim - Just the Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="MorrowRim_SiltStrider"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedTall</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_SiltStrider"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.66</MeleeDodgeChance>
-						<MeleeCritChance>0.67</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_SiltStrider"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_SiltStrider"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_SiltStrider"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>3.4</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>27</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left scythed arm</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>41</power>
-								<cooldownTime>2.4</cooldownTime>
-								<linkedBodyPartsGroup>MorrowRim_InsectArmAttackTool_L</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<armorPenetrationBlunt>16</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right scythed arm</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>41</power>
-								<cooldownTime>2.4</cooldownTime>
-								<linkedBodyPartsGroup>MorrowRim_InsectArmAttackTool_R</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<armorPenetrationBlunt>16</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="MorrowRim_NixHound"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_NixHound"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.14</MeleeParryChance>
-						<ArmorRating_Blunt>0.18</ArmorRating_Blunt>
-						<ArmorRating_Sharp>0.18</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_NixHound"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>proboscis</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.444</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Shalk" or defName="MorrowRim_FungalShalk" or defName="MorrowRim_GlowingShalk"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Shalk" or defName="MorrowRim_FungalShalk" or defName="MorrowRim_GlowingShalk"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						<MeleeCritChance>0.04</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Shalk" or defName="MorrowRim_FungalShalk" or defName="MorrowRim_GlowingShalk"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.33</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Shalk" or defName="MorrowRim_FungalShalk" or defName="MorrowRim_GlowingShalk"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.33</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Shalk" or defName="MorrowRim_FungalShalk" or defName="MorrowRim_GlowingShalk"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>Bite</li>
-									<li>MorrowRim_BurnBite</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.26</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.78</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="MorrowRim_AshHopper"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_AshHopper"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_AshHopper"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_AshHopper"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.18</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_AshHopper"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.34</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="MorrowRim_NixOx"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_NixOx"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.19</MeleeCritChance>
-						<MeleeParryChance>0.14</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_NixOx"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_NixOx"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_NixOx"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>3</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/MorrowRim/MorrowRim_KwamaCE.xml b/Patches/MorrowRim/MorrowRim_KwamaCE.xml
deleted file mode 100644
index 8b8cb357d9..0000000000
--- a/Patches/MorrowRim/MorrowRim_KwamaCE.xml
+++ /dev/null
@@ -1,334 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MorrowRim</li>
-			<li>MorrowRim - Just the Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="MorrowRim_KwamaScrib"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_KwamaScrib"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.03</MeleeCritChance>
-						<MeleeParryChance>0.07</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_KwamaScrib"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_KwamaScrib"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_KwamaScrib"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.1</chanceFactor>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>MorrowRim_ParalyticBite</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="MorrowRim_KwamaForager"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Serpentine</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_KwamaForager"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_KwamaForager"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_KwamaForager"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.27</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_KwamaForager"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="MorrowRim_KwamaWorker"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_KwamaWorker"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						<MeleeCritChance>0.18</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_KwamaWorker"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_KwamaWorker"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_KwamaWorker"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>2.08</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.55</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.55</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="MorrowRim_KwamaWarrior"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_KwamaWarrior"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.33</MeleeDodgeChance>
-						<MeleeCritChance>0.37</MeleeCritChance>
-						<MeleeParryChance>0.5</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_KwamaWarrior"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>2.3</MoveSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_KwamaWarrior"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_KwamaWarrior"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_KwamaWarrior"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mouth</label>
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.88</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<chanceFactor>0.9</chanceFactor>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/MorrowRim/MorrowRim_Reptile_PantherCE.xml b/Patches/MorrowRim/MorrowRim_Reptile_PantherCE.xml
deleted file mode 100644
index fbc98cf6fb..0000000000
--- a/Patches/MorrowRim/MorrowRim_Reptile_PantherCE.xml
+++ /dev/null
@@ -1,733 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MorrowRim</li>
-			<li>MorrowRim - Just the Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Guar" or defName="MorrowRim_AlbinoGuar" or defName="MorrowRim_Scuttler" or defName="MorrowRim_Alit"
-						or defName="MorrowRim_Kagouti" or defName="MorrowRim_Durzog" or defName="MorrowRim_TigerGuar" or defName="MorrowRim_Wormmouth" or defName="MorrowRim_CliffRacer" or defName="MorrowRim_AshPanther"] </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="MorrowRim_BantamGuar"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Guar" or defName="MorrowRim_AlbinoGuar"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.29</MeleeDodgeChance>
-						<MeleeCritChance>0.29</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-						<ArmorRating_Blunt>0.15</ArmorRating_Blunt>
-						<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Alit"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.24</MeleeDodgeChance>
-						<MeleeCritChance>0.38</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-						<ArmorRating_Blunt>0.15</ArmorRating_Blunt>
-						<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Kagouti"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.56</MeleeCritChance>
-						<MeleeParryChance>0.4</MeleeParryChance>
-						<ArmorRating_Blunt>0.18</ArmorRating_Blunt>
-						<ArmorRating_Sharp>0.18</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Durzog"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.24</MeleeDodgeChance>
-						<MeleeCritChance>0.43</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-						<ArmorRating_Sharp>0.08</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_BantamGuar"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.03</MeleeCritChance>
-						<MeleeParryChance>0.03</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_CliffRacer"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_TigerGuar"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.24</MeleeDodgeChance>
-						<MeleeCritChance>0.37</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-						<ArmorRating_Blunt>0.15</ArmorRating_Blunt>
-						<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Wormmouth"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						<MeleeCritChance>0.29</MeleeCritChance>
-						<MeleeParryChance>0.23</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Wormmouth"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.3</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Wormmouth"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.18</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Scuttler"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_AshPanther"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.6</MeleeDodgeChance>
-						<MeleeCritChance>0.27</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Guar" or defName="MorrowRim_AlbinoGuar"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>2.9</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>13</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Alit"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>13</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Kagouti"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tusk</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Stab</li>
-								</capacities>
-								<power>34</power>
-								<cooldownTime>1.98</cooldownTime>
-								<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>5</armorPenetrationSharp>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>2.3</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>2.76</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>16</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Durzog"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tusk</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Stab</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>0.75</cooldownTime>
-								<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.75</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>13</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_CliffRacer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tail</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>MorrowRim_TailAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.38</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.24</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>beak</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.23</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>13</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.27</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.58</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_TigerGuar"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.6</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>34</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>13</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_BantamGuar"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.12</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>13</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.24</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Wormmouth"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>2.3</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>13</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Scuttler"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2.1</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>13</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_AshPanther"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>0.7</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>0.7</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/MorrowRim/MorrowRim_VvarkCE.xml b/Patches/MorrowRim/MorrowRim_VvarkCE.xml
deleted file mode 100644
index 31094db9ae..0000000000
--- a/Patches/MorrowRim/MorrowRim_VvarkCE.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MorrowRim</li>
-			<li>MorrowRim - Just the Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Vvardvark"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Vvardvark"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						<MeleeCritChance>0.12</MeleeCritChance>
-						<MeleeParryChance>0.03</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_Vvardvark"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>feet claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.66</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.12</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/MorrowRim/MorrowRim_XMaterials.xml b/Patches/MorrowRim/MorrowRim_XMaterials.xml
deleted file mode 100644
index 12a1110bc8..0000000000
--- a/Patches/MorrowRim/MorrowRim_XMaterials.xml
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MorrowRim</li>
-			<li>MorrowRim - Just the Animals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Remove horn as a weapon -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="MorrowRim_KagoutiTusk"]/tools</xpath>
-				</li>
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="MorrowRim_KagoutiTusk"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>ResourceBase</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_KagoutiTusk"]/description</xpath>
-					<value>
-						<description>A single horn of the mighty Kagouti. Proof that you're a warrior worthy of the title of Aberration Killer. Traders and collectors might pay a high price for this.</description>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_KagoutiTusk"]/statBases/MarketValue</xpath>
-					<value>
-						<MarketValue>100</MarketValue>
-					</value>
-				</li>
-				<!--Guar -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_GuarHide" or defName="MorrowRim_AlbinoGuarHide"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.08</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_GuarHide" or defName="MorrowRim_AlbinoGuarHide"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.064</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<!--Netch -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_NetchLeather"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.11</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_NetchLeather"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.068</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_NetchLeather"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.02</StuffPower_Armor_Heat>
-					</value>
-				</li>
-				<!--Flea -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_SiltStriderChitin"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.18</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_SiltStriderChitin"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.18</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_SiltStriderChitin"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.01</StuffPower_Armor_Heat>
-					</value>
-				</li>
-				<!--Nix -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_NixHoundLeather"]/statBases/MarketValue</xpath>
-					<value>
-						<MarketValue>1.3</MarketValue>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_NixHoundLeather"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.08</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_NixHoundLeather"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.06</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_NixHoundLeather"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.01</StuffPower_Armor_Heat>
-					</value>
-				</li>
-				<!-- HeavyLeather-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_HeavyLeather"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.1</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_HeavyLeather"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.068</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<!--Duzog -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_DurzogLeather"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.04</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_DurzogLeather"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.028</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<!--Cliff Racer -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_CliffRacerLeather"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.01</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_CliffRacerLeather"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.01</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_CliffRacerLeather"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0</StuffPower_Armor_Heat>
-					</value>
-				</li>
-				<!--Daedra -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_DaedraHide"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.12</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_DaedraHide"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.8</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MorrowRim_DaedraHide"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
-					</value>
-				</li>
-				<!--Kesh fiber -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_KreshFiber"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.02</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_KreshFiber"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.01</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MorrowRim_KreshFiber"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.01</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/MorrowRim/MyBodiesAreReady.xml b/Patches/MorrowRim/MyBodiesAreReady.xml
deleted file mode 100644
index d68f0a1fbd..0000000000
--- a/Patches/MorrowRim/MyBodiesAreReady.xml
+++ /dev/null
@@ -1,341 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MorrowRim</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Bipedal -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="MorrowRim_Bipedal"]//*[
-						def="Body" or
-						def="Tail" or
-						def="Neck" or
-						def="Leg"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="MorrowRim_Bipedal"]//*[
-						def="Body" or
-						def="Tail" or
-						def="Neck" or
-						def="Head" or
-						def="Leg" or
-						def="Foot"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- Clannfear -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="MorrowRim_Clannfear"]//*[
-						def="Body" or
-						def="Tail" or
-						def="Neck" or
-						def="Leg"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="MorrowRim_Clannfear"]//*[
-						def="Body" or
-						def="Tail" or
-						def="Neck" or
-						def="Head" or
-						def="AnimalJaw" or
-						def="FrontClaw" or
-						def="Shoulder" or
-						def="Arm" or
-						def="Hand" or
-						def="Leg" or
-						def="Foot"
-						]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- Daedra -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="MorrowRim_Daedra"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Leg"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="MorrowRim_Daedra"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Head" or
-						def="AnimalJaw" or
-						def="Arm" or
-						def="Shoulder" or
-						def="FrontClaw" or
-						def="Hand" or
-						def="Leg" or
-						def="Foot"
-						]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- BipedalWithTusks -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="MorrowRim_BipedalWithTusks"]//*[
-						def="Body" or
-						def="Tail" or
-						def="Neck" or
-						def="Leg"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="MorrowRim_BipedalWithTusks"]//*[
-						def="Body" or
-						def="Tail" or
-						def="Neck" or
-						def="Head" or
-						def="Tusk" or
-						def="Leg" or
-						def="Foot"
-						]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- KwamaScrib -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="MorrowRim_KwamaScrib"]//*[
-						def="Shell" or
-						def="Pronotum" or
-						def="InsectLeg"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="MorrowRim_KwamaScrib"]//*[
-						def="Shell" or
-						def="Pronotum" or
-						def="InsectHead" or
-						def="InsectMouth" or
-						def="InsectLeg"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- KwamaLeechLike -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="MorrowRim_KwamaLeechLike"]//*[
-						def="MorrowRim_LeechBody" or
-						def="Tail" or
-						def="Pronotum"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="MorrowRim_KwamaLeechLike"]//*[
-						def="MorrowRim_LeechBody" or
-						def="Tail" or
-						def="Pronotum" or
-						def="InsectHead" or
-						def="InsectMouth"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- KwamaWarrior -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="MorrowRim_KwamaWarrior"]//*[
-						def="Shell" or
-						def="Pronotum" or
-						def="MorrowRim_Insect_Arm" or
-						def="InsectLeg"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="MorrowRim_KwamaWarrior"]//*[
-						def="Shell" or
-						def="Pronotum" or
-						def="InsectHead" or
-						def="InsectMouth" or
-						def="MorrowRim_Insect_Arm" or
-						def="FrontClaw" or
-						def="InsectLeg"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- Quadrupedal Insect -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="MorrowRim_QuadrupedalInsect"]//*[
-						def="Shell" or
-						def="Pronotum"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="MorrowRim_QuadrupedalInsect"]//*[
-						def="Shell" or
-						def="Pronotum" or
-						def="InsectHead" or
-						def="InsectMouth" or
-						def="InsectLeg"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- Netcha -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="MorrowRim_Jelly"]//*[
-						def="MorrowRim_Netch_Shell"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="MorrowRim_Jelly"]//*[
-						def="Shell" or
-						def="Head" or
-						def="AnimalJaw"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- Flea-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="MorrowRim_Flea"]//*[
-						def="Shell" or
-						def="Pronotum" or
-						def="InsectLeg" or
-						def="InsectNostril"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="MorrowRim_Flea"]//*[
-						def="Shell" or
-						def="Pronotum" or
-						def="InsectNostril" or
-						def="InsectHead" or
-						def="InsectMouth" or
-						def="MorrowRim_Insect_Arm" or
-						def="InsectLeg"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- Tick-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="MorrowRim_Tick"]//*[
-						def="Shell" or
-						def="Pronotum" or
-						def="InsectLeg" or
-						def="InsectNostril"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="MorrowRim_Tick"]//*[
-						def="Shell" or
-						def="Pronotum" or
-						def="InsectNostril" or
-						def="InsectHead" or
-						def="InsectMouth" or
-						def="InsectLeg"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/MorrowRim/Patch_Gasmasks.xml b/Patches/MorrowRim/Patch_Gasmasks.xml
deleted file mode 100644
index c76ba6a2b4..0000000000
--- a/Patches/MorrowRim/Patch_Gasmasks.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MorrowRim</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="CE_Apparel_GasMask"]</xpath>
-					<value>
-						<li Class="MorrowRim.ExtendedRaceProperties">
-							<ashResistant>Resistant</ashResistant>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="CE_Apparel_ImprovGasMask"]</xpath>
-					<value>
-						<li Class="MorrowRim.ExtendedRaceProperties">
-							<ashResistant>Resistant</ashResistant>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="MorrowRim_AshInEyes"]/stages/li/partEfficiencyOffset</xpath>
-					<value>
-						<partEfficiencyOffset>-0.5</partEfficiencyOffset>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/MorrowRim/RetchingShell.xml b/Patches/MorrowRim/RetchingShell.xml
deleted file mode 100644
index a94b5a3313..0000000000
--- a/Patches/MorrowRim/RetchingShell.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>MorrowRim</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="MorrowRim_RetchingNetchShell"]</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<CombatExtended.AmmoCategoryDef>
-							<defName>Netchyshell</defName>
-							<label>Netch foam</label>
-							<description>Releases a flood of steaming netch jelly that extinguishes fire.</description>
-						</CombatExtended.AmmoCategoryDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBaseCraftableBase">
-							<defName>MorrowRim_RetchingNetchShell</defName>
-							<label>retching netch gas shell</label>
-							<graphicData>
-								<texPath>MorrowRim/Items/Shells/RetchingNetch</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>20.03</MarketValue>
-								<Mass>5</Mass>
-								<Bulk>8</Bulk>
-							</statBases>
-							<ammoClass>Netchyshell</ammoClass>
-							<generateAllowChance>0</generateAllowChance>
-							<detonateProjectile>Bullet_RetchingNetchShell</detonateProjectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base81mmMortarShell">
-							<defName>Bullet_RetchingNetchShell</defName>
-							<label>Retching Netch Shell</label>
-							<graphicData>
-								<texPath>Things/Projectile/ShellFirefoam</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Smoke</damageDef>
-								<suppressionFactor>0.0</suppressionFactor>
-								<dangerFactor>0.0</dangerFactor>
-								<damageAmountBase>40</damageAmountBase>
-								<explosionRadius>5</explosionRadius>
-								<flyOverhead>true</flyOverhead>
-								<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-								<soundExplode>Explosion_Smoke</soundExplode>
-								<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
-								<soundAmbient>MortarRound_Ambient</soundAmbient>
-								<postExplosionSpawnThingDef>Gas_RetchingNetch</postExplosionSpawnThingDef>
-								<postExplosionSpawnChance>1</postExplosionSpawnChance>
-								<postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<explosionEffect>ExtinguisherExplosion</explosionEffect>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_81mmMortarShell"]/ammoTypes</xpath>
-					<value>
-						<MorrowRim_RetchingNetchShell>Bullet_RetchingNetchShell</MorrowRim_RetchingNetchShell>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeMorrowRim_RetchingNetchShell</defName>
-							<label>make 81mm netch foam mortar shell x3</label>
-							<description>Craft 3 netch firefoam shells from netch body mucus.</description>
-							<jobString>Making 81mm netch firefoam shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>30</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>3</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>MorrowRim_NetchJelly</li>
-										</thingDefs>
-									</filter>
-									<count>12</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-									<li>MorrowRim_NetchJelly</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<MorrowRim_RetchingNetchShell>3</MorrowRim_RetchingNetchShell>
-							</products>
-							<workAmount>2400</workAmount>
-							<researchPrerequisite>Mortars</researchPrerequisite>
-						</RecipeDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Moyo Cartel/Ammo/Ammo_Moyo.xml b/Patches/Moyo Cartel/Ammo/Ammo_Moyo.xml
deleted file mode 100644
index 8ca834950e..0000000000
--- a/Patches/Moyo Cartel/Ammo/Ammo_Moyo.xml	
+++ /dev/null
@@ -1,354 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Moyo-The cartel arrives</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ==================== Cartel Specific Ammosets ========================== -->
-
-				<!--6x18 Moyo-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_6x18mmCMoyo</defName>
-							<label>6x18mm Charged Bullet</label>
-							<ammoTypes>
-								<Ammo_6x18mmCharged>Bullet_6x18mmCMoyo</Ammo_6x18mmCharged>
-								<Ammo_6x18mmCharged_AP>Bullet_6x18mmCMoyo_AP</Ammo_6x18mmCharged_AP>
-								<Ammo_6x18mmCharged_Ion>Bullet_6x18mmCMoyo_Ion</Ammo_6x18mmCharged_Ion>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingDef ParentName="Base6x18mmChargedBullet">
-							<defName>Bullet_6x18mmCMoyo</defName>
-							<label>6x18mm Charged bullet</label>
-							<graphicData>
-								<texPath>Things/Weapons/MoyoCNeedleshot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>10</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>3</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base6x18mmChargedBullet">
-							<defName>Bullet_6x18mmCMoyo_AP</defName>
-							<label>6x18mm Charged bullet (Conc.)</label>
-							<graphicData>
-								<texPath>Things/Weapons/MoyoCNeedleshot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>8</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>1</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>24</armorPenetrationSharp>
-								<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base6x18mmChargedBullet">
-							<defName>Bullet_6x18mmCMoyo_Ion</defName>
-							<label>6x18mm Charged bullet (Ion)</label>
-							<graphicData>
-								<texPath>Things/Weapons/MoyoCNeedleshot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>8</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>5</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
-								<empShieldBreakChance>1</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-				<!--6x24 Moyo-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_6x24mmCMoyo</defName>
-							<label>6x24mm Charged Bullet</label>
-							<ammoTypes>
-								<Ammo_6x24mmCharged>Bullet_6x24mmCMoyo</Ammo_6x24mmCharged>
-								<Ammo_6x24mmCharged_AP>Bullet_6x24mmCMoyo_AP</Ammo_6x24mmCharged_AP>
-								<Ammo_6x24mmCharged_Ion>Bullet_6x24mmCMoyo_Ion</Ammo_6x24mmCharged_Ion>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingDef ParentName="Base6x24mmChargedBullet">
-							<defName>Bullet_6x24mmCMoyo</defName>
-							<label>6x24mm Charged bullet</label>
-							<graphicData>
-								<texPath>Things/Weapons/MoyoCNeedleshot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>13</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>4</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-								<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base6x24mmChargedBullet">
-							<defName>Bullet_6x24mmCMoyo_AP</defName>
-							<label>6x24mm Charged bullet (Conc.)</label>
-							<graphicData>
-								<texPath>Things/Weapons/MoyoCNeedleshot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>10</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>2</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-								<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base6x24mmChargedBullet">
-							<defName>Bullet_6x24mmCMoyo_Ion</defName>
-							<label>6x24mm Charged bullet (Ion)</label>
-							<graphicData>
-								<texPath>Things/Weapons/MoyoCNeedleshot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>10</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>6</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>22.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
-								<empShieldBreakChance>0.2</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-				<!--8x35 Moyo-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_10x18mmCMoyo</defName>
-							<label>10x18mm Charged Bullet</label>
-							<ammoTypes>
-								<Ammo_10x18mmCharged>Bullet_10x18mmCMoyo</Ammo_10x18mmCharged>
-								<Ammo_10x18mmCharged_AP>Bullet_10x18mmCMoyo_AP</Ammo_10x18mmCharged_AP>
-								<Ammo_10x18mmCharged_Ion>Bullet_10x18mmCMoyo_Ion</Ammo_10x18mmCharged_Ion>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingDef ParentName="Base10x18mmChargedBullet">
-							<defName>Bullet_10x18mmCMoyo</defName>
-							<label>10x18mm Charged bullet</label>
-							<graphicData>
-								<texPath>Things/Weapons/MoyoCNeedleshot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>15</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>4</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>13</armorPenetrationSharp>
-								<armorPenetrationBlunt>22.56</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base10x18mmChargedBullet">
-							<defName>Bullet_10x18mmCMoyo_AP</defName>
-							<label>10x18mm Charged bullet (Conc.)</label>
-							<graphicData>
-								<texPath>Things/Weapons/MoyoCNeedleshot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>11</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>2</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>26</armorPenetrationSharp>
-								<armorPenetrationBlunt>22.56</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base10x18mmChargedBullet">
-							<defName>Bullet_10x18mmCMoyo_Ion</defName>
-							<label>10x18mm Charged bullet (Ion)</label>
-							<graphicData>
-								<texPath>Things/Weapons/MoyoCNeedleshot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>11</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>7</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>19.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>22.5</armorPenetrationBlunt>
-								<empShieldBreakChance>0.4</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-				<!--8x50 Moyo-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_8x50mmCMoyo</defName>
-							<label>8x50mm Charged Bullet</label>
-							<ammoTypes>
-								<Ammo_8x50mmCharged>Bullet_8x50mmCMoyo</Ammo_8x50mmCharged>
-								<Ammo_8x50mmCharged_AP>Bullet_8x50mmCMoyo_AP</Ammo_8x50mmCharged_AP>
-								<Ammo_8x50mmCharged_Ion>Bullet_8x50mmCMoyo_Ion</Ammo_8x50mmCharged_Ion>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingDef ParentName="Base8x50mmChargedBullet">
-							<defName>Bullet_8x50mmCMoyo</defName>
-							<label>8x50mm Charged bullet</label>
-							<graphicData>
-								<texPath>Things/Weapons/MoyoCNeedleshot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>24</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>7</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<armorPenetrationBlunt>120</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base8x50mmChargedBullet">
-							<defName>Bullet_8x50mmCMoyo_AP</defName>
-							<label>8x50mm Charged bullet (Conc.)</label>
-							<graphicData>
-								<texPath>Things/Weapons/MoyoCNeedleshot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>19</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>3</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>36</armorPenetrationSharp>
-								<armorPenetrationBlunt>120</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base8x50mmChargedBullet">
-							<defName>Bullet_8x50mmCMoyo_Ion</defName>
-							<label>8x50mm Charged bullet (Ion)</label>
-							<graphicData>
-								<texPath>Things/Weapons/MoyoCNeedleshot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>19</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>11</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>27</armorPenetrationSharp>
-								<armorPenetrationBlunt>120</armorPenetrationBlunt>
-								<empShieldBreakChance>1</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Moyo Cartel/PawnKindDefs/Moyo_PawnKind.xml b/Patches/Moyo Cartel/PawnKindDefs/Moyo_PawnKind.xml
deleted file mode 100644
index 33859753b2..0000000000
--- a/Patches/Moyo Cartel/PawnKindDefs/Moyo_PawnKind.xml	
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Moyo-The cartel arrives</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!--Ammo-->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="Moyo_CartelTech" or
-						defName="Moyo_CartelSmuggler" or
-						defName="Moyo_CartelLabourer" or
-						defName="Moyo_CartelTrooper"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="CartelSoldierLight"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="CartelSoldierLight"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="CartelSniper"]</xpath>
-					<value>
-						<li Inherit="False" Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>500</min>
-									<max>1200</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>MoyoBasicGun</li>
-									<li>MoyoCartelBasicGun</li>
-								</weaponTags>
-								<magazineCount>
-									<min>1</min>
-									<max>2</max>
-								</magazineCount>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<!--Backpack-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[
-						@Name="CartelSoldierLight" or
-						@Name="CartelSniper" or
-						defName="Moyo_CartelTrooper" or
-						defName="Moyo_CartelSmuggler"
-						]/apparelRequired </xpath>
-					<value>
-						<li>CE_Apparel_Backpack</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Moyo Cartel/ThingDefs_Misc/Moyo_Apparel.xml b/Patches/Moyo Cartel/ThingDefs_Misc/Moyo_Apparel.xml
deleted file mode 100644
index 14d5e2f9a4..0000000000
--- a/Patches/Moyo Cartel/ThingDefs_Misc/Moyo_Apparel.xml	
+++ /dev/null
@@ -1,362 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Moyo-The cartel arrives</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--========= Fixed Armor Value =========-->
-
-				<!--Ballistic Suit-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Moyo_CBsuit"]/statBases</xpath>
-					<value>
-						<Bulk>25</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_CBsuit"]/statBases/Mass</xpath>
-					<value>
-						<Mass>12</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_CBsuit"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>175</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_CBsuit"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>11.25</ArmorRating_Sharp>
-						<ArmorRating_Electric>0.15</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_CBsuit"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>16.875</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Moyo_CBsuit"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-										<li>Leg</li>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-										<li>Leg</li>
-										<li>Arm</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!--Ballistic Helmet-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Moyo_CBhelmet"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_CBhelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>100</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_CBhelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-						<ArmorRating_Electric>0.15</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_CBhelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>12</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!--Evasuit-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Moyo_Cartelsuit"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_Cartelsuit"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
-						<ArmorRating_Electric>0.15</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_Cartelsuit"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Moyo_Cartelsuit"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<!--Evasuit-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Moyo_CartelStrikerHood"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_CartelStrikerHood"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
-						<ArmorRating_Electric>0.30</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_CartelStrikerHood"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!--Strike Armor-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Moyo_CSgear"]/statBases</xpath>
-					<value>
-						<Bulk>80</Bulk>
-						<WornBulk>8</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_CSgear"]/statBases/Mass</xpath>
-					<value>
-						<Mass>30</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_CSgear"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-						<ArmorRating_Electric>0.30</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_CSgear"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>35</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_CSgear"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Moyo_CSgear"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>40</CarryWeight>
-							<CarryBulk>20</CarryBulk>
-							<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-							<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-							<MoveSpeed>0.3</MoveSpeed>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_CSgear"]/costList/Moyo_Abyssteel</xpath>
-					<value>
-						<Moyo_Abyssteel>115</Moyo_Abyssteel>
-						<DevilstrandCloth>10</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Moyo_CSgear"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!--Strike Helmet-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Moyo_CShelmet"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_CShelmet"]/statBases/Mass</xpath>
-					<value>
-						<Mass>2</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_CShelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-						<ArmorRating_Electric>0.30</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_CShelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>40</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_CShelmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Moyo_CShelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Moyo_CShelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Moyo_CShelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_CShelmet"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<AimingAccuracy>0.15</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_CShelmet"]/costList/Moyo_Abyssteel</xpath>
-					<value>
-						<Moyo_Abyssteel>55</Moyo_Abyssteel>
-						<DevilstrandCloth>10</DevilstrandCloth>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Moyo Cartel/ThingDefs_Misc/Moyo_Royal_Apparel.xml b/Patches/Moyo Cartel/ThingDefs_Misc/Moyo_Royal_Apparel.xml
deleted file mode 100644
index 94dad8a474..0000000000
--- a/Patches/Moyo Cartel/ThingDefs_Misc/Moyo_Royal_Apparel.xml	
+++ /dev/null
@@ -1,249 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Moyo-The cartel arrives</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Royal suit-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Moyo_CartelRoyalsuit"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_CartelRoyalsuit"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>3.5</ArmorRating_Sharp>
-						<ArmorRating_Electric>0.40</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_CartelRoyalsuit"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>5.25</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Moyo_CartelRoyalsuit"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<!--Royal Robe-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="Moyo_CartelRobeBase"]/statBases</xpath>
-					<value>
-						<Bulk>7.5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Moyo_CartelRobeBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-						<ArmorRating_Electric>0.60</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Moyo_CartelRobeBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!--Cartel Executioner Helmet-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_CEhelmet"]/statBases/MarketValue</xpath>
-					<value>
-						<MarketValue>1745</MarketValue>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Moyo_CEhelmet"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>4</WornBulk>
-						<NightVisionEfficiency_Apparel>0.8</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_CEhelmet"]/statBases/Mass</xpath>
-					<value>
-						<Mass>7</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_CEhelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>22</ArmorRating_Sharp>
-						<ArmorRating_Electric>0.55</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_CEhelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>64</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_CEhelmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Moyo_CEhelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Moyo_CEhelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Moyo_CEhelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_CEhelmet"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<ShootingAccuracyPawn>0.75</ShootingAccuracyPawn>
-						<AimingAccuracy>0.50</AimingAccuracy>
-					</value>
-				</li>
-
-				<!--Cartel Executioner Armor-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_CEsuit"]/statBases/MarketValue</xpath>
-					<value>
-						<MarketValue>4435</MarketValue>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Moyo_CEsuit"]/statBases</xpath>
-					<value>
-						<Bulk>80</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_CEsuit"]/statBases/Mass</xpath>
-					<value>
-						<Mass>30</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_CEsuit"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-						<ArmorRating_Electric>0.30</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_CEsuit"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>45</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_CEsuit"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Moyo_CEsuit"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>80</CarryWeight>
-						<CarryBulk>30</CarryBulk>
-						<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Moyo_CEsuit"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Moyo Cartel/ThingDefs_Misc/Weapons.xml b/Patches/Moyo Cartel/ThingDefs_Misc/Weapons.xml
deleted file mode 100644
index 98cad9f512..0000000000
--- a/Patches/Moyo Cartel/ThingDefs_Misc/Weapons.xml	
+++ /dev/null
@@ -1,481 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Moyo-The cartel arrives</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==========  Moyo Knife  =========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_CombatKnife"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2.01</cooldownTime>
-								<chanceFactor>0.4</chanceFactor>
-								<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.36</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationBlunt>0.30</armorPenetrationBlunt>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.23</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.2</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Moyo_CombatKnife"]/statBases</xpath>
-					<value>
-						<MeleeCounterParryBonus>0.39</MeleeCounterParryBonus>
-						<Bulk>1.5</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Moyo_CombatKnife"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.16</MeleeCritChance>
-							<MeleeParryChance>0.24</MeleeParryChance>
-							<MeleeDodgeChance>1.07</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- ==========  Moyo Vibrokatana  =========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_Katana"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>46</power>
-								<cooldownTime>1.03</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
-								<armorPenetrationSharp>23.44</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>0.98</cooldownTime>
-								<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
-								<armorPenetrationSharp>25</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Moyo_Katana"]/statBases</xpath>
-					<value>
-						<Bulk>8.5</Bulk>
-						<MeleeCounterParryBonus>0.80</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Moyo_Katana"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.00</MeleeCritChance>
-							<MeleeParryChance>0.60</MeleeParryChance>
-							<MeleeDodgeChance>0.40</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- ========== Charge Pistol =========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Moyo_CartelPistol</defName>
-					<statBases>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.08</SwayFactor>
-						<Bulk>2.45</Bulk>
-						<Mass>0.8</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<recoilAmount>2.47</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x18mmCMoyo</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<burstShotCount>2</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<range>15</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_6x18mmCMoyo</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Moyo_Pistol"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- ========== Charge Revolver =========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Moyo_CartelRevolver</defName>
-					<statBases>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.75</SwayFactor>
-						<Bulk>3.25</Bulk>
-						<Mass>2.00</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_10x18mmCMoyo</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>21</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>5.1</reloadTime>
-						<ammoSet>AmmoSet_10x18mmCMoyo</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Moyo_Pistol"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- ========== Charge SMG =========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Moyo_CartelSMGa</defName>
-					<statBases>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.94</SwayFactor>
-						<Bulk>6.25</Bulk>
-						<Mass>3.10</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<recoilAmount>1.24</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x18mmCMoyo</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<range>31</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>42</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_6x18mmCMoyo</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== Charge Carbine =========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Moyo_CarteCarbine</defName>
-					<statBases>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.19</SwayFactor>
-						<Bulk>8.80</Bulk>
-						<Mass>3.10</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<recoilAmount>0.14</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x24mmCMoyo</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<range>61</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_6x24mmCMoyo</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== Charge Precision Rifle =========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Moyo_CartelLongRifle</defName>
-					<statBases>
-						<SightsEfficiency>5.00</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>2.04</SwayFactor>
-						<Bulk>11.00</Bulk>
-						<Mass>8.1</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8x50mmCMoyo</defaultProjectile>
-						<warmupTime>2.7</warmupTime>
-						<range>86</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_8x50mmCMoyo</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== Melee Attacks =========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_CartelLongRifle" or
-						defName="Moyo_CarteCarbine" or
-						defName="Moyo_CartelSMGa"
-						]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Moyo_CartelPistol" or
-						defName="Moyo_CartelRevolver"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Persona : Royalty Only-->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Moyo_PersonaKatana"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="Moyo_PersonaKatana"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>handle</label>
-											<capacities>
-												<li>Poke</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>1.5</cooldownTime>
-											<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-											<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>edge</label>
-											<capacities>
-												<li>Cut</li>
-											</capacities>
-											<power>50</power>
-											<cooldownTime>1.03</cooldownTime>
-											<chanceFactor>1.33</chanceFactor>
-											<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
-											<armorPenetrationSharp>28</armorPenetrationSharp>
-											<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>point</label>
-											<capacities>
-												<li>Stab</li>
-											</capacities>
-											<power>28</power>
-											<cooldownTime>0.98</cooldownTime>
-											<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
-											<armorPenetrationSharp>36.29</armorPenetrationSharp>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="Moyo_PersonaKatana"]/statBases</xpath>
-								<value>
-									<Bulk>8.5</Bulk>
-									<MeleeCounterParryBonus>0.90</MeleeCounterParryBonus>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="Moyo_PersonaKatana"]</xpath>
-								<value>
-									<equippedStatOffsets>
-										<MeleeCritChance>1.10</MeleeCritChance>
-										<MeleeParryChance>0.70</MeleeParryChance>
-										<MeleeDodgeChance>0.50</MeleeDodgeChance>
-									</equippedStatOffsets>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Moyo from the depth/Ammo/Ammo_Moyo.xml b/Patches/Moyo from the depth/Ammo/Ammo_Moyo.xml
deleted file mode 100644
index c080d7be4b..0000000000
--- a/Patches/Moyo from the depth/Ammo/Ammo_Moyo.xml	
+++ /dev/null
@@ -1,855 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Moyo-From the depth</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!-- ==================== Boltcaster ========================== -->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<!-- ==================== AmmoSets ========================== -->
-
-								<CombatExtended.AmmoSetDef>
-									<defName>AmmoSet_MoyoBallista</defName>
-									<label>Moyo charge bolt</label>
-									<ammoTypes>
-										<Ammo_MoyoBallista>Bullet_MoyoBallista</Ammo_MoyoBallista>
-									</ammoTypes>
-								</CombatExtended.AmmoSetDef>
-
-								<CombatExtended.AmmoCategoryDef>
-									<defName>MoyoBolt</defName>
-									<label>Charged Ion Bolt</label>
-									<description>High velocity charged bolt.</description>
-								</CombatExtended.AmmoCategoryDef>
-
-								<!-- ==================== Ammo ========================== -->
-
-								<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerAmmoBase">
-									<defName>Ammo_MoyoBallista</defName>
-									<label>Moyo charge bolt</label>
-									<description>High power ion charge bolt for use against heavy targets such as mechanoids or power armor.</description>
-									<statBases>
-										<Mass>1.92</Mass>
-										<Bulk>2.87</Bulk>
-										<MarketValue>27.22</MarketValue>
-									</statBases>
-									<tradeTags>
-										<li>CE_AutoEnableTrade</li>
-										<li>CE_AutoEnableCrafting_TableMachining</li>
-									</tradeTags>
-									<thingCategories>
-										<li>AmmoAdvanced</li>
-									</thingCategories>
-									<stackLimit>100</stackLimit>
-									<graphicData>
-										<texPath>Things/Ammo/Railgun/HighCaliber</texPath>
-										<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-									</graphicData>
-									<ammoClass>MoyoBolt</ammoClass>
-									<comps>
-										<!-- Arbitarily defined cookoff explosive stats; represents power cells detonating -->
-										<li Class="CombatExtended.CompProperties_ExplosiveCE">
-											<damageAmountBase>20</damageAmountBase>
-											<explosiveDamageType>Bomb</explosiveDamageType>
-											<explosiveRadius>0.5</explosiveRadius>
-											<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-										</li>
-										<li Class="CombatExtended.CompProperties_Fragments">
-											<fragments>
-												<Fragment_Large>2</Fragment_Large>
-												<Fragment_Small>10</Fragment_Small>
-											</fragments>
-										</li>
-									</comps>
-								</ThingDef>
-
-								<!-- ================== Projectiles ================== -->
-
-								<ThingDef ParentName="Base6x24mmChargedBullet">
-									<defName>Bullet_MoyoBallista</defName>
-									<label>moyo heavy chargebolt</label>
-									<graphicData>
-										<texPath>Things/Weapons/MoyoBolt</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-										<drawSize>1.5</drawSize>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<speed>500</speed>
-										<damageDef>Moyo_ChargeBolt</damageDef>
-										<damageAmountBase>100</damageAmountBase>
-										<armorPenetrationSharp>125</armorPenetrationSharp>
-										<armorPenetrationBlunt>7500</armorPenetrationBlunt>
-									</projectile>
-									<comps>
-										<li Class="CombatExtended.CompProperties_ExplosiveCE">
-											<damageAmountBase>60</damageAmountBase>
-											<explosiveDamageType>EMP</explosiveDamageType>
-											<explosiveRadius>1</explosiveRadius>
-											<explosionSound>Explosion_EMP</explosionSound>
-											<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-										</li>
-									</comps>
-								</ThingDef>
-
-								<!-- ==================== Recipes ========================== -->
-
-								<RecipeDef ParentName="ChargeAmmoRecipeBase">
-									<defName>MakeAmmo_MoyoBallista</defName>
-									<label>make Moyo charge bolts x25</label>
-									<description>Craft 25 Moyo charge bolts.</description>
-									<jobString>Making Moyo charge bolts.</jobString>
-									<workAmount>21000</workAmount>
-									<ingredients>
-										<li>
-											<filter>
-												<thingDefs>
-													<li>Steel</li>
-												</thingDefs>
-											</filter>
-											<count>90</count>
-										</li>
-										<li>
-											<filter>
-												<thingDefs>
-													<li>Plasteel</li>
-												</thingDefs>
-											</filter>
-											<count>12</count>
-										</li>
-										<li>
-											<filter>
-												<thingDefs>
-													<li>ComponentIndustrial</li>
-												</thingDefs>
-											</filter>
-											<count>12</count>
-										</li>
-									</ingredients>
-									<fixedIngredientFilter>
-										<thingDefs>
-											<li>Steel</li>
-											<li>Plasteel</li>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</fixedIngredientFilter>
-									<products>
-										<Ammo_MoyoBallista>25</Ammo_MoyoBallista>
-									</products>
-								</RecipeDef>
-							</value>
-						</li>
-
-						<!-- ==================== Cryoblaster ========================== -->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<!-- ==================== AmmoSets ========================== -->
-
-								<CombatExtended.AmmoSetDef>
-									<defName>AmmoSet_Cryoblaster</defName>
-									<label>Moyo Cryocell</label>
-									<ammoTypes>
-										<Ammo_MoyoCryocell>Bullet_MoyoCryocell</Ammo_MoyoCryocell>
-									</ammoTypes>
-								</CombatExtended.AmmoSetDef>
-
-								<CombatExtended.AmmoSetDef>
-									<defName>AmmoSet_CryoRifle</defName>
-									<label>Moyo Cryocell</label>
-									<ammoTypes>
-										<Ammo_MoyoCryocell>Bullet_MoyoCryocannon</Ammo_MoyoCryocell>
-									</ammoTypes>
-								</CombatExtended.AmmoSetDef>
-
-								<CombatExtended.AmmoCategoryDef>
-									<defName>MoyoCryo</defName>
-									<label>Cryo Cell</label>
-									<description>Cryo fuel cell.</description>
-								</CombatExtended.AmmoCategoryDef>
-
-								<!-- ==================== Ammo ========================== -->
-
-								<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-									<defName>Ammo_MoyoCryocell</defName>
-									<label>Moyo cryocell</label>
-									<description>Weaponized cryofreezing cell for Moyo cryotech weapons.</description>
-									<statBases>
-										<Mass>0.02</Mass>
-										<Bulk>0.01</Bulk>
-										<MarketValue>1.56</MarketValue>
-									</statBases>
-									<tradeTags>
-										<li>CE_AutoEnableTrade</li>
-										<li>CE_AutoEnableCrafting_TableMachining</li>
-									</tradeTags>
-									<thingCategories>
-										<li>AmmoAdvanced</li>
-									</thingCategories>
-									<stackLimit>2000</stackLimit>
-									<graphicData>
-										<texPath>Things/Ammo/FuelCell/Foam</texPath>
-										<graphicClass>Graphic_StackCount</graphicClass>
-									</graphicData>
-									<ammoClass>MoyoCryo</ammoClass>
-									<comps>
-										<!-- Cell failure releases cryoblast at 1/4 efficency -->
-										<li Class="CombatExtended.CompProperties_ExplosiveCE">
-											<damageAmountBase>2</damageAmountBase>
-											<explosiveDamageType>Moyo_Cryo</explosiveDamageType>
-											<explosiveRadius>0.5</explosiveRadius>
-											<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-										</li>
-									</comps>
-								</ThingDef>
-
-								<!-- ================== Projectiles ================== -->
-
-								<ThingDef ParentName="BaseFlamethrowerBullet">
-									<defName>Bullet_MoyoCryocell</defName>
-									<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-									<label>moyo cryoblast</label>
-									<graphicData>
-										<texPath>Things/Weapons/MoyoCBBlast2</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-										<shaderType>TransparentPostLight</shaderType>
-										<drawSize>1.5</drawSize>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageDef>Moyo_Cryo</damageDef>
-										<speed>20</speed>
-										<damageAmountBase>4</damageAmountBase>
-										<soundExplode>MoyoCryoShatter</soundExplode>
-										<explosionRadius>1.4</explosionRadius>
-										<ai_IsIncendiary>false</ai_IsIncendiary>
-										<gravityFactor>1.5</gravityFactor>
-									</projectile>
-								</ThingDef>
-
-								<ThingDef ParentName="BaseFlamethrowerBullet">
-									<defName>Bullet_MoyoCryocannon</defName>
-									<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-									<label>moyo cryoblast</label>
-									<graphicData>
-										<texPath>Things/Weapons/MoyoCBBlast3</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-										<shaderType>TransparentPostLight</shaderType>
-										<drawSize>1.5</drawSize>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageDef>Moyo_Cryo</damageDef>
-										<speed>90</speed>
-										<damageAmountBase>60</damageAmountBase>
-										<soundExplode>MoyoCryoShatter</soundExplode>
-										<explosionRadius>3.5</explosionRadius>
-										<ai_IsIncendiary>false</ai_IsIncendiary>
-									</projectile>
-								</ThingDef>
-
-								<!-- ==================== Recipes ========================== -->
-
-								<RecipeDef ParentName="ChargeAmmoRecipeBase">
-									<defName>MakeAmmo_MoyoCryocell</defName>
-									<label>make Moyo cryocells x500</label>
-									<description>Craft 500 Moyo cryocells.</description>
-									<jobString>Making Moyo cryocells.</jobString>
-									<workAmount>7000</workAmount>
-									<ingredients>
-										<li>
-											<filter>
-												<thingDefs>
-													<li>Steel</li>
-												</thingDefs>
-											</filter>
-											<count>30</count>
-										</li>
-										<li>
-											<filter>
-												<thingDefs>
-													<li>Plasteel</li>
-												</thingDefs>
-											</filter>
-											<count>6</count>
-										</li>
-										<li>
-											<filter>
-												<thingDefs>
-													<li>ComponentIndustrial</li>
-												</thingDefs>
-											</filter>
-											<count>6</count>
-										</li>
-									</ingredients>
-									<fixedIngredientFilter>
-										<thingDefs>
-											<li>Steel</li>
-											<li>Plasteel</li>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</fixedIngredientFilter>
-									<products>
-										<Ammo_MoyoCryocell>500</Ammo_MoyoCryocell>
-									</products>
-								</RecipeDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/DamageDef[defName="Moyo_Cryo"]</xpath>
-							<value>
-								<li Class="CombatExtended.DamageDefExtensionCE">
-									<harmOnlyOutsideLayers>true</harmOnlyOutsideLayers>
-									<isAmbientDamage>true</isAmbientDamage>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/DamageDef[defName="Moyo_Cryo"]/armorCategory</xpath>
-							<value>
-								<armorCategory>Heat</armorCategory>
-							</value>
-						</li>
-
-						<!-- ==================== Abysteel Nail ========================== -->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<!-- ==================== AmmoSets ========================== -->
-
-								<CombatExtended.AmmoSetDef>
-									<defName>AmmoSet_Abyssnail</defName>
-									<label>Moyo alloy nail</label>
-									<ammoTypes>
-										<Ammo_Abyssnail>Bullet_Abyssnail</Ammo_Abyssnail>
-									</ammoTypes>
-								</CombatExtended.AmmoSetDef>
-
-								<CombatExtended.AmmoCategoryDef>
-									<defName>MoyoNail</defName>
-									<label>Nail</label>
-									<description>High velocity alloy nail.</description>
-								</CombatExtended.AmmoCategoryDef>
-
-								<!-- ==================== Ammo ========================== -->
-
-								<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-									<defName>Ammo_Abyssnail</defName>
-									<label>Abyssal Nail</label>
-									<description>Machined alloy nails.</description>
-									<statBases>
-										<Mass>0.02</Mass>
-										<Bulk>0.01</Bulk>
-										<MarketValue>0.05</MarketValue>
-									</statBases>
-									<tradeTags>
-										<li>CE_AutoEnableTrade</li>
-										<li>CE_AutoEnableCrafting_TableMachining</li>
-									</tradeTags>
-									<thingCategories>
-										<li>AmmoAdvanced</li>
-									</thingCategories>
-									<stackLimit>500</stackLimit>
-									<graphicData>
-										<texPath>Things/Ammo/Railgun/Pistol</texPath>
-										<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-									</graphicData>
-									<ammoClass>MoyoNail</ammoClass>
-								</ThingDef>
-
-								<!-- ================== Projectiles ================== -->
-
-								<ThingDef ParentName="Base6x24mmChargedBullet">
-									<defName>Bullet_Abyssnail</defName>
-									<label>abyssal nail</label>
-									<graphicData>
-										<texPath>Things/Weapons/MoyoNail</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-										<drawSize>1</drawSize>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<speed>200</speed>
-										<damageDef>Bullet</damageDef>
-										<damageAmountBase>5</damageAmountBase>
-										<armorPenetrationSharp>11</armorPenetrationSharp>
-										<armorPenetrationBlunt>8</armorPenetrationBlunt>
-									</projectile>
-								</ThingDef>
-
-								<!-- ==================== Recipes ========================== -->
-
-								<RecipeDef ParentName="AmmoRecipeBase">
-									<defName>MakeAmmo_Abyssnail</defName>
-									<label>make abyssal nails x500</label>
-									<description>Craft 500 abyssal nails.</description>
-									<jobString>Making abyssal nails.</jobString>
-									<workAmount>2500</workAmount>
-									<ingredients>
-										<li>
-											<filter>
-												<thingDefs>
-													<li>Steel</li>
-												</thingDefs>
-											</filter>
-											<count>5</count>
-										</li>
-									</ingredients>
-									<fixedIngredientFilter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</fixedIngredientFilter>
-									<products>
-										<Ammo_Abyssnail>500</Ammo_Abyssnail>
-									</products>
-								</RecipeDef>
-							</value>
-						</li>
-
-						<!-- ==================== Moyo Specific Ammosets ========================== -->
-
-						<!--6x18 Moyo-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<CombatExtended.AmmoSetDef>
-									<defName>AmmoSet_6x18mmMoyo</defName>
-									<label>6x18mm Charged Bullet</label>
-									<ammoTypes>
-										<Ammo_6x18mmCharged>Bullet_6x18mmMoyo</Ammo_6x18mmCharged>
-										<Ammo_6x18mmCharged_AP>Bullet_6x18mmMoyo_AP</Ammo_6x18mmCharged_AP>
-										<Ammo_6x18mmCharged_Ion>Bullet_6x18mmMoyo_Ion</Ammo_6x18mmCharged_Ion>
-									</ammoTypes>
-								</CombatExtended.AmmoSetDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-
-								<ThingDef ParentName="Base6x18mmChargedBullet">
-									<defName>Bullet_6x18mmMoyo</defName>
-									<label>6x18mm Charged bullet</label>
-									<graphicData>
-										<texPath>Things/Weapons/MoyoSmallBolt</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageAmountBase>10</damageAmountBase>
-										<secondaryDamage>
-											<li>
-												<def>Bomb_Secondary</def>
-												<amount>3</amount>
-											</li>
-										</secondaryDamage>
-										<armorPenetrationSharp>12</armorPenetrationSharp>
-										<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
-									</projectile>
-								</ThingDef>
-
-								<ThingDef ParentName="Base6x18mmChargedBullet">
-									<defName>Bullet_6x18mmMoyo_AP</defName>
-									<label>6x18mm Charged bullet (Conc.)</label>
-									<graphicData>
-										<texPath>Things/Weapons/MoyoSmallBolt</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageAmountBase>8</damageAmountBase>
-										<secondaryDamage>
-											<li>
-												<def>Bomb_Secondary</def>
-												<amount>1</amount>
-											</li>
-										</secondaryDamage>
-										<armorPenetrationSharp>24</armorPenetrationSharp>
-										<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
-									</projectile>
-								</ThingDef>
-
-								<ThingDef ParentName="Base6x18mmChargedBullet">
-									<defName>Bullet_6x18mmMoyo_Ion</defName>
-									<label>6x18mm Charged bullet (Ion)</label>
-									<graphicData>
-										<texPath>Things/Weapons/MoyoSmallBolt</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageAmountBase>8</damageAmountBase>
-										<secondaryDamage>
-											<li>
-												<def>EMP</def>
-												<amount>5</amount>
-											</li>
-										</secondaryDamage>
-										<armorPenetrationSharp>18</armorPenetrationSharp>
-										<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
-										<empShieldBreakChance>1</empShieldBreakChance>
-									</projectile>
-								</ThingDef>
-
-							</value>
-						</li>
-
-						<!--6x24 Moyo-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<CombatExtended.AmmoSetDef>
-									<defName>AmmoSet_6x24mmMoyo</defName>
-									<label>6x24mm Charged Bullet</label>
-									<ammoTypes>
-										<Ammo_6x24mmCharged>Bullet_6x24mmMoyo</Ammo_6x24mmCharged>
-										<Ammo_6x24mmCharged_AP>Bullet_6x24mmMoyo_AP</Ammo_6x24mmCharged_AP>
-										<Ammo_6x24mmCharged_Ion>Bullet_6x24mmMoyo_Ion</Ammo_6x24mmCharged_Ion>
-									</ammoTypes>
-								</CombatExtended.AmmoSetDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-
-								<ThingDef ParentName="Base6x24mmChargedBullet">
-									<defName>Bullet_6x24mmMoyo</defName>
-									<label>6x24mm Charged bullet</label>
-									<graphicData>
-										<texPath>Things/Weapons/MoyoSmallBolt</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageAmountBase>13</damageAmountBase>
-										<secondaryDamage>
-											<li>
-												<def>Bomb_Secondary</def>
-												<amount>4</amount>
-											</li>
-										</secondaryDamage>
-										<armorPenetrationSharp>15</armorPenetrationSharp>
-										<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
-									</projectile>
-								</ThingDef>
-
-								<ThingDef ParentName="Base6x24mmChargedBullet">
-									<defName>Bullet_6x24mmMoyo_AP</defName>
-									<label>6x24mm Charged bullet (Conc.)</label>
-									<graphicData>
-										<texPath>Things/Weapons/MoyoSmallBolt</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageAmountBase>10</damageAmountBase>
-										<secondaryDamage>
-											<li>
-												<def>Bomb_Secondary</def>
-												<amount>2</amount>
-											</li>
-										</secondaryDamage>
-										<armorPenetrationSharp>30</armorPenetrationSharp>
-										<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
-									</projectile>
-								</ThingDef>
-
-								<ThingDef ParentName="Base6x24mmChargedBullet">
-									<defName>Bullet_6x24mmMoyo_Ion</defName>
-									<label>6x24mm Charged bullet (Ion)</label>
-									<graphicData>
-										<texPath>Things/Weapons/MoyoSmallBolt</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageAmountBase>10</damageAmountBase>
-										<secondaryDamage>
-											<li>
-												<def>EMP</def>
-												<amount>6</amount>
-											</li>
-										</secondaryDamage>
-										<armorPenetrationSharp>22.5</armorPenetrationSharp>
-										<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
-										<empShieldBreakChance>0.2</empShieldBreakChance>
-									</projectile>
-								</ThingDef>
-
-							</value>
-						</li>
-
-						<!--6x24 Warped : Removed
-			
-			<li Class="PatchOperationAdd">
-				<xpath>Defs</xpath>
-				<value>
-					<CombatExtended.AmmoSetDef>
-						<defName>AmmoSet_6x24mmWMoyo</defName>
-						<label>6x24mm Charged Bullet</label>
-						<ammoTypes>
-						  <Ammo_6x24mmCharged>Bullet_6x24mmWMoyo</Ammo_6x24mmCharged>
-						  <Ammo_6x24mmCharged_AP>Bullet_6x24mmWMoyo_AP</Ammo_6x24mmCharged_AP>
-						  <Ammo_6x24mmCharged_Ion>Bullet_6x24mmWMoyo_Ion</Ammo_6x24mmCharged_Ion>
-						</ammoTypes>
-					</CombatExtended.AmmoSetDef>
-				</value>
-			</li>
-			
-			<li Class="PatchOperationAdd">
-				<xpath>Defs</xpath>
-				<value>
-				
-					<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmChargedBullet">
-						<defName>Bullet_6x24mmWMoyo</defName>
-						<label>6x24mm Charged bullet</label>
-						<graphicData>
-						  <texPath>Things/Weapons/Warped/ARWarped_Bullet</texPath>
-						  <graphicClass>Graphic_Single</graphicClass>
-						</graphicData>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						  <speed>200</speed>
-						  <damageAmountBase>15</damageAmountBase>
-						  <secondaryDamage>
-							<li>
-							  <def>Bomb_Secondary</def>
-							  <amount>4</amount>
-							</li>
-						  </secondaryDamage>
-						  <armorPenetrationSharp>14</armorPenetrationSharp>
-						  <armorPenetrationBlunt>40</armorPenetrationBlunt>
-						</projectile>
-					</ThingDef>
-					
-					<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmChargedBullet">
-						<defName>Bullet_6x24mmWMoyo_AP</defName>
-						<label>6x24mm Charged bullet (Conc.)</label>
-						<graphicData>
-						  <texPath>Things/Weapons/Warped/ARWarped_Bullet</texPath>
-						  <graphicClass>Graphic_Single</graphicClass>
-						</graphicData>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						  <speed>200</speed>
-						  <damageAmountBase>12</damageAmountBase>
-						  <secondaryDamage>
-							<li>
-							  <def>Bomb_Secondary</def>
-							  <amount>2</amount>
-							</li>
-						  </secondaryDamage>
-						  <armorPenetrationSharp>28</armorPenetrationSharp>
-						  <armorPenetrationBlunt>40</armorPenetrationBlunt>
-						</projectile>
-					</ThingDef>
-					
-					<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmChargedBullet">
-						<defName>Bullet_6x24mmWMoyo_Ion</defName>
-						<label>6x24mm Charged bullet (Ion)</label>
-						<graphicData>
-						  <texPath>Things/Weapons/Warped/ARWarped_Bullet</texPath>
-						  <graphicClass>Graphic_Single</graphicClass>
-						</graphicData>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						  <speed>200</speed>
-						  <damageAmountBase>12</damageAmountBase>
-						  <secondaryDamage>
-							<li>
-							  <def>EMP</def>
-							  <amount>7</amount>
-							</li>
-						  </secondaryDamage>
-						  <armorPenetrationSharp>18</armorPenetrationSharp>
-						  <armorPenetrationBlunt>40</armorPenetrationBlunt>
-						</projectile>
-					</ThingDef>
-					
-				</value>
-			</li>
-			-->
-
-						<!--8x35 Moyo-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<CombatExtended.AmmoSetDef>
-									<defName>AmmoSet_8x35mmMoyo</defName>
-									<label>8x35mm Charged Bullet</label>
-									<ammoTypes>
-										<Ammo_8x35mmCharged>Bullet_8x35mmMoyo</Ammo_8x35mmCharged>
-										<Ammo_8x35mmCharged_AP>Bullet_8x35mmMoyo_AP</Ammo_8x35mmCharged_AP>
-										<Ammo_8x35mmCharged_Ion>Bullet_8x35mmMoyo_Ion</Ammo_8x35mmCharged_Ion>
-									</ammoTypes>
-								</CombatExtended.AmmoSetDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-
-								<ThingDef ParentName="Base8x35mmChargedBullet">
-									<defName>Bullet_8x35mmMoyo</defName>
-									<label>8x35mm Charged bullet</label>
-									<graphicData>
-										<texPath>Things/Weapons/MoyoSmallBolt</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageAmountBase>19</damageAmountBase>
-										<secondaryDamage>
-											<li>
-												<def>Bomb_Secondary</def>
-												<amount>6</amount>
-											</li>
-										</secondaryDamage>
-										<armorPenetrationSharp>15</armorPenetrationSharp>
-										<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
-									</projectile>
-								</ThingDef>
-
-								<ThingDef ParentName="Base8x35mmChargedBullet">
-									<defName>Bullet_8x35mmMoyo_AP</defName>
-									<label>8x35mm Charged bullet (Conc.)</label>
-									<graphicData>
-										<texPath>Things/Weapons/MoyoSmallBolt</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageAmountBase>15</damageAmountBase>
-										<secondaryDamage>
-											<li>
-												<def>Bomb_Secondary</def>
-												<amount>2</amount>
-											</li>
-										</secondaryDamage>
-										<armorPenetrationSharp>30</armorPenetrationSharp>
-										<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
-									</projectile>
-								</ThingDef>
-
-								<ThingDef ParentName="Base8x35mmChargedBullet">
-									<defName>Bullet_8x35mmMoyo_Ion</defName>
-									<label>8x35mm Charged bullet (Ion)</label>
-									<graphicData>
-										<texPath>Things/Weapons/MoyoSmallBolt</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageAmountBase>15</damageAmountBase>
-										<secondaryDamage>
-											<li>
-												<def>EMP</def>
-												<amount>9</amount>
-											</li>
-										</secondaryDamage>
-										<armorPenetrationSharp>22.5</armorPenetrationSharp>
-										<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
-										<empShieldBreakChance>0.2</empShieldBreakChance>
-									</projectile>
-								</ThingDef>
-
-							</value>
-						</li>
-
-						<!--8x50 Moyo-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<CombatExtended.AmmoSetDef>
-									<defName>AmmoSet_8x50mmMoyo</defName>
-									<label>8x50mm Charged Bullet</label>
-									<ammoTypes>
-										<Ammo_8x50mmCharged>Bullet_8x50mmMoyo</Ammo_8x50mmCharged>
-										<Ammo_8x50mmCharged_AP>Bullet_8x50mmMoyo_AP</Ammo_8x50mmCharged_AP>
-										<Ammo_8x50mmCharged_Ion>Bullet_8x50mmMoyo_Ion</Ammo_8x50mmCharged_Ion>
-									</ammoTypes>
-								</CombatExtended.AmmoSetDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-
-								<ThingDef ParentName="Base8x50mmChargedBullet">
-									<defName>Bullet_8x50mmMoyo</defName>
-									<label>8x50mm Charged bullet</label>
-									<graphicData>
-										<texPath>Things/Weapons/MoyoSmallBolt</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageAmountBase>24</damageAmountBase>
-										<secondaryDamage>
-											<li>
-												<def>Bomb_Secondary</def>
-												<amount>7</amount>
-											</li>
-										</secondaryDamage>
-										<armorPenetrationSharp>18</armorPenetrationSharp>
-										<armorPenetrationBlunt>120</armorPenetrationBlunt>
-									</projectile>
-								</ThingDef>
-
-								<ThingDef ParentName="Base8x50mmChargedBullet">
-									<defName>Bullet_8x50mmMoyo_AP</defName>
-									<label>8x50mm Charged bullet (Conc.)</label>
-									<graphicData>
-										<texPath>Things/Weapons/MoyoSmallBolt</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageAmountBase>19</damageAmountBase>
-										<secondaryDamage>
-											<li>
-												<def>Bomb_Secondary</def>
-												<amount>3</amount>
-											</li>
-										</secondaryDamage>
-										<armorPenetrationSharp>36</armorPenetrationSharp>
-										<armorPenetrationBlunt>120</armorPenetrationBlunt>
-									</projectile>
-								</ThingDef>
-
-								<ThingDef ParentName="Base8x50mmChargedBullet">
-									<defName>Bullet_8x50mmMoyo_Ion</defName>
-									<label>8x50mm Charged bullet (Ion)</label>
-									<graphicData>
-										<texPath>Things/Weapons/MoyoSmallBolt</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageAmountBase>19</damageAmountBase>
-										<secondaryDamage>
-											<li>
-												<def>EMP</def>
-												<amount>11</amount>
-											</li>
-										</secondaryDamage>
-										<armorPenetrationSharp>27</armorPenetrationSharp>
-										<armorPenetrationBlunt>120</armorPenetrationBlunt>
-										<empShieldBreakChance>1</empShieldBreakChance>
-									</projectile>
-								</ThingDef>
-
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Moyo from the depth/Bodies/Bodies_Moyo_Mech.xml b/Patches/Moyo from the depth/Bodies/Bodies_Moyo_Mech.xml
deleted file mode 100644
index 77b73c45a1..0000000000
--- a/Patches/Moyo from the depth/Bodies/Bodies_Moyo_Mech.xml	
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Moyo-From the depth</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Scorpion === -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Moyo_Hexapod"]//*[
-						def="Hexapod_TentacleJoint"]
-					</xpath>
-
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Moyo_Hexapod"]//*[
-						def="HexapodHeadShell" or
-						def="Hexapod_TentacleJoint" or
-						def="Hexapod_Tentacle"
-						]/groups
-					</xpath>
-
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- === Scorpion === -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Moyo_Pressurepod"]//*[
-						def="PressurePod_Seg1" or
-						def="pressurepod_ArmJoint" or
-						def="pressurepod_Leg" or
-						def="PressurePod_Seg2" or
-						def="PressurePod_Seg3" or
-						def="PressurePod_Seg4" or
-						def="PressurePod_Seg5"]
-					</xpath>
-
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Moyo_Pressurepod"]//*[
-						def="PressurePod_Seg1" or
-						def="pressurepod_ArmJoint" or
-						def="pressurepod_Leg" or
-						def="PressurePod_Seg2" or
-						def="PressurePod_Seg3" or
-						def="PressurePod_Seg4" or
-						def="PressurePod_Seg5" or
-						def="MechanicalHead" or
-						def="pressurepod_club"]/groups
-					</xpath>
-
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Moyo from the depth/Bodies/Moyo_Bodytype.xml b/Patches/Moyo from the depth/Bodies/Moyo_Bodytype.xml
deleted file mode 100644
index c7ae30b58a..0000000000
--- a/Patches/Moyo from the depth/Bodies/Moyo_Bodytype.xml	
+++ /dev/null
@@ -1,271 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-
-			<!--Moyo Bodytype-->
-
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Moyo-From the depth</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--Arm Groups-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
-							<value>
-								<li>LeftArm</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
-							<value>
-								<li>RightArm</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
-							<value>
-								<li>LeftShoulder</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
-							<value>
-								<li>RightShoulder</li>
-							</value>
-						</li>
-
-						<!--Natural Armor-->
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Moyo"]/corePart/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Moyo_Tail"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Neck"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Leg"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<!-- Changing coverage of the bodyDef (should've done this sooner, but eh) -->
-						<!-- why yes dear explorer of this file, i did just literally copy and paste the Moyo bodytype patches -->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Ribcage"]/coverage</xpath>
-							<value>
-								<coverage>0.07</coverage>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Pelvis"]/coverage</xpath>
-							<value>
-								<coverage>0.05</coverage>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Stomach"]/coverage</xpath>
-							<value>
-								<coverage>0.05</coverage>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="MoyoHeart"]/coverage</xpath>
-							<value>
-								<coverage>0.04</coverage>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Lung"]/coverage</xpath>
-							<value>
-								<coverage>0.055</coverage>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Kidney"]/coverage</xpath>
-							<value>
-								<coverage>0.03</coverage>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Liver"]/coverage</xpath>
-							<value>
-								<coverage>0.06</coverage>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Neck"]/coverage</xpath>
-							<value>
-								<coverage>0.055</coverage>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Skull"]/parts/li[def="Brain"]/coverage</xpath>
-							<value>
-								<coverage>0.9</coverage>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Eye"]/coverage</xpath>
-							<value>
-								<coverage>0.05</coverage>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/coverage</xpath>
-							<value>
-								<coverage>0.05</coverage>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/coverage</xpath>
-							<value>
-								<coverage>0.08</coverage>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Shoulder"]/coverage</xpath>
-							<value>
-								<coverage>0.085</coverage>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Clavicle"]/coverage</xpath>
-							<value>
-								<coverage>0.06</coverage>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Humerus"]/coverage</xpath>
-							<value>
-								<coverage>0.15</coverage>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Radius"]/coverage</xpath>
-							<value>
-								<coverage>0.15</coverage>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Leg"]/parts/li[def="Femur"]/coverage</xpath>
-							<value>
-								<coverage>0.15</coverage>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/BodyDef[defName="Moyo"]/corePart/parts/li[def="Leg"]/parts/li[def="Tibia"]/coverage</xpath>
-							<value>
-								<coverage>0.15</coverage>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>
-								Defs/BodyDef[defName="Moyo"]//*[
-								def="Jaw" or
-								def="Nose" or
-								def="Eye"]/groups
-							</xpath>
-							<value>
-								<li>OutsideSquishy</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Moyo from the depth/Drugs/Belial-V_Effect.xml b/Patches/Moyo from the depth/Drugs/Belial-V_Effect.xml
deleted file mode 100644
index ce62d4b194..0000000000
--- a/Patches/Moyo from the depth/Drugs/Belial-V_Effect.xml	
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Moyo-From the depth</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="BelialVEffect_4"]/stages/li[1]/statOffsets/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="BelialVEffect_4"]/stages/li[1]/statOffsets/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="BelialVEffect_4U"]/stages/li[1]/statOffsets/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>1.75</ArmorRating_Sharp>
-								<ArmorRating_Electric>0.20</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="BelialVEffect_4U"]/stages/li[1]/statOffsets/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>3</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/HediffDef[defName="BelialVEffect_5"]/stages/li[1]/statOffsets</xpath>
-							<value>
-								<Suppressability>-0.25</Suppressability>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="BelialVEffect_7"]/stages/li[1]/statOffsets/ShootingAccuracyPawn</xpath>
-							<value>
-								<ShootingAccuracyPawn>0.3</ShootingAccuracyPawn>
-								<AimingAccuracy>0.15</AimingAccuracy>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="BelialVEffect_7U"]/stages/li[1]/statOffsets/ShootingAccuracyPawn</xpath>
-							<value>
-								<ShootingAccuracyPawn>0.6</ShootingAccuracyPawn>
-								<AimingAccuracy>0.3</AimingAccuracy>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/HediffDef[defName="BelialVEffect_3"]/stages/li[1]</xpath>
-							<value>
-								<statOffsets>
-									<NightVisionEfficiency>0.20</NightVisionEfficiency>
-								</statOffsets>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/HediffDef[defName="BelialVEffect_3U"]/stages/li[1]/statOffsets</xpath>
-							<value>
-								<NightVisionEfficiency>0.60</NightVisionEfficiency>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Moyo from the depth/Drugs/Deepblue_splicing.xml b/Patches/Moyo from the depth/Drugs/Deepblue_splicing.xml
deleted file mode 100644
index 445a8abc1d..0000000000
--- a/Patches/Moyo from the depth/Drugs/Deepblue_splicing.xml	
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Moyo-From the depth</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/HediffDef[defName="BlueYoHigh"]/stages/li[1]</xpath>
-							<value>
-								<statOffsets>
-									<Suppressability>-0.5</Suppressability>
-								</statOffsets>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/HediffDef[defName="BlueGoHigh"]/stages/li[1]</xpath>
-							<value>
-								<statOffsets>
-									<Suppressability>-0.5</Suppressability>
-								</statOffsets>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Moyo from the depth/PawnKindDefs/Moyo_PawnKind.xml b/Patches/Moyo from the depth/PawnKindDefs/Moyo_PawnKind.xml
deleted file mode 100644
index e4752e07ab..0000000000
--- a/Patches/Moyo from the depth/PawnKindDefs/Moyo_PawnKind.xml	
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Moyo-From the depth</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--Ammo-->
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[
-								defName="Moyo_TopCivilan" or
-								defName="Moyo_MiddleCivilan" or
-								defName="Moyo_BottomCivilan" or
-								defName="Moyo_Resercher" or
-								defName="Moyo_TopSmuggler" or
-								defName="Moyo_MiddleSmuggler" or
-								@Name="MoyoSoldierLight" or
-								@Name="MoyoSoliderStandard" or
-								defName="Moyo_leader" or
-								@Name="MoyoGuardian" or
-								@Name="MoyoGuardianAssault" or
-								@Name="MoyoGeneral"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>6</max>
-									</primaryMagazineCount>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[@Name="MoyoSoldierHeavy"]</xpath>
-							<value>
-								<li Inherit="False" Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>3</max>
-									</primaryMagazineCount>
-									<forcedSidearm>
-										<sidearmMoney>
-											<min>500</min>
-											<max>1200</max>
-										</sidearmMoney>
-										<weaponTags>
-											<li>MoyoBasicGun</li>
-											<li>Moyo_SpacerLightGun</li>
-										</weaponTags>
-										<magazineCount>
-											<min>3</min>
-											<max>4</max>
-										</magazineCount>
-									</forcedSidearm>
-								</li>
-							</value>
-						</li>
-
-						<!--Backpack-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/PawnKindDef[
-								@Name="MoyoSoldierLight" or
-								@Name="MoyoSoliderStandard" or
-								@Name="MoyoSoldierHeavy" or
-								@Name="MoyoSoldierAssult" or
-								@Name="MoyoGuardian" or
-								@Name="MoyoGuardianAssault" or
-								@Name="MoyoGeneral" or
-								defName="Moyo_Engineer" or
-								defName="Moyo_Resercher" or
-								defName="Moyo_MiddleSmuggler"
-								]/apparelRequired </xpath>
-							<value>
-								<li>CE_Apparel_Backpack</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="CE_Apparel_Backpack"]/apparel/tags</xpath>
-							<value>
-								<li>Moyo_Industrial</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="CE_Apparel_KidBackpack"]/apparel/tags</xpath>
-							<value>
-								<li>Moyo_Industrial</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="CE_Apparel_TribalBackpack"]/apparel/tags</xpath>
-							<value>
-								<li>Moyo_Neolithic</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Moyo from the depth/Scenario/Moyo_Scenario.xml b/Patches/Moyo from the depth/Scenario/Moyo_Scenario.xml
deleted file mode 100644
index 41115a6eeb..0000000000
--- a/Patches/Moyo from the depth/Scenario/Moyo_Scenario.xml	
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Moyo-From the depth</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ScenarioDef[defName="Moyo_RefugeeScenario"]/scenario/parts</xpath>
-							<value>
-								<li Class="ScenPart_StartingThing_Defined">
-									<def>StartingThing_Defined</def>
-									<thingDef>Ammo_6x18mmCharged</thingDef>
-									<count>216</count>
-								</li>
-								<li Class="ScenPart_StartingThing_Defined">
-									<def>StartingThing_Defined</def>
-									<thingDef>Ammo_Abyssnail</thingDef>
-									<count>240</count>
-								</li>
-							</value>
-						</li>
-
-						<!--Add material filter to faction for MIB type events-->
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/FactionDef[@Name="Moyo_PlayerBase"]/apparelStuffFilter</xpath>
-							<match Class="PatchOperationConditional">
-								<xpath>Defs/FactionDef[@Name="Moyo_PlayerBase"]/apparelStuffFilter/thingDefs</xpath>
-								<match Class="PatchOperationConditional">
-									<xpath>Defs/FactionDef[@Name="Moyo_PlayerBase"]/apparelStuffFilter/thingDefs/li["Steel"]</xpath>
-									<match Class="PatchOperationReplace">
-										<xpath>Defs/FactionDef[@Name="Moyo_PlayerBase"]/apparelStuffFilter/thingDefs/li["Steel"]</xpath>
-										<value>
-											<li>Steel</li>
-										</value>
-									</match>
-									<nomatch Class="PatchOperationAdd">
-										<xpath>Defs/FactionDef[@Name="Moyo_PlayerBase"]/apparelStuffFilter/thingDefs</xpath>
-										<value>
-											<li>Steel</li>
-										</value>
-									</nomatch>
-								</match>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/FactionDef[@Name="Moyo_PlayerBase"]/apparelStuffFilter</xpath>
-									<value>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</value>
-								</nomatch>
-							</match>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/FactionDef[@Name="Moyo_PlayerBase"]</xpath>
-								<value>
-									<apparelStuffFilter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</apparelStuffFilter>
-								</value>
-							</nomatch>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Moyo from the depth/ThingDefs_Items/Items_Resources.xml b/Patches/Moyo from the depth/ThingDefs_Items/Items_Resources.xml
deleted file mode 100644
index 4938ed0a84..0000000000
--- a/Patches/Moyo from the depth/ThingDefs_Items/Items_Resources.xml	
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Moyo-From the depth</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!-- ==========  Abyssteel  =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_Abyssteel"]/statBases/StuffPower_Armor_Sharp</xpath>
-							<value>
-								<StuffPower_Armor_Sharp>2</StuffPower_Armor_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_Abyssteel"]/statBases/StuffPower_Armor_Blunt</xpath>
-							<value>
-								<StuffPower_Armor_Blunt>3.5</StuffPower_Armor_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_Abyssteel"]/statBases/StuffPower_Armor_Heat</xpath>
-							<value>
-								<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
-								<StuffPower_Armor_Electric>0.05</StuffPower_Armor_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_Abyssteel"]/stuffProps/categories</xpath>
-							<value>
-								<li>Metallic_Weapon</li>
-								<li>Steeled</li>
-							</value>
-						</li>
-
-						<!-- ==========  Depthweave  =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_Depthweave"]/statBases/StuffPower_Armor_Sharp</xpath>
-							<value>
-								<StuffPower_Armor_Sharp>0.25</StuffPower_Armor_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_Depthweave"]/statBases/StuffPower_Armor_Blunt</xpath>
-							<value>
-								<StuffPower_Armor_Blunt>0.08</StuffPower_Armor_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_Depthweave"]/statBases/StuffPower_Armor_Heat</xpath>
-							<value>
-								<StuffPower_Armor_Heat>0.025</StuffPower_Armor_Heat>
-								<StuffPower_Armor_Electric>0.025</StuffPower_Armor_Electric>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Moyo from the depth/ThingDefs_Misc/Moyo_Apparel.xml b/Patches/Moyo from the depth/ThingDefs_Misc/Moyo_Apparel.xml
deleted file mode 100644
index e79bc9ff7d..0000000000
--- a/Patches/Moyo from the depth/ThingDefs_Misc/Moyo_Apparel.xml	
+++ /dev/null
@@ -1,663 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Moyo-From the depth</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--========= Stuffable =========-->
-
-						<!--Tribalwear-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_Tribal"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<!--Shirt And boots-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_SnB"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>2.75</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<!--Straps-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_BodyStrap"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>0.5</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<!--Parka-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_Parka"]/statBases</xpath>
-							<value>
-								<Bulk>10</Bulk>
-								<WornBulk>3</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_Parka"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<!--Jacket/Duster-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_Jacket"]/statBases</xpath>
-							<value>
-								<Bulk>5</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_Duster"]/statBases</xpath>
-							<value>
-								<Bulk>7.5</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_Jacket" or
-								defName="Moyo_Duster"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<!--Cowboy/Bowler/Tuque-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_Tuque" or
-								defName="Moyo_CowboyHat" or
-								defName="Moyo_BowlerHat"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_Tuque" or
-								defName="Moyo_CowboyHat" or
-								defName="Moyo_BowlerHat"]/apparel/layers </xpath>
-							<value>
-								<layers>
-									<li>Overhead</li>
-								</layers>
-							</value>
-						</li>
-
-						<!--========= Fixed Armor Value =========-->
-
-						<!--Bodysuit-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_Bodysuit"]/statBases</xpath>
-							<value>
-								<Bulk>5</Bulk>
-								<WornBulk>2</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_Bodysuit"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-								<ArmorRating_Electric>0.15</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_Bodysuit"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.3</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_Bodysuit"]/apparel/bodyPartGroups</xpath>
-							<value>
-								<li>Hands</li>
-								<li>Feet</li>
-							</value>
-						</li>
-
-						<!--Engineering Suit-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_EGsuit"]/statBases</xpath>
-							<value>
-								<Bulk>25</Bulk>
-								<WornBulk>5</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_EGsuit"]/statBases/Mass</xpath>
-							<value>
-								<Mass>12</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_EGsuit"]/statBases/MaxHitPoints</xpath>
-							<value>
-								<MaxHitPoints>175</MaxHitPoints>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_EGsuit"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>6.5</ArmorRating_Sharp>
-								<ArmorRating_Electric>0.45</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_EGsuit"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>9.75</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--Engineering Mask-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_EGmask"]/statBases</xpath>
-							<value>
-								<Bulk>4</Bulk>
-								<WornBulk>1</WornBulk>
-								<NightVisionEfficiency_Apparel>0.1</NightVisionEfficiency_Apparel>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_EGmask"]/statBases/MaxHitPoints</xpath>
-							<value>
-								<MaxHitPoints>100</MaxHitPoints>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_EGmask"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>5</ArmorRating_Sharp>
-								<ArmorRating_Electric>0.25</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_EGmask"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_EGmask"]/apparel/layers</xpath>
-							<value>
-								<layers>
-									<li>OnHead</li>
-									<li>StrappedHead</li>
-									<li>Overhead</li>
-								</layers>
-							</value>
-						</li>
-
-						<!--Suppressive Mask-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_PShelmet" or defName="Moyo_SShelmet"]/statBases</xpath>
-							<value>
-								<Bulk>4</Bulk>
-								<WornBulk>1</WornBulk>
-								<NightVisionEfficiency_Apparel>0.4</NightVisionEfficiency_Apparel>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_PShelmet" or defName="Moyo_SShelmet"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>8</ArmorRating_Sharp>
-								<ArmorRating_Electric>0.25</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_PShelmet" or defName="Moyo_SShelmet"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>12</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--Evasuit-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_Evasuit"]/statBases</xpath>
-							<value>
-								<Bulk>5</Bulk>
-								<WornBulk>2</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_Evasuit"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
-								<ArmorRating_Electric>0.30</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_Evasuit"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>4</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_Evasuit"]/apparel/bodyPartGroups</xpath>
-							<value>
-								<li>Hands</li>
-								<li>Feet</li>
-							</value>
-						</li>
-
-						<!--Deepdiving Gear-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_DDgear"]/statBases</xpath>
-							<value>
-								<Bulk>125</Bulk>
-								<WornBulk>20</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_DDgear"]/statBases/Mass</xpath>
-							<value>
-								<Mass>75</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_DDgear"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>16</ArmorRating_Sharp>
-								<ArmorRating_Electric>0.60</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_DDgear"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>64</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_DDgear"]/statBases/Flammability</xpath>
-							<value>
-								<Flammability>0</Flammability>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_DDgear"]/equippedStatOffsets</xpath>
-							<value>
-								<CarryWeight>85</CarryWeight>
-								<CarryBulk>10</CarryBulk>
-								<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_DDgear"]/costList/Moyo_Abyssteel</xpath>
-							<value>
-								<Moyo_Abyssteel>190</Moyo_Abyssteel>
-								<DevilstrandCloth>40</DevilstrandCloth>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="Moyo_PowerArmorBase"]/apparel/bodyPartGroups</xpath>
-							<value>
-								<li>Hands</li>
-								<li>Feet</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[defName="Moyo_DDgear"]</xpath>
-							<value>
-								<li Class="CombatExtended.PartialArmorExt">
-									<stats>
-										<li>
-											<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-											<parts>
-												<li>Neck</li>
-												<li>Leg</li>
-												<li>Arm</li>
-											</parts>
-										</li>
-										<li>
-											<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-											<parts>
-												<li>Neck</li>
-												<li>Leg</li>
-												<li>Arm</li>
-											</parts>
-										</li>
-										<li>
-											<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-											<parts>
-												<li>Hand</li>
-											</parts>
-										</li>
-										<li>
-											<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-											<parts>
-												<li>Hand</li>
-											</parts>
-										</li>
-									</stats>
-								</li>
-							</value>
-						</li>
-
-						<!--Deepdiving Helmet-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_DDhelmet"]/statBases</xpath>
-							<value>
-								<Bulk>6</Bulk>
-								<WornBulk>3</WornBulk>
-								<NightVisionEfficiency_Apparel>0.4</NightVisionEfficiency_Apparel>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_DDhelmet"]/statBases/Mass</xpath>
-							<value>
-								<Mass>5</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_DDhelmet"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>16</ArmorRating_Sharp>
-								<ArmorRating_Electric>0.55</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_DDhelmet"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>64</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_DDhelmet"]/statBases/Flammability</xpath>
-							<value>
-								<Flammability>0</Flammability>
-							</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="Moyo_DDhelmet"]/apparel/immuneToToxGasExposure</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="Moyo_DDhelmet"]/apparel</xpath>
-								<value>
-									<immuneToToxGasExposure>true</immuneToToxGasExposure>
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_DDhelmet"]/equippedStatOffsets/MoveSpeed</xpath>
-							<value>
-								<SmokeSensitivity>-1</SmokeSensitivity>
-								<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_DDhelmet"]/costList/Moyo_Abyssteel</xpath>
-							<value>
-								<Moyo_Abyssteel>60</Moyo_Abyssteel>
-								<DevilstrandCloth>20</DevilstrandCloth>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="Moyo_PowerHelmetBase"]/apparel/layers</xpath>
-							<value>
-								<layers>
-									<li>OnHead</li>
-									<li>StrappedHead</li>
-									<li>Overhead</li>
-								</layers>
-							</value>
-						</li>
-
-						<!--Diving Gear-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_LDgear"]/statBases</xpath>
-							<value>
-								<Bulk>125</Bulk>
-								<WornBulk>15</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_LDgear"]/statBases/Mass</xpath>
-							<value>
-								<Mass>60</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_LDgear"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>14</ArmorRating_Sharp>
-								<ArmorRating_Electric>0.50</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_LDgear"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>50</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_LDgear"]/statBases/Flammability</xpath>
-							<value>
-								<Flammability>0</Flammability>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_LDgear"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<CarryWeight>75</CarryWeight>
-									<CarryBulk>10</CarryBulk>
-									<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_LDgear"]/costList/Moyo_Abyssteel</xpath>
-							<value>
-								<Moyo_Abyssteel>150</Moyo_Abyssteel>
-								<DevilstrandCloth>30</DevilstrandCloth>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[defName="Moyo_LDgear"]</xpath>
-							<value>
-								<li Class="CombatExtended.PartialArmorExt">
-									<stats>
-										<li>
-											<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-											<parts>
-												<li>Neck</li>
-											</parts>
-										</li>
-										<li>
-											<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-											<parts>
-												<li>Neck</li>
-											</parts>
-										</li>
-										<li>
-											<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-											<parts>
-												<li>Leg</li>
-												<li>Arm</li>
-											</parts>
-										</li>
-										<li>
-											<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-											<parts>
-												<li>Leg</li>
-												<li>Arm</li>
-											</parts>
-										</li>
-										<li>
-											<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-											<parts>
-												<li>Hand</li>
-											</parts>
-										</li>
-										<li>
-											<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-											<parts>
-												<li>Hand</li>
-											</parts>
-										</li>
-									</stats>
-								</li>
-							</value>
-						</li>
-
-						<!--Diving Helmet-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_LDhelmet"]/statBases</xpath>
-							<value>
-								<Bulk>6</Bulk>
-								<WornBulk>2</WornBulk>
-								<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_LDhelmet"]/statBases/Mass</xpath>
-							<value>
-								<Mass>1.5</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_LDhelmet"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>12</ArmorRating_Sharp>
-								<ArmorRating_Electric>0.35</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_LDhelmet"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>48</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_LDhelmet"]/statBases/Flammability</xpath>
-							<value>
-								<Flammability>0</Flammability>
-							</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="Moyo_LDhelmet"]/apparel/immuneToToxGasExposure</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="Moyo_LDhelmet"]/apparel</xpath>
-								<value>
-									<immuneToToxGasExposure>true</immuneToToxGasExposure>
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_LDhelmet"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<SmokeSensitivity>-1</SmokeSensitivity>
-									<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_LDhelmet"]/costList/Moyo_Abyssteel</xpath>
-							<value>
-								<Moyo_Abyssteel>50</Moyo_Abyssteel>
-								<DevilstrandCloth>15</DevilstrandCloth>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[defName="Moyo_LDhelmet"]</xpath>
-							<value>
-								<li Class="CombatExtended.PartialArmorExt">
-									<stats>
-										<li>
-											<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-											<parts>
-												<li>Eye</li>
-												<li>Nose</li>
-												<li>Jaw</li>
-											</parts>
-										</li>
-									</stats>
-								</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Moyo from the depth/ThingDefs_Misc/Moyo_Dragonian_Apparel.xml b/Patches/Moyo from the depth/ThingDefs_Misc/Moyo_Dragonian_Apparel.xml
deleted file mode 100644
index ffd4f07e86..0000000000
--- a/Patches/Moyo from the depth/ThingDefs_Misc/Moyo_Dragonian_Apparel.xml	
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Moyo-From the depth</li>
-				</mods>
-				<match Class="PatchOperationFindMod">
-					<mods>
-						<li>Dragonian GaramRace</li>
-						<li>Dragonian Race</li>
-						<li>Dragonian Race 1.4(unofficial)</li>
-					</mods>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<!--Dragon Dress-->
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[@Name="Moyo_DragonDress"]/statBases</xpath>
-								<value>
-									<Bulk>7.5</Bulk>
-									<WornBulk>1</WornBulk>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[@Name="Moyo_DragonDress"]/statBases/ArmorRating_Sharp</xpath>
-								<value>
-									<ArmorRating_Sharp>7.5</ArmorRating_Sharp>
-									<ArmorRating_Electric>0.60</ArmorRating_Electric>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[@Name="Moyo_DragonDress"]/statBases/ArmorRating_Blunt</xpath>
-								<value>
-									<ArmorRating_Blunt>11.25</ArmorRating_Blunt>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="Moyo_Exoframeproto"]/statBases</xpath>
-								<value>
-									<Bulk>7.5</Bulk>
-									<WornBulk>5</WornBulk>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="Moyo_Exoframeproto"]/statBases/ArmorRating_Sharp</xpath>
-								<value>
-									<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="Moyo_Exoframeproto"]/statBases/ArmorRating_Blunt</xpath>
-								<value>
-									<ArmorRating_Blunt>1</ArmorRating_Blunt>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="Moyo_Exoframeproto"]/equippedStatOffsets</xpath>
-								<value>
-									<CarryWeight>7.5</CarryWeight>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Moyo from the depth/ThingDefs_Misc/Moyo_Royal_Apparel.xml b/Patches/Moyo from the depth/ThingDefs_Misc/Moyo_Royal_Apparel.xml
deleted file mode 100644
index 9392b9d135..0000000000
--- a/Patches/Moyo from the depth/ThingDefs_Misc/Moyo_Royal_Apparel.xml	
+++ /dev/null
@@ -1,469 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Moyo-From the depth</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--Royal suit-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_Royalsuit"]/statBases</xpath>
-							<value>
-								<Bulk>5</Bulk>
-								<WornBulk>2</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_Royalsuit"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>3.5</ArmorRating_Sharp>
-								<ArmorRating_Electric>0.40</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_Royalsuit"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>5.25</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_Royalsuit"]/apparel/bodyPartGroups</xpath>
-							<value>
-								<li>Hands</li>
-								<li>Feet</li>
-							</value>
-						</li>
-
-						<!--Celeberty-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_Holosuit"]/statBases</xpath>
-							<value>
-								<Bulk>3</Bulk>
-								<WornBulk>0</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_Holosuit"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>1.75</ArmorRating_Sharp>
-								<ArmorRating_Electric>0.20</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_Holosuit"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>3</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_Holosuit"]/apparel/bodyPartGroups</xpath>
-							<value>
-								<li>Feet</li>
-							</value>
-						</li>
-
-						<!--Royal Robe-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="Moyo_RoyalcoatBase"]/statBases</xpath>
-							<value>
-								<Bulk>7.5</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="Moyo_RoyalcoatBase"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>5</ArmorRating_Sharp>
-								<ArmorRating_Electric>0.60</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="Moyo_RoyalcoatBase"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--Exotic Dress-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_RoyalBlackDress"]/statBases</xpath>
-							<value>
-								<Bulk>7.5</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_RoyalBlackDress"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>5</ArmorRating_Sharp>
-								<ArmorRating_Electric>0.60</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_RoyalBlackDress"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--Royal Guard Armor-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_GDsuit"]/statBases</xpath>
-							<value>
-								<Bulk>125</Bulk>
-								<WornBulk>20</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_GDsuit"]/statBases/Mass</xpath>
-							<value>
-								<Mass>50</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_GDsuit"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>26</ArmorRating_Sharp>
-								<ArmorRating_Electric>0.60</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_GDsuit"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>72</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_GDsuit"]/statBases/Flammability</xpath>
-							<value>
-								<Flammability>0</Flammability>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_GDsuit"]/equippedStatOffsets</xpath>
-							<value>
-								<CarryWeight>85</CarryWeight>
-								<CarryBulk>10</CarryBulk>
-								<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-								<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_GDsuit"]/costList/Moyo_Abyssteel</xpath>
-							<value>
-								<Moyo_Abyssteel>260</Moyo_Abyssteel>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[defName="Moyo_GDsuit"]</xpath>
-							<value>
-								<li Class="CombatExtended.PartialArmorExt">
-									<stats>
-										<li>
-											<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-											<parts>
-												<li>Neck</li>
-												<li>Leg</li>
-												<li>Arm</li>
-											</parts>
-										</li>
-										<li>
-											<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-											<parts>
-												<li>Neck</li>
-												<li>Leg</li>
-												<li>Arm</li>
-											</parts>
-										</li>
-										<li>
-											<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-											<parts>
-												<li>Hand</li>
-											</parts>
-										</li>
-										<li>
-											<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-											<parts>
-												<li>Hand</li>
-											</parts>
-										</li>
-									</stats>
-								</li>
-							</value>
-						</li>
-
-						<!--Royal Guard Helmet-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_GDhelmet"]/statBases</xpath>
-							<value>
-								<Bulk>6</Bulk>
-								<WornBulk>3</WornBulk>
-								<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_GDhelmet"]/statBases/Mass</xpath>
-							<value>
-								<Mass>3</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_GDhelmet"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>22</ArmorRating_Sharp>
-								<ArmorRating_Electric>0.55</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_GDhelmet"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>64</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_GDhelmet"]/statBases/Flammability</xpath>
-							<value>
-								<Flammability>0</Flammability>
-							</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="Moyo_GDhelmet"]/apparel/immuneToToxGasExposure</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="Moyo_GDhelmet"]/apparel</xpath>
-								<value>
-									<immuneToToxGasExposure>true</immuneToToxGasExposure>
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_GDhelmet"]/equippedStatOffsets</xpath>
-							<value>
-								<SmokeSensitivity>-1</SmokeSensitivity>
-								<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_GDhelmet"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-							<value>
-								<AimingAccuracy>0.10</AimingAccuracy>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_GDhelmet"]/costList/Moyo_Abyssteel</xpath>
-							<value>
-								<Moyo_Abyssteel>90</Moyo_Abyssteel>
-								<Hyperweave>10</Hyperweave>
-							</value>
-						</li>
-
-						<!--Royal Guard Light Armor-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_GSsuit"]/statBases</xpath>
-							<value>
-								<Bulk>80</Bulk>
-								<WornBulk>10</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_GSsuit"]/statBases/Mass</xpath>
-							<value>
-								<Mass>25</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_GSsuit"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>16</ArmorRating_Sharp>
-								<ArmorRating_Electric>0.30</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_GSsuit"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>55</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_GSsuit"]/statBases/Flammability</xpath>
-							<value>
-								<Flammability>0</Flammability>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_GSsuit"]/equippedStatOffsets</xpath>
-							<value>
-								<CarryWeight>60</CarryWeight>
-								<CarryBulk>10</CarryBulk>
-								<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-								<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-								<MoveSpeed>0.1</MoveSpeed>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_GSsuit"]/costList/Moyo_Abyssteel</xpath>
-							<value>
-								<Moyo_Abyssteel>150</Moyo_Abyssteel>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[defName="Moyo_GSsuit"]</xpath>
-							<value>
-								<li Class="CombatExtended.PartialArmorExt">
-									<stats>
-										<li>
-											<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-											<parts>
-												<li>Neck</li>
-												<li>Leg</li>
-												<li>Arm</li>
-											</parts>
-										</li>
-										<li>
-											<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-											<parts>
-												<li>Neck</li>
-												<li>Leg</li>
-												<li>Arm</li>
-											</parts>
-										</li>
-										<li>
-											<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-											<parts>
-												<li>Hand</li>
-											</parts>
-										</li>
-										<li>
-											<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-											<parts>
-												<li>Hand</li>
-											</parts>
-										</li>
-									</stats>
-								</li>
-							</value>
-						</li>
-
-						<!--Royal Guard Light Helmet-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_GShelmet"]/statBases</xpath>
-							<value>
-								<Bulk>6</Bulk>
-								<WornBulk>1</WornBulk>
-								<NightVisionEfficiency_Apparel>0.8</NightVisionEfficiency_Apparel>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_GShelmet"]/statBases/Mass</xpath>
-							<value>
-								<Mass>1</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_GShelmet"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>20</ArmorRating_Sharp>
-								<ArmorRating_Electric>0.55</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_GShelmet"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>60</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_GShelmet"]/statBases/Flammability</xpath>
-							<value>
-								<Flammability>0</Flammability>
-							</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="Moyo_GShelmet"]/apparel/immuneToToxGasExposure</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="Moyo_GShelmet"]/apparel</xpath>
-								<value>
-									<immuneToToxGasExposure>true</immuneToToxGasExposure>
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_GShelmet"]/equippedStatOffsets</xpath>
-							<value>
-								<SmokeSensitivity>-1</SmokeSensitivity>
-								<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_GShelmet"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-							<value>
-								<AimingAccuracy>0.10</AimingAccuracy>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_GShelmet"]/costList/Moyo_Abyssteel</xpath>
-							<value>
-								<Moyo_Abyssteel>80</Moyo_Abyssteel>
-								<Hyperweave>10</Hyperweave>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Moyo from the depth/ThingDefs_Misc/Weapons.xml b/Patches/Moyo from the depth/ThingDefs_Misc/Weapons.xml
deleted file mode 100644
index 07ba38a3fe..0000000000
--- a/Patches/Moyo from the depth/ThingDefs_Misc/Weapons.xml	
+++ /dev/null
@@ -1,889 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Moyo-From the depth</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!-- ==========  Moyo Wrench  =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_Wrench"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>4</power>
-										<cooldownTime>1.84</cooldownTime>
-										<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>19</power>
-										<cooldownTime>2.61</cooldownTime>
-										<chanceFactor>1.5</chanceFactor>
-										<armorPenetrationBlunt>7.605</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_Wrench"]/statBases</xpath>
-							<value>
-								<MeleeCounterParryBonus>0.25</MeleeCounterParryBonus>
-								<Bulk>3.5</Bulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_Wrench"]/equippedStatOffsets</xpath>
-							<value>
-								<MeleeCritChance>0.67</MeleeCritChance>
-								<MeleeParryChance>0.25</MeleeParryChance>
-								<MeleeDodgeChance>0.33</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<!-- ==========  Moyo Knife  =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_Knife"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>5</power>
-										<cooldownTime>2.01</cooldownTime>
-										<chanceFactor>0.4</chanceFactor>
-										<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>point</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>11</power>
-										<cooldownTime>1.26</cooldownTime>
-										<chanceFactor>1</chanceFactor>
-										<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-										<armorPenetrationSharp>1.67</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>edge</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>10</power>
-										<cooldownTime>1.18</cooldownTime>
-										<chanceFactor>1</chanceFactor>
-										<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
-										<armorPenetrationSharp>1.2</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_Knife"]/statBases</xpath>
-							<value>
-								<MeleeCounterParryBonus>0.39</MeleeCounterParryBonus>
-								<Bulk>1.5</Bulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_Knife"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.08</MeleeCritChance>
-									<MeleeParryChance>0.24</MeleeParryChance>
-									<MeleeDodgeChance>1.07</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-						<!-- ==========  Moyo Glaive  =========== -->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_Spear"]/statBases</xpath>
-							<value>
-								<MeleeCounterParryBonus>1.08</MeleeCounterParryBonus>
-								<Bulk>12.50</Bulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_Spear"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.22</MeleeCritChance>
-									<MeleeParryChance>1.53</MeleeParryChance>
-									<MeleeDodgeChance>0.67</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_Spear"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>blade</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>34</power>
-										<extraMeleeDamages>
-											<li>
-												<def>Moyo_Cryo</def>
-												<amount>10</amount>
-											</li>
-										</extraMeleeDamages>
-										<cooldownTime>1.72</cooldownTime>
-										<chanceFactor>1</chanceFactor>
-										<armorPenetrationBlunt>2.59</armorPenetrationBlunt>
-										<armorPenetrationSharp>17.39</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-											<li>Blunt</li>
-										</capacities>
-										<power>11</power>
-										<cooldownTime>1.38</cooldownTime>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationBlunt>4.05</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<!-- ==========  Moyo Royal Glaive : 20% Reduction to Sway/Recoil =========== -->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_GDSpear"]/statBases</xpath>
-							<value>
-								<MeleeCounterParryBonus>1.08</MeleeCounterParryBonus>
-								<Bulk>12.50</Bulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_GDSpear"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.22</MeleeCritChance>
-									<MeleeParryChance>1.53</MeleeParryChance>
-									<MeleeDodgeChance>0.67</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_GDSpear"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>blade</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>41</power>
-										<extraMeleeDamages>
-											<li>
-												<def>Moyo_Cryo</def>
-												<amount>10</amount>
-											</li>
-										</extraMeleeDamages>
-										<cooldownTime>1.76</cooldownTime>
-										<chanceFactor>1</chanceFactor>
-										<armorPenetrationBlunt>4.56</armorPenetrationBlunt>
-										<armorPenetrationSharp>26.08</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-											<li>Blunt</li>
-										</capacities>
-										<power>11</power>
-										<cooldownTime>1.38</cooldownTime>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationBlunt>4.05</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<!-- ==========  Moyo Piledriver : No melee bonuses but high power =========== -->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_Piledriver"]/statBases</xpath>
-							<value>
-								<Bulk>9.5</Bulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_Piledriver"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>body</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>8</power>
-										<cooldownTime>1.15</cooldownTime>
-										<chanceFactor>0.4</chanceFactor>
-										<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>Stake</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>33</power>
-										<cooldownTime>3.98</cooldownTime>
-										<chanceFactor>1</chanceFactor>
-										<armorPenetrationBlunt>65</armorPenetrationBlunt>
-										<armorPenetrationSharp>16</armorPenetrationSharp>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<!-- ==========  Moyo Power Fist : Powered weapon, +55MPA Blunt  =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_PowerFist"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>Fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>13</power>
-										<cooldownTime>1.37</cooldownTime>
-										<armorPenetrationBlunt>60</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>Body</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>13</power>
-										<cooldownTime>1.37</cooldownTime>
-										<armorPenetrationBlunt>60</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_PowerFist"]/statBases</xpath>
-							<value>
-								<MeleeCounterParryBonus>0.2</MeleeCounterParryBonus>
-								<Bulk>5</Bulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_PowerFist"]/equippedStatOffsets</xpath>
-							<value>
-								<MeleeCritChance>0.85</MeleeCritChance>
-								<MeleeParryChance>0.05</MeleeParryChance>
-								<MeleeDodgeChance>0.17</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_PowerFist"]/weaponTags</xpath>
-							<value>
-								<li>CE_OneHandedWeapon</li>
-							</value>
-						</li>
-
-						<!-- ==========  Moyo Royal Power Fist : Advanced powered weapon, +75MPA Blunt  =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_GDPowerFist"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>Fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>17</power>
-										<cooldownTime>1.34</cooldownTime>
-										<armorPenetrationBlunt>81.615</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>Body</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>17</power>
-										<cooldownTime>1.34</cooldownTime>
-										<armorPenetrationBlunt>81.615</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_GDPowerFist"]/statBases</xpath>
-							<value>
-								<MeleeCounterParryBonus>0.17</MeleeCounterParryBonus>
-								<Bulk>5</Bulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_GDPowerFist"]/equippedStatOffsets</xpath>
-							<value>
-								<MeleeCritChance>1</MeleeCritChance>
-								<MeleeParryChance>0.04</MeleeParryChance>
-								<MeleeDodgeChance>0.17</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_GDPowerFist"]/weaponTags</xpath>
-							<value>
-								<li>CE_OneHandedWeapon</li>
-							</value>
-						</li>
-
-						<!-- ========== Charge Pistol =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Moyo_Pistol</defName>
-							<statBases>
-								<SightsEfficiency>0.80</SightsEfficiency>
-								<ShotSpread>0.18</ShotSpread>
-								<SwayFactor>1.07</SwayFactor>
-								<Bulk>2.00</Bulk>
-								<Mass>1.20</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							</statBases>
-
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_Abyssnail</defaultProjectile>
-								<warmupTime>0.5</warmupTime>
-								<range>20</range>
-								<soundCast>Shot_ChargeRifle</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>30</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_Abyssnail</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiAimMode>Snapshot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moyo_Pistol"]/weaponTags</xpath>
-							<value>
-								<li>CE_OneHandedWeapon</li>
-							</value>
-						</li>
-
-						<!-- ========== Charge SMG =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Moyo_ChargeSMG</defName>
-							<statBases>
-								<SightsEfficiency>1.10</SightsEfficiency>
-								<ShotSpread>0.17</ShotSpread>
-								<SwayFactor>0.98</SwayFactor>
-								<Bulk>6.80</Bulk>
-								<Mass>3.00</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							</statBases>
-
-							<Properties>
-								<recoilAmount>1.26</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_6x18mmMoyo</defaultProjectile>
-								<warmupTime>0.5</warmupTime>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-								<range>28</range>
-								<soundCast>Shot_ChargeRifle</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>36</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_6x18mmMoyo</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>Snapshot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== Charge Rifle =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Moyo_ChargeRifle</defName>
-							<statBases>
-								<SightsEfficiency>1.10</SightsEfficiency>
-								<ShotSpread>0.09</ShotSpread>
-								<SwayFactor>1.53</SwayFactor>
-								<Bulk>8.80</Bulk>
-								<Mass>6.50</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							</statBases>
-
-							<Properties>
-								<recoilAmount>0.99</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_6x24mmMoyo</defaultProjectile>
-								<warmupTime>1.0</warmupTime>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-								<range>51</range>
-								<soundCast>Shot_ChargeRifle</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>30</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_6x24mmMoyo</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== Charge Rifle (Warped) : Removed ===========
-			
-			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-			<defName>Moyo_WarpedRifle</defName>
-				<statBases>
-					<SightsEfficiency>1.10</SightsEfficiency>
-					<ShotSpread>0.09</ShotSpread>
-					<SwayFactor>1.53</SwayFactor>
-					<Bulk>8.80</Bulk>
-					<Mass>6.50</Mass>
-					<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-				</statBases>
-				
-				<Properties>
-					<recoilAmount>1.14</recoilAmount>
-					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-					<hasStandardCommand>true</hasStandardCommand>
-					<defaultProjectile>Bullet_6x24mmWMoyo</defaultProjectile>
-					<warmupTime>1.0</warmupTime>
-					<burstShotCount>6</burstShotCount>
-					<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-					<range>51</range>
-					<soundCast>Shot_ChargeRifle</soundCast>
-					<soundCastTail>GunTail_Light</soundCastTail>
-					<muzzleFlashScale>9</muzzleFlashScale>
-				</Properties>
-				
-				<AmmoUser>
-					<magazineSize>30</magazineSize>
-					<reloadTime>4</reloadTime>
-					<ammoSet>AmmoSet_6x24mmWMoyo</ammoSet>
-				</AmmoUser>
-				<FireModes>
-					<aimedBurstShotCount>3</aimedBurstShotCount>
-					<aiUseBurstMode>TRUE</aiUseBurstMode>
-					<aiAimMode>AimedShot</aiAimMode>
-				</FireModes>
-			</li>
-			 -->
-
-						<!-- ========== Charge Autocannon =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Moyo_AutoCannon</defName>
-							<statBases>
-								<SightsEfficiency>1.10</SightsEfficiency>
-								<ShotSpread>0.09</ShotSpread>
-								<SwayFactor>2.15</SwayFactor>
-								<Bulk>12.50</Bulk>
-								<Mass>9.00</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							</statBases>
-
-							<Properties>
-								<recoilAmount>1.83</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_8x35mmMoyo</defaultProjectile>
-								<warmupTime>1.0</warmupTime>
-								<burstShotCount>8</burstShotCount>
-								<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
-								<range>51</range>
-								<soundCast>Shot_NeedleGun</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>40</magazineSize>
-								<reloadTime>7.8</reloadTime>
-								<ammoSet>AmmoSet_8x35mmMoyo</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>4</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== Charge Precision Rifle =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Moyo_PrecisionRifle</defName>
-							<statBases>
-								<SightsEfficiency>2.98</SightsEfficiency>
-								<ShotSpread>0.01</ShotSpread>
-								<SwayFactor>1.77</SwayFactor>
-								<Bulk>10.25</Bulk>
-								<Mass>6.25</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							</statBases>
-
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_8x50mmMoyo</defaultProjectile>
-								<warmupTime>1.7</warmupTime>
-								<range>78</range>
-								<soundCast>Shot_ChargeRifle</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>15</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_8x50mmMoyo</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== Charge Ballista =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Moyo_BoltCaster</defName>
-							<statBases>
-								<SightsEfficiency>1.85</SightsEfficiency>
-								<ShotSpread>0.07</ShotSpread>
-								<SwayFactor>2.40</SwayFactor>
-								<Bulk>14.00</Bulk>
-								<Mass>9.50</Mass>
-								<RangedWeapon_Cooldown>0.67</RangedWeapon_Cooldown>
-							</statBases>
-
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_MoyoBallista</defaultProjectile>
-								<warmupTime>2.85</warmupTime>
-								<range>55</range>
-								<soundCast>ChargeLance_Fire</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>4</magazineSize>
-								<reloadTime>8.7</reloadTime>
-								<ammoSet>AmmoSet_MoyoBallista</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== Royal Charge Rifle =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Moyo_HeavyChargeRifle</defName>
-							<statBases>
-								<SightsEfficiency>1.10</SightsEfficiency>
-								<ShotSpread>0.07</ShotSpread>
-								<SwayFactor>1.58</SwayFactor>
-								<Bulk>8.80</Bulk>
-								<Mass>7.00</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							</statBases>
-
-							<Properties>
-								<recoilAmount>1.43</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_8x35mmMoyo</defaultProjectile>
-								<warmupTime>1.0</warmupTime>
-								<burstShotCount>5</burstShotCount>
-								<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-								<range>55</range>
-								<soundCast>Shot_ChargeRifle</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>24</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_8x35mmMoyo</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== Royal Charge Autocannon =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Moyo_HeavyAutoCannon</defName>
-							<statBases>
-								<SightsEfficiency>1.10</SightsEfficiency>
-								<ShotSpread>0.09</ShotSpread>
-								<SwayFactor>1.65</SwayFactor>
-								<Bulk>12.50</Bulk>
-								<Mass>9.00</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							</statBases>
-
-							<Properties>
-								<recoilAmount>1.68</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_8x50mmMoyo</defaultProjectile>
-								<warmupTime>1.2</warmupTime>
-								<burstShotCount>10</burstShotCount>
-								<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-								<range>55</range>
-								<soundCast>Shot_NeedleGun</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>40</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_8x50mmMoyo</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>5</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== Royal Charge Ballista =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Moyo_HeavyBoltCaster</defName>
-							<statBases>
-								<SightsEfficiency>2.05</SightsEfficiency>
-								<ShotSpread>0.07</ShotSpread>
-								<SwayFactor>2.55</SwayFactor>
-								<Bulk>14.00</Bulk>
-								<Mass>11</Mass>
-								<RangedWeapon_Cooldown>0.67</RangedWeapon_Cooldown>
-							</statBases>
-
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_MoyoBallista</defaultProjectile>
-								<warmupTime>2.45</warmupTime>
-								<range>62</range>
-								<soundCast>ChargeLance_Fire</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>4</magazineSize>
-								<reloadTime>8.7</reloadTime>
-								<ammoSet>AmmoSet_MoyoBallista</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!-- ========== Cryoblaster =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Moyo_CryoBlaster</defName>
-							<statBases>
-								<SightsEfficiency>1.10</SightsEfficiency>
-								<ShotSpread>3</ShotSpread>
-								<SwayFactor>2.25</SwayFactor>
-								<Bulk>13.00</Bulk>
-								<Mass>9.50</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							</statBases>
-
-							<Properties>
-								<recoilAmount>0.05</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_MoyoCryocell</defaultProjectile>
-								<warmupTime>1</warmupTime>
-								<burstShotCount>40</burstShotCount>
-								<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-								<range>31</range>
-								<soundCast>MoyoCryoSpray</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>160</magazineSize>
-								<reloadTime>6</reloadTime>
-								<ammoSet>AmmoSet_Cryoblaster</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>20</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-								<noSingleShot>true</noSingleShot>
-							</FireModes>
-						</li>
-
-						<!-- ========== Melee Attacks =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_CryoBlaster" or
-								defName="Moyo_HeavyAutoCannon" or
-								defName="Moyo_HeavyChargeRifle" or
-								defName="Moyo_HeavyBoltCaster" or
-								defName="Moyo_BoltCaster" or
-								defName="Moyo_PrecisionRifle" or
-								defName="Moyo_AutoCannon" or
-								defName="Moyo_ChargeRifle" or
-								defName="Moyo_ChargeSMG" or
-								defName="Moyo_WarpedRifle"
-								]/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>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_Pistol"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>grip</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>1.54</cooldownTime>
-										<chanceFactor>1.5</chanceFactor>
-										<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>muzzle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>1.54</cooldownTime>
-										<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Moyo from the depth/ThingDefs_Misc/Weapons_Mechanoid.xml b/Patches/Moyo from the depth/ThingDefs_Misc/Weapons_Mechanoid.xml
deleted file mode 100644
index d2bcccf964..0000000000
--- a/Patches/Moyo from the depth/ThingDefs_Misc/Weapons_Mechanoid.xml	
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Moyo-From the depth</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!-- ========== Cryopod Cryorifle =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Moyo_CryoRifle</defName>
-							<statBases>
-								<SightsEfficiency>1.00</SightsEfficiency>
-								<ShotSpread>0.05</ShotSpread>
-								<SwayFactor>0.86</SwayFactor>
-								<Bulk>20</Bulk>
-								<Mass>22</Mass>
-								<RangedWeapon_Cooldown>2.5</RangedWeapon_Cooldown>
-							</statBases>
-
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_MoyoCryocannon</defaultProjectile>
-								<warmupTime>4.3</warmupTime>
-								<ammoConsumedPerShotCount>50</ammoConsumedPerShotCount>
-								<range>55</range>
-								<soundCast>ChargeLance_Fire</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>100</magazineSize>
-								<reloadTime>9.8</reloadTime>
-								<ammoSet>AmmoSet_CryoRifle</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-							<weaponTags>
-								<li>NoSwitch</li>
-							</weaponTags>
-						</li>
-
-						<!-- ========== Melee Attacks =========== -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moyo_CryoRifle"]/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>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Moyo from the depth/ThingDefs_Races/AlienRace_Moyo.xml b/Patches/Moyo from the depth/ThingDefs_Races/AlienRace_Moyo.xml
deleted file mode 100644
index 3b6e4574e7..0000000000
--- a/Patches/Moyo from the depth/ThingDefs_Races/AlienRace_Moyo.xml	
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Moyo-From the depth</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Moyo"]/comps</xpath>
-							<value>
-								<li Class="CombatExtended.CompProperties_Inventory" />
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Moyo"]/comps</xpath>
-							<value>
-								<li>
-									<compClass>CombatExtended.CompPawnGizmo</compClass>
-								</li>
-								<li Class="CombatExtended.CompProperties_Suppressable" />
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Moyo"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Humanoid</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Moyo"]/statBases</xpath>
-							<value>
-								<!--Increased mass, better leverage in combat-->
-								<MeleeCritChance>1.05</MeleeCritChance>
-								<MeleeParryChance>1.05</MeleeParryChance>
-								<Suppressability>1</Suppressability>
-								<SmokeSensitivity>0.9</SmokeSensitivity>
-							</value>
-						</li>
-
-						<!--Base has no headbut, only bite-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Moyo"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>1.33</cooldownTime>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.313</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>right fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>1.33</cooldownTime>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.313</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>teeth</label>
-										<capacities>
-											<li>Bite</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>2.52</cooldownTime>
-										<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationSharp>0.01</armorPenetrationSharp>
-										<armorPenetrationBlunt>0.245</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Moyo from the depth/ThingDefs_Races/Race_MoyoMech.xml b/Patches/Moyo from the depth/ThingDefs_Races/Race_MoyoMech.xml
deleted file mode 100644
index 8a75370f48..0000000000
--- a/Patches/Moyo from the depth/ThingDefs_Races/Race_MoyoMech.xml	
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Moyo-From the depth</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--Pressurepod-->
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[defName="MoyoPressurePod_Race"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Quadruped</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="MoyoPressurePod_Race"]/statBases</xpath>
-							<value>
-								<MeleeCritChance>1.50</MeleeCritChance>
-								<MeleeParryChance>1.50</MeleeParryChance>
-								<NightVisionEfficiency>0.80</NightVisionEfficiency>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="MoyoPressurePod_Race"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>18</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="MoyoPressurePod_Race"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>40.5</ArmorRating_Blunt>
-								<ArmorRating_Heat>0.25</ArmorRating_Heat>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="MoyoPressurePod_Race"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left club</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>56</power>
-										<cooldownTime>3.1</cooldownTime>
-										<linkedBodyPartsGroup>LeftClub</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>right club</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>56</power>
-										<cooldownTime>3.1</cooldownTime>
-										<linkedBodyPartsGroup>RightClub</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>35</power>
-										<cooldownTime>3.51</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationBlunt>15</armorPenetrationBlunt>
-										<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<!-- Hexapod -->
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[@Name="Moyo_HexapodBase"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Birdlike</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="Moyo_HexapodBase"]/statBases</xpath>
-							<value>
-								<MeleeCritChance>1</MeleeCritChance>
-								<MeleeParryChance>2.50</MeleeParryChance>
-								<NightVisionEfficiency>0.80</NightVisionEfficiency>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="Moyo_HexapodBase"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>10</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="Moyo_HexapodBase"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>22.5</ArmorRating_Blunt>
-								<ArmorRating_Heat>0.75</ArmorRating_Heat>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="Moyo_HexapodBase"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>tentacle</label>
-										<capacities>
-											<li>HexapodTentacle</li>
-										</capacities>
-										<power>20</power>
-										<cooldownTime>1.24</cooldownTime>
-										<linkedBodyPartsGroup>Tentacle1</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>50</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>tentacle</label>
-										<capacities>
-											<li>HexapodTentacle</li>
-										</capacities>
-										<power>20</power>
-										<cooldownTime>1.24</cooldownTime>
-										<linkedBodyPartsGroup>Tentacle2</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>50</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>tentacle</label>
-										<capacities>
-											<li>HexapodTentacle</li>
-										</capacities>
-										<power>20</power>
-										<cooldownTime>1.24</cooldownTime>
-										<linkedBodyPartsGroup>Tentacle3</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>50</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>tentacle</label>
-										<capacities>
-											<li>HexapodTentacle</li>
-										</capacities>
-										<power>20</power>
-										<cooldownTime>1.24</cooldownTime>
-										<linkedBodyPartsGroup>Tentacle4</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>50</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>tentacle</label>
-										<capacities>
-											<li>HexapodTentacle</li>
-										</capacities>
-										<power>20</power>
-										<cooldownTime>1.24</cooldownTime>
-										<linkedBodyPartsGroup>Tentacle5</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>50</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>tentacle</label>
-										<capacities>
-											<li>HexapodTentacle</li>
-										</capacities>
-										<power>20</power>
-										<cooldownTime>1.24</cooldownTime>
-										<linkedBodyPartsGroup>Tentacle6</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>50</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>35</power>
-										<cooldownTime>3.51</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationBlunt>15</armorPenetrationBlunt>
-										<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[defName="MoyoCryopod_Kind"]</xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>20</min>
-										<max>20</max>
-									</primaryMagazineCount>
-								</li>
-							</value>
-						</li>
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Moyo light in the abyss/Ammo/Ammo_Moyo.xml b/Patches/Moyo light in the abyss/Ammo/Ammo_Moyo.xml
deleted file mode 100644
index 1a0b4e4226..0000000000
--- a/Patches/Moyo light in the abyss/Ammo/Ammo_Moyo.xml	
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-
-		<mods>
-			<li>Moyo-Light in the Abyss</li>
-		</mods>
-
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_MabyssalLight</defName>
-					<label>Light Plasma Cell</label>
-					<ammoTypes>
-						<Ammo_PlasmaCellPistol>Bullet_MabyssalPlasmaPistol</Ammo_PlasmaCellPistol>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_MabyssalMid</defName>
-					<label>Rifle Plasma Cell</label>
-					<ammoTypes>
-						<Ammo_PlasmaCellRifle>Bullet_MabyssalPlasmaMid</Ammo_PlasmaCellRifle>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_MabyssalAccelerated</defName>
-					<label>Heavy Plasma Cell</label>
-					<ammoTypes>
-						<Ammo_PlasmaCellHeavy>Bullet_MabyssalPlasmaAccelerated</Ammo_PlasmaCellHeavy>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-				<ThingDef ParentName="Base556x45mmNATOBullet">
-					<defName>Bullet_MabyssalPlasmaPistol</defName>
-					<label>Low Density Plasma Bolt</label>
-					<graphicData>
-						<texPath>RedMoyo_Weapons/RedMoyoBolt</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>100</speed>
-						<damageAmountBase>10</damageAmountBase>
-						<secondaryDamage>
-							<li>
-								<def>Flame_Secondary</def>
-								<amount>2</amount>
-							</li>
-						</secondaryDamage>
-						<armorPenetrationSharp>12</armorPenetrationSharp>
-						<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-				<ThingDef ParentName="Base556x45mmNATOBullet">
-					<defName>Bullet_MabyssalPlasmaMid</defName>
-					<label>Medium Density Plasma Bolt</label>
-					<graphicData>
-						<texPath>RedMoyo_Weapons/RedMoyoBolt</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>150</speed>
-						<damageAmountBase>12</damageAmountBase>
-						<secondaryDamage>
-							<li>
-								<def>Flame_Secondary</def>
-								<amount>2</amount>
-							</li>
-						</secondaryDamage>
-						<armorPenetrationSharp>26</armorPenetrationSharp>
-						<armorPenetrationBlunt>4</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-				<ThingDef ParentName="Base556x45mmNATOBullet">
-					<defName>Bullet_MabyssalPlasmaAccelerated</defName>
-					<label>Accelerated Plasma Bolt</label>
-					<graphicData>
-						<texPath>RedMoyo_Weapons/RedMoyoBoltLarge</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>200</speed>
-						<damageAmountBase>28</damageAmountBase>
-						<secondaryDamage>
-							<li>
-								<def>Flame_Secondary</def>
-								<amount>6</amount>
-							</li>
-						</secondaryDamage>
-						<armorPenetrationSharp>60</armorPenetrationSharp>
-						<armorPenetrationBlunt>23</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-				<RecipeDef ParentName="GrenadeRecipeBase">
-					<defName>MakeAmmo_PlasmaCellPistol_Abyss</defName>
-					<label>make Plasma Pistol Power Cells</label>
-					<description>Craft 500 shots' worth of Plasma Pistol Power Cells.</description>
-					<jobString>Making Plasma Pistol Power Cells.</jobString>
-					<workAmount>6800</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>14</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Moyo_Abyssteel</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Moyo_Abyssteel</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_PlasmaCellPistol>500</Ammo_PlasmaCellPistol>
-					</products>
-				</RecipeDef>
-			</value>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Moyo light in the abyss/PawnKindDefs/Moyo_PawnKind.xml b/Patches/Moyo light in the abyss/PawnKindDefs/Moyo_PawnKind.xml
deleted file mode 100644
index a7fe66f591..0000000000
--- a/Patches/Moyo light in the abyss/PawnKindDefs/Moyo_PawnKind.xml	
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Moyo-Light in the Abyss</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--Ammo-->
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[
-								@Name="RedMoyoBasePawnKind"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>1</min>
-										<max>3</max>
-									</primaryMagazineCount>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[
-								@Name="RedMoyoPolice"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>5</max>
-									</primaryMagazineCount>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[
-								@Name="RedMoyoSoliderStandard"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>4</min>
-										<max>6</max>
-									</primaryMagazineCount>
-								</li>
-							</value>
-						</li>
-
-						<!--Backpack-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/PawnKindDef[
-								@ParentName="RedMoyoPolice" or
-								@ParentName="RedMoyoSoliderStandard"
-								]/apparelRequired </xpath>
-							<value>
-								<li>CE_Apparel_Backpack</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Moyo light in the abyss/ThingDefs_Misc/Moyo_Apparel.xml b/Patches/Moyo light in the abyss/ThingDefs_Misc/Moyo_Apparel.xml
deleted file mode 100644
index a3b999f76d..0000000000
--- a/Patches/Moyo light in the abyss/ThingDefs_Misc/Moyo_Apparel.xml	
+++ /dev/null
@@ -1,651 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Moyo-Light in the Abyss</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--========= Stuffable =========-->
-
-						<!--Straps-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_BodyStrap"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<!--Worksuit-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_WorkSuit"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-								<Bulk>3</Bulk>
-								<WornBulk>2</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RedMoyo_WorkSuit"]/equippedStatOffsets</xpath>
-							<value>
-								<CarryBulk>5</CarryBulk>
-							</value>
-						</li>
-
-						<!--========= Fixed Armor Value =========-->
-
-						<!--Bodysuit-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RedMoyo_BobySuit"]/statBases</xpath>
-							<value>
-								<Bulk>5</Bulk>
-								<WornBulk>2</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_BobySuit"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-								<ArmorRating_Electric>0.15</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_BobySuit"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.3</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RedMoyo_BobySuit"]/apparel/bodyPartGroups</xpath>
-							<value>
-								<li>Hands</li>
-								<li>Feet</li>
-							</value>
-						</li>
-
-						<!--Tactical Strap-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RedMoyo_TacticalStrap"]/statBases</xpath>
-							<value>
-								<Bulk>5</Bulk>
-								<WornBulk>2</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_TacticalStrap"]/statBases/MaxHitPoints</xpath>
-							<value>
-								<MaxHitPoints>175</MaxHitPoints>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_TacticalStrap"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
-								<ArmorRating_Electric>0.15</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_TacticalStrap"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>3.75</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RedMoyo_TacticalStrap"]/equippedStatOffsets</xpath>
-							<value>
-								<CarryBulk>20</CarryBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RedMoyo_TacticalStrap"]/equippedStatOffsets/AimingDelayFactor</xpath>
-							<value>
-								<ReloadSpeed>0.1</ReloadSpeed>
-								<AimingDelayFactor>-0.05</AimingDelayFactor>
-							</value>
-						</li>
-
-						<!--Police Uniform-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RedMoyo_PoliceUniform"]/statBases</xpath>
-							<value>
-								<Bulk>2</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_PoliceUniform"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-								<ArmorRating_Electric>0.45</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_PoliceUniform"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>1.25</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--Exoskeleton-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RedMoyo_ExoSkeleton"]/statBases</xpath>
-							<value>
-								<Bulk>40</Bulk>
-								<WornBulk>8</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_ExoSkeleton"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>3</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_ExoSkeleton"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>4.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RedMoyo_ExoSkeleton"]/equippedStatOffsets</xpath>
-							<value>
-								<CarryWeight>20</CarryWeight>
-							</value>
-						</li>
-
-						<!--Officer Cape-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RedMoyo_OfficerCape"]/statBases</xpath>
-							<value>
-								<Bulk>5</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_OfficerCape"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>2</ArmorRating_Sharp>
-								<ArmorRating_Electric>0.15</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_OfficerCape"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.4</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--Combat Gear-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RedMoyo_TacticalGears"]/statBases</xpath>
-							<value>
-								<Bulk>50</Bulk>
-								<WornBulk>12</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_TacticalGears"]/statBases/Mass</xpath>
-							<value>
-								<Mass>9.5</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_TacticalGears"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>8</ArmorRating_Sharp>
-								<ArmorRating_Electric>0.23</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_TacticalGears"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>14</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RedMoyo_TacticalGears"]/equippedStatOffsets/MoveSpeed</xpath>
-							<value>
-								<CarryBulk>5</CarryBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RedMoyo_TacticalGears"]/equippedStatOffsets/AimingDelayFactor</xpath>
-							<value>
-								<ReloadSpeed>0.1</ReloadSpeed>
-								<AimingDelayFactor>-0.05</AimingDelayFactor>
-							</value>
-						</li>
-
-						<!--Helmet-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RedMoyo_Helmet"]/statBases</xpath>
-							<value>
-								<Bulk>2</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_Helmet"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>8</ArmorRating_Sharp>
-								<ArmorRating_Electric>0.23</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_Helmet"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>14</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--Pan Hat-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RedMoyo_PanHat"]/statBases</xpath>
-							<value>
-								<Bulk>1</Bulk>
-								<WornBulk>0</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_PanHat"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>2</ArmorRating_Sharp>
-								<ArmorRating_Electric>0.10</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_PanHat"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.2</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--Melee Mask-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RedMoyo_MeleeMask"]/statBases</xpath>
-							<value>
-								<Bulk>2</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_MeleeMask"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>4</ArmorRating_Sharp>
-								<ArmorRating_Electric>0.10</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_MeleeMask"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>7</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_MeleeMask"]/apparel/layers/li[.="EyeCover"]</xpath>
-							<value>
-								<li>StrappedHead</li>
-							</value>
-						</li>
-
-						<!--Sniper Mask-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RedMoyo_SniperMask"]/statBases</xpath>
-							<value>
-								<Bulk>1</Bulk>
-								<WornBulk>1</WornBulk>
-								<NightVisionEfficiency_Apparel>0.90</NightVisionEfficiency_Apparel>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_SniperMask"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>6</ArmorRating_Sharp>
-								<ArmorRating_Electric>0.08</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_SniperMask"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>3.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_SniperMask"]/apparel/layers/li[.="EyeCover"]</xpath>
-							<value>
-								<li>StrappedHead</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_SniperMask"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-							<value>
-								<ShootingAccuracyPawn>2.5</ShootingAccuracyPawn>
-								<AimingAccuracy>2.5</AimingAccuracy>
-							</value>
-						</li>
-
-						<!--Gas Mask-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RedMoyo_GasMask"]/statBases</xpath>
-							<value>
-								<Bulk>5</Bulk>
-								<WornBulk>2</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_GasMask"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>1</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_GasMask"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_GasMask"]/apparel/layers/li[.="Overhead"]</xpath>
-							<value>
-								<li>StrappedHead</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RedMoyo_GasMask"]/equippedStatOffsets</xpath>
-							<value>
-								<SmokeSensitivity>-1</SmokeSensitivity>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_GasMask"]/apparel/bodyPartGroups</xpath>
-							<value>
-								<bodyPartGroups>
-									<li>Teeth</li>
-								</bodyPartGroups>
-							</value>
-						</li>
-
-						<!--Gas Mask-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RedMoyo_TacticalHeadSet"]/statBases</xpath>
-							<value>
-								<Bulk>5</Bulk>
-								<WornBulk>2</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_TacticalHeadSet"]/apparel/layers/li[.="Overhead"]</xpath>
-							<value>
-								<li>OnHead</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_TacticalHeadSet"]/apparel/bodyPartGroups</xpath>
-							<value>
-								<bodyPartGroups>
-									<li>Teeth</li>
-								</bodyPartGroups>
-							</value>
-						</li>
-
-						<!--Diving Gear-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RedMoyo_AbyssArmour"]/statBases</xpath>
-							<value>
-								<Bulk>125</Bulk>
-								<WornBulk>15</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_AbyssArmour"]/statBases/Mass</xpath>
-							<value>
-								<Mass>80</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_AbyssArmour"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>25</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_AbyssArmour"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>75</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_AbyssArmour"]/statBases/ArmorRating_Heat</xpath>
-							<value>
-								<ArmorRating_Heat>0.75</ArmorRating_Heat>
-								<ArmorRating_Electric>0.50</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_AbyssArmour"]/statBases/Flammability</xpath>
-							<value>
-								<Flammability>0</Flammability>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_AbyssArmour"]/equippedStatOffsets/MoveSpeed</xpath>
-							<value>
-								<CarryWeight>110</CarryWeight>
-								<CarryBulk>15</CarryBulk>
-								<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-								<MoveSpeed>-0.75</MoveSpeed>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_AbyssArmour"]/costList/Moyo_Abyssteel</xpath>
-							<value>
-								<Moyo_Abyssteel>216</Moyo_Abyssteel>
-								<DevilstrandCloth>30</DevilstrandCloth>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[defName="RedMoyo_AbyssArmour"]</xpath>
-							<value>
-								<li Class="CombatExtended.PartialArmorExt">
-									<stats>
-										<li>
-											<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-											<parts>
-												<li>Neck</li>
-												<li>Arm</li>
-											</parts>
-										</li>
-										<li>
-											<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-											<parts>
-												<li>Neck</li>
-												<li>Arm</li>
-											</parts>
-										</li>
-										<li>
-											<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-											<parts>
-												<li>Hand</li>
-											</parts>
-										</li>
-										<li>
-											<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-											<parts>
-												<li>Hand</li>
-											</parts>
-										</li>
-									</stats>
-								</li>
-							</value>
-						</li>
-
-						<!--Diving Helmet-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RedMoyo_AbyssHelmet"]/statBases</xpath>
-							<value>
-								<Bulk>6</Bulk>
-								<WornBulk>5</WornBulk>
-								<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_AbyssHelmet"]/statBases/Mass</xpath>
-							<value>
-								<Mass>6.5</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_AbyssHelmet"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>20</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_AbyssHelmet"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>60</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_AbyssHelmet"]/statBases/ArmorRating_Heat</xpath>
-							<value>
-								<ArmorRating_Heat>0.75</ArmorRating_Heat>
-								<ArmorRating_Electric>0.50</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_AbyssHelmet"]/statBases/Flammability</xpath>
-							<value>
-								<Flammability>0</Flammability>
-							</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="RedMoyo_AbyssHelmet"]/apparel/immuneToToxGasExposure</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="RedMoyo_AbyssHelmet"]/apparel</xpath>
-								<value>
-									<immuneToToxGasExposure>true</immuneToToxGasExposure>
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RedMoyo_AbyssHelmet"]/equippedStatOffsets</xpath>
-							<value>
-								<SmokeSensitivity>-1</SmokeSensitivity>
-								<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RedMoyo_AbyssHelmet"]/costList/Moyo_Abyssteel</xpath>
-							<value>
-								<Moyo_Abyssteel>135</Moyo_Abyssteel>
-								<DevilstrandCloth>15</DevilstrandCloth>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[defName="RedMoyo_AbyssHelmet"]</xpath>
-							<value>
-								<li Class="CombatExtended.PartialArmorExt">
-									<stats>
-										<li>
-											<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-											<parts>
-												<li>Eye</li>
-												<li>Nose</li>
-											</parts>
-										</li>
-										<li>
-											<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-											<parts>
-												<li>Eye</li>
-												<li>Nose</li>
-											</parts>
-										</li>
-									</stats>
-								</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Moyo light in the abyss/ThingDefs_Misc/Weapons.xml b/Patches/Moyo light in the abyss/ThingDefs_Misc/Weapons.xml
deleted file mode 100644
index bdf302e2c2..0000000000
--- a/Patches/Moyo light in the abyss/ThingDefs_Misc/Weapons.xml	
+++ /dev/null
@@ -1,693 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Moyo-Light in the Abyss</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==========  Moyo Knife : Same as normal variant =========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RedMoyo_Knife"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2.01</cooldownTime>
-								<chanceFactor>0.4</chanceFactor>
-								<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.26</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.67</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.18</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.2</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RedMoyo_Knife"]/statBases</xpath>
-					<value>
-						<MeleeCounterParryBonus>0.39</MeleeCounterParryBonus>
-						<Bulk>1.5</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RedMoyo_Knife"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.08</MeleeCritChance>
-							<MeleeParryChance>0.24</MeleeParryChance>
-							<MeleeDodgeChance>1.07</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- ==========  Moyo Clamp : No melee bonuses but high power =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RedMoyo_KineticClamp"]/statBases</xpath>
-					<value>
-						<Bulk>9.5</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RedMoyo_KineticClamp"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>body</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.15</cooldownTime>
-								<chanceFactor>0.4</chanceFactor>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Stake</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>51</power>
-								<cooldownTime>4.3</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationBlunt>32</armorPenetrationBlunt>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ==========  Alloy Harpoon  =========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RedMoyo_AlloyHarpoon"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.77</cooldownTime>
-								<chanceFactor>0.4</chanceFactor>
-								<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.77</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
-								<armorPenetrationSharp>5.76</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RedMoyo_AlloyHarpoon"]/statBases</xpath>
-					<value>
-						<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
-						<Bulk>10</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RedMoyo_AlloyHarpoon"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.24</MeleeCritChance>
-							<MeleeParryChance>1.45</MeleeParryChance>
-							<MeleeDodgeChance>0.9</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- ==========  Plasma Harpoon  =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RedMoyo_PlasmaHarpoon"]/statBases</xpath>
-					<value>
-						<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
-						<Bulk>10</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RedMoyo_PlasmaHarpoon"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.24</MeleeCritChance>
-							<MeleeParryChance>1.45</MeleeParryChance>
-							<MeleeDodgeChance>0.9</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RedMoyo_PlasmaHarpoon"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-									<li>Stab</li>
-								</capacities>
-								<power>17</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Burn</def>
-										<amount>7</amount>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>1.44</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationBlunt>3.136</armorPenetrationBlunt>
-								<armorPenetrationSharp>24.5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2.01</cooldownTime>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ==========  Plasma Tachi - Producable, longer and heavier plasmasword =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_PlasmaTachi"]/statBases</xpath>
-					<value>
-						<MeleeCounterParryBonus>1.27</MeleeCounterParryBonus>
-						<Bulk>10.50</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_PlasmaTachi"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.95</MeleeCritChance>
-							<MeleeParryChance>0.54</MeleeParryChance>
-							<MeleeDodgeChance>0.33</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_PlasmaTachi"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>56</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Burn</def>
-										<amount>7</amount>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>2.1</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationBlunt>6.24</armorPenetrationBlunt>
-								<armorPenetrationSharp>16.26</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>14</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Burn</def>
-										<amount>5</amount>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>1.85</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationBlunt>3.46</armorPenetrationBlunt>
-								<armorPenetrationSharp>24</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2.22</cooldownTime>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>2.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Pistol =========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RedMoyo_Pistol</defName>
-					<statBases>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.57</SwayFactor>
-						<Bulk>4.50</Bulk>
-						<Mass>1.20</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_MabyssalPlasmaPistol</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_MabyssalLight</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== Police Pistol =========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RedMoyo_PistolPolice</defName>
-					<statBases>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.65</SwayFactor>
-						<Bulk>3.75</Bulk>
-						<Mass>1.20</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_MabyssalPlasmaMid</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>18</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>18</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_MabyssalMid</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== Charge SMG =========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RedMoyo_SMG</defName>
-					<statBases>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>0.75</SwayFactor>
-						<Bulk>6.80</Bulk>
-						<Mass>3.00</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<recoilAmount>1.46</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_MabyssalPlasmaPistol</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<range>31</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>35</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_MabyssalLight</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== Civil Rifle =========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RedMoyo_CivilAR</defName>
-					<statBases>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.38</SwayFactor>
-						<Bulk>6.50</Bulk>
-						<Mass>7.25</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<recoilAmount>1.39</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_MabyssalPlasmaMid</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-						<range>48</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>18</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_MabyssalMid</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AR</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Military Rifle =========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RedMoyo_MilitaryAR</defName>
-					<statBases>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.40</SwayFactor>
-						<Bulk>10.50</Bulk>
-						<Mass>3.5</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<recoilAmount>1.39</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_MabyssalPlasmaMid</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<range>51</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>24</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_MabyssalMid</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AR</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Precision Rifle =========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RedMoyo_MilitarySR</defName>
-					<statBases>
-						<SightsEfficiency>2.25</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<Bulk>11.50</Bulk>
-						<Mass>6.2</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<recoilAmount>1.00</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_MabyssalPlasmaMid</defaultProjectile>
-						<warmupTime>1.7</warmupTime>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<range>65</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>24</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_MabyssalMid</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_SR</li>
-						<li>Bipod_DMR</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Accelerator =========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RedMoyo_MilitaryHeavyRifle</defName>
-					<statBases>
-						<SightsEfficiency>2.25</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<Bulk>11.50</Bulk>
-						<Mass>6.2</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<recoilAmount>2.25</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_MabyssalPlasmaAccelerated</defaultProjectile>
-						<warmupTime>1.875</warmupTime>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>20</ticksBetweenBurstShots>
-						<range>51</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>9</magazineSize>
-						<reloadTime>5.1</reloadTime>
-						<ammoSet>AmmoSet_MabyssalAccelerated</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-				<!-- ========== Melee Attacks =========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RedMoyo_Pistol" or
-						defName="RedMoyo_SMG" or
-						defName="RedMoyo_MilitarySR" or
-						defName="RedMoyo_CivilAR" or
-						defName="RedMoyo_MilitaryHeavyRifle"
-						]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RedMoyo_PistolPolice"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RedMoyo_MilitaryAR"]/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</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>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>plasma bayonet</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.62</cooldownTime>
-								<armorPenetrationBlunt>2.304</armorPenetrationBlunt>
-								<armorPenetrationSharp>24.5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Moyo light in the abyss/ThingDefs_Races/AlienRace_Moyo.xml b/Patches/Moyo light in the abyss/ThingDefs_Races/AlienRace_Moyo.xml
deleted file mode 100644
index ebd4d50d64..0000000000
--- a/Patches/Moyo light in the abyss/ThingDefs_Races/AlienRace_Moyo.xml	
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Moyo-Light in the Abyss</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_RedMoyo"]/comps</xpath>
-							<value>
-								<li Class="CombatExtended.CompProperties_Inventory" />
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_RedMoyo"]/comps</xpath>
-							<value>
-								<li>
-									<compClass>CombatExtended.CompPawnGizmo</compClass>
-								</li>
-								<li Class="CombatExtended.CompProperties_Suppressable" />
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_RedMoyo"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Humanoid</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_RedMoyo"]/statBases</xpath>
-							<value>
-								<!--Increased mass, better leverage in combat-->
-								<MeleeCritChance>1.05</MeleeCritChance>
-								<MeleeParryChance>1.05</MeleeParryChance>
-								<Suppressability>1</Suppressability>
-								<SmokeSensitivity>0.9</SmokeSensitivity>
-							</value>
-						</li>
-
-						<!--Base has no headbut, only bite-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_RedMoyo"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>1.33</cooldownTime>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>right fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>1.33</cooldownTime>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>teeth</label>
-										<capacities>
-											<li>Bite</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>2.52</cooldownTime>
-										<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationSharp>0.03</armorPenetrationSharp>
-										<armorPenetrationBlunt>0.375</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>3</power>
-										<cooldownTime>4.75</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationBlunt>0.800</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Nakin Race/Nakin_Bionics.xml b/Patches/Nakin Race/Nakin_Bionics.xml
deleted file mode 100644
index 8f48993cd9..0000000000
--- a/Patches/Nakin Race/Nakin_Bionics.xml	
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>NakinRace</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Nakin Claw -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="Nakin_ARClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<!-- Compared to a Power Claw, Deals more damage, is slower, no movement penalty, slightly more Sharp Penetration and slightly less Blunt Penetration | Is exclusive to Nakins-->
-							<li Class="CombatExtended.ToolCE">
-								<label>claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationSharp>1.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- Nakin Bionic Arm -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="Bionic_Nakin_Arm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<!-- Is exclusive to Nakins-->
-							<li Class="CombatExtended.ToolCE">
-								<label>claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationSharp>0.85</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Nakin Race/Nakin_Body.xml b/Patches/Nakin Race/Nakin_Body.xml
deleted file mode 100644
index eefc65d2b8..0000000000
--- a/Patches/Nakin Race/Nakin_Body.xml	
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>NakinRace</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Body Armor Patch-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Nakin_body"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Nakin_body"]/corePart/parts/li[def = "Neck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Nakin_body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Nakin_body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Jaw"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Nakin_body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Nose"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Nakin_body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Ear"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Nakin_body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Eye"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Nakin_body"]/corePart/parts/li[def = "Nakin_Shoulder"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Nakin_body"]/corePart/parts/li[def= "Nakin_Shoulder"]/parts/li[def ="Arm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Nakin_body"]/corePart/parts/li[def="Nakin_Shoulder"]/parts/li[def ="Arm"]/parts/li[def = "Nakin_Hand"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Nakin_body"]/corePart/parts/li[def="Nakin_Shoulder"]/parts/li[def ="Arm"]/parts/li[def = "Nakin_Hand"]/parts/li[def = "Finger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Nakin_body"]/corePart/parts/li[def = "Waist"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Nakin_body"]/corePart/parts/li[def = "Leg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Nakin_body"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Nakin_body"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/parts/li[def = "Toe"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Nakin_body"]/corePart/parts/li[def = "Tail"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Nakin_body"]/corePart/parts/li[def = "Nakin_Tentacle"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Nakin Race/Nakin_Items.xml b/Patches/Nakin Race/Nakin_Items.xml
deleted file mode 100644
index 09498a47d6..0000000000
--- a/Patches/Nakin Race/Nakin_Items.xml	
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>NakinRace</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Nakin Leather | values to represent the Race's natural toughness-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Nakin"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.06</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Nakin"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.08</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- Nakin Glasses -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_NakinGlasses"]/statBases</xpath>
-					<value>
-						<Bulk>0</Bulk>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_NakinGlasses"]/apparel/layers</xpath>
-					<value>
-						<layers>
-							<li>StrappedHead</li>
-						</layers>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_NakinGlasses"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>0.3</AimingAccuracy>
-							<ShootingAccuracyPawn>5.0</ShootingAccuracyPawn>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Nakin Tactical Ballistc Goggles-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_NakinGogglesA"]/statBases</xpath>
-					<value>
-						<Bulk>0.5</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_NakinGogglesA"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_NakinGogglesA"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_NakinGogglesA"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.366</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_NakinGogglesA"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>15</DevilstrandCloth>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_NakinGogglesA"]/apparel</xpath>
-					<value>
-						<layers>
-							<li>StrappedHead</li>
-						</layers>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_NakinGogglesA"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>0.6</AimingAccuracy>
-							<ShootingAccuracyPawn>10.0</ShootingAccuracyPawn>
-						</equippedStatOffsets>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Nakin Race/Nakin_Pawnkind.xml b/Patches/Nakin Race/Nakin_Pawnkind.xml
deleted file mode 100644
index 366218c6d5..0000000000
--- a/Patches/Nakin Race/Nakin_Pawnkind.xml	
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>NakinRace</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[@Name="NakinPawnKindBase"]</xpath>
-					<value>
-						<apparelRequired>
-							<li>CE_Apparel_Backpack</li>
-						</apparelRequired>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Nakin Race/Nakin_Race.xml b/Patches/Nakin Race/Nakin_Race.xml
deleted file mode 100644
index ac21fce8eb..0000000000
--- a/Patches/Nakin Race/Nakin_Race.xml	
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>NakinRace</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NakinRace"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-				<!-- Body Armor Values (Had no reference to use. Vanilla values were 0.1 Sharp/ 0.2 Blunt -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NakinRace"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NakinRace"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NakinRace"]/statBases</xpath>
-					<!-- Nakin are Melee focused and are not good at using ranged weapons-->
-					<value>
-						<AimingAccuracy>0.7</AimingAccuracy>
-						<MeleeCritChance>1.3</MeleeCritChance>
-						<MeleeParryChance>1.3</MeleeParryChance>
-						<ReloadSpeed>2.0</ReloadSpeed>
-						<Suppressability>0.50</Suppressability>
-						<SmokeSensitivity>1</SmokeSensitivity>
-						<NightVisionEfficiency>0.2</NightVisionEfficiency>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NakinRace"]/statBases/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>1.5</MeleeDodgeChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NakinRace"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left craw</label><!-- It's literally called "left craw" in the files -->
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.20</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right craw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.20</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>2</cooldownTime>
-								<chanceFactor>0.07</chanceFactor>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.7</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NakinRace"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NakinRace"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="NakinRace"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Nakin Race/Nakin_Scenario.xml b/Patches/Nakin Race/Nakin_Scenario.xml
deleted file mode 100644
index e2a7343b62..0000000000
--- a/Patches/Nakin Race/Nakin_Scenario.xml	
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>NakinRace</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="NakinCrashlanded"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_303British_FMJ</thingDef>
-							<count>50</count>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ScenarioDef[defName="NakinCrashlanded"]/scenario/parts/li[thingDef="Apparel_AdvancedHelmet"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ScenarioDef[defName="NakinCrashlanded"]/scenario/parts/li[thingDef="Apparel_FlakVest"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ScenarioDef[defName="NakinCrashlanded"]/scenario/parts/li[thingDef="Apparel_FlakPants"]</xpath>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Nanosuit/Armor_Crysis.xml b/Patches/Nanosuit/Armor_Crysis.xml
deleted file mode 100644
index b128e98fae..0000000000
--- a/Patches/Nanosuit/Armor_Crysis.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Nanosuit</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Nano Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="NS_Apparel_NanosuitHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="NS_Apparel_NanosuitHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="NS_Apparel_NanosuitHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>36</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="NS_Apparel_NanosuitHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>240</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="NS_Apparel_NanosuitHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="NS_Apparel_NanosuitHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="NS_Apparel_NanosuitHelmet"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingDelayFactor>-0.05</AimingDelayFactor>
-							<AimingAccuracy>0.1</AimingAccuracy>
-							<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-							<Suppressability>-0.1</Suppressability>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="NS_Apparel_NanosuitHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!-- === Nano Armor === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="ApparelArmorNanoSuitBase"]/apparel/layers</xpath>
-					<value>
-						<li>Webbing</li>
-						<li>Backpack</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="ApparelArmorNanoSuitBase"]/statBases/Mass</xpath>
-					<value>
-						<Bulk>60</Bulk>
-						<WornBulk>8</WornBulk>
-						<Mass>18</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="ApparelArmorNanoSuitBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="ApparelArmorNanoSuitBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>45</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="ApparelArmorNanoSuitBase"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>60</CarryWeight>
-							<CarryBulk>80</CarryBulk>
-							<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-							<MoveSpeed>1</MoveSpeed>
-							<ReloadSpeed>0.15</ReloadSpeed>
-							<Suppressability>-0.33</Suppressability>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="ApparelArmorNanoSuitBase"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Nanosuit.NanosuitDef[defName="NS_Apparel_Nanosuit"]/nightVisor/accuracyBonus</xpath>
-					<value>
-						<accuracyBonus>1.5</accuracyBonus>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Nearmare Race/Ammo/Projectiles.xml b/Patches/Nearmare Race/Ammo/Projectiles.xml
deleted file mode 100644
index 7a6e54114c..0000000000
--- a/Patches/Nearmare Race/Ammo/Projectiles.xml	
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[1.4]Nearmare Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Geist_Knife_Projectile"]</xpath>
-							<value>
-								<ThingDef ParentName="BaseGreatArrowProjectile">
-									<defName>Geist_Knife_Projectile</defName>
-									<label>縛刃『ガイスト』</label>
-									<graphicData>
-										<texPath>HAR_NM/Weapons/W_NM_Knife2</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<speed>25</speed>
-										<damageDef>Damage_Geist</damageDef>
-										<damageAmountBase>1</damageAmountBase>
-										<armorPenetrationSharp>6</armorPenetrationSharp>
-										<armorPenetrationBlunt>0.025</armorPenetrationBlunt>
-									</projectile>
-								</ThingDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Larva_SKnife_Projectile"]</xpath>
-							<value>
-								<ThingDef ParentName="BaseGreatArrowProjectile">
-									<defName>Larva_SKnife_Projectile</defName>
-									<label>憑剣『ラルヴァ』</label>
-									<graphicData>
-										<texPath>HAR_NM/Weapons/W_NM_SKnife2</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<speed>35</speed>
-										<damageDef>Damage_Larva</damageDef>
-										<damageAmountBase>10</damageAmountBase>
-										<armorPenetrationSharp>14</armorPenetrationSharp>
-										<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
-									</projectile>
-								</ThingDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Rugeiyu_Pilum_Thrown"]</xpath>
-							<value>
-								<ThingDef ParentName="BaseGreatArrowProjectile">
-									<defName>Rugeiyu_Pilum_Thrown</defName>
-									<label>魔槍『ルゲイエ』</label>
-									<graphicData>
-										<texPath>HAR_NM/Weapons/W_NM_lance2</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<speed>25</speed>
-										<damageDef>Damage_Rugeiyu</damageDef>
-										<damageAmountBase>3</damageAmountBase>
-										<armorPenetrationSharp>7</armorPenetrationSharp>
-										<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
-									</projectile>
-								</ThingDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/DamageDef[defName="Damage_Genocide_Bomb"]/armorCategory</xpath>
-							<value>
-								<armorCategory>Electric</armorCategory>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Nearmaere_WildHunt_B"]</xpath>
-							<value>
-								<ThingDef ParentName="BaseGreatArrowProjectile">
-									<defName>Nearmaere_WildHunt_B</defName>
-									<label>夢杖『ワイルドハント』</label>
-									<graphicData>
-										<texPath>HAR_NM/Weapons/W_NM_Rod2</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-										<shaderType>TransparentPostLight</shaderType>
-									</graphicData>
-									<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<speed>35</speed>
-										<damageDef>Damage_Genocide_Bomb</damageDef>
-										<damageAmountBase>3</damageAmountBase>
-										<armorPenetrationSharp>0</armorPenetrationSharp>
-										<armorPenetrationBlunt>0</armorPenetrationBlunt>
-										<explosionRadius>25</explosionRadius>
-										<gravityFactor>4</gravityFactor>
-									</projectile>
-								</ThingDef>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Nearmare Race/Bodies/Bodies_Summon.xml b/Patches/Nearmare Race/Bodies/Bodies_Summon.xml
deleted file mode 100644
index cd59e4ac4f..0000000000
--- a/Patches/Nearmare Race/Bodies/Bodies_Summon.xml	
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[1.4]Nearmare Race</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Nearmare Summon === -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="HAR_NM_M_Body"]//*[
-						def="Body" or
-						def="Tail" or
-						def="Neck" or
-						def="Nose" or
-						def="Leg" or
-						customLabel="rear left paw" or
-						customLabel="rear right paw"]
-					</xpath>
-
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="HAR_NM_M_Body"]//*[
-						def="Body" or
-						def="Tail" or
-						def="Neck" or
-						def="Head" or
-						def="Leg" or
-						def="Paw"]/groups
-					</xpath>
-
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Nearmare Race/Bodies/Nearmare_Bodytype.xml b/Patches/Nearmare Race/Bodies/Nearmare_Bodytype.xml
deleted file mode 100644
index 8b7969591d..0000000000
--- a/Patches/Nearmare Race/Bodies/Nearmare_Bodytype.xml	
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-
-			<!--Nearmare Bodytype-->
-
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>[1.4]Nearmare Race</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--Arm Groups-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Nearmaere_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
-							<value>
-								<li>LeftArm</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Nearmaere_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
-							<value>
-								<li>RightArm</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Nearmaere_Body"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
-							<value>
-								<li>LeftShoulder</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Nearmaere_Body"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
-							<value>
-								<li>RightShoulder</li>
-							</value>
-						</li>
-
-						<!--Natural Armor-->
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Nearmaere_Body"]/corePart/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Nearmaere_Body"]/corePart/parts/li[def="Nearmaere_Wing"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Nearmaere_Body"]/corePart/parts/li[def="Neck"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Nearmaere_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Nearmaere_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Nearmaere_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Nearmaere_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Nearmaere_Body"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Nearmaere_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Nearmaere_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Nearmaere_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Nearmaere_Body"]/corePart/parts/li[def="Leg"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Nearmaere_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Nearmaere_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Nearmare Race/PawnKindDefs/Nearmare_PawnKind.xml b/Patches/Nearmare Race/PawnKindDefs/Nearmare_PawnKind.xml
deleted file mode 100644
index df5fdd1af6..0000000000
--- a/Patches/Nearmare Race/PawnKindDefs/Nearmare_PawnKind.xml	
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[1.4]Nearmare Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--Ammo-->
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[
-								@Name="HAR_Nearmaere_KindBase_NPC"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>6</max>
-									</primaryMagazineCount>
-								</li>
-							</value>
-						</li>
-
-						<!--Backpack-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="CE_Apparel_Backpack"]/apparel/tags</xpath>
-							<value>
-								<li>HAR_NM_Apparel</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Nearmare Race/Scenario/Nearmare_Scenario.xml b/Patches/Nearmare Race/Scenario/Nearmare_Scenario.xml
deleted file mode 100644
index 7814668547..0000000000
--- a/Patches/Nearmare Race/Scenario/Nearmare_Scenario.xml	
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[1.4]Nearmare Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ScenarioDef[defName="Nearmaere_Scenario"]/scenario/parts</xpath>
-							<value>
-								<li Class="ScenPart_StartingThing_Defined">
-									<def>StartingThing_Defined</def>
-									<thingDef>Ammo_303British_FMJ</thingDef>
-									<count>100</count>
-								</li>
-								<li Class="ScenPart_StartingThing_Defined">
-									<def>StartingThing_Defined</def>
-									<thingDef>Ammo_44Magnum_FMJ</thingDef>
-									<count>60</count>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ScenarioDef[defName="Nearmaere_Scenario"]/scenario/parts/li[thingDef="Apparel_AdvancedHelmet"]</xpath>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ScenarioDef[defName="Nearmaere_Scenario"]/scenario/parts/li[thingDef="Apparel_FlakVest"]</xpath>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ScenarioDef[defName="Nearmaere_Scenario"]/scenario/parts/li[thingDef="Apparel_FlakPants"]</xpath>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Nearmare Race/ThingDefs_Misc/Nearmare_Apparel.xml b/Patches/Nearmare Race/ThingDefs_Misc/Nearmare_Apparel.xml
deleted file mode 100644
index 039140bc28..0000000000
--- a/Patches/Nearmare Race/ThingDefs_Misc/Nearmare_Apparel.xml	
+++ /dev/null
@@ -1,369 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[1.4]Nearmare Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--========= Stuffable =========-->
-
-						<!--Skin Layer minimum protection-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_NM_Os_P" or
-								defName="HAR_NM_Os_Pb" or
-								defName="HAR_NM_Os_Pc" or
-								defName="HAR_NM_Os_Pd" or
-								defName="HAR_NM_Os_Pe"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>0.25</StuffEffectMultiplierArmor>
-								<Bulk>0.5</Bulk>
-								<WornBulk>0.25</WornBulk>
-							</value>
-						</li>
-
-						<!--Middle Low-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_NM_RiderS"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>0.5</StuffEffectMultiplierArmor>
-								<Bulk>1</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_NM_Tshirt" or
-								defName="HAR_NM_Itimai" or
-								defName="HAR_NM_NurseS"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-								<Bulk>1</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_NM_Sc_Uniform" or
-								defName="HAR_NM_SShirts"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
-								<Bulk>1</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_NM_Blouse"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-								<Bulk>1</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<!--Middle Mid-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_NM_BDress" or
-								defName="HAR_NM_WDress" or
-								defName="HAR_NM_China" or
-								defName="HAR_NM_Maid" or
-								defName="HAR_NM_Kimono" or
-								defName="HAR_NM_Miko"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-								<Bulk>3</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<!--Middle Metallic-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_NM_DLArmor"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
-								<Bulk>60</Bulk>
-								<WornBulk>10</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="HAR_NM_DLArmor"]/apparel/bodyPartGroups</xpath>
-							<value>
-								<li>Hands</li>
-								<li>Feet</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_NM_KArmor"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
-								<Bulk>60</Bulk>
-								<WornBulk>5</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="HAR_NM_KArmor"]/apparel/bodyPartGroups</xpath>
-							<value>
-								<li>Hands</li>
-								<li>Feet</li>
-							</value>
-						</li>
-
-						<!--Shell-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_NM_Sh_K" or
-								defName="HAR_NM_Sh_Kb" or
-								defName="HAR_NM_Sh_Kc" or
-								defName="HAR_NM_Sh_Kd" or
-								defName="HAR_NM_Sh_Ke" or
-								defName="HAR_NM_Sh_Ho" or
-								defName="HAR_NM_Sh_SKo"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-								<Bulk>10</Bulk>
-								<WornBulk>5</WornBulk>
-							</value>
-						</li>
-
-						<!--Shell Metallic
-			
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[
-				defName="HAR_NM_Sh_BKo"
-				]/statBases/StuffEffectMultiplierArmor</xpath>
-				<value>
-					<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					<Bulk>1</Bulk>
-					<WornBulk>1</WornBulk>
-				</value>
-			</li>
-			
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[
-				defName="HAR_NM_Sh_BKo"
-				]/costList/Steel</xpath>
-				<value>
-					<Steel>150</Steel>
-				</value>
-			</li>
-			
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[
-				defName="HAR_NM_Sh_BKo"
-				]</xpath>
-				<value>
-					<costStuffCount>150</costStuffCount>
-					<stuffCategories>
-						<li>Metallic</li>
-					</stuffCategories>
-				</value>
-			</li>
-			-->
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="HAR_NM_Sh_BKo"]/apparel/bodyPartGroups</xpath>
-							<value>
-								<li>Legs</li>
-								<li>Hands</li>
-								<li>Feet</li>
-							</value>
-						</li>
-
-						<!--Overhead-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_NM_MCt" or
-								defName="HAR_NM_Tar"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-								<Bulk>1</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_NM_MHK" or
-								defName="HAR_NM_Cts" or
-								defName="HAR_NM_MRbn"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-								<Bulk>1</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<!--Overhead Armor-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_NM_HArmor"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
-								<Bulk>3</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_NM_HCArmor"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-								<Bulk>3</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="HAR_NM_A_EyeCover_a"]/apparel/bodyPartGroups</xpath>
-							<value>
-								<li>Hands</li>
-								<li>Feet</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="HAR_NM_Sh_BKo"]/statBases</xpath>
-							<value>
-								<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
-								<ArmorRating_Blunt>6</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HAR_NM_AH_f"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>18</ArmorRating_Sharp>
-								<Bulk>40</Bulk>
-								<WornBulk>10</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HAR_NM_AH_f"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>36</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HAR_NM_AH_g"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>8</ArmorRating_Sharp>
-								<Bulk>20</Bulk>
-								<WornBulk>5</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HAR_NM_AH_g"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>16</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HAR_NM_A_a"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>22</ArmorRating_Sharp>
-								<Bulk>80</Bulk>
-								<WornBulk>10</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HAR_NM_A_a"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>50</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HAR_NM_A_b"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>12</ArmorRating_Sharp>
-								<Bulk>40</Bulk>
-								<WornBulk>5</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HAR_NM_A_b"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>20</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HAR_NM_A_Belt_a"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>16</ArmorRating_Sharp>
-								<Bulk>40</Bulk>
-								<WornBulk>5</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HAR_NM_A_Belt_a"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>30</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="HAR_NM_A_Belt_a"]/apparel/bodyPartGroups</xpath>
-							<value>
-								<li>Hands</li>
-								<li>Feet</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="HAR_NM_Armor_Base"]/apparel/bodyPartGroups</xpath>
-							<value>
-								<li>Hands</li>
-								<li>Feet</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Nearmare Race/ThingDefs_Misc/Weapons.xml b/Patches/Nearmare Race/ThingDefs_Misc/Weapons.xml
deleted file mode 100644
index 283b9d442b..0000000000
--- a/Patches/Nearmare Race/ThingDefs_Misc/Weapons.xml	
+++ /dev/null
@@ -1,413 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>[1.4]Nearmare Race</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!-- ==========  Geist Knife  =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Geist_Knife</defName>
-							<statBases>
-								<SightsEfficiency>0.70</SightsEfficiency>
-								<ShotSpread>1.5</ShotSpread>
-								<SwayFactor>0.85</SwayFactor>
-								<Bulk>1</Bulk>
-								<Mass>2</Mass>
-								<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
-							</statBases>
-
-							<Properties>
-								<recoilAmount>0</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Geist_Knife_Projectile</defaultProjectile>
-								<warmupTime>0.3</warmupTime>
-								<range>20</range>
-								<soundCast>Interact_BeatFire</soundCast>
-								<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
-							</Properties>
-							<FireModes>
-							</FireModes>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Geist_Knife"]/statBases</xpath>
-							<value>
-								<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Geist_Knife"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.5</MeleeCritChance>
-									<MeleeParryChance>0.15</MeleeParryChance>
-									<MeleeDodgeChance>0.05</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Geist_Knife"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>1.26</cooldownTime>
-										<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>blade</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>10</power>
-										<cooldownTime>1.18</cooldownTime>
-										<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.32</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>point</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>11</power>
-										<cooldownTime>1.26</cooldownTime>
-										<chanceFactor>1.33</chanceFactor>
-										<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.42</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<!-- ==========  Larva Knife  =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Larva_SKnife</defName>
-							<statBases>
-								<SightsEfficiency>1.25</SightsEfficiency>
-								<ShotSpread>0.20</ShotSpread>
-								<SwayFactor>1.25</SwayFactor>
-								<Bulk>1</Bulk>
-								<Mass>2</Mass>
-								<RangedWeapon_Cooldown>1.26</RangedWeapon_Cooldown>
-							</statBases>
-
-							<Properties>
-								<recoilAmount>0</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Larva_SKnife_Projectile</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>62</range>
-								<soundCast>Interact_BeatFire</soundCast>
-								<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
-							</Properties>
-							<FireModes>
-							</FireModes>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Larva_SKnife"]/statBases</xpath>
-							<value>
-								<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Larva_SKnife"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.5</MeleeCritChance>
-									<MeleeParryChance>0.15</MeleeParryChance>
-									<MeleeDodgeChance>0.05</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Larva_SKnife"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>1.26</cooldownTime>
-										<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>blade</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>10</power>
-										<cooldownTime>1.18</cooldownTime>
-										<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.32</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>point</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>11</power>
-										<cooldownTime>1.26</cooldownTime>
-										<chanceFactor>1.33</chanceFactor>
-										<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.42</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<!-- ==========  Rugeiyo Pila  =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Rugeiyu_Pila</defName>
-							<statBases>
-								<SightsEfficiency>0.85</SightsEfficiency>
-								<ShotSpread>2</ShotSpread>
-								<SwayFactor>1.85</SwayFactor>
-								<Bulk>10</Bulk>
-								<Mass>4</Mass>
-								<RangedWeapon_Cooldown>1.19</RangedWeapon_Cooldown>
-							</statBases>
-
-							<Properties>
-								<recoilAmount>0</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Rugeiyu_Pilum_Thrown</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<burstShotCount>5</burstShotCount>
-								<ticksBetweenBurstShots>20</ticksBetweenBurstShots>
-								<range>51</range>
-								<soundCast>Interact_BeatFire</soundCast>
-								<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
-							</Properties>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>Snapshot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Rugeiyu_Pila"]/statBases</xpath>
-							<value>
-								<MeleeCounterParryBonus>1.08</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Rugeiyu_Pila"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.17</MeleeCritChance>
-									<MeleeParryChance>1.45</MeleeParryChance>
-									<MeleeDodgeChance>0.9</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Rugeiyu_Pila"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>shaft</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>7</power>
-										<cooldownTime>1.35</cooldownTime>
-										<chanceFactor>0.15</chanceFactor>
-										<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>shaft</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>4</power>
-										<cooldownTime>1.78</cooldownTime>
-										<chanceFactor>0.05</chanceFactor>
-										<armorPenetrationBlunt>1</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>18</power>
-										<cooldownTime>1.19</cooldownTime>
-										<chanceFactor>1.00</chanceFactor>
-										<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-										<armorPenetrationSharp>1.5</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<!-- ==========  Wild Hunt  =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Nearmaere_WildHunt</defName>
-							<statBases>
-								<SightsEfficiency>1.00</SightsEfficiency>
-								<ShotSpread>0.20</ShotSpread>
-								<SwayFactor>1.85</SwayFactor>
-								<Bulk>10</Bulk>
-								<Mass>4</Mass>
-								<RangedWeapon_Cooldown>40</RangedWeapon_Cooldown>
-							</statBases>
-
-							<Properties>
-								<recoilAmount>0</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Nearmaere_WildHunt_B</defaultProjectile>
-								<warmupTime>20</warmupTime>
-								<range>86</range>
-								<soundCast>InfernoCannon_Fire</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>14</muzzleFlashScale>
-								<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<onlyManualCast>true</onlyManualCast>
-								<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-							</Properties>
-							<FireModes>
-							</FireModes>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Nearmaere_WildHunt"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>5</power>
-										<cooldownTime>2.85</cooldownTime>
-										<chanceFactor>0.30</chanceFactor>
-										<armorPenetrationBlunt>1.69</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Gun_AssaultRifle_NM"]/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.2</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>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Gun_AssaultRifle_NM</defName>
-							<statBases>
-								<SightsEfficiency>1</SightsEfficiency>
-								<Bulk>6.65</Bulk>
-								<ShotSpread>1</ShotSpread>
-								<SwayFactor>1.3</SwayFactor>
-								<Mass>3.5</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							</statBases>
-
-							<Properties>
-								<recoilAmount>3</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_127x55mm_FMJ</defaultProjectile>
-								<warmupTime>5</warmupTime>
-								<range>52</range>
-								<burstShotCount>10</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<soundCast>Shot_AssaultRifle</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>11</muzzleFlashScale>
-							</Properties>
-
-							<AmmoUser>
-								<magazineSize>30</magazineSize>
-								<reloadTime>5.2</reloadTime>
-								<ammoSet>AmmoSet_127x55mm</ammoSet>
-							</AmmoUser>
-
-							<FireModes>
-								<aimedBurstShotCount>5</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Nearmare Race/ThingDefs_Races/AlienRace_Nearmare.xml b/Patches/Nearmare Race/ThingDefs_Races/AlienRace_Nearmare.xml
deleted file mode 100644
index 6c361c5e8f..0000000000
--- a/Patches/Nearmare Race/ThingDefs_Races/AlienRace_Nearmare.xml	
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[1.4]Nearmare Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="HAR_Nearmaere_BasePawn"]/inspectorTabs/li[.="ITab_Pawn_Gear"]</xpath>
-							<value>
-								<li>CombatExtended.ITab_Inventory</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="HAR_Nearmaere_BasePawn"]/comps</xpath>
-							<value>
-								<li Class="CombatExtended.CompProperties_Inventory" />
-								<li Class="CombatExtended.CompProperties_TacticalManager" />
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="HAR_Nearmaere_BasePawn"]/comps</xpath>
-							<value>
-								<li>
-									<compClass>CombatExtended.CompPawnGizmo</compClass>
-								</li>
-								<li Class="CombatExtended.CompProperties_Suppressable" />
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="HAR_Nearmaere_Base"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Humanoid</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="HAR_Nearmaere_Base"]/statBases</xpath>
-							<value>
-								<Suppressability>1</Suppressability>
-								<SmokeSensitivity>1.2</SmokeSensitivity>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="HAR_Nearmaere_Base"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>1.33</cooldownTime>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.162</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>right fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>1.33</cooldownTime>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.162</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>4.49</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="HAR_Nearmaere_Base"]/alienRace/raceRestriction/whiteApparelList</xpath>
-							<value>
-								<li>CE_Apparel_TacVest</li>
-								<li>CE_Apparel_Backpack</li>
-								<li>CE_Apparel_TribalBackpack</li>
-								<li>CE_Apparel_BallisticShield</li>
-								<li>CE_Apparel_MeleeShield</li>
-								<li>CE_Apparel_GasMask</li>
-								<li>CE_Apparel_ImprovGasMask</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Nearmare Race/ThingDefs_Races/Race_Summons.xml b/Patches/Nearmare Race/ThingDefs_Races/Race_Summons.xml
deleted file mode 100644
index aaf10ac12d..0000000000
--- a/Patches/Nearmare Race/ThingDefs_Races/Race_Summons.xml	
+++ /dev/null
@@ -1,530 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[1.4]Nearmare Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!-- Nightstalker -->
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[@Name="NM_M_NightStalker_Base"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Quadruped</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="NM_M_NightStalker_Base"]/statBases</xpath>
-							<value>
-								<Suppressability>0</Suppressability>
-								<SmokeSensitivity>0</SmokeSensitivity>
-								<ArmorRating_Electric>1</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="NM_M_NightStalker_Base"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>6</ArmorRating_Sharp>
-								<MeleeDodgeChance>0.21</MeleeDodgeChance>
-								<MeleeCritChance>0.20</MeleeCritChance>
-								<MeleeParryChance>0.09</MeleeParryChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="NM_M_NightStalker_Base"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>9</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="NM_M_NightStalker_Base"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left claw</label>
-										<capacities>
-											<li>ScratchToxic</li>
-										</capacities>
-										<power>9</power>
-										<cooldownTime>1.19</cooldownTime>
-										<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-										<surpriseAttack>
-											<extraMeleeDamages>
-												<li>
-													<def>Stun</def>
-													<amount>20</amount>
-												</li>
-											</extraMeleeDamages>
-										</surpriseAttack>
-										<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-										<armorPenetrationSharp>2.1</armorPenetrationSharp>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>right claw</label>
-										<capacities>
-											<li>ScratchToxic</li>
-										</capacities>
-										<power>9</power>
-										<cooldownTime>1.19</cooldownTime>
-										<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-										<surpriseAttack>
-											<extraMeleeDamages>
-												<li>
-													<def>Stun</def>
-													<amount>20</amount>
-												</li>
-											</extraMeleeDamages>
-										</surpriseAttack>
-										<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-										<armorPenetrationSharp>2.1</armorPenetrationSharp>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<capacities>
-											<li>ToxicBite</li>
-										</capacities>
-										<power>19</power>
-										<cooldownTime>1.46</cooldownTime>
-										<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-										<surpriseAttack>
-											<extraMeleeDamages>
-												<li>
-													<def>Stun</def>
-													<amount>20</amount>
-												</li>
-											</extraMeleeDamages>
-										</surpriseAttack>
-										<chanceFactor>2</chanceFactor>
-										<armorPenetrationSharp>2.4</armorPenetrationSharp>
-										<armorPenetrationBlunt>5.063</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>4</power>
-										<cooldownTime>3.2</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationBlunt>1.225</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="NM_M_NightStalker"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>1.2</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="NM_M_NightStalker"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>1.8</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="NM_M_NightStalker_b"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>2.4</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="NM_M_NightStalker_b"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>3.6</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="NM_M_NightStalker_c"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>3.6</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="NM_M_NightStalker_c"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>5.4</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="NM_M_NightStalker_d"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>4.8</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="NM_M_NightStalker_d"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>7.2</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="NM_M_NightStalker_e"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>6</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="NM_M_NightStalker_e"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>9</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!-- Nightgaunt -->
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[@Name="NM_M_NightGaunts_Base"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Humanoid</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="NM_M_NightGaunts_Base"]/statBases</xpath>
-							<value>
-								<Suppressability>0</Suppressability>
-								<SmokeSensitivity>0</SmokeSensitivity>
-								<ArmorRating_Electric>1</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="NM_M_NightGaunts_Base"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>6</ArmorRating_Sharp>
-								<MeleeCritChance>0.15</MeleeCritChance>
-								<MeleeParryChance>0.65</MeleeParryChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="NM_M_NightGaunts_Base"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>9</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="NM_M_NightGaunts_Base"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left claw</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>3</power>
-										<extraMeleeDamages>
-											<li>
-												<def>Flame</def>
-												<amount>6</amount>
-											</li>
-										</extraMeleeDamages>
-										<cooldownTime>2</cooldownTime>
-										<armorPenetrationBlunt>55</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>right claw</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>3</power>
-										<extraMeleeDamages>
-											<li>
-												<def>Frostbite</def>
-												<amount>6</amount>
-											</li>
-										</extraMeleeDamages>
-										<cooldownTime>2</cooldownTime>
-										<armorPenetrationBlunt>55</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="NM_M_NightGaunts"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>1.2</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="NM_M_NightGaunts"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>1.8</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="NM_M_NightGaunts_b"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>2.4</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="NM_M_NightGaunts_b"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>3.6</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="NM_M_NightGaunts_c"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>3.6</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="NM_M_NightGaunts_c"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>5.4</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="NM_M_NightGaunts_d"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>4.8</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="NM_M_NightGaunts_d"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>7.2</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="NM_M_NightGaunts_e"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>6</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="NM_M_NightGaunts_e"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>9</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!-- Nightmare -->
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[@Name="NM_M_Nightmare_Base"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Birdlike</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="NM_M_Nightmare_Base"]/statBases</xpath>
-							<value>
-								<Suppressability>0</Suppressability>
-								<SmokeSensitivity>0</SmokeSensitivity>
-								<ArmorRating_Electric>1</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="NM_M_Nightmare_Base"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>14</ArmorRating_Sharp>
-								<MeleeCritChance>0.15</MeleeCritChance>
-								<MeleeParryChance>0.65</MeleeParryChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="NM_M_Nightmare_Base"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>21</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="NM_M_Nightmare_Base"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left claw</label>
-										<capacities>
-											<li>Scratch</li>
-										</capacities>
-										<power>26</power>
-										<cooldownTime>2.95</cooldownTime>
-										<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-										<surpriseAttack>
-											<extraMeleeDamages>
-												<li>
-													<def>Stun</def>
-													<amount>20</amount>
-												</li>
-											</extraMeleeDamages>
-										</surpriseAttack>
-										<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-										<armorPenetrationSharp>6.25</armorPenetrationSharp>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>right claw</label>
-										<capacities>
-											<li>Scratch</li>
-										</capacities>
-										<power>26</power>
-										<cooldownTime>2.95</cooldownTime>
-										<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-										<surpriseAttack>
-											<extraMeleeDamages>
-												<li>
-													<def>Stun</def>
-													<amount>20</amount>
-												</li>
-											</extraMeleeDamages>
-										</surpriseAttack>
-										<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-										<armorPenetrationSharp>6.25</armorPenetrationSharp>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<capacities>
-											<li>Bite</li>
-										</capacities>
-										<power>40</power>
-										<cooldownTime>3.51</cooldownTime>
-										<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-										<surpriseAttack>
-											<extraMeleeDamages>
-												<li>
-													<def>Stun</def>
-													<amount>20</amount>
-												</li>
-											</extraMeleeDamages>
-										</surpriseAttack>
-										<chanceFactor>0.9</chanceFactor>
-										<armorPenetrationSharp>9.38</armorPenetrationSharp>
-										<armorPenetrationBlunt>15</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>24</power>
-										<cooldownTime>3.17</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationBlunt>10</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="NM_M_Nightmare"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>6</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="NM_M_Nightmare"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>9</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="NM_M_Nightmare_b"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>8</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="NM_M_Nightmare_b"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>12</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="NM_M_Nightmare_c"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>10</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="NM_M_Nightmare_c"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>15</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="NM_M_Nightmare_d"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>12</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="NM_M_Nightmare_d"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>18</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="NM_M_Nightmare_e"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>14</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="NM_M_Nightmare_e"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>21</ArmorRating_Blunt>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Neclose Race/Bodies/Neclose_Bodytype.xml b/Patches/Neclose Race/Bodies/Neclose_Bodytype.xml
deleted file mode 100644
index d1d1ef857c..0000000000
--- a/Patches/Neclose Race/Bodies/Neclose_Bodytype.xml	
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>[1.4]Neclose Race</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--Arm Groups-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>
-								Defs/BodyDef[defName="HAR_Neclose_Body"]//*[
-								customLabel="left shoulder"
-								]/groups
-							</xpath>
-							<value>
-								<li>LeftShoulder</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>
-								Defs/BodyDef[defName="HAR_Neclose_Body"]//*[
-								customLabel="right shoulder"
-								]/groups
-							</xpath>
-							<value>
-								<li>RightShoulder</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>
-								Defs/BodyDef[defName="HAR_Neclose_Body"]//*[
-								customLabel="left arm"
-								]/groups
-							</xpath>
-							<value>
-								<li>LeftArm</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>
-								Defs/BodyDef[defName="HAR_Neclose_Body"]//*[
-								customLabel="right arm"
-								]/groups
-							</xpath>
-							<value>
-								<li>RightArm</li>
-							</value>
-						</li>
-
-						<!--Natural Armor-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>
-								Defs/BodyDef[defName="HAR_Neclose_Body"]//*[
-								def="Torso" or
-								def="Neclose_Wing" or
-								def="Neck" or
-								def="Head" or
-								def="Nose" or
-								def="Jaw" or
-								def="Neclose_Horn" or
-								def="Shoulder" or
-								def="Arm" or
-								def="Hand" or
-								def="Finger" or
-								def="Leg" or
-								def="Foot"
-								]/groups
-							</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Neclose Race/Hediffs/Neclose_Hediffs.xml b/Patches/Neclose Race/Hediffs/Neclose_Hediffs.xml
deleted file mode 100644
index d710f88d6f..0000000000
--- a/Patches/Neclose Race/Hediffs/Neclose_Hediffs.xml	
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[1.4]Neclose Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="HAR_NC_Hediff_b"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>-1</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="HAR_NC_Hediff_b"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>-1.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="HAR_NC_Hediff_b"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>-0.20</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="HAR_NC_Hediff_b"]/stages/li[minSeverity="0.3"]/statOffsets/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>-3</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="HAR_NC_Hediff_b"]/stages/li[minSeverity="0.3"]/statOffsets/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>-4.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="HAR_NC_Hediff_b"]/stages/li[minSeverity="0.3"]/statOffsets/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>-0.40</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="HAR_NC_Hediff_b"]/stages/li[minSeverity="0.6"]/statOffsets/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>-4</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="HAR_NC_Hediff_b"]/stages/li[minSeverity="0.6"]/statOffsets/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>-6</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="HAR_NC_Hediff_b"]/stages/li[minSeverity="0.6"]/statOffsets/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>-0.60</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="HAR_NC_Hediff_b"]/stages/li[minSeverity="0.9"]/statOffsets/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>-6</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="HAR_NC_Hediff_b"]/stages/li[minSeverity="0.9"]/statOffsets/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>-9</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="HAR_NC_Hediff_b"]/stages/li[minSeverity="0.9"]/statOffsets/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>-0.80</MeleeDodgeChance>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Neclose Race/PawnKindDefs/Neclose_PawnKind.xml b/Patches/Neclose Race/PawnKindDefs/Neclose_PawnKind.xml
deleted file mode 100644
index 883db72485..0000000000
--- a/Patches/Neclose Race/PawnKindDefs/Neclose_PawnKind.xml	
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[1.4]Neclose Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--combatPower-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/PawnKindDef[@Name="HAR_Neclose_KindBase"]/combatPower</xpath>
-							<value>
-								<combatPower>200</combatPower>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Neclose Race/Scenario/Neclose_Scenario.xml b/Patches/Neclose Race/Scenario/Neclose_Scenario.xml
deleted file mode 100644
index 3cdd61b9a8..0000000000
--- a/Patches/Neclose Race/Scenario/Neclose_Scenario.xml	
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[1.4]Neclose Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ScenarioDef[defName="Neclose_Scenario"]/scenario/parts</xpath>
-							<value>
-								<li Class="ScenPart_StartingThing_Defined">
-									<def>StartingThing_Defined</def>
-									<thingDef>Ammo_303British_FMJ</thingDef>
-									<count>100</count>
-								</li>
-								<li Class="ScenPart_StartingThing_Defined">
-									<def>StartingThing_Defined</def>
-									<thingDef>Ammo_44Magnum_FMJ</thingDef>
-									<count>60</count>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ScenarioDef[defName="Neclose_Scenario"]/scenario/parts/li[thingDef="Apparel_AdvancedHelmet"]</xpath>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ScenarioDef[defName="Neclose_Scenario"]/scenario/parts/li[thingDef="Apparel_FlakVest"]</xpath>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ScenarioDef[defName="Neclose_Scenario"]/scenario/parts/li[thingDef="Apparel_FlakPants"]</xpath>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Neclose Race/ThingDefs_Misc/Neclose_Apparel.xml b/Patches/Neclose Race/ThingDefs_Misc/Neclose_Apparel.xml
deleted file mode 100644
index 295aa4c10e..0000000000
--- a/Patches/Neclose Race/ThingDefs_Misc/Neclose_Apparel.xml	
+++ /dev/null
@@ -1,279 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[1.4]Neclose Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--========= Stuffable =========-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_NC_Tops_a" or
-								defName="HAR_NC_Tops_b" or
-								defName="HAR_NC_Tops_c"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-								<Bulk>3</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<!--Middle PA-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="HAR_NC_Armor_Base"]/apparel/bodyPartGroups</xpath>
-							<value>
-								<li>Hands</li>
-								<li>Feet</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="HAR_NC_Armor_Base"]/costList</xpath>
-							<value>
-								<DevilstrandCloth>50</DevilstrandCloth>
-							</value>
-						</li>
-
-						<!--Regular-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_NC_Armor_a"
-								]/statBases/ArmorRating_Sharp </xpath>
-							<value>
-								<ArmorRating_Sharp>15</ArmorRating_Sharp>
-								<Bulk>80</Bulk>
-								<WornBulk>10</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_NC_Armor_a"
-								]/statBases/ArmorRating_Blunt </xpath>
-							<value>
-								<ArmorRating_Blunt>37.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_NC_Armor_a"
-								]/statBases/Mass </xpath>
-							<value>
-								<Mass>60</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_NC_Armor_a"
-								]/equippedStatOffsets/MoveSpeed </xpath>
-							<value>
-								<CarryWeight>60</CarryWeight>
-								<CarryBulk>10</CarryBulk>
-								<MoveSpeed>-0.5</MoveSpeed>
-								<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-								<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-							</value>
-						</li>
-
-						<!--Light-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_NC_Armor_b"
-								]/statBases/ArmorRating_Sharp </xpath>
-							<value>
-								<ArmorRating_Sharp>10</ArmorRating_Sharp>
-								<Bulk>80</Bulk>
-								<WornBulk>10</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_NC_Armor_b"
-								]/statBases/ArmorRating_Blunt </xpath>
-							<value>
-								<ArmorRating_Blunt>25</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_NC_Armor_b"
-								]/statBases/Mass </xpath>
-							<value>
-								<Mass>50</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_NC_Armor_b"
-								]/equippedStatOffsets/MeleeDodgeChance </xpath>
-							<value>
-								<CarryWeight>70</CarryWeight>
-								<CarryBulk>10</CarryBulk>
-								<MeleeDodgeChance>1</MeleeDodgeChance>
-								<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-							</value>
-						</li>
-
-						<!--Mid-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_NC_Armor_c"
-								]/statBases/ArmorRating_Sharp </xpath>
-							<value>
-								<ArmorRating_Sharp>13</ArmorRating_Sharp>
-								<Bulk>80</Bulk>
-								<WornBulk>10</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_NC_Armor_c"
-								]/statBases/ArmorRating_Blunt </xpath>
-							<value>
-								<ArmorRating_Blunt>32.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_NC_Armor_c"
-								]/statBases/Mass </xpath>
-							<value>
-								<Mass>60</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_NC_Armor_c"
-								]/equippedStatOffsets/MeleeDodgeChance </xpath>
-							<value>
-								<CarryWeight>70</CarryWeight>
-								<CarryBulk>10</CarryBulk>
-								<MeleeDodgeChance>0.5</MeleeDodgeChance>
-								<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[
-								defName="HAR_NC_Armor_c"
-								]/equippedStatOffsets/MoveSpeed </xpath>
-						</li>
-
-						<!--Shell-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_NC_Shell_a" or
-								defName="HAR_NC_Shell_b" or
-								defName="HAR_NC_Shell_c"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-								<Bulk>10</Bulk>
-								<WornBulk>5</WornBulk>
-							</value>
-						</li>
-
-						<!--Overhead-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_NC_Heads_a"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-								<Bulk>1</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_NC_Heads_c" or
-								defName="HAR_NC_Heads_d" or
-								defName="HAR_NC_Heads_e"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-								<Bulk>1</Bulk>
-								<WornBulk>0</WornBulk>
-							</value>
-						</li>
-
-						<!--Overhead Armor-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_NC_Heads_b"
-								]/statBases/ArmorRating_Sharp </xpath>
-							<value>
-								<ArmorRating_Sharp>15</ArmorRating_Sharp>
-								<Bulk>5</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_NC_Heads_b"
-								]/statBases/ArmorRating_Blunt </xpath>
-							<value>
-								<ArmorRating_Blunt>37.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="HAR_NC_Heads_b"]/apparel/immuneToToxGasExposure</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="HAR_NC_Heads_b"]/apparel</xpath>
-								<value>
-									<immuneToToxGasExposure>true</immuneToToxGasExposure>
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_NC_Heads_b"
-								]/equippedStatOffsets/MoveSpeed </xpath>
-							<value>
-								<AimingAccuracy>0.15</AimingAccuracy>
-								<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-								<SmokeSensitivity>-1</SmokeSensitivity>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HAR_NC_Heads_b"]/costList/Plasteel</xpath>
-							<value>
-								<Plasteel>60</Plasteel>
-								<DevilstrandCloth>20</DevilstrandCloth>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Neclose Race/ThingDefs_Races/AlienRace_Neclose.xml b/Patches/Neclose Race/ThingDefs_Races/AlienRace_Neclose.xml
deleted file mode 100644
index 10e7b38337..0000000000
--- a/Patches/Neclose Race/ThingDefs_Races/AlienRace_Neclose.xml	
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[1.4]Neclose Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="HAR_Neclose_BaseNRPawn"]/inspectorTabs/li[.="ITab_Pawn_Gear"]</xpath>
-							<value>
-								<li>CombatExtended.ITab_Inventory</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="HAR_Neclose_BaseNRPawn"]/comps</xpath>
-							<value>
-								<li Class="CombatExtended.CompProperties_Inventory" />
-								<li Class="CombatExtended.CompProperties_TacticalManager" />
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="HAR_Neclose_BaseNRPawn"]/comps</xpath>
-							<value>
-								<li>
-									<compClass>CombatExtended.CompPawnGizmo</compClass>
-								</li>
-								<li Class="CombatExtended.CompProperties_Suppressable" />
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Neclose"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Humanoid</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Neclose"]/statBases</xpath>
-							<value>
-								<Suppressability>1</Suppressability>
-								<SmokeSensitivity>0.2</SmokeSensitivity>
-								<MeleeCritChance>1.00</MeleeCritChance>
-								<MeleeParryChance>1.00</MeleeParryChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Neclose"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Neclose"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Neclose"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>teeth</label>
-										<capacities>
-											<li>HAR_NC_Damage_a</li>
-										</capacities>
-										<power>20</power>
-										<cooldownTime>3.05</cooldownTime>
-										<extraMeleeDamages>
-											<li>
-												<def>HAR_NC_Damage_b</def>
-												<amount>5</amount>
-											</li>
-											<li>
-												<def>EMP</def>
-												<amount>10</amount>
-											</li>
-										</extraMeleeDamages>
-										<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-										<chanceFactor>1</chanceFactor>
-										<armorPenetrationSharp>6.75</armorPenetrationSharp>
-										<armorPenetrationBlunt>12.35</armorPenetrationBlunt>
-										<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>left fist</label>
-										<capacities>
-											<li>HAR_NC_Damage_a</li>
-										</capacities>
-										<power>10</power>
-										<cooldownTime>1.66</cooldownTime>
-										<extraMeleeDamages>
-											<li>
-												<def>HAR_NC_Damage_b</def>
-												<amount>5</amount>
-											</li>
-											<li>
-												<def>EMP</def>
-												<amount>8</amount>
-											</li>
-										</extraMeleeDamages>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationSharp>2.75</armorPenetrationSharp>
-										<armorPenetrationBlunt>7.75</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>right fist</label>
-										<capacities>
-											<li>HAR_NC_Damage_a</li>
-										</capacities>
-										<power>10</power>
-										<cooldownTime>1.66</cooldownTime>
-										<extraMeleeDamages>
-											<li>
-												<def>HAR_NC_Damage_b</def>
-												<amount>5</amount>
-											</li>
-											<li>
-												<def>EMP</def>
-												<amount>8</amount>
-											</li>
-										</extraMeleeDamages>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationSharp>2.75</armorPenetrationSharp>
-										<armorPenetrationBlunt>7.75</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Neclose"]/alienRace/raceRestriction/whiteApparelList</xpath>
-							<value>
-								<li>CE_Apparel_TacVest</li>
-								<li>CE_Apparel_Backpack</li>
-								<li>CE_Apparel_TribalBackpack</li>
-								<li>CE_Apparel_BallisticShield</li>
-								<li>CE_Apparel_MeleeShield</li>
-								<li>CE_Apparel_GasMask</li>
-								<li>CE_Apparel_ImprovGasMask</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Neclose Race/ThingDefs_Races/Race_Summons.xml b/Patches/Neclose Race/ThingDefs_Races/Race_Summons.xml
deleted file mode 100644
index ddc9d5d90b..0000000000
--- a/Patches/Neclose Race/ThingDefs_Races/Race_Summons.xml	
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[1.4]Neclose Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!-- Summons -->
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[@Name="NC_Summon_PawnBase"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Quadruped</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="NC_Summon_PawnBase"]/statBases</xpath>
-							<value>
-								<Suppressability>0</Suppressability>
-								<SmokeSensitivity>0</SmokeSensitivity>
-								<MeleeDodgeChance>0.20</MeleeDodgeChance>
-								<MeleeCritChance>0.20</MeleeCritChance>
-								<MeleeParryChance>0.20</MeleeParryChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								@Name="HAR_NC_M_a_race_Base" or
-								@Name="HAR_NC_M_b_race_Base" or
-								@Name="HAR_NC_M_c_race_Base"
-								]/tools </xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left claw</label>
-										<capacities>
-											<li>HAR_NC_Damage_a</li>
-										</capacities>
-										<power>9</power>
-										<cooldownTime>1.19</cooldownTime>
-										<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-										<extraMeleeDamages>
-											<li>
-												<def>HAR_NC_Damage_b</def>
-												<amount>5</amount>
-											</li>
-										</extraMeleeDamages>
-										<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-										<armorPenetrationSharp>2.1</armorPenetrationSharp>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>right claw</label>
-										<capacities>
-											<li>HAR_NC_Damage_a</li>
-										</capacities>
-										<power>9</power>
-										<cooldownTime>1.19</cooldownTime>
-										<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-										<extraMeleeDamages>
-											<li>
-												<def>HAR_NC_Damage_b</def>
-												<amount>5</amount>
-											</li>
-										</extraMeleeDamages>
-										<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-										<armorPenetrationSharp>2.1</armorPenetrationSharp>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>razorfangs</label>
-										<capacities>
-											<li>HAR_NC_Damage_a</li>
-										</capacities>
-										<power>19</power>
-										<cooldownTime>1.46</cooldownTime>
-										<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-										<extraMeleeDamages>
-											<li>
-												<def>HAR_NC_Damage_b</def>
-												<amount>5</amount>
-											</li>
-										</extraMeleeDamages>
-										<chanceFactor>2</chanceFactor>
-										<armorPenetrationSharp>2.4</armorPenetrationSharp>
-										<armorPenetrationBlunt>5.063</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/New Mech - Mini-Miner/Race_MiniMiner.xml b/Patches/New Mech - Mini-Miner/Race_MiniMiner.xml
deleted file mode 100644
index 993b2dde60..0000000000
--- a/Patches/New Mech - Mini-Miner/Race_MiniMiner.xml	
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>New Mech: Mini-Miner</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Pawn inherits needed StatBase stuff from LightMech parent.-->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Mech_MiniMiner"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mech_MiniMiner"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.0</cooldownTime>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.0</cooldownTime>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/NewRatkinPlus/Ammo/Ammo_Flechette.xml b/Patches/NewRatkinPlus/Ammo/Ammo_Flechette.xml
deleted file mode 100644
index ab7c8bacd4..0000000000
--- a/Patches/NewRatkinPlus/Ammo/Ammo_Flechette.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>NewRatkinPlus</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==========  Flechette Rounds =========== -->
-
-				<!-- Def -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_65x50mmSRArisaka"]/ammoTypes</xpath>
-					<value>
-						<Ammo_65x50mmSRArisaka_FLCH>Bullet_65x50mmSRArisaka_FLCH</Ammo_65x50mmSRArisaka_FLCH>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="65x50mmSRArisakaBase">
-							<defName>Ammo_65x50mmSRArisaka_FLCH</defName>
-							<label>6.5x50mmSR Arisaka cartridge (Flechette)</label>
-							<graphicData>
-								<texPath>ThirdParty/Ratkin/FLCH</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.1</MarketValue>
-							</statBases>
-							<ammoClass>Flechette</ammoClass>
-						</ThingDef>
-
-						<!-- Projectile -->
-						<ThingDef ParentName="Base65x50mmSRArisakaBullet">
-							<defName>Bullet_65x50mmSRArisaka_FLCH</defName>
-							<label>6.5x50mmSR Arisaka cartridge (Flechette)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Fragment</damageDef>
-								<damageAmountBase>17</damageAmountBase>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>53.96</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<!-- Recipe -->
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_65x50mmSRArisaka_FLCH</defName>
-							<label>make 500 65x50mm Arisaka Flechette rounds.</label>
-							<description>Craft 65x50mm Arisaka Flechette rounds.</description>
-							<jobString>Making 65x50mm Arisaka Flechette rounds.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>24</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_65x50mmSRArisaka_FLCH>500</Ammo_65x50mmSRArisaka_FLCH>
-							</products>
-							<researchPrerequisite>FlechetteBullet</researchPrerequisite>
-							<workAmount>2800</workAmount>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/NewRatkinPlus/Ammo/RKBallistaBolt.xml b/Patches/NewRatkinPlus/Ammo/RKBallistaBolt.xml
deleted file mode 100644
index bb9c23e812..0000000000
--- a/Patches/NewRatkinPlus/Ammo/RKBallistaBolt.xml
+++ /dev/null
@@ -1,287 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>NewRatkinPlus</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingCategoryDef>
-							<defName>AmmoBallistaBolts</defName>
-							<label>Ballista Bolts</label>
-							<parent>AmmoNeolithic</parent>
-						</ThingCategoryDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_RKBallistaBolt</defName>
-							<label>Ballista Bolt</label>
-							<ammoTypes>
-								<Ammo_RKBallistaBolt>Projectile_RKBallistaBolt</Ammo_RKBallistaBolt>
-								<Ammo_RKBallistaBolt_Bodkin>Projectile_RKBallistaBolt_Bodkin</Ammo_RKBallistaBolt_Bodkin>
-								<Ammo_RKBallistaBolt_Fire>Projectile_RKBallistaBolt_Fire</Ammo_RKBallistaBolt_Fire>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Name="AmmoRKBallistaBolt" ParentName="AmmoBase" Abstract="True">
-							<description>Heavy bolt designed to be fired from a ratkin ballista.</description>
-							<statBases>
-								<Mass>2.00</Mass>
-								<Bulk>7.50</Bulk>
-								<Flammability>1</Flammability>
-							</statBases>
-							<thingCategories>
-								<li>AmmoBallistaBolts</li>
-							</thingCategories>
-							<stackLimit>75</stackLimit>
-							<techLevel>Medieval</techLevel>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoRKBallistaBolt">
-							<defName>Ammo_RKBallistaBolt</defName>
-							<label>Ballista Bolt</label>
-							<graphicData>
-								<texPath>Things/Item/Resource/Ballista_Bolt_Normal</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>7.5</MarketValue>
-							</statBases>
-							<ammoClass>RKBallistaBolt</ammoClass>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoRKBallistaBolt">
-							<defName>Ammo_RKBallistaBolt_Bodkin</defName>
-							<label>Ballista Bodkin Bolt</label>
-							<graphicData>
-								<texPath>Things/Item/Resource/Ballista_Bolt_AP</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>9.5</MarketValue>
-							</statBases>
-							<ammoClass>RKBallistaBolt_AP</ammoClass>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoRKBallistaBolt">
-							<defName>Ammo_RKBallistaBolt_Fire</defName>
-							<label>Flaming Ballista Bolt</label>
-							<graphicData>
-								<texPath>Things/Item/Resource/Ballista_Bolt_HE</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>10.5</MarketValue>
-							</statBases>
-							<ammoClass>RKBallistaBolt_Fire</ammoClass>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="BaseProjectileNeolithic" Name="BaseProjectileRKBallista" Abstract="true">
-							<thingClass>CombatExtended.BulletCE</thingClass>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>45</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseProjectileRKBallista">
-							<defName>Projectile_RKBallistaBolt_Bodkin</defName>
-							<label>Ballista Bolt</label>
-							<graphicData>
-								<texPath>Things/Projectile/Ballista_Bolt_Normal</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Stab</damageDef>
-								<damageAmountBase>10</damageAmountBase>
-								<armorPenetrationBlunt>12.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Ammo_RKBallistaBolt</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseProjectileRKBallista">
-							<defName>Projectile_RKBallistaBolt</defName>
-							<label>Ballista Bodkin Bolt</label>
-							<graphicData>
-								<texPath>Things/Projectile/Ballista_Bolt_AP</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Stab</damageDef>
-								<damageAmountBase>19</damageAmountBase>
-								<armorPenetrationBlunt>12.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<preExplosionSpawnChance>0.3</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Ammo_RKBallistaBolt_Bodkin</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseProjectileRKBallista">
-							<defName>Projectile_RKBallistaBolt_Fire</defName>
-							<label>Ballista Bodkin Bolt</label>
-							<thingClass>CombatExtended.Projectile_FireTrail</thingClass>
-							<graphicData>
-								<texPath>Things/Projectile/Ballista_Bolt_HE</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>1.5</explosionRadius>
-								<damageAmountBase>15</damageAmountBase>
-								<damageDef>Flame</damageDef>
-								<armorPenetrationBlunt>12.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
-								<preExplosionSpawnChance>1</preExplosionSpawnChance>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>MakeRKBallistaBolt</defName>
-							<label>make ballista bolt</label>
-							<description>Craft ballista bolt.</description>
-							<jobString>Making ballista bolt.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>5</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>15</count>
-								</li>
-							</ingredients>
-							<workAmount>2300</workAmount>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_RKBallistaBolt>5</Ammo_RKBallistaBolt>
-							</products>
-							<recipeUsers>
-								<li>FueledSmithy</li>
-								<li>ElectricSmithy</li>
-								<li>RK_FueledSmithy</li>
-								<li>RK_ElectricSmithy</li>
-							</recipeUsers>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>MakeRKBallistaBodkinBolt</defName>
-							<label>make ballista bodkin bolt</label>
-							<description>Craft ballista bodkin bolt.</description>
-							<jobString>Making ballista bodkin bolt.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>5</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>12</count>
-								</li>
-							</ingredients>
-							<workAmount>3500</workAmount>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_RKBallistaBolt_Bodkin>5</Ammo_RKBallistaBolt_Bodkin>
-							</products>
-							<recipeUsers>
-								<li>FueledSmithy</li>
-								<li>ElectricSmithy</li>
-								<li>RK_FueledSmithy</li>
-								<li>RK_ElectricSmithy</li>
-							</recipeUsers>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>MakeRKBallistaFireBolt</defName>
-							<label>make flaming ballista bolt</label>
-							<description>Craft flaming ballista bolt.</description>
-							<jobString>Making flaming ballista bolt.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Prometheum</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-							</ingredients>
-							<workAmount>5000</workAmount>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_RKBallistaBolt_Fire>5</Ammo_RKBallistaBolt_Fire>
-							</products>
-							<recipeUsers>
-								<li>FueledSmithy</li>
-								<li>ElectricSmithy</li>
-								<li>RK_FueledSmithy</li>
-								<li>RK_ElectricSmithy</li>
-							</recipeUsers>
-						</RecipeDef>
-
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/NewRatkinPlus/Ammo/RKCannonShell.xml b/Patches/NewRatkinPlus/Ammo/RKCannonShell.xml
deleted file mode 100644
index 45e6d19fd5..0000000000
--- a/Patches/NewRatkinPlus/Ammo/RKCannonShell.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>NewRatkinPlus</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingCategoryDef>
-							<defName>Ammo_RKCannonShell</defName>
-							<label>Ratkin Cannon Balls</label>
-							<parent>AmmoMedieval</parent>
-						</ThingCategoryDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_RKCannonBall</defName>
-							<label>Cannon Ball</label>
-							<ammoTypes>
-								<Ammo_RKCannonBall>Projectile_RKCannonBall</Ammo_RKCannonBall>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Name="AmmoRKCannonBall" ParentName="HeavyAmmoBase" Abstract="True">
-							<description>Simple solid shot, designed for ratkin cannons.</description>
-							<statBases>
-								<Mass>13.6</Mass>
-								<Bulk>8.31</Bulk>
-								<Flammability>1</Flammability>
-							</statBases>
-							<thingCategories>
-								<li>Ammo_RKCannonShell</li>
-							</thingCategories>
-							<stackLimit>25</stackLimit>
-							<techLevel>Medieval</techLevel>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoRKCannonBall">
-							<defName>Ammo_RKCannonBall</defName>
-							<label>Cannon Ball</label>
-							<graphicData>
-								<texPath>Things/Item/Resource/Big_mouse</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<drawSize>(0.6,0.6)</drawSize>
-							</graphicData>
-							<statBases>
-								<MarketValue>54.7</MarketValue>
-							</statBases>
-							<ammoClass>CannonBall</ammoClass>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="BaseProjectileNeolithic" Name="BaseProjectileRKCannon" Abstract="true">
-							<thingClass>CombatExtended.BulletCE</thingClass>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>45</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseProjectileRKCannon">
-							<defName>Projectile_RKCannonBall</defName>
-							<label>Cannon Ball</label>
-							<graphicData>
-								<texPath>Things/Projectile/Big_mouse</texPath>
-								<drawSize>(0.6,0.6)</drawSize>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>337</damageAmountBase>
-								<armorPenetrationBlunt>17856.08</armorPenetrationBlunt>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>MakeRKCannonBall</defName>
-							<label>make Cannon 5 Balls</label>
-							<description>Craft Cannon Ball x5.</description>
-							<jobString>Making Cannon Ball.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>138</count>
-								</li>
-							</ingredients>
-							<workAmount>13800</workAmount>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_RKCannonBall>5</Ammo_RKCannonBall>
-							</products>
-							<recipeUsers>
-								<li>FueledSmithy</li>
-								<li>ElectricSmithy</li>
-								<li>RK_FueledSmithy</li>
-								<li>RK_ElectricSmithy</li>
-							</recipeUsers>
-						</RecipeDef>
-
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/NewRatkinPlus/Bodies/Bodies_Ratkin.xml b/Patches/NewRatkinPlus/Bodies/Bodies_Ratkin.xml
deleted file mode 100644
index f31cecf9c6..0000000000
--- a/Patches/NewRatkinPlus/Bodies/Bodies_Ratkin.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>NewRatkinPlus</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Add new parts ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel = "left arm"]/groups</xpath>
-					<value>
-						<li>LeftArm</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel = "right arm"]/groups</xpath>
-					<value>
-						<li>RightArm</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
-					<value>
-						<li>LeftShoulder</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
-					<value>
-						<li>RightShoulder</li>
-					</value>
-				</li>
-
-				<!-- ========== Adjust Coverages ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Ribcage"]/coverage</xpath>
-					<value>
-						<coverage>0.06</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Pelvis"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Stomach"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Heart"]/coverage</xpath>
-					<value>
-						<coverage>0.03</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Lung"]/coverage</xpath>
-					<value>
-						<coverage>0.0525</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Kidney"]/coverage</xpath>
-					<value>
-						<coverage>0.03</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Liver"]/coverage</xpath>
-					<value>
-						<coverage>0.055</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Neck"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Skull"]/parts/li[def = "Brain"]/coverage</xpath>
-					<value>
-						<coverage>0.9</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def = "Eye"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def = "Ear"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def = "Nose"]/coverage</xpath>
-					<value>
-						<coverage>0.08</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Shoulder"]/coverage</xpath>
-					<value>
-						<coverage>0.085</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Clavicle"]/coverage</xpath>
-					<value>
-						<coverage>0.06</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def="Humerus"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def="Radius"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Leg"]/parts/li[def="Femur"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Leg"]/parts/li[def="Tibia"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Neck"]/parts/li[def = "Head"]/parts/li[customLabel="left ear"]/coverage</xpath>
-					<value>
-						<coverage>0.09</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Neck"]/parts/li[def = "Head"]/parts/li[customLabel="right ear"]/coverage</xpath>
-					<value>
-						<coverage>0.09</coverage>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/NewRatkinPlus/PawnKindDefs/PawnKinds_Ratkin.xml b/Patches/NewRatkinPlus/PawnKindDefs/PawnKinds_Ratkin.xml
deleted file mode 100644
index 59e2b8b541..0000000000
--- a/Patches/NewRatkinPlus/PawnKindDefs/PawnKinds_Ratkin.xml
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>NewRatkinPlus</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Add tags for loadbearing gear to pawns.. =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[
-						defName="RatkinColonist" or
-						defName="RatkinNoble" or
-						defName="RatkinServant" or
-						defName="RatkinCombatant" or
-						defName="RatkinEliteGuardener" or
-						defName="RatkinMercenary" or
-						defName="RatkinKnight" or
-						defName="RatkinKnightCommander" or
-						defName="RatkinPriest" or
-						defName="RatkinMerchant" or
-						defName="RatkinMercenaryLight" or
-						defName="RatkinMurderer" or
-						defName="RatkinVagabond" or
-						defName="RatkinDemonMan" or
-						defName="RatkinEliteSoldier" or
-						defName="RatkinSoldier"
-						]/apparelTags </xpath>
-					<value>
-						<li>RK_Loadbearing</li>
-					</value>
-				</li>
-
-				<!-- ========== Combatant ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RatkinCombatant"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>8</min>
-								<max>12</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Mercenary ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RatkinMercenary"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Merchant ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RatkinMerchant"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Soldier ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RatkinSoldier"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Subject ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RatkinSubject"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Guardener ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RatkinEliteGuardener"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Murderer ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RatkinMurderer"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Vagabond ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RatkinVagabond"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Mercenary - Light ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RatkinMercenaryLight"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Elite ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RatkinEliteSoldier"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Demoman ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RatkinDemonMan"]/weaponTags</xpath>
-					<value>
-						<weaponTags>
-							<li>GrenadeDestructive</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RatkinDemonMan"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>8</min>
-								<max>12</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<magazineCount>
-										<min>6</min>
-										<max>10</max>
-									</magazineCount>
-									<generateChance>0.7</generateChance>
-									<sidearmMoney>
-										<min>375</min>
-										<max>825</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>RK_Rifle</li>
-										<li>CE_AI_Grenade</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Vagabond ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RatkinPettyThief"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>4</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/NewRatkinPlus/Scenarios/Scenarios.xml b/Patches/NewRatkinPlus/Scenarios/Scenarios.xml
deleted file mode 100644
index a6486e21d6..0000000000
--- a/Patches/NewRatkinPlus/Scenarios/Scenarios.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>NewRatkinPlus</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="RK_Scenario"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_CrossbowBolt_Stone</thingDef>
-							<count>60</count>
-						</li>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_65x50mmSRArisaka_FMJ</thingDef>
-							<count>60</count>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/FactionDef[@Name="RK_PlayerFactionBase"]/apparelStuffFilter</xpath>
-					<match Class="PatchOperationConditional">
-						<xpath>Defs/FactionDef[@Name="RK_PlayerFactionBase"]/apparelStuffFilter/thingDefs</xpath>
-						<match Class="PatchOperationConditional">
-							<xpath>Defs/FactionDef[@Name="RK_PlayerFactionBase"]/apparelStuffFilter/thingDefs/li["Steel"]</xpath>
-							<match Class="PatchOperationReplace">
-								<xpath>Defs/FactionDef[@Name="RK_PlayerFactionBase"]/apparelStuffFilter/thingDefs/li["Steel"]</xpath>
-								<value>
-									<li>Steel</li>
-								</value>
-							</match>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/FactionDef[@Name="RK_PlayerFactionBase"]/apparelStuffFilter/thingDefs</xpath>
-								<value>
-									<li>Steel</li>
-								</value>
-							</nomatch>
-						</match>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/FactionDef[@Name="RK_PlayerFactionBase"]/apparelStuffFilter</xpath>
-							<value>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</value>
-						</nomatch>
-					</match>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/FactionDef[@Name="RK_PlayerFactionBase"]</xpath>
-						<value>
-							<apparelStuffFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</apparelStuffFilter>
-						</value>
-					</nomatch>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/NewRatkinPlus/ThingDef_Misc/AmmoCategories.xml b/Patches/NewRatkinPlus/ThingDef_Misc/AmmoCategories.xml
deleted file mode 100644
index ed6b15eef7..0000000000
--- a/Patches/NewRatkinPlus/ThingDef_Misc/AmmoCategories.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>NewRatkinPlus</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<CombatExtended.AmmoCategoryDef>
-							<defName>RK_CrossbowBolt</defName>
-							<label>Bolt</label>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>Flechette</defName>
-							<label>Flechette</label>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>RKBallistaBolt</defName>
-							<label>Ballista Bolt</label>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>RKBallistaBolt_Fire</defName>
-							<label>Flaming Ballista Bolt</label>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>RKBallistaBolt_AP</defName>
-							<label>Ballista Bodkin Bolt</label>
-						</CombatExtended.AmmoCategoryDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_Apparel.xml b/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_Apparel.xml
deleted file mode 100644
index 252bd3edfe..0000000000
--- a/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_Apparel.xml
+++ /dev/null
@@ -1,567 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>NewRatkinPlus</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--NOTE: Numerous pieces of apparel aren't patched here. Apparel without a specific value for Bulk or WornBulk
-				defaults to '1' for both. So, smaller pieces of clothing don't need patched.-->
-
-				<!-- ========== CLOTHING =========== -->
-				<!-- ========== Apparel Base =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RK_ApparelBase"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>1</WornBulk>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="RK_ApronSkirt" or
-						defName="RK_SummerDress" or
-						defName="RK_Cardigan" or
-						defName="RK_WorkerWear" or
-						defName="RK_ResearchGown" or
-						defName="RK_ExplorerWear" or
-						defName="RK_ChefSuit" or
-						defName="RK_GaurdenUniform" or
-						defName="RK_WinterRobe" or
-						defName="RK_FlatColorCoat" or
-						defName="RK_SistersDerss" or
-						defName="RK_SantaRobe"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-				</li>
-
-				<!-- ========== Gaurden Uniform =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_GaurdenUniform"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>6</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_GaurdenUniform"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_GaurdenUniform"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ========== Winter Robe =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_WinterRobe"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>4</WornBulk>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Cardigan =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_Cardigan"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Coat =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_FlatColorCoat"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== White Coat =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_WhiteCoat"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>4</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_WhiteCoat"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-						<ArmorRating_Electric>0.60</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_WhiteCoat"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ========== LOADBEARING GEAR =========== -->
-				<!-- ========== Crossback =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_CrossBack"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_CrossBack"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>20</CarryBulk>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- ========== Backpack =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_Backpack"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_Backpack"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>30</CarryBulk>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- ========== Outoor Backpack =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_OutdoorBackpack"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_OutdoorBackpack"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>40</CarryBulk>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- ========== Sack =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_Sack"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_Sack"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>50</CarryBulk>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- ========== Santa Sack =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_SantaSack"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_SantaSack"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>60</CarryBulk>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- ========== ARMOR =========== -->
-				<!-- ========== Combat Helmet =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_BulletProofHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_BulletProofHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_BulletProofHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-				
-				<!-- ========== Order Uniform =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_OrderUniform"]/statBases/Mass</xpath>
-					<value>
-						<Bulk>16</Bulk>
-						<WornBulk>10</WornBulk>
-						<Mass>10</Mass>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_OrderUniform"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_OrderUniform"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5.75</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_OrderUniform"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>7.875</ArmorRating_Blunt>
-					</value>
-				</li>
-				
-				<!-- ========== Battlesuit =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_BattleSuit"]/statBases</xpath>
-					<value>
-						<Bulk>60</Bulk>
-						<WornBulk>12</WornBulk>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RK_BattleSuit"]/statBases/StuffEffectMultiplierArmor</xpath>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_BattleSuit"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_BattleSuit"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>36</ArmorRating_Blunt>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_BattleSuit"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>30</CarryBulk>
-							<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-							<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_BattleSuit"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-				
-				<!-- ========== Combat Mask =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_Mask" or defName="RK_MaskB"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_Mask" or defName="RK_MaskB"]/equippedStatOffsets</xpath>
-					<value>
-						<PsychicSensitivity>-0.1</PsychicSensitivity>
-						<AimingAccuracy>0.1</AimingAccuracy>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RK_Mask" or defName="RK_MaskB"]/statBases/StuffEffectMultiplierArmor</xpath>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_Mask" or defName="RK_MaskB"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>13</ArmorRating_Sharp>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_Mask" or defName="RK_MaskB"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>32</ArmorRating_Blunt>
-					</value>
-				</li>
-				
-				<!-- ========== Plate Armor =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_Plate"]/statBases</xpath>
-					<value>
-						<Bulk>80</Bulk>
-						<WornBulk>8</WornBulk>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_Plate"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_Plate"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-				
-				<!-- ========== Plate Armor - Helmets =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_PlateHelmA" or
-						defName="RK_PlateHelmB" or
-						defName="RK_PlateHelmC"]/statBases </xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_PlateHelmA" or
-						defName="RK_PlateHelmB" or
-						defName="RK_PlateHelmC"]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_PlateHelmA" or
-						defName="RK_PlateHelmB" or
-						defName="RK_PlateHelmC"]/equippedStatOffsets </xpath>
-					<value>
-						<AimingAccuracy>-0.4</AimingAccuracy>
-						<MeleeHitChance>-2</MeleeHitChance>
-					</value>
-				</li>
-
-				<!-- ========== Shields =========== -->
-				
-				<!-- ========== WoodenShield =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_WoodenShield"]/statBases</xpath>
-					<value>
-						<Bulk>7</Bulk>
-						<WornBulk>4</WornBulk>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_WoodenShield"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.2</ArmorRating_Sharp>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_WoodenShield"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.75</ArmorRating_Blunt>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_WoodenShield"]/equippedStatOffsets</xpath>
-					<value>
-						<ReloadSpeed>-0.2</ReloadSpeed>
-						<MeleeHitChance>-1</MeleeHitChance>
-						<ShootingAccuracyPawn>-0.15</ShootingAccuracyPawn>
-						<AimingAccuracy>-0.08</AimingAccuracy>
-						<Suppressability>-0.25</Suppressability>
-						<MeleeCritChance>-0.05</MeleeCritChance>
-						<MeleeParryChance>1.0</MeleeParryChance>
-					</value>
-				</li>
-					
-				<!-- ========== HeavyShield =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_HeavyShield"]/statBases/Mass</xpath>
-					<value>
-						<Mass>8</Mass>
-						<Bulk>14</Bulk>
-						<WornBulk>8</WornBulk>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_HeavyShield"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_HeavyShield"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_HeavyShield"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_HeavyShield"]/equippedStatOffsets</xpath>
-					<value>
-						<ReloadSpeed>-0.2</ReloadSpeed>
-						<MeleeHitChance>-1</MeleeHitChance>
-						<ShootingAccuracyPawn>-0.30</ShootingAccuracyPawn>
-						<AimingAccuracy>-0.16</AimingAccuracy>
-						<Suppressability>-0.25</Suppressability>
-						<MeleeCritChance>-0.05</MeleeCritChance>
-						<MeleeParryChance>1.0</MeleeParryChance>
-					</value>
-				</li>
-				
-				<!-- ========== HeavyShield_Big =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_HeavyShield_Big"]/statBases/Mass</xpath>
-					<value>
-						<Mass>12</Mass>
-						<Bulk>18</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_HeavyShield_Big"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_HeavyShield_Big"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_HeavyShield_Big"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_HeavyShield_Big"]/equippedStatOffsets/MeleeHitChance</xpath>
-					<value>
-						<ReloadSpeed>-0.3</ReloadSpeed>
-						<MeleeHitChance>-1.2</MeleeHitChance>
-						<ShootingAccuracyPawn>-0.40</ShootingAccuracyPawn>
-						<AimingAccuracy>-0.40</AimingAccuracy>
-						<Suppressability>-0.50</Suppressability>
-						<MeleeCritChance>-0.05</MeleeCritChance>
-						<MeleeParryChance>1.0</MeleeParryChance>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_HeavyShield" or defName="RK_WoodenShield" or defName="RK_HeavyShield_Big"]/apparel/layers</xpath>
-					<value>
-						<layers>
-							<li>Shield</li>
-						</layers>
-					</value>
-				</li>
-
-				<!-- ========== Add proper tags to loadbearing gear. =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RK_SantaSack" or
-						defName="RK_Backpack" or
-						defName="RK_CrossBack" or
-						defName="RK_OutsideBackpack" or
-						defName="RK_Sack"
-						]/apparel/tags </xpath>
-					<value>
-						<li>RK_Loadbearing</li>
-					</value>
-				</li>
-				
-				<!-- ========== Fix apparel layer for loadbearing gear. =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RK_SantaSack" or
-						defName="RK_Backpack" or
-						defName="RK_CrossBack" or
-						defName="RK_OutsideBackpack" or
-						defName="RK_Sack"
-						]/apparel/layers </xpath>
-					<value>
-						<layers>
-							<li>Backpack</li>
-						</layers>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
diff --git a/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_Buildings_Security.xml b/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_Buildings_Security.xml
deleted file mode 100644
index 5d7f74dbed..0000000000
--- a/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_Buildings_Security.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>NewRatkinPlus</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Ratkin Ballista ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding"]/inspectorTabs</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding"]/statBases/AccuracyTouch</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding"]/statBases/AccuracyShort</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding"]/statBases/AccuracyMedium</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding"]/statBases/AccuracyLong</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>1</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryWeapon"]/building</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryWeapon"]/comps/li[@Class="CompProperties_ChangeableProjectile"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryWeapon"]/statBases/AccuracyTouch</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryWeapon"]/statBases/AccuracyShort</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryWeapon"]/statBases/AccuracyMedium</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryWeapon"]/statBases/AccuracyLong</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "RK_Turret_Ballista_Strait"]</xpath>
-					<value>
-						<statBases />
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RK_Turret_Ballista_Strait</defName>
-					<statBases>
-						<Mass>16.5</Mass>
-						<Bulk>20</Bulk>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>0.96</SwayFactor>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_RKBallistaBolt</defaultProjectile>
-						<warmupTime>2.1</warmupTime>
-						<range>44</range>
-						<soundCast>BallistaShot</soundCast>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>8</reloadTime>
-						<ammoSet>AmmoSet_RKBallistaBolt</ammoSet>
-					</AmmoUser>
-					<FireModes>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="BallistaBolt_Normal"]</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="BallistaBolt_AP"]</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="BallistaBolt_Heavy"]</xpath>
-				</li>
-
-				<!-- ========== Ratkin Cannon ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding_Cannon"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding_Cannon"]/inspectorTabs</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding_Cannon"]/statBases/AccuracyTouch</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding_Cannon"]/statBases/AccuracyShort</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding_Cannon"]/statBases/AccuracyMedium</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding_Cannon"]/statBases/AccuracyLong</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding_Cannon"]/costList/Chemfuel</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding_Cannon"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>1</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryWeapon_Cannon"]/building</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryWeapon_Cannon"]/comps/li[@Class="CompProperties_ChangeableProjectile"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryWeapon_Cannon"]/statBases/AccuracyTouch</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryWeapon_Cannon"]/statBases/AccuracyShort</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryWeapon_Cannon"]/statBases/AccuracyMedium</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name = "RK_BaseArtilleryWeapon_Cannon"]/statBases/AccuracyLong</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "RK_Turret_Cannon_Strait"]</xpath>
-					<value>
-						<statBases />
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RK_Turret_Cannon_Strait</defName>
-					<statBases>
-						<Mass>20</Mass>
-						<Bulk>20</Bulk>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.26</ShotSpread>
-						<SwayFactor>1.55</SwayFactor>
-						<RangedWeapon_Cooldown>3</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_RKCannonBall</defaultProjectile>
-						<warmupTime>4.9</warmupTime>
-						<range>75</range>
-						<soundCast>RKCannonShot</soundCast>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>14</reloadTime>
-						<ammoSet>AmmoSet_RKCannonBall</ammoSet>
-					</AmmoUser>
-					<FireModes>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- Bolts -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Bullet_Big_mouse"]</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Big_mouse"]</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_MeleeWeapons.xml b/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_MeleeWeapons.xml
deleted file mode 100644
index 9299477ebe..0000000000
--- a/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_MeleeWeapons.xml
+++ /dev/null
@@ -1,721 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>NewRatkinPlus</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Axe -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_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="RK_Axe"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_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="RK_Axe"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- Cleaver -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_Cleaver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.656</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.43</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_Cleaver"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_Cleaver"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>0.35</MeleeParryChance>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_Cleaver"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- Two-Handed Sword -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_TwoHanded"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.6</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.65</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.6</cooldownTime>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>0.65</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.45</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>33</power>
-								<cooldownTime>1.43</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>2.106</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.53</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_TwoHanded"]/statBases</xpath>
-					<value>
-						<Bulk>7</Bulk>
-						<MeleeCounterParryBonus>1.13</MeleeCounterParryBonus>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_TwoHanded"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.77</MeleeCritChance>
-							<MeleeParryChance>0.85</MeleeParryChance>
-							<MeleeDodgeChance>0.37</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_TwoHanded"]/statBases/Mass</xpath>
-					<value>
-						<Mass>1.3</Mass>
-					</value>
-				</li>
-
-				<!-- Pitchfork -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_Fork"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.5</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>1.352</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2.11</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.512</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.3</cooldownTime>
-								<chanceFactor>1.00</chanceFactor>
-								<armorPenetrationBlunt>1.352</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.31</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_Fork"]/statBases</xpath>
-					<value>
-						<Bulk>7</Bulk>
-						<MeleeCounterParryBonus>2</MeleeCounterParryBonus>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_Fork"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.16</MeleeCritChance>
-						<MeleeParryChance>1.5</MeleeParryChance>
-						<MeleeDodgeChance>0.8</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<!-- Bill -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_Hockey"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.35</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.78</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>3</cooldownTime>
-								<armorPenetrationBlunt>1.44</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.48</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_Hockey"]/statBases</xpath>
-					<value>
-						<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
-						<Bulk>8</Bulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_Hockey"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.17</MeleeCritChance>
-							<MeleeParryChance>1.45</MeleeParryChance>
-							<MeleeDodgeChance>0.9</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Dagger -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_Dagger"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.18</cooldownTime>
-								<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.32</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.26</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.42</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_Dagger"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_Dagger"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.5</MeleeCritChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-							<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- One-handed Sword -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_OneHanded"]/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>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_OneHanded"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_OneHanded"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_OneHanded"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>0.35</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Two-handed Sword (Remove pointless duplicate.) -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RK_LongSword"]</xpath>
-				</li>
-
-				<!-- Magic Wand/Concussion Grenade -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_MagicWand"]/costList/Chemfuel</xpath>
-					<value>
-						<FSX>1</FSX>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_MagicWand"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Kaboom</li>
-								</capacities>
-								<power>5</power>
-								<armorPenetrationBlunt>5.625</armorPenetrationBlunt>
-								<cooldownTime>1.5</cooldownTime>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Light Lance -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_LightLance"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.67</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>1.224</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2.14</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.544</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.43</cooldownTime>
-								<chanceFactor>1.00</chanceFactor>
-								<armorPenetrationBlunt>1.224</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.84</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_LightLance"]/statBases</xpath>
-					<value>
-						<MeleeCounterParryBonus>1.88</MeleeCounterParryBonus>
-						<Bulk>7</Bulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_LightLance"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>1.41</MeleeParryChance>
-							<MeleeDodgeChance>0.8</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Heavy Lance -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_HeavyLance"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.83</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>1.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2.36</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.57</cooldownTime>
-								<chanceFactor>1.00</chanceFactor>
-								<armorPenetrationBlunt>1.8</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.2</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_HeavyLance"]/statBases/Mass</xpath>
-					<value>
-						<MeleeCounterParryBonus>1.28</MeleeCounterParryBonus>
-						<Bulk>7</Bulk>
-						<Mass>5</Mass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_HeavyLance"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>0.98</MeleeParryChance>
-							<MeleeDodgeChance>0.8</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_HeavyLance"]/stuffCategories/li[.="Metallic"]</xpath>
-					<value>
-						<li>Metallic_Weapon</li>
-					</value>
-				</li>
-
-				<!-- Gunlances (Normal & Spread) -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_Gunlance_NormalType" or defName="RK_Gunlance_SpreadType"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.9</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.65</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.6</cooldownTime>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.9</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>38</power>
-								<cooldownTime>2.1</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>4.106</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.90</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_Gunlance_NormalType" or defName="RK_Gunlance_SpreadType"]/statBases/Mass</xpath>
-					<value>
-						<MeleeCounterParryBonus>1.28</MeleeCounterParryBonus>
-						<Bulk>7</Bulk>
-						<Mass>8</Mass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_Gunlance_NormalType" or defName="RK_Gunlance_SpreadType"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>0.98</MeleeParryChance>
-							<MeleeDodgeChance>0.8</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_Gunlance_NormalType" or defName="RK_Gunlance_SpreadType"]/stuffCategories/li[.="Metallic"]</xpath>
-					<value>
-						<li>Metallic_Weapon</li>
-					</value>
-				</li>
-
-				<!-- ========== Patch StrawberryBeer ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_StrawberryBeer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2.22</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>neck</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>3.33</cooldownTime>
-								<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Neck</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_StrawberryBeer"]/statBases</xpath>
-					<value>
-						<MeleeCounterParryBonus>0.33</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_StrawberryBeer"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.1</MeleeCritChance>
-							<MeleeParryChance>0.33</MeleeParryChance>
-							<MeleeDodgeChance>0.07</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="RK_StrawberryBeer"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="RK_StrawberryBeer"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_StrawberryBeer"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_RangedWeapons.xml b/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_RangedWeapons.xml
deleted file mode 100644
index a77f96e861..0000000000
--- a/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_RangedWeapons.xml
+++ /dev/null
@@ -1,505 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>NewRatkinPlus</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Melee Tools - Rifles ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_Rifle" or defName="RK_SniperRifle" or defName="RK_FlechetteRifle" or defName="RK_FlechetteSniperRifle" or defName="RK_Rifle_line"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.09</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>1.82</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>bayonet</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.38</cooldownTime>
-								<armorPenetrationBlunt>1.08</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.72</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_Crossbow" or defName="RK_EnhanceCrossBow" or defName="RK_AutoCrossBow"]/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>
-				</li>
-
-				<!-- ========== Crossbow ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RK_Crossbow</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.5</ShotSpread>
-						<SwayFactor>1.2</SwayFactor>
-						<Bulk>7.5</Bulk>
-						<RangedWeapon_Cooldown>0.1</RangedWeapon_Cooldown>
-						<WorkToMake>2400</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_CrossbowBolt_Stone</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>20</range>
-						<soundCast>Bow_Small</soundCast>
-					</Properties>
-					<costList>
-						<WoodLog>40</WoodLog>
-						<Steel>20</Steel>
-					</costList>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>7</reloadTime>
-						<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags Inherit="False">
-						<li>RK_1TierRange</li>
-						<li>RK_Crossbow</li>
-						<li>RK_Weapon</li>
-						<li>RK_RangeWeapon</li>
-						<li>RK_Combatant</li>
-						<li>CE_Bow</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Enhanced Crossbow ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RK_EnhanceCrossBow</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.4</ShotSpread>
-						<SwayFactor>1.4</SwayFactor>
-						<Bulk>9.00</Bulk>
-						<RangedWeapon_Cooldown>0.1</RangedWeapon_Cooldown>
-						<WorkToMake>2600</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_CrossbowBolt_Stone</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>28</range>
-						<soundCast>Bow_Large</soundCast>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>9</reloadTime>
-						<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags Inherit="False">
-						<li>RK_1TierRange</li>
-						<li>RK_Crossbow</li>
-						<li>RK_Weapon</li>
-						<li>RK_RangeWeapon</li>
-						<li>RK_Combatant</li>
-						<li>CE_Bow</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Auto Crossbow ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RK_AutoCrossBow</defName>
-					<statBases>
-						<SightsEfficiency>0.9</SightsEfficiency>
-						<ShotSpread>0.5</ShotSpread>
-						<SwayFactor>1.2</SwayFactor>
-						<Bulk>6.5</Bulk>
-						<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
-						<WorkToMake>7500</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_CrossbowBolt_Stone</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>18</range>
-						<soundCast>Bow_Large</soundCast>
-					</Properties>
-					<AmmoUser>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<magazineSize>6</magazineSize>
-						<reloadTime>1.7</reloadTime>
-						<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags Inherit="False">
-						<li>RK_1TierRange</li>
-						<li>RK_Crossbow</li>
-						<li>RK_Weapon</li>
-						<li>RK_RangeWeapon</li>
-						<li>RK_Combatant</li>
-						<li>CE_Bow</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Rifle ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RK_Rifle</defName>
-					<statBases>
-						<Mass>3.30</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.30</SwayFactor>
-						<Bulk>9.66</Bulk>
-						<WorkToMake>12000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>30</WoodLog>
-						<Steel>55</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_65x50mmSRArisaka_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Rifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_65x50mmSRArisaka</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>RK_3TierWeapon</li>
-						<li>RK_2TierWeapon</li>
-						<li>RK_Rifle</li>
-						<li>RK_Weapon</li>
-						<li>RK_RangeWeapon</li>
-						<li>RK_Combatant</li>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Shotgun ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RK_Rifle_line</defName>
-					<statBases>
-						<Mass>3.30</Mass>
-						<RangedWeapon_Cooldown>1.00</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.22</SwayFactor>
-						<Bulk>9</Bulk>
-						<WorkToMake>9500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>45</Steel>
-						<WoodLog>10</WoodLog>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>FlechetteRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-					</FireModes>
-					<weaponTags>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Sniper Rifle ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RK_SniperRifle</defName>
-					<statBases>
-						<Mass>3.6</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.37</SwayFactor>
-						<Bulk>9.86</Bulk>
-						<WorkToMake>15000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>30</WoodLog>
-						<Steel>70</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_65x50mmSRArisaka_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>68</range>
-						<soundCast>Rifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_65x50mmSRArisaka</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>RK_3TierWeapon</li>
-						<li>RK_2TierWeapon</li>
-						<li>RK_Rifle</li>
-						<li>RK_Weapon</li>
-						<li>RK_RangeWeapon</li>
-						<li>RK_Combatant</li>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Remove Flechette Rifle & Sniper Rifle ========== -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RK_FlechetteRifle" or defName="RK_FlechetteSniperRifle"]</xpath>
-				</li>
-
-				<!-- ========== Prototype Pulse Rifle ========== -->
-				<li Class="PatchOperationRemove"><!-- Remove special fire modes; replaced with ammo types. -->
-					<xpath>Defs/ThingDef[defName="RK_PrototypePulseRifle"]/verbs</xpath>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RK_PrototypePulseRifle</defName>
-					<statBases>
-						<Mass>3.5</Mass>
-						<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.05</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.20</SwayFactor>
-						<Bulk>9.00</Bulk>
-						<WorkToMake>40000</WorkToMake>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.51</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>48</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>6</burstShotCount>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>4</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-					<researchPrerequisite>ChargedShot</researchPrerequisite>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_PrototypePulseRifle"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.09</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>1.82</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>3.86</cooldownTime>
-								<armorPenetrationBlunt>0.96</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.79</cooldownTime>
-								<armorPenetrationBlunt>1.82</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Anti-Materiel Rifle ========== -->
-				<li Class="PatchOperationRemove"><!-- Remove special fire modes; replaced with ammo types. -->
-					<xpath>Defs/ThingDef[defName="RK_BFR"]/verbs</xpath>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RK_BFR</defName>
-					<statBases>
-						<Mass>10.5</Mass>
-						<RangedWeapon_Cooldown>0.48</RangedWeapon_Cooldown>
-						<SightsEfficiency>3.5</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>2.10</SwayFactor>
-						<Bulk>16.8</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>85</range>
-						<burstShotCount>1</burstShotCount>
-						<soundCast>PrototypePulse</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>2.6</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_BFR"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.09</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>1.82</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>3.86</cooldownTime>
-								<armorPenetrationBlunt>0.96</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.79</cooldownTime>
-								<armorPenetrationBlunt>1.82</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_Rifle" or defName="RK_SniperRifle" or defName="RK_FlechetteRifle" or defName="RK_FlechetteSniperRifle" or defName="RK_Rifle_line"]/weaponTags</xpath>
-					<value>
-						<li>NoSwitch</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/NewRatkinPlus/ThingDefs_Races/Race_KingHamster.xml b/Patches/NewRatkinPlus/ThingDefs_Races/Race_KingHamster.xml
deleted file mode 100644
index 6cd3bfde64..0000000000
--- a/Patches/NewRatkinPlus/ThingDefs_Races/Race_KingHamster.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>NewRatkinPlus</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== RK_KingHamster ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RK_KingHamster"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_KingHamster"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4.5</MoveSpeed>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_KingHamster"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.19</MeleeDodgeChance>
-						<MeleeCritChance>0.14</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_KingHamster"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.87</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>2</chanceFactor>
-								<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>3</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/NewRatkinPlus/ThingDefs_Races/Race_Rakinlike.xml b/Patches/NewRatkinPlus/ThingDefs_Races/Race_Rakinlike.xml
deleted file mode 100644
index a4ef461e42..0000000000
--- a/Patches/NewRatkinPlus/ThingDefs_Races/Race_Rakinlike.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>NewRatkinPlus</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Ratkin" or defName="Ratkin_Su"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Ratkin" or defName="Ratkin_Su"]/statBases</xpath>
-					<value>
-						<MeleeCritChance>0.95</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Ratkin" or defName="Ratkin_Su"]/statBases/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>1.05</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Ratkin" or defName="Ratkin_Su"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.32</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.03</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.1</chanceFactor>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Adding Inventory Support-->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Ratkin" or defName="Ratkin_Su"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Ratkin" or defName="Ratkin_Su"]</xpath>
-						<value>
-							<comps>
-								<li>
-									<compClass>CombatExtended.CompPawnGizmo</compClass>
-								</li>
-								<li Class="CombatExtended.CompProperties_Suppressable" />
-							</comps>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationReplace">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Ratkin" or defName="Ratkin_Su"]/comps</xpath>
-						<value>
-							<comps>
-								<li>
-									<compClass>CombatExtended.CompPawnGizmo</compClass>
-								</li>
-								<li Class="CombatExtended.CompProperties_Suppressable" />
-							</comps>
-						</value>
-					</match>
-				</li>
-
-				<!-- Tweak weaponList -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Ratkin" or defName="Ratkin_Su"]/alienRace/raceRestriction/weaponList/li[.="RK_LongSword"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Ratkin" or defName="Ratkin_Su"]/alienRace/raceRestriction/weaponList/li[.="RK_FlechetteRifle"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Ratkin" or defName="Ratkin_Su"]/alienRace/raceRestriction/weaponList/li[.="RK_FlechetteSniperRifle"]</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/NewRatkinPlus/ThingDefs_Races/Race_Rotti.xml b/Patches/NewRatkinPlus/ThingDefs_Races/Race_Rotti.xml
deleted file mode 100644
index 8c9122dcb7..0000000000
--- a/Patches/NewRatkinPlus/ThingDefs_Races/Race_Rotti.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>NewRatkinPlus</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== Rotti ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Rotti"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Rotti"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>3.9</MoveSpeed>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Rotti"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						<MeleeCritChance>0</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Rotti"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>2.01</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>2.01</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>0.84</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>2</chanceFactor>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.144</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>3</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Nihal/PawnKinds_NiHal.xml b/Patches/Nihal/PawnKinds_NiHal.xml
deleted file mode 100644
index 82f997e863..0000000000
--- a/Patches/Nihal/PawnKinds_NiHal.xml
+++ /dev/null
@@ -1,387 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Ni'Hal 1.0</li>
-			<li>Ni'Hal 1.0/1.1</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Scoot ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="NihalPeasant"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.25</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="NihalPeasant"]/weaponMoney</xpath>
-					<value>
-						<weaponMoney>
-							<min>350</min>
-							<max>800</max>
-						</weaponMoney>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="NihalSlave"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="NihalRefugee"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="NihalMilitia"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.25</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="NihalTownCouncilman"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.25</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[defName="NihalTownCouncilman"]</xpath>
-					<value>
-						<weaponMoney>
-							<min>400</min>
-							<max>800</max>
-						</weaponMoney>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="NihalSniper"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="NihalSoldier"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="NihalSlasher"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="NihalGunner"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="NihalGrenadier"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="NiHalBoss"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Nihal/Scenarios.xml b/Patches/Nihal/Scenarios.xml
deleted file mode 100644
index 7ef0f3d3e9..0000000000
--- a/Patches/Nihal/Scenarios.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Ni'Hal 1.0</li>
-			<li>Ni'Hal 1.0/1.1</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="NihalScenario"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_RPG7Grenade_HEAT</thingDef>
-							<count>5</count>
-						</li>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_12x64mmCharged</thingDef>
-							<count>36</count>
-						</li>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_6x18mmCharged</thingDef>
-							<count>192</count>
-						</li>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_6x24mmCharged</thingDef>
-							<count>600</count>
-						</li>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_12GaugeCharged</thingDef>
-							<count>96</count>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Nihal/ThingDefs_Misc/Apparel_Hats.xml b/Patches/Nihal/ThingDefs_Misc/Apparel_Hats.xml
deleted file mode 100644
index 70fd67fbad..0000000000
--- a/Patches/Nihal/ThingDefs_Misc/Apparel_Hats.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Ni'Hal 1.0</li>
-			<li>Ni'Hal 1.0/1.1</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Ni'Hal 1.0 Power Helmet ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparel_NihalPowerArmorHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Apparel_NihalPowerArmorHelmet"]/equippedStatOffsets</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Apparel_NihalPowerArmorHelmet"]</xpath>
-						<value>
-							<equippedStatOffsets />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_NihalPowerArmorHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<AimingAccuracy>0.15</AimingAccuracy>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_NihalPowerArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.8</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_NihalPowerArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.2</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_NihalPowerArmorHelmet"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>45</Plasteel>
-						<DevilstrandCloth>20</DevilstrandCloth>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Nihal/ThingDefs_Misc/Apparel_Various.xml b/Patches/Nihal/ThingDefs_Misc/Apparel_Various.xml
deleted file mode 100644
index a641149f39..0000000000
--- a/Patches/Nihal/ThingDefs_Misc/Apparel_Various.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Ni'Hal 1.0</li>
-			<li>Ni'Hal 1.0/1.1</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== Ni'Hal 1.0 Power Armor ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparel_CatfishArmor"]/statBases</xpath>
-					<value>
-						<Bulk>90</Bulk>
-						<WornBulk>6</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_CatfishArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>90</CarryWeight>
-						<CarryBulk>15</CarryBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_CatfishArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>45</Mass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_CatfishArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_CatfishArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.6</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_CatfishArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Nihal/ThingDefs_Races/Drake.xml b/Patches/Nihal/ThingDefs_Races/Drake.xml
deleted file mode 100644
index 4a1c144232..0000000000
--- a/Patches/Nihal/ThingDefs_Races/Drake.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Ni'Hal 1.0</li>
-			<li>Ni'Hal 1.0/1.1</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== Make Drake Drakonic ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Drake"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Serpentine</bodyShape>
-						</li>
-					</value>
-				</li>
-				<!-- ========== Give em that thicc dragon skin ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Drake"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.85</MeleeCritChance>
-						<MeleeParryChance>0.45</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Drake"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Drake"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- ========== Patch Drake Melee Attacks ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Drake"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetration>0.350</armorPenetration>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetration>0.350</armorPenetration>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetration>0.375</armorPenetration>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetration>0.048</armorPenetration>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>tail spear</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>TailAttackToolStab</linkedBodyPartsGroup>
-								<armorPenetration>0.5</armorPenetration>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== yeah i think i made them a bit op ========== -->
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Nihal/ThingDefs_Races/Nihal_Race.xml b/Patches/Nihal/ThingDefs_Races/Nihal_Race.xml
deleted file mode 100644
index 845169d142..0000000000
--- a/Patches/Nihal/ThingDefs_Races/Nihal_Race.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Ni'Hal 1.0</li>
-			<li>Ni'Hal 1.0/1.1</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== Got one ========== -->
-
-				<!-- ========== Turn our Fish boys into Fish *boys* ========== -->
-				<!-- ========== To be human is to be a tall brick ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<!-- === Note to future furball compatibility nerds: 		=== -->
-					<!-- === Paste the defName of your horrible alien there   |	=== -->
-					<!-- === 												  V	=== -->
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_NiHal"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Gives Gun Gizmos to Nihal HUD thing ========== -->
-				<!-- ========== Also Makes Em Suppressable		   ========== -->
-
-				<!-- Checking if "Alien_Nihal" has a <comps> node and adding it if it doesn't exist -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_NiHal"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_NiHal"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_NiHal"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-				<!-- === Patch Nihal default melee attacks === -->
-				<!-- === For the most part, it adds the CE melee handler thing 	=== -->
-				<!-- === And also defines armor penetration, which allows them	=== -->
-				<!-- === to actually do damage. 								=== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_NiHal"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1</AimingAccuracy>
-						<MeleeDodgeChance>1.5</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<ReloadSpeed>1</ReloadSpeed>
-						<Suppressability>1</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_NiHal"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetration>0.15</armorPenetration>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetration>0.15</armorPenetration>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetration>0.10</armorPenetration>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetration>0.10</armorPenetration>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.7</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetration>0.16</armorPenetration>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Claws! Teeth! Blub!		   === -->
-				<!-- ===================================== -->
-				<!-- === BaseBodySize, ArmorRatings, MoveSpeed, and BaseHealth should already be set. I think. === -->
-				<!-- ===================================== -->
-				<!-- === Adds In Inspector Tabs 	   === -->
-				<!-- === Inventory and all that jazz   === -->
-				<!-- === Again, no need to change 'em  === -->
-				<!-- === Unless you changed it         === -->
-				<!-- === then change 'em			   === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="BaseNiHal"]/inspectorTabs/li[.="ITab_Pawn_Gear"]</xpath>
-					<value>
-						<li>CombatExtended.ITab_Inventory</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="BaseNiHal"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Inventory" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-	<!-- === Congratulations! Your alien is Combat Ready!	 === -->
-	<!-- === If your alien comes with extra guns and gear,	 === -->
-	<!-- === Congratulations! You're not even close to done! === -->
-</Patch>
\ No newline at end of file
diff --git a/Patches/Nihal/ThingDefs_Weapons/Weapons.xml b/Patches/Nihal/ThingDefs_Weapons/Weapons.xml
deleted file mode 100644
index a5e4104111..0000000000
--- a/Patches/Nihal/ThingDefs_Weapons/Weapons.xml
+++ /dev/null
@@ -1,544 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Ni'Hal 1.0</li>
-			<li>Ni'Hal 1.0/1.1</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Melee Tools -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_NihalPistol"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_NihalShotgun" or defName="Gun_NihalRifle" or defName="Gun_NihalLMG" or defName="Gun_NihalSniper" or defName="Gun_NihalThoober" or defName="Gun_NihalCarbine"]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_NihalRocket" or defName="Gun_NihalTripleRocket"]/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>
-				</li>
-
-				<!-- NiHal Bardiche -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_fishytooth"]/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="MeleeWeapon_fishytooth"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_fishytooth"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.10</MeleeCritChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-							<MeleeDodgeChance>0.20</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Nihal Rocket Launcher -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_NihalRocket</defName>
-					<statBases>
-						<Bulk>3.1</Bulk>
-						<Mass>1.0</Mass>
-						<SwayFactor>1.1</SwayFactor>
-						<ShotSpread>1</ShotSpread>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
-						<WorkToMake>32000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_RPG7Grenade_HEAT</defaultProjectile>
-						<warmupTime>3</warmupTime>
-						<range>38</range>
-						<burstShotCount>1</burstShotCount>
-						<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
-						<minRange>5</minRange>
-						<soundCast>OLaunchers</soundCast>
-						<muzzleFlashScale>14</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>8</reloadTime>
-						<ammoSet>AmmoSet_RPG7Grenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-					</FireModes>
-					<weaponTags>
-						<li>NiHalMissile</li>
-					</weaponTags>
-				</li>
-
-				<!-- Nihal Triple Rocket Launcher -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_NihalTripleRocket</defName>
-					<statBases>
-						<Bulk>3.1</Bulk>
-						<Mass>1.0</Mass>
-						<SwayFactor>1.5</SwayFactor>
-						<ShotSpread>1</ShotSpread>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
-						<WorkToMake>32000</WorkToMake>
-					</statBases>
-					<Properties>
-						<recoilAmount>20</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_RPG7Grenade_HEAT</defaultProjectile>
-						<warmupTime>3</warmupTime>
-						<range>38</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
-						<minRange>5</minRange>
-						<soundCast>OLaunchers</soundCast>
-						<muzzleFlashScale>14</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>3</magazineSize>
-						<reloadTime>8</reloadTime>
-						<ammoSet>AmmoSet_RPG7Grenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-					</FireModes>
-					<weaponTags>
-						<li>NiHalMissile</li>
-					</weaponTags>
-				</li>
-
-				<!-- Nihal Big Pistol -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_NihalPistol</defName>
-					<statBases>
-						<Mass>3.3</Mass>
-						<RangedWeapon_Cooldown>1.9</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.75</SightsEfficiency>
-						<ShotSpread>0.38</ShotSpread>
-						<SwayFactor>1.3</SwayFactor>
-						<Bulk>4</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>10</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12x64mmCharged</defaultProjectile>
-						<warmupTime>0.40</warmupTime>
-						<range>18</range>
-						<soundCast>OTFalcon</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_12x64mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>NiHalPistol</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- Nihal Shotgun -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_NihalShotgun</defName>
-					<statBases>
-						<Mass>3</Mass>
-						<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.1</SwayFactor>
-						<Bulk>7</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.1</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12GaugeCharged</defaultProjectile>
-						<warmupTime>0.3</warmupTime>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<range>27</range>
-						<soundCast>OShotgun</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>2</reloadTime>
-						<ammoSet>AmmoSet_12GaugeCharged</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>AdvancedGun</li>
-						<li>NiHalRifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- Nihal Rifle -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_NihalRifle</defName>
-					<statBases>
-						<Mass>2.7</Mass>
-						<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.20</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.15</SwayFactor>
-						<Bulk>8.00</Bulk>
-						<WorkToMake>62000</WorkToMake>
-					</statBases>
-					<costList>
-						<Uranium>5</Uranium>
-						<Steel>100</Steel>
-						<Plasteel>100</Plasteel>
-						<ComponentSpacer>1</ComponentSpacer>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>58</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>3</burstShotCount>
-						<soundCast>ORifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>24</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>NiHalRifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- Nihal LMG -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_NihalLMG</defName>
-					<statBases>
-						<Mass>3.2</Mass>
-						<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.25</SightsEfficiency>
-						<ShotSpread>0.1</ShotSpread>
-						<SwayFactor>1.17</SwayFactor>
-						<Bulk>8.00</Bulk>
-						<WorkToMake>62000</WorkToMake>
-					</statBases>
-					<costList>
-						<Uranium>5</Uranium>
-						<Steel>100</Steel>
-						<Plasteel>100</Plasteel>
-						<ComponentSpacer>1</ComponentSpacer>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>3</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
-						<warmupTime>2.1</warmupTime>
-						<range>58</range>
-						<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
-						<burstShotCount>50</burstShotCount>
-						<soundCast>OLMG</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>150</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>25</aimedBurstShotCount>
-						<aiUseBurstMode>false</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- Nihal Sniper -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_NihalSniper</defName>
-					<statBases>
-						<Mass>3.0</Mass>
-						<RangedWeapon_Cooldown>0.32</RangedWeapon_Cooldown>
-						<SightsEfficiency>3</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.7</SwayFactor>
-						<Bulk>12</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.60</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>55</range>
-						<soundCast>OSniper</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>2</reloadTime>
-						<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>NiHalSniper</li>
-					</weaponTags>
-				</li>
-
-				<!-- NiHal Thoober -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_NihalThoober</defName>
-					<statBases>
-						<WorkToMake>14000</WorkToMake>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.00</SwayFactor>
-						<Bulk>7.31</Bulk>
-						<Mass>2.70</Mass>
-						<RangedWeapon_Cooldown>0.93</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Plasteel>20</Plasteel>
-						<Uranium>5</Uranium>
-						<Steel>40</Steel>
-						<ComponentSpacer>1</ComponentSpacer>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<warmupTime>1.1</warmupTime>
-						<range>44</range>
-						<minRange>5</minRange>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>NiHalRifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- NiHal Carbine -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_NihalCarbine</defName>
-					<statBases>
-						<Mass>2.7</Mass>
-						<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.05</SwayFactor>
-						<Bulk>5.50</Bulk>
-						<WorkToMake>42000</WorkToMake>
-					</statBases>
-					<costList>
-						<Uranium>5</Uranium>
-						<Steel>80</Steel>
-						<Plasteel>80</Plasteel>
-						<ComponentSpacer>1</ComponentSpacer>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>46</range>
-						<soundCast>ORifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>NiHalRifle</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Gun_NihalCarbine"]/tools</xpath>
-					<value>
-						<li Class="CombatExtended.ToolCE">
-							<label>bayonet</label>
-							<capacities>
-								<li>Stab</li>
-							</capacities>
-							<power>17</power>
-							<cooldownTime>1.38</cooldownTime>
-							<armorPenetrationBlunt>1.08</armorPenetrationBlunt>
-							<armorPenetrationSharp>0.72</armorPenetrationSharp>
-							<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Not Only Just A Cannon/Patch_Cannon_Ammo.xml b/Patches/Not Only Just A Cannon/Patch_Cannon_Ammo.xml
deleted file mode 100644
index f1499f13c3..0000000000
--- a/Patches/Not Only Just A Cannon/Patch_Cannon_Ammo.xml	
+++ /dev/null
@@ -1,882 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Not Only just a cannon</li>
-			<li>Not Only just a cannon (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingCategoryDef>
-							<defName>Ammo164mmCannonShells</defName>
-							<label>32-pounder Cannon Shells</label>
-							<parent>AmmoShells</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberCannon</iconPath>
-						</ThingCategoryDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_164mmCannonBall</defName>
-							<label>164mm 32-pounder Cannonball</label>
-							<ammoTypes>
-								<Ammo_164mmCannonShell_HE>Bullet_164mmCannonShell_HE</Ammo_164mmCannonShell_HE>
-								<Ammo_164mmCannonShell_AP>Bullet_164mmCannonShell_AP</Ammo_164mmCannonShell_AP>
-								<Ammo_164mmCannonShell_FI>Bullet_164mmCannonShell_FI</Ammo_164mmCannonShell_FI>
-							</ammoTypes>
-							<isMortarAmmoSet>true</isMortarAmmoSet>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="164mmCannonShellBase" ParentName="HeavyAmmoBase" Abstract="True">
-							<description>A round shell designed to be fired from a cannon.</description>
-							<thingCategories>
-								<li>Ammo164mmCannonShells</li>
-								<li>CannonShells</li>
-							</thingCategories>
-							<stackLimit>25</stackLimit>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_TableMachining</li>
-								<li>MortarShell</li>
-							</tradeTags>
-							<statBases>
-								<MaxHitPoints>100</MaxHitPoints>
-								<Mass>19</Mass>
-								<Bulk>21.41</Bulk>
-							</statBases>
-							<cookOffFlashScale>30</cookOffFlashScale>
-							<cookOffSound>MortarBomb_Explode</cookOffSound>
-							<isMortarAmmo>true</isMortarAmmo>
-						</ThingDef>
-
-						<ThingDef Name="Base164mmCannonShell" ParentName="BaseExplosiveBullet" Abstract="true">
-							<graphicData>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>100</speed>
-								<soundExplode>MortarBomb_Explode</soundExplode>
-								<flyOverhead>false</flyOverhead>
-								<dropsCasings>false</dropsCasings>
-								<casingMoteDefname>Fleck_BigShell</casingMoteDefname>
-								<casingFilthDefname>Filth_CannonAmmoCasings</casingFilthDefname>
-							</projectile>
-						</ThingDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase" Name="CannonRoundRecipeBase" Abstract="true">
-							<recipeUsers>
-								<li>FueledSmithy</li>
-								<li>ElectricSmithy</li>
-							</recipeUsers>
-						</RecipeDef>
-
-						<!-- HE -->
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="164mmCannonShellBase">
-							<defName>Ammo_164mmCannonShell_HE</defName>
-							<label>32-pounder cannon explosive round</label>
-							<graphicData>
-								<texPath>Things/Item/CannonBall_Explosive</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>100.83</MarketValue>
-							</statBases>
-							<ammoClass>GrenadeHE</ammoClass>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>185</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>2.3</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Large>10</Fragment_Large>
-										<Fragment_Small>50</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="Base164mmCannonShell">
-							<defName>Bullet_164mmCannonShell_HE</defName>
-							<label>32-pounder cannon shell (HE)</label>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<graphicData>
-								<texPath>Things/Projectile/Projectile_Explosive</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>152</damageAmountBase>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0</armorPenetrationBlunt>
-								<explosionRadius>2.3</explosionRadius>
-								<soundExplode>MortarBomb_Explode</soundExplode>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Large>10</Fragment_Large>
-										<Fragment_Small>50</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<RecipeDef ParentName="CannonRoundRecipeBase">
-							<defName>MakeAmmo_164mmCannonShell_HE</defName>
-							<label>make 32-pounder shells x5</label>
-							<description>Craft 5 32-pounder cannon shells.</description>
-							<jobString>Making 32-pounder cannon shells.</jobString>
-							<workAmount>1200</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>80</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>FSX</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_164mmCannonShell_HE>5</Ammo_164mmCannonShell_HE>
-							</products>
-						</RecipeDef>
-
-						<!-- HEAT -->
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="164mmCannonShellBase">
-							<defName>Ammo_164mmCannonShell_AP</defName>
-							<label>32-pounder cannon solid round</label>
-							<graphicData>
-								<texPath>Things/Item/CannonBall_Solid</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>1.83</MarketValue>
-							</statBases>
-							<ammoClass>RocketHEAT</ammoClass>
-							<!--<detonateProjectile>Bullet_164mmCannonShell_AP</detonateProjectile>-->
-						</ThingDef>
-
-						<ThingDef ParentName="Base164mmCannonShell">
-							<defName>Bullet_164mmCannonShell_AP</defName>
-							<label>32-pounder cannon solid round</label>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<graphicData>
-								<texPath>Things/Projectile/Projectile_Solid</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>152</damageAmountBase>
-								<armorPenetrationSharp>100</armorPenetrationSharp>
-								<armorPenetrationBlunt>100</armorPenetrationBlunt>
-								<soundExplode>MortarBomb_Explode</soundExplode>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>100</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>1.5</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<!--<Fragment_Large>30</Fragment_Large>-->
-										<Fragment_Small>20</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<RecipeDef ParentName="CannonRoundRecipeBase">
-							<defName>MakeAmmo_164mmCannonShell_AP</defName>
-							<label>make 32-pounder shells x5</label>
-							<description>Craft 5 32-pounder cannon shells.</description>
-							<jobString>Making 32-pounder cannon shells.</jobString>
-							<workAmount>1200</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>100</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_164mmCannonShell_AP>5</Ammo_164mmCannonShell_AP>
-							</products>
-						</RecipeDef>
-
-						<!-- INCENDIARY -->
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="164mmCannonShellBase">
-							<defName>Ammo_164mmCannonShell_FI</defName>
-							<label>32-pounder cannon incendiary round (Incendiary)</label>
-							<graphicData>
-								<texPath>Things/Item/CannonBall_Incendiary</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>1.83</MarketValue>
-							</statBases>
-							<ammoClass>GrenadeIncendiary</ammoClass>
-							<detonateProjectile>Bullet_164mmCannonShell_FI</detonateProjectile>
-							<comps>
-								<li Class="CompProperties_Explosive">
-									<explosiveRadius>2</explosiveRadius>
-									<explosiveDamageType>Flame</explosiveDamageType>
-									<startWickHitPointsPercent>0.7</startWickHitPointsPercent>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-									<explodeOnKilled>True</explodeOnKilled>
-									<wickTicks>30~60</wickTicks>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="Base164mmCannonShell">
-							<defName>Bullet_164mmCannonShell_FI</defName>
-							<label>32-pounder incendiary shell</label>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<graphicData>
-								<texPath>Things/Projectile/Projectile_Incendiary</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>PrometheumFlame</damageDef>
-								<damageAmountBase>35</damageAmountBase>
-								<explosionRadius>2.8</explosionRadius>
-								<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
-								<preExplosionSpawnChance>0.5</preExplosionSpawnChance>
-								<soundExplode>MortarBomb_Explode</soundExplode>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Large>1</Fragment_Large>
-										<Fragment_Small>10</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<RecipeDef ParentName="CannonRoundRecipeBase">
-							<defName>MakeAmmo_164mmCannonShell_FI</defName>
-							<label>make 32-pounder shells x5</label>
-							<description>Craft 5 32-pounder cannon shells.</description>
-							<jobString>Making 32-pounder cannon shells.</jobString>
-							<workAmount>1200</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Prometheum</li>
-										</thingDefs>
-									</filter>
-									<count>80</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Prometheum</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_164mmCannonShell_FI>5</Ammo_164mmCannonShell_FI>
-							</products>
-						</RecipeDef>
-
-						<ThingCategoryDef>
-							<defName>Ammo164mmCannonShellsChamber</defName>
-							<label>18-pounder Chambered Cannon Shells</label>
-							<parent>AmmoShells</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberCannon</iconPath>
-						</ThingCategoryDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_164mmCannonBallChamber</defName>
-							<label>18-pounder Chambered Cannonball</label>
-							<ammoTypes>
-								<Ammo_164mmCannonShell_HEChamber>Bullet_164mmCannonShell_HE</Ammo_164mmCannonShell_HEChamber>
-								<Ammo_164mmCannonShell_APChamber>Bullet_164mmCannonShell_AP</Ammo_164mmCannonShell_APChamber>
-								<Ammo_164mmCannonShell_FIChamber>Bullet_164mmCannonShell_FI</Ammo_164mmCannonShell_FIChamber>
-							</ammoTypes>
-							<isMortarAmmoSet>true</isMortarAmmoSet>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="164mmCannonShellBaseChamber" ParentName="HeavyAmmoBase" Abstract="True">
-							<description>A metal projectile and powder charge loaded in a mug-shaped chamber to be loaded into a cannon.</description>
-							<thingCategories>
-								<li>Ammo164mmCannonShellsChamber</li>
-							</thingCategories>
-							<stackLimit>25</stackLimit>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_TableMachining</li>
-							</tradeTags>
-							<statBases>
-								<MaxHitPoints>100</MaxHitPoints>
-								<Mass>19</Mass>
-								<Bulk>22.41</Bulk>
-							</statBases>
-							<cookOffFlashScale>30</cookOffFlashScale>
-							<cookOffSound>MortarBomb_Explode</cookOffSound>
-							<isMortarAmmo>true</isMortarAmmo>
-						</ThingDef>
-
-						<!-- HE -->
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="164mmCannonShellBaseChamber">
-							<defName>Ammo_164mmCannonShell_HEChamber</defName>
-							<label>18-pounder cannon chamber explosive round</label>
-							<graphicData>
-								<texPath>Things/Item/Chamber_Explosive</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>1.83</MarketValue>
-							</statBases>
-							<ammoClass>GrenadeHE</ammoClass>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>185</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>2.3</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Large>10</Fragment_Large>
-										<Fragment_Small>50</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<RecipeDef ParentName="CannonRoundRecipeBase">
-							<defName>MakeAmmo_164mmCannonShell_HEChamber</defName>
-							<label>make 18-pounder chamber shells x5</label>
-							<description>Craft 5 18-pounder chamber cannon shells.</description>
-							<jobString>Making 18-pounder chamber cannon shells.</jobString>
-							<workAmount>1200</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>105</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>FSX</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_164mmCannonShell_HEChamber>5</Ammo_164mmCannonShell_HEChamber>
-							</products>
-						</RecipeDef>
-
-						<!-- HEAT -->
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="164mmCannonShellBaseChamber">
-							<defName>Ammo_164mmCannonShell_APChamber</defName>
-							<label>18-pounder cannon chamber solid round</label>
-							<graphicData>
-								<texPath>Things/Item/Chamber_Solid</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>1.83</MarketValue>
-							</statBases>
-							<ammoClass>RocketHEAT</ammoClass>
-						</ThingDef>
-
-						<RecipeDef ParentName="CannonRoundRecipeBase">
-							<defName>MakeAmmo_164mmCannonShell_APChamber</defName>
-							<label>make 18-pounder chamber shells x5</label>
-							<description>Craft 5 18-pounder chamber cannon shells.</description>
-							<jobString>Making 18-pounder chamber cannon shells.</jobString>
-							<workAmount>1200</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>130</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_164mmCannonShell_APChamber>5</Ammo_164mmCannonShell_APChamber>
-							</products>
-						</RecipeDef>
-
-						<!-- INCENDIARY -->
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="164mmCannonShellBaseChamber">
-							<defName>Ammo_164mmCannonShell_FIChamber</defName>
-							<label>18-pounder cannon chamber incendiary round</label>
-							<graphicData>
-								<texPath>Things/Item/Chamber_Incendiary</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>1.83</MarketValue>
-							</statBases>
-							<ammoClass>GrenadeIncendiary</ammoClass>
-							<detonateProjectile>Bullet_164mmCannonShell_FI</detonateProjectile>
-							<comps>
-								<li Class="CompProperties_Explosive">
-									<explosiveRadius>2</explosiveRadius>
-									<explosiveDamageType>Flame</explosiveDamageType>
-									<startWickHitPointsPercent>0.7</startWickHitPointsPercent>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-									<explodeOnKilled>True</explodeOnKilled>
-									<wickTicks>30~60</wickTicks>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<RecipeDef ParentName="CannonRoundRecipeBase">
-							<defName>MakeAmmo_164mmCannonShell_FIChamber</defName>
-							<label>make 18-pounder chamber shells x5</label>
-							<description>Craft 5 18-pounder chamber cannon shells.</description>
-							<jobString>Making 18-pounder chamber cannon shells.</jobString>
-							<workAmount>1200</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>30</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Prometheum</li>
-										</thingDefs>
-									</filter>
-									<count>80</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Prometheum</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_164mmCannonShell_FIChamber>5</Ammo_164mmCannonShell_FIChamber>
-							</products>
-						</RecipeDef>
-
-						<ThingDef ParentName="Base164mmCannonShell">
-							<defName>Bullet_164mmCannonShell_HE_Mortar</defName>
-							<label>24-pounder cannon shell (HE)</label>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<graphicData>
-								<texPath>Things/Projectile/Projectile_Explosive</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>152</damageAmountBase>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0</armorPenetrationBlunt>
-								<explosionRadius>2.3</explosionRadius>
-								<soundExplode>MortarBomb_Explode</soundExplode>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<flyOverhead>true</flyOverhead>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Large>10</Fragment_Large>
-										<Fragment_Small>50</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="Base164mmCannonShell">
-							<defName>Bullet_164mmCannonShell_AP_Mortar</defName>
-							<label>24-pounder cannon solid round</label>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<graphicData>
-								<texPath>Things/Projectile/Projectile_Solid</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>152</damageAmountBase>
-								<armorPenetrationSharp>100</armorPenetrationSharp>
-								<armorPenetrationBlunt>100</armorPenetrationBlunt>
-								<soundExplode>MortarBomb_Explode</soundExplode>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<flyOverhead>true</flyOverhead>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>100</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>1.5</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<!--<Fragment_Large>30</Fragment_Large>-->
-										<Fragment_Small>20</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="Base164mmCannonShell">
-							<defName>Bullet_164mmCannonShell_FI_Mortar</defName>
-							<label>24-pounder incendiary shell</label>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<graphicData>
-								<texPath>Things/Projectile/Projectile_Incendiary</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>PrometheumFlame</damageDef>
-								<damageAmountBase>35</damageAmountBase>
-								<explosionRadius>2.8</explosionRadius>
-								<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
-								<preExplosionSpawnChance>0.5</preExplosionSpawnChance>
-								<soundExplode>MortarBomb_Explode</soundExplode>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<flyOverhead>true</flyOverhead>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Large>1</Fragment_Large>
-										<Fragment_Small>10</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="164mmCannonShellBase">
-							<defName>Ammo_164mmCannonShell_GunStoneSmall</defName>
-							<label>24-pounder cannon small gunstone</label>
-							<graphicData>
-								<texPath>Things/Item/SGunstone</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>1.83</MarketValue>
-							</statBases>
-							<ammoClass>CannonBall</ammoClass>
-						</ThingDef>
-
-						<ThingDef ParentName="Base164mmCannonShell">
-							<defName>Bullet_164mmCannonShell_GunStoneSmall</defName>
-							<label>24-pounder cannon small gunstone</label>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<graphicData>
-								<texPath>Things/Projectile/Projectile_SGunstone</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>80</damageAmountBase>
-								<armorPenetrationSharp>50</armorPenetrationSharp>
-								<armorPenetrationBlunt>50</armorPenetrationBlunt>
-								<soundExplode>MortarBomb_Explode</soundExplode>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<flyOverhead>true</flyOverhead>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>50</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>0.5</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<!--<Fragment_Large>30</Fragment_Large>-->
-										<Fragment_Small>10</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="164mmCannonShellBase">
-							<defName>Ammo_164mmCannonShell_GunStone</defName>
-							<label>24-pounder cannon gunstone</label>
-							<graphicData>
-								<texPath>Things/Item/Gunstone</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>1.83</MarketValue>
-							</statBases>
-							<ammoClass>CannonBall</ammoClass>
-						</ThingDef>
-
-						<ThingDef ParentName="Base164mmCannonShell">
-							<defName>Bullet_164mmCannonShell_GunStone</defName>
-							<label>24-pounder cannon gunstone</label>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<graphicData>
-								<texPath>Things/Projectile/Projectile_Gunstone</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>180</damageAmountBase>
-								<armorPenetrationSharp>100</armorPenetrationSharp>
-								<armorPenetrationBlunt>100</armorPenetrationBlunt>
-								<soundExplode>MortarBomb_Explode</soundExplode>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<flyOverhead>true</flyOverhead>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>70</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>1.5</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<!--<Fragment_Large>30</Fragment_Large>-->
-										<Fragment_Small>10</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_164mmCannonBall_Mortar</defName>
-							<label>24-pounder Cannonball</label>
-							<ammoTypes>
-								<Ammo_164mmCannonShell_HE>Bullet_164mmCannonShell_HE_Mortar</Ammo_164mmCannonShell_HE>
-								<Ammo_164mmCannonShell_AP>Bullet_164mmCannonShell_AP_Mortar</Ammo_164mmCannonShell_AP>
-								<Ammo_164mmCannonShell_FI>Bullet_164mmCannonShell_FI_Mortar</Ammo_164mmCannonShell_FI>
-								<Ammo_164mmCannonShell_GunStoneSmall>Bullet_164mmCannonShell_GunStoneSmall</Ammo_164mmCannonShell_GunStoneSmall>
-								<Ammo_164mmCannonShell_GunStone>Bullet_164mmCannonShell_GunStone</Ammo_164mmCannonShell_GunStone>
-							</ammoTypes>
-							<isMortarAmmoSet>true</isMortarAmmoSet>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_164mmCannonBall_MortarSmall</defName>
-							<label>24-pounder Cannonball</label>
-							<ammoTypes>
-								<Ammo_164mmCannonShell_HE>Bullet_164mmCannonShell_HE_Mortar</Ammo_164mmCannonShell_HE>
-								<Ammo_164mmCannonShell_AP>Bullet_164mmCannonShell_AP_Mortar</Ammo_164mmCannonShell_AP>
-								<Ammo_164mmCannonShell_FI>Bullet_164mmCannonShell_FI_Mortar</Ammo_164mmCannonShell_FI>
-								<Ammo_164mmCannonShell_GunStoneSmall>Bullet_164mmCannonShell_GunStoneSmall</Ammo_164mmCannonShell_GunStoneSmall>
-							</ammoTypes>
-							<isMortarAmmoSet>true</isMortarAmmoSet>
-						</CombatExtended.AmmoSetDef>
-
-						<RecipeDef ParentName="MakeStoneBlocksBase">
-							<defName>MakeAmmo_164mmCannonShell_GunStoneSmall</defName>
-							<label>cut stone chunks into small gunstones</label>
-							<description>Cuts stone chunks down to size to be fired by a cannon.</description>
-							<ingredients>
-								<li>
-									<filter>
-										<categories>
-											<li>StoneChunks</li>
-										</categories>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<categories>
-									<li>StoneChunks</li>
-								</categories>
-							</fixedIngredientFilter>
-							<recipeUsers Inherit="False">
-								<li>TableStonecutter</li>
-							</recipeUsers>
-							<products>
-								<Ammo_164mmCannonShell_GunStoneSmall>2</Ammo_164mmCannonShell_GunStoneSmall>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="MakeStoneBlocksBase">
-							<defName>MakeAmmo_164mmCannonShell_GunStone</defName>
-							<label>cut stone chunks into a gunstones</label>
-							<description>Cuts stone chunks down to size to be fired by a cannon.</description>
-							<ingredients>
-								<li>
-									<filter>
-										<categories>
-											<li>StoneChunks</li>
-										</categories>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<categories>
-									<li>StoneChunks</li>
-								</categories>
-							</fixedIngredientFilter>
-							<recipeUsers Inherit="False">
-								<li>TableStonecutter</li>
-							</recipeUsers>
-							<products>
-								<Ammo_164mmCannonShell_GunStone>1</Ammo_164mmCannonShell_GunStone>
-							</products>
-						</RecipeDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Dragonator</defName>
-							<label>Dragonator Spike</label>
-							<ammoTypes>
-								<Ammo_DragonatorSpike>Bullet_DragonatorSpike</Ammo_DragonatorSpike>
-							</ammoTypes>
-							<isMortarAmmoSet>true</isMortarAmmoSet>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>DragonatorSpike</defName>
-							<label>Dragonator Spike</label>
-							<description>A steel spike attached to a long and fletched spiked pole, packing a very strong punch against even the most armored targets.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="164mmCannonShellBase">
-							<defName>Ammo_DragonatorSpike</defName>
-							<label>Dragonator Spike</label>
-							<graphicData>
-								<texPath>Things/Item/Dragonator</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<drawSize>(2)</drawSize>
-							</graphicData>
-							<stackLimit>3</stackLimit>
-							<statBases>
-								<MarketValue>20</MarketValue>
-							</statBases>
-							<ammoClass>DragonatorSpike</ammoClass>
-						</ThingDef>
-
-						<ThingDef ParentName="Base164mmCannonShell">
-							<defName>Bullet_DragonatorSpike</defName>
-							<label>Dragonator Spike</label>
-							<thingClass>CombatExtended.BulletCE</thingClass>
-							<graphicData>
-								<texPath>Things/Projectile/Dragonator</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>2,4</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>450</damageAmountBase>
-								<armorPenetrationSharp>50</armorPenetrationSharp>
-								<armorPenetrationBlunt>400</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<RecipeDef ParentName="MakeStoneBlocksBase">
-							<defName>MakeAmmo_DragonatorSpike</defName>
-							<label>forge dragonator spike</label>
-							<description>Forges steel into dragonator spikes</description>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>150</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_DragonatorSpike>1</Ammo_DragonatorSpike>
-							</products>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="CannonBall_Solidshot" or
-						defName="CannonBall_Explosiveshot" or
-						defName="CannonBall_Incendiary" or
-						defName="Chamber_Solidshot" or
-						defName="Chamber_Explosiveshot" or
-						defName="Chamber_Incendiary" or
-						defName="MortarShell_Solidshot" or
-						defName="MortarShell_Explosiveshot" or
-						defName="MortarShell_Incendiary" or
-						defName="GunStone" or
-						defName="SGunStone"
-						]</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Not Only Just A Cannon/Patch_Cannon_Turret.xml b/Patches/Not Only Just A Cannon/Patch_Cannon_Turret.xml
deleted file mode 100644
index 493a4b005b..0000000000
--- a/Patches/Not Only Just A Cannon/Patch_Cannon_Turret.xml	
+++ /dev/null
@@ -1,859 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Not Only just a cannon</li>
-			<li>Not Only just a cannon (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Mortars won't place if they have show radius -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="BaseCannonBuilding"]/placeWorkers</xpath>
-					<value>
-						<placeWorkers>
-							<li>PlaceWorker_PreventInteractionSpotOverlap</li>
-							<li>PlaceWorker_TurretTop</li>
-						</placeWorkers>
-					</value>
-				</li>
-
-				<!--   CANNON   -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Weapon_Cannon</defName>
-
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.3</ShotSpread>
-						<SwayFactor>1.34</SwayFactor>
-						<RangedWeapon_Cooldown>3.2</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<recoilAmount>1.52</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_164mmCannonShell_HE</defaultProjectile>
-						<burstShotCount />
-						<warmupTime>5</warmupTime>
-						<requireLineOfSight>true</requireLineOfSight>
-						<range>86</range>
-						<soundCast>MortarBomb_Explode</soundCast>
-						<muzzleFlashScale>32</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>15</reloadTime>
-						<ammoSet>AmmoSet_164mmCannonBall</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Turret_Cannon"]</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Turret_Cannon"]</xpath>
-					<value>
-						<specialDisplayRadius>86</specialDisplayRadius>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Weapon_Cannon"]/comps/li[@Class="CompProperties_ChangeableProjectile"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Weapon_Cannon"]/building</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Turret_Cannon"]</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_Cannon"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>1</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Turret_Cannon"]/statBases</xpath>
-					<value>
-						<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<!--   SWIVEL GUN   -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Weapon_SwivelGun</defName>
-
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.3</ShotSpread>
-						<SwayFactor>1.34</SwayFactor>
-						<RangedWeapon_Cooldown>2.71</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<recoilAmount>1.52</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_164mmCannonShell_HE</defaultProjectile>
-						<burstShotCount />
-						<warmupTime>4.5</warmupTime>
-						<requireLineOfSight>true</requireLineOfSight>
-						<range>86</range>
-						<soundCast>MortarBomb_Explode</soundCast>
-						<muzzleFlashScale>32</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>8.5</reloadTime>
-						<ammoSet>AmmoSet_164mmCannonBallChamber</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Swivel_Gun"]</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Weapon_SwivelGun"]/comps/li[@Class="CompProperties_ChangeableProjectile"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Weapon_SwivelGun"]/building</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Swivel_Gun"]</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Swivel_Gun"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>1</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Swivel_Gun"]/statBases</xpath>
-					<value>
-						<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<!--   PIVOT GUN   -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Weapon_PivotGun</defName>
-
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.3</ShotSpread>
-						<SwayFactor>1.34</SwayFactor>
-						<RangedWeapon_Cooldown>3.2</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<recoilAmount>1.52</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_164mmCannonShell_HE</defaultProjectile>
-						<burstShotCount />
-						<warmupTime>5</warmupTime>
-						<requireLineOfSight>true</requireLineOfSight>
-						<range>86</range>
-						<soundCast>MortarBomb_Explode</soundCast>
-						<muzzleFlashScale>32</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>8.5</reloadTime>
-						<ammoSet>AmmoSet_164mmCannonBallChamber</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Turret_PivotGun"]</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Turret_PivotGun"]</xpath>
-					<value>
-						<specialDisplayRadius>86</specialDisplayRadius>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Weapon_PivotGun"]/comps/li[@Class="CompProperties_ChangeableProjectile"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Weapon_PivotGun"]/building</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Turret_PivotGun"]</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_PivotGun"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>1</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Turret_PivotGun"]/statBases</xpath>
-					<value>
-						<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<!--   FORTRESS CANNON   -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Weapon_FortedCannon</defName>
-
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.04</SwayFactor>
-						<RangedWeapon_Cooldown>2.71</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<recoilAmount>1.52</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_164mmCannonShell_HE</defaultProjectile>
-						<burstShotCount />
-						<warmupTime>5</warmupTime>
-						<requireLineOfSight>true</requireLineOfSight>
-						<range>86</range>
-						<soundCast>MortarBomb_Explode</soundCast>
-						<muzzleFlashScale>32</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>15</reloadTime>
-						<ammoSet>AmmoSet_164mmCannonBall</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Forted_Cannon"]</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Forted_Cannon"]</xpath>
-					<value>
-						<specialDisplayRadius>86</specialDisplayRadius>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Weapon_FortedCannon"]/comps/li[@Class="CompProperties_ChangeableProjectile"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Weapon_FortedCannon"]/building</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Forted_Cannon"]</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Forted_Cannon"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>1</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Forted_Cannon"]/statBases</xpath>
-					<value>
-						<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<!--   COEHORN   -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Weapon_Coehorn</defName>
-
-					<statBases>
-						<SightsEfficiency>0.5</SightsEfficiency>
-						<ShotSpread>0.3</ShotSpread>
-						<SwayFactor>1.34</SwayFactor>
-						<RangedWeapon_Cooldown>2.71</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-						<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_164mmCannonShell_HE_Mortar</defaultProjectile>
-						<warmupTime>3</warmupTime>
-						<minRange>15</minRange>
-						<range>50</range>
-						<burstShotCount>1</burstShotCount>
-						<soundCast>MortarBomb_Explode</soundCast>
-						<muzzleFlashScale>32</muzzleFlashScale>
-						<circularError>1.5</circularError>
-						<indirectFirePenalty>0.6</indirectFirePenalty>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>10</reloadTime>
-						<ammoSet>AmmoSet_164mmCannonBall_MortarSmall</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Turret_Coehorn"]</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Turret_Coehorn"]</xpath>
-					<value>
-						<specialDisplayRadius>50</specialDisplayRadius>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Weapon_Coehorn"]/comps/li[@Class="CompProperties_ChangeableProjectile"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Weapon_Coehorn"]/building</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Turret_Coehorn"]</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_Coehorn"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>2</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Turret_Coehorn"]/statBases</xpath>
-					<value>
-						<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Weapon_Coehorn"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Charges">
-							<chargeSpeeds>
-								<li>30</li>
-								<li>50</li>
-								<li>70</li>
-								<li>90</li>
-							</chargeSpeeds>
-						</li>
-						<li Class="CombatExtended.CompProperties_AmmoUser">
-							<magazineSize>1</magazineSize>
-							<reloadTime>10</reloadTime>
-							<ammoSet>AmmoSet_164mmCannonBall_MortarSmall</ammoSet>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Weapon_Coehorn"]/weaponTags</xpath>
-					<value>
-						<li>TurretGun</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Turret_Coehorn"]/tradeTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Turret_Coehorn"]</xpath>
-						<value>
-							<tradeTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Turret_Coehorn"]/tradeTags</xpath>
-					<value>
-						<li>CE_Turret</li>
-					</value>
-				</li>
-
-				<!--   EARLY MORTAR   -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Weapon_Early_Mortar</defName>
-
-					<statBases>
-						<SightsEfficiency>0.5</SightsEfficiency>
-						<ShotSpread>0.3</ShotSpread>
-						<SwayFactor>1.34</SwayFactor>
-						<RangedWeapon_Cooldown>2.71</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-						<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_164mmCannonShell_HE_Mortar</defaultProjectile>
-						<warmupTime>4</warmupTime>
-						<minRange>20</minRange>
-						<range>700</range>
-						<burstShotCount>1</burstShotCount>
-						<soundCast>MortarBomb_Explode</soundCast>
-						<muzzleFlashScale>32</muzzleFlashScale>
-						<circularError>1.3</circularError>
-						<indirectFirePenalty>0.4</indirectFirePenalty>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>15</reloadTime>
-						<ammoSet>AmmoSet_164mmCannonBall_Mortar</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Turret_Early_Mortar"]</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Turret_Early_Mortar"]</xpath>
-					<value>
-						<specialDisplayRadius>20</specialDisplayRadius>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Weapon_Early_Mortar"]/comps/li[@Class="CompProperties_ChangeableProjectile"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Weapon_Early_Mortar"]/building</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Turret_Early_Mortar"]</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_Early_Mortar"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>2</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Turret_Early_Mortar"]/statBases</xpath>
-					<value>
-						<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Weapon_Early_Mortar"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Charges">
-							<chargeSpeeds>
-								<li>30</li>
-								<li>50</li>
-								<li>70</li>
-								<li>90</li>
-							</chargeSpeeds>
-						</li>
-						<li Class="CombatExtended.CompProperties_AmmoUser">
-							<magazineSize>1</magazineSize>
-							<reloadTime>15</reloadTime>
-							<ammoSet>AmmoSet_164mmCannonBall_Mortar</ammoSet>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Weapon_Early_Mortar"]/weaponTags</xpath>
-					<value>
-						<li>TurretGun</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Turret_Early_Mortar"]/tradeTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Turret_Early_Mortar"]</xpath>
-						<value>
-							<tradeTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Turret_Early_Mortar"]/tradeTags</xpath>
-					<value>
-						<li>CE_Turret</li>
-					</value>
-				</li>
-
-				<!--   FORTED MORTAR   -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Weapon_Forted_Mortar</defName>
-
-					<statBases>
-						<SightsEfficiency>0.5</SightsEfficiency>
-						<ShotSpread>0.3</ShotSpread>
-						<SwayFactor>1.34</SwayFactor>
-						<RangedWeapon_Cooldown>2.71</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-						<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_164mmCannonShell_HE_Mortar</defaultProjectile>
-						<warmupTime>4</warmupTime>
-						<minRange>32</minRange>
-						<range>700</range>
-						<burstShotCount>1</burstShotCount>
-						<soundCast>MortarBomb_Explode</soundCast>
-						<muzzleFlashScale>32</muzzleFlashScale>
-						<circularError>1</circularError>
-						<indirectFirePenalty>0.3</indirectFirePenalty>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>15</reloadTime>
-						<ammoSet>AmmoSet_164mmCannonBall_Mortar</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Turret_Forted_Mortar"]</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Turret_Forted_Mortar"]</xpath>
-					<value>
-						<specialDisplayRadius>32</specialDisplayRadius>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Weapon_Forted_Mortar"]/comps/li[@Class="CompProperties_ChangeableProjectile"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Weapon_Forted_Mortar"]/building</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Turret_Forted_Mortar"]</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_Forted_Mortar"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>2</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Turret_Forted_Mortar"]/statBases</xpath>
-					<value>
-						<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Weapon_Forted_Mortar"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Charges">
-							<chargeSpeeds>
-								<li>30</li>
-								<li>50</li>
-								<li>70</li>
-								<li>90</li>
-							</chargeSpeeds>
-						</li>
-						<li Class="CombatExtended.CompProperties_AmmoUser">
-							<magazineSize>1</magazineSize>
-							<reloadTime>15</reloadTime>
-							<ammoSet>AmmoSet_164mmCannonBall_Mortar</ammoSet>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Weapon_Forted_Mortar"]/weaponTags</xpath>
-					<value>
-						<li>TurretGun</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Turret_Forted_Mortar"]/tradeTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Turret_Forted_Mortar"]</xpath>
-						<value>
-							<tradeTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Turret_Forted_Mortar"]/tradeTags</xpath>
-					<value>
-						<li>CE_Turret</li>
-					</value>
-				</li>
-
-				<!--   DRAGONATOR   -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Weapon_Dragonator</defName>
-
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.3</ShotSpread>
-						<SwayFactor>1.34</SwayFactor>
-						<RangedWeapon_Cooldown>3.2</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<recoilAmount>1.52</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_DragonatorSpike</defaultProjectile>
-						<burstShotCount />
-						<warmupTime>5</warmupTime>
-						<requireLineOfSight>true</requireLineOfSight>
-						<range>20</range>
-						<soundCast>MortarBomb_Explode</soundCast>
-						<muzzleFlashScale>2</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>30</reloadTime>
-						<ammoSet>AmmoSet_Dragonator</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_Dragonator"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Turret_Dragonator"]</xpath>
-					<value>
-						<specialDisplayRadius>86</specialDisplayRadius>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Turret_Dragonator"]/comps/li[@Class="CompProperties_Refuelable"]</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_Dragonator"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>1</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_Dragonator"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Turret_Dragonator"]</xpath>
-					<value>
-						<hasInteractionCell>True</hasInteractionCell>
-						<interactionCellOffset>(0,0,-2)</interactionCellOffset>
-						<size>(3,3)</size>
-					</value>
-				</li>
-
-				<!--
-        <li Class="PatchOperationReplace">
-          <xpath>Defs/ThingDef[defName="Weapon_Cannon"]/building/fixedStorageSettings/filter/categories/li</xpath>
-          <value>
-			  <li>Ammo164mmCannonShells</li>
-          </value>
-        </li>
-		
-		<li Class="PatchOperationReplace">
-          <xpath>Defs/ThingDef[defName="Weapon_Cannon"]/building/defaultStorageSettings/filter/categories/li</xpath>
-          <value>
-			  <li>Ammo164mmCannonShells</li>
-          </value>
-        </li>
-		
-		
-		<li Class="PatchOperationRemove">
-          <xpath>Defs/ThingDef[
-		  defName="Swivel_Gun" or
-		  defName="Turret_PivotGun" or
-		  defName="Forted_Cannon" or
-		  defName="Turret_Coehorn" or
-		  defName="Turret_Early_Mortar" or
-		  defName="Turret_Forted_Mortar"
-		  ]/building/buildingTags/li[1]</xpath>
-        </li>
-		
-		<li Class="PatchOperationReplace">
-          <xpath>Defs/ThingDef[
-		  defName="Weapon_SwivelGun" or
-		  defName="Weapon_PivotGun" or
-		  defName="Weapon_FortedCannon" or
-		  defName="Weapon_Coehorn" or
-		  defName="Weapon_Early_Mortar" or
-		  defName="Weapon_Forted_Mortar"
-		  ]/weaponTags</xpath>
-		  <value>
-			<weaponTags>
-			  <li>TurretGun</li>
-			</weaponTags>
-		  </value>
-        </li>
-		-->
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Nukes/Ammo_Nuclear.xml b/Patches/Nukes/Ammo_Nuclear.xml
deleted file mode 100644
index 26d4f5b860..0000000000
--- a/Patches/Nukes/Ammo_Nuclear.xml
+++ /dev/null
@@ -1,418 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[1.4] Nukes</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Create new ammo categories.-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- Ammo Categories -->
-						<CombatExtended.AmmoCategoryDef>
-							<defName>Fusion</defName>
-							<label>Fusion</label>
-							<description>A massively powerful nuclear fusion warhead.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>LargeNuke</defName>
-							<label>Large Nuke</label>
-							<description>A large nuclear fission device.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>SmallNuke</defName>
-							<label>Small Nuke</label>
-							<description>A small nuclear fission device.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>DirtyBomb</defName>
-							<label>Dirty</label>
-							<description>A bomb loaded with dangerous radioactive materials, designed to poison large areas with radiation.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<!-- Ammo Items -->
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBaseCraftableBase">
-							<defName>Ammo_FusionBomb</defName>
-							<label>fusion warhead</label>
-							<graphicData>
-								<texPath>Things/FusionWarhead</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>4000</MarketValue>
-								<Mass>7.5</Mass>
-								<Bulk>15</Bulk>
-							</statBases>
-							<ammoClass>Fusion</ammoClass>
-							<detonateProjectile>Bullet_FusionWarhead</detonateProjectile>
-							<comps>
-								<!-- Vanilla values -->
-								<li Class="CompProperties_Explosive">
-									<explosiveRadius>60</explosiveRadius>
-									<explosiveDamageType>BombSuper</explosiveDamageType>
-									<explosiveExpandPerStackcount>0.4</explosiveExpandPerStackcount>
-									<startWickHitPointsPercent>0.7</startWickHitPointsPercent>
-									<chanceToStartFire>1</chanceToStartFire>
-									<damageFalloff>false</damageFalloff>
-									<explosionEffect>GiantExplosion</explosionEffect>
-									<explosionSound>Explosion_GiantBomb</explosionSound>
-									<wickTicks>
-										<min>60</min>
-										<max>120</max>
-									</wickTicks>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBaseCraftableBase">
-							<defName>Ammo_LargeNuclearBomb</defName>
-							<label>large nuclear warhead</label>
-							<graphicData>
-								<texPath>Things/LargeNuke</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>4000</MarketValue>
-								<Mass>7.5</Mass>
-								<Bulk>15</Bulk>
-							</statBases>
-							<ammoClass>LargeNuke</ammoClass>
-							<detonateProjectile>Bullet_FusionWarhead</detonateProjectile>
-							<comps>
-								<!-- Vanilla values -->
-								<li Class="CompProperties_Explosive">
-									<explosiveRadius>35</explosiveRadius>
-									<explosiveDamageType>BombSuper</explosiveDamageType>
-									<explosiveExpandPerStackcount>0.4</explosiveExpandPerStackcount>
-									<startWickHitPointsPercent>0.7</startWickHitPointsPercent>
-									<chanceToStartFire>0.5</chanceToStartFire>
-									<damageFalloff>false</damageFalloff>
-									<explosionEffect>GiantExplosion</explosionEffect>
-									<explosionSound>Explosion_GiantBomb</explosionSound>
-									<wickTicks>
-										<min>60</min>
-										<max>120</max>
-									</wickTicks>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBaseCraftableBase">
-							<defName>Ammo_SmallNuclearBomb</defName>
-							<label>small nuclear warhead</label>
-							<graphicData>
-								<texPath>Things/SmallNuke</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>500</MarketValue>
-								<Mass>7.5</Mass>
-								<Bulk>15</Bulk>
-							</statBases>
-							<ammoClass>SmallNuke</ammoClass>
-							<detonateProjectile>Bullet_FusionWarhead</detonateProjectile>
-							<comps>
-								<!-- Vanilla values -->
-								<li Class="CompProperties_Explosive">
-									<explosiveRadius>10</explosiveRadius>
-									<explosiveDamageType>BombSuper</explosiveDamageType>
-									<explosiveExpandPerStackcount>0.4</explosiveExpandPerStackcount>
-									<startWickHitPointsPercent>0.7</startWickHitPointsPercent>
-									<chanceToStartFire>0.3</chanceToStartFire>
-									<damageFalloff>true</damageFalloff>
-									<explosionEffect>GiantExplosion</explosionEffect>
-									<explosionSound>Explosion_GiantBomb</explosionSound>
-									<wickTicks>
-										<min>60</min>
-										<max>120</max>
-									</wickTicks>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBaseCraftableBase">
-							<defName>Ammo_DirtyNuclearBomb</defName>
-							<label>dirty nuclear warhead</label>
-							<graphicData>
-								<texPath>Things/DirtyNuke</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>800</MarketValue>
-								<Mass>7.5</Mass>
-								<Bulk>15</Bulk>
-							</statBases>
-							<ammoClass>DirtyBomb</ammoClass>
-							<detonateProjectile>Bullet_FusionWarhead</detonateProjectile>
-							<comps>
-								<!-- Vanilla values -->
-								<li Class="CompProperties_Explosive">
-									<explosiveRadius>4</explosiveRadius>
-									<explosiveDamageType>BombSuper</explosiveDamageType>
-									<explosiveExpandPerStackcount>0.4</explosiveExpandPerStackcount>
-									<startWickHitPointsPercent>0.7</startWickHitPointsPercent>
-									<chanceToStartFire>0</chanceToStartFire>
-									<damageFalloff>true</damageFalloff>
-									<explosionEffect>GiantExplosion</explosionEffect>
-									<explosionSound>Explosion_GiantBomb</explosionSound>
-									<wickTicks>
-										<min>60</min>
-										<max>120</max>
-									</wickTicks>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_FusionBomb</defName>
-							<label>make a fusion shell</label>
-							<description>Craft a fusion shell.</description>
-							<jobString>Making a fusion shell.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>200</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Uranium</li>
-										</thingDefs>
-									</filter>
-									<count>400</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>40</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentSpacer</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Shell_AntigrainWarhead</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Uranium</li>
-									<li>Plasteel</li>
-									<li>ComponentIndustrial</li>
-									<li>ComponentSpacer</li>
-									<li>Shell_AntigrainWarhead</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_FusionBomb>1</Ammo_FusionBomb>
-							</products>
-							<workAmount>7500</workAmount>
-							<researchPrerequisite>FusionWeaponsResearch</researchPrerequisite>
-							<skillRequirements>
-								<Crafting>15</Crafting>
-							</skillRequirements>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_LargeNuclearBomb</defName>
-							<label>make a large nuclear shell</label>
-							<description>Craft a large nuclear shell.</description>
-							<jobString>Making a large nuclear shell.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>150</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Uranium</li>
-										</thingDefs>
-									</filter>
-									<count>200</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>40</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Uranium</li>
-									<li>Plasteel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_LargeNuclearBomb>1</Ammo_LargeNuclearBomb>
-							</products>
-							<workAmount>7000</workAmount>
-							<researchPrerequisite>LargeNuclearWeaponsResearch</researchPrerequisite>
-							<skillRequirements>
-								<Crafting>12</Crafting>
-							</skillRequirements>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_SmallNuclearBomb</defName>
-							<label>make a small nuclear shell</label>
-							<description>Craft a small nuclear shell.</description>
-							<jobString>Making a small nuclear shell.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>60</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Uranium</li>
-										</thingDefs>
-									</filter>
-									<count>30</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Uranium</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_SmallNuclearBomb>1</Ammo_SmallNuclearBomb>
-							</products>
-							<workAmount>6500</workAmount>
-							<researchPrerequisite>SmallNuclearWeaponsResearch</researchPrerequisite>
-							<skillRequirements>
-								<Crafting>8</Crafting>
-							</skillRequirements>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_DirtyNuclearBomb</defName>
-							<label>make a dirty nuclear shell</label>
-							<description>Craft a dirty nuclear shell.</description>
-							<jobString>Making a dirty nuclear shell.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>60</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Uranium</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Uranium</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_DirtyNuclearBomb>1</Ammo_DirtyNuclearBomb>
-							</products>
-							<workAmount>6000</workAmount>
-							<researchPrerequisite>DirtyNuclearWeaponsResearch</researchPrerequisite>
-							<skillRequirements>
-								<Crafting>8</Crafting>
-							</skillRequirements>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-				<!-- Remove base mod shells.-->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="Shell_FusionWarhead" or
-						defName="Shell_LargeNuclearWarhead" or
-						defName="Shell_SmallNuclearWarhead" or
-						defName="Shell_DirtyNuclearWarhead"]
-					</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Nukes/IEDs_Nuclear.xml b/Patches/Nukes/IEDs_Nuclear.xml
deleted file mode 100644
index 0641d8cdf0..0000000000
--- a/Patches/Nukes/IEDs_Nuclear.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[1.4] Nukes</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TrapIED_Fusion"]/costList</xpath>
-					<value>
-						<costList>
-							<Ammo_FusionBomb>1</Ammo_FusionBomb>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TrapIED_LargeNuclear"]/costList</xpath>
-					<value>
-						<costList>
-							<Ammo_LargeNuclearBomb>2</Ammo_LargeNuclearBomb>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TrapIED_SmallNuclear"]/costList</xpath>
-					<value>
-						<costList>
-							<Ammo_SmallNuclearBomb>2</Ammo_SmallNuclearBomb>
-						</costList>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Nukes/Projectiles_Nuclear.xml b/Patches/Nukes/Projectiles_Nuclear.xml
deleted file mode 100644
index d89b1007a0..0000000000
--- a/Patches/Nukes/Projectiles_Nuclear.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[1.4] Nukes</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Add ThingClass-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Bullet_FusionWarhead" or
-						defName="Bullet_LargeNuclearWarhead" or
-						defName="Bullet_SmallNuclearWarhead" or
-						defName="Bullet_DirtyNuclearWarhead"
-						]/thingClass
-					</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[
-						defName="Bullet_FusionWarhead" or
-						defName="Bullet_LargeNuclearWarhead" or
-						defName="Bullet_SmallNuclearWarhead" or
-						defName="Bullet_DirtyNuclearWarhead"
-						]/projectile
-					</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.ProjectilePropertiesCE</value>
-				</li>
-
-				<!-- Set speed.-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Bullet_FusionWarhead" or
-						defName="Bullet_LargeNuclearWarhead" or
-						defName="Bullet_SmallNuclearWarhead" or
-						defName="Bullet_DirtyNuclearWarhead"
-						]/projectile/speed
-					</xpath>
-					<value>
-						<speed>0</speed>
-					</value>
-				</li>
-
-				<!-- Add shells to 81mm ammo set.-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_81mmMortarShell"]/ammoTypes</xpath>
-					<value>
-						<Ammo_FusionBomb>Bullet_FusionWarhead</Ammo_FusionBomb>
-						<Ammo_LargeNuclearBomb>Bullet_LargeNuclearWarhead</Ammo_LargeNuclearBomb>
-						<Ammo_SmallNuclearBomb>Bullet_SmallNuclearWarhead</Ammo_SmallNuclearBomb>
-						<Ammo_DirtyNuclearBomb>Bullet_DirtyNuclearWarhead</Ammo_DirtyNuclearBomb>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Nyaron/Ammo/Ammo_Nyaron.xml b/Patches/Nyaron/Ammo/Ammo_Nyaron.xml
deleted file mode 100644
index 276d75fdd3..0000000000
--- a/Patches/Nyaron/Ammo/Ammo_Nyaron.xml
+++ /dev/null
@@ -1,403 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-
-		<mods>
-			<li>Nyaron race</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==================== Nyaron Pulse Ammo ========================== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<!-- ==================== AmmoSets ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_NyaronCellBall</defName>
-							<label>Energy Ball</label>
-							<ammoTypes>
-								<Ammo_NyaronCell>Bullet_NyaronCellBall</Ammo_NyaronCell>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_NyaronCellBullet</defName>
-							<label>Energy Ball</label>
-							<ammoTypes>
-								<Ammo_NyaronCell>Bullet_NyaronCellBullet</Ammo_NyaronCell>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_NyaronCellLaser</defName>
-							<label>Energy Ball</label>
-							<ammoTypes>
-								<Ammo_NyaronCell>Bullet_NyaronCellLaser</Ammo_NyaronCell>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>NyaronCell</defName>
-							<label>Cell</label>
-							<description>Energy based weapon.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_NyaronCell</defName>
-							<label>nyaron power cell</label>
-							<description>Energy cells for use in Nyaron energy weapons.</description>
-							<statBases>
-								<Mass>0.01</Mass>
-								<Bulk>0.01</Bulk>
-								<MarketValue>0.7</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_TableMachining</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoAdvanced</li>
-							</thingCategories>
-							<stackLimit>500</stackLimit>
-							<graphicData>
-								<texPath>ThirdParty/CP DOOM and DOOM Kit Classic/Doom2016PlasmaCell</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>NyaronCell</ammoClass>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="Base6x24mmChargedBullet">
-							<defName>Bullet_NyaronCellBall</defName>
-							<label>nyaron power ball</label>
-							<graphicData>
-								<texPath>Things/Projectile/Nyaron/Energy_ball</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>1</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>120</speed>
-								<damageDef>EnergyBall</damageDef>
-								<damageAmountBase>16</damageAmountBase>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>60</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base6x24mmChargedBullet">
-							<defName>Bullet_NyaronCellBullet</defName>
-							<label>nyaron shock bullet</label>
-							<graphicData>
-								<texPath>Things/Projectile/Nyaron/Sec_bullet</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>1</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>160</speed>
-								<damageDef>Shockbullet</damageDef>
-								<damageAmountBase>4</damageAmountBase>
-								<armorPenetrationSharp>25</armorPenetrationSharp>
-								<armorPenetrationBlunt>45</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletBlue">
-							<defName>Bullet_NyaronCellLaser</defName>
-							<label>pulse beam</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>EnergyBullet</damageDef>
-								<damageAmountBase>30</damageAmountBase>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_NyaronCell</defName>
-							<label>make nyaron power cell x500</label>
-							<description>Craft 500 nyaron power cells.</description>
-							<jobString>Making nyaron power cells.</jobString>
-							<workAmount>8600</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>6</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Plasteel</li>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_NyaronCell>500</Ammo_NyaronCell>
-							</products>
-						</RecipeDef>
-					</value>
-				</li>
-
-				<!-- ==================== Nyaron Super Bow ========================== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<!-- ==================== AmmoSets ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_GreatArrowNyaron</defName>
-							<label>great arrows</label>
-							<ammoTypes>
-								<Ammo_GreatArrow_Stone>Projectile_GreatArrowNyaron_Stone</Ammo_GreatArrow_Stone>
-								<Ammo_GreatArrow_Steel>Projectile_GreatArrowNyaron_Steel</Ammo_GreatArrow_Steel>
-								<Ammo_GreatArrow_Plasteel>Projectile_GreatArrowNyaron_Plasteel</Ammo_GreatArrow_Plasteel>
-								<Ammo_GreatArrow_Venom>Projectile_GreatArrowNyaron_Venom</Ammo_GreatArrow_Venom>
-								<Ammo_GreatArrow_Flame>Projectile_GreatArrowNyaron_Flame</Ammo_GreatArrow_Flame>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="BaseGreatArrowProjectile">
-							<defName>Projectile_GreatArrowNyaron_Stone</defName>
-							<label>great arrow (stone)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Stone</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>33</speed>
-								<damageAmountBase>28</damageAmountBase><!--Artifically reduced from 33-->
-								<armorPenetrationBlunt>14.98</armorPenetrationBlunt>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<preExplosionSpawnChance>0.1</preExplosionSpawnChance><!-- All values are halved from original great arrow -->
-								<preExplosionSpawnThingDef>Ammo_GreatArrow_Stone</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseGreatArrowProjectile">
-							<defName>Projectile_GreatArrowNyaron_Steel</defName>
-							<label>great arrow (steel)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>36</speed>
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationBlunt>21.06</armorPenetrationBlunt>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<preExplosionSpawnChance>0.3</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Ammo_GreatArrow_Steel</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseGreatArrowProjectile">
-							<defName>Projectile_GreatArrowNyaron_Plasteel</defName>
-							<label>great arrow (plasteel)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Plasteel</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>37</speed>
-								<damageAmountBase>15</damageAmountBase>
-								<armorPenetrationBlunt>19.26</armorPenetrationBlunt>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<preExplosionSpawnChance>0.375</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Ammo_GreatArrow_Plasteel</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseGreatArrowProjectile">
-							<defName>Projectile_GreatArrowNyaron_Venom</defName>
-							<label>great arrow (venom)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Venom</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>36</speed>
-								<damageDef>Arrow</damageDef>
-								<damageAmountBase>14</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>ArrowVenom</def>
-										<amount>6</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationBlunt>21.06</armorPenetrationBlunt>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<preExplosionSpawnChance>0.3</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Ammo_GreatArrow_Steel</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseGreatArrowProjectile">
-							<defName>Projectile_GreatArrowNyaron_Flame</defName>
-							<label>great arrow (flame)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Flame</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>36</speed>
-								<damageDef>Arrow</damageDef>
-								<damageAmountBase>6</damageAmountBase>
-								<armorPenetrationBlunt>10.54</armorPenetrationBlunt>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<secondaryDamage>
-									<li>
-										<def>Flame</def>
-										<amount>1</amount>
-										<chance>0.33</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-				<!-- ==================== Nyaron Flak Ammo ========================== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_NyaronFlakGrenade</defName>
-							<label>NyaronFlak Grenades</label>
-							<ammoTypes>
-								<Ammo_NyaronFlakGrenade_HE>Bullet_NyaronFlakGrenade_HE</Ammo_NyaronFlakGrenade_HE>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="20x42mmGrenadeBase">
-							<defName>Ammo_NyaronFlakGrenade_HE</defName>
-							<label>Nyaron flak grenade</label>
-							<graphicData>
-								<texPath>Things/Ammo/GrenadeLauncher/HE</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>1.56</MarketValue>
-							</statBases>
-							<ammoClass>GrenadeHE</ammoClass>
-							<thingCategories Inherit="False">
-								<li>AmmoAdvanced</li>
-							</thingCategories>
-							<detonateProjectile>Bullet_NyaronFlakGrenade_HE</detonateProjectile>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="Base20x42mmGrenadeBullet">
-							<defName>Bullet_NyaronFlakGrenade_HE</defName>
-							<label>nyaron grenade (HE)</label>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<graphicData>
-								<texPath>Things/Projectile/Nyaron/Flak_cannon</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>25</speed>
-								<gravityFactor>7</gravityFactor>
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>15</damageAmountBase>
-								<explosionRadius>0.5</explosionRadius>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Small>11</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_NyaronFlakGrenade_HE</defName>
-							<label>make Nyaron Flak grenades x100</label>
-							<description>Craft 100 Nyaron Flak grenades.</description>
-							<jobString>Making Nyaron Flak grenades.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>26</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>5</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>FSX</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_NyaronFlakGrenade_HE>100</Ammo_NyaronFlakGrenade_HE>
-							</products>
-							<workAmount>5800</workAmount>
-						</RecipeDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Nyaron/Bodies/Nyaron_Bodytype.xml b/Patches/Nyaron/Bodies/Nyaron_Bodytype.xml
deleted file mode 100644
index 73c152918a..0000000000
--- a/Patches/Nyaron/Bodies/Nyaron_Bodytype.xml
+++ /dev/null
@@ -1,303 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<!--Nyaron Bodytype-->
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Nyaron race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Modify coverage ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def = "Ribcage"]/coverage</xpath>
-					<value>
-						<coverage>0.07</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def = "Pelvis"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def = "Stomach"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def = "Heart"]/coverage</xpath>
-					<value>
-						<coverage>0.04</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def = "Lung"]/coverage</xpath>
-					<value>
-						<coverage>0.055</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def = "Kidney"]/coverage</xpath>
-					<value>
-						<coverage>0.03</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def = "Liver"]/coverage</xpath>
-					<value>
-						<coverage>0.06</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def = "Neck"]/coverage</xpath>
-					<value>
-						<coverage>0.055</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Skull"]/parts/li[def = "Brain"]/coverage</xpath>
-					<value>
-						<coverage>0.9</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def = "Eye"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def = "Ear"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def = "Nose"]/coverage</xpath>
-					<value>
-						<coverage>0.08</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def = "Shoulder"]/coverage</xpath>
-					<value>
-						<coverage>0.085</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Clavicle"]/coverage</xpath>
-					<value>
-						<coverage>0.06</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def="Humerus"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def="Radius"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def = "Leg"]/parts/li[def="Femur"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def = "Leg"]/parts/li[def="Tibia"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-
-				<!--Outside Squishy-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "right eye"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "left eye"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Nyaron"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<!--Arm Groups-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Nyaron"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
-					<value>
-						<li>LeftArm</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Nyaron"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
-					<value>
-						<li>RightArm</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Nyaron"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
-					<value>
-						<li>LeftShoulder</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Nyaron"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
-					<value>
-						<li>RightShoulder</li>
-					</value>
-				</li>
-
-				<!--Natural Armor-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Nyaron"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Nyaron"]/corePart/parts/li[def="NR_CatTail"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Nyaron"]/corePart/parts/li[def="Neck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Nyaron"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Nyaron"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Nyaron"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Nyaron"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Nyaron"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Nyaron"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Nyaron"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Nyaron"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Nyaron"]/corePart/parts/li[def="Leg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Nyaron"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Nyaron"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Nyaron/PawnKindDefs/Nyaron_PawnKind.xml b/Patches/Nyaron/PawnKindDefs/Nyaron_PawnKind.xml
deleted file mode 100644
index caa03996b5..0000000000
--- a/Patches/Nyaron/PawnKindDefs/Nyaron_PawnKind.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-
-		<mods>
-			<li>Nyaron race</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!--Ammo-->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						@Name="NyaronCivBase"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>0</min>
-								<max>3</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						@Name="NyaronMilBase"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>200</min>
-								<max>600</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Nyaron/Scenario/Nyaron_Scenario.xml b/Patches/Nyaron/Scenario/Nyaron_Scenario.xml
deleted file mode 100644
index cd91ffedc1..0000000000
--- a/Patches/Nyaron/Scenario/Nyaron_Scenario.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-
-		<mods>
-			<li>Nyaron race</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="NyaronStart"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_NyaronCell</thingDef>
-							<count>240</count>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="NyaronStart_butler"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_303British_FMJ</thingDef>
-							<count>100</count>
-						</li>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_NyaronCell</thingDef>
-							<count>60</count>
-						</li>
-					</value>
-				</li>
-
-				<!--Add material filter to faction for MIB type events-->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/FactionDef[@Name="NyaronFactionBase"]/apparelStuffFilter</xpath>
-					<match Class="PatchOperationConditional">
-						<xpath>Defs/FactionDef[@Name="NyaronFactionBase"]/apparelStuffFilter/thingDefs</xpath>
-						<match Class="PatchOperationConditional">
-							<xpath>Defs/FactionDef[@Name="NyaronFactionBase"]/apparelStuffFilter/thingDefs/li["Steel"]</xpath>
-							<match Class="PatchOperationReplace">
-								<xpath>Defs/FactionDef[@Name="NyaronFactionBase"]/apparelStuffFilter/thingDefs/li["Steel"]</xpath>
-								<value>
-									<li>Steel</li>
-								</value>
-							</match>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/FactionDef[@Name="NyaronFactionBase"]/apparelStuffFilter/thingDefs</xpath>
-								<value>
-									<li>Steel</li>
-								</value>
-							</nomatch>
-						</match>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/FactionDef[@Name="NyaronFactionBase"]/apparelStuffFilter</xpath>
-							<value>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</value>
-						</nomatch>
-					</match>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/FactionDef[@Name="NyaronFactionBase"]</xpath>
-						<value>
-							<apparelStuffFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</apparelStuffFilter>
-						</value>
-					</nomatch>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Nyaron/ThingDefs_Items/Items_Resources.xml b/Patches/Nyaron/ThingDefs_Items/Items_Resources.xml
deleted file mode 100644
index 6b4c75a3bb..0000000000
--- a/Patches/Nyaron/ThingDefs_Items/Items_Resources.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Nyaron race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==========  Leather  =========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Nyaron"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.05</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Nyaron/ThingDefs_Misc/Nyaron_Apparel.xml b/Patches/Nyaron/ThingDefs_Misc/Nyaron_Apparel.xml
deleted file mode 100644
index 256f97089c..0000000000
--- a/Patches/Nyaron/ThingDefs_Misc/Nyaron_Apparel.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-
-		<mods>
-			<li>Nyaron race</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--========= Stuffable =========-->
-
-				<!--Starter-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Nr_SUniform"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>0.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Nr_SUniform"]/statBases/ArmorRating_Blunt</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Nr_SUniform"]/statBases/ArmorRating_Heat</xpath>
-				</li>
-
-				<!--Cat Jacket-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Nr_CatJacket"
-						]/statBases/Mass </xpath>
-					<value>
-						<Mass>12.5</Mass>
-						<Bulk>20</Bulk>
-						<WornBulk>8</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Nr_CatJacket"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>12</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Nr_CatJacket"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Nr_CatJacket"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Nr_CatJacket"]/stuffCategories</xpath>
-					<value>
-						<stuffCategories>
-							<li>SoftArmor</li>
-						</stuffCategories>
-						<costList>
-							<Steel>90</Steel>
-						</costList>
-					</value>
-				</li>
-
-				<!--Cat Hoodie-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Nr_CatHoodie"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Nr_CatHoodie"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Nr_CatHoodie"]/statBases/ArmorRating_Sharp</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Nr_CatHoodie"]/statBases/ArmorRating_Blunt</xpath>
-				</li>
-
-				<!--========= Fixed Armor Value =========-->
-
-				<!--Maid-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Nr_CatMaid"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Nr_CatMaid"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Nr_CatMaid"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.05</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Nr_CatMaidBand"]/statBases</xpath>
-					<value>
-						<Bulk>0.5</Bulk>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Nr_CatMaidBand"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Nr_CatMaidBand"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.05</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!--Power Armor-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Nr_PowerArmor"]/statBases</xpath>
-					<value>
-						<Bulk>80</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Nr_PowerArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>30</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Nr_PowerArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Nr_PowerArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>45</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Nr_PowerArmor"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Nr_PowerArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>35</CarryWeight>
-						<CarryBulk>10</CarryBulk>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Nr_PowerArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Nyaron/ThingDefs_Misc/Weapons.xml b/Patches/Nyaron/ThingDefs_Misc/Weapons.xml
deleted file mode 100644
index 7220b8eac9..0000000000
--- a/Patches/Nyaron/ThingDefs_Misc/Weapons.xml
+++ /dev/null
@@ -1,561 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Nyaron race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==========  Clawbar  =========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Nr_Clawbar"]/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>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2.25</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>4.225</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>2.25</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationSharp>1.06</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.225</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Nr_Clawbar"]/statBases</xpath>
-					<value>
-						<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
-						<Bulk>5.5</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Nr_Clawbar"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Nr_Clawbar"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.42</MeleeCritChance>
-							<MeleeParryChance>0.24</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- ==========  Knife  =========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Nr_Karambit"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2.01</cooldownTime>
-								<chanceFactor>0.4</chanceFactor>
-								<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.26</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.67</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.18</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.2</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Nr_Karambit"]/statBases</xpath>
-					<value>
-						<MeleeCounterParryBonus>0.39</MeleeCounterParryBonus>
-						<Bulk>1.5</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Nr_Karambit"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.08</MeleeCritChance>
-							<MeleeParryChance>0.24</MeleeParryChance>
-							<MeleeDodgeChance>1.07</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Nr_Karambit"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- ==========  Sword  =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Nr_Lightbringer"]/statBases</xpath>
-					<value>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-						<Bulk>6.5</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Nr_Lightbringer"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.63</MeleeCritChance>
-							<MeleeParryChance>0.75</MeleeParryChance>
-							<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Nr_Lightbringer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.69</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<armorPenetrationSharp>22</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>1.69</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationBlunt>2.592</armorPenetrationBlunt>
-								<armorPenetrationSharp>16</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.56</cooldownTime>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>4.05</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Charge Pistol =========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Nr_CriPistol</defName>
-					<statBases>
-						<SightsEfficiency>0.80</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>2.50</Bulk>
-						<Mass>1.3</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_NyaronCellBall</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>Cripistol_fire</soundCast>
-						<soundCastTail>Secgun_tail</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>16</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_NyaronCellBall</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Nr_CriPistol"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- ========== Charge SMG =========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Nr_MfoldPdw</defName>
-					<statBases>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>0.95</SwayFactor>
-						<Bulk>6.00</Bulk>
-						<Mass>3.50</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<recoilAmount>1.86</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_NyaronCellBall</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<range>28</range>
-						<soundCast>Cripistol_fire</soundCast>
-						<soundCastTail>Secgun_tail</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>36</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_NyaronCellBall</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== Rifle =========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Nr_NpcRifle</defName>
-					<statBases>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.24</SwayFactor>
-						<Bulk>8.80</Bulk>
-						<Mass>6.50</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<recoilAmount>2.34</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_NyaronCellBullet</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<range>51</range>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<soundCast>Secgun_fire</soundCast>
-						<soundCastTail>Secgun_tail</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>48</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_NyaronCellBullet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== Beam Rifle =========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Nr_ChRifle</defName>
-					<statBases>
-						<SightsEfficiency>2.60</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.90</SwayFactor>
-						<Bulk>12.5</Bulk>
-						<Mass>5.50</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_NyaronCellLaser</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>75</range>
-						<ammoConsumedPerShotCount>10</ammoConsumedPerShotCount>
-						<soundCast>Nr_beamfire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>60</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_NyaronCellLaser</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== Flak Caster =========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Nr_FlakCaster</defName>
-					<statBases>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.20</ShotSpread>
-						<SwayFactor>2.10</SwayFactor>
-						<Bulk>14.00</Bulk>
-						<Mass>7.00</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<recoilAmount>2.04</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_NyaronFlakGrenade_HE</defaultProjectile>
-						<warmupTime>2.1</warmupTime>
-						<burstShotCount>16</burstShotCount>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<range>44</range>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>6</reloadTime>
-						<ammoSet>AmmoSet_NyaronFlakGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>4</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!-- ========== Bow =========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Nr_ChRifle</defName>
-					<statBases>
-						<SightsEfficiency>2.60</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.90</SwayFactor>
-						<Bulk>12.5</Bulk>
-						<Mass>5.50</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_NyaronCellLaser</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>75</range>
-						<ammoConsumedPerShotCount>10</ammoConsumedPerShotCount>
-						<soundCast>Nr_beamfire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>60</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_NyaronCellLaser</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Nr_Stkbow</defName>
-					<statBases>
-						<SightsEfficiency>2.5</SightsEfficiency>
-						<ShotSpread>1</ShotSpread>
-						<SwayFactor>1.5</SwayFactor>
-						<Bulk>5.00</Bulk>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_GreatArrowNyaron_Stone</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>30</range>
-						<soundCast>Bow_Large</soundCast>
-					</Properties>
-					<AmmoUser>
-						<ammoSet>AmmoSet_GreatArrowNyaron</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Nr_Stkbow"]/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>
-
-				<!-- ========== Melee Attacks =========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Nr_FlakCaster" or
-						defName="Nr_ChRifle" or
-						defName="Nr_NpcRifle" or
-						defName="Nr_MfoldPdw"
-						]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Nr_CriPistol"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Nyaron/ThingDefs_Races/AlienRace_Nyaron.xml b/Patches/Nyaron/ThingDefs_Races/AlienRace_Nyaron.xml
deleted file mode 100644
index df6a1038d9..0000000000
--- a/Patches/Nyaron/ThingDefs_Races/AlienRace_Nyaron.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-
-		<mods>
-			<li>Nyaron race</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="BaseNyaronPawn"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Nyaron"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!--Better shooting, Worse melee-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Nyaron"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<MeleeCritChance>1.3</MeleeCritChance>
-						<MeleeParryChance>0.5</MeleeParryChance>
-						<Suppressability>0.9</Suppressability>
-						<SmokeSensitivity>0.9</SmokeSensitivity>
-						<CarryBulk>30</CarryBulk>
-						<CarryWeight>60</CarryWeight>
-						<ReloadSpeed>1.25</ReloadSpeed>
-					</value>
-				</li>
-
-				<!--Base has no headbut, only bite-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Nyaron"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left NyanPunch</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right NyanPunch</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Dragons Not Included/Apparel_Dragon.xml b/Patches/O21 Dragons Not Included/Apparel_Dragon.xml
deleted file mode 100644
index 7c45a10d61..0000000000
--- a/Patches/O21 Dragons Not Included/Apparel_Dragon.xml	
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[O21] Dragons Not Included</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Cloak -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_DNI_ShoulderCloak"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
-						<Bulk>3.5</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<!-- Tunic & Surcoat-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_DNI_TunicKnight" or defName="O21_DNI_KnightSurcoat"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-						<Bulk>3.5</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<!-- Light Leather -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_DNI_LeatherLight"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
-						<Bulk>75</Bulk>
-						<WornBulk>8</WornBulk>
-					</value>
-				</li>
-
-				<!-- Pauldrons -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_DNI_PauldronsKnight" or defName="O21_DNI_PauldronsGondorian"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.3</StuffEffectMultiplierArmor>
-						<Bulk>5</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<!-- Breastplate -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_DNI_BreastplateKnight" or defName="O21_DNI_CuirassGondorian"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-						<Bulk>90</Bulk>
-						<WornBulk>9</WornBulk>
-					</value>
-				</li>
-
-				<!-- Helmet -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_DNI_HelmetKnight" or defName="O21_DNI_HelmetGondor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.1</StuffEffectMultiplierArmor>
-						<Bulk>5</Bulk>
-					</value>
-				</li>
-
-				<!-- Tropical Mask -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="DNIZoraiMaskBase"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>10</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Hood -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_DNI_NausicHoodGoggled" or defName="O21_DNI_NausicGasmask"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Armored Hood -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_DNI_NausicHoodGoggled_Armoured" or defName="O21_DNI_NausicGasmask_Armoured"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- Gas Mask -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_NausicGasmask" or defName="O21_DNI_NausicGasmask_Armoured"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-0.65</SmokeSensitivity>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Dragons Not Included/Melee_Dragon.xml b/Patches/O21 Dragons Not Included/Melee_Dragon.xml
deleted file mode 100644
index e68088d929..0000000000
--- a/Patches/O21 Dragons Not Included/Melee_Dragon.xml	
+++ /dev/null
@@ -1,1232 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[O21] Dragons Not Included</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Scottish Broadswords -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_DNI_BasketHiltedSword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.69</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.69</cooldownTime>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.6</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>1.56</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>2.592</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.58</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_BasketHiltedSword"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_BasketHiltedSword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.63</MeleeCritChance>
-							<MeleeParryChance>0.80</MeleeParryChance>
-							<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_DNI_HalflangBroadsword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.69</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.69</cooldownTime>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.6</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>1.56</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>2.592</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.58</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_HalflangBroadsword"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_HalflangBroadsword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.63</MeleeCritChance>
-							<MeleeParryChance>0.75</MeleeParryChance>
-							<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Lochaber Axe -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_DNI_LochaberAxe"]/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>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_LochaberAxe"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>0.89</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_LochaberAxe"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.22</MeleeCritChance>
-							<MeleeParryChance>1.33</MeleeParryChance>
-							<MeleeDodgeChance>0.57</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Machete -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_DNI_SpikedMachete"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.3</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.70</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_SpikedMachete"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<MeleeCounterParryBonus>0.26</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_SpikedMachete"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.29</MeleeCritChance>
-							<MeleeParryChance>0.26</MeleeParryChance>
-							<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_SpikedMachete"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- Ball Club -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_DNI_BallClubA"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.06</cooldownTime>
-								<armorPenetrationBlunt>1.15</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>3.06</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>4.598</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_BallClubA"]/statBases</xpath>
-					<value>
-						<Bulk>3.75</Bulk>
-						<MeleeCounterParryBonus>0.16</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_BallClubA"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.63</MeleeCritChance>
-							<MeleeParryChance>0.16</MeleeParryChance>
-							<MeleeDodgeChance>0.20</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_BallClubA"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- Spade-Tipped Sword -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_DNI_SpadeTippedSword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.57</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.30</cooldownTime>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>2.4</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.48</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>1.56</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>1.944</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.44</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_SpadeTippedSword"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>0.45</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_SpadeTippedSword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.20</MeleeCritChance>
-							<MeleeParryChance>0.35</MeleeParryChance>
-							<MeleeDodgeChance>0.20</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Tropical Clubs -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="TropicalClubBase"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.06</cooldownTime>
-								<armorPenetrationBlunt>1.15</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>3.06</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>4.598</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="TropicalClubBase"]/statBases</xpath>
-					<value>
-						<Bulk>3.75</Bulk>
-						<MeleeCounterParryBonus>0.16</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="TropicalClubBase"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.63</MeleeCritChance>
-							<MeleeParryChance>0.16</MeleeParryChance>
-							<MeleeDodgeChance>0.20</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="TropicalClubBase"]</xpath>
-					<value>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<!-- Yari -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_DNI_JumonjiYari" or defName="O21_DNI_SuYari"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.29</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>1.913</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.71</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.85</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.14</cooldownTime>
-								<chanceFactor>1.00</chanceFactor>
-								<armorPenetrationBlunt>1.913</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.4</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>3.2</cooldownTime>
-								<chanceFactor>0.33</chanceFactor>
-								<armorPenetrationBlunt>1.913</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.28</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_JumonjiYari" or defName="O21_DNI_SuYari"]/statBases</xpath>
-					<value>
-						<Bulk>11</Bulk>
-						<MeleeCounterParryBonus>2.12</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_JumonjiYari" or defName="O21_DNI_SuYari"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.39</MeleeCritChance>
-							<MeleeParryChance>1.59</MeleeParryChance>
-							<MeleeDodgeChance>0.90</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Tanto -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Tanto"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>0.97</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.259</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>0.97</cooldownTime>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>0.259</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.48</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.05</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>0.304</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.28</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Tanto"]/statBases</xpath>
-					<value>
-						<Bulk>4.2</Bulk>
-						<MeleeCounterParryBonus>0.38</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Tanto"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.93</MeleeCritChance>
-							<MeleeParryChance>0.38</MeleeParryChance>
-							<MeleeDodgeChance>0.09</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Ono -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Ono"]/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="O21_DNI_Ono"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Ono"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.10</MeleeCritChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-							<MeleeDodgeChance>0.20</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Ono"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- Naginata -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Naginata"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.76</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>0.95</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.76</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationSharp>1.9</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.95</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>32</power>
-								<cooldownTime>1.41</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationSharp>1.27</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Naginata"]/statBases</xpath>
-					<value>
-						<Bulk>14</Bulk>
-						<MeleeCounterParryBonus>1.78</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Naginata"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.56</MeleeCritChance>
-							<MeleeParryChance>0.75</MeleeParryChance>
-							<MeleeDodgeChance>0.6</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Jitte -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Jitte"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.68</cooldownTime>
-								<armorPenetrationBlunt>2.188</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Jitte"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Jitte"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>1</MeleeParryChance>
-							<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Jitte"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- Ararebo -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Ararebo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.49</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>3.375</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>2.67</cooldownTime>
-								<armorPenetrationBlunt>15.75</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Ararebo"]/statBases</xpath>
-					<value>
-						<Bulk>14</Bulk>
-						<MeleeCounterParryBonus>0.28</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Ararebo"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.6</MeleeCritChance>
-							<MeleeParryChance>0.38</MeleeParryChance>
-							<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Kabutowari, Sai -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Kabutowari" or defName="O21_DNI_Sai"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.29</cooldownTime>
-								<armorPenetrationBlunt>0.275</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.29</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.275</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Kabutowari" or defName="O21_DNI_Sai"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Kabutowari" or defName="O21_DNI_Sai"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.63</MeleeCritChance>
-							<MeleeParryChance>0.5</MeleeParryChance>
-							<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Kabutowari" or defName="O21_DNI_Sai"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- Tropical Knives -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="TropicalBladeBase"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.18</cooldownTime>
-								<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.32</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.26</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.42</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="TropicalBladeBase"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="TropicalBladeBase"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.5</MeleeCritChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-							<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="TropicalBladeBase"]</xpath>
-					<value>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<!-- Masakari Axe -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Masakari"]/statBases</xpath>
-					<value>
-						<Bulk>13</Bulk>
-						<MeleeCounterParryBonus>1.5</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Masakari"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.3</MeleeCritChance>
-							<MeleeParryChance>1.6</MeleeParryChance>
-							<MeleeDodgeChance>0.56</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Masakari"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>48</power>
-								<cooldownTime>3.4</cooldownTime>
-								<chanceFactor>1.165</chanceFactor>
-								<armorPenetrationBlunt>10.4</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.8</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<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>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Tropical Spears -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="TropicalSpearBase"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.35</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.78</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.19</cooldownTime>
-								<chanceFactor>1.00</chanceFactor>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="TropicalSpearBase"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="TropicalSpearBase"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.17</MeleeCritChance>
-							<MeleeParryChance>1.45</MeleeParryChance>
-							<MeleeDodgeChance>0.9</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Sasumata -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Sasumata"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.78</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>1.000</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2.79</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>6.76</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Sasumata"]/statBases</xpath>
-					<value>
-						<Bulk>7</Bulk>
-						<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Sasumata"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.50</MeleeCritChance>
-							<MeleeParryChance>0.18</MeleeParryChance>
-							<MeleeDodgeChance>0.30</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Katana -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Katana"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.33</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.936</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.33</cooldownTime>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>0.936</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.88</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>31</power>
-								<cooldownTime>1.28</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>2.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.65</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Katana"]/statBases</xpath>
-					<value>
-						<Bulk>7.85</Bulk>
-						<MeleeCounterParryBonus>1.38</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Katana"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.85</MeleeCritChance>
-							<MeleeParryChance>0.69</MeleeParryChance>
-							<MeleeDodgeChance>0.37</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Nagamaki, Odachi -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Nagamaki" or defName="O21_DNI_Odachi"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.38</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>1.08</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.38</cooldownTime>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>1.08</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.55</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>1.49</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Nagamaki" or defName="O21_DNI_Odachi"]/statBases</xpath>
-					<value>
-						<Bulk>9</Bulk>
-						<MeleeCounterParryBonus>3.6</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Nagamaki" or defName="O21_DNI_Odachi"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.74</MeleeCritChance>
-							<MeleeParryChance>0.53</MeleeParryChance>
-							<MeleeDodgeChance>0.60</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Dragons Not Included/Ranged_Dragon.xml b/Patches/O21 Dragons Not Included/Ranged_Dragon.xml
deleted file mode 100644
index cc513954f3..0000000000
--- a/Patches/O21 Dragons Not Included/Ranged_Dragon.xml	
+++ /dev/null
@@ -1,462 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[O21] Dragons Not Included</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Melee -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_Gun_HighlandPistol" or defName="O21_Gun_FlintlockPistol" or defName="O21_Gun_MatchlockPistol"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "O21_Gun_ResonanceRifle"]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="TropicalBlowpipeBase"]/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>
-
-				<!-- Various Pistols -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>O21_Gun_HighlandPistol</defName>
-					<statBases>
-						<Mass>1.25</Mass>
-						<Bulk>3.90</Bulk>
-						<SwayFactor>1.22</SwayFactor>
-						<ShotSpread>0.36</ShotSpread>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_SlowMusketBall</defaultProjectile>
-						<warmupTime>1.66</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Revolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>5</AmmoGenPerMagOverride>
-						<reloadTime>6.5</reloadTime>
-						<ammoSet>AmmoSet_SlowMusketBall</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>O21_Gun_FlintlockPistol</defName>
-					<statBases>
-						<Mass>1.25</Mass>
-						<Bulk>3.90</Bulk>
-						<SwayFactor>1.22</SwayFactor>
-						<ShotSpread>0.36</ShotSpread>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_SlowMusketBall</defaultProjectile>
-						<warmupTime>1.66</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Revolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>5</AmmoGenPerMagOverride>
-						<reloadTime>6.5</reloadTime>
-						<ammoSet>AmmoSet_SlowMusketBall</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>O21_Gun_MatchlockPistol</defName>
-					<statBases>
-						<Mass>1.45</Mass>
-						<Bulk>4</Bulk>
-						<SwayFactor>1.24</SwayFactor>
-						<ShotSpread>0.37</ShotSpread>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_SlowMusketBall</defaultProjectile>
-						<warmupTime>1.86</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Revolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>5</AmmoGenPerMagOverride>
-						<reloadTime>6.9</reloadTime>
-						<ammoSet>AmmoSet_SlowMusketBall</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- Blowpipes -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="TropicalBlowpipeBase"]/verbs</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="TropicalBlowpipeBase"]/statBases/AccuracyTouch</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="TropicalBlowpipeBase"]/statBases/AccuracyShort</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="TropicalBlowpipeBase"]/statBases/AccuracyMedium</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="TropicalBlowpipeBase"]/statBases/AccuracyLong</xpath>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>O21_TropicalBoneBlowpipe</defName>
-					<statBases>
-						<Mass>1</Mass>
-						<Bulk>2.50</Bulk>
-						<SwayFactor>1.22</SwayFactor>
-						<ShotSpread>0.36</ShotSpread>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Projectile_Dart_Venom</defaultProjectile>
-						<warmupTime>1.20</warmupTime>
-						<range>10</range>
-						<soundCast>Bow_Small</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_Blowdart</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>O21_TropicalBambooBlowpipe</defName>
-					<statBases>
-						<Mass>1</Mass>
-						<Bulk>2.50</Bulk>
-						<SwayFactor>1.22</SwayFactor>
-						<ShotSpread>0.36</ShotSpread>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.85</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Projectile_Dart_Venom</defaultProjectile>
-						<warmupTime>2.60</warmupTime>
-						<range>10</range>
-						<soundCast>Bow_Small</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
-						<reloadTime>5.3</reloadTime>
-						<ammoSet>AmmoSet_Blowdart</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Boomerang =========== -->
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Boomerang"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>BaseWeapon</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Boomerang"]/costStuffCount</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Boomerang"]/recipeMaker</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Boomerang"]</xpath>
-					<value>
-						<thingCategories>
-							<li>WeaponsRanged</li>
-						</thingCategories>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Boomerang"]/statBases</xpath>
-					<value>
-						<statBases>
-							<SightsEfficiency>0.8</SightsEfficiency>
-							<ShotSpread>0.6</ShotSpread>
-							<SwayFactor>2</SwayFactor>
-							<Bulk>1</Bulk>
-							<Mass>0.5</Mass>
-							<RangedWeapon_Cooldown>1.3</RangedWeapon_Cooldown>
-						</statBases>
-						<stackLimit>25</stackLimit>
-						<tradeTags>
-							<li>CE_AutoEnableTrade</li>
-						</tradeTags>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Boomerang"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Boomerang_Thrown</defaultProjectile>
-								<warmupTime>1.5</warmupTime>
-								<range>16</range>
-								<soundCast>Interact_BeatFire</soundCast>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_DNI_Boomerang"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.69</cooldownTime>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>3.29</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>3.2</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingDef ParentName="BasePilumProjectile">
-							<defName>Boomerang_Thrown</defName>
-							<label>boomerang</label>
-							<graphicData>
-								<texPath>Things/Weapons/Melee/Boomerang</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Blunt</damageDef>
-								<damageAmountBase>15</damageAmountBase>
-								<speed>12</speed>
-								<armorPenetrationBlunt>0.18</armorPenetrationBlunt>
-								<preExplosionSpawnChance>0.50</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>O21_DNI_Boomerang</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>MakeAmmo_O21_DNI_Boomerang</defName>
-							<label>make boomerang x5</label>
-							<description>Craft 5 boomerangs.</description>
-							<jobString>Making boomerangs.</jobString>
-							<workAmount>1200</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>15</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<recipeUsers>
-								<li>CraftingSpot</li>
-							</recipeUsers>
-							<products>
-								<O21_DNI_Boomerang>5</O21_DNI_Boomerang>
-							</products>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-				<!-- === Resonance Rifle === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>O21_Gun_ResonanceRifle</defName>
-					<statBases>
-						<Mass>4.8</Mass>
-						<Bulk>14.9</Bulk>
-						<SwayFactor>1.92</SwayFactor>
-						<ShotSpread>0.30</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.35</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_FastMusketBall</defaultProjectile>
-						<warmupTime>2.5</warmupTime>
-						<range>45</range>
-						<soundCast>Shot_Revolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>5</AmmoGenPerMagOverride>
-						<reloadTime>10</reloadTime>
-						<ammoSet>AmmoSet_FastMusketBall</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Forgotten Realms/ThingDefs_Races/Patch_Bodies.xml b/Patches/O21 Forgotten Realms/ThingDefs_Races/Patch_Bodies.xml
deleted file mode 100644
index fd6e78a920..0000000000
--- a/Patches/O21 Forgotten Realms/ThingDefs_Races/Patch_Bodies.xml	
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forgotten Realms</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Add armor coverage (for pawns with non-zero armor that use human body) ========== -->
-
-				<!-- Illithid -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "O21_FR_Body_Illithid"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "O21_FR_Body_Illithid"]/corePart/parts/li[def = "Neck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "O21_FR_Body_Illithid"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "O21_FR_Body_Illithid"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Jaw"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "O21_FR_Body_Illithid"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Nose"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "O21_FR_Body_Illithid"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Ear"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "O21_FR_Body_Illithid"]/corePart/parts/li[def = "Shoulder"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "O21_FR_Body_Illithid"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "O21_FR_Body_Illithid"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "O21_FR_Body_Illithid"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/parts/li[def = "Finger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "O21_FR_Body_Illithid"]/corePart/parts/li[def = "Leg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "O21_FR_Body_Illithid"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "O21_FR_Body_Illithid"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/parts/li[def = "Toe"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- Chitine -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "O21_FR_Chitine"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "O21_FR_Chitine"]/corePart/parts/li[def = "Neck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "O21_FR_Chitine"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "O21_FR_Chitine"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Jaw"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "O21_FR_Chitine"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Nose"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "O21_FR_Chitine"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Ear"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "O21_FR_Chitine"]/corePart/parts/li[def = "Shoulder"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "O21_FR_Chitine"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "O21_FR_Chitine"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "O21_FR_Chitine"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/parts/li[def = "Finger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "O21_FR_Chitine"]/corePart/parts/li[def = "Leg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "O21_FR_Chitine"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "O21_FR_Chitine"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/parts/li[def = "Toe"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Forgotten Realms/ThingDefs_Races/PawnKinds_Misc.xml b/Patches/O21 Forgotten Realms/ThingDefs_Races/PawnKinds_Misc.xml
deleted file mode 100644
index 191053cd98..0000000000
--- a/Patches/O21 Forgotten Realms/ThingDefs_Races/PawnKinds_Misc.xml	
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forgotten Realms</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Give ammo to pawns with bows ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>
-						Defs/PawnKindDef[
-						@Name="O21_FR_NPCTribePawnBase_Bowman" or
-						@Name="O21_FR_NPCTribePawnBase_Hunter" or
-						@Name="O21_FR_NPCTribePawnBase_Miner" or
-						@Name="O21_FR_NPCTribePawnBase_Logger" or
-						@Name="O21_FR_NPCTribePawnBase_Farmer"]
-					</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>12</min>
-								<max>20</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.3</generateChance>
-									<sidearmMoney>
-										<min>150</min>
-										<max>350</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>NeolithicMeleeBasic</li>
-										<li>MedievalMeleeDecent</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Chitine.xml b/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Chitine.xml
deleted file mode 100644
index 997d07481c..0000000000
--- a/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Chitine.xml	
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forgotten Realms</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Chitine"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Chitine"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Chitine"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Chitine"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency>0.6</NightVisionEfficiency>
-						<MeleeDodgeChance>1.1</MeleeDodgeChance>
-						<MeleeCritChance>0.8</MeleeCritChance>
-						<MeleeParryChance>0.85</MeleeParryChance>
-						<CarryWeight>35</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Chitine"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Chitine"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Dwarf.xml b/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Dwarf.xml
deleted file mode 100644
index a6f93ce944..0000000000
--- a/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Dwarf.xml	
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forgotten Realms</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Dwarf"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Dwarf"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Dwarf"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Dwarf"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency>0.5</NightVisionEfficiency>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>0.8</MeleeCritChance>
-						<MeleeParryChance>0.8</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Dwarf"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hand</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.19</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hand</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.19</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.19</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Dwarf"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_ElfBase.xml b/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_ElfBase.xml
deleted file mode 100644
index c795f916f4..0000000000
--- a/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_ElfBase.xml	
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forgotten Realms</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_ElfBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_ElfBase"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_ElfBase"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_ElfBase"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency>0.4</NightVisionEfficiency>
-						<MeleeDodgeChance>1.1</MeleeDodgeChance>
-						<MeleeCritChance>0.8</MeleeCritChance>
-						<MeleeParryChance>0.85</MeleeParryChance>
-						<CarryWeight>35</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_ElfBase"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_ElfBase"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Firbolg.xml b/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Firbolg.xml
deleted file mode 100644
index 32129afd7e..0000000000
--- a/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Firbolg.xml	
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forgotten Realms</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Firbolg"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Firbolg"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Firbolg"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Firbolg"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Firbolg"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Firbolg"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Gith.xml b/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Gith.xml
deleted file mode 100644
index e231f11868..0000000000
--- a/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Gith.xml	
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forgotten Realms</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Gith"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Gith"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Gith"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Gith"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency>0.4</NightVisionEfficiency>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Gith"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Gith"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Goblin.xml b/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Goblin.xml
deleted file mode 100644
index 3da885f0ac..0000000000
--- a/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Goblin.xml	
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forgotten Realms</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Goblins stand about as tall as a child, with strength and wits to match. -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Goblin"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Goblin"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Goblin"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<!-- Goblins are cowardly, cruel, brutal, and not very smart. -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Goblin"]/alienRace/generalSettings/forcedRaceTraitEntries</xpath>
-					<value>
-						<li>
-							<defName>Beauty</defName>
-							<degree>-1</degree>
-							<chance>20</chance>
-						</li>
-						<li>
-							<defName>Greedy</defName>
-							<chance>20</chance>
-						</li>
-						<li>
-							<defName>Bravery</defName>
-							<degree>-1</degree>
-							<chance>20</chance>
-						</li>
-					</value>
-				</li>
-
-				<!-- The only good goblins are the ones who never come out of their holes. -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Goblin"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency>0.4</NightVisionEfficiency>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>0.6</MeleeCritChance>
-						<MeleeParryChance>0.8</MeleeParryChance>
-						<CarryWeight>20</CarryWeight>
-						<CarryBulk>15</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Goblin"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hand</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.19</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hand</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.19</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.19</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Goblins aren't bright, but they're not fools. -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Goblin"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_HalfOrcs.xml b/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_HalfOrcs.xml
deleted file mode 100644
index 29ff6d0eeb..0000000000
--- a/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_HalfOrcs.xml	
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forgotten Realms</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- You just *know* there's a human bard somewhere out there that's responsible for this. -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_HalfOrc"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_HalfOrc"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_HalfOrc"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<!-- The average half-orc is both larger and taller than your average human. -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_HalfOrc"]/race/baseBodySize</xpath>
-					<value>
-						<baseBodySize>1.1</baseBodySize>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_HalfOrc"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4.35</MoveSpeed>
-					</value>
-				</li>
-
-				<!-- Half-orcs benefit from their hybrid parents, mixing human agility with orc strength. -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_HalfOrc"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.95</MeleeDodgeChance>
-						<MeleeCritChance>1.05</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<SmokeSensitivity>0.90</SmokeSensitivity>
-						<CarryWeight>41</CarryWeight>
-						<CarryBulk>22</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_HalfOrc"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.42</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.42</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>4.88</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.875</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.57</cooldownTime>
-								<chanceFactor>0.33</chanceFactor>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_HalfOrc"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Halfing.xml b/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Halfing.xml
deleted file mode 100644
index c09ac234d5..0000000000
--- a/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Halfing.xml	
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forgotten Realms</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Halfling"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Halfling"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Halfling"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Halfling"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1.1</MeleeDodgeChance>
-						<MeleeCritChance>0.8</MeleeCritChance>
-						<MeleeParryChance>0.85</MeleeParryChance>
-						<CarryWeight>35</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Halfling"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Halfling"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Hobgoblins.xml b/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Hobgoblins.xml
deleted file mode 100644
index fd32acc9b2..0000000000
--- a/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Hobgoblins.xml	
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forgotten Realms</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Hobgoblin"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Hobgoblin"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Hobgoblin"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<!-- Goblins are cowardly, cruel, and brutal. This extendeds to their larger breathern. -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Hobgoblin"]/alienRace/generalSettings/forcedRaceTraitEntries</xpath>
-					<value>
-						<li>
-							<defName>Beauty</defName>
-							<degree>-1</degree>
-							<chance>20</chance>
-						</li>
-						<li>
-							<defName>Greedy</defName>
-							<chance>10</chance>
-						</li>
-						<li>
-							<defName>Xenophobia</defName>
-							<degree>-1</degree>
-							<chance>10</chance>
-						</li>
-					</value>
-				</li>
-
-				<!-- The typical hobgoblin stands slightly taller than the average human. -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Hobgoblin"]/race/baseBodySize</xpath>
-					<value>
-						<baseBodySize>1.15</baseBodySize>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Hobgoblin"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4.3</MoveSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Hobgoblin"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.90</MeleeDodgeChance>
-						<MeleeCritChance>1.1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<SmokeSensitivity>1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Hobgoblin"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>4.96</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.938</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.57</cooldownTime>
-								<chanceFactor>0.33</chanceFactor>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Hobgoblin"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Illlithids.xml b/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Illlithids.xml
deleted file mode 100644
index dc8bbe3a34..0000000000
--- a/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Illlithids.xml	
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forgotten Realms</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Illithid"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Illithid"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Illithid"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Illithid"]/race/baseBodySize</xpath>
-					<value>
-						<baseBodySize>1</baseBodySize>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Illithid"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency>0.6</NightVisionEfficiency>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<SmokeSensitivity>1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Illithid"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>4.96</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.938</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.57</cooldownTime>
-								<chanceFactor>0.33</chanceFactor>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Illithid"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Killoren.xml b/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Killoren.xml
deleted file mode 100644
index 432f7d65d8..0000000000
--- a/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Killoren.xml	
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forgotten Realms</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Killoren"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Killoren"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Killoren"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Killoren"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1.1</MeleeDodgeChance>
-						<MeleeCritChance>0.8</MeleeCritChance>
-						<MeleeParryChance>0.85</MeleeParryChance>
-						<CarryWeight>35</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Killoren"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Killoren"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Kobold.xml b/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Kobold.xml
deleted file mode 100644
index e82b46b147..0000000000
--- a/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Kobold.xml	
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forgotten Realms</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Kobold"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Kobold"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Kobold"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Kobold"]/alienRace/generalSettings</xpath>
-					<value>
-						<forcedRaceTraitEntries>
-							<li>
-								<defName>Xenophobia</defName>
-								<degree>1</degree>
-								<chance>20</chance>
-							</li>
-						</forcedRaceTraitEntries>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Kobold"]/race/baseBodySize</xpath>
-					<value>
-						<baseBodySize>0.6</baseBodySize>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Kobold"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency>0.4</NightVisionEfficiency>
-						<CarryWeight>40</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-						<MeleeDodgeChance>1.1</MeleeDodgeChance>
-						<MeleeCritChance>0.4</MeleeCritChance>
-						<MeleeParryChance>0.5</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Kobold"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.57</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.57</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.46</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Kobold"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Orcs.xml b/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Orcs.xml
deleted file mode 100644
index d5e21c60c9..0000000000
--- a/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Orcs.xml	
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forgotten Realms</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Orc"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Orc"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Orc"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<!-- Orcs are markedly larger than your average human. -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Orc"]/race/baseBodySize</xpath>
-					<value>
-						<baseBodySize>1.3</baseBodySize>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Orc"]/alienRace/generalSettings/disallowedTraits/li[defName="Undergrounder"]</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Orc"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.70</MeleeDodgeChance>
-						<MeleeCritChance>1.10</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<SmokeSensitivity>0.80</SmokeSensitivity>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>30</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Orc"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.66</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.66</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>5.05</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.57</cooldownTime>
-								<chanceFactor>0.33</chanceFactor>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.08</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- While hardly remarkable for their intellectual prowess, orcs are nonetheless smart enough to take cover when arrows start flying. -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Orc"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Tabaxi.xml b/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Tabaxi.xml
deleted file mode 100644
index 3711e51974..0000000000
--- a/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Tabaxi.xml	
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forgotten Realms</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Tabaxi"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Tabaxi"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Tabaxi"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Tabaxi"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency>0.4</NightVisionEfficiency>
-						<MeleeDodgeChance>1.1</MeleeDodgeChance>
-						<MeleeCritChance>0.8</MeleeCritChance>
-						<MeleeParryChance>0.8</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Tabaxi"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.15</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.15</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.923</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Tabaxi"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Tieflings.xml b/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Tieflings.xml
deleted file mode 100644
index e2ef8b40a8..0000000000
--- a/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Tieflings.xml	
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forgotten Realms</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Tiefling"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Tiefling"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Tiefling"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Tiefling"]/alienRace/generalSettings/forcedRaceTraitEntries</xpath>
-					<value>
-						<li>
-							<defName>Beauty</defName>
-							<degree>1</degree>
-							<chance>10</chance>
-						</li>
-						<li>
-							<defName>Bloodlust</defName>
-							<chance>20</chance>
-						</li>
-					</value>
-				</li>
-
-				<!-- Tieflings generally have slightly better reflexes than your standard human, and an innate resistance to heat. -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Tiefling"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1.1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<ArmorRating_Heat>0.20</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Tiefling"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Tiefling"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Warforged.xml b/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Warforged.xml
deleted file mode 100644
index 1a66758f64..0000000000
--- a/Patches/O21 Forgotten Realms/ThingDefs_Races/Race_Warforged.xml	
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Forgotten Realms</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Warforged"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Warforged"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Warforged"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<!-- Warforged are generally slightly larger than your average human. -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Warforged"]/race/baseBodySize</xpath>
-					<value>
-						<baseBodySize>1.1</baseBodySize>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Warforged"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.9</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<SmokeSensitivity>0.00</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Warforged"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Warforged"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Warforged"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4.4</MoveSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Warforged"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_FR_Warforged"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Mechadroids/Bodies_Mechadroids.xml b/Patches/O21 Mechadroids/Bodies_Mechadroids.xml
deleted file mode 100644
index 6282bc5de8..0000000000
--- a/Patches/O21 Mechadroids/Bodies_Mechadroids.xml	
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[O21] Mechadroids</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "O21_Mechadroid"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "O21_Mechadroid"]/corePart/parts/li[def = "MechanicalNeck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "O21_Mechadroid"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def = "Head"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "O21_Mechadroid"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def = "Head"]/parts/li[def="HearingSensor"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "O21_Mechadroid"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def = "Head"]/parts/li[def="HearingSensor"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "O21_Mechadroid"]/corePart/parts/li[def = "MechanicalShoulder"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "O21_Mechadroid"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def = "MechanicalArm"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "O21_Mechadroid"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def = "MechanicalArm"]/parts/li[def = "MechanicalHand"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "O21_Mechadroid"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def = "MechanicalArm"]/parts/li[def = "MechanicalHand"]/parts/li[def = "MechanicalFinger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "O21_Mechadroid"]/corePart/parts/li[def = "MechanicalLeg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "O21_Mechadroid"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def = "MechanicalFoot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="O21_Mechadroid"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
-					<value>
-						<li>LeftShoulder</li>
-						<li>Shoulders</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="O21_Mechadroid"]/corePart/parts/li[customLabel="right mechanical shoulder"]/groups</xpath>
-					<value>
-						<li>RightShoulder</li>
-						<li>Shoulders</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="O21_Mechadroid"]/corePart/parts/li[customLabel="left shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
-					<value>
-						<li>LeftArm</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="O21_Mechadroid"]/corePart/parts/li[customLabel="right mechanical shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
-					<value>
-						<li>RightArm</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Mechadroids/PawnKinds_Misc.xml b/Patches/O21 Mechadroids/PawnKinds_Misc.xml
deleted file mode 100644
index c55008ce6b..0000000000
--- a/Patches/O21 Mechadroids/PawnKinds_Misc.xml	
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[O21] Mechadroids</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Give ammo to droids ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>
-						Defs/PawnKindDef[defName="O21_Mechadroid_Villager" or defName="O21_Mechadroid_Primus"]
-					</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>
-						Defs/PawnKindDef[defName="O21_Mechadroid_Guard"]
-					</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>7</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Mechadroids/Race_Mechadroids.xml b/Patches/O21 Mechadroids/Race_Mechadroids.xml
deleted file mode 100644
index 110799ecd8..0000000000
--- a/Patches/O21 Mechadroids/Race_Mechadroids.xml	
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[O21] Mechadroids</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="O21_BaseMechadroid"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="O21_BaseMechadroid"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="O21_BaseMechadroid"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="O21_BaseMechadroid"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.9</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<SmokeSensitivity>0.00</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="O21_BaseMechadroid"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="O21_BaseMechadroid"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_MechadroidAlpha" or defName="O21_Alien_MechadroidGamma"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_MechadroidDelta"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.56</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.550</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.56</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.550</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>4.89</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.250</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="O21_BaseMechadroid"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Mechadroids/ThingDefs_Items.xml b/Patches/O21 Mechadroids/ThingDefs_Items.xml
deleted file mode 100644
index 9b354cc8cb..0000000000
--- a/Patches/O21 Mechadroids/ThingDefs_Items.xml	
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[O21] Mechadroids</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_MechanoidParts"]/statBases</xpath>
-					<value>
-						<Bulk>0.75</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_MechanoidRepairKit"]/statBases</xpath>
-					<value>
-						<Bulk>1.25</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_MechanoidPowerCell"]/statBases</xpath>
-					<value>
-						<Bulk>0.05</Bulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outer Rim Galaxies/Chiss/Patch_OuterRim_Chiss_PawnKinds.xml b/Patches/O21 Outer Rim Galaxies/Chiss/Patch_OuterRim_Chiss_PawnKinds.xml
deleted file mode 100644
index 016a12e5bc..0000000000
--- a/Patches/O21 Outer Rim Galaxies/Chiss/Patch_OuterRim_Chiss_PawnKinds.xml	
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[O21] Outer Rim Galaxies</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/PawnKindDef[defName="O21_OR_ChissAscendancy_Trooper"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/PawnKindDef[defName="O21_OR_ChissAscendancy_Trooper" or defName="O21_OR_ChissAscendancy_Officer" or defName="O21_OR_ChissAscendancy_Trader" or defName="O21_OR_ChissAscendancy_Syndic"]</xpath>
-								<value>
-									<li Class="CombatExtended.LoadoutPropertiesExtension">
-										<primaryMagazineCount>
-											<min>5</min>
-											<max>12</max>
-										</primaryMagazineCount>
-									</li>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outer Rim Galaxies/Chiss/Patch_OuterRim_Chiss_Races.xml b/Patches/O21 Outer Rim Galaxies/Chiss/Patch_OuterRim_Chiss_Races.xml
deleted file mode 100644
index 2eb169858b..0000000000
--- a/Patches/O21 Outer Rim Galaxies/Chiss/Patch_OuterRim_Chiss_Races.xml	
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[O21] Outer Rim Galaxies</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Chiss"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Chiss"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>Humanoid</bodyShape>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Chiss"]/statBases</xpath>
-								<value>
-									<CarryWeight>40</CarryWeight>
-									<CarryBulk>20</CarryBulk>
-									<MeleeDodgeChance>1</MeleeDodgeChance>
-									<MeleeCritChance>1</MeleeCritChance>
-									<MeleeParryChance>1</MeleeParryChance>
-									<SmokeSensitivity>1</SmokeSensitivity>
-								</value>
-							</li>
-
-							<li Class="PatchOperationConditional">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Chiss"]/comps</xpath>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Chiss"]</xpath>
-									<value>
-										<comps />
-									</value>
-								</nomatch>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Chiss"]/comps</xpath>
-								<value>
-									<li>
-										<compClass>CombatExtended.CompPawnGizmo</compClass>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Chiss"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>left fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>4.49</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outer Rim Galaxies/Chiss/Patch_OuterRim_Chiss_Weapons.xml b/Patches/O21 Outer Rim Galaxies/Chiss/Patch_OuterRim_Chiss_Weapons.xml
deleted file mode 100644
index 709b9243ab..0000000000
--- a/Patches/O21 Outer Rim Galaxies/Chiss/Patch_OuterRim_Chiss_Weapons.xml	
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[O21] Outer Rim Galaxies</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="O21_OR_ChissRifle"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[
-									defName="O21_OR_ChissRifle" or
-									defName="O21_OR_ChissCarbine"
-									]/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>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[
-									defName="O21_OR_ChissPistol"
-									]/tools </xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>grip</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>1.54</cooldownTime>
-											<chanceFactor>1.5</chanceFactor>
-											<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-											<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>muzzle</label>
-											<capacities>
-												<li>Poke</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>1.54</cooldownTime>
-											<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-											<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>O21_OR_ChissRifle</defName>
-								<statBases>
-									<SightsEfficiency>1.0</SightsEfficiency>
-									<ShotSpread>0.14</ShotSpread>
-									<SwayFactor>1.01</SwayFactor>
-									<Bulk>6.35</Bulk>
-									<Mass>3.5</Mass>
-									<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-								</statBases>
-								<Properties>
-									<recoilAmount>1.53</recoilAmount>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_OR_Blaster_Blue_Chiss</defaultProjectile>
-									<warmupTime>0.8</warmupTime>
-									<burstShotCount>3</burstShotCount>
-									<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-									<range>40</range>
-									<soundCast>O21_Shot_BlasterBolt</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<FireModes>
-									<aimedBurstShotCount>2</aimedBurstShotCount>
-									<aiUseBurstMode>FALSE</aiUseBurstMode>
-									<aiAimMode>AimedShot</aiAimMode>
-								</FireModes>
-								<AmmoUser>
-									<magazineSize>24</magazineSize>
-									<reloadTime>4.5</reloadTime>
-									<ammoSet>AmmoSet_PlasmaGasCartridgeChiss</ammoSet>
-								</AmmoUser>
-							</li>
-
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>O21_OR_ChissPistol</defName>
-								<statBases>
-									<SightsEfficiency>0.7</SightsEfficiency>
-									<ShotSpread>0.18</ShotSpread>
-									<SwayFactor>0.87</SwayFactor>
-									<Bulk>1.75</Bulk>
-									<Mass>1.5</Mass>
-									<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-								</statBases>
-								<Properties>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_OR_Blaster_Blue_Chiss</defaultProjectile>
-									<warmupTime>0.6</warmupTime>
-									<range>25</range>
-									<soundCast>O21_Shot_BlasterBolt</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<FireModes />
-								<AmmoUser>
-									<magazineSize>15</magazineSize>
-									<reloadTime>3</reloadTime>
-									<ammoSet>AmmoSet_PlasmaGasCartridgeChiss</ammoSet>
-								</AmmoUser>
-							</li>
-
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>O21_OR_ChissCarbine</defName>
-								<statBases>
-									<SightsEfficiency>1.0</SightsEfficiency>
-									<ShotSpread>0.14</ShotSpread>
-									<SwayFactor>1.34</SwayFactor>
-									<Bulk>7.20</Bulk>
-									<Mass>3.5</Mass>
-									<RangedWeapon_Cooldown>.5</RangedWeapon_Cooldown>
-								</statBases>
-								<Properties>
-									<recoilAmount>1.22</recoilAmount>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_OR_Blaster_Blue_Chiss</defaultProjectile>
-									<warmupTime>0.6</warmupTime>
-									<burstShotCount>5</burstShotCount>
-									<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-									<range>30</range>
-									<soundCast>O21_Shot_BlasterBolt</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<FireModes>
-									<aimedBurstShotCount>2</aimedBurstShotCount>
-									<aiUseBurstMode>FALSE</aiUseBurstMode>
-									<aiAimMode>AimedShot</aiAimMode>
-								</FireModes>
-								<AmmoUser>
-									<magazineSize>24</magazineSize>
-									<reloadTime>4</reloadTime>
-									<ammoSet>AmmoSet_PlasmaGasCartridgeChiss</ammoSet>
-								</AmmoUser>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outer Rim Galaxies/Clone Wars/Patch_OuterRim_CloneWars_Apparel.xml b/Patches/O21 Outer Rim Galaxies/Clone Wars/Patch_OuterRim_CloneWars_Apparel.xml
deleted file mode 100644
index e7019cf7bd..0000000000
--- a/Patches/O21 Outer Rim Galaxies/Clone Wars/Patch_OuterRim_CloneWars_Apparel.xml	
+++ /dev/null
@@ -1,387 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[O21] Outer Rim Galaxies</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="O21_OR_CloneArmor_PhaseOne"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<!-- Jedi Armor -->
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="O21_OR_JediGeneralPauldron"]/statBases</xpath>
-								<value>
-									<Bulk>10</Bulk>
-									<WornBulk>5</WornBulk>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="O21_OR_JediGeneralPauldron"]/statBases/MaxHitPoints</xpath>
-								<value>
-									<MaxHitPoints>125</MaxHitPoints>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="O21_OR_JediGeneralPauldron"]/statBases/Mass</xpath>
-								<value>
-									<Mass>8</Mass>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="O21_OR_JediGeneralPauldron"]/statBases/ArmorRating_Sharp</xpath>
-								<value>
-									<ArmorRating_Sharp>16</ArmorRating_Sharp>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="O21_OR_JediGeneralPauldron"]/statBases/ArmorRating_Blunt</xpath>
-								<value>
-									<ArmorRating_Blunt>14</ArmorRating_Blunt>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="O21_OR_JediGeneralPauldron"]/statBases/ArmorRating_Heat</xpath>
-								<value>
-									<ArmorRating_Heat>0.65</ArmorRating_Heat>
-								</value>
-							</li>
-
-							<!-- Clone Armor -->
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[@Name="CloneArmorPhaseOneCuirassBase"]/statBases/ArmorRating_Sharp</xpath>
-								<value>
-									<ArmorRating_Sharp>16</ArmorRating_Sharp>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[@Name="CloneArmorPhaseOneCuirassBase"]/statBases/ArmorRating_Blunt</xpath>
-								<value>
-									<ArmorRating_Blunt>15</ArmorRating_Blunt>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[@Name="CloneArmorPhaseOneCuirassBase"]/statBases/ArmorRating_Heat</xpath>
-								<value>
-									<ArmorRating_Heat>0.60</ArmorRating_Heat>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[@Name="CloneArmorPhaseOneCuirassBase"]/apparel/layers</xpath>
-								<value>
-									<li>Shell</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[@Name="CloneArmorPhaseOneCuirassBase"]/statBases/Mass</xpath>
-								<value>
-									<Mass>10</Mass>
-									<Bulk>80</Bulk>
-									<WornBulk>15</WornBulk>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[@Name="CloneArmorPhaseOneCuirassBase"]/statBases/MaxHitPoints</xpath>
-								<value>
-									<MaxHitPoints>200</MaxHitPoints>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[@Name="CloneArmorPhaseOneCuirassBase"]</xpath>
-								<value>
-									<equippedStatOffsets>
-										<ToxicEnvironmentResistance>0.40</ToxicEnvironmentResistance>
-										<CarryBulk>25</CarryBulk>
-									</equippedStatOffsets>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[@Name="CloneCuirassIIBase"]/statBases/ArmorRating_Sharp</xpath>
-								<value>
-									<ArmorRating_Sharp>17.5</ArmorRating_Sharp>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[@Name="CloneCuirassIIBase"]/statBases/ArmorRating_Blunt</xpath>
-								<value>
-									<ArmorRating_Blunt>18</ArmorRating_Blunt>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[@Name="CloneCuirassIIBase"]/statBases/ArmorRating_Heat</xpath>
-								<value>
-									<ArmorRating_Heat>0.60</ArmorRating_Heat>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[@Name="CloneCuirassIIBase"]/apparel/layers</xpath>
-								<value>
-									<li>Shell</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[@Name="CloneCuirassIIBase"]/statBases/Mass</xpath>
-								<value>
-									<Mass>10</Mass>
-									<Bulk>80</Bulk>
-									<WornBulk>15</WornBulk>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[@Name="CloneCuirassIIBase"]/statBases/MaxHitPoints</xpath>
-								<value>
-									<MaxHitPoints>250</MaxHitPoints>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[@Name="CloneCuirassIIBase"]</xpath>
-								<value>
-									<equippedStatOffsets>
-										<ToxicEnvironmentResistance>0.40</ToxicEnvironmentResistance>
-										<CarryBulk>30</CarryBulk>
-									</equippedStatOffsets>
-								</value>
-							</li>
-
-							<!-- Clone Helmets -->
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[@Name="CloneArmorPhaseOneHelmetBase"]/statBases</xpath>
-								<value>
-									<Bulk>4</Bulk>
-									<WornBulk>1</WornBulk>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[@Name="CloneArmorPhaseOneHelmetBase"]/statBases/MaxHitPoints</xpath>
-								<value>
-									<MaxHitPoints>190</MaxHitPoints>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[@Name="CloneArmorPhaseOneHelmetBase"]/statBases/ArmorRating_Sharp</xpath>
-								<value>
-									<ArmorRating_Sharp>12</ArmorRating_Sharp>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[@Name="CloneArmorPhaseOneHelmetBase"]/statBases/ArmorRating_Blunt</xpath>
-								<value>
-									<ArmorRating_Blunt>15</ArmorRating_Blunt>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[@Name="CloneArmorPhaseOneHelmetBase"]/statBases/ArmorRating_Heat</xpath>
-								<value>
-									<ArmorRating_Heat>0.34</ArmorRating_Heat>
-								</value>
-							</li>
-
-							<li Class="PatchOperationConditional">
-								<xpath>Defs/ThingDef[@Name="CloneArmorPhaseOneHelmetBase"]/apparel/immuneToToxGasExposure</xpath>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/ThingDef[@Name="CloneArmorPhaseOneHelmetBase"]/apparel</xpath>
-									<value>
-										<immuneToToxGasExposure>true</immuneToToxGasExposure>
-									</value>
-								</nomatch>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[@Name="CloneArmorPhaseOneHelmetBase"]</xpath>
-								<value>
-									<equippedStatOffsets>
-										<AimingAccuracy>0.1</AimingAccuracy>
-										<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-										<SmokeSensitivity>-1</SmokeSensitivity>
-									</equippedStatOffsets>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[@Name="CloneArmorPhaseOneHelmetBase"]/apparel/layers</xpath>
-								<value>
-									<li>OnHead</li>
-									<li>StrappedHead</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[@Name="CloneHelmetIIBase"]/statBases</xpath>
-								<value>
-									<Bulk>4</Bulk>
-									<WornBulk>1</WornBulk>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[@Name="CloneHelmetIIBase"]/statBases/MaxHitPoints</xpath>
-								<value>
-									<MaxHitPoints>210</MaxHitPoints>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[@Name="CloneHelmetIIBase"]/statBases/ArmorRating_Sharp</xpath>
-								<value>
-									<ArmorRating_Sharp>13.5</ArmorRating_Sharp>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[@Name="CloneHelmetIIBase"]/statBases/ArmorRating_Blunt</xpath>
-								<value>
-									<ArmorRating_Blunt>25</ArmorRating_Blunt>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[@Name="CloneHelmetIIBase"]/statBases/ArmorRating_Heat</xpath>
-								<value>
-									<ArmorRating_Heat>0.34</ArmorRating_Heat>
-								</value>
-							</li>
-
-							<li Class="PatchOperationConditional">
-								<xpath>Defs/ThingDef[@Name="CloneHelmetIIBase"]/apparel/immuneToToxGasExposure</xpath>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/ThingDef[@Name="CloneHelmetIIBase"]/apparel</xpath>
-									<value>
-										<immuneToToxGasExposure>true</immuneToToxGasExposure>
-									</value>
-								</nomatch>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[@Name="CloneHelmetIIBase"]</xpath>
-								<value>
-									<equippedStatOffsets>
-										<AimingAccuracy>0.1</AimingAccuracy>
-										<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-										<SmokeSensitivity>-1</SmokeSensitivity>
-									</equippedStatOffsets>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[@Name="CloneHelmetIIBase"]/apparel/layers</xpath>
-								<value>
-									<li>OnHead</li>
-									<li>StrappedHead</li>
-								</value>
-							</li>
-
-							<!-- Clone Pauldrons -->
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[@Name="CloneArmorPhaseOnePauldronBase"]/statBases/ArmorRating_Sharp</xpath>
-								<value>
-									<ArmorRating_Sharp>13</ArmorRating_Sharp>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[@Name="CloneArmorPhaseOnePauldronBase"]/statBases/ArmorRating_Blunt</xpath>
-								<value>
-									<ArmorRating_Blunt>15</ArmorRating_Blunt>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[@Name="CloneArmorPhaseOnePauldronBase"]/statBases/ArmorRating_Heat</xpath>
-								<value>
-									<ArmorRating_Heat>0.34</ArmorRating_Heat>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[@Name="CloneArmorPhaseOnePauldronBase"]/statBases/Mass</xpath>
-								<value>
-									<Mass>4</Mass>
-									<Bulk>10</Bulk>
-									<WornBulk>1</WornBulk>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[@Name="CloneArmorPhaseOnePauldronBase"]/statBases/MaxHitPoints</xpath>
-								<value>
-									<MaxHitPoints>150</MaxHitPoints>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[@Name="ClonePauldronsIIBase"]/statBases/ArmorRating_Sharp</xpath>
-								<value>
-									<ArmorRating_Sharp>14.5</ArmorRating_Sharp>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[@Name="ClonePauldronsIIBase"]/statBases/ArmorRating_Blunt</xpath>
-								<value>
-									<ArmorRating_Blunt>30</ArmorRating_Blunt>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[@Name="ClonePauldronsIIBase"]/statBases/ArmorRating_Heat</xpath>
-								<value>
-									<ArmorRating_Heat>0.34</ArmorRating_Heat>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[@Name="ClonePauldronsIIBase"]/statBases/Mass</xpath>
-								<value>
-									<Mass>4</Mass>
-									<Bulk>10</Bulk>
-									<WornBulk>1</WornBulk>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[@Name="ClonePauldronsIIBase"]/statBases/MaxHitPoints</xpath>
-								<value>
-									<MaxHitPoints>180</MaxHitPoints>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outer Rim Galaxies/Clone Wars/Patch_OuterRim_CloneWars_Pawnkinds.xml b/Patches/O21 Outer Rim Galaxies/Clone Wars/Patch_OuterRim_CloneWars_Pawnkinds.xml
deleted file mode 100644
index e6f57b1d23..0000000000
--- a/Patches/O21 Outer Rim Galaxies/Clone Wars/Patch_OuterRim_CloneWars_Pawnkinds.xml	
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[O21] Outer Rim Galaxies</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/PawnKindDef[@Name="BaseConfederacyDroidPawn"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/PawnKindDef[@Name="BaseConfederacyDroidPawn"]</xpath>
-								<value>
-									<li Class="CombatExtended.LoadoutPropertiesExtension">
-										<primaryMagazineCount>
-											<min>5</min>
-											<max>12</max>
-										</primaryMagazineCount>
-									</li>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/PawnKindDef[@Name="O21_OR_CloneP2Base"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/PawnKindDef[
-									defName="O21_OR_CloneP2Trader" or
-									defName="O21_OR_CloneP2Trooper" or
-									defName="O21_OR_CloneP2Heavy" or
-									defName="O21_OR_CloneP2Trooper_Desert" or
-									defName="O21_OR_CloneP2Trooper_Snow" or
-									defName="O21_OR_CloneP2Engineer" or
-									defName="O21_OR_CloneP2Operative" or
-									defName="O21_OR_CloneP2Pilot" or
-									defName="O21_OR_CloneP2Captain" or
-									defName="O21_OR_CloneP2Commander"
-									] </xpath>
-								<value>
-									<li Class="CombatExtended.LoadoutPropertiesExtension">
-										<primaryMagazineCount>
-											<min>5</min>
-											<max>12</max>
-										</primaryMagazineCount>
-									</li>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outer Rim Galaxies/Clone Wars/Patch_OuterRim_CloneWars_Races.xml b/Patches/O21 Outer Rim Galaxies/Clone Wars/Patch_OuterRim_CloneWars_Races.xml
deleted file mode 100644
index 03f59eb805..0000000000
--- a/Patches/O21 Outer Rim Galaxies/Clone Wars/Patch_OuterRim_CloneWars_Races.xml	
+++ /dev/null
@@ -1,320 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[O21] Outer Rim Galaxies</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_CloneTrooper"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="O21_OR_BaseHumanoidDroid"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>Humanoid</bodyShape>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/HediffDef[defName="O21_OR_CloneConditioning"]/stages/li[1]/statOffsets</xpath>
-								<value>
-									<Suppressability>-0.025</Suppressability>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/HediffDef[defName="O21_OR_CloneConditioning"]/stages/li[2]/statOffsets</xpath>
-								<value>
-									<Suppressability>-0.05</Suppressability>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/HediffDef[defName="O21_OR_CloneConditioning"]/stages/li[3]/statOffsets</xpath>
-								<value>
-									<Suppressability>-0.075</Suppressability>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/HediffDef[defName="O21_OR_CloneConditioning"]/stages/li[4]/statOffsets</xpath>
-								<value>
-									<Suppressability>-0.1</Suppressability>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/HediffDef[defName="O21_OR_CloneConditioning"]/stages/li[5]/statOffsets</xpath>
-								<value>
-									<Suppressability>-0.125</Suppressability>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/HediffDef[defName="O21_OR_CloneConditioning"]/stages/li[6]/statOffsets</xpath>
-								<value>
-									<Suppressability>-0.15</Suppressability>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/HediffDef[defName="O21_OR_CloneConditioning"]/stages/li[7]/statOffsets</xpath>
-								<value>
-									<Suppressability>-0.175</Suppressability>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/HediffDef[defName="O21_OR_CloneConditioning"]/stages/li[8]/statOffsets</xpath>
-								<value>
-									<Suppressability>-0.2</Suppressability>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="O21_OR_BaseHumanoidDroid"]/statBases</xpath>
-								<value>
-									<CarryWeight>40</CarryWeight>
-									<CarryBulk>50</CarryBulk>
-									<MeleeDodgeChance>0.20</MeleeDodgeChance>
-									<MeleeCritChance>0.20</MeleeCritChance>
-									<MeleeParryChance>0.10</MeleeParryChance>
-									<SmokeSensitivity>0</SmokeSensitivity>
-								</value>
-							</li>
-
-							<li Class="PatchOperationConditional">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="O21_OR_BaseHumanoidDroid"]/comps</xpath>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="O21_OR_BaseHumanoidDroid"]</xpath>
-									<value>
-										<comps />
-									</value>
-								</nomatch>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="O21_OR_BaseHumanoidDroid"]/comps</xpath>
-								<value>
-									<li>
-										<compClass>CombatExtended.CompPawnGizmo</compClass>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_BattleDroid" or defName="O21_OR_SuperTacticalDroid" or defName="O21_OR_TacticalDroid"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>left fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>4.49</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_BattleDroid"]/statBases/MoveSpeed</xpath>
-								<value>
-									<MoveSpeed>4.4</MoveSpeed>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_MagnaGuardDroid"]/statBases</xpath>
-								<value>
-									<MeleeParryChance>1</MeleeParryChance>
-									<AimingAccuracy>0.7</AimingAccuracy>
-									<ShootingAccuracyPawn>0.7</ShootingAccuracyPawn>
-									<MeleeCritChance>1</MeleeCritChance>
-									<MeleeDodgeChance>1</MeleeDodgeChance>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_MagnaGuardDroid"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>left fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>3</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>3</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>4</power>
-											<cooldownTime>4.49</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_CommandoDroid"]/statBases</xpath>
-								<value>
-									<MeleeParryChance>1.2</MeleeParryChance>
-									<MeleeCritChance>1.2</MeleeCritChance>
-									<MeleeDodgeChance>1.2</MeleeDodgeChance>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_CommandoDroid"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>left fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>3</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>3</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>4</power>
-											<cooldownTime>4.49</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_SuperBattleDroid"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>left fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>5</power>
-											<cooldownTime>2.64</cooldownTime>
-											<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.525</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>5</power>
-											<cooldownTime>2.64</cooldownTime>
-											<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.525</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_DestroyerDroid"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>left fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outer Rim Galaxies/Clone Wars/Patch_OuterRim_CloneWars_Weapons.xml b/Patches/O21 Outer Rim Galaxies/Clone Wars/Patch_OuterRim_CloneWars_Weapons.xml
deleted file mode 100644
index fb8f101390..0000000000
--- a/Patches/O21 Outer Rim Galaxies/Clone Wars/Patch_OuterRim_CloneWars_Weapons.xml	
+++ /dev/null
@@ -1,455 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[O21] Outer Rim Galaxies</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="O21_OR_DC15ARifle"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[
-									defName="O21_OR_DC15ACarbine" or
-									defName="O21_OR_Z6RotaryBlaster" or
-									defName="O21_OR_DC15xSniperRifle" or
-									defName="O21_OR_DC17mCarbine" or
-									defName="O21_OR_E5Blaster" or
-									defName="O21_OR_E5sSniperRifle" or
-									defName="O21_OR_DC15ARifle"
-									]/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>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[
-									defName="O21_OR_DC17HandBlaster" or
-									defName="O21_OR_RG4DBlaster"
-									]/tools </xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>grip</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>1.54</cooldownTime>
-											<chanceFactor>1.5</chanceFactor>
-											<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-											<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>muzzle</label>
-											<capacities>
-												<li>Poke</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>1.54</cooldownTime>
-											<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-											<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>O21_OR_DC15ACarbine</defName>
-								<statBases>
-									<SightsEfficiency>1.0</SightsEfficiency>
-									<ShotSpread>0.14</ShotSpread>
-									<SwayFactor>1.01</SwayFactor>
-									<Bulk>6.35</Bulk>
-									<Mass>3.5</Mass>
-									<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-								</statBases>
-								<Properties>
-									<recoilAmount>1.53</recoilAmount>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_OR_Blaster_Blue</defaultProjectile>
-									<warmupTime>0.8</warmupTime>
-									<burstShotCount>3</burstShotCount>
-									<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-									<range>40</range>
-									<soundCast>O21_Shot_BlasterBolt</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<FireModes>
-									<aimedBurstShotCount>2</aimedBurstShotCount>
-									<aiUseBurstMode>FALSE</aiUseBurstMode>
-									<aiAimMode>AimedShot</aiAimMode>
-								</FireModes>
-								<AmmoUser>
-									<magazineSize>24</magazineSize>
-									<reloadTime>4</reloadTime>
-									<ammoSet>AmmoSet_PlasmaGasCartridgeBlue</ammoSet>
-								</AmmoUser>
-							</li>
-
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>O21_OR_DC15ARifle</defName>
-								<statBases>
-									<SightsEfficiency>1.0</SightsEfficiency>
-									<ShotSpread>0.04</ShotSpread>
-									<SwayFactor>1.70</SwayFactor>
-									<Bulk>12.25</Bulk>
-									<Mass>4.3</Mass>
-									<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
-								</statBases>
-								<Properties>
-									<recoilAmount>1.73</recoilAmount>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_OR_Blaster_Blue</defaultProjectile>
-									<warmupTime>0.6</warmupTime>
-									<burstShotCount>5</burstShotCount>
-									<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
-									<range>55</range>
-									<soundCast>O21_Shot_BlasterBolt</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<FireModes>
-									<aimedBurstShotCount>3</aimedBurstShotCount>
-									<aiUseBurstMode>FALSE</aiUseBurstMode>
-									<aiAimMode>AimedShot</aiAimMode>
-								</FireModes>
-								<AmmoUser>
-									<magazineSize>20</magazineSize>
-									<reloadTime>4.5</reloadTime>
-									<ammoSet>AmmoSet_PlasmaGasCartridgeBlue</ammoSet>
-								</AmmoUser>
-							</li>
-
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>O21_OR_DC15xSniperRifle</defName>
-								<statBases>
-									<SightsEfficiency>2.4</SightsEfficiency>
-									<ShotSpread>0.02</ShotSpread>
-									<SwayFactor>1.9</SwayFactor>
-									<Bulk>12.25</Bulk>
-									<Mass>5</Mass>
-									<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-								</statBases>
-								<Properties>
-									<recoilAmount>1.48</recoilAmount>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_OR_Blaster_Blue</defaultProjectile>
-									<warmupTime>1.6</warmupTime>
-									<range>80</range>
-									<soundCast>O21_Shot_BlasterBolt</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<FireModes>
-									<aiAimMode>AimedShot</aiAimMode>
-								</FireModes>
-								<AmmoUser>
-									<magazineSize>10</magazineSize>
-									<reloadTime>4.5</reloadTime>
-									<ammoSet>AmmoSet_PlasmaGasCartridgeBlue</ammoSet>
-								</AmmoUser>
-							</li>
-
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>O21_OR_DC17HandBlaster</defName>
-								<statBases>
-									<SightsEfficiency>0.7</SightsEfficiency>
-									<ShotSpread>0.18</ShotSpread>
-									<SwayFactor>0.87</SwayFactor>
-									<Bulk>1.75</Bulk>
-									<Mass>1.5</Mass>
-									<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-								</statBases>
-								<Properties>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_OR_Blaster_Blue</defaultProjectile>
-									<warmupTime>0.6</warmupTime>
-									<range>25</range>
-									<soundCast>O21_Shot_BlasterBolt</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<FireModes />
-								<AmmoUser>
-									<magazineSize>15</magazineSize>
-									<reloadTime>3</reloadTime>
-									<ammoSet>AmmoSet_PlasmaGasCartridgeBlue</ammoSet>
-								</AmmoUser>
-							</li>
-
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>O21_OR_DC17mCarbine</defName>
-								<statBases>
-									<SightsEfficiency>1.0</SightsEfficiency>
-									<ShotSpread>0.14</ShotSpread>
-									<SwayFactor>1.34</SwayFactor>
-									<Bulk>7.20</Bulk>
-									<Mass>3.5</Mass>
-									<RangedWeapon_Cooldown>.5</RangedWeapon_Cooldown>
-								</statBases>
-								<Properties>
-									<recoilAmount>1.22</recoilAmount>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_OR_Blaster_Blue</defaultProjectile>
-									<warmupTime>0.6</warmupTime>
-									<burstShotCount>5</burstShotCount>
-									<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-									<range>30</range>
-									<soundCast>O21_Shot_BlasterBolt</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<FireModes>
-									<aimedBurstShotCount>2</aimedBurstShotCount>
-									<aiUseBurstMode>FALSE</aiUseBurstMode>
-									<aiAimMode>AimedShot</aiAimMode>
-								</FireModes>
-								<AmmoUser>
-									<magazineSize>25</magazineSize>
-									<reloadTime>3.5</reloadTime>
-									<ammoSet>AmmoSet_PlasmaGasCartridgeBlue</ammoSet>
-								</AmmoUser>
-							</li>
-
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>O21_OR_Z6RotaryBlaster</defName>
-								<statBases>
-									<SightsEfficiency>1.0</SightsEfficiency>
-									<ShotSpread>0.06</ShotSpread>
-									<SwayFactor>1.32</SwayFactor>
-									<Bulk>16.02</Bulk>
-									<Mass>30</Mass>
-									<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-								</statBases>
-								<Properties>
-									<recoilAmount>0.68</recoilAmount>
-									<recoilPattern>Mounted</recoilPattern>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_OR_Blaster_Blue</defaultProjectile>
-									<warmupTime>2.2</warmupTime>
-									<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-									<burstShotCount>100</burstShotCount>
-									<range>60</range>
-									<soundCast>O21_Shot_BlasterBolt</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<FireModes>
-									<aimedBurstShotCount>50</aimedBurstShotCount>
-									<aiUseBurstMode>FALSE</aiUseBurstMode>
-									<aiAimMode>SuppressFire</aiAimMode>
-								</FireModes>
-								<AmmoUser>
-									<magazineSize>300</magazineSize>
-									<reloadTime>9.5</reloadTime>
-									<ammoSet>AmmoSet_PlasmaGasCartridgeBlue</ammoSet>
-								</AmmoUser>
-							</li>
-
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>O21_OR_E5Blaster</defName>
-								<statBases>
-									<SightsEfficiency>1.0</SightsEfficiency>
-									<ShotSpread>0.14</ShotSpread>
-									<SwayFactor>1.34</SwayFactor>
-									<Bulk>7.20</Bulk>
-									<Mass>3</Mass>
-									<RangedWeapon_Cooldown>.65</RangedWeapon_Cooldown>
-								</statBases>
-								<Properties>
-									<recoilAmount>1.48</recoilAmount>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_OR_Blaster_Red</defaultProjectile>
-									<warmupTime>0.8</warmupTime>
-									<burstShotCount>3</burstShotCount>
-									<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-									<range>38</range>
-									<soundCast>O21_Shot_BlasterBolt</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<FireModes>
-									<aiAimMode>AimedShot</aiAimMode>
-								</FireModes>
-								<AmmoUser>
-									<magazineSize>24</magazineSize>
-									<reloadTime>4.5</reloadTime>
-									<ammoSet>AmmoSet_PlasmaGasCartridgeRed</ammoSet>
-								</AmmoUser>
-							</li>
-
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>O21_OR_E5sSniperRifle</defName>
-								<statBases>
-									<SightsEfficiency>2.4</SightsEfficiency>
-									<ShotSpread>0.02</ShotSpread>
-									<SwayFactor>1.9</SwayFactor>
-									<Bulk>12.25</Bulk>
-									<Mass>5</Mass>
-									<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-								</statBases>
-								<Properties>
-									<recoilAmount>1.48</recoilAmount>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_OR_Blaster_Red</defaultProjectile>
-									<warmupTime>1.6</warmupTime>
-									<range>80</range>
-									<soundCast>O21_Shot_BlasterBolt</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<FireModes>
-									<aiAimMode>AimedShot</aiAimMode>
-								</FireModes>
-								<AmmoUser>
-									<magazineSize>10</magazineSize>
-									<reloadTime>4.5</reloadTime>
-									<ammoSet>AmmoSet_PlasmaGasCartridgeRed</ammoSet>
-								</AmmoUser>
-							</li>
-
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>O21_OR_RG4DBlaster</defName>
-								<statBases>
-									<SightsEfficiency>0.7</SightsEfficiency>
-									<ShotSpread>0.18</ShotSpread>
-									<SwayFactor>0.87</SwayFactor>
-									<Bulk>1.75</Bulk>
-									<Mass>1.5</Mass>
-									<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-								</statBases>
-								<Properties>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_OR_Blaster_Red</defaultProjectile>
-									<warmupTime>0.6</warmupTime>
-									<range>25</range>
-									<soundCast>O21_Shot_BlasterBolt</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<FireModes />
-								<AmmoUser>
-									<magazineSize>15</magazineSize>
-									<reloadTime>3</reloadTime>
-									<ammoSet>AmmoSet_PlasmaGasCartridgeRed</ammoSet>
-								</AmmoUser>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="O21_OR_BXVibroblade"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>handle</label>
-											<capacities>
-												<li>Poke</li>
-											</capacities>
-											<power>4</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>17</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>15</armorPenetrationSharp>
-											<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="O21_OR_BXVibroblade"]/statBases</xpath>
-								<value>
-									<Bulk>3.5</Bulk>
-									<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="O21_OR_BXVibroblade"]</xpath>
-								<value>
-									<equippedStatOffsets>
-										<MeleeCritChance>0.2</MeleeCritChance>
-										<MeleeParryChance>0.35</MeleeParryChance>
-										<MeleeDodgeChance>0.2</MeleeDodgeChance>
-									</equippedStatOffsets>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outer Rim Galaxies/Mandalore/Patch_OuterRim_Mandalore_Apparel.xml b/Patches/O21 Outer Rim Galaxies/Mandalore/Patch_OuterRim_Mandalore_Apparel.xml
deleted file mode 100644
index 2ef6440f61..0000000000
--- a/Patches/O21 Outer Rim Galaxies/Mandalore/Patch_OuterRim_Mandalore_Apparel.xml	
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[O21] Outer Rim Galaxies</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="O21_OR_AmbanSniperRifle"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[@Name="MandalorianChestBase"]/statBases/StuffEffectMultiplierArmor</xpath>
-								<value>
-									<StuffEffectMultiplierArmor>14.5</StuffEffectMultiplierArmor>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[@Name="MandalorianChestBase"]/apparel/layers</xpath>
-								<value>
-									<li>Shell</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[@Name="MandalorianChestBase"]/statBases/Mass</xpath>
-								<value>
-									<Mass>15</Mass>
-									<Bulk>80</Bulk>
-									<WornBulk>15</WornBulk>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[@Name="MandalorianChestBase"]</xpath>
-								<value>
-									<equippedStatOffsets>
-										<ToxicEnvironmentResistance>0.40</ToxicEnvironmentResistance>
-										<CarryBulk>25</CarryBulk>
-									</equippedStatOffsets>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[@Name="MandalorianHelmetBase"]/statBases/StuffEffectMultiplierArmor</xpath>
-								<value>
-									<StuffEffectMultiplierArmor>13.8</StuffEffectMultiplierArmor>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[@Name="MandalorianHelmetBase"]/apparel/layers</xpath>
-								<value>
-									<li>OnHead</li>
-									<li>StrappedHead</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[@Name="MandalorianHelmetBase"]/statBases/Mass</xpath>
-								<value>
-									<Mass>4</Mass>
-									<Bulk>4</Bulk>
-									<WornBulk>1</WornBulk>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[@Name="MandalorianHelmetBase"]</xpath>
-								<value>
-									<equippedStatOffsets>
-										<ToxicEnvironmentResistance>0.40</ToxicEnvironmentResistance>
-									</equippedStatOffsets>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[@Name="MandalorianPauldronsBase"]/statBases/StuffEffectMultiplierArmor</xpath>
-								<value>
-									<StuffEffectMultiplierArmor>14</StuffEffectMultiplierArmor>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[@Name="MandalorianPauldronsBase"]/statBases/Mass</xpath>
-								<value>
-									<Mass>4</Mass>
-									<Bulk>10</Bulk>
-									<WornBulk>1</WornBulk>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outer Rim Galaxies/Mandalore/Patch_OuterRim_Mandalore_Pawnkinds.xml b/Patches/O21 Outer Rim Galaxies/Mandalore/Patch_OuterRim_Mandalore_Pawnkinds.xml
deleted file mode 100644
index 7979879b08..0000000000
--- a/Patches/O21 Outer Rim Galaxies/Mandalore/Patch_OuterRim_Mandalore_Pawnkinds.xml	
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[O21] Outer Rim Galaxies</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/PawnKindDef[defName="O21_OR_DeathWatch_Leader"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/PawnKindDef[@Name="BaseDeathWatchPawn"]</xpath>
-								<value>
-									<li Class="CombatExtended.LoadoutPropertiesExtension">
-										<primaryMagazineCount>
-											<min>5</min>
-											<max>12</max>
-										</primaryMagazineCount>
-									</li>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outer Rim Galaxies/Mandalore/Patch_OuterRim_Mandalore_Weapons.xml b/Patches/O21 Outer Rim Galaxies/Mandalore/Patch_OuterRim_Mandalore_Weapons.xml
deleted file mode 100644
index 51ef3e99e7..0000000000
--- a/Patches/O21 Outer Rim Galaxies/Mandalore/Patch_OuterRim_Mandalore_Weapons.xml	
+++ /dev/null
@@ -1,444 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[O21] Outer Rim Galaxies</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="O21_OR_AmbanSniperRifle"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[
-									defName="O21_OR_WESTAR18Blaster" or
-									defName="O21_OR_WESTAR34Blaster" or
-									defName="O21_OR_WESTAR35Blaster" or
-									defName="O21_OR_IB94BlasterPistol"
-									]/tools </xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>grip</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>1.54</cooldownTime>
-											<chanceFactor>1.5</chanceFactor>
-											<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-											<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>muzzle</label>
-											<capacities>
-												<li>Poke</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>1.54</cooldownTime>
-											<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-											<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[
-									defName="O21_OR_AmbanSniperRifle" or
-									defName="O21_OR_EE3BlasterCarbine" or
-									defName="O21_OR_GALAAR15Blaster"
-									]/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>
-							</li>
-
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>O21_OR_WESTAR18Blaster</defName>
-								<statBases>
-									<SightsEfficiency>1.0</SightsEfficiency>
-									<ShotSpread>0.18</ShotSpread>
-									<SwayFactor>0.87</SwayFactor>
-									<Bulk>1.75</Bulk>
-									<Mass>1.5</Mass>
-									<RangedWeapon_Cooldown>.4</RangedWeapon_Cooldown>
-								</statBases>
-								<Properties>
-									<recoilAmount>1.48</recoilAmount>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_OR_Blaster_Red</defaultProjectile>
-									<warmupTime>0.25</warmupTime>
-									<range>25</range>
-									<soundCast>O21_Shot_BlasterBolt</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<FireModes />
-								<AmmoUser>
-									<magazineSize>15</magazineSize>
-									<reloadTime>3</reloadTime>
-									<ammoSet>AmmoSet_PlasmaGasCartridgeRed</ammoSet>
-								</AmmoUser>
-							</li>
-
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>O21_OR_WESTAR34Blaster</defName>
-								<statBases>
-									<SightsEfficiency>1.0</SightsEfficiency>
-									<ShotSpread>0.18</ShotSpread>
-									<SwayFactor>0.87</SwayFactor>
-									<Bulk>1.75</Bulk>
-									<Mass>1.5</Mass>
-									<RangedWeapon_Cooldown>.4</RangedWeapon_Cooldown>
-								</statBases>
-								<Properties>
-									<recoilAmount>1.48</recoilAmount>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_OR_Blaster_Red</defaultProjectile>
-									<warmupTime>0.25</warmupTime>
-									<range>25</range>
-									<soundCast>O21_Shot_BlasterBolt</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<FireModes />
-								<AmmoUser>
-									<magazineSize>15</magazineSize>
-									<reloadTime>3</reloadTime>
-									<ammoSet>AmmoSet_PlasmaGasCartridgeRed</ammoSet>
-								</AmmoUser>
-							</li>
-
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>O21_OR_WESTAR35Blaster</defName>
-								<statBases>
-									<SightsEfficiency>1.0</SightsEfficiency>
-									<ShotSpread>0.18</ShotSpread>
-									<SwayFactor>0.87</SwayFactor>
-									<Bulk>1.75</Bulk>
-									<Mass>1.5</Mass>
-									<RangedWeapon_Cooldown>.4</RangedWeapon_Cooldown>
-								</statBases>
-								<Properties>
-									<recoilAmount>1.48</recoilAmount>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_OR_Blaster_Red</defaultProjectile>
-									<warmupTime>0.25</warmupTime>
-									<range>25</range>
-									<soundCast>O21_Shot_BlasterBolt</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<FireModes />
-								<AmmoUser>
-									<magazineSize>15</magazineSize>
-									<reloadTime>3</reloadTime>
-									<ammoSet>AmmoSet_PlasmaGasCartridgeRed</ammoSet>
-								</AmmoUser>
-							</li>
-
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>O21_OR_IB94BlasterPistol</defName>
-								<statBases>
-									<SightsEfficiency>1.0</SightsEfficiency>
-									<ShotSpread>0.18</ShotSpread>
-									<SwayFactor>0.87</SwayFactor>
-									<Bulk>1.75</Bulk>
-									<Mass>1.5</Mass>
-									<RangedWeapon_Cooldown>.4</RangedWeapon_Cooldown>
-								</statBases>
-								<Properties>
-									<recoilAmount>1.48</recoilAmount>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_OR_Blaster_Red</defaultProjectile>
-									<warmupTime>0.25</warmupTime>
-									<range>25</range>
-									<soundCast>O21_Shot_BlasterBolt</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<FireModes />
-								<AmmoUser>
-									<magazineSize>15</magazineSize>
-									<reloadTime>3</reloadTime>
-									<ammoSet>AmmoSet_PlasmaGasCartridgeRed</ammoSet>
-								</AmmoUser>
-							</li>
-
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>O21_OR_AmbanSniperRifle</defName>
-								<statBases>
-									<SightsEfficiency>1.5</SightsEfficiency>
-									<ShotSpread>0.14</ShotSpread>
-									<SwayFactor>1.34</SwayFactor>
-									<Bulk>12.25</Bulk>
-									<Mass>5</Mass>
-									<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
-								</statBases>
-								<Properties>
-									<recoilAmount>1.48</recoilAmount>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_OR_Blaster_Red</defaultProjectile>
-									<warmupTime>0.6</warmupTime>
-									<range>60</range>
-									<soundCast>O21_Shot_BlasterBolt</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<FireModes>
-									<aiAimMode>AimedShot</aiAimMode>
-								</FireModes>
-								<AmmoUser>
-									<magazineSize>15</magazineSize>
-									<reloadTime>3</reloadTime>
-									<ammoSet>AmmoSet_PlasmaGasCartridgeRed</ammoSet>
-								</AmmoUser>
-							</li>
-
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>O21_OR_GALAAR15Blaster</defName>
-								<statBases>
-									<SightsEfficiency>1.0</SightsEfficiency>
-									<ShotSpread>0.14</ShotSpread>
-									<SwayFactor>1.01</SwayFactor>
-									<Bulk>6.35</Bulk>
-									<Mass>3.5</Mass>
-									<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-								</statBases>
-								<Properties>
-									<recoilAmount>1.53</recoilAmount>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_OR_Blaster_Red</defaultProjectile>
-									<warmupTime>0.8</warmupTime>
-									<burstShotCount>3</burstShotCount>
-									<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-									<range>40</range>
-									<soundCast>O21_Shot_BlasterBolt</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<FireModes>
-									<aimedBurstShotCount>2</aimedBurstShotCount>
-									<aiUseBurstMode>FALSE</aiUseBurstMode>
-									<aiAimMode>AimedShot</aiAimMode>
-								</FireModes>
-								<AmmoUser>
-									<magazineSize>24</magazineSize>
-									<reloadTime>4</reloadTime>
-									<ammoSet>AmmoSet_PlasmaGasCartridgeRed</ammoSet>
-								</AmmoUser>
-							</li>
-
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>O21_OR_EE3BlasterCarbine</defName>
-								<statBases>
-									<SightsEfficiency>1.5</SightsEfficiency>
-									<ShotSpread>0.14</ShotSpread>
-									<SwayFactor>1.01</SwayFactor>
-									<Bulk>6.35</Bulk>
-									<Mass>3.5</Mass>
-									<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-								</statBases>
-								<Properties>
-									<recoilAmount>1.53</recoilAmount>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_OR_Blaster_Red</defaultProjectile>
-									<warmupTime>0.8</warmupTime>
-									<burstShotCount>2</burstShotCount>
-									<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-									<range>40</range>
-									<soundCast>O21_Shot_BlasterBolt</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<FireModes>
-									<aiAimMode>AimedShot</aiAimMode>
-								</FireModes>
-								<AmmoUser>
-									<magazineSize>20</magazineSize>
-									<reloadTime>4.5</reloadTime>
-									<ammoSet>AmmoSet_PlasmaGasCartridgeRed</ammoSet>
-								</AmmoUser>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="O21_OR_MandalorianSaber"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>handle</label>
-											<capacities>
-												<li>Poke</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>0.96</cooldownTime>
-											<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
-											<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>point</label>
-											<capacities>
-												<li>Stab</li>
-											</capacities>
-											<power>23.4</power>
-											<cooldownTime>0.96</cooldownTime>
-											<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
-											<armorPenetrationSharp>20.4</armorPenetrationSharp>
-											<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>edge</label>
-											<capacities>
-												<li>Cut</li>
-											</capacities>
-											<power>17.55</power>
-											<cooldownTime>1.34</cooldownTime>
-											<chanceFactor>0.93</chanceFactor>
-											<armorPenetrationBlunt>0.956</armorPenetrationBlunt>
-											<armorPenetrationSharp>18</armorPenetrationSharp>
-											<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="O21_OR_MandalorianSaber"]/statBases</xpath>
-								<value>
-									<Bulk>3.5</Bulk>
-									<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="O21_OR_MandalorianSaber"]</xpath>
-								<value>
-									<equippedStatOffsets>
-										<MeleeCritChance>0.2</MeleeCritChance>
-										<MeleeParryChance>0.1</MeleeParryChance>
-										<MeleeDodgeChance>0.4</MeleeDodgeChance>
-									</equippedStatOffsets>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="O21_OR_MandalorianSaber"]/weaponTags</xpath>
-								<value>
-									<li>CE_Sidearm</li>
-									<li>CE_OneHandedWeapon</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="O21_OR_MunitkatHalberd"]/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>37</power>
-											<cooldownTime>2.54</cooldownTime>
-											<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
-											<armorPenetrationSharp>17</armorPenetrationSharp>
-											<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>edge</label>
-											<capacities>
-												<li>Cut</li>
-											</capacities>
-											<power>30</power>
-											<cooldownTime>2.34</cooldownTime>
-											<chanceFactor>1.33</chanceFactor>
-											<armorPenetrationBlunt>0.956</armorPenetrationBlunt>
-											<armorPenetrationSharp>15</armorPenetrationSharp>
-											<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="O21_OR_MunitkatHalberd"]/statBases</xpath>
-								<value>
-									<Bulk>3.5</Bulk>
-									<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="O21_OR_MunitkatHalberd"]</xpath>
-								<value>
-									<equippedStatOffsets>
-										<MeleeCritChance>0.4</MeleeCritChance>
-										<MeleeParryChance>0.35</MeleeParryChance>
-										<MeleeDodgeChance>0.2</MeleeDodgeChance>
-									</equippedStatOffsets>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outer Rim Galaxies/Old Republic/Patch_OuterRim_OldRepublic_Races.xml b/Patches/O21 Outer Rim Galaxies/Old Republic/Patch_OuterRim_OldRepublic_Races.xml
deleted file mode 100644
index a6dce325f6..0000000000
--- a/Patches/O21 Outer Rim Galaxies/Old Republic/Patch_OuterRim_OldRepublic_Races.xml	
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[O21] Outer Rim Galaxies</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_HK47Droid"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_HK47Droid"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>Humanoid</bodyShape>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_HK50Droid"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>Humanoid</bodyShape>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_HK51Droid"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>Humanoid</bodyShape>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_HK47Droid" or defName="O21_OR_HK50Droid" or defName="O21_OR_HK51Droid"]/statBases</xpath>
-								<value>
-									<CarryWeight>40</CarryWeight>
-									<CarryBulk>20</CarryBulk>
-									<MeleeDodgeChance>1.2</MeleeDodgeChance>
-									<MeleeCritChance>1.5</MeleeCritChance>
-									<MeleeParryChance>1.3</MeleeParryChance>
-									<SmokeSensitivity>1</SmokeSensitivity>
-								</value>
-							</li>
-
-							<li Class="PatchOperationConditional">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_HK47Droid"]/comps</xpath>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_HK47Droid"]</xpath>
-									<value>
-										<comps />
-									</value>
-								</nomatch>
-							</li>
-
-							<li Class="PatchOperationConditional">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_HK50Droid"]/comps</xpath>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_HK50Droid"]</xpath>
-									<value>
-										<comps />
-									</value>
-								</nomatch>
-							</li>
-
-							<li Class="PatchOperationConditional">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_HK51Droid"]/comps</xpath>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_HK51Droid"]</xpath>
-									<value>
-										<comps />
-									</value>
-								</nomatch>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_HK47Droid" or defName="O21_OR_HK50Droid" or defName="O21_OR_HK51Droid"]/comps</xpath>
-								<value>
-									<li>
-										<compClass>CombatExtended.CompPawnGizmo</compClass>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_HK47Droid" or defName="O21_OR_HK50Droid" or defName="O21_OR_HK51Droid"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>left fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>4.49</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outer Rim Galaxies/Patch_OuterRim_Ammo.xml b/Patches/O21 Outer Rim Galaxies/Patch_OuterRim_Ammo.xml
deleted file mode 100644
index 608240456d..0000000000
--- a/Patches/O21 Outer Rim Galaxies/Patch_OuterRim_Ammo.xml	
+++ /dev/null
@@ -1,511 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[O21] Outer Rim Galaxies</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingCategoryDef>
-							<defName>AmmoPlasmaGasCartridge</defName>
-							<label>Plasma Gas Cartridges</label>
-							<parent>AmmoAdvanced</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
-						</ThingCategoryDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="PlasmaGasCartridgeBase" ParentName="SpacerSmallAmmoBase" Abstract="True">
-							<description>Plasma gas ammo used by advanced blaster designs.</description>
-							<statBases>
-								<Mass>0.01</Mass>
-								<Bulk>0.03</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoPlasmaGasCartridge</li>
-							</thingCategories>
-							<stackLimit>500</stackLimit>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="PlasmaGasCartridgeBase">
-							<defName>Ammo_PlasmaGasCartridge</defName>
-							<label>Plasma Gas Cartridges</label>
-							<graphicData>
-								<texPath>Things/Ammo/PlasmaCell/Rifle</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>1.55</MarketValue>
-							</statBases>
-							<ammoClass>Charged</ammoClass>
-							<generateAllowChance>1</generateAllowChance>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="PlasmaGasCartridgeBase">
-							<defName>Ammo_PlasmaGasCartridge_AP</defName>
-							<label>Plasma Gas Cartridges (Imp)</label>
-							<graphicData>
-								<texPath>Things/Ammo/PlasmaCell/Rifle</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>1.55</MarketValue>
-							</statBases>
-							<ammoClass>ChargedAP</ammoClass>
-							<generateAllowChance>0.5</generateAllowChance>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="PlasmaGasCartridgeBase">
-							<defName>Ammo_PlasmaGasCartridge_Ion</defName>
-							<label>Plasma Gas Cartridges (Stun)</label>
-							<graphicData>
-								<texPath>Things/Ammo/PlasmaCell/Rifle</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>1.55</MarketValue>
-							</statBases>
-							<ammoClass>Ionized</ammoClass>
-							<generateAllowChance>0</generateAllowChance>
-						</ThingDef>
-
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_PlasmaGasCartridge</defName>
-							<label>make Plasma Gas Cartridges x500</label>
-							<description>Craft 100 Plasma Gas Cartridges .</description>
-							<jobString>Making Plasma Gas Cartridges .</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>O21_OR_Durasteel</li>
-										</thingDefs>
-									</filter>
-									<count>28</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>O21_OR_Tibanna</li>
-										</thingDefs>
-									</filter>
-									<count>45</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>O21_OR_ComponentHypertech</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>O21_OR_Durasteel</li>
-									<li>O21_OR_Tibanna</li>
-									<li>O21_OR_ComponentHypertech</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<recipeUsers Inherit="False">
-								<li>O21_OR_WeaponsFabricator</li>
-							</recipeUsers>
-							<products>
-								<Ammo_PlasmaGasCartridge>200</Ammo_PlasmaGasCartridge>
-							</products>
-							<researchPrerequisite>O21_OR_WeaponFabrication</researchPrerequisite>
-						</RecipeDef>
-
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_PlasmaGasCartridge_AP</defName>
-							<label>make Plasma Gas Cartridges (Conc.) x500</label>
-							<description>Craft 100 Plasma Gas Cartridges (Conc.) .</description>
-							<jobString>Making Plasma Gas Cartridges (Conc.) .</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>O21_OR_Durasteel</li>
-										</thingDefs>
-									</filter>
-									<count>28</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>O21_OR_Tibanna</li>
-										</thingDefs>
-									</filter>
-									<count>30</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>O21_OR_ComponentHypertech</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>O21_OR_Durasteel</li>
-									<li>O21_OR_Tibanna</li>
-									<li>O21_OR_ComponentHypertech</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<recipeUsers Inherit="False">
-								<li>O21_OR_WeaponsFabricator</li>
-							</recipeUsers>
-							<products>
-								<Ammo_PlasmaGasCartridge_AP>200</Ammo_PlasmaGasCartridge_AP>
-							</products>
-							<researchPrerequisite>O21_OR_WeaponFabrication</researchPrerequisite>
-						</RecipeDef>
-
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_PlasmaGasCartridge_Ion</defName>
-							<label>make Plasma Gas Cartridges (Ion) x500</label>
-							<description>Craft 100 PlasmaGas Cartridges (Ion) .</description>
-							<jobString>Making Plasma Gas Cartridges (Ion) .</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>O21_OR_Durasteel</li>
-										</thingDefs>
-									</filter>
-									<count>30</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>O21_OR_Tibanna</li>
-										</thingDefs>
-									</filter>
-									<count>30</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>O21_OR_ComponentHypertech</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>O21_OR_Durasteel</li>
-									<li>O21_OR_Tibanna</li>
-									<li>O21_OR_ComponentHypertech</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<recipeUsers Inherit="False">
-								<li>O21_OR_WeaponsFabricator</li>
-							</recipeUsers>
-							<products>
-								<Ammo_PlasmaGasCartridge_Ion>200</Ammo_PlasmaGasCartridge_Ion>
-							</products>
-							<researchPrerequisite>O21_OR_WeaponFabrication</researchPrerequisite>
-						</RecipeDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_PlasmaGasCartridgeRed</defName>
-							<label>Plasma Gas Cartridges</label>
-							<ammoTypes>
-								<Ammo_PlasmaGasCartridge>Bullet_OR_Blaster_Red</Ammo_PlasmaGasCartridge>
-								<Ammo_PlasmaGasCartridge_AP>Bullet_OR_Blaster_AP_Red</Ammo_PlasmaGasCartridge_AP>
-								<Ammo_PlasmaGasCartridge_Ion>Bullet_OR_Blaster_Ion</Ammo_PlasmaGasCartridge_Ion>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_PlasmaGasCartridgeBlue</defName>
-							<label>Plasma Gas Cartridges</label>
-							<ammoTypes>
-								<Ammo_PlasmaGasCartridge>Bullet_OR_Blaster_Blue</Ammo_PlasmaGasCartridge>
-								<Ammo_PlasmaGasCartridge_AP>Bullet_OR_Blaster_AP_Blue</Ammo_PlasmaGasCartridge_AP>
-								<Ammo_PlasmaGasCartridge_Ion>Bullet_OR_Blaster_Ion</Ammo_PlasmaGasCartridge_Ion>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_PlasmaGasCartridgeChiss</defName>
-							<label>Plasma Gas Cartridges</label>
-							<ammoTypes>
-								<Ammo_PlasmaGasCartridge>Bullet_OR_Blaster_Blue_Chiss</Ammo_PlasmaGasCartridge>
-								<Ammo_PlasmaGasCartridge_AP>Bullet_OR_Blaster_Blue_ChissAP</Ammo_PlasmaGasCartridge_AP>
-								<Ammo_PlasmaGasCartridge_Ion>Bullet_OR_Blaster_Ion</Ammo_PlasmaGasCartridge_Ion>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_PlasmaGasCartridgeJawa</defName>
-							<label>Plasma Gas Cartridges</label>
-							<ammoTypes>
-								<Ammo_PlasmaGasCartridge_Ion>Bullet_OR_Blaster_Ion</Ammo_PlasmaGasCartridge_Ion>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_PlasmaGasCartridgeAnaxesTurret</defName>
-							<label>Plasma Gas Cartridges</label>
-							<ammoTypes>
-								<Ammo_PlasmaGasCartridge>Bullet_OR_Blaster_AnaxesTurret_Red</Ammo_PlasmaGasCartridge>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_PlasmaGasCartridgePTowerTurret</defName>
-							<label>Plasma Gas Cartridges</label>
-							<ammoTypes>
-								<Ammo_PlasmaGasCartridge>Bullet_OR_Blaster_PTowerTurret_Red</Ammo_PlasmaGasCartridge>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- Ultra tech weapons should be able to pierce spacer armor so I gave them high AP-->
-
-						<ThingDef ParentName="Base556x45mmNATOBullet">
-							<defName>Bullet_OR_Blaster_Blue</defName>
-							<label>blaster bolt</label>
-							<graphicData>
-								<texPath>OuterRim/Projectile/BlasterBolt_Blue</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>O21_OR_Blaster</damageDef>
-								<speed>150</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>18</damageAmountBase>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base556x45mmNATOBullet">
-							<defName>Bullet_OR_Blaster_AP_Blue</defName>
-							<label>blaster bolt</label>
-							<graphicData>
-								<texPath>OuterRim/Projectile/BlasterBolt_Blue</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>O21_OR_Blaster</damageDef>
-								<speed>150</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>11</damageAmountBase>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base556x45mmNATOBullet">
-							<defName>Bullet_OR_Blaster_Red</defName>
-							<label>blaster bolt</label>
-							<graphicData>
-								<texPath>OuterRim/Projectile/BlasterBolt_Red</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>O21_OR_Blaster</damageDef>
-								<speed>150</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>18</damageAmountBase>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base556x45mmNATOBullet">
-							<defName>Bullet_OR_Blaster_AP_Red</defName>
-							<label>blaster bolt</label>
-							<graphicData>
-								<texPath>OuterRim/Projectile/BlasterBolt_Red</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>O21_OR_Blaster</damageDef>
-								<speed>150</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>11</damageAmountBase>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base556x45mmNATOBullet">
-							<defName>Bullet_OR_Blaster_Ion</defName>
-							<label>blaster bolt</label>
-							<graphicData>
-								<texPath>OuterRim/Projectile/BlasterBolt_Blue</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>EMP</damageDef>
-								<damageAmountBase>7</damageAmountBase>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<speed>35</speed>
-								<gravityFactor>0.5</gravityFactor>
-								<dropsCasings>false</dropsCasings>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base556x45mmNATOBullet">
-							<defName>Bullet_OR_Blaster_AnaxesTurret_Red</defName>
-							<label>blaster bolt</label>
-							<graphicData>
-								<texPath>OuterRim/Projectile/BlasterBolt_Red</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>O21_OR_Blaster</damageDef>
-								<speed>175</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>127</damageAmountBase>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<armorPenetrationSharp>100</armorPenetrationSharp>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>36</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>0.9</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Small>8</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="Base556x45mmNATOBullet">
-							<defName>Bullet_OR_Blaster_PTowerTurret_Red</defName>
-							<label>blaster bolt</label>
-							<graphicData>
-								<texPath>OuterRim/Projectile/BlasterBolt_Red</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>O21_OR_Blaster</damageDef>
-								<speed>175</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>95</damageAmountBase>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<armorPenetrationSharp>75</armorPenetrationSharp>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base556x45mmNATOBullet">
-							<defName>Bullet_OR_Blaster_Droid_Red</defName>
-							<label>blaster bolt</label>
-							<graphicData>
-								<texPath>OuterRim/Projectile/BlasterBolt_Red</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>O21_OR_Blaster</damageDef>
-								<speed>150</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>18</damageAmountBase>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<armorPenetrationSharp>25</armorPenetrationSharp>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base556x45mmNATOBullet">
-							<defName>Bullet_OR_Blaster_Blue_Chiss</defName>
-							<label>maser bolt</label>
-							<graphicData>
-								<texPath>OuterRim/Projectile/BlasterBolt_Blue</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>O21_OR_Blaster</damageDef>
-								<speed>150</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>10</damageAmountBase>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<secondaryDamage>
-									<li>
-										<def>Blunt</def>
-										<amount>7</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base556x45mmNATOBullet">
-							<defName>Bullet_OR_Blaster_Blue_ChissAP</defName>
-							<label>maser bolt</label>
-							<graphicData>
-								<texPath>OuterRim/Projectile/BlasterBolt_Blue</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>O21_OR_Blaster</damageDef>
-								<speed>150</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>7</damageAmountBase>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<armorPenetrationSharp>28</armorPenetrationSharp>
-								<secondaryDamage>
-									<li>
-										<def>Blunt</def>
-										<amount>3</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base556x45mmNATOBullet">
-							<defName>Bullet_OR_WristRocket</defName>
-							<label>wrist rocket</label>
-							<graphicData>
-								<texPath>Things/Projectile/Cannon/Sabot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>1.8</explosionRadius>
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>190</damageAmountBase>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<speed>65</speed>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Small>19</Fragment_Small>
-										<Fragment_Large>5</Fragment_Large>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[defName="O21_OR_Blaster"]/armorCategory</xpath>
-					<value>
-						<armorCategory>Sharp</armorCategory>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outer Rim Galaxies/Patch_OuterRim_Apparel.xml b/Patches/O21 Outer Rim Galaxies/Patch_OuterRim_Apparel.xml
deleted file mode 100644
index db49356963..0000000000
--- a/Patches/O21 Outer Rim Galaxies/Patch_OuterRim_Apparel.xml	
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[O21] Outer Rim Galaxies</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_OR_Bodysuit"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_OR_Bodysuit"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>300</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_OR_Bodysuit"]/statBases/Mass</xpath>
-					<value>
-						<Mass>1</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_OR_Bodysuit"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_OR_Bodysuit"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.9</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_OR_DroidArmorModule"]/statBases/Mass</xpath>
-					<value>
-						<Mass>13</Mass>
-						<Bulk>25</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_OR_DroidArmorModule"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outer Rim Galaxies/Patch_OuterRim_Hediffs.xml b/Patches/O21 Outer Rim Galaxies/Patch_OuterRim_Hediffs.xml
deleted file mode 100644
index 5e46a3763f..0000000000
--- a/Patches/O21 Outer Rim Galaxies/Patch_OuterRim_Hediffs.xml	
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[O21] Outer Rim Galaxies</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="O21_OR_DroidTwinWristBlaster"]/comps/li[@Class="MVCF.Comps.HediffCompProperties_ExtendedVerbGiver"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_OR_Blaster_Droid_Red</defaultProjectile>
-								<warmupTime>3</warmupTime>
-								<range>42</range>
-								<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-								<burstShotCount>4</burstShotCount>
-								<soundCast>O21_Shot_BlasterBolt</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<label>TwinWristBlaster</label>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="O21_OR_DroidWristBlaster"]/comps/li[@Class="MVCF.Comps.HediffCompProperties_ExtendedVerbGiver"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_OR_Blaster_Droid_Red</defaultProjectile>
-								<warmupTime>2.5</warmupTime>
-								<range>42</range>
-								<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-								<burstShotCount>2</burstShotCount>
-								<soundCast>O21_Shot_BlasterBolt</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<label>WristBlaster</label>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="O21_OR_DroidWristBlasterIon"]/comps/li[@Class="MVCF.Comps.HediffCompProperties_ExtendedVerbGiver"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_OR_Blaster_Ion</defaultProjectile>
-								<warmupTime>2.5</warmupTime>
-								<range>42</range>
-								<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-								<burstShotCount>2</burstShotCount>
-								<soundCast>O21_Shot_BlasterBolt</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<label>WristBlasterIon</label>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="O21_OR_DroidWristRocket"]/comps/li[@Class="MVCF.Comps.HediffCompProperties_ExtendedVerbGiver"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_OR_WristRocket</defaultProjectile>
-								<warmupTime>7.5</warmupTime>
-								<range>42</range>
-								<burstShotCount>1</burstShotCount>
-								<soundCast>InfernoCannon_Fire</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<label>WristRocket</label>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outer Rim Galaxies/Patch_OuterRim_Races.xml b/Patches/O21 Outer Rim Galaxies/Patch_OuterRim_Races.xml
deleted file mode 100644
index 7cc8f8702f..0000000000
--- a/Patches/O21 Outer Rim Galaxies/Patch_OuterRim_Races.xml	
+++ /dev/null
@@ -1,2303 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[O21] Outer Rim Galaxies</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Dathomirian"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Dathomirian"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>Humanoid</bodyShape>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Dathomirian"]/statBases</xpath>
-								<value>
-									<CarryWeight>40</CarryWeight>
-									<CarryBulk>20</CarryBulk>
-									<MeleeDodgeChance>1</MeleeDodgeChance>
-									<MeleeCritChance>1</MeleeCritChance>
-									<MeleeParryChance>1</MeleeParryChance>
-									<SmokeSensitivity>1</SmokeSensitivity>
-								</value>
-							</li>
-
-							<li Class="PatchOperationConditional">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Dathomirian"]/comps</xpath>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Dathomirian"]</xpath>
-									<value>
-										<comps />
-									</value>
-								</nomatch>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Dathomirian"]/comps</xpath>
-								<value>
-									<li>
-										<compClass>CombatExtended.CompPawnGizmo</compClass>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Dathomirian"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>left fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>4.49</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Wookiee"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Wookiee"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>Humanoid</bodyShape>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Wookiee"]/statBases</xpath>
-								<value>
-									<CarryWeight>40</CarryWeight>
-									<CarryBulk>20</CarryBulk>
-									<MeleeDodgeChance>1</MeleeDodgeChance>
-									<MeleeCritChance>1</MeleeCritChance>
-									<MeleeParryChance>1</MeleeParryChance>
-									<SmokeSensitivity>1</SmokeSensitivity>
-								</value>
-							</li>
-
-							<li Class="PatchOperationConditional">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Wookiee"]/comps</xpath>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Wookiee"]</xpath>
-									<value>
-										<comps />
-									</value>
-								</nomatch>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Wookiee"]/comps</xpath>
-								<value>
-									<li>
-										<compClass>CombatExtended.CompPawnGizmo</compClass>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Wookiee"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>left fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>2.5</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>2.5</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>5</power>
-											<cooldownTime>4.49</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_MonCalamari"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_MonCalamari"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>Humanoid</bodyShape>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_MonCalamari"]/statBases</xpath>
-								<value>
-									<CarryWeight>40</CarryWeight>
-									<CarryBulk>20</CarryBulk>
-									<MeleeDodgeChance>1</MeleeDodgeChance>
-									<MeleeCritChance>1</MeleeCritChance>
-									<MeleeParryChance>1</MeleeParryChance>
-									<SmokeSensitivity>1</SmokeSensitivity>
-								</value>
-							</li>
-
-							<li Class="PatchOperationConditional">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_MonCalamari"]/comps</xpath>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_MonCalamari"]</xpath>
-									<value>
-										<comps />
-									</value>
-								</nomatch>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_MonCalamari"]/comps</xpath>
-								<value>
-									<li>
-										<compClass>CombatExtended.CompPawnGizmo</compClass>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_MonCalamari"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>left fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>4.49</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Quarren"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Quarren"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>Humanoid</bodyShape>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Quarren"]/statBases</xpath>
-								<value>
-									<CarryWeight>40</CarryWeight>
-									<CarryBulk>20</CarryBulk>
-									<MeleeDodgeChance>1</MeleeDodgeChance>
-									<MeleeCritChance>1</MeleeCritChance>
-									<MeleeParryChance>1</MeleeParryChance>
-									<SmokeSensitivity>1</SmokeSensitivity>
-								</value>
-							</li>
-
-							<li Class="PatchOperationConditional">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Quarren"]/comps</xpath>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Quarren"]</xpath>
-									<value>
-										<comps />
-									</value>
-								</nomatch>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Quarren"]/comps</xpath>
-								<value>
-									<li>
-										<compClass>CombatExtended.CompPawnGizmo</compClass>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Quarren"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>left fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>4.49</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Gungan"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Gungan"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>Humanoid</bodyShape>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Gungan"]/statBases</xpath>
-								<value>
-									<CarryWeight>40</CarryWeight>
-									<CarryBulk>20</CarryBulk>
-									<MeleeDodgeChance>1</MeleeDodgeChance>
-									<MeleeCritChance>1</MeleeCritChance>
-									<MeleeParryChance>1</MeleeParryChance>
-									<SmokeSensitivity>1</SmokeSensitivity>
-								</value>
-							</li>
-
-							<li Class="PatchOperationConditional">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Gungan"]/comps</xpath>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Gungan"]</xpath>
-									<value>
-										<comps />
-									</value>
-								</nomatch>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Gungan"]/comps</xpath>
-								<value>
-									<li>
-										<compClass>CombatExtended.CompPawnGizmo</compClass>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Gungan"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>left fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>4.49</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Pyke"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Pyke"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>Humanoid</bodyShape>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Pyke"]/statBases</xpath>
-								<value>
-									<CarryWeight>40</CarryWeight>
-									<CarryBulk>20</CarryBulk>
-									<MeleeDodgeChance>1</MeleeDodgeChance>
-									<MeleeCritChance>1</MeleeCritChance>
-									<MeleeParryChance>1</MeleeParryChance>
-									<SmokeSensitivity>1</SmokeSensitivity>
-								</value>
-							</li>
-
-							<li Class="PatchOperationConditional">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Pyke"]/comps</xpath>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Pyke"]</xpath>
-									<value>
-										<comps />
-									</value>
-								</nomatch>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Pyke"]/comps</xpath>
-								<value>
-									<li>
-										<compClass>CombatExtended.CompPawnGizmo</compClass>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Pyke"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>left fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>4.49</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Jawa"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Jawa"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>Humanoid</bodyShape>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Jawa"]/statBases</xpath>
-								<value>
-									<CarryWeight>40</CarryWeight>
-									<CarryBulk>20</CarryBulk>
-									<MeleeDodgeChance>1</MeleeDodgeChance>
-									<MeleeCritChance>1</MeleeCritChance>
-									<MeleeParryChance>1</MeleeParryChance>
-									<SmokeSensitivity>1</SmokeSensitivity>
-								</value>
-							</li>
-
-							<li Class="PatchOperationConditional">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Jawa"]/comps</xpath>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Jawa"]</xpath>
-									<value>
-										<comps />
-									</value>
-								</nomatch>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Jawa"]/comps</xpath>
-								<value>
-									<li>
-										<compClass>CombatExtended.CompPawnGizmo</compClass>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Jawa"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>left fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>4.49</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Tusken"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Tusken"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>Humanoid</bodyShape>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Tusken"]/statBases</xpath>
-								<value>
-									<CarryWeight>40</CarryWeight>
-									<CarryBulk>20</CarryBulk>
-									<MeleeDodgeChance>1</MeleeDodgeChance>
-									<MeleeCritChance>1</MeleeCritChance>
-									<MeleeParryChance>1</MeleeParryChance>
-									<SmokeSensitivity>1</SmokeSensitivity>
-								</value>
-							</li>
-
-							<li Class="PatchOperationConditional">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Tusken"]/comps</xpath>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Tusken"]</xpath>
-									<value>
-										<comps />
-									</value>
-								</nomatch>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Tusken"]/comps</xpath>
-								<value>
-									<li>
-										<compClass>CombatExtended.CompPawnGizmo</compClass>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Tusken"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>left fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>4.49</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Abednedo"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Abednedo"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>Humanoid</bodyShape>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Abednedo"]/statBases</xpath>
-								<value>
-									<CarryWeight>40</CarryWeight>
-									<CarryBulk>20</CarryBulk>
-									<MeleeDodgeChance>1</MeleeDodgeChance>
-									<MeleeCritChance>1</MeleeCritChance>
-									<MeleeParryChance>1</MeleeParryChance>
-									<SmokeSensitivity>1</SmokeSensitivity>
-								</value>
-							</li>
-
-							<li Class="PatchOperationConditional">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Abednedo"]/comps</xpath>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Abednedo"]</xpath>
-									<value>
-										<comps />
-									</value>
-								</nomatch>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Abednedo"]/comps</xpath>
-								<value>
-									<li>
-										<compClass>CombatExtended.CompPawnGizmo</compClass>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Abednedo"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>left fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>4.49</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Aqualish"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Aqualish"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>Humanoid</bodyShape>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Aqualish"]/statBases</xpath>
-								<value>
-									<CarryWeight>40</CarryWeight>
-									<CarryBulk>20</CarryBulk>
-									<MeleeDodgeChance>1</MeleeDodgeChance>
-									<MeleeCritChance>1</MeleeCritChance>
-									<MeleeParryChance>1</MeleeParryChance>
-									<SmokeSensitivity>1</SmokeSensitivity>
-								</value>
-							</li>
-
-							<li Class="PatchOperationConditional">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Aqualish"]/comps</xpath>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Aqualish"]</xpath>
-									<value>
-										<comps />
-									</value>
-								</nomatch>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Aqualish"]/comps</xpath>
-								<value>
-									<li>
-										<compClass>CombatExtended.CompPawnGizmo</compClass>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Aqualish"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>left fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>4.49</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Bith"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Bith"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>Humanoid</bodyShape>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Bith"]/statBases</xpath>
-								<value>
-									<CarryWeight>40</CarryWeight>
-									<CarryBulk>20</CarryBulk>
-									<MeleeDodgeChance>1</MeleeDodgeChance>
-									<MeleeCritChance>1</MeleeCritChance>
-									<MeleeParryChance>1</MeleeParryChance>
-									<SmokeSensitivity>1</SmokeSensitivity>
-								</value>
-							</li>
-
-							<li Class="PatchOperationConditional">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Bith"]/comps</xpath>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Bith"]</xpath>
-									<value>
-										<comps />
-									</value>
-								</nomatch>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Bith"]/comps</xpath>
-								<value>
-									<li>
-										<compClass>CombatExtended.CompPawnGizmo</compClass>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Bith"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>left fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>4.49</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Cerean"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Cerean"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>Humanoid</bodyShape>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Cerean"]/statBases</xpath>
-								<value>
-									<CarryWeight>40</CarryWeight>
-									<CarryBulk>20</CarryBulk>
-									<MeleeDodgeChance>1</MeleeDodgeChance>
-									<MeleeCritChance>1</MeleeCritChance>
-									<MeleeParryChance>1</MeleeParryChance>
-									<SmokeSensitivity>1</SmokeSensitivity>
-								</value>
-							</li>
-
-							<li Class="PatchOperationConditional">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Cerean"]/comps</xpath>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Cerean"]</xpath>
-									<value>
-										<comps />
-									</value>
-								</nomatch>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Cerean"]/comps</xpath>
-								<value>
-									<li>
-										<compClass>CombatExtended.CompPawnGizmo</compClass>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Cerean"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>left fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>4.49</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Devaronian"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Devaronian"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>Humanoid</bodyShape>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Devaronian"]/statBases</xpath>
-								<value>
-									<CarryWeight>40</CarryWeight>
-									<CarryBulk>20</CarryBulk>
-									<MeleeDodgeChance>1</MeleeDodgeChance>
-									<MeleeCritChance>1</MeleeCritChance>
-									<MeleeParryChance>1</MeleeParryChance>
-									<SmokeSensitivity>1</SmokeSensitivity>
-								</value>
-							</li>
-
-							<li Class="PatchOperationConditional">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Devaronian"]/comps</xpath>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Devaronian"]</xpath>
-									<value>
-										<comps />
-									</value>
-								</nomatch>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Devaronian"]/comps</xpath>
-								<value>
-									<li>
-										<compClass>CombatExtended.CompPawnGizmo</compClass>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Devaronian"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>left fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>4.49</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Duros"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Duros"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>Humanoid</bodyShape>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Duros"]/statBases</xpath>
-								<value>
-									<CarryWeight>40</CarryWeight>
-									<CarryBulk>20</CarryBulk>
-									<MeleeDodgeChance>1</MeleeDodgeChance>
-									<MeleeCritChance>1</MeleeCritChance>
-									<MeleeParryChance>1</MeleeParryChance>
-									<SmokeSensitivity>1</SmokeSensitivity>
-								</value>
-							</li>
-
-							<li Class="PatchOperationConditional">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Duros"]/comps</xpath>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Duros"]</xpath>
-									<value>
-										<comps />
-									</value>
-								</nomatch>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Duros"]/comps</xpath>
-								<value>
-									<li>
-										<compClass>CombatExtended.CompPawnGizmo</compClass>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Duros"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>left fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>4.49</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Iktotchi"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Iktotchi"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>Humanoid</bodyShape>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Iktotchi"]/statBases</xpath>
-								<value>
-									<CarryWeight>40</CarryWeight>
-									<CarryBulk>20</CarryBulk>
-									<MeleeDodgeChance>1</MeleeDodgeChance>
-									<MeleeCritChance>1</MeleeCritChance>
-									<MeleeParryChance>1</MeleeParryChance>
-									<SmokeSensitivity>1</SmokeSensitivity>
-								</value>
-							</li>
-
-							<li Class="PatchOperationConditional">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Iktotchi"]/comps</xpath>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Iktotchi"]</xpath>
-									<value>
-										<comps />
-									</value>
-								</nomatch>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Iktotchi"]/comps</xpath>
-								<value>
-									<li>
-										<compClass>CombatExtended.CompPawnGizmo</compClass>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Iktotchi"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>left fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>4.49</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Iridonian"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Iridonian"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>Humanoid</bodyShape>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Iridonian"]/statBases</xpath>
-								<value>
-									<CarryWeight>40</CarryWeight>
-									<CarryBulk>20</CarryBulk>
-									<MeleeDodgeChance>1</MeleeDodgeChance>
-									<MeleeCritChance>1</MeleeCritChance>
-									<MeleeParryChance>1</MeleeParryChance>
-									<SmokeSensitivity>1</SmokeSensitivity>
-								</value>
-							</li>
-
-							<li Class="PatchOperationConditional">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Iridonian"]/comps</xpath>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Iridonian"]</xpath>
-									<value>
-										<comps />
-									</value>
-								</nomatch>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Iridonian"]/comps</xpath>
-								<value>
-									<li>
-										<compClass>CombatExtended.CompPawnGizmo</compClass>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Iridonian"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>left fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>4.49</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Ithorian"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Ithorian"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>Humanoid</bodyShape>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Ithorian"]/statBases</xpath>
-								<value>
-									<CarryWeight>40</CarryWeight>
-									<CarryBulk>20</CarryBulk>
-									<MeleeDodgeChance>1</MeleeDodgeChance>
-									<MeleeCritChance>1</MeleeCritChance>
-									<MeleeParryChance>1</MeleeParryChance>
-									<SmokeSensitivity>1</SmokeSensitivity>
-								</value>
-							</li>
-
-							<li Class="PatchOperationConditional">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Ithorian"]/comps</xpath>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Ithorian"]</xpath>
-									<value>
-										<comps />
-									</value>
-								</nomatch>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Ithorian"]/comps</xpath>
-								<value>
-									<li>
-										<compClass>CombatExtended.CompPawnGizmo</compClass>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Ithorian"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>left fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>4.49</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Mirialan"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Mirialan"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>Humanoid</bodyShape>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Mirialan"]/statBases</xpath>
-								<value>
-									<CarryWeight>40</CarryWeight>
-									<CarryBulk>20</CarryBulk>
-									<MeleeDodgeChance>1</MeleeDodgeChance>
-									<MeleeCritChance>1</MeleeCritChance>
-									<MeleeParryChance>1</MeleeParryChance>
-									<SmokeSensitivity>1</SmokeSensitivity>
-								</value>
-							</li>
-
-							<li Class="PatchOperationConditional">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Mirialan"]/comps</xpath>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Mirialan"]</xpath>
-									<value>
-										<comps />
-									</value>
-								</nomatch>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Mirialan"]/comps</xpath>
-								<value>
-									<li>
-										<compClass>CombatExtended.CompPawnGizmo</compClass>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Mirialan"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>left fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>4.49</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Neimoidian"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Neimoidian"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>Humanoid</bodyShape>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Neimoidian"]/statBases</xpath>
-								<value>
-									<CarryWeight>40</CarryWeight>
-									<CarryBulk>20</CarryBulk>
-									<MeleeDodgeChance>1</MeleeDodgeChance>
-									<MeleeCritChance>1</MeleeCritChance>
-									<MeleeParryChance>1</MeleeParryChance>
-									<SmokeSensitivity>1</SmokeSensitivity>
-								</value>
-							</li>
-
-							<li Class="PatchOperationConditional">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Neimoidian"]/comps</xpath>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Neimoidian"]</xpath>
-									<value>
-										<comps />
-									</value>
-								</nomatch>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Neimoidian"]/comps</xpath>
-								<value>
-									<li>
-										<compClass>CombatExtended.CompPawnGizmo</compClass>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Neimoidian"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>left fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>4.49</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Nikto"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Nikto"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>Humanoid</bodyShape>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Nikto"]/statBases</xpath>
-								<value>
-									<CarryWeight>40</CarryWeight>
-									<CarryBulk>20</CarryBulk>
-									<MeleeDodgeChance>1</MeleeDodgeChance>
-									<MeleeCritChance>1</MeleeCritChance>
-									<MeleeParryChance>1</MeleeParryChance>
-									<SmokeSensitivity>1</SmokeSensitivity>
-								</value>
-							</li>
-
-							<li Class="PatchOperationConditional">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Nikto"]/comps</xpath>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Nikto"]</xpath>
-									<value>
-										<comps />
-									</value>
-								</nomatch>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Nikto"]/comps</xpath>
-								<value>
-									<li>
-										<compClass>CombatExtended.CompPawnGizmo</compClass>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Nikto"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>left fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>4.49</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Rakata"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Rakata"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>Humanoid</bodyShape>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Rakata"]/statBases</xpath>
-								<value>
-									<CarryWeight>40</CarryWeight>
-									<CarryBulk>20</CarryBulk>
-									<MeleeDodgeChance>1</MeleeDodgeChance>
-									<MeleeCritChance>1</MeleeCritChance>
-									<MeleeParryChance>1</MeleeParryChance>
-									<SmokeSensitivity>1</SmokeSensitivity>
-								</value>
-							</li>
-
-							<li Class="PatchOperationConditional">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Rakata"]/comps</xpath>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Rakata"]</xpath>
-									<value>
-										<comps />
-									</value>
-								</nomatch>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Rakata"]/comps</xpath>
-								<value>
-									<li>
-										<compClass>CombatExtended.CompPawnGizmo</compClass>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Rakata"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>left fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>4.49</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Selkath"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Selkath"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>Humanoid</bodyShape>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Selkath"]/statBases</xpath>
-								<value>
-									<CarryWeight>40</CarryWeight>
-									<CarryBulk>20</CarryBulk>
-									<MeleeDodgeChance>1</MeleeDodgeChance>
-									<MeleeCritChance>1</MeleeCritChance>
-									<MeleeParryChance>1</MeleeParryChance>
-									<SmokeSensitivity>1</SmokeSensitivity>
-								</value>
-							</li>
-
-							<li Class="PatchOperationConditional">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Selkath"]/comps</xpath>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Selkath"]</xpath>
-									<value>
-										<comps />
-									</value>
-								</nomatch>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Selkath"]/comps</xpath>
-								<value>
-									<li>
-										<compClass>CombatExtended.CompPawnGizmo</compClass>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Selkath"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>left fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>4.49</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Sith"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Sith"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>Humanoid</bodyShape>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Sith"]/statBases</xpath>
-								<value>
-									<CarryWeight>40</CarryWeight>
-									<CarryBulk>20</CarryBulk>
-									<MeleeDodgeChance>1</MeleeDodgeChance>
-									<MeleeCritChance>1</MeleeCritChance>
-									<MeleeParryChance>1</MeleeParryChance>
-									<SmokeSensitivity>1</SmokeSensitivity>
-								</value>
-							</li>
-
-							<li Class="PatchOperationConditional">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Sith"]/comps</xpath>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Sith"]</xpath>
-									<value>
-										<comps />
-									</value>
-								</nomatch>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Sith"]/comps</xpath>
-								<value>
-									<li>
-										<compClass>CombatExtended.CompPawnGizmo</compClass>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Sith"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>left fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>4.49</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Togruta"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Togruta"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>Humanoid</bodyShape>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Togruta"]/statBases</xpath>
-								<value>
-									<CarryWeight>40</CarryWeight>
-									<CarryBulk>20</CarryBulk>
-									<MeleeDodgeChance>1</MeleeDodgeChance>
-									<MeleeCritChance>1</MeleeCritChance>
-									<MeleeParryChance>1</MeleeParryChance>
-									<SmokeSensitivity>1</SmokeSensitivity>
-								</value>
-							</li>
-
-							<li Class="PatchOperationConditional">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Togruta"]/comps</xpath>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Togruta"]</xpath>
-									<value>
-										<comps />
-									</value>
-								</nomatch>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Togruta"]/comps</xpath>
-								<value>
-									<li>
-										<compClass>CombatExtended.CompPawnGizmo</compClass>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Togruta"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>left fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>4.49</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Trandoshan"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Trandoshan"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>Humanoid</bodyShape>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Trandoshan"]/statBases</xpath>
-								<value>
-									<CarryWeight>40</CarryWeight>
-									<CarryBulk>20</CarryBulk>
-									<MeleeDodgeChance>1</MeleeDodgeChance>
-									<MeleeCritChance>1</MeleeCritChance>
-									<MeleeParryChance>1</MeleeParryChance>
-									<SmokeSensitivity>1</SmokeSensitivity>
-								</value>
-							</li>
-
-							<li Class="PatchOperationConditional">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Trandoshan"]/comps</xpath>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Trandoshan"]</xpath>
-									<value>
-										<comps />
-									</value>
-								</nomatch>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Trandoshan"]/comps</xpath>
-								<value>
-									<li>
-										<compClass>CombatExtended.CompPawnGizmo</compClass>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Trandoshan"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>left fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>4.49</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Twilek"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Twilek"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>Humanoid</bodyShape>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Twilek"]/statBases</xpath>
-								<value>
-									<CarryWeight>40</CarryWeight>
-									<CarryBulk>20</CarryBulk>
-									<MeleeDodgeChance>1</MeleeDodgeChance>
-									<MeleeCritChance>1</MeleeCritChance>
-									<MeleeParryChance>1</MeleeParryChance>
-									<SmokeSensitivity>1</SmokeSensitivity>
-								</value>
-							</li>
-
-							<li Class="PatchOperationConditional">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Twilek"]/comps</xpath>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Twilek"]</xpath>
-									<value>
-										<comps />
-									</value>
-								</nomatch>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Twilek"]/comps</xpath>
-								<value>
-									<li>
-										<compClass>CombatExtended.CompPawnGizmo</compClass>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="O21_OR_Twilek"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>left fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right fist</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>4.49</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outer Rim Galaxies/Patch_OuterRim_Turret.xml b/Patches/O21 Outer Rim Galaxies/Patch_OuterRim_Turret.xml
deleted file mode 100644
index e7f42ead63..0000000000
--- a/Patches/O21 Outer Rim Galaxies/Patch_OuterRim_Turret.xml	
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[O21] Outer Rim Galaxies</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName = "O21_OR_AnaxesTurret"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "O21_OR_AnaxesTurret"]</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "O21_OR_AnaxesTurret"]</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "O21_OR_AnaxesTurret"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.50</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "O21_OR_AnaxesTurret"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "O21_OR_AnaxesTurret"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>1.1</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>O21_OR_Gun_AnaxesTurret</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.61</SwayFactor>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.67</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_OR_Blaster_AnaxesTurret_Red</defaultProjectile>
-						<warmupTime>4.3</warmupTime>
-						<range>78</range>
-						<minRange>8.9</minRange>
-						<ticksBetweenBurstShots>16</ticksBetweenBurstShots>
-						<burstShotCount>4</burstShotCount>
-						<soundCast>O21_Shot_BlasterBolt</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-						<ammoConsumedPerShotCount>5</ammoConsumedPerShotCount>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>400</magazineSize>
-						<reloadTime>9.8</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeAnaxesTurret</ammoSet>
-					</AmmoUser>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName = "O21_OR_PTowerTurret"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "O21_OR_PTowerTurret"]</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "O21_OR_PTowerTurret"]</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "O21_OR_PTowerTurret"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.50</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "O21_OR_PTowerTurret"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "O21_OR_PTowerTurret"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>1.1</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>O21_OR_Gun_PTowerTurret</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.61</SwayFactor>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.67</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_OR_Blaster_PTowerTurret_Red</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>62</range>
-						<minRange>4.9</minRange>
-						<burstShotCount>1</burstShotCount>
-						<soundCast>O21_Shot_BlasterBolt</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-						<ammoConsumedPerShotCount>5</ammoConsumedPerShotCount>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>150</magazineSize>
-						<reloadTime>9.8</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgePTowerTurret</ammoSet>
-					</AmmoUser>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outer Rim Galaxies/Patch_OuterRim_Weapons.xml b/Patches/O21 Outer Rim Galaxies/Patch_OuterRim_Weapons.xml
deleted file mode 100644
index a0073eae98..0000000000
--- a/Patches/O21 Outer Rim Galaxies/Patch_OuterRim_Weapons.xml	
+++ /dev/null
@@ -1,583 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[O21] Outer Rim Galaxies</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_OR_ThermalDetProj"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_OR_ThermalDetProj"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>4.9</explosionRadius>
-							<damageDef>Bomb</damageDef>
-							<damageAmountBase>250</damageAmountBase>
-							<explosionDelay>120</explosionDelay>
-							<dropsCasings>false</dropsCasings>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							<speed>5</speed>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="O21_OR_ThermalDetProj"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="O21_OR_ThermalDetProj"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_OR_ThermalDetProj"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>20</Fragment_Small>
-							</fragments>
-						</li>
-					</value>
-				</li>
-
-				<!-- Grenade -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_OR_ThermalDetonator"]</xpath>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<stackLimit>75</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="O21_OR_ThermalDetonator"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_OR_ThermalDetonator"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>20</Fragment_Small>
-							</fragments>
-						</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>O21_OR_ThermalDetonator</defName>
-					<statBases>
-						<Mass>0.4</Mass>
-						<Bulk>0.87</Bulk>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<label>throw thermal detonator</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<range>14.9</range>
-						<minRange>5</minRange>
-						<warmupTime>0.8</warmupTime>
-						<noiseRadius>5</noiseRadius>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<soundCast>ThrowGrenade</soundCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<defaultProjectile>O21_OR_ThermalDetProj</defaultProjectile>
-						<onlyManualCast>true</onlyManualCast>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<weaponTags>
-						<li>CE_AI_Grenade</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_OR_ThermalDetonatorBelt"]/costList</xpath>
-					<value>
-						<costList>
-							<O21_OR_ThermalDetonator>5</O21_OR_ThermalDetonator>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_OR_ThermalDetonatorBelt"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountToRefill</xpath>
-					<value>
-						<ammoCountPerCharge>1</ammoCountPerCharge>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_OR_ThermalDetonatorBelt"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<label>throw thermal detonator</label>
-								<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<onlyManualCast>True</onlyManualCast>
-								<warmupTime>1.5</warmupTime>
-								<range>15</range>
-								<minRange>5</minRange>
-								<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-								<soundCast>ThrowGrenade</soundCast>
-								<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-								<defaultProjectile>O21_OR_ThermalDetProj</defaultProjectile>
-								<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_OR_VibroBlade"]/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>17</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>15</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_OR_VibroBlade"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_OR_VibroDagger"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.96</cooldownTime>
-								<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>0.96</cooldownTime>
-								<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
-								<armorPenetrationSharp>17</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>13.5</power>
-								<cooldownTime>1.34</cooldownTime>
-								<chanceFactor>0.93</chanceFactor>
-								<armorPenetrationBlunt>0.956</armorPenetrationBlunt>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_OR_VibroDagger"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_OR_VibroDagger"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>0.1</MeleeParryChance>
-							<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_OR_VibroAxe"]/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>37</power>
-								<cooldownTime>2.54</cooldownTime>
-								<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
-								<armorPenetrationSharp>17</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>2.34</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.956</armorPenetrationBlunt>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_OR_VibroAxe"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_OR_VibroAxe"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.4</MeleeCritChance>
-							<MeleeParryChance>0.35</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_OR_VibroDoubleBlade"]/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>second edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.44</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.956</armorPenetrationBlunt>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>1.24</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.956</armorPenetrationBlunt>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_OR_VibroDoubleBlade"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_OR_VibroDoubleBlade"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>0.7</MeleeParryChance>
-							<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_OR_VibroCleaver"]/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>37</power>
-								<cooldownTime>2.54</cooldownTime>
-								<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
-								<armorPenetrationSharp>17</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>2.34</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.956</armorPenetrationBlunt>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_OR_VibroCleaver"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_OR_VibroCleaver"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>0.35</MeleeParryChance>
-							<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_OR_VibroGlaive"]/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>37</power>
-								<cooldownTime>2.88</cooldownTime>
-								<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
-								<armorPenetrationSharp>17</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>32</power>
-								<cooldownTime>2.64</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.956</armorPenetrationBlunt>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_OR_VibroGlaive"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_OR_VibroGlaive"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.4</MeleeCritChance>
-							<MeleeParryChance>0.7</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Lightsaber patch from fully functional lightsaber mod -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="O21_OR_BaseLightsaber"]/statBases</xpath>
-					<value>
-						<Bulk>1.5</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="O21_OR_BaseLightsaber"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<Suppressability>-10</Suppressability>
-							<MeleeCritChance>0.5</MeleeCritChance>
-							<MeleeParryChance>0.65</MeleeParryChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[@Name="O21_OR_LightsaberStandardBase"]/tools/li</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.ToolCE</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="O21_OR_LightsaberStandardBase"]/tools/li[label="hilt"]</xpath>
-					<value>
-						<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="O21_OR_LightsaberStandardBase"]/tools/li[label="blade tip"]</xpath>
-					<value>
-						<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-						<armorPenetrationSharp>1.9</armorPenetrationSharp>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="O21_OR_LightsaberStandardBase"]/tools/li[label="blade edge"]</xpath>
-					<value>
-						<armorPenetrationBlunt>2.992</armorPenetrationBlunt>
-						<armorPenetrationSharp>0.88</armorPenetrationSharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[@Name="O21_OR_LightsaberDoubleBase"]/tools/li</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.ToolCE</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="O21_OR_LightsaberDoubleBase"]/tools/li[label="hilt"]</xpath>
-					<value>
-						<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="O21_OR_LightsaberDoubleBase"]/tools/li[label="blade tip"]</xpath>
-					<value>
-						<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-						<armorPenetrationSharp>1.9</armorPenetrationSharp>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="O21_OR_LightsaberDoubleBase"]/tools/li[label="blade edge"]</xpath>
-					<value>
-						<armorPenetrationBlunt>2.992</armorPenetrationBlunt>
-						<armorPenetrationSharp>0.88</armorPenetrationSharp>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outer Rim Galaxies/Rakata/Patch_OuterRim_Rakata_Weapons.xml b/Patches/O21 Outer Rim Galaxies/Rakata/Patch_OuterRim_Rakata_Weapons.xml
deleted file mode 100644
index 90c615a315..0000000000
--- a/Patches/O21 Outer Rim Galaxies/Rakata/Patch_OuterRim_Rakata_Weapons.xml	
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[O21] Outer Rim Galaxies</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="O21_OR_RakataDagger"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="O21_OR_RakataDagger"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>handle</label>
-											<capacities>
-												<li>Poke</li>
-											</capacities>
-											<power>1.5</power>
-											<cooldownTime>1.26</cooldownTime>
-											<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-											<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>blade</label>
-											<capacities>
-												<li>Cut</li>
-											</capacities>
-											<power>15</power>
-											<cooldownTime>1.18</cooldownTime>
-											<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
-											<armorPenetrationSharp>0.48</armorPenetrationSharp>
-											<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>point</label>
-											<capacities>
-												<li>Stab</li>
-											</capacities>
-											<power>16.5</power>
-											<cooldownTime>1.26</cooldownTime>
-											<chanceFactor>1.33</chanceFactor>
-											<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-											<armorPenetrationSharp>0.63</armorPenetrationSharp>
-											<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="O21_OR_RakataDagger"]/statBases</xpath>
-								<value>
-									<Bulk>1</Bulk>
-									<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="O21_OR_RakataDagger"]</xpath>
-								<value>
-									<equippedStatOffsets>
-										<MeleeCritChance>0.5</MeleeCritChance>
-										<MeleeParryChance>0.15</MeleeParryChance>
-										<MeleeDodgeChance>0.05</MeleeDodgeChance>
-									</equippedStatOffsets>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="O21_OR_RakataWarriorArmor"]/statBases</xpath>
-								<value>
-									<Bulk>100</Bulk>
-									<WornBulk>15</WornBulk>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="O21_OR_RakataWarriorArmor"]/statBases/Mass</xpath>
-								<value>
-									<Mass>15</Mass>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="O21_OR_RakataWarriorArmor"]/statBases/ArmorRating_Sharp</xpath>
-								<value>
-									<ArmorRating_Sharp>12</ArmorRating_Sharp>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="O21_OR_RakataWarriorArmor"]/statBases/ArmorRating_Blunt</xpath>
-								<value>
-									<ArmorRating_Blunt>20</ArmorRating_Blunt>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outer Rim/Patch_OuterRim_Apparel.xml b/Patches/O21 Outer Rim/Patch_OuterRim_Apparel.xml
deleted file mode 100644
index ecd4232794..0000000000
--- a/Patches/O21 Outer Rim/Patch_OuterRim_Apparel.xml	
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outer Rim - Tatooine (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_OuterRim_JawaRobe" or defName="O21_OuterRim_TuskenRaiderRobeA" or defName="O21_OuterRim_TuskenRaiderRobeB"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>40</CarryBulk>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_OuterRim_JawaRobe" or defName="O21_OuterRim_TuskenRaiderRobeA" or defName="O21_OuterRim_TuskenRaiderRobeB"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_OuterRim_JawaRobe" or defName="O21_OuterRim_TuskenRaiderRobeA" or defName="O21_OuterRim_TuskenRaiderRobeB"]/statBases</xpath>
-					<value>
-						<Bulk>7.5</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_OuterRim_JawaRobe" or defName="O21_OuterRim_TuskenRaiderRobeA" or defName="O21_OuterRim_TuskenRaiderRobeB"]/apparel/layers</xpath>
-					<value>
-						<li>Backpack</li>
-						<li>Webbing</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Jawa"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.05</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Leather_Jawa"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.02</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outer Rim/Patch_OuterRim_Factions.xml b/Patches/O21 Outer Rim/Patch_OuterRim_Factions.xml
deleted file mode 100644
index 8380d926d3..0000000000
--- a/Patches/O21 Outer Rim/Patch_OuterRim_Factions.xml	
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outer Rim - Faction - Tatooine (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="O21_NPC_TuskenRaiderTrooperRanged" or
-						defName="O21_NPC_TuskenRaiderOfficer" or
-						defName="O21_NPC_TuskenRaiderCommander"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>4</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.3</generateChance>
-									<sidearmMoney>
-										<min>20</min>
-										<max>120</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>TuskenRaiderWeapons</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="O21_NPC_JawaChief" or
-						defName="O21_NPC_JawaTrader" or
-						defName="O21_NPC_JawaScavenger" or
-						defName="O21_NPC_JawaMechanic" or
-						defName="O21_NPC_JawaShaman" or
-						defName="O21_NPC_JawaVillager"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>4</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outer Rim/Patch_OuterRim_Races.xml b/Patches/O21 Outer Rim/Patch_OuterRim_Races.xml
deleted file mode 100644
index a191f371ac..0000000000
--- a/Patches/O21 Outer Rim/Patch_OuterRim_Races.xml	
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outer Rim - Tatooine (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Jawa -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Jawa"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Jawa"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1.35</MeleeDodgeChance>
-						<MeleeCritChance>0.75</MeleeCritChance>
-						<MeleeParryChance>0.9</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Jawa"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>0.8</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>0.8</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1.6</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Jawa"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Jawa"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Jawa"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Jawa"]/race/baseBodySize</xpath>
-					<value>
-						<baseBodySize>0.8</baseBodySize>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Jawa"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>0.8</baseHealthScale>
-					</value>
-				</li>
-
-				<!-- Tusken -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_TuskenRaider"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_TuskenRaider"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.9</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_TuskenRaider"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1.1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1.1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2.2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_TuskenRaider"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_TuskenRaider"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_TuskenRaider"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_TuskenRaider"]/race/baseBodySize</xpath>
-					<value>
-						<baseBodySize>1.1</baseBodySize>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_TuskenRaider"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>1.1</baseHealthScale>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outer Rim/Patch_OuterRim_Resources.xml b/Patches/O21 Outer Rim/Patch_OuterRim_Resources.xml
deleted file mode 100644
index c48b3073e2..0000000000
--- a/Patches/O21 Outer Rim/Patch_OuterRim_Resources.xml	
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[O21] Outer Rim - Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_OuterRim_Durasteel" or defName="O21_OuterRim_Beskar"]/stuffProps/categories</xpath>
-					<value>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[defName="O21_OuterRim_Blaster"]/armorCategory</xpath>
-					<value>
-						<armorCategory>Sharp</armorCategory>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outer Rim/Patch_OuterRim_SandCrawler.xml b/Patches/O21 Outer Rim/Patch_OuterRim_SandCrawler.xml
deleted file mode 100644
index f145f7cda0..0000000000
--- a/Patches/O21 Outer Rim/Patch_OuterRim_SandCrawler.xml	
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outer Rim - Tatooine Sandcrawler (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<CombatExtended.BodyShapeDef>
-							<defName>Sandcrawler_Shape</defName>
-							<width>0.25</width>
-							<widthLaying>0.25</widthLaying>
-							<height>0.01</height>
-							<heightLaying>0.01</heightLaying>
-						</CombatExtended.BodyShapeDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Sandcrawler"]/race/baseBodySize</xpath>
-					<value>
-						<baseBodySize>10</baseBodySize>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Sandcrawler"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Sandcrawler_Shape</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Sandcrawler"]/statBases</xpath>
-					<value>
-						<CarryWeight>400</CarryWeight>
-						<CarryBulk>80</CarryBulk>
-						<MeleeDodgeChance>0</MeleeDodgeChance>
-						<MeleeCritChance>0</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-						<MaxHitPoints>1000</MaxHitPoints>
-						<SmokeSensitivity>0</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Sandcrawler"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>30</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Sandcrawler"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Sandcrawler"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>3.51</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MechanicalSandcrawler"]//*[def="FrontHatch"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MechanicalSandcrawler"]//*[def="FrontWindow" or def="Reactor" or def="FluidReprocessor"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outer Rim/Patch_OuterRim_Weapons.xml b/Patches/O21 Outer Rim/Patch_OuterRim_Weapons.xml
deleted file mode 100644
index 7827c2212b..0000000000
--- a/Patches/O21 Outer Rim/Patch_OuterRim_Weapons.xml	
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outer Rim - Tatooine (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmChargedBullet">
-							<defName>Bullet_Ion_Energy</defName>
-							<label>Ion Energy</label>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_Ion_Energy</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>EMP</damageDef>
-								<damageAmountBase>23</damageAmountBase>
-								<speed>60</speed>
-								<gravityFactor>0.5</gravityFactor>
-								<explosionRadius>1.5</explosionRadius>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							</projectile>
-						</ThingDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Tusken</defName>
-							<label>12 Gauge</label>
-							<ammoTypes>
-								<Ammo_12Gauge_Slug>Bullet_12Gauge_Slug</Ammo_12Gauge_Slug>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="O21_JawaIonBlaster" or
-						defName="O21_TuskenCycler"
-						]/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>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>O21_JawaIonBlaster</defName>
-					<statBases>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.21</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>3.00</Bulk>
-						<Mass>4.10</Mass>
-						<RangedWeapon_Cooldown>2.5</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Ion_Energy</defaultProjectile>
-						<warmupTime>2</warmupTime>
-						<range>35</range>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<!--
-				<AmmoUser>
-					<magazineSize>18</magazineSize>
-					<reloadTime>3.7</reloadTime>
-					<ammoSet>AmmoSet_SWPlasmaGasCartridgeJawa</ammoSet>
-				</AmmoUser>
-				-->
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>O21_TuskenCycler</defName>
-					<statBases>
-						<SightsEfficiency>0.9</SightsEfficiency>
-						<ShotSpread>0.5</ShotSpread>
-						<SwayFactor>1.8</SwayFactor>
-						<Bulk>3.00</Bulk>
-						<Mass>4.10</Mass>
-						<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Slug</defaultProjectile>
-						<warmupTime>2</warmupTime>
-						<range>45</range>
-						<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-						<burstShotCount>2</burstShotCount>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>16</magazineSize>
-						<reloadTime>4.0</reloadTime>
-						<ammoSet>AmmoSet_Tusken</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="O21_Gaderffii"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1</cooldownTime>
-								<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
-								<!--<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>-->
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>3.5</cooldownTime>
-								<armorPenetrationBlunt>0.956</armorPenetrationBlunt>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_Gaderffii"]/statBases</xpath>
-					<value>
-						<Bulk>8.5</Bulk>
-						<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="O21_Gaderffii"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.17</MeleeCritChance>
-							<MeleeParryChance>1.45</MeleeParryChance>
-							<MeleeDodgeChance>0.9</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outland - Core/Apparel_Outland.xml b/Patches/O21 Outland - Core/Apparel_Outland.xml
deleted file mode 100644
index eabb7bf5c3..0000000000
--- a/Patches/O21 Outland - Core/Apparel_Outland.xml	
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outland - Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Cloak -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_ShoulderCloak"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-						<Bulk>3.5</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<!-- Heavy Tribalwear & Padding -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_HeavyTribalPadding" or defName="Outland_HeavyTribalwear"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
-						<Bulk>3.5</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outland - Core/Buildings_Security.xml b/Patches/O21 Outland - Core/Buildings_Security.xml
deleted file mode 100644
index 198f37c26e..0000000000
--- a/Patches/O21 Outland - Core/Buildings_Security.xml	
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outland - Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Outland_Ballista" or defName="Outland_Mangonel"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Outland_Ballista" or defName="Outland_Mangonel"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName = "Outland_Gun_Mangonel" or defName="Outland_Gun_BallistaTurret"]/building</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName = "Outland_Gun_Mangonel" or defName="Outland_Gun_BallistaTurret"]/comps/li[@Class="CompProperties_ChangeableProjectile"]</xpath>
-				</li>
-
-				<!-- ========== Ballista - Weapon ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Outland_Gun_BallistaTurret</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>1</ShotSpread>
-						<SwayFactor>1</SwayFactor>
-						<Bulk>4.00</Bulk>
-						<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Pilum_Fired</defaultProjectile>
-						<warmupTime>1.4</warmupTime>
-						<range>44</range>
-						<soundCast>Bow_Large</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>8</reloadTime>
-						<ammoSet>AmmoSet_Javelins</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>false</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Catapult - Weapon ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_Gun_Mangonel"]/statBases</xpath>
-					<value>
-						<SightsEfficiency>0.5</SightsEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Outland_Gun_Mangonel"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Charges">
-							<chargeSpeeds>
-								<li>10</li>
-								<li>20</li>
-								<li>30</li>
-								<li>50</li>
-								<li>70</li>
-							</chargeSpeeds>
-						</li>
-						<li Class="CombatExtended.CompProperties_AmmoUser">
-							<magazineSize>1</magazineSize>
-							<reloadTime>12</reloadTime>
-							<ammoSet>AmmoSet_Catapult</ammoSet>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Outland_Gun_Mangonel"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-								<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Projectile_CatapultBullet_Boulder</defaultProjectile>
-								<warmupTime>4</warmupTime>
-								<minRange>30</minRange>
-								<range>500</range>
-								<burstShotCount>1</burstShotCount>
-								<soundCast>Bow_Recurve</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<indirectFirePenalty>0.2</indirectFirePenalty>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Outland_Gun_Mangonel"]/weaponTags</xpath>
-					<value>
-						<li>TurretGun</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outland - Core/Items_Resources.xml b/Patches/O21 Outland - Core/Items_Resources.xml
deleted file mode 100644
index 6bafd04ecb..0000000000
--- a/Patches/O21 Outland - Core/Items_Resources.xml	
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outland - Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Bones -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_Bones"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.25</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_Bones"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_Bones"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.99</cooldownTime>
-								<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Siege Weapon Ammo -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Outland_Ammo_BallistaBolt"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/RecipeDef[defName="Outland_Make_BallistaBolts"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Outland_Ammo_RoundShot"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/RecipeDef[defName="Outland_Make_RoundShots"]</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outland - Core/ThingDef_Projectiles.xml b/Patches/O21 Outland - Core/ThingDef_Projectiles.xml
deleted file mode 100644
index a436d99f91..0000000000
--- a/Patches/O21 Outland - Core/ThingDef_Projectiles.xml	
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outland - Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Projectiles -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_Projectile_ArcaneShard"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<damageDef>Outland_ArcaneDamage</damageDef>
-							<damageAmountBase>9</damageAmountBase>
-							<armorPenetrationSharp>4</armorPenetrationSharp>
-							<armorPenetrationBlunt>9.66</armorPenetrationBlunt>
-							<speed>60</speed>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_Projectile_ArcaneBolt"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<damageDef>Outland_ArcaneDamage</damageDef>
-							<damageAmountBase>14</damageAmountBase>
-							<armorPenetrationSharp>6</armorPenetrationSharp>
-							<armorPenetrationBlunt>12.18</armorPenetrationBlunt>
-							<speed>60</speed>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_Projectile_ArcaneBlast"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<damageDef>Outland_ArcaneDamage</damageDef>
-							<damageAmountBase>18</damageAmountBase>
-							<armorPenetrationSharp>8.5</armorPenetrationSharp>
-							<armorPenetrationBlunt>18.18</armorPenetrationBlunt>
-							<speed>60</speed>
-						</projectile>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outland - Eastborn/Apparel_Eastborn.xml b/Patches/O21 Outland - Eastborn/Apparel_Eastborn.xml
deleted file mode 100644
index 9921ed38f9..0000000000
--- a/Patches/O21 Outland - Eastborn/Apparel_Eastborn.xml	
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outland - Eastborn Empire</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Hakama -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_Hakama"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-						<Bulk>2.5</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<!-- Ninja Garb -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_NinjaGarb"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-						<Bulk>2.5</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<!-- Ninja Mask -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_NinjaHood"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-						<Bulk>1</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<!-- Haygrass Hat / Conical Hat -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_HaygrassHat"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Shogun Cuirass (has same stats as vanilla plate armor) -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_ShogunCuirass"]/statBases</xpath>
-					<value>
-						<Bulk>90</Bulk>
-						<WornBulk>12.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_ShogunCuirass"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Shogun Pauldrons -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_ShogunPauldrons"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>2.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_ShogunPauldrons"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Shogun Helmet -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_ShogunHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_ShogunHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.75</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outland - Eastborn/Eastborn_WeaponsMelee.xml b/Patches/O21 Outland - Eastborn/Eastborn_WeaponsMelee.xml
deleted file mode 100644
index 27623c6dd9..0000000000
--- a/Patches/O21 Outland - Eastborn/Eastborn_WeaponsMelee.xml	
+++ /dev/null
@@ -1,672 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outland - Eastborn Empire</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Tanto -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_Tanto"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>0.97</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.259</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>0.97</cooldownTime>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>0.259</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.48</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.05</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>0.304</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.28</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_Tanto"]/statBases</xpath>
-					<value>
-						<Bulk>4.2</Bulk>
-						<MeleeCounterParryBonus>0.38</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_Tanto"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.93</MeleeCritChance>
-							<MeleeParryChance>0.38</MeleeParryChance>
-							<MeleeDodgeChance>0.09</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Jitte -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_Jitte"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.68</cooldownTime>
-								<armorPenetrationBlunt>2.188</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_Jitte"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_Jitte"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>1</MeleeParryChance>
-							<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_Jitte"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- Ararebo -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_Ararebo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.49</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>3.375</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>2.67</cooldownTime>
-								<armorPenetrationBlunt>15.75</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_Ararebo"]/statBases</xpath>
-					<value>
-						<Bulk>14</Bulk>
-						<MeleeCounterParryBonus>0.28</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_Ararebo"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.6</MeleeCritChance>
-							<MeleeParryChance>0.38</MeleeParryChance>
-							<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Yari -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_JumonjiYari" or defName="Outland_SuYari"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.29</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>1.913</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.71</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.85</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.14</cooldownTime>
-								<chanceFactor>1.00</chanceFactor>
-								<armorPenetrationBlunt>1.913</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.4</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>3.2</cooldownTime>
-								<chanceFactor>0.33</chanceFactor>
-								<armorPenetrationBlunt>1.913</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.28</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_JumonjiYari" or defName="Outland_SuYari"]/statBases</xpath>
-					<value>
-						<Bulk>11</Bulk>
-						<MeleeCounterParryBonus>2.12</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_JumonjiYari" or defName="Outland_SuYari"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.39</MeleeCritChance>
-							<MeleeParryChance>1.59</MeleeParryChance>
-							<MeleeDodgeChance>0.90</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Odachi -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_Nagamaki" or defName="Outland_Odachi"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.38</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>1.08</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.38</cooldownTime>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>1.08</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.55</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>1.49</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_Nagamaki" or defName="Outland_Odachi"]/statBases</xpath>
-					<value>
-						<Bulk>9</Bulk>
-						<MeleeCounterParryBonus>3.6</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_Nagamaki" or defName="Outland_Odachi"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.74</MeleeCritChance>
-							<MeleeParryChance>0.53</MeleeParryChance>
-							<MeleeDodgeChance>0.60</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Ono -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_Ono"]/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="Outland_Ono"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_Ono"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.10</MeleeCritChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-							<MeleeDodgeChance>0.20</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_Ono"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- Sai -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_Kabutowari" or defName="Outland_Sai"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.29</cooldownTime>
-								<armorPenetrationBlunt>0.275</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.29</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.275</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_Kabutowari" or defName="Outland_Sai"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_Kabutowari" or defName="Outland_Sai"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.63</MeleeCritChance>
-							<MeleeParryChance>0.5</MeleeParryChance>
-							<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_Kabutowari" or defName="Outland_Sai"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- Sasumata -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_Sasumata"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.78</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>1.000</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2.79</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>6.76</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_Sasumata"]/statBases</xpath>
-					<value>
-						<Bulk>7</Bulk>
-						<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_Sasumata"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.50</MeleeCritChance>
-							<MeleeParryChance>0.18</MeleeParryChance>
-							<MeleeDodgeChance>0.30</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Katana -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_Katana"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.33</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.936</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.33</cooldownTime>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>0.936</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.88</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>31</power>
-								<cooldownTime>1.28</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>2.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.65</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_Katana"]/statBases</xpath>
-					<value>
-						<Bulk>7.85</Bulk>
-						<MeleeCounterParryBonus>1.38</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_Katana"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.85</MeleeCritChance>
-							<MeleeParryChance>0.69</MeleeParryChance>
-							<MeleeDodgeChance>0.37</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Masakari Axe -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_Masakari"]/statBases</xpath>
-					<value>
-						<Bulk>13</Bulk>
-						<MeleeCounterParryBonus>1.5</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_Masakari"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.3</MeleeCritChance>
-							<MeleeParryChance>1.6</MeleeParryChance>
-							<MeleeDodgeChance>0.56</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_Masakari"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>48</power>
-								<cooldownTime>3.4</cooldownTime>
-								<chanceFactor>1.165</chanceFactor>
-								<armorPenetrationBlunt>10.4</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.8</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<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>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Naginata -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_Naginata"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.76</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>0.95</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.76</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationSharp>1.9</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.95</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>32</power>
-								<cooldownTime>1.41</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationSharp>1.27</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_Naginata"]/statBases</xpath>
-					<value>
-						<Bulk>14</Bulk>
-						<MeleeCounterParryBonus>1.78</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_Naginata"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.56</MeleeCritChance>
-							<MeleeParryChance>0.75</MeleeParryChance>
-							<MeleeDodgeChance>0.6</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outland - Eastborn/Eastborn_WeaponsRanged.xml b/Patches/O21 Outland - Eastborn/Eastborn_WeaponsRanged.xml
deleted file mode 100644
index 2522c83baa..0000000000
--- a/Patches/O21 Outland - Eastborn/Eastborn_WeaponsRanged.xml	
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outland - Eastborn Empire</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Yumi ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Outland_Yumi</defName>
-					<statBases>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>1</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>8.00</Bulk>
-						<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_StreamlinedArrow_Steel</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>20</range>
-						<soundCast>Bow_Recurve</soundCast>
-					</Properties>
-					<AmmoUser>
-						<ammoSet>AmmoSet_StreamlinedArrow</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_Bow</li>
-					</weaponTags>
-					<researchPrerequisite>RecurveBow</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_Yumi"]/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>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Outland_EastbornMatchlock</defName>
-					<statBases>
-						<Mass>1.45</Mass>
-						<Bulk>4</Bulk>
-						<SwayFactor>1.24</SwayFactor>
-						<ShotSpread>0.37</ShotSpread>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_SlowMusketBall</defaultProjectile>
-						<warmupTime>1.86</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Revolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>5</AmmoGenPerMagOverride>
-						<reloadTime>6.9</reloadTime>
-						<ammoSet>AmmoSet_SlowMusketBall</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- Melee -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_EastbornMatchlock"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outland - Eastborn/PawnKinds_Eastborn.xml b/Patches/O21 Outland - Eastborn/PawnKinds_Eastborn.xml
deleted file mode 100644
index 4e5886c209..0000000000
--- a/Patches/O21 Outland - Eastborn/PawnKinds_Eastborn.xml	
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outland - Eastborn Empire</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Give ammo to pawns with ranged weapons. -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>
-						Defs/PawnKindDef[
-						defName="Outland_Ninja" or
-						defName="Outland_Bowman" or
-						defName="Outland_Emperor"]
-					</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>12</min>
-								<max>18</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.3</generateChance>
-									<sidearmMoney>
-										<min>150</min>
-										<max>350</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>EastbornLightSharp</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- Give tribal backpacks to pawns with ranged weapons. -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/PawnKindDef[
-						defName="Outland_Ninja" or
-						defName="Outland_Emperor"]/apparelRequired
-					</xpath>
-					<value>
-						<li>CE_Apparel_TribalBackpack</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[defName="Outland_Bowman"]</xpath>
-					<value>
-						<apparelRequired>
-							<li>CE_Apparel_TribalBackpack</li>
-						</apparelRequired>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/PawnKindDef[
-						defName="Outland_Bowman" or
-						defName="Outland_Emperor"]/specificApparelRequirements
-					</xpath>
-					<value>
-						<li>
-							<apparelLayer>Backpack</apparelLayer>
-							<color>(50, 123, 168)</color>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/PawnKindDef[defName="Outland_Ninja"]/specificApparelRequirements
-					</xpath>
-					<value>
-						<li>
-							<apparelLayer>Backpack</apparelLayer>
-							<color>(90, 90, 90)</color>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outland - Eastborn/Races_Elf.xml b/Patches/O21 Outland - Eastborn/Races_Elf.xml
deleted file mode 100644
index 3811ee6a02..0000000000
--- a/Patches/O21 Outland - Eastborn/Races_Elf.xml	
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outland - Eastborn Empire</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Outland Elves are identical to humans and use their bodyDef, aside from higher dodge. -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Elf"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Elf"]/statBases/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>2</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Elf"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Elf"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Elf"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Elf"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outland - Eastborn/Scenarios_Eastborn.xml b/Patches/O21 Outland - Eastborn/Scenarios_Eastborn.xml
deleted file mode 100644
index f6fc168182..0000000000
--- a/Patches/O21 Outland - Eastborn/Scenarios_Eastborn.xml	
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outland - Eastborn Empire</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Starting Things ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="Outland_EastbornExpedition"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_Arrow_Steel</thingDef>
-							<count>100</count>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outland - Motz Coalition/Apparel_MotzPatch.xml b/Patches/O21 Outland - Motz Coalition/Apparel_MotzPatch.xml
deleted file mode 100644
index acbeb71a1b..0000000000
--- a/Patches/O21 Outland - Motz Coalition/Apparel_MotzPatch.xml	
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outland - Motz Coalition</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- captain helmet-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_MotzCaptainHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4.0</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_MotzCaptainHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Outland_MotzCaptainHelmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.9</ArmorRating_Sharp>
-									<parts>
-										<li>Jaw</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.9</ArmorRating_Blunt>
-									<parts>
-										<li>Jaw</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- motz helmet-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_MotzHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4.0</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_MotzHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Outland_MotzHelmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.8</ArmorRating_Sharp>
-									<parts>
-										<li>Jaw</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.8</ArmorRating_Blunt>
-									<parts>
-										<li>Jaw</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!--Shoulderpads-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_MotzPauldrons"]/statBases/Mass</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<WornBulk>1.0</WornBulk>
-						<Mass>1.0</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_MotzPauldrons"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!--Cuirass-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_MotzCuirass"]/statBases</xpath>
-					<value>
-						<Bulk>50</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_MotzCuirass"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.25</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_MotzCuirass"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeDodgeChance>-0.07</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Outland_MotzCuirass"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.75</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-										<li>Foot</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-										<li>Foot</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!--Tunic-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_MotzTunic"]/statBases</xpath>
-					<value>
-						<Bulk>1.4</Bulk>
-						<WornBulk>0.4</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_MotzTunic"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.6</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outland - Motz Coalition/MotzWeapons_Patch.xml b/Patches/O21 Outland - Motz Coalition/MotzWeapons_Patch.xml
deleted file mode 100644
index f8333c02d8..0000000000
--- a/Patches/O21 Outland - Motz Coalition/MotzWeapons_Patch.xml	
+++ /dev/null
@@ -1,506 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outland - Motz Coalition</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Dory Spear-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_DorySpear"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>1.08</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_DorySpear"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>1.45</MeleeParryChance>
-							<MeleeDodgeChance>0.6</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_DorySpear"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.25</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.5</cooldownTime>
-								<chanceFactor>0.95</chanceFactor>
-								<armorPenetrationBlunt>4.1</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.6</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.5</cooldownTime>
-								<chanceFactor>0.95</chanceFactor>
-								<armorPenetrationBlunt>5.0</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.95</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Epsilon Axe-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_EpsilonAxe"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<MeleeCounterParryBonus>0.22</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_EpsilonAxe"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.31</MeleeCritChance>
-							<MeleeParryChance>0.22</MeleeParryChance>
-							<MeleeDodgeChance>0.22</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_EpsilonAxe"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_EpsilonAxe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>0.95</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>0.95</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.9</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Kopis -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_Kopis"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_Kopis"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.40</MeleeCritChance>
-							<MeleeParryChance>0.60</MeleeParryChance>
-							<MeleeDodgeChance>0.30</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_Kopis"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_Kopis"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2.1</cooldownTime>
-								<chanceFactor>0.50</chanceFactor>
-								<armorPenetrationBlunt>0.65</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>0.45</chanceFactor>
-								<armorPenetrationBlunt>1.1</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.68</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- labrys axe -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_LabrysAxe"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<MeleeCounterParryBonus>0.38</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_LabrysAxe"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.31</MeleeCritChance>
-							<MeleeParryChance>0.40</MeleeParryChance>
-							<MeleeDodgeChance>0.22</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_LabrysAxe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<chanceFactor>0.1</chanceFactor>
-								<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.95</cooldownTime>
-								<chanceFactor>0.9</chanceFactor>
-								<armorPenetrationBlunt>11</armorPenetrationBlunt>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Machaira-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_Machaira"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_Machaira"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.40</MeleeCritChance>
-							<MeleeParryChance>0.60</MeleeParryChance>
-							<MeleeDodgeChance>0.30</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_Machaira"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_Machaira"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2.1</cooldownTime>
-								<chanceFactor>0.50</chanceFactor>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>0.45</chanceFactor>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.8</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Rapier -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_Rapier"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_Rapier"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>2.50</MeleeCritChance>
-							<MeleeParryChance>1</MeleeParryChance>
-							<MeleeDodgeChance>0.50</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_Rapier"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.25</cooldownTime>
-								<chanceFactor>0.85</chanceFactor>
-								<armorPenetrationBlunt>2.3</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.46</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.68</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Xiphos -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_Xiphos"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_Xiphos"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.15</MeleeCritChance>
-							<MeleeParryChance>0.30</MeleeParryChance>
-							<MeleeDodgeChance>0.30</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_Xiphos"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_Xiphos"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.36</cooldownTime>
-								<chanceFactor>0.95</chanceFactor>
-								<armorPenetrationBlunt>1.05</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.68</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- crossbow -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_MotzCrossbow"]/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>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Outland_MotzCrossbow</defName>
-					<statBases>
-						<Bulk>6</Bulk>
-						<SwayFactor>1.2</SwayFactor>
-						<ShotSpread>0.5</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>70</WoodLog>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Projectile_CrossbowBolt_Steel</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>20</range>
-						<soundCast>Bow_Large</soundCast>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>7</reloadTime>
-						<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>NeolithicRangedHeavy</li>
-						<li>NeolithicRangedChief</li>
-						<li>CE_Bow</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outland - Motz Coalition/Motz_PawnkindPatch.xml b/Patches/O21 Outland - Motz Coalition/Motz_PawnkindPatch.xml
deleted file mode 100644
index 9f823b0f3f..0000000000
--- a/Patches/O21 Outland - Motz Coalition/Motz_PawnkindPatch.xml	
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outland - Motz Coalition</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Outland_MotzArcher" or defName="Outland_MotzHopliteCaptain" or defName="Outland_MotzArcherCaptain" or defName="Outland_Councillor"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>7</min>
-								<max>10</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>500</min>
-									<max>700</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>MotzLightSharp</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Outland_MotzHoplite" or defName="Outland_MotzMilitia"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>220</min>
-								<max>320</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[@Name="Motz_PawnKindBase"]/apparelRequired</xpath>
-					<value>
-						<li>CE_Apparel_TribalBackpack</li>
-					</value>
-				</li>
-
-				<!-- AI Motz carried way too much Pemmican, increasing carried bulk-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[@Name="Motz_PawnKindBase"]/invNutrition</xpath>
-					<value>
-						<invNutrition>1.8</invNutrition>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outland - Motz Coalition/Oxcet_BodyPatch.xml b/Patches/O21 Outland - Motz Coalition/Oxcet_BodyPatch.xml
deleted file mode 100644
index d1d82f86f0..0000000000
--- a/Patches/O21 Outland - Motz Coalition/Oxcet_BodyPatch.xml	
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outland - Motz Coalition</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Outland_Oxect"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Outland_Oxect"]/combatPower</xpath>
-					<value>
-						<combatPower>250</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_Oxect"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_Oxect"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_Oxect"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>3.60</MoveSpeed>
-						<MeleeDodgeChance>0.08</MeleeDodgeChance>
-						<MeleeCritChance>0.8</MeleeCritChance>
-						<MeleeParryChance>0.23</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_Oxect"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head claw</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.6</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2.68</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outland - Motz Coalition/Race_MotzPatch.xml b/Patches/O21 Outland - Motz Coalition/Race_MotzPatch.xml
deleted file mode 100644
index 244f74ad0a..0000000000
--- a/Patches/O21 Outland - Motz Coalition/Race_MotzPatch.xml	
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outland - Motz Coalition</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Motz"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Motz"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<ReloadSpeed>1.0</ReloadSpeed>
-						<Suppressability>0.60</Suppressability>
-						<SmokeSensitivity>0.2</SmokeSensitivity>
-						<!--Moths can see in the dark and natural light blinds them-->
-						<NightVisionEfficiency>1</NightVisionEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Motz"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>0.3</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Motz"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Motz"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.0</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Motz"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Motz"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Motz"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outland - Motz Coalition/ScenarioPatch.xml b/Patches/O21 Outland - Motz Coalition/ScenarioPatch.xml
deleted file mode 100644
index 54e3a62f6e..0000000000
--- a/Patches/O21 Outland - Motz Coalition/ScenarioPatch.xml	
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outland - Motz Coalition</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="Outland_MotzTraders"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_CrossbowBolt_Steel</thingDef>
-							<count>50</count>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="Outland_MotzTraders"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_CrossbowBolt_Flame</thingDef>
-							<count>25</count>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outland - Redburn Pact/Apparel_Redburn.xml b/Patches/O21 Outland - Redburn Pact/Apparel_Redburn.xml
deleted file mode 100644
index 03224b79a6..0000000000
--- a/Patches/O21 Outland - Redburn Pact/Apparel_Redburn.xml	
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outland - Redburn Pact</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Pact Furs -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_PactFurs"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-						<Bulk>2.5</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<!-- Pact Harness -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_PactHarness"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
-						<Bulk>7</Bulk>
-						<WornBulk>3.5</WornBulk>
-					</value>
-				</li>
-
-				<!-- Pact Leather Helmet -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_PactLeatherHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<!-- Pact Caster Mask -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_TribalMask_PactCaster"]</xpath>
-					<value>
-						<statBases>
-							<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-							<Bulk>1</Bulk>
-							<WornBulk>0.5</WornBulk>
-						</statBases>
-					</value>
-				</li>
-
-				<!-- Pact Cap -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_PactCap"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-						<Bulk>1</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<!-- Pact Fur Helmet -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_PactFurHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<!-- Pact Warlord Cuirass (has same stats as vanilla plate armor) -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_PactWarlordCuirass"]/statBases</xpath>
-					<value>
-						<Bulk>90</Bulk>
-						<WornBulk>12.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_PactWarlordCuirass"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Pact Warlord Pauldrons -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_PactWarlordPauldrons"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>2.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_PactWarlordPauldrons"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Pact Warlord Helmet -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_PactWarlordHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_PactWarlordHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.75</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outland - Redburn Pact/Buildings_Security.xml b/Patches/O21 Outland - Redburn Pact/Buildings_Security.xml
deleted file mode 100644
index 96295802dc..0000000000
--- a/Patches/O21 Outland - Redburn Pact/Buildings_Security.xml	
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outland - Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Pact Catapult -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_PactCatapult"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_PactCatapult"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Outland_Gun_PactCatapult"]/building</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Outland_Gun_PactCatapult"]/comps/li[@Class="CompProperties_ChangeableProjectile"]</xpath>
-				</li>
-
-				<!-- Pact Catapult - Weapon -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_Gun_PactCatapult"]/statBases</xpath>
-					<value>
-						<SightsEfficiency>0.5</SightsEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Outland_Gun_PactCatapult"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Charges">
-							<chargeSpeeds>
-								<li>10</li>
-								<li>20</li>
-								<li>30</li>
-								<li>50</li>
-								<li>70</li>
-							</chargeSpeeds>
-						</li>
-						<li Class="CombatExtended.CompProperties_AmmoUser">
-							<magazineSize>1</magazineSize>
-							<reloadTime>12</reloadTime>
-							<ammoSet>AmmoSet_Catapult</ammoSet>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Outland_Gun_PactCatapult"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-								<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Projectile_CatapultBullet_Boulder</defaultProjectile>
-								<warmupTime>4</warmupTime>
-								<minRange>30</minRange>
-								<range>500</range>
-								<burstShotCount>1</burstShotCount>
-								<soundCast>Bow_Recurve</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<indirectFirePenalty>0.2</indirectFirePenalty>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Outland_Gun_PactCatapult"]/weaponTags</xpath>
-					<value>
-						<li>TurretGun</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outland - Redburn Pact/PawnKinds_Redburn.xml b/Patches/O21 Outland - Redburn Pact/PawnKinds_Redburn.xml
deleted file mode 100644
index 608de31e28..0000000000
--- a/Patches/O21 Outland - Redburn Pact/PawnKinds_Redburn.xml	
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outland - Redburn Pact</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Give ammo to pawns with ranged weapons. -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Outland_PactArcher" or defName="Outland_PactArcherCaptain" or defName="Outland_Ascensionist"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>12</min>
-								<max>18</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.3</generateChance>
-									<sidearmMoney>
-										<min>150</min>
-										<max>350</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>EastbornLightSharp</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- Give tribal backpacks to pawns with ranged weapons. -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[defName="Outland_Ascensionist"]/apparelRequired</xpath>
-					<value>
-						<li>CE_Apparel_TribalBackpack</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[defName="Outland_PactArcher" or defName="Outland_PactArcherCaptain"]</xpath>
-					<value>
-						<apparelRequired>
-							<li>CE_Apparel_TribalBackpack</li>
-						</apparelRequired>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[defName="Outland_PactArcher" or defName="Outland_PactArcherCaptain" or defName="Outland_Ascensionist"]/specificApparelRequirements</xpath>
-					<value>
-						<li>
-							<apparelLayer>Backpack</apparelLayer>
-							<color>(50, 123, 168)</color>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outland - Redburn Pact/Races_Goblin.xml b/Patches/O21 Outland - Redburn Pact/Races_Goblin.xml
deleted file mode 100644
index 03b9fcb3fb..0000000000
--- a/Patches/O21 Outland - Redburn Pact/Races_Goblin.xml	
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outland - Redburn Pact</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Goblin -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Goblin"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Goblin"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>0.6</MeleeCritChance>
-						<MeleeParryChance>0.8</MeleeParryChance>
-						<CarryWeight>20</CarryWeight>
-						<CarryBulk>15</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Goblin"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hand</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.19</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hand</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.19</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.19</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Goblin"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Goblin"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Goblin"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outland - Redburn Pact/Races_Hobgoblin.xml b/Patches/O21 Outland - Redburn Pact/Races_Hobgoblin.xml
deleted file mode 100644
index 93cf756448..0000000000
--- a/Patches/O21 Outland - Redburn Pact/Races_Hobgoblin.xml	
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outland - Redburn Pact</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Hobgoblin -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Hobgoblin"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Hobgoblin"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4.3</MoveSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Hobgoblin"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.90</MeleeDodgeChance>
-						<MeleeCritChance>1.1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<SmokeSensitivity>1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Hobgoblin"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>4.96</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.938</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.57</cooldownTime>
-								<chanceFactor>0.33</chanceFactor>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Hobgoblin"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Hobgoblin"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Hobgoblin"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outland - Redburn Pact/Races_Orc.xml b/Patches/O21 Outland - Redburn Pact/Races_Orc.xml
deleted file mode 100644
index b705125d23..0000000000
--- a/Patches/O21 Outland - Redburn Pact/Races_Orc.xml	
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outland - Redburn Pact</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Orc -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Orc"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Orc"]/race/baseBodySize</xpath>
-					<value>
-						<baseBodySize>1.1</baseBodySize>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Orc"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4.35</MoveSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Orc"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.95</MeleeDodgeChance>
-						<MeleeCritChance>1.05</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<SmokeSensitivity>0.90</SmokeSensitivity>
-						<CarryWeight>41</CarryWeight>
-						<CarryBulk>22</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Orc"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.42</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.42</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>4.88</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.875</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.57</cooldownTime>
-								<chanceFactor>0.33</chanceFactor>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Orc"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Orc"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Orc"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outland - Redburn Pact/Races_Varag.xml b/Patches/O21 Outland - Redburn Pact/Races_Varag.xml
deleted file mode 100644
index b45a7ea319..0000000000
--- a/Patches/O21 Outland - Redburn Pact/Races_Varag.xml	
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outland - Redburn Pact</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Varag -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Varag"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Varag"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>0.6</MeleeCritChance>
-						<MeleeParryChance>0.8</MeleeParryChance>
-						<CarryWeight>20</CarryWeight>
-						<CarryBulk>15</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Varag"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hand</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.19</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hand</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.19</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.19</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Varag"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Varag"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Outland_Varag"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outland - Redburn Pact/Redburn_WeaponsMelee.xml b/Patches/O21 Outland - Redburn Pact/Redburn_WeaponsMelee.xml
deleted file mode 100644
index b43ad7665e..0000000000
--- a/Patches/O21 Outland - Redburn Pact/Redburn_WeaponsMelee.xml	
+++ /dev/null
@@ -1,414 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outland - Redburn Pact</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Pact Club -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_PactClub"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.49</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>3.375</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>2.67</cooldownTime>
-								<armorPenetrationBlunt>15.75</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_PactClub"]/statBases</xpath>
-					<value>
-						<Bulk>14</Bulk>
-						<MeleeCounterParryBonus>0.28</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_PactClub"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.6</MeleeCritChance>
-							<MeleeParryChance>0.38</MeleeParryChance>
-							<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Pact Spear -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_PactSpear"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.29</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>1.913</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.71</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.85</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.14</cooldownTime>
-								<chanceFactor>1.00</chanceFactor>
-								<armorPenetrationBlunt>1.913</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.4</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>3.2</cooldownTime>
-								<chanceFactor>0.33</chanceFactor>
-								<armorPenetrationBlunt>1.913</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.28</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_PactSpear"]/statBases</xpath>
-					<value>
-						<Bulk>11</Bulk>
-						<MeleeCounterParryBonus>2.12</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_PactSpear"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.39</MeleeCritChance>
-							<MeleeParryChance>1.59</MeleeParryChance>
-							<MeleeDodgeChance>0.90</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Pact Axe -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_PactAxe"]/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="Outland_PactAxe"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_PactAxe"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.10</MeleeCritChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-							<MeleeDodgeChance>0.20</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_PactAxe"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- Pact Dagger -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_PactDagger"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.29</cooldownTime>
-								<armorPenetrationBlunt>0.275</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.29</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.275</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_PactDagger"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_PactDagger"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.63</MeleeCritChance>
-							<MeleeParryChance>0.5</MeleeParryChance>
-							<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_PactDagger"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- Pact Fork -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_PactFork"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.78</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>1.000</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2.79</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>6.76</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_PactFork"]/statBases</xpath>
-					<value>
-						<Bulk>7</Bulk>
-						<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_PactFork"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.50</MeleeCritChance>
-							<MeleeParryChance>0.18</MeleeParryChance>
-							<MeleeDodgeChance>0.30</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Pact Sword -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_PactSword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.33</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.936</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.33</cooldownTime>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>0.936</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.88</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>31</power>
-								<cooldownTime>1.28</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>2.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.65</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_PactSword"]/statBases</xpath>
-					<value>
-						<Bulk>7.85</Bulk>
-						<MeleeCounterParryBonus>1.38</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_PactSword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.85</MeleeCritChance>
-							<MeleeParryChance>0.69</MeleeParryChance>
-							<MeleeDodgeChance>0.37</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Obsidian Sword -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_ObsidianSword"]/statBases</xpath>
-					<value>
-						<Bulk>13</Bulk>
-						<MeleeCounterParryBonus>1.5</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Outland_ObsidianSword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.3</MeleeCritChance>
-							<MeleeParryChance>1.6</MeleeParryChance>
-							<MeleeDodgeChance>0.56</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_ObsidianSword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>48</power>
-								<cooldownTime>3.4</cooldownTime>
-								<chanceFactor>1.165</chanceFactor>
-								<armorPenetrationBlunt>10.4</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.8</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<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>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outland - Redburn Pact/Redburn_WeaponsRanged.xml b/Patches/O21 Outland - Redburn Pact/Redburn_WeaponsRanged.xml
deleted file mode 100644
index b85174d957..0000000000
--- a/Patches/O21 Outland - Redburn Pact/Redburn_WeaponsRanged.xml	
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outland - Redburn Pact</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Pact Crossbow -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Outland_PactCrossbow"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.65</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Outland_PactCrossbow</defName>
-					<statBases>
-						<Bulk>4</Bulk>
-						<SwayFactor>1.0</SwayFactor>
-						<ShotSpread>0.5</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>2.05</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Projectile_CrossbowBolt_Steel</defaultProjectile>
-						<warmupTime>0.90</warmupTime>
-						<range>20</range>
-						<soundCast>Bow_Small</soundCast>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>MedievalRanged</li>
-						<li>CE_Bow</li>
-					</weaponTags>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/O21 Outland - Redburn Pact/Scenarios_Redburn.xml b/Patches/O21 Outland - Redburn Pact/Scenarios_Redburn.xml
deleted file mode 100644
index daf1c944bb..0000000000
--- a/Patches/O21 Outland - Redburn Pact/Scenarios_Redburn.xml	
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outland - Redburn Pact</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== Starting Things ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="Outland_RedburnPactScouts"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_Arrow_Steel</thingDef>
-							<count>100</count>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/ODS SCP Outfits/ThingDefs_Misc/Apparel_SCP_Hats.xml b/Patches/ODS SCP Outfits/ThingDefs_Misc/Apparel_SCP_Hats.xml
deleted file mode 100644
index a816104070..0000000000
--- a/Patches/ODS SCP Outfits/ThingDefs_Misc/Apparel_SCP_Hats.xml	
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[Ods] SCP Outfits Only Edition</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--Thin Stuffable-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_ScpRcfFrontCap" or
-								defName="Apparel_ScpRcfBackCap" or
-								defName="Apparel_GocSecurityBeret" or
-								defName="Apparel_GocSTBoonie" or
-								defName="Apparel_CiToque" or
-								defName="Apparel_CiMaskedHeadset" or
-								defName="Apparel_CiCap" or
-								defName="Apparel_CiCapMasked" or
-								defName="Apparel_CiMilitaryCap" or
-								defName="Apparel_ScpRcfCap" or
-								defName="Apparel_GocSTBoonieNew"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-								<Bulk>1</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<!--Helmet-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_ScpRcfHelmet" or
-								defName="Apparel_ScpSecurityHelmet" or
-								defName="Apparel_ScpMtfHelmet" or
-								defName="Apparel_ScpMtfHelmetGoggles" or
-								defName="Apparel_ScpMtfHelmetVisor" or
-								defName="Apparel_ScpMtfHelmetMasked" or
-								defName="Apparel_ScpMtfHelmetGogglesMasked" or
-								defName="Apparel_ScpMtfHelmetVisorMasked" or
-								defName="Apparel_GocSecurityHelmet" or
-								defName="Apparel_GocSTHelmet" or
-								defName="Apparel_GocSTHelmetMasked" or
-								defName="Apparel_CiHelmet" or
-								defName="Apparel_ScpRcfHelmetMasked" or
-								defName="Apparel_ScpMtfHelmetMaskedNew" or
-								defName="Apparel_ScpMtfHelmetVisorMaskedNew" or
-								defName="Apparel_ScpMtfHelmetGasmaskNew" or
-								defName="Apparel_GocSTHelmetNew" or
-								defName="Apparel_GocSTHelmetMaskedNew"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-								<Bulk>5</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_ScpRcfHelmet" or
-								defName="Apparel_ScpSecurityHelmet" or
-								defName="Apparel_ScpMtfHelmet" or
-								defName="Apparel_ScpMtfHelmetGoggles" or
-								defName="Apparel_ScpMtfHelmetVisor" or
-								defName="Apparel_ScpMtfHelmetMasked" or
-								defName="Apparel_ScpMtfHelmetGogglesMasked" or
-								defName="Apparel_ScpMtfHelmetVisorMasked" or
-								defName="Apparel_GocSecurityHelmet" or
-								defName="Apparel_GocSTHelmet" or
-								defName="Apparel_GocSTHelmetMasked" or
-								defName="Apparel_CiHelmet" or
-								defName="Apparel_ScpRcfHelmetMasked" or
-								defName="Apparel_ScpMtfHelmetMaskedNew" or
-								defName="Apparel_ScpMtfHelmetVisorMaskedNew" or
-								defName="Apparel_ScpMtfHelmetGasmaskNew" or
-								defName="Apparel_GocSTHelmetNew" or
-								defName="Apparel_GocSTHelmetMaskedNew"
-								]/stuffCategories/li[.="Metallic"] </xpath>
-							<value>
-								<li>Steeled</li>
-							</value>
-						</li>
-
-						<!--Helmet Gasmask-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_ScpMtfHelmetGasmask" or
-								defName="Apparel_ScpMtfHelmetVisorGasmask" or
-								defName="Apparel_GocSTHelmetGasMask" or
-								defName="Apparel_CiHelmetGasmask" or
-								defName="Apparel_GocSTHelmetGasMaskNew" or
-								defName="Apparel_CiGasmaskHelmet"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-								<Bulk>5</Bulk>
-								<WornBulk>2</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_ScpMtfHelmetGasmask" or
-								defName="Apparel_ScpMtfHelmetVisorGasmask" or
-								defName="Apparel_GocSTHelmetGasMask" or
-								defName="Apparel_CiHelmetGasmask" or
-								defName="Apparel_GocSTHelmetGasMaskNew" or
-								defName="Apparel_CiGasmaskHelmet"
-								]/stuffCategories/li[.="Metallic"] </xpath>
-							<value>
-								<li>Steeled</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[defName="Apparel_ScpMtfHelmetGasmask" or
-								defName="Apparel_ScpMtfHelmetVisorGasmask" or
-								defName="Apparel_GocSTHelmetGasMask" or
-								defName="Apparel_CiHelmetGasmask" or
-								defName="Apparel_GocSTHelmetGasMaskNew" or
-								defName="Apparel_CiGasmaskHelmet"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.ApparelHediffExtension">
-									<hediff>WearingGasMask</hediff>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Apparel_ScpMtfHelmetGasmask" or
-								defName="Apparel_ScpMtfHelmetVisorGasmask" or
-								defName="Apparel_GocSTHelmetGasMask" or
-								defName="Apparel_CiHelmetGasmask" or
-								defName="Apparel_GocSTHelmetGasMaskNew" or
-								defName="Apparel_CiGasmaskHelmet"
-								]/apparel/layers </xpath>
-							<value>
-								<li>StrappedHead</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Apparel_ScpMtfHelmetGasmask" or
-								defName="Apparel_ScpMtfHelmetVisorGasmask" or
-								defName="Apparel_GocSTHelmetGasMask" or
-								defName="Apparel_CiHelmetGasmask" or
-								defName="Apparel_GocSTHelmetGasMaskNew" or
-								defName="Apparel_CiGasmaskHelmet"
-								]/equippedStatOffsets </xpath>
-							<value>
-								<SmokeSensitivity>-1</SmokeSensitivity>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/ODS SCP Outfits/ThingDefs_Misc/Apparel_SCP_Various.xml b/Patches/ODS SCP Outfits/ThingDefs_Misc/Apparel_SCP_Various.xml
deleted file mode 100644
index 0c93deed8a..0000000000
--- a/Patches/ODS SCP Outfits/ThingDefs_Misc/Apparel_SCP_Various.xml	
+++ /dev/null
@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[Ods] SCP Outfits Only Edition</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--Thin Stuffable-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_ScpDClassUniform" or
-								defName="Apparel_ScpFacilityStaff" or
-								defName="Apparel_ScpScientist" or
-								defName="Apparel_ScpBuisnessSuit" or
-								defName="Apparel_GocStaff" or
-								defName="Apparel_GocScientist" or
-								defName="Apparel_GocBuisnessSuit" or
-								defName="Apparel_CiOpperative"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-								<Bulk>3</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<!--Mid Stuffable-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_ScpSecurityFatigues" or
-								defName="Apparel_ScpRcfTShirt" or
-								defName="Apparel_ScpMtfFatigues" or
-								defName="Apparel_GocSecurityFatigues" or
-								defName="Apparel_GocSTFatigues" or
-								defName="Apparel_CiMilitaryFatiguesTwo" or
-								defName="Apparel_ScpSecurityFatiguesNew"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
-								<Bulk>5</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<!--Thick Stuffable-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_ScpRcfJacket" or
-								defName="Apparel_CiMilitaryFatiguesOne" or
-								defName="Apparel_ScpRcfJacketNew" or
-								defName="Apparel_CiMilitaryFatigues"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-								<Bulk>7</Bulk>
-								<WornBulk>3</WornBulk>
-							</value>
-						</li>
-
-						<!--Light Bodyarmor-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_CiBodyArmorTwo" or
-								defName="Apparel_CiBodyArmor"
-								]/statBases/ArmorRating_Sharp </xpath>
-							<value>
-								<ArmorRating_Sharp>3</ArmorRating_Sharp>
-								<Bulk>3</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_CiBodyArmorTwo" or
-								defName="Apparel_CiBodyArmor"
-								]/statBases/ArmorRating_Blunt </xpath>
-							<value>
-								<ArmorRating_Blunt>4.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_CiBodyArmorTwo" or
-								defName="Apparel_CiBodyArmor"
-								]/statBases/Mass </xpath>
-							<value>
-								<Mass>5.25</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="Apparel_CiBodyArmorTwo" or
-								defName="Apparel_CiBodyArmor"
-								]/statBases/ArmorRating_Heat </xpath>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_CiBodyArmorTwo" or
-								defName="Apparel_CiBodyArmor"
-								]/costList </xpath>
-							<value>
-								<costList>
-									<Cloth>20</Cloth>
-									<Steel>30</Steel>
-								</costList>
-							</value>
-						</li>
-
-						<!--Heavy Bodyarmor-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_ScpSecurityArmor" or
-								defName="Apparel_ScpRcfBodyArmor" or
-								defName="Apparel_GocSecurityArmor" or
-								defName="Apparel_CiBodyArmorOne"
-								]/statBases/ArmorRating_Sharp </xpath>
-							<value>
-								<ArmorRating_Sharp>14</ArmorRating_Sharp>
-								<Bulk>5</Bulk>
-								<WornBulk>3</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_ScpSecurityArmor" or
-								defName="Apparel_ScpRcfBodyArmor" or
-								defName="Apparel_GocSecurityArmor" or
-								defName="Apparel_CiBodyArmorOne"
-								]/statBases/ArmorRating_Blunt </xpath>
-							<value>
-								<ArmorRating_Blunt>21</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_ScpSecurityArmor" or
-								defName="Apparel_ScpRcfBodyArmor" or
-								defName="Apparel_GocSecurityArmor" or
-								defName="Apparel_CiBodyArmorOne"
-								]/statBases/Mass </xpath>
-							<value>
-								<Mass>12</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_ScpSecurityArmor" or
-								defName="Apparel_ScpRcfBodyArmor" or
-								defName="Apparel_GocSecurityArmor" or
-								defName="Apparel_CiBodyArmorOne"
-								]/statBases/MaxHitPoints </xpath>
-							<value>
-								<MaxHitPoints>75</MaxHitPoints>
-							</value>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="Apparel_ScpSecurityArmor" or
-								defName="Apparel_ScpRcfBodyArmor" or
-								defName="Apparel_GocSecurityArmor" or
-								defName="Apparel_CiBodyArmorOne"
-								]/statBases/ArmorRating_Heat </xpath>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_ScpSecurityArmor" or
-								defName="Apparel_ScpRcfBodyArmor" or
-								defName="Apparel_GocSecurityArmor" or
-								defName="Apparel_CiBodyArmorOne"
-								]/costList </xpath>
-							<value>
-								<costList>
-									<Steel>60</Steel>
-									<DevilstrandCloth>20</DevilstrandCloth>
-								</costList>
-							</value>
-						</li>
-
-						<!--Elite Bodyarmor-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_ScpMtfBodyArmor" or
-								defName="Apparel_GocSTArmor"
-								]/statBases/ArmorRating_Sharp </xpath>
-							<value>
-								<ArmorRating_Sharp>16</ArmorRating_Sharp>
-								<Bulk>5</Bulk>
-								<WornBulk>3</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_ScpMtfBodyArmor" or
-								defName="Apparel_GocSTArmor"
-								]/statBases/ArmorRating_Blunt </xpath>
-							<value>
-								<ArmorRating_Blunt>24</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_ScpMtfBodyArmor" or
-								defName="Apparel_GocSTArmor"
-								]/statBases/Mass </xpath>
-							<value>
-								<Mass>10.40</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="Apparel_ScpMtfBodyArmor" or
-								defName="Apparel_GocSTArmor"
-								]/statBases/ArmorRating_Heat </xpath>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_ScpMtfBodyArmor" or
-								defName="Apparel_GocSTArmor"
-								]/costList </xpath>
-							<value>
-								<costList>
-									<Cloth>30</Cloth>
-									<Plasteel>90</Plasteel>
-								</costList>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/ODZ Stalingrad - Uniforms/ThingDefs_Apparel.xml b/Patches/ODZ Stalingrad - Uniforms/ThingDefs_Apparel.xml
deleted file mode 100644
index 27b88d126b..0000000000
--- a/Patches/ODZ Stalingrad - Uniforms/ThingDefs_Apparel.xml	
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[1.4] Stalingrad - Uniforms</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= Webbings ======= -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_WWII_GermanRiflemanKit" or defName="ODZ_WWII_GermanAssaultKit" or defName="ODZ_WWII_GermanMGKit" or defName="ODZ_WWII_GermanPlatoonLeaderKit" or defName="ODZ_WWII_SovietRiflemanKit" or defName="ODZ_WWII_SovietAssaultKit" or defName="ODZ_WWII_SovietMGKit" or defName="ODZ_WWII_SovietPlatoonLeaderKit"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>Shoulders</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_WWII_GermanRiflemanKit" or defName="ODZ_WWII_GermanAssaultKit" or defName="ODZ_WWII_GermanMGKit" or defName="ODZ_WWII_GermanPlatoonLeaderKit" or defName="ODZ_WWII_SovietRiflemanKit" or defName="ODZ_WWII_SovietAssaultKit" or defName="ODZ_WWII_SovietMGKit" or defName="ODZ_WWII_SovietPlatoonLeaderKit"]/apparel/layers</xpath>
-					<value>
-						<layers>
-							<li>Webbing</li>
-						</layers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ODZ_WWII_GermanRiflemanKit" or defName="ODZ_WWII_GermanAssaultKit" or defName="ODZ_WWII_GermanMGKit" or defName="ODZ_WWII_GermanPlatoonLeaderKit" or defName="ODZ_WWII_SovietRiflemanKit" or defName="ODZ_WWII_SovietAssaultKit" or defName="ODZ_WWII_SovietMGKit" or defName="ODZ_WWII_SovietPlatoonLeaderKit"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<!-- ===== Rifleman Kit ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_WWII_GermanRiflemanKit" or defName="ODZ_WWII_SovietRiflemanKit"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>30</CarryBulk>
-							<AimingDelayFactor>-0.05</AimingDelayFactor>
-							<MedicalTendSpeed>0.05</MedicalTendSpeed>
-							<ReloadSpeed>0.08</ReloadSpeed>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- ===== Assault Kit ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_WWII_GermanAssaultKit" or defName="ODZ_WWII_SovietAssaultKit"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>27</CarryBulk>
-							<AimingDelayFactor>-0.08</AimingDelayFactor>
-							<MedicalTendSpeed>0.05</MedicalTendSpeed>
-							<ReloadSpeed>0.09</ReloadSpeed>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- ===== Machinegunner Kit ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_WWII_GermanMGKit" or defName="ODZ_WWII_SovietMGKit"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>25</CarryBulk>
-							<AimingDelayFactor>-0.10</AimingDelayFactor>
-							<MedicalTendSpeed>0.05</MedicalTendSpeed>
-							<ReloadSpeed>0.1</ReloadSpeed>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- ===== Platoon Leader Kit ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_WWII_GermanPlatoonLeaderKit" or defName="ODZ_WWII_SovietPlatoonLeaderKit"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>30</CarryBulk>
-							<AimingDelayFactor>-0.06</AimingDelayFactor>
-							<MedicalTendSpeed>0.05</MedicalTendSpeed>
-							<ReloadSpeed>0.08</ReloadSpeed>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- ======= Headgear ======= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ODZ_WWII_M24GermanSidecap" or defName="ODZ_WWII_GermanCrusherCap" or defName="ODZ_WWII_SovietPilotka" or defName="ODZ_WWII_SovietM24Cap"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>0.8</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ODZ_WWII_GermanM42Stahlhelm" or defName="ODZ_WWII_SovietSSH40Helmet"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<!-- ===== Helmet ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_WWII_GermanM42Stahlhelm" or defName="ODZ_WWII_SovietSSH40Helmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ===== Caps ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_WWII_M24GermanSidecap" or defName="ODZ_WWII_GermanCrusherCap" or defName="ODZ_WWII_SovietPilotka" or defName="ODZ_WWII_SovietM24Cap"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ======= Uniforms ======= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ODZ_WWII_M42GermanUniform" or defName="ODZ_WWII_M42PlatoonLeader" or defName="ODZ_WWII_Obr35SovietUniform" or defName="ODZ_WWII_Obr35PlatoonLeader"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_WWII_M42GermanUniform" or defName="ODZ_WWII_M42PlatoonLeader" or defName="ODZ_WWII_Obr35SovietUniform" or defName="ODZ_WWII_Obr35PlatoonLeader"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ======= Coats ======= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ODZ_WWII_GermanM40GreatCoat" or defName="ODZ_WWII_SovietM41Overcoat"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_WWII_GermanM40GreatCoat" or defName="ODZ_WWII_SovietM41Overcoat"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/ODZ Suits/ThingDefs_Apparel.xml b/Patches/ODZ Suits/ThingDefs_Apparel.xml
deleted file mode 100644
index f6b39c028a..0000000000
--- a/Patches/ODZ Suits/ThingDefs_Apparel.xml	
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[1.4] Odz Suits</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Shell === -->
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName="ODZ_SM_SuitI" or
-						defName="ODZ_SM_SuitII" or
-						defName="ODZ_SR_MonsotaSuit" or
-						defName="ODZ_SR_OXSSuit" or
-						defName="ODZ_SR_Goldmenuit"
-						]/statBases/StuffEffectMultiplierArmor
-					</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- === OnSkin === -->
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName="ODZ_SM_ShirtAndTie" or
-						defName="ODZ_SR_MonsotaShirt" or
-						defName="ODZ_SR_OXSShirt" or
-						defName="ODZ_SR_GoldmenShirt"
-						]/statBases/StuffEffectMultiplierArmor
-					</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName="ODZ_SM_ShirtAndTie" or
-						defName="ODZ_SR_MonsotaShirt" or
-						defName="ODZ_SR_OXSShirt" or
-						defName="ODZ_SR_GoldmenShirt"
-						]/costStuffCount
-					</xpath>
-					<value>
-						<costStuffCount>25</costStuffCount>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Obsidia Expansion/ThingDefs_Misc/Obsidia_Expansion_CE_Ability.xml b/Patches/Obsidia Expansion/ThingDefs_Misc/Obsidia_Expansion_CE_Ability.xml
deleted file mode 100644
index a1ee67991d..0000000000
--- a/Patches/Obsidia Expansion/ThingDefs_Misc/Obsidia_Expansion_CE_Ability.xml	
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Obsidia Expansion - Mothoids</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ============== Atlant Pollen ================ -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AbilityDef[defName="OE_PollenAtlant"]/verbProperties/range</xpath>
-					<value>
-						<range>14.9</range>
-					</value>
-				</li>
-
-				<!-- ============== Flight ================ -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AbilityDef[defName="OE_WingsFly"]/verbProperties/range</xpath>
-					<value>
-						<range>27.9</range>
-					</value>
-				</li>
-
-				<!-- ============== silkshot compatibility ================ -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AbilityDef[defName="OE_Silkshot"]/verbProperties/range</xpath>
-					<value>
-						<range>11.9</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OE_Silkshot_Bullet"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<damageDef>Stun</damageDef>
-							<speed>95</speed>
-							<damageAmountBase>18</damageAmountBase>
-							<armorPenetrationBlunt>8</armorPenetrationBlunt>
-						</projectile>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Opossum Friends/OpossumFriend.xml b/Patches/Opossum Friends/OpossumFriend.xml
deleted file mode 100644
index f386f86ede..0000000000
--- a/Patches/Opossum Friends/OpossumFriend.xml	
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Opossum Friends</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Opossum === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ERN_Opossum"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ERN_Opossum"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ERN_Opossum"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.84</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.144</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>0.84</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.144</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Orassans/Ammo/10mmRailgunOE.xml b/Patches/Orassans/Ammo/10mmRailgunOE.xml
deleted file mode 100644
index 60278717b7..0000000000
--- a/Patches/Orassans/Ammo/10mmRailgunOE.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Orassans</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>Ammo10mmRailgunOE</defName>
-					<label>10mm Railgun (OE)</label>
-					<parent>AmmoAdvanced</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberRailgunRifle</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_10mmRailgunOE</defName>
-					<label>10mm Railgun (OE)</label>
-					<ammoTypes>
-						<Ammo_10mmRailgun_SabotOE>Bullet_10mmRailgun_SabotOE</Ammo_10mmRailgun_SabotOE>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerAmmoBase">
-					<defName>Ammo_10mmRailgun_SabotOE</defName>
-					<label>10mm Railgun cartridge (Sabot:OE)</label>
-					<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for long-range railgun weapons.</description>
-					<statBases>
-						<Mass>0.014</Mass>
-						<Bulk>0.022</Bulk>
-						<MarketValue>0.06</MarketValue>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_FabricationBench</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-						<!-- Railgun ammo isn't handloaded because it contains no propellant, and the sabots must be precision-machined anyway -->
-					</tradeTags>
-					<thingCategories>
-						<li>Ammo8mmRailgunOE</li>
-					</thingCategories>
-					<graphicData>
-						<texPath>Things/Ammo/Railgun/Rifle</texPath>
-						<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-					</graphicData>
-					<ammoClass>RailgunSabot</ammoClass>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef ParentName="Base762x39mmSovietBullet">
-					<defName>Bullet_10mmRailgun_SabotOE</defName>
-					<label>10mm Railgun bullet (Sabot:OE)</label>
-					<graphicData>
-						<texPath>Things/Projectile/Bullet_Small</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bullet</damageDef>
-						<damageAmountBase>38</damageAmountBase>
-						<armorPenetrationSharp>38</armorPenetrationSharp>
-						<armorPenetrationBlunt>165.320</armorPenetrationBlunt>
-						<speed>294</speed>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_10mmRailgun_SabotOE</defName>
-					<label>make 10mm Railgun cartridge (Sabot:OE) x500</label>
-					<description>Craft 500 10mm Railgun (Sabot:OE) cartridges.</description>
-					<jobString>Making 10mm Railgun (Sabot:OE) cartridges.</jobString>
-					<workAmount>1000</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>3</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Uranium</li>
-								</thingDefs>
-							</filter>
-							<count>6</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Uranium</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_10mmRailgun_SabotOE>500</Ammo_10mmRailgun_SabotOE>
-					</products>
-				</RecipeDef>
-			</value>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Orassans/Ammo/12mm-autoRailgunOE.xml b/Patches/Orassans/Ammo/12mm-autoRailgunOE.xml
deleted file mode 100644
index d2c8840c4d..0000000000
--- a/Patches/Orassans/Ammo/12mm-autoRailgunOE.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Orassans</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>Ammo12mmautoRailgunOE</defName>
-					<label>12mm auto Railgun (OE)</label>
-					<parent>AmmoAdvanced</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberRailgunPistol</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_12mmautoRailgunOE</defName>
-					<label>12mm auto Railgun (OE)</label>
-					<ammoTypes>
-						<Ammo_12mmautoRailgun_SabotOE>Bullet_12mmautoRailgun_SabotOE</Ammo_12mmautoRailgun_SabotOE>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerAmmoBase">
-					<defName>Ammo_12mmautoRailgun_SabotOE</defName>
-					<label>12mm auto Railgun cartridge (Sabot:OE)</label>
-					<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for high calibar handguns.</description>
-					<statBases>
-						<Mass>0.012</Mass>
-						<Bulk>0.016</Bulk>
-						<MarketValue>0.16</MarketValue>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_FabricationBench</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-						<!-- Railgun ammo isn't handloaded because it contains no propellant, and the sabots must be precision-machined anyway -->
-					</tradeTags>
-					<thingCategories>
-						<li>Ammo12mmautoRailgunOE</li>
-					</thingCategories>
-					<graphicData>
-						<texPath>Things/Ammo/Railgun/Pistol</texPath>
-						<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-					</graphicData>
-					<ammoClass>RailgunSabot</ammoClass>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef ParentName="Base50AEBullet">
-					<defName>Bullet_12mmautoRailgun_SabotOE</defName>
-					<label>12mm auto Railgun bullet (Sabot:OE)</label>
-					<graphicData>
-						<texPath>Things/Projectile/Bullet_Small</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bullet</damageDef>
-						<damageAmountBase>28</damageAmountBase>
-						<armorPenetrationSharp>22</armorPenetrationSharp>
-						<armorPenetrationBlunt>110.80</armorPenetrationBlunt>
-						<speed>253</speed>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_12mmautoRailgun_SabotOE</defName>
-					<label>make 12mm auto Railgun cartridge (Sabot:OE) x500</label>
-					<description>Craft 500 12mm auto Railgun (Sabot:OE) cartridges.</description>
-					<jobString>Making 12mm auto Railgun (Sabot:OE) cartridges.</jobString>
-					<workAmount>1000</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>3</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Uranium</li>
-								</thingDefs>
-							</filter>
-							<count>4</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Uranium</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_12mmautoRailgun_SabotOE>500</Ammo_12mmautoRailgun_SabotOE>
-					</products>
-				</RecipeDef>
-			</value>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Orassans/Ammo/12mm-longRailgunOE.xml b/Patches/Orassans/Ammo/12mm-longRailgunOE.xml
deleted file mode 100644
index 4b988cf0c1..0000000000
--- a/Patches/Orassans/Ammo/12mm-longRailgunOE.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Orassans</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>Ammo12mmRailgunOE</defName>
-					<label>12mm Railgun (OE)</label>
-					<parent>AmmoAdvanced</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberRailgunHighCaliber</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_12mmRailgunOE</defName>
-					<label>12mm Railgun (OE)</label>
-					<ammoTypes>
-						<Ammo_12mmRailgun_SabotOE>Bullet_12mmRailgun_SabotOE</Ammo_12mmRailgun_SabotOE>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerMediumAmmoBase">
-					<defName>Ammo_12mmRailgun_SabotOE</defName>
-					<label>12mm Railgun cartridge (Sabot:OE)</label>
-					<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for large-caliber railgun weapons.</description>
-					<statBases>
-						<Mass>0.020</Mass>
-						<Bulk>0.035</Bulk>
-						<MarketValue>0.33</MarketValue>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_FabricationBench</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-						<!-- Railgun ammo isn't handloaded because it contains no propellant, and the sabots must be precision-machined anyway -->
-					</tradeTags>
-					<thingCategories>
-						<li>Ammo12mmRailgunOE</li>
-					</thingCategories>
-					<stackLimit>200</stackLimit>
-					<graphicData>
-						<texPath>Things/Ammo/Railgun/HighCaliber</texPath>
-						<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-					</graphicData>
-					<ammoClass>RailgunSabot</ammoClass>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef ParentName="Base950JDJBullet">
-					<defName>Bullet_12mmRailgun_SabotOE</defName>
-					<label>12mm Railgun bullet (Sabot:OE)</label>
-					<graphicData>
-						<texPath>Things/Projectile/Bullet_Big</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bullet</damageDef>
-						<damageAmountBase>60</damageAmountBase>
-						<armorPenetrationSharp>52</armorPenetrationSharp>
-						<armorPenetrationBlunt>290.890</armorPenetrationBlunt>
-						<speed>327</speed>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_12mmRailgun_SabotOE</defName>
-					<label>make 12mm Railgun cartridge (Sabot:OE) x200</label>
-					<description>Craft 200 12mm Railgun (Sabot:OE) cartridges.</description>
-					<jobString>Making 12mm Railgun (Sabot:OE) cartridges.</jobString>
-					<workAmount>2200</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>4</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Uranium</li>
-								</thingDefs>
-							</filter>
-							<count>10</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Uranium</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_12mmRailgun_SabotOE>200</Ammo_12mmRailgun_SabotOE>
-					</products>
-				</RecipeDef>
-			</value>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Orassans/Ammo/12mm-subsonicRailgunOE.xml b/Patches/Orassans/Ammo/12mm-subsonicRailgunOE.xml
deleted file mode 100644
index d4497a19f3..0000000000
--- a/Patches/Orassans/Ammo/12mm-subsonicRailgunOE.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Orassans</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>Ammo12mmsubsonicRailgunOE</defName>
-					<label>12mm subsonic Railgun (OE)</label>
-					<parent>AmmoAdvanced</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberRailgunPistol</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_12mmsubsonicRailgunOE</defName>
-					<label>12mm subsonic Railgun (OE)</label>
-					<ammoTypes>
-						<Ammo_12mmsubsonicRailgun_SabotOE>Bullet_12mmsubsonicRailgun_SabotOE</Ammo_12mmsubsonicRailgun_SabotOE>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerAmmoBase">
-					<defName>Ammo_12mmsubsonicRailgun_SabotOE</defName>
-					<label>12mm subsonic Railgun cartridge (Sabot:OE)</label>
-					<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for high calibar subsonic railguns.</description>
-					<statBases>
-						<Mass>0.016</Mass>
-						<Bulk>0.016</Bulk>
-						<MarketValue>0.16</MarketValue>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_FabricationBench</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-						<!-- Railgun ammo isn't handloaded because it contains no propellant, and the sabots must be precision-machined anyway -->
-					</tradeTags>
-					<thingCategories>
-						<li>Ammo12mmautoRailgunOE</li>
-					</thingCategories>
-					<graphicData>
-						<texPath>Things/Ammo/Railgun/Pistol</texPath>
-						<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-					</graphicData>
-					<ammoClass>RailgunSabot</ammoClass>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef ParentName="Base9x39mmSovietBullet">
-					<defName>Bullet_12mmsubsonicRailgun_SabotOE</defName>
-					<label>12mm subsonic Railgun bullet (Sabot:OE)</label>
-					<graphicData>
-						<texPath>Things/Projectile/Bullet_Small</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bullet</damageDef>
-						<damageAmountBase>23</damageAmountBase>
-						<armorPenetrationSharp>50</armorPenetrationSharp>
-						<armorPenetrationBlunt>210.80</armorPenetrationBlunt>
-						<speed>229</speed>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_12mmsubsonicRailgun_SabotOE</defName>
-					<label>make 12mm subsonic Railgun cartridge (Sabot:OE) x500</label>
-					<description>Craft 500 12mm subsonic Railgun (Sabot:OE) cartridges.</description>
-					<jobString>Making 12mm auto Railgun (Sabot:OE) cartridges.</jobString>
-					<workAmount>1000</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>4</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Uranium</li>
-								</thingDefs>
-							</filter>
-							<count>6</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Uranium</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_12mmsubsonicRailgun_SabotOE>500</Ammo_12mmsubsonicRailgun_SabotOE>
-					</products>
-				</RecipeDef>
-			</value>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Orassans/Ammo/40x90mmGrenadeOE.xml b/Patches/Orassans/Ammo/40x90mmGrenadeOE.xml
deleted file mode 100644
index 5b26403e2c..0000000000
--- a/Patches/Orassans/Ammo/40x90mmGrenadeOE.xml
+++ /dev/null
@@ -1,398 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Orassans</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>Ammo40x90mmGrenadesOE</defName>
-					<label>40x90mm Grenade OE</label>
-					<parent>AmmoGrenades</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberGrenade</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_40x90mmGrenadeOE</defName>
-					<label>40x90mm Grenades OE</label>
-					<ammoTypes>
-						<Ammo_40x90mmGrenadeOE_HE>Bullet_40x90mmGrenadeOE_HE</Ammo_40x90mmGrenadeOE_HE>
-						<Ammo_40x90mmGrenadeOE_HEAT>Bullet_40x90mmGrenadeOE_HEAT</Ammo_40x90mmGrenadeOE_HEAT>
-						<Ammo_40x90mmGrenadeOE_EMP>Bullet_40x90mmGrenadeOE_EMP</Ammo_40x90mmGrenadeOE_EMP>
-						<Ammo_40x90mmGrenadeOE_Smoke>Bullet_40x90mmGrenadeOE_Smoke</Ammo_40x90mmGrenadeOE_Smoke>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="40x90mmGrenadeBaseOE" ParentName="MediumAmmoBase" Abstract="True">
-					<description>Low velocity caseless grenade fired from handheld railgun grenade launchers.</description>
-					<statBases>
-						<Mass>0.320</Mass>
-						<Bulk>0.40</Bulk>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-					</tradeTags>
-					<thingCategories>
-						<li>Ammo40x90mmGrenadesOE</li>
-					</thingCategories>
-					<stackLimit>500</stackLimit>
-					<cookOffFlashScale>100</cookOffFlashScale>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="40x90mmGrenadeBaseOE">
-					<defName>Ammo_40x90mmGrenadeOE_HE</defName>
-					<label>40x90mm grenade OE (HE)</label>
-					<graphicData>
-						<texPath>ThirdParty/Orassans/Ammo/Grenade/HELL</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>3.3</MarketValue>
-					</statBases>
-					<ammoClass>GrenadeHE</ammoClass>
-					<detonateProjectile>Bullet_40x90mmGrenadeOE_HE</detonateProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="40x90mmGrenadeBaseOE">
-					<defName>Ammo_40x90mmGrenadeOE_HEAT</defName>
-					<label>40x90mm grenade OE (HEAT)</label>
-					<graphicData>
-						<texPath>ThirdParty/Orassans/Ammo/Grenade/HEAT</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>3.6</MarketValue>
-					</statBases>
-					<ammoClass>GrenadeHEAT</ammoClass>
-					<detonateProjectile>Bullet_40x90mmGrenadeOE_HEAT</detonateProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="40x90mmGrenadeBaseOE">
-					<defName>Ammo_40x90mmGrenadeOE_EMP</defName>
-					<label>40x90mm grenade OE (EMP)</label>
-					<graphicData>
-						<texPath>Things/Ammo/GrenadeLauncher/EMP</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>4.5</MarketValue>
-					</statBases>
-					<ammoClass>GrenadeEMP</ammoClass>
-					<detonateProjectile>Bullet_40x90mmGrenadeOE_EMP</detonateProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="40x90mmGrenadeBaseOE">
-					<defName>Ammo_40x90mmGrenadeOE_Smoke</defName>
-					<label>40x90mm grenade OE (Smoke)</label>
-					<graphicData>
-						<texPath>Things/Ammo/GrenadeLauncher/SMK</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>2.25</MarketValue>
-					</statBases>
-					<ammoClass>Smoke</ammoClass>
-					<generateAllowChance>0</generateAllowChance>
-					<detonateProjectile>Bullet_40x90mmGrenadeOE_Smoke</detonateProjectile>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef Name="Base40x90mmGrenadeOEBullet" ParentName="BaseExplosiveBullet" Abstract="true">
-					<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					<graphicData>
-						<texPath>Things/Projectile/Bullet_Big</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>39</speed>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base40x90mmGrenadeOEBullet">
-					<defName>Bullet_40x90mmGrenadeOE_HE</defName>
-					<label>40x90mm grenade OE (HE)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<explosionRadius>2.0</explosionRadius>
-						<damageDef>Bomb</damageDef>
-						<damageAmountBase>45</damageAmountBase>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>16</Fragment_Small>
-								<Fragment_Large>5</Fragment_Large>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<ThingDef ParentName="Base40x90mmGrenadeOEBullet">
-					<defName>Bullet_40x90mmGrenadeOE_HEAT</defName>
-					<label>40x90mm grenade OE (HEAT)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>56</speed>
-						<damageDef>Bullet</damageDef>
-						<damageAmountBase>65</damageAmountBase>
-						<armorPenetrationSharp>75</armorPenetrationSharp>
-						<armorPenetrationBlunt>32.950</armorPenetrationBlunt>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<explosiveRadius>1.5</explosiveRadius>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<damageAmountBase>32</damageAmountBase>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>9</Fragment_Small>
-								<Fragment_Large>5</Fragment_Large>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<ThingDef ParentName="Base40x90mmGrenadeOEBullet">
-					<defName>Bullet_40x90mmGrenadeOE_EMP</defName>
-					<label>40x90mm grenade OE (EMP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<explosionRadius>2.5</explosionRadius>
-						<damageDef>EMP</damageDef>
-						<damageAmountBase>25</damageAmountBase>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base40x90mmGrenadeOEBullet">
-					<defName>Bullet_40x90mmGrenadeOE_Cryo</defName>
-					<label>40x90mm grenade OE (Cryo)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>48</speed>
-						<damageDef>OFrostbite</damageDef>
-						<damageAmountBase>20</damageAmountBase>
-						<armorPenetrationSharp>0</armorPenetrationSharp>
-						<armorPenetrationBlunt>0</armorPenetrationBlunt>
-						<explosionRadius>4.0</explosionRadius>
-						<postExplosionSpawnThingDef>Filth_Snow</postExplosionSpawnThingDef>
-						<postExplosionSpawnChance>1</postExplosionSpawnChance>
-						<postExplosionSpawnThingCount>3</postExplosionSpawnThingCount>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>12</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<ThingDef ParentName="Base40x90mmGrenadeOEBullet">
-					<defName>Bullet_40x90mmGrenadeOE_Smoke</defName>
-					<label>40x90mm grenade OE (Smoke)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<explosionRadius>5</explosionRadius>
-						<damageDef>Smoke</damageDef>
-						<suppressionFactor>0.0</suppressionFactor>
-						<dangerFactor>0.0</dangerFactor>
-						<postExplosionGasType>BlindSmoke</postExplosionGasType>
-						<preExplosionSpawnChance>1</preExplosionSpawnChance>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>8</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>0.75</explosiveRadius>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>2</Fragment_Large>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_40x90mmGrenadeOE_HE</defName>
-					<label>make 40x90mm OE HE grenades x100</label>
-					<description>Craft 100 40x90mm OE HE grenades.</description>
-					<jobString>Making 40x90mm OE HE grenades.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>60</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>15</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>4</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_40x90mmGrenadeOE_HE>100</Ammo_40x90mmGrenadeOE_HE>
-					</products>
-					<workAmount>11000</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_40x90mmGrenadeOE_HEAT</defName>
-					<label>make 40x90mm OE HEAT grenades x100</label>
-					<description>Craft 100 40x90mm OE HEAT grenades.</description>
-					<jobString>Making 40x90mm OE HEAT grenades.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>60</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>12</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>5</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_40x90mmGrenadeOE_HEAT>100</Ammo_40x90mmGrenadeOE_HEAT>
-					</products>
-					<workAmount>11000</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_40x90mmGrenadeOE_EMP</defName>
-					<label>make 40x90mm OE EMP grenades x100</label>
-					<description>Craft 100 40x90mm OE EMP grenades.</description>
-					<jobString>Making 40x90mm OE EMP grenades.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>30</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>10</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_40x90mmGrenadeOE_EMP>100</Ammo_40x90mmGrenadeOE_EMP>
-					</products>
-					<workAmount>12000</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_40x90mmGrenadeOE_Smoke</defName>
-					<label>make 40x90mm OE Smoke grenades x100</label>
-					<description>Craft 100 40x90mm OE Smoke grenades.</description>
-					<jobString>Making 40x90mm OE Smoke grenades.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>45</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>6</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>3</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Prometheum</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_40x90mmGrenadeOE_Smoke>100</Ammo_40x90mmGrenadeOE_Smoke>
-					</products>
-					<workAmount>7500</workAmount>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Orassans/Ammo/6mmRailgunOE.xml b/Patches/Orassans/Ammo/6mmRailgunOE.xml
deleted file mode 100644
index 42dd2ecc22..0000000000
--- a/Patches/Orassans/Ammo/6mmRailgunOE.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Orassans</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>Ammo6mmRailgunOE</defName>
-					<label>6mm Railgun OE</label>
-					<parent>AmmoAdvanced</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberRailgunPistol</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_6mmRailgunOE</defName>
-					<label>6mm Railgun OE</label>
-					<ammoTypes>
-						<Ammo_6mmRailgun_SabotOE>Bullet_6mmRailgun_SabotOE</Ammo_6mmRailgun_SabotOE>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-					<defName>Ammo_6mmRailgun_SabotOE</defName>
-					<label>6mm Railgun cartridge (Sabot:OE)</label>
-					<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for railgun pistols.</description>
-					<statBases>
-						<Mass>0.008</Mass>
-						<Bulk>0.008</Bulk>
-						<MarketValue>0.06</MarketValue>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_FabricationBench</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-						<!-- Railgun ammo isn't handloaded because it contains no propellant, and the sabots must be precision-machined anyway -->
-					</tradeTags>
-					<thingCategories>
-						<li>Ammo6mmRailgunOE</li>
-					</thingCategories>
-					<graphicData>
-						<texPath>Things/Ammo/Railgun/Pistol</texPath>
-						<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-					</graphicData>
-					<ammoClass>RailgunSabot</ammoClass>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef ParentName="BaseFN57x28mmBullet">
-					<defName>Bullet_6mmRailgun_SabotOE</defName>
-					<label>6mm Railgun bullet (Sabot:OE)</label>
-					<graphicData>
-						<texPath>Things/Projectile/Bullet_Small</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bullet</damageDef>
-						<damageAmountBase>16</damageAmountBase>
-						<armorPenetrationSharp>18</armorPenetrationSharp>
-						<armorPenetrationBlunt>130.80</armorPenetrationBlunt>
-						<speed>242</speed>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_6mmRailgun_SabotOE</defName>
-					<label>make 6mm Railgun cartridge (Sabot:OE) x500</label>
-					<description>Craft 500 6mm Railgun (Sabot:OE) cartridges.</description>
-					<jobString>Making 6mm Railgun (Sabot:OE) cartridges.</jobString>
-					<workAmount>1000</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Uranium</li>
-								</thingDefs>
-							</filter>
-							<count>3</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Uranium</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_6mmRailgun_SabotOE>500</Ammo_6mmRailgun_SabotOE>
-					</products>
-				</RecipeDef>
-			</value>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Orassans/Ammo/8mmRailgunOE.xml b/Patches/Orassans/Ammo/8mmRailgunOE.xml
deleted file mode 100644
index 6d9979b199..0000000000
--- a/Patches/Orassans/Ammo/8mmRailgunOE.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Orassans</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>Ammo8mmRailgunOE</defName>
-					<label>8mm Railgun (OE)</label>
-					<parent>AmmoAdvanced</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberRailgunRifle</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_8mmRailgunOE</defName>
-					<label>8mm Railgun (OE)</label>
-					<ammoTypes>
-						<Ammo_8mmRailgun_SabotOE>Bullet_8mmRailgun_SabotOE</Ammo_8mmRailgun_SabotOE>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerAmmoBase">
-					<defName>Ammo_8mmRailgun_SabotOE</defName>
-					<label>8mm Railgun cartridge (Sabot:OE)</label>
-					<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for railgun rifles.</description>
-					<statBases>
-						<Mass>0.01</Mass>
-						<Bulk>0.014</Bulk>
-						<MarketValue>0.06</MarketValue>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_FabricationBench</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-						<!-- Railgun ammo isn't handloaded because it contains no propellant, and the sabots must be precision-machined anyway -->
-					</tradeTags>
-					<thingCategories>
-						<li>Ammo8mmRailgunOE</li>
-					</thingCategories>
-					<graphicData>
-						<texPath>Things/Ammo/Railgun/Rifle</texPath>
-						<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-					</graphicData>
-					<ammoClass>RailgunSabot</ammoClass>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef ParentName="Base545x39mmSovietBullet">
-					<defName>Bullet_8mmRailgun_SabotOE</defName>
-					<label>8mm Railgun bullet (Sabot:OE)</label>
-					<graphicData>
-						<texPath>Things/Projectile/Bullet_Small</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bullet</damageDef>
-						<damageAmountBase>26</damageAmountBase>
-						<armorPenetrationSharp>32</armorPenetrationSharp>
-						<armorPenetrationBlunt>95.720</armorPenetrationBlunt>
-						<speed>271</speed>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_8mmRailgun_SabotOE</defName>
-					<label>make 8mm Railgun cartridge (Sabot:OE) x500</label>
-					<description>Craft 500 8mm Railgun (Sabot:OE) cartridges.</description>
-					<jobString>Making 8mm Railgun (Sabot:OE) cartridges.</jobString>
-					<workAmount>1000</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Uranium</li>
-								</thingDefs>
-							</filter>
-							<count>4</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Uranium</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_8mmRailgun_SabotOE>500</Ammo_8mmRailgun_SabotOE>
-					</products>
-				</RecipeDef>
-			</value>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Orassans/Ammo/AmmoCategories_ChemicalCompoundOE.xml b/Patches/Orassans/Ammo/AmmoCategories_ChemicalCompoundOE.xml
deleted file mode 100644
index 4a95e3e1a1..0000000000
--- a/Patches/Orassans/Ammo/AmmoCategories_ChemicalCompoundOE.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Orassans</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<CombatExtended.AmmoCategoryDef>
-					<defName>ChemicalMunitionCompoundAprometheum</defName>
-					<label>accelerated jellied prometheum</label>
-					<labelShort>A.Prometheum</labelShort>
-					<description>Filled with mixture of potent but short-living version of prometheum.</description>
-				</CombatExtended.AmmoCategoryDef>
-
-				<CombatExtended.AmmoCategoryDef>
-					<defName>ChemicalMunitionCompoundThermobaric</defName>
-					<label>Thermobaric</label>
-					<description>Filled with mixture that disperses and subsequently ignites a fuel-air explosive mix, creating a powerful explosion and potentially igniting flammable objects.</description>
-					<advanced>true</advanced>
-				</CombatExtended.AmmoCategoryDef>
-
-				<CombatExtended.AmmoCategoryDef>
-					<defName>ChemicalMunitionCompoundCryo</defName>
-					<label>Cryo</label>
-					<description>Filled with mixture of solid hydrogen and unstable compounds that vaporizes on contact with the air.</description>
-					<advanced>true</advanced>
-				</CombatExtended.AmmoCategoryDef>
-
-			</value>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Orassans/Ammo/AmmoCategories_GrenadesOE.xml b/Patches/Orassans/Ammo/AmmoCategories_GrenadesOE.xml
deleted file mode 100644
index 6bfb8fbdfd..0000000000
--- a/Patches/Orassans/Ammo/AmmoCategories_GrenadesOE.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Orassans</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<CombatExtended.AmmoCategoryDef>
-					<defName>GrenadeHEAT</defName>
-					<label>High-explosive anti-tank</label>
-					<labelShort>HEAT</labelShort>
-					<description>Grenade with a shaped charge warhead. Detonates on impact, creating a stream of metal that punches through enemy armor.</description>
-				</CombatExtended.AmmoCategoryDef>
-
-				<CombatExtended.AmmoCategoryDef>
-					<defName>GrenadeThermobaric</defName>
-					<label>Thermobaric</label>
-					<description>Disperses and subsequently ignites a fuel-air explosive mix, creating a powerful explosion and potentially igniting flammable objects.</description>
-					<advanced>true</advanced>
-				</CombatExtended.AmmoCategoryDef>
-
-			</value>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Orassans/Ammo/ChemicalCompoundOE.xml b/Patches/Orassans/Ammo/ChemicalCompoundOE.xml
deleted file mode 100644
index 65bcb55036..0000000000
--- a/Patches/Orassans/Ammo/ChemicalCompoundOE.xml
+++ /dev/null
@@ -1,401 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Orassans</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>AmmoChemicalCompoundOE</defName>
-					<label>Chemical munition OE</label>
-					<parent>AmmoAdvanced</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberFuel</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_ChemicalCompoundOE</defName>
-					<label>Chemical munition compound OE</label>
-					<ammoTypes>
-						<Ammo_ChemicalCompoundOE_Cryo>Bullet_ChemicalCompoundOE_Cryo</Ammo_ChemicalCompoundOE_Cryo>
-						<Ammo_ChemicalCompoundOE_Napalm>Bullet_ChemicalCompoundOE_Napalm</Ammo_ChemicalCompoundOE_Napalm>
-						<Ammo_ChemicalCompoundOE_Aprometheum>Bullet_ChemicalCompoundOE_Aprometheum</Ammo_ChemicalCompoundOE_Aprometheum>
-						<Ammo_ChemicalCompoundOE_Thermobaric>Bullet_ChemicalCompoundOE_Thermobaric</Ammo_ChemicalCompoundOE_Thermobaric>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="ChemicalCompoundOE" ParentName="AmmoBase" Abstract="True">
-					<description>Stabilised chemical munition compound stored in special canister, for use in advanced chemical launchers.</description>
-					<statBases>
-						<MaxHitPoints>75</MaxHitPoints>
-						<Flammability>1.0</Flammability>
-						<Mass>0.34</Mass>
-						<Bulk>0.45</Bulk>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_DrugLab</li>
-					</tradeTags>
-					<thingCategories>
-						<li>AmmoFlamethrower</li>
-					</thingCategories>
-					<stackLimit>500</stackLimit>
-					<cookOffFlashScale>50</cookOffFlashScale>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="ChemicalCompoundOE">
-					<defName>Ammo_ChemicalCompoundOE_Cryo</defName>
-					<label>Chemical munition OE (Cryo)</label>
-					<graphicData>
-						<texPath>ThirdParty/Orassans/Ammo/Canister/Cryo</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>5.0</MarketValue>
-					</statBases>
-					<ammoClass>ChemicalMunitionCompoundCryo</ammoClass>
-					<detonateProjectile>Bullet_ChemicalCompoundOE_Cryo</detonateProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="ChemicalCompoundOE">
-					<defName>Ammo_ChemicalCompoundOE_Napalm</defName>
-					<label>Chemical munition OE (Napalm)</label>
-					<graphicData>
-						<texPath>ThirdParty/Orassans/Ammo/Canister/Napalm</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>3.3</MarketValue>
-					</statBases>
-					<ammoClass>IncendiaryFuel</ammoClass>
-					<detonateProjectile>Bullet_ChemicalCompoundOE_Napalm</detonateProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="ChemicalCompoundOE">
-					<defName>Ammo_ChemicalCompoundOE_Aprometheum</defName>
-					<label>Chemical munition OE (A.Prometheum)</label>
-					<graphicData>
-						<texPath>ThirdParty/Orassans/Ammo/Canister/Aprometheum</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>7.2</MarketValue>
-					</statBases>
-					<ammoClass>ChemicalMunitionCompoundAprometheum</ammoClass>
-					<detonateProjectile>Bullet_ChemicalCompoundOE_Aprometheum</detonateProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="ChemicalCompoundOE">
-					<defName>Ammo_ChemicalCompoundOE_Thermobaric</defName>
-					<label>Chemical munition OE (Thermobaric)</label>
-					<graphicData>
-						<texPath>ThirdParty/Orassans/Ammo/Canister/Thermobaric</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>8.5</MarketValue>
-					</statBases>
-					<ammoClass>ChemicalMunitionCompoundThermobaric</ammoClass>
-					<detonateProjectile>Bullet_ChemicalCompoundOE_Thermobaric</detonateProjectile>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef Name="BaseChemicalCompoundOEBullet" ParentName="BaseExplosiveBullet" Abstract="true">
-					<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					<graphicData>
-						<texPath>Things/Projectile/Bullet_Big</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>40</speed>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseChemicalCompoundOEBullet">
-					<defName>Bullet_ChemicalCompoundOE_Cryo</defName>
-					<label>Chemical munition OE (Cryo)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>45</speed>
-						<damageDef>OFrostbite</damageDef>
-						<damageAmountBase>20</damageAmountBase>
-						<armorPenetrationSharp>0</armorPenetrationSharp>
-						<armorPenetrationBlunt>0</armorPenetrationBlunt>
-						<explosionRadius>4.0</explosionRadius>
-						<postExplosionSpawnThingDef>Filth_Snow</postExplosionSpawnThingDef>
-						<postExplosionSpawnChance>1</postExplosionSpawnChance>
-						<postExplosionSpawnThingCount>3</postExplosionSpawnThingCount>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseChemicalCompoundOEBullet">
-					<defName>Bullet_ChemicalCompoundOE_Napalm</defName>
-					<label>Chemical munition OE (Napalm)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Flame</damageDef>
-						<damageAmountBase>8</damageAmountBase>
-						<armorPenetrationSharp>0</armorPenetrationSharp>
-						<armorPenetrationBlunt>0</armorPenetrationBlunt>
-						<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
-						<preExplosionSpawnChance>0.33</preExplosionSpawnChance>
-						<soundExplode>CE_FlamethrowerExplosion</soundExplode>
-						<explosionRadius>4.5</explosionRadius>
-						<ai_IsIncendiary>true</ai_IsIncendiary>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseChemicalCompoundOEBullet">
-					<defName>Bullet_ChemicalCompoundOE_Aprometheum</defName>
-					<label>Chemical munition OE (A.Prometheum)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>AprometheumFlame</damageDef>
-						<damageAmountBase>12</damageAmountBase>
-						<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
-						<preExplosionSpawnChance>0.15</preExplosionSpawnChance>
-						<soundExplode>CE_FlamethrowerExplosion</soundExplode>
-						<explosionRadius>2.5</explosionRadius>
-						<ai_IsIncendiary>true</ai_IsIncendiary>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseChemicalCompoundOEBullet">
-					<defName>Bullet_ChemicalCompoundOE_Thermobaric</defName>
-					<label>Chemical munition OE (Thermobaric)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Thermobaric</damageDef>
-						<explosionRadius>4.5</explosionRadius>
-						<damageAmountBase>46</damageAmountBase>
-						<armorPenetrationSharp>0</armorPenetrationSharp>
-						<armorPenetrationBlunt>0</armorPenetrationBlunt>
-						<soundExplode>MortarBomb_Explode</soundExplode>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						<ai_IsIncendiary>true</ai_IsIncendiary>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_ChemicalCompoundOE_Cryo</defName>
-					<label>make Chemical munition OE Cryo units x100</label>
-					<description>Craft 100 Chemical munition OE Cryo units.</description>
-					<jobString>Making Chemical munition OE Cryo units.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>45</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>12</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>12</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>5</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>Prometheum</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_ChemicalCompoundOE_Cryo>100</Ammo_ChemicalCompoundOE_Cryo>
-					</products>
-					<workAmount>13000</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_ChemicalCompoundOE_Napalm</defName>
-					<label>make Chemical munitio compound OE Napalm units x100</label>
-					<description>Craft 100 Chemical munition OE Napalm units.</description>
-					<jobString>Making Chemical munition OE Napalm units.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>45</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>12</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>12</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>5</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>Prometheum</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_ChemicalCompoundOE_Napalm>100</Ammo_ChemicalCompoundOE_Napalm>
-					</products>
-					<workAmount>13000</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_ChemicalCompoundOE_Aprometheum</defName>
-					<label>make Chemical munition OE A.Prometheum units x100</label>
-					<description>Craft 100 Chemical compound OE A.Prometheum units.</description>
-					<jobString>Making Chemical munitio compound OE A.Prometheum units.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>45</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>12</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>12</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>5</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>Prometheum</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_ChemicalCompoundOE_Aprometheum>100</Ammo_ChemicalCompoundOE_Aprometheum>
-					</products>
-					<workAmount>13000</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_ChemicalCompoundOE_Thermobaric</defName>
-					<label>make Chemical munition OE Thermobaric units x100</label>
-					<description>Craft 100 Chemical compound OE Thermobaric units.</description>
-					<jobString>Making Chemical munition OE Thermobaric units.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>45</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>12</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>12</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>5</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>Prometheum</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_ChemicalCompoundOE_Thermobaric>100</Ammo_ChemicalCompoundOE_Thermobaric>
-					</products>
-					<workAmount>13000</workAmount>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Orassans/Ammo/CryoBolt.xml b/Patches/Orassans/Ammo/CryoBolt.xml
deleted file mode 100644
index 75bc63145f..0000000000
--- a/Patches/Orassans/Ammo/CryoBolt.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Orassans</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<!-- === Custom Snow Filth === -->
-				<ThingDef ParentName="BaseFilth">
-					<defName>Filth_Snow</defName>
-					<label>snow</label>
-					<graphicData>
-						<texPath>Things/Filth/Grainy</texPath>
-						<color>(180, 180, 180, 97)</color>
-					</graphicData>
-					<filth>
-						<placementMask>
-							<li>Terrain</li>
-						</placementMask>
-						<disappearsInDays>5~10</disappearsInDays>
-						<rainWashes>true</rainWashes>
-						<cleaningWorkToReduceThickness>35</cleaningWorkToReduceThickness>
-						<canFilthAttach>true</canFilthAttach>
-						<allowsFire>false</allowsFire>
-					</filth>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseExplosiveBullet">
-					<defName>Bullet_CryBolt</defName>
-					<label>cryo bolt</label>
-					<thingClass>Orassan.Projectile_SnowMaker</thingClass>
-					<graphicData>
-						<texPath>Things/Item/Equipment/Weapons/CryoCannonShot</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-						<shaderType>TransparentPostLight</shaderType>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>60</speed>
-						<damageDef>OFrostbite</damageDef>
-						<damageAmountBase>15</damageAmountBase>
-						<armorPenetrationSharp>0</armorPenetrationSharp>
-						<armorPenetrationBlunt>0</armorPenetrationBlunt>
-						<explosionRadius>4</explosionRadius>
-						<postExplosionSpawnThingDef>Filth_Snow</postExplosionSpawnThingDef>
-						<postExplosionSpawnChance>1</postExplosionSpawnChance>
-						<postExplosionSpawnThingCount>3</postExplosionSpawnThingCount>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-					</projectile>
-				</ThingDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Orassans/Ammo/Damages_LocalInjury_OE.xml b/Patches/Orassans/Ammo/Damages_LocalInjury_OE.xml
deleted file mode 100644
index b5d48f78de..0000000000
--- a/Patches/Orassans/Ammo/Damages_LocalInjury_OE.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Orassans</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<DamageDef ParentName="Flame">
-					<defName>AprometheumFlame</defName>
-					<label>accelerated prometheum flame</label>
-					<additionalHediffs>
-						<li>
-							<hediff>AprometheumSoaked</hediff>
-							<severityPerDamageDealt>0.08</severityPerDamageDealt>
-						</li>
-					</additionalHediffs>
-				</DamageDef>
-
-			</value>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Orassans/Ammo/Hediffs_CE_OE.xml b/Patches/Orassans/Ammo/Hediffs_CE_OE.xml
deleted file mode 100644
index 3558e00cf0..0000000000
--- a/Patches/Orassans/Ammo/Hediffs_CE_OE.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Orassans</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<HediffDef>
-					<defName>AprometheumSoaked</defName>
-					<label>Accelerated Prometheum-soaked</label>
-					<description>Soaked in Accelerated Prometheum</description>
-					<hediffClass>HediffWithComps</hediffClass>
-					<comps>
-						<li Class="HediffCompProperties_SeverityPerDay">
-							<severityPerDay>-24</severityPerDay>
-						</li>
-						<li Class="CombatExtended.HediffCompProperties_Prometheum" />
-					</comps>
-					<stages>
-						<li>
-							<minSeverity>0.2</minSeverity>
-							<label>minor</label>
-							<statOffsets>
-								<Flammability>0.3</Flammability>
-							</statOffsets>
-						</li>
-						<li>
-							<minSeverity>0.40</minSeverity>
-							<label>dripping</label>
-							<statOffsets>
-								<Flammability>0.65</Flammability>
-							</statOffsets>
-						</li>
-						<li>
-							<minSeverity>0.5</minSeverity>
-							<label>soaked</label>
-							<statOffsets>
-								<Flammability>1.1</Flammability>
-							</statOffsets>
-						</li>
-						<li>
-							<minSeverity>0.65</minSeverity>
-							<label>soaked</label>
-							<statOffsets>
-								<Flammability>1.3</Flammability>
-							</statOffsets>
-						</li>
-						<li>
-							<minSeverity>0.75</minSeverity>
-							<label>drenched</label>
-							<statOffsets>
-								<Flammability>1.5</Flammability>
-							</statOffsets>
-						</li>
-						<li>
-							<minSeverity>0.8</minSeverity>
-							<label>drenched</label>
-							<statOffsets>
-								<Flammability>1.8</Flammability>
-							</statOffsets>
-						</li>
-						<li>
-							<minSeverity>0.9</minSeverity>
-							<label>overdrenched</label>
-							<statOffsets>
-								<Flammability>2.0</Flammability>
-							</statOffsets>
-						</li>
-					</stages>
-				</HediffDef>
-
-			</value>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Orassans/Ammo/MissileAmmo.xml b/Patches/Orassans/Ammo/MissileAmmo.xml
deleted file mode 100644
index 978d90ba00..0000000000
--- a/Patches/Orassans/Ammo/MissileAmmo.xml
+++ /dev/null
@@ -1,333 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Orassans</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>AmmoOrassanMissileShells</defName>
-					<label>orassan missile shell</label>
-					<parent>AmmoShells</parent>
-					<iconPath>Things/Projectile/Cannon/HE</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_OrassanMissileShell</defName>
-					<label>Orassan missile shells</label>
-					<ammoTypes>
-						<Ammo_OrassanMissileShell_HEAT>Bullet_OrassanMissileShell_HEAT</Ammo_OrassanMissileShell_HEAT>
-						<Ammo_OrassanMissileShell_HE>Bullet_OrassanMissileShell_HE</Ammo_OrassanMissileShell_HE>
-						<Ammo_OrassanMissileShell_APSabot>Bullet_OrassanMissileShell_APSabot</Ammo_OrassanMissileShell_APSabot>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="OrassanMissileShellBase" ParentName="HeavyAmmoBase" Abstract="True">
-					<description>Large projectiles for the orassan recoilless railgun rifle system The lack of propellent allows for larger payloads for their size, effectively allowing infantry to use armaments typically associated with armor.</description>
-					<thingCategories>
-						<li>AmmoOrassanMissileShells</li>
-					</thingCategories>
-					<stackLimit>25</stackLimit>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-					</tradeTags>
-					<statBases>
-						<MaxHitPoints>250</MaxHitPoints>
-						<Mass>15</Mass>
-						<Bulk>15</Bulk>
-					</statBases>
-					<cookOffFlashScale>35</cookOffFlashScale>
-					<cookOffSound>MortarBomb_Explode</cookOffSound>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="OrassanMissileShellBase">
-					<defName>Ammo_OrassanMissileShell_HEAT</defName>
-					<label>Orassan Missile shell (HEAT)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Cannon/Tank/HEAT</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>141.46</MarketValue>
-					</statBases>
-					<ammoClass>RocketHEAT</ammoClass>
-					<detonateProjectile>Bullet_OrassanMissileShell_HEAT</detonateProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="OrassanMissileShellBase">
-					<defName>Ammo_OrassanMissileShell_HE</defName>
-					<label>Orassan Missile shell (HE)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Cannon/Tank/HE</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>180.99</MarketValue>
-					</statBases>
-					<ammoClass>RocketHE</ammoClass>
-					<detonateProjectile>Bullet_OrassanMissileShell_HE</detonateProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="OrassanMissileShellBase">
-					<defName>Ammo_OrassanMissileShell_APSabot</defName>
-					<label>Orassan Missile shell (AP Sabot)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Cannon/Tank/Sabot</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>190</MarketValue>
-						<Bulk>10.8</Bulk>
-						<Mass>4</Mass>
-					</statBases>
-					<ammoClass>RailgunSabot</ammoClass>
-					<detonateProjectile>Bullet_OrassanMissileShell_APSabot</detonateProjectile>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef Name="BaseOrassanMissileShell" ParentName="Base120mmCannonShell" Abstract="true">
-					<graphicData>
-						<shaderType>TransparentPostLight</shaderType>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>280</speed>
-						<soundExplode>MortarBomb_Explode</soundExplode>
-						<flyOverhead>false</flyOverhead>
-						<dropsCasings>false</dropsCasings>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseOrassanMissileShell">
-					<defName>Bullet_OrassanMissileShell_HEAT</defName>
-					<label>Orassan Missile shell (HEAT)</label>
-					<graphicData>
-						<texPath>Things/Projectile/Cannon/HEAT</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bullet</damageDef>
-						<damageAmountBase>405</damageAmountBase>
-						<soundExplode>MortarBomb_Explode</soundExplode>
-						<armorPenetrationSharp>420</armorPenetrationSharp>
-						<armorPenetrationBlunt>62.411</armorPenetrationBlunt>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>208</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>1.5</explosiveRadius>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>18</Fragment_Large>
-								<Fragment_Small>81</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseOrassanMissileShell">
-					<defName>Bullet_OrassanMissileShell_APSabot</defName>
-					<label>Orassan Missile shell (AP Sabot)</label>
-					<graphicData>
-						<texPath>Things/Projectile/Cannon/Sabot</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bullet</damageDef>
-						<damageAmountBase>500</damageAmountBase>
-						<soundExplode>MortarBomb_Explode</soundExplode>
-						<armorPenetrationSharp>500</armorPenetrationSharp>
-						<armorPenetrationBlunt>75</armorPenetrationBlunt>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>108</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>1.5</explosiveRadius>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>5</Fragment_Large>
-								<Fragment_Small>25</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseOrassanMissileShell">
-					<defName>Bullet_OrassanMissileShell_HE</defName>
-					<label>Orassan Missile shell (HE)</label>
-					<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					<graphicData>
-						<texPath>Things/Projectile/Cannon/HE</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bomb</damageDef>
-						<damageAmountBase>315</damageAmountBase>
-						<explosionRadius>4</explosionRadius>
-						<soundExplode>MortarBomb_Explode</soundExplode>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>30</Fragment_Large>
-								<Fragment_Small>323</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_OrassanMissileShell_HEAT</defName>
-					<label>make HEAT orassan missile shells x2</label>
-					<description>Craft 2 120mm HEAT cannon shells.</description>
-					<jobString>Making 120mm HEAT cannon shells.</jobString>
-					<workAmount>33200</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>90</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>7</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>ComponentIndustrial</li>
-							<li>FSX</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_OrassanMissileShell_HEAT>2</Ammo_OrassanMissileShell_HEAT>
-					</products>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_OrassanMissileShell_APSabot</defName>
-					<label>make armor Piercing Sabot orassan missile shells x2</label>
-					<description>Craft 2 armor piercing sabot orassan missile shells.</description>
-					<jobString>Making armor piercing sabot orassan missile shells.</jobString>
-					<workAmount>30000</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>90</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>ComponentIndustrial</li>
-							<li>FSX</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_OrassanMissileShell_APSabot>2</Ammo_OrassanMissileShell_APSabot>
-					</products>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_OrassanMissileShell_HE</defName>
-					<label>make HE orassan missile shells x2</label>
-					<description>Craft 2 120mm HE cannon shells.</description>
-					<jobString>Making 120mm HE cannon shells.</jobString>
-					<workAmount>42400</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>90</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>13</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>ComponentIndustrial</li>
-							<li>FSX</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_OrassanMissileShell_HE>2</Ammo_OrassanMissileShell_HE>
-					</products>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Orassans/Ammo/RailShotgunAmmo.xml b/Patches/Orassans/Ammo/RailShotgunAmmo.xml
deleted file mode 100644
index e4d6643701..0000000000
--- a/Patches/Orassans/Ammo/RailShotgunAmmo.xml
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Orassans</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>AmmoRailShotOE</defName>
-					<label>railgun shot shell (OE)</label>
-					<parent>AmmoShells</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberShotgun</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_RailShellOE</defName>
-					<label>rail shotgun shells (OE)</label>
-					<ammoTypes>
-						<Ammo_Railgun_BuckOE>Bullet_Railgun_BuckOE</Ammo_Railgun_BuckOE>
-						<Ammo_Railgun_SlugOE>Bullet_Railgun_SlugOE</Ammo_Railgun_SlugOE>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="RailGaugeBase" ParentName="SmallAmmoBase" Abstract="True">
-					<description>Unlike other railgun rounds these require a casing to be used effectively, and unlike shotguns, the buckshot isn't as easily foiled by armor.</description>
-					<statBases>
-						<Mass>0.023</Mass>
-						<Bulk>0.06</Bulk>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_FabricationBench</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-					</tradeTags>
-					<thingCategories>
-						<li>AmmoRailShotOE</li>
-					</thingCategories>
-					<stackLimit>5000</stackLimit>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="RailGaugeBase">
-					<defName>Ammo_Railgun_BuckOE</defName>
-					<label>railgun shell (Buck:OE)</label>
-					<graphicData>
-						<texPath>ThirdParty/Orassans/Ammo/Shotgun/RailShot</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.1</MarketValue>
-					</statBases>
-					<ammoClass>BuckShot</ammoClass>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="RailGaugeBase">
-					<defName>Ammo_Railgun_SlugOE</defName>
-					<label>railgun shell (Slug:OE)</label>
-					<graphicData>
-						<texPath>ThirdParty/Orassans/Ammo/Shotgun/RailSlug</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<Mass>0.048</Mass>
-						<MarketValue>0.2</MarketValue>
-					</statBases>
-					<ammoClass>Slug</ammoClass>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef Name="BaseRailShotBullet" ParentName="Base12GaugeBullet" Abstract="true">
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bullet</damageDef>
-						<dropsCasings>true</dropsCasings>
-						<casingMoteDefname>Fleck_ShotgunShell</casingMoteDefname>
-						<casingFilthDefname>Filth_ShotgunAmmoCasings</casingFilthDefname>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseRailShotBullet">
-					<defName>Bullet_Railgun_BuckOE</defName>
-					<label>rail buckshot pellet</label>
-					<graphicData>
-						<texPath>Things/Projectile/Shotgun_Pellet</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>12</damageAmountBase>
-						<pelletCount>9</pelletCount>
-						<armorPenetrationSharp>9</armorPenetrationSharp>
-						<armorPenetrationBlunt>20</armorPenetrationBlunt>
-						<spreadMult>15.8</spreadMult>
-						<speed>380</speed>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseRailShotBullet">
-					<defName>Bullet_Railgun_SlugOE</defName>
-					<label>rail shotgun slug (sabot:OE)</label>
-					<graphicData>
-						<texPath>Things/Projectile/Bullet_big</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>38</damageAmountBase>
-						<armorPenetrationSharp>20</armorPenetrationSharp>
-						<armorPenetrationBlunt>160.450</armorPenetrationBlunt>
-						<speed>310</speed>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_Railgun_BuckOE</defName>
-					<label>make railgun (Buck:OE) shell x200</label>
-					<description>Craft 200 12 gauge (Buck:OE) shells.</description>
-					<jobString>Making 12 gauge (Buck:OE) shells.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Uranium</li>
-								</thingDefs>
-							</filter>
-							<count>4</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Uranium</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_Railgun_BuckOE>200</Ammo_Railgun_BuckOE>
-					</products>
-					<workAmount>1200</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_Railgun_SlugOE</defName>
-					<label>make railgun (Slug:OE) shell x200</label>
-					<description>Craft 200 railgun (Slug:OE) shells.</description>
-					<jobString>Making railgun (Slug:OE) shells.</jobString>
-					<workAmount>900</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Uranium</li>
-								</thingDefs>
-							</filter>
-							<count>5</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Uranium</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_Railgun_SlugOE>200</Ammo_Railgun_SlugOE>
-					</products>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Orassans/PawnKinds_Orassans.xml b/Patches/Orassans/PawnKinds_Orassans.xml
deleted file mode 100644
index d29f3cb6f1..0000000000
--- a/Patches/Orassans/PawnKinds_Orassans.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Orassans</li>
-		</mods>
-		<match Class="PatchOperationAddModExtension">
-			<xpath>
-				Defs/PawnKindDef[
-				defName = "Orassan" or
-				defName = "HumanVillager" or
-				defName = "HybridVillager" or
-				defName = "OrassanVillager" or
-				defName = "OrassanSlave" or
-				defName = "HybridRefugee" or
-				defName = "OrassanRefugee" or
-				defName = "OrassanTownCouncilman" or
-				defName = "OrassanTrader" or
-				defName = "OrassanTownGuard" or
-				defName = "OrassanSniper" or
-				defName = "OrassanMercenarySniper" or
-				defName = "OrassanSlasher" or
-				defName = "OrassanPirateSlasher" or
-				defName = "OrassanGunner" or
-				defName = "OrassanMercenaryGunner" or
-				defName = "OrassanGrenadier" or
-				defName = "OrassanSoldier" or
-				defName = "HybridSoldier" or
-				defName = "HumanSoldier" or
-				defName = "OrassanMercenarySoldier" or
-				defName = "OrassanPirate"
-				]
-			</xpath>
-			<value>
-				<li Class="CombatExtended.LoadoutPropertiesExtension">
-					<primaryMagazineCount>
-						<min>3</min>
-						<max>5</max>
-					</primaryMagazineCount>
-					<shieldMoney>
-						<min>500</min>
-						<max>1400</max>
-					</shieldMoney>
-					<shieldTags>
-						<li>OutlanderShield</li>
-					</shieldTags>
-					<shieldChance>0.5</shieldChance>
-					<sidearms>
-						<li>
-							<generateChance>0.75</generateChance>
-							<sidearmMoney>
-								<min>200</min>
-								<max>400</max>
-							</sidearmMoney>
-							<weaponTags>
-								<li>OrassanMeleeSidearm</li>
-							</weaponTags>
-						</li>
-					</sidearms>
-				</li>
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Orassans/ThingDefs_Misc/Apparel_Hats.xml b/Patches/Orassans/ThingDefs_Misc/Apparel_Hats.xml
deleted file mode 100644
index f29721d9e9..0000000000
--- a/Patches/Orassans/ThingDefs_Misc/Apparel_Hats.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Orassans</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Orassan Power Helmet ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_OrassanPowerArmorHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_OrassanPowerArmorHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<AimingAccuracy>0.15</AimingAccuracy>
-
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_OrassanPowerArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>19.2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_OrassanPowerArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>50</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_OrassanPowerArmorHelmet"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>45</Plasteel>
-						<CatLavenderCloth>20</CatLavenderCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_OrassanPowerArmorHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!-- ========== Orassan Sack Helmet ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_OrassanSacriArmorHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.8</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_OrassanSacriArmorHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<AimingAccuracy>0.15</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_OrassanSacriArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4.8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_OrassanSacriArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>25</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_OrassanSacriArmorHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Orassans/ThingDefs_Misc/Apparel_Various.xml b/Patches/Orassans/ThingDefs_Misc/Apparel_Various.xml
deleted file mode 100644
index a74eb5fbd2..0000000000
--- a/Patches/Orassans/ThingDefs_Misc/Apparel_Various.xml
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Orassans</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Orassan Power Armor ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_KittyArmor"]/statBases</xpath>
-					<value>
-						<Bulk>90</Bulk>
-						<WornBulk>6</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_KittyArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>90</CarryWeight>
-						<CarryBulk>15</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_KittyArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>45</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_KittyArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>24</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_KittyArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>60</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_KittyArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<!-- ========== Orassan Medium Powerarmor ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_MediumKittyArmor"]/statBases</xpath>
-					<value>
-						<Bulk>70</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_MediumKittyArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>100</CarryWeight>
-						<CarryBulk>22.5</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MediumKittyArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>25</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MediumKittyArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MediumKittyArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>50</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_MediumKittyArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<!-- ========== Orassan Light Powarmor ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_LightKittyArmor"]/statBases</xpath>
-					<value>
-						<Bulk>50</Bulk>
-						<WornBulk>4</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_LightKittyArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>110</CarryWeight>
-						<CarryBulk>30</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_LightKittyArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>3</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_LightKittyArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>13</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_LightKittyArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>39</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_LightKittyArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<!-- ========== Orassan Sack Armor ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_KittySacriSuit"]/statBases</xpath>
-					<value>
-						<Bulk>90</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_KittySacriSuit"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>90</CarryWeight>
-						<CarryBulk>15</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_KittySacriSuit"]/statBases/Mass</xpath>
-					<value>
-						<Mass>15</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_KittySacriSuit"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_KittySacriSuit"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>25</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_KittySacriSuit"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<!-- ======= Clothing ======= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_OrassanBasicTop" or defName="Apparel_OrassanBasicShorts"]/statBases</xpath>
-					<value>
-						<Bulk>0.75</Bulk>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_OrassanBasicTop" or defName="Apparel_OrassanBasicShorts"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Orassans/ThingDefs_Races/Desiri.xml b/Patches/Orassans/ThingDefs_Races/Desiri.xml
deleted file mode 100644
index e84eebc32a..0000000000
--- a/Patches/Orassans/ThingDefs_Races/Desiri.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Orassans</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="ThingBaseDesiri"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="ThingBaseDesiri"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.91</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.198</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.91</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.198</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.49</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>1.440</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Animal_Desiri"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.27</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Orassans/ThingDefs_Races/Gryphon.xml b/Patches/Orassans/ThingDefs_Races/Gryphon.xml
deleted file mode 100644
index e08b85b012..0000000000
--- a/Patches/Orassans/ThingDefs_Races/Gryphon.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Orassans</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Gryphon"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- Copied Big Cat Stats, changed bite to use beak, and paws to claws -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gryphon"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Gryphon"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						<MeleeCritChance>0.12</MeleeCritChance>
-						<MeleeParryChance>0.06</MeleeParryChance>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Orassans/ThingDefs_Races/Hybrid_Race.xml b/Patches/Orassans/ThingDefs_Races/Hybrid_Race.xml
deleted file mode 100644
index 36db133ad8..0000000000
--- a/Patches/Orassans/ThingDefs_Races/Hybrid_Race.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Orassans</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_OrassanHumanHybrid"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_OrassanHumanHybrid"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_OrassanHumanHybrid"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_OrassanHumanHybrid"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_OrassanHumanHybrid"]/statBases/MeleeDodgeChance</xpath>
-					<value>
-						<AimingAccuracy>1</AimingAccuracy>
-						<MeleeCritChance>1.93</MeleeCritChance>
-						<MeleeParryChance>0.75</MeleeParryChance>
-						<ReloadSpeed>1</ReloadSpeed>
-						<Suppressability>1</Suppressability>
-						<MeleeDodgeChance>1.71</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_OrassanHumanHybrid"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.15</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.15</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.923</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Orassans/ThingDefs_Races/Orassan_Race.xml b/Patches/Orassans/ThingDefs_Races/Orassan_Race.xml
deleted file mode 100644
index 14a575e75d..0000000000
--- a/Patches/Orassans/ThingDefs_Races/Orassan_Race.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Orassans</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Orassan"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Orassan"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Orassan"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Orassan"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Orassan"]/statBases/MeleeDodgeChance</xpath>
-					<value>
-						<AimingAccuracy>1</AimingAccuracy>
-						<MeleeCritChance>1.93</MeleeCritChance>
-						<MeleeParryChance>0.75</MeleeParryChance>
-						<ReloadSpeed>1</ReloadSpeed>
-						<Suppressability>1</Suppressability>
-						<MeleeDodgeChance>1.71</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Orassan"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.15</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.15</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.923</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Orassans/ThingDefs_Races/Ori.xml b/Patches/Orassans/ThingDefs_Races/Ori.xml
deleted file mode 100644
index 9a99cb3aee..0000000000
--- a/Patches/Orassans/ThingDefs_Races/Ori.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Orassans</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Ori"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Ori"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hand</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.19</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hand</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.19</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.19</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Ori"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>5</MoveSpeed>
-						<MeleeDodgeChance>0.24</MeleeDodgeChance>
-						<MeleeCritChance>0.03</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Orassans/ThingDefs_Weapons/Weapons.xml b/Patches/Orassans/ThingDefs_Weapons/Weapons.xml
deleted file mode 100644
index 0d446ba463..0000000000
--- a/Patches/Orassans/ThingDefs_Weapons/Weapons.xml
+++ /dev/null
@@ -1,965 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Orassans</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "Gun_OrassanPistol" or
-						defName = "Gun_OrassanAEPistol" or
-						defName = "Gun_OrassanSMG"
-						]/tools
-					</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "Gun_OrassanShotgun" or
-						defName = "Gun_OrassanRifle" or
-						defName = "Gun_OrassanLMG" or
-						defName = "Gun_OrassanSniper" or
-						defName = "Gun_OrassanDMR" or
-						defName = "Gun_OrassanGMG" or
-						defName = "Gun_OrassanBattleRifle" or
-						defName = "Gun_OrassanGrenadeLauncher"
-						]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "Gun_CryoLauncher" or
-						defName = "Gun_OrassanRocket"
-						]/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>
-				</li>
-
-				<!-- === Pistol === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_OrassanPistol</defName>
-					<statBases>
-						<Mass>1</Mass>
-						<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.50</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.37</SwayFactor>
-						<Bulk>1</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.40</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6mmRailgun_SabotOE</defaultProjectile>
-						<warmupTime>0.55</warmupTime>
-						<range>10</range>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<soundCast>Opistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>2</reloadTime>
-						<ammoSet>AmmoSet_6mmRailgunOE</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>AdvancedGun</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Heavy Pistol === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_OrassanAEPistol</defName>
-					<statBases>
-						<Mass>3</Mass>
-						<RangedWeapon_Cooldown>2.1</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.40</SightsEfficiency>
-						<ShotSpread>0.35</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>3</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>10</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12mmautoRailgun_SabotOE</defaultProjectile>
-						<warmupTime>0.40</warmupTime>
-						<range>18</range>
-						<soundCast>OTFalcon</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_12mmautoRailgunOE</ammoSet>
-					</AmmoUser>
-					<FireModes>
-					</FireModes>
-					<weaponTags>
-						<li>AdvancedGun</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- === SMG === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_OrassanSMG</defName>
-					<statBases>
-						<Mass>3</Mass>
-						<RangedWeapon_Cooldown>0.33</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.2</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>0.88</SwayFactor>
-						<Bulk>6</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.41</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12mmsubsonicRailgun_SabotOE</defaultProjectile>
-						<warmupTime>0.55</warmupTime>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<range>17</range>
-						<soundCast>OSMG</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_12mmsubsonicRailgunOE</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>true</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>AdvancedGun</li>
-						<li>CE_BROOM</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Shotgun === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_OrassanShotgun</defName>
-					<statBases>
-						<Mass>3</Mass>
-						<RangedWeapon_Cooldown>0.89</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.1</SwayFactor>
-						<Bulk>7</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.1</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Railgun_BuckOE</defaultProjectile>
-						<warmupTime>0.7</warmupTime>
-						<range>25</range>
-						<soundCast>OShotgun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>2</reloadTime>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<ammoSet>AmmoSet_RailShellOE</ammoSet>
-					</AmmoUser>
-					<FireModes>
-					</FireModes>
-					<weaponTags>
-						<li>AdvancedGun</li>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Rifle === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_OrassanRifle</defName>
-					<statBases>
-						<Mass>2.7</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.17</SwayFactor>
-						<Bulk>8.00</Bulk>
-						<WorkToMake>62000</WorkToMake>
-					</statBases>
-					<costList>
-						<Uranium>5</Uranium>
-						<Steel>100</Steel>
-						<Plasteel>100</Plasteel>
-						<ComponentSpacer>1</ComponentSpacer>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8mmRailgun_SabotOE</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>58</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>6</burstShotCount>
-						<soundCast>ORifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>40</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_8mmRailgunOE</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>true</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>AdvancedGun</li>
-						<li>CE_AI_AR</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_OrassanBattleRifle</defName>
-					<statBases>
-						<Mass>3.2</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.1</ShotSpread>
-						<SwayFactor>1.22</SwayFactor>
-						<Bulk>8.30</Bulk>
-						<WorkToMake>62000</WorkToMake>
-					</statBases>
-					<costList>
-						<Uranium>5</Uranium>
-						<Steel>100</Steel>
-						<Plasteel>120</Plasteel>
-						<ComponentSpacer>1</ComponentSpacer>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.6</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_10mmRailgun_SabotOE</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>58</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>6</burstShotCount>
-						<soundCast>OTFalcon</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_10mmRailgunOE</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>true</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>AdvancedGun</li>
-						<li>CE_AI_AR</li>
-					</weaponTags>
-				</li>
-
-				<!-- === LMG === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_OrassanLMG</defName>
-					<statBases>
-						<Mass>2.7</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.17</SwayFactor>
-						<Bulk>8.00</Bulk>
-						<WorkToMake>62000</WorkToMake>
-						<NightVisionEfficiency_Weapon>0.6</NightVisionEfficiency_Weapon>
-					</statBases>
-					<costList>
-						<Uranium>5</Uranium>
-						<Steel>100</Steel>
-						<Plasteel>100</Plasteel>
-						<ComponentSpacer>1</ComponentSpacer>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.16</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8mmRailgun_SabotOE</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>62</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>OLMG</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>90</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_8mmRailgunOE</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>AdvancedGun</li>
-						<li>CE_MachineGun</li>
-						<li>CE_AI_LMG</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_OrassanGMG</defName>
-					<statBases>
-						<Mass>2.7</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.17</SwayFactor>
-						<Bulk>8.00</Bulk>
-						<WorkToMake>62000</WorkToMake>
-						<NightVisionEfficiency_Weapon>0.6</NightVisionEfficiency_Weapon>
-					</statBases>
-					<costList>
-						<Uranium>5</Uranium>
-						<Steel>100</Steel>
-						<Plasteel>100</Plasteel>
-						<ComponentSpacer>1</ComponentSpacer>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.16</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_10mmRailgun_SabotOE</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>62</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>OLMG</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>90</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_10mmRailgunOE</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>AdvancedGun</li>
-						<li>CE_MachineGun</li>
-						<li>CE_AI_LMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Sniper === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_OrassanSniper</defName>
-					<statBases>
-						<Mass>3.0</Mass>
-						<Bulk>12</Bulk>
-						<SightsEfficiency>3</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.3</SwayFactor>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<NightVisionEfficiency_Weapon>0.6</NightVisionEfficiency_Weapon>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12mmRailgun_SabotOE</defaultProjectile>
-						<warmupTime>2</warmupTime>
-						<range>90</range>
-						<soundCast>OSniper</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_12mmRailgunOE</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>AdvancedGun</li>
-						<li>OrassanSniper</li>
-						<li>CE_AI_SR</li>
-					</weaponTags>
-				</li>
-
-				<!-- === DMR === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_OrassanDMR</defName>
-					<statBases>
-						<Mass>3.0</Mass>
-						<RangedWeapon_Cooldown>0.32</RangedWeapon_Cooldown>
-						<SightsEfficiency>3</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.3</SwayFactor>
-						<Bulk>12</Bulk>
-						<NightVisionEfficiency_Weapon>0.6</NightVisionEfficiency_Weapon>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.60</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_10mmRailgun_SabotOE</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>74</range>
-						<soundCast>OTFalcon</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_10mmRailgunOE</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>AdvancedGun</li>
-						<li>OrassanSniper</li>
-						<li>CE_AI_SR</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Cryo Launcher === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_CryoLauncher</defName>
-					<statBases>
-						<Bulk>5.75</Bulk>
-						<Mass>3.8</Mass>
-						<SwayFactor>0.9</SwayFactor>
-						<ShotSpread>0.15</ShotSpread>
-						<SightsEfficiency>2</SightsEfficiency>
-						<RangedWeapon_Cooldown>.32</RangedWeapon_Cooldown>
-						<WorkToMake>32000</WorkToMake>
-						<NightVisionEfficiency_Weapon>0.6</NightVisionEfficiency_Weapon>
-					</statBases>
-					<costList>
-						<Plasteel>50</Plasteel>
-						<Uranium>20</Uranium>
-						<Steel>75</Steel>
-						<ComponentSpacer>4</ComponentSpacer>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>0.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_ChemicalCompoundOE_Cryo</defaultProjectile>
-						<warmupTime>.8</warmupTime>
-						<range>52</range>
-						<minRange>4</minRange>
-						<soundCast>OLaunchers</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>5.5</reloadTime>
-						<ammoSet>AmmoSet_ChemicalCompoundOE</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>AdvancedGun</li>
-						<li>OrassanCryo</li>
-						<li>CE_AI_AOE</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Grenade Launcher === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_OrassanGrenadeLauncher</defName>
-					<statBases>
-						<Bulk>5.2</Bulk>
-						<Mass>3.5</Mass>
-						<SwayFactor>0.9</SwayFactor>
-						<ShotSpread>0.1</ShotSpread>
-						<SightsEfficiency>2</SightsEfficiency>
-						<RangedWeapon_Cooldown>.35</RangedWeapon_Cooldown>
-						<WorkToMake>32000</WorkToMake>
-						<NightVisionEfficiency_Weapon>0.6</NightVisionEfficiency_Weapon>
-					</statBases>
-					<costList>
-						<Plasteel>40</Plasteel>
-						<Uranium>20</Uranium>
-						<Steel>80</Steel>
-						<ComponentSpacer>3</ComponentSpacer>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>0.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_40x90mmGrenadeOE_HE</defaultProjectile>
-						<warmupTime>.9</warmupTime>
-						<range>54</range>
-						<minRange>5</minRange>
-						<soundCast>OLaunchers</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_40x90mmGrenadeOE</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>AdvancedGun</li>
-						<li>OrassanGrenade</li>
-						<li>CE_AI_AOE</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Rocket Launcher === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_OrassanRocket</defName>
-					<statBases>
-						<Bulk>10</Bulk>
-						<Mass>5.0</Mass>
-						<SwayFactor>0.9</SwayFactor>
-						<ShotSpread>0.1</ShotSpread>
-						<SightsEfficiency>2</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
-						<WorkToMake>32000</WorkToMake>
-						<NightVisionEfficiency_Weapon>0.6</NightVisionEfficiency_Weapon>
-					</statBases>
-					<costList>
-						<Plasteel>50</Plasteel>
-						<Uranium>20</Uranium>
-						<Steel>75</Steel>
-						<ComponentSpacer>4</ComponentSpacer>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>0.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_OrassanMissileShell_HEAT</defaultProjectile>
-						<warmupTime>1.85</warmupTime>
-						<range>44</range>
-						<minRange>5</minRange>
-						<soundCast>OLaunchers</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>8</reloadTime>
-						<ammoSet>AmmoSet_OrassanMissileShell</ammoSet>
-					</AmmoUser>
-					<FireModes>
-					</FireModes>
-					<weaponTags>
-						<li>AdvancedGun</li>
-						<li>OrassanMissile</li>
-						<li>CE_AI_Launcher</li>
-						<li>CE_AI_AOE</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Kitty Claws (Sabre) === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_kittyclaws"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>hand guard</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.12</cooldownTime>
-								<armorPenetrationBlunt>1.8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>1.12</cooldownTime>
-								<armorPenetrationSharp>28.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>52</power>
-								<cooldownTime>0.9</cooldownTime>
-								<armorPenetrationSharp>10.37</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.832</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_kittyclaws"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.63</MeleeCritChance>
-							<MeleeParryChance>0.75</MeleeParryChance>
-							<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_kittyclaws"]/statBases</xpath>
-					<value>
-						<Bulk>7</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<!-- === Orassan Combat Knife === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OrassanCombatKnife"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<MeleeCounterParryBonus>0.30</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OrassanCombatKnife"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.15</MeleeCritChance>
-							<MeleeParryChance>0.35</MeleeParryChance>
-							<MeleeDodgeChance>0.02</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OrassanCombatKnife"]/weaponTags</xpath>
-					<value>
-						<li>CE_Sidearm_Melee</li>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OrassanCombatKnife"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>.85</cooldownTime>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.8</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>0.85</cooldownTime>
-								<chanceFactor>1.88</chanceFactor>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.8</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Orassan Telescoping Warhammer === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OrassanWarHammer"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<MeleeCounterParryBonus>1.4</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OrassanWarHammer"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.40</MeleeCritChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OrassanWarHammer"]/weaponTags</xpath>
-					<value>
-						<li>CE_Sidearm_Melee</li>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OrassanWarHammer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.8</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<!-- Designed to damage most powered armor -->
-								<armorPenetrationBlunt>60</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Cat's Eye berry juice (bottle) === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Catberryjuice"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2.22</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>neck</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>3.33</cooldownTime>
-								<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Neck</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Catberryjuice"]/statBases</xpath>
-					<value>
-						<MeleeCounterParryBonus>0.33</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Catberryjuice"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.1</MeleeCritChance>
-							<MeleeParryChance>0.33</MeleeParryChance>
-							<MeleeDodgeChance>0.07</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Catberryjuice"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Catberryjuice"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Catberryjuice"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Ordo Tempestus - Tempestus Scions/Armor_Industrial.xml b/Patches/Ordo Tempestus - Tempestus Scions/Armor_Industrial.xml
deleted file mode 100644
index 39eadc16ad..0000000000
--- a/Patches/Ordo Tempestus - Tempestus Scions/Armor_Industrial.xml	
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[1.4] Ordo Tempestus - Tempestus Scions</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Fatigues === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IM_TempestusScion_Fatigues"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IM_TempestusScion_Fatigues"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- === Carapace Armor === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IM_TempestusScion_CarapaceArmor"]/statBases</xpath>
-					<value>
-						<Bulk>20</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IM_TempestusScion_CarapaceArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IM_TempestusScion_CarapaceArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>24</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IM_TempestusScion_CarapaceArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>30</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IM_TempestusScion_CarapaceArmor"]/apparel/layers</xpath>
-					<value>
-						<li>Webbing</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IM_TempestusScion_CarapaceArmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Ordo Tempestus - Tempestus Scions/Headgear_Industrial.xml b/Patches/Ordo Tempestus - Tempestus Scions/Headgear_Industrial.xml
deleted file mode 100644
index 7dd4264b5e..0000000000
--- a/Patches/Ordo Tempestus - Tempestus Scions/Headgear_Industrial.xml	
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[1.4] Ordo Tempestus - Tempestus Scions</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Beret === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IM_TempestusScion_Beret"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- === Helmet === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IM_TempestusScion_Helmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IM_TempestusScion_Helmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>14</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IM_TempestusScion_Helmet"]/stuffCategories/li[.="Metallic"]</xpath>
-					<value>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<!-- === Omni Mask === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IM_TempestusScion_Mask"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>0.5</WornBulk>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-						<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ODZ_40k_IM_TempestusScion_Mask"]/stuffCategories/li[.="Metallic"]</xpath>
-					<value>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Outer Rim - Chiss Ascendancy/Outer_Rim_Chiss_Ascendancy_Ranged_Weapons.xml b/Patches/Outer Rim - Chiss Ascendancy/Outer_Rim_Chiss_Ascendancy_Ranged_Weapons.xml
deleted file mode 100644
index c74930bc30..0000000000
--- a/Patches/Outer Rim - Chiss Ascendancy/Outer_Rim_Chiss_Ascendancy_Ranged_Weapons.xml	
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outer Rim - Chiss Ascendancy</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_CharricPistol</defName>
-					<statBases>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.07</SwayFactor>
-						<Bulk>1.90</Bulk>
-						<Mass>1.20</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>3.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterPistol_Yellow</defaultProjectile>
-						<burstShotCount>2</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>0.5</warmupTime>
-						<range>9</range>
-						<soundCast>OuterRim_Shot_MaserBlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-					<AmmoUser>
-						<magazineSize>24</magazineSize>
-						<reloadTime>3.7</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeYellow_Pistol</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_CharricCarbine</defName>
-					<statBases>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.21</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>5.00</Bulk>
-						<Mass>2.80</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterRifle_Yellow</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>35</range>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>2</burstShotCount>
-						<soundCast>OuterRim_Shot_MaserBlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>3.7</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeYellow_Rifle</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_CharricRifle</defName>
-					<statBases>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.21</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>6.00</Bulk>
-						<Mass>4.10</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterRifle_Yellow</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>35</range>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>2</burstShotCount>
-						<soundCast>OuterRim_Shot_MaserBlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>3.7</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeYellow_Rifle</ammoSet>
-					</AmmoUser>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Outer Rim - Core/Outer_Rim_Core_Ammo.xml b/Patches/Outer Rim - Core/Outer_Rim_Core_Ammo.xml
deleted file mode 100644
index c0e163ba50..0000000000
--- a/Patches/Outer Rim - Core/Outer_Rim_Core_Ammo.xml	
+++ /dev/null
@@ -1,1043 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outer Rim - Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[defName="OuterRim_Blaster"]/armorCategory</xpath>
-					<value>
-						<armorCategory>Sharp</armorCategory>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingCategoryDef>
-							<defName>AmmoPlasmaGasCartridge</defName>
-							<label>Plasma Gas Cartridges</label>
-							<parent>AmmoAdvanced</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== AmmoSets ========================== -->
-						
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_PlasmaGasCartridgeRed_Pistol</defName>
-							<label>Pistol Plasma Gas Cartridges (Imperial/Sith)</label>
-							<ammoTypes>
-								<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterPistol_Red</Ammo_PlasmaGasCartridge_Standard>
-								<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterPistol_RedAP</Ammo_PlasmaGasCartridge_AP>
-								<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterPistol_Ion</Ammo_PlasmaGasCartridge_Ion>
-								<Ammo_PlasmaGasCartridge_Stun>Bullet_BlasterPistol_Stun</Ammo_PlasmaGasCartridge_Stun>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-						
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_PlasmaGasCartridgeRed_Rifle</defName>
-							<label>Rifle Plasma Gas Cartridges (Imperial/Sith)</label>
-							<ammoTypes>
-								<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterRifle_Red</Ammo_PlasmaGasCartridge_Standard>
-								<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterRifle_RedAP</Ammo_PlasmaGasCartridge_AP>
-								<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterRifle_Ion</Ammo_PlasmaGasCartridge_Ion>
-								<Ammo_PlasmaGasCartridge_Stun>Bullet_BlasterRifle_Stun</Ammo_PlasmaGasCartridge_Stun>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-						
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_PlasmaGasCartridgeRed_Sniper</defName>
-							<label>Heavy Plasma Gas Cartridges (Imperial/Sith)</label>
-							<ammoTypes>
-								<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterSniper_Red</Ammo_PlasmaGasCartridge_Standard>
-								<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterSniper_RedAP</Ammo_PlasmaGasCartridge_AP>
-								<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterSniper_Ion</Ammo_PlasmaGasCartridge_Ion>
-								<Ammo_PlasmaGasCartridge_Stun>Bullet_BlasterSniper_Stun</Ammo_PlasmaGasCartridge_Stun>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_PlasmaGasCartridgeGreen_Pistol</defName>
-							<label>Pistol Plasma Gas Cartridges (Rebel/Old Republic)</label>
-							<ammoTypes>
-								<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterPistol_Green</Ammo_PlasmaGasCartridge_Standard>
-								<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterPistol_GreenAP</Ammo_PlasmaGasCartridge_AP>
-								<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterPistol_Ion</Ammo_PlasmaGasCartridge_Ion>
-								<Ammo_PlasmaGasCartridge_Stun>Bullet_BlasterPistol_Stun</Ammo_PlasmaGasCartridge_Stun>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_PlasmaGasCartridgeGreen_Rifle</defName>
-							<label>Rifle Plasma Gas Cartridges (Rebel/Old Republic)</label>
-							<ammoTypes>
-								<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterRifle_Green</Ammo_PlasmaGasCartridge_Standard>
-								<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterRifle_GreenAP</Ammo_PlasmaGasCartridge_AP>
-								<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterRifle_Ion</Ammo_PlasmaGasCartridge_Ion>
-								<Ammo_PlasmaGasCartridge_Stun>Bullet_BlasterRifle_Stun</Ammo_PlasmaGasCartridge_Stun>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_PlasmaGasCartridgeGreen_Sniper</defName>
-							<label>Heavy Plasma Gas Cartridges (Rebel/Old Republic)</label>
-							<ammoTypes>
-								<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterSniper_Green</Ammo_PlasmaGasCartridge_Standard>
-								<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterSniper_GreenAP</Ammo_PlasmaGasCartridge_AP>
-								<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterSniper_Ion</Ammo_PlasmaGasCartridge_Ion>
-								<Ammo_PlasmaGasCartridge_Stun>Bullet_BlasterSniper_Stun</Ammo_PlasmaGasCartridge_Stun>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_PlasmaGasCartridgeBlue_Pistol</defName>
-							<label>Plasma Gas Cartridges (Galactic Republic)</label>
-							<ammoTypes>
-								<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterPistol_Blue</Ammo_PlasmaGasCartridge_Standard>
-								<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterPistol_BlueAP</Ammo_PlasmaGasCartridge_AP>
-								<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterPistol_Ion</Ammo_PlasmaGasCartridge_Ion>
-								<Ammo_PlasmaGasCartridge_Stun>Bullet_BlasterPistol_Stun</Ammo_PlasmaGasCartridge_Stun>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_PlasmaGasCartridgeBlue_Rifle</defName>
-							<label>Rifle Plasma Gas Cartridges (Galactic Republic)</label>
-							<ammoTypes>
-								<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterRifle_Blue</Ammo_PlasmaGasCartridge_Standard>
-								<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterRifle_BlueAP</Ammo_PlasmaGasCartridge_AP>
-								<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterRifle_Ion</Ammo_PlasmaGasCartridge_Ion>
-								<Ammo_PlasmaGasCartridge_Stun>Bullet_BlasterRifle_Stun</Ammo_PlasmaGasCartridge_Stun>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_PlasmaGasCartridgeBlue_Sniper</defName>
-							<label>Heavy Plasma Gas Cartridges (Galactic Republic)</label>
-							<ammoTypes>
-								<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterSniper_Blue</Ammo_PlasmaGasCartridge_Standard>
-								<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterSniper_BlueAP</Ammo_PlasmaGasCartridge_AP>
-								<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterSniper_Ion</Ammo_PlasmaGasCartridge_Ion>
-								<Ammo_PlasmaGasCartridge_Stun>Bullet_BlasterSniper_Stun</Ammo_PlasmaGasCartridge_Stun>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_PlasmaGasCartridgeYellow_Pistol</defName>
-							<label>Pistol Plasma Gas Cartridges (Chiss/Mandalorian)</label>
-							<ammoTypes>
-								<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterPistol_Yellow</Ammo_PlasmaGasCartridge_Standard>
-								<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterPistol_YellowAP</Ammo_PlasmaGasCartridge_AP>
-								<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterPistol_Ion</Ammo_PlasmaGasCartridge_Ion>
-								<Ammo_PlasmaGasCartridge_Stun>Bullet_BlasterPistol_Stun</Ammo_PlasmaGasCartridge_Stun>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_PlasmaGasCartridgeYellow_Rifle</defName>
-							<label>Rifle Plasma Gas Cartridges (Chiss/Mandalorian)</label>
-							<ammoTypes>
-								<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterRifle_Yellow</Ammo_PlasmaGasCartridge_Standard>
-								<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterRifle_YellowAP</Ammo_PlasmaGasCartridge_AP>
-								<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterRifle_Ion</Ammo_PlasmaGasCartridge_Ion>
-								<Ammo_PlasmaGasCartridge_Stun>Bullet_BlasterRifle_Stun</Ammo_PlasmaGasCartridge_Stun>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_PlasmaGasCartridgeYellow_Sniper</defName>
-							<label>Heavy Plasma Gas Cartridges (Chiss/Mandalorian)</label>
-							<ammoTypes>
-								<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterSniper_Yellow</Ammo_PlasmaGasCartridge_Standard>
-								<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterSniper_YellowAP</Ammo_PlasmaGasCartridge_AP>
-								<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterSniper_Ion</Ammo_PlasmaGasCartridge_Ion>
-								<Ammo_PlasmaGasCartridge_Stun>Bullet_BlasterSniper_Stun</Ammo_PlasmaGasCartridge_Stun>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_PlasmaGasCartridge_Scatter</defName>
-							<label>Scatterblaster Plasma Gas Cartridges</label>
-							<ammoTypes>
-								<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterBolt_Scatter</Ammo_PlasmaGasCartridge_Standard>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_PlasmaGasCartridgeIon_Pistol</defName>
-							<label>Ionized Pistol Plasma Gas Cartridges</label>
-							<ammoTypes>
-								<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterPistol_Ion</Ammo_PlasmaGasCartridge_Ion>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_PlasmaGasCartridgeIon_Rifle</defName>
-							<label>Ionized Rifle Plasma Gas Cartridges</label>
-							<ammoTypes>
-								<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterRifle_Ion</Ammo_PlasmaGasCartridge_Ion>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_PlasmaGasCartridgeIon_Sniper</defName>
-							<label>Heavy Ionized Plasma Gas Cartridges</label>
-							<ammoTypes>
-								<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterSniper_Ion</Ammo_PlasmaGasCartridge_Ion>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-						
-						<!-- ================== Ammo ================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="PlasmaGasCartridgeBase" ParentName="SpacerSmallAmmoBase" Abstract="True">
-							<description>Plasma gas ammo used by advanced blaster designs. Standard general-purpose tibanna-gas based plasma bolts, effective against most targets and lighter armours.</description>
-							<statBases>
-								<Mass>0.01</Mass>
-								<Bulk>0.03</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoPlasmaGasCartridge</li>
-							</thingCategories>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="PlasmaGasCartridgeBase">
-							<defName>Ammo_PlasmaGasCartridge_Standard</defName>
-							<label>Plasma Gas Cartridges</label>
-							<graphicData>
-								<texPath>Things/Ammo/Charged/MediumRegular</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>1.55</MarketValue>
-							</statBases>
-							<ammoClass>BlasterStandard</ammoClass>
-							<cookOffProjectile>Bullet_BlasterPistol_Red</cookOffProjectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="PlasmaGasCartridgeBase">
-							<defName>Ammo_PlasmaGasCartridge_AP</defName>
-							<description>Plasma gas ammo used by advanced blaster designs. A concentrated high-pressure refinement process produces plasma bolts capable of piercing hardened armour more effectively.</description>
-							<label>Plasma Gas Cartridges (Conc.)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Charged/MediumConc</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>1.95</MarketValue>
-							</statBases>
-							<ammoClass>BlasterAP</ammoClass>
-							<generateAllowChance>0.25</generateAllowChance>
-							<cookOffProjectile>Bullet_BlasterPistol_RedAP</cookOffProjectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="PlasmaGasCartridgeBase">
-							<defName>Ammo_PlasmaGasCartridge_Ion</defName>
-							<description>Plasma gas ammo used by advanced blaster designs. Specialized particle induction causes ionization effects on bolt impacts, increasing effectiveness against mechanical targets.</description>
-							<label>Plasma Gas Cartridges (Ion)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Charged/MediumIon</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>1.95</MarketValue>
-							</statBases>
-							<ammoClass>BlasterIonized</ammoClass>
-							<generateAllowChance>0.05</generateAllowChance>
-							<cookOffProjectile>Bullet_BlasterPistol_Ion</cookOffProjectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="PlasmaGasCartridgeBase">
-							<defName>Ammo_PlasmaGasCartridge_Stun</defName>
-							<description>Plasma gas ammo used by advanced blaster designs. Modulated energy pulse emission generates a non-lethal pulse that can disable organics, but is highly ineffective against mechanical targets.</description>
-							<label>Plasma Gas Cartridges (Stun)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Charged/MediumTox</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>1.95</MarketValue>
-							</statBases>
-							<ammoClass>BlasterStun</ammoClass>
-							<generateAllowChance>0</generateAllowChance>
-							<cookOffProjectile>Bullet_BlasterPistol_Stun</cookOffProjectile>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef Name="BaseBlasterBolt" ParentName="BaseBulletCE" Abstract="true">
-							<label>blaster bolt</label>
-							<graphicData>
-								<texPath>Things/Projectile/Charged/ChargeShot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>OuterRim_Blaster</damageDef>
-								<speed>122</speed>
-								<dropsCasings>false</dropsCasings>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Name="BaseBlasterBolt_Pistol" ParentName="BaseBlasterBolt" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Charged/ChargeShot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>14</damageAmountBase>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<armorPenetrationSharp>14</armorPenetrationSharp>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Name="BaseBlasterBolt_PistolAP" ParentName="BaseBlasterBolt" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Charged/ChargeShot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>11</damageAmountBase>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Name="BaseBlasterBolt_Rifle" ParentName="BaseBlasterBolt" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Charged/ChargeShot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>18</damageAmountBase>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<armorPenetrationSharp>22</armorPenetrationSharp>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Name="BaseBlasterBolt_RifleAP" ParentName="BaseBlasterBolt" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Charged/ChargeShot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<armorPenetrationSharp>33</armorPenetrationSharp>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Name="BaseBlasterBolt_Sniper" ParentName="BaseBlasterBolt" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Charged/ChargeShot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>175</speed>
-								<damageAmountBase>30</damageAmountBase>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Name="BaseBlasterBolt_SniperAP" ParentName="BaseBlasterBolt" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Charged/ChargeShot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>175</speed>
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<armorPenetrationSharp>36</armorPenetrationSharp>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBlasterBolt_Pistol">
-							<defName>Bullet_BlasterPistol_Red</defName>
-							<graphicData>
-								<texPath>OuterRim/Projectile/BlasterBolt_Red</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBlasterBolt_PistolAP">
-							<defName>Bullet_BlasterPistol_RedAP</defName>
-							<graphicData>
-								<texPath>OuterRim/Projectile/BlasterBolt_Red</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBlasterBolt_Rifle">
-							<defName>Bullet_BlasterRifle_Red</defName>
-							<graphicData>
-								<texPath>OuterRim/Projectile/BlasterBolt_Red</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBlasterBolt_RifleAP">
-							<defName>Bullet_BlasterRifle_RedAP</defName>
-							<graphicData>
-								<texPath>OuterRim/Projectile/BlasterBolt_Red</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBlasterBolt_Sniper">
-							<defName>Bullet_BlasterSniper_Red</defName>
-							<graphicData>
-								<texPath>OuterRim/Projectile/BlasterBolt_Red</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBlasterBolt_SniperAP">
-							<defName>Bullet_BlasterSniper_RedAP</defName>
-							<graphicData>
-								<texPath>OuterRim/Projectile/BlasterBolt_Red</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBlasterBolt_Pistol">
-							<defName>Bullet_BlasterPistol_Green</defName>
-							<graphicData>
-								<texPath>OuterRim/Projectile/BlasterBolt_Green</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBlasterBolt_PistolAP">
-							<defName>Bullet_BlasterPistol_GreenAP</defName>
-							<graphicData>
-								<texPath>OuterRim/Projectile/BlasterBolt_Green</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBlasterBolt_Rifle">
-							<defName>Bullet_BlasterRifle_Green</defName>
-							<graphicData>
-								<texPath>OuterRim/Projectile/BlasterBolt_Green</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBlasterBolt_RifleAP">
-							<defName>Bullet_BlasterRifle_GreenAP</defName>
-							<graphicData>
-								<texPath>OuterRim/Projectile/BlasterBolt_Green</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBlasterBolt_Sniper">
-							<defName>Bullet_BlasterSniper_Green</defName>
-							<graphicData>
-								<texPath>OuterRim/Projectile/BlasterBolt_Green</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBlasterBolt_SniperAP">
-							<defName>Bullet_BlasterSniper_GreenAP</defName>
-							<graphicData>
-								<texPath>OuterRim/Projectile/BlasterBolt_Green</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBlasterBolt_Pistol">
-							<defName>Bullet_BlasterPistol_Blue</defName>
-							<graphicData>
-								<texPath>OuterRim/Projectile/BlasterBolt_Blue</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBlasterBolt_PistolAP">
-							<defName>Bullet_BlasterPistol_BlueAP</defName>
-							<graphicData>
-								<texPath>OuterRim/Projectile/BlasterBolt_Blue</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBlasterBolt_Rifle">
-							<defName>Bullet_BlasterRifle_Blue</defName>
-							<graphicData>
-								<texPath>OuterRim/Projectile/BlasterBolt_Blue</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBlasterBolt_RifleAP">
-							<defName>Bullet_BlasterRifle_BlueAP</defName>
-							<graphicData>
-								<texPath>OuterRim/Projectile/BlasterBolt_Blue</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBlasterBolt_Sniper">
-							<defName>Bullet_BlasterSniper_Blue</defName>
-							<graphicData>
-								<texPath>OuterRim/Projectile/BlasterBolt_Blue</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBlasterBolt_SniperAP">
-							<defName>Bullet_BlasterSniper_BlueAP</defName>
-							<graphicData>
-								<texPath>OuterRim/Projectile/BlasterBolt_Blue</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBlasterBolt_Pistol">
-							<defName>Bullet_BlasterPistol_Yellow</defName>
-							<graphicData>
-								<texPath>OuterRim/Projectile/BlasterBolt_Yellow</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBlasterBolt_PistolAP">
-							<defName>Bullet_BlasterPistol_YellowAP</defName>
-							<graphicData>
-								<texPath>OuterRim/Projectile/BlasterBolt_Yellow</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBlasterBolt_Rifle">
-							<defName>Bullet_BlasterRifle_Yellow</defName>
-							<graphicData>
-								<texPath>OuterRim/Projectile/BlasterBolt_Yellow</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBlasterBolt_RifleAP">
-							<defName>Bullet_BlasterRifle_YellowAP</defName>
-							<graphicData>
-								<texPath>OuterRim/Projectile/BlasterBolt_Yellow</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBlasterBolt_Sniper">
-							<defName>Bullet_BlasterSniper_Yellow</defName>
-							<graphicData>
-								<texPath>OuterRim/Projectile/BlasterBolt_Yellow</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBlasterBolt_SniperAP">
-							<defName>Bullet_BlasterSniper_YellowAP</defName>
-							<graphicData>
-								<texPath>OuterRim/Projectile/BlasterBolt_Yellow</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBlasterBolt_Pistol">
-							<defName>Bullet_BlasterPistol_Ion</defName>
-							<graphicData>
-								<texPath>OuterRim/Projectile/BlasterBolt_Blue</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>8</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>5</amount>
-									</li>
-								</secondaryDamage>
-								<empShieldBreakChance>0.2</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBlasterBolt_Rifle">
-							<defName>Bullet_BlasterRifle_Ion</defName>
-							<graphicData>
-								<texPath>OuterRim/Projectile/BlasterBolt_Blue</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>8</amount>
-									</li>
-								</secondaryDamage>
-								<empShieldBreakChance>0.33</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBlasterBolt_Sniper">
-							<defName>Bullet_BlasterSniper_Ion</defName>
-							<graphicData>
-								<texPath>OuterRim/Projectile/BlasterBolt_Blue</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>14</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>11</amount>
-									</li>
-								</secondaryDamage>
-								<empShieldBreakChance>0.66</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBlasterBolt_Pistol">
-							<defName>Bullet_BlasterPistol_Stun</defName>
-							<graphicData>
-								<texPath>OuterRim/Projectile/Proj_StunPulse</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Neuralizer</damageDef>
-								<damageAmountBase>1</damageAmountBase>
-								<speed>80</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBlasterBolt_Rifle">
-							<defName>Bullet_BlasterRifle_Stun</defName>
-							<graphicData>
-								<texPath>OuterRim/Projectile/Proj_StunPulse</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Neuralizer</damageDef>
-								<damageAmountBase>1</damageAmountBase>
-								<speed>90</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBlasterBolt_Sniper">
-							<defName>Bullet_BlasterSniper_Stun</defName>
-							<graphicData>
-								<texPath>OuterRim/Projectile/Proj_StunPulse</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Neuralizer</damageDef>
-								<damageAmountBase>1</damageAmountBase>
-								<speed>100</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBlasterBolt">
-							<defName>Bullet_BlasterBolt_Scatter</defName>
-							<graphicData>
-								<texPath>OuterRim/Projectile/BlasterBolt_Red</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>8</damageAmountBase>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<pelletCount>12</pelletCount>
-								<spreadMult>15</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBulletCE">
-							<defName>Bullet_OR_WristRocket</defName>
-							<label>wrist rocket</label>
-							<graphicData>
-								<texPath>OuterRim/Projectile/Proj_MicroMissile</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>1.8</explosionRadius>
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>190</damageAmountBase>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<speed>65</speed>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Small>19</Fragment_Small>
-										<Fragment_Large>5</Fragment_Large>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-						
-						<!-- ==================== RPS6/HH ========================== -->
-						
-						<ThingCategoryDef>
-							<defName>AmmoOuterRimRocket</defName>
-							<label>RPS-6 Rockets</label>
-							<parent>AmmoRockets</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberRocket</iconPath>
-						</ThingCategoryDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_OuterRimRockets</defName>
-							<label>RPS-6 Rockets</label>
-							<ammoTypes>
-								<Ammo_RPS6_HEDP>Bullet_RPS6_HEDP</Ammo_RPS6_HEDP>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="RPS6RocketBase" ParentName="MediumAmmoBase" Abstract="True">
-							<description>A powerful rocket first used in the Galactic Republic's RPS-6. Old caches have been repurposed by the Rebel Alliance for use in the HH-12 launcher. The dual-purpose missile is lethal to both vehicles and infantry alike.</description>
-							<statBases>
-								<MaxHitPoints>150</MaxHitPoints>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_TableMachining</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoOuterRimRocket</li>
-							</thingCategories>
-							<stackLimit>25</stackLimit>
-							<cookOffFlashScale>40</cookOffFlashScale>
-							<cookOffSound>MortarBomb_Explode</cookOffSound>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="RPS6RocketBase">
-							<defName>Ammo_RPS6_HEDP</defName>
-							<label>RPS-6 rocket</label>
-							<graphicData>
-								<texPath>ThirdParty/StarWars/Ammo/OR_RPS6</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>63.92</MarketValue>
-								<Mass>6.3</Mass>
-								<Bulk>17.91</Bulk>
-							</statBases>
-							<ammoClass>SWRocketPlasma</ammoClass>
-							<detonateProjectile>Bullet_RPS6_HEDP</detonateProjectile>
-						</ThingDef>
-
-						<ThingDef Name="BaseRPS6" ParentName="BaseExplosiveBullet" Abstract="true">
-							<graphicData>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>58</speed>
-								<soundAmbient>RocketPropelledLoop_Small</soundAmbient>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ProjectileFleck">
-									<FleckDatas>
-										<li>
-											<fleck>Fleck_CERocketFlame</fleck>
-											<emissionsPerTick>7</emissionsPerTick>
-											<flecksPerEmission>3</flecksPerEmission>
-											<scale>1</scale>
-											<cutoffTickRange>25~30</cutoffTickRange>
-											<originOffset>0.4</originOffset>
-										</li>
-										<li>
-											<fleck>Fleck_CERocketSmokeTrail</fleck>
-											<emissionsPerTick>2</emissionsPerTick>
-											<rotation>0~360</rotation>
-											<flecksPerEmission>1</flecksPerEmission>
-										</li>
-										<li>
-											<fleck>Fleck_CERocketSmoke</fleck>
-											<emissionsPerTick>2</emissionsPerTick>
-											<rotation>0~360</rotation>
-											<flecksPerEmission>2</flecksPerEmission>
-											<cutoffTickRange>25~60</cutoffTickRange>
-										</li>
-									</FleckDatas>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseRPS6">
-							<defName>Bullet_RPS6_HEDP</defName>
-							<label>RPS-6 Rocket</label>
-							<graphicData>
-								<texPath>OuterRim/Projectile/HH12Missile</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>248</damageAmountBase>
-								<armorPenetrationSharp>600</armorPenetrationSharp>
-								<armorPenetrationBlunt>39.494</armorPenetrationBlunt>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>132</damageAmountBase>
-									<explosiveDamageType>Thermobaric</explosiveDamageType>
-									<explosiveRadius>5</explosiveRadius>
-									<explosionSound>MortarBomb_Explode</explosionSound>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<RecipeDef ParentName="LauncherAmmoRecipeBase">
-							<defName>MakeAmmo_RPS6_HEDP</defName>
-							<label>make RPS-6/HH-12 rockets x5</label>
-							<description>Craft 5 RPS-6/HH-12 rockets.</description>
-							<jobString>Making RPS-6/HH-12 rockets.</jobString>
-							<workAmount>12000</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>OuterRim_Durasteel</li>
-										</thingDefs>
-									</filter>
-									<count>64</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>OuterRim_Tibanna</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>OuterRim_ComponentHypertech</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>OuterRim_Durasteel</li>
-									<li>OuterRim_Tibanna</li>
-									<li>OuterRim_ComponentHypertech</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<recipeUsers Inherit="False">
-								<li>OuterRim_HypertechFabricator</li>
-							</recipeUsers>
-							<products>
-								<Ammo_RPS6_HEDP>5</Ammo_RPS6_HEDP>
-							</products>
-							<researchPrerequisite>OuterRim_HypertechFabrication</researchPrerequisite>
-						</RecipeDef>
-
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_PlasmaGasCartridge_Standard</defName>
-							<label>make Plasma Gas Cartridges x500</label>
-							<description>Craft 500 Standard Plasma Gas Cartridges.</description>
-							<jobString>Making Plasma Gas Cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>OuterRim_Durasteel</li>
-										</thingDefs>
-									</filter>
-									<count>30</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>OuterRim_Tibanna</li>
-										</thingDefs>
-									</filter>
-									<count>30</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>OuterRim_ComponentHypertech</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>OuterRim_Durasteel</li>
-									<li>OuterRim_Tibanna</li>
-									<li>OuterRim_ComponentHypertech</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<recipeUsers Inherit="False">
-								<li>OuterRim_HypertechFabricator</li>
-							</recipeUsers>
-							<products>
-								<Ammo_PlasmaGasCartridge_Standard>500</Ammo_PlasmaGasCartridge_Standard>
-							</products>
-							<researchPrerequisite>OuterRim_HypertechFabrication</researchPrerequisite>
-						</RecipeDef>
-
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_PlasmaGasCartridge_AP</defName>
-							<label>make Plasma Gas Cartridges (AP) x500</label>
-							<description>Craft 500 Plasma Gas Cartridges (AP).</description>
-							<jobString>Making Plasma Gas Cartridges (AP).</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>OuterRim_Durasteel</li>
-										</thingDefs>
-									</filter>
-									<count>45</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>OuterRim_Tibanna</li>
-										</thingDefs>
-									</filter>
-									<count>45</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>OuterRim_ComponentHypertech</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>OuterRim_Durasteel</li>
-									<li>OuterRim_Tibanna</li>
-									<li>OuterRim_ComponentHypertech</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<recipeUsers Inherit="False">
-								<li>OuterRim_HypertechFabricator</li>
-							</recipeUsers>
-							<products>
-								<Ammo_PlasmaGasCartridge_AP>500</Ammo_PlasmaGasCartridge_AP>
-							</products>
-							<researchPrerequisite>OuterRim_HypertechFabrication</researchPrerequisite>
-						</RecipeDef>
-
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_PlasmaGasCartridge_Ion</defName>
-							<label>make Plasma Gas Cartridges (Ion) x500</label>
-							<description>Craft 500 PlasmaGas Cartridges (Ion).</description>
-							<jobString>Making Plasma Gas Cartridges (Ion).</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>OuterRim_Durasteel</li>
-										</thingDefs>
-									</filter>
-									<count>30</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>OuterRim_Tibanna</li>
-										</thingDefs>
-									</filter>
-									<count>45</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>OuterRim_ComponentHypertech</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>OuterRim_Durasteel</li>
-									<li>OuterRim_Tibanna</li>
-									<li>OuterRim_ComponentHypertech</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<recipeUsers Inherit="False">
-								<li>OuterRim_HypertechFabricator</li>
-							</recipeUsers>
-							<products>
-								<Ammo_PlasmaGasCartridge_Ion>500</Ammo_PlasmaGasCartridge_Ion>
-							</products>
-							<researchPrerequisite>OuterRim_HypertechFabrication</researchPrerequisite>
-						</RecipeDef>
-
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_PlasmaGasCartridge_Stun</defName>
-							<label>make Plasma Gas Cartridges (Stun) x500</label>
-							<description>Craft 500 PlasmaGas Cartridges (Stun).</description>
-							<jobString>Making Plasma Gas Cartridges (Stun).</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>OuterRim_Durasteel</li>
-										</thingDefs>
-									</filter>
-									<count>30</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>OuterRim_Tibanna</li>
-										</thingDefs>
-									</filter>
-									<count>60</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>OuterRim_ComponentHypertech</li>
-										</thingDefs>
-									</filter>
-									<count>3</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>OuterRim_Durasteel</li>
-									<li>OuterRim_Tibanna</li>
-									<li>OuterRim_ComponentHypertech</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<recipeUsers Inherit="False">
-								<li>OuterRim_HypertechFabricator</li>
-							</recipeUsers>
-							<products>
-								<Ammo_PlasmaGasCartridge_Stun>500</Ammo_PlasmaGasCartridge_Stun>
-							</products>
-							<researchPrerequisite>OuterRim_HypertechFabrication</researchPrerequisite>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Outer Rim - Core/Outer_Rim_Core_Apparel.xml b/Patches/Outer Rim - Core/Outer_Rim_Core_Apparel.xml
deleted file mode 100644
index d8c4345193..0000000000
--- a/Patches/Outer Rim - Core/Outer_Rim_Core_Apparel.xml	
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outer Rim - Core</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="OuterRim_UniformBodyFabricatedBase"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="OuterRim_UniformBodyFabricatedBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="OuterRim_UniformBodyFabricatedBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>12</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="OuterRim_UniformBodyFabricatedBase"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<ToxicEnvironmentResistance>0.25</ToxicEnvironmentResistance>
-							<CarryBulk>10</CarryBulk>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="OuterRim_UniformHeadwearFabricatedBase"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="OuterRim_UniformHeadwearFabricatedBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="OuterRim_UniformHeadwearFabricatedBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Outer Rim - Core/Outer_Rim_Core_Armour.xml b/Patches/Outer Rim - Core/Outer_Rim_Core_Armour.xml
deleted file mode 100644
index 369a5cfafd..0000000000
--- a/Patches/Outer Rim - Core/Outer_Rim_Core_Armour.xml	
+++ /dev/null
@@ -1,308 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outer Rim - Core</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="OuterRim_ArmorFabricatedBase"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>80</Bulk>
-							<WornBulk>15</WornBulk>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="OuterRim_ArmorFabricatedBase"]/equippedStatOffsets</xpath>
-					<value>
-						<ToxicEnvironmentResistance>0.25</ToxicEnvironmentResistance>
-						<CarryBulk>25</CarryBulk>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="OuterRim_ArmorFabricatedBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="OuterRim_HelmetFabricatedBase"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>4</Bulk>
-							<WornBulk>2</WornBulk>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="OuterRim_HelmetFabricatedBase"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-						<ToxicEnvironmentResistance>0.25</ToxicEnvironmentResistance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="OuterRim_HelmetFabricatedBase"]/apparel/layers</xpath>
-					<value>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="OuterRim_PauldronsFabricatedBase"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>6</Bulk>
-							<WornBulk>3</WornBulk>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="OuterRim_PauldronsFabricatedBase"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<ToxicEnvironmentResistance>0.25</ToxicEnvironmentResistance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="OuterRim_PauldronsFabricatedBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="OuterRim_LightArmorFabricatedBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>12</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="OuterRim_LightArmorFabricatedBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>22</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="OuterRim_LightArmorFabricatedBase"]/statBases/ArmorRating_Heat</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="OuterRim_LightHelmetFabricatedBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>12</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="OuterRim_LightHelmetFabricatedBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>22</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="OuterRim_LightHelmetFabricatedBase"]/statBases/ArmorRating_Heat</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="OuterRim_LightPauldronsFabricatedBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>12</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="OuterRim_LightPauldronsFabricatedBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>22</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="OuterRim_LightPauldronsFabricatedBase"]/statBases/ArmorRating_Heat</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="OuterRim_MediumArmorFabricatedBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="OuterRim_MediumArmorFabricatedBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>32</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="OuterRim_MediumArmorFabricatedBase"]/statBases/ArmorRating_Heat</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="OuterRim_MediumHelmetFabricatedBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="OuterRim_MediumHelmetFabricatedBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>32</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="OuterRim_MediumHelmetFabricatedBase"]/statBases/ArmorRating_Heat</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="OuterRim_MediumPauldronsFabricatedBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="OuterRim_MediumPauldronsFabricatedBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>32</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="OuterRim_MediumPauldronsFabricatedBase"]/statBases/ArmorRating_Heat</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="OuterRim_HeavyArmorFabricatedBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="OuterRim_HeavyArmorFabricatedBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>48</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="OuterRim_HeavyArmorFabricatedBase"]/statBases/ArmorRating_Heat</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="OuterRim_HeavyHelmetFabricatedBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="OuterRim_HeavyHelmetFabricatedBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>48</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="OuterRim_HeavyHelmetFabricatedBase"]/statBases/ArmorRating_Heat</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="OuterRim_HeavyPauldronsFabricatedBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="OuterRim_HeavyPauldronsFabricatedBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>48</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="OuterRim_HeavyPauldronsFabricatedBase"]/statBases/ArmorRating_Heat</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Outer Rim - Core/Outer_Rim_Core_GrenadeRecipes.xml b/Patches/Outer Rim - Core/Outer_Rim_Core_GrenadeRecipes.xml
deleted file mode 100644
index eea6babae7..0000000000
--- a/Patches/Outer Rim - Core/Outer_Rim_Core_GrenadeRecipes.xml	
+++ /dev/null
@@ -1,360 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outer Rim - Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-					<!-- ========== New Recipes ========== -->
-
-					<RecipeDef ParentName="GrenadeRecipeBase">
-						<defName>MakeORFragGrenade</defName>
-						<label>make frag detonators x10</label>
-						<description>Craft 10 frag detonators.</description>
-						<jobString>Making frag detonators.</jobString>
-						<researchPrerequisite>OuterRim_HypertechFabrication</researchPrerequisite>
-						<workAmount>3600</workAmount>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>OuterRim_Durasteel</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>OuterRim_Tibanna</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>ComponentIndustrial</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-						</ingredients>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>OuterRim_Durasteel</li>
-								<li>OuterRim_Tibanna</li>
-								<li>ComponentIndustrial</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-						<products>
-							<OuterRim_FragGrenade>10</OuterRim_FragGrenade>
-						</products>
-						<recipeUsers Inherit="False">
-							<li>OuterRim_HypertechFabricator</li>
-						</recipeUsers>
-					</RecipeDef>
-
-					<RecipeDef ParentName="GrenadeRecipeBase">
-						<defName>MakeORCryoGrenade</defName>
-						<label>make cryoban detonators x10</label>
-						<description>Craft 10 cryoban detonators.</description>
-						<jobString>Making cryoban detonators.</jobString>
-						<researchPrerequisite>OuterRim_HypertechFabrication</researchPrerequisite>
-						<workAmount>3600</workAmount>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>OuterRim_Durasteel</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>OuterRim_Tibanna</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>ComponentIndustrial</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-						</ingredients>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>OuterRim_Durasteel</li>
-								<li>OuterRim_Tibanna</li>
-								<li>ComponentIndustrial</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-						<products>
-							<OuterRim_CryoBanGrenade>10</OuterRim_CryoBanGrenade>
-						</products>
-						<recipeUsers Inherit="False">
-							<li>OuterRim_HypertechFabricator</li>
-						</recipeUsers>
-					</RecipeDef>
-
-					<RecipeDef ParentName="GrenadeRecipeBase">
-						<defName>MakeORIonGrenade</defName>
-						<label>make ion detonators x10</label>
-						<description>Craft 10 ion detonators.</description>
-						<jobString>Making ion detonators.</jobString>
-						<researchPrerequisite>OuterRim_HypertechFabrication</researchPrerequisite>
-						<workAmount>3600</workAmount>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>OuterRim_Durasteel</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>OuterRim_Tibanna</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>ComponentIndustrial</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-						</ingredients>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>OuterRim_Durasteel</li>
-								<li>OuterRim_Tibanna</li>
-								<li>ComponentIndustrial</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-						<products>
-							<OuterRim_IonGrenade>10</OuterRim_IonGrenade>
-						</products>
-						<recipeUsers Inherit="False">
-							<li>OuterRim_HypertechFabricator</li>
-						</recipeUsers>
-					</RecipeDef>
-
-					<RecipeDef ParentName="GrenadeRecipeBase">
-						<defName>MakeORPlasmaGrenade</defName>
-						<label>make plasma detonators x10</label>
-						<description>Craft 10 plasma detonators.</description>
-						<jobString>Making plasma detonators.</jobString>
-						<researchPrerequisite>OuterRim_HypertechFabrication</researchPrerequisite>
-						<workAmount>3600</workAmount>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>OuterRim_Durasteel</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>OuterRim_Tibanna</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>ComponentIndustrial</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-						</ingredients>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>OuterRim_Durasteel</li>
-								<li>OuterRim_Tibanna</li>
-								<li>ComponentIndustrial</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-						<products>
-							<OuterRim_PlasmaGrenade>10</OuterRim_PlasmaGrenade>
-						</products>
-						<recipeUsers Inherit="False">
-							<li>OuterRim_HypertechFabricator</li>
-						</recipeUsers>
-					</RecipeDef>
-
-					<RecipeDef ParentName="GrenadeRecipeBase">
-						<defName>MakeORSonicGrenade</defName>
-						<label>make sonic detonators x10</label>
-						<description>Craft 10 sonic detonators.</description>
-						<jobString>Making sonic detonators.</jobString>
-						<researchPrerequisite>OuterRim_HypertechFabrication</researchPrerequisite>
-						<workAmount>3600</workAmount>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>OuterRim_Durasteel</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>OuterRim_Tibanna</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>ComponentIndustrial</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-						</ingredients>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>OuterRim_Durasteel</li>
-								<li>OuterRim_Tibanna</li>
-								<li>ComponentIndustrial</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-						<products>
-							<OuterRim_SonicGrenade>10</OuterRim_SonicGrenade>
-						</products>
-						<recipeUsers Inherit="False">
-							<li>OuterRim_HypertechFabricator</li>
-						</recipeUsers>
-					</RecipeDef>
-
-					<RecipeDef ParentName="GrenadeRecipeBase">
-						<defName>MakeORStunGrenade</defName>
-						<label>make stun detonators x10</label>
-						<description>Craft 10 stun detonators.</description>
-						<jobString>Making stun detonators.</jobString>
-						<researchPrerequisite>OuterRim_HypertechFabrication</researchPrerequisite>
-						<workAmount>3600</workAmount>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>OuterRim_Durasteel</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>OuterRim_Tibanna</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>ComponentIndustrial</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-						</ingredients>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>OuterRim_Durasteel</li>
-								<li>OuterRim_Tibanna</li>
-								<li>ComponentIndustrial</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-						<products>
-							<OuterRim_StunGrenade>10</OuterRim_StunGrenade>
-						</products>
-						<recipeUsers Inherit="False">
-							<li>OuterRim_HypertechFabricator</li>
-						</recipeUsers>
-					</RecipeDef>
-
-					<RecipeDef ParentName="GrenadeRecipeBase">
-						<defName>MakeORThermalGrenade</defName>
-						<label>make thermal detonators x5</label>
-						<description>Craft 5 thermal detonators.</description>
-						<jobString>Making thermal detonators.</jobString>
-						<researchPrerequisite>OuterRim_HypertechFabrication</researchPrerequisite>
-						<workAmount>3600</workAmount>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>OuterRim_Durasteel</li>
-									</thingDefs>
-								</filter>
-								<count>8</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>OuterRim_Tibanna</li>
-									</thingDefs>
-								</filter>
-								<count>4</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>OuterRim_ComponentHypertech</li>
-									</thingDefs>
-								</filter>
-								<count>2</count>
-							</li>
-						</ingredients>
-						<fixedIngredientFilter>
-							<thingDefs>
-								<li>OuterRim_Durasteel</li>
-								<li>OuterRim_Tibanna</li>
-								<li>OuterRim_ComponentHypertech</li>
-							</thingDefs>
-						</fixedIngredientFilter>
-						<products>
-							<OuterRim_ThermalDetonator>5</OuterRim_ThermalDetonator>
-						</products>
-						<recipeUsers Inherit="False">
-							<li>OuterRim_HypertechFabricator</li>
-						</recipeUsers>
-					</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Outer Rim - Core/Outer_Rim_Core_Grenades.xml b/Patches/Outer Rim - Core/Outer_Rim_Core_Grenades.xml
deleted file mode 100644
index 9481a7d937..0000000000
--- a/Patches/Outer Rim - Core/Outer_Rim_Core_Grenades.xml	
+++ /dev/null
@@ -1,1000 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outer Rim - Core</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-			<!-- ========== Kill recipe makers ========== -->
-
-			<li Class="PatchOperationAttributeSet">
-				<xpath>Defs/ThingDef[defName="OuterRim_FragGrenade" or defName="OuterRim_CryoBanGrenade" or defName="OuterRim_IonGrenade" or defName="OuterRim_PlasmaGrenade" or defName="OuterRim_SonicGrenade" or defName="OuterRim_StunGrenade" or defName="OuterRim_ThermalDetonator"]</xpath>
-				<attribute>ParentName</attribute>
-				<value>BaseWeapon</value>
-			</li>
-
-			<!-- ========== Melee tools ========== -->
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="OuterRim_FragGrenade" or defName="OuterRim_CryoBanGrenade" or defName="OuterRim_IonGrenade" or defName="OuterRim_PlasmaGrenade" or defName="OuterRim_SonicGrenade" or defName="OuterRim_StunGrenade" or defName="OuterRim_ThermalDetonator"]</xpath>
-				<value>
-					<tools>
-						<li Class="CombatExtended.ToolCE">
-							<label>Body</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>2</power>
-							<cooldownTime>1.75</cooldownTime>
-							<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
-						</li>
-					</tools>
-					<tradeTags Inherit="False">
-						<li>CE_MediumAmmo</li>
-					</tradeTags>
-					<allowedArchonexusCount>5</allowedArchonexusCount>
-				</value>
-			</li>
-
-			<!-- ========== Frag Grenade ========== -->
-
-			<!-- Projectile -->
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_FragGrenadeProj" or defName="OuterRim_CryoBanGrenadeProj" or defName="OuterRim_IonGrenadeProj" or defName="OuterRim_PlasmaGrenadeProj" or defName="OuterRim_SonicGrenadeProj" or defName="OuterRim_StunGrenadeProj" or defName="OuterRim_ThermalDetProj"]/thingClass</xpath>
-				<value>
-					<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_FragGrenade"]/description</xpath>
-				<value>
-					<description>A lightweight but powerful fragmentation grenade, releasing a deadly storm of flechettes on detonation.</description>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_CryoBanGrenade"]/description</xpath>
-				<value>
-					<description>A lightweight but powerful explosive, releasing a cloud of supercooled cryoban to freeze opponents solid. Does little direct damage by itself.</description>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_IonGrenade"]/description</xpath>
-				<value>
-					<description>A lightweight but powerful pulse detonator, burning out its internal components to release an electromagnetic shockwave that can disable or even damage droids.</description>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_PlasmaGrenade"]/description</xpath>
-				<value>
-					<description>A lightweight but powerful plasma detonator, releasing a burst of superheated gas to inflict tremendous burns on anyone nearby.</description>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_SonicGrenade"]/description</xpath>
-				<value>
-					<description>A lightweight but powerful sonic generator, burning out its internal components to release a shockwave that causes blunt force trauma to all in the radius.</description>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_StunGrenade"]/description</xpath>
-				<value>
-					<description>A lightweight but nonlethal detonator, emitting a bright flash and loud sound to stun targets, useful when attempting to take someone in alive and unharmed.</description>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_ThermalDetonator"]/description</xpath>
-				<value>
-					<description>A lightweight but tremendously powerful explosive, capable of inflicting terrible harm on anything caught in its area of effect.</description>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_FragGrenadeProj"]/graphicData</xpath>
-				<value>
-					<graphicData>
-						<texPath>ThirdParty/StarWars/Projectile/OR_FragGrenade</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_CryoBanGrenadeProj"]/graphicData</xpath>
-				<value>
-					<graphicData>
-						<texPath>ThirdParty/StarWars/Projectile/OR_CryoBanGrenade</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_IonGrenadeProj"]/graphicData</xpath>
-				<value>
-					<graphicData>
-						<texPath>ThirdParty/StarWars/Projectile/OR_IonGrenade</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_PlasmaGrenadeProj"]/graphicData</xpath>
-				<value>
-					<graphicData>
-						<texPath>ThirdParty/StarWars/Projectile/OR_PlasmaGrenade</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_SonicGrenadeProj"]/graphicData</xpath>
-				<value>
-					<graphicData>
-						<texPath>ThirdParty/StarWars/Projectile/OR_SonicGrenade</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_StunGrenadeProj"]/graphicData</xpath>
-				<value>
-					<graphicData>
-						<texPath>ThirdParty/StarWars/Projectile/OR_StunGrenade</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_ThermalDetProj"]/graphicData</xpath>
-				<value>
-					<graphicData>
-						<texPath>ThirdParty/StarWars/Projectile/OR_ThermalDetonator</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_FragGrenadeProj"]/projectile</xpath>
-				<value>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<explosionRadius>1.5</explosionRadius>
-						<damageDef>Bomb</damageDef>
-						<damageAmountBase>56</damageAmountBase>
-						<explosionDelay>60</explosionDelay>
-						<dropsCasings>false</dropsCasings>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						<speed>12</speed>
-						<suppressionFactor>3.0</suppressionFactor>
-						<dangerFactor>2.0</dangerFactor>
-						<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
-					</projectile>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_CryoBanGrenadeProj"]/projectile</xpath>
-				<value>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<explosionRadius>3.5</explosionRadius>
-						<damageDef>OuterRim_CryoBan</damageDef>
-						<explosionDelay>60</explosionDelay>
-						<dropsCasings>false</dropsCasings>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						<speed>12</speed>
-						<suppressionFactor>3.0</suppressionFactor>
-						<dangerFactor>2.0</dangerFactor>
-						<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
-					</projectile>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_IonGrenadeProj"]/projectile</xpath>
-				<value>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<explosionRadius>3.5</explosionRadius>
-						<damageDef>OuterRim_Ion</damageDef>
-						<damageAmountBase>56</damageAmountBase>
-						<explosionDelay>60</explosionDelay>
-						<dropsCasings>false</dropsCasings>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						<speed>12</speed>
-						<suppressionFactor>3.0</suppressionFactor>
-						<dangerFactor>2.0</dangerFactor>
-						<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
-					</projectile>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_PlasmaGrenadeProj"]/projectile</xpath>
-				<value>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<explosionRadius>3.5</explosionRadius>
-						<damageDef>Flame</damageDef>
-						<damageAmountBase>56</damageAmountBase>
-						<explosionDelay>60</explosionDelay>
-						<dropsCasings>false</dropsCasings>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						<speed>12</speed>
-						<suppressionFactor>3.0</suppressionFactor>
-						<dangerFactor>2.0</dangerFactor>
-						<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
-					</projectile>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_SonicGrenadeProj"]/projectile</xpath>
-				<value>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<explosionRadius>3.5</explosionRadius>
-						<damageDef>OuterRim_Sonic</damageDef>
-						<damageAmountBase>56</damageAmountBase>
-						<explosionDelay>60</explosionDelay>
-						<dropsCasings>false</dropsCasings>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						<speed>12</speed>
-						<suppressionFactor>3.0</suppressionFactor>
-						<dangerFactor>2.0</dangerFactor>
-						<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
-					</projectile>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_StunGrenadeProj"]/projectile</xpath>
-				<value>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<explosionRadius>3.5</explosionRadius>
-						<damageDef>Stun</damageDef>
-						<explosionDelay>60</explosionDelay>
-						<dropsCasings>false</dropsCasings>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						<speed>12</speed>
-						<suppressionFactor>3.0</suppressionFactor>
-						<dangerFactor>2.0</dangerFactor>
-						<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
-					</projectile>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_ThermalDetProj"]/projectile</xpath>
-				<value>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<explosionRadius>3.5</explosionRadius>
-						<damageDef>Bomb</damageDef>
-						<damageAmountBase>200</damageAmountBase>
-						<explosionDelay>120</explosionDelay>
-						<dropsCasings>false</dropsCasings>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						<speed>12</speed>
-						<suppressionFactor>3.0</suppressionFactor>
-						<dangerFactor>2.0</dangerFactor>
-						<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
-					</projectile>
-				</value>
-			</li>
-
-			<li Class="PatchOperationConditional">
-				<xpath>Defs/ThingDef[defName="OuterRim_FragGrenadeProj"]/comps</xpath>
-				<nomatch Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_FragGrenadeProj"]</xpath>
-					<value>
-						<comps />
-					</value>
-				</nomatch>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="OuterRim_FragGrenadeProj"]/comps</xpath>
-				<value>
-					<li Class="CombatExtended.CompProperties_Fragments">
-						<fragments>
-							<Fragment_Small>50</Fragment_Small>
-						</fragments>
-					</li>
-				</value>
-			</li>
-			
-			<!-- Grenade -->
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_FragGrenade"]/label</xpath>
-				<value>
-					<label>frag detonator</label>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_CryoBanGrenade"]/label</xpath>
-				<value>
-					<label>cryoban detonator</label>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_IonGrenade"]/label</xpath>
-				<value>
-					<label>ion detonator</label>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_PlasmaGrenade"]/label</xpath>
-				<value>
-					<label>plasma detonator</label>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_SonicGrenade"]/label</xpath>
-				<value>
-					<label>sonic detonator</label>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_StunGrenade"]/label</xpath>
-				<value>
-					<label>stun detonator</label>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_ThermalDetonator"]/label</xpath>
-				<value>
-					<label>thermal detonator</label>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_FragGrenade"]/graphicData</xpath>
-				<value>
-					<graphicData>
-						<texPath>OuterRim/Items/FragGrenade</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-						<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
-					</graphicData>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_CryoBanGrenade"]/graphicData</xpath>
-				<value>
-					<graphicData>
-						<texPath>OuterRim/Items/CryoBanGrenade</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-						<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
-					</graphicData>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_IonGrenade"]/graphicData</xpath>
-				<value>
-					<graphicData>
-						<texPath>OuterRim/Items/IonGrenade</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-						<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
-					</graphicData>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_PlasmaGrenade"]/graphicData</xpath>
-				<value>
-					<graphicData>
-						<texPath>OuterRim/Items/PlasmaGrenade</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-						<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
-					</graphicData>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_SonicGrenade"]/graphicData</xpath>
-				<value>
-					<graphicData>
-						<texPath>OuterRim/Items/SonicGrenade</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-						<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
-					</graphicData>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_StunGrenade"]/graphicData</xpath>
-				<value>
-					<graphicData>
-						<texPath>OuterRim/Items/StunGrenade</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-						<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
-					</graphicData>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_ThermalDetonator"]/graphicData</xpath>
-				<value>
-					<graphicData>
-						<texPath>OuterRim/Items/ThermalDetonator</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-						<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
-					</graphicData>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="OuterRim_FragGrenade" or defName="OuterRim_CryoBanGrenade" or defName="OuterRim_IonGrenade" or defName="OuterRim_PlasmaGrenade" or defName="OuterRim_SonicGrenade" or defName="OuterRim_StunGrenade" or defName="OuterRim_ThermalDetonator"]</xpath>
-				<value>
-					<thingClass>CombatExtended.AmmoThing</thingClass>
-					<stackLimit>75</stackLimit>
-					<resourceReadoutPriority>First</resourceReadoutPriority>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAttributeSet">
-				<xpath>Defs/ThingDef[defName="OuterRim_FragGrenade" or defName="OuterRim_CryoBanGrenade" or defName="OuterRim_IonGrenade" or defName="OuterRim_PlasmaGrenade" or defName="OuterRim_SonicGrenade" or defName="OuterRim_StunGrenade" or defName="OuterRim_ThermalDetonator"]</xpath>
-				<attribute>Class</attribute>
-				<value>CombatExtended.AmmoDef</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_FragGrenade"]/comps</xpath>
-				<value>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>56</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>1.5</explosiveRadius>
-						</li>
-					</comps>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="OuterRim_FragGrenade"]/comps</xpath>
-				<value>
-					<li Class="CombatExtended.CompProperties_Fragments">
-						<fragments>
-							<Fragment_Small>50</Fragment_Small>
-						</fragments>
-					</li>
-				</value>
-			</li>
-
-			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-				<defName>OuterRim_FragGrenade</defName>
-				<statBases>
-					<Mass>0.4</Mass>
-					<Bulk>0.87</Bulk>
-					<MarketValue>11.22</MarketValue>
-					<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					<SightsEfficiency>1.0</SightsEfficiency>
-				</statBases>
-				<Properties>
-					<label>throw frag detonator</label>
-					<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-					<hasStandardCommand>true</hasStandardCommand>
-					<range>10.0</range>
-					<minRange>4</minRange>
-					<warmupTime>0.8</warmupTime>
-					<noiseRadius>4</noiseRadius>
-					<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-					<soundCast>ThrowGrenade</soundCast>
-					<targetParams>
-						<canTargetLocations>true</canTargetLocations>
-					</targetParams>
-					<defaultProjectile>OuterRim_FragGrenadeProj</defaultProjectile>
-					<onlyManualCast>true</onlyManualCast>
-					<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					<ai_AvoidFriendlyFireRadius>7</ai_AvoidFriendlyFireRadius>
-				</Properties>
-				<weaponTags>
-					<li>CE_AI_Grenade</li>
-					<li>CE_AI_AOE</li>
-					<li>CE_OneHandedWeapon</li>
-				</weaponTags>
-			</li>
-
-			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-				<defName>OuterRim_CryoBanGrenade</defName>
-				<statBases>
-					<Mass>0.4</Mass>
-					<Bulk>0.87</Bulk>
-					<MarketValue>11.22</MarketValue>
-					<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					<SightsEfficiency>1.0</SightsEfficiency>
-				</statBases>
-				<Properties>
-					<label>throw cryoban deonator</label>
-					<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-					<hasStandardCommand>true</hasStandardCommand>
-					<range>10.0</range>
-					<minRange>4</minRange>
-					<warmupTime>0.8</warmupTime>
-					<noiseRadius>4</noiseRadius>
-					<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-					<soundCast>ThrowGrenade</soundCast>
-					<targetParams>
-						<canTargetLocations>true</canTargetLocations>
-					</targetParams>
-					<defaultProjectile>OuterRim_CryoBanGrenadeProj</defaultProjectile>
-					<onlyManualCast>true</onlyManualCast>
-					<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					<ai_AvoidFriendlyFireRadius>7</ai_AvoidFriendlyFireRadius>
-				</Properties>
-				<weaponTags>
-					<li>CE_AI_Grenade</li>
-					<li>CE_AI_AOE</li>
-					<li>CE_OneHandedWeapon</li>
-    					<li>CE_GrenadeFlashbang</li>
-				</weaponTags>
-			</li>
-
-			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-				<defName>OuterRim_IonGrenade</defName>
-				<statBases>
-					<Mass>0.4</Mass>
-					<Bulk>0.87</Bulk>
-					<MarketValue>11.22</MarketValue>
-					<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					<SightsEfficiency>1.0</SightsEfficiency>
-				</statBases>
-				<Properties>
-					<label>throw ion detonator</label>
-					<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-					<hasStandardCommand>true</hasStandardCommand>
-					<range>10.0</range>
-					<minRange>4</minRange>
-					<warmupTime>0.8</warmupTime>
-					<noiseRadius>4</noiseRadius>
-					<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-					<soundCast>ThrowGrenade</soundCast>
-					<targetParams>
-						<canTargetLocations>true</canTargetLocations>
-					</targetParams>
-					<defaultProjectile>OuterRim_IonGrenadeProj</defaultProjectile>
-					<onlyManualCast>true</onlyManualCast>
-					<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					<ai_AvoidFriendlyFireRadius>7</ai_AvoidFriendlyFireRadius>
-				</Properties>
-				<weaponTags>
-					<li>CE_AI_Grenade</li>
-					<li>CE_AI_AOE</li>
-					<li>CE_OneHandedWeapon</li>
-				</weaponTags>
-			</li>
-
-			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-				<defName>OuterRim_PlasmaGrenade</defName>
-				<statBases>
-					<Mass>0.4</Mass>
-					<Bulk>0.87</Bulk>
-					<MarketValue>11.22</MarketValue>
-					<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					<SightsEfficiency>1.0</SightsEfficiency>
-				</statBases>
-				<Properties>
-					<label>throw plasma detonator</label>
-					<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-					<hasStandardCommand>true</hasStandardCommand>
-					<range>10.0</range>
-					<minRange>4</minRange>
-					<warmupTime>0.8</warmupTime>
-					<noiseRadius>4</noiseRadius>
-					<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-					<soundCast>ThrowGrenade</soundCast>
-					<targetParams>
-						<canTargetLocations>true</canTargetLocations>
-					</targetParams>
-					<defaultProjectile>OuterRim_PlasmaGrenadeProj</defaultProjectile>
-					<onlyManualCast>true</onlyManualCast>
-					<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					<ai_AvoidFriendlyFireRadius>7</ai_AvoidFriendlyFireRadius>
-				</Properties>
-				<weaponTags>
-					<li>CE_AI_Grenade</li>
-					<li>CE_AI_AOE</li>
-					<li>CE_OneHandedWeapon</li>
-				</weaponTags>
-			</li>
-
-			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-				<defName>OuterRim_SonicGrenade</defName>
-				<statBases>
-					<Mass>0.4</Mass>
-					<Bulk>0.87</Bulk>
-					<MarketValue>11.22</MarketValue>
-					<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					<SightsEfficiency>1.0</SightsEfficiency>
-				</statBases>
-				<Properties>
-					<label>throw sonic detonator</label>
-					<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-					<hasStandardCommand>true</hasStandardCommand>
-					<range>10.0</range>
-					<minRange>4</minRange>
-					<warmupTime>0.8</warmupTime>
-					<noiseRadius>4</noiseRadius>
-					<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-					<soundCast>ThrowGrenade</soundCast>
-					<targetParams>
-						<canTargetLocations>true</canTargetLocations>
-					</targetParams>
-					<defaultProjectile>OuterRim_SonicGrenadeProj</defaultProjectile>
-					<onlyManualCast>true</onlyManualCast>
-					<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					<ai_AvoidFriendlyFireRadius>7</ai_AvoidFriendlyFireRadius>
-				</Properties>
-				<weaponTags>
-					<li>CE_AI_Grenade</li>
-					<li>CE_AI_AOE</li>
-					<li>CE_OneHandedWeapon</li>
-				</weaponTags>
-			</li>
-
-			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-				<defName>OuterRim_StunGrenade</defName>
-				<statBases>
-					<Mass>0.4</Mass>
-					<Bulk>0.87</Bulk>
-					<MarketValue>11.22</MarketValue>
-					<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					<SightsEfficiency>1.0</SightsEfficiency>
-				</statBases>
-				<Properties>
-					<label>throw stun detonator</label>
-					<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-					<hasStandardCommand>true</hasStandardCommand>
-					<range>10.0</range>
-					<minRange>4</minRange>
-					<warmupTime>0.8</warmupTime>
-					<noiseRadius>4</noiseRadius>
-					<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-					<soundCast>ThrowGrenade</soundCast>
-					<targetParams>
-						<canTargetLocations>true</canTargetLocations>
-					</targetParams>
-					<defaultProjectile>OuterRim_StunGrenadeProj</defaultProjectile>
-					<onlyManualCast>true</onlyManualCast>
-					<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					<ai_AvoidFriendlyFireRadius>7</ai_AvoidFriendlyFireRadius>
-				</Properties>
-				<weaponTags>
-					<li>CE_AI_Grenade</li>
-					<li>CE_AI_AOE</li>
-					<li>CE_OneHandedWeapon</li>
-    					<li>CE_GrenadeFlashbang</li>
-				</weaponTags>
-			</li>
-
-			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-				<defName>OuterRim_ThermalDetonator</defName>
-				<statBases>
-					<Mass>0.4</Mass>
-					<Bulk>0.87</Bulk>
-					<MarketValue>11.22</MarketValue>
-					<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					<SightsEfficiency>1.0</SightsEfficiency>
-				</statBases>
-				<Properties>
-					<label>throw thermal detonator</label>
-					<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-					<hasStandardCommand>true</hasStandardCommand>
-					<range>10.0</range>
-					<minRange>4</minRange>
-					<warmupTime>0.8</warmupTime>
-					<noiseRadius>4</noiseRadius>
-					<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-					<soundCast>ThrowGrenade</soundCast>
-					<targetParams>
-						<canTargetLocations>true</canTargetLocations>
-					</targetParams>
-					<defaultProjectile>OuterRim_ThermalDetProj</defaultProjectile>
-					<onlyManualCast>true</onlyManualCast>
-					<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					<ai_AvoidFriendlyFireRadius>7</ai_AvoidFriendlyFireRadius>
-				</Properties>
-				<weaponTags>
-					<li>CE_AI_Grenade</li>
-					<li>CE_AI_AOE</li>
-					<li>CE_OneHandedWeapon</li>
-				</weaponTags>
-			</li>
-
-			<!-- Grenade Costs -->
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_FragGrenadeBelt"]/costList</xpath>
-				<value>
-					<costList>
-						<OuterRim_FragGrenade>5</OuterRim_FragGrenade>
-					</costList>
-				</value>
-			</li>
-			
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_CryoBanGrenadeBelt"]/costList</xpath>
-				<value>
-					<costList>
-						<OuterRim_CryoBanGrenade>5</OuterRim_CryoBanGrenade>
-					</costList>
-				</value>
-			</li>
-			
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_IonGrenadeBelt"]/costList</xpath>
-				<value>
-					<costList>
-						<OuterRim_IonGrenade>5</OuterRim_IonGrenade>
-					</costList>
-				</value>
-			</li>
-			
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_PlasmaGrenadeBelt"]/costList</xpath>
-				<value>
-					<costList>
-						<OuterRim_PlasmaGrenade>5</OuterRim_PlasmaGrenade>
-					</costList>
-				</value>
-			</li>
-			
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_SonicGrenadeBelt"]/costList</xpath>
-				<value>
-					<costList>
-						<OuterRim_SonicGrenade>5</OuterRim_SonicGrenade>
-					</costList>
-				</value>
-			</li>
-			
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_StunGrenadeBelt"]/costList</xpath>
-				<value>
-					<costList>
-						<OuterRim_StunGrenade>5</OuterRim_StunGrenade>
-					</costList>
-				</value>
-			</li>
-			
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_ThermalDetonatorBelt"]/costList</xpath>
-				<value>
-					<costList>
-						<OuterRim_ThermalDetonator>5</OuterRim_ThermalDetonator>
-					</costList>
-				</value>
-			</li>
-			
-			<!-- Reload Logic -->
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_FragGrenadeBelt" or defName="OuterRim_CryoBanGrenadeBelt" or defName="OuterRim_IonGrenadeBelt" or defName="OuterRim_PlasmaGrenadeBelt" or defName="OuterRim_SonicGrenadeBelt" or defName="OuterRim_StunGrenadeBelt" or defName="OuterRim_ThermalDetonatorBelt"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountToRefill</xpath>
-				<value>
-					<ammoCountPerCharge>1</ammoCountPerCharge>
-				</value>
-			</li>
-
-			<!-- Grenade Verbs -->
-			
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_FragGrenadeBelt"]/verbs</xpath>
-				<value>
-					<verbs>
-						<li Class="CombatExtended.VerbPropertiesCE">
-							<label>throw frag detonator</label>
-							<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
-							<hasStandardCommand>true</hasStandardCommand>
-							<onlyManualCast>True</onlyManualCast>
-							<warmupTime>0.8</warmupTime>
-							<range>10</range>
-							<minRange>3</minRange>
-							<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-							<soundCast>ThrowGrenade</soundCast>
-							<soundCastTail>GunTail_Medium</soundCastTail>
-							<muzzleFlashScale>0</muzzleFlashScale>
-							<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
-							<targetParams>
-								<canTargetLocations>true</canTargetLocations>
-							</targetParams>
-							<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-							<defaultProjectile>OuterRim_FragGrenadeProj</defaultProjectile>
-							<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
-						</li>
-					</verbs>
-				</value>
-			</li>
-			
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_CryoBanGrenadeBelt"]/verbs</xpath>
-				<value>
-					<verbs>
-						<li Class="CombatExtended.VerbPropertiesCE">
-							<label>throw cryoban detonator</label>
-							<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
-							<hasStandardCommand>true</hasStandardCommand>
-							<onlyManualCast>True</onlyManualCast>
-							<warmupTime>0.8</warmupTime>
-							<range>10</range>
-							<minRange>3</minRange>
-							<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-							<soundCast>ThrowGrenade</soundCast>
-							<soundCastTail>GunTail_Medium</soundCastTail>
-							<muzzleFlashScale>0</muzzleFlashScale>
-							<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
-							<targetParams>
-								<canTargetLocations>true</canTargetLocations>
-							</targetParams>
-							<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-							<defaultProjectile>OuterRim_CryoBanGrenadeProj</defaultProjectile>
-							<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
-						</li>
-					</verbs>
-				</value>
-			</li>
-			
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_IonGrenadeBelt"]/verbs</xpath>
-				<value>
-					<verbs>
-						<li Class="CombatExtended.VerbPropertiesCE">
-							<label>throw ion detonator</label>
-							<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
-							<hasStandardCommand>true</hasStandardCommand>
-							<onlyManualCast>True</onlyManualCast>
-							<warmupTime>0.8</warmupTime>
-							<range>10</range>
-							<minRange>3</minRange>
-							<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-							<soundCast>ThrowGrenade</soundCast>
-							<soundCastTail>GunTail_Medium</soundCastTail>
-							<muzzleFlashScale>0</muzzleFlashScale>
-							<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
-							<targetParams>
-								<canTargetLocations>true</canTargetLocations>
-							</targetParams>
-							<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-							<defaultProjectile>OuterRim_IonGrenadeProj</defaultProjectile>
-							<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
-						</li>
-					</verbs>
-				</value>
-			</li>
-			
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_PlasmaGrenadeBelt"]/verbs</xpath>
-				<value>
-					<verbs>
-						<li Class="CombatExtended.VerbPropertiesCE">
-							<label>throw plasma detonator</label>
-							<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
-							<hasStandardCommand>true</hasStandardCommand>
-							<onlyManualCast>True</onlyManualCast>
-							<warmupTime>0.8</warmupTime>
-							<range>10</range>
-							<minRange>3</minRange>
-							<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-							<soundCast>ThrowGrenade</soundCast>
-							<soundCastTail>GunTail_Medium</soundCastTail>
-							<muzzleFlashScale>0</muzzleFlashScale>
-							<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
-							<targetParams>
-								<canTargetLocations>true</canTargetLocations>
-							</targetParams>
-							<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-							<defaultProjectile>OuterRim_PlasmaGrenadeProj</defaultProjectile>
-							<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
-						</li>
-					</verbs>
-				</value>
-			</li>
-			
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_SonicGrenadeBelt"]/verbs</xpath>
-				<value>
-					<verbs>
-						<li Class="CombatExtended.VerbPropertiesCE">
-							<label>throw sonic detonator</label>
-							<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
-							<hasStandardCommand>true</hasStandardCommand>
-							<onlyManualCast>True</onlyManualCast>
-							<warmupTime>0.8</warmupTime>
-							<range>10</range>
-							<minRange>3</minRange>
-							<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-							<soundCast>ThrowGrenade</soundCast>
-							<soundCastTail>GunTail_Medium</soundCastTail>
-							<muzzleFlashScale>0</muzzleFlashScale>
-							<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
-							<targetParams>
-								<canTargetLocations>true</canTargetLocations>
-							</targetParams>
-							<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-							<defaultProjectile>OuterRim_SonicGrenadeProj</defaultProjectile>
-							<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
-						</li>
-					</verbs>
-				</value>
-			</li>
-			
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_StunGrenadeBelt"]/verbs</xpath>
-				<value>
-					<verbs>
-						<li Class="CombatExtended.VerbPropertiesCE">
-							<label>throw stun detonator</label>
-							<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
-							<hasStandardCommand>true</hasStandardCommand>
-							<onlyManualCast>True</onlyManualCast>
-							<warmupTime>0.8</warmupTime>
-							<range>10</range>
-							<minRange>3</minRange>
-							<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-							<soundCast>ThrowGrenade</soundCast>
-							<soundCastTail>GunTail_Medium</soundCastTail>
-							<muzzleFlashScale>0</muzzleFlashScale>
-							<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
-							<targetParams>
-								<canTargetLocations>true</canTargetLocations>
-							</targetParams>
-							<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-							<defaultProjectile>OuterRim_StunGrenadeProj</defaultProjectile>
-							<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
-						</li>
-					</verbs>
-				</value>
-			</li>
-			
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="OuterRim_ThermalDetonatorBelt"]/verbs</xpath>
-				<value>
-					<verbs>
-						<li Class="CombatExtended.VerbPropertiesCE">
-							<label>throw thermal detonator</label>
-							<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
-							<hasStandardCommand>true</hasStandardCommand>
-							<onlyManualCast>True</onlyManualCast>
-							<warmupTime>0.8</warmupTime>
-							<range>10</range>
-							<minRange>3</minRange>
-							<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-							<soundCast>ThrowGrenade</soundCast>
-							<soundCastTail>GunTail_Medium</soundCastTail>
-							<muzzleFlashScale>0</muzzleFlashScale>
-							<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
-							<targetParams>
-								<canTargetLocations>true</canTargetLocations>
-							</targetParams>
-							<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-							<defaultProjectile>OuterRim_ThermalDetProj</defaultProjectile>
-							<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
-						</li>
-					</verbs>
-				</value>
-			</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Outer Rim - Core/Outer_Rim_Core_Jetpacks.xml b/Patches/Outer Rim - Core/Outer_Rim_Core_Jetpacks.xml
deleted file mode 100644
index 79b717c9a6..0000000000
--- a/Patches/Outer Rim - Core/Outer_Rim_Core_Jetpacks.xml	
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outer Rim - Core</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="OuterRim_JetpackBase"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>3</WornBulk>
-						<JumpRange>30</JumpRange>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="OuterRim_JetpackBase"]/equippedStatOffsets</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="OuterRim_JetpackBase"]</xpath>
-					<value>
-						<verbs>
-							<li>
-								<verbClass>Verb_Jump</verbClass>
-								<label>jump</label>
-								<violent>false</violent>
-								<hasStandardCommand>true</hasStandardCommand>
-								<onlyManualCast>True</onlyManualCast>
-								<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-								<warmupTime>0.5</warmupTime>
-								<warmupEffecter>JumpWarmupEffect</warmupEffecter>
-								<requireLineOfSight>true</requireLineOfSight>
-								<flightEffecterDef>JumpFlightEffect</flightEffecterDef>
-								<soundLanding>JumpPackLand</soundLanding>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-									<canTargetPawns>false</canTargetPawns>
-									<canTargetBuildings>false</canTargetBuildings>
-								</targetParams>
-							</li>
-						</verbs>
-						<comps>
-							<li Class="CompProperties_Reloadable">
-								<maxCharges>8</maxCharges>
-								<ammoDef>Chemfuel</ammoDef>
-								<ammoCountPerCharge>10</ammoCountPerCharge>
-								<baseReloadTicks>60</baseReloadTicks>
-								<soundReload>Standard_Reload</soundReload>
-								<hotKey>Misc4</hotKey>
-								<chargeNoun>jump</chargeNoun>
-								<displayGizmoWhileUndrafted>false</displayGizmoWhileUndrafted>
-							</li>
-						</comps>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="OuterRim_JT12Jetpack" or defName="OuterRim_IndustrialJetpack" or defName="OuterRim_MakeshiftJetpack"]/comps</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Outer Rim - Core/Outer_Rim_Core_Materials.xml b/Patches/Outer Rim - Core/Outer_Rim_Core_Materials.xml
deleted file mode 100644
index 18a22a0e20..0000000000
--- a/Patches/Outer Rim - Core/Outer_Rim_Core_Materials.xml	
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outer Rim - Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- general adjustments -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="OuterRimMetal"]/stuffProps/categories</xpath>
-					<value>
-						<li>Metallic_Weapon</li>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="OuterRimMetal"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>0.03</Bulk>
-						</statBases>
-					</value>
-				</li>
-				
-				<!-- fabrics -->
-				
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_Durafiber"]/statBases</xpath>
-					<value>
-						<Bulk>0.05</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_Durafiber"]/statBases</xpath>
-					<value>
-						<WornBulk>0.25</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_Durafiber"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>0.9</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_Durafiber"]/stuffProps</xpath>
-					<value>
-						<categories>
-							<li>SoftArmor</li>
-						</categories>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_Durafiber"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.6</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_Durafiber"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.12</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_Durafiber"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.1</StuffPower_Armor_Heat>
-						<StuffPower_Armor_Electric>0.05</StuffPower_Armor_Electric>
-					</value>
-				</li>
-				
-				<!-- metals -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="OuterRim_Durasteel"]/statBases/StuffPower_Armor_Heat</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="OuterRim_Beskar"]/statBases/StuffPower_Armor_Heat</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="OuterRim_PureBeskar"]/statBases/StuffPower_Armor_Heat</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_Durasteel"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1.5</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_Durasteel"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>2.5</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_Durasteel"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>1.1</MeleePenetrationFactor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_Beskar"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>2</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_Beskar"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>3</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_Beskar"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>1.15</MeleePenetrationFactor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_PureBeskar"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>2.2</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_PureBeskar"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>3.5</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_PureBeskar"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>1.3</MeleePenetrationFactor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Outer Rim - Core/Outer_Rim_Core_Melee_Weapons.xml b/Patches/Outer Rim - Core/Outer_Rim_Core_Melee_Weapons.xml
deleted file mode 100644
index b6c09d386e..0000000000
--- a/Patches/Outer Rim - Core/Outer_Rim_Core_Melee_Weapons.xml	
+++ /dev/null
@@ -1,409 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outer Rim - Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_GaderffiiStick"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.84</cooldownTime>
-								<armorPenetrationBlunt>1.54</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>3.5</cooldownTime>
-								<armorPenetrationBlunt>0.956</armorPenetrationBlunt>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_GaderffiiStick"]/statBases</xpath>
-					<value>
-						<Bulk>5.5</Bulk>
-						<MeleeCounterParryBonus>1.5</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_GaderffiiStick"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.25</MeleeCritChance>
-							<MeleeParryChance>1.45</MeleeParryChance>
-							<MeleeDodgeChance>0.6</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_VibroAxe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<chanceFactor>0.1</chanceFactor>
-								<cooldownTime>1.66</cooldownTime>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>2.47</cooldownTime>
-								<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_VibroAxe"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.2</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_VibroAxe"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.75</MeleeCritChance>
-							<MeleeParryChance>0.2</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_VibroBlade"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<chanceFactor>0.1</chanceFactor>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>0.83</cooldownTime>
-								<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>0.94</cooldownTime>
-								<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
-								<armorPenetrationSharp>25</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_VibroBlade"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_VibroBlade"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.0</MeleeCritChance>
-							<MeleeParryChance>0.4</MeleeParryChance>
-							<MeleeDodgeChance>0.27</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_VibroBlade"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_VibroCleaver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<chanceFactor>0.1</chanceFactor>
-								<cooldownTime>1.66</cooldownTime>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.97</cooldownTime>
-								<armorPenetrationBlunt>4.69</armorPenetrationBlunt>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_VibroCleaver"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_VibroCleaver"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.5</MeleeCritChance>
-							<MeleeParryChance>0.2</MeleeParryChance>
-							<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_VibroCleaver"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_VibroDagger"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>16</power>
-								<chanceFactor>0.1</chanceFactor>
-								<cooldownTime>1</cooldownTime>
-								<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>0.83</cooldownTime>
-								<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>15</power>
-								<chanceFactor>0.4</chanceFactor>
-								<cooldownTime>0.75</cooldownTime>
-								<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_VibroDagger"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<MeleeCounterParryBonus>0.25</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_VibroDagger"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.25</MeleeCritChance>
-							<MeleeParryChance>0.1</MeleeParryChance>
-							<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_VibroDagger"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_VibroDoubleBlade"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>0.46</cooldownTime>
-								<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>0.47</cooldownTime>
-								<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
-								<armorPenetrationSharp>25</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_VibroDoubleBlade"]/statBases</xpath>
-					<value>
-						<Bulk>8.5</Bulk>
-						<MeleeCounterParryBonus>0.8</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_VibroDoubleBlade"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.00</MeleeCritChance>
-							<MeleeParryChance>0.1</MeleeParryChance>
-							<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_VibroGlaive"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<chanceFactor>0.1</chanceFactor>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>46</power>
-								<cooldownTime>1.85</cooldownTime>
-								<armorPenetrationBlunt>4.32</armorPenetrationBlunt>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.64</cooldownTime>
-								<armorPenetrationBlunt>1.92</armorPenetrationBlunt>
-								<armorPenetrationSharp>25</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_VibroGlaive"]/statBases</xpath>
-					<value>
-						<Bulk>8.5</Bulk>
-						<MeleeCounterParryBonus>0.75</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_VibroGlaive"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.0</MeleeCritChance>
-							<MeleeParryChance>1.25</MeleeParryChance>
-							<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Outer Rim - Core/Outer_Rim_Core_Mines.xml b/Patches/Outer Rim - Core/Outer_Rim_Core_Mines.xml
deleted file mode 100644
index 68210ec61e..0000000000
--- a/Patches/Outer Rim - Core/Outer_Rim_Core_Mines.xml	
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outer Rim - Core</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_Mine_Frag"]/comps/li[@Class="CompProperties_Explosive"]</xpath>
-					<value>
-						<li Class="CompProperties_Explosive">
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<damageAmountBase>320</damageAmountBase>
-							<explosiveRadius>4.9</explosiveRadius>
-							<startWickOnDamageTaken>
-								<li>Bullet</li>
-								<li>Arrow</li>
-								<li>ArrowHighVelocity</li>
-							</startWickOnDamageTaken>
-							<wickTicks>6</wickTicks>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>32</Fragment_Large>
-								<Fragment_Small>80</Fragment_Small>
-							</fragments>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_Mine_Ion"]/description</xpath>
-					<value>
-						<description>A powerful mine designed to release a large electromagnetic pulse when triggered. Whilst harmless to unaugmented organics, it can temporarily stun cyborgs, mechanoids, droids, and other mechanical entities. Particularly weak mechanoids might be destroyed outright.</description>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_Mine_Ion"]/comps/li[@Class="CompProperties_Explosive"]</xpath>
-					<value>
-						<li Class="CompProperties_Explosive">
-							<explosiveRadius>9.9</explosiveRadius>
-							<explosiveDamageType>EMP</explosiveDamageType>
-							<startWickHitPointsPercent>0.2</startWickHitPointsPercent>
-							<wickTicks>6</wickTicks>
-							<startWickOnDamageTaken>
-								<li>Bullet</li>
-								<li>Arrow</li>
-								<li>ArrowHighVelocity</li>
-							</startWickOnDamageTaken>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Outer Rim - Core/Outer_Rim_Core_Pawnkinds.xml b/Patches/Outer Rim - Core/Outer_Rim_Core_Pawnkinds.xml
deleted file mode 100644
index 4204f9c974..0000000000
--- a/Patches/Outer Rim - Core/Outer_Rim_Core_Pawnkinds.xml	
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outer Rim - Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-			
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="OuterRim_SettlerBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-			
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="OuterRim_MercenaryBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-			
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="OuterRim_PirateBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Outer Rim - Core/Outer_Rim_Core_Ranged_Weapons.xml b/Patches/Outer Rim - Core/Outer_Rim_Core_Ranged_Weapons.xml
deleted file mode 100644
index db2f05af1d..0000000000
--- a/Patches/Outer Rim - Core/Outer_Rim_Core_Ranged_Weapons.xml	
+++ /dev/null
@@ -1,528 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outer Rim - Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						@Name="OuterRimBlasterBase_Pistol" or
-						@Name="OuterRimBlasterBase_Rifle" or
-						@Name="OuterRimBlasterBase_SniperRifle" or
-						@Name="OuterRimBlasterBase_HeavyWeapon"
-						]/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>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_AB75BoRifle</defName>
-					<statBases>
-						<Mass>3.0</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.20</SwayFactor>
-						<Bulk>7.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.46</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterRifle_Red</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>55</range>
-						<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-						<burstShotCount>3</burstShotCount>
-						<soundCast>OuterRim_Shot_AB75BoRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Rifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_BARMST12Scattergun"]/description</xpath>
-					<value>
-						<description>The BARM-ST12 scattergun was a type of pump-action scatterblaster, the blaster equivalent of a shotgun. It lacks the ability to make use of concentrated or ionized blaster cells, but can fire a spread of micro-blasts that are almost as powerful as individual pistol bolts - at the cost of consuming a lot of energy (and tibanna) to do so.</description>
-					</value>
-				</li>
-				
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_BARMST12Scattergun</defName>
-					<statBases>
-						<Mass>4.35</Mass>
-						<Bulk>6.0</Bulk>
-						<SwayFactor>1.25</SwayFactor>
-						<ShotSpread>0.14</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>3.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterBolt_Scatter</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>20</range>
-						<soundCast>OuterRim_Shot_DLT19DBlasterBolt</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<ammoConsumedPerShotCount>4</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>40</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridge_Scatter</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_DE10Blaster</defName>
-					<statBases>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.07</SwayFactor>
-						<Bulk>2.60</Bulk>
-						<Mass>1.50</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>3.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterPistol_Yellow</defaultProjectile>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>0.5</warmupTime>
-						<range>12</range>
-						<soundCast>OuterRim_Shot_MediumBlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>24</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeYellow_Pistol</ammoSet>
-					</AmmoUser>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_DG29Blaster"]/description</xpath>
-					<value>
-						<description>The DG-29 heavy blaster pistol, also known as the DG-29 sideloader, is a model of heavy blaster pistol produced by BlasTech Industries. Whilst it cannot fire as quickly as other blaster pistols, it has better range and packs a punch comparable to a full-scale rifle in a smaller package.</description>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_DG29Blaster</defName>
-					<statBases>
-						<SightsEfficiency>0.9</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.07</SwayFactor>
-						<Bulk>3.10</Bulk>
-						<Mass>1.80</Mass>
-						<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>3.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterRifle_Red</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>16</range>
-						<soundCast>OuterRim_Shot_MediumBlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>22</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Rifle</ammoSet>
-					</AmmoUser>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_K16BryarBlaster</defName>
-					<statBases>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.07</SwayFactor>
-						<Bulk>2.60</Bulk>
-						<Mass>1.50</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>3.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterPistol_Yellow</defaultProjectile>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>0.5</warmupTime>
-						<range>12</range>
-						<soundCast>OuterRim_Shot_MediumBlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>24</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeYellow_Pistol</ammoSet>
-					</AmmoUser>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_IonRifle</defName>
-					<statBases>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.21</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>3.00</Bulk>
-						<Mass>4.10</Mass>
-						<RangedWeapon_Cooldown>2.5</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterRifle_Ion</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>31</range>
-						<soundCast>OuterRim_Shot_DLT19DBlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>3.7</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeIon_Rifle</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_HeavyIonRifle</defName>
-					<statBases>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.21</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>3.00</Bulk>
-						<Mass>4.10</Mass>
-						<RangedWeapon_Cooldown>2.5</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterRifle_Ion</defaultProjectile>
-						<warmupTime>2.4</warmupTime>
-						<range>42</range>
-						<soundCast>OuterRim_Shot_DLT19DBlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>3.7</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeIon_Sniper</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_IonBlaster</defName>
-					<statBases>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.21</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>3.00</Bulk>
-						<Mass>4.10</Mass>
-						<RangedWeapon_Cooldown>2.5</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterRifle_Ion</defaultProjectile>
-						<warmupTime>0.8</warmupTime>
-						<range>24</range>
-						<soundCast>OuterRim_Shot_DLT19DBlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>2.5</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeIon_Pistol</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_CyclerRifle</defName>
-					<statBases>
-						<SightsEfficiency>1.6</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.75</SwayFactor>
-						<Bulk>12</Bulk>
-						<Mass>7.5</Mass>
-						<RangedWeapon_Cooldown>1.05</RangedWeapon_Cooldown>
-					</statBases>
-					<weaponTags>
-					    <li>Bipod_DMR</li>
-					</weaponTags>
-					<Properties>
-						<recoilAmount>2.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_4570Gov_FMJ</defaultProjectile>
-						<warmupTime>1.8</warmupTime>
-						<range>75</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>1.5</reloadTime>
-						<ammoSet>AmmoSet_4570Gov</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_BlasterCarbine</defName>
-					<statBases>
-						<SightsEfficiency>0.6</SightsEfficiency>
-						<ShotSpread>0.24</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>5.30</Bulk>
-						<Mass>3.10</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterRifle_Red</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>35</range>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<burstShotCount>3</burstShotCount>
-						<soundCast>OuterRim_Shot_E11BlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>80</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Rifle</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_T21RepeatingBlaster</defName>
-					<statBases>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.3</SwayFactor>
-						<Bulk>13.25</Bulk>
-						<Mass>7.75</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.05</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterRifle_Red</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>62</range>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>15</burstShotCount>
-						<soundCast>OuterRim_Shot_HeavyMinigunBlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>220</magazineSize>
-						<reloadTime>6.25</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Rifle</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_VSSBlasterCarbine"]/description</xpath>
-					<value>
-						<description>An oddly archaic-looking blaster carbine, favoured by the Pyke Syndicate. Whilst it lacks the rapid-fire capacity of other blaster rifles and carbines, it is precise and has respectable range, and comes with a high-quality optic.</description>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_VSSBlasterCarbine</defName>
-					<statBases>
-						<SightsEfficiency>1.9</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>2.25</SwayFactor>
-						<Bulk>6.5</Bulk>
-						<Mass>4.30</Mass>
-						<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
-						<NightVisionEfficiency_Weapon>0.4</NightVisionEfficiency_Weapon>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterRifle_Red</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>52</range>
-						<soundCast>OuterRim_Shot_E11BlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>44</magazineSize>
-						<reloadTime>3.7</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Rifle</ammoSet>
-					</AmmoUser>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Apparel.xml b/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Apparel.xml
deleted file mode 100644
index e68cbfc628..0000000000
--- a/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Apparel.xml	
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outer Rim - Galactic Empire</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="OuterRim_StormtrooperHelmet"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_StormtrooperHelmet"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
-					<value>
-						<ToxicEnvironmentResistance>0.25</ToxicEnvironmentResistance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_ScoutTrooperHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<NightVisionEfficiency>0.8</NightVisionEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="OuterRim_ScoutTrooperHelmet"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_ImperialArmyHelmet"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<ToxicEnvironmentResistance>0</ToxicEnvironmentResistance>
-							<SmokeSensitivity>0</SmokeSensitivity>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_ImperialArmyHelmet"]/apparel</xpath>
-					<value>
-						<bodyPartGroups Inherit="False">
-							<li>UpperHead</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_ImperialCadetHelmet"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
-					<value>
-						<ToxicEnvironmentResistance>0.25</ToxicEnvironmentResistance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_ImperialCadetHelmetAlt"]/apparel</xpath>
-					<value>
-						<immuneToToxGasExposure>false</immuneToToxGasExposure>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_ImperialCadetHelmetAlt"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<ToxicEnvironmentResistance>0</ToxicEnvironmentResistance>
-							<SmokeSensitivity>0</SmokeSensitivity>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_ISBAgentHelmet"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<ToxicEnvironmentResistance>0</ToxicEnvironmentResistance>
-							<SmokeSensitivity>0</SmokeSensitivity>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="OuterRim_ISBAgentHelmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-				
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Jetpacks.xml b/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Jetpacks.xml
deleted file mode 100644
index 0d1c3acbb1..0000000000
--- a/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Jetpacks.xml	
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outer Rim - Galactic Empire</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="OuterRim_ImperialJetpack"]/comps</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Pawnkinds.xml b/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Pawnkinds.xml
deleted file mode 100644
index d984ce0c38..0000000000
--- a/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Pawnkinds.xml	
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outer Rim - Galactic Empire</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-			
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="OuterRim_ImperialArmyTroopBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-			
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="OuterRim_EMPStormBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Ranged_Weapons.xml b/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Ranged_Weapons.xml
deleted file mode 100644
index 93bc7047ea..0000000000
--- a/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Ranged_Weapons.xml	
+++ /dev/null
@@ -1,404 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outer Rim - Galactic Empire</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_EC17Blaster</defName>
-					<statBases>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.07</SwayFactor>
-						<Bulk>1.90</Bulk>
-						<Mass>1.20</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>3.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterPistol_Red</defaultProjectile>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>0.5</warmupTime>
-						<range>9</range>
-						<soundCast>OuterRim_Shot_MediumBlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-					<AmmoUser>
-						<magazineSize>24</magazineSize>
-						<reloadTime>3.7</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Pistol</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_SE14RBlaster</defName>
-					<statBases>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.21</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>2.60</Bulk>
-						<Mass>1.50</Mass>
-						<RangedWeapon_Cooldown>2.5</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>3.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterPistol_Red</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>OuterRim_Shot_SE14RBlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-					<AmmoUser>
-						<magazineSize>24</magazineSize>
-						<reloadTime>3.7</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Pistol</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_DLT20ABlaster</defName>
-					<statBases>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.21</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>3.00</Bulk>
-						<Mass>4.10</Mass>
-						<RangedWeapon_Cooldown>2.5</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterRifle_Red</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>35</range>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<burstShotCount>5</burstShotCount>
-						<soundCast>OuterRim_Shot_DLT20BBlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>80</magazineSize>
-						<reloadTime>3.7</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Rifle</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_E10BlasterRifle</defName>
-					<statBases>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.21</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>6.00</Bulk>
-						<Mass>4.10</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterRifle_Red</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>35</range>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>5</burstShotCount>
-						<soundCast>OuterRim_Shot_E11BlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>80</magazineSize>
-						<reloadTime>3.7</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Rifle</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_E11BlasterRifle</defName>
-					<statBases>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.21</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>5.00</Bulk>
-						<Mass>2.80</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterRifle_Red</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>35</range>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>5</burstShotCount>
-						<soundCast>OuterRim_Shot_E11BlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>80</magazineSize>
-						<reloadTime>3.7</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Rifle</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_E22BlasterRifle</defName>
-					<statBases>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.21</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>6.50</Bulk>
-						<Mass>3.40</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.6</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterRifle_Red</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>35</range>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<burstShotCount>8</burstShotCount>
-						<soundCast>OuterRim_Shot_E11BlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>4</aimedBurstShotCount>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>4.4</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Rifle</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_DLT19HeavyBlasterRifle</defName>
-					<statBases>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.25</SwayFactor>
-						<Bulk>16.50</Bulk>
-						<Mass>9.00</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.16</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterRifle_Red</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>62</range>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>OuterRim_Shot_HeavyMinigunBlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>250</magazineSize>
-						<reloadTime>7.5</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Rifle</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_DLT19XTargetingBlaster</defName>
-					<statBases>
-						<SightsEfficiency>2.6</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>2.25</SwayFactor>
-						<Bulk>14.5</Bulk>
-						<Mass>8.0</Mass>
-						<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
-						<NightVisionEfficiency_Weapon>0.4</NightVisionEfficiency_Weapon>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterSniper_Red</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>75</range>
-						<soundCast>OuterRim_Shot_DLT19DBlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>24</magazineSize>
-						<reloadTime>3.7</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Sniper</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_TL50HeavyRepeaterBlaster</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.10</ShotSpread>
-						<SwayFactor>1.35</SwayFactor>
-						<Bulk>12.00</Bulk>
-						<Mass>20.00</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterRifle_Red</defaultProjectile>
-						<warmupTime>2.5</warmupTime>
-						<range>62</range>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<burstShotCount>50</burstShotCount>
-						<soundCast>OuterRim_Shot_HeavyMinigunBlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>25</aimedBurstShotCount>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>400</magazineSize>
-						<reloadTime>9.5</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Rifle</ammoSet>
-					</AmmoUser>
-				</li>
-				
-				<!-- === D72 Flamethrower === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_D72wOppressor</defName>
-					<statBases>
-						<Mass>5.5</Mass>
-						<Bulk>8</Bulk>
-						<SwayFactor>1.35</SwayFactor>
-						<ShotSpread>0.15</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.85</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Flamethrower_Prometheum</defaultProjectile>
-						<burstShotCount>20</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>11</range>
-						<minRange>3</minRange>
-						<soundCast>OuterRim_Shot_FlameProjector</soundCast>
-						<muzzleFlashScale>0</muzzleFlashScale>
-						<ai_IsBuildingDestroyer>True</ai_IsBuildingDestroyer>
-						<targetParams>
-							<canTargetLocations>True</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>40</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_Flamethrower</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>10</aimedBurstShotCount>
-					</FireModes>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Outer Rim - Galactic Republic/Outer_Rim_Galactic_Republic_Pawnkinds.xml b/Patches/Outer Rim - Galactic Republic/Outer_Rim_Galactic_Republic_Pawnkinds.xml
deleted file mode 100644
index 8dcc0d820f..0000000000
--- a/Patches/Outer Rim - Galactic Republic/Outer_Rim_Galactic_Republic_Pawnkinds.xml	
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outer Rim - Galactic Republic</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-			
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="OuterRim_CloneP2Base"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Outer Rim - Galactic Republic/Outer_Rim_Galactic_Republic_Ranged_Weapons.xml b/Patches/Outer Rim - Galactic Republic/Outer_Rim_Galactic_Republic_Ranged_Weapons.xml
deleted file mode 100644
index 2134c85a26..0000000000
--- a/Patches/Outer Rim - Galactic Republic/Outer_Rim_Galactic_Republic_Ranged_Weapons.xml	
+++ /dev/null
@@ -1,281 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outer Rim - Galactic Republic</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_DC17HandBlaster</defName>
-					<statBases>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.21</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>2.60</Bulk>
-						<Mass>1.50</Mass>
-						<RangedWeapon_Cooldown>2.5</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>3.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterPistol_Blue</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>OuterRim_Shot_MediumBlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-					<AmmoUser>
-						<magazineSize>24</magazineSize>
-						<reloadTime>3.7</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeBlue_Pistol</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_DC17mCarbine</defName>
-					<statBases>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.21</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>5.00</Bulk>
-						<Mass>2.80</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterRifle_Blue</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>35</range>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>5</burstShotCount>
-						<soundCast>OuterRim_Shot_EE13BlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>80</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeBlue_Rifle</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_DC15ACarbine</defName>
-					<statBases>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.21</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>6.00</Bulk>
-						<Mass>4.10</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterRifle_Blue</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>35</range>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>5</burstShotCount>
-						<soundCast>OuterRim_Shot_DC15BlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>3.7</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeBlue_Rifle</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_DC15ARifle</defName>
-					<statBases>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.25</SwayFactor>
-						<Bulk>16.50</Bulk>
-						<Mass>9.00</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.16</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterRifle_Blue</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>62</range>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>OuterRim_Shot_DC15BlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>200</magazineSize>
-						<reloadTime>7.5</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeBlue_Rifle</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_DC15xSniperRifle</defName>
-					<statBases>
-						<SightsEfficiency>2.6</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>2.25</SwayFactor>
-						<Bulk>14.5</Bulk>
-						<Mass>8.0</Mass>
-						<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
-						<NightVisionEfficiency_Weapon>0.4</NightVisionEfficiency_Weapon>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterSniper_Blue</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>75</range>
-						<soundCast>OuterRim_Shot_DLT20BBlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeBlue_Sniper</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_Z6RotaryBlaster</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.10</ShotSpread>
-						<SwayFactor>1.35</SwayFactor>
-						<Bulk>12.00</Bulk>
-						<Mass>20.00</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterRifle_Blue</defaultProjectile>
-						<warmupTime>2.5</warmupTime>
-						<range>62</range>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<burstShotCount>50</burstShotCount>
-						<soundCast>OuterRim_Shot_HeavyMinigunBlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>25</aimedBurstShotCount>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>600</magazineSize>
-						<reloadTime>9.5</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeBlue_Rifle</ammoSet>
-					</AmmoUser>
-				</li>
-				
-				<!-- === RPS6 RL === -->
-				
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_RPS6RocketLauncher</defName>
-					<statBases>
-						<Mass>7.5</Mass>
-						<Bulk>10.5</Bulk>
-						<SwayFactor>1.7</SwayFactor>
-						<ShotSpread>0.15</ShotSpread>
-						<SightsEfficiency>2.25</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_RPS6_HEDP</defaultProjectile>
-						<warmupTime>3.3</warmupTime>
-						<range>58</range>
-						<minRange>10</minRange>
-						<soundCast>OuterRim_Shot_RocketLauncher</soundCast>
-						<muzzleFlashScale>15</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>True</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>12</reloadTime>
-						<ammoSet>AmmoSet_OuterRimRockets</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Apparel.xml b/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Apparel.xml
deleted file mode 100644
index 8609d7eead..0000000000
--- a/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Apparel.xml	
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outer Rim - Mandalore</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="MandalorianChestBase"]/statBases/Mass</xpath>
-					<value>
-						<Mass>15</Mass>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="MandalorianChestBase"]/statBases</xpath>
-					<value>
-						<Bulk>80</Bulk>
-						<WornBulk>15</WornBulk>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-						<ArmorRating_Blunt>18</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="MandalorianChestBase"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>11</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="MandalorianChestBase"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MoveSpeed>-0.15</MoveSpeed>
-							<ToxicEnvironmentResistance>0.25</ToxicEnvironmentResistance>
-							<CarryBulk>25</CarryBulk>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="MandalorianChestBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="MandalorianHelmetBase"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>2</WornBulk>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-						<ArmorRating_Blunt>18</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="MandalorianHelmetBase"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>11</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="MandalorianHelmetBase"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-							<ToxicEnvironmentResistance>0.25</ToxicEnvironmentResistance>
-							<NightVisionEfficiency>0.8</NightVisionEfficiency>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="MandalorianPauldronsBase"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>3</WornBulk>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-						<ArmorRating_Blunt>18</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="MandalorianPauldronsBase"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>11</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="MandalorianPauldronsBase"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<ToxicEnvironmentResistance>0.25</ToxicEnvironmentResistance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="MandalorianPauldronsBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_MandalorianChest_Heavy"]/statBases</xpath>
-					<value>
-						<Bulk>40</Bulk>
-						<WornBulk>25</WornBulk>
-						<ArmorRating_Sharp>7.5</ArmorRating_Sharp>
-						<ArmorRating_Blunt>22.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_MandalorianChest_Heavy"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>15</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_MandalorianHelmet_Heavy"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>4</WornBulk>
-						<ArmorRating_Sharp>7.5</ArmorRating_Sharp>
-						<ArmorRating_Blunt>22.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_MandalorianHelmet_Heavy"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>15</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_MandalorianPauldrons_Heavy"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>4</WornBulk>
-						<ArmorRating_Sharp>7.5</ArmorRating_Sharp>
-						<ArmorRating_Blunt>22.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_MandalorianPauldrons_Heavy"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>15</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Jetpacks.xml b/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Jetpacks.xml
deleted file mode 100644
index 63f88899bf..0000000000
--- a/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Jetpacks.xml	
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outer Rim - Mandalore</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="OuterRim_Z6Jetpack" or defName="OuterRim_SupercommandoJetpack"]/comps</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Melee_Weapons.xml b/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Melee_Weapons.xml
deleted file mode 100644
index 47729d5765..0000000000
--- a/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Melee_Weapons.xml	
+++ /dev/null
@@ -1,307 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outer Rim - Mandalore</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_MunitkatHalberd"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<chanceFactor>0.1</chanceFactor>
-								<cooldownTime>1.66</cooldownTime>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>2.47</cooldownTime>
-								<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_MunitkatHalberd"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.2</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_MunitkatHalberd"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.75</MeleeCritChance>
-							<MeleeParryChance>0.2</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_MandalorianWarhammer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.78</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>1.000</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>2.36</cooldownTime>
-								<armorPenetrationBlunt>11.76</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_MandalorianWarhammer"]/statBases/Mass</xpath>
-					<value>
-						<Mass>2.5</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_MandalorianWarhammer"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<MeleeCounterParryBonus>0.48</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_MandalorianWarhammer"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.25</MeleeCritChance>
-							<MeleeParryChance>0.36</MeleeParryChance>
-							<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_MandalorianHammer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.78</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>1.000</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>2.36</cooldownTime>
-								<armorPenetrationBlunt>10.26</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_MandalorianHammer"]/statBases/Mass</xpath>
-					<value>
-						<Mass>2</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_MandalorianHammer"]/statBases</xpath>
-					<value>
-						<Bulk>5.5</Bulk>
-						<MeleeCounterParryBonus>0.48</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_MandalorianHammer"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.15</MeleeCritChance>
-							<MeleeParryChance>0.32</MeleeParryChance>
-							<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_MandalorianSaber"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<chanceFactor>0.1</chanceFactor>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>0.83</cooldownTime>
-								<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>0.94</cooldownTime>
-								<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
-								<armorPenetrationSharp>25</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_MandalorianSaber"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.40</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_MandalorianSaber"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.00</MeleeCritChance>
-							<MeleeParryChance>0.40</MeleeParryChance>
-							<MeleeDodgeChance>0.27</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_MandalorianSaber"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_MandalorianHookblade"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<chanceFactor>0.1</chanceFactor>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>1.13</cooldownTime>
-								<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.34</cooldownTime>
-								<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
-								<armorPenetrationSharp>25</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_MandalorianHookblade"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.65</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_MandalorianHookblade"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.25</MeleeCritChance>
-							<MeleeParryChance>0.50</MeleeParryChance>
-							<MeleeDodgeChance>0.27</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_MandalorianHookblade"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Pawnkinds.xml b/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Pawnkinds.xml
deleted file mode 100644
index c00eb3d2b6..0000000000
--- a/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Pawnkinds.xml	
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outer Rim - Mandalore</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-			
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="BaseDeathWatchPawn"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Ranged_Weapons.xml b/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Ranged_Weapons.xml
deleted file mode 100644
index 685359f585..0000000000
--- a/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Ranged_Weapons.xml	
+++ /dev/null
@@ -1,435 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outer Rim - Mandalore</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_WESTAR35Blaster</defName>
-					<statBases>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.07</SwayFactor>
-						<Bulk>2.60</Bulk>
-						<Mass>1.50</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>3.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterPistol_Yellow</defaultProjectile>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>0.5</warmupTime>
-						<range>12</range>
-						<soundCast>OuterRim_Shot_RepeaterBlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>24</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeYellow_Pistol</ammoSet>
-					</AmmoUser>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-				
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_WESTAR34Blaster</defName>
-					<statBases>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.07</SwayFactor>
-						<Bulk>2.60</Bulk>
-						<Mass>1.50</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>3.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterPistol_Yellow</defaultProjectile>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>0.5</warmupTime>
-						<range>12</range>
-						<soundCast>OuterRim_Shot_RepeaterBlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>24</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeYellow_Pistol</ammoSet>
-					</AmmoUser>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-				
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_WESTAR18Blaster</defName>
-					<statBases>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.07</SwayFactor>
-						<Bulk>2.60</Bulk>
-						<Mass>1.50</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>3.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterPistol_Yellow</defaultProjectile>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>0.5</warmupTime>
-						<range>12</range>
-						<soundCast>OuterRim_Shot_RepeaterBlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>24</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeYellow_Pistol</ammoSet>
-					</AmmoUser>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-				
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_IB94BlasterPistol</defName>
-					<statBases>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.07</SwayFactor>
-						<Bulk>2.60</Bulk>
-						<Mass>1.50</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>3.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterPistol_Yellow</defaultProjectile>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>0.5</warmupTime>
-						<range>12</range>
-						<soundCast>OuterRim_Shot_RepeaterBlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>24</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeYellow_Pistol</ammoSet>
-					</AmmoUser>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-				
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_EE13BlasterPistol</defName>
-					<statBases>
-						<Mass>2.80</Mass>
-						<Bulk>5.00</Bulk>
-						<SwayFactor>0.75</SwayFactor>
-						<ShotSpread>0.16</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterPistol_Yellow</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>0.5</warmupTime>
-						<range>12</range>
-						<soundCast>OuterRim_Shot_EE13BlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeYellow_Pistol</ammoSet>
-					</AmmoUser>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-				
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_GALAAR15Blaster</defName>
-					<statBases>
-						<Mass>2.80</Mass>
-						<Bulk>5.00</Bulk>
-						<SwayFactor>0.75</SwayFactor>
-						<ShotSpread>0.16</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterRifle_Yellow</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>0.5</warmupTime>
-						<range>55</range>
-						<soundCast>OuterRim_Shot_RepeaterBlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>80</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeYellow_Rifle</ammoSet>
-					</AmmoUser>
-					<weaponTags>
-						<li>SpacerGun</li>
-					</weaponTags>
-				</li>
-				
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_EE13SniperRifle</defName>
-					<statBases>
-						<Mass>8</Mass>
-						<Bulk>14.5</Bulk>
-						<SwayFactor>2.25</SwayFactor>
-						<ShotSpread>0.05</ShotSpread>
-						<SightsEfficiency>2.6</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
-						<NightVisionEfficiency_Weapon>0.4</NightVisionEfficiency_Weapon>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterSniper_Yellow</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>75</range>
-						<soundCast>OuterRim_Shot_EE13BlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>24</magazineSize>
-						<reloadTime>6</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeYellow_Sniper</ammoSet>
-					</AmmoUser>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>Bipod_DMR</li>
-					</weaponTags>
-				</li>
-				
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_EE13BlasterRifle</defName>
-					<statBases>
-						<Mass>3.0</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.20</SwayFactor>
-						<Bulk>7.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.46</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterRifle_Yellow</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>55</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>6</burstShotCount>
-						<soundCast>OuterRim_Shot_EE13BlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>80</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeYellow_Rifle</ammoSet>
-					</AmmoUser>
-					<weaponTags>
-						<li>SpacerGun</li>
-					</weaponTags>
-				</li>
-				
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_EE3BlasterCarbine</defName>
-					<statBases>
-						<Mass>3.0</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.20</SwayFactor>
-						<Bulk>7.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterRifle_Yellow</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>1.0</warmupTime>
-						<range>55</range>
-						<soundCast>OuterRim_Shot_EE3BlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>80</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeYellow_Rifle</ammoSet>
-					</AmmoUser>
-					<weaponTags>
-						<li>SpacerGun</li>
-					</weaponTags>
-				</li>
-				
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_AmbanSniperRifle</defName>
-					<statBases>
-						<Mass>8</Mass>
-						<Bulk>14.5</Bulk>
-						<SwayFactor>2.25</SwayFactor>
-						<ShotSpread>0.05</ShotSpread>
-						<SightsEfficiency>2.6</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
-						<NightVisionEfficiency_Weapon>0.4</NightVisionEfficiency_Weapon>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterSniper_Yellow</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>75</range>
-						<soundCast>OuterRim_Shot_DisintigratorBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-						<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>3</magazineSize>
-						<reloadTime>0.25</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeYellow_Sniper</ammoSet>
-					</AmmoUser>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>Bipod_DMR</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Outer Rim - Old Republic/Outer_Rim_Old_Republic_Apparel.xml b/Patches/Outer Rim - Old Republic/Outer_Rim_Old_Republic_Apparel.xml
deleted file mode 100644
index 06d80c3d85..0000000000
--- a/Patches/Outer Rim - Old Republic/Outer_Rim_Old_Republic_Apparel.xml	
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outer Rim - Old Republic</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_SithTrooperHelmet"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
-					<value>
-						<ToxicEnvironmentResistance>0.25</ToxicEnvironmentResistance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_OldRepublicTrooperHelmet"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
-					<value>
-						<ToxicEnvironmentResistance>0</ToxicEnvironmentResistance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_OldRepublicTrooperHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>0</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_OldRepublicTrooperHelmet"]/apparel</xpath>
-					<value>
-						<bodyPartGroups Inherit="False">
-							<li>UpperHead</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="OuterRim_OldRepublicTrooperHelmet"]/apparel/immuneToToxGasExposure</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Outer Rim - Old Republic/Outer_Rim_Old_Republic_Pawnkinds.xml b/Patches/Outer Rim - Old Republic/Outer_Rim_Old_Republic_Pawnkinds.xml
deleted file mode 100644
index 803173edcc..0000000000
--- a/Patches/Outer Rim - Old Republic/Outer_Rim_Old_Republic_Pawnkinds.xml	
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outer Rim - Old Republic</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-			
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="OuterRim_OldRepublicPawnBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-			
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="OuterRim_SithPawnBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Outer Rim - Old Republic/Outer_Rim_Old_Republic_Ranged_Weapons.xml b/Patches/Outer Rim - Old Republic/Outer_Rim_Old_Republic_Ranged_Weapons.xml
deleted file mode 100644
index 4a960832b5..0000000000
--- a/Patches/Outer Rim - Old Republic/Outer_Rim_Old_Republic_Ranged_Weapons.xml	
+++ /dev/null
@@ -1,406 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outer Rim - Old Republic</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_OldRepublicBlaster</defName>
-					<statBases>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.21</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>2.60</Bulk>
-						<Mass>1.50</Mass>
-						<RangedWeapon_Cooldown>2.5</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>3.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterPistol_Green</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>3</burstShotCount>
-						<soundCast>OuterRim_Shot_BlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-					<AmmoUser>
-						<magazineSize>24</magazineSize>
-						<reloadTime>3.7</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeGreen_Pistol</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_SithBlaster</defName>
-					<statBases>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.21</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>2.60</Bulk>
-						<Mass>1.50</Mass>
-						<RangedWeapon_Cooldown>2.5</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>3.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterPistol_Red</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>3</burstShotCount>
-						<soundCast>OuterRim_Shot_BlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-					<AmmoUser>
-						<magazineSize>24</magazineSize>
-						<reloadTime>3.7</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Pistol</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_OldRepublicRifle</defName>
-					<statBases>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.21</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>6.00</Bulk>
-						<Mass>4.10</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterRifle_Green</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>35</range>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>5</burstShotCount>
-						<soundCast>OuterRim_Shot_MediumBlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>80</magazineSize>
-						<reloadTime>3.7</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeGreen_Rifle</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_SithRifle</defName>
-					<statBases>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.21</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>6.00</Bulk>
-						<Mass>4.10</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterRifle_Red</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>35</range>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>5</burstShotCount>
-						<soundCast>OuterRim_Shot_MediumBlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>80</magazineSize>
-						<reloadTime>3.7</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Rifle</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_OldRepublicSniper</defName>
-					<statBases>
-						<SightsEfficiency>2.6</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>2.25</SwayFactor>
-						<Bulk>14.5</Bulk>
-						<Mass>8.0</Mass>
-						<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
-						<NightVisionEfficiency_Weapon>0.4</NightVisionEfficiency_Weapon>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterSniper_Green</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>75</range>
-						<soundCast>OuterRim_Shot_PowerBlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>3.7</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeGreen_Sniper</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_SithSniper</defName>
-					<statBases>
-						<SightsEfficiency>2.6</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>2.25</SwayFactor>
-						<Bulk>14.5</Bulk>
-						<Mass>8.0</Mass>
-						<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
-						<NightVisionEfficiency_Weapon>0.4</NightVisionEfficiency_Weapon>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterSniper_Red</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>75</range>
-						<soundCast>OuterRim_Shot_PowerBlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>3.7</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Sniper</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_OldRepublicHeavyRifle</defName>
-					<statBases>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.25</SwayFactor>
-						<Bulk>16.50</Bulk>
-						<Mass>9.00</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.16</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterRifle_Green</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>62</range>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>OuterRim_Shot_AltHeavyBlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>300</magazineSize>
-						<reloadTime>7.5</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeGreen_Rifle</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_SithHeavyRifle</defName>
-					<statBases>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.25</SwayFactor>
-						<Bulk>16.50</Bulk>
-						<Mass>9.00</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.16</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterRifle_Red</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>62</range>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>OuterRim_Shot_AltHeavyBlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>300</magazineSize>
-						<reloadTime>7.5</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Rifle</ammoSet>
-					</AmmoUser>
-				</li>
-				
-				<!-- === Flamethrowers === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_OldRepublicFlameProjector</defName>
-					<statBases>
-						<Mass>5.5</Mass>
-						<Bulk>8</Bulk>
-						<SwayFactor>1.35</SwayFactor>
-						<ShotSpread>0.15</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.85</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Flamethrower_Prometheum</defaultProjectile>
-						<burstShotCount>20</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>11</range>
-						<minRange>3</minRange>
-						<soundCast>OuterRim_Shot_FlameProjector</soundCast>
-						<muzzleFlashScale>0</muzzleFlashScale>
-						<ai_IsBuildingDestroyer>True</ai_IsBuildingDestroyer>
-						<targetParams>
-							<canTargetLocations>True</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>40</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_Flamethrower</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>10</aimedBurstShotCount>
-					</FireModes>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-				
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_SithFlameProjector</defName>
-					<statBases>
-						<Mass>5.5</Mass>
-						<Bulk>8</Bulk>
-						<SwayFactor>1.35</SwayFactor>
-						<ShotSpread>0.15</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.85</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Flamethrower_Prometheum</defaultProjectile>
-						<burstShotCount>20</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>11</range>
-						<minRange>3</minRange>
-						<soundCast>OuterRim_Shot_FlameProjector</soundCast>
-						<muzzleFlashScale>0</muzzleFlashScale>
-						<ai_IsBuildingDestroyer>True</ai_IsBuildingDestroyer>
-						<targetParams>
-							<canTargetLocations>True</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>40</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_Flamethrower</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>10</aimedBurstShotCount>
-					</FireModes>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Apparel.xml b/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Apparel.xml
deleted file mode 100644
index 8c3a1c9e09..0000000000
--- a/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Apparel.xml	
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outer Rim - Rebel Alliance</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_RebelFleetTrooperHelmet"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<ToxicEnvironmentResistance>0</ToxicEnvironmentResistance>
-							<SmokeSensitivity>0</SmokeSensitivity>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_RebelForestHelmet"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<ToxicEnvironmentResistance>0</ToxicEnvironmentResistance>
-							<SmokeSensitivity>0</SmokeSensitivity>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Jetpacks.xml b/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Jetpacks.xml
deleted file mode 100644
index 3e589841bd..0000000000
--- a/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Jetpacks.xml	
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outer Rim - Rebel Alliance</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="OuterRim_RebelJetpack"]/comps</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Pawnkinds.xml b/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Pawnkinds.xml
deleted file mode 100644
index ed166841ee..0000000000
--- a/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Pawnkinds.xml	
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outer Rim - Rebel Alliance</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-			
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="OuterRim_RebelPawnBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Ranged_Weapons.xml b/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Ranged_Weapons.xml
deleted file mode 100644
index e1a524b020..0000000000
--- a/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Ranged_Weapons.xml	
+++ /dev/null
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outer Rim - Rebel Alliance</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_A180Blaster"]/description</xpath>
-					<value>
-						<description>The A-180 blaster was a modular blaster manufactured by BlasTech Industries. Though theoretically capable of being easily reconfigured for various battlefield roles, the vast majority found are the simple blaster pistol variant.</description>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_A180Blaster</defName>
-					<statBases>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.21</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>2.60</Bulk>
-						<Mass>1.50</Mass>
-						<RangedWeapon_Cooldown>2.5</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>3.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterPistol_Green</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>OuterRim_Shot_SE14RBlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-					<AmmoUser>
-						<magazineSize>24</magazineSize>
-						<reloadTime>3.7</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeGreen_Pistol</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_DH17Pistol"]/label</xpath>
-					<value>
-						<label>dh-17 blaster carbine</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_DH17Pistol"]/description</xpath>
-					<value>
-						<description>The DH-17 blaster carbine was a close-combat blaster weapon produced by BlasTech Industries.</description>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_DH17Pistol</defName>
-					<statBases>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.21</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>5.00</Bulk>
-						<Mass>2.80</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterRifle_Red</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>35</range>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>5</burstShotCount>
-						<soundCast>OuterRim_Shot_E11BlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>60</magazineSize>
-						<reloadTime>2.6</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeGreen_Rifle</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_DH17Rifle"]/description</xpath>
-					<value>
-						<description>Not to be confused with the more compact DH-17 carbine, the DH-17 rifle was another staple of the Rebel Alliance's armouries. With a full stock and improved optics, it was more accurate than the carbine model.</description>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_DH17Rifle</defName>
-					<statBases>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.12</SwayFactor>
-						<Bulk>6.00</Bulk>
-						<Mass>4.10</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterRifle_Green</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>41</range>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>5</burstShotCount>
-						<soundCast>OuterRim_Shot_E11BlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>80</magazineSize>
-						<reloadTime>3.7</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeGreen_Rifle</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_A280Blaster</defName>
-					<statBases>
-						<SightsEfficiency>1.9</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>2.25</SwayFactor>
-						<Bulk>6.5</Bulk>
-						<Mass>4.30</Mass>
-						<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
-						<NightVisionEfficiency_Weapon>0.4</NightVisionEfficiency_Weapon>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterSniper_Green</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>52</range>
-						<soundCast>OuterRim_Shot_E11BlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>3.7</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeGreen_Sniper</ammoSet>
-					</AmmoUser>
-				</li>
-				
-				<!-- === HH12 RL === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_HH12RocketLauncher"]/description</xpath>
-					<value>
-						<description>A simple but effective shoulder-fired rocket launcher utilized by the Rebel Alliance, engineered to take advantage of generous leftover stocks of RPS-6 missiles that were once used by the Galactic Republic before its dissolution.</description>
-					</value>
-				</li>
-				
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_HH12RocketLauncher</defName>
-					<statBases>
-						<Mass>7.5</Mass>
-						<Bulk>10.5</Bulk>
-						<SwayFactor>1.7</SwayFactor>
-						<ShotSpread>0.15</ShotSpread>
-						<SightsEfficiency>2.25</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_RPS6_HEDP</defaultProjectile>
-						<warmupTime>3.3</warmupTime>
-						<range>58</range>
-						<minRange>10</minRange>
-						<soundCast>OuterRim_Shot_RocketLauncher</soundCast>
-						<muzzleFlashScale>15</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>True</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>12</reloadTime>
-						<ammoSet>AmmoSet_OuterRimRockets</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Outer Rim - Seperatists/Outer_Rim_Seperatist_Melee_Weapons.xml b/Patches/Outer Rim - Seperatists/Outer_Rim_Seperatist_Melee_Weapons.xml
deleted file mode 100644
index 6c888d1c6a..0000000000
--- a/Patches/Outer Rim - Seperatists/Outer_Rim_Seperatist_Melee_Weapons.xml	
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outer Rim - Seperatists</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OuterRim_BXVibroblade"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<chanceFactor>0.1</chanceFactor>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>0.83</cooldownTime>
-								<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>0.94</cooldownTime>
-								<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
-								<armorPenetrationSharp>25</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_BXVibroblade"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_BXVibroblade"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.0</MeleeCritChance>
-							<MeleeParryChance>0.4</MeleeParryChance>
-							<MeleeDodgeChance>0.27</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="OuterRim_BXVibroblade"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Outer Rim - Seperatists/Outer_Rim_Seperatist_Ranged_Weapons.xml b/Patches/Outer Rim - Seperatists/Outer_Rim_Seperatist_Ranged_Weapons.xml
deleted file mode 100644
index fdce107412..0000000000
--- a/Patches/Outer Rim - Seperatists/Outer_Rim_Seperatist_Ranged_Weapons.xml	
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Outer Rim - Old Republic</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_RG4DBlaster</defName>
-					<statBases>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.21</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>2.60</Bulk>
-						<Mass>1.50</Mass>
-						<RangedWeapon_Cooldown>2.5</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>3.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterPistol_Red</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>OuterRim_Shot_BlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-					<AmmoUser>
-						<magazineSize>24</magazineSize>
-						<reloadTime>3.7</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Pistol</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_E5Blaster</defName>
-					<statBases>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.21</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>6.00</Bulk>
-						<Mass>4.10</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterRifle_Red</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>35</range>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>5</burstShotCount>
-						<soundCast>OuterRim_Shot_MediumBlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>80</magazineSize>
-						<reloadTime>3.7</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Rifle</ammoSet>
-					</AmmoUser>
-				</li>
-				
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>OuterRim_E5sSniperRifle</defName>
-					<statBases>
-						<SightsEfficiency>2.6</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>2.25</SwayFactor>
-						<Bulk>14.5</Bulk>
-						<Mass>8.0</Mass>
-						<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
-						<NightVisionEfficiency_Weapon>0.4</NightVisionEfficiency_Weapon>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BlasterSniper_Red</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>75</range>
-						<soundCast>OuterRim_Shot_PowerBlasterBolt</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>3.7</reloadTime>
-						<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Sniper</ammoSet>
-					</AmmoUser>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Palm Cats/ThingDefs_Races.xml b/Patches/Palm Cats/ThingDefs_Races.xml
deleted file mode 100644
index 45b34a75a6..0000000000
--- a/Patches/Palm Cats/ThingDefs_Races.xml	
+++ /dev/null
@@ -1,301 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Palm Cats</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Common === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Leoplicant" or defName="MalmTiger" or defName="PalmCat"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Leoplicant === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Leoplicant"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						<MeleeCritChance>0.12</MeleeCritChance>
-						<MeleeParryChance>0.06</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leoplicant"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>0.97</cooldownTime>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.523</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>0.97</cooldownTime>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.523</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.35</cooldownTime>
-								<armorPenetrationSharp>0.35</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.97</cooldownTime>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Leoplicant"]/combatPower</xpath>
-					<value>
-						<combatPower>120</combatPower>
-					</value>
-				</li>
-
-				<!-- === Malm Tiger === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MalmTiger"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.29</MeleeDodgeChance>
-						<MeleeCritChance>0.06</MeleeCritChance>
-						<MeleeParryChance>0.03</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MalmTiger"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>0.97</cooldownTime>
-								<armorPenetrationSharp>0.10</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>0.97</cooldownTime>
-								<armorPenetrationSharp>0.10</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.35</cooldownTime>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.690</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.97</cooldownTime>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="MalmTiger"]/combatPower</xpath>
-					<value>
-						<combatPower>90</combatPower>
-					</value>
-				</li>
-
-				<!-- === Palm Cat === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PalmCat"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						<MeleeCritChance>0.06</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PalmCat"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.60</cooldownTime>
-								<armorPenetrationSharp>0.10</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.60</cooldownTime>
-								<armorPenetrationSharp>0.10</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>0.97</cooldownTime>
-								<armorPenetrationBlunt>0.254</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.60</cooldownTime>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="PalmCat"]/combatPower</xpath>
-					<value>
-						<combatPower>90</combatPower>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Paniel the Automata/Ammo/Ammo_Paniel.xml b/Patches/Paniel the Automata/Ammo/Ammo_Paniel.xml
deleted file mode 100644
index eaf1f021c4..0000000000
--- a/Patches/Paniel the Automata/Ammo/Ammo_Paniel.xml	
+++ /dev/null
@@ -1,921 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-
-		<mods>
-			<li>Paniel the Automata</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==================== Shells ========================== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>AmmoPanielHowitzerShells</defName>
-							<label>Paniel Howitzer shell</label>
-							<parent>AmmoShells</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberCannon</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_PanielHowitzerShell</defName>
-							<label>Paniel Howitzer shells</label>
-							<ammoTypes>
-								<Ammo_PanielHowitzerShell_HE>Bullet_PanielHowitzerShell_HE</Ammo_PanielHowitzerShell_HE>
-								<Ammo_PanielHowitzerShell_Incendiary>Bullet_PanielHowitzerShell_Incendiary</Ammo_PanielHowitzerShell_Incendiary>
-								<Ammo_PanielHowitzerShell_EMP>Bullet_PanielHowitzerShell_EMP</Ammo_PanielHowitzerShell_EMP>
-								<Ammo_PanielHowitzerShell_Smoke>Bullet_PanielHowitzerShell_Smoke</Ammo_PanielHowitzerShell_Smoke>
-								<Ammo_PanielHowitzerShell_Firefoam>Bullet_PanielHowitzerShell_Firefoam</Ammo_PanielHowitzerShell_Firefoam>
-								<Ammo_PanielHowitzerShell_AP>Bullet_PanielHowitzerShell_AP</Ammo_PanielHowitzerShell_AP>
-							</ammoTypes>
-							<isMortarAmmoSet>true</isMortarAmmoSet>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_PanielLSWMulti</defName>
-							<label>Paniel Multi-Launcher munitions</label>
-							<ammoTypes>
-								<Ammo_40x53mmGrenade_HE>Bullet_40x53mmGrenade_HE</Ammo_40x53mmGrenade_HE>
-								<Ammo_40x53mmGrenade_HE_TFuzed>Bullet_40x53mmGrenade_HE_TFuzed</Ammo_40x53mmGrenade_HE_TFuzed>
-								<Ammo_40x53mmGrenade_HEDP>Bullet_40x53mmGrenade_HEDP</Ammo_40x53mmGrenade_HEDP>
-								<Ammo_40x53mmGrenade_EMP>Bullet_40x53mmGrenade_EMP</Ammo_40x53mmGrenade_EMP>
-								<Ammo_40x53mmGrenade_Smoke>Bullet_40x53mmGrenade_Smoke</Ammo_40x53mmGrenade_Smoke>
-								<Ammo_30x64mmFuel_Incendiary>Bullet_30x64mmFuel_Incendiary</Ammo_30x64mmFuel_Incendiary>
-								<Ammo_30x64mmFuel_Thermobaric>Bullet_30x64mmFuel_Thermobaric</Ammo_30x64mmFuel_Thermobaric>
-								<Ammo_30x64mmFuel_Foam>Bullet_30x64mmFuel_Foam</Ammo_30x64mmFuel_Foam>
-							</ammoTypes>
-							<isMortarAmmoSet>false</isMortarAmmoSet>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_PanielRailShell</defName>
-							<label>Paniel Railgun shells</label>
-							<ammoTypes>
-								<Ammo_PanielRailShell>Bullet_PanielRail</Ammo_PanielRailShell>
-							</ammoTypes>
-							<isMortarAmmoSet>false</isMortarAmmoSet>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="105mmHowitzerShellBase">
-							<defName>Ammo_PanielHowitzerShell_HE</defName>
-							<label>Paniel Howitzer shell (HE)</label>
-							<graphicData>
-								<texPath>Things/Item/PNShell/PNShellHE</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<drawSize>0.90</drawSize>
-							</graphicData>
-							<tradeTags Inherit="False">
-								<li>CE_HeavyAmmo</li>
-								<li>CE_AutoEnableTrade</li>
-							</tradeTags>
-							<statBases>
-								<MarketValue>221.6</MarketValue>
-							</statBases>
-							<ammoClass>GrenadeHE</ammoClass>
-							<detonateProjectile>Bullet_PanielHowitzerShell_HE</detonateProjectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="105mmHowitzerShellBase">
-							<defName>Ammo_PanielHowitzerShell_Incendiary</defName>
-							<label>Paniel Howitzer shell (Incendiary)</label>
-							<graphicData>
-								<texPath>Things/Item/PNShell/PNShellIN</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<drawSize>0.90</drawSize>
-							</graphicData>
-							<tradeTags Inherit="False">
-								<li>CE_HeavyAmmo</li>
-								<li>CE_AutoEnableTrade</li>
-							</tradeTags>
-							<statBases>
-								<MarketValue>187.76</MarketValue>
-							</statBases>
-							<ammoClass>GrenadeIncendiary</ammoClass>
-							<detonateProjectile>Bullet_PanielHowitzerShell_Incendiary</detonateProjectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="105mmHowitzerShellBase">
-							<defName>Ammo_PanielHowitzerShell_EMP</defName>
-							<label>Paniel Howitzer shell (EMP)</label>
-							<graphicData>
-								<texPath>Things/Item/PNShell/PNShellEM</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<drawSize>0.90</drawSize>
-							</graphicData>
-							<tradeTags Inherit="False">
-								<li>CE_HeavyAmmo</li>
-								<li>CE_AutoEnableTrade</li>
-							</tradeTags>
-							<statBases>
-								<MarketValue>375.52</MarketValue>
-							</statBases>
-							<ammoClass>GrenadeEMP</ammoClass>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="105mmHowitzerShellBase">
-							<defName>Ammo_PanielHowitzerShell_Smoke</defName>
-							<label>Paniel Howitzer shell (Smoke)</label>
-							<graphicData>
-								<texPath>Things/Item/PNShell/PNShellSM</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<drawSize>0.90</drawSize>
-							</graphicData>
-							<tradeTags Inherit="False">
-								<li>CE_HeavyAmmo</li>
-								<li>CE_AutoEnableTrade</li>
-							</tradeTags>
-							<statBases>
-								<MarketValue>177.6</MarketValue>
-							</statBases>
-							<ammoClass>Smoke</ammoClass>
-							<detonateProjectile>Bullet_PanielHowitzerShell_Smoke</detonateProjectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="105mmHowitzerShellBase">
-							<defName>Ammo_PanielHowitzerShell_Firefoam</defName>
-							<label>Paniel Howitzer shell (Foam)</label>
-							<graphicData>
-								<texPath>Things/Item/PNShell/PNShellFF</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<drawSize>0.90</drawSize>
-							</graphicData>
-							<tradeTags Inherit="False">
-								<li>CE_HeavyAmmo</li>
-								<li>CE_AutoEnableTrade</li>
-							</tradeTags>
-							<statBases>
-								<MarketValue>191.76</MarketValue>
-							</statBases>
-							<ammoClass>FoamFuel</ammoClass>
-							<detonateProjectile>Bullet_PanielHowitzerShell_Firefoam</detonateProjectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="105mmHowitzerShellBase">
-							<defName>Ammo_PanielHowitzerShell_AP</defName>
-							<label>Paniel Howitzer shell (AP)</label>
-							<graphicData>
-								<texPath>Things/Item/PNShell/PNShellAP</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<drawSize>0.90</drawSize>
-							</graphicData>
-							<tradeTags Inherit="False">
-								<li>CE_HeavyAmmo</li>
-								<li>CE_AutoEnableTrade</li>
-							</tradeTags>
-							<statBases>
-								<MarketValue>144.04</MarketValue>
-							</statBases>
-							<ammoClass>GrenadeHE</ammoClass>
-							<detonateProjectile>Bullet_PanielHowitzerShell_AP</detonateProjectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="105mmHowitzerShellBase">
-							<defName>Ammo_PanielHowitzerShell_Anti</defName>
-							<label>Paniel Howitzer shell (Anti)</label>
-							<graphicData>
-								<texPath>Things/Item/PNShell/PNShellAG</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<drawSize>0.90</drawSize>
-							</graphicData>
-							<tradeTags Inherit="False">
-								<li>CE_HeavyAmmo</li>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableTrade_Sellable</li>
-							</tradeTags>
-							<statBases>
-								<MarketValue>1500</MarketValue>
-							</statBases>
-							<ammoClass>Antigrain</ammoClass>
-							<detonateProjectile>Bullet_PanielHowitzerShell_Anti</detonateProjectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="105mmHowitzerShellBase">
-							<defName>Ammo_PanielRailShell</defName>
-							<label>Paniel Railgun shell</label>
-							<graphicData>
-								<texPath>Things/Item/PNShell/PNShellAP</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<drawSize>0.90</drawSize>
-							</graphicData>
-							<tradeTags Inherit="False">
-								<li>CE_HeavyAmmo</li>
-								<li>CE_AutoEnableTrade</li>
-							</tradeTags>
-							<statBases>
-								<MarketValue>225</MarketValue>
-							</statBases>
-							<ammoClass>Antigrain</ammoClass>
-							<detonateProjectile>Bullet_PanielRail</detonateProjectile>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="Base105mmHowitzerShell">
-							<defName>Bullet_PanielHowitzerShell_HE</defName>
-							<label>Paniel Howitzer shell (HE)</label>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<graphicData>
-								<texPath>Things/Projectile/Cannon/Howitzer/HE</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>5</damageAmountBase>
-								<explosionRadius>0.5</explosionRadius>
-								<soundExplode>MortarBomb_Explode</soundExplode>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Bullet_60mmMortarPaniel_HE>8</Bullet_60mmMortarPaniel_HE>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="Base105mmHowitzerShell">
-							<defName>Bullet_PanielHowitzerShell_Incendiary</defName>
-							<label>Paniel Howitzer shell (Incendiary)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Cannon/Howitzer/INC</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>5</damageAmountBase>
-								<explosionRadius>0.5</explosionRadius>
-								<soundExplode>MortarBomb_Explode</soundExplode>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Bullet_60mmMortarPaniel_Incendiary>8</Bullet_60mmMortarPaniel_Incendiary>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="Base105mmHowitzerShell">
-							<defName>Bullet_PanielHowitzerShell_EMP</defName>
-							<label>Paniel Howitzer shell (EMP)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Cannon/Howitzer/EMP</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>5</damageAmountBase>
-								<explosionRadius>0.5</explosionRadius>
-								<soundExplode>MortarBomb_Explode</soundExplode>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Bullet_60mmMortarPaniel_EMP>8</Bullet_60mmMortarPaniel_EMP>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="Base105mmHowitzerShell">
-							<defName>Bullet_PanielHowitzerShell_Smoke</defName>
-							<label>Paniel Howitzer shell (Smoke)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Cannon/Howitzer/SMK</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>5</damageAmountBase>
-								<explosionRadius>0.5</explosionRadius>
-								<soundExplode>MortarBomb_Explode</soundExplode>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Bullet_60mmMortarPaniel_Smoke>8</Bullet_60mmMortarPaniel_Smoke>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="Base105mmHowitzerShell">
-							<defName>Bullet_PanielHowitzerShell_Firefoam</defName>
-							<label>Paniel Howitzer shell (Foam)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Cannon/Howitzer/SMK</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>5</damageAmountBase>
-								<explosionRadius>0.5</explosionRadius>
-								<soundExplode>MortarBomb_Explode</soundExplode>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Bullet_60mmMortarPaniel_Firefoam>8</Bullet_60mmMortarPaniel_Firefoam>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="Base105mmHowitzerShell">
-							<defName>Bullet_PanielHowitzerShell_AP</defName>
-							<label>Paniel Howitzer shell (AP)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Cannon/Howitzer/IILUM</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>1050</damageAmountBase>
-								<explosionRadius>1</explosionRadius>
-								<soundExplode>MortarBomb_Explode</soundExplode>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Large>30</Fragment_Large>
-										<Fragment_Small>50</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="Base105mmHowitzerShell">
-							<defName>Bullet_PanielHowitzerShell_Anti</defName>
-							<label>Paniel Howitzer shell (AP)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Cannon/Howitzer/ANTI</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>800</damageAmountBase>
-								<explosionRadius>50</explosionRadius>
-								<explosionChanceToStartFire>0.22</explosionChanceToStartFire>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<flyOverhead>true</flyOverhead>
-								<explosionEffect>GiantExplosion</explosionEffect>
-								<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-								<soundExplode>Explosion_GiantBomb</soundExplode>
-								<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
-								<soundAmbient>MortarRound_Ambient</soundAmbient>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== Cluster ========================== -->
-
-						<ThingDef ParentName="Base60mmMortarShell">
-							<defName>Bullet_60mmMortarPaniel_HE</defName>
-							<label>60mm mortar shell (HE)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Mortar/HE</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>9</speed>
-								<gravityFactor>5</gravityFactor>
-								<damageDef>Bomb</damageDef>
-								<explosionRadius>2</explosionRadius>
-								<damageAmountBase>76</damageAmountBase>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0</armorPenetrationBlunt>
-								<flyOverhead>true</flyOverhead>
-								<soundExplode>MortarBomb_Explode</soundExplode>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<ai_IsIncendiary>true</ai_IsIncendiary>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Large>6</Fragment_Large>
-										<Fragment_Small>31</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="Base60mmMortarShell">
-							<defName>Bullet_60mmMortarPaniel_Incendiary</defName>
-							<label>60mm mortar shell (Incendiary)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Mortar/Incendiary</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>9</speed>
-								<gravityFactor>5</gravityFactor>
-								<damageDef>PrometheumFlame</damageDef>
-								<damageAmountBase>6</damageAmountBase>
-								<explosionRadius>4.5</explosionRadius>
-								<flyOverhead>true</flyOverhead>
-								<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
-								<preExplosionSpawnChance>0.15</preExplosionSpawnChance>
-								<soundExplode>MortarIncendiary_Explode</soundExplode>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base60mmMortarShell">
-							<defName>Bullet_60mmMortarPaniel_EMP</defName>
-							<label>60mm mortar shell (EMP)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Mortar/EMP</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>9</speed>
-								<gravityFactor>5</gravityFactor>
-								<damageDef>EMP</damageDef>
-								<damageAmountBase>76</damageAmountBase>
-								<flyOverhead>true</flyOverhead>
-								<explosionRadius>3.5</explosionRadius>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base60mmMortarShell">
-							<defName>Bullet_60mmMortarPaniel_Firefoam</defName>
-							<label>60mm mortar shell (Foam)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Mortar/Firefoam</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>9</speed>
-								<gravityFactor>5</gravityFactor>
-								<damageDef>Extinguish</damageDef>
-								<suppressionFactor>0.0</suppressionFactor>
-								<dangerFactor>0.0</dangerFactor>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0</armorPenetrationBlunt>
-								<explosionRadius>7</explosionRadius>
-								<flyOverhead>true</flyOverhead>
-								<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-								<soundExplode>Explosion_EMP</soundExplode>
-								<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
-								<soundAmbient>MortarRound_Ambient</soundAmbient>
-								<postExplosionSpawnThingDef>Filth_FireFoam</postExplosionSpawnThingDef>
-								<postExplosionSpawnChance>1</postExplosionSpawnChance>
-								<postExplosionSpawnThingCount>3</postExplosionSpawnThingCount>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<explosionEffect>ExtinguisherExplosion</explosionEffect>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base60mmMortarShell">
-							<defName>Bullet_60mmMortarPaniel_Smoke</defName>
-							<label>60mm mortar shell (Smoke)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Mortar/Smoke</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>9</speed>
-								<gravityFactor>5</gravityFactor>
-								<damageDef>Smoke</damageDef>
-								<suppressionFactor>0.0</suppressionFactor>
-								<dangerFactor>0.0</dangerFactor>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0</armorPenetrationBlunt>
-								<explosionRadius>4.5</explosionRadius>
-								<flyOverhead>true</flyOverhead>
-								<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-								<soundExplode>Explosion_EMP</soundExplode>
-								<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
-								<soundAmbient>MortarRound_Ambient</soundAmbient>
-								<postExplosionGasType>BlindSmoke</postExplosionGasType>
-								<preExplosionSpawnChance>1</preExplosionSpawnChance>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<explosionEffect>ExtinguisherExplosion</explosionEffect>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== Railgun Projectile ========================== -->
-
-						<ThingDef ParentName="Base90mmCannonShell">
-							<defName>Bullet_PanielRail</defName>
-							<label>Prototype Railgun Shot</label>
-							<graphicData>
-								<texPath>Things/Projectile/Charged/ChargeLanceShot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>400</speed>
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>600</damageAmountBase>
-								<soundExplode>MortarBomb_Explode</soundExplode>
-								<armorPenetrationSharp>500</armorPenetrationSharp>
-								<armorPenetrationBlunt>12000</armorPenetrationBlunt>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>250</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>1.5</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_PanielHowitzerShell_HE</defName>
-							<label>make Paniel HE Howitzer shells x2</label>
-							<description>Craft 2 Paniel HE Howitzer shells.</description>
-							<jobString>Making Paniel HE Howitzer shells.</jobString>
-							<workAmount>11600</workAmount>
-							<recipeUsers Inherit="False">
-								<li>PN_AutomatonBench</li>
-							</recipeUsers>
-							<researchPrerequisite>PNRP_AutoArtillery</researchPrerequisite>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Shell_60mmMortar_HE</li>
-										</thingDefs>
-									</filter>
-									<count>16</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-									<li>Shell_60mmMortar_HE</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_PanielHowitzerShell_HE>2</Ammo_PanielHowitzerShell_HE>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_PanielHowitzerShell_Incendiary</defName>
-							<label>make Paniel Incendiary Howitzer shells x2</label>
-							<description>Craft 2 Paniel Incendiary Howitzer shells.</description>
-							<jobString>Making Paniel Incendiary Howitzer shells.</jobString>
-							<workAmount>11600</workAmount>
-							<recipeUsers Inherit="False">
-								<li>PN_AutomatonBench</li>
-							</recipeUsers>
-							<researchPrerequisite>PNRP_AutoArtillery</researchPrerequisite>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Shell_60mmMortar_Incendiary</li>
-										</thingDefs>
-									</filter>
-									<count>16</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-									<li>Shell_60mmMortar_Incendiary</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_PanielHowitzerShell_Incendiary>2</Ammo_PanielHowitzerShell_Incendiary>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_PanielHowitzerShell_EMP</defName>
-							<label>make Paniel EMP Howitzer shells x2</label>
-							<description>Craft 2 Paniel EMP Howitzer shells.</description>
-							<jobString>Making Paniel EMP Howitzer shells.</jobString>
-							<workAmount>11600</workAmount>
-							<recipeUsers Inherit="False">
-								<li>PN_AutomatonBench</li>
-							</recipeUsers>
-							<researchPrerequisite>PNRP_AutoArtillery</researchPrerequisite>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Shell_60mmMortar_EMP</li>
-										</thingDefs>
-									</filter>
-									<count>16</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-									<li>Shell_60mmMortar_EMP</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_PanielHowitzerShell_EMP>2</Ammo_PanielHowitzerShell_EMP>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_PanielHowitzerShell_Smoke</defName>
-							<label>make Paniel Smoke Howitzer shells x2</label>
-							<description>Craft 2 Paniel Smoke Howitzer shells.</description>
-							<jobString>Making Paniel Smoke Howitzer shells.</jobString>
-							<workAmount>11600</workAmount>
-							<recipeUsers Inherit="False">
-								<li>PN_AutomatonBench</li>
-							</recipeUsers>
-							<researchPrerequisite>PNRP_AutoArtillery</researchPrerequisite>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Shell_60mmMortar_Smoke</li>
-										</thingDefs>
-									</filter>
-									<count>16</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-									<li>Shell_60mmMortar_Smoke</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_PanielHowitzerShell_Smoke>2</Ammo_PanielHowitzerShell_Smoke>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_PanielHowitzerShell_Firefoam</defName>
-							<label>make Paniel Firefoam Howitzer shells x2</label>
-							<description>Craft 2 Paniel firefoam Howitzer shells.</description>
-							<jobString>Making Paniel firefoam Howitzer shells.</jobString>
-							<workAmount>11600</workAmount>
-							<recipeUsers Inherit="False">
-								<li>PN_AutomatonBench</li>
-							</recipeUsers>
-							<researchPrerequisite>PNRP_AutoArtillery</researchPrerequisite>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Shell_60mmMortar_Firefoam</li>
-										</thingDefs>
-									</filter>
-									<count>16</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-									<li>Shell_60mmMortar_Firefoam</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_PanielHowitzerShell_Firefoam>2</Ammo_PanielHowitzerShell_Firefoam>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_PanielHowitzerShell_Anti</defName>
-							<label>make Paniel Antigrain Howitzer shell</label>
-							<description>Craft Paniel antigrain Howitzer shell.</description>
-							<jobString>Making Paniel antigrain Howitzer shell.</jobString>
-							<workAmount>1200</workAmount>
-							<recipeUsers Inherit="False">
-								<li>PN_AutomatonBench</li>
-							</recipeUsers>
-							<researchPrerequisite>PNRP_AutoArtillery</researchPrerequisite>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Shell_AntigrainWarhead</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Shell_AntigrainWarhead</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_PanielHowitzerShell_Anti>1</Ammo_PanielHowitzerShell_Anti>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_PanielHowitzerShell_AP</defName>
-							<label>make Paniel AP Howitzer shells x2</label>
-							<description>Craft 2 Paniel ap Howitzer shells.</description>
-							<jobString>Making Paniel ap Howitzer shells.</jobString>
-							<workAmount>11600</workAmount>
-							<recipeUsers Inherit="False">
-								<li>PN_AutomatonBench</li>
-							</recipeUsers>
-							<researchPrerequisite>PNRP_AutoArtillery</researchPrerequisite>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>76</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>7</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-									<li>FSX</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_PanielHowitzerShell_AP>2</Ammo_PanielHowitzerShell_AP>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_PanielRailShell</defName>
-							<label>make Paniel Railgun Shell</label>
-							<description>Craft Paniel Railgun Shell.</description>
-							<jobString>Making Paniel Railgun Shell.</jobString>
-							<workAmount>16000</workAmount>
-							<recipeUsers Inherit="False">
-								<li>PN_AutomatonBench</li>
-							</recipeUsers>
-							<researchPrerequisite Inherit="False">PNRP_Railgun</researchPrerequisite>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>50</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Uranium</li>
-										</thingDefs>
-									</filter>
-									<count>30</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentSpacer</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Uranium</li>
-									<li>ComponentSpacer</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_PanielRailShell>1</Ammo_PanielRailShell>
-							</products>
-						</RecipeDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@ParentName="PN_ShellBase"]</xpath>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Paniel the Automata/Bodies/Paniel_Bodytype.xml b/Patches/Paniel the Automata/Bodies/Paniel_Bodytype.xml
deleted file mode 100644
index 9da3586402..0000000000
--- a/Patches/Paniel the Automata/Bodies/Paniel_Bodytype.xml	
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Paniel the Automata</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!--Arm Groups-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="PanielBody"]/corePart/parts/li[def="PNShoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
-					<value>
-						<li>LeftArm</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="PanielBody"]/corePart/parts/li[def="PNShoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
-					<value>
-						<li>RightArm</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="PanielBody"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
-					<value>
-						<li>LeftShoulder</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="PanielBody"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
-					<value>
-						<li>RightShoulder</li>
-					</value>
-				</li>
-
-				<!--Natural Armor-->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="PanielBody"]//*[
-						def="PNTorso" or
-						def="PNNeck" or
-						def="PNHead" or
-						def="PNNose" or
-						def="PNJaw" or
-						def="PNEar" or
-						def="PNShoulder" or
-						def="PNArm" or
-						def="PNHand" or
-						def="PNFinger" or
-						def="PNLeg" or
-						def="PNFoot" or
-						def="PNToe" or
-						def="PNTail"]/groups
-					</xpath>
-
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Paniel the Automata/HediffDef/Hediff.xml b/Patches/Paniel the Automata/HediffDef/Hediff.xml
deleted file mode 100644
index 9dde8ecb5f..0000000000
--- a/Patches/Paniel the Automata/HediffDef/Hediff.xml	
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Paniel the Automata</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[
-						defName="PN_RapidFireModuleHediff"
-						]/stages/li/statOffsets/ShootingAccuracyPawn </xpath>
-					<value>
-						<ShootingAccuracyPawn>-0.2</ShootingAccuracyPawn>
-						<AimingAccuracy>-0.2</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[
-						defName="PN_CQCModuleHediff"
-						]/stages/li/statOffsets/ShootingAccuracyPawn </xpath>
-					<value>
-						<ShootingAccuracyPawn>-0.4</ShootingAccuracyPawn>
-						<AimingAccuracy>-0.2</AimingAccuracy>
-					</value>
-				</li>
-
-				<!-- ==========  Abilities  =========== -->
-
-				<li Class="PatchOperationFindMod">
-					<mods>
-						<li>Ideology</li>
-					</mods>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/HediffDef[
-									defName="PN_OfficerCommand" or
-									defName="PN_OfficerCommandBuff"
-									]/stages/li/statOffsets/ShootingAccuracyPawn </xpath>
-								<value>
-									<ShootingAccuracyPawn>0.4</ShootingAccuracyPawn>
-									<AimingAccuracy>0.2</AimingAccuracy>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/HediffDef[
-									defName="PN_RapidFire"
-									]/stages/li/statOffsets/ShootingAccuracyPawn </xpath>
-								<value>
-									<ShootingAccuracyPawn>-0.4</ShootingAccuracyPawn>
-									<AimingAccuracy>-0.4</AimingAccuracy>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/HediffDef[
-									defName="PN_RapidFireOverload"
-									]/stages/li/statOffsets/ShootingAccuracyPawn </xpath>
-								<value>
-									<ShootingAccuracyPawn>-0.6</ShootingAccuracyPawn>
-									<AimingAccuracy>-0.6</AimingAccuracy>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Paniel the Automata/PawnKindsDef_Paniel/PawnKinds_Misc.xml b/Patches/Paniel the Automata/PawnKindsDef_Paniel/PawnKinds_Misc.xml
deleted file mode 100644
index a4dead92b8..0000000000
--- a/Patches/Paniel the Automata/PawnKindsDef_Paniel/PawnKinds_Misc.xml	
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Paniel the Automata</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="PN_AssociateH" or
-						defName="PN_AssociateP_EngineerA" or
-						defName="PN_AssociateP_EngineerB" or
-						defName="PN_AssociateP_DomesticA" or
-						defName="PN_AssociateP_DomesticB"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>3</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="PN_ManagerH" or
-						defName="PN_ManageUnit_Enginer" or
-						defName="PN_ManageUnit_Domestic" or
-						defName="PN_Director" or
-						@Name="PN_NPCBasePawnKind"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="PN_GrenadePBase"]</xpath>
-					<value>
-						<li Inherit="False" Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>10</min>
-								<max>20</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>50</min>
-									<max>500</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>CE_Sidearm</li>
-								</weaponTags>
-								<magazineCount>
-									<min>1</min>
-									<max>2</max>
-								</magazineCount>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="PN_EliteCannonUnit"]</xpath>
-					<value>
-						<li Inherit="False" Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>15</min>
-								<max>20</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>500</min>
-									<max>1200</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>PN_Revolver</li>
-								</weaponTags>
-								<magazineCount>
-									<min>2</min>
-									<max>3</max>
-								</magazineCount>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="PN_SecurityGuardH" or
-						defName="PN_SecurityUnit" or
-						@Name="PN_MidUnitBase"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="PN_EliteUnitBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Paniel the Automata/ThingDefs_Buildings/Buildings_Turrets.xml b/Patches/Paniel the Automata/ThingDefs_Buildings/Buildings_Turrets.xml
deleted file mode 100644
index 33ef772a9a..0000000000
--- a/Patches/Paniel the Automata/ThingDefs_Buildings/Buildings_Turrets.xml	
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Paniel the Automata</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="PN_Artillery_Base_Core"]/thingClass</xpath>
-							<value>
-								<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="PN_Artillery_Base_Core"]/statBases</xpath>
-							<value>
-								<AimingAccuracy>0.25</AimingAccuracy>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="PN_Artillery_Base_Core"]/statBases/Mass</xpath>
-							<value>
-								<Mass>1000</Mass>
-							</value>
-						</li>
-						<!--
-			<li Class="PatchOperationRemove">
-				<xpath>Defs/ThingDef[@Name="PN_BaseArtilleryBuilding" ]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
-			</li>
-			-->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="PN_Artillery_Base_Core"]/fillPercent</xpath>
-							<value>
-								<fillPercent>0.85</fillPercent>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="PN_Artillery_Base_Core"]/building/turretBurstCooldownTime</xpath>
-							<value>
-								<turretBurstCooldownTime>1.1</turretBurstCooldownTime>
-							</value>
-						</li>
-
-						<!-- ==========  Paniel Cannon  =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>PN_Artillery_Turret</defName>
-							<statBases>
-								<SightsEfficiency>1.0</SightsEfficiency>
-								<ShotSpread>0.12</ShotSpread>
-								<SwayFactor>0.80</SwayFactor>
-								<Bulk>22.00</Bulk>
-								<Mass>18.50</Mass>
-								<RangedWeapon_Cooldown>1.55</RangedWeapon_Cooldown>
-							</statBases>
-							<Properties>
-								<recoilAmount>1.12</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_81mmMortarShell_HE</defaultProjectile>
-								<warmupTime>8</warmupTime>
-								<minRange>32</minRange>
-								<range>700</range>
-								<soundCast>PNCannonSound</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>12</muzzleFlashScale>
-								<circularError>1</circularError>
-								<indirectFirePenalty>0.2</indirectFirePenalty>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>1</magazineSize>
-								<reloadTime>7.8</reloadTime>
-								<reloadOneAtATime>true</reloadOneAtATime>
-								<ammoSet>AmmoSet_PanielHowitzerShell</ammoSet>
-							</AmmoUser>
-
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="PN_Artillery_Turret" ]/building/fixedStorageSettings</xpath>
-						</li>
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="PN_Artillery_Turret" ]/building/defaultStorageSettings</xpath>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="PN_Artillery_Turret" ]/comps/li[@Class="CompProperties_ChangeableProjectile"]</xpath>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName = "PN_Artillery_Turret"]/comps</xpath>
-							<value>
-								<li Class="CombatExtended.CompProperties_Charges">
-									<chargeSpeeds>
-										<li>30</li>
-										<li>50</li>
-										<li>70</li>
-										<li>90</li>
-									</chargeSpeeds>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="PN_Railgun_Base_Core"]/thingClass</xpath>
-							<value>
-								<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="PN_Railgun_Base_Core"]/statBases</xpath>
-							<value>
-								<AimingAccuracy>0.25</AimingAccuracy>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="PN_Railgun_Base_Core"]/statBases/Mass</xpath>
-							<value>
-								<Mass>1000</Mass>
-							</value>
-						</li>
-						<!--
-			<li Class="PatchOperationRemove">
-				<xpath>Defs/ThingDef[@Name="PN_BaseArtilleryBuilding" ]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
-			</li>
-			-->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="PN_Railgun_Base_Core"]/fillPercent</xpath>
-							<value>
-								<fillPercent>0.85</fillPercent>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="PN_Railgun_Base_Core"]/building/turretBurstCooldownTime</xpath>
-							<value>
-								<turretBurstCooldownTime>1.1</turretBurstCooldownTime>
-							</value>
-						</li>
-
-						<!-- ==========  Paniel Cannon  =========== -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>PN_Railgun_Turret</defName>
-							<statBases>
-								<SightsEfficiency>1.0</SightsEfficiency>
-								<ShotSpread>0.01</ShotSpread>
-								<SwayFactor>0.80</SwayFactor>
-								<Bulk>22.00</Bulk>
-								<Mass>18.50</Mass>
-								<RangedWeapon_Cooldown>1.55</RangedWeapon_Cooldown>
-							</statBases>
-							<Properties>
-								<recoilAmount>1.12</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_PanielRail</defaultProjectile>
-								<warmupTime>4</warmupTime>
-								<minRange>5</minRange>
-								<range>86</range>
-								<soundAiming>PN_PrototypeRailGun_Warmup_Sound</soundAiming>
-								<soundCast>PN_PrototypeRailGun_Fire_Sound</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>16</muzzleFlashScale>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>1</magazineSize>
-								<reloadTime>7.8</reloadTime>
-								<reloadOneAtATime>true</reloadOneAtATime>
-								<ammoSet>AmmoSet_PanielRailShell</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="PN_Railgun_Turret"]/building/fixedStorageSettings</xpath>
-						</li>
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="PN_Railgun_Turret"]/building/defaultStorageSettings</xpath>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="PN_Railgun_Turret" ]/comps/li[@Class="CompProperties_ChangeableProjectile"]</xpath>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Paniel the Automata/ThingDefs_Items/Items_Resources.xml b/Patches/Paniel the Automata/ThingDefs_Items/Items_Resources.xml
deleted file mode 100644
index 5c11d268fe..0000000000
--- a/Patches/Paniel the Automata/ThingDefs_Items/Items_Resources.xml	
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Paniel the Automata</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==========  Leather  =========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Automaton"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.05</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Paniel the Automata/ThingDefs_Misc/Paniel_Apparel.xml b/Patches/Paniel the Automata/ThingDefs_Misc/Paniel_Apparel.xml
deleted file mode 100644
index eb5a595dbd..0000000000
--- a/Patches/Paniel the Automata/ThingDefs_Misc/Paniel_Apparel.xml	
+++ /dev/null
@@ -1,334 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-
-		<mods>
-			<li>Paniel the Automata</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==========  Module  =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="PN_ApparelModuleBase"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-
-				<!--========= Stuffable =========-->
-
-				<!--Fabric-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PN_ApparelBasic"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PN_ApparelBasicHat"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PN_ApparelCape"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PN_ApparelCape"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!--Metallic-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PN_ApparelMilitia" or
-						defName="PN_ApparelWorker" or
-						defName="PN_ApparelMaid"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PN_ApparelMilitiaHat" or
-						defName="PN_ApparelWorkerHat" or
-						defName="PN_ApparelMaidHat"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5.5</StuffEffectMultiplierArmor>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PN_ApparelMilitia"]/statBases/Mass</xpath>
-					<value>
-						<Mass>8</Mass>
-						<Bulk>25</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PN_ApparelWorker" or
-						defName="PN_ApparelMaid"
-						]/statBases/Mass </xpath>
-					<value>
-						<Mass>6</Mass>
-						<Bulk>25</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<!-- Advanced -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PN_ApparelSoldier"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>9</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PN_ApparelSoldier"]/statBases/Mass</xpath>
-					<value>
-						<Mass>12</Mass>
-						<Bulk>28</Bulk>
-						<WornBulk>20</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PN_ApparelSoldier"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<CarryBulk>20</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PN_ApparelSoldierHat"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PN_ApparelSoldierHat"]/statBases/Mass</xpath>
-					<value>
-						<Mass>2</Mass>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.4</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PN_ApparelSoldierHat"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<AimingAccuracy>0.1</AimingAccuracy>
-					</value>
-				</li>
-
-				<!-- Security -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PN_EliteSecurityUniform"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PN_EliteSecurityUniform"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>40</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PN_EliteSecurityUniform"]/statBases/Mass</xpath>
-					<value>
-						<Mass>12</Mass>
-						<Bulk>28</Bulk>
-						<WornBulk>16</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PN_EliteSecurityUniform"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						<CarryBulk>25</CarryBulk>
-						<CarryWeight>10</CarryWeight>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PN_EliteSecurityHat"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PN_EliteSecurityHat"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>35</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PN_EliteSecurityHat"]/statBases/Mass</xpath>
-					<value>
-						<Mass>3</Mass>
-						<Bulk>2.5</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.70</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PN_EliteSecurityHat"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<AimingAccuracy>0.3</AimingAccuracy>
-					</value>
-				</li>
-
-				<!-- Advanced -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PN_ApparelRoyalguard"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>12</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PN_ApparelRoyalguard"]/statBases/Mass</xpath>
-					<value>
-						<Mass>16</Mass>
-						<Bulk>28</Bulk>
-						<WornBulk>22</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PN_ApparelRoyalguard"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						<CarryBulk>30</CarryBulk>
-						<CarryWeight>20</CarryWeight>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PN_ApparelRoyalguardHat"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>10</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PN_ApparelRoyalguardHat"]/statBases/Mass</xpath>
-					<value>
-						<Mass>5</Mass>
-						<Bulk>2.5</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PN_ApparelRoyalguardHat"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<AimingAccuracy>0.3</AimingAccuracy>
-					</value>
-				</li>
-
-				<!-- Advanced -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PN_ApparelRoyalmaid" or
-						defName="PN_ApparelRoyalmeister"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>8.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PN_ApparelRoyalmaid" or
-						defName="PN_ApparelRoyalmeister"]/statBases/Mass </xpath>
-					<value>
-						<Mass>8</Mass>
-						<Bulk>25</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PN_ApparelRoyalmaidHat" or
-						defName="PN_ApparelRoyalmeisterHat" or
-						defName="PN_ApparelRoyalmeisterHatWithMonocle" or
-						defName="PN_ApparelRoyalmeisterMonocle"]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PN_ApparelRoyalmaidHat" or
-						defName="PN_ApparelRoyalmeisterHat" or
-						defName="PN_ApparelRoyalmeisterHatWithMonocle" or
-						defName="PN_ApparelRoyalmeisterMonocle"]/statBases/Mass </xpath>
-					<value>
-						<Mass>2</Mass>
-						<Bulk>0.5</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PN_ApparelMilitia" or
-						defName="PN_ApparelMilitiaHat" or
-						defName="PN_ApparelSoldier" or
-						defName="PN_ApparelSoldierHat" or
-						defName="PN_ApparelWorker" or
-						defName="PN_ApparelWorkerHat" or
-						defName="PN_ApparelMaid" or
-						defName="PN_ApparelMaidHat" or
-						defName="PN_ApparelRoyalguard" or
-						defName="PN_ApparelRoyalguardHat" or
-						defName="PN_ApparelRoyalmaid" or
-						defName="PN_ApparelRoyalmaidHat"]/stuffCategories </xpath>
-					<value>
-						<stuffCategories>
-							<li>Steeled</li>
-						</stuffCategories>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Paniel the Automata/ThingDefs_Misc/Weapons.xml b/Patches/Paniel the Automata/ThingDefs_Misc/Weapons.xml
deleted file mode 100644
index fe66c359b5..0000000000
--- a/Patches/Paniel the Automata/ThingDefs_Misc/Weapons.xml	
+++ /dev/null
@@ -1,1111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Paniel the Automata</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==========  Shovel  =========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PN_Shovel"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.78</cooldownTime>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>2.38</cooldownTime>
-								<armorPenetrationBlunt>9</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.19</cooldownTime>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PN_Shovel"]/statBases</xpath>
-					<value>
-						<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
-						<Bulk>5.5</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PN_Shovel"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PN_Shovel"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.42</MeleeCritChance>
-						<MeleeParryChance>0.24</MeleeParryChance>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<!-- ==========  PN_Chainsword  =========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PN_Chainsword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.78</cooldownTime>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.19</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>39</power>
-								<cooldownTime>1</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.6</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PN_Chainsword"]/statBases</xpath>
-					<value>
-						<MeleeCounterParryBonus>0.39</MeleeCounterParryBonus>
-						<Bulk>6.5</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PN_Chainsword"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.08</MeleeCritChance>
-						<MeleeParryChance>0.24</MeleeParryChance>
-						<MeleeDodgeChance>1.07</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PN_Chainsword"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- ==========  Sword  =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PN_Chainlongsword"]/statBases</xpath>
-					<value>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-						<Bulk>13.5</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PN_Chainlongsword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.63</MeleeCritChance>
-							<MeleeParryChance>0.75</MeleeParryChance>
-							<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PN_Chainlongsword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>44</power>
-								<cooldownTime>1.57</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationBlunt>6.75</armorPenetrationBlunt>
-								<armorPenetrationSharp>13.5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>100</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<armorPenetrationSharp>8.1</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2.35</cooldownTime>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ==========  Hammer  =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PN_WarHammer"]/statBases</xpath>
-					<value>
-						<MeleeCounterParryBonus>0.28</MeleeCounterParryBonus>
-						<Bulk>14.5</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PN_WarHammer"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.6</MeleeCritChance>
-							<MeleeParryChance>0.38</MeleeParryChance>
-							<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PN_WarHammer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>2.67</cooldownTime>
-								<armorPenetrationBlunt>15.75</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Rifle =========== -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="PN_Rifle"]/verbs</xpath>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>PN_Rifle</defName>
-					<statBases>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.34</SwayFactor>
-						<Bulk>10.25</Bulk>
-						<Mass>3.19</Mass>
-						<RangedWeapon_Cooldown>0.78</RangedWeapon_Cooldown>
-						<WorkToMake>10000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>50</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-						<WoodLog>10</WoodLog>
-					</costList>
-
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>62</range>
-						<soundCast>PNRifleSound</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>0.65</reloadTime>
-						<ammoSet>AmmoSet_303British</ammoSet>
-						<reloadOneAtATime>true</reloadOneAtATime>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== Revolver =========== -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="PN_Revolver"]/verbs</xpath>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>PN_Revolver</defName>
-					<statBases>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>0.47</SwayFactor>
-						<Bulk>3.25</Bulk>
-						<Mass>1.40</Mass>
-						<RangedWeapon_Cooldown>0.49</RangedWeapon_Cooldown>
-						<WorkToMake>10000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-						<WoodLog>5</WoodLog>
-					</costList>
-
-					<Properties>
-						<recoilAmount>3.71</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_44Magnum_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<range>12</range>
-						<soundCast>Shot_Revolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>5.1</reloadTime>
-						<ammoSet>AmmoSet_44Magnum</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== Machinegun =========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>PN_Machinegun</defName>
-					<statBases>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.49</SwayFactor>
-						<Bulk>12.35</Bulk>
-						<Mass>10.00</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<WorkToMake>31000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>75</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-						<WoodLog>15</WoodLog>
-					</costList>
-
-					<Properties>
-						<recoilAmount>1.24</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<range>59</range>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>80</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_303British</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PN_Machinegun"]/weaponTags</xpath>
-					<value>
-						<li>Bipod_LMG</li>
-					</value>
-				</li>
-
-				<!-- ========== Portable Cannon =========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>PN_Cannon</defName>
-					<statBases>
-						<SightsEfficiency>2.60</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>2.58</SwayFactor>
-						<Bulk>19.85</Bulk>
-						<Mass>18.00</Mass>
-						<RangedWeapon_Cooldown>1.38</RangedWeapon_Cooldown>
-						<WorkToMake>19500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>120</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-						<WoodLog>25</WoodLog>
-					</costList>
-
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_20x110mmHispano_AP</defaultProjectile>
-						<warmupTime>2.8</warmupTime>
-						<range>41</range>
-						<soundCast>PNCannonSound</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
-						<reloadTime>2.2</reloadTime>
-						<ammoSet>AmmoSet_20x110mmHispano</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PN_Cannon"]/weaponTags</xpath>
-					<value>
-						<li>Bipod_ATR</li>
-					</value>
-				</li>
-
-				<!-- ========== Dual Royal Pistol =========== -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="PN_TwinPistol"]/verbs</xpath>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>PN_TwinPistol</defName>
-					<statBases>
-						<SightsEfficiency>0.60</SightsEfficiency>
-						<ShotSpread>1.70</ShotSpread>
-						<SwayFactor>1.14</SwayFactor>
-						<Bulk>5.50</Bulk>
-						<Mass>4.6</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<recoilAmount>1.25</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<burstShotCount>12</burstShotCount>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<range>14</range>
-						<soundCast>Shot_Revolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>36</magazineSize>
-						<reloadTime>5.5</reloadTime>
-						<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>6</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== Royal Rifle =========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>PN_RoyalRifle</defName>
-					<statBases>
-						<SightsEfficiency>2.60</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.37</SwayFactor>
-						<Bulk>9.05</Bulk>
-						<Mass>4.60</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<recoilAmount>2.28</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8x50mmCharged</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<range>62</range>
-						<soundCast>PNRoyalRifleSound</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>0.65</reloadTime>
-						<ammoSet>AmmoSet_8x50mmCharged</ammoSet>
-						<reloadOneAtATime>true</reloadOneAtATime>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== Royal Machinegun =========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>PN_RoyalMachinegun</defName>
-					<statBases>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.49</SwayFactor>
-						<Bulk>12.35</Bulk>
-						<Mass>10.00</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<recoilAmount>0.96</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<range>59</range>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<soundCast>PNRoyalMachinegunSound</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>120</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PN_RoyalMachinegun"]/weaponTags</xpath>
-					<value>
-						<li>Bipod_LMG</li>
-					</value>
-				</li>
-
-				<!-- ========== Royal Cannon =========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>PN_RoyalHeavySlug</defName>
-					<statBases>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.85</SwayFactor>
-						<Bulk>12.00</Bulk>
-						<Mass>4.6</Mass>
-						<RangedWeapon_Cooldown>0.83</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12x72mmCharged</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>31</range>
-						<soundCast>PNRoyalHCSound</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>0.95</reloadTime>
-						<ammoSet>AmmoSet_12x72mmCharged</ammoSet>
-						<reloadOneAtATime>true</reloadOneAtATime>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== Royal Launcher =========== -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="PN_RoyalLSW"]/verbs</xpath>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>PN_RoyalLSW</defName>
-					<statBases>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.87</SwayFactor>
-						<Bulk>12.05</Bulk>
-						<Mass>5.70</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<recoilAmount>1.89</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_40x53mmGrenade_HE</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_IncendiaryLauncher</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>5.5</reloadTime>
-						<ammoSet>AmmoSet_PanielLSWMulti</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>PN_PrototypeRailGun</defName>
-					<statBases>
-						<Mass>12.00</Mass>
-						<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>2.80</SwayFactor>
-						<Bulk>13.0</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_PanielRail</defaultProjectile>
-						<warmupTime>2.1</warmupTime>
-						<range>53</range>
-						<burstShotCount>1</burstShotCount>
-						<soundAiming>PN_PrototypeRailGun_Warmup_Sound</soundAiming>
-						<soundCast>PN_PrototypeRailGun_Fire_Sound</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<muzzleFlashScale>14</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PN_PrototypeRailGun"]/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>
-				</li>
-
-				<!-- ========== Melee Attacks =========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PN_Rifle" or
-						defName="PN_Machinegun" or
-						defName="PN_Cannon" or
-						defName="PN_RoyalRifle" or
-						defName="PN_RoyalHeavySlug" or
-						defName="PN_RoyalMachinegun" or
-						defName="PN_RoyalLSW"
-						]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PN_Revolver" or
-						defName="PN_TwinPistol"]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PN_TwinPistol"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>kick</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>2.36</cooldownTime>
-								<armorPenetrationBlunt>11.75</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Close Shot</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>0.36</cooldownTime>
-								<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PN_TwinPistol"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.10</MeleeCritChance>
-							<MeleeParryChance>0.70</MeleeParryChance>
-							<MeleeDodgeChance>0.50</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- ========== Cost Adjustments =========== -->
-
-				<!-- ========== Royalty Equipment =========== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="PN_RoyalSaber_Bladelink"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="PN_RoyalSaber_Bladelink"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>handle</label>
-											<capacities>
-												<li>Poke</li>
-											</capacities>
-											<power>3</power>
-											<cooldownTime>1.53</cooldownTime>
-											<chanceFactor>0.10</chanceFactor>
-											<armorPenetrationBlunt>0.968</armorPenetrationBlunt>
-											<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>edge</label>
-											<capacities>
-												<li>Cut</li>
-											</capacities>
-											<power>51</power>
-											<extraMeleeDamages>
-												<li>
-													<def>Flame</def>
-													<amount>8</amount>
-													<chance>0.3</chance>
-												</li>
-											</extraMeleeDamages>
-											<cooldownTime>1.03</cooldownTime>
-											<chanceFactor>0.66</chanceFactor>
-											<armorPenetrationBlunt>5.576</armorPenetrationBlunt>
-											<armorPenetrationSharp>29.04</armorPenetrationSharp>
-											<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>point</label>
-											<capacities>
-												<li>Stab</li>
-											</capacities>
-											<power>26</power>
-											<extraMeleeDamages>
-												<li>
-													<def>Flame</def>
-													<amount>5</amount>
-													<chance>0.2</chance>
-												</li>
-											</extraMeleeDamages>
-											<cooldownTime>0.96</cooldownTime>
-											<armorPenetrationBlunt>2.478</armorPenetrationBlunt>
-											<armorPenetrationSharp>38.72</armorPenetrationSharp>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="PN_RoyalSaber_Bladelink"]/statBases</xpath>
-								<value>
-									<Bulk>8.5</Bulk>
-									<MeleeCounterParryBonus>0.90</MeleeCounterParryBonus>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="PN_RoyalSaber_Bladelink"]</xpath>
-								<value>
-									<equippedStatOffsets>
-										<MeleeCritChance>1.10</MeleeCritChance>
-										<MeleeParryChance>0.70</MeleeParryChance>
-										<MeleeDodgeChance>0.50</MeleeDodgeChance>
-									</equippedStatOffsets>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="PN_Chainsword_Bladelink"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>handle</label>
-											<capacities>
-												<li>Poke</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>1.36</cooldownTime>
-											<armorPenetrationBlunt>0.605</armorPenetrationBlunt>
-											<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>edge</label>
-											<capacities>
-												<li>Cut</li>
-											</capacities>
-											<power>38</power>
-											<cooldownTime>0.74</cooldownTime>
-											<chanceFactor>1.33</chanceFactor>
-											<armorPenetrationBlunt>3.485</armorPenetrationBlunt>
-											<armorPenetrationSharp>21.78</armorPenetrationSharp>
-											<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>point</label>
-											<capacities>
-												<li>Stab</li>
-											</capacities>
-											<power>16</power>
-											<cooldownTime>0.85</cooldownTime>
-											<armorPenetrationBlunt>1.173</armorPenetrationBlunt>
-											<armorPenetrationSharp>30.24</armorPenetrationSharp>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs</xpath>
-								<value>
-									<DamageDef ParentName="Flame">
-										<defName>Flame_Nopenetration</defName>
-										<harmAllLayersUntilOutside>false</harmAllLayersUntilOutside>
-									</DamageDef>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="PN_Chainsword_Bladelink"]/statBases</xpath>
-								<value>
-									<Bulk>5.5</Bulk>
-									<MeleeCounterParryBonus>0.50</MeleeCounterParryBonus>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="PN_Chainsword_Bladelink"]</xpath>
-								<value>
-									<equippedStatOffsets>
-										<MeleeCritChance>1.10</MeleeCritChance>
-										<MeleeParryChance>0.50</MeleeParryChance>
-										<MeleeDodgeChance>0.37</MeleeDodgeChance>
-									</equippedStatOffsets>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="PN_RoyalHammer_Bladelink"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>handle</label>
-											<capacities>
-												<li>Poke</li>
-											</capacities>
-											<power>4</power>
-											<cooldownTime>1.62</cooldownTime>
-											<chanceFactor>0.10</chanceFactor>
-											<armorPenetrationBlunt>1.21</armorPenetrationBlunt>
-											<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>PN_ElectricalBluntTool</li>
-											</capacities>
-											<power>49</power>
-											<extraMeleeDamages>
-												<li>
-													<def>EMP</def>
-													<amount>8</amount>
-												</li>
-											</extraMeleeDamages>
-											<cooldownTime>2.24</cooldownTime>
-											<armorPenetrationBlunt>190.575</armorPenetrationBlunt>
-											<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-											<chanceFactor>0.30</chanceFactor>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="PN_RoyalHammer_Bladelink"]/statBases</xpath>
-								<value>
-									<Bulk>5.5</Bulk>
-									<MeleeCounterParryBonus>0.50</MeleeCounterParryBonus>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="PN_RoyalHammer_Bladelink"]</xpath>
-								<value>
-									<equippedStatOffsets>
-										<MeleeCritChance>1.60</MeleeCritChance>
-										<MeleeParryChance>0.40</MeleeParryChance>
-										<MeleeDodgeChance>0.40</MeleeDodgeChance>
-									</equippedStatOffsets>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="PN_StormLance_Bladelink"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>handle</label>
-											<capacities>
-												<li>Poke</li>
-											</capacities>
-											<power>3</power>
-											<cooldownTime>1.53</cooldownTime>
-											<chanceFactor>0.10</chanceFactor>
-											<armorPenetrationBlunt>0.968</armorPenetrationBlunt>
-											<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>side</label>
-											<capacities>
-												<li>PN_ElectricalBluntTool</li>
-											</capacities>
-											<power>28</power>
-											<extraMeleeDamages>
-												<li>
-													<def>EMP</def>
-													<amount>8</amount>
-												</li>
-											</extraMeleeDamages>
-											<cooldownTime>1.03</cooldownTime>
-											<chanceFactor>0.66</chanceFactor>
-											<armorPenetrationBlunt>111.6</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>point</label>
-											<capacities>
-												<li>PN_ElectricalStabTool</li>
-											</capacities>
-											<power>26</power>
-											<extraMeleeDamages>
-												<li>
-													<def>EMP</def>
-													<amount>8</amount>
-												</li>
-											</extraMeleeDamages>
-											<cooldownTime>0.96</cooldownTime>
-											<armorPenetrationBlunt>2.478</armorPenetrationBlunt>
-											<armorPenetrationSharp>38.72</armorPenetrationSharp>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="PN_StormLance_Bladelink"]/statBases</xpath>
-								<value>
-									<Bulk>5.5</Bulk>
-									<MeleeCounterParryBonus>0.50</MeleeCounterParryBonus>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="PN_StormLance_Bladelink"]</xpath>
-								<value>
-									<equippedStatOffsets>
-										<MeleeCritChance>1.60</MeleeCritChance>
-										<MeleeParryChance>0.40</MeleeParryChance>
-										<MeleeDodgeChance>0.40</MeleeDodgeChance>
-									</equippedStatOffsets>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Paniel the Automata/ThingDefs_Races/AlienRace_Paniel.xml b/Patches/Paniel the Automata/ThingDefs_Races/AlienRace_Paniel.xml
deleted file mode 100644
index bc758cdcd1..0000000000
--- a/Patches/Paniel the Automata/ThingDefs_Races/AlienRace_Paniel.xml	
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Paniel the Automata</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Paniel_Race"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Paniel_Race"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Paniel_Race"]/statBases</xpath>
-					<value>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<Suppressability>0.5</Suppressability>
-						<SmokeSensitivity>0</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Paniel_Race"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Paniel_Race"]/alienRace/raceRestriction/whiteApparelList</xpath>
-					<value>
-						<li>CE_Apparel_TacVest</li>
-						<li>CE_Apparel_Backpack</li>
-						<li>CE_Apparel_TribalBackpack</li>
-						<li>CE_Apparel_BallisticShield</li>
-						<li>CE_Apparel_MeleeShield</li>
-						<li>CE_Apparel_GasMask</li>
-						<li>CE_Apparel_ImprovGasMask</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Pawnbold Race/Body_Pawnbold.xml b/Patches/Pawnbold Race/Body_Pawnbold.xml
deleted file mode 100644
index 334b2f954e..0000000000
--- a/Patches/Pawnbold Race/Body_Pawnbold.xml	
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Pawnbold Race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==================== Pawnbold Body ==================== -->
-
-				<!-- ========== Add groups ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "right eye"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "left eye"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "left ear"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[customLabel = "right ear"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel = "left arm"]/groups</xpath>
-					<value>
-						<li>LeftArm</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel = "right arm"]/groups</xpath>
-					<value>
-						<li>RightArm</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
-					<value>
-						<li>LeftShoulder</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
-					<value>
-						<li>RightShoulder</li>
-					</value>
-				</li>
-
-				<!-- ========== Add armor coverage (for pawns with non-zero armor that use Pawnbold_Body body) ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def = "Neck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def = "Tail"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Jaw"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Nose"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Ear"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def = "Shoulder"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/parts/li[def = "Finger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def = "Leg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Pawnbold_Body"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/parts/li[def = "Toe"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Pawnbold Race/PawnKinds_Misc.xml b/Patches/Pawnbold Race/PawnKinds_Misc.xml
deleted file mode 100644
index 5b3824099d..0000000000
--- a/Patches/Pawnbold Race/PawnKinds_Misc.xml	
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Pawnbold Race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Give ammo to bowman ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Pawnbold_Archer" or defName="Pawnbold_Hunter" or defName="Pawnbold_HeavyArcher" or defName="Pawnbold_ChiefRanged"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>14</min>
-								<max>26</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>150</min>
-									<max>350</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>NeolithicMeleeBasic</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Pawnbold Race/Race_Pawnbold.xml b/Patches/Pawnbold Race/Race_Pawnbold.xml
deleted file mode 100644
index 64ed816852..0000000000
--- a/Patches/Pawnbold Race/Race_Pawnbold.xml	
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Pawnbold Race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Pawnbold_bold"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Pawnbold_bold"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Pawnbold_bold"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Pawnbold_bold"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Pawnbold_bold"]/race/baseBodySize</xpath>
-					<value>
-						<baseBodySize>0.6</baseBodySize>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Pawnbold_bold"]/statBases</xpath>
-					<value>
-						<CarryWeight>40</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-						<MeleeDodgeChance>1.1</MeleeDodgeChance>
-						<MeleeCritChance>0.4</MeleeCritChance>
-						<MeleeParryChance>0.5</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Pawnbold_bold"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.57</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.57</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.46</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Pawnbold Race/Scenarios_Misc.xml b/Patches/Pawnbold Race/Scenarios_Misc.xml
deleted file mode 100644
index 89123ac1a0..0000000000
--- a/Patches/Pawnbold Race/Scenarios_Misc.xml	
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Pawnbold Race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Starting Things ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="PawnboldLostTribe"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_Arrow_Stone</thingDef>
-							<count>100</count>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="PawnboldLostTribe"]/scenario/parts/li[thingDef="Pila" and @Class="ScenPart_StartingThing_Defined"]</xpath>
-					<value>
-						<count>10</count>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Penguin/Races_Penguin.xml b/Patches/Penguin/Races_Penguin.xml
deleted file mode 100644
index 634a4edba9..0000000000
--- a/Patches/Penguin/Races_Penguin.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>CutePenguin</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Penguin"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.14</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0.03</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Penguin"]/verbs</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.6</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetration>0.117</armorPenetration>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetration>0.08</armorPenetration>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Penguin"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Polarisbloc Core Lab/HediffDefs/Hediffs_CombatChip.xml b/Patches/Polarisbloc Core Lab/HediffDefs/Hediffs_CombatChip.xml
deleted file mode 100644
index 63bebaed14..0000000000
--- a/Patches/Polarisbloc Core Lab/HediffDefs/Hediffs_CombatChip.xml	
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Polarisbloc - Core LAB</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!--Combat Chip modes-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="PolarisCombatChip_Currency"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<ShootingAccuracyPawn>0.2</ShootingAccuracyPawn>
-						<AimingAccuracy>0.1</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="PolarisCombatChip_Sniper"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<AimingAccuracy>0.5</AimingAccuracy>
-						<ReloadSpeed>0.5</ReloadSpeed>
-						<Suppressability>-0.25</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="PolarisCombatChip_Scouter"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.87</MeleeDodgeChance>
-						<MeleeCritChance>0.04</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-						<Suppressability>-0.50</Suppressability>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Polarisbloc Security Force/Ammo/Ammo_Polaris.xml b/Patches/Polarisbloc Security Force/Ammo/Ammo_Polaris.xml
deleted file mode 100644
index ad14a90e85..0000000000
--- a/Patches/Polarisbloc Security Force/Ammo/Ammo_Polaris.xml	
+++ /dev/null
@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Polarisbloc - Security Force</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<CombatExtended.AmmoSetDef>
-									<defName>AmmoSet_6x24mmPolarisSF</defName>
-									<label>6x24mm Charged Bullet (Canicula)</label>
-									<ammoTypes>
-										<Ammo_6x24mmCharged>Bullet_6x24mmPolarisSF</Ammo_6x24mmCharged>
-										<Ammo_6x24mmCharged_AP>Bullet_6x24mmPolarisSF_AP</Ammo_6x24mmCharged_AP>
-										<Ammo_6x24mmCharged_Ion>Bullet_6x24mmPolarisSF_Ion</Ammo_6x24mmCharged_Ion>
-									</ammoTypes>
-								</CombatExtended.AmmoSetDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<ThingDef ParentName="Base6x24mmChargedBullet">
-									<defName>Bullet_6x24mmPolarisSF</defName>
-									<label>6x24mm Charged SF bullet</label>
-									<graphicData>
-										<texPath>PolarisblocSF/Projectile/Bullet_CaniculaRifle</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<speed>192</speed>
-										<damageAmountBase>7</damageAmountBase>
-										<secondaryDamage>
-											<li>
-												<def>Bomb_Secondary</def>
-												<amount>8</amount>
-											</li>
-										</secondaryDamage>
-										<armorPenetrationSharp>15</armorPenetrationSharp>
-										<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
-									</projectile>
-								</ThingDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<ThingDef ParentName="Base6x24mmChargedBullet">
-									<defName>Bullet_6x24mmPolarisSF_AP</defName>
-									<label>6x24mm Charged SF bullet (Conc.)</label>
-									<graphicData>
-										<texPath>PolarisblocSF/Projectile/Bullet_CaniculaRifle</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<speed>192</speed>
-										<damageAmountBase>5</damageAmountBase>
-										<secondaryDamage>
-											<li>
-												<def>Bomb_Secondary</def>
-												<amount>4</amount>
-											</li>
-										</secondaryDamage>
-										<armorPenetrationSharp>30</armorPenetrationSharp>
-										<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
-									</projectile>
-								</ThingDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<ThingDef ParentName="Base6x24mmChargedBullet">
-									<defName>Bullet_6x24mmPolarisSF_Ion</defName>
-									<label>6x24mm Charged SF bullet (Ion)</label>
-									<graphicData>
-										<texPath>PolarisblocSF/Projectile/Bullet_CaniculaRifle</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<speed>192</speed>
-										<damageAmountBase>5</damageAmountBase>
-										<secondaryDamage>
-											<li>
-												<def>EMP</def>
-												<amount>12</amount>
-											</li>
-										</secondaryDamage>
-										<armorPenetrationSharp>22.5</armorPenetrationSharp>
-										<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
-									</projectile>
-								</ThingDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<CombatExtended.AmmoSetDef>
-									<defName>AmmoSet_8x35mmPolarisSF</defName>
-									<label>8x35mm Charged Bullet (Canicula)</label>
-									<ammoTypes>
-										<Ammo_8x35mmCharged>Bullet_8x35mmPolarisSF</Ammo_8x35mmCharged>
-										<Ammo_8x35mmCharged_AP>Bullet_8x35mmPolarisSF_AP</Ammo_8x35mmCharged_AP>
-										<Ammo_8x35mmCharged_Ion>Bullet_8x35mmPolarisSF_Ion</Ammo_8x35mmCharged_Ion>
-									</ammoTypes>
-								</CombatExtended.AmmoSetDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<ThingDef ParentName="Base8x35mmChargedBullet">
-									<defName>Bullet_8x35mmPolarisSF</defName>
-									<label>8x35mm Charged SF bullet</label>
-									<graphicData>
-										<texPath>PolarisblocSF/Projectile/Bullet_CaniculaSniper</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageAmountBase>7</damageAmountBase>
-										<speed>192</speed>
-										<secondaryDamage>
-											<li>
-												<def>Bomb_Secondary</def>
-												<amount>12</amount>
-											</li>
-										</secondaryDamage>
-										<armorPenetrationSharp>15</armorPenetrationSharp>
-										<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
-									</projectile>
-								</ThingDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<ThingDef ParentName="Base8x35mmChargedBullet">
-									<defName>Bullet_8x35mmPolarisSF_AP</defName>
-									<label>8x35mm Charged SF bullet (Conc.)</label>
-									<graphicData>
-										<texPath>PolarisblocSF/Projectile/Bullet_CaniculaSniper</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageAmountBase>6</damageAmountBase>
-										<speed>192</speed>
-										<secondaryDamage>
-											<li>
-												<def>Bomb_Secondary</def>
-												<amount>4</amount>
-											</li>
-										</secondaryDamage>
-										<armorPenetrationSharp>30</armorPenetrationSharp>
-										<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
-									</projectile>
-								</ThingDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<ThingDef ParentName="Base8x35mmChargedBullet">
-									<defName>Bullet_8x35mmPolarisSF_Ion</defName>
-									<label>8x35mm Charged SF bullet (Ion)</label>
-									<graphicData>
-										<texPath>PolarisblocSF/Projectile/Bullet_CaniculaSniper</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageAmountBase>6</damageAmountBase>
-										<speed>192</speed>
-										<secondaryDamage>
-											<li>
-												<def>EMP</def>
-												<amount>18</amount>
-											</li>
-										</secondaryDamage>
-										<armorPenetrationSharp>22.5</armorPenetrationSharp>
-										<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
-									</projectile>
-								</ThingDef>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Polarisbloc Security Force/PawnKindDefs/PawnKinds_SecuirityForce.xml b/Patches/Polarisbloc Security Force/PawnKindDefs/PawnKinds_SecuirityForce.xml
deleted file mode 100644
index 7fc7b13da6..0000000000
--- a/Patches/Polarisbloc Security Force/PawnKindDefs/PawnKinds_SecuirityForce.xml	
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Polarisbloc - Security Force</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[defName="Polarisbloc_SFSoldier" or
-								defName="Polarisbloc_SFCaptain" or
-								defName="Polarisbloc_SFCommander"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>6</min>
-										<max>8</max>
-									</primaryMagazineCount>
-									<sidearms>
-										<li>
-											<generateChance>1</generateChance>
-											<sidearmMoney>
-												<min>200</min>
-												<max>400</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_Sidearm_Melee</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/PawnKindDef[defName="Polarisbloc_SFSoldier"]/combatPower</xpath>
-							<value>
-								<combatPower>185</combatPower>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/PawnKindDef[defName="Polarisbloc_SFSoldier"]/combatPower</xpath>
-							<value>
-								<combatPower>256</combatPower>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/PawnKindDef[defName="Polarisbloc_SFSoldier"]/combatPower</xpath>
-							<value>
-								<combatPower>270</combatPower>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Polarisbloc Security Force/Thingdefs_Misc/Apparel.xml b/Patches/Polarisbloc Security Force/Thingdefs_Misc/Apparel.xml
deleted file mode 100644
index 9529a3edcf..0000000000
--- a/Patches/Polarisbloc Security Force/Thingdefs_Misc/Apparel.xml	
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Polarisbloc - Security Force</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--Std Armor, 1/3 protection of devilstrand flak-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Polarisbloc_CygnusStandardArmor"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>1.35</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Polarisbloc_CygnusStandardArmor"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.3</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Polarisbloc_CygnusStandardArmor"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>0.2</MeleeDodgeChance>
-								<CarryBulk>20</CarryBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Polarisbloc_CygnusStandardArmor"]/statBases</xpath>
-							<value>
-								<Bulk>5</Bulk>
-								<WornBulk>3</WornBulk>
-							</value>
-						</li>
-
-						<!--Cap Armor, 1/2 protection of devilstrand flak-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Polarisbloc_CygnusStandardArmorC"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>2</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Polarisbloc_CygnusStandardArmorC"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.45</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Polarisbloc_CygnusStandardArmorC"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>0.25</MeleeDodgeChance>
-								<CarryBulk>20</CarryBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Polarisbloc_CygnusStandardArmorC"]/statBases</xpath>
-							<value>
-								<Bulk>5</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<!--Strategy Assistant-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Polarisbloc_AlkaidStrategyAssistant"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>0.05</MeleeDodgeChance>
-								<MeleeParryChance>0.05</MeleeParryChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Polarisbloc_AlkaidStrategyAssistant"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-							<value>
-								<ShootingAccuracyPawn>0.4</ShootingAccuracyPawn>
-								<AimingAccuracy>0.2</AimingAccuracy>
-								<Suppressability>-0.2</Suppressability>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Polarisbloc_AlkaidStrategyAssistant"]/statBases</xpath>
-							<value>
-								<Bulk>5</Bulk>
-								<WornBulk>0</WornBulk>
-							</value>
-						</li>
-
-						<!--Tac Goggles-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Polarisbloc_ThubanTacticalGoggles"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>4</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Polarisbloc_ThubanTacticalGoggles"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>6</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Polarisbloc_ThubanTacticalGoggles"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-							<value>
-								<ShootingAccuracyPawn>0.4</ShootingAccuracyPawn>
-								<AimingAccuracy>0.2</AimingAccuracy>
-								<MeleeCritChance>0.05</MeleeCritChance>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Polarisbloc Security Force/Thingdefs_Misc/Weapons.xml b/Patches/Polarisbloc Security Force/Thingdefs_Misc/Weapons.xml
deleted file mode 100644
index f905c861ed..0000000000
--- a/Patches/Polarisbloc Security Force/Thingdefs_Misc/Weapons.xml	
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Polarisbloc - Security Force</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Polarisbloc_CaniculaRifle" or
-								defName="Polarisbloc_CaniculaSniper"]/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>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Polarisbloc_CaniculaRifle</defName>
-							<statBases>
-								<Bulk>7.50</Bulk>
-								<Mass>2.7</Mass>
-								<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-								<SightsEfficiency>2.15</SightsEfficiency>
-								<SwayFactor>1.05</SwayFactor>
-								<ShotSpread>0.05</ShotSpread>
-							</statBases>
-							<Properties>
-								<recoilAmount>1.74</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_6x24mmPolarisSF</defaultProjectile>
-								<warmupTime>1.225</warmupTime>
-								<range>62</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-								<soundCast>Shot_ChargeRifle</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>30</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_6x24mmPolarisSF</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Polarisbloc_CaniculaSniper</defName>
-							<statBases>
-								<Bulk>19.00</Bulk>
-								<Mass>3.30</Mass>
-								<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-								<SightsEfficiency>2.51</SightsEfficiency>
-								<SwayFactor>1.57</SwayFactor>
-								<ShotSpread>0.01</ShotSpread>
-							</statBases>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_8x35mmPolarisSF</defaultProjectile>
-								<warmupTime>1.525</warmupTime>
-								<range>78</range>
-								<soundCast>ChargeLance_Fire</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>9</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_8x35mmPolarisSF</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Poleepkwa Race/New_Prawns.xml b/Patches/Poleepkwa Race/New_Prawns.xml
deleted file mode 100644
index 479a657298..0000000000
--- a/Patches/Poleepkwa Race/New_Prawns.xml	
+++ /dev/null
@@ -1,195 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Poleepkwa Race Update</li>
-			<li>Poleepkwa Race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ========== Tribals ========== -->
-
-						<PawnKindDef>
-							<defName>PpGrenadier</defName>
-							<race>Poleepkwa</race>
-							<label>boomer</label>
-							<initialWillRange>1~3</initialWillRange>
-							<initialResistanceRange>12~19</initialResistanceRange>
-							<combatPower>60</combatPower>
-							<defaultFactionType>PoleepkwaFaction</defaultFactionType>
-							<backstoryCategories>
-								<li>Tribal</li>
-							</backstoryCategories>
-							<maxGenerationAge>60</maxGenerationAge>
-							<chemicalAddictionChance>0.05</chemicalAddictionChance>
-							<invNutrition>2.55</invNutrition>
-							<invFoodDef>Pemmican</invFoodDef>
-							<canBeSapper>true</canBeSapper>
-							<gearHealthRange>
-								<min>0.5</min>
-								<max>1.8</max>
-							</gearHealthRange>
-							<apparelMoney>
-								<min>180</min>
-								<max>350</max>
-							</apparelMoney>
-							<apparelRequired>
-								<li>Apparel_WarVeil</li>
-								<li>CE_Apparel_TribalBackpack</li>
-							</apparelRequired>
-							<apparelTags>
-								<li>Tribal</li>
-							</apparelTags>
-							<weaponMoney>
-								<min>60</min>
-								<max>400</max>
-							</weaponMoney>
-							<weaponTags>
-								<li>CE_GrenadeNeolithic</li>
-							</weaponTags>
-							<techHediffsMoney>
-								<min>50</min>
-								<max>800</max>
-							</techHediffsMoney>
-							<techHediffsTags>
-								<li>Poor</li>
-								<li>Simple</li>
-							</techHediffsTags>
-							<techHediffsChance>0.33</techHediffsChance>
-							<modExtensions>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>6</min>
-										<max>14</max>
-									</primaryMagazineCount>
-									<forcedSidearm>
-										<sidearmMoney>
-											<min>80</min>
-											<max>160</max>
-										</sidearmMoney>
-										<weaponTags>
-											<li>CE_Sidearm_Tribal</li>
-										</weaponTags>
-									</forcedSidearm>
-								</li>
-							</modExtensions>
-						</PawnKindDef>
-
-						<PawnKindDef>
-							<defName>PpGunner</defName>
-							<race>Poleepkwa</race>
-							<label>thunderer</label>
-							<initialWillRange>3~5</initialWillRange>
-							<initialResistanceRange>20~34</initialResistanceRange>
-							<combatPower>60</combatPower>
-							<defaultFactionType>PoleepkwaFaction</defaultFactionType>
-							<backstoryCategories>
-								<li>Tribal</li>
-							</backstoryCategories>
-							<maxGenerationAge>60</maxGenerationAge>
-							<chemicalAddictionChance>0.05</chemicalAddictionChance>
-							<invNutrition>2.55</invNutrition>
-							<invFoodDef>Pemmican</invFoodDef>
-							<gearHealthRange>
-								<min>0.5</min>
-								<max>1.8</max>
-							</gearHealthRange>
-							<apparelMoney>
-								<min>180</min>
-								<max>350</max>
-							</apparelMoney>
-							<apparelTags>
-								<li>Tribal</li>
-							</apparelTags>
-							<apparelRequired>
-								<li>Apparel_WarMask</li>
-							</apparelRequired>
-							<weaponMoney>
-								<min>180</min>
-								<max>290</max>
-							</weaponMoney>
-							<weaponTags>
-								<li>Gun</li>
-							</weaponTags>
-							<techHediffsMoney>
-								<min>50</min>
-								<max>800</max>
-							</techHediffsMoney>
-							<techHediffsTags>
-								<li>Poor</li>
-								<li>Simple</li>
-							</techHediffsTags>
-							<techHediffsChance>0.20</techHediffsChance>
-							<modExtensions>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>4</max>
-									</primaryMagazineCount>
-									<shieldMoney>
-										<min>120</min>
-										<max>160</max>
-									</shieldMoney>
-									<shieldTags>
-										<li>TribalShield</li>
-									</shieldTags>
-									<shieldChance>0.9</shieldChance>
-									<sidearms>
-										<li>
-											<sidearmMoney>
-												<min>100</min>
-												<max>600</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_Sidearm_Tribal</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</modExtensions>
-						</PawnKindDef>
-					</value>
-				</li>
-
-				<!-- ========== Add tribal grenadies ========== -->
-
-				<li Class="PatchOperationAdd"><!-- Combat -->
-					<xpath>Defs/FactionDef[defName="PoleepkwaFaction"]/pawnGroupMakers/li[1]/options</xpath>
-					<value>
-						<PpGrenadier>5</PpGrenadier>
-						<PpGunner>10</PpGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Peaceful -->
-					<xpath>Defs/FactionDef[defName="PoleepkwaFaction"]/pawnGroupMakers/li[2]/options</xpath>
-					<value>
-						<PpGrenadier>6</PpGrenadier>
-						<PpGunner>6</PpGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Trader -->
-					<xpath>Defs/FactionDef[defName="PoleepkwaFaction"]/pawnGroupMakers/li[3]/guards</xpath>
-					<value>
-						<PpGrenadier>4</PpGrenadier>
-						<PpGunner>8</PpGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Settlement -->
-					<xpath>Defs/FactionDef[defName="PoleepkwaFaction"]/pawnGroupMakers/li[4]/options</xpath>
-					<value>
-						<PpGrenadier>8</PpGrenadier>
-						<PpGunner>12</PpGunner>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Poleepkwa Race/Patch_Bodies_Prawny.xml b/Patches/Poleepkwa Race/Patch_Bodies_Prawny.xml
deleted file mode 100644
index 74abba5bf0..0000000000
--- a/Patches/Poleepkwa Race/Patch_Bodies_Prawny.xml	
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Poleepkwa Race Update</li>
-			<li>Poleepkwa Race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Changing coverage of the bodyDef (should've done this sooner, but eh) -->
-				<!-- why yes dear explorer of this file, i did just literally copy and paste the PoleepkwaBody bodytype patches -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="PoleepkwaBody"]/corePart/parts/li[def="Ribcage"]/coverage</xpath>
-					<value>
-						<coverage>0.07</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="PoleepkwaBody"]/corePart/parts/li[def="Pelvis"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="PoleepkwaBody"]/corePart/parts/li[def="Stomach"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="PoleepkwaBody"]/corePart/parts/li[def="Heart"]/coverage</xpath>
-					<value>
-						<coverage>0.04</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="PoleepkwaBody"]/corePart/parts/li[def="Lung"]/coverage</xpath>
-					<value>
-						<coverage>0.055</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="PoleepkwaBody"]/corePart/parts/li[def="Kidney"]/coverage</xpath>
-					<value>
-						<coverage>0.03</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="PoleepkwaBody"]/corePart/parts/li[def="Liver"]/coverage</xpath>
-					<value>
-						<coverage>0.06</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="PoleepkwaBody"]/corePart/parts/li[def="Neck"]/coverage</xpath>
-					<value>
-						<coverage>0.055</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="PoleepkwaBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Skull"]/parts/li[def="Brain"]/coverage</xpath>
-					<value>
-						<coverage>0.9</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="PoleepkwaBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Eye"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="PoleepkwaBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="PoleepkwaBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/coverage</xpath>
-					<value>
-						<coverage>0.08</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="PoleepkwaBody"]/corePart/parts/li[def="Shoulder"]/coverage</xpath>
-					<value>
-						<coverage>0.085</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="PoleepkwaBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Clavicle"]/coverage</xpath>
-					<value>
-						<coverage>0.06</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="PoleepkwaBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Humerus"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="PoleepkwaBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Radius"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="PoleepkwaBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Femur"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="PoleepkwaBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Tibia"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-
-				<!-- Natural Armor -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="PoleepkwaBody"]//*[
-						def="Torso" or
-						def="Neck" or
-						def="Head" or
-						def="Jaw" or
-						def="Ear" or
-						def="Nose" or
-						def="Shoulder" or
-						def="Arm" or
-						def="Hand" or
-						def="Finger" or
-						def="Leg" or
-						def="Toe" or
-						def="Foot"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="PoleepkwaBody"]//*[
-						def="Nose" or
-						def="Jaw" or
-						def="Eye" ]/groups
-					</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Poleepkwa Race/Patch_PawnKinds_Prawn.xml b/Patches/Poleepkwa Race/Patch_PawnKinds_Prawn.xml
deleted file mode 100644
index 3de590669d..0000000000
--- a/Patches/Poleepkwa Race/Patch_PawnKinds_Prawn.xml	
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Poleepkwa Race Update</li>
-			<li>Poleepkwa Race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Tribal -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Poleepkwa_Warrior" or defName="Poleepkwa_Worker" ]/combatPower</xpath>
-					<value>
-						<combatPower>30</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Poleepkwa_Archer"]/combatPower</xpath>
-					<value>
-						<combatPower>30</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Poleepkwa_CaravanSoldier"]/combatPower</xpath>
-					<value>
-						<combatPower>40</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Poleepkwa_Leader"]/combatPower</xpath>
-					<value>
-						<combatPower>75</combatPower>
-					</value>
-				</li>
-
-				<!-- Hive_Archer -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Poleepkwa_Archer" or defName="Poleepkwa_CaravanSoldier"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>20</min>
-								<max>40</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>100</min>
-								<max>140</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.6</shieldChance>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>40</min>
-										<max>80</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Tribal</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- Hiver_Warrior -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Poleepkwa_Warrior" or defName="Poleepkwa_CaravanSoldier"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>100</min>
-								<max>200</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.75</shieldChance>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Poleepkwa Race/Patch_Race_Prawns.xml b/Patches/Poleepkwa Race/Patch_Race_Prawns.xml
deleted file mode 100644
index c13f57405d..0000000000
--- a/Patches/Poleepkwa Race/Patch_Race_Prawns.xml	
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Poleepkwa Race Update</li>
-			<li>Poleepkwa Race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Poleepkwa"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Poleepkwa"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<Suppressability>1</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Poleepkwa"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.24</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.24</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationSharp>0.14</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.24</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationSharp>0.14</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.24</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>3.4</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Poleepkwa"]</xpath>
-					<value>
-						<comps />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Poleepkwa"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Possesed Weapons/PossessedWeapons_Ammo.xml b/Patches/Possesed Weapons/PossessedWeapons_Ammo.xml
deleted file mode 100644
index c2d702b123..0000000000
--- a/Patches/Possesed Weapons/PossessedWeapons_Ammo.xml	
+++ /dev/null
@@ -1,271 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Possessed Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Dragonfire Ammo Sets -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!--CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_LesserDragonFireArrow</defName>
-							<label>great arrows</label>
-							<ammoTypes>
-								<Ammo_GreatArrow_Stone>Projectile_LesserDragonFireArrow</Ammo_GreatArrow_Stone>
-								<Ammo_GreatArrow_Steel>Projectile_LesserDragonFireArrow</Ammo_GreatArrow_Steel>
-								<Ammo_GreatArrow_Venom>Projectile_LesserDragonFireArrow</Ammo_GreatArrow_Venom>
-								<Ammo_GreatArrow_Flame>Projectile_LesserDragonFireArrow</Ammo_GreatArrow_Flame>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef-->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_DragonFireArrow</defName>
-							<label>great arrows</label>
-							<ammoTypes>
-								<Ammo_GreatArrow_Stone>Projectile_DragonFireArrow</Ammo_GreatArrow_Stone>
-								<Ammo_GreatArrow_Steel>Projectile_DragonFireArrow</Ammo_GreatArrow_Steel>
-								<Ammo_GreatArrow_Venom>Projectile_DragonFireArrow</Ammo_GreatArrow_Venom>
-								<Ammo_GreatArrow_Flame>Projectile_DragonFireArrow</Ammo_GreatArrow_Flame>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!--ThingDef ParentName="BaseGreatArrowProjectile">
-							<defName>Projectile_LesserDragonFireArrow</defName>
-							<label>dragon fire arrow</label>
-							<graphicData>
-								<texPath>Things/Projectile/DragonfireArrow</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>30</speed>
-								<damageDef>BotchJob_LesserDragonfireArrow</damageDef>
-								<damageAmountBase>7</damageAmountBase>
-								<explosionRadius>2</explosionRadius>
-								<ai_IsIncendiary>true</ai_IsIncendiary>
-								<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
-								<preExplosionSpawnChance>0.33</preExplosionSpawnChance>
-							</projectile>
-						</ThingDef-->
-
-						<ThingDef ParentName="BaseGreatArrowProjectile">
-							<defName>Projectile_DragonFireArrow</defName>
-							<label>dragon fire arrow</label>
-							<graphicData>
-								<texPath>Things/Projectile/DragonfireArrow</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>30</speed>
-								<damageDef>BotchJob_DragonfireArrow</damageDef>
-								<damageAmountBase>15</damageAmountBase>
-								<explosionRadius>3</explosionRadius>
-								<ai_IsIncendiary>true</ai_IsIncendiary>
-								<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
-								<preExplosionSpawnChance>0.33</preExplosionSpawnChance>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-				<!-- Ammo for Verdant Bow -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- Verdant Bow -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_VerdantArrow</defName>
-							<label>verdant arrows</label>
-							<ammoTypes>
-								<Ammo_Arrow_Stone>Projectile_VerdantArrow_Stone</Ammo_Arrow_Stone>
-								<Ammo_Arrow_Steel>Projectile_VerdantArrow_Steel</Ammo_Arrow_Steel>
-								<Ammo_Arrow_Plasteel>Projectile_VerdantArrow_Plasteel</Ammo_Arrow_Plasteel>
-								<Ammo_Arrow_Venom>Projectile_VerdantArrow_Venom</Ammo_Arrow_Venom>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_VerdantMOArrow</defName>
-							<label>verdant arrows</label>
-							<ammoTypes>
-								<Ammo_Arrow_Stone>Projectile_VerdantArrow_Stone</Ammo_Arrow_Stone>
-								<Ammo_Arrow_Steel>Projectile_VerdantArrow_Steel</Ammo_Arrow_Steel>
-								<Ammo_Arrow_Venom>Projectile_VerdantArrow_Venom</Ammo_Arrow_Venom>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef ParentName="BaseStreamlinedArrowProjectile">
-							<defName>Projectile_VerdantArrow_Stone</defName>
-							<label>verdant arrow (stone)</label>
-							<graphicData>
-								<texPath>Things/Projectile/VerdantBowArrow</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>40</speed>
-								<damageAmountBase>9</damageAmountBase>
-								<armorPenetrationSharp>0.6</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.9</armorPenetrationBlunt>
-								<preExplosionSpawnChance>0.2</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Ammo_Arrow_Stone</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseStreamlinedArrowProjectile">
-							<defName>Projectile_VerdantArrow_Steel</defName>
-							<label>verdant arrow (steel)</label>
-							<graphicData>
-								<texPath>Things/Projectile/VerdantBowArrow</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>10</damageAmountBase>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>6.4</armorPenetrationBlunt>
-								<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Ammo_Arrow_Steel</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseStreamlinedArrowProjectile">
-							<defName>Projectile_VerdantArrow_Plasteel</defName>
-							<label>verdant arrow (plasteel)</label>
-							<graphicData>
-								<texPath>Things/Projectile/VerdantBowArrow</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>50</speed>
-								<damageAmountBase>9</damageAmountBase>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.54</armorPenetrationBlunt>
-								<preExplosionSpawnChance>0.75</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Ammo_Arrow_Plasteel</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseStreamlinedArrowProjectile">
-							<defName>Projectile_VerdantArrow_Venom</defName>
-							<label>verdant arrow (venom)</label>
-							<graphicData>
-								<texPath>Things/Projectile/VerdantBowArrow</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>ArrowVenom</damageDef>
-								<damageAmountBase>10</damageAmountBase>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>6.4</armorPenetrationBlunt>
-								<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Ammo_Arrow_Steel</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- Ammo for Ghostly Flintlock -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- Ghostly Flintlock -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_GhostFlintlock_MusketBall</defName>
-							<label>musket ball</label>
-							<ammoTypes>
-								<Ammo_MusketBall>Projectile_GhostFlintlock_MusketBall</Ammo_MusketBall>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef ParentName="BaseStreamlinedArrowProjectile">
-							<defName>Projectile_GhostFlintlock_MusketBall</defName>
-							<label>musket ball</label>
-							<graphicData>
-								<texPath>Things/Projectile/BotchJob_GhostBullet</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>BotchJob_GhostBlast</damageDef>
-								<speed>35</speed>
-								<damageAmountBase>4</damageAmountBase>
-								<armorPenetrationSharp>3.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-								<explosionRadius>1</explosionRadius>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-				<!-- Ammo for Ghostly Flintlock -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- Ghostly Flintlock -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_GhostFlintlock_MusketBall</defName>
-							<label>musket ball</label>
-							<ammoTypes>
-								<Ammo_MusketBall>Projectile_GhostFlintlock_MusketBall</Ammo_MusketBall>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef ParentName="BaseStreamlinedArrowProjectile">
-							<defName>Projectile_GhostFlintlock_MusketBall</defName>
-							<label>musket ball</label>
-							<graphicData>
-								<texPath>Things/Projectile/BotchJob_GhostBullet</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>BotchJob_GhostBlast</damageDef>
-								<speed>30</speed>
-								<damageAmountBase>6</damageAmountBase>
-								<pelletCount>6</pelletCount>
-								<armorPenetrationSharp>3.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.14</armorPenetrationBlunt>
-								<spreadMult>5</spreadMult>
-								<explosionRadius>1</explosionRadius>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseStreamlinedArrowProjectile">
-							<defName>Projectile_EarthenGauntlet_RockBlast</defName>
-							<label>rock blast</label>
-							<graphicData>
-								<texPath>Things/Projectile/BotchJob_RockSmash</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>BotchJob_RockSmash</damageDef>
-								<speed>18</speed>
-								<damageAmountBase>15</damageAmountBase>
-								<armorPenetrationBlunt>60</armorPenetrationBlunt>
-								<explosionRadius>2.7</explosionRadius>
-								<arcHeightFactor>1.2</arcHeightFactor>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/DamageDef[defName="BotchJob_RockSmash"]</xpath>
-					<value>
-						<buildingDamageFactor>3</buildingDamageFactor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Possesed Weapons/PossessedWeapons_MeleePatch.xml b/Patches/Possesed Weapons/PossessedWeapons_MeleePatch.xml
deleted file mode 100644
index d7b4dde33e..0000000000
--- a/Patches/Possesed Weapons/PossessedWeapons_MeleePatch.xml	
+++ /dev/null
@@ -1,628 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Possessed Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--=============================== Melee ================================-->
-
-				<!--=============================== Scourge Blade ================================-->
-
-				<!--li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_ScourgeBlade"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<chanceFactor>0.1</chanceFactor>
-								<cooldownTime>1.69</cooldownTime>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>BotchJob_ToxicCut</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>2.06</cooldownTime>
-								<armorPenetrationBlunt>3.2</armorPenetrationBlunt>
-								<armorPenetrationSharp>16</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>BotchJob_ToxicStab</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>0.99</cooldownTime>
-								<armorPenetrationBlunt>3.24</armorPenetrationBlunt>
-								<armorPenetrationSharp>32.4</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_ScourgeBlade"]/statBases</xpath>
-					<value>
-						<Bulk>8.5</Bulk>
-						<MeleeCounterParryBonus>0.80</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_ScourgeBlade"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>1.00</MeleeCritChance>
-						<MeleeParryChance>0.60</MeleeParryChance>
-						<MeleeDodgeChance>0.4</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="BotchJob_ScourgeBlade"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="BotchJob_ScourgeBlade"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_ScourgeBlade"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li-->
-
-				<!--=============================== Possessed Scourge Blade ================================-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_PossessedScourgeBlade"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<chanceFactor>0.1</chanceFactor>
-								<cooldownTime>1.52</cooldownTime>
-								<armorPenetrationBlunt>0.97</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>BotchJob_ToxicCut</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>1.85</cooldownTime>
-								<armorPenetrationBlunt>3.87</armorPenetrationBlunt>
-								<armorPenetrationSharp>19.36</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>BotchJob_ToxicStab</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>0.89</cooldownTime>
-								<armorPenetrationBlunt>3.92</armorPenetrationBlunt>
-								<armorPenetrationSharp>39.2</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_PossessedScourgeBlade"]/statBases</xpath>
-					<value>
-						<Bulk>8.5</Bulk>
-						<MeleeCounterParryBonus>1.2</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_PossessedScourgeBlade"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>1.00</MeleeCritChance>
-						<MeleeParryChance>0.69</MeleeParryChance>
-						<MeleeDodgeChance>0.46</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<!--=============================== Glacial Cleaver ================================-->
-				<!--li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_GlacialCleaver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<chanceFactor>0.1</chanceFactor>
-								<cooldownTime>0.99</cooldownTime>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>BotchJob_FrostCut</li>
-								</capacities>
-								<power>46</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Frostbite</def>
-										<amount>8</amount>
-										<chance>0.3</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>1.92</cooldownTime>
-								<armorPenetrationBlunt>6.48</armorPenetrationBlunt>
-								<armorPenetrationSharp>19.24</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_GlacialCleaver"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>0.13</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_GlacialCleaver"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-						<MeleeDodgeChance>0.20</MeleeDodgeChance>
-					</value>
-				</li-->
-
-				<!--=============================== Possessed Glaciar Cleaver ================================-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_PossessedGlacialCleaver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<chanceFactor>0.1</chanceFactor>
-								<cooldownTime>0.89</cooldownTime>
-								<armorPenetrationBlunt>7.26</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>BotchJob_FrostCut</li>
-								</capacities>
-								<power>46</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Frostbite</def>
-										<amount>9</amount>
-										<chance>0.3</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>1.73</cooldownTime>
-								<armorPenetrationBlunt>7.84</armorPenetrationBlunt>
-								<armorPenetrationSharp>23.28</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_PossessedGlacialCleaver"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_PossessedGlacialCleaver"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>0.12</MeleeParryChance>
-						<MeleeDodgeChance>0.23</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<!--=============================== Sanctified Sword ================================-->
-				<!--li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_SanctifiedSword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<chanceFactor>0.1</chanceFactor>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>2.4</cooldownTime>
-								<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>2.4</cooldownTime>
-								<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
-								<armorPenetrationSharp>25</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_SanctifiedSword"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>0.8</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_SanctifiedSword"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>0.6</MeleeParryChance>
-						<MeleeDodgeChance>0.4</MeleeDodgeChance>
-					</value>
-				</li-->
-
-				<!--=============================== Possessed Sanctified Sword ================================-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_PossessedSanctifiedSword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<chanceFactor>0.1</chanceFactor>
-								<cooldownTime>1.44</cooldownTime>
-								<armorPenetrationBlunt>0.61</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>2.16</cooldownTime>
-								<armorPenetrationBlunt>3.48</armorPenetrationBlunt>
-								<armorPenetrationSharp>21.78</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>2.16</cooldownTime>
-								<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
-								<armorPenetrationSharp>30.25</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_PossessedSanctifiedSword"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>0.92</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_PossessedSanctifiedSword"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>0.69</MeleeParryChance>
-						<MeleeDodgeChance>0.46</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<!--=============================== Volcanic Maul ================================-->
-				<!--li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_VolcanicMaul"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>13</power>
-								<chanceFactor>0.1</chanceFactor>
-								<cooldownTime>2.67</cooldownTime>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>93</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Flame</def>
-										<amount>8</amount>
-										<chance>0.3</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>3.47</cooldownTime>
-								<armorPenetrationBlunt>45</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_VolcanicMaul"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_VolcanicMaul"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.5</MeleeCritChance>
-							<MeleeParryChance>0.3</MeleeParryChance>
-							<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li-->
-
-				<!--=============================== Possessed Volcanic Sword ================================-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_PossessedVolcanicMaul"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>13</power>
-								<chanceFactor>0.1</chanceFactor>
-								<cooldownTime>2.4</cooldownTime>
-								<armorPenetrationBlunt>6.05</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>93</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Flame</def>
-										<amount>8</amount>
-										<chance>0.3</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>3.12</cooldownTime>
-								<armorPenetrationBlunt>54.45</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_PossessedVolcanicMaul"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>0.46</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_PossessedVolcanicMaul"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>1.5</MeleeCritChance>
-						<MeleeParryChance>0.35</MeleeParryChance>
-						<MeleeDodgeChance>0.35</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<!--=============================== Craghammer ================================-->
-				<!--li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_Craghammer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>11</power>
-								<chanceFactor>0.1</chanceFactor>
-								<cooldownTime>2.52</cooldownTime>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Demolish</li>
-								</capacities>
-								<power>76</power>
-								<cooldownTime>3.28</cooldownTime>
-								<armorPenetrationBlunt>36</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_Craghammer"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_Craghammer"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>1.5</MeleeCritChance>
-						<MeleeParryChance>0.3</MeleeParryChance>
-						<MeleeDodgeChance>0.3</MeleeDodgeChance>
-					</value>
-				</li-->
-
-				<!--=============================== Possessed Sanctified Sword ================================-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_PossessedCraghammer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>11</power>
-								<chanceFactor>0.1</chanceFactor>
-								<cooldownTime>2.27</cooldownTime>
-								<armorPenetrationBlunt>4.84</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Demolish</li>
-								</capacities>
-								<power>76</power>
-								<cooldownTime>2.95</cooldownTime>
-								<armorPenetrationBlunt>43.56</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_PossessedCraghammer"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>0.46</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_PossessedCraghammer"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>1.5</MeleeCritChance>
-						<MeleeParryChance>0.35</MeleeParryChance>
-						<MeleeDodgeChance>0.35</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<!--=============================== Possessed Bloodstained Scythe ================================-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_PossessedBloodstainedScythe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.16</cooldownTime>
-								<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>BotchJob_BloodCut</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>4</cooldownTime>
-								<armorPenetrationSharp>24</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.6</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_PossessedBloodstainedScythe"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>1.71</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_PossessedBloodstainedScythe"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.19</MeleeCritChance>
-							<MeleeParryChance>1.5</MeleeParryChance>
-							<MeleeDodgeChance>0.83</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Possesed Weapons/PossessedWeapons_RangedPatch.xml b/Patches/Possesed Weapons/PossessedWeapons_RangedPatch.xml
deleted file mode 100644
index 220426dd09..0000000000
--- a/Patches/Possesed Weapons/PossessedWeapons_RangedPatch.xml	
+++ /dev/null
@@ -1,1441 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Possessed Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--=============================== Ranged ================================-->
-
-				<!--=============================== Dragonfire Greatbow ================================-->
-
-				<!--li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BotchJob_DragonfireGreatbow</defName>
-					<statBases>
-						<SightsEfficiency>0.6</SightsEfficiency>
-						<ShotSpread>1</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>10.00</Bulk>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_LesserDragonFireArrow</defaultProjectile>
-						<warmupTime>4</warmupTime>
-						<range>30</range>
-						<soundCast>Bow_Large</soundCast>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<ammoSet>AmmoSet_LesserDragonFireArrow</ammoSet>
-					</AmmoUser>
-					<FireModes/>
-					<weaponTags>
-						<li>BotchJob_DragonfireGreatbow</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_DragonfireGreatbow"]/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-->
-
-				<!-- Possessed Dragonfire Bow -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BotchJob_PossessedDragonfireGreatbow</defName>
-					<statBases>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>1</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>10.00</Bulk>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_DragonFireArrow</defaultProjectile>
-						<warmupTime>4</warmupTime>
-						<range>30</range>
-						<soundCast>Bow_Large</soundCast>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<ammoSet>AmmoSet_DragonFireArrow</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>BotchJob_PossessedDragonfireGreatbow</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="BotchJob_PossessedDragonfireGreatbow"]/equippedStatOffsets</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_PossessedDragonfireGreatbow"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.44</cooldownTime>
-								<armorPenetrationBlunt>0.79</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--=============================== Lightning Javelin ================================-->
-				<!--li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="BotchJob_LightningJavelin"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>BaseWeapon</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_LightningJavelin"]</xpath>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<stackLimit>5</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-						<techLevel>Medieval</techLevel>
-						<tradeNeverStack>true</tradeNeverStack>
-						<relicChance>3</relicChance>
-						<burnableByRecipe>true</burnableByRecipe>
-						<thingSetMakerTags>
-							<li>RewardStandardMidFreq</li>
-						</thingSetMakerTags>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="BotchJob_LightningJavelin"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BotchJob_LightningJavelin</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<Bulk>2</Bulk>
-						<Mass>2</Mass>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<MeleeCounterParryBonus>0.36</MeleeCounterParryBonus>
-					</statBases>
-					<Properties>
-						<label>Throw lightning javelin</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Projectile_ThrownLightningJavelin</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>25</range>
-						<soundCast>Power_OnSmall</soundCast>
-						<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_LightningJavelin"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.17</MeleeCritChance>
-							<MeleeDodgeChance>0.6</MeleeDodgeChance>
-							<MeleeParryChance>0.5</MeleeParryChance>
-							<RestRateMultiplier>-0.2</RestRateMultiplier>
-							<MoveSpeed>0.2</MoveSpeed>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_LightningJavelin"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2.52</cooldownTime>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>2.52</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<armorPenetrationSharp>3.34</armorPenetrationSharp>
-								<extraMeleeDamages>
-									<li>
-										<def>EMP</def>
-										<amount>9</amount>
-									</li>
-								</extraMeleeDamages>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li-->
-
-				<!--=============================== Possessed Lightning Javelin ================================-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BotchJob_PossessedLightningJavelin</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<Bulk>8</Bulk>
-						<Mass>4</Mass>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_ThrownPossessedLightningJavelin</defaultProjectile>
-						<warmupTime>3</warmupTime>
-						<range>25</range>
-						<soundCast>Power_OnSmall</soundCast>
-						<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_PossessedLightningJavelin"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2.26</cooldownTime>
-								<armorPenetrationBlunt>4.84</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>2.26</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>4.84</armorPenetrationBlunt>
-								<armorPenetrationSharp>4.04</armorPenetrationSharp>
-								<extraMeleeDamages>
-									<li>
-										<def>EMP</def>
-										<amount>9</amount>
-									</li>
-								</extraMeleeDamages>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_PossessedLightningJavelin"]/description</xpath>
-					<value>
-						<description>A large, lightning infused spear that is deadly in close quarters but can also be thrown to produce an EMP burst on impact.\n\nThe electricity coursing through this weapon will energize its wielder, increasing their movement speed. The downside of this is that being constantly energized makes it difficult to sleep and as such, the wielder's rest rate will be slower.\n\nThis weapon is possessed by an ancient spirit and will exhibit some of their traits. The spirit will bond with the first person to wield it and thereafter, refuse to be wielded by anyone else.\n\nWhen wielded by the bonded person, the spirit will augment their combat abilities, allowing them to attack with greater ferocity, speed and accuracy than ever before. The spirit of the lightning javelin is temperamental and will depart once thrown.</description>
-					</value>
-				</li>
-				<!-- Projectile -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="BasePilumProjectile">
-							<defName>Projectile_ThrownPossessedLightningJavelin</defName>
-							<label>lightning javelin</label>
-							<graphicData>
-								<texPath>Things/Projectile/LightningJavelinThrown</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>36</damageAmountBase>
-								<flyOverhead>false</flyOverhead>
-								<speed>20</speed>
-								<damageDef>EMP</damageDef>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<armorPenetrationSharp>8.34</armorPenetrationSharp>
-								<!--preExplosionSpawnChance>1</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>BotchJob_LightningJavelin</preExplosionSpawnThingDef-->
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>30</damageAmountBase>
-									<explosiveDamageType>EMP</explosiveDamageType>
-									<explosiveRadius>4</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!--li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="BasePilumProjectile">
-							<defName>Projectile_ThrownLightningJavelin</defName>
-							<label>lightning javelin</label>
-							<graphicData>
-								<texPath>Things/Projectile/LightningJavelinThrown</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>26</damageAmountBase>
-								<flyOverhead>false</flyOverhead>
-								<speed>20</speed>
-								<damageDef>EMP</damageDef>
-								<armorPenetrationBlunt>4.84</armorPenetrationBlunt>
-								<armorPenetrationSharp>4.04</armorPenetrationSharp>
-								<preExplosionSpawnChance>1</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>BotchJob_LightningJavelin</preExplosionSpawnThingDef>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>20</damageAmountBase>
-									<explosiveDamageType>EMP</explosiveDamageType>
-									<explosiveRadius>2</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li-->
-
-				<!--=============================== Archmage Staff ================================-->
-				<!--li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BotchJob_ArchmageStaff</defName>
-					<statBases>
-						<SightsEfficiency>0.3</SightsEfficiency>
-						<ShotSpread>3</ShotSpread>
-						<SwayFactor>1</SwayFactor>
-						<Bulk>10.00</Bulk>
-						<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_ArchmageStaffBolt</defaultProjectile>
-						<warmupTime>6</warmupTime>
-						<range>30</range>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<burstShotCount>8</burstShotCount>
-						<soundAiming>BotchJob_ArchmageStaffCharge</soundAiming>
-						<soundCast>BotchJob_ArchmageStaffCast</soundCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>BotchJob_ArchmageStaff</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_ArchmageStaff"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>limb</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li-->
-
-				<!--=============================== Possessed Archmage Staff ================================-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BotchJob_PossessedArchmageStaff</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>3</ShotSpread>
-						<SwayFactor>1</SwayFactor>
-						<Bulk>10.00</Bulk>
-						<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_ArchmageStaffBolt</defaultProjectile>
-						<warmupTime>5.4</warmupTime>
-						<range>30</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundAiming>BotchJob_ArchmageStaffCharge</soundAiming>
-						<soundCast>BotchJob_ArchmageStaffCast</soundCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>BotchJob_PossessedArchmageStaff</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_PossessedArchmageStaff"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>limb</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Archmage Staff Projectiles  -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="BasePilumProjectile">
-							<defName>Projectile_ArchmageStaffBolt</defName>
-							<label>archmage staff bolt</label>
-							<graphicData>
-								<texPath>Things/Projectile/ArchmageStaffBolt</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<flyOverhead>false</flyOverhead>
-								<speed>20</speed>
-								<damageDef>BotchJob_ArchmageStaffBolt</damageDef>
-								<explosionRadius>1</explosionRadius>
-								<ai_IsIncendiary>true</ai_IsIncendiary>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<explosiveDamageType>Flame</explosiveDamageType>
-									<explosiveRadius>1</explosiveRadius>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!--=============================== Automaton Crossbow ================================-->
-
-				<!--li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BotchJob_AutomatonCrossbow</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1</SwayFactor>
-						<Bulk>8</Bulk>
-						<RangedWeapon_Cooldown>0.2</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.39</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_CrossbowBolt_Steel</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<burstShotCount>3</burstShotCount>
-						<range>26</range>
-						<soundCast>Bow_Large</soundCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>3</magazineSize>
-						<reloadTime>5.5</reloadTime>
-						<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>BotchJob_AutomatonCrossbow</li>
-					</weaponTags>
-				</li-->
-
-				<!-- Patch to Make it Utilize Heavy Crossbow Ammo from MO when loaded -->
-				<!--li Class="PatchOperationFindMod">
-					<mods>
-						<li>Medieval Overhaul</li>
-					</mods>
-					<match Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="BotchJob_AutomatonCrossbow"]/comps</xpath>
-						<value>
-							<comps>
-								<li Class="CombatExtended.CompProperties_AmmoUser">
-									<magazineSize>3</magazineSize>
-									<reloadTime>5.5</reloadTime>
-									<ammoSet>AmmoSet_ArbalestBolt</ammoSet>
-								</li>
-								<li Class="CombatExtended.CompProperties_FireModes">
-									<aiUseBurstMode>FALSE</aiUseBurstMode>
-									<aiAimMode>Snapshot</aiAimMode>
-									<aimedBurstShotCount>3</aimedBurstShotCount>
-								</li>
-							</comps>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_AutomatonCrossbow"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetrationBlunt>0.85</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li-->
-
-				<!--=============================== Possessed Automaton Crossbow ================================-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BotchJob_PossessedAutomatonCrossbow</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1</SwayFactor>
-						<Bulk>8</Bulk>
-						<RangedWeapon_Cooldown>0.2</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.39</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_CrossbowBolt_Steel</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<burstShotCount>3</burstShotCount>
-						<range>26</range>
-						<soundCast>Bow_Large</soundCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>3</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>BotchJob_PossessedAutomatonCrossbow</li>
-					</weaponTags>
-				</li>
-
-				<!-- Patch to Make it Utilize Heavy Crossbow Ammo from MO when loaded -->
-				<li Class="PatchOperationFindMod">
-					<mods>
-						<li>Medieval Overhaul</li>
-					</mods>
-					<match Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="BotchJob_PossessedAutomatonCrossbow"]/comps</xpath>
-						<value>
-							<comps>
-								<li Class="CombatExtended.CompProperties_AmmoUser">
-									<magazineSize>3</magazineSize>
-									<reloadTime>5</reloadTime>
-									<ammoSet>AmmoSet_ArbalestBolt</ammoSet>
-								</li>
-								<li Class="CombatExtended.CompProperties_FireModes">
-									<aiUseBurstMode>FALSE</aiUseBurstMode>
-									<aiAimMode>Snapshot</aiAimMode>
-									<aimedBurstShotCount>3</aimedBurstShotCount>
-								</li>
-							</comps>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_PossessedAutomatonCrossbow"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.44</cooldownTime>
-								<armorPenetrationBlunt>1.03</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--=============================== Verdant Bow ================================-->
-
-				<!--li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BotchJob_VerdantBow</defName>
-					<statBases>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>1</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>4.00</Bulk>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_VerdantArrow_Steel</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>22</range>
-						<soundCast>Bow_Recurve</soundCast>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<ammoSet>AmmoSet_VerdantArrow</ammoSet>
-					</AmmoUser>
-					<FireModes/>
-					<weaponTags>
-						<li>BotchJob_VerdantBow</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li-->
-
-				<!-- Patch to Make it Utilize Heavy Crossbow Ammo from MO when loaded -->
-				<!--li Class="PatchOperationFindMod">
-					<mods>
-						<li>Medieval Overhaul</li>
-					</mods>
-					<match Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="BotchJob_VerdantBow"]/comps</xpath>
-						<value>
-							<comps>
-								<li Class="CombatExtended.CompProperties_AmmoUser">
-									<ammoSet>AmmoSet_VerdantMOArrow</ammoSet>
-								</li>
-							</comps>
-						</value>
-					</match>
-				</li-->
-
-				<!--li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_VerdantBow"]/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-->
-
-				<!--=============================== Possessed Verdant Bow ================================-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BotchJob_PossessedVerdantBow</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.8</ShotSpread>
-						<SwayFactor>1.</SwayFactor>
-						<Bulk>4.00</Bulk>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_VerdantArrow_Steel</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>22</range>
-						<soundCast>Bow_Recurve</soundCast>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<ammoSet>AmmoSet_VerdantArrow</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>BotchJob_PossessedVerdantBow</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- Patch to Make it Utilize Heavy Crossbow Ammo from MO when loaded -->
-				<li Class="PatchOperationFindMod">
-					<mods>
-						<li>Medieval Overhaul</li>
-					</mods>
-					<match Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="BotchJob_PossessedVerdantBow"]/comps</xpath>
-						<value>
-							<comps>
-								<li Class="CombatExtended.CompProperties_AmmoUser">
-									<ammoSet>AmmoSet_VerdantMOArrow</ammoSet>
-								</li>
-							</comps>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_PossessedVerdantBow"]/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>
-
-				<!--=============================== Gilded Arquebus ================================-->
-
-				<!--li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BotchJob_GildedArquebus</defName>
-					<statBases>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.85</SwayFactor>
-						<Mass>4.5</Mass>
-						<Bulk>14.00</Bulk>
-						<RangedWeapon_Cooldown>0.93</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_FastMusketBall</defaultProjectile>
-						<warmupTime>1.26</warmupTime>
-						<range>35</range>
-						<soundCast>Shot_CE_Musket</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>4</AmmoGenPerMagOverride>
-						<reloadTime>7.11</reloadTime>
-						<ammoSet>AmmoSet_FastMusketBall</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>BotchJob_GildedArquebus</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li-->
-
-				<!--=============================== Possessed Gilded Arquebus ================================-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BotchJob_PossessedGildedArquebus</defName>
-					<statBases>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.85</SwayFactor>
-						<Mass>4.5</Mass>
-						<Bulk>14.00</Bulk>
-						<RangedWeapon_Cooldown>0.84</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_FastMusketBall</defaultProjectile>
-						<warmupTime>1.11</warmupTime>
-						<range>35</range>
-						<soundCast>Shot_CE_Musket</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>4</AmmoGenPerMagOverride>
-						<reloadTime>6.4</reloadTime>
-						<ammoSet>AmmoSet_FastMusketBall</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>BotchJob_GildedArquebus</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_PossessedGildedArquebus"]/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>Stab</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.55</cooldownTime>
-								<armorPenetrationSharp>1.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--=============================== Shrouded Dagger ================================-->
-				<!--li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="BotchJob_ShroudedDagger"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>BaseWeapon</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_ShroudedDagger"]</xpath>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<stackLimit>5</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-						<techLevel>Medieval</techLevel>
-						<tradeNeverStack>true</tradeNeverStack>
-						<relicChance>3</relicChance>
-						<burnableByRecipe>true</burnableByRecipe>
-						<thingSetMakerTags>
-							<li>RewardStandardMidFreq</li>
-						</thingSetMakerTags>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="BotchJob_ShroudedDagger"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BotchJob_ShroudedDagger</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<Bulk>1</Bulk>
-						<Mass>1</Mass>
-						<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-						<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<label>Throw shrouded dagger</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Projectile_ThrownShroudedDagger</defaultProjectile>
-						<warmupTime>0.2</warmupTime>
-						<range>15</range>
-						<soundCast>ThrowGrenade</soundCast>
-						<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-					</Properties>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_ShroudedDagger"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<PawnTrapSpringChance>-0.15</PawnTrapSpringChance>
-							<MeleeDodgeChance>0.15</MeleeDodgeChance>
-							<MeleeCritChance>0.5</MeleeCritChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_ShroudedDagger"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1</cooldownTime>
-								<armorPenetrationBlunt>1.13</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>stab</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>1.13</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.88</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>slash</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.41</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.72</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.64</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="BasePilumProjectile">
-							<defName>Projectile_ThrownShroudedDagger</defName>
-							<label>shrouded dagger</label>
-							<graphicData>
-								<texPath>Things/Projectile/ShroudedDaggerThrown</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>16</damageAmountBase>
-								<flyOverhead>false</flyOverhead>
-								<speed>26</speed>
-								<damageDef>RangedStab</damageDef>
-								<armorPenetrationBlunt>2.26</armorPenetrationBlunt>
-								<armorPenetrationSharp>3.76</armorPenetrationSharp>
-								<preExplosionSpawnChance>1</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>BotchJob_ShroudedDagger</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li-->
-
-				<!--=============================== Possessed Shrouded Dagger ================================-->
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="BotchJob_PossessedShroudedDagger"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>BaseWeapon</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_PossessedShroudedDagger"]/description</xpath>
-					<value>
-						<description>A deadly dagger favoured by assassins and rogues.\n\nIn skilled hands it can deliver a lightning fast flurry of stabs and slashes and can also be thrown short distances, ideal for finishing off fleeing opponents.\n\nIt allows the wielder to remain light on their feet, increasing their melee dodge chance and reducing the chances of them triggering hidden traps.\n\nThis weapon is possessed by an ancient spirit and will exhibit some of their traits. The spirit will bond with the first person to wield it and thereafter, refuse to be wielded by anyone else.\n\nWhen wielded by the bonded person, the spirit will augment their combat abilities, allowing them to attack with greater ferocity, speed and accuracy than ever before. When thrown the spirit will enhance the dagger one last time before departing.</description>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_PossessedShroudedDagger"]</xpath>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<stackLimit>5</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-						<techLevel>Medieval</techLevel>
-						<tradeNeverStack>true</tradeNeverStack>
-						<relicChance>3</relicChance>
-						<burnableByRecipe>true</burnableByRecipe>
-						<thingSetMakerTags>
-							<li>RewardStandardLowFreq</li>
-						</thingSetMakerTags>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="BotchJob_PossessedShroudedDagger"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BotchJob_PossessedShroudedDagger</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<Bulk>1</Bulk>
-						<Mass>1</Mass>
-						<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-						<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<label>Throw shrouded dagger</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Projectile_ThrownShroudedDagger</defaultProjectile>
-						<warmupTime>0.2</warmupTime>
-						<range>15</range>
-						<soundCast>ThrowGrenade</soundCast>
-						<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-					</Properties>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_PossessedShroudedDagger"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<PawnTrapSpringChance>-0.15</PawnTrapSpringChance>
-							<MeleeDodgeChance>0.15</MeleeDodgeChance>
-							<MeleeCritChance>0.5</MeleeCritChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_PossessedShroudedDagger"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.9</cooldownTime>
-								<armorPenetrationBlunt>1.37</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>stab</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>0.9</cooldownTime>
-								<chanceFactor>1.2</chanceFactor>
-								<armorPenetrationBlunt>1.37</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.27</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>slash</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.27</cooldownTime>
-								<chanceFactor>1.20</chanceFactor>
-								<armorPenetrationBlunt>0.87</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.77</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="BasePilumProjectile">
-							<defName>Projectile_ThrownShroudedDagger</defName>
-							<label>shrouded dagger</label>
-							<graphicData>
-								<texPath>Things/Projectile/ShroudedDaggerThrown</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>32</damageAmountBase>
-								<flyOverhead>false</flyOverhead>
-								<speed>26</speed>
-								<damageDef>RangedStab</damageDef>
-								<armorPenetrationBlunt>4.52</armorPenetrationBlunt>
-								<armorPenetrationSharp>7.52</armorPenetrationSharp>
-								<!--preExplosionSpawnChance>1</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>BotchJob_ShroudedDagger</preExplosionSpawnThingDef-->
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!--=============================== Acolyte Staff ================================-->
-				<li Class="PatchOperationFindMod">
-					<mods>
-						<li>Biotech</li>
-					</mods>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<!--li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="BotchJob_AcolyteStaff"]/statBases</xpath>
-								<value>
-									<Bulk>10.00</Bulk>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="BotchJob_AcolyteStaff"]/verbs/li/warmupTime</xpath>
-								<value>
-									<warmupTime>3.2</warmupTime>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="BotchJob_AcolyteStaff"]/verbs/li/range</xpath>
-								<value>
-									<range>30</range>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="BotchJob_AcolyteStaff"]/verbs/li/burstShotCount</xpath>
-								<value>
-									<burstShotCount>10</burstShotCount>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="BotchJob_AcolyteStaff"]/verbs/li/ticksBetweenBurstShots</xpath>
-								<value>
-									<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="BotchJob_AcolyteStaff"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>limb</label>
-											<capacities>
-												<li>Blunt</li>
-												<li>Poke</li>
-											</capacities>
-											<power>6</power>
-											<cooldownTime>1.2</cooldownTime>
-											<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li-->
-
-							<!--=============================== Possessed Acolyte Staff ================================-->
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/statBases</xpath>
-								<value>
-									<Bulk>10.00</Bulk>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/statBases/RangedWeapon_Cooldown</xpath>
-								<value>
-									<RangedWeapon_Cooldown>1.53</RangedWeapon_Cooldown>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/verbs/li/warmupTime</xpath>
-								<value>
-									<warmupTime>2.7</warmupTime>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/verbs/li/range</xpath>
-								<value>
-									<range>30</range>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/verbs/li/burstShotCount</xpath>
-								<value>
-									<burstShotCount>14</burstShotCount>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/verbs/li/ticksBetweenBurstShots</xpath>
-								<value>
-									<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>limb</label>
-											<capacities>
-												<li>Blunt</li>
-												<li>Poke</li>
-											</capacities>
-											<power>6</power>
-											<cooldownTime>1.2</cooldownTime>
-											<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-				<!--=============================== Ghostly Flintlock ================================-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BotchJob_PossessedGhostlyFlintlock</defName>
-					<statBases>
-						<SightsEfficiency>0.5</SightsEfficiency>
-						<ShotSpread>0.42</ShotSpread>
-						<SwayFactor>1.58</SwayFactor>
-						<Mass>1.25</Mass>
-						<Bulk>3.50</Bulk>
-						<RangedWeapon_Cooldown>1.06</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>3.59</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_GhostFlintlock_MusketBall</defaultProjectile>
-						<warmupTime>0.9</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_CE_Musket</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
-						<reloadTime>5.9</reloadTime>
-						<ammoSet>AmmoSet_GhostFlintlock_MusketBall</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>6</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>BotchJob_PossessedGhostlyFlintlock</li>
-						<li>CE_AI_BROOM</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_PossessedGhostlyFlintlock"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Crystal blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationSharp>1.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--=============================== Possessed Earthen Gauntlet ================================-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BotchJob_PossessedEarthenGauntlet</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.42</ShotSpread>
-						<SwayFactor>1.58</SwayFactor>
-						<Mass>3.5</Mass>
-						<Bulk>3</Bulk>
-						<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>3.59</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_EarthenGauntlet_RockBlast</defaultProjectile>
-						<warmupTime>4</warmupTime>
-						<range>18</range>
-						<soundCast>Interact_BeatFire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>BotchJob_PossessedEarthenGauntlet</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BotchJob_PossessedEarthenGauntlet"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Demolish</li>
-								</capacities>
-								<power>41</power>
-								<cooldownTime>4</cooldownTime>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<extraMeleeDamages>
-									<li>
-										<def>Stun</def>
-										<amount>310</amount>
-										<chance>0.5</chance>
-									</li>
-								</extraMeleeDamages>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_PossessedEarthenGauntlet"]/statBases</xpath>
-					<value>
-						<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BotchJob_PossessedEarthenGauntlet"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.5</MeleeCritChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-							<MeleeDodgeChance>0.83</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/PowerArmour T-45b/T45b_CE_Patch.xml b/Patches/PowerArmour T-45b/T45b_CE_Patch.xml
deleted file mode 100644
index fea209d65d..0000000000
--- a/Patches/PowerArmour T-45b/T45b_CE_Patch.xml	
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>T-45b Power Armor</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== T-45b helmet ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CPApparel_T45bHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CPApparel_T45bHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CPApparel_T45bHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>32</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CPApparel_T45bHelmet"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>1</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CPApparel_T45bHelmet"]/statBases</xpath>
-					<value>
-						<ArmorRating_Electric>0.06</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="CPApparel_T45bHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="CPApparel_T45bHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CPApparel_T45bHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CPApparel_T45bHelmet"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>55</Plasteel>
-					</value>
-				</li>
-
-				<!-- Deliberately omitted WearingGasMask ApparelHediffExtension, as we assume the T-45b Helmet is more comfortable than real-life gas masks -->
-
-				<!-- ========== T-45b armor ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CPApparel_T45bPowerArmor"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CPApparel_T45bPowerArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>15</CarryBulk>
-						<CarryWeight>90</CarryWeight>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CPApparel_T45bPowerArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CPApparel_T45bPowerArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>40</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CPApparel_T45bPowerArmor"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.8</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CPApparel_T45bPowerArmor"]/statBases</xpath>
-					<value>
-						<ArmorRating_Electric>0.05</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CPApparel_T45bPowerArmor"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>160</Plasteel>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Turrets.xml b/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Turrets.xml
deleted file mode 100644
index 423dd4b7bd..0000000000
--- a/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Turrets.xml	
+++ /dev/null
@@ -1,649 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Pratt] WWII Weapons Pack (Vanilla)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== (Turret FR) Hotchkiss M1914 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_HotchkissM1914HMG</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1.16</SwayFactor>
-						<Bulk>14.70</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.80</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8x50mmRLebel_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>250</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_8x50mmRLebel</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_HotchkissM1914HMG"]/statBases/Mass</xpath>
-					<value>
-						<Mass>23.60</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_HotchkissM1914HMG"]/statBases/WorkToBuild</xpath>
-					<value>
-						<WorkToBuild>47000</WorkToBuild>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_HotchkissM1914HMG"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>170</Steel>
-							<ComponentIndustrial>6</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_HotchkissM1914HMG"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>75</specialDisplayRadius>
-					</value>
-				</li>
-
-				<!-- ========== (Turret GER) MG 34 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MG34MG</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.28</SwayFactor>
-						<Bulk>14.19</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.64</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>86</range>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>250</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_MG34MG"]/statBases/Mass</xpath>
-					<value>
-						<Mass>32.00</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_MG34MG"]/statBases/WorkToBuild</xpath>
-					<value>
-						<WorkToBuild>48500</WorkToBuild>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_MG34MG"]/costList</xpath>
-					<value>
-						<costList>
-							<WoodLog>20</WoodLog>
-							<Steel>175</Steel>
-							<ComponentIndustrial>6</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_MG34MG"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>86</specialDisplayRadius>
-					</value>
-				</li>
-
-				<!-- ========== (Turret GER) MG 42 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MG42MG</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>14.20</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.63</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>86</range>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>250</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_MG42MG"]/statBases/Mass</xpath>
-					<value>
-						<Mass>31.65</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_MG42MG"]/statBases/WorkToBuild</xpath>
-					<value>
-						<WorkToBuild>48500</WorkToBuild>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_MG42MG"]/costList</xpath>
-					<value>
-						<costList>
-							<WoodLog>20</WoodLog>
-							<Steel>175</Steel>
-							<ComponentIndustrial>6</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_MG42MG"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>86</specialDisplayRadius>
-					</value>
-				</li>
-
-				<!-- ========== (Turret JPN) Type 92 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Type92HMG</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.57</SwayFactor>
-						<Bulk>13.56</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.37</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_77x58mmArisaka_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_77x58mmArisaka</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_Type92HMG"]/statBases/Mass</xpath>
-					<value>
-						<Mass>55.30</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_Type92HMG"]/statBases/WorkToBuild</xpath>
-					<value>
-						<WorkToBuild>59500</WorkToBuild>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_Type92HMG"]/costList</xpath>
-					<value>
-						<costList>
-							<WoodLog>5</WoodLog>
-							<Steel>270</Steel>
-							<ComponentIndustrial>6</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_Type92HMG"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>75</specialDisplayRadius>
-					</value>
-				</li>
-
-				<!-- ========== (Turret UK) Vickers ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_VickersHMG</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.34</SwayFactor>
-						<Bulk>13.20</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.54</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>86</range>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>250</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_303British</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_VickersHMG"]/statBases/Mass</xpath>
-					<value>
-						<Mass>37.00</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_VickersHMG"]/statBases/WorkToBuild</xpath>
-					<value>
-						<WorkToBuild>52000</WorkToBuild>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_VickersHMG"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>210</Steel>
-							<ComponentIndustrial>6</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_VickersHMG"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>86</specialDisplayRadius>
-					</value>
-				</li>
-
-				<!-- ========== (Turret US) M1917A1 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_M1917A1MG</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.35</SwayFactor>
-						<Bulk>11.80</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>250</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_3006Springfield</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_M1917A1MG"]/statBases/Mass</xpath>
-					<value>
-						<Mass>39.25</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_M1917A1MG"]/statBases/WorkToBuild</xpath>
-					<value>
-						<WorkToBuild>52500</WorkToBuild>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_M1917A1MG"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>215</Steel>
-							<ComponentIndustrial>6</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_M1917A1MG"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>75</specialDisplayRadius>
-					</value>
-				</li>
-
-				<!-- ========== (Turret US) M1919A4 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_M1919A4MG</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.05</SwayFactor>
-						<Bulk>11.64</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.83</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>86</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>250</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_3006Springfield</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_M1919A4MG"]/statBases/Mass</xpath>
-					<value>
-						<Mass>20.40</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_M1919A4MG"]/statBases/WorkToBuild</xpath>
-					<value>
-						<WorkToBuild>44500</WorkToBuild>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_M1919A4MG"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>150</Steel>
-							<ComponentIndustrial>6</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_M1919A4MG"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>86</specialDisplayRadius>
-					</value>
-				</li>
-
-				<!-- ========== (Turret USSR) Maxim M1910-30 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MaximM1910-30HMG</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.67</SwayFactor>
-						<Bulk>12.67</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.28</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>86</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>250</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_MaximM1910-30HMG"]/statBases/Mass</xpath>
-					<value>
-						<Mass>64.30</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_MaximM1910-30HMG"]/statBases/WorkToBuild</xpath>
-					<value>
-						<WorkToBuild>63000</WorkToBuild>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_MaximM1910-30HMG"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>300</Steel>
-							<ComponentIndustrial>6</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_MaximM1910-30HMG"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>86</specialDisplayRadius>
-					</value>
-				</li>
-
-				<!-- ========== Common to all Turrets ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Turret_HotchkissM1914HMG" or
-						defName="Turret_MG34MG" or
-						defName="Turret_MG42MG" or
-						defName="Turret_Type92HMG" or
-						defName="Turret_VickersHMG" or
-						defName="Turret_M1917A1MG" or
-						defName="Turret_M1919A4MG" or
-						defName="Turret_MaximM1910-30HMG"
-						]/thingClass </xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="Turret_HotchkissM1914HMG" or
-						defName="Turret_MG34MG" or
-						defName="Turret_MG42MG" or
-						defName="Turret_Type92HMG" or
-						defName="Turret_VickersHMG" or
-						defName="Turret_M1917A1MG" or
-						defName="Turret_M1919A4MG" or
-						defName="Turret_MaximM1910-30HMG"
-						]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
-				</li>
-
-				<!-- All Pratt WWII Turrets already have their fillPercent set to 0.85, making them automatically compatible with CE embrasures -->
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Grenades.xml b/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Grenades.xml
deleted file mode 100644
index 01d4071968..0000000000
--- a/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Grenades.xml	
+++ /dev/null
@@ -1,967 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Pratt] WWII Weapons Pack (Vanilla)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Core patches already cover the BaseGrenadeProjectile abstract class -->
-
-				<!-- ========== Common ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="Weapon_MkIIGrenadeGNDE" or
-						defName="Weapon_Stielhandgranate24gnde" or
-						defName="Weapon_Type97GNDE" or
-						defName="Weapon_RGD-33GNDE" or
-						defName="Weapon_F1GrenadeGNDE" or
-						defName="Weapon_MillsGrenadeGNDE"
-						] </xpath>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<stackLimit>75</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="Weapon_MkIIGrenadeGNDE" or
-						defName="Weapon_Stielhandgranate24gnde" or
-						defName="Weapon_Type97GNDE" or
-						defName="Weapon_RGD-33GNDE" or
-						defName="Weapon_F1GrenadeGNDE" or
-						defName="Weapon_MillsGrenadeGNDE"
-						]/graphicData </xpath>
-					<value>
-						<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[
-						defName="Weapon_MkIIGrenadeGNDE" or
-						defName="Weapon_Stielhandgranate24gnde" or
-						defName="Weapon_Type97GNDE" or
-						defName="Weapon_RGD-33GNDE" or
-						defName="Weapon_F1GrenadeGNDE" or
-						defName="Weapon_MillsGrenadeGNDE"
-						] </xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[
-						defName="Weapon_MkIIGrenadeGNDE" or
-						defName="Weapon_Stielhandgranate24gnde" or
-						defName="Weapon_Type97GNDE" or
-						defName="Weapon_RGD-33GNDE" or
-						defName="Weapon_F1GrenadeGNDE" or
-						defName="Weapon_MillsGrenadeGNDE"
-						]/comps </xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[
-							defName="Weapon_MkIIGrenadeGNDE" or
-							defName="Weapon_Stielhandgranate24gnde" or
-							defName="Weapon_Type97GNDE" or
-							defName="Weapon_RGD-33GNDE" or
-							defName="Weapon_F1GrenadeGNDE" or
-							defName="Weapon_MillsGrenadeGNDE"
-							] </xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<!-- Remove original recipe maker -->
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[
-						defName="Weapon_MkIIGrenadeGNDE" or
-						defName="Weapon_Stielhandgranate24gnde" or
-						defName="Weapon_Type97GNDE" or
-						defName="Weapon_RGD-33GNDE" or
-						defName="Weapon_F1GrenadeGNDE" or
-						defName="Weapon_MillsGrenadeGNDE"
-						] </xpath>
-					<attribute>ParentName</attribute>
-					<value>BaseWeapon</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="Weapon_MkIIGrenadeGNDE" or
-						defName="Weapon_Stielhandgranate24gnde" or
-						defName="Weapon_Type97GNDE" or
-						defName="Weapon_RGD-33GNDE" or
-						defName="Weapon_F1GrenadeGNDE" or
-						defName="Weapon_MillsGrenadeGNDE"
-						]/costList </xpath>
-				</li>
-
-				<!-- Remove original recipe maker (END) -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Proj_MkIIGrenadeGNDE" or
-						defName="Proj_Stielhandgranate24gnde" or
-						defName="Proj_Type97GNDE" or
-						defName="Proj_RGD-33GNDE" or
-						defName="Proj_F1GrenadeGNDE" or
-						defName="Proj_MillsGrenadeGNDE"
-						]/thingClass </xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[
-						defName="Proj_MkIIGrenadeGNDE" or
-						defName="Proj_Stielhandgranate24gnde" or
-						defName="Proj_Type97GNDE" or
-						defName="Proj_RGD-33GNDE" or
-						defName="Proj_F1GrenadeGNDE" or
-						defName="Proj_MillsGrenadeGNDE"
-						]/comps </xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[
-							defName="Proj_MkIIGrenadeGNDE" or
-							defName="Proj_Stielhandgranate24gnde" or
-							defName="Proj_Type97GNDE" or
-							defName="Proj_RGD-33GNDE" or
-							defName="Proj_F1GrenadeGNDE" or
-							defName="Proj_MillsGrenadeGNDE"
-							] </xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<!-- ========== (US) MkII Grenade ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Weapon_MkIIGrenadeGNDE</defName>
-					<statBases>
-						<Mass>0.595</Mass>
-						<Bulk>0.91</Bulk>
-						<MarketValue>9.95</MarketValue>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<label>throw frag grenade</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<range>10.0</range>
-						<minRange>4</minRange>
-						<warmupTime>0.8</warmupTime>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<soundCast>ThrowGrenade</soundCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<defaultProjectile>Proj_MkIIGrenadeGNDE</defaultProjectile>
-						<onlyManualCast>true</onlyManualCast>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<weaponTags>
-						<li>CE_AI_Grenade</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Weapon_MkIIGrenadeGNDE"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>22</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>1</explosiveRadius>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Weapon_MkIIGrenadeGNDE"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>60</Fragment_Small>
-							</fragments>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Proj_MkIIGrenadeGNDE"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>1</explosionRadius>
-							<damageDef>Bomb</damageDef>
-							<damageAmountBase>22</damageAmountBase>
-							<explosionDelay>60</explosionDelay>
-							<dropsCasings>true</dropsCasings>
-							<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-							<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							<speed>12</speed>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Proj_MkIIGrenadeGNDE"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>60</Fragment_Small>
-							</fragments>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>MakeMkIIGrenadeGNDE</defName>
-							<label>make MkII grenades x10</label>
-							<description>Craft 10 MkII grenades.</description>
-							<jobString>Making MkII grenades.</jobString>
-							<workAmount>3200</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>12</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>FSX</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Weapon_MkIIGrenadeGNDE>10</Weapon_MkIIGrenadeGNDE>
-							</products>
-						</RecipeDef>
-					</value>
-				</li>
-
-				<!-- ========== (GER) Stielhandgranate 24 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Weapon_Stielhandgranate24gnde</defName>
-					<statBases>
-						<Mass>0.595</Mass>
-						<Bulk>4.22</Bulk>
-						<MarketValue>12.41</MarketValue>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<label>throw frag grenade</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<range>10.0</range>
-						<minRange>4</minRange>
-						<warmupTime>0.8</warmupTime>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<soundCast>ThrowGrenade</soundCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<defaultProjectile>Proj_Stielhandgranate24gnde</defaultProjectile>
-						<onlyManualCast>true</onlyManualCast>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<weaponTags>
-						<li>CE_AI_Grenade</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Weapon_Stielhandgranate24gnde"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>45</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>1.5</explosiveRadius>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>1</Fragment_Large>
-								<Fragment_Small>13</Fragment_Small>
-							</fragments>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Proj_Stielhandgranate24gnde"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>1.5</explosionRadius>
-							<damageDef>Bomb</damageDef>
-							<damageAmountBase>45</damageAmountBase>
-							<explosionDelay>60</explosionDelay>
-							<dropsCasings>true</dropsCasings>
-							<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-							<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							<speed>12</speed>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Proj_Stielhandgranate24gnde"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>1</Fragment_Large>
-								<Fragment_Small>13</Fragment_Small>
-							</fragments>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<!-- Note: Costs were hand-balanced to account for the wooden handle -->
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>MakeStielhandgranate24gnde</defName>
-							<label>make Stielhandgranate 24 grenades x10</label>
-							<description>Craft 10 Stielhandgranate 24 grenades.</description>
-							<jobString>Making Stielhandgranate 24 grenades.</jobString>
-							<workAmount>4200</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>3</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-									<li>Steel</li>
-									<li>FSX</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Weapon_Stielhandgranate24gnde>10</Weapon_Stielhandgranate24gnde>
-							</products>
-						</RecipeDef>
-					</value>
-				</li>
-
-				<!-- ========== (JPN) Type 97 Grenade ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Weapon_Type97GNDE</defName>
-					<statBases>
-						<Mass>0.45</Mass>
-						<Bulk>0.57</Bulk>
-						<MarketValue>9.55</MarketValue>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<label>throw frag grenade</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<range>10.0</range>
-						<minRange>4</minRange>
-						<warmupTime>0.8</warmupTime>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<soundCast>ThrowGrenade</soundCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<defaultProjectile>Proj_Type97GNDE</defaultProjectile>
-						<onlyManualCast>true</onlyManualCast>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<weaponTags>
-						<li>CE_AI_Grenade</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Weapon_Type97GNDE"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>26</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>1</explosiveRadius>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Weapon_Type97GNDE"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>45</Fragment_Small>
-							</fragments>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Proj_Type97GNDE"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>1</explosionRadius>
-							<damageDef>Bomb</damageDef>
-							<damageAmountBase>26</damageAmountBase>
-							<explosionDelay>60</explosionDelay>
-							<dropsCasings>true</dropsCasings>
-							<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-							<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							<speed>12</speed>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Proj_Type97GNDE"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>45</Fragment_Small>
-							</fragments>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>MakeType97GNDE</defName>
-							<label>make Type 97 grenades x10</label>
-							<description>Craft 10 Type 97 grenades.</description>
-							<jobString>Making Type 97 grenades.</jobString>
-							<workAmount>3000</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>FSX</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Weapon_Type97GNDE>10</Weapon_Type97GNDE>
-							</products>
-						</RecipeDef>
-					</value>
-				</li>
-
-				<!-- ========== (USSR) RGD-33 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Weapon_RGD-33GNDE</defName>
-					<statBases>
-						<Mass>0.75</Mass>
-						<Bulk>1.31</Bulk>
-						<MarketValue>10.74</MarketValue>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<label>throw frag grenade</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<range>10.0</range>
-						<minRange>4</minRange>
-						<warmupTime>0.8</warmupTime>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<soundCast>ThrowGrenade</soundCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<defaultProjectile>Proj_RGD-33GNDE</defaultProjectile>
-						<onlyManualCast>true</onlyManualCast>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<weaponTags>
-						<li>CE_AI_Grenade</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Weapon_RGD-33GNDE"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>30</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>1</explosiveRadius>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Weapon_RGD-33GNDE"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>9</Fragment_Small>
-							</fragments>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Proj_RGD-33GNDE"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>1</explosionRadius>
-							<damageDef>Bomb</damageDef>
-							<damageAmountBase>30</damageAmountBase>
-							<explosionDelay>60</explosionDelay>
-							<dropsCasings>true</dropsCasings>
-							<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-							<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							<speed>12</speed>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Proj_RGD-33GNDE"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>9</Fragment_Small>
-							</fragments>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>MakeRGD-33GNDE</defName>
-							<label>make RGD-33 grenades x10</label>
-							<description>Craft 10 RGD-33 grenades.</description>
-							<jobString>Making RGD-33 grenades.</jobString>
-							<workAmount>3600</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>16</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>FSX</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Weapon_RGD-33GNDE>10</Weapon_RGD-33GNDE>
-							</products>
-						</RecipeDef>
-					</value>
-				</li>
-
-				<!-- ========== (FR) Grenade F1 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Weapon_F1GrenadeGNDE</defName>
-					<statBases>
-						<Mass>0.55</Mass>
-						<Bulk>0.65</Bulk>
-						<MarketValue>9.95</MarketValue>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<label>throw frag grenade</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<range>10.0</range>
-						<minRange>4</minRange>
-						<warmupTime>0.8</warmupTime>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<soundCast>ThrowGrenade</soundCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<defaultProjectile>Proj_F1GrenadeGNDE</defaultProjectile>
-						<onlyManualCast>true</onlyManualCast>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<weaponTags>
-						<li>CE_AI_Grenade</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Weapon_F1GrenadeGNDE"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>24</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>1</explosiveRadius>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Weapon_F1GrenadeGNDE"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>55</Fragment_Small>
-							</fragments>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Proj_F1GrenadeGNDE"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>1</explosionRadius>
-							<damageDef>Bomb</damageDef>
-							<damageAmountBase>24</damageAmountBase>
-							<explosionDelay>60</explosionDelay>
-							<dropsCasings>true</dropsCasings>
-							<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-							<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							<speed>12</speed>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Proj_F1GrenadeGNDE"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>55</Fragment_Small>
-							</fragments>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>MakeF1GrenadeGNDE</defName>
-							<label>make F1 grenades x10</label>
-							<description>Craft 10 F1 grenades.</description>
-							<jobString>Making F1 grenades.</jobString>
-							<workAmount>3200</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>12</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>FSX</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Weapon_F1GrenadeGNDE>10</Weapon_F1GrenadeGNDE>
-							</products>
-						</RecipeDef>
-					</value>
-				</li>
-
-				<!-- ========== (UK) Mills Grenade ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Weapon_MillsGrenadeGNDE</defName>
-					<statBases>
-						<Mass>0.765</Mass>
-						<Bulk>0.84</Bulk>
-						<MarketValue>10.74</MarketValue>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<label>throw frag grenade</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<range>10.0</range>
-						<minRange>4</minRange>
-						<warmupTime>0.8</warmupTime>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<soundCast>ThrowGrenade</soundCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<defaultProjectile>Proj_MillsGrenadeGNDE</defaultProjectile>
-						<onlyManualCast>true</onlyManualCast>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<weaponTags>
-						<li>CE_AI_Grenade</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Weapon_MillsGrenadeGNDE"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>27</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>1</explosiveRadius>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Weapon_MillsGrenadeGNDE"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>77</Fragment_Small>
-							</fragments>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Proj_MillsGrenadeGNDE"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>1</explosionRadius>
-							<damageDef>Bomb</damageDef>
-							<damageAmountBase>27</damageAmountBase>
-							<explosionDelay>60</explosionDelay>
-							<dropsCasings>true</dropsCasings>
-							<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-							<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							<speed>12</speed>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Proj_MillsGrenadeGNDE"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>77</Fragment_Small>
-							</fragments>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>MakeMillsGrenadeGNDE</defName>
-							<label>make Mills grenades x10</label>
-							<description>Craft 10 Mills grenades.</description>
-							<jobString>Making Mills grenades.</jobString>
-							<workAmount>3600</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>16</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>FSX</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Weapon_MillsGrenadeGNDE>10</Weapon_MillsGrenadeGNDE>
-							</products>
-						</RecipeDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Melee_JPN.xml b/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Melee_JPN.xml
deleted file mode 100644
index f6c34bb0cc..0000000000
--- a/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Melee_JPN.xml	
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Pratt] WWII Weapons Pack (Vanilla)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Longsword / Katana ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Katana"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.57</cooldownTime>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.57</cooldownTime>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.2</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>1.21</cooldownTime>
-								<armorPenetrationBlunt>1.944</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.44</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Katana"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<MeleeCounterParryBonus>0.78</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Katana"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.56</MeleeCritChance>
-							<MeleeParryChance>0.58</MeleeParryChance>
-							<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_FR.xml b/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_FR.xml
deleted file mode 100644
index 74f516b383..0000000000
--- a/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_FR.xml	
+++ /dev/null
@@ -1,744 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Pratt] WWII Weapons Pack (Vanilla)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== (FR) MAS 36 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MAS36R</defName>
-					<statBases>
-						<Mass>3.72</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.39</SwayFactor>
-						<Bulk>10.20</Bulk>
-						<WorkToMake>11000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_75x54mmFrench_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_75x54mmFrench</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_MAS36R"]/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>
-				</li>
-
-				<!-- ========== (FR) Lebel M1886 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_LebelM1886R</defName>
-					<statBases>
-						<Mass>4.18</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.72</SwayFactor>
-						<Bulk>13.00</Bulk>
-						<WorkToMake>12000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>65</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8x50mmRLebel_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>6.8</reloadTime>
-						<ammoSet>AmmoSet_8x50mmRLebel</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_LebelM1886R"]/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>
-				</li>
-
-				<!-- ========== (FR) Mousqueton Berthier M1916 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MousquetonBerthierM1916R</defName>
-					<statBases>
-						<Mass>3.25</Mass>
-						<RangedWeapon_Cooldown>1.18</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>9.45</Bulk>
-						<WorkToMake>14500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8x50mmRLebel_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_8x50mmRLebel</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_MousquetonBerthierM1916R"]/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>
-				</li>
-
-				<!-- ========== (FR) Sawed-off Double-barel Shotgun ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Sawed-offDouble-barelShotgunSG</defName>
-					<statBases>
-						<Mass>1.90</Mass>
-						<RangedWeapon_Cooldown>0.93</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>2.73</SwayFactor>
-						<Bulk>6.29</Bulk>
-						<WorkToMake>8500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>40</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>11</range>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>2</magazineSize>
-						<reloadTime>1.7</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Sawed-offDouble-barelShotgunSG"]/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>
-				</li>
-
-				<!-- ========== (FR) FM M24-29 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_FMM24-29LMG</defName>
-					<statBases>
-						<Mass>8.90</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.38</SwayFactor>
-						<Bulk>11.80</Bulk>
-						<WorkToMake>30500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>70</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.26</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_75x54mmFrench_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_75x54mmFrench</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_FMM24-29LMG"]/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>
-				</li>
-
-				<!-- ========== (FR) Chauchat LMG ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_ChauchatLMG</defName>
-					<statBases>
-						<Mass>9.07</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.44</SwayFactor>
-						<Bulk>12.43</Bulk>
-						<WorkToMake>31500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>80</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.30</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8x50mmRLebel_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>19</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_8x50mmRLebel</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<noSingleShot>TRUE</noSingleShot>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_ChauchatLMG"]/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>
-				</li>
-
-				<!-- ========== (FR) PM MAS 38 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PMMAS38SMG</defName>
-					<statBases>
-						<Mass>4.34</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.06</SwayFactor>
-						<Bulk>6.30</Bulk>
-						<WorkToMake>26500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>45</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>0.90</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_765x20mmLongue_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_765x20mmLongue</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_PMMAS38SMG"]/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>
-				</li>
-
-				<!-- ========== (FR) Sten MkII ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_StenMkII</defName>
-					<statBases>
-						<Mass>3.20</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.08</SwayFactor>
-						<Bulk>7.62</Bulk>
-						<WorkToMake>27000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.35</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_StenMkII"]/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>
-				</li>
-
-				<!-- ========== (FR) PA MAS 35 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PAMAS35P</defName>
-					<statBases>
-						<Mass>0.73</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.90</SwayFactor>
-						<Bulk>1.97</Bulk>
-						<WorkToMake>7000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_765x20mmLongue_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_765x20mmLongue</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_PAMAS35P"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_GER.xml b/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_GER.xml
deleted file mode 100644
index e6dc5b62a3..0000000000
--- a/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_GER.xml	
+++ /dev/null
@@ -1,1128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Pratt] WWII Weapons Pack (Vanilla)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== (GER) Mauser 98k ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Mauser98kR</defName>
-					<statBases>
-						<Mass>3.70</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.48</SwayFactor>
-						<Bulk>11.10</Bulk>
-						<WorkToMake>11500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Mauser98kR"]/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>
-				</li>
-
-				<!-- ========== (GER) Gewehr 43 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Gewer43R</defName>
-					<statBases>
-						<Mass>4.40</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.57</SwayFactor>
-						<Bulk>11.30</Bulk>
-						<WorkToMake>19000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>55</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_SniperRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Gewer43R"]/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>
-				</li>
-
-				<!-- ========== (GER) Mauser 98k scoped ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Mauser98kscopedSR</defName>
-					<statBases>
-						<Mass>4.10</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.56</SwayFactor>
-						<Bulk>11.10</Bulk>
-						<WorkToMake>15000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>86</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Mauser98kscopedSR"]/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>
-				</li>
-
-				<!-- ========== (GER) STG 44 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Stg44AR</defName>
-					<statBases>
-						<Mass>4.60</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.40</SwayFactor>
-						<Bulk>9.40</Bulk>
-						<WorkToMake>28500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>60</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.54</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_792x33mmKurz_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>51</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_792x33mmKurz</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Stg44AR"]/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>
-				</li>
-
-				<!-- ========== (GER) VG1-5 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_VG5-1C</defName>
-					<statBases>
-						<Mass>4.60</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.35</SwayFactor>
-						<Bulk>8.85</Bulk>
-						<WorkToMake>18000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_792x33mmKurz_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>40</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_792x33mmKurz</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_VG5-1C"]/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>
-				</li>
-
-				<!-- ========== (GER) MG 34 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MG34MG</defName>
-					<statBases>
-						<Mass>12.10</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.70</SwayFactor>
-						<Bulk>15.19</Bulk>
-						<WorkToMake>38500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>100</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.17</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>86</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>250</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_MG34MG"]/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>
-				</li>
-
-				<!-- ========== (GER) MG 42 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MG42MG</defName>
-					<statBases>
-						<Mass>11.60</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.67</SwayFactor>
-						<Bulk>15.20</Bulk>
-						<WorkToMake>38000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>95</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.18</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>86</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>250</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_MG42MG"]/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>
-				</li>
-
-				<!-- ========== (GER) FG 42 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_FG42FM</defName>
-					<statBases>
-						<Mass>4.20</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.37</SwayFactor>
-						<Bulk>9.45</Bulk>
-						<WorkToMake>27500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.03</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>62</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_FG42FM"]/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>
-				</li>
-
-				<!-- ========== (GER) MP 28 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MP28SMG</defName>
-					<statBases>
-						<Mass>4.18</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.25</SwayFactor>
-						<Bulk>9.32</Bulk>
-						<WorkToMake>27500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.21</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>26</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_MP28SMG"]/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>
-				</li>
-
-				<!-- ========== (GER) MP 40 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MP40SMG</defName>
-					<statBases>
-						<Mass>3.97</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<Bulk>6.30</Bulk>
-						<WorkToMake>30000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.27</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>31</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_MP40SMG"]/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>
-				</li>
-
-				<!-- ========== (GER) MP 3008 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MP3008SMG</defName>
-					<statBases>
-						<Mass>3.20</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.08</SwayFactor>
-						<Bulk>7.60</Bulk>
-						<WorkToMake>27000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.35</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_MP3008SMG"]/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>
-				</li>
-
-				<!-- ========== (GER) Luger P 08 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_LugerP08P</defName>
-					<statBases>
-						<Mass>0.87</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>1.03</SwayFactor>
-						<Bulk>2.22</Bulk>
-						<WorkToMake>7000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_LugerP08P"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== (GER) Walter P 38 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_WalterP38P</defName>
-					<statBases>
-						<Mass>0.84</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.00</SwayFactor>
-						<Bulk>2.16</Bulk>
-						<WorkToMake>7000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_WalterP38P"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== (GER) Panzerschreck ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PanzerschreckRL</defName>
-					<statBases>
-						<Mass>11.00</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>2.74</SwayFactor>
-						<Bulk>17.40</Bulk>
-						<WorkToMake>27000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>110</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_88mmRPzB_HEAT</defaultProjectile>
-						<warmupTime>1.9</warmupTime>
-						<range>25</range>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>5.6</reloadTime>
-						<ammoSet>AmmoSet_88mmRPzBRocket</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_PanzerschreckRL"]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_JPN.xml b/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_JPN.xml
deleted file mode 100644
index c229d70a4c..0000000000
--- a/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_JPN.xml	
+++ /dev/null
@@ -1,498 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Pratt] WWII Weapons Pack (Vanilla)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== (JPN) Type 99 Arisaka ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Type99ArisakaR</defName>
-					<statBases>
-						<Mass>3.79</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.50</SwayFactor>
-						<Bulk>11.18</Bulk>
-						<WorkToMake>11500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_77x58mmArisaka_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>62</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_77x58mmArisaka</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Type99ArisakaR"]/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>
-				</li>
-
-				<!-- ========== (JPN) Type 99 Arisaka scoped ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Type99ArisakascopedSR</defName>
-					<statBases>
-						<Mass>4.04</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.56</SwayFactor>
-						<Bulk>11.18</Bulk>
-						<WorkToMake>15000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_77x58mmArisaka_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_77x58mmArisaka</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Type99ArisakascopedSR"]/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>
-				</li>
-
-				<!-- ========== (JPN) Type 11 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Type11LMG</defName>
-					<statBases>
-						<Mass>10.20</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.48</SwayFactor>
-						<Bulk>13.00</Bulk>
-						<WorkToMake>32000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>85</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.09</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_65x50mmSRArisaka_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>62</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_65x50mmSRArisaka</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Type11LMG"]/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>
-				</li>
-
-				<!-- ========== (JPN) Type 99 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Type99LMG</defName>
-					<statBases>
-						<Mass>10.40</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.55</SwayFactor>
-						<Bulk>12.81</Bulk>
-						<WorkToMake>32000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>85</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.19</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_77x58mmArisaka_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_77x58mmArisaka</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Type99LMG"]/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>
-				</li>
-
-				<!-- ========== (JPN) Type 100 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Type100SMG</defName>
-					<statBases>
-						<Mass>3.70</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.26</SwayFactor>
-						<Bulk>8.90</Bulk>
-						<WorkToMake>27500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.13</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8x22mmNambu_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_8x22mmNambu</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Type100SMG"]/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>
-				</li>
-
-				<!-- ========== (JPN) Type 14 Nambu ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Type14NambuP</defName>
-					<statBases>
-						<Mass>0.65</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.19</ShotSpread>
-						<SwayFactor>0.97</SwayFactor>
-						<Bulk>1.71</Bulk>
-						<WorkToMake>7000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8x22mmNambu_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_8x22mmNambu</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Type14NambuP"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_UK.xml b/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_UK.xml
deleted file mode 100644
index e1c0b1b550..0000000000
--- a/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_UK.xml	
+++ /dev/null
@@ -1,645 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Pratt] WWII Weapons Pack (Vanilla)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== (UK) Lee Enfield N°4 MkI ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_LeeEnfieldN4MkIR</defName>
-					<statBases>
-						<Mass>4.11</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.54</SwayFactor>
-						<Bulk>11.29</Bulk>
-						<WorkToMake>11500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_303British</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_LeeEnfieldN4MkIR"]/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>
-				</li>
-
-				<!-- ========== (UK) LeeEnfield N°4 MkI (T) ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_LeeEnfieldN4MkI-TSR</defName>
-					<statBases>
-						<Mass>4.84</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.21</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.65</SwayFactor>
-						<Bulk>11.29</Bulk>
-						<WorkToMake>15500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>55</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
-						<warmupTime>1.275</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_303British</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_LeeEnfieldN4MkI-TSR"]/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>
-				</li>
-
-				<!-- ========== (UK) Bren MkII ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_BrenMkIILMG</defName>
-					<statBases>
-						<Mass>10.35</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.53</SwayFactor>
-						<Bulk>12.56</Bulk>
-						<WorkToMake>32000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>85</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.22</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>59</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_303British</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_BrenMkIILMG"]/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>
-				</li>
-
-				<!-- ========== (UK) Sten MkIII ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_StenMkIII</defName>
-					<statBases>
-						<Mass>3.20</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.08</SwayFactor>
-						<Bulk>7.62</Bulk>
-						<WorkToMake>27000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.35</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_StenMkIII"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.79</cooldownTime>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>3.02</cooldownTime>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.63</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.55</cooldownTime>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== (UK) Sten MkVI ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_StenMkVI</defName>
-					<statBases>
-						<Mass>4.50</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.36</SwayFactor>
-						<Bulk>9.08</Bulk>
-						<WorkToMake>27500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.04</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_StenMkVI"]/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>
-				</li>
-
-				<!-- ========== (UK) Thompson M1928 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_ThompsonM1928UKSMG</defName>
-					<statBases>
-						<Mass>4.90</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.35</SwayFactor>
-						<Bulk>8.60</Bulk>
-						<WorkToMake>27500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.32</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>25</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_ThompsonM1928UKSMG"]/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>
-				</li>
-
-				<!-- ========== (UK) Webley ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_WebleyP</defName>
-					<statBases>
-						<Mass>1.10</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>2.86</Bulk>
-						<WorkToMake>5000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_455Webley_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Revolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_455Webley</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_WebleyP"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== (UK) PIAT ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PIAT</defName>
-					<statBases>
-						<Mass>15.00</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>2.49</SwayFactor>
-						<Bulk>10.90</Bulk>
-						<WorkToMake>26500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>105</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_83mmPIATGrenade_HEAT</defaultProjectile>
-						<warmupTime>1.9</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_IncendiaryLauncher</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>5.6</reloadTime>
-						<ammoSet>AmmoSet_83mmPIATGrenade</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_PIAT"]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_US.xml b/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_US.xml
deleted file mode 100644
index 045fe7448e..0000000000
--- a/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_US.xml	
+++ /dev/null
@@ -1,1222 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Pratt] WWII Weapons Pack (Vanilla)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== (US) M1 Garand ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_M1GarandR</defName>
-					<statBases>
-						<Mass>4.31</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.53</SwayFactor>
-						<Bulk>11.00</Bulk>
-						<WorkToMake>15000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>52</range>
-						<soundCast>Shot_SniperRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_3006Springfield</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_M1GarandR"]/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>
-				</li>
-
-				<!-- ========== (US) Springfield 1903 scoped ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Springfield1903scopedSR</defName>
-					<statBases>
-						<Mass>4.14</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.15</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.54</SwayFactor>
-						<Bulk>11.00</Bulk>
-						<WorkToMake>14500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
-						<warmupTime>1.225</warmupTime>
-						<range>63</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_3006Springfield</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Springfield1903scopedSR"]/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>
-				</li>
-
-				<!-- ========== (US) Springfield 1903 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Springfield1903R</defName>
-					<statBases>
-						<Mass>3.90</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.49</SwayFactor>
-						<Bulk>11.00</Bulk>
-						<WorkToMake>11500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>63</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_3006Springfield</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Springfield1903R"]/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>
-				</li>
-
-				<!-- ========== (US) M1897 Trench Gun ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_M1897trenchgunSG</defName>
-					<statBases>
-						<Mass>3.60</Mass>
-						<RangedWeapon_Cooldown>0.99</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.36</SwayFactor>
-						<Bulk>10.00</Bulk>
-						<WorkToMake>10000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>7</range>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.25</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_M1897trenchgunSG"]/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>
-				</li>
-
-				<!-- ========== (US} M1919A6 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_M1919A6LMG</defName>
-					<statBases>
-						<Mass>14.70</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.97</SwayFactor>
-						<Bulk>16.46</Bulk>
-						<WorkToMake>40500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>120</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.03</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>70</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>250</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_3006Springfield</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_M1919A6LMG"]/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>
-				</li>
-
-				<!-- ========== (US) BAR ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_BarFM</defName>
-					<statBases>
-						<Mass>7.25</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.34</SwayFactor>
-						<Bulk>12.94</Bulk>
-						<WorkToMake>30500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>70</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.51</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_3006Springfield</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_BarFM"]/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>
-				</li>
-
-				<!-- ========== (US) M1 Carbine ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_USM1C</defName>
-					<statBases>
-						<Mass>2.40</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.14</SwayFactor>
-						<Bulk>9.00</Bulk>
-						<WorkToMake>17500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>45</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_30Carbine_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>37</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_30Carbine</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_USM1C"]/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>
-				</li>
-
-				<!-- ========== (US) M2 Carbine ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_USM2C</defName>
-					<statBases>
-						<Mass>2.40</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.14</SwayFactor>
-						<Bulk>9.00</Bulk>
-						<WorkToMake>27000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>45</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.88</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_30Carbine_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>37</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_30Carbine</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_USM2C"]/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>
-				</li>
-
-				<!-- ========== (US) Thompson M1928 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_ThompsonM1928SMG</defName>
-					<statBases>
-						<Mass>4.90</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.35</SwayFactor>
-						<Bulk>9.60</Bulk>
-						<WorkToMake>28000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>55</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.32</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>25</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_ThompsonM1928SMG"]/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>
-				</li>
-
-				<!-- ========== (US) Thompson M1928A1 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_ThompsonM1928A1SMG</defName>
-					<statBases>
-						<Mass>4.90</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.35</SwayFactor>
-						<Bulk>9.60</Bulk>
-						<WorkToMake>28000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>55</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.32</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>25</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_ThompsonM1928A1SMG"]/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>
-				</li>
-
-				<!-- ========== (US) Thompson M1A1 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_ThompsonM1A1SMG</defName>
-					<statBases>
-						<Mass>4.50</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.26</SwayFactor>
-						<Bulk>8.10</Bulk>
-						<WorkToMake>27500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.38</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>25</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_ThompsonM1A1SMG"]/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>
-				</li>
-
-				<!-- ========== (US) M3 Grease Gun ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_M3greasegunSMG</defName>
-					<statBases>
-						<Mass>3.70</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.11</SwayFactor>
-						<Bulk>5.56</Bulk>
-						<WorkToMake>29500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>45</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.51</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<soundCast>Shot_HeavySMG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_M3greasegunSMG"]/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>
-				</li>
-
-				<!-- ========== (US) M3A1 Grease Gun ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_M3a1greasegunSMG</defName>
-					<statBases>
-						<Mass>3.61</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.10</SwayFactor>
-						<Bulk>5.56</Bulk>
-						<WorkToMake>29500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>45</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<soundCast>Shot_HeavySMG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_M3a1greasegunSMG"]/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>
-				</li>
-
-				<!-- ========== (US) Colt 1911 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Colt1911P</defName>
-					<statBases>
-						<Mass>1.10</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.07</SwayFactor>
-						<Bulk>2.10</Bulk>
-						<WorkToMake>7000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Colt1911P"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== (US) M9A1 Bazooka ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_M9A1BazookaRL</defName>
-					<statBases>
-						<Mass>7.20</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>2.27</SwayFactor>
-						<Bulk>16.50</Bulk>
-						<WorkToMake>25000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>95</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_M6A3_HEAT</defaultProjectile>
-						<warmupTime>1.9</warmupTime>
-						<range>40</range>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>5.6</reloadTime>
-						<ammoSet>AmmoSet_M6A3Rocket</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_M9A1BazookaRL"]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_USSR.xml b/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_USSR.xml
deleted file mode 100644
index f933eca2ca..0000000000
--- a/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_USSR.xml	
+++ /dev/null
@@ -1,663 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Pratt] WWII Weapons Pack (Vanilla)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== (USSR) Mosin-Nagant M91-30 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Mosin-NagantM91-30R</defName>
-					<statBases>
-						<Mass>4.00</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.63</SwayFactor>
-						<Bulk>12.32</Bulk>
-						<WorkToMake>12000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>55</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Mosin-NagantM91-30R"]/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>
-				</li>
-
-				<!-- ========== (USSR) Mosin-Nagant M91-30 scoped ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MosinNagantM91-30scopedSR</defName>
-					<statBases>
-						<Mass>4.27</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.21</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.69</SwayFactor>
-						<Bulk>12.32</Bulk>
-						<WorkToMake>15500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>55</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.275</warmupTime>
-						<range>75</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_MosinNagantM91-30scopedSR"]/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>
-				</li>
-
-				<!-- ========== (USSR) SVT 40 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SVT40R</defName>
-					<statBases>
-						<Mass>3.85</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.61</SwayFactor>
-						<Bulk>12.26</Bulk>
-						<WorkToMake>19000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>55</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_SniperRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_SVT40R"]/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>
-				</li>
-
-				<!-- ========== (USSR) DP 28 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_DP28LMG</defName>
-					<statBases>
-						<Mass>9.12</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.53</SwayFactor>
-						<Bulk>14.70</Bulk>
-						<WorkToMake>32000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>85</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.32</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>62</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>47</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_DP28LMG"]/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>
-				</li>
-
-				<!-- ========== (USSR) PPSH 41 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PPSH41SMG</defName>
-					<statBases>
-						<Mass>3.63</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.21</SwayFactor>
-						<Bulk>9.43</Bulk>
-						<WorkToMake>27500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.22</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>23</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>71</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_PPSH41SMG"]/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>
-				</li>
-
-				<!-- ========== (USSR) PPS 43 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PPS43SMG</defName>
-					<statBases>
-						<Mass>3.04</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.12</SwayFactor>
-						<Bulk>6.15</Bulk>
-						<WorkToMake>29500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>45</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.35</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>23</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>35</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_PPS43SMG"]/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>
-				</li>
-
-				<!-- ========== (USSR) PPSH 41 (stick mag) ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PPSH41stickSMG</defName>
-					<statBases>
-						<Mass>3.63</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.21</SwayFactor>
-						<Bulk>8.43</Bulk>
-						<WorkToMake>27000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>45</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.22</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>23</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>35</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_PPSH41stickSMG"]/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>
-				</li>
-
-				<!-- ========== (USSR) TT-33 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_TT-33P</defName>
-					<statBases>
-						<Mass>0.85</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.93</SwayFactor>
-						<Bulk>1.94</Bulk>
-						<WorkToMake>7000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_TT-33P"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Prestige Specialist Armor/Apparel_Armor.xml b/Patches/Prestige Specialist Armor/Apparel_Armor.xml
deleted file mode 100644
index 4e48edf03d..0000000000
--- a/Patches/Prestige Specialist Armor/Apparel_Armor.xml	
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Prestige Specialist Armours</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Grenadier armor -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ArmorGrenadierPrestige"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ArmorGrenadierPrestige"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>41</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_ArmorGrenadierPrestige"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>50</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ArmorGrenadierPrestige"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<label>launch 30x29mm grenade</label>
-								<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<onlyManualCast>True</onlyManualCast>
-								<warmupTime>1.5</warmupTime>
-								<range>40</range>
-								<minRange>5</minRange>
-								<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-								<soundCast>Shot_IncendiaryLauncher</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>14</muzzleFlashScale>
-								<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-								<defaultProjectile>Bullet_30x29mmGrenade_HE</defaultProjectile>
-								<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ArmorGrenadierPrestige"]/comps/li[@Class="CompProperties_Reloadable"]/ammoDef</xpath>
-					<value>
-						<ammoDef>Ammo_30x29mmGrenade_HE</ammoDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ArmorGrenadierPrestige"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountPerCharge</xpath>
-					<value>
-						<ammoCountPerCharge>1</ammoCountPerCharge>
-					</value>
-				</li>
-
-				<!-- Phoenix armor -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_ArmorPhoenixPrestige"]/statBases</xpath>
-					<value>
-						<Bulk>110</Bulk>
-						<WornBulk>18</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ArmorPhoenixPrestige"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ArmorPhoenixPrestige"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>26</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ArmorPhoenixPrestige"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>55</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_ArmorPhoenixPrestige"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>60</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ArmorPhoenixPrestige"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<label>launch 30x64mm incendiary</label>
-								<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<onlyManualCast>True</onlyManualCast>
-								<warmupTime>1.5</warmupTime>
-								<range>40</range>
-								<minRange>5</minRange>
-								<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-								<soundCast>Shot_IncendiaryLauncher</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>14</muzzleFlashScale>
-								<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-								<defaultProjectile>Bullet_30x64mmFuel_Incendiary</defaultProjectile>
-								<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ArmorPhoenixPrestige"]/comps/li[@Class="CompProperties_Reloadable"]/ammoDef</xpath>
-					<value>
-						<ammoDef>Ammo_30x64mmFuel_Incendiary</ammoDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ArmorPhoenixPrestige"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountPerCharge</xpath>
-					<value>
-						<ammoCountPerCharge>1</ammoCountPerCharge>
-					</value>
-				</li>
-
-				<!-- ========== Locust Armor ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_ArmorLocustPrestige"]/statBases</xpath>
-					<value>
-						<Bulk>85</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ArmorLocustPrestige"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ArmorLocustPrestige"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>38</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_ArmorLocustPrestige"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>40</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ArmorLocustPrestige"]/statBases/JumpRange</xpath>
-					<value>
-						<JumpRange>30</JumpRange>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Project RimFactory - Materials/Ammo_PRFM.xml b/Patches/Project RimFactory - Materials/Ammo_PRFM.xml
deleted file mode 100644
index abaff5f168..0000000000
--- a/Patches/Project RimFactory - Materials/Ammo_PRFM.xml	
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Project RimFactory - Materials</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_Arrow"]/ammoTypes</xpath>
-					<value>
-						<Ammo_Arrow_Iron>Projectile_Arrow_Iron</Ammo_Arrow_Iron>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_StreamlinedArrow"]/ammoTypes</xpath>
-					<value>
-						<Ammo_Arrow_Iron>Projectile_StreamlinedArrow_Iron</Ammo_Arrow_Iron>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_GreatArrow"]/ammoTypes</xpath>
-					<value>
-						<Ammo_GreatArrow_Iron>Projectile_GreatArrow_Iron</Ammo_GreatArrow_Iron>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ==================== Arrows & Streamlined Arrows ========================== -->
-
-						<!-- ==================== Ammo Category ========================== -->
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>IronArrow</defName>
-							<label>iron arrow</label>
-							<labelShort>iron</labelShort>
-							<description>The arrow head is made from iron, capable of punching through shields and leather armor.</description>
-							<advanced>true</advanced>
-						</CombatExtended.AmmoCategoryDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoArrowBase">
-							<defName>Ammo_Arrow_Iron</defName>
-							<label>arrow (iron)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Neolithic/Arrow/Steel</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<Mass>0.034</Mass>
-								<MarketValue>0.53</MarketValue>
-							</statBases>
-							<ammoClass>IronArrow</ammoClass>
-						</ThingDef>
-
-						<!-- ================== Projectiles (short bow) ================== -->
-
-						<ThingDef ParentName="BaseArrowProjectile">
-							<defName>Projectile_Arrow_Iron</defName>
-							<label>arrow (iron)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>24</speed>
-								<damageAmountBase>7</damageAmountBase>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.02</armorPenetrationBlunt>
-								<preExplosionSpawnChance>0.666</preExplosionSpawnChance><!-- 29.94 arrows per resource -->
-								<preExplosionSpawnThingDef>Ammo_Arrow_Iron</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== Projectiles (Recurve Bow) ================== -->
-
-						<ThingDef ParentName="BaseStreamlinedArrowProjectile">
-							<defName>Projectile_StreamlinedArrow_Iron</defName>
-							<label>streamlined arrow (iron)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>33</speed>
-								<damageAmountBase>9</damageAmountBase>
-								<armorPenetrationSharp>1.0</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.9</armorPenetrationBlunt>
-								<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Ammo_Arrow_Iron</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>MakeAmmo_Arrow_Iron</defName>
-							<label>make iron arrows x10</label>
-							<description>Craft 10 iron arrows.</description>
-							<jobString>Making iron arrows.</jobString>
-							<workAmount>300</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>PRF_Iron</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-									<li>PRF_Iron</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Arrow_Iron>10</Ammo_Arrow_Iron>
-							</products>
-						</RecipeDef>
-
-						<!-- ==================== Great Arrows ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoGreatArrowBase">
-							<defName>Ammo_GreatArrow_Iron</defName>
-							<label>great arrow (iron)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Neolithic/Arrow/Steel</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<Mass>0.115</Mass>
-								<MarketValue>0.66</MarketValue>
-							</statBases>
-							<ammoClass>IronArrow</ammoClass>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseGreatArrowProjectile">
-							<defName>Projectile_GreatArrow_Iron</defName>
-							<label>great arrow (iron)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>7</damageAmountBase>
-								<armorPenetrationBlunt>2.340</armorPenetrationBlunt>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<preExplosionSpawnChance>0.6</preExplosionSpawnChance><!-- 25 arrows per resource -->
-								<preExplosionSpawnThingDef>Ammo_GreatArrow_Iron</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>MakeAmmo_GreatArrow_Iron</defName>
-							<label>make iron great arrows x10</label>
-							<description>Craft 10 iron great arrows.</description>
-							<jobString>Making iron great arrows.</jobString>
-							<workAmount>400</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>PRF_Iron</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-									<li>PRF_Iron</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_GreatArrow_Iron>10</Ammo_GreatArrow_Iron>
-							</products>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Project RimFactory - Materials/Items_Fossil.xml b/Patches/Project RimFactory - Materials/Items_Fossil.xml
deleted file mode 100644
index 7c07d88a90..0000000000
--- a/Patches/Project RimFactory - Materials/Items_Fossil.xml	
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Project RimFactory - Materials</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Copied Values from Expanded Materials - Metals patch since it Project RimFactory merges it -->
-				<!-- Combining the Bulk Values -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PRF_Fossil"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Project RimFactory - Materials/Items_Resource_Carbon.xml b/Patches/Project RimFactory - Materials/Items_Resource_Carbon.xml
deleted file mode 100644
index 4de62125cb..0000000000
--- a/Patches/Project RimFactory - Materials/Items_Resource_Carbon.xml	
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Project RimFactory - Materials</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Copied Values from Expanded Materials - Plastics patch -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PRF_Carbon" or defName="PRF_CarbonFiber" or defName="PRF_CarbonKevlarComposite" or
-						defName="PRF_CarbonPlate" or defName="PRF_RawDiamond" or defName="PRF_SyntheticDiamond"]/statBases </xpath>
-					<value>
-						<Bulk>0.02</Bulk>
-					</value>
-				</li>
-
-				<!-- Carbon Fiber -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PRF_CarbonFiber"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.95</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PRF_CarbonFiber"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1.4</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PRF_CarbonFiber"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.08</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PRF_CarbonFiber"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>0.4</Mass>
-						<MeleePenetrationFactor>0.8</MeleePenetrationFactor>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PRF_CarbonFiber"]/stuffProps/categories</xpath>
-					<value>
-						<li>Metallic_Weapon</li>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<!-- carbon-kevlar composite -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PRF_CarbonKevlarComposite"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.9</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PRF_CarbonKevlarComposite"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1.55</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- Carbon fiber plate -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PRF_CarbonPlate"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.5</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PRF_CarbonPlate"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1.6</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- Synthetic Diamond -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PRF_CarbonPlate"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.45</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PRF_CarbonPlate"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1.8</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Project RimFactory - Materials/Items_Resource_Coal.xml b/Patches/Project RimFactory - Materials/Items_Resource_Coal.xml
deleted file mode 100644
index 8b2da07acb..0000000000
--- a/Patches/Project RimFactory - Materials/Items_Resource_Coal.xml	
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Project RimFactory - Materials</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Copied Values from Expanded Materials - Metals patch since it Project RimFactory merges it -->
-				<!-- Combining the Bulk Values -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PRF_Coal"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Project RimFactory - Materials/Items_Resource_Coke.xml b/Patches/Project RimFactory - Materials/Items_Resource_Coke.xml
deleted file mode 100644
index 4873a4bdc9..0000000000
--- a/Patches/Project RimFactory - Materials/Items_Resource_Coke.xml	
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Project RimFactory - Materials</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Copied Values from Expanded Materials - Metals patch since it Project RimFactory merges it -->
-				<!-- Combining the Bulk Values -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PRF_Coke"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Project RimFactory - Materials/Items_Resource_Glasswork.xml b/Patches/Project RimFactory - Materials/Items_Resource_Glasswork.xml
deleted file mode 100644
index 9f6393dc51..0000000000
--- a/Patches/Project RimFactory - Materials/Items_Resource_Glasswork.xml	
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Project RimFactory - Materials</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Copied Values from Expanded Materials - Metals patch since it Project RimFactory merges it -->
-				<!-- Combining the Bulk Values -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PRF_Glass" or defName="PRF_RGlass"]/statBases</xpath>
-					<value>
-						<Bulk>0.02</Bulk>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Project RimFactory - Materials/Items_Resource_Masonry.xml b/Patches/Project RimFactory - Materials/Items_Resource_Masonry.xml
deleted file mode 100644
index 4be12d2eb8..0000000000
--- a/Patches/Project RimFactory - Materials/Items_Resource_Masonry.xml	
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Project RimFactory - Materials</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Copied Values from Expanded Materials - Metals patch since it Project RimFactory merges it -->
-				<!-- Combining the Bulk Values -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PRF_Brick" or defName="PRF_Concrete" or defName="PRF_RefConcrete"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Project RimFactory - Materials/Items_Resource_Metal.xml b/Patches/Project RimFactory - Materials/Items_Resource_Metal.xml
deleted file mode 100644
index a719e71cb2..0000000000
--- a/Patches/Project RimFactory - Materials/Items_Resource_Metal.xml	
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Project RimFactory - Materials</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Copied Values from Expanded Materials - Metals patch since it Project RimFactory merges it -->
-				<!-- Combining the Bulk Values -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PRF_Iron" or defName="PRF_Copper" or defName="PRF_StainlessSteel"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-
-				<!-- Iron -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PRF_Iron"]/stuffProps/categories</xpath>
-					<value>
-						<li>Metallic_Weapon</li>
-						<li>Steeled</li>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PRF_Iron"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.8</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PRF_Iron"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1.2</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- Copper -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PRF_Copper"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.25</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PRF_Copper"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.32</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- Stainless Steel -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PRF_StainlessSteel"]/stuffProps/categories</xpath>
-					<value>
-						<li>Metallic_Weapon</li>
-						<li>Steeled</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PRF_StainlessSteel"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>1.1</MeleePenetrationFactor>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PRF_StainlessSteel"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1.2</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PRF_StainlessSteel"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1.7</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Project RimFactory - Materials/Items_Resource_Plastics.xml b/Patches/Project RimFactory - Materials/Items_Resource_Plastics.xml
deleted file mode 100644
index 8276d7216d..0000000000
--- a/Patches/Project RimFactory - Materials/Items_Resource_Plastics.xml	
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Project RimFactory - Materials</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Copied Values from Expanded Materials - Plastics patch since it Project RimFactory merges it -->
-				<!-- Plastic -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PRF_MixedPlastic"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PRF_MixedPlastic"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.02</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PRF_MixedPlastic"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.05</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- Polyester -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PRF_Polyester"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PRF_Polyester"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.012</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PRF_Polyester"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.015</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- Kevlar -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PRF_Kevlar"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PRF_Kevlar"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.5</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PRF_Kevlar"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.04</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Project RimFactory - Materials/Items_Resource_Quartz.xml b/Patches/Project RimFactory - Materials/Items_Resource_Quartz.xml
deleted file mode 100644
index 89db58ca21..0000000000
--- a/Patches/Project RimFactory - Materials/Items_Resource_Quartz.xml	
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Project RimFactory - Materials</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Quartz -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PRF_quartz"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-				<!-- Crystal Powder -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PRF_CrystalPowder"]/statBases</xpath>
-					<value>
-						<Bulk>0.02</Bulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PRF_CrystalPowder"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.01</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PRF_CrystalPowder"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.004</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Project RimFactory - Materials/Items_Resource_Raw.xml b/Patches/Project RimFactory - Materials/Items_Resource_Raw.xml
deleted file mode 100644
index a3edd0da12..0000000000
--- a/Patches/Project RimFactory - Materials/Items_Resource_Raw.xml	
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Project RimFactory - Materials</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Combined Bulk -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PRF_RawClay" or defName="PRF_Cement" or defName="PRF_RawSand"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Prostheses+/Patch_Implants.xml b/Patches/Prostheses+/Patch_Implants.xml
deleted file mode 100644
index 48c882344e..0000000000
--- a/Patches/Prostheses+/Patch_Implants.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Prostheses+</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Combat_Mechanites_TwoA"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Combat_Mechanites_TwoA"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Combat_Mechanites_ThreeA"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Combat_Mechanites_ThreeA"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Protective_Mechanites"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Protective_Mechanites"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Prostheses+/Patch_Prostheses.xml b/Patches/Prostheses+/Patch_Prostheses.xml
deleted file mode 100644
index 5deddcf77c..0000000000
--- a/Patches/Prostheses+/Patch_Prostheses.xml
+++ /dev/null
@@ -1,648 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Prostheses+</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Reinforced_Wooden_Arm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>reinforced wooden arm</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.48</cooldownTime>
-								<armorPenetrationBlunt>0.350</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Hydraulic_Wooden_Arm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>hydraulic wooden arm</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.48</cooldownTime>
-								<armorPenetrationBlunt>0.550</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Simple_Mechanical_Arm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>simple mechanical arm</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.68</cooldownTime>
-								<armorPenetrationBlunt>0.650</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Reinforced_Mechanical_Arm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>reinforced mechanical arm</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.88</cooldownTime>
-								<armorPenetrationBlunt>0.850</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Metal_Blade"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.18</cooldownTime>
-								<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.32</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Advanced_Hand_Prosthesis"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>advanced arm prosthesis</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.48</cooldownTime>
-								<armorPenetrationBlunt>0.950</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Mechanical_Arm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mechanical arm</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.68</cooldownTime>
-								<armorPenetrationBlunt>0.850</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Hydraulic_Reinforced_Arm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>hydraulic reinforced arm</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.78</cooldownTime>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Energy_Spear"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>energy spear</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.64</cooldownTime>
-								<armorPenetrationBlunt>0.415</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.44</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Energy_Spear_A"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Energy spear MK 1A</label>
-								<capacities>
-									<li>TP_Energy_Spear_A_Scratch</li>
-								</capacities>
-								<power>17</power>
-								<hediff>TP_Poisoning_Chemicals</hediff>
-								<cooldownTime>2.64</cooldownTime>
-								<armorPenetrationBlunt>0.415</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.44</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Energy_Spear_B"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Energy spear MK 1B</label>
-								<capacities>
-									<li>TP_Energy_Spear_B_Scratch</li>
-								</capacities>
-								<power>17</power>
-								<hediff>TP_Disorienting_Gases</hediff>
-								<cooldownTime>2.64</cooldownTime>
-								<armorPenetrationBlunt>0.415</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.44</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Energy_Spear_C"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Energy spear MK 1C</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>1.64</cooldownTime>
-								<armorPenetrationBlunt>0.415</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.55</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Electromechanical_Arm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>electromechanical arm</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.48</cooldownTime>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Sensory_Active_Hand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>sensory active hand</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.42</cooldownTime>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Reinforced_Electrochemical_Arm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>reinforced electrochemical arm</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.52</cooldownTime>
-								<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Bionic_Blades"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>bionic blades</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.18</cooldownTime>
-								<armorPenetrationBlunt>0.48</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.88</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Bionic_Blades_A"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>bionic blades MK 1A</label>
-								<capacities>
-									<li>TP_Energy_Spear_A_Scratch</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.18</cooldownTime>
-								<armorPenetrationBlunt>0.48</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.88</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Bionic_Blades_B"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>bionic blades MK 1B</label>
-								<capacities>
-									<li>TP_Energy_Spear_B_Scratch</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.18</cooldownTime>
-								<armorPenetrationBlunt>0.48</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.88</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Bionic_Blades_C"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>bionic blades MK 1C</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>2.18</cooldownTime>
-								<armorPenetrationBlunt>0.58</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.08</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Mechanized_Arm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mechanized arm</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2.48</cooldownTime>
-								<armorPenetrationBlunt>7.450</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Hydromechanical_Arm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>hydromechanical arm</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2.48</cooldownTime>
-								<armorPenetrationBlunt>8.650</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Bioelectric_Hand_Prosthesis"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>bioelectric arm prosthesis</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2.48</cooldownTime>
-								<armorPenetrationBlunt>8.650</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Myoelectric_Hand_Prosthesis"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>bioelectric arm prosthesis</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2.48</cooldownTime>
-								<armorPenetrationBlunt>8.50</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Programmable_Hand_Prosthesis"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>programmable arm prosthesis</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11.4</power>
-								<cooldownTime>2.48</cooldownTime>
-								<armorPenetrationBlunt>8.70</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Cybernetic_Hand_MK_One"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>programmable arm prosthesis</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12.4</power>
-								<cooldownTime>2.48</cooldownTime>
-								<armorPenetrationBlunt>9.40</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Cyber_blades"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>cyber ​​blades MK Basic</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>2.18</cooldownTime>
-								<armorPenetrationBlunt>1.4</armorPenetrationBlunt>
-								<armorPenetrationSharp>4.5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Cyber_blades_A"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>cyber ​​blades MK 1A</label>
-								<capacities>
-									<li>TP_Energy_Spear_A_Scratch</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>2.18</cooldownTime>
-								<armorPenetrationBlunt>1.4</armorPenetrationBlunt>
-								<armorPenetrationSharp>4.5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Cyber_blades_B"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>cyber ​​blades MK 1B</label>
-								<capacities>
-									<li>TP_Energy_Spear_B_Scratch</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>2.18</cooldownTime>
-								<armorPenetrationBlunt>1.4</armorPenetrationBlunt>
-								<armorPenetrationSharp>4.5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Cyber_blades_C"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>cyber ​​blades MK 1C</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>2.38</cooldownTime>
-								<armorPenetrationBlunt>1.4</armorPenetrationBlunt>
-								<armorPenetrationSharp>4.95</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Cybernetic_Arm_MK_Medicine"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>cybernetic arm MK medicine</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12.4</power>
-								<cooldownTime>2.48</cooldownTime>
-								<armorPenetrationBlunt>9.40</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Cybernetic_Arm_MK_Construction"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>cybernetic arm MK construction</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12.4</power>
-								<cooldownTime>2.48</cooldownTime>
-								<armorPenetrationBlunt>9.40</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Cybernetic_Arm_MK_Sniper"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>cybernetic arm MK Sniper</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12.4</power>
-								<cooldownTime>2.48</cooldownTime>
-								<armorPenetrationBlunt>9.40</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Cybernetic_Arm_MK_Two"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>cybernetic arm MK 2</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14.4</power>
-								<cooldownTime>2.68</cooldownTime>
-								<armorPenetrationBlunt>11.40</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Cybernetic_Arm_MK_Three"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>cybernetic arm MK 3</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14.4</power>
-								<cooldownTime>2.68</cooldownTime>
-								<armorPenetrationBlunt>11.40</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Unstable_Shield_Generator"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Unstable_Shield_Generator"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Shield_Generator"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Shield_Generator"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Prostheses+/Patch_Utility.xml b/Patches/Prostheses+/Patch_Utility.xml
deleted file mode 100644
index 14c266b35f..0000000000
--- a/Patches/Prostheses+/Patch_Utility.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Prostheses+</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Shockproof_Plates"]/stages/li[1]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Shockproof_Plates"]/stages/li[2]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Shockproof_Plates"]/stages/li[3]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Shockproof_Plates"]/stages/li[4]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>7</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Shockproof_Plates"]/stages/li[5]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>8</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Ablation_Plates"]/stages/li[1]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Ablation_Plates"]/stages/li[2]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Ablation_Plates"]/stages/li[3]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.50</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Ablation_Plates"]/stages/li[4]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2.50</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Ablation_Plates"]/stages/li[5]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5.00</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Combat_Exosuit"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5.00</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Combat_Exosuit"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>5.00</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Combat_Exohelmet"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2.50</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "TP_Combat_Exohelmet"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2.50</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName= "TP_Bioelectric_Exoskeleton"]/stages/li/statOffsets/CarryingCapacity</xpath>
-					<value>
-						<CarryWeight>5</CarryWeight>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName= "TP_Myoelectric_Exoskeleton"]/stages/li/statOffsets/CarryingCapacity</xpath>
-					<value>
-						<CarryWeight>10</CarryWeight>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName= "TP_Programmable_Exoskeleton"]/stages/li/statOffsets/CarryingCapacity</xpath>
-					<value>
-						<CarryWeight>15</CarryWeight>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName= "TP_Cybernetic_Exoskeleton_MK_OneA"]/stages/li/statOffsets/CarryingCapacity</xpath>
-					<value>
-						<CarryWeight>30</CarryWeight>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Protoswords/Proto_CE.xml b/Patches/Protoswords/Proto_CE.xml
deleted file mode 100644
index 6c2d83cd54..0000000000
--- a/Patches/Protoswords/Proto_CE.xml
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Protoswords</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Protosword-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BON_Protosword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<chanceFactor>0.1</chanceFactor>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>26</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Bomb</def>
-										<amount>6</amount>
-										<chance>0.3</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>1.3</cooldownTime>
-								<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>13</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Bomb</def>
-										<amount>6</amount>
-										<chance>0.3</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>1.35</cooldownTime>
-								<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BON_Protosword"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<MeleeCounterParryBonus>0.36</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BON_Protosword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.45</MeleeCritChance>
-							<MeleeParryChance>0.32</MeleeParryChance>
-							<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="BON_Protosword"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="BON_Protosword"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BON_Protosword"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- Patch sear tool capacity & damage type -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ToolCapacityDef[defName="BON_SearStab"]</xpath>
-					<value>
-						<li Class="CombatExtended.ModExtensionMeleeToolPenetration">
-							<canHitInternal>true</canHitInternal>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/DamageDef[defName="BON_SearDamage"]</xpath>
-					<value>
-						<li Class="CombatExtended.DamageDefExtensionCE">
-							<isAmbientDamage>true</isAmbientDamage>
-						</li>
-					</value>
-				</li>
-
-				<!--Phase Sword -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BON_Phasesword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>hilt</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<chanceFactor>0.1</chanceFactor>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.65</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>BON_SearCut</li>
-								</capacities>
-								<power>36</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Flame</def>
-										<amount>4</amount>
-										<chance>0.3</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>1.19</cooldownTime>
-								<armorPenetrationBlunt>3.16</armorPenetrationBlunt>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>BON_SearStab</li>
-								</capacities>
-								<power>18</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Flame</def>
-										<amount>4</amount>
-										<chance>0.3</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>1.32</cooldownTime>
-								<armorPenetrationBlunt>1.68</armorPenetrationBlunt>
-								<armorPenetrationSharp>26</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BON_Phasesword"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.45</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BON_Phasesword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.71</MeleeCritChance>
-							<MeleeParryChance>0.45</MeleeParryChance>
-							<MeleeDodgeChance>0.29</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="BON_Phasesword"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="BON_Phasesword"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BON_Phasesword"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/PsiTech/AutocastProfileDefs/PsiTechAutocastProfileDefs.xml b/Patches/PsiTech/AutocastProfileDefs/PsiTechAutocastProfileDefs.xml
deleted file mode 100644
index f5bf3b4289..0000000000
--- a/Patches/PsiTech/AutocastProfileDefs/PsiTechAutocastProfileDefs.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>PsiTech</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- == Mindfray == -->
-				<!-- PTAutocastProfile_Mindfray_1 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Def[defName="PTAutocastProfile_Mindfray_1"]/TargetRange</xpath>
-					<value>
-						<TargetRange>0~18</TargetRange>
-					</value>
-				</li>
-				<!-- PTAutocastProfile_Mindfray_2 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Def[defName="PTAutocastProfile_Mindfray_2"]/TargetRange</xpath>
-					<value>
-						<TargetRange>0~18</TargetRange>
-					</value>
-				</li>
-
-				<!-- == Inspire == -->
-				<!-- PTAutocastProfile_Inspire_1 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Def[defName="PTAutocastProfile_Inspire_1"]/TargetRange</xpath>
-					<value>
-						<TargetRange>0~18</TargetRange>
-					</value>
-				</li>
-
-				<!-- == Mindsoothe == -->
-				<!-- PTAutocastProfile_Mindsoothe_1 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Def[defName="PTAutocastProfile_Mindsoothe_1"]/TargetRange</xpath>
-					<value>
-						<TargetRange>0~24</TargetRange>
-					</value>
-				</li>
-
-				<!-- == Insanity == -->
-				<!-- PTAutocastProfile_Insanity_1 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Def[defName="PTAutocastProfile_Insanity_1"]/TargetRange</xpath>
-					<value>
-						<TargetRange>0~36</TargetRange>
-					</value>
-				</li>
-				<!-- PTAutocastProfile_Insanity_2 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Def[defName="PTAutocastProfile_Insanity_2"]/TargetRange</xpath>
-					<value>
-						<TargetRange>0~36</TargetRange>
-					</value>
-				</li>
-				<!-- PTAutocastProfile_Insanity_3 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Def[defName="PTAutocastProfile_Insanity_3"]/TargetRange</xpath>
-					<value>
-						<TargetRange>0~36</TargetRange>
-					</value>
-				</li>
-
-				<!-- == Mindmelt == -->
-				<!-- PTAutocastProfile_Mindmelt_1 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Def[defName="PTAutocastProfile_Mindmelt_1"]/TargetRange</xpath>
-					<value>
-						<TargetRange>0~36</TargetRange>
-					</value>
-				</li>
-				<!-- PTAutocastProfile_Mindmelt_2 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Def[defName="PTAutocastProfile_Mindmelt_2"]/TargetRange</xpath>
-					<value>
-						<TargetRange>0~36</TargetRange>
-					</value>
-				</li>
-				<!-- PTAutocastProfile_Mindmelt_3 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Def[defName="PTAutocastProfile_Mindmelt_3"]/TargetRange</xpath>
-					<value>
-						<TargetRange>0~36</TargetRange>
-					</value>
-				</li>
-				<!-- PTAutocastProfile_Mindmelt_4 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Def[defName="PTAutocastProfile_Mindmelt_4"]/TargetRange</xpath>
-					<value>
-						<TargetRange>0~36</TargetRange>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/PsiTech/EquipmentEnhancementDef/EquipmentEnhancementDef.xml b/Patches/PsiTech/EquipmentEnhancementDef/EquipmentEnhancementDef.xml
deleted file mode 100644
index 121f494c0b..0000000000
--- a/Patches/PsiTech/EquipmentEnhancementDef/EquipmentEnhancementDef.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>PsiTech</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- == EquipmentEnhancementDef == -->
-				<!-- RangedMods -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Def[defName="EquipmentEnhancementDef"]/RangedMods</xpath>
-					<value>
-						<RangedMods>
-							<ShotSpread>-0.1</ShotSpread>
-							<SwayFactor>-0.25</SwayFactor>
-							<SightsEfficiency>0.2</SightsEfficiency>
-							<RangedWeapon_Cooldown>-0.25</RangedWeapon_Cooldown>
-						</RangedMods>
-					</value>
-				</li>
-				<!-- MeleeMods -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Def[defName="EquipmentEnhancementDef"]/MeleeMods</xpath>
-					<value>
-						<MeleeMods>
-							<MeleeWeapon_DamageMultiplier>0.25</MeleeWeapon_DamageMultiplier>
-							<MeleePenetrationFactor>0.5</MeleePenetrationFactor>
-							<MeleeCounterParryBonus>0.25</MeleeCounterParryBonus>
-						</MeleeMods>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/PsiTech/HediffDefs/PsiTechBuffs.xml b/Patches/PsiTech/HediffDefs/PsiTechBuffs.xml
deleted file mode 100644
index 827e6e1e73..0000000000
--- a/Patches/PsiTech/HediffDefs/PsiTechBuffs.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>PsiTech</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- == PTMeleeMastery == -->
-				<!-- statOffsets -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="PTMeleeMastery"]/stages/li/statOffsets[MeleeDodgeChance="30"]</xpath>
-					<value>
-						<statOffsets>
-							<MeleeDodgeChance>1</MeleeDodgeChance>
-							<MeleePenetrationFactor>0.5</MeleePenetrationFactor>
-						</statOffsets>
-					</value>
-				</li>
-
-				<!-- == PTRangedMastery == -->
-				<!-- statFactors -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="PTRangedMastery"]/stages/li[statOffsets/ShootingAccuracyPawn="10"]</xpath>
-					<value>
-						<statFactors>
-							<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
-							<AimingAccuracy>1.25</AimingAccuracy>
-						</statFactors>
-					</value>
-				</li>
-				<!-- statOffsets -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/HediffDef[defName="PTRangedMastery"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/PsiTech/PawnKindDefs/PawnKinds_PsiTech.xml b/Patches/PsiTech/PawnKindDefs/PawnKinds_PsiTech.xml
deleted file mode 100644
index b4a510bb9f..0000000000
--- a/Patches/PsiTech/PawnKindDefs/PawnKinds_PsiTech.xml
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>PsiTech</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ==== Psion_Penitent ==== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Psion_Penitent"]/combatPower</xpath>
-					<value>
-						<combatPower>20</combatPower>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Psion_Penitent"]/weaponMoney</xpath>
-					<value>
-						<weaponMoney>80~150</weaponMoney>
-					</value>
-				</li>
-
-				<!-- ==== Psion_Uninitiated ==== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Psion_Uninitiated"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>1</min>
-								<max>3</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>10</min>
-										<max>120</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- ==== Psion_Initiate and Psion_Acolyte ==== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Psion_Initiate" or defName="Psion_Acolyte"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>4</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.6</generateChance>
-									<sidearmMoney>
-										<min>20</min>
-										<max>180</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- ==== Psion_Ascendant ==== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Psion_Ascendant"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.7</generateChance>
-									<sidearmMoney>
-										<min>20</min>
-										<max>180</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- ==== Every elite tier pawn is forced to wear a tactical vest for bulk capacity ==== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[defName="Psion_Commando" or defName="Psion_Warrior" or defName="Psion_Conduit" or defName="Psion_Transcendent"]</xpath>
-					<value>
-						<specificApparelRequirements>
-							<li>
-								<bodyPartGroup>Shoulders</bodyPartGroup>
-								<apparelLayer>Webbing</apparelLayer>
-								<requiredTag>IndustrialMilitaryBasic</requiredTag>
-							</li>
-						</specificApparelRequirements>
-					</value>
-				</li>
-
-				<!-- ==== Psion_Commando ==== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Psion_Commando"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>200</min>
-								<max>600</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.8</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.8</generateChance>
-									<sidearmMoney>
-										<min>60</min>
-										<max>360</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- ==== Psion_Warrior ==== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Psion_Warrior"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.8</generateChance>
-									<sidearmMoney>
-										<min>120</min>
-										<max>720</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- ==== Psion_Conduit ==== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Psion_Conduit"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.8</generateChance>
-									<sidearmMoney>
-										<min>30</min>
-										<max>180</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- ==== Psion_Transcendent ==== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Psion_Transcendent"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>999999</min>
-								<max>999999</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>1</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>1</generateChance>
-									<sidearmMoney>
-										<min>999999</min>
-										<max>999999</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm</li>
-									</weaponTags>
-									<magazineCount>
-										<min>0</min>
-										<max>3</max>
-									</magazineCount>
-								</li>
-								<li>
-									<generateChance>1</generateChance>
-									<sidearmMoney>
-										<min>999999</min>
-										<max>999999</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/PsiTech/PsiTechAbilityDefs/PsiTechAbilitiyDefs_Tier1.xml b/Patches/PsiTech/PsiTechAbilityDefs/PsiTechAbilitiyDefs_Tier1.xml
deleted file mode 100644
index 0b9fdbfc4f..0000000000
--- a/Patches/PsiTech/PsiTechAbilityDefs/PsiTechAbilitiyDefs_Tier1.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>PsiTech</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- == PTCombatPrecognition == -->
-				<!-- StatOffsets -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Def[defName="PTCombatPrecognition"]/StatOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						<MeleeParryChance>0.5</MeleeParryChance>
-					</value>
-				</li>
-				<!-- description -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Def[defName="PTCombatPrecognition"]/description</xpath>
-					<value>
-						<description>Combat precognition is a technique that allows a psion to predict an adversary's movement before it happens, making them better at evading and blocking attacks.</description>
-					</value>
-				</li>
-
-				<!-- == PTCombatInsight == -->
-				<!-- StatOffsets -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/Def[defName="PTCombatInsight"]</xpath>
-					<value>
-						<StatOffsets>
-							<MeleeCritChance>0.5</MeleeCritChance>
-							<MeleePenetrationFactor>0.5</MeleePenetrationFactor>
-						</StatOffsets>
-					</value>
-				</li>
-				<!-- StatFactors -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/Def[defName="PTCombatInsight"]/StatFactors</xpath>
-				</li>
-				<!-- description -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Def[defName="PTCombatInsight"]/description</xpath>
-					<value>
-						<description>Combat insight is a technique that allows a psion to more easily see an adversary's weaknesses, making them more effective at penetrating armor and dealing critical blows.</description>
-					</value>
-				</li>
-
-				<!-- == PTCombatPrecision == -->
-				<!-- StatOffsets -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Def[defName="PTCombatPrecision"]/StatOffsets</xpath>
-					<value>
-						<StatFactors>
-							<AimingAccuracy>1.5</AimingAccuracy>
-						</StatFactors>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/PsiTech/PsiTechAbilityDefs/PsiTechAbilitiyDefs_Tier2.xml b/Patches/PsiTech/PsiTechAbilityDefs/PsiTechAbilitiyDefs_Tier2.xml
deleted file mode 100644
index 1f17417008..0000000000
--- a/Patches/PsiTech/PsiTechAbilityDefs/PsiTechAbilitiyDefs_Tier2.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>PsiTech</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- == PTMindfray == -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Def[defName="PTMindfray"]/Range</xpath>
-					<value>
-						<Range>18</Range>
-					</value>
-				</li>
-				<!-- == PTMindSuppression == -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Def[defName="PTMindSuppression"]/Range</xpath>
-					<value>
-						<Range>42</Range>
-					</value>
-				</li>
-				<!-- == PTInspire == -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Def[defName="PTInspire"]/Range</xpath>
-					<value>
-						<Range>18</Range>
-					</value>
-				</li>
-				<!-- == PTMindlink == -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Def[defName="PTMindlink"]/Range</xpath>
-					<value>
-						<Range>24</Range>
-					</value>
-				</li>
-				<!-- == PTPsiHeal == -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Def[defName="PTPsiHeal"]/Range</xpath>
-					<value>
-						<Range>24</Range>
-					</value>
-				</li>
-				<!-- == PTMindsoothe == -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Def[defName="PTMindsoothe"]/Range</xpath>
-					<value>
-						<Range>24</Range>
-					</value>
-				</li>
-				<!-- == PTInsanity == -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Def[defName="PTInsanity"]/Range</xpath>
-					<value>
-						<Range>36</Range>
-					</value>
-				</li>
-				<!-- == PTMindmelt == -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Def[defName="PTMindmelt"]/Range</xpath>
-					<value>
-						<Range>36</Range>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/PsiTech/PsiTechAbilityDefs/PsiTechAbilityDefs_Tier3.xml b/Patches/PsiTech/PsiTechAbilityDefs/PsiTechAbilityDefs_Tier3.xml
deleted file mode 100644
index 1965360efc..0000000000
--- a/Patches/PsiTech/PsiTechAbilityDefs/PsiTechAbilityDefs_Tier3.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>PsiTech</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- == PTMindfray == -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Def[defName="PTMindDomination"]/Range</xpath>
-					<value>
-						<Range>66</Range>
-					</value>
-				</li>
-				<!-- == PTMindSuppression == -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Def[defName="PTPsiRally"]/Range</xpath>
-					<value>
-						<Range>48</Range>
-					</value>
-				</li>
-				<!-- == PTInspire == -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Def[defName="PTPsiStorm"]/Range</xpath>
-					<value>
-						<Range>48</Range>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/PsiTech/ThingDefs/Equipment/PsiTechAdvancedApparel.xml b/Patches/PsiTech/ThingDefs/Equipment/PsiTechAdvancedApparel.xml
deleted file mode 100644
index d3f88240cd..0000000000
--- a/Patches/PsiTech/ThingDefs/Equipment/PsiTechAdvancedApparel.xml
+++ /dev/null
@@ -1,408 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>PsiTech</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- == PTPsionicCommandoArmor == -->
-				<!-- Basing all of these armor patches off marine/power armor. -->
-				<!-- statBases -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTPsionicCommandoArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>22</ArmorRating_Sharp>
-						<Bulk>150</Bulk>
-						<WornBulk>18</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTPsionicCommandoArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>50</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTPsionicCommandoArmor"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTPsionicCommandoArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>625</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTPsionicCommandoArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>80</Mass>
-					</value>
-				</li>
-				<!-- equippedStatOffsets -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PTPsionicCommandoArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>80</CarryWeight>
-						<CarryBulk>10</CarryBulk>
-						<ShootingAccuracyPawn>0.2</ShootingAccuracyPawn>
-						<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="PTPsionicCommandoArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-				<!-- costList -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTPsionicCommandoArmor"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>180</Plasteel>
-						<DevilstrandCloth>60</DevilstrandCloth>
-					</value>
-				</li>
-				<!-- apparel -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PTPsionicCommandoArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<!-- == PTPsionicCommandoHelmet == -->
-				<!-- statBases -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTPsionicCommandoHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-						<Bulk>7.5</Bulk>
-						<WornBulk>1.2</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTPsionicCommandoHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>40</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTPsionicCommandoHelmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTPsionicCommandoHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>300</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTPsionicCommandoHelmet"]/statBases/Mass</xpath>
-					<value>
-						<Mass>5.2</Mass>
-					</value>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="PTPsionicCommandoHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="PTPsionicCommandoHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-				<!-- equippedStatOffsets -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PTPsionicCommandoHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<AimingAccuracy>0.2</AimingAccuracy>
-						<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-				<!-- costList -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTPsionicCommandoHelmet"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>70</Plasteel>
-						<DevilstrandCloth>30</DevilstrandCloth>
-					</value>
-				</li>
-				<!-- apparel -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PTPsionicCommandoHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!-- == PTPsionicWarriorArmor == -->
-				<!-- statBases -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTPsionicWarriorArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-						<Bulk>120</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTPsionicWarriorArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>45</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTPsionicWarriorArmor"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTPsionicWarriorArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>500</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTPsionicWarriorArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>60</Mass>
-					</value>
-				</li>
-				<!-- equippedStatOffsets -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PTPsionicWarriorArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>80</CarryWeight>
-						<CarryBulk>10</CarryBulk>
-						<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-						<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="PTPsionicWarriorArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-				<!-- costList -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTPsionicWarriorArmor"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>180</Plasteel>
-						<DevilstrandCloth>60</DevilstrandCloth>
-					</value>
-				</li>
-				<!-- apparel -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PTPsionicWarriorArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<!-- == PTPsionicWarriorHelmet == -->
-				<!-- statBases -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTPsionicWarriorHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-						<Bulk>6</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTPsionicWarriorHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>36</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTPsionicWarriorHelmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTPsionicWarriorHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>240</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTPsionicWarriorHelmet"]/statBases/Mass</xpath>
-					<value>
-						<Mass>4.8</Mass>
-					</value>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="PTPsionicWarriorHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="PTPsionicWarriorHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-				<!-- equippedStatOffsets -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PTPsionicWarriorHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<AimingAccuracy>0.15</AimingAccuracy>
-						<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-				<!-- costList -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTPsionicWarriorHelmet"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>60</Plasteel>
-						<DevilstrandCloth>20</DevilstrandCloth>
-					</value>
-				</li>
-				<!-- apparel -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PTPsionicWarriorHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!-- == PTPsionicConduitArmor == -->
-				<!-- statBases -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTPsionicConduitArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTPsionicConduitArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>41</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTPsionicConduitArmor"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTPsionicConduitArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>400</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTPsionicConduitArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>40</Mass>
-					</value>
-				</li>
-				<!-- equippedStatOffsets -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PTPsionicConduitArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>60</CarryWeight>
-						<CarryBulk>8</CarryBulk>
-						<ShootingAccuracyPawn>0.05</ShootingAccuracyPawn>
-						<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-					</value>
-				</li>
-				<!-- costList -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTPsionicConduitArmor"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>140</Plasteel>
-						<DevilstrandCloth>50</DevilstrandCloth>
-					</value>
-				</li>
-				<!-- apparel -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PTPsionicConduitArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<!-- == PTPsionicConduitHelmet == -->
-				<!-- statBases -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTPsionicConduitHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTPsionicConduitHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>32</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTPsionicConduitHelmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTPsionicConduitHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>200</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTPsionicConduitHelmet"]/statBases/Mass</xpath>
-					<value>
-						<Mass>1</Mass>
-					</value>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="PTPsionicConduitHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="PTPsionicConduitHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-				<!-- equippedStatOffsets -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PTPsionicConduitHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<AimingAccuracy>0.05</AimingAccuracy>
-						<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-				<!-- costList -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTPsionicConduitHelmet"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>50</Plasteel>
-						<DevilstrandCloth>15</DevilstrandCloth>
-					</value>
-				</li>
-				<!-- apparel -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PTPsionicConduitHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/PsiTech/ThingDefs/Equipment/PsiTechBasicApparel.xml b/Patches/PsiTech/ThingDefs/Equipment/PsiTechBasicApparel.xml
deleted file mode 100644
index aec99a7f18..0000000000
--- a/Patches/PsiTech/ThingDefs/Equipment/PsiTechBasicApparel.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>PsiTech</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- == PTRobeBase == -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="PTRobeBase"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-						<Bulk>7.5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-				<!-- == PTPsiHood == -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTPsiHood"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/PsiTech/ThingDefs/Items/PsiTechResources.xml b/Patches/PsiTech/ThingDefs/Items/PsiTechResources.xml
deleted file mode 100644
index e0eda08ac7..0000000000
--- a/Patches/PsiTech/ThingDefs/Items/PsiTechResources.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>PsiTech</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- == PTAthenium == -->
-				<!-- statBases -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTAthenium"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.8</StuffPower_Armor_Sharp>
-						<Bulk>0.05</Bulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTAthenium"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1.2</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PTAthenium"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0</StuffPower_Armor_Heat>
-					</value>
-				</li>
-				<!-- stuffProps -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PTAthenium"]/stuffProps/categories</xpath>
-					<value>
-						<li>Metallic_Weapon</li>
-						<li>Steeled</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Pulse Weaponry/Ammo.xml b/Patches/Pulse Weaponry/Ammo.xml
deleted file mode 100644
index 58974f4c0f..0000000000
--- a/Patches/Pulse Weaponry/Ammo.xml	
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Pulse Weaponry</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingCategoryDef>
-							<defName>AmmoDEpulsePack</defName>
-							<label>combine pulse pack</label>
-							<parent>AmmoAdvanced</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberChargeLarge</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== Ammo ========================== -->
-						<ThingDef Class="CombatExtended.AmmoDef" Name="DEpulsePackBase" ParentName="SpacerSmallAmmoBase" Abstract="True">
-							<description>A dark energy charge pack for combine pulse weapons.</description>
-							<statBases>
-								<Mass>0.008</Mass>
-								<Bulk>0.01</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_FabricationBench</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoDEpulsePack</li>
-							</thingCategories>
-							<stackLimit>5000</stackLimit>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="LaserChargePackBase">
-							<defName>Ammo_DEpulsePack</defName>
-							<label>combine pulse pack</label>
-							<graphicData>
-								<texPath>ThirdParty/Pulse Weaponry/DE Pulse</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<ammoClass>Charged</ammoClass>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_DEpulsePack</defName>
-							<label>make combine pulse pack x500</label>
-							<description>Craft 500 combine pulse pack.</description>
-							<jobString>Making combine pulse pack.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>16</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentSpacer</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Plasteel</li>
-									<li>Steel</li>
-									<li>ComponentSpacer</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_DEpulsePack>500</Ammo_DEpulsePack>
-							</products>
-							<workAmount>12600</workAmount><!-- === 1.5 times 8400 === -->
-						</RecipeDef>
-
-						<!-- === Ammo Sets === -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_DV_PulseSMG</defName>
-							<label>pulse pack</label>
-							<ammoTypes>
-								<Ammo_DEpulsePack>Bullet_DV_PulseSMG_CE</Ammo_DEpulsePack>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_DV_PulseRifle</defName>
-							<label>pulse pack</label>
-							<ammoTypes>
-								<Ammo_DEpulsePack>Bullet_DV_PulseRifle_CE</Ammo_DEpulsePack>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_DV_PulseSuppressor</defName>
-							<label>pulse pack</label>
-							<ammoTypes>
-								<Ammo_DEpulsePack>Bullet_DV_PulseSuppressor_CE</Ammo_DEpulsePack>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>Bullet_DV_PulseRifle_UBGL_CE</defName>
-							<label>pulse pack</label>
-							<ammoTypes>
-								<Ammo_DEpulsePack>Bullet_DV_PulseRifle_UBGL_CE</Ammo_DEpulsePack>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- === Projectiles === -->
-						<ThingDef ParentName="BaseBulletCE">
-							<defName>Bullet_DV_PulseSMG_CE</defName>
-							<label>Pulse projectile</label>
-							<graphicData>
-								<texPath>Things/PulseBullet</texPath>
-								<shaderType>TransparentPostLight</shaderType>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>122</speed>
-								<damageAmountBase>8</damageAmountBase>
-								<secondaryDamage><!-- === 50% of base damage === -->
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>4</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<armorPenetrationBlunt>43.2</armorPenetrationBlunt>
-							</projectile>
-							<comps>
-								<li Class="AthenaFramework.CompProperties_ProjectileImpactEffect">
-									<mote>PulseBulletImpact</mote>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBulletCE">
-							<defName>Bullet_DV_PulseRifle_CE</defName>
-							<label>Pulse projectile</label>
-							<graphicData>
-								<texPath>Things/PulseBullet</texPath>
-								<shaderType>TransparentPostLight</shaderType>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>151</speed>
-								<damageAmountBase>13</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>6</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-								<armorPenetrationBlunt>128</armorPenetrationBlunt>
-							</projectile>
-							<comps>
-								<li Class="AthenaFramework.CompProperties_ProjectileImpactEffect">
-									<mote>PulseBulletImpact</mote>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBulletCE">
-							<defName>Bullet_DV_PulseSuppressor_CE</defName>
-							<label>Pulse projectile</label>
-							<graphicData>
-								<texPath>Things/PulseBullet</texPath>
-								<shaderType>TransparentPostLight</shaderType>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>151</speed>
-								<damageAmountBase>19</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>9</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>16</armorPenetrationSharp>
-								<armorPenetrationBlunt>345.6</armorPenetrationBlunt>
-							</projectile>
-							<comps>
-								<li Class="AthenaFramework.CompProperties_ProjectileImpactEffect">
-									<mote>PulseBulletImpact</mote>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseExplosiveBullet">
-							<defName>Bullet_DV_PulseRifle_UBGL_CE</defName>
-							<label>Pulse projectile</label>
-							<graphicData>
-								<texPath>Things/Projectiles/CombineBall</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>81</speed>
-								<damageDef>EMP</damageDef>
-								<damageAmountBase>20</damageAmountBase>
-								<explosionRadius>0.6</explosionRadius>
-								<empShieldBreakChance>1</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Pulse Weaponry/Apparel_Hats.xml b/Patches/Pulse Weaponry/Apparel_Hats.xml
deleted file mode 100644
index 171671dc7d..0000000000
--- a/Patches/Pulse Weaponry/Apparel_Hats.xml	
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Pulse Weaponry</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== Enforcer Mask ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DV_Apparel_SuppressorMask"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DV_Apparel_SuppressorMask"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DV_Apparel_SuppressorMask"]/statBases/Mass</xpath>
-					<value>
-						<Mass>4.8</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DV_Apparel_SuppressorMask"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>240</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DV_Apparel_SuppressorMask"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DV_Apparel_SuppressorMask"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>36</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DV_Apparel_SuppressorMask"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
-					<value>
-						<ToxicEnvironmentResistance>1</ToxicEnvironmentResistance>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DV_Apparel_SuppressorMask"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>60</Plasteel>
-						<DevilstrandCloth>20</DevilstrandCloth>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DV_Apparel_SuppressorMask"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<AimingAccuracy>0.6</AimingAccuracy>
-						<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DV_Apparel_SuppressorMask"]/apparel</xpath>
-					<value>
-						<immuneToToxGasExposure>true</immuneToToxGasExposure>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DV_Apparel_SuppressorMask"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="DV_Apparel_SuppressorMask"]/comps/li[@Class="AthenaFramework.CompProperties_CustomApparelBody"]</xpath>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="DV_Apparel_SuppressorMask"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Pulse Weaponry/RangedSpacer.xml b/Patches/Pulse Weaponry/RangedSpacer.xml
deleted file mode 100644
index 6f850eeb1d..0000000000
--- a/Patches/Pulse Weaponry/RangedSpacer.xml	
+++ /dev/null
@@ -1,333 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Pulse Weaponry</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DV_MeleeWeapon_Stunstick"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<chanceFactor>0.33</chanceFactor>
-								<cooldownTime>1.52</cooldownTime>
-								<armorPenetrationBlunt>0.500</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Stun</def>
-										<amount>32</amount>
-										<chance>0.20</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>1.68</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>3.375</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DV_MeleeWeapon_Stunstick"]/statBases</xpath>
-					<value>
-						<Bulk>2.75</Bulk>
-						<MeleeCounterParryBonus>0.9</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DV_MeleeWeapon_Stunstick"]/equippedAngleOffset</xpath>
-					<value>
-						<equippedAngleOffset>-65</equippedAngleOffset>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DV_MeleeWeapon_Stunstick"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.17</MeleeCritChance>
-							<MeleeParryChance>0.9</MeleeParryChance>
-							<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "DV_PulseSMG" or defName = "DV_PulseSuppressor"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "DV_PulseRifle"]/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>
-				</li>
-
-				<!-- === HL:A SMG === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DV_PulseSMG</defName>
-					<statBases>
-						<WorkToMake>40000</WorkToMake>
-						<Mass>2.80</Mass>
-						<Bulk>5.00</Bulk>
-						<SwayFactor>0.75</SwayFactor>
-						<ShotSpread>0.16</ShotSpread>
-						<SightsEfficiency>1.15</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>45</Steel>
-						<Plasteel>15</Plasteel>
-						<Chemfuel>5</Chemfuel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-						<ComponentSpacer>1</ComponentSpacer>
-					</costList>
-					<Properties>
-						<recoilAmount>1.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_DV_PulseSMG_CE</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>31</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>Shot_PulseLight</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>2.5</reloadTime>
-						<ammoSet>AmmoSet_DV_PulseSMG</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- === HL2 rifle === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DV_PulseRifle</defName>
-					<statBases>
-						<Mass>3.0</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.20</SwayFactor>
-						<Bulk>7.00</Bulk>
-						<WorkToMake>49000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>45</Steel>
-						<Plasteel>25</Plasteel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-						<ComponentSpacer>2</ComponentSpacer>
-						<Chemfuel>10</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>1.20</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_DV_PulseRifle_CE</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>Shot_PulseMedium</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>60</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_DV_PulseRifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AR</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DV_PulseRifle"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_UnderBarrel">
-							<propsUnderBarrel>
-								<magazineSize>30</magazineSize>
-								<reloadTime>3.5</reloadTime>
-								<ammoSet>Bullet_DV_PulseRifle_UBGL_CE</ammoSet>
-							</propsUnderBarrel>
-							<verbPropsUnderBarrel>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_DV_PulseRifle_UBGL_CE</defaultProjectile>
-								<warmupTime>1.05</warmupTime>
-								<range>55</range>
-								<ammoConsumedPerShotCount>10</ammoConsumedPerShotCount>
-								<recoilAmount>1.20</recoilAmount>
-								<soundCast>Shot_Shotgun</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>12</muzzleFlashScale>
-							</verbPropsUnderBarrel>
-							<propsFireModesUnderBarrel>
-								<aiAimMode>AimedShot</aiAimMode>
-							</propsFireModesUnderBarrel>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Pulse Suppressor === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DV_PulseSuppressor</defName>
-					<statBases>
-						<WorkToMake>60000</WorkToMake>
-						<Mass>20.0</Mass>
-						<Bulk>12.0</Bulk>
-						<SwayFactor>1.35</SwayFactor>
-						<ShotSpread>0.10</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>120</Steel>
-						<Plasteel>40</Plasteel>
-						<Chemfuel>15</Chemfuel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-						<ComponentSpacer>3</ComponentSpacer>
-					</costList>
-					<Properties>
-						<recoilAmount>1.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_DV_PulseSuppressor_CE</defaultProjectile>
-						<burstShotCount>50</burstShotCount>
-						<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<warmupTime>2.5</warmupTime>
-						<range>62</range>
-						<soundCast>Shot_PulseMedium</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>450</magazineSize>
-						<reloadTime>6.2</reloadTime>
-						<ammoSet>AmmoSet_DV_PulseSuppressor</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>25</aimedBurstShotCount>
-					</FireModes>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[
-						defName = "DV_PulseSMG" or
-						defName = "DV_PulseRifle" or
-						defName = "DV_PulseSuppressor"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.05,1.05</DrawSize>
-							<DrawOffset>0.0,0.0</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName = "DV_PulseRifle"]/comps/li[@Class="AthenaFramework.CompProperties_EquippableAbility"]</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Pulse Weaponry/ThingDefs_Sentry.xml b/Patches/Pulse Weaponry/ThingDefs_Sentry.xml
deleted file mode 100644
index 2e62fb346e..0000000000
--- a/Patches/Pulse Weaponry/ThingDefs_Sentry.xml	
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Pulse Weaponry</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Remove refuelable property -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName = "DV_Turret_PulseAutogun"]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
-				</li>
-
-				<!-- Replace vanilla thingClass -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "DV_Turret_PulseAutogun"]/thingClass </xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<!-- Make turrets taller -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "DV_Turret_PulseAutogun"]/fillPercent </xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "DV_Turret_PulseAutogun"]/statBases </xpath>
-					<value>
-						<AimingAccuracy>0.5</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "DV_Turret_PulseAutogun"]/statBases </xpath>
-					<value>
-						<NightVisionEfficiency>0.5</NightVisionEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "DV_Turret_PulseAutogun"]/statBases/ShootingAccuracyTurret </xpath>
-					<value>
-						<ShootingAccuracyTurret>1.25</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "DV_Turret_PulseAutogun"]/building/turretBurstCooldownTime </xpath>
-					<value>
-						<turretBurstCooldownTime>1.1</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<!-- Pulse Turret -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PulseTurret</defName>
-					<statBases>
-						<SightsEfficiency>1.15</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>0.72</SwayFactor>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<NightVisionEfficiency_Weapon>0.5</NightVisionEfficiency_Weapon>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.85</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_DV_PulseRifle_CE</defaultProjectile>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<warmupTime>1.3</warmupTime>
-						<range>55</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>Shot_PulseMedium</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>200</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_DV_PulseRifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags Inherit="False">
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Pulsefire Turret/PulsefireTurret_CombatExtendedPatch.xml b/Patches/Pulsefire Turret/PulsefireTurret_CombatExtendedPatch.xml
deleted file mode 100644
index affa617a9b..0000000000
--- a/Patches/Pulsefire Turret/PulsefireTurret_CombatExtendedPatch.xml	
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Pulsefire Turret (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Compatibility for Turret #1 -->
-
-				<!-- Remove Explosive comp -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName = "PulsefireTurretGun" or
-						defName = "PulsefireTwinCannon"
-						]/comps/li[@Class = "CompProperties_Explosive"] </xpath>
-				</li>
-
-				<!-- Replace vanilla thingClass -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "PulsefireTurretGun" or
-						defName = "PulsefireTwinCannon"
-						]/thingClass </xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "PulsefireTurretGun" or
-						defName = "PulsefireTwinCannon"
-						]/fillPercent </xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "PulsefireTurretGun" or defName = "PulsefireTwinCannon"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PulsefireTurret</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.25</ShotSpread>
-						<SwayFactor>0.45</SwayFactor>
-						<RangedWeapon_Cooldown>0.1</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.79</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12x72mmCharged</defaultProjectile>
-						<warmupTime>1.25</warmupTime>
-						<range>75</range>
-						<soundCast>ChargeLance_Fire</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>false</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>40</magazineSize>
-						<reloadTime>5.9</reloadTime>
-						<ammoSet>AmmoSet_12x72mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PulsefireTurretEnhanced</defName>
-					<statBases>
-						<SightsEfficiency>2.4</SightsEfficiency>
-						<ShotSpread>0.25</ShotSpread>
-						<SwayFactor>0.45</SwayFactor>
-						<RangedWeapon_Cooldown>0.1</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.79</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12x72mmCharged</defaultProjectile>
-						<warmupTime>1.25</warmupTime>
-						<range>75</range>
-						<soundCast>ChargeLance_Fire</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>false</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>80</magazineSize>
-						<reloadTime>5.9</reloadTime>
-						<ammoSet>AmmoSet_12x72mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PulsefireTwinCannon</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>0.15</SwayFactor>
-						<Bulk>18.05</Bulk>
-						<RangedWeapon_Cooldown>3</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.69</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
-						<warmupTime>1.25</warmupTime>
-						<range>65</range>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<burstShotCount>15</burstShotCount>
-						<soundCast>Shot_ChargeBlaster</soundCast>
-						<muzzleFlashScale>18</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>false</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>150</magazineSize>
-						<reloadTime>7.9</reloadTime>
-						<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PulsefireTwinCannonEnhanced</defName>
-					<statBases>
-						<SightsEfficiency>1.4</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>0.15</SwayFactor>
-						<Bulk>18.05</Bulk>
-						<RangedWeapon_Cooldown>3</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.69</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
-						<warmupTime>1.25</warmupTime>
-						<range>65</range>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<burstShotCount>15</burstShotCount>
-						<soundCast>Shot_ChargeBlaster</soundCast>
-						<muzzleFlashScale>18</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>false</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>150</magazineSize>
-						<reloadTime>7.9</reloadTime>
-						<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RBSE/Bionics.xml b/Patches/RBSE/Bionics.xml
deleted file mode 100644
index 93e884c1b7..0000000000
--- a/Patches/RBSE/Bionics.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rah's Bionics and Surgery Expansion</li>
-			<li>RBSE Hardcore Edition</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/HediffDef[defName="SimpleProstheticHand" or defName="SimpleProstheticArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]</xpath>
-				</li>
-
-				<!-- ========== Bionics ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BionicHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>bionic fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-								<cooldownTime>1.66</cooldownTime>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="PowerArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>bionic fist</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>9</power>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<cooldownTime>1.66</cooldownTime>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Advanced Bionics ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AdvancedPowerArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>bionic fist</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>22</power>
-								<armorPenetrationBlunt>4.75</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.96</armorPenetrationSharp>
-								<cooldownTime>0.76</cooldownTime>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AdvancedBionicArm" or defName="AdvancedBionicHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>bionic fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<cooldownTime>0.83</cooldownTime>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RBSE/Cure CE Scars.xml b/Patches/RBSE/Cure CE Scars.xml
deleted file mode 100644
index 3733d2abb4..0000000000
--- a/Patches/RBSE/Cure CE Scars.xml	
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rah's Bionics and Surgery Expansion</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<RecipeDef ParentName="SurgeryOld">
-							<defName>CureInjuryBlast</defName>
-							<label>cure blast</label>
-							<description>Cure blast.</description>
-							<workerClass>ScarRemoving.Recipe_RemoveHediff_noBrain</workerClass>
-							<jobString>Curing blast.</jobString>
-							<workAmount>2000</workAmount>
-							<surgerySuccessChanceFactor>1.55</surgerySuccessChanceFactor>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>MedicineUltratech</li>
-										</thingDefs>
-									</filter>
-									<count>3</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>MedicineUltratech</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<skillRequirements>
-								<Medicine>10</Medicine>
-							</skillRequirements>
-							<removesHediff>Blast</removesHediff>
-							<researchPrerequisite>RegenerativeMedicine</researchPrerequisite>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_12Gauge_Dual.xml b/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_12Gauge_Dual.xml
deleted file mode 100644
index 0fb059e8c1..0000000000
--- a/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_12Gauge_Dual.xml	
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] DOOM</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ========== Custom variants of the standard 12 Gauge shotgun projectiles, emulating the effect of two ordinary 12 Gauge shotgun shells being fired side-by-side simultaneously ========== -->
-
-						<ThingDef ParentName="Base12GaugeBullet">
-							<defName>Bullet_12Gauge_DoubleBarreled_Buck</defName>
-							<label>buckshot pellet</label>
-							<graphicData>
-								<texPath>Things/Projectile/Shotgun_Pellet</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>18</damageAmountBase>
-								<pelletCount>18</pelletCount><!-- Twice the usual number of buckshot pellets -->
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.7</armorPenetrationBlunt>
-								<spreadMult>17.8</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base12GaugeBullet">
-							<defName>Bullet_12Gauge_DoubleBarreled_Slug</defName>
-							<label>shotgun slug</label>
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_big</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>92</speed>
-								<damageAmountBase>46</damageAmountBase>
-								<pelletCount>2</pelletCount><!-- Double slugs -->
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<armorPenetrationBlunt>48.04</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base12GaugeBullet">
-							<defName>Bullet_12Gauge_DoubleBarreled_Beanbag</defName>
-							<label>beanbag</label>
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_big</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>30</speed>
-								<damageDef>Beanbag</damageDef>
-								<damageAmountBase>18</damageAmountBase>
-								<pelletCount>2</pelletCount><!-- Double beanbags -->
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.240</armorPenetrationBlunt>
-								<spreadMult>2</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base12GaugeBullet">
-							<defName>Bullet_12Gauge_DoubleBarreled_ElectroSlug</defName>
-							<label>EMP slug</label>
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_big</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>43</speed>
-								<damageDef>EMP</damageDef>
-								<damageAmountBase>24</damageAmountBase>
-								<pelletCount>2</pelletCount><!-- Double EMP slugs -->
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>8.509</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<!-- ========== Custom AmmoSet for the double-barreled Super Shotgun, which maps the custom 12 Gauge shotgun projectiles to standard versions of their craftable ammo ========== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_12Gauge_CP_DOOM_SuperShotgun</defName>
-							<label>12 Gauge</label>
-							<ammoTypes>
-								<Ammo_12Gauge_Buck>Bullet_12Gauge_DoubleBarreled_Buck</Ammo_12Gauge_Buck>
-								<Ammo_12Gauge_Slug>Bullet_12Gauge_DoubleBarreled_Slug</Ammo_12Gauge_Slug>
-								<Ammo_12Gauge_Beanbag>Bullet_12Gauge_DoubleBarreled_Beanbag</Ammo_12Gauge_Beanbag>
-								<Ammo_12Gauge_ElectroSlug>Bullet_12Gauge_DoubleBarreled_ElectroSlug</Ammo_12Gauge_ElectroSlug>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_BfgCell.xml b/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_BfgCell.xml
deleted file mode 100644
index d6d0bc3307..0000000000
--- a/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_BfgCell.xml	
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] DOOM</li>
-		</mods>
-
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<!-- There is only one type of UAC BFG Cell for CE, no subcategory for variants required -->
-
-				<!-- ==================== AmmoSets ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_Doom2016Bfg9000Gun</defName>
-					<label>UAC BFG Cell</label>
-					<ammoTypes>
-						<Ammo_Doom2016BfgCell>Bullet_Doom2016Bfg9000Gun</Ammo_Doom2016BfgCell>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerAmmoBase">
-					<defName>Ammo_Doom2016BfgCell</defName>
-					<label>UAC BFG Cell</label>
-					<description>Plasma containment power cell developed by the Union Aerospace Corporation for the BFG 9000, utilizing the compression of Argent energy</description>
-					<statBases>
-						<Mass>0.5</Mass>
-						<Bulk>1.21</Bulk>
-						<MarketValue>31.92</MarketValue>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-						<!-- Plasma ammo can't be handloaded, and the containment cell must be precision-machined anyway -->
-					</tradeTags>
-					<thingCategories>
-						<li>AmmoAdvanced</li>
-					</thingCategories>
-					<stackLimit>25</stackLimit>
-					<graphicData>
-						<texPath>ThirdParty/CP DOOM and DOOM Kit Classic/Doom2016BfgCell</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<ammoClass>Plasma</ammoClass>
-					<comps>
-						<!-- Arbitarily defined cookoff explosive stats; represents a plasma containment system failing -->
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>20</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>0.5</explosiveRadius>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>2</Fragment_Large>
-								<Fragment_Small>10</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<!-- Workaround for conditionally-patched projectiles: use an existing abstract class from the generic ammo library (In this case, Base6x24mmChargedBullet) -->
-
-				<ThingDef ParentName="Base6x24mmChargedBullet">
-					<defName>Bullet_Doom2016Bfg9000Gun</defName>
-					<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					<label>BFG Plasma Shot</label>
-					<graphicData>
-						<texPath>Things/Projectile/BFGPLAZMA</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>200</speed>
-						<damageDef>Bomb</damageDef>
-						<damageAmountBase>500</damageAmountBase>
-						<explosionRadius>2.5</explosionRadius>
-						<suppressionFactor>3.0</suppressionFactor>
-						<dangerFactor>2.0</dangerFactor>
-						<soundExplode>RHHit_DOOMBFG</soundExplode>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						<secondaryDamage>
-							<li>
-								<def>Flame_Secondary</def>
-								<amount>600</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="ChargeAmmoRecipeBase">
-					<defName>MakeAmmo_Doom2016BfgCell</defName>
-					<label>make UAC BFG Cells x25</label>
-					<description>Craft 25 UAC BFG Cells.</description>
-					<jobString>Making UAC BFG Cells.</jobString>
-					<workAmount>33000</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>26</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Plasteel</li>
-								</thingDefs>
-							</filter>
-							<count>73</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Plasteel</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_Doom2016BfgCell>25</Ammo_Doom2016BfgCell>
-					</products>
-				</RecipeDef>
-
-			</value>
-
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_EmgPistol.xml b/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_EmgPistol.xml
deleted file mode 100644
index 65ba8541e9..0000000000
--- a/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_EmgPistol.xml	
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] DOOM</li>
-		</mods>
-
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<!-- Projectile-only definition for the weaker infinite-ammo EMG Pistol; uses same stats as the generic Plasma Pistol projectile -->
-
-				<!-- ================== Projectiles ================== -->
-
-				<!-- Workaround for conditionally-patched projectiles: use an existing abstract class from the generic ammo library (In this case, Base6x24mmChargedBullet) -->
-
-				<ThingDef ParentName="Base6x24mmChargedBullet">
-					<defName>Bullet_Doom2016EmgPistol</defName>
-					<label>EMG Bolt</label>
-					<graphicData>
-						<texPath>Things/Projectile/Charged/ChargeShot</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>140</speed>
-						<damageDef>Bomb</damageDef>
-						<damageAmountBase>2</damageAmountBase>
-						<explosionRadius>0.5</explosionRadius>
-						<suppressionFactor>3.0</suppressionFactor>
-						<dangerFactor>2.0</dangerFactor>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						<secondaryDamage>
-							<li>
-								<def>Flame_Secondary</def>
-								<amount>9</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-			</value>
-
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_GaussCannonFlechette.xml b/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_GaussCannonFlechette.xml
deleted file mode 100644
index aa12b7950c..0000000000
--- a/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_GaussCannonFlechette.xml	
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] DOOM</li>
-		</mods>
-
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<!-- DOOM 2016 specifies that the Guass Cannon uses Plasma Cells as ammo, but fires steel (railgun) flechettes instead -->
-
-				<!-- ==================== AmmoSets ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_Doom2016GaussCannon</defName>
-					<label>UAC Plasma Cell</label>
-					<ammoTypes>
-						<Ammo_Doom2016PlasmaCell>Bullet_Doom2016GaussCannonFlechette</Ammo_Doom2016PlasmaCell>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<!-- Workaround for conditionally-patched projectiles: use an existing abstract class from the generic ammo library (In this case, Base6x24mmChargedBullet) -->
-
-				<ThingDef ParentName="Base6x24mmChargedBullet">
-					<defName>Bullet_Doom2016GaussCannonFlechette</defName>
-					<label>UAC Gauss Cannon Flechette</label>
-					<graphicData>
-						<texPath>Things/Projectile/GAUSSBeam</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bullet</damageDef>
-						<damageAmountBase>121</damageAmountBase>
-						<armorPenetrationSharp>160</armorPenetrationSharp>
-						<armorPenetrationBlunt>11348.10</armorPenetrationBlunt>
-						<speed>500</speed>
-					</projectile>
-				</ThingDef>
-
-			</value>
-
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_PlasmaCell.xml b/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_PlasmaCell.xml
deleted file mode 100644
index a5548c5715..0000000000
--- a/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_PlasmaCell.xml	
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] DOOM</li>
-		</mods>
-
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<!-- There is only one type of UAC Plasma Cell for CE, no subcategory for variants required -->
-
-				<!-- ==================== AmmoSets ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_Doom2016PlasmaGun</defName>
-					<label>UAC Plasma Cell</label>
-					<ammoTypes>
-						<Ammo_Doom2016PlasmaCell>Bullet_Doom2016PlasmaGun</Ammo_Doom2016PlasmaCell>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_Doom2016VortexRifle</defName>
-					<label>UAC Plasma Cell</label>
-					<ammoTypes>
-						<Ammo_Doom2016PlasmaCell>Bullet_Doom2016VortexRifle</Ammo_Doom2016PlasmaCell>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!--<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_Doom2016Hellshot</defName>
-					<label>UAC Plasma Cell</label>
-					<ammoTypes>
-						<Ammo_Doom2016PlasmaCell>Bullet_Doom2016Hellshot</Ammo_Doom2016PlasmaCell>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>-->
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-					<defName>Ammo_Doom2016PlasmaCell</defName>
-					<label>UAC Plasma Cell</label>
-					<description>Plasma containment power cell developed by the Union Aerospace Corporation for heavy energy weapons, utilizing the compression of Argent energy</description>
-					<statBases>
-						<Mass>0.002</Mass>
-						<Bulk>0.01</Bulk>
-						<MarketValue>0.84</MarketValue>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-						<!-- Plasma ammo can't be handloaded, and the containment cell must be precision-machined anyway -->
-					</tradeTags>
-					<thingCategories>
-						<li>AmmoAdvanced</li>
-					</thingCategories>
-					<stackLimit>450</stackLimit>
-					<graphicData>
-						<texPath>ThirdParty/CP DOOM and DOOM Kit Classic/Doom2016PlasmaCell</texPath>
-						<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-					</graphicData>
-					<ammoClass>Plasma</ammoClass>
-					<comps>
-						<!-- Arbitarily defined cookoff explosive stats; represents a plasma containment system failing -->
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>80</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>0.5</explosiveRadius>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>2</Fragment_Large>
-								<Fragment_Small>10</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<!-- Workaround for conditionally-patched projectiles: use an existing abstract class from the generic ammo library (In this case, Base6x24mmChargedBullet) -->
-
-				<ThingDef ParentName="Base6x24mmChargedBullet">
-					<defName>Bullet_Doom2016PlasmaGun</defName>
-					<label>Plasma Shot</label>
-					<graphicData>
-						<texPath>Things/Projectile/Charged/ChargeShot</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>200</speed>
-						<damageDef>Bomb</damageDef>
-						<damageAmountBase>12</damageAmountBase>
-						<explosionRadius>0.5</explosionRadius>
-						<suppressionFactor>3.0</suppressionFactor>
-						<dangerFactor>2.0</dangerFactor>
-						<soundExplode>MortarBomb_Explode</soundExplode>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						<secondaryDamage>
-							<li>
-								<def>Flame_Secondary</def>
-								<amount>22</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmChargedBullet">
-					<defName>Bullet_Doom2016VortexRifle</defName>
-					<label>Plasma Shot</label>
-					<graphicData>
-						<texPath>Things/Projectile/Charged/ChargeShot</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>200</speed>
-						<damageDef>Bomb</damageDef>
-						<damageAmountBase>12</damageAmountBase>
-						<explosionRadius>0.5</explosionRadius>
-						<suppressionFactor>3.0</suppressionFactor>
-						<dangerFactor>2.0</dangerFactor>
-						<soundExplode>MortarBomb_Explode</soundExplode>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						<secondaryDamage>
-							<li>
-								<def>Flame_Secondary</def>
-								<amount>22</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<!--<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmChargedBullet">
-					<defName>Bullet_Doom2016Hellshot</defName>
-					<label>Plasma Shot</label>
-					<graphicData>
-						<texPath>Things/Projectile/HellshotPlasma</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>200</speed>
-						<damageDef>Bomb</damageDef>
-						<damageAmountBase>12</damageAmountBase>
-						<explosionRadius>0.5</explosionRadius>
-						<suppressionFactor>3.0</suppressionFactor>
-						<dangerFactor>2.0</dangerFactor>
-						<soundExplode>MortarBomb_Explode</soundExplode>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						<secondaryDamage>
-							<li>
-								<def>Flame_Secondary</def>
-								<amount>22</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef> -->
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="ChargeAmmoRecipeBase">
-					<defName>MakeAmmo_Doom2016PlasmaCell</defName>
-					<label>make UAC Plasma Cells x450 shots</label>
-					<description>Craft 450 shots' worth of UAC Plasma Cells.</description>
-					<jobString>Making UAC Plasma Cells.</jobString>
-					<workAmount>12600</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Plasteel</li>
-								</thingDefs>
-							</filter>
-							<count>33</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Plasteel</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_Doom2016PlasmaCell>450</Ammo_Doom2016PlasmaCell>
-					</products>
-				</RecipeDef>
-
-			</value>
-		</match>
-
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_Rocket.xml b/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_Rocket.xml
deleted file mode 100644
index 102ad59afd..0000000000
--- a/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_Rocket.xml	
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] DOOM</li>
-		</mods>
-
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>AmmoDoom2016Rockets</defName>
-					<label>UAC Rocket Mk VI</label>
-					<parent>AmmoRockets</parent>
-					<iconPath>ThirdParty/CP DOOM and DOOM Kit Classic/Doom2016Rocket/Doom2016Rocket_c</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_Doom2016Rocket</defName>
-					<label>UAC Rocket Mk VI</label>
-					<ammoTypes>
-						<Ammo_Doom2016Rocket_HEAT>Bullet_Doom2016Rocket_HEAT</Ammo_Doom2016Rocket_HEAT>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="Doom2016RocketBase" ParentName="MediumAmmoBase" Abstract="True">
-					<description>Compact 60mm rocket developed by the Union Aerospace Corporation for infantry rocket launchers.</description>
-					<statBases>
-						<MaxHitPoints>150</MaxHitPoints>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-					</tradeTags>
-					<thingCategories>
-						<li>AmmoDoom2016Rockets</li>
-					</thingCategories>
-					<stackLimit>9</stackLimit>
-					<cookOffFlashScale>40</cookOffFlashScale>
-					<cookOffSound>MortarBomb_Explode</cookOffSound>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="Doom2016RocketBase">
-					<defName>Ammo_Doom2016Rocket_HEAT</defName>
-					<label>UAC Rocket Mk VI (HEAT)</label>
-					<graphicData>
-						<texPath>ThirdParty/CP DOOM and DOOM Kit Classic/Doom2016Rocket</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>22.42</MarketValue>
-						<Mass>0.75</Mass>
-						<Bulk>1.53</Bulk>
-					</statBases>
-					<ammoClass>RocketHEAT</ammoClass>
-					<detonateProjectile>Bullet_Doom2016Rocket_HEAT</detonateProjectile>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<!-- Workaround for conditionally-patched projectiles: use an existing abstract class from the generic ammo library (In this case, BaseM6Rocket) -->
-
-				<ThingDef ParentName="BaseM6Rocket">
-					<defName>Bullet_Doom2016Rocket_HEAT</defName>
-					<label>UAC Rocket Mk VI (HEAT)</label>
-					<graphicData>
-						<texPath>Things/Projectile/Dart/Dart</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bullet</damageDef>
-						<damageAmountBase>225</damageAmountBase>
-						<armorPenetrationSharp>76</armorPenetrationSharp>
-						<armorPenetrationBlunt>19.178</armorPenetrationBlunt>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>64</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>1</explosiveRadius>
-							<explosionSound>RHHit_DOOMRocketLauncher</explosionSound>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>1</Fragment_Large>
-								<Fragment_Small>12</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_Doom2016Rocket_HEAT</defName>
-					<label>make UAC Rocket Mk VI (HEAT) rockets x9</label>
-					<description>Craft 9 UAC Rocket Mk VI (HEAT) rockets.</description>
-					<jobString>Making UAC Rocket Mk VI (HEAT) rockets.</jobString>
-					<workAmount>6200</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>14</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>6</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>4</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_Doom2016Rocket_HEAT>9</Ammo_Doom2016Rocket_HEAT>
-					</products>
-				</RecipeDef>
-
-			</value>
-
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Apparel_Armor.xml b/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Apparel_Armor.xml
deleted file mode 100644
index a40bcec662..0000000000
--- a/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Apparel_Armor.xml	
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] DOOM</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Praetor Suit ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_PraetorSuit_PowerArmor"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_PraetorSuit_PowerArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>40</CarryBulk>
-						<CarryWeight>90</CarryWeight>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_PraetorSuit_PowerArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_PraetorSuit_PowerArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>40</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_PraetorSuit_PowerArmor"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>1.0</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_PraetorSuit_PowerArmor"]/statBases</xpath>
-					<value>
-						<ArmorRating_Electric>0.975</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_PraetorSuit_PowerArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Apparel_Armor_Headgear.xml b/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Apparel_Armor_Headgear.xml
deleted file mode 100644
index 885952bcd0..0000000000
--- a/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Apparel_Armor_Headgear.xml	
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] DOOM</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Praetor Suit helmet ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_PraetorSuitHelmet_PowerArmor"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_PraetorSuitHelmet_PowerArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_PraetorSuitHelmet_PowerArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>40</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_PraetorSuitHelmet_PowerArmor"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>1.0</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_PraetorSuitHelmet_PowerArmor"]/statBases</xpath>
-					<value>
-						<ArmorRating_Electric>0.975</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="RHApparel_PraetorSuitHelmet_PowerArmor"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="RHApparel_PraetorSuitHelmet_PowerArmor"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_PraetorSuitHelmet_PowerArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<!-- WearingGasMask Hediff not applicable -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_PraetorSuitHelmet_PowerArmor"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_LauncherDOOM_Weapons.xml b/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_LauncherDOOM_Weapons.xml
deleted file mode 100644
index 8086f19df7..0000000000
--- a/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_LauncherDOOM_Weapons.xml	
+++ /dev/null
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] DOOM</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== UAC Gauss Cannon ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHEx_DOOM_GAUSSCannon</defName>
-					<statBases>
-						<Mass>12.50</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.20</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.78</SwayFactor>
-						<Bulk>12</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Doom2016GaussCannonFlechette</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<ammoConsumedPerShotCount>30</ammoConsumedPerShotCount>
-						<range>126</range>
-						<soundCast>RHShot_DOOMGAUSS</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<muzzleFlashScale>15</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>150</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_Doom2016GaussCannon</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== BFG 9000 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHEx_DOOM_BFG9000Gun</defName>
-					<statBases>
-						<Mass>10.00</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>0.88</SwayFactor>
-						<Bulk>13.00</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Doom2016Bfg9000Gun</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<soundAiming>RHGun_DOOMBFGAiming</soundAiming>
-						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-						<range>62</range>
-						<soundCast>RHShot_DOOMBFG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>false</onlyManualCast>
-						<muzzleFlashScale>20</muzzleFlashScale>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>3</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_Doom2016Bfg9000Gun</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== UAC Rocket Launcher ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHEx_DOOM_RocketLauncher</defName>
-					<statBases>
-						<Mass>8.00</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.82</SwayFactor>
-						<Bulk>11.20</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Doom2016Rocket_HEAT</defaultProjectile>
-						<warmupTime>1.9</warmupTime>
-						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-						<range>40</range>
-						<soundCast>RHShot_DOOMRocketLauncher</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>15</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>5.1</reloadTime>
-						<ammoSet>AmmoSet_Doom2016Rocket</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-				</li>
-
-				<!-- ========== UAC Grenade Launcher ========== 
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHEx_UACGrenadeLauncher</defName>
-					<statBases>
-						<Mass>5.30</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>1.31</SwayFactor>
-						<Bulk>7.67</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>40</range>
-						<soundCast>RHShot_DOOMGrenadeLauncher</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>15</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>5.1</reloadTime>
-						<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-
-				</li>-->
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHEx_DOOM_GAUSSCannon" or
-						defName="RHEx_UACGrenadeLauncher"
-						]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHEx_DOOM_BFG9000Gun" or
-						defName="RHEx_DOOM_RocketLauncher"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_MeleeDOOM_Weapons.xml b/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_MeleeDOOM_Weapons.xml
deleted file mode 100644
index f91cdd32a4..0000000000
--- a/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_MeleeDOOM_Weapons.xml	
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] DOOM</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Mixom Beavertooth Painsaw (Chainsaw) ========== 
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHMelee_DOOM_Chainsaw"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>RHMelee_ChainsawSlash</li>
-								</capacities>
-								<power>38</power>
-								<cooldownTime>4.36</cooldownTime>
-								<armorPenetrationBlunt>3.7</armorPenetrationBlunt>
-								<armorPenetrationSharp>14.8</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>RHMelee_ChainsawStab</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>2.47</cooldownTime>
-								<armorPenetrationBlunt>3.7</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.65</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHMelee_DOOM_Chainsaw"]/statBases</xpath>
-					<value>
-						<Bulk>9</Bulk>
-						<MeleeCounterParryBonus>0.14</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHMelee_DOOM_Chainsaw"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.04</MeleeCritChance>
-							<MeleeParryChance>0.1</MeleeParryChance>
-							<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>-->
-
-				<!-- ========== Crucible Blade ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHMelee_DOOMCrucible"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.69</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.80</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>40</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Flame</def>
-										<amount>5</amount>
-										<chance>0.3</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>2.06</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>3.20</armorPenetrationBlunt>
-								<armorPenetrationSharp>16</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>17</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Flame</def>
-										<amount>3</amount>
-										<chance>0.2</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>0.99</cooldownTime>
-								<armorPenetrationBlunt>3.24</armorPenetrationBlunt>
-								<armorPenetrationSharp>32.4</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHMelee_DOOMCrucible"]/statBases</xpath>
-					<value>
-						<Bulk>8.5</Bulk>
-						<MeleeCounterParryBonus>0.80</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHMelee_DOOMCrucible"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.00</MeleeCritChance>
-							<MeleeParryChance>0.60</MeleeParryChance>
-							<MeleeDodgeChance>0.40</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_RangedDOOM_Weapons.xml b/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_RangedDOOM_Weapons.xml
deleted file mode 100644
index a292cd8c60..0000000000
--- a/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_RangedDOOM_Weapons.xml	
+++ /dev/null
@@ -1,558 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] DOOM</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== UAC EMG Sidearm ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHGun_DOOM_UACEMGPistol</defName>
-					<statBases>
-						<Mass>1.35</Mass>
-						<RangedWeapon_Cooldown>0.05</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.176</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>2.45</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.57</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Doom2016EmgPistol</defaultProjectile>
-						<warmupTime>0.0</warmupTime>
-						<range>12</range>
-						<soundCast>RHShot_DOOMEMGPistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<!-- Infinite ammo -->
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-				</li>
-
-				<!-- ========== UAC EMG Mk V Pistol ========== 
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHGun_DOOM_UACEMGMarkVPistol</defName>
-					<statBases>
-						<Mass>1.35</Mass>
-						<RangedWeapon_Cooldown>0.05</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.176</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>2.45</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Doom2016EmgMkVPistol</defaultProjectile>
-						<warmupTime>0.0</warmupTime>
-						<range>12</range>
-						<soundCast>RHShot_DOOMEMGMarkVPistol</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_Doom2016EmgMkVPistol</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li> -->
-
-				<!-- ========== UAC Combat Shotgun ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHGun_DOOM_CombatShotgun</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.49</SwayFactor>
-						<Bulk>7.67</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.26</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>RHShot_DOOMCombatShotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-				</li> 
-
-				<!-- ========== UAC Combat Shotgun - Eternal ========== 
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHGun_DOOM_CombatShotgunEternal</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.68</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.49</SwayFactor>
-						<Bulk>7.67</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.26</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.7</warmupTime>
-						<range>26</range>
-						<soundCast>RHShot_DOOMCombatShotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-				</li> -->
-
-				<!-- ========== Super Shotgun ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHGun_DOOM_SuperShotgun</defName>
-					<statBases>
-						<Mass>1.90</Mass>
-						<RangedWeapon_Cooldown>0.93</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>2.73</SwayFactor>
-						<Bulk>6.29</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_DoubleBarreled_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<range>11</range>
-						<soundCast>RHShot_DOOMSuperShotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>2</magazineSize>
-						<reloadTime>1.7</reloadTime>
-						<ammoSet>AmmoSet_12Gauge_CP_DOOM_SuperShotgun</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== UAC Heavy Assault Rifle ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHGun_DOOM_HeavyAssaultRifle</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>9.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.48</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>6</burstShotCount>
-						<soundCast>RHShot_DOOMHeavyAssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>90</magazineSize>
-						<reloadTime>7.80</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!-- ========== UAC Heavy Assault Rifle ========== 
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHGun_DOOM_HeavyCannon</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.01</SwayFactor>
-						<Bulk>10.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.45</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>82</range>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>RHShot_EternalHeavyCannon</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.80</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li> -->
-
-				<!-- ========== UAC D12 Chaingun ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHGun_DOOM_Chaingun</defName>
-					<statBases>
-						<Mass>39.00</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>9.5</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.58</recoilAmount>
-						<recoilPattern>Mounted</recoilPattern>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>2.3</warmupTime>
-						<range>62</range>
-						<burstShotCount>150</burstShotCount>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<soundCast>RHFire_DOOMChaingun</soundCast>
-						<soundAiming>RHGun_DOOMChaingunAiming</soundAiming>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>150</magazineSize>
-						<reloadTime>9.2</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!-- ========== UAC Plasma Rifle ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHGun_DOOM_PlasmaRifle</defName>
-					<statBases>
-						<Mass>8.20</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>13.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.48</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Doom2016PlasmaGun</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>RHShot_DOOMPlasmaRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>150</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_Doom2016PlasmaGun</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- ========== UAC Plasma Gun ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHGun_DOOM_PlasmaGun</defName>
-					<statBases>
-						<Mass>8.20</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>10.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.48</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Doom2016PlasmaGun</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>RHShot_DOOMPlasmaGun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>150</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_Doom2016PlasmaGun</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- ========== UAC Vortex Rifle ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHGun_DOOM_VortexRifle</defName>
-					<statBases>
-						<Mass>7.51</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.60</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.76</SwayFactor>
-						<Bulk>9.05</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Doom2016VortexRifle</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>68</range>
-						<soundCast>RHFire_DOOMVortexRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_Doom2016VortexRifle</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== UAC Hellshot ========== 
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHGun_DOOM_Hellshot</defName>
-					<statBases>
-						<Mass>6.35</Mass>
-						<RangedWeapon_Cooldown>0.05</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.42</SwayFactor>
-						<Bulk>7.49</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Doom2016Hellshot</defaultProjectile>
-						<warmupTime>0.0</warmupTime>
-						<range>48</range>
-						<soundCast>RHFire_DOOMHellshot</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>60</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_Doom2016Hellshot</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-				</li>-->
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHGun_DOOM_UACEMGPistol" or
-						defName="RHGun_DOOM_UACEMGMarkVPistol"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHGun_DOOM_CombatShotgun" or
-						defName="RHGun_DOOM_CombatShotgunEternal" or
-						defName="RHGun_DOOM_SuperShotgun" or
-						defName="RHGun_DOOM_HeavyAssaultRifle" or
-						defName="RHGun_DOOM_PlasmaRifle" or
-						defName="RHGun_DOOM_PlasmaGun" or
-						defName="RHGun_DOOM_VortexRifle" or
-						defName="RHGun_DOOM_HeavyCannon" or
-						defName="RHGun_DOOM_Hellshot"
-						]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHGun_DOOM_Chaingun"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Faction - Bounty Hunters/BountyHunters_Apparel.xml b/Patches/RH2 Faction - Bounty Hunters/BountyHunters_Apparel.xml
deleted file mode 100644
index e27becce65..0000000000
--- a/Patches/RH2 Faction - Bounty Hunters/BountyHunters_Apparel.xml	
+++ /dev/null
@@ -1,306 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Faction: Bounty Hunters</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Ranged Shield Belt -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_RangedShieldBelt_S1_UAC"]/statBases/EnergyShieldRechargeRate</xpath>
-					<value>
-						<EnergyShieldRechargeRate>0.168</EnergyShieldRechargeRate>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_RangedShieldBelt_S1_UAC"]/statBases/EnergyShieldEnergyMax</xpath>
-					<value>
-						<EnergyShieldEnergyMax>1.125</EnergyShieldEnergyMax>
-					</value>
-				</li>
-
-				<!-- Power Armor Helmets -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_WardenHelmet_BH1PowerArmor" or
-						defName="RHApparel_JusticeHelmet_BH2PowerArmor" or
-						defName="RHApparel_BloodhoundHelmet_BH3PowerArmor" or
-						defName="RHApparel_OutlawHelmet_BH4PowerArmor"]/statBases </xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_WardenHelmet_BH1PowerArmor" or
-						defName="RHApparel_JusticeHelmet_BH2PowerArmor" or
-						defName="RHApparel_BloodhoundHelmet_BH3PowerArmor" or
-						defName="RHApparel_OutlawHelmet_BH4PowerArmor"]/statBases/Flammability </xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_WardenHelmet_BH1PowerArmor" or
-						defName="RHApparel_JusticeHelmet_BH2PowerArmor" or
-						defName="RHApparel_BloodhoundHelmet_BH3PowerArmor" or
-						defName="RHApparel_OutlawHelmet_BH4PowerArmor"]/statBases/Mass </xpath>
-					<value>
-						<Mass>6.6</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_WardenHelmet_BH1PowerArmor" or
-						defName="RHApparel_JusticeHelmet_BH2PowerArmor" or
-						defName="RHApparel_BloodhoundHelmet_BH3PowerArmor" or
-						defName="RHApparel_OutlawHelmet_BH4PowerArmor"]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>22</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_WardenHelmet_BH1PowerArmor" or
-						defName="RHApparel_JusticeHelmet_BH2PowerArmor" or
-						defName="RHApparel_BloodhoundHelmet_BH3PowerArmor" or
-						defName="RHApparel_OutlawHelmet_BH4PowerArmor"]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>50</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_WardenHelmet_BH1PowerArmor" or
-						defName="RHApparel_JusticeHelmet_BH2PowerArmor" or
-						defName="RHApparel_BloodhoundHelmet_BH3PowerArmor" or
-						defName="RHApparel_OutlawHelmet_BH4PowerArmor"]/equippedStatOffsets/ShootingAccuracyPawn </xpath>
-					<value>
-						<AimingAccuracy>0.15</AimingAccuracy>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_WardenHelmet_BH1PowerArmor" or
-						defName="RHApparel_JusticeHelmet_BH2PowerArmor" or
-						defName="RHApparel_BloodhoundHelmet_BH3PowerArmor" or
-						defName="RHApparel_OutlawHelmet_BH4PowerArmor"]/costList/Plasteel </xpath>
-					<value>
-						<Plasteel>120</Plasteel>
-						<DevilstrandCloth>25</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_WardenHelmet_BH1PowerArmor" or
-						defName="RHApparel_JusticeHelmet_BH2PowerArmor" or
-						defName="RHApparel_BloodhoundHelmet_BH3PowerArmor" or
-						defName="RHApparel_OutlawHelmet_BH4PowerArmor"]/apparel/layers </xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_WardenHelmet_BH1PowerArmor" or
-						defName="RHApparel_JusticeHelmet_BH2PowerArmor" or
-						defName="RHApparel_BloodhoundHelmet_BH3PowerArmor" or
-						defName="RHApparel_OutlawHelmet_BH4PowerArmor"] </xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- Power Armor Suits -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_Warden_BH1PowerArmor" or
-						defName="RHApparel_Justice_BH2PowerArmor" or
-						defName="RHApparel_Bloodhound_BH3PowerArmor" or
-						defName="RHApparel_Outlaw_BH4PowerArmor"]/statBases </xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_Warden_BH1PowerArmor" or
-						defName="RHApparel_Justice_BH2PowerArmor" or
-						defName="RHApparel_Bloodhound_BH3PowerArmor" or
-						defName="RHApparel_Outlaw_BH4PowerArmor"]/statBases/MaxHitPoints </xpath>
-					<value>
-						<MaxHitPoints>600</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_Warden_BH1PowerArmor" or
-						defName="RHApparel_Justice_BH2PowerArmor" or
-						defName="RHApparel_Bloodhound_BH3PowerArmor" or
-						defName="RHApparel_Outlaw_BH4PowerArmor"]/statBases/Mass </xpath>
-					<value>
-						<Mass>80</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_Warden_BH1PowerArmor" or
-						defName="RHApparel_Justice_BH2PowerArmor" or
-						defName="RHApparel_Bloodhound_BH3PowerArmor" or
-						defName="RHApparel_Outlaw_BH4PowerArmor"]/statBases/Flammability </xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_Warden_BH1PowerArmor" or
-						defName="RHApparel_Justice_BH2PowerArmor" or
-						defName="RHApparel_Bloodhound_BH3PowerArmor" or
-						defName="RHApparel_Outlaw_BH4PowerArmor"]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>26</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_Warden_BH1PowerArmor" or
-						defName="RHApparel_Justice_BH2PowerArmor" or
-						defName="RHApparel_Bloodhound_BH3PowerArmor" or
-						defName="RHApparel_Outlaw_BH4PowerArmor"]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>56</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_Warden_BH1PowerArmor" or
-						defName="RHApparel_Justice_BH2PowerArmor" or
-						defName="RHApparel_Bloodhound_BH3PowerArmor" or
-						defName="RHApparel_Outlaw_BH4PowerArmor"]/costList </xpath>
-					<value>
-						<DevilstrandCloth>50</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_Warden_BH1PowerArmor" or
-						defName="RHApparel_Justice_BH2PowerArmor" or
-						defName="RHApparel_Bloodhound_BH3PowerArmor" or
-						defName="RHApparel_Outlaw_BH4PowerArmor"]/equippedStatOffsets </xpath>
-					<value>
-						<CarryWeight>100</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-						<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_Warden_BH1PowerArmor" or
-						defName="RHApparel_Justice_BH2PowerArmor" or
-						defName="RHApparel_Bloodhound_BH3PowerArmor" or
-						defName="RHApparel_Outlaw_BH4PowerArmor"]/apparel/bodyPartGroups </xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_Warden_BH1PowerArmor" or
-						defName="RHApparel_Justice_BH2PowerArmor" or
-						defName="RHApparel_Bloodhound_BH3PowerArmor" or
-						defName="RHApparel_Outlaw_BH4PowerArmor"]/costList/Plasteel </xpath>
-					<value>
-						<Plasteel>220</Plasteel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_Warden_BH1PowerArmor" or
-						defName="RHApparel_Justice_BH2PowerArmor" or
-						defName="RHApparel_Bloodhound_BH3PowerArmor" or
-						defName="RHApparel_Outlaw_BH4PowerArmor"]/costList/Uranium </xpath>
-					<value>
-						<Uranium>60</Uranium>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_Warden_BH1PowerArmor" or
-						defName="RHApparel_Justice_BH2PowerArmor" or
-						defName="RHApparel_Bloodhound_BH3PowerArmor" or
-						defName="RHApparel_Outlaw_BH4PowerArmor"] </xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Faction - Bounty Hunters/BountyHunters_Drink.xml b/Patches/RH2 Faction - Bounty Hunters/BountyHunters_Drink.xml
deleted file mode 100644
index f2f48ac230..0000000000
--- a/Patches/RH2 Faction - Bounty Hunters/BountyHunters_Drink.xml	
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Faction: Bounty Hunters</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RH2_SoftDrinkResourceBase"]/statBases</xpath>
-					<value>
-						<Bulk>0.33</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RH2_SmokeleafSotoxi_Cigarette"]/statBases</xpath>
-					<value>
-						<Bulk>0.05</Bulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Faction - Bounty Hunters/BountyHunters_Gun.xml b/Patches/RH2 Faction - Bounty Hunters/BountyHunters_Gun.xml
deleted file mode 100644
index fbbfd0f19e..0000000000
--- a/Patches/RH2 Faction - Bounty Hunters/BountyHunters_Gun.xml	
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Faction: Bounty Hunters</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHGun_DOOM3_PlasmaGun"]/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>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RHGun_DOOM3_PlasmaGun</defName>
-					<statBases>
-						<Bulk>7.5</Bulk>
-						<SwayFactor>1.27</SwayFactor>
-						<ShotSpread>0.07</ShotSpread>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.25</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_PlasmaCellRifle</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<warmupTime>1.2</warmupTime>
-						<range>62</range>
-						<soundCast>RHShot_DOOM3_PlasmaGunShot</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>60</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_PlasmaCellRifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Faction - Bounty Hunters/BountyHunters_Pawnkinds.xml b/Patches/RH2 Faction - Bounty Hunters/BountyHunters_Pawnkinds.xml
deleted file mode 100644
index 062029ada6..0000000000
--- a/Patches/RH2 Faction - Bounty Hunters/BountyHunters_Pawnkinds.xml	
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Faction: Bounty Hunters</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						@Name="RH2_DOOMBountyHunters_Base" or
-						@Name="RH2_BountyHunters_SpecialBase" or
-						@Name="RH2_BountyHunters_FNGBase" or
-						@Name="RH2_BountyHunters_BossBase"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Faction - Task Force 141/TaskForce141_Apparel.xml b/Patches/RH2 Faction - Task Force 141/TaskForce141_Apparel.xml
deleted file mode 100644
index 596127e4ac..0000000000
--- a/Patches/RH2 Faction - Task Force 141/TaskForce141_Apparel.xml	
+++ /dev/null
@@ -1,232 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Faction: Task Force 141</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Shirts, pants, hats, earpro-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_TacticalJacket_141Fleece" or
-						defName="RNApparel_Pants_CryeG3MultiCam" or
-						defName="RNApparel_Pants_BDUDCU" or
-						defName="RNApparel_BoonieHat_Price" or
-						defName="RNApparel_EarDefs_PeltorComtacII"]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_EarDefs_PeltorComtacII"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>20</costStuffCount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_TacticalJacket_141Fleece" or
-						defName="RNApparel_Pants_CryeG3MultiCam" or
-						defName="RNApparel_Pants_BDUDCU"]/statBases </xpath>
-					<value>
-						<Bulk>2</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_TacticalJacket_141Fleece"]/statBases/Mass</xpath>
-					<value>
-						<Mass>0.75</Mass>
-					</value>
-				</li>
-
-				<!--Masks-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Balaclava_Helikon" or
-						defName="RNApparel_Balaclava_Ghost"]/apparel/layers </xpath>
-					<value>
-						<layers>
-							<li>OnHead</li>
-						</layers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Balaclava_Helikon" or
-						defName="RNApparel_Balaclava_Ghost"]/apparel/bodyPartGroups </xpath>
-					<value>
-						<bodyPartGroups>
-							<li>UpperHead</li>
-							<li>Teeth</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-				<!--Eyepros-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_EyePros_SIBallistic" or
-						defName="RNApparel_EyePros_PILLAPantherX"]/apparel/layers </xpath>
-					<value>
-						<layers>
-							<li>StrappedHead</li>
-						</layers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_EyePros_SIBallistic"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_EyePros_PILLAPantherX"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!--Armor-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_CryeCAGE_Tan"]/statBases/Mass</xpath>
-					<value>
-						<Mass>9</Mass>
-						<Bulk>6</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_CryeCAGE_Tan"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>75</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_CryeCAGE_Tan"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_CryeCAGE_Tan"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>20</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RNApparel_CryeCAGE_Tan"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<!--Helmets-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_MICH2000_141Rook" or
-						defName="RNApparel_MICH2000_141Roach"]/stuffCategories </xpath>
-					<value>
-						<stuffCategories>
-							<li>Steeled</li>
-						</stuffCategories>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_MICH2000_141Rook" or
-						defName="RNApparel_MICH2000_141Roach"]/statBases </xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-						<ArmorRating_Blunt>20</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.54</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!--Webbing, packs-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name = "RHApparel_141HarnessBase"]/apparel/layers</xpath>
-					<value>
-						<layers>
-							<li>Webbing</li>
-						</layers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name = "RHApparel_141HarnessBase"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>Shoulders</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						@Name = "RHApparel_141HarnessBase" or
-						defName="RNApparel_Backpack_CamelbakMULE" or
-						defName="RNApparel_Backpack_MaxpeditionFalconIII" or
-						defName="RNApparel_Backpack_MFH"]/statBases
-
-					</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationreplace">
-					<xpath>Defs/ThingDef[@Name = "RHApparel_141HarnessBase"]/equippedStatOffsets
-					</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>30</CarryBulk>
-							<ReloadSpeed>0.1</ReloadSpeed>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationreplace">
-					<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_MaxpeditionFalconIII"]/equippedStatOffsets
-					</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>35</CarryBulk>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationreplace">
-					<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_CamelbakMULE"]/equippedStatOffsets
-					</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>25</CarryBulk>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationreplace">
-					<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_MFH"]/equippedStatOffsets
-					</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>15</CarryBulk>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Faction - Task Force 141/TaskForce141_Guns.xml b/Patches/RH2 Faction - Task Force 141/TaskForce141_Guns.xml
deleted file mode 100644
index 00569f0bf2..0000000000
--- a/Patches/RH2 Faction - Task Force 141/TaskForce141_Guns.xml	
+++ /dev/null
@@ -1,304 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Faction: Task Force 141</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName="RNGun_HK433_Rifle" or
-						defName="RNGun_M4A1TaskForce_Rifle" or
-						defName="RNGun_FNMinimi762MG" or
-						defName="RNGun_RSASS_DMR" or
-						defName="RNGun_THORM408AMR"
-						]/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>
-				</li>
-
-				<!-- HK 443 -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_HK433_Rifle</defName>
-					<statBases>
-						<Mass>3.8</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.5</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.35</SwayFactor>
-						<Bulk>8.5</Bulk>
-						<WorkToMake>37000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>55</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-						<Chemfuel>10</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>1.45</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>58</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AR</li>
-						<li>RN_Coalition_AR</li>
-						<li>RN_HK433</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-				</li>
-
-				<!-- M4A1 -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M4A1TaskForce_Rifle</defName>
-					<statBases>
-						<WorkToMake>32000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.28</SwayFactor>
-						<Bulk>7.5</Bulk>
-						<Mass>2.9</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-						<Chemfuel>10</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>1.58</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_MWARRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AR</li>
-						<li>RN_Coalition_CQB</li>
-						<li>RN_Coalition_AR</li>
-						<li>RN_M4A1_TaskForce</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-				</li>
-
-				<!--FN Minimi 7.62-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_FNMinimi762MG</defName>
-					<statBases>
-						<WorkToMake>40500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.45</SwayFactor>
-						<Bulk>12.55</Bulk>
-						<Mass>8.8</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>80</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-						<Chemfuel>15</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>1.3</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>58</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>RNShot_GenericDMR_II</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AR</li>
-						<li>RN_Coalition_MG</li>
-						<li>RNGun_FNMinimi762</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-				</li>
-
-				<!--RSASS-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_RSASS_DMR</defName>
-					<statBases>
-						<WorkToMake>33500</WorkToMake>
-						<Mass>7.50</Mass>
-						<Bulk>11.20</Bulk>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.70</SwayFactor>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>75</Steel>
-						<Chemfuel>5</Chemfuel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<soundCast>RNShot_GenericDMR</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SniperRifle</li>
-						<li>RN_Coalition_DMR</li>
-						<li>RN_RSASS</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-				</li>
-
-				<!--THOR M408 AMR-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_THORM408AMR</defName>
-					<statBases>
-						<WorkToMake>44500</WorkToMake>
-						<SightsEfficiency>3.5</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1.92</SwayFactor>
-						<Bulk>15.48</Bulk>
-						<Mass>11.80</Mass>
-						<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>85</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-						<Chemfuel>20</Chemfuel>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_408CheyenneTactical_FMJ</defaultProjectile>
-						<warmupTime>2.8</warmupTime>
-						<range>86</range>
-						<soundCast>RNShotIntervention</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_408CheyenneTactical</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SniperRifle</li>
-						<li>RN_Coalition_AMR</li>
-						<li>RN_Coalition_Sniper</li>
-						<li>RN_THOR_M408</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Faction - Task Force 141/TaskForce141_Pawnkinds.xml b/Patches/RH2 Faction - Task Force 141/TaskForce141_Pawnkinds.xml
deleted file mode 100644
index ba8cfe1bd2..0000000000
--- a/Patches/RH2 Faction - Task Force 141/TaskForce141_Pawnkinds.xml	
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Faction: Task Force 141</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Traders ammo stock ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[
-						defName="RHVisitor_141_Standard" or
-						defName="RHBase_141_Standard" or
-						defName="RHCaravan_141_MilitiaSupplier"
-						]/stockGenerators </xpath>
-					<value>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Ammo</tradeTag>
-							<countRange>
-								<min>1000</min>
-								<max>3000</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>5</min>
-								<max>12</max>
-							</thingDefCountRange>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Weapon money ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[
-						defName="RH2_141_FNG" or
-						defName="RH2_141_Gunner" or
-						defName="RH2_141_Assault" or
-						defName="RH2_141_Trader"
-						]/weaponMoney/min </xpath>
-					<value>
-						<min>550</min>
-					</value>
-				</li>
-
-				<!-- ========== Apparel, Webbing ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[@Name="RH2_141_SpecialBase"]/specificApparelRequirements/li[1]</xpath>
-					<value>
-						<li>
-							<bodyPartGroup>Eyes</bodyPartGroup>
-							<apparelLayer>StrappedHead</apparelLayer>
-							<stuff>Plasteel</stuff>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[
-						@Name="RH2_Operator_NonEliteTierBase" or
-						@Name="RH2_141_EliteTierBase" or
-						@Name="RH2_141_BossTierBase" or
-						@Name="RH2_141_SoapTierBase" or
-						defName="RH2_141_Trader"
-						]/apparelTags </xpath>
-					<value>
-						<li>RH2_XBelt_141</li>
-						<li>RH2_Backpack_141</li>
-					</value>
-				</li>
-
-				<!-- ========== Ammo ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RH2_141_EliteGunner"]/weaponTags</xpath>
-					<value>
-						<weaponTags>
-							<li>RN_Coalition_MG</li>
-							<li>RNGun_FNMinimi762</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="RH2_141_EliteGunner" or
-						defName="RH2_141_Gunner"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>3</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="RH2_141_Trader" or
-						defName="RH2_141_FNG" or
-						defName="RH2_141_Assault" or
-						defName="RH2_141_Sharpshooter" or
-						defName="RH2_141_Boss" or
-						defName="RH2_141_Elite"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>7</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.15</generateChance>
-									<sidearmMoney>
-										<min>10</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>GrenadeSmoke</li>
-									</weaponTags>
-									<magazineCount>
-										<min>1</min>
-										<max>2</max>
-									</magazineCount>
-								</li>
-								<li>
-									<generateChance>0.075</generateChance>
-									<sidearmMoney>
-										<min>50</min>
-										<max>200</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_FlareLauncher</li>
-									</weaponTags>
-									<magazineCount>
-										<min>2</min>
-										<max>4</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Apparel.xml b/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Apparel.xml
deleted file mode 100644
index e0ec950858..0000000000
--- a/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Apparel.xml	
+++ /dev/null
@@ -1,430 +0,0 @@
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Faction: The Rangers</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== In-built Shield Patch ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@ParentName="RHApparel_Armor_VigilanteBase"]/statBases/EnergyShieldRechargeRate</xpath>
-					<value>
-						<EnergyShieldRechargeRate>0.075</EnergyShieldRechargeRate>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@ParentName="RHApparel_Armor_VigilanteBase"]/statBases/EnergyShieldEnergyMax</xpath>
-					<value>
-						<EnergyShieldEnergyMax>0.75</EnergyShieldEnergyMax>
-					</value>
-				</li>
-
-				<!-- Add Partial Armor to Helmet -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="RHApparel_ArmorHelmetPower_VigilanteBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.50</ArmorRating_Sharp>
-									<parts>
-										<li>Nose</li>
-										<li>Jaw</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.50</ArmorRating_Blunt>
-									<parts>
-										<li>Nose</li>
-										<li>Jaw</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- Add partial armor to Ranger Armors -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="RHApparel_Armor_VigilanteBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Ranger Helmet ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RHApparel_ArmorHelmetPower_VigilanteBase"]/statBases/Mass</xpath>
-					<value>
-						<Mass>5.0</Mass>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RHApparel_ArmorHelmetPower_VigilanteBase"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RHApparel_ArmorHelmetPower_VigilanteBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RHApparel_ArmorHelmetPower_VigilanteBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>36</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RHApparel_ArmorHelmetPower_VigilanteBase"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>0.15</AimingAccuracy>
-							<ToxicResistance>0.50</ToxicResistance>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RHApparel_ArmorHelmetPower_VigilanteBase"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>60</Plasteel>
-						<DevilstrandCloth>20</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RHApparel_ArmorHelmetPower_VigilanteBase"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="RHApparel_ArmorHelmetPower_VigilanteBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Ranger armor ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RHApparel_Armor_VigilanteBase"]/statBases</xpath>
-					<value>
-						<Bulk>90</Bulk>
-						<WornBulk>13</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RHApparel_Armor_VigilanteBase"]/statBases/Mass</xpath>
-					<value>
-						<Mass>40</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RHApparel_Armor_VigilanteBase"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RHApparel_Armor_VigilanteBase"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>450</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RHApparel_Armor_VigilanteBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>19</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RHApparel_Armor_VigilanteBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>42</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RHApparel_Armor_VigilanteBase"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>40</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RHApparel_Armor_VigilanteBase"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>70</CarryWeight>
-							<CarryBulk>10</CarryBulk>
-							<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-							<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RHApparel_Armor_VigilanteBase"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>160</Plasteel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RHApparel_Armor_VigilanteBase"]/costList/Uranium</xpath>
-					<value>
-						<Uranium>20</Uranium>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="RHApparel_Armor_VigilanteBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- Poncho & Duster-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_Duster_Ranger" or defName="RHApparel_Poncho_Western"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_Duster_Ranger" or defName="RHApparel_Poncho_Western"]/statBases</xpath>
-					<value>
-						<Bulk>7.5</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<!--Packs-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "RHApparel_M56Webbing_Ranger" or
-						defName = "RHApparel_Bandolier_Ranger"
-						]/apparel/layers </xpath>
-					<value>
-						<layers>
-							<li>Webbing</li>
-						</layers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "RHApparel_M56Webbing_Ranger" or
-						defName = "RHApparel_Bandolier_Ranger"
-						]/apparel/bodyPartGroups </xpath>
-					<value>
-						<bodyPartGroups>
-							<li>Shoulders</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName = "RHApparel_M56Webbing_Ranger" or
-						defName = "RHApparel_Bandolier_Ranger" or
-						defName = "RNApparel_Backpack_AUGURDaypack" or
-						defName = "RNApparel_Backpack_AUGURSling" or
-						defName = "RNApparel_Backpack_AUGURHaversack"]/statBases
-					</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationreplace">
-					<xpath>Defs/ThingDef[defName = "RHApparel_M56Webbing_Ranger"]/equippedStatOffsets
-					</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>30</CarryBulk>
-							<ReloadSpeed>0.1</ReloadSpeed>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationreplace">
-					<xpath>Defs/ThingDef[defName = "RHApparel_Bandolier_Ranger"]/equippedStatOffsets
-					</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>18</CarryBulk>
-							<ReloadSpeed>0.1</ReloadSpeed>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationreplace">
-					<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_AUGURDaypack"]/equippedStatOffsets
-					</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>38</CarryBulk>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationreplace">
-					<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_AUGURDaypack"]/statBases/Mass
-					</xpath>
-					<value>
-						<Mass>1.2</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationreplace">
-					<xpath>Defs/ThingDef[
-						defName = "RNApparel_Backpack_AUGURSling" or
-						defName = "RNApparel_Backpack_AUGURHaversack"]/equippedStatOffsets
-					</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>25</CarryBulk>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Handgun.xml b/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Handgun.xml
deleted file mode 100644
index a4607c2786..0000000000
--- a/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Handgun.xml	
+++ /dev/null
@@ -1,329 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Faction: The Rangers</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Colt Peacemaker ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Revolver_ColtPeacemaker</defName>
-					<statBases>
-						<Mass>1.19</Mass>
-						<RangedWeapon_Cooldown>0.89</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>2.79</Bulk>
-						<WorkToMake>3500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.84</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45Colt_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShot_GenericRevolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_45Colt</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Colt Walker ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Revolver_ColtWalker</defName>
-					<statBases>
-						<Mass>1.79</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.36</ShotSpread>
-						<SwayFactor>1.22</SwayFactor>
-						<Bulk>3.56</Bulk>
-						<WorkToMake>5000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>35</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.58</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_SlowMusketBall</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShot_GenericRevolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>15</reloadTime>
-						<ammoSet>AmmoSet_SlowMusketBall</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Remington 1875 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Revolver_RemingtonSingleActionArmy</defName>
-					<statBases>
-						<Mass>1.18</Mass>
-						<RangedWeapon_Cooldown>0.90</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.56</SwayFactor>
-						<Bulk>3.51</Bulk>
-						<WorkToMake>3500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>3.28</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45Colt_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>15</range>
-						<soundCast>RNShot_GenericRevolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_45Colt</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Smith & Wesson Model 3R ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Revolver_SWModel3R</defName>
-					<statBases>
-						<Mass>1.35</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.47</SwayFactor>
-						<Bulk>3.05</Bulk>
-						<WorkToMake>5000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.93</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_44Magnum_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>RNShotColtPython</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_44Magnum</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Smith & Wesson Model 29 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Revolver_SWModel29R</defName>
-					<statBases>
-						<Mass>1.35</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.47</SwayFactor>
-						<Bulk>3.05</Bulk>
-						<WorkToMake>5000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.93</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_44Magnum_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShotColtPython</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_44Magnum</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Browning HiPower ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_BrowningHiPower_Pistol</defName>
-					<statBases>
-						<WorkToMake>5000</WorkToMake>
-						<Mass>1.11</Mass>
-						<Bulk>2.00</Bulk>
-						<SwayFactor>1.07</SwayFactor>
-						<ShotSpread>0.15</ShotSpread>
-						<SightsEfficiency>0.80</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.3</warmupTime>
-						<range>18</range>
-						<soundCast>RNShot_CZ75B</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>13</magazineSize>
-						<reloadTime>1.7</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNGun_Revolver_RemingtonSingleActionArmy" or
-						defName="RNGun_Revolver_ColtPeacemaker" or
-						defName="RNGun_Revolver_ColtWalker" or
-						defName="RNGun_Revolver_SWModel3R" or
-						defName="RNGun_Revolver_SWModel29R" or
-						defName="RNGun_BrowningHiPower_Pistol"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Melee.xml b/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Melee.xml
deleted file mode 100644
index 68377fb1cd..0000000000
--- a/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Melee.xml	
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Faction: The Rangers</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Vintage KABAR_Knife === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_VintageKABAR_Knife"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_VintageKABAR_Knife"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.05</MeleeCritChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-							<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_VintageKABAR_Knife"]/weaponTags</xpath>
-					<value>
-						<li>CE_Sidearm_Melee</li>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_VintageKABAR_Knife"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.22</cooldownTime>
-								<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.34</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.29</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.44</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Pawns.xml b/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Pawns.xml
deleted file mode 100644
index 5f12c6c54a..0000000000
--- a/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Pawns.xml	
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Faction: The Rangers</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="RH2_Ranger_NonEliteTierBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="RH2_Rangers_EliteTierBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>7</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.075</generateChance>
-									<sidearmMoney>
-										<min>50</min>
-										<max>200</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_FlareLauncher</li>
-									</weaponTags>
-									<magazineCount>
-										<min>2</min>
-										<max>4</max>
-									</magazineCount>
-								</li>
-								<li>
-									<generateChance>0.125</generateChance>
-									<sidearmMoney>
-										<min>10</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>GrenadeSmoke</li>
-										<li>GrenadeDestructive</li>
-									</weaponTags>
-									<magazineCount>
-										<min>0</min>
-										<max>1</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Rifle.xml b/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Rifle.xml
deleted file mode 100644
index 1ec2369782..0000000000
--- a/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Rifle.xml	
+++ /dev/null
@@ -1,271 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Faction: The Rangers</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Longgun Melee Tools =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNGun_AR10_Rifle" or
-						defName="RNGun_T48_Rifle" or
-						defName="RNGun_BattleRifle_M1Garand" or
-						defName="RNGun_BattleRifle_M1Carbine" or
-						defName="RNGun_HenryRepeatingRifle_Rifle"]/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>
-				</li>
-
-				<!-- ========== AR10 =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_AR10_Rifle</defName>
-					<statBases>
-						<WorkToMake>32500</WorkToMake>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.44</SwayFactor>
-						<Bulk>10.25</Bulk>
-						<Mass>4.05</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>55</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-						<Chemfuel>10</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>2.07</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<range>55</range>
-						<soundCast>RNShot_GenericDMR_II</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-				</li>
-
-				<!-- ========== T48 FAL thing =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_T48_Rifle</defName>
-					<statBases>
-						<WorkToMake>28000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.52</SwayFactor>
-						<Bulk>10.90</Bulk>
-						<Mass>4.30</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>55</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.07</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<soundCast>RNShot_GenericDMR</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</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>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-				</li>
-
-				<!-- ========== M1 Garand ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_BattleRifle_M1Garand</defName>
-					<statBases>
-						<Mass>4.31</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.53</SwayFactor>
-						<Bulk>11.00</Bulk>
-						<WorkToMake>15000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>RNShot_GenericDMR</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_3006Springfield</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-					<researchPrerequisite>GasOperation</researchPrerequisite>
-				</li>
-
-				<!-- ========== M1 Carbine ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_BattleRifle_M1Carbine</defName>
-					<statBases>
-						<Mass>2.40</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.14</SwayFactor>
-						<Bulk>6.00</Bulk>
-						<WorkToMake>17500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>45</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_30Carbine_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>37</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_30Carbine</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<researchPrerequisite>GasOperation</researchPrerequisite>
-				</li>
-
-				<!-- Henry -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_HenryRepeatingRifle_Rifle</defName>
-					<statBases>
-						<WorkToMake>12000</WorkToMake>
-						<Mass>3.2</Mass>
-						<Bulk>12.50</Bulk>
-						<SwayFactor>1.30</SwayFactor>
-						<ShotSpread>0.02</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.65</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>60</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_45Colt_FMJ</defaultProjectile>
-						<warmupTime>0.9</warmupTime>
-						<range>48</range>
-						<soundCast>RNShotModel1866LA</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>16</magazineSize>
-						<reloadTime>0.5</reloadTime>
-						<ammoSet>AmmoSet_45Colt</ammoSet>
-						<reloadOneAtATime>true</reloadOneAtATime>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Sharpshooter.xml b/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Sharpshooter.xml
deleted file mode 100644
index f170bce7c3..0000000000
--- a/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Sharpshooter.xml	
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Faction: The Rangers</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== HelcateII AMR ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_PGMHelcateII_AMR</defName>
-					<statBases>
-						<Mass>13.8</Mass>
-						<RangedWeapon_Cooldown>1.10</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.72</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1.7</SwayFactor>
-						<Bulk>14.52</Bulk>
-						<WorkToMake>40000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>80</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>2.8</warmupTime>
-						<range>100</range>
-						<soundCast>RNShot_Generic50Bolt</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== WinchesterModel70_Sniper ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_WinchesterModel70_Sniper</defName>
-					<statBases>
-						<Mass>3.6</Mass>
-						<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.60</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.57</SwayFactor>
-						<Bulk>12</Bulk>
-						<WorkToMake>32500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>20</Chemfuel>
-						<Steel>70</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
-						<warmupTime>1.8</warmupTime>
-						<range>75</range>
-						<soundCast>RNShot_GenericBoltSniper_II</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_303British</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-					<researchPrerequisite>Gunsmithing</researchPrerequisite>
-				</li>
-
-				<!-- ========== Ruger M77 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_RugerM77_BoltAction</defName>
-					<statBases>
-						<Mass>3.74</Mass>
-						<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.60</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>11.92</Bulk>
-						<WorkToMake>30500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>65</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
-						<warmupTime>1.8</warmupTime>
-						<range>75</range>
-						<soundCast>RNShot_GenericBoltSniper</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_3006Springfield</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-					<researchPrerequisite>Gunsmithing</researchPrerequisite>
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNGun_PGMHelcateII_AMR" or
-						defName="RNGun_WinchesterModel70_Sniper" or
-						defName="RNGun_RugerM77_BoltAction"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Shotgun.xml b/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Shotgun.xml
deleted file mode 100644
index bbc16e1068..0000000000
--- a/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Shotgun.xml	
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Faction: The Rangers</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Rhotgun Shotgun ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_RugerRedLabel_Shotgun</defName>
-					<statBases>
-						<Mass>2.90</Mass>
-						<RangedWeapon_Cooldown>0.9</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>9.97</Bulk>
-						<WorkToMake>9500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>40</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>18</range>
-						<soundCast>RNShotSawnOff</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>2</magazineSize>
-						<reloadTime>1.9</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<!-- shotguns with stocks -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNGun_RugerRedLabel_Shotgun"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Spacer.xml b/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Spacer.xml
deleted file mode 100644
index 28f34a91ee..0000000000
--- a/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Spacer.xml	
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Faction: The Rangers</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Mr Shorty ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_MrShorty_ChargeRifle</defName>
-					<statBases>
-						<SightsEfficiency>1.05</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.3</SwayFactor>
-						<Bulk>6.5</Bulk>
-					</statBases>
-					<costList>
-						<Steel>45</Steel>
-						<Plasteel>25</Plasteel>
-						<ComponentIndustrial>10</ComponentIndustrial>
-						<Chemfuel>15</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>1.7</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
-						<warmupTime>0.9</warmupTime>
-						<range>46</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<soundCast>RN2Shot_GenericCharge</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>2.40</reloadTime>
-						<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<researchPrerequisite>ChargedShot</researchPrerequisite>
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Railgun ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_KBARailgun_BoltAction</defName>
-					<statBases>
-						<Mass>5.05</Mass>
-						<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.20</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.53</SwayFactor>
-						<Bulk>11.00</Bulk>
-						<WorkToMake>40000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>60</Steel>
-						<Plasteel>10</Plasteel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-						<ComponentSpacer>1</ComponentSpacer>
-						<WoodLog>15</WoodLog>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6mmRailgun_Sabot</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>62</range>
-						<soundCast>RN2Shot_ChargeSniper</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_6mmRailgun</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-					<researchPrerequisite>ChargedShot</researchPrerequisite>
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNGun_MrShorty_ChargeRifle" or
-						defName="RNGun_KBARailgun_BoltAction"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Faction - Utilitarian/Utilitarian_Apparel.xml b/Patches/RH2 Faction - Utilitarian/Utilitarian_Apparel.xml
deleted file mode 100644
index 04b5a41a02..0000000000
--- a/Patches/RH2 Faction - Utilitarian/Utilitarian_Apparel.xml	
+++ /dev/null
@@ -1,306 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Faction: Utilitarian</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Ranged Shield Belt -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_RangedShieldBelt_TitanCorp"]/statBases/EnergyShieldRechargeRate</xpath>
-					<value>
-						<EnergyShieldRechargeRate>0.15</EnergyShieldRechargeRate>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_RangedShieldBelt_TitanCorp"]/statBases/EnergyShieldEnergyMax</xpath>
-					<value>
-						<EnergyShieldEnergyMax>0.75</EnergyShieldEnergyMax>
-					</value>
-				</li>
-
-				<!-- Power Armor Helmets -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_VectorHelmet_UTIL1PowerArmor" or
-						defName="RHApparel_PrimeHelmet_UTIL2PowerArmor" or
-						defName="RHApparel_OmicronHelmet_UTIL3PowerArmor" or
-						defName="RHApparel_HelixHelmet_UTIL4PowerArmor"]/statBases </xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_VectorHelmet_UTIL1PowerArmor" or
-						defName="RHApparel_PrimeHelmet_UTIL2PowerArmor" or
-						defName="RHApparel_OmicronHelmet_UTIL3PowerArmor" or
-						defName="RHApparel_HelixHelmet_UTIL4PowerArmor"]/statBases/Flammability </xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_VectorHelmet_UTIL1PowerArmor" or
-						defName="RHApparel_PrimeHelmet_UTIL2PowerArmor" or
-						defName="RHApparel_OmicronHelmet_UTIL3PowerArmor" or
-						defName="RHApparel_HelixHelmet_UTIL4PowerArmor"]/statBases/Mass </xpath>
-					<value>
-						<Mass>6.6</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_VectorHelmet_UTIL1PowerArmor" or
-						defName="RHApparel_PrimeHelmet_UTIL2PowerArmor" or
-						defName="RHApparel_OmicronHelmet_UTIL3PowerArmor" or
-						defName="RHApparel_HelixHelmet_UTIL4PowerArmor"]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>22</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_VectorHelmet_UTIL1PowerArmor" or
-						defName="RHApparel_PrimeHelmet_UTIL2PowerArmor" or
-						defName="RHApparel_OmicronHelmet_UTIL3PowerArmor" or
-						defName="RHApparel_HelixHelmet_UTIL4PowerArmor"]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>50</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_VectorHelmet_UTIL1PowerArmor" or
-						defName="RHApparel_PrimeHelmet_UTIL2PowerArmor" or
-						defName="RHApparel_OmicronHelmet_UTIL3PowerArmor" or
-						defName="RHApparel_HelixHelmet_UTIL4PowerArmor"]/equippedStatOffsets/ShootingAccuracyPawn </xpath>
-					<value>
-						<AimingAccuracy>0.15</AimingAccuracy>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_VectorHelmet_UTIL1PowerArmor" or
-						defName="RHApparel_PrimeHelmet_UTIL2PowerArmor" or
-						defName="RHApparel_OmicronHelmet_UTIL3PowerArmor" or
-						defName="RHApparel_HelixHelmet_UTIL4PowerArmor"]/costList/Plasteel </xpath>
-					<value>
-						<Plasteel>120</Plasteel>
-						<DevilstrandCloth>25</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_VectorHelmet_UTIL1PowerArmor" or
-						defName="RHApparel_PrimeHelmet_UTIL2PowerArmor" or
-						defName="RHApparel_OmicronHelmet_UTIL3PowerArmor" or
-						defName="RHApparel_HelixHelmet_UTIL4PowerArmor"]/apparel/layers </xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_VectorHelmet_UTIL1PowerArmor" or
-						defName="RHApparel_PrimeHelmet_UTIL2PowerArmor" or
-						defName="RHApparel_OmicronHelmet_UTIL3PowerArmor" or
-						defName="RHApparel_HelixHelmet_UTIL4PowerArmor"] </xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- Power Armor Suits -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_Vector_UTIL1PowerArmor" or
-						defName="RHApparel_Prime_UTIL2PowerArmor" or
-						defName="RHApparel_Omicron_UTIL3PowerArmor" or
-						defName="RHApparel_Helix_UTIL4PowerArmor"]/statBases </xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_Vector_UTIL1PowerArmor" or
-						defName="RHApparel_Prime_UTIL2PowerArmor" or
-						defName="RHApparel_Omicron_UTIL3PowerArmor" or
-						defName="RHApparel_Helix_UTIL4PowerArmor"]/statBases/MaxHitPoints </xpath>
-					<value>
-						<MaxHitPoints>600</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_Vector_UTIL1PowerArmor" or
-						defName="RHApparel_Prime_UTIL2PowerArmor" or
-						defName="RHApparel_Omicron_UTIL3PowerArmor" or
-						defName="RHApparel_Helix_UTIL4PowerArmor"]/statBases/Mass </xpath>
-					<value>
-						<Mass>80</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_Vector_UTIL1PowerArmor" or
-						defName="RHApparel_Prime_UTIL2PowerArmor" or
-						defName="RHApparel_Omicron_UTIL3PowerArmor" or
-						defName="RHApparel_Helix_UTIL4PowerArmor"]/statBases/Flammability </xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_Vector_UTIL1PowerArmor" or
-						defName="RHApparel_Prime_UTIL2PowerArmor" or
-						defName="RHApparel_Omicron_UTIL3PowerArmor" or
-						defName="RHApparel_Helix_UTIL4PowerArmor"]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>26</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_Vector_UTIL1PowerArmor" or
-						defName="RHApparel_Prime_UTIL2PowerArmor" or
-						defName="RHApparel_Omicron_UTIL3PowerArmor" or
-						defName="RHApparel_Helix_UTIL4PowerArmor"]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>56</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_Vector_UTIL1PowerArmor" or
-						defName="RHApparel_Prime_UTIL2PowerArmor" or
-						defName="RHApparel_Omicron_UTIL3PowerArmor" or
-						defName="RHApparel_Helix_UTIL4PowerArmor"]/costList </xpath>
-					<value>
-						<DevilstrandCloth>50</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_Vector_UTIL1PowerArmor" or
-						defName="RHApparel_Prime_UTIL2PowerArmor" or
-						defName="RHApparel_Omicron_UTIL3PowerArmor" or
-						defName="RHApparel_Helix_UTIL4PowerArmor"]/equippedStatOffsets </xpath>
-					<value>
-						<CarryWeight>100</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-						<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_Vector_UTIL1PowerArmor" or
-						defName="RHApparel_Prime_UTIL2PowerArmor" or
-						defName="RHApparel_Omicron_UTIL3PowerArmor" or
-						defName="RHApparel_Helix_UTIL4PowerArmor"]/apparel/bodyPartGroups </xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_Vector_UTIL1PowerArmor" or
-						defName="RHApparel_Prime_UTIL2PowerArmor" or
-						defName="RHApparel_Omicron_UTIL3PowerArmor" or
-						defName="RHApparel_Helix_UTIL4PowerArmor"]/costList/Plasteel </xpath>
-					<value>
-						<Plasteel>220</Plasteel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_Vector_UTIL1PowerArmor" or
-						defName="RHApparel_Prime_UTIL2PowerArmor" or
-						defName="RHApparel_Omicron_UTIL3PowerArmor" or
-						defName="RHApparel_Helix_UTIL4PowerArmor"]/costList/Uranium </xpath>
-					<value>
-						<Uranium>60</Uranium>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_Vector_UTIL1PowerArmor" or
-						defName="RHApparel_Prime_UTIL2PowerArmor" or
-						defName="RHApparel_Omicron_UTIL3PowerArmor" or
-						defName="RHApparel_Helix_UTIL4PowerArmor"] </xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Faction - Utilitarian/Utilitarian_Drink.xml b/Patches/RH2 Faction - Utilitarian/Utilitarian_Drink.xml
deleted file mode 100644
index 24047ee07f..0000000000
--- a/Patches/RH2 Faction - Utilitarian/Utilitarian_Drink.xml	
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Faction: Utilitarian</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RH2_Soda_ThirstyBurst"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>0.33</Bulk>
-						</statBases>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Faction - Utilitarian/Utilitarian_Gun.xml b/Patches/RH2 Faction - Utilitarian/Utilitarian_Gun.xml
deleted file mode 100644
index b1858544d1..0000000000
--- a/Patches/RH2 Faction - Utilitarian/Utilitarian_Gun.xml	
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Faction: Utilitarian</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNGun_DOOM3_MG88Enforcer"]/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>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_DOOM3_MG88Enforcer</defName>
-					<statBases>
-						<Bulk>7.0</Bulk>
-						<SwayFactor>1.15</SwayFactor>
-						<ShotSpread>0.05</ShotSpread>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.25</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>51</range>
-						<soundCast>RHShot_DOOM3_MG88EnforcerShot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>60</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Faction - Utilitarian/Utilitarian_Pawnkinds.xml b/Patches/RH2 Faction - Utilitarian/Utilitarian_Pawnkinds.xml
deleted file mode 100644
index 64779c099a..0000000000
--- a/Patches/RH2 Faction - Utilitarian/Utilitarian_Pawnkinds.xml	
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Faction: Utilitarian</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						@Name="RH2_DOOMUtilitarian_Base" or
-						@Name="RH2_Utilitarian_SpecialBase" or
-						@Name="RH2_Utilitarian_FNGBase" or
-						@Name="RH2_Utilitarian_BossBase"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Faction - VOID/FoodDefs/Caviar_Food.xml b/Patches/RH2 Faction - VOID/FoodDefs/Caviar_Food.xml
deleted file mode 100644
index 58858af4ee..0000000000
--- a/Patches/RH2 Faction - VOID/FoodDefs/Caviar_Food.xml	
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Faction: V.O.I.D.</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RH2_Ration_Caviar"]/statBases</xpath>
-					<value>
-						<Bulk>0.1</Bulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Faction - VOID/HediffDefs/Hediffs_BodyParts_VOIDArchotech.xml b/Patches/RH2 Faction - VOID/HediffDefs/Hediffs_BodyParts_VOIDArchotech.xml
deleted file mode 100644
index 3cb6829236..0000000000
--- a/Patches/RH2 Faction - VOID/HediffDefs/Hediffs_BodyParts_VOIDArchotech.xml	
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Faction: V.O.I.D.</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="RH2_VOIDArchotechArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>0.75</cooldownTime>
-								<armorPenetrationBlunt>5.00</armorPenetrationBlunt>
-								<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
-								<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Faction - VOID/Items_Drugs/Alcohol_RedWine.xml b/Patches/RH2 Faction - VOID/Items_Drugs/Alcohol_RedWine.xml
deleted file mode 100644
index 3d97064709..0000000000
--- a/Patches/RH2 Faction - VOID/Items_Drugs/Alcohol_RedWine.xml	
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Faction: V.O.I.D.</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RH_RedWine"]/statBases</xpath>
-					<value>
-						<Bulk>1.5</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_RedWine"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2.22</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>neck</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>3.33</cooldownTime>
-								<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Neck</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RH_RedWine"]/statBases</xpath>
-					<value>
-						<MeleeCounterParryBonus>0.33</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RH_RedWine"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.1</MeleeCritChance>
-							<MeleeParryChance>0.33</MeleeParryChance>
-							<MeleeDodgeChance>0.07</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="RH_RedWine"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="RH_RedWine"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RH_RedWine"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Faction - VOID/Items_Drugs/Items_Exotic.xml b/Patches/RH2 Faction - VOID/Items_Drugs/Items_Exotic.xml
deleted file mode 100644
index ce066c0c59..0000000000
--- a/Patches/RH2 Faction - VOID/Items_Drugs/Items_Exotic.xml	
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Faction: V.O.I.D.</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RH_Nerotonin8B"]/statBases</xpath>
-					<value>
-						<Bulk>0.01</Bulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Faction - VOID/Monsters/Bodies.xml b/Patches/RH2 Faction - VOID/Monsters/Bodies.xml
deleted file mode 100644
index 20b8d7d6fa..0000000000
--- a/Patches/RH2 Faction - VOID/Monsters/Bodies.xml	
+++ /dev/null
@@ -1,444 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Faction: V.O.I.D.</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant"]/corePart/parts/li[def = "RH_N4Mutant_Neck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant"]/corePart/parts/li[def = "RH_N4Mutant_Neck"]/parts/li[def = "RH_N4Mutant_Head"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/parts/li[def = "RH_N4Mutant_Arm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/parts/li[def = "RH_N4Mutant_Arm"]/parts/li[def = "RH_N4Mutant_Hand"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/parts/li[def = "RH_N4Mutant_Arm"]/parts/li[def = "RH_N4Mutant_Hand"]/parts/li[def = "RH_N4Mutant_Finger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant"]/corePart/parts/li[def = "RH_N4Mutant_Leg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant"]/corePart/parts/li[def = "RH_N4Mutant_Leg"]/parts/li[def = "RH_N4Mutant_Foot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant"]/corePart/parts/li[def = "RH_N4Mutant_Leg"]/parts/li[def = "RH_N4Mutant_Foot"]/parts/li[def = "RH_N4Mutant_Toe"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- ========== Humanlike (ArmBlade) ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_ArmBlade"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_ArmBlade"]/corePart/parts/li[def = "RH_N4Mutant_Neck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_ArmBlade"]/corePart/parts/li[def = "RH_N4Mutant_Neck"]/parts/li[def = "RH_N4Mutant_Head"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_ArmBlade"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_ArmBlade"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/parts/li[def = "RH_N4Mutant_Arm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_ArmBlade"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/parts/li[def = "RH_N4Mutant_Arm"]/parts/li[def = "RH_N4Mutant_Hand"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_ArmBlade"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/parts/li[def = "RH_N4Mutant_Arm"]/parts/li[def = "RH_N4Mutant_Hand"]/parts/li[def = "RH_N4Mutant_Finger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_ArmBlade"]/corePart/parts/li[def = "RH_N4Mutant_Leg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_ArmBlade"]/corePart/parts/li[def = "RH_N4Mutant_Leg"]/parts/li[def = "RH_N4Mutant_Foot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_ArmBlade"]/corePart/parts/li[def = "RH_N4Mutant_Leg"]/parts/li[def = "RH_N4Mutant_Foot"]/parts/li[def = "RH_N4Mutant_Toe"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- ========== Humanlike (BlackLeaper) ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_BlackLeaper"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_BlackLeaper"]/corePart/parts/li[def = "RH_N4Mutant_Neck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_BlackLeaper"]/corePart/parts/li[def = "RH_N4Mutant_Neck"]/parts/li[def = "RH_N4Mutant_Head"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_BlackLeaper"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_BlackLeaper"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/parts/li[def = "RH_N4Mutant_Arm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_BlackLeaper"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/parts/li[def = "RH_N4Mutant_Arm"]/parts/li[def = "RH_N4Mutant_Hand"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_BlackLeaper"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/parts/li[def = "RH_N4Mutant_Arm"]/parts/li[def = "RH_N4Mutant_Hand"]/parts/li[def = "RH_N4Mutant_Finger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_BlackLeaper"]/corePart/parts/li[def = "RH_N4Mutant_Leg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_BlackLeaper"]/corePart/parts/li[def = "RH_N4Mutant_Leg"]/parts/li[def = "RH_N4Mutant_Foot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_BlackLeaper"]/corePart/parts/li[def = "RH_N4Mutant_Leg"]/parts/li[def = "RH_N4Mutant_Foot"]/parts/li[def = "RH_N4Mutant_Toe"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- ========== Giant Spider ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_GiantSpider"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_GiantSpider"]/corePart/parts/li[def = "RH_N4Mutant_Neck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_GiantSpider"]/corePart/parts/li[def = "RH_N4Mutant_Neck"]/parts/li[def = "RH_N4Mutant_Head"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_GiantSpider"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_GiantSpider"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/parts/li[def = "RH_N4Mutant_Arm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_GiantSpider"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/parts/li[def = "RH_N4Mutant_Arm"]/parts/li[def = "RH_N4Mutant_Hand"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_GiantSpider"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/parts/li[def = "RH_N4Mutant_Arm"]/parts/li[def = "RH_N4Mutant_Hand"]/parts/li[def = "RH_N4Mutant_Finger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_GiantSpider"]/corePart/parts/li[def = "RH_N4Mutant_Leg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_GiantSpider"]/corePart/parts/li[def = "RH_N4Mutant_Leg"]/parts/li[def = "RH_N4Mutant_Foot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_GiantSpider"]/corePart/parts/li[def = "RH_N4Mutant_Leg"]/parts/li[def = "RH_N4Mutant_Foot"]/parts/li[def = "RH_N4Mutant_Toe"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- ========== Mother ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_Mother"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_Mother"]/corePart/parts/li[def = "RH_N4Mutant_Neck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_Mother"]/corePart/parts/li[def = "RH_N4Mutant_Neck"]/parts/li[def = "RH_N4Mutant_Head"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_Mother"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_Mother"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/parts/li[def = "RH_N4Mutant_Arm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_Mother"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/parts/li[def = "RH_N4Mutant_Arm"]/parts/li[def = "RH_N4Mutant_Hand"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_Mother"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/parts/li[def = "RH_N4Mutant_Arm"]/parts/li[def = "RH_N4Mutant_Hand"]/parts/li[def = "RH_N4Mutant_Finger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_Mother"]/corePart/parts/li[def = "RH_N4Mutant_Leg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_Mother"]/corePart/parts/li[def = "RH_N4Mutant_Leg"]/parts/li[def = "RH_N4Mutant_Foot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_Mother"]/corePart/parts/li[def = "RH_N4Mutant_Leg"]/parts/li[def = "RH_N4Mutant_Foot"]/parts/li[def = "RH_N4Mutant_Toe"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- ========== Wraith ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_Wraith"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_Wraith"]/corePart/parts/li[def = "RH_N4Mutant_Neck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_Wraith"]/corePart/parts/li[def = "RH_N4Mutant_Neck"]/parts/li[def = "RH_N4Mutant_Head"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_Wraith"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_Wraith"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/parts/li[def = "RH_N4Mutant_Arm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_Wraith"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/parts/li[def = "RH_N4Mutant_Arm"]/parts/li[def = "RH_N4Mutant_Hand"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_Wraith"]/corePart/parts/li[def = "RH_N4Mutant_Shoulder"]/parts/li[def = "RH_N4Mutant_Arm"]/parts/li[def = "RH_N4Mutant_Hand"]/parts/li[def = "RH_N4Mutant_Finger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_Wraith"]/corePart/parts/li[def = "RH_N4Mutant_Leg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_Wraith"]/corePart/parts/li[def = "RH_N4Mutant_Leg"]/parts/li[def = "RH_N4Mutant_Foot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RH_N4Mutant_Wraith"]/corePart/parts/li[def = "RH_N4Mutant_Leg"]/parts/li[def = "RH_N4Mutant_Foot"]/parts/li[def = "RH_N4Mutant_Toe"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Faction - VOID/Monsters/Races.xml b/Patches/RH2 Faction - VOID/Monsters/Races.xml
deleted file mode 100644
index a3015c0e15..0000000000
--- a/Patches/RH2 Faction - VOID/Monsters/Races.xml	
+++ /dev/null
@@ -1,528 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Faction: V.O.I.D.</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Base Mutant pawn ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="Base_RHN4Mutant"]/statBases</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<!-- ========== Mother ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RH_DF_Mother"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RH_DF_Mother"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.08</MeleeDodgeChance>
-						<MeleeCritChance>0.8</MeleeCritChance>
-						<MeleeParryChance>1.33</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_Mother"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>23</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>30</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>5</cooldownTime>
-								<linkedBodyPartsGroup>RH_LeftClaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>25</armorPenetrationBlunt>
-								<armorPenetrationSharp>5</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>27</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>30</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>4.5</cooldownTime>
-								<linkedBodyPartsGroup>RH_RightClaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>14</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_Mother"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_Mother"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>15</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RH_DF_Mother"]/combatPower</xpath>
-					<value>
-						<combatPower>600</combatPower>
-					</value>
-				</li>
-
-				<!-- ========== Titan ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RH_DF_Titan"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RH_DF_Titan"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>2.0</MeleeCritChance>
-						<MeleeParryChance>1.4</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_Titan"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>52</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>45</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>4.2</cooldownTime>
-								<linkedBodyPartsGroup>RH_N4LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>57</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>45</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>4</cooldownTime>
-								<linkedBodyPartsGroup>RH_N4RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>27</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>60</power>
-								<cooldownTime>15</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_Titan"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>9</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_Titan"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>15</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RH_Titan"]/combatPower</xpath>
-					<value>
-						<combatPower>600</combatPower>
-					</value>
-				</li>
-
-				<!-- ========== Wraith ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RH_DF_Wraith"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RH_DF_Wraith"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.33</MeleeDodgeChance>
-						<MeleeCritChance>2.0</MeleeCritChance>
-						<MeleeParryChance>1.11</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_Wraith"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tentacle</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>48</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>85</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>3.7</cooldownTime>
-								<linkedBodyPartsGroup>RH_LeftTentacle</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>50</armorPenetrationBlunt>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>tentacle</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>52</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>85</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>3.9</cooldownTime>
-								<linkedBodyPartsGroup>RH_RightTentacle</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>50</armorPenetrationBlunt>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>45</power>
-								<cooldownTime>13</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_Wraith"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>7</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_Wraith"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>13</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RH_Wraith"]/combatPower</xpath>
-					<value>
-						<combatPower>540</combatPower>
-					</value>
-				</li>
-
-				<!-- ========== Giant Spider ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RH_DF_GiantSpider"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RH_DF_GiantSpider"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.36</MeleeDodgeChance>
-						<MeleeCritChance>2.0</MeleeCritChance>
-						<MeleeParryChance>1.4</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_GiantSpider"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>23</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>3.7</cooldownTime>
-								<linkedBodyPartsGroup>RH_LeftClaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>25</armorPenetrationBlunt>
-								<armorPenetrationSharp>5</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>27</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>3.3</cooldownTime>
-								<linkedBodyPartsGroup>RH_RightClaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>40</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>50</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>9.7</cooldownTime>
-								<linkedBodyPartsGroup>RH_GSTeeth</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.95</chanceFactor>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_GiantSpider"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>7</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_GiantSpider"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>13</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RH_DFGiantSpider"]/combatPower</xpath>
-					<value>
-						<combatPower>600</combatPower>
-					</value>
-				</li>
-
-				<!-- ========== Stalker ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RH_DF2_Stalker"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RH_DF2_Stalker"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.08</MeleeDodgeChance>
-						<MeleeCritChance>0.48</MeleeCritChance>
-						<MeleeParryChance>0.37</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF2_Stalker"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>16</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>30</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>4.9</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>30</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>3.1</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>17.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>3.5</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>6.0</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF2_Stalker"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>7.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF2_Stalker"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>15</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RH_DF2_Stalker"]/combatPower</xpath>
-					<value>
-						<combatPower>600</combatPower>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Faction - VOID/Monsters/Races_Evolved.xml b/Patches/RH2 Faction - VOID/Monsters/Races_Evolved.xml
deleted file mode 100644
index 5ee71f3219..0000000000
--- a/Patches/RH2 Faction - VOID/Monsters/Races_Evolved.xml	
+++ /dev/null
@@ -1,1210 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Faction: V.O.I.D.</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== EV Rumbler ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RH_DF_EvolvedRumbler"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RH_DF_EvolvedRumbler"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>1.82</MeleeCritChance>
-						<MeleeParryChance>0.37</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_EvolvedRumbler"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>12</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>3.8</cooldownTime>
-								<linkedBodyPartsGroup>RH_LeftClaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>12.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>13</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>3.5</cooldownTime>
-								<linkedBodyPartsGroup>RH_RightClaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>12.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>5.2</cooldownTime>
-								<linkedBodyPartsGroup>RH_N4Teeth</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_EvolvedRumbler"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_EvolvedRumbler"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RH_DF_EvolvedRumbler"]/combatPower</xpath>
-					<value>
-						<combatPower>225</combatPower>
-					</value>
-				</li>
-
-				<!-- ========== Evolved long arm ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RH_DF_EvolvedLongArms"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RH_DF_EvolvedLongArms"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>2.0</MeleeCritChance>
-						<MeleeParryChance>0.37</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_EvolvedLongArms"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left arm blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>14</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>8</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>3.8</cooldownTime>
-								<linkedBodyPartsGroup>RH_LeftArmBlade</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right arm blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>15</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>45</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>3</cooldownTime>
-								<linkedBodyPartsGroup>RH_RightBlade</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>5.2</cooldownTime>
-								<linkedBodyPartsGroup>RH_N4Teeth</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_EvolvedLongArms"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>7</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_EvolvedLongArms"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>14</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RH_DF_EvolvedLongArms"]/combatPower</xpath>
-					<value>
-						<combatPower>225</combatPower>
-					</value>
-				</li>
-
-				<!-- ========== Volatile long arm ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RH_DF_IrridiatedLongArms"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RH_DF_IrridiatedLongArms"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						<MeleeCritChance>2.0</MeleeCritChance>
-						<MeleeParryChance>0.37</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_IrridiatedLongArms"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left arm blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>67</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>50</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>4.0</cooldownTime>
-								<linkedBodyPartsGroup>RH_LeftArmBlade</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>12.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right arm blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>71</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>60</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>4.4</cooldownTime>
-								<linkedBodyPartsGroup>RH_RightBlade</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>87</power>
-								<cooldownTime>8.2</cooldownTime>
-								<linkedBodyPartsGroup>RH_N4Teeth</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>25.0</armorPenetrationBlunt>
-								<armorPenetrationSharp>5.0</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_IrridiatedLongArms"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>7.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_IrridiatedLongArms"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>15</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RH_DF_IrridiatedLongArms"]/combatPower</xpath>
-					<value>
-						<combatPower>900</combatPower>
-					</value>
-				</li>
-
-				<!-- ========== Volatile Leaper ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RH_DF_VolatileLeaper"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RH_DF_VolatileLeaper"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.59</MeleeDodgeChance>
-						<MeleeCritChance>2.0</MeleeCritChance>
-						<MeleeParryChance>2.0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_VolatileLeaper"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>38</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>30</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>3.7</cooldownTime>
-								<linkedBodyPartsGroup>RH_N4LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>40</armorPenetrationBlunt>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>42</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>30</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>3.5</cooldownTime>
-								<linkedBodyPartsGroup>RH_N4RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>40</armorPenetrationBlunt>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>tongue</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>700</power>
-								<cooldownTime>4.2</cooldownTime>
-								<linkedBodyPartsGroup>RH_LeaperTongue</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>100</armorPenetrationBlunt>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_VolatileLeaper"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_VolatileLeaper"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>20</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RH_DF_VolatileLeaper"]/combatPower</xpath>
-					<value>
-						<combatPower>2100</combatPower>
-					</value>
-				</li>
-
-				<!-- ========== BLACK TITAN ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RH_DF_BlackTitan"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RH_DF_BlackTitan"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.56</MeleeDodgeChance>
-						<MeleeCritChance>2.0</MeleeCritChance>
-						<MeleeParryChance>1.87</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_BlackTitan"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>80</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>70</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>4.8</cooldownTime>
-								<linkedBodyPartsGroup>RH_N4LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>45</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>85</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>70</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>3.4</cooldownTime>
-								<linkedBodyPartsGroup>RH_N4RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>50</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>100</power>
-								<cooldownTime>4.2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_BlackTitan"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>13</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_BlackTitan"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>21</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RH_BlackTitan"]/combatPower</xpath>
-					<value>
-						<combatPower>1200</combatPower>
-					</value>
-				</li>
-
-				<!-- ========== Black Wraith ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RH_DF_BlackWraith"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RH_DF_BlackWraith"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.66</MeleeDodgeChance>
-						<MeleeCritChance>2.0</MeleeCritChance>
-						<MeleeParryChance>1.11</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_BlackWraith"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tentacle</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>97</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>85</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>3.5</cooldownTime>
-								<linkedBodyPartsGroup>RH_LeftTentacle</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>100</armorPenetrationBlunt>
-								<armorPenetrationSharp>36</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>tentacle</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>110</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>85</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>3.8</cooldownTime>
-								<linkedBodyPartsGroup>RH_RightTentacle</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>110</armorPenetrationBlunt>
-								<armorPenetrationSharp>38</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>90</power>
-								<cooldownTime>3.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_BlackWraith"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>13</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_BlackWraith"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>20</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RH_BlackWraith"]/combatPower</xpath>
-					<value>
-						<combatPower>900</combatPower>
-					</value>
-				</li>
-
-				<!-- ========== BLACK LEAPER ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RH_DF_BlackLeaper"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RH_DF_BlackLeaper"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						<MeleeCritChance>0.56</MeleeCritChance>
-						<MeleeParryChance>1.87</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_BlackLeaper"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>35</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>30</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>5.5</cooldownTime>
-								<linkedBodyPartsGroup>RH_N4LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>37</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>30</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>5.4</cooldownTime>
-								<linkedBodyPartsGroup>RH_N4RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>32.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>6.5</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>tongue</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>600</power>
-								<cooldownTime>6.7</cooldownTime>
-								<linkedBodyPartsGroup>RH_LeaperTongue</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>100</armorPenetrationBlunt>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_BlackLeaper"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_BlackLeaper"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>21</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RH_DF_BlackLeaper"]/combatPower</xpath>
-					<value>
-						<combatPower>1500</combatPower>
-					</value>
-				</li>
-
-				<!-- ========== Devil Hound ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RH_DF_DevilHound"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RH_DF_DevilHound"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.67</MeleeDodgeChance>
-						<MeleeCritChance>2.0</MeleeCritChance>
-						<MeleeParryChance>2.0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_DevilHound"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>72</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>85</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>3.6</cooldownTime>
-								<linkedBodyPartsGroup>RH_LeftClaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>75</armorPenetrationBlunt>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>77</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>85</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>3.1</cooldownTime>
-								<linkedBodyPartsGroup>RH_RightClaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>75</armorPenetrationBlunt>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>125</power>
-								<cooldownTime>4.7</cooldownTime>
-								<linkedBodyPartsGroup>RH_N4Teeth</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>40</armorPenetrationBlunt>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_DevilHound"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_DevilHound"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>23</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RH_DF_DevilHound"]/combatPower</xpath>
-					<value>
-						<combatPower>2700</combatPower>
-					</value>
-				</li>
-
-				<!-- ========== Tendril ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RH_DF_Tendril"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RH_DF_Tendril"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.21</MeleeCritChance>
-						<MeleeParryChance>1.16</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_Tendril"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tentacles</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>9</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>5</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>RH_LeftTentacle</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>tentacles</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>13</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>5</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>2.3</cooldownTime>
-								<linkedBodyPartsGroup>RH_RightTentacle</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>11.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>4.5</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>4.0</cooldownTime>
-								<linkedBodyPartsGroup>RH_N4Teeth</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_Tendril"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_Tendril"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>7</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RH_DF_Tendril"]/combatPower</xpath>
-					<value>
-						<combatPower>75</combatPower>
-					</value>
-				</li>
-
-				<!-- ========== Bone ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RH_DF_Bone"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RH_DF_Bone"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.09</MeleeDodgeChance>
-						<MeleeCritChance>0.07</MeleeCritChance>
-						<MeleeParryChance>0.16</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_Bone"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>5</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>2.5</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>5</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>2.7</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>11.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>4.5</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>10.0</cooldownTime>
-								<linkedBodyPartsGroup>RH_N4Teeth</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_Bone"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_Bone"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>8</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RH_DF_Bone"]/combatPower</xpath>
-					<value>
-						<combatPower>80</combatPower>
-					</value>
-				</li>
-
-				<!-- ========== Roid Hulk ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RH_DF2_RoidHulk"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RH_DF2_RoidHulk"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>0.29</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF2_RoidHulk"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>14</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>13</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>3.0</cooldownTime>
-								<linkedBodyPartsGroup>RH_LeftClaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>16</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>2.8</cooldownTime>
-								<linkedBodyPartsGroup>RH_RightClaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>12.0</cooldownTime>
-								<linkedBodyPartsGroup>RH_N4Teeth</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF2_RoidHulk"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF2_RoidHulk"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>8</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RH_DF2_RoidHulk"]/combatPower</xpath>
-					<value>
-						<combatPower>200</combatPower>
-					</value>
-				</li>
-
-				<!-- ========== Reaper ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RH_DF_Reaper"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RH_DF_Reaper"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.08</MeleeDodgeChance>
-						<MeleeCritChance>0.09</MeleeCritChance>
-						<MeleeParryChance>0.32</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_Reaper"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>11</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>13</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>2.2</cooldownTime>
-								<linkedBodyPartsGroup>RH_LeftClawAB</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>12.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>arm blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>21</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>2.6</cooldownTime>
-								<chanceFactor>0.9</chanceFactor>
-								<linkedBodyPartsGroup>RH_RightBlade</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>11.0</cooldownTime>
-								<linkedBodyPartsGroup>RH_N4Teeth</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_Reaper"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RH_DF_Reaper"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>7</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RH_DF_Reaper"]/combatPower</xpath>
-					<value>
-						<combatPower>100</combatPower>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Faction - VOID/PawnKindDefs_Humanlike/PawnKinds.xml b/Patches/RH2 Faction - VOID/PawnKindDefs_Humanlike/PawnKinds.xml
deleted file mode 100644
index b56247be4f..0000000000
--- a/Patches/RH2 Faction - VOID/PawnKindDefs_Humanlike/PawnKinds.xml	
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Faction: V.O.I.D.</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Ammo ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="RH_VOID_Base" or @Name="RH_VOID_BB_Base"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Backpacks ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[@Name="RH_VOID_Base" or @Name="RH_VOID_BB_Base"]</xpath>
-					<value>
-						<apparelRequired>
-							<li>CE_Apparel_Backpack</li>
-						</apparelRequired>
-					</value>
-				</li>
-
-				<!-- ========== CombatPower Patches ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RH_VOID_Undying"]/combatPower</xpath>
-					<value>
-						<combatPower>900</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RH_VOID_Collaborator"]/combatPower</xpath>
-					<value>
-						<combatPower>270</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[@Name="RH_VOIDAdvMemberBase"]/combatPower</xpath>
-					<value>
-						<combatPower>300</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RH_VOID_Associate"]/combatPower</xpath>
-					<value>
-						<combatPower>300</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RH_VOID_Destroyer"]/combatPower</xpath>
-					<value>
-						<combatPower>360</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RH_VOID_Grinder"]/combatPower</xpath>
-					<value>
-						<combatPower>360</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[@Name="RH_VOIDEliteBase"]/combatPower</xpath>
-					<value>
-						<combatPower>600</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[@Name="RH_VOIDEliteCloakedBase"]/combatPower</xpath>
-					<value>
-						<combatPower>600</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RH_VOID_Boss"]/combatPower</xpath>
-					<value>
-						<combatPower>750</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RH_VOID_Negotiator"]/combatPower</xpath>
-					<value>
-						<combatPower>240</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RH_VOID_Bodyguard"]/combatPower</xpath>
-					<value>
-						<combatPower>240</combatPower>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Faction - VOID/ThingDefs_Apparel/Apparel_Various.xml b/Patches/RH2 Faction - VOID/ThingDefs_Apparel/Apparel_Various.xml
deleted file mode 100644
index 11d5b75da7..0000000000
--- a/Patches/RH2 Faction - VOID/ThingDefs_Apparel/Apparel_Various.xml	
+++ /dev/null
@@ -1,543 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Faction: V.O.I.D.</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== RH Apparel Base ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RHApparelBase"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<!-- ========== Cloak and Hood ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_DFCloak_Hood"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-						<Bulk>1</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_DFCloak_Poncho"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_DFCloak_Poncho"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Business Suit ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_VOID_BusinessSuit"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_VOID_BusinessSuit"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>30</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_VOID_BusinessSuit"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_VOID_BusinessSuit"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>30</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_VOID_BusinessSuit"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<!-- ========== Speed Skin ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_VOID_SpeedSkin"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_VOID_SpeedSkin"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_VOID_SpeedSkin"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<!-- ========== VOID Reactive Armor ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RH_VOIDReactiveBase"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RH_VOIDReactiveBase"]/statBases/Mass</xpath>
-					<value>
-						<Mass>50</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RH_VOIDReactiveBase"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>550</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RH_VOIDReactiveBase"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>220</Plasteel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RH_VOIDReactiveBase"]/costList/Uranium</xpath>
-					<value>
-						<Uranium>50</Uranium>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RH_VOIDReactiveBase"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>50</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RH_VOIDReactiveBase"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>60</CarryBulk>
-						<CarryWeight>80</CarryWeight>
-						<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RH_VOIDReactiveBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>28</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RH_VOIDReactiveBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>60</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RH_VOIDReactiveBase"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="RH_VOIDReactiveBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_VOIDReactive_PowerArmor"]/statBases/EnergyShieldRechargeRate</xpath>
-					<value>
-						<EnergyShieldRechargeRate>1.68</EnergyShieldRechargeRate>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_VOIDReactive_PowerArmor"]/statBases/EnergyShieldRechargeRate</xpath>
-					<value>
-						<EnergyShieldRechargeRate>3.0</EnergyShieldRechargeRate>
-					</value>
-				</li>
-
-				<!-- ========== VOID Guard ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RH_VengeanceGuardBase"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RH_VengeanceGuardBase"]/statBases/Mass</xpath>
-					<value>
-						<Mass>60</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RH_VengeanceGuardBase"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>650</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RH_VengeanceGuardBase"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>260</Plasteel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RH_VengeanceGuardBase"]/costList/Uranium</xpath>
-					<value>
-						<Uranium>50</Uranium>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RH_VengeanceGuardBase"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>60</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RH_VengeanceGuardBase"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>70</CarryBulk>
-						<CarryWeight>90</CarryWeight>
-						<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RH_VengeanceGuardBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>36</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RH_VengeanceGuardBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>78</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RH_VengeanceGuardBase"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="RH_VengeanceGuardBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_VengeanceGuard_PowerArmor"]/statBases/EnergyShieldRechargeRate</xpath>
-					<value>
-						<EnergyShieldRechargeRate>1.2</EnergyShieldRechargeRate>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_VengeanceGuard_PowerArmor"]/statBases/EnergyShieldRechargeRate</xpath>
-					<value>
-						<EnergyShieldRechargeRate>4.5</EnergyShieldRechargeRate>
-					</value>
-				</li>
-
-				<!-- ========== VOID Reactive Armor - Helmet ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_VOIDBase"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_VOIDBase"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_VOIDBase"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_VOIDBase"]/equippedStatOffsets</xpath>
-					<value>
-						<AimingAccuracy>0.15</AimingAccuracy>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_VOIDBase"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_VOIDBase"]/statBases/Mass</xpath>
-					<value>
-						<Mass>5.0</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_VOIDBase"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>230</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_VOIDBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>22</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_VOIDBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>50</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_VOIDBase"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>100</Plasteel>
-						<DevilstrandCloth>25</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_VOIDBase"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_VOIDBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Dusk Helmet ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_DuskBase"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_DuskBase"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_DuskBase"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_DuskBase"]/equippedStatOffsets</xpath>
-					<value>
-						<AimingAccuracy>0.15</AimingAccuracy>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_DuskBase"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_DuskBase"]/statBases/Mass</xpath>
-					<value>
-						<Mass>5.0</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_DuskBase"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>230</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_DuskBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>27</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_DuskBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>65</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_DuskBase"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>110</Plasteel>
-						<DevilstrandCloth>25</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_DuskBase"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="RH_ReactiveHelmet_DuskBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Faction - VOID/ThingDefs_Weapons/MeleeWeapons.xml b/Patches/RH2 Faction - VOID/ThingDefs_Weapons/MeleeWeapons.xml
deleted file mode 100644
index f1deb7910b..0000000000
--- a/Patches/RH2 Faction - VOID/ThingDefs_Weapons/MeleeWeapons.xml	
+++ /dev/null
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Faction: V.O.I.D.</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Dusk Blade -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMelee_DFDuskBlade_Sword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.68</MeleeCritChance>
-							<MeleeParryChance>0.8</MeleeParryChance>
-							<MeleeDodgeChance>0.45</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMelee_DFDuskBlade_Sword"]/statBases</xpath>
-					<value>
-						<Bulk>9</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNMelee_DFDuskBlade_Sword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>pommel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>0.33</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>RHMelee_DFBladeStab</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>2.1</cooldownTime>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>serrated blade</label>
-								<capacities>
-									<li>RHMelee_DFBladeSlash</li>
-								</capacities>
-								<power>42</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Amputator -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMelee_DFAmputator_Blade"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.63</MeleeCritChance>
-							<MeleeParryChance>0.75</MeleeParryChance>
-							<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMelee_DFAmputator_Blade"]/statBases</xpath>
-					<value>
-						<Bulk>9</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNMelee_DFAmputator_Blade"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>pommel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>0.33</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>RHMelee_AmputatorStab</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>RHMelee_AmputatorSlash</li>
-								</capacities>
-								<power>52</power>
-								<cooldownTime>2.1</cooldownTime>
-								<armorPenetrationBlunt>9</armorPenetrationBlunt>
-								<armorPenetrationSharp>7</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Grinder (Chainsaw) -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMelee_DFGrinder_Chainsaw"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.3</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMelee_DFGrinder_Chainsaw"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>3</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNMelee_DFGrinder_Chainsaw"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>RHMelee_ChainsawStab</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>0.8</cooldownTime>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>RHMelee_ChainsawSlash</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.0</cooldownTime>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Dual Blade -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMelee_DFDual_Blade"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.0</MeleeCritChance>
-							<MeleeParryChance>0.5</MeleeParryChance>
-							<MeleeDodgeChance>0.45</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMelee_DFDual_Blade"]/statBases</xpath>
-					<value>
-						<Bulk>9</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNMelee_DFDual_Blade"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>pommel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>0.33</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>RHMelee_DFBladeStab</li>
-								</capacities>
-								<power>32</power>
-								<cooldownTime>2.1</cooldownTime>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<armorPenetrationSharp>25</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>RHMelee_DFBladeSlash</li>
-								</capacities>
-								<power>65</power>
-								<cooldownTime>2.7</cooldownTime>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Faction - VOID/ThingDefs_Weapons/RangedWeapons.xml b/Patches/RH2 Faction - VOID/ThingDefs_Weapons/RangedWeapons.xml
deleted file mode 100644
index 3ce295f787..0000000000
--- a/Patches/RH2 Faction - VOID/ThingDefs_Weapons/RangedWeapons.xml	
+++ /dev/null
@@ -1,528 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Faction: V.O.I.D.</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Remove MoveSpeed Penalties ========== -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RNGun_WraithCannon_HMG" or defName="RNGun_GAU19_HMG" or defName="RNGun_DuskMAG_HMG"]/equippedStatOffsets</xpath>
-				</li>
-
-				<!-- ========== Shared Melee Tools ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNGun_GAU19_HMG"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrels</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>2.44</cooldownTime>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrels</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNGun_Longshot_PP10AMR"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.55</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Cut</li>
-									<li>Stab</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2.0</cooldownTime>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.55</cooldownTime>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNGun_WraithCannon_HMG"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel spikes</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>2.0</cooldownTime>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Barrels</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>heavy barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>2.44</cooldownTime>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrels</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNGun_DuskMAG_HMG" or
-						defName="RNGun_CorpseBlaster_Shotgun" or
-						defName="RNGun_DuskStriker_Shotgun" or
-						defName="RNGun_CorpseDestroyer_GPMG" or
-						defName="RNGun_DuskCarbine_DMR" or
-						defName="RNGun_DFGAUSSRifle_AMR"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.55</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2.02</cooldownTime>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.55</cooldownTime>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNGun_DuskEnforcer_Revolver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Longshot PP-10 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Longshot_PP10AMR</defName>
-					<statBases>
-						<Mass>20.00</Mass>
-						<RangedWeapon_Cooldown>0.58</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>2.0</SwayFactor>
-						<Bulk>20</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_145x114mm_FMJ</defaultProjectile>
-						<warmupTime>2.8</warmupTime>
-						<range>86</range>
-						<soundCast>RNShot_DFGAUSSRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_145x114mm</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== Wraith Cannon ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_WraithCannon_HMG</defName>
-					<statBases>
-						<Mass>66.00</Mass>
-						<RangedWeapon_Cooldown>0.58</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.52</SwayFactor>
-						<Bulk>25</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.0</recoilAmount>
-						<recoilPattern>Mounted</recoilPattern>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_145x114mm_AP</defaultProjectile>
-						<warmupTime>2.8</warmupTime>
-						<range>75</range>
-						<burstShotCount>50</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>RNShot_GAU19HMG</soundCast>
-						<soundAiming>RHGun_DOOMChaingunAiming</soundAiming>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aimedBurstShotCount>25</aimedBurstShotCount>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== GAU-19 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_GAU19_HMG</defName>
-					<statBases>
-						<Mass>55.00</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>18</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.70</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>2.3</warmupTime>
-						<range>68</range>
-						<burstShotCount>50</burstShotCount>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<soundCast>RNShot_GAU19HMG</soundCast>
-						<soundAiming>RHGun_DOOMChaingunAiming</soundAiming>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>200</magazineSize>
-						<reloadTime>9.2</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>25</aimedBurstShotCount>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== Dusk MAG Machine Gun ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_DuskMAG_HMG</defName>
-					<statBases>
-						<Mass>9.12</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.53</SwayFactor>
-						<Bulk>15</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.32</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>62</range>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>RNShot_DuskMag</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>80</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== Corpse Blaster Shotgun ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_CorpseBlaster_Shotgun</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.20</SwayFactor>
-						<Bulk>9.0</Bulk>
-						<SightsEfficiency>1.1</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_10Gauge_Buck</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>20</range>
-						<soundCast>RNShot_CorpseBlaster</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_10Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== Dusk Striker Shotgun ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_DuskStriker_Shotgun</defName>
-					<statBases>
-						<Mass>5.20</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.49</SwayFactor>
-						<Bulk>10.66</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.8</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_10Gauge_Buck</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>20</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-						<soundCast>RNShot_DuskStriker</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_10Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- ========== Dusk Enforcer ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_DuskEnforcer_Revolver</defName>
-					<statBases>
-						<Mass>3.00</Mass>
-						<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.58</SwayFactor>
-						<Bulk>2.73</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_500SWMagnum_AP</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>18</range>
-						<soundCast>RNShot_DuskEnforcer</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== Corpse Destroyer ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_CorpseDestroyer_GPMG</defName>
-					<statBases>
-						<Mass>10.50</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.51</SwayFactor>
-						<Bulk>14.05</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.30</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>RNShot_CorpseDestroyer</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- ========== Dusk Carbine ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_DuskCarbine_DMR</defName>
-					<statBases>
-						<Mass>5</Mass>
-						<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1.68</SwayFactor>
-						<Bulk>8</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.30</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>60</range>
-						<soundCast>RNShot_DuskCarbine</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== Gauss Rifle ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_DFGAUSSRifle_AMR</defName>
-					<statBases>
-						<Mass>5</Mass>
-						<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1.68</SwayFactor>
-						<Bulk>8</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6mmRailgun_Sabot</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>60</range>
-						<soundCast>RNShot_DFGAUSSRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_6mmRailgun</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Ammo_NonLethal.xml b/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Ammo_NonLethal.xml
deleted file mode 100644
index 67045460de..0000000000
--- a/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Ammo_NonLethal.xml	
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Metal Gear Solid</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Non-lethal tranquilizer 9x19mm Parabellum pistol cartridge and ammoset for non-lethal pistols -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_9x19mmPara_NonLethal</defName>
-							<label>9x19mm Para (Tranq)</label>
-							<ammoTypes>
-								<Ammo_9x19mmPara_NL>Bullet_9x19mmPara_NL</Ammo_9x19mmPara_NL>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="9x19mmParaBase">
-							<defName>Ammo_9x19mmPara_NL</defName>
-							<label>9x19mm Para cartridge (Tranq)</label>
-							<graphicData>
-								<texPath>ThirdParty/CP Metal Gear Solid/Pistol/NL</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.31</MarketValue>
-							</statBases>
-							<ammoClass>TranqNonLethal</ammoClass>
-							<cookOffProjectile>Bullet_9x19mmPara_NL</cookOffProjectile>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<!-- Workaround for conditionally-patched projectiles: use an existing abstract class from the generic ammo library (In this case, Base9x19mmParaBullet) -->
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base9x19mmParaBullet">
-							<defName>Bullet_9x19mmPara_NL</defName>
-							<label>9mm Para bullet (Tranq)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Tranquilizer</damageDef>
-								<damageAmountBase>1</damageAmountBase>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>10.820</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_9x19mmPara_NL</defName>
-							<label>make 9x19mm Parabellum (Tranq) cartridge x500</label>
-							<description>Craft 500 9x19mm Parabellum (Tranq) cartridges.</description>
-							<jobString>Making 9x19mm Parabellum (Tranq) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>14</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>MedicineHerbal</li>
-										</thingDefs>
-									</filter>
-									<count>12</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>MedicineHerbal</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_9x19mmPara_NL>500</Ammo_9x19mmPara_NL>
-							</products>
-							<workAmount>5000</workAmount>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-				<!-- Non-lethal tranquilizer 7.62x51mm NATO rifle cartridge and ammoset for non-lethal rifles -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_762x51mmNATO_NonLethal</defName>
-							<label>7.62x51mm NATO (Tranq)</label>
-							<ammoTypes>
-								<Ammo_762x51mmNATO_NL>Bullet_762x51mmNATO_NL</Ammo_762x51mmNATO_NL>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x51mmNATOBase">
-							<defName>Ammo_762x51mmNATO_NL</defName>
-							<label>7.62x51mm NATO cartridge (Tranq)</label>
-							<graphicData>
-								<texPath>ThirdParty/CP Metal Gear Solid/Rifle/NL</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.5</MarketValue>
-							</statBases>
-							<ammoClass>TranqNonLethal</ammoClass>
-							<cookOffProjectile>Bullet_762x51mmNATO_NL</cookOffProjectile>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<!-- Workaround for conditionally-patched projectiles: use an existing abstract class from the generic ammo library (In this case, Base762x51mmNATOBullet) -->
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base762x51mmNATOBullet">
-							<defName>Bullet_762x51mmNATO_NL</defName>
-							<label>7.62mm NATO bullet (Tranq)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Tranquilizer</damageDef>
-								<damageAmountBase>1</damageAmountBase>
-								<armorPenetrationSharp>21</armorPenetrationSharp>
-								<armorPenetrationBlunt>86.28</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_762x51mmNATO_NL</defName>
-							<label>make 7.62x51mm NATO (Tranq) cartridge x500</label>
-							<description>Craft 500 7.62x51mm NATO (Tranq) cartridges.</description>
-							<jobString>Making 7.62x51mm NATO (Tranq) cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>22</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>MedicineHerbal</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>MedicineHerbal</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_762x51mmNATO_NL>500</Ammo_762x51mmNATO_NL>
-							</products>
-							<workAmount>8200</workAmount>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Apparel_Armor.xml b/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Apparel_Armor.xml
deleted file mode 100644
index ec8926553f..0000000000
--- a/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Apparel_Armor.xml	
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Metal Gear Solid</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Exo Suit THI ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_ExoSuit_GrayFox"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_ExoSuit_GrayFox"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_ExoSuit_GrayFox"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>30</CarryWeight>
-						<!-- Essentially cancel out the added bulk of the exosuit -->
-						<CarryBulk>10</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_ExoSuit_GrayFox"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_ExoSuit_GrayFox"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>40</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_ExoSuit_GrayFox"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.8</ArmorRating_Heat>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Apparel_Armor_Headgear.xml b/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Apparel_Armor_Headgear.xml
deleted file mode 100644
index d986438f08..0000000000
--- a/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Apparel_Armor_Headgear.xml	
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Metal Gear Solid</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== PASGT helmet FOXHOUND ========== 
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_PASGTFOXHOUNDHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-						<ArmorRating_Blunt>13</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.54</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_PASGTFOXHOUNDHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>0.20</StuffEffectMultiplierArmor>
-					</value>
-				</li>-->
-
-				<!-- ========== Exo Suit Helmet THI ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHApparel_ExoHelmet_GrayFox"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_ExoHelmet_GrayFox"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_ExoHelmet_GrayFox"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>32</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHApparel_ExoHelmet_GrayFox"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>1</ArmorRating_Heat>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Apparel_Headgear.xml b/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Apparel_Headgear.xml
deleted file mode 100644
index 3f78d6bc35..0000000000
--- a/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Apparel_Headgear.xml	
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Metal Gear Solid</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== bandana FOX & bandana FOXHOUND ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_MGS_Bandana"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<!-- Equivalent to vanilla pants, T-shirt and button-down shirt -->
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== beret (FOXHOUND) ========== 
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_Beret_FOXHOUND"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_Beret_FOXHOUND"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						 Equivalent to vanilla fabric hats 
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>-->
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Apparel_OnSkin.xml b/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Apparel_OnSkin.xml
deleted file mode 100644
index 0dff3e1c16..0000000000
--- a/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Apparel_OnSkin.xml	
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Metal Gear Solid</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== sneaking suit FOX & sneaking suit FOXHOUND ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_SneakingSuit_A" or
-						defName="RNApparel_SneakingSuit_B"
-						]/apparel/bodyPartGroups </xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_SneakingSuit_A" or
-						defName="RNApparel_SneakingSuit_B"
-						]/equippedStatOffsets </xpath>
-					<value>
-						<CarryBulk>15</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_SneakingSuit_A" or
-						defName="RNApparel_SneakingSuit_B"
-						]/statBases </xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_SneakingSuit_A" or
-						defName="RNApparel_SneakingSuit_B"
-						]/statBases </xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_SneakingSuit_A" or
-						defName="RNApparel_SneakingSuit_B"
-						]/statBases </xpath>
-					<value>
-						<ArmorRating_Blunt>13</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_MeleeWeapon.xml b/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_MeleeWeapon.xml
deleted file mode 100644
index a1f3993ede..0000000000
--- a/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_MeleeWeapon.xml	
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Metal Gear Solid</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Longsword / Katana ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHMelee_HF_Katana"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<chanceFactor>0.33</chanceFactor>
-								<cooldownTime>1.52</cooldownTime>
-								<armorPenetrationBlunt>0.500</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>RHMelee_HFBladeStab</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1</cooldownTime>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<armorPenetrationSharp>85</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>RHMelee_HFBladeSlash</li>
-								</capacities>
-								<power>42</power>
-								<cooldownTime>0.5</cooldownTime>
-								<armorPenetrationBlunt>40</armorPenetrationBlunt>
-								<armorPenetrationSharp>75</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHMelee_HF_Katana"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<MeleeCounterParryBonus>0.78</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHMelee_HF_Katana"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>4</MeleeCritChance>
-						<MeleeParryChance>1.2</MeleeParryChance>
-						<MeleeDodgeChance>0.4</MeleeDodgeChance>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_PawnKindDefs.xml b/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_PawnKindDefs.xml
deleted file mode 100644
index 6b0356d134..0000000000
--- a/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_PawnKindDefs.xml	
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Metal Gear Solid</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Reduce meals and medicine carried by all pawns ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[@Name="RH_MGS_SoldierBase"]/invNutrition</xpath>
-					<value>
-						<invNutrition>1</invNutrition>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[
-						defName="RH_FOX_Infiltrator" or
-						defName="RH_MGS_GenomeSoldierBase" or
-						defName="RH_MGS_Infiltrator_Elite" or
-						defname="RH_MGS_CyborgNinja"
-						]/inventoryOptions/subOptionsChooseOne/li/countRange </xpath>
-					<value>
-						<countRange>
-							<min>0</min>
-							<max>1</max>
-						</countRange>
-					</value>
-				</li>
-
-				<!-- ========== FOX / FOXHOUND QRF Operator pawns should spawn with ammo appropriate to their primary weapon, as well as a sidearm (and its own ammo) ========== -->
-
-				<!-- First remove redundant MK23 from pawn's existing primary weaponTags -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/PawnKindDef[defName="RH_MGS_Infiltrator_Elite"]/weaponTags/li[.="RH2_FOXHOUND"]</xpath>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RH_MGS_Infiltrator_Elite"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>1</generateChance>
-									<magazineCount>
-										<min>2</min>
-										<max>3</max>
-									</magazineCount>
-									<weaponTags>
-										<li>RN_MK23_Loud</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_RangedIndustrial_Pistols.xml b/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_RangedIndustrial_Pistols.xml
deleted file mode 100644
index e5db466135..0000000000
--- a/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_RangedIndustrial_Pistols.xml	
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Metal Gear Solid</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== M9A1-S Tranq ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M9A1STranq_Pistol</defName>
-					<statBases>
-						<Mass>1.13</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.64</SwayFactor>
-						<Bulk>3.80</Bulk>
-						<WorkToMake>7500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_NL</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShotWUSPistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>2</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara_NonLethal</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== SOCOM Mk 23 MOD 0 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_MK23SOCOM_Pistol</defName>
-					<statBases>
-						<Mass>1.35</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.176</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>2.45</Bulk>
-						<WorkToMake>7500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShot_1911Hellfighter</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNGun_M9A1STranq_Pistol" or
-						defName="RNGun_MK23SOCOM_Pistol"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Scenario.xml b/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Scenario.xml
deleted file mode 100644
index 74c2e7bf9c..0000000000
--- a/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Scenario.xml	
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Metal Gear Solid</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="RH_Scenario_MGS_Infiltration"]/scenario/parts</xpath>
-					<value>
-
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_9x19mmPara_NL</thingDef>
-							<count>500</count>
-						</li>
-
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_45ACP_FMJ</thingDef>
-							<count>500</count>
-						</li>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git "a/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Armors_CE.xml" "b/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Armors_CE.xml"
deleted file mode 100644
index 7088519e17..0000000000
--- "a/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Armors_CE.xml"	
+++ /dev/null
@@ -1,793 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Rimmu-Nation² - Clothing</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!--=============== Eye and Ear Pro ====================-->
-
-				<!--layer fix-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_EyePros_8X10BallisticGoggles" or
-						defName="RNApparel_EyePros_RB3025AviatorGlasses" or
-						defName="RNApparel_EyePros_SIBallisticMFrame" or
-						defName="RNApparel_EyePros_TerminatorGlasses"
-						]/apparel/layers </xpath>
-					<value>
-						<layers>
-							<li>StrappedHead</li>
-						</layers>
-					</value>
-				</li>
-
-				<!--Ballistic Goggles + Ear Pro-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_EyePros_8X10BallisticGoggles" or
-						defName="RNApparel_EarDefs_PeltorOptimeII"]/statBases </xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>0.1</WornBulk>
-						<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_EyePros_8X10BallisticGoggles"]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				<!--SI Ballistic M frame-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_EyePros_SIBallisticMFrame"]/statBases </xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>0.1</WornBulk>
-						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-						<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_EyePros_SIBallisticMFrame"]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[
-						defName = "RNApparel_EyePros_SIBallisticMFrame" or
-						defName="RNApparel_EyePros_8X10BallisticGoggles"] </xpath>
-					<value>
-						<li Class="CombatExtended.ApperalRenderingExtension">
-							<HideHair>false</HideHair>
-							<HideBeard>false</HideBeard>
-						</li>
-					</value>
-				</li>
-
-				<!--========================= Helmets ========================-->
-				<!--Material-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_M1Helmet_Vietnam" or
-						defName="RNApparel_ProTecPrime_PizzaTime" or
-						defName="RNApparel_EXFILBallisticHelmet_Tan" or
-						defName="RNApparel_3MF70HighCut_Tan" or
-						defName="RNApparel_FLUXBallisticHelmet_Raid" or
-						defName="RNApparel_UaRmsTORD_Tan" or
-						defName="RNApparel_VestGuardFAST_Black" or
-						defName="RNApparel_OpsCoreFAST_Tan" or
-						defName="RNApparel_OpsCoreFASTBUMP_Multicam" or
-						defName="RNApparel_OpsCoreFASTCarbon_Grey" or
-						defName="RNApparel_MICH2000_CAG" or
-						defName="RNApparel_MICH2000_AmericanSniper" or
-						defName="RNApparel_Mk6BallisticHelmet_DDPM" or
-						defName="RNApparel_Mk6BallisticHelmet_Olive" or
-						defName="RNApparel_Mk6ABallisticHelmet_Black" or
-						defName="RNApparel_Mk7BallisticHelmet_Tan" or
-						defName="RNApparel_VestGuardPASGT_Black" or
-						defName="RNApparel_VestGuardPASGT_PRESS" or
-						defName="RNApparel_PASGT_Tan" or
-						defName="RNApparel_PASGT_ENVO" or
-						defName="RNApparel_LWH_DMARPAT" or
-						defName="RNApparel_ACH_UCP" or
-						defName="RNApparel_LZSH2DTM_Olive" or
-						defName="RNApparel_STSh81_Helmet" or
-						defName="RNApparel_6B48_Helmet"]/stuffCategories </xpath>
-					<value>
-						<stuffCategories>
-							<li>Steeled</li>
-						</stuffCategories>
-					</value>
-				</li>
-
-				<!--Wendy Exfil Ballistic-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_EXFILBallisticHelmet_Tan"]/statBases </xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.54</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!--FLUX Helmet-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_FLUXBallisticHelmet_Raid"]/statBases </xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.54</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!--M1 Helmet-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_M1Helmet_Vietnam"]/statBases </xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>0.375</ArmorRating_Sharp>
-						<ArmorRating_Blunt>0.143</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.386</ArmorRating_Heat>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_M1Helmet_Vietnam"]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_M1Helmet_Vietnam"]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!--Epic Pizzatime Helmet-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_ProTecPrime_PizzaTime"]/statBases </xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>0.375</ArmorRating_Sharp>
-						<ArmorRating_Blunt>0.143</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.386</ArmorRating_Heat>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_ProTecPrime_PizzaTime"]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_ProTecPrime_PizzaTime"]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!--3M F70-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_3MF70HighCut_Tan"]/statBases </xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.54</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!--TOR-D-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_UaRmsTORD_Tan"]/statBases </xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.54</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!--SF151-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_VestGuardFAST_Black"]/statBases </xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.54</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!--Ops Core FAST Helmets-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_OpsCoreFAST_Tan" or
-						defName="RNApparel_OpsCoreFASTBUMP_Multicam" or
-						defName="RNApparel_OpsCoreFASTCarbon_Grey"]/statBases </xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.54</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!--MICH 2000-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_MICH2000_CAG" or
-						defName="RNApparel_MICH2000_AmericanSniper" or
-						defName="RNApparel_ACH_UCP"]/statBases </xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-						<ArmorRating_Blunt>20</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.54</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!--Mk Series-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Mk6BallisticHelmet_DDPM" or
-						defName="RNApparel_Mk6BallisticHelmet_Olive" or
-						defName="RNApparel_Mk6ABallisticHelmet_Black" or
-						defName="RNApparel_Mk7BallisticHelmet_Tan"]/statBases </xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-						<ArmorRating_Blunt>14</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.54</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!--PASGT Helmets-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_VestGuardPASGT_Black" or
-						defName="RNApparel_PASGT_Tan" or
-						defName="RNApparel_PASGT_ENVO" or
-						defName="RNApparel_LWH_DMARPAT"]/statBases </xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.54</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!--LZSH 2DTM-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_LZSH2DTM_Olive"]/statBases </xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>2</WornBulk>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-						<ArmorRating_Blunt>20</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.54</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!--STSh-81-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_STSh81_Helmet"]/statBases </xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.54</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!--6B48-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_6B48_Helmet"]/statBases </xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.54</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!--EOD-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_MedEngHelmet_EOD9A"]/statBases </xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>10</WornBulk>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-						<ArmorRating_Blunt>45</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.90</ArmorRating_Heat>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_MedEngHelmet_EOD9A"]/apparel/bodyPartGroups </xpath>
-					<value>
-						<bodyPartGroups>
-							<li>FullHead</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_MedEngHelmet_EOD9A"]/costList </xpath>
-					<value>
-						<costList>
-							<Plasteel>10</Plasteel>
-							<DevilstrandCloth>5</DevilstrandCloth>
-							<ComponentIndustrial>2</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<!--Juggernaut-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Helmet_Juggernaut"]/statBases </xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1.5</WornBulk>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-						<ArmorRating_Blunt>28</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.90</ArmorRating_Heat>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Helmet_Juggernaut"]/apparel/bodyPartGroups </xpath>
-					<value>
-						<bodyPartGroups>
-							<li>FullHead</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Helmet_Juggernaut"]/costList </xpath>
-					<value>
-						<costList>
-							<Plasteel>15</Plasteel>
-							<ComponentIndustrial>5</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<!--Riot Helmet-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_SecProHelmet_Riot"]/statBases </xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-						<ArmorRating_Blunt>24</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.54</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!--Galac-Tac Helmet (Fast Helmet?)-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_GalacTacFAST_Tan"]/statBases </xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-						<ArmorRating_Blunt>20</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.54</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!--========================== Body Armors =====================================-->
-				<!--EOD-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_MedEng_EOD9Suit"]/statBases </xpath>
-					<value>
-						<Bulk>60</Bulk>
-						<WornBulk>20</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_MedEng_EOD9Suit"]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_MedEng_EOD9Suit"]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>45</ArmorRating_Blunt>
-					</value>
-				</li>
-				<!--Stats-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_MedEng_EOD9Suit"]/equippedStatOffsets/MoveSpeed </xpath>
-					<value>
-						<MoveSpeed>-0.75</MoveSpeed>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_MedEng_EOD9Suit"]/equippedStatOffsets </xpath>
-					<value>
-						<WorkSpeedGlobal>-0.25</WorkSpeedGlobal>
-						<MeleeHitChance>-0.25</MeleeHitChance>
-						<AimingDelayFactor>0.15</AimingDelayFactor>
-					</value>
-				</li>
-				<!--Costs-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_MedEng_EOD9Suit"]/costList </xpath>
-					<value>
-						<costList>
-							<Plasteel>120</Plasteel>
-							<Uranium>20</Uranium>
-							<DevilstrandCloth>50</DevilstrandCloth>
-							<ComponentIndustrial>10</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<!--Juggernaut Suit-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_MedEng_JuggernautSuit"]/statBases </xpath>
-					<value>
-						<Bulk>50</Bulk>
-						<WornBulk>20</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_MedEng_JuggernautSuit"]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_MedEng_JuggernautSuit"]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>28</ArmorRating_Blunt>
-					</value>
-				</li>
-				<!--Stats-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_MedEng_JuggernautSuit"]/statBases/Mass </xpath>
-					<value>
-						<Mass>30</Mass>
-						<WorkSpeedGlobal>-0.25</WorkSpeedGlobal>
-						<MeleeHitChance>-0.25</MeleeHitChance>
-						<AimingDelayFactor>0.15</AimingDelayFactor>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_MedEng_JuggernautSuit"]/equippedStatOffsets/MoveSpeed </xpath>
-					<value>
-						<MoveSpeed>-1.0</MoveSpeed>
-					</value>
-				</li>
-				<!--Costs-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_MedEng_JuggernautSuit"]/costList </xpath>
-					<value>
-						<costList>
-							<Plasteel>120</Plasteel>
-							<Uranium>50</Uranium>
-							<DevilstrandCloth>30</DevilstrandCloth>
-							<ComponentIndustrial>12</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<!--Riot Suit-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_RiotSuit_SecPro"]/statBases/Mass </xpath>
-					<value>
-						<Mass>18</Mass>
-						<Bulk>40</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_RiotSuit_SecPro"]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_RiotSuit_SecPro"]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>26</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_RiotSuit_SecPro"]/apparel/layers </xpath>
-					<value>
-						<layers>
-							<li>Middle</li>
-							<li>Shell</li>
-						</layers>
-					</value>
-				</li>
-
-				<!--14mm armors (same sharp value 1.01)-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_FlyyeFCPC_Multicam" or
-						defName="RNApparel_511TacTec_Tan" or
-						defName="RNApparel_DDTGhost_ODGreen" or
-						defName="RNApparel_WarriorDCS_ODGreen" or
-						defName="RNApparel_ENVOVestSystem_Grey" or
-						defName="RNApparel_ViperLazerSOPC_Tan" or
-						defName="RNApparel_PointBlankASPC_Black" or
-						defName="RNApparel_PointBlankFASTC_CoyoteBrown" or
-						defName="RNApparel_LBTMPC_Tan" or
-						defName="RNApparel_LBTG3_Multicam" or
-						defName="RNApparel_AR500Veritas_Brown" or
-						defName="RNApparel_MBCFantom_Black" or
-						defName="RNApparel_PACALVC_Tan" or
-						defName="RNApparel_BristolBodyArmor_Olive"]/statBases/Mass </xpath>
-					<value>
-						<Mass>11</Mass>
-						<Bulk>6</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_FlyyeFCPC_Multicam" or
-						defName="RNApparel_511TacTec_Tan" or
-						defName="RNApparel_DDTGhost_ODGreen" or
-						defName="RNApparel_WarriorDCS_ODGreen" or
-						defName="RNApparel_ENVOVestSystem_Grey" or
-						defName="RNApparel_ViperLazerSOPC_Tan" or
-						defName="RNApparel_PointBlankASPC_Black" or
-						defName="RNApparel_PointBlankFASTC_CoyoteBrown" or
-						defName="RNApparel_LBTMPC_Tan" or
-						defName="RNApparel_LBTG3_Multicam" or
-						defName="RNApparel_AR500Veritas_Brown" or
-						defName="RNApparel_MBCFantom_Black" or
-						defName="RNApparel_PACALVC_Tan" or
-						defName="RNApparel_BristolBodyArmor_Olive"]/statBases/MaxHitPoints </xpath>
-					<value>
-						<MaxHitPoints>75</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_FlyyeFCPC_Multicam" or
-						defName="RNApparel_511TacTec_Tan" or
-						defName="RNApparel_DDTGhost_ODGreen" or
-						defName="RNApparel_WarriorDCS_ODGreen" or
-						defName="RNApparel_ENVOVestSystem_Grey" or
-						defName="RNApparel_ViperLazerSOPC_Tan" or
-						defName="RNApparel_PointBlankASPC_Black" or
-						defName="RNApparel_PointBlankFASTC_CoyoteBrown" or
-						defName="RNApparel_LBTMPC_Tan" or
-						defName="RNApparel_LBTG3_Multicam" or
-						defName="RNApparel_AR500Veritas_Brown" or
-						defName="RNApparel_MBCFantom_Black" or
-						defName="RNApparel_PACALVC_Tan" or
-						defName="RNApparel_BristolBodyArmor_Olive"]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_FlyyeFCPC_Multicam" or
-						defName="RNApparel_511TacTec_Tan" or
-						defName="RNApparel_DDTGhost_ODGreen" or
-						defName="RNApparel_WarriorDCS_ODGreen" or
-						defName="RNApparel_ENVOVestSystem_Grey" or
-						defName="RNApparel_ViperLazerSOPC_Tan" or
-						defName="RNApparel_PointBlankASPC_Black" or
-						defName="RNApparel_PointBlankFASTC_CoyoteBrown" or
-						defName="RNApparel_LBTMPC_Tan" or
-						defName="RNApparel_LBTG3_Multicam" or
-						defName="RNApparel_AR500Veritas_Brown" or
-						defName="RNApparel_MBCFantom_Black" or
-						defName="RNApparel_PACALVC_Tan" or
-						defName="RNApparel_BristolBodyArmor_Olive"]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>20</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_FlyyeFCPC_Multicam" or
-						defName="RNApparel_511TacTec_Tan" or
-						defName="RNApparel_DDTGhost_ODGreen" or
-						defName="RNApparel_WarriorDCS_ODGreen" or
-						defName="RNApparel_ENVOVestSystem_Grey" or
-						defName="RNApparel_ViperLazerSOPC_Tan" or
-						defName="RNApparel_PointBlankASPC_Black" or
-						defName="RNApparel_PointBlankFASTC_CoyoteBrown" or
-						defName="RNApparel_LBTMPC_Tan" or
-						defName="RNApparel_LBTG3_Multicam" or
-						defName="RNApparel_AR500Veritas_Brown" or
-						defName="RNApparel_MBCFantom_Black" or
-						defName="RNApparel_PACALVC_Tan" or
-						defName="RNApparel_BristolBodyArmor_Olive"]/equippedStatOffsets/MoveSpeed </xpath>
-				</li>
-
-				<!--16mm (sharp 1.05)-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_OTV_Tan" or
-						defName="RNApparel_IOTV_UCP" or
-						defName="RNApparel_MTV_Tan" or
-						defName="RNApparel_VestguardCT101_Navy" or
-						defName="RNApparel_VestguardQRA_Black" or
-						defName="RNApparel_VestguardQRX_Black" or
-						defName="RNApparel_PASGTVest_Olive" or
-						defName="RNApparel_Defender2_Tan" or
-						defName="RNApparel_GalacTecBodyArmour_Tan" or
-						defName="RNApparel_OspreyMk3_DDPM" or
-						defName="RNApparel_VestguardOT103_Navy"]/statBases/MaxHitPoints </xpath>
-					<value>
-						<MaxHitPoints>115</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_OTV_Tan" or
-						defName="RNApparel_IOTV_UCP" or
-						defName="RNApparel_MTV_Tan" or
-						defName="RNApparel_VestguardCT101_Navy" or
-						defName="RNApparel_VestguardQRA_Black" or
-						defName="RNApparel_VestguardQRX_Black" or
-						defName="RNApparel_PASGTVest_Olive" or
-						defName="RNApparel_Defender2_Tan" or
-						defName="RNApparel_GalacTecBodyArmour_Tan" or
-						defName="RNApparel_OspreyMk3_DDPM" or
-						defName="RNApparel_VestguardOT103_Navy"]/statBases/Mass </xpath>
-					<value>
-						<Mass>13</Mass>
-						<Bulk>6</Bulk>
-						<WornBulk>4</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_OTV_Tan" or
-						defName="RNApparel_IOTV_UCP" or
-						defName="RNApparel_MTV_Tan" or
-						defName="RNApparel_VestguardCT101_Navy" or
-						defName="RNApparel_VestguardQRA_Black" or
-						defName="RNApparel_VestguardQRX_Black" or
-						defName="RNApparel_PASGTVest_Olive" or
-						defName="RNApparel_Defender2_Tan" or
-						defName="RNApparel_GalacTecBodyArmour_Tan" or
-						defName="RNApparel_OspreyMk3_DDPM" or
-						defName="RNApparel_VestguardOT103_Navy"]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_OTV_Tan" or
-						defName="RNApparel_IOTV_UCP" or
-						defName="RNApparel_MTV_Tan" or
-						defName="RNApparel_VestguardCT101_Navy" or
-						defName="RNApparel_VestguardQRA_Black" or
-						defName="RNApparel_VestguardQRX_Black" or
-						defName="RNApparel_PASGTVest_Olive" or
-						defName="RNApparel_Defender2_Tan" or
-						defName="RNApparel_GalacTecBodyArmour_Tan" or
-						defName="RNApparel_OspreyMk3_DDPM" or
-						defName="RNApparel_VestguardOT103_Navy"]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>23</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_OTV_Tan" or
-						defName="RNApparel_IOTV_UCP" or
-						defName="RNApparel_MTV_Tan" or
-						defName="RNApparel_VestguardCT101_Navy" or
-						defName="RNApparel_VestguardQRA_Black" or
-						defName="RNApparel_VestguardQRX_Black" or
-						defName="RNApparel_PASGTVest_Olive" or
-						defName="RNApparel_Defender2_Tan" or
-						defName="RNApparel_GalacTecBodyArmour_Tan" or
-						defName="RNApparel_OspreyMk3_DDPM" or
-						defName="RNApparel_VestguardOT103_Navy"]/equippedStatOffsets/MoveSpeed </xpath>
-				</li>
-				<!--18mm (sharp 1.1)-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_PinnacleArmor_DragonSkin"]/statBases/MaxHitPoints </xpath>
-					<value>
-						<MaxHitPoints>160</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_PinnacleArmor_DragonSkin"]/statBases/Mass </xpath>
-					<value>
-						<Mass>20.7</Mass>
-						<Bulk>8</Bulk>
-						<WornBulk>4</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_PinnacleArmor_DragonSkin"]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_PinnacleArmor_DragonSkin"]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>24</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_PinnacleArmor_DragonSkin"]/equippedStatOffsets/MoveSpeed </xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git "a/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Backpacks_CE.xml" "b/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Backpacks_CE.xml"
deleted file mode 100644
index e97ffeb121..0000000000
--- "a/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Backpacks_CE.xml"	
+++ /dev/null
@@ -1,276 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Rimmu-Nation² - Clothing</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RH2_BackpackBase" or @Name="RH2_BackpackMakeableBase"]/apparel/layers</xpath>
-					<value>
-						<layers>
-							<li>Backpack</li>
-						</layers>
-					</value>
-				</li>
-
-				<!-- RemoveCarryCapacity -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName = "RNApparel_Backpack_MOLLE2UCP"
-						or defName = "RNApparel_Backpack_NorthFaceTerra65L"
-						or defName = "RNApparel_Backpack_BerghausVulcanIV"
-						or defName = "RNApparel_Backpack_AzimutSSKangaroo"
-						or defName = "RNApparel_Backpack_LBT0101JJ"
-						or defName = "RNApparel_Backpack_RUSH24BP"
-						or defName = "RNApparel_Backpack_FASTPack"
-						or defName = "RNApparel_Backpack_KeltyRaven2500Pack"
-						or defName = "RNApparel_Backpack_WarriorPegasus"
-						or defName = "RNApparel_Backpack_Motherlode"
-						or defName = "RNApparel_Backpack_Gootium"
-						or defName = "RNApparel_Backpack_OutdoorMaster"
-						or defName = "RNApparel_Backpack_TactixHalfday"
-						or defName = "RNApparel_Backpack_RUSH12BP"
-						or defName = "RNApparel_Backpack_AssaultPack"
-						or defName = "RNApparel_Backpack_NitecoreBP20Pack"
-						or defName = "RNApparel_Backpack_WarriorHelmetCarrier"
-						or defName = "RNApparel_Backpack_BearGryllsBearpac"
-						or defName = "RNApparel_Backpack_WENGERSyngery"
-						or defName = "RNApparel_Backpack_MountainWarehouseMerlin"
-						or defName = "RNApparel_Backpack_AMAPIII"
-						or defName = "RNApparel_Backpack_Tomahawk"
-						or defName = "RNApparel_Backpack_HelloKitty"
-						or defName = "RNApparel_Backpack_TarpBackpack"
-						or defName = "RNApparel_Backpack_AnCHero"
-						or defName = "RNApparel_Backpack_HelikonBailOutBag"
-						or defName = "RNApparel_Backpack_StudentBackpack"
-						or defName = "RNApparel_Backpack_Naotak"
-						or defName = "RNApparel_Backpack_Wasing"
-						or defName = "RNApparel_Backpack_FANDARESling"
-						or defName = "RNApparel_Backpack_Level1PUBG"
-						]/equippedStatOffsets/CarryingCapacity </xpath>
-				</li>
-
-				<!-- Sling / Ultralight Pack -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_Wasing"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-					</value>
-				</li>
-
-				<!-- Light Pack -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_StudentBackpack" or defName ="RNApparel_Backpack_Naotak" or defName ="RNApparel_Backpack_FANDARESling" or defName ="RNApparel_Backpack_Level1PUBG"]/statBases</xpath>
-					<value>
-						<Bulk>2.5</Bulk>
-					</value>
-				</li>
-
-				<!-- Medium Light Pack -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName = "RNApparel_Backpack_BearGryllsBearpac"
-						or defName = "RNApparel_Backpack_WENGERSyngery"
-						or defName = "RNApparel_Backpack_MountainWarehouseMerlin"
-						or defName = "RNApparel_Backpack_AMAPIII"
-						or defName = "RNApparel_Backpack_Tomahawk"
-						or defName = "RNApparel_Backpack_HelloKitty"
-						or defName = "RNApparel_Backpack_TarpBackpack"
-						or defName = "RNApparel_Backpack_AnCHero"
-						or defName = "RNApparel_RNApparel_Backpack_HelikonBailOutBag"
-						]/statBases </xpath>
-					<value>
-						<Bulk>3</Bulk>
-					</value>
-				</li>
-
-				<!-- Medium Pack -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName = "RNApparel_Backpack_Motherlode"
-						or defName = "RNApparel_Backpack_Gootium"
-						or defName = "RNApparel_Backpack_OutdoorMaster"
-						or defName = "RNApparel_Backpack_TactixHalfday"
-						or defName = "RNApparel_Backpack_RUSH12BP"
-						or defName = "RNApparel_Backpack_AssaultPack"
-						or defName = "RNApparel_Backpack_NitecoreBP20Pack"
-						or defName = "RNApparel_Backpack_WarriorHelmetCarrier"
-						]/statBases </xpath>
-					<value>
-						<Bulk>4</Bulk>
-					</value>
-				</li>
-
-				<!-- Medium Heavy Pack -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName = "RNApparel_Backpack_RUSH24BP"
-						or defName = "RNApparel_Backpack_FASTPack"
-						or defName = "RNApparel_Backpack_KeltyRaven2500Pack"
-						or defName = "RNApparel_Backpack_WarriorPegasus"
-						]/statBases </xpath>
-					<value>
-						<Bulk>10</Bulk>
-					</value>
-				</li>
-
-				<!-- Heavy Light Pack -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_LBT0101JJ"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-					</value>
-				</li>
-
-				<!-- Heavy Pack -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName = "RNApparel_Backpack_MOLLE2UCP"
-						or defName = "RNApparel_Backpack_NorthFaceTerra65L"
-						or defName = "RNApparel_Backpack_BerghausVulcanIV"
-						or defName = "RNApparel_Backpack_AzimutSSKangaroo"
-						]/statBases </xpath>
-					<value>
-						<Bulk>20</Bulk>
-					</value>
-				</li>
-
-				<!-- == CarryBulk == -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_Wasing"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>20</CarryBulk>
-					</value>
-				</li>
-
-				<!-- Light Pack -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_StudentBackpack"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>25</CarryBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_Naotak"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>27.5</CarryBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_FANDARESling"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>30</CarryBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_Level1PUBG"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>32.5</CarryBulk>
-					</value>
-				</li>
-
-				<!-- Medium Light Pack -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName = "RNApparel_Backpack_BearGryllsBearpac"
-						or defName = "RNApparel_Backpack_WENGERSyngery"
-						or defName = "RNApparel_Backpack_MountainWarehouseMerlin"
-						]/equippedStatOffsets </xpath>
-					<value>
-						<CarryBulk>34</CarryBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_AMAPIII" or defName = "RNApparel_Backpack_Tomahawk"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>33</CarryBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_HelloKitty" or defName = "RNApparel_Backpack_TarpBackpack"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>32</CarryBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_AnCHero" or defName = "RNApparel_Backpack_HelikonBailOutBag"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>30</CarryBulk>
-					</value>
-				</li>
-
-				<!-- Medium Pack -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName = "RNApparel_Backpack_Motherlode"
-						or defName = "RNApparel_Backpack_OutdoorMaster"
-						or defName = "RNApparel_Backpack_RUSH12BP"
-						or defName = "RNApparel_Backpack_AssaultPack"
-						or defName = "RNApparel_Backpack_NitecoreBP20Pack"
-						or defName = "RNApparel_Backpack_WarriorHelmetCarrier"
-						]/equippedStatOffsets </xpath>
-					<value>
-						<CarryBulk>35</CarryBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_Gootium" or defName = "RNApparel_Backpack_TactixHalfday"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>37.5</CarryBulk>
-					</value>
-				</li>
-
-				<!-- Medium Heavy Pack -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName = "RNApparel_Backpack_RUSH24BP"
-						or defName = "RNApparel_Backpack_FASTPack"
-						or defName = "RNApparel_Backpack_KeltyRaven2500Pack"
-						or defName = "RNApparel_Backpack_WarriorPegasus"
-						]/equippedStatOffsets </xpath>
-					<value>
-						<CarryingCapacity>5</CarryingCapacity>
-						<CarryBulk>40</CarryBulk>
-					</value>
-				</li>
-
-				<!-- Heavy Light Pack -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_LBT0101JJ"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryingCapacity>10</CarryingCapacity>
-						<CarryBulk>47.5</CarryBulk>
-					</value>
-				</li>
-
-				<!-- Heavy Pack -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_MOLLE2UCP"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryingCapacity>30</CarryingCapacity>
-						<CarryBulk>60</CarryBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_AzimutSSKangaroo" or defName = "RNApparel_Backpack_BerghausVulcanIV"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryingCapacity>25</CarryingCapacity>
-						<CarryBulk>60</CarryBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "RNApparel_Backpack_NorthFaceTerra65L"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryingCapacity>20</CarryingCapacity>
-						<CarryBulk>55</CarryBulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git "a/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Bandana_Balaclava_Scarf.xml" "b/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Bandana_Balaclava_Scarf.xml"
deleted file mode 100644
index c78eaa996f..0000000000
--- "a/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Bandana_Balaclava_Scarf.xml"	
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Rimmu-Nation² - Clothing</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Bandana === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_ColdWar_Bandana" or
-						defName="RNApparel_Shemagh_Bandana"]/costStuffCount </xpath>
-					<value>
-						<costStuffCount>20</costStuffCount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Shemagh_511BlazeWrap"]/costStuffCount </xpath>
-					<value>
-						<costStuffCount>20</costStuffCount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_PUBG_Bandana"]/costStuffCount </xpath>
-					<value>
-						<costStuffCount>20</costStuffCount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_ColdWar_Bandana" or
-						defName="RNApparel_Shemagh_Bandana"]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-						<Bulk>0.5</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Shemagh_511BlazeWrap"]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-						<Bulk>0.5</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_PUBG_Bandana"]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-						<Bulk>0.5</Bulk>
-					</value>
-				</li>
-
-				<!-- === Balaclava === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Balaclava_EXF"
-						or defName="RNApparel_Balaclava_511M"
-						or defName="RNApparel_Balaclava_AikuerSkull"
-						or defName="RNApparel_Balaclava_Highlander"
-						or defName="RNApparel_Balaclava_CheekiBreeki"
-						]/costStuffCount </xpath>
-					<value>
-						<costStuffCount>20</costStuffCount>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Balaclava_EXF"
-						or defName="RNApparel_Balaclava_511M"
-						or defName="RNApparel_Balaclava_AikuerSkull"
-						or defName="RNApparel_Balaclava_Highlander"
-						or defName="RNApparel_Balaclava_CheekiBreeki"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<Bulk>0.5</Bulk>
-						<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Balaclava_EXF"
-						or defName="RNApparel_Balaclava_511M"
-						or defName="RNApparel_Balaclava_AikuerSkull"
-						or defName="RNApparel_Balaclava_Highlander"
-						or defName="RNApparel_Balaclava_CheekiBreeki"]/apparel/layers </xpath>
-					<value>
-						<layers>
-							<li>OnHead</li>
-						</layers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Balaclava_EXF"
-						or defName="RNApparel_Balaclava_511M"
-						or defName="RNApparel_Balaclava_AikuerSkull"
-						or defName="RNApparel_Balaclava_Highlander"
-						or defName="RNApparel_Balaclava_CheekiBreeki"
-						]/apparel/bodyPartGroups </xpath>
-					<value>
-						<bodyPartGroups>
-							<li>UpperHead</li>
-							<li>Teeth</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-				<!--Hats-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Beanie_Beechfield"
-						or defName="RNApparel_BaseballCap_511Tactical"
-						or defName="RNApparel_BoonieHat_Bushmaster"
-						or defName="RNApparel_BoonieHat_MILTEC"
-						or defName="RNApparel_TrenchCoatHood_PUBG"
-						or defName="RNApparel_Beanie_Skullcap"
-						or defName="RNApparel_FedoraHat_Generic"
-						or defName="RNApparel_Beret_RUMilitary"]/apparel/layers </xpath>
-					<value>
-						<layers>
-							<li>Overhead</li>
-						</layers>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git "a/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Jacket_Rimmu.xml" "b/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Jacket_Rimmu.xml"
deleted file mode 100644
index 54c14fe611..0000000000
--- "a/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Jacket_Rimmu.xml"	
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Rimmu-Nation² - Clothing</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Overcoat_Generic"
-						or defName="RNApparel_SuitJacket_Generic"
-						or defName="RNApparel_TrenchCoat_Detective"
-						or defName="RNApparel_VestJacket_Generic"
-						or defName="RNApparel_BikerJacket_Generic"
-						or defName="RNApparel_SuedeJacket_Generic"
-						]/costStuffCount </xpath>
-					<value>
-						<costStuffCount>50</costStuffCount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Overcoat_Generic"
-						or defName="RNApparel_SuitJacket_Generic"
-						or defName="RNApparel_TrenchCoat_Detective"
-						or defName="RNApparel_VestJacket_Generic"
-						or defName="RNApparel_BikerJacket_Generic"
-						or defName="RNApparel_SuedeJacket_Generic"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RHApparel_PUTrenchCoat_PUBG"
-						or defName="RHApparel_TrenchCoat_Vigilante"
-						or defName="RHApparel_TrenchCoat_PUBG"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
-						<Bulk>7.5</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_FieldParka_Generic"
-						or defName="RNApparel_VintageParka_Generic"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5.5</StuffEffectMultiplierArmor>
-						<Bulk>6.5</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git "a/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Pantsu_Rimmu.xml" "b/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Pantsu_Rimmu.xml"
deleted file mode 100644
index 3ae2d644dd..0000000000
--- "a/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Pantsu_Rimmu.xml"	
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Rimmu-Nation² - Clothing</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Pants_511Stryke"
-						or defName="RNApparel_Pants_BlackhawkPursuit"
-						or defName="RNApparel_Pants_HelikonPilgrim"
-						or defName="RNApparel_Pants_511StrykeMulticam"
-						or defName="RNApparel_Pants_FjallravenKeb"
-						or defName="RNApparel_Pants_BearGryllsSurvivor"
-						or defName="RNApparel_Pants_GORKA3Pants"
-						or defName="RNApparel_Jeans_Generic"
-						or defName="RNApparel_Pants_ACUUCP"
-						or defName="RNApparel_Pants_BDUDMARPAT"
-						or defName="RNApparel_Pants_CombatsDDPM"
-						or defName="RNApparel_Pants_SuitBrioni"
-						]/statBases/Flammability </xpath>
-					<value>
-						<Flammability>0.6</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Pants_511Stryke"
-						or defName="RNApparel_Pants_BlackhawkPursuit"
-						or defName="RNApparel_Pants_HelikonPilgrim"
-						or defName="RNApparel_Pants_511StrykeMulticam"
-						or defName="RNApparel_Pants_FjallravenKeb"
-						or defName="RNApparel_Pants_BearGryllsSurvivor"
-						or defName="RNApparel_Pants_GORKA3Pants"
-						or defName="RNApparel_Jeans_Generic"
-						or defName="RNApparel_Pants_ACUUCP"
-						or defName="RNApparel_Pants_BDUDMARPAT"
-						or defName="RNApparel_Pants_CombatsDDPM"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-						<Bulk>1</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_Pants_SuitBrioni"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.75</StuffEffectMultiplierArmor>
-						<Bulk>1</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Pants_511Stryke"
-						or defName="RNApparel_Pants_BlackhawkPursuit"
-						or defName="RNApparel_Pants_HelikonPilgrim"
-						or defName="RNApparel_Pants_511StrykeMulticam"
-						or defName="RNApparel_Pants_FjallravenKeb"
-						or defName="RNApparel_Pants_BearGryllsSurvivor"
-						or defName="RNApparel_Pants_GORKA3Pants"
-						or defName="RNApparel_Jeans_Generic"
-						or defName="RNApparel_Pants_ACUUCP"
-						or defName="RNApparel_Pants_BDUDMARPAT"
-						or defName="RNApparel_Pants_CombatsDDPM"
-						]/costStuffCount </xpath>
-					<value>
-						<costStuffCount>45</costStuffCount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_Pants_SuitBrioni"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>35</costStuffCount>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git "a/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Respirators_Rimmu.xml" "b/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Respirators_Rimmu.xml"
deleted file mode 100644
index 783f285748..0000000000
--- "a/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Respirators_Rimmu.xml"	
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Rimmu-Nation² - Clothing</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName = "RNApparel_Gasmask_P1944WWI"
-						or defName = "RNApparel_Gasmask_S6NBC"
-						or defName = "RNApparel_Gasmask_S10NBC"
-						or defName = "RNApparel_Gasmask_GP5Soviet"
-						or defName = "RNApparel_Gasmask_M1Yugoslavian"
-						or defName = "RNApparel_Gasmask_MSAMillenium"
-						]/statBases </xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "RNApparel_Gasmask_P1944WWI"
-						or defName = "RNApparel_Gasmask_S6NBC"
-						or defName = "RNApparel_Gasmask_S10NBC"
-						or defName = "RNApparel_Gasmask_GP5Soviet"
-						or defName = "RNApparel_Gasmask_M1Yugoslavian"
-						or defName = "RNApparel_Gasmask_MSAMillenium"
-						]/equippedStatOffsets </xpath>
-					<value>
-						<equippedStatOffsets>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "RNApparel_Gasmask_P1944WWI"
-						or defName = "RNApparel_Gasmask_S6NBC"
-						or defName = "RNApparel_Gasmask_S10NBC"
-						or defName = "RNApparel_Gasmask_GP5Soviet"
-						or defName = "RNApparel_Gasmask_M1Yugoslavian"
-						or defName = "RNApparel_Gasmask_MSAMillenium"
-						]/apparel/layers </xpath>
-					<value>
-						<layers>
-							<li>StrappedHead</li>
-						</layers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[
-						defName = "RNApparel_Gasmask_P1944WWI"
-						or defName = "RNApparel_Gasmask_S6NBC"
-						or defName = "RNApparel_Gasmask_S10NBC"
-						or defName = "RNApparel_Gasmask_M1Yugoslavian"
-						or defName = "RNApparel_Gasmask_MSAMillenium"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.ApparelHediffExtension">
-							<hediff>WearingGasMask</hediff>
-						</li>
-						<li Class="CombatExtended.ApperalRenderingExtension">
-							<HideHair>false</HideHair>
-							<HideBeard>true</HideBeard>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName = "RNApparel_Gasmask_GP5Soviet"]</xpath>
-					<value>
-						<li Class="CombatExtended.ApparelHediffExtension">
-							<hediff>WearingGasMask</hediff>
-						</li>
-						<li Class="CombatExtended.ApperalRenderingExtension">
-							<HideHair>true</HideHair>
-							<HideBeard>true</HideBeard>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "RNApparel_Gasmask_P1944WWI"
-						or defName = "RNApparel_Gasmask_S6NBC"
-						or defName = "RNApparel_Gasmask_S10NBC"
-						or defName = "RNApparel_Gasmask_GP5Soviet"
-						or defName = "RNApparel_Gasmask_M1Yugoslavian"
-						or defName = "RNApparel_Gasmask_MSAMillenium"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>0.1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName = "RNApparel_Gasmask_P1944WWI"
-						or defName = "RNApparel_Gasmask_S6NBC"
-						or defName = "RNApparel_Gasmask_S10NBC"
-						or defName = "RNApparel_Gasmask_GP5Soviet"
-						or defName = "RNApparel_Gasmask_M1Yugoslavian"
-						or defName = "RNApparel_Gasmask_MSAMillenium"
-						]/recipeMaker </xpath>
-					<value>
-						<skillRequirements>
-							<Crafting>8</Crafting>
-						</skillRequirements>
-						<unfinishedThingDef>UnfinishedTechArmor</unfinishedThingDef>
-						<recipeUsers>
-							<li>TableMachining</li>
-						</recipeUsers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "RNApparel_Gasmask_P1944WWI"
-						or defName = "RNApparel_Gasmask_S6NBC"
-						or defName = "RNApparel_Gasmask_S10NBC"
-						or defName = "RNApparel_Gasmask_GP5Soviet"
-						or defName = "RNApparel_Gasmask_M1Yugoslavian"
-						or defName = "RNApparel_Gasmask_MSAMillenium"
-						]/costList </xpath>
-					<value>
-						<costList>
-							<ComponentIndustrial>2</ComponentIndustrial>
-							<Chemfuel>10</Chemfuel>
-						</costList>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git "a/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Shirt_Rimmu.xml" "b/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Shirt_Rimmu.xml"
deleted file mode 100644
index be52d4d1b7..0000000000
--- "a/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Shirt_Rimmu.xml"	
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Rimmu-Nation² - Clothing</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_UBACShirt_511RapidAssault"
-						or defName="RNApparel_Jacket_GORKA3Jacket"
-						or defName="RNApparel_Shirt_BlackhawkPursuit"
-						or defName="RNApparel_FlightSuit_Brandit"
-						or defName="RNApparel_UBACShirt_DDPM"
-						]/statBases/Flammability </xpath>
-					<value>
-						<Flammability>0.6</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_TankTop_Generic"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>16</costStuffCount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_ButtonShirt_Generic" or defName="RNApparel_HawaiianShirt_Generic"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>25</costStuffCount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_TankTop_Generic"
-						or defName="RNApparel_ButtonShirt_Generic"
-						or defName="RNApparel_HawaiianShirt_Generic"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-						<Bulk>1</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_TacticalJacket_TACVASEN"
-						or defName="RNApparel_NorweiganShirt_Pullover"
-						or defName="RNApparel_PoloShirt_511Tactical"
-						or defName="RNApparel_DesignerShirt_Boss"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.25</StuffEffectMultiplierArmor>
-						<Bulk>1</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_Hoodie_FruitOfTheLoom"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-						<Bulk>1</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_UBACShirt_511RapidAssault"
-						or defName="RNApparel_Jacket_GORKA3Jacket"
-						or defName="RNApparel_FlightSuit_Brandit"
-						or defName="RNApparel_ACU_UCP"
-						or defName="RNApparel_BDU_DMARPAT"
-						or defName="RNApparel_UBACShirt_DDPM"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
-						<Bulk>1</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_Shirt_BlackhawkPursuit"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.3</StuffEffectMultiplierArmor>
-						<Bulk>1</Bulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git "a/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Vests_CE.xml" "b/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Vests_CE.xml"
deleted file mode 100644
index ef9b02331c..0000000000
--- "a/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Vests_CE.xml"	
+++ /dev/null
@@ -1,233 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Rimmu-Nation² - Clothing</li>
-		</mods>
-		<!--Body Group Replacing-->
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "RHApparel_M56Webbing_Vietnam" or
-						defName = "RHApparel_ALICEWebbing_ColdWar" or
-						defName = "RHApparel_RRV_ChestRig" or
-						defName = "RHApparel_USMC_ChestRig" or
-						defName = "RHApparel_CondorRecon_ChestRig" or
-						defName = "RHApparel_CryeAVSTan_ChestRig" or
-						defName = "RHApparel_MilTec_ChestRig" or
-						defName = "RHApparel_WarriorFalcon_ChestRig" or
-						defName = "RHApparel_Type56Webbing_ColdWar" or
-						defName = "RHApparel_Type63Webbing_ColdWar" or
-						defName = "RHApparel_M23_ChestRig" or
-						defName = "RHApparel_KulaMongoose_ChestRig" or
-						defName = "RHApparel_Arktis_TacticalVest"
-						]/apparel/layers </xpath>
-					<value>
-						<layers>
-							<li>Webbing</li>
-						</layers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "RHApparel_M56Webbing_Vietnam" or
-						defName = "RHApparel_ALICEWebbing_ColdWar" or
-						defName = "RHApparel_RRV_ChestRig" or
-						defName = "RHApparel_USMC_ChestRig" or
-						defName = "RHApparel_CondorRecon_ChestRig" or
-						defName = "RHApparel_CryeAVSTan_ChestRig" or
-						defName = "RHApparel_MilTec_ChestRig" or
-						defName = "RHApparel_WarriorFalcon_ChestRig" or
-						defName = "RHApparel_Type56Webbing_ColdWar" or
-						defName = "RHApparel_Type63Webbing_ColdWar" or
-						defName = "RHApparel_M23_ChestRig" or
-						defName = "RHApparel_KulaMongoose_ChestRig" or
-						defName = "RHApparel_Arktis_TacticalVest"
-						]/apparel/bodyPartGroups </xpath>
-					<value>
-						<bodyPartGroups>
-							<li>Shoulders</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-				<!-- In case of body group change for belts I guess -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "RHApparel_SuperBelt_Tan" or
-						defName = "RHApparel_VTACBattleBelt_Tan" or
-						defName = "RHApparel_CondorBattleBelt_Tan" or
-						defName = "RHApparel_TexShoemakerPoliceBelt_Python" or
-						defName = "RHApparel_SafarilandPoliceBelt_Beretta" or
-						defName = "RHApparel_SafarilandPoliceBelt_Glock" or
-						defName = "RHApparel_MaxpeditionBattleBelt_Olive"
-						]/apparel/layers
-					</xpath>
-					<value>
-						<layers>
-							<li>Webbing</li>
-						</layers>
-					</value>
-				</li>
-
-				<!-- Bulk -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName = "RHApparel_M56Webbing_Vietnam" or
-						defName = "RHApparel_ALICEWebbing_ColdWar" or
-						defName = "RHApparel_RRV_ChestRig" or
-						defName = "RHApparel_USMC_ChestRig" or
-						defName = "RHApparel_CondorRecon_ChestRig" or
-						defName = "RHApparel_CryeAVSTan_ChestRig" or
-						defName = "RHApparel_MilTec_ChestRig" or
-						defName = "RHApparel_WarriorFalcon_ChestRig" or
-						defName = "RHApparel_CondorBattleBelt_Tan" or
-						defName = "RHApparel_VTACBattleBelt_Tan" or
-						defName = "RHApparel_Type56Webbing_ColdWar" or
-						defName = "RHApparel_Type63Webbing_ColdWar" or
-						defName = "RHApparel_M23_ChestRig" or
-						defName = "RHApparel_KulaMongoose_ChestRig" or
-						defName = "RHApparel_Arktis_TacticalVest" or
-						defName = "RHApparel_TexShoemakerPoliceBelt_Python" or
-						defName = "RHApparel_SafarilandPoliceBelt_Beretta" or
-						defName = "RHApparel_SafarilandPoliceBelt_Glock" or
-						defName = "RHApparel_MaxpeditionBattleBelt_Olive"
-						]/statBases
-					</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/ThingDef[
-						defName = "RHApparel_SuperBelt_Tan"]/statBases
-					</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-
-				<!-- == Equipped Offsets == -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName = "RHApparel_M56Webbing_Vietnam" or
-						defName = "RHApparel_ALICEWebbing_ColdWar" or
-						defName = "RHApparel_RRV_ChestRig" or
-						defName = "RHApparel_USMC_ChestRig" or
-						defName = "RHApparel_CondorRecon_ChestRig" or
-						defName = "RHApparel_CryeAVSTan_ChestRig" or
-						defName = "RHApparel_MilTec_ChestRig" or
-						defName = "RHApparel_WarriorFalcon_ChestRig" or
-						defName = "RHApparel_CondorBattleBelt_Tan" or
-						defName = "RHApparel_VTACBattleBelt_Tan" or
-						defName = "RHApparel_Type56Webbing_ColdWar" or
-						defName = "RHApparel_Type63Webbing_ColdWar" or
-						defName = "RHApparel_M23_ChestRig" or
-						defName = "RHApparel_KulaMongoose_ChestRig" or
-						defName = "RHApparel_Arktis_TacticalVest" or
-						defName = "RHApparel_TexShoemakerPoliceBelt_Python" or
-						defName = "RHApparel_SafarilandPoliceBelt_Beretta" or
-						defName = "RHApparel_SafarilandPoliceBelt_Glock" or
-						defName = "RHApparel_MaxpeditionBattleBelt_Olive"
-						]/equippedStatOffsets
-					</xpath>
-					<value>
-						<CarryBulk>25</CarryBulk>
-						<ReloadSpeed>0.1</ReloadSpeed>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "RHApparel_SuperBelt_Tan"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>15</CarryBulk>
-						<ReloadSpeed>0.1</ReloadSpeed>
-					</value>
-				</li>
-
-				<!-- RemoveCarryWeight -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName = "RHApparel_M56Webbing_Vietnam" or
-						defName = "RHApparel_ALICEWebbing_ColdWar" or
-						defName = "RHApparel_RRV_ChestRig" or
-						defName = "RHApparel_USMC_ChestRig" or
-						defName = "RHApparel_CondorRecon_ChestRig" or
-						defName = "RHApparel_CryeAVSTan_ChestRig" or
-						defName = "RHApparel_MilTec_ChestRig" or
-						defName = "RHApparel_WarriorFalcon_ChestRig" or
-						defName = "RHApparel_Type56Webbing_ColdWar" or
-						defName = "RHApparel_Type63Webbing_ColdWar" or
-						defName = "RHApparel_M23_ChestRig" or
-						defName = "RHApparel_KulaMongoose_ChestRig" or
-						defName = "RHApparel_Arktis_TacticalVest"
-						]/equippedStatOffsets/CarryingCapacity </xpath>
-				</li>
-
-				<!-- RemoveFlamm -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName = "RHApparel_M56Webbing_Vietnam" or
-						defName = "RHApparel_ALICEWebbing_ColdWar" or
-						defName = "RHApparel_RRV_ChestRig" or
-						defName = "RHApparel_USMC_ChestRig" or
-						defName = "RHApparel_CondorRecon_ChestRig" or
-						defName = "RHApparel_CryeAVSTan_ChestRig" or
-						defName = "RHApparel_MilTec_ChestRig" or
-						defName = "RHApparel_WarriorFalcon_ChestRig" or
-						defName = "RHApparel_Type56Webbing_ColdWar" or
-						defName = "RHApparel_Type63Webbing_ColdWar" or
-						defName = "RHApparel_M23_ChestRig" or
-						defName = "RHApparel_KulaMongoose_ChestRig" or
-						defName = "RHApparel_Arktis_TacticalVest"
-						]/statBases/Flammability </xpath>
-				</li>
-
-				<!-- RemoveAim -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName = "RHApparel_M56Webbing_Vietnam" or
-						defName = "RHApparel_ALICEWebbing_ColdWar" or
-						defName = "RHApparel_RRV_ChestRig" or
-						defName = "RHApparel_USMC_ChestRig" or
-						defName = "RHApparel_CondorRecon_ChestRig" or
-						defName = "RHApparel_CryeAVSTan_ChestRig" or
-						defName = "RHApparel_MilTec_ChestRig" or
-						defName = "RHApparel_WarriorFalcon_ChestRig" or
-						defName = "RHApparel_Type56Webbing_ColdWar" or
-						defName = "RHApparel_Type63Webbing_ColdWar" or
-						defName = "RHApparel_M23_ChestRig" or
-						defName = "RHApparel_KulaMongoose_ChestRig" or
-						defName = "RHApparel_Arktis_TacticalVest"
-						]/equippedStatOffsets/AimingDelayFactor </xpath>
-				</li>
-
-				<!-- RemoveSpeed -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName = "RHApparel_M56Webbing_Vietnam" or
-						defName = "RHApparel_ALICEWebbing_ColdWar" or
-						defName = "RHApparel_RRV_ChestRig" or
-						defName = "RHApparel_USMC_ChestRig" or
-						defName = "RHApparel_CondorRecon_ChestRig" or
-						defName = "RHApparel_CryeAVSTan_ChestRig" or
-						defName = "RHApparel_MilTec_ChestRig" or
-						defName = "RHApparel_WarriorFalcon_ChestRig" or
-						defName = "RHApparel_Type56Webbing_ColdWar" or
-						defName = "RHApparel_Type63Webbing_ColdWar" or
-						defName = "RHApparel_M23_ChestRig" or
-						defName = "RHApparel_KulaMongoose_ChestRig" or
-						defName = "RHApparel_Arktis_TacticalVest"
-						]/equippedStatOffsets/MoveSpeed </xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git "a/Patches/RH2 Rimmu-Nation\302\262 - Security/152mmBGM71.xml" "b/Patches/RH2 Rimmu-Nation\302\262 - Security/152mmBGM71.xml"
deleted file mode 100644
index 56bbb9e957..0000000000
--- "a/Patches/RH2 Rimmu-Nation\302\262 - Security/152mmBGM71.xml"	
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Rimmu-Nation² - Security</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>AmmoBGM71</defName>
-					<label>BGM-71 Missile</label>
-					<parent>AmmoRockets</parent>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_BGM71</defName>
-					<label>BGM-71D Missiles</label>
-					<ammoTypes>
-						<Ammo_BGM71_HEAT>Bullet_BGM71_HEAT</Ammo_BGM71_HEAT>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="BGM71Base" ParentName="HeavyAmmoBase" Abstract="True">
-					<description>152mm Anti-tank guided missiles, typically reserved for destroying armoured targets due to its rarity, but can be used for engaging soft targets should a mysterious foreign benefactor supply you with thousands of these free of charge.</description>
-					<statBases>
-						<MaxHitPoints>200</MaxHitPoints>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade_Sellable</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-					</tradeTags>
-					<thingCategories>
-						<li>AmmoBGM71</li>
-					</thingCategories>
-					<stackLimit>10</stackLimit>
-					<cookOffFlashScale>30</cookOffFlashScale>
-					<cookOffSound>MortarBomb_Explode</cookOffSound>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="BGM71Base">
-					<defName>Ammo_BGM71_HEAT</defName>
-					<label>BGM-71D Missile (HEAT)</label>
-					<graphicData>
-						<texPath>Things/Ammo/RPG/RPG32_Thermobaric</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-						<drawSize>1.65</drawSize>
-					</graphicData>
-					<statBases>
-						<MarketValue>232.27</MarketValue>
-						<Mass>21.5</Mass>
-						<Bulk>36.17</Bulk>
-					</statBases>
-					<ammoClass>RocketHEAT</ammoClass>
-					<detonateProjectile>Bullet_BGM71_HEAT</detonateProjectile>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef ParentName="BaseRPG7Grenade">
-					<defName>Bullet_BGM71_HEAT</defName>
-					<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					<label>BGM-71D Missile (HEAT)</label>
-					<graphicData>
-						<texPath>Things/Building/Security/TOW_MissileLauncher/TOW_2B</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-						<shaderType>TransparentPostLight</shaderType>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>69</speed>
-						<damageDef>Bullet</damageDef>
-						<damageAmountBase>400</damageAmountBase>
-						<armorPenetrationSharp>900</armorPenetrationSharp>
-						<armorPenetrationBlunt>151.584</armorPenetrationBlunt>
-						<soundAmbient>RocketPropelledLoop_Small</soundAmbient>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>300</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>2.5</explosiveRadius>
-							<explosionSound>MortarBomb_Explode</explosionSound>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>20</Fragment_Large>
-								<Fragment_Small>50</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_BGM71_HEAT</defName>
-					<label>make BGM-71 HEAT Missile</label>
-					<description>Craft 1 BGM-71 HEAT Missiles.</description>
-					<jobString>Making BGM-71 HEAT Missiles.</jobString>
-					<workAmount>11000</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>64</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>3</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>5</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>ComponentIndustrial</li>
-							<li>FSX</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_BGM71_HEAT>1</Ammo_BGM71_HEAT>
-					</products>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git "a/Patches/RH2 Rimmu-Nation\302\262 - Security/Rimmu2_CE_Security_MG.xml" "b/Patches/RH2 Rimmu-Nation\302\262 - Security/Rimmu2_CE_Security_MG.xml"
deleted file mode 100644
index ce79fe5f7b..0000000000
--- "a/Patches/RH2 Rimmu-Nation\302\262 - Security/Rimmu2_CE_Security_MG.xml"	
+++ /dev/null
@@ -1,494 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Rimmu-Nation² - Security</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Mounted M60 Gun ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RN2Gun_M60Mounted_GPMG</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.19</SwayFactor>
-						<Bulk>13.70</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.11</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>65</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>RNShotM60LMG</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>6.8</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RN2Gun_M60Mounted_MG"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>66</specialDisplayRadius>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RN2Gun_M60Mounted_MG"]/statBases</xpath>
-					<value>
-						<statBases>
-							<Mass>12</Mass>
-							<MaxHitPoints>120</MaxHitPoints>
-							<Flammability>0.5</Flammability>
-							<WorkToBuild>40000</WorkToBuild>
-							<Beauty>-20</Beauty>
-						</statBases>
-					</value>
-				</li>
-
-				<!-- ========== Mounted M2HB Gun ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RN2Gun_M2Browning</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.59</SwayFactor>
-						<Bulk>18.54</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.25</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>RNShot_M2Browning</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RN2Gun_M2Browning_MG"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>75</specialDisplayRadius>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RN2Gun_M2Browning_MG"]/statBases</xpath>
-					<value>
-						<statBases>
-							<Mass>58</Mass>
-							<MaxHitPoints>150</MaxHitPoints>
-							<Flammability>0.5</Flammability>
-							<WorkToBuild>60000</WorkToBuild>
-							<Beauty>-30</Beauty>
-						</statBases>
-					</value>
-				</li>
-
-				<!-- ========== Mounted M134 Gun ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RN2Gun_M134Minigun</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<Bulk>8.02</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.58</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<burstShotCount>300</burstShotCount>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<muzzleFlashScale>10</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1500</magazineSize>
-						<reloadTime>9.2</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>150</aimedBurstShotCount>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RN2Gun_M134Minigun_MG"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>75</specialDisplayRadius>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RN2Gun_M134Minigun_MG"]/statBases</xpath>
-					<value>
-						<statBases>
-							<Mass>39</Mass>
-							<MaxHitPoints>150</MaxHitPoints>
-							<Flammability>0.5</Flammability>
-							<WorkToBuild>65000</WorkToBuild>
-							<Beauty>-30</Beauty>
-						</statBases>
-					</value>
-				</li>
-
-				<!-- ========== Mounted Mk 19 Turret ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RN2Gun_MK19_GrenadeLauncher</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.49</SwayFactor>
-						<Bulk>12.90</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.67</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_40x53mmGrenade_HE</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<minRange>6</minRange>
-						<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
-						<burstShotCount>6</burstShotCount>
-						<soundCast>RNShot_MK19GrenadeLauncher</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<muzzleFlashScale>16</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>48</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_40x53mmGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RN2Gun_MK19_GL"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>75</specialDisplayRadius>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RN2Gun_MK19_GL"]/statBases</xpath>
-					<value>
-						<statBases>
-							<Mass>35.2</Mass>
-							<MaxHitPoints>150</MaxHitPoints>
-							<Flammability>0.5</Flammability>
-							<WorkToBuild>62000</WorkToBuild>
-							<Beauty>-30</Beauty>
-						</statBases>
-					</value>
-				</li>
-
-				<!-- ========== TOW launcher ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RN2Gun_TOW_MissileLauncher</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>2.5</RangedWeapon_Cooldown>
-						<SightsEfficiency>4.50</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>2.0</SwayFactor>
-						<Bulk>12.90</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BGM71_HEAT</defaultProjectile>
-						<warmupTime>4.0</warmupTime>
-						<ai_AvoidFriendlyFireRadius>3</ai_AvoidFriendlyFireRadius>
-						<range>120</range>
-						<minRange>6</minRange>
-						<soundCast>RNShot_TOWLauncher</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<muzzleFlashScale>16</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>9.9</reloadTime>
-						<ammoSet>AmmoSet_BGM71</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RN2Gun_TOW_Launcher"]/statBases</xpath>
-					<value>
-						<statBases>
-							<Mass>41</Mass>
-							<MaxHitPoints>150</MaxHitPoints>
-							<Flammability>0.5</Flammability>
-							<WorkToBuild>60000</WorkToBuild>
-							<Beauty>-20</Beauty>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RN2Gun_TOW_Launcher"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>150</Steel>
-							<ComponentIndustrial>10</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<!-- ========== M134 Sentry Gun ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RN2Gun_SentryGun</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.31</SwayFactor>
-						<Bulk>8.02</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.59</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>2.1</warmupTime>
-						<range>65</range>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<burstShotCount>300</burstShotCount>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1500</magazineSize>
-						<reloadTime>9.2</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RN2Turret_SentryGun"]</xpath>
-					<value>
-						<specialDisplayRadius>65</specialDisplayRadius>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RN2Turret_SentryGun"]/statBases</xpath>
-					<value>
-						<statBases>
-							<MaxHitPoints>150</MaxHitPoints>
-							<Flammability>0.7</Flammability>
-							<WorkToBuild>75500</WorkToBuild>
-							<Mass>50</Mass>
-							<Beauty>-20</Beauty>
-							<AimingAccuracy>0.30</AimingAccuracy>
-							<ShootingAccuracyTurret>0.6</ShootingAccuracyTurret>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "RN2Turret_SentryGun"]/comps/li[@Class="CompProperties_Power"]</xpath>
-					<value>
-						<li Class="CompProperties_Power">
-							<compClass>CompPowerTrader</compClass>
-							<basePowerConsumption>900</basePowerConsumption>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "RN2Turret_SentryGun"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>0.56</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<!-- == Shared patches == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "RN2Turret_SentryGun" or
-						defName = "RN2Gun_M60Mounted_MG" or
-						defName = "RN2Gun_M134Minigun_MG" or
-						defName = "RN2Gun_MK19_GL" or
-						defName = "RN2Gun_TOW_Launcher" or
-						defName = "RN2Gun_M2Browning_MG"]/fillPercent </xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RN2Gun_M60Mounted_MG"
-						or defName="RN2Gun_M2Browning_MG"
-						or defName="RN2Gun_M134Minigun_MG"
-						or defName="RN2Gun_MK19_GL"
-						or defName="RN2Gun_TOW_Launcher"]/statBases </xpath>
-					<value>
-						<ShootingAccuracyTurret>2.0</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RN2Turret_SentryGun"
-						or defName="RN2Gun_M60Mounted_MG"
-						or defName="RN2Gun_M2Browning_MG"
-						or defName="RN2Gun_M134Minigun_MG"
-						or defName="RN2Gun_MK19_GL"
-						or defName="RN2Gun_TOW_Launcher"]/thingClass </xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="RN2Turret_SentryGun" or
-						defName="RN2Gun_M60Mounted_MG" or
-						defName="RN2Gun_M2Browning_MG" or
-						defName="RN2Gun_M134Minigun_MG" or
-						defName="RN2Gun_MK19_GL" or
-						defName="RN2Gun_TOW_Launcher"
-						]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RN2Gun_M2Browning_MG" or
-						defName="RN2Gun_M134Minigun_MG" or
-						defName="RN2Gun_MK19_GL"
-						]/researchPrerequisites </xpath>
-					<value>
-						<researchPrerequisites>
-							<li>CE_TurretHeavyWeapons</li>
-						</researchPrerequisites>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RN2Gun_TOW_Launcher"]/researchPrerequisites</xpath>
-					<value>
-						<researchPrerequisites>
-							<li>CE_TurretHeavyWeapons</li>
-							<li>CE_Launchers</li>
-						</researchPrerequisites>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RN2Turret_SentryGun"
-						]/researchPrerequisites </xpath>
-					<value>
-						<researchPrerequisites>
-							<li>CE_TurretHeavyWeapons</li>
-							<li>CE_HeavyTurret</li>
-						</researchPrerequisites>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git "a/Patches/RH2 Rimmu-Nation\302\262 - Security/Rimmu2_CE_mortars.xml" "b/Patches/RH2 Rimmu-Nation\302\262 - Security/Rimmu2_CE_mortars.xml"
deleted file mode 100644
index aaa2d61f8a..0000000000
--- "a/Patches/RH2 Rimmu-Nation\302\262 - Security/Rimmu2_CE_mortars.xml"	
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Rimmu-Nation² - Security</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Remove RH2 60mm Mortar Shell === -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RN2Shell_60mmShell_HighExplosive"]</xpath>
-				</li>
-
-				<!-- === Patch Base === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name = "RN2_BaseArtilleryBuilding"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name = "RN2_BaseArtilleryBuilding"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>2.0</turretBurstCooldownTime>
-						<spawnedConceptLearnOpportunity>CE_MortarDirectFire</spawnedConceptLearnOpportunity>
-					</value>
-				</li>
-
-				<!-- === Mortar === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RN2Artillery_M2Mortar"]</xpath>
-					<value>
-						<statBases>
-							<SightsEfficiency>0.5</SightsEfficiency>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RN2Artillery_M2Mortar"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Charges">
-							<chargeSpeeds>
-								<li>30</li>
-								<li>50</li>
-								<li>70</li>
-								<li>90</li>
-							</chargeSpeeds>
-						</li>
-						<li Class="CombatExtended.CompProperties_AmmoUser">
-							<magazineSize>1</magazineSize>
-							<reloadTime>3.8</reloadTime>
-							<ammoSet>AmmoSet_60mmMortarShell</ammoSet>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RN2Artillery_M2Mortar"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-								<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_60mmMortarShell_HE</defaultProjectile>
-								<warmupTime>4.0</warmupTime>
-								<minRange>16</minRange>
-								<range>500</range>
-								<burstShotCount>1</burstShotCount>
-								<soundCast>RNShot_M224Mortar</soundCast>
-								<muzzleFlashScale>16</muzzleFlashScale>
-								<circularError>1</circularError>
-								<indirectFirePenalty>0.2</indirectFirePenalty>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RN2Artillery_M2Mortar"]/weaponTags</xpath>
-					<value>
-						<weaponTags>
-							<li>TurretGun</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<!-- === Turret === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RN2Turret_M2Mortar"]</xpath>
-					<value>
-						<tradeTags>
-							<li>CE_Turret</li>
-						</tradeTags>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git "a/Patches/RH2 Rimmu-Nation\302\262 - Security/ThingDefs_CE_IED.xml" "b/Patches/RH2 Rimmu-Nation\302\262 - Security/ThingDefs_CE_IED.xml"
deleted file mode 100644
index d235a5d1bd..0000000000
--- "a/Patches/RH2 Rimmu-Nation\302\262 - Security/ThingDefs_CE_IED.xml"	
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Rimmu-Nation² - Security</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- C4 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "RN2Explosive_C4Charge"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>2</Steel>
-							<ComponentIndustrial>2</ComponentIndustrial>
-							<FSX>6</FSX>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RN2Explosive_C4Charge"]/comps/li[@Class="CompProperties_Explosive"]</xpath>
-					<value>
-						<li Class="CompProperties_Explosive">
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>5.5</explosiveRadius>
-							<wickTicks>
-								<min>5</min>
-								<max>30</max>
-							</wickTicks>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "RN2Explosive_C4IED"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>2</Steel>
-							<ComponentIndustrial>2</ComponentIndustrial>
-							<FSX>9</FSX>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RN2Explosive_C4IED"]/comps/li[@Class="CompProperties_Explosive"]</xpath>
-					<value>
-						<li Class="CompProperties_Explosive">
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>7.5</explosiveRadius>
-							<wickTicks>
-								<min>5</min>
-								<max>30</max>
-							</wickTicks>
-						</li>
-					</value>
-				</li>
-
-				<!-- 155mm IED -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "RN2Explosive_155mmIED"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>40</Steel>
-							<ComponentIndustrial>2</ComponentIndustrial>
-							<FSX>8</FSX>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RN2Explosive_155mmIED"]/comps/li[@Class="CompProperties_Explosive"]</xpath>
-					<value>
-						<li Class="CompProperties_Explosive">
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>6.5</explosiveRadius>
-							<wickTicks>
-								<min>5</min>
-								<max>30</max>
-							</wickTicks>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>40</Fragment_Large>
-								<Fragment_Small>80</Fragment_Small>
-							</fragments>
-						</li>
-					</value>
-				</li>
-
-				<!-- Claymore -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "RN2Explosive_M18Claymore"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>30</Steel>
-							<ComponentIndustrial>1</ComponentIndustrial>
-							<FSX>4</FSX>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RN2Explosive_M18Claymore"]/comps/li[@Class="CompProperties_Explosive"]</xpath>
-					<value>
-						<li Class="CompProperties_Explosive">
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>3</explosiveRadius>
-							<wickTicks>
-								<min>5</min>
-								<max>30</max>
-							</wickTicks>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>100</Fragment_Small>
-							</fragments>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RN2Explosive_M18Claymore"]/comps/li[@Class="ChickenExplosives.CompProperties_ProjectileSprayer"]</xpath>
-				</li>
-
-				<!--  Mines -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "RN2Explosive_YM1B_APMine"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>20</Steel>
-							<ComponentIndustrial>1</ComponentIndustrial>
-							<FSX>2</FSX>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RN2Explosive_YM1B_APMine"]/comps/li[@Class="CompProperties_Explosive"]</xpath>
-					<value>
-						<li Class="CompProperties_Explosive">
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>3.5</explosiveRadius>
-							<startWickHitPointsPercent>0.2</startWickHitPointsPercent>
-							<wickTicks>5</wickTicks>
-							<startWickOnDamageTaken>
-								<li>Bullet</li>
-								<li>Arrow</li>
-								<li>ArrowHighVelocity</li>
-							</startWickOnDamageTaken>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>4</Fragment_Large>
-								<Fragment_Small>40</Fragment_Small>
-							</fragments>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_Axes_CE.xml" "b/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_Axes_CE.xml"
deleted file mode 100644
index 6bd5d03693..0000000000
--- "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_Axes_CE.xml"	
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Rimmu-Nation² - Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- RimmuNaysh Y'all -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_USMC_Tomahawk"
-						or defName="RNMeleeWeapon_Gerber_Tomahawk"
-						or defName="RNMeleeWeapon_Roughneck_Handaxe"
-						or defName="RNMeleeWeapon_GerberSurvival_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>20</power>
-								<cooldownTime>1.64</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.72</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_USMC_Tomahawk"
-						or defName="RNMeleeWeapon_Gerber_Tomahawk"
-						or defName="RNMeleeWeapon_Roughneck_Handaxe"
-						or defName="RNMeleeWeapon_GerberSurvival_Axe"]/statBases </xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_USMC_Tomahawk"
-						or defName="RNMeleeWeapon_Gerber_Tomahawk"
-						or defName="RNMeleeWeapon_Roughneck_Handaxe"
-						or defName="RNMeleeWeapon_GerberSurvival_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="RNMeleeWeapon_USMC_Tomahawk"
-						or defName="RNMeleeWeapon_Gerber_Tomahawk"
-						or defName="RNMeleeWeapon_Roughneck_Handaxe"
-						or defName="RNMeleeWeapon_GerberSurvival_Axe"]/weaponTags </xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- Shitty ax -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Fire_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>22</power>
-								<cooldownTime>2.1</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.64</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_DMMFly_IceAxe"]/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>1.7</cooldownTime>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.48</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.78</cooldownTime>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.08</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Felling_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>24</power>
-								<cooldownTime>2.5</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.7</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Fire_Axe" or defName="RNMeleeWeapon_Felling_Axe"or defName="RNMeleeWeapon_DMMFly_IceAxe"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Fire_Axe" or defName="RNMeleeWeapon_Felling_Axe"or defName="RNMeleeWeapon_DMMFly_IceAxe"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.10</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-						<MeleeDodgeChance>0.20</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Fire_Axe" or defName="RNMeleeWeapon_Felling_Axe"or defName="RNMeleeWeapon_DMMFly_IceAxe"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_BoltAction.xml" "b/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_BoltAction.xml"
deleted file mode 100644
index 910a6f2ae1..0000000000
--- "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_BoltAction.xml"	
+++ /dev/null
@@ -1,577 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Rimmu-Nation² - Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== C14 Timberwolf ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_C14Timberwolf_Sniper</defName>
-					<statBases>
-						<Mass>7.10</Mass>
-						<RangedWeapon_Cooldown>1.24</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.96</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.64</SwayFactor>
-						<Bulk>13.00</Bulk>
-						<WorkToMake>36000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>70</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
-						<warmupTime>1.75</warmupTime>
-						<range>80</range>
-						<soundCast>RNShot_GenericBoltSniper_II</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_338Lapua</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Desert Tech HTI ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_DesertTechHTI_AMR</defName>
-					<statBases>
-						<Mass>9.09</Mass>
-						<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.72</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.86</SwayFactor>
-						<Bulk>12.52</Bulk>
-						<WorkToMake>40000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>80</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>3.6</warmupTime>
-						<range>86</range>
-						<soundCast>RNShot_Generic50Bolt</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== GOL Magnum ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_GOLMagnum_Sniper</defName>
-					<statBases>
-						<Mass>6.00</Mass>
-						<RangedWeapon_Cooldown>1.24</RangedWeapon_Cooldown>
-						<SightsEfficiency>3.20</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.67</SwayFactor>
-						<Bulk>13.30</Bulk>
-						<WorkToMake>33500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>65</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_300WinchesterMagnum_FMJ</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>75</range>
-						<soundCast>RNShotGOL</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_300WinchesterMagnum</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== L96A1 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_L96A1_Sniper</defName>
-					<statBases>
-						<Mass>6.50</Mass>
-						<RangedWeapon_Cooldown>1.24</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.6</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>12.80</Bulk>
-						<WorkToMake>30500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>65</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.4</warmupTime>
-						<range>75</range>
-						<soundCast>RNShot_L96A1Sn</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Lee Enfield ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_LeeEnfield_BoltAction</defName>
-					<statBases>
-						<Mass>4.19</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.62</SwayFactor>
-						<Bulk>12.60</Bulk>
-						<WorkToMake>12000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>55</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>RNShot_BoltActionOldie</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_303British</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Ultra ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_MannlicherUltraLight_Sniper</defName>
-					<statBases>
-						<Mass>2.7</Mass>
-						<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.60</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.29</SwayFactor>
-						<Bulk>11.92</Bulk>
-						<WorkToMake>29000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>55</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<soundCast>RNShot_BoltGenericSD</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>6</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>4</magazineSize>
-						<reloadTime>3.8</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Mannlicher Schoenauer ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_MannlicherSchoenauer_Sniper</defName>
-					<statBases>
-						<Mass>4</Mass>
-						<RangedWeapon_Cooldown>1.26</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.60</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.56</SwayFactor>
-						<Bulk>12.26</Bulk>
-						<WorkToMake>25000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>55</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.4</warmupTime>
-						<range>75</range>
-						<soundCast>RNShot_GenericBoltSniper</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== M24A2 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M24A2_Sniper</defName>
-					<statBases>
-						<Mass>7.10</Mass>
-						<RangedWeapon_Cooldown>1.24</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.60</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.35</SwayFactor>
-						<Bulk>11.92</Bulk>
-						<WorkToMake>30000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>65</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.4</warmupTime>
-						<range>75</range>
-						<soundCast>RNShot_GenericBoltSniper</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== M40A5 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M40A5_Sniper</defName>
-					<statBases>
-						<Mass>7.50</Mass>
-						<RangedWeapon_Cooldown>1.24</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.72</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.40</SwayFactor>
-						<Bulk>12.24</Bulk>
-						<WorkToMake>30000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>65</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.4</warmupTime>
-						<range>75</range>
-						<soundCast>RNShotM40Sniper</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== SV-98 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_SV98_Sniper</defName>
-					<statBases>
-						<Mass>6.80</Mass>
-						<RangedWeapon_Cooldown>1.24</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.60</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.39</SwayFactor>
-						<Bulk>13.00</Bulk>
-						<WorkToMake>29000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>65</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.4</warmupTime>
-						<range>75</range>
-						<soundCast>RNShotSV98</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Intervention AMR ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M200Intervention_AMR</defName>
-					<statBases>
-						<Mass>15.20</Mass>
-						<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>3.32</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>2.06</SwayFactor>
-						<Bulk>12.87</Bulk>
-						<WorkToMake>42500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>110</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_408CheyenneTactical_FMJ</defaultProjectile>
-						<warmupTime>2.4</warmupTime>
-						<range>86</range>
-						<soundCast>RNShotIntervention</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_408CheyenneTactical</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>Bipod_AMR</li>
-						<li>CE_AI_SR</li>
-					</weaponTags>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNGun_C14Timberwolf_Sniper" or
-						defName="RNGun_DesertTechHTI_AMR" or
-						defName="RNGun_GOLMagnum_Sniper" or
-						defName="RNGun_MannlicherUltraLight_Sniper" or
-						defName="RNGun_MannlicherSchoenauer_Sniper" or
-						defName="RNGun_L96A1_Sniper" or
-						defName="RNGun_LeeEnfield_BoltAction" or
-						defName="RNGun_M24A2_Sniper" or
-						defName="RNGun_M40A5_Sniper" or
-						defName="RNGun_SV98_Sniper" or
-						defName="RNGun_M200Intervention_AMR"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_BullpupAR.xml" "b/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_BullpupAR.xml"
deleted file mode 100644
index 78a5a44d82..0000000000
--- "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_BullpupAR.xml"	
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Rimmu-Nation² - Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Steyr AUG A2 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_AUGA1_Rifle</defName>
-					<statBases>
-						<Mass>3.60</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.5</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.31</SwayFactor>
-						<Bulk>7.90</Bulk>
-						<WorkToMake>35000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.41</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>48</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShotAUG</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.0</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== FAMAS ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_FAMAS_Rifle</defName>
-					<statBases>
-						<Mass>3.61</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.31</SwayFactor>
-						<Bulk>7.57</Bulk>
-						<WorkToMake>30000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.44</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericBullpup_II</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>4.0</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>Bipod_Rifle</li>
-					</weaponTags>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== L85A2 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_SA80A2_Rifle</defName>
-					<statBases>
-						<Mass>3.82</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.5</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.29</SwayFactor>
-						<Bulk>7.85</Bulk>
-						<WorkToMake>35000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.41</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>48</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericBullpup</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.0</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNGun_AUGA1_Rifle" or
-						defName="RNGun_FAMAS_Rifle" or
-						defName="RNGun_SA80A2_Rifle"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_DMR.xml" "b/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_DMR.xml"
deleted file mode 100644
index 432246aa71..0000000000
--- "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_DMR.xml"	
+++ /dev/null
@@ -1,679 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Rimmu-Nation² - Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Dragunov SVD ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_DragunovSVD_DMR</defName>
-					<statBases>
-						<Mass>4.30</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.70</SwayFactor>
-						<Bulk>12.25</Bulk>
-						<WorkToMake>23000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>60</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<soundCast>RNShotDragunov</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== OTs-03 SVU ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_SVU_DMR</defName>
-					<statBases>
-						<Mass>4.10</Mass>
-						<RangedWeapon_Cooldown>0.57</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>0.92</SwayFactor>
-						<Bulk>9.70</Bulk>
-						<WorkToMake>31000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>97</range>
-						<soundCast>RNShot_DMRSDGeneric_II</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== SKS DMR ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_SKSModern_DMR</defName>
-					<statBases>
-						<Mass>3.85</Mass>
-						<RangedWeapon_Cooldown>0.57</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.01</SwayFactor>
-						<Bulk>10.18</Bulk>
-						<WorkToMake>29000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>48</range>
-						<soundCast>RNShotSKS</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== PSL54 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_PSL54_DMR</defName>
-					<statBases>
-						<Mass>4.30</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.70</SwayFactor>
-						<Bulk>12.25</Bulk>
-						<WorkToMake>23000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>60</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<soundCast>RNShotDragunov</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Heckler & Koch G28 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_G28_DMR</defName>
-					<statBases>
-						<Mass>5.80</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.48</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.47</SwayFactor>
-						<Bulk>10.65</Bulk>
-						<WorkToMake>29000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>60</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<soundCast>RNShot_GenericDMR</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>Bipod_DMR</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== L129A1 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_L129A1_DMR</defName>
-					<statBases>
-						<Mass>4.50</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.36</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.50</SwayFactor>
-						<Bulk>9.00</Bulk>
-						<WorkToMake>29000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>55</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<soundCast>RNShot_GenericDMR</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>Bipod_DMR</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== M14 DMR ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M14_DMR</defName>
-					<statBases>
-						<Mass>6.10</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.57</SwayFactor>
-						<Bulk>12.18</Bulk>
-						<WorkToMake>24000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>60</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<soundCast>RNShot_EBRGeneric</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>Bipod_DMR</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Barrett M82A1 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M82A1_AMR</defName>
-					<statBases>
-						<Mass>13.50</Mass>
-						<RangedWeapon_Cooldown>0.68</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.84</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.92</SwayFactor>
-						<Bulk>13.00</Bulk>
-						<WorkToMake>38500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>105</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>3.6</warmupTime>
-						<range>86</range>
-						<soundCast>RNShot50Cal</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>Bipod_ATR</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Mk 14 EBR ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Mk14Mod0_DMR</defName>
-					<statBases>
-						<Mass>6.75</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.60</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.89</SwayFactor>
-						<Bulk>8.89</Bulk>
-						<WorkToMake>33500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>70</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>75</range>
-						<soundCast>RNShot_EBRGeneric</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Desert Tech SRS ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_DesertTechSRS_DMR</defName>
-					<statBases>
-						<Mass>5.6</Mass>
-						<RangedWeapon_Cooldown>1.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>3.50</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.14</SwayFactor>
-						<Bulk>10.52</Bulk>
-						<WorkToMake>47000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>60</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
-						<warmupTime>2.55</warmupTime>
-						<range>86</range>
-						<soundCast>RNShot_SRSSD</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_338Lapua</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>Bipod_DMR</li>
-						<li>CE_AI_SR</li>
-					</weaponTags>
-
-					<!-- No additional CE weaponTags needed -->
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Heckler & Koch PSG-1 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_PSG1_DMR</defName>
-					<statBases>
-						<Mass>7.20</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.36</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.7</SwayFactor>
-						<Bulk>12.30</Bulk>
-						<WorkToMake>31000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>65</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<soundCast>RNShotPSG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>Bipod_DMR</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== VSS Vintorez ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_VSSVintorez_DMR</defName>
-					<statBases>
-						<Mass>2.60</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.29</SwayFactor>
-						<Bulk>8.94</Bulk>
-						<WorkToMake>25500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Chemfuel>5</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.94</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>40</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShotVSSVintorez</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Walther WA 2000 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_WA2000_DMR</defName>
-					<statBases>
-						<Mass>7.51</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.70</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1.47</SwayFactor>
-						<Bulk>9.05</Bulk>
-						<WorkToMake>42000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>60</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_300WinchesterMagnum_FMJ</defaultProjectile>
-						<warmupTime>1.4</warmupTime>
-						<range>75</range>
-						<soundCast>RNShotPSG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_300WinchesterMagnum</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>Bipod_DMR</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNGun_DragunovSVD_DMR" or
-						defName="RNGun_PSL54_DMR" or
-						defName="RNGun_G28_DMR" or
-						defName="RNGun_L129A1_DMR" or
-						defName="RNGun_M14_DMR" or
-						defName="RNGun_M82A1_AMR" or
-						defName="RNGun_PSG1_DMR" or
-						defName="RNGun_VSSVintorez_DMR" or
-						defName="RNGun_WA2000_DMR" or
-						defName="RNGun_SVU_DMR" or
-						defName="RNGun_Mk14Mod0_DMR" or
-						defName="RNGun_SKSModern_DMR" or
-						defName="RNGun_DesertTechSRS_DMR"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_GrenadeDeletus.xml" "b/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_GrenadeDeletus.xml"
deleted file mode 100644
index 62b812c51b..0000000000
--- "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_GrenadeDeletus.xml"	
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Rimmu-Nation² - Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Remove Grenades and their projectiles ========== -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RNThrown_M84Stun_Grenade"]</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_LMG.xml" "b/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_LMG.xml"
deleted file mode 100644
index 20eaaf7656..0000000000
--- "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_LMG.xml"	
+++ /dev/null
@@ -1,511 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Rimmu-Nation² - Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== FN MAG ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_FNMAG_GPMG</defName>
-					<statBases>
-						<Mass>11.80</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.72</SwayFactor>
-						<Bulk>15.63</Bulk>
-						<WorkToMake>41000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>100</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.21</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.45</warmupTime>
-						<range>67</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>RNShotM240B</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>Bipod_LMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Ksp 58 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Ksp58B_GPMG</defName>
-					<statBases>
-						<Mass>11.80</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.71</SwayFactor>
-						<Bulk>15.63</Bulk>
-						<WorkToMake>41000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>100</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.21</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>67</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>RNShotM240B</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>Bipod_LMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== M60 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M60_GPMG</defName>
-					<statBases>
-						<Mass>10.50</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.51</SwayFactor>
-						<Bulk>14.05</Bulk>
-						<WorkToMake>40500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>85</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.30</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>62</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>RNShotM60LMG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_MachineGun</li>
-						<li>Bipod_LMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== M249 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M249_LMG</defName>
-					<statBases>
-						<Mass>7.50</Mass>
-						<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.34</SwayFactor>
-						<Bulk>13.35</Bulk>
-						<WorkToMake>42000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>70</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>60</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>RNShotL86LMG</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>200</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>Bipod_LMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== PKM ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_PKM_GPMG</defName>
-					<statBases>
-						<Mass>7.50</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.37</SwayFactor>
-						<Bulk>14.92</Bulk>
-						<WorkToMake>36000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>80</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.45</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<soundCast>RNShotM240B</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_MachineGun</li>
-						<li>Bipod_LMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== RPD ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_RPD_LMG</defName>
-					<statBases>
-						<Mass>7.40</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.24</SwayFactor>
-						<Bulk>13.37</Bulk>
-						<WorkToMake>35000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>70</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.24</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>48</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShotRPD</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_MachineGun</li>
-						<li>Bipod_SAW</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== T81 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Type81_LMG</defName>
-					<statBases>
-						<Mass>7.40</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.24</SwayFactor>
-						<Bulk>13.37</Bulk>
-						<WorkToMake>35000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>70</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.24</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>48</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShotRPD</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_MachineGun</li>
-						<li>Bipod_SAW</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== RPK-74 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_RPK_LMG</defName>
-					<statBases>
-						<Mass>4.80</Mass>
-						<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.2</SwayFactor>
-						<Bulk>12.40</Bulk>
-						<WorkToMake>29500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>65</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.11</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>55</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>RNShotRPK</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>75</magazineSize>
-						<reloadTime>4.8</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_MachineGun</li>
-						<li>Bipod_SAW</li>
-					</weaponTags>
-				</li>
-
-				<!-- MG-42 -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_MG42_GPMG</defName>
-					<statBases>
-						<Mass>11.6</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.67</SwayFactor>
-						<Bulk>12.20</Bulk>
-						<WorkToMake>41000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>120</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-						<WoodLog>5</WoodLog>
-					</costList>
-					<Properties>
-						<recoilAmount>1.47</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>62</range>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<burstShotCount>12</burstShotCount>
-						<soundCast>RNShot_AN94</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>250</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>6</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_MachineGun</li>
-						<li>Bipod_LMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNGun_FNMAG_GPMG" or
-						defName="RNGun_Ksp58B_GPMG" or
-						defName="RNGun_M60_GPMG" or
-						defName="RNGun_M249_LMG" or
-						defName="RNGun_PKM_GPMG" or
-						defName="RNGun_RPD_LMG" or
-						defName="RNGun_Type81_LMG" or
-						defName="RNGun_MG42_GPMG" or
-						defName="RNGun_RPK_LMG"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Launchers.xml" "b/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Launchers.xml"
deleted file mode 100644
index 4a0672e9fc..0000000000
--- "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Launchers.xml"	
+++ /dev/null
@@ -1,375 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Rimmu-Nation² - Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Heckler & Koch HK69A1 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_HK69A1_GrenadeLauncher</defName>
-					<statBases>
-						<Mass>2.60</Mass>
-						<RangedWeapon_Cooldown>0.94</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.94</SwayFactor>
-						<Bulk>4.63</Bulk>
-						<WorkToMake>11500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>44</range>
-						<minRange>5</minRange>
-						<soundCast>RNShotGL</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== M79 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M79_GrenadeLauncher</defName>
-					<statBases>
-						<Mass>2.70</Mass>
-						<RangedWeapon_Cooldown>0.93</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.00</SwayFactor>
-						<Bulk>7.31</Bulk>
-						<WorkToMake>9000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-						<WoodLog>10</WoodLog>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>44</range>
-						<minRange>5</minRange>
-						<soundCast>RNShotGL</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== M72 LAW ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M72LAW_RocketLauncher</defName>
-					<statBases>
-						<MarketValue>35.72</MarketValue>
-						<Mass>2.50</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.24</SwayFactor>
-						<Bulk>7.30</Bulk>
-						<WorkToMake>12000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>50</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-						<FSX>3</FSX>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_M72LAW</defaultProjectile>
-						<warmupTime>1.9</warmupTime>
-						<range>31</range>
-						<minRange>2</minRange>
-						<soundCast>RNShotLauncher</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>15</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== RPG-7 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_RPG7_RocketLauncher</defName>
-					<statBases>
-						<Mass>7.00</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.16</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.68</SwayFactor>
-						<Bulk>10.50</Bulk>
-						<WorkToMake>25500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>70</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_RPG7Grenade_HEAT</defaultProjectile>
-						<warmupTime>2.035</warmupTime>
-						<range>40</range>
-						<minRange>3</minRange>
-						<soundCast>RNShotRPG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>15</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>8.6</reloadTime>
-						<ammoSet>AmmoSet_RPG7Grenade</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== MBT LAW / NLAW ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_NLAW_RocketLauncher</defName>
-					<statBases>
-						<Mass>12.50</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>2.27</SwayFactor>
-						<Bulk>11.16</Bulk>
-						<WorkToMake>30500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>20</Chemfuel>
-						<Steel>75</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-						<FSX>9</FSX>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_150mmMBTLAWMissile</defaultProjectile>
-						<warmupTime>1.8</warmupTime>
-						<range>48</range>
-						<ticksBetweenBurstShots>20</ticksBetweenBurstShots>
-						<soundCast>RNShotLauncher</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>15</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== FGM-148 Javelin ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_FGM148Javelin_RocketLauncher</defName>
-					<statBases>
-						<Mass>22.30</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.72</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>3.55</SwayFactor>
-						<Bulk>13.00</Bulk>
-						<WorkToMake>41500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>135</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-						<FSX>15</FSX>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_127mmJavelinMissile</defaultProjectile>
-						<warmupTime>2.5</warmupTime>
-						<range>156</range>
-						<soundCast>RNShotLauncher</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>15</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<!-- RH2 Weapons version of FGM-148 Javelin is single-use only -->
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNGun_HK69A1_GrenadeLauncher" or
-						defName="RNGun_M79_GrenadeLauncher"
-						]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNGun_M72LAW_RocketLauncher" or
-						defName="RNGun_RPG7_RocketLauncher" or
-						defName="RNGun_NLAW_RocketLauncher" or
-						defName="RNGun_FGM148Javelin_RocketLauncher"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Pistols.xml" "b/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Pistols.xml"
deleted file mode 100644
index 1dc682b5a2..0000000000
--- "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Pistols.xml"	
+++ /dev/null
@@ -1,743 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Rimmu-Nation² - Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== FuckiN Five-seveN ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_FiveSeven_Pistol</defName>
-					<statBases>
-						<Mass>0.61</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.90</SwayFactor>
-						<Bulk>2.08</Bulk>
-						<WorkToMake>7500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>20</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShotFiveSeven</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_FN57x28mm</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== STK100 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_STK100_Pistol</defName>
-					<statBases>
-						<Mass>0.81</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>0.83</SwayFactor>
-						<Bulk>1.86</Bulk>
-						<WorkToMake>7500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>20</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShotGlock17</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>17</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Glock 17 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Glock17_Pistol</defName>
-					<statBases>
-						<Mass>0.63</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.83</SwayFactor>
-						<Bulk>1.86</Bulk>
-						<WorkToMake>7500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>20</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShotGlock17</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>17</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Glock 18 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Glock18_Pistol</defName>
-					<statBases>
-						<Mass>0.63</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>1.86</Bulk>
-						<WorkToMake>13000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>20</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<recoilAmount>1.94</recoilAmount>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>RNShotGlock17</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>17</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Glock 34 Combat Master ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Glock34CombatMaster_Pistol</defName>
-					<statBases>
-						<Mass>0.66</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>0.96</SwayFactor>
-						<Bulk>2.23</Bulk>
-						<WorkToMake>7500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>20</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>13</range>
-						<soundCast>RNShotPistol_II</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>17</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-
-				</li>
-
-				<!-- ========== HS2000 / XD / XDM / XD-S ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_SpringfieldXD_Pistol</defName>
-					<statBases>
-						<Mass>0.65</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>0.8</SwayFactor>
-						<Bulk>1.60</Bulk>
-						<WorkToMake>7500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>20</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShot_SpringfieldXD</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>13</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-
-				</li>
-
-				<!-- ========== M1911A1 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M1911_Pistol</defName>
-					<statBases>
-						<Mass>1.14</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.11</SwayFactor>
-						<Bulk>2.19</Bulk>
-						<WorkToMake>7000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShot1911P</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== STI 2011 Combat Master ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_STI2011CombatMaster_Pistol</defName>
-					<statBases>
-						<Mass>1.14</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.11</SwayFactor>
-						<Bulk>2.19</Bulk>
-						<WorkToMake>7000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShot1911P</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== M9A1 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M9A1_Pistol</defName>
-					<statBases>
-						<Mass>0.97</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.05</SwayFactor>
-						<Bulk>2.17</Bulk>
-						<WorkToMake>7000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNPistolShot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Makarov (PM) ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Makarov_Pistol</defName>
-					<statBases>
-						<Mass>0.73</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>0.78</SwayFactor>
-						<Bulk>1.62</Bulk>
-						<WorkToMake>7000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x18mmMakarov_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNPistolShot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<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>
-				</li>
-				<!-- ========== SIG Sauer P226 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_P226_Pistol</defName>
-					<statBases>
-						<Mass>0.96</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.97</SwayFactor>
-						<Bulk>1.96</Bulk>
-						<WorkToMake>7000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_40SW_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShotPistol_II</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_40SW</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== SIG Sauer P320 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_P320_Pistol</defName>
-					<statBases>
-						<Mass>0.84</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.96</SwayFactor>
-						<Bulk>2.03</Bulk>
-						<WorkToMake>7500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>20</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShotPistol_II</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>17</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== USP45  ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_USP45_Pistol</defName>
-					<statBases>
-						<Mass>0.78</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.08</SwayFactor>
-						<Bulk>2.01</Bulk>
-						<WorkToMake>7500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>25</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShot_1911Hellfighter</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Juan Deag ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_DesertEagle_Pistol</defName>
-					<statBases>
-						<Mass>2.00</Mass>
-						<RangedWeapon_Cooldown>0.43</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.58</SwayFactor>
-						<Bulk>2.73</Bulk>
-						<WorkToMake>11000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50AE_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNDeagleShot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_50AE</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Taurus PT92 "Luison" ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_PT92SF_Pistol</defName>
-					<statBases>
-						<Mass>1.12</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.63</SwayFactor>
-						<Bulk>3.79</Bulk>
-						<WorkToMake>7500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShotSupressed_II</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>17</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNGun_FiveSeven_Pistol" or
-						defName="RNGun_STK100_Pistol" or
-						defName="RNGun_Glock17_Pistol" or
-						defName="RNGun_Glock18_Pistol" or
-						defName="RNGun_Glock34CombatMaster_Pistol" or
-						defName="RNGun_SpringfieldXD_Pistol" or
-						defName="RNGun_M1911_Pistol" or
-						defName="RNGun_STI2011CombatMaster_Pistol" or
-						defName="RNGun_M9A1_Pistol" or
-						defName="RNGun_Makarov_Pistol" or
-						defName="RNGun_P226_Pistol" or
-						defName="RNGun_P320_Pistol" or
-						defName="RNGun_DesertEagle_Pistol" or
-						defName="RNGun_PT92SF_Pistol" or
-						defName="RNGun_USP45_Pistol"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Revolvers.xml" "b/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Revolvers.xml"
deleted file mode 100644
index 388faaacdd..0000000000
--- "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Revolvers.xml"	
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Rimmu-Nation² - Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Colt Cobra ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_ColtCobra_Revolver</defName>
-					<statBases>
-						<Mass>0.43</Mass>
-						<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.22</ShotSpread>
-						<SwayFactor>0.87</SwayFactor>
-						<Bulk>1.71</Bulk>
-						<WorkToMake>4500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>20</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>3.35</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_38Special_FMJ</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>10</range>
-						<soundCast>RNShotColtPython</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_38Special</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Colt Python ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_ColtPython_Revolver</defName>
-					<statBases>
-						<Mass>1.23</Mass>
-						<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.38</SwayFactor>
-						<Bulk>2.92</Bulk>
-						<WorkToMake>5000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.15</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_357Magnum_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShotColtPython</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_357Magnum</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== MP-412 REX ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_MP412REX_Revolver</defName>
-					<statBases>
-						<Mass>0.90</Mass>
-						<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>1.07</SwayFactor>
-						<Bulk>2.32</Bulk>
-						<WorkToMake>4500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.51</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_357Magnum_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShotRevolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_357Magnum</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== S&W Model 36 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Model36_Revolver</defName>
-					<statBases>
-						<Mass>0.55</Mass>
-						<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.22</ShotSpread>
-						<SwayFactor>0.87</SwayFactor>
-						<Bulk>1.71</Bulk>
-						<WorkToMake>4500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>20</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>3.35</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_38Special_FMJ</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>10</range>
-						<soundCast>RNShotColtPython</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_38Special</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNGun_ColtCobra_Revolver" or
-						defName="RNGun_ColtPython_Revolver" or
-						defName="RNGun_MP412REX_Revolver" or
-						defName="RNGun_Model36_Revolver"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Rifle1_Style.xml" "b/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Rifle1_Style.xml"
deleted file mode 100644
index 3d3e46b0c9..0000000000
--- "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Rifle1_Style.xml"	
+++ /dev/null
@@ -1,307 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Rimmu-Nation² - Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== 56 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Type56_Rifle</defName>
-					<statBases>
-						<Mass>3.47</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<Bulk>8.80</Bulk>
-						<WorkToMake>27000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>45</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.82</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>44</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>RNShot_AK47Rifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== AK-47 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_AK47_Rifle</defName>
-					<statBases>
-						<Mass>3.47</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<Bulk>8.80</Bulk>
-						<WorkToMake>27000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>45</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.82</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>44</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>RNShot_AK47Rifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== AK-74 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_AK74_Rifle</defName>
-					<statBases>
-						<Mass>3.07</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.25</SwayFactor>
-						<Bulk>9.43</Bulk>
-						<WorkToMake>27500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.43</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>RNShotAK74USMG</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== AK-103 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_AK103_Rifle</defName>
-					<statBases>
-						<Mass>3.60</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.50</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<Bulk>9.43</Bulk>
-						<WorkToMake>32000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.64</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>44</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>RNShot_AK47Rifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- AS Val -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_ASVAL_Rifle</defName>
-					<statBases>
-						<Mass>2.50</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.17</SwayFactor>
-						<Bulk>6.15</Bulk>
-						<WorkToMake>37500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.94</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>31</range>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShotVSSVintorez</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>1</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNGun_AK47_Rifle" or
-						defName="RNGun_AK74_Rifle" or
-						defName="RNGun_AK103_Rifle" or
-						defName="RNGun_ASVAL_Rifle" or
-						defName="RNGun_Type56_Rifle"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Rifle2_Style.xml" "b/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Rifle2_Style.xml"
deleted file mode 100644
index 7ace1ce802..0000000000
--- "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Rifle2_Style.xml"	
+++ /dev/null
@@ -1,1062 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Rimmu-Nation² - Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Daniel Defense DDM4 V1 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_DDM4V11_Rifle</defName>
-					<statBases>
-						<Mass>3.04</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.5</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.26</SwayFactor>
-						<Bulk>8.19</Bulk>
-						<WorkToMake>36000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.51</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>57</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR_II</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Heckler & Koch HK416 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_HK416_Rifle</defName>
-					<statBases>
-						<Mass>3.56</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.5</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.30</SwayFactor>
-						<Bulk>8.48</Bulk>
-						<WorkToMake>35000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.41</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== War Sport Industries LVOA-C ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_LVOAC_Rifle</defName>
-					<statBases>
-						<Mass>3.20</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.5</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.35</SwayFactor>
-						<Bulk>9</Bulk>
-						<WorkToMake>35500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.39</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>48</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR_II</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>6</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== M16A2 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M16A2_Rifle</defName>
-					<statBases>
-						<Mass>3.26</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>10.03</Bulk>
-						<WorkToMake>30000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR_IV</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== M4A1 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M4A1_Rifle</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>
-						<WorkToMake>32000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-						<Chemfuel>10</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>1.58</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_MWARRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== F2000 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_F2000_Rifle</defName>
-					<statBases>
-						<Mass>3.60</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.05</SwayFactor>
-						<Bulk>6.88</Bulk>
-						<WorkToMake>36500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.41</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericBullpup_III</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== ACR ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_ACR_Rifle</defName>
-					<statBases>
-						<Mass>3.30</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>7.16</Bulk>
-						<WorkToMake>35500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.55</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_TAR-21_Rifle</defName>
-					<statBases>
-						<Mass>3.27</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.05</SwayFactor>
-						<Bulk>7.20</Bulk>
-						<WorkToMake>38500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.49</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>59</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericBullpup_III</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== L119A2 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_C8CQB_Carbine</defName>
-					<statBases>
-						<Mass>2.91</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.5</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>8.76</Bulk>
-						<WorkToMake>35000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.51</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>48</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== CQ ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_TypeCQ_Rifle</defName>
-					<statBases>
-						<Mass>3.26</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.5</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>10.03</Bulk>
-						<WorkToMake>30000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR_IV</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== C7A1 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_C7A1_Rifle</defName>
-					<statBases>
-						<Mass>3.4</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.5</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>10.06</Bulk>
-						<WorkToMake>34000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR_IV</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== IWI ACE ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_IWIACE52_Rifle</defName>
-					<statBases>
-						<Mass>3.60</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.4</SwayFactor>
-						<Bulk>9.54</Bulk>
-						<WorkToMake>33000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.08</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>50</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericDMR_II</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== MD97 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_MD97_Rifle</defName>
-					<statBases>
-						<Mass>3.7</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>10.1</Bulk>
-						<WorkToMake>30000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR_IV</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== AK5 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_AK5C_Carbine</defName>
-					<statBases>
-						<Mass>4.08</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.5</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>9.14</Bulk>
-						<WorkToMake>34000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR_IV</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-				<!-- ========== CZ 805 BREN A2 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_CZ805BrenA2_Rifle</defName>
-					<statBases>
-						<Mass>3.60</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>7.92</Bulk>
-						<WorkToMake>31000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>48</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Heckler & Koch G36K ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_G36K_Rifle</defName>
-					<statBases>
-						<Mass>3.5</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.5</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>8.60</Bulk>
-						<WorkToMake>34000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.43</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShotG36C</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Beryl ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_FBBeryl_Rifle</defName>
-					<statBases>
-						<Mass>3.35</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>9.43</Bulk>
-						<WorkToMake>30000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.43</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>48</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== FAL Para ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_R1Para_Rifle</defName>
-					<statBases>
-						<Mass>4.20</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.52</SwayFactor>
-						<Bulk>10.14</Bulk>
-						<WorkToMake>29000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>55</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.08</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShotSCARH</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</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>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== FN FAL ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_FNFAL_Rifle</defName>
-					<statBases>
-						<Mass>4.30</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.52</SwayFactor>
-						<Bulk>10.90</Bulk>
-						<WorkToMake>29000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>55</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.08</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShotSCARH</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</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>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Romat FAL ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_RomatFAL_Rifle</defName>
-					<statBases>
-						<Mass>4.30</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.52</SwayFactor>
-						<Bulk>10.90</Bulk>
-						<WorkToMake>29000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>55</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.08</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShotSCARH</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</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>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_G3A2_Rifle</defName>
-					<statBases>
-						<WorkToMake>67500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.46</SwayFactor>
-						<Bulk>10.23</Bulk>
-						<Mass>4.40</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>65</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-						<Chemfuel>10</Chemfuel>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<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>
-						<soundCast>RNShot_GenericDMR_II</soundCast>
-						<soundCastTail>GunTail_Heavy</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>
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNGun_DDM4V11_Rifle" or
-						defName="RNGun_HK416_Rifle" or
-						defName="RNGun_LVOAC_Rifle" or
-						defName="RNGun_M16A2_Rifle" or
-						defName="RNGun_C8CQB_Carbine" or
-						defName="RNGun_TypeCQ_Rifle" or
-						defName="RNGun_IWIACE52_Rifle" or
-						defName="RNGun_C7A1_Rifle" or
-						defName="RNGun_MD97_Rifle" or
-						defName="RNGun_AK5C_Carbine" or
-						defName="RNGun_CZ805BrenA2_Rifle" or
-						defName="RNGun_FBBeryl_Rifle" or
-						defName="RNGun_R1Para_Rifle" or
-						defName="RNGun_FNFAL_Rifle" or
-						defName="RNGun_RomatFAL_Rifle" or
-						defName="RNGun_G36K_Rifle" or
-						defName="RNGun_M4A1_Rifle" or
-						defName="RNGun_F2000_Rifle" or
-						defName="RNGun_G3A2_Rifle" or
-						defName="RNGun_ACR_Rifle" or
-						defName="RNGun_TAR-21_Rifle"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_SMG.xml" "b/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_SMG.xml"
deleted file mode 100644
index 8444a44d07..0000000000
--- "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_SMG.xml"	
+++ /dev/null
@@ -1,651 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Rimmu-Nation² - Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== AK-74U ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_AK74U_SMG</defName>
-					<statBases>
-						<Mass>2.85</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.02</SwayFactor>
-						<Bulk>4.90</Bulk>
-						<WorkToMake>29000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>0.66</warmupTime>
-						<range>40</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>RNShotAK74USMG</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== MAC-10 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_MAC11_SMG</defName>
-					<statBases>
-						<Mass>1.59</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>1.89</SwayFactor>
-						<Bulk>2.48</Bulk>
-						<WorkToMake>24500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.99</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>RNShotMAC11SMG</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== KRISS Vector ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_KrissVector_PDW</defName>
-					<statBases>
-						<Mass>3.20</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.1</ShotSpread>
-						<SwayFactor>1.14</SwayFactor>
-						<Bulk>6.06</Bulk>
-						<WorkToMake>32000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.47</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>12</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>RNShotMP7SMG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== MP5A2 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_MP5A2_SMG</defName>
-					<statBases>
-						<Mass>2.50</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>0.93</SwayFactor>
-						<Bulk>6.80</Bulk>
-						<WorkToMake>27500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>26</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShotMP5SMG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== MP7A2 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_MP7A1_PDW</defName>
-					<statBases>
-						<Mass>1.96</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>0.87</SwayFactor>
-						<Bulk>4.15</Bulk>
-						<WorkToMake>29000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>30</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.37</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_46x30mm_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>25</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShotMP7SMG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_46x30mm</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== P90 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_P90_PDW</defName>
-					<statBases>
-						<Mass>2.60</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>0.8</SwayFactor>
-						<Bulk>5.05</Bulk>
-						<WorkToMake>37000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>30</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.05</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>31</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNP90Shot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_FN57x28mm</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== PPSh-41 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_PPSh41_SMG</defName>
-					<statBases>
-						<Mass>3.63</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.21</SwayFactor>
-						<Bulk>9.43</Bulk>
-						<WorkToMake>27500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.46</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>28</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShotAK74USMG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>71</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Skorpion vz. 61 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_SkorpionVZ61_SMG</defName>
-					<statBases>
-						<Mass>1.30</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.65</SwayFactor>
-						<Bulk>2.70</Bulk>
-						<WorkToMake>24500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.89</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_32ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>25</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShotSkorpionVZ</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_32ACP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Thompson SMG ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_ThompsonSubmachineGun_SMG</defName>
-					<statBases>
-						<Mass>4.90</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.35</SwayFactor>
-						<Bulk>8.60</Bulk>
-						<WorkToMake>27500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.32</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>25</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShotMP7SMG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== UMP45 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_UMP45_SMG</defName>
-					<statBases>
-						<Mass>2.50</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>0.94</SwayFactor>
-						<Bulk>4.50</Bulk>
-						<WorkToMake>30500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>30</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.85</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>25</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>RNUMP45Shot</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Uzi ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Uzi_SMG</defName>
-					<statBases>
-						<Mass>3.50</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>3.30</SwayFactor>
-						<Bulk>4.70</Bulk>
-						<WorkToMake>29500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>45</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.39</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>31</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>RNShotMAC11SMG</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Pepe-19 Bizon ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_PP19_SMG</defName>
-					<statBases>
-						<Mass>2.10</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>0.91</SwayFactor>
-						<Bulk>4.25</Bulk>
-						<WorkToMake>28000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>30</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.35</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x18mmMakarov_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShotSMG_II</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>64</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNGun_AK74U_SMG" or
-						defName="RNGun_MAC11_SMG" or
-						defName="RNGun_MP5A2_SMG" or
-						defName="RNGun_MP7A1_PDW" or
-						defName="RNGun_P90_PDW" or
-						defName="RNGun_PPSh41_SMG" or
-						defName="RNGun_SkorpionVZ61_SMG" or
-						defName="RNGun_ThompsonSubmachineGun_SMG" or
-						defName="RNGun_UMP45_SMG" or
-						defName="RNGun_PP19_SMG" or
-						defName="RNGun_Uzi_SMG" or
-						defName="RNGun_KrissVector_PDW"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Shotguns.xml" "b/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Shotguns.xml"
deleted file mode 100644
index c9afa7aff6..0000000000
--- "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Shotguns.xml"	
+++ /dev/null
@@ -1,675 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Rimmu-Nation² - Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== AA12 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_AA12_Shotgun</defName>
-					<statBases>
-						<Mass>5.20</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.49</SwayFactor>
-						<Bulk>10.66</Bulk>
-						<WorkToMake>33000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>55</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.26</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-						<soundCast>RNShotUSAS</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Remington 870 Magnum ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Remington870MCS_Shotgun</defName>
-					<statBases>
-						<Mass>3.40</Mass>
-						<RangedWeapon_Cooldown>1.00</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>9.78</Bulk>
-						<WorkToMake>1000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>RN870Shot</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Model 1897 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Model1897_Shotgun</defName>
-					<statBases>
-						<Mass>3.60</Mass>
-						<RangedWeapon_Cooldown>0.99</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.36</SwayFactor>
-						<Bulk>10.00</Bulk>
-						<WorkToMake>10000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>RNShotPumpShot</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== IZh43 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_IZh43_Shotgun</defName>
-					<statBases>
-						<Mass>3.30</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.36</SwayFactor>
-						<Bulk>8.25</Bulk>
-						<WorkToMake>7500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>RNShotSawnOff</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>2</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>1</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== StoegerCoachGun ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_StoegerCoachGun_Shotgun</defName>
-					<statBases>
-						<Mass>2.95</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.36</SwayFactor>
-						<Bulk>9.27</Bulk>
-						<WorkToMake>7500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>RNShotSawnOff</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>2</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>1</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Benelli Montefeltro ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_BenelliMontefeltro_Shotgun</defName>
-					<statBases>
-						<Mass>3.12</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.36</SwayFactor>
-						<Bulk>12.00</Bulk>
-						<WorkToMake>17500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>RNShotM1014S</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Mossberg 500 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Mossberg500_Shotgun</defName>
-					<statBases>
-						<Mass>3.40</Mass>
-						<RangedWeapon_Cooldown>1.00</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.45</SwayFactor>
-						<Bulk>12.07</Bulk>
-						<WorkToMake>11500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>55</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>RN870Shot</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Saiga-12 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Saiga12_Shotgun</defName>
-					<statBases>
-						<Mass>3.60</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>10.60</Bulk>
-						<WorkToMake>22500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>RNShotSAIGA</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== SPAS-12 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_SPAS12_Shotgun</defName>
-					<statBases>
-						<Mass>4.40</Mass>
-						<RangedWeapon_Cooldown>0.44</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.48</SwayFactor>
-						<Bulk>8.20</Bulk>
-						<WorkToMake>17500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>55</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>RNShotSPAS</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>9</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>0.8</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== USAS-12 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_USAS12_Shotgun</defName>
-					<statBases>
-						<Mass>5.45</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.51</SwayFactor>
-						<Bulk>9.60</Bulk>
-						<WorkToMake>30500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>55</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.36</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<soundCast>RNShotUSAS</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Spartan Marine ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_SpartanMarine_Shotgun</defName>
-					<statBases>
-						<Mass>3.30</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<Bulk>10.13</Bulk>
-						<WorkToMake>12000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>RNShotM1014S</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>3</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== M1014 / Benelli M4 Super 90 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M1014_Shotgun</defName>
-					<statBases>
-						<Mass>3.82</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>10.10</Bulk>
-						<WorkToMake>18000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>55</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>RNShotM1014S</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>0.8</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Pancor Jackhammer ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_PancorJackhammer_Shotgun</defName>
-					<statBases>
-						<Mass>7.90</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.58</SwayFactor>
-						<Bulk>7.87</Bulk>
-						<WorkToMake>33000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>60</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.94</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
-						<soundCast>RNShotUSAS</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<!-- shotguns with stocks -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNGun_AA12_Shotgun" or
-						defName="RNGun_Remington870MCS_Shotgun" or
-						defName="RNGun_Model1897_Shotgun" or
-						defName="RNGun_IZh43_Shotgun" or
-						defName="RNGun_StoegerCoachGun_Shotgun" or
-						defName="RNGun_BenelliMontefeltro_Shotgun" or
-						defName="RNGun_Mossberg500_Shotgun" or
-						defName="RNGun_Saiga12_Shotgun" or
-						defName="RNGun_SPAS12_Shotgun" or
-						defName="RNGun_USAS12_Shotgun" or
-						defName="RNGun_M1014_Shotgun" or
-						defName="RNGun_SpartanMarine_Shotgun" or
-						defName="RNGun_PancorJackhammer_Shotgun"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_Industrial.xml" "b/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_Industrial.xml"
deleted file mode 100644
index 213e1e3b13..0000000000
--- "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_Industrial.xml"	
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Rimmu-Nation² - Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- You can find the spreadsheet here https://drive.google.com/open?id=1JZAjvzealI189OofkxwUCif3yA4-u6yP3DilsmIEQJA -->
-
-				<!-- Chainsaw -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RHMelee_ECHO_Chainsaw"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>RHMelee_GenericChainsawStab</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>0.5</cooldownTime>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>RHMelee_GenericChainsawSlash</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>0.6</cooldownTime>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHMelee_ECHO_Chainsaw"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>0.20</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RHMelee_ECHO_Chainsaw"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.33</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<!-- Bat -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Baseball_Bat"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.46</cooldownTime>
-								<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>6.0</armorPenetrationBlunt>
-								<chanceFactor>2</chanceFactor>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_BrooklynSmasher_Bat"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.46</cooldownTime>
-								<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>6.0</armorPenetrationBlunt>
-								<chanceFactor>2</chanceFactor>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Baseball_Bat"]/statBases</xpath>
-					<value>
-						<Bulk>7.5</Bulk>
-						<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_BrooklynSmasher_Bat"]/statBases</xpath>
-					<value>
-						<Bulk>7.5</Bulk>
-						<MeleeCounterParryBonus>0.2</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Baseball_Bat"
-						or defName="RNMeleeWeapon_BrooklynSmasher_Bat"] </xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.5</MeleeCritChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-							<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_Machete_CE.xml" "b/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_Machete_CE.xml"
deleted file mode 100644
index c77bf8a556..0000000000
--- "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_Machete_CE.xml"	
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Rimmu-Nation² - Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- You can find the spreadsheet here https://drive.google.com/open?id=1JZAjvzealI189OofkxwUCif3yA4-u6yP3DilsmIEQJA -->
-
-				<!-- Machetey WARRIOR -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Spetsnaz_Machete"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.37</cooldownTime>
-								<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.37</cooldownTime>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.24</armorPenetrationSharp>
-								<chanceFactor>0.25</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>1.17</cooldownTime>
-								<armorPenetrationBlunt>1.512</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.55</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Spetsnaz_Machete"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Spetsnaz_Machete"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.29</MeleeCritChance>
-						<MeleeParryChance>0.35</MeleeParryChance>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Spetsnaz_Machete"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_TOPS_Machete" or defName="RNMeleeWeapon_GerberGator_Machete"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.37</cooldownTime>
-								<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.37</cooldownTime>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.24</armorPenetrationSharp>
-								<chanceFactor>0.25</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>1.33</cooldownTime>
-								<armorPenetrationBlunt>1.512</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.55</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_TOPS_Machete" or defName="RNMeleeWeapon_GerberGator_Machete"]/statBases</xpath>
-					<value>
-						<Bulk>4.5</Bulk>
-						<MeleeCounterParryBonus>0.43</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_TOPS_Machete" or defName="RNMeleeWeapon_GerberGator_Machete"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.29</MeleeCritChance>
-						<MeleeParryChance>0.4</MeleeParryChance>
-						<MeleeDodgeChance>0.3</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_TOPS_Machete" or defName="RNMeleeWeapon_GerberGator_Machete"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- Kukri -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Kukri_Machete"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.37</cooldownTime>
-								<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>1.37</cooldownTime>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.24</armorPenetrationSharp>
-								<chanceFactor>0.25</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>1.27</cooldownTime>
-								<armorPenetrationBlunt>1.512</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.55</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Kukri_Machete"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Kukri_Machete"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.29</MeleeCritChance>
-						<MeleeParryChance>0.35</MeleeParryChance>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Kukri_Machete"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_Research.xml" "b/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_Research.xml"
deleted file mode 100644
index 4978b842df..0000000000
--- "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_Research.xml"	
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Rimmu-Nation² - Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==================== Weapons research prerequisite patches ==================== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNGun_RPG7_RocketLauncher" or defName="RNGun_M79_GrenadeLauncher"]/recipeMaker/researchPrerequisite</xpath>
-					<value>
-						<researchPrerequisite>CE_Launchers</researchPrerequisite>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNGun_HK69A1_GrenadeLauncher"]/recipeMaker</xpath>
-					<value>
-						<researchPrerequisite>CE_Launchers</researchPrerequisite>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNGun_M72LAW_RocketLauncher"]/recipeMaker/skillRequirements</xpath>
-					<value>
-						<researchPrerequisite>CE_Launchers</researchPrerequisite>
-						<skillRequirements>
-							<Crafting>6</Crafting>
-						</skillRequirements>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNGun_M72LAW_RocketLauncher"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>50</Steel>
-							<ComponentIndustrial>3</ComponentIndustrial>
-							<FSX>3</FSX>
-						</costList>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_SmolKnifes_CE.xml" "b/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_SmolKnifes_CE.xml"
deleted file mode 100644
index 078291a243..0000000000
--- "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_SmolKnifes_CE.xml"	
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Rimmu-Nation² - Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- RimmuNaysh Y'all -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_EickhornRecondoIV_Knife"
-						or defName="RNMeleeWeapon_KABAR_Knife"
-						or defName="RNMeleeWeapon_M3Trench_Knife"
-						or defName="RNMeleeWeapon_FirstBlood_Knife"
-						or defName="RNMeleeWeapon_GerberSurvival_Knife"
-						or defName="RNMeleeWeapon_Karambit_Knife"
-						or defName="RNMeleeWeapon_M9Bayonet_Knife"]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.18</cooldownTime>
-								<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.32</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.26</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.42</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_EickhornRecondoIV_Knife"
-						or defName="RNMeleeWeapon_KABAR_Knife"
-						or defName="RNMeleeWeapon_M3Trench_Knife"
-						or defName="RNMeleeWeapon_FirstBlood_Knife"
-						or defName="RNMeleeWeapon_GerberSurvival_Knife"
-						or defName="RNMeleeWeapon_Karambit_Knife"
-						or defName="RNMeleeWeapon_M9Bayonet_Knife"]/statBases </xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_EickhornRecondoIV_Knife"
-						or defName="RNMeleeWeapon_KABAR_Knife"
-						or defName="RNMeleeWeapon_M3Trench_Knife"
-						or defName="RNMeleeWeapon_FirstBlood_Knife"
-						or defName="RNMeleeWeapon_GerberSurvival_Knife"
-						or defName="RNMeleeWeapon_Karambit_Knife"
-						or defName="RNMeleeWeapon_M9Bayonet_Knife"] </xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.5</MeleeCritChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-							<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_EickhornRecondoIV_Knife"
-						or defName="RNMeleeWeapon_KABAR_Knife"
-						or defName="RNMeleeWeapon_M3Trench_Knife"
-						or defName="RNMeleeWeapon_FirstBlood_Knife"
-						or defName="RNMeleeWeapon_GerberSurvival_Knife"
-						or defName="RNMeleeWeapon_Karambit_Knife"
-						or defName="RNMeleeWeapon_M9Bayonet_Knife"]/weaponTags </xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Tanto_Sword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.22</cooldownTime>
-								<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.34</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.29</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.44</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Tanto_Sword"]/statBases</xpath>
-					<value>
-						<Bulk>1.5</Bulk>
-						<MeleeCounterParryBonus>0.18</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Tanto_Sword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.4</MeleeCritChance>
-							<MeleeParryChance>0.2</MeleeParryChance>
-							<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Tanto_Sword"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_Swords_CE.xml" "b/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_Swords_CE.xml"
deleted file mode 100644
index a6467ee753..0000000000
--- "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_Swords_CE.xml"	
+++ /dev/null
@@ -1,270 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Rimmu-Nation² - Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === One-handed Tags === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "RNMeleeWeapon_Maximus_Spatha"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- === Katana === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Mizutori_Katana" or defName="RNMeleeWeapon_Fudoshin_Katana" or defName="RNMeleeWeapon_Yanmaodao_Saber"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.33</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.936</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.33</cooldownTime>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>0.936</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.88</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>31</power>
-								<cooldownTime>1.28</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>2.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.65</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Mizutori_Katana" or defName="RNMeleeWeapon_Fudoshin_Katana" or defName="RNMeleeWeapon_Yanmaodao_Saber"]/statBases</xpath>
-					<value>
-						<Bulk>7.85</Bulk>
-						<MeleeCounterParryBonus>1.38</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Mizutori_Katana" or defName="RNMeleeWeapon_Fudoshin_Katana" or defName="RNMeleeWeapon_Yanmaodao_Saber"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.86</MeleeCritChance>
-							<MeleeParryChance>0.69</MeleeParryChance>
-							<MeleeDodgeChance>0.37</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- === I Hanjo === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Hanzo_Katana"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.33</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.936</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>1.33</cooldownTime>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>0.936</armorPenetrationBlunt>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>32</power>
-								<cooldownTime>1.28</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>2.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Hanzo_Katana"]/statBases</xpath>
-					<value>
-						<Bulk>7.85</Bulk>
-						<MeleeCounterParryBonus>1.56</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Hanzo_Katana"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.44</MeleeCritChance>
-							<MeleeParryChance>0.69</MeleeParryChance>
-							<MeleeDodgeChance>0.37</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- === Spatha === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Maximus_Spatha"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.18</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.339</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>1.39</cooldownTime>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>0.339</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.48</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.33</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>0.717</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.36</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Maximus_Spatha"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>0.43</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_Maximus_Spatha"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.30</MeleeCritChance>
-							<MeleeParryChance>0.35</MeleeParryChance>
-							<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- === Z-Killer Sword === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_ZKiller_Sword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.18</cooldownTime>
-								<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.32</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.26</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.42</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_ZKiller_Sword"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<MeleeCounterParryBonus>0.23</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNMeleeWeapon_ZKiller_Sword"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.30</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-						<MeleeDodgeChance>0.08</MeleeDodgeChance>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/Rm2_CE_AirSupport.xml" "b/Patches/RH2 Rimmu-Nation\302\262 - Weapons/Rm2_CE_AirSupport.xml"
deleted file mode 100644
index 8f85249a93..0000000000
--- "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/Rm2_CE_AirSupport.xml"	
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RH2] Rimmu-Nation² - Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RN_SOFLAM_AirSupport"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li>
-								<verbClass>Verb_Bombardment</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<warmupTime>3</warmupTime>
-								<ai_AvoidFriendlyFireRadius>20</ai_AvoidFriendlyFireRadius>
-								<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-								<range>69.9</range>
-								<burstShotCount>1</burstShotCount>
-								<soundAiming>OrbitalTargeter_Aiming</soundAiming>
-								<soundCast>OrbitalTargeter_Fire</soundCast>
-								<onlyManualCast>true</onlyManualCast>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RN_OrbitalUtilityBase"]/statBases</xpath>
-					<value>
-						<Bulk>1.5</Bulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RWY Dragon's Descent Void Dwellers/Ability Defs/Shoot_Breath_SpaceDragons.xml b/Patches/RWY Dragon's Descent Void Dwellers/Ability Defs/Shoot_Breath_SpaceDragons.xml
deleted file mode 100644
index 01edb55b0a..0000000000
--- a/Patches/RWY Dragon's Descent Void Dwellers/Ability Defs/Shoot_Breath_SpaceDragons.xml	
+++ /dev/null
@@ -1,251 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RWY]Dragon's Descent: Void Dwellers</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Void Dragon Breath -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_Void_Breath"]/range</xpath>
-					<value>
-						<range>60</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_Void_Breath"]/castTime</xpath>
-					<value>
-						<castTime>1.6</castTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_Void_Breath"]</xpath>
-					<value>
-						<minRange>4</minRange>
-					</value>
-				</li>
-
-				<!-- Nebula dragon Breath -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_Nebula_Breath"]/range</xpath>
-					<value>
-						<range>55</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_Nebula_Breath"]</xpath>
-					<value>
-						<minRange>8</minRange>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_Nebula_Breath"]/castTime</xpath>
-					<value>
-						<castTime>2.5</castTime>
-					</value>
-				</li>
-
-				<!-- Aurelion Dragon Breath -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_Aurelion_Breath"]/range</xpath>
-					<value>
-						<range>60</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_Aurelion_Breath"]</xpath>
-					<value>
-						<minRange>9</minRange>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_Aurelion_Breath"]/castTime</xpath>
-					<value>
-						<castTime>2.0</castTime>
-					</value>
-				</li>
-
-				<!-- Star Dust Breath -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_Stardust_Breath"]/range</xpath>
-					<value>
-						<range>43</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_Stardust_Breath"]</xpath>
-					<value>
-						<minRange>3</minRange>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_Stardust_Breath"]/castTime</xpath>
-					<value>
-						<castTime>2.5</castTime>
-					</value>
-				</li>
-
-				<!-- Molten Breath -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_Molten_Breath"]/range</xpath>
-					<value>
-						<range>36</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_Molten_Breath"]</xpath>
-					<value>
-						<minRange>5</minRange>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_Molten_Breath"]/castTime</xpath>
-					<value>
-						<castTime>3.0</castTime>
-					</value>
-				</li>
-
-				<!-- Surge Breath -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_DD_Surge_Breath"]/range</xpath>
-					<value>
-						<range>36</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_DD_Surge_Breath"]/castTime</xpath>
-					<value>
-						<castTime>1.5</castTime>
-					</value>
-				</li>
-
-				<!-- Mind Flay Breath -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_DD_Mind_Flay"]/range</xpath>
-					<value>
-						<range>36</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_DD_Mind_Flay"]</xpath>
-					<value>
-						<minRange>6</minRange>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_DD_Mind_Flay"]/castTime</xpath>
-					<value>
-						<castTime>3.0</castTime>
-					</value>
-				</li>
-
-				<!-- Hellfire Breath -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_DD_Hellfire"]/range</xpath>
-					<value>
-						<range>36</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_DD_Hellfire"]</xpath>
-					<value>
-						<minRange>3</minRange>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_DD_Hellfire"]/castTime</xpath>
-					<value>
-						<castTime>2.5</castTime>
-					</value>
-				</li>
-
-				<!-- Eclipse Breath -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_DD_Eclipse"]/range</xpath>
-					<value>
-						<range>60</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_DD_Eclipse"]</xpath>
-					<value>
-						<minRange>6</minRange>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_DD_Eclipse"]/castTime</xpath>
-					<value>
-						<castTime>3.5</castTime>
-					</value>
-				</li>
-
-				<!-- Constrain Breath -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_DD_Constrain"]/range</xpath>
-					<value>
-						<range>30</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_DD_Constrain"]</xpath>
-					<value>
-						<minRange>3</minRange>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_DD_Constrain"]/castTime</xpath>
-					<value>
-						<castTime>2</castTime>
-					</value>
-				</li>
-
-				<!-- Constrain Breath -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_DD_Rend"]/range</xpath>
-					<value>
-						<range>48</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_DD_Rend"]</xpath>
-					<value>
-						<minRange>5</minRange>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="Projectile_DD_Rend"]/castTime</xpath>
-					<value>
-						<castTime>1.5</castTime>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RWY Dragon's Descent Void Dwellers/Bodies/Bodies_SpaceDragons.xml b/Patches/RWY Dragon's Descent Void Dwellers/Bodies/Bodies_SpaceDragons.xml
deleted file mode 100644
index 2a30ee7b2b..0000000000
--- a/Patches/RWY Dragon's Descent Void Dwellers/Bodies/Bodies_SpaceDragons.xml	
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RWY]Dragon's Descent: Void Dwellers</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Natural Armor -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="BipedAnimalWithoutWingsDragon"]//*[
-						def="Body" or
-						def="MiddleBodySegment"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="BipedAnimalWithoutWingsDragon"]//*[
-						def="Body" or
-						def="Tail" or
-						def="Neck" or
-						def="Head" or
-						def="Ear" or
-						def="Nose" or
-						def="Horn" or
-						def="Shoulder" or
-						def="AnimalJaw" or
-						def="Arm" or
-						def="MiddleBodySegment" or
-						def="FrontClaw" or
-						def="Paw"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="BipedAnimalWithWingsDragon"]//*[
-						def="Body" or
-						def="MiddleBodySegment"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="BipedAnimalWithWingsDragon"]//*[
-						def="Body" or
-						def="Wing" or
-						def="Tail" or
-						def="Neck" or
-						def="Head" or
-						def="Ear" or
-						def="Nose" or
-						def="Horn" or
-						def="Shoulder" or
-						def="AnimalJaw" or
-						def="Arm" or
-						def="MiddleBodySegment" or
-						def="FrontClaw" or
-						def="Paw"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RWY Dragon's Descent Void Dwellers/DamageDefs/Void_DamageDefs.xml b/Patches/RWY Dragon's Descent Void Dwellers/DamageDefs/Void_DamageDefs.xml
deleted file mode 100644
index b247c71514..0000000000
--- a/Patches/RWY Dragon's Descent Void Dwellers/DamageDefs/Void_DamageDefs.xml	
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RWY]Dragon's Descent: Void Dwellers</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<DamageDef>
-							<defName>Void_Bomb</defName>
-							<label>The void</label>
-							<workerClass>DamageWorker_AddInjury</workerClass>
-							<externalViolence>true</externalViolence>
-							<isExplosive>true</isExplosive>
-							<deathMessage>{0} is consumed by the void.</deathMessage>
-							<hediff>Shredded</hediff>
-							<hediffSolid>Crack</hediffSolid>
-							<harmAllLayersUntilOutside>true</harmAllLayersUntilOutside>
-							<canUseDeflectMetalEffect>false</canUseDeflectMetalEffect>
-							<armorCategory>Blunt</armorCategory>
-							<minDamageToFragment>15</minDamageToFragment>
-							<defaultDamage>36</defaultDamage>
-							<defaultStoppingPower>2.0</defaultStoppingPower>
-							<defaultArmorPenetration>90</defaultArmorPenetration>
-							<buildingDamageFactor>4</buildingDamageFactor>
-							<plantDamageFactor>4</plantDamageFactor>
-							<explosionAffectOutsidePartsOnly>false</explosionAffectOutsidePartsOnly>
-							<explosionHeatEnergyPerCell>1</explosionHeatEnergyPerCell>
-							<explosionCellFleck>Mote_VoidExplosion</explosionCellFleck>
-							<explosionColorCenter>(1, 0.5, 0.3)</explosionColorCenter>
-							<explosionColorEdge>(0.6, 0.5, 0.4)</explosionColorEdge>
-							<soundExplosion>Explosion_Bomb</soundExplosion>
-							<combatLogRules>Damage_Bomb</combatLogRules>
-						</DamageDef>
-
-						<DamageDef>
-							<defName>Void_Arururu</defName>
-							<label>Molten</label>
-							<workerClass>DamageWorker_AddInjury</workerClass>
-							<externalViolence>true</externalViolence>
-							<isExplosive>true</isExplosive>
-							<deathMessage>{0} is moltened.</deathMessage>
-							<hediff>Shredded</hediff>
-							<hediffSolid>Crack</hediffSolid>
-							<harmAllLayersUntilOutside>true</harmAllLayersUntilOutside>
-							<canUseDeflectMetalEffect>false</canUseDeflectMetalEffect>
-							<armorCategory>Blunt</armorCategory>
-							<minDamageToFragment>15</minDamageToFragment>
-							<defaultDamage>58</defaultDamage>
-							<defaultStoppingPower>3.0</defaultStoppingPower>
-							<defaultArmorPenetration>140</defaultArmorPenetration>
-							<buildingDamageFactor>4</buildingDamageFactor>
-							<plantDamageFactor>4</plantDamageFactor>
-							<explosionAffectOutsidePartsOnly>false</explosionAffectOutsidePartsOnly>
-							<explosionHeatEnergyPerCell>1</explosionHeatEnergyPerCell>
-							<explosionCellFleck>Mote_StarExplosion</explosionCellFleck>
-							<explosionColorCenter>(1, 0.5, 0.3)</explosionColorCenter>
-							<explosionColorEdge>(0.6, 0.5, 0.4)</explosionColorEdge>
-							<soundExplosion>Explosion_Bomb</soundExplosion>
-							<combatLogRules>Damage_Bomb</combatLogRules>
-						</DamageDef>
-
-						<DamageDef>
-							<defName>Void_Molten</defName>
-							<label>Molten</label>
-							<workerClass>DamageWorker_AddInjury</workerClass>
-							<externalViolence>true</externalViolence>
-							<isExplosive>true</isExplosive>
-							<deathMessage>{0} is moltened.</deathMessage>
-							<hediff>Shredded</hediff>
-							<hediffSolid>Crack</hediffSolid>
-							<harmAllLayersUntilOutside>true</harmAllLayersUntilOutside>
-							<canUseDeflectMetalEffect>false</canUseDeflectMetalEffect>
-							<armorCategory>Blunt</armorCategory>
-							<minDamageToFragment>15</minDamageToFragment>
-							<defaultDamage>40</defaultDamage>
-							<defaultStoppingPower>3.0</defaultStoppingPower>
-							<defaultArmorPenetration>140</defaultArmorPenetration>
-							<buildingDamageFactor>4</buildingDamageFactor>
-							<plantDamageFactor>4</plantDamageFactor>
-							<explosionAffectOutsidePartsOnly>false</explosionAffectOutsidePartsOnly>
-							<explosionHeatEnergyPerCell>1</explosionHeatEnergyPerCell>
-							<explosionCellFleck>Mote_MoltenExplosion</explosionCellFleck>
-							<explosionColorCenter>(1, 0.5, 0.3)</explosionColorCenter>
-							<explosionColorEdge>(0.6, 0.5, 0.4)</explosionColorEdge>
-							<soundExplosion>Explosion_Bomb</soundExplosion>
-							<combatLogRules>Damage_Bomb</combatLogRules>
-						</DamageDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RWY Dragon's Descent Void Dwellers/Projectiles/Projectile_SpaceDragon.xml b/Patches/RWY Dragon's Descent Void Dwellers/Projectiles/Projectile_SpaceDragon.xml
deleted file mode 100644
index f8a6e3625c..0000000000
--- a/Patches/RWY Dragon's Descent Void Dwellers/Projectiles/Projectile_SpaceDragon.xml	
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RWY]Dragon's Descent: Void Dwellers</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Void Breath -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Projectile_Void_Breath"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Projectile_Void_Breath"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<speed>36</speed>
-							<flyOverhead>false</flyOverhead>
-							<damageDef>Void_Bomb</damageDef>
-							<soundExplode>DD_Void_DarkExplosion</soundExplode>
-							<explosionRadius>3.3</explosionRadius>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-						</projectile>
-					</value>
-				</li>
-
-				<!-- Nebula Breath -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Projectile_Nebula_Breath"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Projectile_Nebula_Breath"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<speed>44</speed>
-							<flyOverhead>false</flyOverhead>
-							<damageDef>NebulaFlame</damageDef>
-							<damageAmountBase>19</damageAmountBase>
-							<soundExplode>DD_Void_DarkExplosion</soundExplode>
-							<explosionRadius>2.1</explosionRadius>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-						</projectile>
-					</value>
-				</li>
-
-				<!-- Arururulion Breath -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Projectile_Aurelion_Breath"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Projectile_Aurelion_Breath"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<speed>58</speed>
-							<flyOverhead>false</flyOverhead>
-							<damageDef>Void_Arururu</damageDef>
-							<soundExplode>DD_Void_DarkExplosion</soundExplode>
-							<explosionRadius>3.3</explosionRadius>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-						</projectile>
-					</value>
-				</li>
-
-				<!-- Stardust Breath -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Projectile_Stardust_Breath"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Projectile_Stardust_Breath"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<speed>42</speed>
-							<flyOverhead>false</flyOverhead>
-							<damageDef>EMP</damageDef>
-							<damageAmountBase>9</damageAmountBase>
-							<soundExplode>DD_Void_DarkExplosion</soundExplode>
-							<explosionRadius>3.3</explosionRadius>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-						</projectile>
-					</value>
-				</li>
-
-				<!-- Molten Breath -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Projectile_Molten_Breath"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Projectile_Molten_Breath"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<speed>48</speed>
-							<flyOverhead>false</flyOverhead>
-							<damageDef>Void_Molten</damageDef>
-							<soundExplode>DD_Void_DarkExplosion</soundExplode>
-							<explosionRadius>4.1</explosionRadius>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-						</projectile>
-					</value>
-				</li>
-
-				<!-- Surge Breath -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Projectile_DD_Surge_Breath"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Projectile_DD_Surge_Breath"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<speed>48</speed>
-							<flyOverhead>false</flyOverhead>
-							<damageDef>DD_Void_Surge</damageDef>
-							<soundExplode>DD_Void_DarkExplosion</soundExplode>
-							<explosionRadius>1.5</explosionRadius>
-							<damageAmountBase>1</damageAmountBase>
-							<armorPenetrationBase>20.0</armorPenetrationBase>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-						</projectile>
-					</value>
-				</li>
-
-				<!-- Mind Flay Breath -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Projectile_DD_Mind_Flay"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Projectile_DD_Mind_Flay"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<speed>48</speed>
-							<flyOverhead>false</flyOverhead>
-							<damageDef>DD_Mind_Flay</damageDef>
-							<soundExplode>DD_Void_DarkExplosion</soundExplode>
-							<damageAmountBase>1</damageAmountBase>
-							<armorPenetrationBase>20.0</armorPenetrationBase>
-							<explosionRadius>2</explosionRadius>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-						</projectile>
-					</value>
-				</li>
-
-				<!-- Hellfire Breath -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Projectile_DD_Hellfire"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Projectile_DD_Hellfire"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<speed>34</speed>
-							<flyOverhead>false</flyOverhead>
-							<damageDef>DD_Hellfire</damageDef>
-							<soundExplode>DD_Void_DarkExplosion</soundExplode>
-							<ai_IsIncendiary>false</ai_IsIncendiary>
-							<explosionRadius>3</explosionRadius>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-						</projectile>
-					</value>
-				</li>
-
-				<!-- Eclipse Breath -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Projectile_DD_Eclipse"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Projectile_DD_Eclipse"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<speed>88</speed>
-							<flyOverhead>false</flyOverhead>
-							<damageDef>DD_Eclipse</damageDef>
-							<soundExplode>DD_Void_DarkExplosion</soundExplode>
-							<explosionRadius>2</explosionRadius>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-						</projectile>
-					</value>
-				</li>
-
-				<!-- Rend Breath -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Projectile_DD_Rend"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Projectile_DD_Rend"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<speed>34</speed>
-							<flyOverhead>false</flyOverhead>
-							<damageDef>DD_Rend</damageDef>
-							<soundExplode>DD_Void_DarkExplosion</soundExplode>
-							<explosionRadius>5</explosionRadius>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-						</projectile>
-					</value>
-				</li>
-
-				<!-- Constrain Breath -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Projectile_DD_Constrain"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Projectile_DD_Constrain"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<speed>48</speed>
-							<flyOverhead>false</flyOverhead>
-							<damageDef>DD_Constrain</damageDef>
-							<soundExplode>DD_Void_DarkExplosion</soundExplode>
-							<damageAmountBase>1</damageAmountBase>
-							<armorPenetrationBase>20.0</armorPenetrationBase>
-							<explosionRadius>2.5</explosionRadius>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-						</projectile>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RWY Dragon's Descent Void Dwellers/ThingDefs_Items/Items_Resource_SpaceDragon.xml b/Patches/RWY Dragon's Descent Void Dwellers/ThingDefs_Items/Items_Resource_SpaceDragon.xml
deleted file mode 100644
index 1b1e1db43a..0000000000
--- a/Patches/RWY Dragon's Descent Void Dwellers/ThingDefs_Items/Items_Resource_SpaceDragon.xml	
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RWY]Dragon's Descent: Void Dwellers</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Dragon_Leather === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DD_AbyssalPearl"]/statBases/StuffPower_Armor_Sharp</xpath>
-
-					<value>
-						<StuffPower_Armor_Sharp>0.807</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DD_AbyssalPearl"]/statBases/StuffPower_Armor_Blunt</xpath>
-
-					<value>
-						<StuffPower_Armor_Blunt>0.42</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DD_AbyssalPearl"]/statBases/StuffPower_Armor_Heat</xpath>
-
-					<value>
-						<StuffPower_Armor_Heat>0.16</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DD_AbyssalPearl"]/statBases/BluntDamageMultiplier</xpath>
-
-					<value>
-						<BluntDamageMultiplier>1.4</BluntDamageMultiplier>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DD_AbyssalPearl"]/stuffProps/statFactors</xpath>
-
-					<value>
-						<MeleePenetrationFactor>1.5</MeleePenetrationFactor>
-					</value>
-				</li>
-
-				<!-- === Rich_Dragon_Leather === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DD_BrittleStar"]/statBases/StuffPower_Armor_Sharp</xpath>
-
-					<value>
-						<StuffPower_Armor_Sharp>0.03</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DD_BrittleStar"]/statBases/StuffPower_Armor_Blunt</xpath>
-
-					<value>
-						<StuffPower_Armor_Blunt>0.02</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DD_BrittleStar"]/statBases/StuffPower_Armor_Heat</xpath>
-
-					<value>
-						<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RWY Dragon's Descent Void Dwellers/ThingDefs_Races/Races_Animal_SpaceDragon_Base.xml b/Patches/RWY Dragon's Descent Void Dwellers/ThingDefs_Races/Races_Animal_SpaceDragon_Base.xml
deleted file mode 100644
index 26fcaed373..0000000000
--- a/Patches/RWY Dragon's Descent Void Dwellers/ThingDefs_Races/Races_Animal_SpaceDragon_Base.xml	
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RWY]Dragon's Descent: Void Dwellers</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======== BaseDragon (Dragon Base) ======== -->
-				<!-- ====== ModExtension ====== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="VoidDragonRaceBase" or @Name="NebulaDragonRaceBase" or @Name="AurelionDragonRaceBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- ======== Void Base ======== -->
-				<!-- ====== statBases ====== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="VoidDragonRaceBase" or @Name="VoidDragonWWRaceBase"]/statBases/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.24</MeleeDodgeChance>
-						<MeleeCritChance>2</MeleeCritChance>
-						<MeleeParryChance>0.64</MeleeParryChance>
-						<SightsEfficiency>1</SightsEfficiency>
-						<AimingAccuracy>1</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="VoidDragonRaceBase" or @Name="VoidDragonWWRaceBase" or @Name="NebulaDragonRaceBase" or @Name="StarDragonRaceBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>50</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="VoidDragonRaceBase" or @Name="VoidDragonWWRaceBase" or @Name="NebulaDragonRaceBase" or @Name="StarDragonRaceBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="NebulaDragonRaceBase"]/statBases/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.57</MeleeDodgeChance>
-						<MeleeCritChance>1.1</MeleeCritChance>
-						<MeleeParryChance>0.36</MeleeParryChance>
-						<SightsEfficiency>1</SightsEfficiency>
-						<AimingAccuracy>1</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="StarDragonRaceBase"]/statBases/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.66</MeleeDodgeChance>
-						<MeleeCritChance>1.56</MeleeCritChance>
-						<MeleeParryChance>0.64</MeleeParryChance>
-						<SightsEfficiency>1</SightsEfficiency>
-						<AimingAccuracy>1</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-					</value>
-				</li>
-
-				<!-- Natural Armor Comp -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="VoidDragonRaceBase" or @Name="VoidDragonWWRaceBase"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>16500</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="NebulaDragonRaceBase"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>15250</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="StarDragonRaceBase"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>14000</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<!-- ====== race (Race Properties) ====== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="VoidDragonRaceBase"]/race/manhunterOnTameFailChance</xpath>
-					<value>
-						<manhunterOnTameFailChance>0.6</manhunterOnTameFailChance>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RWY Dragon's Descent Void Dwellers/ThingDefs_Races/Races_SpaceDragon_Attacks.xml b/Patches/RWY Dragon's Descent Void Dwellers/ThingDefs_Races/Races_SpaceDragon_Attacks.xml
deleted file mode 100644
index 8665dcdf6c..0000000000
--- a/Patches/RWY Dragon's Descent Void Dwellers/ThingDefs_Races/Races_SpaceDragon_Attacks.xml	
+++ /dev/null
@@ -1,825 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[RWY]Dragon's Descent: Void Dwellers</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====== Tools ====== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Purple_Nebula_Dragon" or
-						defName="Blue_Nebula_Dragon" or
-						defName="Red_Nebula_Dragon" or
-						defName="EH_Void_Dragon" or
-						defName="Destroyer_Void_Dragon" or
-						defName="Eater_Void_Dragon" or
-						defName="Harbinger_Void_Dragon" or
-						defName="Rurelion_Zol_Dragon"]/tools
-					</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>DD_Knockback</label>
-								<capacities>
-									<li>DD_Knockback</li>
-								</capacities>
-								<power>110</power>
-								<armorPenetrationBlunt>115</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-								<cooldownTime>4.0</cooldownTime>
-								<linkedBodyPartsGroup>Tail</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ====== Tools ====== -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/ThingDef[
-						defName="Purple_Nebula_Dragon" or
-						defName="Blue_Nebula_Dragon" or
-						defName="Red_Nebula_Dragon" or
-						defName="EH_Void_Dragon" or
-						defName="Destroyer_Void_Dragon" or
-						defName="Eater_Void_Dragon" or
-						defName="Harbinger_Void_Dragon" or
-						defName="Rurelion_Zol_Dragon"]/tools
-					</xpath>
-					<value>
-						<li Class="CombatExtended.ToolCE">
-							<cooldownTime>4.66</cooldownTime>
-							<power>107</power>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<surpriseAttack>
-								<extraMeleeDamages>
-									<li>
-										<def>Stun</def>
-										<amount>20</amount>
-									</li>
-								</extraMeleeDamages>
-							</surpriseAttack>
-							<linkedBodyPartsGroup>Tail</linkedBodyPartsGroup>
-							<label>tail</label>
-							<armorPenetrationBlunt>54.611</armorPenetrationBlunt>
-						</li>
-					</value>
-				</li>
-
-				<!-- ====== Tools ====== -->
-				<!-- ====== Purple Neb====== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Purple_Nebula_Dragon"]/tools</xpath>
-					<value>
-						<li Class="CombatExtended.ToolCE">
-							<label>left dragonclaw</label>
-							<capacities>
-								<li>Scratch</li>
-								<li>Stab</li>
-								<li>Cut</li>
-							</capacities>
-							<power>30</power>
-							<extraMeleeDamages>
-								<li>
-									<def>NebulaFlame</def>
-									<amount>8</amount>
-									<chance>0.33</chance>
-								</li>
-							</extraMeleeDamages>
-							<cooldownTime>1.3</cooldownTime>
-							<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-							<armorPenetrationSharp>16</armorPenetrationSharp>
-							<armorPenetrationBlunt>40</armorPenetrationBlunt>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>right dragonclaw</label>
-							<capacities>
-								<li>Scratch</li>
-								<li>Stab</li>
-								<li>Cut</li>
-							</capacities>
-							<power>30</power>
-							<extraMeleeDamages>
-								<li>
-									<def>NebulaFlame</def>
-									<amount>8</amount>
-									<chance>0.33</chance>
-								</li>
-							</extraMeleeDamages>
-							<cooldownTime>1.3</cooldownTime>
-							<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-							<armorPenetrationSharp>16</armorPenetrationSharp>
-							<armorPenetrationBlunt>40</armorPenetrationBlunt>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>razorfangs</label>
-							<capacities>
-								<li>Bite</li>
-								<li>Stab</li>
-							</capacities>
-							<power>56</power>
-							<extraMeleeDamages>
-								<li>
-									<def>NebulaFlame</def>
-									<amount>12</amount>
-									<chance>0.33</chance>
-								</li>
-							</extraMeleeDamages>
-							<cooldownTime>2.4</cooldownTime>
-							<armorPenetrationSharp>28</armorPenetrationSharp>
-							<armorPenetrationBlunt>80</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-							<chanceFactor>0.75</chanceFactor>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>head</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>24</power>
-							<extraMeleeDamages>
-								<li>
-									<def>NebulaFlame</def>
-									<amount>12</amount>
-									<chance>0.33</chance>
-								</li>
-							</extraMeleeDamages>
-							<cooldownTime>3</cooldownTime>
-							<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-							<armorPenetrationBlunt>30.55</armorPenetrationBlunt>
-							<chanceFactor>0.6</chanceFactor>
-						</li>
-					</value>
-				</li>
-
-				<!-- ====== Blue Neb Neb====== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Blue_Nebula_Dragon" or defName="Red_Nebula_Dragon"]/tools</xpath>
-					<value>
-						<li Class="CombatExtended.ToolCE">
-							<label>left dragonclaw</label>
-							<capacities>
-								<li>Scratch</li>
-								<li>Stab</li>
-								<li>Cut</li>
-							</capacities>
-							<power>36</power>
-							<extraMeleeDamages>
-								<li>
-									<def>NebulaFlame</def>
-									<amount>9</amount>
-									<chance>0.33</chance>
-								</li>
-							</extraMeleeDamages>
-							<cooldownTime>1.3</cooldownTime>
-							<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-							<armorPenetrationSharp>16</armorPenetrationSharp>
-							<armorPenetrationBlunt>40</armorPenetrationBlunt>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>right dragonclaw</label>
-							<capacities>
-								<li>Scratch</li>
-								<li>Stab</li>
-								<li>Cut</li>
-							</capacities>
-							<power>36</power>
-							<extraMeleeDamages>
-								<li>
-									<def>NebulaFlame</def>
-									<amount>9</amount>
-									<chance>0.33</chance>
-								</li>
-							</extraMeleeDamages>
-							<cooldownTime>1.3</cooldownTime>
-							<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-							<armorPenetrationSharp>16</armorPenetrationSharp>
-							<armorPenetrationBlunt>40</armorPenetrationBlunt>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>razorfangs</label>
-							<capacities>
-								<li>Bite</li>
-								<li>Stab</li>
-							</capacities>
-							<power>64</power>
-							<extraMeleeDamages>
-								<li>
-									<def>NebulaFlame</def>
-									<amount>15</amount>
-									<chance>0.33</chance>
-								</li>
-							</extraMeleeDamages>
-							<cooldownTime>2.4</cooldownTime>
-							<armorPenetrationSharp>28</armorPenetrationSharp>
-							<armorPenetrationBlunt>80</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-							<chanceFactor>0.75</chanceFactor>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>head</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>24</power>
-							<extraMeleeDamages>
-								<li>
-									<def>NebulaFlame</def>
-									<amount>15</amount>
-									<chance>0.33</chance>
-								</li>
-							</extraMeleeDamages>
-							<cooldownTime>3</cooldownTime>
-							<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-							<armorPenetrationBlunt>30.55</armorPenetrationBlunt>
-							<chanceFactor>0.6</chanceFactor>
-						</li>
-					</value>
-				</li>
-
-				<!-- ====== Void====== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="EH_Void_Dragon"]/tools</xpath>
-					<value>
-						<li Class="CombatExtended.ToolCE">
-							<label>left dragonclaw</label>
-							<capacities>
-								<li>Scratch</li>
-								<li>Stab</li>
-								<li>Cut</li>
-							</capacities>
-							<power>64</power>
-							<cooldownTime>1.64</cooldownTime>
-							<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-							<armorPenetrationSharp>24</armorPenetrationSharp>
-							<armorPenetrationBlunt>80</armorPenetrationBlunt>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>right dragonclaw</label>
-							<capacities>
-								<li>Scratch</li>
-								<li>Stab</li>
-								<li>Cut</li>
-							</capacities>
-							<power>64</power>
-							<cooldownTime>1.64</cooldownTime>
-							<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-							<armorPenetrationSharp>24</armorPenetrationSharp>
-							<armorPenetrationBlunt>80</armorPenetrationBlunt>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>razorfangs</label>
-							<capacities>
-								<li>Bite</li>
-								<li>Stab</li>
-							</capacities>
-							<power>148</power>
-							<cooldownTime>3.4</cooldownTime>
-							<armorPenetrationSharp>32</armorPenetrationSharp>
-							<armorPenetrationBlunt>80</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-							<chanceFactor>0.75</chanceFactor>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>head</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>43</power>
-							<cooldownTime>3</cooldownTime>
-							<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-							<armorPenetrationBlunt>80.55</armorPenetrationBlunt>
-							<chanceFactor>0.6</chanceFactor>
-						</li>
-					</value>
-				</li>
-
-				<!-- ======Supah Destroya====== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Destroyer_Void_Dragon" or defName="Eater_Void_Dragon"]/tools</xpath>
-					<value>
-						<li Class="CombatExtended.ToolCE">
-							<label>left dragonclaw</label>
-							<capacities>
-								<li>Scratch</li>
-								<li>Stab</li>
-								<li>Cut</li>
-							</capacities>
-							<power>101</power>
-							<cooldownTime>1.64</cooldownTime>
-							<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-							<armorPenetrationSharp>36</armorPenetrationSharp>
-							<armorPenetrationBlunt>136</armorPenetrationBlunt>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>right dragonclaw</label>
-							<capacities>
-								<li>Scratch</li>
-								<li>Stab</li>
-								<li>Cut</li>
-							</capacities>
-							<power>101</power>
-							<cooldownTime>1.64</cooldownTime>
-							<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-							<armorPenetrationSharp>36</armorPenetrationSharp>
-							<armorPenetrationBlunt>136</armorPenetrationBlunt>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>razorfangs</label>
-							<capacities>
-								<li>Bite</li>
-								<li>Stab</li>
-							</capacities>
-							<power>208</power>
-							<cooldownTime>3.4</cooldownTime>
-							<armorPenetrationSharp>60</armorPenetrationSharp>
-							<armorPenetrationBlunt>300</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-							<chanceFactor>0.75</chanceFactor>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>head</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>60</power>
-							<cooldownTime>3</cooldownTime>
-							<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-							<armorPenetrationBlunt>150.55</armorPenetrationBlunt>
-							<chanceFactor>0.6</chanceFactor>
-						</li>
-					</value>
-				</li>
-				<!-- ======The End====== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Harbinger_Void_Dragon"]/tools</xpath>
-					<value>
-						<li Class="CombatExtended.ToolCE">
-							<label>left dragonclaw</label>
-							<capacities>
-								<li>Scratch</li>
-								<li>Stab</li>
-								<li>Cut</li>
-							</capacities>
-							<power>144</power>
-							<cooldownTime>1.64</cooldownTime>
-							<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-							<armorPenetrationSharp>44</armorPenetrationSharp>
-							<armorPenetrationBlunt>200</armorPenetrationBlunt>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>right dragonclaw</label>
-							<capacities>
-								<li>Scratch</li>
-								<li>Stab</li>
-								<li>Cut</li>
-							</capacities>
-							<power>144</power>
-							<cooldownTime>1.64</cooldownTime>
-							<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-							<armorPenetrationSharp>44</armorPenetrationSharp>
-							<armorPenetrationBlunt>200</armorPenetrationBlunt>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>razorfangs</label>
-							<capacities>
-								<li>Bite</li>
-								<li>Stab</li>
-							</capacities>
-							<power>288</power>
-							<cooldownTime>3.4</cooldownTime>
-							<armorPenetrationSharp>80</armorPenetrationSharp>
-							<armorPenetrationBlunt>600</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-							<chanceFactor>0.75</chanceFactor>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>head</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>80</power>
-							<cooldownTime>3</cooldownTime>
-							<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-							<armorPenetrationBlunt>240.55</armorPenetrationBlunt>
-							<chanceFactor>0.6</chanceFactor>
-						</li>
-					</value>
-				</li>
-				<!-- ======Zol====== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Rurelion_Zol_Dragon"]/tools</xpath>
-					<value>
-						<li Class="CombatExtended.ToolCE">
-							<label>left dragonclaw</label>
-							<capacities>
-								<li>Scratch</li>
-								<li>Stab</li>
-								<li>Cut</li>
-							</capacities>
-							<power>88</power>
-							<cooldownTime>1.44</cooldownTime>
-							<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-							<armorPenetrationSharp>32</armorPenetrationSharp>
-							<armorPenetrationBlunt>120</armorPenetrationBlunt>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>right dragonclaw</label>
-							<capacities>
-								<li>Scratch</li>
-								<li>Stab</li>
-								<li>Cut</li>
-							</capacities>
-							<power>88</power>
-							<cooldownTime>1.44</cooldownTime>
-							<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-							<armorPenetrationSharp>32</armorPenetrationSharp>
-							<armorPenetrationBlunt>120</armorPenetrationBlunt>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>razorfangs</label>
-							<capacities>
-								<li>Bite</li>
-								<li>Stab</li>
-							</capacities>
-							<power>188</power>
-							<cooldownTime>3.0</cooldownTime>
-							<armorPenetrationSharp>55</armorPenetrationSharp>
-							<armorPenetrationBlunt>248</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-							<chanceFactor>0.75</chanceFactor>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>head</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>43</power>
-							<cooldownTime>3</cooldownTime>
-							<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-							<armorPenetrationBlunt>100.55</armorPenetrationBlunt>
-							<chanceFactor>0.6</chanceFactor>
-						</li>
-					</value>
-				</li>
-
-				<!-- ====== Verbs ====== -->
-				<!-- Purple, Blue, and Red Nebula Dragons -->
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName="Purple_Nebula_Dragon" or
-						defName="Blue_Nebula_Dragon" or
-						defName="Red_Nebula_Dragon"]/verbs
-					</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Projectile_Nebula_Breath</defaultProjectile>
-								<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-								<warmupTime>2.5</warmupTime>
-								<burstShotCount>33</burstShotCount>
-								<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-								<minRange>8</minRange>
-								<range>55</range>
-								<soundCast>DD_Void_FireBreath</soundCast>
-								<muzzleFlashScale>4</muzzleFlashScale>
-								<label>Nebula breath</label>
-								<commonality>0.7</commonality>
-								<recoilAmount>0.48</recoilAmount>
-								<recoilPattern>Mounted</recoilPattern>
-							</li>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-								<defaultProjectile>Projectile_Stardust_Breath</defaultProjectile>
-								<warmupTime>2.5</warmupTime>
-								<burstShotCount>5</burstShotCount>
-								<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-								<minRange>3</minRange>
-								<range>43</range>
-								<soundCast>DD_Void_FireBreath</soundCast>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<label>Stardust breath</label>
-								<commonality>0.7</commonality>
-								<recoilAmount>0.4</recoilAmount>
-								<recoilPattern>Mounted</recoilPattern>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Event Horizon Void Dragons -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="EH_Void_Dragon"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Projectile_Void_Breath</defaultProjectile>
-								<warmupTime>1.6</warmupTime>
-								<burstShotCount>15</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>4</minRange>
-								<range>60</range>
-								<soundCast>DD_Void_FireBreath</soundCast>
-								<muzzleFlashScale>5</muzzleFlashScale>
-								<label>Void Breath</label>
-								<commonality>0.7</commonality>
-								<recoilPattern>Mounted</recoilPattern>
-							</li>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Projectile_Molten_Breath</defaultProjectile>
-								<warmupTime>3.0</warmupTime>
-								<burstShotCount>8</burstShotCount>
-								<ticksBetweenBurstShots>11</ticksBetweenBurstShots>
-								<minRange>5</minRange>
-								<range>36</range>
-								<soundCast>DD_Void_FireBreath</soundCast>
-								<muzzleFlashScale>16</muzzleFlashScale>
-								<label>Molten Spit</label>
-								<commonality>0.3</commonality>
-								<recoilAmount>1</recoilAmount>
-								<recoilPattern>Mounted</recoilPattern>
-							</li>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Projectile_DD_Eclipse</defaultProjectile>
-								<warmupTime>3.5</warmupTime>
-								<minRange>6</minRange>
-								<range>60</range>
-								<burstShotCount>8</burstShotCount>
-								<ticksBetweenBurstShots>11</ticksBetweenBurstShots>
-								<soundCast>DD_Void_FireBreath</soundCast>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<label>Eclipse</label>
-								<commonality>0.13</commonality>
-								<recoilAmount>1</recoilAmount>
-								<recoilPattern>Mounted</recoilPattern>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Destroyer Void Dragons -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Destroyer_Void_Dragon"]/verbs
-					</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Projectile_Void_Breath</defaultProjectile>
-								<warmupTime>1.6</warmupTime>
-								<burstShotCount>15</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>4</minRange>
-								<range>60</range>
-								<soundCast>DD_Void_FireBreath</soundCast>
-								<muzzleFlashScale>5</muzzleFlashScale>
-								<label>Void Breath</label>
-								<commonality>0.7</commonality>
-								<recoilPattern>Mounted</recoilPattern>
-							</li>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Projectile_Molten_Breath</defaultProjectile>
-								<warmupTime>3.0</warmupTime>
-								<burstShotCount>8</burstShotCount>
-								<ticksBetweenBurstShots>11</ticksBetweenBurstShots>
-								<minRange>5</minRange>
-								<range>36</range>
-								<soundCast>DD_Void_FireBreath</soundCast>
-								<muzzleFlashScale>16</muzzleFlashScale>
-								<label>Molten Spit</label>
-								<commonality>0.3</commonality>
-								<recoilAmount>1</recoilAmount>
-								<recoilPattern>Mounted</recoilPattern>
-							</li>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Projectile_DD_Hellfire</defaultProjectile>
-								<warmupTime>2.5</warmupTime>
-								<minRange>3</minRange>
-								<range>36</range>
-								<burstShotCount>10</burstShotCount>
-								<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-								<soundCast>DD_Void_FireBreath</soundCast>
-								<muzzleFlashScale>16</muzzleFlashScale>
-								<label>Hellfire</label>
-								<commonality>0.33</commonality>
-								<recoilAmount>1</recoilAmount>
-								<recoilPattern>Mounted</recoilPattern>
-							</li>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Projectile_DD_Rend</defaultProjectile>
-								<warmupTime>1.5</warmupTime>
-								<minRange>5</minRange>
-								<range>48</range>
-								<burstShotCount>14</burstShotCount>
-								<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-								<soundCast>DD_Void_FireBreath</soundCast>
-								<muzzleFlashScale>2</muzzleFlashScale>
-								<label>Rend</label>
-								<commonality>0.15</commonality>
-								<recoilAmount>1.2</recoilAmount>
-								<recoilPattern>Mounted</recoilPattern>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Eater Void Dragons -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Eater_Void_Dragon"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Projectile_Void_Breath</defaultProjectile>
-								<warmupTime>1.6</warmupTime>
-								<burstShotCount>15</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>4</minRange>
-								<range>60</range>
-								<soundCast>DD_Void_FireBreath</soundCast>
-								<muzzleFlashScale>5</muzzleFlashScale>
-								<label>Void Breath</label>
-								<commonality>0.7</commonality>
-								<recoilPattern>Mounted</recoilPattern>
-							</li>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Projectile_DD_Rend</defaultProjectile>
-								<warmupTime>1.5</warmupTime>
-								<minRange>5</minRange>
-								<range>48</range>
-								<burstShotCount>14</burstShotCount>
-								<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-								<soundCast>DD_Void_FireBreath</soundCast>
-								<muzzleFlashScale>6</muzzleFlashScale>
-								<label>Rend</label>
-								<commonality>0.15</commonality>
-								<recoilAmount>1.2</recoilAmount>
-								<recoilPattern>Mounted</recoilPattern>
-							</li>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Projectile_DD_Constrain</defaultProjectile>
-								<warmupTime>2</warmupTime>
-								<minRange>3</minRange>
-								<range>30</range>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-								<soundCast>DD_Void_FireBreath</soundCast>
-								<muzzleFlashScale>6</muzzleFlashScale>
-								<label>Constrain</label>
-								<commonality>0.11</commonality>
-								<recoilAmount>0.6</recoilAmount>
-								<recoilPattern>Mounted</recoilPattern>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Harbinger Void Dragons -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Harbinger_Void_Dragon"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Projectile_Void_Breath</defaultProjectile>
-								<warmupTime>1.6</warmupTime>
-								<burstShotCount>15</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>4</minRange>
-								<range>60</range>
-								<soundCast>DD_Void_FireBreath</soundCast>
-								<muzzleFlashScale>5</muzzleFlashScale>
-								<label>Void Breath</label>
-								<commonality>0.7</commonality>
-								<recoilPattern>Mounted</recoilPattern>
-							</li>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Projectile_DD_Surge_Breath</defaultProjectile>
-								<warmupTime>1.5</warmupTime>
-								<burstShotCount>3</burstShotCount>
-								<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-								<range>36</range>
-								<soundCast>DD_Void_FireBreath</soundCast>
-								<muzzleFlashScale>5</muzzleFlashScale>
-								<label>Void Surge</label>
-								<commonality>0.01</commonality>
-								<recoilAmount>0.3</recoilAmount>
-								<recoilPattern>Mounted</recoilPattern>
-							</li>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Projectile_DD_Mind_Flay</defaultProjectile>
-								<warmupTime>3</warmupTime>
-								<burstShotCount>3</burstShotCount>
-								<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-								<minRange>6</minRange>
-								<range>36</range>
-								<soundCast>DD_Void_FireBreath</soundCast>
-								<muzzleFlashScale>5</muzzleFlashScale>
-								<label>Mind Flay</label>
-								<commonality>0.33</commonality>
-								<recoilAmount>0.3</recoilAmount>
-								<recoilPattern>Mounted</recoilPattern>
-							</li>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Projectile_DD_Constrain</defaultProjectile>
-								<warmupTime>2</warmupTime>
-								<minRange>3</minRange>
-								<range>30</range>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-								<soundCast>DD_Void_FireBreath</soundCast>
-								<muzzleFlashScale>6</muzzleFlashScale>
-								<label>Constrain</label>
-								<commonality>0.11</commonality>
-								<recoilAmount>0.6</recoilAmount>
-								<recoilPattern>Mounted</recoilPattern>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Aurelion Sol Dragons -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Rurelion_Zol_Dragon"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-								<defaultProjectile>Projectile_Stardust_Breath</defaultProjectile>
-								<warmupTime>2.5</warmupTime>
-								<burstShotCount>5</burstShotCount>
-								<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-								<minRange>3</minRange>
-								<range>43</range>
-								<soundCast>DD_Void_FireBreath</soundCast>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<label>Stardust breath</label>
-								<commonality>0.7</commonality>
-								<recoilAmount>0.4</recoilAmount>
-								<recoilPattern>Mounted</recoilPattern>
-							</li>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-								<defaultProjectile>Projectile_Aurelion_Breath</defaultProjectile>
-								<warmupTime>2.0</warmupTime>
-								<burstShotCount>5</burstShotCount>
-								<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-								<minRange>9</minRange>
-								<range>60</range>
-								<soundCast>DD_Void_FireBreath</soundCast>
-								<muzzleFlashScale>11</muzzleFlashScale>
-								<label>Rurelion breath</label>
-								<commonality>0.3</commonality>
-								<recoilAmount>0.76</recoilAmount>
-								<recoilPattern>Mounted</recoilPattern>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rabbie The Moonrabbit/Bodies/Rabbie_Bodytype.xml b/Patches/Rabbie The Moonrabbit/Bodies/Rabbie_Bodytype.xml
deleted file mode 100644
index afefe42ebc..0000000000
--- a/Patches/Rabbie The Moonrabbit/Bodies/Rabbie_Bodytype.xml	
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-
-			<!--Rabbie Bodytype-->
-
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Rabbie The Moonrabbit</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--Arm Groups-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Rabbie"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
-							<value>
-								<li>LeftArm</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Rabbie"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
-							<value>
-								<li>RightArm</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Rabbie"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
-							<value>
-								<li>LeftShoulder</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Rabbie"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
-							<value>
-								<li>RightShoulder</li>
-							</value>
-						</li>
-
-						<!--Natural Armor-->
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Rabbie"]/corePart/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Rabbie"]/corePart/parts/li[def="RB_RabbitTail"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Rabbie"]/corePart/parts/li[def="Neck"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Rabbie"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Rabbie"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Rabbie"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Rabbie"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Rabbie"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Rabbie"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Rabbie"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Rabbie"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Rabbie"]/corePart/parts/li[def="Leg"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Rabbie"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="Rabbie"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rabbie The Moonrabbit/PawnKindDefs/RB_PawnKind.xml b/Patches/Rabbie The Moonrabbit/PawnKindDefs/RB_PawnKind.xml
deleted file mode 100644
index 24e9096edc..0000000000
--- a/Patches/Rabbie The Moonrabbit/PawnKindDefs/RB_PawnKind.xml	
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Rabbie The Moonrabbit race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--Backpack-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/PawnKindDef[
-								defName="RB_Wanderer" or
-								defName="RB_SubOfficer" or
-								defName="RB_EliteOfficer" or
-								defName="RB_FSniper" or
-								defName="RB_FMachinegunner"
-								]/apparelRequired </xpath>
-							<value>
-								<li>CE_Apparel_Backpack</li>
-							</value>
-						</li>
-
-						<!--Regular-->
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[defName="RB_EnergySupply" or
-								defName="RB_Technician" or
-								defName="RB_Worker" or
-								defName="RB_Wanderer" or
-								defName="RB_SubOfficer" or
-								defName="RB_EliteOfficer"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>3</max>
-									</primaryMagazineCount>
-									<sidearms>
-										<li>
-											<generateChance>0.2</generateChance>
-											<sidearmMoney>
-												<min>20</min>
-												<max>120</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_Sidearm_Melee</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</value>
-						</li>
-
-						<!--Military-->
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[defName="RB_FRifle"]</xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>6</min>
-										<max>8</max>
-									</primaryMagazineCount>
-									<sidearms>
-										<li>
-											<generateChance>1</generateChance>
-											<sidearmMoney>
-												<min>50</min>
-												<max>200</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_Sidearm_Melee</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[defName="RB_FSniper"]</xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>3</min>
-										<max>5</max>
-									</primaryMagazineCount>
-									<sidearms>
-										<li>
-											<generateChance>1</generateChance>
-											<sidearmMoney>
-												<min>60</min>
-												<max>150</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_Sidearm_Melee</li>
-											</weaponTags>
-										</li>
-										<li>
-											<generateChance>0.5</generateChance>
-											<sidearmMoney>
-												<min>50</min>
-												<max>250</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_Sidearm</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[defName="RB_FMachinegunner"]</xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>4</min>
-										<max>6</max>
-									</primaryMagazineCount>
-									<sidearms>
-										<li>
-											<generateChance>1</generateChance>
-											<sidearmMoney>
-												<min>50</min>
-												<max>200</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_Sidearm_Melee</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</value>
-						</li>
-
-						<!--Replace minigun with MG Catergory-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/PawnKindDef[defName="RB_FMachinegunner"]/weaponTags</xpath>
-							<value>
-								<weaponTags>
-									<li>CE_MachineGun</li>
-								</weaponTags>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/PawnKindDef[defName="RB_FMachinegunner"]/weaponMoney</xpath>
-							<value>
-								<weaponMoney>
-									<min>500</min>
-									<max>600</max>
-								</weaponMoney>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[defName="RB_FSapper"]</xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>10</min>
-										<max>30</max>
-									</primaryMagazineCount>
-									<shieldMoney>
-										<min>200</min>
-										<max>600</max>
-									</shieldMoney>
-									<shieldTags>
-										<li>OutlanderShield</li>
-									</shieldTags>
-									<shieldChance>0.5</shieldChance>
-									<forcedSidearm>
-										<sidearmMoney>
-											<min>150</min>
-											<max>350</max>
-										</sidearmMoney>
-										<weaponTags>
-											<li>CE_Sidearm</li>
-										</weaponTags>
-										<magazineCount>
-											<min>0</min>
-											<max>1</max>
-										</magazineCount>
-									</forcedSidearm>
-								</li>
-							</value>
-						</li>
-
-						<!--Advanced-->
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[defName="RB_RGunner"]</xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>6</min>
-										<max>8</max>
-									</primaryMagazineCount>
-									<sidearms>
-										<li>
-											<generateChance>0.5</generateChance>
-											<sidearmMoney>
-												<min>120</min>
-												<max>500</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_Sidearm_Melee</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rabbie The Moonrabbit/Scenario/RB_Scenario.xml b/Patches/Rabbie The Moonrabbit/Scenario/RB_Scenario.xml
deleted file mode 100644
index cec1d46df2..0000000000
--- a/Patches/Rabbie The Moonrabbit/Scenario/RB_Scenario.xml	
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Rabbie The Moonrabbit race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ScenarioDef[defName="RB_Scenario"]/scenario/parts</xpath>
-							<value>
-								<li Class="ScenPart_StartingThing_Defined">
-									<def>StartingThing_Defined</def>
-									<thingDef>Ammo_46x30mm_FMJ</thingDef>
-									<count>90</count>
-								</li>
-								<li Class="ScenPart_StartingThing_Defined">
-									<def>StartingThing_Defined</def>
-									<thingDef>Ammo_303British_FMJ</thingDef>
-									<count>100</count>
-								</li>
-								<li Class="ScenPart_StartingThing_Defined">
-									<def>StartingThing_Defined</def>
-									<thingDef>Ammo_44Magnum_FMJ</thingDef>
-									<count>60</count>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ScenarioDef[defName="RB_Scenario"]/scenario/parts/li[thingDef="Apparel_FlakVest"]</xpath>
-							<value>
-								<li Class="ScenPart_StartingThing_Defined">
-									<def>StartingThing_Defined</def>
-									<thingDef>Apparel_FlakVest</thingDef>
-									<stuff>Steel</stuff>
-									<count>1</count>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ScenarioDef[defName="RB_Scenario"]/scenario/parts/li[thingDef="Apparel_AdvancedHelmet"]</xpath>
-							<value>
-								<li Class="ScenPart_StartingThing_Defined">
-									<def>StartingThing_Defined</def>
-									<thingDef>Apparel_AdvancedHelmet</thingDef>
-									<count>1</count>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/FactionDef[@Name="RB_PlayerFactionBase"]/apparelStuffFilter</xpath>
-							<match Class="PatchOperationConditional">
-								<xpath>Defs/FactionDef[@Name="RB_PlayerFactionBase"]/apparelStuffFilter/thingDefs</xpath>
-								<match Class="PatchOperationConditional">
-									<xpath>Defs/FactionDef[@Name="RB_PlayerFactionBase"]/apparelStuffFilter/thingDefs/li["Steel"]</xpath>
-									<match Class="PatchOperationReplace">
-										<xpath>Defs/FactionDef[@Name="RB_PlayerFactionBase"]/apparelStuffFilter/thingDefs/li["Steel"]</xpath>
-										<value>
-											<li>Steel</li>
-										</value>
-									</match>
-									<nomatch Class="PatchOperationAdd">
-										<xpath>Defs/FactionDef[@Name="RB_PlayerFactionBase"]/apparelStuffFilter/thingDefs</xpath>
-										<value>
-											<li>Steel</li>
-										</value>
-									</nomatch>
-								</match>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/FactionDef[@Name="RB_PlayerFactionBase"]/apparelStuffFilter</xpath>
-									<value>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</value>
-								</nomatch>
-							</match>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/FactionDef[@Name="RB_PlayerFactionBase"]</xpath>
-								<value>
-									<apparelStuffFilter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</apparelStuffFilter>
-								</value>
-							</nomatch>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rabbie The Moonrabbit/ThingDefs_Items/Items_Resource_Stuff.xml b/Patches/Rabbie The Moonrabbit/ThingDefs_Items/Items_Resource_Stuff.xml
deleted file mode 100644
index c272181e2c..0000000000
--- a/Patches/Rabbie The Moonrabbit/ThingDefs_Items/Items_Resource_Stuff.xml	
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Rabbie The Moonrabbit race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moonthread"]/statBases/StuffPower_Armor_Sharp</xpath>
-							<value>
-								<StuffPower_Armor_Sharp>0.2</StuffPower_Armor_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moonthread"]/statBases/StuffPower_Armor_Blunt</xpath>
-							<value>
-								<StuffPower_Armor_Blunt>0.05</StuffPower_Armor_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moonthread"]/statBases/StuffPower_Armor_Heat</xpath>
-							<value>
-								<StuffPower_Armor_Heat>0.008</StuffPower_Armor_Heat>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moonsilk"]/statBases/StuffPower_Armor_Sharp</xpath>
-							<value>
-								<StuffPower_Armor_Sharp>1</StuffPower_Armor_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moonsilk"]/statBases/StuffPower_Armor_Blunt</xpath>
-							<value>
-								<StuffPower_Armor_Blunt>1.5</StuffPower_Armor_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Moonsilk"]/statBases/StuffPower_Armor_Heat</xpath>
-							<value>
-								<StuffPower_Armor_Heat>0.5</StuffPower_Armor_Heat>
-								<StuffPower_Armor_Electric>0.08</StuffPower_Armor_Electric>
-								<Bulk>0.2</Bulk>
-								<WornBulk>0.5</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moonsilk"]/stuffProps/statFactors</xpath>
-							<value>
-								<Mass>1.3</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Moonsilk"]/stuffProps/categories</xpath>
-							<value>
-								<li>SoftArmor</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rabbie The Moonrabbit/ThingDefs_Misc/RB_Apparel.xml b/Patches/Rabbie The Moonrabbit/ThingDefs_Misc/RB_Apparel.xml
deleted file mode 100644
index 3eb083c07f..0000000000
--- a/Patches/Rabbie The Moonrabbit/ThingDefs_Misc/RB_Apparel.xml	
+++ /dev/null
@@ -1,463 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Rabbie The Moonrabbit race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--========= Regular =========-->
-
-						<!--Stuffable Thin-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RB_Camisole"]/statBases</xpath>
-							<value>
-								<Bulk>0.5</Bulk>
-								<WornBulk>0.25</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RB_CasualTshirt" or
-								defName="RB_Casualribbonshirt" or
-								defName="RB_Summerfit" or
-								defName="RB_Casualtieshirt" or
-								defName="RB_Fashionhat"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<!--Mid-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RB_Apron" or
-								defName="RB_Winterknit" or
-								defName="RB_Winterhat" or
-								defName="RB_Metalpot" or
-								defName="RB_Neckscarf"
-								]/statBases </xpath>
-							<value>
-								<Bulk>3</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RB_Apron" or
-								defName="RB_Winterknit" or
-								defName="RB_Winterhat" or
-								defName="RB_Metalpot" or
-								defName="RB_Neckscarf"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<!--Thick-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RB_Earjacket" or
-								defName="RB_Starjacket" or
-								defName="RB_Blazer" or
-								defName="RB_Winterouter"
-								]/statBases </xpath>
-							<value>
-								<Bulk>5</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RB_Earjacket" or
-								defName="RB_Starjacket" or
-								defName="RB_Blazer" or
-								defName="RB_Winterouter"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<!--========= Moonthread Only =========-->
-
-						<!--Thin 1.5mm Moonthread-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RB_Subofficer" or
-								defName="RB_Subofficerhat" or
-								defName="RB_Summerouter" or
-								defName="RB_Summerhat" or
-								defName="RB_Energymanager" or
-								defName="RB_Cookwear" or
-								defName="RB_Cookhat" or
-								defName="RB_Technician" or
-								defName="RB_Handygirl"
-								]/statBases/ArmorRating_Sharp </xpath>
-							<value>
-								<ArmorRating_Sharp>0.3</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RB_Subofficer" or
-								defName="RB_Subofficerhat" or
-								defName="RB_Summerouter" or
-								defName="RB_Summerhat" or
-								defName="RB_Energymanager" or
-								defName="RB_Cookwear" or
-								defName="RB_Cookhat" or
-								defName="RB_Technician" or
-								defName="RB_Handygirl"
-								]/statBases/ArmorRating_Blunt </xpath>
-							<value>
-								<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RB_Subofficer" or
-								defName="RB_Subofficerhat" or
-								defName="RB_Summerouter" or
-								defName="RB_Summerhat" or
-								defName="RB_Energymanager" or
-								defName="RB_Cookwear" or
-								defName="RB_Cookhat" or
-								defName="RB_Technician" or
-								defName="RB_Handygirl"
-								]/statBases/ArmorRating_Heat </xpath>
-							<value>
-								<ArmorRating_Heat>0.012</ArmorRating_Heat>
-							</value>
-						</li>
-
-						<!--Thick 5mm Moonthread-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RB_SeniorOfficer" or
-								defName="RB_HighCloak" or
-								defName="RB_SeniorOfficerhat" or
-								defName="RB_Energygown" or
-								defName="RB_Inteligown"
-								]/statBases/ArmorRating_Sharp </xpath>
-							<value>
-								<ArmorRating_Sharp>1</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RB_SeniorOfficer" or
-								defName="RB_HighCloak" or
-								defName="RB_SeniorOfficerhat" or
-								defName="RB_Energygown" or
-								defName="RB_Inteligown"
-								]/statBases/ArmorRating_Blunt </xpath>
-							<value>
-								<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RB_SeniorOfficer" or
-								defName="RB_HighCloak" or
-								defName="RB_SeniorOfficerhat" or
-								defName="RB_Energygown" or
-								defName="RB_Inteligown"
-								]/statBases/ArmorRating_Heat </xpath>
-							<value>
-								<ArmorRating_Heat>0.04</ArmorRating_Heat>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RB_SeniorOfficer" or
-								defName="RB_HighCloak" or
-								defName="RB_SeniorOfficerhat" or
-								defName="RB_Energygown" or
-								defName="RB_Inteligown"
-								]/statBases </xpath>
-							<value>
-								<Bulk>5</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<!--========= Other =========-->
-
-						<!--Safehat. 3mm Steel; 4mm Blunt resistance-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RB_Safehelmet"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>3</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RB_Safehelmet"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>6</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RB_Safehelmet"]/statBases/ArmorRating_Heat</xpath>
-							<value>
-								<ArmorRating_Heat>0</ArmorRating_Heat>
-							</value>
-						</li>
-
-						<!--Infantry Uniform 2.5mm Moonthread/1mm Composite-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RB_Safehelmet"]/statBases</xpath>
-							<value>
-								<Bulk>12</Bulk>
-								<WornBulk>5</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RB_Infantryuniform" or defName="RB_Infantrynewuniform"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>2.25</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RB_Infantryuniform" or defName="RB_Infantrynewuniform"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>2.75</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RB_Infantryuniform" or defName="RB_Infantrynewuniform"]/statBases/ArmorRating_Heat</xpath>
-							<value>
-								<ArmorRating_Heat>0.02</ArmorRating_Heat>
-							</value>
-						</li>
-
-						<!--Infantry Helmet 6mm Steel/1.5mm Plasteel. Composite heat protection.-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RB_Infantryhelmet"]/statBases</xpath>
-							<value>
-								<Bulk>3</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RB_Infantryhelmet"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>9</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RB_Infantryhelmet"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>12</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RB_Infantryhelmet"]/statBases/ArmorRating_Heat</xpath>
-							<value>
-								<ArmorRating_Heat>0.56</ArmorRating_Heat>
-							</value>
-						</li>
-
-						<!--Infantry Vest, Composite Protection-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RB_Infantryvest"]/statBases</xpath>
-							<value>
-								<Bulk>12</Bulk>
-								<WornBulk>6</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RB_Infantryvest"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>14</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RB_Infantryvest"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>21</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RB_Infantryvest"]/statBases/ArmorRating_Heat</xpath>
-							<value>
-								<ArmorRating_Heat>0.56</ArmorRating_Heat>
-							</value>
-						</li>
-
-						<!--Increase Mass, remove movespeed offset-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RB_Infantryvest"]/statBases/Mass</xpath>
-							<value>
-								<Mass>10</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="RB_Infantryvest"]/equippedStatOffsets/MoveSpeed</xpath>
-						</li>
-
-						<!--Replace ranged cooldown with tacvest function-->
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="RB_Infantryvest"]/equippedStatOffsets/RangedCooldownFactor</xpath>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RB_Infantryvest"]/equippedStatOffsets</xpath>
-							<value>
-								<CarryBulk>30</CarryBulk>
-								<ReloadSpeed>0.1</ReloadSpeed>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RB_Infantryvest"]/apparel/layers</xpath>
-							<value>
-								<li>Webbing</li>
-							</value>
-						</li>
-
-						<!--Regular Army Powerarmor, 12mm Power Armor-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RB_RegularInfantrySuit"]/statBases</xpath>
-							<value>
-								<Bulk>12</Bulk>
-								<WornBulk>6</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RB_RegularInfantrySuit"]/statBases/Mass</xpath>
-							<value>
-								<Mass>50</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RB_RegularInfantrySuit"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>24</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RB_RegularInfantrySuit"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>54</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="RB_RegularInfantrySuit"]/equippedStatOffsets/MoveSpeed</xpath>
-						</li>
-
-						<!--Replace Ranged Cooldown with Power armor functions-->
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="RB_RegularInfantrySuit"]/equippedStatOffsets/RangedCooldownFactor</xpath>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RB_RegularInfantrySuit"]/equippedStatOffsets</xpath>
-							<value>
-								<CarryBulk>10</CarryBulk>
-								<ReloadSpeed>0.10</ReloadSpeed>
-								<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-								<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-								<CarryWeight>60</CarryWeight>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RB_RegularInfantrySuit"]/costList/Plasteel</xpath>
-							<value>
-								<Plasteel>190</Plasteel>
-								<DevilstrandCloth>50</DevilstrandCloth>
-							</value>
-						</li>
-
-						<!--Regular Army Helmet, 10mm Power Armor-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RB_RegularInfantryhelmet"]/statBases</xpath>
-							<value>
-								<Bulk>5</Bulk>
-								<WornBulk>2</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RB_RegularInfantryhelmet"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>20</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RB_RegularInfantryhelmet"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>45</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--Replace handling bonus with power armor helmet functions-->
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="RB_RegularInfantryhelmet"]/apparel/immuneToToxGasExposure</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="RB_RegularInfantryhelmet"]/apparel</xpath>
-								<value>
-									<immuneToToxGasExposure>true</immuneToToxGasExposure>
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RB_RegularInfantryhelmet"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-							<value>
-								<AimingAccuracy>0.15</AimingAccuracy>
-								<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-								<SmokeSensitivity>-1</SmokeSensitivity>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RB_RegularInfantryhelmet"]/costList/Plasteel</xpath>
-							<value>
-								<Plasteel>80</Plasteel>
-								<DevilstrandCloth>25</DevilstrandCloth>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rabbie The Moonrabbit/ThingDefs_Misc/Weapons_Guns.xml b/Patches/Rabbie The Moonrabbit/ThingDefs_Misc/Weapons_Guns.xml
deleted file mode 100644
index 24e827000e..0000000000
--- a/Patches/Rabbie The Moonrabbit/ThingDefs_Misc/Weapons_Guns.xml	
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rabbie The Moonrabbit race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==========  PDW - MP7  =========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RB_F_PDW</defName>
-					<statBases>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>0.83</SwayFactor>
-						<Bulk>4.15</Bulk>
-						<Mass>1.90</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<recoilAmount>1.31</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_46x30mm_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<range>31</range>
-						<soundCast>ShotRBPDW</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_46x30mm</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RB_F_PDW"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rabbie The Moonrabbit/ThingDefs_Races/AlienRace_Rabbielike.xml b/Patches/Rabbie The Moonrabbit/ThingDefs_Races/AlienRace_Rabbielike.xml
deleted file mode 100644
index 4fbb534cd0..0000000000
--- a/Patches/Rabbie The Moonrabbit/ThingDefs_Races/AlienRace_Rabbielike.xml	
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Rabbie The Moonrabbit race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[@Name="RB_PawnBase"]/comps</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[@Name="RB_PawnBase"]</xpath>
-								<value>
-									<comps />
-								</value>
-							</nomatch>
-							<match Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[@Name="RB_PawnBase"]</xpath>
-								<value>
-								</value>
-							</match>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="RB_PawnBase"]/comps</xpath>
-							<value>
-								<li>
-									<compClass>CombatExtended.CompPawnGizmo</compClass>
-								</li>
-								<li Class="CombatExtended.CompProperties_Suppressable" />
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Rabbie"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Humanoid</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<!--Better shooting, Worse melee-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Rabbie"]/statBases</xpath>
-							<value>
-								<!--Same as shooting offset-->
-								<AimingAccuracy>1.2</AimingAccuracy>
-								<!--Same as hit offset-->
-								<MeleeCritChance>0.9</MeleeCritChance>
-								<!--Same as dodge offset-->
-								<MeleeParryChance>0.8</MeleeParryChance>
-								<Suppressability>1</Suppressability>
-								<SmokeSensitivity>1</SmokeSensitivity>
-							</value>
-						</li>
-
-						<!--Base has no headbut, only bite-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Rabbie"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>1.33</cooldownTime>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.162</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>right fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>1.33</cooldownTime>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.162</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>teeth</label>
-										<capacities>
-											<li>Bite</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>2.52</cooldownTime>
-										<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationSharp>0.01</armorPenetrationSharp>
-										<armorPenetrationBlunt>0.245</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Racc/PawnKinds_Racc.xml b/Patches/Racc/PawnKinds_Racc.xml
deleted file mode 100644
index 31f42ec091..0000000000
--- a/Patches/Racc/PawnKinds_Racc.xml
+++ /dev/null
@@ -1,326 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Racc Race</li>
-			<li>Racc Race (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Scoot ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RaccColonist"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RaccArchivist"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RaccTrader"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RaccSlave"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RaccRefugee"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RaccSecurityGuard"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RaccTheif"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RaccHunter"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RaccSpy"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RaccNinja"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Racc/Racc_Weapons.xml b/Patches/Racc/Racc_Weapons.xml
deleted file mode 100644
index 30f760befe..0000000000
--- a/Patches/Racc/Racc_Weapons.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Racc Race</li>
-			<li>Racc Race (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Walthracc PPK -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Racc_WPPK</defName>
-					<statBases>
-						<Mass>0.45</Mass>
-						<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.30</ShotSpread>
-						<SwayFactor>1</SwayFactor>
-						<Bulk>1</Bulk>
-						<WorkToMake>15000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_22LR_FMJ</defaultProjectile>
-						<warmupTime>0.2</warmupTime>
-						<range>12</range>
-						<soundCast>Xen_SD</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>1</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>2</reloadTime>
-						<ammoSet>AmmoSet_22LR</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Racc_WPPK"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.5</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.5</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- etc.. -->
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Racc/Race_Racc.xml b/Patches/Racc/Race_Racc.xml
deleted file mode 100644
index c6807905a9..0000000000
--- a/Patches/Racc/Race_Racc.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Racc Race</li>
-			<li>Racc Race (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== Found Bandit. Rabies. ========== -->
-
-				<!-- ========== Turn our lotor boys into lotor *boys* ========== -->
-				<!-- ========== To be human is to be a tall brick 	  ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<!-- === Note to future furball compatibility nerds: 		=== -->
-					<!-- === Paste the defName of your horrible alien there   |	=== -->
-					<!-- === 												  V	=== -->
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Racc"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Gives Gun Gizmos to Racc HUD thing ========== -->
-				<!-- ========== Also Makes Em Suppressable		   ========== -->
-
-				<li Class="PatchOperationAdd">
-					<!-- === Shouldn't need to change this at all		  === -->
-					<!-- === Unless you changed the name of your BaseRaccPawn === -->
-					<!-- === In which case change "BaseRaccPawn" to that name === -->
-					<xpath>Defs/ThingDef[@Name="BaseRaccPawn"]</xpath>
-					<value>
-						<comps>
-							<li>
-								<compClass>CombatExtended.CompPawnGizmo</compClass>
-							</li>
-							<li Class="CombatExtended.CompProperties_Suppressable" />
-						</comps>
-					</value>
-				</li>
-
-				<!-- === Patch Racc default melee attacks === -->
-				<!-- === Mightve made them kinda OP 	=== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Racc"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1.2</AimingAccuracy>
-						<MeleeDodgeChance>1.5</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<ReloadSpeed>1.25</ReloadSpeed>
-						<Suppressability>0.85</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Racc"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.690</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-		<!-- ================================================= -->
-		<!-- === BaseBodySize, ArmorRatings, MoveSpeed, and BaseHealth should already be set. I think. === -->
-		<!-- ===================================== -->
-
-		<!-- === Congratulations! Your alien is Combat Ready!	 === -->
-		<!-- === If your alien comes with extra guns and gear,	 === -->
-		<!-- === Congratulations! You're not even close to done! === -->
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Race to the Rim/Patch_AnimalProjectiles.xml b/Patches/Race to the Rim/Patch_AnimalProjectiles.xml
deleted file mode 100644
index 13cd96f134..0000000000
--- a/Patches/Race to the Rim/Patch_AnimalProjectiles.xml	
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Race to the Rim</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- These use VE ThingClass -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef Name="RttRFlameCEBase" ParentName="RttR_BaseAnimalProjectile" Abstract="True">
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>40</speed>
-								<damageDef>Flame</damageDef>
-								<damageAmountBase>2</damageAmountBase>
-								<explosionRadius>1.1</explosionRadius>
-								<suppressionFactor>3.0</suppressionFactor>
-								<dangerFactor>2.0</dangerFactor>
-								<ai_IsIncendiary>true</ai_IsIncendiary>
-								<soundExplode>Interact_Ignite</soundExplode>
-								<flyOverhead>false</flyOverhead>
-							</projectile>
-						</ThingDef>
-						<ThingDef ParentName="RttRFlameCEBase">
-							<defName>RttR_NightmareBreathCE</defName>
-							<label>nightmare breath</label>
-							<graphicData>
-								<texPath>Things/Projectiles/FireEffects/Proj_NightmareFire/Proj_NightmareFireA</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-						</ThingDef>
-						<ThingDef ParentName="RttRFlameCEBase">
-							<defName>RttR_RazorwhipBreathCE</defName>
-							<label>razorwhip breath</label>
-							<graphicData>
-								<texPath>Things/Projectiles/FireEffects/Proj_RazorwhipFire/Proj_RazorwhipFireA</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-						</ThingDef>
-						<ThingDef ParentName="RttRFlameCEBase">
-							<defName>RttR_TripleStrykeBreathCE</defName>
-							<label>triple stryke breath</label>
-							<graphicData>
-								<texPath>Things/Projectiles/FireEffects/Proj_TripleStrykeFire/Proj_TripleStrykeFireA</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-						</ThingDef>
-						<ThingDef ParentName="RttRFlameCEBase">
-							<defName>RttR_StormcutterBreathCE</defName>
-							<label>stormcutter breath</label>
-							<graphicData>
-								<texPath>Things/Projectiles/FireEffects/Proj_StormcutterFire/Proj_StormcutterFireA</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-						</ThingDef>
-						<ThingDef ParentName="RttRFlameCEBase">
-							<defName>RttR_TerribleTerrorBreathCE</defName>
-							<label>terrible terror breath</label>
-							<graphicData>
-								<texPath>Things/Projectiles/FireEffects/Proj_TerribleTerrorFire/Proj_TerribleTerrorA</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-						</ThingDef>
-						<ThingDef ParentName="RttRFlameCEBase">
-							<defName>RttR_NadderBreathCE</defName>
-							<label>nadder breath</label>
-							<graphicData>
-								<texPath>Things/Projectiles/FireEffects/Proj_NadderFire/Proj_NadderFireA</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- === Projectile Base === -->
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						@Name="RttR_BaseAnimalProjectile" or
-						defName="RttR_FlameBreath" or
-						defName="RttR_TinyFlameBreath" or
-						defName="RttR_FlightmareBreath" or
-						defName="RttR_GronckleBreath" or
-						defName="RttR_StreamFlameBreath" or
-						defName="RttR_Furybreath" or
-						defName="RttR_StreamFlameBreath" or
-						defName="RttR_GasBall" or
-						defName="RttR_WaterBreath"
-						]/thingClass
-					</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeAdd">
-					<xpath>
-						Defs/ThingDef[
-						@Name="RttR_BaseAnimalProjectile" or
-						defName="RttR_FlameBreath" or
-						defName="RttR_TinyFlameBreath" or
-						defName="RttR_FlightmareBreath" or
-						defName="RttR_GronckleBreath" or
-						defName="RttR_StreamFlameBreath" or
-						defName="RttR_Furybreath" or
-						defName="RttR_StreamFlameBreath" or
-						defName="RttR_GasBall" or
-						defName="RttR_WaterBreath"
-						]/projectile
-					</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.ProjectilePropertiesCE</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RttR_BaseAnimalProjectile"]/projectile/speed</xpath>
-					<value>
-						<speed>40</speed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RttR_BaseAnimalProjectile"]/projectile/flyOverhead</xpath>
-					<value>
-						<flyOverhead>false</flyOverhead>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Race to the Rim/Patch_Leathers.xml b/Patches/Race to the Rim/Patch_Leathers.xml
deleted file mode 100644
index 7b93098fa6..0000000000
--- a/Patches/Race to the Rim/Patch_Leathers.xml	
+++ /dev/null
@@ -1,225 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Race to the Rim</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Flightmare Scales === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_FlightmareDragonScales"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.5</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_FlightmareDragonScales"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.75</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- === Fury Scales === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_FuryDragonScales"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.55</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_FuryDragonScales"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.80</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- === Gronckle Scales === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_GronckleDragonScales"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.65</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_GronckleDragonScales"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.90</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- === Hotburple Scales === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_HotburpleDragonScales"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.65</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_HotburpleDragonScales"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.90</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- === Nadder Scales === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_NadderDragonScales"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1.1</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_NadderDragonScales"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1.75</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- === Nightmare Scales === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_NightmareDragonScales"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1.05</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_NightmareDragonScales"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1.65</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- === Rumblehorn Scales === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_RumblehornDragonScales"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1.3</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_RumblehornDragonScales"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>2.7</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- === Scauldron Scales === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_ScauldronDragonScales"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_ScauldronDragonScales"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1.40</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- === Stormcutter Scales === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_StormcutterDragonScales"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1.15</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_StormcutterDragonScales"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1.95</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- === Terrible Terror Scales === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_TerribleTerrorDragonScales"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_TerribleTerrorDragonScales"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1.5</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- === Zippleback Scales === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_ZipplebackDragonScales"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.90</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_ZipplebackDragonScales"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1.35</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- === Razorwhip Scales === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_RazorwhipDragonScales"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1.35</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_RazorwhipDragonScales"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>2.2</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- === Triple Stryke Scales === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_TripleStrykeDragonScales"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1.45</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_TripleStrykeDragonScales"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>2.4</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- === Patched Dragon Scales === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_PatchedDragonScales"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.45</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_PatchedDragonScales"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.60</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Race to the Rim/Patch_Resources.xml b/Patches/Race to the Rim/Patch_Resources.xml
deleted file mode 100644
index 63ffd996da..0000000000
--- a/Patches/Race to the Rim/Patch_Resources.xml	
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Race to the Rim</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Gronckle Iron === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RttR_GronckleIron"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RttR_GronckleIron"]/stuffProps/categories</xpath>
-					<value>
-						<li>Metallic_Weapon</li>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RttR_GronckleIron"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>0.9</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_GronckleIron"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1.05</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_GronckleIron"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1.60</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_GronckleIron"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RttR_GronckleIron"]/statBases/StuffPower_Armor_Heat</xpath>
-				</li>
-
-				<!-- === Nadder Spike === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_WoodLog"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.99</cooldownTime>
-								<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RttR_WoodLog"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>1</MeleeParryChance>
-							<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RttR_WoodLog"]/statBases</xpath>
-					<value>
-						<Bulk>0.07</Bulk>
-						<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_WoodLog"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.1</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_WoodLog"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.2</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_WoodLog"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.025</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_WoodLog"]/statBases/SharpDamageMultiplier</xpath>
-					<value>
-						<SharpDamageMultiplier>0.7</SharpDamageMultiplier>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_WoodLog"]/statBases/BluntDamageMultiplier</xpath>
-					<value>
-						<BluntDamageMultiplier>0.5</BluntDamageMultiplier>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RttR_WoodLog"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>0.3</Mass>
-						<MeleePenetrationFactor>0.3</MeleePenetrationFactor>
-					</value>
-				</li>
-
-				<!-- === Flightmare Algae === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RttR_FlightmareAlgae"]/statBases</xpath>
-					<value>
-						<Bulk>0.07</Bulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Race to the Rim/Races_Flightmare.xml b/Patches/Race to the Rim/Races_Flightmare.xml
deleted file mode 100644
index b33315e9f8..0000000000
--- a/Patches/Race to the Rim/Races_Flightmare.xml	
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Race to the Rim</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RttR_Flightmare"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RttR_Flightmare"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.20</MeleeDodgeChance>
-						<MeleeCritChance>0.45</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-						<SightsEfficiency>1</SightsEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_Flightmare"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.08</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.08</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.24</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_Flightmare"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>RttR_FlightmareBreath</defaultProjectile>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-								<warmupTime>1.75</warmupTime>
-								<range>23</range>
-								<minRange>2</minRange>
-								<soundCast>RttR_FireBreathSound</soundCast>
-								<muzzleFlashScale>1</muzzleFlashScale>
-								<commonality>1</commonality>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<recoilAmount>0.4</recoilAmount>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Race to the Rim/Races_Fury.xml b/Patches/Race to the Rim/Races_Fury.xml
deleted file mode 100644
index 7c76a70777..0000000000
--- a/Patches/Race to the Rim/Races_Fury.xml	
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Race to the Rim</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RttR_Fury"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RttR_Fury"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						<MeleeCritChance>0.20</MeleeCritChance>
-						<MeleeParryChance>0.08</MeleeParryChance>
-						<SightsEfficiency>1</SightsEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_Fury"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.24</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_Fury"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>RttR_Furybreath</defaultProjectile>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-								<warmupTime>2</warmupTime>
-								<range>22</range>
-								<minRange>2</minRange>
-								<soundCast>RttR_FireBreathSound</soundCast>
-								<muzzleFlashScale>1</muzzleFlashScale>
-								<commonality>0.9</commonality>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<recoilAmount>0.4</recoilAmount>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Race to the Rim/Races_Gronckle.xml b/Patches/Race to the Rim/Races_Gronckle.xml
deleted file mode 100644
index 14c6c9e033..0000000000
--- a/Patches/Race to the Rim/Races_Gronckle.xml	
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Race to the Rim</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RttR_Gronckle"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RttR_Gronckle"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.08</MeleeDodgeChance>
-						<MeleeCritChance>0.23</MeleeCritChance>
-						<MeleeParryChance>0.06</MeleeParryChance>
-						<SightsEfficiency>1</SightsEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_Gronckle"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.623</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_Gronckle"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>RttR_GronckleBreath</defaultProjectile>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-								<warmupTime>3.75</warmupTime>
-								<range>25</range>
-								<minRange>24</minRange>
-								<soundCast>RttR_FireBreathSound</soundCast>
-								<muzzleFlashScale>1</muzzleFlashScale>
-								<commonality>1</commonality>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<recoilAmount>0.4</recoilAmount>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Race to the Rim/Races_Hotburple.xml b/Patches/Race to the Rim/Races_Hotburple.xml
deleted file mode 100644
index 99ad4576f3..0000000000
--- a/Patches/Race to the Rim/Races_Hotburple.xml	
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Race to the Rim</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RttR_Hotburple"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RttR_Hotburple"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.08</MeleeDodgeChance>
-						<MeleeCritChance>0.23</MeleeCritChance>
-						<MeleeParryChance>0.06</MeleeParryChance>
-						<SightsEfficiency>1</SightsEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_Hotburple"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.623</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_Hotburple"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>RttR_StreamFlameBreath</defaultProjectile>
-								<burstShotCount>10</burstShotCount>
-								<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-								<warmupTime>2.85</warmupTime>
-								<range>24</range>
-								<minRange>2</minRange>
-								<soundCast>RttR_FireBreathSound</soundCast>
-								<muzzleFlashScale>1</muzzleFlashScale>
-								<commonality>1</commonality>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<recoilAmount>0.4</recoilAmount>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Race to the Rim/Races_Nadder.xml b/Patches/Race to the Rim/Races_Nadder.xml
deleted file mode 100644
index eeedc01c39..0000000000
--- a/Patches/Race to the Rim/Races_Nadder.xml	
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Race to the Rim</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RttR_Nadder"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RttR_Nadder"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.20</MeleeDodgeChance>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>0.08</MeleeParryChance>
-						<SightsEfficiency>1</SightsEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_Nadder"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_Nadder"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>RttR_NadderBreathCE</defaultProjectile>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-								<warmupTime>2.25</warmupTime>
-								<range>16</range>
-								<minRange>2</minRange>
-								<soundCast>RttR_FireBreathSound</soundCast>
-								<muzzleFlashScale>1</muzzleFlashScale>
-								<commonality>1</commonality>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<recoilAmount>0.4</recoilAmount>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Race to the Rim/Races_Nightmare.xml b/Patches/Race to the Rim/Races_Nightmare.xml
deleted file mode 100644
index 2bfd15a8fb..0000000000
--- a/Patches/Race to the Rim/Races_Nightmare.xml	
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Race to the Rim</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RttR_Nightmare"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RttR_Nightmare"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.38</MeleeCritChance>
-						<MeleeParryChance>0.02</MeleeParryChance>
-						<SightsEfficiency>1</SightsEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_Nightmare"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_Nightmare"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>RttR_NightmareBreathCE</defaultProjectile>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-								<warmupTime>1.25</warmupTime>
-								<range>12</range>
-								<minRange>1</minRange>
-								<soundCast>RttR_FireBreathSound</soundCast>
-								<muzzleFlashScale>1</muzzleFlashScale>
-								<commonality>1</commonality>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<recoilAmount>0.4</recoilAmount>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Race to the Rim/Races_Razorwhip.xml b/Patches/Race to the Rim/Races_Razorwhip.xml
deleted file mode 100644
index 4189aa65c7..0000000000
--- a/Patches/Race to the Rim/Races_Razorwhip.xml	
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Race to the Rim</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RttR_Razorwhip"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RttR_Razorwhip"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.20</MeleeDodgeChance>
-						<MeleeCritChance>0.26</MeleeCritChance>
-						<MeleeParryChance>0.12</MeleeParryChance>
-						<SightsEfficiency>1</SightsEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_Razorwhip"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_Razorwhip"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>RttR_RazorwhipBreathCE</defaultProjectile>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-								<warmupTime>5</warmupTime>
-								<range>32</range>
-								<minRange>5</minRange>
-								<soundCast>RttR_FireBreathSound</soundCast>
-								<muzzleFlashScale>1</muzzleFlashScale>
-								<commonality>1</commonality>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<recoilAmount>0.4</recoilAmount>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Race to the Rim/Races_Rumblehorn.xml b/Patches/Race to the Rim/Races_Rumblehorn.xml
deleted file mode 100644
index 30a5c24ffc..0000000000
--- a/Patches/Race to the Rim/Races_Rumblehorn.xml	
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Race to the Rim</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RttR_Rumblehorn"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RttR_Rumblehorn"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.09</MeleeDodgeChance>
-						<MeleeCritChance>0.28</MeleeCritChance>
-						<MeleeParryChance>0.06</MeleeParryChance>
-						<SightsEfficiency>1</SightsEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_Rumblehorn"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_Rumblehorn"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>RttR_FlameBreath</defaultProjectile>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-								<warmupTime>1</warmupTime>
-								<range>16</range>
-								<minRange>1</minRange>
-								<soundCast>RttR_FireBreathSound</soundCast>
-								<muzzleFlashScale>1</muzzleFlashScale>
-								<commonality>1</commonality>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<recoilAmount>0.4</recoilAmount>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Race to the Rim/Races_Scauldron.xml b/Patches/Race to the Rim/Races_Scauldron.xml
deleted file mode 100644
index 35923f7760..0000000000
--- a/Patches/Race to the Rim/Races_Scauldron.xml	
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Race to the Rim</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RttR_Scauldron"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RttR_Scauldron"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.20</MeleeDodgeChance>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>0.08</MeleeParryChance>
-						<SightsEfficiency>1</SightsEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_Scauldron"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_Scauldron"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>RttR_WaterBreath</defaultProjectile>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-								<warmupTime>1.75</warmupTime>
-								<range>20</range>
-								<minRange>2</minRange>
-								<soundCast>RttR_FireBreathSound</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<commonality>1</commonality>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<recoilAmount>0.4</recoilAmount>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Race to the Rim/Races_Stormcutter.xml b/Patches/Race to the Rim/Races_Stormcutter.xml
deleted file mode 100644
index 67406c7557..0000000000
--- a/Patches/Race to the Rim/Races_Stormcutter.xml	
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Race to the Rim</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RttR_Stormcutter"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RttR_Stormcutter"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.28</MeleeDodgeChance>
-						<MeleeCritChance>0.17</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-						<SightsEfficiency>1</SightsEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_Stormcutter"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_Stormcutter"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>RttR_StormcutterBreathCE</defaultProjectile>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-								<warmupTime>1.25</warmupTime>
-								<range>12</range>
-								<minRange>1</minRange>
-								<soundCast>RttR_FireBreathSound</soundCast>
-								<muzzleFlashScale>1</muzzleFlashScale>
-								<commonality>1</commonality>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<recoilAmount>0.4</recoilAmount>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Race to the Rim/Races_TerribleTerror.xml b/Patches/Race to the Rim/Races_TerribleTerror.xml
deleted file mode 100644
index 882d4bc9c0..0000000000
--- a/Patches/Race to the Rim/Races_TerribleTerror.xml	
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Race to the Rim</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RttR_TerribleTerror"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RttR_TerribleTerror"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.14</MeleeDodgeChance>
-						<MeleeCritChance>0.37</MeleeCritChance>
-						<MeleeParryChance>0.17</MeleeParryChance>
-						<SightsEfficiency>1</SightsEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_TerribleTerror"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_TerribleTerror"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>RttR_TerribleTerrorBreathCE</defaultProjectile>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-								<warmupTime>1</warmupTime>
-								<range>8</range>
-								<minRange>2</minRange>
-								<soundCast>RttR_FireBreathSound</soundCast>
-								<muzzleFlashScale>1</muzzleFlashScale>
-								<commonality>1</commonality>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<recoilAmount>0.4</recoilAmount>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Race to the Rim/Races_TripleStryke.xml b/Patches/Race to the Rim/Races_TripleStryke.xml
deleted file mode 100644
index 048f317b72..0000000000
--- a/Patches/Race to the Rim/Races_TripleStryke.xml	
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Race to the Rim</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RttR_TripleStryke"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RttR_TripleStryke"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.23</MeleeCritChance>
-						<MeleeParryChance>0.06</MeleeParryChance>
-						<SightsEfficiency>1</SightsEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_TripleStryke"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>first tail</label>
-								<capacities>
-									<li>RttR_Anesthesia</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>RttR_FirstTailAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>second tail</label>
-								<capacities>
-									<li>RttR_Dazing</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>RttR_SecondTailAttackTool</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>third tail</label>
-								<capacities>
-									<li>RttR_Toxic</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>RttR_ThirdTailAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.05</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.05</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_TripleStryke"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_Flamethrower_Napalm</defaultProjectile>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-								<warmupTime>5</warmupTime>
-								<range>25</range>
-								<minRange>2</minRange>
-								<soundCast>RttR_FireBreathSound</soundCast>
-								<muzzleFlashScale>1</muzzleFlashScale>
-								<commonality>0.9</commonality>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<recoilAmount>0.4</recoilAmount>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Race to the Rim/Races_Zippleback.xml b/Patches/Race to the Rim/Races_Zippleback.xml
deleted file mode 100644
index 5aa2d4060f..0000000000
--- a/Patches/Race to the Rim/Races_Zippleback.xml	
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Race to the Rim</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RttR_Zippleback"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RttR_Zippleback"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						<MeleeCritChance>0.28</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-						<SightsEfficiency>1</SightsEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_Zippleback"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RttR_Zippleback"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>RttR_GasBall</defaultProjectile>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-								<warmupTime>5</warmupTime>
-								<range>35</range>
-								<minRange>5</minRange>
-								<soundCast>RttR_FireBreathSound</soundCast>
-								<muzzleFlashScale>1</muzzleFlashScale>
-								<commonality>1</commonality>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<recoilAmount>0.4</recoilAmount>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RadWorld/PawnKinds_RadWorld.xml b/Patches/RadWorld/PawnKinds_RadWorld.xml
deleted file mode 100644
index 7276aa6bf5..0000000000
--- a/Patches/RadWorld/PawnKinds_RadWorld.xml
+++ /dev/null
@@ -1,385 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RadWorld</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Give ammo to Mutant ranged PawnKinds. ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="Mutant_Archer" or
-						defName="Mutant_Hunter" or
-						defName="Mutant_HeavyArcher" or
-						defName="Mutant_ChiefRanged"]
-					</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>14</min>
-								<max>26</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>150</min>
-									<max>350</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>NeolithicMeleeBasic</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Vaulter ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RW_Vault_Villager" or defName="RW_Vault_Town_Trader" or defName="RW_Vault_Town_Councilman"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>1</min>
-								<max>2</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>20</min>
-										<max>120</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RW_Vault_Town_Guard"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>20</min>
-										<max>120</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Vaulter Mercenary ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RW_Vault_Grenadier_Destructive"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>10</min>
-								<max>30</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>200</min>
-								<max>600</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>150</min>
-									<max>350</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>CE_Sidearm_Melee</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RW_Vault_Grenadier_EMP"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>10</min>
-								<max>30</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>100</min>
-									<max>250</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>CE_Sidearm</li>
-								</weaponTags>
-								<magazineCount>
-									<min>2</min>
-									<max>5</max>
-								</magazineCount>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RW_Vault_Grenadier_EMP"]/label</xpath>
-					<value>
-						<label>vault advanced grenadier</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[defName="RW_Vault_Grenadier_EMP"]/weaponTags</xpath>
-					<value>
-						<li>CE_GrenadeFlashbang</li>
-						<li>GrenadeSmoke</li>
-						<li>GrenadeDestructive</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RW_Vault_Grenadier_Smoke"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>10</min>
-								<max>30</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>100</min>
-									<max>250</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>CE_Sidearm</li>
-								</weaponTags>
-								<magazineCount>
-									<min>2</min>
-									<max>5</max>
-								</magazineCount>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RW_Vault_Grenadier_Smoke"]/label</xpath>
-					<value>
-						<label>vault advanced grenadier</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[defName="RW_Vault_Grenadier_Smoke"]/weaponTags</xpath>
-					<value>
-						<li>CE_GrenadeFlashbang</li>
-						<li>GrenadeSmoke</li>
-						<li>GrenadeDestructive</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RW_Vault_Mercenary_Gunner" or defName="RW_Vault_Mercenary_Gunner_Acidifier"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>4</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>200</min>
-								<max>600</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.8</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>20</min>
-										<max>120</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RW_Vault_Mercenary_Sniper" or defName="RW_Vault_Mercenary_Sniper_Acidifier"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>1</generateChance>
-									<sidearmMoney>
-										<min>60</min>
-										<max>150</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>80</min>
-										<max>120</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RW_Vault_Mercenary_Heavy"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>14</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>150</min>
-									<max>350</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>CE_SMG</li>
-								</weaponTags>
-								<magazineCount>
-									<min>0</min>
-									<max>1</max>
-								</magazineCount>
-							</forcedSidearm>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>60</min>
-										<max>150</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName = "RW_Vault_Mercenary_Slasher" or defName="RW_Vault_Mercenary_Slasher_Acidifier"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.9</shieldChance>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RW_Vault_PirateBoss"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>1300</min>
-								<max>1700</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.9</shieldChance>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>400</min>
-										<max>800</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name = "MercenaryEliteTierBase" or defName="RW_Vault_Mercenary_Elite" or defName="RW_Vault_Mercenary_Elite_Acidifier"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>1000</min>
-								<max>1600</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.9</shieldChance>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>400</min>
-										<max>800</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RadWorld/ThingDefs_Apparel.xml b/Patches/RadWorld/ThingDefs_Apparel.xml
deleted file mode 100644
index 559fdbf473..0000000000
--- a/Patches/RadWorld/ThingDefs_Apparel.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RadWorld</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Hazard Suits -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "RW_Apparel_PatchWork_HazardSuit" or defName="RW_Apparel_HazardSuit_Black" or defName="RW_Apparel_HazardSuit_Yellow"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "RW_Apparel_PatchWork_HazardSuit" or defName="RW_Apparel_HazardSuit_Black" or defName="RW_Apparel_HazardSuit_Yellow"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.08</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "RW_Apparel_PatchWork_HazardSuit" or defName="RW_Apparel_HazardSuit_Black" or defName="RW_Apparel_HazardSuit_Yellow"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.12</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Armored Hazard Suits -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RW_Apparel_ArmoredHazardSuit_Black" or defName="RW_Apparel_ArmoredHazardSuit_Yellow"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-
-				<!-- Stated to have added plasteel plates for protection. We'll say they're 3mm thick.-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RW_Apparel_ArmoredHazardSuit_Black" or defName="RW_Apparel_ArmoredHazardSuit_Yellow"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RW_Apparel_ArmoredHazardSuit_Black" or defName="RW_Apparel_ArmoredHazardSuit_Yellow"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>9</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Environment Shield -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "RW_Apparel_ArchotechEnvironmentShield"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RadWorld/ThingDefs_Misc.xml b/Patches/RadWorld/ThingDefs_Misc.xml
deleted file mode 100644
index 4e97f80980..0000000000
--- a/Patches/RadWorld/ThingDefs_Misc.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RadWorld</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Give the gas mask filter appropriate bulk. -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "RW_GasMaskFilter"]/statBases</xpath>
-					<value>
-						<Bulk>0.65</Bulk>
-					</value>
-				</li>
-
-				<!-- Make RadWorld gas masks work like CE gas masks. -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName = "RW_Apparel_DuctTapedGasMask" or defName="RW_Apparel_GasMask_Black" or defName="RW_Apparel_GasMask_Yellow"]</xpath>
-					<value>
-						<li Class="CombatExtended.ApparelHediffExtension">
-							<hediff>WearingGasMask</hediff>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RW_Apparel_GasMask_Black" or defName="RW_Apparel_GasMask_Yellow"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RW_Apparel_DuctTapedGasMask" or defName="RW_Apparel_ArchotechGasMask"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<!-- Make CE gas masks work like RadWorld gas masks. -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparel_GasMask"]/statBases</xpath>
-					<value>
-						<RW_RadiationResistanceOffset>0.15</RW_RadiationResistanceOffset>
-						<RW_RadiationResistancePoweredOffset>0.35</RW_RadiationResistancePoweredOffset>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparel_GasMask"]</xpath>
-					<value>
-						<comps>
-							<li Class="CompProperties_Reloadable">
-								<compClass>RadWorld.CompGasMaskReloadable</compClass>
-								<maxCharges>2</maxCharges>
-								<ammoDef>RW_GasMaskFilter</ammoDef>
-								<ammoCountToRefill>2</ammoCountToRefill>
-								<baseReloadTicks>60</baseReloadTicks>
-								<soundReload>Standard_Reload</soundReload>
-								<hotKey>Misc4</hotKey>
-								<chargeNoun>smokepop</chargeNoun>
-								<displayGizmoWhileUndrafted>false</displayGizmoWhileUndrafted>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RadWorld/ThingDefs_Races.xml b/Patches/RadWorld/ThingDefs_Races.xml
deleted file mode 100644
index 51d5cabc2e..0000000000
--- a/Patches/RadWorld/ThingDefs_Races.xml
+++ /dev/null
@@ -1,321 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RadWorld</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Irradiated Bear ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RW_IrradiatedBear"]</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.41</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.41</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>31</power>
-								<cooldownTime>2.05</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.85</armorPenetrationSharp>
-								<armorPenetrationBlunt>8.450</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.22</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>4.235</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Irradiated Megaspider ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RW_IrradiatedMegaspider"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4.5</MoveSpeed>
-						<MeleeDodgeChance>0.07</MeleeDodgeChance>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>0.17</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RW_IrradiatedMegaspider"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>43</power>
-								<cooldownTime>2.48</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.750</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RW_IrradiatedMegaspider"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>12</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RW_IrradiatedMegaspider"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RW_IrradiatedMegaspider"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>1.8</baseHealthScale>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RW_IrradiatedMegaspider"]/combatPower</xpath>
-					<value>
-						<combatPower>130</combatPower>
-					</value>
-				</li>
-
-				<!-- ========== Irradiated Rat ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RW_IrradiatedRat"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RW_IrradiatedRat"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>2.3</MoveSpeed>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.0</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RW_IrradiatedRat"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.69</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.013</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.69</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.013</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.95</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>3</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Mole ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RW_Mole"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RW_Mole"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>2.0</MoveSpeed>
-						<MeleeDodgeChance>0.10</MeleeDodgeChance>
-						<MeleeCritChance>0.0</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RW_Mole"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.69</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.013</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.69</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.013</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.95</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>3</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RW_Mole"]/combatPower</xpath>
-					<value>
-						<combatPower>12</combatPower>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rah's Vanilla Turrets Expansion/Patch_Ammo_Shells.xml b/Patches/Rah's Vanilla Turrets Expansion/Patch_Ammo_Shells.xml
deleted file mode 100644
index eac8ef6d01..0000000000
--- a/Patches/Rah's Vanilla Turrets Expansion/Patch_Ammo_Shells.xml	
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rah's Vanilla Turrets Expansion</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="PlasmaPowerCell"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>81mmMortarShellBaseCraftableBase</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="PlasmaPowerCell"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PlasmaPowerCell"]</xpath>
-					<value>
-						<ammoClass>Plasma</ammoClass>
-						<destroyOnDrop>False</destroyOnDrop>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="PlasmaPowerCell"]/costList</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="PlasmaPowerCell"]/recipeMaker</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_81mmMortarShell_Plasma</defName>
-							<label>plasma power cell</label>
-							<ammoTypes>
-								<PlasmaPowerCell>Bullet_81mmMortarShell_Plasma</PlasmaPowerCell>
-							</ammoTypes>
-							<isMortarAmmoSet>true</isMortarAmmoSet>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base81mmMortarShell">
-							<defName>Bullet_81mmMortarShell_Plasma</defName>
-							<label>81mm mortar shell (Plasma)</label>
-							<graphicData>
-								<texPath>ThirdParty/More Vanilla Turrets/PlasmaMortarProj</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>524</damageAmountBase>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0</armorPenetrationBlunt>
-								<explosionRadius>5</explosionRadius>
-								<flyOverhead>true</flyOverhead>
-								<explosionChanceToStartFire>0.75</explosionChanceToStartFire>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<explosionEffect>GiantExplosion</explosionEffect>
-								<soundExplode>Explosion_GiantBomb</soundExplode>
-								<dropsCasings>true</dropsCasings>
-							</projectile>
-						</ThingDef>
-
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakePlasmaPowerCell</defName>
-							<label>make devastator plasma power cell</label>
-							<description>Craft 1 devastator plasma power cell.</description>
-							<jobString>Making devastator plasma power cell.</jobString>
-							<workAmount>40000</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Shell_HighExplosive</li>
-										</thingDefs>
-									</filter>
-									<count>5</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Shell_EMP</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Plasteel</li>
-									<li>Shell_EMP</li>
-									<li>Shell_HighExplosive</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<PlasmaPowerCell>1</PlasmaPowerCell>
-							</products>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rah's Vanilla Turrets Expansion/Patch_Buildings_Security.xml b/Patches/Rah's Vanilla Turrets Expansion/Patch_Buildings_Security.xml
deleted file mode 100644
index f15b494d52..0000000000
--- a/Patches/Rah's Vanilla Turrets Expansion/Patch_Buildings_Security.xml	
+++ /dev/null
@@ -1,801 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rah's Vanilla Turrets Expansion</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Gun Complex ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_GunComplex</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.59</SwayFactor>
-						<Bulk>18.54</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.08</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>86</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<muzzleFlashScale>18</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_303British</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GunComplex"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>86</specialDisplayRadius>
-					</value>
-				</li>
-
-				<!-- ========== Rocket Complex ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_RocketComplex</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.23</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>2.16</SwayFactor>
-						<Bulk>14.71</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_83mmSMAW_HEAT</defaultProjectile>
-						<warmupTime>2.09</warmupTime>
-						<range>58</range>
-						<minRange>3</minRange>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>30</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>3</magazineSize>
-						<reloadTime>8.6</reloadTime>
-						<ammoSet>AmmoSet_83mmSMAW</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RocketComplex"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>48</specialDisplayRadius>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RocketComplex"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>200</Steel>
-							<ComponentIndustrial>5</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<!-- ========== Military Grade Turret ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_TurretMilitary</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>2.13</SwayFactor>
-						<Bulk>37.08</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.09</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>54</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>20</burstShotCount>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>200</magazineSize>
-						<reloadTime>15.6</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MilitaryTurretGun"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>86</specialDisplayRadius>
-					</value>
-				</li>
-
-				<!-- ========== Manned Military Grade Turret ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_TurretMilitaryManned</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>2.13</SwayFactor>
-						<Bulk>37.08</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.09</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>54</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>20</burstShotCount>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>200</magazineSize>
-						<reloadTime>15.6</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>10</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MilitaryTurretGunManned"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>86</specialDisplayRadius>
-					</value>
-				</li>
-
-				<!-- ========== Shredder Turret ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_TurretShredder</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>2.02</SwayFactor>
-						<Bulk>10.66</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.34</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<burstShotCount>5</burstShotCount>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>18</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-						<requireLineOfSight>false</requireLineOfSight>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ShredderTurretGun"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>20</specialDisplayRadius>
-					</value>
-				</li>
-
-				<!-- ========== Manned Shredder Turret ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_TurretShredderManned</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>2.02</SwayFactor>
-						<Bulk>10.66</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.34</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<burstShotCount>5</burstShotCount>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>18</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-						<requireLineOfSight>false</requireLineOfSight>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ShredderTurretGunManned"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>20</specialDisplayRadius>
-					</value>
-				</li>
-
-				<!-- ========== Precision Turret ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_TurretPrecision</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.2</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>28.72</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.80</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_145x114mm_FMJ</defaultProjectile>
-						<warmupTime>1.4</warmupTime>
-						<range>89</range>
-						<soundCast>Shot_SniperRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<muzzleFlashScale>45</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_145x114mm</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PrecisionTurretGun"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>89</specialDisplayRadius>
-					</value>
-				</li>
-
-				<!-- ========== Manned Precision Turret ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_TurretPrecisionManned</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>28.72</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.80</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_145x114mm_FMJ</defaultProjectile>
-						<warmupTime>1.4</warmupTime>
-						<range>89</range>
-						<soundCast>Shot_SniperRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<muzzleFlashScale>45</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_145x114mm</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PrecisionTurretGunManned"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>89</specialDisplayRadius>
-					</value>
-				</li>
-
-				<!-- ========== Blast Turret ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_BlastCharge</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>0.99</SwayFactor>
-						<Bulk>12.9</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.58</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_40x53mmGrenade_HE</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>40</range>
-						<minRange>5</minRange>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>3</burstShotCount>
-						<soundCast>Mortar_LaunchA</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>20</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>48</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_40x53mmGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BlastTurretGun"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>40</specialDisplayRadius>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BlastTurretGun"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>200</Steel>
-							<Plasteel>20</Plasteel>
-							<ComponentIndustrial>5</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<!-- ========== Manned Blast Turret ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_BlastChargeManned</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>0.99</SwayFactor>
-						<Bulk>12.9</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.58</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_40x53mmGrenade_HE</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>40</range>
-						<minRange>5</minRange>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>4</burstShotCount>
-						<soundCast>Mortar_LaunchA</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>20</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>48</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_40x53mmGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BlastTurretGunManned"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>40</specialDisplayRadius>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BlastTurretGunManned"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>200</Steel>
-							<Plasteel>20</Plasteel>
-							<ComponentIndustrial>5</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<!-- ========== Vulcan Cannon ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_VulcanCannon</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.20</SwayFactor>
-						<Bulk>20.27</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.80</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_20x102mmNATO_Sabot</defaultProjectile>
-						<warmupTime>4.1</warmupTime>
-						<range>62</range>
-						<minRange>6</minRange>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<burstShotCount>40</burstShotCount>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>6</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>375</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_20x102mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VulcanCannon"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>62</specialDisplayRadius>
-					</value>
-				</li>
-
-				<!-- ========== Manned Vulcan Cannon ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_VulcanCannonManned</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.20</SwayFactor>
-						<Bulk>20.27</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.80</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_20x102mmNATO_Sabot</defaultProjectile>
-						<warmupTime>4.1</warmupTime>
-						<range>62</range>
-						<minRange>4</minRange>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<burstShotCount>40</burstShotCount>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>6</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>375</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_20x102mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>20</aimedBurstShotCount>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VulcanCannonManned"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>62</specialDisplayRadius>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="VulcanCannon" or
-						defName="VulcanCannonManned" or
-						defName="ChargeCannon"
-						]/passability </xpath>
-					<value>
-						<!-- Turrets must be passable to allow reloading -->
-						<passability>PassThroughOnly</passability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="VulcanCannon" or
-						defName="VulcanCannonManned" or
-						defName="ChargeCannon"
-						] </xpath>
-					<value>
-						<!-- Workaround to replace passability=Impassable -->
-						<pathCost>200</pathCost>
-					</value>
-				</li>
-
-				<!-- ========== Devastator Mortar ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Artillery_DevastatorBomb</defName>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-						<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_81mmMortarShell_Plasma</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<minRange>20</minRange>
-						<range>500</range>
-						<burstShotCount>5</burstShotCount>
-						<soundCast>ChargeLance_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>55</muzzleFlashScale>
-						<circularError>1.45</circularError>
-						<requireLineOfSight>false</requireLineOfSight>
-						<indirectFirePenalty>0.5</indirectFirePenalty>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_81mmMortarShell_Plasma</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Artillery_DevastatorBomb"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Charges">
-							<chargeSpeeds>
-								<li>30</li>
-								<li>50</li>
-								<li>70</li>
-								<li>90</li>
-							</chargeSpeeds>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_DevastatorMortarBomb"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>15</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_81mmMortarShell_Plasma"]/graphicData/texPath</xpath>
-					<value>
-						<texPath>Things/Building/Security/DevastatorShell</texPath>
-					</value>
-				</li>
-
-				<!--<li Class="PatchOperationAdd">
-				<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_81mmMortarShell"]/ammoTypes</xpath>
-				<value>
-					<Shell_Plasma>Bullet_81mmMortarShell_Plasma</Shell_Plasma>
-				</value>
-			</li>-->
-
-				<!-- ========== Charge Cannon ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_ChargeCannon</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>4.8</RangedWeapon_Cooldown>
-						<SightsEfficiency>2</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1.89</SwayFactor>
-						<Bulk>40.00</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12mmRailgun_Sabot</defaultProjectile>
-						<warmupTime>1.8</warmupTime>
-						<range>78</range>
-						<soundCast>Shot_TurretSniper</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>8</reloadTime>
-						<ammoSet>AmmoSet_12mmRailgun</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Common to many or all Turrets ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="GunComplex" or
-						defName="RocketComplex" or
-						defName="MilitaryTurretGun" or
-						defName="MilitaryTurretGunManned" or
-						defName="ShredderTurretGun" or
-						defName="ShredderTurretGunManned" or
-						defName="PrecisionTurretGun" or
-						defName="PrecisionTurretGunManned" or
-						defName="BlastTurretGun" or
-						defName="BlastTurretGunManned" or
-						defName="VulcanCannon" or
-						defName="VulcanCannonManned" or
-						defName="ChargeCannon" or
-						defName="Turret_DevastatorMortarBomb"
-						]/thingClass </xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="MilitaryTurretGun" or
-						defName="MilitaryTurretGunManned" or
-						defName="ShredderTurretGun" or
-						defName="ShredderTurretGunManned" or
-						defName="PrecisionTurretGun" or
-						defName="PrecisionTurretGunManned" or
-						defName="BlastTurretGun" or
-						defName="BlastTurretGunManned"
-						]/fillPercent </xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="GunComplex" or
-						defName="RocketComplex" or
-						defName="MilitaryTurretGun" or
-						defName="MilitaryTurretGunManned" or
-						defName="ShredderTurretGun" or
-						defName="ShredderTurretGunManned" or
-						defName="PrecisionTurretGun" or
-						defName="PrecisionTurretGunManned" or
-						defName="BlastTurretGun" or
-						defName="BlastTurretGunManned" or
-						defName="VulcanCannon" or
-						defName="VulcanCannonManned" or
-						defName="ChargeCannon" or
-						defName="Turret_DevastatorMortarBomb"
-						]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="GunComplex" or
-						defName="RocketComplex" or
-						defName="MilitaryTurretGun" or
-						defName="MilitaryTurretGunManned" or
-						defName="ShredderTurretGun" or
-						defName="ShredderTurretGunManned" or
-						defName="PrecisionTurretGun" or
-						defName="PrecisionTurretGunManned" or
-						defName="BlastTurretGun" or
-						defName="BlastTurretGunManned" or
-						defName="VulcanCannon" or
-						defName="VulcanCannonManned" or
-						defName="ChargeCannon"
-						]/statBases/ShootingAccuracyTurret </xpath>
-					<value>
-						<AimingAccuracy>1</AimingAccuracy>
-						<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rakkle the Rattlesnake/Bodies/Rakkle_Bodyparts.xml b/Patches/Rakkle the Rattlesnake/Bodies/Rakkle_Bodyparts.xml
deleted file mode 100644
index 69ce48104c..0000000000
--- a/Patches/Rakkle the Rattlesnake/Bodies/Rakkle_Bodyparts.xml	
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rakkle the rattle snake Race mod</li>
-			<li>Rakkle 1.3 (unofficial update)</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Bleed Rate === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyPartDef[
-						defName="RS_UpperTail" or
-						defName="RS_LowerTail" or
-						defName="RS_Rattle" or
-						defName="Lower_BellyScale"
-						] </xpath>
-					<value>
-						<bleedRate>1.5</bleedRate>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rakkle the Rattlesnake/Bodies/Rakkle_Bodytype.xml b/Patches/Rakkle the Rattlesnake/Bodies/Rakkle_Bodytype.xml
deleted file mode 100644
index 7ff3f3cc35..0000000000
--- a/Patches/Rakkle the Rattlesnake/Bodies/Rakkle_Bodytype.xml	
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rakkle the rattle snake Race mod</li>
-			<li>Rakkle 1.3 (unofficial update)</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Sholder/Arm Groups === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Rakkle"]//*[customLabel="right shoulder"]/groups</xpath>
-					<value>
-						<li>RightShoulder</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Rakkle"]//*[customLabel="left shoulder"]/groups</xpath>
-					<value>
-						<li>LeftShoulder</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Rakkle"]//*[customLabel="right arm"]/groups</xpath>
-					<value>
-						<li>RightArm</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Rakkle"]//*[customLabel="left arm"]/groups</xpath>
-					<value>
-						<li>LeftArm</li>
-					</value>
-				</li>
-
-				<!-- === Natural Armor === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Rakkle"]//*[
-						def="Torso" or
-						def="Neck" or
-						def="Head" or
-						def="Ear" or
-						def="Nose" or
-						def="Jaw" or
-						def="Shoulder" or
-						def="Arm" or
-						def="Hand" or
-						def="Finger" or
-						def="RS_UpperTail" or
-						def="RS_LowerTail" or
-						def="Lower_BellyScale" or
-						def="RS_Rattle"]/groups </xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rakkle the Rattlesnake/PawnKindDefs/Rakkle_PawnKind.xml b/Patches/Rakkle the Rattlesnake/PawnKindDefs/Rakkle_PawnKind.xml
deleted file mode 100644
index 150f47847f..0000000000
--- a/Patches/Rakkle the Rattlesnake/PawnKindDefs/Rakkle_PawnKind.xml	
+++ /dev/null
@@ -1,234 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Rakkle the rattle snake Race mod</li>
-					<li>Rakkle 1.3 (unofficial update)</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--Regular-->
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[@Name="FRUBasePawnKind"]</xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>1</min>
-										<max>3</max>
-									</primaryMagazineCount>
-									<sidearms>
-										<li>
-											<generateChance>0.15</generateChance>
-											<sidearmMoney>
-												<min>20</min>
-												<max>120</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_Sidearm_Melee</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</value>
-						</li>
-
-						<!--Cradle-->
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[defName="CRD_Kidnapper"]</xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>3</max>
-									</primaryMagazineCount>
-									<sidearms>
-										<li>
-											<generateChance>0.2</generateChance>
-											<sidearmMoney>
-												<min>20</min>
-												<max>120</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_Sidearm_Melee</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[defName="CRD_Gunner"]</xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>6</min>
-										<max>8</max>
-									</primaryMagazineCount>
-									<sidearms>
-										<li>
-											<generateChance>0.2</generateChance>
-											<sidearmMoney>
-												<min>50</min>
-												<max>200</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_Sidearm_Melee</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[defName="CRD_Sapper"]</xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>10</min>
-										<max>30</max>
-									</primaryMagazineCount>
-									<forcedSidearm>
-										<sidearmMoney>
-											<min>250</min>
-											<max>100</max>
-										</sidearmMoney>
-										<weaponTags>
-											<li>CE_Sidearm</li>
-										</weaponTags>
-										<magazineCount>
-											<min>2</min>
-											<max>5</max>
-										</magazineCount>
-									</forcedSidearm>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[defName="CRD_HeavyGunner"]</xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>1</min>
-										<max>4</max>
-									</primaryMagazineCount>
-									<forcedSidearm>
-										<sidearmMoney>
-											<min>150</min>
-											<max>350</max>
-										</sidearmMoney>
-										<weaponTags>
-											<li>CE_SMG</li>
-										</weaponTags>
-										<magazineCount>
-											<min>0</min>
-											<max>1</max>
-										</magazineCount>
-									</forcedSidearm>
-									<sidearms>
-										<li>
-											<generateChance>0.5</generateChance>
-											<sidearmMoney>
-												<min>60</min>
-												<max>150</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_Sidearm_Melee</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[
-								defName="CradleLeader" or
-								defName="CRD_EliteGunner"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>6</min>
-										<max>8</max>
-									</primaryMagazineCount>
-									<sidearms>
-										<li>
-											<generateChance>0.2</generateChance>
-											<sidearmMoney>
-												<min>50</min>
-												<max>200</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_Sidearm_Melee</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[defName="CRD_Slasher"]</xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<shieldMoney>
-										<min>500</min>
-										<max>800</max>
-									</shieldMoney>
-									<shieldTags>
-										<li>OutlanderShield</li>
-									</shieldTags>
-									<shieldChance>0.9</shieldChance>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[defName="CRD_EliteSlasher"]</xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<shieldMoney>
-										<min>800</min>
-										<max>1400</max>
-									</shieldMoney>
-									<shieldTags>
-										<li>OutlanderShield</li>
-									</shieldTags>
-									<shieldChance>0.9</shieldChance>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/PawnKindDef[
-								defName="CradleLeader"
-								]/weaponTags </xpath>
-							<value>
-								<li>SpacerGun</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/PawnKindDef[
-								defName="CRD_EliteGunner"
-								]/weaponTags </xpath>
-							<value>
-								<li>SpacerGun</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rakkle the Rattlesnake/Scenario/Rakkle_Scenario.xml b/Patches/Rakkle the Rattlesnake/Scenario/Rakkle_Scenario.xml
deleted file mode 100644
index abdb401b26..0000000000
--- a/Patches/Rakkle the Rattlesnake/Scenario/Rakkle_Scenario.xml	
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Rakkle the rattle snake Race mod</li>
-					<li>Rakkle 1.3 (unofficial update)</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ScenarioDef[defName="RS_Scenario"]/scenario/parts</xpath>
-							<value>
-								<li Class="ScenPart_StartingThing_Defined">
-									<def>StartingThing_Defined</def>
-									<thingDef>Ammo_303British_FMJ</thingDef>
-									<count>200</count>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ScenarioDef[defName="RS_Scenario"]/scenario/parts/li[thingDef="Apparel_FlakPants"]</xpath>
-							<value>
-								<li Class="ScenPart_StartingThing_Defined">
-									<def>StartingThing_Defined</def>
-									<thingDef>Apparel_FlakPants</thingDef>
-									<stuff>Cloth</stuff>
-									<count>1</count>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ScenarioDef[defName="RS_Scenario"]/scenario/parts/li[thingDef="Apparel_FlakVest"]</xpath>
-							<value>
-								<li Class="ScenPart_StartingThing_Defined">
-									<def>StartingThing_Defined</def>
-									<thingDef>Apparel_FlakVest</thingDef>
-									<stuff>Steel</stuff>
-									<count>1</count>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ScenarioDef[defName="RS_Scenario"]/scenario/parts/li[thingDef="Apparel_AdvancedHelmet"]</xpath>
-							<value>
-								<li Class="ScenPart_StartingThing_Defined">
-									<def>StartingThing_Defined</def>
-									<thingDef>Apparel_AdvancedHelmet</thingDef>
-									<count>1</count>
-								</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rakkle the Rattlesnake/ThingDefs_Misc/Rakkle_Apparel.xml b/Patches/Rakkle the Rattlesnake/ThingDefs_Misc/Rakkle_Apparel.xml
deleted file mode 100644
index 1cc8554451..0000000000
--- a/Patches/Rakkle the Rattlesnake/ThingDefs_Misc/Rakkle_Apparel.xml	
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Rakkle the rattle snake Race mod</li>
-					<li>Rakkle 1.3 (unofficial update)</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--========= Regular =========-->
-
-						<!--Thin-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[
-								defName="RS_ChestWrap"
-								]/statBases </xpath>
-							<value>
-								<Bulk>0.5</Bulk>
-								<WornBulk>0.25</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RS_IdolCostume" or
-								defName="RS_StarIdol"
-								]/statBases </xpath>
-							<value>
-								<Bulk>2</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RS_IdolCostume"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RS_StarIdol"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<!--Mid-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="RS_MaidCostume" or
-								defName="RS_KnitSweater"
-								]/statBases </xpath>
-							<value>
-								<Bulk>5</Bulk>
-								<WornBulk>2</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RS_MaidCostume"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="RS_KnitSweater"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rakkle the Rattlesnake/ThingDefs_Races/AlienRace_Rakklelike.xml b/Patches/Rakkle the Rattlesnake/ThingDefs_Races/AlienRace_Rakklelike.xml
deleted file mode 100644
index a0258c7953..0000000000
--- a/Patches/Rakkle the Rattlesnake/ThingDefs_Races/AlienRace_Rakklelike.xml	
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Rakkle the rattle snake Race mod</li>
-					<li>Rakkle 1.3 (unofficial update)</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="RS_PawnBase"]/inspectorTabs/li[.="ITab_Pawn_Gear"]</xpath>
-							<value>
-								<li>CombatExtended.ITab_Inventory</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="RS_PawnBase"]/comps</xpath>
-							<value>
-								<li Class="CombatExtended.CompProperties_Inventory" />
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="RS_PawnBase"]/comps</xpath>
-							<value>
-								<li>
-									<compClass>CombatExtended.CompPawnGizmo</compClass>
-								</li>
-								<li Class="CombatExtended.CompProperties_Suppressable" />
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Rakkle"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Humanoid</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Rakkle"]/statBases</xpath>
-							<value>
-								<MeleeCritChance>1</MeleeCritChance>
-								<MeleeParryChance>1</MeleeParryChance>
-								<Suppressability>1</Suppressability>
-								<SmokeSensitivity>1</SmokeSensitivity>
-							</value>
-						</li>
-
-						<!--Powerful Bite, slightly faster regular attacks-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Rakkle"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>1.33</cooldownTime>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.456</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>right fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>1.33</cooldownTime>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.456</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>snake tail</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>4</power>
-										<cooldownTime>1.16</cooldownTime>
-										<linkedBodyPartsGroup>tail</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>1.094</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>fangs</label>
-										<capacities>
-											<li>Bite</li>
-										</capacities>
-										<power>4</power>
-										<cooldownTime>1.4</cooldownTime>
-										<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-										<armorPenetrationSharp>1.52</armorPenetrationSharp>
-										<armorPenetrationBlunt>2.278</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Hediff_VenomGlands"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>venom fangs</label>
-										<capacities>
-											<li>ToxicBite</li>
-										</capacities>
-										<power>7</power>
-										<cooldownTime>1.4</cooldownTime>
-										<chanceFactor>1.5</chanceFactor>
-										<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-										<armorPenetrationSharp>1.52</armorPenetrationSharp>
-										<armorPenetrationBlunt>2.278</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<!--Venom immunity to make social fights less lethal-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/HediffDef[defName="Hediff_FoodpoisoningImmunity"]/comps/li[@Class="MoharHediffs.HediffCompProperties_HediffNullifier"]/hediffToNullify</xpath>
-							<value>
-								<li>VenomBuildup</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rambo Weapons Pack/RamboWeaponsPack_amrifles.xml b/Patches/Rambo Weapons Pack/RamboWeaponsPack_amrifles.xml
deleted file mode 100644
index 04b780c697..0000000000
--- a/Patches/Rambo Weapons Pack/RamboWeaponsPack_amrifles.xml	
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rambo Weapons Pack (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Barret_M82A1_RWP</defName>
-					<statBases>
-						<WorkToMake>96200</WorkToMake>
-						<SightsEfficiency>2.34</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>2.08</SwayFactor>
-						<Bulk>15.47</Bulk>
-						<Mass>14.00</Mass>
-						<RangedWeapon_Cooldown>3.51</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>275</Steel>
-						<ComponentIndustrial>12</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>6.01</warmupTime>
-						<range>46</range>
-						<soundCast>ShotAMRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>15</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SniperRifle</li>
-						<li>Bipod_AMR</li>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_OSV-96_RWP</defName>
-					<statBases>
-						<WorkToMake>98500</WorkToMake>
-						<SightsEfficiency>2.28</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>2.21</SwayFactor>
-						<Bulk>12.51</Bulk>
-						<Mass>12.90</Mass>
-						<RangedWeapon_Cooldown>3.55</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>205</Steel>
-						<ComponentIndustrial>12</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_127x108mm_FMJ</defaultProjectile>
-						<warmupTime>6.09</warmupTime>
-						<range>47</range>
-						<soundCast>ShotAMRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>15</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_127x108mm</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SniperRifle</li>
-						<li>Bipod_AMR</li>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PTRS-41_RWP</defName>
-					<statBases>
-						<WorkToMake>72000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>2.63</SwayFactor>
-						<Bulk>21.20</Bulk>
-						<Mass>17.30</Mass>
-						<RangedWeapon_Cooldown>4.05</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>250</Steel>
-						<ComponentIndustrial>10</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_145x114mm_FMJ</defaultProjectile>
-						<warmupTime>6.63</warmupTime>
-						<range>40</range>
-						<soundCast>ShotAMRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>15</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>4</AmmoGenPerMagOverride>
-						<reloadTime>1.6</reloadTime>
-						<ammoSet>AmmoSet_145x114mm</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SniperRifle</li>
-						<li>Bipod_AMR</li>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PTRD-41_RWP</defName>
-					<statBases>
-						<WorkToMake>68000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>2.89</SwayFactor>
-						<Bulk>22.00</Bulk>
-						<Mass>20.30</Mass>
-						<RangedWeapon_Cooldown>4.05</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>240</Steel>
-						<ComponentIndustrial>9</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_145x114mm_FMJ</defaultProjectile>
-						<warmupTime>6.42</warmupTime>
-						<range>40</range>
-						<soundCast>ShotAMRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>15</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_145x114mm</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SniperRifle</li>
-						<li>Bipod_AMR</li>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rambo Weapons Pack/RamboWeaponsPack_assaultrifles.xml b/Patches/Rambo Weapons Pack/RamboWeaponsPack_assaultrifles.xml
deleted file mode 100644
index 591347712e..0000000000
--- a/Patches/Rambo Weapons Pack/RamboWeaponsPack_assaultrifles.xml	
+++ /dev/null
@@ -1,2793 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rambo Weapons Pack (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AssaultRifle</defName>
-					<statBases>
-						<WorkToMake>43000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.35</SwayFactor>
-						<Bulk>10.03</Bulk>
-						<Mass>3.44</Mass>
-						<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>65</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.49</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>0.9</warmupTime>
-						<range>31</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_ChargeRifle</defName>
-					<statBases>
-						<WorkToMake>70000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.35</SwayFactor>
-						<Bulk>10.03</Bulk>
-						<Mass>3.44</Mass>
-						<RangedWeapon_Cooldown>2.00</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Plasteel>50</Plasteel>
-						<ComponentSpacer>2</ComponentSpacer>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_PlasmaCellRifle</defaultProjectile>
-						<recoilAmount>1</recoilAmount>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-						<warmupTime>1.0</warmupTime>
-						<range>25.9</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_PlasmaCellRifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AK-47_RWP</defName>
-					<statBases>
-						<WorkToMake>37000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<Bulk>9.43</Bulk>
-						<Mass>3.47</Mass>
-						<RangedWeapon_Cooldown>1.59</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>85</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<recoilAmount>1.82</recoilAmount>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>1.0</warmupTime>
-						<range>25.9</range>
-						<soundCast>Shot762x39</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AK-74_RWP</defName>
-					<statBases>
-						<WorkToMake>36500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.25</SwayFactor>
-						<Bulk>9.43</Bulk>
-						<Mass>3.07</Mass>
-						<RangedWeapon_Cooldown>1.29</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>70</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<recoilAmount>1.46</recoilAmount>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>0.9</warmupTime>
-						<range>30</range>
-						<soundCast>Shot545x39</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AK-74M_RWP</defName>
-					<statBases>
-						<WorkToMake>38500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.28</SwayFactor>
-						<Bulk>7.00</Bulk>
-						<Mass>3.40</Mass>
-						<RangedWeapon_Cooldown>1.27</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>72</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<recoilAmount>1.38</recoilAmount>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>0.9</warmupTime>
-						<range>31</range>
-						<soundCast>Shot545x39</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AK-101_RWP</defName>
-					<statBases>
-						<WorkToMake>39000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.30</SwayFactor>
-						<Bulk>7.00</Bulk>
-						<Mass>3.60</Mass>
-						<RangedWeapon_Cooldown>1.27</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>72</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.42</recoilAmount>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>0.91</warmupTime>
-						<range>31</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AK-102_RWP</defName>
-					<statBases>
-						<WorkToMake>38500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.22</SwayFactor>
-						<Bulk>5.86</Bulk>
-						<Mass>3.00</Mass>
-						<RangedWeapon_Cooldown>1.31</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>73</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.51</recoilAmount>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>0.85</warmupTime>
-						<range>30</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AK-103_RWP</defName>
-					<statBases>
-						<WorkToMake>38700</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.28</SwayFactor>
-						<Bulk>7.05</Bulk>
-						<Mass>3.40</Mass>
-						<RangedWeapon_Cooldown>1.57</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>78</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<recoilAmount>1.83</recoilAmount>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>0.91</warmupTime>
-						<range>29</range>
-						<soundCast>Shot762x39</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AK-104_RWP</defName>
-					<statBases>
-						<WorkToMake>38200</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.12</SwayFactor>
-						<Bulk>5.86</Bulk>
-						<Mass>3.20</Mass>
-						<RangedWeapon_Cooldown>1.61</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>78</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<recoilAmount>1.89</recoilAmount>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>0.85</warmupTime>
-						<range>28</range>
-						<soundCast>Shot762x39</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AK-105_RWP</defName>
-					<statBases>
-						<WorkToMake>38000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.14</SwayFactor>
-						<Bulk>5.86</Bulk>
-						<Mass>3.20</Mass>
-						<RangedWeapon_Cooldown>1.31</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>78</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<recoilAmount>1.38</recoilAmount>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>0.85</warmupTime>
-						<range>30</range>
-						<soundCast>Shot545x39</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AKM_RWP</defName>
-					<statBases>
-						<WorkToMake>36000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.19</SwayFactor>
-						<Bulk>8.80</Bulk>
-						<Mass>3.10</Mass>
-						<RangedWeapon_Cooldown>1.58</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>77</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<recoilAmount>1.92</recoilAmount>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>0.91</warmupTime>
-						<range>28</range>
-						<soundCast>Shot762x39</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AKMS_RWP</defName>
-					<statBases>
-						<WorkToMake>36500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.25</SwayFactor>
-						<Bulk>6.55</Bulk>
-						<Mass>3.30</Mass>
-						<RangedWeapon_Cooldown>1.61</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>76</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<recoilAmount>1.86</recoilAmount>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>0.86</warmupTime>
-						<range>28</range>
-						<soundCast>Shot762x39</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AKS-47_RWP</defName>
-					<statBases>
-						<WorkToMake>37500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.24</SwayFactor>
-						<Bulk>6.45</Bulk>
-						<Mass>3.67</Mass>
-						<RangedWeapon_Cooldown>1.61</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>75</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<recoilAmount>1.77</recoilAmount>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>0.86</warmupTime>
-						<range>27</range>
-						<soundCast>Shot762x39</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AKS-74_RWP</defName>
-					<statBases>
-						<WorkToMake>37100</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.24</SwayFactor>
-						<Bulk>6.90</Bulk>
-						<Mass>2.97</Mass>
-						<RangedWeapon_Cooldown>1.32</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>81</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<recoilAmount>1.48</recoilAmount>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>0.86</warmupTime>
-						<range>30</range>
-						<soundCast>Shot545x39</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AKS-74U_RWP</defName>
-					<statBases>
-						<WorkToMake>32800</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.01</SwayFactor>
-						<Bulk>4.90</Bulk>
-						<Mass>2.70</Mass>
-						<RangedWeapon_Cooldown>1.19</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>52</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<recoilAmount>1.40</recoilAmount>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>0.53</warmupTime>
-						<range>26</range>
-						<soundCast>Shot545x39</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AKS-74UB_RWP</defName>
-					<statBases>
-						<WorkToMake>32800</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.01</SwayFactor>
-						<Bulk>6.95</Bulk>
-						<Mass>3.00</Mass>
-						<RangedWeapon_Cooldown>1.19</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>52</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<recoilAmount>1.33</recoilAmount>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>0.53</warmupTime>
-						<range>26</range>
-						<soundCast>ShotASVal</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AN-94_RWP</defName>
-					<statBases>
-						<WorkToMake>56100</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.25</SwayFactor>
-						<Bulk>7.28</Bulk>
-						<Mass>3.85</Mass>
-						<RangedWeapon_Cooldown>0.80</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>80</Steel>
-						<ComponentIndustrial>8</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<recoilAmount>1.04</recoilAmount>
-						<burstShotCount>2</burstShotCount>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<warmupTime>0.57</warmupTime>
-						<range>30</range>
-						<soundCast>Shot545x39</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AS_Val_RWP</defName>
-					<statBases>
-						<WorkToMake>61500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.25</SwayFactor>
-						<Bulk>7.28</Bulk>
-						<Mass>3.85</Mass>
-						<RangedWeapon_Cooldown>1.20</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>102</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_9x39mmSoviet_FMJ</defaultProjectile>
-						<recoilAmount>1.94</recoilAmount>
-						<warmupTime>0.95</warmupTime>
-						<range>27</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>ShotASVal</soundCast>
-						<muzzleFlashScale>11</muzzleFlashScale>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_ASh-127_RWP</defName>
-					<statBases>
-						<WorkToMake>85000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.62</SwayFactor>
-						<Bulk>10.20</Bulk>
-						<Mass>6.00</Mass>
-						<RangedWeapon_Cooldown>2.55</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>100</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_127x55mm_FMJ</defaultProjectile>
-						<recoilAmount>2.68</recoilAmount>
-						<warmupTime>1.20</warmupTime>
-						<range>22</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>Shot762x39</soundCast>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_127x55mm</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AUG_A1_RWP</defName>
-					<statBases>
-						<WorkToMake>49900</WorkToMake>
-						<SightsEfficiency>1.59</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.18</SwayFactor>
-						<Bulk>8.05</Bulk>
-						<Mass>3.60</Mass>
-						<RangedWeapon_Cooldown>1.28</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>20</Chemfuel>
-						<Steel>65</Steel>
-						<ComponentIndustrial>9</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.47</recoilAmount>
-						<warmupTime>0.97</warmupTime>
-						<range>34</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AUG_A1_Carbine_RWP</defName>
-					<statBases>
-						<WorkToMake>49900</WorkToMake>
-						<SightsEfficiency>1.59</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.04</SwayFactor>
-						<Bulk>6.90</Bulk>
-						<Mass>3.30</Mass>
-						<RangedWeapon_Cooldown>1.33</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>68</Steel>
-						<ComponentIndustrial>9</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.49</recoilAmount>
-						<warmupTime>0.85</warmupTime>
-						<range>34</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AUG_A3_Carbine_RWP</defName>
-					<statBases>
-						<WorkToMake>47000</WorkToMake>
-						<SightsEfficiency>1.59</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.03</SwayFactor>
-						<Bulk>6.90</Bulk>
-						<Mass>3.20</Mass>
-						<RangedWeapon_Cooldown>1.30</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>65</Steel>
-						<ComponentIndustrial>8</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.51</recoilAmount>
-						<warmupTime>0.80</warmupTime>
-						<range>30</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Daewoo_K2_RWP</defName>
-					<statBases>
-						<WorkToMake>39800</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.31</SwayFactor>
-						<Bulk>7.30</Bulk>
-						<Mass>3.26</Mass>
-						<RangedWeapon_Cooldown>1.30</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>64</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.44</recoilAmount>
-						<warmupTime>0.92</warmupTime>
-						<range>30</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_F2000_RWP</defName>
-					<statBases>
-						<WorkToMake>56500</WorkToMake>
-						<SightsEfficiency>1.60</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.19</SwayFactor>
-						<Bulk>9.13</Bulk>
-						<Mass>3.60</Mass>
-						<RangedWeapon_Cooldown>1.23</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>59</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.41</recoilAmount>
-						<warmupTime>1.05</warmupTime>
-						<range>35</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_F2000_Tactical_RWP</defName>
-					<statBases>
-						<WorkToMake>54500</WorkToMake>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.17</SwayFactor>
-						<Bulk>9.13</Bulk>
-						<Mass>3.39</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>85</Steel>
-						<ComponentIndustrial>9</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.46</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_FAMAS_F1_RWP</defName>
-					<statBases>
-						<WorkToMake>45500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.12</SwayFactor>
-						<Bulk>7.57</Bulk>
-						<Mass>3.61</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>53</Steel>
-						<ComponentIndustrial>8</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.44</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>40</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>Bipod_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_FAMAS_G1_RWP</defName>
-					<statBases>
-						<WorkToMake>46000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.14</SwayFactor>
-						<Bulk>7.57</Bulk>
-						<Mass>3.80</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>53</Steel>
-						<ComponentIndustrial>8</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.40</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>40</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>Bipod_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_FAMAS_G2_RWP</defName>
-					<statBases>
-						<WorkToMake>46200</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.14</SwayFactor>
-						<Bulk>7.57</Bulk>
-						<Mass>3.80</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>56</Steel>
-						<ComponentIndustrial>8</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.40</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>51</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>Bipod_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_G11_K2_RWP</defName>
-					<statBases>
-						<WorkToMake>66000</WorkToMake>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.11</SwayFactor>
-						<Bulk>8.50</Bulk>
-						<Mass>3.60</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>95</Steel>
-						<ComponentIndustrial>10</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_473x33mmCaseless_FMJ</defaultProjectile>
-						<recoilAmount>1.30</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<warmupTime>1</warmupTime>
-						<range>48</range>
-						<soundCast>ShotG11</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>45</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_473x33mmCaseless</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_G36_RWP</defName>
-					<statBases>
-						<WorkToMake>53500</WorkToMake>
-						<SightsEfficiency>1.68</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.39</SwayFactor>
-						<Bulk>7.58</Bulk>
-						<Mass>3.63</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>70</Steel>
-						<ComponentIndustrial>8</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.42</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>1.4</warmupTime>
-						<range>48</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_G36C_RWP</defName>
-					<statBases>
-						<WorkToMake>49500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.00</SwayFactor>
-						<Bulk>5.00</Bulk>
-						<Mass>2.82</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>64</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.43</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>0.9</warmupTime>
-						<range>31</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_G36K_RWP</defName>
-					<statBases>
-						<WorkToMake>52500</WorkToMake>
-						<SightsEfficiency>1.68</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.22</SwayFactor>
-						<Bulk>6.15</Bulk>
-						<Mass>3.30</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>77</Steel>
-						<ComponentIndustrial>8</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.44</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>1.4</warmupTime>
-						<range>40</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Galil_AR_556mm_RWP</defName>
-					<statBases>
-						<WorkToMake>41500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.37</SwayFactor>
-						<Bulk>7.42</Bulk>
-						<Mass>3.95</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>8</Chemfuel>
-						<Steel>78</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.39</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>51</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>35</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Galil_MAR_556mm_RWP</defName>
-					<statBases>
-						<WorkToMake>36800</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>0.99</SwayFactor>
-						<Bulk>4.45</Bulk>
-						<Mass>2.95</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>8</Chemfuel>
-						<Steel>58</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.39</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>40</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>35</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Galil_SAR_556mm_RWP</defName>
-					<statBases>
-						<WorkToMake>41000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.10</ShotSpread>
-						<SwayFactor>1.22</SwayFactor>
-						<Bulk>6.14</Bulk>
-						<Mass>3.75</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>8</Chemfuel>
-						<Steel>74</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.39</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>40</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>35</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_HK416_D10RS_RWP</defName>
-					<statBases>
-						<WorkToMake>54000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.10</SwayFactor>
-						<Bulk>7.01</Bulk>
-						<Mass>3.02</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>82</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.44</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>40</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_HK416_D145RS_RWP</defName>
-					<statBases>
-						<WorkToMake>54500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.10</ShotSpread>
-						<SwayFactor>1.25</SwayFactor>
-						<Bulk>8.04</Bulk>
-						<Mass>3.49</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>79</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.42</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Howa_Type_89_RWP</defName>
-					<statBases>
-						<WorkToMake>45200</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>0.89</SwayFactor>
-						<Bulk>10.16</Bulk>
-						<Mass>3.50</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>70</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.42</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>Bipod_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_L85A1_RWP</defName>
-					<statBases>
-						<WorkToMake>40000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.17</SwayFactor>
-						<Bulk>7.85</Bulk>
-						<Mass>3.82</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>70</Steel>
-						<ComponentIndustrial>8</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.37</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_L85A2_RWP</defName>
-					<statBases>
-						<WorkToMake>44500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.17</SwayFactor>
-						<Bulk>7.85</Bulk>
-						<Mass>3.82</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>68</Steel>
-						<ComponentIndustrial>8</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.37</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_LR-300-ML_RWP</defName>
-					<statBases>
-						<WorkToMake>46500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.13</SwayFactor>
-						<Bulk>5.79</Bulk>
-						<Mass>3.10</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>62</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.54</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>40</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_M4_RWP</defName>
-					<statBases>
-						<WorkToMake>45200</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.10</ShotSpread>
-						<SwayFactor>1.11</SwayFactor>
-						<Bulk>7.57</Bulk>
-						<Mass>2.68</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>69</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.62</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_M16A1_RWP</defName>
-					<statBases>
-						<WorkToMake>44500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.30</SwayFactor>
-						<Bulk>9.86</Bulk>
-						<Mass>3.18</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>68</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.58</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_M16A2_RWP</defName>
-					<statBases>
-						<WorkToMake>45000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.35</SwayFactor>
-						<Bulk>10.06</Bulk>
-						<Mass>3.40</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>68</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.49</recoilAmount>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_M16A2_RWP</defName>
-					<statBases>
-						<WorkToMake>45500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.35</SwayFactor>
-						<Bulk>10.06</Bulk>
-						<Mass>3.40</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>71</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.49</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MKb42_H_RWP</defName>
-					<statBases>
-						<WorkToMake>34500</WorkToMake>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.10</ShotSpread>
-						<SwayFactor>1.43</SwayFactor>
-						<Bulk>9.40</Bulk>
-						<Mass>4.90</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>8</WoodLog>
-						<Steel>62</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_792x33mmKurz_FMJ</defaultProjectile>
-						<recoilAmount>1.50</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>40</range>
-						<soundCast>Shot792x33</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_792x33mmKurz</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_OTs-14-1A-01_Groza-1_RWP</defName>
-					<statBases>
-						<WorkToMake>43500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>0.88</SwayFactor>
-						<Bulk>6.10</Bulk>
-						<Mass>2.70</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>8</Chemfuel>
-						<WoodLog>10</WoodLog>
-						<Steel>78</Steel>
-						<ComponentIndustrial>8</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<recoilAmount>2.07</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>40</range>
-						<soundCast>Shot762x39</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_OTs-14-4A-01_Groza-4_RWP</defName>
-					<statBases>
-						<WorkToMake>55300</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>0.88</SwayFactor>
-						<Bulk>6.10</Bulk>
-						<Mass>2.70</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>8</Chemfuel>
-						<WoodLog>10</WoodLog>
-						<Steel>83</Steel>
-						<ComponentIndustrial>8</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_9x39mmSoviet_FMJ</defaultProjectile>
-						<recoilAmount>1.89</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>31</range>
-						<soundCast>Shot545x39</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_9x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SA_vz58P_RWP</defName>
-					<statBases>
-						<WorkToMake>38000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.14</SwayFactor>
-						<Bulk>8.45</Bulk>
-						<Mass>2.91</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>80</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<recoilAmount>1.97</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<soundCast>Shot762x39</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SA_vz58V_RWP</defName>
-					<statBases>
-						<WorkToMake>38800</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.14</SwayFactor>
-						<Bulk>6.36</Bulk>
-						<Mass>2.91</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>8</Chemfuel>
-						<Steel>81</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<recoilAmount>1.97</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<soundCast>Shot762x39</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SCAR-L_CQC_RWP</defName>
-					<statBases>
-						<WorkToMake>53000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.09</SwayFactor>
-						<Bulk>5.33</Bulk>
-						<Mass>3.04</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>78</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.41</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>40</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SCAR-L_LB_RWP</defName>
-					<statBases>
-						<WorkToMake>55000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.34</SwayFactor>
-						<Bulk>7.36</Bulk>
-						<Mass>3.49</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>81</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.47</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SCAR-L_STD_RWP</defName>
-					<statBases>
-						<WorkToMake>53800</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.10</ShotSpread>
-						<SwayFactor>1.22</SwayFactor>
-						<Bulk>6.35</Bulk>
-						<Mass>3.29</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>79</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.47</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SG_550_RWP</defName>
-					<statBases>
-						<WorkToMake>47500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.40</SwayFactor>
-						<Bulk>7.72</Bulk>
-						<Mass>4.10</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>73</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.33</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>Bipod_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SG_551_RWP</defName>
-					<statBases>
-						<WorkToMake>47000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.10</ShotSpread>
-						<SwayFactor>1.17</SwayFactor>
-						<Bulk>6.07</Bulk>
-						<Mass>3.40</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>72</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.41</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SG_552_RWP</defName>
-					<statBases>
-						<WorkToMake>46300</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.05</SwayFactor>
-						<Bulk>5.04</Bulk>
-						<Mass>3.20</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>70</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.35</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>40</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_StG44_RWP</defName>
-					<statBases>
-						<WorkToMake>35000</WorkToMake>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.40</SwayFactor>
-						<Bulk>9.40</Bulk>
-						<Mass>4.60</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>8</WoodLog>
-						<Steel>63</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_792x33mmKurz_FMJ</defaultProjectile>
-						<recoilAmount>1.51</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>40</range>
-						<soundCast>Shot792x33</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_792x33mmKurz</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Tavor_CTAR-21_RWP</defName>
-					<statBases>
-						<WorkToMake>45700</WorkToMake>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>0.96</SwayFactor>
-						<Bulk>6.40</Bulk>
-						<Mass>3.18</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>68</Steel>
-						<ComponentIndustrial>8</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.50</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>1</warmupTime>
-						<range>48</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Tavor_TAR-21_RWP</defName>
-					<statBases>
-						<WorkToMake>46200</WorkToMake>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.05</SwayFactor>
-						<Bulk>7.20</Bulk>
-						<Mass>3.27</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>70</Steel>
-						<ComponentIndustrial>8</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.49</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_TKB-022PM_RWP</defName>
-					<statBases>
-						<WorkToMake>42000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.10</ShotSpread>
-						<SwayFactor>0.80</SwayFactor>
-						<Bulk>5.25</Bulk>
-						<Mass>2.80</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>70</Steel>
-						<ComponentIndustrial>8</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<recoilAmount>2.02</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>44</range>
-						<soundCast>Shot762x39</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_VSS_Vintorez_RWP</defName>
-					<statBases>
-						<WorkToMake>65000</WorkToMake>
-						<SightsEfficiency>1.75</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.19</SwayFactor>
-						<Bulk>8.94</Bulk>
-						<Mass>2.60</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>8</Chemfuel>
-						<WoodLog>10</WoodLog>
-						<Steel>100</Steel>
-						<ComponentIndustrial>10</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_9x39mmSoviet_FMJ</defaultProjectile>
-						<recoilAmount>1.90</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>1.5</warmupTime>
-						<range>40</range>
-						<soundCast>ShotASVal</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>0</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Zastava_M70_RWP</defName>
-					<statBases>
-						<WorkToMake>37000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.29</SwayFactor>
-						<Bulk>9.20</Bulk>
-						<Mass>3.70</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>82</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<recoilAmount>1.76</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>44</range>
-						<soundCast>Shot762x39</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Zastava_M70A_RWP</defName>
-					<statBases>
-						<WorkToMake>37500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>6.70</Bulk>
-						<Mass>3.50</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>81</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<recoilAmount>1.81</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>44</range>
-						<soundCast>Shot762x39</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rambo Weapons Pack/RamboWeaponsPack_base.xml b/Patches/Rambo Weapons Pack/RamboWeaponsPack_base.xml
deleted file mode 100644
index 772d00f15b..0000000000
--- a/Patches/Rambo Weapons Pack/RamboWeaponsPack_base.xml	
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rambo Weapons Pack (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@ParentName = "BaseRamboGun"]/tools</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name = "BaseRamboGun"]</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Mercenary_Sniper" or defName="Mercenary_Sniper_Acidifier"]/weaponMoney</xpath>
-					<value>
-						<weaponMoney>475~600</weaponMoney>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Medusa_M-47</defName>
-							<label>9mm up to .357 Magnum</label>
-							<ammoTypes>
-								<Ammo_357Magnum_FMJ>Bullet_357Magnum_FMJ</Ammo_357Magnum_FMJ>
-								<Ammo_357Magnum_AP>Bullet_357Magnum_AP</Ammo_357Magnum_AP>
-								<Ammo_357Magnum_HP>Bullet_357Magnum_HP</Ammo_357Magnum_HP>
-								<Ammo_38Special_FMJ>Bullet_38Special_FMJ</Ammo_38Special_FMJ>
-								<Ammo_38Special_AP>Bullet_38Special_AP</Ammo_38Special_AP>
-								<Ammo_38Special_HP>Bullet_38Special_HP</Ammo_38Special_HP>
-								<Ammo_9x19mmPara_FMJ>Bullet_9x19mmPara_FMJ</Ammo_9x19mmPara_FMJ>
-								<Ammo_9x19mmPara_AP>Bullet_9x19mmPara_AP</Ammo_9x19mmPara_AP>
-								<Ammo_9x19mmPara_HP>Bullet_9x19mmPara_HP</Ammo_9x19mmPara_HP>
-								<Ammo_380ACP_FMJ>Bullet_380ACP_FMJ</Ammo_380ACP_FMJ>
-								<Ammo_380ACP_AP>Bullet_380ACP_AP</Ammo_380ACP_AP>
-								<Ammo_380ACP_HP>Bullet_380ACP_HP</Ammo_380ACP_HP>
-								<Ammo_38ACP_FMJ>Bullet_38ACP_FMJ</Ammo_38ACP_FMJ>
-								<Ammo_762x25mmTokarev_FMJ>Bullet_762x25mmTokarev_FMJ</Ammo_762x25mmTokarev_FMJ>
-								<Ammo_762x25mmTokarev_AP>Bullet_762x25mmTokarev_AP</Ammo_762x25mmTokarev_AP>
-								<Ammo_762x25mmTokarev_HP>Bullet_762x25mmTokarev_HP</Ammo_762x25mmTokarev_HP>
-								<Ammo_763x25mmMauser_FMJ>Bullet_763x25mmMauser_FMJ</Ammo_763x25mmMauser_FMJ>
-								<Ammo_9x21mmGyurza_FMJ>Bullet_9x21mmGyurza_FMJ</Ammo_9x21mmGyurza_FMJ>
-								<Ammo_9x21mmGyurza_AP>Bullet_9x21mmGyurza_AP</Ammo_9x21mmGyurza_AP>
-								<Ammo_9x21mmGyurza_HP>Bullet_9x21mmGyurza_HP</Ammo_9x21mmGyurza_HP>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rambo Weapons Pack/RamboWeaponsPack_battlerifles.xml b/Patches/Rambo Weapons Pack/RamboWeaponsPack_battlerifles.xml
deleted file mode 100644
index 1536dcc1c6..0000000000
--- a/Patches/Rambo Weapons Pack/RamboWeaponsPack_battlerifles.xml	
+++ /dev/null
@@ -1,624 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rambo Weapons Pack (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AVT-40_RWP</defName>
-					<statBases>
-						<WorkToMake>32000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.61</SwayFactor>
-						<Bulk>12.26</Bulk>
-						<Mass>3.85</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>57</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<recoilAmount>2.09</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>ShotSemiAutoRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_C1A1_SLR_RWP</defName>
-					<statBases>
-						<WorkToMake>40000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.58</SwayFactor>
-						<Bulk>11.43</Bulk>
-						<Mass>4.34</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>80</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>ShotBattleRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</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>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Fal_50_00_RWP</defName>
-					<statBases>
-						<WorkToMake>67000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.52</SwayFactor>
-						<Bulk>10.90</Bulk>
-						<Mass>4.30</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>106</Steel>
-						<ComponentIndustrial>8</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>2.07</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>ShotBattleRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</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>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Fal_50_61_RWP</defName>
-					<statBases>
-						<WorkToMake>67400</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.49</SwayFactor>
-						<Bulk>8.45</Bulk>
-						<Mass>3.90</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>113</Steel>
-						<ComponentIndustrial>8</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>2.18</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>ShotBattleRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</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>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_G3_RWP</defName>
-					<statBases>
-						<WorkToMake>66500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.46</SwayFactor>
-						<Bulk>10.23</Bulk>
-						<Mass>4.40</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>110</Steel>
-						<ComponentIndustrial>8</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<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>
-						<soundCast>ShotBattleRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</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>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_G3A3_RWP</defName>
-					<statBases>
-						<WorkToMake>67500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.46</SwayFactor>
-						<Bulk>10.23</Bulk>
-						<Mass>4.40</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>115</Steel>
-						<ComponentIndustrial>8</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<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>
-						<soundCast>ShotBattleRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</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>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_G3A4_RWP</defName>
-					<statBases>
-						<WorkToMake>67200</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.50</SwayFactor>
-						<Bulk>8.40</Bulk>
-						<Mass>4.70</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>8</Chemfuel>
-						<Steel>117</Steel>
-						<ComponentIndustrial>8</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.94</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>ShotBattleRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</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>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_G3KA4_RWP</defName>
-					<statBases>
-						<WorkToMake>67200</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.31</SwayFactor>
-						<Bulk>7.11</Bulk>
-						<Mass>4.10</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>8</Chemfuel>
-						<Steel>117</Steel>
-						<ComponentIndustrial>8</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>2.05</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>ShotBattleRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</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>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Howa_Type_64_RWP</defName>
-					<statBases>
-						<WorkToMake>65000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.00</SwayFactor>
-						<Bulk>10.90</Bulk>
-						<Mass>4.40</Mass>
-						<RangedWeapon_Cooldown>0.57</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>8</WoodLog>
-						<Steel>104</Steel>
-						<ComponentIndustrial>8</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.84</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<soundCast>ShotBattleRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</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>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>Bipod_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_L1A1_SLR_RWP</defName>
-					<statBases>
-						<WorkToMake>40000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.58</SwayFactor>
-						<Bulk>11.43</Bulk>
-						<Mass>4.34</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>75</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>ShotBattleRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</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>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_M14_RWP</defName>
-					<statBases>
-						<WorkToMake>35000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.53</SwayFactor>
-						<Bulk>11.20</Bulk>
-						<Mass>4.10</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>60</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>2.14</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>52</range>
-						<soundCast>ShotBattleRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</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>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SCAR-H_CQC_RWP</defName>
-					<statBases>
-						<WorkToMake>69000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.24</SwayFactor>
-						<Bulk>6.35</Bulk>
-						<Mass>3.49</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>12</Chemfuel>
-						<Steel>102</Steel>
-						<ComponentIndustrial>8</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>2.12</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>40</range>
-						<soundCast>ShotBattleRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</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>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SCAR-H_LB_RWP</defName>
-					<statBases>
-						<WorkToMake>73000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.44</SwayFactor>
-						<Bulk>8.13</Bulk>
-						<Mass>3.72</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>12</Chemfuel>
-						<Steel>104</Steel>
-						<ComponentIndustrial>8</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>2.05</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>ShotBattleRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</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>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SCAR-H_STD_RWP</defName>
-					<statBases>
-						<WorkToMake>70000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>7.11</Bulk>
-						<Mass>3.58</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>12</Chemfuel>
-						<Steel>103</Steel>
-						<ComponentIndustrial>8</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>2.09</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<soundCast>ShotBattleRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</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>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rambo Weapons Pack/RamboWeaponsPack_heavy.xml b/Patches/Rambo Weapons Pack/RamboWeaponsPack_heavy.xml
deleted file mode 100644
index 3428d8bfc9..0000000000
--- a/Patches/Rambo Weapons Pack/RamboWeaponsPack_heavy.xml	
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rambo Weapons Pack (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_China_Lake_RWP</defName>
-					<statBases>
-						<WorkToMake>45600</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.25</SwayFactor>
-						<Bulk>8.75</Bulk>
-						<Mass>3.72</Mass>
-						<RangedWeapon_Cooldown>1.01</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>90</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<warmupTime>1.1</warmupTime>
-						<range>40</range>
-						<minRange>5</minRange>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<soundCast>ShotPumpGrenadeLauncher</soundCast>
-						<muzzleFlashScale>14</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>3</magazineSize>
-						<reloadTime>6.00</reloadTime>
-						<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>GrenadeDestructive</li>
-						<li>CE_AI_Launcher</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_M79_RWP</defName>
-					<statBases>
-						<WorkToMake>39500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.00</SwayFactor>
-						<Bulk>7.31</Bulk>
-						<Mass>2.70</Mass>
-						<RangedWeapon_Cooldown>0.43</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>75</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<warmupTime>1.1</warmupTime>
-						<range>40</range>
-						<minRange>5</minRange>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<muzzleFlashScale>14</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
-						<reloadTime>2.6</reloadTime>
-						<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>GrenadeDestructive</li>
-						<li>CE_AI_Launcher</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_XM25_CDTE_RWP</defName>
-					<statBases>
-						<WorkToMake>55000</WorkToMake>
-						<SightsEfficiency>1.62</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.40</SwayFactor>
-						<Bulk>7.49</Bulk>
-						<Mass>6.35</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>115</Steel>
-						<ComponentIndustrial>8</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_25x40mmGrenade_HE</defaultProjectile>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<warmupTime>1.3</warmupTime>
-						<range>55</range>
-						<minRange>5</minRange>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<muzzleFlashScale>14</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_25x40mmGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>GrenadeDestructive</li>
-						<li>CE_AI_Launcher</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rambo Weapons Pack/RamboWeaponsPack_machineguns.xml b/Patches/Rambo Weapons Pack/RamboWeaponsPack_machineguns.xml
deleted file mode 100644
index 33febd2a4b..0000000000
--- a/Patches/Rambo Weapons Pack/RamboWeaponsPack_machineguns.xml	
+++ /dev/null
@@ -1,1235 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rambo Weapons Pack (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Bren_Mk1_RWP</defName>
-					<statBases>
-						<WorkToMake>68000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.51</SwayFactor>
-						<Bulk>13.56</Bulk>
-						<Mass>10.04</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>8</WoodLog>
-						<Steel>147</Steel>
-						<ComponentIndustrial>9</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
-						<recoilAmount>1.24</recoilAmount>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>59</range>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_303British</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>CE_MachineGun</li>
-						<li>Bipod_LMG</li>
-						<li>CE_AI_Suppressive</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Chauchat_Mle_1915_RWP</defName>
-					<statBases>
-						<WorkToMake>52000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.44</SwayFactor>
-						<Bulk>11.43</Bulk>
-						<Mass>9.07</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>8</WoodLog>
-						<Steel>147</Steel>
-						<ComponentIndustrial>9</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_8x50mmRLebel_FMJ</defaultProjectile>
-						<recoilAmount>1.30</recoilAmount>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>31</range>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_8x50mmRLebel</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>CE_MachineGun</li>
-						<li>Bipod_LMG</li>
-						<li>CE_AI_Suppressive</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_DP-28_RWP</defName>
-					<statBases>
-						<WorkToMake>74500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.53</SwayFactor>
-						<Bulk>14.70</Bulk>
-						<Mass>9.12</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>8</WoodLog>
-						<Steel>173</Steel>
-						<ComponentIndustrial>12</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<recoilAmount>1.32</recoilAmount>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>75</range>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>47</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>CE_MachineGun</li>
-						<li>Bipod_LMG</li>
-						<li>CE_AI_Suppressive</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_DPM_RWP</defName>
-					<statBases>
-						<WorkToMake>76000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.53</SwayFactor>
-						<Bulk>14.70</Bulk>
-						<Mass>9.12</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>8</WoodLog>
-						<Steel>175</Steel>
-						<ComponentIndustrial>12</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<recoilAmount>1.32</recoilAmount>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>75</range>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>47</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>CE_MachineGun</li>
-						<li>Bipod_LMG</li>
-						<li>CE_AI_Suppressive</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Galil_ARM_556mm_RWP</defName>
-					<statBases>
-						<WorkToMake>48500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>0.99</SwayFactor>
-						<Bulk>8.42</Bulk>
-						<Mass>4.35</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>8</WoodLog>
-						<Steel>83</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<recoilAmount>1.28</recoilAmount>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>51</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>CE_MachineGun</li>
-						<li>Bipod_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_HK21_RWP</defName>
-					<statBases>
-						<WorkToMake>82200</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>13.21</Bulk>
-						<Mass>7.92</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>178</Steel>
-						<ComponentIndustrial>12</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.46</recoilAmount>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>75</range>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>CE_MachineGun</li>
-						<li>Bipod_LMG</li>
-						<li>CE_AI_Suppressive</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Lewis_Gun_RWP</defName>
-					<statBases>
-						<WorkToMake>70000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.72</SwayFactor>
-						<Bulk>14.83</Bulk>
-						<Mass>11.80</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>8</WoodLog>
-						<Steel>175</Steel>
-						<ComponentIndustrial>12</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
-						<recoilAmount>1.13</recoilAmount>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>75</range>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>47</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_303British</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>CE_MachineGun</li>
-						<li>Bipod_LMG</li>
-						<li>CE_AI_Suppressive</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_M60_RWP</defName>
-					<statBases>
-						<WorkToMake>81000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.47</SwayFactor>
-						<Bulk>13.67</Bulk>
-						<Mass>10.40</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>175</Steel>
-						<ComponentIndustrial>12</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.31</recoilAmount>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>75</range>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>CE_MachineGun</li>
-						<li>Bipod_LMG</li>
-						<li>CE_AI_Suppressive</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_M240B_RWP</defName>
-					<statBases>
-						<WorkToMake>83000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.26</SwayFactor>
-						<Bulk>18.35</Bulk>
-						<Mass>12.70</Mass>
-						<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>179</Steel>
-						<ComponentIndustrial>12</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.31</recoilAmount>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>75</range>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>CE_MachineGun</li>
-						<li>Bipod_LMG</li>
-						<li>CE_AI_Suppressive</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_M249_RWP</defName>
-					<statBases>
-						<WorkToMake>75000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.26</SwayFactor>
-						<Bulk>13.35</Bulk>
-						<Mass>7.70</Mass>
-						<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>167</Steel>
-						<ComponentIndustrial>12</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>0.92</recoilAmount>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>75</range>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>200</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>CE_MachineGun</li>
-						<li>Bipod_SAW</li>
-						<li>CE_AI_Suppressive</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_M1918_BAR_RWP</defName>
-					<statBases>
-						<WorkToMake>69000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.92</SwayFactor>
-						<Bulk>11.94</Bulk>
-						<Mass>7.25</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>155</Steel>
-						<ComponentIndustrial>9</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
-						<recoilAmount>1.52</recoilAmount>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>51</range>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_3006Springfield</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>CE_MachineGun</li>
-						<li>CE_AI_Suppressive</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MG3_RWP</defName>
-					<statBases>
-						<WorkToMake>84500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.59</SwayFactor>
-						<Bulk>15.25</Bulk>
-						<Mass>10.50</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>172</Steel>
-						<ComponentIndustrial>13</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<recoilAmount>1.27</recoilAmount>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>75</range>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>CE_MachineGun</li>
-						<li>Bipod_LMG</li>
-						<li>CE_AI_Suppressive</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MG34_RWP</defName>
-					<statBases>
-						<WorkToMake>80000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.59</SwayFactor>
-						<Bulk>15.20</Bulk>
-						<Mass>10.50</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>177</Steel>
-						<ComponentIndustrial>12</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-						<recoilAmount>1.32</recoilAmount>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>75</range>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>CE_MachineGun</li>
-						<li>Bipod_LMG</li>
-						<li>CE_AI_Suppressive</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MG42_RWP</defName>
-					<statBases>
-						<WorkToMake>82000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.66</SwayFactor>
-						<Bulk>15.20</Bulk>
-						<Mass>11.57</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>175</Steel>
-						<ComponentIndustrial>13</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-						<recoilAmount>1.24</recoilAmount>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>75</range>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>CE_MachineGun</li>
-						<li>Bipod_LMG</li>
-						<li>CE_AI_Suppressive</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PK_RWP</defName>
-					<statBases>
-						<WorkToMake>83000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.45</SwayFactor>
-						<Bulk>14.73</Bulk>
-						<Mass>9.00</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>8</WoodLog>
-						<Steel>179</Steel>
-						<ComponentIndustrial>12</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<recoilAmount>1.32</recoilAmount>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>75</range>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>CE_MachineGun</li>
-						<li>Bipod_LMG</li>
-						<li>CE_AI_Suppressive</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PKM_RWP</defName>
-					<statBases>
-						<WorkToMake>84500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.34</SwayFactor>
-						<Bulk>14.60</Bulk>
-						<Mass>7.50</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>182</Steel>
-						<ComponentIndustrial>12</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<recoilAmount>1.45</recoilAmount>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>75</range>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>CE_MachineGun</li>
-						<li>Bipod_LMG</li>
-						<li>CE_AI_Suppressive</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PKP_Pecheneg_RWP</defName>
-					<statBases>
-						<WorkToMake>86800</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.42</SwayFactor>
-						<Bulk>14.55</Bulk>
-						<Mass>8.70</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>187</Steel>
-						<ComponentIndustrial>12</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<recoilAmount>1.34</recoilAmount>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>75</range>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>CE_MachineGun</li>
-						<li>Bipod_LMG</li>
-						<li>CE_AI_Suppressive</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_RPD_RWP</defName>
-					<statBases>
-						<WorkToMake>71500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.24</SwayFactor>
-						<Bulk>13.37</Bulk>
-						<Mass>7.40</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>160</Steel>
-						<ComponentIndustrial>12</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<recoilAmount>1.22</recoilAmount>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>62</range>
-						<soundCast>Shot762x39</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>CE_MachineGun</li>
-						<li>Bipod_SAW</li>
-						<li>CE_AI_Suppressive</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_RPK_RWP</defName>
-					<statBases>
-						<WorkToMake>70000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.06</SwayFactor>
-						<Bulk>12.40</Bulk>
-						<Mass>4.80</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>162</Steel>
-						<ComponentIndustrial>11</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<recoilAmount>1.54</recoilAmount>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>62</range>
-						<soundCast>Shot762x39</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>75</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>CE_MachineGun</li>
-						<li>Bipod_SAW</li>
-						<li>CE_AI_Suppressive</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_RPK-74_RWP</defName>
-					<statBases>
-						<WorkToMake>69000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.07</SwayFactor>
-						<Bulk>11.60</Bulk>
-						<Mass>4.70</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>160</Steel>
-						<ComponentIndustrial>10</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<recoilAmount>1.17</recoilAmount>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>75</range>
-						<soundCast>Shot545x39</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>45</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>CE_MachineGun</li>
-						<li>Bipod_SAW</li>
-						<li>CE_AI_Suppressive</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_RPKS_RWP</defName>
-					<statBases>
-						<WorkToMake>68000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.09</SwayFactor>
-						<Bulk>9.20</Bulk>
-						<Mass>5.10</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>165</Steel>
-						<ComponentIndustrial>10</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<recoilAmount>1.50</recoilAmount>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>62</range>
-						<soundCast>Shot762x39</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>40</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>CE_MachineGun</li>
-						<li>Bipod_SAW</li>
-						<li>CE_AI_Suppressive</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_RPKS-74_RWP</defName>
-					<statBases>
-						<WorkToMake>69800</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.08</SwayFactor>
-						<Bulk>9.45</Bulk>
-						<Mass>4.85</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>163</Steel>
-						<ComponentIndustrial>10</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<recoilAmount>1.15</recoilAmount>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>75</range>
-						<soundCast>Shot545x39</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>45</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>CE_MachineGun</li>
-						<li>Bipod_SAW</li>
-						<li>CE_AI_Suppressive</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Zastava_M53_RWP</defName>
-					<statBases>
-						<WorkToMake>81500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.66</SwayFactor>
-						<Bulk>15.20</Bulk>
-						<Mass>11.50</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>8</WoodLog>
-						<Steel>175</Steel>
-						<ComponentIndustrial>13</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-						<recoilAmount>1.24</recoilAmount>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>75</range>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>CE_MachineGun</li>
-						<li>Bipod_LMG</li>
-						<li>CE_AI_Suppressive</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Zastava_M72_RWP</defName>
-					<statBases>
-						<WorkToMake>45400</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.09</SwayFactor>
-						<Bulk>11.25</Bulk>
-						<Mass>5.37</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>135</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<recoilAmount>1.46</recoilAmount>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>59</range>
-						<soundCast>Shot762x39</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>CE_MachineGun</li>
-						<li>Bipod_SAW</li>
-						<li>CE_AI_Suppressive</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rambo Weapons Pack/RamboWeaponsPack_pistols.xml b/Patches/Rambo Weapons Pack/RamboWeaponsPack_pistols.xml
deleted file mode 100644
index 6b41403d0e..0000000000
--- a/Patches/Rambo Weapons Pack/RamboWeaponsPack_pistols.xml	
+++ /dev/null
@@ -1,1782 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rambo Weapons Pack (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Autopistol</defName>
-					<statBases>
-						<WorkToMake>15000</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.07</SwayFactor>
-						<Bulk>2.10</Bulk>
-						<Mass>1.11</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Beretta_92f_RWP</defName>
-					<statBases>
-						<WorkToMake>15800</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.04</SwayFactor>
-						<Bulk>2.17</Bulk>
-						<Mass>0.95</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>28</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Beretta_92fs_Inox_RWP</defName>
-					<statBases>
-						<WorkToMake>16200</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.04</SwayFactor>
-						<Bulk>2.17</Bulk>
-						<Mass>0.95</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>29</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Browning_Hi-Power_P35_RWP</defName>
-					<statBases>
-						<WorkToMake>15000</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.99</SwayFactor>
-						<Bulk>1.97</Bulk>
-						<Mass>1.00</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>27</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>13</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Colt_Anaconda_RWP</defName>
-					<statBases>
-						<WorkToMake>28000</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.48</SwayFactor>
-						<Bulk>2.95</Bulk>
-						<Mass>1.50</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>44</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_44Magnum_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Revolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_44Magnum</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>Revolver</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Colt_Python_RWP</defName>
-					<statBases>
-						<WorkToMake>24200</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.38</SwayFactor>
-						<Bulk>2.92</Bulk>
-						<Mass>1.22</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>38</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_357Magnum_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Revolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_357Magnum_Revolver</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>Revolver</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_CZ_75B_RWP</defName>
-					<statBases>
-						<WorkToMake>15400</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.02</SwayFactor>
-						<Bulk>2.06</Bulk>
-						<Mass>1.00</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>29</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>16</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_CZ_75B_Full_Auto_RWP</defName>
-					<statBases>
-						<WorkToMake>15400</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.18</SwayFactor>
-						<Bulk>2.40</Bulk>
-						<Mass>1.15</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>34</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<recoilAmount>2.19</recoilAmount>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Desert_Eagle_44_RWP</defName>
-					<statBases>
-						<WorkToMake>30500</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.58</SwayFactor>
-						<Bulk>2.73</Bulk>
-						<Mass>2.00</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>46</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_44Magnum_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>ShotHeavyPistol</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_44Magnum</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Desert_Eagle_50AE_RWP</defName>
-					<statBases>
-						<WorkToMake>34200</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.58</SwayFactor>
-						<Bulk>2.73</Bulk>
-						<Mass>2.00</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>52</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_50AE_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>ShotHeavyPistol</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_50AE</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Desert_Eagle_357_RWP</defName>
-					<statBases>
-						<WorkToMake>25000</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.58</SwayFactor>
-						<Bulk>2.73</Bulk>
-						<Mass>2.00</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_357Magnum_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>ShotHeavyPistol</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>9</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_357Magnum_Revolver</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Fort-12_RWP</defName>
-					<statBases>
-						<WorkToMake>15500</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>0.88</SwayFactor>
-						<Bulk>1.80</Bulk>
-						<Mass>0.83</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>28</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<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>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_FP-45_Liberator_RWP</defName>
-					<statBases>
-						<WorkToMake>4000</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>0.62</SwayFactor>
-						<Bulk>1.41</Bulk>
-						<Mass>0.45</Mass>
-						<RangedWeapon_Cooldown>0.93</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>18</Steel>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>6</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>5</AmmoGenPerMagOverride>
-						<reloadTime>7.5</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Glock_17_RWP</defName>
-					<statBases>
-						<WorkToMake>15500</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.92</SwayFactor>
-						<Bulk>2.04</Bulk>
-						<Mass>0.71</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>6</Chemfuel>
-						<Steel>23</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>17</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Glock_17L_RWP</defName>
-					<statBases>
-						<WorkToMake>16700</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.06</SwayFactor>
-						<Bulk>2.43</Bulk>
-						<Mass>0.75</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>6</Chemfuel>
-						<Steel>30</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>17</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Glock_18_RWP</defName>
-					<statBases>
-						<WorkToMake>23200</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.98</SwayFactor>
-						<Bulk>2.04</Bulk>
-						<Mass>0.90</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>6</Chemfuel>
-						<Steel>31</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<recoilAmount>2.52</recoilAmount>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>33</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Glock_19_RWP</defName>
-					<statBases>
-						<WorkToMake>15000</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>0.85</SwayFactor>
-						<Bulk>1.87</Bulk>
-						<Mass>0.67</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>6</Chemfuel>
-						<Steel>21</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Glock_26_RWP</defName>
-					<statBases>
-						<WorkToMake>14800</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>0.76</SwayFactor>
-						<Bulk>1.65</Bulk>
-						<Mass>0.62</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>6</Chemfuel>
-						<Steel>20</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Jericho_941R_RWP</defName>
-					<statBases>
-						<WorkToMake>16200</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.05</SwayFactor>
-						<Bulk>2.07</Bulk>
-						<Mass>1.09</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>27</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>16</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Luger_P08_RWP</defName>
-					<statBases>
-						<WorkToMake>13500</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>1.03</SwayFactor>
-						<Bulk>2.22</Bulk>
-						<Mass>0.87</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>27</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Mauser_C96_RWP</defName>
-					<statBases>
-						<WorkToMake>12500</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.46</SwayFactor>
-						<Bulk>3.12</Bulk>
-						<Mass>1.25</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>33</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_763x25mmMauser_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>6</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_763x25mmMauser</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MCM_RWP</defName>
-					<statBases>
-						<WorkToMake>19000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.12</SwayFactor>
-						<Bulk>2.45</Bulk>
-						<Mass>0.91</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>38</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_22LR_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>5</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_22LR</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Medusa_M-47_RWP</defName>
-					<statBases>
-						<WorkToMake>26700</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>0.97</SwayFactor>
-						<Bulk>1.82</Bulk>
-						<Mass>1.08</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>35</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_357Magnum_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Revolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_Medusa_M-47</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>Revolver</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MG2R_RWP</defName>
-					<statBases>
-						<WorkToMake>22200</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.39</SwayFactor>
-						<Bulk>3.00</Bulk>
-						<Mass>1.16</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>35</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_22LR_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>5</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.75</reloadTime>
-						<ammoSet>AmmoSet_22LR</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MP-443_Grach_RWP</defName>
-					<statBases>
-						<WorkToMake>16500</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.98</SwayFactor>
-						<Bulk>1.98</Bulk>
-						<Mass>0.95</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>31</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>18</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Nagant_M1895_RWP</defName>
-					<statBases>
-						<WorkToMake>11800</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.06</SwayFactor>
-						<Bulk>2.35</Bulk>
-						<Mass>0.82</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>24</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x38mmR_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>ShotHeavyPistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>5.95</reloadTime>
-						<ammoSet>AmmoSet_762x38mmR</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>Revolver</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_P38_RWP</defName>
-					<statBases>
-						<WorkToMake>12500</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.99</SwayFactor>
-						<Bulk>2.16</Bulk>
-						<Mass>0.80</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>26</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_P38K_RWP</defName>
-					<statBases>
-						<WorkToMake>12000</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.19</ShotSpread>
-						<SwayFactor>0.79</SwayFactor>
-						<Bulk>1.61</Bulk>
-						<Mass>0.75</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Pardini_SP_RWP</defName>
-					<statBases>
-						<WorkToMake>21000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.35</SwayFactor>
-						<Bulk>2.95</Bulk>
-						<Mass>1.10</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>35</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_22LR_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>5</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_22LR</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PB_RWP</defName>
-					<statBases>
-						<WorkToMake>14800</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>1.35</SwayFactor>
-						<Bulk>3.10</Bulk>
-						<Mass>0.95</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_9x18mmMakarov_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>ShotSuppressedPistol</soundCast>
-						<muzzleFlashScale>3</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PM_RWP</defName>
-					<statBases>
-						<WorkToMake>13500</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>0.78</SwayFactor>
-						<Bulk>1.62</Bulk>
-						<Mass>0.73</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<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>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PMM_RWP</defName>
-					<statBases>
-						<WorkToMake>14000</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>0.82</SwayFactor>
-						<Bulk>1.69</Bulk>
-						<Mass>0.76</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>27</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<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>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Raging_Judge_RWP</defName>
-					<statBases>
-						<WorkToMake>36300</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.84</SwayFactor>
-						<Bulk>3.45</Bulk>
-						<Mass>2.07</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>54</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_454Casull_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Revolver</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_454Casull</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>Revolver</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Remington_Model_95_RWP</defName>
-					<statBases>
-						<WorkToMake>5500</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.20</ShotSpread>
-						<SwayFactor>0.52</SwayFactor>
-						<Bulk>1.24</Bulk>
-						<Mass>0.31</Mass>
-						<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>17</Steel>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_41Rimfire_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>6</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>5</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>2</magazineSize>
-						<reloadTime>1.6</reloadTime>
-						<ammoSet>AmmoSet_41Rimfire</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SP89_RWP</defName>
-					<statBases>
-						<WorkToMake>14800</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.53</SwayFactor>
-						<Bulk>3.30</Bulk>
-						<Mass>2.00</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>6</Chemfuel>
-						<Steel>37</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SW_Model_500_RWP</defName>
-					<statBases>
-						<WorkToMake>41000</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.94</SwayFactor>
-						<Bulk>3.81</Bulk>
-						<Mass>2.02</Mass>
-						<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>58</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_500SWMagnum_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Revolver</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_500SWMagnum</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Tec-9_RWP</defName>
-					<statBases>
-						<WorkToMake>16500</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.52</SwayFactor>
-						<Bulk>3.17</Bulk>
-						<Mass>1.40</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>6</Chemfuel>
-						<Steel>32</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_TT-33_RWP</defName>
-					<statBases>
-						<WorkToMake>11000</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.93</SwayFactor>
-						<Bulk>1.94</Bulk>
-						<Mass>0.84</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>6</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_USP9_RWP</defName>
-					<statBases>
-						<WorkToMake>16300</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.90</SwayFactor>
-						<Bulk>1.94</Bulk>
-						<Mass>0.75</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>6</Chemfuel>
-						<Steel>32</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_USP45_RWP</defName>
-					<statBases>
-						<WorkToMake>16700</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.93</SwayFactor>
-						<Bulk>2.01</Bulk>
-						<Mass>0.79</Mass>
-						<RangedWeapon_Cooldown>0.40</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>6</Chemfuel>
-						<Steel>35</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_UZI_Pistol_RWP</defName>
-					<statBases>
-						<WorkToMake>15500</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.37</SwayFactor>
-						<Bulk>2.40</Bulk>
-						<Mass>1.70</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>33</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PP_RWP</defName>
-					<statBases>
-						<WorkToMake>12800</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>0.79</SwayFactor>
-						<Bulk>1.70</Bulk>
-						<Mass>0.67</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>26</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_380ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_380ACP</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PPK_RWP</defName>
-					<statBases>
-						<WorkToMake>12300</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.19</ShotSpread>
-						<SwayFactor>0.71</SwayFactor>
-						<Bulk>1.55</Bulk>
-						<Mass>0.59</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_380ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_380ACP</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Welrod_Mk1_RWP</defName>
-					<statBases>
-						<WorkToMake>8000</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>1.70</SwayFactor>
-						<Bulk>2.33</Bulk>
-						<Mass>1.50</Mass>
-						<RangedWeapon_Cooldown>1.16</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>29</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>8</range>
-						<soundCast>ShotSuppressedPistol</soundCast>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Welrod_Mk2_RWP</defName>
-					<statBases>
-						<WorkToMake>7600</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>1.40</SwayFactor>
-						<Bulk>3.10</Bulk>
-						<Mass>1.09</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>28</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_32ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>8</range>
-						<soundCast>ShotSuppressedPistol</soundCast>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_32ACP</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_Pistol</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rambo Weapons Pack/RamboWeaponsPack_rifles.xml b/Patches/Rambo Weapons Pack/RamboWeaponsPack_rifles.xml
deleted file mode 100644
index c39dbbcbf8..0000000000
--- a/Patches/Rambo Weapons Pack/RamboWeaponsPack_rifles.xml	
+++ /dev/null
@@ -1,766 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rambo Weapons Pack (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_BoltActionRifle</defName>
-					<statBases>
-						<WorkToMake>25000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1.68</SwayFactor>
-						<Bulk>12.60</Bulk>
-						<Mass>4.19</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_303British</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Arisaka_Type_38_RWP</defName>
-					<statBases>
-						<WorkToMake>23000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.69</SwayFactor>
-						<Bulk>12.75</Bulk>
-						<Mass>4.19</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>46</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_65x50mmSRArisaka_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>51</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_65x50mmSRArisaka</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Arisaka_Type_99_Long_RWP</defName>
-					<statBases>
-						<WorkToMake>23500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.64</SwayFactor>
-						<Bulk>12.58</Bulk>
-						<Mass>3.80</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>49</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_77x58mmArisaka_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_77x58mmArisaka</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Cx4_Storm_RWP</defName>
-					<statBases>
-						<WorkToMake>20000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.01</SwayFactor>
-						<Bulk>7.55</Bulk>
-						<Mass>2.58</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>20</range>
-						<soundCast>ShotLightSemiAutoRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>8</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_De_Lisle_Commando_Carbine_RWP</defName>
-					<statBases>
-						<WorkToMake>17500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>8.94</Bulk>
-						<Mass>3.74</Mass>
-						<RangedWeapon_Cooldown>1.16</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>20</range>
-						<soundCast>ShotSuppressedPistol</soundCast>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_G43_RWP</defName>
-					<statBases>
-						<WorkToMake>31000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.57</SwayFactor>
-						<Bulk>11.30</Bulk>
-						<Mass>4.40</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>59</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>ShotSemiAutoRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Kar_98k_RWP</defName>
-					<statBases>
-						<WorkToMake>24000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.48</SwayFactor>
-						<Bulk>11.10</Bulk>
-						<Mass>3.70</Mass>
-						<RangedWeapon_Cooldown>1.18</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>48</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_M1_Carbine_RWP</defName>
-					<statBases>
-						<WorkToMake>21500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.15</SwayFactor>
-						<Bulk>9.04</Bulk>
-						<Mass>2.49</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>43</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_30Carbine_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>37</range>
-						<soundCast>ShotLightSemiAutoRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>8</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_30Carbine</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_M1_Garand_RWP</defName>
-					<statBases>
-						<WorkToMake>28000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.34</SwayFactor>
-						<Bulk>9.05</Bulk>
-						<Mass>4.31</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>53</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>52</range>
-						<soundCast>ShotSemiAutoRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_3006Springfield</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_M1A1_Carbine_RWP</defName>
-					<statBases>
-						<WorkToMake>22500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.19</SwayFactor>
-						<Bulk>6.48</Bulk>
-						<Mass>2.81</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_30Carbine_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>37</range>
-						<soundCast>ShotLightSemiAutoRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>8</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_30Carbine</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_M2_Carbine_RWP</defName>
-					<statBases>
-						<WorkToMake>28000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.15</SwayFactor>
-						<Bulk>9.05</Bulk>
-						<Mass>2.49</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>45</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_30Carbine_FMJ</defaultProjectile>
-						<recoilAmount>1.85</recoilAmount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>37</range>
-						<soundCast>ShotLightSemiAutoRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>8</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_30Carbine</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MAS-36_RWP</defName>
-					<statBases>
-						<WorkToMake>24800</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.39</SwayFactor>
-						<Bulk>10.20</Bulk>
-						<Mass>3.72</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>49</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_75x54mmFrench_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_75x54mmFrench</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Mle_1886_RWP</defName>
-					<statBases>
-						<WorkToMake>22700</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.72</SwayFactor>
-						<Bulk>13.00</Bulk>
-						<Mass>4.18</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>45</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_8x50mmRLebel_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>8.5</reloadTime>
-						<ammoSet>AmmoSet_8x50mmRLebel</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MN91-30_RWP</defName>
-					<statBases>
-						<WorkToMake>21000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.63</SwayFactor>
-						<Bulk>12.32</Bulk>
-						<Mass>4.00</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>52</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SKS-45_RWP</defName>
-					<statBases>
-						<WorkToMake>24000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.41</SwayFactor>
-						<Bulk>10.20</Bulk>
-						<Mass>3.85</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>45</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<soundCast>Shot762x39</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Springfield_M1903_RWP</defName>
-					<statBases>
-						<WorkToMake>24500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.49</SwayFactor>
-						<Bulk>10.97</Bulk>
-						<Mass>3.94</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>49</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_3006Springfield</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Springfield_M1903A1_RWP</defName>
-					<statBases>
-						<WorkToMake>25500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.49</SwayFactor>
-						<Bulk>10.97</Bulk>
-						<Mass>3.94</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>51</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_3006Springfield</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Springfield_M1903A3_RWP</defName>
-					<statBases>
-						<WorkToMake>24000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.49</SwayFactor>
-						<Bulk>10.97</Bulk>
-						<Mass>3.94</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>47</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_3006Springfield</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SVT-40_RWP</defName>
-					<statBases>
-						<WorkToMake>29000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.61</SwayFactor>
-						<Bulk>12.26</Bulk>
-						<Mass>3.85</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>56</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>ShotSemiAutoRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Winchester_M1873_RWP</defName>
-					<statBases>
-						<WorkToMake>24500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1.68</SwayFactor>
-						<Bulk>12.52</Bulk>
-						<Mass>4.30</Mass>
-						<RangedWeapon_Cooldown>0.76</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_44-40Winchester_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>12.75</reloadTime>
-						<ammoSet>AmmoSet_44-40Winchester</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rambo Weapons Pack/RamboWeaponsPack_shotguns.xml b/Patches/Rambo Weapons Pack/RamboWeaponsPack_shotguns.xml
deleted file mode 100644
index 5a258932cc..0000000000
--- a/Patches/Rambo Weapons Pack/RamboWeaponsPack_shotguns.xml	
+++ /dev/null
@@ -1,896 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rambo Weapons Pack (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_ChainShotgun</defName>
-					<statBases>
-						<WorkToMake>45000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.44</SwayFactor>
-						<Bulk>9.66</Bulk>
-						<Mass>4.76</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>60</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>2.36</recoilAmount>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>ShotAutoShotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PumpShotgun</defName>
-					<statBases>
-						<WorkToMake>30000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.39</SwayFactor>
-						<Bulk>10.28</Bulk>
-						<Mass>3.60</Mass>
-						<RangedWeapon_Cooldown>0.99</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>55</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.25</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AA-12_RWP</defName>
-					<statBases>
-						<WorkToMake>45500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.44</SwayFactor>
-						<Bulk>9.66</Bulk>
-						<Mass>4.76</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>63</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>2.36</recoilAmount>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>ShotAutoShotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Browning_Auto-5_RWP</defName>
-					<statBases>
-						<WorkToMake>33000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.68</SwayFactor>
-						<Bulk>12.70</Bulk>
-						<Mass>4.10</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>60</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>ShotAutoShotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.25</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Fort-500_RWP</defName>
-					<statBases>
-						<WorkToMake>29500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.42</SwayFactor>
-						<Bulk>10.42</Bulk>
-						<Mass>3.80</Mass>
-						<RangedWeapon_Cooldown>0.99</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>54</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>5.95</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Fort-500FS_RWP</defName>
-					<statBases>
-						<WorkToMake>30500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.41</SwayFactor>
-						<Bulk>7.55</Bulk>
-						<Mass>3.90</Mass>
-						<RangedWeapon_Cooldown>0.99</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>3</WoodLog>
-						<Steel>54</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>5.95</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Fort-500P_RWP</defName>
-					<statBases>
-						<WorkToMake>28000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.06</SwayFactor>
-						<Bulk>7.55</Bulk>
-						<Mass>3.00</Mass>
-						<RangedWeapon_Cooldown>1.00</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>3</WoodLog>
-						<Steel>54</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>5.95</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Ithaca_37_Riot_RWP</defName>
-					<statBases>
-						<WorkToMake>29800</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.46</SwayFactor>
-						<Bulk>10.06</Bulk>
-						<Mass>4.50</Mass>
-						<RangedWeapon_Cooldown>0.98</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>55</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.25</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Ithaca_37_Stakeout_RWP</defName>
-					<statBases>
-						<WorkToMake>26000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>0.81</SwayFactor>
-						<Bulk>5.08</Bulk>
-						<Mass>3.00</Mass>
-						<RangedWeapon_Cooldown>0.99</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>6</Chemfuel>
-						<Steel>51</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.25</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Ithaca_37_Trench_RWP</defName>
-					<statBases>
-						<WorkToMake>30800</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.46</SwayFactor>
-						<Bulk>10.06</Bulk>
-						<Mass>4.50</Mass>
-						<RangedWeapon_Cooldown>0.98</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>56</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.25</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_KS-23_RWP</defName>
-					<statBases>
-						<WorkToMake>36000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.43</SwayFactor>
-						<Bulk>10.40</Bulk>
-						<Mass>3.85</Mass>
-						<RangedWeapon_Cooldown>1.01</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>3</WoodLog>
-						<Chemfuel>2</Chemfuel>
-						<Steel>83</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_23x75mmR_Slug</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>16</range>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>4</magazineSize>
-						<reloadTime>3.4</reloadTime>
-						<ammoSet>AmmoSet_23x75mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_KS-23M_RWP</defName>
-					<statBases>
-						<WorkToMake>36500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<Bulk>6.50</Bulk>
-						<Mass>3.50</Mass>
-						<RangedWeapon_Cooldown>1.01</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>6</Chemfuel>
-						<Steel>83</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_23x75mmR_Slug</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>16</range>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>4</magazineSize>
-						<reloadTime>3.4</reloadTime>
-						<ammoSet>AmmoSet_23x75mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Saiga-12K_RWP</defName>
-					<statBases>
-						<WorkToMake>38000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<Bulk>6.50</Bulk>
-						<Mass>3.50</Mass>
-						<RangedWeapon_Cooldown>1.01</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>67</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>ShotAutoShotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.25</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SPAS-12_RWP</defName>
-					<statBases>
-						<WorkToMake>39000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.48</SwayFactor>
-						<Bulk>8.05</Bulk>
-						<Mass>4.36</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>6</Chemfuel>
-						<Steel>69</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>ShotAutoShotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>9</magazineSize>
-						<reloadTime>7.65</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_TOZ-34_RWP</defName>
-					<statBases>
-						<WorkToMake>20000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.49</SwayFactor>
-						<Bulk>11.60</Bulk>
-						<Mass>3.30</Mass>
-						<RangedWeapon_Cooldown>0.41</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>40</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<recoilAmount>0.75</recoilAmount>
-						<burstShotCount>2</burstShotCount>
-						<ticksBetweenBurstShots>0</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>ShotAutoShotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>2</magazineSize>
-						<reloadTime>2.2</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_TOZ-34_Sawed-off_RWP</defName>
-					<statBases>
-						<WorkToMake>15000</WorkToMake>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.19</ShotSpread>
-						<SwayFactor>0.76</SwayFactor>
-						<Bulk>5.80</Bulk>
-						<Mass>1.80</Mass>
-						<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>3</WoodLog>
-						<Steel>27</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<recoilAmount>0.75</recoilAmount>
-						<burstShotCount>2</burstShotCount>
-						<ticksBetweenBurstShots>0</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>ShotAutoShotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>2</magazineSize>
-						<reloadTime>1.7</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_TOZ-66_RWP</defName>
-					<statBases>
-						<WorkToMake>20000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.45</SwayFactor>
-						<Bulk>11.30</Bulk>
-						<Mass>3.20</Mass>
-						<RangedWeapon_Cooldown>0.41</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>40</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>0.75</recoilAmount>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<burstShotCount>2</burstShotCount>
-						<ticksBetweenBurstShots>0</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>ShotAutoShotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>2</magazineSize>
-						<reloadTime>2.2</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_TOZ-66_Sawed-off_RWP</defName>
-					<statBases>
-						<WorkToMake>15000</WorkToMake>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.20</ShotSpread>
-						<SwayFactor>0.68</SwayFactor>
-						<Bulk>5.09</Bulk>
-						<Mass>1.70</Mass>
-						<RangedWeapon_Cooldown>0.43</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>3</WoodLog>
-						<Steel>27</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>0.75</recoilAmount>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<burstShotCount>2</burstShotCount>
-						<ticksBetweenBurstShots>0</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>ShotAutoShotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>2</magazineSize>
-						<reloadTime>1.7</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Winchester_M1897_Riot_RWP</defName>
-					<statBases>
-						<WorkToMake>27800</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.36</SwayFactor>
-						<Bulk>10.00</Bulk>
-						<Mass>3.60</Mass>
-						<RangedWeapon_Cooldown>0.99</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>51</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>5.1</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Winchester_M1897_Trench_RWP</defName>
-					<statBases>
-						<WorkToMake>28500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.35</SwayFactor>
-						<Bulk>10.00</Bulk>
-						<Mass>3.50</Mass>
-						<RangedWeapon_Cooldown>0.99</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>52</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>5.1</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Winchester_M1912_Riot_RWP</defName>
-					<statBases>
-						<WorkToMake>28300</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.30</SwayFactor>
-						<Bulk>10.00</Bulk>
-						<Mass>2.95</Mass>
-						<RangedWeapon_Cooldown>1.00</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>52</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>5.1</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Winchester_M1912_Trench_RWP</defName>
-					<statBases>
-						<WorkToMake>29500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>10.28</Bulk>
-						<Mass>2.95</Mass>
-						<RangedWeapon_Cooldown>1.00</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>52</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>5.1</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rambo Weapons Pack/RamboWeaponsPack_sniperrifles.xml b/Patches/Rambo Weapons Pack/RamboWeaponsPack_sniperrifles.xml
deleted file mode 100644
index 0052cff5c0..0000000000
--- a/Patches/Rambo Weapons Pack/RamboWeaponsPack_sniperrifles.xml	
+++ /dev/null
@@ -1,683 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rambo Weapons Pack (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SniperRifle</defName>
-					<statBases>
-						<WorkToMake>89000</WorkToMake>
-						<SightsEfficiency>2.82</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>2.05</SwayFactor>
-						<Bulk>12.87</Bulk>
-						<Mass>15.07</Mass>
-						<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>162</Steel>
-						<ComponentIndustrial>11</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
-						<warmupTime>2.1</warmupTime>
-						<range>75</range>
-						<soundCast>Shot_SniperRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_338Lapua</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SniperRifle</li>
-						<li>Bipod_DMR</li>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AWSM_RWP</defName>
-					<statBases>
-						<WorkToMake>102500</WorkToMake>
-						<SightsEfficiency>2.1</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.41</SwayFactor>
-						<Bulk>11.16</Bulk>
-						<Mass>6.90</Mass>
-						<RangedWeapon_Cooldown>1.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>190</Steel>
-						<ComponentIndustrial>12</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
-						<warmupTime>2.1</warmupTime>
-						<range>75</range>
-						<soundCast>Shot_SniperRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_338Lapua</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SniperRifle</li>
-						<li>Bipod_DMR</li>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_M21_RWP</defName>
-					<statBases>
-						<WorkToMake>69500</WorkToMake>
-						<SightsEfficiency>2.04</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.74</SwayFactor>
-						<Bulk>11.18</Bulk>
-						<Mass>5.27</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>147</Steel>
-						<ComponentIndustrial>11</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>2</warmupTime>
-						<range>75</range>
-						<soundCast>ShotSemiAutoRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SniperRifle</li>
-						<li>Bipod_DMR</li>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_M40_RWP</defName>
-					<statBases>
-						<WorkToMake>78000</WorkToMake>
-						<SightsEfficiency>2.04</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.63</SwayFactor>
-						<Bulk>11.17</Bulk>
-						<Mass>4.20</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>155</Steel>
-						<ComponentIndustrial>10</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>2</warmupTime>
-						<range>75</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.25</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SniperRifle</li>
-						<li>Bipod_DMR</li>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Orsis_T-5000_338_RWP</defName>
-					<statBases>
-						<WorkToMake>99500</WorkToMake>
-						<SightsEfficiency>2.7</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.43</SwayFactor>
-						<Bulk>11.20</Bulk>
-						<Mass>6.50</Mass>
-						<RangedWeapon_Cooldown>1.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>3</Chemfuel>
-						<Steel>192</Steel>
-						<ComponentIndustrial>12</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
-						<warmupTime>3.1</warmupTime>
-						<range>75</range>
-						<soundCast>Shot_SniperRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_338Lapua</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SniperRifle</li>
-						<li>Bipod_DMR</li>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PSG1_RWP</defName>
-					<statBases>
-						<WorkToMake>100500</WorkToMake>
-						<SightsEfficiency>1.86</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>2.01</SwayFactor>
-						<Bulk>12.30</Bulk>
-						<Mass>7.20</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>189</Steel>
-						<ComponentIndustrial>14</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.7</warmupTime>
-						<range>75</range>
-						<soundCast>ShotSemiAutoRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SniperRifle</li>
-						<li>Bipod_DMR</li>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Steyr_Scout_RWP</defName>
-					<statBases>
-						<WorkToMake>71000</WorkToMake>
-						<SightsEfficiency>1.64</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>0.93</SwayFactor>
-						<Bulk>10.80</Bulk>
-						<Mass>3.20</Mass>
-						<RangedWeapon_Cooldown>1.38</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>140</Steel>
-						<ComponentIndustrial>9</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.33</warmupTime>
-						<range>48</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SniperRifle</li>
-						<li>Bipod_DMR</li>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SV-98_RWP</defName>
-					<statBases>
-						<WorkToMake>81500</WorkToMake>
-						<SightsEfficiency>2.10</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>13.00</Bulk>
-						<Mass>5.80</Mass>
-						<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>167</Steel>
-						<ComponentIndustrial>10</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>2.1</warmupTime>
-						<range>75</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SniperRifle</li>
-						<li>Bipod_DMR</li>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SVD_RWP</defName>
-					<statBases>
-						<WorkToMake>75000</WorkToMake>
-						<SightsEfficiency>1.74</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.70</SwayFactor>
-						<Bulk>12.25</Bulk>
-						<Mass>4.30</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>158</Steel>
-						<ComponentIndustrial>11</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>75</range>
-						<soundCast>ShotSemiAutoRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SniperRifle</li>
-						<li>Bipod_DMR</li>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SVU_RWP</defName>
-					<statBases>
-						<WorkToMake>78500</WorkToMake>
-						<SightsEfficiency>1.74</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.38</SwayFactor>
-						<Bulk>9.00</Bulk>
-						<Mass>4.40</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>155</Steel>
-						<ComponentIndustrial>12</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>75</range>
-						<soundCast>ShotSuppressedSniper</soundCast>
-						<muzzleFlashScale>3</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SniperRifle</li>
-						<li>Bipod_DMR</li>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_TRG-21_RWP</defName>
-					<statBases>
-						<WorkToMake>81000</WorkToMake>
-						<SightsEfficiency>2.10</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.24</SwayFactor>
-						<Bulk>13.00</Bulk>
-						<Mass>4.70</Mass>
-						<RangedWeapon_Cooldown>1.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>165</Steel>
-						<ComponentIndustrial>10</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>2.1</warmupTime>
-						<range>75</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SniperRifle</li>
-						<li>Bipod_DMR</li>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_TRG-22_RWP</defName>
-					<statBases>
-						<WorkToMake>82000</WorkToMake>
-						<SightsEfficiency>2.10</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.22</SwayFactor>
-						<Bulk>12.50</Bulk>
-						<Mass>4.90</Mass>
-						<RangedWeapon_Cooldown>1.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>170</Steel>
-						<ComponentIndustrial>10</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>2.1</warmupTime>
-						<range>75</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SniperRifle</li>
-						<li>Bipod_DMR</li>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_TRG-41_RWP</defName>
-					<statBases>
-						<WorkToMake>94000</WorkToMake>
-						<SightsEfficiency>2.10</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>13.00</Bulk>
-						<Mass>5.10</Mass>
-						<RangedWeapon_Cooldown>1.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>175</Steel>
-						<ComponentIndustrial>11</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_300WinchesterMagnum_FMJ</defaultProjectile>
-						<warmupTime>2.1</warmupTime>
-						<range>75</range>
-						<soundCast>Shot_SniperRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_300WinchesterMagnum</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SniperRifle</li>
-						<li>Bipod_DMR</li>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_TRG-42_RWP</defName>
-					<statBases>
-						<WorkToMake>97500</WorkToMake>
-						<SightsEfficiency>2.10</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.28</SwayFactor>
-						<Bulk>13.00</Bulk>
-						<Mass>5.30</Mass>
-						<RangedWeapon_Cooldown>1.38</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>185</Steel>
-						<ComponentIndustrial>12</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
-						<warmupTime>2.1</warmupTime>
-						<range>75</range>
-						<soundCast>Shot_SniperRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_338Lapua</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SniperRifle</li>
-						<li>Bipod_DMR</li>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_VSSK_Vykhlop_RWP</defName>
-					<statBases>
-						<WorkToMake>93000</WorkToMake>
-						<SightsEfficiency>1.98</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>12.20</Bulk>
-						<Mass>7.00</Mass>
-						<RangedWeapon_Cooldown>1.38</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>180</Steel>
-						<ComponentIndustrial>13</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_127x55mm_FMJ</defaultProjectile>
-						<warmupTime>1.9</warmupTime>
-						<range>62</range>
-						<soundCast>ShotSuppressedSniper</soundCast>
-						<muzzleFlashScale>3</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_127x55mm</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SniperRifle</li>
-						<li>Bipod_DMR</li>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_WA_2000_RWP</defName>
-					<statBases>
-						<WorkToMake>98000</WorkToMake>
-						<SightsEfficiency>2.10</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<Bulk>10.05</Bulk>
-						<Mass>7.51</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>190</Steel>
-						<ComponentIndustrial>12</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_300WinchesterMagnum_FMJ</defaultProjectile>
-						<warmupTime>2.1</warmupTime>
-						<range>68</range>
-						<soundCast>Shot_SniperRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_300WinchesterMagnum</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SniperRifle</li>
-						<li>Bipod_DMR</li>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rambo Weapons Pack/RamboWeaponsPack_submachineguns.xml b/Patches/Rambo Weapons Pack/RamboWeaponsPack_submachineguns.xml
deleted file mode 100644
index 2aaa9f6a38..0000000000
--- a/Patches/Rambo Weapons Pack/RamboWeaponsPack_submachineguns.xml	
+++ /dev/null
@@ -1,2672 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rambo Weapons Pack (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_HeavySMG</defName>
-					<statBases>
-						<WorkToMake>28000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>0.88</SwayFactor>
-						<Bulk>5.30</Bulk>
-						<Mass>3.50</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>75</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>2.00</recoilAmount>
-						<defaultProjectile>Bullet_44Magnum_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>11</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_HeavySMG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_44Magnum</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MachinePistol</defName>
-					<statBases>
-						<WorkToMake>26000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.02</SwayFactor>
-						<Bulk>4.70</Bulk>
-						<Mass>3.70</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>6</Chemfuel>
-						<Steel>42</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.27</recoilAmount>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_American-180_RWP</defName>
-					<statBases>
-						<WorkToMake>25000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.16</SwayFactor>
-						<Bulk>10.00</Bulk>
-						<Mass>2.60</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>45</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>0.84</recoilAmount>
-						<defaultProjectile>Bullet_22LR_FMJ</defaultProjectile>
-						<burstShotCount>16</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>6</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>165</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_22LR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>8</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Carl_Gustav_M45_RWP</defName>
-					<statBases>
-						<WorkToMake>22800</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.14</SwayFactor>
-						<Bulk>5.50</Bulk>
-						<Mass>3.35</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>37</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.38</recoilAmount>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>36</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_KP_M44_RWP</defName>
-					<statBases>
-						<WorkToMake>22700</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.13</SwayFactor>
-						<Bulk>6.20</Bulk>
-						<Mass>2.95</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>42</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.43</recoilAmount>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>36</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_KRISS_Vector_Gen1_RWP</defName>
-					<statBases>
-						<WorkToMake>35800</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>0.89</SwayFactor>
-						<Bulk>4.10</Bulk>
-						<Mass>2.72</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>42</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.43</recoilAmount>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>14</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_M3_RWP</defName>
-					<statBases>
-						<WorkToMake>21800</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.13</SwayFactor>
-						<Bulk>5.79</Bulk>
-						<Mass>3.70</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>37</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.50</recoilAmount>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_M3A1_RWP</defName>
-					<statBases>
-						<WorkToMake>21500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.12</SwayFactor>
-						<Bulk>5.79</Bulk>
-						<Mass>3.61</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>38</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.50</recoilAmount>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MAC-10_RWP</defName>
-					<statBases>
-						<WorkToMake>25000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>0.83</SwayFactor>
-						<Bulk>2.95</Bulk>
-						<Mass>2.84</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>45</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.71</recoilAmount>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MAC-11_RWP</defName>
-					<statBases>
-						<WorkToMake>24500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.69</SwayFactor>
-						<Bulk>2.48</Bulk>
-						<Mass>1.59</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>44</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.71</recoilAmount>
-						<defaultProjectile>Bullet_32ACP_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>6</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_32ACP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MAT-49_9x19mm_RWP</defName>
-					<statBases>
-						<WorkToMake>23100</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.02</SwayFactor>
-						<Bulk>4.04</Bulk>
-						<Mass>3.60</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>39</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.71</recoilAmount>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MAT-49_762x25mm_RWP</defName>
-					<statBases>
-						<WorkToMake>23500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.07</SwayFactor>
-						<Bulk>4.51</Bulk>
-						<Mass>3.65</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.22</recoilAmount>
-						<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>35</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Micro-UZI_RWP</defName>
-					<statBases>
-						<WorkToMake>22000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>0.71</SwayFactor>
-						<Bulk>2.82</Bulk>
-						<Mass>2.20</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>38</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.54</recoilAmount>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Mini-UZI_RWP</defName>
-					<statBases>
-						<WorkToMake>25300</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>0.89</SwayFactor>
-						<Bulk>3.60</Bulk>
-						<Mass>2.85</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>43</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.40</recoilAmount>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MP5-10A2_RWP</defName>
-					<statBases>
-						<WorkToMake>23500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>0.95</SwayFactor>
-						<Bulk>6.80</Bulk>
-						<Mass>2.70</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>53</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.94</recoilAmount>
-						<defaultProjectile>Bullet_10mmAuto_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_10mmAuto</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MP5-40A2_RWP</defName>
-					<statBases>
-						<WorkToMake>29800</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>0.97</SwayFactor>
-						<Bulk>6.80</Bulk>
-						<Mass>2.85</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>49</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.54</recoilAmount>
-						<defaultProjectile>Bullet_40SW_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_40SW</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MP5A1_RWP</defName>
-					<statBases>
-						<WorkToMake>26600</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>0.65</SwayFactor>
-						<Bulk>4.40</Bulk>
-						<Mass>2.10</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>41</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.69</recoilAmount>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MP5A2_RWP</defName>
-					<statBases>
-						<WorkToMake>27700</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>0.93</SwayFactor>
-						<Bulk>6.80</Bulk>
-						<Mass>2.50</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>46</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.55</recoilAmount>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MP5A3_RWP</defName>
-					<statBases>
-						<WorkToMake>28200</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.01</SwayFactor>
-						<Bulk>5.50</Bulk>
-						<Mass>3.10</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>6</Chemfuel>
-						<Steel>46</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.39</recoilAmount>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MP5K_RWP</defName>
-					<statBases>
-						<WorkToMake>25800</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.53</SwayFactor>
-						<Bulk>3.25</Bulk>
-						<Mass>2.00</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>6</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.68</recoilAmount>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>15</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MP5KA1_RWP</defName>
-					<statBases>
-						<WorkToMake>25500</WorkToMake>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.53</SwayFactor>
-						<Bulk>3.25</Bulk>
-						<Mass>2.00</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>6</Chemfuel>
-						<Steel>39</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.68</recoilAmount>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>15</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MP5K-PDW_RWP</defName>
-					<statBases>
-						<WorkToMake>27500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>0.85</SwayFactor>
-						<Bulk>3.68</Bulk>
-						<Mass>2.50</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>44</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.50</recoilAmount>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>15</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MP5SD1_RWP</defName>
-					<statBases>
-						<WorkToMake>31900</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>0.82</SwayFactor>
-						<Bulk>5.50</Bulk>
-						<Mass>2.70</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>6</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.26</recoilAmount>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>ShotSuppressedPistol</soundCast>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MP5SD2_RWP</defName>
-					<statBases>
-						<WorkToMake>33000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.10</SwayFactor>
-						<Bulk>7.90</Bulk>
-						<Mass>3.10</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>53</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.17</recoilAmount>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>ShotSuppressedPistol</soundCast>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MP5SD3_RWP</defName>
-					<statBases>
-						<WorkToMake>33500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.17</SwayFactor>
-						<Bulk>6.70</Bulk>
-						<Mass>3.60</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>6</Chemfuel>
-						<Steel>53</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.09</recoilAmount>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>ShotSuppressedPistol</soundCast>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MP7_RWP</defName>
-					<statBases>
-						<WorkToMake>33800</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>0.83</SwayFactor>
-						<Bulk>4.15</Bulk>
-						<Mass>1.90</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>6</Chemfuel>
-						<Steel>54</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.11</recoilAmount>
-						<defaultProjectile>Bullet_46x30mm_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>23</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>40</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_46x30mm</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MP-18_RWP</defName>
-					<statBases>
-						<WorkToMake>20000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.24</SwayFactor>
-						<Bulk>8.23</Bulk>
-						<Mass>4.18</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>26</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.17</recoilAmount>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MP-28_RWP</defName>
-					<statBases>
-						<WorkToMake>20700</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.22</SwayFactor>
-						<Bulk>8.20</Bulk>
-						<Mass>4.00</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>28</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.19</recoilAmount>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MP-38_RWP</defName>
-					<statBases>
-						<WorkToMake>23500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.25</SwayFactor>
-						<Bulk>6.30</Bulk>
-						<Mass>4.14</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.20</recoilAmount>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MP-40_RWP</defName>
-					<statBases>
-						<WorkToMake>22500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<Bulk>6.30</Bulk>
-						<Mass>3.97</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>38</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.23</recoilAmount>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MP-41_RWP</defName>
-					<statBases>
-						<WorkToMake>23600</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.22</SwayFactor>
-						<Bulk>8.35</Bulk>
-						<Mass>3.87</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>37</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.25</recoilAmount>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MP-3008_RWP</defName>
-					<statBases>
-						<WorkToMake>18000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.08</SwayFactor>
-						<Bulk>7.60</Bulk>
-						<Mass>3.20</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>37</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.19</recoilAmount>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_P90_RWP</defName>
-					<statBases>
-						<WorkToMake>36700</WorkToMake>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>0.77</SwayFactor>
-						<Bulk>5.05</Bulk>
-						<Mass>2.60</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.20</recoilAmount>
-						<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>0.5</warmupTime>
-						<range>23</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_FN57x28mm</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PP-9_Klin_RWP</defName>
-					<statBases>
-						<WorkToMake>25800</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.69</SwayFactor>
-						<Bulk>3.05</Bulk>
-						<Mass>1.54</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>43</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.83</recoilAmount>
-						<defaultProjectile>Bullet_9x18mmMakarov_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>17</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PP-19_Bizon-1_RWP</defName>
-					<statBases>
-						<WorkToMake>27000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>0.87</SwayFactor>
-						<Bulk>5.25</Bulk>
-						<Mass>2.10</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>6</Chemfuel>
-						<Steel>53</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.35</recoilAmount>
-						<defaultProjectile>Bullet_9x18mmMakarov_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>17</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>64</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PP-19_Bizon-2_RWP</defName>
-					<statBases>
-						<WorkToMake>27500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>0.90</SwayFactor>
-						<Bulk>5.60</Bulk>
-						<Mass>2.10</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>6</Chemfuel>
-						<Steel>53</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.35</recoilAmount>
-						<defaultProjectile>Bullet_9x18mmMakarov_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>17</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>64</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PP-19_Bizon-2-01_RWP</defName>
-					<statBases>
-						<WorkToMake>27500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>0.90</SwayFactor>
-						<Bulk>5.60</Bulk>
-						<Mass>2.10</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>6</Chemfuel>
-						<Steel>52</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.65</recoilAmount>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>53</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PP-91_Kedr_RWP</defName>
-					<statBases>
-						<WorkToMake>25000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.70</SwayFactor>
-						<Bulk>3.05</Bulk>
-						<Mass>1.57</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>42</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.54</recoilAmount>
-						<defaultProjectile>Bullet_9x18mmMakarov_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>14</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PP-91-01_Kedr-B_RWP</defName>
-					<statBases>
-						<WorkToMake>28000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.88</SwayFactor>
-						<Bulk>4.43</Bulk>
-						<Mass>2.10</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>46</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.33</recoilAmount>
-						<defaultProjectile>Bullet_9x18mmMakarov_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>14</range>
-						<soundCast>ShotSuppressedPistol</soundCast>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PP-2000_RWP</defName>
-					<statBases>
-						<WorkToMake>26500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>0.70</SwayFactor>
-						<Bulk>3.40</Bulk>
-						<Mass>1.40</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>41</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>2.00</recoilAmount>
-						<defaultProjectile>Bullet_9x18mmMakarov_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PPD-34_RWP</defName>
-					<statBases>
-						<WorkToMake>21000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.16</SwayFactor>
-						<Bulk>7.77</Bulk>
-						<Mass>3.79</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>29</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.19</recoilAmount>
-						<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>6</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PPD-34-38_RWP</defName>
-					<statBases>
-						<WorkToMake>22500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<Bulk>8.77</Bulk>
-						<Mass>4.56</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>35</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.09</recoilAmount>
-						<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>6</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>71</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PPD-40_RWP</defName>
-					<statBases>
-						<WorkToMake>22300</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.22</SwayFactor>
-						<Bulk>8.88</Bulk>
-						<Mass>4.30</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>33</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.12</recoilAmount>
-						<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>6</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>71</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PPS-43_RWP</defName>
-					<statBases>
-						<WorkToMake>22400</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.12</SwayFactor>
-						<Bulk>6.15</Bulk>
-						<Mass>3.04</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>41</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.35</recoilAmount>
-						<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>6</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>35</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PPSh-41d_RWP</defName>
-					<statBases>
-						<WorkToMake>23500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.38</SwayFactor>
-						<Bulk>9.43</Bulk>
-						<Mass>5.32</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>42</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.00</recoilAmount>
-						<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>6</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>71</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PPSh-41s_RWP</defName>
-					<statBases>
-						<WorkToMake>22800</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.25</SwayFactor>
-						<Bulk>8.43</Bulk>
-						<Mass>4.11</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>40</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.14</recoilAmount>
-						<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>6</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>35</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Skorpion_SA_Vz61_RWP</defName>
-					<statBases>
-						<WorkToMake>21000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.65</SwayFactor>
-						<Bulk>2.70</Bulk>
-						<Mass>1.30</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>32</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.39</recoilAmount>
-						<defaultProjectile>Bullet_32ACP_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>6</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_32ACP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Skorpion_SA_Vz82_RWP</defName>
-					<statBases>
-						<WorkToMake>21400</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.66</SwayFactor>
-						<Bulk>2.70</Bulk>
-						<Mass>1.44</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>32</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.63</recoilAmount>
-						<defaultProjectile>Bullet_9x18mmMakarov_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>6</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Sten_Mk_I_RWP</defName>
-					<statBases>
-						<WorkToMake>19900</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.17</SwayFactor>
-						<Bulk>8.45</Bulk>
-						<Mass>3.27</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>3</WoodLog>
-						<Steel>34</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.29</recoilAmount>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Sten_Mk_II_RWP</defName>
-					<statBases>
-						<WorkToMake>19400</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.18</SwayFactor>
-						<Bulk>8.95</Bulk>
-						<Mass>2.80</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>35</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.40</recoilAmount>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Sten_Mk_III_RWP</defName>
-					<statBases>
-						<WorkToMake>19000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.08</SwayFactor>
-						<Bulk>7.62</Bulk>
-						<Mass>3.18</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>35</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.31</recoilAmount>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Sten_Mk_V_RWP</defName>
-					<statBases>
-						<WorkToMake>19600</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.15</SwayFactor>
-						<Bulk>7.62</Bulk>
-						<Mass>3.86</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>3</WoodLog>
-						<Steel>34</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.19</recoilAmount>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Sterling_L2A3_RWP</defName>
-					<statBases>
-						<WorkToMake>24700</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>0.96</SwayFactor>
-						<Bulk>4.81</Bulk>
-						<Mass>2.70</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.29</recoilAmount>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>34</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SW_M76_RWP</defName>
-					<statBases>
-						<WorkToMake>22500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.10</SwayFactor>
-						<Bulk>5.70</Bulk>
-						<Mass>3.29</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>37</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.39</recoilAmount>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>36</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Thompson_M1_RWP</defName>
-					<statBases>
-						<WorkToMake>24300</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.29</SwayFactor>
-						<Bulk>8.13</Bulk>
-						<Mass>4.80</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>49</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.33</recoilAmount>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>14</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Thompson_M1A1_RWP</defName>
-					<statBases>
-						<WorkToMake>24500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.29</SwayFactor>
-						<Bulk>8.13</Bulk>
-						<Mass>4.80</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.33</recoilAmount>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>14</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Thompson_M1921_RWP</defName>
-					<statBases>
-						<WorkToMake>26400</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.30</SwayFactor>
-						<Bulk>9.30</Bulk>
-						<Mass>4.70</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>53</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.34</recoilAmount>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>14</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Thompson_M1928_RWP</defName>
-					<statBases>
-						<WorkToMake>26000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.34</SwayFactor>
-						<Bulk>9.51</Bulk>
-						<Mass>4.90</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>55</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.32</recoilAmount>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>14</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Thompson_M1928A1_RWP</defName>
-					<statBases>
-						<WorkToMake>25100</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.34</SwayFactor>
-						<Bulk>8.51</Bulk>
-						<Mass>4.90</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>51</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.32</recoilAmount>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>14</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Thompson_UMP9_RWP</defName>
-					<statBases>
-						<WorkToMake>29000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>0.94</SwayFactor>
-						<Bulk>4.50</Bulk>
-						<Mass>2.50</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>48</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.55</recoilAmount>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Thompson_UMP40_RWP</defName>
-					<statBases>
-						<WorkToMake>30500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>0.95</SwayFactor>
-						<Bulk>4.50</Bulk>
-						<Mass>2.55</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-      					<Steel>50</Steel>
-      					<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.79</recoilAmount>
-						<defaultProjectile>Bullet_40SW_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>17</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_40SW</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Thompson_UMP45_RWP</defName>
-					<statBases>
-						<WorkToMake>30800</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>0.96</SwayFactor>
-						<Bulk>4.50</Bulk>
-						<Mass>2.65</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>51</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<recoilAmount>1.79</recoilAmount>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>15</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Ratkin Apparel+/Apparel_Ratkin.xml b/Patches/Ratkin Apparel+/Apparel_Ratkin.xml
deleted file mode 100644
index 7d4ad79fb3..0000000000
--- a/Patches/Ratkin Apparel+/Apparel_Ratkin.xml	
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Ratkin Apparel+</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- == Crusader == -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_Crusader"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>40</Bulk>
-						<WornBulk>10</WornBulk>
-						<StuffEffectMultiplierArmor>1.85</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_Crusader"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_Crusader"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.45</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- === Gambeson === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_Gambeson"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_Gambeson"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_Gambeson"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.06</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_Gambeson"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.09</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- === Gambeson B === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_GambesonB"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_GambesonB"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_GambesonB"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.12</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_GambesonB"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.18</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- === Outer Plate === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RK_OuterPlate"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_OuterPlate"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_OuterPlate"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_OuterPlate"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2.65</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- == Military Uniform == -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_MilUniform"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>2.25</WornBulk>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_Crusader"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_Crusader"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.25</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- == Rifleman == -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_Rifleman"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>2.5</WornBulk>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_Rifleman"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_Rifleman"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2.75</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- == Oriental Dress == -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_Oriental"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1.5</WornBulk>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_Rifleman"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- == Scarf & Sleeves == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RK_Scarf" or defName="RK_Sleeves"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>0.5</Bulk>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Ratnik-3 Prototype Armor/Bits_N_Bobs_CE.xml b/Patches/Ratnik-3 Prototype Armor/Bits_N_Bobs_CE.xml
deleted file mode 100644
index d593c9385e..0000000000
--- a/Patches/Ratnik-3 Prototype Armor/Bits_N_Bobs_CE.xml	
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Ratnik-3 Prototype Armor</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Camo === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Helix-Camo"]/statBases/WorkToMake</xpath>
-					<value>
-						<WorkToMake>5000</WorkToMake>
-						<Bulk>2</Bulk>
-						<Flammability>0.6</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Helix-Camo"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Helix-Camo"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.06</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Helix-Camo"]/costList/Cloth</xpath>
-					<value>
-						<Cloth>50</Cloth>
-					</value>
-				</li>
-
-				<!-- === Helmet === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_6b47_Helmet_Black"]/statBases/WorkToMake</xpath>
-					<value>
-						<WorkToMake>8000</WorkToMake>
-						<Bulk>4</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_6b47_Helmet_Black"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_6b47_Helmet_Black"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>12</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_6b47_Helmet_Black"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.54</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_6b47_Helmet_Black"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>75</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_6b47_Helmet_Black"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>30</Steel>
-							<DevilstrandCloth>15</DevilstrandCloth>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_6b47_Helmet_Black"]/apparel</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>UpperHead</li>
-						</bodyPartGroups>
-						<layers>
-							<li>Overhead</li>
-						</layers>
-						<defaultOutfitTags>
-							<li>Soldier</li>
-						</defaultOutfitTags>
-						<useDeflectMetalEffect>true</useDeflectMetalEffect>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Altyn_Helmet_Black"]/statBases/WorkToMake</xpath>
-					<value>
-						<WorkToMake>12500</WorkToMake>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Altyn_Helmet_Black"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>120</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_Altyn_Helmet_Black"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>2</WornBulk>
-						<Flammability>0.6</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Altyn_Helmet_Black"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Altyn_Helmet_Black"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>12</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Altyn_Helmet_Black"]/costList</xpath>
-					<value>
-						<costList>
-							<Plasteel>50</Plasteel>
-							<DevilstrandCloth>15</DevilstrandCloth>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_Altyn_Helmet_Black"]/equippedStatOffsets</xpath>
-					<value>
-						<AimingAccuracy>-0.25</AimingAccuracy>
-						<MeleeHitChance>-1</MeleeHitChance>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Ratnik-3 Prototype Armor/Ratnik_CE.xml b/Patches/Ratnik-3 Prototype Armor/Ratnik_CE.xml
deleted file mode 100644
index 274270b419..0000000000
--- a/Patches/Ratnik-3 Prototype Armor/Ratnik_CE.xml	
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Ratnik-3 Prototype Armor</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Helmet === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Ratnik-3_Helmet"]/statBases/WorkToMake</xpath>
-					<value>
-						<WorkToMake>12000</WorkToMake>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-						<Flammability>0.25</Flammability>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Ratnik-3_Helmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>100</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Ratnik-3_Helmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Ratnik-3_Helmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>18</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Ratnik-3_Helmet"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<ToxicEnvironmentResistance>0.33</ToxicEnvironmentResistance>
-							<SmokeSensitivity>-0.66</SmokeSensitivity>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Ratnik-3_Helmet"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>20</Steel>
-							<Plasteel>25</Plasteel>
-							<DevilstrandCloth>15</DevilstrandCloth>
-							<ComponentIndustrial>5</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="Ratnik_HelmetBase"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!-- === Armor === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Ratnik-3_Armor"]/statBases/WorkToMake</xpath>
-					<value>
-						<WorkToMake>41000</WorkToMake>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Ratnik-3_Armor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>270</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Ratnik-3_Armor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>24</Mass>
-						<Bulk>40</Bulk>
-						<WornBulk>5</WornBulk>
-						<Flammability>0.3</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Ratnik-3_Armor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Ratnik-3_Armor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>24</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Ratnik-3_Armor"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.46</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Ratnik-3_Armor"]/costList</xpath>
-					<value>
-						<costList>
-							<Plasteel>80</Plasteel>
-							<Steel>100</Steel>
-							<DevilstrandCloth>30</DevilstrandCloth>
-							<ComponentIndustrial>8</ComponentIndustrial>
-							<ComponentSpacer>1</ComponentSpacer>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Ratnik-3_Armor"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>25</CarryWeight>
-							<CarryBulk>20</CarryBulk>
-							<ToxicEnvironmentResistance>0.30</ToxicEnvironmentResistance>
-							<MoveSpeed>0.1</MoveSpeed>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/ReGrowth - Core/Animals_Biotech.xml b/Patches/ReGrowth - Core/Animals_Biotech.xml
deleted file mode 100644
index aaf21e834f..0000000000
--- a/Patches/ReGrowth - Core/Animals_Biotech.xml	
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ReGrowth: Core</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Biotech</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<!-- ========== Hemolope ========== -->
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="RG_Hemolope"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Quadruped</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="RG_Hemolope"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.05</MeleeDodgeChance>
-							<MeleeCritChance>0.07</MeleeCritChance>
-							<MeleeParryChance>0.16</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="RG_Hemolope"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>14</power>
-									<cooldownTime>2.0</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>5.0</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>left hoof</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>8</power>
-									<cooldownTime>1.2</cooldownTime>
-									<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>left hoof</label>
-									<capacities>
-										<li>Poke</li>
-									</capacities>
-									<power>8</power>
-									<cooldownTime>1.2</cooldownTime>
-									<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>right hoof</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>8</power>
-									<cooldownTime>1.2</cooldownTime>
-									<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>right hoof</label>
-									<capacities>
-										<li>Poke</li>
-									</capacities>
-									<power>8</power>
-									<cooldownTime>1.2</cooldownTime>
-									<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<capacities>
-										<li>Bite</li>
-									</capacities>
-									<power>5</power>
-									<cooldownTime>0.8</cooldownTime>
-									<chanceFactor>0.5</chanceFactor>
-									<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/ReGrowth - Core/Animals_Core.xml b/Patches/ReGrowth - Core/Animals_Core.xml
deleted file mode 100644
index 5489edaa2a..0000000000
--- a/Patches/ReGrowth - Core/Animals_Core.xml	
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ReGrowth: Core</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Moa === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RG_Moa"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.20</MeleeDodgeChance>
-						<MeleeCritChance>0.06</MeleeCritChance>
-						<MeleeParryChance>0.06</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG_Moa"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.42</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.08</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>beak</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.89</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.78</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Neutrolope ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RG_Neutrolope"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RG_Neutrolope"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						<MeleeCritChance>0.07</MeleeCritChance>
-						<MeleeParryChance>0.16</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG_Neutrolope"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5.0</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.8</cooldownTime>
-								<chanceFactor>0.5</chanceFactor>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/ReGrowth - Extinct Animals/Extinct_Birdlike.xml b/Patches/ReGrowth - Extinct Animals/Extinct_Birdlike.xml
deleted file mode 100644
index 6ce75be13e..0000000000
--- a/Patches/ReGrowth - Extinct Animals/Extinct_Birdlike.xml	
+++ /dev/null
@@ -1,353 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ReGrowth: Extinct Animals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ===== Body Type ===== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RG_Dodo" or defName="RG_TerrorBird" or defName="RG_ArcticDrak" or defName="RG_Velociraptor"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Dodo === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RG_Dodo"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.07</MeleeDodgeChance>
-						<MeleeCritChance>0.03</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG_Dodo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.55</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.08</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.16</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RG_Dodo"]/combatPower</xpath>
-					<value>
-						<combatPower>30</combatPower>
-					</value>
-				</li>
-
-				<!-- === Terror Bird === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RG_TerrorBird"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.20</MeleeDodgeChance>
-						<MeleeCritChance>0.06</MeleeCritChance>
-						<MeleeParryChance>0.06</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG_TerrorBird"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.42</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.08</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.89</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.78</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RG_TerrorBird"]/combatPower</xpath>
-					<value>
-						<combatPower>80</combatPower>
-					</value>
-				</li>
-
-				<!-- === Arctic Drak === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RG_ArcticDrak"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.37</MeleeDodgeChance>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>0.08</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG_ArcticDrak"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>RG_FootClawAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.37</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>RG_FootClawAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.37</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.75</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>tail</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.78</cooldownTime>
-								<linkedBodyPartsGroup>RG_TailAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RG_ArcticDrak"]/combatPower</xpath>
-					<value>
-						<combatPower>120</combatPower>
-					</value>
-				</li>
-
-				<!-- === Velociraptor === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RG_Velociraptor"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.31</MeleeDodgeChance>
-						<MeleeCritChance>0.07</MeleeCritChance>
-						<MeleeParryChance>0.03</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG_Velociraptor"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Stab</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.7</cooldownTime>
-								<linkedBodyPartsGroup>RG_FootClawAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.281</armorPenetrationBlunt>
-								<chanceFactor>0.3</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Stab</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.7</cooldownTime>
-								<linkedBodyPartsGroup>RG_FootClawAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.281</armorPenetrationBlunt>
-								<chanceFactor>0.3</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>0.7</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-								<chanceFactor>0.7</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG_Velociraptor"]/race/manhunterOnDamageChance</xpath>
-					<value>
-						<manhunterOnDamageChance>0.75</manhunterOnDamageChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RG_Velociraptor"]/combatPower</xpath>
-					<value>
-						<combatPower>85</combatPower>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RG_Velociraptor"]/wildGroupSize</xpath>
-					<value>
-						<wildGroupSize>4~6</wildGroupSize>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/ReGrowth - Extinct Animals/Extinct_Bodies.xml b/Patches/ReGrowth - Extinct Animals/Extinct_Bodies.xml
deleted file mode 100644
index f5caa50fa6..0000000000
--- a/Patches/ReGrowth - Extinct Animals/Extinct_Bodies.xml	
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ReGrowth: Extinct Animals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Natural Armor === -->
-
-				<!-- === Theropod === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RG_TheropodWithClaws"]//*[def="Body" or def="Neck" or def="Leg"]</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RG_TheropodWithClaws"]//*[def="Body" or def="Tail" or def="Neck" or def="Head" or def="AnimalJaw" or def="RG_FootClaw" or def="Leg" or def="Foot"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- === Sauropod === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RG_SauropodWithTailSpikes"]//*[def="Body" or def="Neck"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RG_SauropodWithTailSpikes"]//*[def="Body" or def="Tail" or def="Neck" or def="Head" or def="AnimalJaw" or def="Leg" or def="Foot"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/ReGrowth - Extinct Animals/Extinct_Mammals.xml b/Patches/ReGrowth - Extinct Animals/Extinct_Mammals.xml
deleted file mode 100644
index db98e2f6c8..0000000000
--- a/Patches/ReGrowth - Extinct Animals/Extinct_Mammals.xml	
+++ /dev/null
@@ -1,349 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ReGrowth: Extinct Animals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ===== Body Type ===== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RG_WoollyMammoth" or defName="RG_WoollyRhinoceros" or defName="RG_WoollyStegosaurus" or defName="RG_Synthetion"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Wooly Mammoth === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RG_WoollyMammoth"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.90</MeleeCritChance>
-						<MeleeParryChance>0.33</MeleeParryChance>
-						<ArmorRating_Blunt>5</ArmorRating_Blunt>
-						<ArmorRating_Sharp>0.22</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG_WoollyMammoth"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tusk</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>68</power>
-								<cooldownTime>3.37</cooldownTime>
-								<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>46.226</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>2.47</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>28.96</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>2.47</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>28.960</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>56</power>
-								<cooldownTime>3.69</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>40</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RG_WoollyMammoth"]/combatPower</xpath>
-					<value>
-						<combatPower>280</combatPower>
-					</value>
-				</li>
-
-				<!-- === Wooly Rhino === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG_WoollyRhinoceros"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>5.1</MoveSpeed>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.62</MeleeCritChance>
-						<MeleeParryChance>0.3</MeleeParryChance>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-						<ArmorRating_Sharp>0.4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG_WoollyRhinoceros"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>2.37</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>21</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Poke</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>2.37</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>21</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>2.7</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>24</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RG_WoollyRhinoceros"]/combatPower</xpath>
-					<value>
-						<combatPower>240</combatPower>
-					</value>
-				</li>
-
-				<!-- === Woolly Stegosaurus === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG_WoollyStegosaurus"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>3</MoveSpeed>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.22</MeleeCritChance>
-						<MeleeParryChance>0.57</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG_WoollyStegosaurus"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3.8</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG_WoollyStegosaurus"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG_WoollyStegosaurus"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>2.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.7</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.700</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.255</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>tail spikes</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Stab</li>
-									<li>Blunt</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>2.8</cooldownTime>
-								<linkedBodyPartsGroup>RG_TailAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>5</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>4.235</armorPenetrationBlunt>
-								<chanceFactor>1.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RG_WoollyStegosaurus"]/combatPower</xpath>
-					<value>
-						<combatPower>240</combatPower>
-					</value>
-				</li>
-
-				<!-- === Synthetion === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG_Synthetion"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>6.8</MoveSpeed>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.07</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG_Synthetion"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.27</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.700</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RG_Synthetion"]/combatPower</xpath>
-					<value>
-						<combatPower>50</combatPower>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/ReGrowth - Extinct Animals/Extinct_Resources.xml b/Patches/ReGrowth - Extinct Animals/Extinct_Resources.xml
deleted file mode 100644
index 6ae08991c6..0000000000
--- a/Patches/ReGrowth - Extinct Animals/Extinct_Resources.xml	
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ReGrowth: Extinct Animals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Remove tusk as a weapon === -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RG_MammothTusk"]/tools</xpath>
-				</li>
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="RG_MammothTusk"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>ResourceBase</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG_MammothTusk"]/statBases/MarketValue</xpath>
-					<value>
-						<MarketValue>120</MarketValue>
-					</value>
-				</li>
-
-				<!-- === Dinosaur Hides === -->
-
-				<!-- Thin -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG_DinosaursHideThin"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.05</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG_DinosaursHideThin"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.02</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- Medium -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG_DinosaursHideMedium"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.26</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG_DinosaursHideMedium"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.04</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- Heavy -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG_DinosaursHideHeavy"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.52</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG_DinosaursHideHeavy"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.08</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- === Wooly Wool === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG_WoolRhinoceros" or defName="RG_WoolStegosaurus"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.036</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/ReGrowth - Extinct Animals/Extinct_Rodentlikes.xml b/Patches/ReGrowth - Extinct Animals/Extinct_Rodentlikes.xml
deleted file mode 100644
index 5e92a08cbe..0000000000
--- a/Patches/ReGrowth - Extinct Animals/Extinct_Rodentlikes.xml	
+++ /dev/null
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ReGrowth: Extinct Animals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ===== Body Type ===== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RG_SabertoothSquirrel" or defName="RG_Thrinaxodon" or defName="RG_Megalenhydris"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Sabertooth Squirrel === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RG_SabertoothSquirrel"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0.02</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG_SabertoothSquirrel"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.67</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.67</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>0.88</cooldownTime>
-								<chanceFactor>0.7</chanceFactor>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.825</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.14</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>3.00</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RG_SabertoothSquirrel"]/combatPower</xpath>
-					<value>
-						<combatPower>30</combatPower>
-					</value>
-				</li>
-
-				<!-- === Thrinaxodon === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RG_Thrinaxodon"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG_Thrinaxodon"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.87</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.16</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.325</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RG_Thrinaxodon"]/combatPower</xpath>
-					<value>
-						<combatPower>55</combatPower>
-					</value>
-				</li>
-
-				<!-- === Megalenhydris === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RG_Megalenhydris"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.27</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.02</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG_Megalenhydris"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.67</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.67</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>0.88</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>3.00</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>tail</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>3.00</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.6</chanceFactor>
-								<armorPenetrationBlunt>0.145</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.06</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RG_Megalenhydris"]/combatPower</xpath>
-					<value>
-						<combatPower>45</combatPower>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/ReGrowth - Mutated Animals Pack/Bodies.xml b/Patches/ReGrowth - Mutated Animals Pack/Bodies.xml
deleted file mode 100644
index b530843665..0000000000
--- a/Patches/ReGrowth - Mutated Animals Pack/Bodies.xml	
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ReGrowth: Mutated Animals Pack</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Natural Armor -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="RG-WF_HumanoidWithHornsAndClaws"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Leg" or
-						def="Paw" or
-						def="Arm"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="RG-WF_HumanoidWithHornsAndClaws"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Head" or
-						def="Horn" or
-						def="Arm" or
-						def="FrontClaw" or
-						def="Leg" or
-						def="Paw"
-						]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/ReGrowth - Mutated Animals Pack/Deffclaw.xml b/Patches/ReGrowth - Mutated Animals Pack/Deffclaw.xml
deleted file mode 100644
index a35f1af9e7..0000000000
--- a/Patches/ReGrowth - Mutated Animals Pack/Deffclaw.xml	
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ReGrowth: Mutated Animals Pack</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RG-WF_WastelandDeathclaw"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG-WF_WastelandDeathclaw"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG-WF_WastelandDeathclaw"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>9</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RG-WF_WastelandDeathclaw"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						<MeleeCritChance>0.46</MeleeCritChance>
-						<MeleeParryChance>0.78</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG-WF_WastelandDeathclaw"]/race/baseBodySize</xpath>
-					<value>
-						<baseBodySize>2.5</baseBodySize>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG-WF_WastelandDeathclaw"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>6.75</MoveSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG-WF_WastelandDeathclaw"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Stab</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>7.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>16</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right blade</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Stab</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>7.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>16</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>6.750</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Horn</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Stab</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<armorPenetrationBlunt>8.750</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.750</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/ReGrowth - Mutated Animals Pack/Mutant_Beaver.xml b/Patches/ReGrowth - Mutated Animals Pack/Mutant_Beaver.xml
deleted file mode 100644
index 3a027be2d9..0000000000
--- a/Patches/ReGrowth - Mutated Animals Pack/Mutant_Beaver.xml	
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ReGrowth: Mutated Animals Pack</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RG-WF_WastelandBeaver"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RG-WF_WastelandBeaver"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.36</MeleeDodgeChance>
-						<MeleeCritChance>0.03</MeleeCritChance>
-						<MeleeParryChance>0.00</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG-WF_WastelandBeaver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.03</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.03</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/ReGrowth - Mutated Animals Pack/Mutant_Deer.xml b/Patches/ReGrowth - Mutated Animals Pack/Mutant_Deer.xml
deleted file mode 100644
index da6a9891de..0000000000
--- a/Patches/ReGrowth - Mutated Animals Pack/Mutant_Deer.xml	
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ReGrowth: Mutated Animals Pack</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RG-WF_WastelandDeer"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RG-WF_WastelandDeer"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.11</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG-WF_WastelandDeer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Right head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>RG-WF_RightHeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Left head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>RG-WF_LeftHeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>antlers</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.66</cooldownTime>
-								<restrictedGender>Male</restrictedGender>
-								<linkedBodyPartsGroup>RG-WF_RightHeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.750</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>antlers</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.66</cooldownTime>
-								<restrictedGender>Male</restrictedGender>
-								<linkedBodyPartsGroup>RG-WF_LeftHeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.750</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/ReGrowth - Mutated Animals Pack/Mutant_Rat.xml b/Patches/ReGrowth - Mutated Animals Pack/Mutant_Rat.xml
deleted file mode 100644
index 005410a90b..0000000000
--- a/Patches/ReGrowth - Mutated Animals Pack/Mutant_Rat.xml	
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>ReGrowth: Mutated Animals Pack</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RG-WF_WastelandSquirrel"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RG-WF_WastelandSquirrel"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.52</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.00</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG-WF_WastelandSquirrel"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.03</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.03</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Recon Mechanoid/Mech_PawnKinds.xml b/Patches/Recon Mechanoid/Mech_PawnKinds.xml
deleted file mode 100644
index 9a03dbb881..0000000000
--- a/Patches/Recon Mechanoid/Mech_PawnKinds.xml	
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Recon Mechanoid</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="Mech_Recon" or
-						defName="Mech_ReconBlaster" or
-						defName="Mech_Scout" or
-						defName="Mech_ScoutBlaster"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Recon Mechanoid/Races_Mechanoid.xml b/Patches/Recon Mechanoid/Races_Mechanoid.xml
deleted file mode 100644
index 6bc6298b6c..0000000000
--- a/Patches/Recon Mechanoid/Races_Mechanoid.xml	
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Recon Mechanoid</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[
-						defName="Mech_Recon" or
-						defName="Mech_ReconBlaster" or
-						defName="Mech_Scout" or
-						defName="Mech_ScoutBlaster"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Mech_Recon" or
-						defName="Mech_ReconBlaster" or
-						defName="Mech_Scout" or
-						defName="Mech_ScoutBlaster"
-						]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Mech_Recon" or
-						defName="Mech_ReconBlaster" or
-						defName="Mech_Scout" or
-						defName="Mech_ScoutBlaster"
-						]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="Mech_Recon" or
-						defName="Mech_ReconBlaster" or
-						defName="Mech_Scout" or
-						defName="Mech_ScoutBlaster"
-						]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1.1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.075</MeleeCritChance>
-						<MeleeParryChance>0.075</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Mech_Recon" or
-						defName="Mech_ReconBlaster" or
-						defName="Mech_Scout" or
-						defName="Mech_ScoutBlaster"
-						]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Recon Mechanoid/RangedRecon.xml b/Patches/Recon Mechanoid/RangedRecon.xml
deleted file mode 100644
index 110b2546f9..0000000000
--- a/Patches/Recon Mechanoid/RangedRecon.xml	
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Recon Mechanoid</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Melee Tools -->
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName="Gun_ReconSMG" or
-						defName="Gun_MechScoutGun" or
-						defName="Gun_ReconBlaster" or
-						defName="Gun_ScoutLancer"
-						]/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>
-				</li>
-
-				<!-- Recon SMG -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_ReconSMG</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.19</ShotSpread>
-						<SwayFactor>0.98</SwayFactor>
-						<Bulk>3</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.79</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20.9</range>
-						<burstShotCount>4</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<soundCast>Shot_Slugthrower</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<!-- Recon Blaster  -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_ReconBlaster</defName>
-					<statBases>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>0.78</SwayFactor>
-						<Bulk>4.50</Bulk>
-						<Mass>2.0</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.42</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
-						<burstShotCount>4</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>0.5</warmupTime>
-						<range>28</range>
-						<soundCast>Shot_ChargeBlaster</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>28</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- Scout Gun -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MechScoutGun</defName>
-					<statBases>
-						<Mass>3.26</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.35</SwayFactor>
-						<Bulk>5</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.54</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>46</range>
-						<soundCast>Shot_Slugthrower</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AR</li>
-					</weaponTags>
-				</li>
-
-				<!-- Scout Lancer -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_ScoutLancer</defName>
-					<statBases>
-						<Mass>3.26</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.35</SwayFactor>
-						<Bulk>5</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.54</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>52</range>
-						<soundCast>Shot_ChargeBlaster</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AR</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Red Army/RedArmy_PM_M1910.xml b/Patches/Red Army/RedArmy_PM_M1910.xml
deleted file mode 100644
index 4f19dc2f85..0000000000
--- a/Patches/Red Army/RedArmy_PM_M1910.xml	
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Red Army (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="MaximRounds"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/RecipeDef[defName="MakeMaximCrate"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="BaseSovietEmplacedMG"]/building/fixedStorageSettings</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="BaseSovietEmplacedMG"]/building/defaultStorageSettings</xpath>
-				</li>
-
-				<li Class="PatchOperationInsert">
-					<xpath>Defs/ThingDef[defName="Maxim_HMG"]</xpath>
-					<value>
-						<ThingDef Name="BaseArtilleryWeaponPMM1910" Abstract="True">
-							<category>Item</category>
-							<thingClass>ThingWithComps</thingClass>
-							<label>artillery error</label>
-							<useHitPoints>false</useHitPoints>
-							<equipmentType>Primary</equipmentType>
-							<tickerType>Never</tickerType>
-							<techLevel>Industrial</techLevel>
-							<destroyOnDrop>True</destroyOnDrop>
-							<generateCommonality>0</generateCommonality>
-							<menuHidden>True</menuHidden>
-							<tradeability>None</tradeability>
-							<weaponTags>
-								<li>Turret</li>
-							</weaponTags>
-							<comps>
-								<li>
-									<compClass>CompEquippable</compClass>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Maxim_HMG</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>0.82</SwayFactor>
-						<Bulk>10.0</Bulk>
-						<WorkToMake>14000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>35</range>
-						<minRange>2</minRange>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<burstShotCount>6</burstShotCount>
-						<soundCast>Maxim_Fire1</soundCast>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<recoilAmount>0.78</recoilAmount>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>250</magazineSize>
-						<reloadTime>6.25</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Turret</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_Maxim"]/label</xpath>
-					<value>
-						<label>PM M1910</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Maxim_HMG"]/label</xpath>
-					<value>
-						<label>PM M1910</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Turret_Maxim"]</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Turret_Maxim"]</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Red Army/RedArmy_PawnKinds.xml b/Patches/Red Army/RedArmy_PawnKinds.xml
deleted file mode 100644
index 4d83c8f40e..0000000000
--- a/Patches/Red Army/RedArmy_PawnKinds.xml	
+++ /dev/null
@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Red Army (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="SovietInfantry"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.1</generateChance>
-									<sidearmMoney>
-										<min>80</min>
-										<max>120</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm</li>
-									</weaponTags>
-								</li>
-								<li>
-									<generateChance>0.4</generateChance>
-									<sidearmMoney>
-										<min>60</min>
-										<max>150</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="SovietScoutInfantry"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.3</generateChance>
-									<sidearmMoney>
-										<min>80</min>
-										<max>120</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm</li>
-									</weaponTags>
-								</li>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>60</min>
-										<max>150</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="SovietAssaultInfantry"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.3</generateChance>
-									<sidearmMoney>
-										<min>80</min>
-										<max>120</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm</li>
-									</weaponTags>
-								</li>
-								<li>
-									<generateChance>0.6</generateChance>
-									<sidearmMoney>
-										<min>60</min>
-										<max>150</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="SovietGrenadier"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.4</generateChance>
-									<sidearmMoney>
-										<min>80</min>
-										<max>120</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm</li>
-									</weaponTags>
-								</li>
-								<li>
-									<generateChance>1</generateChance>
-									<sidearmMoney>
-										<min>60</min>
-										<max>150</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="SovietGuardsInfantry"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.7</generateChance>
-									<sidearmMoney>
-										<min>80</min>
-										<max>120</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm</li>
-									</weaponTags>
-								</li>
-								<li>
-									<generateChance>1</generateChance>
-									<sidearmMoney>
-										<min>60</min>
-										<max>150</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="SovietBannerman"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>1</generateChance>
-									<sidearmMoney>
-										<min>60</min>
-										<max>150</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="SovietFactionCommander"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.9</generateChance>
-									<sidearmMoney>
-										<min>80</min>
-										<max>120</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="SovietMG"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.6</generateChance>
-									<sidearmMoney>
-										<min>80</min>
-										<max>120</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Red Army/RedArmy_Weapons.xml b/Patches/Red Army/RedArmy_Weapons.xml
deleted file mode 100644
index 110966a845..0000000000
--- a/Patches/Red Army/RedArmy_Weapons.xml	
+++ /dev/null
@@ -1,588 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Red Army (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- SovietFlag -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SovietBanner"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>11.3</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SovietBanner"]/statBases</xpath>
-					<value>
-						<Bulk>7</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SovietBanner"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.25</MeleeCritChance>
-							<MeleeParryChance>0.25</MeleeParryChance>
-							<MeleeDodgeChance>0.9</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Add tags -->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="SovietBanner"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="SovietBanner"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SovietBanner"]/weaponTags</xpath>
-					<value>
-						<li>CE_Sidearm_Melee</li>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- Mosin IronSight Rifle -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>MosinNagant</defName>
-					<statBases>
-						<Mass>4.20</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.24</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.05</SwayFactor>
-						<Bulk>8.7</Bulk>
-						<WorkToMake>18000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>50</range>
-						<soundCast>Mosin_Fire1</soundCast>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>SovietInfantry</li>
-						<li>SovietAssaultInfantry</li>
-					</weaponTags>
-					<researchPrerequisite>
-						<researchPrerequisite>SovietEarlyWarTech</researchPrerequisite>
-					</researchPrerequisite>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MosinNagant"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Mosin Sniper Rifle Var1 -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>MosinSniper</defName>
-					<statBases>
-						<Mass>5.20</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.24</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>0.93</SwayFactor>
-						<Bulk>8.7</Bulk>
-						<WorkToMake>18000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>100</range>
-						<soundCast>Mosin_Fire1</soundCast>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>6.5</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>SovietScoutInfantry</li>
-					</weaponTags>
-					<researchPrerequisite>
-						<researchPrerequisite>SovietMidWarTech</researchPrerequisite>
-					</researchPrerequisite>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MosinSniper"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Mosin Sniper Rifle Var2 -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>MosinSniperVariant</defName>
-					<statBases>
-						<Mass>5.20</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.24</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>0.90</SwayFactor>
-						<Bulk>8.7</Bulk>
-						<WorkToMake>18000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>100</range>
-						<soundCast>Mosin_Fire1</soundCast>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>6.8</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>SovietScoutInfantry</li>
-					</weaponTags>
-					<researchPrerequisite>
-						<researchPrerequisite>SovietMidWarTech</researchPrerequisite>
-					</researchPrerequisite>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MosinSniperVariant"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Nagant M1895 -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Nagant1895Pistol</defName>
-					<statBases>
-						<Mass>3.20</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.24</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>0.94</SwayFactor>
-						<Bulk>3.7</Bulk>
-						<WorkToMake>9000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x38mmR_FMJ</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>12</range>
-						<soundCast>NagantPistol_Fire1</soundCast>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>3.8</reloadTime>
-						<ammoSet>AmmoSet_762x38mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>SovietFactionCommander</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-					<researchPrerequisite>
-						<researchPrerequisite>SovietEarlyWarTech</researchPrerequisite>
-					</researchPrerequisite>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Nagant1895Pistol"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- PPSh 41 Drum -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>PPSh</defName>
-					<statBases>
-						<Mass>4.20</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.50</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.06</SwayFactor>
-						<Bulk>3.7</Bulk>
-						<WorkToMake>7500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>65</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
-						<warmupTime>1.25</warmupTime>
-						<range>19</range>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>7</burstShotCount>
-						<soundCast>PPSh_Fire1</soundCast>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>71</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_SMG</li>
-						<li>SovietInfantry</li>
-						<li>SovietAssaultInfantry</li>
-						<li>SovietFactionCommander</li>
-					</weaponTags>
-					<researchPrerequisite>
-						<researchPrerequisite>SovietEarlyWarTech</researchPrerequisite>
-					</researchPrerequisite>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PPSh"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- DP27 LMG -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>DPTwentySeven</defName>
-					<statBases>
-						<Mass>10.50</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.50</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.51</SwayFactor>
-						<Bulk>14.05</Bulk>
-						<WorkToMake>13000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>65</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>3</warmupTime>
-						<range>32</range>
-						<ticksBetweenBurstShots>14</ticksBetweenBurstShots>
-						<burstShotCount>8</burstShotCount>
-						<soundCast>DP27_Fire1</soundCast>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>47</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_MachineGun</li>
-						<li>SovietMG</li>
-					</weaponTags>
-					<researchPrerequisite>
-						<researchPrerequisite>SovietMidWarTech</researchPrerequisite>
-					</researchPrerequisite>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DPTwentySeven"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- SVTForty -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>SVTForty</defName>
-					<statBases>
-						<Mass>8.50</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.50</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>0.93</SwayFactor>
-						<Bulk>7.05</Bulk>
-						<WorkToMake>16000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>65</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>2</warmupTime>
-						<range>33</range>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<burstShotCount>2</burstShotCount>
-						<soundCast>SVT_Fire1</soundCast>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>3.8</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>SovietScoutInfantry</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-					<researchPrerequisite>
-						<researchPrerequisite>SovietMidWarTech</researchPrerequisite>
-					</researchPrerequisite>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SVTForty"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>bayonet</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>2.14</cooldownTime>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>bayonet</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.49</cooldownTime>
-								<armorPenetrationBlunt>2.16</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.44</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- TankLightGun -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>SovietTankLightGun</defName>
-					<statBases>
-						<SightsEfficiency>1.4</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>0.82</SwayFactor>
-						<Bulk>13.0</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_90mmCannonShell_HEAT</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>82</range>
-						<minRange>3</minRange>
-						<ticksBetweenBurstShots>20</ticksBetweenBurstShots>
-						<burstShotCount>1</burstShotCount>
-						<soundCast>Tank_Fire1</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<recoilAmount>0.78</recoilAmount>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>6.75</reloadTime>
-						<ammoSet>AmmoSet_90mmCannonShell</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>1</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Red Army/RedArmy_ZIS2_Cannon.xml b/Patches/Red Army/RedArmy_ZIS2_Cannon.xml
deleted file mode 100644
index d9d8fafdea..0000000000
--- a/Patches/Red Army/RedArmy_ZIS2_Cannon.xml	
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Red Army (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationInsert">
-					<xpath>Defs/ThingDef[defName="Artillery_zis"]</xpath>
-					<value>
-						<ThingDef Name="BaseArtilleryWeaponZIS" Abstract="True">
-							<category>Item</category>
-							<thingClass>ThingWithComps</thingClass>
-							<label>artillery error</label>
-							<useHitPoints>false</useHitPoints>
-							<equipmentType>Primary</equipmentType>
-							<tickerType>Never</tickerType>
-							<techLevel>Industrial</techLevel>
-							<destroyOnDrop>True</destroyOnDrop>
-							<generateCommonality>0</generateCommonality>
-							<menuHidden>True</menuHidden>
-							<tradeability>None</tradeability>
-							<weaponTags>
-								<li>Artillery</li>
-							</weaponTags>
-							<comps>
-								<li>
-									<compClass>CompEquippable</compClass>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Artillery_zis</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>0.82</SwayFactor>
-						<Bulk>13.0</Bulk>
-						<WorkToMake>18000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_90mmCannonShell_HE</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<minRange>5</minRange>
-						<range>75</range>
-						<ticksBetweenBurstShots>45</ticksBetweenBurstShots>
-						<soundCast>Zis_Fire1</soundCast>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<recoilAmount>0.78</recoilAmount>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>4.75</reloadTime>
-						<ammoSet>AmmoSet_90mmCannonShell</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Turret</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="BaseSovietArtillery"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Turret_Zis"]</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Redcoat Apparel/Apparel_Redcoat.xml b/Patches/Redcoat Apparel/Apparel_Redcoat.xml
deleted file mode 100644
index d2874a0c04..0000000000
--- a/Patches/Redcoat Apparel/Apparel_Redcoat.xml	
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Redcoat Apparel</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Redcoat -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RCA_plainshirtvest" or
-						defName="RCA_breeches"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-						<Bulk>1</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						@Name="RCA_coat_base" or
-						@Name="RCA_regcoat_base"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-						<Bulk>2.5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RCA_watchcloak" or
-						defName="RCA_capote"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-						<Bulk>7.5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						@Name="CockedHatBase" or
-						defName="RCA_bearskin" or
-						defName="RCA_beaverhat" or
-						@Name="ForageCapBase"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-						<Bulk>0.5</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="RCA_beltcbox"]/equippedStatOffsets</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="RCA_beltcbox"]</xpath>
-						<value>
-							<equippedStatOffsets>
-								<CarryBulk>10</CarryBulk>
-							</equippedStatOffsets>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="RCA_beltcbox"]/equippedStatOffsets</xpath>
-						<value>
-							<CarryBulk>10</CarryBulk>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Reinforced Mechanoid 2/Bodies/RM_Bodies_Mechanoid.xml b/Patches/Reinforced Mechanoid 2/Bodies/RM_Bodies_Mechanoid.xml
deleted file mode 100644
index c3741b0a56..0000000000
--- a/Patches/Reinforced Mechanoid 2/Bodies/RM_Bodies_Mechanoid.xml	
+++ /dev/null
@@ -1,1433 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Reinforced Mechanoid 2</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ===== Mechanoid BodyDefs Natural Armor ===== -->
-
-				<!-- === Zealot Body === -->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[@Name="RM_VultureFalconBody"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[@Name="RM_VultureFalconBody"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[@Name="RM_VultureFalconBody"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[@Name="RM_VultureFalconBody"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[@Name="RM_VultureFalconBody"]/corePart/parts/li[def="MechanicalNeck"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[@Name="RM_VultureFalconBody"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[@Name="RM_VultureFalconBody"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[@Name="RM_VultureFalconBody"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[@Name="RM_VultureFalconBody"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[@Name="RM_VultureFalconBody"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[@Name="RM_VultureFalconBody"]/corePart/parts/li[def="MechanicalShoulder"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[@Name="RM_VultureFalconBody"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[@Name="RM_VultureFalconBody"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[@Name="RM_VultureFalconBody"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[@Name="RM_VultureFalconBody"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[@Name="RM_VultureFalconBody"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[@Name="RM_VultureFalconBody"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[@Name="RM_VultureFalconBody"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[@Name="RM_VultureFalconBody"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[@Name="RM_VultureFalconBody"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[@Name="RM_VultureFalconBody"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[@Name="RM_VultureFalconBody"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[@Name="RM_VultureFalconBody"]/corePart/parts/li[def="MechanicalLeg"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[@Name="RM_VultureFalconBody"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[@Name="RM_VultureFalconBody"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[@Name="RM_VultureFalconBody"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[@Name="RM_VultureFalconBody"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<!-- === Gremlin Body === -->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Gremlin"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Gremlin"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Gremlin"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Gremlin"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Gremlin"]/corePart/parts/li[def="MechanicalNeck"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Gremlin"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Gremlin"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Gremlin"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Gremlin"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Gremlin"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Gremlin"]/corePart/parts/li[def="MechanicalShoulder"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Gremlin"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Gremlin"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Gremlin"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Gremlin"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Gremlin"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Gremlin"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Gremlin"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Gremlin"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Gremlin"]/corePart/parts/li[def="MechanicalLeg"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Gremlin"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Gremlin"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Gremlin"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Ranger"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<!-- === Harpy Body === -->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Harpy"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Harpy"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Harpy"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Harpy"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Harpy"]/corePart/parts/li[def="MechanicalNeck"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Harpy"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Harpy"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Harpy"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Harpy"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Harpy"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Harpy"]/corePart/parts/li[def="MechanicalShoulder"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Harpy"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Harpy"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Harpy"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Harpy"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Harpy"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Harpy"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Harpy"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Harpy"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Harpy"]/corePart/parts/li[def="MechanicalLeg"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Harpy"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Harpy"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Harpy"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Harpy"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<!-- === Ranger Body === -->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Ranger"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Ranger"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Ranger"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Ranger"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Ranger"]/corePart/parts/li[def="MechanicalNeck"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Ranger"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Ranger"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Ranger"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Ranger"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Ranger"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Ranger"]/corePart/parts/li[def="MechanicalShoulder"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Ranger"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Ranger"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Ranger"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Ranger"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Ranger"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Ranger"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Ranger"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Ranger"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Ranger"]/corePart/parts/li[def="MechanicalLeg"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Ranger"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Ranger"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Ranger"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Ranger"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<!-- === Zealot Body === -->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Zealot"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Zealot"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Zealot"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Zealot"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Zealot"]/corePart/parts/li[def="MechanicalNeck"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Zealot"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Zealot"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Zealot"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Zealot"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Zealot"]/corePart/parts/li[def="RM_MechanicalShoulderZealot"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Zealot"]/corePart/parts/li[def="RM_MechanicalShoulderZealot"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Zealot"]/corePart/parts/li[def="RM_MechanicalShoulderZealot"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Zealot"]/corePart/parts/li[def="RM_MechanicalShoulderZealot"]/parts/li[def="MechanicalArm"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Zealot"]/corePart/parts/li[def="RM_MechanicalShoulderZealot"]/parts/li[def="MechanicalArm"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Zealot"]/corePart/parts/li[def="RM_MechanicalShoulderZealot"]/parts/li[def="MechanicalArm"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Zealot"]/corePart/parts/li[def="RM_MechanicalShoulderZealot"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Zealot"]/corePart/parts/li[def="RM_MechanicalShoulderZealot"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Zealot"]/corePart/parts/li[def="RM_MechanicalShoulderZealot"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Zealot"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Zealot"]/corePart/parts/li[def="MechanicalLeg"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Zealot"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Zealot"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Zealot"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Zealot"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<!-- === Marshal Body === -->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Marshal"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Marshal"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Marshal"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Marshal"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Marshal"]/corePart/parts/li[def="MechanicalNeck"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Marshal"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Marshal"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Marshal"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Marshal"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Marshal"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="RM_HeadBlade"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Marshal"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="RM_HeadBlade"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Marshal"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="RM_HeadBlade"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Marshal"]/corePart/parts/li[def="RM_MechanicalShoulderZealot"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Marshal"]/corePart/parts/li[def="RM_MechanicalShoulderZealot"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Marshal"]/corePart/parts/li[def="RM_MechanicalShoulderZealot"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Marshal"]/corePart/parts/li[def="RM_MechanicalShoulderZealot"]/parts/li[def="MechanicalArm"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Marshal"]/corePart/parts/li[def="RM_MechanicalShoulderZealot"]/parts/li[def="MechanicalArm"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Marshal"]/corePart/parts/li[def="RM_MechanicalShoulderZealot"]/parts/li[def="MechanicalArm"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Marshal"]/corePart/parts/li[def="RM_MechanicalShoulderZealot"]/parts/li[def="MechanicalArm"]/parts/li[def="Blade"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Marshal"]/corePart/parts/li[def="RM_MechanicalShoulderZealot"]/parts/li[def="MechanicalArm"]/parts/li[def="Blade"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Marshal"]/corePart/parts/li[def="RM_MechanicalShoulderZealot"]/parts/li[def="MechanicalArm"]/parts/li[def="Blade"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Marshal"]/corePart/parts/li[def="RM_MechanicalShoulderZealot"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Marshal"]/corePart/parts/li[def="RM_MechanicalShoulderZealot"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Marshal"]/corePart/parts/li[def="RM_MechanicalShoulderZealot"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Marshal"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Marshal"]/corePart/parts/li[def="MechanicalLeg"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Marshal"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Marshal"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Marshal"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Marshal"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<!-- === Sentinel Body === -->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Sentinel"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Sentinel"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Sentinel"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Sentinel"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Sentinel"]/corePart/parts/li[def="MechanicalNeck"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Sentinel"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Sentinel"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="RM_MechanicalHeadSentinel"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Sentinel"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="RM_MechanicalHeadSentinel"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Sentinel"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="RM_MechanicalHeadSentinel"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Sentinel"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="RM_MechanicalHeadSentinel"]/parts/li[def="RM_HeadBlade"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Sentinel"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="RM_MechanicalHeadSentinel"]/parts/li[def="RM_HeadBlade"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Sentinel"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="RM_MechanicalHeadSentinel"]/parts/li[def="RM_HeadBlade"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Sentinel"]/corePart/parts/li[def="RM_MechanicalShoulderSentinel"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Sentinel"]/corePart/parts/li[def="RM_MechanicalShoulderSentinel"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Sentinel"]/corePart/parts/li[def="RM_MechanicalShoulderSentinel"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Sentinel"]/corePart/parts/li[def="RM_MechanicalShoulderSentinel"]/parts/li[def="MechanicalArm"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Sentinel"]/corePart/parts/li[def="RM_MechanicalShoulderSentinel"]/parts/li[def="MechanicalArm"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Sentinel"]/corePart/parts/li[def="RM_MechanicalShoulderSentinel"]/parts/li[def="MechanicalArm"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Sentinel"]/corePart/parts/li[def="RM_MechanicalShoulderSentinel"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Sentinel"]/corePart/parts/li[def="RM_MechanicalShoulderSentinel"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Sentinel"]/corePart/parts/li[def="RM_MechanicalShoulderSentinel"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Sentinel"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Sentinel"]/corePart/parts/li[def="MechanicalLeg"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Sentinel"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Sentinel"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Sentinel"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Sentinel"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<!-- === Behemoth Body === -->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Behemoth"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Behemoth"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Behemoth"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Behemoth"]/corePart/parts/li[def="RM_MechanicalNeckBehemoth"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Behemoth"]/corePart/parts/li[def="RM_MechanicalNeckBehemoth"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Behemoth"]/corePart/parts/li[def="RM_MechanicalNeckBehemoth"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Behemoth"]/corePart/parts/li[def="RM_MechanicalNeckBehemoth"]/parts/li[def="MechanicalHead"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Behemoth"]/corePart/parts/li[def="RM_MechanicalNeckBehemoth"]/parts/li[def="MechanicalHead"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Behemoth"]/corePart/parts/li[def="RM_MechanicalNeckBehemoth"]/parts/li[def="MechanicalHead"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Behemoth"]/corePart/parts/li[def="RM_MechanicalShoulderBehemoth"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Behemoth"]/corePart/parts/li[def="RM_MechanicalShoulderBehemoth"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Behemoth"]/corePart/parts/li[def="RM_MechanicalShoulderBehemoth"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Behemoth"]/corePart/parts/li[def="RM_MechanicalShoulderBehemoth"]/parts/li[def="MechanicalArm"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Behemoth"]/corePart/parts/li[def="RM_MechanicalShoulderBehemoth"]/parts/li[def="MechanicalArm"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Behemoth"]/corePart/parts/li[def="RM_MechanicalShoulderBehemoth"]/parts/li[def="MechanicalArm"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Behemoth"]/corePart/parts/li[def="RM_MechanicalShoulderBehemoth"]/parts/li[def="MechanicalArm"]/parts/li[def="RM_BehemothShield"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Behemoth"]/corePart/parts/li[def="RM_MechanicalShoulderBehemoth"]/parts/li[def="MechanicalArm"]/parts/li[def="RM_BehemothShield"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Behemoth"]/corePart/parts/li[def="RM_MechanicalShoulderBehemoth"]/parts/li[def="MechanicalArm"]/parts/li[def="RM_BehemothShield"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Behemoth"]/corePart/parts/li[def="RM_MechanicalShoulderBehemoth"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Behemoth"]/corePart/parts/li[def="RM_MechanicalShoulderBehemoth"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Behemoth"]/corePart/parts/li[def="RM_MechanicalShoulderBehemoth"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Behemoth"]/corePart/parts/li[def="RM_MechanicalLegBehemoth"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Behemoth"]/corePart/parts/li[def="RM_MechanicalLegBehemoth"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Behemoth"]/corePart/parts/li[def="RM_MechanicalLegBehemoth"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Behemoth"]/corePart/parts/li[def="RM_MechanicalLegBehemoth"]/parts/li[def="RM_MechanicalFootBehemoth"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Behemoth"]/corePart/parts/li[def="RM_MechanicalLegBehemoth"]/parts/li[def="RM_MechanicalFootBehemoth"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Behemoth"]/corePart/parts/li[def="RM_MechanicalLegBehemoth"]/parts/li[def="RM_MechanicalFootBehemoth"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<!-- === Caretaker Body === -->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Caretaker"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Caretaker"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Caretaker"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Caretaker"]/corePart/parts/li[def="RM_MechanicalHeadCaretaker"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Caretaker"]/corePart/parts/li[def="RM_MechanicalHeadCaretaker"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Caretaker"]/corePart/parts/li[def="RM_MechanicalHeadCaretaker"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Caretaker"]/corePart/parts/li[def="RM_MechanicalShellCaretaker"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Caretaker"]/corePart/parts/li[def="RM_MechanicalShellCaretaker"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Caretaker"]/corePart/parts/li[def="RM_MechanicalShellCaretaker"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<!-- === Wraith Body === -->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Wraith"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Wraith"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Wraith"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Wraith"]/corePart/parts/li[def="MechanicalHead"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Wraith"]/corePart/parts/li[def="MechanicalHead"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Wraith"]/corePart/parts/li[def="MechanicalHead"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Wraith"]/corePart/parts/li[def="RM_MechanicalSecondWraithBody"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Wraith"]/corePart/parts/li[def="RM_MechanicalSecondWraithBody"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Wraith"]/corePart/parts/li[def="RM_MechanicalSecondWraithBody"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<!-- === Locust Body === -->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Locust"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Locust"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Locust"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Locust"]/corePart/parts/li[def="RM_MechanicalHeadLocust"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Locust"]/corePart/parts/li[def="RM_MechanicalHeadLocust"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Locust"]/corePart/parts/li[def="RM_MechanicalHeadLocust"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="RM_Mechanical_Locust"]/corePart/parts/li[def="RM_MechanicalLegLocust"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Locust"]/corePart/parts/li[def="RM_MechanicalLegLocust"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="RM_Mechanical_Locust"]/corePart/parts/li[def="RM_MechanicalLegLocust"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Reinforced Mechanoid 2/PawnKindDefs/RM_PawnKinds_Mech.xml b/Patches/Reinforced Mechanoid 2/PawnKindDefs/RM_PawnKinds_Mech.xml
deleted file mode 100644
index 8d3931b98f..0000000000
--- a/Patches/Reinforced Mechanoid 2/PawnKindDefs/RM_PawnKinds_Mech.xml	
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Reinforced Mechanoid 2</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="RM_RemnantsHumanBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>300</min>
-								<max>750</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.8</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>1</generateChance>
-									<sidearmMoney>
-										<min>60</min>
-										<max>200</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>80</min>
-										<max>200</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="RM_BaseDroidKind"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RM_Mech_Marshal"]/combatPower</xpath>
-					<value>
-						<combatPower>240</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RM_Mech_Sentinel"]/combatPower</xpath>
-					<value>
-						<combatPower>500</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RM_Mech_Behemoth"]/combatPower</xpath>
-					<value>
-						<combatPower>580</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RM_Mech_WraithSiege" or defName="RM_Mech_Locust"]/combatPower</xpath>
-					<value>
-						<combatPower>650</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="RM_Mech_Falcon" or
-						defName="RM_Mech_Gremlin" or
-						defName="RM_Mech_Harpy" or
-						defName="RM_Mech_Ranger" or
-						defName="RM_Mech_Zealot" or
-						defName="RM_Mech_Sentinel" or
-						defName="RM_Mech_Behemoth" or
-						defName="RM_Mech_WraithSiege" or
-						defName="RM_Mech_Locust"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Reinforced Mechanoid 2/ThingDefs_Misc/RM_ARCWeaponry.xml b/Patches/Reinforced Mechanoid 2/ThingDefs_Misc/RM_ARCWeaponry.xml
deleted file mode 100644
index d91b8c5320..0000000000
--- a/Patches/Reinforced Mechanoid 2/ThingDefs_Misc/RM_ARCWeaponry.xml	
+++ /dev/null
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Reinforced Mechanoid 2</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ===== Move Speed Penalty Removal ===== -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RM_ARCRifle"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<!-- ===== Weapon Tools ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Gun_ARCPistol"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2.2</cooldownTime>
-								<armorPenetrationBlunt>0.830</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>3.05</cooldownTime>
-								<armorPenetrationBlunt>1.130</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>coil</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2.85</cooldownTime>
-								<armorPenetrationBlunt>1.380</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_ARCRifle"]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Gun_ARCThrower"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2.74</cooldownTime>
-								<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>coil</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2.54</cooldownTime>
-								<armorPenetrationBlunt>3.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Coil Weaponry ===== -->
-
-				<!-- === ARC Pistol === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RM_Gun_ARCPistol</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.07</SwayFactor>
-						<Mass>1.5</Mass>
-						<Bulk>3</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.76</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>RM_Bullet_CoilPistol</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>21</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>3</burstShotCount>
-						<soundCast>RM_Shot_ARC</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>24</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_RM_CoilPistolGun</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>MechanoidGunSmall</li>
-						<li>MechanoidGunARCSmall</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<!-- === ARC Rifle === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RM_ARCRifle</defName>
-					<statBases>
-						<Mass>5</Mass>
-						<Bulk>11</Bulk>
-						<SwayFactor>1</SwayFactor>
-						<ShotSpread>0.05</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.16</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>RM_Bullet_CoilRifle</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>57</range>
-						<burstShotCount>1</burstShotCount>
-						<soundCast>RM_Shot_ARC</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_RM_CoilRifleGun</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>MechanoidGunMedium</li>
-						<li>MechanoidGunARCMedium</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<!-- ===== ARC Thrower ===== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RM_Gun_ARCThrower</defName>
-					<statBases>
-						<Mass>8.0</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1.24</SwayFactor>
-						<Bulk>10.0</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>RM_Bullet_TeslaCoil</defaultProjectile>
-						<warmupTime>0.85</warmupTime>
-						<range>52</range>
-						<burstShotCount>1</burstShotCount>
-						<soundCast>RM_Shot_ARC</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_RM_TeslaGun</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>MechanoidGunHeavy</li>
-						<li>MechanoidGunARC</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Reinforced Mechanoid 2/ThingDefs_Misc/RM_Ammo_Spacer.xml b/Patches/Reinforced Mechanoid 2/ThingDefs_Misc/RM_Ammo_Spacer.xml
deleted file mode 100644
index f956996490..0000000000
--- a/Patches/Reinforced Mechanoid 2/ThingDefs_Misc/RM_Ammo_Spacer.xml	
+++ /dev/null
@@ -1,476 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Reinforced Mechanoid 2</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ===== Ammo Sets ===== -->
-
-						<!-- Charged -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_RM_5x35mmS</defName>
-							<label>5x35mm Special</label>
-							<ammoTypes>
-								<Ammo_5x35mmCharged>RM_Bullet_5x35mmS</Ammo_5x35mmCharged>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_RM_5x35mmH</defName>
-							<label>5x35mm Hyper</label>
-							<ammoTypes>
-								<Ammo_5x35mmCharged>RM_Bullet_5x35mmH</Ammo_5x35mmCharged>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- Shard -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_ShardPistol</defName>
-							<label>Crystalline Shard</label>
-							<ammoTypes>
-								<RM_Ammo_ShardGun>RM_Bullet_ShardPistol</RM_Ammo_ShardGun>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_ShardLance</defName>
-							<label>Crystalline Shard</label>
-							<ammoTypes>
-								<RM_Ammo_ShardGun>RM_Bullet_ShardLance</RM_Ammo_ShardGun>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_ShardSwarmer</defName>
-							<label>Crystalline Shard</label>
-							<ammoTypes>
-								<RM_Ammo_ShardGun>RM_Bullet_ShardSwarmer</RM_Ammo_ShardGun>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- Coil -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_RM_CoilPistolGun</defName>
-							<label>coil charge</label>
-							<ammoTypes>
-								<Ammo_LaserChargePack>RM_Bullet_CoilPistol</Ammo_LaserChargePack>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_RM_CoilRifleGun</defName>
-							<label>coil charge</label>
-							<ammoTypes>
-								<Ammo_LaserChargePack>RM_Bullet_CoilRifle</Ammo_LaserChargePack>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_RM_TeslaGun</defName>
-							<label>coil charge</label>
-							<ammoTypes>
-								<Ammo_LaserChargePack>RM_Bullet_TeslaCoil</Ammo_LaserChargePack>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- Plasma -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_PlasmaImmolator</defName>
-							<label>plasma cell</label>
-							<ammoTypes>
-								<Ammo_PlasmaCellHeavy>RM_Bullet_PlasmaCellImmolator</Ammo_PlasmaCellHeavy>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_PlasmaHellgator</defName>
-							<label>plasma cell</label>
-							<ammoTypes>
-								<Ammo_PlasmaCellHeavy>RM_Bullet_PlasmaCellHellgator</Ammo_PlasmaCellHeavy>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ===== Shard Ammo ===== -->
-						<ThingCategoryDef>
-							<defName>AmmoCrystallineShard</defName>
-							<label>Crystalline Shard</label>
-							<parent>AmmoRifles</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
-						</ThingCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>CrystallineShard</defName>
-							<label>crystalline shard</label>
-							<labelShort>CS</labelShort>
-							<description>The crystalline shard core shatters into sharp splinter that maximize flesh damage but produces less armor penetration.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="RMShardBase" ParentName="SmallAmmoBase" Abstract="True">
-							<description>Small, high-velocity crystalline bullet used in Shard weaponry system.</description>
-							<statBases>
-								<Mass>0.01</Mass>
-								<Bulk>0.02</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoCrystallineShard</li>
-							</thingCategories>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="RMShardBase">
-							<defName>RM_Ammo_ShardGun</defName>
-							<label>Crystalline shard cartridge</label>
-							<graphicData>
-								<texPath>Things/Ammo/Railgun/Rifle</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>1</MarketValue>
-							</statBases>
-							<ammoClass>CrystallineShard</ammoClass>
-							<cookOffProjectile>RM_Bullet_ShardLance</cookOffProjectile>
-						</ThingDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeRM_Ammo_ShardGun</defName>
-							<label>make Crystalline shard cartridge x750</label>
-							<description>Craft 750 Crystalline shard cartridges.</description>
-							<jobString>Making Crystalline Shard cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>18</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>18</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Plasteel</li>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<researchPrerequisite>RM_ShardShot</researchPrerequisite>
-							<recipeUsers>
-								<li>FabricationBench</li>
-							</recipeUsers>
-							<products>
-								<RM_Ammo_ShardGun>750</RM_Ammo_ShardGun>
-							</products>
-							<workAmount>19000</workAmount>
-						</RecipeDef>
-
-						<!-- ===== Low velocity 5x35mm Projectile ===== -->
-						<ThingDef ParentName="Base5x35mmChargedBullet">
-							<defName>RM_Bullet_5x35mmS</defName>
-							<label>5x35mm Special bullet</label>
-							<graphicData>
-								<texPath>Things/Projectile/Charged/ChargeLanceShot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-								<drawSize>(0.75,0.75)</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE" Inherit="False">
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>11</damageAmountBase>
-								<speed>151</speed>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>2</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>27</armorPenetrationSharp>
-								<armorPenetrationBlunt>38.4</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<!-- ===== High velocity 5x35mm Projectile ===== -->
-						<ThingDef ParentName="Base5x35mmChargedBullet">
-							<defName>RM_Bullet_5x35mmH</defName>
-							<label>5x35mm Hyper bullet</label>
-							<graphicData>
-								<texPath>Things/Projectile/Charged/ChargeLanceShot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-								<drawSize>(1.25,1.25)</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE" Inherit="False">
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>14</damageAmountBase>
-								<speed>204</speed>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>2</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>33</armorPenetrationSharp>
-								<armorPenetrationBlunt>86.4</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<!-- ===== Shard Projectiles ===== -->
-						<ThingDef ParentName="Base45ACPBullet">
-							<defName>RM_Bullet_ShardPistol</defName>
-							<label>Shard crystal</label>
-							<graphicData>
-								<texPath>Things/Projectile/ShardShot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>0.5</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>RM_Damage_ShardShot</damageDef>
-								<speed>83</speed>
-								<dropsCasings>false</dropsCasings>
-								<pelletCount>2</pelletCount>
-								<spreadMult>2</spreadMult>
-								<damageAmountBase>3</damageAmountBase>
-								<armorPenetrationBlunt>5.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base45ACPBullet">
-							<defName>RM_Bullet_ShardLance</defName>
-							<label>Shard crystal</label>
-							<graphicData>
-								<texPath>Things/Projectile/ShardShot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>0.5</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>RM_Damage_ShardShot</damageDef>
-								<speed>83</speed>
-								<dropsCasings>false</dropsCasings>
-								<pelletCount>3</pelletCount>
-								<spreadMult>2</spreadMult>
-								<damageAmountBase>5</damageAmountBase>
-								<armorPenetrationBlunt>6.4</armorPenetrationBlunt>
-								<armorPenetrationSharp>16</armorPenetrationSharp>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base45ACPBullet">
-							<defName>RM_Bullet_ShardSwarmer</defName>
-							<label>Shard crystal</label>
-							<graphicData>
-								<texPath>Things/Projectile/ShardShot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>0.5</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>RM_Damage_ShardShot</damageDef>
-								<speed>83</speed>
-								<dropsCasings>false</dropsCasings>
-								<pelletCount>4</pelletCount>
-								<spreadMult>2</spreadMult>
-								<damageAmountBase>4</damageAmountBase>
-								<armorPenetrationBlunt>5.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>14</armorPenetrationSharp>
-							</projectile>
-						</ThingDef>
-
-						<!-- ===== Reinforced Tesla/Coil Projectiles ===== -->
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletWhite">
-							<defName>RM_Bullet_CoilPistol</defName>
-							<label>coil discharge</label>
-							<graphicData>
-								<color>(255,255,255)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>EMP</damageDef>
-								<damageAmountBase>10</damageAmountBase>
-								<explosionRadius>0.3</explosionRadius>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletWhite">
-							<defName>RM_Bullet_CoilRifle</defName>
-							<label>coil discharge</label>
-							<graphicData>
-								<color>(255,255,255)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>EMP</damageDef>
-								<damageAmountBase>17</damageAmountBase>
-								<explosionRadius>0.5</explosionRadius>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletWhite">
-							<defName>RM_Bullet_TeslaCoil</defName>
-							<label>coil discharge</label>
-							<graphicData>
-								<color>(255,255,255)</color>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>EMP</damageDef>
-								<damageAmountBase>20</damageAmountBase>
-								<explosionRadius>2.5</explosionRadius>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							</projectile>
-						</ThingDef>
-
-						<!-- ===== Plasma Weapon Projectiles ===== -->
-						<ThingDef Name="BaseRMPlasmaCell" ParentName="BaseBulletCE" Abstract="true">
-							<thingClass>CombatExtended.BulletCE</thingClass>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Burn</damageDef>
-								<speed>144</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseRMPlasmaCell">
-							<defName>RM_Bullet_PlasmaCellImmolator</defName>
-							<label>immolator shot</label>
-							<graphicData>
-								<texPath>Things/Projectile/Charged/ChargeShot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>144</speed>
-								<damageDef>Burn</damageDef>
-								<damageAmountBase>14</damageAmountBase>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<explosionRadius>1</explosionRadius>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>30</amount>
-									</li>
-								</secondaryDamage>
-								<screenShakeFactor>0</screenShakeFactor>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base60mmMortarShell">
-							<defName>RM_Bullet_PlasmaCellHellgator</defName>
-							<label>encapsulated hellgator shot</label>
-							<graphicData>
-								<texPath>Things/Projectile/Mortar/Incendiary</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Flame</damageDef>
-								<damageAmountBase>18</damageAmountBase>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0</armorPenetrationBlunt>
-								<explosionRadius>3.9</explosionRadius>
-								<flyOverhead>true</flyOverhead>
-								<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-								<soundExplode>Explosion_GiantBomb</soundExplode>
-								<soundImpactAnticipate>RM_Hit_PlasmaHellgator</soundImpactAnticipate>
-								<soundAmbient>MortarRound_Ambient</soundAmbient>
-								<ai_IsIncendiary>true</ai_IsIncendiary>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseGrenadeProjectile">
-							<defName>RM_Proj_PlasmaGrenadeImmolator</defName>
-							<label>immolator grenade</label>
-							<graphicData>
-								<texPath>Things/Projectile/MechanoidImmolatorGrenade</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>2.9</explosionRadius>
-								<damageDef>Flame</damageDef>
-								<damageAmountBase>10</damageAmountBase>
-								<explosionDelay>180</explosionDelay>
-								<dropsCasings>true</dropsCasings>
-								<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-								<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<speed>15</speed>
-								<gravityFactor>2</gravityFactor>
-								<suppressionFactor>3.0</suppressionFactor>
-								<dangerFactor>2.0</dangerFactor>
-								<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base90mmCannonShell">
-							<defName>RM_Bullet_AncientChargeRailgun_CE</defName>
-							<label>charge railgun shot</label>
-							<graphicData>
-								<texPath>Things/Projectile/AncientChargeRailgunShot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-								<drawSize>4</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>242</speed>
-								<flyOverhead>false</flyOverhead>
-								<dropsCasings>false</dropsCasings>
-								<casingMoteDefname>Fleck_BigShell</casingMoteDefname>
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>500</damageAmountBase>
-								<soundExplode>MortarBomb_Explode</soundExplode>
-								<armorPenetrationSharp>200</armorPenetrationSharp>
-								<armorPenetrationBlunt>20000</armorPenetrationBlunt>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>300</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>8</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Large>50</Fragment_Large>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Reinforced Mechanoid 2/ThingDefs_Misc/RM_Apparel.xml b/Patches/Reinforced Mechanoid 2/ThingDefs_Misc/RM_Apparel.xml
deleted file mode 100644
index d8ec83b607..0000000000
--- a/Patches/Reinforced Mechanoid 2/ThingDefs_Misc/RM_Apparel.xml	
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Reinforced Mechanoids 2</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RM_Apparel_ProphetCrown"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RM_Apparel_ProphetAura"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>2</WornBulk>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Apparel_ProphetCrown" or defName="RM_Apparel_ProphetAura"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Apparel_ProphetCrown" or defName="RM_Apparel_ProphetAura"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ======== Royalty Add-On ======= -->
-				<li Class="PatchOperationFindMod">
-					<mods>
-						<li>Royalty</li>
-					</mods>
-
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="RM_Apparel_SkimmerPack"]/statBases</xpath>
-								<value>
-									<Bulk>8</Bulk>
-									<WornBulk>3</WornBulk>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Reinforced Mechanoid 2/ThingDefs_Misc/RM_Buildings_Mech.xml b/Patches/Reinforced Mechanoid 2/ThingDefs_Misc/RM_Buildings_Mech.xml
deleted file mode 100644
index d2962bfa6f..0000000000
--- a/Patches/Reinforced Mechanoid 2/ThingDefs_Misc/RM_Buildings_Mech.xml	
+++ /dev/null
@@ -1,285 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Reinforced Mechanoid 2</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Ancient Immolator Turret ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Turret_AncientImmolatorTurret"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Turret_AncientImmolatorTurret"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>1.0</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RM_Turret_AncientImmolatorTurret"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.75</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Turret_AncientImmolatorTurret"]/statBases/Mass</xpath>
-					<value>
-						<Mass>50</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RM_Turret_AncientImmolatorTurret"]/comps/li[@Class = "CompProperties_Explosive"]</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Turret_AncientImmolatorTurret"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RM_Gun_AncientImmolatorTurret</defName>
-					<statBases>
-						<Mass>100</Mass>
-						<RangedWeapon_Cooldown>2.51</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>0.82</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.82</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>RM_Bullet_PlasmaCellImmolator</defaultProjectile>
-						<warmupTime>4.0</warmupTime>
-						<range>55</range>
-						<ticksBetweenBurstShots>30</ticksBetweenBurstShots>
-						<burstShotCount>3</burstShotCount>
-						<soundCast>RM_Shot_PlasmaImmolator</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-					</FireModes>
-				</li>
-
-				<!-- ========== Ancient Auto Mortar ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Turret_AutoMortarCannon"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Turret_AutoMortarCannon"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RM_Turret_AutoMortarCannon"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.25</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Turret_AutoMortarCannon"]/statBases/Mass</xpath>
-					<value>
-						<Mass>75</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RM_Turret_AutoMortarCannon"]/comps/li[@Class = "CompProperties_Explosive"]</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Turret_AutoMortarCannon"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RM_Gun_AncientAutoMortarCannon"]</xpath>
-					<value>
-						<statBases>
-							<SightsEfficiency>0.5</SightsEfficiency>
-						</statBases>
-					</value>
-				</li>
-
-				<!--Test for comps and add if not present-->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="RM_Gun_AncientAutoMortarCannon"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="RM_Gun_AncientAutoMortarCannon"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="RM_Gun_AncientAutoMortarCannon"]</xpath>
-						<value>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RM_Gun_AncientAutoMortarCannon"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Charges">
-							<chargeSpeeds>
-								<li>30</li>
-								<li>50</li>
-								<li>70</li>
-								<li>90</li>
-							</chargeSpeeds>
-						</li>
-					</value>
-				</li>
-
-				<!--Test for tags and add if not present-->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="RM_Gun_AncientAutoMortarCannon"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="RM_Gun_AncientAutoMortarCannon"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="RM_Gun_AncientAutoMortarCannon"]</xpath>
-						<value>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RM_Gun_AncientAutoMortarCannon"]/weaponTags</xpath>
-					<value>
-						<li>TurretGun</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Gun_AncientAutoMortarCannon"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-								<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_66mmThermalBolt_Incendiary</defaultProjectile>
-								<warmupTime>11</warmupTime>
-								<minRange>32</minRange>
-								<range>700</range>
-								<burstShotCount>1</burstShotCount>
-								<soundCast>Mortar_LaunchA</soundCast>
-								<muzzleFlashScale>16</muzzleFlashScale>
-								<circularError>1</circularError>
-								<indirectFirePenalty>0.2</indirectFirePenalty>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- ========== Ancient Charge Railgun ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Turret_AncientChargeRailgun"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Turret_AncientChargeRailgun"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>1.5</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RM_Turret_AncientChargeRailgun"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>2</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Turret_AncientChargeRailgun"]/statBases/Mass</xpath>
-					<value>
-						<Mass>800</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RM_Turret_AncientChargeRailgun"]/comps/li[@Class = "CompProperties_Explosive"]</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Turret_AncientChargeRailgun"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.99</fillPercent>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RM_Gun_AncientChargeRailgun</defName>
-					<statBases>
-						<Mass>300.00</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>4.5</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.92</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>RM_Bullet_AncientChargeRailgun_CE</defaultProjectile>
-						<warmupTime>16</warmupTime>
-						<range>500</range>
-						<burstShotCount>1</burstShotCount>
-						<soundCast>RM_Shot_ChargeRailgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>16</muzzleFlashScale>
-						<minRange>14.9</minRange>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Reinforced Mechanoid 2/ThingDefs_Misc/RM_Buildings_Security_Turrets.xml b/Patches/Reinforced Mechanoid 2/ThingDefs_Misc/RM_Buildings_Security_Turrets.xml
deleted file mode 100644
index ab8fc195a9..0000000000
--- a/Patches/Reinforced Mechanoid 2/ThingDefs_Misc/RM_Buildings_Security_Turrets.xml	
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Reinforced Mechanoid 2</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Auto Shard Lance ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Turret_AutoShardLance"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Turret_AutoShardLance"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>1.5</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RM_Turret_AutoShardLance"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.75</AimingAccuracy>
-						<NightVisionEfficiency>0.4</NightVisionEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Turret_AutoShardLance"]/statBases/Mass</xpath>
-					<value>
-						<Mass>30</Mass>
-						<Bulk>40</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RM_Turret_AutoShardLance"]/comps/li[@Class = "CompProperties_Explosive"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RM_Turret_AutoShardLance"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Turret_AutoShardLance"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Turret_AutoShardLance"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>1.0</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<!--1 shot turret would be useless. Giving it a 50 round mag-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RM_Gun_AutoShardLance</defName>
-					<statBases>
-						<Mass>8.00</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>0.44</SwayFactor>
-						<Bulk>13.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.75</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>RM_Bullet_ShardLance</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>55</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-						<soundCast>RM_Shot_ShardLance</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_ShardLance</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-					</FireModes>
-				</li>
-
-				<!-- ========== Auto Shard Swarmer ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Turret_AutoShardSwarmer"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Turret_AutoShardSwarmer"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>1.0</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RM_Turret_AutoShardSwarmer"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.5</AimingAccuracy>
-						<NightVisionEfficiency>0.4</NightVisionEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Turret_AutoShardSwarmer"]/statBases/Mass</xpath>
-					<value>
-						<Mass>80</Mass>
-						<Bulk>80</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RM_Turret_AutoShardSwarmer"]/comps/li[@Class = "CompProperties_Explosive"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RM_Turret_AutoShardSwarmer"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Turret_AutoShardSwarmer"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Turret_AutoShardSwarmer"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>2.0</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<!-- Price increase because CE HCB is not an equivalent weapon to most other options-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Turret_AutoShardSwarmer"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>60</Plasteel>
-						<Steel>205</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Turret_AutoShardSwarmer"]/costList/ComponentIndustrial</xpath>
-					<value>
-						<ComponentIndustrial>15</ComponentIndustrial>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RM_Gun_AutoShardSwarmer</defName>
-					<statBases>
-						<Mass>35.00</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>13.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.08</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>RM_Bullet_ShardSwarmer</defaultProjectile>
-						<warmupTime>2.0</warmupTime>
-						<range>48</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>RM_Shot_ShardLauncher</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>9.2</reloadTime>
-						<ammoSet>AmmoSet_ShardSwarmer</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Reinforced Mechanoid 2/ThingDefs_Misc/RM_ChargeWeaponry.xml b/Patches/Reinforced Mechanoid 2/ThingDefs_Misc/RM_ChargeWeaponry.xml
deleted file mode 100644
index 98a6cf28d4..0000000000
--- a/Patches/Reinforced Mechanoid 2/ThingDefs_Misc/RM_ChargeWeaponry.xml	
+++ /dev/null
@@ -1,232 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Reinforced Mechanoid 2</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ===== Weapon Tools ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Gun_ChargeLancePistol"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2.02</cooldownTime>
-								<armorPenetrationBlunt>1.430</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2.2</cooldownTime>
-								<armorPenetrationBlunt>0.830</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Gun_ChargePistol"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>3.05</cooldownTime>
-								<armorPenetrationBlunt>1.130</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-									<li>Stab</li>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2.2</cooldownTime>
-								<armorPenetrationBlunt>2.380</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.52</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Gun_ChargeLanceRifle"]/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>
-				</li>
-
-				<!-- ===== Lance Weaponry ===== -->
-
-				<!-- === Charge Lance Pistol === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RM_Gun_ChargeLancePistol</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.10</ShotSpread>
-						<SwayFactor>1</SwayFactor>
-						<Mass>1.75</Mass>
-						<Bulk>3.5</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>RM_Bullet_5x35mmS</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>30</range>
-						<burstShotCount>1</burstShotCount>
-						<soundCast>ChargeLance_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_RM_5x35mmS</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>MechanoidGunSmall</li>
-						<li>SpacerGun</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Charge Lance Rifle === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RM_Gun_ChargeLanceRifle</defName>
-					<statBases>
-						<Mass>7</Mass>
-						<Bulk>12</Bulk>
-						<SwayFactor>1</SwayFactor>
-						<ShotSpread>0.02</ShotSpread>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>RM_Bullet_5x35mmH</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>65</range>
-						<burstShotCount>1</burstShotCount>
-						<soundCast>ChargeLance_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_RM_5x35mmH</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>MechanoidGunMedium</li>
-						<li>SpacerGun</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<!-- ===== Charge Weaponry ===== -->
-
-				<!-- === Charge Sidearm === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RM_Gun_ChargePistol</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.07</SwayFactor>
-						<Mass>1.50</Mass>
-						<Bulk>3</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.76</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>24</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>3</burstShotCount>
-						<soundCast>Shot_ChargeBlaster</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>21</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>MechanoidGunSmall</li>
-						<li>SpacerGun</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Reinforced Mechanoid 2/ThingDefs_Misc/RM_MechWeaponry.xml b/Patches/Reinforced Mechanoid 2/ThingDefs_Misc/RM_MechWeaponry.xml
deleted file mode 100644
index 3dc752ca99..0000000000
--- a/Patches/Reinforced Mechanoid 2/ThingDefs_Misc/RM_MechWeaponry.xml	
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Reinforced Mechanoid 2</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ===== Weapon Tools ===== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Gun_InfernoRifle" or defName="RM_Gun_InfernoLauncher"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2.14</cooldownTime>
-								<armorPenetrationBlunt>2.75</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2.74</cooldownTime>
-								<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Gun_ChargeLanceHeavy"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2.74</cooldownTime>
-								<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>rail</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2.14</cooldownTime>
-								<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Inferno Rifle ===== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RM_Gun_InfernoRifle</defName>
-					<statBases>
-						<Mass>50.00</Mass>
-						<RangedWeapon_Cooldown>2.68</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.35</ShotSpread>
-						<SwayFactor>0.19</SwayFactor>
-						<Bulk>18.00</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_80x256mmFuel_Incendiary</defaultProjectile>
-						<warmupTime>4.5</warmupTime>
-						<range>82</range>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-						<minRange>5</minRange>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>13.7</reloadTime>
-						<ammoSet>AmmoSet_80x256mmFuel</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>MechanoidGunMedium</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<!-- ===== Inferno Launcher ===== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RM_Gun_InfernoLauncher</defName>
-					<statBases>
-						<Mass>75.00</Mass>
-						<RangedWeapon_Cooldown>2.53</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.35</ShotSpread>
-						<SwayFactor>0.21</SwayFactor>
-						<Bulk>20.00</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_80x256mmFuel_Incendiary</defaultProjectile>
-						<warmupTime>4.5</warmupTime>
-						<range>76</range>
-						<ticksBetweenBurstShots>25</ticksBetweenBurstShots>
-						<burstShotCount>4</burstShotCount>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-						<minRange>5</minRange>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>4</magazineSize>
-						<reloadTime>14.7</reloadTime>
-						<ammoSet>AmmoSet_80x256mmFuel</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<!-- ===== Heavy Charge Lance ===== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RM_Gun_ChargeLanceHeavy</defName>
-					<statBases>
-						<Mass>8.5</Mass>
-						<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1</SwayFactor>
-						<Bulk>14.00</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_5x35mmCharged</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>62</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>3</burstShotCount>
-						<soundCast>ChargeLance_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_5x35mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>MechanoidGunHeavy</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<!-- ===== Locust Laser ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Bullet_LocustLaser"]/projectile/damageAmountBase</xpath>
-					<value>
-						<damageAmountBase>14</damageAmountBase>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Reinforced Mechanoid 2/ThingDefs_Misc/RM_PlasmaWeaponry.xml b/Patches/Reinforced Mechanoid 2/ThingDefs_Misc/RM_PlasmaWeaponry.xml
deleted file mode 100644
index 83c1c75a27..0000000000
--- a/Patches/Reinforced Mechanoid 2/ThingDefs_Misc/RM_PlasmaWeaponry.xml	
+++ /dev/null
@@ -1,655 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Reinforced Mechanoid 2</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ===== Plasma Melee Weapon ===== -->
-
-				<!-- === Graviton Mace === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_MeleeWeapon_GravitonMace"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>RM_GravitonMaceAttack</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>2.61</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>115</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>2.2</cooldownTime>
-								<extraMeleeDamages>
-									<li>
-										<def>Flame</def>
-										<amount>8</amount>
-										<chance>0.5</chance>
-									</li>
-								</extraMeleeDamages>
-								<armorPenetrationBlunt>10.180</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.76</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.84</cooldownTime>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RM_MeleeWeapon_GravitonMace"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RM_MeleeWeapon_GravitonMace"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.8</MeleeCritChance>
-							<MeleeParryChance>0.45</MeleeParryChance>
-							<MeleeDodgeChance>0.30</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- ======== Royalty Add-On ======= -->
-				<li Class="PatchOperationFindMod">
-					<mods>
-						<li>Royalty</li>
-					</mods>
-
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<!-- === Plasma Dagger === -->
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="RM_MeleeWeapon_PlasmaBane"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>points</label>
-											<capacities>
-												<li>Stab</li>
-											</capacities>
-											<power>29</power>
-											<cooldownTime>1.46</cooldownTime>
-											<extraMeleeDamages>
-												<li>
-													<def>Flame</def>
-													<amount>5</amount>
-													<chance>0.5</chance>
-												</li>
-											</extraMeleeDamages>
-											<chanceFactor>0.20</chanceFactor>
-											<armorPenetrationBlunt>2.625</armorPenetrationBlunt>
-											<armorPenetrationSharp>24</armorPenetrationSharp>
-											<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>left edge</label>
-											<capacities>
-												<li>Cut</li>
-											</capacities>
-											<power>28</power>
-											<cooldownTime>1.59</cooldownTime>
-											<extraMeleeDamages>
-												<li>
-													<def>Flame</def>
-													<amount>5</amount>
-													<chance>0.5</chance>
-												</li>
-											</extraMeleeDamages>
-											<chanceFactor>0.40</chanceFactor>
-											<armorPenetrationBlunt>3.0</armorPenetrationBlunt>
-											<armorPenetrationSharp>18</armorPenetrationSharp>
-											<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right edge</label>
-											<capacities>
-												<li>Cut</li>
-											</capacities>
-											<power>28</power>
-											<cooldownTime>1.59</cooldownTime>
-											<extraMeleeDamages>
-												<li>
-													<def>Flame</def>
-													<amount>5</amount>
-													<chance>0.5</chance>
-												</li>
-											</extraMeleeDamages>
-											<chanceFactor>0.40</chanceFactor>
-											<armorPenetrationBlunt>3.0</armorPenetrationBlunt>
-											<armorPenetrationSharp>18</armorPenetrationSharp>
-											<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="RM_MeleeWeapon_PlasmaBane"]/statBases</xpath>
-								<value>
-									<Bulk>5</Bulk>
-									<MeleeCounterParryBonus>0.3</MeleeCounterParryBonus>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="RM_MeleeWeapon_PlasmaBane"]</xpath>
-								<value>
-									<equippedStatOffsets>
-										<MeleeCritChance>0.40</MeleeCritChance>
-										<MeleeParryChance>0.60</MeleeParryChance>
-										<MeleeDodgeChance>0.30</MeleeDodgeChance>
-									</equippedStatOffsets>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="RM_MeleeWeapon_PlasmaBane"]/weaponTags</xpath>
-								<value>
-									<li>CE_OneHandedWeapon</li>
-								</value>
-							</li>
-
-							<!-- === Plasma Dual Sword === -->
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="RM_MeleeWeapon_PlasmaSword"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>point</label>
-											<capacities>
-												<li>Stab</li>
-											</capacities>
-											<power>40</power>
-											<extraMeleeDamages>
-												<li>
-													<def>Flame</def>
-													<amount>10</amount>
-													<chance>0.5</chance>
-												</li>
-											</extraMeleeDamages>
-											<cooldownTime>1.25</cooldownTime>
-											<armorPenetrationBlunt>1.848</armorPenetrationBlunt>
-											<armorPenetrationSharp>28</armorPenetrationSharp>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>left edge</label>
-											<capacities>
-												<li>Cut</li>
-											</capacities>
-											<power>32</power>
-											<extraMeleeDamages>
-												<li>
-													<def>Flame</def>
-													<amount>8</amount>
-													<chance>0.5</chance>
-												</li>
-											</extraMeleeDamages>
-											<cooldownTime>1.57</cooldownTime>
-											<armorPenetrationBlunt>3.76</armorPenetrationBlunt>
-											<armorPenetrationSharp>22</armorPenetrationSharp>
-											<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right edge</label>
-											<capacities>
-												<li>Cut</li>
-											</capacities>
-											<power>32</power>
-											<extraMeleeDamages>
-												<li>
-													<def>Flame</def>
-													<amount>8</amount>
-													<chance>0.5</chance>
-												</li>
-											</extraMeleeDamages>
-											<cooldownTime>1.57</cooldownTime>
-											<armorPenetrationBlunt>3.76</armorPenetrationBlunt>
-											<armorPenetrationSharp>22</armorPenetrationSharp>
-											<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="RM_MeleeWeapon_PlasmaSword"]/statBases</xpath>
-								<value>
-									<Bulk>8.5</Bulk>
-									<MeleeCounterParryBonus>1.17</MeleeCounterParryBonus>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="RM_MeleeWeapon_PlasmaSword"]</xpath>
-								<value>
-									<equippedStatOffsets>
-										<MeleeCritChance>0.80</MeleeCritChance>
-										<MeleeParryChance>0.60</MeleeParryChance>
-										<MeleeDodgeChance>0.53</MeleeDodgeChance>
-									</equippedStatOffsets>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-				<!-- ===== Weapon Tools ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Gun_PlasmaImmolator"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2.74</cooldownTime>
-								<armorPenetrationBlunt>3.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shielding</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2.14</cooldownTime>
-								<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Immolator === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RM_Gun_PlasmaImmolator</defName>
-					<statBases>
-						<Mass>12.5</Mass>
-						<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1</SwayFactor>
-						<Bulk>18.00</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>RM_Bullet_PlasmaCellImmolator</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>62</range>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<burstShotCount>3</burstShotCount>
-						<soundCast>RM_Shot_PlasmaImmolator</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_PlasmaImmolator</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>MechanoidGunBehemoth</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Hellgator === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RM_Gun_PlasmaHellgator</defName>
-					<statBases>
-						<MarketValue>9999</MarketValue>
-						<Bulk>20</Bulk>
-						<SwayFactor>1.24</SwayFactor>
-						<ShotSpread>0.10</ShotSpread>
-						<SightsEfficiency>0.5</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>RM_Bullet_PlasmaCellHellgator</defaultProjectile>
-						<warmupTime>3.5</warmupTime>
-						<range>126</range>
-						<minRange>16</minRange>
-						<burstShotCount>1</burstShotCount>
-						<ammoConsumedPerShotCount>10</ammoConsumedPerShotCount>
-						<soundCast>RM_Shot_PlasmaHellgator</soundCast>
-						<muzzleFlashScale>16</muzzleFlashScale>
-						<circularError>1.1</circularError>
-						<indirectFirePenalty>0.3</indirectFirePenalty>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>5.2</reloadTime>
-						<ammoSet>AmmoSet_PlasmaHellgator</ammoSet>
-					</AmmoUser>
-					<weaponTags Inherit="False">
-						<li>MechanoidGunWraithArtillery</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="RM_Gun_PlasmaHellgator"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="RM_Gun_PlasmaHellgator"]</xpath>
-						<value>
-							<comps>
-								<li Class="CombatExtended.CompProperties_Charges">
-									<chargeSpeeds>
-										<li>30</li>
-										<li>50</li>
-										<li>70</li>
-										<li>90</li>
-									</chargeSpeeds>
-								</li>
-							</comps>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="RM_Gun_PlasmaHellgator"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_Charges">
-								<chargeSpeeds>
-									<li>30</li>
-									<li>50</li>
-									<li>70</li>
-									<li>90</li>
-								</chargeSpeeds>
-							</li>
-						</value>
-					</match>
-				</li>
-
-				<!-- === Immolator Grenade === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RM_Weapon_GrenadePlasmaImmolator</defName>
-					<statBases>
-						<Mass>2.1</Mass>
-						<Bulk>3</Bulk>
-						<MarketValue>14.05</MarketValue>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<label>throw immolator grenade</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<range>12.9</range>
-						<minRange>3</minRange>
-						<warmupTime>0.8</warmupTime>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<soundCast>ThrowGrenade</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<defaultProjectile>RM_Proj_PlasmaGrenadeImmolator</defaultProjectile>
-						<onlyManualCast>true</onlyManualCast>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-						<ai_AvoidFriendlyFireRadius>2</ai_AvoidFriendlyFireRadius>
-					</Properties>
-					<weaponTags>
-						<li>MechanoidGrenadeDestructive</li>
-						<li>EmpireGrenadeDestructive</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="RM_Weapon_GrenadePlasmaImmolator"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>BaseWeapon</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RM_Weapon_GrenadePlasmaImmolator"]/recipeMaker</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RM_Weapon_GrenadePlasmaImmolator"]/costList</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RM_Weapon_GrenadePlasmaImmolator"]</xpath>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<stackLimit>75</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>RM_Make_ImmolatorGrenade</defName>
-							<label>make immolator grenades x10</label>
-							<description>Craft 10 immolator grenades.</description>
-							<jobString>Making immolator grenades.</jobString>
-							<workAmount>11000</workAmount>
-							<researchPrerequisite>AdvancedFabrication</researchPrerequisite>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Chemfuel</li>
-										</thingDefs>
-									</filter>
-									<count>80</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>3</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Prometheum</li>
-										</thingDefs>
-									</filter>
-									<count>3</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Chemfuel</li>
-									<li>ComponentIndustrial</li>
-									<li>Prometheum</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<RM_Weapon_GrenadePlasmaImmolator>10</RM_Weapon_GrenadePlasmaImmolator>
-							</products>
-							<recipeUsers>
-								<li>FabricationBench</li>
-							</recipeUsers>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingDef ParentName="BaseWeapon">
-							<defName>RM_Weapon_GrenadePlasmaImmolator_V</defName>
-							<label>immolator grenade</label>
-							<description>A stack of antipersonnel plasma pulse grenades. The resulting explosion will ignite anything nearby.</description>
-							<graphicData>
-								<texPath>Things/Item/Equipment/WeaponRanged/MechanoidImmolatorGrenades</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<tickerType>Normal</tickerType>
-							<soundInteract>Interact_Grenade</soundInteract>
-							<uiIconScale>1.3</uiIconScale>
-							<techLevel>Ultra</techLevel>
-							<statBases>
-								<Mass>4</Mass>
-								<RangedWeapon_Cooldown>2.66</RangedWeapon_Cooldown>
-								<WorkToMake>22000</WorkToMake>
-							</statBases>
-							<weaponTags>
-								<li>MechanoidGrenadeDestructive</li>
-							</weaponTags>
-							<thingCategories>
-								<li>Grenades</li>
-							</thingCategories>
-							<verbs>
-								<li>
-									<label>throw immolator grenade</label>
-									<verbClass>Verb_LaunchProjectile</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<range>12.9</range>
-									<forcedMissRadius>1.9</forcedMissRadius>
-									<warmupTime>1.5</warmupTime>
-									<noiseRadius>4</noiseRadius>
-									<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-									<soundCast>ThrowGrenade</soundCast>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<defaultProjectile>RM_Proj_GrenadeImmolator</defaultProjectile>
-									<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
-								</li>
-							</verbs>
-							<comps>
-								<li Class="CompProperties_Explosive">
-									<explosiveRadius>4.66</explosiveRadius>
-									<explosiveDamageType>Flame</explosiveDamageType>
-									<requiredDamageTypeToExplode>Flame</requiredDamageTypeToExplode>
-								</li>
-							</comps>
-						</ThingDef>
-
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RM_Proj_GrenadeImmolator"]/projectile</xpath>
-					<value>
-						<damageAmountBase>10</damageAmountBase>
-					</value>
-				</li>
-
-				<!-- ======== VWE - Grenades Add-On ======= -->
-				<li Class="PatchOperationFindMod">
-					<mods>
-						<li>Vanilla Weapons Expanded - Grenades</li>
-					</mods>
-
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<!-- === Immolator Grenade Belt === -->
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="VWE_Apparel_GrenadePlasmaImmolator"]/costList</xpath>
-								<value>
-									<costList>
-										<RM_Weapon_GrenadePlasmaImmolator>5</RM_Weapon_GrenadePlasmaImmolator>
-									</costList>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="VWE_Apparel_GrenadePlasmaImmolator"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountToRefill</xpath>
-								<value>
-									<ammoCountPerCharge>1</ammoCountPerCharge>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="VWE_Apparel_GrenadePlasmaImmolator"]/verbs</xpath>
-								<value>
-									<verbs>
-										<li Class="CombatExtended.VerbPropertiesCE">
-											<label>throw immolator grenade</label>
-											<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
-											<hasStandardCommand>true</hasStandardCommand>
-											<onlyManualCast>True</onlyManualCast>
-											<warmupTime>0.8</warmupTime>
-											<range>12.9</range>
-											<minRange>3</minRange>
-											<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-											<soundCast>ThrowGrenade</soundCast>
-											<soundCastTail>GunTail_Medium</soundCastTail>
-											<muzzleFlashScale>10</muzzleFlashScale>
-											<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
-											<targetParams>
-												<canTargetLocations>true</canTargetLocations>
-											</targetParams>
-											<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-											<defaultProjectile>RM_Proj_PlasmaGrenadeImmolator</defaultProjectile>
-											<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
-										</li>
-									</verbs>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Reinforced Mechanoid 2/ThingDefs_Misc/RM_ShardWeaponry.xml b/Patches/Reinforced Mechanoid 2/ThingDefs_Misc/RM_ShardWeaponry.xml
deleted file mode 100644
index aa3731ea6b..0000000000
--- a/Patches/Reinforced Mechanoid 2/ThingDefs_Misc/RM_ShardWeaponry.xml	
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Reinforced Mechanoid 2</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ===== Weapon Tools ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Gun_ShardLauncher" or defName="RM_Gun_ShardLance"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>crystal</label>
-								<capacities>
-									<li>Cut</li>
-									<li>Poke</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.2</cooldownTime>
-								<armorPenetrationBlunt>2.380</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.32</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Gun_ShardSwarmer"]/tools</xpath>
-					<value>
-						<tools>
-							<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>crystal</label>
-								<capacities>
-									<li>Cut</li>
-									<li>Poke</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.2</cooldownTime>
-								<armorPenetrationBlunt>2.380</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.32</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Shard Weaponry ===== -->
-
-				<!-- === Shard Pistol === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RM_Gun_ShardLauncher</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.07</SwayFactor>
-						<Mass>1.5</Mass>
-						<Bulk>3</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.76</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>RM_Bullet_ShardPistol</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>21</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>12</burstShotCount>
-						<soundCast>RM_Shot_ShardLauncher</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>36</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_ShardPistol</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>MechanoidGunMedium</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Shard Lance === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RM_Gun_ShardLance</defName>
-					<statBases>
-						<Mass>6</Mass>
-						<Bulk>13</Bulk>
-						<SwayFactor>1</SwayFactor>
-						<ShotSpread>0.05</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.16</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>RM_Bullet_ShardLance</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>57</range>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<burstShotCount>3</burstShotCount>
-						<soundCast>RM_Shot_ShardLance</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_ShardLance</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>MechanoidGunMedium</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Shard Swarmer === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RM_Gun_ShardSwarmer</defName>
-					<statBases>
-						<Mass>12</Mass>
-						<Bulk>20</Bulk>
-						<SwayFactor>1</SwayFactor>
-						<ShotSpread>0.05</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.16</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>RM_Bullet_ShardSwarmer</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>42</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>14</burstShotCount>
-						<soundCast>RM_Shot_ShardLauncher</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>70</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_ShardSwarmer</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>MechanoidGunHeavy</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Reinforced Mechanoid 2/ThingDefs_Races/RM_Races_Machines.xml b/Patches/Reinforced Mechanoid 2/ThingDefs_Races/RM_Races_Machines.xml
deleted file mode 100644
index 914494c3ea..0000000000
--- a/Patches/Reinforced Mechanoid 2/ThingDefs_Races/RM_Races_Machines.xml	
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Reinforced Mechanoid 2</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ===== Mechanoid Body Extension ===== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RM_Droid_Buffer" or defName="RM_Droid_Spartan"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- ===== Mechanoid Stats ===== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RM_Droid_Buffer" or defName="RM_Droid_Spartan"]/statBases</xpath>
-					<value>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>30</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
-						<ReloadSpeed>1</ReloadSpeed>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-						<MaxHitPoints>200</MaxHitPoints>
-						<NightVisionEfficiency>0.60</NightVisionEfficiency>
-					</value>
-				</li>
-
-				<!-- ===== Mechanoid Melee Attacks ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Droid_Buffer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Droid_Spartan"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.75</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.7</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Guardian Droid ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Droid_Buffer"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>3</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Droid_Buffer"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ===== Spartan Droid ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Droid_Spartan"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Droid_Spartan"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>9</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Reinforced Mechanoid 2/ThingDefs_Races/RM_Races_Mechanoids.xml b/Patches/Reinforced Mechanoid 2/ThingDefs_Races/RM_Races_Mechanoids.xml
deleted file mode 100644
index ebe1e97153..0000000000
--- a/Patches/Reinforced Mechanoid 2/ThingDefs_Races/RM_Races_Mechanoids.xml	
+++ /dev/null
@@ -1,959 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Reinforced Mechanoid 2</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ===== Mechanoid Vulture ===== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Vulture"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Vulture"]/statBases</xpath>
-					<value>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						<MeleeCritChance>0.12</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-						<MaxHitPoints>200</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Vulture"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Vulture"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Vulture"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.288</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.288</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationBlunt>0.525</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Mechanoid Caretaker ===== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Caretaker"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Caretaker"]/statBases</xpath>
-					<value>
-						<CarryWeight>200</CarryWeight>
-						<CarryBulk>80</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.02</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.41</MeleeParryChance>
-						<AimingDelayFactor>1.25</AimingDelayFactor>
-						<MaxHitPoints>500</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Caretaker"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>38</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Caretaker"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Caretaker"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>3.0</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Mechanoid Falcon ===== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Falcon"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Falcon"]/statBases</xpath>
-					<value>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						<MeleeCritChance>0.12</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-						<MaxHitPoints>200</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Falcon"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Falcon"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Falcon"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationBlunt>0.65</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Mechanoid Gremlin ===== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Gremlin"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Gremlin"]/statBases</xpath>
-					<value>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-						<MaxHitPoints>200</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Gremlin"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>5.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Gremlin"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>3.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Gremlin"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Gremlin"]/comps/li[@Class="ReinforcedMechanoids.CompProperties_GrenadeThrower"]/grenadeLauncher</xpath>
-					<value>
-						<grenadeLauncher>RM_Weapon_GrenadePlasmaImmolator_V</grenadeLauncher>
-					</value>
-				</li>
-
-				<!-- ===== Mechanoid Harpy ===== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Harpy"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Harpy"]/statBases</xpath>
-					<value>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-						<MaxHitPoints>200</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Harpy"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Harpy"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>3</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Harpy"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Mechanoid Ranger ===== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Ranger"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Ranger"]/statBases</xpath>
-					<value>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						<MeleeCritChance>0.12</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-						<MaxHitPoints>200</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Ranger"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Ranger"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Ranger"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Mechanoid Zealot ===== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Zealot"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Zealot"]/statBases</xpath>
-					<value>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-						<MaxHitPoints>200</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Zealot"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>9</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Zealot"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Zealot"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.34</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.625</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.34</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.625</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.1</chanceFactor>
-								<armorPenetrationBlunt>1.225</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Mechanoid Marshal ===== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Marshal"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Marshal"]/statBases</xpath>
-					<value>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.11</MeleeDodgeChance>
-						<MeleeCritChance>0.12</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-						<MaxHitPoints>200</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Marshal"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>9</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Marshal"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Marshal"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>48</power>
-								<cooldownTime>2.25</cooldownTime>
-								<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
-								<armorPenetrationSharp>2.47</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.8</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left blade</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>29</power>
-								<cooldownTime>1.73</cooldownTime>
-								<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
-								<armorPenetrationSharp>42.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>22.85</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>48</power>
-								<cooldownTime>2.27</cooldownTime>
-								<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
-								<armorPenetrationSharp>2.47</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.8</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right blade</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>29</power>
-								<cooldownTime>1.73</cooldownTime>
-								<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
-								<armorPenetrationSharp>42.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>22.85</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>41</power>
-								<cooldownTime>5.9</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<armorPenetrationSharp>2.17</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>5.9</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<armorPenetrationSharp>40.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>20.45</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Mechanoid Sentinel ===== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Sentinel"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Sentinel"]/statBases</xpath>
-					<value>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.12</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-						<MaxHitPoints>200</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Sentinel"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>50</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Sentinel"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>22</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Sentinel"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>3.51</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>3.51</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>32</power>
-								<cooldownTime>2.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationSharp>2.17</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>2.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Mechanoid Behemoth ===== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Behemoth"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Behemoth"]/statBases</xpath>
-					<value>
-						<CarryWeight>200</CarryWeight>
-						<CarryBulk>80</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.02</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.41</MeleeParryChance>
-						<AimingDelayFactor>1.25</AimingDelayFactor>
-						<MaxHitPoints>500</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Behemoth"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>60</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Behemoth"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>24</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Behemoth"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left shield</label>
-								<capacities>
-									<li>RM_BehemothAttack</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>4.28</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>18</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.24</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5.625</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>2.225</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Mechanoid Wraith ===== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Wraith"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Wraith"]/statBases</xpath>
-					<value>
-						<CarryWeight>200</CarryWeight>
-						<CarryBulk>80</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.02</MeleeDodgeChance>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>0.5</MeleeParryChance>
-						<AimingDelayFactor>1.25</AimingDelayFactor>
-						<MaxHitPoints>500</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Wraith"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>70</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Wraith"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>30</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Wraith"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>3.51</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Mechanoid Locust ===== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Locust"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Locust"]/statBases</xpath>
-					<value>
-						<CarryWeight>200</CarryWeight>
-						<CarryBulk>80</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.02</MeleeDodgeChance>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>0.5</MeleeParryChance>
-						<AimingDelayFactor>1.25</AimingDelayFactor>
-						<MaxHitPoints>500</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Locust"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>60</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Locust"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>24</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RM_Mech_Locust"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>3.51</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Remote Detonator/Remote_Detonator_CEpatch.xml b/Patches/Remote Detonator/Remote_Detonator_CEpatch.xml
deleted file mode 100644
index 50d6a0dc74..0000000000
--- a/Patches/Remote Detonator/Remote_Detonator_CEpatch.xml	
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Remote Detonator</li>
-		</mods>
-		<match Class='PatchOperationSequence'>
-
-			<operations>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_IED_HighExplosive"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>10</Steel>
-							<FSX>3</FSX>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_IED_Incendiary"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>10</Steel>
-							<Prometheum>2</Prometheum>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_IED_HighExplosive"]/comps/li[@Class="CompProperties_Explosive"]</xpath>
-					<value>
-						<li Class="CompProperties_Explosive">
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<damageAmountBase>270</damageAmountBase>
-							<explosiveRadius>4.5</explosiveRadius>
-							<wickTicks>
-								<min>5</min>
-								<max>30</max>
-							</wickTicks>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>16</Fragment_Large>
-								<Fragment_Small>100</Fragment_Small>
-							</fragments>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RD_IED_Incendiary"]/comps/li[@Class="CompProperties_Explosive"]</xpath>
-					<value>
-						<li Class="CompProperties_Explosive">
-							<explosiveDamageType>PrometheumFlame</explosiveDamageType>
-							<explosiveRadius>5</explosiveRadius>
-							<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
-							<preExplosionSpawnChance>0.75</preExplosionSpawnChance>
-							<wickTicks>
-								<min>5</min>
-								<max>20</max>
-							</wickTicks>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git "a/Patches/Revia Race \342\200\224 biotech/PawnKindDefs/ReviaPawnKindDefs.xml" "b/Patches/Revia Race \342\200\224 biotech/PawnKindDefs/ReviaPawnKindDefs.xml"
deleted file mode 100644
index 2d47140383..0000000000
--- "a/Patches/Revia Race \342\200\224 biotech/PawnKindDefs/ReviaPawnKindDefs.xml"	
+++ /dev/null
@@ -1,283 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Revia Race - biotech</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--Revia Marauder-->
-						<!--Berserker-->
-						<li Class="PatchOperationAddModExtension">
-							<xpath>
-								Defs/PawnKindDef[defName="ReviaRaceBerserker"]
-							</xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<sidearms>
-										<li>
-											<weaponTags>
-												<li>ReviaMeleeAdvanced</li>
-												<li>ReviaMeleeLegendary</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/PawnKindDef[defName="ReviaRaceBerserker"]/apparelTags</xpath>
-							<value>
-								<li>CE_Apparel_TacVest</li>
-								<li>CE_Apparel_Backpack</li>
-								<li>CE_Apparel_TribalBackpack</li>
-							</value>
-						</li>
-						<!--Marauder-->
-						<li Class="PatchOperationAddModExtension">
-							<xpath>
-								Defs/PawnKindDef[defName="ReviaRaceMarauder"]
-							</xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>5</min>
-										<max>10</max>
-									</primaryMagazineCount>
-									<sidearms>
-										<li>
-											<generateChance>0.2</generateChance>
-											<sidearmMoney>
-												<min>40</min>
-												<max>100</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>ReviaMeleeBasic</li>
-												<li>ReviaMeleeIntermediate</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/PawnKindDef[defName="ReviaRaceMarauder"]/apparelTags</xpath>
-							<value>
-								<li>CE_Apparel_TacVest</li>
-								<li>CE_Apparel_Backpack</li>
-								<li>CE_Apparel_TribalBackpack</li>
-							</value>
-						</li>
-						<!--Raider-->
-						<li Class="PatchOperationAddModExtension">
-							<xpath>
-								Defs/PawnKindDef[defName="ReviaRaceRaider"]
-							</xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<sidearms>
-										<li>
-											<generateChance>0.2</generateChance>
-											<sidearmMoney>
-												<min>10</min>
-												<max>20</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_Sidearm_Melee</li>
-												<li>ReviaMeleeBasic</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/PawnKindDef[defName="ReviaRaceRaider"]/apparelTags</xpath>
-							<value>
-								<li>CE_Apparel_TacVest</li>
-								<li>CE_Apparel_Backpack</li>
-								<li>CE_Apparel_TribalBackpack</li>
-							</value>
-						</li>
-						<!--Skullshatterer-->
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/PawnKindDef[defName="ReviaRaceSkullshatterer"]/apparelTags</xpath>
-							<value>
-								<li>CE_Apparel_TacVest</li>
-								<li>CE_Apparel_Backpack</li>
-								<li>CE_Apparel_TribalBackpack</li>
-							</value>
-						</li>
-						<!--Revia Templar-->
-						<!--High Templar-->
-						<li Class="PatchOperationAddModExtension">
-							<xpath>
-								Defs/PawnKindDef[defName="ReviaRaceHighTemplar"]
-							</xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>4</max>
-									</primaryMagazineCount>
-									<sidearms>
-										<li>
-											<magazineCount>
-												<min>1</min>
-												<max>3</max>
-											</magazineCount>
-											<generateChance>0.6</generateChance>
-											<weaponTags>
-												<li>ReviaMeleeLegendary</li>
-												<li>ReviaRangedAdvanced</li>
-												<li>CE_Sidearm</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/PawnKindDef[defName="ReviaRaceHighTemplar"]/apparelRequired</xpath>
-							<value>
-								<li>CE_Apparel_TacVest</li>
-								<li>CE_Apparel_Backpack</li>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/PawnKindDef[defName="ReviaRaceHighTemplar"]/apparelTags</xpath>
-							<value>
-								<li>CE_Apparel_TacVest</li>
-								<li>CE_Apparel_Backpack</li>
-								<li>CE_Apparel_TribalBackpack</li>
-							</value>
-						</li>
-						<!--Initiate-->
-						<li Class="PatchOperationAddModExtension">
-							<xpath>
-								Defs/PawnKindDef[defName="ReviaRaceInitiate"]
-							</xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>4</max>
-									</primaryMagazineCount>
-									<sidearms>
-										<li>
-											<magazineCount>
-												<min>1</min>
-												<max>3</max>
-											</magazineCount>
-											<generateChance>0.5</generateChance>
-											<weaponTags>
-												<li>ReviaRangedAdvanced</li>
-												<li>CE_Sidearm</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/PawnKindDef[defName="ReviaRaceInitiate"]/apparelTags</xpath>
-							<value>
-								<li>CE_Apparel_TacVest</li>
-								<li>CE_Apparel_Backpack</li>
-								<li>CE_Apparel_TribalBackpack</li>
-							</value>
-						</li>
-						<!--Quartermaster-->
-						<li Class="PatchOperationAddModExtension">
-							<xpath>
-								Defs/PawnKindDef[defName="ReviaRaceQuartermaster"]
-							</xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>4</max>
-									</primaryMagazineCount>
-									<sidearms>
-										<li>
-											<magazineCount>
-												<min>1</min>
-												<max>3</max>
-											</magazineCount>
-											<generateChance>0.5</generateChance>
-											<weaponTags>
-												<li>ReviaMeleeAdvanced</li>
-												<li>CE_Sidearm</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/PawnKindDef[defName="ReviaRaceQuartermaster"]/apparelRequired</xpath>
-							<value>
-								<li>CE_Apparel_TacVest</li>
-								<li>CE_Apparel_Backpack</li>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/PawnKindDef[defName="ReviaRaceQuartermaster"]/apparelTags</xpath>
-							<value>
-								<li>CE_Apparel_TacVest</li>
-								<li>CE_Apparel_Backpack</li>
-								<li>CE_Apparel_TribalBackpack</li>
-							</value>
-						</li>
-						<!--Templar-->
-						<li Class="PatchOperationAddModExtension">
-							<xpath>
-								Defs/PawnKindDef[defName="ReviaRaceTemplar"]
-							</xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>4</max>
-									</primaryMagazineCount>
-									<sidearms>
-										<li>
-											<magazineCount>
-												<min>1</min>
-												<max>3</max>
-											</magazineCount>
-											<generateChance>0.5</generateChance>
-											<weaponTags>
-												<li>ReviaMeleeAdvanced</li>
-												<li>ReviaMeleeLegendary</li>
-												<li>CE_Sidearm</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/PawnKindDef[defName="ReviaRaceTemplar"]/apparelRequired</xpath>
-							<value>
-								<li>CE_Apparel_TacVest</li>
-								<li>CE_Apparel_Backpack</li>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/PawnKindDef[defName="ReviaRaceTemplar"]/apparelTags</xpath>
-							<value>
-								<li>CE_Apparel_TacVest</li>
-								<li>CE_Apparel_Backpack</li>
-								<li>CE_Apparel_TribalBackpack</li>
-							</value>
-						</li>
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git "a/Patches/Revia Race \342\200\224 biotech/Scenario/Revia_Scenario.xml" "b/Patches/Revia Race \342\200\224 biotech/Scenario/Revia_Scenario.xml"
deleted file mode 100644
index fc750c250d..0000000000
--- "a/Patches/Revia Race \342\200\224 biotech/Scenario/Revia_Scenario.xml"	
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Revia Race - biotech</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ScenarioDef[defName="ReviaExclave"]/scenario/parts/li[thingDef="ReviaThrowingKnife" and @Class="ScenPart_StartingThing_Defined"]</xpath>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ScenarioDef[defName="ReviaExclave"]/scenario/parts</xpath>
-							<value>
-								<li Class="ScenPart_StartingThing_Defined">
-									<def>StartingThing_Defined</def>
-									<thingDef>ReviaThrowingKnife</thingDef>
-									<count>20</count>
-								</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git "a/Patches/Revia Race \342\200\224 biotech/ThingDefs_Misc/Weapons_Guns.xml" "b/Patches/Revia Race \342\200\224 biotech/ThingDefs_Misc/Weapons_Guns.xml"
deleted file mode 100644
index df0203933f..0000000000
--- "a/Patches/Revia Race \342\200\224 biotech/ThingDefs_Misc/Weapons_Guns.xml"	
+++ /dev/null
@@ -1,695 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Revia Race - biotech</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!-- ==========  Ranged  =========== -->
-						<!-- ==========  Throwing knife  =========== -->
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="ReviaThrowingKnife"]/costStuffCount</xpath>
-						</li>
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="ReviaThrowingKnife"]/stuffCategories</xpath>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ReviaThrowingKnifeThrown"]/projectile</xpath>
-							<value>
-								<projectile Class="CombatExtended.ProjectilePropertiesCE">
-									<damageDef>RangedStab</damageDef>
-									<damageAmountBase>14</damageAmountBase>
-									<flyOverhead>false</flyOverhead>
-									<speed>16</speed>
-									<armorPenetrationBlunt>0.12</armorPenetrationBlunt>
-									<armorPenetrationSharp>0.18</armorPenetrationSharp>
-									<preExplosionSpawnChance>0.80</preExplosionSpawnChance>
-									<preExplosionSpawnThingDef>ReviaThrowingKnife</preExplosionSpawnThingDef>
-								</projectile>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ReviaThrowingKnife"]</xpath>
-							<value>
-								<thingClass>CombatExtended.AmmoThing</thingClass>
-								<stackLimit>75</stackLimit>
-								<resourceReadoutPriority>First</resourceReadoutPriority>
-							</value>
-						</li>
-						<li Class="PatchOperationAttributeSet">
-							<xpath>Defs/ThingDef[defName="ReviaThrowingKnife"]</xpath>
-							<attribute>Class</attribute>
-							<value>CombatExtended.AmmoDef</value>
-						</li>
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>ReviaThrowingKnife</defName>
-							<statBases>
-								<SightsEfficiency>1.0</SightsEfficiency>
-								<Bulk>0.35</Bulk>
-								<Mass>0.15</Mass>
-								<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
-							</statBases>
-							<costList>
-								<Steel>10</Steel>
-							</costList>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-								<hasStandardCommand>True</hasStandardCommand>
-								<defaultProjectile>ReviaThrowingKnifeThrown</defaultProjectile>
-								<warmupTime>0.5</warmupTime>
-								<range>16</range>
-								<soundCast>Interact_BeatFire</soundCast>
-								<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-							</Properties>
-							<weaponTags>
-								<li>ReviaRangedBasic</li>
-							</weaponTags>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ReviaThrowingKnife"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>point</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>4</power>
-										<cooldownTime>1.28</cooldownTime>
-										<chanceFactor>1.12</chanceFactor>
-										<armorPenetrationBlunt>0.14</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.15</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>blade</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>6</power>
-										<cooldownTime>1.12</cooldownTime>
-										<chanceFactor>1.88</chanceFactor>
-										<armorPenetrationBlunt>0.12</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.24</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-						<!-- == Recipe == -->
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<RecipeDef ParentName="GrenadeRecipeBase">
-									<defName>MakeReviaThrowingKnife</defName>
-									<label>make throwing knives x10</label>
-									<description>Craft 10 throwing knives.</description>
-									<jobString>Making throwing knives.</jobString>
-									<ingredients>
-										<li>
-											<filter>
-												<thingDefs>
-													<li>Steel</li>
-												</thingDefs>
-											</filter>
-											<count>10</count>
-										</li>
-									</ingredients>
-									<fixedIngredientFilter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</fixedIngredientFilter>
-									<products>
-										<ReviaThrowingKnife>10</ReviaThrowingKnife>
-									</products>
-									<recipeUsers>
-										<li>CraftingSpot</li>
-									</recipeUsers>
-								</RecipeDef>
-							</value>
-						</li>
-						<!-- ==========  Repeating crossbow  =========== -->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ReviaRepeatingCrossbow"]/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>
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>ReviaRepeatingCrossbow</defName>
-							<statBases>
-								<SightsEfficiency>1.0</SightsEfficiency>
-								<Bulk>4.0</Bulk>
-								<Mass>2.55</Mass>
-								<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
-							</statBases>
-							<costList>
-								<Steel>10</Steel>
-							</costList>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>True</hasStandardCommand>
-								<defaultProjectile>Projectile_CrossbowBolt_Steel</defaultProjectile>
-								<warmupTime>1</warmupTime>
-								<range>22</range>
-								<burstShotCount>6</burstShotCount>
-								<soundCast>Bow_Small</soundCast>
-								<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-							</Properties>
-							<weaponTags>
-								<li>ReviaRangedAdvanced</li>
-							</weaponTags>
-							<AmmoUser>
-								<magazineSize>6</magazineSize>
-								<reloadTime>6.6</reloadTime>
-								<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-							</FireModes>
-						</li>
-						<!-- ==========  Shard cannon  =========== -->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ReviaFlechetteCannon"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>7</power>
-										<cooldownTime>1.6</cooldownTime>
-										<armorPenetrationBlunt>0.24</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<capacities>
-											<li>Gash</li>
-										</capacities>
-										<power>12</power>
-										<cooldownTime>1.9</cooldownTime>
-										<armorPenetrationBlunt>0.85</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.74</armorPenetrationSharp>
-									</li>
-								</tools>
-							</value>
-						</li>
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>ReviaFlechetteCannon</defName>
-							<statBases>
-								<SightsEfficiency>1.0</SightsEfficiency>
-								<Bulk>10.0</Bulk>
-								<Mass>8.0</Mass>
-								<ShotSpread>0.18</ShotSpread>
-								<SwayFactor>1.45</SwayFactor>
-								<RangedWeapon_Cooldown>1.15</RangedWeapon_Cooldown>
-							</statBases>
-							<costList>
-								<Steel>10</Steel>
-							</costList>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>True</hasStandardCommand>
-								<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>21</range>
-								<recoilAmount>2.35</recoilAmount>
-								<burstShotCount>3</burstShotCount>
-								<soundCast>Shot_Shotgun</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-							</Properties>
-							<weaponTags>
-								<li>ReviaRangedAdvanced</li>
-							</weaponTags>
-							<AmmoUser>
-								<magazineSize>8</magazineSize>
-								<reloadTime>4.8</reloadTime>
-								<ammoSet>AmmoSet_12Gauge</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>Snapshot</aiAimMode>
-								<aimedBurstShotCount>2</aimedBurstShotCount>
-							</FireModes>
-						</li>
-						<!-- ==========  Melee  =========== -->
-						<!-- ==========  Eviscerator  =========== -->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ReviaSerratedDagger"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>1.38</cooldownTime>
-										<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>point</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>11</power>
-										<cooldownTime>1.38</cooldownTime>
-										<chanceFactor>1.165</chanceFactor>
-										<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.6</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>edge</label>
-										<capacities>
-											<li>Gash</li>
-										</capacities>
-										<power>10</power>
-										<cooldownTime>1.3</cooldownTime>
-										<chanceFactor>1.243</chanceFactor>
-										<armorPenetrationBlunt>0.518</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.47</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ReviaSerratedDagger"]/statBases</xpath>
-							<value>
-								<Bulk>1.5</Bulk>
-								<MeleeCounterParryBonus>0.36</MeleeCounterParryBonus>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ReviaSerratedDagger"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.43</MeleeCritChance>
-									<MeleeParryChance>0.14</MeleeParryChance>
-									<MeleeDodgeChance>0.11</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-						<!-- ==========  Crimson Blossom  =========== -->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ReviaBlessedSerratedDagger"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>1.07</cooldownTime>
-										<armorPenetrationBlunt>0.98</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>point</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>10</power>
-										<cooldownTime>1.07</cooldownTime>
-										<chanceFactor>1.165</chanceFactor>
-										<armorPenetrationBlunt>0.98</armorPenetrationBlunt>
-										<armorPenetrationSharp>1.64</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>edge</label>
-										<capacities>
-											<li>Gash</li>
-										</capacities>
-										<power>11</power>
-										<cooldownTime>1.03</cooldownTime>
-										<chanceFactor>1.243</chanceFactor>
-										<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
-										<armorPenetrationSharp>1.14</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ReviaBlessedSerratedDagger"]/statBases</xpath>
-							<value>
-								<Bulk>1.5</Bulk>
-								<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ReviaBlessedSerratedDagger"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.5</MeleeCritChance>
-									<MeleeParryChance>0.19</MeleeParryChance>
-									<MeleeDodgeChance>0.14</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-						<!-- ==========  Scourge  =========== -->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ReviaSerratedSword"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>1.66</cooldownTime>
-										<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>point</label>
-										<capacities>
-											<li>Gash</li>
-										</capacities>
-										<power>27</power>
-										<cooldownTime>1.66</cooldownTime>
-										<chanceFactor>1.062</chanceFactor>
-										<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.84</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>edge</label>
-										<capacities>
-											<li>Gash</li>
-										</capacities>
-										<power>20</power>
-										<cooldownTime>1.7</cooldownTime>
-										<chanceFactor>1.322</chanceFactor>
-										<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.75</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ReviaSerratedSword"]/statBases</xpath>
-							<value>
-								<Bulk>3.5</Bulk>
-								<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ReviaSerratedSword"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.31</MeleeCritChance>
-									<MeleeParryChance>0.4</MeleeParryChance>
-									<MeleeDodgeChance>0.27</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-						<!-- ==========  Red Inquisitor  =========== -->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ReviaBlessedSerratedSword"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>1.38</cooldownTime>
-										<armorPenetrationBlunt>1.08</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>point</label>
-										<capacities>
-											<li>Gash</li>
-										</capacities>
-										<power>20</power>
-										<cooldownTime>1.44</cooldownTime>
-										<chanceFactor>1.062</chanceFactor>
-										<armorPenetrationBlunt>2.168</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.97</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>edge</label>
-										<capacities>
-											<li>Gash</li>
-										</capacities>
-										<power>27</power>
-										<cooldownTime>1.38</cooldownTime>
-										<chanceFactor>1.322</chanceFactor>
-										<armorPenetrationBlunt>1.08</armorPenetrationBlunt>
-										<armorPenetrationSharp>1.2</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ReviaBlessedSerratedSword"]/statBases</xpath>
-							<value>
-								<Bulk>3.5</Bulk>
-								<MeleeCounterParryBonus>0.44</MeleeCounterParryBonus>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ReviaBlessedSerratedSword"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.37</MeleeCritChance>
-									<MeleeParryChance>0.44</MeleeParryChance>
-									<MeleeDodgeChance>0.27</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-						<!-- ==========  Harvester  =========== -->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ReviaSerratedScythe"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>7</power>
-										<cooldownTime>2.46</cooldownTime>
-										<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
-										<chanceFactor>0.15</chanceFactor>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>edge</label>
-										<capacities>
-											<li>Gash</li>
-										</capacities>
-										<power>18</power>
-										<cooldownTime>2.63</cooldownTime>
-										<chanceFactor>1.122</chanceFactor>
-										<armorPenetrationBlunt>5.058</armorPenetrationBlunt>
-										<armorPenetrationSharp>3.38</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ReviaSerratedScythe"]/statBases</xpath>
-							<value>
-								<Bulk>8</Bulk>
-								<MeleeCounterParryBonus>0.69</MeleeCounterParryBonus>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ReviaSerratedScythe"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.1</MeleeCritChance>
-									<MeleeParryChance>0.63</MeleeParryChance>
-									<MeleeDodgeChance>0.67</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-						<!-- ==========  Shatterer  =========== -->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ReviaWarPick"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>7</power>
-										<cooldownTime>2.46</cooldownTime>
-										<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
-										<chanceFactor>0.15</chanceFactor>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Demolish</li>
-										</capacities>
-										<power>22</power>
-										<cooldownTime>2.56</cooldownTime>
-										<chanceFactor>0.3</chanceFactor>
-										<armorPenetrationBlunt>16.76</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>edge</label>
-										<capacities>
-											<li>Gash</li>
-										</capacities>
-										<power>20</power>
-										<cooldownTime>2.83</cooldownTime>
-										<chanceFactor>0.55</chanceFactor>
-										<armorPenetrationBlunt>6</armorPenetrationBlunt>
-										<armorPenetrationSharp>4</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ReviaWarPick"]/statBases</xpath>
-							<value>
-								<Bulk>8</Bulk>
-								<MeleeCounterParryBonus>0.69</MeleeCounterParryBonus>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ReviaWarPick"]/equippedStatOffsets</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeHitChance>-8</MeleeHitChance>
-									<MeleeCritChance>0.1</MeleeCritChance>
-									<MeleeParryChance>0.63</MeleeParryChance>
-									<MeleeDodgeChance>0.67</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-						<!-- ========== Vermillion Tide  =========== -->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ReviaBlessedSerratedScythe"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>7</power>
-										<cooldownTime>1.67</cooldownTime>
-										<armorPenetrationBlunt>3.44</armorPenetrationBlunt>
-										<chanceFactor>0.15</chanceFactor>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>edge</label>
-										<capacities>
-											<li>Gash</li>
-										</capacities>
-										<power>18</power>
-										<cooldownTime>1.87</cooldownTime>
-										<armorPenetrationBlunt>8.47</armorPenetrationBlunt>
-										<armorPenetrationSharp>5.65</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ReviaBlessedSerratedScythe"]/statBases</xpath>
-							<value>
-								<Bulk>8</Bulk>
-								<MeleeCounterParryBonus>0.77</MeleeCounterParryBonus>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ReviaBlessedSerratedScythe"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.1</MeleeCritChance>
-									<MeleeParryChance>0.69</MeleeParryChance>
-									<MeleeDodgeChance>0.73</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-						<!-- ==========  Shredder  =========== -->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ReviaChainSword"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>3</power>
-										<cooldownTime>2.65</cooldownTime>
-										<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>teeth</label>
-										<capacities>
-											<li>Gash</li>
-										</capacities>
-										<power>36</power>
-										<cooldownTime>1.96</cooldownTime>
-										<chanceFactor>1.2</chanceFactor>
-										<armorPenetrationBlunt>6.48</armorPenetrationBlunt>
-										<armorPenetrationSharp>1.44</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ReviaChainSword"]/statBases</xpath>
-							<value>
-								<Bulk>8</Bulk>
-								<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ReviaChainSword"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.08</MeleeCritChance>
-									<MeleeParryChance>0.3</MeleeParryChance>
-									<MeleeDodgeChance>0.4</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git "a/Patches/Revia Race \342\200\224 biotech/ThingDefs_Races/Race_Revia.xml" "b/Patches/Revia Race \342\200\224 biotech/ThingDefs_Races/Race_Revia.xml"
deleted file mode 100644
index f1f835b2b6..0000000000
--- "a/Patches/Revia Race \342\200\224 biotech/ThingDefs_Races/Race_Revia.xml"	
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Revia Race - biotech</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--Not required anymore, cuz not using HAR-->
-						<!--<li Class="PatchOperationConditional">
-				<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ReviaRaceAlien"]/comps</xpath>
-				<nomatch Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ReviaRaceAlien"]</xpath>
-					<value>
-						<comps/>
-					</value>
-				</nomatch>
-				<match Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ReviaRaceAlien"]</xpath>
-					<value>
-					</value>
-				</match>
-			</li>
-			
-			<li Class="PatchOperationAddModExtension">
-				<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ReviaRaceAlien"]</xpath>
-				<value>
-					<li Class="CombatExtended.RacePropertiesExtensionCE">
-						<bodyShape>Humanoid</bodyShape>
-					</li>
-				</value>
-			</li>-->
-
-						<!--      
-			Making them less suppressible the more tails they get (See mod page for what that means, for comparison it takes 100 corpses sacrificed to get to tier 9)
-			Soulreap tier 1 is their base state, weaker than a normal human so not adding any for that. -->
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/HediffDef[defName="ReviaRaceSoulreapTier2"]/stages/li/statOffsets</xpath>
-							<value>
-								<Suppressability>-0.05</Suppressability>
-								<!-- Once they got their first upgrade they become a bit more fearless -->
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/HediffDef[defName="ReviaRaceSoulreapTier3"]/stages/li</xpath>
-							<value>
-								<statOffsets>
-									<Suppressability>-0.1</Suppressability>
-								</statOffsets>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/HediffDef[defName="ReviaRaceSoulreapTier4"]/stages/li/statOffsets</xpath>
-							<value>
-								<Suppressability>-0.20</Suppressability>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/HediffDef[defName="ReviaRaceSoulreapTier5"]/stages/li/statOffsets</xpath>
-							<value>
-								<Suppressability>-0.30</Suppressability>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/HediffDef[defName="ReviaRaceSoulreapTier6"]/stages/li/statOffsets</xpath>
-							<value>
-								<Suppressability>-0.4</Suppressability>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/HediffDef[defName="ReviaRaceSoulreapTier7"]/stages/li/statOffsets</xpath>
-							<value>
-								<Suppressability>-0.5</Suppressability>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/HediffDef[defName="ReviaRaceSoulreapTier8"]/stages/li/statOffsets</xpath>
-							<value>
-								<Suppressability>-0.7</Suppressability>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/HediffDef[defName="ReviaRaceSoulreapTier9"]/stages/li/statOffsets</xpath>
-							<value>
-								<Suppressability>-0.9</Suppressability>
-							</value>
-						</li>
-						<!--Not required anymore, cuz not using HAR-->
-						<!--<li Class="PatchOperationAdd">
-			 <xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ReviaRaceAlien"]/statBases</xpath>
-				  <value>
-					<MeleeCritChance>1.1</MeleeCritChance>
-					<MeleeParryChance>1.15</MeleeParryChance>
-					<Suppressability>1</Suppressability>
-					<SmokeSensitivity>0.85</SmokeSensitivity>
-					<CarryBulk>25</CarryBulk>
-					<CarryWeight>40</CarryWeight>
-				  </value>
-			</li>-->
-
-						<!--Not required anymore, cuz not using HAR-->
-						<!--<li Class="PatchOperationAdd">
-        <xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ReviaRaceAlien"]/alienRace/generalSettings/forcedRaceTraitEntries</xpath>
-        <value>
-          <li>
-            <defName>Bravery</defName>
-            <degree>-1</degree>
-            <chance>0</chance>
-          </li>
-        </value>
-      </li>-->
-
-						<!--Not required anymore, cuz not using HAR-->
-						<!--<li Class="PatchOperationReplace">
-			 <xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ReviaRaceAlien"]/statBases/MeleeDodgeChance</xpath>
-				  <value>
-					<MeleeDodgeChance>1.20</MeleeDodgeChance>
-				  </value>
-			</li>-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="ReviaClaws"]/comps/li/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>claw</label>
-										<capacities>
-											<li>Scratch</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>1.26</cooldownTime>
-										<armorPenetrationBlunt>0.350</armorPenetrationBlunt>
-
-									</li>
-								</tools>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="ReviaTeeth"]/comps/li/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>teeth</label>
-										<capacities>
-											<li>Bite</li>
-										</capacities>
-										<power>7</power>
-										<cooldownTime>1.75</cooldownTime>
-										<armorPenetrationSharp>0.180</armorPenetrationSharp>
-										<armorPenetrationBlunt>0.350</armorPenetrationBlunt>
-
-									</li>
-								</tools>
-							</value>
-						</li>
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Revia Race/PawnKindDefs/ReviaPawnKindDefs.xml b/Patches/Revia Race/PawnKindDefs/ReviaPawnKindDefs.xml
deleted file mode 100644
index 2cd08fedc8..0000000000
--- a/Patches/Revia Race/PawnKindDefs/ReviaPawnKindDefs.xml	
+++ /dev/null
@@ -1,283 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Revia Race</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--Revia Marauder-->
-						<!--Berserker-->
-						<li Class="PatchOperationAddModExtension">
-							<xpath>
-								Defs/PawnKindDef[defName="ReviaRaceBerserker"]
-							</xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<sidearms>
-										<li>
-											<weaponTags>
-												<li>ReviaMeleeAdvanced</li>
-												<li>ReviaMeleeLegendary</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/PawnKindDef[defName="ReviaRaceBerserker"]/apparelTags</xpath>
-							<value>
-								<li>CE_Apparel_TacVest</li>
-								<li>CE_Apparel_Backpack</li>
-								<li>CE_Apparel_TribalBackpack</li>
-							</value>
-						</li>
-						<!--Marauder-->
-						<li Class="PatchOperationAddModExtension">
-							<xpath>
-								Defs/PawnKindDef[defName="ReviaRaceMarauder"]
-							</xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>5</min>
-										<max>10</max>
-									</primaryMagazineCount>
-									<sidearms>
-										<li>
-											<generateChance>0.2</generateChance>
-											<sidearmMoney>
-												<min>40</min>
-												<max>100</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>ReviaMeleeBasic</li>
-												<li>ReviaMeleeIntermediate</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/PawnKindDef[defName="ReviaRaceMarauder"]/apparelTags</xpath>
-							<value>
-								<li>CE_Apparel_TacVest</li>
-								<li>CE_Apparel_Backpack</li>
-								<li>CE_Apparel_TribalBackpack</li>
-							</value>
-						</li>
-						<!--Raider-->
-						<li Class="PatchOperationAddModExtension">
-							<xpath>
-								Defs/PawnKindDef[defName="ReviaRaceRaider"]
-							</xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<sidearms>
-										<li>
-											<generateChance>0.2</generateChance>
-											<sidearmMoney>
-												<min>10</min>
-												<max>20</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_Sidearm_Melee</li>
-												<li>ReviaMeleeBasic</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/PawnKindDef[defName="ReviaRaceRaider"]/apparelTags</xpath>
-							<value>
-								<li>CE_Apparel_TacVest</li>
-								<li>CE_Apparel_Backpack</li>
-								<li>CE_Apparel_TribalBackpack</li>
-							</value>
-						</li>
-						<!--Skullshatterer-->
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/PawnKindDef[defName="ReviaRaceSkullshatterer"]/apparelTags</xpath>
-							<value>
-								<li>CE_Apparel_TacVest</li>
-								<li>CE_Apparel_Backpack</li>
-								<li>CE_Apparel_TribalBackpack</li>
-							</value>
-						</li>
-						<!--Revia Templar-->
-						<!--High Templar-->
-						<li Class="PatchOperationAddModExtension">
-							<xpath>
-								Defs/PawnKindDef[defName="ReviaRaceHighTemplar"]
-							</xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>4</max>
-									</primaryMagazineCount>
-									<sidearms>
-										<li>
-											<magazineCount>
-												<min>1</min>
-												<max>3</max>
-											</magazineCount>
-											<generateChance>0.6</generateChance>
-											<weaponTags>
-												<li>ReviaMeleeLegendary</li>
-												<li>ReviaRangedAdvanced</li>
-												<li>CE_Sidearm</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/PawnKindDef[defName="ReviaRaceHighTemplar"]/apparelRequired</xpath>
-							<value>
-								<li>CE_Apparel_TacVest</li>
-								<li>CE_Apparel_Backpack</li>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/PawnKindDef[defName="ReviaRaceHighTemplar"]/apparelTags</xpath>
-							<value>
-								<li>CE_Apparel_TacVest</li>
-								<li>CE_Apparel_Backpack</li>
-								<li>CE_Apparel_TribalBackpack</li>
-							</value>
-						</li>
-						<!--Initiate-->
-						<li Class="PatchOperationAddModExtension">
-							<xpath>
-								Defs/PawnKindDef[defName="ReviaRaceInitiate"]
-							</xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>4</max>
-									</primaryMagazineCount>
-									<sidearms>
-										<li>
-											<magazineCount>
-												<min>1</min>
-												<max>3</max>
-											</magazineCount>
-											<generateChance>0.5</generateChance>
-											<weaponTags>
-												<li>ReviaRangedAdvanced</li>
-												<li>CE_Sidearm</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/PawnKindDef[defName="ReviaRaceInitiate"]/apparelTags</xpath>
-							<value>
-								<li>CE_Apparel_TacVest</li>
-								<li>CE_Apparel_Backpack</li>
-								<li>CE_Apparel_TribalBackpack</li>
-							</value>
-						</li>
-						<!--Quartermaster-->
-						<li Class="PatchOperationAddModExtension">
-							<xpath>
-								Defs/PawnKindDef[defName="ReviaRaceQuartermaster"]
-							</xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>4</max>
-									</primaryMagazineCount>
-									<sidearms>
-										<li>
-											<magazineCount>
-												<min>1</min>
-												<max>3</max>
-											</magazineCount>
-											<generateChance>0.5</generateChance>
-											<weaponTags>
-												<li>ReviaMeleeAdvanced</li>
-												<li>CE_Sidearm</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/PawnKindDef[defName="ReviaRaceQuartermaster"]/apparelRequired</xpath>
-							<value>
-								<li>CE_Apparel_TacVest</li>
-								<li>CE_Apparel_Backpack</li>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/PawnKindDef[defName="ReviaRaceQuartermaster"]/apparelTags</xpath>
-							<value>
-								<li>CE_Apparel_TacVest</li>
-								<li>CE_Apparel_Backpack</li>
-								<li>CE_Apparel_TribalBackpack</li>
-							</value>
-						</li>
-						<!--Templar-->
-						<li Class="PatchOperationAddModExtension">
-							<xpath>
-								Defs/PawnKindDef[defName="ReviaRaceTemplar"]
-							</xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>4</max>
-									</primaryMagazineCount>
-									<sidearms>
-										<li>
-											<magazineCount>
-												<min>1</min>
-												<max>3</max>
-											</magazineCount>
-											<generateChance>0.5</generateChance>
-											<weaponTags>
-												<li>ReviaMeleeAdvanced</li>
-												<li>ReviaMeleeLegendary</li>
-												<li>CE_Sidearm</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/PawnKindDef[defName="ReviaRaceTemplar"]/apparelRequired</xpath>
-							<value>
-								<li>CE_Apparel_TacVest</li>
-								<li>CE_Apparel_Backpack</li>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/PawnKindDef[defName="ReviaRaceTemplar"]/apparelTags</xpath>
-							<value>
-								<li>CE_Apparel_TacVest</li>
-								<li>CE_Apparel_Backpack</li>
-								<li>CE_Apparel_TribalBackpack</li>
-							</value>
-						</li>
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Revia Race/Scenario/Revia_Scenario.xml b/Patches/Revia Race/Scenario/Revia_Scenario.xml
deleted file mode 100644
index aca3b20239..0000000000
--- a/Patches/Revia Race/Scenario/Revia_Scenario.xml	
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Revia Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ScenarioDef[defName="ReviaExclave"]/scenario/parts/li[thingDef="ReviaThrowingKnife" and @Class="ScenPart_StartingThing_Defined"]</xpath>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ScenarioDef[defName="ReviaExclave"]/scenario/parts</xpath>
-							<value>
-								<li Class="ScenPart_StartingThing_Defined">
-									<def>StartingThing_Defined</def>
-									<thingDef>ReviaThrowingKnife</thingDef>
-									<count>20</count>
-								</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Revia Race/ThingDefs_Bodies/Revia_Bodytype.xml b/Patches/Revia Race/ThingDefs_Bodies/Revia_Bodytype.xml
deleted file mode 100644
index 25d40b684e..0000000000
--- a/Patches/Revia Race/ThingDefs_Bodies/Revia_Bodytype.xml	
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-
-			<!--Patch Revian Bodytype-->
-
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Revia Race</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!-- Changing coverage of the bodyDef (should've done this sooner, but eh) -->
-						<!-- why yes dear explorer of this file, i did just literally copy and paste the ShekBody bodytype patches -->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Ribcage"]/coverage</xpath>
-							<value>
-								<coverage>0.07</coverage>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Pelvis"]/coverage</xpath>
-							<value>
-								<coverage>0.05</coverage>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Stomach"]/coverage</xpath>
-							<value>
-								<coverage>0.05</coverage>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Heart"]/coverage</xpath>
-							<value>
-								<coverage>0.04</coverage>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Lung"]/coverage</xpath>
-							<value>
-								<coverage>0.055</coverage>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Kidney"]/coverage</xpath>
-							<value>
-								<coverage>0.03</coverage>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Liver"]/coverage</xpath>
-							<value>
-								<coverage>0.06</coverage>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Neck"]/coverage</xpath>
-							<value>
-								<coverage>0.055</coverage>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Skull"]/parts/li[def="Brain"]/coverage</xpath>
-							<value>
-								<coverage>0.9</coverage>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Eye"]/coverage</xpath>
-							<value>
-								<coverage>0.05</coverage>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/coverage</xpath>
-							<value>
-								<coverage>0.05</coverage>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/coverage</xpath>
-							<value>
-								<coverage>0.08</coverage>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Shoulder"]/coverage</xpath>
-							<value>
-								<coverage>0.085</coverage>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Clavicle"]/coverage</xpath>
-							<value>
-								<coverage>0.06</coverage>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Humerus"]/coverage</xpath>
-							<value>
-								<coverage>0.15</coverage>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Radius"]/coverage</xpath>
-							<value>
-								<coverage>0.15</coverage>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="ReviaRaceTail"]/coverage</xpath>
-							<value>
-								<coverage>0.05</coverage>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Femur"]/coverage</xpath>
-							<value>
-								<coverage>0.15</coverage>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Tibia"]/coverage</xpath>
-							<value>
-								<coverage>0.15</coverage>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>
-								Defs/BodyDef[defName="ReviaRaceBody"]//*[
-								def="Torso" or
-								def="Neck" or
-								def="Head" or
-								def="Jaw" or
-								def="Ear" or
-								def="Nose" or
-								def="Shoulder" or
-								def="Arm" or
-								def="Hand" or
-								def="Finger" or
-								def="Foot" or
-								def="Toe" or
-								def="Leg"]/groups
-							</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>
-								Defs/BodyDef[defName="ReviaRaceBody"]//*[
-								def="Jaw" or
-								def="Nose" or
-								def="Eye"]/groups
-							</xpath>
-							<value>
-								<li>OutsideSquishy</li>
-							</value>
-						</li>
-
-						<!--Arm Groups-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
-							<value>
-								<li>LeftArm</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
-							<value>
-								<li>RightArm</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
-							<value>
-								<li>LeftShoulder</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="ReviaRaceBody"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
-							<value>
-								<li>RightShoulder</li>
-							</value>
-						</li>
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Revia Race/ThingDefs_Misc/Weapons_Guns.xml b/Patches/Revia Race/ThingDefs_Misc/Weapons_Guns.xml
deleted file mode 100644
index 37bd97bb6f..0000000000
--- a/Patches/Revia Race/ThingDefs_Misc/Weapons_Guns.xml	
+++ /dev/null
@@ -1,695 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Revia Race</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!-- ==========  Ranged  =========== -->
-						<!-- ==========  Throwing knife  =========== -->
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="ReviaThrowingKnife"]/costStuffCount</xpath>
-						</li>
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="ReviaThrowingKnife"]/stuffCategories</xpath>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ReviaThrowingKnifeThrown"]/projectile</xpath>
-							<value>
-								<projectile Class="CombatExtended.ProjectilePropertiesCE">
-									<damageDef>RangedStab</damageDef>
-									<damageAmountBase>14</damageAmountBase>
-									<flyOverhead>false</flyOverhead>
-									<speed>16</speed>
-									<armorPenetrationBlunt>0.12</armorPenetrationBlunt>
-									<armorPenetrationSharp>0.18</armorPenetrationSharp>
-									<preExplosionSpawnChance>0.80</preExplosionSpawnChance>
-									<preExplosionSpawnThingDef>ReviaThrowingKnife</preExplosionSpawnThingDef>
-								</projectile>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ReviaThrowingKnife"]</xpath>
-							<value>
-								<thingClass>CombatExtended.AmmoThing</thingClass>
-								<stackLimit>75</stackLimit>
-								<resourceReadoutPriority>First</resourceReadoutPriority>
-							</value>
-						</li>
-						<li Class="PatchOperationAttributeSet">
-							<xpath>Defs/ThingDef[defName="ReviaThrowingKnife"]</xpath>
-							<attribute>Class</attribute>
-							<value>CombatExtended.AmmoDef</value>
-						</li>
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>ReviaThrowingKnife</defName>
-							<statBases>
-								<SightsEfficiency>1.0</SightsEfficiency>
-								<Bulk>0.35</Bulk>
-								<Mass>0.15</Mass>
-								<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
-							</statBases>
-							<costList>
-								<Steel>10</Steel>
-							</costList>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-								<hasStandardCommand>True</hasStandardCommand>
-								<defaultProjectile>ReviaThrowingKnifeThrown</defaultProjectile>
-								<warmupTime>0.5</warmupTime>
-								<range>16</range>
-								<soundCast>Interact_BeatFire</soundCast>
-								<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-							</Properties>
-							<weaponTags>
-								<li>ReviaRangedBasic</li>
-							</weaponTags>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ReviaThrowingKnife"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>point</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>4</power>
-										<cooldownTime>1.28</cooldownTime>
-										<chanceFactor>1.12</chanceFactor>
-										<armorPenetrationBlunt>0.14</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.15</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>blade</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>6</power>
-										<cooldownTime>1.12</cooldownTime>
-										<chanceFactor>1.88</chanceFactor>
-										<armorPenetrationBlunt>0.12</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.24</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-						<!-- == Recipe == -->
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<RecipeDef ParentName="GrenadeRecipeBase">
-									<defName>MakeReviaThrowingKnife</defName>
-									<label>make throwing knives x10</label>
-									<description>Craft 10 throwing knives.</description>
-									<jobString>Making throwing knives.</jobString>
-									<ingredients>
-										<li>
-											<filter>
-												<thingDefs>
-													<li>Steel</li>
-												</thingDefs>
-											</filter>
-											<count>10</count>
-										</li>
-									</ingredients>
-									<fixedIngredientFilter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</fixedIngredientFilter>
-									<products>
-										<ReviaThrowingKnife>10</ReviaThrowingKnife>
-									</products>
-									<recipeUsers>
-										<li>CraftingSpot</li>
-									</recipeUsers>
-								</RecipeDef>
-							</value>
-						</li>
-						<!-- ==========  Repeating crossbow  =========== -->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ReviaRepeatingCrossbow"]/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>
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>ReviaRepeatingCrossbow</defName>
-							<statBases>
-								<SightsEfficiency>1.0</SightsEfficiency>
-								<Bulk>4.0</Bulk>
-								<Mass>2.55</Mass>
-								<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
-							</statBases>
-							<costList>
-								<Steel>10</Steel>
-							</costList>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>True</hasStandardCommand>
-								<defaultProjectile>Projectile_CrossbowBolt_Steel</defaultProjectile>
-								<warmupTime>1</warmupTime>
-								<range>22</range>
-								<burstShotCount>6</burstShotCount>
-								<soundCast>Bow_Small</soundCast>
-								<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-							</Properties>
-							<weaponTags>
-								<li>ReviaRangedAdvanced</li>
-							</weaponTags>
-							<AmmoUser>
-								<magazineSize>6</magazineSize>
-								<reloadTime>6.6</reloadTime>
-								<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-							</FireModes>
-						</li>
-						<!-- ==========  Shard cannon  =========== -->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ReviaFlechetteCannon"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>7</power>
-										<cooldownTime>1.6</cooldownTime>
-										<armorPenetrationBlunt>0.24</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<capacities>
-											<li>Gash</li>
-										</capacities>
-										<power>12</power>
-										<cooldownTime>1.9</cooldownTime>
-										<armorPenetrationBlunt>0.85</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.74</armorPenetrationSharp>
-									</li>
-								</tools>
-							</value>
-						</li>
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>ReviaFlechetteCannon</defName>
-							<statBases>
-								<SightsEfficiency>1.0</SightsEfficiency>
-								<Bulk>10.0</Bulk>
-								<Mass>8.0</Mass>
-								<ShotSpread>0.18</ShotSpread>
-								<SwayFactor>1.45</SwayFactor>
-								<RangedWeapon_Cooldown>1.15</RangedWeapon_Cooldown>
-							</statBases>
-							<costList>
-								<Steel>10</Steel>
-							</costList>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>True</hasStandardCommand>
-								<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>21</range>
-								<recoilAmount>2.35</recoilAmount>
-								<burstShotCount>3</burstShotCount>
-								<soundCast>Shot_Shotgun</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-							</Properties>
-							<weaponTags>
-								<li>ReviaRangedAdvanced</li>
-							</weaponTags>
-							<AmmoUser>
-								<magazineSize>8</magazineSize>
-								<reloadTime>4.8</reloadTime>
-								<ammoSet>AmmoSet_12Gauge</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>Snapshot</aiAimMode>
-								<aimedBurstShotCount>2</aimedBurstShotCount>
-							</FireModes>
-						</li>
-						<!-- ==========  Melee  =========== -->
-						<!-- ==========  Eviscerator  =========== -->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ReviaSerratedDagger"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>1.38</cooldownTime>
-										<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>point</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>11</power>
-										<cooldownTime>1.38</cooldownTime>
-										<chanceFactor>1.165</chanceFactor>
-										<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.6</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>edge</label>
-										<capacities>
-											<li>Gash</li>
-										</capacities>
-										<power>10</power>
-										<cooldownTime>1.3</cooldownTime>
-										<chanceFactor>1.243</chanceFactor>
-										<armorPenetrationBlunt>0.518</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.47</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ReviaSerratedDagger"]/statBases</xpath>
-							<value>
-								<Bulk>1.5</Bulk>
-								<MeleeCounterParryBonus>0.36</MeleeCounterParryBonus>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ReviaSerratedDagger"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.43</MeleeCritChance>
-									<MeleeParryChance>0.14</MeleeParryChance>
-									<MeleeDodgeChance>0.11</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-						<!-- ==========  Crimson Blossom  =========== -->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ReviaBlessedSerratedDagger"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>1.07</cooldownTime>
-										<armorPenetrationBlunt>0.98</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>point</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>10</power>
-										<cooldownTime>1.07</cooldownTime>
-										<chanceFactor>1.165</chanceFactor>
-										<armorPenetrationBlunt>0.98</armorPenetrationBlunt>
-										<armorPenetrationSharp>1.64</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>edge</label>
-										<capacities>
-											<li>Gash</li>
-										</capacities>
-										<power>11</power>
-										<cooldownTime>1.03</cooldownTime>
-										<chanceFactor>1.243</chanceFactor>
-										<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
-										<armorPenetrationSharp>1.14</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ReviaBlessedSerratedDagger"]/statBases</xpath>
-							<value>
-								<Bulk>1.5</Bulk>
-								<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ReviaBlessedSerratedDagger"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.5</MeleeCritChance>
-									<MeleeParryChance>0.19</MeleeParryChance>
-									<MeleeDodgeChance>0.14</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-						<!-- ==========  Scourge  =========== -->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ReviaSerratedSword"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>1.66</cooldownTime>
-										<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>point</label>
-										<capacities>
-											<li>Gash</li>
-										</capacities>
-										<power>27</power>
-										<cooldownTime>1.66</cooldownTime>
-										<chanceFactor>1.062</chanceFactor>
-										<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.84</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>edge</label>
-										<capacities>
-											<li>Gash</li>
-										</capacities>
-										<power>20</power>
-										<cooldownTime>1.7</cooldownTime>
-										<chanceFactor>1.322</chanceFactor>
-										<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.75</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ReviaSerratedSword"]/statBases</xpath>
-							<value>
-								<Bulk>3.5</Bulk>
-								<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ReviaSerratedSword"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.31</MeleeCritChance>
-									<MeleeParryChance>0.4</MeleeParryChance>
-									<MeleeDodgeChance>0.27</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-						<!-- ==========  Red Inquisitor  =========== -->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ReviaBlessedSerratedSword"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>1.38</cooldownTime>
-										<armorPenetrationBlunt>1.08</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>point</label>
-										<capacities>
-											<li>Gash</li>
-										</capacities>
-										<power>20</power>
-										<cooldownTime>1.44</cooldownTime>
-										<chanceFactor>1.062</chanceFactor>
-										<armorPenetrationBlunt>2.168</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.97</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>edge</label>
-										<capacities>
-											<li>Gash</li>
-										</capacities>
-										<power>27</power>
-										<cooldownTime>1.38</cooldownTime>
-										<chanceFactor>1.322</chanceFactor>
-										<armorPenetrationBlunt>1.08</armorPenetrationBlunt>
-										<armorPenetrationSharp>1.2</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ReviaBlessedSerratedSword"]/statBases</xpath>
-							<value>
-								<Bulk>3.5</Bulk>
-								<MeleeCounterParryBonus>0.44</MeleeCounterParryBonus>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ReviaBlessedSerratedSword"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.37</MeleeCritChance>
-									<MeleeParryChance>0.44</MeleeParryChance>
-									<MeleeDodgeChance>0.27</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-						<!-- ==========  Harvester  =========== -->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ReviaSerratedScythe"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>7</power>
-										<cooldownTime>2.46</cooldownTime>
-										<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
-										<chanceFactor>0.15</chanceFactor>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>edge</label>
-										<capacities>
-											<li>Gash</li>
-										</capacities>
-										<power>18</power>
-										<cooldownTime>2.63</cooldownTime>
-										<chanceFactor>1.122</chanceFactor>
-										<armorPenetrationBlunt>5.058</armorPenetrationBlunt>
-										<armorPenetrationSharp>3.38</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ReviaSerratedScythe"]/statBases</xpath>
-							<value>
-								<Bulk>8</Bulk>
-								<MeleeCounterParryBonus>0.69</MeleeCounterParryBonus>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ReviaSerratedScythe"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.1</MeleeCritChance>
-									<MeleeParryChance>0.63</MeleeParryChance>
-									<MeleeDodgeChance>0.67</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-						<!-- ==========  Shatterer  =========== -->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ReviaWarPick"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>7</power>
-										<cooldownTime>2.46</cooldownTime>
-										<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
-										<chanceFactor>0.15</chanceFactor>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Demolish</li>
-										</capacities>
-										<power>22</power>
-										<cooldownTime>2.56</cooldownTime>
-										<chanceFactor>0.3</chanceFactor>
-										<armorPenetrationBlunt>16.76</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>edge</label>
-										<capacities>
-											<li>Gash</li>
-										</capacities>
-										<power>20</power>
-										<cooldownTime>2.83</cooldownTime>
-										<chanceFactor>0.55</chanceFactor>
-										<armorPenetrationBlunt>6</armorPenetrationBlunt>
-										<armorPenetrationSharp>4</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ReviaWarPick"]/statBases</xpath>
-							<value>
-								<Bulk>8</Bulk>
-								<MeleeCounterParryBonus>0.69</MeleeCounterParryBonus>
-							</value>
-						</li>
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ReviaWarPick"]/equippedStatOffsets</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeHitChance>-8</MeleeHitChance>
-									<MeleeCritChance>0.1</MeleeCritChance>
-									<MeleeParryChance>0.63</MeleeParryChance>
-									<MeleeDodgeChance>0.67</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-						<!-- ========== Vermillion Tide  =========== -->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ReviaBlessedSerratedScythe"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>7</power>
-										<cooldownTime>1.67</cooldownTime>
-										<armorPenetrationBlunt>3.44</armorPenetrationBlunt>
-										<chanceFactor>0.15</chanceFactor>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>edge</label>
-										<capacities>
-											<li>Gash</li>
-										</capacities>
-										<power>18</power>
-										<cooldownTime>1.87</cooldownTime>
-										<armorPenetrationBlunt>8.47</armorPenetrationBlunt>
-										<armorPenetrationSharp>5.65</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ReviaBlessedSerratedScythe"]/statBases</xpath>
-							<value>
-								<Bulk>8</Bulk>
-								<MeleeCounterParryBonus>0.77</MeleeCounterParryBonus>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ReviaBlessedSerratedScythe"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.1</MeleeCritChance>
-									<MeleeParryChance>0.69</MeleeParryChance>
-									<MeleeDodgeChance>0.73</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-						<!-- ==========  Shredder  =========== -->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ReviaChainSword"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>3</power>
-										<cooldownTime>2.65</cooldownTime>
-										<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>teeth</label>
-										<capacities>
-											<li>Gash</li>
-										</capacities>
-										<power>36</power>
-										<cooldownTime>1.96</cooldownTime>
-										<chanceFactor>1.2</chanceFactor>
-										<armorPenetrationBlunt>6.48</armorPenetrationBlunt>
-										<armorPenetrationSharp>1.44</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ReviaChainSword"]/statBases</xpath>
-							<value>
-								<Bulk>8</Bulk>
-								<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ReviaChainSword"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.08</MeleeCritChance>
-									<MeleeParryChance>0.3</MeleeParryChance>
-									<MeleeDodgeChance>0.4</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Revia Race/ThingDefs_Races/Race_Revia.xml b/Patches/Revia Race/ThingDefs_Races/Race_Revia.xml
deleted file mode 100644
index 63f93646eb..0000000000
--- a/Patches/Revia Race/ThingDefs_Races/Race_Revia.xml	
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Revia Race</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ReviaRaceAlien"]/comps</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ReviaRaceAlien"]</xpath>
-								<value>
-									<comps />
-								</value>
-							</nomatch>
-							<match Class="PatchOperationAdd">
-								<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ReviaRaceAlien"]</xpath>
-								<value>
-								</value>
-							</match>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ReviaRaceAlien"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Humanoid</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<!--
-      Juanfrank
-      https://github.com/Juanfrank/Revia4Nalesh-and-someoneinapt/
-      
-			Making them less suppressible the more tails they get (See mod page for what that means, for comparison it takes 100 corpses sacrificed to get to tier 9)
-			Soulreap tier 1 is their base state, weaker than a normal human so not adding any for that. -->
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/HediffDef[defName="ReviaRaceSoulreapTier2"]/stages/li/statOffsets</xpath>
-							<value>
-								<Suppressability>-0.05</Suppressability>
-								<!-- Once they got their first upgrade they become a bit more fearless -->
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/HediffDef[defName="ReviaRaceSoulreapTier3"]/stages/li</xpath>
-							<value>
-								<statOffsets>
-									<Suppressability>-0.1</Suppressability>
-								</statOffsets>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/HediffDef[defName="ReviaRaceSoulreapTier4"]/stages/li/statOffsets</xpath>
-							<value>
-								<Suppressability>-0.20</Suppressability>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/HediffDef[defName="ReviaRaceSoulreapTier5"]/stages/li/statOffsets</xpath>
-							<value>
-								<Suppressability>-0.30</Suppressability>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/HediffDef[defName="ReviaRaceSoulreapTier6"]/stages/li/statOffsets</xpath>
-							<value>
-								<Suppressability>-0.4</Suppressability>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/HediffDef[defName="ReviaRaceSoulreapTier7"]/stages/li/statOffsets</xpath>
-							<value>
-								<Suppressability>-0.5</Suppressability>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/HediffDef[defName="ReviaRaceSoulreapTier8"]/stages/li/statOffsets</xpath>
-							<value>
-								<Suppressability>-0.7</Suppressability>
-							</value>
-						</li>
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/HediffDef[defName="ReviaRaceSoulreapTier9"]/stages/li/statOffsets</xpath>
-							<value>
-								<Suppressability>-0.9</Suppressability>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ReviaRaceAlien"]/statBases</xpath>
-							<value>
-								<MeleeCritChance>1.1</MeleeCritChance>
-								<MeleeParryChance>1.15</MeleeParryChance>
-								<Suppressability>1</Suppressability>
-								<SmokeSensitivity>0.85</SmokeSensitivity>
-								<CarryBulk>25</CarryBulk>
-								<CarryWeight>40</CarryWeight>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ReviaRaceAlien"]/alienRace/generalSettings/forcedRaceTraitEntries</xpath>
-							<value>
-								<li>
-									<defName>Bravery</defName>
-									<degree>-1</degree>
-									<chance>0</chance>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ReviaRaceAlien"]/statBases/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>1.20</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ReviaRaceAlien"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>1.26</cooldownTime>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.350</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>right fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>1.26</cooldownTime>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.350</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>Bite</label>
-										<capacities>
-											<li>Bite</li>
-										</capacities>
-										<power>7</power>
-										<cooldownTime>1.75</cooldownTime>
-										<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-										<armorPenetrationSharp>0.180</armorPenetrationSharp>
-										<armorPenetrationBlunt>0.350</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>3</power>
-										<cooldownTime>4.49</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim Contractors Arsenal/PawnKindDefs/PawnKinds_Contractor.xml b/Patches/Rim Contractors Arsenal/PawnKindDefs/PawnKinds_Contractor.xml
deleted file mode 100644
index 06318b2306..0000000000
--- a/Patches/Rim Contractors Arsenal/PawnKindDefs/PawnKinds_Contractor.xml	
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Contractors Arsenal</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[
-								defName="Contractor_Rifleman" or
-								defName="Contractor_Medic" or
-								defName="Contractor_Marksman" or
-								defName="Contractor_Assault" or
-								defName="Contractor_Gunner" or
-								defName="Contractor_Officer" or
-								defName="Contract_Militia"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>4</min>
-										<max>6</max>
-									</primaryMagazineCount>
-									<sidearms>
-										<li>
-											<generateChance>0.25</generateChance>
-											<sidearmMoney>
-												<min>500</min>
-												<max>800</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>ContractorMisc</li>
-											</weaponTags>
-										</li>
-										<li>
-											<generateChance>0.2</generateChance>
-											<sidearmMoney>
-												<min>10</min>
-												<max>100</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>GrenadeSmoke</li>
-												<li>GrenadeDestructive</li>
-												<li>CE_GrenadeFlashbang</li>
-											</weaponTags>
-											<magazineCount>
-												<min>0</min>
-												<max>1</max>
-											</magazineCount>
-										</li>
-									</sidearms>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[
-								defName="Contractor_Explosives"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>3</min>
-										<max>6</max>
-									</primaryMagazineCount>
-									<forcedSidearm>
-										<sidearmMoney>
-											<min>550</min>
-											<max>1750</max>
-										</sidearmMoney>
-										<weaponTags>
-											<li>ContractorMisc</li>
-										</weaponTags>
-										<magazineCount>
-											<min>2</min>
-											<max>4</max>
-										</magazineCount>
-									</forcedSidearm>
-								</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim Contractors Arsenal/ThingDefs_Misc/ApparelBodyArmour.xml b/Patches/Rim Contractors Arsenal/ThingDefs_Misc/ApparelBodyArmour.xml
deleted file mode 100644
index 4445da74cb..0000000000
--- a/Patches/Rim Contractors Arsenal/ThingDefs_Misc/ApparelBodyArmour.xml	
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Contractors Arsenal</li>
-					<li>Contractors Arsenal (Factionless)</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_ContractorBodyArmor"]/statBases/Mass</xpath>
-							<value>
-								<Mass>50</Mass>
-								<Bulk>100</Bulk>
-								<WornBulk>15</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_ContractorBodyArmor"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>21</ArmorRating_Sharp>
-								<ArmorRating_Electric>0.45</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_ContractorBodyArmor"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>47.25</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Apparel_ContractorBodyArmor"]/equippedStatOffsets</xpath>
-							<value>
-								<ShootingAccuracyPawn>0.10</ShootingAccuracyPawn>
-								<CarryWeight>85</CarryWeight>
-								<CarryBulk>20</CarryBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_ContractorBodyArmor"]/costList/Plasteel</xpath>
-							<value>
-								<Plasteel>200</Plasteel>
-								<DevilstrandCloth>50</DevilstrandCloth>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Apparel_ContractorBodyArmor"]/apparel/bodyPartGroups</xpath>
-							<value>
-								<li>Hands</li>
-								<li>Feet</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim Contractors Arsenal/ThingDefs_Misc/ApparelHeadgear.xml b/Patches/Rim Contractors Arsenal/ThingDefs_Misc/ApparelHeadgear.xml
deleted file mode 100644
index 0cd79c345b..0000000000
--- a/Patches/Rim Contractors Arsenal/ThingDefs_Misc/ApparelHeadgear.xml	
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Contractors Arsenal</li>
-					<li>Contractors Arsenal (Factionless)</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_ContractorArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>19</ArmorRating_Sharp>
-								<Bulk>5</Bulk>
-								<WornBulk>1</WornBulk>
-								<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_ContractorArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>42.75</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="Apparel_ContractorArmorHelmet"]/apparel/immuneToToxGasExposure</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="Apparel_ContractorArmorHelmet"]/apparel</xpath>
-								<value>
-									<immuneToToxGasExposure>true</immuneToToxGasExposure>
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Apparel_ContractorArmorHelmet"]/equippedStatOffsets</xpath>
-							<value>
-								<SmokeSensitivity>-1</SmokeSensitivity>
-								<AimingAccuracy>0.10</AimingAccuracy>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_ContractorArmorHelmet"]/costList/Plasteel</xpath>
-							<value>
-								<Plasteel>70</Plasteel>
-								<DevilstrandCloth>20</DevilstrandCloth>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Apparel_ContractorArmorHelmet"]/apparel/layers</xpath>
-							<value>
-								<li>OnHead</li>
-								<li>StrappedHead</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim Contractors Arsenal/ThingDefs_Misc/MeleeContractors.xml b/Patches/Rim Contractors Arsenal/ThingDefs_Misc/MeleeContractors.xml
deleted file mode 100644
index bc0477851c..0000000000
--- a/Patches/Rim Contractors Arsenal/ThingDefs_Misc/MeleeContractors.xml	
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Contractors Arsenal</li>
-					<li>Contractors Arsenal (Factionless)</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Melee_ContractorsCombatKnife"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>1.26</cooldownTime>
-										<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>blade</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>10</power>
-										<cooldownTime>1.18</cooldownTime>
-										<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
-										<armorPenetrationSharp>7.32</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>point</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>11</power>
-										<cooldownTime>1.26</cooldownTime>
-										<chanceFactor>1.33</chanceFactor>
-										<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-										<armorPenetrationSharp>7.42</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Melee_ContractorsCombatKnife"]/statBases</xpath>
-							<value>
-								<Bulk>1</Bulk>
-								<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Melee_ContractorsCombatKnife"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.5</MeleeCritChance>
-									<MeleeParryChance>0.15</MeleeParryChance>
-									<MeleeDodgeChance>0.05</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim Contractors Arsenal/ThingDefs_Misc/RangedContractors.xml b/Patches/Rim Contractors Arsenal/ThingDefs_Misc/RangedContractors.xml
deleted file mode 100644
index c8bb777cd3..0000000000
--- a/Patches/Rim Contractors Arsenal/ThingDefs_Misc/RangedContractors.xml	
+++ /dev/null
@@ -1,841 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Contractors Arsenal</li>
-					<li>Contractors Arsenal (Factionless)</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="Gun_LNF35L" or
-								defName="Gun_B3500A" or
-								defName="Gun_M34A" or
-								defName="Gun_M168B" or
-								defName="Gun_M340V" or
-								defName="Gun_MS700G" or
-								defName="Gun_SLZ556S" or
-								defName="Gun_SCR" or
-								defName="Gun_AUGS" or
-								defName="Gun_HKCAS42A" or
-								defName="Gun_FAL450A" or
-								defName="Gun_M870C" or
-								defName="Gun_ML237S"
-								]/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>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Gun_AT45A"]/tools</xpath>
-							<value>
-								<tools>
-									<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>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="Gun_L45E" or
-								defName="Gun_RHSC120P"
-								]/tools </xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>grip</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>1.54</cooldownTime>
-										<chanceFactor>1.5</chanceFactor>
-										<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>muzzle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>1.54</cooldownTime>
-										<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<!--LNF35L - SCAR L, 6x24mm-->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Gun_LNF35L</defName>
-							<statBases>
-								<Bulk>6.35</Bulk>
-								<Mass>3.29</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.40</SightsEfficiency>
-								<SwayFactor>1.23</SwayFactor>
-								<ShotSpread>0.1</ShotSpread>
-								<WorkToMake>51500</WorkToMake>
-							</statBases>
-							<costList>
-								<Chemfuel>10</Chemfuel>
-								<Steel>40</Steel>
-								<Plasteel>25</Plasteel>
-								<ComponentIndustrial>10</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<recoilAmount>1.44</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
-								<warmupTime>1.25</warmupTime>
-								<range>55</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-								<soundCast>Shot_LightRifleContractors</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>30</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!--B3500 - Mossberg 500, Charge 12 Gauge-->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Gun_B3500A</defName>
-							<statBases>
-								<Bulk>9.00</Bulk>
-								<Mass>3.00</Mass>
-								<RangedWeapon_Cooldown>1.00</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.10</SightsEfficiency>
-								<SwayFactor>1.20</SwayFactor>
-								<ShotSpread>0.14</ShotSpread>
-								<WorkToMake>30500</WorkToMake>
-							</statBases>
-							<costList>
-								<Chemfuel>10</Chemfuel>
-								<Steel>45</Steel>
-								<Plasteel>25</Plasteel>
-								<ComponentIndustrial>6</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_12GaugeCharged</defaultProjectile>
-								<warmupTime>0.5</warmupTime>
-								<range>29</range>
-								<soundCast>Shot_ShotgunPumpContractors</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>8</magazineSize>
-								<reloadOneAtATime>true</reloadOneAtATime>
-								<reloadTime>0.85</reloadTime>
-								<ammoSet>AmmoSet_12GaugeCharged</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiAimMode>Snapshot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!--L45E - M45, 6x18mm-->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Gun_L45E</defName>
-							<statBases>
-								<Bulk>2.10</Bulk>
-								<Mass>1.11</Mass>
-								<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-								<SightsEfficiency>0.7</SightsEfficiency>
-								<SwayFactor>1.07</SwayFactor>
-								<ShotSpread>0.17</ShotSpread>
-								<WorkToMake>16000</WorkToMake>
-							</statBases>
-							<costList>
-								<Chemfuel>5</Chemfuel>
-								<Steel>20</Steel>
-								<Plasteel>20</Plasteel>
-								<ComponentIndustrial>7</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>16</range>
-								<soundCast>Shot_PistolContractors</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>7</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiAimMode>Snapshot</aiAimMode>
-							</FireModes>
-							<weaponTags>
-								<li>CE_OneHandedWeapon</li>
-							</weaponTags>
-						</li>
-
-						<!--M34 A - M24, 8x35mm-->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Gun_M34A</defName>
-							<statBases>
-								<Bulk>11.92</Bulk>
-								<Mass>7.30</Mass>
-								<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
-								<SightsEfficiency>2.72</SightsEfficiency>
-								<SwayFactor>1.35</SwayFactor>
-								<ShotSpread>0.05</ShotSpread>
-								<WorkToMake>48500</WorkToMake>
-							</statBases>
-							<costList>
-								<Chemfuel>15</Chemfuel>
-								<Steel>65</Steel>
-								<Plasteel>30</Plasteel>
-								<ComponentIndustrial>9</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
-								<warmupTime>1.9</warmupTime>
-								<range>75</range>
-								<soundCast>Shot_SniperBoltContractors</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>5</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!--M168B - M14 EBR, 8x35mm-->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Gun_M168B</defName>
-							<statBases>
-								<Bulk>8.89</Bulk>
-								<Mass>5.1</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.56</SightsEfficiency>
-								<SwayFactor>1.42</SwayFactor>
-								<ShotSpread>0.08</ShotSpread>
-								<WorkToMake>51500</WorkToMake>
-							</statBases>
-							<costList>
-								<Chemfuel>15</Chemfuel>
-								<Steel>50</Steel>
-								<Plasteel>30</Plasteel>
-								<ComponentIndustrial>10</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<recoilAmount>1.41</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
-								<warmupTime>1.3</warmupTime>
-								<range>65</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-								<soundCast>Shot_HeavyRifleContractors</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>10</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>20</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!--M340V - M240, 8x35mm-->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Gun_M340V</defName>
-							<statBases>
-								<Bulk>13.60</Bulk>
-								<Mass>12.50</Mass>
-								<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.20</SightsEfficiency>
-								<SwayFactor>1.77</SwayFactor>
-								<ShotSpread>0.04</ShotSpread>
-								<WorkToMake>57000</WorkToMake>
-							</statBases>
-							<costList>
-								<Chemfuel>20</Chemfuel>
-								<Steel>85</Steel>
-								<Plasteel>40</Plasteel>
-								<ComponentIndustrial>10</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<recoilAmount>0.85</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
-								<warmupTime>1.3875</warmupTime>
-								<range>55</range>
-								<burstShotCount>10</burstShotCount>
-								<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-								<soundCast>Shot_GPMGContractors</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>11</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>200</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>5</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>SuppressFire</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!--MS700G - MP7, 6x18mm-->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Gun_MS700G</defName>
-							<statBases>
-								<Bulk>4.15</Bulk>
-								<Mass>1.90</Mass>
-								<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.0</SightsEfficiency>
-								<SwayFactor>0.83</SwayFactor>
-								<ShotSpread>0.15</ShotSpread>
-								<WorkToMake>46000</WorkToMake>
-							</statBases>
-							<costList>
-								<Chemfuel>5</Chemfuel>
-								<Steel>30</Steel>
-								<Plasteel>20</Plasteel>
-								<ComponentIndustrial>9</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<recoilAmount>1.89</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>31</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-								<soundCast>Shot_SMGContractors</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>7</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>30</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>Snapshot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!--RHSC120P, 8x35mm-->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Gun_RHSC120P</defName>
-							<statBases>
-								<Bulk>3.57</Bulk>
-								<Mass>2.20</Mass>
-								<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-								<SightsEfficiency>0.7</SightsEfficiency>
-								<SwayFactor>0.58</SwayFactor>
-								<ShotSpread>0.15</ShotSpread>
-								<WorkToMake>14000</WorkToMake>
-							</statBases>
-							<costList>
-								<Chemfuel>5</Chemfuel>
-								<Steel>30</Steel>
-								<Plasteel>20</Plasteel>
-								<ComponentIndustrial>6</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>20</range>
-								<soundCast>Shot_PistolContractors</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>11</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>5</magazineSize>
-								<reloadTime>3.5</reloadTime>
-								<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiAimMode>Snapshot</aiAimMode>
-							</FireModes>
-							<weaponTags>
-								<li>CE_OneHandedWeapon</li>
-							</weaponTags>
-						</li>
-
-						<!--SLZ556 - Steyr 556, 6x24mm-->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Gun_SLZ556S</defName>
-							<statBases>
-								<Bulk>8.60</Bulk>
-								<Mass>3.70</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.10</SightsEfficiency>
-								<SwayFactor>1.35</SwayFactor>
-								<ShotSpread>0.09</ShotSpread>
-								<WorkToMake>51000</WorkToMake>
-							</statBases>
-							<costList>
-								<Chemfuel>10</Chemfuel>
-								<Steel>45</Steel>
-								<Plasteel>25</Plasteel>
-								<ComponentIndustrial>10</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<recoilAmount>1.36</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
-								<warmupTime>1</warmupTime>
-								<range>55</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-								<soundCast>Shot_LightRifleContractors</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>30</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!--AUGS - Steyr AUG, 6x24mm-->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Gun_AUGS</defName>
-							<statBases>
-								<Bulk>7.90</Bulk>
-								<Mass>3.60</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.10</SightsEfficiency>
-								<SwayFactor>1.15</SwayFactor>
-								<ShotSpread>0.07</ShotSpread>
-								<WorkToMake>60000</WorkToMake>
-							</statBases>
-							<costList>
-								<Chemfuel>10</Chemfuel>
-								<Steel>45</Steel>
-								<Plasteel>25</Plasteel>
-								<ComponentIndustrial>11</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<recoilAmount>1.43</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
-								<warmupTime>1</warmupTime>
-								<range>55</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-								<soundCast>Shot_LightRifleContractors</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>30</magazineSize>
-								<reloadTime>4.5</reloadTime>
-								<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!--Divider - FN FAL, 8x35mm-->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Gun_FAL450A</defName>
-							<statBases>
-								<Bulk>11.90</Bulk>
-								<Mass>4.75</Mass>
-								<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.56</SightsEfficiency>
-								<SwayFactor>1.12</SwayFactor>
-								<ShotSpread>0.06</ShotSpread>
-								<WorkToMake>53000</WorkToMake>
-							</statBases>
-							<costList>
-								<Chemfuel>15</Chemfuel>
-								<Steel>55</Steel>
-								<Plasteel>30</Plasteel>
-								<ComponentIndustrial>10</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<recoilAmount>1.43</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
-								<warmupTime>1.5</warmupTime>
-								<range>62</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-								<soundCast>Shot_HeavyRifleContractors</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>30</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!--ML2375 Devastator, 12x64mech-->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Gun_ML237S</defName>
-							<statBases>
-								<Bulk>12</Bulk>
-								<Mass>13.50</Mass>
-								<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-								<SightsEfficiency>3.51</SightsEfficiency>
-								<SwayFactor>2.36</SwayFactor>
-								<ShotSpread>0.06</ShotSpread>
-								<WorkToMake>59000</WorkToMake>
-							</statBases>
-							<costList>
-								<Chemfuel>20</Chemfuel>
-								<Steel>80</Steel>
-								<Plasteel>40</Plasteel>
-								<ComponentIndustrial>11</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_12x72mmCharged</defaultProjectile>
-								<warmupTime>3.2</warmupTime>
-								<range>86</range>
-								<soundCast>Shot_HeavySniperContractors</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>12</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>5</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_12x72mmCharged</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!--Phoenix - Charge 12 Gauge-->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Gun_HKCAS42A</defName>
-							<statBases>
-								<Bulk>7.62</Bulk>
-								<Mass>3.70</Mass>
-								<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.10</SightsEfficiency>
-								<SwayFactor>1.13</SwayFactor>
-								<ShotSpread>0.08</ShotSpread>
-								<WorkToMake>48000</WorkToMake>
-							</statBases>
-							<costList>
-								<Chemfuel>10</Chemfuel>
-								<Steel>45</Steel>
-								<Plasteel>25</Plasteel>
-								<ComponentIndustrial>10</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<recoilAmount>2.88</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_12GaugeCharged</defaultProjectile>
-								<warmupTime>0.5</warmupTime>
-								<range>25</range>
-								<burstShotCount>3</burstShotCount>
-								<ticksBetweenBurstShots>13</ticksBetweenBurstShots>
-								<soundCast>Shot_ShotgunContractors</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>11</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>10</magazineSize>
-								<reloadTime>4.5</reloadTime>
-								<ammoSet>AmmoSet_12GaugeCharged</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>2</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>Snapshot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!--SCR Survival Rifle-->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Gun_SCR</defName>
-							<statBases>
-								<Bulk>11.55</Bulk>
-								<Mass>7.26</Mass>
-								<RangedWeapon_Cooldown>1.16</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.10</SightsEfficiency>
-								<SwayFactor>1.88</SwayFactor>
-								<ShotSpread>0.04</ShotSpread>
-								<WorkToMake>51500</WorkToMake>
-							</statBases>
-							<costList>
-								<Chemfuel>15</Chemfuel>
-								<Steel>65</Steel>
-								<Plasteel>30</Plasteel>
-								<ComponentIndustrial>6</ComponentIndustrial>
-								<ComponentSpacer>1</ComponentSpacer>
-							</costList>
-							<Properties>
-								<recoilAmount>1.43</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
-								<warmupTime>1.5</warmupTime>
-								<range>55</range>
-								<burstShotCount>3</burstShotCount>
-								<ticksBetweenBurstShots>21</ticksBetweenBurstShots>
-								<soundCast>Shot_HeavyRifleContractors</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<FireModes>
-								<aimedBurstShotCount>2</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!--M870C , Fuel Cell-->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Gun_M870C</defName>
-							<statBases>
-								<Bulk>3.50</Bulk>
-								<Mass>1.50</Mass>
-								<RangedWeapon_Cooldown>0.69</RangedWeapon_Cooldown>
-								<SightsEfficiency>1</SightsEfficiency>
-								<SwayFactor>0.65</SwayFactor>
-								<ShotSpread>0.18</ShotSpread>
-								<WorkToMake>33500</WorkToMake>
-							</statBases>
-							<costList>
-								<Chemfuel>5</Chemfuel>
-								<Steel>25</Steel>
-								<Plasteel>20</Plasteel>
-								<ComponentIndustrial>7</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_30x64mmFuel_Incendiary</defaultProjectile>
-								<warmupTime>1</warmupTime>
-								<range>25</range>
-								<soundCast>Shot_GrenadeLauncherContractors</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>11</muzzleFlashScale>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>1</magazineSize>
-								<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
-								<reloadTime>1.6</reloadTime>
-								<ammoSet>AmmoSet_30x64mmFuel</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiAimMode>Snapshot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<!--AT 45A Disintergrator-->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Gun_AT45A</defName>
-							<statBases>
-								<Bulk>14.50</Bulk>
-								<Mass>13.45</Mass>
-								<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.10</SightsEfficiency>
-								<SwayFactor>1.69</SwayFactor>
-								<ShotSpread>0.05</ShotSpread>
-								<WorkToMake>43500</WorkToMake>
-							</statBases>
-							<costList>
-								<Steel>55</Steel>
-								<Plasteel>30</Plasteel>
-								<ComponentIndustrial>8</ComponentIndustrial>
-								<FSX>2</FSX>
-								<Chemfuel>5</Chemfuel>
-							</costList>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_ContractorATRocket</defaultProjectile>
-								<warmupTime>1.8</warmupTime>
-								<range>40</range>
-								<burstShotCount>1</burstShotCount>
-								<soundCast>Shot_RPGContractors</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<onlyManualCast>true</onlyManualCast>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<muzzleFlashScale>14</muzzleFlashScale>
-							</Properties>
-							<FireModes>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Bullet_ContractorATRocket"]/thingClass</xpath>
-							<value>
-								<thingClass>CombatExtended.BulletCE</thingClass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Bullet_ContractorATRocket"]/projectile</xpath>
-							<value>
-								<projectile Class="CombatExtended.ProjectilePropertiesCE">
-									<damageDef>Bullet</damageDef>
-									<damageAmountBase>350</damageAmountBase>
-									<armorPenetrationSharp>600</armorPenetrationSharp>
-									<armorPenetrationBlunt>50</armorPenetrationBlunt>
-									<speed>77</speed>
-								</projectile>
-							</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="Bullet_ContractorATRocket"]/comps</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="Bullet_ContractorATRocket"]</xpath>
-								<value>
-									<comps />
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="Bullet_ContractorATRocket"]/comps</xpath>
-							<value>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>160</damageAmountBase>
-									<explosiveDamageType>EMP</explosiveDamageType>
-									<explosiveRadius>2.5</explosiveRadius>
-								</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim Flood/CE_FloodForms.xml b/Patches/Rim Flood/CE_FloodForms.xml
deleted file mode 100644
index 6bba553b5e..0000000000
--- a/Patches/Rim Flood/CE_FloodForms.xml	
+++ /dev/null
@@ -1,393 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim Flood</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="BaseFlood"]/statBases</xpath>
-					<value>
-						<SmokeSensitivity>0.05</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="BaseFlood"]/statBases</xpath>
-					<value>
-						<PainShockThreshold>0.99</PainShockThreshold>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="InfestForm" or defName="Combatform" or defName="FloodCarrier" or defName="Tankform"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Houndform" or defName="Pureform"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Stalkerform"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Houndform"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>6.2</MoveSpeed>
-						<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						<MeleeCritChance>0.17</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Combatform"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4.0</MoveSpeed>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.37</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FloodCarrier"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>2</MoveSpeed>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.31</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tankform"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>3.0</MoveSpeed>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.7</MeleeCritChance>
-						<MeleeParryChance>0.4</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Combatform"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Combatform"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Houndform"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Houndform"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tankform"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>20</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tankform"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>7</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="InfestForm"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Pureform"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.47</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Stalkerform"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.33</MeleeDodgeChance>
-						<MeleeCritChance>0.24</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="InfestForm"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>FloodMouth</label>
-								<capacities>
-									<li>FloodBite</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Combatform"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>18</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Houndform"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>7</armorPenetrationSharp>
-								<armorPenetrationBlunt>14</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tankform"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<armorPenetrationBlunt>36</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>2.8</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>65</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FloodCarrier"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.75</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>16</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>9</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Pureform"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>FloodMouth</label>
-								<capacities>
-									<li>FloodBite</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationSharp>22</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Stalkerform"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>FloodMouth</label>
-								<capacities>
-									<li>FloodBite</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim Flood/CE_Flood_Bodies.xml b/Patches/Rim Flood/CE_Flood_Bodies.xml
deleted file mode 100644
index 27f40bf44d..0000000000
--- a/Patches/Rim Flood/CE_Flood_Bodies.xml	
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim Flood</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Sentinel -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Sentinel"]//*[
-						def="Sentinelbody"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Sentinel"]//*[
-						def="Sentinelbody" or
-						def="ForerunnerHead"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- Flood -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Flood"]//*[
-						def="FloodBody" or
-						def="Nose"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Flood"]//*[
-						def="FloodBody" or
-						def="FloodHead" or
-						def="Nose" or
-						def="FloodMouth"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Flood"]//*[
-						def="Nose" or
-						def="FloodMouth"]/groups
-					</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim Flood/CE_Flood_Bodyparts.xml b/Patches/Rim Flood/CE_Flood_Bodyparts.xml
deleted file mode 100644
index d94c772295..0000000000
--- a/Patches/Rim Flood/CE_Flood_Bodyparts.xml	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim Flood</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyPartDef[defName="FloodBody"]/hitPoints</xpath>
-					<value>
-						<hitPoints>40</hitPoints>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim Flood/CE_Forerunnermetal.xml b/Patches/Rim Flood/CE_Forerunnermetal.xml
deleted file mode 100644
index 5e83b7aae5..0000000000
--- a/Patches/Rim Flood/CE_Forerunnermetal.xml	
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim Flood</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Forerunner -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Forerunner_Metal"]/statBases</xpath>
-					<value>
-						<Bulk>0.025</Bulk>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Forerunner_Metal"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>0.9</Mass>
-						<MeleePenetrationFactor>2.25</MeleePenetrationFactor>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Forerunner_Metal"]/statBases/SharpDamageMultiplier</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Forerunner_Metal"]/statBases/BluntDamageMultiplier</xpath>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Forerunner_Metal"]/stuffProps/categories</xpath>
-					<value>
-						<li>Metallic_Weapon</li>
-						<li>Steeled</li>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Forerunner_Metal"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>2.4</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Forerunner_Metal"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>3.6</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Forerunner_Metal"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.15</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim Flood/CE_Forerunners.xml b/Patches/Rim Flood/CE_Forerunners.xml
deleted file mode 100644
index 3a55a8ca66..0000000000
--- a/Patches/Rim Flood/CE_Forerunners.xml	
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim Flood</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="BaseForerunner"]/statBases</xpath>
-					<value>
-						<SmokeSensitivity>0</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="BaseForerunner"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>1</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Sentinel" or defName="SentinelMajor" or defName="Forerunnerspawn" or defName="Constructor"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Sentinel"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Sentinel"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SentinelMajor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SentinelMajor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Forerunnerspawn"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4.5</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Forerunnerspawn"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>3</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Constructor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Constructor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Sentinel" or defName="SentinelMajor" or defName="Forerunnerspawn" or defName="Constructor"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>0.37</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Sentinel" or defName="SentinelMajor" or defName="Forerunnerspawn" or defName="Constructor"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Sentinel blast</label>
-								<capacities>
-									<li>Sentinelblast</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>ForerunnerHeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim Flood/Flood_Turrets.xml b/Patches/Rim Flood/Flood_Turrets.xml
deleted file mode 100644
index 6be9a858a5..0000000000
--- a/Patches/Rim Flood/Flood_Turrets.xml	
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim Flood</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingDef ParentName="Base6x24mmChargedBullet">
-							<defName>FloodSpitfire_CE</defName>
-							<label>flood spore</label>
-							<thingClass>CombatExtended.BulletCE</thingClass>
-							<graphicData>
-								<texPath>Pawn/Flood/Body/spore_fire</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<flyOverhead>false</flyOverhead>
-								<speed>40</speed>
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>15</damageAmountBase>
-								<armorPenetrationSharp>7</armorPenetrationSharp>
-								<armorPenetrationBlunt>16</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base6x24mmChargedBullet">
-							<defName>FloodRangedfire_CE</defName>
-							<label>flood spore</label>
-							<thingClass>CombatExtended.BulletCE</thingClass>
-							<graphicData>
-								<texPath>Pawn/Flood/Body/spore_fire</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<flyOverhead>false</flyOverhead>
-								<speed>50</speed>
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>11</damageAmountBase>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-				<!-- Replace vanilla thingClass -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Rangedform" or defName = "Flood_Spitter"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<!-- Make turrets taller -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Rangedform" or defName = "Flood_Spitter"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Rangedform" or defName = "Flood_Spitter"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.25</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "Rangedform" or defName = "Flood_Spitter"]/statBases/ShootingAccuracyTurret </xpath>
-					<value>
-						<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Rangedform" or defName = "Flood_Spitter" ]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>1.25</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<!-- Make the Turret usable -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Spitterbulb</defName>
-					<statBases>
-						<Mass>10.00</Mass>
-						<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>1.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.37</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>FloodSpitfire_CE</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>44</range>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<burstShotCount>2</burstShotCount>
-						<minRange>1.5</minRange>
-						<soundCast>BulletImpact_Flesh</soundCast>
-						<muzzleFlashScale>0</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Rangedtop</defName>
-					<statBases>
-						<Mass>10.00</Mass>
-						<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>1.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.27</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>FloodRangedfire_CE</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>50</range>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<burstShotCount>6</burstShotCount>
-						<minRange>1.5</minRange>
-						<soundCast>BulletImpact_Flesh</soundCast>
-						<muzzleFlashScale>0</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>6</aimedBurstShotCount>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim Flood/Melee_Flood_CE.xml b/Patches/Rim Flood/Melee_Flood_CE.xml
deleted file mode 100644
index 118673fcdc..0000000000
--- a/Patches/Rim Flood/Melee_Flood_CE.xml	
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim Flood</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- TENTACLES -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_flood"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.55</cooldownTime>
-								<armorPenetrationBlunt>17</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.55</cooldownTime>
-								<armorPenetrationBlunt>34</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_flood"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<MeleeCounterParryBonus>0.25</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_flood"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.5</MeleeCritChance>
-							<MeleeParryChance>0.3</MeleeParryChance>
-							<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim Flood/Pawnkind_Ammo_CE.xml b/Patches/Rim Flood/Pawnkind_Ammo_CE.xml
deleted file mode 100644
index 650023d313..0000000000
--- a/Patches/Rim Flood/Pawnkind_Ammo_CE.xml	
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim Flood</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Flood Combat-->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="CombatformG"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>1</min>
-								<max>2</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim Flood/Sentinal_Laser_CE.xml b/Patches/Rim Flood/Sentinal_Laser_CE.xml
deleted file mode 100644
index 33032e1002..0000000000
--- a/Patches/Rim Flood/Sentinal_Laser_CE.xml	
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim Flood</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Tools ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Sentinelbeam" or
-						defName="SentinelMajorbeam"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletRed">
-							<defName>Bullet_Laser_Sentinel</defName>
-							<label>laser beam</label>
-							<textures>
-								<li>Pawn/Forerunner/Sentinel_laser</li>
-							</textures>
-							<seam>0</seam>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>CE_Laser</damageDef>
-								<damageAmountBase>15</damageAmountBase>
-								<armorPenetrationSharp>15.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletBlue">
-							<defName>Bullet_Laser_SentinelChungus</defName>
-							<label>laser beam</label>
-							<textures>
-								<li>Pawn/Forerunner/Major_laser</li>
-							</textures>
-							<seam>0</seam>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>CE_Laser</damageDef>
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- Patch Sentinal Laser -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Sentinelbeam</defName>
-					<statBases>
-						<Mass>10.00</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>1.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.37</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Laser_Sentinel</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>40</range>
-						<burstShotCount>1</burstShotCount>
-						<minRange>1.5</minRange>
-						<soundCast>Shot_Sentinelbeam</soundCast>
-						<muzzleFlashScale>3</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>SentinelMajorbeam</defName>
-					<statBases>
-						<Mass>10.00</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>1.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.27</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Laser_SentinelChungus</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>50</range>
-						<burstShotCount>1</burstShotCount>
-						<minRange>1.5</minRange>
-						<soundCast>Shot_SentinelMajor</soundCast>
-						<muzzleFlashScale>3</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim Gnoblins/Gnoblins_Drugs.xml b/Patches/Rim Gnoblins/Gnoblins_Drugs.xml
deleted file mode 100644
index 6d08f01a31..0000000000
--- a/Patches/Rim Gnoblins/Gnoblins_Drugs.xml	
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Gnoblins</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Patch statOffsets ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ShardHigh"]/stages/li/statOffsets</xpath>
-					<value>
-						<Suppressability>-0.5</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="DregHigh"]/stages/li</xpath>
-					<value>
-						<statFactors>
-							<Suppressability>0.75</Suppressability>
-						</statFactors>
-					</value>
-				</li>
-
-				<!-- ========== Patch item bulk ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ShardMethamphetamine"]/statBases</xpath>
-					<value>
-						<Bulk>0.05</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DregMethamphetamine"]/statBases</xpath>
-					<value>
-						<Bulk>0.05</Bulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim Gnoblins/Gnoblins_Grenade.xml b/Patches/Rim Gnoblins/Gnoblins_Grenade.xml
deleted file mode 100644
index 9e2c289b3a..0000000000
--- a/Patches/Rim Gnoblins/Gnoblins_Grenade.xml	
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Gnoblins</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Kill recipe maker ========== -->
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="RGWeapon_Toxpot"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>BaseWeapon</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RGWeapon_Toxpot"]/recipeMaker</xpath>
-				</li>
-
-				<!-- ========== Melee tools ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RGWeapon_Toxpot"]</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Body</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.75</cooldownTime>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Projectile -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RGProj_ToxPot"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RGProj_ToxPot"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>1.9</explosionRadius>
-							<damageDef>ToxGas</damageDef>
-							<explosionDelay>100</explosionDelay>
-							<postExplosionGasType>ToxGas</postExplosionGasType>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							<speed>12</speed>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
-						</projectile>
-					</value>
-				</li>
-
-				<!-- Grenade -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RGWeapon_Toxpot"]/costList</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RGWeapon_Toxpot"]/graphicData/texPath</xpath>
-					<value>
-						<texPath>Items/Weapons/Toxpots/Toxpot_Flying</texPath>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RGWeapon_Toxpot"]</xpath>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<stackLimit>50</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="RGWeapon_Toxpot"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RGWeapon_Toxpot</defName>
-					<statBases>
-						<Mass>0.7</Mass>
-						<Bulk>1.05</Bulk>
-						<MarketValue>7.05</MarketValue>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<label>throw grenade</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<range>10</range>
-						<minRange>1.9</minRange>
-						<warmupTime>0.8</warmupTime>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<soundCast>ThrowMolotovCocktail</soundCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<defaultProjectile>RGProj_ToxPot</defaultProjectile>
-						<onlyManualCast>true</onlyManualCast>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-						<ai_AvoidFriendlyFireRadius>2</ai_AvoidFriendlyFireRadius>
-					</Properties>
-					<weaponTags>
-						<li>CE_AI_Grenade</li>
-						<li>CE_AI_AOE</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>MakeToxPot</defName>
-							<label>make toxic grenade x10</label>
-							<description>Craft 10 toxic grenade.</description>
-							<jobString>Making toxic grenade.</jobString>
-							<researchPrerequisite>RG_ShardDistilleryAndWeaponry</researchPrerequisite>
-							<workAmount>4400</workAmount>
-							<recipeUsers>
-								<li>ElectricSmithy</li>
-								<li>FueledSmithy</li>
-								<li>CraftingSpot</li>
-							</recipeUsers>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>DregMethamphetamine</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>DregMethamphetamine</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<RGWeapon_Toxpot>10</RGWeapon_Toxpot>
-							</products>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim Gnoblins/Gnoblins_Melee.xml b/Patches/Rim Gnoblins/Gnoblins_Melee.xml
deleted file mode 100644
index d2a9f1fb13..0000000000
--- a/Patches/Rim Gnoblins/Gnoblins_Melee.xml	
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Gnoblins</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Patch stats -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RG_MeleeWeapon_ToxSpear"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.35</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.78</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>ScratchToxic</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.19</cooldownTime>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.25</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RG_MeleeWeapon_ToxSpear"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RG_MeleeWeapon_ToxSpear"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.17</MeleeCritChance>
-							<MeleeParryChance>1.45</MeleeParryChance>
-							<MeleeDodgeChance>0.9</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim Gnoblins/Gnoblins_Pawnkind.xml b/Patches/Rim Gnoblins/Gnoblins_Pawnkind.xml
deleted file mode 100644
index 13102a85b8..0000000000
--- a/Patches/Rim Gnoblins/Gnoblins_Pawnkind.xml	
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Gnoblins</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Give ammo to crosbowman-->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Gnoblin_Scout"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>20</min>
-								<max>30</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>50</min>
-									<max>100</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>NeolithicMeleeBasic</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Gnoblin_Ranger"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>20</min>
-								<max>30</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>100</min>
-									<max>200</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>NeolithicMeleeBasic</li>
-									<li>MedievalMeleeDecent</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Gnoblin_Lobber"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>12</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>100</min>
-									<max>200</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>NeolithicMeleeBasic</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Gnoblin_HeavyRanger"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>30</min>
-								<max>40</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>150</min>
-									<max>300</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>MedievalMeleeDecent</li>
-									<li>MedievalMeleeAdvanced</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[
-						defName="Gnoblin_Scout" or
-						defName="Gnoblin_Ranger" or
-						defname="Gnoblin_Lobber" or
-						defName="Gnoblin_HeavyRanger"]/apparelRequired</xpath>
-					<value>
-						<li>CE_Apparel_TribalBackpack</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[defName="Gnoblin_Scout" or defName="Gnoblin_Ranger" or defName="Gnoblin_HeavyRanger"]/weaponTags</xpath>
-					<value>
-						<li>CE_Bow</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim Gnoblins/Gnoblins_Scenario.xml b/Patches/Rim Gnoblins/Gnoblins_Scenario.xml
deleted file mode 100644
index 2ec8d322f9..0000000000
--- a/Patches/Rim Gnoblins/Gnoblins_Scenario.xml	
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Gnoblins</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="LostGnoblins"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_Arrow_Stone</thingDef>
-							<count>100</count>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="LostGnoblins"]/scenario/parts/li[@Class="ScenPart_StartingThing_Defined" and (thingDef="RGWeapon_Toxpot")]</xpath>
-					<value>
-						<count>10</count>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim of Madness - Bones/ThingDefs_Items/Patch_Items_Apparel_BoneMasks.xml b/Patches/Rim of Madness - Bones/ThingDefs_Items/Patch_Items_Apparel_BoneMasks.xml
deleted file mode 100644
index 48947cfda3..0000000000
--- a/Patches/Rim of Madness - Bones/ThingDefs_Items/Patch_Items_Apparel_BoneMasks.xml	
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim of Madness - Bones</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======== ROMB_Apparel_SkullMask ======== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ROMB_Apparel_SkullMask"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>0.5</WornBulk>
-						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ROMB_Apparel_SkullMask"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ROMB_Apparel_SkullMask"]/apparel/layers</xpath>
-					<value>
-						<layers>
-							<li>OnHead</li>
-						</layers>
-					</value>
-				</li>
-
-				<!-- ======== Sihv_Apparel_BoneArmor ======== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Sihv_Apparel_BoneArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>2.5</WornBulk>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Sihv_Apparel_BoneArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.2</ArmorRating_Blunt>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim of Madness - Bones/ThingDefs_Items/Patch_Items_Resources_Bones.xml b/Patches/Rim of Madness - Bones/ThingDefs_Items/Patch_Items_Resources_Bones.xml
deleted file mode 100644
index 1add28a74d..0000000000
--- a/Patches/Rim of Madness - Bones/ThingDefs_Items/Patch_Items_Resources_Bones.xml	
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim of Madness - Bones</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======== BoneItem ======== -->
-				<!-- ==== As material ==== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BoneItem"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>0.6</MeleePenetrationFactor>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BoneItem"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.25</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BoneItem"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<!-- ==== As a weapon ==== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BoneItem"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.99</cooldownTime>
-								<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ======== BonePlastic ======== -->
-				<!-- ==== As material ==== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BonePlastic"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.5</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim of Madness - Vampires/Patch_ROMV_Animals.xml b/Patches/Rim of Madness - Vampires/Patch_ROMV_Animals.xml
deleted file mode 100644
index 78fcbb5ade..0000000000
--- a/Patches/Rim of Madness - Vampires/Patch_ROMV_Animals.xml	
+++ /dev/null
@@ -1,356 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim of Madness - Vampires</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ROMV_BatRace"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ROMV_BatRace"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.0</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="ROMV_BatRace"]/verbs</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ROMV_BatRace"]</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.88</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.28</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>3.00</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ROMV_BatSpectralRace"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ROMV_BatSpectralRace"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.2</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ROMV_BatSpectralRace"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.67</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.67</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>fangs</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>0.88</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>3.00</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="ROMV_ThingBaseWolf"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="ROMV_ThingBaseWolf"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.21</MeleeDodgeChance>
-						<MeleeCritChance>0.20</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="ROMV_ThingBaseWolf"]/verbs</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="ROMV_ThingBaseWolf"]</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.19</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>12.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>18.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.19</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>12.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>18.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.46</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<chanceFactor>2</chanceFactor>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>3.2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.225</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="ROMV_ThingBaseMonstrosity"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="ROMV_ThingBaseMonstrosity"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.06</MeleeDodgeChance>
-						<MeleeCritChance>0.41</MeleeCritChance>
-						<MeleeParryChance>0.48</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="ROMV_ThingBaseMonstrosity"]/tools</xpath>
-					<value>
-						<tools>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>Monstrous Arm</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>17.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>33.5</armorPenetrationBlunt>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>Monstrous Arm</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>17.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>33.5</armorPenetrationBlunt>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>Monstrous Teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>Head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-							</li>
-
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="ROMV_ThingBaseAbyssalArm"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Plane</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="ROMV_ThingBaseAbyssalArm"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.06</MeleeDodgeChance>
-						<MeleeCritChance>0.41</MeleeCritChance>
-						<MeleeParryChance>0.48</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="ROMV_ThingBaseAbyssalArm"]/tools</xpath>
-					<value>
-						<tools>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>Tentacle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>36</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</li>
-
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim of Madness - Vampires/Patch_ROMV_Human.xml b/Patches/Rim of Madness - Vampires/Patch_ROMV_Human.xml
deleted file mode 100644
index 7f39769886..0000000000
--- a/Patches/Rim of Madness - Vampires/Patch_ROMV_Human.xml	
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim of Madness - Vampires</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ROMV_Fangs"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fangs</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ROMV_FeralClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>feral claw</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
-								<armorPenetrationSharp>12.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>18.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="ROMV_ThingBaseAbyssalArm"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tentacle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="ROMV_ThingBaseBloodMist"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>viscera</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-								<armorPenetrationBlunt>0</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="ROMV_ThingBaseMist"]/verbs</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="ROMV_ThingBaseMist"]</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>viscera</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-								<armorPenetrationBlunt>0</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ROM_Generations_Caine" or defName="ROM_Generations_TheThree"]/stages/li</xpath>
-					<value>
-						<statOffsets>
-							<Suppressability>-10</Suppressability>
-							<NightVisionEfficiency>5</NightVisionEfficiency>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ROM_Generations_Antediluvian" or defName="ROM_Generations_Methuselah" or defName="ROM_Generations_Elder"]/stages/li</xpath>
-					<value>
-						<statOffsets>
-							<Suppressability>-2</Suppressability>
-							<NightVisionEfficiency>2</NightVisionEfficiency>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ROM_Generations_Ancillae"]/stages/li</xpath>
-					<value>
-						<statOffsets>
-							<Suppressability>-1</Suppressability>
-							<NightVisionEfficiency>1</NightVisionEfficiency>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ROM_Generations_Neonate"]/stages/li</xpath>
-					<value>
-						<statOffsets>
-							<Suppressability>-0.8</Suppressability>
-							<NightVisionEfficiency>1</NightVisionEfficiency>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ROM_Generations_Thinblood"]/stages/li</xpath>
-					<value>
-						<statOffsets>
-							<Suppressability>-0.5</Suppressability>
-							<NightVisionEfficiency>0.6</NightVisionEfficiency>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ROM_GhoulHediff"]/stages/li[1]</xpath>
-					<value>
-						<statOffsets>
-							<Suppressability>-0.2</Suppressability>
-							<NightVisionEfficiency>0.15</NightVisionEfficiency>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ROM_GhoulHediff"]/stages/li[2]</xpath>
-					<value>
-						<statOffsets>
-							<Suppressability>-0.4</Suppressability>
-							<NightVisionEfficiency>0.3</NightVisionEfficiency>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ROM_GhoulHediff"]/stages/li[3]</xpath>
-					<value>
-						<statOffsets>
-							<Suppressability>-0.6</Suppressability>
-							<NightVisionEfficiency>0.5</NightVisionEfficiency>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="ROM_GhoulHediff"]/stages/li[4]</xpath>
-					<value>
-						<statOffsets>
-							<Suppressability>-0.8</Suppressability>
-							<NightVisionEfficiency>0.6</NightVisionEfficiency>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="ROMV_ScenStrangeCargo"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_303British_FMJ</thingDef>
-							<count>100</count>
-						</li>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_44Magnum_FMJ</thingDef>
-							<count>60</count>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim of Madness - Werewolves/Patch_ROM_Werewolves.xml b/Patches/Rim of Madness - Werewolves/Patch_ROM_Werewolves.xml
deleted file mode 100644
index d0e84f7ab0..0000000000
--- a/Patches/Rim of Madness - Werewolves/Patch_ROM_Werewolves.xml	
+++ /dev/null
@@ -1,260 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim of Madness - Werewolves (Continued)</li>
-			<li>Rim of Madness - Werewolves</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Glabro -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ROM_GlabroClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<armorPenetrationBlunt>36</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ROM_GlabroJaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2.1</cooldownTime>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>18</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Crinos -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ROM_CrinosClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>50</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>60</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ROM_CrinosJaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>2.1</cooldownTime>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>48</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Hispo -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ROM_HispoClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<armorPenetrationBlunt>36</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ROM_HispoJaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>2.4</cooldownTime>
-								<armorPenetrationSharp>5</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Lupus -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ROM_LupusClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>2.2</cooldownTime>
-								<armorPenetrationSharp>5</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ROM_LupusJaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>2.4</cooldownTime>
-								<armorPenetrationSharp>5</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Metis -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ROM_MetisClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>1.65</cooldownTime>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<armorPenetrationBlunt>36</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ROM_MetisJaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<armorPenetrationBlunt>24</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[
-						defName="ROM_GlabroHediff" or
-						defName="ROM_CrinosHediff" or
-						defName="ROM_HispoHediff" or
-						defName="ROM_LupusHediff" or
-						defName="ROM_MetisHediff"
-						]/stages/li/statOffsets </xpath>
-					<value>
-						<Suppressability>-0.9</Suppressability>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Asari and Reapers/Ammo_Projectile_Asari.xml b/Patches/Rim-Effect Asari and Reapers/Ammo_Projectile_Asari.xml
deleted file mode 100644
index fd9fe55b73..0000000000
--- a/Patches/Rim-Effect Asari and Reapers/Ammo_Projectile_Asari.xml	
+++ /dev/null
@@ -1,699 +0,0 @@
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Asari and Reapers</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<DamageDef ParentName="Bullet">
-							<defName>Micromunition</defName>
-							<label>Micromunition</label>
-							<minDamageToFragment>6</minDamageToFragment>
-							<buildingDamageFactor>0.2</buildingDamageFactor>
-							<plantDamageFactor>0.2</plantDamageFactor>
-						</DamageDef>
-
-						<DamageDef ParentName="Bullet">
-							<defName>MicromunitionD</defName>
-							<label>Micromunition</label>
-							<minDamageToFragment>4</minDamageToFragment>
-							<buildingDamageFactor>0.2</buildingDamageFactor>
-							<plantDamageFactor>0.2</plantDamageFactor>
-						</DamageDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_AAR</defName>
-							<label>Thermal Clip</label>
-							<ammoTypes>
-								<Ammo_ME>Bullet_AAR</Ammo_ME>
-								<Ammo_ME_AP>Bullet_AAR_AP</Ammo_ME_AP>
-								<Ammo_ME_Cryo>Bullet_AAR_Cryo</Ammo_ME_Cryo>
-								<Ammo_ME_HE>Bullet_AAR_HE</Ammo_ME_HE>
-								<Ammo_ME_FI>Bullet_AAR_FI</Ammo_ME_FI>
-								<Ammo_ME_Ion>Bullet_AAR_Ion</Ammo_ME_Ion>
-								<Ammo_ME_Toxic>Bullet_AAR_Toxic</Ammo_ME_Toxic>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_ASR</defName>
-							<label>Thermal Clip</label>
-							<ammoTypes>
-								<Ammo_ME>Bullet_ASR</Ammo_ME>
-								<Ammo_ME_AP>Bullet_ASR_AP</Ammo_ME_AP>
-								<Ammo_ME_Cryo>Bullet_ASR_Cryo</Ammo_ME_Cryo>
-								<Ammo_ME_HE>Bullet_ASR_HE</Ammo_ME_HE>
-								<Ammo_ME_FI>Bullet_ASR_FI</Ammo_ME_FI>
-								<Ammo_ME_Ion>Bullet_ASR_Ion</Ammo_ME_Ion>
-								<Ammo_ME_Toxic>Bullet_ASR_Toxic</Ammo_ME_Toxic>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Disciple</defName>
-							<label>Thermal Clip</label>
-							<ammoTypes>
-								<Ammo_ME>Bullet_Disciple</Ammo_ME>
-								<Ammo_ME_AP>Bullet_Disciple_AP</Ammo_ME_AP>
-								<Ammo_ME_Cryo>Bullet_Disciple_Cryo</Ammo_ME_Cryo>
-								<Ammo_ME_HE>Bullet_Disciple_HE</Ammo_ME_HE>
-								<Ammo_ME_FI>Bullet_Disciple_FI</Ammo_ME_FI>
-								<Ammo_ME_Ion>Bullet_Disciple_Ion</Ammo_ME_Ion>
-								<Ammo_ME_Toxic>Bullet_Disciple_Toxic</Ammo_ME_Toxic>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Acolyte</defName>
-							<label>Thermal Clip</label>
-							<ammoTypes>
-								<Ammo_ME>Bullet_Acolyte</Ammo_ME>
-								<Ammo_ME_AP>Bullet_Acolyte_AP</Ammo_ME_AP>
-								<Ammo_ME_Cryo>Bullet_Acolyte_Cryo</Ammo_ME_Cryo>
-								<Ammo_ME_HE>Bullet_Acolyte_HE</Ammo_ME_HE>
-								<Ammo_ME_FI>Bullet_Acolyte_FI</Ammo_ME_FI>
-								<Ammo_ME_Ion>Bullet_Acolyte_Ion</Ammo_ME_Ion>
-								<Ammo_ME_Toxic>Bullet_Acolyte_Toxic</Ammo_ME_Toxic>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ================== Projectiles ================== -->
-						<!-- ================== AAR ================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="BaseAARBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectiles/Shot_BioticSharp_Large</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>400</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseAARBullet">
-							<defName>Bullet_AAR</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>13</damageAmountBase>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<armorPenetrationBlunt>46</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Stun</def>
-										<amount>8</amount>
-										<chance>0.05</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseAARBullet">
-							<defName>Bullet_AAR_AP</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>9</damageAmountBase>
-								<armorPenetrationSharp>36</armorPenetrationSharp>
-								<armorPenetrationBlunt>46</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Stun</def>
-										<amount>8</amount>
-										<chance>0.04</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseAARBullet">
-							<defName>Bullet_AAR_HE</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>13</damageAmountBase>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<armorPenetrationBlunt>46</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>6</amount>
-									</li>
-									<li>
-										<def>Stun</def>
-										<amount>8</amount>
-										<chance>0.05</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseAARBullet">
-							<defName>Bullet_AAR_Cryo</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<armorPenetrationBlunt>46</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Cryo</def>
-										<amount>3</amount>
-									</li>
-									<li>
-										<def>Stun</def>
-										<amount>8</amount>
-										<chance>0.05</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseAARBullet">
-							<defName>Bullet_AAR_Toxic</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<armorPenetrationBlunt>46</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Toxin</def>
-										<amount>3</amount>
-									</li>
-									<li>
-										<def>Stun</def>
-										<amount>8</amount>
-										<chance>0.05</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseAARBullet">
-							<defName>Bullet_AAR_Ion</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>9</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>5</amount>
-									</li>
-									<li>
-										<def>Stun</def>
-										<amount>8</amount>
-										<chance>0.04</chance>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<armorPenetrationBlunt>46</armorPenetrationBlunt>
-								<empShieldBreakChance>0.225</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseAARBullet">
-							<defName>Bullet_AAR_FI</defName>
-							<label>accelerated incendiary shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationSharp>17</armorPenetrationSharp>
-								<armorPenetrationBlunt>59</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_SickBurn</def>
-										<amount>2</amount>
-									</li>
-									<li>
-										<def>Flame</def>
-										<amount>1</amount>
-										<chance>0.2</chance>
-									</li>
-									<li>
-										<def>Stun</def>
-										<amount>8</amount>
-										<chance>0.03</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== Acolyte ================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="BaseAcolyteBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
-							<label>warp bomb</label>
-							<graphicData>
-								<texPath>Things/Projectiles/Shot_BioticBlunt_Small</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>1.1</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Blunt</damageDef>
-								<speed>50</speed>
-							</projectile>
-						</ThingDef>
-
-						<!-- DO NOT REMOVE THE SHARP PENETRATION -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseAcolyteBullet">
-							<defName>Bullet_Acolyte</defName>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>15</damageAmountBase>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-								<armorPenetrationBlunt>50</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Stun</def>
-										<amount>8</amount>
-										<chance>0.3</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>90</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>0.9</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseAcolyteBullet">
-							<defName>Bullet_Acolyte_AP</defName>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>9</damageAmountBase>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<armorPenetrationBlunt>100</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Stun</def>
-										<amount>8</amount>
-										<chance>0.3</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>90</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>0.9</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseAcolyteBullet">
-							<defName>Bullet_Acolyte_Cryo</defName>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<armorPenetrationBlunt>50</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Stun</def>
-										<amount>8</amount>
-										<chance>0.3</chance>
-									</li>
-									<li>
-										<def>ME_Cryo</def>
-										<amount>3</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseAcolyteBullet">
-							<defName>Bullet_Acolyte_Toxic</defName>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>28</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Stun</def>
-										<amount>8</amount>
-										<chance>0.3</chance>
-									</li>
-									<li>
-										<def>ME_Toxin</def>
-										<amount>3</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseAcolyteBullet">
-							<defName>Bullet_Acolyte_HE</defName>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>13</damageAmountBase>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>28</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Stun</def>
-										<amount>8</amount>
-										<chance>0.3</chance>
-									</li>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>6</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseAcolyteBullet">
-							<defName>Bullet_Acolyte_FI</defName>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>13</damageAmountBase>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>28</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_SickBurn</def>
-										<amount>3</amount>
-									</li>
-									<li>
-										<def>Flame</def>
-										<amount>1</amount>
-										<chance>0.275</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseAcolyteBullet">
-							<defName>Bullet_Acolyte_Ion</defName>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>8</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>5</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<armorPenetrationBlunt>23</armorPenetrationBlunt>
-								<empShieldBreakChance>0.25</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== ASR ================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="BaseASRBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
-							<label>accelerated shot</label>
-							<graphicData>
-								<texPath>Things/Projectiles/Shot_BioticBlunt_Large</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>1.0</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>500</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseASRBullet">
-							<defName>Bullet_ASR</defName>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>29</damageAmountBase>
-								<armorPenetrationSharp>24</armorPenetrationSharp>
-								<armorPenetrationBlunt>96</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseASRBullet">
-							<defName>Bullet_ASR_AP</defName>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>19</damageAmountBase>
-								<armorPenetrationSharp>48</armorPenetrationSharp>
-								<armorPenetrationBlunt>96</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseASRBullet">
-							<defName>Bullet_ASR_Cryo</defName>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>27</damageAmountBase>
-								<armorPenetrationSharp>24</armorPenetrationSharp>
-								<armorPenetrationBlunt>96</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Cryo</def>
-										<amount>7</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseASRBullet">
-							<defName>Bullet_ASR_HE</defName>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>29</damageAmountBase>
-								<armorPenetrationSharp>24</armorPenetrationSharp>
-								<armorPenetrationBlunt>96</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>14</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseASRBullet">
-							<defName>Bullet_ASR_Toxic</defName>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>27</damageAmountBase>
-								<armorPenetrationSharp>24</armorPenetrationSharp>
-								<armorPenetrationBlunt>96</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Toxin</def>
-										<amount>7</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseASRBullet">
-							<defName>Bullet_ASR_FI</defName>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>29</damageAmountBase>
-								<armorPenetrationSharp>24</armorPenetrationSharp>
-								<armorPenetrationBlunt>96</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_SickBurn</def>
-										<amount>6</amount>
-									</li>
-									<li>
-										<def>Flame</def>
-										<amount>1</amount>
-										<chance>0.55</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseASRBullet">
-							<defName>Bullet_ASR_Ion</defName>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>19</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>10</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>27</armorPenetrationSharp>
-								<armorPenetrationBlunt>96</armorPenetrationBlunt>
-								<empShieldBreakChance>0.6</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== Disciple ================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="BaseDiscipleBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
-							<label>accelerated blast</label>
-							<graphicData>
-								<texPath>Things/Projectiles/Shot_BioticBlunt_Small</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>0.6</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>MicromunitionD</damageDef>
-								<speed>200</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseDiscipleBullet">
-							<defName>Bullet_Disciple</defName>
-							<graphicData>
-								<texPath>Things/Projectiles/Shot_BioticBlunt_Small</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>0.6</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>8</damageAmountBase>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>21</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Stun</def>
-										<amount>5</amount>
-										<chance>0.045</chance>
-									</li>
-								</secondaryDamage>
-								<pelletCount>9</pelletCount>
-								<spreadMult>9.2</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseDiscipleBullet">
-							<defName>Bullet_Disciple_AP</defName>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>6</damageAmountBase>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<armorPenetrationBlunt>21</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Stun</def>
-										<amount>5</amount>
-										<chance>0.045</chance>
-									</li>
-								</secondaryDamage>
-								<pelletCount>9</pelletCount>
-								<spreadMult>9.2</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseDiscipleBullet">
-							<defName>Bullet_Disciple_HE</defName>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>8</damageAmountBase>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>21</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>4</amount>
-									</li>
-									<li>
-										<def>Stun</def>
-										<amount>5</amount>
-										<chance>0.045</chance>
-									</li>
-								</secondaryDamage>
-								<pelletCount>9</pelletCount>
-								<spreadMult>9.2</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseDiscipleBullet">
-							<defName>Bullet_Disciple_Cryo</defName>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>7</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>ME_Cryo</def>
-										<amount>3</amount>
-									</li>
-									<li>
-										<def>Stun</def>
-										<amount>5</amount>
-										<chance>0.045</chance>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>21</armorPenetrationBlunt>
-								<pelletCount>9</pelletCount>
-								<spreadMult>9.2</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseDiscipleBullet">
-							<defName>Bullet_Disciple_Toxic</defName>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>7</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>ME_Toxin</def>
-										<amount>3</amount>
-									</li>
-									<li>
-										<def>Stun</def>
-										<amount>5</amount>
-										<chance>0.045</chance>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>21</armorPenetrationBlunt>
-								<pelletCount>9</pelletCount>
-								<spreadMult>9.2</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseDiscipleBullet">
-							<defName>Bullet_Disciple_FI</defName>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>8</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>ME_SickBurn</def>
-										<amount>1</amount>
-									</li>
-									<li>
-										<def>Flame</def>
-										<amount>1</amount>
-										<chance>0.065</chance>
-									</li>
-									<li>
-										<def>Stun</def>
-										<amount>5</amount>
-										<chance>0.045</chance>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>21</armorPenetrationBlunt>
-								<pelletCount>8</pelletCount>
-								<spreadMult>9.2</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseDiscipleBullet">
-							<defName>Bullet_Disciple_Ion</defName>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>5</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>3</amount>
-									</li>
-									<li>
-										<def>Stun</def>
-										<amount>5</amount>
-										<chance>0.045</chance>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>21</armorPenetrationBlunt>
-								<pelletCount>8</pelletCount>
-								<spreadMult>9.2</spreadMult>
-								<empShieldBreakChance>0.075</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Asari and Reapers/Ammo_Projectile_Reapers.xml b/Patches/Rim-Effect Asari and Reapers/Ammo_Projectile_Reapers.xml
deleted file mode 100644
index d059b42897..0000000000
--- a/Patches/Rim-Effect Asari and Reapers/Ammo_Projectile_Reapers.xml	
+++ /dev/null
@@ -1,488 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Asari and Reapers</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ==================== Ammo Type ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_Reapers</defName>
-							<label>Reaper powercell</label>
-							<description>Mysterious reaper tech, might be of some value to collectors and researchers.</description>
-							<statBases>
-								<Mass>0.01</Mass>
-								<Bulk>0.01</Bulk>
-								<MarketValue>0.1</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade_Sellable</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoME</li>
-							</thingCategories>
-							<graphicData>
-								<texPath>ThirdParty/MassEffect/Heatsink</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>ME_FMJ</ammoClass>
-							<generateAllowChance>0.1</generateAllowChance>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_Reapers_AP</defName>
-							<label>Reaper powercell AP</label>
-							<description>Mysterious reaper tech, might be of some value to collectors and researchers.</description>
-							<statBases>
-								<Mass>0.015</Mass>
-								<Bulk>0.012</Bulk>
-								<MarketValue>0.14</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade_Sellable</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoME</li>
-							</thingCategories>
-							<graphicData>
-								<texPath>ThirdParty/MassEffect/ME_AP</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>ME_AP</ammoClass>
-							<generateAllowChance>0.06</generateAllowChance>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_Reapers_HE</defName>
-							<label>Reaper powercell HE</label>
-							<description>Mysterious reaper tech, might be of some value to collectors and researchers.</description>
-							<statBases>
-								<Mass>0.01</Mass>
-								<Bulk>0.01</Bulk>
-								<MarketValue>0.2</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade_Sellable</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoME</li>
-							</thingCategories>
-							<graphicData>
-								<texPath>ThirdParty/MassEffect/ME_HE</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>ME_HE</ammoClass>
-							<generateAllowChance>0.03</generateAllowChance>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_Reapers_FI</defName>
-							<label>Reaper powercell FI</label>
-							<description>Mysterious reaper tech, might be of some value to collectors and researchers.</description>
-							<statBases>
-								<Mass>0.01</Mass>
-								<Bulk>0.01</Bulk>
-								<MarketValue>0.2</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade_Sellable</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoME</li>
-							</thingCategories>
-							<graphicData>
-								<texPath>ThirdParty/MassEffect/ME_FI</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>ME_FI</ammoClass>
-							<generateAllowChance>0.03</generateAllowChance>
-						</ThingDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Goliath</defName>
-							<label>Reaper tech</label>
-							<ammoTypes>
-								<Ammo_Reapers>Bullet_Goliath</Ammo_Reapers>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Cannibal</defName>
-							<label>Reaper tech</label>
-							<ammoTypes>
-								<Ammo_Reapers>Bullet_Cannibal_Basic</Ammo_Reapers>
-								<Ammo_Reapers_AP>Bullet_Cannibal_AP</Ammo_Reapers_AP>
-								<Ammo_Reapers_HE>Bullet_Cannibal_HE</Ammo_Reapers_HE>
-								<Ammo_Reapers_FI>Bullet_Cannibal_FI</Ammo_Reapers_FI>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Marauder</defName>
-							<label>Reaper tech</label>
-							<ammoTypes>
-								<Ammo_Reapers>Bullet_Marauder</Ammo_Reapers>
-								<Ammo_Reapers_AP>Bullet_Marauder_AP</Ammo_Reapers_AP>
-								<Ammo_Reapers_HE>Bullet_Marauder_HE</Ammo_Reapers_HE>
-								<Ammo_Reapers_FI>Bullet_Marauder_FI</Ammo_Reapers_FI>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Ravager</defName>
-							<label>Reaper tech</label>
-							<ammoTypes>
-								<Ammo_Reapers>Bullet_Ravager</Ammo_Reapers>
-								<Ammo_Reapers_HE>Bullet_Ravager_HE</Ammo_Reapers_HE>
-								<Ammo_Reapers_FI>Bullet_Ravager_FI</Ammo_Reapers_FI>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Collossus</defName>
-							<label>Reaper tech</label>
-							<ammoTypes>
-								<Ammo_Reapers>Bullet_Collosus</Ammo_Reapers>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<!-- ================== Goliath ================== -->
-
-						<ThingDef ParentName="Base12x64mmChargedBullet">
-							<defName>Bullet_Goliath</defName>
-							<label>goliath cannon shot</label>
-							<graphicData>
-								<texPath>Things/Projectiles/Shot_GoliathCannon</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-						</ThingDef>
-
-						<!-- ================== Cannibal ================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="BaseCannibalBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
-							<label>cannibal shot</label>
-							<graphicData>
-								<texPath>Things/Projectiles/Shot_CannibalCaster</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>300</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseCannibalBullet">
-							<defName>Bullet_Cannibal_Basic</defName>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationSharp>16</armorPenetrationSharp>
-								<armorPenetrationBlunt>56</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseCannibalBullet">
-							<defName>Bullet_Cannibal_AP</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>13</damageAmountBase>
-								<armorPenetrationSharp>32</armorPenetrationSharp>
-								<armorPenetrationBlunt>56</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseCannibalBullet">
-							<defName>Bullet_Cannibal_HE</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationSharp>16</armorPenetrationSharp>
-								<armorPenetrationBlunt>56</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>10</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseAARBullet">
-							<defName>Bullet_Cannibal_FI</defName>
-							<label>accelerated incendiary shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>19</damageAmountBase>
-								<armorPenetrationSharp>16</armorPenetrationSharp>
-								<armorPenetrationBlunt>56</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_SickBurn</def>
-										<amount>4</amount>
-									</li>
-									<li>
-										<def>Flame</def>
-										<amount>1</amount>
-										<chance>0.2</chance>
-									</li>
-									<li>
-										<def>Stun</def>
-										<amount>8</amount>
-										<chance>0.03</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== Marauder ================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="BaseMarauderBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
-							<label>maruader shot</label>
-							<graphicData>
-								<texPath>Things/Projectiles/Shot_MarauderRifle</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>1.0</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>400</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseMarauderBullet">
-							<defName>Bullet_Marauder</defName>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>16</damageAmountBase>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<armorPenetrationBlunt>44</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseMarauderBullet">
-							<defName>Bullet_Marauder_AP</defName>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>11</damageAmountBase>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<armorPenetrationBlunt>44</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseMarauderBullet">
-							<defName>Bullet_Marauder_HE</defName>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>16</damageAmountBase>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<armorPenetrationBlunt>44</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>8</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseMarauderBullet">
-							<defName>Bullet_Marauder_FI</defName>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>15</damageAmountBase>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<armorPenetrationBlunt>44</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_SickBurn</def>
-										<amount>4</amount>
-									</li>
-									<li>
-										<def>Flame</def>
-										<amount>1</amount>
-										<chance>0.15</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== Ravager ================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="BaseRavagerBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
-							<label>ravager cannon shot</label>
-							<graphicData>
-								<texPath>Things/Projectiles/Shot_RavagerCannon</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-								<drawSize>2</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>160</speed>
-								<suppressionFactor>3.0</suppressionFactor>
-								<dangerFactor>2.0</dangerFactor>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseRavagerBullet">
-							<defName>Bullet_Ravager</defName>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>50</damageAmountBase>
-								<armorPenetrationSharp>100</armorPenetrationSharp>
-								<armorPenetrationBlunt>700</armorPenetrationBlunt>
-								<pelletCount>2</pelletCount>
-								<spreadMult>2</spreadMult>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>32</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>0.9</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_ME>5</Fragment_ME>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<!-- DO NOT REMOVE THE SHARP PENETRATION -->
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseRavagerBullet">
-							<defName>Bullet_Ravager_HE</defName>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>1.5</explosionRadius>
-								<damageDef>Bomb</damageDef>
-								<armorPenetrationSharp>200</armorPenetrationSharp>
-								<damageAmountBase>90</damageAmountBase>
-								<armorPenetrationBlunt>0</armorPenetrationBlunt>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<pelletCount>2</pelletCount>
-								<spreadMult>2.0</spreadMult>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_ME>15</Fragment_ME>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseRavagerBullet">
-							<defName>Bullet_Ravager_FI</defName>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>1.5</explosionRadius>
-								<damageDef>Bomb</damageDef>
-								<armorPenetrationSharp>300</armorPenetrationSharp>
-								<damageAmountBase>100</damageAmountBase>
-								<armorPenetrationBlunt>0</armorPenetrationBlunt>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<pelletCount>2</pelletCount>
-								<spreadMult>2.0</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== Collossus ================== -->
-
-						<ThingDef ParentName="Base80x256mmFuelIncendiaryBullet">
-							<defName>Bullet_Collosus</defName>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<label>colossus artillery shot</label>
-							<graphicData>
-								<texPath>Things/Projectiles/Shot_ColossusArtillery</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-								<drawSize>1.5</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bomb</damageDef>
-								<ai_IsIncendiary>false</ai_IsIncendiary>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== Bolter ================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseMarauderBullet">
-							<defName>Bullet_ReaperBolter</defName>
-							<label>reaper bolter shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>16</damageAmountBase>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<armorPenetrationBlunt>44</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== Heavy Bolter ================== -->
-
-						<ThingDef ParentName="Base12x64mmChargedBullet">
-							<defName>Bullet_ReaperHeavyBolter</defName>
-							<label>reaper heavy bolter shot</label>
-							<graphicData>
-								<texPath>Things/Projectiles/Shot_MarauderRifle</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-						</ThingDef>
-
-						<!-- ================== Reaper Missile Launcher ================== -->
-
-						<ThingDef ParentName="Base80x256mmFuelIncendiaryBullet">
-							<defName>Bullet_ReaperMissile</defName>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<label>reaper missile launcher rocket</label>
-							<graphicData>
-								<texPath>Things/Projectiles/ReaperMissileLauncher_Shot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-								<drawSize>2.5</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>0</speed>
-								<damageDef>Bomb</damageDef>
-								<explosionRadius>7.5</explosionRadius>
-								<ai_IsIncendiary>false</ai_IsIncendiary>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== Reaper Kinetic Artillery ================== -->
-
-						<ThingDef ParentName="Base105mmHowitzerShell">
-							<defName>Bullet_ReaperKineticArtillery</defName>
-							<label>reaper kinetic artillery shot</label>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<graphicData>
-								<texPath>Things/Projectiles/KineticArtillery_Shot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-								<drawSize>2.5</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>350</damageAmountBase>
-								<explosionRadius>5</explosionRadius>
-								<soundExplode>MortarBomb_Explode</soundExplode>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<shellingProps>
-									<tilesPerTick>0.15</tilesPerTick>
-									<range>80</range>
-								</shellingProps>								
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Asari and Reapers/Asari_Abilities.xml b/Patches/Rim-Effect Asari and Reapers/Asari_Abilities.xml
deleted file mode 100644
index 294197ce42..0000000000
--- a/Patches/Rim-Effect Asari and Reapers/Asari_Abilities.xml	
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Asari and Reapers</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Biotics -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="RE_Biotic_Lance"]/range</xpath>
-					<value>
-						<range>62</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="RE_Biotic_Warp" or defName="RE_Biotic_Stasis"]/range</xpath>
-					<value>
-						<range>40</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Biotic_LanceProjectile"]/projectile/armorPenetrationBase</xpath>
-					<value>
-						<armorPenetrationBase>1000</armorPenetrationBase>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Asari and Reapers/Asari_Trader.xml b/Patches/Rim-Effect Asari and Reapers/Asari_Trader.xml
deleted file mode 100644
index 39e9bab9fd..0000000000
--- a/Patches/Rim-Effect Asari and Reapers/Asari_Trader.xml	
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Asari and Reapers</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Traders ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="RE_Base_Asari_Standard"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>FSX</thingDef>
-							<countRange>
-								<min>25</min>
-								<max>90</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>Prometheum</thingDef>
-							<countRange>
-								<min>25</min>
-								<max>90</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>ME_Ammo</tradeTag>
-							<countRange>
-								<min>500</min>
-								<max>1800</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>1</min>
-								<max>4</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_MediumAmmo</tradeTag>
-							<countRange>
-								<min>20</min>
-								<max>80</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>4</min>
-								<max>8</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_HeavyAmmo</tradeTag>
-							<countRange>
-								<min>5</min>
-								<max>20</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>4</min>
-								<max>6</max>
-							</thingDefCountRange>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="RE_Caravan_Asari_CombatSupplier"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>FSX</thingDef>
-							<countRange>
-								<min>12</min>
-								<max>36</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>Prometheum</thingDef>
-							<countRange>
-								<min>12</min>
-								<max>36</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>ME_Ammo</tradeTag>
-							<countRange>
-								<min>300</min>
-								<max>1200</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>2</min>
-								<max>4</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_MediumAmmo</tradeTag>
-							<countRange>
-								<min>20</min>
-								<max>60</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>3</min>
-								<max>6</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_HeavyAmmo</tradeTag>
-							<countRange>
-								<min>5</min>
-								<max>20</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>3</max>
-							</thingDefCountRange>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="RE_Caravan_Asari_Exotic" or
-						defName="RE_Caravan_Asari_BulkGoods"]/stockGenerators </xpath>
-					<value>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>FSX</thingDef>
-							<countRange>
-								<min>15</min>
-								<max>45</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>Prometheum</thingDef>
-							<countRange>
-								<min>15</min>
-								<max>45</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>ME_Ammo</tradeTag>
-							<countRange>
-								<min>120</min>
-								<max>400</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>1</min>
-								<max>2</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_MediumAmmo</tradeTag>
-							<countRange>
-								<min>10</min>
-								<max>20</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>2</min>
-								<max>4</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_HeavyAmmo</tradeTag>
-							<countRange>
-								<min>1</min>
-								<max>5</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>-1</min>
-								<max>3</max>
-							</thingDefCountRange>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="RE_Visitor_Asari_Standard"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>ME_Ammo</tradeTag>
-							<countRange>
-								<min>10</min>
-								<max>60</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>-1</min>
-								<max>1</max>
-							</thingDefCountRange>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Asari and Reapers/Bodies/Bodies_Asari.xml b/Patches/Rim-Effect Asari and Reapers/Bodies/Bodies_Asari.xml
deleted file mode 100644
index 5218e28553..0000000000
--- a/Patches/Rim-Effect Asari and Reapers/Bodies/Bodies_Asari.xml	
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Asari and Reapers</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="RE_Asari"]/corePart/parts/li[def="Ribcage"]/coverage</xpath>
-					<value>
-						<coverage>0.07</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="RE_Asari"]/corePart/parts/li[def="Pelvis"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="RE_Asari"]/corePart/parts/li[def="Stomach"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="RE_Asari"]/corePart/parts/li[def="Heart"]/coverage</xpath>
-					<value>
-						<coverage>0.04</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="RE_Asari"]/corePart/parts/li[def="Lung"]/coverage</xpath>
-					<value>
-						<coverage>0.055</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="RE_Asari"]/corePart/parts/li[def="Kidney"]/coverage</xpath>
-					<value>
-						<coverage>0.03</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="RE_Asari"]/corePart/parts/li[def="Liver"]/coverage</xpath>
-					<value>
-						<coverage>0.06</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="RE_Asari"]/corePart/parts/li[def="Neck"]/coverage</xpath>
-					<value>
-						<coverage>0.055</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="RE_Asari"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Skull"]/parts/li[def="Brain"]/coverage</xpath>
-					<value>
-						<coverage>0.9</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="RE_Asari"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Eye"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="RE_Asari"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="RE_Asari"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/coverage</xpath>
-					<value>
-						<coverage>0.08</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="RE_Asari"]/corePart/parts/li[def="Shoulder"]/coverage</xpath>
-					<value>
-						<coverage>0.085</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="RE_Asari"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Clavicle"]/coverage</xpath>
-					<value>
-						<coverage>0.06</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="RE_Asari"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Humerus"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="RE_Asari"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Radius"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="RE_Asari"]/corePart/parts/li[def="Leg"]/parts/li[def="Femur"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="RE_Asari"]/corePart/parts/li[def="Leg"]/parts/li[def="Tibia"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="RE_Asari"]//*[
-						def="Torso" or
-						def="Neck" or
-						def="Head" or
-						def="Jaw" or
-						def="Ear" or
-						def="Nose" or
-						def="Shoulder" or
-						def="Arm" or
-						def="Hand" or
-						def="Finger" or
-						def="Foot" or
-						def="Toe" or
-						def="Leg"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="RE_Asari"]//*[
-						def="Jaw" or
-						def="Nose" or
-						def="Eye"]/groups
-					</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Asari and Reapers/Bodies/Bodies_Reapers.xml b/Patches/Rim-Effect Asari and Reapers/Bodies/Bodies_Reapers.xml
deleted file mode 100644
index fa0e181cb6..0000000000
--- a/Patches/Rim-Effect Asari and Reapers/Bodies/Bodies_Reapers.xml	
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Asari and Reapers</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyPartDef[defName="RE_HuskTorso" or defName="RE_HuskBody"]/hitPoints</xpath>
-					<value>
-						<hitPoints>50</hitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyPartDef[defName="RE_HuskLeg"]/hitPoints</xpath>
-					<value>
-						<hitPoints>40</hitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="RE_RachniLike"]//*[
-						def="MechanicalThoraxCanManipulate" or
-						def="Pronotum" or
-						def="RE_HuskHead" or
-						def="MechanicalLeg"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="RE_Swarmer"]//*[
-						def="Shell" or
-						def="Pronotum" or
-						def="RE_HuskHead" or
-						def="MechanicalLeg"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="RE_Banshee" or defName="RE_Husk" or defName="RE_Marauder" or defName="RE_Brute"]//*[
-						def="RE_HuskTorso" or
-						def="RE_HuskNeck" or
-						def="RE_HuskHead" or
-						def="RE_HuskShoulder" or
-						def="RE_HuskArm" or
-						def="RE_HuskHand" or
-						def="RE_HuskFoot" or
-						def="RE_HuskLeg"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="RE_Colossus"]//*[
-						def="RE_HuskBodyCanManipulate" or
-						def="RE_HuskNeck" or
-						def="RE_HuskHead" or
-						def="Nose" or
-						def="Horn" or
-						def="Hoof" or
-						def="RE_HuskLeg"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="RE_Colossus"]//*[
-						def="SightSensor" or def="Nose"]
-					</xpath>
-					<value>
-						<groups>
-							<li>OutsideSquishy</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RE_RachniLike"]//*[def="SightSensor"]</xpath>
-					<value>
-						<groups>
-							<li>OutsideSquishy</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RE_Banshee"]//*[def="SightSensor" or def="Nose" or def="Jaw"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RE_Husk"]//*[def="SightSensor" or def="Nose" or def="Jaw"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RE_Marauder"]//*[def="SightSensor" or def="Nose" or def="Jaw"]/groups</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="RE_Brute"]//*[def="SightSensor" or def="Nose" or def="Jaw"]/groups
-					</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="RE_Swarmer"]//*[def="SightSensor"]
-					</xpath>
-					<value>
-						<groups>
-							<li>OutsideSquishy</li>
-						</groups>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Asari and Reapers/Buildings_Reapers.xml b/Patches/Rim-Effect Asari and Reapers/Buildings_Reapers.xml
deleted file mode 100644
index fbf63d6751..0000000000
--- a/Patches/Rim-Effect Asari and Reapers/Buildings_Reapers.xml	
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Asari and Reapers</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Light Bolter ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Turret_ReaperBolter" or defName="RE_Turret_ReaperHeavyBolter"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Turret_ReaperBolter" or defName="RE_Turret_ReaperHeavyBolter"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.75</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Turret_ReaperBolter" or defName="RE_Turret_ReaperHeavyBolter"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>1</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>RE_Gun_ReaperBolter</defName>
-					<statBases>
-						<Mass>35.00</Mass>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>0.72</SwayFactor>
-						<RangedWeapon_Cooldown>0.66</RangedWeapon_Cooldown>
-						<Bulk>13.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.28</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_ReaperBolter</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>55</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>9</burstShotCount>
-						<soundCast>RE_Shot_ReaperBolter</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Suppressive</li>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>RE_Gun_ReaperHeavyBolter</defName>
-					<statBases>
-						<Mass>35.00</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>13.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.28</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_ReaperHeavyBolter</defaultProjectile>
-						<warmupTime>1.30</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<burstShotCount>9</burstShotCount>
-						<soundCast>RE_Shot_HeavyBolter</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Suppressive</li>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Reaper Missile Launcher ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Turret_ReaperMissileLauncher"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Turret_ReaperMissileLauncher"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>10</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RE_Gun_ReaperMissileLauncher</defName>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-						<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_ReaperMissile</defaultProjectile>
-						<warmupTime>3.2</warmupTime>
-						<minRange>10</minRange>
-						<range>100</range>
-						<burstShotCount>1</burstShotCount>
-						<soundCast>RE_Shot_ReaperKineticArtillery</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>55</muzzleFlashScale>
-						<circularError>1.2</circularError>
-						<requireLineOfSight>true</requireLineOfSight>
-						<indirectFirePenalty>0.4</indirectFirePenalty>
-						<targetParams>
-							<canTargetLocations>false</canTargetLocations>
-						</targetParams>
-					</Properties>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "RE_Gun_ReaperMissileLauncher"]</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_Charges">
-								<chargeSpeeds>
-									<li>90</li>
-									<li>100</li>
-									<li>150</li>
-								</chargeSpeeds>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ========== Reaper Beam ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Bullet_ReaperBeam"]/projectile/armorPenetrationBase</xpath>
-					<value>
-						<armorPenetrationBase>1000</armorPenetrationBase>
-					</value>
-				</li>
-
-				<!-- ========== Kinetic Artillery ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Turret_ReaperKineticArtillery"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Turret_ReaperKineticArtillery"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>10</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RE_Gun_ReaperKineticArtillery</defName>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-						<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_ReaperKineticArtillery</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<minRange>20</minRange>
-						<range>500</range>
-						<burstShotCount>1</burstShotCount>
-						<soundCast>RE_Shot_ReaperKineticArtillery</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>55</muzzleFlashScale>
-						<circularError>2.5</circularError>
-						<requireLineOfSight>false</requireLineOfSight>
-						<indirectFirePenalty>0.6</indirectFirePenalty>
-						<targetParams>
-							<canTargetLocations>false</canTargetLocations>
-						</targetParams>
-					</Properties>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "RE_Gun_ReaperKineticArtillery"]</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_Charges">
-								<chargeSpeeds>
-									<li>50</li>
-									<li>70</li>
-									<li>90</li>
-								</chargeSpeeds>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Asari and Reapers/PawnKindDefs/Asari_Pawns.xml b/Patches/Rim-Effect Asari and Reapers/PawnKindDefs/Asari_Pawns.xml
deleted file mode 100644
index 7b5c2f969d..0000000000
--- a/Patches/Rim-Effect Asari and Reapers/PawnKindDefs/Asari_Pawns.xml	
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Asari and Reapers</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="RE_AsariExplorer" or
-						defName="RE_AsariDancer" or
-						defName="RE_AsariOfficial" or
-						defName="RE_AsariTrader" or
-						defName="RE_Matriarch" or
-						defName="RE_AsariScientist" or
-						defName="RE_AsariTraveller"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>3</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.25</generateChance>
-									<sidearmMoney>
-										<min>20</min>
-										<max>120</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-								<li>
-									<generateChance>0.075</generateChance>
-									<sidearmMoney>
-										<min>80</min>
-										<max>160</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_FlareLauncher</li>
-									</weaponTags>
-									<magazineCount>
-										<min>1</min>
-										<max>1</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="RE_AsariAdept" or
-						defName="RE_AsariJusticar" or
-						defName="RE_Alliance_AsariMarine" or
-						defName="RE_AsariCommando" or
-						defName="RE_AsariCommandoSpecialist" or
-						defName="RE_ArdatYakshi"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.05</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-								<li>
-									<generateChance>0.125</generateChance>
-									<sidearmMoney>
-										<min>10</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>GrenadeSmoke</li>
-										<li>GrenadeDestructive</li>
-									</weaponTags>
-									<magazineCount>
-										<min>0</min>
-										<max>1</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RE_AsariMarineSniper"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>12</min>
-								<max>21</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Asari and Reapers/PawnKindDefs/Reaper_Pawns.xml b/Patches/Rim-Effect Asari and Reapers/PawnKindDefs/Reaper_Pawns.xml
deleted file mode 100644
index c648917d4f..0000000000
--- a/Patches/Rim-Effect Asari and Reapers/PawnKindDefs/Reaper_Pawns.xml	
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Asari and Reapers</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= Combat Power ======= -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RE_Husk_Banshee" or defName="RE_Husk_Brute"]/combatPower</xpath>
-					<value>
-						<combatPower>360</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RE_Husk_Ravager"]/combatPower</xpath>
-					<value>
-						<combatPower>180</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RE_Husk_Cannibal"]/combatPower</xpath>
-					<value>
-						<combatPower>75</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="RE_Husk_Husk" or defName="RE_Husk_Swarmer"]/combatPower</xpath>
-					<value>
-						<combatPower>15</combatPower>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Asari and Reapers/Reaper_Hediff.xml b/Patches/Rim-Effect Asari and Reapers/Reaper_Hediff.xml
deleted file mode 100644
index fb915b2e32..0000000000
--- a/Patches/Rim-Effect Asari and Reapers/Reaper_Hediff.xml	
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Asari and Reapers</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName = "RER_DirectControl"]/stages/li[1]/statOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<ShootingAccuracyPawn>2</ShootingAccuracyPawn>
-						<MeleeCritChance>0.50</MeleeCritChance>
-						<MeleeParryChance>0.50</MeleeParryChance>
-						<MeleeDodgeChance>0.50</MeleeDodgeChance>
-						<Suppressability>-10</Suppressability>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Asari and Reapers/Scenarios_Asari.xml b/Patches/Rim-Effect Asari and Reapers/Scenarios_Asari.xml
deleted file mode 100644
index 71fc744f6f..0000000000
--- a/Patches/Rim-Effect Asari and Reapers/Scenarios_Asari.xml	
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Asari and Reapers</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Add ammo to scenario === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="RE_LoneAsariExplorer"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_ME</thingDef>
-							<count>120</count>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Asari and Reapers/ShellingResponse_Reapers.xml b/Patches/Rim-Effect Asari and Reapers/ShellingResponse_Reapers.xml
deleted file mode 100644
index c431ccbec2..0000000000
--- a/Patches/Rim-Effect Asari and Reapers/ShellingResponse_Reapers.xml	
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Asari and Reapers</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-			<!-- Let the Reapers respond to anyone stupid enough to shell their landing site. -->
-			<li Class="PatchOperationAdd">
-				<xpath>Defs</xpath>
-				<value>
-
-				<CombatExtended.ShellingResponseDef ParentName="ShellingPreset_UltraBase">
-					<defName>CE_ShellingPreset_Reapers</defName>
-					<projectiles Inherit="false">
-						<li>
-							<projectile>Bullet_ReaperKineticArtillery</projectile>
-							<points>250</points>
-							<weight>0.001</weight>
-						</li>
-					</projectiles>
-					<worldObjects>
-						<li>
-							<worldObject>Site</worldObject>
-							<shellingPropability>0.75</shellingPropability>
-							<raidPropability>0.5</raidPropability>
-							<raidMTBDays>2</raidMTBDays>
-						</li>				
-					</worldObjects>					
-				</CombatExtended.ShellingResponseDef>
-
-				</value>
-			</li>
-
-			<li Class="PatchOperationAddModExtension">
-				<xpath>Defs/FactionDef[defName="RE_Reapers"]</xpath>
-				<value>
-					<li Class="CombatExtended.FactionDefExtensionCE">
-						<shellingResponse>CE_ShellingPreset_Reapers</shellingResponse>
-					</li>
-				</value>
-			</li>
-
-			<!-- Increase Reaper landing site health and negation chance. -->
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/WorldObjectDef[defName="RE_Reaper"]/comps</xpath>
-				<value>
-					<li Class="CombatExtended.WorldObjects.WorldObjectCompProperties_Health">
-						<healthModifier>8</healthModifier>
-						<techLevelNoImpact>true</techLevelNoImpact>
-						<chanceToNegateDamage>0.33</chanceToNegateDamage>
-					</li>
-					<li Class="CombatExtended.WorldObjects.WorldObjectCompProperties_Hostility" />
-				</value>
-			</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Asari and Reapers/ThingDefs_Misc/Apparel_Asari.xml b/Patches/Rim-Effect Asari and Reapers/ThingDefs_Misc/Apparel_Asari.xml
deleted file mode 100644
index 602afe66c8..0000000000
--- a/Patches/Rim-Effect Asari and Reapers/ThingDefs_Misc/Apparel_Asari.xml	
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Asari and Reapers</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_DancerBodysuit"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AmbassadorOutfit"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AsariDress"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_MatriarchDress"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Asari and Reapers/ThingDefs_Misc/Armor_Asari.xml b/Patches/Rim-Effect Asari and Reapers/ThingDefs_Misc/Armor_Asari.xml
deleted file mode 100644
index 2f71abe188..0000000000
--- a/Patches/Rim-Effect Asari and Reapers/ThingDefs_Misc/Armor_Asari.xml	
+++ /dev/null
@@ -1,265 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Asari and Reapers</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Armor Layers === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AsariJusticarArmor" or defName="RE_Apparel_AsariCommandoArmor"]/apparel/layers</xpath>
-					<value>
-						<li>Webbing</li>
-					</value>
-				</li>
-
-				<!-- === Justicar Crown === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AsariJusticarCrown"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<NightVisionEfficiency_Apparel>0.7</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AsariJusticarCrown"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AsariJusticarCrown"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AsariJusticarCrown"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0.1</Flammability>
-					</value>
-				</li>
-
-				<!-- === Commando Armor (Middle layer only) === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AsariCommandoArmor"]/statBases/Mass</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>2</WornBulk>
-						<Mass>5.5</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AsariCommandoArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>9</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AsariCommandoArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>14</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AsariCommandoArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>260</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AsariCommandoArmor"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0.2</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AsariCommandoArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>10</CarryWeight>
-						<CarryBulk>30</CarryBulk>
-						<ShootingAccuracyPawn>0.1</ShootingAccuracyPawn>
-						<AimingDelayFactor>-0.075</AimingDelayFactor>
-						<ToxicEnvironmentResistance>0.3</ToxicEnvironmentResistance>
-						<MoveSpeed>0.4</MoveSpeed>
-						<ReloadSpeed>0.15</ReloadSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AsariCommandoArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AsariCommandoArmor"]/costList</xpath>
-					<value>
-						<costList>
-							<ComponentSpacer>3</ComponentSpacer>
-							<Plasteel>50</Plasteel>
-							<RE_ElementZero>10</RE_ElementZero>
-							<DevilstrandCloth>25</DevilstrandCloth>
-						</costList>
-					</value>
-				</li>
-
-				<!-- === Justicar Armor === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AsariJusticarArmor"]</xpath>
-					<value>
-						<thingClass>RimEffect.ShieldBeltApparel</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AsariJusticarArmor"]/statBases/Mass</xpath>
-					<value>
-						<Bulk>30</Bulk>
-						<WornBulk>5</WornBulk>
-						<Mass>12</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AsariJusticarArmor"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0.1</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AsariJusticarArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AsariJusticarArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>32</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AsariJusticarArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>400</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AsariJusticarArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>20</CarryWeight>
-						<CarryBulk>40</CarryBulk>
-						<ShootingAccuracyPawn>0.05</ShootingAccuracyPawn>
-						<ToxicEnvironmentResistance>0.3</ToxicEnvironmentResistance>
-						<ReloadSpeed>0.1</ReloadSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AsariJusticarArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AsariJusticarArmor"]/costList</xpath>
-					<value>
-						<costList>
-							<ComponentSpacer>5</ComponentSpacer>
-							<Plasteel>80</Plasteel>
-							<RE_ElementZero>35</RE_ElementZero>
-							<DevilstrandCloth>50</DevilstrandCloth>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AsariJusticarArmor"]/comps</xpath>
-					<value>
-						<li Class="VFECore.CompProperties_ShieldBubble">
-							<blockRangedAttack>true</blockRangedAttack>
-							<blockMeleeAttack>false</blockMeleeAttack>
-							<showWhenDrafted>true</showWhenDrafted>
-							<showOnHostiles>true</showOnHostiles>
-							<showOnNeutralInCombat>true</showOnNeutralInCombat>
-							<shieldTexPath>UI/AbilityShields/ShieldTech</shieldTexPath>
-							<EnergyShieldRechargeRate>0.2</EnergyShieldRechargeRate>
-							<EnergyShieldEnergyMax>100</EnergyShieldEnergyMax>
-							<minShieldSize>1</minShieldSize>
-							<maxShieldSize>1.5</maxShieldSize>
-							<disableRotation>true</disableRotation>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AsariJusticarArmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Asari and Reapers/ThingDefs_Misc/Weapons_Asari.xml b/Patches/Rim-Effect Asari and Reapers/ThingDefs_Misc/Weapons_Asari.xml
deleted file mode 100644
index abfa2a89e2..0000000000
--- a/Patches/Rim-Effect Asari and Reapers/ThingDefs_Misc/Weapons_Asari.xml	
+++ /dev/null
@@ -1,308 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Asari and Reapers</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Asari Blade === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_MeleeWeapon_AsariSword"]/statBases/Mass</xpath>
-					<value>
-						<Mass>0.25</Mass>
-						<Bulk>6.25</Bulk>
-						<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_MeleeWeapon_AsariSword"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>1.1</MeleeCritChance>
-						<MeleeParryChance>0.24</MeleeParryChance>
-						<MeleeDodgeChance>0.4</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_MeleeWeapon_AsariSword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>1.1</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.18</cooldownTime>
-								<chanceFactor>2</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Melee Tools ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Gun_AsariPistol"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Gun_AsariAssaultRifle" or defName="RE_Gun_AsariShotgun" or defName="RE_Gun_AsariSniperRifle"]/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>
-				</li>
-
-				<!-- ========== Priestess ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RE_Gun_AsariAssaultRifle</defName>
-					<statBases>
-						<SightsEfficiency>1.15</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.3</SwayFactor>
-						<Bulk>6.4</Bulk>
-						<Mass>1.8</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_AAR</defaultProjectile>
-						<warmupTime>0.75</warmupTime>
-						<range>50</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RE_Shot_AsariAssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>8</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-						<recoilAmount>1.26</recoilAmount>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>36</magazineSize>
-						<reloadTime>3.6</reloadTime>
-						<ammoSet>AmmoSet_AAR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- Name -->
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='RE_Gun_AsariAssaultRifle']/label</xpath>
-					<value>
-						<label>Priestess</label>
-					</value>
-				</li>
-
-				<!-- ========== Huntress ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RE_Gun_AsariSniperRifle</defName>
-					<statBases>
-						<SightsEfficiency>2.8</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.43</SwayFactor>
-						<Bulk>9.0</Bulk>
-						<Mass>3.60</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_ASR</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<soundCast>RE_Shot_AsariSniperRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>18</magazineSize>
-						<reloadTime>3.6</reloadTime>
-						<ammoSet>AmmoSet_ASR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- Name -->
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='RE_Gun_AsariSniperRifle']/label</xpath>
-					<value>
-						<label>Huntress</label>
-					</value>
-				</li>
-
-				<!-- ========== Disciple ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RE_Gun_AsariShotgun</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.20</SwayFactor>
-						<Bulk>5</Bulk>
-						<Mass>1.5</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Disciple</defaultProjectile>
-						<warmupTime>0.55</warmupTime>
-						<range>25</range>
-						<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
-						<soundCast>RE_Shot_AsariShotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>18</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_Disciple</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>False</aiUseBurstMode>
-					</FireModes>
-				</li>
-
-				<!-- Name -->
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='RE_Gun_AsariShotgun']/label</xpath>
-					<value>
-						<label>Disciple</label>
-					</value>
-				</li>
-
-				<!-- ========== Acolyte ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RE_Gun_AsariPistol</defName>
-					<statBases>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.19</SwayFactor>
-						<Bulk>1.5</Bulk>
-						<Mass>0.6</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Acolyte</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>18</range>
-						<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
-						<soundCast>RE_Shot_AsariPistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-							<canTargetPawns>true</canTargetPawns>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>3.0</reloadTime>
-						<ammoSet>AmmoSet_Acolyte</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- Name -->
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='RE_Gun_AsariPistol']/label</xpath>
-					<value>
-						<label>Acolyte</label>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Asari and Reapers/ThingDefs_Misc/Weapons_Reapers.xml b/Patches/Rim-Effect Asari and Reapers/ThingDefs_Misc/Weapons_Reapers.xml
deleted file mode 100644
index 5c745795ed..0000000000
--- a/Patches/Rim-Effect Asari and Reapers/ThingDefs_Misc/Weapons_Reapers.xml	
+++ /dev/null
@@ -1,229 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Asari and Reapers</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Melee Tools ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Gun_CannibalCaster" or defName="RE_Gun_MarauderRifle"]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RE_Gun_GoliathCannon" or
-						defName="RE_Gun_ColossusArtillery"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>3.44</cooldownTime>
-								<armorPenetrationBlunt>8.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Goliath Cannnon ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RE_Gun_GoliathCannon</defName>
-					<statBases>
-						<Mass>35.00</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>13.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.28</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Goliath</defaultProjectile>
-						<warmupTime>1.30</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>25</burstShotCount>
-						<soundCast>RE_Shot_GoliathCannon</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>200</magazineSize>
-						<reloadTime>9.1</reloadTime>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>12</aimedBurstShotCount>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Suppressive</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Cannibal Caster ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RE_Gun_CannibalCaster</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.30</SwayFactor>
-						<Bulk>8</Bulk>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Cannibal_Basic</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>50</range>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<soundCast>RE_Shot_CannibalCaster</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-						<recoilAmount>1.68</recoilAmount>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>35</magazineSize>
-						<reloadTime>4.0</reloadTime>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Marauder ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RE_Gun_MarauderRifle</defName>
-					<statBases>
-						<SightsEfficiency>1.25</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.20</SwayFactor>
-						<Bulk>10</Bulk>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Marauder</defaultProjectile>
-						<burstShotCount>8</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>1.0</warmupTime>
-						<range>55</range>
-						<soundCast>RE_Shot_MarauderRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilAmount>1.24</recoilAmount>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>3.5</reloadTime>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>4</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Colossus Artillery ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RE_Gun_ColossusArtillery</defName>
-					<statBases>
-						<Mass>50.00</Mass>
-						<RangedWeapon_Cooldown>2.53</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>0.82</SwayFactor>
-						<Bulk>20.00</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Collosus</defaultProjectile>
-						<burstShotCount>1</burstShotCount>
-						<warmupTime>5.5</warmupTime>
-						<ai_AvoidFriendlyFireRadius>5.9</ai_AvoidFriendlyFireRadius>
-						<requireLineOfSight>false</requireLineOfSight>
-						<range>92</range>
-						<minRange>5.9</minRange>
-						<soundCast>RE_Shot_ColossusArtillery</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>40</muzzleFlashScale>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>7.6</reloadTime>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Asari and Reapers/ThingDefs_Races/Race_Asari.xml b/Patches/Rim-Effect Asari and Reapers/ThingDefs_Races/Race_Asari.xml
deleted file mode 100644
index c7018518a6..0000000000
--- a/Patches/Rim-Effect Asari and Reapers/ThingDefs_Races/Race_Asari.xml	
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Asari and Reapers</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="RE_Asari"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="RE_Asari"]/statBases</xpath>
-					<value>
-						<MeleeCritChance>1.0</MeleeCritChance>
-						<MeleeParryChance>1.0</MeleeParryChance>
-						<Suppressability>1</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="RE_Asari"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="RE_Asari"]</xpath>
-					<value>
-						<comps />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="RE_Asari"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Asari and Reapers/ThingDefs_Races/Races_Reapers.xml b/Patches/Rim-Effect Asari and Reapers/ThingDefs_Races/Races_Reapers.xml
deleted file mode 100644
index b3783dbaea..0000000000
--- a/Patches/Rim-Effect Asari and Reapers/ThingDefs_Races/Races_Reapers.xml	
+++ /dev/null
@@ -1,593 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Asari and Reapers</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Body Shapes ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[
-						defName="RE_Husk_Banshee" or
-						defName="RE_Husk_Husk" or
-						defName="RE_Husk_Marauder"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[
-						defName="RE_Husk_Goliath" or
-						defName="RE_Husk_Ravager" or
-						defName="RE_Husk_Brute"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RE_Husk_Swarmer"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RE_Husk_Cannibal"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>HumanoidWide</bodyShape>
-						</li>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RE_Husk_Colossus"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Stat Bases ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="BaseHusk"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency>0.8</NightVisionEfficiency>
-						<SmokeSensitivity>0</SmokeSensitivity>
-						<PainShockThreshold>1</PainShockThreshold>
-						<Suppressability>0</Suppressability>
-					</value>
-				</li>
-
-				<!-- ========== Banshee ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Husk_Banshee"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>3.0</ArmorRating_Sharp>
-						<ShootingAccuracyPawn>3.0</ShootingAccuracyPawn>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>0.9</MeleeCritChance>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Husk_Banshee"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Husk_Banshee"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>3.0</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Cut</li>
-									<li>Stab</li>
-								</capacities>
-								<power>43</power>
-								<cooldownTime>2.3</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Cut</li>
-									<li>Stab</li>
-								</capacities>
-								<power>43</power>
-								<cooldownTime>2.3</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Husk_Banshee"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyLossPerDamage</xpath>
-					<value>
-						<EnergyLossPerDamage>0.5</EnergyLossPerDamage>
-					</value>
-				</li>
-
-				<!-- ========== Cannibal ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Husk_Cannibal"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1.0</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.33</MeleeDodgeChance>
-						<MeleeCritChance>0.33</MeleeCritChance>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Husk_Cannibal"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>12</ArmorRating_Blunt>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Husk_Cannibal"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2.4</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.76</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<armorPenetrationSharp>4.5</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.76</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<armorPenetrationSharp>4.5</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Marauder ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Husk_Marauder"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>15</ArmorRating_Sharp>
-						<AimingAccuracy>1.3</AimingAccuracy>
-						<ShootingAccuracyPawn>1.3</ShootingAccuracyPawn>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>0.33</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Husk_Marauder"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>28</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Husk_Marauder"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>135</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<armorPenetrationSharp>4.5</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<armorPenetrationSharp>4.5</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Goliath ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Husk_Goliath"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>28</ArmorRating_Sharp>
-						<CarryWeight>550</CarryWeight>
-						<CarryBulk>140</CarryBulk>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>1.25</MeleeCritChance>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Husk_Goliath"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>80</ArmorRating_Blunt>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Husk_Goliath"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>3.51</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Ravager ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Husk_Ravager"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.40</MeleeCritChance>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Husk_Ravager"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Husk_Ravager"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>3.0</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Husk ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Husk_Husk"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
-						<MeleeDodgeChance>0.9</MeleeDodgeChance>
-						<MeleeCritChance>0.3</MeleeCritChance>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Husk_Husk"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.15</ArmorRating_Blunt>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Husk_Husk"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.0</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.0</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>bite</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>2.8</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<soundMeleeHit>Pawn_Melee_HumanBite_Hit</soundMeleeHit>
-								<soundMeleeMiss>Pawn_Melee_HumanBite_Miss</soundMeleeMiss>
-								<armorPenetrationBlunt>14</armorPenetrationBlunt>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>3.0</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Brute ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Husk_Brute"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>23</ArmorRating_Sharp>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>2</MeleeCritChance>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Husk_Brute"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>75</ArmorRating_Blunt>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Husk_Brute"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Cut</li>
-									<li>Scratch</li>
-								</capacities>
-								<power>56</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Stun</def>
-										<amount>15</amount>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>3.3</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>500</armorPenetrationBlunt>
-								<armorPenetrationSharp>60</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Cut</li>
-									<li>Scratch</li>
-								</capacities>
-								<power>56</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Stun</def>
-										<amount>15</amount>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>3.3</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>500</armorPenetrationBlunt>
-								<armorPenetrationSharp>60</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>3.51</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>18</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Swarmer ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Husk_Swarmer"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-						<MeleeDodgeChance>0.35</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Husk_Swarmer"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Husk_Swarmer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.33</cooldownTime>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>3.0</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Colossus ========== -->
-        
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Husk_Colossus"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						<MeleeCritChance>0.75</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Husk_Colossus"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>48</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Husk_Colossus"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Husk_Colossus"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>56</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<armorPenetrationBlunt>50</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>50</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Core/Alliance_Pawns.xml b/Patches/Rim-Effect Core/Alliance_Pawns.xml
deleted file mode 100644
index 9fdc39ed62..0000000000
--- a/Patches/Rim-Effect Core/Alliance_Pawns.xml	
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Core</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="RE_Merchant" or
-						defName="RE_Colonist" or
-						defName="RE_Farmer" or
-						defName="RE_AllianceOfficer" or
-						defName="RE_AllianceRecruit" or
-						defName="RE_AllianceMilitia" or
-						defName="RE_Official" or
-						defName="RE_Ranger" or
-						defName="RE_Scientist" or
-						defName="RE_Medic" or
-						defName="RE_Scientist" or
-						defName="RE_PrimeMinister"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>3</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.25</generateChance>
-									<sidearmMoney>
-										<min>20</min>
-										<max>120</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-								<li>
-									<generateChance>0.075</generateChance>
-									<sidearmMoney>
-										<min>80</min>
-										<max>160</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_FlareLauncher</li>
-									</weaponTags>
-									<magazineCount>
-										<min>1</min>
-										<max>1</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="RE_Alliance_Adept" or
-						defName="RE_Alliance_Marine" or
-						defName="RE_Spectre" or
-						defName="RE_Alliance_Engineer"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.25</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-								<li>
-									<generateChance>0.125</generateChance>
-									<sidearmMoney>
-										<min>10</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>GrenadeSmoke</li>
-										<li>GrenadeDestructive</li>
-									</weaponTags>
-									<magazineCount>
-										<min>0</min>
-										<max>1</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RE_Alliance_MarineHeavy"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>12</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.75</generateChance>
-									<sidearmMoney>
-										<min>200</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>RE_Bullet_AlliancePistol</li>
-									</weaponTags>
-									<magazineCount>
-										<min>2</min>
-										<max>3</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="RE_Alliance_MarineSniper"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>12</min>
-								<max>21</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- ======= Combat Power ======= -->
-
-				<!-- Trooper -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[
-						defName="RE_Alliance_Marine"
-						]/combatPower </xpath>
-					<value>
-						<combatPower>200</combatPower>
-					</value>
-				</li>
-
-				<!-- Infiltrator -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[
-						defName="RE_Ranger" or
-						defName="RE_AllianceMilitia"
-						]/combatPower </xpath>
-					<value>
-						<combatPower>80</combatPower>
-					</value>
-				</li>
-
-				<!-- Special -->
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Core/Apparel_ME.xml b/Patches/Rim-Effect Core/Apparel_ME.xml
deleted file mode 100644
index cde0e12623..0000000000
--- a/Patches/Rim-Effect Core/Apparel_ME.xml	
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_Fatigues"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-						<Bulk>5</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceDressJacket"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-						<ArmorRating_Sharp>0.04</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceDressJacket"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.04</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_FormalShirt"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>40</costStuffCount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_FormalShirt"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
-						<Bulk>1</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_FormalJacket"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_BattleUniform"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>2</WornBulk>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-						<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_BattleUniform"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>0.4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceOfficerHat"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>0</WornBulk>
-						<ArmorRating_Sharp>0.02</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceOfficerHat"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.03</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_ScienceUniform"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>2</WornBulk>
-						<ArmorRating_Sharp>0.08</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_ScienceUniform"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.12</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Core/Armor_ME.xml b/Patches/Rim-Effect Core/Armor_ME.xml
deleted file mode 100644
index d0bd607ea4..0000000000
--- a/Patches/Rim-Effect Core/Armor_ME.xml	
+++ /dev/null
@@ -1,788 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceArmor" or defName="RE_Apparel_AllianceArmor" or defName="RE_Apparel_HeavyAllianceArmor" or defName="RE_Apparel_SpectreArmor"]/apparel/layers</xpath>
-					<value>
-						<li>Webbing</li>
-					</value>
-				</li>
-
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='RE_Apparel_LightAllianceArmor' or defName='RE_Apparel_LightAllianceHelmet']/recipeMaker/skillRequirements</xpath>
-					<value>
-						<skillRequirements>
-							<Crafting>6</Crafting>
-						</skillRequirements>
-					</value>
-				</li>
-
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='RE_Apparel_AllianceArmor' or defName='RE_Apparel_AllianceHelmet']/recipeMaker/skillRequirements</xpath>
-					<value>
-						<skillRequirements>
-							<Crafting>8</Crafting>
-						</skillRequirements>
-					</value>
-				</li>
-
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='RE_Apparel_HeavyAllianceArmor' or defName='RE_Apparel_HeavyAllianceHelmet']/recipeMaker/skillRequirements</xpath>
-					<value>
-						<skillRequirements>
-							<Crafting>10</Crafting>
-						</skillRequirements>
-					</value>
-				</li>
-
-				<!-- === Light Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>0.5</WornBulk>
-						<NightVisionEfficiency_Apparel>0.7</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>11</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>20</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>180</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceHelmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0.1</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceHelmet"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingDelayFactor>-0.05</AimingDelayFactor>
-							<ToxicEnvironmentResistance>0.10</ToxicEnvironmentResistance>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceHelmet"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>40</Plasteel>
-						<DevilstrandCloth>10</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceHelmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.50</ArmorRating_Sharp>
-									<parts>
-										<li>Nose</li>
-										<li>Jaw</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.50</ArmorRating_Blunt>
-									<parts>
-										<li>Nose</li>
-										<li>Jaw</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Trooper Armor === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceArmor"]/statBases/Mass</xpath>
-					<value>
-						<Bulk>35</Bulk>
-						<WornBulk>6</WornBulk>
-						<Mass>12</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>13</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>26</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>400</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceArmor"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0.1</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceArmor"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>12</CarryWeight>
-							<CarryBulk>35</CarryBulk>
-							<ShootingAccuracyPawn>0.05</ShootingAccuracyPawn>
-							<ToxicEnvironmentResistance>0.3</ToxicEnvironmentResistance>
-							<MoveSpeed>0.3</MoveSpeed>
-							<ReloadSpeed>0.1</ReloadSpeed>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceArmor"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>25</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_LightAllianceArmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Medium Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>0.5</WornBulk>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceHelmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0.1</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>13</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>24</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>200</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceHelmet"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<PsychicSensitivity>-0.1</PsychicSensitivity>
-							<AimingDelayFactor>-0.05</AimingDelayFactor>
-							<ToxicEnvironmentResistance>0.25</ToxicEnvironmentResistance>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceHelmet"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>50</Plasteel>
-						<DevilstrandCloth>10</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceHelmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Medium Armor === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceArmor"]/statBases/Mass</xpath>
-					<value>
-						<Bulk>50</Bulk>
-						<WornBulk>8</WornBulk>
-						<Mass>22</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceArmor"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0.1</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>17</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>32</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>450</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<CarryWeight>20</CarryWeight>
-						<CarryBulk>40</CarryBulk>
-						<ShootingAccuracyPawn>0.05</ShootingAccuracyPawn>
-						<ToxicEnvironmentResistance>0.3</ToxicEnvironmentResistance>
-						<ReloadSpeed>0.1</ReloadSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceArmor"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>35</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_AllianceArmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Heavy Alliance Helmet === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceHelmet"]/statBases/Mass</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>2.5</WornBulk>
-						<Mass>6</Mass>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceHelmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0.1</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>17</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>34</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>240</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceHelmet"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<PsychicSensitivity>-0.3</PsychicSensitivity>
-							<AimingAccuracy>0.3</AimingAccuracy>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-							<CarryWeight>5.4</CarryWeight>
-							<CarryBulk>1</CarryBulk>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-							<PainShockThreshold>0.05</PainShockThreshold>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceHelmet"]/costList</xpath>
-					<value>
-						<costList>
-							<Plasteel>65</Plasteel>
-							<DevilstrandCloth>15</DevilstrandCloth>
-							<ComponentSpacer>3</ComponentSpacer>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceHelmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Heavy Alliance Armor === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceArmor"]/statBases/Mass</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>20</WornBulk>
-						<Mass>60</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceArmor"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0.1</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>22</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>60</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>520</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>75</CarryWeight>
-							<CarryBulk>60</CarryBulk>
-							<ShootingAccuracyPawn>0.2</ShootingAccuracyPawn>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-							<PainShockThreshold>0.05</PainShockThreshold>
-							<MoveSpeed>-0.4</MoveSpeed>
-							<ReloadSpeed>0.1</ReloadSpeed>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceArmor"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>50</DevilstrandCloth>
-						<Hyperweave>10</Hyperweave>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_HeavyAllianceArmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Spectre Armor === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_SpectreArmor"]/statBases/Mass</xpath>
-					<value>
-						<Bulk>80</Bulk>
-						<WornBulk>15</WornBulk>
-						<Mass>30</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_SpectreArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_SpectreArmor"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0.1</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_SpectreArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>44</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_SpectreArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>500</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_SpectreArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>40</CarryWeight>
-							<CarryBulk>50</CarryBulk>
-							<ShootingAccuracyPawn>0.3</ShootingAccuracyPawn>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-							<PainShockThreshold>0.1</PainShockThreshold>
-							<MoveSpeed>0.5</MoveSpeed>
-							<ReloadSpeed>0.1</ReloadSpeed>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_SpectreArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_SpectreArmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_SpectreVisor"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-						<Bulk>1</Bulk>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_SpectreVisor"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<ShootingAccuracyPawn>0.8</ShootingAccuracyPawn>
-							<AimingAccuracy>0.4</AimingAccuracy>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_SpectreVisor"]/apparel</xpath>
-					<value>
-						<layers>
-							<li>StrappedHead</li>
-						</layers>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Core/ME_Abilities.xml b/Patches/Rim-Effect Core/ME_Abilities.xml
deleted file mode 100644
index a653afb396..0000000000
--- a/Patches/Rim-Effect Core/ME_Abilities.xml	
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Core</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Biotic -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="RE_Biotic_Throw" or defName="RE_Biotic_Pull" ]/range</xpath>
-					<value>
-						<range>34</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="RE_Biotic_Annihilation" or defName="RE_Biotic_Dominate" or defName="RE_Biotic_Singularity" or defName="RE_Biotic_Flare" ]/range</xpath>
-					<value>
-						<range>40</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="RE_Biotic_Charge"]/range</xpath>
-					<value>
-						<range>46</range>
-					</value>
-				</li>
-
-				<!-- Spectre -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="RE_SpectreArmor_AdrenalineRushHediff"]/stages/li[1]</xpath>
-					<value>
-						<statOffsets>
-							<Suppressability>-0.5</Suppressability>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="RE_SpectreArmor_CombatMasteryHediff"]/stages/li[1]/statFactors</xpath>
-					<value>
-						<statOffsets>
-							<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-							<AimingAccuracy>0.4</AimingAccuracy>
-						</statOffsets>
-					</value>
-				</li>
-
-				<!-- Tech -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "RE_Tech_CombatDroneTurret"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.9</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="RE_Tech_CryoBlast" or defName="RE_Tech_Incinerate"]/range</xpath>
-					<value>
-						<range>36</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="RE_Tech_CombatDrone"]/range</xpath>
-					<value>
-						<range>24</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="RE_Tech_HexShield" or defName="RE_Tech_Overload" or defName="RE_Tech_Sabotage"]/range</xpath>
-					<value>
-						<range>26</range>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Core/ME_Ammo_Recipe.xml b/Patches/Rim-Effect Core/ME_Ammo_Recipe.xml
deleted file mode 100644
index 4a41fd2d51..0000000000
--- a/Patches/Rim-Effect Core/ME_Ammo_Recipe.xml	
+++ /dev/null
@@ -1,396 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_ME</defName>
-							<label>make thermal clips</label>
-							<description>Craft 200 shots' worth of thermal clips.</description>
-							<jobString>Making thermal clips.</jobString>
-							<workAmount>6000</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Plasteel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_ME>200</Ammo_ME>
-							</products>
-							<researchPrerequisite>RE_AllianceWeaponry</researchPrerequisite>
-							<recipeUsers>
-								<li>RE_ManufacturingBench</li>
-							</recipeUsers>
-						</RecipeDef>
-
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_ME_AP</defName>
-							<label>make thermal clips</label>
-							<description>Craft 200 shots' worth of AP thermal clips.</description>
-							<jobString>Making AP thermal clips.</jobString>
-							<workAmount>7500</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Uranium</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Uranium</li>
-									<li>Steel</li>
-									<li>Plasteel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_ME_AP>200</Ammo_ME_AP>
-							</products>
-							<researchPrerequisite>RE_AllianceWeaponry</researchPrerequisite>
-							<recipeUsers>
-								<li>RE_ManufacturingBench</li>
-							</recipeUsers>
-						</RecipeDef>
-
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_ME_Cryo</defName>
-							<label>make thermal clips</label>
-							<description>Craft 200 shots' worth of Cryo thermal clips.</description>
-							<jobString>Making Cryo thermal clips.</jobString>
-							<workAmount>10000</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>RE_ElementZero</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>RE_ElementZero</li>
-									<li>Steel</li>
-									<li>Plasteel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_ME_Cryo>200</Ammo_ME_Cryo>
-							</products>
-							<researchPrerequisite>RE_AmmunitionModification</researchPrerequisite>
-							<recipeUsers>
-								<li>RE_ManufacturingBench</li>
-							</recipeUsers>
-						</RecipeDef>
-
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_ME_HE</defName>
-							<label>make thermal clips</label>
-							<description>Craft 200 shots' worth of high explosive thermal clips.</description>
-							<jobString>Making HE thermal clips.</jobString>
-							<workAmount>10000</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>RE_ElementZero</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>RE_ElementZero</li>
-									<li>Steel</li>
-									<li>Plasteel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_ME_HE>200</Ammo_ME_HE>
-							</products>
-							<researchPrerequisite>RE_AmmunitionModification</researchPrerequisite>
-							<recipeUsers>
-								<li>RE_ManufacturingBench</li>
-							</recipeUsers>
-						</RecipeDef>
-
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_ME_FI</defName>
-							<label>make thermal clips</label>
-							<description>Craft 200 shots' worth of FI thermal clips.</description>
-							<jobString>Making incendiary thermal clips.</jobString>
-							<workAmount>10000</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Prometheum</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>RE_ElementZero</li>
-										</thingDefs>
-									</filter>
-									<count>3</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>RE_ElementZero</li>
-									<li>Steel</li>
-									<li>Plasteel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_ME_FI>200</Ammo_ME_FI>
-							</products>
-							<researchPrerequisite>RE_AmmunitionModification</researchPrerequisite>
-							<recipeUsers>
-								<li>RE_ManufacturingBench</li>
-							</recipeUsers>
-						</RecipeDef>
-
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_ME_Ion</defName>
-							<label>make thermal clips</label>
-							<description>Craft 200 shots' worth of disruptor thermal clips.</description>
-							<jobString>Making disruptor thermal clips.</jobString>
-							<workAmount>10000</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>RE_ElementZero</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>RE_ElementZero</li>
-									<li>Steel</li>
-									<li>Plasteel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_ME_Ion>200</Ammo_ME_Ion>
-							</products>
-							<researchPrerequisite>RE_AmmunitionModification</researchPrerequisite>
-							<recipeUsers>
-								<li>RE_ManufacturingBench</li>
-							</recipeUsers>
-						</RecipeDef>
-
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_ME_Toxic</defName>
-							<label>make thermal clips</label>
-							<description>Craft 200 shots' worth of toxin thermal clips.</description>
-							<jobString>Making toxin thermal clips.</jobString>
-							<workAmount>10000</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>RE_ElementZero</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>RE_ElementZero</li>
-									<li>Steel</li>
-									<li>Plasteel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_ME_Toxic>200</Ammo_ME_Toxic>
-							</products>
-							<researchPrerequisite>RE_AmmunitionModification</researchPrerequisite>
-							<recipeUsers>
-								<li>RE_ManufacturingBench</li>
-							</recipeUsers>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Core/ME_Animals.xml b/Patches/Rim-Effect Core/ME_Animals.xml
deleted file mode 100644
index f33d30db21..0000000000
--- a/Patches/Rim-Effect Core/ME_Animals.xml	
+++ /dev/null
@@ -1,231 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Core</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RE_SpaceCow" or
-						defName="RE_Pyjak" or
-						defName="RE_Varren" ] </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_SpaceCow"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.04</MeleeDodgeChance>
-						<MeleeCritChance>0.34</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_SpaceCow"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>2.84</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Pyjak"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-						<MeleeParryChance>0.03</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Pyjak"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<armorPenetrationSharp>0.08</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.12</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Varren"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.38</MeleeDodgeChance>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>0.08</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Varren"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.16</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.16</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.9</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Core/ME_Machine.xml b/Patches/Rim-Effect Core/ME_Machine.xml
deleted file mode 100644
index 9c185bdb3b..0000000000
--- a/Patches/Rim-Effect Core/ME_Machine.xml	
+++ /dev/null
@@ -1,143 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingDef ParentName="BaseGunWithQuality">
-							<defName>ME_LokiPistol</defName>
-							<label>Loki Pistol</label>
-							<description>A specialised M3 predator pistol used by LOKI mechs, does not appear to use thermal clips. Do not under any circumstance tell your mech to drop its weapon.</description>
-							<graphicData>
-								<texPath>Things/Item/Equipment/WeaponRanged/AlliancePistol</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<soundInteract>RE_Interact_Predator</soundInteract>
-							<statBases>
-								<SightsEfficiency>1</SightsEfficiency>
-								<ShotSpread>0.13</ShotSpread>
-								<SwayFactor>0.88</SwayFactor>
-								<Bulk>1.75</Bulk>
-								<Mass>0.8</Mass>
-								<RangedWeapon_Cooldown>0.1</RangedWeapon_Cooldown>
-							</statBases>
-							<techLevel>Ultra</techLevel>
-							<relicChance>0</relicChance>
-							<tradeability>None</tradeability>
-							<destroyOnDrop>true</destroyOnDrop>
-							<weaponTags>
-								<li>LokiGun</li>
-							</weaponTags>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_Predator</defaultProjectile>
-									<warmupTime>0.5</warmupTime>
-									<range>18</range>
-									<burstShotCount>1</burstShotCount>
-									<soundCast>RE_Shot_Predator</soundCast>
-									<soundCastTail>GunTail_Light</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</li>
-							</verbs>
-							<comps>
-								<li Class="CombatExtended.CompProperties_AmmoUser">
-									<magazineSize>15</magazineSize>
-									<reloadTime>2.5</reloadTime>
-								</li>
-								<li Class="CombatExtended.CompProperties_FireModes">
-									<aiUseBurstMode>FALSE</aiUseBurstMode>
-								</li>
-							</comps>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>grip</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>4</power>
-									<cooldownTime>1.54</cooldownTime>
-									<chanceFactor>1.5</chanceFactor>
-									<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>muzzle</label>
-									<capacities>
-										<li>Poke</li>
-									</capacities>
-									<power>3</power>
-									<cooldownTime>1.54</cooldownTime>
-									<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-								</li>
-							</tools>
-							<modExtensions>
-								<li Class="CombatExtended.GunDrawExtension">
-									<DrawSize>1.0,1.0</DrawSize>
-									<DrawOffset>0.0,0.0</DrawOffset>
-								</li>
-							</modExtensions>
-						</ThingDef>
-
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Mechanoids_LOKIBase"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>40</Steel>
-							<Plasteel>40</Plasteel>
-							<RE_PrefabComponent>7</RE_PrefabComponent>
-							<ComponentSpacer>4</ComponentSpacer>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Mechanoids_LOKIBase"]/comps/li[@Class ="VFE.Mechanoids.CompProperties_MachineChargingStation"]/spawnWithWeapon</xpath>
-					<value>
-						<spawnWithWeapon>ME_LokiPistol</spawnWithWeapon>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Mechanoids_YMIRBase"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>300</Steel>
-							<Plasteel>300</Plasteel>
-							<Uranium>60</Uranium>
-							<RE_PrefabComponent>25</RE_PrefabComponent>
-							<ComponentSpacer>16</ComponentSpacer>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Mechanoids_YMIRBase"]/constructionSkillPrerequisite</xpath>
-					<value>
-						<constructionSkillPrerequisite>12</constructionSkillPrerequisite>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Mechanoids_YMIRBase"]/comps/li[@Class ="VFE.Mechanoids.CompProperties_MachineChargingStation"]/spawnWithWeapon</xpath>
-					<value>
-						<spawnWithWeapon>RE_YMIRMassAccelerator</spawnWithWeapon>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Core/ME_Projectile_Damage_Ammoclass.xml b/Patches/Rim-Effect Core/ME_Projectile_Damage_Ammoclass.xml
deleted file mode 100644
index 95f1ca2fd2..0000000000
--- a/Patches/Rim-Effect Core/ME_Projectile_Damage_Ammoclass.xml	
+++ /dev/null
@@ -1,2052 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ==================== Hediff Type ========================== -->
-
-						<HediffDef>
-							<defName>ME_Toxic</defName>
-							<label>toxin round</label>
-							<description>Neurotoxin in the bloodstream. Causes nausea and severe degradation of neuromotor functions.
-								\nAt high doses, toxic buildup can have severe health effects. Even at low doses, it can generate cancers.
-								\nCreatures who die with toxic buildup cannot be eaten. </description>
-							<hediffClass>HediffWithComps</hediffClass>
-							<defaultLabelColor>(0.7, 1.0, 0.7)</defaultLabelColor>
-							<makesSickThought>true</makesSickThought>
-							<scenarioCanAdd>false</scenarioCanAdd>
-							<taleOnVisible>ToxicityRevealed</taleOnVisible>
-							<comps>
-								<li Class="HediffCompProperties_Immunizable">
-									<severityPerDayNotImmune>-0.2</severityPerDayNotImmune>
-								</li>
-							</comps>
-							<stages>
-								<li>
-									<label>initial</label>
-									<becomeVisible>false</becomeVisible>
-								</li>
-								<li>
-									<label>initial</label>
-									<minSeverity>0.01</minSeverity>
-									<vomitMtbDays>0.8</vomitMtbDays>
-									<capMods>
-										<li>
-											<capacity>Consciousness</capacity>
-											<offset>-0.05</offset>
-										</li>
-									</capMods>
-								</li>
-								<li>
-									<label>minor</label>
-									<minSeverity>0.15</minSeverity>
-									<vomitMtbDays>0.33</vomitMtbDays>
-									<capMods>
-										<li>
-											<capacity>Consciousness</capacity>
-											<offset>-0.10</offset>
-										</li>
-									</capMods>
-								</li>
-								<li>
-									<label>moderate</label>
-									<minSeverity>0.35</minSeverity>
-									<vomitMtbDays>0.2</vomitMtbDays>
-									<capMods>
-										<li>
-											<capacity>Consciousness</capacity>
-											<offset>-0.175</offset>
-										</li>
-									</capMods>
-									<hediffGivers>
-										<li Class="HediffGiver_Random">
-											<hediff>Dementia</hediff>
-											<mtbDays>146</mtbDays>
-											<partsToAffect>
-												<li>Brain</li>
-											</partsToAffect>
-										</li>
-										<li Class="HediffGiver_Random">
-											<hediff>Carcinoma</hediff>
-											<mtbDays>300</mtbDays>
-											<canAffectAnyLivePart>true</canAffectAnyLivePart>
-										</li>
-									</hediffGivers>
-								</li>
-								<li>
-									<label>serious</label>
-									<minSeverity>0.65</minSeverity>
-									<vomitMtbDays>0.1</vomitMtbDays>
-									<capMods>
-										<li>
-											<capacity>Consciousness</capacity>
-											<offset>-0.25</offset>
-										</li>
-									</capMods>
-									<hediffGivers>
-										<li Class="HediffGiver_Random">
-											<hediff>Dementia</hediff>
-											<mtbDays>25</mtbDays>
-											<partsToAffect>
-												<li>Brain</li>
-											</partsToAffect>
-										</li>
-										<li Class="HediffGiver_Random">
-											<hediff>Carcinoma</hediff>
-											<mtbDays>60</mtbDays>
-											<canAffectAnyLivePart>true</canAffectAnyLivePart>
-										</li>
-									</hediffGivers>
-								</li>
-								<li>
-									<label>extreme</label>
-									<minSeverity>0.85</minSeverity>
-									<vomitMtbDays>0.06</vomitMtbDays>
-									<capMods>
-										<li>
-											<capacity>Consciousness</capacity>
-											<setMax>0.10</setMax>
-										</li>
-									</capMods>
-									<hediffGivers>
-										<li Class="HediffGiver_Random">
-											<hediff>Dementia</hediff>
-											<mtbDays>10</mtbDays>
-											<partsToAffect>
-												<li>Brain</li>
-											</partsToAffect>
-										</li>
-										<li Class="HediffGiver_Random">
-											<hediff>Carcinoma</hediff>
-											<mtbDays>30</mtbDays>
-											<canAffectAnyLivePart>true</canAffectAnyLivePart>
-										</li>
-									</hediffGivers>
-								</li>
-							</stages>
-						</HediffDef>
-
-						<HediffDef>
-							<defName>ME_Freeze</defName>
-							<label>Freeze</label>
-							<description>Dangerously low core body temperature. Unless re-warmed, hypothermia gets worse and ends in death. Recovery is quick once the victim is re-warmed. Avoid hypothermia by wearing warm clothes in cold environments.</description>
-							<defaultLabelColor>(0.8, 0.8, 1)</defaultLabelColor>
-							<hediffClass>HediffWithComps</hediffClass>
-							<taleOnVisible>HypothermiaRevealed</taleOnVisible>
-							<comps>
-								<li Class="HediffCompProperties_Immunizable">
-									<severityPerDayNotImmune>-0.5</severityPerDayNotImmune>
-								</li>
-							</comps>
-							<stages>
-								<li>
-									<label>shivering</label>
-									<becomeVisible>false</becomeVisible>
-								</li>
-								<li>
-									<label>shivering</label>
-									<minSeverity>0.03</minSeverity>
-									<capMods>
-										<li>
-											<capacity>Manipulation</capacity>
-											<offset>-0.1</offset>
-										</li>
-										<li>
-											<capacity>Moving</capacity>
-											<offset>-0.1</offset>
-										</li>
-										<li>
-											<capacity>Consciousness</capacity>
-											<offset>-0.01</offset>
-										</li>
-									</capMods>
-								</li>
-								<li>
-									<label>minor</label>
-									<minSeverity>0.2</minSeverity>
-									<capMods>
-										<li>
-											<capacity>Moving</capacity>
-											<offset>-0.2</offset>
-										</li>
-										<li>
-											<capacity>Manipulation</capacity>
-											<offset>-0.2</offset>
-										</li>
-										<li>
-											<capacity>Consciousness</capacity>
-											<offset>-0.05</offset>
-										</li>
-									</capMods>
-								</li>
-								<li>
-									<label>serious</label>
-									<minSeverity>0.35</minSeverity>
-									<painOffset>0.1</painOffset>
-									<capMods>
-										<li>
-											<capacity>Moving</capacity>
-											<offset>-0.35</offset>
-										</li>
-										<li>
-											<capacity>Manipulation</capacity>
-											<offset>-0.5</offset>
-										</li>
-										<li>
-											<capacity>Consciousness</capacity>
-											<offset>-0.1</offset>
-										</li>
-									</capMods>
-								</li>
-								<li>
-									<label>extreme</label>
-									<minSeverity>0.65</minSeverity>
-									<painOffset>0.15</painOffset>
-									<capMods>
-										<li>
-											<capacity>Moving</capacity>
-											<offset>-0.5</offset>
-										</li>
-										<li>
-											<capacity>Manipulation</capacity>
-											<offset>-0.66</offset>
-										</li>
-										<li>
-											<capacity>Consciousness</capacity>
-											<offset>-0.15</offset>
-										</li>
-									</capMods>
-								</li>
-								<li>
-									<label>Frozen</label>
-									<minSeverity>0.85</minSeverity>
-									<lifeThreatening>true</lifeThreatening>
-									<painOffset>0.2</painOffset>
-									<capMods>
-										<li>
-											<capacity>Moving</capacity>
-											<offset>-0.9</offset>
-										</li>
-										<li>
-											<capacity>Manipulation</capacity>
-											<offset>-0.9</offset>
-										</li>
-										<li>
-											<capacity>Consciousness</capacity>
-											<offset>-0.15</offset>
-										</li>
-									</capMods>
-								</li>
-							</stages>
-						</HediffDef>
-
-						<!-- ==================== Damage Type ========================== -->
-
-						<DamageDef ParentName="Bullet">
-							<defName>ME_BigBullet</defName>
-							<buildingDamageFactor>0.7</buildingDamageFactor>
-							<plantDamageFactor>0.7</plantDamageFactor>
-						</DamageDef>
-
-						<DamageDef ParentName="Flame">
-							<defName>ME_SickBurn</defName>
-							<label>prometheum burn</label>
-							<workerClass>DamageWorker_AddInjury</workerClass>
-							<harmAllLayersUntilOutside>false</harmAllLayersUntilOutside>
-							<minDamageToFragment>99999</minDamageToFragment>
-							<hediff>BurnSecondary</hediff>
-							<additionalHediffs>
-								<li>
-									<hediff>PrometheumSoaked</hediff>
-									<severityPerDamageDealt>0.03</severityPerDamageDealt>
-									<victimSeverityScalingByInvBodySize>true</victimSeverityScalingByInvBodySize>
-								</li>
-							</additionalHediffs>
-						</DamageDef>
-
-						<DamageDef ParentName="Bullet">
-							<defName>ME_Cryo</defName>
-							<label>Cryo shot</label>
-							<externalViolence>false</externalViolence>
-							<deathMessage>{0} has succumbed to frostbite.</deathMessage>
-							<additionalHediffs>
-								<li>
-									<hediff>ME_Freeze</hediff>
-									<severityPerDamageDealt>0.05</severityPerDamageDealt>
-									<victimSeverityScalingByInvBodySize>true</victimSeverityScalingByInvBodySize>
-								</li>
-							</additionalHediffs>
-						</DamageDef>
-
-						<DamageDef ParentName="Bullet">
-							<defName>ME_Toxin</defName>
-							<label>Toxin shot</label>
-							<externalViolence>false</externalViolence>
-							<deathMessage>{0} has succumbed to bullet poisoning.</deathMessage>
-							<additionalHediffs>
-								<li>
-									<hediff>ME_Toxic</hediff>
-									<severityPerDamageDealt>0.05</severityPerDamageDealt>
-									<victimSeverityScalingByInvBodySize>true</victimSeverityScalingByInvBodySize>
-								</li>
-							</additionalHediffs>
-						</DamageDef>
-
-						<HediffDef>
-							<defName>ME_PrometheumSoaked</defName>
-							<label>Incendiary agent</label>
-							<description>Shot by incendiary slug</description>
-							<hediffClass>HediffWithComps</hediffClass>
-							<comps>
-								<li Class="HediffCompProperties_SeverityPerDay">
-									<severityPerDay>-30</severityPerDay>
-								</li>
-								<li Class="CombatExtended.HediffCompProperties_Prometheum" />
-							</comps>
-							<stages>
-								<li>
-									<minSeverity>0.2</minSeverity>
-									<label>minor</label>
-									<statOffsets>
-										<Flammability>0.15</Flammability>
-									</statOffsets>
-								</li>
-								<li>
-									<minSeverity>0.40</minSeverity>
-									<label>dripping</label>
-									<statOffsets>
-										<Flammability>0.25</Flammability>
-									</statOffsets>
-								</li>
-								<li>
-									<minSeverity>0.6</minSeverity>
-									<label>soaked</label>
-									<statOffsets>
-										<Flammability>0.33</Flammability>
-									</statOffsets>
-								</li>
-								<li>
-									<minSeverity>0.8</minSeverity>
-									<label>drenched</label>
-									<statOffsets>
-										<Flammability>0.5</Flammability>
-									</statOffsets>
-								</li>
-							</stages>
-						</HediffDef>
-
-						<!-- ==================== Ammo Cat========================== -->
-
-						<ThingCategoryDef>
-							<defName>AmmoME</defName>
-							<label>Thermal clips</label>
-							<parent>AmmoAdvanced</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberPlasmaMedium</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Ymir</defName>
-							<label>Thermal Clip</label>
-							<ammoTypes>
-								<Ammo_ME>RE_YmirBullet</Ammo_ME>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_ME_Cannon</defName>
-							<label>Thermal Clip</label>
-							<ammoTypes>
-								<Ammo_ME>ME_Bullet_Cannon</Ammo_ME>
-								<Ammo_ME_HE>ME_Bullet_Cannon_HE</Ammo_ME_HE>
-								<Ammo_ME_FI>ME_Bullet_Cannon_FI</Ammo_ME_FI>
-								<Ammo_ME_Ion>ME_Bullet_Cannon_Ion</Ammo_ME_Ion>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_M8</defName>
-							<label>Thermal Clip</label>
-							<ammoTypes>
-								<Ammo_ME>Bullet_M8_Basic</Ammo_ME>
-								<Ammo_ME_AP>Bullet_M8_AP</Ammo_ME_AP>
-								<Ammo_ME_Cryo>Bullet_M8_Cryo</Ammo_ME_Cryo>
-								<Ammo_ME_HE>Bullet_M8_HE</Ammo_ME_HE>
-								<Ammo_ME_FI>Bullet_M8_FI</Ammo_ME_FI>
-								<Ammo_ME_Ion>Bullet_M8_Ion</Ammo_ME_Ion>
-								<Ammo_ME_Toxic>Bullet_M8_Toxic</Ammo_ME_Toxic>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_M15</defName>
-							<label>Thermal Clip</label>
-							<ammoTypes>
-								<Ammo_ME>Bullet_M15_Basic</Ammo_ME>
-								<Ammo_ME_AP>Bullet_M15_AP</Ammo_ME_AP>
-								<Ammo_ME_Cryo>Bullet_M15_Cryo</Ammo_ME_Cryo>
-								<Ammo_ME_HE>Bullet_M15_HE</Ammo_ME_HE>
-								<Ammo_ME_FI>Bullet_M15_FI</Ammo_ME_FI>
-								<Ammo_ME_Ion>Bullet_M15_Ion</Ammo_ME_Ion>
-								<Ammo_ME_Toxic>Bullet_M15_Toxic</Ammo_ME_Toxic>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Katana</defName>
-							<label>Thermal Clip</label>
-							<ammoTypes>
-								<Ammo_ME>Bullet_Katana</Ammo_ME>
-								<Ammo_ME_AP>Bullet_Katana_AP</Ammo_ME_AP>
-								<Ammo_ME_Cryo>Bullet_Katana_Cryo</Ammo_ME_Cryo>
-								<Ammo_ME_HE>Bullet_Katana_HE</Ammo_ME_HE>
-								<Ammo_ME_FI>Bullet_Katana_FI</Ammo_ME_FI>
-								<Ammo_ME_Ion>Bullet_Katana_Ion</Ammo_ME_Ion>
-								<Ammo_ME_Toxic>Bullet_Katana_Toxic</Ammo_ME_Toxic>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Hydrashotty</defName>
-							<label>Thermal Clip</label>
-							<ammoTypes>
-								<Ammo_ME>Bullet_Hydra</Ammo_ME>
-								<Ammo_ME_AP>Bullet_Hydra_AP</Ammo_ME_AP>
-								<Ammo_ME_Cryo>Bullet_Hydra_Cryo</Ammo_ME_Cryo>
-								<Ammo_ME_HE>Bullet_Hydra_HE</Ammo_ME_HE>
-								<Ammo_ME_FI>Bullet_Hydra_FI</Ammo_ME_FI>
-								<Ammo_ME_Ion>Bullet_Hydra_Ion</Ammo_ME_Ion>
-								<Ammo_ME_Toxic>Bullet_Hydra_Toxic</Ammo_ME_Toxic>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_M98</defName>
-							<label>Thermal Clip</label>
-							<ammoTypes>
-								<Ammo_ME>Bullet_M98_Basic</Ammo_ME>
-								<Ammo_ME_AP>Bullet_M98_AP</Ammo_ME_AP>
-								<Ammo_ME_Cryo>Bullet_M98_Cryo</Ammo_ME_Cryo>
-								<Ammo_ME_HE>Bullet_M98_HE</Ammo_ME_HE>
-								<Ammo_ME_FI>Bullet_M98_FI</Ammo_ME_FI>
-								<Ammo_ME_Ion>Bullet_M98_Ion</Ammo_ME_Ion>
-								<Ammo_ME_Toxic>Bullet_M98_Toxic</Ammo_ME_Toxic>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Mantis</defName>
-							<label>Thermal Clip</label>
-							<ammoTypes>
-								<Ammo_ME>Bullet_Mantis</Ammo_ME>
-								<Ammo_ME_AP>Bullet_Mantis_AP</Ammo_ME_AP>
-								<Ammo_ME_Cryo>Bullet_Mantis_Cryo</Ammo_ME_Cryo>
-								<Ammo_ME_HE>Bullet_Mantis_HE</Ammo_ME_HE>
-								<Ammo_ME_FI>Bullet_Mantis_FI</Ammo_ME_FI>
-								<Ammo_ME_Ion>Bullet_Mantis_Ion</Ammo_ME_Ion>
-								<Ammo_ME_Toxic>Bullet_Mantis_Toxic</Ammo_ME_Toxic>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Tempest</defName>
-							<label>Thermal Clip</label>
-							<ammoTypes>
-								<Ammo_ME>Bullet_Tempest</Ammo_ME>
-								<Ammo_ME_AP>Bullet_Tempest_AP</Ammo_ME_AP>
-								<Ammo_ME_Cryo>Bullet_Tempest_Cryo</Ammo_ME_Cryo>
-								<Ammo_ME_HE>Bullet_Tempest_HE</Ammo_ME_HE>
-								<Ammo_ME_FI>Bullet_Tempest_FI</Ammo_ME_FI>
-								<Ammo_ME_Ion>Bullet_Tempest_Ion</Ammo_ME_Ion>
-								<Ammo_ME_Toxic>Bullet_Tempest_Toxic</Ammo_ME_Toxic>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Predator</defName>
-							<label>Thermal Clip</label>
-							<ammoTypes>
-								<Ammo_ME>Bullet_Predator</Ammo_ME>
-								<Ammo_ME_AP>Bullet_Predator_AP</Ammo_ME_AP>
-								<Ammo_ME_Cryo>Bullet_Predator_Cryo</Ammo_ME_Cryo>
-								<Ammo_ME_HE>Bullet_Predator_HE</Ammo_ME_HE>
-								<Ammo_ME_FI>Bullet_Predator_FI</Ammo_ME_FI>
-								<Ammo_ME_Ion>Bullet_Predator_Ion</Ammo_ME_Ion>
-								<Ammo_ME_Toxic>Bullet_Predator_Toxic</Ammo_ME_Toxic>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Phalanx</defName>
-							<label>Thermal Clip</label>
-							<ammoTypes>
-								<Ammo_ME>Bullet_Phalanx</Ammo_ME>
-								<Ammo_ME_AP>Bullet_Predator_AP</Ammo_ME_AP>
-								<Ammo_ME_Cryo>Bullet_Predator_Cryo</Ammo_ME_Cryo>
-								<Ammo_ME_HE>Bullet_Predator_HE</Ammo_ME_HE>
-								<Ammo_ME_FI>Bullet_Predator_FI</Ammo_ME_FI>
-								<Ammo_ME_Ion>Bullet_Predator_Ion</Ammo_ME_Ion>
-								<Ammo_ME_Toxic>Bullet_Predator_Toxic</Ammo_ME_Toxic>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== AmmoClass========================== -->
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>ME_FMJ</defName>
-							<label>Acccelerator slug</label>
-							<labelShort>Accelerator slug</labelShort>
-							<description>Minature pellets generated from a weapon's internal ammunition block, which are first reduced to near weightlessness by a mass effect field and then propelled to lethal speed by magnetic forces.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>ME_AP</defName>
-							<label>Armor-Piercing acccelerator slug</label>
-							<labelShort>AP</labelShort>
-							<description>Features a hardened tungsten carbide penetrator core for increased armor penetration. Causes less internal tissue damage.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>ME_Cryo</defName>
-							<label>Cryo acccelerator slug</label>
-							<labelShort>Cryo</labelShort>
-							<description>Filled with cryogenic agents that freezes your enemies in place upon impact.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>ME_HE</defName>
-							<label>High Explosive acccelerator slug</label>
-							<labelShort>HE</labelShort>
-							<description>Filled with high explosive agent that detonate upon impact.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>ME_FI</defName>
-							<label>Incendiary</label>
-							<description>Filled with incendiary agent that ignites after impact.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>ME_Ion</defName>
-							<label>Disruptor</label>
-							<labelShort>Disruptor</labelShort>
-							<description>Designed to combat mechanoids and shielding, the round creates an electrical current on impact, disrupting electronic systems temporarily.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>ME_Toxic</defName>
-							<label>Toxin</label>
-							<labelShort>Toxin</labelShort>
-							<description>Designed to combat organic targets, injects the target with a painful neuratoxin upon penetration. Inflicts extreme nausea and neuro paralysis to the victim.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<!-- ==================== Ammo Type ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_ME</defName>
-							<label>Basic Thermal clip</label>
-							<description>Thermal clips designed to fit almost all mass accelerator weapons. It allows mass accelerator weapons to fire continuously without needing to slow down in order to cool. It is best not to question where the projectile itself comes from.</description>
-							<statBases>
-								<Mass>0.01</Mass>
-								<Bulk>0.01</Bulk>
-								<MarketValue>0.24</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>ME_Ammo</li>
-								<li>CE_AutoEnableTrade</li>
-								<!-- Plasma ammo can't be handloaded, and the containment cell must be precision-machined anyway -->
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoME</li>
-							</thingCategories>
-							<graphicData>
-								<texPath>ThirdParty/MassEffect/Heatsink</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>ME_FMJ</ammoClass>
-							<generateAllowChance>0.5</generateAllowChance>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_ME_AP</defName>
-							<label>AP Thermal clip</label>
-							<description>Thermal clips designed to fit almost all mass accelerator weapons. This one penetrates armour better.</description>
-							<statBases>
-								<Mass>0.015</Mass>
-								<Bulk>0.012</Bulk>
-								<MarketValue>0.35</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<!-- Plasma ammo can't be handloaded, and the containment cell must be precision-machined anyway -->
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoME</li>
-							</thingCategories>
-							<graphicData>
-								<texPath>ThirdParty/MassEffect/ME_AP</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>ME_AP</ammoClass>
-							<generateAllowChance>0.33</generateAllowChance>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_ME_Cryo</defName>
-							<label>Cryo Thermal clip</label>
-							<description>Thermal clips designed to fit almost all mass accelerator weapons. This one makes your enemy slow and cumberson.</description>
-							<statBases>
-								<Mass>0.01</Mass>
-								<Bulk>0.01</Bulk>
-								<MarketValue>0.5</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>ME_Ammo</li>
-								<li>CE_AutoEnableTrade</li>
-								<!-- Plasma ammo can't be handloaded, and the containment cell must be precision-machined anyway -->
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoME</li>
-							</thingCategories>
-							<graphicData>
-								<texPath>ThirdParty/MassEffect/ME_Cryo</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>ME_Cryo</ammoClass>
-							<generateAllowChance>0.15</generateAllowChance>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_ME_HE</defName>
-							<label>HE Thermal clip</label>
-							<description>Thermal clips designed to fit almost all mass accelerator weapons.</description>
-							<statBases>
-								<Mass>0.01</Mass>
-								<Bulk>0.01</Bulk>
-								<MarketValue>0.64</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>ME_Ammo</li>
-								<li>CE_AutoEnableTrade</li>
-								<!-- Plasma ammo can't be handloaded, and the containment cell must be precision-machined anyway -->
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoME</li>
-							</thingCategories>
-							<graphicData>
-								<texPath>ThirdParty/MassEffect/ME_HE</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>ME_HE</ammoClass>
-							<generateAllowChance>0.125</generateAllowChance>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_ME_FI</defName>
-							<label>incendiary Thermal clip</label>
-							<description>Thermal clips designed to fit almost all mass accelerator weapons. Set enemy on fire.</description>
-							<statBases>
-								<Mass>0.01</Mass>
-								<Bulk>0.01</Bulk>
-								<MarketValue>0.6</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>ME_Ammo</li>
-								<li>CE_AutoEnableTrade</li>
-								<!-- Plasma ammo can't be handloaded, and the containment cell must be precision-machined anyway -->
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoME</li>
-							</thingCategories>
-							<graphicData>
-								<texPath>ThirdParty/MassEffect/ME_FI</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>ME_FI</ammoClass>
-							<generateAllowChance>0.15</generateAllowChance>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_ME_Ion</defName>
-							<label>Disruptor Thermal clip</label>
-							<description>Thermal clips designed to fit almost all mass accelerator weapons. This one makes your enemy combust.</description>
-							<statBases>
-								<Mass>0.01</Mass>
-								<Bulk>0.01</Bulk>
-								<MarketValue>0.6</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>ME_Ammo</li>
-								<li>CE_AutoEnableTrade</li>
-								<!-- Plasma ammo can't be handloaded, and the containment cell must be precision-machined anyway -->
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoME</li>
-							</thingCategories>
-							<graphicData>
-								<texPath>ThirdParty/MassEffect/ME_EMP</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>ME_Ion</ammoClass>
-							<generateAllowChance>0.1</generateAllowChance>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_ME_Toxic</defName>
-							<label>Toxin Thermal clip</label>
-							<description>Thermal clips designed to fit almost all mass accelerator weapons.</description>
-							<statBases>
-								<Mass>0.01</Mass>
-								<Bulk>0.01</Bulk>
-								<MarketValue>0.5</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>ME_Ammo</li>
-								<li>CE_AutoEnableTrade</li>
-								<!-- Plasma ammo can't be handloaded, and the containment cell must be precision-machined anyway -->
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoME</li>
-							</thingCategories>
-							<graphicData>
-								<texPath>ThirdParty/MassEffect/ME_Toxic</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>ME_Toxic</ammoClass>
-							<generateAllowChance>0.15</generateAllowChance>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-						<!-- ================== Fragments ================== -->
-
-						<ThingDef ParentName="BaseFragment">
-							<defName>Fragment_ME</defName>
-							<label>small fragments</label>
-							<graphicData>
-								<texPath>Things/Projectile/Fragments/Fragment_Small</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Fragment</damageDef>
-								<damageAmountBase>8</damageAmountBase>
-								<speed>56</speed>
-								<armorPenetrationSharp>7</armorPenetrationSharp>
-								<armorPenetrationBlunt>18</armorPenetrationBlunt>
-								<gravityFactor>15</gravityFactor>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== ML77 ================== -->
-						<ThingDef ParentName="BaseRPG7Grenade">
-							<defName>VFE_Bullet_ML77CE</defName>
-							<label>ML77 Missile</label>
-							<graphicData>
-								<texPath>Things/Projectile/Rocket/M72LAW</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>88</speed>
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>200</damageAmountBase>
-								<armorPenetrationSharp>300</armorPenetrationSharp>
-								<armorPenetrationBlunt>31.584</armorPenetrationBlunt>
-								<soundAmbient>RocketPropelledLoop_Small</soundAmbient>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>200</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>2</explosiveRadius>
-									<explosionSound>MortarBomb_Explode</explosionSound>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Large>7</Fragment_Large>
-										<Fragment_Small>20</Fragment_Small>
-										<Fragment_ME>20</Fragment_ME>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-						<!-- ================== Ymir Mech ================== -->
-						<ThingDef ParentName="Base6x24mmChargedBullet">
-							<defName>RE_YmirBullet</defName>
-							<thingClass>CombatExtended.BulletCE</thingClass>
-							<label>Mass accelerator cannon</label>
-							<graphicData>
-								<texPath>Things/Projectile/Shot_MassAccelerated_Large</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<flyOverhead>false</flyOverhead>
-								<speed>368</speed>
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>43</damageAmountBase>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-								<armorPenetrationBlunt>348</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== Heavy CANNON ================== -->
-
-						<ThingDef ParentName="BaseRPG7Grenade">
-							<defName>ME_Bullet_Cannon</defName>
-							<label>Cannon Slug</label>
-							<graphicData>
-								<texPath>Things/Projectile/Shot_MassAcceleratorTurret_Heavy</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>400</speed>
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>100</damageAmountBase>
-								<armorPenetrationSharp>100</armorPenetrationSharp>
-								<armorPenetrationBlunt>800.584</armorPenetrationBlunt>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>36</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>0.9</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_ME>6</Fragment_ME>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseRPG7Grenade">
-							<defName>ME_Bullet_Cannon_FI</defName>
-							<label>Cannon Slug</label>
-							<graphicData>
-								<texPath>Things/Projectile/Shot_MassAcceleratorTurret_Heavy</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>400</speed>
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>100</damageAmountBase>
-								<armorPenetrationSharp>100</armorPenetrationSharp>
-								<armorPenetrationBlunt>800.584</armorPenetrationBlunt>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>36</damageAmountBase>
-									<explosiveDamageType>Flame</explosiveDamageType>
-									<explosiveRadius>1.1</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_ME>6</Fragment_ME>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseRPG7Grenade">
-							<defName>ME_Bullet_Cannon_HE</defName>
-							<label>HE Cannon Slug</label>
-							<graphicData>
-								<texPath>Things/Projectile/Shot_MassAcceleratorTurret_Heavy</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>400</speed>
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>100</damageAmountBase>
-								<armorPenetrationSharp>100</armorPenetrationSharp>
-								<armorPenetrationBlunt>800.584</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>36</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>58</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>1.5</explosiveRadius>
-									<explosionSound>MortarBomb_Explode</explosionSound>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_ME>12</Fragment_ME>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseRPG7Grenade">
-							<defName>ME_Bullet_Cannon_Ion</defName>
-							<label>Disruptor Cannon Slug</label>
-							<graphicData>
-								<texPath>Things/Projectile/Shot_MassAcceleratorTurret_Heavy</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>400</speed>
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>100</damageAmountBase>
-								<armorPenetrationSharp>100</armorPenetrationSharp>
-								<armorPenetrationBlunt>800.584</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>35</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>36</damageAmountBase>
-									<explosiveDamageType>EMP</explosiveDamageType>
-									<explosiveRadius>2</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_ME>6</Fragment_ME>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<!-- ================== Projectiles M8================== -->
-
-						<ThingDef Name="BaseM8Bullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Shot_MassAccelerated_Large</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>400</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseM8Bullet">
-							<defName>Bullet_M8_Basic</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>15</damageAmountBase>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-								<armorPenetrationBlunt>48</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseM8Bullet">
-							<defName>Bullet_M8_AP</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>10</damageAmountBase>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-								<armorPenetrationBlunt>48</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseM8Bullet">
-							<defName>Bullet_M8_HE</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>15</damageAmountBase>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-								<armorPenetrationBlunt>48</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>7</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseM8Bullet">
-							<defName>Bullet_M8_FI</defName>
-							<label>accelerated incendiary shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>15</damageAmountBase>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-								<armorPenetrationBlunt>48</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_SickBurn</def>
-										<amount>3</amount>
-									</li>
-									<li>
-										<def>Flame</def>
-										<amount>1</amount>
-										<chance>0.3</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseM8Bullet">
-							<defName>Bullet_M8_Cryo</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>14</damageAmountBase>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-								<armorPenetrationBlunt>48</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Cryo</def>
-										<amount>4</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseM8Bullet">
-							<defName>Bullet_M8_Toxic</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>15</damageAmountBase>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-								<armorPenetrationBlunt>48</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Toxin</def>
-										<amount>4</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseM8Bullet">
-							<defName>Bullet_M8_Ion</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>11</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>5</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<armorPenetrationBlunt>40</armorPenetrationBlunt>
-								<empShieldBreakChance>0.25</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== 
- ================== -->
-
-						<ThingDef Name="BaseM15Bullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Shot_MassAccelerated_Large</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>400</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseM15Bullet">
-							<defName>Bullet_M15_Basic</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>21</damageAmountBase>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<armorPenetrationBlunt>64</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseM15Bullet">
-							<defName>Bullet_M15_AP</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>15</damageAmountBase>
-								<armorPenetrationSharp>36</armorPenetrationSharp>
-								<armorPenetrationBlunt>64</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseM15Bullet">
-							<defName>Bullet_M15_HE</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>21</damageAmountBase>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<armorPenetrationBlunt>64</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>10</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseM15Bullet">
-							<defName>Bullet_M15_Cryo</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<armorPenetrationBlunt>64</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Cryo</def>
-										<amount>5</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseM15Bullet">
-							<defName>Bullet_M15_Toxic</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<armorPenetrationBlunt>64</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Toxin</def>
-										<amount>5</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseM15Bullet">
-							<defName>Bullet_M15_Ion</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>14</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>8</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>21</armorPenetrationSharp>
-								<armorPenetrationBlunt>64</armorPenetrationBlunt>
-								<empShieldBreakChance>0.33</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseM15Bullet">
-							<defName>Bullet_M15_FI</defName>
-							<label>accelerated incendiary shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<armorPenetrationBlunt>64</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_SickBurn</def>
-										<amount>3</amount>
-									</li>
-									<li>
-										<def>Flame</def>
-										<amount>1</amount>
-										<chance>0.33</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== Katana ================== -->
-
-						<ThingDef Name="BaseKatanaBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Shot_MassAccelerated_Small</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-								<drawSize>0.75</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>200</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseKatanaBullet">
-							<defName>Bullet_Katana</defName>
-							<label>accelerated blast</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>11</damageAmountBase>
-								<armorPenetrationSharp>11</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<pelletCount>8</pelletCount>
-								<spreadMult>15.8</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseKatanaBullet">
-							<defName>Bullet_Katana_AP</defName>
-							<label>accelerated blast</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>7</damageAmountBase>
-								<armorPenetrationSharp>22</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<pelletCount>8</pelletCount>
-								<spreadMult>15.8</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseKatanaBullet">
-							<defName>Bullet_Katana_HE</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>11</damageAmountBase>
-								<armorPenetrationSharp>11</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>5</amount>
-									</li>
-								</secondaryDamage>
-								<pelletCount>8</pelletCount>
-								<spreadMult>15.8</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseKatanaBullet">
-							<defName>Bullet_Katana_Ion</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>8</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>3</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>13</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<pelletCount>8</pelletCount>
-								<spreadMult>15.8</spreadMult>
-								<empShieldBreakChance>0.1</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseKatanaBullet">
-							<defName>Bullet_Katana_Cryo</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>10</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>ME_Cryo</def>
-										<amount>3</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>11</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<pelletCount>8</pelletCount>
-								<spreadMult>15.8</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseKatanaBullet">
-							<defName>Bullet_Katana_Toxic</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>10</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>ME_Toxin</def>
-										<amount>3</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>11</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<pelletCount>8</pelletCount>
-								<spreadMult>15.8</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseKatanaBullet">
-							<defName>Bullet_Katana_FI</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>11</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>ME_SickBurn</def>
-										<amount>1</amount>
-									</li>
-									<li>
-										<def>Flame</def>
-										<amount>1</amount>
-										<chance>0.08</chance>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>11</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<pelletCount>8</pelletCount>
-								<spreadMult>15.8</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== Hydra ================== -->
-
-						<ThingDef ParentName="BaseKatanaBullet">
-							<defName>Bullet_Hydra</defName>
-							<label>accelerated blast</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>9</damageAmountBase>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>24</armorPenetrationBlunt>
-								<pelletCount>8</pelletCount>
-								<spreadMult>16.8</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseKatanaBullet">
-							<defName>Bullet_Hydra_AP</defName>
-							<label>accelerated blast</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>6</damageAmountBase>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<armorPenetrationBlunt>24</armorPenetrationBlunt>
-								<pelletCount>8</pelletCount>
-								<spreadMult>16.8</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseKatanaBullet">
-							<defName>Bullet_Hydra_HE</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>9</damageAmountBase>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>24</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>4</amount>
-									</li>
-								</secondaryDamage>
-								<pelletCount>8</pelletCount>
-								<spreadMult>16.8</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseKatanaBullet">
-							<defName>Bullet_Hydra_Cryo</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>8</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>ME_Cryo</def>
-										<amount>3</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>24</armorPenetrationBlunt>
-								<pelletCount>8</pelletCount>
-								<spreadMult>16.8</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseKatanaBullet">
-							<defName>Bullet_Hydra_Toxic</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>8</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>ME_Toxin</def>
-										<amount>3</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>24</armorPenetrationBlunt>
-								<pelletCount>8</pelletCount>
-								<spreadMult>16.8</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseKatanaBullet">
-							<defName>Bullet_Hydra_FI</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>9</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>ME_SickBurn</def>
-										<amount>1</amount>
-									</li>
-									<li>
-										<def>Flame</def>
-										<amount>1</amount>
-										<chance>0.075</chance>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>24</armorPenetrationBlunt>
-								<pelletCount>8</pelletCount>
-								<spreadMult>16.8</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseKatanaBullet">
-							<defName>Bullet_Hydra_Ion</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>6</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>3</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<armorPenetrationBlunt>24</armorPenetrationBlunt>
-								<pelletCount>8</pelletCount>
-								<spreadMult>16.8</spreadMult>
-								<empShieldBreakChance>0.08</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== M98 ================== -->
-						<ThingDef Name="BaseM98Bullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Shot_MassAccelerated_Sniper</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>1.6</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>ME_BigBullet</damageDef>
-								<speed>500</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseM98Bullet">
-							<defName>Bullet_M98_Basic</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>74</damageAmountBase>
-								<armorPenetrationSharp>48</armorPenetrationSharp>
-								<armorPenetrationBlunt>600</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseM98Bullet">
-							<defName>Bullet_M98_AP</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>49</damageAmountBase>
-								<armorPenetrationSharp>96</armorPenetrationSharp>
-								<armorPenetrationBlunt>600</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseM98Bullet">
-							<defName>Bullet_M98_HE</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>74</damageAmountBase>
-								<armorPenetrationSharp>48</armorPenetrationSharp>
-								<armorPenetrationBlunt>600</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>26</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>26</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>0.9</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseM98Bullet">
-							<defName>Bullet_M98_Cryo</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>70</damageAmountBase>
-								<armorPenetrationSharp>48</armorPenetrationSharp>
-								<armorPenetrationBlunt>600</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Cryo</def>
-										<amount>20</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseM98Bullet">
-							<defName>Bullet_M98_Toxic</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>70</damageAmountBase>
-								<armorPenetrationSharp>48</armorPenetrationSharp>
-								<armorPenetrationBlunt>600</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Toxin</def>
-										<amount>20</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseM98Bullet">
-							<defName>Bullet_M98_FI</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>72</damageAmountBase>
-								<armorPenetrationSharp>48</armorPenetrationSharp>
-								<armorPenetrationBlunt>600</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_SickBurn</def>
-										<amount>11</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>6</damageAmountBase>
-									<explosiveDamageType>Flame</explosiveDamageType>
-									<explosiveRadius>0.9</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseM98Bullet">
-							<defName>Bullet_M98_Ion</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>46</damageAmountBase>
-								<armorPenetrationSharp>55</armorPenetrationSharp>
-								<armorPenetrationBlunt>600</armorPenetrationBlunt>
-								<empShieldBreakChance>1</empShieldBreakChance>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>32</damageAmountBase>
-									<explosiveDamageType>EMP</explosiveDamageType>
-									<explosiveRadius>0.9</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<!-- ================== Mantis ================== -->
-
-						<ThingDef Name="BaseMantisBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Shot_MassAccelerated_Sniper</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>1.1</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>500</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseMantisBullet">
-							<defName>Bullet_Mantis</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>40</damageAmountBase>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-								<armorPenetrationBlunt>200</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseMantisBullet">
-							<defName>Bullet_Mantis_AP</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>27</damageAmountBase>
-								<armorPenetrationSharp>60</armorPenetrationSharp>
-								<armorPenetrationBlunt>200</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseMantisBullet">
-							<defName>Bullet_Mantis_Cryo</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>38</damageAmountBase>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-								<armorPenetrationBlunt>200</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Cryo</def>
-										<amount>9</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseMantisBullet">
-							<defName>Bullet_Mantis_HE</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>40</damageAmountBase>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-								<armorPenetrationBlunt>200</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>20</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseMantisBullet">
-							<defName>Bullet_Mantis_Toxic</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>38</damageAmountBase>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-								<armorPenetrationBlunt>200</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Toxin</def>
-										<amount>9</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseMantisBullet">
-							<defName>Bullet_Mantis_FI</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>40</damageAmountBase>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-								<armorPenetrationBlunt>200</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_SickBurn</def>
-										<amount>7</amount>
-									</li>
-									<li>
-										<def>Flame</def>
-										<amount>1</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseMantisBullet">
-							<defName>Bullet_Mantis_Ion</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>30</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>11</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>34</armorPenetrationSharp>
-								<armorPenetrationBlunt>200</armorPenetrationBlunt>
-								<empShieldBreakChance>1</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== Tempest ================== -->
-
-						<ThingDef Name="BaseTempestBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Shot_MassAccelerated_Small</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-								<drawSize>1.1</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>200</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseTempestBullet">
-							<defName>Bullet_Tempest</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseTempestBullet">
-							<defName>Bullet_Tempest_AP</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>8</damageAmountBase>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseTempestBullet">
-							<defName>Bullet_Tempest_HE</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>6</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseTempestBullet">
-							<defName>Bullet_Tempest_Cryo</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Cryo</def>
-										<amount>3</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseTempestBullet">
-							<defName>Bullet_Tempest_Toxic</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Toxin</def>
-										<amount>3</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseTempestBullet">
-							<defName>Bullet_Tempest_FI</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_SickBurn</def>
-										<amount>2</amount>
-									</li>
-									<li>
-										<def>Flame</def>
-										<amount>1</amount>
-										<chance>0.25</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseTempestBullet">
-							<defName>Bullet_Tempest_Ion</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>8</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>4</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>11</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<empShieldBreakChance>0.25</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== Predator ================== -->
-
-						<ThingDef Name="BasePredatorBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Shot_MassAccelerated_Small</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-								<drawSize>1.2</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>188</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BasePredatorBullet">
-							<defName>Bullet_Predator</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>14</damageAmountBase>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<armorPenetrationBlunt>27</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BasePredatorBullet">
-							<defName>Bullet_Predator_AP</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>100</speed>
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>9</damageAmountBase>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<armorPenetrationBlunt>27</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BasePredatorBullet">
-							<defName>Bullet_Predator_HE</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>14</damageAmountBase>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<armorPenetrationBlunt>27</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>7</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BasePredatorBullet">
-							<defName>Bullet_Predator_Cryo</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>13</damageAmountBase>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<armorPenetrationBlunt>27</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Cryo</def>
-										<amount>4</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BasePredatorBullet">
-							<defName>Bullet_Predator_Toxic</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>13</damageAmountBase>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<armorPenetrationBlunt>27</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Toxin</def>
-										<amount>4</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BasePredatorBullet">
-							<defName>Bullet_Predator_FI</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>14</damageAmountBase>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<armorPenetrationBlunt>27</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_SickBurn</def>
-										<amount>3</amount>
-									</li>
-									<li>
-										<def>Flame</def>
-										<amount>1</amount>
-										<chance>0.25</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BasePredatorBullet">
-							<defName>Bullet_Predator_Ion</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>9</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>5</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>11</armorPenetrationSharp>
-								<armorPenetrationBlunt>27</armorPenetrationBlunt>
-								<empShieldBreakChance>0.25</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== Phalanx ================== -->
-
-						<ThingDef Name="BasePhalanxBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Shot_MassAccelerated_Small</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-								<drawSize>1.3</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>200</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BasePhalanxBullet">
-							<defName>Bullet_Phalanx</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>18</damageAmountBase>
-								<armorPenetrationSharp>11</armorPenetrationSharp>
-								<armorPenetrationBlunt>38</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BasePhalanxBullet">
-							<defName>Bullet_Phalanx_AP</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationSharp>22</armorPenetrationSharp>
-								<armorPenetrationBlunt>38</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BasePhalanxBullet">
-							<defName>Bullet_Phalanx_HE</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>18</damageAmountBase>
-								<armorPenetrationSharp>11</armorPenetrationSharp>
-								<armorPenetrationBlunt>38</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>9</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BasePhalanxBullet">
-							<defName>Bullet_Phalanx_Cryo</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>17</damageAmountBase>
-								<armorPenetrationSharp>11</armorPenetrationSharp>
-								<armorPenetrationBlunt>38</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Cryo</def>
-										<amount>5</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BasePhalanxBullet">
-							<defName>Bullet_Phalanx_Toxic</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>17</damageAmountBase>
-								<armorPenetrationSharp>11</armorPenetrationSharp>
-								<armorPenetrationBlunt>38</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Toxin</def>
-										<amount>5</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BasePhalanxBullet">
-							<defName>Bullet_Phalanx_FI</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>18</damageAmountBase>
-								<armorPenetrationSharp>11</armorPenetrationSharp>
-								<armorPenetrationBlunt>38</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_SickBurn</def>
-										<amount>3</amount>
-									</li>
-									<li>
-										<def>Flame</def>
-										<amount>1</amount>
-										<chance>0.3</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BasePhalanxBullet">
-							<defName>Bullet_Phalanx_Ion</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>6</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<armorPenetrationBlunt>38</armorPenetrationBlunt>
-								<empShieldBreakChance>0.3</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Core/ME_Trader.xml b/Patches/Rim-Effect Core/ME_Trader.xml
deleted file mode 100644
index 3f3f74c4f7..0000000000
--- a/Patches/Rim-Effect Core/ME_Trader.xml	
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==========  ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="RE_Base_Alliance_Standard"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>FSX</thingDef>
-							<countRange>
-								<min>25</min>
-								<max>90</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>Prometheum</thingDef>
-							<countRange>
-								<min>25</min>
-								<max>90</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>ME_Ammo</tradeTag>
-							<countRange>
-								<min>500</min>
-								<max>1800</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>2</min>
-								<max>4</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_MediumAmmo</tradeTag>
-							<countRange>
-								<min>20</min>
-								<max>80</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>4</min>
-								<max>7</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_HeavyAmmo</tradeTag>
-							<countRange>
-								<min>5</min>
-								<max>20</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>4</min>
-								<max>6</max>
-							</thingDefCountRange>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="RE_Caravan_Alliance_CombatSupplier"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>FSX</thingDef>
-							<countRange>
-								<min>12</min>
-								<max>36</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>Prometheum</thingDef>
-							<countRange>
-								<min>12</min>
-								<max>36</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>ME_Ammo</tradeTag>
-							<countRange>
-								<min>300</min>
-								<max>1200</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>2</min>
-								<max>4</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_MediumAmmo</tradeTag>
-							<countRange>
-								<min>20</min>
-								<max>60</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>3</min>
-								<max>6</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_HeavyAmmo</tradeTag>
-							<countRange>
-								<min>5</min>
-								<max>20</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>3</max>
-							</thingDefCountRange>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="RE_Caravan_Alliance_Exotic" or
-						defName="RE_Caravan_Alliance_BulkGoods"]/stockGenerators </xpath>
-					<value>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>FSX</thingDef>
-							<countRange>
-								<min>15</min>
-								<max>45</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>Prometheum</thingDef>
-							<countRange>
-								<min>15</min>
-								<max>45</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>ME_Ammo</tradeTag>
-							<countRange>
-								<min>120</min>
-								<max>400</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>1</min>
-								<max>3</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_MediumAmmo</tradeTag>
-							<countRange>
-								<min>10</min>
-								<max>20</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>2</min>
-								<max>5</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_HeavyAmmo</tradeTag>
-							<countRange>
-								<min>1</min>
-								<max>5</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>-1</min>
-								<max>3</max>
-							</thingDefCountRange>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="RE_Visitor_Alliance_Standard"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>ME_Ammo</tradeTag>
-							<countRange>
-								<min>10</min>
-								<max>60</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>-1</min>
-								<max>1</max>
-							</thingDefCountRange>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Core/Mech_Weapons.xml b/Patches/Rim-Effect Core/Mech_Weapons.xml
deleted file mode 100644
index 55ceeca679..0000000000
--- a/Patches/Rim-Effect Core/Mech_Weapons.xml	
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Core</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Make the YMIR usable -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RE_Gun_MechHeavyMassAccelerator"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>3</cooldownTime>
-								<armorPenetrationBlunt>148</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>43</power>
-								<cooldownTime>2.88</cooldownTime>
-								<armorPenetrationBlunt>100</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>38</power>
-								<cooldownTime>2.48</cooldownTime>
-								<armorPenetrationBlunt>90</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RE_YMIRMassAccelerator</defName>
-					<statBases>
-						<Mass>20.00</Mass>
-						<RangedWeapon_Cooldown>0.65</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>1.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.33</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>RE_YmirBullet</defaultProjectile>
-						<warmupTime>1.4</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<burstShotCount>16</burstShotCount>
-						<minRange>1.5</minRange>
-						<soundCast>RE_Shot_YMIRCannon</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>5</reloadTime>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>8</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Core/Mechpawn_ME.xml b/Patches/Rim-Effect Core/Mechpawn_ME.xml
deleted file mode 100644
index b36ca875ee..0000000000
--- a/Patches/Rim-Effect Core/Mechpawn_ME.xml	
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Core</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RE_Mechanoids_FENRIS" ]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RE_Mechanoids_LOKI" ]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RE_Mechanoids_YMIR" ]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Vehicle</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Mechanoids_YMIR"]/race/baseBodySize</xpath>
-					<value>
-						<baseBodySize>2</baseBodySize>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Mechanoids_FENRIS"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1.0</ShootingAccuracyPawn>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>0.28</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Mechanoids_LOKI"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1.0</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						<MeleeCritChance>0.21</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Mechanoids_YMIR"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1.1</AimingAccuracy>
-						<ShootingAccuracyPawn>1.1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.8</MeleeCritChance>
-						<MeleeParryChance>0.5</MeleeParryChance>
-						<CarryWeight>400</CarryWeight>
-						<CarryBulk>1000</CarryBulk>
-						<MaxHitPoints>500</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Mechanoids_LOKI"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>13</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Mechanoids_LOKI"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>9</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Mechanoids_FENRIS"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Mechanoids_FENRIS"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Mechanoids_YMIR"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>75</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Mechanoids_YMIR"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>22</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Mechanoids_FENRIS"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<extraMeleeDamages>
-									<li>
-										<def>Taser</def>
-										<amount>4</amount>
-									</li>
-								</extraMeleeDamages>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Mechanoids_LOKI"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Mechanoids_YMIR"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>43</power>
-								<cooldownTime>2.68</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>124.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Mechs-->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RE_Mechanoids_FENRIS"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!--Fireworm-->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RE_Mechanoids_LOKI"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>4</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!--Goliath-->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RE_Mechanoids_YMIR"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>8</min>
-								<max>10</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Core/Scenarios_ME.xml b/Patches/Rim-Effect Core/Scenarios_ME.xml
deleted file mode 100644
index f4b1c8cdf6..0000000000
--- a/Patches/Rim-Effect Core/Scenarios_ME.xml	
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Core</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Add ammo to scenario === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="RE_AllianceColony"]/scenario/parts</xpath>
-
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_ME</thingDef>
-							<count>500</count>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Core/Turrets_and_Misc_ME.xml b/Patches/Rim-Effect Core/Turrets_and_Misc_ME.xml
deleted file mode 100644
index 6cc8b1aa61..0000000000
--- a/Patches/Rim-Effect Core/Turrets_and_Misc_ME.xml	
+++ /dev/null
@@ -1,280 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Core</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Remove refuelable property -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName = "RE_Turret_MassAccelerator" or
-						defName = "RE_Turret_HeavyMassAccelerator"]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
-				</li>
-
-				<!-- Replace vanilla thingClass -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "RE_Turret_MassAccelerator"]/thingClass </xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "RE_Turret_HeavyMassAccelerator"]</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<!-- Make turrets taller -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "RE_Turret_MassAccelerator"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "RE_Turret_HeavyMassAccelerator"]</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName = "RE_Turret_MassAccelerator" or
-						defName = "RE_Turret_HeavyMassAccelerator"
-						]/statBases </xpath>
-					<value>
-						<AimingAccuracy>0.25</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "RE_Turret_MassAccelerator" or
-						defName = "RE_Turret_HeavyMassAccelerator"
-						]/statBases/ShootingAccuracyTurret </xpath>
-					<value>
-						<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "RE_Turret_MassAccelerator" or
-						defName = "RE_Turret_HeavyMassAccelerator"
-						]/building/turretBurstCooldownTime </xpath>
-					<value>
-						<turretBurstCooldownTime>1.1</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "RE_Turret_MassAccelerator"]/comps/li[@Class="CompProperties_Power"]</xpath>
-					<value>
-						<li Class="CompProperties_Power">
-							<compClass>CompPowerTrader</compClass>
-							<basePowerConsumption>200</basePowerConsumption>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "RE_Turret_HeavyMassAccelerator"]/comps/li[@Class="CompProperties_Power"]</xpath>
-					<value>
-						<li Class="CompProperties_Power">
-							<compClass>CompPowerTrader</compClass>
-							<basePowerConsumption>800</basePowerConsumption>
-						</li>
-					</value>
-				</li>
-				<!-- Make the Turret usable -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RE_Gun_MassAccelerator</defName>
-					<statBases>
-						<Mass>10.00</Mass>
-						<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.1</SwayFactor>
-						<Bulk>1.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.27</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_M8_Basic</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>50</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<minRange>1.5</minRange>
-						<soundCast>RE_Shot_Turret</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_M8</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!-- Make the Cannon usable -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RE_Gun_HeavyMassAcceleratorTurret</defName>
-					<statBases>
-						<Mass>50.00</Mass>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.36</SwayFactor>
-						<Bulk>1.00</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>ME_Bullet_Cannon</defaultProjectile>
-						<recoilAmount>1.48</recoilAmount>
-						<warmupTime>2</warmupTime>
-						<range>78</range>
-						<minRange>5.9</minRange>
-						<ammoConsumedPerShotCount>10</ammoConsumedPerShotCount>
-						<ticksBetweenBurstShots>30</ticksBetweenBurstShots>
-						<burstShotCount>3</burstShotCount>
-						<soundCast>RE_Shot_HeavyTurret</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>400</magazineSize>
-						<reloadTime>6.0</reloadTime>
-						<ammoSet>AmmoSet_ME_Cannon</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_PrefabBarricade"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.64</fillPercent>
-					</value>
-				</li>
-
-				<!-- Remove ammobelts -->
-				<!--    			<li Class="PatchOperationRemove">
-				<xpath>Defs/ThingDef[defName="RE_AmmoCryoBelt"]</xpath>
-			</li>
-    			<li Class="PatchOperationRemove">
-				<xpath>Defs/ThingDef[defName="RE_AmmoDisruptorBelt"]</xpath>
-			</li>
-    			<li Class="PatchOperationRemove">
-				<xpath>Defs/ThingDef[defName="RE_AmmoExplosiveBelt"]</xpath>
-			</li>
-    			<li Class="PatchOperationRemove">
-				<xpath>Defs/ThingDef[defName="RE_AmmoIncendiaryBelt"]</xpath>
-			</li>
-    			<li Class="PatchOperationRemove">
-				<xpath>Defs/ThingDef[defName="RE_AmmoToxicBelt"]</xpath>
-			</li>
--->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="RE_AmmoBelts"]/recipeMaker</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="RE_AmmoBelts"]/tradeTags</xpath>
-				</li>
-
-				<!-- Implant Hediffs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="RE_AdrenalineModule"]/stages/li[1]</xpath>
-					<value>
-						<statOffsets>
-							<Suppressability>-0.15</Suppressability>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/HediffDef[defName="RE_TargetingVI"]/hediffClass</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="RE_TargetingVI"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<statOffsets>
-									<AimingDelayFactor>-0.08</AimingDelayFactor>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_TargetingVI"]/description</xpath>
-					<value>
-						<description>A small capsule with a VI system, increasing the combat abilities of the user. Decreases the aiming time of the user.</description>
-					</value>
-				</li>
-
-				<!--		<li Class="PatchOperationAdd">
-		<xpath>Defs/HediffDef[defName="RE_OmniToolHediff"]</xpath>
-		<value>
-    		<comps>
-      		<li Class="HediffCompProperties_VerbGiver">
-			<tools>
-				<li Class="CombatExtended.ToolCE">
-					<label>Stab</label>
-					<capacities>
-						<li>Stab</li>
-					</capacities>
-					<power>23</power>
-					<cooldownTime>1.33</cooldownTime>
-					<armorPenetrationSharp>30</armorPenetrationSharp>
-					<armorPenetrationBlunt>1</armorPenetrationBlunt>
-					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-				</li>
-				<li Class="CombatExtended.ToolCE">
-					<label>Cut</label>
-					<capacities>
-						<li>Cut</li>
-					</capacities>
-					<power>28</power>
-					<cooldownTime>1.45</cooldownTime>
-					<armorPenetrationSharp>15</armorPenetrationSharp>
-					<armorPenetrationBlunt>2</armorPenetrationBlunt>
-					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-				</li>
-			</tools>
-      		</li>
-    		</comps>
-		</value>
-	</li>
--->
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Core/Weapons_MEcore.xml b/Patches/Rim-Effect Core/Weapons_MEcore.xml
deleted file mode 100644
index 4c5e641114..0000000000
--- a/Patches/Rim-Effect Core/Weapons_MEcore.xml	
+++ /dev/null
@@ -1,674 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Melee Tools ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Gun_AlliancePistol" or defName="RE_Gun_AllianceSMG" or defName="RE_Gun_AllianceHandcannon"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Gun_AllianceAssaultRifle" or defName="RE_Gun_AllianceBattleRifle" or defName="RE_Gun_AllianceShotgun"
-						or defName="RE_Gun_AllianceSniperRifle" or defName="RE_Gun_AllianceAntimaterielRifle" or defName="RE_Gun_AllianceRocketLauncher" or defName="RE_Gun_AllianceChainShotgun"]/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>
-				</li>
-
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='RE_Gun_AlliancePistol']/recipeMaker/skillRequirements</xpath>
-					<value>
-						<skillRequirements>
-							<Crafting>5</Crafting>
-						</skillRequirements>
-					</value>
-				</li>
-
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='RE_Gun_AllianceShotgun' or defName='RE_Gun_AllianceSMG' or defName='RE_Gun_AllianceHandcannon']/recipeMaker/skillRequirements</xpath>
-					<value>
-						<skillRequirements>
-							<Crafting>6</Crafting>
-						</skillRequirements>
-					</value>
-				</li>
-
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='RE_Gun_AllianceSniperRifle'or defName='RE_Gun_AllianceRocketLauncher' or defName='RE_Gun_AllianceAssaultRifle']/recipeMaker/skillRequirements</xpath>
-					<value>
-						<skillRequirements>
-							<Crafting>7</Crafting>
-						</skillRequirements>
-					</value>
-				</li>
-
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='RE_Gun_AllianceAntimaterielRifle' or defName='RE_Gun_AllianceBattleRifle']/recipeMaker/skillRequirements</xpath>
-					<value>
-						<skillRequirements>
-							<Crafting>8</Crafting>
-						</skillRequirements>
-					</value>
-				</li>
-
-				<!-- ========== M8 Avenger ========== -->
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>RE_Gun_AllianceAssaultRifle</defName>
-					<statBases>
-						<WorkToMake>34000</WorkToMake>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.3</SwayFactor>
-						<Bulk>8</Bulk>
-						<Mass>3.3</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_M8_Basic</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RE_Shot_Avenger</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-						<recoilAmount>1.36</recoilAmount>
-					</Properties>
-					<costList>
-						<Steel>30</Steel>
-						<Plasteel>35</Plasteel>
-						<ComponentSpacer>1</ComponentSpacer>
-						<Chemfuel>10</Chemfuel>
-					</costList>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_M8</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- Name -->
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='RE_Gun_AllianceAssaultRifle']/label</xpath>
-					<value>
-						<label>M-8 Avenger</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Gun_AllianceAssaultRifle"]/description</xpath>
-					<value>
-						<description>The Avenger is a common, versatile, military-grade assault rifle manufactured by the Elkoss Combine. It's accurate when fired in short bursts, and deadly when fired on full auto. The modular design and inexpensive components of the Avenger make it a favorite of military groups and mercenaries alike. The rifle has a reputation for being tough, reliable, easy to use, and easy to upgrade. This might be the most generic assualt rifle to have ever existed in this corner of the milky way.</description>
-					</value>
-				</li>
-
-				<!-- ========== M-15 ========== -->
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>RE_Gun_AllianceBattleRifle</defName>
-					<statBases>
-						<WorkToMake>38000</WorkToMake>
-						<SightsEfficiency>1.25</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.38</SwayFactor>
-						<Bulk>8</Bulk>
-						<Mass>3.7</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_M15_Basic</defaultProjectile>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>1</warmupTime>
-						<range>57</range>
-						<soundCast>RE_Shot_Vindicator</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilAmount>1.08</recoilAmount>
-					</Properties>
-					<costList>
-						<Steel>30</Steel>
-						<Plasteel>35</Plasteel>
-						<ComponentSpacer>1</ComponentSpacer>
-						<Chemfuel>10</Chemfuel>
-					</costList>
-					<AmmoUser>
-						<magazineSize>24</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_M15</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- Name -->
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='RE_Gun_AllianceBattleRifle']/label</xpath>
-					<value>
-						<label>M-15 Vindicator</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Gun_AllianceBattleRifle"]/description</xpath>
-					<value>
-						<description>A low recoil battle rifle that fires in three-round bursts. The Vindicator is favored by assassins and elite mercenaries, and deadly at medium to long ranges. Its effectiveness might be outclassed by faster firing weapons at short ranges.</description>
-					</value>
-				</li>
-
-				<!-- ========== M-9 Tempest ========== -->
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>RE_Gun_AllianceSMG</defName>
-					<statBases>
-						<WorkToMake>23000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.18</SwayFactor>
-						<Bulk>3.75</Bulk>
-						<Mass>1.8</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Tempest</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>28</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RE_Shot_Tempest</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-						<recoilAmount>1.64</recoilAmount>
-					</Properties>
-					<costList>
-						<Steel>15</Steel>
-						<Plasteel>15</Plasteel>
-						<ComponentSpacer>1</ComponentSpacer>
-						<Chemfuel>5</Chemfuel>
-					</costList>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_Tempest</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- Name -->
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='RE_Gun_AllianceSMG']/label</xpath>
-					<value>
-						<label>M-9 Tempest</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Gun_AllianceSMG"]/description</xpath>
-					<value>
-						<description>The Tempest is an expensive but deadly addition to anyone's personal arsenal. This fully automatic submachine gun is punishing up close, but becomes less accurate at long range.</description>
-					</value>
-				</li>
-				<!-- ========== Mantis ========== -->
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>RE_Gun_AllianceSniperRifle</defName>
-					<statBases>
-						<WorkToMake>37500</WorkToMake>
-						<SightsEfficiency>2.8</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.46</SwayFactor>
-						<Bulk>10.0</Bulk>
-						<Mass>4.20</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Mantis</defaultProjectile>
-						<warmupTime>1.45</warmupTime>
-						<range>80</range>
-						<ammoConsumedPerShotCount>4</ammoConsumedPerShotCount>
-						<soundCast>RE_Shot_Mantis</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<costList>
-						<Steel>40</Steel>
-						<Plasteel>30</Plasteel>
-						<ComponentSpacer>1</ComponentSpacer>
-						<Chemfuel>10</Chemfuel>
-					</costList>
-					<AmmoUser>
-						<magazineSize>4</magazineSize>
-						<reloadTime>1.1</reloadTime>
-						<ammoSet>AmmoSet_Mantis</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- Name -->
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='RE_Gun_AllianceSniperRifle']/label</xpath>
-					<value>
-						<label>M-92 Mantis</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Gun_AllianceSniperRifle"]/description</xpath>
-					<value>
-						<description>The Mantis is a powerful sniper rifle able to take out most targets in a single shot. It's incredibly accurate at long range, but rate of fire is slow due to the need to load a new thermal clip after every shot.</description>
-					</value>
-				</li>
-				<!-- ========== M-98 ========== -->
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>RE_Gun_AllianceAntimaterielRifle</defName>
-					<statBases>
-						<WorkToMake>52500</WorkToMake>
-						<SightsEfficiency>3.75</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1.85</SwayFactor>
-						<Bulk>15</Bulk>
-						<Mass>10</Mass>
-						<RangedWeapon_Cooldown>0.64</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_M98_Basic</defaultProjectile>
-						<warmupTime>2</warmupTime>
-						<range>90</range>
-						<ammoConsumedPerShotCount>10</ammoConsumedPerShotCount>
-						<soundCast>RE_Shot_Widow</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-					</Properties>
-					<costList>
-						<Steel>60</Steel>
-						<Plasteel>60</Plasteel>
-						<ComponentSpacer>2</ComponentSpacer>
-						<Chemfuel>20</Chemfuel>
-					</costList>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>1.8</reloadTime>
-						<ammoSet>AmmoSet_M98</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- Name -->
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='RE_Gun_AllianceAntimaterielRifle']/label</xpath>
-					<value>
-						<label>M-98 Widow</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Gun_AllianceAntimaterielRifle"]/description</xpath>
-					<value>
-						<description>A very heavy anti-material rifle, the Widow is primarily used by sniper teams in assault missions against armored vehicles, mechanoids or krogan. It is very slow to fire but packs a massive punch, any humanoid target is likely to be instantly turned into a bloody pulp upon hit.</description>
-					</value>
-				</li>
-				<!-- ========== AllianceShotgun ========== -->
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>RE_Gun_AllianceShotgun</defName>
-					<statBases>
-						<WorkToMake>28000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.2</SwayFactor>
-						<Bulk>7.5</Bulk>
-						<Mass>3</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Katana</defaultProjectile>
-						<warmupTime>0.7</warmupTime>
-						<range>20</range>
-						<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
-						<soundCast>RE_Shot_Katana</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<costList>
-						<Steel>30</Steel>
-						<Plasteel>25</Plasteel>
-						<ComponentSpacer>1</ComponentSpacer>
-						<Chemfuel>10</Chemfuel>
-					</costList>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_Katana</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>False</aiUseBurstMode>
-					</FireModes>
-				</li>
-
-				<!-- Name -->
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='RE_Gun_AllianceShotgun']/label</xpath>
-					<value>
-						<label>M-23 Katana</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Gun_AllianceShotgun"]/description</xpath>
-					<value>
-						<description>The Katana is a common mercenary weapon, and is also popular on colonies with varren infestations. It's deadly at short range, but ineffective at long range. Being a shotgun, it sacrifices its long range and armour piercing capabilities for short range firepower.</description>
-					</value>
-				</li>
-
-				<!-- ==========Hydra Shotgun ========== -->
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>RE_Gun_AllianceChainShotgun</defName>
-					<statBases>
-						<WorkToMake>45000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.38</SwayFactor>
-						<Bulk>7.5</Bulk>
-						<Mass>3</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Hydra</defaultProjectile>
-						<warmupTime>0.7</warmupTime>
-						<range>20</range>
-						<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>18</ticksBetweenBurstShots>
-						<recoilAmount>1.57</recoilAmount>
-						<soundCast>RE_Shot_Katana</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<costList>
-						<Steel>20</Steel>
-						<Plasteel>35</Plasteel>
-						<ComponentSpacer>2</ComponentSpacer>
-						<Chemfuel>10</Chemfuel>
-					</costList>
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_Hydrashotty</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- Name -->
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='RE_Gun_AllianceChainShotgun']/label</xpath>
-					<value>
-						<label>Hydra Shotgun</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Gun_AllianceChainShotgun"]/description</xpath>
-					<value>
-						<description>A curious weapon not given any given any formal alliance designation, the Hydra is an automatic shotgun that is nearly doubles the firepower of a regular semi-automatic shotgun.</description>
-					</value>
-				</li>
-				<!-- ========== Predator ========== -->
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>RE_Gun_AlliancePistol</defName>
-					<statBases>
-						<WorkToMake>13500</WorkToMake>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>0.88</SwayFactor>
-						<Bulk>1.75</Bulk>
-						<Mass>0.8</Mass>
-						<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Predator</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>18</range>
-						<soundCast>RE_Shot_Predator</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<costList>
-						<Steel>15</Steel>
-						<Plasteel>15</Plasteel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-						<Chemfuel>4</Chemfuel>
-					</costList>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_Predator</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>False</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- Name -->
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='RE_Gun_AlliancePistol']/label</xpath>
-					<value>
-						<label>M-3 Predator</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Gun_AlliancePistol"]/description</xpath>
-					<value>
-						<description>A reliable, accurate sidearm. Manufactured by Elanus Risk Control, the Predator is valued as a powerful, deadly, and relatively inexpensive weapon.</description>
-					</value>
-				</li>
-				<!-- ========== Phalanx ========== -->
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>RE_Gun_AllianceHandcannon</defName>
-					<statBases>
-						<WorkToMake>19000</WorkToMake>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.1</ShotSpread>
-						<SwayFactor>1.08</SwayFactor>
-						<Bulk>2.1</Bulk>
-						<Mass>1</Mass>
-						<RangedWeapon_Cooldown>0.46</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Phalanx</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>RE_Shot_Phalanx</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<costList>
-						<Steel>15</Steel>
-						<Plasteel>20</Plasteel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-						<Chemfuel>8</Chemfuel>
-					</costList>
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_Phalanx</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-					<!--    <researchPrerequisite>BlowbackOperation</researchPrerequisite> -->
-				</li>
-
-				<!-- Name -->
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='RE_Gun_AllianceHandcannon']/label</xpath>
-					<value>
-						<label>M-5 Phalanx</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Gun_AllianceHandcannon"]/description</xpath>
-					<value>
-						<description>The M-5 Phalanx is the product of the Alliance's Offensive Handgun Project, a close-in weapon to be used with no loss of stopping power in comparison with a soldier's assault rifle. The Phalanx enjoys a ballistics advantage over most heavy pistols. Civilian variants are often purchased by colonists on planets that have particularly dangerous big-game animals.</description>
-					</value>
-				</li>
-				<!-- === Rocket Launcher === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RE_Gun_AllianceRocketLauncher</defName>
-					<statBases>
-						<WorkToMake>20000</WorkToMake>
-						<Mass>5.0</Mass>
-						<Bulk>8.0</Bulk>
-						<SwayFactor>1.5</SwayFactor>
-						<ShotSpread>0.03</ShotSpread>
-						<SightsEfficiency>2</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.0</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>60</Steel>
-						<FSX>4</FSX>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>VFE_Bullet_ML77CE</defaultProjectile>
-						<burstShotCount>1</burstShotCount>
-						<warmupTime>1.5</warmupTime>
-						<range>62</range>
-						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-						<minRange>5</minRange>
-						<soundCast>RE_Shot_MissileLauncher</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<onlyManualCast>True</onlyManualCast>
-						<ignorePartialLoSBlocker>True</ignorePartialLoSBlocker>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-							<canTargetPawns>true</canTargetPawns>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- Name -->
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='RE_Gun_AllianceRocketLauncher']/label</xpath>
-					<value>
-						<label>ML-77 (single use)</label>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Drell/Apparel_Drell.xml b/Patches/Rim-Effect Drell/Apparel_Drell.xml
deleted file mode 100644
index de0f5dc491..0000000000
--- a/Patches/Rim-Effect Drell/Apparel_Drell.xml	
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Drell</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Assassin's Hood -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_AssassinsHood"]/apparel/layers</xpath>
-					<value>
-						<layers Inherit="False">
-							<li>OnHead</li>
-							<li>Overhead</li>
-						</layers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_AssassinsHood"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_AssassinsHood"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-0.6</SmokeSensitivity>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_AssassinsHood"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_AssassinsHood"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>9</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Assassin's Jacket -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_AssassinsJacket"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>7.5</Bulk>
-						<WornBulk>1.75</WornBulk>
-						<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Drell/Drell_Race.xml b/Patches/Rim-Effect Drell/Drell_Race.xml
deleted file mode 100644
index af978ed41e..0000000000
--- a/Patches/Rim-Effect Drell/Drell_Race.xml	
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Drell</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="RE_Drell"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="RE_Drell"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="RE_Drell"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Checking if "RE_Drell" has a <comps> node and adding it if it doesn't exist -->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="RE_Drell"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="RE_Drell"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="RE_Drell"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Drell/PawnKinds_Drell.xml b/Patches/Rim-Effect Drell/PawnKinds_Drell.xml
deleted file mode 100644
index 1d90385e8a..0000000000
--- a/Patches/Rim-Effect Drell/PawnKinds_Drell.xml	
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Drell</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RE_DrellTraveller"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RE_DrellMercenary"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>7</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<magazineCount>
-										<min>1</min>
-										<max>5</max>
-									</magazineCount>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>450</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-										<li>CE_Sidearm</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Drell/Projectiles_Drell.xml b/Patches/Rim-Effect Drell/Projectiles_Drell.xml
deleted file mode 100644
index 769eb16757..0000000000
--- a/Patches/Rim-Effect Drell/Projectiles_Drell.xml	
+++ /dev/null
@@ -1,290 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Drell</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Viper</defName>
-							<label>Thermal Clip</label>
-							<ammoTypes>
-								<Ammo_ME>Bullet_Viper</Ammo_ME>
-								<Ammo_ME_AP>Bullet_Viper_AP</Ammo_ME_AP>
-								<Ammo_ME_Cryo>Bullet_Viper_Cryo</Ammo_ME_Cryo>
-								<Ammo_ME_HE>Bullet_Viper_HE</Ammo_ME_HE>
-								<Ammo_ME_FI>Bullet_Viper_FI</Ammo_ME_FI>
-								<Ammo_ME_Ion>Bullet_Viper_Ion</Ammo_ME_Ion>
-								<Ammo_ME_Toxic>Bullet_Viper_Toxic</Ammo_ME_Toxic>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Locust</defName>
-							<label>Thermal Clip</label>
-							<ammoTypes>
-								<Ammo_ME>Bullet_Locust</Ammo_ME>
-								<Ammo_ME_AP>Bullet_Locust_AP</Ammo_ME_AP>
-								<Ammo_ME_Cryo>Bullet_Locust_Cryo</Ammo_ME_Cryo>
-								<Ammo_ME_HE>Bullet_Locust_HE</Ammo_ME_HE>
-								<Ammo_ME_FI>Bullet_Locust_FI</Ammo_ME_FI>
-								<Ammo_ME_Ion>Bullet_Locust_Ion</Ammo_ME_Ion>
-								<Ammo_ME_Toxic>Bullet_Locust_Toxic</Ammo_ME_Toxic>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ================== Viper ================== -->
-
-						<ThingDef Name="BaseViperBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Shot_MassAccelerated_Sniper</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>1.1</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>500</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseViperBullet">
-							<defName>Bullet_Viper</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>36</damageAmountBase>
-								<armorPenetrationSharp>28</armorPenetrationSharp>
-								<armorPenetrationBlunt>180</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseViperBullet">
-							<defName>Bullet_Viper_AP</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>24</damageAmountBase>
-								<armorPenetrationSharp>56</armorPenetrationSharp>
-								<armorPenetrationBlunt>180</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseViperBullet">
-							<defName>Bullet_Viper_Cryo</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>34</damageAmountBase>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-								<armorPenetrationBlunt>180</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Cryo</def>
-										<amount>7</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseViperBullet">
-							<defName>Bullet_Viper_HE</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>36</damageAmountBase>
-								<armorPenetrationSharp>28</armorPenetrationSharp>
-								<armorPenetrationBlunt>180</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>20</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseViperBullet">
-							<defName>Bullet_Viper_Toxic</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>34</damageAmountBase>
-								<armorPenetrationSharp>28</armorPenetrationSharp>
-								<armorPenetrationBlunt>180</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Toxin</def>
-										<amount>7</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseViperBullet">
-							<defName>Bullet_Viper_FI</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>36</damageAmountBase>
-								<armorPenetrationSharp>28</armorPenetrationSharp>
-								<armorPenetrationBlunt>180</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_SickBurn</def>
-										<amount>5</amount>
-									</li>
-									<li>
-										<def>Flame</def>
-										<amount>1</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseViperBullet">
-							<defName>Bullet_Viper_Ion</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>27</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>9</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-								<armorPenetrationBlunt>180</armorPenetrationBlunt>
-								<empShieldBreakChance>1</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== Locust ================== -->
-
-						<ThingDef Name="BaseLocustBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Shot_MassAccelerated_Small</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-								<drawSize>1.1</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>180</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseLocustBullet">
-							<defName>Bullet_Locust</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>11</damageAmountBase>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseLocustBullet">
-							<defName>Bullet_Locust_AP</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>8</damageAmountBase>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseLocustBullet">
-							<defName>Bullet_Locust_HE</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>11</damageAmountBase>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>5</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseLocustBullet">
-							<defName>Bullet_Locust_Cryo</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>11</damageAmountBase>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Cryo</def>
-										<amount>2</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseLocustBullet">
-							<defName>Bullet_Locust_Toxic</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Toxin</def>
-										<amount>2</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseLocustBullet">
-							<defName>Bullet_Locust_FI</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>11</damageAmountBase>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_SickBurn</def>
-										<amount>2</amount>
-									</li>
-									<li>
-										<def>Flame</def>
-										<amount>1</amount>
-										<chance>0.25</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseLocustBullet">
-							<defName>Bullet_Locust_Ion</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>7</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>3</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<empShieldBreakChance>0.30</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Drell/Scenarios_Drell.xml b/Patches/Rim-Effect Drell/Scenarios_Drell.xml
deleted file mode 100644
index 28d60f841c..0000000000
--- a/Patches/Rim-Effect Drell/Scenarios_Drell.xml	
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Drell</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Add ammo to scenario === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="RE_LoneDrellAssassin"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_ME</thingDef>
-							<count>500</count>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Drell/Weapons_Drell.xml b/Patches/Rim-Effect Drell/Weapons_Drell.xml
deleted file mode 100644
index d18ededba1..0000000000
--- a/Patches/Rim-Effect Drell/Weapons_Drell.xml	
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Drell</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Melee Tools ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Gun_AllianceCompactSMG"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Gun_AllianceRapidSniperRifle"]/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>
-				</li>
-
-				<!-- ========== M-12 Locust ========== -->
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>RE_Gun_AllianceCompactSMG</defName>
-					<statBases>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.18</SwayFactor>
-						<Bulk>3.75</Bulk>
-						<Mass>1.8</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Locust</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>32</range>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>RE_Shot_Locust</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-						<recoilAmount>1.34</recoilAmount>
-					</Properties>
-					<costList>
-						<Steel>10</Steel>
-						<Plasteel>25</Plasteel>
-						<ComponentSpacer>1</ComponentSpacer>
-						<Chemfuel>5</Chemfuel>
-					</costList>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_Locust</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aimedBurstShotCount>4</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- Name -->
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='RE_Gun_AllianceCompactSMG']/label</xpath>
-					<value>
-						<label>M-12 Locust</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Gun_AllianceCompactSMG"]/description</xpath>
-					<value>
-						<description>The Locust is an expensive but deadly addition to anyone's personal arsenal. This fully automatic submachine gun is punishing up close, while still capable of precise fire at long range.</description>
-					</value>
-				</li>
-
-				<!-- ========== M-97 Viper ========== -->
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>RE_Gun_AllianceRapidSniperRifle</defName>
-					<statBases>
-						<SightsEfficiency>2.5</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.46</SwayFactor>
-						<Bulk>10.0</Bulk>
-						<Mass>4.20</Mass>
-						<RangedWeapon_Cooldown>0.27</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Viper</defaultProjectile>
-						<warmupTime>1.45</warmupTime>
-						<range>78</range>
-						<ammoConsumedPerShotCount>4</ammoConsumedPerShotCount>
-						<soundCast>RE_Shot_Viper</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>24</magazineSize>
-						<reloadTime>1.1</reloadTime>
-						<ammoSet>AmmoSet_Viper</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- Name -->
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='RE_Gun_AllianceRapidSniperRifle']/label</xpath>
-					<value>
-						<label>M-97 Viper</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Gun_AllianceRapidSniperRifle"]/description</xpath>
-					<value>
-						<description>The Viper is a semi-automatic, rapid-fire sniper rifle capable of quickly engaging targets with follow-up shots.</description>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Extended Cut/Headgear_ExtendedCut.xml b/Patches/Rim-Effect Extended Cut/Headgear_ExtendedCut.xml
deleted file mode 100644
index 08cdc603b4..0000000000
--- a/Patches/Rim-Effect Extended Cut/Headgear_ExtendedCut.xml	
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Extended Cut</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Light Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_CapacitorHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>0.5</WornBulk>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_CapacitorHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>3</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_CapacitorHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_CapacitorHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>150</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_CapacitorHelmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0.1</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_CapacitorHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<ShootingAccuracyPawn>-0.4</ShootingAccuracyPawn>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_CapacitorHelmet"]/apparel</xpath>
-					<value>
-						<layers Inherit="False">
-							<li>Overhead</li>
-							<li>StrappedHead</li>
-						</layers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_ArchonVisor"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_ArchonVisor"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<ShootingAccuracyPawn>0.5</ShootingAccuracyPawn>
-							<AimingAccuracy>0.2</AimingAccuracy>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_ArchonVisor"]/apparel</xpath>
-					<value>
-						<layers Inherit="False">
-							<li>StrappedHead</li>
-						</layers>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Extended Cut/ME_Plasma_Recipe_ExtendedCut.xml b/Patches/Rim-Effect Extended Cut/ME_Plasma_Recipe_ExtendedCut.xml
deleted file mode 100644
index d54360355b..0000000000
--- a/Patches/Rim-Effect Extended Cut/ME_Plasma_Recipe_ExtendedCut.xml	
+++ /dev/null
@@ -1,103 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Extended Cut</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_ME_Plasma</defName>
-							<label>Plasma Power Cell</label>
-							<description>Plasma containment power cell optimized for M-19 Ballista rifle.</description>
-							<statBases>
-								<Mass>0.02</Mass>
-								<Bulk>0.015</Bulk>
-								<MarketValue>0.25</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade_Sellable</li>
-								<!-- Plasma ammo can't be handloaded, and the containment cell must be precision-machined anyway -->
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoPlasmaCellRifle</li>
-							</thingCategories>
-							<graphicData>
-								<texPath>Things/Ammo/PlasmaCell/Rifle</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>Plasma</ammoClass>
-							<comps>
-								<!-- Arbitarily defined cookoff explosive stats; represents a plasma containment system failing -->
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>4</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>0.4</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_ME_Plasma</defName>
-							<label>make plasma cells</label>
-							<description>Craft 50 shots' worth of plasma cells.</description>
-							<jobString>Making plasma cells.</jobString>
-							<workAmount>2500</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Plasteel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_ME_Plasma>50</Ammo_ME_Plasma>
-							</products>
-							<researchPrerequisite>RE_AllianceWeaponry</researchPrerequisite>
-							<recipeUsers>
-								<li>RE_ManufacturingBench</li>
-							</recipeUsers>
-						</RecipeDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Extended Cut/ME_Projectile_ExtendedCut.xml b/Patches/Rim-Effect Extended Cut/ME_Projectile_ExtendedCut.xml
deleted file mode 100644
index 8c22356dd5..0000000000
--- a/Patches/Rim-Effect Extended Cut/ME_Projectile_ExtendedCut.xml	
+++ /dev/null
@@ -1,554 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Extended Cut</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_L89</defName>
-							<label>Thermal Clip</label>
-							<ammoTypes>
-								<Ammo_ME>Bullet_L89_Basic</Ammo_ME>
-								<Ammo_ME_AP>Bullet_L89_AP</Ammo_ME_AP>
-								<Ammo_ME_Cryo>Bullet_L89_Cryo</Ammo_ME_Cryo>
-								<Ammo_ME_HE>Bullet_L89_HE</Ammo_ME_HE>
-								<Ammo_ME_FI>Bullet_L89_FI</Ammo_ME_FI>
-								<Ammo_ME_Ion>Bullet_L89_Ion</Ammo_ME_Ion>
-								<Ammo_ME_Toxic>Bullet_L89_Toxic</Ammo_ME_Toxic>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_M29</defName>
-							<label>Thermal Clip</label>
-							<ammoTypes>
-								<Ammo_ME>Bullet_M29_Basic</Ammo_ME>
-								<Ammo_ME_AP>Bullet_M29_AP</Ammo_ME_AP>
-								<Ammo_ME_Cryo>Bullet_M29_Cryo</Ammo_ME_Cryo>
-								<Ammo_ME_HE>Bullet_M29_HE</Ammo_ME_HE>
-								<Ammo_ME_FI>Bullet_M29_FI</Ammo_ME_FI>
-								<Ammo_ME_Ion>Bullet_M29_Ion</Ammo_ME_Ion>
-								<Ammo_ME_Toxic>Bullet_M29_Toxic</Ammo_ME_Toxic>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Chakram</defName>
-							<label>Thermal Clip</label>
-							<ammoTypes>
-								<Ammo_ME>Bullet_Chakram_Basic</Ammo_ME>
-								<Ammo_ME_AP>Bullet_Chakram_AP</Ammo_ME_AP>
-								<Ammo_ME_Cryo>Bullet_Chakram_Cryo</Ammo_ME_Cryo>
-								<Ammo_ME_HE>Bullet_Chakram_HE</Ammo_ME_HE>
-								<Ammo_ME_FI>Bullet_Chakram_FI</Ammo_ME_FI>
-								<Ammo_ME_Ion>Bullet_Chakram_Ion</Ammo_ME_Ion>
-								<Ammo_ME_Toxic>Bullet_Chakram_Toxic</Ammo_ME_Toxic>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_M19</defName>
-							<label>Plasma Canister</label>
-							<ammoTypes>
-								<Ammo_ME_Plasma>Bullet_M19_Basic</Ammo_ME_Plasma>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<!-- ==================Chakram ================== -->
-
-						<ThingDef Name="BaseChakramBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Shot_ChakramDisc</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>208</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseChakramBullet">
-							<defName>Bullet_Chakram_Basic</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>24</damageAmountBase>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<armorPenetrationBlunt>90</armorPenetrationBlunt>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>48</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>1.5</explosiveRadius>
-									<explosionSound>MortarBomb_Explode</explosionSound>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Small>5</Fragment_Small>
-										<Fragment_ME>4</Fragment_ME>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseChakramBullet">
-							<defName>Bullet_Chakram_AP</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>19</damageAmountBase>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<armorPenetrationBlunt>90</armorPenetrationBlunt>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>25</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>0.9</explosiveRadius>
-									<explosionSound>MortarBomb_Explode</explosionSound>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Small>4</Fragment_Small>
-										<Fragment_ME>2</Fragment_ME>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseChakramBullet">
-							<defName>Bullet_Chakram_HE</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>24</damageAmountBase>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<armorPenetrationBlunt>90</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>7</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>75</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>1.9</explosiveRadius>
-									<explosionSound>MortarBomb_Explode</explosionSound>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Small>5</Fragment_Small>
-										<Fragment_ME>4</Fragment_ME>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseChakramBullet">
-							<defName>Bullet_Chakram_Cryo</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>22</damageAmountBase>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<armorPenetrationBlunt>90</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Cryo</def>
-										<amount>7</amount>
-									</li>
-								</secondaryDamage>
-								<explosionEffect>ExtinguisherExplosion</explosionEffect>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>20</damageAmountBase>
-									<explosiveDamageType>ME_Cryo</explosiveDamageType>
-									<explosiveRadius>1.5</explosiveRadius>
-									<explosionSound>Explosion_EMP</explosionSound>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Small>5</Fragment_Small>
-										<Fragment_ME>4</Fragment_ME>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseChakramBullet">
-							<defName>Bullet_Chakram_Toxic</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>22</damageAmountBase>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<armorPenetrationBlunt>90</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Toxin</def>
-										<amount>7</amount>
-									</li>
-								</secondaryDamage>
-								<explosionEffect>ExtinguisherExplosion</explosionEffect>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>20</damageAmountBase>
-									<explosiveDamageType>ME_Toxin</explosiveDamageType>
-									<explosiveRadius>1.5</explosiveRadius>
-									<explosionSound>Explosion_EMP</explosionSound>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Small>5</Fragment_Small>
-										<Fragment_ME>4</Fragment_ME>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseChakramBullet">
-							<defName>Bullet_Chakram_Ion</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>17</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>8</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>22</armorPenetrationSharp>
-								<armorPenetrationBlunt>90</armorPenetrationBlunt>
-								<empShieldBreakChance>0.7</empShieldBreakChance>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>36</damageAmountBase>
-									<explosiveDamageType>EMP</explosiveDamageType>
-									<explosiveRadius>2</explosiveRadius>
-									<explosionSound>Explosion_EMP</explosionSound>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Small>4</Fragment_Small>
-										<Fragment_ME>2</Fragment_ME>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseChakramBullet">
-							<defName>Bullet_Chakram_FI</defName>
-							<label>accelerated incendiary shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>22</damageAmountBase>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<armorPenetrationBlunt>90</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_SickBurn</def>
-										<amount>5</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>18</damageAmountBase>
-									<explosiveDamageType>Flame</explosiveDamageType>
-									<explosiveRadius>1.5</explosiveRadius>
-									<explosionSound>MortarBomb_Explode</explosionSound>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Small>5</Fragment_Small>
-										<Fragment_ME>4</Fragment_ME>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<!-- ================== L89 ================== -->
-
-						<ThingDef Name="BaseL89Bullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Shot_MassAccelerated_Large</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>400</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseL89Bullet">
-							<defName>Bullet_L89_Basic</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>24</damageAmountBase>
-								<armorPenetrationSharp>21</armorPenetrationSharp>
-								<armorPenetrationBlunt>84</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseL89Bullet">
-							<defName>Bullet_L89_AP</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>16</damageAmountBase>
-								<armorPenetrationSharp>42</armorPenetrationSharp>
-								<armorPenetrationBlunt>84</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseL89Bullet">
-							<defName>Bullet_L89_HE</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>24</damageAmountBase>
-								<armorPenetrationSharp>21</armorPenetrationSharp>
-								<armorPenetrationBlunt>84</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>12</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseL89Bullet">
-							<defName>Bullet_L89_Cryo</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>23</damageAmountBase>
-								<armorPenetrationSharp>21</armorPenetrationSharp>
-								<armorPenetrationBlunt>84</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Cryo</def>
-										<amount>6</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseL89Bullet">
-							<defName>Bullet_L89_Toxic</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>23</damageAmountBase>
-								<armorPenetrationSharp>21</armorPenetrationSharp>
-								<armorPenetrationBlunt>84</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Toxin</def>
-										<amount>6</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseL89Bullet">
-							<defName>Bullet_L89_Ion</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>16</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>8</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>24</armorPenetrationSharp>
-								<armorPenetrationBlunt>84</armorPenetrationBlunt>
-								<empShieldBreakChance>0.4</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseL89Bullet">
-							<defName>Bullet_L89_FI</defName>
-							<label>accelerated incendiary shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>24</damageAmountBase>
-								<armorPenetrationSharp>21</armorPenetrationSharp>
-								<armorPenetrationBlunt>84</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_SickBurn</def>
-										<amount>5</amount>
-									</li>
-									<li>
-										<def>Flame</def>
-										<amount>1</amount>
-										<chance>0.4</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== M29 ================== -->
-
-						<ThingDef Name="BaseM29Bullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Shot_MassAccelerated_Sniper</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>1.0</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>480</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseM29Bullet">
-							<defName>Bullet_M29_Basic</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>17</damageAmountBase>
-								<armorPenetrationSharp>17</armorPenetrationSharp>
-								<armorPenetrationBlunt>50</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseM29Bullet">
-							<defName>Bullet_M29_AP</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationSharp>34</armorPenetrationSharp>
-								<armorPenetrationBlunt>50</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseM29Bullet">
-							<defName>Bullet_M29_Cryo</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>16</damageAmountBase>
-								<armorPenetrationSharp>17</armorPenetrationSharp>
-								<armorPenetrationBlunt>50</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Cryo</def>
-										<amount>4</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseM29Bullet">
-							<defName>Bullet_M29_Toxic</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>16</damageAmountBase>
-								<armorPenetrationSharp>17</armorPenetrationSharp>
-								<armorPenetrationBlunt>50</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Toxin</def>
-										<amount>4</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseM29Bullet">
-							<defName>Bullet_M29_HE</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>17</damageAmountBase>
-								<armorPenetrationSharp>17</armorPenetrationSharp>
-								<armorPenetrationBlunt>50</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>8</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseM29Bullet">
-							<defName>Bullet_M29_FI</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>17</damageAmountBase>
-								<armorPenetrationSharp>17</armorPenetrationSharp>
-								<armorPenetrationBlunt>50</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_SickBurn</def>
-										<amount>3</amount>
-									</li>
-									<li>
-										<def>Flame</def>
-										<amount>1</amount>
-										<chance>0.3</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseM29Bullet">
-							<defName>Bullet_M29_Ion</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>5</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<armorPenetrationBlunt>50</armorPenetrationBlunt>
-								<empShieldBreakChance>0.3</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================M19 Plasma ================== -->
-
-						<ThingDef ParentName="BaseM29Bullet">
-							<defName>Bullet_M19_Basic</defName>
-							<label>Plasma shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>10</damageAmountBase>
-								<armorPenetrationSharp>24</armorPenetrationSharp>
-								<armorPenetrationBlunt>36</armorPenetrationBlunt>
-								<speed>250</speed>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>20</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect Extended Cut/Weapons_ME_ExtendedCut.xml b/Patches/Rim-Effect Extended Cut/Weapons_ME_ExtendedCut.xml
deleted file mode 100644
index 0ff43e8b92..0000000000
--- a/Patches/Rim-Effect Extended Cut/Weapons_ME_ExtendedCut.xml	
+++ /dev/null
@@ -1,348 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: Extended Cut</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Melee Tools ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Gun_SpacerBattleRifle" or defName="RE_Gun_SpacerMarksmanRifle" or defName="RE_Gun_SpacerAssaultRifle" or defName="RE_Gun_AlliancePrecisionRifle" or defName="RE_Gun_ChakramLauncher"]/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>
-				</li>
-
-				<!-- Value -->
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='RE_Gun_SpacerAssaultRifle' or defName='RE_Gun_SpacerMarksmanRifle']/statBases/MarketValue</xpath>
-					<value>
-						<MarketValue>600</MarketValue>
-					</value>
-				</li>
-
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='RE_Gun_SpacerBattleRifle']/statBases/MarketValue</xpath>
-					<value>
-						<MarketValue>700</MarketValue>
-					</value>
-				</li>
-
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='RE_Gun_SpacerChakramLauncher']/statBases/MarketValue</xpath>
-					<value>
-						<MarketValue>1000</MarketValue>
-					</value>
-				</li>
-
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='RE_Gun_AlliancePrecisionRifle']/recipeMaker/skillRequirements</xpath>
-					<value>
-						<skillRequirements>
-							<Crafting>8</Crafting>
-						</skillRequirements>
-					</value>
-				</li>
-
-				<!-- ========== M7 Lancer ========== -->
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>RE_Gun_SpacerAssaultRifle</defName>
-					<statBases>
-						<WorkToMake>40000</WorkToMake>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.37</SwayFactor>
-						<Bulk>8</Bulk>
-						<Mass>4</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_M8_Basic</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<ammoConsumedPerShotCount>0</ammoConsumedPerShotCount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-						<soundCast>RE_Shot_Avenger</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-						<recoilAmount>1.37</recoilAmount>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>38</magazineSize>
-						<reloadTime>4.8</reloadTime>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- Name -->
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='RE_Gun_SpacerAssaultRifle']/label</xpath>
-					<value>
-						<label>M7 Lancer</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Gun_SpacerAssaultRifle"]/description</xpath>
-					<value>
-						<description>The M7-Lancer is a rare collector's item that was introduced shortly after the First Contact War. The Lancer has been refurbished by an unknown master weaponsmith, and it now uses the higher velocity rounds of today's weaponry. It does not need heat sinks, instead utilizing weapon heat-generation from an earlier era. Few of these finely crafted weapons are in existence.</description>
-					</value>
-				</li>
-
-				<!-- ========== Not Mattock ========== -->
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>RE_Gun_SpacerBattleRifle</defName>
-					<statBases>
-						<WorkToMake>40000</WorkToMake>
-						<SightsEfficiency>1.35</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.29</SwayFactor>
-						<Bulk>8.8</Bulk>
-						<Mass>4.5</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_L89_Basic</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>60</range>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>28</ticksBetweenBurstShots>
-						<soundCast>RE_Shot_Halberd</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-						<recoilAmount>1.54</recoilAmount>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>36</magazineSize>
-						<reloadTime>3.8</reloadTime>
-						<ammoSet>AmmoSet_L89</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- Name -->
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='RE_Gun_SpacerBattleRifle']/label</xpath>
-					<value>
-						<label>L-89 Halberd</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Gun_SpacerBattleRifle"]/description</xpath>
-					<value>
-						<description>The sleek L-89 Halberd favors power and precision. The semi-automatic rifle was the Andromeda Initiative's attempt to make a weapon on par with the reliable M-96 Mattock that also used Initiative breakthroughs in materials science. Only a few were made, but their effectiveness in the field is unquestioned.</description>
-					</value>
-				</li>
-
-				<!-- ========== M-29 ========== -->
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>RE_Gun_SpacerMarksmanRifle</defName>
-					<statBases>
-						<WorkToMake>40000</WorkToMake>
-						<SightsEfficiency>2.5</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.45</SwayFactor>
-						<Bulk>10</Bulk>
-						<Mass>3.4</Mass>
-						<RangedWeapon_Cooldown>0.44</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_M29_Basic</defaultProjectile>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>1.45</warmupTime>
-						<range>75</range>
-						<soundCast>RE_Shot_Incisor</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilAmount>0.94</recoilAmount>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>3.6</reloadTime>
-						<ammoSet>AmmoSet_M29</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- Name -->
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='RE_Gun_SpacerMarksmanRifle']/label</xpath>
-					<value>
-						<label>M-29 Incisor</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Gun_SpacerMarksmanRifle"]/description</xpath>
-					<value>
-						<description>The Incisor is one of a new wave of military and police sniper rifles designed to overload active defenses such as shields. the Incisor was initially advertised as having negligible recoil, although under real combat conditions the second and third rounds frequently climb in difficulty.</description>
-					</value>
-				</li>
-
-				<!-- ========== M-19 ========== -->
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>RE_Gun_AlliancePrecisionRifle</defName>
-					<statBases>
-						<WorkToMake>50000</WorkToMake>
-						<SightsEfficiency>2.4</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.42</SwayFactor>
-						<Bulk>10</Bulk>
-						<Mass>4.4</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_M19_Basic</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>72</range>
-						<soundCast>RE_Shot_Ballista</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<costList>
-						<Steel>30</Steel>
-						<Plasteel>35</Plasteel>
-						<ComponentSpacer>2</ComponentSpacer>
-						<Chemfuel>10</Chemfuel>
-					</costList>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>5.9</reloadTime>
-						<ammoSet>AmmoSet_M19</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- Name -->
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='RE_Gun_AlliancePrecisionRifle']/label</xpath>
-					<value>
-						<label>M-19 Ballista</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Gun_AlliancePrecisionRifle"]/description</xpath>
-					<value>
-						<description>the M-Series Ballista is an extremely versatile medium-to-long range combat weapon. Harnessing the exhaustive resources of synthetic plasma, the Ballista meets the critical requirements of low-cost abundant ammunition for today's highly mobile snipers, Each projectile contains a small, but very powerful, nanite core that detonates approximately 0.33 seconds after impact. The detonation stage of the projectile is devastating, targets hit by the bullet are not likely to survive.</description>
-					</value>
-				</li>
-
-				<!-- ========== ChakramLauncher ========== -->
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>RE_Gun_SpacerChakramLauncher</defName>
-					<statBases>
-						<WorkToMake>52000</WorkToMake>
-						<SightsEfficiency>1.25</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.56</SwayFactor>
-						<Bulk>12</Bulk>
-						<Mass>6</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Chakram_Basic</defaultProjectile>
-						<warmupTime>1.25</warmupTime>
-						<range>62</range>
-						<ammoConsumedPerShotCount>10</ammoConsumedPerShotCount>
-						<soundCast>RE_Shot_Chakram</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>4.0</reloadTime>
-						<ammoSet>AmmoSet_Chakram</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- Name -->
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='RE_Gun_SpacerChakramLauncher']/label</xpath>
-					<value>
-						<label>Chakram Launcher</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Gun_SpacerChakramLauncher"]/description</xpath>
-					<value>
-						<description>The fancifully named Chakram Launcher uses an internal fabricator to manufacture lightweight ammunition discs wrapped in holographic tracers. The discs explode on impact, sending shrapnel tearing through the enemy.</description>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect N7/Abilities_N7.xml b/Patches/Rim-Effect N7/Abilities_N7.xml
deleted file mode 100644
index 3202dbd0ed..0000000000
--- a/Patches/Rim-Effect N7/Abilities_N7.xml	
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>Rim-Effect: N7</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!-- Biotic -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/VFECore.Abilities.AbilityDef[defName="REN7_DarkChannel"]/range</xpath>
-							<value>
-								<range>48</range>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/VFECore.Abilities.AbilityDef[defName="REN7_Carnage"]/range</xpath>
-							<value>
-								<range>60</range>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect N7/Armor_N7.xml b/Patches/Rim-Effect N7/Armor_N7.xml
deleted file mode 100644
index e2103851de..0000000000
--- a/Patches/Rim-Effect N7/Armor_N7.xml	
+++ /dev/null
@@ -1,716 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: N7</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7AdeptSuit" or defName="REN7_Apparel_N7Armor" or defName="REN7_Apparel_N7HeavyArmor"]/apparel/layers</xpath>
-					<value>
-						<li>Webbing</li>
-					</value>
-				</li>
-
-				<!-- === Mask === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_N7AdeptMask"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>0.5</WornBulk>
-						<NightVisionEfficiency_Apparel>0.7</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_N7AdeptMask"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>12</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_N7AdeptMask"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>24</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_N7AdeptMask"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>180</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_N7AdeptMask"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0.1</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_N7AdeptMask"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="RE_Apparel_N7AdeptMask"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_N7AdeptMask"]/equippedStatOffsets</xpath>
-					<value>
-						<AimingDelayFactor>-0.075</AimingDelayFactor>
-						<ToxicEnvironmentResistance>0.20</ToxicEnvironmentResistance>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_N7AdeptMask"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>45</Plasteel>
-						<DevilstrandCloth>12</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_N7AdeptMask"]/apparel/layers</xpath>
-					<value>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RE_Apparel_N7AdeptMask"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.50</ArmorRating_Sharp>
-									<parts>
-										<li>Nose</li>
-										<li>Jaw</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.50</ArmorRating_Blunt>
-									<parts>
-										<li>Nose</li>
-										<li>Jaw</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Adept suit === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7AdeptSuit"]/statBases/Mass</xpath>
-					<value>
-						<Bulk>40</Bulk>
-						<WornBulk>6</WornBulk>
-						<Mass>12</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7AdeptSuit"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7AdeptSuit"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>28</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7AdeptSuit"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>400</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7AdeptSuit"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0.1</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7AdeptSuit"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>12</CarryWeight>
-						<CarryBulk>40</CarryBulk>
-						<ShootingAccuracyPawn>0.05</ShootingAccuracyPawn>
-						<ToxicEnvironmentResistance>0.3</ToxicEnvironmentResistance>
-						<MoveSpeed>0.6</MoveSpeed>
-						<Suppressability>-0.1</Suppressability>
-						<ReloadSpeed>0.15</ReloadSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7AdeptSuit"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7AdeptSuit"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>30</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7AdeptSuit"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Medium Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7Helmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>0.5</WornBulk>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7Helmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0.1</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7Helmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>13</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7Helmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>24</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7Helmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>200</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7Helmet"]/equippedStatOffsets/ToxicResistance</xpath>
-					<value>
-						<AimingDelayFactor>-0.075</AimingDelayFactor>
-						<ToxicEnvironmentResistance>1</ToxicEnvironmentResistance>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7Helmet"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>55</Plasteel>
-						<DevilstrandCloth>15</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7Helmet"]/apparel/layers</xpath>
-					<value>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7Helmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Medium Armor === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7Armor"]/statBases/Mass</xpath>
-					<value>
-						<Bulk>60</Bulk>
-						<WornBulk>8</WornBulk>
-						<Mass>22</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7Armor"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0.1</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7Armor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7Armor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>36</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7Armor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>450</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7Armor"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<CarryWeight>22</CarryWeight>
-						<CarryBulk>45</CarryBulk>
-						<ShootingAccuracyPawn>0.05</ShootingAccuracyPawn>
-						<ToxicEnvironmentResistance>0.3</ToxicEnvironmentResistance>
-						<MoveSpeed>0.2</MoveSpeed>
-						<Suppressability>-0.1</Suppressability>
-						<ReloadSpeed>0.15</ReloadSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7Armor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7Armor"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>40</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7Armor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Heavy Alliance Helmet === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyHelmet"]/statBases/Mass</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>2.5</WornBulk>
-						<Mass>6</Mass>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyHelmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0.1</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>17</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>34</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>250</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyHelmet"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<PsychicSensitivity>-0.3</PsychicSensitivity>
-							<AimingAccuracy>0.25</AimingAccuracy>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-							<CarryWeight>5</CarryWeight>
-							<CarryBulk>1</CarryBulk>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-							<PainShockThreshold>0.05</PainShockThreshold>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyHelmet"]/costList</xpath>
-					<value>
-						<costList>
-							<Plasteel>75</Plasteel>
-							<DevilstrandCloth>16</DevilstrandCloth>
-							<RE_ElementZero>10</RE_ElementZero>
-							<ComponentSpacer>3</ComponentSpacer>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyHelmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Heavy Alliance Armor === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyArmor"]/statBases/Mass</xpath>
-					<value>
-						<Bulk>80</Bulk>
-						<WornBulk>20</WornBulk>
-						<Mass>60</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyArmor"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0.1</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>22</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>60</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>550</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>75</CarryWeight>
-							<CarryBulk>60</CarryBulk>
-							<ShootingAccuracyPawn>0.2</ShootingAccuracyPawn>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-							<PainShockThreshold>0.1</PainShockThreshold>
-							<MoveSpeed>-0.25</MoveSpeed>
-							<Suppressability>-0.15</Suppressability>
-							<ReloadSpeed>0.15</ReloadSpeed>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyArmor"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>55</DevilstrandCloth>
-						<Hyperweave>10</Hyperweave>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="REN7_Apparel_N7HeavyArmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- Omni Shield -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Omnishield"]</xpath>
-					<value>
-						<ThingDef ParentName="ShieldBase">
-							<defName>REN7_Omnishield</defName>
-							<label>Omni shield</label>
-							<description>An omni shield capable of intercepting a majority of ranged and melee attacks.</description>
-							<techLevel>Ultra</techLevel>
-							<graphicData>
-								<texPath>Things/Item/Equipment/Shield/OmniShield/OmniShield</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>Transparent</shaderType>
-								<drawSize>0.83</drawSize>
-							</graphicData>
-							<costList>
-								<RE_ElementZero>40</RE_ElementZero>
-								<Plasteel>40</Plasteel>
-							</costList>
-							<thingCategories Inherit="False">
-								<li>Shields</li>
-							</thingCategories>
-							<recipeMaker>
-								<researchPrerequisite>RE_OmniTool</researchPrerequisite>
-								<recipeUsers>
-									<li>RE_ManufacturingBench</li>
-								</recipeUsers>
-							</recipeMaker>
-							<statBases>
-								<WorkToMake>40000</WorkToMake>
-								<MaxHitPoints>220</MaxHitPoints>
-								<ArmorRating_Blunt>22</ArmorRating_Blunt>
-								<ArmorRating_Sharp>12</ArmorRating_Sharp>
-								<Mass>4</Mass>
-								<Bulk>9</Bulk>
-								<WornBulk>6</WornBulk>
-							</statBases>
-							<equippedStatOffsets>
-								<ReloadSpeed>-0.1</ReloadSpeed>
-								<MeleeHitChance>-1</MeleeHitChance>
-								<ShootingAccuracyPawn>-0.2</ShootingAccuracyPawn>
-								<AimingAccuracy>-0.08</AimingAccuracy>
-								<Suppressability>-0.5</Suppressability>
-								<MeleeCritChance>-0.1</MeleeCritChance>
-								<MeleeParryChance>1.0</MeleeParryChance>
-							</equippedStatOffsets>
-							<apparel>
-								<careIfWornByCorpse>false</careIfWornByCorpse>
-								<careIfDamaged>false</careIfDamaged>
-								<wearPerDay>0</wearPerDay>
-								<tags>
-									<li>UltratechN7</li>
-								</tags>
-							</apparel>
-							<tradeTags>
-								<li>RE_OmniShield</li>
-							</tradeTags>
-							<modExtensions>
-								<li Class="CombatExtended.ShieldDefExtension">
-									<shieldCoverage>
-										<li>Hands</li>
-										<li>Arms</li>
-										<li>Shoulders</li>
-										<li>Torso</li>
-										<li>Neck</li>
-										<li>Teeth</li>
-									</shieldCoverage>
-									<crouchCoverage>
-										<li>Legs</li>
-										<li>FullHead</li>
-									</crouchCoverage>
-									<drawAsTall>false</drawAsTall>
-								</li>
-							</modExtensions>
-						</ThingDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect N7/ME_Projectile_N7.xml b/Patches/Rim-Effect N7/ME_Projectile_N7.xml
deleted file mode 100644
index 35dfab8bb2..0000000000
--- a/Patches/Rim-Effect N7/ME_Projectile_N7.xml	
+++ /dev/null
@@ -1,1111 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: N7</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Valkyrie</defName>
-							<label>Thermal Clip</label>
-							<ammoTypes>
-								<Ammo_ME>Bullet_Valkyrie</Ammo_ME>
-								<Ammo_ME_AP>Bullet_Valkyrie_AP</Ammo_ME_AP>
-								<Ammo_ME_Cryo>Bullet_Valkyrie_Cryo</Ammo_ME_Cryo>
-								<Ammo_ME_HE>Bullet_Valkyrie_HE</Ammo_ME_HE>
-								<Ammo_ME_FI>Bullet_Valkyrie_FI</Ammo_ME_FI>
-								<Ammo_ME_Ion>Bullet_Valkyrie_Ion</Ammo_ME_Ion>
-								<Ammo_ME_Toxic>Bullet_Valkyrie_Toxic</Ammo_ME_Toxic>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Typhoon</defName>
-							<label>Thermal Clip</label>
-							<ammoTypes>
-								<Ammo_ME>Bullet_Typhoon</Ammo_ME>
-								<Ammo_ME_AP>Bullet_Typhoon_AP</Ammo_ME_AP>
-								<Ammo_ME_Cryo>Bullet_Typhoon_Cryo</Ammo_ME_Cryo>
-								<Ammo_ME_HE>Bullet_Typhoon_HE</Ammo_ME_HE>
-								<Ammo_ME_FI>Bullet_Typhoon_FI</Ammo_ME_FI>
-								<Ammo_ME_Ion>Bullet_Typhoon_Ion</Ammo_ME_Ion>
-								<Ammo_ME_Toxic>Bullet_Typhoon_Toxic</Ammo_ME_Toxic>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Eagle</defName>
-							<label>Thermal Clip</label>
-							<ammoTypes>
-								<Ammo_ME>Bullet_Eagle</Ammo_ME>
-								<Ammo_ME_AP>Bullet_Eagle_AP</Ammo_ME_AP>
-								<Ammo_ME_Cryo>Bullet_Eagle_Cryo</Ammo_ME_Cryo>
-								<Ammo_ME_HE>Bullet_Eagle_HE</Ammo_ME_HE>
-								<Ammo_ME_FI>Bullet_Eagle_FI</Ammo_ME_FI>
-								<Ammo_ME_Ion>Bullet_Eagle_Ion</Ammo_ME_Ion>
-								<Ammo_ME_Toxic>Bullet_Eagle_Toxic</Ammo_ME_Toxic>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Valiant</defName>
-							<label>Thermal Clip</label>
-							<ammoTypes>
-								<Ammo_ME>Bullet_Valiant</Ammo_ME>
-								<Ammo_ME_AP>Bullet_Valiant_AP</Ammo_ME_AP>
-								<Ammo_ME_Cryo>Bullet_Valiant_Cryo</Ammo_ME_Cryo>
-								<Ammo_ME_HE>Bullet_Valiant_HE</Ammo_ME_HE>
-								<Ammo_ME_FI>Bullet_Valiant_FI</Ammo_ME_FI>
-								<Ammo_ME_Ion>Bullet_Valiant_Ion</Ammo_ME_Ion>
-								<Ammo_ME_Toxic>Bullet_Valiant_Toxic</Ammo_ME_Toxic>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Hurricane</defName>
-							<label>Thermal Clip</label>
-							<ammoTypes>
-								<Ammo_ME>Bullet_Hurricane</Ammo_ME>
-								<Ammo_ME_AP>Bullet_Hurricane_AP</Ammo_ME_AP>
-								<Ammo_ME_Cryo>Bullet_Hurricane_Cryo</Ammo_ME_Cryo>
-								<Ammo_ME_HE>Bullet_Hurricane_HE</Ammo_ME_HE>
-								<Ammo_ME_FI>Bullet_Hurricane_FI</Ammo_ME_FI>
-								<Ammo_ME_Ion>Bullet_Hurricane_Ion</Ammo_ME_Ion>
-								<Ammo_ME_Toxic>Bullet_Hurricane_Toxic</Ammo_ME_Toxic>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_BlackWidow</defName>
-							<label>Thermal Clip</label>
-							<ammoTypes>
-								<Ammo_ME>Bullet_BlackWidow</Ammo_ME>
-								<Ammo_ME_AP>Bullet_BlackWidow_AP</Ammo_ME_AP>
-								<Ammo_ME_Cryo>Bullet_BlackWidow_Cryo</Ammo_ME_Cryo>
-								<Ammo_ME_HE>Bullet_BlackWidow_HE</Ammo_ME_HE>
-								<Ammo_ME_FI>Bullet_BlackWidow_FI</Ammo_ME_FI>
-								<Ammo_ME_Ion>Bullet_BlackWidow_Ion</Ammo_ME_Ion>
-								<Ammo_ME_Toxic>Bullet_BlackWidow_Toxic</Ammo_ME_Toxic>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Crusader</defName>
-							<label>Thermal Clip</label>
-							<ammoTypes>
-								<Ammo_ME>Bullet_Crusader</Ammo_ME>
-								<Ammo_ME_AP>Bullet_Crusader_AP</Ammo_ME_AP>
-								<Ammo_ME_Cryo>Bullet_Crusader_Cryo</Ammo_ME_Cryo>
-								<Ammo_ME_HE>Bullet_Crusader_HE</Ammo_ME_HE>
-								<Ammo_ME_FI>Bullet_Crusader_FI</Ammo_ME_FI>
-								<Ammo_ME_Ion>Bullet_Crusader_Ion</Ammo_ME_Ion>
-								<Ammo_ME_Toxic>Bullet_Crusader_Toxic</Ammo_ME_Toxic>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Piranha</defName>
-							<label>Thermal Clip</label>
-							<ammoTypes>
-								<Ammo_ME>Bullet_Piranha</Ammo_ME>
-								<Ammo_ME_AP>Bullet_Piranha_AP</Ammo_ME_AP>
-								<Ammo_ME_Cryo>Bullet_Piranha_Cryo</Ammo_ME_Cryo>
-								<Ammo_ME_HE>Bullet_Piranha_HE</Ammo_ME_HE>
-								<Ammo_ME_FI>Bullet_Piranha_FI</Ammo_ME_FI>
-								<Ammo_ME_Ion>Bullet_Piranha_Ion</Ammo_ME_Ion>
-								<Ammo_ME_Toxic>Bullet_Piranha_Toxic</Ammo_ME_Toxic>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<!-- ================== Valkyrie ================== -->
-
-						<ThingDef Name="BaseValkyrieBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Shot_MassAccelerated_Large</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>400</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseValkyrieBullet">
-							<defName>Bullet_Valkyrie</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>19</damageAmountBase>
-								<armorPenetrationSharp>17</armorPenetrationSharp>
-								<armorPenetrationBlunt>58</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseValkyrieBullet">
-							<defName>Bullet_Valkyrie_AP</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>13</damageAmountBase>
-								<armorPenetrationSharp>34</armorPenetrationSharp>
-								<armorPenetrationBlunt>58</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseValkyrieBullet">
-							<defName>Bullet_Valkyrie_HE</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>19</damageAmountBase>
-								<armorPenetrationSharp>17</armorPenetrationSharp>
-								<armorPenetrationBlunt>58</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>8</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseValkyrieBullet">
-							<defName>Bullet_Valkyrie_Cryo</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>18</damageAmountBase>
-								<armorPenetrationSharp>17</armorPenetrationSharp>
-								<armorPenetrationBlunt>58</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Cryo</def>
-										<amount>4</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseValkyrieBullet">
-							<defName>Bullet_Valkyrie_Toxic</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>18</damageAmountBase>
-								<armorPenetrationSharp>17</armorPenetrationSharp>
-								<armorPenetrationBlunt>58</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Toxin</def>
-										<amount>4</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseValkyrieBullet">
-							<defName>Bullet_Valkyrie_Ion</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>11</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>7</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>19</armorPenetrationSharp>
-								<armorPenetrationBlunt>58</armorPenetrationBlunt>
-								<empShieldBreakChance>0.35</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseValkyrieBullet">
-							<defName>Bullet_Valkyrie_FI</defName>
-							<label>accelerated incendiary shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>18</damageAmountBase>
-								<armorPenetrationSharp>17</armorPenetrationSharp>
-								<armorPenetrationBlunt>58</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_SickBurn</def>
-										<amount>4</amount>
-									</li>
-									<li>
-										<def>Flame</def>
-										<amount>1</amount>
-										<chance>0.3</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== Typhoon ================== -->
-
-						<ThingDef Name="BaseTyphoonBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Shot_MassAccelerated_Large</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>1.0</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>420</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseTyphoonBullet">
-							<defName>Bullet_Typhoon</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationSharp>19</armorPenetrationSharp>
-								<armorPenetrationBlunt>71</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseTyphoonBullet">
-							<defName>Bullet_Typhoon_AP</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>14</damageAmountBase>
-								<armorPenetrationSharp>38</armorPenetrationSharp>
-								<armorPenetrationBlunt>71</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseTyphoonBullet">
-							<defName>Bullet_Typhoon_Cryo</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>19</damageAmountBase>
-								<armorPenetrationSharp>19</armorPenetrationSharp>
-								<armorPenetrationBlunt>71</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Cryo</def>
-										<amount>6</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseTyphoonBullet">
-							<defName>Bullet_Typhoon_Toxic</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>19</damageAmountBase>
-								<armorPenetrationSharp>19</armorPenetrationSharp>
-								<armorPenetrationBlunt>71</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Toxin</def>
-										<amount>6</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseTyphoonBullet">
-							<defName>Bullet_Typhoon_HE</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationSharp>19</armorPenetrationSharp>
-								<armorPenetrationBlunt>71</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>10</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseTyphoonBullet">
-							<defName>Bullet_Typhoon_FI</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationSharp>19</armorPenetrationSharp>
-								<armorPenetrationBlunt>71</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_SickBurn</def>
-										<amount>4</amount>
-									</li>
-									<li>
-										<def>Flame</def>
-										<amount>1</amount>
-										<chance>0.3</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseTyphoonBullet">
-							<defName>Bullet_Typhoon_Ion</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>13</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>8</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>22</armorPenetrationSharp>
-								<armorPenetrationBlunt>71</armorPenetrationBlunt>
-								<empShieldBreakChance>0.35</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== Eagle ================== -->
-
-						<ThingDef Name="BaseEagleBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Shot_MassAccelerated_Small</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>1.2</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>200</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseEagleBullet">
-							<defName>Bullet_Eagle</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>13</damageAmountBase>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>28</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseEagleBullet">
-							<defName>Bullet_Eagle_AP</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>9</damageAmountBase>
-								<armorPenetrationSharp>16</armorPenetrationSharp>
-								<armorPenetrationBlunt>28</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseEagleBullet">
-							<defName>Bullet_Eagle_Cryo</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>28</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Cryo</def>
-										<amount>3</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseEagleBullet">
-							<defName>Bullet_Eagle_Toxic</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>28</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Toxin</def>
-										<amount>3</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseEagleBullet">
-							<defName>Bullet_Eagle_HE</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>13</damageAmountBase>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>28</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>6</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseEagleBullet">
-							<defName>Bullet_Eagle_FI</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>13</damageAmountBase>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>28</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_SickBurn</def>
-										<amount>3</amount>
-									</li>
-									<li>
-										<def>Flame</def>
-										<amount>1</amount>
-										<chance>0.275</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseEagleBullet">
-							<defName>Bullet_Eagle_Ion</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>8</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>5</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<armorPenetrationBlunt>23</armorPenetrationBlunt>
-								<empShieldBreakChance>0.25</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== Hurricane ================== -->
-
-						<ThingDef Name="BaseHurricaneBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Shot_MassAccelerated_Small</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>1.2</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>240</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseHurricaneBullet">
-							<defName>Bullet_Hurricane</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<armorPenetrationBlunt>29</armorPenetrationBlunt>
-								<pelletCount>2</pelletCount>
-								<spreadMult>2</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseHurricaneBullet">
-							<defName>Bullet_Hurricane_AP</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>8</damageAmountBase>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<armorPenetrationBlunt>29</armorPenetrationBlunt>
-								<pelletCount>2</pelletCount>
-								<spreadMult>2</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseHurricaneBullet">
-							<defName>Bullet_Hurricane_Cryo</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>11</damageAmountBase>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<armorPenetrationBlunt>29</armorPenetrationBlunt>
-								<pelletCount>8</pelletCount>
-								<spreadMult>2</spreadMult>
-								<secondaryDamage>
-									<li>
-										<def>ME_Cryo</def>
-										<amount>3</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseHurricaneBullet">
-							<defName>Bullet_Hurricane_Toxic</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>11</damageAmountBase>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<armorPenetrationBlunt>29</armorPenetrationBlunt>
-								<pelletCount>2</pelletCount>
-								<spreadMult>2</spreadMult>
-								<secondaryDamage>
-									<li>
-										<def>ME_Toxin</def>
-										<amount>3</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseHurricaneBullet">
-							<defName>Bullet_Hurricane_HE</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<armorPenetrationBlunt>29</armorPenetrationBlunt>
-								<pelletCount>2</pelletCount>
-								<spreadMult>2</spreadMult>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>6</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseHurricaneBullet">
-							<defName>Bullet_Hurricane_FI</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<armorPenetrationBlunt>29</armorPenetrationBlunt>
-								<pelletCount>2</pelletCount>
-								<spreadMult>2</spreadMult>
-								<secondaryDamage>
-									<li>
-										<def>ME_SickBurn</def>
-										<amount>2</amount>
-									</li>
-									<li>
-										<def>Flame</def>
-										<amount>1</amount>
-										<chance>0.25</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseHurricaneBullet">
-							<defName>Bullet_Hurricane_Ion</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>8</damageAmountBase>
-								<pelletCount>2</pelletCount>
-								<spreadMult>2</spreadMult>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>4</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>29</armorPenetrationBlunt>
-								<empShieldBreakChance>0.25</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== Valiant ================== -->
-
-						<ThingDef Name="BaseValiantBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Shot_MassAccelerated_Sniper</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>1.0</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>500</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseValiantBullet">
-							<defName>Bullet_Valiant</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>29</damageAmountBase>
-								<armorPenetrationSharp>24</armorPenetrationSharp>
-								<armorPenetrationBlunt>88</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseValiantBullet">
-							<defName>Bullet_Valiant_AP</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>19</damageAmountBase>
-								<armorPenetrationSharp>48</armorPenetrationSharp>
-								<armorPenetrationBlunt>88</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseValiantBullet">
-							<defName>Bullet_Valiant_Cryo</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>27</damageAmountBase>
-								<armorPenetrationSharp>24</armorPenetrationSharp>
-								<armorPenetrationBlunt>88</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Cryo</def>
-										<amount>7</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseValiantBullet">
-							<defName>Bullet_Valiant_HE</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>29</damageAmountBase>
-								<armorPenetrationSharp>24</armorPenetrationSharp>
-								<armorPenetrationBlunt>88</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>14</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseValiantBullet">
-							<defName>Bullet_Valiant_Toxic</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>27</damageAmountBase>
-								<armorPenetrationSharp>24</armorPenetrationSharp>
-								<armorPenetrationBlunt>88</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Toxin</def>
-										<amount>7</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseValiantBullet">
-							<defName>Bullet_Valiant_FI</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>29</damageAmountBase>
-								<armorPenetrationSharp>24</armorPenetrationSharp>
-								<armorPenetrationBlunt>88</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_SickBurn</def>
-										<amount>6</amount>
-									</li>
-									<li>
-										<def>Flame</def>
-										<amount>1</amount>
-										<chance>0.55</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseValiantBullet">
-							<defName>Bullet_Valiant_Ion</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>19</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>10</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>27</armorPenetrationSharp>
-								<armorPenetrationBlunt>88</armorPenetrationBlunt>
-								<empShieldBreakChance>0.6</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== Black Widow ================== -->
-
-						<ThingDef Name="BaseBlackWidowBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Shot_MassAccelerated_Sniper</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>1.4</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>ME_BigBullet</damageDef>
-								<speed>500</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBlackWidowBullet">
-							<defName>Bullet_BlackWidow</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>43</damageAmountBase>
-								<armorPenetrationSharp>34</armorPenetrationSharp>
-								<armorPenetrationBlunt>288</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBlackWidowBullet">
-							<defName>Bullet_BlackWidow_AP</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>28</damageAmountBase>
-								<armorPenetrationSharp>68</armorPenetrationSharp>
-								<armorPenetrationBlunt>288</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBlackWidowBullet">
-							<defName>Bullet_BlackWidow_Cryo</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>41</damageAmountBase>
-								<armorPenetrationSharp>34</armorPenetrationSharp>
-								<armorPenetrationBlunt>288</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Cryo</def>
-										<amount>10</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBlackWidowBullet">
-							<defName>Bullet_BlackWidow_HE</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>43</damageAmountBase>
-								<armorPenetrationSharp>34</armorPenetrationSharp>
-								<armorPenetrationBlunt>288</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>21</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBlackWidowBullet">
-							<defName>Bullet_BlackWidow_Toxic</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>41</damageAmountBase>
-								<armorPenetrationSharp>34</armorPenetrationSharp>
-								<armorPenetrationBlunt>288</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Toxin</def>
-										<amount>10</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBlackWidowBullet">
-							<defName>Bullet_BlackWidow_FI</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>43</damageAmountBase>
-								<armorPenetrationSharp>34</armorPenetrationSharp>
-								<armorPenetrationBlunt>288</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_SickBurn</def>
-										<amount>7</amount>
-									</li>
-									<li>
-										<def>Flame</def>
-										<amount>1</amount>
-										<chance>0.95</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBlackWidowBullet">
-							<defName>Bullet_BlackWidow_Ion</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>27</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>17</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>38</armorPenetrationSharp>
-								<armorPenetrationBlunt>288</armorPenetrationBlunt>
-								<empShieldBreakChance>1</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== Crusader ================== -->
-
-						<ThingDef Name="BaseCrusaderBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/Shot_MassAccelerated_Sniper</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>1.2</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>400</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseCrusaderBullet">
-							<defName>Bullet_Crusader</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>38</damageAmountBase>
-								<armorPenetrationSharp>27</armorPenetrationSharp>
-								<armorPenetrationBlunt>136</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseCrusaderBullet">
-							<defName>Bullet_Crusader_AP</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>25</damageAmountBase>
-								<armorPenetrationSharp>54</armorPenetrationSharp>
-								<armorPenetrationBlunt>136</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseCrusaderBullet">
-							<defName>Bullet_Crusader_Cryo</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>36</damageAmountBase>
-								<armorPenetrationSharp>27</armorPenetrationSharp>
-								<armorPenetrationBlunt>136</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Cryo</def>
-										<amount>9</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseCrusaderBullet">
-							<defName>Bullet_Crusader_HE</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>38</damageAmountBase>
-								<armorPenetrationSharp>27</armorPenetrationSharp>
-								<armorPenetrationBlunt>136</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>19</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseCrusaderBullet">
-							<defName>Bullet_Crusader_Toxic</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>36</damageAmountBase>
-								<armorPenetrationSharp>27</armorPenetrationSharp>
-								<armorPenetrationBlunt>136</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_Toxin</def>
-										<amount>9</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseCrusaderBullet">
-							<defName>Bullet_Crusader_FI</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>38</damageAmountBase>
-								<armorPenetrationSharp>27</armorPenetrationSharp>
-								<armorPenetrationBlunt>136</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>ME_SickBurn</def>
-										<amount>7</amount>
-									</li>
-									<li>
-										<def>Flame</def>
-										<amount>1</amount>
-										<chance>0.9</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseCrusaderBullet">
-							<defName>Bullet_Crusader_Ion</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>27</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>12</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-								<armorPenetrationBlunt>136</armorPenetrationBlunt>
-								<empShieldBreakChance>0.9</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== Piranha ================== -->
-
-						<ThingDef ParentName="BaseKatanaBullet">
-							<defName>Bullet_Piranha</defName>
-							<label>accelerated blast</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>9</damageAmountBase>
-								<armorPenetrationSharp>7</armorPenetrationSharp>
-								<armorPenetrationBlunt>16</armorPenetrationBlunt>
-								<pelletCount>8</pelletCount>
-								<spreadMult>21.8</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseKatanaBullet">
-							<defName>Bullet_Piranha_AP</defName>
-							<label>accelerated blast</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>6</damageAmountBase>
-								<armorPenetrationSharp>14</armorPenetrationSharp>
-								<armorPenetrationBlunt>18</armorPenetrationBlunt>
-								<pelletCount>8</pelletCount>
-								<spreadMult>21.8</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseKatanaBullet">
-							<defName>Bullet_Piranha_HE</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>9</damageAmountBase>
-								<armorPenetrationSharp>7</armorPenetrationSharp>
-								<armorPenetrationBlunt>18</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>4</amount>
-									</li>
-								</secondaryDamage>
-								<pelletCount>8</pelletCount>
-								<spreadMult>21.8</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseKatanaBullet">
-							<defName>Bullet_Piranha_Cryo</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>8</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>ME_Cryo</def>
-										<amount>3</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>7</armorPenetrationSharp>
-								<armorPenetrationBlunt>18</armorPenetrationBlunt>
-								<pelletCount>8</pelletCount>
-								<spreadMult>21.8</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseKatanaBullet">
-							<defName>Bullet_Piranha_Toxic</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>8</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>ME_Toxin</def>
-										<amount>3</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>7</armorPenetrationSharp>
-								<armorPenetrationBlunt>18</armorPenetrationBlunt>
-								<pelletCount>8</pelletCount>
-								<spreadMult>21.8</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseKatanaBullet">
-							<defName>Bullet_Piranha_FI</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>9</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>ME_SickBurn</def>
-										<amount>1</amount>
-									</li>
-									<li>
-										<def>Flame</def>
-										<amount>1</amount>
-										<chance>0.065</chance>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>7</armorPenetrationSharp>
-								<armorPenetrationBlunt>18</armorPenetrationBlunt>
-								<pelletCount>8</pelletCount>
-								<spreadMult>21.8</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseKatanaBullet">
-							<defName>Bullet_Piranha_Ion</defName>
-							<label>accelerated shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>6</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>3</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>18</armorPenetrationBlunt>
-								<pelletCount>8</pelletCount>
-								<spreadMult>20.8</spreadMult>
-								<empShieldBreakChance>0.075</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect N7/ME_SpecialsExplosives.xml b/Patches/Rim-Effect N7/ME_SpecialsExplosives.xml
deleted file mode 100644
index 3743128b42..0000000000
--- a/Patches/Rim-Effect N7/ME_SpecialsExplosives.xml	
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Rim-Effect: N7</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-
-								<DamageDef>
-									<defName>ME_Blacked</defName>
-									<label>Blackholed</label>
-									<workerClass>DamageWorker_AddInjury</workerClass>
-									<externalViolence>true</externalViolence>
-									<isExplosive>true</isExplosive>
-									<deathMessage>{0} is consumed by the void.</deathMessage>
-									<hediff>Blast</hediff>
-									<hediffSolid>Crack</hediffSolid>
-									<harmAllLayersUntilOutside>true</harmAllLayersUntilOutside>
-									<impactSoundType>Blunt</impactSoundType>
-									<armorCategory>Blunt</armorCategory>
-									<minDamageToFragment>20</minDamageToFragment>
-									<defaultDamage>200</defaultDamage>
-									<defaultStoppingPower>3.0</defaultStoppingPower>
-									<defaultArmorPenetration>120000</defaultArmorPenetration>
-									<buildingDamageFactor>4</buildingDamageFactor>
-									<buildingDamageFactorPassable>2</buildingDamageFactorPassable>
-									<plantDamageFactor>4</plantDamageFactor>
-									<explosionAffectOutsidePartsOnly>false</explosionAffectOutsidePartsOnly>
-									<explosionHeatEnergyPerCell>-5</explosionHeatEnergyPerCell>
-									<explosionCellFleck>BlastDry</explosionCellFleck>
-									<explosionColorCenter>(1, 0.5, 0.3)</explosionColorCenter>
-									<explosionColorEdge>(0.6, 0.5, 0.4)</explosionColorEdge>
-									<soundExplosion>Explosion_Bomb</soundExplosion>
-									<combatLogRules>Damage_Bomb</combatLogRules>
-								</DamageDef>
-
-								<DamageDef>
-									<defName>ME_BigKill</defName>
-									<label>Carnage</label>
-									<workerClass>DamageWorker_AddInjury</workerClass>
-									<externalViolence>true</externalViolence>
-									<isExplosive>true</isExplosive>
-									<deathMessage>{0} is carnaged.</deathMessage>
-									<hediff>Blast</hediff>
-									<hediffSolid>Crack</hediffSolid>
-									<harmAllLayersUntilOutside>true</harmAllLayersUntilOutside>
-									<impactSoundType>Blunt</impactSoundType>
-									<armorCategory>Blunt</armorCategory>
-									<minDamageToFragment>10</minDamageToFragment>
-									<defaultDamage>43</defaultDamage>
-									<defaultStoppingPower>1.0</defaultStoppingPower>
-									<defaultArmorPenetration>150</defaultArmorPenetration>
-									<buildingDamageFactor>4</buildingDamageFactor>
-									<buildingDamageFactorPassable>2</buildingDamageFactorPassable>
-									<plantDamageFactor>4</plantDamageFactor>
-									<explosionAffectOutsidePartsOnly>false</explosionAffectOutsidePartsOnly>
-									<explosionHeatEnergyPerCell>5</explosionHeatEnergyPerCell>
-									<explosionCellFleck>BlastDry</explosionCellFleck>
-									<explosionColorCenter>(1, 0.5, 0.3)</explosionColorCenter>
-									<explosionColorEdge>(0.6, 0.5, 0.4)</explosionColorEdge>
-									<soundExplosion>Explosion_Bomb</soundExplosion>
-									<combatLogRules>Damage_Bomb</combatLogRules>
-								</DamageDef>
-							</value>
-						</li>
-
-						<li Class='PatchOperationReplace'>
-							<xpath>Defs/ThingDef[defName='REN7_Rocket_BlackHole']/projectile</xpath>
-							<value>
-								<projectile>
-									<damageDef>ME_Blacked</damageDef>
-									<explosionRadius>9.5</explosionRadius>
-									<flyOverhead>true</flyOverhead>
-									<speed>27</speed>
-								</projectile>
-							</value>
-						</li>
-
-						<li Class='PatchOperationReplace'>
-							<xpath>Defs/ThingDef[defName='REN7_CarnageProjectile']/projectile</xpath>
-							<value>
-								<projectile>
-									<damageDef>ME_BigKill</damageDef>
-									<speed>60</speed>
-									<explosionRadius>2</explosionRadius>
-								</projectile>
-							</value>
-						</li>
-
-						<li Class='PatchOperationReplace'>
-							<xpath>Defs/ThingDef[defName='REN7_DarkChannelProjectile']/projectile/armorPenetrationBase</xpath>
-							<value>
-								<armorPenetrationBase>1000</armorPenetrationBase>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect N7/Pawns_N7.xml b/Patches/Rim-Effect N7/Pawns_N7.xml
deleted file mode 100644
index fee2d4633f..0000000000
--- a/Patches/Rim-Effect N7/Pawns_N7.xml	
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: N7</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="REN7_N7AgentAdept" or
-						defName="REN7_N7AgentEngineer"] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>9</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-								<li>
-									<generateChance>0.2</generateChance>
-									<sidearmMoney>
-										<min>10</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>GrenadeSmoke</li>
-										<li>GrenadeDestructive</li>
-										<li>CE_GrenadeFlashbang</li>
-									</weaponTags>
-									<magazineCount>
-										<min>0</min>
-										<max>1</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- ======= Combat Power ======= -->
-
-				<!-- N7 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[
-						defName="REN7_N7AgentAdept" or
-						defName="REN7_N7AgentEngineer"
-						]/combatPower </xpath>
-					<value>
-						<combatPower>400</combatPower>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Effect N7/Weapons_N7.xml b/Patches/Rim-Effect N7/Weapons_N7.xml
deleted file mode 100644
index 52fb73f398..0000000000
--- a/Patches/Rim-Effect N7/Weapons_N7.xml	
+++ /dev/null
@@ -1,699 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Effect: N7</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Melee Tools ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Gun_N7Pistol" or defName="REN7_Gun_N7SMG"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Gun_N7BattleRifle" or defName="REN7_Gun_N7Shotgun" or defName="REN7_Gun_N7DMR"
-						or defName="REN7_Gun_N7AntimaterielRifle" or defName="REN7_Gun_N7BlackHoleGenerator" or defName="REN7_Gun_N7ChainShotgun" or defName="REN7_Gun_N7LMG"]/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>
-				</li>
-
-				<!-- === N7Blade === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="REN7_MeleeWeapon_N7Blade"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="REN7_MeleeWeapon_N7Blade"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.8</MeleeCritChance>
-							<MeleeParryChance>0.33</MeleeParryChance>
-							<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_MeleeWeapon_N7Blade"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<armorPenetrationSharp>5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.1</cooldownTime>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='RE_Gun_N7Pistol']/recipeMaker/skillRequirements</xpath>
-					<value>
-						<skillRequirements>
-							<Crafting>7</Crafting>
-						</skillRequirements>
-					</value>
-				</li>
-
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='REN7_Gun_N7BattleRifle' or defName='REN7_Gun_N7DMR' or defName='REN7_Gun_N7Shotgun']/recipeMaker/skillRequirements</xpath>
-					<value>
-						<skillRequirements>
-							<Crafting>9</Crafting>
-						</skillRequirements>
-					</value>
-				</li>
-
-				<!-- ========== Blackstorm ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Gun_N7BlackHoleGenerator"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li>
-								<verbClass>Verb_ShootOneUse</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>REN7_Rocket_BlackHole</defaultProjectile>
-								<burstShotCount>1</burstShotCount>
-								<forcedMissRadius>1.9</forcedMissRadius>
-								<warmupTime>3</warmupTime>
-								<range>70</range>
-								<soundCast>REN7_Shot_N7BlackHoleGenerator</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<onlyManualCast>true</onlyManualCast>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-									<canTargetPawns>true</canTargetPawns>
-								</targetParams>
-								<muzzleFlashScale>30</muzzleFlashScale>
-								<ai_AvoidFriendlyFireRadius>7</ai_AvoidFriendlyFireRadius>
-								<minRange>7</minRange>
-								<requireLineOfSight>true</requireLineOfSight>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Gun_N7BlackHoleGenerator"]/statBases</xpath>
-					<value>
-						<statBases>
-							<WorkToMake>80000</WorkToMake>
-							<MarketValue>8000</MarketValue>
-							<Mass>12</Mass>
-							<RangedWeapon_Cooldown>0.65</RangedWeapon_Cooldown>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Gun_N7BlackHoleGenerator"]/costList</xpath>
-					<value>
-						<costList>
-							<Plasteel>50</Plasteel>
-							<Uranium>10</Uranium>
-							<ComponentSpacer>3</ComponentSpacer>
-							<RE_ElementZero>30</RE_ElementZero>
-						</costList>
-					</value>
-				</li>
-
-				<!-- Name -->
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='REN7_Gun_N7BlackHoleGenerator']/label</xpath>
-					<value>
-						<label>M-490 Blackstorm</label>
-					</value>
-				</li>
-
-				<!-- ========== Valkyrie ========== -->
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>REN7_Gun_N7BattleRifle</defName>
-					<statBases>
-						<WorkToMake>39000</WorkToMake>
-						<SightsEfficiency>1.2</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.22</SwayFactor>
-						<Bulk>7.6</Bulk>
-						<Mass>4.7</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Valkyrie</defaultProjectile>
-						<burstShotCount>4</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>0.8</warmupTime>
-						<range>56</range>
-						<soundCast>REN7_Shot_N7BattleRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilAmount>1.31</recoilAmount>
-					</Properties>
-					<costList>
-						<Steel>25</Steel>
-						<Plasteel>35</Plasteel>
-						<ComponentSpacer>2</ComponentSpacer>
-						<Chemfuel>10</Chemfuel>
-						<RE_ElementZero>6</RE_ElementZero>
-					</costList>
-					<AmmoUser>
-						<magazineSize>16</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_Valkyrie</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- Name -->
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='REN7_Gun_N7BattleRifle']/label</xpath>
-					<value>
-						<label>N7 Valkyrie</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Gun_N7BattleRifle"]/description</xpath>
-					<value>
-						<description>Based on the popular M8 Avenger, the Valkyrie is an accurate and deadly rifle that fires powerful slugs in 2 round bursts, it quickly became a hot black-market item when it surfaces.</description>
-					</value>
-				</li>
-
-				<!-- ========== N7 Typhoon ========== -->
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>REN7_Gun_N7LMG</defName>
-					<statBases>
-						<WorkToMake>65000</WorkToMake>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.57</SwayFactor>
-						<Bulk>14</Bulk>
-						<Mass>9</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Typhoon</defaultProjectile>
-						<warmupTime>1.35</warmupTime>
-						<range>62</range>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>REN7_Shot_N7LMG</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-						<recoilAmount>1.39</recoilAmount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<costList>
-						<Steel>50</Steel>
-						<Plasteel>50</Plasteel>
-						<ComponentSpacer>4</ComponentSpacer>
-						<Chemfuel>20</Chemfuel>
-						<RE_ElementZero>15</RE_ElementZero>
-					</costList>
-					<AmmoUser>
-						<magazineSize>200</magazineSize>
-						<reloadTime>6</reloadTime>
-						<ammoSet>AmmoSet_Typhoon</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- Name -->
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='REN7_Gun_N7LMG']/label</xpath>
-					<value>
-						<label>N7 Typhoon</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Gun_N7LMG"]/description</xpath>
-					<value>
-						<description>The Typhoon is a distinctive light machine gun featuring a face shield to protect the shooter from stray shots. It is heavy, clumsy and highly ammo intentsive to fire, but it more than made up for it through the sheer firepower it could put down range.(Has a 10% chance to deflect any incoming projectile)</description>
-					</value>
-				</li>
-
-				<!-- ========== Eagle ========== -->
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>RE_Gun_N7Pistol</defName>
-					<statBases>
-						<WorkToMake>20000</WorkToMake>
-						<SightsEfficiency>0.85</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.09</SwayFactor>
-						<Bulk>2.2</Bulk>
-						<Mass>1.1</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Eagle</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>18</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>REN7_Shot_N7Pistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-						<recoilAmount>1.49</recoilAmount>
-					</Properties>
-					<costList>
-						<Steel>15</Steel>
-						<Plasteel>15</Plasteel>
-						<ComponentSpacer>1</ComponentSpacer>
-						<Chemfuel>4</Chemfuel>
-						<RE_ElementZero>3</RE_ElementZero>
-					</costList>
-					<AmmoUser>
-						<magazineSize>18</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_Eagle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- Name -->
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='RE_Gun_N7Pistol']/label</xpath>
-					<value>
-						<label>N7 Eagle</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RE_Gun_N7Pistol"]/description</xpath>
-					<value>
-						<description>The latest result of the Alliance's offensive handgun project, the Eagle is a compact, fully automatic pistol that delivers unprecedented accuracy and punch with a rapid firing rate.</description>
-					</value>
-				</li>
-				<!-- ========== Hurricane ========== -->
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>REN7_Gun_N7SMG</defName>
-					<statBases>
-						<WorkToMake>45000</WorkToMake>
-						<SightsEfficiency>0.95</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>4</Bulk>
-						<Mass>2.25</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Hurricane</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>REN7_Shot_N7SMG</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-						<recoilAmount>2.3</recoilAmount>
-					</Properties>
-					<costList>
-						<Steel>20</Steel>
-						<Plasteel>20</Plasteel>
-						<ComponentSpacer>2</ComponentSpacer>
-						<Chemfuel>8</Chemfuel>
-						<RE_ElementZero>10</RE_ElementZero>
-					</costList>
-					<AmmoUser>
-						<magazineSize>40</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_Hurricane</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- Name -->
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='REN7_Gun_N7SMG']/label</xpath>
-					<value>
-						<label>N7 Hurricane</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Gun_N7SMG"]/description</xpath>
-					<value>
-						<description>A submachine gun with an unpleasantly high rate of fire for both its user and its target. While some militaries pass on the Hurricane because of its lower accuracy and high recoil, its frightening ability to chew thorugh targets at close range makes it a favourite amongst close quarter specialists.</description>
-					</value>
-				</li>
-
-				<!-- ========== Valiant ========== -->
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>REN7_Gun_N7DMR</defName>
-					<statBases>
-						<WorkToMake>48000</WorkToMake>
-						<SightsEfficiency>2.8</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.37</SwayFactor>
-						<Bulk>9.0</Bulk>
-						<Mass>3.70</Mass>
-						<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Valiant</defaultProjectile>
-						<warmupTime>1.45</warmupTime>
-						<range>77</range>
-						<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
-						<soundCast>REN7_Shot_N7DMR</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<costList>
-						<Steel>35</Steel>
-						<Plasteel>40</Plasteel>
-						<ComponentSpacer>2</ComponentSpacer>
-						<Chemfuel>10</Chemfuel>
-						<RE_ElementZero>12</RE_ElementZero>
-					</costList>
-					<AmmoUser>
-						<magazineSize>9</magazineSize>
-						<reloadTime>2.5</reloadTime>
-						<ammoSet>AmmoSet_Valiant</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<!-- Required research rework -->
-					<!--    <researchPrerequisite>PrecisionRifling</researchPrerequisite> -->
-				</li>
-
-				<!-- Name -->
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='REN7_Gun_N7DMR']/label</xpath>
-					<value>
-						<label>N7 Valiant</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Gun_N7DMR"]/description</xpath>
-					<value>
-						<description>The Valiant is a streamlined sniper rifle noted for its sophisticated fire-control system which makes it easy to use and quick to reload, it is a good balance of single shot stopping power, accuracy and rate of fire. Proven to be reliable even in harsh environments, it is popular among alliance N7 recon and scout troopers.</description>
-					</value>
-				</li>
-
-				<!-- ========== Black Widow ========== -->
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>REN7_Gun_N7AntimaterielRifle</defName>
-					<statBases>
-						<WorkToMake>70000</WorkToMake>
-						<SightsEfficiency>3.75</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.88</SwayFactor>
-						<Bulk>15</Bulk>
-						<Mass>10</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_BlackWidow</defaultProjectile>
-						<warmupTime>2.0</warmupTime>
-						<range>86</range>
-						<ammoConsumedPerShotCount>10</ammoConsumedPerShotCount>
-						<soundCast>REN7_Shot_N7AntiMaterielRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-					</Properties>
-					<costList>
-						<Steel>50</Steel>
-						<Plasteel>70</Plasteel>
-						<ComponentSpacer>4</ComponentSpacer>
-						<Chemfuel>20</Chemfuel>
-						<RE_ElementZero>16</RE_ElementZero>
-					</costList>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>3.9</reloadTime>
-						<ammoSet>AmmoSet_BlackWidow</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SniperRifle</li>
-					</weaponTags>
-					<!-- Required research rework -->
-					<!--    <researchPrerequisite>PrecisionRifling</researchPrerequisite> -->
-				</li>
-
-				<!-- Name -->
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='REN7_Gun_N7AntimaterielRifle']/label</xpath>
-					<value>
-						<label>Black Widow</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Gun_N7AntimaterielRifle"]/description</xpath>
-					<value>
-						<description>A development aimed at improving on the original M98 Widow, the Black Widow is a heavy anti-material rifle aimed at recifying the slow fire rate of the original widow by allowing for multiple shot before needing to load another thermal clip. While it does have a noticeably lower per-shot stopping power, the Black Widow's ability to make quick follow up shots makes it superior in most combat situations.</description>
-					</value>
-				</li>
-
-				<!-- ========== Crusader ========== -->
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>REN7_Gun_N7Shotgun</defName>
-					<statBases>
-						<WorkToMake>34000</WorkToMake>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.52</SwayFactor>
-						<Bulk>8</Bulk>
-						<Mass>5.8</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Crusader</defaultProjectile>
-						<warmupTime>0.75</warmupTime>
-						<range>48</range>
-						<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
-						<soundCast>REN7_Shot_N7Shotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<costList>
-						<Steel>30</Steel>
-						<Plasteel>30</Plasteel>
-						<ComponentSpacer>2</ComponentSpacer>
-						<Chemfuel>10</Chemfuel>
-						<RE_ElementZero>8</RE_ElementZero>
-					</costList>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_Crusader</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<!-- Required research rework -->
-					<!--    <researchPrerequisite>PrecisionRifling</researchPrerequisite> -->
-				</li>
-
-				<!-- Name -->
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='REN7_Gun_N7Shotgun']/label</xpath>
-					<value>
-						<label>N7 Crusader</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Gun_N7Shotgun"]/description</xpath>
-					<value>
-						<description>While frequently referred to as a "shotgun", the Crusader has nothing in common with other shotgun other than its patterned design. Instead of firing multiple small projectiles with every pull of the trigger, it fires a single heavy slug with high precision, careful aiming should be employed when using this deadly weapon.</description>
-					</value>
-				</li>
-
-				<!-- ==========Piranha ========== -->
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>REN7_Gun_N7ChainShotgun</defName>
-					<statBases>
-						<WorkToMake>45000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<Bulk>8</Bulk>
-						<Mass>4</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Piranha</defaultProjectile>
-						<warmupTime>0.7</warmupTime>
-						<range>18</range>
-						<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<soundCast>REN7_Shot_N7ChainShotgun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-						<recoilAmount>1.47</recoilAmount>
-					</Properties>
-					<costList>
-						<Steel>20</Steel>
-						<Plasteel>35</Plasteel>
-						<ComponentSpacer>3</ComponentSpacer>
-						<Chemfuel>10</Chemfuel>
-						<RE_ElementZero>10</RE_ElementZero>
-					</costList>
-					<AmmoUser>
-						<magazineSize>24</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_Piranha</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<!-- Required research rework -->
-					<!--    <researchPrerequisite>PrecisionRifling</researchPrerequisite> -->
-				</li>
-
-				<!-- Name -->
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[defName='REN7_Gun_N7ChainShotgun']/label</xpath>
-					<value>
-						<label>N7 Piranha</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="REN7_Gun_N7ChainShotgun"]/description</xpath>
-					<value>
-						<description>The N7 Piranha is a light assault shotgun that features an impressive fire rate, the relatively large spread of its submunitions is a deliberate feature to combat hordes of charging melee enemies. It is popular among lighter frame alien species and widely distributed by the Alliance amongst its alien clients in order to fight a common foe.</description>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Elves/Ammo_Elves.xml b/Patches/Rim-Elves/Ammo_Elves.xml
deleted file mode 100644
index cecf506bae..0000000000
--- a/Patches/Rim-Elves/Ammo_Elves.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Elves</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- Custom Ammoset -->
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_ChargedGreatArrow</defName>
-							<label>plasteel great arrows</label>
-							<ammoTypes>
-								<Ammo_GreatArrow_Plasteel>Projectile_ChargedGreatArrow_Plasteel</Ammo_GreatArrow_Plasteel>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- Custom Projectile -->
-						<ThingDef ParentName="BaseGreatArrowProjectile">
-							<defName>Projectile_ChargedGreatArrow_Plasteel</defName>
-							<label>charged great arrow</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Plasteel</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>19</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>6</amount>
-									</li>
-								</secondaryDamage>
-								<speed>151</speed>
-								<armorPenetrationSharp>16</armorPenetrationSharp>
-								<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
-								<preExplosionSpawnChance>0.25</preExplosionSpawnChance><!-- 40 arrows per resource -->
-								<preExplosionSpawnThingDef>Ammo_GreatArrow_Plasteel</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Elves/GeneDefs_Elves.xml b/Patches/Rim-Elves/GeneDefs_Elves.xml
deleted file mode 100644
index bf24798263..0000000000
--- a/Patches/Rim-Elves/GeneDefs_Elves.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Elves</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/GeneDef[defName="Size_Gigantism"]/statOffsets/CarryingCapacity</xpath>
-					<value>
-						<CarryWeight>15</CarryWeight>
-						<CarryBulk>10</CarryBulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Elves/PawnKinds_Elves.xml b/Patches/Rim-Elves/PawnKinds_Elves.xml
deleted file mode 100644
index d21ad56d89..0000000000
--- a/Patches/Rim-Elves/PawnKinds_Elves.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Elves</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Medieval Pawnkinds -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RE_Elven_Archer"] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>14</min>
-								<max>24</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>80</min>
-										<max>160</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>NeolithicMeleeBasic</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RE_Elven_Levy"] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>80</min>
-								<max>110</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.25</shieldChance>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RE_Elven_Swordsman"] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>100</min>
-								<max>140</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.25</shieldChance>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RE_Elven_Ranger"] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>20</min>
-								<max>40</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>120</min>
-										<max>180</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>MedievalMeleeBasic</li>
-										<li>NeolithicMeleeDecent</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RE_Elven_Knight"] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>120</min>
-								<max>180</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.4</shieldChance>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Elven_Supreme_NobleRanged"] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>20</min>
-								<max>40</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>150</min>
-										<max>240</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>ElvenMedievalMelee</li>
-										<li>MedievalMeleeAdvanced</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- Spacer Pawnkinds -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="ElvenSoldierBase" or @Name="ElvenKnightBase"] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>10</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Elven_Soldier_Grenadier"] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>12</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.8</generateChance>
-									<sidearmMoney>
-										<min>10</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm</li>
-									</weaponTags>
-									<magazineCount>
-										<min>3</min>
-										<max>6</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Elven_Soldier_Lancer"] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>20</min>
-								<max>40</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Elves/Weapons_Elves.xml b/Patches/Rim-Elves/Weapons_Elves.xml
deleted file mode 100644
index b7bedf5603..0000000000
--- a/Patches/Rim-Elves/Weapons_Elves.xml
+++ /dev/null
@@ -1,238 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Elves</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Elven Longbow ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Bow_ElvenLong</defName>
-					<statBases>
-						<SightsEfficiency>0.85</SightsEfficiency>
-						<ShotSpread>0.8</ShotSpread>
-						<SwayFactor>1.8</SwayFactor>
-						<Bulk>4.00</Bulk>
-						<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_GreatArrow_Stone</defaultProjectile>
-						<warmupTime>1.9</warmupTime>
-						<range>33</range>
-						<soundCast>Bow_Large</soundCast>
-					</Properties>
-					<AmmoUser>
-						<ammoSet>AmmoSet_GreatArrow</ammoSet>
-					</AmmoUser>
-					<FireModes />
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bow_ElvenLong"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Elven Scimitar ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_ElvenScimitar"]/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>20</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.28</armorPenetrationSharp>
-								<chanceFactor>0.33</chanceFactor>
-								<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>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_ElvenScimitar"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.38</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_ElvenScimitar"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.24</MeleeCritChance>
-							<MeleeParryChance>0.38</MeleeParryChance>
-							<MeleeDodgeChance>0.28</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_ElvenScimitar"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- ========== Elven Chargebow ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Bow_ElvenCharge</defName>
-					<statBases>
-						<SightsEfficiency>1.2</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.8</SwayFactor>
-						<Bulk>3.5</Bulk>
-						<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_ChargedGreatArrow_Plasteel</defaultProjectile>
-						<warmupTime>0.85</warmupTime>
-						<range>55</range>
-						<soundCast>ChargeBowElven_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-					</Properties>
-					<AmmoUser>
-						<ammoSet>AmmoSet_ChargedGreatArrow</ammoSet>
-					</AmmoUser>
-					<FireModes />
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bow_ElvenCharge"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Elven Banebrand ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_BaneBrand"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<chanceFactor>0.1</chanceFactor>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>33</power>
-								<cooldownTime>0.78</cooldownTime>
-								<armorPenetrationBlunt>2.84</armorPenetrationBlunt>
-								<armorPenetrationSharp>16</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>0.94</cooldownTime>
-								<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
-								<armorPenetrationSharp>16</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_BaneBrand"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>3</Bulk>
-							<MeleeCounterParryBonus>0.40</MeleeCounterParryBonus>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_BaneBrand"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.90</MeleeCritChance>
-							<MeleeParryChance>0.40</MeleeParryChance>
-							<MeleeDodgeChance>0.32</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_BaneBrand"]</xpath>
-					<value>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Hivers!/New_Hivers.xml b/Patches/Rim-Hivers!/New_Hivers.xml
deleted file mode 100644
index cb93973c37..0000000000
--- a/Patches/Rim-Hivers!/New_Hivers.xml
+++ /dev/null
@@ -1,323 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Hivers!</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ========== Tribals ========== -->
-
-						<PawnKindDef ParentName="CivilHiverBase">
-							<defName>HiveGrenadier</defName>
-							<race>Hiver_Soldier</race>
-							<label>Hive boomer</label>
-							<initialWillRange>1~3</initialWillRange>
-							<initialResistanceRange>12~19</initialResistanceRange>
-							<combatPower>60</combatPower>
-							<maxGenerationAge>60</maxGenerationAge>
-							<canBeSapper>true</canBeSapper>
-							<gearHealthRange>
-								<min>0.5</min>
-								<max>1.8</max>
-							</gearHealthRange>
-							<apparelMoney>
-								<min>180</min>
-								<max>350</max>
-							</apparelMoney>
-							<apparelRequired>
-								<li>Apparel_WarVeil</li>
-								<li>CE_Apparel_TribalBackpack</li>
-							</apparelRequired>
-							<apparelTags>
-								<li>Tribal</li>
-							</apparelTags>
-							<weaponMoney>
-								<min>60</min>
-								<max>400</max>
-							</weaponMoney>
-							<weaponTags>
-								<li>CE_GrenadeNeolithic</li>
-							</weaponTags>
-							<modExtensions>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>6</min>
-										<max>15</max>
-									</primaryMagazineCount>
-									<forcedSidearm>
-										<sidearmMoney>
-											<min>80</min>
-											<max>160</max>
-										</sidearmMoney>
-										<weaponTags>
-											<li>CE_Sidearm_Tribal</li>
-										</weaponTags>
-									</forcedSidearm>
-								</li>
-							</modExtensions>
-						</PawnKindDef>
-
-						<PawnKindDef ParentName="CivilHiverBase">
-							<defName>HiveGunner</defName>
-							<race>Hiver_Soldier</race>
-							<label>Hive thunderer</label>
-							<initialWillRange>3~5</initialWillRange>
-							<initialResistanceRange>20~34</initialResistanceRange>
-							<combatPower>60</combatPower>
-							<maxGenerationAge>60</maxGenerationAge>
-							<gearHealthRange>
-								<min>0.5</min>
-								<max>1.8</max>
-							</gearHealthRange>
-							<apparelMoney>
-								<min>180</min>
-								<max>350</max>
-							</apparelMoney>
-							<apparelTags>
-								<li>Tribal</li>
-							</apparelTags>
-							<apparelRequired>
-								<li>Apparel_WarMask</li>
-							</apparelRequired>
-							<weaponMoney>
-								<min>180</min>
-								<max>290</max>
-							</weaponMoney>
-							<weaponTags>
-								<li>Gun</li>
-							</weaponTags>
-							<modExtensions>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>4</max>
-									</primaryMagazineCount>
-									<shieldMoney>
-										<min>120</min>
-										<max>160</max>
-									</shieldMoney>
-									<shieldTags>
-										<li>TribalShield</li>
-									</shieldTags>
-									<shieldChance>0.9</shieldChance>
-									<sidearms>
-										<li>
-											<sidearmMoney>
-												<min>100</min>
-												<max>600</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_Sidearm_Tribal</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</modExtensions>
-						</PawnKindDef>
-
-						<PawnKindDef ParentName="SavageHiverBase">
-							<defName>HiveGrenadierS</defName>
-							<label>Hive boomer</label>
-							<race>Hiver_Soldier_South</race>
-							<combatPower>60</combatPower>
-							<maxGenerationAge>60</maxGenerationAge>
-							<canBeSapper>true</canBeSapper>
-							<initialWillRange>1~3</initialWillRange>
-							<initialResistanceRange>12~19</initialResistanceRange>
-							<gearHealthRange>
-								<min>0.5</min>
-								<max>1.8</max>
-							</gearHealthRange>
-							<apparelMoney>
-								<min>180</min>
-								<max>350</max>
-							</apparelMoney>
-							<apparelRequired>
-								<li>Apparel_WarVeil</li>
-							</apparelRequired>
-							<apparelTags>
-								<li>Tribal</li>
-							</apparelTags>
-							<weaponMoney>
-								<min>60</min>
-								<max>400</max>
-							</weaponMoney>
-							<weaponTags>
-								<li>CE_GrenadeNeolithic</li>
-							</weaponTags>
-							<modExtensions>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>8</min>
-										<max>20</max>
-									</primaryMagazineCount>
-									<forcedSidearm>
-										<sidearmMoney>
-											<min>80</min>
-											<max>160</max>
-										</sidearmMoney>
-										<weaponTags>
-											<li>CE_Sidearm_Tribal</li>
-										</weaponTags>
-									</forcedSidearm>
-								</li>
-							</modExtensions>
-						</PawnKindDef>
-
-						<PawnKindDef ParentName="SavageHiverBase">
-							<defName>HiveGunnerS</defName>
-							<label>Hive thunderer</label>
-							<race>Hiver_Soldier_South</race>
-							<combatPower>60</combatPower>
-							<maxGenerationAge>60</maxGenerationAge>
-							<initialWillRange>1~3</initialWillRange>
-							<initialResistanceRange>12~19</initialResistanceRange>
-							<gearHealthRange>
-								<min>0.5</min>
-								<max>1.8</max>
-							</gearHealthRange>
-							<apparelMoney>
-								<min>180</min>
-								<max>350</max>
-							</apparelMoney>
-							<apparelTags>
-								<li>Tribal</li>
-							</apparelTags>
-							<apparelRequired>
-								<li>Apparel_WarMask</li>
-							</apparelRequired>
-							<weaponMoney>
-								<min>180</min>
-								<max>290</max>
-							</weaponMoney>
-							<weaponTags>
-								<li>Gun</li>
-							</weaponTags>
-							<modExtensions>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>4</max>
-									</primaryMagazineCount>
-									<shieldMoney>
-										<min>120</min>
-										<max>160</max>
-									</shieldMoney>
-									<shieldTags>
-										<li>TribalShield</li>
-									</shieldTags>
-									<shieldChance>0.9</shieldChance>
-									<sidearms>
-										<li>
-											<sidearmMoney>
-												<min>100</min>
-												<max>600</max>
-											</sidearmMoney>
-											<weaponTags>
-												<li>CE_Sidearm_Tribal</li>
-											</weaponTags>
-										</li>
-									</sidearms>
-								</li>
-							</modExtensions>
-						</PawnKindDef>
-
-					</value>
-				</li>
-
-				<!-- ========== Add tribal grenadies ========== -->
-
-				<!-- ========== Civil ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/FactionDef[defName="HiverCivil"]/pawnGroupMakers/li[1]/options</xpath>
-					<value>
-						<HiveGrenadier>3</HiveGrenadier>
-						<HiveGunner>7</HiveGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/FactionDef[defName="HiverCivil"]/pawnGroupMakers/li[3]/options</xpath>
-					<value>
-						<HiveGrenadier>4</HiveGrenadier>
-						<HiveGunner>6</HiveGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/FactionDef[defName="HiverCivil"]/pawnGroupMakers/li[4]/options</xpath>
-					<value>
-						<HiveGrenadier>4</HiveGrenadier>
-						<HiveGunner>6</HiveGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/FactionDef[defName="HiverCivil"]/pawnGroupMakers/li[5]/options</xpath>
-					<value>
-						<HiveGrenadier>5</HiveGrenadier>
-						<HiveGunner>5</HiveGunner>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/FactionDef[defName="HiverCivil"]/pawnGroupMakers/li[8]/options</xpath>
-					<value>
-						<HiveGrenadier>8</HiveGrenadier>
-						<HiveGunner>12</HiveGunner>
-					</value>
-				</li>
-
-				<!-- ========== Savage ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/FactionDef[defName="HiverSavage"]/pawnGroupMakers/li[1]/options</xpath>
-					<value>
-						<HiveGrenadierS>5</HiveGrenadierS>
-						<HiveGunnerS>8</HiveGunnerS>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/FactionDef[defName="HiverSavage"]/pawnGroupMakers/li[3]/options</xpath>
-					<value>
-						<HiveGrenadierS>5</HiveGrenadierS>
-						<HiveGunnerS>8</HiveGunnerS>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/FactionDef[defName="HiverSavage"]/pawnGroupMakers/li[4]/options</xpath>
-					<value>
-						<HiveGrenadierS>5</HiveGrenadierS>
-						<HiveGunnerS>8</HiveGunnerS>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/FactionDef[defName="HiverSavage"]/pawnGroupMakers/li[5]/options</xpath>
-					<value>
-						<HiveGrenadierS>5</HiveGrenadierS>
-						<HiveGunnerS>8</HiveGunnerS>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/FactionDef[defName="HiverSavage"]/pawnGroupMakers/li[6]/options</xpath>
-					<value>
-						<HiveGrenadierS>8</HiveGrenadierS>
-						<HiveGunnerS>12</HiveGunnerS>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Hivers!/Patch_Bodies_Hivers.xml b/Patches/Rim-Hivers!/Patch_Bodies_Hivers.xml
deleted file mode 100644
index 33203858b4..0000000000
--- a/Patches/Rim-Hivers!/Patch_Bodies_Hivers.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Hivers!</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Changing coverage of the bodyDef (should've done this sooner, but eh) -->
-				<!-- why yes dear explorer of this file, i did just literally copy and paste the HiverBody bodytype patches -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="HiverBody"]/corePart/parts/li[def="Ribcage"]/coverage</xpath>
-					<value>
-						<coverage>0.07</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="HiverBody"]/corePart/parts/li[def="Pelvis"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="HiverBody"]/corePart/parts/li[def="Stomach"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="HiverBody"]/corePart/parts/li[def="Heart"]/coverage</xpath>
-					<value>
-						<coverage>0.04</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="HiverBody"]/corePart/parts/li[def="Lung"]/coverage</xpath>
-					<value>
-						<coverage>0.055</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="HiverBody"]/corePart/parts/li[def="Kidney"]/coverage</xpath>
-					<value>
-						<coverage>0.03</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="HiverBody"]/corePart/parts/li[def="Liver"]/coverage</xpath>
-					<value>
-						<coverage>0.06</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="HiverBody"]/corePart/parts/li[def="Neck"]/coverage</xpath>
-					<value>
-						<coverage>0.055</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="HiverBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Skull"]/parts/li[def="Brain"]/coverage</xpath>
-					<value>
-						<coverage>0.9</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="HiverBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Eye"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="HiverBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Antenna"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="HiverBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="InsectNostril"]/coverage</xpath>
-					<value>
-						<coverage>0.08</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="HiverBody"]/corePart/parts/li[def="Shoulder"]/coverage</xpath>
-					<value>
-						<coverage>0.085</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="HiverBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Clavicle"]/coverage</xpath>
-					<value>
-						<coverage>0.06</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="HiverBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Humerus"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="HiverBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Radius"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="HiverBody"]//*[
-						def="Torso" or
-						def="Neck" or
-						def="Head" or
-						def="Jaw" or
-						def="Antenna" or
-						def="InsectNostril" or
-						def="Shoulder" or
-						def="Arm" or
-						def="Hand" or
-						def="Finger" or
-						def="Leg"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="HiverBody"]//*[
-						def="Jaw" or
-						def="InsectNostril" or
-						def="Eye"]/groups
-					</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Hivers!/Patch_PawnKinds_Hivers.xml b/Patches/Rim-Hivers!/Patch_PawnKinds_Hivers.xml
deleted file mode 100644
index 1a0821fde8..0000000000
--- a/Patches/Rim-Hivers!/Patch_PawnKinds_Hivers.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Hivers!</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Techless -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Hiver_Worker" or defName="Hiver_Worker_South"]/combatPower</xpath>
-					<value>
-						<combatPower>20</combatPower>
-					</value>
-				</li>
-
-				<!-- Tribal -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Hiver_Soldier" or defName="Hiver_Soldier_South"]/combatPower</xpath>
-					<value>
-						<combatPower>26</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Hiver_Prince" or defName="Hiver_Prince_South"]/combatPower</xpath>
-					<value>
-						<combatPower>32</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Hiver_Soldier_Heavy" or defName="Hiver_Soldier_Heavy_South"]/combatPower</xpath>
-					<value>
-						<combatPower>60</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Hiver_Caravan_Guard"]/combatPower</xpath>
-					<value>
-						<combatPower>35</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Hiver_Caravan_Prince"]/combatPower</xpath>
-					<value>
-						<combatPower>40</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Hiver_Civil_Queen" or defName="Hiver_Faction_Queen_South"]/combatPower</xpath>
-					<value>
-						<combatPower>70</combatPower>
-					</value>
-				</li>
-
-				<!-- Hive_Archer -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Hiver_Soldier_Archer" or defName="Hiver_Civil_Queen" or defName="Hiver_Faction_Queen_South"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>14</min>
-								<max>40</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>100</min>
-								<max>140</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.6</shieldChance>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>40</min>
-										<max>80</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Tribal</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- Hiver_Warrior -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Hiver_Soldier" or defName="Hiver_Prince" or defName="Hiver_Caravan_Guard" or defName="Hiver_Caravan_Prince" or defName="Hiver_Soldier_South" or defName="Hiver_Prince_South"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>100</min>
-								<max>200</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.75</shieldChance>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Hivers!/Patch_Race_Hivers.xml b/Patches/Rim-Hivers!/Patch_Race_Hivers.xml
deleted file mode 100644
index d08ef67d24..0000000000
--- a/Patches/Rim-Hivers!/Patch_Race_Hivers.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Hivers!</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Hiver_Prince" or defName="Hiver_Soldier" or defName="Hiver_Worker" or defName="Hiver_Prince_South" or defName="Hiver_Queen" or defName="Hiver_Worker_South" or defName="Hiver_Soldier_South" or defName="Hiver_Queen_South"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Hiver_Prince" or defName="Hiver_Prince_South" or defName="Hiver_Queen" or defName="Hiver_Queen_South"]/statBases</xpath>
-					<value>
-						<MeleeCritChance>1.1</MeleeCritChance>
-						<MeleeParryChance>1.1</MeleeParryChance>
-						<MeleeDodgeChance>1.1</MeleeDodgeChance>
-						<Suppressability>0.8</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Hiver_Worker" or defName="Hiver_Worker_South"]/statBases</xpath>
-					<value>
-						<MeleeCritChance>0.88</MeleeCritChance>
-						<MeleeParryChance>0.88</MeleeParryChance>
-						<MeleeDodgeChance>0.88</MeleeDodgeChance>
-						<AimingAccuracy>0.88</AimingAccuracy>
-						<Suppressability>0.66</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Hiver_Soldier" or defName="Hiver_Soldier_South"]/statBases</xpath>
-					<value>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<Suppressability>0.66</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Hiver_Prince" or defName="Hiver_Soldier" or defName="Hiver_Worker" or defName="Hiver_Prince_South" or defName="Hiver_Queen" or defName="Hiver_Worker_South" or defName="Hiver_Soldier_South" or defName="Hiver_Queen_South"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.22</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.22</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>3.4</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Hiver_Prince" or defName="Hiver_Soldier" or defName="Hiver_Worker" or defName="Hiver_Prince_South" or defName="Hiver_Worker_South" or defName="Hiver_Soldier_South"]</xpath>
-					<value>
-						<comps />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Hiver_Prince" or defName="Hiver_Soldier" or defName="Hiver_Worker" or defName="Hiver_Prince_South" or defName="Hiver_Queen" or defName="Hiver_Worker_South" or defName="Hiver_Soldier_South" or defName="Hiver_Queen_South"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Robots!/Implants_Patch.xml b/Patches/Rim-Robots!/Implants_Patch.xml
deleted file mode 100644
index 2ecf9612b6..0000000000
--- a/Patches/Rim-Robots!/Implants_Patch.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Robots_</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ==============================              Implants       ====================== -->
-				<!-- Self-Alloyed Plating -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="RR_SelfAlloyingPlating"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="RR_SelfAlloyingPlating"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="RR_SelfAlloyingPlating"]/stages/li/statOffsets</xpath>
-					<value>
-						<MoveSpeed>-0.25</MoveSpeed>
-						<MeleeDodgeChance>-0.07</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/HediffDef[defName="RR_SelfAlloyingPlating"]/stages/li/capMods</xpath>
-				</li>
-				<!-- Self-Alloyed Helm -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="RR_SelfAlloyingHelm"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="RR_SelfAlloyingHelm"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="RR_SelfAlloyingHelm"]/stages/li/statOffsets/PawnBeauty</xpath>
-					<value>
-						<PawnBeauty>-1</PawnBeauty>
-					</value>
-				</li>
-				<!-- Plasteel Scythe -->
-				<!-- the original had -49% manipulation to "simulate" loss of Work speed but turns out you need manipulation to actually hit someone in Melee, so these changes make the scythe not a meme"-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="RR_AddedScythes"]/stages/li/capMods</xpath>
-					<value>
-						<capMods>
-							<li>
-								<capacity>Manipulation</capacity>
-								<offset>0.15</offset>
-							</li>
-						</capMods>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="RR_AddedScythes"]/stages/li/statOffsets</xpath>
-					<value>
-						<!-- had to lower each work stat individually because WorkSpeedGlobal has a minimum value of 30% for some reason -->
-						<statOffsets>
-							<WorkSpeedGlobal>-0.35</WorkSpeedGlobal>
-							<MiningSpeed>-0.49</MiningSpeed>
-							<DeepDrillingSpeed>-0.49</DeepDrillingSpeed>
-							<MiningYield>-0.49</MiningYield>
-							<SmoothingSpeed>-0.49</SmoothingSpeed>
-							<ResearchSpeed>-0.25</ResearchSpeed>
-							<AnimalGatherSpeed>-0.49</AnimalGatherSpeed>
-							<AnimalGatherYield>-0.49</AnimalGatherYield>
-							<PlantWorkSpeed>-0.25</PlantWorkSpeed>
-							<PlantHarvestYield>-0.25</PlantHarvestYield>
-							<ConstructionSpeed>-0.25</ConstructionSpeed>
-							<ConstructSuccessChance>-0.25</ConstructSuccessChance>
-							<FixBrokenDownBuildingSuccessChance>-0.25</FixBrokenDownBuildingSuccessChance>
-							<MedicalTendSpeed>-0.49</MedicalTendSpeed>
-							<MedicalTendQuality>-0.49</MedicalTendQuality>
-							<MedicalOperationSpeed>0.15</MedicalOperationSpeed>
-							<MedicalSurgerySuccessChance>-0.15</MedicalSurgerySuccessChance>
-							<SmeltingSpeed>-0.49</SmeltingSpeed>
-							<GeneralLaborSpeed>-0.4</GeneralLaborSpeed>
-							<DrugSynthesisSpeed>-0.49</DrugSynthesisSpeed>
-							<CookSpeed>-0.1</CookSpeed>
-							<DrugCookingSpeed>-0.49</DrugCookingSpeed>
-						</statOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="RR_AddedScythes"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>scythe</label>
-								<capacities>
-									<li>Cut</li>
-									<li>Stab</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationSharp>5</armorPenetrationSharp>
-								<armorPenetrationBlunt>9</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Robots!/Mechanent_Body.xml b/Patches/Rim-Robots!/Mechanent_Body.xml
deleted file mode 100644
index a7fe821ce8..0000000000
--- a/Patches/Rim-Robots!/Mechanent_Body.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Robots_</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName ="CasteBody"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<!-- Head -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="CasteBody"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="CasteBody"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="CasteBody"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="HearingSensor"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="CasteBody"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalJaw"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="CasteBody"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="SmellSensor"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<!-- Shoulders-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="CasteBody"]/corePart/parts/li[def="MechShoulder"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="CasteBody"]/corePart/parts/li[def="MechShoulder"]/parts/li[def="MechArm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="CasteBody"]/corePart/parts/li[def="MechShoulder"]/parts/li[def="MechArm"]/parts/li[def="MechanicalHand"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="CasteBody"]/corePart/parts/li[def="MechShoulder"]/parts/li[def="MechArm"]/parts/li[def="MechanicalHand"]/parts/li[def="MechanicalFinger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<!-- Waist and Legs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="CasteBody"]/corePart/parts/li[def="MechWaist"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="CasteBody"]/corePart/parts/li[def="MechLeg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="CasteBody"]/corePart/parts/li[def="MechLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Robots!/Pawnkind_Patch.xml b/Patches/Rim-Robots!/Pawnkind_Patch.xml
deleted file mode 100644
index e7b055e6ba..0000000000
--- a/Patches/Rim-Robots!/Pawnkind_Patch.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Robots_</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ================= Pawnkinds ================== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[ @Name="MechanentBase" or @Name="PersonaBase" or@Name="MechanentPirateTierBase"]</xpath>
-					<value>
-						<apparelRequired>
-							<li>CE_Apparel_Backpack</li>
-						</apparelRequired>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[ @Name="MechanentBase"]</xpath>
-					<value>
-						<invFoodDef>Chemfuel</invFoodDef>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[ defName="Mechanent_Villager" or defName="Persona_Villager" or defName="Mechanent_Guard" or defName="Mechanent_Trader" or @Name="MechanentGunnerBase" or @Name="MechanentSniperBase" or defName="Mechanent_Heavy" or defName="Mechanent_Spacer_Trooper" or defName="Mechanent_Scavenger" or defName="Mechanent_Pirate" or defName="Persona_Spacer_Trooper" or defName="Persona_Pirate" ]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>3</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>100</min>
-									<max>150</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>MedievalMeleeBasic</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[ @Name="MechanentEliteBase" or defName="Mechanent_Spacer_Marine" or defName="Persona_Spacer_Marine" or defName="Personae_Nexus"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>200</min>
-									<max>350</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>MedievalMeleeAdvanced</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Mechanent_Grenadier_EMP"]/label</xpath>
-					<value>
-						<label>advanced grenadier</label>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[defName="Mechanent_Grenadier_EMP"]/weaponTags</xpath>
-					<value>
-						<li>CE_GrenadeFlashbang</li>
-						<li>GrenadeSmoke</li>
-						<li>GrenadeDestructive</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Mechanent_Grenadier_EMP"]/combatPower</xpath>
-					<value>
-						<combatPower>85</combatPower>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Robots!/Personae_Body.xml b/Patches/Rim-Robots!/Personae_Body.xml
deleted file mode 100644
index eab1eaf520..0000000000
--- a/Patches/Rim-Robots!/Personae_Body.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Robots_</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName ="PersonaeBody"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<!-- Head -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="PersonaeBody"]/corePart/parts/li[def="SyntheticNeck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="PersonaeBody"]/corePart/parts/li[def="SyntheticNeck"]/parts/li[def="SyntheticHead"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="PersonaeBody"]/corePart/parts/li[def="SyntheticNeck"]/parts/li[def="SyntheticHead"]/parts/li[def="SyntheticEar"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="PersonaeBody"]/corePart/parts/li[def="SyntheticNeck"]/parts/li[def="SyntheticHead"]/parts/li[def="SyntheticNose"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="PersonaeBody"]/corePart/parts/li[def="SyntheticNeck"]/parts/li[def="SyntheticHead"]/parts/li[def="SyntheticJaw"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<!-- Shoulders-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="PersonaeBody"]/corePart/parts/li[def="SyntheticShoulder"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="PersonaeBody"]/corePart/parts/li[def="SyntheticShoulder"]/parts/li[def="SyntheticArm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="PersonaeBody"]/corePart/parts/li[def="SyntheticShoulder"]/parts/li[def="SyntheticArm"]/parts/li[def="SyntheticHand"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="PersonaeBody"]/corePart/parts/li[def="SyntheticShoulder"]/parts/li[def="SyntheticArm"]/parts/li[def="SyntheticHand"]/parts/li[def="SyntheticFinger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<!-- Waist and Legs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="PersonaeBody"]/corePart/parts/li[def="Waist"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="PersonaeBody"]/corePart/parts/li[def="SyntheticLeg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="PersonaeBody"]/corePart/parts/li[def="SyntheticLeg"]/parts/li[def="SyntheticFoot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="PersonaeBody"]/corePart/parts/li[def="SyntheticLeg"]/parts/li[def="SyntheticFoot"]/parts/li[def="SyntheticToe"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Robots!/Race_Patch.xml b/Patches/Rim-Robots!/Race_Patch.xml
deleted file mode 100644
index 439b333621..0000000000
--- a/Patches/Rim-Robots!/Race_Patch.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Robots_</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ================ Mechanent Race ================== -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Mechanent"]/statBases/MeleeDodgeChance</xpath>
-				</li>
-				<!--  duplicate node on their end -->
-				<!-- the rest was done already on their side -->
-
-				<!-- ================= Personae Race  ================== -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Personae_"]/statBases/MeleeDodgeChance</xpath>
-				</li>
-
-				<!--  duplicate node on their end -->
-				<!-- the rest was done already on their side -->
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Sheks!/Patch_Bodies_Sheks.xml b/Patches/Rim-Sheks!/Patch_Bodies_Sheks.xml
deleted file mode 100644
index 2dd30064dc..0000000000
--- a/Patches/Rim-Sheks!/Patch_Bodies_Sheks.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Shek</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Changing coverage of the bodyDef (should've done this sooner, but eh) -->
-				<!-- why yes dear explorer of this file, i did just literally copy and paste the ShekBody bodytype patches -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="ShekBody"]/corePart/parts/li[def="Ribcage"]/coverage</xpath>
-					<value>
-						<coverage>0.07</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="ShekBody"]/corePart/parts/li[def="Pelvis"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="ShekBody"]/corePart/parts/li[def="Stomach"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="ShekBody"]/corePart/parts/li[def="Heart"]/coverage</xpath>
-					<value>
-						<coverage>0.04</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="ShekBody"]/corePart/parts/li[def="Lung"]/coverage</xpath>
-					<value>
-						<coverage>0.055</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="ShekBody"]/corePart/parts/li[def="Kidney"]/coverage</xpath>
-					<value>
-						<coverage>0.03</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="ShekBody"]/corePart/parts/li[def="Liver"]/coverage</xpath>
-					<value>
-						<coverage>0.06</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="ShekBody"]/corePart/parts/li[def="Neck"]/coverage</xpath>
-					<value>
-						<coverage>0.055</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="ShekBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Skull"]/parts/li[def="Brain"]/coverage</xpath>
-					<value>
-						<coverage>0.9</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="ShekBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Eye"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="ShekBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="ShekBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/coverage</xpath>
-					<value>
-						<coverage>0.08</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="ShekBody"]/corePart/parts/li[def="Shoulder"]/coverage</xpath>
-					<value>
-						<coverage>0.085</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="ShekBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Clavicle"]/coverage</xpath>
-					<value>
-						<coverage>0.06</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="ShekBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Humerus"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="ShekBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Radius"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="ShekBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Femur"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="ShekBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Tibia"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="ShekBody"]//*[
-						def="Torso" or
-						def="Neck" or
-						def="Head" or
-						def="Jaw" or
-						def="Ear" or
-						def="Nose" or
-						def="Shoulder" or
-						def="Arm" or
-						def="Hand" or
-						def="Finger" or
-						def="Foot" or
-						def="Toe" or
-						def="Leg"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="ShekBody"]//*[
-						def="Jaw" or
-						def="Nose" or
-						def="Eye"]/groups
-					</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Sheks!/Patch_PawnKinds_Sheks.xml b/Patches/Rim-Sheks!/Patch_PawnKinds_Sheks.xml
deleted file mode 100644
index 2e0341643b..0000000000
--- a/Patches/Rim-Sheks!/Patch_PawnKinds_Sheks.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Shek</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- SHEK Neutrals (Non-Combatants) -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="NeutralShekBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>1</min>
-								<max>3</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.15</generateChance>
-									<sidearmMoney>
-										<min>40</min>
-										<max>160</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Tribal</li>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- SHEK WARRIOR -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Shek_Warrior" or defName="Shek_Vassal"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>100</min>
-								<max>150</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.25</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.35</generateChance>
-									<sidearmMoney>
-										<min>40</min>
-										<max>160</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Tribal</li>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- SHEK PYRO -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Shek_Pyrotechnician"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>10</min>
-								<max>21</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>100</min>
-								<max>150</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>40</min>
-										<max>160</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- SHEK GUNNERS -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Shek_Guardian" or defName="Heavy_Shek_Guardian"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.35</generateChance>
-									<sidearmMoney>
-										<min>40</min>
-										<max>160</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Tribal</li>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Sheks!/Patch_Race_Shek.xml b/Patches/Rim-Sheks!/Patch_Race_Shek.xml
deleted file mode 100644
index 23585b785e..0000000000
--- a/Patches/Rim-Sheks!/Patch_Race_Shek.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Shek</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Shek_"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Shek_"]/statBases</xpath>
-					<value>
-						<MeleeCritChance>1.2</MeleeCritChance>
-						<MeleeParryChance>1.2</MeleeParryChance>
-						<Suppressability>0.7</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Shek_"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Shek_"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>3.6</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Shek_"]</xpath>
-					<value>
-						<comps />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Shek_"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Skeletons/Patch_Bodies_Skellingtons.xml b/Patches/Rim-Skeletons/Patch_Bodies_Skellingtons.xml
deleted file mode 100644
index 354544f3b5..0000000000
--- a/Patches/Rim-Skeletons/Patch_Bodies_Skellingtons.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Skeletons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="SkeletonBody"]//*[
-						def="MechanicalThorax" or
-						def="MechanicalNeck" or
-						def="MechanicalHead" or
-						def="MechanicalJaw" or
-						def="HearingSensor" or
-						def="SmellSensor" or
-						def="MechShoulder" or
-						def="MechArm" or
-						def="MechanicalHand" or
-						def="MechanicalFinger" or
-						def="MechanicalFoot" or
-						def="MechLeg"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="SkeletonBody"]//*[
-						def="MechanicalJaw" or
-						def="SmellSensor" or
-						def="SightSensor"]/groups
-					</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Skeletons/Patch_PawnKinds_Skellingtons.xml b/Patches/Rim-Skeletons/Patch_PawnKinds_Skellingtons.xml
deleted file mode 100644
index d270964605..0000000000
--- a/Patches/Rim-Skeletons/Patch_PawnKinds_Skellingtons.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Skeletons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- SHEK Outlander-->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Skeleton_Drifter" or defName="Town_Guard_Skele"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>1</min>
-								<max>3</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.35</generateChance>
-									<sidearmMoney>
-										<min>40</min>
-										<max>160</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Pirate_Skele"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>4</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.35</generateChance>
-									<sidearmMoney>
-										<min>40</min>
-										<max>160</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Tribal_Skeleton"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>20</min>
-								<max>30</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.35</generateChance>
-									<sidearmMoney>
-										<min>40</min>
-										<max>160</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-							<shieldMoney>
-								<min>120</min>
-								<max>160</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.9</shieldChance>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Tribal_Skeleton"]/combatPower</xpath>
-					<value>
-						<combatPower>60</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[defName="Tribal_Skeleton"]</xpath>
-					<value>
-						<apparelRequired>
-							<li>CE_Apparel_TribalBackpack</li>
-						</apparelRequired>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rim-Skeletons/Patch_Race_Skellingtons.xml b/Patches/Rim-Skeletons/Patch_Race_Skellingtons.xml
deleted file mode 100644
index 286ef01d0d..0000000000
--- a/Patches/Rim-Skeletons/Patch_Race_Skellingtons.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rim-Skeletons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Patched out, as Rim-Skeletons has its own version of this patch built into it.		
-		<li Class="PatchOperationAddModExtension">
-			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Skeleton_"]</xpath>
-			<value>
-				<li Class="CombatExtended.RacePropertiesExtensionCE">
-					<bodyShape>Humanoid</bodyShape>
-				</li>
-			</value>
-		</li>
-
-		<li Class="PatchOperationAdd">
-		 <xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Skeleton_"]/statBases</xpath>
-			  <value>
-				<MeleeCritChance>1</MeleeCritChance>
-				<MeleeParryChance>1</MeleeParryChance>
-          		<Suppressability>0.8</Suppressability>
-			  </value>
-		</li>
-
-		<li Class="PatchOperationReplace">
-		 <xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Skeleton_"]/statBases/ArmorRating_Sharp</xpath>
-			  <value>
-      				<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-			  </value>
-		</li>
-
-		<li Class="PatchOperationReplace">
-		 <xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Skeleton_"]/statBases/ArmorRating_Blunt</xpath>
-			  <value>
-      				<ArmorRating_Blunt>0.2</ArmorRating_Blunt>
-			  </value>
-		</li>
-
-		<li Class="PatchOperationReplace">
-		 <xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Skeleton_"]/statBases/ArmorRating_Heat</xpath>
-			  <value>
-      				<ArmorRating_Heat>0.4</ArmorRating_Heat>
-			  </value>
-		</li>
-		
-		<li Class="PatchOperationReplace">
-			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Skeleton_"]/tools</xpath> 
-			<value>
-			<tools>
-				<li Class="CombatExtended.ToolCE">
-					<label>left fist</label>
-					<capacities>
-						<li>Blunt</li>
-					</capacities>
-					<power>2</power>
-					<cooldownTime>1.3</cooldownTime>
-					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-				</li>
-				<li Class="CombatExtended.ToolCE">
-					<label>right fist</label>
-					<capacities>
-						<li>Blunt</li>
-					</capacities>
-					<power>2</power>
-					<cooldownTime>1.3</cooldownTime>
-					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-				</li>
-				<li Class="CombatExtended.ToolCE">
-					<label>head</label>
-					<capacities>
-						<li>Blunt</li>
-					</capacities>
-					<power>3</power>
-					<cooldownTime>3.6</cooldownTime>
-					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-					<chanceFactor>0.2</chanceFactor>
-					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-				</li>
-			</tools>
-			</value>
-		</li>
-
-		<li Class="PatchOperationAdd">
-			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Skeleton_"]</xpath>
-			<value>
-             	<comps />
-			</value>
-		</li>
-
-		<li Class="PatchOperationAdd">
-			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Skeleton_"]/comps</xpath>
-			<value>
-				<li>
-				  <compClass>CombatExtended.CompPawnGizmo</compClass>
-				</li>
-				<li Class="CombatExtended.CompProperties_Suppressable" />
-			</value>
-		</li>
--->
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimCities/Scenarios/Scenarios.xml b/Patches/RimCities/Scenarios/Scenarios.xml
deleted file mode 100644
index 73dabd5363..0000000000
--- a/Patches/RimCities/Scenarios/Scenarios.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimCities</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Add ammunition to RimCities starting scenarios -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[@Name="Crashlanded_City"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_303British_FMJ</thingDef>
-							<count>100</count>
-						</li>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_44Magnum_FMJ</thingDef>
-							<count>60</count>
-						</li>
-					</value>
-				</li>
-
-				<!-- Remove apparel from RimCities starting scenarios -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ScenarioDef[@Name="Crashlanded_City"]/scenario/parts/li[thingDef="Apparel_AdvancedHelmet"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ScenarioDef[@Name="Crashlanded_City"]/scenario/parts/li[thingDef="Apparel_FlakVest"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ScenarioDef[@Name="Crashlanded_City"]/scenario/parts/li[thingDef="Apparel_FlakPants"]</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimEffect - Asari of the Rims/Asari_Race.xml b/Patches/RimEffect - Asari of the Rims/Asari_Race.xml
deleted file mode 100644
index d2edeaf02f..0000000000
--- a/Patches/RimEffect - Asari of the Rims/Asari_Race.xml	
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<!-- Updated to Combat Extended 1.6 on 10.6.2019 by N7Huntsman -->
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimEffect - Asari of the Rims</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Asari_Base"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Asari_Base"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Asari_Base"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.203</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.203</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Checking if "Alien_Asari_Base" has a <comps> node and adding it if it doesn't exist -->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Asari_Base"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Asari_Base"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Asari_Base"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-				<!--Adding Inventory Support-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="BaseAsariPawn"]/inspectorTabs/li[.="ITab_Pawn_Gear"]</xpath>
-					<value>
-						<li>CombatExtended.ITab_Inventory</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="BaseAsariPawn"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Inventory" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimEffect - Asari of the Rims/PawnKinds_Asari.xml b/Patches/RimEffect - Asari of the Rims/PawnKinds_Asari.xml
deleted file mode 100644
index 88ce4cebf8..0000000000
--- a/Patches/RimEffect - Asari of the Rims/PawnKinds_Asari.xml	
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimEffect - Asari of the Rims</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="AsariCivBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="AsariSecurityGuard"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>150</min>
-									<max>900</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>CE_Sidearm_Melee</li>
-								</weaponTags>
-								<magazineCount>
-									<min>2</min>
-									<max>3</max>
-								</magazineCount>
-							</forcedSidearm>
-							<shieldMoney>
-								<min>100</min>
-								<max>600</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.05</shieldChance>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="AsariMilBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>7</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<magazineCount>
-										<min>1</min>
-										<max>5</max>
-									</magazineCount>
-									<generateChance>0.7</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>450</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-										<li>CE_Sidearm</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimFantasy - House Doyle/Patch_RFDoyle_ArcaneWeapon.xml b/Patches/RimFantasy - House Doyle/Patch_RFDoyle_ArcaneWeapon.xml
deleted file mode 100644
index e366b9aa39..0000000000
--- a/Patches/RimFantasy - House Doyle/Patch_RFDoyle_ArcaneWeapon.xml	
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimFantasy - House Doyle</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= Amethyst Wand ======= -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_AmethystWand</defName>
-					<costList>
-						<RF_Amethyst>55</RF_Amethyst>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>RF_MagicBolt_Wand_Amethyst</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>40</range>
-						<recoilAmount>1.53</recoilAmount>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>5</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ======= Amethyst Staff ======= -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_AmethystStaff</defName>
-					<costList>
-						<RF_Amethyst>55</RF_Amethyst>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>RF_MagicBolt_Staff_Amethyst</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>45</range>
-						<recoilAmount>1.53</recoilAmount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>5</burstShotCount>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ======= Amethyst Ring ======= -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_AmethystRing</defName>
-					<costList>
-						<RF_Amethyst>55</RF_Amethyst>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>RF_MagicBolt_Ring_Amethyst</defaultProjectile>
-						<warmupTime>0.25</warmupTime>
-						<range>35</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>5</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ======= Amethyst Bow ======= -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_AmethystBow</defName>
-					<costList>
-						<RF_Amethyst>55</RF_Amethyst>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>RF_MagicArrow_Amethyst</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>32</range>
-						<soundCast>ChargeLance_Fire</soundCast>
-					</Properties>
-					<FireModes />
-					<weaponTags>
-						<li>CE_Bow</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimFantasy - House Doyle/Patch_RFDoyle_Armor.xml b/Patches/RimFantasy - House Doyle/Patch_RFDoyle_Armor.xml
deleted file mode 100644
index 08d7d8c747..0000000000
--- a/Patches/RimFantasy - House Doyle/Patch_RFDoyle_Armor.xml	
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimFantasy - House Doyle</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= House Doyle Armor ======= -->
-
-				<!-- ===== Heavy Hauberk ===== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_Apparel_HeraldicHeavyHauberk_Doyle"]/statBases</xpath>
-					<value>
-						<Bulk>30</Bulk>
-						<WornBulk>12</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Apparel_HeraldicHeavyHauberk_Doyle"]/statBases/Mass</xpath>
-					<value>
-						<Mass>9</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Apparel_HeraldicHeavyHauberk_Doyle"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Apparel_HeraldicHeavyHauberk_Doyle"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<MeleeDodgeChance>-0.10</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<!-- ===== Full-Plate Gilded ===== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_Apparel_HeraldicGildedFullPlate_Doyle"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Apparel_HeraldicGildedFullPlate_Doyle"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Apparel_HeraldicGildedFullPlate_Doyle"]/statBases/Mass</xpath>
-					<value>
-						<Mass>15</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Apparel_HeraldicGildedFullPlate_Doyle"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<MeleeDodgeChance>-0.15</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RF_Apparel_HeraldicGildedFullPlate_Doyle"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ===== Heraldic Great Helm ===== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_Apparel_HeraldicGreatHelm_Doyle"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RF_Apparel_HeraldicGreatHelm_Doyle"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_Apparel_HeraldicGreatHelm_Doyle"]/equippedStatOffsets</xpath>
-					<value>
-						<AimingAccuracy>-0.4</AimingAccuracy>
-						<MeleeHitChance>-2</MeleeHitChance>
-						<Suppressability>-0.20</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Apparel_HeraldicGreatHelm_Doyle"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3.75</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimFantasy - House Doyle/Patch_RFDoyle_Jewelry.xml b/Patches/RimFantasy - House Doyle/Patch_RFDoyle_Jewelry.xml
deleted file mode 100644
index 104bef70fe..0000000000
--- a/Patches/RimFantasy - House Doyle/Patch_RFDoyle_Jewelry.xml	
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimFantasy - House Doyle</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= House Doyle Jewelry ======= -->
-
-				<!-- ===== Necklace ===== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_Apparel_Necklace_Amethyst"]/statBases</xpath>
-					<value>
-						<Bulk>0.25</Bulk>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-
-				<!-- ===== Ring ===== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_Apparel_Ring_Amethyst"]/statBases</xpath>
-					<value>
-						<Bulk>0.25</Bulk>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimFantasy - House Doyle/Patch_RFDoyle_Melee.xml b/Patches/RimFantasy - House Doyle/Patch_RFDoyle_Melee.xml
deleted file mode 100644
index 793a494582..0000000000
--- a/Patches/RimFantasy - House Doyle/Patch_RFDoyle_Melee.xml	
+++ /dev/null
@@ -1,650 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimFantasy - House Doyle</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= Hoose Doyle Melee Weapon ======= -->
-
-				<!-- ===== Arming Sword ===== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_ArmingSword_Doyle"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_ArmingSword_Doyle"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.40</MeleeCritChance>
-							<MeleeParryChance>0.60</MeleeParryChance>
-							<MeleeDodgeChance>0.30</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_ArmingSword_Doyle"]</xpath>
-					<value>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_ArmingSword_Doyle"]/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.05</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.46</cooldownTime>
-								<chanceFactor>0.50</chanceFactor>
-								<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.40</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.45</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.58</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Greatsword ===== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_Greatsword_Doyle"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<MeleeCounterParryBonus>0.70</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_Greatsword_Doyle"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.30</MeleeCritChance>
-							<MeleeParryChance>1.20</MeleeParryChance>
-							<MeleeDodgeChance>0.50</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_Greatsword_Doyle"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.69</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.98</cooldownTime>
-								<chanceFactor>0.50</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.90</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>48</power>
-								<cooldownTime>2.86</cooldownTime>
-								<chanceFactor>0.45</chanceFactor>
-								<armorPenetrationBlunt>3.592</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.58</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Fighting Axe ===== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_FightingAxe_Doyle"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<MeleeCounterParryBonus>0.22</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_FightingAxe_Doyle"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.31</MeleeCritChance>
-							<MeleeParryChance>0.22</MeleeParryChance>
-							<MeleeDodgeChance>0.22</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_FightingAxe_Doyle"]</xpath>
-					<value>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_FightingAxe_Doyle"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>0.95</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>15</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.25</chanceFactor>
-								<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.32</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.58</cooldownTime>
-								<chanceFactor>0.70</chanceFactor>
-								<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Longaxe ===== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_Longaxe_Doyle"]/statBases</xpath>
-					<value>
-						<Bulk>7</Bulk>
-						<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_Longaxe_Doyle"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.30</MeleeCritChance>
-							<MeleeParryChance>0.50</MeleeParryChance>
-							<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_Longaxe_Doyle"]/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>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2.05</cooldownTime>
-								<chanceFactor>0.25</chanceFactor>
-								<armorPenetrationBlunt>9.6</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>32</power>
-								<cooldownTime>2.05</cooldownTime>
-								<chanceFactor>0.70</chanceFactor>
-								<armorPenetrationBlunt>9.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.32</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Morning Star ===== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_MorningStar_Doyle"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_MorningStar_Doyle"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.42</MeleeCritChance>
-							<MeleeParryChance>0.24</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_MorningStar_Doyle"]</xpath>
-					<value>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_MorningStar_Doyle"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2.1</cooldownTime>
-								<chanceFactor>0.90</chanceFactor>
-								<armorPenetrationBlunt>6.925</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Two-Handed Flanged Mace ===== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_TwoHandedFlangedMace_Doyle"]/statBases</xpath>
-					<value>
-						<Bulk>9</Bulk>
-						<MeleeCounterParryBonus>0.54</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_TwoHandedFlangedMace_Doyle"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>2.30</MeleeCritChance>
-							<MeleeParryChance>0.40</MeleeParryChance>
-							<MeleeDodgeChance>0.30</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_TwoHandedFlangedMace_Doyle"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>3.30</cooldownTime>
-								<chanceFactor>0.90</chanceFactor>
-								<armorPenetrationBlunt>14.225</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Warhammer ===== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_Warhammer_Doyle"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>0.22</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_Warhammer_Doyle"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.06</MeleeCritChance>
-							<MeleeParryChance>0.22</MeleeParryChance>
-							<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_Warhammer_Doyle"]</xpath>
-					<value>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_Warhammer_Doyle"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.69</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.85</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>6.7</armorPenetrationBlunt>
-								<armorPenetrationSharp>3.0</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>1.90</cooldownTime>
-								<chanceFactor>0.80</chanceFactor>
-								<armorPenetrationBlunt>8.2</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Polehammer ===== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_Polehammer_Doyle"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>0.54</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_Polehammer_Doyle"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>2.40</MeleeCritChance>
-							<MeleeParryChance>1.30</MeleeParryChance>
-							<MeleeDodgeChance>0.30</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_Polehammer_Doyle"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>2.7</cooldownTime>
-								<chanceFactor>0.25</chanceFactor>
-								<armorPenetrationBlunt>9.225</armorPenetrationBlunt>
-								<armorPenetrationSharp>4.3</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>2.7</cooldownTime>
-								<chanceFactor>0.70</chanceFactor>
-								<armorPenetrationBlunt>11.825</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Fighting Spear ===== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_FightingSpear_Doyle"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_FightingSpear_Doyle"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.17</MeleeCritChance>
-							<MeleeParryChance>0.5</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_FightingSpear_Doyle"]</xpath>
-					<value>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_FightingSpear_Doyle"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.50</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.6</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.6</cooldownTime>
-								<chanceFactor>0.90</chanceFactor>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.75</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Pike ===== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_Pike_Doyle"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<MeleeCounterParryBonus>1.27</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_Pike_Doyle"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.08</MeleeCritChance>
-							<MeleeParryChance>0.95</MeleeParryChance>
-							<MeleeDodgeChance>1.27</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_MeleeWeapon_Pike_Doyle"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.3</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>1.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.5</cooldownTime>
-								<chanceFactor>0.95</chanceFactor>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimFantasy - House Doyle/Patch_RFDoyle_Projectiles.xml b/Patches/RimFantasy - House Doyle/Patch_RFDoyle_Projectiles.xml
deleted file mode 100644
index 7f55a55058..0000000000
--- a/Patches/RimFantasy - House Doyle/Patch_RFDoyle_Projectiles.xml	
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimFantasy - House Doyle</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= Magic Projectiles ======= -->
-
-				<!-- ===== Magic Bolts Wand ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_MagicBolt_Wand_Amethyst"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<speed>70</speed>
-							<damageAmountBase>17</damageAmountBase>
-							<armorPenetrationBlunt>30</armorPenetrationBlunt>
-							<armorPenetrationSharp>9</armorPenetrationSharp>
-							<damageDef>RF_MagicBolt</damageDef>
-							<dropsCasings>false</dropsCasings>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_MagicBolt_Wand_Amethyst"]</xpath>
-					<value>
-						<thingClass>CombatExtended.BulletCE</thingClass>
-					</value>
-				</li>
-
-				<!-- ===== Magic Bolts Staff ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_MagicBolt_Staff_Amethyst"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<speed>65</speed>
-							<damageAmountBase>16</damageAmountBase>
-							<armorPenetrationBlunt>30</armorPenetrationBlunt>
-							<armorPenetrationSharp>9</armorPenetrationSharp>
-							<damageDef>RF_MagicBolt</damageDef>
-							<dropsCasings>false</dropsCasings>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_MagicBolt_Staff_Amethyst"]</xpath>
-					<value>
-						<thingClass>CombatExtended.BulletCE</thingClass>
-					</value>
-				</li>
-
-				<!-- ===== Magic Bolts Ring ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_MagicBolt_Ring_Amethyst"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<speed>60</speed>
-							<damageAmountBase>14</damageAmountBase>
-							<armorPenetrationBlunt>26</armorPenetrationBlunt>
-							<armorPenetrationSharp>8</armorPenetrationSharp>
-							<damageDef>RF_MagicBolt_AmethystRing</damageDef>
-							<dropsCasings>false</dropsCasings>
-							<ai_IsIncendiary>true</ai_IsIncendiary>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_MagicBolt_Ring_Amethyst"]</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_ExplosiveCE">
-								<damageAmountBase>4</damageAmountBase>
-								<explosiveDamageType>Bomb</explosiveDamageType>
-								<explosiveRadius>1.2</explosiveRadius>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<preExplosionSpawnChance>0.06</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>RF_RubbleShardsRF_Amethyst</preExplosionSpawnThingDef>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_MagicBolt_Ring_Amethyst"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.BulletCE</thingClass>
-					</value>
-				</li>
-
-				<!-- ===== Magic Arrows ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_MagicArrow_Amethyst"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<speed>33</speed>
-							<damageAmountBase>14</damageAmountBase>
-							<armorPenetrationBlunt>7</armorPenetrationBlunt>
-							<armorPenetrationSharp>2</armorPenetrationSharp>
-							<damageDef>Arrow</damageDef>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_MagicArrow_Amethyst"]</xpath>
-					<value>
-						<thingClass>CombatExtended.BulletCE</thingClass>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimFantasy - House Doyle/Patch_RFDoyle_Ranged.xml b/Patches/RimFantasy - House Doyle/Patch_RFDoyle_Ranged.xml
deleted file mode 100644
index 6d96001d4e..0000000000
--- a/Patches/RimFantasy - House Doyle/Patch_RFDoyle_Ranged.xml	
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimFantasy - House Doyle</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= House Doyle Ranged Weapon ======= -->
-
-				<!-- ===== Tools ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_RangedWeapon_Greatbow_Doyle" or defName="RF_RangedWeapon_WarBow_Doyle"]/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>
-
-				<!-- ===== Bows ===== -->
-
-				<!-- === Great Bow === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_RangedWeapon_Greatbow_Doyle</defName>
-					<statBases>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>1</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>5.00</Bulk>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>40</WoodLog>
-						<RF_Amethyst>1</RF_Amethyst>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_GreatArrow_Stone</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>30</range>
-						<soundCast>Bow_Large</soundCast>
-					</Properties>
-					<AmmoUser>
-						<ammoSet>AmmoSet_GreatArrow</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_Bow</li>
-					</weaponTags>
-					<researchPrerequisite>Greatbow</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- === War Bow === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_RangedWeapon_WarBow_Doyle</defName>
-					<statBases>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>1</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>5.00</Bulk>
-						<RangedWeapon_Cooldown>0.7</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>20</WoodLog>
-						<RF_Amethyst>1</RF_Amethyst>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_WarArrow_Stone</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>32</range>
-						<soundCast>Bow_Large</soundCast>
-					</Properties>
-					<AmmoUser>
-						<ammoSet>AmmoSet_WarArrow</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_Bow</li>
-					</weaponTags>
-					<researchPrerequisite>DankPyon_WarBow</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimFantasy - House Doyle/Patch_RFDoyle_Shield.xml b/Patches/RimFantasy - House Doyle/Patch_RFDoyle_Shield.xml
deleted file mode 100644
index ed9154489b..0000000000
--- a/Patches/RimFantasy - House Doyle/Patch_RFDoyle_Shield.xml	
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimFantasy - House Doyle</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= House Doyle Shield ======= -->
-
-				<!-- === Replace Apparel Layer & BodyPart Group === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_HeraldicHeaterShield_Doyle"]/apparel/layers</xpath>
-					<value>
-						<layers>
-							<li>Shield</li>
-						</layers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_HeraldicHeaterShield_Doyle"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>LeftShoulder</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RF_HeraldicHeaterShield_Doyle"]/comps/li[@Class="VFECore.CompProperties_Shield"]</xpath>
-				</li>
-
-				<!-- === Add Bulk === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_HeraldicHeaterShield_Doyle"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<!-- === Replace Stuff Thickness === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_HeraldicHeaterShield_Doyle"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.85</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Arcane_Bows.xml b/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Arcane_Bows.xml
deleted file mode 100644
index 00946a5671..0000000000
--- a/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Arcane_Bows.xml	
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimFantasy - Medieval Overhaul Edition</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ===== Tools ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneBows"]/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>
-
-				<!-- ===== Statbases ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneBows"]/statBases</xpath>
-					<value>
-						<statBases>
-							<WorkToMake>18000</WorkToMake>
-							<Mass>2.75</Mass>
-							<Bulk>5.00</Bulk>
-							<SightsEfficiency>0.8</SightsEfficiency>
-							<ShotSpread>1</ShotSpread>
-							<SwayFactor>2</SwayFactor>
-							<RangedWeapon_Cooldown>0.7</RangedWeapon_Cooldown>
-						</statBases>
-					</value>
-				</li>
-
-				<!-- ======= Emerald Bow ======= -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_EmeraldBow</defName>
-					<costList>
-						<DankPyon_Emerald>55</DankPyon_Emerald>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>RF_MagicArrow_Emerald</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>32</range>
-						<soundCast>ChargeLance_Fire</soundCast>
-					</Properties>
-					<FireModes />
-					<weaponTags>
-						<li>CE_Bow</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ======= Sapphire Bow ======= -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_SapphireBow</defName>
-					<costList>
-						<DankPyon_Sapphire>55</DankPyon_Sapphire>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>RF_MagicArrow_Sapphire</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>32</range>
-						<soundCast>ChargeLance_Fire</soundCast>
-					</Properties>
-					<FireModes />
-					<weaponTags>
-						<li>CE_Bow</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ======= Ruby Bow ======= -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_RubyBow</defName>
-					<costList>
-						<DankPyon_Ruby>55</DankPyon_Ruby>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>RF_MagicArrow_Ruby</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>32</range>
-						<soundCast>ChargeLance_Fire</soundCast>
-					</Properties>
-					<FireModes />
-					<weaponTags>
-						<li>CE_Bow</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Arcane_Melee.xml b/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Arcane_Melee.xml
deleted file mode 100644
index 22d5ee3d70..0000000000
--- a/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Arcane_Melee.xml	
+++ /dev/null
@@ -1,397 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimFantasy - Medieval Overhaul Edition</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= Arcane Melee Weapon ======= -->
-
-				<!-- ===== Battle Axes ===== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneBattleAxes"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<MeleeCounterParryBonus>0.22</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneBattleAxes"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.31</MeleeCritChance>
-							<MeleeParryChance>0.22</MeleeParryChance>
-							<MeleeDodgeChance>0.22</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneBattleAxes"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneBattleAxes"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.95</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>29</power>
-								<cooldownTime>1.58</cooldownTime>
-								<chanceFactor>0.85</chanceFactor>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.935</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Daggers ===== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneDaggers"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>0.3</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneDaggers"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.40</MeleeCritChance>
-							<MeleeParryChance>0.60</MeleeParryChance>
-							<MeleeDodgeChance>0.30</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneDaggers"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneDaggers"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>1.46</cooldownTime>
-								<chanceFactor>0.50</chanceFactor>
-								<armorPenetrationBlunt>0.685</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.75</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.45</chanceFactor>
-								<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.725</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Longswords ===== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneLongswords"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<MeleeCounterParryBonus>0.9</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneLongswords"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.60</MeleeCritChance>
-							<MeleeParryChance>0.75</MeleeParryChance>
-							<MeleeDodgeChance>0.40</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneLongswords"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.78</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.78</cooldownTime>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.0</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>45</power>
-								<cooldownTime>1.64</cooldownTime>
-								<chanceFactor>0.35</chanceFactor>
-								<armorPenetrationBlunt>3.24</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.725</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Spears ===== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneSpears"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneSpears"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.17</MeleeCritChance>
-							<MeleeParryChance>0.5</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneSpears"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneSpears"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.6</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.685</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.6</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.685</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.6</cooldownTime>
-								<chanceFactor>0.90</chanceFactor>
-								<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.185</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Warhammers ===== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneWarHammers"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>0.22</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneWarHammers"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.06</MeleeCritChance>
-							<MeleeParryChance>0.22</MeleeParryChance>
-							<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneWarHammers"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneWarHammers"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.69</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.90</cooldownTime>
-								<chanceFactor>0.85</chanceFactor>
-								<armorPenetrationBlunt>10.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Halberds ===== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneHalberds"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>1.08</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneHalberds"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.22</MeleeCritChance>
-							<MeleeParryChance>1.53</MeleeParryChance>
-							<MeleeDodgeChance>0.67</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneHalberds"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.31</cooldownTime>
-								<armorPenetrationBlunt>2.535</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>55</power>
-								<cooldownTime>2.9</cooldownTime>
-								<chanceFactor>1.165</chanceFactor>
-								<armorPenetrationBlunt>10.125</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.025</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>47</power>
-								<cooldownTime>1.16</cooldownTime>
-								<chanceFactor>1.165</chanceFactor>
-								<armorPenetrationBlunt>2.535</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.54</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Arcane_Ring.xml b/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Arcane_Ring.xml
deleted file mode 100644
index 8b7808e1d8..0000000000
--- a/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Arcane_Ring.xml	
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimFantasy - Medieval Overhaul Edition</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ===== Tools ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneRings"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>band</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.5</cooldownTime>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Statbases ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneRings"]/statBases</xpath>
-					<value>
-						<statBases>
-							<WorkToMake>18000</WorkToMake>
-							<Mass>1.25</Mass>
-							<Bulk>0.6</Bulk>
-							<SightsEfficiency>1.0</SightsEfficiency>
-							<ShotSpread>0.14</ShotSpread>
-							<SwayFactor>0.10</SwayFactor>
-							<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
-						</statBases>
-					</value>
-				</li>
-
-				<!-- ======= Emerald Ring ======= -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_EmeraldRing</defName>
-					<costList>
-						<DankPyon_Emerald>55</DankPyon_Emerald>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>RF_MagicBolt_Ring_Emerald</defaultProjectile>
-						<warmupTime>0.25</warmupTime>
-						<range>35</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>5</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ======= Sapphire Ring ======= -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_SapphireRing</defName>
-					<costList>
-						<DankPyon_Sapphire>55</DankPyon_Sapphire>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>RF_MagicBolt_Ring_Sapphire</defaultProjectile>
-						<warmupTime>0.25</warmupTime>
-						<range>35</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>5</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ======= Ruby Ring ======= -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_RubyRing</defName>
-					<costList>
-						<DankPyon_Ruby>55</DankPyon_Ruby>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>RF_MagicBolt_Ring_Ruby</defaultProjectile>
-						<warmupTime>0.25</warmupTime>
-						<range>35</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>5</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Arcane_Staff.xml b/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Arcane_Staff.xml
deleted file mode 100644
index def0308ad0..0000000000
--- a/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Arcane_Staff.xml	
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimFantasy - Medieval Overhaul Edition</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ===== Tools ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneStaffs"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>limb</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Statbases ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneStaffs"]/statBases</xpath>
-					<value>
-						<statBases>
-							<WorkToMake>18000</WorkToMake>
-							<Mass>3</Mass>
-							<Bulk>3</Bulk>
-							<SightsEfficiency>1.0</SightsEfficiency>
-							<ShotSpread>0.14</ShotSpread>
-							<SwayFactor>1.01</SwayFactor>
-							<RangedWeapon_Cooldown>2.6</RangedWeapon_Cooldown>
-						</statBases>
-					</value>
-				</li>
-
-				<!-- ======= Emerald Staff ======= -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_EmeraldStaff</defName>
-					<costList>
-						<DankPyon_Emerald>55</DankPyon_Emerald>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>RF_MagicBolt_Staff_Emerald</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>45</range>
-						<recoilAmount>1.53</recoilAmount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>5</burstShotCount>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ======= Sapphire Staff ======= -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_SapphireStaff</defName>
-					<costList>
-						<DankPyon_Sapphire>55</DankPyon_Sapphire>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>RF_MagicBolt_Staff_Sapphire</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>45</range>
-						<recoilAmount>1.53</recoilAmount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>5</burstShotCount>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ======= Ruby Staff ======= -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_RubyStaff</defName>
-					<costList>
-						<DankPyon_Ruby>55</DankPyon_Ruby>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>RF_MagicBolt_Staff_Ruby</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>45</range>
-						<recoilAmount>1.53</recoilAmount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>5</burstShotCount>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Arcane_Wand.xml b/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Arcane_Wand.xml
deleted file mode 100644
index f3fd488303..0000000000
--- a/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Arcane_Wand.xml	
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimFantasy - Medieval Overhaul Edition</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ===== Tools ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneWands"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>limb</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Statbases ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RF_BaseWeapon_ArcaneWands"]/statBases</xpath>
-					<value>
-						<statBases>
-							<WorkToMake>18000</WorkToMake>
-							<Mass>2</Mass>
-							<Bulk>2</Bulk>
-							<SightsEfficiency>1.0</SightsEfficiency>
-							<ShotSpread>0.14</ShotSpread>
-							<SwayFactor>1.01</SwayFactor>
-							<RangedWeapon_Cooldown>1.6</RangedWeapon_Cooldown>
-						</statBases>
-					</value>
-				</li>
-
-				<!-- ======= Emerald Wand ======= -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_EmeraldWand</defName>
-					<costList>
-						<DankPyon_Emerald>55</DankPyon_Emerald>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>RF_MagicBolt_Wand_Emerald</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>40</range>
-						<recoilAmount>1.53</recoilAmount>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>5</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ======= Sapphire Wand ======= -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_SapphireWand</defName>
-					<costList>
-						<DankPyon_Sapphire>55</DankPyon_Sapphire>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>RF_MagicBolt_Wand_Sapphire</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>40</range>
-						<recoilAmount>1.53</recoilAmount>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>5</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ======= Ruby Wand ======= -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_RubyWand</defName>
-					<costList>
-						<DankPyon_Ruby>55</DankPyon_Ruby>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>RF_MagicBolt_Wand_Ruby</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>40</range>
-						<recoilAmount>1.53</recoilAmount>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>5</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Projectiles.xml b/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Projectiles.xml
deleted file mode 100644
index 395259510d..0000000000
--- a/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Projectiles.xml	
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimFantasy - Medieval Overhaul Edition</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= Magic Projectiles ======= -->
-
-				<!-- ===== Magic Arrows ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_MagicArrow_Emerald" or defName="RF_MagicArrow_Sapphire" or defName="RF_MagicArrow_Ruby"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<speed>33</speed>
-							<damageAmountBase>14</damageAmountBase>
-							<armorPenetrationBlunt>7</armorPenetrationBlunt>
-							<armorPenetrationSharp>2</armorPenetrationSharp>
-							<damageDef>Arrow</damageDef>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_MagicArrow_Emerald" or defName="RF_MagicArrow_Sapphire" or defName="RF_MagicArrow_Ruby"]</xpath>
-					<value>
-						<thingClass>CombatExtended.BulletCE</thingClass>
-					</value>
-				</li>
-
-				<!-- ===== Magic Bolts Ring ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_MagicBolt_Ring_Emerald"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<speed>60</speed>
-							<damageAmountBase>14</damageAmountBase>
-							<armorPenetrationBlunt>26</armorPenetrationBlunt>
-							<armorPenetrationSharp>8</armorPenetrationSharp>
-							<damageDef>RF_MagicBolt_EmeraldRing</damageDef>
-							<dropsCasings>false</dropsCasings>
-							<ai_IsIncendiary>true</ai_IsIncendiary>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_MagicBolt_Ring_Emerald"]</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_ExplosiveCE">
-								<damageAmountBase>4</damageAmountBase>
-								<explosiveDamageType>Bomb</explosiveDamageType>
-								<explosiveRadius>1.2</explosiveRadius>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<preExplosionSpawnChance>0.06</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>RF_RubbleShardsRF_Emerald</preExplosionSpawnThingDef>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_MagicBolt_Ring_Sapphire"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<speed>60</speed>
-							<damageAmountBase>14</damageAmountBase>
-							<armorPenetrationBlunt>26</armorPenetrationBlunt>
-							<armorPenetrationSharp>8</armorPenetrationSharp>
-							<damageDef>RF_MagicBolt_SapphireRing</damageDef>
-							<dropsCasings>false</dropsCasings>
-							<ai_IsIncendiary>true</ai_IsIncendiary>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_MagicBolt_Ring_Sapphire"]</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_ExplosiveCE">
-								<damageAmountBase>4</damageAmountBase>
-								<explosiveDamageType>Bomb</explosiveDamageType>
-								<explosiveRadius>1.2</explosiveRadius>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<preExplosionSpawnChance>0.06</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>RF_RubbleShardsRF_Sapphire</preExplosionSpawnThingDef>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_MagicBolt_Ring_Ruby"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<speed>60</speed>
-							<damageAmountBase>14</damageAmountBase>
-							<armorPenetrationBlunt>26</armorPenetrationBlunt>
-							<armorPenetrationSharp>8</armorPenetrationSharp>
-							<damageDef>RF_MagicBolt_RubyRing</damageDef>
-							<dropsCasings>false</dropsCasings>
-							<ai_IsIncendiary>true</ai_IsIncendiary>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_MagicBolt_Ring_Sapphire"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>4</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>1.2</explosiveRadius>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							<preExplosionSpawnChance>0.06</preExplosionSpawnChance>
-							<preExplosionSpawnThingDef>RF_RubbleShardsRF_Ruby</preExplosionSpawnThingDef>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_MagicBolt_Ring_Emerald" or defName="RF_MagicBolt_Ring_Sapphire" or defName="RF_MagicBolt_Ring_Ruby"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.BulletCE</thingClass>
-					</value>
-				</li>
-
-				<!-- ===== Magic Bolts Staff ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_MagicBolt_Staff_Emerald" or defName="RF_MagicBolt_Staff_Sapphire" or defName="RF_MagicBolt_Staff_Ruby"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<speed>65</speed>
-							<damageAmountBase>16</damageAmountBase>
-							<armorPenetrationBlunt>30</armorPenetrationBlunt>
-							<armorPenetrationSharp>9</armorPenetrationSharp>
-							<damageDef>RF_MagicBolt</damageDef>
-							<dropsCasings>false</dropsCasings>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_MagicBolt_Staff_Emerald" or defName="RF_MagicBolt_Staff_Sapphire" or defName="RF_MagicBolt_Staff_Ruby"]</xpath>
-					<value>
-						<thingClass>CombatExtended.BulletCE</thingClass>
-					</value>
-				</li>
-
-				<!-- ===== Magic Bolts Wand ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_MagicBolt_Wand_Emerald" or defName="RF_MagicBolt_Wand_Sapphire" or defName="RF_MagicBolt_Wand_Ruby"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<speed>70</speed>
-							<damageAmountBase>17</damageAmountBase>
-							<armorPenetrationBlunt>30</armorPenetrationBlunt>
-							<armorPenetrationSharp>9</armorPenetrationSharp>
-							<damageDef>RF_MagicBolt</damageDef>
-							<dropsCasings>false</dropsCasings>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_MagicBolt_Wand_Emerald" or defName="RF_MagicBolt_Wand_Sapphire" or defName="RF_MagicBolt_Wand_Ruby"]</xpath>
-					<value>
-						<thingClass>CombatExtended.BulletCE</thingClass>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Turrets.xml b/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Turrets.xml
deleted file mode 100644
index 0298379ff2..0000000000
--- a/Patches/RimFantasy - Medieval Overhaul Edition/Patch_RF_Turrets.xml	
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimFantasy - Medieval Overhaul Edition</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= Pylons ======= -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RF_BombardPylon" or defName="RF_LancePylon" or defName="RF_SprayPylon"]/comps/li[@Class="CompProperties_Refuelable"]</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_BombardPylon" or defName="RF_LancePylon" or defName="RF_SprayPylon"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_BombardPylon" or defName="RF_LancePylon" or defName="RF_SprayPylon"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_BombardPylon" or defName="RF_LancePylon" or defName="RF_SprayPylon"]/costList</xpath>
-					<value>
-						<DankPyon_Onyx>100</DankPyon_Onyx>
-					</value>
-				</li>
-
-				<!-- ===== Bombard Pylon ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_BombardPylon_MagicBolt"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<armorPenetrationBlunt>25</armorPenetrationBlunt>
-							<armorPenetrationSharp>6</armorPenetrationSharp>
-							<dropsCasings>false</dropsCasings>
-							<damageDef>RF_BombardPylon_MagicBolt</damageDef>
-							<damageAmountBase>8</damageAmountBase>
-							<speed>50</speed>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_BombardPylon_MagicBolt"]</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_ExplosiveCE">
-								<damageAmountBase>3</damageAmountBase>
-								<explosiveDamageType>Bomb</explosiveDamageType>
-								<explosiveRadius>3</explosiveRadius>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<preExplosionSpawnChance>0.03</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>RF_RubbleShardsRF_Ruby</preExplosionSpawnThingDef>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_BombardPylon_MagicBolt"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.BulletCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_BombardPylonTurret_Invisible</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.10</ShotSpread>
-						<SwayFactor>1.00</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.19</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>RF_BombardPylon_MagicBolt</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>45</range>
-						<ticksBetweenBurstShots>36</ticksBetweenBurstShots>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ===== Lance Pylon ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_LancePylon_MagicBolt"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<armorPenetrationBlunt>30</armorPenetrationBlunt>
-							<armorPenetrationSharp>6.5</armorPenetrationSharp>
-							<dropsCasings>false</dropsCasings>
-							<damageDef>RF_LancePylon_MagicBolt</damageDef>
-							<damageAmountBase>10</damageAmountBase>
-							<speed>55</speed>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_LancePylon_MagicBolt"]</xpath>
-					<value>
-						<thingClass>CombatExtended.BulletCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_LancePylonTurret_Invisible</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.10</ShotSpread>
-						<SwayFactor>1.00</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.19</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>RF_LancePylon_MagicBolt</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>50</range>
-						<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-						<burstShotCount>2</burstShotCount>
-						<soundCast>ChargeLance_Fire</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ===== Spray Pylon ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_SprayPylon_MagicBolt"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<armorPenetrationBlunt>20</armorPenetrationBlunt>
-							<armorPenetrationSharp>5</armorPenetrationSharp>
-							<dropsCasings>false</dropsCasings>
-							<damageDef>RF_SprayPylon_MagicBolt</damageDef>
-							<damageAmountBase>10</damageAmountBase>
-							<speed>60</speed>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RF_SprayPylon_MagicBolt"]</xpath>
-					<value>
-						<thingClass>CombatExtended.BulletCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_SprayPylonTurret_Invisible</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.10</ShotSpread>
-						<SwayFactor>1.00</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.19</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>RF_SprayPylon_MagicBolt</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>40</range>
-						<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-						<burstShotCount>6</burstShotCount>
-						<soundCast>ChargeLance_Fire</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimHammer40k -Dreadnought/Apparel_Dreadnought.xml b/Patches/RimHammer40k -Dreadnought/Apparel_Dreadnought.xml
deleted file mode 100644
index 1f73910500..0000000000
--- a/Patches/RimHammer40k -Dreadnought/Apparel_Dreadnought.xml	
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimHammer40k -Dreadnought</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Remove Vanilla Carry Capacity ========== -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/VFEPirates.WarcasketDef[
-						defName="Warcasket_Dreadnought"
-						]/modExtensions/li/carryingCapacity </xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Dreadnought"]/statBases</xpath>
-					<value>
-						<Bulk>350</Bulk>
-						<WornBulk>40</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Dreadnought"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>75</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Dreadnought"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>187.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Dreadnought"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>450</CarryWeight>
-						<CarryBulk>300</CarryBulk>
-						<Suppressability>-100</Suppressability>
-					</value>
-				</li>
-
-				<!-- ========== Shoulders ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Dreadnought"]/statBases</xpath>
-					<value>
-						<Bulk>45</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Dreadnought"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>75</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Dreadnought"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>187.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- === Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Dreadnought"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>8</WornBulk>
-						<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Dreadnought"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Dreadnought"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>80</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Dreadnought"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>200</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimNauts 2/ThingDefs_Items/SpaceSuit_CEpatch.xml b/Patches/RimNauts 2/ThingDefs_Items/SpaceSuit_CEpatch.xml
deleted file mode 100644
index 075e3ca1c1..0000000000
--- a/Patches/RimNauts 2/ThingDefs_Items/SpaceSuit_CEpatch.xml	
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimNauts 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!--  spacesuite armor -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RimNauts2_Apparel_SpaceSuit_Body"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>4</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RimNauts2_Apparel_SpaceSuit_Body"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>12.5</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RimNauts2_Apparel_SpaceSuit_Body"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>25</ArmorRating_Blunt>
-					</value>
-				</li>
-				<!--  spacesuit helmet -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RimNauts2_Apparel_SpaceSuit_Head"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RimNauts2_Apparel_SpaceSuit_Head"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>7.5</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RimNauts2_Apparel_SpaceSuit_Head"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationConditional" MayRequire="Ludeon.RimWorld.Biotech">
-					<xpath>Defs/ThingDef[defName="RimNauts2_Apparel_SpaceSuit_Head"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="RimNauts2_Apparel_SpaceSuit_Head"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RimNauts2_Apparel_SpaceSuit_Head"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RimNauts2_Apparel_SpaceSuit_Head"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimSec-Security/AlienBase.xml b/Patches/RimSec-Security/AlienBase.xml
deleted file mode 100644
index fd2eef7f46..0000000000
--- a/Patches/RimSec-Security/AlienBase.xml
+++ /dev/null
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsec Security</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Body Shape -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="RSPeacekeeperDefenderBase" or @Name="RSPeacekeeperEnforcerBase" or @Name="RSPeacekeeperSentinelBase"
-						]/modExtensions </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- Gizmos -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="RSPeacekeeperDefenderBase" or @Name="RSPeacekeeperEnforcerBase" or @Name="RSPeacekeeperSentinelBase"
-						]/comps </xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-					</value>
-				</li>
-
-				<!--Defender Series-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="RSPeacekeeperDefenderBase"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1.2</MeleeCritChance>
-						<MeleeParryChance>1.2</MeleeParryChance>
-						<SmokeSensitivity>0</SmokeSensitivity>
-						<CarryBulk>60</CarryBulk>
-						<CarryWeight>60</CarryWeight>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="RSPeacekeeperDefenderBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>12</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="RSPeacekeeperDefenderBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>26</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="RSPeacekeeperDefenderBase"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--Enforcer Series-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="RSPeacekeeperEnforcerBase"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1.2</MeleeDodgeChance>
-						<MeleeCritChance>1.3</MeleeCritChance>
-						<MeleeParryChance>1.3</MeleeParryChance>
-						<SmokeSensitivity>0</SmokeSensitivity>
-						<CarryBulk>60</CarryBulk>
-						<CarryWeight>60</CarryWeight>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="RSPeacekeeperEnforcerBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="RSPeacekeeperEnforcerBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>34</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="RSPeacekeeperEnforcerBase"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Reduce health scale since they have adequate armor-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="RSPeacekeeperEnforcerBase"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>1.6</baseHealthScale>
-					</value>
-				</li>
-
-				<!--Sentinel Series-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="RSPeacekeeperSentinelBase"]/statBases</xpath>
-					<value>
-						<MeleeCritChance>1.6</MeleeCritChance>
-						<MeleeParryChance>1.6</MeleeParryChance>
-						<SmokeSensitivity>0</SmokeSensitivity>
-						<CarryBulk>60</CarryBulk>
-						<CarryWeight>60</CarryWeight>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="RSPeacekeeperSentinelBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="RSPeacekeeperSentinelBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>42</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="RSPeacekeeperSentinelBase"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.42</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>24</armorPenetrationBlunt>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.42</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>24</armorPenetrationBlunt>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>3.52</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Reduce health scale since they have adequate armor-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="RSPeacekeeperSentinelBase"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>2.5</baseHealthScale>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimSec-Security/Ammo/SRS Ammo.xml b/Patches/RimSec-Security/Ammo/SRS Ammo.xml
deleted file mode 100644
index 21494aa484..0000000000
--- a/Patches/RimSec-Security/Ammo/SRS Ammo.xml	
+++ /dev/null
@@ -1,302 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsec Security</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======== 6x24mm SRS ======== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_6x24mmSRS</defName>
-							<label>6x24mm Charged Bullet (DLG)</label>
-							<ammoTypes>
-								<Ammo_6x24mmCharged>Bullet_6x24mmSRS</Ammo_6x24mmCharged>
-								<Ammo_6x24mmCharged_AP>Bullet_6x24mmSRS_AP</Ammo_6x24mmCharged_AP>
-								<Ammo_6x24mmCharged_Ion>Bullet_6x24mmSRS_Ion</Ammo_6x24mmCharged_Ion>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="Base6x24mmChargedBullet">
-							<defName>Bullet_6x24mmSRS</defName>
-							<label>6x24mm Charged SRS bullet</label>
-							<graphicData>
-								<texPath>Things/laserbolt</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>151</speed>
-								<damageAmountBase>13</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>4</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-								<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="Base6x24mmChargedBullet">
-							<defName>Bullet_6x24mmSRS_AP</defName>
-							<label>6x24mm Charged SRS bullet (Conc.)</label>
-							<graphicData>
-								<texPath>Things/laserbolt</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>151</speed>
-								<damageAmountBase>10</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>2</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-								<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="Base6x24mmChargedBullet">
-							<defName>Bullet_6x24mmSRS_Ion</defName>
-							<label>6x24mm Charged SRS bullet (Ion)</label>
-							<graphicData>
-								<texPath>Things/laserbolt</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>151</speed>
-								<damageAmountBase>10</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>6</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>22.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>25.6</armorPenetrationBlunt>
-								<empShieldBreakChance>0.2</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- ======== 6x18mm SRS ======== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_6x18mmSRS</defName>
-							<label>6x18mm Charged Bullet (EHG)</label>
-							<ammoTypes>
-								<Ammo_6x18mmCharged>Bullet_6x18mmSRS</Ammo_6x18mmCharged>
-								<Ammo_6x18mmCharged_AP>Bullet_6x18mmSRS_AP</Ammo_6x18mmCharged_AP>
-								<Ammo_6x18mmCharged_Ion>Bullet_6x18mmSRS_Ion</Ammo_6x18mmCharged_Ion>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="Base6x18mmChargedBullet">
-							<defName>Bullet_6x18mmSRS</defName>
-							<label>6x18mm Charged SRS bullet</label>
-							<graphicData>
-								<texPath>Things/purplelaserbolt</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>122</speed>
-								<damageAmountBase>10</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>3</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="Base6x18mmChargedBullet">
-							<defName>Bullet_6x18mmSRS_AP</defName>
-							<label>6x18mm Charged SRS bullet (Conc.)</label>
-							<graphicData>
-								<texPath>Things/purplelaserbolt</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>122</speed>
-								<damageAmountBase>8</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>1</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>24</armorPenetrationSharp>
-								<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="Base6x18mmChargedBullet">
-							<defName>Bullet_6x18mmSRS_Ion</defName>
-							<label>6x18mm Charged SRS bullet (Ion)</label>
-							<graphicData>
-								<texPath>Things/purplelaserbolt</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>122</speed>
-								<damageAmountBase>8</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>5</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
-								<empShieldBreakChance>1</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- ======== 8x35mm SRS ======== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_8x35mmSRS</defName>
-							<label>8x35mm Charged Bullet (HLT)</label>
-							<ammoTypes>
-								<Ammo_8x35mmCharged>Bullet_8x35mmSRS</Ammo_8x35mmCharged>
-								<Ammo_8x35mmCharged_AP>Bullet_8x35mmSRS_AP</Ammo_8x35mmCharged_AP>
-								<Ammo_8x35mmCharged_Ion>Bullet_8x35mmSRS_Ion</Ammo_8x35mmCharged_Ion>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="Base8x35mmChargedBullet">
-							<defName>Bullet_8x35mmSRS</defName>
-							<label>8x35mm Charged SRS bullet</label>
-							<graphicData>
-								<texPath>Things/Building/Turrets/HLT/HLT_projectile</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>19</damageAmountBase>
-								<speed>151</speed>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>6</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-								<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="Base8x35mmChargedBullet">
-							<defName>Bullet_8x35mmSRS_AP</defName>
-							<label>8x35mm Charged SRS bullet (Conc.)</label>
-							<graphicData>
-								<texPath>Things/Building/Turrets/HLT/HLT_projectile</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>15</damageAmountBase>
-								<speed>151</speed>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>2</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-								<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="Base8x35mmChargedBullet">
-							<defName>Bullet_8x35mmSRS_Ion</defName>
-							<label>8x35mm Charged SRS bullet (Ion)</label>
-							<graphicData>
-								<texPath>Things/Building/Turrets/HLT/HLT_projectile</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>15</damageAmountBase>
-								<speed>151</speed>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>9</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>22.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
-								<empShieldBreakChance>0.2</empShieldBreakChance>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimSec-Security/Bodies.xml b/Patches/RimSec-Security/Bodies.xml
deleted file mode 100644
index 5caf6a67ef..0000000000
--- a/Patches/RimSec-Security/Bodies.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsec Security</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Add missing group nodes -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="RSPeacekeeperBody"]//*[
-						def="MechanicalShoulder" or
-						def="MechanicalArm" or
-						def="MechanicalHand"
-						]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<!-- Shoulder & Arm Groups -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RSPeacekeeperBody"]//*[customLabel="right shoulder"]/groups</xpath>
-					<value>
-						<li>RightShoulder</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RSPeacekeeperBody"]//*[customLabel="left shoulder"]/groups</xpath>
-					<value>
-						<li>LeftShoulder</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RSPeacekeeperBody"]//*[customLabel="right arm"]/groups</xpath>
-					<value>
-						<li>RightArm</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="RSPeacekeeperBody"]//*[customLabel="left arm"]/groups</xpath>
-					<value>
-						<li>LeftArm</li>
-					</value>
-				</li>
-
-				<!-- Natural Armor -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="RSPeacekeeperBody"]//*[
-						def="MechanicalThorax" or
-						def="MechanicalNeck" or
-						def="RSPeacekeeperHead" or
-						def="MechanicalShoulder" or
-						def="MechanicalArm" or
-						def="MechanicalHand" or
-						def="MechanicalFinger" or
-						def="MechanicalLeg" or
-						def="MechanicalFoot"
-						]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimSec-Security/Buildings.xml b/Patches/RimSec-Security/Buildings.xml
deleted file mode 100644
index 7420d2eb26..0000000000
--- a/Patches/RimSec-Security/Buildings.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsec Security</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Light Laser Turret ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RSTurretLLTGun</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>2</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>0.65</SwayFactor>
-						<Bulk>13.70</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.70</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x24mmSRS</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>62</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>15</burstShotCount>
-						<soundCast>RSLLTProjectileLaunch</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>150</magazineSize>
-						<reloadTime>6.0</reloadTime>
-						<ammoSet>AmmoSet_6x24mmSRS</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- ========== Heavy Laser Turret ========== -->
-
-				<!-- Replace the custom verb with the a common vanilla one, since custom verbs are not patchable -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RSTurretHLTGun"]/verbs/li[1]/verbClass</xpath>
-					<value>
-						<verbClass>Verb_Shoot</verbClass>
-					</value>
-				</li>
-
-				<!-- Replace the custom place worker with the vanilla one -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RSTurretHLTBase"]/placeWorkers/li[2]</xpath>
-					<value>
-						<li>PlaceWorker_ShowTurretRadius</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RSTurretHLTGun</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.8</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>0.95</SwayFactor>
-						<Bulk>40</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.90</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8x35mmSRS</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>78</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>15</burstShotCount>
-						<soundCast>RSHLTProjectileLaunch</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>350</magazineSize>
-						<reloadTime>9.5</reloadTime>
-						<ammoSet>AmmoSet_8x35mmSRS</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>8</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- ========== HAAC ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RSTurretHAACGun</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.95</RangedWeapon_Cooldown>
-						<SightsEfficiency>3.2</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>0.40</SwayFactor>
-						<Bulk>62</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.70</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12mmRailgun_Sabot</defaultProjectile>
-						<warmupTime>2.3</warmupTime>
-						<range>116</range>
-						<minRange>5</minRange>
-						<soundCast>RSHAACProjectileLaunch</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<muzzleFlashScale>18</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>9.5</reloadTime>
-						<ammoSet>AmmoSet_12mmRailgun</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-					</FireModes>
-				</li>
-
-				<!-- ========== Common to all Turrets ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RSTurretLLTBase" or @Name="RSTurretHLTBase" or @Name="RSTurretHAACBase"
-						]/thingClass </xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RSTurretLLTBase" or @Name="RSTurretHLTBase" or @Name="RSTurretHAACBase"
-						]/fillPercent </xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RSTurretLLT" or defName="RSTurretHLT" or defName="RSTurretHAAC"
-						]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RSTurretLLT" or defName="RSTurretHLT" or defName="RSTurretHAAC"
-						]/statBases </xpath>
-					<value>
-						<AimingAccuracy>1</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RSTurretLLT" or defName="RSTurretHLT" or defName="RSTurretHAAC"
-						]/statBases/ShootingAccuracyTurret </xpath>
-					<value>
-						<ShootingAccuracyTurret>1</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimSec-Security/PawnKinds.xml b/Patches/RimSec-Security/PawnKinds.xml
deleted file mode 100644
index 108a0e203a..0000000000
--- a/Patches/RimSec-Security/PawnKinds.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsec Security</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= Ammo ======= -->
-
-				<!-- Defender Series -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						@Name="RSPeacekeeperDefenderPawnKindBase"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- Enforcer Series -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						@Name="RSPeacekeeperEnforcerPawnKindBase"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>3</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- Sentinel Series -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						@Name="RSPeacekeeperSentinelPawnKindBase"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>8</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- ======= Combat Power ======= -->
-
-				<!-- Defender Series -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[
-						defName="RSPeacekeeperDefenderPawnKind" or
-						defName="RSPeacekeeperDefenderForestPawnKind" or
-						defName="RSPeacekeeperDefenderDesertPawnKind" or
-						defName="RSPeacekeeperDefenderWinterPawnKind"
-						]/combatPower </xpath>
-					<value>
-						<combatPower>180</combatPower>
-					</value>
-				</li>
-
-				<!-- Enforcer Series -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[
-						defName="RSPeacekeeperEnforcerPawnKind" or
-						defName="RSPeacekeeperEnforcerForestPawnKind" or
-						defName="RSPeacekeeperEnforcerDesertPawnKind" or
-						defName="RSPeacekeeperEnforcerWinterPawnKind"
-						]/combatPower </xpath>
-					<value>
-						<combatPower>225</combatPower>
-					</value>
-				</li>
-
-				<!-- Defender Series -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[
-						defName="RSPeacekeeperSentinelPawnKind" or
-						defName="RSPeacekeeperSentinelForestPawnKind" or
-						defName="RSPeacekeeperSentinelDesertPawnKind" or
-						defName="RSPeacekeeperSentinelWinterPawnKind"
-						]/combatPower </xpath>
-					<value>
-						<combatPower>400</combatPower>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimSec-Security/Traits.xml b/Patches/RimSec-Security/Traits.xml
deleted file mode 100644
index 21e385fd48..0000000000
--- a/Patches/RimSec-Security/Traits.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>Rimsec Security</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!-- Security Model -->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/TraitDef[defName="RSTraitSecurity"]/degreeDatas/li/statOffsets/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>2</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/TraitDef[defName="RSTraitSecurity"]/degreeDatas/li/statOffsets/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>4</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!-- Forest Model -->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/TraitDef[defName="RSTraitForest"]/degreeDatas/li/statOffsets</xpath>
-							<value>
-								<statOffsets>
-									<MeleeDodgeChance>0.2</MeleeDodgeChance>
-									<MeleeCritChance>0.2</MeleeCritChance>
-									<MeleeParryChance>0.1</MeleeParryChance>
-									<MoveSpeed>1</MoveSpeed>
-								</statOffsets>
-							</value>
-						</li>
-
-						<!-- Winter Model-->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/TraitDef[defName="RSTraitWinter"]/degreeDatas/li/statOffsets/ShootingAccuracyPawn</xpath>
-							<value>
-								<AimingAccuracy>1.2</AimingAccuracy>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimSec-Security/WeaponDefs.xml b/Patches/RimSec-Security/WeaponDefs.xml
deleted file mode 100644
index f23ac5fa8a..0000000000
--- a/Patches/RimSec-Security/WeaponDefs.xml
+++ /dev/null
@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsec Security</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RSWeaponDLG" or defName="RSWeaponEHG" or defName="RSWeaponSHAG"
-						]/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>
-				</li>
-
-				<!-- === DLG-20 === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RSWeaponDLG</defName>
-
-					<statBases>
-						<Mass>3.5</Mass>
-						<Bulk>6.2</Bulk>
-						<SwayFactor>1.04</SwayFactor>
-						<ShotSpread>0.09</ShotSpread>
-						<SightsEfficiency>1.2</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-
-					<Properties>
-						<recoilAmount>1.30</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_6x24mmSRS</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_HeavySMG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_6x24mmSRS</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>RSDLG20</li>
-						<li>RSPeacekeeperGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- === EHG-22 === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RSWeaponEHG</defName>
-
-					<statBases>
-						<WorkToMake>75500</WorkToMake>
-						<Mass>32.0</Mass>
-						<Bulk>28.0</Bulk>
-						<SwayFactor>1.35</SwayFactor>
-						<ShotSpread>0.10</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>150</Steel>
-						<Plasteel>15</Plasteel>
-						<Chemfuel>20</Chemfuel>
-						<ComponentIndustrial>10</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_6x18mmSRS</defaultProjectile>
-						<burstShotCount>50</burstShotCount>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<warmupTime>2.5</warmupTime>
-						<range>62</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilAmount>1.24</recoilAmount>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>500</magazineSize>
-						<reloadTime>9.2</reloadTime>
-						<ammoSet>AmmoSet_6x18mmSRS</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>20</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>RSEHG22</li>
-						<li>RSPeacekeeperGun</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- === SHAG-1 === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RSWeaponSHAG</defName>
-
-					<statBases>
-						<WorkToMake>80000</WorkToMake>
-						<Mass>48.0</Mass>
-						<Bulk>42.0</Bulk>
-						<SwayFactor>1.40</SwayFactor>
-						<ShotSpread>0.10</ShotSpread>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.66</RangedWeapon_Cooldown>
-					</statBases>
-
-					<costList>
-						<Steel>350</Steel>
-						<Plasteel>20</Plasteel>
-						<Chemfuel>20</Chemfuel>
-						<ComponentIndustrial>25</ComponentIndustrial>
-					</costList>
-
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_8mmRailgun_Sabot</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<warmupTime>1.5</warmupTime>
-						<range>90</range>
-						<soundCast>RSShot_Shag</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilAmount>1.75</recoilAmount>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>60</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_8mmRailgun</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>RSSHAG1</li>
-						<li>RSPeacekeeperGun</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimTraits - General Traits/RT_General_Traits.xml b/Patches/RimTraits - General Traits/RT_General_Traits.xml
deleted file mode 100644
index 3dc2498d13..0000000000
--- a/Patches/RimTraits - General Traits/RT_General_Traits.xml	
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimTraits - General Traits</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= General Traits ======= -->
-
-				<!-- ===== RT Trait: Nearsighted ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraitDef[defName = "RT_Nearsighted"]/degreeDatas/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ShootingAccuracyPawn>-0.4</ShootingAccuracyPawn>
-							<AimingDelayFactor>0.15</AimingDelayFactor>
-							<MeleeHitChance>1</MeleeHitChance>
-							<MeleeDodgeChance>0.10</MeleeDodgeChance>
-						</statOffsets>
-					</value>
-				</li>
-
-				<!-- ===== RT Trait: Farsighted ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraitDef[defName = "RT_Farsighted"]/degreeDatas/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ShootingAccuracyPawn>0.5</ShootingAccuracyPawn>
-							<AimingDelayFactor>-0.15</AimingDelayFactor>
-							<MeleeHitChance>-1</MeleeHitChance>
-							<MeleeDodgeChance>-0.10</MeleeDodgeChance>
-						</statOffsets>
-					</value>
-				</li>
-
-				<!-- ===== RT Trait: Athletic ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraitDef[defName = "RT_Athletic"]/degreeDatas/li/statOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.10</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<!-- ===== RT Trait: Stiff ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraitDef[defName = "RT_Stiff"]/degreeDatas/li/statOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>-0.10</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<!-- ===== RT Trait: Muscular ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraitDef[defName = "RT_Muscular"]/degreeDatas/li/statOffsets/CarryingCapacity</xpath>
-					<value>
-						<CarryWeight>5</CarryWeight>
-						<CarryBulk>5</CarryBulk>
-					</value>
-				</li>
-
-				<!-- ===== RT Trait: Frail ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraitDef[defName = "RT_Frail"]/degreeDatas/li/statOffsets/CarryingCapacity</xpath>
-					<value>
-						<CarryWeight>-3</CarryWeight>
-						<CarryBulk>-3</CarryBulk>
-					</value>
-				</li>
-
-				<!-- ======= General Traits Uncommon ======= -->
-
-				<!-- ===== RT Trait: Coordinated ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraitDef[defName = "RT_Coordinated"]/degreeDatas/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ShootingAccuracyPawn>0.5</ShootingAccuracyPawn>
-							<MeleeHitChance>1</MeleeHitChance>
-							<MeleeDodgeChance>0.10</MeleeDodgeChance>
-						</statOffsets>
-					</value>
-				</li>
-
-				<!-- ===== RT Trait: Clumsy ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraitDef[defName = "RT_Clumsy"]/degreeDatas/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ShootingAccuracyPawn>-0.4</ShootingAccuracyPawn>
-							<MeleeHitChance>-1</MeleeHitChance>
-							<MeleeDodgeChance>-0.10</MeleeDodgeChance>
-						</statOffsets>
-					</value>
-				</li>
-
-			</operations>
-
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimTraits - Medieval Talents/RT_Traits.xml b/Patches/RimTraits - Medieval Talents/RT_Traits.xml
deleted file mode 100644
index 4fb9ed3885..0000000000
--- a/Patches/RimTraits - Medieval Talents/RT_Traits.xml	
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimTraits - Medieval Talents</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Tier 1 -->
-				<!-- Talent Bowman -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraitDef[defName="RT_TalentBowman"]/degreeDatas/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
-							<AimingDelayFactor>-0.1</AimingDelayFactor>
-							<MeleeHitChance>1</MeleeHitChance>
-							<MeleeCritChance>0.05</MeleeCritChance>
-							<MeleeParryChance>0.05</MeleeParryChance>
-							<MeleeDodgeChance>0.1</MeleeDodgeChance>
-							<RestRateMultiplier>0.05</RestRateMultiplier>
-							<MentalBreakThreshold>-0.10</MentalBreakThreshold>
-							<PainShockThreshold>0.10</PainShockThreshold>
-							<Suppressability>-0.10</Suppressability>
-							<ComfyTemperatureMax>5</ComfyTemperatureMax>
-							<ComfyTemperatureMin>-5</ComfyTemperatureMin>
-						</statOffsets>
-					</value>
-				</li>
-
-				<!-- Talent Swordsman -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraitDef[defName="RT_TalentSwordsman"]/degreeDatas/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-							<AimingDelayFactor>-0.1</AimingDelayFactor>
-							<MeleeHitChance>2</MeleeHitChance>
-							<MeleeCritChance>0.10</MeleeCritChance>
-							<MeleeParryChance>0.10</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-							<RestRateMultiplier>0.05</RestRateMultiplier>
-							<MentalBreakThreshold>-0.10</MentalBreakThreshold>
-							<PainShockThreshold>0.10</PainShockThreshold>
-							<Suppressability>-0.10</Suppressability>
-							<ComfyTemperatureMax>5</ComfyTemperatureMax>
-							<ComfyTemperatureMin>-5</ComfyTemperatureMin>
-						</statOffsets>
-					</value>
-				</li>
-
-				<!-- Tier 2 -->
-				<!-- Talent Weapons Master -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraitDef[defName="RT_TalentWeaponsMaster"]/degreeDatas/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
-							<AimingDelayFactor>-0.1</AimingDelayFactor>
-							<MeleeHitChance>3</MeleeHitChance>
-							<MeleeCritChance>0.15</MeleeCritChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-							<MeleeDodgeChance>0.3</MeleeDodgeChance>
-							<RestRateMultiplier>0.05</RestRateMultiplier>
-							<MentalBreakThreshold>-0.10</MentalBreakThreshold>
-							<PainShockThreshold>0.10</PainShockThreshold>
-							<Suppressability>-0.15</Suppressability>
-							<ComfyTemperatureMax>5</ComfyTemperatureMax>
-							<ComfyTemperatureMin>-5</ComfyTemperatureMin>
-						</statOffsets>
-					</value>
-				</li>
-
-				<!-- Talent Hunter -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraitDef[defName="RT_TalentHunter"]/degreeDatas/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-							<AimingDelayFactor>-0.1</AimingDelayFactor>
-							<MeleeHitChance>2</MeleeHitChance>
-							<MeleeCritChance>0.10</MeleeCritChance>
-							<MeleeParryChance>0.10</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-							<MedicalTendQuality>0.05</MedicalTendQuality>
-							<RestRateMultiplier>0.1</RestRateMultiplier>
-							<MentalBreakThreshold>-0.10</MentalBreakThreshold>
-							<PainShockThreshold>0.10</PainShockThreshold>
-							<Suppressability>-0.15</Suppressability>
-							<ComfyTemperatureMax>5</ComfyTemperatureMax>
-							<ComfyTemperatureMin>-5</ComfyTemperatureMin>
-						</statOffsets>
-					</value>
-				</li>
-
-				<!-- Talent Fletcher -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraitDef[defName="RT_TalentFletcher"]/degreeDatas/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
-							<AimingDelayFactor>-0.1</AimingDelayFactor>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-							<SmithingSpeed>0.1</SmithingSpeed>
-							<RestRateMultiplier>0.05</RestRateMultiplier>
-							<MentalBreakThreshold>-0.10</MentalBreakThreshold>
-							<PainShockThreshold>0.10</PainShockThreshold>
-							<Suppressability>-0.15</Suppressability>
-							<ComfyTemperatureMax>3</ComfyTemperatureMax>
-							<ComfyTemperatureMin>-3</ComfyTemperatureMin>
-						</statOffsets>
-					</value>
-				</li>
-
-				<!-- Tier 3 -->
-				<!-- Talent Adventurer -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraitDef[defName="RT_TalentAdventurer"]/degreeDatas/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
-							<AimingDelayFactor>-0.15</AimingDelayFactor>
-							<MeleeHitChance>3</MeleeHitChance>
-							<MeleeCritChance>0.15</MeleeCritChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-							<MeleeDodgeChance>0.3</MeleeDodgeChance>
-							<MedicalTendQuality>0.10</MedicalTendQuality>
-							<CarryWeight>2</CarryWeight>
-							<CarryBulk>3</CarryBulk>
-							<RestRateMultiplier>0.15</RestRateMultiplier>
-							<PawnTrapSpringChance>0.2</PawnTrapSpringChance>
-							<MentalBreakThreshold>-0.15</MentalBreakThreshold>
-							<PainShockThreshold>0.10</PainShockThreshold>
-							<Suppressability>-0.15</Suppressability>
-							<ComfyTemperatureMax>5</ComfyTemperatureMax>
-							<ComfyTemperatureMin>-5</ComfyTemperatureMin>
-						</statOffsets>
-					</value>
-				</li>
-
-				<!-- Talent Architect -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraitDef[defName="RT_TalentArchitect"]/degreeDatas/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ConstructionSpeed>0.15</ConstructionSpeed>
-							<FixBrokenDownBuildingSuccessChance>0.15</FixBrokenDownBuildingSuccessChance>
-							<MiningSpeed>0.15</MiningSpeed>
-							<MiningYield>0.15</MiningYield>
-							<SculptingSpeed>0.15</SculptingSpeed>
-							<MeleeDodgeChance>0.5</MeleeDodgeChance>
-							<CarryWeight>2</CarryWeight>
-							<CarryBulk>3</CarryBulk>
-							<MentalBreakThreshold>-0.10</MentalBreakThreshold>
-							<PainShockThreshold>0.10</PainShockThreshold>
-							<ComfyTemperatureMax>3</ComfyTemperatureMax>
-							<ComfyTemperatureMin>-3</ComfyTemperatureMin>
-						</statOffsets>
-					</value>
-				</li>
-
-				<!-- Tier 4 -->
-				<!-- Talent Scout -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraitDef[defName="RT_TalentScout"]/degreeDatas/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
-							<AimingDelayFactor>-0.1</AimingDelayFactor>
-							<MeleeHitChance>3</MeleeHitChance>
-							<MeleeCritChance>0.15</MeleeCritChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-							<MeleeDodgeChance>0.3</MeleeDodgeChance>
-							<PlantHarvestYield>0.1</PlantHarvestYield>
-							<MedicalTendSpeed>0.10</MedicalTendSpeed>
-							<MedicalTendQuality>0.10</MedicalTendQuality>
-							<CarryWeight>-1</CarryWeight>
-							<CarryBulk>-2</CarryBulk>
-							<PawnTrapSpringChance>0.1</PawnTrapSpringChance>
-							<RestRateMultiplier>0.25</RestRateMultiplier>
-							<MentalBreakThreshold>-0.20</MentalBreakThreshold>
-							<PainShockThreshold>0.20</PainShockThreshold>
-							<Suppressability>-0.20</Suppressability>
-							<ComfyTemperatureMax>5</ComfyTemperatureMax>
-							<ComfyTemperatureMin>-5</ComfyTemperatureMin>
-						</statOffsets>
-					</value>
-				</li>
-
-				<!-- Tier 5 -->
-				<!-- Talent Hero -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraitDef[defName="RT_TalentHero"]/degreeDatas/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ShootingAccuracyPawn>3</ShootingAccuracyPawn>
-							<AimingDelayFactor>-0.25</AimingDelayFactor>
-							<MeleeHitChance>6</MeleeHitChance>
-							<MeleeCritChance>0.30</MeleeCritChance>
-							<MeleeParryChance>0.30</MeleeParryChance>
-							<MeleeDodgeChance>0.6</MeleeDodgeChance>
-							<MedicalTendQuality>0.15</MedicalTendQuality>
-							<CarryWeight>5</CarryWeight>
-							<CarryBulk>5</CarryBulk>
-							<PawnTrapSpringChance>0.1</PawnTrapSpringChance>
-							<RestRateMultiplier>0.5</RestRateMultiplier>
-							<MentalBreakThreshold>-0.15</MentalBreakThreshold>
-							<PainShockThreshold>0.15</PainShockThreshold>
-							<Suppressability>-0.25</Suppressability>
-							<ComfyTemperatureMax>5</ComfyTemperatureMax>
-							<ComfyTemperatureMin>-5</ComfyTemperatureMin>
-						</statOffsets>
-					</value>
-				</li>
-
-				<!-- Talent Herald -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraitDef[defName="RT_TalentHerald"]/degreeDatas/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ShootingAccuracyPawn>2</ShootingAccuracyPawn>
-							<AimingDelayFactor>-0.20</AimingDelayFactor>
-							<MeleeHitChance>4</MeleeHitChance>
-							<MeleeCritChance>0.25</MeleeCritChance>
-							<MeleeParryChance>0.25</MeleeParryChance>
-							<MeleeDodgeChance>0.5</MeleeDodgeChance>
-							<MedicalTendQuality>0.10</MedicalTendQuality>
-							<CarryWeight>4</CarryWeight>
-							<CarryBulk>4</CarryBulk>
-							<RestRateMultiplier>0.45</RestRateMultiplier>
-							<PawnTrapSpringChance>0.2</PawnTrapSpringChance>
-							<MentalBreakThreshold>-0.10</MentalBreakThreshold>
-							<PainShockThreshold>0.15</PainShockThreshold>
-							<Suppressability>-0.25</Suppressability>
-							<ComfyTemperatureMax>5</ComfyTemperatureMax>
-							<ComfyTemperatureMin>-5</ComfyTemperatureMin>
-						</statOffsets>
-					</value>
-				</li>
-
-				<!-- Any Tier -->
-				<!-- Replacing Carry Capacity to Carry Weight or Bulk Bonus -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraitDef[defName="RT_TalentBuilder" or defName="RT_TalentMiner" or defName="RT_TalentTrader" or defName="RT_TalentHerbalist" or defName="RT_TalentJackOfAllTrades"]/degreeDatas/li/statOffsets/CarryingCapacity</xpath>
-					<value>
-						<CarryWeight>1</CarryWeight>
-						<CarryBulk>2</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraitDef[defName="RT_TalentGroundskeeper" or defName="RT_TalentEngineer"]/degreeDatas/li/statOffsets/CarryingCapacity</xpath>
-					<value>
-						<CarryWeight>2</CarryWeight>
-						<CarryBulk>3</CarryBulk>
-					</value>
-				</li>
-
-				<!-- Remove Movespeed Bonus -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/TraitDef[defName="RT_TalentPhysician" or defName="RT_TalentGroundskeeper" or defName="RT_TalentEngineer" or defName="RT_TalentCook" or defName="RT_TalentHerbalist" or defName="RT_TalentArmourer" or defName="RT_TalentVeterinarian" or defName="RT_TalentChef" or defName="RT_TalentSurgeon" or defName="RT_TalentPhilosopher" or defName="RT_TalentRecruiter" or defName="RT_TalentJackOfAllTrades"]/degreeDatas/li/statOffsets/MoveSpeed</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimWorld - Witcher Monster Hunt/Bodies_WMH-CE.xml b/Patches/RimWorld - Witcher Monster Hunt/Bodies_WMH-CE.xml
deleted file mode 100644
index e3e076986e..0000000000
--- a/Patches/RimWorld - Witcher Monster Hunt/Bodies_WMH-CE.xml	
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimWorld - Witcher Monster Hunt</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- SingleEyedHumanoid (Cyclops) -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="WMH_SingleEyedHumanoid"]//*[def="Torso" or def="Ribcage" or def="Sternum" or def="Pelvis" or def="Neck" or def="Head" or def="Skull" or def="Nose" or def="Jaw" or def="Shoulder" or def="Clavicle" or def="Arm" or def="Humerus" or def="Radius" or def="Hand" or def="Finger" or def="Waist" or def="Leg" or def="Femur" or def="Tibia" or def="Foot" or def="Toe"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- JellyFish -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="WMH_JellyfishBody"]//*[def="WMH_JellyfishMainBody" or def="WMH_HydrogenSac" or def="AnimalJaw"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- WingedBird / Bird -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="WMH_Bird"]//*[def="Body" or def="Tail" or def="Neck" or def="Head" or def="Skull" or def="Beak" or def="Leg" or def="Foot"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="WMH_Bird"]//*[def="Body" or def="Tail" or def="Neck" or def="Head" or def="Skull" or def="Beak" or def="Leg" or def="Foot"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Then add natural armor -->
-					<xpath>Defs/BodyDef[defName="WMH_Bird"]//*[def="Body" or def="Tail" or def="Neck" or def="Head" or def="Skull" or def="Beak" or def="Leg" or def="Foot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- WingedReptile / Reptile (Literal copy-paste of the above lines except instead of Beak it's AnimalJaw) -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="WMH_Reptile"]//*[def="Body" or def="Tail" or def="Neck" or def="Head" or def="Skull" or def="AnimalJaw" or def="Leg" or def="Foot"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="WMH_Reptile"]//*[def="Body" or def="Tail" or def="Neck" or def="Head" or def="Skull" or def="AnimalJaw" or def="Leg" or def="Foot"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Then add natural armor -->
-					<xpath>Defs/BodyDef[defName="WMH_Reptile"]//*[def="Body" or def="Tail" or def="Neck" or def="Head" or def="Skull" or def="AnimalJaw" or def="Leg" or def="Foot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- WMH_RockHumanoid -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="WMH_RockHumanoid"]//*[def="Torso" or def="WMH_RockHead" or def="WMH_RockArm" or def="WMH_RockLeg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="WMH_RockHumanoid"]//*[def="Torso" or def="WMH_RockHead" or def="WMH_RockArm" or def="WMH_RockLeg"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd"><!-- Then add natural armor -->
-					<xpath>Defs/BodyDef[defName="WMH_RockHumanoid"]//*[def="Torso" or def="WMH_RockHead" or def="WMH_RockArm" or def="WMH_RockLeg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimWorld - Witcher Monster Hunt/Projectile_WH.xml b/Patches/RimWorld - Witcher Monster Hunt/Projectile_WH.xml
deleted file mode 100644
index 1d810e9829..0000000000
--- a/Patches/RimWorld - Witcher Monster Hunt/Projectile_WH.xml	
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimWorld - Witcher Monster Hunt</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WMH_LeshyWave" or
-						defName="WMH_WyvernAcidSpit" or
-						defName="WMH_WispProjectile"
-						] </xpath>
-					<value>
-						<thingClass>CombatExtended.BulletCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="WMH_Rock"
-						]/thingClass </xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_LeshyWave"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>WMH_VeryToxicBite</damageDef>
-							<damageAmountBase>40</damageAmountBase>
-							<speed>28</speed>
-							<armorPenetrationSharp>10</armorPenetrationSharp>
-							<armorPenetrationBlunt>20.660</armorPenetrationBlunt>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_WyvernAcidSpit"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>WMH_AcidSpit</damageDef>
-							<damageAmountBase>40</damageAmountBase>
-							<speed>22</speed>
-							<armorPenetrationSharp>10</armorPenetrationSharp>
-							<armorPenetrationBlunt>1.660</armorPenetrationBlunt>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_WispProjectile"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>Flame</damageDef>
-							<damageAmountBase>6</damageAmountBase>
-							<speed>13</speed>
-							<armorPenetrationSharp>16</armorPenetrationSharp>
-							<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Rock"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>1.5</explosionRadius>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<damageDef>Bomb</damageDef>
-							<damageAmountBase>40</damageAmountBase>
-							<soundExplode>MortarBomb_Explode</soundExplode>
-							<speed>13</speed>
-							<armorPenetrationSharp>5</armorPenetrationSharp>
-							<armorPenetrationBlunt>25</armorPenetrationBlunt>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</projectile>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimWorld - Witcher Monster Hunt/Races_BasiliskCE.xml b/Patches/RimWorld - Witcher Monster Hunt/Races_BasiliskCE.xml
deleted file mode 100644
index d1240288be..0000000000
--- a/Patches/RimWorld - Witcher Monster Hunt/Races_BasiliskCE.xml	
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimWorld - Witcher Monster Hunt</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="WMH_Basilisk"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WMH_Basilisk"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.3</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Basilisk"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WMH_Basilisk"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>0.2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Basilisk"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>0.65</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Right claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>0.65</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>razor beak</label>
-								<capacities>
-									<li>WMH_VeryToxicBite</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<chanceFactor>0.9</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4.55</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>25</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="WMH_Basilisk"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="WMH_Basilisk"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WMH_Basilisk"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>3250</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimWorld - Witcher Monster Hunt/Races_BearofleetCE.xml b/Patches/RimWorld - Witcher Monster Hunt/Races_BearofleetCE.xml
deleted file mode 100644
index f13a8f7c84..0000000000
--- a/Patches/RimWorld - Witcher Monster Hunt/Races_BearofleetCE.xml	
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimWorld - Witcher Monster Hunt</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="WMH_Bearofleet"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WMH_Bearofleet"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						<MeleeCritChance>0.75</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Bearofleet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>8</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Bearofleet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Bearofleet"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fangs</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>50</power>
-								<cooldownTime>1.25</cooldownTime>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<armorPenetrationBlunt>24</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>tentacles</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>Arms</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="WMH_Bearofleet"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="WMH_Bearofleet"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WMH_Bearofleet"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>5250</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimWorld - Witcher Monster Hunt/Races_ChortCE.xml b/Patches/RimWorld - Witcher Monster Hunt/Races_ChortCE.xml
deleted file mode 100644
index eae4b2e480..0000000000
--- a/Patches/RimWorld - Witcher Monster Hunt/Races_ChortCE.xml	
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimWorld - Witcher Monster Hunt</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="WMH_Chort"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WMH_Chort"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.08</MeleeDodgeChance>
-						<MeleeCritChance>0.5</MeleeCritChance>
-						<MeleeParryChance>0.4</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Chort"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>45</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Chewy</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>1.45</cooldownTime>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.6</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimWorld - Witcher Monster Hunt/Races_CyclopsCE.xml b/Patches/RimWorld - Witcher Monster Hunt/Races_CyclopsCE.xml
deleted file mode 100644
index 0a46023658..0000000000
--- a/Patches/RimWorld - Witcher Monster Hunt/Races_CyclopsCE.xml	
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimWorld - Witcher Monster Hunt</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="WMH_Cyclops"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WMH_Cyclops"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.75</MeleeCritChance>
-						<MeleeParryChance>0.3</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Cyclops"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Cyclops"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Cyclops"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>54</power>
-								<cooldownTime>2.9</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>54</power>
-								<cooldownTime>2.9</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>15.55</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="WMH_Cyclops"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="WMH_Cyclops"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WMH_Cyclops"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>7250</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>300</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimWorld - Witcher Monster Hunt/Races_DjinCE.xml b/Patches/RimWorld - Witcher Monster Hunt/Races_DjinCE.xml
deleted file mode 100644
index 787c0f1263..0000000000
--- a/Patches/RimWorld - Witcher Monster Hunt/Races_DjinCE.xml	
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimWorld - Witcher Monster Hunt</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="WMH_Djinn"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WMH_Djinn"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.25</AimingAccuracy>
-						<ShootingAccuracyPawn>0.25</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.8</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Djinn"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>pseudopod</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.88</cooldownTime>
-								<linkedBodyPartsGroup>WMH_Pseudopods</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimWorld - Witcher Monster Hunt/Races_EkimmaraCE.xml b/Patches/RimWorld - Witcher Monster Hunt/Races_EkimmaraCE.xml
deleted file mode 100644
index bf481642c8..0000000000
--- a/Patches/RimWorld - Witcher Monster Hunt/Races_EkimmaraCE.xml	
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimWorld - Witcher Monster Hunt</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="WMH_Ekimmara"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WMH_Ekimmara"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.33</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Ekimmara"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3.75</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Ekimmara"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Ekimmara"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>0.5</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Right claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>0.5</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>fangs</label>
-								<capacities>
-									<li>WMH_EkimmaraBite</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetrationSharp>5</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>3</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4.55</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="WMH_Ekimmara"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="WMH_Ekimmara"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WMH_Ekimmara"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>2750</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>500</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimWorld - Witcher Monster Hunt/Races_FiendCE.xml b/Patches/RimWorld - Witcher Monster Hunt/Races_FiendCE.xml
deleted file mode 100644
index af91690983..0000000000
--- a/Patches/RimWorld - Witcher Monster Hunt/Races_FiendCE.xml	
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimWorld - Witcher Monster Hunt</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="WMH_Fiend"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WMH_Fiend"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>0.55</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Fiend"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>38</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>38</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>1.88</cooldownTime>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.6</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Horn</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimWorld - Witcher Monster Hunt/Races_FlederCE.xml b/Patches/RimWorld - Witcher Monster Hunt/Races_FlederCE.xml
deleted file mode 100644
index 59f7b47e2e..0000000000
--- a/Patches/RimWorld - Witcher Monster Hunt/Races_FlederCE.xml	
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimWorld - Witcher Monster Hunt</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="WMH_Fleder"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WMH_Fleder"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.35</MeleeDodgeChance>
-						<MeleeCritChance>0.36</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Fleder"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Fleder"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Fleder"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.02</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Right claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.02</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>fangs</label>
-								<capacities>
-									<li>WMH_FlederBite</li>
-								</capacities>
-								<power>33</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>3</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4.55</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="WMH_Fleder"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="WMH_Fleder"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WMH_Fleder"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>2800</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>400</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimWorld - Witcher Monster Hunt/Races_FoglerCE.xml b/Patches/RimWorld - Witcher Monster Hunt/Races_FoglerCE.xml
deleted file mode 100644
index 42623c387c..0000000000
--- a/Patches/RimWorld - Witcher Monster Hunt/Races_FoglerCE.xml	
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimWorld - Witcher Monster Hunt</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="WMH_Fogler"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WMH_Fogler"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.35</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Fogler"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2.4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Fogler"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.65</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Fogler"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>WMH_InfectedClaws</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>WMH_InfectedClaws</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="WMH_Fogler"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="WMH_Fogler"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WMH_Fogler"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>2000</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimWorld - Witcher Monster Hunt/Races_GhoulCE.xml b/Patches/RimWorld - Witcher Monster Hunt/Races_GhoulCE.xml
deleted file mode 100644
index 0614485bec..0000000000
--- a/Patches/RimWorld - Witcher Monster Hunt/Races_GhoulCE.xml	
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimWorld - Witcher Monster Hunt</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="WMH_Ghoul"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WMH_Ghoul"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						<MeleeCritChance>0.03</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Ghoul"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>WMH_InfectedClaws</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>WMH_InfectedClaws</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationSharp>0.35</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimWorld - Witcher Monster Hunt/Races_GolemCE.xml b/Patches/RimWorld - Witcher Monster Hunt/Races_GolemCE.xml
deleted file mode 100644
index 2fd4f1361b..0000000000
--- a/Patches/RimWorld - Witcher Monster Hunt/Races_GolemCE.xml	
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimWorld - Witcher Monster Hunt</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="WMH_Golem"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WMH_Golem"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.85</MeleeCritChance>
-						<MeleeParryChance>0.6</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Golem"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>36</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Golem"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Golem"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claws</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>44</power>
-								<cooldownTime>2.33</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>50</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Right claws</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>44</power>
-								<cooldownTime>2.33</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>50</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="WMH_Golem"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="WMH_Golem"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WMH_Golem"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>4500</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.25</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimWorld - Witcher Monster Hunt/Races_HymCE.xml b/Patches/RimWorld - Witcher Monster Hunt/Races_HymCE.xml
deleted file mode 100644
index 3eb7965b33..0000000000
--- a/Patches/RimWorld - Witcher Monster Hunt/Races_HymCE.xml	
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimWorld - Witcher Monster Hunt</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="WMH_Hym"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WMH_Hym"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Hym"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>WMH_HymPunch</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>2.2</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<armorPenetrationBlunt>60</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>WMH_HymPunch</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>2.2</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<armorPenetrationBlunt>60</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>WMH_HymPunch</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<armorPenetrationBlunt>60</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimWorld - Witcher Monster Hunt/Races_KikimoreCE.xml b/Patches/RimWorld - Witcher Monster Hunt/Races_KikimoreCE.xml
deleted file mode 100644
index 5cfce2faf4..0000000000
--- a/Patches/RimWorld - Witcher Monster Hunt/Races_KikimoreCE.xml	
+++ /dev/null
@@ -1,290 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimWorld - Witcher Monster Hunt</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="WMH_InsectoidMonsterBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<useStatic>false</useStatic>
-									<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
-									<parts>
-										<li>InsectLeg</li>
-									</parts>
-								</li>
-								<li>
-									<useStatic>false</useStatic>
-									<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
-									<parts>
-										<li>InsectLeg</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="WMH_InsectoidMonsterBase"]/statBases</xpath>
-					<value>
-						<PartialArmorBody>0</PartialArmorBody>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="WMAux_KikimoreWorker"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WMAux_KikimoreWorker"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.07</MeleeCritChance>
-						<MeleeParryChance>0.08</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMAux_KikimoreWorker"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.1</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.65</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="WMAux_KikimoreWorker"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="WMAux_KikimoreWorker"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WMAux_KikimoreWorker"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>375</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="WMAux_KikimoreWarrior"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WMAux_KikimoreWarrior"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMAux_KikimoreWarrior"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>8</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMAux_KikimoreWarrior"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMAux_KikimoreWarrior"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.55</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="WMAux_KikimoreWorker"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="WMAux_KikimoreWorker"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WMAux_KikimoreWorker"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>750</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="WMH_KikimoreQueen"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WMH_KikimoreQueen"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.01</MeleeDodgeChance>
-						<MeleeCritChance>0.65</MeleeCritChance>
-						<MeleeParryChance>0.3</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_KikimoreQueen"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_KikimoreQueen"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_KikimoreQueen"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>WMH_ParalysingBite</li>
-								</capacities>
-								<power>50</power>
-								<cooldownTime>2.33</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<armorPenetrationBlunt>36</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="WMH_KikimoreQueen"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="WMH_KikimoreQueen"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WMH_KikimoreQueen"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>2500</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimWorld - Witcher Monster Hunt/Races_LeshyCE.xml b/Patches/RimWorld - Witcher Monster Hunt/Races_LeshyCE.xml
deleted file mode 100644
index 43ddcf3784..0000000000
--- a/Patches/RimWorld - Witcher Monster Hunt/Races_LeshyCE.xml	
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimWorld - Witcher Monster Hunt</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="WMH_Leshy"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WMH_Leshy"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.22</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Leshy"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Horn</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>0.85</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Horn</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.85</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Left Claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>0.85</cooldownTime>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Right Claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1</cooldownTime>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>2.67</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>6.55</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimWorld - Witcher Monster Hunt/Races_NekkerCE.xml b/Patches/RimWorld - Witcher Monster Hunt/Races_NekkerCE.xml
deleted file mode 100644
index 7c053bbc97..0000000000
--- a/Patches/RimWorld - Witcher Monster Hunt/Races_NekkerCE.xml	
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimWorld - Witcher Monster Hunt</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="WMH_Nekker"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WMH_Nekker"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.22</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Nekker"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimWorld - Witcher Monster Hunt/Races_WerewolfCE.xml b/Patches/RimWorld - Witcher Monster Hunt/Races_WerewolfCE.xml
deleted file mode 100644
index 6442d55c39..0000000000
--- a/Patches/RimWorld - Witcher Monster Hunt/Races_WerewolfCE.xml	
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimWorld - Witcher Monster Hunt</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="WMH_Werewolf"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WMH_Werewolf"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.45</MeleeDodgeChance>
-						<MeleeCritChance>0.3</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Werewolf"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.45</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Werewolf"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.65</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Werewolf"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>0.9</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>0.9</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>WMH_WerewolfBite</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>1.85</cooldownTime>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="WMH_Werewolf"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="WMH_Werewolf"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WMH_Werewolf"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>2375</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>300</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimWorld - Witcher Monster Hunt/Races_WraithCE.xml b/Patches/RimWorld - Witcher Monster Hunt/Races_WraithCE.xml
deleted file mode 100644
index 576853dc8b..0000000000
--- a/Patches/RimWorld - Witcher Monster Hunt/Races_WraithCE.xml	
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimWorld - Witcher Monster Hunt</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="WMH_Wraith"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WMH_Wraith"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.45</MeleeDodgeChance>
-						<MeleeCritChance>0.2</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Wraith"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>3.2</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<armorPenetrationBlunt>40</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>3.2</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<armorPenetrationBlunt>40</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimWorld - Witcher Monster Hunt/Races_WyvernCE.xml b/Patches/RimWorld - Witcher Monster Hunt/Races_WyvernCE.xml
deleted file mode 100644
index 37186c9fbf..0000000000
--- a/Patches/RimWorld - Witcher Monster Hunt/Races_WyvernCE.xml	
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimWorld - Witcher Monster Hunt</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="WMH_Wyvern"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WMH_Wyvern"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.33</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Wyvern"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>24</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Wyvern"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Wyvern"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Right claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>razor beak</label>
-								<capacities>
-									<li>WMH_VeryToxicBite</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>1.33</cooldownTime>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.8</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>tail</label>
-								<capacities>
-									<li>WMH_VeryToxicBite</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<chanceFactor>0.75</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>25</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="WMH_Wyvern"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="WMH_Wyvern"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WMH_Wyvern"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>4500</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/RimWorld - Witcher Monster Hunt/WH_ProjectileShoot.xml b/Patches/RimWorld - Witcher Monster Hunt/WH_ProjectileShoot.xml
deleted file mode 100644
index d80b71ea21..0000000000
--- a/Patches/RimWorld - Witcher Monster Hunt/WH_ProjectileShoot.xml	
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimWorld - Witcher Monster Hunt</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Wyvern -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Wyvern"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>WMH_WyvernAcidSpit</defaultProjectile>
-								<warmupTime>1.5</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>1</minRange>
-								<range>30</range>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<commonality>0.5</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Leshy -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Leshy"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>WMH_LeshyWave</defaultProjectile>
-								<warmupTime>1</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>2</minRange>
-								<range>50</range>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<commonality>1</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Wisp -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Djinn"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>WMH_WispProjectile</defaultProjectile>
-								<warmupTime>0.3</warmupTime>
-								<burstShotCount>50</burstShotCount>
-								<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-								<minRange>1</minRange>
-								<range>36</range>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<commonality>1</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Cyclop -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WMH_Cyclops"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>WMH_Rock</defaultProjectile>
-								<warmupTime>3</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>6</minRange>
-								<range>32</range>
-								<soundCast>WMH_RockThrow</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-								<commonality>0.4</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimcraft Collection/Allies/AlienRace_AllHumanoids.xml b/Patches/Rimcraft Collection/Allies/AlienRace_AllHumanoids.xml
deleted file mode 100644
index d7ff14742f..0000000000
--- a/Patches/Rimcraft Collection/Allies/AlienRace_AllHumanoids.xml	
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[Ry]Rimcraft Allied Races</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_MagharOrc"]/statBases/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>0.8</MeleeDodgeChance>
-								<MeleeCritChance>1.33</MeleeCritChance>
-								<MeleeParryChance>1</MeleeParryChance>
-								<Suppressability>0.66</Suppressability>
-								<SmokeSensitivity>1</SmokeSensitivity>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_Nightborne"]/statBases/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>1.33</MeleeDodgeChance>
-								<MeleeCritChance>1</MeleeCritChance>
-								<MeleeParryChance>1</MeleeParryChance>
-								<Suppressability>1</Suppressability>
-								<SmokeSensitivity>1</SmokeSensitivity>
-								<NightVisionEfficiency>0.66</NightVisionEfficiency>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_VoidElf"]/statBases/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>1.33</MeleeDodgeChance>
-								<MeleeCritChance>1</MeleeCritChance>
-								<MeleeParryChance>1</MeleeParryChance>
-								<Suppressability>1</Suppressability>
-								<SmokeSensitivity>1</SmokeSensitivity>
-								<NightVisionEfficiency>0.33</NightVisionEfficiency>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimcraft Collection/Allies/RimCraft_AlliedHumanoidLeather_CE.xml b/Patches/Rimcraft Collection/Allies/RimCraft_AlliedHumanoidLeather_CE.xml
deleted file mode 100644
index 1a8392d3a0..0000000000
--- a/Patches/Rimcraft Collection/Allies/RimCraft_AlliedHumanoidLeather_CE.xml	
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Ry]Rimcraft Allied Races</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--========== Humanoid leather ============-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_WoWMagharOrc"
-						or defName="Leather_WoWNightborne"
-						or defName="Leather_WoWVoidElf"]/statBases/StuffPower_Armor_Sharp </xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.05</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimcraft Collection/Animals/Animal_base_CE.xml b/Patches/Rimcraft Collection/Animals/Animal_base_CE.xml
deleted file mode 100644
index 5ea6f9542c..0000000000
--- a/Patches/Rimcraft Collection/Animals/Animal_base_CE.xml	
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Ry]Rimcraft Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="BaseWoWDirewolf"
-						or @Name="BaseWoWElekk"
-						or @Name="BaseWoWForsakenhorse"
-						or @Name="BaseWoWHorse"
-						or @Name="BaseWoWKodo"
-						or @Name="BaseWoWNightsaber"
-						or @Name="BaseWoWRam"] </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="BaseWoWDragonhawk"
-						or @Name="BaseWoWFairyDragon"
-						or @Name="BaseWoWHawkstrider"
-						or @Name="BaseWoWMurloc"
-						or @Name="BaseWoWRaptor"] </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimcraft Collection/Animals/CE_BigBirb.xml b/Patches/Rimcraft Collection/Animals/CE_BigBirb.xml
deleted file mode 100644
index 3e15dbb094..0000000000
--- a/Patches/Rimcraft Collection/Animals/CE_BigBirb.xml	
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Ry]Rimcraft Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoW_Animal_Hawkstrider" or defName="WoW_Animal_Voidstrider"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>0.07</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoW_Animal_Hawkstrider" or defName="WoW_Animal_Voidstrider"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Cut</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.28</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-									<li>Stab</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.68</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>13</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimcraft Collection/Animals/CE_Gargantuan.xml b/Patches/Rimcraft Collection/Animals/CE_Gargantuan.xml
deleted file mode 100644
index 87577b49b1..0000000000
--- a/Patches/Rimcraft Collection/Animals/CE_Gargantuan.xml	
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Ry]Rimcraft Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Kodo === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoW_Animal_Kodo"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.62</MeleeCritChance>
-						<MeleeParryChance>0.3</MeleeParryChance>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-						<ArmorRating_Sharp>0.4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoW_Animal_Kodo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>2.47</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>32.96</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>2.47</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>32.960</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>51</power>
-								<cooldownTime>3</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationBlunt>48</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Elekk === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoW_Animal_Elekk"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.90</MeleeCritChance>
-						<MeleeParryChance>0.33</MeleeParryChance>
-						<ArmorRating_Blunt>4</ArmorRating_Blunt>
-						<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoW_Animal_Elekk"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tusk</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>58</power>
-								<cooldownTime>3.37</cooldownTime>
-								<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>46.226</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>2.47</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>28.96</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>2.47</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>28.960</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>56</power>
-								<cooldownTime>3.69</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>40</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimcraft Collection/Animals/CE_Horses.xml b/Patches/Rimcraft Collection/Animals/CE_Horses.xml
deleted file mode 100644
index 17246ca941..0000000000
--- a/Patches/Rimcraft Collection/Animals/CE_Horses.xml	
+++ /dev/null
@@ -1,323 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Ry]Rimcraft Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoW_Animal_Horse" or defName="WoW_Animal_Forsakenhorse"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.11</MeleeDodgeChance>
-						<MeleeCritChance>0.30</MeleeCritChance>
-						<MeleeParryChance>0.19</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoW_Animal_EpicForsakenhorse"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.36</MeleeCritChance>
-						<MeleeParryChance>0.19</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoW_Animal_Unicorn"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						<MeleeCritChance>0.30</MeleeCritChance>
-						<MeleeParryChance>0.3</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoW_Animal_Talbuk"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.11</MeleeDodgeChance>
-						<MeleeCritChance>0.4</MeleeCritChance>
-						<MeleeParryChance>0.3</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoW_Animal_Horse" or defName="WoW_Animal_Forsakenhorse"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.97</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.12</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoW_Animal_EpicForsakenhorse"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.47</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5.538</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.47</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5.538</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.43</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5.538</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.43</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5.538</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.97</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2.12</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoW_Animal_Unicorn"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horny</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>1.46</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.97</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoW_Animal_Talbuk"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4.538</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4.538</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4.538</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4.538</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.97</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>horny</label>
-								<capacities>
-									<li>Poke</li>
-									<li>Blunt</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.46</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimcraft Collection/Animals/CE_Hound.xml b/Patches/Rimcraft Collection/Animals/CE_Hound.xml
deleted file mode 100644
index 1ce0cfa51f..0000000000
--- a/Patches/Rimcraft Collection/Animals/CE_Hound.xml	
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Ry]Rimcraft Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoW_Animal_Mastiff"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.18</MeleeCritChance>
-						<MeleeParryChance>0.08</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoW_Animal_Mastiff"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.044</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimcraft Collection/Animals/CE_Murloc.xml b/Patches/Rimcraft Collection/Animals/CE_Murloc.xml
deleted file mode 100644
index e4eee3cf0d..0000000000
--- a/Patches/Rimcraft Collection/Animals/CE_Murloc.xml	
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Ry]Rimcraft Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoW_Animal_Murloc"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.33</MeleeDodgeChance>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>0.6</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoW_Animal_Murloc"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.24</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>25</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.24</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimcraft Collection/Animals/CE_Ram.xml b/Patches/Rimcraft Collection/Animals/CE_Ram.xml
deleted file mode 100644
index 7f6e33308a..0000000000
--- a/Patches/Rimcraft Collection/Animals/CE_Ram.xml	
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Ry]Rimcraft Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoW_Animal_Ram"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.38</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoW_Animal_Ram"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Poke</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.64</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimcraft Collection/Animals/CE_Raptor.xml b/Patches/Rimcraft Collection/Animals/CE_Raptor.xml
deleted file mode 100644
index 7c2e09af91..0000000000
--- a/Patches/Rimcraft Collection/Animals/CE_Raptor.xml	
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Ry]Rimcraft Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoW_Animal_Raptor"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						<MeleeCritChance>0.24</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoW_Animal_Raptor"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.12</cooldownTime>
-								<linkedBodyPartsGroup>FootClawAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.64</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.12</cooldownTime>
-								<linkedBodyPartsGroup>FootClawAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.64</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>6.65</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimcraft Collection/Animals/CE_Sabercat.xml b/Patches/Rimcraft Collection/Animals/CE_Sabercat.xml
deleted file mode 100644
index f0bcc29c1d..0000000000
--- a/Patches/Rimcraft Collection/Animals/CE_Sabercat.xml	
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Ry]Rimcraft Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoW_Animal_Frostsaber" or defName="WoW_Animal_Nightsaber" or defName="WoW_Animal_Manasaber"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.34</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoW_Animal_Frostsaber" or defName="WoW_Animal_Nightsaber" or defName="WoW_Animal_Manasaber"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>0.95</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.743</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>0.95</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.743</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-									<li>Stab</li>
-								</capacities>
-								<power>33</power>
-								<cooldownTime>1.7</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>3.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>10.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5.423</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimcraft Collection/Animals/CE_Wolves.xml b/Patches/Rimcraft Collection/Animals/CE_Wolves.xml
deleted file mode 100644
index a6a4dfd2b8..0000000000
--- a/Patches/Rimcraft Collection/Animals/CE_Wolves.xml	
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Ry]Rimcraft Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoW_Animal_Direwolf" or defName="WoW_Animal_Frostwolf"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.34</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoW_Animal_Direwolf" or defName="WoW_Animal_Frostwolf"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.66</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.023</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.66</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.023</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-									<li>Stab</li>
-								</capacities>
-								<power>33</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>3.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>12.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5.423</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimcraft Collection/Animals/CE_wowDragons.xml b/Patches/Rimcraft Collection/Animals/CE_wowDragons.xml
deleted file mode 100644
index 0481d81caf..0000000000
--- a/Patches/Rimcraft Collection/Animals/CE_wowDragons.xml	
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Ry]Rimcraft Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoW_Animal_Dragonhawk"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.66</MeleeDodgeChance>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>0.27</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoW_Animal_Dragonhawk"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>beak</label>
-								<capacities>
-									<li>Bite</li>
-									<li>Stab</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoW_Animal_FairyDragon"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.9</MeleeDodgeChance>
-						<MeleeCritChance>0.16</MeleeCritChance>
-						<MeleeParryChance>0.3</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoW_Animal_FairyDragon"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>beak</label>
-								<capacities>
-									<li>Bite</li>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimcraft Collection/Animals/RimCraft_Leather_CE.xml b/Patches/Rimcraft Collection/Animals/RimCraft_Leather_CE.xml
deleted file mode 100644
index 67e3f59bd0..0000000000
--- a/Patches/Rimcraft Collection/Animals/RimCraft_Leather_CE.xml	
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Ry]Rimcraft Animals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--========== Unicum leather ============-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_WoWUnicorn"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.05</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<!--========== Forsaken zorse leathers ============-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_WoWForsakenhorse"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.03</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_WoWFairyDragon"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.08</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_WoWFairyDragon"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.052</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimcraft Collection/Factions/Patch_PawnKinds_Wow.xml b/Patches/Rimcraft Collection/Factions/Patch_PawnKinds_Wow.xml
deleted file mode 100644
index c5dd4f4a54..0000000000
--- a/Patches/Rimcraft Collection/Factions/Patch_PawnKinds_Wow.xml	
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Ry]Rimcraft Factions</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Archer -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="WoW_BloodElf_Guardian"
-						or defName="WoW_BloodElf_Farstrider"
-						or defName="WoW_Draenei_Peacekeeper"
-						or defName="WoW_Draenei_Vindictator"
-						or defName="WoW_Dwarf_Guard"
-						or defName="WoW_Dwarf_Mountaineer"
-						or defName="WoW_Dwarf_Officer"
-						or defName="WoW_Forsaken_Plaguebringer"
-						or defName="WoW_Forsaken_DarkrangerNE"
-						or defName="WoW_Forsaken_DarkrangerHE"
-						or defName="WoW_Gnome_Engineer"
-						or defName="WoW_Gnome_Tinker"
-						or defName="WoW_Goblin_Tinker"
-						or defName="WoW_HighElf_Scout"
-						or defName="WoW_HighElf_Ranger"
-						or defName="WoW_Human_Private"
-						or defName="WoW_Human_Sergeant"
-						or defName="WoW_Human_Marshal"
-						or defName="WoW_NightElf_Archer"
-						or defName="WoW_Human_Sergeant"
-						or defName="WoW_Human_Marshal"
-						or defName="WoW_NightElf_Archer"
-						or defName="WoW_NightElf_Hunter"
-						or defName="WoW_NightElf_Watcher"
-						or defName="WoW_Troll_ThroatSlicer"
-						or defName="WoW_Troll_HeadHunter"] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>20</min>
-								<max>40</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>20</min>
-										<max>120</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- Warrior shield -->
-				<!--<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FR_MinotaurTribes_Fighter" or defName="FR_MinotaurTribes_Warrior"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>100</min>
-								<max>200</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.75</shieldChance>
-						</li>
-					</value>
-				</li>-->
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimcraft Collection/Metals/WOW_Metals_CE.xml b/Patches/Rimcraft Collection/Metals/WOW_Metals_CE.xml
deleted file mode 100644
index c726a7dc45..0000000000
--- a/Patches/Rimcraft Collection/Metals/WOW_Metals_CE.xml	
+++ /dev/null
@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Ry]Rimcraft Metals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Add Bulk and thingCategories -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="WoW_MetalBase"]/statBases</xpath>
-					<value>
-						<Bulk>0.04</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="WoW_thorium" or
-						defName="WoW_darkiron" or
-						defName="WoW_mithril" or
-						defName="WoW_adamantite" or
-						defName="WoW_hardened_adamantite" or
-						defName="WoW_truesilver"
-						]/stuffProps/categories </xpath>
-					<value>
-						<li>Metallic_Weapon</li>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<!-- Thorium -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoW_thorium"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1.75</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoW_thorium"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>2.6</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoW_thorium"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.1</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoW_thorium"]/statBases/BluntDamageMultiplier</xpath>
-					<value>
-						<BluntDamageMultiplier>1.1</BluntDamageMultiplier>
-					</value>
-				</li>
-
-				<!-- Dark Iron -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoW_darkiron"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1.75</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoW_darkiron"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>2.6</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoW_darkiron"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.3</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="WoW_darkiron"]/statBases/SharpDamageMultiplier</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoW_darkiron"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>1.2</MeleePenetrationFactor>
-					</value>
-				</li>
-
-				<!-- Mithril -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoW_mithril"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1.2</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoW_mithril"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1.9</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoW_mithril"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.08</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="WoW_mithril"]/statBases/SharpDamageMultiplier</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoW_mithril"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>0.7</Mass>
-						<MeleePenetrationFactor>1.1</MeleePenetrationFactor>
-						<MeleeWeapon_CooldownMultiplier>0.9</MeleeWeapon_CooldownMultiplier>
-					</value>
-				</li>
-
-				<!-- Adamantite -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoW_adamantite"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1.6</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoW_adamantite"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>2.75</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoW_adamantite"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.1</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="WoW_adamantite"]/statBases/SharpDamageMultiplier</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="WoW_adamantite"]/statBases/BluntDamageMultiplier</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoW_adamantite"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>1.5</MeleePenetrationFactor>
-					</value>
-				</li>
-
-				<!-- Hardened Adamantite -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoW_hardened_adamantite"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>2.5</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoW_hardened_adamantite"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>4</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoW_hardened_adamantite"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.12</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="WoW_hardened_adamantite"]/statBases/SharpDamageMultiplier</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="WoW_hardened_adamantite"]/statBases/BluntDamageMultiplier</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoW_hardened_adamantite"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>2</MeleePenetrationFactor>
-					</value>
-				</li>
-
-				<!-- True Silvah -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoW_truesilver"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1.18</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoW_truesilver"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1.68</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoW_truesilver"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.03</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoW_truesilver"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>1.07</MeleePenetrationFactor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimcraft Collection/Rimcraft/AlienRace_AllHumanoids.xml b/Patches/Rimcraft Collection/Rimcraft/AlienRace_AllHumanoids.xml
deleted file mode 100644
index fd00728075..0000000000
--- a/Patches/Rimcraft Collection/Rimcraft/AlienRace_AllHumanoids.xml	
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[Ry]Rimcraft</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_BloodElf"]/statBases/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>1.33</MeleeDodgeChance>
-								<MeleeCritChance>1</MeleeCritChance>
-								<MeleeParryChance>1</MeleeParryChance>
-								<Suppressability>1</Suppressability>
-								<SmokeSensitivity>1</SmokeSensitivity>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_Draenei"]/statBases</xpath>
-							<value>
-								<MeleeCritChance>1</MeleeCritChance>
-								<MeleeParryChance>1</MeleeParryChance>
-								<Suppressability>1</Suppressability>
-								<SmokeSensitivity>1</SmokeSensitivity>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_Draenei"]/race/baseBodySize</xpath>
-							<value>
-								<baseBodySize>1.24</baseBodySize>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_Dwarf"]/statBases/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>0.75</MeleeDodgeChance>
-								<MeleeCritChance>1</MeleeCritChance>
-								<MeleeParryChance>1</MeleeParryChance>
-								<Suppressability>0.8</Suppressability>
-								<SmokeSensitivity>1</SmokeSensitivity>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_Forsaken"]/statBases</xpath>
-							<value>
-								<MeleeDodgeChance>1</MeleeDodgeChance>
-								<MeleeCritChance>1</MeleeCritChance>
-								<MeleeParryChance>1</MeleeParryChance>
-								<Suppressability>0.1</Suppressability>
-								<SmokeSensitivity>0.2</SmokeSensitivity>
-								<NightVisionEfficiency>0.5</NightVisionEfficiency>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_ForsakenHighElf" or defName="WoW_ForsakenNightElf"]/statBases/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>1.33</MeleeDodgeChance>
-								<MeleeCritChance>1</MeleeCritChance>
-								<MeleeParryChance>1</MeleeParryChance>
-								<Suppressability>0.2</Suppressability>
-								<SmokeSensitivity>0.1</SmokeSensitivity>
-								<NightVisionEfficiency>0.5</NightVisionEfficiency>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_Gnome"]/statBases/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>1.5</MeleeDodgeChance>
-								<MeleeCritChance>0.8</MeleeCritChance>
-								<MeleeParryChance>0.8</MeleeParryChance>
-								<Suppressability>1</Suppressability>
-								<SmokeSensitivity>1</SmokeSensitivity>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_Goblin"]/statBases/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>1.33</MeleeDodgeChance>
-								<MeleeCritChance>1</MeleeCritChance>
-								<MeleeParryChance>1</MeleeParryChance>
-								<Suppressability>1</Suppressability>
-								<SmokeSensitivity>1</SmokeSensitivity>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_HighElf"]/statBases/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>1.33</MeleeDodgeChance>
-								<MeleeCritChance>1</MeleeCritChance>
-								<MeleeParryChance>1</MeleeParryChance>
-								<Suppressability>1</Suppressability>
-								<SmokeSensitivity>1</SmokeSensitivity>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_Human"]/statBases/MoveSpeed</xpath>
-							<value>
-								<MoveSpeed>4.6</MoveSpeed>
-								<MeleeCritChance>1</MeleeCritChance>
-								<MeleeParryChance>1</MeleeParryChance>
-								<Suppressability>1</Suppressability>
-								<SmokeSensitivity>1</SmokeSensitivity>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_NightElf"]/statBases/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>1.33</MeleeDodgeChance>
-								<MeleeCritChance>1</MeleeCritChance>
-								<MeleeParryChance>1</MeleeParryChance>
-								<Suppressability>1</Suppressability>
-								<SmokeSensitivity>1</SmokeSensitivity>
-								<NightVisionEfficiency>0.66</NightVisionEfficiency>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_Orc"]/statBases/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>0.8</MeleeDodgeChance>
-								<MeleeCritChance>1.33</MeleeCritChance>
-								<MeleeParryChance>1</MeleeParryChance>
-								<Suppressability>0.66</Suppressability>
-								<SmokeSensitivity>1</SmokeSensitivity>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_Skeleton"]/statBases</xpath>
-							<value>
-								<MeleeCritChance>1</MeleeCritChance>
-								<MeleeParryChance>1</MeleeParryChance>
-								<Suppressability>0</Suppressability>
-								<SmokeSensitivity>0</SmokeSensitivity>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_Skeleton"]/statBases/ShootingAccuracyPawn</xpath>
-							<value>
-								<ShootingAccuracyPawn>0.5</ShootingAccuracyPawn>
-								<AimingAccuracy>0.5</AimingAccuracy>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_Tauren"]/statBases/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>0.75</MeleeDodgeChance>
-								<MeleeCritChance>1.5</MeleeCritChance>
-								<MeleeParryChance>1</MeleeParryChance>
-								<Suppressability>0.66</Suppressability>
-								<SmokeSensitivity>1</SmokeSensitivity>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_Troll"]/statBases</xpath>
-							<value>
-								<MeleeDodgeChance>1</MeleeDodgeChance>
-								<MeleeCritChance>1</MeleeCritChance>
-								<MeleeParryChance>1</MeleeParryChance>
-								<Suppressability>1</Suppressability>
-								<SmokeSensitivity>1</SmokeSensitivity>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_Worgen"]/statBases/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>1.25</MeleeDodgeChance>
-								<MeleeCritChance>1.5</MeleeCritChance>
-								<MeleeParryChance>1</MeleeParryChance>
-								<Suppressability>0.5</Suppressability>
-								<SmokeSensitivity>1</SmokeSensitivity>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_Worgen"]/statBases/ShootingAccuracyPawn</xpath>
-							<value>
-								<ShootingAccuracyPawn>0.75</ShootingAccuracyPawn>
-								<AimingAccuracy>0.75</AimingAccuracy>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimcraft Collection/Rimcraft/Base_Race_CE.xml b/Patches/Rimcraft Collection/Rimcraft/Base_Race_CE.xml
deleted file mode 100644
index 9865fd24fa..0000000000
--- a/Patches/Rimcraft Collection/Rimcraft/Base_Race_CE.xml	
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Ry]Rimcraft</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="WoW_Race_Base"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="WoW_Race_Base"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="WoW_Draenei_Base"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.825</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="WoW_Orc_Base"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.47</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.47</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>4.89</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.225</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="WoW_Troll_Base"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.33</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.33</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.825</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_BloodElf"
-						or defName="WoW_Draenei"
-						or defName="WoW_Dwarf"
-						or defName="WoW_Forsaken"
-						or defName="WoW_ForsakenHighElf"
-						or defName="WoW_ForsakenNightElf"
-						or defName="WoW_Gnome"
-						or defName="WoW_Goblin"
-						or defName="WoW_HighElf"
-						or defName="WoW_Human"
-						or defName="WoW_NightElf"
-						or defName="WoW_Orc"
-						or defName="WoW_Skeleton"
-						or defName="WoW_Tauren"
-						or defName="WoW_Troll"
-						or defName="WoW_Worgen"] </xpath>
-					<value>
-						<comps />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WoW_BloodElf"
-						or defName="WoW_Draenei"
-						or defName="WoW_Dwarf"
-						or defName="WoW_Forsaken"
-						or defName="WoW_ForsakenHighElf"
-						or defName="WoW_ForsakenNightElf"
-						or defName="WoW_Gnome"
-						or defName="WoW_Goblin"
-						or defName="WoW_HighElf"
-						or defName="WoW_Human"
-						or defName="WoW_NightElf"
-						or defName="WoW_Orc"
-						or defName="WoW_Skeleton"
-						or defName="WoW_Tauren"
-						or defName="WoW_Troll"
-						or defName="WoW_Worgen"]/comps </xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimcraft Collection/Rimcraft/Patch_Bodies_WOW.xml b/Patches/Rimcraft Collection/Rimcraft/Patch_Bodies_WOW.xml
deleted file mode 100644
index 3dfda4c6fb..0000000000
--- a/Patches/Rimcraft Collection/Rimcraft/Patch_Bodies_WOW.xml	
+++ /dev/null
@@ -1,264 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Ry]Rimcraft</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- why yes dear explorer of this file, i did just literally copy and paste the ShekBody bodytype patches -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Tauren"]/corePart/parts/li[def="Ribcage"]/coverage</xpath>
-					<value>
-						<coverage>0.07</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Tauren"]/corePart/parts/li[def="Pelvis"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Tauren"]/corePart/parts/li[def="Stomach"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Tauren"]/corePart/parts/li[def="Heart"]/coverage</xpath>
-					<value>
-						<coverage>0.04</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Tauren"]/corePart/parts/li[def="Lung"]/coverage</xpath>
-					<value>
-						<coverage>0.055</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Tauren"]/corePart/parts/li[def="Kidney"]/coverage</xpath>
-					<value>
-						<coverage>0.03</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Tauren"]/corePart/parts/li[def="Liver"]/coverage</xpath>
-					<value>
-						<coverage>0.06</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Tauren"]/corePart/parts/li[def="Neck"]/coverage</xpath>
-					<value>
-						<coverage>0.055</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Tauren"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Skull"]/parts/li[def="Brain"]/coverage</xpath>
-					<value>
-						<coverage>0.7</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Tauren"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Eye"]/coverage</xpath>
-					<value>
-						<coverage>0.04</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Tauren"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Tauren"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/coverage</xpath>
-					<value>
-						<coverage>0.08</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Tauren"]/corePart/parts/li[def="Shoulder"]/coverage</xpath>
-					<value>
-						<coverage>0.085</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Tauren"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Clavicle"]/coverage</xpath>
-					<value>
-						<coverage>0.06</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Tauren"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Humerus"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Tauren"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Radius"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Tauren"]/corePart/parts/li[def="Leg"]/parts/li[def="Femur"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Tauren"]/corePart/parts/li[def="Leg"]/parts/li[def="Tibia"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-
-				<!-- why yes dear explorer of this file, i did just literally copy and paste the Skellington bodytype patches -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="WoWScourgeSkeleton_Body"]/corePart/parts/li[def="Ribcage"]/coverage</xpath>
-					<value>
-						<coverage>0.012</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="WoWScourgeSkeleton_Body"]/corePart/parts/li[def="Pelvis"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="WoWScourgeSkeleton_Body"]/corePart/parts/li[def="WoWScourgeSkeleton_Neck"]/coverage</xpath>
-					<value>
-						<coverage>0.055</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="WoWScourgeSkeleton_Body"]/corePart/parts/li[def="WoWScourgeSkeleton_Shoulder"]/coverage</xpath>
-					<value>
-						<coverage>0.085</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="WoWScourgeSkeleton_Body"]/corePart/parts/li[def="WoWScourgeSkeleton_Shoulder"]/parts/li[def="Clavicle"]/coverage</xpath>
-					<value>
-						<coverage>0.06</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="WoWScourgeSkeleton_Body"]/corePart/parts/li[def="WoWScourgeSkeleton_Shoulder"]/parts/li[def="WoWScourgeSkeleton_Arm"]/parts/li[def="Humerus"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="WoWScourgeSkeleton_Body"]/corePart/parts/li[def="WoWScourgeSkeleton_Shoulder"]/parts/li[def="WoWScourgeSkeleton_Arm"]/parts/li[def="Radius"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="WoWScourgeSkeleton_Body"]/corePart/parts/li[def="WoWScourgeSkeleton_Leg"]/coverage</xpath>
-					<value>
-						<coverage>0.1</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="WoWScourgeSkeleton_Body"]/corePart/parts/li[def="WoWScourgeSkeleton_Leg"]/parts/li[def="Femur"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="WoWScourgeSkeleton_Body"]/corePart/parts/li[def="WoWScourgeSkeleton_Leg"]/parts/li[def="Tibia"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyPartDef[defName="WoWScourgeSkeleton_Torso"]/hitPoints</xpath>
-					<value>
-						<hitPoints>50</hitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyPartDef[defName="WoWScourgeSkeleton_Leg"]/hitPoints</xpath>
-					<value>
-						<hitPoints>38</hitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="WoWScourgeSkeleton_Body"]//*[
-						def="WoWScourgeSkeleton_Torso" or
-						def="WoWScourgeSkeleton_Neck" or
-						def="Head" or
-						def="Jaw" or
-						def="WoWScourgeSkeleton_Shoulder" or
-						def="WoWScourgeSkeleton_Arm" or
-						def="WoWScourgeSkeleton_Hand" or
-						def="WoWScourgeSkeleton_Finger" or
-						def="WoWScourgeSkeleton_Toe" or
-						def="WoWScourgeSkeleton_Foot" or
-						def="WoWScourgeSkeleton_Leg"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="WoWScourgeSkeleton_Body"]//*[
-						def="Jaw"]/groups
-					</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Tauren"]//*[
-						def="Torso" or
-						def="Neck" or
-						def="Head" or
-						def="Jaw" or
-						def="Ear" or
-						def="Nose" or
-						def="Shoulder" or
-						def="Arm" or
-						def="Hand" or
-						def="Finger" or
-						def="Toe" or
-						def="Foot" or
-						def="Leg"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Tauren"]//*[
-						def="Jaw" or
-						def="Nose" or
-						def="Eye"]/groups
-					</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimcraft Collection/Rimcraft/RimCraft_HumanoidLeather_CE.xml b/Patches/Rimcraft Collection/Rimcraft/RimCraft_HumanoidLeather_CE.xml
deleted file mode 100644
index 1497c06132..0000000000
--- a/Patches/Rimcraft Collection/Rimcraft/RimCraft_HumanoidLeather_CE.xml	
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Ry]Rimcraft</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--========== Humanoid leather ============-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_WoWBloodElf"
-						or defName="Leather_WoWDraenei"
-						or defName="Leather_WoWDwarf"
-						or defName="Leather_WoWGnome"
-						or defName="Leather_WoWGoblin"
-						or defName="Leather_WoWHighElf"
-						or defName="Leather_WoWNightElf"
-						or defName="Leather_WoWOrc"
-						or defName="Leather_WoWTroll"
-						or defName="Leather_WoWWorgen"]/statBases/StuffPower_Armor_Sharp </xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.05</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<!--========== Forsaken leathers ============-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_WoWForsaken"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.03</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimcraft Collection/Scenario/Scenarios_Patch_Wow _Allies.xml b/Patches/Rimcraft Collection/Scenario/Scenarios_Patch_Wow _Allies.xml
deleted file mode 100644
index 0a0565ec0d..0000000000
--- a/Patches/Rimcraft Collection/Scenario/Scenarios_Patch_Wow _Allies.xml	
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Ry]Rimcraft Scenarios</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>[Ry]Rimcraft Allied Races</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<!-- === Add ammo to scenario === -->
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ScenarioDef[defName="NightborneScenario"]/scenario/parts</xpath>
-
-						<value>
-							<li Class="ScenPart_StartingThing_Defined">
-								<def>StartingThing_Defined</def>
-								<thingDef>Ammo_Arrow_Steel</thingDef>
-								<count>120</count>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimcraft Collection/Scenario/Scenarios_Patch_Wow.xml b/Patches/Rimcraft Collection/Scenario/Scenarios_Patch_Wow.xml
deleted file mode 100644
index 6bba29f4e5..0000000000
--- a/Patches/Rimcraft Collection/Scenario/Scenarios_Patch_Wow.xml	
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Ry]Rimcraft Scenarios</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Add ammo to scenario === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="AllianceScenario"
-						or defName="BloodElfScenario"
-						or defName="DraeneiScenario"
-						or defName="ForsakenScenario"
-						or defName="HighElfScenario"
-						or defName="HordeScenario"
-						or defName="DwarfScenario"
-						or defName="NightElfScenario"
-						or defName="TrollScenario"]/scenario/parts </xpath>
-
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_Arrow_Steel</thingDef>
-							<count>120</count>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimcraft Collection/Weapons/Patch_WOW_Ranged.xml b/Patches/Rimcraft Collection/Weapons/Patch_WOW_Ranged.xml
deleted file mode 100644
index 0b14a9d32f..0000000000
--- a/Patches/Rimcraft Collection/Weapons/Patch_WOW_Ranged.xml	
+++ /dev/null
@@ -1,415 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Ry]Rimcraft Weaponry</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWR_NightElf_RecurveBow"
-						or defName="WoWR_BloodElf_Bow"
-						or defName="WoWR_Alliance_Longbow"
-						or defName="WoWR_BloodElf_HawkBow"
-						or defName="WoWR_HighElf_Longbow"
-						or defName="WoWR_HighElf_RecurveBow"
-						or defName="WoWR_Forsaken_DarkBow"]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWR_Draenei__Crossbow"
-						or defName="WoWR_Draenei_Longbow"]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>WoWR_Alliance_Longbow</defName>
-					<statBases>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.8</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>6.00</Bulk>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_GreatArrow_Stone</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>32</range>
-						<soundCast>Bow_Large</soundCast>
-					</Properties>
-					<AmmoUser>
-						<ammoSet>AmmoSet_GreatArrow</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_Bow</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>WoWR_NightElf_RecurveBow</defName>
-					<statBases>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.8</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>4.00</Bulk>
-						<RangedWeapon_Cooldown>0.8</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_StreamlinedArrow_Stone</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>26</range>
-						<soundCast>Bow_Recurve</soundCast>
-					</Properties>
-					<AmmoUser>
-						<ammoSet>AmmoSet_StreamlinedArrow</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_Bow</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>WoWR_BloodElf_Bow</defName>
-					<statBases>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.8</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>4.00</Bulk>
-						<RangedWeapon_Cooldown>0.8</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_StreamlinedArrow_Stone</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>26</range>
-						<soundCast>Bow_Recurve</soundCast>
-					</Properties>
-					<AmmoUser>
-						<ammoSet>AmmoSet_StreamlinedArrow</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_Bow</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>WoWR_BloodElf_HawkBow</defName>
-					<statBases>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.8</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>4.00</Bulk>
-						<RangedWeapon_Cooldown>0.8</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_StreamlinedArrow_Stone</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>26</range>
-						<soundCast>Bow_Recurve</soundCast>
-					</Properties>
-					<AmmoUser>
-						<ammoSet>AmmoSet_StreamlinedArrow</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_Bow</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>WoWR_HighElf_Longbow</defName>
-					<statBases>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.8</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>6.00</Bulk>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_GreatArrow_Stone</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>32</range>
-						<soundCast>Bow_Large</soundCast>
-					</Properties>
-					<AmmoUser>
-						<ammoSet>AmmoSet_GreatArrow</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_Bow</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>WoWR_HighElf_RecurveBow</defName>
-					<statBases>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.8</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>4.00</Bulk>
-						<RangedWeapon_Cooldown>0.8</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_StreamlinedArrow_Stone</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>26</range>
-						<soundCast>Bow_Recurve</soundCast>
-					</Properties>
-					<AmmoUser>
-						<ammoSet>AmmoSet_StreamlinedArrow</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_Bow</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>WoWR_Forsaken_DarkBow</defName>
-					<statBases>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.8</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>4.00</Bulk>
-						<RangedWeapon_Cooldown>0.8</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_StreamlinedArrow_Stone</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>26</range>
-						<soundCast>Bow_Recurve</soundCast>
-					</Properties>
-					<AmmoUser>
-						<ammoSet>AmmoSet_StreamlinedArrow</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_Bow</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>WoWR_Draenei__Crossbow</defName>
-					<statBases>
-						<Bulk>6</Bulk>
-						<SwayFactor>1.2</SwayFactor>
-						<ShotSpread>0.4</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Projectile_CrossbowBolt_Steel</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>28</range>
-						<soundCast>Bow_Large</soundCast>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>WoWR_Draenei_Longbow</defName>
-					<statBases>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.8</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>6.00</Bulk>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_GreatArrow_Stone</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>32</range>
-						<soundCast>Bow_Large</soundCast>
-					</Properties>
-					<AmmoUser>
-						<ammoSet>AmmoSet_GreatArrow</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_Bow</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_GreatArrowWOW</defName>
-							<label>great arrows</label>
-							<ammoTypes>
-								<Ammo_GreatArrow_Stone>Projectile_GreatArrowWOW_Stone</Ammo_GreatArrow_Stone>
-								<Ammo_GreatArrow_Steel>Projectile_GreatArrowWOW_Steel</Ammo_GreatArrow_Steel>
-								<Ammo_GreatArrow_Plasteel>Projectile_GreatArrowWOW_Plasteel</Ammo_GreatArrow_Plasteel>
-								<Ammo_GreatArrow_Venom>Projectile_GreatArrowWOW_Venom</Ammo_GreatArrow_Venom>
-								<Ammo_GreatArrow_Flame>Projectile_GreatArrowWOW_Flame</Ammo_GreatArrow_Flame>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef ParentName="BaseGreatArrowProjectile">
-							<defName>Projectile_GreatArrowWOW_Stone</defName>
-							<label>great arrow (stone)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Stone</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>33</speed>
-								<damageAmountBase>28</damageAmountBase>
-								<armorPenetrationBlunt>14.98</armorPenetrationBlunt>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<preExplosionSpawnChance>0.1</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Ammo_GreatArrow_Stone</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseGreatArrowProjectile">
-							<defName>Projectile_GreatArrowWOW_Steel</defName>
-							<label>great arrow (steel)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>36</speed>
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationBlunt>21.06</armorPenetrationBlunt>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<preExplosionSpawnChance>0.3</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Ammo_GreatArrow_Steel</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseGreatArrowProjectile">
-							<defName>Projectile_GreatArrowWOW_Plasteel</defName>
-							<label>great arrow (plasteel)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Plasteel</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>37</speed>
-								<damageAmountBase>15</damageAmountBase>
-								<armorPenetrationBlunt>19.26</armorPenetrationBlunt>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<preExplosionSpawnChance>0.375</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Ammo_GreatArrow_Plasteel</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseGreatArrowProjectile">
-							<defName>Projectile_GreatArrowWOW_Venom</defName>
-							<label>great arrow (venom)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Venom</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>36</speed>
-								<damageDef>Arrow</damageDef>
-								<damageAmountBase>14</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>ArrowVenom</def>
-										<amount>6</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationBlunt>21.06</armorPenetrationBlunt>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<preExplosionSpawnChance>0.3</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Ammo_GreatArrow_Steel</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseGreatArrowProjectile">
-							<defName>Projectile_GreatArrowWOW_Flame</defName>
-							<label>great arrow (flame)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Flame</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>36</speed>
-								<damageDef>Arrow</damageDef>
-								<damageAmountBase>6</damageAmountBase>
-								<armorPenetrationBlunt>10.54</armorPenetrationBlunt>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<secondaryDamage>
-									<li>
-										<def>Flame</def>
-										<amount>1</amount>
-										<chance>0.33</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimcraft Collection/Weapons/WOW_AAWeaponsBase_CE.xml b/Patches/Rimcraft Collection/Weapons/WOW_AAWeaponsBase_CE.xml
deleted file mode 100644
index e693069c35..0000000000
--- a/Patches/Rimcraft Collection/Weapons/WOW_AAWeaponsBase_CE.xml	
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Ry]Rimcraft Weaponry</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class='PatchOperationRemove'>
-					<xpath>Defs/ThingDef[defName="WoWM_Alliance_Halberd"
-						or defName="WoWM_Alliance_Polearm"
-						or defName="WoWM_Alliance_BattleHammer"
-						or defName="WoWM_Alliance_Claymore"
-						or defName="WoWM_Bloodelf_Ranseur"
-						or defName="WoWM_Bloodelf_Glaive"
-						or defName="WoWM_Bloodelf_GreatSword"
-						or defName="WoWM_Draenei_Mace"
-						or defName="WoWM_Draenei_Hammer"
-						or defName="WoWM_Draenei_Claymore"
-						or defName="WoWM_Draenei_GreatHammer"
-						or defName="WoWM_Forsaken_Halberd"
-						or defName="WoWM_Forsaken_Greatsword"
-						or defName="WoWM_HighElf_Warhammer"
-						or defName="WoWM_HighElf_Glaive"
-						or defName="WoWM_HighElf_Greatsword"
-						or defName="WoWM_Horde_Maul"
-						or defName="WoWM_Horde_GreatSpear"
-						or defName="WoWM_Horde_Greataxe"
-						or defName="WoWM_NightElf_Mooncleaver"
-						or defName="WoWM_NightElf_Halberd"
-						or defName="WoWM_Horde_Maul"
-						or defName="WoWM_Horde_Maul"]/equippedStatOffsets </xpath>
-				</li>
-
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[@Name="WoW_AllianceT1_BaseWeapon"
-						or @Name="WoW_NightElfT1_BaseWeapon"
-						or @Name="WoW_HighElfT1_BaseWeapon"
-						or @Name="WoW_DraeneiT1_BaseWeapon"
-						or @Name="WoW_HordeT1_BaseWeapon"
-						or @Name="WoW_BloodElfT1_BaseWeapon"
-						or @Name="WoW_ForsakenT1_BaseWeapon"]/recipeMaker/skillRequirements </xpath>
-					<value>
-						<skillRequirements>
-							<Crafting>6</Crafting>
-						</skillRequirements>
-					</value>
-				</li>
-
-				<li Class='PatchOperationReplace'>
-					<xpath>Defs/ThingDef[@Name="WoW_AllianceT2_BaseWeapon"
-						or @Name="WoW_NightElfT2_BaseWeapon"
-						or @Name="WoW_HighElfT2_BaseWeapon"
-						or @Name="WoW_DraeneiT2_BaseWeapon"
-						or @Name="WoW_HordeT2_BaseWeapon"
-						or @Name="WoW_BloodElfT2_BaseWeapon"
-						or @Name="WoW_ForsakenT2_BaseWeapon"]/recipeMaker/skillRequirements </xpath>
-					<value>
-						<skillRequirements>
-							<Crafting>10</Crafting>
-						</skillRequirements>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimcraft Collection/Weapons/WOW_Alliance_CE.xml b/Patches/Rimcraft Collection/Weapons/WOW_Alliance_CE.xml
deleted file mode 100644
index 7927368197..0000000000
--- a/Patches/Rimcraft Collection/Weapons/WOW_Alliance_CE.xml	
+++ /dev/null
@@ -1,447 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Ry]Rimcraft Weaponry</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- You can find the spreadsheet here https://drive.google.com/open?id=1JZAjvzealI189OofkxwUCif3yA4-u6yP3DilsmIEQJA -->
-
-				<!-- Fencing -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_Alliance_BastardSword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.37</cooldownTime>
-								<armorPenetrationBlunt>0.35</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.37</cooldownTime>
-								<armorPenetrationBlunt>0.56</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.8</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>1.21</cooldownTime>
-								<armorPenetrationBlunt>1.512</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.64</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Alliance_BastardSword"]/statBases</xpath>
-					<value>
-						<Bulk>4.5</Bulk>
-						<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_Alliance_BastardSword"]/statBases/Mass</xpath>
-					<value>
-						<Mass>1</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Alliance_BastardSword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.36</MeleeCritChance>
-							<MeleeParryChance>0.4</MeleeParryChance>
-							<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Alliance_BastardSword"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- ========== Nobz sword ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_Alliance_LongSword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.69</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.56</cooldownTime>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.6</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>1.43</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>2.592</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.58</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Alliance_LongSword"]/statBases</xpath>
-					<value>
-						<Bulk>7</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Alliance_LongSword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.63</MeleeCritChance>
-							<MeleeParryChance>0.75</MeleeParryChance>
-							<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Greatboy -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_Alliance_Greatsword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.99</cooldownTime>
-								<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.88</cooldownTime>
-								<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.8</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>1.88</cooldownTime>
-								<armorPenetrationBlunt>3.088</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.0</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Alliance_Greatsword"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>0.64</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Alliance_Greatsword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.4</MeleeCritChance>
-							<MeleeParryChance>0.64</MeleeParryChance>
-							<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Claymore -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_Alliance_Claymore"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.99</cooldownTime>
-								<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>32</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>48</power>
-								<cooldownTime>2.2</cooldownTime>
-								<armorPenetrationBlunt>4.2</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.33</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Alliance_Claymore"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>0.64</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Alliance_Claymore"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.23</MeleeCritChance>
-							<MeleeParryChance>0.64</MeleeParryChance>
-							<MeleeDodgeChance>0.44</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Halberd -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_Alliance_Halberd"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.35</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.78</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.39</cooldownTime>
-								<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.65</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>1.96</cooldownTime>
-								<armorPenetrationBlunt>5.488</armorPenetrationBlunt>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Alliance_Halberd"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>1.28</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Alliance_Halberd"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.24</MeleeCritChance>
-							<MeleeParryChance>1.08</MeleeParryChance>
-							<MeleeDodgeChance>0.9</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Polearm -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_Alliance_Polearm"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.11</cooldownTime>
-								<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.64</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.0</cooldownTime>
-								<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.9</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Alliance_Polearm"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Alliance_Polearm"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.17</MeleeCritChance>
-							<MeleeParryChance>1.18</MeleeParryChance>
-							<MeleeDodgeChance>0.9</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Definitely a warhammer -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_Alliance_BattleHammer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.87</cooldownTime>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>2.18</cooldownTime>
-								<armorPenetrationBlunt>12.76</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Alliance_BattleHammer"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<MeleeCounterParryBonus>0.33</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Alliance_BattleHammer"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>2.4</MeleeCritChance>
-							<MeleeParryChance>0.3</MeleeParryChance>
-							<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimcraft Collection/Weapons/WOW_BluddElves_CE.xml b/Patches/Rimcraft Collection/Weapons/WOW_BluddElves_CE.xml
deleted file mode 100644
index 6610156d3e..0000000000
--- a/Patches/Rimcraft Collection/Weapons/WOW_BluddElves_CE.xml	
+++ /dev/null
@@ -1,318 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Ry]Rimcraft Weaponry</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- You can find the spreadsheet here https://drive.google.com/open?id=1JZAjvzealI189OofkxwUCif3yA4-u6yP3DilsmIEQJA -->
-
-				<!-- T1 sword -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_Bloodelf_Warblade"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.37</cooldownTime>
-								<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.23</cooldownTime>
-								<armorPenetrationBlunt>0.56</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.8</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>1.18</cooldownTime>
-								<armorPenetrationBlunt>1.512</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.64</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Bloodelf_Warblade"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_Bloodelf_Warblade"]/statBases/Mass</xpath>
-					<value>
-						<Mass>1</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Bloodelf_Warblade"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.33</MeleeCritChance>
-							<MeleeParryChance>0.4</MeleeParryChance>
-							<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Bloodelf_Warblade"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!--T3 Greatboy -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_Bloodelf_GreatSword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.99</cooldownTime>
-								<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.8</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>1.37</cooldownTime>
-								<armorPenetrationBlunt>2.488</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.0</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Bloodelf_GreatSword"]/statBases</xpath>
-					<value>
-						<Bulk>9</Bulk>
-						<MeleeCounterParryBonus>0.64</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Bloodelf_GreatSword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.48</MeleeCritChance>
-							<MeleeParryChance>0.64</MeleeParryChance>
-							<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Ranseur -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_Bloodelf_Ranseur"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.35</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.78</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.3</cooldownTime>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Bloodelf_Ranseur"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Bloodelf_Ranseur"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.17</MeleeCritChance>
-							<MeleeParryChance>1.18</MeleeParryChance>
-							<MeleeDodgeChance>0.9</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Polearm -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_Bloodelf_Glaive"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>1.08</cooldownTime>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.78</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.18</cooldownTime>
-								<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.6</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Bloodelf_Glaive"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Bloodelf_Glaive"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.17</MeleeCritChance>
-							<MeleeParryChance>1.45</MeleeParryChance>
-							<MeleeDodgeChance>0.9</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!--T1 Mace-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_Bloodelf_Warmace"]/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>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.64</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>5.025</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Bloodelf_Warmace"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<MeleeCounterParryBonus>0.33</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Bloodelf_Warmace"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.33</MeleeCritChance>
-							<MeleeParryChance>0.33</MeleeParryChance>
-							<MeleeDodgeChance>0.33</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Bloodelf_Warmace"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimcraft Collection/Weapons/WOW_Draenei_CE - Copy.xml b/Patches/Rimcraft Collection/Weapons/WOW_Draenei_CE - Copy.xml
deleted file mode 100644
index e68fae912c..0000000000
--- a/Patches/Rimcraft Collection/Weapons/WOW_Draenei_CE - Copy.xml	
+++ /dev/null
@@ -1,288 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Ry]Rimcraft Weaponry</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--T1 Mace-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_Draenei_Gavel"]/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>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2.08</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>6.45</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Draenei_Gavel"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Draenei_Gavel"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.56</MeleeCritChance>
-							<MeleeParryChance>0.24</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Draenei_Gavel"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!--T2 Mace-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_Draenei_Mace"]/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>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>2</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>7.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Draenei_Mace"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.3</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Draenei_Mace"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.66</MeleeCritChance>
-							<MeleeParryChance>0.33</MeleeParryChance>
-							<MeleeDodgeChance>0.33</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Draenei_Mace"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- Definitely a T2 warhammer -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_Draenei_Hammer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.87</cooldownTime>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>2.36</cooldownTime>
-								<armorPenetrationBlunt>15.76</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Draenei_Hammer"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<MeleeCounterParryBonus>0.33</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Draenei_Hammer"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>2.8</MeleeCritChance>
-							<MeleeParryChance>0.24</MeleeParryChance>
-							<MeleeDodgeChance>0.33</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Definitely a T3 warhammer -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_Draenei_GreatHammer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.87</cooldownTime>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>34</power>
-								<cooldownTime>2.78</cooldownTime>
-								<armorPenetrationBlunt>20.76</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Draenei_GreatHammer"]/statBases</xpath>
-					<value>
-						<Bulk>9</Bulk>
-						<MeleeCounterParryBonus>0.3</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Draenei_GreatHammer"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>2.8</MeleeCritChance>
-							<MeleeParryChance>0.24</MeleeParryChance>
-							<MeleeDodgeChance>0.33</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!--T3 Claymore -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_Draenei_Claymore"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.99</cooldownTime>
-								<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>31</power>
-								<cooldownTime>1.99</cooldownTime>
-								<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>48</power>
-								<cooldownTime>2.4</cooldownTime>
-								<armorPenetrationBlunt>5.488</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.6</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Draenei_Claymore"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>0.54</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Draenei_Claymore"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.33</MeleeCritChance>
-							<MeleeParryChance>0.64</MeleeParryChance>
-							<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimcraft Collection/Weapons/WOW_Forsaken_CE.xml b/Patches/Rimcraft Collection/Weapons/WOW_Forsaken_CE.xml
deleted file mode 100644
index 73549b27c2..0000000000
--- a/Patches/Rimcraft Collection/Weapons/WOW_Forsaken_CE.xml	
+++ /dev/null
@@ -1,419 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Ry]Rimcraft Weaponry</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- You can find the spreadsheet here https://drive.google.com/open?id=1JZAjvzealI189OofkxwUCif3yA4-u6yP3DilsmIEQJA -->
-				<!-- T1 Meat cleaver -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_Forsaken_Cleaver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.37</cooldownTime>
-								<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.36</cooldownTime>
-								<armorPenetrationBlunt>1.812</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.56</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Forsaken_Cleaver"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<MeleeCounterParryBonus>0.3</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_Forsaken_Cleaver"]/statBases/Mass</xpath>
-					<value>
-						<Mass>1</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Forsaken_Cleaver"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.27</MeleeCritChance>
-							<MeleeParryChance>0.35</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Forsaken_Cleaver"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- T1 drik -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_Forsaken_Dirk"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.37</cooldownTime>
-								<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.18</cooldownTime>
-								<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.54</armorPenetrationSharp>
-								<chanceFactor>0.25</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.08</cooldownTime>
-								<armorPenetrationBlunt>1.012</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.36</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Forsaken_Dirk"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_Forsaken_Dirk"]/statBases/Mass</xpath>
-					<value>
-						<Mass>0.7</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Forsaken_Dirk"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.29</MeleeCritChance>
-							<MeleeParryChance>0.35</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Forsaken_Dirk"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- ========== T2 Sword ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_Forsaken_Blade"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.69</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.69</cooldownTime>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.25</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>31</power>
-								<cooldownTime>1.44</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>3.392</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.55</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Forsaken_Blade"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Forsaken_Blade"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.63</MeleeCritChance>
-							<MeleeParryChance>0.75</MeleeParryChance>
-							<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- T3 Greatsword -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_Forsaken_Greatsword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.99</cooldownTime>
-								<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>34</power>
-								<cooldownTime>1.99</cooldownTime>
-								<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>48</power>
-								<cooldownTime>2.4</cooldownTime>
-								<armorPenetrationBlunt>5.488</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.2</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Forsaken_Greatsword"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>0.64</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Forsaken_Greatsword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.24</MeleeCritChance>
-							<MeleeParryChance>0.64</MeleeParryChance>
-							<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- T2 Halberd -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_Forsaken_Halberd"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.35</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.78</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.39</cooldownTime>
-								<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.65</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>1.96</cooldownTime>
-								<armorPenetrationBlunt>5.488</armorPenetrationBlunt>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Forsaken_Halberd"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>1.28</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Forsaken_Halberd"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.24</MeleeCritChance>
-							<MeleeParryChance>1.08</MeleeParryChance>
-							<MeleeDodgeChance>0.9</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- T2 blade -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_Forsaken_CrescentBlade"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.99</cooldownTime>
-								<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>1.39</cooldownTime>
-								<armorPenetrationBlunt>1.05</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.18</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>2.4</cooldownTime>
-								<armorPenetrationBlunt>2.488</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.44</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Forsaken_CrescentBlade"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>0.44</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Forsaken_CrescentBlade"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.24</MeleeCritChance>
-							<MeleeParryChance>0.4</MeleeParryChance>
-							<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Forsaken_CrescentBlade"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimcraft Collection/Weapons/WOW_HiElves_CE.xml b/Patches/Rimcraft Collection/Weapons/WOW_HiElves_CE.xml
deleted file mode 100644
index e79670b3e3..0000000000
--- a/Patches/Rimcraft Collection/Weapons/WOW_HiElves_CE.xml	
+++ /dev/null
@@ -1,348 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Ry]Rimcraft Weaponry</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- You can find the spreadsheet here https://drive.google.com/open?id=1JZAjvzealI189OofkxwUCif3yA4-u6yP3DilsmIEQJA -->
-
-				<!-- T1 Daggah -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_HighElf_Dagger"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.0</cooldownTime>
-								<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.08</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.32</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.62</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_HighElf_Dagger"]/statBases</xpath>
-					<value>
-						<Bulk>1.5</Bulk>
-						<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_HighElf_Dagger"]/statBases/Mass</xpath>
-					<value>
-						<Mass>0.5</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_HighElf_Dagger"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.66</MeleeCritChance>
-							<MeleeParryChance>0.33</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_HighElf_Dagger"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- T2 saber -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_HighElf_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>Cut</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>1.37</cooldownTime>
-								<armorPenetrationBlunt>0.925</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.43</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.34</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.556</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.58</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_HighElf_Sabre"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_HighElf_Sabre"]/statBases/Mass</xpath>
-					<value>
-						<Mass>1</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_HighElf_Sabre"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.33</MeleeCritChance>
-							<MeleeParryChance>0.4</MeleeParryChance>
-							<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_HighElf_Sabre"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!--T3 Greatboy -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_HighElf_Greatsword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.99</cooldownTime>
-								<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>1.64</cooldownTime>
-								<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.8</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>2.0</cooldownTime>
-								<armorPenetrationBlunt>5.488</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.2</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_HighElf_Greatsword"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>0.64</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_HighElf_Greatsword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.24</MeleeCritChance>
-							<MeleeParryChance>0.64</MeleeParryChance>
-							<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- T2 polearm -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_HighElf_Glaive"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.35</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.78</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.39</cooldownTime>
-								<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.65</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>1.96</cooldownTime>
-								<armorPenetrationBlunt>5.488</armorPenetrationBlunt>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_HighElf_Glaive"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>1.28</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_HighElf_Glaive"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.24</MeleeCritChance>
-							<MeleeParryChance>1.08</MeleeParryChance>
-							<MeleeDodgeChance>0.9</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- T2 warhammer -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_HighElf_Warhammer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.87</cooldownTime>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>2.18</cooldownTime>
-								<armorPenetrationBlunt>12.76</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_HighElf_Warhammer"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_HighElf_Warhammer"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>2.4</MeleeCritChance>
-							<MeleeParryChance>0.24</MeleeParryChance>
-							<MeleeDodgeChance>0.33</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimcraft Collection/Weapons/WOW_Horde_CE.xml b/Patches/Rimcraft Collection/Weapons/WOW_Horde_CE.xml
deleted file mode 100644
index 4446f47f25..0000000000
--- a/Patches/Rimcraft Collection/Weapons/WOW_Horde_CE.xml	
+++ /dev/null
@@ -1,307 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Ry]Rimcraft Weaponry</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- You can find the spreadsheet here https://drive.google.com/open?id=1JZAjvzealI189OofkxwUCif3yA4-u6yP3DilsmIEQJA -->
-				<!-- T1 Cleaver -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_Horde_WarCleaver"]/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>18</power>
-								<cooldownTime>1.44</cooldownTime>
-								<armorPenetrationBlunt>0.725</armorPenetrationBlunt>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.34</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>2.056</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Horde_WarCleaver"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Horde_WarCleaver"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>0.35</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Horde_WarCleaver"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-				<!-- T1 Gladius -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_Horde_Gladius"]/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.58</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.34</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.956</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.46</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Horde_Gladius"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Horde_Gladius"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>0.35</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Horde_Gladius"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- T3 Greataxe -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_Horde_Greataxe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.99</cooldownTime>
-								<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>51</power>
-								<cooldownTime>2.44</cooldownTime>
-								<armorPenetrationBlunt>6.488</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.6</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Horde_Greataxe"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Horde_Greataxe"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.33</MeleeCritChance>
-							<MeleeParryChance>0.44</MeleeParryChance>
-							<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- T2 Spear -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_Horde_GreatSpear"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.35</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.78</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>1.56</cooldownTime>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Horde_GreatSpear"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>0.8</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Horde_GreatSpear"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.12</MeleeCritChance>
-							<MeleeParryChance>1.18</MeleeParryChance>
-							<MeleeDodgeChance>1.0</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- T2 Maul -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_Horde_Maul"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.87</cooldownTime>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>2.36</cooldownTime>
-								<armorPenetrationBlunt>14.76</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Horde_Maul"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_Horde_Maul"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>2.4</MeleeCritChance>
-							<MeleeParryChance>0.24</MeleeParryChance>
-							<MeleeDodgeChance>0.33</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimcraft Collection/Weapons/WOW_NightElves_CE.xml b/Patches/Rimcraft Collection/Weapons/WOW_NightElves_CE.xml
deleted file mode 100644
index 78a35a580a..0000000000
--- a/Patches/Rimcraft Collection/Weapons/WOW_NightElves_CE.xml	
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Ry]Rimcraft Weaponry</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- T1  -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_NightElf_Tomahawk"]/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>16</power>
-								<cooldownTime>1.34</cooldownTime>
-								<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.66</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.56</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.78</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_NightElf_Tomahawk"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_NightElf_Tomahawk"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>0.35</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_NightElf_Tomahawk"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- T1 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_NightElf_Mooncleaver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.99</cooldownTime>
-								<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.23</cooldownTime>
-								<armorPenetrationBlunt>0.888</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.46</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.34</cooldownTime>
-								<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.64</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_NightElf_Mooncleaver"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>0.44</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_NightElf_Mooncleaver"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.27</MeleeCritChance>
-							<MeleeParryChance>0.44</MeleeParryChance>
-							<MeleeDodgeChance>0.33</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_NightElf_Mooncleaver"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- T2 Spear -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_NightElf_Moonglaive"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.18</cooldownTime>
-								<armorPenetrationBlunt>1.68</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.68</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.18</cooldownTime>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.6</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_NightElf_Moonglaive"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_NightElf_Moonglaive"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.08</MeleeCritChance>
-							<MeleeParryChance>0.65</MeleeParryChance>
-							<MeleeDodgeChance>1.0</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- T2 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoWM_NightElf_Halberd"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.35</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.78</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.39</cooldownTime>
-								<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.65</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>1.96</cooldownTime>
-								<armorPenetrationBlunt>5.488</armorPenetrationBlunt>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_NightElf_Halberd"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>1.28</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoWM_NightElf_Halberd"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.24</MeleeCritChance>
-							<MeleeParryChance>1.08</MeleeParryChance>
-							<MeleeDodgeChance>0.9</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimedieval - Medieval Royalty/Ammo_MedievalFlameThrower.xml b/Patches/Rimedieval - Medieval Royalty/Ammo_MedievalFlameThrower.xml
deleted file mode 100644
index f3fcdfd98d..0000000000
--- a/Patches/Rimedieval - Medieval Royalty/Ammo_MedievalFlameThrower.xml	
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimedieval - Medieval Royalty</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_MedievalFlamethrower</defName>
-					<label>Medieval Flamethrower Grenades</label>
-					<ammoTypes>
-						<BZT_Weapon_FirepotBomb>BZT_Proj_FirepotBomb_Fired</BZT_Weapon_FirepotBomb>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef ParentName="BaseGrenadeProjectile">
-					<defName>BZT_Proj_FirepotBomb_Fired</defName>
-					<label>firepot bomb</label>
-					<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					<graphicData>
-						<texPath>Things/Item/Equipment/WeaponRanged/FirepotBomb</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<explosionRadius>0.5</explosionRadius>
-						<damageDef>Flame</damageDef>
-						<damageAmountBase>10</damageAmountBase>
-						<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
-						<preExplosionSpawnChance>1</preExplosionSpawnChance>
-						<speed>20</speed>
-						<ai_IsIncendiary>true</ai_IsIncendiary>
-					</projectile>
-				</ThingDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimedieval - Medieval Royalty/Apparel_MedievalRoyalty.xml b/Patches/Rimedieval - Medieval Royalty/Apparel_MedievalRoyalty.xml
deleted file mode 100644
index 340a6b94fe..0000000000
--- a/Patches/Rimedieval - Medieval Royalty/Apparel_MedievalRoyalty.xml	
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimedieval - Medieval Royalty</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Varangian Armor -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BZT_VarangianArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2.75</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BZT_VarangianArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4.25</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="BZT_VarangianArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BZT_VarangianArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeDodgeChance>-0.20</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BZT_VarangianArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<!-- Varangian Helmet -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BZN_VarangianHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BZN_VarangianHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BZN_VarangianHelmet"]/stuffCategories</xpath>
-					<value>
-						<stuffCategories>
-							<li>Steeled</li>
-						</stuffCategories>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BZN_VarangianHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>-0.4</AimingAccuracy>
-							<MeleeHitChance>-2</MeleeHitChance>
-							<PainShockThreshold>0.15</PainShockThreshold>
-							<SocialImpact>0.35</SocialImpact>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Footman / Scout Armor -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BZT_ScoutArmor" or defName="BZT_FootmanArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.65</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BZT_ScoutArmor" or defName="BZT_FootmanArmor"]/stuffCategories</xpath>
-					<value>
-						<stuffCategories>
-							<li>Steeled</li>
-						</stuffCategories>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BZT_ScoutArmor" or defName="BZT_FootmanArmor"]/statBases</xpath>
-					<value>
-						<Bulk>25</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BZT_ScoutArmor" or defName="BZT_FootmanArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<!-- Footman / Scout Helmet -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BZN_ScoutHelmet" or defName="BZN_FootmanHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BZN_ScoutHelmet" or defName="BZN_FootmanHelmet"]/stuffCategories</xpath>
-					<value>
-						<stuffCategories>
-							<li>Steeled</li>
-						</stuffCategories>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BZN_ScoutHelmet" or defName="BZN_FootmanHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BZN_ScoutHelmet" or defName="BZN_FootmanHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>-0.3</AimingAccuracy>
-							<MeleeHitChance>-1.5</MeleeHitChance>
-							<PainShockThreshold>0.10</PainShockThreshold>
-							<SocialImpact>0.3</SocialImpact>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimedieval - Medieval Royalty/Ranged_Medieval.xml b/Patches/Rimedieval - Medieval Royalty/Ranged_Medieval.xml
deleted file mode 100644
index c9209b72bd..0000000000
--- a/Patches/Rimedieval - Medieval Royalty/Ranged_Medieval.xml	
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimedieval - Medieval Royalty</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Flamethrower ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BZT_Gun_Firethrower</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.43</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.8</SwayFactor>
-						<Bulk>12</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>BZT_Proj_FirepotBomb_Fired</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>20</range>
-						<burstShotCount>0</burstShotCount>
-						<soundCast>Shot_IncendiaryLauncher</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_MedievalFlamethrower</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Firepot Bomb ========== -->
-
-				<!-- Projectile -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BZT_Proj_FirepotBomb"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>0.5</explosionRadius>
-							<damageDef>Flame</damageDef>
-							<damageAmountBase>10</damageAmountBase>
-							<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
-							<preExplosionSpawnChance>1</preExplosionSpawnChance>
-							<speed>12</speed>
-							<ai_IsIncendiary>true</ai_IsIncendiary>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BZT_Proj_FirepotBomb"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Projectile_FireTrail</thingClass>
-					</value>
-				</li>
-
-				<!-- Grenade -->
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="BZT_Weapon_FirepotBomb"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BZT_Weapon_FirepotBomb"]/graphicData</xpath>
-					<value>
-						<graphicData>
-							<texPath>Things/Item/Equipment/WeaponRanged/FirepotBomb</texPath>
-							<graphicClass>Graphic_Single</graphicClass>
-						</graphicData>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BZT_Weapon_FirepotBomb"]</xpath>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<stackLimit>50</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-						<ammoClass>IncendiaryFuel</ammoClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="BZT_Weapon_FirepotBomb"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BZT_Weapon_FirepotBomb"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>1</damageAmountBase>
-							<explosiveDamageType>Flame</explosiveDamageType>
-							<explosiveRadius>0.5</explosiveRadius>
-							<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
-							<preExplosionSpawnChance>1</preExplosionSpawnChance>
-						</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>BZT_Weapon_FirepotBomb</defName>
-					<statBases>
-						<Mass>0.6</Mass>
-						<Bulk>1.8</Bulk>
-						<MarketValue>3</MarketValue>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<label>throw firebomb</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<range>12</range>
-						<minRange>3</minRange>
-						<warmupTime>1.8</warmupTime>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<soundCast>ThrowMolotovCocktail</soundCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<defaultProjectile>BZT_Proj_FirepotBomb</defaultProjectile>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BZT_Weapon_FirepotBomb"]</xpath>
-					<value>
-						<recipeMaker />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>MakeFirePotBomb</defName>
-							<label>make firepot bombs x10</label>
-							<description>Craft 10 fire bombs.</description>
-							<jobString>Making fire bombs.</jobString>
-							<workAmount>1600</workAmount>
-							<recipeUsers>
-								<li>CraftingSpot</li>
-							</recipeUsers>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Chemfuel</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Chemfuel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<BZT_Weapon_FirepotBomb>10</BZT_Weapon_FirepotBomb>
-							</products>
-						</RecipeDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimedieval - Medieval Royalty/Weapons_Medieval.xml b/Patches/Rimedieval - Medieval Royalty/Weapons_Medieval.xml
deleted file mode 100644
index d4073c353a..0000000000
--- a/Patches/Rimedieval - Medieval Royalty/Weapons_Medieval.xml	
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimedieval - Medieval Royalty</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Varangian Axe === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BZT_MeleeWeapon_VarangianAxe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.78</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>31</power>
-								<cooldownTime>4.09</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>4.84</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.97</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BZT_MeleeWeapon_VarangianAxe"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>8</Bulk>
-							<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BZT_MeleeWeapon_VarangianAxe"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.06</MeleeCritChance>
-							<MeleeParryChance>0.75</MeleeParryChance>
-							<MeleeDodgeChance>0.50</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- === Imperial Saber === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BZT_MeleeWeapon_ImperialSabre"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>3.5</Bulk>
-							<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BZT_MeleeWeapon_ImperialSabre"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>0.35</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="BZT_MeleeWeapon_ImperialSabre"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BZT_MeleeWeapon_ImperialSabre"]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimefeller/Items_Resource_Stuff.xml b/Patches/Rimefeller/Items_Resource_Stuff.xml
deleted file mode 100644
index 91039fe409..0000000000
--- a/Patches/Rimefeller/Items_Resource_Stuff.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimefeller</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Synthamide === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Synthamide"]/statBases</xpath>
-					<value>
-						<Bulk>0.05</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Synthamide"]/statBases</xpath>
-					<value>
-						<WornBulk>0.25</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Synthamide"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>0.9</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Synthamide"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.6</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Synthamide"]/stuffProps/categories</xpath>
-					<value>
-						<li>SoftArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Synthamide"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.12</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Synthamide"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.1</StuffPower_Armor_Heat>
-						<StuffPower_Armor_Electric>0.05</StuffPower_Armor_Electric>
-					</value>
-				</li>
-
-				<!-- === Fiber Composite === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FiberComposite"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>2.2</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FiberComposite"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>3.1</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FiberComposite"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.2</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="FiberComposite"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>0.75</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="FiberComposite"]/stuffProps/categories</xpath>
-					<value>
-						<li>Metallic_Weapon</li>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<!-- === Synthylene === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="SynthyleneBase"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.08</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="SynthyleneBase"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="SynthyleneBase"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.01</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="SynthyleneBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.StuffToughnessMultiplierExtensionCE">
-							<toughnessMultiplier>4</toughnessMultiplier>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimefeller/Napalm_Tweaks.xml b/Patches/Rimefeller/Napalm_Tweaks.xml
deleted file mode 100644
index 82b21531cd..0000000000
--- a/Patches/Rimefeller/Napalm_Tweaks.xml
+++ /dev/null
@@ -1,271 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimefeller</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Vanilla Fishing Expanded - Fishing Treasures AddOn -->
-				<li Class="PatchOperationFindMod">
-					<mods>
-						<li>Vanilla Fishing Expanded - Fishing Treasures AddOn</li>
-					</mods>
-
-					<match Class="PatchOperationSequence">
-						<operations>
-							<li Class="PatchOperationRemove">
-								<xpath>Defs/VCE_Fishing.FishDef[defName="VCEF_SpecialShell_Napalm" or defName="VCEF_SpecialNapalm"]</xpath>
-							</li>
-						</operations>
-					</match>
-				</li>
-
-				<!-- Research -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ResearchProjectDef[defName="Napalm"]/label</xpath>
-					<value>
-						<label>Prometheum Refining</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ResearchProjectDef[defName="Napalm"]/description</xpath>
-					<value>
-						<description>Produce Prometheum from stored chemfuel, used for making incendiary explosives and specialty ammunition.</description>
-					</value>
-				</li>
-
-				<!-- Refinery Loading Bay -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RefineryLoadingBay"]/building/fixedStorageSettings/filter/thingDefs/li[.="Napalm"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RefineryLoadingBay"]/building/defaultStorageSettings/filter/thingDefs/li[.="Napalm"]</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RefineryLoadingBay"]/building/fixedStorageSettings/filter/thingDefs</xpath>
-					<value>
-						<li>Prometheum</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RefineryLoadingBay"]/building/defaultStorageSettings/filter/thingDefs</xpath>
-					<value>
-						<li>Prometheum</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RefineryLoadingBay"]/building/defaultStorageSettings/filter/thingDefs</xpath>
-					<value>
-						<li>FSX</li>
-					</value>
-				</li>
-
-				<!-- Napalm Refiner -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="NapalmRefiner"]/label</xpath>
-					<value>
-						<label>Prometheum Refiner</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="NapalmRefiner"]/description</xpath>
-					<value>
-						<description>Processes chemfuel into prometheum, a military-grade incendiary agent which ignites on contact with oxygen. The raw resource is used to craft incendiary ammo of all kinds.</description>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="NapalmRefiner"]/comps/li[2]/Product</xpath>
-					<value>
-						<Product>Prometheum</Product>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="NapalmRefiner"]/comps/li[2]/StackSize</xpath>
-					<value>
-						<StackSize>1</StackSize>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="NapalmRefiner"]/comps/li[2]/BufferSize</xpath>
-					<value>
-						<BufferSize>4</BufferSize>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="NapalmRefiner"]/comps/li[2]/ConsumeRate</xpath>
-					<value>
-						<ConsumeRate>0.1</ConsumeRate>
-					</value>
-				</li>
-
-				<!-- Napalm Trails -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Filth_NapalmTrail"]/label</xpath>
-					<value>
-						<label>Chemfuel trail</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Filth_NapalmTrail"]/description</xpath>
-					<value>
-						<description>Chemfuel trail</description>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Filth_NapalmTrail"]/costList</xpath>
-					<value>
-						<costList>
-							<Chemfuel>1</Chemfuel>
-						</costList>
-					</value>
-				</li>
-
-				<!-- Napalm Bombs -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="NapalmBomb"]/label</xpath>
-					<value>
-						<label>Prometheum bomb</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="NapalmBomb"]/description</xpath>
-					<value>
-						<description>Prometheum bomb</description>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="NapalmBomb"]/costList</xpath>
-					<value>
-						<costList>
-							<Prometheum>5</Prometheum>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="NapalmBomb"]/graphicData/texPath</xpath>
-					<value>
-						<texPath>ThirdParty/Rimefeller/Things/Resource/NapalmBomb</texPath>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="NapalmBomb"]/uiIconPath</xpath>
-					<value>
-						<uiIconPath>ThirdParty/Rimefeller/UI/NapalmBomb</uiIconPath>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="NapalmBomb"]/comps/li[2]</xpath>
-					<value>
-						<li Class="CompProperties_Explosive">
-							<explosiveRadius>3</explosiveRadius>
-							<explosiveDamageType>PrometheumFlame</explosiveDamageType>
-							<startWickHitPointsPercent>0.8</startWickHitPointsPercent>
-							<destroyThingOnExplosionSize>1</destroyThingOnExplosionSize>
-							<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
-							<preExplosionSpawnChance>1</preExplosionSpawnChance>
-							<wickTicks>
-								<min>0</min>
-								<max>1</max>
-							</wickTicks>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="NapalmBomb"]</xpath>
-					<value>
-						<specialDisplayRadius>3</specialDisplayRadius>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="NapalmBomb"]</xpath>
-					<value>
-						<fillPercent>0.5</fillPercent>
-					</value>
-				</li>
-
-				<!-- Napalm Shell -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Shell_Napalm" or defName="Bullet_Shell_Napalm"]</xpath>
-				</li>
-
-				<!-- Napalm Recipes -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/RecipeDef[defName="Make_Napalm"]</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Napalm"]</xpath>
-					<value>
-						<generateCommonality>0</generateCommonality>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Napalm"]</xpath>
-					<value>
-						<generateAllowChance>0</generateAllowChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Napalm"]/graphicData/texPath</xpath>
-					<value>
-						<texPath>ThirdParty/Rimefeller/Things/Resource/NapalmBomb</texPath>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="OilBarrel"]/graphicData/texPath</xpath>
-					<value>
-						<texPath>ThirdParty/Rimefeller/Things/Resource/OilBarrel</texPath>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Filth_OilSlick"]/graphicData/texPath</xpath>
-					<value>
-						<texPath>ThirdParty/Rimefeller/Things/Resource/OilBarrel</texPath>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Filth_NapalmTrail"]/graphicData/texPath</xpath>
-					<value>
-						<texPath>ThirdParty/Rimefeller/UI/NapalmSpill</texPath>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Filth_NapalmTrail"]/building/blueprintGraphicData/texPath</xpath>
-					<value>
-						<texPath>ThirdParty/Rimefeller/UI/NapalmSpill_bp</texPath>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimfire/ThingDefs_Misc/RF_Ranged_Medival.xml b/Patches/Rimfire/ThingDefs_Misc/RF_Ranged_Medival.xml
deleted file mode 100644
index 3d2c51363d..0000000000
--- a/Patches/Rimfire/ThingDefs_Misc/RF_Ranged_Medival.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimfire 2.5</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== Short crossbow ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_ShortCrossbow</defName>
-					<statBases>
-						<Mass>3.5</Mass>
-						<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.25</ShotSpread>
-						<SwayFactor>1.35</SwayFactor>
-						<Bulk>10</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_CrossbowBolt_Steel</defaultProjectile>
-						<warmupTime>2.6</warmupTime>
-						<range>16</range>
-						<soundCast>Interact_BeatFire</soundCast>
-						<ejectsCasings>false</ejectsCasings>
-					</Properties>
-					<AmmoUser>
-						<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
-						<magazineSize>1</magazineSize>
-						<reloadTime>2</reloadTime>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_ShortCrossbow"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>limb</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetration>0.102</armorPenetration>
-								<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>nock</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetration>0.075</armorPenetration>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimfire/ThingDefs_Misc/RF_Ranged_Modern.xml b/Patches/Rimfire/ThingDefs_Misc/RF_Ranged_Modern.xml
deleted file mode 100644
index 218a9ad799..0000000000
--- a/Patches/Rimfire/ThingDefs_Misc/RF_Ranged_Modern.xml
+++ /dev/null
@@ -1,3385 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimfire 2.5</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- P I S T O L S -->
-				<!-- ========== Deringer ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_Deringer</defName>
-					<statBases>
-						<Mass>0.45</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>0.53</SwayFactor>
-						<Bulk>1.15</Bulk>
-						<WorkToMake>4500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>20</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.42</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_41Rimfire_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RF_ShotDeringer</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>5</AmmoGenPerMagOverride>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_41Rimfire</ammoSet>
-					</AmmoUser>
-					<FireModes>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_Deringer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.102</armorPenetration>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetration>0.102</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetration>0.075</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== Taurus Judge ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_Taurus</defName>
-					<statBases>
-						<Mass>0.82</Mass>
-						<RangedWeapon_Cooldown>0.41</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.19</ShotSpread>
-						<SwayFactor>0.91</SwayFactor>
-						<Bulk>2.9</Bulk>
-						<WorkToMake>4500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>3.55</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45Colt_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RF_ShotTaurus</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.25</reloadTime>
-						<ammoSet>AmmoSet_45Colt</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_Taurus"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.6</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.102</armorPenetration>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetration>0.102</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetration>0.075</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== S&W Model 500 ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_ModelFivehundred</defName>
-					<statBases>
-						<Mass>2.25</Mass>
-						<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.92</SwayFactor>
-						<Bulk>3.5</Bulk>
-						<WorkToMake>5500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<Chemfuel>30</Chemfuel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>3.76</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_500SWMagnum_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RF_ShotModelFivehundred</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_500SWMagnum</ammoSet>
-					</AmmoUser>
-					<FireModes>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_ModelFivehundred"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.6</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.102</armorPenetration>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetration>0.102</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetration>0.075</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== Ruger Mk III Standard  ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_RugerMkIII</defName>
-					<statBases>
-						<Mass>0.99</Mass>
-						<RangedWeapon_Cooldown>0.47</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.09</SwayFactor>
-						<Bulk>2.29</Bulk>
-						<WorkToMake>7000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>4.93</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_22LR_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RF_ShotRugerMkIII</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_22LR</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_RugerMkIII"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.102</armorPenetration>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetration>0.102</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetration>0.075</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== Sphinx AT 2000 ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_AT2K</defName>
-					<statBases>
-						<Mass>1.0</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.01</SwayFactor>
-						<Bulk>2.04</Bulk>
-						<WorkToMake>8000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>20</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.39</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RF_ShotAT2K</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_AT2K"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.102</armorPenetration>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetration>0.102</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetration>0.075</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== Vektor CP-1 ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_VektorCP</defName>
-					<statBases>
-						<Mass>0.72</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>0.83</SwayFactor>
-						<Bulk>1.77</Bulk>
-						<WorkToMake>7500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>20</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.60</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RF_ShotVektorCP1</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_VektorCP"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.102</armorPenetration>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetration>0.102</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetration>0.075</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== Para-Ordnance P14-45 ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_ParaOrdnancePFourteenFortyfive</defName>
-					<statBases>
-						<Bulk>2.16</Bulk>
-						<Mass>1.1</Mass>
-						<SwayFactor>1.09</SwayFactor>
-						<ShotSpread>0.17</ShotSpread>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.89</RangedWeapon_Cooldown>
-						<WorkToMake>6000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>20</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.88</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RF_ShotParaOrdnanceP1445</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>14</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_ParaOrdnancePFourteenFortyfive"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.102</armorPenetration>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetration>0.102</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetration>0.075</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== Tokarev TT  ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_TokarevTT</defName>
-					<statBases>
-						<Bulk>1.94</Bulk>
-						<Mass>0.85</Mass>
-						<SwayFactor>0.93</SwayFactor>
-						<ShotSpread>0.17</ShotSpread>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<WorkToMake>10000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>25</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RF_ShotTokarevTT</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
-					</AmmoUser>
-					<FireModes>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_TokarevTT"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.102</armorPenetration>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetration>0.102</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetration>0.075</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- M A C H I N E P I S T O L S -->
-				<!-- ========== Tec-9  ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_Tecnine</defName>
-					<statBases>
-						<Bulk>2.8</Bulk>
-						<Mass>1.3</Mass>
-						<SwayFactor>1.37</SwayFactor>
-						<ShotSpread>0.18</ShotSpread>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<WorkToMake>8000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>25</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.13</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RF_ShotTec9</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_Tecnine"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>magazine</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.102</armorPenetration>
-								<linkedBodyPartsGroup>Magazine</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetration>0.102</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetration>0.075</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== 93R machinepistol  ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_93R</defName>
-					<statBases>
-						<Bulk>2.4</Bulk>
-						<Mass>1.17</Mass>
-						<SwayFactor>1.19</SwayFactor>
-						<ShotSpread>0.17</ShotSpread>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<WorkToMake>12000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.30</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>RF_ShotTec9</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_93R"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.102</armorPenetration>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>folding foregrip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.102</armorPenetration>
-								<linkedBodyPartsGroup>Magazine</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetration>0.102</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetration>0.075</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== Steyr TMP  ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_TMP</defName>
-					<statBases>
-						<Bulk>2.82</Bulk>
-						<Mass>1.3</Mass>
-						<SwayFactor>0.41</SwayFactor>
-						<ShotSpread>0.17</ShotSpread>
-						<SightsEfficiency>1.5</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<WorkToMake>27000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>25</Chemfuel>
-						<Steel>25</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.22</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RF_ShotTMP</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_TMP"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.102</armorPenetration>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>frontgrip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.102</armorPenetration>
-								<linkedBodyPartsGroup>Magazine</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetration>0.102</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetration>0.075</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== Skorpion vz 61  ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_Skorpion</defName>
-					<statBases>
-						<Bulk>2.7</Bulk>
-						<Mass>1.3</Mass>
-						<SwayFactor>2.16</SwayFactor>
-						<ShotSpread>0.17</ShotSpread>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<WorkToMake>27000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>25</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.01</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_32ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RF_ShotSkorpion</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_32ACP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_Skorpion"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.102</armorPenetration>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>magazine</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.102</armorPenetration>
-								<linkedBodyPartsGroup>Magazine</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetration>0.102</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetration>0.075</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== H&K MP5K-PDW  ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_MPFiveKPDW</defName>
-					<statBases>
-						<Bulk>3.68</Bulk>
-						<Mass>2.5</Mass>
-						<SwayFactor>0.85</SwayFactor>
-						<ShotSpread>0.16</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<WorkToMake>29000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>30</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.55</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RF_ShotMPFiveKPDW</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_MPFiveKPDW"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.11</armorPenetration>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>magazine</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.11</armorPenetration>
-								<linkedBodyPartsGroup>Magazine</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.118</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.086</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== KRISS Vector  ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_Vector</defName>
-					<statBases>
-						<Bulk>4.1</Bulk>
-						<Mass>2.7</Mass>
-						<SwayFactor>0.89</SwayFactor>
-						<ShotSpread>0.16</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<WorkToMake>28000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>35</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.84</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>14</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>RF_ShotVector</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<researchPrerequisite>GasOperation</researchPrerequisite>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_Vector"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.11</armorPenetration>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>magazine</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.11</armorPenetration>
-								<linkedBodyPartsGroup>Magazine</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.118</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.086</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== M-3 submachinegun  ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_GreaseGun</defName>
-					<statBases>
-						<Bulk>5.79</Bulk>
-						<Mass>3.7</Mass>
-						<SwayFactor>1.13</SwayFactor>
-						<ShotSpread>0.14</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<WorkToMake>27500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>55</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.1</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>18</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<soundCast>RF_ShotGreaseGun</soundCast>
-						<soundCastTail>RF_TailGreaseGun</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_GreaseGun"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.11</armorPenetration>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>magazine</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.11</armorPenetration>
-								<linkedBodyPartsGroup>Magazine</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.118</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.086</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== Hafdasa C-4  ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_CFourHafdasa</defName>
-					<statBases>
-						<Bulk>7.0</Bulk>
-						<Mass>3.2</Mass>
-						<SwayFactor>1.02</SwayFactor>
-						<ShotSpread>0.13</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<WorkToMake>26500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>45</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.36</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RF_ShotCFourHafdasa</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_CFourHafdasa"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.118</armorPenetration>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.125</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.086</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- C A R B I N E S -->
-				<!-- ========== Beretta CX4 Storm  ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_CXfour</defName>
-					<statBases>
-						<Bulk>7.55</Bulk>
-						<Mass>2.58</Mass>
-						<SwayFactor>1.01</SwayFactor>
-						<ShotSpread>0.08</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.86</RangedWeapon_Cooldown>
-						<WorkToMake>15500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.63</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>20</range>
-						<burstShotCount>1</burstShotCount>
-						<ticksBetweenBurstShots>45</ticksBetweenBurstShots>
-						<soundCast>RF_ShotCX4</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_CXfour"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.11</armorPenetration>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.118</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.086</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== Ruger PC-9  ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_PCnine</defName>
-					<statBases>
-						<Bulk>8.6</Bulk>
-						<Mass>3.2</Mass>
-						<SwayFactor>1.18</SwayFactor>
-						<ShotSpread>0.09</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<WorkToMake>20000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.41</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>20</range>
-						<soundCast>RF_ShotRugerPC9</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_PCnine"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.11</armorPenetration>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.118</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.086</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== Ruger 10/22  ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_TenTwentyTwo</defName>
-					<statBases>
-						<Bulk>9.4</Bulk>
-						<Mass>2.3</Mass>
-						<SwayFactor>1.17</SwayFactor>
-						<ShotSpread>0.07</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
-						<WorkToMake>17500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>45</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>3.23</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_22LR_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>20</range>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RF_ShotUSC</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_22LR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_TenTwentyTwo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.11</armorPenetration>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.118</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.086</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== HK USC  ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_USC</defName>
-					<statBases>
-						<Bulk>9.0</Bulk>
-						<Mass>2.72</Mass>
-						<SwayFactor>1.17</SwayFactor>
-						<ShotSpread>0.09</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
-						<WorkToMake>19000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.77</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<burstShotCount>1</burstShotCount>
-						<ticksBetweenBurstShots>45</ticksBetweenBurstShots>
-						<soundCast>RF_ShotUSC</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_USC"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.11</armorPenetration>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.118</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.086</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== Spencer Repeating Rifle  ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_Spencer</defName>
-					<statBases>
-						<Bulk>9.97</Bulk>
-						<Mass>2.63</Mass>
-						<SwayFactor>1.36</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.77</RangedWeapon_Cooldown>
-						<WorkToMake>19000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.98</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_5656Spencer_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>52</range>
-						<burstShotCount>1</burstShotCount>
-						<ticksBetweenBurstShots>212</ticksBetweenBurstShots>
-						<soundCast>RF_ShotUSC</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>5.95</reloadTime>
-						<ammoSet>AmmoSet_5656Spencer</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_Spencer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.11</armorPenetration>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.118</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.086</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- S H O T G U N S -->
-				<!-- ========== Armsel Striker (Cobray Streetsweeper)  ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_Striker</defName>
-					<statBases>
-						<Bulk>6.08</Bulk>
-						<Mass>4.2</Mass>
-						<SwayFactor>1.21</SwayFactor>
-						<ShotSpread>0.16</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<WorkToMake>31000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.69</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
-						<soundCast>RF_ShotStriker</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_Striker"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.11</armorPenetration>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.118</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.086</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== AA-12 autoshotgun  ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_AAtwelve</defName>
-					<statBases>
-						<Bulk>9.66</Bulk>
-						<Mass>5.2</Mass>
-						<SwayFactor>1.49</SwayFactor>
-						<ShotSpread>0.14</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<WorkToMake>30500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>55</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.26</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-						<soundCast>RF_ShotAA12</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4.0</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-					<researchPrerequisite>GasOperation</researchPrerequisite>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_AAtwelve"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.11</armorPenetration>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.118</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.086</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== HK CAWS ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_HKCaws</defName>
-					<statBases>
-						<Bulk>7.62</Bulk>
-						<Mass>3.7</Mass>
-						<SwayFactor>1.13</SwayFactor>
-						<ShotSpread>0.14</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
-						<WorkToMake>29500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>3.2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>25</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>14</ticksBetweenBurstShots>
-						<soundCast>RF_ShotHKCaws</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_HKCaws"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.11</armorPenetration>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.118</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.086</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- M I L I T A R Y R I F L E S -->
-				<!-- ========== Galil ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_Galil</defName>
-					<statBases>
-						<Bulk>7.42</Bulk>
-						<Mass>3.95</Mass>
-						<SwayFactor>1.38</SwayFactor>
-						<ShotSpread>0.08</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<WorkToMake>29000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Chemfuel>5</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.39</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>RF_ShotGalil</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>35</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_Galil"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.11</armorPenetration>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.118</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.086</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== XM-8 ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_XMeight</defName>
-					<statBases>
-						<Bulk>8.38</Bulk>
-						<Mass>3.4</Mass>
-						<SwayFactor>1.18</SwayFactor>
-						<ShotSpread>0.11</ShotSpread>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<WorkToMake>29500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>20</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.46</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RF_ShotXM8</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.0</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<researchPrerequisite>GasOperation</researchPrerequisite>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_XMeight"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.11</armorPenetration>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.118</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.086</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== AK-47 ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_AKFortySeven</defName>
-					<statBases>
-						<Bulk>8.8</Bulk>
-						<Mass>3.47</Mass>
-						<SwayFactor>1.23</SwayFactor>
-						<ShotSpread>0.09</ShotSpread>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<WorkToMake>27000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>45</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.82</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>44</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>RF_ShotAK47</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.0</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_AKFortySeven"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.11</armorPenetration>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.118</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.086</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- S N I P E R R I F L E S -->
-				<!-- ========== Mosin ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_Mosin</defName>
-					<statBases>
-						<Bulk>12.32</Bulk>
-						<Mass>4.0</Mass>
-						<SwayFactor>1.63</SwayFactor>
-						<ShotSpread>0.03</ShotSpread>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						<WorkToMake>12000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>55</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.08</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>RF_ShotMosin</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_Mosin"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.11</armorPenetration>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.118</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.086</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== WA-2000 ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_WA2K</defName>
-					<statBases>
-						<Bulk>9.05</Bulk>
-						<Mass>6.95</Mass>
-						<SwayFactor>1.7</SwayFactor>
-						<ShotSpread>0.04</ShotSpread>
-						<SightsEfficiency>2.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.16</RangedWeapon_Cooldown>
-						<WorkToMake>46500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>60</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.59</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>2.1</warmupTime>
-						<range>68</range>
-						<soundCast>RF_ShotWA2K</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_WA2K"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.11</armorPenetration>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.118</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.086</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== Steyr Scout ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_Scout</defName>
-					<statBases>
-						<Bulk>9.8</Bulk>
-						<Mass>3.0</Mass>
-						<SwayFactor>1.31</SwayFactor>
-						<ShotSpread>0.07</ShotSpread>
-						<SightsEfficiency>1.66</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<WorkToMake>23500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.57</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.37</warmupTime>
-						<range>75</range>
-						<soundCast>RF_ShotScout</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.0</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<researchPrerequisite>GasOperation</researchPrerequisite>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_Scout"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.11</armorPenetration>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.118</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.086</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== Dragunov SVD ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_DragunovSVD</defName>
-					<statBases>
-						<Bulk>12.24</Bulk>
-						<Mass>4.3</Mass>
-						<SwayFactor>1.7</SwayFactor>
-						<ShotSpread>0.04</ShotSpread>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<WorkToMake>21500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>60</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.96</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>75</range>
-						<soundCast>RF_ShotDragunovSVD</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.0</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_DragunovSVD"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.11</armorPenetration>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.118</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.086</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- A N T I M A T E R I E L R I F L E S -->
-				<!-- ========== Armalite AR-50 ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_ARFifty</defName>
-					<statBases>
-						<Bulk>13.53</Bulk>
-						<Mass>15.5</Mass>
-						<SwayFactor>2.23</SwayFactor>
-						<ShotSpread>0.01</ShotSpread>
-						<SightsEfficiency>2.7</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.37</RangedWeapon_Cooldown>
-						<WorkToMake>21500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>60</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.21</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>4.6</warmupTime>
-						<range>153</range>
-						<soundCast>RF_ShotARFifty</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>5</AmmoGenPerMagOverride>
-						<reloadTime>1.6</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_ARFifty"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.118</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.086</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== Micor Defense MD 50 ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_MDFifty</defName>
-					<statBases>
-						<Bulk>10.91</Bulk>
-						<Mass>7.71</Mass>
-						<SwayFactor>1.3</SwayFactor>
-						<ShotSpread>0.05</ShotSpread>
-						<SightsEfficiency>2.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.61</RangedWeapon_Cooldown>
-						<WorkToMake>37000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>65</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilPattern>Mounted</recoilPattern>
-						<recoilAmount>3.31</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>3.6</warmupTime>
-						<range>110</range>
-						<soundCast>RF_ShotMDFifty</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_MDFifty"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.118</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.086</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== Ultima Ratio 'Hecate II' ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_HecateII</defName>
-					<statBases>
-						<Bulk>13.8</Bulk>
-						<Mass>13.8</Mass>
-						<SwayFactor>2.86</SwayFactor>
-						<ShotSpread>0.03</ShotSpread>
-						<SightsEfficiency>2.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.18</RangedWeapon_Cooldown>
-						<WorkToMake>31000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>100</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.45</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>3.6</warmupTime>
-						<range>126</range>
-						<soundCast>RF_ShotHecateII</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_HecateII"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.118</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.086</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== Barrett M82A1  ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_MEightyTwo</defName>
-					<statBases>
-						<Bulk>14.5</Bulk>
-						<Mass>14.0</Mass>
-						<SwayFactor>2.95</SwayFactor>
-						<ShotSpread>0.02</ShotSpread>
-						<SightsEfficiency>2.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<WorkToMake>37000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>100</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.47</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>3.6</warmupTime>
-						<range>126</range>
-						<soundCast>RF_ShotMEightyTwo</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_MEightyTwo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.118</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.086</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- M A C H I N E G U N S -->
-				<!-- ========== M134 machinegun  ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_Mhundredthirtyfour</defName>
-					<statBases>
-						<Bulk>10.02</Bulk>
-						<Mass>39.0</Mass>
-						<SwayFactor>4.7</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<WorkToMake>51000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>180</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>0.69</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>2.1</warmupTime>
-						<range>86</range>
-						<burstShotCount>300</burstShotCount>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<soundCast>RF_ShotM134</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>500</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>150</aimedBurstShotCount>
-					</FireModes>
-					<researchPrerequisite>CE_TurretHeavyWeapons</researchPrerequisite>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_Mhundredthirtyfour"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.118</armorPenetration>
-								<linkedBodyPartsGroup>Barrels</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== Type 73 machine gun ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_Type73LMG</defName>
-					<statBases>
-						<Bulk>13.9</Bulk>
-						<Mass>10.6</Mass>
-						<SwayFactor>1.58</SwayFactor>
-						<ShotSpread>0.05</ShotSpread>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<WorkToMake>32500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>90</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilPattern>Mounted</recoilPattern>
-						<recoilAmount>1.23</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>62</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>RF_ShotType73LMG</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_Type73LMG"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.11</armorPenetration>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.118</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.086</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== Madsen LMG ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_MadsenLMG</defName>
-					<statBases>
-						<Bulk>11.43</Bulk>
-						<Mass>9.07</Mass>
-						<SwayFactor>2.05</SwayFactor>
-						<ShotSpread>0.05</ShotSpread>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<WorkToMake>30500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>75</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.45</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>62</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<soundCast>RF_ShotMadsenLMG</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>40</magazineSize>
-						<reloadTime>4.0</reloadTime>
-						<ammoSet>AmmoSet_303British</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_MadsenLMG"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.11</armorPenetration>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.118</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.086</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== Rheinmetall MG60 ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_MGSixty</defName>
-					<statBases>
-						<Bulk>13.15</Bulk>
-						<Mass>10.50</Mass>
-						<SwayFactor>2.17</SwayFactor>
-						<ShotSpread>0.07</ShotSpread>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<WorkToMake>36500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>85</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.33</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>75</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<soundCast>RF_ShotMGSixty</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_MGSixty"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.11</armorPenetration>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.118</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.086</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- E X P L O S I V E S -->
-				<!-- ========== Milkor MGL ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_MilkorMGL</defName>
-					<statBases>
-						<Bulk>5.65</Bulk>
-						<Mass>5.3</Mass>
-						<SwayFactor>1.31</SwayFactor>
-						<ShotSpread>0.18</ShotSpread>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<WorkToMake>16000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.93</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<forcedMissRadius>1.0</forcedMissRadius>
-						<range>40</range>
-						<minRange>2</minRange>
-						<soundCast>RF_ShotMilkorMGL</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>5.1</reloadTime>
-						<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Launcher</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_MilkorMGL"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.118</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.086</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== RPG-7 ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_RPGSeven</defName>
-					<statBases>
-						<Bulk>7.25</Bulk>
-						<Mass>5.0</Mass>
-						<SwayFactor>1.15</SwayFactor>
-						<ShotSpread>1</ShotSpread>
-						<SightsEfficiency>1.66</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
-						<WorkToMake>16000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>0.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_RPG7Grenade_HEAT</defaultProjectile>
-						<warmupTime>2.17</warmupTime>
-						<forcedMissRadius>2.0</forcedMissRadius>
-						<range>31</range>
-						<minRange>5</minRange>
-						<soundCast>RF_ShotRPG7</soundCast>
-						<muzzleFlashScale>14</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>5.6</reloadTime>
-						<ammoSet>AmmoSet_RPG7Grenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Launcher</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_RPGSeven"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.118</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.086</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== Carl Gustaf launcher ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_CarlGustaf</defName>
-					<statBases>
-						<Bulk>12.0</Bulk>
-						<Mass>8.5</Mass>
-						<SwayFactor>1.98</SwayFactor>
-						<ShotSpread>1</ShotSpread>
-						<SightsEfficiency>1.68</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
-						<WorkToMake>16000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>0.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_84x246mmR_HEAT</defaultProjectile>
-						<warmupTime>2.17</warmupTime>
-						<forcedMissRadius>2.0</forcedMissRadius>
-						<range>40</range>
-						<minRange>5</minRange>
-						<soundCast>RF_ShotCarlGustaf</soundCast>
-						<muzzleFlashScale>15</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>5.6</reloadTime>
-						<ammoSet>AmmoSet_84x246mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Launcher</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_CarlGustaf"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.118</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.086</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimfire/ThingDefs_Misc/RF_Ranged_Neolithic.xml b/Patches/Rimfire/ThingDefs_Misc/RF_Ranged_Neolithic.xml
deleted file mode 100644
index 110b288650..0000000000
--- a/Patches/Rimfire/ThingDefs_Misc/RF_Ranged_Neolithic.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimfire 2.5</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== Atlatl ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Atlatl</defName>
-					<statBases>
-						<Mass>0.8</Mass>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>1</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>0.8</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Pilum_Fired</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>16</range>
-						<soundCast>Interact_BeatFire</soundCast>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>2</reloadTime>
-						<ammoSet>AmmoSet_Javelins</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_Pila</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Atlatl"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetration>0.102</armorPenetration>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.3</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.241</armorPenetration>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimfire/ThingDefs_Misc/RF_Ranged_Spacer.xml b/Patches/Rimfire/ThingDefs_Misc/RF_Ranged_Spacer.xml
deleted file mode 100644
index 46ade05e0d..0000000000
--- a/Patches/Rimfire/ThingDefs_Misc/RF_Ranged_Spacer.xml
+++ /dev/null
@@ -1,299 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimfire 2.5</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== Charge Pistol ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_ChargePistol</defName>
-					<statBases>
-						<Mass>1.2</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.07</SwayFactor>
-						<Bulk>2</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.40</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>2</reloadTime>
-						<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_ChargePistol"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.102</armorPenetration>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetration>0.102</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetration>0.075</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== Charge SMG ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_ChargeSMG</defName>
-					<statBases>
-						<Mass>3.4</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>0.94</SwayFactor>
-						<Bulk>6</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.41</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_Rifle</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_ChargeSMG"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.102</armorPenetration>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetration>0.102</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetration>0.075</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== Charge Shotgun ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_ChargeShotgun</defName>
-					<statBases>
-						<Mass>3.5</Mass>
-						<RangedWeapon_Cooldown>0.96</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.25</SwayFactor>
-						<Bulk>9</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.39</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12GaugeCharged</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_12GaugeCharged</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>AdvancedGun</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_ChargeShotgun"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.11</armorPenetration>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.118</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.086</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ========== Charge Sniper ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RF_Gun_ChargeSniper</defName>
-					<statBases>
-						<Mass>4.0</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.7</SwayFactor>
-						<Bulk>12</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.60</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
-						<warmupTime>2.1</warmupTime>
-						<range>62</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>2</reloadTime>
-						<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>AdvancedGun</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RF_Gun_ChargeSniper"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetration>0.11</armorPenetration>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.118</armorPenetration>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetration>0.086</armorPenetration>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Armor.xml b/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Armor.xml
deleted file mode 100644
index 3e03e3483a..0000000000
--- a/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Armor.xml	
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Rimmu-Nation - Clothing</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== 6B23-1 body armor ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_6B23Vest"]/statBases</xpath>
-					<value>
-						<Bulk>9</Bulk>
-						<WornBulk>6</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_6B23Vest"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>10</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_6B23Vest"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_6B23Vest"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>28</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_6B23Vest"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.36</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!-- ========== 5.11 Tactec body armor ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_511TacTecVest"]/statBases</xpath>
-					<value>
-						<Bulk>7.5</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_511TacTecVest"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>10</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_511TacTecVest"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_511TacTecVest"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>25</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_511TacTecVest"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.36</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!-- ========== Crye CAGE body armor ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_CryeCAGE_Tan"]/statBases</xpath>
-					<value>
-						<Bulk>7.5</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_CryeCAGE_Tan"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>10</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_CryeCAGE_Tan"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_CryeCAGE_Tan"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>25</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_CryeCAGE_Tan"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.36</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!-- ========== AR500 armor (standard, PMC, Warrior variants) ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_AR500Vest" or
-						defName="RNApparel_AR500PMCVest" or
-						defName="RNApparel_AR500WarriorVest"
-						]/statBases </xpath>
-					<value>
-						<Bulk>7.5</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_AR500Vest" or
-						defName="RNApparel_AR500PMCVest" or
-						defName="RNApparel_AR500WarriorVest"
-						]/equippedStatOffsets </xpath>
-					<value>
-						<CarryBulk>10</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_AR500Vest" or
-						defName="RNApparel_AR500PMCVest" or
-						defName="RNApparel_AR500WarriorVest"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_AR500Vest" or
-						defName="RNApparel_AR500PMCVest" or
-						defName="RNApparel_AR500WarriorVest"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>28</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_AR500Vest" or
-						defName="RNApparel_AR500PMCVest" or
-						defName="RNApparel_AR500WarriorVest"
-						]/statBases/ArmorRating_Heat </xpath>
-					<value>
-						<ArmorRating_Heat>0.36</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!-- ========== Hunter Reactive ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_HunterReactiveArmor"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_HunterReactiveArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>15</CarryBulk>
-						<CarryWeight>90</CarryWeight>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_HunterReactiveArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_HunterReactiveArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>40</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_HunterReactiveArmor"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.8</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_HunterReactiveArmor"]/statBases</xpath>
-					<value>
-						<ArmorRating_Electric>0.05</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<!-- ========== Interceptor body armor (M81) ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_IBAM81Vest"]/statBases</xpath>
-					<value>
-						<Bulk>9</Bulk>
-						<WornBulk>6</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_IBAM81Vest"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>10</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_IBAM81Vest"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_IBAM81Vest"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>28</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_IBAM81Vest"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.36</ArmorRating_Heat>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Armor_Headgear.xml b/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Armor_Headgear.xml
deleted file mode 100644
index 920d597870..0000000000
--- a/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Armor_Headgear.xml	
+++ /dev/null
@@ -1,325 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Rimmu-Nation - Clothing</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Chicken hat ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_ChickenHatMGSV"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<!-- ========== FAST helmet black ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_FASTHelmetBlack"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.54</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_FASTHelmetBlack"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>0.20</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== FAST helmet Multicam ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_FASTHelmetMulticam"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.54</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_FASTHelmetMulticam"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>0.20</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== FAST helmet PMC ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_FASTHelmetPMC"]/statBases</xpath>
-					<value>
-						<Bulk>4.5</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.54</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_FASTHelmetPMC"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>0.20</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Hunter Reactive helmet ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_HunterReactiveHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_HunterReactiveHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_HunterReactiveHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>32</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_HunterReactiveHelmet"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>1</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_HunterReactiveHelmet"]/statBases</xpath>
-					<value>
-						<ArmorRating_Electric>0.06</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<!-- ========== K6-3 helmet (closed, open variants) ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_K63Helmet" or
-						defName="RNApparel_K63HelmetOpen"
-						]/statBases </xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-						<ArmorRating_Blunt>22</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.54</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_K63Helmet" or
-						defName="RNApparel_K63HelmetOpen"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>0.30</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Lynx-T helmet (closed, open variants) ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_LynxTHelmet" or
-						defName="RNApparel_LynxTHelmetOpen"
-						]/statBases </xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-						<ArmorRating_Blunt>22</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.54</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_LynxTHelmet" or
-						defName="RNApparel_LynxTHelmetOpen"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>0.30</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== M1 helmet ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_M1Helmet"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>0.375</ArmorRating_Sharp>
-						<ArmorRating_Blunt>0.143</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.386</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_M1Helmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== MASKA-1 helmet ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_MASKA1Helmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-						<ArmorRating_Blunt>22</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.54</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_MASKA1Helmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>0.30</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== PASGT helmet (DCU, M81 variants) ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_PASGTDCUHelmet" or
-						defName="RNApparel_PASGTM81Helmet"
-						]/statBases </xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-						<ArmorRating_Blunt>13</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.54</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_PASGTDCUHelmet" or
-						defName="RNApparel_PASGTM81Helmet"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>0.15</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== PT A-Bravo helmet black ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_PTABravoHelmetBlack"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.54</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_PTABravoHelmetBlack"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>0.20</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== PT A-Bravo helmet Operator ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_PTABravoHelmetOperator"]/statBases</xpath>
-					<value>
-						<Bulk>4.5</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.54</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_PTABravoHelmetOperator"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>0.20</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== MICH helmet (DPM, Tan variants) ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_MICHHelmet_DPM" or
-						defName="RNApparel_MICHHelmet_Tan"
-						]/statBases </xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.54</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_MICHHelmet_DPM" or
-						defName="RNApparel_MICHHelmet_Tan"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>0.20</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Crye Airframe helmet ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_CryeAirframeHelmet_Tan"]/statBases</xpath>
-					<value>
-						<Bulk>4.5</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.54</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_CryeAirframeHelmet_Tan"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>0.20</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Armor_Headgear_Crafting_Rimfeller.xml b/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Armor_Headgear_Crafting_Rimfeller.xml
deleted file mode 100644
index c4dc3af2db..0000000000
--- a/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Armor_Headgear_Crafting_Rimfeller.xml	
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Rimmu-Nation - Clothing</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationFindMod">
-					<mods>
-						<li>Rimefeller</li>
-					</mods>
-
-					<!-- If Rimefeller is also installed, have the PASGT helmets require Synthamide for crafting -->
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[
-									defName="RNApparel_PASGTDCUHelmet" or
-									defName="RNApparel_PASGTM81Helmet"
-									]/costList </xpath>
-								<value>
-									<costList>
-										<Synthamide>10</Synthamide>
-									</costList>
-								</value>
-							</li>
-						</operations>
-					</match>
-
-					<!-- Otherwise, default to Devilstrand -->
-					<nomatch Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[
-									defName="RNApparel_PASGTDCUHelmet" or
-									defName="RNApparel_PASGTM81Helmet"
-									]/costList </xpath>
-								<value>
-									<costList>
-										<DevilstrandCloth>10</DevilstrandCloth>
-									</costList>
-								</value>
-							</li>
-						</operations>
-
-					</nomatch>
-
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Backpacks.xml b/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Backpacks.xml
deleted file mode 100644
index f05ae8f388..0000000000
--- a/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Backpacks.xml	
+++ /dev/null
@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Rimmu-Nation - Clothing</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Backpack civilian ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_Backpack_Civilian"]/statBases</xpath>
-					<value>
-						<Bulk>2.5</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_Backpack_Civilian"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>25</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_Backpack_Civilian"]/apparel
-					</xpath>
-					<value>
-						<apparel>
-							<careIfWornByCorpse>false</careIfWornByCorpse>
-							<bodyPartGroups>
-								<li>Shoulders</li>
-							</bodyPartGroups>
-							<layers>
-								<li>Backpack</li>
-							</layers>
-							<tags>
-								<li>IndustrialAdvanced</li>
-							</tags>
-							<wornGraphicPath>Things/Apparel/Belt/CivilianBackpack</wornGraphicPath>
-						</apparel>
-					</value>
-				</li>
-
-				<!-- ========== Backpack military ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_Backpack_Military"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_Backpack_Military"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>35</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_Backpack_Military"]/apparel
-					</xpath>
-					<value>
-						<apparel>
-							<careIfWornByCorpse>false</careIfWornByCorpse>
-							<bodyPartGroups>
-								<li>Shoulders</li>
-							</bodyPartGroups>
-							<layers>
-								<li>Backpack</li>
-							</layers>
-							<tags>
-								<li>RN_Backpack</li>
-							</tags>
-							<defaultOutfitTags>
-								<li>Soldier</li>
-							</defaultOutfitTags>
-							<wornGraphicPath>Things/Apparel/Belt/MilitaryBackpack</wornGraphicPath>
-						</apparel>
-					</value>
-				</li>
-
-				<!-- ========== Backpack tactical ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_Backpack_Tactical"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_Backpack_Tactical"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>30</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_Backpack_Tactical"]/apparel
-					</xpath>
-					<value>
-						<apparel>
-							<careIfWornByCorpse>false</careIfWornByCorpse>
-							<bodyPartGroups>
-								<li>Shoulders</li>
-							</bodyPartGroups>
-							<layers>
-								<li>Backpack</li>
-							</layers>
-							<tags>
-								<li>IndustrialAdvanced</li>
-							</tags>
-							<defaultOutfitTags>
-								<li>Soldier</li>
-							</defaultOutfitTags>
-							<wornGraphicPath>Things/Apparel/Belt/AssaultBackpack</wornGraphicPath>
-						</apparel>
-					</value>
-				</li>
-
-				<!-- ========== Backpack tactical sling ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_Backpack_Tactical_Sling"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_Backpack_Tactical_Sling"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>15</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_Backpack_Tactical_Sling"]/apparel
-					</xpath>
-					<value>
-						<apparel>
-							<careIfWornByCorpse>false</careIfWornByCorpse>
-							<bodyPartGroups>
-								<li>Shoulders</li>
-							</bodyPartGroups>
-							<layers>
-								<li>Backpack</li>
-							</layers>
-							<tags>
-								<li>IndustrialAdvanced</li>
-							</tags>
-							<defaultOutfitTags>
-								<li>Soldier</li>
-							</defaultOutfitTags>
-							<wornGraphicPath>Things/Apparel/Belt/Tactical_SlingBackpack</wornGraphicPath>
-						</apparel>
-					</value>
-				</li>
-
-				<!-- ========== Backpack pegasus elite ops ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_Backpack_PegasusEliteOps"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_Backpack_PegasusEliteOps"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>30</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_Backpack_PegasusEliteOps"]/apparel
-					</xpath>
-					<value>
-						<apparel>
-							<careIfWornByCorpse>false</careIfWornByCorpse>
-							<bodyPartGroups>
-								<li>Shoulders</li>
-							</bodyPartGroups>
-							<layers>
-								<li>Backpack</li>
-							</layers>
-							<tags>
-								<li>IndustrialAdvanced</li>
-							</tags>
-							<defaultOutfitTags>
-								<li>Soldier</li>
-							</defaultOutfitTags>
-							<wornGraphicPath>Things/Apparel/Belt/EliteOpsBackpack</wornGraphicPath>
-						</apparel>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Belts.xml b/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Belts.xml
deleted file mode 100644
index cac97638f8..0000000000
--- a/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Belts.xml	
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Rimmu-Nation - Clothing</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== MOLLE ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_Harness_MOLLE"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_Harness_MOLLE"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>20</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_Harness_MOLLE"]/apparel
-					</xpath>
-					<value>
-						<apparel>
-							<bodyPartGroups>
-								<li>Shoulders</li>
-							</bodyPartGroups>
-							<layers>
-								<li>Webbing</li>
-							</layers>
-							<tags>
-								<li>IndustrialMilitaryBasic</li>
-							</tags>
-							<defaultOutfitTags>
-								<li>Soldier</li>
-							</defaultOutfitTags>
-							<wornGraphicPath>Things/Apparel/Belt/TacticalHarness</wornGraphicPath>
-						</apparel>
-					</value>
-				</li>
-
-				<!-- ========== ALICE ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_Harness_ALICE"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_Harness_ALICE"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>10</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_Harness_ALICE"]/apparel
-					</xpath>
-					<value>
-						<apparel>
-							<bodyPartGroups>
-								<li>Shoulders</li>
-							</bodyPartGroups>
-							<layers>
-								<li>Webbing</li>
-							</layers>
-							<tags>
-								<li>IndustrialMilitaryBasic</li>
-							</tags>
-							<defaultOutfitTags>
-								<li>Soldier</li>
-							</defaultOutfitTags>
-							<wornGraphicPath>Things/Apparel/Belt/ALICE_Harness</wornGraphicPath>
-						</apparel>
-					</value>
-				</li>
-
-				<!-- ========== Handgun holsters ========== -->
-
-				<!-- Shared with other CP / RH / RN mods - make sure not to apply redundant patches and cause duplicate XML node errors -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="RNApparel_Holsters_Shoulder"]/statBases/Bulk</xpath>
-					<nomatch Class="PatchOperationSequence">
-						<operations>
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="RNApparel_Holsters_Shoulder"]/statBases</xpath>
-								<value>
-									<Bulk>2.5</Bulk>
-									<WornBulk>1</WornBulk>
-								</value>
-							</li>
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="RNApparel_Holsters_Shoulder"]/equippedStatOffsets</xpath>
-								<value>
-									<CarryBulk>2.5</CarryBulk>
-								</value>
-							</li>
-						</operations>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_Holsters_Shoulder"]/apparel
-					</xpath>
-					<value>
-						<apparel>
-							<bodyPartGroups>
-								<li>Shoulders</li>
-							</bodyPartGroups>
-							<layers>
-								<li>Webbing</li>
-							</layers>
-							<tags>
-								<li>IndustrialMilitaryBasic</li>
-							</tags>
-							<defaultOutfitTags>
-								<li>Soldier</li>
-							</defaultOutfitTags>
-							<wornGraphicPath>Things/Apparel/Belt/ShoulderHolster</wornGraphicPath>
-						</apparel>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Headgear.xml b/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Headgear.xml
deleted file mode 100644
index 1c43e7d312..0000000000
--- a/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Headgear.xml	
+++ /dev/null
@@ -1,339 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Rimmu-Nation - Clothing (1.0)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Berets ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Beret" or
-						defName="RNApparel_BeretSOG"
-						]/statBases </xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Beret" or
-						defName="RNApparel_BeretSOG"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<!-- Equivalent to vanilla fabric hats -->
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Baseball Caps ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_PatchCap" or
-						defName="RNApparel_BackwardsCap" or
-						defName="RNApparel_AceCap" or
-						defName="RNApparel_LegendCap" or
-						defName="RNApparel_PunisherCap" or
-						defName="RNApparel_MAGACap" or
-						defName="RNApparel_M81Cap" or
-						defName="RNApparel_MulticamCap" or
-						defName="RNApparel_BrownCap" or
-						defName="RNApparel_NomadCap"
-						]/statBases </xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_PatchCap" or
-						defName="RNApparel_BackwardsCap" or
-						defName="RNApparel_AceCap" or
-						defName="RNApparel_LegendCap" or
-						defName="RNApparel_PunisherCap" or
-						defName="RNApparel_MAGACap" or
-						defName="RNApparel_M81Cap" or
-						defName="RNApparel_MulticamCap" or
-						defName="RNApparel_BrownCap" or
-						defName="RNApparel_NomadCap"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<!-- Equivalent to vanilla fabric hats -->
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Boonie Hats ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_PlainBoonie" or
-						defName="RNApparel_M81Boonie" or
-						defName="RNApparel_MulticamBoonie"
-						]/statBases </xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_PlainBoonie" or
-						defName="RNApparel_M81Boonie" or
-						defName="RNApparel_MulticamBoonie"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<!-- Equivalent to vanilla fabric hats -->
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Bandanas ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_BandanaRed" or
-						defName="RNApparel_BandanaTan"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<!-- Equivalent to vanilla pants, T-shirt and button-down shirt -->
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Balaclavas ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Balaclava" or
-						defName="RNApparel_BalaclavaSkully" or
-						defName="RNApparel_BalaclavaRiley" or
-						defName="RNApparel_BalaclavaKeegan"
-						]/statBases </xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Balaclava" or
-						defName="RNApparel_BalaclavaSkully" or
-						defName="RNApparel_BalaclavaRiley" or
-						defName="RNApparel_BalaclavaKeegan"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<!-- Equivalent to vanilla tuque -->
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Ghillie Suit Hood ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_NewGhillieHood"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<!-- ========== Tuques / Beanies ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Beanie" or
-						defName="RNApparel_M81Tuque" or
-						defName="RNApparel_MulticamTuque"
-						]/statBases </xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Beanie" or
-						defName="RNApparel_M81Tuque" or
-						defName="RNApparel_MulticamTuque"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<!-- Equivalent to vanilla tuque -->
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Beanie Division ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_BeanieDivision"]/statBases</xpath>
-					<value>
-						<Bulk>1.5</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_BeanieDivision"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<!-- Equivalent to vanilla tuque -->
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_BeanieDivision"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RNApparel_BeanieDivision"]</xpath>
-					<value>
-						<li Class="CombatExtended.ApparelHediffExtension">
-							<hediff>WearingGasMask</hediff>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== 4A1 gasmask ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_4A1Gasmask"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_4A1Gasmask"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_4A1Gasmask"]/apparel/layers</xpath>
-					<value>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RNApparel_4A1Gasmask"]</xpath>
-					<value>
-						<li Class="CombatExtended.ApparelHediffExtension">
-							<hediff>WearingGasMask</hediff>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== GP-5 gasmask ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_GP5Gasmask"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_GP5Gasmask"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_GP5Gasmask"]/apparel/layers</xpath>
-					<value>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RNApparel_GP5Gasmask"]</xpath>
-					<value>
-						<li Class="CombatExtended.ApparelHediffExtension">
-							<hediff>WearingGasMask</hediff>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Halfmask (GTA) ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_GTAHalfMask"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_GTAHalfMask"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_GTAHalfMask"]/apparel/layers</xpath>
-					<value>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RNApparel_GTAHalfMask"]</xpath>
-					<value>
-						<li Class="CombatExtended.ApparelHediffExtension">
-							<hediff>WearingGasMask</hediff>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Field Caps ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_MilitaryCap_DCU" or
-						defName="RNApparel_MilitaryCap_M81cam" or
-						defName="RNApparel_MilitaryCap_Multicam"
-						]/statBases </xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_MilitaryCap_DCU" or
-						defName="RNApparel_MilitaryCap_M81cam" or
-						defName="RNApparel_MilitaryCap_Multicam"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<!-- Equivalent to vanilla fabric hats -->
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_OnSkin.xml b/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_OnSkin.xml
deleted file mode 100644
index 7d5da44f3e..0000000000
--- a/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_OnSkin.xml	
+++ /dev/null
@@ -1,277 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Rimmu-Nation - Clothing</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Combat Fleece / Hoodie ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_combats_Fleece" or
-						defName="RNApparel_combats_FleeceBlack"
-						]/statBases </xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>3</WornBulk>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-						<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_combats_Fleece" or
-						defName="RNApparel_combats_FleeceBlack"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<!-- Slightly tougher than vanilla pants, T-shirt and button-down shirt -->
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== GORKA 4 ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_combats_GORKA4C"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>4</WornBulk>
-						<ArmorRating_Sharp>0.075</ArmorRating_Sharp>
-						<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_combats_GORKA4C"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<!-- Slightly tougher than vanilla pants, T-shirt and button-down shirt -->
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Combat Uniforms ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_combats_DCU" or
-						defName="RNApparel_combats_DPM" or
-						defName="RNApparel_combats_M81C" or
-						defName="RNApparel_combats_Multicam"
-						]/statBases </xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>3</WornBulk>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-						<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_combats_DCU" or
-						defName="RNApparel_combats_DPM" or
-						defName="RNApparel_combats_M81C" or
-						defName="RNApparel_combats_Multicam"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<!-- Slightly tougher than vanilla pants, T-shirt and button-down shirt -->
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Combat Uniform C&C Red Alert Tanya ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_Combats_Tanya"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>3</WornBulk>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-						<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_Combats_Tanya"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<!-- Slightly tougher than vanilla pants, T-shirt and button-down shirt -->
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Plaid Collar Shirts with Jeans ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Plaid_Black" or
-						defName="RNApparel_Plaid_Blue" or
-						defName="RNApparel_Plaid_Green" or
-						defName="RNApparel_Plaid_Red" or
-						defName="RNApparel_Plaid_Tan"
-						]/statBases </xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>3</WornBulk>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-						<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Plaid_Black" or
-						defName="RNApparel_Plaid_Blue" or
-						defName="RNApparel_Plaid_Green" or
-						defName="RNApparel_Plaid_Red" or
-						defName="RNApparel_Plaid_Tan"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<!-- Equivalent to vanilla pants, T-shirt and button-down shirt -->
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Tank Tops with Trousers ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel__Tank_ExplorerA" or
-						defName="RNApparel_Tank_ExplorerB" or
-						defName="RNApparel_GymOutfit_Blank" or
-						defName="RNApparel_Tank_Tenlyashka"
-						]/statBases </xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>3</WornBulk>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-						<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel__Tank_ExplorerA" or
-						defName="RNApparel_Tank_ExplorerB" or
-						defName="RNApparel_GymOutfit_Blank" or
-						defName="RNApparel_Tank_Tenlyashka"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<!-- Equivalent to vanilla pants, T-shirt and button-down shirt -->
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Button Shirts with Trousers ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Shirt_PUBGGray" or
-						defName="RNApparel_Shirt_PUBGNavy" or
-						defName="RNApparel_Shirt_Office" or
-						defName="RNApparel_Shirt_OffDuty" or
-						defName="RNApparel_Shirt_Spy" or
-						defName="RNApparel_Shirt_Wick"
-						]/statBases </xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>3</WornBulk>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-						<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Shirt_PUBGGray" or
-						defName="RNApparel_Shirt_PUBGNavy" or
-						defName="RNApparel_Shirt_Office" or
-						defName="RNApparel_Shirt_OffDuty" or
-						defName="RNApparel_Shirt_Spy" or
-						defName="RNApparel_Shirt_Wick"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<!-- Equivalent to vanilla pants, T-shirt and button-down shirt -->
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Light Shirts with Trousers ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Shirt_LiteDDPM" or
-						defName="RNApparel_Shirt_EllieShirt" or
-						defName="RNApparel_Shirt_NomadShirt" or
-						defName="RNApparel_Polo_WPSRed" or
-						defName="RNApparel_Shirt_ButSarge"
-						]/statBases </xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>3</WornBulk>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-						<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Shirt_LiteDDPM" or
-						defName="RNApparel_Shirt_EllieShirt" or
-						defName="RNApparel_Shirt_NomadShirt" or
-						defName="RNApparel_Polo_WPSRed" or
-						defName="RNApparel_Shirt_ButSarge"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<!-- Equivalent to vanilla pants, T-shirt and button-down shirt -->
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Causals Division ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_Hoodie_Ryan"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>3</WornBulk>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-						<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_Hoodie_Ryan"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<!-- Equivalent to vanilla pants, T-shirt and button-down shirt -->
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Ada Wong outfit (Resident Evil) ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_Shirt_AdaREmake"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>3</WornBulk>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-						<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNApparel_Shirt_AdaREmake"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<!-- Equivalent to vanilla pants, T-shirt and button-down shirt -->
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Shell.xml b/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Shell.xml
deleted file mode 100644
index d9d4a7f0f4..0000000000
--- a/Patches/Rimmu-Nation - Clothing/RNC_CE_Patch_Apparel_Shell.xml	
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Rimmu-Nation - Clothing (1.0)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Smocks / Parkas ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Parka" or
-						defName="RNApparel_Parka_M65Blank"
-						]/statBases </xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Parka" or
-						defName="RNApparel_Parka_M65Blank"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Ghillie suit ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNApparel_GhillieSuit"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>7.5</WornBulk>
-					</value>
-				</li>
-
-				<!-- ========== Trench Coats ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_TrenchCoat_Brown" or
-						defName="RNApparel_TrenchCoat_Gray" or
-						defName="RNApparel_TrenchCoat_PUBG"
-						]/statBases </xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<WornBulk>7</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_TrenchCoat_Brown" or
-						defName="RNApparel_TrenchCoat_Gray" or
-						defName="RNApparel_TrenchCoat_PUBG"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Suit Jackets ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Blazer_Black" or
-						defName="RNApparel_Blazer_Blue"
-						]/statBases </xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Blazer_Black" or
-						defName="RNApparel_Blazer_Blue"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Tracksuit Jackets ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Tracksuit_Blue" or
-						defName="RNApparel_Tracksuit_Red"
-						]/statBases </xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Tracksuit_Blue" or
-						defName="RNApparel_Tracksuit_Red"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Leather Jackets ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Jacket_Bomber" or
-						defName="RNApparel_Jacket_Division" or
-						defName="RNApparel_Jacket_LeatherBlank"
-						]/statBases </xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_Jacket_Bomber" or
-						defName="RNApparel_Jacket_Division" or
-						defName="RNApparel_Jacket_LeatherBlank"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Combat Jackets ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_CombatJacket_Urban" or
-						defName="RNApparel_CombatJacket_Olive" or
-						defName="RNApparel_CombatJacket_DCU" or
-						defName="RNApparel_CombatJacket_DPM" or
-						defName="RNApparel_CombatJacket_M81C" or
-						defName="RNApparel_CombatJacket_Multicam"
-						]/statBases </xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_CombatJacket_Urban" or
-						defName="RNApparel_CombatJacket_Olive" or
-						defName="RNApparel_CombatJacket_DCU" or
-						defName="RNApparel_CombatJacket_DPM" or
-						defName="RNApparel_CombatJacket_M81C" or
-						defName="RNApparel_CombatJacket_Multicam"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Tactical Jackets ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_TacticalJacket" or
-						defName="RNApparel_TacticalJacket_M81C" or
-						defName="RNApparel_TacticalJacket_Multicam"
-						]/statBases </xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNApparel_TacticalJacket" or
-						defName="RNApparel_TacticalJacket_M81C" or
-						defName="RNApparel_TacticalJacket_Multicam"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimmu-Nation - Security/Ammo_SSM.xml b/Patches/Rimmu-Nation - Security/Ammo_SSM.xml
deleted file mode 100644
index c98ff99aa9..0000000000
--- a/Patches/Rimmu-Nation - Security/Ammo_SSM.xml	
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Rimmu-Nation - Security</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== SSM Missile ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_130mmType63_SSM</defName>
-							<label>130mm Type 63 Rockets</label>
-							<ammoTypes>
-								<Ammo_130mmType63_HE>Bullet_130mmType63_SSM</Ammo_130mmType63_HE>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="Base130mmType63">
-							<defName>Bullet_130mmType63_SSM</defName>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<label>130mm Type 63 Rocket (HE)</label>
-
-							<graphicData>
-								<texPath>Things/Projectile/Rocket/130mmType63</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>254</damageAmountBase>
-								<explosionRadius>3.5</explosionRadius>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<speed>0</speed>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Large>80</Fragment_Large>
-										<Fragment_Small>100</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimmu-Nation - Security/ThingDefs_Security.xml b/Patches/Rimmu-Nation - Security/ThingDefs_Security.xml
deleted file mode 100644
index 7ae6b67bbe..0000000000
--- a/Patches/Rimmu-Nation - Security/ThingDefs_Security.xml	
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Rimmu-Nation - Security</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- C4 -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "RNTrap_C4Charge"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>2</Steel>
-							<ComponentIndustrial>2</ComponentIndustrial>
-							<FSX>12</FSX>
-						</costList>
-					</value>
-				</li>
-
-				<!-- Claymore -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName = "RNTrap_Claymore"]</xpath>
-				</li>
-				<!--
-		<li Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName = "RNTrap_Claymore"]/costList</xpath>
-		<value>
-		<costList>
-		<Steel>10</Steel>
-		<ComponentIndustrial>3</ComponentIndustrial>
-		<FSX>8</FSX>
-		</costList>
-		</value>
-		</li>
-
-		<li Class="PatchOperationAdd">
-		<xpath>Defs</xpath>
-		<value>
-			<ThingDef ParentName="BaseBulletCE">
-				<defName>Fragment_Claymore</defName>
-				<label>claymore shrapnel</label>
-				<thingClass>ChickenExplosives.Projectile_NotBullet</thingClass>
-				<graphicData>
-					<texPath>Things/Projectile/Bullet_Small</texPath>
-					<graphicClass>Graphic_Single</graphicClass>
-				</graphicData>					
-				<projectile Class="CombatExtended.ProjectilePropertiesCE">
-					<damageAmountBase>11</damageAmountBase>
-					<armorPenetrationSharp>4</armorPenetrationSharp>
-					<armorPenetrationBlunt>9.66</armorPenetrationBlunt>
-					<damageDef>Bullet</damageDef>
-					<speed>72</speed>						
-				</projectile>
-			</ThingDef>
-		</value>
-		</li>
-
-		<li Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName = "RNTrap_Claymore"]/comps/li[@Class="ChickenExplosives.CompProperties_ProjectileSprayer"]/projectileDef</xpath>
-		<value>
-			<projectileDef>Fragment_Claymore</projectileDef>
-		</value>
-		</li>
--->
-				<!-- AT Mine -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "RNTrap_ATMine"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>20</Steel>
-							<ComponentIndustrial>1</ComponentIndustrial>
-							<FSX>8</FSX>
-						</costList>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimmu-Nation - Security/ThingDefs_Turrets.xml b/Patches/Rimmu-Nation - Security/ThingDefs_Turrets.xml
deleted file mode 100644
index 9acc5e3ad6..0000000000
--- a/Patches/Rimmu-Nation - Security/ThingDefs_Turrets.xml	
+++ /dev/null
@@ -1,373 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Rimmu-Nation - Security</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName = "RNTurret_SentryGun" or
-						defName = "RNTurret_SentrySMG" or
-						defName = "RNTurret_SentrySniper" or
-						defName = "RNTurret_SentryNLAR"
-						]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "RNTurret_SentryGun" or
-						defName = "RNTurret_SentrySMG" or
-						defName = "RNTurret_SentrySniper" or
-						defName = "RNTurret_SSMTurret" or
-						defName = "RNTurret_SentryNLAR"
-						]/thingClass </xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "RNTurret_SentryGun" or
-						defName = "RNTurret_SentrySniper" or
-						defName = "RNTurret_SentryNLAR"
-						]/fillPercent </xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName = "RNTurret_SentryGun" or
-						defName = "RNTurret_SentryNLAR"
-						]/statBases </xpath>
-					<value>
-						<AimingAccuracy>0.25</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName = "RNTurret_SentryGun" or
-						defName = "RNTurret_SentrySMG" or
-						defName = "RNTurret_SentrySniper" or
-						defName = "RNTurret_SSMTurret" or
-						defName = "RNTurret_SentryNLAR"
-						]/comps/li[@Class="CompProperties_Explosive"] </xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "RNTurret_SentrySniper"
-						]/statBases/ShootingAccuracyTurret </xpath>
-					<value>
-						<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<!-- ========== Sentry Gun ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "RNTurret_SentryGun"]/comps/li[@Class="CompProperties_Power"]</xpath>
-					<value>
-						<li Class="CompProperties_Power">
-							<compClass>CompPowerTrader</compClass>
-							<basePowerConsumption>1500</basePowerConsumption>
-						</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_SentryGun</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.31</SwayFactor>
-						<Bulk>8.02</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.59</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>2.3</warmupTime>
-						<range>62</range>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<burstShotCount>100</burstShotCount>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>500</magazineSize>
-						<reloadTime>9.2</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== SMG Sentry Gun ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_SentrySMG</defName>
-					<statBases>
-						<Mass>2.60</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>0.77</SwayFactor>
-						<Bulk>10</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.05</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>31</range>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNP90Shot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_FN57x28mm</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!-- ========== Sniper Turret ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "RNTurret_SentrySniper"]/comps/li[@Class="CompProperties_Power"]</xpath>
-					<value>
-						<li Class="CompProperties_Power">
-							<compClass>CompPowerTrader</compClass>
-							<basePowerConsumption>1500</basePowerConsumption>
-						</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_SentrySniper</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>5</RangedWeapon_Cooldown>
-						<SightsEfficiency>2</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<Bulk>11.90</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>4.1</warmupTime>
-						<range>86</range>
-						<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
-						<soundCast>RNShot50Cal</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>18</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== NL Turret ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "RNTurret_SentryNLAR"]/comps/li[@Class="CompProperties_Power"]</xpath>
-					<value>
-						<li Class="CompProperties_Power">
-							<compClass>CompPowerTrader</compClass>
-							<basePowerConsumption>1250</basePowerConsumption>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNTurret_SentryNLAR"]/label</xpath>
-					<value>
-						<label>sentry shotgun turret</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNTurret_SentryNLAR"]/description</xpath>
-					<value>
-						<description>A versatile turret capable of firing a variety of different munitions, including buckshot, EMP slugs, and non-lethal beanbag projectiles, though the bulky shells mean the ammo capacity is somewhat limited. Its dumb AI brain can't be directly controlled, so beware of friendly fire.</description>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNGun_SentryNLAR"]/label</xpath>
-					<value>
-						<label>sentry shotgun</label>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_SentryNLAR</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>0.82</SwayFactor>
-						<Bulk>20.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.76</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Beanbag</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>22</range>
-						<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-						<burstShotCount>5</burstShotCount>
-						<soundCast>GunShotA</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>6</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!-- ========== SSM ========== -->
-
-				<!-- SSM Base -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNTurret_SSM"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNTurret_SSM"]/statBases</xpath>
-					<value>
-						<ShootingAccuracyTurret>0.75</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<!-- SSM Top -->
-
-				<!-- Glitter Tech Fix -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "RNArtillery_SSMTurret"]/statBases</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "RNArtillery_SSMTurret"]</xpath>
-						<value>
-							<statBases>
-								<SightsEfficiency>1</SightsEfficiency>
-							</statBases>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "RNArtillery_SSMTurret"]/statBases</xpath>
-						<value>
-							<SightsEfficiency>1</SightsEfficiency>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "RNArtillery_SSMTurret"]</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_Charges">
-								<chargeSpeeds>
-									<li>30</li>
-									<li>50</li>
-									<li>70</li>
-									<li>90</li>
-								</chargeSpeeds>
-							</li>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>3</magazineSize>
-								<reloadTime>8</reloadTime>
-								<ammoSet>AmmoSet_130mmType63_SSM</ammoSet>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "RNArtillery_SSMTurret"]/weaponTags</xpath>
-					<value>
-						<li>TurretGun</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "RNArtillery_SSMTurret"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-								<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_130mmType63_SSM</defaultProjectile>
-								<warmupTime>11</warmupTime>
-								<minRange>32</minRange>
-								<range>700</range>
-								<burstShotCount>1</burstShotCount>
-								<soundCast>InfernoCannon_Fire</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>16</muzzleFlashScale>
-								<circularError>0.1</circularError>
-								<indirectFirePenalty>0.1</indirectFirePenalty>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_Proj_BallisticKnifeBlade.xml b/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_Proj_BallisticKnifeBlade.xml
deleted file mode 100644
index 77ae82c961..0000000000
--- a/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_Proj_BallisticKnifeBlade.xml	
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Rimmu-Nation - Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ================== Projectile - Ballistic Knife Blade ================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BasePilumProjectile">
-							<defName>Projectile_BallisticKnifeBlade</defName>
-							<label>Ballistic knife blade</label>
-							<graphicData>
-								<texPath>ThirdParty/Rimmu-Nation - Weapons/BallisticKnifeBlade</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Stab</damageDef>
-								<damageAmountBase>4</damageAmountBase>
-								<armorPenetrationBlunt>0.38</armorPenetrationBlunt>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<speed>6</speed>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_BigGuns.xml b/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_BigGuns.xml
deleted file mode 100644
index 86393907b3..0000000000
--- a/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_BigGuns.xml	
+++ /dev/null
@@ -1,871 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Rimmu-Nation - Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== AT4 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNEx_AT4RL</defName>
-					<statBases>
-						<Mass>8.00</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.82</SwayFactor>
-						<Bulk>11.20</Bulk>
-						<WorkToMake>26000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>65</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-						<FSX>6</FSX>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_84mmAT4_HEAT</defaultProjectile>
-						<warmupTime>1.9</warmupTime>
-						<range>40</range>
-						<soundCast>RNShotLauncher</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>15</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<FireModes>
-						<aiUseBurstMode>false</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Carl Gustaf Recoiless Rifle ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNEx_CarlGustafRL</defName>
-					<statBases>
-						<Mass>14.20</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.18</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>2.58</SwayFactor>
-						<Bulk>12.30</Bulk>
-						<WorkToMake>29500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>105</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_84x246mmR_HEAT</defaultProjectile>
-						<warmupTime>2.05</warmupTime>
-						<range>48</range>
-						<soundCast>RNShotLauncher</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>15</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>5.6</reloadTime>
-						<ammoSet>AmmoSet_84x246mmR</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>FALSE</noSnapshot>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== China Lake Grenade Launcher ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNEx_ChinaLakeGL</defName>
-					<statBases>
-						<Mass>3.72</Mass>
-						<RangedWeapon_Cooldown>1.01</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.25</SwayFactor>
-						<Bulk>8.75</Bulk>
-						<WorkToMake>9500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>45</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>44</range>
-						<ticksBetweenBurstShots>120</ticksBetweenBurstShots>
-						<soundCast>RNShot_ChinaLakeGL</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>15</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>3</magazineSize>
-						<reloadTime>2.55</reloadTime>
-						<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Heckler & Koch HK69A1 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNEx_HK69A1GL</defName>
-					<statBases>
-						<Mass>2.60</Mass>
-						<RangedWeapon_Cooldown>0.94</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.94</SwayFactor>
-						<Bulk>4.63</Bulk>
-						<WorkToMake>11500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>44</range>
-						<soundCast>RNShotGL</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>15</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== FGM-148 Javelin ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNEx_JavelinRL</defName>
-					<statBases>
-						<Mass>22.30</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.72</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>3.55</SwayFactor>
-						<Bulk>13.00</Bulk>
-						<WorkToMake>41500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>135</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-						<FSX>17</FSX>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_127mmJavelinMissile</defaultProjectile>
-						<warmupTime>2.5</warmupTime>
-						<range>156</range>
-						<soundCast>RNShotLauncher</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>15</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<!-- RN Weapons version of FGM-148 Javelin is single-use only -->
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== M72 LAW ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNEx_M72LAW</defName>
-					<statBases>
-						<Mass>3.60</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.24</SwayFactor>
-						<Bulk>7.30</Bulk>
-						<WorkToMake>22500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>50</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-						<FSX>3</FSX>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_M72LAW</defaultProjectile>
-						<warmupTime>1.9</warmupTime>
-						<range>31</range>
-						<soundCast>RNShotLauncher</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>15</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== M202 FLASH ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNEx_M202FLASH</defName>
-					<statBases>
-						<Mass>5.22</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.41</SwayFactor>
-						<Bulk>10.86</Bulk>
-						<WorkToMake>27000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>70</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_M74_Incendiary</defaultProjectile>
-						<warmupTime>1.8</warmupTime>
-						<range>31</range>
-						<soundCast>RNShotLauncher</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>15</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>4</magazineSize>
-						<reloadTime>5.6</reloadTime>
-						<ammoSet>AmmoSet_M74</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== M320 Grenade Launcher Module ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNEx_M320GL</defName>
-					<statBases>
-						<Mass>1.27</Mass>
-						<RangedWeapon_Cooldown>0.53</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>0.48</SwayFactor>
-						<Bulk>2.85</Bulk>
-						<WorkToMake>13500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>25</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>44</range>
-						<burstShotCount>1</burstShotCount>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<soundCast>RNShotGL</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>15</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== MATADOR ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNEx_MATADORRL</defName>
-					<statBases>
-						<Mass>8.90</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.89</SwayFactor>
-						<Bulk>11.00</Bulk>
-						<WorkToMake>28500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>70</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-						<FSX>7</FSX>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_90mmMATADOR</defaultProjectile>
-						<warmupTime>1.8</warmupTime>
-						<range>48</range>
-						<soundCast>RNShotLauncher</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>15</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== MBT LAW / NLAW ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNEx_MBTLAWRL</defName>
-					<statBases>
-						<Mass>12.50</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>2.27</SwayFactor>
-						<Bulk>11.16</Bulk>
-						<WorkToMake>30500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>20</Chemfuel>
-						<Steel>75</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-						<FSX>9</FSX>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_150mmMBTLAWMissile</defaultProjectile>
-						<warmupTime>1.8</warmupTime>
-						<range>48</range>
-						<ticksBetweenBurstShots>20</ticksBetweenBurstShots>
-						<soundCast>RNShotLauncher</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>15</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Milkor MGL ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNEx_MilkorMGL</defName>
-					<statBases>
-						<Mass>5.30</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>1.31</SwayFactor>
-						<Bulk>5.65</Bulk>
-						<WorkToMake>19000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>40</range>
-						<soundCast>RNShot_ChinaLakeGL</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>15</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>5.1</reloadTime>
-						<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== RPG-7V2 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNEx_RPG7V2RL</defName>
-					<statBases>
-						<Mass>7.00</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.16</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.68</SwayFactor>
-						<Bulk>10.50</Bulk>
-						<WorkToMake>25500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>70</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_RPG7Grenade_HEAT</defaultProjectile>
-						<warmupTime>2.035</warmupTime>
-						<range>40</range>
-						<soundCast>RNShotRPG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>15</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>5.6</reloadTime>
-						<ammoSet>AmmoSet_RPG7Grenade</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== RPG-28 Klyukva ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNEx_RPG28RL</defName>
-					<statBases>
-						<Mass>13.00</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>2.50</SwayFactor>
-						<Bulk>13.00</Bulk>
-						<WorkToMake>29000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>90</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-						<FSX>10</FSX>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_RPG28Klyukva</defaultProjectile>
-						<warmupTime>1.9</warmupTime>
-						<range>40</range>
-						<soundCast>RNShotRPG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>15</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== RPG-32 Barkas ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNEx_RPG32RL</defName>
-					<statBases>
-						<Mass>3.00</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.12</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.52</SwayFactor>
-						<Bulk>13.00</Bulk>
-						<WorkToMake>26500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>60</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_RPG32Rocket_HEAT</defaultProjectile>
-						<warmupTime>2</warmupTime>
-						<range>44</range>
-						<soundCast>RNShotRPG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>15</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>5.6</reloadTime>
-						<ammoSet>AmmoSet_RPG32Rocket</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== SMAW ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNEx_SMAWRL</defName>
-					<statBases>
-						<Mass>7.54</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.23</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>2.16</SwayFactor>
-						<Bulk>14.71</Bulk>
-						<WorkToMake>31500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>20</Chemfuel>
-						<Steel>70</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_83mmSMAW_HEAT</defaultProjectile>
-						<warmupTime>2.09</warmupTime>
-						<range>48</range>
-						<soundCast>RNShotLauncher</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>15</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>5.6</reloadTime>
-						<ammoSet>AmmoSet_83mmSMAW</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== XM25 CDTE ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNEx_XM25GL</defName>
-					<statBases>
-						<Mass>6.35</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.42</SwayFactor>
-						<Bulk>7.49</Bulk>
-						<WorkToMake>31000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_25x40mmGrenade_HE</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>48</range>
-						<soundCast>RNShotXM25</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>15</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_25x40mmGrenade</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNEx_ChinaLakeGL" or
-						defName="RNEx_HK69A1GL" or
-						defName="RNEx_M320GL" or
-						defName="RNEx_MilkorMGL" or
-						defName="RNEx_XM25GL"
-						]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNEx_AT4RL" or
-						defName="RNEx_CarlGustafRL" or
-						defName="RNEx_JavelinRL" or
-						defName="RNEx_M72LAW" or
-						defName="RNEx_M202FLASH" or
-						defName="RNEx_MATADORRL" or
-						defName="RNEx_MBTLAWRL" or
-						defName="RNEx_RPG7V2RL" or
-						defName="RNEx_RPG28RL" or
-						defName="RNEx_RPG32RL" or
-						defName="RNEx_SMAWRL"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_Grenades.xml b/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_Grenades.xml
deleted file mode 100644
index 1fa27befc4..0000000000
--- a/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_Grenades.xml	
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Rimmu-Nation - Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Remove Grenades and their projectiles ========== -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RNThrown_HeNade"]</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RNProj_HEGrenade"]</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RNThrown_Vodka"]</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RNProj_Molotov"]</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RNThrown_Flashbang"]</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RNProj_Flash"]</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RNThrown_Incendiary"]</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RNProj_Incendiary"]</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RNThrown_Smoke"]</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RNProj_Smoke"]</xpath>
-				</li>
-
-				<!-- ========== Patch C4 ========== -->
-
-				<!-- Projectile def -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNProj_C4CSGO"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNProj_C4CSGO"]/graphicData/texPath</xpath>
-					<value>
-						<texPath>Things/Projectile/Proj_CSGOC4</texPath>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNProj_C4CSGO"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>4</explosionRadius>
-							<damageDef>Bomb</damageDef>
-							<damageAmountBase>328</damageAmountBase>
-							<explosionDelay>500</explosionDelay>
-							<dropsCasings>true</dropsCasings>
-							<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-							<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							<speed>6</speed>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="RNProj_C4CSGO"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="RNProj_C4CSGO"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNProj_C4CSGO"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>345</Fragment_Small>
-							</fragments>
-						</li>
-					</value>
-				</li>
-
-				<!-- Weapon def -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RNThrown_C4CSGO"]</xpath>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<stackLimit>25</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-						<drawGUIOverlay>true</drawGUIOverlay>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="RNThrown_C4CSGO"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="RNThrown_C4CSGO"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="RNThrown_C4CSGO"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<!-- Unthrown C4 does not have CombatExtended.CompProperties_ExplosiveCE, as C4 does not explode if dropped, shot at or set on fire -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNThrown_C4CSGO</defName>
-					<statBases>
-						<Mass>2.92</Mass>
-						<Bulk>6.8</Bulk>
-						<MarketValue>184.2</MarketValue>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<WorkToMake>6000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>8</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-						<FSX>7</FSX>
-					</costList>
-					<Properties>
-						<label>arm and throw C4</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<range>3</range>
-						<warmupTime>2.5</warmupTime>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<soundCast>CSGOC4Shot</soundCast>
-						<soundAiming>CSGOC4_Aiming</soundAiming>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<defaultProjectile>RNProj_C4CSGO</defaultProjectile>
-						<onlyManualCast>true</onlyManualCast>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<weaponTags>
-						<li>RN_CSGOC4</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_HRT_Pack.xml b/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_HRT_Pack.xml
deleted file mode 100644
index 3e4ae23bbc..0000000000
--- a/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_HRT_Pack.xml	
+++ /dev/null
@@ -1,500 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Rimmu-Nation - Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Heckler & Koch G36C - Hostage Rescue Team variant ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_G36CHRT</defName>
-					<statBases>
-						<Mass>2.82</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.18</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.03</SwayFactor>
-						<Bulk>5.00</Bulk>
-						<WorkToMake>34000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>30</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.43</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>0.9</warmupTime>
-						<range>31</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShotG36C</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Glock 17 - Hostage Rescue Team variant ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Glock17_HRT</defName>
-					<statBases>
-						<Mass>0.66</Mass>
-						<RangedWeapon_Cooldown>0.40</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.84</SwayFactor>
-						<Bulk>1.86</Bulk>
-						<WorkToMake>7500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>20</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShotGlock17</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>17</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Heckler & Koch HK417 - Hostage Rescue Team variant ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_HK417HRTDMR</defName>
-					<statBases>
-						<Mass>4.23</Mass>
-						<RangedWeapon_Cooldown>0.57</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.36</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.10</SwayFactor>
-						<Bulk>11.05</Bulk>
-						<WorkToMake>30000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>60</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>75</range>
-						<soundCast>RNShot_GenericDMR</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== M4A1 - Hostage Rescue Team variant ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M4A1HRT</defName>
-					<statBases>
-						<Mass>2.90</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.1</ShotSpread>
-						<SwayFactor>1.17</SwayFactor>
-						<Bulk>7.56</Bulk>
-						<WorkToMake>35500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.58</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR_II</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== M9A1 - Hostage Rescue Team variant ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M9A1_HRT</defName>
-					<statBases>
-						<Mass>1.01</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.06</SwayFactor>
-						<Bulk>2.17</Bulk>
-						<WorkToMake>7000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNPistolShot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== M24A2 - Hostage Rescue Team variant ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M24A2HRTSn</defName>
-					<statBases>
-						<Mass>7.10</Mass>
-						<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.60</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>11.92</Bulk>
-						<WorkToMake>30500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>65</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.8</warmupTime>
-						<range>75</range>
-						<soundCast>RNShot_GenericBoltSniper</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== MP5A2 SD - Hostage Rescue Team variant ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_MP5A2SDHRT_PDW</defName>
-					<statBases>
-						<Mass>2.50</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>0.93</SwayFactor>
-						<Bulk>6.80</Bulk>
-						<WorkToMake>29000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.60</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>31</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShotSMG2SD</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Remington 870 - Hostage Rescue Team variant ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Remington870HRT</defName>
-					<statBases>
-						<Mass>2.72</Mass>
-						<RangedWeapon_Cooldown>1.02</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.12</SwayFactor>
-						<Bulk>7.67</Bulk>
-						<WorkToMake>14500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RN870Shot</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>5.1</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== UMP 45 - Hostage Rescue Team variant ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_UMP45HRT_PDW</defName>
-					<statBases>
-						<Mass>2.54</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>0.94</SwayFactor>
-						<Bulk>4.50</Bulk>
-						<WorkToMake>30500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>30</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.84</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>15</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNUMP45Shot</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNGun_Glock17_HRT" or
-						defName="RNGun_M9A1_HRT"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNGun_G36CHRT" or
-						defName="RNGun_HK417HRTDMR" or
-						defName="RNGun_M4A1HRT" or
-						defName="RNGun_M24A2HRTSn" or
-						defName="RNGun_MP5A2SDHRT_PDW" or
-						defName="RNGun_Remington870HRT" or
-						defName="RNGun_UMP45HRT_PDW"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_LMG.xml b/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_LMG.xml
deleted file mode 100644
index 3709e7af76..0000000000
--- a/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_LMG.xml	
+++ /dev/null
@@ -1,787 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Rimmu-Nation - Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== DP-27 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_DP27LMG</defName>
-					<statBases>
-						<Mass>9.12</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.53</SwayFactor>
-						<Bulk>14.70</Bulk>
-						<WorkToMake>32000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>85</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.32</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<soundCast>RNShotDP28LMG</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>47</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_MachineGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== FN Minimi ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_FNMinimi</defName>
-					<statBases>
-						<Mass>8.00</Mass>
-						<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.1</ShotSpread>
-						<SwayFactor>1.25</SwayFactor>
-						<Bulk>11.63</Bulk>
-						<WorkToMake>45000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>65</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>0.91</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>75</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShotL86LMG</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>200</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== FN Minimi C9A1 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_C9A1Minimi</defName>
-					<statBases>
-						<Mass>7.12</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.20</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.25</SwayFactor>
-						<Bulk>13.40</Bulk>
-						<WorkToMake>40500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>80</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>0.97</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.47</warmupTime>
-						<range>75</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShotL86LMG</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>200</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== FN MAG ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_FNMAG</defName>
-					<statBases>
-						<Mass>11.80</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.71</SwayFactor>
-						<Bulk>15.63</Bulk>
-						<WorkToMake>41000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>100</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.21</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>RNShotM240B</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== HK MG4 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_HKMG4LMG</defName>
-					<statBases>
-						<Mass>8.15</Mass>
-						<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.18</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.31</SwayFactor>
-						<Bulk>11.30</Bulk>
-						<WorkToMake>44500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>65</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>0.90</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.45</warmupTime>
-						<range>75</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShotL86LMG</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>200</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== HK MG5 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_HKMG5LMG</defName>
-					<statBases>
-						<Mass>11.20</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.62</SwayFactor>
-						<Bulk>12.60</Bulk>
-						<WorkToMake>47000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>80</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.24</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>RNShotM240B</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>120</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== IMI Negev ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_NegevLMG</defName>
-					<statBases>
-						<Mass>7.60</Mass>
-						<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.25</SwayFactor>
-						<Bulk>11.10</Bulk>
-						<WorkToMake>39500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>75</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>0.93</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShotL86LMG</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>150</magazineSize>
-						<reloadTime>7.80</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== M60 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M60LMG</defName>
-					<statBases>
-						<Mass>10.50</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.51</SwayFactor>
-						<Bulk>14.05</Bulk>
-						<WorkToMake>40500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>85</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.30</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>RNShotM60LMG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_MachineGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== M240B ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M240B</defName>
-					<statBases>
-						<Mass>12.50</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.20</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.78</SwayFactor>
-						<Bulk>15.63</Bulk>
-						<WorkToMake>46000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>20</Chemfuel>
-						<Steel>90</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.18</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.47</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>RNShotM240B</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== M249 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M249LMG</defName>
-					<statBases>
-						<Mass>7.50</Mass>
-						<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.21</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>13.35</Bulk>
-						<WorkToMake>42500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>70</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>0.94</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.475</warmupTime>
-						<range>75</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>RNShotL86LMG</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>200</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Mk 48 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_MK48LMG</defName>
-					<statBases>
-						<Mass>8.20</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>13.00</Bulk>
-						<WorkToMake>40500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>70</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.48</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>RNShotM240B</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.80</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== PKM ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_PKMLMG</defName>
-					<statBases>
-						<Mass>7.50</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.36</SwayFactor>
-						<Bulk>14.92</Bulk>
-						<WorkToMake>36000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>80</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.45</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<soundCast>RNShotM240B</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_MachineGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== RPD ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_RPD</defName>
-					<statBases>
-						<Mass>7.40</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.24</SwayFactor>
-						<Bulk>13.37</Bulk>
-						<WorkToMake>35000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>70</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.22</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>62</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShotRPD</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_MachineGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== RPK-74 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_RPK74LMG</defName>
-					<statBases>
-						<Mass>4.80</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.06</SwayFactor>
-						<Bulk>12.40</Bulk>
-						<WorkToMake>29500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>65</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.54</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>RNShotRPK</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>75</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_MachineGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Zastava M84 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_ZastavaM84LMG</defName>
-					<statBases>
-						<Mass>8.80</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.44</SwayFactor>
-						<Bulk>14.75</Bulk>
-						<WorkToMake>36500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>85</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.33</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<soundCast>RNShotM240B</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_MachineGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNGun_DP27LMG" or
-						defName="RNGun_FNMinimi" or
-						defName="RNGun_C9A1Minimi" or
-						defName="RNGun_FNMAG" or
-						defName="RNGun_HKMG4LMG" or
-						defName="RNGun_HKMG5LMG" or
-						defName="RNGun_NegevLMG" or
-						defName="RNGun_M60LMG" or
-						defName="RNGun_M240B" or
-						defName="RNGun_M249LMG" or
-						defName="RNGun_MK48LMG" or
-						defName="RNGun_PKMLMG" or
-						defName="RNGun_RPD" or
-						defName="RNGun_RPK74LMG" or
-						defName="RNGun_ZastavaM84LMG"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_M_BoltAction.xml b/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_M_BoltAction.xml
deleted file mode 100644
index 3aa2aa8d53..0000000000
--- a/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_M_BoltAction.xml	
+++ /dev/null
@@ -1,1262 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Rimmu-Nation - Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Accuracy International AW50 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_AW50Sn</defName>
-					<statBases>
-						<Mass>13.50</Mass>
-						<RangedWeapon_Cooldown>1.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.72</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>2.02</SwayFactor>
-						<Bulk>15.20</Bulk>
-						<WorkToMake>36500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>20</Chemfuel>
-						<Steel>95</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>3.4</warmupTime>
-						<range>112</range>
-						<soundCast>RNShot_AWP</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== C14 Timberwolf ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_C14TimberwolfSn</defName>
-					<statBases>
-						<Mass>7.10</Mass>
-						<RangedWeapon_Cooldown>1.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.96</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.42</SwayFactor>
-						<Bulk>13.00</Bulk>
-						<WorkToMake>36000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>70</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
-						<warmupTime>2.1</warmupTime>
-						<range>112</range>
-						<soundCast>RNShot_GenericBoltSniper_II</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_338Lapua</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== C3A1 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_C3A1Sn</defName>
-					<statBases>
-						<Mass>7.20</Mass>
-						<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.60</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.50</SwayFactor>
-						<Bulk>14.21</Bulk>
-						<WorkToMake>23500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>20</WoodLog>
-						<Steel>70</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.8</warmupTime>
-						<range>97</range>
-						<soundCast>RNShot_GenericBoltSniper_II</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>10</AmmoGenPerMagOverride>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== CDX-33 Patriot Lite ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_CDX33PatriotLiteSn</defName>
-					<statBases>
-						<Mass>6.58</Mass>
-						<RangedWeapon_Cooldown>1.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>3.50</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.42</SwayFactor>
-						<Bulk>11.32</Bulk>
-						<WorkToMake>39500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>75</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
-						<warmupTime>2.55</warmupTime>
-						<range>117</range>
-						<soundCast>RNShot_GenericBoltSniper_II</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_338Lapua</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== CS-LR4 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_CSLR4Sn</defName>
-					<statBases>
-						<Mass>6.50</Mass>
-						<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>3.92</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.31</SwayFactor>
-						<Bulk>12.00</Bulk>
-						<WorkToMake>43000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>65</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>2.9</warmupTime>
-						<range>62</range>
-						<soundCast>RNShot_CSLR4Sn</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Desert Tech HTI ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_DesertTechHTISn</defName>
-					<statBases>
-						<Mass>9.09</Mass>
-						<RangedWeapon_Cooldown>1.40</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.72</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1.53</SwayFactor>
-						<Bulk>12.52</Bulk>
-						<WorkToMake>40000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>80</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>3.4</warmupTime>
-						<range>126</range>
-						<soundCast>RNShot_SRSSD</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Desert Tech SRS ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_DesertTechSRS</defName>
-					<statBases>
-						<Mass>5.6</Mass>
-						<RangedWeapon_Cooldown>1.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>3.50</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.14</SwayFactor>
-						<Bulk>10.52</Bulk>
-						<WorkToMake>47000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>60</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
-						<warmupTime>2.55</warmupTime>
-						<range>119</range>
-						<soundCast>RNShot_SRSSD</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_338Lapua</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== FN Ballista ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_FNBallista</defName>
-					<statBases>
-						<Mass>7.54</Mass>
-						<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>3.92</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.51</SwayFactor>
-						<Bulk>10.91</Bulk>
-						<WorkToMake>44500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>75</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>2.9</warmupTime>
-						<range>112</range>
-						<soundCast>RNShotBallista</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== GOL Magnum ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_GOLMagnumSn</defName>
-					<statBases>
-						<Mass>6.00</Mass>
-						<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>3.20</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.37</SwayFactor>
-						<Bulk>13.30</Bulk>
-						<WorkToMake>33500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>65</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>2.3</warmupTime>
-						<range>112</range>
-						<soundCast>RNShotGOL</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Haenel RS9 / G29 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_HaenelRS9Sn</defName>
-					<statBases>
-						<Mass>8.00</Mass>
-						<RangedWeapon_Cooldown>1.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>3.50</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.54</SwayFactor>
-						<Bulk>11.20</Bulk>
-						<WorkToMake>40000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>80</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
-						<warmupTime>2.55</warmupTime>
-						<range>112</range>
-						<soundCast>RNShot_G29Sn</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_338Lapua</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== CheyTac Intervention ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_InterventionSn</defName>
-					<statBases>
-						<Mass>15.20</Mass>
-						<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>3.32</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>2.06</SwayFactor>
-						<Bulk>12.87</Bulk>
-						<WorkToMake>42500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>110</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_408CheyenneTactical_FMJ</defaultProjectile>
-						<warmupTime>2.4</warmupTime>
-						<range>156</range>
-						<soundCast>RNShotIntervention</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_408CheyenneTactical</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Kar98k ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Kar98k</defName>
-					<statBases>
-						<Mass>4.10</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.56</SwayFactor>
-						<Bulk>11.10</Bulk>
-						<WorkToMake>15000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>86</range>
-						<soundCast>RNShot_BoltActionOldie</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== L115A3 SD / Accuracy International AWM ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_L115A3Sn</defName>
-					<statBases>
-						<Mass>7.18</Mass>
-						<RangedWeapon_Cooldown>1.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>3.50</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.61</SwayFactor>
-						<Bulk>15.60</Bulk>
-						<WorkToMake>42000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>20</Chemfuel>
-						<Steel>70</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
-						<warmupTime>2.55</warmupTime>
-						<range>107</range>
-						<soundCast>RNShot_BoltGenericSD</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_338Lapua</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== L96A1 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_L96A1Sn</defName>
-					<statBases>
-						<Mass>6.50</Mass>
-						<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.36</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>12.80</Bulk>
-						<WorkToMake>26500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>65</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>75</range>
-						<soundCast>RNShot_L96A1Sn</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Lee Enfield ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_LeeEnfield</defName>
-					<statBases>
-						<Mass>4.19</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.21</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1.71</SwayFactor>
-						<Bulk>12.60</Bulk>
-						<WorkToMake>15500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>55</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
-						<warmupTime>1.275</warmupTime>
-						<range>55</range>
-						<soundCast>RNShot_BoltActionOldie</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_303British</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== M24A2 SD ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M24A2SDSn</defName>
-					<statBases>
-						<Mass>7.82</Mass>
-						<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.60</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.57</SwayFactor>
-						<Bulk>14.59</Bulk>
-						<WorkToMake>32500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>20</Chemfuel>
-						<Steel>70</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.8</warmupTime>
-						<range>75</range>
-						<soundCast>RNShot_BoltGenericSD</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== M24A2 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M24A2Sn</defName>
-					<statBases>
-						<Mass>7.10</Mass>
-						<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.60</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>11.92</Bulk>
-						<WorkToMake>30500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>65</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.8</warmupTime>
-						<range>75</range>
-						<soundCast>RNShot_GenericBoltSniper</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== M40A5 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M40A3Sn</defName>
-					<statBases>
-						<Mass>7.50</Mass>
-						<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.72</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.40</SwayFactor>
-						<Bulk>12.24</Bulk>
-						<WorkToMake>31500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>65</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.9</warmupTime>
-						<range>75</range>
-						<soundCast>RNShotM40Sniper</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Mosin Nagant ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_MosinNagant</defName>
-					<statBases>
-						<Mass>4.00</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.21</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.67</SwayFactor>
-						<Bulk>12.32</Bulk>
-						<WorkToMake>15500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>55</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.275</warmupTime>
-						<range>75</range>
-						<soundCast>RNShot_BoltActionOldie</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Remington 700 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_R700Sn</defName>
-					<statBases>
-						<Mass>4.08</Mass>
-						<RangedWeapon_Cooldown>1.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.72</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.15</SwayFactor>
-						<Bulk>12.08</Bulk>
-						<WorkToMake>26000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>55</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.9</warmupTime>
-						<range>75</range>
-						<soundCast>RNShotM40Sniper</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.25</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Remington MSR ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_RemingtonMSR</defName>
-					<statBases>
-						<Mass>7.70</Mass>
-						<RangedWeapon_Cooldown>1.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>3.50</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.46</SwayFactor>
-						<Bulk>13.00</Bulk>
-						<WorkToMake>37500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>85</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
-						<warmupTime>2.55</warmupTime>
-						<range>112</range>
-						<soundCast>RNShot_MSR</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_338Lapua</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== SNIPEX M75 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_SNIPEXM75Sn</defName>
-					<statBases>
-						<Mass>13.50</Mass>
-						<RangedWeapon_Cooldown>1.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>3.80</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1.88</SwayFactor>
-						<Bulk>13.20</Bulk>
-						<WorkToMake>48000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>105</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_127x108mm_FMJ</defaultProjectile>
-						<warmupTime>4.3</warmupTime>
-						<range>112</range>
-						<soundCast>RNShot_SNIPEX</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>5</AmmoGenPerMagOverride>
-						<reloadTime>1.35</reloadTime>
-						<ammoSet>AmmoSet_127x108mm</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Steyr SSG 08 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_SSG08Sn</defName>
-					<statBases>
-						<Mass>6.50</Mass>
-						<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.72</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.37</SwayFactor>
-						<Bulk>10.60</Bulk>
-						<WorkToMake>31000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>75</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.9</warmupTime>
-						<range>112</range>
-						<soundCast>RNShotM40Sniper</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== SV-98 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_SV98Sn</defName>
-					<statBases>
-						<Mass>6.80</Mass>
-						<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.60</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.39</SwayFactor>
-						<Bulk>13.00</Bulk>
-						<WorkToMake>26500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>65</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.8</warmupTime>
-						<range>86</range>
-						<soundCast>RNShotSV98</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== McMillan TAC-50 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_TAC50Sn</defName>
-					<statBases>
-						<Mass>11.80</Mass>
-						<RangedWeapon_Cooldown>1.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>3.50</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1.92</SwayFactor>
-						<Bulk>15.48</Bulk>
-						<WorkToMake>44500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>20</Chemfuel>
-						<Steel>90</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>4.05</warmupTime>
-						<range>126</range>
-						<soundCast>RNTac50Shot</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Zastava M07 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_ZastavaM07Sn</defName>
-					<statBases>
-						<Mass>5.40</Mass>
-						<RangedWeapon_Cooldown>1.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.72</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.30</SwayFactor>
-						<Bulk>12.91</Bulk>
-						<WorkToMake>27000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>60</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.9</warmupTime>
-						<range>86</range>
-						<soundCast>RNShot_GenericBoltSniper</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNGun_AW50Sn" or
-						defName="RNGun_C14TimberwolfSn" or
-						defName="RNGun_C3A1Sn" or
-						defName="RNGun_CDX33PatriotLiteSn" or
-						defName="RNGun_CSLR4Sn" or
-						defName="RNGun_DesertTechHTISn" or
-						defName="RNGun_DesertTechSRS" or
-						defName="RNGun_FNBallista" or
-						defName="RNGun_GOLMagnumSn" or
-						defName="RNGun_HaenelRS9Sn" or
-						defName="RNGun_InterventionSn" or
-						defName="RNGun_Kar98k" or
-						defName="RNGun_L115A3Sn" or
-						defName="RNGun_L96A1Sn" or
-						defName="RNGun_LeeEnfield" or
-						defName="RNGun_M24A2SDSn" or
-						defName="RNGun_M24A2Sn" or
-						defName="RNGun_M40A3Sn" or
-						defName="RNGun_MosinNagant" or
-						defName="RNGun_R700Sn" or
-						defName="RNGun_RemingtonMSR" or
-						defName="RNGun_SNIPEXM75Sn" or
-						defName="RNGun_SSG08Sn" or
-						defName="RNGun_SV98Sn" or
-						defName="RNGun_TAC50Sn" or
-						defName="RNGun_ZastavaM07Sn"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_M_DMR.xml b/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_M_DMR.xml
deleted file mode 100644
index 7c0eb697d1..0000000000
--- a/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_M_DMR.xml	
+++ /dev/null
@@ -1,1643 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Rimmu-Nation - Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== ArmaLite AR-10 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_AR10DMR</defName>
-					<statBases>
-						<Mass>5.35</Mass>
-						<RangedWeapon_Cooldown>0.57</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.22</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.15</SwayFactor>
-						<Bulk>11.41</Bulk>
-						<WorkToMake>28500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>60</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.48</warmupTime>
-						<range>68</range>
-						<soundCast>RNShot_GenericDMR</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Accuracy International AS50 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_AS50AMR</defName>
-					<statBases>
-						<Mass>14.10</Mass>
-						<RangedWeapon_Cooldown>0.58</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.72</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>2.03</SwayFactor>
-						<Bulk>14.69</Bulk>
-						<WorkToMake>37000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>115</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>3.4</warmupTime>
-						<range>126</range>
-						<soundCast>RNShot50Cal</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Dragunov SVD ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_DragunovDMR</defName>
-					<statBases>
-						<Mass>4.30</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.70</SwayFactor>
-						<Bulk>12.25</Bulk>
-						<WorkToMake>23000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>60</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<soundCast>RNShotDragunov</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Heckler & Koch G28 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_G28DMR</defName>
-					<statBases>
-						<Mass>5.80</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.48</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.22</SwayFactor>
-						<Bulk>10.65</Bulk>
-						<WorkToMake>32500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>60</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.7</warmupTime>
-						<range>62</range>
-						<soundCast>RNShot_GenericDMR</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Heckler & Koch G3SG/1 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_G3SGDMR</defName>
-					<statBases>
-						<Mass>5.50</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.36</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.63</SwayFactor>
-						<Bulk>10.23</Bulk>
-						<WorkToMake>28500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>60</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.4</warmupTime>
-						<range>62</range>
-						<soundCast>RNShot_GenericDMR_III</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Heckler & Koch HK417 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_HK417DMR</defName>
-					<statBases>
-						<Mass>4.23</Mass>
-						<RangedWeapon_Cooldown>0.57</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.36</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.10</SwayFactor>
-						<Bulk>11.05</Bulk>
-						<WorkToMake>30000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>60</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>75</range>
-						<soundCast>RNShot_GenericDMR</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== L129A1 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_L129A1DMR</defName>
-					<statBases>
-						<Mass>4.50</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.36</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.50</SwayFactor>
-						<Bulk>9.00</Bulk>
-						<WorkToMake>29000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>55</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.4</warmupTime>
-						<range>75</range>
-						<soundCast>RNShot_GenericDMR</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Barrett M107 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M107AMR</defName>
-					<statBases>
-						<Mass>14.00</Mass>
-						<RangedWeapon_Cooldown>0.58</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.84</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>2.04</SwayFactor>
-						<Bulk>15.00</Bulk>
-						<WorkToMake>39500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>115</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>3.5</warmupTime>
-						<range>126</range>
-						<soundCast>RNShot50Cal</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== M110 SASS ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M110SASSDMR</defName>
-					<statBases>
-						<Mass>6.54</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.60</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>11.29</Bulk>
-						<WorkToMake>35500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>65</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.8</warmupTime>
-						<range>75</range>
-						<soundCast>RNShot_GenericDMR</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== M110 SASS SD ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M110SASSSDDMR</defName>
-					<statBases>
-						<Mass>7.45</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.60</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.44</SwayFactor>
-						<Bulk>12.81</Bulk>
-						<WorkToMake>37000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>75</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.8</warmupTime>
-						<range>75</range>
-						<soundCast>RNShot_DMRSDGeneric</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== M14 DMR ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M14DMR</defName>
-					<statBases>
-						<Mass>6.10</Mass>
-						<RangedWeapon_Cooldown>0.57</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.84</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.29</SwayFactor>
-						<Bulk>12.18</Bulk>
-						<WorkToMake>37500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>60</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>2</warmupTime>
-						<range>75</range>
-						<soundCast>RNShot_M14DMR</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== M14 EBR ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M14EBR</defName>
-					<statBases>
-						<Mass>6.75</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.60</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>9.89</Bulk>
-						<WorkToMake>33500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>70</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.8</warmupTime>
-						<range>75</range>
-						<soundCast>RNShot_EBRGeneric</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== M14 EBR MIL-SPEC ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M14EBRMilSpec</defName>
-					<statBases>
-						<Mass>6.75</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.60</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>9.89</Bulk>
-						<WorkToMake>33500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>70</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.8</warmupTime>
-						<range>75</range>
-						<soundCast>RNShot_EBRGeneric</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Springfield Armory M1A VLTOR ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M14VLTOR</defName>
-					<statBases>
-						<Mass>5.26</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.60</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.75</SwayFactor>
-						<Bulk>10.43</Bulk>
-						<WorkToMake>36000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>55</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>75</range>
-						<soundCast>RNShot_EBRGeneric</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== M21 SWS ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M21DMR</defName>
-					<statBases>
-						<Mass>5.27</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.60</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.75</SwayFactor>
-						<Bulk>11.18</Bulk>
-						<WorkToMake>29000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>55</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>76</range>
-						<soundCast>RNShot_M14DMR</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== M39 EMR ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M39EMR</defName>
-					<statBases>
-						<Mass>7.50</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.72</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.99</SwayFactor>
-						<Bulk>10.37</Bulk>
-						<WorkToMake>35000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>75</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.7</warmupTime>
-						<range>73</range>
-						<soundCast>RNShot_EBRGeneric</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== M39 EMR MIL-SPEC ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M39EMRMilSpec</defName>
-					<statBases>
-						<Mass>7.50</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.72</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.39</SwayFactor>
-						<Bulk>11.37</Bulk>
-						<WorkToMake>35500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>80</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.9</warmupTime>
-						<range>73</range>
-						<soundCast>RNShot_EBRGeneric</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Barrett M82A1 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M82A1AMR</defName>
-					<statBases>
-						<Mass>13.50</Mass>
-						<RangedWeapon_Cooldown>0.58</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.84</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.87</SwayFactor>
-						<Bulk>13.00</Bulk>
-						<WorkToMake>38500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>105</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>3.5</warmupTime>
-						<range>126</range>
-						<soundCast>RNShot50Cal</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Zijiang M99 / Type 99 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M99AMR</defName>
-					<statBases>
-						<Mass>12.00</Mass>
-						<RangedWeapon_Cooldown>0.58</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.72</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.96</SwayFactor>
-						<Bulk>15.80</Bulk>
-						<WorkToMake>36500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>110</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_127x108mm_FMJ</defaultProjectile>
-						<warmupTime>3.4</warmupTime>
-						<range>112</range>
-						<soundCast>RNShot50Cal</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_127x108mm</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== MK11 Mod 0 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_MK11DMR</defName>
-					<statBases>
-						<Mass>6.90</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.48</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.93</SwayFactor>
-						<Bulk>11.58</Bulk>
-						<WorkToMake>30500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>70</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>75</range>
-						<soundCast>RNShot_GenericDMR</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Mk 14 EBR ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Mk14EBR</defName>
-					<statBases>
-						<Mass>6.75</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.60</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.89</SwayFactor>
-						<Bulk>8.89</Bulk>
-						<WorkToMake>33500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>70</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>75</range>
-						<soundCast>RNShot_EBRGeneric</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Heckler & Koch PSG-1 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_PSG1DMR</defName>
-					<statBases>
-						<Mass>7.20</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.36</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>2.01</SwayFactor>
-						<Bulk>12.30</Bulk>
-						<WorkToMake>30500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>65</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.4</warmupTime>
-						<range>86</range>
-						<soundCast>RNShotPSG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== QBU-88 (Type 88) ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_QBU88DMR</defName>
-					<statBases>
-						<Mass>4.10</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.54</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>0.99</SwayFactor>
-						<Bulk>10.20</Bulk>
-						<WorkToMake>39000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>55</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_58x42mmDBP10_FMJ</defaultProjectile>
-						<warmupTime>1.75</warmupTime>
-						<range>75</range>
-						<soundCast>RNShot_GenericDMR_II</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_58x42mmDBP10</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Kel-Tec RFB DMR ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_RFBDMR</defName>
-					<statBases>
-						<Mass>5.10</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.60</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.61</SwayFactor>
-						<Bulk>10.00</Bulk>
-						<WorkToMake>41000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>55</range>
-						<soundCast>RNShot_M14DMR</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== FN SCAR Mk20 SSR ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_SCARMk20DMR</defName>
-					<statBases>
-						<Mass>4.85</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.60</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.67</SwayFactor>
-						<Bulk>10.29</Bulk>
-						<WorkToMake>35500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>86</range>
-						<soundCast>RNShot_GenericDMR_III</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== SKS DMR ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_SKSDMR</defName>
-					<statBases>
-						<Mass>3.85</Mass>
-						<RangedWeapon_Cooldown>0.57</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.01</SwayFactor>
-						<Bulk>10.18</Bulk>
-						<WorkToMake>29000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>48</range>
-						<soundCast>RNShotSKS</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== SKS DMR-SD ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_SKSSDDMR</defName>
-					<statBases>
-						<Mass>4.31</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.25</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.19</SwayFactor>
-						<Bulk>12.20</Bulk>
-						<WorkToMake>29500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>55</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>48</range>
-						<soundCast>RNShot_DMRSDGeneric</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== SR-25 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_SR25DMR</defName>
-					<statBases>
-						<Mass>5.30</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.48</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.73</SwayFactor>
-						<Bulk>10.10</Bulk>
-						<WorkToMake>31000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>60</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>75</range>
-						<soundCast>RNShot_GenericDMR</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Kalashnikov SVK ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_SVKDMR</defName>
-					<statBases>
-						<Mass>5.20</Mass>
-						<RangedWeapon_Cooldown>0.57</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.06</SwayFactor>
-						<Bulk>8.40</Bulk>
-						<WorkToMake>27500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>75</range>
-						<soundCast>RNShot_DMRSDGeneric_II</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== OTs-03 SVU-A ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_SVUADMR</defName>
-					<statBases>
-						<Mass>4.10</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>8.70</Bulk>
-						<WorkToMake>42500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.01</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>97</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>RNShot_DMRSDGeneric_II</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== OTs-03 SVU ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_SVUDMR</defName>
-					<statBases>
-						<Mass>4.10</Mass>
-						<RangedWeapon_Cooldown>0.57</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>0.92</SwayFactor>
-						<Bulk>9.70</Bulk>
-						<WorkToMake>31000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>97</range>
-						<soundCast>RNShot_DMRSDGeneric_II</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== VSS Vintorez ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_VSSDMR</defName>
-					<statBases>
-						<Mass>2.60</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.19</SwayFactor>
-						<Bulk>8.94</Bulk>
-						<WorkToMake>22500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Chemfuel>5</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.94</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>48</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShotVSSVintorez</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Walther WA 2000 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_WA2000DMR</defName>
-					<statBases>
-						<Mass>7.51</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.60</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.76</SwayFactor>
-						<Bulk>9.05</Bulk>
-						<WorkToMake>37500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>60</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>68</range>
-						<soundCast>RNShotPSG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Zastava M76 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_ZastavaM76DMR</defName>
-					<statBases>
-						<Mass>4.60</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.64</SwayFactor>
-						<Bulk>11.35</Bulk>
-						<WorkToMake>23000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>60</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_792x57mmMauser_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<soundCast>RNShotDragunov</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_792x57mmMauser</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNGun_AR10DMR" or
-						defName="RNGun_AS50AMR" or
-						defName="RNGun_DragunovDMR" or
-						defName="RNGun_G28DMR" or
-						defName="RNGun_G3SGDMR" or
-						defName="RNGun_HK417DMR" or
-						defName="RNGun_L129A1DMR" or
-						defName="RNGun_M107AMR" or
-						defName="RNGun_M110SASSDMR" or
-						defName="RNGun_M110SASSSDDMR" or
-						defName="RNGun_M14DMR" or
-						defName="RNGun_M14EBR" or
-						defName="RNGun_M14EBRMilSpec" or
-						defName="RNGun_M14VLTOR" or
-						defName="RNGun_M21DMR" or
-						defName="RNGun_M39EMR" or
-						defName="RNGun_M39EMRMilSpec" or
-						defName="RNGun_M82A1AMR" or
-						defName="RNGun_M99AMR" or
-						defName="RNGun_MK11DMR" or
-						defName="RNGun_Mk14EBR" or
-						defName="RNGun_PSG1DMR" or
-						defName="RNGun_QBU88DMR" or
-						defName="RNGun_RFBDMR" or
-						defName="RNGun_SCARMk20DMR" or
-						defName="RNGun_SKSDMR" or
-						defName="RNGun_SKSSDDMR" or
-						defName="RNGun_SR25DMR" or
-						defName="RNGun_SVKDMR" or
-						defName="RNGun_SVUADMR" or
-						defName="RNGun_SVUDMR" or
-						defName="RNGun_VSSDMR" or
-						defName="RNGun_WA2000DMR" or
-						defName="RNGun_ZastavaM76DMR"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_Pistols.xml b/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_Pistols.xml
deleted file mode 100644
index cb7212de36..0000000000
--- a/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_Pistols.xml	
+++ /dev/null
@@ -1,1082 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Rimmu-Nation - Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== CZ 75B ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_CZ75B</defName>
-					<statBases>
-						<Mass>1.12</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.06</SwayFactor>
-						<Bulk>2.06</Bulk>
-						<WorkToMake>7000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>8</range>
-						<soundCast>RNShot_CZ75B</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>16</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Desert Eagle ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_DesertEagle</defName>
-					<statBases>
-						<Mass>2.00</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.58</SwayFactor>
-						<Bulk>2.73</Bulk>
-						<WorkToMake>7500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50AE_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNDeagleShot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_50AE</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Desert Eagle Gold ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_DesertEagleGold</defName>
-					<statBases>
-						<Mass>2.00</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.58</SwayFactor>
-						<Bulk>2.73</Bulk>
-						<WorkToMake>7500</WorkToMake>
-					</statBases>
-					<costList>
-						<Gold>5</Gold>
-						<Steel>30</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50AE_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNDeagleShot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_50AE</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-
-				</li>
-
-				<!-- ========== FN Five-seven ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_FiveSeven</defName>
-					<statBases>
-						<Mass>0.61</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.90</SwayFactor>
-						<Bulk>2.08</Bulk>
-						<WorkToMake>7500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>20</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShotFiveSeven</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_FN57x28mm</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Glock 17 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Glock17P</defName>
-					<statBases>
-						<Mass>0.63</Mass>
-						<RangedWeapon_Cooldown>0.40</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.83</SwayFactor>
-						<Bulk>1.86</Bulk>
-						<WorkToMake>7500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>20</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShotGlock17</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>17</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Glock 34 Combat Master ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Glock34CM</defName>
-					<statBases>
-						<Mass>0.66</Mass>
-						<RangedWeapon_Cooldown>0.40</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>0.96</SwayFactor>
-						<Bulk>2.23</Bulk>
-						<WorkToMake>7500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>20</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>13</range>
-						<soundCast>RNShotPistol_II</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>17</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-
-				</li>
-
-				<!-- ========== HS2000 / XD / XDM / XD-S ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_HS2000P</defName>
-					<statBases>
-						<Mass>0.65</Mass>
-						<RangedWeapon_Cooldown>0.41</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>0.75</SwayFactor>
-						<Bulk>1.60</Bulk>
-						<WorkToMake>7500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>20</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShot_SpringfieldXD</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>13</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-
-				</li>
-
-				<!-- ========== M1911A1 Hellfighter ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M1911_Hellfighter</defName>
-					<statBases>
-						<Mass>1.14</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.11</SwayFactor>
-						<Bulk>2.19</Bulk>
-						<WorkToMake>7000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShot_1911Hellfighter</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== M1911A1 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M1911A1P</defName>
-					<statBases>
-						<Mass>1.14</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.11</SwayFactor>
-						<Bulk>2.19</Bulk>
-						<WorkToMake>7000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShot1911P</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== M1911A2 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M1911A2P</defName>
-					<statBases>
-						<Mass>1.14</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.11</SwayFactor>
-						<Bulk>2.19</Bulk>
-						<WorkToMake>7000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShot_1911Hellfighter</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== M45A1 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M45A1_Pistol</defName>
-					<statBases>
-						<Mass>1.11</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.07</SwayFactor>
-						<Bulk>2.10</Bulk>
-						<WorkToMake>7000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>RNShot1911P</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== M9A1 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M9A1P</defName>
-					<statBases>
-						<Mass>0.97</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.05</SwayFactor>
-						<Bulk>2.17</Bulk>
-						<WorkToMake>7000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNPistolShot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Makarov (PM) ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Makarov</defName>
-					<statBases>
-						<Mass>0.73</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>0.78</SwayFactor>
-						<Bulk>1.62</Bulk>
-						<WorkToMake>7000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x18mmMakarov_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNPistolShot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== USSOCOM MK23 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_MK23P</defName>
-					<statBases>
-						<Mass>2.02</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>2.08</SwayFactor>
-						<Bulk>4.21</Bulk>
-						<WorkToMake>8500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>30</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShotSupressed_III</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== MP445 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_MP445P</defName>
-					<statBases>
-						<Mass>0.90</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.97</SwayFactor>
-						<Bulk>2.00</Bulk>
-						<WorkToMake>7500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>20</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_40SW_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>9</range>
-						<soundCast>RNShotMP445Ruski</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_40SW</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== SIG Sauer P226 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_P226P</defName>
-					<statBases>
-						<Mass>0.96</Mass>
-						<RangedWeapon_Cooldown>0.40</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.97</SwayFactor>
-						<Bulk>1.96</Bulk>
-						<WorkToMake>7000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_40SW_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShotP226P</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_40SW</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== SIG Sauer P320 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_P320P</defName>
-					<statBases>
-						<Mass>0.84</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.96</SwayFactor>
-						<Bulk>2.03</Bulk>
-						<WorkToMake>7500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>20</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShotPistol_II</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>17</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Taurus PT92 "Luison" ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_PT92Luison</defName>
-					<statBases>
-						<Mass>1.12</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.63</SwayFactor>
-						<Bulk>3.79</Bulk>
-						<WorkToMake>7500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShotSupressed_II</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>17</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== TEC-9 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_TEC-9P</defName>
-					<statBases>
-						<Mass>1.23</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.19</ShotSpread>
-						<SwayFactor>1.21</SwayFactor>
-						<Bulk>2.41</Bulk>
-						<WorkToMake>7500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>20</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShotTec9</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== TT-30 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_TT30P</defName>
-					<statBases>
-						<Mass>0.85</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.93</SwayFactor>
-						<Bulk>1.94</Bulk>
-						<WorkToMake>7000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNPistolShot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== USP45 SD ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_USP45SD</defName>
-					<statBases>
-						<Mass>1.23</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.71</SwayFactor>
-						<Bulk>3.92</Bulk>
-						<WorkToMake>8000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>25</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNPistolSupressed</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Walther PPK ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_WaltherPPK</defName>
-					<statBases>
-						<Mass>0.59</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.19</ShotSpread>
-						<SwayFactor>0.71</SwayFactor>
-						<Bulk>1.55</Bulk>
-						<WorkToMake>7000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>20</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_380ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>8</range>
-						<soundCast>RNShotGlock17</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_380ACP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNGun_CZ75B" or
-						defName="RNGun_DesertEagle" or
-						defName="RNGun_DesertEagleGold" or
-						defName="RNGun_FiveSeven" or
-						defName="RNGun_Glock17P" or
-						defName="RNGun_Glock34CM" or
-						defName="RNGun_HS2000P" or
-						defName="RNGun_M1911_Hellfighter" or
-						defName="RNGun_M1911A1P" or
-						defName="RNGun_M1911A2P" or
-						defName="RNGun_M45A1_Pistol" or
-						defName="RNGun_M9A1P" or
-						defName="RNGun_Makarov" or
-						defName="RNGun_MK23P" or
-						defName="RNGun_MP445P" or
-						defName="RNGun_P226P" or
-						defName="RNGun_P320P" or
-						defName="RNGun_PT92Luison" or
-						defName="RNGun_TEC-9P" or
-						defName="RNGun_TT30P" or
-						defName="RNGun_USP45SD" or
-						defName="RNGun_WaltherPPK"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_R_AK_Style.xml b/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_R_AK_Style.xml
deleted file mode 100644
index c1dae3a894..0000000000
--- a/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_R_AK_Style.xml	
+++ /dev/null
@@ -1,960 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Rimmu-Nation - Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== AEK-971 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_AEK971AR</defName>
-					<statBases>
-						<Mass>3.30</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.29</SwayFactor>
-						<Bulk>7.20</Bulk>
-						<WorkToMake>32000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.37</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_AEK971</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== AK-103 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_AK103AR</defName>
-					<statBases>
-						<Mass>3.40</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.28</SwayFactor>
-						<Bulk>7.05</Bulk>
-						<WorkToMake>33500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.83</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>RNShot_AKM</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== AK-104 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_AK104AR</defName>
-					<statBases>
-						<Mass>3.00</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.21</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.16</SwayFactor>
-						<Bulk>5.86</Bulk>
-						<WorkToMake>34000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.89</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.275</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>RNShot_AKM</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== AK-12 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_AK12AR</defName>
-					<statBases>
-						<Mass>3.30</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.21</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.31</SwayFactor>
-						<Bulk>7.25</Bulk>
-						<WorkToMake>35500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.38</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.275</warmupTime>
-						<range>51</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShot_AK12AR</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== AK-15 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_AK15AR</defName>
-					<statBases>
-						<Mass>3.30</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.28</SwayFactor>
-						<Bulk>7.25</Bulk>
-						<WorkToMake>33500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.86</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>51</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShot_AKM</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== AK-47 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_AK47AR</defName>
-					<statBases>
-						<Mass>3.47</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<Bulk>8.80</Bulk>
-						<WorkToMake>27000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>45</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.82</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>44</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>RNShot_AK47Rifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== AK-47 Gold ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_AK47GoldAR</defName>
-					<statBases>
-						<Mass>3.47</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<Bulk>8.80</Bulk>
-						<WorkToMake>27000</WorkToMake>
-					</statBases>
-					<costList>
-						<Gold>10</Gold>
-						<WoodLog>10</WoodLog>
-						<Steel>45</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.82</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>44</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>RNShot_AK47Rifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== AK-47 Modern ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_AK47ModernAR</defName>
-					<statBases>
-						<Mass>3.47</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<Bulk>8.80</Bulk>
-						<WorkToMake>29500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.82</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>44</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>RNShot_AK47Rifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== AK-74 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_AK74AR</defName>
-					<statBases>
-						<Mass>3.07</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.25</SwayFactor>
-						<Bulk>9.43</Bulk>
-						<WorkToMake>27500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.43</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>RNShotAK74USMG</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== AK-74 Tactical ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_AK74TacticalAR</defName>
-					<statBases>
-						<Mass>3.07</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.21</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.29</SwayFactor>
-						<Bulk>9.43</Bulk>
-						<WorkToMake>33500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.43</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.275</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>RNShotAK74USMG</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== AKM ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_AKMAR</defName>
-					<statBases>
-						<Mass>3.10</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.19</SwayFactor>
-						<Bulk>8.80</Bulk>
-						<WorkToMake>27000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>45</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.92</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>44</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>RNShot_AKM</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== AKM Tactical ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_AKMTacticalAR</defName>
-					<statBases>
-						<Mass>3.10</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.21</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<Bulk>8.80</Bulk>
-						<WorkToMake>33000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.92</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.275</warmupTime>
-						<range>44</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>RNShot_AKM</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== AKS-47 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_AKS47AR</defName>
-					<statBases>
-						<Mass>3.90</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.26</SwayFactor>
-						<Bulk>6.45</Bulk>
-						<WorkToMake>29500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>45</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.71</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>44</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>RNShot_AK47Rifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== AN-94 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_AN94AR</defName>
-					<statBases>
-						<Mass>3.85</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>7.28</Bulk>
-						<WorkToMake>32500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.28</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>68</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>RNShot_AN94</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Type 56 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Type56AR</defName>
-					<statBases>
-						<Mass>3.70</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.24</SwayFactor>
-						<Bulk>6.54</Bulk>
-						<WorkToMake>29500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>45</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.78</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>44</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>RNShot_AKM</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Zastava M21 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_ZastavaM21AR</defName>
-					<statBases>
-						<Mass>4.15</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.42</SwayFactor>
-						<Bulk>7.50</Bulk>
-						<WorkToMake>34000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.34</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>62</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShot_AEK971</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Zastava M70AB2 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_ZastavaM70AB2AR</defName>
-					<statBases>
-						<Mass>3.70</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.29</SwayFactor>
-						<Bulk>6.70</Bulk>
-						<WorkToMake>29500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>45</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.76</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>RNShot_AK47Rifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Zastava M70 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_ZastavaM70AR</defName>
-					<statBases>
-						<Mass>3.70</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.31</SwayFactor>
-						<Bulk>9.40</Bulk>
-						<WorkToMake>27500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.76</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>RNShot_AK47Rifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNGun_AEK971AR" or
-						defName="RNGun_AK103AR" or
-						defName="RNGun_AK104AR" or
-						defName="RNGun_AK12AR" or
-						defName="RNGun_AK15AR" or
-						defName="RNGun_AK47AR" or
-						defName="RNGun_AK47GoldAR" or
-						defName="RNGun_AK47ModernAR" or
-						defName="RNGun_AK74AR" or
-						defName="RNGun_AK74TacticalAR" or
-						defName="RNGun_AKMAR" or
-						defName="RNGun_AKMTacticalAR" or
-						defName="RNGun_AKS47AR" or
-						defName="RNGun_AN94AR" or
-						defName="RNGun_Type56AR" or
-						defName="RNGun_ZastavaM21AR" or
-						defName="RNGun_ZastavaM70AB2AR" or
-						defName="RNGun_ZastavaM70AR"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_R_AR_Style.xml b/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_R_AR_Style.xml
deleted file mode 100644
index c877d38cbf..0000000000
--- a/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_R_AR_Style.xml	
+++ /dev/null
@@ -1,1679 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Rimmu-Nation - Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Daniel Defense DDM4 V1 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_DDM4AR</defName>
-					<statBases>
-						<Mass>3.04</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.26</SwayFactor>
-						<Bulk>8.19</Bulk>
-						<WorkToMake>36000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.55</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>59</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR_II</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Heckler & Koch HK416 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_HK416Bare</defName>
-					<statBases>
-						<Mass>3.56</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.30</SwayFactor>
-						<Bulk>8.48</Bulk>
-						<WorkToMake>31500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.41</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>62</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Heckler & Koch HK416 Elite ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_HK416Elite</defName>
-					<statBases>
-						<Mass>3.84</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.37</SwayFactor>
-						<Bulk>8.48</Bulk>
-						<WorkToMake>35500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.36</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>62</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Heckler & Koch HK416 Nomad ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_HK416Nomad</defName>
-					<statBases>
-						<Mass>3.84</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.37</SwayFactor>
-						<Bulk>8.48</Bulk>
-						<WorkToMake>36000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.36</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>62</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Heckler & Koch HK416 SD Predator ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_HK416SD_Predator</defName>
-					<statBases>
-						<Mass>4.38</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.58</SwayFactor>
-						<Bulk>10.10</Bulk>
-						<WorkToMake>37500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>55</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.27</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>62</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_SDAR</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Heckler & Koch HK416 SD DEVGRU ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_HK416SD_DEVGRU</defName>
-					<statBases>
-						<Mass>4.44</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.62</SwayFactor>
-						<Bulk>10.39</Bulk>
-						<WorkToMake>37500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>55</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.27</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>62</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_SDAR</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Heckler & Koch HK416 SD Punisher ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_HK416PunisherSD</defName>
-					<statBases>
-						<Mass>4.38</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.54</SwayFactor>
-						<Bulk>10.10</Bulk>
-						<WorkToMake>35500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>55</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.27</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>62</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_SDAR</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== War Sport Industries LVOA-C ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_LVOACAR</defName>
-					<statBases>
-						<Mass>3.20</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.26</SwayFactor>
-						<Bulk>8.32</Bulk>
-						<WorkToMake>35500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.49</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR_II</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== M16A1 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M16A1Bare</defName>
-					<statBases>
-						<Mass>2.89</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.29</SwayFactor>
-						<Bulk>10.03</Bulk>
-						<WorkToMake>30000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.63</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>59</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR_IV</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== M16A4 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M16A4AR</defName>
-					<statBases>
-						<Mass>2.89</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>10.03</Bulk>
-						<WorkToMake>34000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.63</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>59</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR_IV</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== M16A4 MIL-SPEC ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M16A4MilSpec</defName>
-					<statBases>
-						<Mass>2.89</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>10.03</Bulk>
-						<WorkToMake>34000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.63</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>59</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR_IV</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Heckler & Koch M27 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M27AR</defName>
-					<statBases>
-						<Mass>3.60</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.21</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<Bulk>9.37</Bulk>
-						<WorkToMake>35500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>55</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.31</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.275</warmupTime>
-						<range>59</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR_IV</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Heckler & Koch M27 IAR ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M27IAR</defName>
-					<statBases>
-						<Mass>3.60</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.21</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<Bulk>9.37</Bulk>
-						<WorkToMake>36500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.31</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.275</warmupTime>
-						<range>59</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR_IV</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Heckler & Koch M27 IAR SD ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M27IAR_SD</defName>
-					<statBases>
-						<Mass>4.11</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.21</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.37</SwayFactor>
-						<Bulk>10.26</Bulk>
-						<WorkToMake>37000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>55</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.23</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.275</warmupTime>
-						<range>59</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_SDAR_III</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== M4A1 Kandahar ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M4A1AR</defName>
-					<statBases>
-						<Mass>2.90</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.1</ShotSpread>
-						<SwayFactor>1.17</SwayFactor>
-						<Bulk>7.56</Bulk>
-						<WorkToMake>33500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.58</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR_IV</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== M4A1 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M4A1Bare</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>
-						<WorkToMake>32000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.58</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR_II</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== M4A1 SD ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M4A1BareSD</defName>
-					<statBases>
-						<Mass>3.52</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.28</SwayFactor>
-						<Bulk>8.45</Bulk>
-						<WorkToMake>32500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.44</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_SDAR_III</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== M4A1 Benghazi ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M4A1Benghazi</defName>
-					<statBases>
-						<Mass>2.90</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.1</ShotSpread>
-						<SwayFactor>1.13</SwayFactor>
-						<Bulk>7.56</Bulk>
-						<WorkToMake>33500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.58</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR_II</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== M4A1 Blackout ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M4A1Black</defName>
-					<statBases>
-						<Mass>2.90</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.1</ShotSpread>
-						<SwayFactor>1.17</SwayFactor>
-						<Bulk>7.56</Bulk>
-						<WorkToMake>35500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.73</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_300AACBlackout_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR_II</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_300AACBlackout</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== M4A1 Fallujah ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M4A1Fallujah</defName>
-					<statBases>
-						<Mass>2.90</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.1</ShotSpread>
-						<SwayFactor>1.17</SwayFactor>
-						<Bulk>7.56</Bulk>
-						<WorkToMake>33500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.58</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR_II</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== M4A1 Ghost ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M4A1Ghost</defName>
-					<statBases>
-						<Mass>2.90</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.1</ShotSpread>
-						<SwayFactor>1.17</SwayFactor>
-						<Bulk>7.56</Bulk>
-						<WorkToMake>33500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.58</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR_II</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== M4A1 Hunter ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M4A1Hunter</defName>
-					<statBases>
-						<Mass>2.90</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.1</ShotSpread>
-						<SwayFactor>1.17</SwayFactor>
-						<Bulk>7.56</Bulk>
-						<WorkToMake>33500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.58</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR_II</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== M4A1 MIL-SPEC ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M4A1MilSpec</defName>
-					<statBases>
-						<Mass>2.90</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.1</ShotSpread>
-						<SwayFactor>1.17</SwayFactor>
-						<Bulk>7.56</Bulk>
-						<WorkToMake>33500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.58</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR_II</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== M4A1 SD MIL-SPEC ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M4A1MilSpecSD</defName>
-					<statBases>
-						<Mass>3.52</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.40</SwayFactor>
-						<Bulk>9.21</Bulk>
-						<WorkToMake>37000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.44</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_SDAR_III</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== M4A1 SD Ramadi ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M4A1RamadiSD</defName>
-					<statBases>
-						<Mass>2.90</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.1</ShotSpread>
-						<SwayFactor>1.17</SwayFactor>
-						<Bulk>7.56</Bulk>
-						<WorkToMake>35500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.58</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_SDAR_III</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== M4A1 Roach ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M4A1RoachAR</defName>
-					<statBases>
-						<Mass>2.90</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.1</ShotSpread>
-						<SwayFactor>1.17</SwayFactor>
-						<Bulk>7.56</Bulk>
-						<WorkToMake>33500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.58</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR_II</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== M4A1 SD Banshee ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M4A1SD_Banshee</defName>
-					<statBases>
-						<Mass>3.52</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.28</SwayFactor>
-						<Bulk>8.45</Bulk>
-						<WorkToMake>34000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.44</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_SDAR_III</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== M4A1 SD Commando ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M4A1SD_Commando</defName>
-					<statBases>
-						<Mass>3.52</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.40</SwayFactor>
-						<Bulk>9.21</Bulk>
-						<WorkToMake>37000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.44</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_SDAR_III</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== M4A1 SD VLTOR ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M4A1SD_VLTOR</defName>
-					<statBases>
-						<Mass>3.52</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>8.45</Bulk>
-						<WorkToMake>36000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.44</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_SDAR_III</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== M4A1 Warfighter ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M4A1Warfighter</defName>
-					<statBases>
-						<Mass>2.90</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.1</ShotSpread>
-						<SwayFactor>1.17</SwayFactor>
-						<Bulk>7.56</Bulk>
-						<WorkToMake>35500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.58</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR_II</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Patriot Ordinance Factory P416 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_P416Bare</defName>
-					<statBases>
-						<Mass>3.06</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.09</SwayFactor>
-						<Bulk>6.86</Bulk>
-						<WorkToMake>32500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.35</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR_II</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== SIG Sauer SIGM400 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_SIGM400Tread</defName>
-					<statBases>
-						<Mass>3.16</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>8.28</Bulk>
-						<WorkToMake>26000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>59</range>
-						<soundCast>RNShot_GenericAR_IV</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Smith & Wesson MP15 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_SWMP15AR</defName>
-					<statBases>
-						<Mass>3.06</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.24</SwayFactor>
-						<Bulk>8.13</Bulk>
-						<WorkToMake>26500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>59</range>
-						<soundCast>RNShot_GenericAR_IV</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Bushmaster XM-15 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_XM15AR</defName>
-					<statBases>
-						<Mass>2.95</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.22</SwayFactor>
-						<Bulk>8.26</Bulk>
-						<WorkToMake>26500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>59</range>
-						<soundCast>RNShot_GenericAR_IV</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNGun_DDM4AR" or
-						defName="RNGun_HK416Bare" or
-						defName="RNGun_HK416Elite" or
-						defName="RNGun_HK416Nomad" or
-						defName="RNGun_HK416SD_Predator" or
-						defName="RNGun_HK416SD_DEVGRU" or
-						defName="RNGun_HK416PunisherSD" or
-						defName="RNGun_LVOACAR" or
-						defName="RNGun_M16A1Bare" or
-						defName="RNGun_M16A4AR" or
-						defName="RNGun_M16A4MilSpec" or
-						defName="RNGun_M27AR" or
-						defName="RNGun_M27IAR" or
-						defName="RNGun_M27IAR_SD" or
-						defName="RNGun_M4A1AR" or
-						defName="RNGun_M4A1Bare" or
-						defName="RNGun_M4A1BareSD" or
-						defName="RNGun_M4A1Benghazi" or
-						defName="RNGun_M4A1Black" or
-						defName="RNGun_M4A1Fallujah" or
-						defName="RNGun_M4A1Ghost" or
-						defName="RNGun_M4A1Hunter" or
-						defName="RNGun_M4A1MilSpec" or
-						defName="RNGun_M4A1MilSpecSD" or
-						defName="RNGun_M4A1RamadiSD" or
-						defName="RNGun_M4A1RoachAR" or
-						defName="RNGun_M4A1SD_Banshee" or
-						defName="RNGun_M4A1SD_Commando" or
-						defName="RNGun_M4A1SD_VLTOR" or
-						defName="RNGun_M4A1Warfighter" or
-						defName="RNGun_P416Bare" or
-						defName="RNGun_SIGM400Tread" or
-						defName="RNGun_SWMP15AR" or
-						defName="RNGun_XM15AR"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_R_Bullpup_Style.xml b/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_R_Bullpup_Style.xml
deleted file mode 100644
index a8d3c90014..0000000000
--- a/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_R_Bullpup_Style.xml	
+++ /dev/null
@@ -1,391 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Rimmu-Nation - Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Steyr AUG A2 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_AUGA2AR</defName>
-					<statBases>
-						<Mass>3.60</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.09</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.17</SwayFactor>
-						<Bulk>7.90</Bulk>
-						<WorkToMake>40500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.47</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.175</warmupTime>
-						<range>40</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShotAUG</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Steyr AUG A3 SD ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_AUGA3SDAR</defName>
-					<statBases>
-						<Mass>3.20</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.11</SwayFactor>
-						<Bulk>7.90</Bulk>
-						<WorkToMake>39500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.56</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>40</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShot_SDAR_III</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== F2000 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_F2000AR</defName>
-					<statBases>
-						<Mass>3.60</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.05</SwayFactor>
-						<Bulk>6.88</Bulk>
-						<WorkToMake>36500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.41</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericBullpup_III</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== FAMAS ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_FAMASAR</defName>
-					<statBases>
-						<Mass>3.61</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.12</SwayFactor>
-						<Bulk>7.57</Bulk>
-						<WorkToMake>37500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.44</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>40</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericBullpup_II</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Groza-4 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Groza4AR</defName>
-					<statBases>
-						<Mass>3.60</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.08</SwayFactor>
-						<Bulk>7.20</Bulk>
-						<WorkToMake>35500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.67</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>31</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShot_Groza4</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_9x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== L85A2 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_L85A2MILSPEC</defName>
-					<statBases>
-						<Mass>3.82</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.21</SwayFactor>
-						<Bulk>7.85</Bulk>
-						<WorkToMake>41000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.40</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>48</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericBullpup</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>6</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Type 97 / QBZ-95 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Type97AR</defName>
-					<statBases>
-						<Mass>3.35</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.09</SwayFactor>
-						<Bulk>7.58</Bulk>
-						<WorkToMake>36500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.49</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericBullpup_III</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNGun_AUGA2AR" or
-						defName="RNGun_AUGA3SDAR" or
-						defName="RNGun_F2000AR" or
-						defName="RNGun_FAMASAR" or
-						defName="RNGun_Groza4AR" or
-						defName="RNGun_L85A2MILSPEC" or
-						defName="RNGun_Type97AR"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_R_Colt_Canada.xml b/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_R_Colt_Canada.xml
deleted file mode 100644
index d400fd8dd3..0000000000
--- a/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_R_Colt_Canada.xml	
+++ /dev/null
@@ -1,343 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Rimmu-Nation - Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Colt Canada C7A1 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_C7A1AR</defName>
-					<statBases>
-						<Mass>3.30</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.20</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.37</SwayFactor>
-						<Bulk>10.06</Bulk>
-						<WorkToMake>33500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.48</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.27</warmupTime>
-						<range>48</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Colt Canada C7A2 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_C7A2AR</defName>
-					<statBases>
-						<Mass>3.30</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.20</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.37</SwayFactor>
-						<Bulk>9.30</Bulk>
-						<WorkToMake>33500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.48</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.27</warmupTime>
-						<range>48</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Colt Canada C8A2 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_C8A2AR</defName>
-					<statBases>
-						<Mass>3.20</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.20</SightsEfficiency>
-						<ShotSpread>0.1</ShotSpread>
-						<SwayFactor>1.19</SwayFactor>
-						<Bulk>7.60</Bulk>
-						<WorkToMake>35000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.50</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.27</warmupTime>
-						<range>48</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR_II</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Colt Canada C8A3 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_C8A3AR</defName>
-					<statBases>
-						<Mass>3.20</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.20</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<Bulk>8.00</Bulk>
-						<WorkToMake>36000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.50</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.27</warmupTime>
-						<range>48</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR_II</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Colt Canada C8SFW ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_C8SFWAR</defName>
-					<statBases>
-						<Mass>3.40</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.20</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.25</SwayFactor>
-						<Bulk>8.00</Bulk>
-						<WorkToMake>36000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.46</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.27</warmupTime>
-						<range>48</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR_II</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Colt Canada C8SFW SD ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_C8SFWSDAR</defName>
-					<statBases>
-						<Mass>3.85</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.20</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.40</SwayFactor>
-						<Bulk>9.02</Bulk>
-						<WorkToMake>36500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.37</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.27</warmupTime>
-						<range>48</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShot_SDAR_III</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNGun_C7A1AR" or
-						defName="RNGun_C7A2AR" or
-						defName="RNGun_C8A2AR" or
-						defName="RNGun_C8A3AR" or
-						defName="RNGun_C8SFWAR" or
-						defName="RNGun_C8SFWSDAR"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_R_Others.xml b/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_R_Others.xml
deleted file mode 100644
index 1a2e57861f..0000000000
--- a/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_R_Others.xml	
+++ /dev/null
@@ -1,637 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Rimmu-Nation - Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Remington ACR ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_ACRAR</defName>
-					<statBases>
-						<Mass>3.30</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>7.16</Bulk>
-						<WorkToMake>35500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.55</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== CZ 805 BREN A2 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_CZ805A2AR</defName>
-					<statBases>
-						<Mass>3.60</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.18</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.24</SwayFactor>
-						<Bulk>5.82</Bulk>
-						<WorkToMake>34500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>35</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.30</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.25</warmupTime>
-						<range>48</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== FB Beryl ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_FBBerylAR</defName>
-					<statBases>
-						<Mass>3.35</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.28</SwayFactor>
-						<Bulk>7.42</Bulk>
-						<WorkToMake>32500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.48</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>62</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR_III</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== FN FAL ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_FNFALAR</defName>
-					<statBases>
-						<Mass>4.30</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.52</SwayFactor>
-						<Bulk>10.90</Bulk>
-						<WorkToMake>30500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>55</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.07</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>62</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShotSCARH</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== FN FNC ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_FNFNCAR</defName>
-					<statBases>
-						<Mass>3.84</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.38</SwayFactor>
-						<Bulk>7.66</Bulk>
-						<WorkToMake>31500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.42</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericBullpup_IV</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Heckler & Koch G36C ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_G36CAR</defName>
-					<statBases>
-						<Mass>2.82</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.18</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.03</SwayFactor>
-						<Bulk>5.00</Bulk>
-						<WorkToMake>34000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>30</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.43</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>0.9</warmupTime>
-						<range>31</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShotG36C</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Heckler & Koch G36C SD ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_G36CSDAR</defName>
-					<statBases>
-						<Mass>3.42</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.18</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.28</SwayFactor>
-						<Bulk>6.91</Bulk>
-						<WorkToMake>35000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.30</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>0.9</warmupTime>
-						<range>31</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShot_SDAR</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Daewoo K2C ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_K2CAR</defName>
-					<statBases>
-						<Mass>3.77</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.29</SwayFactor>
-						<Bulk>7.77</Bulk>
-						<WorkToMake>36000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.32</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>40</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== WAT-FB MSBS-5.56 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_MSBS556AR</defName>
-					<statBases>
-						<Mass>3.70</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.31</SwayFactor>
-						<Bulk>8.43</Bulk>
-						<WorkToMake>36000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.39</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== FN SCAR-H ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_SCARHAR</defName>
-					<statBases>
-						<Mass>3.58</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.36</SwayFactor>
-						<Bulk>7.11</Bulk>
-						<WorkToMake>35500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.09</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>62</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>RNShotSCARH</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</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>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== FN SCAR-L ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_SCARLAR</defName>
-					<statBases>
-						<Mass>3.29</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.1</ShotSpread>
-						<SwayFactor>1.26</SwayFactor>
-						<Bulk>6.35</Bulk>
-						<WorkToMake>35500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.45</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Heckler & Koch XM8 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_XM8AR</defName>
-					<statBases>
-						<Mass>3.40</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.18</SwayFactor>
-						<Bulk>8.40</Bulk>
-						<WorkToMake>31000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.38</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShot_GenericAR_IV</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNGun_ACRAR" or
-						defName="RNGun_CZ805A2AR" or
-						defName="RNGun_FBBerylAR" or
-						defName="RNGun_FNFALAR" or
-						defName="RNGun_FNFNCAR" or
-						defName="RNGun_G36CAR" or
-						defName="RNGun_G36CSDAR" or
-						defName="RNGun_K2CAR" or
-						defName="RNGun_MSBS556AR" or
-						defName="RNGun_SCARHAR" or
-						defName="RNGun_SCARLAR" or
-						defName="RNGun_XM8AR"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_Revolvers.xml b/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_Revolvers.xml
deleted file mode 100644
index 86756998a7..0000000000
--- a/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_Revolvers.xml	
+++ /dev/null
@@ -1,526 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Rimmu-Nation - Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Colt Cobra ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_ColtCobra</defName>
-					<statBases>
-						<Mass>0.43</Mass>
-						<RangedWeapon_Cooldown>0.41</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>0.71</SwayFactor>
-						<Bulk>1.71</Bulk>
-						<WorkToMake>4500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>20</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>3.35</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_38Special_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShotColtPython</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_38Special</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Colt Peacemaker ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_ColtPeacemaker</defName>
-					<statBases>
-						<Mass>1.19</Mass>
-						<RangedWeapon_Cooldown>0.89</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>2.79</Bulk>
-						<WorkToMake>3500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.84</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45Colt_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShot_GenericRevolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_45Colt</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Colt Peacemaker II ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_ColtPeacemaker_II</defName>
-					<statBases>
-						<Mass>1.19</Mass>
-						<RangedWeapon_Cooldown>0.89</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.46</SwayFactor>
-						<Bulk>3.18</Bulk>
-						<WorkToMake>3500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.84</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45Colt_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShot_GenericRevolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_45Colt</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Colt Python ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_ColtPython</defName>
-					<statBases>
-						<Mass>1.23</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.38</SwayFactor>
-						<Bulk>2.92</Bulk>
-						<WorkToMake>5000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.15</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_357Magnum_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShotColtPython</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_357Magnum</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Mateba Model 6 Unica ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Mateba</defName>
-					<statBases>
-						<Mass>1.25</Mass>
-						<RangedWeapon_Cooldown>0.41</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>2.75</Bulk>
-						<WorkToMake>5500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>3.37</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_454Casull_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShotRevolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_454Casull</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== MP-412 REX ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_MP412REX</defName>
-					<statBases>
-						<Mass>0.90</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>1.07</SwayFactor>
-						<Bulk>2.32</Bulk>
-						<WorkToMake>4500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.51</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_357Magnum_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShotRevolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_357Magnum</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Nagant M1895 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_NagantRevolver</defName>
-					<statBases>
-						<Mass>0.80</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.05</SwayFactor>
-						<Bulk>2.35</Bulk>
-						<WorkToMake>4500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.09</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x38mmR_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Revolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_762x38mmR</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Taurus Raging Bull ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_RagingBull</defName>
-					<statBases>
-						<Mass>1.79</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.78</SwayFactor>
-						<Bulk>3.56</Bulk>
-						<WorkToMake>5000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>35</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.58</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_454Casull_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShotRevolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_454Casull</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Remington 1858 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Remington1858P</defName>
-					<statBases>
-						<Mass>1.18</Mass>
-						<RangedWeapon_Cooldown>0.90</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.56</SwayFactor>
-						<Bulk>3.51</Bulk>
-						<WorkToMake>3500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>3.28</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45Colt_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>15</range>
-						<soundCast>RNShot_GenericRevolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_45Colt</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Smith & Wesson Model 29 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_SWModel29P</defName>
-					<statBases>
-						<Mass>1.35</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.47</SwayFactor>
-						<Bulk>3.05</Bulk>
-						<WorkToMake>5000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.93</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_44Magnum_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShotRevolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_44Magnum</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNGun_ColtCobra" or
-						defName="RNGun_ColtPeacemaker" or
-						defName="RNGun_ColtPeacemaker_II" or
-						defName="RNGun_ColtPython" or
-						defName="RNGun_Mateba" or
-						defName="RNGun_MP412REX" or
-						defName="RNGun_NagantRevolver" or
-						defName="RNGun_RagingBull" or
-						defName="RNGun_Remington1858P" or
-						defName="RNGun_SWModel29P"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_SMG.xml b/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_SMG.xml
deleted file mode 100644
index 522cd7518e..0000000000
--- a/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_SMG.xml	
+++ /dev/null
@@ -1,1682 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Rimmu-Nation - Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== AK-74U ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_AK74U_PDW</defName>
-					<statBases>
-						<Mass>2.85</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.02</SwayFactor>
-						<Bulk>4.90</Bulk>
-						<WorkToMake>29000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.34</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>0.9</warmupTime>
-						<range>31</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>RNShotAK74USMG</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== AKMS-U ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_AKMSU_PDW</defName>
-					<statBases>
-						<Mass>2.85</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.03</SwayFactor>
-						<Bulk>4.80</Bulk>
-						<WorkToMake>29000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.95</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>0.9</warmupTime>
-						<range>31</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShot_AKM</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== AKS-74U ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_AKS74U_PDW</defName>
-					<statBases>
-						<Mass>2.70</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.00</SwayFactor>
-						<Bulk>4.90</Bulk>
-						<WorkToMake>29000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.38</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>0.9</warmupTime>
-						<range>31</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShotAK74USMG</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== CZ Scorpion EVO 3 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_CZScorpion_PDW</defName>
-					<statBases>
-						<Mass>2.10</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>0.86</SwayFactor>
-						<Bulk>4.00</Bulk>
-						<WorkToMake>29000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>30</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.68</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>35</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>RNShotCZ</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Honey Badger ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_HoneyBadger_PDW</defName>
-					<statBases>
-						<Mass>2.60</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.05</SwayFactor>
-						<Bulk>6.60</Bulk>
-						<WorkToMake>32000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.72</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>0.8</warmupTime>
-						<range>40</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShotSMG2SD</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== KRISS Vector ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_KrissVector_PDW</defName>
-					<statBases>
-						<Mass>2.70</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>0.89</SwayFactor>
-						<Bulk>4.10</Bulk>
-						<WorkToMake>30500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.60</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>12</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>RNShotSMG2SD</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>13</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== KRISS Vector Contractor ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_KrissVectorContractor_PDW</defName>
-					<statBases>
-						<Mass>3.20</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.1</ShotSpread>
-						<SwayFactor>1.14</SwayFactor>
-						<Bulk>6.06</Bulk>
-						<WorkToMake>32000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.47</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>12</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>RNShotMP7SMG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== MAC-11 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_MAC11_PDW</defName>
-					<statBases>
-						<Mass>1.59</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.69</SwayFactor>
-						<Bulk>2.48</Bulk>
-						<WorkToMake>27500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.50</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_380ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20.9</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>RNShotMAC11SMG</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_380ACP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== MAC-11 SD ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_MAC11SD_PDW</defName>
-					<statBases>
-						<Mass>2.04</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.1</ShotSpread>
-						<SwayFactor>0.96</SwayFactor>
-						<Bulk>4.72</Bulk>
-						<WorkToMake>29000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.33</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_380ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>RNShotSMGSDMAC</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>6</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_380ACP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== MP 40 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_MP40_PDW</defName>
-					<statBases>
-						<Mass>3.97</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<Bulk>6.30</Bulk>
-						<WorkToMake>31000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.27</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>31</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<soundCast>RNShotSMG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== MP5A2 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_MP5A2_PDW</defName>
-					<statBases>
-						<Mass>2.50</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>0.93</SwayFactor>
-						<Bulk>6.80</Bulk>
-						<WorkToMake>27500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.60</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>31</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShotMP5SMG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== MP5SD2 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_MP5A2SD_PDW</defName>
-					<statBases>
-						<Mass>3.10</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.1</ShotSpread>
-						<SwayFactor>1.10</SwayFactor>
-						<Bulk>7.90</Bulk>
-						<WorkToMake>28000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.44</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmParaSD_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>26</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShotSMG2SD</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>1</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmParaSD</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== MP5A3 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_MP5A3_PDW</defName>
-					<statBases>
-						<Mass>3.10</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.01</SwayFactor>
-						<Bulk>5.50</Bulk>
-						<WorkToMake>30500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.44</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>31</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShotMP5SMG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== MP5SD3 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_MP5A3SD_PDW</defName>
-					<statBases>
-						<Mass>2.80</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.1</ShotSpread>
-						<SwayFactor>1.09</SwayFactor>
-						<Bulk>6.70</Bulk>
-						<WorkToMake>29500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>45</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.51</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmParaSD_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>26</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShotSMG2SD</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>1</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmParaSD</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== MP5K-PDW ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_MP5KPDW_PDW</defName>
-					<statBases>
-						<Mass>2.50</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>0.85</SwayFactor>
-						<Bulk>3.68</Bulk>
-						<WorkToMake>29000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>30</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.55</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShotMP5K</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== MP5K-A3 SD ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_MP5KPDWSD_PDW</defName>
-					<statBases>
-						<Mass>2.86</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.1</ShotSpread>
-						<SwayFactor>1.10</SwayFactor>
-						<Bulk>5.76</Bulk>
-						<WorkToMake>30500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.45</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmParaSD_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>18</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShotSMG2SD</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>1</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmParaSD</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== MP7A2 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_MP7_PDW</defName>
-					<statBases>
-						<Mass>1.96</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>0.83</SwayFactor>
-						<Bulk>4.15</Bulk>
-						<WorkToMake>29000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>30</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.42</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_46x30mm_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>31</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShotMP7SMG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_46x30mm</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== MP9 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_MP9_PDW</defName>
-					<statBases>
-						<Mass>1.40</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.66</SwayFactor>
-						<Bulk>3.03</Bulk>
-						<WorkToMake>28500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>25</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.14</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNMP9Shot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== MPX ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_MPX_PDW</defName>
-					<statBases>
-						<Mass>2.70</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>0.88</SwayFactor>
-						<Bulk>4.25</Bulk>
-						<WorkToMake>29500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>35</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.61</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_40SW_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShotMPX</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_40SW</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== P90 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_P90_PDW</defName>
-					<statBases>
-						<Mass>2.60</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>0.77</SwayFactor>
-						<Bulk>5.05</Bulk>
-						<WorkToMake>37000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>30</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.05</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>31</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNP90Shot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_FN57x28mm</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== P90 SD ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_P90SD_PDW</defName>
-					<statBases>
-						<Mass>2.94</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>0.99</SwayFactor>
-						<Bulk>6.96</Bulk>
-						<WorkToMake>38500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>0.99</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>31</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShotSMG2SD</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>6</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_FN57x28mm</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== PP-19 Bizon ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_PP19_PDW</defName>
-					<statBases>
-						<Mass>2.10</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>0.87</SwayFactor>
-						<Bulk>4.25</Bulk>
-						<WorkToMake>28000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>35</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.35</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x18mmMakarov_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNShotSMG_II</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>64</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== PP-2000 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_PP2000_PDW</defName>
-					<statBases>
-						<Mass>1.40</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>0.70</SwayFactor>
-						<Bulk>3.40</Bulk>
-						<WorkToMake>28500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>25</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.62</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RNMP9Shot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== PPSh-41 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_PPSh41_PDW</defName>
-					<statBases>
-						<Mass>3.63</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.21</SwayFactor>
-						<Bulk>9.43</Bulk>
-						<WorkToMake>27500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.22</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>25</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShotAK74USMG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>71</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Skorpion vz. 61 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_SkorpionVZ61_PDW</defName>
-					<statBases>
-						<Mass>1.30</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.65</SwayFactor>
-						<Bulk>2.70</Bulk>
-						<WorkToMake>27500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.57</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_32ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>25</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShotSkorpionVZ</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_32ACP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Skorpion vz. 61 SD ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_SkorpionVZ61SD_PDW</defName>
-					<statBases>
-						<Mass>1.65</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.1</ShotSpread>
-						<SwayFactor>0.91</SwayFactor>
-						<Bulk>4.99</Bulk>
-						<WorkToMake>29000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.39</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_32ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>25</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShotSMG2SD</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>6</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_32ACP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Thompson SMG ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_ThompsonSMG_PDW</defName>
-					<statBases>
-						<Mass>4.90</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.35</SwayFactor>
-						<Bulk>8.60</Bulk>
-						<WorkToMake>27500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.32</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>25</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RNShotMP7SMG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== UMP45 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_UMP45_PDW</defName>
-					<statBases>
-						<Mass>2.50</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>0.94</SwayFactor>
-						<Bulk>4.50</Bulk>
-						<WorkToMake>30500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>30</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.85</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>15</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>RNUMP45Shot</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== UMP45 SD ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_UMP45SD_PDW</defName>
-					<statBases>
-						<Mass>2.98</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.20</SwayFactor>
-						<Bulk>6.63</Bulk>
-						<WorkToMake>32000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.69</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>15</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>RNShotSupressed_III</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>6</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Uzi ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Uzi_PDW</defName>
-					<statBases>
-						<Mass>3.50</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>3.30</SwayFactor>
-						<Bulk>4.70</Bulk>
-						<WorkToMake>29500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>45</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.39</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>31</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>RNShotMAC11SMG</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Uzi SD ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_UziSD_PDW</defName>
-					<statBases>
-						<Mass>4.11</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<Bulk>6.45</Bulk>
-						<WorkToMake>30000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.25</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>31</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>RNShotSMGSDMAC</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>6</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Walther MPL ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_WaltherMPL_PDW</defName>
-					<statBases>
-						<Mass>3.00</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.05</SwayFactor>
-						<Bulk>4.62</Bulk>
-						<WorkToMake>29000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.45</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>31</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<soundCast>RNShotMAC11SMG</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Zastava M92 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_ZastavaM92_PDW</defName>
-					<statBases>
-						<Mass>3.57</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.15</SwayFactor>
-						<Bulk>5.50</Bulk>
-						<WorkToMake>29500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>45</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.74</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>0.9</warmupTime>
-						<range>31</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>RNShot_AK47Rifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNGun_AK74U_PDW" or
-						defName="RNGun_AKMSU_PDW" or
-						defName="RNGun_AKS74U_PDW" or
-						defName="RNGun_CZScorpion_PDW" or
-						defName="RNGun_HoneyBadger_PDW" or
-						defName="RNGun_KrissVector_PDW" or
-						defName="RNGun_KrissVectorContractor_PDW" or
-						defName="RNGun_MAC11_PDW" or
-						defName="RNGun_MAC11SD_PDW" or
-						defName="RNGun_MP40_PDW" or
-						defName="RNGun_MP5A2_PDW" or
-						defName="RNGun_MP5A2SD_PDW" or
-						defName="RNGun_MP5A3_PDW" or
-						defName="RNGun_MP5A3SD_PDW" or
-						defName="RNGun_MP5KPDW_PDW" or
-						defName="RNGun_MP5KPDWSD_PDW" or
-						defName="RNGun_MP7_PDW" or
-						defName="RNGun_MP9_PDW" or
-						defName="RNGun_MPX_PDW" or
-						defName="RNGun_P90_PDW" or
-						defName="RNGun_P90SD_PDW" or
-						defName="RNGun_PP19_PDW" or
-						defName="RNGun_PP2000_PDW" or
-						defName="RNGun_PPSh41_PDW" or
-						defName="RNGun_SkorpionVZ61_PDW" or
-						defName="RNGun_SkorpionVZ61SD_PDW" or
-						defName="RNGun_ThompsonSMG_PDW" or
-						defName="RNGun_UMP45_PDW" or
-						defName="RNGun_UMP45SD_PDW" or
-						defName="RNGun_Uzi_PDW" or
-						defName="RNGun_UziSD_PDW" or
-						defName="RNGun_WaltherMPL_PDW" or
-						defName="RNGun_ZastavaM92_PDW"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_Shotguns.xml b/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_Shotguns.xml
deleted file mode 100644
index e605384fce..0000000000
--- a/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_Shotguns.xml	
+++ /dev/null
@@ -1,932 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Rimmu-Nation - Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== AA12 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_AA12S</defName>
-					<statBases>
-						<Mass>5.20</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.49</SwayFactor>
-						<Bulk>10.66</Bulk>
-						<WorkToMake>32000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>15</Chemfuel>
-						<Steel>55</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.26</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-						<soundCast>RNShotAutoShotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== KS-23 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_KS23S</defName>
-					<statBases>
-						<Mass>3.85</Mass>
-						<RangedWeapon_Cooldown>1.02</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.43</SwayFactor>
-						<Bulk>10.40</Bulk>
-						<WorkToMake>12000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Chemfuel>5</Chemfuel>
-						<Steel>55</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_23x75mmR_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>RNShotPumpShot</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>4</magazineSize>
-						<reloadTime>3.4</reloadTime>
-						<ammoSet>AmmoSet_23x75mmR</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Kel-Tec KSG ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_KSGS</defName>
-					<statBases>
-						<Mass>6.90</Mass>
-						<RangedWeapon_Cooldown>0.97</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.35</SwayFactor>
-						<Bulk>6.60</Bulk>
-						<WorkToMake>17000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>RNShotPumpShot</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>13.25</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== M1014 / Benelli M4 Super 90 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_M1014S</defName>
-					<statBases>
-						<Mass>3.82</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>6.82</Bulk>
-						<WorkToMake>18000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShotM1014S</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>6.8</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Model 1887 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Model1887LA</defName>
-					<statBases>
-						<Mass>3.60</Mass>
-						<RangedWeapon_Cooldown>0.79</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.36</SwayFactor>
-						<Bulk>9.97</Bulk>
-						<WorkToMake>10000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>RNShotModel1887LA</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>5.1</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Model 1897 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Model1897S</defName>
-					<statBases>
-						<Mass>3.60</Mass>
-						<RangedWeapon_Cooldown>0.99</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.36</SwayFactor>
-						<Bulk>10.00</Bulk>
-						<WorkToMake>10000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShotPumpShot</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.25</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Mossberg 500 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Mossberg500S</defName>
-					<statBases>
-						<Mass>3.40</Mass>
-						<RangedWeapon_Cooldown>1.00</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.55</SwayFactor>
-						<Bulk>12.07</Bulk>
-						<WorkToMake>11500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>60</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RN870Shot</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>5.1</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Mossberg 500 Tactical ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Mossberg500TacticalS</defName>
-					<statBases>
-						<Mass>3.06</Mass>
-						<RangedWeapon_Cooldown>1.00</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<Bulk>8.35</Bulk>
-						<WorkToMake>16500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>12</range>
-						<soundCast>RN870Shot</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>5.1</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Remington 870 Magnum ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Remington870MagnumS</defName>
-					<statBases>
-						<Mass>3.40</Mass>
-						<RangedWeapon_Cooldown>1.00</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>9.78</Bulk>
-						<WorkToMake>12500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RN870Shot</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>5.1</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Remington 870 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Remington870S</defName>
-					<statBases>
-						<Mass>2.54</Mass>
-						<RangedWeapon_Cooldown>1.02</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>0.92</SwayFactor>
-						<Bulk>6.68</Bulk>
-						<WorkToMake>10000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RN870Shot</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.25</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Remington 870 Tactical ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Remington870TacticalS</defName>
-					<statBases>
-						<Mass>2.72</Mass>
-						<RangedWeapon_Cooldown>1.02</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.12</SwayFactor>
-						<Bulk>7.67</Bulk>
-						<WorkToMake>16000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>12</range>
-						<soundCast>RN870Shot</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>5.1</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Saiga-12 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Saiga12S</defName>
-					<statBases>
-						<Mass>3.50</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.26</SwayFactor>
-						<Bulk>9.10</Bulk>
-						<WorkToMake>20500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>RNShotSAIGA</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Sawed-Off Shotgun ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_SawedOff</defName>
-					<statBases>
-						<Mass>1.90</Mass>
-						<RangedWeapon_Cooldown>0.93</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>2.73</SwayFactor>
-						<Bulk>6.29</Bulk>
-						<WorkToMake>8500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>40</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>11</range>
-						<soundCast>RNShotSawnOff</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>2</magazineSize>
-						<reloadTime>1.7</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== SPAS-12 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_SPAS12S</defName>
-					<statBases>
-						<Mass>4.40</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.48</SwayFactor>
-						<Bulk>8.20</Bulk>
-						<WorkToMake>18500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>55</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShotSPAS</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>9</magazineSize>
-						<reloadTime>7.65</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Supernova ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_Supernova</defName>
-					<statBases>
-						<Mass>3.45</Mass>
-						<RangedWeapon_Cooldown>0.99</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.36</SwayFactor>
-						<Bulk>10.16</Bulk>
-						<WorkToMake>12500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>50</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNNovaShot</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.25</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Super-Shorty / Mossberg Maverick 88 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_SuperShorty</defName>
-					<statBases>
-						<Mass>1.80</Mass>
-						<RangedWeapon_Cooldown>1.03</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>0.60</SwayFactor>
-						<Bulk>4.19</Bulk>
-						<WorkToMake>8500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>30</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RNShortShot</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>3</magazineSize>
-						<reloadTime>2.55</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== USAS-12 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_USAS12S</defName>
-					<statBases>
-						<Mass>5.45</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.51</SwayFactor>
-						<Bulk>9.60</Bulk>
-						<WorkToMake>30500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>55</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.36</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>11</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<soundCast>RNShotUSAS</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== UTAS UTS-15 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNGun_UTS15S</defName>
-					<statBases>
-						<Mass>3.10</Mass>
-						<RangedWeapon_Cooldown>1.00</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.03</SwayFactor>
-						<Bulk>7.20</Bulk>
-						<WorkToMake>15500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>RNShotPumpShot</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>13.25</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<!-- shotguns with stocks -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNGun_AA12S" or
-						defName="RNGun_KS23S" or
-						defName="RNGun_KSGS" or
-						defName="RNGun_M1014S" or
-						defName="RNGun_Mossberg500S" or
-						defName="RNGun_Mossberg500TacticalS" or
-						defName="RNGun_Remington870MagnumS" or
-						defName="RNGun_Remington870TacticalS" or
-						defName="RNGun_Saiga12S" or
-						defName="RNGun_SPAS12S" or
-						defName="RNGun_Supernova" or
-						defName="RNGun_USAS12S" or
-						defName="RNGun_UTS15S"
-						]/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>
-				</li>
-
-				<!-- shotguns without stocks -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNGun_Model1887LA" or
-						defName="RNGun_Model1897S" or
-						defName="RNGun_Remington870S" or
-						defName="RNGun_SawedOff" or
-						defName="RNGun_SuperShorty"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_Spacer.xml b/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_Spacer.xml
deleted file mode 100644
index 99915b371b..0000000000
--- a/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_Spacer.xml	
+++ /dev/null
@@ -1,395 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Rimmu-Nation - Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Auger Mk II ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNSci_AugerMkII</defName>
-					<statBases>
-
-						<SightsEfficiency>1.05</SightsEfficiency>
-						<ShotSpread>0.065</ShotSpread>
-						<SwayFactor>1.2</SwayFactor>
-						<Bulk>8.07</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.13</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>30.9</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<soundCast>RNAugerMkIIShot</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>2.40</reloadTime>
-						<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Auger WS ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNSci_AugerWS</defName>
-					<statBases>
-
-						<SightsEfficiency>1.05</SightsEfficiency>
-						<ShotSpread>0.065</ShotSpread>
-						<SwayFactor>1.2</SwayFactor>
-						<Bulk>8.07</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.13</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>30.9</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<soundCast>RNAugerShot</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>2.40</reloadTime>
-						<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== BM001 Razor ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNSci_BM001Razor</defName>
-					<statBases>
-
-						<SightsEfficiency>1.05</SightsEfficiency>
-						<ShotSpread>0.065</ShotSpread>
-						<SwayFactor>1.2</SwayFactor>
-						<Bulk>8.07</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.03</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
-						<warmupTime>0.9</warmupTime>
-						<range>30.9</range>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<soundCast>RNRazorShot</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>2.40</reloadTime>
-						<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== BM003 Razor ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNSci_BM003Razor</defName>
-					<statBases>
-
-						<SightsEfficiency>1.05</SightsEfficiency>
-						<ShotSpread>0.065</ShotSpread>
-						<SwayFactor>1.2</SwayFactor>
-						<Bulk>8.07</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.03</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
-						<warmupTime>0.9</warmupTime>
-						<range>35.9</range>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<soundCast>RNBlueDeathShot</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>2.40</reloadTime>
-						<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Bullseye Mk I ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNSci_BullseyeMkI</defName>
-					<statBases>
-
-						<SightsEfficiency>1.05</SightsEfficiency>
-						<ShotSpread>0.065</ShotSpread>
-						<SwayFactor>1.2</SwayFactor>
-						<Bulk>8.07</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.03</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
-						<warmupTime>0.9</warmupTime>
-						<range>35.9</range>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<soundCast>RNRazorShot</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>2.40</reloadTime>
-						<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Bullseye Mk II ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNSci_BullseyeMkII</defName>
-					<statBases>
-
-						<SightsEfficiency>1.05</SightsEfficiency>
-						<ShotSpread>0.065</ShotSpread>
-						<SwayFactor>1.2</SwayFactor>
-						<Bulk>8.07</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.03</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
-						<warmupTime>0.9</warmupTime>
-						<range>35.9</range>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<soundCast>RNBlueDeathShot</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>2.40</reloadTime>
-						<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Longbow 1S-1K ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNSci_Longbow1S1K</defName>
-					<statBases>
-
-						<SightsEfficiency>1.45</SightsEfficiency>
-						<ShotSpread>0.025</ShotSpread>
-						<SwayFactor>1.0</SwayFactor>
-						<Bulk>11.07</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12x64mmCharged</defaultProjectile>
-						<warmupTime>0.9</warmupTime>
-						<range>40.9</range>
-						<burstShotCount>1</burstShotCount>
-						<ticksBetweenBurstShots>22</ticksBetweenBurstShots>
-						<soundCast>RNLongbowShot</soundCast>
-						<soundAiming>RNLongbowCharge</soundAiming>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>2.40</reloadTime>
-						<ammoSet>AmmoSet_12x64mmCharged</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-				</li>
-
-				<!-- ========== Railgun ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RNSci_Railgun</defName>
-					<statBases>
-						<SightsEfficiency>1.45</SightsEfficiency>
-						<ShotSpread>0.025</ShotSpread>
-						<SwayFactor>1.0</SwayFactor>
-						<Bulk>11.07</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
-						<warmupTime>2.2</warmupTime>
-						<range>40.9</range>
-						<burstShotCount>1</burstShotCount>
-						<ticksBetweenBurstShots>22</ticksBetweenBurstShots>
-						<soundCast>RNRailgunShot</soundCast>
-						<soundAiming>RNLongbowCharge</soundAiming>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>2.40</reloadTime>
-						<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="RNSci_AugerMkII" or
-						defName="RNSci_AugerWS" or
-						defName="RNSci_BM001Razor" or
-						defName="RNSci_BM003Razor" or
-						defName="RNSci_BullseyeMkI" or
-						defName="RNSci_BullseyeMkII" or
-						defName="RNSci_Longbow1S1K" or
-						defName="RNSci_Railgun"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedSpecial_AirSupport.xml b/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedSpecial_AirSupport.xml
deleted file mode 100644
index 33778035a1..0000000000
--- a/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedSpecial_AirSupport.xml	
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Rimmu-Nation - Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Patch EMP to use CE EMP projectile defs ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RNAir_EMPBlast"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<damageDef>EMP</damageDef>
-							<damageAmountBase>9001</damageAmountBase>
-							<explosionRadius>15.9</explosionRadius>
-							<flyOverhead>true</flyOverhead>
-							<preExplosionSpawnThingDef>Spark</preExplosionSpawnThingDef>
-							<speed>70</speed>
-						</projectile>
-					</value>
-				</li>
-
-				<!-- ========== All other air support defs do not require CE patches ========== -->
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_Ranged_Misc.xml b/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_Ranged_Misc.xml
deleted file mode 100644
index 0de9789d29..0000000000
--- a/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_Ranged_Misc.xml	
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[CP] Rimmu-Nation - Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Ballistic Knife ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RN_BallisticKnife</defName>
-					<statBases>
-						<Mass>0.560</Mass>
-						<RangedWeapon_Cooldown>1.07</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>0.85</SwayFactor>
-						<Bulk>1.00</Bulk>
-						<WorkToMake>3000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_BallisticKnifeBlade</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>3</range>
-						<burstShotCount>1</burstShotCount>
-						<ticksBetweenBurstShots>0</ticksBetweenBurstShots>
-						<soundCast>RNShotBallistic</soundCast>
-						<muzzleFlashScale>0</muzzleFlashScale>
-					</Properties>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RN_BallisticKnife"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.18</cooldownTime>
-								<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.32</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.26</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.42</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RN_BallisticKnife"]/statBases</xpath>
-					<value>
-						<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RN_BallisticKnife"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.5</MeleeCritChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-							<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- ========== Compound Bow ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RN_CompoundBow</defName>
-					<statBases>
-						<SightsEfficiency>0.95</SightsEfficiency>
-						<ShotSpread>1</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>3</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_StreamlinedArrow_Steel</defaultProjectile>
-						<warmupTime>1.25</warmupTime>
-						<range>24</range>
-						<soundCast>Bow_Recurve</soundCast>
-					</Properties>
-					<AmmoUser>
-						<ammoSet>AmmoSet_StreamlinedArrow</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RN_CompoundBow"]/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>
-
-				<!-- ========== Compound Crossbow ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RN_CompoundCrossbow</defName>
-					<statBases>
-						<SightsEfficiency>0.95</SightsEfficiency>
-						<ShotSpread>1</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>3</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_CrossbowBolt_Steel</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>26</range>
-						<soundCast>RNCrossbow</soundCast>
-					</Properties>
-					<AmmoUser>
-						<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<!-- No additional CE weaponTags needed -->
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RN_CompoundCrossbow"]/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>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal - Spacer Faction Pack/Apparel_Spacer_CE.xml b/Patches/Rimsenal - Spacer Faction Pack/Apparel_Spacer_CE.xml
deleted file mode 100644
index 0e014c6b3e..0000000000
--- a/Patches/Rimsenal - Spacer Faction Pack/Apparel_Spacer_CE.xml	
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Spacer Faction Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==========  Unisuit =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_Unisuit"]/statBases</xpath>
-					<value>
-						<Bulk>0</Bulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Unisuit"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_Unisuit"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Apparel_Unisuit"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.625</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.625</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ==========  Smart Visor =========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SmartVisor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.01</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_SmartVisor"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency_Apparel>0.80</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SmartVisor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.01</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_SmartVisor"]/costList</xpath>
-					<attribute>Inherit</attribute>
-					<value>false</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SmartVisor"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets Inherit="False">
-							<AimingAccuracy>0.3</AimingAccuracy>
-							<AimingDelayFactor>-0.25</AimingDelayFactor>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_SmartVisor"]/apparel</xpath>
-					<value>
-						<layers Inherit="False">
-							<li>StrappedHead</li>
-						</layers>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
-			
-			
\ No newline at end of file
diff --git a/Patches/Rimsenal - Spacer Faction Pack/Explosives_Smart_CE.xml b/Patches/Rimsenal - Spacer Faction Pack/Explosives_Smart_CE.xml
deleted file mode 100644
index 78d9352a2d..0000000000
--- a/Patches/Rimsenal - Spacer Faction Pack/Explosives_Smart_CE.xml	
+++ /dev/null
@@ -1,247 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Spacer Faction Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Remove Recipe Maker & Verbs ========== -->
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="Weapon_GrenadeSmart"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>BaseWeapon</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Weapon_GrenadeSmart"]/smeltable</xpath>
-					<value>
-						<smeltable>false</smeltable>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Weapon_GrenadeSmart"]/recipeMaker </xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Weapon_GrenadeSmart"]/costList </xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Weapon_GrenadeSmart"]/verbs </xpath>
-				</li>
-
-				<!-- ========== Projectile ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Proj_GrenadeSmart"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>1.5</explosionRadius>
-							<damageDef>Bomb</damageDef>
-							<damageAmountBase>56</damageAmountBase>
-							<explosionDelay>60</explosionDelay>
-							<dropsCasings>true</dropsCasings>
-							<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-							<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							<speed>12</speed>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
-						</projectile>
-					</value>
-				</li>
-
-				<!-- ========== Check Comp ========== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Proj_GrenadeSmart"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Proj_GrenadeSmart"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<!-- ========== Add Fragmentation ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Proj_GrenadeSmart"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>40</Fragment_Small>
-							</fragments>
-						</li>
-					</value>
-				</li>
-
-				<!-- Weapon Stack and Appearance -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Weapon_GrenadeSmart"]/graphicData </xpath>
-					<value>
-						<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Weapon_GrenadeSmart"] </xpath>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<stackLimit>75</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="Weapon_GrenadeSmart"] </xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<!-- Weapon Check Comps -->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Weapon_GrenadeSmart"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Weapon_GrenadeSmart"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<!-- Weapon Values -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Weapon_GrenadeSmart"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>40</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>1.5</explosiveRadius>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>20</Fragment_Small>
-							</fragments>
-						</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Weapon_GrenadeSmart</defName>
-					<statBases>
-						<Mass>0.4</Mass>
-						<Bulk>0.87</Bulk>
-						<MarketValue>15.22</MarketValue>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>10</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<label>throw frag grenade</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<range>14.0</range>
-						<minRange>4</minRange>
-						<warmupTime>0.8</warmupTime>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<soundCast>ThrowGrenade</soundCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<defaultProjectile>Proj_GrenadeSmart</defaultProjectile>
-						<onlyManualCast>true</onlyManualCast>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-						<ai_AvoidFriendlyFireRadius>7</ai_AvoidFriendlyFireRadius>
-					</Properties>
-					<weaponTags>
-						<li>CE_AI_Grenade</li>
-						<li>CE_AI_AOE</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Weapon_GrenadeSmart"]/graphicData</xpath>
-					<value>
-						<graphicData>
-							<texPath>Things/Projectile/SmartGrenade</texPath>
-							<graphicClass>Graphic_Single</graphicClass>
-							<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
-						</graphicData>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- YP BaegYa Microwave Grenades -->
-						<RecipeDef ParentName="RSExplosive_RecipeBase">
-
-							<defName>Craft_10_Smartgrenade</defName>
-							<label>Craft 10 smart grenades</label>
-							<description>Craft 10 smart grenades.</description>
-							<jobString>Crafting smart grenades</jobString>
-							<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-							<effectWorking>Cook</effectWorking>
-							<soundWorking>Recipe_Smith</soundWorking>
-							<workSkill>Crafting</workSkill>
-							<unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Plasteel</li>
-									<li>SubcoreBasic</li>
-									<li>FSX</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>SubcoreBasic</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>5</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<researchPrerequisite>SmartWeapons</researchPrerequisite>
-							<skillRequirements>
-								<Crafting>7</Crafting>
-							</skillRequirements>
-							<products>
-								<Weapon_GrenadeSmart>10</Weapon_GrenadeSmart>
-							</products>
-							<workAmount>20000</workAmount>
-							<recipeUsers>
-								<li>FabricationBench</li>
-							</recipeUsers>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal - Spacer Faction Pack/Mechs_Body_CE.xml b/Patches/Rimsenal - Spacer Faction Pack/Mechs_Body_CE.xml
deleted file mode 100644
index ef3fc3e682..0000000000
--- a/Patches/Rimsenal - Spacer Faction Pack/Mechs_Body_CE.xml	
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Spacer Faction Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!--Natural Armor-->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Tagmaton" or defName="Omniservant"]//*[
-						def="MechanicalThorax" or
-						def="MechanicalNeck" or
-						def="MechanicalShoulder" or
-						def="MechanicalArm" or
-						def="MechanicalHand" or
-						def="MechanicalLeg" or
-						def="MechanicalFoot"
-						]
-					</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="Tagmaton" or defName="Omniservant"]//*[
-						def="MechanicalFinger" or
-						def="MechanicalHead"
-						]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal - Spacer Faction Pack/Mechs_Smart_CE.xml b/Patches/Rimsenal - Spacer Faction Pack/Mechs_Smart_CE.xml
deleted file mode 100644
index 56ea279d4b..0000000000
--- a/Patches/Rimsenal - Spacer Faction Pack/Mechs_Smart_CE.xml	
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Spacer Faction Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== Tagma =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="BaseMechanoidTagma"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>7</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="BaseMechanoidTagma"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>15</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mech_Tagmaton"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.1</chanceFactor>
-								<armorPenetrationBlunt>0.7</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Omniservant =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RSMechanoid"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RSMechanoid"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="RSMechanoid"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.1</chanceFactor>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Borer =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mech_Borer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>drill</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Stab</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.5</cooldownTime>
-								<armorPenetrationSharp>0.85</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Psiloid =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mech_Psiloid"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>3.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mech_Psiloid"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal - Spacer Faction Pack/Weapons_Smart_CE.xml b/Patches/Rimsenal - Spacer Faction Pack/Weapons_Smart_CE.xml
deleted file mode 100644
index 5f6d149cba..0000000000
--- a/Patches/Rimsenal - Spacer Faction Pack/Weapons_Smart_CE.xml	
+++ /dev/null
@@ -1,842 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Spacer Faction Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Melee Tools =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Gun_SmartRevolver" or
-						defName="Gun_SmartAutoPistol" or
-						defName="Gun_SmartMachinePistol"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Gun_SmartBoltActionRifle" or
-						defName="Gun_SmartPumpShotgun" or
-						defName="Gun_SmartChainShotgun" or
-						defName="Gun_SmartHeavySMG" or
-						defName="Gun_SmartLMG" or
-						defName="Gun_SmartAssaultRifle" or
-						defName="Gun_SniperRifleSmart" or
-						defName="Gun_SmartChargeRifle" or
-						defName="Gun_SmartChargeLance"]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_SmartMinigun"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrels</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2.44</cooldownTime>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrels</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Stats =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="Gun_SmartRevolver" or
-						defName="Gun_SmartAutoPistol" or
-						defName="Gun_SmartMachinePistol" or
-						defName="Gun_SmartBoltActionRifle" or
-						defName="Gun_SmartPumpShotgun" or
-						defName="Gun_SmartChainShotgun" or
-						defName="Gun_SmartHeavySMG" or
-						defName="Gun_SmartLMG" or
-						defName="Gun_SmartAssaultRifle" or
-						defName="Gun_SniperRifleSmart" or
-						defName="Gun_SmartChargeRifle" or
-						defName="Gun_SmartChargeLance" or
-						defName="Gun_SmartMinigun"
-						]/statBases </xpath>
-					<value>
-						<NightVisionEfficiency_Weapon>0.50</NightVisionEfficiency_Weapon>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="Gun_SmartRevolver" or
-						defName="Gun_SmartAutoPistol" or
-						defName="Gun_SmartMachinePistol" or
-						defName="Gun_SmartBoltActionRifle" or
-						defName="Gun_SmartPumpShotgun" or
-						defName="Gun_SmartChainShotgun" or
-						defName="Gun_SmartHeavySMG" or
-						defName="Gun_SmartLMG" or
-						defName="Gun_SmartAssaultRifle" or
-						defName="Gun_SniperRifleSmart" or
-						defName="Gun_SmartChargeRifle" or
-						defName="Gun_SmartChargeLance" or
-						defName="Gun_SmartMinigun"
-						]/equippedStatOffsets </xpath>
-					<value>
-						<AimingAccuracy>0.5</AimingAccuracy>
-					</value>
-				</li>
-
-				<!-- ========== Smart Revolver =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SmartRevolver</defName>
-					<statBases>
-						<SightsEfficiency>0.9</SightsEfficiency>
-						<ShotSpread>0.135</ShotSpread><!--25% reduction-->
-						<SwayFactor>0.635</SwayFactor><!--25% reduction-->
-						<Bulk>2.41</Bulk>
-						<Mass>1.39</Mass>
-						<RangedWeapon_Cooldown>0.51</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.76</recoilAmount><!--50% reduction-->
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_44Magnum_HV_FMJ</defaultProjectile>
-						<warmupTime>0.4</warmupTime>
-						<range>23</range>
-						<soundCast>Shot_Revolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>3.6</reloadTime>
-						<ammoSet>AmmoSet_44Magnum_HV</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>AdvancedGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Smart Pistol =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SmartAutoPistol</defName>
-					<statBases>
-						<SightsEfficiency>0.9</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>0.80</SwayFactor>
-						<Bulk>2.10</Bulk>
-						<Mass>1.11</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.89</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
-						<warmupTime>0.4</warmupTime>
-						<range>23</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>14</magazineSize>
-						<reloadTime>3.0</reloadTime>
-						<ammoSet>AmmoSet_FN57x28mm</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>AdvancedGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Smart Bolt Action =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SmartBoltActionRifle</defName>
-					<statBases>
-						<SightsEfficiency>1.2</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1.26</SwayFactor>
-						<Bulk>9.50</Bulk>
-						<Mass>4.19</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.97</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_277Fury_FMJ</defaultProjectile>
-						<warmupTime>0.9</warmupTime>
-						<range>68</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>3.0</reloadTime>
-						<ammoSet>AmmoSet_277Fury</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>AdvancedGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Smart MP =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SmartMachinePistol</defName>
-					<statBases>
-						<SightsEfficiency>0.9</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.45</SwayFactor>
-						<Bulk>2.95</Bulk>
-						<Mass>2.84</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.57</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
-						<warmupTime>0.4</warmupTime>
-						<range>21</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>3.0</reloadTime>
-						<ammoSet>AmmoSet_FN57x28mm</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>AdvancedGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Smart Pump =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SmartPumpShotgun</defName>
-					<statBases>
-						<SightsEfficiency>1.2</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>0.90</SwayFactor>
-						<Bulk>9.00</Bulk>
-						<Mass>3.00</Mass>
-						<RangedWeapon_Cooldown>1.00</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.58</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.4</warmupTime>
-						<range>18</range>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>0.45</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>AdvancedGun</li>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Smart Chain =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SmartChainShotgun</defName>
-					<statBases>
-						<SightsEfficiency>1.2</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>0.95</SwayFactor>
-						<Bulk>6.70</Bulk>
-						<Mass>3.50</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.46</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.4</warmupTime>
-						<range>18</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>9</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>AdvancedGun</li>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Smart SMG =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SmartHeavySMG</defName>
-					<statBases>
-						<SightsEfficiency>1.2</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>0.71</SwayFactor>
-						<Bulk>4.50</Bulk>
-						<Mass>2.5</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.58</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
-						<warmupTime>0.4</warmupTime>
-						<range>31</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>3.0</reloadTime>
-						<ammoSet>AmmoSet_FN57x28mm</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>AdvancedGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Smart MG =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SmartLMG</defName>
-					<statBases>
-						<SightsEfficiency>1.2</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.60</SwayFactor>
-						<Bulk>12.90</Bulk>
-						<Mass>8.70</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.66</recoilAmount><!--Halved from 1.33-->
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_277Fury_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>68</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>5.1</reloadTime>
-						<ammoSet>AmmoSet_277Fury</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_MachineGun</li>
-						<li>CE_AI_Suppressive</li>
-						<li>AdvancedGun</li>
-						<li>Bipod_LMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Smart Rifle =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SmartAssaultRifle</defName>
-					<statBases>
-						<WorkToMake>39500</WorkToMake>
-						<SightsEfficiency>1.20</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.00</SwayFactor>
-						<Bulk>9.00</Bulk>
-						<Mass>3.40</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.11</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_277Fury_FMJ</defaultProjectile>
-						<warmupTime>0.9</warmupTime>
-						<range>62</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>3.0</reloadTime>
-						<ammoSet>AmmoSet_277Fury</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Rifle</li>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>AdvancedGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Smart Sniper Rifle =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SniperRifleSmart</defName>
-					<statBases>
-						<SightsEfficiency>4</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>0.98</SwayFactor>
-						<Bulk>11.92</Bulk>
-						<Mass>6.8</Mass>
-						<RangedWeapon_Cooldown>1.38</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>86</range>
-						<soundCast>Shot_SniperRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>3.0</reloadTime>
-						<ammoSet>AmmoSet_338Lapua</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Rifle</li>
-						<li>AdvancedGun</li>
-						<li>Bipod_DMR</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Minigun =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SmartMinigun</defName>
-					<statBases>
-						<SightsEfficiency>1.20</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>2.42</SwayFactor>
-						<Bulk>8.02</Bulk>
-						<Mass>20.00</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.49</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_277Fury_FMJ</defaultProjectile>
-						<warmupTime>1.9</warmupTime>
-						<range>68</range>
-						<burstShotCount>50</burstShotCount>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>250</magazineSize>
-						<reloadTime>7.1</reloadTime>
-						<ammoSet>AmmoSet_277Fury</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>25</aimedBurstShotCount>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Suppressive</li>
-						<li>AdvancedGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Smart Rifle (Charge) =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SmartChargeRifle</defName>
-					<statBases>
-						<SightsEfficiency>1.20</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>0.90</SwayFactor>
-						<Bulk>7.00</Bulk>
-						<Mass>3.00</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.73</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
-						<warmupTime>0.9</warmupTime>
-						<range>62</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>3.0</reloadTime>
-						<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AR</li>
-						<li>CE_Rifle</li>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>AdvancedGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Smart Lance (Charge Sniper) =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SmartChargeLance</defName>
-					<statBases>
-						<SightsEfficiency>1.2</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.43</SwayFactor>
-						<Bulk>12.00</Bulk>
-						<Mass>8.00</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.75</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8x50mmCharged</defaultProjectile>
-						<warmupTime>0.95</warmupTime>
-						<range>75</range>
-						<soundCast>ChargeLance_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>3.0</reloadTime>
-						<ammoSet>AmmoSet_8x50mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Rifle</li>
-						<li>AdvancedGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Slug Spitter =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SlugSpitter</defName>
-					<statBases>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>0.88</SwayFactor>
-						<Bulk>13.00</Bulk>
-						<Mass>8.00</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.89</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_5x100mmCaseless_Sabot_LV</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>44</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>24</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_5x100mmCaseless_LV</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AR</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Gun_SlugSpitterBase"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>bayonet</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.38</cooldownTime>
-								<armorPenetrationBlunt>1.15</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.50</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Smart Sword =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_SmartSword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.69</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.80</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>47</power>
-								<cooldownTime>1.17</cooldownTime>
-								<armorPenetrationBlunt>4.06</armorPenetrationBlunt>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>1.05</cooldownTime>
-								<armorPenetrationBlunt>2.048</armorPenetrationBlunt>
-								<armorPenetrationSharp>16</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_SmartSword"]/statBases</xpath>
-					<value>
-						<MeleeCounterParryBonus>1.5</MeleeCounterParryBonus>
-						<Bulk>8.5</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_SmartSword"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeCritChance>1.1</MeleeCritChance>
-						<MeleeParryChance>0.7</MeleeParryChance>
-						<MeleeDodgeChance>0.6</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<!-- ========== Stun Prod =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_StunProd"]/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>head</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Stun</def>
-										<amount>8</amount>
-										<chance>0.50</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>1.68</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>3.375</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_StunProd"]/statBases</xpath>
-					<value>
-						<MeleeCounterParryBonus>0.9</MeleeCounterParryBonus>
-						<Bulk>5</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_StunProd"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.17</MeleeCritChance>
-							<MeleeParryChance>0.9</MeleeParryChance>
-							<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Core/Ammo_GD.xml b/Patches/Rimsenal Collection/Core/Ammo_GD.xml
deleted file mode 100644
index 3f192f8775..0000000000
--- a/Patches/Rimsenal Collection/Core/Ammo_GD.xml	
+++ /dev/null
@@ -1,210 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ==================== Pistol - AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_473x33mmCaseless_GDPistol</defName>
-							<label>4.73x33mm Caseless</label>
-							<ammoTypes>
-								<Ammo_473x33mmCaseless_FMJ>Bullet_473x33mmGDPistol_FMJ</Ammo_473x33mmCaseless_FMJ>
-								<Ammo_473x33mmCaseless_AP>Bullet_473x33mmGDPistol_AP</Ammo_473x33mmCaseless_AP>
-								<Ammo_473x33mmCaseless_HP>Bullet_473x33mmGDPistol_HP</Ammo_473x33mmCaseless_HP>
-								<Ammo_473x33mmCaseless_Incendiary>Bullet_473x33mmGDPistol_Incendiary</Ammo_473x33mmCaseless_Incendiary>
-								<Ammo_473x33mmCaseless_HE>Bullet_473x33mmGDPistol_HE</Ammo_473x33mmCaseless_HE>
-								<Ammo_473x33mmCaseless_Sabot>Bullet_473x33mmGDPistol_Sabot</Ammo_473x33mmCaseless_Sabot>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="Base473x33mmCaselessBullet">
-							<defName>Bullet_473x33mmGDPistol_FMJ</defName>
-							<label>4.73mm Caseless bullet (FMJ)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>10</damageAmountBase>
-								<armorPenetrationSharp>5</armorPenetrationSharp>
-								<armorPenetrationBlunt>14.06</armorPenetrationBlunt>
-								<speed>129</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base473x33mmCaselessBullet">
-							<defName>Bullet_473x33mmGDPistol_AP</defName>
-							<label>4.73mm Caseless bullet (AP)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>6</damageAmountBase>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<armorPenetrationBlunt>14.06</armorPenetrationBlunt>
-								<speed>129</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base473x33mmCaselessBullet">
-							<defName>Bullet_473x33mmGDPistol_HP</defName>
-							<label>4.73mm Caseless bullet (HP)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>14.06</armorPenetrationBlunt>
-								<speed>129</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base473x33mmCaselessBullet">
-							<defName>Bullet_473x33mmGDPistol_Incendiary</defName>
-							<label>4.73mm Caseless bullet (AP-I)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>6</damageAmountBase>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>14.06</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>4</amount>
-									</li>
-								</secondaryDamage>
-								<speed>129</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base473x33mmCaselessBullet">
-							<defName>Bullet_473x33mmGDPistol_HE</defName>
-							<label>4.73mm Caseless bullet (HE)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>10</damageAmountBase>
-								<armorPenetrationSharp>5</armorPenetrationSharp>
-								<armorPenetrationBlunt>14.06</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>6</amount>
-									</li>
-								</secondaryDamage>
-								<speed>129</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base473x33mmCaselessBullet">
-							<defName>Bullet_473x33mmGDPistol_Sabot</defName>
-							<label>4.73mm Caseless bullet (Sabot)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>5</damageAmountBase>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<armorPenetrationBlunt>18.06</armorPenetrationBlunt>
-								<speed>175</speed>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== Hybrid - AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_473x33mmCaseless_GDHybrid</defName>
-							<label>4.73x33mm Caseless</label>
-							<ammoTypes>
-								<Ammo_473x33mmCaseless_FMJ>Bullet_473x33mmGDHybrid_FMJ</Ammo_473x33mmCaseless_FMJ>
-								<Ammo_473x33mmCaseless_AP>Bullet_473x33mmGDHybrid_AP</Ammo_473x33mmCaseless_AP>
-								<Ammo_473x33mmCaseless_HP>Bullet_473x33mmGDHybrid_HP</Ammo_473x33mmCaseless_HP>
-								<Ammo_473x33mmCaseless_Incendiary>Bullet_473x33mmGDHybrid_Incendiary</Ammo_473x33mmCaseless_Incendiary>
-								<Ammo_473x33mmCaseless_HE>Bullet_473x33mmGDHybrid_HE</Ammo_473x33mmCaseless_HE>
-								<Ammo_473x33mmCaseless_Sabot>Bullet_473x33mmGDHybrid_Sabot</Ammo_473x33mmCaseless_Sabot>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="Base473x33mmCaselessBullet">
-							<defName>Bullet_473x33mmGDHybrid_FMJ</defName>
-							<label>4.73mm Caseless bullet (FMJ)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>15</damageAmountBase>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<armorPenetrationBlunt>47.96</armorPenetrationBlunt>
-								<speed>129</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base473x33mmCaselessBullet">
-							<defName>Bullet_473x33mmGDHybrid_AP</defName>
-							<label>4.73mm Caseless bullet (AP)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>9</damageAmountBase>
-								<armorPenetrationSharp>16</armorPenetrationSharp>
-								<armorPenetrationBlunt>47.96</armorPenetrationBlunt>
-								<speed>129</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base473x33mmCaselessBullet">
-							<defName>Bullet_473x33mmGDHybrid_HP</defName>
-							<label>4.73mm Caseless bullet (HP)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>19</damageAmountBase>
-								<armorPenetrationSharp>5</armorPenetrationSharp>
-								<armorPenetrationBlunt>47.96</armorPenetrationBlunt>
-								<speed>129</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base473x33mmCaselessBullet">
-							<defName>Bullet_473x33mmGDHybrid_Incendiary</defName>
-							<label>4.73mm Caseless bullet (AP-I)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>9</damageAmountBase>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<armorPenetrationBlunt>47.96</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>6</amount>
-									</li>
-								</secondaryDamage>
-								<speed>129</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base473x33mmCaselessBullet">
-							<defName>Bullet_473x33mmGDHybrid_HE</defName>
-							<label>4.73mm Caseless bullet (HE)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>15</damageAmountBase>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<armorPenetrationBlunt>47.96</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>9</amount>
-									</li>
-								</secondaryDamage>
-								<speed>129</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base473x33mmCaselessBullet">
-							<defName>Bullet_473x33mmGDHybrid_Sabot</defName>
-							<label>4.73mm Caseless bullet (Sabot)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>7</damageAmountBase>
-								<armorPenetrationSharp>31.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>52.68</armorPenetrationBlunt>
-								<speed>175</speed>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Core/Ammo_GDGrenades.xml b/Patches/Rimsenal Collection/Core/Ammo_GDGrenades.xml
deleted file mode 100644
index 82a2ac3f31..0000000000
--- a/Patches/Rimsenal Collection/Core/Ammo_GDGrenades.xml	
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_25x40mmGrenade"]/ammoTypes</xpath>
-					<value>
-						<Ammo_25x40mmGrenade_Buck>Bullet_25mmGauge_Buck</Ammo_25x40mmGrenade_Buck>
-						<Ammo_25x40mmGrenade_INC>Bullet_25x40mmGrenade_INC</Ammo_25x40mmGrenade_INC>
-					</value>
-				</li>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="25x40mmGrenadeBase">
-							<defName>Ammo_25x40mmGrenade_Buck</defName>
-							<label>25x40mm grenade (Buck)</label>
-							<graphicData>
-								<texPath>ThirdParty/Rimsenal/GrenadeLauncher/BS</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.96</MarketValue>
-							</statBases>
-							<ammoClass>BuckShot</ammoClass>
-							<cookOffProjectile>Bullet_25mmGauge_Buck</cookOffProjectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="25x40mmGrenadeBase">
-							<defName>Ammo_25x40mmGrenade_INC</defName>
-							<label>25x40mm grenade (Incendiary)</label>
-							<graphicData>
-								<texPath>ThirdParty/Rimsenal/GrenadeLauncher/INC</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.96</MarketValue>
-							</statBases>
-							<ammoClass>ThermobaricFuel</ammoClass>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>1</damageAmountBase>
-									<explosiveDamageType>PrometheumFlame</explosiveDamageType>
-									<explosiveRadius>0.5</explosiveRadius>
-									<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
-									<preExplosionSpawnChance>1</preExplosionSpawnChance>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="Base12GaugeBullet">
-							<defName>Bullet_25mmGauge_Buck</defName>
-							<label>buckshot pellet</label>
-							<graphicData>
-								<texPath>Things/Projectile/Shotgun_Pellet</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>9</damageAmountBase>
-								<pelletCount>16</pelletCount>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.7</armorPenetrationBlunt>
-								<spreadMult>40</spreadMult>
-								<dropsCasings>false</dropsCasings>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base25x40mmGrenadeBullet">
-							<defName>Bullet_25x40mmGrenade_INC</defName>
-							<label>25x40mm grenade (Incendiary)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>1</explosionRadius>
-								<damageDef>PrometheumFlame</damageDef>
-								<damageAmountBase>4</damageAmountBase>
-								<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
-								<preExplosionSpawnChance>1</preExplosionSpawnChance>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_25x40mmGrenade_Buck</defName>
-							<label>make 25x40mm buckshot rounds x100</label>
-							<description>Craft 100 25x40mm buckshot rounds.</description>
-							<jobString>Making 25x40mm buckshot rounds.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>32</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_25x40mmGrenade_Buck>100</Ammo_25x40mmGrenade_Buck>
-							</products>
-							<workAmount>3200</workAmount>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_25x40mmGrenade_INC</defName>
-							<label>make 25x40mm Incendiary grenades x100</label>
-							<description>Craft 100 25x40mm Incendiary grenades.</description>
-							<jobString>Making 25x40mm Incendiary grenades.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>32</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Prometheum</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Prometheum</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_25x40mmGrenade_INC>100</Ammo_25x40mmGrenade_INC>
-							</products>
-							<workAmount>600</workAmount>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Core/Ammo_JI.xml b/Patches/Rimsenal Collection/Core/Ammo_JI.xml
deleted file mode 100644
index f88e2862e3..0000000000
--- a/Patches/Rimsenal Collection/Core/Ammo_JI.xml	
+++ /dev/null
@@ -1,483 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ==================== JI Molten Fragmentation (Old) ========================== -->
-
-						<ThingDef ParentName="BaseFragment">
-							<defName>Fragment_Molten</defName>
-							<label>molten splatter</label>
-							<graphicData>
-								<texPath>Things/Projectile/Fragments/Fragment_Small</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Burn</damageDef>
-								<damageAmountBase>5</damageAmountBase>
-								<speed>30</speed>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<gravityFactor>25</gravityFactor>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== JI Rocket Shells (Old/Security) ========================== -->
-
-						<ThingCategoryDef>
-							<defName>AmmoJIRockets</defName>
-							<label>JI Siege Rockets</label>
-							<parent>AmmoRockets</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberRocket</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_JIRocket</defName>
-							<label>Siege rocket</label>
-							<ammoTypes>
-								<Ammo_JIRocket>Bullet_JISiegeRocket</Ammo_JIRocket>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="88mmRPzBRocketBase" ParentName="MediumAmmoBase" Abstract="True">
-							<description>Bulky siege rockets, fired by the heaviest of Jotun Interstellar weaponry. An outer casing of high explosives around a shaped-charge core makes it capable of engaging both hard and soft targets.</description>
-							<statBases>
-								<MaxHitPoints>150</MaxHitPoints>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_TableMachining</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoJIRockets</li>
-							</thingCategories>
-							<stackLimit>25</stackLimit>
-							<cookOffFlashScale>40</cookOffFlashScale>
-							<cookOffSound>MortarBomb_Explode</cookOffSound>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="88mmRPzBRocketBase">
-							<defName>Ammo_JIRocket</defName>
-							<label>Siege rocket</label>
-							<graphicData>
-								<texPath>ThirdParty/Rimsenal/JI/JI_Shell</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>40</MarketValue>
-								<Mass>4</Mass>
-								<Bulk>9</Bulk>
-							</statBases>
-							<ammoClass>RocketHE</ammoClass>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>50</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>4</explosiveRadius>
-									<explosionSound>Explosion_GiantBomb</explosionSound>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Large>3</Fragment_Large>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="BaseRPG7Grenade">
-							<defName>Bullet_JISiegeRocket</defName>
-							<label>Siege rocket</label>
-							<graphicData>
-								<texPath>Things/Projectile/Rocket</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>90</speed>
-								<soundAmbient>RocketPropelledLoop_Small</soundAmbient>
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>210</damageAmountBase>
-								<armorPenetrationBlunt>25</armorPenetrationBlunt>
-								<armorPenetrationSharp>500</armorPenetrationSharp>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>98</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>2.5</explosiveRadius>
-									<explosionSound>Explosion_GiantBomb</explosionSound>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<!-- ==================== Recipe: JI Rocket Shells ========================== -->
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_JIRocket</defName>
-							<label>make siege rockets x5</label>
-							<description>Craft 5 JI siege rockets rockets.</description>
-							<jobString>Making JI siege rockets rockets.</jobString>
-							<workAmount>7500</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>3</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>FSX</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<researchPrerequisite>SiegeTech</researchPrerequisite>
-							<recipeUsers Inherit="False">
-								<li>JITable</li>
-							</recipeUsers>
-							<products>
-								<Ammo_JIRocket>5</Ammo_JIRocket>
-							</products>
-						</RecipeDef>
-
-						<!-- ==================== JI Siege Shells ========================== -->
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_JISiege</defName>
-							<label>Siege Cannon</label>
-							<ammoTypes>
-								<Ammo_JI_Alloy>Bullet_JISiegeRound</Ammo_JI_Alloy>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="BaseRPG7Grenade">
-							<defName>Bullet_JISiegeRound</defName>
-							<label>grendel shell</label>
-							<graphicData>
-								<texPath>Things/Projectile/SCM</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>90</speed>
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>80</damageAmountBase>
-								<armorPenetrationBlunt>51200</armorPenetrationBlunt>
-								<armorPenetrationSharp>100</armorPenetrationSharp>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>20</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>0.5</explosiveRadius>
-									<explosionSound>Explosion_GiantBomb</explosionSound>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragSpeedFactor>0.5</fragSpeedFactor>
-									<fragments>
-										<Fragment_Large>325</Fragment_Large>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="Base81mmMortarShell">
-							<defName>Bullet_JICrowFeeder</defName>
-							<label>crow feeder</label>
-							<graphicData>
-								<texPath>Things/Projectile/SCM</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0</armorPenetrationBlunt>
-								<explosionRadius>0.5</explosionRadius>
-								<flyOverhead>true</flyOverhead>
-								<soundExplode>MortarBomb_Explode</soundExplode>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<ai_IsIncendiary>false</ai_IsIncendiary>
-								<speed>49</speed>
-								<gravityFactor>10</gravityFactor>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragSpeedFactor>0.5</fragSpeedFactor>
-									<fragments>
-										<Fragment_Large>325</Fragment_Large>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<!-- ==================== JI Alloy ========================== -->
-
-						<ThingCategoryDef>
-							<defName>AmmoAlloy</defName>
-							<label>Semi-molten Alloy Round</label>
-							<parent>AmmoRifles</parent>
-							<iconPath>ThirdParty/Rimsenal/JI/JI_Molten/MoltenCartridge_c</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_JISlag</defName>
-							<label>Semi-molten round</label>
-							<ammoTypes>
-								<Ammo_JI_Alloy>Bullet_JI_Slag</Ammo_JI_Alloy>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="BaseJIAlloy" ParentName="SmallAmmoBase" Abstract="True">
-							<description>A ultra dense, strong alloy with extremely high thermal conductivity, specially manufactured for use by Jotun Interstellar weaponry.</description>
-							<statBases>
-								<Mass>0.075</Mass>
-								<Bulk>0.01</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoAlloy</li>
-							</thingCategories>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseJIAlloy">
-							<defName>Ammo_JI_Alloy</defName>
-							<label>Ultra-density alloy</label>
-							<graphicData>
-								<texPath>ThirdParty/Rimsenal/JI/JI_Molten</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>3</MarketValue>
-							</statBases>
-							<ammoClass>Slag</ammoClass>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="Base556x45mmNATOBullet">
-							<defName>Bullet_JI_Slag</defName>
-							<label>Semi-molten alloy</label>
-							<graphicData>
-								<texPath>Things/Projectile/Slug</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>122</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>10</damageAmountBase>
-								<armorPenetrationBlunt>60</armorPenetrationBlunt>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<pelletCount>10</pelletCount>
-								<spreadMult>25</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== Recipe: JI Alloy ========================== -->
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_JI_Alloy</defName>
-							<label>make alloy x250</label>
-							<description>Craft 250 ultra dense alloy.</description>
-							<jobString>Making ultra dense alloy.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>18</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>18</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Plasteel</li>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<researchPrerequisite>MoltenTech</researchPrerequisite>
-							<recipeUsers Inherit="False">
-								<li>JITable</li>
-							</recipeUsers>
-							<products>
-								<Ammo_JI_Alloy>250</Ammo_JI_Alloy>
-							</products>
-							<workAmount>19000</workAmount>
-						</RecipeDef>
-
-						<!-- ==================== JI Molten Slug ========================== -->
-
-						<ThingCategoryDef>
-							<defName>AmmoMoltenSlug</defName>
-							<label>Semi-molten alloy</label>
-							<parent>AmmoRifles</parent>
-							<iconPath>ThirdParty/Rimsenal/JI/JI_Molten/MoltenCartridge_c</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_JIStandard</defName>
-							<label>molten slug</label>
-							<ammoTypes>
-								<Ammo_JI_Alloy>Bullet_JI_Molten</Ammo_JI_Alloy>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="Base556x45mmNATOBullet">
-							<defName>Bullet_JI_Molten</defName>
-							<label>Semi-molten alloy</label>
-							<graphicData>
-								<texPath>Things/Projectile/Slug</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>137</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>28</damageAmountBase>
-								<armorPenetrationBlunt>490</armorPenetrationBlunt>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_JI_AMR</defName>
-							<label>High-density alloy slug</label>
-							<ammoTypes>
-								<Ammo_JI_Alloy>Bullet_JI_AMR</Ammo_JI_Alloy>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="Base556x45mmNATOBullet">
-							<defName>Bullet_JI_AMR</defName>
-							<label>Semi-molten alloy</label>
-							<graphicData>
-								<texPath>Things/Projectile/Shell</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>178</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>128</damageAmountBase>
-								<armorPenetrationBlunt>20000</armorPenetrationBlunt>
-								<armorPenetrationSharp>200</armorPenetrationSharp>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Large>6</Fragment_Large>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<!-- ==================== JI Suppressor Shot ========================== -->
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_JISuppressor</defName>
-							<label>molten slug</label>
-							<ammoTypes>
-								<Ammo_JI_Alloy>Bullet_JI_Suppressor</Ammo_JI_Alloy>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="Base556x45mmNATOBullet">
-							<defName>Bullet_JI_Suppressor</defName>
-							<label>Semi-molten alloy</label>
-							<graphicData>
-								<texPath>Things/Projectile/Slug</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>137</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>22</damageAmountBase>
-								<armorPenetrationBlunt>245</armorPenetrationBlunt>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Core/Ammo_TE.xml b/Patches/Rimsenal Collection/Core/Ammo_TE.xml
deleted file mode 100644
index 3839fa48e2..0000000000
--- a/Patches/Rimsenal Collection/Core/Ammo_TE.xml	
+++ /dev/null
@@ -1,300 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[defName="KineticImpact"]/defaultDamage</xpath>
-					<value>
-						<defaultDamage>25</defaultDamage>
-						<defaultArmorPenetration>50</defaultArmorPenetration>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- TE Universal Power Cell -->
-
-						<ThingCategoryDef>
-							<defName>AmmoTEUniversalPowerCell</defName>
-							<label>TE Universal Power Cell</label>
-							<parent>AmmoRifles</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="TEPowerCoreBase" ParentName="SmallAmmoBase" Abstract="True">
-							<description>A power cell used by the Tisiphone Enterprise kinetic force family of weaponry weaponry.</description>
-							<statBases>
-								<Mass>0.005</Mass>
-								<Bulk>0.01</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoTEPowerCore</li>
-							</thingCategories>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="TEPowerCoreBase">
-							<defName>Ammo_TEPowerCell</defName>
-							<label>TE Universal Power Cell (KE)</label>
-							<graphicData>
-								<texPath>ThirdParty/Rimsenal/TE</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>1.5</MarketValue>
-							</statBases>
-							<ammoClass>KineticEnergy</ammoClass>
-						</ThingDef>
-
-						<!-- ==================== Recipe: TE Universal Power Cell ========================== -->
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_TEPowerCell</defName>
-							<label>make TE Universal Power Cell x500</label>
-							<description>Craft 500 TE Universal Power Cell.</description>
-							<jobString>Making TE Universal Power Cell.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>18</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>18</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Plasteel</li>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<researchPrerequisite>KineticTech</researchPrerequisite>
-							<recipeUsers Inherit="False">
-								<li>TETable</li>
-							</recipeUsers>
-							<products>
-								<Ammo_TEPowerCell>500</Ammo_TEPowerCell>
-							</products>
-							<workAmount>19000</workAmount>
-						</RecipeDef>
-
-						<!-- ==================== TE Power Core ========================== -->
-
-						<ThingCategoryDef>
-							<defName>AmmoTEPowerCore</defName>
-							<label>TE Power Core</label>
-							<parent>AmmoRifles</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_TEPowerCore</defName>
-							<label>TE Power Core</label>
-							<ammoTypes>
-								<Ammo_TEPowerCell>Bullet_TEPowerCore_KE</Ammo_TEPowerCell>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ================== Projectiles ==================
-
-	<ThingDef ParentName="Base556x45mmNATOBullet">
-		<defName>Bullet_TEPowerCore_KE</defName>
-		<label>TE energy blast (KE)</label>
-		<graphicData>
-			<texPath>Things/Projectile/Harrower</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-		</graphicData>		
-		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<speed>400</speed>
-			<damageDef>KineticImpact</damageDef>
-			<damageAmountBase>8</damageAmountBase>
-			<armorPenetrationSharp>70</armorPenetrationSharp>
-			<armorPenetrationBlunt>160</armorPenetrationBlunt>
-		</projectile>
-		<comps>
-		  <li Class="CombatExtended.CompProperties_ExplosiveCE">
-			<damageAmountBase>10</damageAmountBase>
-			<explosiveDamageType>KineticImpact</explosiveDamageType>
-			<explosiveRadius>0.5</explosiveRadius>
-			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-		  </li>
-		</comps>
-	</ThingDef> -->
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletPurple">
-							<defName>Bullet_TEPowerCore_KE</defName>
-							<label>TE energy blast (KE)</label>
-							<graphicData>
-								<texPath>Things/Projectile/ImpactL</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>KineticImpact</damageDef>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>16</damageAmountBase>
-								<armorPenetrationBlunt>2000</armorPenetrationBlunt>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>1</damageAmountBase>
-									<explosiveDamageType>KineticImpact</explosiveDamageType>
-									<explosiveRadius>0.5</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>false</applyDamageToExplosionCellsNeighbors>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<!-- ==================== TE Power Charge ========================== -->
-
-						<ThingCategoryDef>
-							<defName>AmmoTEPowerCharge</defName>
-							<label>TE Power Charge</label>
-							<parent>AmmoRifles</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_TEPowerCharge</defName>
-							<label>TE Power Charge</label>
-							<ammoTypes>
-								<Ammo_TEPowerCell>Bullet_TEPowerCharge_KE</Ammo_TEPowerCell>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="Base556x45mmNATOBullet">
-							<defName>Bullet_TEPowerCharge_KE</defName>
-							<label>TE energy blast (KE)</label>
-							<graphicData>
-								<texPath>Things/Projectile/ImpactM</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>KineticImpact</damageDef>
-								<speed>61</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>30</damageAmountBase>
-								<armorPenetrationBlunt>24</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== TE Energy Canister ========================== -->
-
-						<ThingCategoryDef>
-							<defName>AmmoTEEnergyCanister</defName>
-							<label>TE Energy Canister</label>
-							<parent>AmmoRifles</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_TEEnergyCanister</defName>
-							<label>TE Energy Canister</label>
-							<ammoTypes>
-								<Ammo_TEPowerCell>Bullet_TEEnergyCanister_KE</Ammo_TEPowerCell>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="Base30x29mmGrenadeBullet">
-							<defName>Bullet_TEEnergyCanister_KE</defName>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<label>TE energy blast (KE)</label>
-							<graphicData>
-								<texPath>Things/Projectile/ImpactB</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>KineticImpact</damageDef>
-								<speed>54</speed>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<explosiveDamageType>KineticImpact</explosiveDamageType>
-									<explosiveRadius>1.5</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>false</applyDamageToExplosionCellsNeighbors>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<!-- ==================== TE Concentrated Power Charge ========================== -->
-
-						<ThingCategoryDef>
-							<defName>AmmoTEConcentratedPowerCharge</defName>
-							<label>TE Concentrated Power Charge</label>
-							<parent>AmmoRifles</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_TEConcentratedPowerCharge</defName>
-							<label>TE Concentrated Power Charge</label>
-							<ammoTypes>
-								<Ammo_TEPowerCell>Bullet_TEConcentratedPowerCharge_KE</Ammo_TEPowerCell>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="Base556x45mmNATOBullet">
-							<defName>Bullet_TEConcentratedPowerCharge_KE</defName>
-							<label>TE energy blast (KE)</label>
-							<graphicData>
-								<texPath>Things/Projectile/ImpactL</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>KineticImpact</damageDef>
-								<speed>83</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>40</damageAmountBase>
-								<armorPenetrationBlunt>54</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Core/Ammo_YP.xml b/Patches/Rimsenal Collection/Core/Ammo_YP.xml
deleted file mode 100644
index 1f2809d9d9..0000000000
--- a/Patches/Rimsenal Collection/Core/Ammo_YP.xml	
+++ /dev/null
@@ -1,368 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ==================== YP Pistol ========================== -->
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_PistolYP</defName>
-							<label>Small YP</label>
-							<ammoTypes>
-								<Ammo_RifleYP>Bullet_PistolYP</Ammo_RifleYP>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="Base45ACPBullet">
-							<defName>Bullet_PistolYP</defName>
-							<label>Carbon crystal</label>
-							<graphicData>
-								<texPath>Things/Projectile/Shard</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Shredder</damageDef>
-								<speed>83</speed>
-								<dropsCasings>false</dropsCasings>
-								<pelletCount>2</pelletCount>
-								<spreadMult>2</spreadMult>
-								<damageAmountBase>4</damageAmountBase>
-								<armorPenetrationBlunt>6.4</armorPenetrationBlunt>
-								<armorPenetrationSharp>24</armorPenetrationSharp>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== YP Rifle ========================== -->
-
-						<ThingCategoryDef>
-							<defName>AmmoRifleYP</defName>
-							<label>Light YP</label>
-							<parent>AmmoRifles</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_RifleYP</defName>
-							<label>Light YP</label>
-							<ammoTypes>
-								<Ammo_RifleYP>Bullet_RifleYP</Ammo_RifleYP>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_SwarmerYP</defName>
-							<label>Light YP</label>
-							<ammoTypes>
-								<Ammo_RifleYP>Bullet_SwarmerYP</Ammo_RifleYP>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="RifleYPBase" ParentName="SmallAmmoBase" Abstract="True">
-							<description>Small, high-velocity crystal bullet used in Yunhwa Precision arms.</description>
-							<statBases>
-								<Mass>0.01</Mass>
-								<Bulk>0.02</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoRifleYP</li>
-							</thingCategories>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="RifleYPBase">
-							<defName>Ammo_RifleYP</defName>
-							<label>Light YP cartridge</label>
-							<graphicData>
-								<texPath>ThirdParty/Rimsenal/YP</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>1</MarketValue>
-							</statBases>
-							<ammoClass>CarbonCrystal</ammoClass>
-							<cookOffProjectile>Bullet_RifleYP</cookOffProjectile>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="Base556x45mmNATOBullet">
-							<defName>Bullet_RifleYP</defName>
-							<label>Carbon crystal</label>
-							<graphicData>
-								<texPath>Things/Projectile/Shard</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Shredder</damageDef>
-								<speed>158</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>5</damageAmountBase>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base556x45mmNATOBullet">
-							<defName>Bullet_SwarmerYP</defName>
-							<label>sagpung swarm</label>
-							<graphicData>
-								<texPath>Things/Projectile/Swarm</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Shredder</damageDef>
-								<speed>68</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>6</damageAmountBase>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<pelletCount>12</pelletCount>
-								<spreadMult>1</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== Recipe: YP Rifle ========================== -->
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_RifleYP</defName>
-							<label>make Light YP cartridge x750</label>
-							<description>Craft 750 Light YP cartridges.</description>
-							<jobString>Making Light YP cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>18</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>18</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Plasteel</li>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<researchPrerequisite>ShardTech</researchPrerequisite>
-							<recipeUsers Inherit="False">
-								<li>YPTable</li>
-							</recipeUsers>
-							<products>
-								<Ammo_RifleYP>750</Ammo_RifleYP>
-							</products>
-							<workAmount>19000</workAmount>
-						</RecipeDef>
-
-						<!-- ==================== YP Spike ========================== -->
-
-						<ThingCategoryDef>
-							<defName>AmmoSpikeYP</defName>
-							<label>Heavy YP</label>
-							<parent>AmmoRifles</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_SpikeYP</defName>
-							<label>Heavy YP</label>
-							<ammoTypes>
-								<Ammo_SpikeYP>Bullet_SpikeYP</Ammo_SpikeYP>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_VectorYP</defName>
-							<label>Heavy YP</label>
-							<ammoTypes>
-								<Ammo_SpikeYP>Bullet_VectorYP</Ammo_SpikeYP>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="SpikeYPBase" ParentName="SmallAmmoBase" Abstract="True">
-							<description>High-velocity spike made of synthesized crystals, fired by Yunhwa Precision equipment. While more effective against armor, the spikes' tendency to remain intact after striking a target decreases thier stopping power.</description>
-							<statBases>
-								<Mass>0.015</Mass>
-								<Bulk>0.02</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoSpikeYP</li>
-							</thingCategories>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpikeYPBase">
-							<defName>Ammo_SpikeYP</defName>
-							<label>Heavy YP cartridge</label>
-							<graphicData>
-								<texPath>ThirdParty/Rimsenal/YP</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>1.5</MarketValue>
-							</statBases>
-							<ammoClass>CarbonCrystal</ammoClass>
-							<cookOffProjectile>Bullet_SpikeYP</cookOffProjectile>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="Base556x45mmNATOBullet">
-							<defName>Bullet_SpikeYP</defName>
-							<label>Heavy carbon crystal</label>
-							<graphicData>
-								<texPath>Things/Projectile/Spike</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Shredder</damageDef>
-								<speed>204</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>10</damageAmountBase>
-								<armorPenetrationBlunt>36</armorPenetrationBlunt>
-								<armorPenetrationSharp>36</armorPenetrationSharp>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base556x45mmNATOBullet">
-							<defName>Bullet_VectorYP</defName>
-							<label>Vector shot</label>
-							<graphicData>
-								<texPath>Things/Projectile/Spike</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Shredder</damageDef>
-								<speed>165</speed>
-								<soundHitThickRoof>RS_ShotShard</soundHitThickRoof>
-								<flyOverhead>true</flyOverhead>
-								<gravityFactor>450</gravityFactor>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>5</damageAmountBase>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<pelletCount>2</pelletCount>
-								<spreadMult>40</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== Recipe: YP Spike ========================== -->
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_SpikeYP</defName>
-							<label>make Heavy YP cartridge x500</label>
-							<description>Craft 500 Heavy YP cartridges.</description>
-							<jobString>Making Heavy YP cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>18</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>18</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Plasteel</li>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<researchPrerequisite>ShardTech</researchPrerequisite>
-							<recipeUsers Inherit="False">
-								<li>YPTable</li>
-							</recipeUsers>
-							<products>
-								<Ammo_SpikeYP>500</Ammo_SpikeYP>
-							</products>
-							<workAmount>19000</workAmount>
-						</RecipeDef>
-
-						<!-- ================== YP Microwave - Projectiles ================== -->
-
-						<ThingDef ParentName="Base556x45mmNATOBullet">
-							<defName>Bullet_GeugGwang_CE</defName>
-							<label>microwave pulse</label>
-							<graphicData>
-								<texPath>Things/Projectile/Microwave</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Microwave</damageDef>
-								<speed>999</speed>
-								<dropsCasings>false</dropsCasings>
-								<explosionRadius>1.5</explosionRadius>
-								<damageAmountBase>1</damageAmountBase>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<ai_IsIncendiary>true</ai_IsIncendiary>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Core/Apparel_RS_CE.xml b/Patches/Rimsenal Collection/Core/Apparel_RS_CE.xml
deleted file mode 100644
index c80c886232..0000000000
--- a/Patches/Rimsenal Collection/Core/Apparel_RS_CE.xml	
+++ /dev/null
@@ -1,2136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==========  Carbon Jumpsuit =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Carbonsuit"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Carbonsuit"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Carbonsuit"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Carbonsuit"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.5</ArmorRating_Heat>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Carbonsuit"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<!-- ========== Security Armor =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_SecurityArmor"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SecurityArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>25</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SecurityArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>12</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SecurityArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>24</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_SecurityArmor"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>35</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SecurityArmor"]/costList/Steel</xpath>
-					<value>
-						<Steel>130</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SecurityArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<CarryWeight>10</CarryWeight>
-						<CarryBulk>10</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_SecurityArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Apparel_SecurityArmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>1.25</ArmorRating_Sharp>
-									<parts>
-										<li>Torso</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>1.25</ArmorRating_Blunt>
-									<parts>
-										<li>Torso</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.875</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.875</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.625</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.625</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Security Helmet =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_SecurityHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SecurityHelmet"]/statBases/Mass</xpath>
-					<value>
-						<Mass>3.6</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SecurityHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>12</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SecurityHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>24</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SecurityHelmet"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>25</Plasteel>
-						<DevilstrandCloth>10</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_SecurityHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Apparel_SecurityHelmet"]</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>
-				</li>
-
-				<!-- ========== Pioneer Armor =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_PioneerArmor"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>25</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_PioneerArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>45</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_PioneerArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_PioneerArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>42</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_PioneerArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<CarryWeight>80</CarryWeight>
-						<CarryBulk>45</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_PioneerArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Apparel_PioneerArmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Pioneer Helmet =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_PioneerH"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_PioneerH"]/statBases/Mass</xpath>
-					<value>
-						<Mass>4.5</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_PioneerH"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_PioneerH"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>40</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Apparel_PioneerH"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Apparel_PioneerH"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_PioneerH"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_PioneerH"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>40</Plasteel>
-						<DevilstrandCloth>10</DevilstrandCloth>
-						<ComponentSpacer>1</ComponentSpacer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_PioneerH"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Apparel_PioneerH"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.85</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Nomad Armor =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_NomadArmor"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_NomadArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>35</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_NomadArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_NomadArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>40</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_NomadArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_NomadArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Apparel_NomadArmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Nomad Helmet =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_NomadH"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>1</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_NomadH"]/statBases/Mass</xpath>
-					<value>
-						<Mass>2.8</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_NomadH"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>12</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_NomadH"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>30</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Apparel_NomadH"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Apparel_NomadH"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_NomadH"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-						<AimingAccuracy>0.15</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_NomadH"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>40</Plasteel>
-						<DevilstrandCloth>10</DevilstrandCloth>
-						<ComponentSpacer>1</ComponentSpacer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_NomadH"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!-- ========== Medic Armor =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_MedicArmor"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MedicArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>45</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MedicArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MedicArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>30</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MedicArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<CarryWeight>60</CarryWeight>
-						<CarryBulk>25</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_MedicArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Apparel_MedicArmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Medic Helmet =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_MedicH"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.4</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MedicH"]/statBases/Mass</xpath>
-					<value>
-						<Mass>3.2</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MedicH"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MedicH"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>30</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MedicH"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>40</Plasteel>
-						<DevilstrandCloth>10</DevilstrandCloth>
-						<ComponentSpacer>1</ComponentSpacer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_MedicH"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Apparel_MedicH"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.75</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-										<li>Jaw</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.50</ArmorRating_Sharp>
-									<parts>
-										<li>Nose</li>
-										<li>Jaw</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Upgrade Kit =========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/thingDef[defName="MBPSKit"]/statBases/Mass</xpath>
-					<value>
-						<Mass>25</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/thingDef[defName="MBPSKit"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>60</Plasteel>
-						<DevilstrandCloth>10</DevilstrandCloth>
-					</value>
-				</li>
-
-				<!-- ========== Drop Suit =========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Dropsuit"]/statBases/Mass</xpath>
-					<value>
-						<Mass>60</Mass>
-						<Bulk>90</Bulk>
-						<WornBulk>18</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Dropsuit"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>180</Plasteel>
-						<DevilstrandCloth>40</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_Dropsuit"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Dropsuit"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<CarryWeight>90</CarryWeight>
-						<CarryBulk>10</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Dropsuit"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>17</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Dropsuit"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>51</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Apparel_Dropsuit"]/verbs</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="Apparel_Dropsuit"]/statBases/JumpRange</xpath>
-								<value>
-									<JumpRange>47</JumpRange>
-								</value>
-							</li>
-						</operations>
-					</match>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Apparel_Dropsuit"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-										<li>Arm</li>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-										<li>Arm</li>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Dropsuit Helmet =========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_DropsuitH"]/statBases/Mass</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<Mass>5</Mass>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.65</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_DropsuitH"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_DropsuitH"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>42</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Apparel_DropsuitH"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Apparel_DropsuitH"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_DropsuitH"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_DropsuitH"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>60</Plasteel>
-						<DevilstrandCloth>20</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_DropsuitH"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!-- ========== Nervesuit =========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Strikesuit"]/statBases/Mass</xpath>
-					<value>
-						<Bulk>75</Bulk>
-						<Mass>20</Mass>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_Strikesuit"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_Strikesuit"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>10</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Strikesuit"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>120</Plasteel>
-						<DevilstrandCloth>40</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Strikesuit"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Strikesuit"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>22.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Apparel_Strikesuit"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>1.2</ArmorRating_Sharp>
-									<parts>
-										<li>Torso</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>1.2</ArmorRating_Blunt>
-									<parts>
-										<li>Torso</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-										<li>Leg</li>
-										<li>Foot</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-										<li>Leg</li>
-										<li>Foot</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Nervesuit helmet =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_StrikesuitH"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.9</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_StrikesuitH"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>9.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_StrikesuitH"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>22.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Apparel_StrikesuitH"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Apparel_StrikesuitH"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_StrikesuitH"]/equippedStatOffsets</xpath>
-					<value>
-						<Suppressability>-0.25</Suppressability>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_StrikesuitH"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>35</Plasteel>
-						<DevilstrandCloth>10</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_StrikesuitH"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!-- ========== Assault Armor =========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_AssaultArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>100</Mass>
-						<Bulk>120</Bulk>
-						<WornBulk>18</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_AssaultArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>28</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_AssaultArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>70</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_AssaultArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<CarryWeight>115</CarryWeight>
-						<CarryBulk>15</CarryBulk>
-						<MoveSpeed>-0.55</MoveSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_AssaultArmor"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>225</Plasteel>
-						<DevilstrandCloth>60</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_AssaultArmor"]/costList/Uranium</xpath>
-					<value>
-						<Uranium>70</Uranium>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_AssaultArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Apparel_AssaultArmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Apparel_AssaultArmor"]/verbs</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="Apparel_AssaultArmor"]/verbs</xpath>
-								<value>
-									<verbs>
-										<li Class="CombatExtended.VerbPropertiesCE">
-											<label>launch EMP grenade</label>
-											<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
-											<hasStandardCommand>true</hasStandardCommand>
-											<onlyManualCast>True</onlyManualCast>
-											<warmupTime>1.5</warmupTime>
-											<range>40</range>
-											<minRange>5</minRange>
-											<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-											<soundCast>Shot_IncendiaryLauncher</soundCast>
-											<soundCastTail>GunTail_Medium</soundCastTail>
-											<muzzleFlashScale>14</muzzleFlashScale>
-											<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
-											<targetParams>
-												<canTargetLocations>true</canTargetLocations>
-											</targetParams>
-											<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-											<defaultProjectile>Bullet_30x29mmGrenade_EMP</defaultProjectile>
-											<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
-										</li>
-									</verbs>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="Apparel_AssaultArmor"]/comps/li[@Class="CompProperties_Reloadable"]/ammoDef</xpath>
-								<value>
-									<ammoDef>Ammo_30x29mmGrenade_EMP</ammoDef>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="Apparel_AssaultArmor"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountPerCharge</xpath>
-								<value>
-									<ammoCountPerCharge>1</ammoCountPerCharge>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-				<!-- ========== Assault Helmet =========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_AssaultArmorH"]/statBases/Mass</xpath>
-					<value>
-						<Mass>10</Mass>
-						<Bulk>20</Bulk>
-						<WornBulk>2</WornBulk>
-						<NightVisionEfficiency_Apparel>0.3</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_AssaultArmorH"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>25</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_AssaultArmorH"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>62.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Apparel_AssaultArmorH"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Apparel_AssaultArmorH"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_AssaultArmorH"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>-0.25</MoveSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_AssaultArmorH"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_AssaultArmorH"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>70</Plasteel>
-						<Uranium>15</Uranium>
-						<DevilstrandCloth>30</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_AssaultArmorH"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!-- ========== Fire Support Armor =========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_FSArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>70</Mass>
-						<Bulk>80</Bulk>
-						<WornBulk>20</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_FSArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>15</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_FSArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>37.5</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_FSArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<CarryWeight>120</CarryWeight>
-						<CarryBulk>50</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_FSArmor"]/equippedStatOffsets/AimingDelayFactor</xpath>
-					<value>
-						<AimingDelayFactor>-0.25</AimingDelayFactor>
-						<ReloadSpeed>0.5</ReloadSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_FSArmor"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>175</Plasteel>
-						<DevilstrandCloth>50</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_FSArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Apparel_FSArmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Fire Support Helmet =========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_FSArmorH"]/statBases/Mass</xpath>
-					<value>
-						<Mass>5</Mass>
-						<Bulk>7</Bulk>
-						<WornBulk>1.5</WornBulk>
-						<NightVisionEfficiency_Apparel>0.9</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_FSArmorH"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_FSArmorH"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>35</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Apparel_FSArmorH"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Apparel_FSArmorH"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_FSArmorH"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_FSArmorH"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>55</Plasteel>
-						<DevilstrandCloth>20</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_FSArmorH"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Apparel_FSArmorH"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Korp Armor =========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Korp"]/statBases/Mass</xpath>
-					<value>
-						<Mass>85</Mass>
-						<Bulk>80</Bulk>
-						<WornBulk>20</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Korp"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>15</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Korp"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>37.5</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Korp"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<CarryWeight>100</CarryWeight>
-						<CarryBulk>30</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Korp"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>175</Plasteel>
-						<DevilstrandCloth>50</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_Korp"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Apparel_Korp"]/verbs</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="Apparel_Korp"]/verbs</xpath>
-								<value>
-									<verbs>
-										<li Class="CombatExtended.VerbPropertiesCE">
-											<label>launch crow feeder</label>
-											<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
-											<hasStandardCommand>true</hasStandardCommand>
-											<onlyManualCast>True</onlyManualCast>
-											<warmupTime>1.5</warmupTime>
-											<range>55</range>
-											<minRange>5</minRange>
-											<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-											<soundCast>RS_ShotGrendel</soundCast>
-											<soundCastTail>GunTail_Medium</soundCastTail>
-											<muzzleFlashScale>16</muzzleFlashScale>
-											<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
-											<targetParams>
-												<canTargetLocations>true</canTargetLocations>
-											</targetParams>
-											<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-											<defaultProjectile>Bullet_JICrowFeeder</defaultProjectile>
-											<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
-										</li>
-									</verbs>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="Apparel_Korp"]/comps/li[@Class="CompProperties_Reloadable"]/ammoDef</xpath>
-								<value>
-									<ammoDef>Ammo_JI_Alloy</ammoDef>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="Apparel_Korp"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountPerCharge</xpath>
-								<value>
-									<ammoCountPerCharge>80</ammoCountPerCharge>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Apparel_Korp"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Reflactor Carapace =========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ReflactorArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>60</Mass>
-						<Bulk>100</Bulk>
-						<WornBulk>18</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ReflactorArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ReflactorArmor"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>10</ArmorRating_Heat>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ReflactorArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>54</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ReflactorArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<CarryWeight>90</CarryWeight>
-						<CarryBulk>15</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ReflactorArmor"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>160</Plasteel>
-						<DevilstrandCloth>75</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ReflactorArmor"]/costList/Uranium</xpath>
-					<value>
-						<Uranium>60</Uranium>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_ReflactorArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Apparel_ReflactorArmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.85</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.85</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Reflactor Helmet =========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ReflactorArmorH"]/statBases/Mass</xpath>
-					<value>
-						<Mass>5.2</Mass>
-						<Bulk>6</Bulk>
-						<WornBulk>1.5</WornBulk>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ReflactorArmorH"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>15</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ReflactorArmorH"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>10</ArmorRating_Heat>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ReflactorArmorH"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>37.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Apparel_ReflactorArmorH"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Apparel_ReflactorArmorH"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_ReflactorArmorH"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ReflactorArmorH"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>60</Plasteel>
-						<DevilstrandCloth>30</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ReflactorArmorH"]/costList/Uranium</xpath>
-					<value>
-						<Uranium>20</Uranium>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_ReflactorArmorH"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!-- ========== Hazard Carapace =========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_HazardCarapace"]/statBases/Mass</xpath>
-					<value>
-						<Mass>45</Mass>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_HazardCarapace"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_HazardCarapace"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>36</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_HazardCarapace"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>1</ArmorRating_Heat>
-						<ArmorRating_Electric>1</ArmorRating_Electric>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_HazardCarapace"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<CarryWeight>80</CarryWeight>
-						<CarryBulk>25</CarryBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_HazardCarapace"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>145</Plasteel>
-						<DevilstrandCloth>50</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_HazardCarapace"]/costList/Uranium</xpath>
-					<value>
-						<Uranium>65</Uranium>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_HazardCarapace"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Apparel_HazardCarapace"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.95</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.95</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Hazard Helmet =========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_HazardCarapaceH"]/statBases/Mass</xpath>
-					<value>
-						<Mass>6</Mass>
-						<Bulk>6</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.7</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_HazardCarapaceH"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_HazardCarapaceH"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>31.5</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_HazardCarapaceH"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>1.5</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Apparel_HazardCarapaceH"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Apparel_HazardCarapaceH"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_HazardCarapaceH"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_HazardCarapaceH"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>50</Plasteel>
-						<DevilstrandCloth>10</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_HazardCarapaceH"]/costList/Uranium</xpath>
-					<value>
-						<Uranium>25</Uranium>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_HazardCarapaceH"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!-- ========== CQ Armor =========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_CloseCombatArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>60</Mass>
-						<Bulk>65</Bulk>
-						<WornBulk>20</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_CloseCombatArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_CloseCombatArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>60</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_CloseCombatArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>80</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_CloseCombatArmor"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>145</Plasteel>
-						<DevilstrandCloth>50</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_CloseCombatArmor"]/costList/Uranium</xpath>
-					<value>
-						<Uranium>110</Uranium>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_CloseCombatArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Apparel_CloseCombatArmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_CloseCombatArmor"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>0.55</MeleeDodgeChance>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-					</value>
-				</li>
-
-				<!-- ========== CQ Helmet =========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_CloseCombatHelmet"]/statBases/Mass</xpath>
-					<value>
-						<Mass>5</Mass>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_CloseCombatHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_CloseCombatHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>54</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Apparel_CloseCombatHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Apparel_CloseCombatHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_CloseCombatHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_CloseCombatHelmet"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>65</Plasteel>
-						<DevilstrandCloth>20</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_CloseCombatHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Apparel_CloseCombatHelmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Core/RemoveWeapons.xml b/Patches/Rimsenal Collection/Core/RemoveWeapons.xml
deleted file mode 100644
index 1d635430b4..0000000000
--- a/Patches/Rimsenal Collection/Core/RemoveWeapons.xml	
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!--		
-			<li Class="PatchOperationRemove">
-				<xpath>Defs//thingDef[@ParentName="BaseGDGun"]</xpath>
-			</li>
-			<li Class="PatchOperationRemove">
-				<xpath>Defs//thingDef[@ParentName="BaseJIGun"]</xpath>
-			</li>
-			<li Class="PatchOperationRemove">
-				<xpath>Defs//thingDef[@ParentName="BaseYPGun"]</xpath>
-			</li>
-			<li Class="PatchOperationRemove">
-				<xpath>Defs//thingDef[@ParentName="BaseTEGun"]</xpath>
-			</li>
--->
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Core/Rimsenal_AmmoCategories.xml b/Patches/Rimsenal Collection/Core/Rimsenal_AmmoCategories.xml
deleted file mode 100644
index 4f0f48fc9f..0000000000
--- a/Patches/Rimsenal Collection/Core/Rimsenal_AmmoCategories.xml	
+++ /dev/null
@@ -1,69 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>MoltenSlug</defName>
-							<label>molten slug</label>
-							<labelShort>MS</labelShort>
-							<description>An alloy slug heated nearly to the melting point.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>HDSlug</defName>
-							<label>high-density alloy slug</label>
-							<labelShort>HDS</labelShort>
-							<description>A dense alloy slug heated nearly to the melting point. intended to defeat heavy armor.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>Slag</defName>
-							<label>slag round</label>
-							<labelShort>SG</labelShort>
-							<description>Loose, white-hot alloy pelts.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>KineticEnergy</defName>
-							<label>kinetic energy</label>
-							<labelShort>KE</labelShort>
-							<description>Special ionized electricity from the power core gets turned into a hard energy amalgam in the gun breech, the amalgam doesn't burn like normal energy projectiles, instead it deals blunt damage, hence the name kinetic energy.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>CarbonCrystal</defName>
-							<label>carbon crystal</label>
-							<labelShort>CC</labelShort>
-							<description>The carbon crystal core shatters into sharp splinter that maximize flesh damage but produces less armor penetration.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>FeralNail</defName>
-							<label>nail</label>
-							<labelShort>Nail</labelShort>
-							<description>A pointy, slightly rusted metal nail. Try not to step on it.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>MoltenShell</defName>
-							<label>molten shell</label>
-							<labelShort>MS</labelShort>
-							<description>An alloy shell heated nearly to the melting point.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Core/Rimsenal_DamageDefs.xml b/Patches/Rimsenal Collection/Core/Rimsenal_DamageDefs.xml
deleted file mode 100644
index d60b07225b..0000000000
--- a/Patches/Rimsenal Collection/Core/Rimsenal_DamageDefs.xml	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Core</li>
-		</mods>
-		<match Class="PatchOperationAddModExtension">
-			<xpath>Defs/DamageDef[defName="Microwave"]</xpath>
-			<value>
-				<li Class="CombatExtended.DamageDefExtensionCE">
-					<isAmbientDamage>true</isAmbientDamage>
-				</li>
-			</value>
-
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Core/Rimsenal_Melee.xml b/Patches/Rimsenal Collection/Core/Rimsenal_Melee.xml
deleted file mode 100644
index d5a721d938..0000000000
--- a/Patches/Rimsenal Collection/Core/Rimsenal_Melee.xml	
+++ /dev/null
@@ -1,320 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Torch Sword-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_TorchSword"]/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.5</cooldownTime>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.3</cooldownTime>
-								<armorPenetrationBlunt>1.352</armorPenetrationBlunt>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>41</power>
-								<cooldownTime>1.52</cooldownTime>
-								<armorPenetrationBlunt>3.2</armorPenetrationBlunt>
-								<armorPenetrationSharp>12.8</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_TorchSword"]/statBases</xpath>
-					<value>
-						<MeleeCounterParryBonus>0.8</MeleeCounterParryBonus>
-						<Bulk>6.5</Bulk>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_TorchSword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1</MeleeCritChance>
-							<MeleeParryChance>0.6</MeleeParryChance>
-							<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<!--			
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="MeleeWeapon_TorchSword"]/weaponTags</xpath>
-				<value>
-					<li>CE_OneHandedWeapon</li>
-				</value>
-			</li>
-			-->
-				<!-- GD - Sabertooth -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GD_Sabertooth"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<chanceFactor>0.33</chanceFactor>
-								<cooldownTime>1.65</cooldownTime>
-								<armorPenetrationBlunt>0.71</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>31</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationSharp>3.63</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.174</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GD_Sabertooth"]/statBases</xpath>
-					<value>
-						<MeleeCounterParryBonus>0.25</MeleeCounterParryBonus>
-						<Bulk>3.5</Bulk>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="GD_Sabertooth"]/equippedStatOffsets</xpath>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GD_Sabertooth"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.28</MeleeCritChance>
-							<MeleeParryChance>0.25</MeleeParryChance>
-							<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GD_Sabertooth"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- YP Vibroknife -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="YP_BingJu"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<chanceFactor>0.33</chanceFactor>
-								<cooldownTime>1.26</cooldownTime>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>0.6</cooldownTime>
-								<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>0.6</cooldownTime>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="YP_BingJu"]/statBases</xpath>
-					<value>
-						<MeleeCounterParryBonus>1.2</MeleeCounterParryBonus>
-						<Bulk>2.5</Bulk>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="YP_BingJu"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.75</MeleeCritChance>
-							<MeleeParryChance>0.94</MeleeParryChance>
-							<MeleeDodgeChance>0.20</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="YP_BingJu"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="YP_BingJu"]</xpath>
-						<value>
-							<weaponTags>
-								<li>CE_OneHandedWeapon</li>
-							</weaponTags>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="YP_BingJu"]/weaponTags</xpath>
-						<value>
-							<li>CE_OneHandedWeapon</li>
-						</value>
-					</match>
-				</li>
-
-				<!-- JI Assault Hammer -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JI_Ormbane"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<chanceFactor>0.33</chanceFactor>
-								<cooldownTime>1.97</cooldownTime>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>32</power>
-								<cooldownTime>3.2</cooldownTime>
-								<armorPenetrationBlunt>250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="JI_Ormbane"]/statBases</xpath>
-					<value>
-						<MeleeCounterParryBonus>1.21</MeleeCounterParryBonus>
-						<Bulk>9</Bulk>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="JI_Ormbane"]/equippedStatOffsets</xpath>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="JI_Ormbane"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>2.5</MeleeCritChance>
-							<MeleeParryChance>0.16</MeleeParryChance>
-							<MeleeDodgeChance>0.27</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- TE - Impact Knuckle -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TE_Eris"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>knuckle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>0.7</cooldownTime>
-								<armorPenetrationBlunt>25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>discharger</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Stun</def>
-										<amount>4</amount>
-										<chance>0.5</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>1.00</cooldownTime>
-								<armorPenetrationBlunt>45</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TE_Eris"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TE_Eris"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.5</MeleeCritChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-							<MeleeDodgeChance>0.45</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TE_Eris"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Core/Weapons_Explosives.xml b/Patches/Rimsenal Collection/Core/Weapons_Explosives.xml
deleted file mode 100644
index ae2e43fefe..0000000000
--- a/Patches/Rimsenal Collection/Core/Weapons_Explosives.xml	
+++ /dev/null
@@ -1,679 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Remove Recipe Maker & Verbs ========== -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="YP_BaegYa" or
-						defName="JI_Dunder" or
-						defName="GD_Bobcat" or
-						defName="TE_Grief" or
-						@Name="BaseRSGrenade"
-						]/recipeMaker </xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="YP_BaegYa" or
-						defName="JI_Dunder" or
-						defName="GD_Bobcat" or
-						defName="TE_Grief"
-						]/costList </xpath>
-				</li>
-
-				<!-- Without this mod, Grief and Bobcat don't work, and it logs at ForcedMissRadius error.-->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="YP_BaegYa" or
-						defName="JI_Dunder" or
-						defName="GD_Bobcat" or
-						defName="TE_Grief"
-						]/verbs </xpath>
-				</li>
-
-				<!-- Change TickerType.-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="YP_BaegYa" or
-						defName="JI_Dunder" or
-						defName="GD_Bobcat" or
-						defName="TE_Grief"
-						] </xpath>
-					<value>
-						<tickerType>Normal</tickerType>
-					</value>
-				</li>
-
-				<!-- ========== Projectile thingClass ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Proj_BaegYa" or
-						defName="Proj_Dunder" or
-						defName="Proj_Bobcat" or
-						defName="Proj_Grief"
-						]/thingClass </xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<!-- ========== Projectile ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Proj_BaegYa"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>5</explosionRadius>
-							<damageDef>Microwave</damageDef>
-							<damageAmountBase>1</damageAmountBase>
-							<explosionDelay>50</explosionDelay>
-							<dropsCasings>false</dropsCasings>
-							<speed>12</speed>
-							<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-							<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Proj_Dunder"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>4.5</explosionRadius>
-							<damageDef>Bomb</damageDef>
-							<damageAmountBase>200</damageAmountBase>
-							<explosionDelay>500</explosionDelay>
-							<dropsCasings>false</dropsCasings>
-							<speed>10</speed>
-							<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-							<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Proj_Bobcat"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>1</explosionRadius>
-							<damageDef>Bomb</damageDef>
-							<damageAmountBase>10</damageAmountBase>
-							<explosionDelay>80</explosionDelay>
-							<dropsCasings>true</dropsCasings>
-							<speed>12</speed>
-							<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-							<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Proj_Grief"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>4</explosionRadius>
-							<damageDef>KineticImpact</damageDef>
-							<explosionDelay>80</explosionDelay>
-							<dropsCasings>false</dropsCasings>
-							<speed>12</speed>
-							<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-							<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</projectile>
-					</value>
-				</li>
-
-				<!-- ========== Check Comp ========== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Proj_BaegYa"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Proj_BaegYa"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Proj_Dunder"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Proj_Dunder"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Proj_Bobcat"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Proj_Bobcat"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Proj_Grief"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Proj_Grief"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<!-- ========== Add Fragmentation ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Proj_BaegYa"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>0</Fragment_Small>
-							</fragments>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Proj_Dunder"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>0</Fragment_Small>
-							</fragments>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Proj_Bobcat"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>27</Fragment_Small>
-							</fragments>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Proj_Grief"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>0</Fragment_Small>
-							</fragments>
-						</li>
-					</value>
-				</li>
-
-				<!-- Weapon Stack and Appearance -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="YP_BaegYa" or
-						defName="JI_Dunder" or
-						defName="GD_Bobcat" or
-						defName="TE_Grief"
-						]/graphicData </xpath>
-					<value>
-						<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="YP_BaegYa" or
-						defName="JI_Dunder" or
-						defName="GD_Bobcat" or
-						defName="TE_Grief"
-						] </xpath>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<stackLimit>75</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="YP_BaegYa" or
-						defName="JI_Dunder" or
-						defName="GD_Bobcat" or
-						defName="TE_Grief"
-						] </xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<!-- Weapon Check Comps -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="YP_BaegYa"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="YP_BaegYa"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="JI_Dunder"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="JI_Dunder"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="GD_Bobcat"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GD_Bobcat"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="TE_Grief"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="TE_Grief"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<!-- Weapon Values -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="YP_BaegYa"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>40</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>1.5</explosiveRadius>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>20</Fragment_Small>
-							</fragments>
-						</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>YP_BaegYa</defName>
-					<statBases>
-						<Mass>0.4</Mass>
-						<MarketValue>4.75</MarketValue>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<label>throw microwave grenade</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<range>10.0</range>
-						<minRange>4</minRange>
-						<warmupTime>0.8</warmupTime>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<soundCast>ThrowGrenade</soundCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<defaultProjectile>Proj_BaegYa</defaultProjectile>
-						<onlyManualCast>true</onlyManualCast>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<weaponTags>
-						<li>CE_AI_Grenade</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="JI_Dunder"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>40</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>1.5</explosiveRadius>
-
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>50</Fragment_Small>
-							</fragments>
-						</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>JI_Dunder</defName>
-					<statBases>
-						<Mass>2.5</Mass>
-						<MarketValue>7.25</MarketValue>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<label>throw satchel charge</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<range>10.0</range>
-						<minRange>4</minRange>
-						<warmupTime>0.8</warmupTime>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<soundCast>ThrowGrenade</soundCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<defaultProjectile>Proj_Dunder</defaultProjectile>
-						<onlyManualCast>true</onlyManualCast>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<weaponTags>
-						<li>CE_AI_Grenade</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GD_Bobcat"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>40</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>1.5</explosiveRadius>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>50</Fragment_Small>
-							</fragments>
-						</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GD_Bobcat</defName>
-					<statBases>
-						<Mass>0.4</Mass>
-						<MarketValue>4.75</MarketValue>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>1.0</ShotSpread>
-					</statBases>
-					<Properties>
-						<label>throw mini grenades</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<range>11.0</range>
-						<minRange>4</minRange>
-						<warmupTime>0.8</warmupTime>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<soundCast>ThrowGrenade</soundCast>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<defaultProjectile>Proj_Bobcat</defaultProjectile>
-						<onlyManualCast>true</onlyManualCast>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<weaponTags>
-						<li>CE_AI_Grenade</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TE_Grief"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>40</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>1.5</explosiveRadius>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Small>20</Fragment_Small>
-							</fragments>
-						</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>TE_Grief</defName>
-					<statBases>
-						<Mass>0.4</Mass>
-						<MarketValue>4.75</MarketValue>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<label>throw impact grenade</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<range>10.0</range>
-						<minRange>4</minRange>
-						<warmupTime>0.8</warmupTime>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<soundCast>ThrowGrenade</soundCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<defaultProjectile>Proj_Grief</defaultProjectile>
-						<onlyManualCast>true</onlyManualCast>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<weaponTags>
-						<li>CE_AI_Grenade</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- YP BaegYa Microwave Grenades -->
-						<RecipeDef ParentName="RSExplosive_RecipeBase">
-							<defName>Craft_10_BaegYa</defName>
-							<label>Craft 10 microwave grenades</label>
-							<description>Craft 10 BaegYa microwave grenades.</description>
-							<jobString>Crafting microwave grenades</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>5</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<researchPrerequisite>ShardTech</researchPrerequisite>
-							<skillRequirements>
-								<Crafting>9</Crafting>
-							</skillRequirements>
-							<products>
-								<YP_BaegYa>10</YP_BaegYa>
-							</products>
-							<workAmount>20000</workAmount>
-							<recipeUsers>
-								<li>YPTable</li>
-							</recipeUsers>
-						</RecipeDef>
-
-						<!-- JI Dunder Satchel Charge -->
-						<RecipeDef ParentName="RSExplosive_RecipeBase">
-							<defName>Craft_10_Dunder</defName>
-							<label>Craft 10 satchel charges</label>
-							<description>Craft 10 Dunder satchel charges.</description>
-							<jobString>Crafting satchel charges</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>30</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-							</ingredients>
-							<researchPrerequisite>MoltenTech</researchPrerequisite>
-							<skillRequirements>
-								<Crafting>9</Crafting>
-							</skillRequirements>
-							<products>
-								<JI_Dunder>10</JI_Dunder>
-							</products>
-							<workAmount>20000</workAmount>
-							<recipeUsers>
-								<li>JITable</li>
-							</recipeUsers>
-						</RecipeDef>
-
-						<!-- GD Bobcat Micro Grenades -->
-						<RecipeDef ParentName="RSExplosive_RecipeBase">
-							<defName>Craft_10_Bobcat</defName>
-							<label>Craft 10 micro grenades</label>
-							<description>Craft 10 Bobcat micro grenades.</description>
-							<jobString>Crafting micro grenades</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>5</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<researchPrerequisite>DefenceTech</researchPrerequisite>
-							<products>
-								<GD_Bobcat>10</GD_Bobcat>
-							</products>
-							<workAmount>20000</workAmount>
-							<recipeUsers>
-								<li>GDTable</li>
-							</recipeUsers>
-						</RecipeDef>
-
-						<!-- TE Grief Impact Grenades -->
-						<RecipeDef ParentName="RSExplosive_RecipeBase">
-							<defName>Craft_10_Grief</defName>
-							<label>Craft 10 impact grenades</label>
-							<description>Craft 10 Grief impact grenades.</description>
-							<jobString>Crafting impact grenades</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>25</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<researchPrerequisite>KineticTech</researchPrerequisite>
-							<skillRequirements>
-								<Crafting>9</Crafting>
-							</skillRequirements>
-							<products>
-								<TE_Grief>10</TE_Grief>
-							</products>
-							<workAmount>20000</workAmount>
-							<recipeUsers>
-								<li>TETable</li>
-							</recipeUsers>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Core/Weapons_ExplosivesRecipeBase.xml b/Patches/Rimsenal Collection/Core/Weapons_ExplosivesRecipeBase.xml
deleted file mode 100644
index 167c4bb292..0000000000
--- a/Patches/Rimsenal Collection/Core/Weapons_ExplosivesRecipeBase.xml	
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Core</li>
-			<li>Rimsenal - Spacer Faction Pack</li>			
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-			<RecipeDef Name="RSExplosive_RecipeBase" Abstract="true">
-				<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-				<effectWorking>Cook</effectWorking>
-				<soundWorking>Recipe_Smith</soundWorking>
-				<workSkill>Crafting</workSkill>
-				<unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
-				<fixedIngredientFilter>
-					<thingDefs>
-						<li>Plasteel</li>
-						<li>ComponentIndustrial</li>
-						<li>FSX</li>
-					</thingDefs>
-				</fixedIngredientFilter>
-			</RecipeDef>
-
-			</value>
-
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Core/Weapons_GD_CE.xml b/Patches/Rimsenal Collection/Core/Weapons_GD_CE.xml
deleted file mode 100644
index 086fe6dc48..0000000000
--- a/Patches/Rimsenal Collection/Core/Weapons_GD_CE.xml	
+++ /dev/null
@@ -1,687 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ==========  Cost Change =========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/thingDef[defName="MRSKitR"]/recipeMaker/researchPrerequisite</xpath>
-					<value>
-						<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-					</value>
-				</li>
-
-				<!-- ==========  Melee Tools =========== -->
-
-				<!-- Pistols -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GD_MSSH" or
-						defName="GD_MSST" or
-						defName="GD_MSSF" or
-						defName="GD_TacticalPistol"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- Long guns-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GD_HybridRifle" or
-						defName="GD_ModularCarbine" or
-						defName="GD_ModularRifle" or
-						defName="GD_ModularDMR" or
-						defName="GD_ModularLMG" or
-						defName="GD_GrenadeLauncher"
-						]/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>
-				</li>
-				<!-- Carcal -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/thingDef[defName="GD_HVSMG"]</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>
-				</li>
-
-				<!-- ==========  "Black Panther" Hybrid Rifle =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GD_HybridRifle</defName>
-					<statBases>
-						<Mass>4.4</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.75</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.4</SwayFactor>
-						<Bulk>9.6</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.34</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_473x33mmGDHybrid_FMJ</defaultProjectile>
-						<warmupTime>1.05</warmupTime>
-						<range>58</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>ShotGRH</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>45</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_473x33mmCaseless_GDHybrid</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- ==========  Hybrid Ocelot =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GD_MSSH</defName>
-					<statBases>
-						<WorkToMake>50</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.48</SwayFactor>
-						<Bulk>2.35</Bulk>
-						<Mass>2.1</Mass>
-						<RangedWeapon_Cooldown>0.33</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_473x33mmGDHybrid_FMJ</defaultProjectile>
-						<warmupTime>0.65</warmupTime>
-						<range>23</range>
-						<soundCast>ShotGRH</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_473x33mmCaseless_GDHybrid</ammoSet>
-					</AmmoUser>
-					<FireModes>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ==========  Modular Triple-shot =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GD_MSST</defName>
-					<statBases>
-						<WorkToMake>50</WorkToMake>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.17</SwayFactor>
-						<Bulk>2.20</Bulk>
-						<Mass>1.25</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.12</recoilAmount><!--Halved from base-->
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_473x33mmGDPistol_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<range>18</range>
-						<soundCast>ShotLynx</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_473x33mmCaseless_GDPistol</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ==========  Modular Spitfire =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/thingDef[defName="GD_MSSS"]/statBases</xpath>
-					<value>
-						<statBases>
-							<WorkToMake>50</WorkToMake>
-							<SightsEfficiency>0.8</SightsEfficiency>
-							<ShotSpread>0.2</ShotSpread>
-							<SwayFactor>1.45</SwayFactor>
-							<Bulk>2.85</Bulk>
-							<Mass>1.51</Mass>
-							<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						</statBases>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/thingDef[defName="GD_MSSS"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.04</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_473x33mmGDPistol_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<burstShotCount>5</burstShotCount>
-								<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-								<range>12</range>
-								<soundCast>ShotLynx</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/thingDef[defName="GD_MSSS"]</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>45</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_473x33mmCaseless_GDPistol</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-							</li>
-						</comps>
-						<weaponTags>
-							<li>CE_Sidearm</li>
-							<li>CE_AI_Pistol</li>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/thingDef[defName="GD_MSSS"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ==========  Modular Flakker =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GD_MSSF</defName>
-					<statBases>
-						<WorkToMake>50</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.36</ShotSpread>
-						<SwayFactor>1.22</SwayFactor>
-						<Bulk>1.90</Bulk>
-						<Mass>1.75</Mass>
-						<RangedWeapon_Cooldown>1.06</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_25x40mmGrenade_HE</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>18</range>
-						<soundCast>ShotLynx</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>4</AmmoGenPerMagOverride>
-						<reloadTime>2.6</reloadTime>
-						<ammoSet>AmmoSet_25x40mmGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ==========  Tactical Pistol =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GD_TacticalPistol</defName>
-					<statBases>
-						<Mass>1.25</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>1.02</SwayFactor>
-						<Bulk>1.25</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>ShotLynx</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>14</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ==========  Modular Carbine =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GD_ModularCarbine</defName>
-					<statBases>
-						<Mass>2.5</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.04</SwayFactor>
-						<Bulk>6.4</Bulk>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-						<Chemfuel>10</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>1.56</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_473x33mmCaseless_FMJ</defaultProjectile>
-						<warmupTime>0.85</warmupTime>
-						<range>40</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>ShotGRC</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>45</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_473x33mmCaseless</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>false</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- ==========  Modular Rifle =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GD_ModularRifle</defName>
-					<statBases>
-						<Mass>3.5</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.75</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.34</SwayFactor>
-						<Bulk>9.45</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.32</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_473x33mmCaseless_FMJ</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>62</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>ShotGRC</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>45</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_473x33mmCaseless</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- ==========  Modular DMR =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GD_ModularDMR</defName>
-					<statBases>
-						<Mass>3.91</Mass>
-						<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.60</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.12</SwayFactor>
-						<Bulk>11.85</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.12</recoilAmount><!--Further reduction of the recoil from 0.2x to 0.1x to facilitate aimed shots a bit better-->
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_473x33mmCaseless_FMJ</defaultProjectile>
-						<warmupTime>1.9</warmupTime>
-						<range>81</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<soundCast>ShotGRM</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>45</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_473x33mmCaseless</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SniperRifle</li>
-						<li>Bipod_DMR</li>
-					</weaponTags>
-				</li>
-
-				<!-- ==========  Modular LMG =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GD_ModularLMG</defName>
-					<statBases>
-						<Mass>6.8</Mass>
-						<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<Bulk>11.75</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.87</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_473x33mmCaseless_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>67</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>ShotGRS</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>150</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_473x33mmCaseless</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_MachineGun</li>
-						<li>Bipod_LMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- ==========  Caracal SMG =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/thingDef[defName="GD_HVSMG"]/statBases</xpath>
-					<value>
-						<statBases>
-							<WorkToMake>50</WorkToMake>
-							<SightsEfficiency>1</SightsEfficiency>
-							<ShotSpread>0.17</ShotSpread>
-							<SwayFactor>0.55</SwayFactor>
-							<Bulk>2.31</Bulk>
-							<Mass>3.2</Mass>
-							<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						</statBases>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/thingDef[defName="GD_HVSMG"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.58</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-								<range>16</range>
-								<soundCast>ShotCaracal</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/thingDef[defName="GD_HVSMG"]</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>36</magazineSize>
-								<reloadTime>4.5</reloadTime>
-								<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-							</li>
-						</comps>
-						<weaponTags>
-							<li>CE_SMG</li>
-							<li>CE_AI_AssaultWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<!-- ==========  GD Multi Launcher =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GD_GrenadeLauncher</defName>
-					<statBases>
-						<WorkToMake>55000</WorkToMake>
-						<Mass>5.5</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>1.15</SwayFactor>
-						<Bulk>6.0</Bulk>
-					</statBases>
-					<costList>
-						<Steel>45</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-						<Chemfuel>10</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>2.58</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_25x40mmGrenade_HE</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>45</range>
-						<minRange>2</minRange>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<soundCast>ShotGdgrenade</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>5.1</reloadTime>
-						<ammoSet>AmmoSet_25x40mmGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<researchPrerequisite>CE_Launchers</researchPrerequisite>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/thingDef[defName="GD_BSLauncher"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/thingDef[defName="GD_INGrenadeLauncher"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/thingDef[defName="GD_SKGrenadeLauncher"]</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Core/Weapons_JI_CE.xml b/Patches/Rimsenal Collection/Core/Weapons_JI_CE.xml
deleted file mode 100644
index 32580476d7..0000000000
--- a/Patches/Rimsenal Collection/Core/Weapons_JI_CE.xml	
+++ /dev/null
@@ -1,488 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==========  Melee Tools =========== -->
-
-				<!-- Pistols -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/thingDef[defName="JI_Trollsverd"]</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- Long guns-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/thingDef[defName="JI_Hrunting" or
-						defName="JI_Gramr" or
-						defName="JI_Muspell"
-						] </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>
-				</li>
-				<!-- Heavy Weapons -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/thingDef[defName="JI_Grendel" or
-						defName="JI_Fafnir"
-						] </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>
-				</li>
-
-				<!-- ==========  Trollsverd Pistol =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/thingDef[defName="JI_Trollsverd"]/statBases</xpath>
-					<value>
-						<statBases>
-							<WorkToMake>35500</WorkToMake>
-							<SightsEfficiency>0.7</SightsEfficiency>
-							<ShotSpread>0.17</ShotSpread>
-							<SwayFactor>1.83</SwayFactor>
-							<Bulk>2.90</Bulk>
-							<Mass>2.81</Mass>
-							<RangedWeapon_Cooldown>0.47</RangedWeapon_Cooldown>
-						</statBases>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/thingDef[defName="JI_Trollsverd"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.2</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_JI_Molten</defaultProjectile>
-								<warmupTime>1.0</warmupTime>
-								<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-								<range>12</range>
-								<soundCast>RS_ShotJI</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>12</muzzleFlashScale>
-							</li>
-						</verbs>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/thingDef[defName="JI_Trollsverd"]</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>8</magazineSize>
-								<reloadTime>4.8</reloadTime>
-								<ammoSet>AmmoSet_JIStandard</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-							</li>
-						</comps>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/thingDef[defName="JI_Trollsverd"]/weaponTags</xpath>
-					<value>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-				<!-- ==========  Hrunting Rifle =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/thingDef[defName="JI_Hrunting"]/statBases</xpath>
-					<value>
-						<statBases>
-							<WorkToMake>45500</WorkToMake>
-							<SightsEfficiency>1</SightsEfficiency>
-							<ShotSpread>0.05</ShotSpread>
-							<SwayFactor>1.72</SwayFactor>
-							<Bulk>11.40</Bulk>
-							<Mass>5.81</Mass>
-							<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
-						</statBases>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/thingDef[defName="JI_Hrunting"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.25</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_JI_Molten</defaultProjectile>
-								<warmupTime>1.4</warmupTime>
-								<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-								<burstShotCount>3</burstShotCount>
-								<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-								<range>52</range>
-								<soundCast>RS_ShotJI</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>11</muzzleFlashScale>
-							</li>
-						</verbs>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/thingDef[defName="JI_Hrunting"]</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>40</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_JIStandard</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiUseBurstMode>false</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-								<aimedBurstShotCount>2</aimedBurstShotCount>
-							</li>
-						</comps>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/thingDef[defName="JI_Hrunting"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1,1</DrawSize>
-							<DrawOffset>0,0</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Gramr AMR =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/thingDef[defName="JI_Gramr"]/statBases</xpath>
-					<value>
-						<statBases>
-							<WorkToMake>50500</WorkToMake>
-							<SightsEfficiency>1.6</SightsEfficiency>
-							<ShotSpread>0.01</ShotSpread>
-							<SwayFactor>3.43</SwayFactor>
-							<Bulk>25</Bulk>
-							<Mass>15.50</Mass>
-							<RangedWeapon_Cooldown>2.45</RangedWeapon_Cooldown>
-						</statBases>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/thingDef[defName="JI_Gramr"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>12.77</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_JI_AMR</defaultProjectile>
-								<warmupTime>3.525</warmupTime>
-								<ammoConsumedPerShotCount>30</ammoConsumedPerShotCount>
-								<range>58</range>
-								<soundCast>RS_ShotJI</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>15</muzzleFlashScale>
-							</li>
-						</verbs>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/thingDef[defName="JI_Gramr"]</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>90</magazineSize>
-								<reloadTime>6</reloadTime>
-								<ammoSet>AmmoSet_JI_AMR</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-						<weaponTags>
-						</weaponTags>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/thingDef[defName="JI_Gramr"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.1,1.1</DrawSize>
-							<DrawOffset>0,0</DrawOffset>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/thingDef[defName="JI_Gramr"]/weaponTags</xpath>
-					<value>
-						<li>Bipod_AMR</li>
-					</value>
-				</li>
-
-				<!-- ========== Grendel Rocket Launcher =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/thingDef[defName="JI_Grendel"]/statBases</xpath>
-					<value>
-						<statBases>
-							<WorkToMake>90500</WorkToMake>
-							<SightsEfficiency>1.6</SightsEfficiency>
-							<ShotSpread>0.1</ShotSpread>
-							<SwayFactor>2.99</SwayFactor>
-							<Bulk>18.50</Bulk>
-							<Mass>15</Mass>
-							<RangedWeapon_Cooldown>3.63</RangedWeapon_Cooldown>
-						</statBases>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/thingDef[defName="JI_Grendel"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>4.5</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_JISiegeRound</defaultProjectile>
-								<warmupTime>2.075</warmupTime>
-								<range>48</range>
-								<ammoConsumedPerShotCount>80</ammoConsumedPerShotCount>
-								<soundCast>RS_ShotJI</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>15</muzzleFlashScale>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</li>
-						</verbs>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/thingDef[defName="JI_Grendel"]</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>240</magazineSize>
-								<reloadTime>8</reloadTime>
-								<ammoSet>AmmoSet_JISiege</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-						<weaponTags>
-						</weaponTags>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/thingDef[defName="JI_Grendel"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.1,1.1</DrawSize>
-							<DrawOffset>0,0</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<!-- ==========  Suppression Cannon =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/thingDef[defName="JI_Muspell"]/statBases</xpath>
-					<value>
-						<statBases>
-							<WorkToMake>62500</WorkToMake>
-							<SightsEfficiency>1.1</SightsEfficiency>
-							<ShotSpread>0.1</ShotSpread>
-							<SwayFactor>2.06</SwayFactor>
-							<Bulk>12.5</Bulk>
-							<Mass>8.1</Mass>
-							<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
-						</statBases>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/thingDef[defName="JI_Muspell"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.85</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_JI_Suppressor</defaultProjectile>
-								<warmupTime>2.25</warmupTime>
-								<range>62</range>
-								<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-								<burstShotCount>20</burstShotCount>
-								<soundCast>RS_ShotMuspell</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>12</muzzleFlashScale>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<recoilPattern>Mounted</recoilPattern>
-							</li>
-						</verbs>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/thingDef[defName="JI_Muspell"]</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>200</magazineSize>
-								<reloadTime>7.8</reloadTime>
-								<ammoSet>AmmoSet_JISuppressor</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aimedBurstShotCount>10</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>SuppressFire</aiAimMode>
-							</li>
-						</comps>
-						<weaponTags>
-						</weaponTags>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/thingDef[defName="JI_Muspell"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.1,1.1</DrawSize>
-							<DrawOffset>0,0</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<!-- Siege Shotgun -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/thingDef[defName="JI_Fafnir"]/statBases</xpath>
-					<value>
-						<statBases>
-							<WorkToMake>54500</WorkToMake>
-							<SightsEfficiency>1.0</SightsEfficiency>
-							<ShotSpread>0.2</ShotSpread>
-							<SwayFactor>1.75</SwayFactor>
-							<Bulk>11.5</Bulk>
-							<Mass>6.03</Mass>
-							<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-						</statBases>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/thingDef[defName="JI_Fafnir"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_JI_Slag</defaultProjectile>
-								<warmupTime>1.0</warmupTime>
-								<range>14</range>
-								<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
-								<soundCast>RS_ShotFafnir</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
-							</li>
-						</verbs>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/thingDef[defName="JI_Fafnir"]</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>21</magazineSize>
-								<reloadTime>4.3</reloadTime>
-								<ammoSet>AmmoSet_JISlag</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes" />
-						</comps>
-						<weaponTags>
-						</weaponTags>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/thingDef[defName="JI_Fafnir"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.1,1.1</DrawSize>
-							<DrawOffset>0,0</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Core/Weapons_TE_CE.xml b/Patches/Rimsenal Collection/Core/Weapons_TE_CE.xml
deleted file mode 100644
index 79ae25a674..0000000000
--- a/Patches/Rimsenal Collection/Core/Weapons_TE_CE.xml	
+++ /dev/null
@@ -1,418 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==========  Melee Tools =========== -->
-
-				<!-- Pistols -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/thingDef[defName="TE_KineticPistol"]</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- Long guns-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/thingDef[defName="TE_KineticRifle" or
-						defName="TE_ThuddGun" or
-						defName="TE_KineticLongRifle" or
-						defName="TE_StormCannon"
-						] </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>
-				</li>
-				<!-- Heavy Weapons -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/thingDef[defName="TE_KineticLance"]</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>
-				</li>
-
-				<!-- ==========  TE Kinetic Rifle  =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/thingDef[defName="TE_KineticRifle"]/statBases</xpath>
-					<value>
-						<statBases>
-							<WorkToMake>50800</WorkToMake>
-							<SightsEfficiency>1.0</SightsEfficiency>
-							<ShotSpread>0.08</ShotSpread>
-							<SwayFactor>1.25</SwayFactor>
-							<Bulk>9.20</Bulk>
-							<Mass>3.30</Mass>
-							<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						</statBases>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/thingDef[defName="TE_KineticRifle"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.56</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_TEPowerCharge_KE</defaultProjectile>
-								<warmupTime>0.9</warmupTime>
-								<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-								<burstShotCount>5</burstShotCount>
-								<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-								<range>44</range>
-								<soundCast>ImpactM</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>8</muzzleFlashScale>
-							</li>
-						</verbs>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/thingDef[defName="TE_KineticRifle"]</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>60</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_TEPowerCharge</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ==========  TE Kinetic Pistol  =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/thingDef[defName="TE_KineticPistol"]/statBases</xpath>
-					<value>
-						<statBases>
-							<WorkToMake>30800</WorkToMake>
-							<SightsEfficiency>0.7</SightsEfficiency>
-							<ShotSpread>0.17</ShotSpread>
-							<SwayFactor>0.93</SwayFactor>
-							<Bulk>1.70</Bulk>
-							<Mass>1.10</Mass>
-							<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						</statBases>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/thingDef[defName="TE_KineticPistol"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.8</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_TEPowerCharge_KE</defaultProjectile>
-								<warmupTime>0.4</warmupTime>
-								<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-								<range>12</range>
-								<soundCast>ImpactM</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>8</muzzleFlashScale>
-							</li>
-						</verbs>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/thingDef[defName="TE_KineticPistol"]</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>18</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_TEPowerCharge</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ==========  TE Thudd Gun  =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/thingDef[defName="TE_ThuddGun"]/statBases</xpath>
-					<value>
-						<statBases>
-							<WorkToMake>46800</WorkToMake>
-							<SightsEfficiency>1.0</SightsEfficiency>
-							<ShotSpread>0.21</ShotSpread>
-							<SwayFactor>1.37</SwayFactor>
-							<Bulk>9.60</Bulk>
-							<Mass>4.11</Mass>
-							<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						</statBases>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/thingDef[defName="TE_ThuddGun"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.48</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_TEEnergyCanister_KE</defaultProjectile>
-								<ammoConsumedPerShotCount>10</ammoConsumedPerShotCount>
-								<warmupTime>0.9</warmupTime>
-								<range>32</range>
-								<soundCast>ImpactB</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>12</muzzleFlashScale>
-							</li>
-						</verbs>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/thingDef[defName="TE_ThuddGun"]</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>100</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_TEEnergyCanister</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ==========  TE Kinetic Long Rifle  =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/thingDef[defName="TE_KineticLongRifle"]/statBases</xpath>
-					<value>
-						<statBases>
-							<WorkToMake>46800</WorkToMake>
-							<SightsEfficiency>2.60</SightsEfficiency>
-							<ShotSpread>0.04</ShotSpread>
-							<SwayFactor>1.74</SwayFactor>
-							<Bulk>12.10</Bulk>
-							<Mass>4.50</Mass>
-							<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-						</statBases>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/thingDef[defName="TE_KineticLongRifle"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.01</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_TEConcentratedPowerCharge_KE</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<ammoConsumedPerShotCount>6</ammoConsumedPerShotCount>
-								<range>75</range>
-								<soundCast>ImpactB</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>12</muzzleFlashScale>
-							</li>
-						</verbs>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/thingDef[defName="TE_KineticLongRifle"]</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>60</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_TEConcentratedPowerCharge</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ==========  TE Storm Cannon  =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/thingDef[defName="TE_StormCannon"]/statBases</xpath>
-					<value>
-						<statBases>
-							<WorkToMake>65800</WorkToMake>
-							<SightsEfficiency>1.0</SightsEfficiency>
-							<ShotSpread>0.18</ShotSpread>
-							<SwayFactor>1.34</SwayFactor>
-							<Bulk>12.60</Bulk>
-							<Mass>6.85</Mass>
-							<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
-						</statBases>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/thingDef[defName="TE_StormCannon"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.25</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_TEEnergyCanister_KE</defaultProjectile>
-								<warmupTime>1.75</warmupTime>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-								<ammoConsumedPerShotCount>10</ammoConsumedPerShotCount>
-								<range>62</range>
-								<soundCast>ImpactB</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>12</muzzleFlashScale>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</li>
-						</verbs>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/thingDef[defName="TE_StormCannon"]</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>240</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_TEEnergyCanister</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ==========  TE Kinetic Lance  =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/thingDef[defName="TE_KineticLance"]/statBases</xpath>
-					<value>
-						<statBases>
-							<WorkToMake>65800</WorkToMake>
-							<SightsEfficiency>2.1</SightsEfficiency>
-							<ShotSpread>0.12</ShotSpread>
-							<SwayFactor>1.82</SwayFactor>
-							<Bulk>18.00</Bulk>
-							<Mass>10</Mass>
-							<RangedWeapon_Cooldown>1.1</RangedWeapon_Cooldown>
-						</statBases>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/thingDef[defName="TE_KineticLance"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>0.22</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_TEPowerCore_KE</defaultProjectile>
-								<warmupTime>2.5</warmupTime>
-								<burstShotCount>50</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
-								<range>44</range>
-								<soundCast>ImpactB</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>12</muzzleFlashScale>
-							</li>
-						</verbs>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/thingDef[defName="TE_KineticLance"]</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>150</magazineSize>
-								<reloadTime>8</reloadTime>
-								<ammoSet>AmmoSet_TEPowerCore</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aimedBurstShotCount>25</aimedBurstShotCount>
-								<noSingleShot>true</noSingleShot>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Core/Weapons_YP_CE.xml b/Patches/Rimsenal Collection/Core/Weapons_YP_CE.xml
deleted file mode 100644
index 4ebce77880..0000000000
--- a/Patches/Rimsenal Collection/Core/Weapons_YP_CE.xml	
+++ /dev/null
@@ -1,442 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==========  Melee Tools =========== -->
-
-				<!-- Pistols -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="YP_SeolHwa"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Long guns-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="YP_SeoLi" or
-						defName="YP_SagPung" or
-						defName="YP_SangAe" or
-						defName="YP_VectorShot"
-						]/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>
-				</li>
-
-				<!-- Heavy Weapons -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="YP_GeugGwang"]/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>
-				</li>
-
-				<!-- ==========  YP Shard Rifle =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="YP_SeoLi"]/statBases</xpath>
-					<value>
-						<statBases>
-							<WorkToMake>48500</WorkToMake>
-							<SightsEfficiency>1.1</SightsEfficiency>
-							<ShotSpread>0.14</ShotSpread>
-							<SwayFactor>1.15</SwayFactor>
-							<Bulk>8.20</Bulk>
-							<Mass>3.12</Mass>
-							<RangedWeapon_Cooldown>0.2</RangedWeapon_Cooldown>
-						</statBases>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="YP_SeoLi"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>0.80</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_RifleYP</defaultProjectile>
-								<warmupTime>1.0</warmupTime>
-								<burstShotCount>10</burstShotCount>
-								<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-								<range>38</range>
-								<soundCast>RS_ShotShard</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>4</muzzleFlashScale>
-							</li>
-						</verbs>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="YP_SeoLi"]</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>60</magazineSize>
-								<reloadTime>3</reloadTime>
-								<ammoSet>AmmoSet_RifleYP</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aimedBurstShotCount>5</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ==========  YP Swarmer =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="YP_SagPung"]/statBases</xpath>
-					<value>
-						<statBases>
-							<WorkToMake>42500</WorkToMake>
-							<SightsEfficiency>1.1</SightsEfficiency>
-							<ShotSpread>0.40</ShotSpread>
-							<SwayFactor>0.20</SwayFactor>
-							<Bulk>9.70</Bulk>
-							<Mass>2.85</Mass>
-							<RangedWeapon_Cooldown>0.22</RangedWeapon_Cooldown>
-						</statBases>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="YP_SagPung"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>0.25</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_SwarmerYP</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<ammoConsumedPerShotCount>4</ammoConsumedPerShotCount>
-								<burstShotCount>3</burstShotCount>
-								<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-								<range>15</range>
-								<soundCast>RS_ShotSwarm</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="YP_SagPung"]</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>60</magazineSize>
-								<reloadTime>3</reloadTime>
-								<ammoSet>AmmoSet_SwarmerYP</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aimedBurstShotCount>2</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ==========  YP Spike Rifle =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="YP_SangAe"]/statBases</xpath>
-					<value>
-						<statBases>
-							<WorkToMake>55500</WorkToMake>
-							<SightsEfficiency>1.86</SightsEfficiency>
-							<ShotSpread>0.04</ShotSpread>
-							<SwayFactor>1.52</SwayFactor>
-							<Bulk>12.20</Bulk>
-							<Mass>3.30</Mass>
-							<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-						</statBases>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="YP_SangAe"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.33</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_SpikeYP</defaultProjectile>
-								<warmupTime>1.3</warmupTime>
-								<range>68</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-								<soundCast>RS_ShotSpike</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>8</muzzleFlashScale>
-							</li>
-						</verbs>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="YP_SangAe"]</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>24</magazineSize>
-								<reloadTime>3.5</reloadTime>
-								<ammoSet>AmmoSet_SpikeYP</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiAimMode>AimedShot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- ==========  YP Dual Wield Shard Pistols =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="YP_SeolHwa"]/statBases</xpath>
-					<value>
-						<statBases>
-							<WorkToMake>50500</WorkToMake>
-							<SightsEfficiency>0.7</SightsEfficiency>
-							<ShotSpread>0.2</ShotSpread>
-							<SwayFactor>1.5</SwayFactor>
-							<Bulk>4.7</Bulk>
-							<Mass>4.32</Mass>
-							<RangedWeapon_Cooldown>0.2</RangedWeapon_Cooldown>
-						</statBases>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="YP_SeolHwa"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>0.32</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_PistolYP</defaultProjectile>
-								<warmupTime>0.5</warmupTime>
-								<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-								<burstShotCount>8</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<range>12</range>
-								<soundCast>RS_ShotShard</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>3</muzzleFlashScale>
-							</li>
-						</verbs>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="YP_SeolHwa"]</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>32</magazineSize>
-								<reloadTime>4.5</reloadTime>
-								<ammoSet>AmmoSet_PistolYP</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aimedBurstShotCount>4</aimedBurstShotCount>
-								<aiUseBurstMode>True</aiUseBurstMode>
-								<aiAimMode>Snapshot</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="YP_SeolHwa"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="YP_SeolHwa"]</xpath>
-						<value>
-							<weaponTags>
-								<li>CE_Sidearm</li>
-								<li>CE_AI_Pistol</li>
-							</weaponTags>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="YP_SeolHwa"]/weaponTags</xpath>
-						<value>
-							<li>CE_Sidearm</li>
-							<li>CE_AI_Pistol</li>
-						</value>
-					</match>
-				</li>
-
-				<!-- ==========  YP Microwave Emmiter =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="YP_GeugGwang"]/statBases</xpath>
-					<value>
-						<statBases>
-							<WorkToMake>42500</WorkToMake>
-							<SightsEfficiency>1.0</SightsEfficiency>
-							<ShotSpread>0.0</ShotSpread>
-							<SwayFactor>1.21</SwayFactor>
-							<Bulk>8.70</Bulk>
-							<Mass>4.32</Mass>
-							<RangedWeapon_Cooldown>2.5</RangedWeapon_Cooldown>
-						</statBases>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="YP_GeugGwang"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.17</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_GeugGwang_CE</defaultProjectile>
-								<warmupTime>1</warmupTime>
-								<ticksBetweenBurstShots>0</ticksBetweenBurstShots>
-								<range>62</range>
-								<soundCast>RS_ShotBoreas</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>14</muzzleFlashScale>
-							</li>
-						</verbs>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="YP_GeugGwang"]</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_FireModes" />
-						</comps>
-					</value>
-				</li>
-
-				<!-- ==========  YP Vector Shot =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="YP_VectorShot"]/statBases</xpath>
-					<value>
-						<statBases>
-							<WorkToMake>58500</WorkToMake>
-							<SightsEfficiency>3.0</SightsEfficiency>
-							<ShotSpread>0.02</ShotSpread>
-							<SwayFactor>0.25</SwayFactor>
-							<Bulk>6.20</Bulk>
-							<Mass>3.06</Mass>
-							<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						</statBases>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="YP_VectorShot"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.25</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_VectorYP</defaultProjectile>
-								<warmupTime>1.4</warmupTime>
-								<burstShotCount>3</burstShotCount>
-								<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-								<range>14</range>
-								<soundCast>RS_ShotShard</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>10</muzzleFlashScale>
-								<circularError>0</circularError>
-								<indirectFirePenalty>0</indirectFirePenalty>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</li>
-						</verbs>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="YP_VectorShot"]</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>16</magazineSize>
-								<reloadTime>3.5</reloadTime>
-								<ammoSet>AmmoSet_VectorYP</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aimedBurstShotCount>2</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Enhanced Vanilla/Ammo_EnhancedVanilla.xml b/Patches/Rimsenal Collection/Enhanced Vanilla/Ammo_EnhancedVanilla.xml
deleted file mode 100644
index f11e937167..0000000000
--- a/Patches/Rimsenal Collection/Enhanced Vanilla/Ammo_EnhancedVanilla.xml	
+++ /dev/null
@@ -1,310 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Enhanced Vanilla Pack</li>
-			<li>Rimsenal - Augmented Vanilla Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ================== EMP Blast - Projectiles ================== -->
-
-						<ThingDef ParentName="BaseExplosiveBullet">
-							<defName>EMP_Blast</defName>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<label>emp blast</label>
-							<graphicData>
-								<texPath>Things/Projectile/EMPBlast</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>EMP</damageDef>
-								<damageAmountBase>25</damageAmountBase>
-								<speed>60</speed>
-								<flyOverhead>false</flyOverhead>
-								<explosionRadius>1</explosionRadius>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							</projectile>
-						</ThingDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_LaserEMP_Rimsenal</defName>
-							<label>Charge Pack (EMP)</label>
-							<ammoTypes>
-								<Ammo_LaserChargePack>EMP_Blast</Ammo_LaserChargePack>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<!-- The amount of arrows usable over the ammo lifetime for each resource cost is equal to
-		[r / (1 - x)];
-			x = preExplosionSpawnChance,
-			r = resource cost. -->
-
-						<ThingDef ParentName="BasePilumProjectile">
-							<defName>Club_Thrown</defName>
-							<label>club</label>
-							<graphicData>
-								<texPath>Things/A16/ThrowingClubs</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Blunt</damageDef>
-								<damageAmountBase>15</damageAmountBase>
-								<speed>22</speed>
-								<armorPenetrationBlunt>0.18</armorPenetrationBlunt>
-								<preExplosionSpawnChance>0.50</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Gun_ThrowingClubs</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<!-- The amount of arrows usable over the ammo lifetime for each resource cost is equal to
-		[r / (1 - x)];
-			x = preExplosionSpawnChance,
-			r = resource cost. -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BasePilumProjectile">
-							<defName>Axe_Thrown</defName>
-							<label>axe</label>
-							<graphicData>
-								<texPath>Things/A16/ThrowingAxes</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Cut</damageDef>
-								<damageAmountBase>16</damageAmountBase>
-								<speed>22</speed>
-								<armorPenetrationSharp>1.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>27</armorPenetrationBlunt>
-								<preExplosionSpawnChance>0.80</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Gun_ThrowingAxes</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== Compound Arrows ========================== -->
-
-						<ThingCategoryDef>
-							<defName>AmmoCompoundArrows</defName>
-							<label>compound arrows</label>
-							<parent>AmmoNeolithic</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberArrow</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_CompoundArrow</defName>
-							<label>compound arrows</label>
-							<ammoTypes>
-								<Ammo_CompoundArrow_Broadhead>Projectile_CompoundArrow_Broadhead</Ammo_CompoundArrow_Broadhead>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="AmmoCompoundArrowBase" ParentName="NeolithicAmmoBase" Abstract="True">
-							<description>Modern arrows with a strong carbon shaft, designed to be fired from a powerful compound bow.</description>
-							<statBases>
-								<Mass>0.034</Mass>
-								<Bulk>0.08</Bulk>
-								<Flammability>0</Flammability>
-							</statBases>
-							<thingCategories>
-								<li>AmmoArrows</li>
-							</thingCategories>
-							<stackLimit>200</stackLimit>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_FueledSmithy</li>
-								<li>CE_AutoEnableCrafting_ElectricSmithy</li>
-							</tradeTags>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoCompoundArrowBase">
-							<defName>Ammo_CompoundArrow_Broadhead</defName>
-							<label>compound arrow</label>
-							<graphicData>
-								<texPath>ThirdParty/Rimsenal/CompoundArrows</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>1.20</MarketValue>
-							</statBases>
-							<ammoClass>SteelArrow</ammoClass>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<!-- The amount of arrows usable over the ammo lifetime for each resource cost is equal to
-			[r / (1 - x)];
-				x = preExplosionSpawnChance,
-				r = resource cost. -->
-
-						<ThingDef ParentName="BaseArrowProjectile">
-							<defName>Projectile_CompoundArrow_Broadhead</defName>
-							<label>compound arrow</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Plasteel</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Arrow</damageDef>
-								<speed>50</speed>
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationBlunt>2.34</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-								<preExplosionSpawnChance>0.5</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>Ammo_CompoundArrow_Broadhead</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>MakeAmmo_CompoundArrow_Broadhead</defName>
-							<label>make compound arrows x10</label>
-							<description>Craft 10 compound arrows.</description>
-							<jobString>Making compound arrows.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Chemfuel</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Chemfuel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_CompoundArrow_Broadhead>10</Ammo_CompoundArrow_Broadhead>
-							</products>
-							<workAmount>900</workAmount>
-						</RecipeDef>
-
-						<!-- ==================== Thumper Fuel Cell ammoset ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_30x64mmFuel_RSThump</defName>
-							<label>30x64mm Fuel Cell (Thumper)</label>
-							<ammoTypes>
-								<Ammo_30x64mmFuel_Thermobaric>Bullet_30x64mmFuel_RSThump</Ammo_30x64mmFuel_Thermobaric>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="Base30x64mmFuelBullet">
-							<defName>Bullet_30x64mmFuel_RSThump</defName>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<label>concussion bolt</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>2.0</explosionRadius>
-								<damageDef>Thump</damageDef>
-								<damageAmountBase>24</damageAmountBase>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0</armorPenetrationBlunt>
-								<soundExplode>ThumpCannon_Impact</soundExplode>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<ai_IsIncendiary>true</ai_IsIncendiary>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>MakeAmmo_Gun_ThrowingClub</defName>
-							<label>make throwing club x5</label>
-							<description>Craft 5 throwing clubs.</description>
-							<jobString>Making throwing clubs.</jobString>
-							<workAmount>400</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<recipeUsers>
-								<li>CraftingSpot</li>
-							</recipeUsers>
-							<products>
-								<Gun_ThrowingClubs>5</Gun_ThrowingClubs>
-							</products>
-						</RecipeDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>MakeAmmo_Gun_ThrowingAxes</defName>
-							<label>make throwing axe x5</label>
-							<description>Craft 5 throwing axes.</description>
-							<jobString>Making throwing axes.</jobString>
-							<workAmount>900</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<recipeUsers>
-								<li>ElectricSmithy</li>
-								<li>FueledSmithy</li>
-							</recipeUsers>
-							<products>
-								<Gun_ThrowingAxes>5</Gun_ThrowingAxes>
-							</products>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Enhanced Vanilla/Apparel_RS_CE.xml b/Patches/Rimsenal Collection/Enhanced Vanilla/Apparel_RS_CE.xml
deleted file mode 100644
index 204e6203f5..0000000000
--- a/Patches/Rimsenal Collection/Enhanced Vanilla/Apparel_RS_CE.xml	
+++ /dev/null
@@ -1,436 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Enhanced Vanilla Pack</li>
-			<li>Rimsenal - Augmented Vanilla Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Tactical "Armor" =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_TacVest" and techLevel="Spacer"]</xpath>
-					<value>
-						<ThingDef ParentName="ApparelMakeableBase">
-							<defName>Apparel_TacArmor</defName>
-							<label>tactical armor</label>
-							<description>An ergonomically designed body armor. This type of armor increase wearer's combat efficiency.</description>
-							<techLevel>Spacer</techLevel>
-							<graphicData>
-								<texPath>Things/Apparel/TacVest</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<statBases>
-								<Mass>6</Mass>
-								<Bulk>6</Bulk>
-								<WornBulk>0</WornBulk>
-								<WorkToMake>15000</WorkToMake>
-								<MaxHitPoints>290</MaxHitPoints>
-								<ArmorRating_Blunt>24</ArmorRating_Blunt>
-								<ArmorRating_Sharp>12</ArmorRating_Sharp>
-								<ArmorRating_Heat>0.25</ArmorRating_Heat>
-								<Insulation_Cold>1</Insulation_Cold>
-								<EquipDelay>4</EquipDelay>
-							</statBases>
-							<equippedStatOffsets>
-								<CarryBulk>10</CarryBulk>
-								<ReloadSpeed>0.10</ReloadSpeed>
-							</equippedStatOffsets>
-							<thingCategories>
-								<li>Apparel</li>
-							</thingCategories>
-							<recipeMaker>
-								<unfinishedThingDef>UnfinishedTechArmor</unfinishedThingDef>
-								<researchPrerequisite>ComplexClothing</researchPrerequisite>
-								<recipeUsers Inherit="False">
-									<li>FabricationBench</li>
-								</recipeUsers>
-								<skillRequirements>
-									<Crafting>7</Crafting>
-								</skillRequirements>
-							</recipeMaker>
-							<costList>
-								<ComponentSpacer>1</ComponentSpacer>
-								<Plasteel>50</Plasteel>
-								<DevilstrandCloth>25</DevilstrandCloth>
-							</costList>
-							<generateCommonality>0.5</generateCommonality>
-							<apparel>
-								<defaultOutfitTags>
-									<li>Soldier</li>
-								</defaultOutfitTags>
-								<bodyPartGroups>
-									<li>Torso</li>
-									<li>Shoulders</li>
-									<li>Neck</li>
-								</bodyPartGroups>
-								<wornGraphicPath>Things/Apparel/TacVest</wornGraphicPath>
-								<layers>
-									<li>Middle</li>
-								</layers>
-								<tags>
-									<li>SpacerMilitary</li>
-								</tags>
-							</apparel>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Apparel_TacArmor"]</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>
-
-				<!-- ========== Tactical Helmet =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_TacHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_TacHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_TacHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>20</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_TacHelmet"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.50</ArmorRating_Heat>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_TacHelmet"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>15</DevilstrandCloth>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_TacHelmet"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>25</Plasteel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Apparel_TacHelmet"]/apparel/bodyPartGroups/li[.="Neck"]</xpath>
-				</li>
-
-				<!-- ========== Exoframe =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_Exoframe"]/statBases</xpath>
-					<value>
-						<Bulk>35</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Exoframe"]/statBases/Mass</xpath>
-					<value>
-						<Mass>10</Mass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Exoframe"]/statBases/WorkToMake</xpath>
-					<value>
-						<WorkToMake>38000</WorkToMake>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Exoframe"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>300</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_Exoframe"]/costList</xpath>
-					<value>
-						<Uranium>10</Uranium>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_Exoframe"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>10</CarryBulk>
-					</value>
-				</li>
-
-				<!-- ========== Protective Gear =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_ProtectiveGear"]/statBases</xpath>
-					<value>
-						<Bulk>80</Bulk>
-						<WornBulk>18</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ProtectiveGear"]/statBases/WorkToMake</xpath>
-					<value>
-						<WorkToMake>42000</WorkToMake>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ProtectiveGear"]/statBases/Mass</xpath>
-					<value>
-						<Mass>18.5</Mass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ProtectiveGear"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ProtectiveGear"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>15</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Apparel_ProtectiveGear"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_ProtectiveGear"]/equippedStatOffsets</xpath>
-					<value>
-						<ToxicEnvironmentResistance>0.30</ToxicEnvironmentResistance>
-						<MeleeDodgeChance>-0.25</MeleeDodgeChance>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_ProtectiveGear"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Apparel_ProtectiveGear"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>1.2</ArmorRating_Sharp>
-									<parts>
-										<li>Torso</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>1.2</ArmorRating_Blunt>
-									<parts>
-										<li>Torso</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.96</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.96</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.96</ArmorRating_Sharp>
-									<parts>
-										<li>Shoulder</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.96</ArmorRating_Blunt>
-									<parts>
-										<li>Shoulder</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.30</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.24</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.12</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Foot</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.30</ArmorRating_Blunt>
-									<parts>
-										<li>Foot</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Protective Helmet =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_ProtectiveHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ProtectiveHelmet"]/statBases/WorkToMake</xpath>
-					<value>
-						<WorkToMake>14000</WorkToMake>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ProtectiveHelmet"]/statBases/Mass</xpath>
-					<value>
-						<Mass>4.5</Mass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ProtectiveHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ProtectiveHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>22.5</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Apparel_ProtectiveHelmet"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Apparel_ProtectiveHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Apparel_ProtectiveHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_ProtectiveHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<ToxicEnvironmentResistance>0.20</ToxicEnvironmentResistance>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-						<AimingAccuracy>-0.2</AimingAccuracy>
-						<MeleeHitChance>-1</MeleeHitChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_ProtectiveHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Apparel_ProtectiveHelmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.85</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.95</ArmorRating_Sharp>
-									<parts>
-										<li>Nose</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.95</ArmorRating_Blunt>
-									<parts>
-										<li>Nose</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
-			
-			
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Enhanced Vanilla/Weapons_Charge_CE.xml b/Patches/Rimsenal Collection/Enhanced Vanilla/Weapons_Charge_CE.xml
deleted file mode 100644
index f4f80ff1dc..0000000000
--- a/Patches/Rimsenal Collection/Enhanced Vanilla/Weapons_Charge_CE.xml	
+++ /dev/null
@@ -1,437 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Enhanced Vanilla Pack</li>
-			<li>Rimsenal - Augmented Vanilla Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Charge Sidearm =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_ChargeSidearm</defName>
-					<statBases>
-						<WorkToMake>17500</WorkToMake>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.37</SwayFactor>
-						<Bulk>2.60</Bulk>
-						<Mass>1.50</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<Plasteel>20</Plasteel>
-						<ComponentIndustrial>8</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>AdvancedGun</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_ChargeSidearm"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Longgun Melee Tools =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_ScatterCharger" or defName="Gun_ChargeDriver" or defName="Gun_EMPRifle" or defName="Gun_AssaultCharger" or defName="Gun_BurstCharger"]/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>
-				</li>
-
-				<!-- ========== Scatter Charger	=========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_ScatterCharger</defName>
-					<statBases>
-						<WorkToMake>31000</WorkToMake>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.46</SwayFactor>
-						<Bulk>9.60</Bulk>
-						<Mass>5.00</Mass>
-						<RangedWeapon_Cooldown>0.99</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>60</Steel>
-						<Plasteel>30</Plasteel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-						<Chemfuel>5</Chemfuel>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12GaugeCharged</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>16</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>0.85</reloadTime>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<ammoSet>AmmoSet_12GaugeCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>AdvancedGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Charge Driver	=========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_ChargeDriver</defName>
-					<statBases>
-						<WorkToMake>59000</WorkToMake>
-						<SightsEfficiency>2.5</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>2.08</SwayFactor>
-						<Bulk>12.00</Bulk>
-						<Mass>8.00</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>80</Steel>
-						<Plasteel>35</Plasteel>
-						<ComponentIndustrial>10</ComponentIndustrial>
-						<Chemfuel>5</Chemfuel>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12x72mmCharged</defaultProjectile>
-						<warmupTime>2.8</warmupTime>
-						<range>86</range>
-						<soundCast>ChargeLance_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_12x72mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>SniperRifle</li>
-						<li>AdvancedGun</li>
-						<li>Bipod_AMR</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== EMP Rifle	=========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_EMPRifle</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>9.85</Bulk>
-						<Mass>4.80</Mass>
-						<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.44</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>EMP_Blast</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>40</range>
-						<burstShotCount>4</burstShotCount>
-						<ammoConsumedPerShotCount>5</ammoConsumedPerShotCount>
-						<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_LaserEMP_Rimsenal</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>AdvancedGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Assault Charger =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AssaultCharger</defName>
-					<statBases>
-						<WorkToMake>50500</WorkToMake>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.18</SwayFactor>
-						<Bulk>11.00</Bulk>
-						<Mass>6.80</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>75</Steel>
-						<Plasteel>35</Plasteel>
-						<ComponentIndustrial>10</ComponentIndustrial>
-						<Chemfuel>5</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>1.18</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>75</range>
-						<burstShotCount>20</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>ChargeLance_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>15</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_MachineGun</li>
-						<li>CE_AI_Suppressive</li>
-						<li>AdvancedGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Burst Charger =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_BurstCharger</defName>
-					<statBases>
-						<WorkToMake>60500</WorkToMake>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.49</SwayFactor>
-						<Bulk>9.60</Bulk>
-						<Mass>5.30</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>60</Steel>
-						<Plasteel>30</Plasteel>
-						<ComponentIndustrial>11</ComponentIndustrial>
-						<Chemfuel>5</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>1.39</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>ChargeLance_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>AdvancedGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Charge Longgun =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_CFR</defName>
-					<statBases>
-						<WorkToMake>81000</WorkToMake>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.61</SwayFactor>
-						<Bulk>11.45</Bulk>
-						<Mass>4.60</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>60</Steel>
-						<Plasteel>80</Plasteel>
-						<ComponentIndustrial>14</ComponentIndustrial>
-						<Chemfuel>10</Chemfuel>
-						<ComponentSpacer>1</ComponentSpacer>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8x50mmCharged</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>62</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_8x50mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>AdvancedGun</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_CFR"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.55</cooldownTime>
-								<chanceFactor>0.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>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>bayonet</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.55</cooldownTime>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<armorPenetrationSharp>24.01</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Enhanced Vanilla/Weapons_RSGuns_CE.xml b/Patches/Rimsenal Collection/Enhanced Vanilla/Weapons_RSGuns_CE.xml
deleted file mode 100644
index e67605b757..0000000000
--- a/Patches/Rimsenal Collection/Enhanced Vanilla/Weapons_RSGuns_CE.xml	
+++ /dev/null
@@ -1,562 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Enhanced Vanilla Pack</li>
-			<li>Rimsenal - Augmented Vanilla Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Longgun Melee Tools =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_RSBattleRifle" or defName="Gun_RSCarbine" or defName="Gun_RSAMRifle" or defName="Gun_AutomaticRifle" or defName="Gun_Repeater" or defName="Gun_MilitiaRifle" or defName="Gun_MarksmanRifle" or defName="Gun_RSThumper"]/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>
-				</li>
-
-				<!-- ========== Battle Rifle =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_RSBattleRifle</defName>
-					<statBases>
-						<WorkToMake>32500</WorkToMake>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.44</SwayFactor>
-						<Bulk>10.25</Bulk>
-						<Mass>4.10</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>55</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-						<Chemfuel>10</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>2.07</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<range>55</range>
-						<soundCast>RS_ShotBattleRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Carbine =========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_RSCarbine</defName>
-					<statBases>
-						<WorkToMake>29000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.03</SwayFactor>
-						<Bulk>6.8</Bulk>
-						<Mass>2.95</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-						<Chemfuel>5</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>1.61</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>0.85</warmupTime>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<range>44</range>
-						<soundCast>RS_ShotCarbine</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>3.8</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Heavy Revolver =========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PistolHeavyRevolver</defName>
-					<statBases>
-						<WorkToMake>6000</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.94</SwayFactor>
-						<Bulk>3.81</Bulk>
-						<Mass>2.0</Mass>
-						<RangedWeapon_Cooldown>0.41</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>35</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_500SWMagnum_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>RS_ShotRevolver</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_500SWMagnum</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_PistolHeavyRevolver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== AM Rifle =========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_RSAMRifle</defName>
-					<statBases>
-						<WorkToMake>35000</WorkToMake>
-						<SightsEfficiency>3.0</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.84</SwayFactor>
-						<Bulk>13</Bulk>
-						<Mass>13.5</Mass>
-						<RangedWeapon_Cooldown>0.58</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>105</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>3</warmupTime>
-						<range>86</range>
-						<soundCast>RS_ShotAMRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>15</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>Bipod_AMR</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Gun_RSAMRifle"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<!-- ========== Automatic Rfile =========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AutomaticRifle</defName>
-					<statBases>
-						<WorkToMake>39000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>2.11</SwayFactor>
-						<Bulk>12.15</Bulk>
-						<Mass>8.80</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>75</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-						<WoodLog>10</WoodLog>
-					</costList>
-					<Properties>
-						<recoilAmount>1.38</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
-						<warmupTime>1.55</warmupTime>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<range>55</range>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_3006Springfield</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>Tag</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Repeater =========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Repeater</defName>
-					<statBases>
-						<WorkToMake>11500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1.68</SwayFactor>
-						<Bulk>12.50</Bulk>
-						<Mass>4.30</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>60</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-						<WoodLog>10</WoodLog>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_44-40Winchester_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_Revolver</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_44-40Winchester</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Militia Rifle =========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MilitiaRifle</defName>
-					<statBases>
-						<WorkToMake>27000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<Bulk>8.80</Bulk>
-						<Mass>3.47</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>45</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-						<WoodLog>10</WoodLog>
-					</costList>
-					<Properties>
-						<recoilAmount>1.82</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<range>44</range>
-						<soundCast>RS_ShotMilitiaRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Frontier Rifle =========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_FR</defName>
-					<statBases>
-						<WorkToMake>17500</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.14</SwayFactor>
-						<Bulk>9.50</Bulk>
-						<Mass>2.70</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>45</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-						<WoodLog>10</WoodLog>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>51</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_FR"]/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>bayonet</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.38</cooldownTime>
-								<armorPenetrationBlunt>1.08</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.72</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Marksman Rifle : NATO SVD=========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MarksmanRifle</defName>
-					<statBases>
-						<WorkToMake>23000</WorkToMake>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.70</SwayFactor>
-						<Bulk>12.25</Bulk>
-						<Mass>4.30</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>60</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-						<WoodLog>10</WoodLog>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<soundCast>Shot_SniperRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_SR</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_RSThumper</defName>
-					<statBases>
-						<Mass>8</Mass>
-						<RangedWeapon_Cooldown>0.43</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.8</SwayFactor>
-						<Bulk>10</Bulk>
-						<WorkToMake>39500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>65</Steel>
-						<Plasteel>30</Plasteel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-						<Chemfuel>10</Chemfuel>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_30x64mmFuel_RSThump</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>40</range>
-						<burstShotCount>0</burstShotCount>
-						<soundCast>ThumpCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_30x64mmFuel_RSThump</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AOE</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Enhanced Vanilla/Weapons_Ranged_CE.xml b/Patches/Rimsenal Collection/Enhanced Vanilla/Weapons_Ranged_CE.xml
deleted file mode 100644
index a5aea86ac8..0000000000
--- a/Patches/Rimsenal Collection/Enhanced Vanilla/Weapons_Ranged_CE.xml	
+++ /dev/null
@@ -1,295 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Enhanced Vanilla Pack</li>
-			<li>Rimsenal - Augmented Vanilla Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Remove Duplicate Rimsenal Smoke Grenade =========== -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Proj_GrenadeSmoke" and graphicData/texPath="Things/Projectile/SmokeGrenade"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Weapon_GrenadeSmoke" and graphicData/texPath="Things/A16/SmokeGrenades"]</xpath>
-				</li>
-
-				<!-- ========== Compound Bow =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Bow_Compound</defName>
-					<statBases>
-						<WorkToMake>22000</WorkToMake>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.6</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>4.5</Bulk>
-						<Mass>1.6</Mass>
-						<RangedWeapon_Cooldown>1.15</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>5</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-						<Chemfuel>15</Chemfuel>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_CompoundArrow_Broadhead</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>26</range>
-						<soundCast>Bow_Large</soundCast>
-					</Properties>
-					<AmmoUser>
-						<ammoSet>AmmoSet_CompoundArrow</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Bow</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bow_Compound"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.76</cooldownTime>
-								<armorPenetrationBlunt>1.76</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Throwing Axe =========== -->
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="Gun_ThrowingAxes"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>BaseWeapon</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Gun_ThrowingAxes"]/costList</xpath>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Gun_ThrowingAxes"]</xpath>
-					<value>
-						<thingCategories>
-							<li>WeaponsRanged</li>
-						</thingCategories>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Gun_ThrowingAxes"]/recipeMaker</xpath>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_ThrowingAxes"]/label</xpath>
-					<value>
-						<label>Throwing axe</label>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_ThrowingAxes"]/statBases</xpath>
-					<value>
-						<statBases>
-							<SightsEfficiency>1.0</SightsEfficiency>
-							<ShotSpread>0.6</ShotSpread>
-							<SwayFactor>2</SwayFactor>
-							<Bulk>1.25</Bulk>
-							<Mass>0.75</Mass>
-							<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
-						</statBases>
-						<stackLimit>25</stackLimit>
-						<tradeTags>
-							<li>CE_AutoEnableTrade</li>
-							<li>CE_AutoEnableCrafting</li>
-						</tradeTags>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_ThrowingAxes"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Axe_Thrown</defaultProjectile>
-								<warmupTime>1.5</warmupTime>
-								<range>16</range>
-								<soundCast>Interact_BeatFire</soundCast>
-							</li>
-						</verbs>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_ThrowingAxes"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.4</cooldownTime>
-								<armorPenetrationBlunt>0.375</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2.62</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.25</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Throwing Club =========== -->
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="Gun_ThrowingClubs"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>BaseWeapon</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Gun_ThrowingClubs"]/costList</xpath>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Gun_ThrowingClubs"]/recipeMaker</xpath>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Gun_ThrowingClubs"]</xpath>
-					<value>
-						<techLevel>Neolithic</techLevel>
-						<thingCategories>
-							<li>WeaponsRanged</li>
-						</thingCategories>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_ThrowingClubs"]/label</xpath>
-					<value>
-						<label>Throwing club</label>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_ThrowingClubs"]/statBases</xpath>
-					<value>
-						<statBases>
-							<SightsEfficiency>1.0</SightsEfficiency>
-							<ShotSpread>0.6</ShotSpread>
-							<SwayFactor>2</SwayFactor>
-							<Bulk>1</Bulk>
-							<Mass>0.5</Mass>
-							<RangedWeapon_Cooldown>1.3</RangedWeapon_Cooldown>
-						</statBases>
-						<stackLimit>25</stackLimit>
-						<tradeTags>
-							<li>CE_AutoEnableTrade</li>
-							<li>CE_AutoEnableCrafting_CraftingSpot</li>
-						</tradeTags>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_ThrowingClubs"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Club_Thrown</defaultProjectile>
-								<warmupTime>1.5</warmupTime>
-								<range>16</range>
-								<soundCast>Interact_BeatFire</soundCast>
-							</li>
-						</verbs>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_ThrowingClubs"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.69</cooldownTime>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>3.29</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>3.2</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== No Blowgun (Yet) =========== -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Gun_Blowgun"]</xpath>
-				</li>
-
-				<!--			
-			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-				<defName>Gun_Blowgun</defName>
-				<statBases>
-					<WorkToMake>600</WorkToMake>
-					<SightsEfficiency>0.7</SightsEfficiency>
-					<ShotSpread>0.6</ShotSpread>
-					<SwayFactor>2.5</SwayFactor>
-					<Bulk>2</Bulk>
-					<Mass>1</Mass>
-					<RangedWeapon_Cooldown>4</RangedWeapon_Cooldown>
-				</statBases>
-				<costList>
-					<Wood>20</Wood>
-				</costList>
-				<Properties>				
-					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-					<hasStandardCommand>true</hasStandardCommand>
-					<defaultProjectile>Projectile_Blowdart</defaultProjectile>
-					<warmupTime>1</warmupTime>
-					<range>22</range>
-					<soundCast>Beat_Fire</soundCast>
-				</Properties>
-				<AmmoUser>
-					<ammoSet>AmmoSet_Blowdart</ammoSet>
-				</AmmoUser>
-				<FireModes>
-					<aiAimMode>AimedShot</aiAimMode>
-				</FireModes>
-				<weaponTags>
-				<li>CE_Bow</li>
-				</weaponTags>
-			</li>
-
--->
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Enhanced Vanilla/Weapons_Smart_CE.xml b/Patches/Rimsenal Collection/Enhanced Vanilla/Weapons_Smart_CE.xml
deleted file mode 100644
index 68475a8ba2..0000000000
--- a/Patches/Rimsenal Collection/Enhanced Vanilla/Weapons_Smart_CE.xml	
+++ /dev/null
@@ -1,315 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Enhanced Vanilla Pack</li>
-			<li>Rimsenal - Augmented Vanilla Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Melee Tools =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_SmartRifle" or defName="Gun_SMG" or defName="SmartMG" or defName="Gun_SmartSniperRifle"]/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>
-				</li>
-
-				<!-- ========== Stats =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="Gun_SmartPistol" or
-						defName="Gun_SmartRifle" or
-						defName="Gun_SMG" or
-						defName="SmartMG" or
-						defName="Gun_SmartSniperRifle"
-						]/statBases </xpath>
-					<value>
-						<NightVisionEfficiency_Weapon>1</NightVisionEfficiency_Weapon>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="Gun_SmartPistol" or
-						defName="Gun_SmartRifle" or
-						defName="Gun_SMG" or
-						defName="SmartMG" or
-						defName="Gun_SmartSniperRifle"
-						]/equippedStatOffsets </xpath>
-					<value>
-						<AimingAccuracy>0.5</AimingAccuracy>
-					</value>
-				</li>
-
-				<!-- ========== Smart Rifle =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SmartRifle</defName>
-					<statBases>
-						<WorkToMake>39500</WorkToMake>
-						<SightsEfficiency>1.8</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1.34</SwayFactor>
-						<Bulk>9.00</Bulk>
-						<Mass>3.40</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.97</recoilAmount><!--Halved from 1.93-->
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>0.9</warmupTime>
-						<range>62</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>RS_ShotSmartRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>24</magazineSize>
-						<reloadTime>3.0</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_Rifle</li>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>AdvancedGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Smart Pistol =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SmartPistol</defName>
-					<statBases>
-						<WorkToMake>11500</WorkToMake>
-						<SightsEfficiency>0.9</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>0.61</SwayFactor><!--50% reduction from 1.12-->
-						<Bulk>2.10</Bulk>
-						<Mass>1.25</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
-						<warmupTime>0.4</warmupTime>
-						<range>21</range>
-						<soundCast>RS_ShotSmartPistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>18</magazineSize>
-						<reloadTime>3.0</reloadTime>
-						<ammoSet>AmmoSet_FN57x28mm</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>AdvancedGun</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_SmartPistol"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Smart SMG =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SMG</defName>
-					<statBases>
-						<WorkToMake>37000</WorkToMake>
-						<SightsEfficiency>1.2</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.72</SwayFactor>
-						<Bulk>4.20</Bulk>
-						<Mass>3.0</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.7</recoilAmount><!--Halved from 1.40-->
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
-						<warmupTime>0.4</warmupTime>
-						<range>28</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<soundCast>RS_ShotSmartSMG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>36</magazineSize>
-						<reloadTime>3.0</reloadTime>
-						<ammoSet>AmmoSet_FN57x28mm</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>AdvancedGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Smart MG =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>SmartMG</defName>
-					<statBases>
-						<WorkToMake>44000</WorkToMake>
-						<SightsEfficiency>1.2</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.60</SwayFactor>
-						<Bulk>14.05</Bulk>
-						<Mass>10.50</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.67</recoilAmount><!--Halved from 1.33-->
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>68</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>RS_ShotSmartMG</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>6.8</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_MachineGun</li>
-						<li>CE_AI_Suppressive</li>
-						<li>AdvancedGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Smart Sniper Rifle =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SmartSniperRifle</defName>
-					<statBases>
-						<WorkToMake>42500</WorkToMake>
-						<SightsEfficiency>5</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.41</SwayFactor><!--25% reduction from 1.88-->
-						<Bulk>10.20</Bulk>
-						<Mass>7.6</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>86</range>
-						<soundCast>RS_ShotSSR</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>3.0</reloadTime>
-						<ammoSet>AmmoSet_338Lapua</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Rifle</li>
-						<li>AdvancedGun</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Factions/PawnKinds.xml b/Patches/Rimsenal Collection/Factions/PawnKinds.xml
deleted file mode 100644
index 221b725da1..0000000000
--- a/Patches/Rimsenal Collection/Factions/PawnKinds.xml	
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal Factions</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Deserters === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="CD_Recruit" or
-						defName="CD_Soldier" or
-						defName="CD_Elite" or
-						defName="CD_Officer" or
-						defName="CD_Leader"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Greydale === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="GD_Grunt_Pistol"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>4</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="GD_Defender_Rifle" or
-						defName="GD_Defender_Scout" or
-						@Name="GD_ProtectorBase"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="GD_EliteBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>7</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>200</min>
-										<max>800</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>GD_Knife</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="GD_Defender_Grenadier" or
-						defName="GD_Protector_Grenadier" or
-						defName="GD_Defender_Scout" or
-						defName="GD_Protector_Sapper"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>12</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Jotun === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="JI_Recruit"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>4</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="JI_Soldier" or
-						defName="JI_Elite" or
-						defName="JI_Officer" or
-						defName="JI_Leader"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="JI_Sapper"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>12</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Tisiphone === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="TE_Recruit"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>4</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="TE_Soldier" or
-						defName="TE_Elite" or
-						defName="TE_Officer" or
-						defName="TE_Leader"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>7</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- === YeonHwa === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="YP_Recruit"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>4</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="YP_Soldier" or
-						defName="YP_Elite" or
-						defName="YP_Officer" or
-						defName="YP_Leader"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="YP_Microwave"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>12</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Federation/Bodies/Bodies_FederatorMech.xml b/Patches/Rimsenal Collection/Federation/Bodies/Bodies_FederatorMech.xml
deleted file mode 100644
index b6476d256c..0000000000
--- a/Patches/Rimsenal Collection/Federation/Bodies/Bodies_FederatorMech.xml	
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Federation Faction Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Mechsuit-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Mechsuit"]/corePart</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<!--Neck Parts-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Mechsuit"]/corePart/parts/li[def = "MechNeck"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Mechsuit"]/corePart/parts/li[def = "MechNeck"]/parts/li[def = "MechHead"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!--Arm Parts-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Mechsuit"]/corePart/parts/li[def = "MechShoulder"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Mechsuit"]/corePart/parts/li[def = "MechShoulder"]/parts/li[def = "MechArm"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Mechsuit"]/corePart/parts/li[def = "MechShoulder"]/parts/li[def = "MechArm"]/parts/li[def="MechHand"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Mechsuit"]/corePart/parts/li[def = "MechShoulder"]/parts/li[def = "MechArm"]/parts/li[def="MechHand"]/parts/li[def="MechFinger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!--Leg Parts-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Mechsuit"]/corePart/parts/li[def = "MechLeg"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Mechsuit"]/corePart/parts/li[def = "MechLeg"]/parts/li[def="MechFoot"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Federation/Bodies/Bodies_SeekerMech.xml b/Patches/Rimsenal Collection/Federation/Bodies/Bodies_SeekerMech.xml
deleted file mode 100644
index 9e85f047f4..0000000000
--- a/Patches/Rimsenal Collection/Federation/Bodies/Bodies_SeekerMech.xml	
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Federation Faction Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Mechsuit-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Biodrone"]/corePart</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<!--Neck Parts-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Biodrone"]/corePart/parts/li[def = "MechNeck"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Biodrone"]/corePart/parts/li[def = "MechNeck"]/parts/li[def = "MechHead"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!--Arm Parts-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Biodrone"]/corePart/parts/li[def = "MechShoulder"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Biodrone"]/corePart/parts/li[def = "MechShoulder"]/parts/li[def = "MechArm"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Biodrone"]/corePart/parts/li[def = "MechShoulder"]/parts/li[def = "MechArm"]/parts/li[def="MechHand"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Biodrone"]/corePart/parts/li[def = "MechShoulder"]/parts/li[def = "MechArm"]/parts/li[def="MechHand"]/parts/li[def="MechFinger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!--Leg Parts-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Biodrone"]/corePart/parts/li[def = "MechEngine"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Biodrone"]/corePart/parts/li[def = "MechEngine"]/parts/li[def="MechThruster"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Federation/PawnKindDefs/PawnKinds_Federation.xml b/Patches/Rimsenal Collection/Federation/PawnKindDefs/PawnKinds_Federation.xml
deleted file mode 100644
index 548bac8cb5..0000000000
--- a/Patches/Rimsenal Collection/Federation/PawnKindDefs/PawnKinds_Federation.xml	
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Federation Faction Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Auxiliary ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FPCAuxiliary"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Commander ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FPCCommander"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Assassin ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FPCAssassin"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<magazineCount>
-										<min>1</min>
-										<max>5</max>
-									</magazineCount>
-									<generateChance>0.7</generateChance>
-									<sidearmMoney>
-										<min>275</min>
-										<max>525</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>FedCC</li>
-										<li>AuxPistol</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Unity Guard ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FPCUnityGuard"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<magazineCount>
-										<min>2</min>
-										<max>5</max>
-									</magazineCount>
-									<generateChance>0.7</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>450</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>FedCC</li>
-										<li>AuxPistol</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Federation/ThingDefs_Misc/Ammo_Fed.xml b/Patches/Rimsenal Collection/Federation/ThingDefs_Misc/Ammo_Fed.xml
deleted file mode 100644
index ccf220ebcb..0000000000
--- a/Patches/Rimsenal Collection/Federation/ThingDefs_Misc/Ammo_Fed.xml	
+++ /dev/null
@@ -1,332 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Federation Faction Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ==========  Harvester Cannon =========== -->
-
-						<ThingDef ParentName="Base40x365mmBoforsBullet">
-							<defName>Bullet_HarvesterCannon</defName>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<label>energy bolt</label>
-							<graphicData>
-								<texPath>Things/Projectile/Laser</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Optic</damageDef>
-								<speed>106</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<armorPenetrationSharp>14</armorPenetrationSharp>
-								<explosionRadius>1</explosionRadius>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==========  Plasma Bombard Projectile =========== -->
-
-						<ThingDef ParentName="BaseExplosiveBullet">
-							<defName>Bullet_PlasmaTurretBombard</defName>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<label>energy bolt</label>
-							<graphicData>
-								<texPath>Things/Projectile/Plasma</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Plasma</damageDef>
-								<speed>0</speed>
-								<flyOverhead>true</flyOverhead>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>25</damageAmountBase>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<armorPenetrationSharp>14</armorPenetrationSharp>
-								<explosionRadius>2.5</explosionRadius>
-								<gravityFactor>5</gravityFactor>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==========  Crucible Cannon Projectile =========== -->
-
-						<ThingDef ParentName="Base40x365mmBoforsBullet">
-							<defName>Bullet_CrucibleCannon</defName>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<label>energy bolt</label>
-							<graphicData>
-								<texPath>Things/Projectile/Mlaser</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Optic</damageDef>
-								<speed>98</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<explosionRadius>1</explosionRadius>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==========  Mech Plasma Bombard Projectile =========== -->
-
-						<ThingDef ParentName="BaseExplosiveBullet">
-							<defName>Bullet_PlasmaMechBombard</defName>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<label>energy bolt</label>
-							<graphicData>
-								<texPath>Things/Projectile/MFlux</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Plasma</damageDef>
-								<speed>63</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>50</damageAmountBase>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<armorPenetrationSharp>14</armorPenetrationSharp>
-								<explosionRadius>4</explosionRadius>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==========  Plasma Rifle Projectile =========== -->
-
-						<ThingDef ParentName="Base556x45mmNATOBullet">
-							<defName>Bullet_PlasmaRifle</defName>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<label>plasma sphere</label>
-							<graphicData>
-								<texPath>Things/Projectile/Plasma</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Plasma</damageDef>
-								<speed>54</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>25</damageAmountBase>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<armorPenetrationSharp>16</armorPenetrationSharp>
-								<explosionRadius>1.5</explosionRadius>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==========  EMP Bomb Projectile =========== -->
-
-						<ThingDef ParentName="BaseExplosiveBullet">
-							<defName>Bullet_EMPBomb</defName>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<label>EMP</label>
-							<graphicData>
-								<texPath>Things/A16/MechPlasma</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>EMP</damageDef>
-								<speed>43</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>100</damageAmountBase>
-								<armorPenetrationBase>0.5</armorPenetrationBase>
-								<explosionRadius>5.5</explosionRadius>
-								<explosionDelay>20</explosionDelay>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==========  Auxiliary Pistol Projectile =========== -->
-
-						<ThingDef ParentName="Base45ACPBullet">
-							<defName>Bullet_AuxiliaryPistol</defName>
-							<label>energy bolt</label>
-							<graphicData>
-								<texPath>Things/Projectile/Laser</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Optic</damageDef>
-								<speed>90</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>8</damageAmountBase>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==========  Makeshift Crucible Rifle Projectile =========== -->
-
-						<ThingDef ParentName="Base556x45mmNATOBullet">
-							<defName>Bullet_MakeshiftCrucibleRifle</defName>
-							<label>energy bolt</label>
-							<graphicData>
-								<texPath>Things/Projectile/Laser</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Optic</damageDef>
-								<speed>90</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>13</damageAmountBase>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==========  Crucible Rifle Projectile =========== -->
-
-						<ThingDef ParentName="Base556x45mmNATOBullet">
-							<defName>Bullet_CrucibleRifle</defName>
-							<label>energy bolt</label>
-							<graphicData>
-								<texPath>Things/Projectile/Laser</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Optic</damageDef>
-								<speed>90</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==========  Crucible Pistol Projectile =========== -->
-
-						<ThingDef ParentName="Base45ACPBullet">
-							<defName>Bullet_CruciblePistol</defName>
-							<label>energy bolt</label>
-							<graphicData>
-								<texPath>Things/Projectile/Laser</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Optic</damageDef>
-								<speed>90</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>10</damageAmountBase>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==========  Heat Cannon Projectile =========== -->
-
-						<ThingDef ParentName="Base40x365mmBoforsBullet">
-							<defName>Bullet_HeatCannon</defName>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<label>heat bolt</label>
-							<graphicData>
-								<texPath>Things/Projectile/Pulse</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Flame</damageDef>
-								<speed>90</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>5</damageAmountBase>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<explosionRadius>0.5</explosionRadius>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==========  Crucible Precision Rifle Projectile =========== -->
-
-						<ThingDef ParentName="Base556x45mmNATOBullet">
-							<defName>Bullet_CruciblePrecisionRifle</defName>
-							<label>energy bolt</label>
-							<graphicData>
-								<texPath>Things/Projectile/Laser</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Optic</damageDef>
-								<speed>90</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==========  Plasma Caster Projectile =========== -->
-
-						<ThingDef ParentName="Base40x365mmBoforsBullet">
-							<defName>Bullet_PlasmaCaster</defName>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<label>plasma sphere</label>
-							<graphicData>
-								<texPath>Things/Projectile/Flux</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Plasma</damageDef>
-								<speed>32</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>25</damageAmountBase>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<explosionRadius>2.5</explosionRadius>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==========  Plasma Bomb Projectile =========== -->
-
-						<ThingDef ParentName="Base40x365mmBoforsBullet">
-							<defName>Bullet_PlasmaBomb</defName>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<label>plasma bomb</label>
-							<graphicData>
-								<texPath>Things/Projectile/Flux</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Plasma</damageDef>
-								<speed>43</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>100</damageAmountBase>
-								<armorPenetrationBase>0.5</armorPenetrationBase>
-								<explosionRadius>4</explosionRadius>
-								<explosionDelay>20</explosionDelay>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==========  Crucible Carbine Projectile =========== -->
-
-						<ThingDef ParentName="Base556x45mmNATOBullet">
-							<defName>Bullet_CrucibleCarbine</defName>
-							<label>energy bolt</label>
-							<graphicData>
-								<texPath>Things/Projectile/Laser</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Optic</damageDef>
-								<speed>90</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>8</damageAmountBase>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Federation/ThingDefs_Misc/Fed_Apparel.xml b/Patches/Rimsenal Collection/Federation/ThingDefs_Misc/Fed_Apparel.xml
deleted file mode 100644
index 1b424e33dd..0000000000
--- a/Patches/Rimsenal Collection/Federation/ThingDefs_Misc/Fed_Apparel.xml	
+++ /dev/null
@@ -1,551 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Federation Faction Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==========  Federation Undersuit =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="FedSuit"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="FedSuit"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>5</CarryBulk>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="FedSuit"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Feet</li>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FedSuit"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="FedSuit"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>0.8</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ========== Riot Armor =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Judicator"]/statBases/Mass</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<Mass>60</Mass>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_Judicator"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>80</CarryWeight>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_Judicator"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Judicator"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>28</ArmorRating_Sharp>
-						<ArmorRating_Electric>0.75</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Judicator"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>28</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Judicator"]/costList/Foerum</xpath>
-					<value>
-						<Foerum>190</Foerum>
-						<DevilstrandCloth>30</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Apparel_Judicator"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Riot Helmet =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_JudicatorH"]/statBases/Mass</xpath>
-					<value>
-						<Mass>5</Mass>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_JudicatorH"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>28</ArmorRating_Sharp>
-						<ArmorRating_Electric>0.70</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_JudicatorH"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>28</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Apparel_JudicatorH"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Apparel_JudicatorH"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_JudicatorH"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_JudicatorH"]/costList/Foerum</xpath>
-					<value>
-						<Foerum>70</Foerum>
-						<DevilstrandCloth>10</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_JudicatorH"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Apparel_JudicatorH"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.7</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-										<li>Jaw</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.7</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-										<li>Jaw</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Marksman Armor =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MarksmanGear"]/statBases/Mass</xpath>
-					<value>
-						<Mass>15</Mass>
-						<Bulk>40</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_MarksmanGear"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>20</CarryWeight>
-						<CarryBulk>15</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_MarksmanGear"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MarksmanGear"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-						<ArmorRating_Electric>0.30</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MarksmanGear"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Apparel_MarksmanGear"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>1.80</ArmorRating_Sharp>
-									<parts>
-										<li>Torso</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>2.0</ArmorRating_Blunt>
-									<parts>
-										<li>Torso</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.50</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.50</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Foot</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Foot</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Marksman Helmet =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_MarksmanGearH"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.9</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MarksmanGearH"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-						<ArmorRating_Electric>0.20</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_MarksmanGearH"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_MarksmanGearH"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-0.75</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_MarksmanGearH"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!-- ========== Unity Guard Armor =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_UGCuirass"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_UGCuirass"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<CarryBulk>10</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_UGCuirass"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_UGCuirass"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-						<ArmorRating_Electric>0.30</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_UGCuirass"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>10</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Apparel_UGCuirass"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-										<li>Shoulder</li>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-										<li>Shoulder</li>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Unity Guard Helmet =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_UGHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1.6</WornBulk>
-						<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_UGHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>11</ArmorRating_Sharp>
-						<ArmorRating_Electric>0.30</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_UGHelmet"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_UGHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!-- ========== Unity Guard Cloak =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_UGCloak"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<!-- ========== Foerum Material =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Foerum"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Foerum"]/stuffProps/categories</xpath>
-					<value>
-						<li>Metallic_Weapon</li>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Foerum"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>2</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Foerum"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.8</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Foerum"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
-						<StuffPower_Armor_Electric>0.05</StuffPower_Armor_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Foerum"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>0.8</Mass>
-						<MeleePenetrationFactor>1.3</MeleePenetrationFactor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Foerum"]/statBases/SharpDamageMultiplier</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Federation/ThingDefs_Misc/Fed_DamageDefs.xml b/Patches/Rimsenal Collection/Federation/ThingDefs_Misc/Fed_DamageDefs.xml
deleted file mode 100644
index 6e38787a62..0000000000
--- a/Patches/Rimsenal Collection/Federation/ThingDefs_Misc/Fed_DamageDefs.xml	
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Federation Faction Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/DamageDef[defName="Optic"]</xpath>
-					<value>
-						<li Class="CombatExtended.DamageDefExtensionCE">
-							<isAmbientDamage>true</isAmbientDamage>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/DamageDef[defName="Plasma"]</xpath>
-					<value>
-						<li Class="CombatExtended.DamageDefExtensionCE">
-							<isAmbientDamage>true</isAmbientDamage>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Federation/ThingDefs_Misc/Fed_Explosives.xml b/Patches/Rimsenal Collection/Federation/ThingDefs_Misc/Fed_Explosives.xml
deleted file mode 100644
index 346564a252..0000000000
--- a/Patches/Rimsenal Collection/Federation/ThingDefs_Misc/Fed_Explosives.xml	
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Federation Faction Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Repose Plasma Grenade === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Proj_Repose"]</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Proj_Repose"]/graphicData/texPath</xpath>
-					<value>
-						<texPath>Things/Projectile/Repose</texPath>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Proj_Repose"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>1</explosionRadius>
-							<damageDef>Plasma</damageDef>
-							<damageAmountBase>65</damageAmountBase>
-							<explosionDelay>100</explosionDelay>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Proj_Repose"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Proj_Repose"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Proj_Repose"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AD_FedPlasmaGrenades"]/label</xpath>
-					<value>
-						<label>plasma grenade</label>
-					</value>
-				</li>
-
-				<!-- Change TickerType.-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AD_FedPlasmaGrenades"]</xpath>
-					<value>
-						<tickerType>Normal</tickerType>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AD_FedPlasmaGrenades"]/graphicData</xpath>
-					<value>
-						<graphicData>
-							<texPath>Things/Projectile/Repose</texPath>
-							<graphicClass>Graphic_Single</graphicClass>
-							<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
-						</graphicData>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AD_FedPlasmaGrenades"]</xpath>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<stackLimit>75</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AD_FedPlasmaGrenades"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AD_FedPlasmaGrenades"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AD_FedPlasmaGrenades"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>40</damageAmountBase>
-							<explosiveDamageType>Plasma</explosiveDamageType>
-							<explosiveRadius>1</explosiveRadius>
-						</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AD_FedPlasmaGrenades</defName>
-					<statBases>
-						<Mass>0.45</Mass>
-						<MarketValue>8.25</MarketValue>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<label>throw plasma grenade</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<range>12.0</range>
-						<minRange>3</minRange>
-						<warmupTime>0.8</warmupTime>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<soundCast>ThrowGrenade</soundCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<defaultProjectile>Proj_Repose</defaultProjectile>
-						<onlyManualCast>true</onlyManualCast>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<weaponTags>
-						<li>FedGrenade</li>
-						<li>CE_AI_Grenade</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Plasma Bomb Vest === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_PBomb"]</xpath>
-					<value>
-						<ThingDef ParentName="BaseGrenadeProjectile">
-							<defName>Bullet_PBomb</defName>
-							<label>fusion device</label>
-							<graphicData>
-								<texPath>Things/A16/MechPlasma</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>12</explosionRadius>
-								<damageDef>Plasma</damageDef>
-								<explosionDamageFalloff>true</explosionDamageFalloff>
-								<damageAmountBase>100</damageAmountBase>
-								<explosionDelay>0</explosionDelay>
-								<soundExplode>Explosion_GiantBomb</soundExplode>
-								<dropsCasings>false</dropsCasings>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AD_PBomb"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<Suppressability>-10.00</Suppressability>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AD_PBomb"]</xpath>
-					<value>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGrenadeEquipment">
-							<defName>AD_PBomb</defName>
-							<equipmentType>Primary</equipmentType>
-							<label>plasma bomb</label>
-							<techLevel>Spacer</techLevel>
-							<description>A portable plasma reactor converted to suicide bombing.</description>
-							<graphicData>
-								<texPath>Things/A16/PBomb</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<soundInteract>Interact_Grenade</soundInteract>
-							<statBases>
-								<MarketValue>400</MarketValue>
-								<SightsEfficiency>1</SightsEfficiency>
-								<RangedWeapon_Cooldown>0.1</RangedWeapon_Cooldown>
-							</statBases>
-							<weaponTags>
-								<li>FedBomb</li>
-							</weaponTags>
-							<thingCategories>
-								<li>Grenades</li>
-							</thingCategories>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<label>detonate suicide vest</label>
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<range>2</range>
-									<warmupTime>0.1</warmupTime>
-									<noiseRadius>4</noiseRadius>
-									<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-									<soundCast>ThrowGrenade</soundCast>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<defaultProjectile>Bullet_PBomb</defaultProjectile>
-									<onlyManualCast>true</onlyManualCast>
-									<ignorePartialLoSBlocker>false</ignorePartialLoSBlocker>
-								</li>
-							</verbs>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>400</damageAmountBase>
-									<explosiveDamageType>Plasma</explosiveDamageType>
-									<explosiveRadius>12</explosiveRadius>
-									<explosionSound>Explosion_GiantBomb</explosionSound>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Federation/ThingDefs_Misc/Fed_MechWeapons.xml b/Patches/Rimsenal Collection/Federation/ThingDefs_Misc/Fed_MechWeapons.xml
deleted file mode 100644
index 3e3b7e1a8a..0000000000
--- a/Patches/Rimsenal Collection/Federation/ThingDefs_Misc/Fed_MechWeapons.xml	
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Federation Faction Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==========  AD Plasma Bombard  =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AD_PlasmaBombard</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.10</ShotSpread>
-						<SwayFactor>0.91</SwayFactor>
-						<Bulk>30</Bulk>
-						<Mass>25</Mass>
-						<RangedWeapon_Cooldown>5</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_PlasmaMechBombard</defaultProjectile>
-						<warmupTime>4</warmupTime>
-						<range>56</range>
-						<soundCast>RS_ShotHarmonizer</soundCast>
-						<muzzleFlashScale>17</muzzleFlashScale>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ==========  AD Crucible Cannon  =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AD_CrucibleCannon</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.21</SwayFactor>
-						<Bulk>28.00</Bulk>
-						<Mass>24.00</Mass>
-						<RangedWeapon_Cooldown>8</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.18</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_CrucibleCannon</defaultProjectile>
-						<warmupTime>2.6</warmupTime>
-						<burstShotCount>13</burstShotCount>
-						<ticksBetweenBurstShots>22</ticksBetweenBurstShots>
-						<range>75</range>
-						<soundCast>RS_ShotCR</soundCast>
-					</Properties>
-					<FireModes>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Federation/ThingDefs_Misc/Fed_MeleeWeapons.xml b/Patches/Rimsenal Collection/Federation/ThingDefs_Misc/Fed_MeleeWeapons.xml
deleted file mode 100644
index f10f8bf3bf..0000000000
--- a/Patches/Rimsenal Collection/Federation/ThingDefs_Misc/Fed_MeleeWeapons.xml	
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Federation Faction Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- 'Verdict' Concussion Baton -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AD_ConcussionBaton" or defName="AD_FedConcussionBaton"]/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>shaft</label>
-								<labelUsedInLogging>false</labelUsedInLogging>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>0.63</cooldownTime>
-								<armorPenetrationBlunt>5.625</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AD_ConcussionBaton"]/statBases</xpath>
-					<value>
-						<Bulk>2.5</Bulk>
-						<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AD_ConcussionBaton"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.42</MeleeCritChance>
-							<MeleeParryChance>0.24</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<!--Since both bions are the same race, we'll buff the AI only weapon to boost the melee stats, since the melee one does visibly have a shield-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AD_FedConcussionBaton"]/statBases</xpath>
-					<value>
-						<Bulk>2.5</Bulk>
-						<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AD_FedConcussionBaton"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.4</MeleeCritChance>
-							<MeleeParryChance>1.2</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AD_ConcussionBaton"]/weaponTags</xpath>
-					<value>
-						<li>CE_OnehandedWeapon</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Federation/ThingDefs_Misc/Fed_RangedWeapons.xml b/Patches/Rimsenal Collection/Federation/ThingDefs_Misc/Fed_RangedWeapons.xml
deleted file mode 100644
index 33dcbdf22b..0000000000
--- a/Patches/Rimsenal Collection/Federation/ThingDefs_Misc/Fed_RangedWeapons.xml	
+++ /dev/null
@@ -1,519 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Federation Faction Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Remove EMP Device  =========== -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="AD_EMB"]</xpath>
-				</li>
-
-				<!-- ========== Melee Tools  =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="AD_CruciblePistol" or
-						defName="AD_FedPistol" or
-						defName="AD_AuxPistol"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="AD_HeatProjector" or
-						defName="AD_FedHeatCannon" or
-						defName="AD_CruciblePresicionRifle" or
-						defName="AD_FedSniperRifle" or
-						defName="AD_CrucibleRifle" or
-						defName="AD_FedRifle" or
-						defName="AD_PlasmaCaliver" or
-						defName="AD_FedPlasmaCaster" or
-						defName="AD_CrucibleCarbine" or
-						defName="Gun_MCrucibleRifle" or
-						defName="AD_Sentinel"
-						]/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>
-				</li>
-
-				<!-- Aux Weapons -->
-
-				<!-- ==========  Aux Plasma Rifle  =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AD_Sentinel</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.34</SwayFactor>
-						<Bulk>10.80</Bulk>
-						<Mass>5.60</Mass>
-						<RangedWeapon_Cooldown>0.75</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.48</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_PlasmaRifle</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>RS_ShotCR</soundCast>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-					</Properties>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-				</li>
-
-				<!-- ==========  Aux Pistol  =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AD_AuxPistol</defName>
-					<statBases>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<Bulk>2.50</Bulk>
-						<Mass>1.60</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_AuxiliaryPistol</defaultProjectile>
-						<warmupTime>0.55</warmupTime>
-						<burstShotCount>2</burstShotCount>
-						<ticksBetweenBurstShots>25</ticksBetweenBurstShots>
-						<range>18</range>
-						<soundCast>RS_ShotCP</soundCast>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-				</li>
-
-				<!-- ==========  Makeshift Crucible Rifle  =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MCrucibleRifle</defName>
-					<statBases>
-						<WorkToMake>20000</WorkToMake>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.34</SwayFactor>
-						<Bulk>9.90</Bulk>
-						<Mass>4.20</Mass>
-						<RangedWeapon_Cooldown>1.15</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.56</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_MakeshiftCrucibleRifle</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>RS_ShotCP</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<FireModes />
-				</li>
-
-				<!-- ==========  AD Crucible Rifle  =========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AD_CrucibleRifle</defName>
-					<statBases>
-						<WorkToMake>52000</WorkToMake>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.44</SwayFactor>
-						<Bulk>9.50</Bulk>
-						<Mass>4.80</Mass>
-						<RangedWeapon_Cooldown>0.95</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.56</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_CrucibleRifle</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>25</ticksBetweenBurstShots>
-						<range>55</range>
-						<soundCast>RS_ShotCR</soundCast>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AD_FedRifle</defName>
-					<statBases>
-						<WorkToMake>52000</WorkToMake>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.44</SwayFactor>
-						<Bulk>9.50</Bulk>
-						<Mass>4.80</Mass>
-						<RangedWeapon_Cooldown>0.95</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.56</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_CrucibleRifle</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>18</ticksBetweenBurstShots>
-						<range>55</range>
-						<soundCast>RS_ShotCR</soundCast>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ==========  AD Crucible Pistol  =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AD_CruciblePistol</defName>
-					<statBases>
-						<WorkToMake>30500</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>1.08</SwayFactor>
-						<Bulk>3.90</Bulk>
-						<Mass>2.40</Mass>
-						<RangedWeapon_Cooldown>0.75</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.78</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_CruciblePistol</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>20</ticksBetweenBurstShots>
-						<range>12</range>
-						<soundCast>RS_ShotCP</soundCast>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AD_FedPistol</defName>
-					<statBases>
-						<WorkToMake>30500</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>1.08</SwayFactor>
-						<Bulk>3.90</Bulk>
-						<Mass>2.40</Mass>
-						<RangedWeapon_Cooldown>0.75</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.78</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_CruciblePistol</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>20</ticksBetweenBurstShots>
-						<range>12</range>
-						<soundCast>RS_ShotCP</soundCast>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-				</li>
-
-				<!-- ==========  AD Heat Cannon  =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AD_HeatProjector</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.24</ShotSpread>
-						<SwayFactor>1.48</SwayFactor>
-						<Bulk>12.70</Bulk>
-						<Mass>7.50</Mass>
-						<RangedWeapon_Cooldown>0.90</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.58</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_HeatCannon</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>50</ticksBetweenBurstShots>
-						<range>55</range>
-						<soundCast>RS_ShotHC</soundCast>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AD_FedHeatCannon</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.24</ShotSpread>
-						<SwayFactor>1.48</SwayFactor>
-						<Bulk>12.70</Bulk>
-						<Mass>7.50</Mass>
-						<RangedWeapon_Cooldown>0.90</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.58</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_HeatCannon</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>50</ticksBetweenBurstShots>
-						<range>55</range>
-						<soundCast>RS_ShotHC</soundCast>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-				</li>
-
-				<!-- ==========  AD Crucible Precision Rifle  =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AD_CruciblePresicionRifle</defName>
-					<statBases>
-						<SightsEfficiency>2.60</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.46</SwayFactor>
-						<Bulk>12.40</Bulk>
-						<Mass>5.20</Mass>
-						<RangedWeapon_Cooldown>0.95</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.06</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_CruciblePrecisionRifle</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>75</range>
-						<soundCast>RS_ShotCPR</soundCast>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AD_FedSniperRifle</defName>
-					<statBases>
-						<SightsEfficiency>2.60</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.46</SwayFactor>
-						<Bulk>12.40</Bulk>
-						<Mass>5.20</Mass>
-						<RangedWeapon_Cooldown>0.95</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.06</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_CruciblePrecisionRifle</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>75</range>
-						<soundCast>RS_ShotCPR</soundCast>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ==========  AD Plasma Caster  =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AD_PlasmaCaliver</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.25</ShotSpread>
-						<SwayFactor>1.96</SwayFactor>
-						<Bulk>18.20</Bulk>
-						<Mass>10.00</Mass>
-						<RangedWeapon_Cooldown>1.75</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_PlasmaCaster</defaultProjectile>
-						<warmupTime>3.25</warmupTime>
-						<minRange>3</minRange>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<range>40</range>
-						<soundCast>RS_ShotHarmonizer</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>18</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes />
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AD_FedPlasmaCaster</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.25</ShotSpread>
-						<SwayFactor>1.96</SwayFactor>
-						<Bulk>18.20</Bulk>
-						<Mass>10.00</Mass>
-						<RangedWeapon_Cooldown>1.75</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_PlasmaCaster</defaultProjectile>
-						<warmupTime>4.25</warmupTime>
-						<minRange>3</minRange>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<range>40</range>
-						<soundCast>RS_ShotHarmonizer</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>18</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes />
-				</li>
-
-				<!-- ==========  AD Crucible Carbine  =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AD_CrucibleCarbine</defName>
-					<statBases>
-						<WorkToMake>50000</WorkToMake>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.11</SwayFactor>
-						<Bulk>8.20</Bulk>
-						<Mass>4.10</Mass>
-						<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.38</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_CrucibleCarbine</defaultProjectile>
-						<warmupTime>0.85</warmupTime>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>22</ticksBetweenBurstShots>
-						<range>32</range>
-						<soundCast>RS_ShotCR</soundCast>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Federation/ThingDefs_Misc/Fed_Security.xml b/Patches/Rimsenal Collection/Federation/ThingDefs_Misc/Fed_Security.xml
deleted file mode 100644
index 100839344c..0000000000
--- a/Patches/Rimsenal Collection/Federation/ThingDefs_Misc/Fed_Security.xml	
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Federation Faction Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						@Name="FedHarvester" or
-						@Name="Harmonizer"
-						]/thingClass </xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<!-- ==========  Harvester Cannon  =========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_FedHarvester</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>0.80</SwayFactor>
-						<Bulk>22.00</Bulk>
-						<Mass>18.50</Mass>
-						<RangedWeapon_Cooldown>1.55</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.12</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_HarvesterCannon</defaultProjectile>
-						<warmupTime>1.55</warmupTime>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<range>55</range>
-						<soundCast>RS_ShotCR</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<FireModes>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-					</FireModes>
-				</li>
-
-				<!-- ==========  Plasma Bombard  =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Gun_PB"]</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_Charges">
-								<chargeSpeeds>
-									<li>30</li>
-									<li>50</li>
-									<li>70</li>
-									<li>90</li>
-								</chargeSpeeds>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Gun_PB"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-								<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_PlasmaTurretBombard</defaultProjectile>
-								<warmupTime>3.55</warmupTime>
-								<range>500</range>
-								<minRange>25</minRange>
-								<burstShotCount>10</burstShotCount>
-								<soundCast>RS_ShotHarmonizer</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>26</muzzleFlashScale>
-								<circularError>1.5</circularError>
-								<indirectFirePenalty>0.3</indirectFirePenalty>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Gun_PB"]</xpath>
-					<value>
-						<weaponTags>
-							<li>Artillery</li>
-							<li>TurretGun</li>
-						</weaponTags>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Federation/ThingDefs_Races/Race_Bion.xml b/Patches/Rimsenal Collection/Federation/ThingDefs_Races/Race_Bion.xml
deleted file mode 100644
index 369fbae5d5..0000000000
--- a/Patches/Rimsenal Collection/Federation/ThingDefs_Races/Race_Bion.xml	
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Federation Faction Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Bion Base & Stalker ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="BaseBion"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bion_Base"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>12</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bion_Base"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.70</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bion_Base"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>22</ArmorRating_Sharp>
-						<NightVisionEfficiency>0.70</NightVisionEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bion_Stalker"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-						<NightVisionEfficiency>0.90</NightVisionEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bion_Stalker"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.70</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Bion_Base" or defName="Bion_Stalker"]/statBases</xpath>
-					<value>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>50</CarryBulk>
-						<AimingAccuracy>1.2</AimingAccuracy>
-						<ShootingAccuracyPawn>1.2</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-						<SmokeSensitivity>0</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bion_Base" or defName="Bion_Stalker"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>5.05</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[@Name="BaseBion"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[@Name="BaseBion"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="BaseBion"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<!--<li Class="CombatExtended.CompProperties_Suppressable" />-->
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[@Name="BaseBion"]/damageMultipliers</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[@Name="BaseBion"]</xpath>
-						<value>
-							<damageMultipliers />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="BaseBion"]/damageMultipliers</xpath>
-					<value>
-						<li>
-							<damageDef>Blunt</damageDef>
-							<multiplier>0.75</multiplier>
-						</li>
-						<li>
-							<damageDef>Bomb_Secondary</damageDef>
-							<multiplier>0.25</multiplier>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Federation/ThingDefs_Races/Race_FederatorMech.xml b/Patches/Rimsenal Collection/Federation/ThingDefs_Races/Race_FederatorMech.xml
deleted file mode 100644
index f7024d9ef7..0000000000
--- a/Patches/Rimsenal Collection/Federation/ThingDefs_Races/Race_FederatorMech.xml	
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Federation Faction Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Mech - Federator ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Mech_Federator"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mech_Federator"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>40</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mech_Federator"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>35</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mech_Federator"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.95</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Mech_Federator"]/statBases</xpath>
-					<value>
-						<CarryWeight>60</CarryWeight>
-						<CarryBulk>60</CarryBulk>
-						<AimingAccuracy>1.1</AimingAccuracy>
-						<ShootingAccuracyPawn>1.1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						<MeleeCritChance>0.4</MeleeCritChance>
-						<MeleeParryChance>0.3</MeleeParryChance>
-						<SmokeSensitivity>0</SmokeSensitivity>
-						<NightVisionEfficiency>0.80</NightVisionEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mech_Federator"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>3.67</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>2.67</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>2.67</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Federation/ThingDefs_Races/Race_Hulk.xml b/Patches/Rimsenal Collection/Federation/ThingDefs_Races/Race_Hulk.xml
deleted file mode 100644
index e562b4aed1..0000000000
--- a/Patches/Rimsenal Collection/Federation/ThingDefs_Races/Race_Hulk.xml	
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Federation Faction Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Hulk ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Bion_Hulk"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bion_Hulk"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>20</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bion_Hulk"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bion_Stalker"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.85</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Bion_Hulk"]/statBases</xpath>
-					<value>
-						<CarryWeight>60</CarryWeight>
-						<CarryBulk>60</CarryBulk>
-						<AimingAccuracy>1.2</AimingAccuracy>
-						<ShootingAccuracyPawn>1.2</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.10</MeleeDodgeChance>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>0.10</MeleeParryChance>
-						<SmokeSensitivity>0</SmokeSensitivity>
-						<NightVisionEfficiency>0.80</NightVisionEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bion_Hulk"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>5.58</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2.24</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2.24</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Federation/ThingDefs_Races/Race_SeekerMech.xml b/Patches/Rimsenal Collection/Federation/ThingDefs_Races/Race_SeekerMech.xml
deleted file mode 100644
index 8531be8569..0000000000
--- a/Patches/Rimsenal Collection/Federation/ThingDefs_Races/Race_SeekerMech.xml	
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Federation Faction Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Mech - Seeker ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Mech_Seeker"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Mech_Seeker"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mech_Seeker"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Mech_Seeker"]/statBases</xpath>
-					<value>
-						<CarryWeight>20</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-						<AimingAccuracy>0.3</AimingAccuracy>
-						<ShootingAccuracyPawn>0.3</ShootingAccuracyPawn>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0.025</MeleeParryChance>
-						<SmokeSensitivity>0</SmokeSensitivity>
-						<NightVisionEfficiency>1</NightVisionEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mech_Seeker"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Feral/PawnKindDefs/PawnKinds_Feral.xml b/Patches/Rimsenal Collection/Feral/PawnKindDefs/PawnKinds_Feral.xml
deleted file mode 100644
index 4291e0d97f..0000000000
--- a/Patches/Rimsenal Collection/Feral/PawnKindDefs/PawnKinds_Feral.xml	
+++ /dev/null
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Feral Faction Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Husker ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FeralHusker"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>8</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Mangler ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FeralMangler"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Scorcher ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FeralScorcher"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<magazineCount>
-										<min>1</min>
-										<max>5</max>
-									</magazineCount>
-									<generateChance>0.7</generateChance>
-									<sidearmMoney>
-										<min>75</min>
-										<max>325</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>FeralPistol</li>
-										<li>FeralMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Boomer ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FeralBoomer"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>12</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<magazineCount>
-										<min>2</min>
-										<max>5</max>
-									</magazineCount>
-									<generateChance>0.7</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>450</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>FeralPistol</li>
-										<li>FeralMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Thumper ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FeralThumper"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<magazineCount>
-										<min>1</min>
-										<max>5</max>
-									</magazineCount>
-									<generateChance>0.7</generateChance>
-									<sidearmMoney>
-										<min>200</min>
-										<max>550</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>FeralPistol</li>
-										<li>FeralMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Skulker ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FeralSkulker"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<magazineCount>
-										<min>2</min>
-										<max>5</max>
-									</magazineCount>
-									<generateChance>0.7</generateChance>
-									<sidearmMoney>
-										<min>200</min>
-										<max>550</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>FeralPistol</li>
-										<li>FeralMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Elite Base ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="FeralEliteBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<magazineCount>
-										<min>2</min>
-										<max>5</max>
-									</magazineCount>
-									<generateChance>0.7</generateChance>
-									<sidearmMoney>
-										<min>1800</min>
-										<max>2500</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>FeralPistol</li>
-										<li>FeralMelee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Ogrenaut ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FeralOgrenaut"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>10</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Hellmaker ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FeralHellmaker"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>10</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Backpacks ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[
-						defName="FeralHusker" or
-						defName="FeralMangler" or
-						defName="FeralScorcher" or
-						defName="FeralBoomer"
-						]/apparelRequired </xpath>
-					<value>
-						<li>CE_Apparel_TribalBackpack</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[
-						@Name="FeralEliteBase" or
-						defName="FeralSkulker" or
-						defName="FeralThumper"
-						]/apparelRequired </xpath>
-					<value>
-						<li>CE_Apparel_Backpack</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Feral/ThingDefs_Misc/Ammo_Feral.xml b/Patches/Rimsenal Collection/Feral/ThingDefs_Misc/Ammo_Feral.xml
deleted file mode 100644
index 98b97f0d78..0000000000
--- a/Patches/Rimsenal Collection/Feral/ThingDefs_Misc/Ammo_Feral.xml	
+++ /dev/null
@@ -1,243 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Feral Faction Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<!-- ==================== Scrap Metal ========================== -->
-
-						<ThingCategoryDef>
-							<defName>AmmoFeralScrap</defName>
-							<label>scrap metal</label>
-							<parent>AmmoRifles</parent>
-							<iconPath>ThirdParty/Rimsenal/Nail/Nail_c</iconPath>
-						</ThingCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>FeralScrap</defName>
-							<label>scrap</label>
-							<labelShort>scrap</labelShort>
-							<description>Bits of metal scraps</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Feral_Scrap</defName>
-							<label>scrap</label>
-							<ammoTypes>
-								<Ammo_Feral_Scrap>Bullet_Feral_Scrap</Ammo_Feral_Scrap>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="BaseScrap" ParentName="SmallAmmoBase" Abstract="True">
-							<description>Bits of jagged scrap metal.</description>
-							<statBases>
-								<Mass>0.04</Mass>
-								<Bulk>0.1</Bulk>
-							</statBases>
-							<destroyOnDrop>True</destroyOnDrop>
-							<thingCategories>
-								<li>AmmoFeralScrap</li>
-							</thingCategories>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseScrap">
-							<defName>Ammo_Feral_Scrap</defName>
-							<label>bits of jagged scrap metal</label>
-							<graphicData>
-								<texPath>ThirdParty/Rimsenal/Nail</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.01</MarketValue>
-							</statBases>
-							<ammoClass>FeralScrap</ammoClass>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="Base556x45mmNATOBullet">
-							<defName>Bullet_Feral_Scrap</defName>
-							<label>scrap metal</label>
-							<graphicData>
-								<texPath>Projectile/Scrap</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>10</damageAmountBase>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<pelletCount>20</pelletCount>
-								<spreadMult>17.8</spreadMult>
-								<damageDef>Bullet</damageDef>
-								<speed>63</speed>
-								<dropsCasings>false</dropsCasings>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== Nails ========================== -->
-
-						<ThingCategoryDef>
-							<defName>AmmoFeralNail</defName>
-							<label>nail</label>
-							<parent>AmmoRifles</parent>
-							<iconPath>ThirdParty/Rimsenal/Nail/Nail_c</iconPath>
-						</ThingCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>FeralNail</defName>
-							<label>nail</label>
-							<labelShort>nail</labelShort>
-							<description>Rusty, pointy nails arranged in strips.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Feral_Nail</defName>
-							<label>nail</label>
-							<ammoTypes>
-								<Ammo_Feral_Nail>Bullet_Feral_Nail</Ammo_Feral_Nail>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="BaseFeralNail" ParentName="SmallAmmoBase" Abstract="True">
-							<description>A pointed, slightly rusty carpentry nail a few inches long. While an extremely inaccurate projectile at best, its shape means it tends to tumble when it strikes a target, leaving large wounds.</description>
-							<statBases>
-								<Mass>0.02</Mass>
-								<Bulk>0.02</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoFeralNail</li>
-							</thingCategories>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseFeralNail">
-							<defName>Ammo_Feral_Nail</defName>
-							<label>nail</label>
-							<graphicData>
-								<texPath>ThirdParty/Rimsenal/Nail</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.02</MarketValue>
-							</statBases>
-							<ammoClass>FeralNail</ammoClass>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="Base556x45mmNATOBullet">
-							<defName>Bullet_Feral_Nail</defName>
-							<label>nail</label>
-							<graphicData>
-								<texPath>Projectile/Nail</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>73</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>8</damageAmountBase>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_Feral_Nail</defName>
-							<label>make nails x500</label>
-							<description>Craft 500 steel nails.</description>
-							<jobString>Making nails.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>15</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Feral_Nail>500</Ammo_Feral_Nail>
-							</products>
-						</RecipeDef>
-
-						<!-- ==================== Twin 9x19mm Para ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_9x19mmParaTwin_Feral</defName>
-							<label>Twin 9x19mm Para</label>
-							<ammoTypes>
-								<Ammo_9x19mmPara_FMJ>Bullet_9x19mmParaTwin_Feral_FMJ</Ammo_9x19mmPara_FMJ>
-								<Ammo_9x19mmPara_AP>Bullet_9x19mmParaTwin_Feral_AP</Ammo_9x19mmPara_AP>
-								<Ammo_9x19mmPara_HP>Bullet_9x19mmParaTwin_Feral_HP</Ammo_9x19mmPara_HP>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef ParentName="Base9x19mmParaBullet">
-							<defName>Bullet_9x19mmParaTwin_Feral_FMJ</defName>
-							<label>9mm Para bullet (FMJ)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>11</damageAmountBase>
-								<pelletCount>2</pelletCount>
-								<spreadMult>2</spreadMult>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<armorPenetrationBlunt>9.66</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base9x19mmParaBullet">
-							<defName>Bullet_9x19mmParaTwin_Feral_AP</defName>
-							<label>9mm Para bullet (AP)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>7</damageAmountBase>
-								<pelletCount>2</pelletCount>
-								<spreadMult>2</spreadMult>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>9.66</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base9x19mmParaBullet">
-							<defName>Bullet_9x19mmParaTwin_Feral_HP</defName>
-							<label>9mm Para bullet (HP)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>13</damageAmountBase>
-								<pelletCount>2</pelletCount>
-								<spreadMult>2</spreadMult>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>9.66</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Feral/ThingDefs_Misc/Feral_Apparel.xml b/Patches/Rimsenal Collection/Feral/ThingDefs_Misc/Feral_Apparel.xml
deleted file mode 100644
index f89f5a5082..0000000000
--- a/Patches/Rimsenal Collection/Feral/ThingDefs_Misc/Feral_Apparel.xml	
+++ /dev/null
@@ -1,470 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Feral Faction Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==========  Patched Shirt =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_PatchedShirt"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_PatchedShirt"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.03</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_PatchedShirt"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.024</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ==========  Hoods =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="Apparel_HuskerHood" or
-						defName="Apparel_SkulkerHood" or
-						defName="Apparel_ThumperHood" or
-						defName="Apparel_FeralHood"
-						]/statBases </xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-
-				<!-- ==========  Grinder Helmet =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_GrinderHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_GrinderHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>10</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_GrinderHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_GrinderHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-0.3</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_GrinderHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!-- ==========  Scorcher Helmet =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_ScorcherHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<WornBulk>1.8</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_ScorcherHelmet"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_ScorcherHelmet"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Apparel_ScorcherHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Apparel_ScorcherHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_ScorcherHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_ScorcherHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!-- ==========  Feral Exo Helmet =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_FeralExoH"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1.5</WornBulk>
-						<NightVisionEfficiency_Apparel>0.25</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_FeralExoH"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>28</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_FeralExoH"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Apparel_FeralExoH"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Apparel_FeralExoH"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_FeralExoH"]/equippedStatOffsets</xpath>
-					<value>
-						<ToxicEnvironmentResistance>0.80</ToxicEnvironmentResistance>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_FeralExoH"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>36</Plasteel>
-						<DevilstrandCloth>10</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_FeralExoH"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!-- ==========  Scrap Armor =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_ScrapArmor"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ScrapArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>13</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ScrapArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>12</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_ScrapArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Apparel_ScrapArmor"]</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>
-
-				<!-- ==========  Feral Mail =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_FeralMail"]/statBases</xpath>
-					<value>
-						<Bulk>60</Bulk>
-						<WornBulk>8</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_FeralMail"]/statBases/Mass</xpath>
-					<value>
-						<Mass>15</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_FeralMail"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>8</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_FeralMail"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Apparel_FeralMail"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Blunt>1.50</ArmorRating_Blunt>
-									<parts>
-										<li>Torso</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-										<li>Shoulder</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-										<li>Shoulder</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.40</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.40</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.375</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.50</ArmorRating_Sharp>
-									<parts>
-										<li>Foot</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.75</ArmorRating_Blunt>
-									<parts>
-										<li>Foot</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ==========  Feral Exosuit =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_FeralExo"]/statBases</xpath>
-					<value>
-						<Bulk>110</Bulk>
-						<WornBulk>25</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_FeralExo"]/statBases/Mass</xpath>
-					<value>
-						<Mass>75</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_FeralExo"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>70</CarryWeight>
-						<CarryBulk>10</CarryBulk>
-						<ToxicEnvironmentResistance>0.45</ToxicEnvironmentResistance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_FeralExo"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>83</Plasteel>
-						<DevilstrandCloth>30</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_FeralExo"]/costList/Steel</xpath>
-					<value>
-						<Steel>204</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_FeralExo"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>32</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_FeralExo"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_FeralExo"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Apparel_FeralExo"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Feral/ThingDefs_Misc/Feral_Explosives.xml b/Patches/Rimsenal Collection/Feral/ThingDefs_Misc/Feral_Explosives.xml
deleted file mode 100644
index b16f771e97..0000000000
--- a/Patches/Rimsenal Collection/Feral/ThingDefs_Misc/Feral_Explosives.xml	
+++ /dev/null
@@ -1,292 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Feral Faction Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Thumper Rocket Launcher === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Gun_Thumper"]</xpath>
-					<value>
-						<stackLimit>5</stackLimit>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_Thumper"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<damageDef>Bullet</damageDef>
-							<damageAmountBase>100</damageAmountBase>
-							<armorPenetrationBlunt>2.2</armorPenetrationBlunt>
-							<armorPenetrationSharp>20</armorPenetrationSharp>
-							<speed>40</speed>
-							<soundAmbient>RocketPropelledLoop_Small</soundAmbient>
-						</projectile>
-						<comps>
-							<li Class="CombatExtended.CompProperties_ExplosiveCE">
-								<damageAmountBase>35</damageAmountBase>
-								<explosiveDamageType>Bomb</explosiveDamageType>
-								<explosiveRadius>2.5</explosiveRadius>
-								<explosionSound>MortarBomb_Explode</explosionSound>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							</li>
-							<li Class="CombatExtended.CompProperties_Fragments">
-								<fragments>
-									<Fragment_Large>40</Fragment_Large>
-								</fragments>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_Thumper"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Thumper</defName>
-					<statBases>
-						<Mass>6</Mass>
-						<RangedWeapon_Cooldown>4.8</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.46</SwayFactor>
-						<Bulk>10</Bulk>
-						<WorkToMake>29500</WorkToMake>
-					</statBases>
-					<costList>
-						<ChunkSlagSteel>1</ChunkSlagSteel>
-						<Steel>30</Steel>
-						<FSX>3</FSX>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Thumper</defaultProjectile>
-						<warmupTime>3.5</warmupTime>
-						<range>34</range>
-						<minRange>5</minRange>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<muzzleFlashScale>14</muzzleFlashScale>
-					</Properties>
-					<weaponTags>
-						<li>FeralGun</li>
-						<li>FeralGunHeavy</li>
-					</weaponTags>
-					<researchPrerequisite>CE_Launchers</researchPrerequisite>
-					<FireModes />
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Thumper"]/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>
-				</li>
-
-				<!-- === Madness Fusion Device === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Proj_MADness"]</xpath>
-					<value>
-						<ThingDef ParentName="BaseGrenadeProjectile">
-							<defName>Proj_MADness</defName>
-							<label>fusion device</label>
-							<graphicData>
-								<texPath>Projectile/MADness</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>29.5</explosionRadius>
-								<damageDef>BombSuper</damageDef>
-								<explosionDamageFalloff>true</explosionDamageFalloff>
-								<damageAmountBase>400</damageAmountBase>
-								<explosionDelay>600</explosionDelay>
-								<soundExplode>Explosion_GiantBomb</soundExplode>
-								<dropsCasings>false</dropsCasings>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Weapon_MADness"]</xpath>
-					<value>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGrenadeEquipment">
-							<defName>Weapon_MADness</defName>
-							<equipmentType>Primary</equipmentType>
-							<label>fusion device</label>
-							<techLevel>Spacer</techLevel>
-							<description>Modified portable fusion reactor, used for rimworld scale Mutual Assured Destruction strategy.</description>
-							<graphicData>
-								<texPath>Things/A13/MADness</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<soundInteract>Interact_Grenade</soundInteract>
-							<statBases>
-								<MarketValue>2500</MarketValue>
-								<SightsEfficiency>1</SightsEfficiency>
-								<RangedWeapon_Cooldown>3</RangedWeapon_Cooldown>
-							</statBases>
-							<thingCategories>
-								<li>Grenades</li>
-							</thingCategories>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<label>deploy fusion device</label>
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<range>2.9</range>
-									<warmupTime>8.95</warmupTime>
-									<noiseRadius>4</noiseRadius>
-									<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-									<soundCast>ThrowGrenade</soundCast>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<defaultProjectile>Proj_MADness</defaultProjectile>
-									<onlyManualCast>true</onlyManualCast>
-									<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-								</li>
-							</verbs>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>400</damageAmountBase>
-									<explosiveDamageType>BombSuper</explosiveDamageType>
-									<explosiveRadius>12</explosiveRadius>
-									<explosionSound>Explosion_GiantBomb</explosionSound>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- === Rat Stick Grenade === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_RatStick"]</xpath>
-					<value>
-						<ThingDef ParentName="BaseGrenadeProjectile">
-							<defName>Bullet_RatStick</defName>
-							<label>rat stick</label>
-							<graphicData>
-								<texPath>Projectile/BoomStick</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>1.8</explosionRadius>
-								<damageDef>PrometheumFlame</damageDef>
-								<damageAmountBase>15</damageAmountBase>
-								<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
-								<preExplosionSpawnChance>1</preExplosionSpawnChance>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_RatStick"]</xpath>
-					<value>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGrenadeEquipment">
-							<defName>Gun_RatStick</defName>
-							<label>feral rat sticks</label>
-							<description>Javelins tied with explosive boomrat tumor.</description>
-							<graphicData>
-								<texPath>Things/A13/BoomStick</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<onGroundRandomRotateAngle>35</onGroundRandomRotateAngle>
-							</graphicData>
-							<thingCategories>
-								<li>FeralWeapons</li>
-							</thingCategories>
-							<generateCommonality>0.1</generateCommonality>
-							<soundInteract>Interact_BeatFire</soundInteract>
-							<statBases>
-								<MarketValue>200</MarketValue>
-								<SightsEfficiency>1.0</SightsEfficiency>
-								<ShotSpread>1.5</ShotSpread>
-								<SwayFactor>2.5</SwayFactor>
-								<Bulk>5.00</Bulk>
-								<Mass>4.00</Mass>
-								<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-							</statBases>
-							<altitudeLayer>Item</altitudeLayer>
-							<alwaysHaulable>True</alwaysHaulable>
-							<tickerType>Normal</tickerType>
-							<techLevel>Neolithic</techLevel>
-							<equippedAngleOffset>30</equippedAngleOffset>
-							<stackLimit>75</stackLimit>
-							<weaponTags>
-								<li>GrenadeDestructive</li>
-								<li>FeralGun</li>
-								<li>FeralGrenade</li>
-							</weaponTags>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_RatStick</defaultProjectile>
-									<warmupTime>1.5</warmupTime>
-									<range>11</range>
-									<soundCast>Interact_BeatFire</soundCast>
-								</li>
-							</verbs>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>shaft</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>7</power>
-									<cooldownTime>1.40</cooldownTime>
-									<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>point</label>
-									<capacities>
-										<li>Stab</li>
-									</capacities>
-									<power>15</power>
-									<cooldownTime>1.43</cooldownTime>
-									<chanceFactor>1.5</chanceFactor>
-									<armorPenetrationBlunt>1.69</armorPenetrationBlunt>
-									<armorPenetrationSharp>0.30</armorPenetrationSharp>
-									<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-								</li>
-							</tools>
-						</ThingDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Feral/ThingDefs_Misc/Feral_MeleeWeapons.xml b/Patches/Rimsenal Collection/Feral/ThingDefs_Misc/Feral_MeleeWeapons.xml
deleted file mode 100644
index decd685f9c..0000000000
--- a/Patches/Rimsenal Collection/Feral/ThingDefs_Misc/Feral_MeleeWeapons.xml	
+++ /dev/null
@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Feral Faction Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Feral Glaive-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_FeralGlaive"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<chanceFactor>0.33</chanceFactor>
-								<cooldownTime>1.31</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>2.9</cooldownTime>
-								<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>
-								<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.03</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_FeralGlaive"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_FeralGlaive"]</xpath>
-					<value>
-						<modExtensions>
-							<li Class="CombatExtended.GunDrawExtension">
-								<DrawSize>1.6,1.5</DrawSize>
-								<DrawOffset>0.35,0.30</DrawOffset>
-							</li>
-						</modExtensions>
-					</value>
-				</li>
-
-				<!-- Feral Knife -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_FeralCleaver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<chanceFactor>0.33</chanceFactor>
-								<cooldownTime>1.89</cooldownTime>
-								<armorPenetrationBlunt>0.65</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetrationBlunt>0.612</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.39</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.44</cooldownTime>
-								<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.43</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_FeralCleaver"]/statBases</xpath>
-					<value>
-						<Bulk>4.5</Bulk>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_FeralCleaver"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!--=== Mutant Weapons ===-->
-				<!-- Carver Axes -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Carver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>47</power>
-								<cooldownTime>2.9</cooldownTime>
-								<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>
-								<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.03</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Carver"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Carver"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- Sunderer -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Sunderer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<chanceFactor>0.33</chanceFactor>
-								<cooldownTime>2.42</cooldownTime>
-								<armorPenetrationBlunt>3.125</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<chanceFactor>0.33</chanceFactor>
-								<cooldownTime>2.37</cooldownTime>
-								<armorPenetrationBlunt>3.125</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>55</power>
-								<cooldownTime>3.71</cooldownTime>
-								<armorPenetrationBlunt>16</armorPenetrationBlunt>
-								<armorPenetrationSharp>3.6</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Sunderer"]/statBases</xpath>
-					<value>
-						<Bulk>14</Bulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Feral/ThingDefs_Misc/Feral_MutantWeapons.xml b/Patches/Rimsenal Collection/Feral/ThingDefs_Misc/Feral_MutantWeapons.xml
deleted file mode 100644
index eb52bf9b5b..0000000000
--- a/Patches/Rimsenal Collection/Feral/ThingDefs_Misc/Feral_MutantWeapons.xml	
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Feral Faction Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Melee Tools -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Feral_ScatterCannon" or
-						defName="Feral_RivetCannon" or
-						defName="Feral_DMG"
-						] </xpath>
-					<value>
-						<tools Inherit="False">
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>4</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.55</cooldownTime>
-								<armorPenetrationBlunt>8.45</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ==========  Mutant DMG =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Feral_DMG</defName>
-					<statBases>
-						<Mass>10</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.8</ShotSpread>
-						<SwayFactor>2.53</SwayFactor>
-						<Bulk>12</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
-						<warmupTime>1.4</warmupTime>
-						<range>60</range>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>ShotCrucifier</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>200</magazineSize>
-						<reloadTime>20</reloadTime>
-						<ammoSet>AmmoSet_303British</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>20</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>Hellmaker</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Scatterstick Shotgun ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Feral_ScatterCannon</defName>
-					<statBases>
-						<Mass>8</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<ShotSpread>0.25</ShotSpread>
-						<SwayFactor>1.26</SwayFactor>
-						<Bulk>10</Bulk>
-						<SightsEfficiency>0.8</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Feral_Scrap</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>24</range>
-						<soundCast>ShotScatterStick</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>10</reloadTime>
-						<ammoSet>AmmoSet_Feral_Scrap</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>4</aimedBurstShotCount>
-						<aiUseBurstMode>true</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>Ogrenaut</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Rivet Gun ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Feral_RivetCannon</defName>
-					<statBases>
-						<Mass>5.3</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.89</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.7</SwayFactor>
-						<Bulk>11.03</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.83</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Feral_Nail</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<burstShotCount>8</burstShotCount>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<soundCast>ShotCrucifier</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>80</magazineSize>
-						<reloadTime>6.7</reloadTime>
-						<ammoSet>AmmoSet_Feral_Nail</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>8</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>Ogrenaut</li>
-					</weaponTags>
-				</li>
-
-				<!-- ==========  Smoke Spore =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_SporeSmoker"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Bullet_SporeSmoker"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<damageDef>Spore</damageDef>
-							<damageAmountBase>5</damageAmountBase>
-							<explosionRadius>3.2</explosionRadius>
-							<speed>54</speed>
-							<postExplosionGasType>BlindSmoke</postExplosionGasType>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Feral_SporeSmoker</defName>
-					<statBases>
-						<Mass>1</Mass>
-						<RangedWeapon_Cooldown>6.5</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.8</ShotSpread>
-						<SwayFactor>1.53</SwayFactor>
-						<Bulk>1</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_SporeSmoker</defaultProjectile>
-						<warmupTime>2</warmupTime>
-						<range>36</range>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<burstShotCount>1</burstShotCount>
-						<soundCast>Shriker</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>0</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SmokeSpore</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Feral/ThingDefs_Misc/Feral_RangedWeapons.xml b/Patches/Rimsenal Collection/Feral/ThingDefs_Misc/Feral_RangedWeapons.xml
deleted file mode 100644
index db92c9a7ee..0000000000
--- a/Patches/Rimsenal Collection/Feral/ThingDefs_Misc/Feral_RangedWeapons.xml	
+++ /dev/null
@@ -1,463 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Feral Faction Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Pistols -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Scraptooth"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- Long guns-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Gnasher" or
-						defName="Gun_Deathdealer" or
-						defName="Gun_ScatterStick" or
-						defName="Gun_Thrasher" or
-						defName="Gun_Crucifier"
-						]/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>
-				</li>
-				<!-- Heavy Weapons -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_SkullBuster" or defName="Gun_Scorcher"]/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>
-				</li>
-
-				<!-- ==========  Skullbuster Crank Gun =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SkullBuster</defName>
-					<statBases>
-						<Mass>9.12</Mass>
-						<RangedWeapon_Cooldown>0.93</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.9</SightsEfficiency>
-						<ShotSpread>0.21</ShotSpread>
-						<SwayFactor>2.53</SwayFactor>
-						<Bulk>13.7</Bulk>
-						<WorkToMake>32000</WorkToMake>
-					</statBases>
-					<costList>
-						<ChunkSlagSteel>3</ChunkSlagSteel>
-						<Steel>60</Steel>
-						<ComponentIndustrial>8</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.32</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
-						<warmupTime>1.25</warmupTime>
-						<range>62</range>
-						<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-						<burstShotCount>25</burstShotCount>
-						<soundCast>ShotCrucifier</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>200</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_303British</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>10</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_MachineGun</li>
-						<li>CE_AI_Suppressive</li>
-					</weaponTags>
-					<researchPrerequisite>Gunsmithing</researchPrerequisite>
-				</li>
-
-				<!-- ==========  Scraptooth Pistols =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Scraptooth</defName>
-					<statBases>
-						<WorkToMake>35500</WorkToMake>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.7</SwayFactor>
-						<Bulk>5</Bulk>
-						<Mass>4.8</Mass>
-						<RangedWeapon_Cooldown>0.65</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.8</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmParaTwin_Feral_FMJ</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>11</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<muzzleFlashScale>7</muzzleFlashScale>
-						<soundCast>ShotScraptooth</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>16</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_9x19mmParaTwin_Feral</ammoSet>
-					</AmmoUser>
-					<FireModes>
-					</FireModes>
-					<weaponTags>
-						<li>FeralPistol</li>
-						<li>FeralGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ==========  Gnasher SMG =========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Gnasher</defName>
-					<statBases>
-						<Mass>5.50</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.60</SightsEfficiency>
-						<ShotSpread>0.54</ShotSpread>
-						<SwayFactor>1.64</SwayFactor>
-						<Bulk>4.90</Bulk>
-						<WorkToMake>24500</WorkToMake>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.25</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Feral_Nail</defaultProjectile>
-						<warmupTime>0.9</warmupTime>
-						<range>14</range>
-						<burstShotCount>8</burstShotCount>
-						<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-						<soundCast>ShotGnasher</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>8</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>48</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_Feral_Nail</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>6</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>FeralPistol</li>
-						<li>FeralGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Deathdealer Machinepistols ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Deathdealer</defName>
-					<statBases>
-						<Mass>4.20</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.67</ShotSpread>
-						<SwayFactor>1.95</SwayFactor>
-						<Bulk>5.8</Bulk>
-						<WorkToMake>24500</WorkToMake>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.65</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmParaTwin_Feral_FMJ</defaultProjectile>
-						<warmupTime>0.8</warmupTime>
-						<range>16</range>
-						<burstShotCount>4</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
-						<soundCast>ShotDeathdealer</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>40</magazineSize>
-						<reloadTime>4.8</reloadTime>
-						<ammoSet>AmmoSet_9x19mmParaTwin_Feral</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>FeralGun</li>
-						<li>FeralRifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Scatterstick Shotgun ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_ScatterStick</defName>
-					<statBases>
-						<Mass>3.50</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.26</SwayFactor>
-						<Bulk>6.7</Bulk>
-						<SightsEfficiency>0.9</SightsEfficiency>
-						<WorkToMake>22500</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>ShotScatterStick</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>3</magazineSize>
-						<reloadTime>6.8</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Thrasher Assault Rifle ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Thrasher</defName>
-					<statBases>
-						<Mass>5.3</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.90</SightsEfficiency>
-						<ShotSpread>0.37</ShotSpread>
-						<SwayFactor>1.7</SwayFactor>
-						<Bulk>11.03</Bulk>
-						<WorkToMake>30000</WorkToMake>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.83</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<burstShotCount>4</burstShotCount>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<soundCast>ShotThrasher</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>26</magazineSize>
-						<reloadTime>4.7</reloadTime>
-						<ammoSet>AmmoSet_303British</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>FeralGun</li>
-						<li>FeralRifle</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Crucible Anti-Material Rifle ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Crucifier</defName>
-					<statBases>
-						<WorkToMake>44500</WorkToMake>
-						<SightsEfficiency>2.2</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>2.4</SwayFactor>
-						<Bulk>17.5</Bulk>
-						<Mass>13.80</Mass>
-						<RangedWeapon_Cooldown>1.38</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.83</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>4.2</warmupTime>
-						<range>76</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>15</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>FeralSniperRifle</li>
-						<li>Bipod_AMR</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Scorcher Flamethrower ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Scorcher"]/statBases</xpath>
-					<value>
-						<statBases>
-							<Mass>4.2</Mass>
-							<RangedWeapon_Cooldown>0.44</RangedWeapon_Cooldown>
-							<SightsEfficiency>0.90</SightsEfficiency>
-							<ShotSpread>0.18</ShotSpread>
-							<SwayFactor>1.4</SwayFactor>
-							<Bulk>5</Bulk>
-							<WorkToMake>31500</WorkToMake>
-						</statBases>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Scorcher"]/costList</xpath>
-					<value>
-						<costList>
-							<ChunkSlagSteel>1</ChunkSlagSteel>
-							<Steel>35</Steel>
-							<ComponentIndustrial>2</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Gun_Scorcher"]</xpath>
-					<value>
-						<recipeMaker>
-							<researchPrerequisite>CE_Launchers</researchPrerequisite>
-						</recipeMaker>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Scorcher"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<recoilAmount>0.95</recoilAmount>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_Flamethrower_Prometheum</defaultProjectile>
-								<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-								<warmupTime>1.1</warmupTime>
-								<range>11</range>
-								<minRange>3</minRange>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<soundCast>HissFlamethrower</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-								<burstShotCount>20</burstShotCount>
-							</li>
-						</verbs>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Gun_Scorcher"]</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>40</magazineSize>
-								<reloadTime>5</reloadTime>
-								<ammoSet>AmmoSet_Flamethrower</ammoSet>
-							</li>
-							<li Class="CombatExtended.CompProperties_FireModes">
-								<aiUseBurstMode>true</aiUseBurstMode>
-								<aimedBurstShotCount>10</aimedBurstShotCount>
-								<aiAimMode>SuppressFire</aiAimMode>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Feral/ThingDefs_Races/Race_Ogrons.xml b/Patches/Rimsenal Collection/Feral/ThingDefs_Races/Race_Ogrons.xml
deleted file mode 100644
index 610959cc03..0000000000
--- a/Patches/Rimsenal Collection/Feral/ThingDefs_Races/Race_Ogrons.xml	
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Feral Faction Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Ogron ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Mutant_Ogron"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Mutant_Ogron"]/statBases</xpath>
-					<value>
-						<CarryWeight>100</CarryWeight>
-						<CarryBulk>80</CarryBulk>
-						<AimingAccuracy>0.85</AimingAccuracy>
-						<ShootingAccuracyPawn>0.85</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.02</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.35</MeleeParryChance>
-						<SmokeSensitivity>0.1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mutant_Ogron"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mutant_Ogron"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mutant_Ogron"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>3.67</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>2.67</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>2.67</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Feral/ThingDefs_Races/Race_Razortooth.xml b/Patches/Rimsenal Collection/Feral/ThingDefs_Races/Race_Razortooth.xml
deleted file mode 100644
index 9852d4eb4d..0000000000
--- a/Patches/Rimsenal Collection/Feral/ThingDefs_Races/Race_Razortooth.xml	
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Feral Faction Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Mutant_Razortooth ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Mutant_Razortooth"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Mutant_Razortooth"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>20</ArmorRating_Blunt>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>0.18</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-						<SmokeSensitivity>0.4</SmokeSensitivity>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mutant_Razortooth"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.19</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.19</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.46</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>16</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<chanceFactor>2</chanceFactor>
-								<armorPenetrationBlunt>5.063</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.8</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>3.2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.225</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Feral/ThingDefs_Races/Race_Shadark.xml b/Patches/Rimsenal Collection/Feral/ThingDefs_Races/Race_Shadark.xml
deleted file mode 100644
index 9bbef53de5..0000000000
--- a/Patches/Rimsenal Collection/Feral/ThingDefs_Races/Race_Shadark.xml	
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Feral Faction Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Shadark ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Mutant_Shadark"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Mutant_Shadark"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<SmokeSensitivity>0</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mutant_Shadark"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>5</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>5</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Feral/ThingDefs_Races/Race_Twisted.xml b/Patches/Rimsenal Collection/Feral/ThingDefs_Races/Race_Twisted.xml
deleted file mode 100644
index 48c6fed6dd..0000000000
--- a/Patches/Rimsenal Collection/Feral/ThingDefs_Races/Race_Twisted.xml	
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Feral Faction Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Twisted ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Mutant_Twisted"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Mutant_Twisted"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>0.5</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mutant_Twisted"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>5</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>5</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Marauder/Marauder_Grenades.xml b/Patches/Rimsenal Collection/Marauder/Marauder_Grenades.xml
deleted file mode 100644
index 4ae30c82e1..0000000000
--- a/Patches/Rimsenal Collection/Marauder/Marauder_Grenades.xml	
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Marauders</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Kill recipe maker ========== -->
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="RSWeapon_PipeBombs"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>BaseWeapon</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RSWeapon_PipeBombs"]/costList</xpath>
-				</li>
-
-				<!-- ========== Pipe Bomb ========== -->
-
-				<!-- Projectile -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Proj_PipeBomb"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Proj_PipeBomb"]/graphicData/texPath</xpath>
-					<value>
-						<texPath>Things/Projectile/PipeBomb</texPath>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Proj_PipeBomb"]/label</xpath>
-					<value>
-						<label>pipe bomb</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Proj_PipeBomb"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>0.5</explosionRadius>
-							<damageDef>Bomb</damageDef>
-							<damageAmountBase>15</damageAmountBase>
-							<explosionDelay>60</explosionDelay>
-							<dropsCasings>false</dropsCasings>
-							<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-							<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							<speed>8</speed>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Proj_PipeBomb"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Proj_PipeBomb"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Proj_PipeBomb"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<fragments>
-								<Fragment_Small>8</Fragment_Small>
-							</fragments>
-						</li>
-					</value>
-				</li>
-
-				<!-- Item -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RSWeapon_PipeBombs"]/graphicData</xpath>
-					<value>
-						<graphicData>
-							<texPath>Things/Ammo/Pipebomb</texPath>
-							<graphicClass>Graphic_StackCount</graphicClass>
-							<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
-						</graphicData>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RSWeapon_PipeBombs"]</xpath>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<stackLimit>100</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="RSWeapon_PipeBombs"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="RSWeapon_PipeBombs"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="RSWeapon_PipeBombs"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RSWeapon_PipeBombs"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>15</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosionRadius>0.5</explosionRadius>
-							<fragments>
-								<Fragment_Small>8</Fragment_Small>
-							</fragments>
-						</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RSWeapon_PipeBombs</defName>
-					<statBases>
-						<Mass>0.992</Mass>
-						<Bulk>1.09</Bulk>
-						<MarketValue>12.22</MarketValue>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<label>throw pipe bomb</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<range>10.0</range>
-						<minRange>4</minRange>
-						<warmupTime>0.8</warmupTime>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<soundCast>ThrowGrenade</soundCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<defaultProjectile>Proj_PipeBomb</defaultProjectile>
-						<onlyManualCast>true</onlyManualCast>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<weaponTags>
-						<li>CE_AI_Grenade</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Marauder/Marauder_Guns.xml b/Patches/Rimsenal Collection/Marauder/Marauder_Guns.xml
deleted file mode 100644
index 80625a05b3..0000000000
--- a/Patches/Rimsenal Collection/Marauder/Marauder_Guns.xml	
+++ /dev/null
@@ -1,552 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Marauders</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Tools ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RSGun_Contender" or defName="RSGun_DDP"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RSGun_TExpress" or defName="RSGun_TrenchCarbine" or defName="RSGun_VarmintRifle" or defName="RSGun_DMR" or defName="RSGun_CSAS"
-						or defName="RSGun_BoomPipe" or defName="RSGun_FlakCannon"]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RSGun_ChainSAW"]/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>
-				</li>
-
-				<!-- ========== Contender ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RSGun_Contender</defName>
-					<statBases>
-						<Mass>1.58</Mass>
-						<RangedWeapon_Cooldown>0.91</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.1</ShotSpread>
-						<SwayFactor>2.01</SwayFactor>
-						<Bulk>4.45</Bulk>
-						<WorkToMake>4000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>15</range>
-						<soundCast>Shot_Revolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>10</AmmoGenPerMagOverride>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_3006Springfield</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<noSnapshot>false</noSnapshot>
-						<noSingleShot>false</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>StoneCrownTier1</li>
-					</weaponTags>
-					<researchPrerequisite>Gunsmithing</researchPrerequisite>
-				</li>
-
-				<!-- ========== Dual Dueling Pistols ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RSGun_DDP</defName>
-					<statBases>
-						<Mass>1.9</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>2.28</SwayFactor>
-						<Bulk>5.34</Bulk>
-						<WorkToMake>5000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_32ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>8</reloadTime>
-						<ammoSet>AmmoSet_32ACP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_Pistol</li>
-						<li>StoneCrownTier2</li>
-					</weaponTags>
-					<researchPrerequisite>BlowbackOperation</researchPrerequisite>
-				</li>
-
-				<!-- ========== "Thrumbo Express" Big Game Rifle ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RSGun_TExpress</defName>
-					<statBases>
-						<Mass>4.6</Mass>
-						<RangedWeapon_Cooldown>0.9</RangedWeapon_Cooldown>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>4.60</SwayFactor>
-						<Bulk>10.2</Bulk>
-						<SightsEfficiency>1</SightsEfficiency>
-						<WorkToMake>9500</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_470NitroExpress_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>59</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_470NitroExpress</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>StoneCrownTier3</li>
-					</weaponTags>
-					<researchPrerequisite>Gunsmithing</researchPrerequisite>
-				</li>
-
-				<!-- ========== Trench Carbine ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RSGun_TrenchCarbine</defName>
-					<statBases>
-						<Mass>4.6</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.35</SwayFactor>
-						<Bulk>6.3</Bulk>
-						<WorkToMake>11000</WorkToMake>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.17</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<warmupTime>0.9</warmupTime>
-						<range>31</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>false</noSnapshot>
-						<noSingleShot>false</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-					<researchPrerequisite>BlowbackOperation</researchPrerequisite>
-				</li>
-
-				<!-- ========== Storm Rifle ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RSGun_StormRifle</defName>
-					<statBases>
-						<Mass>3.25</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.07</SwayFactor>
-						<Bulk>7.45</Bulk>
-						<WorkToMake>40000</WorkToMake>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.54</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>48</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>false</noSnapshot>
-						<noSingleShot>false</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>IronRosesTier2</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-				</li>
-
-				<!-- ========== Chain SAW ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RSGun_ChainSAW</defName>
-					<statBases>
-						<Mass>10.40</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>2.60</SwayFactor>
-						<Bulk>17.60</Bulk>
-						<WorkToMake>30000</WorkToMake>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.34</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>68</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>200</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>IronRosesTier3</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-				</li>
-
-				<!-- ========== Varmint Rifle ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RSGun_VarmintRifle</defName>
-					<statBases>
-						<Mass>3.63</Mass>
-						<RangedWeapon_Cooldown>1.16</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.52</SwayFactor>
-						<Bulk>11.18</Bulk>
-						<WorkToMake>12000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>60</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>VeilWalkersTier1</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== DMR ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RSGun_DMR</defName>
-					<statBases>
-						<Mass>4.3</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.47</SwayFactor>
-						<Bulk>10</Bulk>
-						<WorkToMake>45000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>72</range>
-						<soundCast>Shot_SniperRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>VeilWalkersTier2</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== CSAS ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RSGun_CSAS</defName>
-					<statBases>
-						<Mass>6</Mass>
-						<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.42</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.87</SwayFactor>
-						<Bulk>12</Bulk>
-						<WorkToMake>45000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>1.45</warmupTime>
-						<range>75</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>VeilWalkersTier3</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Boompipe ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RSGun_BoomPipe</defName>
-					<statBases>
-						<Mass>2.7</Mass>
-						<RangedWeapon_Cooldown>0.93</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1</SwayFactor>
-						<Bulk>7.31</Bulk>
-						<WorkToMake>10000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>40</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SmokeyToothTier2</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Flak Cannon ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>RSGun_FlakCannon</defName>
-					<statBases>
-						<Mass>7.6</Mass>
-						<RangedWeapon_Cooldown>1.16</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.86</SwayFactor>
-						<Bulk>13</Bulk>
-						<WorkToMake>10000</WorkToMake>
-					</statBases>
-					<Properties>
-						<recoilAmount>9.75</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_25x59mmGrenade_HE</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>68</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_25x59mmGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>4</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SmokeyToothTier3</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Security/Ammo_Security.xml b/Patches/Rimsenal Collection/Security/Ammo_Security.xml
deleted file mode 100644
index 7ee9fa0cbc..0000000000
--- a/Patches/Rimsenal Collection/Security/Ammo_Security.xml	
+++ /dev/null
@@ -1,593 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Security Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ==================== Fake Bullet ========================== -->
-
-						<ThingDef ParentName="Base556x45mmNATOBullet">
-							<defName>Bullet_FakeBullet_CE</defName>
-							<label>dummy round</label>
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_Small</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>120</speed>
-								<dropsCasings>false</dropsCasings>
-								<damageAmountBase>0</damageAmountBase>
-								<armorPenetrationBlunt>0</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</projectile>
-						</ThingDef>
-
-						<!-- ================== Molten Shell ================== -->
-
-						<ThingCategoryDef>
-							<defName>AmmoMoltenShells</defName>
-							<label>Molten shell</label>
-							<parent>AmmoRockets</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberRocket</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_MoltenShell</defName>
-							<label>molten shells</label>
-							<ammoTypes>
-								<Ammo_MoltenShell>Bullet_MoltenShell</Ammo_MoltenShell>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="MoltenShellBase" ParentName="MediumAmmoBase" Abstract="True">
-							<description>Relatively small diameter cannon shell, fired at high velocity to defeat heavy armor.</description>
-							<thingCategories>
-								<li>AmmoMoltenShells</li>
-							</thingCategories>
-							<stackLimit>25</stackLimit>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-							</tradeTags>
-							<statBases>
-								<MaxHitPoints>200</MaxHitPoints>
-								<Mass>8</Mass>
-								<Bulk>12</Bulk>
-							</statBases>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="MoltenShellBase">
-							<defName>Ammo_MoltenShell</defName>
-							<label>molten shell</label>
-							<graphicData>
-								<texPath>Things/Item/MoltenShell</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>150</MarketValue>
-							</statBases>
-							<ammoClass>MoltenShell</ammoClass>
-							<comps>
-							</comps>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="Base90mmCannonShell">
-							<defName>Bullet_MoltenShell</defName>
-							<label>molten shell</label>
-							<graphicData>
-								<texPath>Things/Projectile/Cannon/HEAT</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>151</speed>
-								<soundExplode>MortarBomb_Explode</soundExplode>
-								<flyOverhead>false</flyOverhead>
-								<dropsCasings>false</dropsCasings>
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>400</damageAmountBase>
-								<armorPenetrationSharp>700</armorPenetrationSharp>
-								<armorPenetrationBlunt>80000</armorPenetrationBlunt>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>5</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>0.5</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragSpeedFactor>0.5</fragSpeedFactor>
-									<fragments>
-										<Fragment_Large>325</Fragment_Large>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<!-- ==================== Recipe: Molten Shell ========================== -->
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>MakeAmmo_MoltenShells</defName>
-							<label>make molten shells x5</label>
-							<description>Craft 5 molten shells.</description>
-							<jobString>Making molten shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>18</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>18</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Plasteel</li>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_MoltenShell>5</Ammo_MoltenShell>
-							</products>
-							<workAmount>19000</workAmount>
-						</RecipeDef>
-
-						<!-- ================== ATGMs ================== -->
-
-						<ThingCategoryDef>
-							<defName>Missile_ATGM</defName>
-							<label>Grey Dale ATGM</label>
-							<parent>AmmoRockets</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberRocket</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_ATGM</defName>
-							<label>Anti-tank guided missile</label>
-							<ammoTypes>
-								<Missile_ATGM_HE>Bullet_ATGM_HE</Missile_ATGM_HE>
-								<Missile_ATGM_AP>Bullet_ATGM_AP</Missile_ATGM_AP>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="ATGMBase" ParentName="HeavyAmmoBase" Abstract="True">
-							<description>Equipped with a large warhead and originally designed to penetrate the thick armor of tanks with a shaped charge, this missile is fired from a specialized launcher and guided by wire to the target.</description>
-							<statBases>
-								<MaxHitPoints>150</MaxHitPoints>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_TableMachining</li>
-							</tradeTags>
-							<thingCategories>
-								<li>Missile_ATGM</li>
-							</thingCategories>
-							<stackLimit>15</stackLimit>
-							<cookOffFlashScale>40</cookOffFlashScale>
-							<cookOffSound>MortarBomb_Explode</cookOffSound>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="ATGMBase">
-							<defName>Missile_ATGM_HE</defName>
-							<label>Anti-tank guided missile (HE)</label>
-							<graphicData>
-								<texPath>Things/Item/Missile_HE</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>65</MarketValue>
-								<Mass>10</Mass>
-								<Bulk>10</Bulk>
-							</statBases>
-							<ammoClass>GrenadeHE</ammoClass>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>100</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>2</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Large>12</Fragment_Large>
-										<Fragment_Small>80</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="ATGMBase">
-							<defName>Missile_ATGM_AP</defName>
-							<label>Anti-tank guided missile (HEAT)</label>
-							<graphicData>
-								<texPath>Things/Item/Missile_AP</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>65</MarketValue>
-								<Mass>10</Mass>
-								<Bulk>10</Bulk>
-							</statBases>
-							<ammoClass>RocketHEAT</ammoClass>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>100</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>1.5</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Large>8</Fragment_Large>
-										<Fragment_Small>20</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="BaseExplosiveBullet">
-							<defName>Bullet_ATGM_HE</defName>
-							<label>Anti-tank guided missile (HE)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Missile_HE</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>152</damageAmountBase>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>40</armorPenetrationBlunt>
-								<explosionRadius>3.5</explosionRadius>
-								<soundExplode>MortarBomb_Explode</soundExplode>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<speed>76</speed>
-								<soundAmbient>RocketPropelledLoop_Small</soundAmbient>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Large>20</Fragment_Large>
-										<Fragment_Small>50</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseExplosiveBullet">
-							<defName>Bullet_ATGM_AP</defName>
-							<label>Anti-tank guided missile (HEAT)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Missile_AP</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>304</damageAmountBase>
-								<soundExplode>MortarBomb_Explode</soundExplode>
-								<armorPenetrationSharp>600</armorPenetrationSharp>
-								<armorPenetrationBlunt>38.687</armorPenetrationBlunt>
-								<speed>76</speed>
-								<soundAmbient>RocketPropelledLoop_Small</soundAmbient>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>127</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>1</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Large>4</Fragment_Large>
-										<Fragment_Small>8</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<!-- ==================== Recipe: ATGM (HE) ========================== -->
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeMissile_ATGM_HE</defName>
-							<label>make HE anti-tank guided missile x5</label>
-							<description>Craft 5 12x64mm Grey Dale anti-tank guided missiles with high explosive warheads.</description>
-							<jobString>Making 5 HE ATGMs.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>50</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>5</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-									<li>FSX</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<researchPrerequisite Inherit="False">
-								<li>DefenceEmplacementTech</li>
-							</researchPrerequisite>
-							<recipeUsers Inherit="False">
-								<li>GDTable</li>
-							</recipeUsers>
-							<products>
-								<Missile_ATGM_HE>5</Missile_ATGM_HE>
-							</products>
-						</RecipeDef>
-
-						<!-- ==================== Recipe: ATGM (HEAT) ========================== -->
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeMissile_ATGM_AP</defName>
-							<label>make HEAT anti-tank guided missile x5</label>
-							<description>Craft 5 12x64mm Grey Dale anti-tank guided missiles with high explosive anti-tank warheads.</description>
-							<jobString>Making 5 HEAT ATGMs.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>70</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>5</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>5</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-									<li>FSX</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<researchPrerequisite Inherit="False">
-								<li>DefenceEmplacementTech</li>
-							</researchPrerequisite>
-							<recipeUsers Inherit="False">
-								<li>GDTable</li>
-							</recipeUsers>
-							<products>
-								<Missile_ATGM_AP>5</Missile_ATGM_AP>
-							</products>
-						</RecipeDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_81mmMortarShellRimsenal</defName>
-							<label>81mm mortar shells</label>
-							<ammoTypes>
-								<Shell_HighExplosive>Bullet_81mmMortarShellRimsenal_HE</Shell_HighExplosive>
-								<Shell_Incendiary>Bullet_81mmMortarShellRimsenal_Incendiary</Shell_Incendiary>
-								<Shell_EMP>Bullet_81mmMortarShellRimsenal_EMP</Shell_EMP>
-								<Shell_Firefoam>Bullet_81mmMortarShellRimsenal_Firefoam</Shell_Firefoam>
-								<Shell_Smoke>Bullet_81mmMortarShellRimsenal_Smoke</Shell_Smoke>
-								<Shell_AntigrainWarhead>Bullet_81mmMortarShellRimsenal_Antigrain</Shell_AntigrainWarhead>
-							</ammoTypes>
-							<isMortarAmmoSet>true</isMortarAmmoSet>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="Base81mmMortarShell">
-							<defName>Bullet_81mmMortarShellRimsenal_HE</defName>
-							<label>81mm mortar shell (HE)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Mortar/HE</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>45</speed>
-								<gravityFactor>2</gravityFactor>
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>156</damageAmountBase>
-								<explosionRadius>2.5</explosionRadius>
-								<flyOverhead>false</flyOverhead>
-								<soundExplode>MortarBomb_Explode</soundExplode>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<ai_IsIncendiary>true</ai_IsIncendiary>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Large>16</Fragment_Large>
-										<Fragment_Small>100</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="Base81mmMortarShell">
-							<defName>Bullet_81mmMortarShellRimsenal_Incendiary</defName>
-							<label>81mm mortar shell (Incendiary)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Mortar/Incendiary</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>45</speed>
-								<gravityFactor>2</gravityFactor>
-								<damageDef>PrometheumFlame</damageDef>
-								<damageAmountBase>6</damageAmountBase>
-								<explosionRadius>6.5</explosionRadius>
-								<flyOverhead>false</flyOverhead>
-								<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
-								<preExplosionSpawnChance>0.15</preExplosionSpawnChance>
-								<soundExplode>MortarIncendiary_Explode</soundExplode>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base81mmMortarShell">
-							<defName>Bullet_81mmMortarShellRimsenal_EMP</defName>
-							<label>81mm mortar shell (EMP)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Mortar/EMP</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>45</speed>
-								<gravityFactor>2</gravityFactor>
-								<damageDef>EMP</damageDef>
-								<damageAmountBase>156</damageAmountBase>
-								<flyOverhead>false</flyOverhead>
-								<explosionRadius>5.5</explosionRadius>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base81mmMortarShell">
-							<defName>Bullet_81mmMortarShellRimsenal_Firefoam</defName>
-							<label>81mm mortar shell (Foam)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Mortar/Firefoam</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>45</speed>
-								<gravityFactor>2</gravityFactor>
-								<damageDef>Extinguish</damageDef>
-								<suppressionFactor>0.0</suppressionFactor>
-								<dangerFactor>0.0</dangerFactor>
-								<explosionRadius>5</explosionRadius>
-								<flyOverhead>false</flyOverhead>
-								<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-								<soundExplode>Explosion_EMP</soundExplode>
-								<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
-								<soundAmbient>MortarRound_Ambient</soundAmbient>
-								<postExplosionSpawnThingDef>Filth_FireFoam</postExplosionSpawnThingDef>
-								<postExplosionSpawnChance>1</postExplosionSpawnChance>
-								<postExplosionSpawnThingCount>3</postExplosionSpawnThingCount>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<explosionEffect>ExtinguisherExplosion</explosionEffect>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base81mmMortarShell">
-							<defName>Bullet_81mmMortarShellRimsenal_Smoke</defName>
-							<label>81mm mortar shell (Smoke)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Mortar/Smoke</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>45</speed>
-								<gravityFactor>2</gravityFactor>
-								<damageDef>Smoke</damageDef>
-								<suppressionFactor>0.0</suppressionFactor>
-								<dangerFactor>0.0</dangerFactor>
-								<explosionRadius>6</explosionRadius>
-								<flyOverhead>false</flyOverhead>
-								<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-								<soundExplode>Explosion_EMP</soundExplode>
-								<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
-								<soundAmbient>MortarRound_Ambient</soundAmbient>
-								<postExplosionGasType>BlindSmoke</postExplosionGasType>
-								<preExplosionSpawnChance>1</preExplosionSpawnChance>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<explosionEffect>ExtinguisherExplosion</explosionEffect>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base81mmMortarShell">
-							<defName>Bullet_81mmMortarShellRimsenal_Antigrain</defName>
-							<label>81mm mortar shell (Anti)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Mortar/Antigrain</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>45</speed>
-								<gravityFactor>2</gravityFactor>
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>800</damageAmountBase>
-								<explosionRadius>50</explosionRadius>
-								<explosionChanceToStartFire>0.22</explosionChanceToStartFire>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<flyOverhead>false</flyOverhead>
-								<explosionEffect>GiantExplosion</explosionEffect>
-								<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-								<soundExplode>Explosion_GiantBomb</soundExplode>
-								<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
-								<soundAmbient>MortarRound_Ambient</soundAmbient>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Collection/Security/Patch_Security.xml b/Patches/Rimsenal Collection/Security/Patch_Security.xml
deleted file mode 100644
index 00c3eeba25..0000000000
--- a/Patches/Rimsenal Collection/Security/Patch_Security.xml	
+++ /dev/null
@@ -1,669 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal - Security Pack</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Shard Sentry ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_ShardSentry</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>0.63</SwayFactor>
-						<Bulk>8.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.78</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_RifleYP</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>55</range>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>RS_ShotShard</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>6</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>5.8</reloadTime>
-						<ammoSet>AmmoSet_RifleYP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Wave Emitter ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_WaveEmitter</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>2.6</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>0.63</SwayFactor>
-						<Bulk>8.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.01</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_GeugGwang_CE</defaultProjectile>
-						<warmupTime>2.8</warmupTime>
-						<range>40</range>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<burstShotCount>5</burstShotCount>
-						<soundCast>RS_ShotBoreas</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>0</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>20</aimedBurstShotCount>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Nest HMG ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_NestHMG</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1.89</SwayFactor>
-						<Bulk>40.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.13</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>86</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>20</burstShotCount>
-						<soundCast>HeavyMG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>250</magazineSize>
-						<reloadTime>10</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>10</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Portable MMG ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_NestMMG</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>0.92</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.06</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>62</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>ShotGRS</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>8</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== AGS ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AGS</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.20</SwayFactor>
-						<Bulk>8.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.83</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_25x40mmGrenade_HE</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>62</range>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<burstShotCount>6</burstShotCount>
-						<soundCast>ShotGdgrenade</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>42</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_25x40mmGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Fake Rifle ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_FakeRifle</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.00</ShotSpread>
-						<SwayFactor>0.00</SwayFactor>
-						<Bulk>7.90</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.00</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_FakeBullet_CE</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>40</range>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<burstShotCount>5</burstShotCount>
-						<soundCast>GunShotA</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Suv Turret ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SuvTurret</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>2.40</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.6</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<Bulk>11.90</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.25</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_TEConcentratedPowerCharge_KE</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
-						<burstShotCount>3</burstShotCount>
-						<soundCast>ImpactL</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>18</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Nest Missile ========== -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName = "Turret_NestMissile"]/inspectorTabs</xpath>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_NestMissile</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
-						<SightsEfficiency>3</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1.25</SwayFactor>
-						<Bulk>20</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.13</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_ATGM_HE</defaultProjectile>
-						<warmupTime>2.1</warmupTime>
-						<range>86</range>
-						<soundCast>RS_ShotGrendel</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>10</reloadTime>
-						<ammoSet>AmmoSet_ATGM</ammoSet>
-					</AmmoUser>
-					<FireModes>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Molten Cannon ========== -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="MoltenShell"]</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Artillery_MC"]</xpath>
-					<value>
-						<ThingDef ParentName="BaseTurretGun">
-							<defName>Artillery_MC</defName>
-							<label>molten cannon</label>
-							<graphicData>
-								<texPath>Things/Building/MC</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<description>An enormous cannon that fires a projectile of molten metal. Though less useful against soft targets than conventional artillery and limited to a direct fire role, but definitely more powerful, it is nevertheless the ideal anti-mechanoid cannon, and is extensively employed in the ongoing mechanoid war on Jotunheim Prime. Fires molten shells.</description>
-							<statBases>
-								<Flammability>1.0</Flammability>
-								<WorkToMake>31500</WorkToMake>
-								<Mass>16.5</Mass>
-								<Bulk>20</Bulk>
-								<MarketValue>2000</MarketValue>
-								<SightsEfficiency>2.6</SightsEfficiency>
-								<ShotSpread>0.04</ShotSpread>
-								<SwayFactor>0.96</SwayFactor>
-								<RangedWeapon_Cooldown>2.0</RangedWeapon_Cooldown>
-							</statBases>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_MoltenShell</defaultProjectile>
-									<warmupTime>4.5</warmupTime>
-									<range>86</range>
-									<soundCast>RS_ShotJI</soundCast>
-									<muzzleFlashScale>16</muzzleFlashScale>
-									<recoilPattern>Mounted</recoilPattern>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-								</li>
-							</verbs>
-							<comps>
-								<li Class="CombatExtended.CompProperties_AmmoUser">
-									<magazineSize>1</magazineSize>
-									<reloadTime>8</reloadTime>
-									<ammoSet>AmmoSet_MoltenShell</ammoSet>
-								</li>
-								<li Class="CombatExtended.CompProperties_FireModes">
-									<aiAimMode>AimedShot</aiAimMode>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- ========== Rocket Turret ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_RocketTurret</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>2.3</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.5</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>1.38</SwayFactor>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_JISiegeRocket</defaultProjectile>
-						<warmupTime>3.7</warmupTime>
-						<range>86</range>
-						<burstShotCount>4</burstShotCount>
-						<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-						<soundCast>RS_ShotGrendel</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>12</reloadTime>
-						<ammoSet>AmmoSet_JIRocket</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Cannon ========== -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName = "Turret_RSCannon"]/inspectorTabs</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Turret_RSCannon"
-						]/building/turretBurstCooldownTime </xpath>
-					<value>
-						<turretBurstCooldownTime>5</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Artillery_RSCannon</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
-						<SightsEfficiency>3</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1.89</SwayFactor>
-						<Bulk>20</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.13</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_ATGM_HE</defaultProjectile>
-						<warmupTime>5</warmupTime>
-						<range>62</range>
-						<soundCast>Mortar_LaunchA</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_81mmMortarShellRimsenal</ammoSet>
-					</AmmoUser>
-					<FireModes>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Common to all Defensive Turrets ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						@Name="BaseMCBuilding" or
-						@Name="NestMissile" or
-						@Name="NestHMG" or
-						@Name="NestAGS" or
-						@Name="NestMMG" or
-						defName="Turret_RSCannon"
-						]/thingClass </xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="Turret_NestHMG" or
-						defName="Turret_NestAGS" or
-						defName="RocketTurret"or
-						defName="Turret_RSCannon"
-						]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="Turret_NestHMG" or
-						defName="Turret_NestAGS" or
-						defName="Turret_NestMMG" or
-						defName="Turret_RSCannon"
-						]/statBases </xpath>
-					<value>
-						<AimingAccuracy>0.5</AimingAccuracy>
-					</value>
-				</li>
-
-				<!--========== Common to all Sentry Turrets ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						@Name="ShardSentry" or
-						@Name="SuvTurret" or
-						@Name="WaveEmitter" or
-						defName="RSDummy" or
-						defName="Turret_Smartmine"
-						]/thingClass </xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="Turret_ShardSentry" or
-						defName="Turret_SuvTurret" or
-						defName="Turret_Smartmine"
-						]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="Turret_ShardSentry" or
-						defName="Turret_SuvTurret" or
-						defName="Turret_WaveEmitter" or
-						defName="RSDummy" or
-						defName="Turret_Smartmine"
-						]/statBases </xpath>
-					<value>
-						<AimingAccuracy>1.0</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="Turret_ShardSentry" or
-						defName="Turret_SuvTurret" or
-						defName="Turret_WaveEmitter" or
-						defName="RocketTurret"
-						]/statBases </xpath>
-					<value>
-						<NightVisionEfficiency>0.5</NightVisionEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="Gun_SuvTurret" or
-						defName="Gun_RocketTurret" or
-						defName="Gun_WaveEmitter" or
-						defName="Gun_ShardSentry"
-						]/statBases </xpath>
-					<value>
-						<NightVisionEfficiency_Weapon>0.5</NightVisionEfficiency_Weapon>
-					</value>
-				</li>
-
-				<!--========== fillpercent replacement ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						@Name="NestMissile" or
-						@Name="NestHMG" or
-						@Name="NestAGS" or
-						@Name="NestMMG" or
-						@Name="ShardSentry" or
-						@Name="SuvTurret" or
-						@Name="WaveEmitter" or
-						defName="RSDummy" or
-						defName="Turret_RSCannon"
-						]/fillPercent </xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name = "BaseMCBuilding"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Missile_HE"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Missile_AP"]</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						@Name = "BaseMCBuilding"]/thingClass </xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name = "BaseMCBuilding"]/inspectorTabs</xpath>
-				</li>
-
-				<!-- ========== Impact Mine ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ImpactMine"]/comps/li[@Class="CompProperties_Explosive"]</xpath>
-					<value>
-						<li Class="CompProperties_Explosive">
-							<explosiveDamageType>KineticImpact</explosiveDamageType>
-							<explosiveRadius>3.5</explosiveRadius>
-							<wickTicks>
-								<min>10</min>
-								<max>15</max>
-							</wickTicks>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Explosive Barrel ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FuelBarrel"]/comps/li[@Class="CompProperties_Explosive"]</xpath>
-					<value>
-						<li Class="CompProperties_Explosive">
-							<explosiveDamageType>PrometheumFlame</explosiveDamageType>
-							<explosiveRadius>3</explosiveRadius>
-							<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
-							<preExplosionSpawnChance>1</preExplosionSpawnChance>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Smart Mine ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Smartmine</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>5</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.25</ShotSpread>
-						<SwayFactor>0</SwayFactor>
-						<Bulk>10</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_RifleYP</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>5</range>
-						<soundCast>Mortar_LaunchA</soundCast>
-						<muzzleFlashScale>20</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>12</reloadTime>
-						<ammoSet>AmmoSet_81mmMortarShellRimsenal</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Xenotype Pack - Askbarn/Ammo_Askbarn.xml b/Patches/Rimsenal Xenotype Pack - Askbarn/Ammo_Askbarn.xml
deleted file mode 100644
index 54d4dd9b64..0000000000
--- a/Patches/Rimsenal Xenotype Pack - Askbarn/Ammo_Askbarn.xml	
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal Xenotype Pack - Askbarn</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationFindMod">
-					<mods>
-						<li>Rimsenal - Core</li>
-					</mods>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs</xpath>
-						<value>
-							<!-- ==================== JI Carbine ========================== -->
-
-							<CombatExtended.AmmoSetDef>
-								<defName>AmmoSet_JICarbine</defName>
-								<label>molten slug</label>
-								<ammoTypes>
-									<Ammo_JI_Alloy>Bullet_JI_Carbine</Ammo_JI_Alloy>
-								</ammoTypes>
-							</CombatExtended.AmmoSetDef>
-
-							<!-- ================== Projectiles ================== -->
-
-							<ThingDef ParentName="Base556x45mmNATOBullet">
-								<defName>Bullet_JI_Carbine</defName>
-								<label>Semi-molten alloy</label>
-								<graphicData>
-									<texPath>Things/Projectile/Slug</texPath>
-									<graphicClass>Graphic_Single</graphicClass>
-								</graphicData>
-								<projectile Class="CombatExtended.ProjectilePropertiesCE">
-									<damageDef>Bullet</damageDef>
-									<speed>106</speed>
-									<dropsCasings>false</dropsCasings>
-									<damageAmountBase>14</damageAmountBase>
-									<armorPenetrationBlunt>125</armorPenetrationBlunt>
-									<armorPenetrationSharp>13</armorPenetrationSharp>
-								</projectile>
-							</ThingDef>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationFindMod">
-					<mods>
-						<li>Rimsenal - Augmented Vanilla Pack</li>
-					</mods>
-
-					<match Class="PatchOperationAdd">
-						<xpath>Defs</xpath>
-						<value>
-
-							<!-- ================== EMP Blast - Projectiles ================== -->
-
-							<ThingDef ParentName="BaseExplosiveBullet">
-								<defName>EMP_FusterClucker</defName>
-								<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-								<label>emp blast</label>
-								<graphicData>
-									<texPath>Things/Projectile/RaceBallLightning</texPath>
-									<graphicClass>Graphic_Single</graphicClass>
-								</graphicData>
-								<projectile Class="CombatExtended.ProjectilePropertiesCE">
-									<damageDef>EMP</damageDef>
-									<damageAmountBase>75</damageAmountBase>
-									<speed>73</speed>
-									<flyOverhead>false</flyOverhead>
-									<explosionRadius>2</explosionRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</projectile>
-							</ThingDef>
-
-							<CombatExtended.AmmoSetDef>
-								<defName>AmmoSet_LaserEMP_FusterClucker</defName>
-								<label>Charge Pack (EMP)</label>
-								<ammoTypes>
-									<Ammo_LaserChargePack>EMP_FusterClucker</Ammo_LaserChargePack>
-								</ammoTypes>
-							</CombatExtended.AmmoSetDef>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Xenotype Pack - Askbarn/Gene_Askbarn_CE.xml b/Patches/Rimsenal Xenotype Pack - Askbarn/Gene_Askbarn_CE.xml
deleted file mode 100644
index da591be57a..0000000000
--- a/Patches/Rimsenal Xenotype Pack - Askbarn/Gene_Askbarn_CE.xml	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal Xenotype Pack - Askbarn</li>
-		</mods>
-		<match Class="PatchOperationReplace">
-			<xpath>Defs/GeneDef[defName="RSLongshot"]/statFactors</xpath>
-			<value>
-				<statFactors>
-					<AimingAccuracy>1.5</AimingAccuracy>
-				</statFactors>
-			</value>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimsenal Xenotype Pack - Askbarn/Weapons_Askbarn_CE.xml b/Patches/Rimsenal Xenotype Pack - Askbarn/Weapons_Askbarn_CE.xml
deleted file mode 100644
index 7ce714b76c..0000000000
--- a/Patches/Rimsenal Xenotype Pack - Askbarn/Weapons_Askbarn_CE.xml	
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimsenal Xenotype Pack - Askbarn</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationFindMod">
-					<mods>
-						<li>Rimsenal - Core</li>
-					</mods>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<!-- ==========  Molten Carbine =========== -->
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/thingDef[defName="JI_Sigrun"]/statBases</xpath>
-								<value>
-									<statBases>
-										<SightsEfficiency>1.1</SightsEfficiency>
-										<ShotSpread>0.1</ShotSpread>
-										<SwayFactor>1.14</SwayFactor>
-										<Bulk>6.5</Bulk>
-										<Mass>3.4</Mass>
-										<RangedWeapon_Cooldown>0.41</RangedWeapon_Cooldown>
-									</statBases>
-								</value>
-							</li>
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/thingDef[defName="JI_Sigrun"]/verbs</xpath>
-								<value>
-									<verbs>
-										<li Class="CombatExtended.VerbPropertiesCE">
-											<recoilAmount>3.43</recoilAmount>
-											<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-											<hasStandardCommand>true</hasStandardCommand>
-											<defaultProjectile>Bullet_JI_Carbine</defaultProjectile>
-											<warmupTime>1.2</warmupTime>
-											<range>35</range>
-											<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-											<burstShotCount>3</burstShotCount>
-											<soundCast>RS_ShotJI</soundCast>
-											<soundCastTail>GunTail_Medium</soundCastTail>
-											<muzzleFlashScale>12</muzzleFlashScale>
-										</li>
-									</verbs>
-								</value>
-							</li>
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/thingDef[defName="JI_Sigrun"]</xpath>
-								<value>
-									<comps>
-										<li Class="CombatExtended.CompProperties_AmmoUser">
-											<magazineSize>24</magazineSize>
-											<reloadTime>4</reloadTime>
-											<ammoSet>AmmoSet_JICarbine</ammoSet>
-										</li>
-										<li Class="CombatExtended.CompProperties_FireModes">
-											<aimedBurstShotCount>2</aimedBurstShotCount>
-											<aiUseBurstMode>TRUE</aiUseBurstMode>
-											<aiAimMode>Snapshot</aiAimMode>
-										</li>
-									</comps>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/thingDef[
-									defName="JI_Sigrun"
-									] </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>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-				<li Class="PatchOperationFindMod">
-					<mods>
-						<li>Rimsenal - Augmented Vanilla Pack</li>
-					</mods>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<!-- ========== EMP Sidearm =========== -->
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>Gun_DisruptionPistol</defName>
-								<statBases>
-									<SightsEfficiency>0.7</SightsEfficiency>
-									<ShotSpread>0.15</ShotSpread>
-									<SwayFactor>1.53</SwayFactor>
-									<Bulk>2.50</Bulk>
-									<Mass>2.10</Mass>
-									<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-								</statBases>
-								<Properties>
-									<recoilAmount>2.20</recoilAmount>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
-									<warmupTime>0.6</warmupTime>
-									<range>12</range>
-									<ammoConsumedPerShotCount>5</ammoConsumedPerShotCount>
-									<soundCast>Shot_ChargeRifle</soundCast>
-									<soundCastTail>GunTail_Light</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<AmmoUser>
-									<magazineSize>35</magazineSize>
-									<reloadTime>4.5</reloadTime>
-									<ammoSet>AmmoSet_LaserEMP_Rimsenal</ammoSet>
-								</AmmoUser>
-								<FireModes>
-									<aiAimMode>Snapshot</aiAimMode>
-								</FireModes>
-								<weaponTags>
-									<li>CE_Sidearm</li>
-									<li>CE_AI_Pistol</li>
-									<li>CE_OneHandedWeapon</li>
-									<li>AdvancedGun</li>
-								</weaponTags>
-							</li>
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="Gun_DisruptionPistol"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>grip</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>1.54</cooldownTime>
-											<chanceFactor>1.5</chanceFactor>
-											<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-											<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>muzzle</label>
-											<capacities>
-												<li>Poke</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>1.54</cooldownTime>
-											<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-											<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-							<!-- ========== EMP Heavy	=========== -->
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>Gun_FusterClucker</defName>
-								<statBases>
-									<SightsEfficiency>1</SightsEfficiency>
-									<ShotSpread>0.01</ShotSpread>
-									<SwayFactor>2.18</SwayFactor>
-									<Bulk>13.00</Bulk>
-									<Mass>8.80</Mass>
-									<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-								</statBases>
-								<Properties>
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>EMP_FusterClucker</defaultProjectile>
-									<warmupTime>2.6</warmupTime>
-									<range>75</range>
-									<ammoConsumedPerShotCount>100</ammoConsumedPerShotCount>
-									<soundCast>Shot_ChargeRifle</soundCast>
-									<soundCastTail>GunTail_Heavy</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</Properties>
-								<AmmoUser>
-									<magazineSize>100</magazineSize>
-									<reloadTime>5</reloadTime>
-									<ammoSet>AmmoSet_LaserEMP_FusterClucker</ammoSet>
-								</AmmoUser>
-								<FireModes>
-									<aiAimMode>AimedShot</aiAimMode>
-								</FireModes>
-								<weaponTags>
-									<li>AdvancedGun</li>
-								</weaponTags>
-							</li>
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="Gun_FusterClucker"]/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>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimworld - The Dark Descent/Patch_Items.xml b/Patches/Rimworld - The Dark Descent/Patch_Items.xml
deleted file mode 100644
index 5369305587..0000000000
--- a/Patches/Rimworld - The Dark Descent/Patch_Items.xml	
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimWorld - The Dark Descent</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "DarkDescent_Orb"]/statBases</xpath>
-					<value>
-						<Bulk>1.5</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "DarkDescent_Vitae" or defName = "DarkDescent_Orgone"]/statBases</xpath>
-					<value>
-						<Bulk>0.5</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name = "DarkDescent_InactiveBase"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimworld - The Dark Descent/Patch_Races.xml b/Patches/Rimworld - The Dark Descent/Patch_Races.xml
deleted file mode 100644
index ad665884ff..0000000000
--- a/Patches/Rimworld - The Dark Descent/Patch_Races.xml	
+++ /dev/null
@@ -1,553 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimWorld - The Dark Descent</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="DarkDescent_CreationBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="DarkDescent_CreationBase"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<SmokeSensitivity>0</SmokeSensitivity>
-					</value>
-				</li>
-
-				<!-- Grunt -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DarkDescent_Grunt"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.14</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0.07</MeleeParryChance>
-						<PainShockThreshold>0.85</PainShockThreshold>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DarkDescent_Grunt"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.9</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.50</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.203</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.406</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>4.60</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.825</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Brute -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DarkDescent_Brute"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.10</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-						<PainShockThreshold>0.90</PainShockThreshold>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DarkDescent_Brute"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DarkDescent_Brute"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>10</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DarkDescent_Brute"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grafted blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2.2</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.40</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.96</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.9</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.706</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>4.80</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.825</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Goliath -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DarkDescent_Goliath"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.10</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-						<PainShockThreshold>0.90</PainShockThreshold>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DarkDescent_Goliath"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DarkDescent_Goliath"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>10</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DarkDescent_Goliath"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grafted blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2.2</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.65</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.9</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>4.80</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Tesla -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DarkDescent_Tesla"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						<MeleeCritChance>0.06</MeleeCritChance>
-						<MeleeParryChance>0.08</MeleeParryChance>
-						<PainShockThreshold>0.99</PainShockThreshold>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DarkDescent_Tesla"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DarkDescent_Tesla"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>14</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DarkDescent_Tesla"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<extraMeleeDamages>
-									<li>
-										<def>EMP</def>
-										<amount>5</amount>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>2.3</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.203</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<extraMeleeDamages>
-									<li>
-										<def>EMP</def>
-										<amount>5</amount>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>2.3</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.203</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.70</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Wretch -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DarkDescent_Wretch"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.14</MeleeDodgeChance>
-						<MeleeCritChance>0.06</MeleeCritChance>
-						<MeleeParryChance>0.07</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DarkDescent_Wretch"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.58</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.58</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.96</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Engineer -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DarkDescent_Engineer"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.10</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0.03</MeleeParryChance>
-						<PainShockThreshold>0.80</PainShockThreshold>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DarkDescent_Engineer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.4</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.406</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.4</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.406</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>4.60</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.825</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Harvester -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DarkDescent_Harvester"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.10</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0.03</MeleeParryChance>
-						<PainShockThreshold>0.80</PainShockThreshold>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DarkDescent_Harvester"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hand</label>
-								<capacities>
-									<li>DarkDescent_HarvesterScratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.9</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.50</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.203</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hand</label>
-								<capacities>
-									<li>DarkDescent_HarvesterScratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.9</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.50</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.203</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>4.60</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.825</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Hound -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="DarkDescent_Hound"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DarkDescent_Hound"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>6.25</MoveSpeed>
-						<MeleeDodgeChance>0.26</MeleeDodgeChance>
-						<MeleeCritChance>0.09</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DarkDescent_Hound"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.73</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.55</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.225</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimworld - The Dark Descent/Patch_Scenarios.xml b/Patches/Rimworld - The Dark Descent/Patch_Scenarios.xml
deleted file mode 100644
index 50c708af8b..0000000000
--- a/Patches/Rimworld - The Dark Descent/Patch_Scenarios.xml	
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimWorld - The Dark Descent</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="DarkDescent_TheDarkDescent"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_303British_FMJ</thingDef>
-							<count>200</count>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimworld-Style Pilas And Bows Strapped With Grenades and Shells Extended/Arrows.xml b/Patches/Rimworld-Style Pilas And Bows Strapped With Grenades and Shells Extended/Arrows.xml
deleted file mode 100644
index 50478857fc..0000000000
--- a/Patches/Rimworld-Style Pilas And Bows Strapped With Grenades and Shells Extended/Arrows.xml	
+++ /dev/null
@@ -1,817 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimworld-Style Pilas And Bows Strapped With Grenades and Shells Extended</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--ARROWS-->
-
-				<!--Remove the bows and their projectiles-->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Bow_Grenade"] |
-						Defs/ThingDef[defName="Arrow_Grenade"] |
-						Defs/ThingDef[defName="Bow_Molotov"] |
-						Defs/ThingDef[defName="Arrow_Molotov"] |
-						Defs/ThingDef[defName="Bow_EMP"] |
-						Defs/ThingDef[defName="Arrow_EMP"] |
-						Defs/ThingDef[defName="Bow_Battery"] |
-						Defs/ThingDef[defName="Arrow_Battery"]
-					</xpath>
-				</li>
-
-				<!-- Ammo Set -->
-				<!--Regular Arrows-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_Arrow"]/ammoTypes</xpath>
-					<value>
-						<Ammo_Arrow_Grenade>Projectile_Arrow_Grenade</Ammo_Arrow_Grenade>
-						<Ammo_Arrow_Molotov>Projectile_Arrow_Molotov</Ammo_Arrow_Molotov>
-						<Ammo_Arrow_EMP>Projectile_Arrow_EMP</Ammo_Arrow_EMP>
-						<Ammo_Arrow_Battery>Projectile_Arrow_Battery</Ammo_Arrow_Battery>
-					</value>
-				</li>
-
-				<!--Streamlined Arrows-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_StreamlinedArrow"]/ammoTypes</xpath>
-					<value>
-						<Ammo_Arrow_Grenade>Projectile_StreamlinedArrow_Grenade</Ammo_Arrow_Grenade>
-						<Ammo_Arrow_Molotov>Projectile_StreamlinedArrow_Molotov</Ammo_Arrow_Molotov>
-						<Ammo_Arrow_EMP>Projectile_StreamlinedArrow_EMP</Ammo_Arrow_EMP>
-						<Ammo_Arrow_Battery>Projectile_StreamlinedArrow_Battery</Ammo_Arrow_Battery>
-					</value>
-				</li>
-
-				<!--Great Arrows-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_GreatArrow"]/ammoTypes</xpath>
-					<value>
-						<Ammo_GreatArrow_Grenade>Projectile_GreatArrow_Grenade</Ammo_GreatArrow_Grenade>
-						<Ammo_GreatArrow_Molotov>Projectile_GreatArrow_Molotov</Ammo_GreatArrow_Molotov>
-						<Ammo_GreatArrow_EMP>Projectile_GreatArrow_EMP</Ammo_GreatArrow_EMP>
-						<Ammo_GreatArrow_Battery>Projectile_GreatArrow_Battery</Ammo_GreatArrow_Battery>
-					</value>
-				</li>
-
-				<!-- Ammo Categories-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<CombatExtended.AmmoCategoryDef>
-							<defName>ArrowGrenade</defName>
-							<label>Bownade</label>
-							<description>Pull the pin and immediately shoot the arrow, or else.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>ArrowMolotov</defName>
-							<label>Bowlotov</label>
-							<description>No need for accuracy when your arrows explode.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>ArrowEMP</defName>
-							<label>BowMP</label>
-							<description>Demonic servants of a sleeping god, meet 'demonic servant of a sleeping god'-stopper.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>ArrowBattery</defName>
-							<label>Bowttery</label>
-							<description>When the guns are gone and you can't go on.</description>
-						</CombatExtended.AmmoCategoryDef>
-					</value>
-				</li>
-
-				<!--Arrows (Ammunition)-->
-				<!--Regular & Streamlined Arrows-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoArrowBase">
-							<defName>Ammo_Arrow_Grenade</defName>
-							<label>arrow (grenade)</label>
-							<graphicData>
-								<texPath>Bownade</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<ammoClass>ArrowGrenade</ammoClass>
-							<statBases>
-								<MarketValue>12.35</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableCrafting_CraftingSpot</li>
-							</tradeTags>
-							<generateAllowChance>0.1</generateAllowChance><!-- Should be a bit rarer than Plasteel -->
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoArrowBase">
-							<defName>Ammo_Arrow_Molotov</defName>
-							<label>arrow (molotov)</label>
-							<graphicData>
-								<texPath>Bowlotov</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<ammoClass>ArrowMolotov</ammoClass>
-							<statBases>
-								<MarketValue>7.18</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableCrafting_CraftingSpot</li>
-							</tradeTags>
-							<generateAllowChance>0.1</generateAllowChance><!-- Should be a bit rarer than a flame arrow -->
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoArrowBase">
-							<defName>Ammo_Arrow_EMP</defName>
-							<label>arrow (EMP)</label>
-							<graphicData>
-								<texPath>BowMP</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<ammoClass>ArrowEMP</ammoClass>
-							<statBases>
-								<MarketValue>21.22</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableCrafting_CraftingSpot</li>
-							</tradeTags>
-							<generateAllowChance>0.05</generateAllowChance><!-- Very rare? -->
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoArrowBase">
-							<defName>Ammo_Arrow_Battery</defName>
-							<label>arrow (battery)</label>
-							<graphicData>
-								<texPath>Bowttery</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<ammoClass>ArrowBattery</ammoClass>
-							<statBases>
-								<MarketValue>26.04</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableCrafting_CraftingSpot</li>
-							</tradeTags>
-							<generateAllowChance>0.05</generateAllowChance><!-- Very rare? -->
-						</ThingDef>
-					</value>
-				</li>
-
-				<!--Great Arrows-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoGreatArrowBase">
-							<defName>Ammo_GreatArrow_Grenade</defName>
-							<label>great arrow (grenade)</label>
-							<graphicData>
-								<texPath>Bownade</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<ammoClass>ArrowGrenade</ammoClass>
-							<statBases>
-								<MarketValue>12.61</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableCrafting_CraftingSpot</li>
-							</tradeTags>
-							<generateAllowChance>0.1</generateAllowChance><!-- Should be a bit rarer than a plasteel arrow -->
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoGreatArrowBase">
-							<defName>Ammo_GreatArrow_Molotov</defName>
-							<label>great arrow (molotov)</label>
-							<graphicData>
-								<texPath>Bowlotov</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<ammoClass>ArrowMolotov</ammoClass>
-							<statBases>
-								<MarketValue>7.44</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableCrafting_CraftingSpot</li>
-							</tradeTags>
-							<generateAllowChance>0.1</generateAllowChance><!-- Should be a bit rarer than a flame arrow -->
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoGreatArrowBase">
-							<defName>Ammo_GreatArrow_EMP</defName>
-							<label>great arrow (EMP)</label>
-							<graphicData>
-								<texPath>BowMP</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<ammoClass>ArrowEMP</ammoClass>
-							<statBases>
-								<MarketValue>21.48</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableCrafting_CraftingSpot</li>
-							</tradeTags>
-							<generateAllowChance>0.05</generateAllowChance><!-- Very rare? -->
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoGreatArrowBase">
-							<defName>Ammo_GreatArrow_Battery</defName>
-							<label>great arrow (battery)</label>
-							<graphicData>
-								<texPath>Bowttery</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<ammoClass>ArrowBattery</ammoClass>
-							<statBases>
-								<MarketValue>26.3</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableCrafting_CraftingSpot</li>
-							</tradeTags>
-							<generateAllowChance>0.05</generateAllowChance><!-- Very rare? -->
-						</ThingDef>
-					</value>
-				</li>
-
-				<!--Arrow Projectiles-->
-				<!--Regular Arrows-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingDef ParentName="BaseArrowProjectile">
-							<defName>Projectile_Arrow_Grenade</defName>
-							<label>arrow (bownade)</label>
-							<graphicData>
-								<texPath>BownadeP</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>1.5</explosionRadius>
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>56</damageAmountBase>
-								<explosionDelay>60</explosionDelay>
-								<dropsCasings>true</dropsCasings>
-								<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-								<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<speed>30</speed>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Small>40</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseArrowProjectile">
-							<defName>Projectile_Arrow_Molotov</defName>
-							<label>arrow (bowlotov)</label>
-							<graphicData>
-								<texPath>BowlotovP</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>1.1</explosionRadius>
-								<damageDef>PrometheumFlame</damageDef>
-								<damageAmountBase>10</damageAmountBase>
-								<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
-								<preExplosionSpawnChance>1</preExplosionSpawnChance>
-								<speed>30</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseArrowProjectile">
-							<defName>Projectile_Arrow_EMP</defName>
-							<label>arrow (bowMP)</label>
-							<graphicData>
-								<texPath>BowMPP</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>3</explosionRadius>
-								<damageDef>EMP</damageDef>
-								<damageAmountBase>56</damageAmountBase>
-								<explosionDelay>60</explosionDelay>
-								<dropsCasings>true</dropsCasings>
-								<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-								<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-								<speed>30</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseArrowProjectile">
-							<defName>Projectile_Arrow_Battery</defName>
-							<label>arrow (bowttery)</label>
-							<graphicData>
-								<texPath>BowtteryP</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>1.1</explosionRadius>
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>200</damageAmountBase>
-								<speed>30</speed>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-				<!--Streamlined Arrows-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingDef ParentName="BaseArrowProjectile">
-							<defName>Projectile_StreamlinedArrow_Grenade</defName>
-							<label>streamlined arrow (bownade)</label>
-							<graphicData>
-								<texPath>BownadeP</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>1.5</explosionRadius>
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>56</damageAmountBase>
-								<explosionDelay>60</explosionDelay>
-								<dropsCasings>true</dropsCasings>
-								<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-								<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<speed>32</speed>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Small>40</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseArrowProjectile">
-							<defName>Projectile_StreamlinedArrow_Molotov</defName>
-							<label>streamlined arrow (bowlotov)</label>
-							<graphicData>
-								<texPath>BowlotovP</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>1.1</explosionRadius>
-								<damageDef>PrometheumFlame</damageDef>
-								<damageAmountBase>10</damageAmountBase>
-								<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
-								<preExplosionSpawnChance>1</preExplosionSpawnChance>
-								<speed>32</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseArrowProjectile">
-							<defName>Projectile_StreamlinedArrow_EMP</defName>
-							<label>streamlined arrow (bowMP)</label>
-							<graphicData>
-								<texPath>BowMPP</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>3</explosionRadius>
-								<damageDef>EMP</damageDef>
-								<damageAmountBase>56</damageAmountBase>
-								<explosionDelay>60</explosionDelay>
-								<dropsCasings>true</dropsCasings>
-								<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-								<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-								<speed>32</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseArrowProjectile">
-							<defName>Projectile_StreamlinedArrow_Battery</defName>
-							<label>streamlined arrow (bowttery)</label>
-							<graphicData>
-								<texPath>BowtteryP</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>1.1</explosionRadius>
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>200</damageAmountBase>
-								<speed>32</speed>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-				<!--Great Arrows-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingDef ParentName="BaseArrowProjectile">
-							<defName>Projectile_GreatArrow_Grenade</defName>
-							<label>great arrow (bownade)</label>
-							<graphicData>
-								<texPath>BownadeP</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>1.5</explosionRadius>
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>56</damageAmountBase>
-								<explosionDelay>60</explosionDelay>
-								<dropsCasings>true</dropsCasings>
-								<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-								<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<speed>30</speed>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Small>40</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseArrowProjectile">
-							<defName>Projectile_GreatArrow_Molotov</defName>
-							<label>great arrow (bowlotov)</label>
-							<graphicData>
-								<texPath>BowlotovP</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>1.1</explosionRadius>
-								<damageDef>PrometheumFlame</damageDef>
-								<damageAmountBase>10</damageAmountBase>
-								<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
-								<preExplosionSpawnChance>1</preExplosionSpawnChance>
-								<speed>30</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseArrowProjectile">
-							<defName>Projectile_GreatArrow_EMP</defName>
-							<label>great arrow (bowMP)</label>
-							<graphicData>
-								<texPath>BowMPP</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>3</explosionRadius>
-								<damageDef>EMP</damageDef>
-								<damageAmountBase>56</damageAmountBase>
-								<explosionDelay>60</explosionDelay>
-								<dropsCasings>true</dropsCasings>
-								<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-								<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-								<speed>32</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseArrowProjectile">
-							<defName>Projectile_GreatArrow_Battery</defName>
-							<label>great arrow (bowttery)</label>
-							<graphicData>
-								<texPath>BowtteryP</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>1.1</explosionRadius>
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>200</damageAmountBase>
-								<speed>30</speed>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-				<!--Arrow Recipes-->
-				<!--Normal Arrows-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>MakeAmmo_Arrow_Grenade</defName>
-							<label>make bownade arrows x10</label>
-							<description>Craft 10 bownade arrows.</description>
-							<jobString>Making bownade arrows.</jobString>
-							<workAmount>100</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Weapon_GrenadeFrag</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-									<li>Weapon_GrenadeFrag</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Arrow_Grenade>10</Ammo_Arrow_Grenade>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>MakeAmmo_Arrow_Molotov</defName>
-							<label>make bowlotov arrows x10</label>
-							<description>Craft 10 bowlotov arrows.</description>
-							<jobString>Making bowlotov arrows.</jobString>
-							<workAmount>100</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Weapon_GrenadeMolotov</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-									<li>Weapon_GrenadeMolotov</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Arrow_Molotov>10</Ammo_Arrow_Molotov>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>MakeAmmo_Arrow_EMP</defName>
-							<label>make bowMP arrows x10</label>
-							<description>Craft 10 bowMP arrows.</description>
-							<jobString>Making bowMP arrows.</jobString>
-							<workAmount>100</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Weapon_GrenadeEMP</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-									<li>Weapon_GrenadeEMP</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Arrow_EMP>10</Ammo_Arrow_EMP>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>MakeAmmo_Arrow_Battery</defName>
-							<label>make bowttery arrows x10</label>
-							<description>Craft 10 bowttery arrows.</description>
-							<jobString>Making bowttery arrows.</jobString>
-							<workAmount>100</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Arrow_Battery>10</Ammo_Arrow_Battery>
-							</products>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-				<!--Great Arrows-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>MakeAmmo_GreatArrow_Grenade</defName>
-							<label>make bownade great arrows x10</label>
-							<description>Craft 10 bownade great arrows.</description>
-							<jobString>Making bownade great arrows.</jobString>
-							<workAmount>300</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>3</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Weapon_GrenadeFrag</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-									<li>Weapon_GrenadeFrag</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_GreatArrow_Grenade>10</Ammo_GreatArrow_Grenade>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>MakeAmmo_GreatArrow_Molotov</defName>
-							<label>make bowlotov great arrows x10</label>
-							<description>Craft 10 bowlotov great arrows.</description>
-							<jobString>Making bowlotov great arrows.</jobString>
-							<workAmount>100</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>3</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Weapon_GrenadeMolotov</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-									<li>Weapon_GrenadeMolotov</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_GreatArrow_Molotov>10</Ammo_GreatArrow_Molotov>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>MakeAmmo_GreatArrow_EMP</defName>
-							<label>make bowMP great arrows x10</label>
-							<description>Craft 10 bowMP great arrows.</description>
-							<jobString>Making bowMP great arrows.</jobString>
-							<workAmount>100</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>3</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Weapon_GrenadeEMP</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-									<li>Weapon_GrenadeEMP</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_GreatArrow_EMP>10</Ammo_GreatArrow_EMP>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>MakeAmmo_GreatArrow_Battery</defName>
-							<label>make bowttery great arrows x10</label>
-							<description>Craft 10 bowttery great arrows.</description>
-							<jobString>Making bowttery great arrows.</jobString>
-							<workAmount>100</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>3</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_GreatArrow_Battery>10</Ammo_GreatArrow_Battery>
-							</products>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rimworld-Style Pilas And Bows Strapped With Grenades and Shells Extended/Javelin.xml b/Patches/Rimworld-Style Pilas And Bows Strapped With Grenades and Shells Extended/Javelin.xml
deleted file mode 100644
index 6a099013b6..0000000000
--- a/Patches/Rimworld-Style Pilas And Bows Strapped With Grenades and Shells Extended/Javelin.xml	
+++ /dev/null
@@ -1,728 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimworld-Style Pilas And Bows Strapped With Grenades and Shells Extended</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--PILA/PILUM/JAVELIN-->
-				<!--Add the ammo to the AmmoSet (for javelin/Pila launchers like atlatl)-->
-				<!--li Class="PatchOperationAdd">
-				<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_Javelins"]/ammoTypes</xpath>
-				<value>
-		        	<PilaHighExplosive>PilumHE_Fired</PilaHighExplosive>
-		        	<PilaHighIncendiary>PilumHI_Fired</PilaHighIncendiary>
-		        	<PilaEMP>PilumEMP_Fired</PilaEMP>
-		        	<PilaSmoke>PilumSmoke_Fired</PilaSmoke>
-		        	<PilaFirefoam>PilumFirefoam_Fired</PilaFirefoam>
-		        	<PilaAntigrain>PilumAntigrain_Fired</PilaAntigrain>
-                </value>
-            </li-->
-
-				<!--Overwrite the Pilas added by the mod-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseWeaponAndAmmoNeolithic" Name="PilaStrappedBased">
-							<defName>PilaHighExplosive</defName>
-							<label>HEla</label>
-							<description>This shell won't miss 9 tiles away from its target (It might miss 2 but that's still valid).</description>
-							<graphicData>
-								<texPath>HEla</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<soundInteract>Interact_BeatFire</soundInteract>
-							<statBases>
-								<MarketValue>62.35</MarketValue>
-								<SightsEfficiency>1.0</SightsEfficiency>
-								<ShotSpread>1.5</ShotSpread>
-								<SwayFactor>2.5</SwayFactor>
-								<Bulk>3.5</Bulk>
-								<Mass>2.00</Mass>
-								<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-							</statBases>
-							<!--equippedAngleOffset>30</equippedAngleOffset-->
-							<stackLimit>25</stackLimit>
-							<weaponTags Inherit="False">
-								<!--li>NeolithicRangedHeavy</li>
-                            <li>CE_Pila</li--><!-- tribal tags -->
-								<li>CE_OneHandedWeapon</li>
-								<li>IndustrialRangedHeavy</li>
-								<li>GrenadeDestructive</li>
-								<li>EmpireGrenadeDestructive</li><!-- Base tags from the mod -->
-							</weaponTags>
-							<tradeability>All</tradeability>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>PilumHE_Thrown</defaultProjectile>
-									<warmupTime>0.8</warmupTime>
-									<range>9</range>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<soundCast>Interact_BeatFire</soundCast>
-								</li>
-							</verbs>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>shaft</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>7</power>
-									<cooldownTime>1.35</cooldownTime>
-									<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>point</label>
-									<capacities>
-										<li>Stab</li>
-									</capacities>
-									<power>15</power>
-									<cooldownTime>1.37</cooldownTime>
-									<chanceFactor>1.5</chanceFactor>
-									<armorPenetrationBlunt>1.69</armorPenetrationBlunt>
-									<armorPenetrationSharp>0.34</armorPenetrationSharp>
-									<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-								</li>
-							</tools>
-							<ammoClass>Javelin</ammoClass>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="PilaStrappedBased">
-							<defName>PilaHighIncendiary</defName>
-							<label>HIla</label>
-							<description>No, there is no baby to reveal its gender with.</description>
-							<graphicData>
-								<texPath>HIla</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<soundInteract>Interact_BeatFire</soundInteract>
-							<statBases>
-								<MarketValue>49.6</MarketValue>
-								<SightsEfficiency>1.0</SightsEfficiency>
-								<ShotSpread>1.5</ShotSpread>
-								<SwayFactor>2.5</SwayFactor>
-								<Bulk>3.5</Bulk>
-								<Mass>2.00</Mass>
-								<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-							</statBases>
-							<verbs Inherit="False">
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>PilumHI_Thrown</defaultProjectile>
-									<warmupTime>0.8</warmupTime>
-									<range>9</range>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<soundCast>Interact_BeatFire</soundCast>
-								</li>
-							</verbs>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="PilaStrappedBased">
-							<defName>PilaEMP</defName>
-							<label>MPila</label>
-							<description>Five feet apart from mechanoids (or whatever it is you're aiming at).</description>
-							<graphicData>
-								<texPath>MPila</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<soundInteract>Interact_BeatFire</soundInteract>
-							<statBases>
-								<MarketValue>119.68</MarketValue>
-								<SightsEfficiency>1.0</SightsEfficiency>
-								<ShotSpread>1.5</ShotSpread>
-								<SwayFactor>2.5</SwayFactor>
-								<Bulk>3.5</Bulk>
-								<Mass>2.00</Mass>
-								<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-							</statBases>
-							<verbs Inherit="False">
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>PilumEMP_Thrown</defaultProjectile>
-									<warmupTime>0.8</warmupTime>
-									<range>9</range>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<soundCast>Interact_BeatFire</soundCast>
-								</li>
-							</verbs>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="PilaStrappedBased">
-							<defName>PilaSmoke</defName>
-							<label>Smola</label>
-							<description>Unfortunately, it is not, in fact, smokeleaf.</description>
-							<graphicData>
-								<texPath>Smola</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<soundInteract>Interact_BeatFire</soundInteract>
-							<statBases>
-								<MarketValue>44.29</MarketValue>
-								<SightsEfficiency>1.0</SightsEfficiency>
-								<ShotSpread>1.5</ShotSpread>
-								<SwayFactor>2.5</SwayFactor>
-								<Bulk>3.5</Bulk>
-								<Mass>2.00</Mass>
-								<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-							</statBases>
-							<generateAllowChance>0</generateAllowChance>
-							<verbs Inherit="False">
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>PilumSmoke_Thrown</defaultProjectile>
-									<warmupTime>0.8</warmupTime>
-									<range>9</range>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<soundCast>Interact_BeatFire</soundCast>
-								</li>
-							</verbs>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="PilaStrappedBased">
-							<defName>PilaFirefoam</defName>
-							<label>Fola</label>
-							<description>"Only you can prevent forest fires!"</description>
-							<graphicData>
-								<texPath>Fola</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<soundInteract>Interact_BeatFire</soundInteract>
-							<statBases>
-								<MarketValue>44.29</MarketValue>
-								<SightsEfficiency>1.0</SightsEfficiency>
-								<ShotSpread>1.5</ShotSpread>
-								<SwayFactor>2.5</SwayFactor>
-								<Bulk>3.5</Bulk>
-								<Mass>2.00</Mass>
-								<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-							</statBases>
-							<generateAllowChance>0</generateAllowChance>
-							<verbs Inherit="False">
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>PilumFirefoam_Thrown</defaultProjectile>
-									<warmupTime>0.8</warmupTime>
-									<range>9</range>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<soundCast>Interact_BeatFire</soundCast>
-								</li>
-							</verbs>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="PilaStrappedBased">
-							<defName>PilaAntigrain</defName>
-							<label>Sayonala</label>
-							<description>You can barely feel the singe.</description>
-							<graphicData>
-								<texPath>Fola</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<soundInteract>Interact_BeatFire</soundInteract>
-							<statBases>
-								<MarketValue>1507.26</MarketValue>
-								<SightsEfficiency>1.0</SightsEfficiency>
-								<ShotSpread>1.5</ShotSpread>
-								<SwayFactor>2.5</SwayFactor>
-								<Bulk>3.5</Bulk>
-								<Mass>2.00</Mass>
-								<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-							</statBases>
-							<generateAllowChance>0.1</generateAllowChance><!-- carried over from base mod, generate commonality 0.1 -->
-							<verbs Inherit="False">
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>PilumAntigrain_Thrown</defaultProjectile>
-									<warmupTime>0.8</warmupTime>
-									<range>9</range>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<soundCast>Interact_BeatFire</soundCast>
-								</li>
-							</verbs>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!--Add Projectiles-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingDef ParentName="BasePilumProjectile">
-							<defName>PilumHE_Thrown</defName>
-							<label>pilum with HE shell on the tip</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>14</damageAmountBase>
-								<speed>27</speed>
-								<armorPenetrationBlunt>5.44</armorPenetrationBlunt>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>156</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>2.5</explosiveRadius>
-									<explosionSound>MortarBomb_Explode</explosionSound>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Large>27</Fragment_Large>
-										<Fragment_Small>100</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="BasePilumProjectile">
-							<defName>PilumHI_Thrown</defName>
-							<label>pilum with incendiary shell on the tip</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>14</damageAmountBase>
-								<speed>27</speed>
-								<armorPenetrationBlunt>5.44</armorPenetrationBlunt>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>5</damageAmountBase>
-									<explosiveDamageType>PrometheumFlame</explosiveDamageType>
-									<explosiveRadius>6.5</explosiveRadius>
-									<explosionSound>MortarBomb_Explode</explosionSound>
-									<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
-									<preExplosionSpawnChance>0.20</preExplosionSpawnChance>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="BasePilumProjectile">
-							<defName>PilumEMP_Thrown</defName>
-							<label>pilum with EMP shell on the tip</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>14</damageAmountBase>
-								<speed>27</speed>
-								<armorPenetrationBlunt>5.44</armorPenetrationBlunt>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>156</damageAmountBase>
-									<explosiveDamageType>EMP</explosiveDamageType>
-									<explosiveRadius>5.5</explosiveRadius>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="BasePilumProjectile">
-							<defName>PilumSmoke_Thrown</defName>
-							<label>pilum with smoke shell on the tip</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>14</damageAmountBase>
-								<speed>27</speed>
-								<armorPenetrationBlunt>5.44</armorPenetrationBlunt>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<explosiveDamageType>Smoke</explosiveDamageType>
-									<explosiveRadius>6</explosiveRadius>
-									<explosionSound>Explosion_EMP</explosionSound>
-									<postExplosionGasType>BlindSmoke</postExplosionGasType>
-									<preExplosionSpawnChance>1</preExplosionSpawnChance>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="BasePilumProjectile">
-							<defName>PilumFirefoam_Thrown</defName>
-							<label>pilum with smoke shell on the tip</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>14</damageAmountBase>
-								<speed>27</speed>
-								<armorPenetrationBlunt>5.44</armorPenetrationBlunt>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<explosiveDamageType>Extinguish</explosiveDamageType>
-									<explosiveRadius>9.5</explosiveRadius>
-									<explosionSound>Explosion_EMP</explosionSound>
-									<postExplosionSpawnThingDef>Filth_FireFoam</postExplosionSpawnThingDef>
-									<postExplosionSpawnChance>1</postExplosionSpawnChance>
-									<postExplosionSpawnThingCount>3</postExplosionSpawnThingCount>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="BasePilumProjectile">
-							<defName>PilumAntigrain_Thrown</defName>
-							<label>pilum with antigrain shell on the tip</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>800</damageAmountBase>
-								<speed>27</speed>
-								<explosionRadius>50</explosionRadius>
-								<explosionChanceToStartFire>0.22</explosionChanceToStartFire>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<explosionEffect>GiantExplosion</explosionEffect>
-								<soundExplode>Explosion_GiantBomb</soundExplode>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-				<!--Add Recipes-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>MakeAmmo_PilaHighExplosive</defName>
-							<label>make HEla x5</label>
-							<description>Craft 5 HEla.</description>
-							<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-							<workSkill>Crafting</workSkill>
-							<recipeUsers>
-								<li>ElectricSmithy</li>
-								<li>FueledSmithy</li>
-								<li>CraftingSpot</li>
-							</recipeUsers>
-							<effectWorking>Smelt</effectWorking>
-							<unfinishedThingDef>UnfinishedAmmo</unfinishedThingDef>
-							<workAmount>2500</workAmount>
-							<jobString>Making HEla.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>6</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>19</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Shell_HighExplosive</li>
-										</thingDefs>
-									</filter>
-									<count>5</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-									<li>Steel</li>
-									<li>Shell_HighExplosive</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<PilaHighExplosive>5</PilaHighExplosive>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>MakeAmmo_PilaHighIncendiary</defName>
-							<label>make HIla x5</label>
-							<description>Craft 5 HIla.</description>
-							<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-							<workSkill>Crafting</workSkill>
-							<recipeUsers>
-								<li>ElectricSmithy</li>
-								<li>FueledSmithy</li>
-								<li>CraftingSpot</li>
-							</recipeUsers>
-							<effectWorking>Smelt</effectWorking>
-							<unfinishedThingDef>UnfinishedAmmo</unfinishedThingDef>
-							<workAmount>2500</workAmount>
-							<jobString>Making HIla.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>6</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>19</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Shell_Incendiary</li>
-										</thingDefs>
-									</filter>
-									<count>5</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-									<li>Steel</li>
-									<li>Shell_Incendiary</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<PilaHighIncendiary>5</PilaHighIncendiary>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>MakeAmmo_PilaEMP</defName>
-							<label>make MPila x5</label>
-							<description>Craft 5 MPila.</description>
-							<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-							<workSkill>Crafting</workSkill>
-							<recipeUsers>
-								<li>ElectricSmithy</li>
-								<li>FueledSmithy</li>
-								<li>CraftingSpot</li>
-							</recipeUsers>
-							<effectWorking>Smelt</effectWorking>
-							<unfinishedThingDef>UnfinishedAmmo</unfinishedThingDef>
-							<workAmount>2500</workAmount>
-							<jobString>Making MPila.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>6</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>19</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Shell_EMP</li>
-										</thingDefs>
-									</filter>
-									<count>5</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-									<li>Steel</li>
-									<li>Shell_EMP</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<PilaEMP>5</PilaEMP>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>MakeAmmo_PilaSmoke</defName>
-							<label>make Smola x5</label>
-							<description>Craft 5 Smola.</description>
-							<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-							<workSkill>Crafting</workSkill>
-							<recipeUsers>
-								<li>ElectricSmithy</li>
-								<li>FueledSmithy</li>
-								<li>CraftingSpot</li>
-							</recipeUsers>
-							<effectWorking>Smelt</effectWorking>
-							<unfinishedThingDef>UnfinishedAmmo</unfinishedThingDef>
-							<workAmount>2500</workAmount>
-							<jobString>Making Smola.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>6</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>19</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Shell_Smoke</li>
-										</thingDefs>
-									</filter>
-									<count>5</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-									<li>Steel</li>
-									<li>Shell_Smoke</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<PilaSmoke>5</PilaSmoke>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>MakeAmmo_PilaFirefoam</defName>
-							<label>make Fola x5</label>
-							<description>Craft 5 Fola.</description>
-							<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-							<workSkill>Crafting</workSkill>
-							<recipeUsers>
-								<li>ElectricSmithy</li>
-								<li>FueledSmithy</li>
-								<li>CraftingSpot</li>
-							</recipeUsers>
-							<effectWorking>Smelt</effectWorking>
-							<unfinishedThingDef>UnfinishedAmmo</unfinishedThingDef>
-							<workAmount>2500</workAmount>
-							<jobString>Making Fola.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>6</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>19</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Shell_Firefoam</li>
-										</thingDefs>
-									</filter>
-									<count>5</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-									<li>Steel</li>
-									<li>Shell_Firefoam</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<PilaFirefoam>5</PilaFirefoam>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>MakeAmmo_PilaAntigrain</defName>
-							<label>make Sayonala</label>
-							<description>Craft a Sayonala.</description>
-							<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-							<workSkill>Crafting</workSkill>
-							<recipeUsers>
-								<li>ElectricSmithy</li>
-								<li>FueledSmithy</li>
-								<li>CraftingSpot</li>
-							</recipeUsers>
-							<effectWorking>Smelt</effectWorking>
-							<unfinishedThingDef>UnfinishedAmmo</unfinishedThingDef>
-							<workAmount>500</workAmount>
-							<jobString>Making Sayonala.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Shell_AntigrainWarhead</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-									<li>Steel</li>
-									<li>Shell_AntigrainWarhead</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<PilaAntigrain>1</PilaAntigrain>
-							</products>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Risk of Rain UES Contact Light Armory/Risk_Of_Rain_Armor_Patches.xml b/Patches/Risk of Rain UES Contact Light Armory/Risk_Of_Rain_Armor_Patches.xml
deleted file mode 100644
index c4666d3da1..0000000000
--- a/Patches/Risk of Rain UES Contact Light Armory/Risk_Of_Rain_Armor_Patches.xml	
+++ /dev/null
@@ -1,730 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Risk of Rain: UES Contact Light Armory (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Add new layer coverage to all Helmets -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_BladeMarine_Helmet" or defName="RoRA_Conscript_Helmet" or defName="RoRA_Enforcer_Helmet" or defName="RoRA_Miner_Helmet" or defName="RoRA_Engineer_Helmet" or defName="RoRA_Ranger_Helmet" or defName="RoRA_Specialist_Helmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-				<!-- Add SmokeSensitivity to all Helmets -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_BladeMarine_Helmet" or defName="RoRA_Conscript_Helmet" or defName="RoRA_Enforcer_Helmet" or defName="RoRA_Miner_Helmet" or defName="RoRA_Engineer_Helmet" or defName="RoRA_Ranger_Helmet" or defName="RoRA_Specialist_Helmet"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-				<!-- Add Partial Armor to Helmets -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RoRA_BladeMarine_Helmet" or defName="RoRA_Conscript_Helmet" or defName="RoRA_Enforcer_Helmet" or defName="RoRA_Miner_Helmet" or defName="RoRA_Engineer_Helmet" or defName="RoRA_Ranger_Helmet" or defName="RoRA_Specialist_Helmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-				<!-- Add partial armor for all armors-->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="RoRA_BladeMarine_Armor" or defName="RoRA_Conscript_Armor" or defName="RoRA_Enforcer_Armor" or defName="RoRA_Miner_Armor" or defName="RoRA_Engineer_Armor" or defName="RoRA_Ranger_Armor" or defName="RoRA_Specialist_Armor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-				<!-- ================================ BLADEMARINE  ================================ -->
-				<li Class="PatchOperationReplace">
-					<!-- Blademarine Helmet -->
-					<xpath>Defs/ThingDef[defName="RoRA_BladeMarine_Helmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>260</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_BladeMarine_Helmet"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>0.25</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoRA_BladeMarine_Helmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>23</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoRA_BladeMarine_Helmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>48</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_BladeMarine_Helmet"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.20</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-						<ToxicEnvironmentResistance>0.80</ToxicEnvironmentResistance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<!-- Blademarine Armor -->
-					<xpath>Defs/ThingDef[defName="RoRA_BladeMarine_Armor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>490</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoRA_BladeMarine_Armor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>45</Mass>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_BladeMarine_Armor"]/statBases</xpath>
-					<value>
-						<Bulk>90</Bulk>
-						<WornBulk>12</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoRA_BladeMarine_Armor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>25</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoRA_BladeMarine_Armor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>48</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_BladeMarine_Armor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>75</CarryWeight>
-						<CarryBulk>10</CarryBulk>
-						<ToxicEnvironmentResistance>0.20</ToxicEnvironmentResistance>
-						<MeleeCritChance>0.55</MeleeCritChance>
-						<MeleeParryChance>0.5</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_BladeMarine_Armor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_BladeMarine_Armor"]/apparel/layers</xpath>
-					<value>
-						<li>Middle</li>
-					</value>
-				</li>
-				<!-- ================================ CONSCRIPT  ================================ -->
-				<li Class="PatchOperationReplace">
-					<!-- Conscript Helmet -->
-					<xpath>Defs/ThingDef[defName="RoRA_Conscript_Helmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>200</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_Conscript_Helmet"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>0.25</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoRA_Conscript_Helmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>17</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoRA_Conscript_Helmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>39</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_Conscript_Helmet"]/equippedStatOffsets</xpath>
-					<value>
-						<AimingAccuracy>0.08</AimingAccuracy>
-						<ToxicEnvironmentResistance>0.9</ToxicEnvironmentResistance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<!-- Conscript Armor -->
-					<xpath>Defs/ThingDef[defName="RoRA_Conscript_Armor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>440</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoRA_Conscript_Armor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>40</Mass>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_Conscript_Armor"]/statBases</xpath>
-					<value>
-						<Bulk>70</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RoRA_Conscript_Armor"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_Conscript_Armor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>60</CarryWeight>
-						<CarryBulk>15</CarryBulk>
-						<ToxicEnvironmentResistance>0.10</ToxicEnvironmentResistance>
-						<ReloadSpeed>0.5</ReloadSpeed>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoRA_Conscript_Armor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoRA_Conscript_Armor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>40</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_Conscript_Armor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_Conscript_Armor"]/apparel/layers</xpath>
-					<value>
-						<li>Middle</li>
-					</value>
-				</li>
-				<!-- ================================ ENFORCER helmet  ================================ -->
-				<li Class="PatchOperationReplace">
-					<!-- Enforcer Helmet -->
-					<xpath>Defs/ThingDef[defName="RoRA_Enforcer_Helmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>260</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_Enforcer_Helmet"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoRA_Enforcer_Helmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>25</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoRA_Enforcer_Helmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>50</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_Enforcer_Helmet"]/equippedStatOffsets</xpath>
-					<value>
-						<Suppressability>-0.25</Suppressability>
-						<ToxicEnvironmentResistance>0.80</ToxicEnvironmentResistance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<!-- Emforcer Armor -->
-					<xpath>Defs/ThingDef[defName="RoRA_Enforcer_Armor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>560</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoRA_Enforcer_Armor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>60</Mass>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_Enforcer_Armor"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoRA_Enforcer_Armor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>29</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoRA_Enforcer_Armor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>52</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RoRA_Enforcer_Armor"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_Enforcer_Armor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>90</CarryWeight>
-						<CarryBulk>15</CarryBulk>
-						<ToxicEnvironmentResistance>0.20</ToxicEnvironmentResistance>
-						<Suppressability>-0.50</Suppressability>
-						<ReloadSpeed>0.25</ReloadSpeed>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_Enforcer_Armor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_Enforcer_Armor"]/apparel/layers</xpath>
-					<value>
-						<li>Middle</li>
-					</value>
-				</li>
-				<!-- ================================ ENGINEER  ================================ -->
-				<!-- Engineer Helmet -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoRA_Engineer_Helmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>220</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_Engineer_Helmet"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>0.25</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoRA_Engineer_Helmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>17</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoRA_Engineer_Helmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>42</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_Engineer_Helmet"]/equippedStatOffsets</xpath>
-					<value>
-						<ToxicEnvironmentResistance>0.70</ToxicEnvironmentResistance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<!-- Engineer Armor -->
-					<xpath>Defs/ThingDef[defName="RoRA_Engineer_Armor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>440</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoRA_Engineer_Armor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>40</Mass>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_Engineer_Armor"]/statBases</xpath>
-					<value>
-						<Bulk>80</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoRA_Engineer_Armor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>19</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoRA_Engineer_Armor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>48</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RoRA_Engineer_Armor"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_Engineer_Armor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>85</CarryWeight>
-						<CarryBulk>10</CarryBulk>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_Engineer_Armor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_Engineer_Armor"]/apparel/layers</xpath>
-					<value>
-						<li>Middle</li>
-					</value>
-				</li>
-				<!-- ================================ SPECIALIST  ================================ -->
-				<!-- Specialist Helmet -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoRA_Specialist_Helmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>220</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_Specialist_Helmet"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoRA_Specialist_Helmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>22</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoRA_Specialist_Helmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>48</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_Specialist_Helmet"]/equippedStatOffsets</xpath>
-					<value>
-						<AimingAccuracy>0.25</AimingAccuracy>
-						<Suppressability>-0.15</Suppressability>
-						<ToxicEnvironmentResistance>0.60</ToxicEnvironmentResistance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<!-- Specialist Armor -->
-					<xpath>Defs/ThingDef[defName="RoRA_Specialist_Armor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>520</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoRA_Specialist_Armor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>55</Mass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoRA_Specialist_Armor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>25</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoRA_Specialist_Armor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>48</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_Specialist_Armor"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RoRA_Specialist_Armor"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_Specialist_Armor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>100</CarryWeight>
-						<CarryBulk>25</CarryBulk>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-						<Suppressability>-0.35</Suppressability>
-						<ReloadSpeed>0.25</ReloadSpeed>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_Specialist_Armor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_Specialist_Armor"]/apparel/layers</xpath>
-					<value>
-						<li>Middle</li>
-					</value>
-				</li>
-				<!-- ================================ RANGER  ================================ -->
-				<li Class="PatchOperationReplace">
-					<!-- Ranger Helmet -->
-					<xpath>Defs/ThingDef[defName="RoRA_Ranger_Helmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>200</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_Ranger_Helmet"]/equippedStatOffsets</xpath>
-					<value>
-						<AimingAccuracy>0.25</AimingAccuracy>
-						<ToxicEnvironmentResistance>0.60</ToxicEnvironmentResistance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoRA_Ranger_Helmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>19</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoRA_Ranger_Helmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>40</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_Ranger_Helmet"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>0.25</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<!-- Ranger Armor -->
-					<xpath>Defs/ThingDef[defName="RoRA_Ranger_Armor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>480</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoRA_Ranger_Armor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>40</Mass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoRA_Ranger_Armor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoRA_Ranger_Armor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>42</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_Ranger_Armor"]/statBases</xpath>
-					<value>
-						<Bulk>70</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_Ranger_Armor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>75</CarryWeight>
-						<CarryBulk>10</CarryBulk>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_Ranger_Armor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_Ranger_Armor"]/apparel/layers</xpath>
-					<value>
-						<li>Middle</li>
-					</value>
-				</li>
-				<!-- ================================ MINER  ================================ -->
-				<li Class="PatchOperationReplace">
-					<!-- Miner Helmet -->
-					<xpath>Defs/ThingDef[defName="RoRA_Miner_Helmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>200</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoRA_Miner_Helmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>22</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoRA_Miner_Helmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>45</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_Miner_Helmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_Miner_Helmet"]/equippedStatOffsets</xpath>
-					<value>
-						<AimingAccuracy>0.10</AimingAccuracy>
-						<ToxicEnvironmentResistance>0.60</ToxicEnvironmentResistance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<!-- Miner Armor -->
-					<xpath>Defs/ThingDef[defName="RoRA_Miner_Armor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>510</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoRA_Miner_Armor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>50</Mass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoRA_Miner_Armor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>23</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RoRA_Miner_Armor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>45</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_Miner_Armor"]/statBases</xpath>
-					<value>
-						<Bulk>95</Bulk>
-						<WornBulk>12</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RoRA_Miner_Armor"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_Miner_Armor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>90</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_Miner_Armor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RoRA_Miner_Armor"]/apparel/layers</xpath>
-					<value>
-						<li>Middle</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rockmen Race/PawnKinds_Rockmen.xml b/Patches/Rockmen Race/PawnKinds_Rockmen.xml
deleted file mode 100644
index ef93e5c94a..0000000000
--- a/Patches/Rockmen Race/PawnKinds_Rockmen.xml	
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rockmen race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="RockmanBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>18</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="RockmanCivBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RockmanGuard"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="RockmanMilBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>8</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="RockmanGrenadier"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>12</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rockmen Race/Rockmen_Race.xml b/Patches/Rockmen Race/Rockmen_Race.xml
deleted file mode 100644
index b0e4af3dc4..0000000000
--- a/Patches/Rockmen Race/Rockmen_Race.xml	
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rockmen race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Rockman"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Rockman"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<CarryWeight>40</CarryWeight>
-						<CarryBulk>30</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Rockman"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.75</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Rockman"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Rockman"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.07</chanceFactor>
-								<soundMeleeHit>Pawn_Melee_HumanBite_Hit</soundMeleeHit>
-								<soundMeleeMiss>Pawn_Melee_HumanBite_Miss</soundMeleeMiss>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Checking if "Alien_Rockman" has a <comps> node and adding it if it doesn't exist -->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Rockman"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Rockman"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Rockman"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-				<!-- === Rockman Leather === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Rockman"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.08</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Rockman"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.055</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Leather_Rockman"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.15</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Leather_Rockman"]/stuffProps</xpath>
-					<value>
-						<categories>
-							<li>SoftArmor</li>
-						</categories>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Rockmen Race/Rockmen_Scenario.xml b/Patches/Rockmen Race/Rockmen_Scenario.xml
deleted file mode 100644
index eaafea18ba..0000000000
--- a/Patches/Rockmen Race/Rockmen_Scenario.xml	
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rockmen race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="RockmansTribeScenario"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_Arrow_Stone</thingDef>
-							<count>100</count>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="RockmansTribeScenario"]/scenario/parts/li[thingDef="Pila"]</xpath>
-					<value>
-						<count>10</count>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Royal Arsenal - Speciality Weapons/Ammo_6x28Spark.xml b/Patches/Royal Arsenal - Speciality Weapons/Ammo_6x28Spark.xml
deleted file mode 100644
index 690e20f7af..0000000000
--- a/Patches/Royal Arsenal - Speciality Weapons/Ammo_6x28Spark.xml	
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Patch>
-<Operation Class="PatchOperationFindMod">
-	<mods>
-		<li>Royal Arsenal: Specialty Weapons</li>
-	</mods>
-	<match Class="PatchOperationAdd">
-		<xpath>Defs</xpath>
-		<value>
-
-		<ThingCategoryDef>
-			<defName>Ammo6x28mmRoyalSpark</defName>
-			<label>6x28mm Royal spark</label>
-			<parent>AmmoAdvanced</parent>
-			<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
-		</ThingCategoryDef>
-
-		<!-- ==================== AmmoSet ========================== -->
-
-		<CombatExtended.AmmoSetDef>
-			<defName>AmmoSet_6x28mmSpark</defName>
-			<label>6x28mm Royal Spark</label>
-			<ammoTypes>
-				<Ammo_6x28mmSpark>Bullet_6x28mmSpark</Ammo_6x28mmSpark>
-			</ammoTypes>
-		</CombatExtended.AmmoSetDef>
-
-		<!-- ==================== Ammo ========================== -->
-
-		<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-			<defName>Ammo_6x28mmSpark</defName>
-			<label>6x28mm Royal spark cartridge</label>
-			<description>Specialty ionized royal charged ammo designed by the Empire during its prime. Can be used by zeusrifles.</description>
-			<statBases>
-				<Mass>0.01</Mass>
-				<Bulk>0.01</Bulk>
-				<MarketValue>1.5</MarketValue>
-			</statBases>
-			<tradeTags>
-				<li>CE_AutoEnableTrade</li>
-				<li>CE_AutoEnableCrafting_FabricationBench</li>
-			</tradeTags>
-			<thingCategories>
-				<li>Ammo6x28mmRoyalSpark</li>
-			</thingCategories>
-			<stackLimit>5000</stackLimit>	
-
-			<graphicData>
-				<texPath>Things/Ammo/Charged/MediumIon</texPath>
-				<graphicClass>Graphic_StackCount</graphicClass>
-			</graphicData>
-			<ammoClass>Ionized</ammoClass>
-		</ThingDef>
-
-		<!-- ================== Projectiles ================== -->
-
-		<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseBulletCE">
-			<defName>Bullet_6x28mmSpark</defName>
-			<label>6x28mm Royal Charged bullet</label>
-			<graphicData>
-				<texPath>Things/Projectiles/ZeusShot</texPath>
-				<graphicClass>Graphic_Single</graphicClass>
-			</graphicData>
-			<projectile Class="CombatExtended.ProjectilePropertiesCE">
-				<damageDef>Bullet</damageDef>
-				<speed>160</speed>
-				<damageAmountBase>22</damageAmountBase>
-				<secondaryDamage>
-					<li>
-						<def>EMP</def>
-						<amount>12</amount>
-					</li>
-				</secondaryDamage>
-				<empShieldBreakChance>0.5</empShieldBreakChance>
-				<armorPenetrationSharp>36</armorPenetrationSharp>
-				<armorPenetrationBlunt>32</armorPenetrationBlunt>
-			</projectile>
-		</ThingDef>
-
-		<!-- ==================== Recipes ========================== -->
-
-		<RecipeDef ParentName="AmmoRecipeBase">
-			<defName>MakeAmmo_6x28mmSpark</defName>
-			<label>make 6x28mm Royal spark cartridge x500</label>
-			<description>Craft 500 6x28mm Royal spark cartridges.</description>
-			<researchPrerequisite>RA_ExperimentalRoyal</researchPrerequisite>
-			<jobString>Making 6x28mm Royal spark cartridges.</jobString>
-			<ingredients>
-			<li>
-				<filter>
-				<thingDefs>
-					<li>Plasteel</li>
-				</thingDefs>
-				</filter>
-				<count>8</count>
-			</li>
-			<li>
-				<filter>
-				<thingDefs>
-					<li>Uranium</li>
-				</thingDefs>
-				</filter>
-				<count>6</count>
-			</li>	    
-			<li>
-				<filter>
-				<thingDefs>
-					<li>ComponentIndustrial</li>
-				</thingDefs>
-				</filter>
-				<count>8</count>
-			</li>
-			</ingredients>
-			<fixedIngredientFilter>
-			<thingDefs>
-				<li>Plasteel</li>
-				<li>Uranium</li>				
-				<li>ComponentIndustrial</li>
-			</thingDefs>
-			</fixedIngredientFilter>
-			<products>
-			<Ammo_6x28mmSpark>500</Ammo_6x28mmSpark>
-			</products>
-			<workAmount>8600</workAmount>		
-		</RecipeDef>
-
-  		</value>
-	</match>
-</Operation>
-  
-</Patch>
diff --git a/Patches/Royal Arsenal - Speciality Weapons/Ammo_ThunderJavelins.xml b/Patches/Royal Arsenal - Speciality Weapons/Ammo_ThunderJavelins.xml
deleted file mode 100644
index 067a9e3c9f..0000000000
--- a/Patches/Royal Arsenal - Speciality Weapons/Ammo_ThunderJavelins.xml	
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Royal Arsenal: Specialty Weapons</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-			<!-- ================== Projectiles ================== -->
-			
-			<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseProjectileNeolithic">
-				<defName>ThunderJavelin_Thrown</defName>
-				<graphicData>
-					<texPath>Things/Projectiles/ThunderJavelinProjectile</texPath>
-					<graphicClass>Graphic_Single</graphicClass>
-				</graphicData>
-				<label>thunder javelin (thrown)</label>
-				<projectile Class="CombatExtended.ProjectilePropertiesCE">
-					<damageDef>Bomb</damageDef>
-					<damageAmountBase>80</damageAmountBase>
-					<speed>16</speed>
-					<explosionRadius>1</explosionRadius>
-					<soundExplode>MortarBomb_Explode</soundExplode>
-				</projectile>
-			</ThingDef>
-
-		
-			<!-- ==================== Recipes ========================== -->
-			<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-				<defName>MakeAmmo_ThunderJavelins</defName>
-				<label>make thunder javelin x5</label>
-				<description>Craft 5 thunder javelins.</description>
-				<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-				<workSkill>Crafting</workSkill>
-				<recipeUsers>
-					<li>FabricationBench</li>
-				</recipeUsers>
-				<researchPrerequisite>RA_ExperimentalRoyal</researchPrerequisite>
-				<effectWorking>Smelt</effectWorking>
-				<unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
-				<workAmount>7500</workAmount>	
-				<jobString>Making thunder javelins.</jobString>
-				<ingredients>
-				<li>
-					<filter>
-						<thingDefs>
-							<li>Plasteel</li>
-						</thingDefs>
-					</filter>
-					<count>25</count>
-				</li>
-				<li>
-					<filter>
-						<thingDefs>
-							<li>Uranium</li>
-						</thingDefs>
-					</filter>
-					<count>20</count>
-				</li>
-				<li>
-					<filter>
-						<thingDefs>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</filter>
-					<count>10</count>
-				</li>
-				</ingredients>
-				<fixedIngredientFilter>
-					<thingDefs>
-						<li>Plasteel</li>
-						<li>Uranium</li>
-							<li>ComponentIndustrial</li>
-					</thingDefs>
-				</fixedIngredientFilter>
-				<products>
-					<RA_ThunderJavelins>5</RA_ThunderJavelins>
-				</products>
-			</RecipeDef>
-	
-			</value>
-		</match>
-	</Operation>
-  
-</Patch>
diff --git a/Patches/Royal Arsenal - Speciality Weapons/RangedWeapons.xml b/Patches/Royal Arsenal - Speciality Weapons/RangedWeapons.xml
deleted file mode 100644
index 7a4e3b79ed..0000000000
--- a/Patches/Royal Arsenal - Speciality Weapons/RangedWeapons.xml	
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Royal Arsenal: Specialty Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				
-			<!-- Thunder Javelins -->
-
-			<li Class="PatchOperationAttributeSet">
-				<xpath>Defs/ThingDef[defName="RA_ThunderJavelins"]</xpath>
-				<attribute>ParentName</attribute>
-				<value>BaseWeapon</value>
-			</li>
-
-			<li Class="PatchOperationRemove">
-				<xpath>Defs/ThingDef[defName="RA_ThunderJavelins"]/costList</xpath>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="RA_ThunderJavelins"]/graphicData</xpath>
-				<value>
-					<graphicData>
-						<texPath>ThirdParty/RoyalArsenal/ThunderJavelin</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="RA_ThunderJavelins"]</xpath>
-				<value>
-					<thingCategories>
-						<li>WeaponsRanged</li>
-					</thingCategories>
-				</value>
-			</li>
-
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="RA_ThunderJavelins"]/weaponTags</xpath>
-				<value>
-					<li>CE_OneHandedWeapon</li>
-				</value>
-			</li>
-
-			<li Class="PatchOperationRemove">
-				<xpath>Defs/ThingDef[defName="RA_ThunderJavelins"]/recipeMaker</xpath>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="RA_ThunderJavelins"]/statBases</xpath>
-				<value>
-					<statBases>
-						<MarketValue>7.26</MarketValue>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>1.5</ShotSpread>
-						<SwayFactor>2.5</SwayFactor>
-						<Bulk>3</Bulk>
-						<Mass>1.75</Mass>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<stackLimit>25</stackLimit>
-					<techLevel>Ultra</techLevel>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="RA_ThunderJavelins"]/verbs</xpath>
-				<value>
-					<verbs>
-						<li Class="CombatExtended.VerbPropertiesCE">
-							<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-							<hasStandardCommand>true</hasStandardCommand>
-							<defaultProjectile>ThunderJavelin_Thrown</defaultProjectile>
-							<warmupTime>0.8</warmupTime>
-							<range>20</range>
-							<soundCast>Interact_BeatFire</soundCast>
-							<targetParams>
-								<canTargetLocations>true</canTargetLocations>
-							</targetParams>									
-						</li>
-					</verbs>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="RA_ThunderJavelins"]/tools</xpath>
-				<value>
-					<tools>
-						<li Class="CombatExtended.ToolCE">
-							<label>shaft</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>7</power>
-							<cooldownTime>1.35</cooldownTime>
-							<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-						</li>
-					</tools>
-				</value>
-			</li>
-			
-			</operations>
-		</match>
-	</Operation>
-	
-</Patch>
diff --git a/Patches/Royal Arsenal/Ammo/Ammo_5x35RoyalCharged.xml b/Patches/Royal Arsenal/Ammo/Ammo_5x35RoyalCharged.xml
deleted file mode 100644
index e9bdb81645..0000000000
--- a/Patches/Royal Arsenal/Ammo/Ammo_5x35RoyalCharged.xml	
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Royal Arsenal</li>
-			<li>Royal Arsenal: Specialty Weapons</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_5x35mmRoyal</defName>
-					<label>5x35mm Charged</label>
-					<ammoTypes>
-						<Ammo_5x35mmCharged>Bullet_5x35mmRoyal</Ammo_5x35mmCharged>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseBulletCE">
-					<defName>Bullet_5x35mmRoyal</defName>
-					<label>5x35mm Royal charged bullet</label>
-					<graphicData>
-						<texPath>Things/Projectiles/RoyalLanceShot</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-						<shaderType>TransparentPostLight</shaderType>
-						<drawSize>(3,3)</drawSize>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bullet</damageDef>
-						<damageAmountBase>16</damageAmountBase>
-						<speed>200</speed>
-						<secondaryDamage>
-							<li>
-								<def>Bomb_Secondary</def>
-								<amount>5</amount>
-							</li>
-						</secondaryDamage>
-						<armorPenetrationSharp>40</armorPenetrationSharp>
-						<armorPenetrationBlunt>70</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-			</value>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Royal Arsenal/Ammo/Ammo_6x24RoyalCharged.xml b/Patches/Royal Arsenal/Ammo/Ammo_6x24RoyalCharged.xml
deleted file mode 100644
index 60d5f2131e..0000000000
--- a/Patches/Royal Arsenal/Ammo/Ammo_6x24RoyalCharged.xml	
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Royal Arsenal</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-		<xpath>Defs</xpath>
-			<value>
-
-			<!-- ==================== AmmoSet ========================== -->
-
-			<CombatExtended.AmmoSetDef>
-				<defName>AmmoSet_6x24mmRoyal</defName>
-				<label>6x24mm Charged</label>
-				<ammoTypes>
-					<Ammo_6x24mmCharged>Bullet_6x24mmRoyal</Ammo_6x24mmCharged>
-					<Ammo_6x24mmCharged_AP>Bullet_6x24mmRoyal_AP</Ammo_6x24mmCharged_AP>
-					<Ammo_6x24mmCharged_Ion>Bullet_6x24mmRoyal_Ion</Ammo_6x24mmCharged_Ion>
-				</ammoTypes>
-				<similarTo>AmmoSet_ChargedRifle</similarTo>
-			</CombatExtended.AmmoSetDef>
-
-			<!-- ================== Projectiles ================== -->
-
-			<ThingDef Class="CombatExtended.AmmoDef" Name="Base6x24mmRoyalBullet" ParentName="BaseBulletCE" Abstract="true">
-				<graphicData>
-					<texPath>Things/Projectiles/RoyalChargeShot</texPath>
-					<graphicClass>Graphic_Single</graphicClass>
-				</graphicData>
-				<projectile Class="CombatExtended.ProjectilePropertiesCE">
-					<damageDef>Bullet</damageDef>
-					<speed>160</speed>
-				</projectile>
-			</ThingDef>
-
-			<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmRoyalBullet">
-				<defName>Bullet_6x24mmRoyal</defName>
-				<label>6x24mm Royal Charged bullet</label>
-				<projectile Class="CombatExtended.ProjectilePropertiesCE">
-					<damageAmountBase>15</damageAmountBase>
-					<secondaryDamage>
-					<li>
-						<def>Bomb_Secondary</def>
-						<amount>5</amount>
-					</li>
-					</secondaryDamage>
-					<armorPenetrationSharp>16</armorPenetrationSharp>
-					<armorPenetrationBlunt>28</armorPenetrationBlunt>
-				</projectile>
-			</ThingDef>
-
-			<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmRoyalBullet">
-				<defName>Bullet_6x24mmRoyal_AP</defName>
-				<label>6x24mm Royal Charged bullet (Conc.)</label>
-				<projectile Class="CombatExtended.ProjectilePropertiesCE">
-					<damageAmountBase>12</damageAmountBase>
-					<secondaryDamage>
-					<li>
-						<def>Bomb_Secondary</def>
-						<amount>3</amount>
-					</li>
-					</secondaryDamage>
-					<armorPenetrationSharp>35</armorPenetrationSharp>
-					<armorPenetrationBlunt>30</armorPenetrationBlunt>
-				</projectile>
-			</ThingDef>
-
-			<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base6x24mmRoyalBullet">
-				<defName>Bullet_6x24mmRoyal_Ion</defName>
-				<label>6x24mm Royal Charged bullet (Ion)</label>
-				<projectile Class="CombatExtended.ProjectilePropertiesCE">
-					<damageAmountBase>10</damageAmountBase>
-					<secondaryDamage>
-					<li>
-						<def>EMP</def>
-						<amount>6</amount>
-					</li>
-					</secondaryDamage>
-					<armorPenetrationSharp>25</armorPenetrationSharp>
-					<armorPenetrationBlunt>27</armorPenetrationBlunt>
-					<empShieldBreakChance>0.3</empShieldBreakChance>
-				</projectile>
-			</ThingDef>
-
-			</value>
-		</match>
-	</Operation>
-</Patch>
diff --git a/Patches/Royal Arsenal/Ammo/Ammo_MonoArrow.xml b/Patches/Royal Arsenal/Ammo/Ammo_MonoArrow.xml
deleted file mode 100644
index ef3205761d..0000000000
--- a/Patches/Royal Arsenal/Ammo/Ammo_MonoArrow.xml	
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Royal Arsenal</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-			<!-- ==================== Ammo Classes ========================== -->
-
-			<CombatExtended.AmmoCategoryDef>
-				<defName>Mono-AP</defName>
-				<label>Mono-bodkin</label>
-				<labelShort>bodkin</labelShort>
-				<description>Mono-sharpened bodkin arrows that can penetrate thick armor.</description>
-				<advanced>true</advanced>
-			</CombatExtended.AmmoCategoryDef>
-			
-			<CombatExtended.AmmoCategoryDef>
-				<defName>Mono-Heavy</defName>
-				<label>Mono-broadhead</label>
-				<labelShort>broadhead</labelShort>
-				<description>Mono-sharpened broadhead arrows that have less penetrative power, but will cause more damage when they can penetrate.</description>
-				<advanced>true</advanced>
-			</CombatExtended.AmmoCategoryDef>
-			
-			<!-- ==================== AmmoSet ========================== -->
-			
-			<ThingCategoryDef>
-				<defName>AmmoMonoArrow</defName>
-				<label>Mono arrow</label>
-				<parent>AmmoAdvanced</parent>
-				<iconPath>UI/Icons/ThingCategories/CaliberArrow</iconPath>
-			</ThingCategoryDef>
-				
-			<CombatExtended.AmmoSetDef>
-				<defName>AmmoSet_MonoArrow</defName>
-				<label>Mono arrow</label>
-				<ammoTypes>
-					<Ammo_MonoArrow>Projectile_MonoArrow</Ammo_MonoArrow>
-					<Ammo_MonoArrow_Broad>Projectile_MonoArrow_Broad</Ammo_MonoArrow_Broad>
-				</ammoTypes>
-			</CombatExtended.AmmoSetDef>
-			
-			<!-- ==================== Ammo ========================== -->
-			
-			<ThingDef Class="CombatExtended.AmmoDef" Name="MonoArrowBase" ParentName="SpacerSmallAmmoBase" Abstract="True">
-				<description>Specilized plasteel arrows that can be sharpened to a mono-molecular edge before being fired by a mono-longbow.</description>
-				<statBases>
-					<Mass>0.012</Mass>
-					<Bulk>0.01</Bulk>
-				</statBases>
-				<tradeTags>
-					<li>CE_AutoEnableTrade</li>
-					<li>CE_AutoEnableCrafting_FabricationBench</li>
-				</tradeTags>
-				<thingCategories>
-					<li>AmmoMonoArrow</li>
-				</thingCategories>
-				<stackLimit>1000</stackLimit>	
-			</ThingDef>
-			
-			<ThingDef Class="CombatExtended.AmmoDef" ParentName="MonoArrowBase">
-				<defName>Ammo_MonoArrow</defName>
-				<label>Mono Arrow (Bodkin)</label>
-				<graphicData>
-					<texPath>ThirdParty/RoyalArsenal/MonoBodkin</texPath>
-					<graphicClass>Graphic_StackCount</graphicClass>
-				</graphicData>
-				<statBases>
-					<MarketValue>1.2</MarketValue>
-				</statBases>
-				<ammoClass>Mono-AP</ammoClass>
-			</ThingDef>
-			
-			<ThingDef Class="CombatExtended.AmmoDef" ParentName="MonoArrowBase">
-				<defName>Ammo_MonoArrow_Broad</defName>
-				<label>Mono Arrow (Broadhead)</label>
-				<graphicData>
-					<texPath>ThirdParty/RoyalArsenal/MonoBroadhead</texPath>
-					<graphicClass>Graphic_StackCount</graphicClass>
-				</graphicData>
-				<statBases>
-					<MarketValue>1.2</MarketValue>
-				</statBases>
-				<ammoClass>Mono-Heavy</ammoClass>
-			</ThingDef>
-
-			<!-- ================== Projectiles ================== -->
-			
-			<ThingDef Class="CombatExtended.AmmoDef" Name="BaseMonoArrowProjectile" ParentName="BaseBulletCE" Abstract="true">
-				<graphicData>
-					<texPath>Things/Projectiles/Arrow_Mono</texPath>
-					<graphicClass>Graphic_Single</graphicClass>
-				</graphicData>
-				<projectile Class="CombatExtended.ProjectilePropertiesCE">
-					<damageDef>Arrow</damageDef>
-					<speed>200</speed>
-				</projectile>
-			</ThingDef>
-			
-			<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseMonoArrowProjectile">
-				<defName>Projectile_MonoArrow</defName>
-				<label>mono-bodkin arrow</label>
-				<graphicData>
-					<texPath>Things/Projectiles/Arrow_Mono</texPath>
-					<graphicClass>Graphic_Single</graphicClass>
-				</graphicData>
-				<projectile Class="CombatExtended.ProjectilePropertiesCE">
-					<damageAmountBase>12</damageAmountBase>
-					<armorPenetrationSharp>50</armorPenetrationSharp>
-					<armorPenetrationBlunt>60</armorPenetrationBlunt>
-					<preExplosionSpawnChance>0.333</preExplosionSpawnChance>
-					<preExplosionSpawnThingDef>Ammo_MonoArrow</preExplosionSpawnThingDef>
-				</projectile>
-			</ThingDef>
-			
-			<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseMonoArrowProjectile">
-				<defName>Projectile_MonoArrow_Broad</defName>
-				<label>mono-broadhead arrow</label>
-				<graphicData>
-					<texPath>Things/Projectiles/Arrow_Mono</texPath>
-					<graphicClass>Graphic_Single</graphicClass>
-				</graphicData>
-				<projectile Class="CombatExtended.ProjectilePropertiesCE">
-					<damageAmountBase>18</damageAmountBase>
-					<armorPenetrationSharp>25</armorPenetrationSharp>
-					<armorPenetrationBlunt>30</armorPenetrationBlunt>
-					<preExplosionSpawnChance>0.333</preExplosionSpawnChance>
-					<preExplosionSpawnThingDef>Ammo_MonoArrow</preExplosionSpawnThingDef>
-				</projectile>
-			</ThingDef>
-			
-			<!-- ================== Recipes ================== -->
-			
-			<RecipeDef ParentName="AmmoRecipeBase">
-				<defName>MakeAmmo_MonoArrow</defName>
-				<label>make mono arrow (bodkin) x100</label>
-				<description>Craft 100 mono-bodkin arrows.</description>
-				<jobString>Making mono-bodkin arrows.</jobString>
-				<workAmount>10000</workAmount>
-				<researchPrerequisite>RA_MonoBowResearch</researchPrerequisite>
-				<ingredients>
-					<li>
-						<filter>
-							<thingDefs>
-								<li>Plasteel</li>
-							</thingDefs>
-						</filter>
-						<count>10</count>
-					</li>
-					<li>
-						<filter>
-							<thingDefs>
-								<li>ComponentIndustrial</li>
-							</thingDefs>
-						</filter>
-						<count>2</count>
-					</li>
-				</ingredients>
-				<fixedIngredientFilter>
-					<thingDefs>
-						<li>Plasteel</li>
-						<li>ComponentIndustrial</li>
-					</thingDefs>
-				</fixedIngredientFilter>
-				<products>
-					<Ammo_MonoArrow>100</Ammo_MonoArrow>
-				</products>
-			</RecipeDef>
-			
-			<RecipeDef ParentName="AmmoRecipeBase">
-				<defName>MakeAmmo_MonoArrow_Broad</defName>
-				<label>make mono arrow (broadhead) x100</label>
-				<description>Craft 100 mono-broadhead arrows.</description>
-				<jobString>Making mono-broadhead arrows.</jobString>
-				<workAmount>10000</workAmount>
-				<researchPrerequisite>RA_MonoBowResearch</researchPrerequisite>
-				<ingredients>
-					<li>
-						<filter>
-							<thingDefs>
-								<li>Plasteel</li>
-							</thingDefs>
-						</filter>
-						<count>10</count>
-					</li>
-					<li>
-						<filter>
-							<thingDefs>
-								<li>ComponentIndustrial</li>
-							</thingDefs>
-						</filter>
-						<count>2</count>
-					</li>
-				</ingredients>
-				<fixedIngredientFilter>
-					<thingDefs>
-						<li>Plasteel</li>
-						<li>ComponentIndustrial</li>
-					</thingDefs>
-				</fixedIngredientFilter>
-				<products>
-					<Ammo_MonoArrow_Broad>100</Ammo_MonoArrow_Broad>
-				</products>
-			</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-  
-</Patch>
\ No newline at end of file
diff --git a/Patches/Royal Arsenal/Things/RoyalArsenal_Armors.xml b/Patches/Royal Arsenal/Things/RoyalArsenal_Armors.xml
deleted file mode 100644
index 2e00aaf2aa..0000000000
--- a/Patches/Royal Arsenal/Things/RoyalArsenal_Armors.xml	
+++ /dev/null
@@ -1,535 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Royal Arsenal</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-			
-				<!-- Ranseur Armor -->
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmor"]/statBases</xpath>
-					<value>
-						<Bulk>80</Bulk>
-						<WornBulk>12</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>400</MaxHitPoints>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>30</Mass>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmor"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>35</ArmorRating_Blunt>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmor"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>60</DevilstrandCloth>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>8</CarryBulk>
-						<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmor"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>120</Plasteel>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmor"]/costList/Uranium</xpath>
-					<value>
-						<Uranium>70</Uranium>
-					</value>
-				</li>
-				
-				<!-- Ranseur Helmet -->
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.9</NightVisionEfficiency_Apparel> 
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>190</MaxHitPoints>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet"]/statBases/Mass</xpath>
-					<value>
-						<Mass>3</Mass>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>9</ArmorRating_Sharp>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>24</ArmorRating_Blunt>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>20</DevilstrandCloth>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<ToxicEnvironmentResistance>0.4</ToxicEnvironmentResistance>
-						<PsychicSensitivity>-0.2</PsychicSensitivity>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>40</Plasteel>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				
-				<!-- Guardian Armor -->
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>500</MaxHitPoints>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase"]/statBases/Mass</xpath>
-					<value>
-						<Mass>55</Mass>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>29</ArmorRating_Sharp>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>60</ArmorRating_Blunt>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>50</DevilstrandCloth>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>80</CarryWeight>
-						<CarryBulk>10</CarryBulk>
-						<ToxicEnvironmentResistance>0.4</ToxicEnvironmentResistance>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>200</Plasteel>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase"]/costList/Uranium</xpath>
-					<value>
-						<Uranium>40</Uranium>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RA_GuardianArmorBase"]/verbs</xpath>
-						<value>
-							<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<label>launch 30x29mm EMP grenade</label>
-								<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<onlyManualCast>True</onlyManualCast>
-								<warmupTime>1.5</warmupTime>
-								<range>40</range>
-								<minRange>5</minRange>
-								<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-								<soundCast>Shot_IncendiaryLauncher</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>14</muzzleFlashScale>
-								<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-								<defaultProjectile>Bullet_30x29mmGrenade_EMP</defaultProjectile>
-								<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RA_GuardianArmorBase"]/comps/li[@Class="CompProperties_Reloadable"]/ammoDef</xpath>
-					<value>
-						<ammoDef>Ammo_30x29mmGrenade_EMP</ammoDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RA_GuardianArmorBase"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountPerCharge</xpath>
-					<value>
-						<ammoCountPerCharge>1</ammoCountPerCharge>
-					</value>
-				</li>
-				
-				<!-- Guardian Helmet -->
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel> 
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>240</MaxHitPoints>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet"]/statBases/Mass</xpath>
-					<value>
-						<Mass>5.2</Mass>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>21</ArmorRating_Sharp>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>50</ArmorRating_Blunt>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>20</DevilstrandCloth>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-						<PsychicSensitivity>-0.2</PsychicSensitivity>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>90</Plasteel>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-				
-				<!-- Phalanx Armor -->
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>20</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>650</MaxHitPoints>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>80</Mass>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>24</ArmorRating_Sharp>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>50</ArmorRating_Blunt>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>80</DevilstrandCloth>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>80</CarryWeight>
-						<CarryBulk>10</CarryBulk>
-						<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>220</Plasteel>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor"]/costList/Uranium</xpath>
-					<value>
-						<Uranium>100</Uranium>
-					</value>
-				</li>
-				
-				<!-- Phalanx Helmet -->
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel> 
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>320</MaxHitPoints>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet"]/statBases/Mass</xpath>
-					<value>
-						<Mass>6</Mass>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>50</ArmorRating_Blunt>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>30</DevilstrandCloth>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<PsychicSensitivity>-0.2</PsychicSensitivity>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>100</Plasteel>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-				
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Royal Arsenal/Things/RoyalArsenal_Melee.xml b/Patches/Royal Arsenal/Things/RoyalArsenal_Melee.xml
deleted file mode 100644
index fa15c8e8a0..0000000000
--- a/Patches/Royal Arsenal/Things/RoyalArsenal_Melee.xml	
+++ /dev/null
@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Royal Arsenal</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				
-				<!-- Mono Greatsword, Persona Mono Greatsword -->
-			
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-					defName="RA_MonoGreatsword" or 
-					defName="RA_MonoGreatswordBladelink"
-					]/tools</xpath>
-					<value>
-					  <tools>
-						  <li Class="CombatExtended.ToolCE">
-							<label>handle</label>
-							<capacities>
-							  <li>Poke</li>
-							</capacities>
-							<power>9</power>
-							<cooldownTime>1.32</cooldownTime>
-							<chanceFactor>0.2</chanceFactor>
-							<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-						  </li>
-						  <li Class="CombatExtended.ToolCE">
-							<label>point</label>
-							<capacities>
-							  <li>Stab</li>
-							</capacities>
-							<power>70</power>
-							<cooldownTime>2</cooldownTime>
-							<chanceFactor>1.2</chanceFactor>
-							<armorPenetrationBlunt>2.0</armorPenetrationBlunt>
-							<armorPenetrationSharp>30.0</armorPenetrationSharp>
-							<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-						  </li>
-						  <li Class="CombatExtended.ToolCE">
-							<label>edge</label>
-							<capacities>
-							  <li>Cut</li>
-							</capacities>
-							<power>105</power>
-							<cooldownTime>2.4</cooldownTime>
-							<chanceFactor>1</chanceFactor>
-							<armorPenetrationBlunt>4.0</armorPenetrationBlunt>
-							<armorPenetrationSharp>24.0</armorPenetrationSharp>
-							<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-						  </li>
-					  </tools>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RA_MonoGreatsword"]/statBases</xpath>
-					<value>
-						<MeleeCounterParryBonus>0.10</MeleeCounterParryBonus>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RA_MonoGreatsword"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-						  <MeleeCritChance>1</MeleeCritChance>
-						  <MeleeParryChance>0.60</MeleeParryChance>
-						  <MeleeDodgeChance>0.25</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RA_MonoGreatswordBladelink"]/statBases</xpath>
-					<value>
-						<MeleeCounterParryBonus>0.25</MeleeCounterParryBonus>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RA_MonoGreatswordBladelink"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-						  <MeleeCritChance>1.20</MeleeCritChance>
-						  <MeleeParryChance>0.75</MeleeParryChance>
-						  <MeleeDodgeChance>0.35</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-					defName="RA_MonoGreatsword" or 
-					defName="RA_MonoGreatswordBladelink"
-					]/statBases/Mass</xpath>
-					<value>
-						<Mass>10</Mass>
-						<Bulk>12</Bulk>
-					</value>
-				</li>
-				
-				<!-- Plasma Greatsword, Persona Plasma Greatsword -->
-			
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-					defName="RA_PlasmaGreatsword" or 
-					defName="RA_PlasmaGreatswordBladelink"
-					]/tools</xpath>
-					<value>
-					  <tools>
-						  <li Class="CombatExtended.ToolCE">
-							<label>handle</label>
-							<capacities>
-							  <li>Poke</li>
-							</capacities>
-							<power>9</power>
-							<cooldownTime>1.32</cooldownTime>
-							<chanceFactor>0.2</chanceFactor>
-							<armorPenetrationBlunt>3.375</armorPenetrationBlunt>
-							<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-						  </li>
-						  <li Class="CombatExtended.ToolCE">
-							<label>point</label>
-							<capacities>
-							  <li>Stab</li>
-							</capacities>
-							<power>60</power>
-							<extraMeleeDamages>
-							<li>
-								<def>Flame</def>
-								<amount>5</amount>
-								<chance>0.3</chance>
-							</li>
-							</extraMeleeDamages>
-							<cooldownTime>2</cooldownTime>
-							<chanceFactor>1.2</chanceFactor>
-							<armorPenetrationBlunt>5.5</armorPenetrationBlunt>
-							<armorPenetrationSharp>36</armorPenetrationSharp>
-							<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-						  </li>
-						  <li Class="CombatExtended.ToolCE">
-							<label>edge</label>
-							<capacities>
-							  <li>Cut</li>
-							</capacities>
-							<power>120</power>
-							<extraMeleeDamages>
-							<li>
-								<def>Flame</def>
-								<amount>8</amount>
-								<chance>0.3</chance>
-							</li>
-							</extraMeleeDamages>
-							<cooldownTime>2.4</cooldownTime>
-							<chanceFactor>1</chanceFactor>
-							<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							<armorPenetrationSharp>30</armorPenetrationSharp>
-							<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-						  </li>
-					  </tools>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RA_PlasmaGreatsword"]/statBases</xpath>
-					<value>
-						<MeleeCounterParryBonus>0.10</MeleeCounterParryBonus>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RA_PlasmaGreatsword"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-						  <MeleeCritChance>1</MeleeCritChance>
-						  <MeleeParryChance>0.60</MeleeParryChance>
-						  <MeleeDodgeChance>0.25</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RA_PlasmaGreatswordBladelink"]/statBases</xpath>
-					<value>
-						<MeleeCounterParryBonus>0.25</MeleeCounterParryBonus>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RA_PlasmaGreatswordBladelink"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-						  <MeleeCritChance>1.20</MeleeCritChance>
-						  <MeleeParryChance>0.75</MeleeParryChance>
-						  <MeleeDodgeChance>0.35</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-					defName="RA_PlasmaGreatsword" or 
-					defName="RA_PlasmaGreatswordBladelink"
-					]/statBases/Mass</xpath>
-					<value>
-						<Mass>16</Mass>
-						<Bulk>12</Bulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Royal Arsenal/Things/RoyalArsenal_PrestigeArmors.xml b/Patches/Royal Arsenal/Things/RoyalArsenal_PrestigeArmors.xml
deleted file mode 100644
index 8148bfc59d..0000000000
--- a/Patches/Royal Arsenal/Things/RoyalArsenal_PrestigeArmors.xml	
+++ /dev/null
@@ -1,531 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Royal Arsenal</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-			
-				<!-- Ranseur Armor -->
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmor_Prestige"]/statBases</xpath>
-					<value>
-						<Bulk>80</Bulk>
-						<WornBulk>12</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmor_Prestige"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>400</MaxHitPoints>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmor_Prestige"]/statBases/Mass</xpath>
-					<value>
-						<Mass>30</Mass>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmor_Prestige"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmor_Prestige"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmor_Prestige"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>35</ArmorRating_Blunt>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmor_Prestige"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>60</DevilstrandCloth>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmor_Prestige"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>8</CarryBulk>
-						<ToxicEnvironmentResistance>0.3</ToxicEnvironmentResistance>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmor_Prestige"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmor_Prestige"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>120</Plasteel>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmor_Prestige"]/costList/Uranium</xpath>
-					<value>
-						<Uranium>70</Uranium>
-					</value>
-				</li>
-				
-				<!-- Ranseur Helmet -->
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet_Prestige"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.9</NightVisionEfficiency_Apparel> 
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet_Prestige"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>190</MaxHitPoints>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet_Prestige"]/statBases/Mass</xpath>
-					<value>
-						<Mass>3</Mass>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet_Prestige"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet_Prestige"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>9</ArmorRating_Sharp>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet_Prestige"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>24</ArmorRating_Blunt>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet_Prestige"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>20</DevilstrandCloth>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet_Prestige"]/equippedStatOffsets</xpath>
-					<value>
-						<ToxicEnvironmentResistance>0.4</ToxicEnvironmentResistance>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet_Prestige"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>40</Plasteel>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_RanseurArmorHelmet_Prestige"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-				
-				<!-- Guardian Armor -->
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase_Prestige"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase_Prestige"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>500</MaxHitPoints>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase_Prestige"]/statBases/Mass</xpath>
-					<value>
-						<Mass>55</Mass>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase_Prestige"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase_Prestige"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>29</ArmorRating_Sharp>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase_Prestige"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>60</ArmorRating_Blunt>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase_Prestige"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>50</DevilstrandCloth>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase_Prestige"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>80</CarryWeight>
-						<CarryBulk>10</CarryBulk>
-						<ToxicEnvironmentResistance>0.4</ToxicEnvironmentResistance>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase_Prestige"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase_Prestige"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>200</Plasteel>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorBase_Prestige"]/costList/Uranium</xpath>
-					<value>
-						<Uranium>40</Uranium>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RA_GuardianArmorBase_Prestige"]/verbs</xpath>
-						<value>
-							<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<label>launch 30x29mm EMP grenade</label>
-								<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<onlyManualCast>True</onlyManualCast>
-								<warmupTime>1.5</warmupTime>
-								<range>45</range>
-								<minRange>5</minRange>
-								<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-								<soundCast>Shot_IncendiaryLauncher</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>14</muzzleFlashScale>
-								<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-								<defaultProjectile>Bullet_30x29mmGrenade_EMP</defaultProjectile>
-								<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RA_GuardianArmorBase_Prestige"]/comps/li[@Class="CompProperties_Reloadable"]/ammoDef</xpath>
-					<value>
-						<ammoDef>Ammo_30x29mmGrenade_EMP</ammoDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RA_GuardianArmorBase_Prestige"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountPerCharge</xpath>
-					<value>
-						<ammoCountPerCharge>1</ammoCountPerCharge>
-					</value>
-				</li>
-				
-				<!-- Guardian Helmet -->
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet_Prestige"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel> 
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet_Prestige"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>240</MaxHitPoints>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet_Prestige"]/statBases/Mass</xpath>
-					<value>
-						<Mass>5.2</Mass>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet_Prestige"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet_Prestige"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>21</ArmorRating_Sharp>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet_Prestige"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>50</ArmorRating_Blunt>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet_Prestige"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>20</DevilstrandCloth>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet_Prestige"]/equippedStatOffsets</xpath>
-					<value>
-						<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet_Prestige"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>90</Plasteel>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_GuardianArmorHelmet_Prestige"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-				
-				<!-- Phalanx Armor -->
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor_Prestige"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>20</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor_Prestige"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>650</MaxHitPoints>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor_Prestige"]/statBases/Mass</xpath>
-					<value>
-						<Mass>80</Mass>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor_Prestige"]/statBases/Flammability</xpath>
-						<value>
-							<Flammability>0</Flammability>
-						</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor_Prestige"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>24</ArmorRating_Sharp>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor_Prestige"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>50</ArmorRating_Blunt>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor_Prestige"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>80</DevilstrandCloth>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor_Prestige"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>80</CarryWeight>
-						<CarryBulk>10</CarryBulk>
-						<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor_Prestige"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor_Prestige"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>220</Plasteel>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmor_Prestige"]/costList/Uranium</xpath>
-					<value>
-						<Uranium>100</Uranium>
-					</value>
-				</li>
-				
-				<!-- Phalanx Helmet -->
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet_Prestige"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel> 
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet_Prestige"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>320</MaxHitPoints>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet_Prestige"]/statBases/Mass</xpath>
-					<value>
-						<Mass>6</Mass>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet_Prestige"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet_Prestige"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet_Prestige"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>50</ArmorRating_Blunt>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet_Prestige"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>30</DevilstrandCloth>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet_Prestige"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet_Prestige"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>100</Plasteel>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/ThingDef[defName="RA_PhalanxArmorHelmet_Prestige"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-				
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Royal Arsenal/Things/RoyalArsenal_Ranged.xml b/Patches/Royal Arsenal/Things/RoyalArsenal_Ranged.xml
deleted file mode 100644
index 5c76dc2b45..0000000000
--- a/Patches/Royal Arsenal/Things/RoyalArsenal_Ranged.xml	
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Royal Arsenal</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-			
-			<!-- Ranged Weapon Melee Attacks -->
-		
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="RA_RoyalChargeRifle" or defName="RA_RoyalChargeLance"]/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>
-			</li>
-			
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="RA_MonoBow"]/tools</xpath>
-				<value>
-					<tools>
-						<li Class="CombatExtended.ToolCE">
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>8</power>
-							<cooldownTime>1.6</cooldownTime>
-						<armorPenetrationBlunt>0.65</armorPenetrationBlunt>
-						</li>
-					</tools>
-				</value>
-			</li>
-			
-			
-			<!-- Mono Longbow -->
-			
-			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-				<defName>RA_MonoBow</defName>
-				<statBases>
-					<Mass>8</Mass>
-					<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					<SightsEfficiency>2</SightsEfficiency>
-					<ShotSpread>0.01</ShotSpread>
-					<SwayFactor>1</SwayFactor>
-					<Bulk>13.0</Bulk>
-				</statBases>
-				<costList>
-					<Plasteel>60</Plasteel>
-					<Uranium>20</Uranium>
-					<ComponentSpacer>6</ComponentSpacer>
-				</costList>
-				<Properties>
-					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-					<hasStandardCommand>true</hasStandardCommand>
-					<defaultProjectile>Projectile_MonoArrow</defaultProjectile>
-					<warmupTime>1.8</warmupTime>
-					<range>80</range>
-					<soundCast>ChargeLance_Fire</soundCast>
-					<muzzleFlashScale>0</muzzleFlashScale>
-					<recoilAmount>1.0</recoilAmount>
-				</Properties>
-				<AmmoUser>
-					<ammoSet>AmmoSet_MonoArrow</ammoSet>
-				</AmmoUser>
-				<FireModes/>
-				<weaponTags />
-				<researchPrerequisite>RA_MonoBowResearch</researchPrerequisite>
-				<AllowWithRunAndGun>false</AllowWithRunAndGun>
-			</li>
-			
-			<li Class="PatchOperationAddModExtension">
-				<xpath>Defs/ThingDef[defName="RA_MonoBow"]</xpath>
-				<value>
-					<li Class="CombatExtended.GunDrawExtension">
-					<DrawSize>1,1</DrawSize>
-					<DrawOffset>0.15,-0.05</DrawOffset>
-					</li>
-				</value>
-			</li>
-			
-			
-			<!-- Royal Charge Rifle -->
-			
-			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-				<defName>RA_RoyalChargeRifle</defName>
-				<statBases>
-					<Mass>5</Mass>
-					<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
-					<SightsEfficiency>1.4</SightsEfficiency>
-					<ShotSpread>0.08</ShotSpread>
-					<SwayFactor>1</SwayFactor>
-					<Bulk>10.0</Bulk>
-				</statBases>
-				<costList>
-					<Plasteel>60</Plasteel>
-					<Gold>2</Gold>
-					<ComponentSpacer>6</ComponentSpacer>
-					<Chemfuel>10</Chemfuel>
-				</costList>
-				<Properties>
-					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-					<hasStandardCommand>true</hasStandardCommand>
-					<defaultProjectile>Bullet_6x24mmRoyal</defaultProjectile>
-					<warmupTime>1.0</warmupTime>
-					<range>55</range>
-					<burstShotCount>5</burstShotCount>
-					<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-					<soundCast>Shot_ChargeRifle</soundCast>
-					<soundCastTail>GunTail_Medium</soundCastTail>
-					<muzzleFlashScale>9</muzzleFlashScale>
-					<recoilAmount>1.0</recoilAmount>
-				</Properties>
-				<AmmoUser>
-					<magazineSize>40</magazineSize>
-					<reloadTime>4</reloadTime>
-					<ammoSet>AmmoSet_6x24mmRoyal</ammoSet>
-				</AmmoUser>
-				<FireModes>
-					<aimedBurstShotCount>4</aimedBurstShotCount>
-					<aiUseBurstMode>TRUE</aiUseBurstMode>
-					<aiAimMode>AimedShot</aiAimMode>
-				</FireModes>
-				<weaponTags />
-				<researchPrerequisite>RA_RoyalChargedShot</researchPrerequisite>
-				<AllowWithRunAndGun>false</AllowWithRunAndGun>
-			</li>
-			
-			<li Class="PatchOperationAddModExtension">
-				<xpath>Defs/ThingDef[defName="RA_RoyalChargeRifle"]</xpath>
-				<value>
-					<li Class="CombatExtended.GunDrawExtension">
-					<DrawSize>1,1</DrawSize>
-					<DrawOffset>0.15,-0.05</DrawOffset>
-					</li>
-				</value>
-			</li>
-			
-			
-			<!-- Royal Charge Lance -->
-			
-			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-				<defName>RA_RoyalChargeLance</defName>
-				<statBases>
-					<Mass>5</Mass>
-					<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
-					<SightsEfficiency>2.2</SightsEfficiency>
-					<ShotSpread>0.01</ShotSpread>
-					<SwayFactor>1</SwayFactor>
-					<Bulk>10.0</Bulk>
-				</statBases>
-				<costList>
-					<Plasteel>60</Plasteel>
-					<Gold>2</Gold>
-					<ComponentSpacer>6</ComponentSpacer>
-					<Chemfuel>10</Chemfuel>
-				</costList>
-				<Properties>
-					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-					<hasStandardCommand>true</hasStandardCommand>
-					<defaultProjectile>Bullet_5x35mmRoyal</defaultProjectile>
-					<warmupTime>1.0</warmupTime>
-					<range>75</range>
-					<soundCast>ChargeLance_Fire</soundCast>
-					<soundCastTail>GunTail_Medium</soundCastTail>
-					<muzzleFlashScale>9</muzzleFlashScale>
-					<recoilAmount>1.0</recoilAmount>
-				</Properties>
-				<AmmoUser>
-					<magazineSize>6</magazineSize>
-					<reloadTime>3</reloadTime>
-					<ammoSet>AmmoSet_5x35mmRoyal</ammoSet>
-				</AmmoUser>
-				<FireModes>
-					<aiAimMode>AimedShot</aiAimMode>
-				</FireModes>
-				<weaponTags />
-				<researchPrerequisite>RA_RoyalChargedShot</researchPrerequisite>
-				<AllowWithRunAndGun>false</AllowWithRunAndGun>
-			</li>
-			
-			<li Class="PatchOperationAddModExtension">
-				<xpath>Defs/ThingDef[defName="RA_RoyalChargeLance"]</xpath>
-				<value>
-					<li Class="CombatExtended.GunDrawExtension">
-					<DrawSize>1,1</DrawSize>
-					<DrawOffset>0.15,-0.05</DrawOffset>
-					</li>
-				</value>
-			</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Royal Warcaskets/Apparel_Royal_Warcaskets.xml b/Patches/Royal Warcaskets/Apparel_Royal_Warcaskets.xml
deleted file mode 100644
index a2d95854ee..0000000000
--- a/Patches/Royal Warcaskets/Apparel_Royal_Warcaskets.xml	
+++ /dev/null
@@ -1,480 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Royal Warcaskets</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Prestige Marine Warcasket ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Marine"]/statBases</xpath>
-					<value>
-						<Bulk>200</Bulk>
-						<WornBulk>20</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Marine"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>23</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Marine"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>57</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Marine"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>250</CarryWeight>
-						<CarryBulk>200</CarryBulk>
-						<Suppressability>-100</Suppressability>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Marine"]/costList/Steel</xpath>
-					<value>
-						<Steel>260</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Marine"]/costList/Gold</xpath>
-					<value>
-						<Gold>40</Gold>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Marine"]/costList/ComponentIndustrial</xpath>
-					<value>
-						<ComponentIndustrial>8</ComponentIndustrial>
-					</value>
-				</li>
-
-				<!-- ========== Prestige Marine Warcasket - Shoulders ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketShoulders_Marine"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketShoulders_Marine"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>23</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketShoulders_Marine"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>57</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketShoulders_Marine"]/costList/Steel</xpath>
-					<value>
-						<Steel>110</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketShoulders_Marine"]/costList/Gold</xpath>
-					<value>
-						<Gold>10</Gold>
-					</value>
-				</li>
-
-				<!-- === Prestige Marine Warcasket Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Marine"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>5</WornBulk>
-						<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Marine"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Marine"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Marine"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<!-- Armor values scaled by vanilla stat ratios compared to basic warcasket helmet [e.g (1.20/1.06)*16 = ~18 ]. -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Marine"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Marine"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>45</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Marine"]/costList/Steel</xpath>
-					<value>
-						<Steel>130</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Marine"]/costList/Gold</xpath>
-					<value>
-						<Gold>20</Gold>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Marine"]/costList/ComponentIndustrial</xpath>
-					<value>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</value>
-				</li>
-
-				<!-- ========== Prestige Recon Warcasket ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Recon"]/statBases</xpath>
-					<value>
-						<Bulk>175</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Recon"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Recon"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>46</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Recon"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>225</CarryWeight>
-						<CarryBulk>175</CarryBulk>
-						<Suppressability>-100</Suppressability>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Recon"]/costList/Steel</xpath>
-					<value>
-						<Steel>160</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Recon"]/costList/Gold</xpath>
-					<value>
-						<Gold>30</Gold>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Recon"]/costList/ComponentIndustrial</xpath>
-					<value>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</value>
-				</li>
-
-				<!-- ========== Prestige Recon Warcasket - Shoulders ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketShoulders_Recon"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketShoulders_Recon"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketShoulders_Recon"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>46</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketShoulders_Recon"]/costList/Steel</xpath>
-					<value>
-						<Steel>80</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketShoulders_Recon"]/costList/Gold</xpath>
-					<value>
-						<Gold>10</Gold>
-					</value>
-				</li>
-
-				<!-- === Prestige Recon Warcasket Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Recon"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>4</WornBulk>
-						<NightVisionEfficiency_Apparel>0.65</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Recon"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Recon"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Recon"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Recon"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Recon"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>37</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Recon"]/costList/Steel</xpath>
-					<value>
-						<Steel>80</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Recon"]/costList/Gold</xpath>
-					<value>
-						<Gold>20</Gold>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Recon"]/costList/ComponentIndustrial</xpath>
-					<value>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</value>
-				</li>
-
-				<!-- ========== Prestige Cataphract Warcasket ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Cataphract"]/statBases</xpath>
-					<value>
-						<Bulk>250</Bulk>
-						<WornBulk>25</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Cataphract"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>32</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Cataphract"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>80</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Cataphract"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>250</CarryWeight>
-						<CarryBulk>200</CarryBulk>
-						<Suppressability>-100</Suppressability>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Cataphract"]/costList/Steel</xpath>
-					<value>
-						<Steel>350</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Cataphract"]/costList/Gold</xpath>
-					<value>
-						<Gold>40</Gold>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_Warcasket_Cataphract"]/costList/ComponentIndustrial</xpath>
-					<value>
-						<ComponentIndustrial>10</ComponentIndustrial>
-					</value>
-				</li>
-
-				<!-- ========== Prestige Cataphract Warcasket - Shoulders ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketShoulders_Cataphract"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketShoulders_Cataphract"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>32</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketShoulders_Cataphract"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>80</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketShoulders_Cataphract"]/costList/Steel</xpath>
-					<value>
-						<Steel>150</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketShoulders_Cataphract"]/costList/Gold</xpath>
-					<value>
-						<Gold>10</Gold>
-					</value>
-				</li>
-
-				<!-- === Prestige Cataphract Warcasket Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Cataphract"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>8</WornBulk>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Cataphract"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Cataphract"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Cataphract"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Cataphract"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>28</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Cataphract"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>63</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Cataphract"]/costList/Steel</xpath>
-					<value>
-						<Steel>150</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Cataphract"]/costList/Gold</xpath>
-					<value>
-						<Gold>20</Gold>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Prestige_WarcasketHelmet_Cataphract"]/costList/ComponentIndustrial</xpath>
-					<value>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/SCP/Apparel_SCP.xml b/Patches/SCP/Apparel_SCP.xml
deleted file mode 100644
index 0318a7457b..0000000000
--- a/Patches/SCP/Apparel_SCP.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>SCP</li>
-			<li>SCP - Clothing Only</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Clothing -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SCPDClassJumpsuit"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>2</WornBulk>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SCPStaffShirt" or defName="Apparel_GOCStaffShirt"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SCPLabcoat"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1.5</WornBulk>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SCPFormalSuit" or defName="Apparel_GOCFormalSuit"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>2</WornBulk>
-						<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SCPGuardJumpsuit" or defName="Apparel_GOCSecurityFatigues" or defName="Apparel_CIInsurgentJumpsuit"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>2</WornBulk>
-						<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SCPSecurityTaskForceJacket"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SCPMobileTaskForceUbac" or defName="Apparel_GOCStrikeTeamUbac"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SCPParka" or defName="Apparel_GOCParka" or defName="Apparel_CIInsurgentParka"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-						<Bulk>10</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<!-- SCP Guard/GOC Security Armor -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_SCPGuardArmor" or defName="Apparel_GOCSecurityArmor"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SCPGuardArmor" or defName="Apparel_GOCSecurityArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SCPGuardArmor" or defName="Apparel_GOCSecurityArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>21</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- MTF Crye CAGE Armor -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_SCPMobileTaskForceCryeCage"]/statBases</xpath>
-					<value>
-						<Bulk>7.5</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_SCPMobileTaskForceCryeCage"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>10</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SCPMobileTaskForceCryeCage"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SCPMobileTaskForceCryeCage"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>31</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SCPMobileTaskForceCryeCage"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.36</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!-- MBAV Armor -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_GOCStrikeTeamMBAV" or defName="Apparel_CIInsurgentMBAV"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>5.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_GOCStrikeTeamMBAV" or defName="Apparel_CIInsurgentMBAV"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>10</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_GOCStrikeTeamMBAV" or defName="Apparel_CIInsurgentMBAV"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_GOCStrikeTeamMBAV" or defName="Apparel_CIInsurgentMBAV"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>28</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- LCE Carrier -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_CIInsurgentLCE"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_CIInsurgentLCE"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>30</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_CIInsurgentLCE"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_CIInsurgentLCE"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.3</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/SCP/Headgear_SCP.xml b/Patches/SCP/Headgear_SCP.xml
deleted file mode 100644
index 4e2f92cf66..0000000000
--- a/Patches/SCP/Headgear_SCP.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>SCP</li>
-			<li>SCP - Clothing Only</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Hats-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_GOCStrikeTeamBoonie" or
-						defName="Apparel_SCPSecurityTaskForceCap" or
-						defName="Apparel_CIInsurgentCap" or
-						defName="Apparel_CIInsurgentBoonie" or
-						defName="Apparel_CIInsurgentBeret"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_CIInsurgentBalaclava"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>0.5</Bulk>
-						<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_CIInsurgentBalaclava"]/apparel/layers</xpath>
-					<value>
-						<layers>
-							<li>OnHead</li>
-						</layers>
-					</value>
-				</li>
-
-				<!-- FAST Helmet -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_SCPMobileTaskForceHelmet" or
-						defName="Apparel_SCPMobileTaskForceHelmetMask" or
-						defName="Apparel_SCPMobileTaskForceHelmetGasmask"
-						]/statBases </xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.54</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SCPMobileTaskForceHelmet" or
-						defName="Apparel_SCPMobileTaskForceHelmetMask" or
-						defName="Apparel_SCPMobileTaskForceHelmetGasmask"]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>0.20</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ACH Helmet -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_CIInsurgentHelmet" or
-						defName="Apparel_CIInsurgentHelmetMask" or
-						defName="Apparel_CIInsurgentHelmetGasmask" or
-						defName="Apparel_SCPGuardHelmet" or
-						defName="Apparel_GOCSecurityHelmet"
-						]/statBases </xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>7</ArmorRating_Sharp>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.54</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_CIInsurgentHelmet" or
-						defName="Apparel_CIInsurgentHelmetMask" or
-						defName="Apparel_CIInsurgentHelmetGasmask" or
-						defName="Apparel_SCPGuardHelmet" or
-						defName="Apparel_GOCSecurityHelmet"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>0.20</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Felin Helmet -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_GOCStrikeTeamHelmet" or
-						defName="Apparel_GOCStrikeTeamHelmetMask" or
-						defName="Apparel_GOCStrikeTeamHelmetGasmask"
-						]/statBases </xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-						<ArmorRating_Blunt>14</ArmorRating_Blunt>
-						<ArmorRating_Heat>0.5</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_GOCStrikeTeamHelmet" or
-						defName="Apparel_GOCStrikeTeamHelmetMask" or
-						defName="Apparel_GOCStrikeTeamHelmetGasmask"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>0.20</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Gas Mask -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Apparel_SCPMobileTaskForceHelmetGasmask" or
-						defName="Apparel_GOCStrikeTeamHelmetGasmask" or
-						defName="Apparel_CIInsurgentHelmetGasmask"] </xpath>
-					<value>
-						<li Class="CombatExtended.ApparelHediffExtension">
-							<hediff>WearingGasMask</hediff>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/SCP/Race_SCP.xml b/Patches/SCP/Race_SCP.xml
deleted file mode 100644
index 26623499d7..0000000000
--- a/Patches/SCP/Race_SCP.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>SCP</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="SCP939_A"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SCP939_A"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.30</MeleeCritChance>
-						<MeleeParryChance>0.10</MeleeParryChance>
-						<SmokeSensitivity>0</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SCP939_A"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.41</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>5</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.41</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>5</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>razorfangs</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>31</power>
-								<cooldownTime>2.05</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>8.450</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.22</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>4.235</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/SCP/SCP_PawnKinds.xml b/Patches/SCP/SCP_PawnKinds.xml
deleted file mode 100644
index 026c5699b3..0000000000
--- a/Patches/SCP/SCP_PawnKinds.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>SCP</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!-- Civilian -->
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[defName="SCP_Staff_Scientist" or
-								defName="SCP_Staff_Ambassador" or
-								defName="SCP_Staff_SiteHead" or
-								defName="GOC_Staff_Worker" or
-								defName="GOC_Staff_Scientist" or
-								defName="GOC_Staff_Ambassador" or
-								defName="GOC_Staff_Director" or
-								defName="CI_Trader" or
-								defName="SCP_Trader" or
-								defName="GOC_Trader"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>3</min>
-										<max>4</max>
-									</primaryMagazineCount>
-								</li>
-							</value>
-						</li>
-
-						<!-- Basics -->
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[defName="SCP_SecurityGuard_CQB" or defName="GOC_SecurityGuard_CQB" or defName="CI_Insurgent_CQB"]</xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>4</min>
-										<max>6</max>
-									</primaryMagazineCount>
-								</li>
-							</value>
-						</li>
-
-						<!-- Elites -->
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[defName="CI_Insurgent_Assault" or
-								defName="CI_Insurgent_Gunner" or
-								defName="CI_Insurgent_Marksman" or
-								defName="CI_Insurgent_Sniper" or
-								defName="CI_Insurgent_Elite" or
-								defName="CI_Insurgent_Commander" or
-								defName="GOC_StrikeTeam_Assault" or
-								defName="GOC_StrikeTeam_Gunner" or
-								defName="GOC_StrikeTeam_Marksman" or
-								defName="GOC_StrikeTeam_Sniper" or
-								defName="GOC_StrikeTeam_Elite" or
-								defName="SCP_SecurityTaskForce_Assault" or
-								defName="SCP_SecurityTaskForce_Marksman" or
-								defName="SCP_SecurityTaskForce_Gunner" or
-								defName="SCP_MobileTaskForce_Assault" or
-								defName="SCP_MobileTaskForce_Gunner" or
-								defName="SCP_MobileTaskForce_Marksman" or
-								defName="SCP_MobileTaskForce_Sniper" or
-								defName="SCP_MobileTaskForce_Elite"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>5</min>
-										<max>7</max>
-									</primaryMagazineCount>
-								</li>
-							</value>
-						</li>
-
-						<!-- Increase weaponMoney -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/PawnKindDef[defName="CI_Insurgent_CQB"]/weaponMoney/min</xpath>
-							<value>
-								<min>150</min>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/PawnKindDef[defName="SCP_SecurityGuard_CQB" or
-								defName="GOC_StrikeTeam_Marksman" or
-								defName="SCP_SecurityTaskForce_Marksman" or
-								defName="SCP_MobileTaskForce_Marksman"]/weaponMoney/min </xpath>
-							<value>
-								<min>440</min>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/PawnKindDef[defName="CI_Insurgent_Gunner" or
-								defName="GOC_StrikeTeam_Gunner" or
-								defName="SCP_SecurityTaskForce_Gunner" or
-								defName="SCP_MobileTaskForce_Gunner"]/weaponMoney/min </xpath>
-							<value>
-								<min>550</min>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/SS Maid Project/ThingDefs_Misc/Apparel.xml b/Patches/SS Maid Project/ThingDefs_Misc/Apparel.xml
deleted file mode 100644
index b0553a1b7f..0000000000
--- a/Patches/SS Maid Project/ThingDefs_Misc/Apparel.xml	
+++ /dev/null
@@ -1,232 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[SS]Maid Project</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--Combat Type-->
-
-						<!--Fight Maid-->
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="FightMaid"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>7.2</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="FightMaid"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>8.25</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="FightMaid"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>0.05</MeleeDodgeChance>
-								<MeleeParryChance>0.05</MeleeParryChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="FightMaid"]/statBases</xpath>
-							<value>
-								<Bulk>15</Bulk>
-								<WornBulk>10</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="FightMaid"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-							<value>
-								<ShootingAccuracyPawn>0.2</ShootingAccuracyPawn>
-								<AimingAccuracy>0.1</AimingAccuracy>
-								<MeleeCritChance>0.05</MeleeCritChance>
-							</value>
-						</li>
-
-						<!--Header Maid-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HeaderMaid"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>5</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HeaderMaid"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.9</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="HeaderMaid"]/statBases</xpath>
-							<value>
-								<Bulk>7</Bulk>
-								<WornBulk>6</WornBulk>
-							</value>
-						</li>
-
-						<!--Healer Maid-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="NurseMaid"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>4.5</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="NurseMaid"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.9</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="NurseMaid"]/statBases</xpath>
-							<value>
-								<Bulk>7</Bulk>
-								<WornBulk>6</WornBulk>
-							</value>
-						</li>
-
-						<!--Non-combat Type-->
-
-						<!--Crafter-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="CrafterMaid"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>2.2</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="CrafterMaid"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.24</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="CrafterMaid"]/statBases</xpath>
-							<value>
-								<Bulk>5</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<!--Cook-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ChefMaid"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="ChefMaid"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.3</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="ChefMaid"]/statBases</xpath>
-							<value>
-								<Bulk>5</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<!--Cleaner-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="CleanerMaid"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>1.9</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="CleanerMaid"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.18</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="CleanerMaid"]/statBases</xpath>
-							<value>
-								<Bulk>5</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="CleanerMaid"]/equippedStatOffsets</xpath>
-							<value>
-								<CarryWeight>15</CarryWeight>
-								<CarryBulk>25</CarryBulk>
-							</value>
-						</li>
-
-						<!--Hats-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="MaidHatNA"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>7.8</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="MaidHatNA"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>6</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="MaidHatNA" or
-								defName="MaidHatNB" or
-								defName="MaidHatNC"
-								]/statBases </xpath>
-							<value>
-								<Bulk>3</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="MaidHatNB" or defName="MaidHatNC"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>3.6</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="MaidHatNB" or defName="MaidHatNC"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>2.25</ArmorRating_Blunt>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/SYR Harpy/Patch_Bodies_Harpy.xml b/Patches/SYR Harpy/Patch_Bodies_Harpy.xml
deleted file mode 100644
index 2d8d955336..0000000000
--- a/Patches/SYR Harpy/Patch_Bodies_Harpy.xml	
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[SYR] Harpy</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- New Bodyparts -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel = "left arm"]/groups</xpath>
-					<value>
-						<li>LeftArm</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel = "right arm"]/groups</xpath>
-					<value>
-						<li>RightArm</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[customLabel = "left shoulder"]/groups</xpath>
-					<value>
-						<li>LeftShoulder</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[customLabel = "right shoulder"]/groups</xpath>
-					<value>
-						<li>RightShoulder</li>
-					</value>
-				</li>
-
-				<!-- Adjustment of coverage -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Ribcage"]/coverage</xpath>
-					<value>
-						<coverage>0.07</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Pelvis"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Stomach"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Heart"]/coverage</xpath>
-					<value>
-						<coverage>0.04</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Lung"]/coverage</xpath>
-					<value>
-						<coverage>0.055</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Kidney"]/coverage</xpath>
-					<value>
-						<coverage>0.03</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Liver"]/coverage</xpath>
-					<value>
-						<coverage>0.06</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Neck"]/coverage</xpath>
-					<value>
-						<coverage>0.055</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Skull"]/parts/li[def="Brain"]/coverage</xpath>
-					<value>
-						<coverage>0.9</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Eye"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/coverage</xpath>
-					<value>
-						<coverage>0.08</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Shoulder"]/coverage</xpath>
-					<value>
-						<coverage>0.085</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Clavicle"]/coverage</xpath>
-					<value>
-						<coverage>0.06</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="ArmHarpy"]/parts/li[def="WingHarpy"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="ArmHarpy"]/parts/li[def="Humerus"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="ArmHarpy"]/parts/li[def="Radius"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Femur"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Harpy_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Tibia"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/SYR Harpy/Patch_Prosthetics_Harpy.xml b/Patches/SYR Harpy/Patch_Prosthetics_Harpy.xml
deleted file mode 100644
index 8f3ec8760f..0000000000
--- a/Patches/SYR Harpy/Patch_Prosthetics_Harpy.xml	
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[SYR] Harpy</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Steel Claw -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="SteelHarpyClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>steel harpy claw</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>0.87</cooldownTime>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>steel harpy claw</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>0.87</cooldownTime>
-								<armorPenetrationSharp>5</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Plasteel Claw -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="PlasteelHarpyClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>plasteel harpy claw</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>0.93</cooldownTime>
-								<armorPenetrationSharp>5.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>plasteel harpy claw</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>0.93</cooldownTime>
-								<armorPenetrationSharp>7.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Mono Claw -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="HarpyMonoClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>harpy monoclaw</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>0.78</cooldownTime>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>harpy monoclaw</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>0.78</cooldownTime>
-								<armorPenetrationSharp>16</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Venom Claw -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="HarpyVenomClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>harpy venonmclaw</label>
-								<capacities>
-									<li>ScratchToxic</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>0.76</cooldownTime>
-								<armorPenetrationSharp>5.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>harpy venonmclaw</label>
-								<capacities>
-									<li>ScratchToxic</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>0.76</cooldownTime>
-								<armorPenetrationSharp>7.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Work Claw -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="HarpyWorkClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>harpy work claw</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>0.87</cooldownTime>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>harpy work claw</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>0.87</cooldownTime>
-								<armorPenetrationSharp>4.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/SYR Harpy/Patch_Race_Harpy.xml b/Patches/SYR Harpy/Patch_Race_Harpy.xml
deleted file mode 100644
index 5e83bca9f7..0000000000
--- a/Patches/SYR Harpy/Patch_Race_Harpy.xml	
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[SYR] Harpy</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Harpy"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- Speed: 8/BBS: 0.91/Mass: 40 -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Harpy"]/statBases</xpath>
-					<value>
-						<MeleeCritChance>1.14</MeleeCritChance>
-						<MeleeParryChance>1.06</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Harpy"]/statBases/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>1.31</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Harpy"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>0.84</cooldownTime>
-								<linkedBodyPartsGroup>LeftClawsHarpy</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>0.84</cooldownTime>
-								<linkedBodyPartsGroup>LeftClawsHarpy</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>0.84</cooldownTime>
-								<linkedBodyPartsGroup>RightClawsHarpy</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>0.84</cooldownTime>
-								<linkedBodyPartsGroup>RightClawsHarpy</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.32</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.1</chanceFactor>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Harpy"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/SYR Naga/Patch_Ammo_44Magnum_Naga.xml b/Patches/SYR Naga/Patch_Ammo_44Magnum_Naga.xml
deleted file mode 100644
index a84847b62d..0000000000
--- a/Patches/SYR Naga/Patch_Ammo_44Magnum_Naga.xml	
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[SYR] Naga</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ========== .44 Magnum Charged for Naga Revolver ========== -->
-
-						<ThingCategoryDef>
-							<defName>Ammo44MagnumCharged</defName>
-							<label>.44 Magnum Charged</label>
-							<parent>AmmoAdvanced</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_44MagnumCharged</defName>
-							<label>.44 Magnum Charged</label>
-							<ammoTypes>
-								<Ammo_44MagnumCharged>Bullet_44MagnumCharged</Ammo_44MagnumCharged>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="44MagnumChargedBase" ParentName="SpacerSmallAmmoBase" Abstract="True">
-							<description>Charged shot ammo used by low velocity, high power charge weapons.</description>
-							<statBases>
-								<Mass>0.023</Mass>
-								<Bulk>0.02</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>Ammo44MagnumCharged</li>
-							</thingCategories>
-							<stackLimit>5000</stackLimit>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="44MagnumChargedBase">
-							<defName>Ammo_44MagnumCharged</defName>
-							<label>.44 Magnum Charged cartridge</label>
-							<graphicData>
-								<texPath>Things/Ammo/Charged/SmallRegular</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.67</MarketValue>
-							</statBases>
-							<ammoClass>Charged</ammoClass>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="Base6x18mmChargedBullet">
-							<defName>Bullet_44MagnumCharged</defName>
-							<label>.44 Magnum Charged bullet</label>
-							<graphicData>
-								<texPath>Things/Weapon/Bullet_Plasma</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>13</damageAmountBase>
-								<speed>160</speed>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_44MagnumCharged</defName>
-							<label>make .44 Magnum Charged cartridge x500</label>
-							<description>Craft 500 .44 Magnum Charged cartridges.</description>
-							<jobString>Making .44 Magnum Charged cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>6</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>5</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>6</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Plasteel</li>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_44MagnumCharged>500</Ammo_44MagnumCharged>
-							</products>
-							<workAmount>7000</workAmount>
-						</RecipeDef>
-
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/SYR Naga/Patch_Ammo_Naga.xml b/Patches/SYR Naga/Patch_Ammo_Naga.xml
deleted file mode 100644
index 120c45f501..0000000000
--- a/Patches/SYR Naga/Patch_Ammo_Naga.xml	
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[SYR] Naga</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ========== 6x18mm Charged for Naga SMG ========== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_6x18mmCharged_NagaSMG</defName>
-							<label>6x18mm Charged</label>
-							<ammoTypes>
-								<Ammo_6x18mmCharged>Bullet_6x18mmCharged_NagaSMG</Ammo_6x18mmCharged>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef ParentName="Base6x18mmChargedBullet">
-							<defName>Bullet_6x18mmCharged_NagaSMG</defName>
-							<label>6x18mm Charged bullet</label>
-							<graphicData>
-								<texPath>Things/Weapon/Bullet_Plasma</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>10</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>3</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<!-- ========== 12 Gauge Charged for Naga Shotgun ========== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_12GaugeCharged_NagaShotgun</defName>
-							<label>12 Gauge Charged</label>
-							<ammoTypes>
-								<Ammo_12GaugeCharged>Bullet_12GaugeCharged_NagaShotgun</Ammo_12GaugeCharged>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef ParentName="Base12GaugeChargedBullet">
-							<defName>Bullet_12GaugeCharged_NagaShotgun</defName>
-							<label>charge shot pellet</label>
-							<graphicData>
-								<texPath>Things/Weapon/Bullet_PlasmaBlast</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>15</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>5</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>32.4</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<!-- ========== 5x35mm Charged for Naga Rifle ========== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_5x35mmCharged_NagaRifle</defName>
-							<label>5x35mm Charged</label>
-							<ammoTypes>
-								<Ammo_5x35mmCharged>Bullet_5x35mmCharged_NagaRifle</Ammo_5x35mmCharged>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- Workaround for conditionally-patched projectiles: use an existing abstract class from the generic ammo library (In this case, Base8x35mmChargedBullet) -->
-						<ThingDef ParentName="Base8x35mmChargedBullet">
-							<defName>Bullet_5x35mmCharged_NagaRifle</defName>
-							<label>5x35mm Charged bullet</label>
-							<graphicData>
-								<texPath>Things/Weapon/Bullet_Plasma</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>13</damageAmountBase>
-								<speed>200</speed>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>2</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-								<armorPenetrationBlunt>60</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<!-- ========== 8x35mm Charged for Naga Sniper Rifle ========== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_8x35mmCharged_NagaSniper</defName>
-							<label>8x35mm Charged</label>
-							<ammoTypes>
-								<Ammo_8x35mmCharged>Bullet_8x35mmCharged_NagaSniper</Ammo_8x35mmCharged>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef ParentName="Base8x35mmChargedBullet">
-							<defName>Bullet_8x35mmCharged_NagaSniper</defName>
-							<label>8x35mm Charged bullet</label>
-							<graphicData>
-								<texPath>Things/Weapon/Bullet_Plasma</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>19</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>6</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>14</armorPenetrationSharp>
-								<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/SYR Naga/Patch_Bodies_Naga.xml b/Patches/SYR Naga/Patch_Bodies_Naga.xml
deleted file mode 100644
index 7090d24568..0000000000
--- a/Patches/SYR Naga/Patch_Bodies_Naga.xml	
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<!-- Naga bodyDef -->
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[SYR] Naga</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Add new parts ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel = "left arm"]/groups</xpath>
-					<value>
-						<li>LeftArm</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel = "right arm"]/groups</xpath>
-					<value>
-						<li>RightArm</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[customLabel = "left shoulder"]/groups</xpath>
-					<value>
-						<li>LeftShoulder</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[customLabel = "right shoulder"]/groups</xpath>
-					<value>
-						<li>RightShoulder</li>
-					</value>
-				</li>
-
-				<!-- ========== Adjust Coverages ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[def="Ribcage"]/coverage</xpath>
-					<value>
-						<coverage>0.07</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[def="Pelvis"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[def="Stomach"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[def="Heart"]/coverage</xpath>
-					<value>
-						<coverage>0.04</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[def="Lung"]/coverage</xpath>
-					<value>
-						<coverage>0.055</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[def="Kidney"]/coverage</xpath>
-					<value>
-						<coverage>0.03</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[def="Liver"]/coverage</xpath>
-					<value>
-						<coverage>0.06</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[def="Neck"]/coverage</xpath>
-					<value>
-						<coverage>0.055</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Skull"]/parts/li[def="Brain"]/coverage</xpath>
-					<value>
-						<coverage>0.9</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Eye"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/coverage</xpath>
-					<value>
-						<coverage>0.08</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[def="Shoulder"]/coverage</xpath>
-					<value>
-						<coverage>0.085</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Clavicle"]/coverage</xpath>
-					<value>
-						<coverage>0.06</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Humerus"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Naga_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Radius"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/SYR Naga/Patch_PawnKinds_Naga.xml b/Patches/SYR Naga/Patch_PawnKinds_Naga.xml
deleted file mode 100644
index bfe086a114..0000000000
--- a/Patches/SYR Naga/Patch_PawnKinds_Naga.xml	
+++ /dev/null
@@ -1,379 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<!-- Naga Pawn Kinds -->
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[SYR] Naga</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Naga_Colonist -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Naga_Colonist"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>3</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>100</min>
-										<max>200</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- Naga_Refugee -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Naga_Refugee"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>3</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>100</min>
-										<max>200</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- Naga_Wanderer -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Naga_Wanderer"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>3</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>100</min>
-										<max>200</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- Naga_Trader -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Naga_Trader"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>4</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>100</min>
-										<max>200</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- Naga_Drifter -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Naga_Drifter"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>200</min>
-								<max>400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.9</shieldChance>
-						</li>
-					</value>
-				</li>
-
-				<!-- Naga_Grenadier_Destructive -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Naga_Grenadier_Destructive"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>150</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- Naga_Mercenary_Gunner -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Naga_Mercenary_Gunner"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>4</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>200</min>
-										<max>400</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- Naga_Mercenary_Sniper -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Naga_Mercenary_Sniper"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>3</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>200</min>
-										<max>400</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- Naga_Mercenary_Heavy -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Naga_Mercenary_Heavy"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>3</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>200</min>
-										<max>400</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- Naga_Boss -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Naga_Boss"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>4</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>400</min>
-										<max>500</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- Naga_Mercenary_Elite -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Naga_Mercenary_Elite"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>4</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>400</min>
-										<max>500</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- Naga_Archer -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Naga_Archer"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>10</min>
-								<max>40</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>100</min>
-								<max>140</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.6</shieldChance>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>40</min>
-										<max>80</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Tribal</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- Naga_Hunter -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Naga_Hunter"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>10</min>
-								<max>60</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>100</min>
-								<max>180</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.6</shieldChance>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>80</min>
-										<max>160</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Tribal</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- Naga_HeavyArcher -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Naga_HeavyArcher"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>10</min>
-								<max>80</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>100</min>
-								<max>200</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.6</shieldChance>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>100</min>
-										<max>200</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Tribal</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- Naga_Warrior -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Naga_Warrior"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>100</min>
-								<max>200</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.9</shieldChance>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/SYR Naga/Patch_Race_Naga.xml b/Patches/SYR Naga/Patch_Race_Naga.xml
deleted file mode 100644
index 52add82332..0000000000
--- a/Patches/SYR Naga/Patch_Race_Naga.xml	
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[SYR] Naga</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Naga"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Naga"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Naga"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Naga"]/statBases/Mass</xpath>
-					<!-- Nagas are too light in the original mod, only 80kg for a 5.5m THICC snake -->
-					<value>
-						<Mass>100</Mass>
-					</value>
-				</li>
-
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Naga"]/statBases</xpath>
-					<!-- Stats are calculated for a 5.5m long, 340kg Naga -->
-					<value>
-						<UnarmedDamage>0.9</UnarmedDamage>
-						<MeleeCritChance>1.23</MeleeCritChance>
-						<MeleeParryChance>1.21</MeleeParryChance>
-						<MeleeDodgeChance>1.24</MeleeDodgeChance>
-						<AimingAccuracy>1.1</AimingAccuracy>
-						<Suppressability>1.2</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Naga"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<chanceFactor>0.25</chanceFactor>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<chanceFactor>0.25</chanceFactor>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>fangs</label>
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>Fangs</linkedBodyPartsGroup>
-								<chanceFactor>1</chanceFactor>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>tail</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>3.17</cooldownTime>
-								<linkedBodyPartsGroup>TailAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Naga"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/SYR Naga/Patch_Scenarios_Naga.xml b/Patches/SYR Naga/Patch_Scenarios_Naga.xml
deleted file mode 100644
index 344ff8d513..0000000000
--- a/Patches/SYR Naga/Patch_Scenarios_Naga.xml	
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[SYR] Naga</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="NagaScenario"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_44MagnumCharged</thingDef>
-							<count>60</count>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/SYR Naga/Patch_ThingsMachining_Naga.xml b/Patches/SYR Naga/Patch_ThingsMachining_Naga.xml
deleted file mode 100644
index 8bdd52ab2a..0000000000
--- a/Patches/SYR Naga/Patch_ThingsMachining_Naga.xml	
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<!-- Naga Things -->
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[SYR] Naga</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== Flak Tail Armor ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_FlakTailArmor"]/statBases</xpath>
-					<value>
-						<Bulk>7</Bulk>
-						<WornBulk>4</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_FlakTailArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_FlakTailArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>21</ArmorRating_Blunt>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/SYR Naga/Patch_ThingsMisc_Naga.xml b/Patches/SYR Naga/Patch_ThingsMisc_Naga.xml
deleted file mode 100644
index 4eb2a60cb2..0000000000
--- a/Patches/SYR Naga/Patch_ThingsMisc_Naga.xml	
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<!-- Naga Prosthetics -->
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[SYR] Naga</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Bionic Naga Tail ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BionicNagaTail"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>bionic naga tail</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>2.64</cooldownTime>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Archotech Naga Tail ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ArchotechNagaTail"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>archotech naga tail</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>1.76</cooldownTime>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/SYR Naga/Patch_ThingsWeapons_Naga.xml b/Patches/SYR Naga/Patch_ThingsWeapons_Naga.xml
deleted file mode 100644
index b2d27fbd44..0000000000
--- a/Patches/SYR Naga/Patch_ThingsWeapons_Naga.xml	
+++ /dev/null
@@ -1,324 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<!-- Naga Weapons -->
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[SYR] Naga</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Naga Revolver ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_NagaRevolver</defName>
-					<statBases>
-						<Mass>1.45</Mass>
-						<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>2.41</Bulk>
-						<WorkToMake>4000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<Jade>10</Jade>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_44MagnumCharged</defaultProjectile>
-						<warmupTime>0.7</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_44MagnumCharged</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>SimpleNagaGun</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>true</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Naga SMG ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_NagaSMG</defName>
-					<statBases>
-						<Mass>2.5</Mass>
-						<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>0.75</SwayFactor>
-						<Bulk>4.50</Bulk>
-						<WorkToMake>11000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>75</Steel>
-						<Jade>20</Jade>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
-						<warmupTime>0.7</warmupTime>
-						<range>12</range>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_6x18mmCharged_NagaSMG</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>SimpleNagaGun</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>true</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Naga Shotgun ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_NagaShotgun</defName>
-					<statBases>
-						<Mass>3.4</Mass>
-						<RangedWeapon_Cooldown>1.1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.20</SwayFactor>
-						<Bulk>9.00</Bulk>
-						<WorkToMake>12000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>60</Steel>
-						<Jade>20</Jade>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12GaugeCharged</defaultProjectile>
-						<warmupTime>0.9</warmupTime>
-						<range>16</range>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>15</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4.25</reloadTime>
-						<ammoSet>AmmoSet_12GaugeCharged_NagaShotgun</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>SimpleNagaGun</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>true</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Naga Rifle ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_NagaRifle</defName>
-					<statBases>
-						<Mass>3.5</Mass>
-						<RangedWeapon_Cooldown>1.4</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.20</SwayFactor>
-						<Bulk>8.00</Bulk>
-						<WorkToMake>40000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>60</Steel>
-						<Jade>35</Jade>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_5x35mmCharged</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>55</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_5x35mmCharged_NagaRifle</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>AdvancedNagaGun</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>true</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Naga Sniper Rifle ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_NagaSniper</defName>
-					<statBases>
-						<Mass>4</Mass>
-						<RangedWeapon_Cooldown>2.3</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.60</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.90</SwayFactor>
-						<Bulk>12.00</Bulk>
-						<WorkToMake>45000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>60</Steel>
-						<Jade>35</Jade>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
-						<warmupTime>2.0</warmupTime>
-						<range>75</range>
-						<soundCast>NagaSniperShot</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>15</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_8x35mmCharged_NagaSniper</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>NagaSniper</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Gun_NagaSMG" or
-						defName="Gun_NagaShotgun" or
-						defName="Gun_NagaRifle" or
-						defName="Gun_NagaSniper"
-						]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_NagaRevolver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Saclean Race/Bodies/Saclean_Bodytype.xml b/Patches/Saclean Race/Bodies/Saclean_Bodytype.xml
deleted file mode 100644
index bf71848939..0000000000
--- a/Patches/Saclean Race/Bodies/Saclean_Bodytype.xml	
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-
-			<!--Saclean Bodytype-->
-
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>[1.4]Saclean Race</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--Arm Groups-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Saclean_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
-							<value>
-								<li>LeftArm</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Saclean_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
-							<value>
-								<li>RightArm</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Saclean_Body"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
-							<value>
-								<li>LeftShoulder</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Saclean_Body"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
-							<value>
-								<li>RightShoulder</li>
-							</value>
-						</li>
-
-						<!--Natural Armor-->
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Saclean_Body"]/corePart/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Saclean_Body"]/corePart/parts/li[def="Saclean_Wing"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Saclean_Body"]/corePart/parts/li[def="Neck"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Saclean_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Saclean_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Saclean_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Saclean_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Saclean_Body"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Saclean_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Saclean_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Saclean_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Saclean_Body"]/corePart/parts/li[def="Leg"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Saclean_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Saclean_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Saclean Race/PawnKindDefs/Saclean_PawnKind.xml b/Patches/Saclean Race/PawnKindDefs/Saclean_PawnKind.xml
deleted file mode 100644
index 86f7e4871c..0000000000
--- a/Patches/Saclean Race/PawnKindDefs/Saclean_PawnKind.xml	
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[1.4]Saclean Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--Ammo-->
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[
-								@Name="HAR_Saclean_KindBase_NPC"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>6</max>
-									</primaryMagazineCount>
-								</li>
-							</value>
-						</li>
-
-						<!--Backpack-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="CE_Apparel_Backpack"]/apparel/tags</xpath>
-							<value>
-								<li>HAR_SL_Apparel</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Saclean Race/ThingDefs_Misc/Saclean_Apparel.xml b/Patches/Saclean Race/ThingDefs_Misc/Saclean_Apparel.xml
deleted file mode 100644
index 9194e59562..0000000000
--- a/Patches/Saclean Race/ThingDefs_Misc/Saclean_Apparel.xml	
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[1.4]Saclean Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HAR_SL_O_a"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>0.25</StuffEffectMultiplierArmor>
-								<Bulk>0.5</Bulk>
-								<WornBulk>0.25</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_SL_Tops_a" or
-								defName="HAR_SL_Tops_b" or
-								defName="HAR_SL_Tops_c"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>0.5</StuffEffectMultiplierArmor>
-								<Bulk>1</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<!--Shell-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_SL_Shell_a" or
-								defName="HAR_SL_Shell_b" or
-								defName="HAR_SL_Shell_c"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-								<Bulk>10</Bulk>
-								<WornBulk>5</WornBulk>
-							</value>
-						</li>
-
-						<!--Overhead-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_SL_Heads_a" or
-								defName="HAR_SL_Heads_b" or
-								defName="HAR_SL_Heads_c"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-								<Bulk>1</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Saclean Race/ThingDefs_Races/AlienRace_Saclean.xml b/Patches/Saclean Race/ThingDefs_Races/AlienRace_Saclean.xml
deleted file mode 100644
index 8f27c15728..0000000000
--- a/Patches/Saclean Race/ThingDefs_Races/AlienRace_Saclean.xml	
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[1.4]Saclean Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="HAR_Saclean_BaseNRPawn"]/inspectorTabs/li[.="ITab_Pawn_Gear"]</xpath>
-							<value>
-								<li>CombatExtended.ITab_Inventory</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="HAR_Saclean_BaseNRPawn"]/comps</xpath>
-							<value>
-								<li Class="CombatExtended.CompProperties_Inventory" />
-								<li Class="CombatExtended.CompProperties_TacticalManager" />
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="HAR_Saclean_BaseNRPawn"]/comps</xpath>
-							<value>
-								<li>
-									<compClass>CombatExtended.CompPawnGizmo</compClass>
-								</li>
-								<li Class="CombatExtended.CompProperties_Suppressable" />
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Saclean"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Humanoid</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Saclean"]/statBases</xpath>
-							<value>
-								<Suppressability>1</Suppressability>
-								<SmokeSensitivity>1.2</SmokeSensitivity>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Saclean"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>1.33</cooldownTime>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.162</armorPenetrationBlunt>
-									</li>
-
-									<li Class="CombatExtended.ToolCE">
-										<label>right fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>1.33</cooldownTime>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.162</armorPenetrationBlunt>
-									</li>
-
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>4.49</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Saclean"]/alienRace/raceRestriction/whiteApparelList</xpath>
-							<value>
-								<li>CE_Apparel_TacVest</li>
-								<li>CE_Apparel_Backpack</li>
-								<li>CE_Apparel_TribalBackpack</li>
-								<li>CE_Apparel_BallisticShield</li>
-								<li>CE_Apparel_MeleeShield</li>
-								<li>CE_Apparel_GasMask</li>
-								<li>CE_Apparel_ImprovGasMask</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Saclean Race/ThingDes_Items/WoolDef.xml b/Patches/Saclean Race/ThingDes_Items/WoolDef.xml
deleted file mode 100644
index b4045265b3..0000000000
--- a/Patches/Saclean Race/ThingDes_Items/WoolDef.xml	
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[1.4]Saclean Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_SL_Wool"
-								]/statBases/StuffPower_Armor_Sharp </xpath>
-							<value>
-								<StuffPower_Armor_Sharp>0.28</StuffPower_Armor_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_SL_Wool"
-								]/statBases/StuffPower_Armor_Blunt </xpath>
-							<value>
-								<StuffPower_Armor_Blunt>0.07</StuffPower_Armor_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_SL_Wool"
-								]/statBases/StuffPower_Armor_Heat </xpath>
-							<value>
-								<StuffPower_Armor_Heat>0.20</StuffPower_Armor_Heat>
-								<StuffPower_Armor_Electric>0.10</StuffPower_Armor_Electric>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Salted Meat 2.0/Items_Meat.xml b/Patches/Salted Meat 2.0/Items_Meat.xml
deleted file mode 100644
index 30c748561c..0000000000
--- a/Patches/Salted Meat 2.0/Items_Meat.xml	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Salted Meat 2.0</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Give meat products appropriate bulk. -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SM_Sausage_Raw" or defName="SM_Sausage" or defName="SM_SaltedMeat"]/statBases</xpath>
-					<value>
-						<Bulk>0.20</Bulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Save Our Ship 2/Apparel_SOS2.xml b/Patches/Save Our Ship 2/Apparel_SOS2.xml
deleted file mode 100644
index 11a81532c2..0000000000
--- a/Patches/Save Our Ship 2/Apparel_SOS2.xml	
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Save Our Ship 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--  Survival Belt -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_SpaceSurvivalBelt"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<!--  EVA Suit -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitBody"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>4</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitBody"]/equippedStatOffsets</xpath>
-					<value>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-					</value>
-				</li>
-
-				<!--  EVA Helmet -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6.5</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>20</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!--  Heavy EVA Helmet -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmetHeavy"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmetHeavy"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>36</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmetHeavy"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmetHeavy"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmetHeavy"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmetHeavy"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmetHeavy"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>65</Plasteel>
-						<DevilstrandCloth>20</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmetHeavy"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmetHeavy"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmetHeavy"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>200</MaxHitPoints>
-					</value>
-				</li>
-
-				<!--  Heavy EVA Suit -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitBodyHeavy"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>230</Plasteel>
-						<DevilstrandCloth>20</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitBodyHeavy"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitBodyHeavy"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>45</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitBodyHeavy"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitBodyHeavy"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>400</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitBodyHeavy"]/statBases/Mass</xpath>
-					<value>
-						<Mass>50</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitBodyHeavy"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>10</CarryBulk>
-						<CarryWeight>80</CarryWeight>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Save Our Ship 2/ArchoCreatures_SOS2.xml b/Patches/Save Our Ship 2/ArchoCreatures_SOS2.xml
deleted file mode 100644
index cee8946a24..0000000000
--- a/Patches/Save Our Ship 2/ArchoCreatures_SOS2.xml	
+++ /dev/null
@@ -1,753 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Save Our Ship 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Archocat"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-							<!-- ========== Archocat : Non-combat Type ========== -->
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="Archocat"]/statBases</xpath>
-								<value>
-									<MeleeDodgeChance>0.23</MeleeDodgeChance>
-									<MeleeCritChance>0.02</MeleeCritChance>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="Archocat"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>left claw</label>
-											<capacities>
-												<li>Scratch</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>0.55</cooldownTime>
-											<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-											<surpriseAttack>
-												<extraMeleeDamages>
-													<li>
-														<def>Stun</def>
-														<amount>20</amount>
-													</li>
-												</extraMeleeDamages>
-											</surpriseAttack>
-											<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
-											<armorPenetrationSharp>0.01</armorPenetrationSharp>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right claw</label>
-											<capacities>
-												<li>Scratch</li>
-											</capacities>
-											<power>2</power>
-											<cooldownTime>0.55</cooldownTime>
-											<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-											<surpriseAttack>
-												<extraMeleeDamages>
-													<li>
-														<def>Stun</def>
-														<amount>20</amount>
-													</li>
-												</extraMeleeDamages>
-											</surpriseAttack>
-											<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
-											<armorPenetrationSharp>0.01</armorPenetrationSharp>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<capacities>
-												<li>Bite</li>
-											</capacities>
-											<power>5</power>
-											<cooldownTime>0.85</cooldownTime>
-											<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-											<surpriseAttack>
-												<extraMeleeDamages>
-													<li>
-														<def>Stun</def>
-														<amount>20</amount>
-													</li>
-												</extraMeleeDamages>
-											</surpriseAttack>
-											<armorPenetrationBlunt>0.254</armorPenetrationBlunt>
-											<armorPenetrationSharp>0.03</armorPenetrationSharp>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>0.55</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/ThingDef[defName="Archocat"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>Quadruped</bodyShape>
-									</li>
-								</value>
-							</li>
-
-							<!-- ========== Archomutt : Combat Type ========== -->
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="Archomutt"]/statBases</xpath>
-								<value>
-									<MeleeDodgeChance>0.22</MeleeDodgeChance>
-									<MeleeCritChance>0.05</MeleeCritChance>
-									<MeleeParryChance>0.04</MeleeParryChance>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="Archomutt"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>left claw</label>
-											<capacities>
-												<li>Scratch</li>
-											</capacities>
-											<power>16</power>
-											<cooldownTime>0.52</cooldownTime>
-											<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
-											<armorPenetrationSharp>2.16</armorPenetrationSharp>
-											<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right claw</label>
-											<capacities>
-												<li>Scratch</li>
-											</capacities>
-											<power>16</power>
-											<cooldownTime>0.52</cooldownTime>
-											<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
-											<armorPenetrationSharp>2.16</armorPenetrationSharp>
-											<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<capacities>
-												<li>Bite</li>
-											</capacities>
-											<power>47</power>
-											<cooldownTime>0.97</cooldownTime>
-											<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-											<armorPenetrationSharp>0.68</armorPenetrationSharp>
-											<armorPenetrationBlunt>27.04</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>6</power>
-											<cooldownTime>0.75</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>2</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/ThingDef[defName="Archomutt"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>Quadruped</bodyShape>
-									</li>
-								</value>
-							</li>
-
-							<!-- ========== Archostrich : Combat Type ========== -->
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="Archostrich"]/statBases</xpath>
-								<value>
-									<MeleeDodgeChance>0.19</MeleeDodgeChance>
-									<MeleeCritChance>0.16</MeleeCritChance>
-									<MeleeParryChance>0.10</MeleeParryChance>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="Archostrich"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>claws</label>
-											<capacities>
-												<li>Cut</li>
-											</capacities>
-											<power>26</power>
-											<cooldownTime>0.89</cooldownTime>
-											<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-											<surpriseAttack>
-												<extraMeleeDamages>
-													<li>
-														<def>Stun</def>
-														<amount>20</amount>
-													</li>
-												</extraMeleeDamages>
-											</surpriseAttack>
-											<armorPenetrationSharp>16</armorPenetrationSharp>
-											<armorPenetrationBlunt>4</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<capacities>
-												<li>Bite</li>
-											</capacities>
-											<power>19</power>
-											<cooldownTime>1.97</cooldownTime>
-											<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-											<chanceFactor>0.5</chanceFactor>
-											<armorPenetrationSharp>0.08</armorPenetrationSharp>
-											<armorPenetrationBlunt>12</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>20</power>
-											<cooldownTime>1.78</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>8</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-							<!-- ========== Archoffalo : Non-Combat ========== -->
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="Archoffalo"]/statBases</xpath>
-								<value>
-									<MeleeDodgeChance>0.12</MeleeDodgeChance>
-									<MeleeCritChance>0.27</MeleeCritChance>
-									<MeleeParryChance>0.20</MeleeParryChance>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="Archoffalo"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>24</power>
-											<cooldownTime>3.17</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>10</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/ThingDef[defName="Archoffalo"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>Quadruped</bodyShape>
-									</li>
-								</value>
-							</li>
-
-							<!-- ========== Megaspider : Combat Type ========== -->
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="Archospider"]/statBases/MoveSpeed</xpath>
-								<value>
-									<MoveSpeed>5</MoveSpeed>
-									<MeleeDodgeChance>0.07</MeleeDodgeChance>
-									<MeleeCritChance>0.25</MeleeCritChance>
-									<MeleeParryChance>0.17</MeleeParryChance>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="Archospider"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<capacities>
-												<li>Stab</li>
-											</capacities>
-											<power>25</power>
-											<cooldownTime>1.48</cooldownTime>
-											<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-											<chanceFactor>1.5</chanceFactor>
-											<armorPenetrationSharp>60</armorPenetrationSharp>
-											<armorPenetrationBlunt>30</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<capacities>
-												<li>Cut</li>
-											</capacities>
-											<power>61</power>
-											<cooldownTime>1.65</cooldownTime>
-											<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-											<armorPenetrationSharp>11.25</armorPenetrationSharp>
-											<armorPenetrationBlunt>8.438</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>10</power>
-											<cooldownTime>2.48</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationSharp>40</armorPenetrationSharp>
-											<armorPenetrationBlunt>20</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="Archospider"]/statBases/ArmorRating_Blunt</xpath>
-								<value>
-									<ArmorRating_Blunt>48</ArmorRating_Blunt>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="Archospider"]/statBases/ArmorRating_Sharp</xpath>
-								<value>
-									<ArmorRating_Sharp>16</ArmorRating_Sharp>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="Archospider"]/race/body</xpath>
-								<value>
-									<body>CE_ArmoredBeetleLikeWithClaw</body>
-								</value>
-							</li>
-
-							<!-- ========== Archolope : Non-Combat ========== -->
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/ThingDef[defName="Archolope"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>Quadruped</bodyShape>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="Archolope"]/statBases</xpath>
-								<value>
-									<MeleeDodgeChance>0.05</MeleeDodgeChance>
-									<MeleeCritChance>0.07</MeleeCritChance>
-									<MeleeParryChance>0.16</MeleeParryChance>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="Archolope"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>5</power>
-											<cooldownTime>1.97</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-							<!-- ========== Archotortoise : Combat Type ========== -->
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/ThingDef[defName="Tortoise"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>QuadrupedLow</bodyShape>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="Archotortoise"]/statBases/MoveSpeed</xpath>
-								<value>
-									<MoveSpeed>3.0</MoveSpeed>
-									<MeleeDodgeChance>0.02</MeleeDodgeChance>
-									<MeleeCritChance>0.01</MeleeCritChance>
-									<MeleeParryChance>0.05</MeleeParryChance>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="Archotortoise"]/statBases/ArmorRating_Blunt</xpath>
-								<value>
-									<ArmorRating_Blunt>45</ArmorRating_Blunt>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="Archotortoise"]/statBases/ArmorRating_Sharp</xpath>
-								<value>
-									<ArmorRating_Sharp>20</ArmorRating_Sharp>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="Archotortoise"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<capacities>
-												<li>Bite</li>
-											</capacities>
-											<power>19</power>
-											<cooldownTime>1.33</cooldownTime>
-											<linkedBodyPartsGroup>TurtleBeakAttackTool</linkedBodyPartsGroup>
-											<armorPenetrationSharp>0.21</armorPenetrationSharp>
-											<armorPenetrationBlunt>5.12</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>3</power>
-											<cooldownTime>0.83</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>0.768</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-							<!-- ========== Archeopanda : Non-Combat ========== -->
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/ThingDef[defName="Archopanda"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>Quadruped</bodyShape>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="Archopanda"]/statBases</xpath>
-								<value>
-									<MeleeDodgeChance>0.15</MeleeDodgeChance>
-									<MeleeCritChance>0.19</MeleeCritChance>
-									<MeleeParryChance>0.11</MeleeParryChance>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="Archopanda"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>left claw</label>
-											<capacities>
-												<li>Scratch</li>
-											</capacities>
-											<power>21</power>
-											<cooldownTime>1.41</cooldownTime>
-											<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-											<surpriseAttack>
-												<extraMeleeDamages>
-													<li>
-														<def>Stun</def>
-														<amount>21</amount>
-													</li>
-												</extraMeleeDamages>
-											</surpriseAttack>
-											<armorPenetrationSharp>0.15</armorPenetrationSharp>
-											<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right claw</label>
-											<capacities>
-												<li>Scratch</li>
-											</capacities>
-											<power>21</power>
-											<cooldownTime>1.41</cooldownTime>
-											<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-											<surpriseAttack>
-												<extraMeleeDamages>
-													<li>
-														<def>Stun</def>
-														<amount>21</amount>
-													</li>
-												</extraMeleeDamages>
-											</surpriseAttack>
-											<armorPenetrationSharp>0.15</armorPenetrationSharp>
-											<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<capacities>
-												<li>Bite</li>
-											</capacities>
-											<power>31</power>
-											<cooldownTime>2.05</cooldownTime>
-											<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-											<surpriseAttack>
-												<extraMeleeDamages>
-													<li>
-														<def>Stun</def>
-														<amount>21</amount>
-													</li>
-												</extraMeleeDamages>
-											</surpriseAttack>
-											<armorPenetrationSharp>0.85</armorPenetrationSharp>
-											<armorPenetrationBlunt>8.450</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>12</power>
-											<cooldownTime>2.22</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>4.235</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-							<!-- ========== Archojerboa : Non-Combat ========== -->
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/ThingDef[defName="Archojerboa"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>QuadrupedLow</bodyShape>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="Archojerboa"]/statBases/MoveSpeed</xpath>
-								<value>
-									<MeleeDodgeChance>0.2</MeleeDodgeChance>
-									<MeleeCritChance>0.01</MeleeCritChance>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="Archojerboa"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>left claw</label>
-											<capacities>
-												<li>Scratch</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.69</cooldownTime>
-											<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.013</armorPenetrationBlunt>
-											<armorPenetrationSharp>0.01</armorPenetrationSharp>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right claw</label>
-											<capacities>
-												<li>Scratch</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>1.69</cooldownTime>
-											<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.013</armorPenetrationBlunt>
-											<armorPenetrationSharp>0.01</armorPenetrationSharp>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<capacities>
-												<li>Bite</li>
-											</capacities>
-											<power>4</power>
-											<cooldownTime>0.95</cooldownTime>
-											<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-											<armorPenetrationSharp>0.09</armorPenetrationSharp>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>1</power>
-											<cooldownTime>3.00</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
-											<armorPenetrationSharp>0</armorPenetrationSharp>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-							<!-- ========== Archothrumbo : Combat Type ========== -->
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="Archothrumbo"]/statBases</xpath>
-								<value>
-									<MeleeDodgeChance>0.09</MeleeDodgeChance>
-									<MeleeCritChance>0.76</MeleeCritChance>
-									<MeleeParryChance>0.45</MeleeParryChance>
-									<Flammability>0.6</Flammability>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="Archothrumbo"]/statBases/ArmorRating_Blunt</xpath>
-								<value>
-									<ArmorRating_Blunt>63</ArmorRating_Blunt>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="Archothrumbo"]/statBases/ArmorRating_Sharp</xpath>
-								<value>
-									<ArmorRating_Sharp>28</ArmorRating_Sharp>
-								</value>
-							</li>
-
-							<!--Heavy Plasma sword as horn, Zeushammers as feet-->
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="Archothrumbo"]/tools</xpath>
-								<value>
-									<tools>
-										<li Class="CombatExtended.ToolCE">
-											<label>horn</label>
-											<capacities>
-												<li>Cut</li>
-											</capacities>
-											<power>66</power>
-											<extraMeleeDamages>
-												<li>
-													<def>Flame</def>
-													<amount>5</amount>
-													<chance>0.3</chance>
-												</li>
-											</extraMeleeDamages>
-											<cooldownTime>2.76</cooldownTime>
-											<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-											<armorPenetrationSharp>51.2</armorPenetrationSharp>
-											<armorPenetrationBlunt>10.24</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>horn</label>
-											<capacities>
-												<li>Stab</li>
-											</capacities>
-											<power>30</power>
-											<extraMeleeDamages>
-												<li>
-													<def>Flame</def>
-													<amount>3</amount>
-													<chance>0.2</chance>
-												</li>
-											</extraMeleeDamages>
-											<cooldownTime>1.4</cooldownTime>
-											<chanceFactor>0.65</chanceFactor>
-											<linkedBodyPartsGroup>HornAttackTool_2</linkedBodyPartsGroup>
-											<armorPenetrationSharp>129.6</armorPenetrationSharp>
-											<armorPenetrationBlunt>12.96</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>left foot</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>41</power>
-											<extraMeleeDamages>
-												<li>
-													<def>EMP</def>
-													<amount>5</amount>
-												</li>
-											</extraMeleeDamages>
-											<cooldownTime>2.76</cooldownTime>
-											<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>157.5</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>right foot</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>41</power>
-											<extraMeleeDamages>
-												<li>
-													<def>EMP</def>
-													<amount>5</amount>
-												</li>
-											</extraMeleeDamages>
-											<cooldownTime>2.76</cooldownTime>
-											<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-											<armorPenetrationBlunt>157.5</armorPenetrationBlunt>
-										</li>
-										<li Class="CombatExtended.ToolCE">
-											<label>head</label>
-											<capacities>
-												<li>Blunt</li>
-											</capacities>
-											<power>37</power>
-											<cooldownTime>1.26</cooldownTime>
-											<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-											<chanceFactor>0.2</chanceFactor>
-											<armorPenetrationBlunt>16</armorPenetrationBlunt>
-										</li>
-									</tools>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/ThingDef[defName="Archothrumbo"]</xpath>
-								<value>
-									<li Class="CombatExtended.RacePropertiesExtensionCE">
-										<bodyShape>Birdlike</bodyShape>
-									</li>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Save Our Ship 2/Creatures_SOS2.xml b/Patches/Save Our Ship 2/Creatures_SOS2.xml
deleted file mode 100644
index 286882609f..0000000000
--- a/Patches/Save Our Ship 2/Creatures_SOS2.xml	
+++ /dev/null
@@ -1,310 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Save Our Ship 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Base Space Insect ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="BaseInsectSpace"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="BaseInsectSpace"]/statBases</xpath>
-					<value>
-						<SmokeSensitivity>0</SmokeSensitivity>
-					</value>
-				</li>
-
-				<!-- ========== Astromite ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Astromite"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4.7</MoveSpeed>
-						<MeleeDodgeChance>0.14</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Astromite"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Astromite"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Astromite"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Astromite"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>0.3</baseHealthScale>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Astromite"]/combatPower</xpath>
-					<value>
-						<combatPower>20</combatPower>
-					</value>
-				</li>
-
-				<!-- ========== Stellapede ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Stellapede"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4.3</MoveSpeed>
-						<MeleeDodgeChance>0.08</MeleeDodgeChance>
-						<MeleeCritChance>0.12</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Stellapede"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.78</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.14</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Stellapede"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Stellapede"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Stellapede"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>1.2</baseHealthScale>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Stellapede"]/combatPower</xpath>
-					<value>
-						<combatPower>80</combatPower>
-					</value>
-				</li>
-
-				<!-- ========== Cosmopillar ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Cosmopillar"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4.5</MoveSpeed>
-						<MeleeDodgeChance>0.07</MeleeDodgeChance>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>0.17</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Cosmopillar"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>43</power>
-								<cooldownTime>2.48</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.750</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Cosmopillar"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>12</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Cosmopillar"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Cosmopillar"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>1.8</baseHealthScale>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Cosmopillar"]/combatPower</xpath>
-					<value>
-						<combatPower>130</combatPower>
-					</value>
-				</li>
-
-				<!-- ========== Base Shuttle ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="BaseShuttle"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Vehicle</bodyShape>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="BaseShuttle"]/statBases</xpath>
-					<value>
-						<SmokeSensitivity>0</SmokeSensitivity>
-					</value>
-				</li>
-
-				<!-- ========== Shuttles Armor & Melee ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ShuttlePersonalRace" or
-						defName="ShuttleCargoRace" or
-						defName="ShuttleHeavyRace"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>45</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ShuttlePersonalRace" or
-						defName="ShuttleCargoRace" or
-						defName="ShuttleHeavyRace"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>13</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="ShuttlePersonalRace" or
-						defName="ShuttleCargoRace" or
-						defName="ShuttleHeavyRace"
-						]/verbs </xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ShuttlePersonalRace" or
-						defName="ShuttleCargoRace" or
-						defName="ShuttleHeavyRace"
-						] </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>hull</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>3.51</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Save Our Ship 2/Hediffs_SOS2.xml b/Patches/Save Our Ship 2/Hediffs_SOS2.xml
deleted file mode 100644
index 33f4aa9268..0000000000
--- a/Patches/Save Our Ship 2/Hediffs_SOS2.xml	
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Save Our Ship 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="SoSPsychicPredictor"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/HediffDef[defName="SoSPsychicPredictor"]/stages/li/statOffsets</xpath>
-								<value>
-									<statOffsets>
-										<ShootingAccuracyPawn>+1</ShootingAccuracyPawn>
-										<AimingAccuracy>+0.5</AimingAccuracy>
-										<MeleeDodgeChance>1</MeleeDodgeChance>
-										<MeleeCritChance>0.4</MeleeCritChance>
-										<MeleeParryChance>0.5</MeleeParryChance>
-										<Suppressability>-0.50</Suppressability>
-									</statOffsets>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/HediffDef[defName="SoSArchotechSkin"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-								<value>
-									<ArmorRating_Sharp>3</ArmorRating_Sharp>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/HediffDef[defName="SoSArchotechSkin"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-								<value>
-									<ArmorRating_Blunt>4.5</ArmorRating_Blunt>
-									<ArmorRating_Electric>0.4</ArmorRating_Electric>
-								</value>
-							</li>
-						</operations>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/HediffDef[defName="SoSHologramArchotech"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/HediffDef[defName="SoSHologramArchotech"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-								<value>
-									<ArmorRating_Sharp>12.0</ArmorRating_Sharp>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/HediffDef[defName="SoSHologramArchotech"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-								<value>
-									<ArmorRating_Blunt>16.0</ArmorRating_Blunt>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Save Our Ship 2/HologramRace_SOS2.xml b/Patches/Save Our Ship 2/HologramRace_SOS2.xml
deleted file mode 100644
index 34c25381a7..0000000000
--- a/Patches/Save Our Ship 2/HologramRace_SOS2.xml	
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Save Our Ship 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="SoSHologramRace"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SoSHologramRace"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<SmokeSensitivity>0</SmokeSensitivity>
-						<Suppressability>0</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SoSHologramRace"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="SoSHologramRace"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="SoSHologramRace"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SoSHologramRace"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Hologram Laser === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>HologramLaser</defName>
-					<statBases>
-						<Bulk>0.01</Bulk>
-						<SwayFactor>1.17</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>2.6</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Laser_Hologram</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>16</range>
-						<soundCast>ShipCombatLaser</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>4</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Hologram Sword === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="HologramSword"]/tools</xpath>
-					<value>
-						<tools>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.1</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<extraMeleeDamages>
-									<li>
-										<def>Flame</def>
-										<amount>6</amount>
-										<chance>0.4</chance>
-									</li>
-								</extraMeleeDamages>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.1</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<extraMeleeDamages>
-									<li>
-										<def>Flame</def>
-										<amount>10</amount>
-										<chance>0.6</chance>
-									</li>
-								</extraMeleeDamages>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="HologramSword"]/statBases</xpath>
-					<value>
-						<MeleeCounterParryBonus>0.8</MeleeCounterParryBonus>
-						<Bulk>0.01</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="HologramSword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.00</MeleeCritChance>
-							<MeleeParryChance>0.60</MeleeParryChance>
-							<MeleeDodgeChance>0.40</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- === Archo Hologram Blast === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>HologramLaserArchotech</defName>
-					<statBases>
-						<Bulk>0.01</Bulk>
-						<SwayFactor>1.17</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>2.85</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Archoblast</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>26</range>
-						<soundCast>ShipCombatLaser</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>0</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Save Our Ship 2/Holograms_Projectiles.xml b/Patches/Save Our Ship 2/Holograms_Projectiles.xml
deleted file mode 100644
index 39b10be1da..0000000000
--- a/Patches/Save Our Ship 2/Holograms_Projectiles.xml	
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Save Our Ship 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- === Projectiles === -->
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletBlue">
-							<defName>Bullet_Laser_Hologram</defName>
-							<label>hologram laser</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>CE_Laser</damageDef>
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationSharp>12.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt><!-- The overall pressure exerted by a laser beam striking something is, unsuprisingly, negligable. -->
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base40x46mmGrenadeBullet">
-							<defName>Bullet_Archoblast</defName>
-							<label>archoblast</label>
-							<graphicData>
-								<texPath>Things/Building/Ship/HullPlateTransparent</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>3</explosionRadius>
-								<speed>999</speed>
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>20</damageAmountBase>
-								<extraDamages>
-									<li>
-										<def>EMP</def>
-										<amount>5</amount>
-										<chance>1</chance>
-									</li>
-									<li>
-										<def>Flame</def>
-										<amount>5</amount>
-										<chance>1</chance>
-									</li>
-								</extraDamages>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Save Our Ship 2/Patch_DamageDefs_SOS2.xml b/Patches/Save Our Ship 2/Patch_DamageDefs_SOS2.xml
deleted file mode 100644
index efb0b0602d..0000000000
--- a/Patches/Save Our Ship 2/Patch_DamageDefs_SOS2.xml	
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Save Our Ship 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[
-						defName="ShipPlasmaSmall" or
-						defName="BombKinetic"
-						]/defaultArmorPenetration </xpath>
-					<value>
-						<defaultArmorPenetration>150</defaultArmorPenetration>
-					</value>
-				</li>
-
-				<!-- Small lasers do low damage and are unlikely to kill -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/DamageDef[
-						defName="ShipLaserSmall" or
-						defName="ShipLaserTwo" or
-						defName="BombKineticLarge" or
-						defName="ShipPlasmaLarge"
-						]/defaultArmorPenetration </xpath>
-					<value>
-						<defaultArmorPenetration>500</defaultArmorPenetration>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Save Our Ship 2/PawnKindsDefs_SOS2.xml b/Patches/Save Our Ship 2/PawnKindsDefs_SOS2.xml
deleted file mode 100644
index 733d463abd..0000000000
--- a/Patches/Save Our Ship 2/PawnKindsDefs_SOS2.xml	
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Save Our Ship 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="SpaceCannibal"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>4</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="SpaceCrew"]/apparelMoney</xpath>
-					<value>
-						<apparelMoney>
-							<min>400</min>
-							<max>800</max>
-						</apparelMoney>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="SpaceCrew"]/weaponMoney</xpath>
-					<value>
-						<weaponMoney>
-							<min>150</min>
-							<max>300</max>
-						</weaponMoney>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="SpaceCrew"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>2</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="SpaceCrewMarine"]/weaponMoney</xpath>
-					<value>
-						<weaponMoney>
-							<min>500</min>
-							<max>900</max>
-						</weaponMoney>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="SpaceCrewMarine"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>4</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="SpaceCrewMarineHeavy"]/weaponMoney</xpath>
-					<value>
-						<weaponMoney>
-							<min>600</min>
-							<max>1300</max>
-						</weaponMoney>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="SpaceCrewMarineHeavy"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>400</min>
-										<max>800</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="SpaceCrewMarineHeavy"]/combatPower</xpath>
-					<value>
-						<combatPower>280</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Empire_Fighter_Marine_Space"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/PawnKindDef[defName="Empire_Fighter_Marine_Space"]</xpath>
-								<value>
-									<li Class="CombatExtended.LoadoutPropertiesExtension">
-										<primaryMagazineCount>
-											<min>4</min>
-											<max>8</max>
-										</primaryMagazineCount>
-										<sidearms>
-											<li>
-												<generateChance>0.5</generateChance>
-												<sidearmMoney>
-													<min>150</min>
-													<max>350</max>
-												</sidearmMoney>
-												<weaponTags>
-													<li>CE_Sidearm_Melee</li>
-												</weaponTags>
-											</li>
-										</sidearms>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/PawnKindDef[defName="Empire_Fighter_Cataphract_Space"]</xpath>
-								<value>
-									<li Class="CombatExtended.LoadoutPropertiesExtension">
-										<primaryMagazineCount>
-											<min>5</min>
-											<max>9</max>
-										</primaryMagazineCount>
-										<sidearms>
-											<li>
-												<generateChance>0.5</generateChance>
-												<sidearmMoney>
-													<min>300</min>
-													<max>500</max>
-												</sidearmMoney>
-												<weaponTags>
-													<li>CE_Sidearm_Melee</li>
-												</weaponTags>
-											</li>
-										</sidearms>
-									</li>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Save Our Ship 2/Scenarios_SOS2.xml b/Patches/Save Our Ship 2/Scenarios_SOS2.xml
deleted file mode 100644
index 94f72a3ff3..0000000000
--- a/Patches/Save Our Ship 2/Scenarios_SOS2.xml	
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Save Our Ship 2</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="SoSDerelict"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_303British_FMJ</thingDef>
-							<count>100</count>
-						</li>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_44Magnum_FMJ</thingDef>
-							<count>60</count>
-						</li>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_6x24mmCharged</thingDef>
-							<count>180</count>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="SoSDungeon"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_303British_FMJ</thingDef>
-							<count>100</count>
-						</li>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_44Magnum_FMJ</thingDef>
-							<count>60</count>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Save Our Ship 2/Ships_SOS2.xml b/Patches/Save Our Ship 2/Ships_SOS2.xml
deleted file mode 100644
index 414a978297..0000000000
--- a/Patches/Save Our Ship 2/Ships_SOS2.xml	
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Save Our Ship 2</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Because the starting ships can generate with charge rifles, they should really generate with ammo for them, too. -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/EnemyShipDef[defName="StartShipA"]/symbolTable</xpath>
-					<value>
-						<li>
-							<key>/</key>
-							<value>
-								<shapeOrDef>Ammo_6x24mmCharged</shapeOrDef>
-							</value>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/EnemyShipDef[defName="StartShipB"]/symbolTable</xpath>
-					<value>
-						<li>
-							<key>*</key>
-							<value>
-								<shapeOrDef>Ammo_6x24mmCharged</shapeOrDef>
-							</value>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/EnemyShipDef[defName="StartShipC"]/symbolTable</xpath>
-					<value>
-						<li>
-							<key>*</key>
-							<value>
-								<shapeOrDef>Ammo_6x24mmCharged</shapeOrDef>
-							</value>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/EnemyShipDef[defName="StartShipD"]/symbolTable</xpath>
-					<value>
-						<li>
-							<key>*</key>
-							<value>
-								<shapeOrDef>Ammo_6x24mmCharged</shapeOrDef>
-							</value>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/EnemyShipDef[defName="StartShipE"]/symbolTable</xpath>
-					<value>
-						<li>
-							<key>*</key>
-							<value>
-								<shapeOrDef>Ammo_6x24mmCharged</shapeOrDef>
-							</value>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/EnemyShipDef[defName="StartShipF"]/symbolTable</xpath>
-					<value>
-						<li>
-							<key>*</key>
-							<value>
-								<shapeOrDef>Ammo_6x24mmCharged</shapeOrDef>
-							</value>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/EnemyShipDef[defName="StartShipK_Infested"]/symbolTable</xpath>
-					<value>
-						<li>
-							<key>*</key>
-							<value>
-								<shapeOrDef>Ammo_6x24mmCharged</shapeOrDef>
-							</value>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Save Our Ship 2/Weapons_Grenades.xml b/Patches/Save Our Ship 2/Weapons_Grenades.xml
deleted file mode 100644
index 5388c23ec9..0000000000
--- a/Patches/Save Our Ship 2/Weapons_Grenades.xml	
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Save Our Ship 2</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Proj_GrenadeMechanite"]</xpath>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<!-- ========== Molotov cocktail ========== -->
-
-							<!-- Projectile -->
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="Proj_GrenadeMechanite"]/graphicData/texPath</xpath>
-								<value>
-									<texPath>Things/Projectile/Grenades/Molotov</texPath>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="Proj_GrenadeMechanite"]</xpath>
-								<value>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<explosionRadius>0.5</explosionRadius>
-										<damageDef>BombMechanite</damageDef>
-										<damageAmountBase>10</damageAmountBase>
-										<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
-										<preExplosionSpawnChance>1</preExplosionSpawnChance>
-										<speed>12</speed>
-										<ai_IsIncendiary>true</ai_IsIncendiary>
-									</projectile>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="Proj_GrenadeMechanite"]</xpath>
-								<value>
-									<thingClass>CombatExtended.Projectile_FireTrail</thingClass>
-								</value>
-							</li>
-
-							<!-- Grenade -->
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="Weapon_GrenadeMechanite"]/label</xpath>
-								<value>
-									<label>mechanite cocktail</label>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="Weapon_GrenadeMechanite"]/graphicData</xpath>
-								<value>
-									<graphicData>
-										<texPath>Things/Ammo/HandGrenades/Molotov</texPath>
-										<graphicClass>Graphic_StackCount</graphicClass>
-										<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
-									</graphicData>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="Weapon_GrenadeMechanite"]</xpath>
-								<value>
-									<thingClass>CombatExtended.AmmoThing</thingClass>
-									<stackLimit>50</stackLimit>
-									<resourceReadoutPriority>First</resourceReadoutPriority>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAttributeSet">
-								<xpath>Defs/ThingDef[defName="Weapon_GrenadeMechanite"]</xpath>
-								<attribute>Class</attribute>
-								<value>CombatExtended.AmmoDef</value>
-							</li>
-
-							<li Class="PatchOperationConditional">
-								<xpath>Defs/ThingDef[defName="Weapon_GrenadeMechanite"]/comps</xpath>
-								<nomatch Class="PatchOperationAdd">
-									<xpath>Defs/ThingDef[defName="Weapon_GrenadeMechanite"]</xpath>
-									<value>
-										<comps />
-									</value>
-								</nomatch>
-							</li>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="Weapon_GrenadeMechanite"]/comps</xpath>
-								<value>
-									<li Class="CombatExtended.CompProperties_ExplosiveCE">
-										<damageAmountBase>1</damageAmountBase>
-										<explosiveDamageType>Flame</explosiveDamageType>
-										<explosiveRadius>0.5</explosiveRadius>
-										<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
-										<preExplosionSpawnChance>1</preExplosionSpawnChance>
-									</li>
-								</value>
-							</li>
-
-							<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-								<defName>Weapon_GrenadeMechanite</defName>
-								<statBases>
-									<Mass>0.6</Mass>
-									<Bulk>2.55</Bulk>
-									<MarketValue>7.05</MarketValue>
-									<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-									<SightsEfficiency>1.0</SightsEfficiency>
-								</statBases>
-								<Properties>
-									<label>throw molotov</label>
-									<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<range>10</range>
-									<minRange>4</minRange>
-									<warmupTime>0.8</warmupTime>
-									<noiseRadius>4</noiseRadius>
-									<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-									<soundCast>ThrowMolotovCocktail</soundCast>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<defaultProjectile>Proj_GrenadeMechanite</defaultProjectile>
-									<onlyManualCast>true</onlyManualCast>
-									<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-								</Properties>
-								<weaponTags>
-									<li>CE_OneHandedWeapon</li>
-								</weaponTags>
-							</li>
-
-							<!--Vanilla Textures Expanded - Save Our Ship 2-->
-
-							<li Class="PatchOperationFindMod">
-								<mods>
-									<li>Vanilla Textures Expanded - Save Our Ship 2</li>
-								</mods>
-								<match Class="PatchOperationSequence">
-									<operations>
-										<li Class="PatchOperationReplace">
-											<xpath>Defs/ThingDef[defName="Proj_GrenadeMechanite"]/graphicData/texPath</xpath>
-											<value>
-												<texPath>Things/Item/GrenadeMechanite_Thrown</texPath>
-											</value>
-										</li>
-
-										<li Class="PatchOperationReplace">
-											<xpath>Defs/ThingDef[defName="Weapon_GrenadeMechanite"]/graphicData</xpath>
-											<value>
-												<graphicData>
-													<texPath>Things/Ammo/HandGrenades/GrenadeMechanite</texPath>
-													<graphicClass>Graphic_StackCount</graphicClass>
-													<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
-												</graphicData>
-											</value>
-										</li>
-
-										<li Class="PatchOperationReplace">
-											<xpath>Defs/ThingDef[defName="Weapon_GrenadeMechanite"]/label</xpath>
-											<value>
-												<label>mechanite grenade</label>
-											</value>
-										</li>
-									</operations>
-								</match>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Seren from Stardust/Bodies_Seren.xml b/Patches/Seren from Stardust/Bodies_Seren.xml
deleted file mode 100644
index 306c6108f0..0000000000
--- a/Patches/Seren from Stardust/Bodies_Seren.xml	
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Alien/Race] Seren, from Stardust</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Seren_Body"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Seren_Body"]/corePart/parts/li[def = "Neck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Seren_Body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Seren_Body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Jaw"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Seren_Body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Nose"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Seren_Body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Ear"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Seren_Body"]/corePart/parts/li[def = "Shoulder"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Seren_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Seren_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Seren_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/parts/li[def = "Finger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Seren_Body"]/corePart/parts/li[def = "Leg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Seren_Body"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Seren_Body"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/parts/li[def = "Toe"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Seren from Stardust/PawnKinds_Seren.xml b/Patches/Seren from Stardust/PawnKinds_Seren.xml
deleted file mode 100644
index 7bb243d9cf..0000000000
--- a/Patches/Seren from Stardust/PawnKinds_Seren.xml	
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Alien/Race] Seren, from Stardust</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="SerenModel"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="SerenRoughModel"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>7</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Seren from Stardust/Scenarios.xml b/Patches/Seren from Stardust/Scenarios.xml
deleted file mode 100644
index 442dc947a9..0000000000
--- a/Patches/Seren from Stardust/Scenarios.xml	
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Alien/Race] Seren, from Stardust</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Add ammunition to RimCities starting scenarios -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="SerenRelocated"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_303British_FMJ</thingDef>
-							<count>100</count>
-						</li>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_44Magnum_FMJ</thingDef>
-							<count>60</count>
-						</li>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_45ACP_FMJ</thingDef>
-							<count>70</count>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Seren from Stardust/Seren_Race.xml b/Patches/Seren from Stardust/Seren_Race.xml
deleted file mode 100644
index 6c1087f031..0000000000
--- a/Patches/Seren from Stardust/Seren_Race.xml	
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[Alien/Race] Seren, from Stardust</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Seren"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Seren"]/statBases/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>1.1</MeleeDodgeChance>
-						<MeleeCritChance>0.9</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Seren"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.193</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>16</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.193</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>16</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.07</chanceFactor>
-								<soundMeleeHit>Pawn_Melee_HumanBite_Hit</soundMeleeHit>
-								<soundMeleeMiss>Pawn_Melee_HumanBite_Miss</soundMeleeMiss>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Checking if "Seren" has a <comps> node and adding it if it doesn't exist -->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Seren"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Seren"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Seren"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Sergal/Ammo_Sergal_LeadBall.xml b/Patches/Sergal/Ammo_Sergal_LeadBall.xml
deleted file mode 100644
index 350bc2bf3e..0000000000
--- a/Patches/Sergal/Ammo_Sergal_LeadBall.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Sergals Gnolls Lions and Frogs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ==================== AmmoCategory and ThingCategory ==================== -->
-
-						<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>AmmoSergalLeadBall</defName>
-							<label>lead ball</label>
-							<parent>AmmoNeolithic</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Sergal_LeadBall</defName>
-							<label>lead ball</label>
-							<ammoTypes>
-								<Ammo_Sergal_LeadBall>Bullet_Sergal_LeadBall</Ammo_Sergal_LeadBall>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="NeolithicAmmoBase">
-							<defName>Ammo_Sergal_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>AmmoSergalLeadBall</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>
-
-						<!-- ================== Projectiles ================== -->
-
-						<!-- Workaround for conditionally-patched projectiles: use an existing abstract class from the generic ammo library (In this case, BaseSlingBullet) -->
-
-						<ThingDef ParentName="BaseSlingBullet">
-							<defName>Bullet_Sergal_LeadBall</defName>
-							<label>lead ball</label>
-							<graphicData>
-								<texPath>Things/Projectile/Sling/Steel</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>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_Sergal_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_Sergal_LeadBall>500</Ammo_Sergal_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/Sergal/Drugs.xml b/Patches/Sergal/Drugs.xml
deleted file mode 100644
index 1bf9af07cd..0000000000
--- a/Patches/Sergal/Drugs.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Sergals Gnolls Lions and Frogs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Patch item bulk ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Beamers"]/statBases</xpath>
-					<value>
-						<!-- Equivalent to vanilla pill drugs -->
-						<Bulk>0.01</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="FrogleafJoint"]/statBases</xpath>
-					<value>
-						<!-- Equivalent to vanilla Smokeleaf Joints -->
-						<Bulk>0.05</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GodsBlood"]/statBases</xpath>
-					<value>
-						<!-- Equivalent to a 12.7mm diameter syringe or .50 BMG cartridge -->
-						<Bulk>0.14</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Sniff"]/statBases</xpath>
-					<value>
-						<!-- Equivalent to vanilla Yayo -->
-						<Bulk>0.05</Bulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Sergal/Gnoll_Weps.xml b/Patches/Sergal/Gnoll_Weps.xml
deleted file mode 100644
index d466849872..0000000000
--- a/Patches/Sergal/Gnoll_Weps.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Sergals Gnolls Lions and Frogs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Gnoll Scythe ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gnythe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.35</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.7</cooldownTime>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.6</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>29</power>
-								<cooldownTime>1.7</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>2.592</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.58</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Gnythe"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1</MeleeCritChance>
-							<MeleeParryChance>1.5</MeleeParryChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Gnythe"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<MeleeCounterParryBonus>2.25</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<!-- ========== War Gnythe ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gnythewar"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.35</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.6</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>1.5</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>2.592</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.58</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Gnythewar"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1</MeleeCritChance>
-							<MeleeParryChance>1.5</MeleeParryChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Gnythewar"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<MeleeCounterParryBonus>2.25</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Sergal/Lion_Weps_Ranged.xml b/Patches/Sergal/Lion_Weps_Ranged.xml
deleted file mode 100644
index d1446bcc69..0000000000
--- a/Patches/Sergal/Lion_Weps_Ranged.xml
+++ /dev/null
@@ -1,225 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Sergals Gnolls Lions and Frogs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== Pride Gauss Rifle (CE implementation based on MRG-5 Rifle from Glitter Tech) ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>LionWep_Gauss</defName>
-					<statBases>
-						<Bulk>6.88</Bulk>
-						<Mass>3.60</Mass>
-						<SwayFactor>1.05</SwayFactor>
-						<ShotSpread>0.09</ShotSpread>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<WorkToMake>72000</WorkToMake>
-					</statBases>
-					<costList>
-						<Plasteel>60</Plasteel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-						<ComponentSpacer>3</ComponentSpacer>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6mmRailgun_Sabot</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>86</range>
-						<soundCast>LionGauss</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_6mmRailgun</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-				</li>
-
-				<!-- ========== Pride Machinegun (CE implementation based on M249 LMG, rechambered for 6mm Railgun sabots) ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>LionWep_Chaingauss</defName>
-					<statBases>
-						<Bulk>13.35</Bulk>
-						<Mass>7.50</Mass>
-						<SwayFactor>1.27</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>2.21</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
-						<WorkToMake>82000</WorkToMake>
-					</statBases>
-					<costList>
-						<Plasteel>120</Plasteel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-						<ComponentSpacer>4</ComponentSpacer>
-					</costList>
-					<Properties>
-						<recoilAmount>0.94</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6mmRailgun_Sabot</defaultProjectile>
-						<warmupTime>1.475</warmupTime>
-						<range>75</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>LionGauss</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>200</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_6mmRailgun</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-
-				</li>
-
-				<!-- ========== Pride Pistol (CE implementation based on Desert Eagle, rechambered for the Sergal mod's own "prothene acid" bullet) ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>LionWep_HandyGun</defName>
-					<statBases>
-						<Bulk>2.73</Bulk>
-						<Mass>2.00</Mass>
-						<SwayFactor>1.58</SwayFactor>
-						<ShotSpread>0.16</ShotSpread>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<WorkToMake>32000</WorkToMake>
-					</statBases>
-					<costList>
-						<Plasteel>80</Plasteel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-						<ComponentSpacer>2</ComponentSpacer>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Lion_Wet_Bullet</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>LionPistol</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-					</Properties>
-
-					<!-- Treat this as an infinite-ammo weapon, as "prothene acid" bullets are too weird to warrant defining a mod-unique ammo item -->
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="LionWep_HandyGun"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Patch prothene acid bullet -->
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="Lion_Wet_Bullet"]/projectile</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.ProjectilePropertiesCE</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Lion_Wet_Bullet"]/projectile</xpath>
-					<value>
-						<!-- Sharp/blunt penetration equivalent to .50 AE (AP), so that the acid has a chance to eat through armor and clothing  -->
-						<armorPenetrationSharp>16</armorPenetrationSharp>
-						<armorPenetrationBlunt>38.480</armorPenetrationBlunt>
-					</value>
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="LionWep_Gauss" or
-						defName="LionWep_Chaingauss"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Sergal/PawnKinds_Frog.xml b/Patches/Sergal/PawnKinds_Frog.xml
deleted file mode 100644
index 7b2df0058f..0000000000
--- a/Patches/Sergal/PawnKinds_Frog.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Sergals Gnolls Lions and Frogs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="FrogRefugee" or
-						defName="FrogSlave"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>20</min>
-								<max>40</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="FrogTracker" or
-						defName="FrogTrader"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>20</min>
-								<max>40</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>100</min>
-										<max>600</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Tribal</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="FrogHunter" or
-						defName="FrogPackLeader" or
-						defName="FrogRanger" or
-						defName="FrogRecruit" or
-						defName="FrogScavenger" or
-						defName="FrogSentinel"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>30</min>
-								<max>50</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>120</min>
-								<max>160</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.6</shieldChance>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>100</min>
-										<max>600</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Tribal</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Sergal/PawnKinds_Gnoll.xml b/Patches/Sergal/PawnKinds_Gnoll.xml
deleted file mode 100644
index 256cfb437d..0000000000
--- a/Patches/Sergal/PawnKinds_Gnoll.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Sergals Gnolls Lions and Frogs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="GnollRefugee" or
-						defName="GnollSlave"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>20</min>
-								<max>40</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="GnollTracker" or
-						defName="GnollTrader"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>20</min>
-								<max>40</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>100</min>
-										<max>600</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Tribal</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="GnollHunter" or
-						defName="GnollPackLeader" or
-						defName="GnollRanger" or
-						defName="GnollRecruit" or
-						defName="GnollScavenger" or
-						defName="GnollSentinel"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>30</min>
-								<max>50</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>120</min>
-								<max>160</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.6</shieldChance>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>100</min>
-										<max>600</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Tribal</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Sergal/PawnKinds_GnollTribe.xml b/Patches/Sergal/PawnKinds_GnollTribe.xml
deleted file mode 100644
index 1339a6ca42..0000000000
--- a/Patches/Sergal/PawnKinds_GnollTribe.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Sergals Gnolls Lions and Frogs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[@Name="GnollTribalBase"]</xpath>
-					<value>
-						<apparelRequired>
-							<li>CE_Apparel_TribalBackpack</li>
-						</apparelRequired>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="Gnoll_Archer" or
-						defName="Gnoll_ChiefRanged" or
-						defName="Gnoll_HeavyArcher" or
-						defName="Gnoll_Hunter"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>20</min>
-								<max>40</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>100</min>
-										<max>600</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Tribal</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Sergal/PawnKinds_Lions.xml b/Patches/Sergal/PawnKinds_Lions.xml
deleted file mode 100644
index a772ed3b67..0000000000
--- a/Patches/Sergal/PawnKinds_Lions.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Sergals Gnolls Lions and Frogs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Add backpacks to list of allowed apparel for Lion race -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Lion"]/alienRace/raceRestriction/whiteApparelList</xpath>
-					<value>
-						<li>CE_Apparel_Backpack</li>
-					</value>
-				</li>
-
-				<!-- Spawn backpacks for selected Lion pawntypes -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[
-						defName="LionColonist" or
-						defName="LionCommando" or
-						defName="LionCommandoElite" or
-						defName="LionHunter" or
-						defName="LionPackLeader" or
-						defName="LionRecruit" or
-						defName="LionSecurityGuard" or
-						defName="LionTrader"
-						] </xpath>
-					<value>
-						<apparelRequired>
-							<li>CE_Apparel_Backpack</li>
-						</apparelRequired>
-					</value>
-				</li>
-
-				<!-- Spawn different combinations of primary ammo, secondary weapon and ammo for various Lion pawntypes -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="LionCivBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>4</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="LionMilBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>7</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<magazineCount>
-										<min>2</min>
-										<max>3</max>
-									</magazineCount>
-									<weaponTags>
-										<li>CE_Sidearm</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Sergal/PawnKinds_Sergal.xml b/Patches/Sergal/PawnKinds_Sergal.xml
deleted file mode 100644
index 808354fa2b..0000000000
--- a/Patches/Sergal/PawnKinds_Sergal.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Sergals Gnolls Lions and Frogs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Spawn backpacks for selected Sergal pawntypes -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[
-						defName="SergalColonist" or
-						defName="SergalCommando" or
-						defName="SergalCommandoElite" or
-						defName="SergalHunter" or
-						defName="SergalPackLeader" or
-						defName="SergalRecruit" or
-						defName="SergalSecurityGuard" or
-						defName="SergalTrader"
-						] </xpath>
-					<value>
-						<apparelRequired>
-							<li>CE_Apparel_Backpack</li>
-						</apparelRequired>
-					</value>
-				</li>
-
-				<!-- Spawn different combinations of primary ammo, secondary weapon and ammo for various Sergal pawntypes -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="SergalRefugee" or
-						defName="SergalSlave"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>4</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="SergalColonist" or
-						defName="SergalCommando" or
-						defName="SergalCommandoElite" or
-						defName="SergalHunter" or
-						defName="SergalPackLeader" or
-						defName="SergalRecruit" or
-						defName="SergalSecurityGuard" or
-						defName="SergalTrader"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>1</generateChance>
-									<magazineCount>
-										<min>2</min>
-										<max>3</max>
-									</magazineCount>
-									<weaponTags>
-										<li>CE_Sidearm</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Sergal/PawnKinds_SergalNME.xml b/Patches/Sergal/PawnKinds_SergalNME.xml
deleted file mode 100644
index 8ae8936cd2..0000000000
--- a/Patches/Sergal/PawnKinds_SergalNME.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Sergals Gnolls Lions and Frogs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Spawn backpacks for selected Sergal NME pawntypes -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[
-						defName="SergalColonistNME" or
-						defName="SergalCommandoNME" or
-						defName="SergalCommandoEliteNME" or
-						defName="SergalHunterNME" or
-						defName="SergalPackLeaderNME" or
-						defName="SergalRecruitNME" or
-						defName="SergalSecurityGuardNME" or
-						defName="SergalTraderNME"
-						] </xpath>
-					<value>
-						<apparelRequired>
-							<li>CE_Apparel_Backpack</li>
-						</apparelRequired>
-					</value>
-				</li>
-
-				<!-- Spawn different combinations of primary ammo, secondary weapon and ammo for various Sergal NME pawntypes -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="SergalRefugeeNME" or
-						defName="SergalSlaveNME"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>4</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="SergalColonistNME" or
-						defName="SergalCommandoNME" or
-						defName="SergalCommandoEliteNME" or
-						defName="SergalHunterNME" or
-						defName="SergalPackLeaderNME" or
-						defName="SergalRecruitNME" or
-						defName="SergalSecurityGuardNME" or
-						defName="SergalTraderNME"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>1</generateChance>
-									<magazineCount>
-										<min>2</min>
-										<max>3</max>
-									</magazineCount>
-									<weaponTags>
-										<li>CE_Sidearm</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Sergal/PawnKinds_SergalTribe.xml b/Patches/Sergal/PawnKinds_SergalTribe.xml
deleted file mode 100644
index e1d97c7d9e..0000000000
--- a/Patches/Sergal/PawnKinds_SergalTribe.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Sergals Gnolls Lions and Frogs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[@Name="SergalTribalBase"]</xpath>
-					<value>
-						<apparelRequired>
-							<li>CE_Apparel_TribalBackpack</li>
-						</apparelRequired>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="Sergal_Tribal_Archer" or
-						defName="Sergal_Tribal_ChiefRanged" or
-						defName="Sergal_Tribal_HeavyArcher" or
-						defName="Sergal_Tribal_Hunter"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>20</min>
-								<max>40</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>100</min>
-										<max>600</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Tribal</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Sergal/PawnKinds_StripedGnoll.xml b/Patches/Sergal/PawnKinds_StripedGnoll.xml
deleted file mode 100644
index 6c8f7bb304..0000000000
--- a/Patches/Sergal/PawnKinds_StripedGnoll.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Sergals Gnolls Lions and Frogs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="StripedGnollRefugee" or
-						defName="StripedGnollSlave"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>20</min>
-								<max>40</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="StripedGnollTracker" or
-						defName="StripedGnollTrader"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>20</min>
-								<max>40</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>100</min>
-										<max>600</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Tribal</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="StripedGnollHunter" or
-						defName="StripedGnollPackLeader" or
-						defName="StripedGnollRanger" or
-						defName="StripedGnollRecruit" or
-						defName="StripedGnollScavenger" or
-						defName="StripedGnollSentinel"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>30</min>
-								<max>50</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>120</min>
-								<max>160</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.6</shieldChance>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>100</min>
-										<max>600</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Tribal</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Sergal/PawnKinds_StripedGnollTribe.xml b/Patches/Sergal/PawnKinds_StripedGnollTribe.xml
deleted file mode 100644
index bb1bbd11ad..0000000000
--- a/Patches/Sergal/PawnKinds_StripedGnollTribe.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Sergals Gnolls Lions and Frogs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[@Name="StripedGnollTribalBase"]</xpath>
-					<value>
-						<apparelRequired>
-							<li>CE_Apparel_TribalBackpack</li>
-						</apparelRequired>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="StripedGnoll_Archer" or
-						defName="StripedGnoll_ChiefRanged" or
-						defName="StripedGnoll_HeavyArcher" or
-						defName="StripedGnoll_Hunter"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>20</min>
-								<max>40</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>100</min>
-										<max>600</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Tribal</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Sergal/Race_Frog.xml b/Patches/Sergal/Race_Frog.xml
deleted file mode 100644
index ccc4eb8581..0000000000
--- a/Patches/Sergal/Race_Frog.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Sergals Gnolls Lions and Frogs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Frog"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Frog"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.9</AimingAccuracy>
-						<MeleeDodgeChance>2.5</MeleeDodgeChance>
-						<MeleeCritChance>1.25</MeleeCritChance>
-						<MeleeParryChance>1.75</MeleeParryChance>
-						<ReloadSpeed>0.85</ReloadSpeed>
-						<Suppressability>0.25</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Frog"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>0.95</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetration>0.16</armorPenetration>
-								<armorPenetrationBlunt>1.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Frog"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Frog"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Frog"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Sergal/Race_Gnoll.xml b/Patches/Sergal/Race_Gnoll.xml
deleted file mode 100644
index 7c5c2a4497..0000000000
--- a/Patches/Sergal/Race_Gnoll.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Sergals Gnolls Lions and Frogs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_SGnoll"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_SGnoll"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.9</AimingAccuracy>
-						<MeleeDodgeChance>2.5</MeleeDodgeChance>
-						<MeleeCritChance>1.25</MeleeCritChance>
-						<MeleeParryChance>1.75</MeleeParryChance>
-						<ReloadSpeed>0.85</ReloadSpeed>
-						<Suppressability>0.25</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_SGnoll"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.73</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.43</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.225</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_SGnoll"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_SGnoll"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_SGnoll"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Sergal/Race_Lion.xml b/Patches/Sergal/Race_Lion.xml
deleted file mode 100644
index a8d77945bd..0000000000
--- a/Patches/Sergal/Race_Lion.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Sergals Gnolls Lions and Frogs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Lion"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Lion"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.9</AimingAccuracy>
-						<MeleeDodgeChance>2.5</MeleeDodgeChance>
-						<MeleeCritChance>1.25</MeleeCritChance>
-						<MeleeParryChance>1.75</MeleeParryChance>
-						<ReloadSpeed>0.85</ReloadSpeed>
-						<Suppressability>0.25</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Lion"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Lion"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Lion"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Lion"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Sergal/Race_Sergal.xml b/Patches/Sergal/Race_Sergal.xml
deleted file mode 100644
index e980326f28..0000000000
--- a/Patches/Sergal/Race_Sergal.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Sergals Gnolls Lions and Frogs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="Alien_Sergal" or
-						defName="Alien_SergalNME"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="Alien_Sergal" or
-						defName="Alien_SergalNME"
-						]/statBases </xpath>
-					<value>
-						<AimingAccuracy>0.9</AimingAccuracy>
-						<MeleeDodgeChance>2.5</MeleeDodgeChance>
-						<MeleeCritChance>1.25</MeleeCritChance>
-						<MeleeParryChance>1.75</MeleeParryChance>
-						<ReloadSpeed>1.5</ReloadSpeed>
-						<Suppressability>0.25</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="Alien_Sergal" or
-						defName="Alien_SergalNME"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Sergal" or defName="Alien_SergalNME"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Sergal" or defName="Alien_SergalNME"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="Alien_Sergal" or
-						defName="Alien_SergalNME"
-						]/comps </xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Sergal/Race_SergalNME.xml b/Patches/Sergal/Race_SergalNME.xml
deleted file mode 100644
index 5ef46a669f..0000000000
--- a/Patches/Sergal/Race_SergalNME.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Sergals and Gnolls</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Whats an NME? ========== -->
-
-				<!-- ========== Turn our NME boys into NME *boys*? ========== -->
-				<!-- ========== To be human is to be a tall brick 	  ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<!-- === Note to future furball compatibility nerds: 		=== -->
-					<!-- === Paste the defName of your horrible alien there   |	=== -->
-					<!-- === 												  V	=== -->
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_SergalNME"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Gives Gun Gizmos to Serg HUD thing ========== -->
-				<!-- ========== Also Makes Em Suppressable		   ========== -->
-
-				<!-- === Patch Serg default melee attacks === -->
-				<!-- === Sidewards eyeballs thrash depth perception === -->
-				<!-- === Sweet swipeys tho 	=== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_SergalNME"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.9</AimingAccuracy>
-						<MeleeDodgeChance>2.5</MeleeDodgeChance>
-						<MeleeCritChance>1.25</MeleeCritChance>
-						<MeleeParryChance>1.75</MeleeParryChance>
-						<ReloadSpeed>1.85</ReloadSpeed>
-						<Suppressability>0.25</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_SergalNME"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetration>0.15</armorPenetration>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetration>0.15</armorPenetration>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>0.95</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetration>0.16</armorPenetration>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ================================================= -->
-				<!-- === BaseBodySize, ArmorRatings, MoveSpeed, and BaseHealth should already be set. I think. === -->
-				<!-- ===================================== -->
-				<!-- === Adds In Inspector Tabs 	   === -->
-				<!-- === Inventory and all that jazz   === -->
-				<!-- === Again, no need to change 'em  === -->
-				<!-- === Unless you changed it         === -->
-				<!-- === then change 'em			   === -->
-
-			</operations>
-		</match>
-	</Operation>
-
-	<!-- === Congratulations! Your alien is Combat Ready!	 === -->
-	<!-- === If your alien comes with extra guns and gear,	 === -->
-	<!-- === Congratulations! You're not even close to done! === -->
-</Patch>
\ No newline at end of file
diff --git a/Patches/Sergal/Race_StripedGnoll.xml b/Patches/Sergal/Race_StripedGnoll.xml
deleted file mode 100644
index 49c693aef9..0000000000
--- a/Patches/Sergal/Race_StripedGnoll.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Sergals Gnolls Lions and Frogs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_StripedGnoll"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_StripedGnoll"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.9</AimingAccuracy>
-						<MeleeDodgeChance>2.5</MeleeDodgeChance>
-						<MeleeCritChance>1.25</MeleeCritChance>
-						<MeleeParryChance>1.75</MeleeParryChance>
-						<ReloadSpeed>1.85</ReloadSpeed>
-						<Suppressability>0.25</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_StripedGnoll"]/tools</xpath>
-					<value>
-						<tools>
-							<!-- Striped Gnolls don't have claws, as per original mod -->
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.73</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.43</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.225</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_StripedGnoll"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_StripedGnoll"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_StripedGnoll"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Sergal/Scenarios.xml b/Patches/Sergal/Scenarios.xml
deleted file mode 100644
index 1bb5d5f4c5..0000000000
--- a/Patches/Sergal/Scenarios.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Sergals Gnolls Lions and Frogs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Add ammo to various starting scenarios -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[
-						defName="ExiledLions_Scenario" or
-						defName="LostCommandoSergal_Scenario"
-						]/scenario/parts </xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_45ACP_FMJ</thingDef>
-							<count>100</count>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[
-						defName="LostCommandoSergal_Scenario" or
-						defName="Frog_Scenario"
-						]/scenario/parts </xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_303British_FMJ</thingDef>
-							<count>100</count>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="Frog_Scenario"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_44Magnum_FMJ</thingDef>
-							<count>100</count>
-						</li>
-					</value>
-				</li>
-
-				<!-- Remove starting apparel items from Frog scenario -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ScenarioDef[defName="Frog_Scenario"]/scenario/parts/li[thingDef="Apparel_AdvancedHelmet"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ScenarioDef[defName="Frog_Scenario"]/scenario/parts/li[thingDef="Apparel_FlakVest"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ScenarioDef[defName="Frog_Scenario"]/scenario/parts/li[thingDef="Apparel_FlakPants"]</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Sergal/Sergal_Apparel.xml b/Patches/Sergal/Sergal_Apparel.xml
deleted file mode 100644
index c8faa119e2..0000000000
--- a/Patches/Sergal/Sergal_Apparel.xml
+++ /dev/null
@@ -1,379 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Sergals Gnolls Lions and Frogs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Lion_Apparel_TribalA"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Cargo pants, Tucked-in button shirt and Suit pants ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Lion_Apparel_Cheap_Pants" or
-						defName="Lion_Apparel_CollarShirt" or
-						defName="Lion_Apparel_Pants"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Duster and Jacket ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Lion_Apparel_Duster" or
-						defName="Lion_Apparel_Jacket"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Lion_Apparel_Duster"]/statBases</xpath>
-					<value>
-						<Bulk>7.5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Lion_Apparel_Jacket"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<!-- ========== Lion armor vest ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakVest"]/label</xpath>
-					<value>
-						<label>lion armor vest</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakVest"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>3</WornBulk>
-						<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakVest"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>125</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakVest"]/statBases/Mass</xpath>
-					<value>
-						<Mass>13</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakVest"]/statBases/ArmorRating_Sharp</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakVest"]/statBases/ArmorRating_Blunt</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakVest"]/statBases/ArmorRating_Heat</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakVest"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<!-- Change recipe to stuffed -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakVest"]</xpath>
-					<value>
-						<costStuffCount>90</costStuffCount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakVest"]</xpath>
-					<value>
-						<stuffCategories>
-							<li>Steeled</li>
-						</stuffCategories>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakVest"]/recipeMaker/unfinishedThingDef</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakVest"]/costList/Steel</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakVest"]/costList/ComponentIndustrial</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakVest"]/colorGenerator</xpath>
-				</li>
-
-				<!-- ========== Lion flak pants ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakPants"]/description</xpath>
-					<value>
-						<description>Padded pants made from bullet-resistant materials. Provides limited protection against shrapnel and gunfire at relatively low weight.</description>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakPants"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>4</WornBulk>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakPants"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakPants"]/statBases/ArmorRating_Heat</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakPants"]/statBases/Insulation_Cold</xpath>
-					<value>
-						<StuffEffectMultiplierInsulation_Cold>0.2</StuffEffectMultiplierInsulation_Cold>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakPants"]/statBases/Insulation_Heat</xpath>
-					<value>
-						<StuffEffectMultiplierInsulation_Heat>0.08</StuffEffectMultiplierInsulation_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakPants"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>15</Steel>
-						</costList>
-						<stuffCategories>
-							<li>Fabric</li>
-						</stuffCategories>
-						<costStuffCount>50</costStuffCount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Lion_Apparel_FlakPants"]/equippedStatOffsets</xpath>
-				</li>
-
-				<!-- ========== Cheap power armor ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Lion_Apparel_CheapPowerArmor"]/statBases</xpath>
-					<value>
-						<Bulk>80</Bulk>
-						<WornBulk>12</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Lion_Apparel_CheapPowerArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>400</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Lion_Apparel_CheapPowerArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>40</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Lion_Apparel_CheapPowerArmor"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Lion_Apparel_CheapPowerArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Lion_Apparel_CheapPowerArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>40</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Lion_Apparel_CheapPowerArmor"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>40</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Lion_Apparel_CheapPowerArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>50</CarryWeight>
-							<CarryBulk>8</CarryBulk>
-							<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Lion_Apparel_CheapPowerArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<!-- ========== Lion honor guard armor and Lion elite armor ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="Lion_Apparel_PowerArmor" or
-						defName="Lion_Apparel_ExpensivePowerArmor"
-						]/statBases </xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Lion_Apparel_PowerArmor" or
-						defName="Lion_Apparel_ExpensivePowerArmor"
-						]/statBases/MaxHitPoints </xpath>
-					<value>
-						<MaxHitPoints>500</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Lion_Apparel_PowerArmor" or
-						defName="Lion_Apparel_ExpensivePowerArmor"
-						]/statBases/Mass </xpath>
-					<value>
-						<Mass>50</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Lion_Apparel_PowerArmor" or
-						defName="Lion_Apparel_ExpensivePowerArmor"
-						]/statBases/Flammability </xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Lion_Apparel_PowerArmor" or
-						defName="Lion_Apparel_ExpensivePowerArmor"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Lion_Apparel_PowerArmor" or
-						defName="Lion_Apparel_ExpensivePowerArmor"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>45</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="Lion_Apparel_PowerArmor" or
-						defName="Lion_Apparel_ExpensivePowerArmor"
-						]/costList </xpath>
-					<value>
-						<DevilstrandCloth>50</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="Lion_Apparel_PowerArmor" or
-						defName="Lion_Apparel_ExpensivePowerArmor"
-						]/equippedStatOffsets/MoveSpeed </xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="Lion_Apparel_PowerArmor" or
-						defName="Lion_Apparel_ExpensivePowerArmor"
-						]/equippedStatOffsets </xpath>
-					<value>
-						<CarryWeight>80</CarryWeight>
-						<CarryBulk>10</CarryBulk>
-						<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="Lion_Apparel_PowerArmor" or
-						defName="Lion_Apparel_ExpensivePowerArmor"
-						]/apparel/bodyPartGroups </xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Sergal/Sergal_Weps.xml b/Patches/Sergal/Sergal_Weps.xml
deleted file mode 100644
index 83b756ade4..0000000000
--- a/Patches/Sergal/Sergal_Weps.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Sergals Gnolls Lions and Frogs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== Sergal Musket (CE implementation based on Musket from Vanilla Weapons Expanded) ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>SergalBurnCannon</defName>
-					<statBases>
-						<Bulk>14.9</Bulk>
-						<Mass>4.8</Mass>
-						<SwayFactor>1.92</SwayFactor>
-						<ShotSpread>0.10</ShotSpread>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.35</RangedWeapon_Cooldown>
-						<WorkToMake>20000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>65</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Sergal_LeadBall</defaultProjectile>
-						<warmupTime>2.5</warmupTime>
-						<range>45</range>
-						<soundCast>Sergalgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
-						<reloadTime>10</reloadTime>
-						<ammoSet>AmmoSet_Sergal_LeadBall</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>MedievalShields_ValidSidearm</li>
-						<li>SergalRifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Sergal Early Rifle (CE implementation based on Lee Enfield N°4 MkI) ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>SergalFrostCannon</defName>
-					<statBases>
-						<Mass>4.11</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.54</SwayFactor>
-						<Bulk>11.29</Bulk>
-						<WorkToMake>11500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Sergalgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_303British</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>MedievalShields_ValidSidearm</li>
-						<li>SergalRifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="SergalBurnCannon" or
-						defName="SergalFrostCannon"
-						]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Seventh Seraph/7S_Weapon.xml b/Patches/Seventh Seraph/7S_Weapon.xml
deleted file mode 100644
index 8e023347ea..0000000000
--- a/Patches/Seventh Seraph/7S_Weapon.xml	
+++ /dev/null
@@ -1,373 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Seventh Seraph Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "SI_SeventhSeraphSI" or
-						defName = "SMG_SeventhSeraphVY" or
-						defName = "HC_SeventhSeraphOfficerRevolver"]/tools
-					</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "SG_SeventhSeraphCQC" or
-						defName = "AR_seventhseraphcarbine" or
-						defName = "MG_SevethSeraphSAW"
-						]/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>
-				</li>
-
-				<!-- === SI-2 === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>SI_SeventhSeraphSI</defName>
-					<statBases>
-						<WorkToMake>20000</WorkToMake>
-						<Mass>0.78</Mass>
-						<Bulk>1.86</Bulk>
-						<SwayFactor>0.88</SwayFactor>
-						<ShotSpread>0.16</ShotSpread>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>10</Steel>
-						<Plasteel>30</Plasteel>
-						<Chemfuel>5</Chemfuel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>14</range>
-						<soundCast>shot_seventhseraphsi2</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-					<researchPrerequisite>ChargedShot</researchPrerequisite>
-				</li>
-
-				<!-- === VY-7 === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>SMG_SeventhSeraphVY</defName>
-					<statBases>
-						<WorkToMake>38000</WorkToMake>
-						<Mass>2.80</Mass>
-						<Bulk>4.50</Bulk>
-						<SwayFactor>0.75</SwayFactor>
-						<ShotSpread>0.16</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>45</Steel>
-						<Plasteel>35</Plasteel>
-						<Chemfuel>15</Chemfuel>
-						<ComponentIndustrial>10</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
-						<burstShotCount>4</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>0.5</warmupTime>
-						<range>35</range>
-						<soundCast>shot_seventhseraphvy7</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilAmount>1.20</recoilAmount>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>27</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-					</weaponTags>
-					<researchPrerequisite>ChargedShot</researchPrerequisite>
-				</li>
-
-				<!-- === CQC-12 === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>SG_SeventhSeraphCQC</defName>
-					<statBases>
-						<WorkToMake>47500</WorkToMake>
-						<Mass>3.0</Mass>
-						<Bulk>8.8</Bulk>
-						<SwayFactor>1.25</SwayFactor>
-						<ShotSpread>0.12</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<Plasteel>40</Plasteel>
-						<Chemfuel>15</Chemfuel>
-						<ComponentIndustrial>10</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_12GaugeCharged</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>20</range>
-						<soundCast>shot_seventhseraphcqc</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>0.7</reloadTime>
-						<ammoSet>AmmoSet_12GaugeCharged</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-					<researchPrerequisite>ChargedShot</researchPrerequisite>
-				</li>
-
-				<!-- === 7S-SAW === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>MG_SevethSeraphSAW</defName>
-					<statBases>
-						<WorkToMake>60000</WorkToMake>
-						<Mass>8.0</Mass>
-						<Bulk>13.00</Bulk>
-						<SwayFactor>1.26</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>45</Steel>
-						<Plasteel>50</Plasteel>
-						<Chemfuel>15</Chemfuel>
-						<ComponentIndustrial>10</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>1.2</warmupTime>
-						<range>62</range>
-						<soundCast>shot_seventhseraphsaw</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilAmount>1.10</recoilAmount>
-						<recoilPattern>Mounted</recoilPattern>
-						<targetParams>
-							<canTargetLocations>True</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>60</magazineSize>
-						<reloadTime>5.8</reloadTime>
-						<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>CE_MachineGun</li>
-					</weaponTags>
-					<researchPrerequisite>ChargedShot</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Officer Revolver ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>HC_SeventhSeraphOfficerRevolver</defName>
-					<statBases>
-						<Mass>1.25</Mass>
-						<RangedWeapon_Cooldown>0.41</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>2.75</Bulk>
-						<WorkToMake>5500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>20</Steel>
-						<Plasteel>10</Plasteel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.00</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_454Casull_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>shot_seventhseraphofficerrevolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>11</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_454Casull</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<!--===== Carbine =====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>AR_seventhseraphcarbine</defName>
-					<statBases>
-						<Mass>3.0</Mass>
-						<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.2</SightsEfficiency>
-						<ShotSpread>0.10</ShotSpread>
-						<SwayFactor>1.10</SwayFactor>
-						<Bulk>8.90</Bulk>
-						<WorkToMake>35000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>45</Steel>
-						<Plasteel>10</Plasteel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-						<Chemfuel>10</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>1.3</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>50</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<soundCast>shot_seventhseraphcarbine</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>34</magazineSize>
-						<reloadTime>3.6</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Silkiera Race/Ammo/Ammo_Silkiera.xml b/Patches/Silkiera Race/Ammo/Ammo_Silkiera.xml
deleted file mode 100644
index 27de9c956a..0000000000
--- a/Patches/Silkiera Race/Ammo/Ammo_Silkiera.xml	
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[1.4]Silkiera Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!-- ==================== Fire Rifle Thing ========================== -->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<CombatExtended.AmmoSetDef>
-									<defName>AmmoSet_AssaultRifle_SK</defName>
-									<label>Silkiera Rifle</label>
-									<ammoTypes>
-										<Ammo_Flamethrower_Napalm>Bullet_SK_AR_Napalm</Ammo_Flamethrower_Napalm>
-										<Ammo_Flamethrower_Prometheum>Bullet_SK_AR_Prometheum</Ammo_Flamethrower_Prometheum>
-									</ammoTypes>
-								</CombatExtended.AmmoSetDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<ThingDef ParentName="Base6x18mmChargedBullet">
-									<defName>Bullet_SK_AR_Napalm</defName>
-									<label>ブレイズガン</label>
-									<graphicData>
-										<texPath>HAR_SK/Weapons/SK_W_c_b</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<speed>120</speed>
-										<damageDef>Flame</damageDef>
-										<damageAmountBase>6</damageAmountBase>
-										<armorPenetrationSharp>6</armorPenetrationSharp>
-										<armorPenetrationBlunt>25</armorPenetrationBlunt>
-									</projectile>
-								</ThingDef>
-								<ThingDef ParentName="Base6x18mmChargedBullet">
-									<defName>Bullet_SK_AR_Prometheum</defName>
-									<label>ブレイズガン</label>
-									<graphicData>
-										<texPath>HAR_SK/Weapons/SK_W_c_b</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<speed>120</speed>
-										<damageDef>PrometheumFlame</damageDef>
-										<damageAmountBase>6</damageAmountBase>
-										<armorPenetrationSharp>6</armorPenetrationSharp>
-										<armorPenetrationBlunt>25</armorPenetrationBlunt>
-									</projectile>
-								</ThingDef>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Silkiera Race/Bodies/Bodies_Mech.xml b/Patches/Silkiera Race/Bodies/Bodies_Mech.xml
deleted file mode 100644
index f6d9711a8a..0000000000
--- a/Patches/Silkiera Race/Bodies/Bodies_Mech.xml	
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[1.4]Silkiera Race</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Nearmare Summon === -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="HAR_SK_Mechanoid_Bodies"]//*[
-						def="MechanicalThorax" or
-						def="MechanicalNeck" or
-						def="MechanicalShoulder" or
-						def="MechanicalArm" or
-						def="MechanicalHand" or
-						def="MechanicalLeg" or
-						def="MechanicalFoot"]
-					</xpath>
-
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="HAR_SK_Mechanoid_Bodies"]//*[
-						def="MechanicalThorax" or
-						def="MechanicalNeck" or
-						def="MechanicalHead" or
-						def="MechanicalShoulder" or
-						def="MechanicalArm" or
-						def="Blade" or
-						def="MechanicalHand" or
-						def="MechanicalFinger" or
-						def="MechanicalLeg" or
-						def="MechanicalFoot"
-						]/groups
-					</xpath>
-
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Silkiera Race/Bodies/Silkiera_Bodytype.xml b/Patches/Silkiera Race/Bodies/Silkiera_Bodytype.xml
deleted file mode 100644
index d88f3406cf..0000000000
--- a/Patches/Silkiera Race/Bodies/Silkiera_Bodytype.xml	
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-
-			<!--Nearmare Bodytype-->
-
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>[1.4]Silkiera Race</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--Arm Groups-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Silkiera_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
-							<value>
-								<li>LeftArm</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Silkiera_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
-							<value>
-								<li>RightArm</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Silkiera_Body"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
-							<value>
-								<li>LeftShoulder</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Silkiera_Body"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
-							<value>
-								<li>RightShoulder</li>
-							</value>
-						</li>
-
-						<!--Natural Armor-->
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Silkiera_Body"]/corePart/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Silkiera_Body"]/corePart/parts/li[def="Silkiera_Tail"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Silkiera_Body"]/corePart/parts/li[def="Neck"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Silkiera_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Silkiera_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Silkiera_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Silkiera_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Silkiera_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Silkiera_Ear"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Silkiera_Body"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Silkiera_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Silkiera_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Silkiera_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Silkiera_Body"]/corePart/parts/li[def="Leg"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Silkiera_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Silkiera_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Silkiera Race/PawnKindDefs/Silkiera_PawnKind.xml b/Patches/Silkiera Race/PawnKindDefs/Silkiera_PawnKind.xml
deleted file mode 100644
index 2f8f3d7b2f..0000000000
--- a/Patches/Silkiera Race/PawnKindDefs/Silkiera_PawnKind.xml	
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[1.4]Silkiera Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--Ammo-->
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[defName="HAR_Silkiera_Player"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>0</min>
-										<max>2</max>
-									</primaryMagazineCount>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[@Name="HAR_Silkiera_KindBase_NPC"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>6</max>
-									</primaryMagazineCount>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[@Name="HAR_SK_Mechanoid_Kind_Base"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>10</min>
-										<max>10</max>
-									</primaryMagazineCount>
-								</li>
-							</value>
-						</li>
-
-						<!--Backpack-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="CE_Apparel_Backpack"]/apparel/tags</xpath>
-							<value>
-								<li>HAR_SK_Apparel</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/PawnKindDef[@Name="HAR_Silkiera_KindBase"]/apparelRequired</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/PawnKindDef[@Name="HAR_Silkiera_KindBase"]</xpath>
-								<value>
-									<apparelRequired>
-										<li>CE_Apparel_Backpack</li>
-									</apparelRequired>
-								</value>
-							</nomatch>
-							<match Class="PatchOperationAdd">
-								<xpath>Defs/PawnKindDef[@Name="HAR_Silkiera_KindBase"]/apparelRequired</xpath>
-								<value>
-								</value>
-							</match>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Silkiera Race/Scenario/Silkiera_Scenario.xml b/Patches/Silkiera Race/Scenario/Silkiera_Scenario.xml
deleted file mode 100644
index f3ba910aea..0000000000
--- a/Patches/Silkiera Race/Scenario/Silkiera_Scenario.xml	
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[1.4]Silkiera Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ScenarioDef[defName="Silkiera_Scenario"]/scenario/parts</xpath>
-							<value>
-								<li Class="ScenPart_StartingThing_Defined">
-									<def>StartingThing_Defined</def>
-									<thingDef>Ammo_303British_FMJ</thingDef>
-									<count>100</count>
-								</li>
-								<li Class="ScenPart_StartingThing_Defined">
-									<def>StartingThing_Defined</def>
-									<thingDef>Ammo_44Magnum_FMJ</thingDef>
-									<count>60</count>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ScenarioDef[defName="Silkiera_Scenario"]/scenario/parts/li[thingDef="Apparel_AdvancedHelmet"]</xpath>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ScenarioDef[defName="Silkiera_Scenario"]/scenario/parts/li[thingDef="Apparel_FlakVest"]</xpath>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ScenarioDef[defName="Silkiera_Scenario"]/scenario/parts/li[thingDef="Apparel_FlakPants"]</xpath>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Silkiera Race/ThingDefs_Misc/Silkiera_Apparel.xml b/Patches/Silkiera Race/ThingDefs_Misc/Silkiera_Apparel.xml
deleted file mode 100644
index d69f4baa9c..0000000000
--- a/Patches/Silkiera Race/ThingDefs_Misc/Silkiera_Apparel.xml	
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[1.4]Silkiera Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--========= Stuffable =========-->
-
-						<!--Skin Layer minimum protection-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_SK_AO_a"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>0.25</StuffEffectMultiplierArmor>
-								<Bulk>0.5</Bulk>
-								<WornBulk>0.25</WornBulk>
-							</value>
-						</li>
-
-						<!--Middle Mid-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_SK_AT_a" or
-								defName="HAR_SK_AT_b" or
-								defName="HAR_SK_AT_c" or
-								defName="HAR_SK_AT_d" or
-								defName="HAR_SK_AT_e"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-								<Bulk>3</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<!--Shell-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_SK_AS_a" or
-								defName="HAR_SK_AS_c"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-								<Bulk>10</Bulk>
-								<WornBulk>5</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_SK_AS_b"
-								]/statBases/ArmorRating_Sharp </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-								<Bulk>10</Bulk>
-								<WornBulk>5</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_SK_AS_b"
-								]/statBases/MaxHitPoints </xpath>
-							<value>
-								<MaxHitPoints>300</MaxHitPoints>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_SK_AS_b"
-								]/statBases/MaxHitPoints </xpath>
-							<value>
-								<MaxHitPoints>300</MaxHitPoints>
-							</value>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[
-								defName="HAR_SK_AS_b"
-								]/statBases/ArmorRating_Blunt </xpath>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[
-								defName="HAR_SK_AS_b"
-								]/statBases/ArmorRating_Heat </xpath>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[
-								defName="HAR_SK_AS_b" or
-								defName="HAR_SK_AS_c"
-								]/equippedStatOffsets/MoveSpeed </xpath>
-						</li>
-
-						<!--Overhead-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_SK_AH_a" or
-								defName="HAR_SK_AH_b" or
-								defName="HAR_SK_AH_c" or
-								defName="HAR_SK_AH_d" or
-								defName="HAR_SK_AH_e"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-								<Bulk>1</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Silkiera Race/ThingDefs_Misc/Weapons.xml b/Patches/Silkiera Race/ThingDefs_Misc/Weapons.xml
deleted file mode 100644
index 50e6a84c32..0000000000
--- a/Patches/Silkiera Race/ThingDefs_Misc/Weapons.xml	
+++ /dev/null
@@ -1,311 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>[1.4]Silkiera Race</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HAR_SK_Weapon_a"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>shaft</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>6</power>
-										<cooldownTime>1.31</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>2.9</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>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="HAR_SK_Weapon_a"]/statBases</xpath>
-							<value>
-								<MeleeCounterParryBonus>1.08</MeleeCounterParryBonus>
-								<Bulk>10</Bulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="HAR_SK_Weapon_a"]/equippedStatOffsets</xpath>
-							<value>
-								<MeleeCritChance>0.22</MeleeCritChance>
-								<MeleeParryChance>1.53</MeleeParryChance>
-								<MeleeDodgeChance>0.67</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HAR_SK_Weapon_b"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>shaft</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>7</power>
-										<cooldownTime>1.35</cooldownTime>
-										<chanceFactor>0.15</chanceFactor>
-										<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>shaft</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>4</power>
-										<cooldownTime>1.78</cooldownTime>
-										<chanceFactor>0.05</chanceFactor>
-										<armorPenetrationBlunt>1</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>18</power>
-										<cooldownTime>1.19</cooldownTime>
-										<chanceFactor>1.00</chanceFactor>
-										<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-										<armorPenetrationSharp>1.5</armorPenetrationSharp>
-										<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="HAR_SK_Weapon_b"]/statBases</xpath>
-							<value>
-								<Bulk>10</Bulk>
-								<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="HAR_SK_Weapon_b"]/equippedStatOffsets</xpath>
-							<value>
-								<MeleeCritChance>0.17</MeleeCritChance>
-								<MeleeParryChance>1.45</MeleeParryChance>
-								<MeleeDodgeChance>0.9</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="Gun_AssaultRifle_SK" or
-								defName="Gun_IncendiaryLauncher_SK"
-								]/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>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Gun_AssaultRifle_SK</defName>
-							<statBases>
-								<Mass>3.26</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-								<SightsEfficiency>1</SightsEfficiency>
-								<ShotSpread>0.14</ShotSpread>
-								<SwayFactor>1.33</SwayFactor>
-								<Bulk>10.03</Bulk>
-								<WorkToMake>30000</WorkToMake>
-							</statBases>
-							<costList>
-								<Steel>65</Steel>
-								<Plasteel>30</Plasteel>
-								<ComponentIndustrial>7</ComponentIndustrial>
-								<Chemfuel>10</Chemfuel>
-							</costList>
-							<Properties>
-								<recoilAmount>1.53</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_SK_AR_Napalm</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>55</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-								<soundCast>Shot_Revolver</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>30</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_AssaultRifle_SK</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Gun_IncendiaryLauncher_SK</defName>
-							<statBases>
-								<Mass>8</Mass>
-								<RangedWeapon_Cooldown>0.43</RangedWeapon_Cooldown>
-								<SightsEfficiency>1</SightsEfficiency>
-								<ShotSpread>0.15</ShotSpread>
-								<SwayFactor>1.8</SwayFactor>
-								<Bulk>10</Bulk>
-								<WorkToMake>39500</WorkToMake>
-							</statBases>
-							<costList>
-								<Steel>65</Steel>
-								<Plasteel>30</Plasteel>
-								<ComponentIndustrial>7</ComponentIndustrial>
-								<Chemfuel>10</Chemfuel>
-							</costList>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_30x64mmFuel_Incendiary</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>40</range>
-								<burstShotCount>0</burstShotCount>
-								<soundCast>Shot_IncendiaryLauncher</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>14</muzzleFlashScale>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>5</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_30x64mmFuel</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>SuppressFire</aiAimMode>
-							</FireModes>
-							<AllowWithRunAndGun>false</AllowWithRunAndGun>
-						</li>
-
-						<!--Bottle-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HAR_SK_Meal_c"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>2.22</cooldownTime>
-										<chanceFactor>1.33</chanceFactor>
-										<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>neck</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>3.33</cooldownTime>
-										<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Neck</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="HAR_SK_Meal_c"]/statBases</xpath>
-							<value>
-								<MeleeCounterParryBonus>0.33</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="HAR_SK_Meal_c"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.1</MeleeCritChance>
-									<MeleeParryChance>0.33</MeleeParryChance>
-									<MeleeDodgeChance>0.07</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Silkiera Race/ThingDefs_Races/AlienRace_Silkiera.xml b/Patches/Silkiera Race/ThingDefs_Races/AlienRace_Silkiera.xml
deleted file mode 100644
index 45fdb282ba..0000000000
--- a/Patches/Silkiera Race/ThingDefs_Races/AlienRace_Silkiera.xml	
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>[1.4]Silkiera Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="HAR_Silkiera_BaseNRPawn"]/inspectorTabs/li[.="ITab_Pawn_Gear"]</xpath>
-							<value>
-								<li>CombatExtended.ITab_Inventory</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="HAR_Silkiera_BaseNRPawn"]/comps</xpath>
-							<value>
-								<li>
-									<compClass>CombatExtended.CompPawnGizmo</compClass>
-								</li>
-								<li Class="CombatExtended.CompProperties_Suppressable" />
-								<li Class="CombatExtended.CompProperties_Inventory" />
-								<li Class="CombatExtended.CompProperties_TacticalManager" />
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="HAR_Silkiera_BaseNRPawn_b"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Humanoid</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="HAR_Silkiera_BaseNRPawn_b"]/statBases</xpath>
-							<value>
-								<Suppressability>1</Suppressability>
-								<SmokeSensitivity>1.2</SmokeSensitivity>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[
-								defName="HAR_Silkiera" or
-								defName="HAR_Silkiera_b" or
-								defName="HAR_Silkiera_c"
-								]/tools </xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>1.26</cooldownTime>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>right fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>1</power>
-										<cooldownTime>1.26</cooldownTime>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>2</power>
-										<cooldownTime>4.49</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="HAR_Silkiera_BaseNRPawn_b"]/alienRace/raceRestriction/whiteApparelList</xpath>
-							<value>
-								<li>CE_Apparel_TacVest</li>
-								<li>CE_Apparel_Backpack</li>
-								<li>CE_Apparel_TribalBackpack</li>
-								<li>CE_Apparel_BallisticShield</li>
-								<li>CE_Apparel_MeleeShield</li>
-								<li>CE_Apparel_GasMask</li>
-								<li>CE_Apparel_ImprovGasMask</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Silkiera Race/ThingDefs_Races/Race_Mech.xml b/Patches/Silkiera Race/ThingDefs_Races/Race_Mech.xml
deleted file mode 100644
index deb77c5999..0000000000
--- a/Patches/Silkiera Race/ThingDefs_Races/Race_Mech.xml	
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>[1.4]Silkiera Race</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="HAR_SK_Mechanoid_race_Base"]/statBases/ArmorRating_Heat</xpath>
-							<value>
-								<ArmorRating_Heat>0</ArmorRating_Heat>
-							</value>
-						</li>
-
-						<!-- Scyther Type -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/PawnKindDef[defName="HAR_SK_Mechanoid_Kind_a"]/combatPower</xpath>
-							<value>
-								<combatPower>100</combatPower>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_a"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Humanoid</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_a"]/statBases</xpath>
-							<value>
-								<Suppressability>0</Suppressability>
-								<SmokeSensitivity>0</SmokeSensitivity>
-								<MeleeDodgeChance>0.19</MeleeDodgeChance>
-								<MeleeCritChance>0.22</MeleeCritChance>
-								<MeleeParryChance>0.09</MeleeParryChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_a"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>4</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_a"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>6</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_a"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left blade</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>36</power>
-										<cooldownTime>1.65</cooldownTime>
-										<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
-										<armorPenetrationSharp>2.07</armorPenetrationSharp>
-										<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
-										<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>left blade</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>12</power>
-										<cooldownTime>1.33</cooldownTime>
-										<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
-										<armorPenetrationSharp>40</armorPenetrationSharp>
-										<armorPenetrationBlunt>20</armorPenetrationBlunt>
-										<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>right blade</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>36</power>
-										<cooldownTime>2.07</cooldownTime>
-										<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
-										<armorPenetrationSharp>2.16</armorPenetrationSharp>
-										<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
-										<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>right blade</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>12</power>
-										<cooldownTime>1.33</cooldownTime>
-										<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
-										<armorPenetrationSharp>40</armorPenetrationSharp>
-										<armorPenetrationBlunt>20</armorPenetrationBlunt>
-										<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>6</power>
-										<cooldownTime>5.9</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationSharp>0</armorPenetrationSharp>
-										<armorPenetrationBlunt>1.875</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<!-- Centipede Type -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/PawnKindDef[defName="HAR_SK_Mechanoid_Kind_b"]/combatPower</xpath>
-							<value>
-								<combatPower>130</combatPower>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_b"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>QuadrupedLow</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_b"]/statBases</xpath>
-							<value>
-								<Suppressability>0</Suppressability>
-								<SmokeSensitivity>0</SmokeSensitivity>
-								<MeleeDodgeChance>0.02</MeleeDodgeChance>
-								<MeleeCritChance>0.15</MeleeCritChance>
-								<MeleeParryChance>0.41</MeleeParryChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_b"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>6</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_b"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>9</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_b"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left blade</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>65</power>
-										<cooldownTime>3.97</cooldownTime>
-										<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
-										<armorPenetrationSharp>6.4</armorPenetrationSharp>
-										<armorPenetrationBlunt>14.5</armorPenetrationBlunt>
-										<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>right blade</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>65</power>
-										<cooldownTime>3.97</cooldownTime>
-										<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
-										<armorPenetrationSharp>6.4</armorPenetrationSharp>
-										<armorPenetrationBlunt>14.5</armorPenetrationBlunt>
-										<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>35</power>
-										<cooldownTime>3.51</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<armorPenetrationSharp>0</armorPenetrationSharp>
-										<armorPenetrationBlunt>15</armorPenetrationBlunt>
-										<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<!-- Bomb Drone -->
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_c"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Birdlike</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_c"]/statBases</xpath>
-							<value>
-								<Suppressability>0</Suppressability>
-								<SmokeSensitivity>0</SmokeSensitivity>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_c"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>1</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_c"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_c"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>6</power>
-										<cooldownTime>2.25</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationSharp>0</armorPenetrationSharp>
-										<armorPenetrationBlunt>1.875</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<!-- Trooper Type -->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/PawnKindDef[defName="HAR_SK_Mechanoid_Kind_e"]/combatPower</xpath>
-							<value>
-								<combatPower>140</combatPower>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_e"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Humanoid</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_e"]/statBases</xpath>
-							<value>
-								<Suppressability>0</Suppressability>
-								<SmokeSensitivity>0</SmokeSensitivity>
-								<MeleeDodgeChance>0.19</MeleeDodgeChance>
-								<MeleeCritChance>0.22</MeleeCritChance>
-								<MeleeParryChance>0.09</MeleeParryChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_e"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>4</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_e"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>6</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HAR_SK_Mechanoid_race_e"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left blade</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>12</power>
-										<cooldownTime>1.65</cooldownTime>
-										<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
-										<armorPenetrationSharp>2.07</armorPenetrationSharp>
-										<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
-										<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>right blade</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>12</power>
-										<cooldownTime>2.07</cooldownTime>
-										<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
-										<armorPenetrationSharp>2.16</armorPenetrationSharp>
-										<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
-										<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>6</power>
-										<cooldownTime>5.9</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationSharp>0</armorPenetrationSharp>
-										<armorPenetrationBlunt>1.875</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Simple Ogre Race/CE_OgreSkin.xml b/Patches/Simple Ogre Race/CE_OgreSkin.xml
deleted file mode 100644
index fa5cfb920e..0000000000
--- a/Patches/Simple Ogre Race/CE_OgreSkin.xml	
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Simple Ogre Race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Ogre Leather -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FP_OGRE_Leather"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.1</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FP_OGRE_Leather"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.05</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FP_OGRE_Leather"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.02</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Simple Ogre Race/CE_Ogre_Race.xml b/Patches/Simple Ogre Race/CE_Ogre_Race.xml
deleted file mode 100644
index 0226bebdef..0000000000
--- a/Patches/Simple Ogre Race/CE_Ogre_Race.xml	
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<!-- It's all Ogre now -->
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Simple Ogre Race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FP_OgreRace"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- Melee Tool & Basestats Defs -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FP_OgreRace"]/statBases/Mass</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1.5</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<Suppressability>0.75</Suppressability>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>40</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FP_OgreRace"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4.0</MoveSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FP_OgreRace"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FP_OgreRace"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.25</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FP_OgreRace"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.1</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FP_OgreRace"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>2</baseHealthScale>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FP_OgreRace"]/race/baseBodySize</xpath>
-					<value>
-						<baseBodySize>1.5</baseBodySize>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FP_OgreRace"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.78</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.44</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.78</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>4.22</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3.675</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FP_OgreRace"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="FP_OGRE_hediff"]/stages/li[1]</xpath>
-					<value>
-						<totalBleedFactor>0.75</totalBleedFactor>
-						<painFactor>0.8</painFactor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Simple Ogre Race/CE_Ogre_Race_Pawn.xml b/Patches/Simple Ogre Race/CE_Ogre_Race_Pawn.xml
deleted file mode 100644
index f9be7dd786..0000000000
--- a/Patches/Simple Ogre Race/CE_Ogre_Race_Pawn.xml	
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Simple Ogre Race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Tribal -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="FP_OGRE_Tribal_Berserker"]/combatPower</xpath>
-					<value>
-						<combatPower>60</combatPower>
-					</value>
-				</li>
-
-				<!-- Pirate -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="FP_OGRE_Pirate_Berserker"]/combatPower</xpath>
-					<value>
-						<combatPower>120</combatPower>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Simple Ogre Race/CE_Ogre_Race_Wep.xml b/Patches/Simple Ogre Race/CE_Ogre_Race_Wep.xml
deleted file mode 100644
index 3b5a6a8291..0000000000
--- a/Patches/Simple Ogre Race/CE_Ogre_Race_Wep.xml	
+++ /dev/null
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Simple Ogre Race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FP_OGRE_meleeone" or defName="FP_OGRE_meleetwo"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>100</costStuffCount>
-					</value>
-				</li>
-
-				<!-- Very High damage and Blunt penetration as it can only be made of woody material -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FP_OGRE_meleeone"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>60</power>
-								<chanceFactor>4</chanceFactor>
-								<cooldownTime>2.7</cooldownTime>
-								<armorPenetrationBlunt>68</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>31</power>
-								<chanceFactor>1</chanceFactor>
-								<cooldownTime>2.4</cooldownTime>
-								<armorPenetrationBlunt>36</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="FP_OGRE_meleeone"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>2.0</MeleeCritChance>
-							<MeleeParryChance>1</MeleeParryChance>
-							<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="FP_OGRE_meleeone"]/statBases</xpath>
-					<value>
-						<Bulk>16</Bulk>
-						<MeleeCounterParryBonus>0.33</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<!-- Spiked Club -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FP_OGRE_meleetwo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>54</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Cut</def>
-										<amount>18</amount>
-									</li>
-								</extraMeleeDamages>
-								<chanceFactor>4</chanceFactor>
-								<cooldownTime>2.88</cooldownTime>
-								<armorPenetrationBlunt>68</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>26</power>
-								<chanceFactor>1</chanceFactor>
-								<cooldownTime>2.55</cooldownTime>
-								<armorPenetrationBlunt>24</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="FP_OGRE_meleetwo"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>2.0</MeleeCritChance>
-							<MeleeParryChance>1</MeleeParryChance>
-							<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FP_OGRE_meleetwo"]/statBases/Mass</xpath>
-					<value>
-						<Mass>9.8</Mass>
-						<Bulk>18</Bulk>
-						<MeleeCounterParryBonus>0.33</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<!-- === The Rock === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FPOGRE_Rock"]/statBases</xpath>
-					<value>
-						<statBases>
-							<MarketValue>0.1</MarketValue>
-							<SightsEfficiency>0.7</SightsEfficiency>
-							<ShotSpread>1.4</ShotSpread>
-							<SwayFactor>2.4</SwayFactor>
-							<Bulk>7</Bulk>
-							<Mass>14</Mass>
-							<RangedWeapon_Cooldown>2.1</RangedWeapon_Cooldown>
-						</statBases>
-						<stackLimit>12</stackLimit>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FPOGRE_Rock"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>FPOGRE_RockFlying</defaultProjectile>
-								<warmupTime>1.4</warmupTime>
-								<range>13</range>
-								<soundCast>ThrowGrenade</soundCast>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FPOGRE_Rock"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>rock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2.9</cooldownTime>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Add Projectiles and Recipes for the Harpoon and Throwing Axe === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="BasePilumProjectile">
-							<defName>FPOGRE_RockFlying</defName>
-							<label>thrown rock</label>
-							<graphicData>
-								<texPath>Things/FPOGRE/rangeone</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Blunt</damageDef>
-								<damageAmountBase>46</damageAmountBase>
-								<speed>9</speed>
-								<armorPenetrationBlunt>27.1</armorPenetrationBlunt>
-								<preExplosionSpawnChance>0.75</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>FPOGRE_Rock</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="Make_FP_OGRE_rock"]/products</xpath>
-					<value>
-						<products>
-							<FPOGRE_Rock>3</FPOGRE_Rock>
-						</products>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Simple Ogre Race/Ogre_Resources.xml b/Patches/Simple Ogre Race/Ogre_Resources.xml
deleted file mode 100644
index 966ff2e2db..0000000000
--- a/Patches/Simple Ogre Race/Ogre_Resources.xml	
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Simple Ogre Race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Bahlrin -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FP_OGRE_Leather"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.08</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FP_OGRE_Leather"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.04</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FP_OGRE_Leather"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.01</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Simply More Melee/SMM_MeleeWeapons_CE.xml b/Patches/Simply More Melee/SMM_MeleeWeapons_CE.xml
deleted file mode 100644
index 76e0202ba7..0000000000
--- a/Patches/Simply More Melee/SMM_MeleeWeapons_CE.xml	
+++ /dev/null
@@ -1,2188 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Simply More Melee</li>
-			<li>Simply More Melee (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- You can find the spreadsheet here https://drive.google.com/open?id=1JZAjvzealI189OofkxwUCif3yA4-u6yP3DilsmIEQJA -->
-
-				<!-- SMM_Bardiche -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Bardiche"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.27</cooldownTime>
-								<armorPenetrationBlunt>2.925</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>42</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetrationBlunt>1.3</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.3</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>51</power>
-								<cooldownTime>2.29</cooldownTime>
-								<armorPenetrationBlunt>8.125</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.63</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Bardiche"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<MeleeCounterParryBonus>0.54</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Bardiche"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.15</MeleeCritChance>
-							<MeleeParryChance>0.62</MeleeParryChance>
-							<MeleeDodgeChance>0.43</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- SMM_Bat -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Bat"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.46</cooldownTime>
-								<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.1</cooldownTime>
-								<armorPenetrationBlunt>1.8</armorPenetrationBlunt>
-								<chanceFactor>1.33</chanceFactor>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Bat"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<MeleeCounterParryBonus>0.56</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Bat"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.3</MeleeCritChance>
-							<MeleeParryChance>0.56</MeleeParryChance>
-							<MeleeDodgeChance>0.33</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- SMM_BatChained -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_BatChained"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.63</cooldownTime>
-								<armorPenetrationBlunt>0.7</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.22</cooldownTime>
-								<armorPenetrationBlunt>2.8</armorPenetrationBlunt>
-								<chanceFactor>1.33</chanceFactor>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_BatChained"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<MeleeCounterParryBonus>0.36</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_BatChained"]/statBases/Mass</xpath>
-					<value>
-						<Mass>1.4</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_BatChained"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.47</MeleeCritChance>
-							<MeleeParryChance>0.36</MeleeParryChance>
-							<MeleeDodgeChance>0.33</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- SMM_BatSpiked -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_BatSpiked"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.13</cooldownTime>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<chanceFactor>1.33</chanceFactor>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_BatSpiked"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_BatSpiked"]/statBases/Mass</xpath>
-					<value>
-						<Mass>1</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_BatSpiked"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.67</MeleeCritChance>
-							<MeleeParryChance>0.5</MeleeParryChance>
-							<MeleeDodgeChance>0.33</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- SMM_Baton -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Baton"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.91</cooldownTime>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Baton"]/statBases</xpath>
-					<value>
-						<Bulk>2.5</Bulk>
-						<MeleeCounterParryBonus>0.9</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Baton"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.17</MeleeCritChance>
-							<MeleeParryChance>0.9</MeleeParryChance>
-							<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Baton"]/weaponTags</xpath>
-					<value>
-						<li>CE_Sidearm_Melee</li>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- SMM_Billhook -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Billhook"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.375</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.16</cooldownTime>
-								<armorPenetrationBlunt>0.54</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.54</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.18</cooldownTime>
-								<armorPenetrationBlunt>0.844</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.38</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Billhook"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<MeleeCounterParryBonus>0.2</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Billhook"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.33</MeleeCritChance>
-							<MeleeParryChance>0.2</MeleeParryChance>
-							<MeleeDodgeChance>0.1</MeleeDodgeChance>
-							<PlantWorkSpeed>0.15</PlantWorkSpeed>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Billhook"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- SMM_Cleaver -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Cleaver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.23</cooldownTime>
-								<armorPenetrationBlunt>0.225</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.05</cooldownTime>
-								<armorPenetrationBlunt>0.38</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.34</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Cleaver"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<MeleeCounterParryBonus>0.25</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Cleaver"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.28</MeleeCritChance>
-							<MeleeParryChance>0.11</MeleeParryChance>
-							<MeleeDodgeChance>0.05</MeleeDodgeChance>
-							<ButcheryFleshEfficiency>0.05</ButcheryFleshEfficiency>
-							<ButcheryFleshSpeed>0.10</ButcheryFleshSpeed>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Cleaver"]/weaponTags</xpath>
-					<value>
-						<li>CE_Sidearm_Melee</li>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- SMM_Crowbar -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Crowbar"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.32</cooldownTime>
-								<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>0.63</cooldownTime>
-								<armorPenetrationBlunt>5.625</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Crowbar"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Crowbar"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.42</MeleeCritChance>
-							<MeleeParryChance>0.24</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Crowbar"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- SMM_Fireaxe -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Fireaxe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.3</cooldownTime>
-								<armorPenetrationBlunt>3.263</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>pick</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.96</cooldownTime>
-								<armorPenetrationBlunt>13.05</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.31</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>41</power>
-								<cooldownTime>2.41</cooldownTime>
-								<armorPenetrationBlunt>13.05</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.16</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Fireaxe"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.28</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Fireaxe"]/statBases/Mass</xpath>
-					<value>
-						<Mass>2.9</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Fireaxe"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.11</MeleeCritChance>
-							<MeleeParryChance>0.28</MeleeParryChance>
-							<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- SMM_Glaive -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Glaive"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.36</cooldownTime>
-								<armorPenetrationBlunt>2.363</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetrationBlunt>2.363</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.37</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>51</power>
-								<cooldownTime>3.01</cooldownTime>
-								<armorPenetrationBlunt>9.45</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.89</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Glaive"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<MeleeCounterParryBonus>1.02</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Glaive"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.19</MeleeCritChance>
-							<MeleeParryChance>1.19</MeleeParryChance>
-							<MeleeDodgeChance>0.67</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- SMM_Halberd -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Halberd"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.52</cooldownTime>
-								<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>38</power>
-								<cooldownTime>1.34</cooldownTime>
-								<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>3.6</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>50</power>
-								<cooldownTime>3.34</cooldownTime>
-								<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.88</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Halberd"]/statBases</xpath>
-					<value>
-						<Bulk>13</Bulk>
-						<MeleeCounterParryBonus>0.67</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Halberd"]/statBases/Mass</xpath>
-					<value>
-						<Mass>3.2</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Halberd"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.13</MeleeCritChance>
-							<MeleeParryChance>0.78</MeleeParryChance>
-							<MeleeDodgeChance>0.67</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- SMM_Hatchet -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Hatchet"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>0.95</cooldownTime>
-								<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>hammerhead</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.58</cooldownTime>
-								<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.58</cooldownTime>
-								<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.32</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Hatchet"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<MeleeCounterParryBonus>0.22</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Hatchet"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.31</MeleeCritChance>
-							<MeleeParryChance>0.22</MeleeParryChance>
-							<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Hatchet"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- SMM_Hooksword -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Hooksword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.4</cooldownTime>
-								<armorPenetrationBlunt>0.375</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.4</cooldownTime>
-								<armorPenetrationBlunt>0.375</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.42</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>1.3</cooldownTime>
-								<armorPenetrationBlunt>0.844</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.38</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Hooksword"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Hooksword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.67</MeleeCritChance>
-							<MeleeParryChance>0.4</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Hooksword"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- SMM_Karambit -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Karambit"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>knuckle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.53</cooldownTime>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.14</cooldownTime>
-								<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.36</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.26</cooldownTime>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.42</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Karambit"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<MeleeCounterParryBonus>0.1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Karambit"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1</MeleeCritChance>
-							<MeleeParryChance>0.1</MeleeParryChance>
-							<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Karambit"]/weaponTags</xpath>
-					<value>
-						<li>CE_Sidearm_Melee</li>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- SMM_Kukri -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Kukri"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.4</cooldownTime>
-								<armorPenetrationBlunt>0.375</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>0.84</cooldownTime>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.67</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.4</cooldownTime>
-								<armorPenetrationBlunt>0.375</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.38</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Kukri"]/statBases</xpath>
-					<value>
-						<Bulk>2.5</Bulk>
-						<MeleeCounterParryBonus>0.27</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Kukri"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.27</MeleeCritChance>
-							<MeleeParryChance>0.27</MeleeParryChance>
-							<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Kukri"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- SMM_Machete -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Machete"]/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>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>1.25</cooldownTime>
-								<armorPenetrationBlunt>0.956</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.43</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.44</cooldownTime>
-								<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.43</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Machete"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<MeleeCounterParryBonus>0.26</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Machete"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.29</MeleeCritChance>
-							<MeleeParryChance>0.26</MeleeParryChance>
-							<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Machete"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- SMM_Mallet -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Mallet"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2.12</cooldownTime>
-								<armorPenetrationBlunt>3.125</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Mallet"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<MeleeCounterParryBonus>0.23</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Mallet"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.33</MeleeCritChance>
-							<MeleeParryChance>0.23</MeleeParryChance>
-							<MeleeDodgeChance>0.15</MeleeDodgeChance>
-							<GeneralLaborSpeed>0.08</GeneralLaborSpeed>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Mallet"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- SMM_Maul -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Maul"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>sledge</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>2.52</cooldownTime>
-								<armorPenetrationBlunt>12.6</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>axe</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>42</power>
-								<cooldownTime>2.52</cooldownTime>
-								<armorPenetrationBlunt>12.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Maul"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<MeleeCounterParryBonus>0.32</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Maul"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.4</MeleeCritChance>
-							<MeleeParryChance>0.43</MeleeParryChance>
-							<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- SMM_Pickaxe -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Pickaxe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.69</cooldownTime>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.69</cooldownTime>
-								<armorPenetrationBlunt>7.2</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.72</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Pickaxe"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>0.22</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Pickaxe"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.06</MeleeCritChance>
-							<MeleeParryChance>0.22</MeleeParryChance>
-							<MeleeDodgeChance>0.23</MeleeDodgeChance>
-							<MiningSpeed>0.15</MiningSpeed>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- SMM_Pitchfork -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Pitchfork"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.69</cooldownTime>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.11</cooldownTime>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Pitchfork"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Pitchfork"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.44</MeleeCritChance>
-							<MeleeParryChance>1.33</MeleeParryChance>
-							<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- SMM_Pollaxe -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Pollaxe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.44</cooldownTime>
-								<armorPenetrationBlunt>2.925</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>37</power>
-								<cooldownTime>1.27</cooldownTime>
-								<armorPenetrationBlunt>2.925</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.93</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>39</power>
-								<cooldownTime>3.66</cooldownTime>
-								<armorPenetrationBlunt>8.125</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.63</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>hammer</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>2.86</cooldownTime>
-								<armorPenetrationBlunt>11.7</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Pollaxe"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>0.58</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Pollaxe"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.13</MeleeCritChance>
-							<MeleeParryChance>0.77</MeleeParryChance>
-							<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- SMM_Sickle -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Sickle"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.4</cooldownTime>
-								<armorPenetrationBlunt>0.375</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.4</cooldownTime>
-								<armorPenetrationBlunt>0.375</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.31</cooldownTime>
-								<armorPenetrationBlunt>0.54</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.48</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Sickle"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<MeleeCounterParryBonus>0.1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Sickle"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.44</MeleeCritChance>
-							<MeleeParryChance>0.1</MeleeParryChance>
-							<MeleeDodgeChance>0.05</MeleeDodgeChance>
-							<PlantHarvestYield>0.15</PlantHarvestYield>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Sickle"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- SMM_Sledgehammer -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Sledgehammer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.87</cooldownTime>
-								<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>2.43</cooldownTime>
-								<armorPenetrationBlunt>10.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Sledgehammer"]/statBases</xpath>
-					<value>
-						<Bulk>7</Bulk>
-						<MeleeCounterParryBonus>0.38</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Sledgehammer"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.2</MeleeCritChance>
-							<MeleeParryChance>0.5</MeleeParryChance>
-							<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- SMM_TrenchKnife -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_TrenchKnife"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>knuckle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.62</cooldownTime>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.31</cooldownTime>
-								<armorPenetrationBlunt>0.54</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.48</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.4</cooldownTime>
-								<armorPenetrationBlunt>0.375</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.63</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_TrenchKnife"]/statBases</xpath>
-					<value>
-						<Bulk>1.5</Bulk>
-						<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_TrenchKnife"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.33</MeleeCritChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-							<MeleeDodgeChance>0.07</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_TrenchKnife"]/weaponTags</xpath>
-					<value>
-						<li>CE_Sidearm_Melee</li>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- SMM_TrenchClub -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_TrenchClub"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.7</cooldownTime>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_TrenchClub"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.18</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_TrenchClub"]/statBases/Mass</xpath>
-					<value>
-						<Mass>1</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_TrenchClub"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.33</MeleeCritChance>
-							<MeleeParryChance>0.23</MeleeParryChance>
-							<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_TrenchClub"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- SMM_Zweihander -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Zweihander"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.99</cooldownTime>
-								<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>60</power>
-								<cooldownTime>1.99</cooldownTime>
-								<armorPenetrationBlunt>1.55</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.87</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>47</power>
-								<cooldownTime>3.1</cooldownTime>
-								<armorPenetrationBlunt>3.488</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.39</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Zweihander"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Zweihander"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.08</MeleeCritChance>
-							<MeleeParryChance>0.52</MeleeParryChance>
-							<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- SMM_Claymore -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Claymore"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.89</cooldownTime>
-								<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>34</power>
-								<cooldownTime>1.89</cooldownTime>
-								<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.39</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>44</power>
-								<cooldownTime>2.02</cooldownTime>
-								<armorPenetrationBlunt>3.613</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.73</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Claymore"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<MeleeCounterParryBonus>0.75</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Claymore"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.18</MeleeCritChance>
-							<MeleeParryChance>0.56</MeleeParryChance>
-							<MeleeDodgeChance>0.47</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- SMM_Pike -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Pike"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.41</cooldownTime>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Pike"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<MeleeCounterParryBonus>1.27</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Pike"]/statBases/Mass</xpath>
-					<value>
-						<Mass>4</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Pike"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.08</MeleeCritChance>
-							<MeleeParryChance>0.95</MeleeParryChance>
-							<MeleeDodgeChance>1.27</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- SMM_Scythe -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Scythe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.74</cooldownTime>
-								<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>1.74</cooldownTime>
-								<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.36</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>6.79</cooldownTime>
-								<armorPenetrationBlunt>0.576</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.52</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Scythe"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<MeleeCounterParryBonus>1.26</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Scythe"]/statBases/Mass</xpath>
-					<value>
-						<Mass>1.8</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Scythe"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.28</MeleeCritChance>
-							<MeleeParryChance>0.94</MeleeParryChance>
-							<MeleeDodgeChance>0.57</MeleeDodgeChance>
-							<PlantWorkSpeed>0.15</PlantWorkSpeed>
-							<PlantHarvestYield>0.15</PlantHarvestYield>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- SMM_Warclub -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Warclub"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.66</cooldownTime>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>2.47</cooldownTime>
-								<armorPenetrationBlunt>4.688</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Warclub"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<MeleeCounterParryBonus>0.2</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Warclub"]/statBases/Mass</xpath>
-					<value>
-						<Mass>1.5</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Warclub"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.5</MeleeCritChance>
-							<MeleeParryChance>0.2</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Warclub"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_Sidearm_Tribal</li>
-					</value>
-				</li>
-
-				<!-- SMM_Dagger -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Dagger"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.32</cooldownTime>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.52</cooldownTime>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.27</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.1</cooldownTime>
-								<armorPenetrationBlunt>0.432</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.72</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Dagger"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Dagger"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.5</MeleeCritChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-							<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Dagger"]/weaponTags</xpath>
-					<value>
-						<li>CE_Sidearm_Melee</li>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- SMM_Quarterstaff -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Quarterstaff"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.37</cooldownTime>
-								<armorPenetrationBlunt>5.313</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>0.86</cooldownTime>
-								<armorPenetrationBlunt>3.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Quarterstaff"]/statBases</xpath>
-					<value>
-						<Bulk>9</Bulk>
-						<MeleeCounterParryBonus>1.96</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Quarterstaff"]/statBases/Mass</xpath>
-					<value>
-						<Mass>1.7</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Quarterstaff"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>70</costStuffCount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Quarterstaff"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.85</MeleeCritChance>
-							<MeleeParryChance>1.47</MeleeParryChance>
-							<MeleeDodgeChance>0.83</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- SMM_Khopesh -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Khopesh"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.37</cooldownTime>
-								<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
-								<chanceFactor>0.15</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.37</cooldownTime>
-								<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.18</armorPenetrationSharp>
-								<chanceFactor>0.25</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.09</cooldownTime>
-								<armorPenetrationBlunt>1.012</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Khopesh"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Khopesh"]/statBases/Mass</xpath>
-					<value>
-						<Mass>0.7</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Khopesh"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>40</costStuffCount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Khopesh"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.29</MeleeCritChance>
-							<MeleeParryChance>0.35</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Khopesh"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- SMM_Scimitar -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_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>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Scimitar"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.38</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SMM_Scimitar"]/statBases/Mass</xpath>
-					<value>
-						<Mass>1.1</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Scimitar"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.24</MeleeCritChance>
-							<MeleeParryChance>0.38</MeleeParryChance>
-							<MeleeDodgeChance>0.28</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SMM_Scimitar"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Slime Rancher/Slime_Recipe.xml b/Patches/Slime Rancher/Slime_Recipe.xml
deleted file mode 100644
index 7b219dca7f..0000000000
--- a/Patches/Slime Rancher/Slime_Recipe.xml	
+++ /dev/null
@@ -1,64 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Slime Rancher</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<RecipeDef>
-							<defName>PressFirePlortCE</defName>
-							<label>press fire plort</label>
-							<description>Concentrate fire plorts into highly flammable compounds.</description>
-							<jobString>Pressing fire plort</jobString>
-							<workAmount>100</workAmount>
-							<products>
-								<Prometheum>1</Prometheum>
-							</products>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FirePlort</li>
-										</thingDefs>
-									</filter>
-									<count>3</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>FirePlort</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="PressBoomPlort"]/products</xpath>
-					<value>
-						<products>
-							<FSX>5</FSX>
-						</products>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PlortPress"]/recipes</xpath>
-					<value>
-						<li>PressFirePlortCE</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Slime Rancher/SlimeyBois.xml b/Patches/Slime Rancher/SlimeyBois.xml
deleted file mode 100644
index 20f47cd8d9..0000000000
--- a/Patches/Slime Rancher/SlimeyBois.xml	
+++ /dev/null
@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Slime Rancher</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[
-						defName="GreenSlime" or
-						defName="PuddleSlime" or
-						defName="FireSlime" or
-						defName="BoomSlime" or
-						defName="TarrSlime" or
-						defName="QuicksilverSlime"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="GreenSlime" or
-						defName="PuddleSlime" or
-						defName="FireSlime" or
-						defName="BoomSlime"
-						]/statBases </xpath>
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.07</MeleeCritChance>
-						<MeleeParryChance>0.00</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="QuicksilverSlime"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>0.07</MeleeCritChance>
-						<MeleeParryChance>0.00</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TarrSlime"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.33</MeleeCritChance>
-						<MeleeParryChance>0.00</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="GreenSlime" or
-						defName="PuddleSlime" or
-						defName="BoomSlime"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>body</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Slimebody</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>2</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="FireSlime"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>body</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Slimebody</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Flame</def>
-											<amount>1</amount>
-											<chance>0.33</chance>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TarrSlime"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>body</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Slimebody</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>2</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>razorfangs</label>
-								<capacities>
-									<li>Bite</li>
-									<li>Stab</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>Slimebody</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-								<chanceFactor>0.9</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="QuicksilverSlime"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>body</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>0.1</cooldownTime>
-								<linkedBodyPartsGroup>Slimebody</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Flame</def>
-											<amount>1</amount>
-											<chance>0.33</chance>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Slice</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Cut</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>0.4</cooldownTime>
-								<linkedBodyPartsGroup>Slimebody</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<chanceFactor>0.9</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>1</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Solark Race/Ammo/Projectiles.xml b/Patches/Solark Race/Ammo/Projectiles.xml
deleted file mode 100644
index bb8e8cee04..0000000000
--- a/Patches/Solark Race/Ammo/Projectiles.xml	
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Solark Race/Bodies/Solark_Bodytype.xml b/Patches/Solark Race/Bodies/Solark_Bodytype.xml
deleted file mode 100644
index 5c26384592..0000000000
--- a/Patches/Solark Race/Bodies/Solark_Bodytype.xml	
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-
-			<!--Nearmare Bodytype-->
-
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>[1.4]Solark Race</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--Arm Groups-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Solark_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
-							<value>
-								<li>LeftArm</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Solark_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
-							<value>
-								<li>RightArm</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Solark_Body"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
-							<value>
-								<li>LeftShoulder</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Solark_Body"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
-							<value>
-								<li>RightShoulder</li>
-							</value>
-						</li>
-
-						<!--Natural Armor-->
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Solark_Body"]/corePart/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Solark_Body"]/corePart/parts/li[def="Solark_Wing"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Solark_Body"]/corePart/parts/li[def="Neck"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Solark_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Solark_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Solark_Horn"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Solark_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Solark_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Solark_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Solark_Body"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Solark_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Solark_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Solark_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Solark_Body"]/corePart/parts/li[def="Leg"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Solark_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Solark_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Solark Race/Hediffs/Hediffs.xml b/Patches/Solark Race/Hediffs/Hediffs.xml
deleted file mode 100644
index 2b955c5fd9..0000000000
--- a/Patches/Solark Race/Hediffs/Hediffs.xml	
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[1.4]Solark Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv1"]/statOffsets/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv1"]/statOffsets/ArmorRating_Heat</xpath>
-							<value>
-								<ArmorRating_Heat>0</ArmorRating_Heat>
-								<ArmorRating_Electric>0.2</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv1"]/statOffsets/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>1</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv1"]/statOffsets/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>0.1</MeleeDodgeChance>
-								<MeleeCritChance>0.1</MeleeCritChance>
-								<MeleeParryChance>0.1</MeleeParryChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv2"]/statOffsets/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv2"]/statOffsets/ArmorRating_Heat</xpath>
-							<value>
-								<ArmorRating_Heat>0.05</ArmorRating_Heat>
-								<ArmorRating_Electric>0.2</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv2"]/statOffsets/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>2</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv2"]/statOffsets/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>0.15</MeleeDodgeChance>
-								<MeleeCritChance>0.15</MeleeCritChance>
-								<MeleeParryChance>0.15</MeleeParryChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv3"]/statOffsets/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>1</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv3"]/statOffsets/ArmorRating_Heat</xpath>
-							<value>
-								<ArmorRating_Heat>0.10</ArmorRating_Heat>
-								<ArmorRating_Electric>0.4</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv3"]/statOffsets/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>4</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv3"]/statOffsets/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>0.2</MeleeDodgeChance>
-								<MeleeCritChance>0.2</MeleeCritChance>
-								<MeleeParryChance>0.2</MeleeParryChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv4"]/statOffsets/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>2</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv4"]/statOffsets/ArmorRating_Heat</xpath>
-							<value>
-								<ArmorRating_Heat>0.15</ArmorRating_Heat>
-								<ArmorRating_Electric>0.6</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv4"]/statOffsets/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>8</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv4"]/statOffsets/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>0.25</MeleeDodgeChance>
-								<MeleeCritChance>0.25</MeleeCritChance>
-								<MeleeParryChance>0.25</MeleeParryChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv5"]/statOffsets/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>4</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv5"]/statOffsets/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>16</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv5"]/statOffsets/ArmorRating_Heat</xpath>
-							<value>
-								<ArmorRating_Heat>0.2</ArmorRating_Heat>
-								<ArmorRating_Electric>0.8</ArmorRating_Electric>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Solark_Artificial"]/stages/li[label="Lv5"]/statOffsets/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>0.3</MeleeDodgeChance>
-								<MeleeCritChance>0.3</MeleeCritChance>
-								<MeleeParryChance>0.3</MeleeParryChance>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Solark Race/PawnKindDefs/Solark_PawnKind.xml b/Patches/Solark Race/PawnKindDefs/Solark_PawnKind.xml
deleted file mode 100644
index 13e514e7e4..0000000000
--- a/Patches/Solark Race/PawnKindDefs/Solark_PawnKind.xml	
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[1.4]Solark Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--Ammo-->
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[
-								@Name="HAR_Solark_KindBase"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>6</max>
-									</primaryMagazineCount>
-								</li>
-							</value>
-						</li>
-
-						<!--Backpack-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="CE_Apparel_Backpack"]/apparel/tags</xpath>
-							<value>
-								<li>HAR_Solark_NPC_Resident</li>
-							</value>
-						</li>
-
-						<!--combatPower-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/PawnKindDef[@Name="HAR_Solark_KindBase"]/combatPower</xpath>
-							<value>
-								<combatPower>200</combatPower>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Solark Race/ThingDefs_Misc/Solark_Apparel.xml b/Patches/Solark Race/ThingDefs_Misc/Solark_Apparel.xml
deleted file mode 100644
index 07382385e0..0000000000
--- a/Patches/Solark Race/ThingDefs_Misc/Solark_Apparel.xml	
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[1.4]Solark Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--========= Stuffable =========-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_SA_Tops_a" or
-								defName="HAR_SA_Tops_b" or
-								defName="HAR_SA_Tops_c"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-								<Bulk>1</Bulk>
-								<WornBulk>0</WornBulk>
-							</value>
-						</li>
-
-						<!--Middle PA-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_SA_Armor_a"
-								]/statBases/ArmorRating_Sharp </xpath>
-							<value>
-								<ArmorRating_Sharp>16</ArmorRating_Sharp>
-								<Bulk>80</Bulk>
-								<WornBulk>10</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_SA_Armor_a"
-								]/statBases/ArmorRating_Blunt </xpath>
-							<value>
-								<ArmorRating_Blunt>40</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_SA_Armor_a"
-								]/statBases/Mass </xpath>
-							<value>
-								<Mass>60</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_SA_Armor_a"
-								]/equippedStatOffsets/MoveSpeed </xpath>
-							<value>
-								<CarryWeight>80</CarryWeight>
-								<CarryBulk>10</CarryBulk>
-								<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-								<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="HAR_SA_Armor_Base"]/apparel/bodyPartGroups</xpath>
-							<value>
-								<li>Hands</li>
-								<li>Feet</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="HAR_SA_Armor_Base"]/costList/ComponentSpacer</xpath>
-							<value>
-								<ComponentSpacer>3</ComponentSpacer>
-								<DevilstrandCloth>50</DevilstrandCloth>
-							</value>
-						</li>
-
-						<!--Shell-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_SA_Shell_a" or
-								defName="HAR_SA_Shell_b"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-								<Bulk>10</Bulk>
-								<WornBulk>5</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_SA_Shell_c"
-								]/statBases/ArmorRating_Sharp </xpath>
-							<value>
-								<ArmorRating_Sharp>10</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_SA_Shell_c"
-								]/statBases/ArmorRating_Blunt </xpath>
-							<value>
-								<ArmorRating_Blunt>10</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--Overhead-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_SA_Heads_a" or
-								defName="HAR_SA_Heads_b" or
-								defName="HAR_SA_Heads_c"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-								<Bulk>1</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<!--Overhead Armor-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_SA_Heads_d"
-								]/statBases/ArmorRating_Sharp </xpath>
-							<value>
-								<ArmorRating_Sharp>18</ArmorRating_Sharp>
-								<Bulk>5</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_SA_Heads_d"
-								]/statBases/ArmorRating_Blunt </xpath>
-							<value>
-								<ArmorRating_Blunt>40.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_SA_Heads_d"
-								]/equippedStatOffsets/MoveSpeed </xpath>
-							<value>
-								<AimingAccuracy>0.15</AimingAccuracy>
-								<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-								<SmokeSensitivity>-1</SmokeSensitivity>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="HAR_SA_Heads_d"]/costList</xpath>
-							<value>
-								<DevilstrandCloth>20</DevilstrandCloth>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Solark Race/ThingDefs_Races/AlienRace_Solark.xml b/Patches/Solark Race/ThingDefs_Races/AlienRace_Solark.xml
deleted file mode 100644
index 60761a8aa1..0000000000
--- a/Patches/Solark Race/ThingDefs_Races/AlienRace_Solark.xml	
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[1.4]Solark Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="HAR_Solark_BaseNRPawn"]/inspectorTabs/li[.="ITab_Pawn_Gear"]</xpath>
-							<value>
-								<li>CombatExtended.ITab_Inventory</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="HAR_Solark_BaseNRPawn"]/comps</xpath>
-							<value>
-								<li Class="CombatExtended.CompProperties_Inventory" />
-								<li Class="CombatExtended.CompProperties_TacticalManager" />
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="HAR_Solark_BaseNRPawn"]/comps</xpath>
-							<value>
-								<li>
-									<compClass>CombatExtended.CompPawnGizmo</compClass>
-								</li>
-								<li Class="CombatExtended.CompProperties_Suppressable" />
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Solark"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Humanoid</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Solark"]/statBases</xpath>
-							<value>
-								<Suppressability>0.2</Suppressability>
-								<SmokeSensitivity>0.2</SmokeSensitivity>
-								<MeleeCritChance>1.0</MeleeCritChance>
-								<MeleeParryChance>1.0</MeleeParryChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<DamageDef ParentName="Bomb">
-									<defName>Bomb_Solark</defName>
-									<defaultDamage>550</defaultDamage>
-									<defaultStoppingPower>2.0</defaultStoppingPower>
-									<defaultArmorPenetration>55</defaultArmorPenetration>
-								</DamageDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Solark"]/race/baseBodySize</xpath>
-							<value>
-								<baseBodySize>1</baseBodySize>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="HAR_Solark_BaseNRPawn"]/comps/li[@Class="Solark_Dll.Solark_CompProperties_CommandExplosive"]/explosiveDamageType</xpath>
-							<value>
-								<explosiveDamageType>Bomb_Solark</explosiveDamageType>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Solark"]/statBases/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>1.30</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Solark"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Solark"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>1</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Solark"]/statBases/ArmorRating_Heat</xpath>
-							<value>
-								<ArmorRating_Heat>0</ArmorRating_Heat>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Solark"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left fist</label>
-										<capacities>
-											<li>HAR_SA_Damage_a</li>
-										</capacities>
-										<power>10</power>
-										<cooldownTime>1.66</cooldownTime>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>60</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>right fist</label>
-										<capacities>
-											<li>HAR_SA_Damage_a</li>
-										</capacities>
-										<power>10</power>
-										<cooldownTime>1.66</cooldownTime>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>60</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>25</power>
-										<cooldownTime>3.05</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<chanceFactor>0.05</chanceFactor>
-										<armorPenetrationBlunt>15</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Solark"]/alienRace/raceRestriction/whiteApparelList</xpath>
-							<value>
-								<li>CE_Apparel_TacVest</li>
-								<li>CE_Apparel_Backpack</li>
-								<li>CE_Apparel_TribalBackpack</li>
-								<li>CE_Apparel_BallisticShield</li>
-								<li>CE_Apparel_MeleeShield</li>
-								<li>CE_Apparel_GasMask</li>
-								<li>CE_Apparel_ImprovGasMask</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Solark"]/damageMultipliers</xpath>
-							<value>
-								<li>
-									<damageDef>Bomb_Solark</damageDef><!--■反物質 -->
-									<multiplier>0</multiplier>
-								</li>
-								<li>
-									<damageDef>Fragment</damageDef><!--■反物質 -->
-									<multiplier>0.3</multiplier>
-								</li>
-								<li>
-									<damageDef>Bomb_Secondary</damageDef><!--■反物質 -->
-									<multiplier>0.2</multiplier>
-								</li>
-								<li>
-									<damageDef>Thermobaric</damageDef><!--■反物質 -->
-									<multiplier>0.3</multiplier>
-								</li>
-								<li>
-									<damageDef>Flame_Secondary</damageDef><!--■反物質 -->
-									<multiplier>2</multiplier>
-								</li>
-								<li>
-									<damageDef>PrometheumFlame</damageDef><!--■反物質 -->
-									<multiplier>2</multiplier>
-								</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Soviet Armory/SovietArmory_CE_Patch_Turrets.xml b/Patches/Soviet Armory/SovietArmory_CE_Patch_Turrets.xml
deleted file mode 100644
index fcb0fa47b8..0000000000
--- a/Patches/Soviet Armory/SovietArmory_CE_Patch_Turrets.xml	
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Soviet Armory [1.4]</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Mounted AGS-17 Plamya ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AGS</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>1.21</SwayFactor>
-						<Bulk>10.40</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.76</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_30x29mmGrenade_HE</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
-						<burstShotCount>6</burstShotCount>
-						<soundCast>Shot_AGS-17</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>29</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_30x29mmGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_AGS"]/statBases/WorkToBuild</xpath>
-					<value>
-						<WorkToBuild>48000</WorkToBuild>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_AGS"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>180</Steel>
-							<ComponentIndustrial>6</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_AGS"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>75</specialDisplayRadius>
-					</value>
-				</li>
-
-				<!-- ========== Mounted NSV Utyos ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_NSV</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.45</SwayFactor>
-						<Bulk>17.60</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.40</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_127x108mm_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>Shot_NSV</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_127x108mm</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_NSV"]/statBases/WorkToBuild</xpath>
-					<value>
-						<WorkToBuild>55500</WorkToBuild>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_NSV"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>240</Steel>
-							<ComponentIndustrial>6</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_NSV"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>75</specialDisplayRadius>
-					</value>
-				</li>
-
-				<!-- ========== Common to all Turrets ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Turret_AGS" or
-						defName="Turret_NSV"
-						]/thingClass </xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="Turret_AGS" or
-						defName="Turret_NSV"
-						]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Turret_AGS" or
-						defName="Turret_NSV"
-						]/fillPercent </xpath>
-					<value>
-						<!-- Needs to be at least 0.85 in order to shoot out from CE embrasures -->
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Soviet Armory/SovietArmory_CE_Patch_Weapons.xml b/Patches/Soviet Armory/SovietArmory_CE_Patch_Weapons.xml
deleted file mode 100644
index 5d3d0b87bf..0000000000
--- a/Patches/Soviet Armory/SovietArmory_CE_Patch_Weapons.xml	
+++ /dev/null
@@ -1,1585 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Soviet Armory [1.4]</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== AK-12 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AK-12_SA</defName>
-					<statBases>
-						<Mass>3.30</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.21</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.31</SwayFactor>
-						<Bulk>7.25</Bulk>
-						<WorkToMake>35500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.38</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.275</warmupTime>
-						<range>51</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>Shot_545mm</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_AK-12_SA"]/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>
-				</li>
-
-				<!-- ========== AK-74 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AK-74_SA</defName>
-					<statBases>
-						<Mass>3.07</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.25</SwayFactor>
-						<Bulk>9.43</Bulk>
-						<WorkToMake>27500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.43</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>Shot_545mm</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_AK-74_SA"]/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>
-				</li>
-
-				<!-- ========== AKM ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AKM_SA</defName>
-					<statBases>
-						<Mass>3.30</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.21</SwayFactor>
-						<Bulk>8.80</Bulk>
-						<WorkToMake>27000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>45</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.86</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>44</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>Shot_762mm</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<ai_AvoidFriendlyFireRadius>4</ai_AvoidFriendlyFireRadius>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_AKM_SA"]/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>
-				</li>
-
-				<!-- ========== AKS-74U ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AKS-74U_SA</defName>
-					<statBases>
-						<Mass>2.70</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.00</SwayFactor>
-						<Bulk>4.90</Bulk>
-						<WorkToMake>29000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.38</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>0.9</warmupTime>
-						<range>31</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>Shot_545mm</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_AKS-74U_SA"]/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>
-				</li>
-
-				<!-- ========== Makarov ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Makarov_SA</defName>
-					<statBases>
-						<Mass>0.73</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>0.78</SwayFactor>
-						<Bulk>1.62</Bulk>
-						<WorkToMake>7000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x18mmMakarov_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_900mm</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Makarov_SA"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== MR-444 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_MR-444_SA</defName>
-					<statBases>
-						<Mass>0.76</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>0.87</SwayFactor>
-						<Bulk>1.86</Bulk>
-						<WorkToMake>7500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>20</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x18mmMakarov_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_900mm</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_MR-444_SA"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== OTs-14 Groza-1 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_OTs-14_1_SA</defName>
-					<statBases>
-						<Mass>2.70</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>0.88</SwayFactor>
-						<Bulk>6.10</Bulk>
-						<WorkToMake>35000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.07</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>40</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>Shot_545mm</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_OTs-14_1_SA"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.79</cooldownTime>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>3.02</cooldownTime>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.63</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.55</cooldownTime>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== PKM ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PKM_SA</defName>
-					<statBases>
-						<Mass>7.50</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.36</SwayFactor>
-						<Bulk>14.92</Bulk>
-						<WorkToMake>36000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>80</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.45</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<soundCast>Shot_PKM</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_MachineGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_PKM_SA"]/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>
-				</li>
-
-				<!-- ========== PP-19 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PP-19_SA</defName>
-					<statBases>
-						<Mass>2.10</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>0.87</SwayFactor>
-						<Bulk>4.25</Bulk>
-						<WorkToMake>28000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>35</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.35</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x18mmMakarov_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>Shot_900mm</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>64</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_PP-19_SA"]/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>
-				</li>
-
-				<!-- ========== RGS-50 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_RGS-50_SA</defName>
-					<statBases>
-						<Mass>6.80</Mass>
-						<RangedWeapon_Cooldown>0.90</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>1.58</SwayFactor>
-						<Bulk>8.95</Bulk>
-						<WorkToMake>15500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>5</Chemfuel>
-						<Steel>65</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50mmGS50Grenade_HE</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>25</range>
-						<burstShotCount>0</burstShotCount>
-						<ticksBetweenBurstShots>0</ticksBetweenBurstShots>
-						<soundCast>Shot_AGS-17</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>2</AmmoGenPerMagOverride>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_50mmGS50Grenade</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>0</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Launcher</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_RGS-50_SA"]/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>
-				</li>
-
-				<!-- ========== RPG-7V2 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_RPG_7_SA</defName>
-					<statBases>
-						<Mass>7.00</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.16</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.68</SwayFactor>
-						<Bulk>10.50</Bulk>
-						<WorkToMake>25500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>70</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_RPG7Grenade_HEAT</defaultProjectile>
-						<warmupTime>2.035</warmupTime>
-						<range>40</range>
-						<burstShotCount>0</burstShotCount>
-						<ticksBetweenBurstShots>0</ticksBetweenBurstShots>
-						<soundCast>Shot_RPG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>27</muzzleFlashScale>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>5.6</reloadTime>
-						<ammoSet>AmmoSet_RPG7Grenade</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>0</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Launcher</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_RPG_7_SA"]/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>
-				</li>
-
-				<!-- ========== RPK ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_RPK_SA</defName>
-					<statBases>
-						<Mass>4.80</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.06</SwayFactor>
-						<Bulk>12.40</Bulk>
-						<WorkToMake>29500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>65</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.54</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>Shot_762mm</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>75</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_MachineGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_RPK_SA"]/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>
-				</li>
-
-				<!-- ========== RPO-Z Shmel ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_RPO-Z_SA</defName>
-					<statBases>
-						<Mass>11.00</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>2.02</SwayFactor>
-						<Bulk>10.20</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_RPO_Z_Grenade</defaultProjectile>
-						<warmupTime>1.9</warmupTime>
-						<range>48</range>
-						<burstShotCount>0</burstShotCount>
-						<ticksBetweenBurstShots>0</ticksBetweenBurstShots>
-						<soundCast>Shot_RPO-Z</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>27</muzzleFlashScale>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>0</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Launcher</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Gun_RPO-Z_SA"]</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>
-				</li>
-
-				<!-- Kill original recipeMaker -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Gun_RPO-Z_SA"]/recipeMaker</xpath>
-				</li>
-
-				<!-- Replace with CE recipe that crafts multiple launchers -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>MakeRPO-Z_SA</defName>
-							<label>make RPO-Z Shmel x5</label>
-							<description>Craft 5 RPO-Z Shmel launchers.</description>
-							<jobString>Making RPO-Z Shmel launchers.</jobString>
-							<researchPrerequisite>Stage1b_SA</researchPrerequisite>
-							<skillRequirements>
-								<Crafting>7</Crafting>
-							</skillRequirements>
-							<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-							<workSkill>Crafting</workSkill>
-							<effectWorking>Smith</effectWorking>
-							<soundWorking>Recipe_Smith</soundWorking>
-							<recipeUsers>
-								<li>TableSA</li>
-							</recipeUsers>
-							<unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
-							<workAmount>24000</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>85</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>3</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>FSX</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Gun_RPO-Z_SA>5</Gun_RPO-Z_SA>
-							</products>
-						</RecipeDef>
-					</value>
-				</li>
-
-				<!-- ========== Saiga-12K ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Saiga-12K_SA</defName>
-					<statBases>
-						<Mass>3.50</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.26</SwayFactor>
-						<Bulk>6.70</Bulk>
-						<WorkToMake>22500</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>10</Chemfuel>
-						<Steel>40</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>Shot_Saiga12K</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Saiga-12K_SA"]/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>
-				</li>
-
-				<!-- ========== SKS-45 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SKS-45_SA</defName>
-					<statBases>
-						<Mass>3.85</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.41</SwayFactor>
-						<Bulk>10.20</Bulk>
-						<WorkToMake>15000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<soundCast>Shot_SKS</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_SKS-45_SA"]/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>
-				</li>
-
-				<!-- ========== SVD Dragunov ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SVD_SA</defName>
-					<statBases>
-						<Mass>4.30</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.70</SwayFactor>
-						<Bulk>12.25</Bulk>
-						<WorkToMake>23000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>60</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<soundCast>Shot_SVD</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_SVD_SA"]/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>
-				</li>
-
-				<!-- ========== TP-82 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_TP-82_SA</defName>
-					<statBases>
-						<Mass>1.60</Mass>
-						<RangedWeapon_Cooldown>0.87</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.73</SwayFactor>
-						<Bulk>3.60</Bulk>
-						<WorkToMake>3500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>30</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_TP-82</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_TP-82_SA"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== VSS Vintorez ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_VSS_SA</defName>
-					<statBases>
-						<Mass>2.60</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.19</SwayFactor>
-						<Bulk>8.94</Bulk>
-						<WorkToMake>32000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Chemfuel>5</Chemfuel>
-						<Steel>45</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.94</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>48</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>Shot_VSS</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x39mmSoviet</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_VSS_SA"]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Spaceworm/Spaceworm.xml b/Patches/Spaceworm/Spaceworm.xml
deleted file mode 100644
index e7a9053c08..0000000000
--- a/Patches/Spaceworm/Spaceworm.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Space Worms (Continued)</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Scuttlebug"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Serpentine</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Scuttlebug"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.36</MeleeDodgeChance>
-						<MeleeCritChance>0</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Scuttlebug"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>face teeth</label>
-								<capacities>
-									<li>ScuttlebugCapacity</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1</cooldownTime>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.844</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Spartan Foundry/Apparel_Armors.xml b/Patches/Spartan Foundry/Apparel_Armors.xml
deleted file mode 100644
index 291a464067..0000000000
--- a/Patches/Spartan Foundry/Apparel_Armors.xml	
+++ /dev/null
@@ -1,650 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimworld: Spartan Foundry</li>
-			<li>Rimworld: Spartan Foundry (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==================================== Powered Assault Armor =====================================-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_PoweredAssaultArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<Bulk>120</Bulk>
-						<WornBulk>18</WornBulk>
-						<MaxHitPoints>1200</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_PoweredAssaultArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>60</Mass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_PoweredAssaultArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>93.7</CarryWeight>
-							<CarryBulk>10.8</CarryBulk>
-							<ShootingAccuracyPawn>0.2</ShootingAccuracyPawn>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SF_PoweredAssaultArmor"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>100</DevilstrandCloth>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_PoweredAssaultArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>26</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_PoweredAssaultArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>59</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_PoweredAssaultArmor"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<!-- ==================================== Engineer Power Armor =====================================-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_EngineerPowerArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<Bulk>108</Bulk>
-						<WornBulk>16.2</WornBulk>
-						<MaxHitPoints>1200</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_EngineerPowerArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>60</Mass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_EngineerPowerArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>82.3</CarryWeight>
-							<CarryBulk>12</CarryBulk>
-							<ShootingAccuracyPawn>0.05</ShootingAccuracyPawn>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-							<ConstructionSpeed>0.15</ConstructionSpeed>
-							<FixBrokenDownBuildingSuccessChance>0.10</FixBrokenDownBuildingSuccessChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SF_EngineerPowerArmor"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>100</DevilstrandCloth>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_EngineerPowerArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_EngineerPowerArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>65</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_EngineerPowerArmor"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<!-- ==================================== Explorer Power Armor =====================================-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ExplorerPowerArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-						<MaxHitPoints>1200</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ExplorerPowerArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>50</Mass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ExplorerPowerArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>83.5</CarryWeight>
-							<CarryBulk>11.1</CarryBulk>
-							<ShootingAccuracyPawn>0.05</ShootingAccuracyPawn>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-							<PlantWorkSpeed>0.12</PlantWorkSpeed>
-							<ResearchSpeedFactor>0.2</ResearchSpeedFactor>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SF_ExplorerPowerArmor"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>100</DevilstrandCloth>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ExplorerPowerArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ExplorerPowerArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>45</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ExplorerPowerArmor"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<!-- ==================================== Grenadier Power Armor =====================================-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_GrenadierPowerArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<Bulk>177.8</Bulk>
-						<WornBulk>26.7</WornBulk>
-						<MaxHitPoints>1200</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_GrenadierPowerArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>80</Mass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_GrenadierPowerArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>90.4</CarryWeight>
-							<CarryBulk>16</CarryBulk>
-							<ShootingAccuracyPawn>0.2</ShootingAccuracyPawn>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-							<ReloadSpeed>-0.3</ReloadSpeed>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SF_GrenadierPowerArmor"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>100</DevilstrandCloth>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_GrenadierPowerArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>28</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_GrenadierPowerArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>91</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_GrenadierPowerArmor"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<!-- ==================================== Commando Armor =====================================-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_CommandoArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<Bulk>120</Bulk>
-						<WornBulk>18</WornBulk>
-						<MaxHitPoints>1200</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_CommandoArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>60</Mass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_CommandoArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>110.5</CarryWeight>
-							<CarryBulk>17.1</CarryBulk>
-							<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SF_CommandoArmor"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>100</DevilstrandCloth>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_CommandoArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>22</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_CommandoArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>50</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_CommandoArmor"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<!-- ==================================== Hazard Operations Armor =====================================-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_HazardOperationsArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<Bulk>155.6</Bulk>
-						<WornBulk>23.3</WornBulk>
-						<MaxHitPoints>1200</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_HazardOperationsArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>70</Mass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_HazardOperationsArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>89.7</CarryWeight>
-							<CarryBulk>14</CarryBulk>
-							<ShootingAccuracyPawn>0.05</ShootingAccuracyPawn>
-							<MiningSpeed>0.2</MiningSpeed>
-							<Flammability>-1</Flammability>
-							<ToxicEnvironmentResistance>1</ToxicEnvironmentResistance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SF_HazardOperationsArmor"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>100</DevilstrandCloth>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_HazardOperationsArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_HazardOperationsArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>45</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_HazardOperationsArmor"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<!-- ==================================== Diplomat Power Armor =====================================-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_DiplomatPowerArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<Bulk>120</Bulk>
-						<WornBulk>18</WornBulk>
-						<MaxHitPoints>1200</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_DiplomatPowerArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>60</Mass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_DiplomatPowerArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>82.3</CarryWeight>
-							<CarryBulk>12</CarryBulk>
-							<ShootingAccuracyPawn>0.05</ShootingAccuracyPawn>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-							<NegotiationAbility>0.15</NegotiationAbility>
-							<GlobalLearningFactor>0.3</GlobalLearningFactor>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SF_DiplomatPowerArmor"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>100</DevilstrandCloth>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_DiplomatPowerArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>22</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_DiplomatPowerArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>55</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_DiplomatPowerArmor"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<!-- ==================================== Defender Power Armor =====================================-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_DefenderPowerArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<Bulk>132</Bulk>
-						<WornBulk>19.8</WornBulk>
-						<MaxHitPoints>1200</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_DefenderPowerArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>73.3</Mass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_DefenderPowerArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>82.3</CarryWeight>
-							<CarryBulk>12</CarryBulk>
-							<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-							<MedicalPotency>0.1</MedicalPotency>
-							<MedicalTendQuality>0.15</MedicalTendQuality>
-							<MedicalTendSpeed>0.6</MedicalTendSpeed>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SF_DefenderPowerArmor"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>100</DevilstrandCloth>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_DefenderPowerArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_DefenderPowerArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>55</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_DefenderPowerArmor"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<!-- ==================================== Scout Power Armor =====================================-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ScoutPowerArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<Bulk>106.67</Bulk>
-						<WornBulk>16</WornBulk>
-						<MaxHitPoints>1200</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ScoutPowerArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>53.33</Mass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ScoutPowerArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>87.3</CarryWeight>
-							<CarryBulk>11.20</CarryBulk>
-							<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-							<MoveSpeed>0.4</MoveSpeed>
-							<TrapSpringChance>-1</TrapSpringChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SF_ScoutPowerArmor"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>100</DevilstrandCloth>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ScoutPowerArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ScoutPowerArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>45</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ScoutPowerArmor"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<!-- ==================================== Samurai Power Armor =====================================-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_SamuraiPowerArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<Bulk>106.7</Bulk>
-						<WornBulk>16</WornBulk>
-						<MaxHitPoints>1200</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_SamuraiPowerArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>53.3</Mass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_SamuraiPowerArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>88.1</CarryWeight>
-							<CarryBulk>10.7</CarryBulk>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-							<MeleeHitChance>0.05</MeleeHitChance>
-							<MeleeCritChance>0.1</MeleeCritChance>
-							<MeleeDodgeChance>0.15</MeleeDodgeChance>
-							<MeleeParryChance>0.3</MeleeParryChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SF_SamuraiPowerArmor"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>100</DevilstrandCloth>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_SamuraiPowerArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_SamuraiPowerArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>36</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_SamuraiPowerArmor"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<!-- ==================================== Shock Trooper Armor =====================================-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ShockTrooperArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<Bulk>106.7</Bulk>
-						<WornBulk>16</WornBulk>
-						<MaxHitPoints>1200</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ShockTrooperArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>53.33</Mass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ShockTrooperArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>82.7</CarryWeight>
-							<CarryBulk>10.7</CarryBulk>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-							<MeleeHitChance>0.025</MeleeHitChance>
-							<MeleeCritChance>0.5</MeleeCritChance>
-							<MeleeDodgeChance>0.075</MeleeDodgeChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SF_ShockTrooperArmor"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>100</DevilstrandCloth>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ShockTrooperArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>19</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ShockTrooperArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>52</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ShockTrooperArmor"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<!-- ==================================== Recon Power Armor =====================================-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ReconPowerArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<Bulk>84</Bulk>
-						<WornBulk>12.6</WornBulk>
-						<MaxHitPoints>1200</MaxHitPoints>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ReconPowerArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>46.7</Mass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ReconPowerArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>72.6</CarryWeight>
-							<CarryBulk>8.2</CarryBulk>
-							<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-							<MoveSpeed>0.4</MoveSpeed>
-							<WorkSpeedGlobal>0.1</WorkSpeedGlobal>
-							<CarryingCapacity>30</CarryingCapacity>
-							<HuntingStealth>1</HuntingStealth>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SF_ReconPowerArmor"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>100</DevilstrandCloth>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ReconPowerArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ReconPowerArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>55</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ReconPowerArmor"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Spartan Foundry/Apparel_Headgear.xml b/Patches/Spartan Foundry/Apparel_Headgear.xml
deleted file mode 100644
index 569df207ed..0000000000
--- a/Patches/Spartan Foundry/Apparel_Headgear.xml	
+++ /dev/null
@@ -1,765 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Rimworld: Spartan Foundry</li>
-			<li>Rimworld: Spartan Foundry (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==================================== Powered Assault Armor Helmet =====================================-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_PoweredAssaultArmorHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<MaxHitPoints>240</MaxHitPoints>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="SF_PoweredAssaultArmorHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="SF_PoweredAssaultArmorHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_PoweredAssaultArmorHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>0.2</AimingAccuracy>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-							<PainShockThreshold>0.2</PainShockThreshold>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SF_PoweredAssaultArmorHelmet"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>40</DevilstrandCloth>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_PoweredAssaultArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_PoweredAssaultArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>45</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_PoweredAssaultArmorHelmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SF_PoweredAssaultArmorHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!-- ==================================== Engineer Power Armor Helmet =====================================-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_EngineerPowerArmorHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<Bulk>4.5</Bulk>
-						<WornBulk>0.9</WornBulk>
-						<MaxHitPoints>240</MaxHitPoints>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="SF_EngineerPowerArmorHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="SF_EngineerPowerArmorHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_EngineerPowerArmorHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>0.05</AimingAccuracy>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-							<ConstructSuccessChance>0.2</ConstructSuccessChance>
-							<FixBrokenDownBuildingSuccessChance>0.1</FixBrokenDownBuildingSuccessChance>
-							<ConstructionSpeed>0.1</ConstructionSpeed>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SF_EngineerPowerArmorHelmet"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>40</DevilstrandCloth>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_EngineerPowerArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_EngineerPowerArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>44</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_EngineerPowerArmorHelmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SF_EngineerPowerArmorHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!-- ==================================== Explorer Power Armor Helmet =====================================-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ExplorerPowerArmorHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<MaxHitPoints>240</MaxHitPoints>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="SF_ExplorerPowerArmorHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="SF_ExplorerPowerArmorHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ExplorerPowerArmorHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<PsychicSensitivity>-0.3</PsychicSensitivity>
-							<AimingAccuracy>0.05</AimingAccuracy>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-							<PlantHarvestYield>0.1</PlantHarvestYield>
-							<TameAnimalChance>0.1</TameAnimalChance>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SF_ExplorerPowerArmorHelmet"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>40</DevilstrandCloth>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ExplorerPowerArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ExplorerPowerArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>35</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ExplorerPowerArmorHelmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SF_ExplorerPowerArmorHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!-- ==================================== Grenadier Power Armor Helmet =====================================-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_GrenadierPowerArmorHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<Bulk>5.6</Bulk>
-						<WornBulk>1.1</WornBulk>
-						<MaxHitPoints>240</MaxHitPoints>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="SF_GrenadierPowerArmorHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="SF_GrenadierPowerArmorHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_GrenadierPowerArmorHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>0.35</AimingAccuracy>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SF_GrenadierPowerArmorHelmet"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>40</DevilstrandCloth>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_GrenadierPowerArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>22</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_GrenadierPowerArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>71</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_GrenadierPowerArmorHelmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SF_GrenadierPowerArmorHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!-- ==================================== Commando Armor Helmet =====================================-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_CommandoArmorHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<MaxHitPoints>240</MaxHitPoints>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="SF_CommandoArmorHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="SF_CommandoArmorHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_CommandoArmorHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>0.45</AimingAccuracy>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-							<AimingDelayFactor>-0.15</AimingDelayFactor>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SF_CommandoArmorHelmet"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>40</DevilstrandCloth>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_CommandoArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_CommandoArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>36</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_CommandoArmorHelmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SF_CommandoArmorHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!-- ==================================== Hazard Operations Armor Helmet =====================================-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_HazardOperationsArmorHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<Bulk>5.6</Bulk>
-						<WornBulk>1.1</WornBulk>
-						<MaxHitPoints>240</MaxHitPoints>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="SF_HazardOperationsArmorHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="SF_HazardOperationsArmorHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_HazardOperationsArmorHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<PsychicSensitivity>-1</PsychicSensitivity>
-							<AimingAccuracy>0.05</AimingAccuracy>
-							<ToxicEnvironmentResistance>1</ToxicEnvironmentResistance>
-							<ImmunityGainSpeed>0.1</ImmunityGainSpeed>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SF_HazardOperationsArmorHelmet"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>40</DevilstrandCloth>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_HazardOperationsArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_HazardOperationsArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>35</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_HazardOperationsArmorHelmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SF_HazardOperationsArmorHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!-- ==================================== Diplomat Power Armor Helmet =====================================-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_DiplomatPowerArmorHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<MaxHitPoints>240</MaxHitPoints>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="SF_DiplomatPowerArmorHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="SF_DiplomatPowerArmorHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_DiplomatPowerArmorHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>0.05</AimingAccuracy>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-							<GlobalLearningFactor>0.1</GlobalLearningFactor>
-							<NegotiationAbility>0.15</NegotiationAbility>
-							<SocialImpact>0.25</SocialImpact>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SF_DiplomatPowerArmorHelmet"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>40</DevilstrandCloth>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_DiplomatPowerArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_DiplomatPowerArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>40</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_DiplomatPowerArmorHelmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SF_DiplomatPowerArmorHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!-- ==================================== Defender Power Armor Helmet =====================================-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_DefenderPowerArmorHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<Bulk>4.5</Bulk>
-						<WornBulk>0.9</WornBulk>
-						<MaxHitPoints>240</MaxHitPoints>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="SF_DefenderPowerArmorHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="SF_DefenderPowerArmorHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_DefenderPowerArmorHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>0.15</AimingAccuracy>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-							<MedicalTendQuality>0.10</MedicalTendQuality>
-							<MedicalOperationSpeed>0.15</MedicalOperationSpeed>
-							<SurgerySuccessChanceFactor>0.15</SurgerySuccessChanceFactor>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SF_DefenderPowerArmorHelmet"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>40</DevilstrandCloth>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_DefenderPowerArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>21</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_DefenderPowerArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>58</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_DefenderPowerArmorHelmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SF_DefenderPowerArmorHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!-- ==================================== Scout Power Armor Helmet =====================================-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ScoutPowerArmorHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<MaxHitPoints>240</MaxHitPoints>
-						<NightVisionEfficiency_Apparel>0.7</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="SF_ScoutPowerArmorHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="SF_ScoutPowerArmorHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ScoutPowerArmorHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>0.5</AimingAccuracy>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-							<AimingDelayFactor>0.2</AimingDelayFactor>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SF_ScoutPowerArmorHelmet"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>40</DevilstrandCloth>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ScoutPowerArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ScoutPowerArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>36</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ScoutPowerArmorHelmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SF_ScoutPowerArmorHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!-- ==================================== Samurai Power Armor Helmet =====================================-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_SamuraiPowerArmorHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<MaxHitPoints>240</MaxHitPoints>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="SF_SamuraiPowerArmorHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="SF_SamuraiPowerArmorHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_SamuraiPowerArmorHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<PsychicSensitivity>-0.08</PsychicSensitivity>
-							<ToxicEnvironmentResistance>0.20</ToxicEnvironmentResistance>
-							<MeleeHitChance>0.15</MeleeHitChance>
-							<MeleeCritChance>0.35</MeleeCritChance>
-							<MeleeDodgeChance>0.05</MeleeDodgeChance>
-							<MeleeParryChance>0.1</MeleeParryChance>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SF_SamuraiPowerArmorHelmet"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>40</DevilstrandCloth>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_SamuraiPowerArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_SamuraiPowerArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>36</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_SamuraiPowerArmorHelmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SF_SamuraiPowerArmorHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!-- ==================================== Shock Trooper Armor Helmet =====================================-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ShockTrooperArmorHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<MaxHitPoints>240</MaxHitPoints>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="SF_ShockTrooperArmorHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="SF_ShockTrooperArmorHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ShockTrooperArmorHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<PsychicSensitivity>-0.08</PsychicSensitivity>
-							<ToxicEnvironmentResistance>0.20</ToxicEnvironmentResistance>
-							<MeleeHitChance>0.075</MeleeHitChance>
-							<MeleeCritChance>0.15</MeleeCritChance>
-							<MeleeDodgeChance>0.025</MeleeDodgeChance>
-							<MeleeParryChance>0.05</MeleeParryChance>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SF_ShockTrooperArmorHelmet"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>40</DevilstrandCloth>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ShockTrooperArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ShockTrooperArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>44</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ShockTrooperArmorHelmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SF_ShockTrooperArmorHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!-- ==================================== Recon Power Armor Helmet =====================================-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ReconPowerArmorHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<Bulk>4.5</Bulk>
-						<WornBulk>0.9</WornBulk>
-						<MaxHitPoints>240</MaxHitPoints>
-						<NightVisionEfficiency_Apparel>0.7</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ReconPowerArmorHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>0.15</AimingAccuracy>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-							<GeneralLaborSpeed>0.15</GeneralLaborSpeed>
-							<SmeltingSpeed>0.20</SmeltingSpeed>
-							<SmoothingSpeed>0.05</SmoothingSpeed>
-							<ForagedNutritionPerDay>6</ForagedNutritionPerDay>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SF_ReconPowerArmorHelmet"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>40</DevilstrandCloth>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ReconPowerArmorHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>12</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ReconPowerArmorHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>33</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SF_ReconPowerArmorHelmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SF_ReconPowerArmorHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Spidercamp's Horses/SpidercampsHorses_Races_Animal_Horse.xml b/Patches/Spidercamp's Horses/SpidercampsHorses_Races_Animal_Horse.xml
deleted file mode 100644
index 6357d6539a..0000000000
--- a/Patches/Spidercamp's Horses/SpidercampsHorses_Races_Animal_Horse.xml	
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Spidercamp's Horses (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Horse Melee ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[
-						defName="SCQuarterHorse" or
-						defName="SCBlackHorse" or
-						defName="SCWhiteHorse" or
-						defName="SCPalomino"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="SCQuarterHorse" or
-						defName="SCBlackHorse" or
-						defName="SCWhiteHorse" or
-						defName="SCPalomino"
-						]/statBases </xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.39</MeleeCritChance>
-						<MeleeParryChance>0.24</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="SCQuarterHorse" or
-						defName="SCBlackHorse" or
-						defName="SCWhiteHorse" or
-						defName="SCPalomino"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.938</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.97</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.12</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Star Crafter's Armory/CMC300.xml b/Patches/Star Crafter's Armory/CMC300.xml
deleted file mode 100644
index 61d61beda7..0000000000
--- a/Patches/Star Crafter's Armory/CMC300.xml	
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Star Crafters Armory</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ==================== CMC300a Armor =====================-->
-
-				<!--Clumbersome armor with a carbon fiber helmet? for real?-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CMC300a"]/statBases</xpath>
-					<value>
-						<Bulk>200</Bulk>
-						<WornBulk>30</WornBulk>
-					</value>
-				</li>
-
-				<!-- Mass Produced...I guess?-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMC300a"]/statBases/WorkToMake</xpath>
-					<value>
-						<WorkToMake>65000</WorkToMake>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMC300a"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>1000</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMC300a"]/statBases/Mass</xpath>
-					<value>
-						<Mass>175</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMC300a"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMC300a"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>32</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMC300a"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>150</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMC300a"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>200</Plasteel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CMC300a"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>80</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CMC300a"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>175</CarryWeight>
-						<CarryBulk>30</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="CMC300a"]/equippedStatOffsets/ToxicSensitivity</xpath>
-					<match Class="PatchOperationRemove">
-						<xpath>Defs/ThingDef[defName="CMC300a"]/equippedStatOffsets/ToxicSensitivity</xpath>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="CMC300a"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
-					<match Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="CMC300a"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
-						<value>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-						</value>
-					</match>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="CMC300a"]/equippedStatOffsets</xpath>
-						<value>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-						</value>
-					</nomatch>
-				</li>
-
-				<!-- ==================== CMC300 helmet =====================-->
-
-				<!-- Carbon fiber, so lightweight but low HP and flammable-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CMC300H" or defName="CMC300Ha" or defName="CMC300Hb"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMC300H" or defName="CMC300Ha" or defName="CMC300Hb"]/statBases/Mass</xpath>
-					<value>
-						<Mass>5</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMC300H" or defName="CMC300Ha" or defName="CMC300Hb"]/statBases/WorkToMake</xpath>
-					<value>
-						<WorkToMake>20000</WorkToMake>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMC300H" or defName="CMC300Ha" or defName="CMC300Hb"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>220</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMC300H" or defName="CMC300Ha" or defName="CMC300Hb"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>24</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMC300H" or defName="CMC300Ha" or defName="CMC300Hb"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>60</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CMC300H" or defName="CMC300Ha" or defName="CMC300Hb"]/equippedStatOffsets</xpath>
-					<value>
-						<AimingAccuracy>0.15</AimingAccuracy>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="CMC300H" or defName="CMC300Ha" or defName="CMC300Hb"]/equippedStatOffsets/ToxicSensitivity</xpath>
-					<match Class="PatchOperationRemove">
-						<xpath>Defs/ThingDef[defName="CMC300H" or defName="CMC300Ha" or defName="CMC300Hb"]/equippedStatOffsets/ToxicSensitivity</xpath>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="CMC300H" or defName="CMC300Ha" or defName="CMC300Hb"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
-					<match Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="CMC300H" or defName="CMC300Ha" or defName="CMC300Hb"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
-						<value>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-						</value>
-					</match>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="CMC300H" or defName="CMC300Ha" or defName="CMC300Hb"]/equippedStatOffsets</xpath>
-						<value>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMC300H" or defName="CMC300Ha" or defName="CMC300Hb"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>60</Plasteel>
-						<Steel>60</Steel>
-						<DevilstrandCloth>25</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CMC300H" or defName="CMC300Ha" or defName="CMC300Hb"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="CMC300H" or defName="CMC300Ha" or defName="CMC300Hb"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Star Crafter's Armory/CMC405.xml b/Patches/Star Crafter's Armory/CMC405.xml
deleted file mode 100644
index 3c7ac7ba33..0000000000
--- a/Patches/Star Crafter's Armory/CMC405.xml	
+++ /dev/null
@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Star Crafters Armory</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ==================== CMC405a Armor =====================-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CMC405a"]/statBases</xpath>
-					<value>
-						<Bulk>135</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PPSa"]/statBases/WorkToMake</xpath>
-					<value>
-						<WorkToMake>95000</WorkToMake>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMC405a"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>750</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMC405a"]/statBases/Mass</xpath>
-					<value>
-						<Mass>125</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMC405a"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMC405a"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>24</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMC405a"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>90</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CMC405a"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>80</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMC405a"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>200</Plasteel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMC405a"]/costList/ComponentIndustrial</xpath>
-					<value>
-						<ComponentSpacer>6</ComponentSpacer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CMC405a"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>150</CarryWeight>
-						<CarryBulk>30</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="CMC405a"]/equippedStatOffsets/ToxicSensitivity</xpath>
-					<match Class="PatchOperationRemove">
-						<xpath>Defs/ThingDef[defName="CMC405a"]/equippedStatOffsets/ToxicSensitivity</xpath>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="CMC405a"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
-					<match Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="CMC405a"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
-						<value>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-						</value>
-					</match>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="CMC405a"]/equippedStatOffsets</xpath>
-						<value>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-						</value>
-					</nomatch>
-				</li>
-
-				<!-- ==================== CMC-405 helmet =====================-->
-
-				<!--100% night vision because of "integrated x ray"-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CMC405H"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>1</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMC405H"]/statBases/WorkToMake</xpath>
-					<value>
-						<WorkToMake>30000</WorkToMake>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMC405H"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMC405H"]/statBases/Mass</xpath>
-					<value>
-						<Mass>8.5</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMC405H"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>320</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMC405H"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>21</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMC405H"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>70</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CMC405H"]/equippedStatOffsets</xpath>
-					<value>
-						<AimingAccuracy>0.15</AimingAccuracy>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="CMC405H"]/equippedStatOffsets/ToxicSensitivity</xpath>
-					<match Class="PatchOperationRemove">
-						<xpath>Defs/ThingDef[defName="CMC405H"]/equippedStatOffsets/ToxicSensitivity</xpath>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="CMC405H"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
-					<match Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="CMC405H"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
-						<value>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-						</value>
-					</match>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="CMC405H"]/equippedStatOffsets</xpath>
-						<value>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CMC405H"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>90</Plasteel>
-						<DevilstrandCloth>25</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CMC405H"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="CMC405H"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Star Crafter's Armory/PPS.xml b/Patches/Star Crafter's Armory/PPS.xml
deleted file mode 100644
index b1c86f9c40..0000000000
--- a/Patches/Star Crafter's Armory/PPS.xml	
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Star Crafters Armory</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ==================== PPS Armor =====================-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PPSa"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PPSa"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>1000</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PPSa"]/statBases/WorkToMake</xpath>
-					<value>
-						<WorkToMake>95000</WorkToMake>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PPSa"]/statBases/Mass</xpath>
-					<value>
-						<Mass>150</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PPSa"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="PPSa"]/equippedStatOffsets/ToxicSensitivity</xpath>
-					<match Class="PatchOperationRemove">
-						<xpath>Defs/ThingDef[defName="PPSa"]/equippedStatOffsets/ToxicSensitivity</xpath>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="PPSa"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
-					<match Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="PPSa"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
-						<value>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-						</value>
-					</match>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="PPSa"]/equippedStatOffsets</xpath>
-						<value>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PPSa"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>28</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PPSa"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>120</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PPSa"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>325</Plasteel>
-						<DevilstrandCloth>80</DevilstrandCloth>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PPSa"]/costList/Uranium</xpath>
-					<value>
-						<Uranium>100</Uranium>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PPSa"]/costList/Steel</xpath>
-					<value>
-						<ComponentIndustrial>20</ComponentIndustrial>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PPSa"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>225</CarryWeight>
-						<CarryBulk>50</CarryBulk>
-					</value>
-				</li>
-
-				<!-- ==================== PPS helmet =====================-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PPSH"]/statBases</xpath>
-					<value>
-						<Bulk>25</Bulk>
-						<WornBulk>5</WornBulk>
-						<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PPSH"]/statBases/WorkToMake</xpath>
-					<value>
-						<WorkToMake>30000</WorkToMake>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PPSH"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PPSH"]/statBases/Mass</xpath>
-					<value>
-						<Mass>15</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PPSH"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>320</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PPSH"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PPSH"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>70</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PPSH"]/equippedStatOffsets</xpath>
-					<value>
-						<AimingAccuracy>0.15</AimingAccuracy>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PPSH"]/equippedStatOffsets/ToxicSensitivity</xpath>
-					<value>
-						<ToxicEnvironmentResistance>-0.5</ToxicEnvironmentResistance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="PPSH"]/equippedStatOffsets/ToxicSensitivity</xpath>
-					<match Class="PatchOperationRemove">
-						<xpath>Defs/ThingDef[defName="PPSH"]/equippedStatOffsets/ToxicSensitivity</xpath>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="PPSH"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
-					<match Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="PPSH"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
-						<value>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-						</value>
-					</match>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="PPSH"]/equippedStatOffsets</xpath>
-						<value>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PPSH"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>150</Plasteel>
-						<DevilstrandCloth>35</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PPSH"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="PPSH"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Star Crafter's Armory/Weapons.xml b/Patches/Star Crafter's Armory/Weapons.xml
deleted file mode 100644
index c4ac161613..0000000000
--- a/Patches/Star Crafter's Armory/Weapons.xml	
+++ /dev/null
@@ -1,531 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Star Crafters Armory</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CoS_C14_D_Gun" or defName="CoS_C14_Gun" or defName="CoS_C20_Gun" or defName="CoS_P45_Gun" or defName="CoS_Perdition_Flamethrower"]/recipeMaker/recipeUsers</xpath>
-					<value>
-						<recipeUsers>
-							<li>FabricationBench</li>
-						</recipeUsers>
-					</value>
-				</li>
-
-				<!-- ========== C14D ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CoS_C14_D_Gun</defName>
-					<statBases>
-						<Mass>20</Mass>
-						<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.3</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.34</SwayFactor>
-						<Bulk>25.5</Bulk>
-						<WorkToMake>65000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>240</Steel>
-						<Plasteel>150</Plasteel>
-						<ComponentIndustrial>10</ComponentIndustrial>
-						<ComponentSpacer>3</ComponentSpacer>
-					</costList>
-					<Properties>
-						<recoilAmount>2.25</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8mmRailgun_Sabot</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>65</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>Shot_C14</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_8mmRailgun</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CoS_C14_D_Gun"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</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>12</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>12</power>
-								<cooldownTime>1.55</cooldownTime>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</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>
-				</li>
-
-				<!-- ========== C14 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CoS_C14_Gun</defName>
-					<statBases>
-						<Mass>20</Mass>
-						<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.3</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.34</SwayFactor>
-						<Bulk>25.5</Bulk>
-						<WorkToMake>65000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>220</Steel>
-						<Plasteel>150</Plasteel>
-						<ComponentIndustrial>10</ComponentIndustrial>
-						<ComponentSpacer>3</ComponentSpacer>
-					</costList>
-					<Properties>
-						<recoilAmount>2.25</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8mmRailgun_Sabot</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>65</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>Shot_C14</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_8mmRailgun</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CoS_C14_Gun"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</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>12</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>12</power>
-								<cooldownTime>1.55</cooldownTime>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== C20A ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CoS_C20_Gun</defName>
-					<statBases>
-						<Mass>9.45</Mass>
-						<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-						<SwayFactor>2.40</SwayFactor>
-						<ShotSpread>0.1</ShotSpread>
-						<SightsEfficiency>2.45</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.86</RangedWeapon_Cooldown>
-						<Bulk>11.55</Bulk>
-						<WorkToMake>58000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>150</Steel>
-						<Plasteel>100</Plasteel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-						<ComponentSpacer>5</ComponentSpacer>
-					</costList>
-					<Properties>
-						<recoilAmount>2.25</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8mmRailgun_Sabot</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>86</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
-						<soundCast>Shot_TurretSniper</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>20</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_8mmRailgun</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>False</aiUseBurstMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>CE_AI_SR</li>
-						<li>Bipod_AMR</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CoS_C20_Gun"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</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>12</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>12</power>
-								<cooldownTime>1.55</cooldownTime>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== P45 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CoS_P45_Gun</defName>
-					<statBases>
-						<Mass>10.5</Mass>
-						<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.12</SwayFactor>
-						<Bulk>8.5</Bulk>
-						<WorkToMake>35000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>55</Steel>
-						<Plasteel>50</Plasteel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-						<ComponentSpacer>2</ComponentSpacer>
-					</costList>
-					<Properties>
-						<recoilAmount>1.25</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6mmRailgun_Sabot</defaultProjectile>
-						<warmupTime>0.8</warmupTime>
-						<range>18</range>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>Shot_Revolver</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>45</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_6mmRailgun</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CoS_P45_Gun"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>CoS_Perdition_Flamethrower</defName>
-					<statBases>
-						<Mass>8.00</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.5</ShotSpread>
-						<SwayFactor>4</SwayFactor>
-						<Bulk>13.00</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<recoilAmount>0.85</recoilAmount>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Flamethrower_Prometheum</defaultProjectile>
-						<burstShotCount>30</burstShotCount>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<warmupTime>1</warmupTime>
-						<range>20</range>
-						<minRange>3</minRange>
-						<soundCast>Shot_PERDITION</soundCast>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>120</magazineSize>
-						<reloadTime>8</reloadTime>
-						<ammoSet>AmmoSet_Flamethrower</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>15</aimedBurstShotCount>
-						<noSingleShot>True</noSingleShot>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CoS_Perdition_Flamethrower"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.49</cooldownTime>
-								<chanceFactor>0.3</chanceFactor>
-								<armorPenetrationBlunt>15.375</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CoS_CombatMedicShield"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shield face</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.49</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>5.375</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shield corner</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.30</cooldownTime>
-								<armorPenetrationBlunt>10.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-				-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="CoS_CombatMedicShield"]</xpath>
-					<value>
-						<ThingDef ParentName="ShieldBase">
-							<defName>CoS_CombatMedicShield</defName>
-							<label>Combat Medic Shield</label>
-							<description>A plasteel alloy combat shield designed for medical staff to carry during battle. Tough and bulky, it will straight out reduce incoming damage in a percentage and can be used as a bash weapon.</description>
-							<graphicData>
-								<texPath>Things/Shield/CombatMedicShield</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<techLevel>Spacer</techLevel>
-							<costStuffCount>50</costStuffCount>
-							<stuffCategories>
-								<li>Steeled</li>
-							</stuffCategories>
-							<recipeMaker>
-								<researchPrerequisite>Fabrication</researchPrerequisite>
-								<recipeUsers Inherit="False">
-									<li>FabricationBench</li>
-								</recipeUsers>
-							</recipeMaker>
-							<costList>
-								<Plasteel>100</Plasteel>
-								<ComponentSpacer>5</ComponentSpacer>
-							</costList>
-							<statBases>
-								<WorkToMake>25000</WorkToMake>
-								<MaxHitPoints>125</MaxHitPoints>
-								<StuffEffectMultiplierArmor>10</StuffEffectMultiplierArmor>
-								<Mass>13</Mass>
-								<Bulk>15</Bulk>
-								<WornBulk>10</WornBulk>
-							</statBases>
-							<equippedStatOffsets>
-								<IncomingDamageFactor>-0.35</IncomingDamageFactor>
-								<ReloadSpeed>-0.3</ReloadSpeed>
-								<MeleeHitChance>-4</MeleeHitChance>
-								<ShootingAccuracyPawn>-0.4</ShootingAccuracyPawn>
-								<AimingAccuracy>-0.2</AimingAccuracy>
-								<Suppressability>-0.5</Suppressability>
-								<MeleeCritChance>-0.2</MeleeCritChance>
-								<MeleeParryChance>1.0</MeleeParryChance>
-							</equippedStatOffsets>
-							<modExtensions>
-								<li Class="CombatExtended.ShieldDefExtension">
-									<shieldCoverage>
-										<li>Hands</li>
-										<li>Arms</li>
-										<li>Shoulders</li>
-										<li>Torso</li>
-										<li>Neck</li>
-										<li>FullHead</li>
-									</shieldCoverage>
-									<crouchCoverage>
-										<li>Legs</li>
-									</crouchCoverage>
-									<drawAsTall>true</drawAsTall>
-								</li>
-							</modExtensions>
-						</ThingDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Star Wars - Droids/Patch_SWDroids_Astromech.xml b/Patches/Star Wars - Droids/Patch_SWDroids_Astromech.xml
deleted file mode 100644
index 01beea5925..0000000000
--- a/Patches/Star Wars - Droids/Patch_SWDroids_Astromech.xml	
+++ /dev/null
@@ -1,441 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Star Wars - Astromech Droids (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="BB_Astromech"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="BB_Astromech"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="C1_Astromech"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="C1_Astromech"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="R2_Astromech"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="R2_Astromech"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="R3_Astromech"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="R3_Astromech"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="R4_Astromech"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="R4_Astromech"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="R5_Astromech"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="R5_Astromech"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="R6_Astromech"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="R6_Astromech"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="BB_Astromech" or
-						defName="C1_Astromech" or
-						defName="R2_Astromech" or
-						defName="R3_Astromech" or
-						defName="R4_Astromech" or
-						defName="R5_Astromech" or
-						defName="R6_Astromech"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="BB_Astromech" or
-						defName="C1_Astromech" or
-						defName="R2_Astromech" or
-						defName="R3_Astromech" or
-						defName="R4_Astromech" or
-						defName="R5_Astromech" or
-						defName="R6_Astromech"
-						]/comps </xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<!--<li Class="CombatExtended.CompProperties_Suppressable" />-->
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="BB_Astromech" or
-						defName="C1_Astromech" or
-						defName="R2_Astromech" or
-						defName="R3_Astromech" or
-						defName="R4_Astromech" or
-						defName="R5_Astromech" or
-						defName="R6_Astromech"
-						]/statBases </xpath>
-					<value>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-						<SmokeSensitivity>0</SmokeSensitivity>
-						<!--<Suppressability>0</Suppressability>-->
-						<CarryBulk>30</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="BB_Astromech" or
-						defName="R2_Astromech" or
-						defName="R3_Astromech" or
-						defName="R6_Astromech"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Charge Arm</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Circular Saw</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Electric Arc Welder</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<extraMeleeDamages>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>3</amount>
-										<chance>1</chance>
-									</li>
-								</extraMeleeDamages>
-								<power>1</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
-								<armorPenetrationSharp>13</armorPenetrationSharp>
-								<armorPenetrationBlunt>0</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2.5</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="C1_Astromech"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Charge Arm</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2.5</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="R4_Astromech"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Circular Saw</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Electric Arc Welder</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<extraMeleeDamages>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>3</amount>
-										<chance>1</chance>
-									</li>
-								</extraMeleeDamages>
-								<power>1</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
-								<armorPenetrationSharp>13</armorPenetrationSharp>
-								<armorPenetrationBlunt>0</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2.5</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="R5_Astromech"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Repair Arm</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Repair Arm</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>5</cooldownTime>
-								<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2.5</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Astromech_BB_Body"]//*[def="SW_Droid_Hull_Sphere" or def="SW_Droid_Neck" or def="SW_Droid_Arm" or def="SW_Astromech_Head"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Astromech_BB_Body"]//*[def="SW_Droid_IntellexIV" or def="SW_Droid_Auditory_Sensor" or def="SW_Droid_Charge_Arm" or def="SW_Droid_Electric_Arc_Welder" or def="SW_Droid_Circular_Saw"
-						or def="SW_Droid_Repair_Arm" or def="SW_Droid_Computer_Scomp_Link" or def="SW_Droid_Loudspeaker"] </xpath>
-					<value>
-						<depth>Inside</depth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Astromech_C1_Body"]//*[def="SW_Droid_Hull" or def="SW_Droid_Arm" or def="SW_Astromech_Head" or def="SW_Droid_Motorized_Tread"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Astromech_C1_Body"]//*[def="SW_Droid_IntellexIV" or def="SW_Droid_Auditory_Sensor" or def="SW_Droid_Charge_Arm" or def="SW_Droid_Repair_Arm" or def="SW_Droid_Loudspeaker"
-						or def="SW_Droid_Computer_Scomp_Link"] </xpath>
-					<value>
-						<depth>Inside</depth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Astromech_R2_R6_R0_Body"]//*[def="SW_Droid_Hull" or def="SW_Droid_Arm" or def="SW_Astromech_Head" or def="SW_Droid_Motorized_Tread"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Astromech_R2_R6_R0_Body"]//*[def="SW_Droid_IntellexIV" or def="SW_Droid_Auditory_Sensor" or def="SW_Droid_Charge_Arm" or def="SW_Droid_Electric_Arc_Welder" or def="SW_Droid_Circular_Saw"
-						or def="SW_Droid_Repair_Arm" or def="SW_Droid_Computer_Scomp_Link" or def="SW_Droid_Loudspeaker"] </xpath>
-					<value>
-						<depth>Inside</depth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Astromech_R4_Body"]//*[def="SW_Droid_R4_Hull" or def="SW_Droid_Arm" or def="SW_Astromech_Head" or def="SW_Droid_Motorized_Tread"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Astromech_R4_Body"]//*[def="SW_Droid_IntellexIV" or def="SW_Droid_Auditory_Sensor" or def="SW_Droid_Electric_Arc_Welder" or def="SW_Droid_Circular_Saw"
-						or def="SW_Droid_Repair_Arm" or def="SW_Droid_Computer_Scomp_Link" or def="SW_Droid_Loudspeaker"] </xpath>
-					<value>
-						<depth>Inside</depth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Astromech_R5_Body"]//*[def="SW_Droid_R5_Hull" or def="SW_Droid_Arm" or def="SW_Astromech_R5_Head" or def="SW_Droid_R5_Motorized_Tread"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Astromech_R5_Body"]//*[def="SW_Droid_IntellexIV" or def="SW_Droid_Auditory_Sensor" or def="SW_Droid_Electric_Arc_Welder" or def="SW_Droid_Circular_Saw"
-						or def="SW_Droid_R5_Repair_Arm" or def="SW_Droid_Computer_Scomp_Link" or def="SW_Droid_Loudspeaker"] </xpath>
-					<value>
-						<depth>Inside</depth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="BB_Astromech" or
-						defName="C1_Astromech" or
-						defName="R2_Astromech" or
-						defName="R3_Astromech" or
-						defName="R4_Astromech" or
-						defName="R5_Astromech" or
-						defName="R6_Astromech"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="BB_Astromech" or
-						defName="C1_Astromech" or
-						defName="R2_Astromech" or
-						defName="R3_Astromech" or
-						defName="R4_Astromech" or
-						defName="R5_Astromech" or
-						defName="R6_Astromech"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="BB_Astromech" or
-						defName="C1_Astromech" or
-						defName="R2_Astromech" or
-						defName="R3_Astromech" or
-						defName="R4_Astromech" or
-						defName="R5_Astromech" or
-						defName="R6_Astromech"
-						]/statBases/ArmorRating_Heat </xpath>
-					<value>
-						<ArmorRating_Heat>0</ArmorRating_Heat>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Star Wars - Droids/Patch_SWDroids_Core.xml b/Patches/Star Wars - Droids/Patch_SWDroids_Core.xml
deleted file mode 100644
index 4d92e81b3f..0000000000
--- a/Patches/Star Wars - Droids/Patch_SWDroids_Core.xml	
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Star Wars - Droids Core (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[
-						defName="SW_Droid_Arm_Computer_Scomp_Link" or
-						defName="SW_Droid_Arm_Charge_Arm" or
-						defName="SW_Droid_Arm_Electric_Arc_Welder" or
-						defName="SW_Droid_Arm_Circular_Saw" or
-						defName="SW_Droid_Arm_Hypodermic_Injector" or
-						defName="SW_Droid_Arm" or
-						defName="SW_Droid_Arm_Cutting_Saw" or
-						defName="SW_Droid_Arm_Repair_Arm"
-						]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-								<soundMeleeHit>MeleeHit_BionicPunch</soundMeleeHit>
-								<soundMeleeMiss>MeleeMiss_BionicPunch</soundMeleeMiss>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Star Wars - Droids/Patch_SWDroids_Protocol.xml b/Patches/Star Wars - Droids/Patch_SWDroids_Protocol.xml
deleted file mode 100644
index e8639d1a2e..0000000000
--- a/Patches/Star Wars - Droids/Patch_SWDroids_Protocol.xml	
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Star Wars - Protocol Droids (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="3PO_Protocol"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="3PO_Protocol"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="TC_Protocol"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="TC_Protocol"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="TC_Protocol" or
-						defName="3PO_Protocol"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="TC_Protocol" or
-						defName="3PO_Protocol"
-						]/comps </xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="TC_Protocol" or
-						defName="3PO_Protocol"
-						]/statBases </xpath>
-					<value>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-						<SmokeSensitivity>0</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="TC_Protocol" or
-						defName="3PO_Protocol"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Protocol_Droid_Body"]//*[def="SW_Droid_Hull" or def="SW_Protocol_Head" or def="SW_Droid_Shoulder" or def="SW_Droid_Arm" or def="SW_Droid_Hand" or def="SW_Droid_Leg" or def="SW_Droid_Foot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="TC_Protocol" or
-						defName="3PO_Protocol"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="TC_Protocol" or
-						defName="3PO_Protocol"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>0.4</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="TC_Protocol" or
-						defName="3PO_Protocol"
-						]/statBases/ArmorRating_Heat </xpath>
-					<value>
-						<ArmorRating_Heat>0</ArmorRating_Heat>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Star Wars - Droids/Patch_SWDroids_Support.xml b/Patches/Star Wars - Droids/Patch_SWDroids_Support.xml
deleted file mode 100644
index 42e476bd46..0000000000
--- a/Patches/Star Wars - Droids/Patch_SWDroids_Support.xml	
+++ /dev/null
@@ -1,283 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Star Wars - Support Droids (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="21B_Medical"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="21B_Medical"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FX7_MedicalAssistant"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="FX7_MedicalAssistant"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="GNK_Power"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="GNK_Power"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="MSE6_Repair"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="MSE6_Repair"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Viper_Probe"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Viper_Probe"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="21B_Medical" or
-						defName="FX7_MedicalAssistant" or
-						defName="GNK_Power"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="MSE6_Repair"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="Viper_Probe"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="21B_Medical" or
-						defName="FX7_MedicalAssistant" or
-						defName="GNK_Power" or
-						defName="MSE6_Repair" or
-						defName="Viper_Probe"
-						]/comps </xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="21B_Medical" or
-						defName="FX7_MedicalAssistant" or
-						defName="GNK_Power" or
-						defName="MSE6_Repair" or
-						defName="Viper_Probe"
-						]/statBases </xpath>
-					<value>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-						<SmokeSensitivity>0</SmokeSensitivity>
-						<CarryBulk>30</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="21B_Medical"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="FX7_MedicalAssistant" or
-						defName="Viper_Probe"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="GNK_Droid_Body"]//*[def="SW_Droid_Hull" or def="SW_Droid_Loudspeaker" or def="SW_Droid_Power_PlugIn_Socket" or def="SW_Droid_Arm" or def="SW_Droid_Leg" or def="SW_Droid_Foot" or def="SW_Droid_Hand"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="MSE6_Droid_Body"]//*[def="SW_Droid_Hull" or def="SW_Droid_Arm" or def="SW_Droid_Hand" or def="SW_Droid_Leg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Viper_Droid_Body"]//*[def="SW_Droid_Hull" or def="SW_Viper_Head"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="FX7_Droid_Body"]//*[def="SW_Droid_Hull" or def="SW_Droid_Rotator_Base"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="FX7_Droid_Body"]//*[def="SW_Droid_Arm" or def="SW_Droid_Hand"]</xpath>
-					<value>
-						<depth>Inside</depth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="21B_Droid_Body"]//*[def="SW_Droid_Hull" or def="SW_Medical_Head" or def="SW_Droid_Shoulder" or def="SW_Droid_Arm" or def="SW_Droid_Hand" or def="Waist" or def="SW_Droid_Leg" or def="SW_Droid_Foot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="21B_Medical" or
-						defName="FX7_MedicalAssistant" or
-						defName="GNK_Power" or
-						defName="MSE6_Repair" or
-						defName="Viper_Probe"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="21B_Medical" or
-						defName="FX7_MedicalAssistant" or
-						defName="GNK_Power" or
-						defName="MSE6_Repair" or
-						defName="Viper_Probe"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>0.4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[
-						defName="21B_Medical" or
-						defName="FX7_MedicalAssistant" or
-						defName="GNK_Power" or
-						defName="MSE6_Repair" or
-						defName="Viper_Probe"
-						]/statBases/ArmorRating_Heat </xpath>
-					<value>
-						<ArmorRating_Heat>0</ArmorRating_Heat>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Star Wars - Factions/Patch_Apparel.xml b/Patches/Star Wars - Factions/Patch_Apparel.xml
deleted file mode 100644
index f22155de75..0000000000
--- a/Patches/Star Wars - Factions/Patch_Apparel.xml	
+++ /dev/null
@@ -1,836 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Star Wars - Factions (Continued)</li>
-			<li>Star Wars - Factions</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="PJ_ImpUniform" or
-						defName="PJ_ImpNAVYSHELL" or
-						defName="PJ_ImpUniformBrownSHELL" or
-						defName="PJ_STOffUniform" or
-						defName="PJ_ImpUniformISBSHELL" or
-						defName="PJ_ImpUniformGrnSHELL" or
-						defName="PJ_ImpUniformBlackSHELL" or
-						defName="PJ_ImpUniformBlack"
-						]/statBases </xpath>
-					<value>
-						<Bulk>4</Bulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PJ_ImpUniform" or
-						defName="PJ_ImpNAVYSHELL" or
-						defName="PJ_ImpUniformBrownSHELL" or
-						defName="PJ_STOffUniform" or
-						defName="PJ_ImpUniformISBSHELL" or
-						defName="PJ_ImpUniformGrnSHELL" or
-						defName="PJ_ImpUniformBlackSHELL" or
-						defName="PJ_ImpUniformBlack"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PJ_ImpUniform" or
-						defName="PJ_ImpNAVYSHELL" or
-						defName="PJ_ImpUniformBrownSHELL" or
-						defName="PJ_STOffUniform" or
-						defName="PJ_ImpUniformISBSHELL" or
-						defName="PJ_ImpUniformGrnSHELL" or
-						defName="PJ_ImpUniformBlackSHELL" or
-						defName="PJ_ImpUniformBlack"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PJ_ImpUniform" or
-						defName="PJ_ImpNAVYSHELL" or
-						defName="PJ_ImpUniformBrownSHELL" or
-						defName="PJ_STOffUniform" or
-						defName="PJ_ImpUniformISBSHELL" or
-						defName="PJ_ImpUniformGrnSHELL" or
-						defName="PJ_ImpUniformBlackSHELL" or
-						defName="PJ_ImpUniformBlack"
-						]/statBases/ArmorRating_Heat </xpath>
-					<value>
-						<ArmorRating_Heat>0.15</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="PJ_TroopArmor" or
-						defName="PJ_TroopArmorJO" or
-						defName="PJ_TroopArmorNCO" or
-						defName="PJ_TroopArmorSO" or
-						defName="PJ_TroopArmorSh" or
-						defName="PJ_TroopArmorShC" or
-						defName="PJ_TroopArmorShSL" or
-						defName="PJ_TroopArmorDT" or
-						defName="PJ_TroopArmorDTC"
-						]/statBases </xpath>
-					<value>
-						<Bulk>80</Bulk>
-						<WornBulk>12</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PJ_TroopArmor" or
-						defName="PJ_TroopArmorJO" or
-						defName="PJ_TroopArmorNCO" or
-						defName="PJ_TroopArmorSO" or
-						defName="PJ_TroopArmorSh" or
-						defName="PJ_TroopArmorShC" or
-						defName="PJ_TroopArmorShSL" or
-						defName="PJ_TroopArmorDT" or
-						defName="PJ_TroopArmorDTC"
-						]/statBases/MaxHitPoints </xpath>
-					<value>
-						<MaxHitPoints>400</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PJ_TroopArmor" or
-						defName="PJ_TroopArmorJO" or
-						defName="PJ_TroopArmorNCO" or
-						defName="PJ_TroopArmorSO" or
-						defName="PJ_TroopArmorSh" or
-						defName="PJ_TroopArmorShC" or
-						defName="PJ_TroopArmorShSL" or
-						defName="PJ_TroopArmorDT" or
-						defName="PJ_TroopArmorDTC"
-						]/statBases/Mass </xpath>
-					<value>
-						<Mass>30</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PJ_TroopArmor" or
-						defName="PJ_TroopArmorJO" or
-						defName="PJ_TroopArmorNCO" or
-						defName="PJ_TroopArmorSO" or
-						defName="PJ_TroopArmorSh" or
-						defName="PJ_TroopArmorShC" or
-						defName="PJ_TroopArmorShSL" or
-						defName="PJ_TroopArmorDT" or
-						defName="PJ_TroopArmorDTC"
-						]/costList </xpath>
-					<value>
-						<costList>
-							<Steel>24</Steel>
-							<Plasteel>80</Plasteel>
-							<ComponentIndustrial>6</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PJ_TroopArmor" or
-						defName="PJ_TroopArmorJO" or
-						defName="PJ_TroopArmorNCO" or
-						defName="PJ_TroopArmorSO" or
-						defName="PJ_TroopArmorSh" or
-						defName="PJ_TroopArmorShC" or
-						defName="PJ_TroopArmorShSL" or
-						defName="PJ_TroopArmorDT" or
-						defName="PJ_TroopArmorDTC"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PJ_TroopArmor" or
-						defName="PJ_TroopArmorJO" or
-						defName="PJ_TroopArmorNCO" or
-						defName="PJ_TroopArmorSO" or
-						defName="PJ_TroopArmorSh" or
-						defName="PJ_TroopArmorShC" or
-						defName="PJ_TroopArmorShSL" or
-						defName="PJ_TroopArmorDT" or
-						defName="PJ_TroopArmorDTC"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>15</ArmorRating_Blunt>
-					</value>
-				</li>
-				<!--
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[
-				defName="PJ_TroopArmor" or
-				defName="PJ_TroopArmorJO" or
-				defName="PJ_TroopArmorNCO" or
-				defName="PJ_TroopArmorSO" or
-				defName="PJ_TroopArmorSh" or
-				defName="PJ_TroopArmorShC" or
-				defName="PJ_TroopArmorShSL" or
-				defName="PJ_TroopArmorDT" or
-				defName="PJ_TroopArmorDTC"
-				]/statBases/ArmorRating_Sharp</xpath>
-				<value>
-					<ArmorRating_Heat>0.54</ArmorRating_Heat>
-				</value>
-			</li>
-			-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="PJ_TroopArmor" or
-						defName="PJ_TroopArmorJO" or
-						defName="PJ_TroopArmorNCO" or
-						defName="PJ_TroopArmorSO" or
-						defName="PJ_TroopArmorSh" or
-						defName="PJ_TroopArmorShC" or
-						defName="PJ_TroopArmorShSL" or
-						defName="PJ_TroopArmorDT" or
-						defName="PJ_TroopArmorDTC"
-						]/costList </xpath>
-					<value>
-						<DevilstrandCloth>40</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="PJ_TroopArmor" or
-						defName="PJ_TroopArmorJO" or
-						defName="PJ_TroopArmorNCO" or
-						defName="PJ_TroopArmorSO" or
-						defName="PJ_TroopArmorSh" or
-						defName="PJ_TroopArmorShC" or
-						defName="PJ_TroopArmorShSL" or
-						defName="PJ_TroopArmorDT" or
-						defName="PJ_TroopArmorDTC"
-						] </xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>15</CarryWeight>
-							<CarryBulk>22</CarryBulk>
-							<ToxicEnvironmentResistance>0.40</ToxicEnvironmentResistance>
-							<MoveSpeed>0.1</MoveSpeed>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="PJ_TroopArmor" or
-						defName="PJ_TroopArmorJO" or
-						defName="PJ_TroopArmorNCO" or
-						defName="PJ_TroopArmorSO" or
-						defName="PJ_TroopArmorSh" or
-						defName="PJ_TroopArmorShC" or
-						defName="PJ_TroopArmorShSL" or
-						defName="PJ_TroopArmorDT" or
-						defName="PJ_TroopArmorDTC"
-						]/apparel/bodyPartGroups </xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="PJ_STHelm" or
-						defName="PJ_SHHelm" or
-						defName="PJ_DTHelm" or
-						defName="PJ_SCTHelm" or
-						defName="PJ_RebHat" or
-						defName="PJ_RebLAVHat" or
-						defName="PJ_RebSnowHat" or
-						defName="PJ_RebScoutHat" or
-						defName="PJ_RebPilot_H_Blue" or
-						defName="PJ_RebPilot_H_Red" or
-						defName="PJ_ImpNavyH" or
-						defName="PJ_TIEHelm"
-						]/statBases </xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PJ_STHelm" or
-						defName="PJ_SHHelm" or
-						defName="PJ_DTHelm" or
-						defName="PJ_SCTHelm" or
-						defName="PJ_RebHat" or
-						defName="PJ_RebLAVHat" or
-						defName="PJ_RebSnowHat" or
-						defName="PJ_RebScoutHat" or
-						defName="PJ_RebPilot_H_Blue" or
-						defName="PJ_RebPilot_H_Red" or
-						defName="PJ_ImpNavyH" or
-						defName="PJ_TIEHelm"
-						]/statBases/MaxHitPoints </xpath>
-					<value>
-						<MaxHitPoints>190</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PJ_STHelm" or
-						defName="PJ_SHHelm" or
-						defName="PJ_DTHelm" or
-						defName="PJ_SCTHelm" or
-						defName="PJ_RebHat" or
-						defName="PJ_RebLAVHat" or
-						defName="PJ_RebSnowHat" or
-						defName="PJ_RebScoutHat" or
-						defName="PJ_RebPilot_H_Blue" or
-						defName="PJ_RebPilot_H_Red" or
-						defName="PJ_ImpNavyH" or
-						defName="PJ_TIEHelm"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PJ_STHelm" or
-						defName="PJ_SHHelm" or
-						defName="PJ_DTHelm" or
-						defName="PJ_SCTHelm" or
-						defName="PJ_RebHat" or
-						defName="PJ_RebLAVHat" or
-						defName="PJ_RebSnowHat" or
-						defName="PJ_RebScoutHat" or
-						defName="PJ_RebPilot_H_Blue" or
-						defName="PJ_RebPilot_H_Red" or
-						defName="PJ_ImpNavyH" or
-						defName="PJ_TIEHelm"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>15</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="PJ_STHelm" or defName="PJ_SHHelm"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="PJ_STHelm" or defName="PJ_SHHelm"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="PJ_STHelm" or
-						defName="PJ_SHHelm"
-						] </xpath>
-					<value>
-						<equippedStatOffsets>
-							<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="PJ_DTHelm" or
-						defName="PJ_SCTHelm" or
-						defName="PJ_TIEHelm"
-						] </xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>0.1</AimingAccuracy>
-							<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="PJ_STHelm" or
-						defName="PJ_SHHelm" or
-						defName="PJ_DTHelm" or
-						defName="PJ_SCTHelm" or
-						defName="PJ_RebHat" or
-						defName="PJ_RebLAVHat" or
-						defName="PJ_RebSnowHat" or
-						defName="PJ_RebScoutHat" or
-						defName="PJ_RebPilot_H_Blue" or
-						defName="PJ_RebPilot_H_Red" or
-						defName="PJ_ImpNavyH" or
-						defName="PJ_TIEHelm"
-						]/costList </xpath>
-					<value>
-						<DevilstrandCloth>15</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="PJ_STHelm" or
-						defName="PJ_SHHelm" or
-						defName="PJ_DTHelm" or
-						defName="PJ_SCTHelm" or
-						defName="PJ_RebHat" or
-						defName="PJ_RebLAVHat" or
-						defName="PJ_RebSnowHat" or
-						defName="PJ_RebScoutHat" or
-						defName="PJ_RebPilot_H_Blue" or
-						defName="PJ_RebPilot_H_Red" or
-						defName="PJ_ImpNavyH" or
-						defName="PJ_TIEHelm"
-						]/apparel/layers </xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!-- Mando -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="PJ_MandoArmor" or
-						defName="PJ_VetMandoArmor" or
-						defName="PJ_BarkMandoArmor"
-						]/statBases </xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PJ_MandoArmor" or
-						defName="PJ_VetMandoArmor" or
-						defName="PJ_BarkMandoArmor"
-						]/statBases/MaxHitPoints </xpath>
-					<value>
-						<MaxHitPoints>500</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PJ_MandoArmor" or
-						defName="PJ_VetMandoArmor" or
-						defName="PJ_BarkMandoArmor"
-						]/statBases/Mass </xpath>
-					<value>
-						<Mass>50</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PJ_MandoArmor" or
-						defName="PJ_VetMandoArmor" or
-						defName="PJ_BarkMandoArmor"
-						]/costList </xpath>
-					<value>
-						<costList>
-							<Steel>8</Steel>
-							<Plasteel>120</Plasteel>
-							<ComponentIndustrial>12</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PJ_MandoArmor" or
-						defName="PJ_VetMandoArmor" or
-						defName="PJ_BarkMandoArmor"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>22</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PJ_MandoArmor" or
-						defName="PJ_VetMandoArmor"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>35</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PJ_BarkMandoArmor"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>40</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="PJ_MandoArmor" or
-						defName="PJ_VetMandoArmor" or
-						defName="PJ_BarkMandoArmor"
-						]/costList </xpath>
-					<value>
-						<DevilstrandCloth>50</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="PJ_MandoArmor" or
-						defName="PJ_VetMandoArmor" or
-						defName="PJ_BarkMandoArmor"
-						] </xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>80</CarryWeight>
-							<CarryBulk>10</CarryBulk>
-							<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-							<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="PJ_MandoArmor" or
-						defName="PJ_VetMandoArmor" or
-						defName="PJ_BarkMandoArmor"
-						]/apparel/bodyPartGroups </xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="PJ_MandoHelm"
-						]/statBases </xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PJ_MandoHelm"
-						]/statBases/MaxHitPoints </xpath>
-					<value>
-						<MaxHitPoints>240</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PJ_MandoHelm"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>15.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PJ_MandoHelm"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>30</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="PJ_MandoHelm"
-						] </xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>0.15</AimingAccuracy>
-							<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="PJ_MandoHelm"
-						]/costList </xpath>
-					<value>
-						<DevilstrandCloth>20</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="PJ_MandoHelm"
-						]/apparel/layers </xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PJ_Apparel_XVestPlate"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PJ_Apparel_XVestPlate"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>125</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PJ_Apparel_XVestPlate"]/statBases/Mass</xpath>
-					<value>
-						<Mass>13</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="PJ_Apparel_XVestPlate"]/statBases/ArmorRating_Heat</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="PJ_Apparel_XVestPlate"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PJ_Apparel_XVestPlate"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PJ_Apparel_XVestPlate"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>12</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Vests -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PJ_Reb_CamoJacket" or
-						defName="PJ_Reb_ScoutLAVJacket" or
-						defName="PJ_Reb_ScoutJacket" or
-						defName="PJ_Reb_TroopJacket"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>5</WornBulk>
-						<!--<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>-->
-						<ArmorRating_Sharp>3</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PJ_Reb_CamoJacket" or
-						defName="PJ_Reb_ScoutLAVJacket" or
-						defName="PJ_Reb_ScoutJacket" or
-						defName="PJ_Reb_TroopJacket"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="PJ_Reb_CamoJacket" or
-						defName="PJ_Reb_ScoutLAVJacket" or
-						defName="PJ_Reb_ScoutJacket" or
-						defName="PJ_Reb_TroopJacket"
-						]/statBases/ArmorRating_Heat </xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PJ_Reb_CamoJacket" or
-						defName="PJ_Reb_ScoutLAVJacket" or
-						defName="PJ_Reb_ScoutJacket" or
-						defName="PJ_Reb_TroopJacket"
-						]/statBases/Mass </xpath>
-					<value>
-						<Mass>4</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PJ_RebBFlight" or
-						defName="PJ_RebOfficer" or
-						defName="PJ_GenFlight_Y" or
-						defName="PJ_RebFlight"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>5</WornBulk>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PJ_RebBFlight" or
-						defName="PJ_RebOfficer" or
-						defName="PJ_GenFlight_Y" or
-						defName="PJ_RebFlight"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>3.75</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PJ_RebBFlight" or
-						defName="PJ_RebOfficer" or
-						defName="PJ_GenFlight_Y" or
-						defName="PJ_RebFlight"
-						]/statBases/Mass </xpath>
-					<value>
-						<Mass>4</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="PJ_CompArmor"
-						]/statBases </xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PJ_CompArmor"
-						]/statBases/MaxHitPoints </xpath>
-					<value>
-						<MaxHitPoints>500</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PJ_CompArmor"
-						]/statBases/Mass </xpath>
-					<value>
-						<Mass>50</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PJ_CompArmor"
-						]/costList </xpath>
-					<value>
-						<costList>
-							<Steel>8</Steel>
-							<Plasteel>120</Plasteel>
-							<ComponentIndustrial>12</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PJ_CompArmor"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>24</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PJ_CompArmor"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>32</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="PJ_CompArmor"
-						]/costList </xpath>
-					<value>
-						<DevilstrandCloth>50</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="PJ_CompArmor"
-						] </xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>80</CarryWeight>
-							<CarryBulk>10</CarryBulk>
-							<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-							<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="PJ_CompArmor"
-						]/apparel/bodyPartGroups </xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Star Wars - Factions/Patch_DamageDefs.xml b/Patches/Star Wars - Factions/Patch_DamageDefs.xml
deleted file mode 100644
index 94c6dd7120..0000000000
--- a/Patches/Star Wars - Factions/Patch_DamageDefs.xml	
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Star Wars - Factions (Continued)</li>
-			<li>Star Wars - Factions</li>
-			<li>[JDS] Star Wars BlasTech Industries</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<DamageDef>
-					<defName>PJ_BlasterDam</defName>
-					<label>Blaster bolt</label>
-					<workerClass>DamageWorker_AddInjury</workerClass>
-					<externalViolence>true</externalViolence>
-					<isExplosive>true</isExplosive>
-					<deathMessage>{0} has been blasted!</deathMessage>
-					<hediff>Burn</hediff>
-					<harmAllLayersUntilOutside>true</harmAllLayersUntilOutside>
-					<impactSoundType>Blunt</impactSoundType>
-					<armorCategory>Sharp</armorCategory>
-					<minDamageToFragment>15</minDamageToFragment>
-					<defaultDamage>3</defaultDamage>
-					<buildingDamageFactor>3</buildingDamageFactor>
-					<plantDamageFactor>3</plantDamageFactor>
-					<explosionAffectOutsidePartsOnly>false</explosionAffectOutsidePartsOnly>
-					<explosionHeatEnergyPerCell>5</explosionHeatEnergyPerCell>
-					<explosionCellFleck>BlastFlame</explosionCellFleck>
-					<explosionColorCenter>(1, 0.5, 0.3)</explosionColorCenter>
-					<explosionColorEdge>(0.6, 0.5, 0.4)</explosionColorEdge>
-					<soundExplosion>Explosion_Flame</soundExplosion>
-					<combatLogRules>Damage_Flame</combatLogRules>
-					<canUseDeflectMetalEffect>false</canUseDeflectMetalEffect>
-				</DamageDef>
-
-				<DamageDef>
-					<defName>SW_Stun_Damage</defName>
-					<label>stun</label>
-					<workerClass>DamageWorker_AddInjury</workerClass>
-					<externalViolence>true</externalViolence>
-					<deathMessage>{0} has been shocked to death.</deathMessage>
-					<hediff>Burn</hediff>
-					<hediffSolid>Burn</hediffSolid>
-					<harmAllLayersUntilOutside>true</harmAllLayersUntilOutside>
-					<impactSoundType>Slice</impactSoundType>
-					<armorCategory>Sharp</armorCategory>
-					<additionalHediffs>
-						<li>
-							<hediff>SW_Stun</hediff>
-						</li>
-					</additionalHediffs>
-				</DamageDef>
-
-				<HediffDef>
-					<defName>SW_Stun</defName>
-					<label>stunned</label>
-					<description>Stunned</description>
-					<hediffClass>HediffWithComps</hediffClass>
-					<defaultLabelColor>(1, 0.2, 0.2)</defaultLabelColor>
-					<comps>
-						<li Class="CombatExtended.HediffCompProperties_FleshOnly" />
-						<li Class="HediffCompProperties_Disappears">
-							<disappearsAfterTicks>
-								<min>1200</min>
-								<max>2100</max>
-							</disappearsAfterTicks>
-						</li>
-					</comps>
-					<stages>
-						<li>
-							<label>trivial</label>
-						</li>
-						<li>
-							<minSeverity>0.2</minSeverity>
-							<label>minor</label>
-							<capMods>
-								<li>
-									<capacity>Consciousness</capacity>
-									<offset>-0.25</offset>
-								</li>
-
-							</capMods>
-						</li>
-						<li>
-							<minSeverity>0.40</minSeverity>
-							<label>moderate</label>
-							<capMods>
-								<li>
-									<capacity>Consciousness</capacity>
-									<offset>-0.5</offset>
-								</li>
-
-							</capMods>
-						</li>
-						<li>
-							<minSeverity>0.6</minSeverity>
-							<label>severe</label>
-							<capMods>
-								<li>
-									<capacity>Consciousness</capacity>
-									<setMax>0.1</setMax>
-								</li>
-
-							</capMods>
-						</li>
-						<li>
-							<minSeverity>0.8</minSeverity>
-							<label>extreme</label>
-							<lifeThreatening>true</lifeThreatening>
-							<capMods>
-								<li>
-									<capacity>Consciousness</capacity>
-									<setMax>0.1</setMax>
-								</li>
-
-							</capMods>
-						</li>
-					</stages>
-				</HediffDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Star Wars - Factions/Patch_Melee.xml b/Patches/Star Wars - Factions/Patch_Melee.xml
deleted file mode 100644
index 2de0169614..0000000000
--- a/Patches/Star Wars - Factions/Patch_Melee.xml	
+++ /dev/null
@@ -1,437 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Star Wars - Factions (Continued)</li>
-			<li>Star Wars - Factions</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PJ_Vibrosword"]/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>12</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>9</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PJ_Vibrosword"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PJ_Vibrosword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>0.35</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PJ_Vibroaxe"]/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>37</power>
-								<cooldownTime>2.54</cooldownTime>
-								<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>2.34</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.956</armorPenetrationBlunt>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PJ_Vibroaxe"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PJ_Vibroaxe"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.4</MeleeCritChance>
-							<MeleeParryChance>0.35</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PJ_TStaff"]/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>37</power>
-								<cooldownTime>2.44</cooldownTime>
-								<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>32</power>
-								<cooldownTime>2.32</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.956</armorPenetrationBlunt>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PJ_TStaff"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PJ_TStaff"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.4</MeleeCritChance>
-							<MeleeParryChance>0.7</MeleeParryChance>
-							<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PJ_StaffX"]/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>37</power>
-								<cooldownTime>2.88</cooldownTime>
-								<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>32</power>
-								<cooldownTime>2.64</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.956</armorPenetrationBlunt>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PJ_StaffX"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PJ_StaffX"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.4</MeleeCritChance>
-							<MeleeParryChance>0.7</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PJ_Vibrodouble"]/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>second edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.44</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.956</armorPenetrationBlunt>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>1.24</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.956</armorPenetrationBlunt>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PJ_Vibrodouble"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PJ_Vibrodouble"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>0.7</MeleeParryChance>
-							<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PJ_VScythe"]/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>23</power>
-								<cooldownTime>1</cooldownTime>
-								<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.956</armorPenetrationBlunt>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PJ_VScythe"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PJ_VScythe"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>0.16</MeleeParryChance>
-							<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="PJ_Vibrocleaver"]/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>37</power>
-								<cooldownTime>2.54</cooldownTime>
-								<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>2.34</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.956</armorPenetrationBlunt>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PJ_Vibrocleaver"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PJ_Vibrocleaver"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>0.35</MeleeParryChance>
-							<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Star Wars - Factions/Patch_Ranged.xml b/Patches/Star Wars - Factions/Patch_Ranged.xml
deleted file mode 100644
index 6eca5267b4..0000000000
--- a/Patches/Star Wars - Factions/Patch_Ranged.xml	
+++ /dev/null
@@ -1,538 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Star Wars - Factions (Continued)</li>
-			<li>Star Wars - Factions</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Melee Tools  =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PJ_DH17Blaster" or
-						defName="PJ_SE14blaster" or
-						defName="PJ_DL44blaster" or
-						defName="PJ_LauncherP" or
-						defName="PJ_Scoutblaster"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="PJ_E11Blaster" or
-						defName="PJ_DXR6Carb" or
-						defName="PJ_JawaIon" or
-						defName="PJ_NymSlug" or
-						defName="PJ_DC15Rifle" or
-						defName="PJ_DLT19Rifle" or
-						defName="PJ_EE3Carbine" or
-						defName="PJ_T21Rifle"
-						]/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>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>PJ_E11Blaster</defName>
-					<statBases>
-						<Mass>6.85</Mass>
-						<Bulk>6.50</Bulk>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.30</SwayFactor>
-						<RangedWeapon_Cooldown>0.62</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.63</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_SWPlasmaGasCartridge</defaultProjectile>
-						<warmupTime>0.53</warmupTime>
-						<range>42</range>
-						<soundCast>PJ_E11B</soundCast>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>24</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_SWPlasmaGasCartridge</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>PJ_DXR6Carb</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.21</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>3.00</Bulk>
-						<Mass>4.10</Mass>
-						<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.63</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_SWPlasmaGasCartridge</defaultProjectile>
-						<warmupTime>0.63</warmupTime>
-						<range>55</range>
-						<soundCast>PJ_DXRS</soundCast>
-						<burstShotCount>2</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>14</magazineSize>
-						<reloadTime>3.2</reloadTime>
-						<ammoSet>AmmoSet_SWPlasmaGasCartridge</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>PJ_JawaIon</defName>
-					<statBases>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.21</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>3.00</Bulk>
-						<Mass>4.10</Mass>
-						<RangedWeapon_Cooldown>1.92</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_SWPlasmaGasCartridge_Ion</defaultProjectile>
-						<warmupTime>1.83</warmupTime>
-						<range>40</range>
-						<soundCast>PJ_BPistolB</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>18</magazineSize>
-						<reloadTime>3.7</reloadTime>
-						<ammoSet>AmmoSet_SWPlasmaGasCartridge</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>PJ_NymSlug</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.26</ShotSpread>
-						<SwayFactor>1.64</SwayFactor>
-						<Bulk>3.00</Bulk>
-						<Mass>4.10</Mass>
-						<RangedWeapon_Cooldown>0.32</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Slug</defaultProjectile>
-						<warmupTime>0.33</warmupTime>
-						<range>40</range>
-						<soundCast>PJ_SlugSnd</soundCast>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>16</magazineSize>
-						<reloadTime>4.0</reloadTime>
-						<ammoSet>AmmoSet_Nym</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>PJ_T21Rifle</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.02</SwayFactor>
-						<Bulk>13.00</Bulk>
-						<Mass>10.85</Mass>
-						<RangedWeapon_Cooldown>0.62</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.73</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_SWPlasmaGasCartridge_AP</defaultProjectile>
-						<warmupTime>0.63</warmupTime>
-						<range>84</range>
-						<soundCast>PJ_T21R</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>18</magazineSize>
-						<reloadTime>2.4</reloadTime>
-						<ammoSet>AmmoSet_SWPlasmaGasCartridge</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>PJ_DC15Rifle</defName>
-					<statBases>
-						<Mass>6.85</Mass>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.31</ShotSpread>
-						<SwayFactor>1.22</SwayFactor>
-						<Bulk>9.00</Bulk>
-						<RangedWeapon_Cooldown>0.32</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.73</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_SWPlasmaGasCartridge</defaultProjectile>
-						<warmupTime>0.63</warmupTime>
-						<range>55</range>
-						<soundCast>PJ_T21R</soundCast>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>2.4</reloadTime>
-						<ammoSet>AmmoSet_SWPlasmaGasCartridge</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>PJ_DLT19Rifle</defName>
-					<statBases>
-						<Mass>9.85</Mass>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.31</ShotSpread>
-						<SwayFactor>1.22</SwayFactor>
-						<Bulk>10.00</Bulk>
-						<RangedWeapon_Cooldown>0.32</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.73</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_SWPlasmaGasCartridge</defaultProjectile>
-						<warmupTime>0.63</warmupTime>
-						<range>55</range>
-						<soundCast>PJ_T21R</soundCast>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>24</magazineSize>
-						<reloadTime>2.4</reloadTime>
-						<ammoSet>AmmoSet_SWPlasmaGasCartridge</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>PJ_EE3Carbine</defName>
-					<statBases>
-						<Mass>6.85</Mass>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>0.82</SwayFactor>
-						<Bulk>4.00</Bulk>
-						<RangedWeapon_Cooldown>0.32</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_SWPlasmaGasCartridge</defaultProjectile>
-						<warmupTime>1.23</warmupTime>
-						<range>45</range>
-						<soundCast>PJ_T21R</soundCast>
-						<burstShotCount>2</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>1.9</reloadTime>
-						<ammoSet>AmmoSet_SWPlasmaGasCartridge</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>PJ_DH17Blaster</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.02</SwayFactor>
-						<Bulk>2.17</Bulk>
-						<Mass>3.95</Mass>
-						<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.48</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_SWPlasmaGasCartridge</defaultProjectile>
-						<warmupTime>0.53</warmupTime>
-						<range>20</range>
-						<soundCast>PJ_E11B</soundCast>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiUseBurstMode>False</aiUseBurstMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_SWPlasmaGasCartridge</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>PJ_Scoutblaster</defName>
-					<statBases>
-						<SightsEfficiency>0.85</SightsEfficiency>
-						<ShotSpread>0.21</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>2.17</Bulk>
-						<Mass>4.85</Mass>
-						<RangedWeapon_Cooldown>0.46</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.48</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_SWPlasmaGasCartridge</defaultProjectile>
-						<warmupTime>0.53</warmupTime>
-						<range>15</range>
-						<soundCast>PJ_BPistol</soundCast>
-						<burstShotCount>4</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>16</magazineSize>
-						<reloadTime>2</reloadTime>
-						<ammoSet>AmmoSet_SWPlasmaGasCartridge</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>PJ_SE14blaster</defName>
-					<statBases>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.11</ShotSpread>
-						<SwayFactor>1.02</SwayFactor>
-						<Bulk>2.17</Bulk>
-						<Mass>3.85</Mass>
-						<RangedWeapon_Cooldown>0.52</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.48</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_SWPlasmaGasCartridge</defaultProjectile>
-						<warmupTime>0.43</warmupTime>
-						<range>18</range>
-						<soundCast>PJ_BPistol</soundCast>
-						<burstShotCount>4</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_SWPlasmaGasCartridge</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>PJ_DL44blaster</defName>
-					<statBases>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.21</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>3.00</Bulk>
-						<Mass>4.10</Mass>
-						<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.48</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_SWPlasmaGasCartridge</defaultProjectile>
-						<warmupTime>0.83</warmupTime>
-						<range>15</range>
-						<soundCast>PJ_BPistolB</soundCast>
-						<burstShotCount>2</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_SWPlasmaGasCartridge</ammoSet>
-					</AmmoUser>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>PJ_LauncherP</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>1.34</ShotSpread>
-						<SwayFactor>4.64</SwayFactor>
-						<Bulk>5.50</Bulk>
-						<Mass>5.10</Mass>
-						<RangedWeapon_Cooldown>1.92</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.48</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_20x42mmGrenade_HE</defaultProjectile>
-						<warmupTime>2.83</warmupTime>
-						<range>26</range>
-						<soundCast>Shot_IncendiaryLauncher</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>4</AmmoGenPerMagOverride>
-						<reloadTime>2</reloadTime>
-						<ammoSet>AmmoSet_20x42mmGrenade</ammoSet>
-					</AmmoUser>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Star Wars - Factions/PawnKinds.xml b/Patches/Star Wars - Factions/PawnKinds.xml
deleted file mode 100644
index 6df91240b2..0000000000
--- a/Patches/Star Wars - Factions/PawnKinds.xml	
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Star Wars - Factions (Continued)</li>
-			<li>Star Wars - Factions</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="PJ_RebVillager" or
-						defName="PJ_RebCouncilman" or
-						defName="PJ_RebSoldier" or
-						defName="PJ_RebLAVSoldier" or
-						defName="PJ_RebNadeSoldier" or
-						defName="PJ_RebPilot" or
-						defName="PJ_RebMerc"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="PJ_ImpInspector" or
-						defName="PJ_ImpTaxOfficer" or
-						defName="PJ_ImpSoldier" or
-						defName="PJ_ImpTrader" or
-						defName="PJ_Stormtrooper" or
-						defName="PJ_StormtrooperSO" or
-						defName="PJ_ImpCommander" or
-						defName="PJ_ScoutTrooper"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="PJ_ScumSoldier" or
-						defName="PJ_Ruffian" or
-						defName="PJ_ScumBoss" or
-						defName="PJ_BountyHunter"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="CE_Apparel_Backpack"]/apparel/tags</xpath>
-					<value>
-						<li>PJ_Imp</li>
-						<li>PJ_Rebel</li>
-						<li>PJ_Scum</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="PJ_ImperialCredit"]/statBases</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="PJ_ImperialCredit"]</xpath>
-						<value>
-							<statBases />
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="PJ_ImperialCredit"]</xpath>
-						<value>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="PJ_ImperialCredit"]/statBases</xpath>
-					<value>
-						<Bulk>0.001</Bulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Star Wars - Factions/PlasmaGasCartridge.xml b/Patches/Star Wars - Factions/PlasmaGasCartridge.xml
deleted file mode 100644
index a7b153a7ee..0000000000
--- a/Patches/Star Wars - Factions/PlasmaGasCartridge.xml	
+++ /dev/null
@@ -1,526 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Star Wars - Factions (Continued)</li>
-			<li>Star Wars - Factions</li>
-			<li>[JDS] Star Wars BlasTech Industries</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>AmmoSWPlasmaGasCartridge</defName>
-					<label>Plasma Gas Cartridges</label>
-					<parent>AmmoAdvanced</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_SWPlasmaGasCartridge</defName>
-					<label>Plasma Gas Cartridges</label>
-					<ammoTypes>
-						<Ammo_SWPlasmaGasCartridge>Bullet_SWPlasmaGasCartridge</Ammo_SWPlasmaGasCartridge>
-						<Ammo_SWPlasmaGasCartridge_AP>Bullet_SWPlasmaGasCartridge_AP</Ammo_SWPlasmaGasCartridge_AP>
-						<Ammo_SWPlasmaGasCartridge_Ion>Bullet_SWPlasmaGasCartridge_Ion</Ammo_SWPlasmaGasCartridge_Ion>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_SWPlasmaGasCartridgeBlue</defName>
-					<label>Plasma Gas Cartridges</label>
-					<ammoTypes>
-						<Ammo_SWPlasmaGasCartridge>Bullet_SWPlasmaGasCartridgeBlue</Ammo_SWPlasmaGasCartridge>
-						<Ammo_SWPlasmaGasCartridge_AP>Bullet_SWPlasmaGasCartridge_AP</Ammo_SWPlasmaGasCartridge_AP>
-						<Ammo_SWPlasmaGasCartridge_Ion>Bullet_SWPlasmaGasCartridge_Ion</Ammo_SWPlasmaGasCartridge_Ion>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_SWPlasmaGasCartridgeJawa</defName>
-					<label>Plasma Gas Cartridges</label>
-					<ammoTypes>
-						<Ammo_SWPlasmaGasCartridge_Ion>Bullet_SWPlasmaGasCartridge_Ion</Ammo_SWPlasmaGasCartridge_Ion>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_Nym</defName>
-					<label>12 Gauge</label>
-					<ammoTypes>
-						<Ammo_12Gauge_Slug>Bullet_12Gauge_Slug</Ammo_12Gauge_Slug>
-						<Ammo_12Gauge_Beanbag>Bullet_12Gauge_Beanbag</Ammo_12Gauge_Beanbag>
-						<Ammo_12Gauge_ElectroSlug>Bullet_12Gauge_ElectroSlug</Ammo_12Gauge_ElectroSlug>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_SWBigPlasmaGasCartridge</defName>
-					<label>Big Plasma Gas Cartridges</label>
-					<ammoTypes>
-						<Ammo_SWPlasmaGasCartridge>Bullet_SWBigPlasmaGasCartridge</Ammo_SWPlasmaGasCartridge>
-						<Ammo_SWPlasmaGasCartridge_AP>Bullet_SWBigPlasmaGasCartridge_AP</Ammo_SWPlasmaGasCartridge_AP>
-						<Ammo_SWPlasmaGasCartridge_Ion>Bullet_SWBigPlasmaGasCartridge_Ion</Ammo_SWPlasmaGasCartridge_Ion>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="SWPlasmaGasCartridgeBase" ParentName="SpacerSmallAmmoBase" Abstract="True">
-					<description>Plasma gas cartridge ammo used by advanced assault rifle designs.</description>
-					<statBases>
-						<Mass>0.01</Mass>
-						<Bulk>0.03</Bulk>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_FabricationBench</li>
-					</tradeTags>
-					<thingCategories>
-						<li>AmmoSWPlasmaGasCartridge</li>
-					</thingCategories>
-					<stackLimit>500</stackLimit>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="SWPlasmaGasCartridgeBase">
-					<defName>Ammo_SWPlasmaGasCartridge</defName>
-					<label>Plasma Gas Cartridges</label>
-					<graphicData>
-						<texPath>Things/Ammo/PlasmaCell/Heavy</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>1.38</MarketValue>
-					</statBases>
-					<ammoClass>Charged</ammoClass>
-					<generateAllowChance>1</generateAllowChance>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="SWPlasmaGasCartridgeBase">
-					<defName>Ammo_SWPlasmaGasCartridge_AP</defName>
-					<label>Plasma Gas Cartridges (Imp)</label>
-					<graphicData>
-						<texPath>Things/Ammo/PlasmaCell/Heavy</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>2.32</MarketValue>
-					</statBases>
-					<ammoClass>ChargedAP</ammoClass>
-					<generateAllowChance>0.2</generateAllowChance>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="SWPlasmaGasCartridgeBase">
-					<defName>Ammo_SWPlasmaGasCartridge_Ion</defName>
-					<label>Plasma Gas Cartridges (Stun)</label>
-					<graphicData>
-						<texPath>Things/Ammo/PlasmaCell/Heavy</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>1.78</MarketValue>
-					</statBases>
-					<ammoClass>Ionized</ammoClass>
-					<generateAllowChance>0</generateAllowChance>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef Name="BaseSWPlasmaGasCartridgeBullet" ParentName="Base6x24mmChargedBullet" Abstract="true">
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>PJ_BlasterDam</damageDef>
-						<speed>135</speed>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseSWPlasmaGasCartridgeBullet">
-					<defName>Bullet_SWPlasmaGasCartridge</defName>
-					<label>Blaster Bolt</label>
-					<graphicData>
-						<texPath>Projectile/Blasterbolt</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>18</damageAmountBase>
-						<armorPenetrationBlunt>3</armorPenetrationBlunt>
-						<armorPenetrationSharp>16</armorPenetrationSharp>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseSWPlasmaGasCartridgeBullet">
-					<defName>Bullet_SWPlasmaGasCartridgeBlue</defName>
-					<label>Blaster Bolt</label>
-					<graphicData>
-						<texPath>Projectile/BlasterboltB</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>18</damageAmountBase>
-						<armorPenetrationBlunt>3</armorPenetrationBlunt>
-						<armorPenetrationSharp>16</armorPenetrationSharp>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseSWPlasmaGasCartridgeBullet">
-					<defName>Bullet_SWPlasmaGasCartridge_AP</defName>
-					<label>Blaster Bolt (Imp)</label>
-					<graphicData>
-						<texPath>Projectile/BlasterboltG</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>12</damageAmountBase>
-						<armorPenetrationBlunt>3</armorPenetrationBlunt>
-						<armorPenetrationSharp>23</armorPenetrationSharp>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseSWPlasmaGasCartridgeBullet">
-					<defName>Bullet_SWPlasmaGasCartridge_Ion</defName>
-					<label>Blaster Bolt(Stun)</label>
-					<graphicData>
-						<texPath>Projectile/IonP</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>SW_Stun_Damage</damageDef>
-						<damageAmountBase>3</damageAmountBase>
-						<secondaryDamage>
-							<li>
-								<def>EMP</def>
-								<amount>7</amount>
-							</li>
-						</secondaryDamage>
-						<armorPenetrationBlunt>3</armorPenetrationBlunt>
-						<armorPenetrationSharp>3</armorPenetrationSharp>
-						<speed>35</speed>
-						<gravityFactor>0.5</gravityFactor>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseSWPlasmaGasCartridgeBullet">
-					<defName>Bullet_SWBigPlasmaGasCartridge</defName>
-					<label>Big Blaster Bolt</label>
-					<graphicData>
-						<texPath>Projectile/BlasterboltBig</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>20</damageAmountBase>
-						<armorPenetrationBlunt>3</armorPenetrationBlunt>
-						<armorPenetrationSharp>14</armorPenetrationSharp>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseSWPlasmaGasCartridgeBullet">
-					<defName>Bullet_SWBigPlasmaGasCartridge_AP</defName>
-					<label>Big Blaster Bolt (Conc.)</label>
-					<graphicData>
-						<texPath>Projectile/BlasterboltBigG</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>15</damageAmountBase>
-						<armorPenetrationBlunt>3</armorPenetrationBlunt>
-						<armorPenetrationSharp>22</armorPenetrationSharp>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseSWPlasmaGasCartridgeBullet">
-					<defName>Bullet_SWBigPlasmaGasCartridge_Ion</defName>
-					<label>Big Blaster Bolt(Ion)</label>
-					<graphicData>
-						<texPath>Projectile/IonP</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>SW_Stun_Damage</damageDef>
-						<damageAmountBase>3</damageAmountBase>
-						<secondaryDamage>
-							<li>
-								<def>EMP</def>
-								<amount>7</amount>
-							</li>
-						</secondaryDamage>
-						<armorPenetrationBlunt>6</armorPenetrationBlunt>
-						<armorPenetrationSharp>6</armorPenetrationSharp>
-						<speed>35</speed>
-						<gravityFactor>0.5</gravityFactor>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="ChargeAmmoRecipeBase">
-					<defName>MakeAmmo_SWPlasmaGasCartridge</defName>
-					<label>make Plasma Gas Cartridges x100</label>
-					<description>Craft 100 Plasma Gas Cartridges .</description>
-					<jobString>Making Plasma Gas Cartridges .</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Plasteel</li>
-								</thingDefs>
-							</filter>
-							<count>3</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>3</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Plasteel</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_SWPlasmaGasCartridge>100</Ammo_SWPlasmaGasCartridge>
-					</products>
-				</RecipeDef>
-
-				<RecipeDef ParentName="ChargeAmmoRecipeBase">
-					<defName>MakeAmmo_SWPlasmaGasCartridge_AP</defName>
-					<label>make Plasma Gas Cartridges (Conc.) x100</label>
-					<description>Craft 100 Plasma Gas Cartridges (Conc.) .</description>
-					<jobString>Making Plasma Gas Cartridges (Conc.) .</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Plasteel</li>
-								</thingDefs>
-							</filter>
-							<count>3</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>1</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Uranium</li>
-								</thingDefs>
-							</filter>
-							<count>3</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Plasteel</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_SWPlasmaGasCartridge_AP>100</Ammo_SWPlasmaGasCartridge_AP>
-					</products>
-				</RecipeDef>
-
-				<RecipeDef ParentName="ChargeAmmoRecipeBase">
-					<defName>MakeAmmo_SWPlasmaGasCartridge_Ion</defName>
-					<label>make Plasma Gas Cartridges (Ion) x100</label>
-					<description>Craft 100 SWPlasmaGas Cartridges (Ion) .</description>
-					<jobString>Making Plasma Gas Cartridges (Ion) .</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Plasteel</li>
-								</thingDefs>
-							</filter>
-							<count>6</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>3</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Plasteel</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_SWPlasmaGasCartridge_Ion>100</Ammo_SWPlasmaGasCartridge_Ion>
-					</products>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-	<!-- Projectile Ammo Fix -->
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[JDS] Star Wars BlasTech Industries</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Star Wars - Factions</li>
-				<li>Star Wars - Factions (Continued)</li>
-			</mods>
-			<nomatch Class="PatchOperationSequence">
-				<operations>
-
-					<!-- Both are used by Blastech Industries -->
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="Bullet_SWPlasmaGasCartridgeBlue"]/graphicData</xpath>
-						<value>
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_Laser</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-						</value>
-					</li>
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="Bullet_SWPlasmaGasCartridge"]/graphicData</xpath>
-						<value>
-							<graphicData>
-								<texPath>Things/Projectile/Red_Bullet_Laser</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-						</value>
-					</li>
-
-					<!-- Unused projectiles get a dummy texture -->
-					<li Class="PatchOperationReplace">
-						<xpath>
-							Defs/ThingDef[
-							defName = "Bullet_SWPlasmaGasCartridge_AP" or
-							defName = "Bullet_SWPlasmaGasCartridge_Ion" or
-							defName = "Bullet_SWBigPlasmaGasCartridge" or
-							defName = "Bullet_SWBigPlasmaGasCartridge_AP" or
-							defName = "Bullet_SWBigPlasmaGasCartridge_Ion"
-							]/graphicData </xpath>
-						<value>
-							<graphicData>
-								<texPath>Things/Projectile/Yellow_Bullet_Laser</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-						</value>
-					</li>
-
-				</operations>
-			</nomatch>
-		</match>
-	</Operation>
-
-	<!-- Projectile Ammo Fix -->
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[JDS] Star Wars BlasTech Industries</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Star Wars - Factions</li>
-				<li>Star Wars - Factions (Continued)</li>
-			</mods>
-			<nomatch Class="PatchOperationSequence">
-				<operations>
-
-					<!-- Both are used by Blastech Industries -->
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="Bullet_SWPlasmaGasCartridgeBlue"]/graphicData</xpath>
-						<value>
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_Laser</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-						</value>
-					</li>
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="Bullet_SWPlasmaGasCartridge"]/graphicData</xpath>
-						<value>
-							<graphicData>
-								<texPath>Things/Projectile/Red_Bullet_Laser</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-						</value>
-					</li>
-
-					<!-- Unused projectiles get a dummy texture -->
-					<li Class="PatchOperationReplace">
-						<xpath>
-							Defs/ThingDef[
-							defName = "Bullet_SWPlasmaGasCartridge_AP" or
-							defName = "Bullet_SWPlasmaGasCartridge_Ion" or
-							defName = "Bullet_SWBigPlasmaGasCartridge" or
-							defName = "Bullet_SWBigPlasmaGasCartridge_AP" or
-							defName = "Bullet_SWBigPlasmaGasCartridge_Ion"
-							]/graphicData </xpath>
-						<value>
-							<graphicData>
-								<texPath>Things/Projectile/Yellow_Bullet_Laser</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-						</value>
-					</li>
-
-				</operations>
-			</nomatch>
-		</match>
-	</Operation>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[JDS] Star Wars BlasTech Industries</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_SWPlasmaGasCartridgeYellow</defName>
-							<label>Plasma Gas Cartridges</label>
-							<ammoTypes>
-								<Ammo_SWPlasmaGasCartridge>Bullet_SWPlasmaGasCartridgeYellow</Ammo_SWPlasmaGasCartridge>
-								<Ammo_SWPlasmaGasCartridge_AP>Bullet_SWPlasmaGasCartridge_AP</Ammo_SWPlasmaGasCartridge_AP>
-								<Ammo_SWPlasmaGasCartridge_Ion>Bullet_SWPlasmaGasCartridge_Ion</Ammo_SWPlasmaGasCartridge_Ion>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef ParentName="BaseSWPlasmaGasCartridgeBullet">
-							<defName>Bullet_SWPlasmaGasCartridgeYellow</defName>
-							<label>Blaster Bolt</label>
-							<graphicData>
-								<texPath>Things/Projectile/Yellow_Bullet_Laser</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>18</damageAmountBase>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<armorPenetrationSharp>16</armorPenetrationSharp>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Starship Troopers Arachnids/Bodies_Bugs.xml b/Patches/Starship Troopers Arachnids/Bodies_Bugs.xml
deleted file mode 100644
index bbc40f973f..0000000000
--- a/Patches/Starship Troopers Arachnids/Bodies_Bugs.xml	
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[1.3] Starship Troopers Arachnids Ver6.3</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="Arachnid"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="Arachnid"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="Arachnid"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="Arachnid"]/corePart/parts/li[def="Elytra"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="Arachnid"]/corePart/parts/li[def="Elytra"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="Arachnid"]/corePart/parts/li[def="Elytra"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="Arachnid"]/corePart/parts/li[def="Pronotum"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="Arachnid"]/corePart/parts/li[def="Pronotum"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="Arachnid"]/corePart/parts/li[def="Pronotum"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="Arachnid"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="Arachnid"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="Arachnid"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="Arachnid"]/corePart/parts/li[def="InsectLeg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="Arachnid"]/corePart/parts/li[def="InsectLeg"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="Arachnid"]/corePart/parts/li[def="InsectLeg"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<!-- -->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="ArachnidScorpion"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="ArachnidScorpion"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="ArachnidScorpion"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="ArachnidScorpion"]/corePart/parts/li[def="Elytra"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="ArachnidScorpion"]/corePart/parts/li[def="Elytra"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="ArachnidScorpion"]/corePart/parts/li[def="Elytra"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="ArachnidScorpion"]/corePart/parts/li[def="Pronotum"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="ArachnidScorpion"]/corePart/parts/li[def="Pronotum"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="ArachnidScorpion"]/corePart/parts/li[def="Pronotum"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="ArachnidScorpion"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="ArachnidScorpion"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="ArachnidScorpion"]/corePart/parts/li[def="Pronotum"]/parts/li[def="InsectHead"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="ArachnidScorpion"]/corePart/parts/li[def="InsectLeg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="ArachnidScorpion"]/corePart/parts/li[def="InsectLeg"]</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="ArachnidScorpion"]/corePart/parts/li[def="InsectLeg"]/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Starship Troopers Arachnids/Races.xml b/Patches/Starship Troopers Arachnids/Races.xml
deleted file mode 100644
index 8a8e2d5dc8..0000000000
--- a/Patches/Starship Troopers Arachnids/Races.xml	
+++ /dev/null
@@ -1,251 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[1.3] Starship Troopers Arachnids Ver6.3</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- BASE -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="BugsThingBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="BugsThingBase"]/statBases</xpath>
-					<value>
-						<PainShockThreshold>5</PainShockThreshold>
-					</value>
-				</li>
-
-				<!-- Basic Warrior -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Arachnid_WarriorBug" or defName="Arachnid_WarriorBugHive"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
-						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Arachnid_WarriorBug" or defName="Arachnid_WarriorBugHive" or defName="Arachnid_FireFlyBug" or defName="Arachnid_HopperBug"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.09</MeleeDodgeChance>
-						<MeleeCritChance>0.53</MeleeCritChance>
-						<MeleeParryChance>0.02</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachnid_WarriorBug" or defName="Arachnid_WarriorBugHive" or defName="Arachnid_FireFlyBug" or defName="Arachnid_HopperBug"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>front left leg</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.0</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftInsectLeg</linkedBodyPartsGroup>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<armorPenetrationBlunt>24</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>front right leg</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.0</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightInsectLeg</linkedBodyPartsGroup>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<armorPenetrationBlunt>68</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Bombardier -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachnid_BombardierBug"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationSharp>0.24</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Plasma Grenadier -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Arachnid_PlasmaGrenadierBug"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Arachnid_PlasmaGrenadierBug"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.09</MeleeDodgeChance>
-						<MeleeCritChance>0.31</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachnid_PlasmaGrenadierBug"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>front left leg</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>2.13</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftInsectLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>14.640</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>front right leg</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>2.13</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightInsectLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>14.640</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Large-class -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachnid_TankerBug"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>22</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachnid_TankerBug"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>33</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachnid_ScorpionBug"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachnid_ScorpionBug"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>38</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Arachnid_TankerBug" or defName="Arachnid_ScorpionBug" or defName="Arachnid_PlasmaBug"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.09</MeleeDodgeChance>
-						<MeleeCritChance>0.76</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Arachnid_TankerBug" or defName="Arachnid_ScorpionBug" or defName="Arachnid_PlasmaBug"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>front left leg</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>33</power>
-								<cooldownTime>2.13</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftInsectLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>14.640</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>front right leg</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>33</power>
-								<cooldownTime>2.13</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightInsectLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>14.640</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Starship Troopers Arachnids/Resources.xml b/Patches/Starship Troopers Arachnids/Resources.xml
deleted file mode 100644
index 73d29a724f..0000000000
--- a/Patches/Starship Troopers Arachnids/Resources.xml	
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[1.3] Starship Troopers Arachnids Ver6.3</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Arachnid Leg -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ArachnidLeg"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ArachnidLeg"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Stab</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>2.6</cooldownTime>
-								<armorPenetrationSharp>5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Arachnid Carapace -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ArachnidCarapace"]/statBases</xpath>
-					<value>
-						<Bulk>0.05</Bulk>
-						<WornBulk>0.75</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ArachnidCarapace"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1.25</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ArachnidCarapace"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1.75</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ArachnidCarapace"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.02</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ArachnidCarapace"]/stuffProps</xpath>
-					<value>
-						<statOffsets>
-							<Mass>0.5</Mass>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="ArachnidCarapace"]/statBases/SharpDamageMultiplier</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ArachnidCarapace"]/statBases/BluntDamageMultiplier</xpath>
-					<value>
-						<BluntDamageMultiplier>1.25</BluntDamageMultiplier>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ArachnidCarapace"]/stuffProps/categories</xpath>
-					<value>
-						<li>Metallic_Weapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ArachnidCarapace"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>2.45</Mass>
-						<MeleePenetrationFactor>1.2</MeleePenetrationFactor>
-					</value>
-				</li>
-
-				<!-- Arachnid Leather, made a bit worse than thrumbofur -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Leather_Arachnids"]/statBases</xpath>
-					<value>
-						<Bulk>0.05</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Leather_Arachnids"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.55</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Leather_Arachnids"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.4</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Leather_Arachnids"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.015</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Leather_Arachnids"]/stuffProps/categories</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Leather_Arachnids"]/stuffProps</xpath>
-						<value>
-							<categories>
-								<li>SoftArmor</li>
-							</categories>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Leather_Arachnids"]/stuffProps/categories</xpath>
-						<value>
-							<li>SoftArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Starship Troopers Arachnids/Weapons_Bugs.xml b/Patches/Starship Troopers Arachnids/Weapons_Bugs.xml
deleted file mode 100644
index dd08d8e705..0000000000
--- a/Patches/Starship Troopers Arachnids/Weapons_Bugs.xml	
+++ /dev/null
@@ -1,343 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[1.3] Starship Troopers Arachnids Ver6.3</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Tanker -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_TankerInfernoCannon</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>3.0</ShotSpread>
-						<SwayFactor>1.52</SwayFactor>
-						<Bulk>36</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_TankerInfernoCannon</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>27</range>
-						<burstShotCount>50</burstShotCount>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>0</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-				</li>
-
-				<!-- Firefly -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_FireFlyInfernoCannon</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>3.0</ShotSpread>
-						<SwayFactor>1.52</SwayFactor>
-						<Bulk>36</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_FireFlyInfernoCannon</defaultProjectile>
-						<warmupTime>0.36</warmupTime>
-						<range>20</range>
-						<burstShotCount>15</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>0</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-				</li>
-
-				<!-- Plasma Bug -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PlasmaBugPlasma</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>4.5</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.5</SightsEfficiency>
-						<Bulk>36</Bulk>
-					</statBases>
-					<Properties>
-						<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_PlasmaBugPlasma</defaultProjectile>
-						<warmupTime>4.5</warmupTime>
-						<range>700</range>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>100</muzzleFlashScale>
-						<indirectFirePenalty>0.2</indirectFirePenalty>
-						<requireLineOfSight>false</requireLineOfSight>
-					</Properties>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Gun_PlasmaBugPlasma"]</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_Charges">
-								<chargeSpeeds>
-									<li>30</li>
-									<li>50</li>
-									<li>70</li>
-									<li>90</li>
-								</chargeSpeeds>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<!-- Bombardier Bug -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_BombardierBugTrigger</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.52</SwayFactor>
-						<Bulk>36</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_BombardierBugTrigger</defaultProjectile>
-						<warmupTime>0.1</warmupTime>
-						<range>3</range>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>50</muzzleFlashScale>
-					</Properties>
-				</li>
-
-				<!-- Plasma Grenadier Bug -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PlasmaGrenadierBugPlasma</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.52</SwayFactor>
-						<Bulk>36</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.85</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_PlasmaGrenadierBugPlasma</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>40</range>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-				</li>
-
-				<!-- Scorpion Bug -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_ScorpionBugPlasma</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.52</SwayFactor>
-						<Bulk>36</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.85</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_ScorpionBugPlasma</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>40</range>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-				</li>
-
-				<!-- Projectiles -->
-				<!-- Tanker -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="BaseFlamethrowerBullet">
-							<defName>Bullet_TankerInfernoCannon</defName>
-							<label>flame stream</label>
-							<thingClass>CombatExtended.BulletCE</thingClass>
-							<graphicData>
-								<texPath>Bugs_Fireball</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>2.5</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>PrometheumFlame</damageDef>
-								<damageAmountBase>10</damageAmountBase>
-								<speed>20</speed>
-								<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
-								<preExplosionSpawnChance>0.33</preExplosionSpawnChance>
-								<soundExplode>CE_FlamethrowerExplosion</soundExplode>
-								<explosionRadius>1.5</explosionRadius>
-								<ai_IsIncendiary>true</ai_IsIncendiary>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- Firefly -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="BaseFlamethrowerBullet">
-							<defName>Bullet_FireFlyInfernoCannon</defName>
-							<label>flame stream</label>
-							<thingClass>CombatExtended.BulletCE</thingClass>
-							<graphicData>
-								<texPath>Bugs_Fireball</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>1</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>PrometheumFlame</damageDef>
-								<damageAmountBase>5</damageAmountBase>
-								<speed>20</speed>
-								<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
-								<preExplosionSpawnChance>0.33</preExplosionSpawnChance>
-								<soundExplode>CE_FlamethrowerExplosion</soundExplode>
-								<explosionRadius>1.0</explosionRadius>
-								<ai_IsIncendiary>true</ai_IsIncendiary>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- Bombardier -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="BaseFlamethrowerBullet">
-							<defName>Bullet_BombardierBugTrigger</defName>
-							<label>Bombardier Suicide</label>
-							<thingClass>CombatExtended.BulletCE</thingClass>
-							<graphicData>
-								<texPath>Bugs_Plasma</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>MoteGlow</shaderType>
-								<drawSize>0</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>120</damageAmountBase>
-								<speed>200</speed>
-								<explosionRadius>8.0</explosionRadius>
-								<ai_IsIncendiary>true</ai_IsIncendiary>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- Plasma Grenadier -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="BaseFlamethrowerBullet">
-							<defName>Bullet_PlasmaGrenadierBugPlasma</defName>
-							<label>plasma burst</label>
-							<thingClass>CombatExtended.BulletCE</thingClass>
-							<graphicData>
-								<texPath>Bugs_Plasma</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>MoteGlow</shaderType>
-								<drawSize>3</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>90</damageAmountBase>
-								<speed>20</speed>
-								<soundExplode>Explosion_EMP</soundExplode>
-								<explosionRadius>1.5</explosionRadius>
-								<ai_IsIncendiary>true</ai_IsIncendiary>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- Scorpion Plasma -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="BaseFlamethrowerBullet">
-							<defName>Bullet_ScorpionBugPlasma</defName>
-							<label>plasma burst</label>
-							<thingClass>CombatExtended.BulletCE</thingClass>
-							<graphicData>
-								<texPath>Bugs_Plasma</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>MoteGlow</shaderType>
-								<drawSize>3</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>90</damageAmountBase>
-								<speed>30</speed>
-								<soundExplode>Explosion_EMP</soundExplode>
-								<explosionRadius>2.4</explosionRadius>
-								<ai_IsIncendiary>true</ai_IsIncendiary>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- Plasma Bug -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="Base81mmMortarShell">
-							<defName>Bullet_PlasmaBugPlasma</defName>
-							<label>plasma burst</label>
-							<thingClass>CombatExtended.BulletCE</thingClass>
-							<graphicData>
-								<texPath>Bugs_Plasma</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>MoteGlow</shaderType>
-								<drawSize>10</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Flame</damageDef>
-								<damageAmountBase>40</damageAmountBase>
-								<speed>1</speed>
-								<gravityFactor>5</gravityFactor>
-								<flyOverhead>true</flyOverhead>
-								<dropsCasings>false</dropsCasings>
-								<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
-								<preExplosionSpawnChance>0.33</preExplosionSpawnChance>
-								<soundExplode>Explosion_EMP</soundExplode>
-								<explosionRadius>8.0</explosionRadius>
-								<ai_IsIncendiary>true</ai_IsIncendiary>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>120</damageAmountBase>
-									<explosiveDamageType>Thermobaric</explosiveDamageType>
-									<explosiveRadius>4.4</explosiveRadius>
-									<explosionSound>MortarIncendiary_Explode</explosionSound>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Steamworld Uniforms/Apparel_Various.xml b/Patches/Steamworld Uniforms/Apparel_Various.xml
deleted file mode 100644
index 4b1ef8ec29..0000000000
--- a/Patches/Steamworld Uniforms/Apparel_Various.xml	
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Steamworld Uniforms</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Headgear -->
-				<!-- Caps -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="SteamworldUniforms_Caps_Base"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Helmets -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="Steamworld_Helmet_Base"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<WornBulk>1</WornBulk>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Pith Helmets (Armor based upon roughly material thickness in cloth/wood.)-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="SteamworldUniforms_PithHelm"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>0.95</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="SteamworldUniforms_PithHelm"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.25</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Jackets -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="SteamworldUniforms_UniformJacketBase"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SteamworldUniforms_ZouaveJacket"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Rolled-up Bedroll -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SteamworldUniforms_BedRoll"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1.5</WornBulk>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Decorations -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="SteamworldUniforms_Gold"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<Bulk>0.25</Bulk>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="SteamworldUniforms_Gold"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.05</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Stoneborn - Delights/Stoneborn_Animal.xml b/Patches/Stoneborn - Delights/Stoneborn_Animal.xml
deleted file mode 100644
index 5afd3de366..0000000000
--- a/Patches/Stoneborn - Delights/Stoneborn_Animal.xml	
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Stoneborn - Delights</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Patch Fey ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SD_Fey"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.21</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SD_Fey"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.24</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SD_Fey"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2.25</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SD_Fey"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.7</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="SD_Fey"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>0.3</baseHealthScale>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="SD_Fey"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="SD_Fey"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Stoneborn - Delights/Stoneborn_Drugs.xml b/Patches/Stoneborn - Delights/Stoneborn_Drugs.xml
deleted file mode 100644
index aaaf7e1bfa..0000000000
--- a/Patches/Stoneborn - Delights/Stoneborn_Drugs.xml	
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Stoneborn - Delights</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Patch item bulk ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="SD_BladerootCigar" or
-						defName="SD_Feywing" or
-						defName="SD_FeywingJoint" or
-						defName="SD_MinersDelight"
-						]/statBases</xpath>
-					<value>
-						<Bulk>0.05</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SD_Alkahest" or defName="SD_Glimmerquartz"]/statBases</xpath>
-					<value>
-						<Bulk>0.2</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SD_BeardWax"]/statBases</xpath>
-					<value>
-						<Bulk>0.5</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="SD_RawShatterbrew" or defName="SD_FermentedShatterbrew"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-					</value>
-				</li>
-
-				<!-- ========== Patch statOffsets ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="SD_ElixirHigh"]/stages/li[1]</xpath>
-					<value>
-						<statOffsets>
-							<Suppressability>-0.1</Suppressability>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="SD_ElixirHigh"]/stages/li[2]</xpath>
-					<value>
-						<statOffsets>
-							<Suppressability>-0.25</Suppressability>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="SD_ElixirHigh"]/stages/li[3]</xpath>
-					<value>
-						<statOffsets>
-							<Suppressability>-0.5</Suppressability>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="SD_ElixirHigh"]/stages/li[4]</xpath>
-					<value>
-						<statOffsets>
-							<Suppressability>-10</Suppressability>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="SD_MDHigh"]/stages/li[1]</xpath>
-					<value>
-						<statFactors>
-							<Suppressability>0.75</Suppressability>
-						</statFactors>
-					</value>
-				</li>
-
-				<!-- ========== Patch Bottles ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="SD_ForgeLiquor" or
-						defName="SD_HiveMead" or
-						defName="SD_ShroomAle" or
-						defName="SD_Sweetwine"
-						]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2.22</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>neck</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>3.33</cooldownTime>
-								<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Neck</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="SD_ForgeLiquor" or
-						defName="SD_HiveMead" or
-						defName="SD_ShroomAle" or
-						defName="SD_Sweetwine"
-						]/statBases</xpath>
-					<value>
-						<MeleeCounterParryBonus>0.33</MeleeCounterParryBonus>
-						<Bulk>0.35</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="SD_ForgeLiquor" or
-						defName="SD_HiveMead" or
-						defName="SD_ShroomAle" or
-						defName="SD_Sweetwine"
-						]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.1</MeleeCritChance>
-							<MeleeParryChance>0.33</MeleeParryChance>
-							<MeleeDodgeChance>0.07</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="SD_ForgeLiquor" or
-						defName="SD_HiveMead" or
-						defName="SD_ShroomAle" or
-						defName="SD_Sweetwine"
-						]</xpath>
-					<value>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Swords/Swords_CE_Compatbility.xml b/Patches/Swords/Swords_CE_Compatbility.xml
deleted file mode 100644
index 8705ce7a2c..0000000000
--- a/Patches/Swords/Swords_CE_Compatbility.xml
+++ /dev/null
@@ -1,677 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<!-- Mod Support for Combat Extended -->
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Swords (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Cloud Sword -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="LS_CloudSword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>3.5</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<armorPenetrationSharp>35</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>cleave</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>3.5</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<armorPenetrationSharp>35</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>maw</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>3.5</cooldownTime>
-								<chanceFactor>1.25</chanceFactor>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<armorPenetrationSharp>35</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>tornado</label>
-								<capacities>
-									<li>LS_DarkClouds</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>3.5</cooldownTime>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<armorPenetrationSharp>35</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>storm</label>
-								<capacities>
-									<li>LS_GatheringStorm</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>3.5</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<armorPenetrationSharp>35</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>3.5</cooldownTime>
-								<armorPenetrationBlunt>35</armorPenetrationBlunt>
-								<armorPenetrationSharp>65</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>trinity</label>
-								<capacities>
-									<li>LS_GatheringStorm</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>3.5</cooldownTime>
-								<armorPenetrationBlunt>55</armorPenetrationBlunt>
-								<armorPenetrationSharp>85</armorPenetrationSharp>
-								<chanceFactor>1.5</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>assault</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>3.5</cooldownTime>
-								<armorPenetrationBlunt>35</armorPenetrationBlunt>
-								<armorPenetrationSharp>65</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>flashback</label>
-								<capacities>
-									<li>LS_DarkClouds</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>3.5</cooldownTime>
-								<armorPenetrationBlunt>35</armorPenetrationBlunt>
-								<armorPenetrationSharp>65</armorPenetrationSharp>
-								<chanceFactor>1.5</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>strife</label>
-								<capacities>
-									<li>LS_DarkClouds</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>3.5</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>25</armorPenetrationBlunt>
-								<armorPenetrationSharp>45</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="LS_CloudSword"]/statBases</xpath>
-					<value>
-						<Bulk>9</Bulk>
-						<MeleeCounterParryBonus>1.5</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="LS_CloudSword"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>0.75</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="LS_CloudSword"]/weaponTags</xpath>
-					<value>
-						<weaponTags>
-							<li>CE_Sidearm_Melee</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<!-- Nightfall -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="LS_Nightfall"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>4.0</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<armorPenetrationSharp>35</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>cleave</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>4.0</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>35</armorPenetrationBlunt>
-								<armorPenetrationSharp>65</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>maw</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>4.0</cooldownTime>
-								<chanceFactor>1.25</chanceFactor>
-								<armorPenetrationBlunt>35</armorPenetrationBlunt>
-								<armorPenetrationSharp>65</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>vanish</label>
-								<capacities>
-									<li>LS_BlackWidow</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>4.0</cooldownTime>
-								<chanceFactor>1.75</chanceFactor>
-								<armorPenetrationBlunt>35</armorPenetrationBlunt>
-								<armorPenetrationSharp>65</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>venom</label>
-								<capacities>
-									<li>LS_BlackWidow</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>4.0</cooldownTime>
-								<chanceFactor>2</chanceFactor>
-								<armorPenetrationBlunt>35</armorPenetrationBlunt>
-								<armorPenetrationSharp>65</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shadows</label>
-								<capacities>
-									<li>LS_DarkVeil</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>4.0</cooldownTime>
-								<chanceFactor>2</chanceFactor>
-								<armorPenetrationBlunt>35</armorPenetrationBlunt>
-								<armorPenetrationSharp>65</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>4.0</cooldownTime>
-								<armorPenetrationBlunt>35</armorPenetrationBlunt>
-								<armorPenetrationSharp>65</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>impale</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>4.0</cooldownTime>
-								<armorPenetrationBlunt>35</armorPenetrationBlunt>
-								<armorPenetrationSharp>65</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>void</label>
-								<capacities>
-									<li>LS_DarkVeil</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>4.0</cooldownTime>
-								<armorPenetrationBlunt>35</armorPenetrationBlunt>
-								<armorPenetrationSharp>65</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="LS_Nightfall"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>1.75</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="LS_Nightfall"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>0.5</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="LS_Nightfall"]/weaponTags</xpath>
-					<value>
-						<weaponTags>
-							<li>CE_Sidearm_Melee</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<!-- Executioner -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="LS_Executioner"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>4.0</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<armorPenetrationSharp>35</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>cleave</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>4.0</cooldownTime>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<armorPenetrationSharp>35</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>maw</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>4.0</cooldownTime>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<armorPenetrationSharp>35</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>freeze</label>
-								<capacities>
-									<li>LS_FrozenHeart</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>4.0</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>35</armorPenetrationBlunt>
-								<armorPenetrationSharp>65</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>wind</label>
-								<capacities>
-									<li>LS_FrozenHeart</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>3.0</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>55</armorPenetrationBlunt>
-								<armorPenetrationSharp>85</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>slide</label>
-								<capacities>
-									<li>LS_FrozenHeart</li>
-								</capacities>
-								<power>32</power>
-								<cooldownTime>4.0</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>55</armorPenetrationBlunt>
-								<armorPenetrationSharp>85</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>2.0</cooldownTime>
-								<armorPenetrationBlunt>35</armorPenetrationBlunt>
-								<armorPenetrationSharp>65</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>throatcutter</label>
-								<capacities>
-									<li>LS_ExecutionersCalling</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>4.0</cooldownTime>
-								<chanceFactor>0.25</chanceFactor>
-								<armorPenetrationBlunt>55</armorPenetrationBlunt>
-								<armorPenetrationSharp>85</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>behead</label>
-								<capacities>
-									<li>LS_ExecutionersCalling</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>4.0</cooldownTime>
-								<chanceFactor>0.1</chanceFactor>
-								<armorPenetrationBlunt>55</armorPenetrationBlunt>
-								<armorPenetrationSharp>85</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="LS_Executioner"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<MeleeCounterParryBonus>1.25</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="LS_Executioner"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.33</MeleeCritChance>
-						<MeleeParryChance>0.33</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="LS_Executioner"]/weaponTags</xpath>
-					<value>
-						<weaponTags>
-							<li>CE_Sidearm_Melee</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<!-- Deathbringer -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="LS_Deathbringer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>4.0</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<armorPenetrationSharp>35</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>cleave</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>4.0</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>25</armorPenetrationBlunt>
-								<armorPenetrationSharp>45</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>maw</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>4.0</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>25</armorPenetrationBlunt>
-								<armorPenetrationSharp>45</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>strike</label>
-								<capacities>
-									<li>LS_BloodLust</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>4.0</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>35</armorPenetrationBlunt>
-								<armorPenetrationSharp>65</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>dismantle</label>
-								<capacities>
-									<li>LS_MoonLight</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>4.0</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>25</armorPenetrationBlunt>
-								<armorPenetrationSharp>45</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>counter</label>
-								<capacities>
-									<li>LS_MoonLight</li>
-								</capacities>
-								<power>32</power>
-								<cooldownTime>3.0</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>25</armorPenetrationBlunt>
-								<armorPenetrationSharp>45</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>4.0</cooldownTime>
-								<armorPenetrationBlunt>25</armorPenetrationBlunt>
-								<armorPenetrationSharp>45</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>riposte</label>
-								<capacities>
-									<li>LS_MoonLight</li>
-								</capacities>
-								<power>32</power>
-								<cooldownTime>4.0</cooldownTime>
-								<armorPenetrationBlunt>35</armorPenetrationBlunt>
-								<armorPenetrationSharp>65</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blood rain</label>
-								<capacities>
-									<li>LS_BloodLust</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>3.0</cooldownTime>
-								<armorPenetrationBlunt>35</armorPenetrationBlunt>
-								<armorPenetrationSharp>65</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="LS_Deathbringer"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="LS_Deathbringer"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.5</MeleeCritChance>
-						<MeleeParryChance>0.33</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="LS_Deathbringer"]/weaponTags</xpath>
-					<value>
-						<weaponTags>
-							<li>CE_Sidearm_Melee</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<!-- Red Queen -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="LS_RedQueen"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>4.0</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<armorPenetrationSharp>35</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>cleave</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>4.0</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>25</armorPenetrationBlunt>
-								<armorPenetrationSharp>45</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>maw</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>4.0</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>25</armorPenetrationBlunt>
-								<armorPenetrationSharp>45</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>strike</label>
-								<capacities>
-									<li>LS_BloodLust</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>4.0</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>35</armorPenetrationBlunt>
-								<armorPenetrationSharp>65</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>dismantle</label>
-								<capacities>
-									<li>LS_MoonLight</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>4.0</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>25</armorPenetrationBlunt>
-								<armorPenetrationSharp>45</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>counter</label>
-								<capacities>
-									<li>LS_MoonLight</li>
-								</capacities>
-								<power>32</power>
-								<cooldownTime>3.0</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<armorPenetrationSharp>35</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>4.0</cooldownTime>
-								<armorPenetrationBlunt>25</armorPenetrationBlunt>
-								<armorPenetrationSharp>45</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>riposte</label>
-								<capacities>
-									<li>LS_MoonLight</li>
-								</capacities>
-								<power>32</power>
-								<cooldownTime>4.0</cooldownTime>
-								<armorPenetrationBlunt>35</armorPenetrationBlunt>
-								<armorPenetrationSharp>65</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blood rain</label>
-								<capacities>
-									<li>LS_BloodLust</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>3.0</cooldownTime>
-								<armorPenetrationBlunt>35</armorPenetrationBlunt>
-								<armorPenetrationSharp>65</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="LS_RedQueen"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<MeleeCounterParryBonus>1.15</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="LS_RedQueen"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>0.33</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="LS_RedQueen"]/weaponTags</xpath>
-					<value>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-							<li>CE_Sidearm_Melee</li>
-						</weaponTags>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/T's Conversion Staff/Patch_TCS_Staff.xml b/Patches/T's Conversion Staff/Patch_TCS_Staff.xml
deleted file mode 100644
index bb456ad3ad..0000000000
--- a/Patches/T's Conversion Staff/Patch_TCS_Staff.xml	
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>T's Conversion Staff</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TCS_ConversionStaff"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.69</cooldownTime>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2.85</cooldownTime>
-								<armorPenetrationBlunt>1.69</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TCS_ConversionStaff"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<MeleeCounterParryBonus>0.93</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TCS_ConversionStaff"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>1.00</MeleeCritChance>
-						<MeleeParryChance>0.70</MeleeParryChance>
-						<MeleeDodgeChance>0.47</MeleeDodgeChance>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/T's Samurai Faction/T_Samurai_Apparel.xml b/Patches/T's Samurai Faction/T_Samurai_Apparel.xml
deleted file mode 100644
index 9a35412867..0000000000
--- a/Patches/T's Samurai Faction/T_Samurai_Apparel.xml	
+++ /dev/null
@@ -1,414 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>T's Samurai Faction</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Utility-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSFApparel_SmokeBomb"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>5</Steel>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TSFApparel_SashimonoBanner"]/equippedStatOffsets</xpath>
-					<value>
-						<Suppressability>-0.25</Suppressability>
-					</value>
-				</li>
-
-				<!--Clothes-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TSFApparel_StrawCoat" or
-						defName="TSFApparel_StrawHat"]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>0.10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TSFApparel_NinjaMask" or
-						defName="TSFApparel_StrawCoat"]/equippedStatOffsets/MeleeDodgeChance </xpath>
-					<value>
-						<MeleeDodgeChance>0.3</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSFApparel_NinjaMask"]/stuffCategories</xpath>
-					<value>
-						<stuffCategories>
-							<li>Steeled</li>
-						</stuffCategories>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSFApparel_NinjaMask"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TSFApparel_NinjaMask" or
-						defName="TSFApparel_Gi" or
-						defName="TSFApparel_Kimono"]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TSFApparel_Gi" or
-						defName="TSFApparel_Kimono"]/statBases/Mass </xpath>
-					<value>
-						<Mass>1.2</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TSFApparel_Yukata" or
-						defName="TSFApparel_HaoriJacket"]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TSFApparel_HaoriJacket" or
-						defName="TSFApparel_Yukata"]/costStuffCount </xpath>
-					<value>
-						<costStuffCount>60</costStuffCount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSFApparel_Kimono"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>80</costStuffCount>
-					</value>
-				</li>
-
-				<!-- ======= Armor ======= -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TSFApparel_AshigaruArmor" or
-						defName="TSFApparel_AshigaruHelmet" or
-						defName="TSFApparel_SamuraiArmor" or
-						defName="TSFApparel_SamuraiHelmet" or
-						defName="TSFApparel_DaimyoHelmet"]/stuffCategories </xpath>
-					<value>
-						<stuffCategories>
-							<li>Steeled</li>
-						</stuffCategories>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TSFApparel_AshigaruArmor" or
-						defName="TSFApparel_SamuraiArmor"]/apparel/layers </xpath>
-					<value>
-						<layers>
-							<li>Shell</li>
-						</layers>
-					</value>
-				</li>
-
-				<!-- === Ashigaru === -->
-				<!-- == Armor == -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TSFApparel_AshigaruArmor"]/statBases</xpath>
-					<value>
-						<Bulk>40</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSFApparel_AshigaruArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.6</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSFApparel_AshigaruArmor"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>110</costStuffCount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSFApparel_AshigaruArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>9</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="TSFApparel_AshigaruArmor"]/equippedStatOffsets</xpath>
-				</li>
-
-				<!-- == Helmet == -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSFApparel_AshigaruHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.8</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TSFApparel_AshigaruHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSFApparel_AshigaruHelmet"]/statBases/Mass</xpath>
-					<value>
-						<Mass>1.75</Mass>
-					</value>
-				</li>
-
-				<!-- === Samurai === -->
-				<!-- == Armor == -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TSFApparel_SamuraiArmor"]/statBases</xpath>
-					<value>
-						<Bulk>60</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSFApparel_SamuraiArmor"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>160</costStuffCount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSFApparel_SamuraiArmor"]/apparel/layers</xpath>
-					<value>
-						<layers>
-							<li>Shell</li>
-						</layers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSFApparel_SamuraiArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.00</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSFApparel_SamuraiArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>13</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSFApparel_SamuraiArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeDodgeChance>-0.10</MeleeDodgeChance>
-							<Suppressability>-0.20</Suppressability>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- == Helmet == -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TSFApparel_SamuraiHelmet" or
-						defName="TSFApparel_DaimyoHelmet"]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="TSFApparel_SamuraiHelmet" or
-						defName="TSFApparel_DaimyoHelmet"]/statBases </xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="TSFApparel_SamuraiHelmet" or
-						defName="TSFApparel_DaimyoHelmet"]/equippedStatOffsets </xpath>
-					<value>
-						<Suppressability>-0.10</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TSFApparel_SamuraiHelmet" or
-						defName="TSFApparel_DaimyoHelmet"]/apparel/bodyPartGroups </xpath>
-					<value>
-						<bodyPartGroups>
-							<li>UpperHead</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSFApparel_DaimyoHelmet"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>55</costStuffCount>
-					</value>
-				</li>
-
-				<!-- === Oni Gear Armor === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TSFApparel_OniHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TSFApparel_OniArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TSFApparel_OniHelmet"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>30</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TSFApparel_OniArmor"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>60</DevilstrandCloth>
-					</value>
-				</li>
-
-				<!-- == Helmet == -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSFApparel_OniHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<MaxHitPoints>240</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSFApparel_OniHelmet"]/statBases/Mass</xpath>
-					<value>
-						<Mass>3.5</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="TSFApparel_OniHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="TSFApparel_OniHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TSFApparel_OniHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<AimingAccuracy>0.15</AimingAccuracy>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSFApparel_OniHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>17</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSFApparel_OniHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>38</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- == Armor == -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSFApparel_OniArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-						<MaxHitPoints>500</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSFApparel_OniArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>50</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSFApparel_OniArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<CarryWeight>80</CarryWeight>
-						<CarryBulk>10</CarryBulk>
-						<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSFApparel_OniArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>21</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSFApparel_OniArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>48</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/T's Samurai Faction/T_Samurai_Legendary_Melee.xml b/Patches/T's Samurai Faction/T_Samurai_Legendary_Melee.xml
deleted file mode 100644
index 815b39395d..0000000000
--- a/Patches/T's Samurai Faction/T_Samurai_Legendary_Melee.xml	
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>T's Samurai Faction</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Masamune ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TSF_Masamune"]/statBases</xpath>
-					<value>
-						<Bulk>7</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSF_Masamune"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeCritChance>0.68</MeleeCritChance>
-						<MeleeParryChance>0.75</MeleeParryChance>
-						<MeleeDodgeChance>0.4</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSF_Masamune"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.69</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>31</power>
-								<cooldownTime>1.69</cooldownTime>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<armorPenetrationSharp>3.375</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>43</power>
-								<cooldownTime>1.56</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>6.48</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.625</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Muramasa ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TSF_Muramasa"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<MeleeCounterParryBonus>0.70</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSF_Muramasa"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeCritChance>0.85</MeleeCritChance>
-						<MeleeParryChance>0.60</MeleeParryChance>
-						<MeleeDodgeChance>0.30</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSF_Muramasa"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.69</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>38</power>
-								<cooldownTime>1.98</cooldownTime>
-								<chanceFactor>0.50</chanceFactor>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<armorPenetrationSharp>3.625</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>48</power>
-								<cooldownTime>2.86</cooldownTime>
-								<chanceFactor>0.45</chanceFactor>
-								<armorPenetrationBlunt>8.98</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.75</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/T's Samurai Faction/T_Samurai_Pawnkinds.xml b/Patches/T's Samurai Faction/T_Samurai_Pawnkinds.xml
deleted file mode 100644
index f65806ddf2..0000000000
--- a/Patches/T's Samurai Faction/T_Samurai_Pawnkinds.xml	
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>T's Samurai Faction</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="TSF_TownGaurd" or
-						defName="TSF_AshigaruYumi"] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>20</min>
-								<max>30</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>200</min>
-									<max>300</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>NeolithicMeleeBasic</li>
-									<li>MedievalMeleeDecent</li>
-									<li>SamuraiMeleeBasic</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="TSF_AshigaruMortar"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>8</min>
-								<max>12</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>200</min>
-									<max>300</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>SamuraiMeleeSidearm</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="TSF_SamuraiWarriorYumi" or
-						defName="TSF_Noble"] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>25</min>
-								<max>35</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>200</min>
-									<max>300</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>SamuraiMeleeSidearm</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="TSF_AshigaruMatchlock" or
-						defName="TSF_SamuraiWarriorMatchlock" or
-						defName="TSF_NinjaMatchlock"] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>15</min>
-								<max>20</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>200</min>
-									<max>300</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>SamuraiMeleeSidearm</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[
-						defName="TSF_TownGaurd" or
-						@Name="TSF_AshigaruBase" or
-						defName="TSF_SamuraiWarriorYumi" or
-						defName="TSF_SamuraiWarriorMatchlock" or
-						defName="TSF_Noble" or
-						@Name="TSF_Ninjabase"]/apparelRequired </xpath>
-					<value>
-						<li>CE_Apparel_TribalBackpack</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[@Name="TSF_Ninjabase"]/weaponMoney</xpath>
-					<value>
-						<weaponMoney>250~600</weaponMoney>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="TSF_SamuraiWarriorHeavy"]/weaponMoney</xpath>
-					<value>
-						<weaponMoney>370~700</weaponMoney>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/PawnKindDef[
-						defName="TSF_TownGaurd" or
-						defName="TSF_Peasant" or
-						@Name="TSF_Ninjabase" or
-						@Name="TSF_AshigaruBase"]/itemQuality </xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[
-						defName="TSF_SamuraiDaimyo" or
-						defName="TSF_Noble"]/itemQuality </xpath>
-					<value>
-						<itemQuality>Excellent</itemQuality>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="WanderingRonin"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_Arrow_Steel</thingDef>
-							<count>80</count>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/T's Samurai Faction/T_Samurai_Spacer_Weapons.xml b/Patches/T's Samurai Faction/T_Samurai_Spacer_Weapons.xml
deleted file mode 100644
index 33bf34d35b..0000000000
--- a/Patches/T's Samurai Faction/T_Samurai_Spacer_Weapons.xml	
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>T's Samurai Faction</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= Oni cannon ======= -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>TSF_OniCannon</defName>
-					<statBases>
-						<Mass>7</Mass>
-						<Bulk>13.0</Bulk>
-						<SwayFactor>1.9</SwayFactor>
-						<ShotSpread>0.03</ShotSpread>
-						<SightsEfficiency>2.6</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
-						<NightVisionEfficiency_Weapon>0.4</NightVisionEfficiency_Weapon>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_8x50mmCharged</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>78</range>
-						<soundCast>ChargeLance_Fire</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_8x50mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>SniperRifle</li>
-						<li>OniWeapon</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ======= Oni Kanabo ======= -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TSF_OniKanabo"]/statBases</xpath>
-					<value>
-						<Bulk>13</Bulk>
-						<MeleeCounterParryBonus>0.26</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TSF_OniKanabo"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.75</MeleeCritChance>
-							<MeleeParryChance>0.34</MeleeParryChance>
-							<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSF_OniKanabo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.85</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>38</power>
-								<cooldownTime>1.85</cooldownTime>
-								<armorPenetrationBlunt>152.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/T's Samurai Faction/T_Samurai_Weapons_Melee.xml b/Patches/T's Samurai Faction/T_Samurai_Weapons_Melee.xml
deleted file mode 100644
index 9d29f73d2c..0000000000
--- a/Patches/T's Samurai Faction/T_Samurai_Weapons_Melee.xml	
+++ /dev/null
@@ -1,308 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>T's Samurai Faction</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSF_Sake"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2.22</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>neck</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>3.33</cooldownTime>
-								<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Neck</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Katana ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TSF_Katana"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSF_Katana"]/statBases/Mass</xpath>
-					<value>
-						<Mass>1.3</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TSF_Katana"]/weaponTags</xpath>
-					<value>
-						<li>SamuraiMeleeSidearm</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSF_Katana"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeCritChance>0.63</MeleeCritChance>
-						<MeleeParryChance>0.75</MeleeParryChance>
-						<MeleeDodgeChance>0.4</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSF_Katana"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.69</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.69</cooldownTime>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.35</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>1.56</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>2.592</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.65</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Odachi ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TSF_Odachi"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>0.70</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSF_Odachi"]/statBases/Mass</xpath>
-					<value>
-						<Mass>2.6</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSF_Odachi"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeCritChance>0.80</MeleeCritChance>
-						<MeleeParryChance>0.60</MeleeParryChance>
-						<MeleeDodgeChance>0.30</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSF_Odachi"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.69</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.98</cooldownTime>
-								<chanceFactor>0.50</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.45</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>42</power>
-								<cooldownTime>2.86</cooldownTime>
-								<chanceFactor>0.45</chanceFactor>
-								<armorPenetrationBlunt>3.592</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.70</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Naginata ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TSF_Naginata"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<MeleeCounterParryBonus>1.27</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TSF_Naginata"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.08</MeleeCritChance>
-						<MeleeParryChance>0.95</MeleeParryChance>
-						<MeleeDodgeChance>1.27</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSF_Naginata"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.3</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>0.20</chanceFactor>
-								<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.6</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>2.3</cooldownTime>
-								<chanceFactor>0.75</chanceFactor>
-								<armorPenetrationBlunt>4.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Yari ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TSF_Yari"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<MeleeCounterParryBonus>1.68</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TSF_Yari"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.17</MeleeCritChance>
-						<MeleeParryChance>1.45</MeleeParryChance>
-						<MeleeDodgeChance>0.9</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSF_Yari"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2.20</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.79</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>0.90</chanceFactor>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/T's Samurai Faction/T_Samurai_Weapons_Ranged.xml b/Patches/T's Samurai Faction/T_Samurai_Weapons_Ranged.xml
deleted file mode 100644
index 01a702b50d..0000000000
--- a/Patches/T's Samurai Faction/T_Samurai_Weapons_Ranged.xml	
+++ /dev/null
@@ -1,382 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>T's Samurai Faction</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TSF_Tanegashima_Short" or
-						defName="TSF_Tanegashima_Matchlock" or
-						defName="TSF_Hand_Mortar"
-						]/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>
-				</li>
-
-				<!-- Short Gun -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>TSF_Tanegashima_Short</defName>
-					<statBases>
-						<WorkToMake>12000</WorkToMake>
-						<Bulk>4.75</Bulk>
-						<Mass>2.5</Mass>
-						<SwayFactor>1.22</SwayFactor>
-						<ShotSpread>0.30</ShotSpread>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>35</Steel>
-						<WoodLog>8</WoodLog>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_SlowMusketBall</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>28</range>
-						<soundCast>Shot_Musket</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>5.5</reloadTime>
-						<ammoSet>AmmoSet_SlowMusketBall</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>NeolithicRangedHeavy</li>
-						<li>NeolithicRangedChief</li>
-					</weaponTags>
-				</li>
-
-				<!-- Long Gun -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>TSF_Tanegashima_Matchlock</defName>
-					<statBases>
-						<WorkToMake>20000</WorkToMake>
-						<Mass>4.8</Mass>
-						<Bulk>14.9</Bulk>
-						<SwayFactor>1.92</SwayFactor>
-						<ShotSpread>0.25</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.35</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>65</Steel>
-						<WoodLog>15</WoodLog>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_FastMusketBall</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>40</range>
-						<soundCast>Shot_Musket</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>7.5</reloadTime>
-						<ammoSet>AmmoSet_FastMusketBall</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>NeolithicRangedHeavy</li>
-						<li>NeolithicRangedChief</li>
-					</weaponTags>
-				</li>
-
-				<!--Hand Mortar-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>TSF_Hand_Mortar</defName>
-					<statBases>
-						<Mass>7.5</Mass>
-						<Bulk>12.9</Bulk>
-						<SwayFactor>1.92</SwayFactor>
-						<ShotSpread>0.8</ShotSpread>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_MortarGrenade</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>37</range>
-						<soundCast>Shot_IncendiaryLauncher</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>True</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>8</reloadTime>
-						<ammoSet>AmmoSet_MortarGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AOE</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Yumi ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>TSF_Yumi</defName>
-					<statBases>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>1</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>8.00</Bulk>
-						<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_StreamlinedArrow_Steel</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>20</range>
-						<soundCast>Bow_Recurve</soundCast>
-					</Properties>
-					<AmmoUser>
-						<ammoSet>AmmoSet_StreamlinedArrow</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_Bow</li>
-					</weaponTags>
-					<researchPrerequisite>RecurveBow</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSF_Yumi"]/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>
-
-				<!--Shuriken (removed because I can't make it not hurt internal organs too often)-->
-
-				<!--disable this disabler part in case of fix for above problem
-          <li Class="PatchOperationRemove">
-            <xpath>Defs/ThingDef[
-              defName="TSF_Star_Thrown" or
-              defName="TSF_Shuriken"]</xpath>
-          </li>
-          
-          <li Class="PatchOperationRemove">
-            <xpath>Defs/PawnKindDef[
-              @Name="TSF_Ninjabase"]/weaponTags</xpath>
-          </li>
-
--->
-
-				<!-- == Projectile == -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSF_Star_Thrown"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<damageDef>Cut</damageDef>
-							<damageAmountBase>5</damageAmountBase>
-							<flyOverhead>false</flyOverhead>
-							<speed>30</speed>
-							<armorPenetrationSharp>0.16</armorPenetrationSharp>
-							<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							<preExplosionSpawnChance>0.15</preExplosionSpawnChance>
-							<preExplosionSpawnThingDef>TSF_Shuriken</preExplosionSpawnThingDef>
-						</projectile>
-					</value>
-				</li>
-
-				<!-- == Weapon == -->
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="TSF_Shuriken"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>BaseWeapon</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TSF_Shuriken"]</xpath>
-					<value>
-						<thingCategories>
-							<li>WeaponsRanged</li>
-						</thingCategories>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="TSF_Shuriken"]/recipeMaker</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="TSF_Shuriken"]/costList</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TSF_Shuriken"]</xpath>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<stackLimit>75</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="TSF_Shuriken"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>TSF_Shuriken</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<Bulk>0.20</Bulk>
-						<Mass>0.30</Mass>
-						<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<label>Throw shuriken</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>TSF_Star_Thrown</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>8</range>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<burstShotCount>3</burstShotCount>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<soundCast>Interact_BeatFire</soundCast>
-						<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TSF_Shuriken"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.26</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>MakeTSF_Shuriken</defName>
-							<label>make shurikens x10</label>
-							<description>Craft 10 shurikens.</description>
-							<jobString>Making shurikens.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<workAmount>500</workAmount>
-							<products>
-								<TSF_Shuriken>10</TSF_Shuriken>
-							</products>
-							<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/Tactical Extremity Protection [BAL]/Armor_Industrial.xml b/Patches/Tactical Extremity Protection [BAL]/Armor_Industrial.xml
deleted file mode 100644
index a3dcf4703f..0000000000
--- a/Patches/Tactical Extremity Protection [BAL]/Armor_Industrial.xml	
+++ /dev/null
@@ -1,390 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Tactical Extremity Protection [BAL]</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Assault Rig === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TEP_AssaultRig"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TEP_AssaultRig"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>6.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TEP_AssaultRig"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="TEP_AssaultRig"]/equippedStatOffsets</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TEP_AssaultRig"]/stuffCategories/li[.="Metallic"]</xpath>
-					<value>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<!-- === Frontier Carapace === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TEP_FrontierCarapace"]/statBases</xpath>
-					<value>
-						<Bulk>80</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TEP_FrontierCarapace"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TEP_FrontierCarapace"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TEP_FrontierCarapace"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>7</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TEP_FrontierCarapace"]/equippedStatOffsets/CarryingCapacity</xpath>
-					<value>
-						<CarryBulk>35</CarryBulk>
-						<CarryWeight>5</CarryWeight>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TEP_FrontierCarapace"]/stuffCategories/li[.="Metallic"]</xpath>
-					<value>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<!-- === Light Arm Protectors === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TEP_LightArmProtectors"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TEP_LightArmProtectors"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.85</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="TEP_LightArmProtectors"]/statBases/ArmorRating_Sharp</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TEP_LightArmProtectors"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeDodgeChance>-0.05</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TEP_LightArmProtectors"]/stuffCategories/li[.="Metallic"]</xpath>
-					<value>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<!-- === Light Leg Protectors === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TEP_LightLegProtectors"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TEP_LightLegProtectors"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="TEP_LightLegProtectors"]/statBases/ArmorRating_Sharp</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="TEP_LightLegProtectors"]/equippedStatOffsets</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TEP_LightLegProtectors"]/stuffCategories/li[.="Metallic"]</xpath>
-					<value>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<!-- === Heavy Arm Protectors === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TEP_HeavyArmProtectors"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TEP_HeavyArmProtectors"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.25</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="TEP_HeavyArmProtectors"]/statBases/ArmorRating_Sharp</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TEP_HeavyArmProtectors"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeDodgeChance>-0.10</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TEP_HeavyArmProtectors"]/stuffCategories/li[.="Metallic"]</xpath>
-					<value>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<!-- === Heavy Leg Protectors === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TEP_HeavyLegProtectors"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TEP_HeavyLegProtectors"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.85</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="TEP_HeavyLegProtectors"]/statBases/ArmorRating_Sharp</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TEP_HeavyLegProtectors"]/stuffCategories/li[.="Metallic"]</xpath>
-					<value>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<!-- === Light Faceshield === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TEP_LightFaceshield"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TEP_LightFaceshield"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="TEP_LightFaceshield"]/statBases/ArmorRating_Blunt</xpath>
-				</li>
-
-				<!-- === Heavy Faceshield === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TEP_HeavyFaceshield"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TEP_HeavyFaceshield"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TEP_HeavyFaceshield"]/stuffCategories/li[.="Metallic"]</xpath>
-					<value>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<!-- === Flak Duster === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TEP_FlakDuster"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>4</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TEP_FlakDuster"]/statBases/Mass</xpath>
-					<value>
-						<Mass>8</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TEP_FlakDuster"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TEP_FlakDuster"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TEP_FlakDuster"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="TEP_FlakDuster"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<!-- === Flak Parka === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TEP_FlakParka"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<WornBulk>7</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TEP_FlakParka"]/statBases/Mass</xpath>
-					<value>
-						<Mass>6</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TEP_FlakParka"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TEP_FlakParka"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TEP_FlakParka"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="TEP_FlakParka"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<!-- === Frontier Longcoat === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TEP_FrontierLongcoat"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TEP_FrontierLongcoat"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TEP_FrontierLongcoat"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>9</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TEP_FrontierLongcoat"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Textiles+/Items_Resource_Stuff.xml b/Patches/Textiles+/Items_Resource_Stuff.xml
deleted file mode 100644
index 51fe9ac1f8..0000000000
--- a/Patches/Textiles+/Items_Resource_Stuff.xml
+++ /dev/null
@@ -1,377 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Textiles+(continued)</li>
-		</mods>
-		<match Class='PatchOperationSequence'>
-
-			<operations>
-
-				<!--===============  Denim.  ====================-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Denim"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.02</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Denim"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.04</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Denim"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.044</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Denim"]/statBases</xpath>
-					<value>
-						<Bulk>0.05</Bulk>
-					</value>
-				</li>
-
-				<!--===============  Silk  ====================-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Silk"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.008</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Silk"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.010</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Silk"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.022</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Silk"]/statBases</xpath>
-					<value>
-						<Bulk>0.05</Bulk>
-					</value>
-				</li>
-
-				<!--===============  Linen  ====================-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Linen"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.012</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Linen"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.020</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Linen"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.044</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Linen"]/statBases</xpath>
-					<value>
-						<Bulk>0.05</Bulk>
-					</value>
-				</li>
-
-				<!--===============  Furstain. ====================-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Fustian"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.015</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Fustian"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.030</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Fustian"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.044</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Fustian"]/statBases</xpath>
-					<value>
-						<Bulk>0.05</Bulk>
-					</value>
-				</li>
-
-				<!--===============  Corduroy  ====================-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Corduroy"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.03</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Corduroy"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.06</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Corduroy"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.044</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Corduroy"]/statBases</xpath>
-					<value>
-						<Bulk>0.05</Bulk>
-					</value>
-				</li>
-
-				<!--===============  Hemp  ====================-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Hemp"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.01</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Hemp"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.015</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Hemp"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.044</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Hemp"]/statBases</xpath>
-					<value>
-						<Bulk>0.05</Bulk>
-					</value>
-				</li>
-
-				<!--===============  Velvet  ====================-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Velvet"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.009</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Velvet"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.012</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Velvet"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.033</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Velvet"]/statBases</xpath>
-					<value>
-						<Bulk>0.05</Bulk>
-					</value>
-				</li>
-
-				<!--===============  Kevlar  ====================-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="Make_Kevlar"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Synthread</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>DevilstrandCloth</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kevlar"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.6</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kevlar"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.12</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kevlar"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.10</StuffPower_Armor_Heat>
-						<StuffPower_Armor_Electric>0.05</StuffPower_Armor_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Kevlar"]/statBases</xpath>
-					<value>
-						<Bulk>0.075</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Kevlar"]/stuffProps/categories</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Kevlar"]/stuffProps</xpath>
-						<value>
-							<categories>
-								<li>SoftArmor</li>
-							</categories>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Kevlar"]/stuffProps/categories</xpath>
-						<value>
-							<li>SoftArmor</li>
-						</value>
-					</match>
-				</li>
-				<!--===============  Sinstrand  ====================-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/RecipeDef[defName="Make_Sinstrand"]/ingredients</xpath>
-					<value>
-						<ingredients>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>Fustian</li>
-									</thingDefs>
-								</filter>
-								<count>20</count>
-							</li>
-							<li>
-								<filter>
-									<thingDefs>
-										<li>DevilstrandCloth</li>
-									</thingDefs>
-								</filter>
-								<count>10</count>
-							</li>
-						</ingredients>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Sinstrand"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.55</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Sinstrand"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.11</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Sinstrand"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
-						<StuffPower_Armor_Electric>0.025</StuffPower_Armor_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Sinstrand"]/statBases</xpath>
-					<value>
-						<Bulk>0.75</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Sinstrand"]/stuffProps/statFactors/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="Sinstrand"]/stuffProps/categories</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Sinstrand"]/stuffProps</xpath>
-						<value>
-							<categories>
-								<li>SoftArmor</li>
-							</categories>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="Sinstrand"]/stuffProps/categories</xpath>
-						<value>
-							<li>SoftArmor</li>
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/The Corporation - Mort's Factions/Corporation_TraderKinds.xml b/Patches/The Corporation - Mort's Factions/Corporation_TraderKinds.xml
deleted file mode 100644
index 1ab51440fc..0000000000
--- a/Patches/The Corporation - Mort's Factions/Corporation_TraderKinds.xml	
+++ /dev/null
@@ -1,397 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>The Corporation - Mort's Factions</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Corpo Base ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="MF_Base_Corporate_Standard"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>FSX</thingDef>
-							<countRange>
-								<min>25</min>
-								<max>100</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>Prometheum</thingDef>
-							<countRange>
-								<min>25</min>
-								<max>100</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Ammo</tradeTag>
-							<countRange>
-								<min>500</min>
-								<max>2000</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>5</min>
-								<max>9</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_MediumAmmo</tradeTag>
-							<countRange>
-								<min>30</min>
-								<max>100</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>5</min>
-								<max>8</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_HeavyAmmo</tradeTag>
-							<countRange>
-								<min>10</min>
-								<max>50</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>4</min>
-								<max>6</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Category">
-							<categoryDef>Ammo</categoryDef>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>0</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Turret</tradeTag>
-							<thingDefCountRange>
-								<min>-2</min>
-								<max>4</max>
-							</thingDefCountRange>
-							<countRange>
-								<min>1</min>
-								<max>2</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_Category">
-							<categoryDef>WeaponsTurrets</categoryDef>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>0</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Animals">
-							<tradeTagsSell>
-								<li>CE_AnimalBoom</li>
-							</tradeTagsSell>
-							<tradeTagsBuy>
-								<li>CE_AnimalBoom</li>
-							</tradeTagsBuy>
-							<kindCountRange>
-								<min>1</min>
-								<max>2</max>
-							</kindCountRange>
-							<countRange>
-								<min>-2</min>
-								<max>4</max>
-							</countRange>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Corpo Caravan ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="MF_Corporate_Caravan_BulkGoods"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Ammo</tradeTag>
-							<countRange>
-								<min>200</min>
-								<max>400</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>1</min>
-								<max>4</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_MediumAmmo</tradeTag>
-							<countRange>
-								<min>20</min>
-								<max>40</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>2</min>
-								<max>6</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_HeavyAmmo</tradeTag>
-							<countRange>
-								<min>5</min>
-								<max>10</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>2</min>
-								<max>4</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Category">
-							<categoryDef>Ammo</categoryDef>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>0</max>
-							</thingDefCountRange>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="MF_Corporate_Caravan_BulkGoods"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>FSX</thingDef>
-							<countRange>
-								<min>25</min>
-								<max>65</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>Prometheum</thingDef>
-							<countRange>
-								<min>25</min>
-								<max>65</max>
-							</countRange>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="MF_Corporate_Caravan_Slaver"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Ammo</tradeTag>
-							<countRange>
-								<min>100</min>
-								<max>300</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>1</min>
-								<max>3</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_MediumAmmo</tradeTag>
-							<countRange>
-								<min>5</min>
-								<max>20</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>1</min>
-								<max>4</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_HeavyAmmo</tradeTag>
-							<countRange>
-								<min>5</min>
-								<max>10</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>1</min>
-								<max>2</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Category">
-							<categoryDef>Ammo</categoryDef>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>0</max>
-							</thingDefCountRange>
-						</li>
-					</value>
-				</li>
-
-				<!-- Combat Supplier -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="MF_Corporate_Caravan_CombatSupplier"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>FSX</thingDef>
-							<countRange>
-								<min>15</min>
-								<max>40</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>Prometheum</thingDef>
-							<countRange>
-								<min>15</min>
-								<max>40</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Ammo</tradeTag>
-							<countRange>
-								<min>400</min>
-								<max>1000</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>3</min>
-								<max>8</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_MediumAmmo</tradeTag>
-							<countRange>
-								<min>30</min>
-								<max>60</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>3</min>
-								<max>6</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_HeavyAmmo</tradeTag>
-							<countRange>
-								<min>10</min>
-								<max>15</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>4</min>
-								<max>6</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Category">
-							<categoryDef>Ammo</categoryDef>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>0</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Turret</tradeTag>
-							<thingDefCountRange>
-								<min>-4</min>
-								<max>2</max>
-							</thingDefCountRange>
-							<countRange>
-								<min>1</min>
-								<max>1</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_Category">
-							<categoryDef>WeaponsTurrets</categoryDef>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>0</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Animals">
-							<tradeTagsSell>
-								<li>CE_AnimalBoom</li>
-							</tradeTagsSell>
-							<tradeTagsBuy>
-								<li>CE_AnimalBoom</li>
-							</tradeTagsBuy>
-							<kindCountRange>
-								<min>1</min>
-								<max>1</max>
-							</kindCountRange>
-							<countRange>
-								<min>-1</min>
-								<max>2</max>
-							</countRange>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="MF_Corporate_Caravan_Exotic"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_Animals">
-							<tradeTagsSell>
-								<li>CE_AnimalBoom</li>
-							</tradeTagsSell>
-							<tradeTagsBuy>
-								<li>CE_AnimalBoom</li>
-							</tradeTagsBuy>
-							<kindCountRange>
-								<min>1</min>
-								<max>2</max>
-							</kindCountRange>
-							<countRange>
-								<min>-2</min>
-								<max>4</max>
-							</countRange>
-						</li>
-					</value>
-				</li>
-
-				<!-- Orbital Corpo Trader -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="MF_Orbital_Corporate"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Ammo</tradeTag>
-							<countRange>
-								<min>200</min>
-								<max>800</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>3</min>
-								<max>6</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_MediumAmmo</tradeTag>
-							<countRange>
-								<min>60</min>
-								<max>120</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>4</min>
-								<max>7</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_HeavyAmmo</tradeTag>
-							<countRange>
-								<min>15</min>
-								<max>50</max>
-							</countRange>
-							<price>Cheap</price>
-							<thingDefCountRange>
-								<min>2</min>
-								<max>4</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Category">
-							<categoryDef>Ammo</categoryDef>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>0</max>
-							</thingDefCountRange>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/The Corporation - Mort's Factions/Pawnkinds_Corporation.xml b/Patches/The Corporation - Mort's Factions/Pawnkinds_Corporation.xml
deleted file mode 100644
index d81e44a7e9..0000000000
--- a/Patches/The Corporation - Mort's Factions/Pawnkinds_Corporation.xml	
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>The Corporation - Mort's Factions</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="MF_CorporatePunk"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.35</generateChance>
-									<sidearmMoney>
-										<min>10</min>
-										<max>150</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="MF_CorporatePunkMechanitor"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[
-						@Name="MF_CorporateSecurityBase" or
-						@Name="MF_CorporatePunkBase"
-						]/apparelRequired </xpath>
-					<value>
-						<li>CE_Apparel_Backpack</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						@Name="MF_CorporateEmployeeBase" or
-						@Name="MF_CorporateBase"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="MF_Corporate_Fighter_Security" or
-						defName="MF_Corporate_Fighter_AugmentMarine"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="MF_CorporateMercenaryBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>25</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-								<li>
-									<generateChance>0.05</generateChance>
-									<sidearmMoney>
-										<min>80</min>
-										<max>160</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_FlareLauncher</li>
-									</weaponTags>
-									<magazineCount>
-										<min>2</min>
-										<max>5</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/The GiantRace/PawnKindDefs/Giant_PawnKind.xml b/Patches/The GiantRace/PawnKindDefs/Giant_PawnKind.xml
deleted file mode 100644
index 7c7307bded..0000000000
--- a/Patches/The GiantRace/PawnKindDefs/Giant_PawnKind.xml	
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>The GiantRace</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--Ammo-->
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[
-								@Name="GIBasePawnKind"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>6</min>
-										<max>20</max>
-									</primaryMagazineCount>
-								</li>
-							</value>
-						</li>
-
-						<!--Points reductions across the board, along the same lines as tribals-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/PawnKindDef[defName="Gi_Warrior"]/combatPower</xpath>
-							<value>
-								<combatPower>210</combatPower>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/PawnKindDef[defName="Gi_Thrower"]/combatPower</xpath>
-							<value>
-								<combatPower>240</combatPower>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/PawnKindDef[defName="Gi_ExpertWarrior"]/combatPower</xpath>
-							<value>
-								<combatPower>285</combatPower>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/PawnKindDef[defName="Gi_ExpertThrower"]/combatPower</xpath>
-							<value>
-								<combatPower>300</combatPower>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/PawnKindDef[defName="Gi_Champion"]/combatPower</xpath>
-							<value>
-								<combatPower>375</combatPower>
-							</value>
-						</li>
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/The GiantRace/Scenario/Giant_Scenario.xml b/Patches/The GiantRace/Scenario/Giant_Scenario.xml
deleted file mode 100644
index 9efa0dc43e..0000000000
--- a/Patches/The GiantRace/Scenario/Giant_Scenario.xml	
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>The GiantRace</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ScenarioDef[defName="GI_Scenario"]/scenario/parts</xpath>
-							<value>
-								<li Class="ScenPart_StartingThing_Defined">
-									<def>StartingThing_Defined</def>
-									<thingDef>Ammo_Arrow_Stone</thingDef>
-									<count>100</count>
-								</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/The GiantRace/ThingDefs_Misc/GiantApparel.xml b/Patches/The GiantRace/ThingDefs_Misc/GiantApparel.xml
deleted file mode 100644
index b40331b134..0000000000
--- a/Patches/The GiantRace/ThingDefs_Misc/GiantApparel.xml	
+++ /dev/null
@@ -1,356 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>The GiantRace</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_GiantRags"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-								<Bulk>6</Bulk>
-								<WornBulk>0</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Clothes"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
-								<Bulk>8</Bulk>
-								<WornBulk>0</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Coverall"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
-								<Bulk>12</Bulk>
-								<WornBulk>0</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="GI_Coverall"]/apparel/bodyPartGroups</xpath>
-							<value>
-								<li>Hands</li>
-								<li>Feet</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="GI_Coverall"]/equippedStatOffsets</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="GI_Coverall"]</xpath>
-								<value>
-									<equippedStatOffsets>
-										<CarryBulk>2.5</CarryBulk>
-									</equippedStatOffsets>
-								</value>
-							</nomatch>
-							<match Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="GI_Coverall"]/equippedStatOffsets</xpath>
-								<value>
-									<CarryBulk>2.5</CarryBulk>
-								</value>
-							</match>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Brigandine"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
-								<Bulk>140</Bulk>
-								<WornBulk>25</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Brigandine"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Brigandine"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.50</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Brigandine"]/statBases/Mass</xpath>
-							<value>
-								<Mass>35</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[defName="GI_Brigandine"]/equippedStatOffsets/MoveSpeed</xpath>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Shadehat"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-								<Bulk>4</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Potlid"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-								<Bulk>8</Bulk>
-								<WornBulk>2</WornBulk>
-							</value>
-						</li>
-
-						<!--Note, techincally a thrumbohorn weighs like, 50kg, but we're not going to bother changing the mass for this-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Thrumboskull"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>6</ArmorRating_Sharp>
-								<Bulk>8</Bulk>
-								<WornBulk>2</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Thrumboskull"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>9</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_MaskandhelmF" or defName="GI_MaskandhelmM"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-								<Bulk>25</Bulk>
-								<WornBulk>5</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_MaskandhelmF" or defName="GI_MaskandhelmM"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_MaskandhelmF" or defName="GI_MaskandhelmM"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.50</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Insignia"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-								<Bulk>8</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Bonepauldron"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>2</ArmorRating_Sharp>
-								<Bulk>18</Bulk>
-								<WornBulk>6</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Bonepauldron"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>8</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Booty"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-								<Bulk>8</Bulk>
-								<WornBulk>2</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Pauldron"]/statBases/StuffEffectMultiplierArmor</xpath>
-							<value>
-								<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-								<Bulk>140</Bulk>
-								<WornBulk>15</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Powerarmour"]/statBases/Mass</xpath>
-							<value>
-								<Mass>130</Mass>
-								<Bulk>300</Bulk>
-								<WornBulk>80</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Powerarmour"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>36</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Powerarmour"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>81</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="GI_Powerarmour"]/equippedStatOffsets</xpath>
-							<value>
-								<CarryBulk>15</CarryBulk>
-								<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-								<CarryWeight>35</CarryWeight>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="GI_Powerarmour"]/apparel/bodyPartGroups</xpath>
-							<value>
-								<li>Hands</li>
-								<li>Feet</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Powerhelmet"]/statBases/Mass</xpath>
-							<value>
-								<Mass>8</Mass>
-								<Bulk>20</Bulk>
-								<WornBulk>4</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Powerhelmet"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>32</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Powerhelmet"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>72</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="GI_Powerhelmet"]/apparel/immuneToToxGasExposure</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="GI_Powerhelmet"]/apparel</xpath>
-								<value>
-									<immuneToToxGasExposure>true</immuneToToxGasExposure>
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="GI_Powerhelmet"]/equippedStatOffsets</xpath>
-							<value>
-								<AimingAccuracy>0.15</AimingAccuracy>
-								<SmokeSensitivity>-1</SmokeSensitivity>
-							</value>
-						</li>
-
-						<!-- Armor launched mortar Projectile -->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<ThingDef ParentName="Base81mmMortarShell">
-									<defName>Bullet_81mmMortarShell_GiantArmor</defName>
-									<label>81mm mortar shell (HE)</label>
-									<graphicData>
-										<texPath>Things/Projectile/Mortar/HE</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageDef>Bomb</damageDef>
-										<damageAmountBase>156</damageAmountBase>
-										<armorPenetrationSharp>0</armorPenetrationSharp>
-										<armorPenetrationBlunt>0</armorPenetrationBlunt>
-										<explosionRadius>2.5</explosionRadius>
-										<flyOverhead>true</flyOverhead>
-										<soundExplode>MortarBomb_Explode</soundExplode>
-										<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-										<ai_IsIncendiary>true</ai_IsIncendiary>
-										<speed>35</speed>
-									</projectile>
-									<comps>
-										<li Class="CombatExtended.CompProperties_Fragments">
-											<fragments>
-												<Fragment_Large>16</Fragment_Large>
-												<Fragment_Small>100</Fragment_Small>
-											</fragments>
-										</li>
-									</comps>
-								</ThingDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="GI_Powerarmour"]/verbs</xpath>
-							<match Class="PatchOperationReplace">
-								<xpath>Defs/ThingDef[defName="GI_Powerarmour"]/verbs</xpath>
-								<value>
-									<verbs>
-										<li Class="CombatExtended.VerbPropertiesCE">
-											<label>launch 81mm shell</label>
-											<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
-											<hasStandardCommand>true</hasStandardCommand>
-											<onlyManualCast>True</onlyManualCast>
-											<warmupTime>2.1</warmupTime>
-											<range>75</range>
-											<minRange>10</minRange>
-											<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-											<soundCast>Mortar_LaunchA</soundCast>
-											<soundCastTail>GunTail_Medium</soundCastTail>
-											<muzzleFlashScale>14</muzzleFlashScale>
-											<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
-											<targetParams>
-												<canTargetLocations>true</canTargetLocations>
-											</targetParams>
-											<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-											<defaultProjectile>Bullet_81mmMortarShell_GiantArmor</defaultProjectile>
-											<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
-										</li>
-									</verbs>
-								</value>
-							</match>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/The GiantRace/ThingDefs_Misc/GiantWeapons_Melee.xml b/Patches/The GiantRace/ThingDefs_Misc/GiantWeapons_Melee.xml
deleted file mode 100644
index 8f6759a72e..0000000000
--- a/Patches/The GiantRace/ThingDefs_Misc/GiantWeapons_Melee.xml	
+++ /dev/null
@@ -1,488 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>The GiantRace</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--========= Melee =========-->
-
-						<!--Log Club-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_GiantClub"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>11</power>
-										<cooldownTime>2.51</cooldownTime>
-										<armorPenetrationBlunt>3.76</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>36</power>
-										<cooldownTime>3.76</cooldownTime>
-										<chanceFactor>2</chanceFactor>
-										<armorPenetrationBlunt>15.6</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="GI_GiantClub"]/statBases</xpath>
-							<value>
-								<Bulk>15.5</Bulk>
-								<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="GI_GiantClub"]/equippedStatOffsets</xpath>
-							<value>
-								<MeleeCritChance>0.65</MeleeCritChance>
-								<MeleeParryChance>0.15</MeleeParryChance>
-								<MeleeDodgeChance>0.2</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<!--Ivory Pick-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_IvoryClub"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>14</power>
-										<cooldownTime>2.51</cooldownTime>
-										<armorPenetrationBlunt>5.1</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Stab</li>
-											<li>Scratch</li>
-										</capacities>
-										<power>44</power>
-										<cooldownTime>4.02</cooldownTime>
-										<chanceFactor>2</chanceFactor>
-										<armorPenetrationSharp>0.91</armorPenetrationSharp>
-										<armorPenetrationBlunt>20.4</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="GI_IvoryClub"]/statBases</xpath>
-							<value>
-								<Bulk>15.5</Bulk>
-								<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="GI_IvoryClub"]/equippedStatOffsets</xpath>
-							<value>
-								<MeleeCritChance>0.65</MeleeCritChance>
-								<MeleeParryChance>0.15</MeleeParryChance>
-								<MeleeDodgeChance>0.2</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<!--Mammoth Hammer-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_MammothHammer"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>16</power>
-										<cooldownTime>2.79</cooldownTime>
-										<armorPenetrationBlunt>6</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Stab</li>
-											<li>Scratch</li>
-										</capacities>
-										<power>46</power>
-										<cooldownTime>4.19</cooldownTime>
-										<chanceFactor>2</chanceFactor>
-										<armorPenetrationSharp>2.29</armorPenetrationSharp>
-										<armorPenetrationBlunt>24</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="GI_MammothHammer"]/statBases</xpath>
-							<value>
-								<Bulk>18.5</Bulk>
-								<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="GI_MammothHammer"]/equippedStatOffsets</xpath>
-							<value>
-								<MeleeCritChance>0.67</MeleeCritChance>
-								<MeleeParryChance>0.24</MeleeParryChance>
-								<MeleeDodgeChance>0.2</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<!--Thrumbo Blade-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_ThrumboSpineBlade"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>base</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>20</power>
-										<cooldownTime>2.98</cooldownTime>
-										<armorPenetrationBlunt>7.8</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>blade</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>108</power>
-										<cooldownTime>1.75</cooldownTime>
-										<chanceFactor>1.165</chanceFactor>
-										<armorPenetrationBlunt>22.542</armorPenetrationBlunt>
-										<armorPenetrationSharp>3.01</armorPenetrationSharp>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>point</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>45</power>
-										<cooldownTime>2.98</cooldownTime>
-										<chanceFactor>1.165</chanceFactor>
-										<armorPenetrationBlunt>7.8</armorPenetrationBlunt>
-										<armorPenetrationSharp>15.6</armorPenetrationSharp>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="GI_ThrumboSpineBlade"]/statBases</xpath>
-							<value>
-								<MeleeCounterParryBonus>0.8</MeleeCounterParryBonus>
-								<Bulk>22.5</Bulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="GI_ThrumboSpineBlade"]/equippedStatOffsets</xpath>
-							<value>
-								<MeleeCritChance>1</MeleeCritChance>
-								<MeleeParryChance>0.6</MeleeParryChance>
-								<MeleeDodgeChance>0.4</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<!--Cleaver-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Cleaver"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>base</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>14</power>
-										<cooldownTime>2.72</cooldownTime>
-										<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>blade</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>97</power>
-										<cooldownTime>2.53</cooldownTime>
-										<chanceFactor>1.165</chanceFactor>
-										<armorPenetrationBlunt>17.496</armorPenetrationBlunt>
-										<armorPenetrationSharp>2.7</armorPenetrationSharp>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>point</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>45</power>
-										<cooldownTime>2.72</cooldownTime>
-										<chanceFactor>1.165</chanceFactor>
-										<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
-										<armorPenetrationSharp>6.75</armorPenetrationSharp>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="GI_Cleaver"]/statBases</xpath>
-							<value>
-								<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-								<Bulk>17.75</Bulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="GI_Cleaver"]/equippedStatOffsets</xpath>
-							<value>
-								<MeleeCritChance>0.63</MeleeCritChance>
-								<MeleeParryChance>0.75</MeleeParryChance>
-								<MeleeDodgeChance>0.4</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<!--Warhammer-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Hammer"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>18</power>
-										<cooldownTime>2.93</cooldownTime>
-										<armorPenetrationBlunt>7.25</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>74</power>
-										<cooldownTime>3.99</cooldownTime>
-										<chanceFactor>2</chanceFactor>
-										<armorPenetrationBlunt>35.09</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="GI_Hammer"]/statBases</xpath>
-							<value>
-								<Bulk>18.25</Bulk>
-								<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="GI_Hammer"]/equippedStatOffsets</xpath>
-							<value>
-								<MeleeCritChance>2.5</MeleeCritChance>
-								<MeleeParryChance>0.18</MeleeParryChance>
-								<MeleeDodgeChance>0.3</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<!--War Ram-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Ram"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>31</power>
-										<cooldownTime>3.39</cooldownTime>
-										<armorPenetrationBlunt>13</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>105</power>
-										<cooldownTime>5.95</cooldownTime>
-										<chanceFactor>2</chanceFactor>
-										<armorPenetrationBlunt>51.84</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="GI_Ram"]/statBases</xpath>
-							<value>
-								<Bulk>25.25</Bulk>
-								<MeleeCounterParryBonus>0.05</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="GI_Ram"]/equippedStatOffsets</xpath>
-							<value>
-								<MeleeCritChance>1.5</MeleeCritChance>
-								<MeleeParryChance>0.05</MeleeParryChance>
-							</value>
-						</li>
-
-						<!--Drill-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Drill"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>drill bit</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>25</power>
-										<cooldownTime>0.2</cooldownTime>
-										<chanceFactor>2</chanceFactor>
-										<armorPenetrationSharp>18</armorPenetrationSharp>
-										<armorPenetrationBlunt>50</armorPenetrationBlunt>
-										<extraMeleeDamages>
-											<li>
-												<def>EMP</def>
-												<amount>4</amount>
-												<chance>0.3</chance>
-											</li>
-										</extraMeleeDamages>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="GI_Drill"]/statBases</xpath>
-							<value>
-								<Bulk>36</Bulk>
-								<MeleeCounterParryBonus>0</MeleeCounterParryBonus>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="GI_Drill"]/equippedStatOffsets</xpath>
-							<value>
-								<MeleeCritChance>0</MeleeCritChance>
-								<MeleeParryChance>4</MeleeParryChance>
-								<MeleeDodgeChance>0.2</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<!--Titan Blade-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Titansword"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>handle</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>27</power>
-										<cooldownTime>3.75</cooldownTime>
-										<armorPenetrationBlunt>11</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>blade</label>
-										<capacities>
-											<li>Cut</li>
-										</capacities>
-										<power>173</power>
-										<cooldownTime>6.64</cooldownTime>
-										<chanceFactor>1.165</chanceFactor>
-										<armorPenetrationBlunt>48</armorPenetrationBlunt>
-										<armorPenetrationSharp>8</armorPenetrationSharp>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>point</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>78</power>
-										<cooldownTime>3.25</cooldownTime>
-										<chanceFactor>1.165</chanceFactor>
-										<armorPenetrationBlunt>11</armorPenetrationBlunt>
-										<armorPenetrationSharp>13.75</armorPenetrationSharp>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="GI_Titansword"]/statBases</xpath>
-							<value>
-								<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
-								<Bulk>24</Bulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="GI_Titansword"]/equippedStatOffsets</xpath>
-							<value>
-								<MeleeCritChance>0.8</MeleeCritChance>
-								<MeleeParryChance>0.6</MeleeParryChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Titansword"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>0.8</MeleeDodgeChance>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/The GiantRace/ThingDefs_Misc/GiantWeapons_Ranged.xml b/Patches/The GiantRace/ThingDefs_Misc/GiantWeapons_Ranged.xml
deleted file mode 100644
index d40959c952..0000000000
--- a/Patches/The GiantRace/ThingDefs_Misc/GiantWeapons_Ranged.xml	
+++ /dev/null
@@ -1,1133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>The GiantRace</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--========= Ranged =========-->
-						<!-- Comps and Classes -->
-
-						<li Class="PatchOperationAttributeRemove">
-							<xpath>Defs/ThingDef[@Name="GiantBaseRange"]</xpath>
-							<attribute>ParentName</attribute>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="GiantBaseRange"]</xpath>
-							<value>
-								<equipmentType>Primary</equipmentType>
-								<pathCost>10</pathCost>
-								<graphicData>
-									<onGroundRandomRotateAngle>35</onGroundRandomRotateAngle>
-								</graphicData>
-								<menuHidden>False</menuHidden>
-								<destroyOnDrop>False</destroyOnDrop>
-								<thingClass>CombatExtended.AmmoThing</thingClass>
-								<label>unspecified ammunition</label>
-								<category>Item</category>
-								<resourceReadoutPriority>Middle</resourceReadoutPriority>
-								<useHitPoints>true</useHitPoints>
-								<statBases>
-									<MaxHitPoints>100</MaxHitPoints>
-									<Beauty>-5</Beauty>
-									<Flammability>1</Flammability>
-									<DeteriorationRate>2</DeteriorationRate>
-									<SellPriceFactor>0.5</SellPriceFactor>
-								</statBases>
-								<selectable>true</selectable>
-								<altitudeLayer>Item</altitudeLayer>
-								<stackLimit>5000</stackLimit>
-								<soundInteract>Metal_Drop</soundInteract>
-								<soundDrop>Metal_Drop</soundDrop>
-								<alwaysHaulable>true</alwaysHaulable>
-								<drawGUIOverlay>true</drawGUIOverlay>
-								<rotatable>false</rotatable>
-								<tradeTags>
-									<li>CE_Ammo</li>
-								</tradeTags>
-								<tradeability>None</tradeability>
-								<tickerType>Normal</tickerType>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="GiantBaseRange"]/comps</xpath>
-							<value>
-								<li Class="CompProperties_Forbiddable" />
-								<li>
-									<compClass>CompEquippable</compClass>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAttributeSet">
-							<xpath>Defs/ThingDef[defName="GI_Jackstones_granite"]</xpath>
-							<attribute>Class</attribute>
-							<value>CombatExtended.AmmoDef</value>
-						</li>
-
-						<li Class="PatchOperationAttributeSet">
-							<xpath>Defs/ThingDef[defName="GI_Jackstones_limestone"]</xpath>
-							<attribute>Class</attribute>
-							<value>CombatExtended.AmmoDef</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="GI_Jackstones_limestone"]/comps</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="GI_Jackstones_limestone"]</xpath>
-								<value>
-									<comps />
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationAttributeSet">
-							<xpath>Defs/ThingDef[defName="GI_Jackstones_granite"]</xpath>
-							<attribute>Class</attribute>
-							<value>CombatExtended.AmmoDef</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="GI_Jackstones_granite"]/comps</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="GI_Jackstones_granite"]</xpath>
-								<value>
-									<comps />
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationAttributeSet">
-							<xpath>Defs/ThingDef[defName="GI_Javelin"]</xpath>
-							<attribute>Class</attribute>
-							<value>CombatExtended.AmmoDef</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="GI_Javelin"]/comps</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="GI_Javelin"]</xpath>
-								<value>
-									<comps />
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationAttributeSet">
-							<xpath>Defs/ThingDef[defName="GI_Scrapmetal"]</xpath>
-							<attribute>Class</attribute>
-							<value>CombatExtended.AmmoDef</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="GI_Scrapmetal"]/comps</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="GI_Scrapmetal"]</xpath>
-								<value>
-									<comps />
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationAttributeSet">
-							<xpath>Defs/ThingDef[defName="GI_Rockpillar_granite"]</xpath>
-							<attribute>Class</attribute>
-							<value>CombatExtended.AmmoDef</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="GI_Rockpillar_granite"]/comps</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="GI_Rockpillar_granite"]</xpath>
-								<value>
-									<comps />
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationAttributeSet">
-							<xpath>Defs/ThingDef[defName="GI_Rockpillar_Marble"]</xpath>
-							<attribute>Class</attribute>
-							<value>CombatExtended.AmmoDef</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="GI_Rockpillar_Marble"]/comps</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="GI_Rockpillar_Marble"]</xpath>
-								<value>
-									<comps />
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationAttributeSet">
-							<xpath>Defs/ThingDef[defName="GI_Lightningjavelin"]</xpath>
-							<attribute>Class</attribute>
-							<value>CombatExtended.AmmoDef</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="GI_Lightningjavelin"]/comps</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="GI_Lightningjavelin"]</xpath>
-								<value>
-									<comps />
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[
-								defName="GI_Jackstones_limestone" or
-								defName="GI_Jackstones_granite" or
-								defName="GI_Javelin" or
-								defName="GI_Lightningjavelin" or
-								defName="GI_Scrapmetal" or
-								defName="GI_Rockpillar_granite" or
-								defName="GI_Rockpillar_Marble"
-								] </xpath>
-							<value>
-								<stackLimit>25</stackLimit>
-							</value>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[
-								defName="GI_Jackstones_limestone" or
-								defName="GI_Jackstones_granite" or
-								defName="GI_Javelin" or
-								defName="GI_Lightningjavelin" or
-								defName="GI_Scrapmetal" or
-								defName="GI_Rockpillar_granite" or
-								defName="GI_Rockpillar_Marble"
-								]/costList </xpath>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[
-								defName="GI_Jackstones_limestone" or
-								defName="GI_Jackstones_granite" or
-								defName="GI_Javelin" or
-								defName="GI_Lightningjavelin" or
-								defName="GI_Scrapmetal" or
-								defName="GI_Rockpillar_granite" or
-								defName="GI_Rockpillar_Marble"
-								]/statBases/WorkToMake </xpath>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ThingDef[
-								defName="GI_Jackstones_limestone" or
-								defName="GI_Jackstones_granite" or
-								defName="GI_Javelin" or
-								defName="GI_Lightningjavelin" or
-								defName="GI_Scrapmetal" or
-								defName="GI_Rockpillar_granite" or
-								defName="GI_Rockpillar_Marble"
-								]/recipeMaker </xpath>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[
-								defName="GI_Jackstones_limestone" or
-								defName="GI_Jackstones_granite" or
-								defName="GI_Javelin" or
-								defName="GI_Scrapmetal" or
-								defName="GI_Rockpillar_granite" or
-								defName="GI_Rockpillar_Marble"
-								]/statBases </xpath>
-							<value>
-								<MarketValue>0.05</MarketValue>
-								<MarketValue>0.18</MarketValue>
-								<MarketValue>0.09</MarketValue>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[
-								defName="GI_Jackstones_limestone" or
-								defName="GI_Jackstones_granite"
-								]/statBases </xpath>
-							<value>
-								<MarketValue>0.05</MarketValue>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[
-								defName="GI_Javelin" or
-								defName="GI_Scrapmetal"
-								]/statBases </xpath>
-							<value>
-								<MarketValue>0.18</MarketValue>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[
-								defName="GI_Rockpillar_granite" or
-								defName="GI_Rockpillar_Marble"
-								]/statBases </xpath>
-							<value>
-								<MarketValue>0.09</MarketValue>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[
-								defName="GI_Lightningjavelin"
-								]/statBases </xpath>
-							<value>
-								<MarketValue>75</MarketValue>
-							</value>
-						</li>
-
-						<!-- == Recipes == -->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-									<defName>Make_GI_Jackstones_limestone</defName>
-									<label>make limestone jackstones x10</label>
-									<description>Craft 10 limestone jackstones.</description>
-									<jobString>Making limestone jackstones.</jobString>
-									<workAmount>500</workAmount>
-									<ingredients>
-										<li>
-											<filter>
-												<thingDefs>
-													<li>BlocksLimestone</li>
-												</thingDefs>
-											</filter>
-											<count>25</count>
-										</li>
-									</ingredients>
-									<fixedIngredientFilter>
-										<thingDefs>
-											<li>BlocksLimestone</li>
-										</thingDefs>
-									</fixedIngredientFilter>
-									<recipeUsers>
-										<li>CraftingSpot</li>
-										<li>ElectricSmithy</li>
-										<li>FueledSmithy</li>
-									</recipeUsers>
-									<products>
-										<GI_Jackstones_limestone>10</GI_Jackstones_limestone>
-									</products>
-								</RecipeDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-									<defName>Make_GI_Jackstones_granite</defName>
-									<label>make granite jackstones x10</label>
-									<description>Craft 10 granite jackstones.</description>
-									<jobString>Making granite jackstones.</jobString>
-									<workAmount>500</workAmount>
-									<ingredients>
-										<li>
-											<filter>
-												<thingDefs>
-													<li>BlocksGranite</li>
-												</thingDefs>
-											</filter>
-											<count>25</count>
-										</li>
-									</ingredients>
-									<fixedIngredientFilter>
-										<thingDefs>
-											<li>BlocksGranite</li>
-										</thingDefs>
-									</fixedIngredientFilter>
-									<recipeUsers>
-										<li>CraftingSpot</li>
-										<li>ElectricSmithy</li>
-										<li>FueledSmithy</li>
-									</recipeUsers>
-									<products>
-										<GI_Jackstones_granite>10</GI_Jackstones_granite>
-									</products>
-								</RecipeDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-									<defName>Make_GI_Javelin</defName>
-									<label>make giant javelin x10</label>
-									<description>Craft 10 giant javelins.</description>
-									<jobString>Making giant javelins.</jobString>
-									<workAmount>8500</workAmount>
-									<ingredients>
-										<li>
-											<filter>
-												<thingDefs>
-													<li>WoodLog</li>
-												</thingDefs>
-											</filter>
-											<count>120</count>
-										</li>
-										<li>
-											<filter>
-												<thingDefs>
-													<li>ElephantTusk</li>
-												</thingDefs>
-											</filter>
-											<count>3</count>
-										</li>
-									</ingredients>
-									<fixedIngredientFilter>
-										<thingDefs>
-											<li>WoodLog</li>
-											<li>ElephantTusk</li>
-										</thingDefs>
-									</fixedIngredientFilter>
-									<recipeUsers>
-										<li>CraftingSpot</li>
-										<li>ElectricSmithy</li>
-										<li>FueledSmithy</li>
-									</recipeUsers>
-									<products>
-										<GI_Javelin>10</GI_Javelin>
-									</products>
-								</RecipeDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-									<defName>Make_GI_Scrapmetal</defName>
-									<label>make scrapmetal bundle x25</label>
-									<description>Craft 10 scrapmetal bundles.</description>
-									<jobString>Making scrapmetal bundles.</jobString>
-									<workAmount>3800</workAmount>
-									<ingredients>
-										<li>
-											<filter>
-												<thingDefs>
-													<li>Steel</li>
-												</thingDefs>
-											</filter>
-											<count>120</count>
-										</li>
-									</ingredients>
-									<fixedIngredientFilter>
-										<thingDefs>
-											<li>BlocksGranite</li>
-										</thingDefs>
-									</fixedIngredientFilter>
-									<recipeUsers>
-										<li>ElectricSmithy</li>
-										<li>FueledSmithy</li>
-									</recipeUsers>
-									<products>
-										<GI_Scrapmetal>25</GI_Scrapmetal>
-									</products>
-								</RecipeDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-									<defName>Make_Rockpillar_granite</defName>
-									<label>make granite rockpillar x25</label>
-									<description>Craft 10 granite rockpillars.</description>
-									<jobString>Making granite rockpillars.</jobString>
-									<workAmount>18500</workAmount>
-									<ingredients>
-										<li>
-											<filter>
-												<thingDefs>
-													<li>BlocksGranite</li>
-												</thingDefs>
-											</filter>
-											<count>250</count>
-										</li>
-									</ingredients>
-									<fixedIngredientFilter>
-										<thingDefs>
-											<li>BlocksGranite</li>
-										</thingDefs>
-									</fixedIngredientFilter>
-									<recipeUsers>
-										<li>ElectricSmithy</li>
-										<li>FueledSmithy</li>
-									</recipeUsers>
-									<products>
-										<GI_Rockpillar_granite>25</GI_Rockpillar_granite>
-									</products>
-								</RecipeDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-									<defName>Make_Rockpillar_marble</defName>
-									<label>make marble rockpillar x25</label>
-									<description>Craft 25 marble rockpillars.</description>
-									<jobString>Making marble rockpillars.</jobString>
-									<workAmount>18500</workAmount>
-									<ingredients>
-										<li>
-											<filter>
-												<thingDefs>
-													<li>BlocksMarble</li>
-												</thingDefs>
-											</filter>
-											<count>250</count>
-										</li>
-									</ingredients>
-									<fixedIngredientFilter>
-										<thingDefs>
-											<li>BlocksGranite</li>
-										</thingDefs>
-									</fixedIngredientFilter>
-									<recipeUsers>
-										<li>ElectricSmithy</li>
-										<li>FueledSmithy</li>
-									</recipeUsers>
-									<products>
-										<GI_Rockpillar_Marble>25</GI_Rockpillar_Marble>
-									</products>
-								</RecipeDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs</xpath>
-							<value>
-								<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-									<defName>Make_GI_Lightningjavelin</defName>
-									<label>make lightning javelin x10</label>
-									<description>Craft 10 lightning javelins.</description>
-									<jobString>Making lightning javelins.</jobString>
-									<workAmount>28500</workAmount>
-									<ingredients>
-										<li>
-											<filter>
-												<thingDefs>
-													<li>Steel</li>
-												</thingDefs>
-											</filter>
-											<count>200</count>
-										</li>
-										<li>
-											<filter>
-												<thingDefs>
-													<li>ComponentIndustrial</li>
-												</thingDefs>
-											</filter>
-											<count>12</count>
-										</li>
-									</ingredients>
-									<fixedIngredientFilter>
-										<thingDefs>
-											<li>Steel</li>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</fixedIngredientFilter>
-									<recipeUsers>
-									</recipeUsers>
-									<products>
-										<GI_Javelin>10</GI_Javelin>
-									</products>
-								</RecipeDef>
-							</value>
-						</li>
-
-						<!-- Compat -->
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>GI_Jackstones_granite</defName>
-							<statBases>
-								<Mass>8</Mass>
-								<Bulk>5</Bulk>
-								<MarketValue>0.09</MarketValue>
-								<SightsEfficiency>0.8</SightsEfficiency>
-								<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-								<ShotSpread>1.5</ShotSpread>
-								<SwayFactor>2.5</SwayFactor>
-							</statBases>
-							<Properties>
-								<label>throw jackstone</label>
-								<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>GI_Jackstones_granite_Thrown</defaultProjectile>
-								<range>12</range>
-								<warmupTime>1.8</warmupTime>
-								<soundCast>Interact_BeatFire</soundCast>
-								<noiseRadius>4</noiseRadius>
-								<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-							</Properties>
-							<FireModes>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-							<AllowWithRunAndGun>false</AllowWithRunAndGun>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Jackstones_granite"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>stone fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>19</power>
-										<cooldownTime>2.25</cooldownTime>
-										<armorPenetrationBlunt>7.56</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>GI_Jackstones_limestone</defName>
-							<statBases>
-								<Mass>8</Mass>
-								<Bulk>5</Bulk>
-								<MarketValue>0.09</MarketValue>
-								<SightsEfficiency>0.8</SightsEfficiency>
-								<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-								<ShotSpread>1.5</ShotSpread>
-								<SwayFactor>2.5</SwayFactor>
-							</statBases>
-							<Properties>
-								<label>throw jackstone</label>
-								<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>GI_Jackstones_granite_Thrown</defaultProjectile>
-								<range>12</range>
-								<warmupTime>1.8</warmupTime>
-								<soundCast>Interact_BeatFire</soundCast>
-								<noiseRadius>4</noiseRadius>
-								<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-							</Properties>
-							<FireModes />
-							<AllowWithRunAndGun>false</AllowWithRunAndGun>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Jackstones_limestone"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>stone fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>19</power>
-										<cooldownTime>2.25</cooldownTime>
-										<armorPenetrationBlunt>7.56</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>GI_Javelin</defName>
-							<statBases>
-								<Mass>10.2</Mass>
-								<Bulk>12</Bulk>
-								<MarketValue>0.09</MarketValue>
-								<SightsEfficiency>1.0</SightsEfficiency>
-								<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-								<ShotSpread>1.5</ShotSpread>
-								<SwayFactor>2.5</SwayFactor>
-							</statBases>
-							<Properties>
-								<label>throw javelin</label>
-								<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>GI_Javelin_Thrown</defaultProjectile>
-								<range>16</range>
-								<warmupTime>1.8</warmupTime>
-								<soundCast>Interact_BeatFire</soundCast>
-								<noiseRadius>4</noiseRadius>
-								<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-							</Properties>
-							<FireModes />
-							<AllowWithRunAndGun>false</AllowWithRunAndGun>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Javelin"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>shaft</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>16</power>
-										<cooldownTime>2.79</cooldownTime>
-										<armorPenetrationBlunt>6</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>46</power>
-										<cooldownTime>4.19</cooldownTime>
-										<chanceFactor>2</chanceFactor>
-										<armorPenetrationSharp>2.29</armorPenetrationSharp>
-										<armorPenetrationBlunt>24</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>GI_Scrapmetal</defName>
-							<statBases>
-								<Mass>6.6</Mass>
-								<Bulk>5</Bulk>
-								<MarketValue>0.09</MarketValue>
-								<SightsEfficiency>0.8</SightsEfficiency>
-								<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-								<ShotSpread>10</ShotSpread>
-								<SwayFactor>2.5</SwayFactor>
-							</statBases>
-							<Properties>
-								<label>throw jackstone</label>
-								<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>GI_Scrapmetal_Thrown</defaultProjectile>
-								<range>12</range>
-								<warmupTime>1.8</warmupTime>
-								<soundCast>Interact_BeatFire</soundCast>
-								<noiseRadius>4</noiseRadius>
-								<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-							</Properties>
-							<FireModes />
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Scrapmetal"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>scrap fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>19</power>
-										<cooldownTime>2.25</cooldownTime>
-										<armorPenetrationBlunt>7.56</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>GI_Rockpillar_granite</defName>
-							<statBases>
-								<Mass>18</Mass>
-								<Bulk>14</Bulk>
-								<MarketValue>0.09</MarketValue>
-								<SightsEfficiency>0.8</SightsEfficiency>
-								<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-								<ShotSpread>1.5</ShotSpread>
-								<SwayFactor>2.5</SwayFactor>
-							</statBases>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>GI_Rockpillar_Marble_Thrown</defaultProjectile>
-								<range>8</range>
-								<warmupTime>1.8</warmupTime>
-								<soundCast>Interact_BeatFire</soundCast>
-								<noiseRadius>4</noiseRadius>
-								<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-							</Properties>
-							<FireModes />
-							<AllowWithRunAndGun>false</AllowWithRunAndGun>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Rockpillar_granite"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>pillar</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>18</power>
-										<cooldownTime>2.93</cooldownTime>
-										<armorPenetrationBlunt>7.25</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>GI_Rockpillar_Marble</defName>
-							<statBases>
-								<Mass>18</Mass>
-								<Bulk>14</Bulk>
-								<MarketValue>0.09</MarketValue>
-								<SightsEfficiency>0.8</SightsEfficiency>
-								<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-								<ShotSpread>1.5</ShotSpread>
-								<SwayFactor>2.5</SwayFactor>
-							</statBases>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>GI_Rockpillar_Marble_Thrown</defaultProjectile>
-								<range>8</range>
-								<warmupTime>1.8</warmupTime>
-								<soundCast>Interact_BeatFire</soundCast>
-								<noiseRadius>4</noiseRadius>
-								<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-							</Properties>
-							<AllowWithRunAndGun>false</AllowWithRunAndGun>
-							<FireModes />
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Rockpillar_Marble"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>pillar</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>18</power>
-										<cooldownTime>2.93</cooldownTime>
-										<armorPenetrationBlunt>7.25</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>GI_Javelin</defName>
-							<statBases>
-								<Mass>10.2</Mass>
-								<Bulk>12</Bulk>
-								<MarketValue>0.09</MarketValue>
-								<SightsEfficiency>1.0</SightsEfficiency>
-								<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-								<ShotSpread>1.5</ShotSpread>
-								<SwayFactor>2.5</SwayFactor>
-							</statBases>
-							<Properties>
-								<label>throw javelin</label>
-								<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>GI_Javelin_Thrown</defaultProjectile>
-								<range>16</range>
-								<warmupTime>1.8</warmupTime>
-								<soundCast>Interact_BeatFire</soundCast>
-								<noiseRadius>4</noiseRadius>
-								<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-							</Properties>
-							<FireModes />
-							<AllowWithRunAndGun>false</AllowWithRunAndGun>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Javelin"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>shaft</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>16</power>
-										<cooldownTime>2.79</cooldownTime>
-										<armorPenetrationBlunt>6</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>46</power>
-										<cooldownTime>4.19</cooldownTime>
-										<chanceFactor>2</chanceFactor>
-										<armorPenetrationSharp>2.29</armorPenetrationSharp>
-										<armorPenetrationBlunt>24</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>GI_Lightningjavelin</defName>
-							<statBases>
-								<Mass>8.6</Mass>
-								<Bulk>12</Bulk>
-								<MarketValue>0.09</MarketValue>
-								<SightsEfficiency>1.0</SightsEfficiency>
-								<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-								<ShotSpread>1.5</ShotSpread>
-								<SwayFactor>1.5</SwayFactor>
-							</statBases>
-							<Properties>
-								<label>throw javelin</label>
-								<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>GI_Lightningjavelin_Thrown</defaultProjectile>
-								<range>22</range>
-								<warmupTime>1.8</warmupTime>
-								<soundCast>Interact_BeatFire</soundCast>
-								<noiseRadius>4</noiseRadius>
-								<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-							</Properties>
-							<FireModes />
-							<AllowWithRunAndGun>false</AllowWithRunAndGun>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Lightningjavelin"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>shaft</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>27</power>
-										<cooldownTime>3.75</cooldownTime>
-										<armorPenetrationBlunt>6</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Stab</li>
-										</capacities>
-										<power>42</power>
-										<cooldownTime>3.85</cooldownTime>
-										<chanceFactor>2</chanceFactor>
-										<armorPenetrationSharp>28</armorPenetrationSharp>
-										<armorPenetrationBlunt>40</armorPenetrationBlunt>
-										<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-										<extraMeleeDamages>
-											<li>
-												<def>EMP</def>
-												<amount>4</amount>
-												<chance>0.5</chance>
-											</li>
-										</extraMeleeDamages>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<!--Ammo-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Jackstones_granite_Thrown"]</xpath>
-							<value>
-								<ThingDef ParentName="BasePilumProjectile">
-									<defName>GI_Jackstones_granite_Thrown</defName>
-									<label>Jackstones</label>
-									<graphicData>
-										<texPath>Giant/Weapons/Neolithic/GI_Jackstones_Thrown</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-										<drawSize>1.0</drawSize>
-										<color>(155,145,147)</color>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageDef>RangedBlunt</damageDef>
-										<damageAmountBase>39</damageAmountBase>
-										<speed>8</speed>
-										<armorPenetrationBlunt>24</armorPenetrationBlunt>
-										<armorPenetrationSharp>0</armorPenetrationSharp>
-										<preExplosionSpawnChance>0.75</preExplosionSpawnChance><!-- 4 javelins per resource -->
-										<preExplosionSpawnThingDef>GI_Jackstones_granite</preExplosionSpawnThingDef>
-									</projectile>
-								</ThingDef>
-							</value>
-
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Jackstones_limestone_Thrown"]</xpath>
-							<value>
-								<ThingDef ParentName="BasePilumProjectile">
-									<defName>GI_Jackstones_limestone_Thrown</defName>
-									<label>Jackstones</label>
-									<graphicData>
-										<texPath>Giant/Weapons/Neolithic/GI_Jackstones_Thrown</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-										<drawSize>1.0</drawSize>
-										<color>(208,203,185)</color>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageDef>RangedBlunt</damageDef>
-										<damageAmountBase>39</damageAmountBase>
-										<speed>8</speed>
-										<armorPenetrationBlunt>24</armorPenetrationBlunt>
-										<armorPenetrationSharp>0</armorPenetrationSharp>
-										<preExplosionSpawnChance>0.75</preExplosionSpawnChance><!-- 4 javelins per resource -->
-										<preExplosionSpawnThingDef>GI_Jackstones_granite</preExplosionSpawnThingDef>
-									</projectile>
-								</ThingDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Javelin_Thrown"]</xpath>
-							<value>
-								<ThingDef ParentName="BasePilumProjectile">
-									<defName>GI_Javelin_Thrown</defName>
-									<label>Javelin</label>
-									<graphicData>
-										<texPath>Giant/Weapons/Neolithic/GI_Javelin_Thrown</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-										<drawSize>2.6</drawSize>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageAmountBase>45</damageAmountBase>
-										<speed>8</speed>
-										<armorPenetrationBlunt>67.5</armorPenetrationBlunt>
-										<armorPenetrationSharp>5</armorPenetrationSharp>
-										<preExplosionSpawnChance>0.50</preExplosionSpawnChance><!-- 4 javelins per resource -->
-										<preExplosionSpawnThingDef>GI_Javelin</preExplosionSpawnThingDef>
-									</projectile>
-								</ThingDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Scrapmetal_Thrown"]</xpath>
-							<value>
-								<ThingDef ParentName="BasePilumProjectile">
-									<defName>GI_Scrapmetal_Thrown</defName>
-									<label>Scrapmetal</label>
-									<graphicData>
-										<texPath>Giant/Weapons/Neolithic/GI_Scrapmetal_Thrown</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-										<drawSize>1.2</drawSize>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<pelletCount>12</pelletCount>
-										<spreadMult>2</spreadMult>
-										<damageAmountBase>12</damageAmountBase>
-										<speed>8</speed>
-										<armorPenetrationBlunt>3.12</armorPenetrationBlunt>
-										<armorPenetrationSharp>2</armorPenetrationSharp>
-									</projectile>
-								</ThingDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Rockpillar_granite_Thrown"]</xpath>
-							<value>
-								<ThingDef ParentName="BasePilumProjectile">
-									<defName>GI_Rockpillar_granite_Thrown</defName>
-									<label>Jackstones</label>
-									<graphicData>
-										<texPath>Giant/Weapons/Medieval/GI_Rockpillar_Thrown</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-										<drawSize>3.2</drawSize>
-										<color>(155,145,147)</color>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageDef>RangedBlunt</damageDef>
-										<damageAmountBase>57</damageAmountBase>
-										<speed>8</speed>
-										<armorPenetrationBlunt>72</armorPenetrationBlunt>
-										<armorPenetrationSharp>0</armorPenetrationSharp>
-										<preExplosionSpawnChance>0.25</preExplosionSpawnChance><!-- 4 javelins per resource -->
-										<preExplosionSpawnThingDef>GI_Rockpillar_granite</preExplosionSpawnThingDef>
-									</projectile>
-								</ThingDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Rockpillar_Marble_Thrown"]</xpath>
-							<value>
-								<ThingDef ParentName="BasePilumProjectile">
-									<defName>GI_Rockpillar_Marble_Thrown</defName>
-									<label>Rockpillar</label>
-									<graphicData>
-										<texPath>Giant/Weapons/Medieval/GI_Rockpillar_Thrown</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-										<drawSize>3.2</drawSize>
-										<color>(132,135,132)</color>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageDef>RangedBlunt</damageDef>
-										<damageAmountBase>57</damageAmountBase>
-										<speed>8</speed>
-										<armorPenetrationBlunt>72</armorPenetrationBlunt>
-										<armorPenetrationSharp>0</armorPenetrationSharp>
-										<preExplosionSpawnChance>0.25</preExplosionSpawnChance><!-- 4 javelins per resource -->
-										<preExplosionSpawnThingDef>GI_Rockpillar_Marble</preExplosionSpawnThingDef>
-									</projectile>
-								</ThingDef>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="GI_Lightningjavelin_Thrown"]</xpath>
-							<value>
-								<ThingDef ParentName="BasePilumProjectile">
-									<defName>GI_Lightningjavelin_Thrown</defName>
-									<label>Lightningjavelin</label>
-									<graphicData>
-										<texPath>Giant/Weapons/Industrial/GI_Lightningjavelin_Thrown</texPath>
-										<graphicClass>Graphic_Single</graphicClass>
-										<drawSize>2.6</drawSize>
-									</graphicData>
-									<projectile Class="CombatExtended.ProjectilePropertiesCE">
-										<damageAmountBase>45</damageAmountBase>
-										<speed>8</speed>
-										<armorPenetrationBlunt>40</armorPenetrationBlunt>
-										<armorPenetrationSharp>28</armorPenetrationSharp>
-									</projectile>
-									<comps>
-										<li Class="CombatExtended.CompProperties_ExplosiveCE">
-											<damageAmountBase>56</damageAmountBase>
-											<explosiveDamageType>EMP</explosiveDamageType>
-											<explosiveRadius>2</explosiveRadius>
-											<applyDamageToExplosionCellsNeighbors>false</applyDamageToExplosionCellsNeighbors>
-										</li>
-									</comps>
-								</ThingDef>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/The GiantRace/ThingDefs_Races/AlienRace_Giantlike.xml b/Patches/The GiantRace/ThingDefs_Races/AlienRace_Giantlike.xml
deleted file mode 100644
index f4e2679cdb..0000000000
--- a/Patches/The GiantRace/ThingDefs_Races/AlienRace_Giantlike.xml	
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>The GiantRace</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HC_Giant"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Humanoid</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HC_Giant"]/statBases</xpath>
-							<value>
-								<!--Significant size results in ease of powerful strikes and difficulty in parrying their blows-->
-								<MeleeCritChance>1.6</MeleeCritChance>
-								<MeleeParryChance>1.8</MeleeParryChance>
-								<!--Mentally simpler and also generally just less attendant to most small arms shooting them-->
-								<Suppressability>0.5</Suppressability>
-								<SmokeSensitivity>1</SmokeSensitivity>
-								<CarryBulk>25</CarryBulk>
-							</value>
-						</li>
-
-						<!--Very heavy blows-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HC_Giant"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>19</power>
-										<cooldownTime>2.25</cooldownTime>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>7.56</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>right fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>19</power>
-										<cooldownTime>2.25</cooldownTime>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>7.56</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>22</power>
-										<cooldownTime>6.66</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationBlunt>9.045</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<!--Giant size prevents use of loadbearing gear, and reasonably, shields.-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="GI_PawnBase"]/inspectorTabs/li[.="ITab_Pawn_Gear"]</xpath>
-							<value>
-								<li>CombatExtended.ITab_Inventory</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="GI_PawnBase"]/comps</xpath>
-							<value>
-								<li Class="CombatExtended.CompProperties_Inventory" />
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="GI_PawnBase"]/comps</xpath>
-							<value>
-								<li>
-									<compClass>CombatExtended.CompPawnGizmo</compClass>
-								</li>
-								<li Class="CombatExtended.CompProperties_Suppressable" />
-							</value>
-						</li>
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/The GiantRace/ThingDefs_Races/Giant_Mammoth.xml b/Patches/The GiantRace/ThingDefs_Races/Giant_Mammoth.xml
deleted file mode 100644
index fa696f047d..0000000000
--- a/Patches/The GiantRace/ThingDefs_Races/Giant_Mammoth.xml	
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>The GiantRace</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HC_WoollyMammoth"]/statBases/MoveSpeed</xpath>
-							<value>
-								<MoveSpeed>5</MoveSpeed>
-								<MeleeDodgeChance>0.08</MeleeDodgeChance>
-								<MeleeCritChance>0.79</MeleeCritChance>
-								<MeleeParryChance>0.51</MeleeParryChance>
-								<ArmorRating_Blunt>0.325</ArmorRating_Blunt>
-								<ArmorRating_Sharp>0.17</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HC_WoollyMammoth"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>tusk</label>
-										<capacities>
-											<li>Poke</li>
-										</capacities>
-										<power>67</power>
-										<cooldownTime>3.57</cooldownTime>
-										<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>31.226</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>left foot</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>31</power>
-										<cooldownTime>2.57</cooldownTime>
-										<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>12.960</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>right foot</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>31</power>
-										<cooldownTime>2.57</cooldownTime>
-										<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>12.960</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>55</power>
-										<cooldownTime>3.99</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<chanceFactor>0.2</chanceFactor>
-										<armorPenetrationBlunt>25</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/ThingDef[defName="HC_WoollyMammoth"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Quadruped</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/PawnKindDef[defName="HC_WoollyMammoth"]/combatPower</xpath>
-							<value>
-								<combatPower>250</combatPower>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/The Joris Experience/Bear_Bodies.xml b/Patches/The Joris Experience/Bear_Bodies.xml
deleted file mode 100644
index 4bce326971..0000000000
--- a/Patches/The Joris Experience/Bear_Bodies.xml	
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>The Joris Experience</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Natural Armor -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="JE_BiblicallyAccurateJoris"]//*[
-						def="Body" or
-						def="Nose"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="JE_BiblicallyAccurateJoris"]//*[
-						def="Body" or
-						def="Head" or
-						def="Nose" or
-						def="AnimalJaw"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/The Joris Experience/Bear_Resources.xml b/Patches/The Joris Experience/Bear_Resources.xml
deleted file mode 100644
index 4a6f61c1a2..0000000000
--- a/Patches/The Joris Experience/Bear_Resources.xml	
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>The Joris Experience</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Remove tusk as a weapon -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="JE_GoldenUniJorisHorn"]/tools</xpath>
-				</li>
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="JE_GoldenUniJorisHorn"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>ResourceBase</value>
-				</li>
-
-				<!--wooly wool -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JE_JorisHair"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.03</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/The Joris Experience/JorisShootCE.xml b/Patches/The Joris Experience/JorisShootCE.xml
deleted file mode 100644
index 47f585dd13..0000000000
--- a/Patches/The Joris Experience/JorisShootCE.xml	
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>The Joris Experience</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Syntax
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName=""]/verbs</xpath>
-							<value>
-								<verbs>
-									<li Class="CombatExtended.VerbPropertiesCE">
-										<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-										...
-									</li>
-								</verbs>
-							</value>
-					</li>
-				-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JE_BiblicallyAccurateJoris"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li>
-								<verbClass>Verb_Shoot</verbClass>
-								<accuracyTouch>1</accuracyTouch>
-								<accuracyShort>1</accuracyShort>
-								<accuracyMedium>1</accuracyMedium>
-								<accuracyLong>1</accuracyLong>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>JE_HolyBolt</defaultProjectile>
-								<warmupTime>7</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<minRange>2</minRange>
-								<range>36</range>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>holy fire</label>
-								<commonality>.8</commonality>
-							</li>
-
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JECom_IsaacJoris"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>JE_Tears</defaultProjectile>
-								<warmupTime>2</warmupTime>
-								<burstShotCount>8</burstShotCount>
-								<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-								<minRange>1</minRange>
-								<range>18</range>
-								<label>tears</label>
-								<soundCast>JE_TearsSound</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<commonality>1</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JE_NoitaJoris"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>JE_NoitaFireball</defaultProjectile>
-								<warmupTime>2</warmupTime>
-								<minRange>1.9</minRange>
-								<range>24</range>
-								<label>noita fireball</label>
-								<soundCast>JE_FireSpit</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<commonality>1</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!--			<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="JE_Joku"]/verbs</xpath>
-							<value>
-								<verbs>
-									<li Class="CombatExtended.VerbPropertiesCE">
-										<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-										<hasStandardCommand>true</hasStandardCommand>
-										<defaultProjectile>JE_BeamAttack</defaultProjectile>
-										<warmupTime>2.4</warmupTime>
-										<burstShotCount>1</burstShotCount>
-										<minRange>1</minRange>
-										<range>25</range>	
-										<label>yellow kamehameha</label>	  				
-										<soundCast>JE_PoisonBreathSound</soundCast>
-										<muzzleFlashScale>0</muzzleFlashScale>
-										<commonality>1</commonality>
-									</li>
-								</verbs>
-							</value>
-					</li>
-		-->
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/The Joris Experience/Joris_Extended.xml b/Patches/The Joris Experience/Joris_Extended.xml
deleted file mode 100644
index a561f1cc6b..0000000000
--- a/Patches/The Joris Experience/Joris_Extended.xml	
+++ /dev/null
@@ -1,281 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>The Joris Experience</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === BEARS=== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="JE_AnimeMascotJoris"
-						or defName="JE_BeefeaterJoris"
-						or defName="JE_BiblicallyAccurateJoris"
-						or defName="JECom_BlockJoris"
-						or defName="JECom_Cerberjoris"
-						or defName="JE_ChainsawJoris"
-						or defName="JE_ChiefOBonson"
-						or defName="JECom_ColonistJoris"
-						or defName="JE_DracoJoris"
-						or defName="JE_EmoJoris"
-						or defName="JECom_FamousDevilJoris"
-						or defName="JE_FatJorry"
-						or defName="JECom_IsaacJoris"
-						or defName="JE_JagothGrr"
-						or defName="JECom_JJorisJameson"
-						or defName="JE_JockExcellente"
-						or defName="JE_Joku"
-						or defName="JE_JoneralGrievous"
-						or defName="JE_JonerysBonbearean"
-						or defName="JE_JonicTheHedgehog"
-						or defName="JE_JoobyDoo"
-						or defName="JE_JoraltOfRivia"
-						or defName="JE_JordonFreeman"
-						or defName="JECom_JorisAstley"
-						or defName="JECom_JorisSiroj"
-						or defName="JECom_JorisThePooh"
-						or defName="JE_JorisWhatLivesInASociety"
-						or defName="JE_Joromir"
-						or defName="JE_JorrickLorge"
-						or defName="JE_Joruto"
-						or defName="JE_JovidBowie"
-						or defName="JE_PerfectlyNormalJoris"
-						or defName="JECom_PickleJoris"
-						or defName="JE_QueenJorisTheSecond"
-						or defName="JE_SpongejorisSquarebonson"
-						or defName="JECom_SuperJoris"
-						or defName="JE_FourLeggedUniJoris"
-						or defName="JECom_VoidJoris"
-						or defName="JE_XorismorphQueen"
-						or defName="JE_YugiJohris"
-						or defName="JE_ZombieJoris"
-						or defName="JE_JoskarBontocki"
-						or defName="JE_NoitaJoris"] </xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="JECom_RoundJoris"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Vehicle</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="JE_AnimeMascotJoris"
-						or defName="JE_BeefeaterJoris"
-						or defName="JE_BiblicallyAccurateJoris"
-						or defName="JECom_BlockJoris"
-						or defName="JECom_ColonistJoris"
-						or defName="JE_DracoJoris"
-						or defName="JE_EmoJoris"
-						or defName="JECom_FamousDevilJoris"
-						or defName="JE_FatJorry"
-						or defName="JECom_IsaacJoris"
-						or defName="JECom_JJorisJameson"
-						or defName="JE_JonerysBonbearean"
-						or defName="JE_JonicTheHedgehog"
-						or defName="JE_JordonFreeman"
-						or defName="JECom_JorisAstley"
-						or defName="JECom_JorisSiroj"
-						or defName="JECom_JorisThePooh"
-						or defName="JE_JorisWhatLivesInASociety"
-						or defName="JE_Joromir"
-						or defName="JE_Joruto"
-						or defName="JE_JovidBowie"
-						or defName="JE_PerfectlyNormalJoris"
-						or defName="JECom_PickleJoris"
-						or defName="JE_QueenJorisTheSecond"
-						or defName="JE_SpongejorisSquarebonson"
-						or defName="JECom_SuperJoris"
-						or defName="JE_YugiJohris"
-						or defName="JE_JoskarBontocki"
-						or defName="JE_NoitaJoris"]/combatPower </xpath>
-					<value>
-						<combatPower>150</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="JECom_Cerberjoris"
-						or defName="JE_ChainsawJoris"
-						or defName="JE_ChiefOBonson"
-						or defName="JE_JagothGrr"
-						or defName="JE_JockExcellente"
-						or defName="JE_Joku"
-						or defName="JE_JoneralGrievous"
-						or defName="JE_JoraltOfRivia"
-						or defName="JE_JorrickLorge"
-						or defName="JECom_RoundJoris"
-						or defName="JE_FourLeggedUniJoris"
-						or defName="JE_ZombieJoris"]/combatPower </xpath>
-					<value>
-						<combatPower>225</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="JE_XorismorphQueen"]/combatPower</xpath>
-					<value>
-						<combatPower>650</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="JE_AnimeMascotJoris"
-						or defName="JE_BeefeaterJoris"
-						or defName="JECom_BlockJoris"
-						or defName="JECom_Cerberjoris"
-						or defName="JE_ChainsawJoris"
-						or defName="JE_ChiefOBonson"
-						or defName="JECom_ColonistJoris"
-						or defName="JE_DracoJoris"
-						or defName="JE_EmoJoris"
-						or defName="JECom_FamousDevilJoris"
-						or defName="JE_FatJorry"
-						or defName="JECom_IsaacJoris"
-						or defName="JE_JagothGrr"
-						or defName="JECom_JJorisJameson"
-						or defName="JE_JockExcellente"
-						or defName="JE_Joku"
-						or defName="JE_JoneralGrievous"
-						or defName="JE_JonerysBonbearean"
-						or defName="JE_JordonFreeman"
-						or defName="JECom_JorisAstley"
-						or defName="JECom_JorisSiroj"
-						or defName="JECom_JorisThePooh"
-						or defName="JE_JorisWhatLivesInASociety"
-						or defName="JE_Joromir"
-						or defName="JE_Joruto"
-						or defName="JE_JovidBowie"
-						or defName="JE_PerfectlyNormalJoris"
-						or defName="JECom_PickleJoris"
-						or defName="JE_QueenJorisTheSecond"
-						or defName="JECom_RoundJoris"
-						or defName="JE_SpongejorisSquarebonson"
-						or defName="JECom_SuperJoris"
-						or defName="JE_FourLeggedUniJoris"
-						or defName="JE_YugiJohris"
-						or defName="JE_ZombieJoris"
-						or defName="JE_JoskarBontocki"
-						or defName="JE_NoitaJoris"]/statBases </xpath>
-					<value>
-						<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						<MeleeCritChance>0.32</MeleeCritChance>
-						<MeleeParryChance>0.26</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JE_AnimeMascotJoris"
-						or defName="JE_BeefeaterJoris"
-						or defName="JE_ChiefOBonson"
-						or defName="JECom_ColonistJoris"
-						or defName="JE_EmoJoris"
-						or defName="JECom_FamousDevilJoris"
-						or defName="JE_FatJorry"
-						or defName="JECom_IsaacJoris"
-						or defName="JE_JagothGrr"
-						or defName="JECom_JJorisJameson"
-						or defName="JE_JockExcellente"
-						or defName="JE_Joku"
-						or defName="JE_JonerysBonbearean"
-						or defName="JECom_JorisAstley"
-						or defName="JECom_JorisThePooh"
-						or defName="JE_JorisWhatLivesInASociety"
-						or defName="JE_Joromir"
-						or defName="JE_Joruto"
-						or defName="JE_JovidBowie"
-						or defName="JE_PerfectlyNormalJoris"
-						or defName="JECom_PickleJoris"
-						or defName="JE_QueenJorisTheSecond"
-						or defName="JECom_RoundJoris"
-						or defName="JE_SpongejorisSquarebonson"
-						or defName="JE_NoitaJoris"]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.32</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.32</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.44</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/The Joris Experience/Joris_Hediffs.xml b/Patches/The Joris Experience/Joris_Hediffs.xml
deleted file mode 100644
index 250f5e2b86..0000000000
--- a/Patches/The Joris Experience/Joris_Hediffs.xml	
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>The Joris Experience</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="JE_TorsoMinigun"]/comps/li[@Class="MVCF.Comps.HediffCompProperties_ExtendedVerbGiver"]/verbs</xpath>
-							<value>
-								<verbs>
-									<li Class="CombatExtended.VerbPropertiesCE">
-										<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-										<hasStandardCommand>true</hasStandardCommand>
-										<defaultProjectile>JE_Bullet_GoldenShower</defaultProjectile>
-										<warmupTime>2.4</warmupTime>
-										<burstShotCount>50</burstShotCount>
-										<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-										<range>60</range>
-										<minRange>1.5</minRange>
-										<soundCast>Shot_Minigun</soundCast>
-										<soundCastTail>GunTail_Medium</soundCastTail>
-										<muzzleFlashScale>7</muzzleFlashScale>
-										<label>Fat Jorry's Golden Shower</label>
-										<commonality>.8</commonality>
-										<commandIcon>Things/Weapons/GoldenShower</commandIcon>
-									</li>
-								</verbs>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/The Joris Experience/Projectiles_Joris.xml b/Patches/The Joris Experience/Projectiles_Joris.xml
deleted file mode 100644
index 70581cec69..0000000000
--- a/Patches/The Joris Experience/Projectiles_Joris.xml	
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>The Joris Experience</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ============== Changing Projectile's thingClass to CE ones ================ -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="JE_Bullet_GoldenShower" or
-						defName="JE_Tears"] </xpath>
-					<value>
-						<thingClass>CombatExtended.BulletCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JE_NoitaFireball"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<!-- ============== Adding 'Standard' AimingAccuracy node to creatures' that use ranged attack statBases. =============== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="JE_FatJorry" or defName="JECom_IsaacJoris" or defName="JE_NoitaJoris"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.6</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="JE_Joku"]/statBases</xpath>
-					<value>
-						<ShootingAccuracyPawn>2.5</ShootingAccuracyPawn>
-						<AimingAccuracy>1</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="JE_BiblicallyAccurateJoris"]/statBases</xpath>
-					<value>
-						<ShootingAccuracyPawn>10</ShootingAccuracyPawn>
-						<AimingAccuracy>1</AimingAccuracy>
-					</value>
-				</li>
-
-				<!-- =============== Now defining Projectiles in CE Procedure ============= -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JE_Bullet_GoldenShower"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>Bullet</damageDef>
-							<damageAmountBase>7</damageAmountBase>
-							<speed>90</speed>
-							<armorPenetrationSharp>4</armorPenetrationSharp>
-							<armorPenetrationBlunt>12</armorPenetrationBlunt>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JE_Tears"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>Bullet</damageDef>
-							<damageAmountBase>8</damageAmountBase>
-							<speed>24</speed>
-							<armorPenetrationSharp>1</armorPenetrationSharp>
-							<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JE_NoitaFireball"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>Flame</damageDef>
-							<damageAmountBase>18</damageAmountBase>
-							<explosionRadius>1.1</explosionRadius>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<speed>27</speed>
-							<armorPenetrationSharp>50</armorPenetrationSharp>
-							<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
-							<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
-							<ai_IsIncendiary>true</ai_IsIncendiary>
-							<soundExplode>Interact_Ignite</soundExplode>
-						</projectile>
-					</value>
-				</li>
-
-				<!--				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.ExpandableProjectileDef[defName="FF_FlameBreathAnimated"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<speed>40</speed>
-							<flyOverhead>false</flyOverhead>
-							<damageDef>Flame</damageDef>
-							<damageAmountBase>16</damageAmountBase>
-							<explosionRadius>2.5</explosionRadius>
-<suppressionFactor>3.0</suppressionFactor>
-<dangerFactor>2.0</dangerFactor>
-							<ai_IsIncendiary>true</ai_IsIncendiary>
-						</projectile>
-					</value>
-				</li> -->
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/The Joris Experience/Unique_Joris_Extended.xml b/Patches/The Joris Experience/Unique_Joris_Extended.xml
deleted file mode 100644
index 5513514810..0000000000
--- a/Patches/The Joris Experience/Unique_Joris_Extended.xml	
+++ /dev/null
@@ -1,818 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>The Joris Experience</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Blocky=== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JECom_BlockJoris"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.32</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.32</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>32</power>
-								<cooldownTime>1.72</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2.44</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Chainsawbear=== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JE_ChainsawJoris"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left chainsaw</label>
-								<capacities>
-									<li>JE_BleedingWound</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>0.9</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right chainsaw</label>
-								<capacities>
-									<li>JE_BleedingWound</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>0.9</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>1.72</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.44</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Bible thumper=== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JE_BiblicallyAccurateJoris"]/statBases</xpath>
-					<value>
-						<statBases>
-							<MoveSpeed>6</MoveSpeed>
-							<ComfyTemperatureMin>-55</ComfyTemperatureMin>
-							<MarketValue>1500</MarketValue>
-							<MeleeDodgeChance>1</MeleeDodgeChance>
-							<MeleeCritChance>0.75</MeleeCritChance>
-							<MeleeParryChance>1</MeleeParryChance>
-							<Flammability>0</Flammability>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JE_BiblicallyAccurateJoris"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-									<li>Stab</li>
-								</capacities>
-								<power>38</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>24</armorPenetrationSharp>
-								<armorPenetrationBlunt>40</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<HediffDef>
-							<defName>JJ_LowBleed</defName>
-							<description>This creature bleeds very little.</description>
-							<label>Regen factor</label>
-							<defaultLabelColor>(.8,0,0)</defaultLabelColor>
-							<scenarioCanAdd>false</scenarioCanAdd>
-							<maxSeverity>1.0</maxSeverity>
-							<stages>
-								<li>
-									<totalBleedFactor>0.1</totalBleedFactor>
-									<painFactor>0.25</painFactor>
-								</li>
-							</stages>
-						</HediffDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="JE_BiblicallyAccurateJoris"]/comps</xpath>
-					<value>
-						<li Class="AnimalBehaviours.CompProperties_InitialHediff">
-							<hediffname>JJ_LowBleed</hediffname>
-							<hediffseverity>1</hediffseverity>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Cerb=== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JECom_Cerberjoris"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.32</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.32</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>1.68</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.44</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Draco=== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JE_DracoJoris"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>12</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>6.375</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>6.375</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>fangs</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>1.62</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>16</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2.44</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === JoneralGrievous=== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JE_JoneralGrievous"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left weapon from a more civilized age</label>
-								<capacities>
-									<li>JE_BurningStab</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.08</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>50</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right weapon from a more civilized age</label>
-								<capacities>
-									<li>JE_BurningStab</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.08</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>50</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Uncivilised method from a more barbaric age</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2.44</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Sanic=== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JE_JonicTheHedgehog"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>12</MoveSpeed>
-						<MeleeDodgeChance>0.78</MeleeDodgeChance>
-						<MeleeCritChance>0.14</MeleeCritChance>
-						<MeleeParryChance>0.17</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JE_JonicTheHedgehog"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2.44</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Jooby Doo=== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JE_JoobyDoo"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>5.6</MoveSpeed>
-						<MeleeDodgeChance>0.21</MeleeDodgeChance>
-						<MeleeCritChance>0.12</MeleeCritChance>
-						<MeleeParryChance>0.12</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JE_JoobyDoo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2.44</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Jeralto=== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JE_JoraltOfRivia"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4.25</MoveSpeed>
-						<MeleeDodgeChance>0.8</MeleeDodgeChance>
-						<MeleeCritChance>0.36</MeleeCritChance>
-						<MeleeParryChance>0.66</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JE_JoraltOfRivia"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>JE_ExtraDamageAnimalsClaws</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>JE_ExtraDamageAnimalsClaws</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>1.92</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2.44</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Jorden Freeman=== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JE_JordonFreeman"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>crowbar</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.24</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.32</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.44</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/The Joris Experience/Unique_Joris_Extended2.xml b/Patches/The Joris Experience/Unique_Joris_Extended2.xml
deleted file mode 100644
index afa8f8b14f..0000000000
--- a/Patches/The Joris Experience/Unique_Joris_Extended2.xml	
+++ /dev/null
@@ -1,825 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>The Joris Experience</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === JorisSiroj=== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JECom_JorisSiroj"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.32</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.32</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>front teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.75</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>rear teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.75</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>front head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>rear head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Jorrick Lorge=== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="JE_JorrickLorge"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.06</MeleeDodgeChance>
-						<MeleeCritChance>0.41</MeleeCritChance>
-						<MeleeParryChance>0.48</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JE_JorrickLorge"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>56</power>
-								<cooldownTime>2.34</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>56</power>
-								<cooldownTime>2.34</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>3.07</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>16</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Supa Joris=== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JECom_SuperJoris"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>1.32</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>1.31</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2.44</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Uni Joris=== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JE_FourLeggedUniJoris"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Horn</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>0.9</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Horn</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Stab</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>0.9</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.32</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.31</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.44</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Void=== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JECom_VoidJoris"]/statBases</xpath>
-					<value>
-						<statBases>
-							<MoveSpeed>8</MoveSpeed>
-							<ArmorRating_Blunt>50</ArmorRating_Blunt>
-							<ArmorRating_Sharp>22</ArmorRating_Sharp>
-							<ArmorRating_Heat>1.8</ArmorRating_Heat>
-							<MeatAmount>115</MeatAmount>
-							<LeatherAmount>200</LeatherAmount>
-							<PsychicSensitivity>0.1</PsychicSensitivity>
-							<ToxicEnvironmentResistance>1</ToxicEnvironmentResistance>
-							<ComfyTemperatureMin>-250</ComfyTemperatureMin>
-							<ComfyTemperatureMax>250</ComfyTemperatureMax>
-							<MarketValue>2500</MarketValue>
-							<MeleeDodgeChance>1</MeleeDodgeChance>
-							<MeleeCritChance>1</MeleeCritChance>
-							<MeleeParryChance>1</MeleeParryChance>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JECom_VoidJoris"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>1.31</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>24</armorPenetrationSharp>
-								<armorPenetrationBlunt>50</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>1.31</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>24</armorPenetrationSharp>
-								<armorPenetrationBlunt>50</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>43</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>32</armorPenetrationSharp>
-								<armorPenetrationBlunt>80</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2.34</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === XenoMorph=== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JE_XorismorphQueen"]/statBases</xpath>
-					<value>
-						<statBases>
-							<MoveSpeed>5.75</MoveSpeed>
-							<ArmorRating_Blunt>26</ArmorRating_Blunt>
-							<ArmorRating_Sharp>15</ArmorRating_Sharp>
-							<ArmorRating_Heat>1.0</ArmorRating_Heat>
-							<MeatAmount>115</MeatAmount>
-							<LeatherAmount>90</LeatherAmount>
-							<PsychicSensitivity>0.25</PsychicSensitivity>
-							<ToxicResistance>0.75</ToxicResistance>
-							<ComfyTemperatureMin>-55</ComfyTemperatureMin>
-							<MarketValue>1500</MarketValue>
-							<MeleeDodgeChance>0.35</MeleeDodgeChance>
-							<MeleeCritChance>0.97</MeleeCritChance>
-							<MeleeParryChance>0.3</MeleeParryChance>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JE_XorismorphQueen"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Cut</li>
-								</capacities>
-								<power>38</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<armorPenetrationBlunt>18</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Cut</li>
-								</capacities>
-								<power>38</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<armorPenetrationBlunt>18</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-									<li>Cut</li>
-								</capacities>
-								<power>54</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>14</armorPenetrationSharp>
-								<armorPenetrationBlunt>42</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>inner teeth</label>
-								<capacities>
-									<li>Bite</li>
-									<li>Stab</li>
-								</capacities>
-								<power>58</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.33</chanceFactor>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<armorPenetrationBlunt>48</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>2.33</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>24</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Yughi Joris=== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JE_YugiJohris"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.68</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.68</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>32</power>
-								<cooldownTime>2.55</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.44</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Zombie Jorry=== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="JE_ZombieJoris"]/comps</xpath>
-					<value>
-						<li Class="AnimalBehaviours.CompProperties_InitialHediff">
-							<hediffname>JJ_LowBleed</hediffname>
-							<hediffseverity>1</hediffseverity>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JE_ZombieJoris"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>JE_InfectedClaws</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>JE_InfectedClaws</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>2.45</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.44</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Joskar=== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="JE_JoskarBontocki"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>paintbrush</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.32</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>paintbrush</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.32</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>2.45</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationSharp>1.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.44</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/The Tuffalo/Animal_Tuffalo.xml b/Patches/The Tuffalo/Animal_Tuffalo.xml
deleted file mode 100644
index 0e9d2b79c1..0000000000
--- a/Patches/The Tuffalo/Animal_Tuffalo.xml	
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>The Tuffalo</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ===== Tuffalo Body Class ===== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Tuffalo"]</xpath>
-
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- ===== Tuffalo Combat Stats ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tuffalo"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4.85</MoveSpeed>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.30</MeleeCritChance>
-						<MeleeParryChance>0.20</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tuffalo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Blunt</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>3.17</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationSharp>0.64</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.68</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.68</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationSharp>0.54</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.89</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Tuffalo"]/combatPower</xpath>
-					<value>
-						<combatPower>135</combatPower>
-					</value>
-				</li>
-
-				<!-- ===== Tuffalo Wool ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TuffaloWool"]/statBases/StuffPower_Armor_Sharp</xpath>
-
-					<value>
-						<StuffPower_Armor_Sharp>0.02</StuffPower_Armor_Sharp>
-						<StuffPower_Armor_Blunt>0.056</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/The Vanity Project - Shiba Inu/Vanity_Project_Shiba_Inu_Patch.xml b/Patches/The Vanity Project - Shiba Inu/Vanity_Project_Shiba_Inu_Patch.xml
deleted file mode 100644
index 0ed56b457c..0000000000
--- a/Patches/The Vanity Project - Shiba Inu/Vanity_Project_Shiba_Inu_Patch.xml	
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>The Vanity Project - Shiba Inu</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TVP_ShibaInu"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.04</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TVP_ShibaInu"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.62</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.21</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.62</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.21</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.66</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.76</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="TVP_ShibaInu"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="TVP_ShibaInu"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TVP_ShibaInu"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>437</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="TVP_ShibaInu"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="TVP_ShibaInu"]/combatPower</xpath>
-					<value>
-						<combatPower>30</combatPower>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/The Wild Fields/ThingDefs_Apparel.xml b/Patches/The Wild Fields/ThingDefs_Apparel.xml
deleted file mode 100644
index 6f88cae787..0000000000
--- a/Patches/The Wild Fields/ThingDefs_Apparel.xml	
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>The Wild Fields - apparel and weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Apparels-->
-
-				<!-- Fur Vest - balancing MO leather tunic -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Serek_Apparel_CommonerVest"]/statBases</xpath>
-					<value>
-						<Bulk>8.5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<!-- mass stuff -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Serek_Apparel_CommonerVest"]/statBases/Mass</xpath>
-					<value>
-						<Mass>2.8</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Serek_Apparel_CommonerVest"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Noble cape - Warm, thick and luxurious cape -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Serek_Apparel_NobleCape"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Serek_Apparel_NobleCape"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Serek_Apparel_NobleCape"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>90</costStuffCount>
-					</value>
-				</li>
-
-				<!--  Vyshyvanka - noble thick shirt -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Serek_Apparel_NobleShirt" or defName="Serek_Apparel_Vyshyvanka"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Serek_Apparel_Vyshyvanka"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Serek_Apparel_Vyshyvanka"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>25</costStuffCount>
-					</value>
-				</li>
-
-				<!--- Hats -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="Serek_Apparel_Birka" or
-						defName="Serek_Apparel_NobleFurCap" or
-						defName="Serek_Apparel_NobleCap"
-						]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Serek_Apparel_Birka" or
-						defName="Serek_Apparel_NobleFurCap" or
-						defName="Serek_Apparel_NobleCap"
-						]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Serek_Apparel_Birka"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>30</costStuffCount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Serek_Apparel_NobleFurCap" or defName="Serek_Apparel_NobleCap"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>40</costStuffCount>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/The Wild Fields/ThingDefs_Weapons.xml b/Patches/The Wild Fields/ThingDefs_Weapons.xml
deleted file mode 100644
index 43adb69e36..0000000000
--- a/Patches/The Wild Fields/ThingDefs_Weapons.xml	
+++ /dev/null
@@ -1,326 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>The Wild Fields - apparel and weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Serek_MeleeWeapon_WarScythe"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.12</MeleeCritChance>
-						<MeleeParryChance>1.18</MeleeParryChance>
-						<MeleeDodgeChance>0.7</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Serek_MeleeWeapon_WarScythe"]/statBases</xpath>
-					<value>
-						<statBases>
-							<Mass>1.8</Mass>
-							<Bulk>10</Bulk>
-							<MeleeCounterParryBonus>1.53</MeleeCounterParryBonus>
-							<WorkToMake>10500</WorkToMake>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Serek_MeleeWeapon_WarScythe"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>70</costStuffCount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Serek_MeleeWeapon_WarScythe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<chanceFactor>0.15</chanceFactor>
-								<cooldownTime>1.16</cooldownTime>
-								<armorPenetrationBlunt>1.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>33</power>
-								<cooldownTime>1.79</cooldownTime>
-								<armorPenetrationBlunt>4.3</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.87</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>1.7</armorPenetrationBlunt>
-								<armorPenetrationSharp>5.6</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Noble Sabre - Elite Stuff - CE armory sabre with social buff and slight better stats -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Serek_MeleeWeapon_NobleSabre"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.25</MeleeCritChance>
-							<MeleeParryChance>0.75</MeleeParryChance>
-							<MeleeDodgeChance>0.40</MeleeDodgeChance>
-							<SocialImpact>0.2</SocialImpact>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<!-- Replace stats -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Serek_MeleeWeapon_NobleSabre"]/statBases</xpath>
-					<value>
-						<statBases>
-							<WorkToMake>16000</WorkToMake>
-							<Mass>1</Mass>
-							<Bulk>6</Bulk>
-							<MeleeCounterParryBonus>0.63</MeleeCounterParryBonus>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Serek_MeleeWeapon_NobleSabre"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.5</cooldownTime>
-								<chanceFactor>0.1</chanceFactor>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.27</cooldownTime>
-								<armorPenetrationBlunt>1.96</armorPenetrationBlunt>
-								<armorPenetrationSharp>3.92</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>2.73</cooldownTime>
-								<armorPenetrationBlunt>7.84</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>29</power>
-								<cooldownTime>2.37</cooldownTime>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>3.24</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.72</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Sabre, same as Noble but weaker, CE Armory Sabre clone    -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Serek_MeleeWeapon_Sabre"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1</MeleeCritChance>
-							<MeleeParryChance>0.65</MeleeParryChance>
-							<MeleeDodgeChance>0.35</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Replace stats -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Serek_MeleeWeapon_Sabre"]/statBases</xpath>
-					<value>
-						<statBases>
-							<WorkToMake>10000</WorkToMake>
-							<Mass>1</Mass>
-							<Bulk>6</Bulk>
-							<MeleeCounterParryBonus>0.45</MeleeCounterParryBonus>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Serek_MeleeWeapon_Sabre"]/recipeMaker</xpath>
-					<value>
-						<recipeMaker>
-							<researchPrerequisite>Smithing</researchPrerequisite>
-							<skillRequirements>
-								<Crafting>5</Crafting>
-							</skillRequirements>
-						</recipeMaker>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Serek_MeleeWeapon_Sabre"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.5</cooldownTime>
-								<chanceFactor>0.1</chanceFactor>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.27</cooldownTime>
-								<armorPenetrationBlunt>1.96</armorPenetrationBlunt>
-								<armorPenetrationSharp>3.92</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>2.73</cooldownTime>
-								<armorPenetrationBlunt>7.84</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>29</power>
-								<cooldownTime>2.37</cooldownTime>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>3.24</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.72</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Weapon tags for ordinary sabre -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Serek_MeleeWeapon_Sabre"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- Bulava - high pen one handed mace with buffs -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Serek_MeleeWeapon_Bulava"]/statBases</xpath>
-					<value>
-						<statBases>
-							<WorkToMake>14000</WorkToMake>
-							<Mass>1.12</Mass>
-							<Bulk>3.5</Bulk>
-							<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Serek_MeleeWeapon_Bulava"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.42</MeleeCritChance>
-							<MeleeParryChance>0.24</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-							<SocialImpact>0.1</SocialImpact>
-							<PainShockThreshold>0.12</PainShockThreshold>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Serek_MeleeWeapon_Bulava"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.70</cooldownTime>
-								<chanceFactor>0.33</chanceFactor>
-								<armorPenetrationBlunt>0.825</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18.50</power>
-								<cooldownTime>2.1</cooldownTime>
-								<chanceFactor>0.33</chanceFactor>
-								<armorPenetrationBlunt>6.625</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Serek_MeleeWeapon_Bulava"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Thog's Armor/Armor_Thogs.xml b/Patches/Thog's Armor/Armor_Thogs.xml
deleted file mode 100644
index 8ab79c7911..0000000000
--- a/Patches/Thog's Armor/Armor_Thogs.xml	
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Thog's Armor</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ===== Flak & Simple Armor ===== -->
-
-				<!-- === Flak Shoulderpads === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_FlakShoulderpads"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_FlakShoulderpads"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4.8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_FlakShoulderpads"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>7.2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_FlakShoulderpads"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<!-- === Simple Chestplate === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_SimpleChestplate"]/statBases</xpath>
-					<value>
-						<Bulk>20</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_SimpleChestplate"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.85</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_SimpleChestplate"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_SimpleChestplate"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<!-- === Simple Pauldrons === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_SimplePauldrons"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_SimplePauldrons"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_SimplePauldrons"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<!-- === Simple Chausses === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_SimpleChausses"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SimpleChausses"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Apparel_SimpleChausses"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<!-- ===== Visors ===== -->
-
-				<!-- === Wooden Visor === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_WoodenVisor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>10</StuffEffectMultiplierArmor>
-						<Bulk>1</Bulk>
-					</value>
-				</li>
-
-				<!-- === Simple Visor === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_SimpleVisor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
-						<Bulk>1</Bulk>
-						<WornBulk>0.75</WornBulk>
-					</value>
-				</li>
-
-				<!-- === Flak Visor === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_FlakVisor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-						<Bulk>1</Bulk>
-						<WornBulk>0.75</WornBulk>
-					</value>
-				</li>
-
-				<!-- === Ablative Visor === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_AblativeVisor"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_AblativeVisor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_AblativeVisor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>8</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ===== Wooden Armor ===== -->
-
-				<!-- === Wooden Chestplate === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_WoodenChestplate"]/statBases</xpath>
-					<value>
-						<Bulk>20</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_WoodenChestplate"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_WoodenChestplate"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_WoodenChestplate"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<!-- === Wooden Arm Guards === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_WoodenArmGuards"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_WoodenArmGuards"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_WoodenArmGuards"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<!-- === Wooden Chausses === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_WoodenChausses"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_WoodenChausses"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_WoodenChausses"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Thog's Armor/Armor_ThogsChild.xml b/Patches/Thog's Armor/Armor_ThogsChild.xml
deleted file mode 100644
index 7c65ca8f71..0000000000
--- a/Patches/Thog's Armor/Armor_ThogsChild.xml	
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Thog's Armor</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Child Flak Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_FlakHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>0.75</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_FlakHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_FlakHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- === Child Squire Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_SquireHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>0.75</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_SquireHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.65</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_SquireHelmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Jaw</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Jaw</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Child Wooden Chestplate === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_WoodenChestplate"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>3.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_WoodenChestplate"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3.75</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_WoodenChestplate"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_WoodenChestplate"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<!-- === Child Wooden Arm Guards === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_WoodenArmGuards"]/statBases</xpath>
-					<value>
-						<Bulk>2.5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_WoodenArmGuards"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.7</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_WoodenArmGuards"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<!-- === Child Simple Chestplate === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_SimpleChestplate"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>3.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_SimpleChestplate"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.20</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_SimpleChestplate"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Child Plate Gorget === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_Neckguard"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>0.75</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_Neckguard"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.0</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_Neckguard"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<!-- === Child Flak Shoulderpads === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_FlakShoulderpads"]/statBases</xpath>
-					<value>
-						<Bulk>2.5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_FlakShoulderpads"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2.9</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_FlakShoulderpads"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4.6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="ThogsArmor_Kid_FlakShoulderpads"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Thog's Guns - More Brukka Pack/Ranged_Industrial.xml b/Patches/Thog's Guns - More Brukka Pack/Ranged_Industrial.xml
deleted file mode 100644
index 249bd3e686..0000000000
--- a/Patches/Thog's Guns - More Brukka Pack/Ranged_Industrial.xml	
+++ /dev/null
@@ -1,1735 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Thog's Guns - More Brukka Pack</li>
-			<li>Thog's Guns - More Brukka Pack - REPRIMED</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--===== Melee Tools =====-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Gun_LightSMG" or
-						defName="Gun_LightAutopistol" or
-						defName="Gun_HeavyAutopistol" or
-						defName="Gun_VarmitPistol" or
-						defName="Gun_AdvancedRevolver" or
-						defName="Gun_Snubby" or
-						defName="Gun_Magnum" or
-						defName="Gun_SawnoffPumpShotgun" or
-						defName="Gun_BreacherShotgun" or
-						defName="Gun_BreacherShotgunSemi" or
-						defName="Gun_AdvancedAutopistol"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Gun_ServiceRifle" or
-						defName="Gun_BattleRifle" or
-						defName="Gun_BattleDMR" or
-						defName="Gun_HeavySniperRifle" or
-						defName="Gun_VarmitRifle" or
-						defName="Gun_DMR" or
-						defName="Gun_CombatShotgun" or
-						defName="Gun_CrudeRifle" or
-						defName="Gun_EBR" or
-						defName="Gun_AdvancedShotgun" or
-						defName="ThogsGun_AdvancedAssaultRifle" or
-						defName="Gun_AutomaticShotgun" or
-						defName="Gun_ServiceSAW" or
-						defName="Gun_PDW" or
-						defName="Gun_ServiceDMR" or
-						defName="Gun_ServiceCarbine" or
-						defName="Gun_SMG" or
-						defName="Gun_BattleCarbine" or
-						defName="Gun_CrudeSMG" or
-						defName="Gun_Carbine" or
-						defName="Gun_AdvancedPDW" or
-						defName="Gun_HMG" or
-						defName="Gun_SAW" or
-						defName="Gun_LightMinigun" or
-						defName="Gun_CrudeLMG" or
-						defName="Gun_ServiceHMG" or
-						defName="Gun_ThogsAntiMaterialRifle"
-						]/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>
-				</li>
-
-				<!--===== Bayonet =====-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_CarbineBayonet" or defName="Gun_ServiceCarbineBayonet" or defName="Gun_CrudeCarbine"]/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>bayonet</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>2.14</cooldownTime>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>bayonet</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.49</cooldownTime>
-								<armorPenetrationBlunt>2.16</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.44</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!--== Combat Extended duplicate removal on mods part ==-->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Gun_IAW"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Gun_GrenadeLauncher"]</xpath>
-				</li>
-
-				<!--=== Removing dart rifles entirely until properly patched ===-->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Gun_AnestheticDartRifle" or defName="Gun_ToxicDartRifle"]</xpath>
-				</li>
-
-				<!--==== Varmit Rifle ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_VarmitRifle</defName>
-					<statBases>
-						<SightsEfficiency>1.24</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.17</SwayFactor>
-						<Bulk>9.40</Bulk>
-						<Mass>2.30</Mass>
-						<RangedWeapon_Cooldown>0.67</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_22LR_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>21</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_22LR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!--==== Varmit Pistol ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_VarmitPistol</defName>
-					<statBases>
-						<WorkToMake>6000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.10</ShotSpread>
-						<SwayFactor>1.10</SwayFactor>
-						<Bulk>0.75</Bulk>
-						<Mass>0.80</Mass>
-						<RangedWeapon_Cooldown>0.47</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_22LR_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>22</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_22LR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!--==== .38 Snubby Revolver ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Snubby</defName>
-					<statBases>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.20</ShotSpread>
-						<SwayFactor>0.56</SwayFactor>
-						<Bulk>1.70</Bulk>
-						<Mass>0.79</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_38Special_FMJ</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>11</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_38Special</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!--==== SMG ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SMG</defName>
-					<statBases>
-						<Mass>3.00</Mass>
-						<RangedWeapon_Cooldown>0.26</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>0.95</SwayFactor>
-						<Bulk>4.20</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.34</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>21</range>
-						<burstShotCount>8</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>4</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!--==== SAW ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_ServiceSAW</defName>
-					<statBases>
-						<Mass>4.80</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.06</SwayFactor>
-						<Bulk>11.40</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.51</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<soundCast>Shot_HeavySMG</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>75</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_MachineGun</li>
-						<li>CE_AI_Suppressive</li>
-					</weaponTags>
-				</li>
-
-				<!--==== Service Rifle ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_ServiceRifle</defName>
-					<statBases>
-						<Mass>3.30</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.21</SwayFactor>
-						<Bulk>8.80</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.87</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>0.8</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!--==== Service HMG ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_ServiceHMG</defName>
-					<statBases>
-						<Mass>10.72</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.06</SwayFactor>
-						<Bulk>11.40</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.88</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1.75</warmupTime>
-						<range>49</range>
-						<burstShotCount>20</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<soundCast>Shot_HeavySMG</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>10</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_MachineGun</li>
-						<li>CE_AI_Suppressive</li>
-					</weaponTags>
-				</li>
-
-				<!--==== Service DMR ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_ServiceDMR</defName>
-					<statBases>
-						<Mass>4.72</Mass>
-						<RangedWeapon_Cooldown>0.66</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.86</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.76</SwayFactor>
-						<Bulk>10.87</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.4</warmupTime>
-						<range>67</range>
-						<soundCast>Shot_SniperRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!--==== Service Carbine w/ Bayonet ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_ServiceCarbineBayonet</defName>
-					<statBases>
-						<Mass>3.16</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.9</SightsEfficiency>
-						<ShotSpread>0.13</ShotSpread>
-						<SwayFactor>0.73</SwayFactor>
-						<Bulk>8.03</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.37</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>45</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<soundCast>Shot_HeavySMG</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>4</aimedBurstShotCount>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<!--==== Service Carbine ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_ServiceCarbine</defName>
-					<statBases>
-						<Mass>3.12</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.9</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>0.70</SwayFactor>
-						<Bulk>7.98</Bulk>
-						<WorkToMake>3000</WorkToMake>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.37</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_545x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>45</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<soundCast>Shot_HeavySMG</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_545x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>4</aimedBurstShotCount>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!--==== SAW ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SAW</defName>
-					<statBases>
-						<Mass>6.23</Mass>
-						<RangedWeapon_Cooldown>2.75</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>1.29</SwayFactor>
-						<Bulk>11.42</Bulk>
-						<WorkToMake>40000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.8</warmupTime>
-						<range>55</range>
-						<burstShotCount>15</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>10</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Suppressive</li>
-						<li>CE_MachineGun</li>
-					</weaponTags>
-				</li>
-
-				<!--==== PDW ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PDW</defName>
-					<statBases>
-						<Mass>2.15</Mass>
-						<RangedWeapon_Cooldown>1.75</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.67</ShotSpread>
-						<SwayFactor>0.79</SwayFactor>
-						<Bulk>4.57</Bulk>
-						<WorkToMake>9000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.3</warmupTime>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<range>22</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-				</li>
-
-				<!--==== S&W 500 ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Magnum</defName>
-					<statBases>
-						<Mass>2.4</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.12</SwayFactor>
-						<Bulk>1.08</Bulk>
-						<WorkToMake>5000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_44Magnum_FMJ</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>24</range>
-						<soundCast>Shot_Revolver</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_44Magnum</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!--==== Light SMG ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_LightSMG</defName>
-					<statBases>
-						<Mass>2.67</Mass>
-						<RangedWeapon_Cooldown>1.3</RangedWeapon_Cooldown>
-						<SightsEfficiency>.8</SightsEfficiency>
-						<ShotSpread>1.66</ShotSpread>
-						<SwayFactor>0.76</SwayFactor>
-						<Bulk>3.89</Bulk>
-						<WorkToMake>6000</WorkToMake>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.11</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.8</warmupTime>
-						<range>20</range>
-						<burstShotCount>8</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>4</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<!--==== Light Minigun ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_LightMinigun</defName>
-					<statBases>
-						<Mass>12.57</Mass>
-						<RangedWeapon_Cooldown>3.7</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>1.67</ShotSpread>
-						<SwayFactor>2.43</SwayFactor>
-						<Bulk>13.23</Bulk>
-						<WorkToMake>12500</WorkToMake>
-					</statBases>
-					<Properties>
-						<burstShotCount>20</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>2</warmupTime>
-						<range>59</range>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>250</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>15</aimedBurstShotCount>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Suppressive</li>
-						<li>CE_MachineGun</li>
-					</weaponTags>
-				</li>
-
-				<!--==== HMG ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_HMG</defName>
-					<statBases>
-						<Mass>17</Mass>
-						<RangedWeapon_Cooldown>5.4</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>.23</ShotSpread>
-						<SwayFactor>1.67</SwayFactor>
-						<Bulk>12.24</Bulk>
-						<WorkToMake>38000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_145x114mm_FMJ</defaultProjectile>
-						<warmupTime>2.8</warmupTime>
-						<range>57</range>
-						<minRange>2</minRange>
-						<burstShotCount>20</burstShotCount>
-						<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_145x114mm</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>10</aimedBurstShotCount>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Suppressive</li>
-						<li>CE_MachineGun</li>
-					</weaponTags>
-				</li>
-
-				<!--==== AWP ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_HeavySniperRifle</defName>
-					<statBases>
-						<Mass>6.22</Mass>
-						<RangedWeapon_Cooldown>3.2</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.6</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>0.75</SwayFactor>
-						<Bulk>11.64</Bulk>
-						<WorkToMake>50000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
-						<warmupTime>3.8</warmupTime>
-						<range>75</range>
-						<minRange>3</minRange>
-						<soundCast>Shot_SniperRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_338Lapua</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!--==== Desert Eagle ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_HeavyAutopistol</defName>
-					<statBases>
-						<Mass>2.6</Mass>
-						<RangedWeapon_Cooldown>0.78</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.19</ShotSpread>
-						<SwayFactor>1.12</SwayFactor>
-						<Bulk>1.03</Bulk>
-						<WorkToMake>6000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_44Magnum_FMJ</defaultProjectile>
-						<warmupTime>0.425</warmupTime>
-						<range>23</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_44Magnum</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!--==== EBR ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_EBR</defName>
-					<statBases>
-						<Mass>5.36</Mass>
-						<RangedWeapon_Cooldown>0.7</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.7</SightsEfficiency>
-						<ShotSpread>0.32</ShotSpread>
-						<SwayFactor>0.49</SwayFactor>
-						<Bulk>7.21</Bulk>
-						<WorkToMake>46000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>64</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-				</li>
-
-				<!--==== Crude SMG ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_CrudeSMG</defName>
-					<statBases>
-						<Mass>4.26</Mass>
-						<RangedWeapon_Cooldown>0.65</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.20</ShotSpread>
-						<SwayFactor>0.43</SwayFactor>
-						<Bulk>3.54</Bulk>
-						<WorkToMake>8000</WorkToMake>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.78</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>11</ticksBetweenBurstShots>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.9</warmupTime>
-						<range>24</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!--==== DMR ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_DMR</defName>
-					<statBases>
-						<Mass>3.85</Mass>
-						<RangedWeapon_Cooldown>0.7</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.5</SightsEfficiency>
-						<ShotSpread>0.54</ShotSpread>
-						<SwayFactor>0.36</SwayFactor>
-						<Bulk>6.43</Bulk>
-						<WorkToMake>46000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_3006Springfield_FMJ</defaultProjectile>
-						<warmupTime>1.4</warmupTime>
-						<range>60</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_3006Springfield</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!--==== Crude Rifle ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_CrudeRifle</defName>
-					<statBases>
-						<Mass>3.24</Mass>
-						<RangedWeapon_Cooldown>2.1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>0.24</SwayFactor>
-						<Bulk>6.89</Bulk>
-						<WorkToMake>6000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.7</warmupTime>
-						<range>45</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>0.90</reloadTime>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!--==== Crude LMG ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_CrudeLMG</defName>
-					<statBases>
-						<Mass>8.89</Mass>
-						<RangedWeapon_Cooldown>2.7</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.21</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<Bulk>12.76</Bulk>
-						<WorkToMake>32000</WorkToMake>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.78</recoilAmount>
-						<burstShotCount>12</burstShotCount>
-						<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>2.2</warmupTime>
-						<range>47</range>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Suppressive</li>
-						<li>CE_Machinegun</li>
-					</weaponTags>
-				</li>
-
-				<!--==== Crude Carbine ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_CrudeCarbine</defName>
-					<statBases>
-						<Mass>3.85</Mass>
-						<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.35</ShotSpread>
-						<SwayFactor>0.23</SwayFactor>
-						<Bulk>9.78</Bulk>
-						<WorkToMake>8500</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>57</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<!--==== Combat Shotgun ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_CombatShotgun</defName>
-					<statBases>
-						<Mass>4.99</Mass>
-						<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.22</SwayFactor>
-						<Bulk>10.75</Bulk>
-						<WorkToMake>15000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>26</range>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!--==== Carbine w/ bayonet ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_CarbineBayonet</defName>
-					<statBases>
-						<Mass>2.75</Mass>
-						<RangedWeapon_Cooldown>1.6</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.13</SwayFactor>
-						<Bulk>7.67</Bulk>
-						<WorkToMake>40000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<recoilAmount>1.53</recoilAmount>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>0.8</warmupTime>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<range>45</range>
-						<soundCast>GunShotA</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<!--==== Carbine ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Carbine</defName>
-					<statBases>
-						<Mass>2.70</Mass>
-						<RangedWeapon_Cooldown>1.6</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.13</SwayFactor>
-						<Bulk>7.62</Bulk>
-						<WorkToMake>40000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<recoilAmount>1.53</recoilAmount>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>0.8</warmupTime>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<range>45</range>
-						<soundCast>GunShotA</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!--==== Shorty Shotgun ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SawnoffPumpShotgun</defName>
-					<statBases>
-						<Mass>2.84</Mass>
-						<RangedWeapon_Cooldown>1.25</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>0.34</SwayFactor>
-						<Bulk>6.10</Bulk>
-						<WorkToMake>2000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>14</range>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!--==== Light Autopistol ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_LightAutopistol</defName>
-					<statBases>
-						<Mass>0.7</Mass>
-						<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.10</ShotSpread>
-						<SwayFactor>0.89</SwayFactor>
-						<Bulk>1</Bulk>
-						<WorkToMake>50000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.25</warmupTime>
-						<range>11</range>
-						<soundCast>Shot_MachinePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>17</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!--==== Breaching Shotgun ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_BreacherShotgunSemi</defName>
-					<statBases>
-						<Mass>2.87</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<ShotSpread>0.19</ShotSpread>
-						<SwayFactor>0.96</SwayFactor>
-						<Bulk>5.75</Bulk>
-						<SightsEfficiency>1</SightsEfficiency>
-						<WorkToMake>15000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.75</warmupTime>
-						<range>11</range>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!--==== Battle Rifle ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_BattleRifle</defName>
-					<statBases>
-						<Mass>4.45</Mass>
-						<RangedWeapon_Cooldown>2.25</RangedWeapon_Cooldown>
-						<ShotSpread>0.10</ShotSpread>
-						<SwayFactor>1.47</SwayFactor>
-						<Bulk>11.67</Bulk>
-						<SightsEfficiency>1</SightsEfficiency>
-						<WorkToMake>44000</WorkToMake>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.67</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>61</range>
-						<burstShotCount>4</burstShotCount>
-						<ticksBetweenBurstShots>11</ticksBetweenBurstShots>
-						<soundCast>Shot_HeavySMG</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!--==== Breacher Shotgun ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_BreacherShotgun</defName>
-					<statBases>
-						<Mass>3.50</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.26</SwayFactor>
-						<Bulk>6.7</Bulk>
-						<SightsEfficiency>1</SightsEfficiency>
-						<WorkToMake>2500</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!--==== DMR ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_BattleDMR</defName>
-					<statBases>
-						<Mass>4.70</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.51</SwayFactor>
-						<Bulk>11.79</Bulk>
-						<SightsEfficiency>1.9</SightsEfficiency>
-						<WorkToMake>50000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>72</range>
-						<soundCast>Shot_HeavySMG</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!--==== Battle Carbine ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_BattleCarbine</defName>
-					<statBases>
-						<Mass>3.90</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.89</SwayFactor>
-						<Bulk>9.76</Bulk>
-						<SightsEfficiency>1</SightsEfficiency>
-						<WorkToMake>41000</WorkToMake>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.87</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>54</range>
-						<burstShotCount>4</burstShotCount>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<soundCast>Shot_HeavySMG</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-				<!--==== Auto Shotgun ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AutomaticShotgun</defName>
-					<statBases>
-						<Mass>3.90</Mass>
-						<RangedWeapon_Cooldown>2.39</RangedWeapon_Cooldown>
-						<ShotSpread>0.19</ShotSpread>
-						<SwayFactor>1.29</SwayFactor>
-						<Bulk>9.7</Bulk>
-						<SightsEfficiency>1</SightsEfficiency>
-						<WorkToMake>15000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>17</range>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>9</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!--==== Advanced Shotgun ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AdvancedShotgun</defName>
-					<statBases>
-						<Mass>4.70</Mass>
-						<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
-						<ShotSpread>0.19</ShotSpread>
-						<SwayFactor>1.08</SwayFactor>
-						<Bulk>8.7</Bulk>
-						<SightsEfficiency>1</SightsEfficiency>
-						<WorkToMake>20000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<recoilAmount>2.16</recoilAmount>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>21</range>
-						<burstShotCount>2</burstShotCount>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>14</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>0.50</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!--==== Advanced Revolver ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AdvancedRevolver</defName>
-					<statBases>
-						<Mass>1.6</Mass>
-						<RangedWeapon_Cooldown>1.4</RangedWeapon_Cooldown>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.31</SwayFactor>
-						<Bulk>2.7</Bulk>
-						<SightsEfficiency>1</SightsEfficiency>
-						<WorkToMake>5800</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_357Magnum_FMJ</defaultProjectile>
-						<warmupTime>0.2</warmupTime>
-						<range>19</range>
-						<soundCast>Shot_Revolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_357Magnum</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!--==== Advanced PDW ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_AdvancedPDW</defName>
-					<statBases>
-						<Mass>2.5</Mass>
-						<RangedWeapon_Cooldown>2.3</RangedWeapon_Cooldown>
-						<ShotSpread>0.19</ShotSpread>
-						<SwayFactor>0.89</SwayFactor>
-						<Bulk>7.7</Bulk>
-						<SightsEfficiency>1.2</SightsEfficiency>
-						<WorkToMake>25000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<recoilAmount>0.97</recoilAmount>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>19</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Advanced Auto Pistol ========== -->
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>Gun_AdvancedAutopistol</defName>
-					<statBases>
-						<WorkToMake>7000</WorkToMake>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.88</SwayFactor>
-						<Bulk>1.86</Bulk>
-						<Mass>0.78</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.74</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>12</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>17</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Anti-Material Rifle ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_ThogsAntiMaterialRifle</defName>
-					<statBases>
-						<Mass>13.50</Mass>
-						<RangedWeapon_Cooldown>0.58</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.84</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.87</SwayFactor>
-						<Bulk>13.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.49</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>3.3</warmupTime>
-						<range>126</range>
-						<soundCast>RNShot50Cal</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!--==== Advanced Assault Rifle ====-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>ThogsGun_AdvancedAssaultRifle</defName>
-					<statBases>
-						<Mass>3.67</Mass>
-						<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.79</SwayFactor>
-						<Bulk>9.7</Bulk>
-						<SightsEfficiency>1</SightsEfficiency>
-						<WorkToMake>42000</WorkToMake>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<recoilAmount>1.23</recoilAmount>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>58</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Thrumbo Plushie/ThrumboPlushie.xml b/Patches/Thrumbo Plushie/ThrumboPlushie.xml
deleted file mode 100644
index f407ef7c49..0000000000
--- a/Patches/Thrumbo Plushie/ThrumboPlushie.xml	
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Thrumbo Plushie</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Thrumbo Plushie ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ThrumboPlushie"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>base</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.05</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ThrumboPlushie"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="ThrumboPlushie"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="ThrumboPlushie"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ThrumboPlushie"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Thrumkin/Patch_Bodies_Thrumkin.xml b/Patches/Thrumkin/Patch_Bodies_Thrumkin.xml
deleted file mode 100644
index 063c800cf6..0000000000
--- a/Patches/Thrumkin/Patch_Bodies_Thrumkin.xml
+++ /dev/null
@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[SYR] Thrumkin</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Let's teach them which is which arm -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel = "left arm"]/groups</xpath>
-					<value>
-						<li>LeftArm</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel = "right arm"]/groups</xpath>
-					<value>
-						<li>RightArm</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[customLabel = "left shoulder"]/groups</xpath>
-					<value>
-						<li>LeftShoulder</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[customLabel = "right shoulder"]/groups</xpath>
-					<value>
-						<li>RightShoulder</li>
-					</value>
-				</li>
-
-				<!-- Changing coverage of the bodyDef (should've done this sooner, but eh) -->
-				<!-- why yes dear explorer of this file, i did just literally copy and paste the Thrumkin_Body bodytype patches -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Ribcage"]/coverage</xpath>
-					<value>
-						<coverage>0.07</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Pelvis"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Stomach"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Heart"]/coverage</xpath>
-					<value>
-						<coverage>0.04</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Lung"]/coverage</xpath>
-					<value>
-						<coverage>0.055</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Kidney"]/coverage</xpath>
-					<value>
-						<coverage>0.03</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Liver"]/coverage</xpath>
-					<value>
-						<coverage>0.06</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Neck"]/coverage</xpath>
-					<value>
-						<coverage>0.055</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Skull"]/parts/li[def="Brain"]/coverage</xpath>
-					<value>
-						<coverage>0.9</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Eye"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/coverage</xpath>
-					<value>
-						<coverage>0.08</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Shoulder"]/coverage</xpath>
-					<value>
-						<coverage>0.085</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Clavicle"]/coverage</xpath>
-					<value>
-						<coverage>0.06</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Humerus"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Radius"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Femur"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Tibia"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-
-				<!-- Adding natural armor coverage -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Tail"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Neck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="HornThrumkin"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Leg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="Thrumkin_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Hoof"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-							<li>Feet</li>
-						</groups>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Thrumkin/Patch_ImplantsProsthetics_Thrumkin.xml b/Patches/Thrumkin/Patch_ImplantsProsthetics_Thrumkin.xml
deleted file mode 100644
index eb9ba64c83..0000000000
--- a/Patches/Thrumkin/Patch_ImplantsProsthetics_Thrumkin.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[SYR] Thrumkin</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- SteelThrumkinHorn -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="SteelThrumkinHorn"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>steel horn</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>2.6</cooldownTime>
-								<armorPenetrationSharp>0.06</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.332</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>steel horn</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>3.12</cooldownTime>
-								<armorPenetrationSharp>0.42</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.925</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- EnhancementThrumkinHorn -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="EnhancementThrumkinHorn"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>enhanced horn</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>53</power>
-								<cooldownTime>1.15</cooldownTime>
-								<armorPenetrationSharp>0.69</armorPenetrationSharp>
-								<armorPenetrationBlunt>6.83</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>enhanced horn</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>34</power>
-								<cooldownTime>1.38</cooldownTime>
-								<armorPenetrationSharp>4.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.743</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Thrumkin/Patch_PawnKinds_Thrumkin.xml b/Patches/Thrumkin/Patch_PawnKinds_Thrumkin.xml
deleted file mode 100644
index 3d77520d6a..0000000000
--- a/Patches/Thrumkin/Patch_PawnKinds_Thrumkin.xml
+++ /dev/null
@@ -1,396 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[SYR] Thrumkin</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Techless -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Thrumkin_Slave"]/combatPower</xpath>
-					<value>
-						<combatPower>20</combatPower>
-					</value>
-				</li>
-
-				<!-- Tribal -->
-				<!-- Thrumkin_Penitent -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Thrumkin_Penitent"]/combatPower</xpath>
-					<value>
-						<combatPower>30</combatPower>
-					</value>
-				</li>
-
-				<!-- Thrumkin_Archer -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Thrumkin_Archer"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>10</min>
-								<max>40</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>100</min>
-								<max>140</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.6</shieldChance>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>40</min>
-										<max>80</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Tribal</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Thrumkin_Archer"]/combatPower</xpath>
-					<value>
-						<combatPower>50</combatPower>
-					</value>
-				</li>
-
-				<!-- Thrumkin_Warrior -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Thrumkin_Warrior"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>100</min>
-								<max>200</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.9</shieldChance>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Thrumkin_Warrior"]/combatPower</xpath>
-					<value>
-						<combatPower>42</combatPower>
-					</value>
-				</li>
-
-				<!-- Thrumkin_Hunter -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Thrumkin_Hunter"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>10</min>
-								<max>60</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>100</min>
-								<max>180</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.6</shieldChance>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>80</min>
-										<max>160</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Tribal</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Thrumkin_Hunter"]/combatPower</xpath>
-					<value>
-						<combatPower>70</combatPower>
-					</value>
-				</li>
-
-				<!-- Thrumkin_Berserker -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Thrumkin_Berserker"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>100</min>
-								<max>300</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.9</shieldChance>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Thrumkin_Berserker"]/combatPower</xpath>
-					<value>
-						<combatPower>90</combatPower>
-					</value>
-				</li>
-
-				<!-- Thrumkin_HeavyArcher -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Thrumkin_HeavyArcher"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>10</min>
-								<max>80</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>100</min>
-								<max>200</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.6</shieldChance>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>100</min>
-										<max>200</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Tribal</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Thrumkin_HeavyArcher"]/combatPower</xpath>
-					<value>
-						<combatPower>90</combatPower>
-					</value>
-				</li>
-
-				<!-- Thrumkin_ElderMelee -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Thrumkin_ElderMelee"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>200</min>
-								<max>400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.9</shieldChance>
-						</li>
-					</value>
-				</li>
-
-				<!-- Thrumkin_ElderRanged -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Thrumkin_ElderRanged"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>10</min>
-								<max>80</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>100</min>
-								<max>300</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.6</shieldChance>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>150</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Tribal</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- Thrumkin_GrandElder -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Thrumkin_GrandElder"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>10</min>
-								<max>40</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>300</min>
-								<max>600</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.6</shieldChance>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>200</min>
-										<max>400</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Tribal</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- Industrial -->
-				<!-- Thrumkin_Villager -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Thrumkin_Villager"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>1</min>
-								<max>2</max>
-							</primaryMagazineCount>
-							<shieldChance>0.6</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>20</min>
-										<max>120</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Thrumkin_Villager"]/combatPower</xpath>
-					<value>
-						<combatPower>45</combatPower>
-					</value>
-				</li>
-
-				<!-- Thrumkin_Guard -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Thrumkin_Guard"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>4</max>
-							</primaryMagazineCount>
-							<shieldChance>0.6</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>20</min>
-										<max>120</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Thrumkin_Guard"]/combatPower</xpath>
-					<value>
-						<combatPower>65</combatPower>
-					</value>
-				</li>
-
-				<!-- Thrumkin_Gunner -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Thrumkin_Gunner"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>4</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>200</min>
-								<max>600</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.8</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>20</min>
-										<max>120</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Thrumkin_Gunner"]/combatPower</xpath>
-					<value>
-						<combatPower>100</combatPower>
-					</value>
-				</li>
-
-				<!-- Thrumkin_Slasher -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Thrumkin_Slasher"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.9</shieldChance>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="Thrumkin_Slasher"]/combatPower</xpath>
-					<value>
-						<combatPower>160</combatPower>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Thrumkin/Patch_Race_Thrumkin.xml b/Patches/Thrumkin/Patch_Race_Thrumkin.xml
deleted file mode 100644
index 3f44e2b886..0000000000
--- a/Patches/Thrumkin/Patch_Race_Thrumkin.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[SYR] Thrumkin</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Combat -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Thrumkin"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Thrumkin"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-				<!-- thrumkin rebalances -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Thrumkin"]/statBases</xpath>
-					<value>
-						<!-- combat stats -->
-						<AimingAccuracy>0.9</AimingAccuracy>
-						<MeleeCritChance>1.34</MeleeCritChance>
-						<MeleeParryChance>1.27</MeleeParryChance>
-						<Suppressability>0.8</Suppressability>
-						<ReloadSpeed>0.9</ReloadSpeed>
-						<MeleeDodgeChance>1.06</MeleeDodgeChance>
-						<!-- other stats -->
-						<CarryWeight>50</CarryWeight>
-					</value>
-				</li>
-				<!-- should've modified the values sooner -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Thrumkin"]/statBases/Mass</xpath>
-					<value>
-						<Mass>120</Mass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Thrumkin"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.4</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Thrumkin"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.6</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Thrumkin"]/statBases/LeatherAmount</xpath>
-					<value>
-						<LeatherAmount>20</LeatherAmount>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Thrumkin"]/comps/li[@Class="CompProperties_Shearable"]/woolAmount</xpath>
-					<value>
-						<woolAmount>10</woolAmount>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Thrumkin"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>1.5</baseHealthScale>
-					</value>
-				</li>
-				<!-- Unarmed -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Thrumkin"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>1.73</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.4</chanceFactor>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.996</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>2.08</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.4</chanceFactor>
-								<armorPenetrationSharp>1.39</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.081</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.16</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.595</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.16</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.595</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.94</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.561</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>3.12</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.3</chanceFactor>
-								<armorPenetrationBlunt>0.925</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Thrumkin/Patch_Things_Thrumkin.xml b/Patches/Thrumkin/Patch_Things_Thrumkin.xml
deleted file mode 100644
index fddfa2c8d5..0000000000
--- a/Patches/Thrumkin/Patch_Things_Thrumkin.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[SYR] Thrumkin</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- WoodLog_GhostAsh -->
-				<!-- As a weapon -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoodLog_GhostAsh"]</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.99</cooldownTime>
-								<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoodLog_GhostAsh"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>1</MeleeParryChance>
-							<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoodLog_GhostAsh"]/statBases</xpath>
-					<value>
-						<Bulk>0.07</Bulk>
-						<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
-					</value>
-				</li>
-				<!-- As a material -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoodLog_GhostAsh"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.2</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoodLog_GhostAsh"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.4</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoodLog_GhostAsh"]/statBases/SharpDamageMultiplier</xpath>
-					<value>
-						<SharpDamageMultiplier>0.8</SharpDamageMultiplier>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WoodLog_GhostAsh"]/statBases/BluntDamageMultiplier</xpath>
-					<value>
-						<BluntDamageMultiplier>0.6</BluntDamageMultiplier>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WoodLog_GhostAsh"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>0.5</Mass>
-						<MeleePenetrationFactor>0.4</MeleePenetrationFactor>
-					</value>
-				</li>
-
-				<!-- Thrumkin_Crossbow -->
-				<!-- as a gun -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Thrumkin_Crossbow</defName>
-					<statBases>
-						<Mass>5.44</Mass><!-- bolt-action rfile has mass of 4.19. since this is supposed to be used by thrumkin, it should be a bit more heavier -->
-						<RangedWeapon_Cooldown>1.404</RangedWeapon_Cooldown><!-- a bit slower than the bolt-action rifle -->
-						<SightsEfficiency>0.9</SightsEfficiency><!-- worse than the bolt-action rifle -->
-						<ShotSpread>0.2</ShotSpread><!-- not a gun, but better than a bow -->
-						<SwayFactor>1.58</SwayFactor><!-- a bit more unwieldy than the bolt-action rifle -->
-						<Bulk>6.40</Bulk><!-- similar bulk to a great bow -->
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_CrossbowBolt_Stone</defaultProjectile>
-						<warmupTime>3.0</warmupTime>
-						<range>50</range>
-						<soundCast>Bow_Large</soundCast>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>6</AmmoGenPerMagOverride>
-						<reloadTime>3.8</reloadTime>
-						<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>NeolithicThrumkinRanged</li>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-					<researchPrerequisite>Greatbow</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-				<!-- in melee -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Thrumkin_Crossbow"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.55</cooldownTime>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Thrumkin_Sword -->
-				<!-- Used as a weapon -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Thrumkin_Sword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.12</cooldownTime>
-								<chanceFactor>0.1</chanceFactor>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>2.12</cooldownTime>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>56</power>
-								<cooldownTime>2.1</cooldownTime>
-								<chanceFactor>0.4</chanceFactor>
-								<armorPenetrationSharp>2.88</armorPenetrationSharp>
-								<armorPenetrationBlunt>6.48</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Thrumkin_Sword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.17</MeleeCritChance>
-							<MeleeParryChance>0.35</MeleeParryChance>
-							<MeleeDodgeChance>0.47</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Thrumkin_Sword"]/statBases/Mass</xpath>
-					<value>
-						<Mass>4</Mass>
-						<Bulk>12</Bulk>
-						<MeleeCounterParryBonus>0.47</MeleeCounterParryBonus>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Toolmetrics Redux/ToolmetricsRedux_ToolsDef.xml b/Patches/Toolmetrics Redux/ToolmetricsRedux_ToolsDef.xml
deleted file mode 100644
index 3377745051..0000000000
--- a/Patches/Toolmetrics Redux/ToolmetricsRedux_ToolsDef.xml	
+++ /dev/null
@@ -1,2036 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Toolmetrics Redux (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Chisel"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5.0</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.1</chanceFactor>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>7.0</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationSharp>0.13</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Chisel"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>1.0</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Chisel"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.20</MeleeCritChance>
-						<MeleeParryChance>0.20</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "Tool_Chisel"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "Tool_Chisel"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Chisel"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Chefs_Knife"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5.0</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.1</chanceFactor>
-								<armorPenetrationBlunt>0.09</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>8.0</power>
-								<cooldownTime>2.0</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationSharp>1.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.936</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>11.0</power>
-								<cooldownTime>2.0</cooldownTime>
-								<chanceFactor>1.34</chanceFactor>
-								<armorPenetrationSharp>1.34</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Chefs_Knife"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>1.0</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Chefs_Knife"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.20</MeleeCritChance>
-						<MeleeParryChance>0.20</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "Tool_Chefs_Knife"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "Tool_Chefs_Knife"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Chefs_Knife"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Pillow"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>side</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1.0</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.01</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Pillow"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Blanket"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>side</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1.0</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.01</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Blanket"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Leash"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>collar</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.85</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.09</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Leash"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<MeleeCounterParryBonus>1.1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Leash"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "Tool_Leash"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "Tool_Leash"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Leash"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Bandage"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>wraps</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.85</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.09</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Bandage"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Bandage"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "Tool_Bandage"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "Tool_Bandage"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Bandage"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Walking_Cane"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7.0</power>
-								<cooldownTime>1.4</cooldownTime>
-								<chanceFactor>1.1</chanceFactor>
-								<armorPenetrationBlunt>0.10</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Walking_Cane"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Walking_Cane"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>0.30</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "Tool_Walking_Cane"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "Tool_Walking_Cane"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Walking_Cane"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Whip"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>14.0</power>
-								<cooldownTime>2.0</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.06</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Whip"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<MeleeCounterParryBonus>1.4</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Whip"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.60</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "Tool_Whip"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "Tool_Whip"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Whip"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_First_Aid_Kit"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>case</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7.0</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.08</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_First_Aid_Kit"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.8</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "Tool_First_Aid_Kit"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "Tool_First_Aid_Kit"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_First_Aid_Kit"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Flowers"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1.0</power>
-								<cooldownTime>1.0</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Flowers"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "Tool_Flowers"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "Tool_Flowers"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Flowers"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Fan"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>6.0</power>
-								<cooldownTime>1.1</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.05</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Fan"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<MeleeCounterParryBonus>1.0</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "Tool_Fan"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "Tool_Fan"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Fan"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Encyclopedia"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>cover</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6.0</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.08</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Encyclopedia"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>1.0</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "Tool_Encyclopedia"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "Tool_Encyclopedia"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Encyclopedia"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_How_To"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>cover</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6.0</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.08</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_How_To"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>1.0</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "Tool_How_To"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "Tool_How_To"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_How_To"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Coupon_Book"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>cover</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6.0</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.08</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Coupon_Book"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>1.0</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "Tool_Coupon_Book"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "Tool_Coupon_Book"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Coupon_Book"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Laptop"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Side</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7.0</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.09</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Laptop"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>0.4</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Saw"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5.0</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.1</chanceFactor>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>10.0</power>
-								<cooldownTime>2.2</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationSharp>0.7</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Saw"]/statBases</xpath>
-					<value>
-						<Bulk>7</Bulk>
-						<MeleeCounterParryBonus>1.1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Saw"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "Tool_Saw"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "Tool_Saw"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Saw"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Brick_Saw"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5.0</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.1</chanceFactor>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>saw</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>32.0</power>
-								<cooldownTime>5.0</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Brick_Saw"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<MeleeCounterParryBonus>1.2</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Brick_Saw"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.60</MeleeCritChance>
-						<MeleeParryChance>-0.20</MeleeParryChance>
-						<MeleeDodgeChance>-0.20</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Power_Drill"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5.0</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.1</chanceFactor>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>drill</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>26.0</power>
-								<cooldownTime>5.5</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationSharp>1.34</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Power_Drill"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>1.2</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Power_Drill"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.50</MeleeCritChance>
-						<MeleeParryChance>0.20</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "Tool_Power_Drill"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "Tool_Power_Drill"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Power_Drill"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Jackhammer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5.0</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.1</chanceFactor>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>52.0</power>
-								<cooldownTime>8</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationSharp>1.34</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Jackhammer"]/statBases</xpath>
-					<value>
-						<Bulk>14</Bulk>
-						<MeleeCounterParryBonus>1.0</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Jackhammer"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.50</MeleeCritChance>
-						<MeleeParryChance>-0.20</MeleeParryChance>
-						<MeleeDodgeChance>-0.20</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Toolkit"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>case</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7.0</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Toolkit"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.8</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "Tool_Toolkit"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "Tool_Toolkit"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Toolkit"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Thimble"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>body</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.85</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.09</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Thimble"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<MeleeCounterParryBonus>1.0</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Thimble"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "Tool_Thimble"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "Tool_Thimble"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Thimble"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Whistle"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>body</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.85</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.09</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Whistle"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<MeleeCounterParryBonus>1.0</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Whistle"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.05</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "Tool_Whistle"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "Tool_Whistle"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Whistle"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Screwdriver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5.0</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.1</chanceFactor>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>7.0</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationSharp>0.74</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Screwdriver"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>1.0</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Screwdriver"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "Tool_Screwdriver"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "Tool_Screwdriver"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Screwdriver"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Axe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6.0</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.1</chanceFactor>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>16.0</power>
-								<cooldownTime>2.5</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Axe"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<MeleeCounterParryBonus>1.0</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Axe"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.30</MeleeCritChance>
-						<MeleeParryChance>0.20</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Skill_Saw"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6.0</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.1</chanceFactor>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>34.0</power>
-								<cooldownTime>5.0</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationSharp>0.84</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Skill_Saw"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>1.2</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Skill_Saw"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.60</MeleeCritChance>
-						<MeleeParryChance>-0.20</MeleeParryChance>
-						<MeleeDodgeChance>-0.20</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Fork"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>7.0</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Fork"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "Tool_Fork"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "Tool_Fork"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Fork"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Cleaver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5.0</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.1</chanceFactor>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>12.0</power>
-								<cooldownTime>2.2</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationSharp>1.34</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Cleaver"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>1.1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Cleaver"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>0.20</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "Tool_Cleaver"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "Tool_Cleaver"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Cleaver"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Skinning_Knife"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>8.0</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.11</chanceFactor>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>9.0</power>
-								<cooldownTime>1.9</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationSharp>1.04</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Skinning_Knife"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<MeleeCounterParryBonus>1.0</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Skinning_Knife"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.30</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "Tool_Skinning_Knife"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "Tool_Skinning_Knife"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Skinning_Knife"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Pickaxe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5.0</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.1</chanceFactor>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>14.0</power>
-								<cooldownTime>2.3</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationSharp>1.14</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Pickaxe"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<MeleeCounterParryBonus>1.2</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Pickaxe"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.40</MeleeCritChance>
-						<MeleeParryChance>0.20</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Scapel"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>5.0</power>
-								<cooldownTime>1</cooldownTime>
-								<chanceFactor>1.11</chanceFactor>
-								<armorPenetrationBlunt>0.08</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>6.0</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationSharp>1.04</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Scapel"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<MeleeCounterParryBonus>0.8</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Scapel"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.40</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "Tool_Scapel"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "Tool_Scapel"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Scapel"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Sickle"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5.0</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.1</chanceFactor>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>11.0</power>
-								<cooldownTime>2.1</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationSharp>0.74</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Sickle"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Sickle"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.20</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "Tool_Sickle"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "Tool_Sickle"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Sickle"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Scythe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5.0</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.1</chanceFactor>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>13.0</power>
-								<cooldownTime>2.1</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationSharp>1.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.936</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>15.0</power>
-								<cooldownTime>2.5</cooldownTime>
-								<chanceFactor>1.26</chanceFactor>
-								<armorPenetrationSharp>1.14</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Scythe"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>1.2</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Scythe"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.40</MeleeCritChance>
-						<MeleeParryChance>0.20</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Crowbar"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9.0</power>
-								<cooldownTime>1.7</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>1.936</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Crowbar"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Crowbar"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "Tool_Crowbar"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "Tool_Crowbar"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Crowbar"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Forge_Hammer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5.0</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.1</chanceFactor>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18.0</power>
-								<cooldownTime>2.9</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>1.936</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Forge_Hammer"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>1.4</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Forge_Hammer"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.40</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Spoon"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1.0</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.01</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Spoon"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<MeleeCounterParryBonus>0.8</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "Tool_Spoon"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "Tool_Spoon"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Spoon"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Trowel"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5.0</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.1</chanceFactor>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>4.0</power>
-								<cooldownTime>1.3</cooldownTime>
-								<chanceFactor>1.2</chanceFactor>
-								<armorPenetrationSharp>1.04</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>4.0</power>
-								<cooldownTime>1.3</cooldownTime>
-								<chanceFactor>1.3</chanceFactor>
-								<armorPenetrationSharp>1.04</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6.0</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.34</chanceFactor>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Trowel"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "Tool_Trowel"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "Tool_Trowel"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Chefs_Knife"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Shovel"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5.0</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.1</chanceFactor>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>9.0</power>
-								<cooldownTime>1.8</cooldownTime>
-								<chanceFactor>1.2</chanceFactor>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.05</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>11.0</power>
-								<cooldownTime>2.0</cooldownTime>
-								<chanceFactor>1.3</chanceFactor>
-								<armorPenetrationSharp>0.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.936</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14.0</power>
-								<cooldownTime>2.5</cooldownTime>
-								<chanceFactor>1.34</chanceFactor>
-								<armorPenetrationBlunt>0.7</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Shovel"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<MeleeCounterParryBonus>1.1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Shovel"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.20</MeleeCritChance>
-						<MeleeParryChance>0.20</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Hammer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5.0</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.1</chanceFactor>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9.0</power>
-								<cooldownTime>2.0</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Hammer"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Hammer"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>0.20</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "Tool_Hammer"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "Tool_Hammer"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Hammer"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Tool_Animal_Husbandry"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>weight</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7.0</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.08</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Animal_Husbandry"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<MeleeCounterParryBonus>0.7</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "Tool_Animal_Husbandry"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "Tool_Animal_Husbandry"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Tool_Animal_Husbandry"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/TouhouStyle/ThingDefs_Misc/Apparel_TouHou.xml b/Patches/TouhouStyle/ThingDefs_Misc/Apparel_TouHou.xml
deleted file mode 100644
index aa383afaa1..0000000000
--- a/Patches/TouhouStyle/ThingDefs_Misc/Apparel_TouHou.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[TH]TouhouStyle - 红魔郷造型包</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--Outifts-->
-
-						<!--Flandre Outfit-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNdressFL"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>10.8</ArmorRating_Sharp>
-								<Bulk>7</Bulk>
-								<WornBulk>5</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNdressFL"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>21.6</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNdressFL"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-							<value>
-								<ShootingAccuracyPawn>0.08</ShootingAccuracyPawn>
-								<AimingAccuracy>0.04</AimingAccuracy>
-							</value>
-						</li>
-
-						<!--Remilia Outfit-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNdressRM"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>9.6</ArmorRating_Sharp>
-								<Bulk>7</Bulk>
-								<WornBulk>5</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNdressRM"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>18.9</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--Patchouli Outfit-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNdressMQ"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>1.25</ArmorRating_Sharp>
-								<Bulk>3</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNdressMQ"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.24</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--Izayoi Outfit-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNdressPAD"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>10.8</ArmorRating_Sharp>
-								<Bulk>7</Bulk>
-								<WornBulk>3</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNdressPAD"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>13.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--Meirin Outfit-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNdressHMR"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>14.4</ArmorRating_Sharp>
-								<Bulk>7</Bulk>
-								<WornBulk>5</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNdressHMR"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>29.7</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNdressHMR"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>0.04</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<!--Koakuma Outfit-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNdressLD"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>4</ArmorRating_Sharp>
-								<Bulk>3</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNdressLD"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.42</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--Cirno Outfit-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_TH_Cirno"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>2.2</ArmorRating_Sharp>
-								<Bulk>5</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_TH_Cirno"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.54</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--Rumia Outfit-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_TH_Rumia"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>4.7</ArmorRating_Sharp>
-								<Bulk>5</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_TH_Rumia"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.72</ArmorRating_Blunt>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/TouhouStyle/ThingDefs_Misc/Headgear_TouHou.xml b/Patches/TouhouStyle/ThingDefs_Misc/Headgear_TouHou.xml
deleted file mode 100644
index 83de2f49fd..0000000000
--- a/Patches/TouhouStyle/ThingDefs_Misc/Headgear_TouHou.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[TH]TouhouStyle - 红魔郷造型包</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--Hats-->
-
-						<!--Flandre Hat-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNhatFL"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>6</ArmorRating_Sharp>
-								<Bulk>3</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNhatFL"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>10.8</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNhatFL"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-							<value>
-								<ShootingAccuracyPawn>0.04</ShootingAccuracyPawn>
-								<AimingAccuracy>0.02</AimingAccuracy>
-							</value>
-						</li>
-
-						<!--Remilia Hat-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNhatRM"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>3.6</ArmorRating_Sharp>
-								<Bulk>7</Bulk>
-								<WornBulk>5</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNhatRM"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<!--Meirin Hat-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNhatHMR"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>4.8</ArmorRating_Sharp>
-								<Bulk>7</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNhatHMR"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>13.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Apparel_TH_ZUNhatHMR"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>0.07</MeleeDodgeChance>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/TradingEconomy/Traders.xml b/Patches/TradingEconomy/Traders.xml
deleted file mode 100644
index 170bbda809..0000000000
--- a/Patches/TradingEconomy/Traders.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[A17] Trading Economy Mod 1.4</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/TraderKindDef[defName="FactionBase_WalkblemMilitary" or defName="Caravan_WalkblemTradings_Turrets"]/stockGenerators/li[thingDef="Turret_MortarIncendiary" or thingDef="Turret_MortarEMP"]</xpath>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Tribal Warrior Set/TribalWarrior_Apparel.xml b/Patches/Tribal Warrior Set/TribalWarrior_Apparel.xml
deleted file mode 100644
index 4d288f05d4..0000000000
--- a/Patches/Tribal Warrior Set/TribalWarrior_Apparel.xml	
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Tribal Warrior Set!</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Tribalwear -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Gunmar_Apparel_Tribal"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName= "Gunmar_Apparel_Tribal"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Thick Pelt Armor -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Gunmar_Apparel_ThickPeltArmor"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName= "Gunmar_Apparel_ThickPeltArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-						<ArmorRating_Sharp>0.30</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- Pelt Cap / Pelt Mantle -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Gunmar_Apparel_PeltMantle" or defName="Gunmar_Apparel_SunshadePeltMantle" or defName = "Gunmar_Apparel_WovenMantle"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gunmar_Apparel_PeltMantle" or defName="Gunmar_Apparel_SunshadePeltMantle"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Sunshade Pelt Cap -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName= "Gunmar_Apparel_PeltCap" or defName = "Gunmar_Apparel_SunshadePeltCap" or defName = "Gunmar_Apparel_WovenCap"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName= "Gunmar_Apparel_PeltCap" or defName= "Gunmar_Apparel_SunshadePeltCap" or defName = "Gunmar_Apparel_WovenCap"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.25</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Pelt Leggings -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Gunmar_Apparel_PeltLeggings" or defName="Gunmar_Apparel_PeltBoots"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName= "Gunmar_Apparel_PeltLeggings" or defName="Gunmar_Apparel_PeltBoots"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Wraps -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Gunmar_Apparel_WovenHandWraps" or defName = "Gunmar_Apparel_WovenLeggings" or defName = "Gunmar_Apparel_WovenFootWraps"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName= "Gunmar_Apparel_WovenHandWraps" or defName = "Gunmar_Apparel_WovenLeggings" or defName = "Gunmar_Apparel_WovenFootWraps"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- War Bow -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gunmar_War_Bow</defName>
-					<statBases>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>1</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>5.00</Bulk>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_GreatArrow_Stone</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>30</range>
-						<soundCast>Bow_Large</soundCast>
-					</Properties>
-					<AmmoUser>
-						<ammoSet>AmmoSet_GreatArrow</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_Bow</li>
-					</weaponTags>
-					<researchPrerequisite>Greatbow</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gunmar_War_Bow"]/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>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Tsar Armory/TsarArmory_Guns.xml b/Patches/Tsar Armory/TsarArmory_Guns.xml
deleted file mode 100644
index 9f7aadfc68..0000000000
--- a/Patches/Tsar Armory/TsarArmory_Guns.xml	
+++ /dev/null
@@ -1,398 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Tsar Armory</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Tools ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Nagant_TA"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Fedorov_TA" or defName="Gun_Mosin_TA" or defName="Gun_M1895_TA"]/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>
-				</li>
-
-				<!-- ========== Fedorov Avtomat ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Fedorov_TA</defName>
-					<statBases>
-						<Mass>4.40</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.49</SwayFactor>
-						<Bulk>10.45</Bulk>
-						<WorkToMake>18000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>80</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-						<WoodLog>10</WoodLog>
-					</costList>
-					<Properties>
-						<recoilAmount>1.78</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_65x50mmSRArisaka_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>51</range>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<soundCast>Shot_Fedorov</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_65x50mmSRArisaka</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<researchPrerequisite>Stage2b_TA</researchPrerequisite>
-				</li>
-
-				<!-- ========== Nagant 1895 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Nagant_TA</defName>
-					<statBases>
-						<Mass>0.80</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.05</SwayFactor>
-						<Bulk>2.35</Bulk>
-						<WorkToMake>10000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>45</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-						<WoodLog>5</WoodLog>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x38mmR_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Nagant</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_762x38mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>Gun</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-					<researchPrerequisite>Stage0b_TA</researchPrerequisite>
-				</li>
-
-				<!-- ========== Mosin 1891 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Mosin_TA</defName>
-					<statBases>
-						<Mass>4.00</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.63</SwayFactor>
-						<Bulk>12.32</Bulk>
-						<WorkToMake>6000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>50</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-						<WoodLog>20</WoodLog>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_Mosin</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<researchPrerequisite>Stage0b_TA</researchPrerequisite>
-				</li>
-
-				<!-- ========== Winchester M1895 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_M1895_TA</defName>
-					<statBases>
-						<Mass>4.20</Mass>
-						<RangedWeapon_Cooldown>0.77</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.60</SwayFactor>
-						<Bulk>11.75</Bulk>
-						<WorkToMake>12000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>50</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-						<WoodLog>20</WoodLog>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_M1895</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<researchPrerequisite>Stage0b_TA</researchPrerequisite>
-				</li>
-
-				<!-- ========== M1914 Concussion Grenade ========== -->
-
-				<!-- Projectile -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Proj_M1914_TA"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Proj_M1914_TA"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>1.5</explosionRadius>
-							<damageDef>Bomb</damageDef>
-							<damageAmountBase>60</damageAmountBase>
-							<explosionDelay>100</explosionDelay>
-							<dropsCasings>true</dropsCasings>
-							<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-							<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							<speed>12</speed>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "Proj_M1914_TA"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "Proj_M1914_TA"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<!-- M1914 Concussion Grenade -->
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="Weapon_M1914_TA"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>BaseWeapon</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Weapon_M1914_TA"]/recipeMaker</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Weapon_M1914_TA"]/costList</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Weapon_M1914_TA"]/label</xpath>
-					<value>
-						<label>Model 1914 grenade</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Weapon_M1914_TA"]</xpath>
-					<value>
-						<equippedAngleOffset>90</equippedAngleOffset>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Weapon_M1914_TA"]</xpath>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<stackLimit>75</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="Weapon_M1914_TA"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "Weapon_M1914_TA"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "Weapon_M1914_TA"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Weapon_M1914_TA"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>60</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>1.5</explosiveRadius>
-						</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Weapon_M1914_TA</defName>
-					<statBases>
-						<Mass>0.5</Mass>
-						<Bulk>0.235</Bulk>
-						<MarketValue>12.22</MarketValue>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<label>throw concussion grenade</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<range>13.0</range>
-						<minRange>2</minRange>
-						<warmupTime>0.8</warmupTime>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<soundCast>ThrowGrenade</soundCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<defaultProjectile>Proj_M1914_TA</defaultProjectile>
-						<onlyManualCast>true</onlyManualCast>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<weaponTags>
-						<li>CE_AI_Grenade</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Tsar Armory/TsarArmory_Recipes.xml b/Patches/Tsar Armory/TsarArmory_Recipes.xml
deleted file mode 100644
index ea56ad480c..0000000000
--- a/Patches/Tsar Armory/TsarArmory_Recipes.xml	
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Tsar Armory</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Remove Useless Recipes ========== -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/RecipeDef[defName="Make_PM1910_Ammo_TA"]</xpath>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="TableMachining"]/recipes/li[text()="Make_PM1910_Ammo_TA"]</xpath>
-					<match Class="PatchOperationRemove">
-						<xpath>Defs/ThingDef[defName="TableMachining"]/recipes/li[text()="Make_PM1910_Ammo_TA"]</xpath>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Tsar Armory/TsarArmory_Turrets.xml b/Patches/Tsar Armory/TsarArmory_Turrets.xml
deleted file mode 100644
index f58ed2b83e..0000000000
--- a/Patches/Tsar Armory/TsarArmory_Turrets.xml	
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Tsar Armory</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== PM 1910 ========== -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="PM1910_Ammo_TA"]</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_PM1910_TA"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_PM1910_TA</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.65</SwayFactor>
-						<Bulk>62.66</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.33</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>62</range>
-						<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>Shot_Maxim</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>250</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Turret_PM1910_TA"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Turret Collection/TurretCollection_CE_Patch_Turrets.xml b/Patches/Turret Collection/TurretCollection_CE_Patch_Turrets.xml
deleted file mode 100644
index 29dab923a6..0000000000
--- a/Patches/Turret Collection/TurretCollection_CE_Patch_Turrets.xml	
+++ /dev/null
@@ -1,983 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Turret Collection</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Ammo: Indirect-fire variant of M74 Incendiary rocket ========== -->
-				<!-- This allows the same craftable M74 ammo to be used by both direct and indirect fire weapons -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_M74_TC</defName>
-							<label>M74 Rockets</label>
-							<ammoTypes>
-								<Ammo_M74_Incendiary>Bullet_M74_Incendiary_TC</Ammo_M74_Incendiary>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseM74">
-							<defName>Bullet_M74_Incendiary_TC</defName>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<label>M74 Rocket (Incendiary)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Rocket/M74</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>PrometheumFlame</damageDef>
-								<damageAmountBase>10</damageAmountBase>
-								<explosionRadius>8</explosionRadius>
-								<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
-								<preExplosionSpawnChance>0.5</preExplosionSpawnChance>
-								<soundExplode>MortarIncendiary_Explode</soundExplode>
-								<!-- This is the key to indirect-fire projectiles -->
-								<flyOverhead>true</flyOverhead>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- ========== Advanced Naval Gun Turret ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>TC_AdvancedNavalGun_Gun</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>3.31</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>4.44</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_57x483mmBofors_HE</defaultProjectile>
-						<warmupTime>4.3</warmupTime>
-						<range>86</range>
-						<minRange>15</minRange>
-						<ticksBetweenBurstShots>16</ticksBetweenBurstShots>
-						<burstShotCount>5</burstShotCount>
-						<soundCast>TC_ShotAdvancedNavalGun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>16</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>9.8</reloadTime>
-						<ammoSet>AmmoSet_57x483mmBofors</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TC_AdvancedNavalGun"]/statBases/WorkToBuild</xpath>
-					<value>
-						<WorkToBuild>165500</WorkToBuild>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TC_AdvancedNavalGun"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>1045</Steel>
-							<ComponentIndustrial>9</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TC_AdvancedNavalGun"]</xpath>
-					<value>
-						<specialDisplayRadius>86</specialDisplayRadius>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TC_AdvancedNavalGun"]/statBases</xpath>
-					<value>
-						<ShootingAccuracyTurret>0.999</ShootingAccuracyTurret>
-						<AimingAccuracy>1.0</AimingAccuracy>
-					</value>
-				</li>
-
-				<!-- ========== Anti-Materiel Turret ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>TC_AntiMaterielTurret_Gun</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>2.08</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.61</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_20x128mmOerlikon_HE</defaultProjectile>
-						<warmupTime>4.3</warmupTime>
-						<range>86</range>
-						<minRange>8</minRange>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>5</burstShotCount>
-						<soundCast>TC_ShotAntiMaterielTurret</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>60</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_20x128mmOerlikon</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TC_AntiMaterielTurret"]/statBases/WorkToBuild</xpath>
-					<value>
-						<WorkToBuild>83000</WorkToBuild>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TC_AntiMaterielTurret"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>440</Steel>
-							<ComponentIndustrial>9</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TC_AntiMaterielTurret"]</xpath>
-					<value>
-						<specialDisplayRadius>86</specialDisplayRadius>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TC_AntiMaterielTurret"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>0.999</ShootingAccuracyTurret>
-						<AimingAccuracy>1.0</AimingAccuracy>
-					</value>
-				</li>
-
-				<!-- ========== Avenger Turret ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>TC_AvengerTurret_Gun</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>3.55</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.58</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_30x173mmNATO_Sabot</defaultProjectile>
-						<warmupTime>2.3</warmupTime>
-						<range>86</range>
-						<minRange>12</minRange>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<burstShotCount>100</burstShotCount>
-						<soundCast>TC_ShotAvengerTurret</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>16</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1350</magazineSize>
-						<reloadTime>9.2</reloadTime>
-						<ammoSet>AmmoSet_30x173mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>50</aimedBurstShotCount>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TC_AvengerTurret"]/statBases/WorkToBuild</xpath>
-					<value>
-						<WorkToBuild>180500</WorkToBuild>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TC_AvengerTurret"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>1195</Steel>
-							<ComponentIndustrial>7</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TC_AvengerTurret"]</xpath>
-					<value>
-						<specialDisplayRadius>86</specialDisplayRadius>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TC_AvengerTurret"]/statBases</xpath>
-					<value>
-						<ShootingAccuracyTurret>0.999</ShootingAccuracyTurret>
-						<AimingAccuracy>1.0</AimingAccuracy>
-					</value>
-				</li>
-
-				<!-- ========== Cannon Turret ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>TC_CannonTurret_Gun</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>2.65</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>3.23</SwayFactor>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_120mmCannonShell_HEAT</defaultProjectile>
-						<warmupTime>4.3</warmupTime>
-						<range>270</range>
-						<minRange>12</minRange>
-						<soundCast>TC_ShotCannonTurret</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>18</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>9.8</reloadTime>
-						<ammoSet>AmmoSet_120mmCannonShell</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TC_CannonTurret"]/statBases/WorkToBuild</xpath>
-					<value>
-						<WorkToBuild>94500</WorkToBuild>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TC_CannonTurret"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>535</Steel>
-							<ComponentIndustrial>5</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TC_CannonTurret"]</xpath>
-					<value>
-						<!-- Set to 0 as CE cannot draw range circles with radiuses larger than 90 cells -->
-						<specialDisplayRadius>0</specialDisplayRadius>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TC_CannonTurret"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>0.999</ShootingAccuracyTurret>
-						<AimingAccuracy>1.0</AimingAccuracy>
-					</value>
-				</li>
-
-				<!-- ========== Howitzer ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>TC_Howitzer_Gun</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>2.59</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>11.38</SwayFactor>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_155mmHowitzerShell_HE</defaultProjectile>
-						<warmupTime>4.3</warmupTime>
-						<range>700</range>
-						<!-- Same as CE 81mm mortar -->
-						<minRange>33</minRange>
-						<requireLineOfSight>false</requireLineOfSight>
-						<soundCast>TC_ShotHowitzer</soundCast>
-						<muzzleFlashScale>16</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>9.8</reloadTime>
-						<ammoSet>AmmoSet_155mmHowitzerShell</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TC_Howitzer"]/statBases/WorkToBuild</xpath>
-					<value>
-						<WorkToBuild>257000</WorkToBuild>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TC_Howitzer"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>1835</Steel>
-							<ComponentIndustrial>5</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<!-- Do not draw max range display circle (as it is larger than the upper limit of 90 cells) -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TC_Howitzer"]/statBases</xpath>
-					<value>
-						<ShootingAccuracyTurret>0.999</ShootingAccuracyTurret>
-						<AimingAccuracy>1.0</AimingAccuracy>
-					</value>
-				</li>
-
-				<!-- ========== Incendiary Launcher ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>TC_IncendiaryLauncher_Gun</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>0.72</SwayFactor>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_M74_Incendiary_TC</defaultProjectile>
-						<warmupTime>2.1</warmupTime>
-						<range>72</range>
-						<minRange>15</minRange>
-						<requireLineOfSight>false</requireLineOfSight>
-						<burstShotCount>4</burstShotCount>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<soundCast>TC_ShotIncendiaryLauncher</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>4</magazineSize>
-						<reloadTime>8.6</reloadTime>
-						<ammoSet>AmmoSet_M74_TC</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>1</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TC_IncendiaryLauncher"]/statBases/WorkToBuild</xpath>
-					<value>
-						<WorkToBuild>26000</WorkToBuild>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TC_IncendiaryLauncher"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>100</Steel>
-							<ComponentIndustrial>3</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TC_IncendiaryLauncher"]</xpath>
-					<value>
-						<specialDisplayRadius>72</specialDisplayRadius>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TC_IncendiaryLauncher"]/statBases</xpath>
-					<value>
-						<ShootingAccuracyTurret>0.999</ShootingAccuracyTurret>
-						<AimingAccuracy>1.0</AimingAccuracy>
-					</value>
-				</li>
-
-				<!-- ========== Multi-Barrel Rocket Launcher ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>TC_RocketLauncher_Gun</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>14.47</SwayFactor>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_130mmType63_HE</defaultProjectile>
-						<warmupTime>2.1</warmupTime>
-						<range>700</range>
-						<!-- Same as CE 81mm mortar -->
-						<minRange>37</minRange>
-						<requireLineOfSight>false</requireLineOfSight>
-						<burstShotCount>19</burstShotCount>
-						<ticksBetweenBurstShots>60</ticksBetweenBurstShots>
-						<soundCast>TC_ShotRocketLauncher</soundCast>
-						<muzzleFlashScale>16</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>19</magazineSize>
-						<reloadTime>8.6</reloadTime>
-						<ammoSet>AmmoSet_130mmType63</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>6</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TC_RocketLauncher"]/statBases/WorkToBuild</xpath>
-					<value>
-						<WorkToBuild>2429500</WorkToBuild>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TC_RocketLauncher"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>19330</Steel>
-							<ComponentIndustrial>3</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<!-- Do not draw max range display circle (as it is larger than the upper limit of 90 cells) -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TC_RocketLauncher"]/statBases</xpath>
-					<value>
-						<ShootingAccuracyTurret>0.999</ShootingAccuracyTurret>
-						<AimingAccuracy>1.0</AimingAccuracy>
-					</value>
-				</li>
-
-				<!-- ========== Pre-charged Mini-Turret (Removed as CE currently does not support preloaded turrets) ========== -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="TCEE_ChargedMiniTurret" or
-						defName="TCEE_ChargedMiniTurret_Crate"
-						] </xpath>
-				</li>
-
-				<!-- ========== Gatling Gun Turret ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>TCEE_GatlingGunTurret_Gun</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.23</SwayFactor>
-						<Bulk>8.02</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.65</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>2.3</warmupTime>
-						<range>86</range>
-						<minRange>15</minRange>
-						<burstShotCount>300</burstShotCount>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<soundCast>GunShotA</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1500</magazineSize>
-						<reloadTime>9.2</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>150</aimedBurstShotCount>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TCEE_GatlingGunTurret"]/statBases/WorkToBuild</xpath>
-					<value>
-						<WorkToBuild>54000</WorkToBuild>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TCEE_GatlingGunTurret"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>180</Steel>
-							<ComponentIndustrial>7</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TCEE_GatlingGunTurret"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>86</specialDisplayRadius>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TCEE_GatlingGunTurret"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>0.999</ShootingAccuracyTurret>
-						<AimingAccuracy>1.0</AimingAccuracy>
-					</value>
-				</li>
-
-				<!-- ========== Machine Gun Turret ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>TCEE_MachineGunTurret_Gun</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.59</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.25</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>86</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<requireLineOfSight>false</requireLineOfSight>
-						<soundCast>GunShotA</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TCEE_MachineGunTurret"]/statBases/WorkToBuild</xpath>
-					<value>
-						<WorkToBuild>60500</WorkToBuild>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TCEE_MachineGunTurret"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>280</Steel>
-							<ComponentIndustrial>6</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TCEE_MachineGunTurret"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>86</specialDisplayRadius>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TCEE_MachineGunTurret"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>0.999</ShootingAccuracyTurret>
-						<AimingAccuracy>1.0</AimingAccuracy>
-					</value>
-				</li>
-
-				<!-- ========== Naval Gun Turret ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>TCEE_NavalGunTurret_Gun</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>2.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.0</ShotSpread>
-						<SwayFactor>13.03</SwayFactor>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_28cmSpgrShell_HE</defaultProjectile>
-						<warmupTime>4.3</warmupTime>
-						<range>700</range>
-						<!-- Same as CE 81mm mortar -->
-						<minRange>35</minRange>
-						<requireLineOfSight>false</requireLineOfSight>
-						<burstShotCount>3</burstShotCount>
-						<soundCast>TCEE_ShotNavalGunTurret</soundCast>
-						<muzzleFlashScale>20</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>24</magazineSize>
-						<reloadTime>9.8</reloadTime>
-						<ammoSet>AmmoSet_28cmSpgrShell</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TCEE_NavalGunTurret"]/statBases/WorkToBuild</xpath>
-					<value>
-						<WorkToBuild>2597000</WorkToBuild>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="TCEE_NavalGunTurret"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>20555</Steel>
-							<ComponentIndustrial>5</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<!-- Do not draw max range display circle (as it is larger than the upper limit of 90 cells) -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="TCEE_NavalGunTurret"]/statBases</xpath>
-					<value>
-						<ShootingAccuracyTurret>1.0</ShootingAccuracyTurret>
-						<AimingAccuracy>1.0</AimingAccuracy>
-					</value>
-				</li>
-
-				<!-- ========== Common to all Turrets ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						@Name="TC_BaseArtilleryBuilding" or
-						@Name="TC_BaseAutoBuilding" or
-						@Name="TC_BaseMannedBuilding"
-						]/thingClass </xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						@Name="TC_BaseArtilleryBuilding" or
-						@Name="TC_BaseAutoBuilding" or
-						@Name="TC_BaseMannedBuilding"
-						]/fillPercent </xpath>
-					<value>
-						<!-- Needs to be at least 0.85 in order to shoot out from CE embrasures -->
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="TC_AdvancedNavalGun" or
-						defName="TC_AntiMaterielTurret" or
-						defName="TC_AvengerTurret" or
-						defName="TC_IncendiaryLauncher" or
-						defName="TC_RocketLauncher" or
-						defName="TCEE_GatlingGunTurret" or
-						defName="TCEE_MachineGunTurret" or
-						defName="TCEE_NavalGunTurret"
-						]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="TC_AvengerTurret" or
-						defName="TC_CannonTurret" or
-						defName="TC_Howitzer" or
-						defName="TC_IncendiaryLauncher" or
-						defName="TC_RocketLauncher" or
-						defName="TCEE_NavalGunTurret" or
-						@Name="TC_BaseAutoBuilding"
-						]/comps/li[@Class = "CompProperties_Explosive"] </xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="TC_CannonTurret" or
-						defName="TC_Howitzer"
-						]/inspectorTabs </xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="TC_CannonTurret_Gun" or
-						defName="TC_Howitzer_Gun"
-						]/comps/li[@Class = "CompProperties_ChangeableProjectile"] </xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="TC_BaseArtilleryWeapon"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Charges">
-							<chargeSpeeds>
-								<li>0</li>
-								<li>5</li>
-								<li>10</li>
-								<li>15</li>
-								<li>20</li>
-								<li>25</li>
-								<li>30</li>
-								<li>35</li>
-								<li>40</li>
-								<li>45</li>
-								<li>50</li>
-								<li>55</li>
-								<li>60</li>
-								<li>65</li>
-								<li>70</li>
-								<li>75</li>
-								<li>80</li>
-								<li>85</li>
-							</chargeSpeeds>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="TC_CannonTurret_Gun" or
-						defName="TC_Howitzer_Gun"
-						]/building </xpath>
-				</li>
-
-				<!-- ========== Remove original non-CE ammo and projectiles ========== -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="TC_Bullet_AntiMaterielTurret" or
-						defName="TC_Bullet_AvengerTurret" or
-						defName="TC_Bullet_Shell_AdvancedNavalGun" or
-						defName="TC_Bullet_Shell_CannonTurret_HEAT" or
-						defName="TC_Bullet_Shell_CannonTurret_HighExplosive" or
-						defName="TC_Bullet_Shell_Howitzer_EMP" or
-						defName="TC_Bullet_Shell_Howitzer_HighExplosive" or
-						defName="TC_Bullet_Shell_Howitzer_Incendiary" or
-						defName="TC_Bullet_Shell_IncendiaryLauncher_Incendiary" or
-						defName="TC_Bullet_Shell_RocketLauncher_HighExplosive" or
-						defName="TC_Shell_CannonTurret_HEAT" or
-						defName="TC_Shell_CannonTurret_HighExplosive" or
-						defName="TC_Shell_EMP" or
-						defName="TC_Shell_Howitzer_HighExplosive" or
-						defName="TC_Shell_Howitzer_Incendiary" or
-						defName="TC_Shell_IncendiaryLauncher_Incendiary" or
-						defName="TC_Shell_RocketLauncher_HighExplosive" or
-						defName="TCEE_Bullet_GatlingGunTurret" or
-						defName="TCEE_Bullet_MachineGunTurret" or
-						defName="TCEE_Bullet_Shell_Howitzer_ClusterBomb" or
-						defName="TCEE_Bullet_Shell_NavalGunTurret_HighExplosive" or
-						defName="TCEE_Shell_Howitzer_ClusterBomb" or
-						defName="TCEE_Shell_NavalGunTurret_HighExplosive" or
-						defName="TCEE_Submunition"
-						] </xpath>
-				</li>
-
-				<!-- ========== Replace research projects with CE equivalents ========== -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ResearchProjectDef[
-						defName="TC_AvengerTurret"
-						]/prerequisites </xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ResearchProjectDef[defName="TC_Artillery"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ResearchProjectDef[defName="TC_AutoTurret"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ResearchProjectDef[defName="TC_AvengerTurret"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ResearchProjectDef[defName="TCEE_ClusterMunition"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName="TCEE_Shell_Howitzer_ClusterBomb" or
-						@Name="TC_MakeableShellBase"
-						]/recipeMaker/researchPrerequisite </xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="TC_AvengerTurret" or
-						defName="TC_CannonTurret" or
-						defName="TCEE_GatlingGunTurret" or
-						defName="TCEE_MachineGunTurret" or
-						@Name="TC_BaseArtilleryBuilding"
-						]/researchPrerequisites </xpath>
-					<value>
-						<researchPrerequisites>
-							<li>CE_TurretHeavyWeapons</li>
-						</researchPrerequisites>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						@Name="TC_BaseAutoBuilding"
-						]/researchPrerequisites </xpath>
-					<value>
-						<researchPrerequisites>
-							<li>CE_HeavyTurret</li>
-							<li>CE_TurretHeavyWeapons</li>
-						</researchPrerequisites>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Twi'lek Race/Patch_Bodies.xml b/Patches/Twi'lek Race/Patch_Bodies.xml
deleted file mode 100644
index 99a47d24e5..0000000000
--- a/Patches/Twi'lek Race/Patch_Bodies.xml	
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Twi'lek Race (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Add armor coverage (for pawns with non-zero armor that use human body) ========== -->
-
-				<!-- Illithid -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Twilek_body"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Twilek_body"]/corePart/parts/li[def = "Neck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Twilek_body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Twilek_body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Jaw"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Twilek_body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Nose"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Twilek_body"]/corePart/parts/li[def="Neck"]/parts/li[def = "Head"]/parts/li[def="Ear"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Twilek_body"]/corePart/parts/li[def = "Shoulder"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Twilek_body"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Twilek_body"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Twilek_body"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def = "Hand"]/parts/li[def = "Finger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Twilek_body"]/corePart/parts/li[def = "Leg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Twilek_body"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "Twilek_body"]/corePart/parts/li[def="Leg"]/parts/li[def = "Foot"]/parts/li[def = "Toe"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Twi'lek Race/PawnKinds_Twilek.xml b/Patches/Twi'lek Race/PawnKinds_Twilek.xml
deleted file mode 100644
index 5f4b805634..0000000000
--- a/Patches/Twi'lek Race/PawnKinds_Twilek.xml	
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Twi'lek Race (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Give ammo to pawns with ranged weapons. ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="TwilekMilBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>7</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.15</generateChance>
-									<sidearmMoney>
-										<min>150</min>
-										<max>350</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>NeolithicMeleeBasic</li>
-										<li>MedievalMeleeDecent</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Twi'lek Race/Race_Twilek.xml b/Patches/Twi'lek Race/Race_Twilek.xml
deleted file mode 100644
index e6dda889f7..0000000000
--- a/Patches/Twi'lek Race/Race_Twilek.xml	
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Twi'lek Race (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Twilek"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Twilek"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Twilek"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Twilek"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency>0.4</NightVisionEfficiency>
-						<MeleeDodgeChance>1.1</MeleeDodgeChance>
-						<MeleeCritChance>0.8</MeleeCritChance>
-						<MeleeParryChance>0.85</MeleeParryChance>
-						<CarryWeight>35</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Twilek"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Twilek"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Twi'lek Race/ScenarioDefs.xml b/Patches/Twi'lek Race/ScenarioDefs.xml
deleted file mode 100644
index 3630d92ac8..0000000000
--- a/Patches/Twi'lek Race/ScenarioDefs.xml	
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Twi'lek Race (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--Add ammo to scenarioes-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="TwilekScenariox"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_Arrow_Stone</thingDef>
-							<count>100</count>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="TwilekScenariox"]/scenario/parts/li[thingDef="Pila"]</xpath>
-					<value>
-						<count>20</count>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/UEM More Mechanitor Mechs/Defs/ThingDefs_Races/Races_Mechanoid_Light.xml b/Patches/UEM More Mechanitor Mechs/Defs/ThingDefs_Races/Races_Mechanoid_Light.xml
deleted file mode 100644
index 6a44b7f532..0000000000
--- a/Patches/UEM More Mechanitor Mechs/Defs/ThingDefs_Races/Races_Mechanoid_Light.xml	
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[UEM] More Mechanitor Mechs</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Gastromech ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Mech_Gastromech"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mech_Gastromech"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>chef knife</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>2.07</cooldownTime>
-								<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.6</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.4</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>chef knife</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>spatula</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>RightSpatula</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.715</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Decorator ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Mech_Decorator"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mech_Decorator"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Left Pick</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.0</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.4</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Right Pick</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.0</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.4</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Scavoid ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Mech_Scavoid"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Mech_Scavoid"]/tools</xpath>
-					<value>
-						<tools Inherit="False">
-							<li Class="CombatExtended.ToolCE">
-								<label>Leg Spikes</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>SmallLegSpike</linkedBodyPartsGroup>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Leg Spikes</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>2.07</cooldownTime>
-								<linkedBodyPartsGroup>SmallLegSpike</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.6</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.4</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Urbworld Weaponry - Caseless/6.5x21mmCaseless.xml b/Patches/Urbworld Weaponry - Caseless/6.5x21mmCaseless.xml
deleted file mode 100644
index a541c04f29..0000000000
--- a/Patches/Urbworld Weaponry - Caseless/6.5x21mmCaseless.xml	
+++ /dev/null
@@ -1,289 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Urbworld Weaponry: Caseless</li>
-		</mods>
-
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>Ammo65x21mmCaseless</defName>
-					<label>6.5x21mm Caseless</label>
-					<parent>AmmoPistols</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_65x21mmCaseless</defName>
-					<label>6.5x21mm Caseless</label>
-					<ammoTypes>
-						<Ammo_65x21mmCaseless_FMJ>Bullet_65x21mmCaseless_FMJ</Ammo_65x21mmCaseless_FMJ>
-						<Ammo_65x21mmCaseless_AP>Bullet_65x21mmCaseless_AP</Ammo_65x21mmCaseless_AP>
-						<Ammo_65x21mmCaseless_HP>Bullet_65x21mmCaseless_HP</Ammo_65x21mmCaseless_HP>
-						<Ammo_65x21mmCaseless_Sabot>Bullet_65x21mmCaseless_Sabot</Ammo_65x21mmCaseless_Sabot>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="65x21mmCaselessBase" ParentName="SmallAmmoBase" Abstract="True">
-					<description>A high-velocity handgun cartridge enveloped in a solid propellant.</description>
-					<statBases>
-						<Mass>0.006</Mass>
-						<Bulk>0.01</Bulk>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting</li>
-					</tradeTags>
-					<thingCategories>
-						<li>Ammo65x21mmCaseless</li>
-					</thingCategories>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="65x21mmCaselessBase">
-					<defName>Ammo_65x21mmCaseless_FMJ</defName>
-					<label>6.5x21mm Caseless cartridge (FMJ)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Pistol/FMJ</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.04</MarketValue>
-					</statBases>
-					<ammoClass>FullMetalJacket</ammoClass>
-					<cookOffProjectile>Bullet_65x21mmCaseless_FMJ</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="65x21mmCaselessBase">
-					<defName>Ammo_65x21mmCaseless_AP</defName>
-					<label>6.5x21mm Caseless cartridge (AP)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Pistol/AP</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.04</MarketValue>
-					</statBases>
-					<ammoClass>ArmorPiercing</ammoClass>
-					<cookOffProjectile>Bullet_65x21mmCaseless_AP</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="65x21mmCaselessBase">
-					<defName>Ammo_65x21mmCaseless_HP</defName>
-					<label>6.5x21mm Caseless cartridge (HP)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Pistol/HP</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.04</MarketValue>
-					</statBases>
-					<ammoClass>HollowPoint</ammoClass>
-					<cookOffProjectile>Bullet_65x21mmCaseless_HP</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="65x21mmCaselessBase">
-					<defName>Ammo_65x21mmCaseless_Sabot</defName>
-					<label>6.5x21mm Caseless cartridge (Sabot)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/Sabot</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.06</MarketValue>
-					</statBases>
-					<ammoClass>Sabot</ammoClass>
-					<cookOffProjectile>Bullet_65x21mmCaseless_Sabot</cookOffProjectile>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="Base65x21mmCaselessBullet" ParentName="BaseBulletCE" Abstract="true">
-					<thingClass>CombatExtended.BulletCE</thingClass>
-					<graphicData>
-						<texPath>Things/Projectile/Bullet_Small</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bullet</damageDef>
-						<speed>141</speed>
-						<dropsCasings>false</dropsCasings>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base65x21mmCaselessBullet">
-					<defName>Bullet_65x21mmCaseless_FMJ</defName>
-					<label>6.5x21mm Caseless bullet (FMJ)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>9</damageAmountBase>
-						<armorPenetrationSharp>5</armorPenetrationSharp>
-						<armorPenetrationBlunt>14.22</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base65x21mmCaselessBullet">
-					<defName>Bullet_65x21mmCaseless_AP</defName>
-					<label>6.5x21mm Caseless bullet (AP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>6</damageAmountBase>
-						<armorPenetrationSharp>9</armorPenetrationSharp>
-						<armorPenetrationBlunt>14.22</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base65x21mmCaselessBullet">
-					<defName>Bullet_65x21mmCaseless_HP</defName>
-					<label>6.5x21mm Caseless bullet (HP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>12</damageAmountBase>
-						<armorPenetrationSharp>3</armorPenetrationSharp>
-						<armorPenetrationBlunt>14.22</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base65x21mmCaselessBullet">
-					<defName>Bullet_65x21mmCaseless_Sabot</defName>
-					<label>6.5x21mm Caseless bullet (Sabot)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>6</damageAmountBase>
-						<armorPenetrationSharp>12</armorPenetrationSharp>
-						<armorPenetrationBlunt>20.26</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_65x21mmCaseless_FMJ</defName>
-					<label>make 6.5x21mm caseless (FMJ) cartridge x500</label>
-					<description>Craft 500 6.5x21mm caseless (FMJ) cartridges.</description>
-					<jobString>Making 6.5x21mm caseless (FMJ) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>8</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_65x21mmCaseless_FMJ>500</Ammo_65x21mmCaseless_FMJ>
-					</products>
-					<workAmount>800</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_65x21mmCaseless_AP</defName>
-					<label>make 6.5x21mm caseless (AP) cartridge x500</label>
-					<description>Craft 500 6.5x21mm caseless (AP) cartridges.</description>
-					<jobString>Making 6.5x21mm caseless (AP) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>8</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_65x21mmCaseless_AP>500</Ammo_65x21mmCaseless_AP>
-					</products>
-					<workAmount>800</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_65x21mmCaseless_HP</defName>
-					<label>make 6.5x21mm caseless (HP) cartridge x500</label>
-					<description>Craft 500 6.5x21mm caseless (HP) cartridges.</description>
-					<jobString>Making 6.5x21mm caseless (HP) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>8</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_65x21mmCaseless_HP>500</Ammo_65x21mmCaseless_HP>
-					</products>
-					<workAmount>800</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AdvancedAmmoRecipeBase">
-					<defName>MakeAmmo_65x21mmCaseless_Sabot</defName>
-					<label>make 6.5x21mm caseless (Sabot) cartridge x500</label>
-					<description>Craft 500 6.5x21mm caseless (Sabot) cartridges.</description>
-					<jobString>Making 6.5x21mm caseless (Sabot) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>6</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Uranium</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Chemfuel</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Uranium</li>
-							<li>Chemfuel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_65x21mmCaseless_Sabot>500</Ammo_65x21mmCaseless_Sabot>
-					</products>
-					<workAmount>1800</workAmount>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Urbworld Weaponry - Caseless/7.7mmPC.xml b/Patches/Urbworld Weaponry - Caseless/7.7mmPC.xml
deleted file mode 100644
index e83750541f..0000000000
--- a/Patches/Urbworld Weaponry - Caseless/7.7mmPC.xml	
+++ /dev/null
@@ -1,423 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Urbworld Weaponry: Caseless</li>
-		</mods>
-
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>Ammo77x49mmPC</defName>
-					<label>7.7x49mm PC</label>
-					<parent>AmmoRifles</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_77x49mmPC</defName>
-					<label>7.7x49mm Proprietary Caseless</label>
-					<ammoTypes>
-						<Ammo_77x49mmPC_FMJ>Bullet_77x49mmPC_FMJ</Ammo_77x49mmPC_FMJ>
-						<Ammo_77x49mmPC_AP>Bullet_77x49mmPC_AP</Ammo_77x49mmPC_AP>
-						<Ammo_77x49mmPC_HP>Bullet_77x49mmPC_HP</Ammo_77x49mmPC_HP>
-						<Ammo_77x49mmPC_Incendiary>Bullet_77x49mmPC_Incendiary</Ammo_77x49mmPC_Incendiary>
-						<Ammo_77x49mmPC_HE>Bullet_77x49mmPC_HE</Ammo_77x49mmPC_HE>
-						<Ammo_77x49mmPC_Sabot>Bullet_77x49mmPC_Sabot</Ammo_77x49mmPC_Sabot>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="77x49mmPCBase" ParentName="SmallAmmoBase" Abstract="True">
-					<description>Heavy caseless rifle cartridge used in battle rifles, machine guns and sniper rifles.</description>
-					<statBases>
-						<Mass>0.023</Mass>
-						<Bulk>0.02</Bulk>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting</li>
-					</tradeTags>
-					<thingCategories>
-						<li>Ammo77x49mmPC</li>
-					</thingCategories>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="77x49mmPCBase">
-					<defName>Ammo_77x49mmPC_FMJ</defName>
-					<label>7.7x49mmPC cartridge (FMJ)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/FMJ</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.10</MarketValue>
-					</statBases>
-					<ammoClass>FullMetalJacket</ammoClass>
-					<cookOffProjectile>Bullet_77x49mmPC_FMJ</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="77x49mmPCBase">
-					<defName>Ammo_77x49mmPC_AP</defName>
-					<label>7.7x49mmPC cartridge (AP)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/AP</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.1</MarketValue>
-					</statBases>
-					<ammoClass>ArmorPiercing</ammoClass>
-					<cookOffProjectile>Bullet_77x49mmPC_AP</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="77x49mmPCBase">
-					<defName>Ammo_77x49mmPC_HP</defName>
-					<label>7.7x49mmPC cartridge (HP)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/HP</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.1</MarketValue>
-					</statBases>
-					<ammoClass>HollowPoint</ammoClass>
-					<cookOffProjectile>Bullet_77x49mmPC_HP</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="77x49mmPCBase">
-					<defName>Ammo_77x49mmPC_Incendiary</defName>
-					<label>7.7x49mmPC cartridge (AP-I)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/Incendiary</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.22</MarketValue>
-					</statBases>
-					<ammoClass>IncendiaryAP</ammoClass>
-					<cookOffProjectile>Bullet_77x49mmPC_Incendiary</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="77x49mmPCBase">
-					<defName>Ammo_77x49mmPC_HE</defName>
-					<label>7.7x49mmPC cartridge (HE)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/HE</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.15</MarketValue>
-					</statBases>
-					<ammoClass>ExplosiveAP</ammoClass>
-					<cookOffProjectile>Bullet_77x49mmPC_HE</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="77x49mmPCBase">
-					<defName>Ammo_77x49mmPC_Sabot</defName>
-					<label>7.7x49mmPC cartridge (Sabot)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/Sabot</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.12</MarketValue>
-						<Mass>0.022</Mass>
-					</statBases>
-					<ammoClass>Sabot</ammoClass>
-					<cookOffProjectile>Bullet_77x49mmPC_Sabot</cookOffProjectile>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="Base77x49mmPCBullet" ParentName="BaseBulletCE" Abstract="true">
-					<thingClass>CombatExtended.BulletCE</thingClass>
-					<graphicData>
-						<texPath>Things/Projectile/Bullet_Small</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bullet</damageDef>
-						<speed>154</speed>
-						<dropsCasings>false</dropsCasings>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base77x49mmPCBullet">
-					<defName>Bullet_77x49mmPC_FMJ</defName>
-					<label>7.7mmPC bullet (FMJ)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>21</damageAmountBase>
-						<armorPenetrationSharp>8</armorPenetrationSharp>
-						<armorPenetrationBlunt>69.28</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base77x49mmPCBullet">
-					<defName>Bullet_77x49mmPC_AP</defName>
-					<label>7.7mmPC bullet (AP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>13</damageAmountBase>
-						<armorPenetrationSharp>15</armorPenetrationSharp>
-						<armorPenetrationBlunt>87.42</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base77x49mmPCBullet">
-					<defName>Bullet_77x49mmPC_HP</defName>
-					<label>7.7mmPC bullet (HP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>27</damageAmountBase>
-						<armorPenetrationSharp>4</armorPenetrationSharp>
-						<armorPenetrationBlunt>87.42</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base77x49mmPCBullet">
-					<defName>Bullet_77x49mmPC_Incendiary</defName>
-					<label>7.7mmPC bullet (AP-I)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>13</damageAmountBase>
-						<armorPenetrationSharp>15</armorPenetrationSharp>
-						<armorPenetrationBlunt>87.42</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Flame_Secondary</def>
-								<amount>8</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base77x49mmPCBullet">
-					<defName>Bullet_77x49mmPC_HE</defName>
-					<label>7.7mmPC bullet (HE)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>21</damageAmountBase>
-						<armorPenetrationSharp>8</armorPenetrationSharp>
-						<armorPenetrationBlunt>87.42</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Bomb_Secondary</def>
-								<amount>13</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base77x49mmPCBullet">
-					<defName>Bullet_77x49mmPC_Sabot</defName>
-					<label>7.7mmPC bullet (Sabot)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>10</damageAmountBase>
-						<armorPenetrationSharp>26</armorPenetrationSharp>
-						<armorPenetrationBlunt>114.98</armorPenetrationBlunt>
-						<speed>208</speed>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_77x49mmPC_FMJ</defName>
-					<label>make 7.7x49mmPC (FMJ) cartridge x500</label>
-					<description>Craft 500 7.7x49mmPC (FMJ) cartridges.</description>
-					<jobString>Making 7.7x49mmPC (FMJ) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>24</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_77x49mmPC_FMJ>500</Ammo_77x49mmPC_FMJ>
-					</products>
-					<workAmount>2400</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_77x49mmPC_AP</defName>
-					<label>make 7.7x49mmPC (AP) cartridge x500</label>
-					<description>Craft 500 7.7x49mmPC (AP) cartridges.</description>
-					<jobString>Making 7.7x49mmPC (AP) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>24</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_77x49mmPC_AP>500</Ammo_77x49mmPC_AP>
-					</products>
-					<workAmount>2400</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_77x49mmPC_HP</defName>
-					<label>make 7.7x49mmPC (HP) cartridge x500</label>
-					<description>Craft 500 7.7x49mmPC (HP) cartridges.</description>
-					<jobString>Making 7.7x49mmPC (HP) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>24</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_77x49mmPC_HP>500</Ammo_77x49mmPC_HP>
-					</products>
-					<workAmount>2400</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AdvancedAmmoRecipeBase">
-					<defName>MakeAmmo_77x49mmPC_Incendiary</defName>
-					<label>make 7.7x49mmPC (AP-I) cartridge x500</label>
-					<description>Craft 500 7.7x49mmPC (AP-I) cartridges.</description>
-					<jobString>Making 7.7x49mmPC (AP-I) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>24</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>4</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Prometheum</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_77x49mmPC_Incendiary>500</Ammo_77x49mmPC_Incendiary>
-					</products>
-					<workAmount>4000</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AdvancedAmmoRecipeBase">
-					<defName>MakeAmmo_77x49mmPC_HE</defName>
-					<label>make 7.7x49mmPC (HE) cartridge x500</label>
-					<description>Craft 500 7.7x49mmPC (HE) cartridges.</description>
-					<jobString>Making 7.7x49mmPC (HE) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>24</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>7</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_77x49mmPC_HE>500</Ammo_77x49mmPC_HE>
-					</products>
-					<workAmount>5200</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AdvancedAmmoRecipeBase">
-					<defName>MakeAmmo_77x49mmPC_Sabot</defName>
-					<label>make 7.7x49mmPC (Sabot) cartridge x500</label>
-					<description>Craft 500 7.7x49mmPC (Sabot) cartridges.</description>
-					<jobString>Making 7.7x49mmPC (Sabot) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>10</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Uranium</li>
-								</thingDefs>
-							</filter>
-							<count>4</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Chemfuel</li>
-								</thingDefs>
-							</filter>
-							<count>4</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Uranium</li>
-							<li>Chemfuel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_77x49mmPC_Sabot>500</Ammo_77x49mmPC_Sabot>
-					</products>
-					<workAmount>3400</workAmount>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Urbworld Weaponry - Caseless/CaselessWeapons.xml b/Patches/Urbworld Weaponry - Caseless/CaselessWeapons.xml
deleted file mode 100644
index 96048ad500..0000000000
--- a/Patches/Urbworld Weaponry - Caseless/CaselessWeapons.xml	
+++ /dev/null
@@ -1,377 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Urbworld Weaponry: Caseless</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<!-- ==== UBX-320 ==== -->
-
-				<ThingDef ParentName="CaselessGunBase">
-					<defName>Gun_Caseless_LMG_Heavy</defName>
-					<label>C-21</label>
-					<description>Caseless LMG fed from a box and fired from an open bolt. This one of Orbital General Industry's most popular products due to the weight-saving ammunition and familiar design.\n\nThe original production run LMGs were manufactured orbitally, it's said that their quality is nearly unmatched even several centuries later.</description>
-					<graphicData>
-						<texPath>CaselessBonus/UBX320</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<soundInteract>Interact_CBox</soundInteract>
-					<statBases>
-						<WorkToMake>38000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.66</SwayFactor>
-						<Bulk>9</Bulk>
-						<Mass>7.85</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>50</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-						<Chemfuel>10</Chemfuel>
-					</costList>
-					<verbs>
-						<li Class="CombatExtended.VerbPropertiesCE">
-							<recoilAmount>1.65</recoilAmount>
-							<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-							<hasStandardCommand>true</hasStandardCommand>
-							<defaultProjectile>Bullet_77x49mmPC_FMJ</defaultProjectile>
-							<burstShotCount>10</burstShotCount>
-							<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-							<warmupTime>1.1</warmupTime>
-							<range>72</range>
-							<soundCast>Shot_Minigun</soundCast>
-							<soundCastTail>GunTail_Heavy</soundCastTail>
-							<muzzleFlashScale>8</muzzleFlashScale>
-							<targetParams>
-								<canTargetLocations>true</canTargetLocations>
-							</targetParams>
-							<recoilPattern>Mounted</recoilPattern>
-						</li>
-					</verbs>
-					<comps>
-						<li Class="CombatExtended.CompProperties_AmmoUser">
-							<magazineSize>125</magazineSize>
-							<reloadTime>7.4</reloadTime>
-							<ammoSet>AmmoSet_77x49mmPC</ammoSet>
-						</li>
-						<li Class="CombatExtended.CompProperties_FireModes">
-							<aiUseBurstMode>TRUE</aiUseBurstMode>
-							<aiAimMode>AimedShot</aiAimMode>
-							<aimedBurstShotCount>5</aimedBurstShotCount>
-						</li>
-					</comps>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>CE_MachineGun</li>
-						<li>CE_AI_LMG</li>
-						<li>Bipod_LMG</li>
-					</weaponTags>
-					<weaponClasses>
-						<li>RangedHeavy</li>
-					</weaponClasses>
-					<recipeMaker>
-						<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-					</recipeMaker>
-					<tools>
-						<li Class="CombatExtended.ToolCE">
-							<label>stock</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>9</power>
-							<cooldownTime>1.8</cooldownTime>
-							<chanceFactor>1.5</chanceFactor>
-							<armorPenetration>0.11</armorPenetration>
-							<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>barrel</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>10</power>
-							<cooldownTime>1.9</cooldownTime>
-							<armorPenetration>0.118</armorPenetration>
-							<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>muzzle</label>
-							<capacities>
-								<li>Poke</li>
-							</capacities>
-							<power>10</power>
-							<cooldownTime>1.9</cooldownTime>
-							<armorPenetration>0.086</armorPenetration>
-							<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-						</li>
-					</tools>
-				</ThingDef>
-
-				<!-- ===== Carbine GL ===== -->
-
-				<ThingDef ParentName="CaselessGunBase">
-					<defName>Gun_Caseless_Carbine_GL</defName>
-					<label>BZ-4 + I2 Knight</label>
-					<description>With a touch of spacer ingenuity this weapon is significantly more effective than its midworld counterparts.\n\nThe Smart Defense Systems "I2 Knight" was a package for the CBZ-4 that attempted to extend the rifle's service life with the addition of a 30mm grenade launcher and advanced optics suite. Both the caliber and size of the grenades were quickly deemed ineffective for combat seen on most urbworlds. Corporate security on midworlds and the rim however find the weapon very useful.</description>
-					<graphicData>
-						<texPath>CaselessBonus/CARGL</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<soundInteract>Interact_CRifle</soundInteract>
-					<statBases>
-						<Mass>8.84</Mass>
-						<MaxHitPoints>75</MaxHitPoints>
-						<RangedWeapon_Cooldown>0.33</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.17</SightsEfficiency>
-						<ShotSpread>0.1</ShotSpread>
-						<SwayFactor>1.0</SwayFactor>
-						<Bulk>12.89</Bulk>
-						<WorkToMake>48500</WorkToMake><!--52500-->
-						<NightVisionEfficiency_Weapon>0.5</NightVisionEfficiency_Weapon>
-					</statBases>
-					<costList>
-						<Steel>75</Steel>
-						<ComponentIndustrial>11</ComponentIndustrial>
-						<Chemfuel>20</Chemfuel>
-						<Plasteel>25</Plasteel>
-					</costList>
-					<verbs>
-						<li Class="CombatExtended.VerbPropertiesCE">
-							<recoilAmount>1.5</recoilAmount>
-							<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-							<hasStandardCommand>true</hasStandardCommand>
-							<defaultProjectile>Bullet_473x33mmCaseless_FMJ</defaultProjectile>
-							<warmupTime>1.1</warmupTime>
-							<range>55</range>
-							<burstShotCount>6</burstShotCount>
-							<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-							<soundCast>Shot_SilencedA</soundCast>
-							<soundCastTail>GunTail_Medium</soundCastTail>
-							<muzzleFlashScale>2</muzzleFlashScale>
-							<recoilPattern>Regular</recoilPattern>
-						</li>
-					</verbs>
-					<weaponTags>
-						<li>CE_AI_AR</li>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-					<weaponClasses>
-						<li>RangedLight</li>
-						<li>ShortShots</li>
-					</weaponClasses>
-					<comps>
-						<li Class="CombatExtended.CompProperties_AmmoUser">
-							<magazineSize>50</magazineSize>
-							<reloadTime>5.5</reloadTime>
-							<ammoSet>AmmoSet_473x33mmCaseless</ammoSet>
-						</li>
-						<li Class="CombatExtended.CompProperties_FireModes">
-							<aiUseBurstMode>TRUE</aiUseBurstMode>
-							<aiAimMode>AimedShot</aiAimMode>
-							<aimedBurstShotCount>3</aimedBurstShotCount>
-						</li>
-						<li Class="CombatExtended.CompProperties_UnderBarrel">
-							<propsUnderBarrel>
-								<magazineSize>3</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_20x42mmGrenade</ammoSet>
-							</propsUnderBarrel>
-							<verbPropsUnderBarrel>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_20x42mmGrenade_HE</defaultProjectile>
-								<warmupTime>1.5</warmupTime>
-								<range>70</range>
-								<soundCast>Shot_GLA</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>0</muzzleFlashScale>
-							</verbPropsUnderBarrel>
-							<propsFireModesUnderBarrel>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-								<aimedBurstShotCount>1</aimedBurstShotCount>
-							</propsFireModesUnderBarrel>
-						</li>
-					</comps>
-					<recipeMaker>
-						<skillRequirements>
-							<Crafting>6</Crafting>
-						</skillRequirements>
-						<researchPrerequisite>MultiAnalyzer</researchPrerequisite>
-					</recipeMaker>
-					<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>
-					<modExtensions>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.16,1.25</DrawSize>
-							<DrawOffset>0.05,-0.07</DrawOffset>
-						</li>
-					</modExtensions>
-				</ThingDef>
-
-				<!-- ==== EM-72 + 40mm grenade launcher ==== -->
-
-				<ThingDef ParentName="CaselessGunBase">
-					<defName>Gun_Caseless_BattleRifle_Sixmm_GL</defName>
-					<label>EM72 + I9 Halberd</label>
-					<description>The EM72 with an advanced combat suite, what it lacks in style it makes up for in firepower.\n\n The realized vision of a convoluted urbworld infantry weapons program. Likely issued to cybernetically enhanced soldiers due to this weapon's weight and bulk.</description>
-					<graphicData>
-						<texPath>CaselessBonus/HBRGL/Standard</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<soundInteract>Interact_CRifle</soundInteract>
-					<statBases>
-						<WorkToMake>52500</WorkToMake>
-						<MaxHitPoints>75</MaxHitPoints>
-						<SightsEfficiency>2.5</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.42</SwayFactor>
-						<Bulk>16.8</Bulk>
-						<Mass>7.2</Mass>
-						<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>80</Steel>
-						<ComponentIndustrial>12</ComponentIndustrial>
-						<Chemfuel>25</Chemfuel>
-						<Plasteel>25</Plasteel>
-					</costList>
-					<verbs>
-						<li Class="CombatExtended.VerbPropertiesCE">
-							<recoilAmount>2.17</recoilAmount>
-							<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-							<hasStandardCommand>true</hasStandardCommand>
-							<defaultProjectile>Bullet_77x49mmPC_FMJ</defaultProjectile>
-							<burstShotCount>4</burstShotCount>
-							<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-							<warmupTime>1.01</warmupTime>
-							<range>65</range>
-							<soundCast>Shot_csniper</soundCast>
-							<soundCastTail>GunTail_Heavy</soundCastTail>
-							<muzzleFlashScale>8</muzzleFlashScale>
-						</li>
-					</verbs>
-					<comps>
-						<li Class="CombatExtended.CompProperties_AmmoUser">
-							<magazineSize>20</magazineSize>
-							<reloadTime>4</reloadTime>
-							<ammoSet>AmmoSet_77x49mmPC</ammoSet>
-						</li>
-						<li Class="CombatExtended.CompProperties_FireModes">
-							<aiUseBurstMode>TRUE</aiUseBurstMode>
-							<aiAimMode>AimedShot</aiAimMode>
-							<aimedBurstShotCount>2</aimedBurstShotCount>
-						</li>
-						<li Class="CombatExtended.CompProperties_UnderBarrel">
-							<propsUnderBarrel>
-								<magazineSize>4</magazineSize>
-								<reloadTime>4.5</reloadTime>
-								<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
-							</propsUnderBarrel>
-							<verbPropsUnderBarrel>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
-								<warmupTime>1.01</warmupTime>
-								<range>45</range>
-								<soundCast>Shot_GLA</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>5</muzzleFlashScale>
-							</verbPropsUnderBarrel>
-							<propsFireModesUnderBarrel>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-								<aimedBurstShotCount>1</aimedBurstShotCount>
-							</propsFireModesUnderBarrel>
-						</li>
-					</comps>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>CE_AI_AR</li>
-						<li>Bipod_Rifle</li>
-					</weaponTags>
-					<weaponClasses>
-						<li>RangedHeavy</li>
-					</weaponClasses>
-					<recipeMaker>
-						<skillRequirements>
-							<Crafting>6</Crafting>
-						</skillRequirements>
-						<researchPrerequisite>MultiAnalyzer</researchPrerequisite>
-					</recipeMaker>
-					<tools>
-						<li Class="CombatExtended.ToolCE">
-							<label>stock</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>9</power>
-							<cooldownTime>1.8</cooldownTime>
-							<chanceFactor>1.5</chanceFactor>
-							<armorPenetration>0.11</armorPenetration>
-							<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>barrel</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>10</power>
-							<cooldownTime>1.9</cooldownTime>
-							<armorPenetration>0.118</armorPenetration>
-							<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>muzzle</label>
-							<capacities>
-								<li>Poke</li>
-							</capacities>
-							<power>10</power>
-							<cooldownTime>1.9</cooldownTime>
-							<armorPenetration>0.086</armorPenetration>
-							<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-						</li>
-					</tools>
-				</ThingDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Urbworld Weaponry - Caseless/CaselessWeapons_CE.xml b/Patches/Urbworld Weaponry - Caseless/CaselessWeapons_CE.xml
deleted file mode 100644
index 274d16c1dc..0000000000
--- a/Patches/Urbworld Weaponry - Caseless/CaselessWeapons_CE.xml	
+++ /dev/null
@@ -1,531 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Urbworld Weaponry: Caseless</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Tools ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Caseless_Pistol"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="CaselessGunMMeleeBase"]/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>
-				</li>
-
-				<!-- ========== K-5 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Caseless_Pistol</defName>
-					<statBases>
-						<Mass>0.61</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.92</SwayFactor>
-						<Bulk>2.15</Bulk>
-						<WorkToMake>13000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>20</Steel>
-						<Chemfuel>10</Chemfuel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.78</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_65x21mmCaseless_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>Shot_kpistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>4</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>21</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_65x21mmCaseless</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_BROOM</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-					<researchPrerequisite>BlowbackOperation</researchPrerequisite>
-				</li>
-
-				<!-- ========== CSG-3 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Caseless_SMG</defName>
-					<statBases>
-						<Mass>2.4</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>0.69</SwayFactor>
-						<Bulk>4.53</Bulk>
-						<WorkToMake>30000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-						<Chemfuel>10</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>1.39</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_65x21mmCaseless_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>17</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>Shot_CSG</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>5</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_65x21mmCaseless</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-					<researchPrerequisite>BlowbackOperation</researchPrerequisite>
-				</li>
-
-				<!-- ========== LMG11k ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Caseless_LMG</defName>
-					<statBases>
-						<Mass>5.53</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.31</SwayFactor>
-						<Bulk>7.53</Bulk>
-						<WorkToMake>29000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>55</Steel>
-						<Chemfuel>5</Chemfuel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.06</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_473x33mmCaseless_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>68</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>Shot_CLMG</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>6</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>300</magazineSize>
-						<reloadTime>9.2</reloadTime>
-						<ammoSet>AmmoSet_473x33mmCaseless</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_MachineGun</li>
-						<li>CE_AI_LMG</li>
-						<li>Bipod_LMG</li>
-					</weaponTags>
-					<researchPrerequisite>GasOperation</researchPrerequisite>
-				</li>
-
-				<!-- ========== Burst Rifle ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Caseless_BurstRifle</defName>
-					<statBases>
-						<Mass>7.44</Mass>
-						<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.18</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.13</SwayFactor>
-						<Bulk>7.44</Bulk>
-						<WorkToMake>49000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<Chemfuel>10</Chemfuel>
-						<Plasteel>25</Plasteel>
-						<ComponentIndustrial>10</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.29</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_473x33mmCaseless_FMJ</defaultProjectile>
-						<warmupTime>1.25</warmupTime>
-						<range>58</range>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<burstShotCount>3</burstShotCount>
-						<soundCast>Shot_Burst</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>6</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>5.5</reloadTime>
-						<ammoSet>AmmoSet_473x33mmCaseless</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>CE_AI_AR</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Carbine ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Caseless_Carbine</defName>
-					<statBases>
-						<Mass>2.74</Mass>
-						<RangedWeapon_Cooldown>0.33</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.1</ShotSpread>
-						<SwayFactor>1.0</SwayFactor>
-						<Bulk>6.47</Bulk>
-						<WorkToMake>29500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>35</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-						<Chemfuel>10</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>1.5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_473x33mmCaseless_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>46</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>Shot_CAR</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_473x33mmCaseless</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AR</li>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-					<researchPrerequisite>GasOperation</researchPrerequisite>
-				</li>
-
-				<!-- ========== GMA M901 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Caseless_SniperRifle</defName>
-					<statBases>
-						<Mass>8.75</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.54</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.65</SwayFactor>
-						<Bulk>8.75</Bulk>
-						<WorkToMake>59000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>55</Steel>
-						<Chemfuel>15</Chemfuel>
-						<Plasteel>30</Plasteel>
-						<ComponentIndustrial>12</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>0.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_77x49mmPC_FMJ</defaultProjectile>
-						<burstShotCount>2</burstShotCount>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<warmupTime>1.65</warmupTime>
-						<range>72</range>
-						<soundCast>Shot_csniper</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_77x49mmPC</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_SR</li>
-						<li>Bipod_DMR</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== bolty ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Caseless_BoltAction</defName>
-					<statBases>
-						<Mass>3.3</Mass>
-						<RangedWeapon_Cooldown>1.31</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.31</SwayFactor>
-						<Bulk>6.3</Bulk>
-						<WorkToMake>22000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>55</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-						<Chemfuel>12</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>2.54</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_77x49mmPC_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_Bolty</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>8</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_77x49mmPC</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_SR</li>
-					</weaponTags>
-					<researchPrerequisite>Gunsmithing</researchPrerequisite>
-				</li>
-
-				<!-- ========== battle rifle ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Caseless_BattleRifle</defName>
-					<statBases>
-						<Mass>3.8</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.15</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-						<Bulk>9.2</Bulk>
-						<WorkToMake>32500</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>50</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-						<Chemfuel>12</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>2.37</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_77x49mmPC_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<range>65</range>
-						<soundCast>Shot_csniper</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>8</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_77x49mmPC</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>CE_AI_AR</li>
-						<li>Bipod_Rifle</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-				</li>
-
-				<!-- ===== Names ==== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Caseless_Pistol"]/label</xpath>
-					<value>
-						<label>K5</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Caseless_SMG"]/label</xpath>
-					<value>
-						<label>CS-8</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Caseless_Carbine"]/label</xpath>
-					<value>
-						<label>BZ-4</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Caseless_BurstRifle"]/label</xpath>
-					<value>
-						<label>G530</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Caseless_LMG"]/label</xpath>
-					<value>
-						<label>LMG11</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Caseless_SniperRifle"]/label</xpath>
-					<value>
-						<label>MX91</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Caseless_BoltAction"]/label</xpath>
-					<value>
-						<label>RimWarrior</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Caseless_BattleRifle"]/label</xpath>
-					<value>
-						<label>EM72</label>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Urbworld Weaponry SDS/18mmSSR.xml b/Patches/Urbworld Weaponry SDS/18mmSSR.xml
deleted file mode 100644
index ac11970cf4..0000000000
--- a/Patches/Urbworld Weaponry SDS/18mmSSR.xml	
+++ /dev/null
@@ -1,524 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Urbworld Weaponry SDS</li>
-		</mods>
-
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>Ammo18mmSmart</defName>
-					<label>18mm Semi-smart rocket</label>
-					<parent>AmmoPistols</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_18mmSmart</defName>
-					<label>18mm Semi-smart rocket</label>
-					<ammoTypes>
-						<Ammo_18mmSmart_FMJ>Bullet_18mmSmart_FMJ</Ammo_18mmSmart_FMJ>
-						<Ammo_18mmSmart_AP>Bullet_18mmSmart_AP</Ammo_18mmSmart_AP>
-						<Ammo_18mmSmart_Sabot>Bullet_18mmSmart_Sabot</Ammo_18mmSmart_Sabot>
-						<Ammo_18mmSmart_HE>Bullet_18mmSmart_HE</Ammo_18mmSmart_HE>
-						<Ammo_18mmSmart_Incendiary>Bullet_18mmSmart_Incendiary</Ammo_18mmSmart_Incendiary>
-						<Ammo_18mmSmart_EMP>Bullet_18mmSmart_EMP</Ammo_18mmSmart_EMP>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="18mmSmartBase" ParentName="AmmoBase" Abstract="True">
-					<description>Rare urbworld ammunition that guides itself using micro rocket propulsion. An electric igniter fires the cartridge as well as flash-programs the bullet with flight data. An antiquted design that introduces more problems than it solves.</description>
-					<statBases>
-						<Mass>0.0051</Mass>
-						<Bulk>0.09</Bulk>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting</li>
-					</tradeTags>
-					<thingCategories>
-						<li>Ammo18mmSmart</li>
-					</thingCategories>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="18mmSmartBase">
-					<defName>Ammo_18mmSmart_FMJ</defName>
-					<label>18mm Smart rocket (FMJ)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Pistol/FMJ</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.55</MarketValue>
-					</statBases>
-					<ammoClass>FullMetalJacket</ammoClass>
-					<cookOffProjectile>Bullet_18mmSmart_FMJ</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="18mmSmartBase">
-					<defName>Ammo_18mmSmart_AP</defName>
-					<label>18mm Smart rocket (AP)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Pistol/AP</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.55</MarketValue>
-					</statBases>
-					<ammoClass>ArmorPiercing</ammoClass>
-					<cookOffProjectile>Bullet_18mmSmart_AP</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="18mmSmartBase">
-					<defName>Ammo_18mmSmart_Sabot</defName>
-					<label>18mm Smart rocket (Sabot)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/Sabot</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.69</MarketValue>
-					</statBases>
-					<ammoClass>Sabot</ammoClass>
-					<cookOffProjectile>Bullet_18mmSmart_Sabot</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="18mmSmartBase">
-					<defName>Ammo_18mmSmart_HE</defName>
-					<label>18mm Smart rocket (HE)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/HE</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>1.03</MarketValue>
-					</statBases>
-					<ammoClass>ExplosiveAP</ammoClass>
-					<cookOffProjectile>Bullet_18mmSmart_HE</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="18mmSmartBase">
-					<defName>Ammo_18mmSmart_Incendiary</defName>
-					<label>18mm Smart rocket (Incendiary)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/Incendiary</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.96</MarketValue>
-					</statBases>
-					<ammoClass>IncendiaryFuel</ammoClass>
-					<cookOffProjectile>Bullet_18mmSmart_Incendiary</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="18mmSmartBase">
-					<defName>Ammo_18mmSmart_EMP</defName>
-					<label>18mm Smart rocket (EMP)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Shotgun/EMP</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>1.1</MarketValue>
-					</statBases>
-					<ammoClass>ElectroSlug</ammoClass>
-					<cookOffProjectile>Bullet_18mmSmart_EMP</cookOffProjectile>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef Name="Base18mmSmartBullet" ParentName="BaseBulletCE" Abstract="true">
-					<graphicData>
-						<texPath>Projectiles/SSR_Rocket_Small</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bullet</damageDef>
-						<speed>110</speed> <!--40-->
-						<dropsCasings>true</dropsCasings>
-						<casingMoteDefname>Mote_SDSShell</casingMoteDefname>
-						<casingFilthDefname>Filth_SDSCasings</casingFilthDefname>
-						<gravityFactor>75</gravityFactor> <!--15-->
-						<soundAmbient>SSR_Loop_Multi</soundAmbient>
-						<screenShakeFactor>0</screenShakeFactor>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base18mmSmartBullet">
-					<defName>Bullet_18mmSmart_FMJ</defName>
-					<label>18mm Smart rocket (FMJ)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>28</damageAmountBase>
-						<armorPenetrationSharp>6</armorPenetrationSharp>
-						<armorPenetrationBlunt>84.7</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base18mmSmartBullet">
-					<defName>Bullet_18mmSmart_AP</defName>
-					<label>18mm Smart rocket (AP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>22</damageAmountBase>
-						<armorPenetrationSharp>12</armorPenetrationSharp>
-						<armorPenetrationBlunt>84.7</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base18mmSmartBullet">
-					<defName>Bullet_18mmSmart_Sabot</defName>
-					<label>18mm Smart rocket (Sabot)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>21</damageAmountBase>
-						<speed>165</speed>
-						<armorPenetrationSharp>21</armorPenetrationSharp>
-						<armorPenetrationBlunt>190.58</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base18mmSmartBullet">
-					<defName>Bullet_18mmSmart_HE</defName>
-					<label>18mm Smart rocket (HE)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>17</damageAmountBase>
-						<armorPenetrationSharp>4.125</armorPenetrationSharp>
-						<armorPenetrationBlunt>0.799</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Bomb_Secondary</def>
-								<amount>14</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base18mmSmartBullet">
-					<defName>Bullet_18mmSmart_Incendiary</defName>
-					<label>18mm Smart rocket (Incendiary)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>PrometheumFlame</damageDef>
-						<damageAmountBase>3</damageAmountBase>
-						<armorPenetrationSharp>0</armorPenetrationSharp>
-						<armorPenetrationBlunt>0</armorPenetrationBlunt>
-						<explosionRadius>1</explosionRadius>
-						<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
-						<preExplosionSpawnChance>0.15</preExplosionSpawnChance>
-						<ai_IsIncendiary>true</ai_IsIncendiary>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base18mmSmartBullet">
-					<defName>Bullet_18mmSmart_EMP</defName>
-					<label>18mm Smart rocket (EMP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>EMP</damageDef>
-						<damageAmountBase>8</damageAmountBase>
-						<explosionRadius>1</explosionRadius>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_18mmSmart_FMJ</defName>
-					<label>make 18mm Smart (FMJ) rocket x200</label>
-					<description>Craft 500 18mm Smart (FMJ) rockets.</description>
-					<jobString>Making 18mm Smart (FMJ) rockets.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>22</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Prometheum</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_18mmSmart_FMJ>200</Ammo_18mmSmart_FMJ>
-					</products>
-					<workAmount>3400</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_18mmSmart_AP</defName>
-					<label>make 18mm Smart (AP) rocket x200</label>
-					<description>Craft 500 18mm Smart (AP) rockets.</description>
-					<jobString>Making 18mm Smart (AP) rockets.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>22</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Prometheum</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_18mmSmart_AP>200</Ammo_18mmSmart_AP>
-					</products>
-					<workAmount>4080</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AdvancedAmmoRecipeBase">
-					<defName>MakeAmmo_18mmSmart_Sabot</defName>
-					<label>make 18mm Smart (Sabot) rocket x200</label>
-					<description>Craft 500 18mm Smart (Sabot) rockets.</description>
-					<jobString>Making 18mm Smart (Sabot) rockets.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>10</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Uranium</li>
-								</thingDefs>
-							</filter>
-							<count>6</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Chemfuel</li>
-								</thingDefs>
-							</filter>
-							<count>6</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Prometheum</li>
-							<li>ComponentIndustrial</li>
-							<li>Uranium</li>
-							<li>Chemfuel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_18mmSmart_Sabot>200</Ammo_18mmSmart_Sabot>
-					</products>
-					<workAmount>5800</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AdvancedAmmoRecipeBase">
-					<defName>MakeAmmo_18mmSmart_HE</defName>
-					<label>make 18mm Smart (HE) rocket x200</label>
-					<description>Craft 500 18mm Smart (HE) rockets.</description>
-					<jobString>Making 18mm Smart (HE) rockets.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>28</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>8</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Prometheum</li>
-							<li>ComponentIndustrial</li>
-							<li>FSX</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_18mmSmart_HE>200</Ammo_18mmSmart_HE>
-					</products>
-					<workAmount>8640</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AdvancedAmmoRecipeBase">
-					<defName>MakeAmmo_18mmSmart_Incendiary</defName>
-					<label>make 18mm Smart (Incendiary) rocket x200</label>
-					<description>Craft 500 18mm Smart (Incendiary) rockets.</description>
-					<jobString>Making 18mm Smart (Incendiary) rockets.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>28</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>4</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>3</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Prometheum</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_18mmSmart_Incendiary>200</Ammo_18mmSmart_Incendiary>
-					</products>
-					<workAmount>5600</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AdvancedAmmoRecipeBase">
-					<defName>MakeAmmo_18mmSmart_EMP</defName>
-					<label>make 18mm Smart (EMP) rocket x200</label>
-					<description>Craft 500 18mm Smart (EMP) rockets.</description>
-					<jobString>Making 18mm Smart (EMP) rockets.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>28</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>5</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Prometheum</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_18mmSmart_EMP>200</Ammo_18mmSmart_EMP>
-					</products>
-					<workAmount>5800</workAmount>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Urbworld Weaponry SDS/50ISM.xml b/Patches/Urbworld Weaponry SDS/50ISM.xml
deleted file mode 100644
index 6b138b3585..0000000000
--- a/Patches/Urbworld Weaponry SDS/50ISM.xml	
+++ /dev/null
@@ -1,374 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Urbworld Weaponry SDS</li>
-		</mods>
-
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<!-- ==== .50 ==== -->
-
-				<ThingCategoryDef>
-					<defName>Ammo50ISM</defName>
-					<label>.50 ISM</label>
-					<parent>AmmoHighCaliber</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberHighCaliber</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_50ISM</defName>
-					<label>.50 caliber Indirect Smart Munition</label>
-					<ammoTypes>
-						<Ammo_50ISM_FMJ>Bullet_50ISM_FMJ</Ammo_50ISM_FMJ>
-						<Ammo_50ISM_Incendiary>Bullet_50ISM_Incendiary</Ammo_50ISM_Incendiary>
-						<Ammo_50ISM_HE>Bullet_50ISM_HE</Ammo_50ISM_HE>
-						<Ammo_50ISM_Sabot>Bullet_50ISM_Sabot</Ammo_50ISM_Sabot>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="Ammo50ISMBase" ParentName="SmallAmmoBase" Abstract="True">
-					<description>Large caliber guided rocket used by precision smartrifles and heavy emplacements.</description>
-					<statBases>
-						<Mass>0.036</Mass>
-						<Bulk>0.04</Bulk>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting</li>
-					</tradeTags>
-					<thingCategories>
-						<li>Ammo50ISM</li>
-					</thingCategories>
-					<stackLimit>5000</stackLimit>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo50ISMBase">
-					<defName>Ammo_50ISM_FMJ</defName>
-					<label>.50 ISM cartridge (FMJ)</label>
-					<graphicData>
-						<texPath>Things/Ammo/HighCaliber/FMJ</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.49</MarketValue>
-					</statBases>
-					<ammoClass>FullMetalJacket</ammoClass>
-					<cookOffProjectile>Bullet_50ISM_FMJ</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo50ISMBase">
-					<defName>Ammo_50ISM_Incendiary</defName>
-					<label>.50 ISM cartridge (AP-I)</label>
-					<graphicData>
-						<texPath>Things/Ammo/HighCaliber/Incendiary</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.62</MarketValue>
-						<Mass>0.112</Mass>
-					</statBases>
-					<ammoClass>IncendiaryAP</ammoClass>
-					<cookOffProjectile>Bullet_50ISM_Incendiary</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo50ISMBase">
-					<defName>Ammo_50ISM_HE</defName>
-					<label>.50 ISM cartridge (AP-HE)</label>
-					<graphicData>
-						<texPath>Things/Ammo/HighCaliber/HE</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.91</MarketValue>
-					</statBases>
-					<ammoClass>ExplosiveAP</ammoClass>
-					<cookOffProjectile>Bullet_50ISM_HE</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo50ISMBase">
-					<defName>Ammo_50ISM_Sabot</defName>
-					<label>.50 ISM cartridge (Sabot)</label>
-					<graphicData>
-						<texPath>Things/Ammo/HighCaliber/Sabot</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.59</MarketValue>
-						<Mass>0.029</Mass>
-					</statBases>
-					<ammoClass>Sabot</ammoClass>
-					<cookOffProjectile>Bullet_50ISM_Sabot</cookOffProjectile>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef Name="Base50ISMBullet" ParentName="BaseBulletCE" Abstract="true">
-					<graphicData>
-						<texPath>Projectiles/SSR_Rocket_Big</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bullet</damageDef>
-						<speed>180</speed> <!--180-->
-						<gravityFactor>150</gravityFactor> <!--210-->
-						<dropsCasings>true</dropsCasings>
-						<casingMoteDefname>Mote_FiftyISMShell</casingMoteDefname>
-						<casingFilthDefname>Filth_FiftyISM</casingFilthDefname>
-						<flyOverhead>false</flyOverhead>
-						<soundAmbient>SSR_Loop_Multi</soundAmbient>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base50ISMBullet">
-					<defName>Bullet_50ISM_FMJ</defName>
-					<label>.50 ISM bullet (FMJ)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>43</damageAmountBase>
-						<armorPenetrationSharp>15</armorPenetrationSharp>
-						<armorPenetrationBlunt>291.6</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base50ISMBullet">
-					<defName>Bullet_50ISM_Incendiary</defName>
-					<label>.50 ISM bullet (AP-I)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>31</damageAmountBase>
-						<armorPenetrationSharp>30</armorPenetrationSharp>
-						<armorPenetrationBlunt>291.6</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Flame_Secondary</def>
-								<amount>15</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base50ISMBullet">
-					<defName>Bullet_50ISM_HE</defName>
-					<label>.50 ISM bullet (AP-HE)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>31</damageAmountBase>
-						<armorPenetrationSharp>15</armorPenetrationSharp>
-						<armorPenetrationBlunt>291.6</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Bomb_Secondary</def>
-								<amount>23</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base50ISMBullet">
-					<defName>Bullet_50ISM_Sabot</defName>
-					<label>.50 ISM bullet (Sabot)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>37</damageAmountBase>
-						<speed>270</speed> <!--270-->
-						<armorPenetrationSharp>52</armorPenetrationSharp>
-						<armorPenetrationBlunt>528.52</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_50ISM_FMJ</defName>
-					<label>make .50 ISM (FMJ) cartridge x200</label>
-					<description>Craft 200 .50 ISM (FMJ) cartridges.</description>
-					<jobString>Making .50 ISM (FMJ) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>16</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>ComponentIndustrial</li>
-							<li>Prometheum</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_50ISM_FMJ>200</Ammo_50ISM_FMJ>
-					</products>
-					<workAmount>2800</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AdvancedAmmoRecipeBase">
-					<defName>MakeAmmo_50ISM_Incendiary</defName>
-					<label>make .50 ISM (AP-I) cartridge x200</label>
-					<description>Craft 200 .50 ISM (AP-I) cartridges.</description>
-					<jobString>Making .50 ISM (AP-I) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>16</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>6</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>ComponentIndustrial</li>
-							<li>Prometheum</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_50ISM_Incendiary>200</Ammo_50ISM_Incendiary>
-					</products>
-					<workAmount>5280</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AdvancedAmmoRecipeBase">
-					<defName>MakeAmmo_50ISM_HE</defName>
-					<label>make .50 ISM (AP-HE) cartridge x200</label>
-					<description>Craft 200 .50 ISM (HE) cartridges.</description>
-					<jobString>Making .50 ISM (HE) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>16</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>8</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-							<li>Prometheum</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_50ISM_HE>200</Ammo_50ISM_HE>
-					</products>
-					<workAmount>7200</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AdvancedAmmoRecipeBase">
-					<defName>MakeAmmo_50ISM_Sabot</defName>
-					<label>make .50 ISM (Sabot) cartridge x200</label>
-					<description>Craft 200 .50 ISM (Sabot) cartridges.</description>
-					<jobString>Making .50 ISM (Sabot) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>8</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Uranium</li>
-								</thingDefs>
-							</filter>
-							<count>6</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Chemfuel</li>
-								</thingDefs>
-							</filter>
-							<count>6</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Uranium</li>
-							<li>Chemfuel</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_50ISM_Sabot>200</Ammo_50ISM_Sabot>
-					</products>
-					<workAmount>4800</workAmount>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Urbworld Weaponry SDS/556mmISM.xml b/Patches/Urbworld Weaponry SDS/556mmISM.xml
deleted file mode 100644
index 630ebe491e..0000000000
--- a/Patches/Urbworld Weaponry SDS/556mmISM.xml	
+++ /dev/null
@@ -1,393 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Urbworld Weaponry SDS</li>
-		</mods>
-
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>Ammo556x31mmISM</defName>
-					<label>5.56x31mm indirect smart munition</label>
-					<parent>AmmoRifles</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_556x31mmISM</defName>
-					<label>5.56x31mm indirect smart munition</label>
-					<ammoTypes>
-						<Ammo_556x31mmISM_AP>Bullet_556x31mmISM_AP</Ammo_556x31mmISM_AP>
-						<Ammo_556x31mmISM_API>Bullet_556x31mmISM_API</Ammo_556x31mmISM_API>
-						<Ammo_556x31mmISM_HE>Bullet_556x31mmISM_HE</Ammo_556x31mmISM_HE>
-						<Ammo_556x31mmISM_Sabot>Bullet_556x31mmISM_Sabot</Ammo_556x31mmISM_Sabot>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="556x31mmISMBase" ParentName="AmmoBase" Abstract="True">
-					<description>5.56mm Indirect Smart Munition, based off of the 5.56mm NATO cartridge. This proprietary caseless ammunition was created for SDS' Sentinel smart machine gun.</description>
-					<statBases>
-						<Mass>0.011</Mass>
-						<Bulk>0.01</Bulk>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting</li>
-					</tradeTags>
-					<thingCategories>
-						<li>Ammo556x31mmISM</li>
-					</thingCategories>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="556x31mmISMBase">
-					<defName>Ammo_556x31mmISM_AP</defName>
-					<label>5.56x31mm ISM cartridge (AP)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/AP</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.18</MarketValue>
-					</statBases>
-					<ammoClass>ArmorPiercing</ammoClass>
-					<cookOffProjectile>Bullet_556x31mmISM_AP</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="556x31mmISMBase">
-					<defName>Ammo_556x31mmISM_API</defName>
-					<label>5.56x31mm ISM cartridge (AP-I)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/Incendiary</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.21</MarketValue>
-					</statBases>
-					<ammoClass>IncendiaryAP</ammoClass>
-					<cookOffProjectile>Bullet_556x31mmISM_API</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="556x31mmISMBase">
-					<defName>Ammo_556x31mmISM_HE</defName>
-					<label>5.56x31mm ISM cartridge (HE)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/HE</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.27</MarketValue>
-					</statBases>
-					<ammoClass>ExplosiveAP</ammoClass>
-					<cookOffProjectile>Bullet_556x31mmISM_HE</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="556x31mmISMBase">
-					<defName>Ammo_556x31mmISM_Sabot</defName>
-					<label>5.56x31mm ISM cartridge (Sabot)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/Sabot</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.19</MarketValue>
-					</statBases>
-					<ammoClass>Sabot</ammoClass>
-					<cookOffProjectile>Bullet_556x31mmISM_Sabot</cookOffProjectile>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef Name="Base556mmISMBullet" ParentName="BaseBulletCE" Abstract="True">
-					<graphicData>
-						<texPath>Projectiles/SSR_Rocket_Small</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bullet</damageDef>
-						<speed>166</speed> <!--old:95-->
-						<gravityFactor>250</gravityFactor> <!--old:75-->
-						<dropsCasings>false</dropsCasings>
-						<soundAmbient>SSR_Loop_Short</soundAmbient>
-					</projectile>
-				</ThingDef>
-
-				<!--ThingDefParentName="Base556mmISMBullet">
-		<defName>Bullet_556x31mmISM_FMJ</defName>
-		<label>5.56mm Indirect smart munition (FMJ)</label>
-		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<damageAmountBase>10</damageAmountBase>
-			<armorPenetrationSharp>7.5</armorPenetrationSharp>
-			<armorPenetrationBlunt>29.44</armorPenetrationBlunt>
-		</projectile>
-	</ThingDef-->
-
-				<ThingDef ParentName="Base556mmISMBullet">
-					<defName>Bullet_556x31mmISM_AP</defName>
-					<label>5.56mm Indirect smart munition (AP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>10</damageAmountBase>
-						<armorPenetrationSharp>15</armorPenetrationSharp>
-						<armorPenetrationBlunt>29.44</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base556mmISMBullet">
-					<defName>Bullet_556x31mmISM_API</defName>
-					<label>5.56mm Indirect smart munition (AP-I)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>10</damageAmountBase>
-						<armorPenetrationSharp>15</armorPenetrationSharp>
-						<armorPenetrationBlunt>29.44</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Flame_Secondary</def>
-								<amount>5</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base556mmISMBullet">
-					<defName>Bullet_556x31mmISM_HE</defName>
-					<label>5.56mm Indirect smart munition (HE)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>11</damageAmountBase>
-						<armorPenetrationSharp>7.5</armorPenetrationSharp>
-						<armorPenetrationBlunt>29.44</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Bomb_Secondary</def>
-								<amount>8</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base556mmISMBullet">
-					<defName>Bullet_556x31mmISM_Sabot</defName>
-					<label>5.56mm Indirect smart munition (Sabot)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>12</damageAmountBase>
-						<armorPenetrationSharp>26.25</armorPenetrationSharp>
-						<armorPenetrationBlunt>46.34</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_556x31mmISM_AP</defName>
-					<label>make 5.56x31mm ISM (AP) cartridge x500</label>
-					<description>Craft 500 5.56x31mm ISM (AP) rockets.</description>
-					<jobString>Making 5.56x31mm ISM (AP) rockets.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>12</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>ComponentIndustrial</li>
-							<li>Prometheum</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_556x31mmISM_AP>500</Ammo_556x31mmISM_AP>
-					</products>
-					<workAmount>2880</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_556x31mmISM_API</defName>
-					<label>make 5.56x31mm ISM (AP-I) cartridge x500</label>
-					<description>Craft 500 5.56x31mm ISM (AP-I) rockets.</description>
-					<jobString>Making 5.56x31mm ISM (AP-I) rockets.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>12</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>4</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>ComponentIndustrial</li>
-							<li>Prometheum</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_556x31mmISM_API>500</Ammo_556x31mmISM_API>
-					</products>
-					<workAmount>3840</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_556x31mmISM_HE</defName>
-					<label>make 5.56x31mm ISM (HE) cartridge x500</label>
-					<description>Craft 500 5.56x31mm ISM (HE) rockets.</description>
-					<jobString>Making 5.56x31mm ISM (HE) rockets.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>12</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>4</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-							<li>Prometheum</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_556x31mmISM_HE>500</Ammo_556x31mmISM_HE>
-					</products>
-					<workAmount>4800</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_556x31mmISM_Sabot</defName>
-					<label>make 5.56x31mm ISM (Sabot) cartridge x500</label>
-					<description>Craft 500 5.56x31mm ISM (Sabot) rockets.</description>
-					<jobString>Making 5.56x31mm ISM (Sabot) rockets.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>6</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Uranium</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Chemfuel</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>Chemfuel</li>
-							<li>ComponentIndustrial</li>
-							<li>Prometheum</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_556x31mmISM_Sabot>500</Ammo_556x31mmISM_Sabot>
-					</products>
-					<workAmount>3000</workAmount>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Urbworld Weaponry SDS/9x35mmSSR.xml b/Patches/Urbworld Weaponry SDS/9x35mmSSR.xml
deleted file mode 100644
index b7fe6941c0..0000000000
--- a/Patches/Urbworld Weaponry SDS/9x35mmSSR.xml	
+++ /dev/null
@@ -1,523 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Urbworld Weaponry SDS</li>
-		</mods>
-
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>Ammo9x35mmSSR</defName>
-					<label>9x35mm semi smart rocket</label>
-					<parent>AmmoRifles</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_9x35mmSSR</defName>
-					<label>9x35mmSSR</label>
-					<ammoTypes>
-						<Ammo_9x35mmSSR_FMJ>Bullet_9x35mmSSR_FMJ</Ammo_9x35mmSSR_FMJ>
-						<Ammo_9x35mmSSR_AP>Bullet_9x35mmSSR_AP</Ammo_9x35mmSSR_AP>
-						<Ammo_9x35mmSSR_HP>Bullet_9x35mmSSR_HP</Ammo_9x35mmSSR_HP>
-						<Ammo_9x35mmSSR_Incendiary>Bullet_9x35mmSSR_Incendiary</Ammo_9x35mmSSR_Incendiary>
-						<Ammo_9x35mmSSR_HE>Bullet_9x35mmSSR_HE</Ammo_9x35mmSSR_HE>
-						<Ammo_9x35mmSSR_Sabot>Bullet_9x35mmSSR_Sabot</Ammo_9x35mmSSR_Sabot>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="9x35mmSSRBase" ParentName="SmallAmmoBase" Abstract="True">
-					<description>Caseless semi-guided rocket used by early smartgun designs. Instead of actively tracking a target each bullet is programmed with flight data given to it by the weapon and/or user agumentations.</description>
-					<statBases>
-						<Mass>0.026</Mass>
-						<Bulk>0.02</Bulk>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting</li>
-					</tradeTags>
-					<thingCategories>
-						<li>Ammo9x35mmSSR</li>
-					</thingCategories>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="9x35mmSSRBase">
-					<defName>Ammo_9x35mmSSR_FMJ</defName>
-					<label>9x35mmSSR cartridge (FMJ)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/FMJ</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.24</MarketValue>
-					</statBases>
-					<ammoClass>FullMetalJacket</ammoClass>
-					<cookOffProjectile>Bullet_9x35mmSSR_FMJ</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="9x35mmSSRBase">
-					<defName>Ammo_9x35mmSSR_AP</defName>
-					<label>9x35mmSSR cartridge (AP)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/AP</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.24</MarketValue>
-					</statBases>
-					<ammoClass>ArmorPiercing</ammoClass>
-					<cookOffProjectile>Bullet_9x35mmSSR_AP</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="9x35mmSSRBase">
-					<defName>Ammo_9x35mmSSR_HP</defName>
-					<label>9x35mmSSR cartridge (HP)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/HP</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.24</MarketValue>
-					</statBases>
-					<ammoClass>HollowPoint</ammoClass>
-					<cookOffProjectile>Bullet_9x35mmSSR_HP</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="9x35mmSSRBase">
-					<defName>Ammo_9x35mmSSR_Incendiary</defName>
-					<label>9x35mmSSR cartridge (AP-I)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/Incendiary</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.3</MarketValue>
-					</statBases>
-					<ammoClass>IncendiaryAP</ammoClass>
-					<cookOffProjectile>Bullet_9x35mmSSR_Incendiary</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="9x35mmSSRBase">
-					<defName>Ammo_9x35mmSSR_HE</defName>
-					<label>9x35mmSSR cartridge (HE)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/HE</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.45</MarketValue>
-					</statBases>
-					<ammoClass>ExplosiveAP</ammoClass>
-					<cookOffProjectile>Bullet_9x35mmSSR_HE</cookOffProjectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="9x35mmSSRBase">
-					<defName>Ammo_9x35mmSSR_Sabot</defName>
-					<label>9x35mmSSR cartridge (Sabot)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Rifle/Sabot</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.26</MarketValue>
-						<Mass>0.018</Mass>
-					</statBases>
-					<ammoClass>Sabot</ammoClass>
-					<cookOffProjectile>Bullet_9x35mmSSR_Sabot</cookOffProjectile>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef Name="Base9x35mmSSRBullet" ParentName="BaseBulletCE" Abstract="True">
-					<graphicData>
-						<texPath>Projectiles/SSR_Rocket_Small</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Bullet</damageDef>
-						<speed>84</speed>
-						<gravityFactor>50</gravityFactor>
-						<dropsCasings>false</dropsCasings>
-						<soundAmbient>SSR_Loop_Short</soundAmbient>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base9x35mmSSRBullet">
-					<defName>Bullet_9x35mmSSR_FMJ</defName>
-					<label>9x35mmSSR (FMJ)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>11</damageAmountBase>
-						<armorPenetrationSharp>8</armorPenetrationSharp>
-						<armorPenetrationBlunt>35.28</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base9x35mmSSRBullet">
-					<defName>Bullet_9x35mmSSR_AP</defName>
-					<label>9x35mmSSR (AP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>9</damageAmountBase>
-						<armorPenetrationSharp>16</armorPenetrationSharp>
-						<armorPenetrationBlunt>35.28</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base9x35mmSSRBullet">
-					<defName>Bullet_9x35mmSSR_HP</defName>
-					<label>9x35mmSSR (HP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>21</damageAmountBase>
-						<armorPenetrationSharp>4</armorPenetrationSharp>
-						<armorPenetrationBlunt>35.28</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base9x35mmSSRBullet">
-					<defName>Bullet_9x35mmSSR_Incendiary</defName>
-					<label>9x35mmSSR (AP-I)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>11</damageAmountBase>
-						<armorPenetrationSharp>16</armorPenetrationSharp>
-						<armorPenetrationBlunt>35.28</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Flame_Secondary</def>
-								<amount>7</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base9x35mmSSRBullet">
-					<defName>Bullet_9x35mmSSR_HE</defName>
-					<label>9x35mmSSR (HE)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>19</damageAmountBase>
-						<armorPenetrationSharp>8</armorPenetrationSharp>
-						<armorPenetrationBlunt>47.62</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Bomb_Secondary</def>
-								<amount>11</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base9x35mmSSRBullet">
-					<defName>Bullet_9x35mmSSR_Sabot</defName>
-					<label>9x35mmSSR (Sabot)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>15</damageAmountBase>
-						<armorPenetrationSharp>28</armorPenetrationSharp>
-						<armorPenetrationBlunt>47.62</armorPenetrationBlunt>
-						<speed>126</speed>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_9x35mmSSR_FMJ</defName>
-					<label>make 9x35mmSSR (FMJ) cartridge x500</label>
-					<description>Craft 500 9x35mmSSR (FMJ) rockets.</description>
-					<jobString>Making 9x35mmSSR (FMJ) rockets.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>26</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>ComponentIndustrial</li>
-							<li>Prometheum</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_9x35mmSSR_FMJ>500</Ammo_9x35mmSSR_FMJ>
-					</products>
-					<workAmount>3800</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_9x35mmSSR_AP</defName>
-					<label>make 9x35mmSSR (AP) cartridge x500</label>
-					<description>Craft 500 9x35mmSSR (AP) rockets.</description>
-					<jobString>Making 9x35mmSSR (AP) rockets.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>26</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>ComponentIndustrial</li>
-							<li>Prometheum</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_9x35mmSSR_AP>500</Ammo_9x35mmSSR_AP>
-					</products>
-					<workAmount>4560</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AmmoRecipeBase">
-					<defName>MakeAmmo_9x35mmSSR_HP</defName>
-					<label>make 9x35mmSSR (HP) cartridge x500</label>
-					<description>Craft 500 9x35mmSSR (HP) rockets.</description>
-					<jobString>Making 9x35mmSSR (HP) rockets.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>26</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>ComponentIndustrial</li>
-							<li>Prometheum</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_9x35mmSSR_HP>500</Ammo_9x35mmSSR_HP>
-					</products>
-					<workAmount>3800</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AdvancedAmmoRecipeBase">
-					<defName>MakeAmmo_9x35mmSSR_Incendiary</defName>
-					<label>make 9x35mmSSR (AP-I) cartridge x500</label>
-					<description>Craft 500 9x35mmSSR (AP-I) rockets.</description>
-					<jobString>Making 9x35mmSSR (AP-I) rockets.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>26</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>7</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>ComponentIndustrial</li>
-							<li>Prometheum</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_9x35mmSSR_Incendiary>500</Ammo_9x35mmSSR_Incendiary>
-					</products>
-					<workAmount>6960</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AdvancedAmmoRecipeBase">
-					<defName>MakeAmmo_9x35mmSSR_HE</defName>
-					<label>make 9x35mmSSR (HE) cartridge x500</label>
-					<description>Craft 500 9x35mmSSR (HE) rockets.</description>
-					<jobString>Making 9x35mmSSR (HE) rockets.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>26</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>10</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-							<li>Prometheum</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_9x35mmSSR_HE>500</Ammo_9x35mmSSR_HE>
-					</products>
-					<workAmount>9360</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="AdvancedAmmoRecipeBase">
-					<defName>MakeAmmo_9x35mmSSR_Sabot</defName>
-					<label>make 9x35mmSSR (Sabot) cartridge x500</label>
-					<description>Craft 500 9x35mmSSR (Sabot) rockets.</description>
-					<jobString>Making 9x35mmSSR (Sabot) rockets.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>6</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Uranium</li>
-								</thingDefs>
-							</filter>
-							<count>6</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Chemfuel</li>
-								</thingDefs>
-							</filter>
-							<count>6</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Uranium</li>
-							<li>Chemfuel</li>
-							<li>ComponentIndustrial</li>
-							<li>Prometheum</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_9x35mmSSR_Sabot>500</Ammo_9x35mmSSR_Sabot>
-					</products>
-					<workAmount>5400</workAmount>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Urbworld Weaponry SDS/CE-UWSDS.xml b/Patches/Urbworld Weaponry SDS/CE-UWSDS.xml
deleted file mode 100644
index 8284898187..0000000000
--- a/Patches/Urbworld Weaponry SDS/CE-UWSDS.xml	
+++ /dev/null
@@ -1,532 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Urbworld Weaponry SDS</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Reload sounds, Night vision -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_SemiSmart_Carbine"]/soundInteract</xpath>
-					<value>
-						<soundInteract>SSR_Warden_Int</soundInteract>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Gun_SemiSmart_Pistol"
-						or defName="Gun_SemiSmart_SMG"
-						or defName="Gun_SemiSmart_Carbine"
-						]/equippedStatOffsets
-					</xpath>
-					<value>
-						<NightVisionEfficiency_Weapon>0.75</NightVisionEfficiency_Weapon>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Gun_SemiSmart_LMG"
-						or defName="Gun_SemiSmart_Rifle"
-						or defName="Gun_SemiSmart_Sniper"
-						or defName="Gun_SemiSmart_BattleRifle"
-						]/equippedStatOffsets
-					</xpath>
-					<value>
-						<NightVisionEfficiency_Weapon>0.9</NightVisionEfficiency_Weapon>
-					</value>
-				</li>
-
-				<!-- ==== Tools ==== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[@Name="SSR_Basegun"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.5</cooldownTime>
-								<chanceFactor>1.65</chanceFactor>
-								<armorPenetrationBlunt>2.27</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.35</cooldownTime>
-								<armorPenetrationBlunt>1.15</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>2.27</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>/Defs/ThingDef[defName="Gun_SemiSmart_Pistol"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.5</cooldownTime>
-								<chanceFactor>1.65</chanceFactor>
-								<armorPenetrationBlunt>2.27</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.35</cooldownTime>
-								<armorPenetrationBlunt>1.15</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ==== Guardian ==== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SemiSmart_Pistol</defName>
-					<statBases>
-						<WorkToMake>9000</WorkToMake>
-						<SightsEfficiency>1.86</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>0.96</SwayFactor>
-						<Bulk>1.96</Bulk>
-						<Mass>0.96</Mass>
-						<RangedWeapon_Cooldown>0.51</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>20</Steel>
-						<Chemfuel>5</Chemfuel>
-						<SimpleBC>1</SimpleBC>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_18mmSmart_FMJ</defaultProjectile>
-						<warmupTime>0.735</warmupTime>
-						<range>21</range> <!--+5-->
-						<soundCast>SSR_Small_Fire</soundCast>
-						<soundAiming>SSR_Basic_Aim_Short</soundAiming>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>4</muzzleFlashScale>
-						<requireLineOfSight>false</requireLineOfSight>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>4</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_18mmSmart</ammoSet>
-					</AmmoUser>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ==== Vanguard ==== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SemiSmart_SMG</defName>
-					<statBases>
-						<WorkToMake>29000</WorkToMake>
-						<SightsEfficiency>1.86</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>2.05</SwayFactor>
-						<Bulk>4.46</Bulk>
-						<Mass>3.6</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-						<Chemfuel>5</Chemfuel>
-						<SimpleBC>1</SimpleBC>
-					</costList>
-					<Properties>
-						<recoilAmount>2.94</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_18mmSmart_FMJ</defaultProjectile>
-						<burstShotCount>4</burstShotCount>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<warmupTime>0.735</warmupTime>
-						<soundCast>SSR_Small_Fire</soundCast>
-						<soundAiming>SSR_Basic_Aim_Short</soundAiming>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<range>30</range> <!--+5-->
-						<requireLineOfSight>false</requireLineOfSight>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_18mmSmart</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ==== Warden ==== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SemiSmart_Carbine</defName>
-					<statBases>
-						<WorkToMake>32000</WorkToMake>
-						<SightsEfficiency>1.86</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>2.36</SwayFactor>
-						<Bulk>4.19</Bulk>
-						<Mass>2.8</Mass>
-						<RangedWeapon_Cooldown>1.01</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-						<Chemfuel>10</Chemfuel>
-						<SimpleBC>1</SimpleBC>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_18mmSmart_FMJ</defaultProjectile>
-						<warmupTime>0.735</warmupTime>
-						<range>45</range> <!--+5-->
-						<soundCast>SSR_Warden_Fire</soundCast>
-						<soundAiming>SSR_Basic_Aim</soundAiming>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>4</muzzleFlashScale>
-						<requireLineOfSight>false</requireLineOfSight>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>4</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_18mmSmart</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ==== Watchman ==== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SemiSmart_Rifle</defName>
-					<statBases>
-						<WorkToMake>62500</WorkToMake>
-						<SightsEfficiency>2.78</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>1.36</SwayFactor>
-						<Bulk>7.1</Bulk>
-						<Mass>3.1</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>8</ComponentIndustrial>
-						<Plasteel>25</Plasteel>
-						<Chemfuel>10</Chemfuel>
-						<AdvancedBC>1</AdvancedBC>
-					</costList>
-					<Properties>
-						<recoilAmount>2.33</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x35mmSSR_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>1.75</warmupTime>
-						<range>58</range> <!--+10-->
-						<soundCast>SSR_Watchman_Fire</soundCast>
-						<soundAiming>SSR_Adv_Aim</soundAiming>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>5</muzzleFlashScale>
-						<requireLineOfSight>false</requireLineOfSight>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>25</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x35mmSSR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ==== Enforcer ==== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SemiSmart_BattleRifle</defName>
-					<statBases>
-						<WorkToMake>52000</WorkToMake>
-						<SightsEfficiency>2.16</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.3</SwayFactor>
-						<Bulk>6.35</Bulk>
-						<Mass>3.8</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>8</ComponentIndustrial>
-						<Plasteel>25</Plasteel>
-						<Chemfuel>10</Chemfuel>
-						<AdvancedBC>1</AdvancedBC>
-					</costList>
-					<Properties>
-						<recoilAmount>2.85</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_18mmSmart_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>1.235</warmupTime>
-						<range>58</range> <!--+10-->
-						<soundCast>SSR_Enforcer_Fire</soundCast>
-						<soundAiming>SSR_Adv_Aim</soundAiming>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>4</muzzleFlashScale>
-						<requireLineOfSight>false</requireLineOfSight>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>16</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_18mmSmart</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ==== Sentinel ==== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SemiSmart_LMG</defName>
-					<statBases>
-						<WorkToMake>65000</WorkToMake>
-						<SightsEfficiency>2.78</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.16</SwayFactor>
-						<Bulk>8.3</Bulk>
-						<Mass>6.6</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>50</Steel>
-						<ComponentIndustrial>9</ComponentIndustrial>
-						<AdvancedBC>1</AdvancedBC>
-						<Plasteel>30</Plasteel>
-						<Chemfuel>15</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>1.05</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x31mmISM_AP</defaultProjectile>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<warmupTime>1.95</warmupTime>
-						<range>58</range> <!--+10-->
-						<soundCast>SSR_Sentinel_Fire</soundCast>
-						<soundAiming>SSR_Adv_Aim</soundAiming>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>5</muzzleFlashScale>
-						<circularError>0</circularError>
-						<indirectFirePenalty>0.3</indirectFirePenalty>
-						<requireLineOfSight>false</requireLineOfSight>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_556x31mmISM</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_MachineGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ==== Panopticon ==== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SemiSmart_Sniper</defName>
-					<statBases>
-						<WorkToMake>60000</WorkToMake>
-						<SightsEfficiency>2.78</SightsEfficiency>
-						<ShotSpread>0.02</ShotSpread>
-						<SwayFactor>1.82</SwayFactor>
-						<Bulk>9.2</Bulk>
-						<Mass>14.8</Mass>
-						<RangedWeapon_Cooldown>0.57</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>75</Steel>
-						<Plasteel>35</Plasteel>
-						<ComponentIndustrial>7</ComponentIndustrial>
-						<AdvancedBC>1</AdvancedBC>
-						<Chemfuel>20</Chemfuel>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50ISM_FMJ</defaultProjectile>
-						<warmupTime>1.95</warmupTime>
-						<range>96</range> <!--+10-->
-						<soundCast>SSR_Panopticon_Fire</soundCast>
-						<soundAiming>SSR_Adv_Aim</soundAiming>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<circularError>0</circularError>
-						<indirectFirePenalty>0</indirectFirePenalty>
-						<requireLineOfSight>false</requireLineOfSight>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_50ISM</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Gun_SemiSmart_Barricade"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<!-- ==== Barricade ==== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_SemiSmart_Barricade</defName>
-					<statBases>
-						<WorkToMake>80500</WorkToMake>
-						<SightsEfficiency>2.78</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>3.46</SwayFactor>
-						<Bulk>8.89</Bulk>
-						<Mass>20</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>90</Steel>
-						<Plasteel>40</Plasteel>
-						<AdvancedBC>1</AdvancedBC>
-						<Chemfuel>25</Chemfuel>
-						<ComponentIndustrial>11</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>0.99</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x35mmSSR_FMJ</defaultProjectile>
-						<burstShotCount>50</burstShotCount>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<warmupTime>2.75</warmupTime>
-						<range>72</range> <!--+10-->
-						<soundCast>SSR_Barricade_Fire</soundCast>
-						<soundAiming>SSR_Adv_Aim</soundAiming>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>5</muzzleFlashScale>
-						<circularError>0</circularError>
-						<indirectFirePenalty>0.5</indirectFirePenalty>
-						<requireLineOfSight>false</requireLineOfSight>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>200</magazineSize>
-						<reloadTime>9.2</reloadTime>
-						<ammoSet>AmmoSet_9x35mmSSR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>25</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Suppressive</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch> 
\ No newline at end of file
diff --git a/Patches/Useless Clothes/ThingDefs_Apparel.xml b/Patches/Useless Clothes/ThingDefs_Apparel.xml
deleted file mode 100644
index 92774578ab..0000000000
--- a/Patches/Useless Clothes/ThingDefs_Apparel.xml	
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Useless clothes</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="woola" or defName="woolschoolpants" or defName="woolschoolskirt" or defName="woolshirtpants" or defName="wooluniform"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- == Useless nooses == -->
-				<!-- statBases -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="woolnecktie" or defName="woolbow"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>0.1</Bulk>
-						<StuffEffectMultiplierArmor>0.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- == useless SuitJacket == -->
-				<!-- statBases -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="woolsuitpants"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				<!-- == useless school uniform == -->
-				<!-- statBases -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="woolschooluniform_Thin"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Ushankas Glitterworld Uprising/Hediff_Glitter.xml b/Patches/Ushankas Glitterworld Uprising/Hediff_Glitter.xml
deleted file mode 100644
index 6dd3a67689..0000000000
--- a/Patches/Ushankas Glitterworld Uprising/Hediff_Glitter.xml	
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Ushankas Glitterworld Uprising</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-
-			<operations>
-
-				<!-- ===== Glitterworld Golden Skin ===== -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/HediffDef[defName="USH_InstalledGoldenSkinReplacement"]/stages/li/capMods</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="USH_InstalledGoldenSkinReplacement"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="USH_InstalledGoldenSkinReplacement"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="USH_InstalledGoldenSkinReplacement"]/stages/li/statOffsets</xpath>
-					<value>
-						<MoveSpeed>-0.15</MoveSpeed>
-						<MeleeDodgeChance>-0.01</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<!-- ===== Glitterworld Plasteel Skin ===== -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/HediffDef[defName="USH_InstalledPlasteelSkinReplacement"]/stages/li/capMods</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="USH_InstalledPlasteelSkinReplacement"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="USH_InstalledPlasteelSkinReplacement"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>5.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="USH_InstalledPlasteelSkinReplacement"]/stages/li/statOffsets</xpath>
-					<value>
-						<MoveSpeed>0.10</MoveSpeed>
-						<MeleeDodgeChance>0.01</MeleeDodgeChance>
-					</value>
-				</li>
-
-			</operations>
-
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/VFAS/HediffDefs/BionicArm.xml b/Patches/VFAS/HediffDefs/BionicArm.xml
deleted file mode 100644
index 457db17fde..0000000000
--- a/Patches/VFAS/HediffDefs/BionicArm.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[XND] Vanilla-Friendly Animal Surgery (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- tiny -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BionicAnimalArmTiny"]/comps/li/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.25</cooldownTime>
-								<armorPenetration>0.071</armorPenetration>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- small -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BionicAnimalArmSmall"]/comps/li/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.45</cooldownTime>
-								<armorPenetration>0.087</armorPenetration>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- medium -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BionicAnimalArmMedium"]/comps/li/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.65</cooldownTime>
-								<armorPenetration>0.125</armorPenetration>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- large -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BionicAnimalArmLarge"]/comps/li/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.85</cooldownTime>
-								<armorPenetration>0.163</armorPenetration>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- huge -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BionicAnimalArmHuge"]/comps/li/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>2.05</cooldownTime>
-								<armorPenetration>0.207</armorPenetration>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/VFAS/HediffDefs/BionicLeg.xml b/Patches/VFAS/HediffDefs/BionicLeg.xml
deleted file mode 100644
index bbf654ffbc..0000000000
--- a/Patches/VFAS/HediffDefs/BionicLeg.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[XND] Vanilla-Friendly Animal Surgery (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- tiny -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BionicAnimalLegTinyFront"]/comps/li/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>leg</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetration>0.107</armorPenetration>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- small -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BionicAnimalLegSmallFront"]/comps/li/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>leg</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.65</cooldownTime>
-								<armorPenetration>0.143</armorPenetration>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- medium -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BionicAnimalLegMediumFront"]/comps/li/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>leg</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.65</cooldownTime>
-								<armorPenetration>0.169</armorPenetration>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- large -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BionicAnimalLegLargeFront"]/comps/li/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>leg</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.85</cooldownTime>
-								<armorPenetration>0.211</armorPenetration>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- huge -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BionicAnimalLegHugeFront"]/comps//li/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>leg</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>2.05</cooldownTime>
-								<armorPenetration>0.267</armorPenetration>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/VFAS/HediffDefs/Denture.xml b/Patches/VFAS/HediffDefs/Denture.xml
deleted file mode 100644
index 1bea9b4a4a..0000000000
--- a/Patches/VFAS/HediffDefs/Denture.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[XND] Vanilla-Friendly Animal Surgery (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- tiny -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AnimalDentureTiny"]/comps/li/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.65</cooldownTime>
-								<armorPenetration>0.106</armorPenetration>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- small -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AnimalDentureSmall"]/comps/li/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.75</cooldownTime>
-								<armorPenetration>0.128</armorPenetration>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- medium -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AnimalDentureMedium"]/comps/li/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.85</cooldownTime>
-								<armorPenetration>0.15</armorPenetration>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- large -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AnimalDentureLarge"]/comps/li/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.95</cooldownTime>
-								<armorPenetration>0.192</armorPenetration>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- huge -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="AnimalDentureHuge"]/comps/li/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>2.05</cooldownTime>
-								<armorPenetration>0.233</armorPenetration>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/VFAS/HediffDefs/SimpleProstheticArm.xml b/Patches/VFAS/HediffDefs/SimpleProstheticArm.xml
deleted file mode 100644
index 203af4f817..0000000000
--- a/Patches/VFAS/HediffDefs/SimpleProstheticArm.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[XND] Vanilla-Friendly Animal Surgery (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- tiny -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="SimpleProstheticAnimalArmTiny"]/comps/li/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3.6</power>
-								<cooldownTime>1.25</cooldownTime>
-								<armorPenetration>0.68</armorPenetration>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- small -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="SimpleProstheticAnimalArmSmall"]/comps/li/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5.4</power>
-								<cooldownTime>1.45</cooldownTime>
-								<armorPenetration>0.082</armorPenetration>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- medium -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="SimpleProstheticAnimalArmMedium"]/comps/li/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.65</cooldownTime>
-								<armorPenetration>0.118</armorPenetration>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- large -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="SimpleProstheticAnimalArmLarge"]/comps/li/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14.4</power>
-								<cooldownTime>1.85</cooldownTime>
-								<armorPenetration>0.151</armorPenetration>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- huge -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="SimpleProstheticAnimalArmHuge"]/comps/li/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>2.05</cooldownTime>
-								<armorPenetration>0.192</armorPenetration>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/VFAS/HediffDefs/SimpleProstheticLeg.xml b/Patches/VFAS/HediffDefs/SimpleProstheticLeg.xml
deleted file mode 100644
index 83f95b1efe..0000000000
--- a/Patches/VFAS/HediffDefs/SimpleProstheticLeg.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>[XND] Vanilla-Friendly Animal Surgery (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- tiny -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="SimpleProstheticAnimalLegTinyFront"]/comps/li/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>leg</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>5.4</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetration>0.081</armorPenetration>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- small -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="SimpleProstheticAnimalLegSmallFront"]/comps/li/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>leg</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.65</cooldownTime>
-								<armorPenetration>0.107</armorPenetration>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- medium -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="SimpleProstheticAnimalLegMediumFront"]/comps/li/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>leg</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.65</cooldownTime>
-								<armorPenetration>0.128</armorPenetration>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- large -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="SimpleProstheticAnimalLegLargeFront"]/comps/li/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>leg</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>16.2</power>
-								<cooldownTime>1.85</cooldownTime>
-								<armorPenetration>0.196</armorPenetration>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- huge -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="SimpleProstheticAnimalLegHugeFront"]/comps/li/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>leg</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>2.05</cooldownTime>
-								<armorPenetration>0.251</armorPenetration>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/VFE - Mechanoids Drones/Race_Machines.xml b/Patches/VFE - Mechanoids Drones/Race_Machines.xml
deleted file mode 100644
index 3294c6dedd..0000000000
--- a/Patches/VFE - Mechanoids Drones/Race_Machines.xml	
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>VFE - Mechanoids : Drones</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFEMA_Mechanoids_Farmer" or defName="VFEMA_Mechanoids_Kitchen"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEMA_Mechanoids_Farmer" or defName="VFEMA_Mechanoids_Kitchen"]/statBases</xpath>
-					<value>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-						<MeleeDodgeChance>0</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEMA_Mechanoids_Farmer" or defName="VFEMA_Mechanoids_Kitchen"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEMA_Mechanoids_Farmer" or defName="VFEMA_Mechanoids_Kitchen"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEMA_Mechanoids_Farmer" or defName="VFEMA_Mechanoids_Kitchen"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.825</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/VFE - Mechanoids Unofficial Add-On/Apparel_Mechanite.xml b/Patches/VFE - Mechanoids Unofficial Add-On/Apparel_Mechanite.xml
deleted file mode 100644
index bb3c58a766..0000000000
--- a/Patches/VFE - Mechanoids Unofficial Add-On/Apparel_Mechanite.xml	
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>VFE - Mechanoids : Unoffical Add-On</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MAO_MechaniteUnderArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>7</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MAO_MechaniteUnderArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>10</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/VFE - Mechanoids Unofficial Add-On/Race_Machines.xml b/Patches/VFE - Mechanoids Unofficial Add-On/Race_Machines.xml
deleted file mode 100644
index 1ba63f431a..0000000000
--- a/Patches/VFE - Mechanoids Unofficial Add-On/Race_Machines.xml	
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>VFE - Mechanoids : Unoffical Add-On</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="MAO_Mechanoids_Mender" or defName="MAO_Mechanoids_Assembler"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MAO_Mechanoids_Mender" or defName="MAO_Mechanoids_Assembler"]/statBases</xpath>
-					<value>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-						<MeleeDodgeChance>0</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MAO_Mechanoids_Mender" or defName="MAO_Mechanoids_Assembler"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MAO_Mechanoids_Mender" or defName="MAO_Mechanoids_Assembler"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MAO_Mechanoids_Mender" or defName="MAO_Mechanoids_Assembler"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.825</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/VGP Drinks/VGP_Drinks_CE_Patch.xml b/Patches/VGP Drinks/VGP_Drinks_CE_Patch.xml
deleted file mode 100644
index 163dae8a9f..0000000000
--- a/Patches/VGP Drinks/VGP_Drinks_CE_Patch.xml	
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>VGP Garden Drinks UF</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ====================== Liquor Closet ===================== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="LiquorCloset"]/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>neck</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>0.255</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/VGP Garden Fabrics/VGP Garden Fabrics.xml b/Patches/VGP Garden Fabrics/VGP Garden Fabrics.xml
deleted file mode 100644
index 1c18c3a55e..0000000000
--- a/Patches/VGP Garden Fabrics/VGP Garden Fabrics.xml	
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>VGP Garden Fabrics</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- LinenCloth -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Flaxcloth"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.013</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Flaxcloth"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.019</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Flaxcloth"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.044</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<!-- Hemp -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="HempCloth"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.012</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="HempCloth"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.023</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="HempCloth"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.044</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<!-- Blended Wool -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VG_BlendedWool"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.01</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VG_BlendedWool"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.022</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VG_BlendedWool"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.044</StuffPower_Armor_Heat>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/VRE Android Factions/Factions_Misc.xml b/Patches/VRE Android Factions/Factions_Misc.xml
deleted file mode 100644
index 7c9e5a6e51..0000000000
--- a/Patches/VRE Android Factions/Factions_Misc.xml	
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>VRE Android Factions</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="R_AndroidTrader"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Ammo</tradeTag>
-							<countRange>
-								<min>200</min>
-								<max>500</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>2</min>
-								<max>4</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_MediumAmmo</tradeTag>
-							<countRange>
-								<min>20</min>
-								<max>50</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>2</min>
-								<max>6</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_HeavyAmmo</tradeTag>
-							<countRange>
-								<min>5</min>
-								<max>10</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>2</min>
-								<max>4</max>
-							</thingDefCountRange>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vampire, Demons, and the Undead/HediffDefs/VU_Hediff_Patch.xml b/Patches/Vampire, Demons, and the Undead/HediffDefs/VU_Hediff_Patch.xml
deleted file mode 100644
index 566daa5ebd..0000000000
--- a/Patches/Vampire, Demons, and the Undead/HediffDefs/VU_Hediff_Patch.xml	
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vampires, Demons, and the Undead</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="VU_DraculTeeth"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>vampire bite</label>
-								<capacities>
-									<li>VU_DraculBiteCap</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2.0</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>12</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.0</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="VU_WerewolfFangs"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>werewolf bite</label>
-								<capacities>
-									<li>VU_WerewolfBiteCap</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2.0</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>12</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.0</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded - Caves/ThingDefs_Misc/Caves_Projectiles.xml b/Patches/Vanilla Animals Expanded - Caves/ThingDefs_Misc/Caves_Projectiles.xml
deleted file mode 100644
index 3926482b91..0000000000
--- a/Patches/Vanilla Animals Expanded - Caves/ThingDefs_Misc/Caves_Projectiles.xml	
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded — Caves</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ============== Changing Projectile's thingClass to CE ones ================ -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAECaves_RangedSilk"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<!-- ============== Adding 'Standard' AimingAccuracy node to creatures' that use ranged attack statBases. =============== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAECaves_AncientGiantSpider"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.6</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAECaves_AncientGiantSpider"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>VAECaves_RangedSilk</defaultProjectile>
-								<warmupTime>3</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<minRange>2</minRange>
-								<range>25</range>
-								<soundCast>VAE_Throw</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>ranged silk</label>
-								<commonality>0.8</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="VAE_OpenWound"]/injuryProps/painPerSeverity</xpath>
-					<value>
-						<painPerSeverity>0.0175</painPerSeverity>
-					</value>
-				</li>
-
-				<!-- =============== Now defining Projectiles in CE Procedure(Please do not remove sharp penetration value >:(   ) ============= -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAECaves_RangedSilk"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<explosionRadius>3</explosionRadius>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<damageDef>VAE_CocoonRanged</damageDef>
-							<damageAmountBase>5</damageAmountBase>
-							<speed>15</speed>
-							<armorPenetrationSharp>20</armorPenetrationSharp>
-							<armorPenetrationBlunt>60</armorPenetrationBlunt>
-							<soundExplode>Hive_Spawn</soundExplode>
-							<soundAmbient>MortarRound_Ambient</soundAmbient>
-							<postExplosionSpawnThingDef>VAECaves_Filth_Webs</postExplosionSpawnThingDef>
-							<postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
-							<postExplosionSpawnChance>1</postExplosionSpawnChance>
-						</projectile>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded - Caves/ThingDefs_Races/Caves_Animals.xml b/Patches/Vanilla Animals Expanded - Caves/ThingDefs_Races/Caves_Animals.xml
deleted file mode 100644
index 55849c1865..0000000000
--- a/Patches/Vanilla Animals Expanded - Caves/ThingDefs_Races/Caves_Animals.xml	
+++ /dev/null
@@ -1,972 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded — Caves</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Cave Bear === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VAECaves_CaveBear"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAECaves_CaveBear"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.11</MeleeDodgeChance>
-						<MeleeCritChance>0.35</MeleeCritChance>
-						<MeleeParryChance>0.21</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAECaves_CaveBear"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.65</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAECaves_CaveBear"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAECaves_CaveBear"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>1.48</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>1.48</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>39</power>
-								<cooldownTime>1.95</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2.44</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VAECaves_CaveBear"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VAECaves_CaveBear"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAECaves_CaveBear"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1400</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Cave Crawler === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VAECaves_CaveCrawler"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAECaves_CaveCrawler"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>8</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAECaves_CaveCrawler"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAECaves_CaveCrawler"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.4</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAECaves_CaveCrawler"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>VAE_PlagueBite</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.28</cooldownTime>
-								<armorPenetrationSharp>5</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>VAE_PlagueBite</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.28</cooldownTime>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>16</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<chanceFactor>0.3</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VAECaves_CaveCrawler"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VAECaves_CaveCrawler"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAECaves_CaveCrawler"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1125</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Giant Spider Leg Armor === -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VAECaves_GiantSpiderHatchling" or defName="VAECaves_GiantSpider" or defName="VAECaves_AncientGiantSpider"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<useStatic>false</useStatic>
-									<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
-									<parts>
-										<li>InsectLeg</li>
-									</parts>
-								</li>
-								<li>
-									<useStatic>false</useStatic>
-									<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
-									<parts>
-										<li>InsectLeg</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAECaves_GiantSpiderHatchling" or defName="VAECaves_GiantSpider" or defName="VAECaves_AncientGiantSpider"]/statBases</xpath>
-					<value>
-						<PartialArmorBody>0</PartialArmorBody>
-					</value>
-				</li>
-
-				<!-- === Giant Spider Hatchling === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VAECaves_GiantSpiderHatchling"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAECaves_GiantSpiderHatchling"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAECaves_GiantSpiderHatchling"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAECaves_GiantSpiderHatchling"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.07</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAECaves_GiantSpiderHatchling"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>VAE_VeryToxicBite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.24</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VAECaves_GiantSpiderHatchling"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VAECaves_GiantSpiderHatchling"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAECaves_GiantSpiderHatchling"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>175</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>400</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Giant Spider === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VAECaves_GiantSpider"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAECaves_GiantSpider"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>8</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAECaves_GiantSpider"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAECaves_GiantSpider"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAECaves_GiantSpider"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>VAE_CocoonBite</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>2.4</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VAECaves_GiantSpider"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VAECaves_GiantSpider"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAECaves_GiantSpider"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1000</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>400</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Ancient Giant Spider === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VAECaves_AncientGiantSpider"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAECaves_AncientGiantSpider"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>12</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAECaves_AncientGiantSpider"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAECaves_AncientGiantSpider"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.72</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAECaves_AncientGiantSpider"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>VAE_CocoonBite</li>
-								</capacities>
-								<power>60</power>
-								<cooldownTime>2.4</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>30</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>VAE_InfectedMandibles</li>
-								</capacities>
-								<power>31</power>
-								<cooldownTime>2.4</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>30</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<chanceFactor>0.25</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VAECaves_AncientGiantSpider"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VAECaves_AncientGiantSpider"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAECaves_AncientGiantSpider"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>6000</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>400</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Insectoid Hulk === -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VAECaves_InsectoidHulk"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<useStatic>false</useStatic>
-									<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
-									<parts>
-										<li>InsectLeg</li>
-									</parts>
-								</li>
-								<li>
-									<useStatic>false</useStatic>
-									<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
-									<parts>
-										<li>InsectLeg</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAECaves_InsectoidHulk"]/statBases</xpath>
-					<value>
-						<PartialArmorBody>0</PartialArmorBody>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VAECaves_InsectoidHulk"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAECaves_InsectoidHulk"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>14</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAECaves_InsectoidHulk"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAECaves_InsectoidHulk"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.75</MeleeCritChance>
-						<MeleeParryChance>0.5</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAECaves_InsectoidHulk"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>arm</label>
-								<capacities>
-									<li>VAE_HulkAttack</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>VAE_Arms</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>two arm slam</label>
-								<capacities>
-									<li>VAE_HulkDualAttack</li>
-								</capacities>
-								<power>38</power>
-								<cooldownTime>2.4</cooldownTime>
-								<linkedBodyPartsGroup>VAE_Arms</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>25</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>60</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>38</power>
-								<cooldownTime>2.48</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VAECaves_InsectoidHulk"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VAECaves_InsectoidHulk"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAECaves_InsectoidHulk"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>3250</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Cave Salamander === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VAECaves_BlindSalamander"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAECaves_BlindSalamander"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.03</MeleeCritChance>
-						<MeleeParryChance>0.00</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAECaves_BlindSalamander"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.05</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.05</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Wyrm === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VAECaves_Wyrm"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAECaves_Wyrm"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAECaves_Wyrm"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>7</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAECaves_Wyrm"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						<MeleeCritChance>0.33</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAECaves_Wyrm"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Cut</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.24</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.7</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Cut</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.24</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.7</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>razorfangs</label>
-								<capacities>
-									<li>Bite</li>
-									<li>Stab</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>2.1</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.75</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>9</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>tail</label>
-								<capacities>
-									<li>VAE_ToxicSting</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>1.24</cooldownTime>
-								<linkedBodyPartsGroup>VAE_AttackTail</linkedBodyPartsGroup>
-								<chanceFactor>1</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VAECaves_Wyrm"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VAECaves_Wyrm"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAECaves_Wyrm"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>2100</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded - Caves/ThingDefs_Races/Caves_Bodies.xml b/Patches/Vanilla Animals Expanded - Caves/ThingDefs_Races/Caves_Bodies.xml
deleted file mode 100644
index d51a494c5d..0000000000
--- a/Patches/Vanilla Animals Expanded - Caves/ThingDefs_Races/Caves_Bodies.xml	
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded — Caves</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="VAE_Arachnid"]//*[
-						def="Body" or
-						def="VAE_Thorax" or
-						def="Pronotum" or
-						def="InsectNostril" or
-						def="Eye" or
-						def="InsectLeg"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="VAE_Arachnid"]//*[
-						def="InsectMouth" or
-						def="InsectNostril" or
-						def="Eye"]/groups
-					</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="VAE_Arachnid"]//*[
-						def="Body" or
-						def="VAE_Thorax" or
-						def="Pronotum" or
-						def="InsectHead"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="VAE_WyvernBody"]//*[
-						def="Body" or
-						def="VAE_Wing" or
-						def="Neck" or
-						def="Nose" or
-						def="Ear" or
-						def="Eye" or
-						def="Leg"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="VAE_WyvernBody"]//*[
-						def="AnimalJaw" or
-						def="Nose" or
-						def="Eye"]/groups
-					</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="VAE_WyvernBody"]//*[
-						def="Body" or
-						def="VAE_Wing" or
-						def="Neck" or
-						def="Head" or
-						def="Ear" or
-						def="Nose" or
-						def="Paw" or
-						def="AnimalJaw" or
-						def="Leg"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="VAE_InsectoidHulkBody"]//*[
-						def="Shell" or
-						def="Elytra" or
-						def="Pronotum" or
-						def="InsectNostril" or
-						def="Antenna" or
-						def="Eye" or
-						def="InsectLeg"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="VAE_InsectoidHulkBody"]//*[
-						def="InsectMouth" or
-						def="InsectNostril" or
-						def="Eye"]/groups
-					</xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="VAE_InsectoidHulkBody"]//*[
-						def="Body" or
-						def="Elytra" or
-						def="Pronotum" or
-						def="InsectHead" or
-						def="InsectNostril" or
-						def="HeadClaw" or
-						def="InsectMouth" or
-						def="VAE_InsectArm" or
-						def="InsectLeg"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded - Endangered/Bodies/Patch_Bodies_Animals.xml b/Patches/Vanilla Animals Expanded - Endangered/Bodies/Patch_Bodies_Animals.xml
deleted file mode 100644
index 267f3757f2..0000000000
--- a/Patches/Vanilla Animals Expanded - Endangered/Bodies/Patch_Bodies_Animals.xml	
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded — Royal Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Great Ape -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="VAERoy_GreatApe"]//*[
-						def="Torso" or
-						def="Neck" or
-						def="Shoulder" or
-						def="Arm" or
-						def="Hand" or
-						def="Leg" or
-						def="Foot" or
-						def="Toe"
-						] </xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="VAERoy_GreatApe"]//*[
-						def="Torso" or
-						def="Neck" or
-						def="Head" or
-						def="AnimalJaw" or
-						def="Shoulder" or
-						def="Arm" or
-						def="Hand" or
-						def="Finger" or
-						def="Leg" or
-						def="Foot" or
-						def="Toe"
-						]/groups </xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded - Endangered/ThingDefs_Races/Endangered_AddClass.xml b/Patches/Vanilla Animals Expanded - Endangered/ThingDefs_Races/Endangered_AddClass.xml
deleted file mode 100644
index 70519dcbbd..0000000000
--- a/Patches/Vanilla Animals Expanded - Endangered/ThingDefs_Races/Endangered_AddClass.xml	
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded — Endangered</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Quadruped === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>
-						Defs/ThingDef[
-						defName="AEXP_BlackRhino" or
-						defName="AEXP_Quagga" or
-						defName="AEXP_Panda" or
-						defName="AEXP_Bonobo"
-						]
-					</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Quadruped Low === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>
-						Defs/ThingDef[
-						defName="AEXP_BlackFootedFerret"
-						]
-					</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Humanoid === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>
-						Defs/ThingDef[
-						defName="AEXP_RockhopperPenguin"
-						]
-					</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded - Endangered/ThingDefs_Races/Endangered_Animals.xml b/Patches/Vanilla Animals Expanded - Endangered/ThingDefs_Races/Endangered_Animals.xml
deleted file mode 100644
index 9e89662008..0000000000
--- a/Patches/Vanilla Animals Expanded - Endangered/ThingDefs_Races/Endangered_Animals.xml	
+++ /dev/null
@@ -1,762 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded — Endangered</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Black-Footed Ferret === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_BlackFootedFerret"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.27</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.02</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_BlackFootedFerret"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.67</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.67</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.88</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>3.00</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Black Rhino === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_BlackRhino"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.52</MeleeCritChance>
-						<MeleeParryChance>0.27</MeleeParryChance>
-						<ArmorRating_Blunt>8</ArmorRating_Blunt>
-						<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_BlackRhino"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>3.17</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>3.17</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool_2</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2.44</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>2.95</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Panda === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Panda"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.19</MeleeCritChance>
-						<MeleeParryChance>0.11</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Panda"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.9</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.9</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.11</armorPenetrationSharp>
-								<armorPenetrationBlunt>6.5</armorPenetrationBlunt>
-								<chanceFactor>0.7</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4.2</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Quagga === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Quagga"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.14</MeleeCritChance>
-						<MeleeParryChance>0.13</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Quagga"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>bite</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.06</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.9</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Moa === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Moa"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.20</MeleeDodgeChance>
-						<MeleeCritChance>0.06</MeleeCritChance>
-						<MeleeParryChance>0.06</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Moa"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.42</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.08</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.89</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.78</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Rockhopper Penguin === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_RockhopperPenguin"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.08</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_RockhopperPenguin"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>4</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.162</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>6</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.162</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.284</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Tasmanian Devil === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_TasmanianDevil"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.21</MeleeDodgeChance>
-						<MeleeCritChance>0.31</MeleeCritChance>
-						<MeleeParryChance>0.08</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_TasmanianDevil"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === African Wild Dog === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_AfricanWildDog"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.22</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0.04</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_AfricanWildDog"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.8</cooldownTime>
-								<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.8</cooldownTime>
-								<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>1.63</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.380</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Thylacine === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Thylacine"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.22</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0.04</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Thylacine"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.8</cooldownTime>
-								<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.8</cooldownTime>
-								<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>1.63</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.380</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Pangolin === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Pangolin"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.17</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0.13</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Pangolin"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.32</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Pangolin"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.26</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Pangolin"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.55</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.55</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.85</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>8</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.254</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.55</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Bonobo === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Bonobo"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.10</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Bonobo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.56</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.550</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.56</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.550</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.05</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.65</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.95</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded - Royal Animals/ThingDefs_Races/Royal_Animals.xml b/Patches/Vanilla Animals Expanded - Royal Animals/ThingDefs_Races/Royal_Animals.xml
deleted file mode 100644
index 670212e751..0000000000
--- a/Patches/Vanilla Animals Expanded - Royal Animals/ThingDefs_Races/Royal_Animals.xml	
+++ /dev/null
@@ -1,614 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded — Royal Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Angora Rabbit === -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VAERoy_AngoraRabbit"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAERoy_AngoraRabbit"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.24</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAERoy_AngoraRabbit"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Crane === -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VAERoy_Crane"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAERoy_Crane"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-						<MeleeParryChance>0.03</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAERoy_Crane"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.95</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.0</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.75</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Megachicken === -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VAERoy_Megachicken"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAERoy_Megachicken"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.16</MeleeDodgeChance>
-						<MeleeCritChance>0.00</MeleeCritChance>
-						<MeleeParryChance>0.00</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAERoy_Megachicken"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.39</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.096</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.39</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.096</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.192</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Orangutan === -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VAERoy_Orangutan"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAERoy_Orangutan"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.20</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAERoy_Orangutan"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.9</cooldownTime>
-								<chanceFactor>0.7</chanceFactor>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.0</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2</cooldownTime>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3.0</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Peacock === -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VAERoy_Peacock"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAERoy_Peacock"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-						<MeleeParryChance>0.03</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAERoy_Peacock"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2.0</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2.08</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Pheasant === -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VAERoy_Pheasant"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAERoy_Pheasant"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.16</MeleeDodgeChance>
-						<MeleeCritChance>0.00</MeleeCritChance>
-						<MeleeParryChance>0.00</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAERoy_Pheasant"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Quail === -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VAERoy_Quail"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAERoy_Quail"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.16</MeleeDodgeChance>
-						<MeleeCritChance>0.00</MeleeCritChance>
-						<MeleeParryChance>0.00</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAERoy_Quail"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.39</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.096</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.39</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.096</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.192</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Royal tiger === -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VAERoy_RoyalTiger"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAERoy_RoyalTiger"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.09</MeleeCritChance>
-						<MeleeParryChance>0.07</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAERoy_RoyalTiger"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>0.9</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>24</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>0.84</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>24</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>28</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Swan === -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VAERoy_Swan"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAERoy_Swan"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-						<MeleeParryChance>0.03</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAERoy_Swan"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>7.5</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2.08</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded - Waste Animals/Bodies/Patch_Bodies_Animals.xml b/Patches/Vanilla Animals Expanded - Waste Animals/Bodies/Patch_Bodies_Animals.xml
deleted file mode 100644
index 87de7e1c19..0000000000
--- a/Patches/Vanilla Animals Expanded - Waste Animals/Bodies/Patch_Bodies_Animals.xml	
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded — Waste Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- bipedal lizard -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="VAEWaste_BipedalLizard"]//*[
-						def="Body" or
-						def="Tail" or
-						def="Neck" or
-						def="Arm" or
-						def="Leg"
-						] </xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="VAEWaste_BipedalLizard"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Head" or
-						def="AnimalJaw" or
-						def="Leg" or
-						def="Arm"
-						]/groups </xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- hydra -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="VAEWaste_Hydra"]//*[
-						def="SnakeBody"
-						] </xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="VAEWaste_Hydra"]//*[
-						def="SnakeBody" or
-						def="SnakeHead" or
-						def="SnakeMouth"
-						]/groups </xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- large lizardlike -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="VAEWaste_LargeLizardlike"]//*[
-						def="Body" or
-						def="Tail" or
-						def="Neck" or
-						def="Leg"
-						] </xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="VAEWaste_LargeLizardlike"]//*[
-						def="Body" or
-						def="Tail" or
-						def="Neck" or
-						def="Head" or
-						def="AnimalJaw" or
-						def="Leg"
-						]/groups </xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- megatardi -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="VAEWaste_Megatardi"]//*[
-						def="Shell" or
-						def="Elytra" or
-						def="Pronotum" or
-						def="InsectNostril" or
-						def="Antenna" or
-						def="InsectLeg"
-						] </xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="VAEWaste_Megatardi"]//*[
-						def="InsectMouth" or
-						def="InsectNostril"
-						]/groups </xpath>
-					<value>
-						<li>OutsideSquishy</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="VAEWaste_Megatardi"]//*[
-						def="Shell" or
-						def="Elytra" or
-						def="Pronotum" or
-						def="InsectHead" or
-						def="InsectNostril" or
-						def="InsectMouth" or
-						def="Antenna" or
-						def="InsectLeg"
-						]/groups </xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- double headed quadruped animal -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="VAEWaste_Wasteffalo_Body"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Hoof"
-						] </xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="VAEWaste_Wasteffalo_Body"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Head" or
-						def="AnimalJaw" or
-						def="Leg" or
-						def="Hoof"
-						]/groups </xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- wasteboar -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="VAEWaste_Wasteboar"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Hoof"
-						] </xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="VAEWaste_Wasteboar"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Head" or
-						def="AnimalJaw" or
-						def="Leg" or
-						def="Hoof"
-						]/groups </xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- scorpionlike body -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="VAEWaste_ScorpionLike"]//*[
-						def="Shell" or
-						def="VAEWaste_Thorax" or
-						def="Pronotum" or
-						def="VAEWaste_InsectTail"
-						] </xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="VAEWaste_ScorpionLike"]//*[
-						def="Shell" or
-						def="VAEWaste_Thorax" or
-						def="Pronotum" or
-						def="InsectHead" or
-						def="VAEWaste_InsectMouth" or
-						def="VAEWaste_InsectSting" or
-						def="VAEWaste_InsectTail"
-						]/groups </xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Items/WasteAnimals_Items.xml b/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Items/WasteAnimals_Items.xml
deleted file mode 100644
index e4d89d63da..0000000000
--- a/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Items/WasteAnimals_Items.xml	
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded — Waste Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAEWaste_ToxicLeather"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.045</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAEWaste_ToxicLeather"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.02</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAEWaste_ToxicLeather"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.009</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Misc/WasteAnimals_Projectiles.xml b/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Misc/WasteAnimals_Projectiles.xml
deleted file mode 100644
index a31aaf1800..0000000000
--- a/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Misc/WasteAnimals_Projectiles.xml	
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded — Waste Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ============== Changing Projectile's thingClass to CE ones ================ -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAEWaste_AcidBolt"]</xpath>
-					<value>
-						<thingClass>CombatExtended.BulletCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAEWaste_AcidBolt"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>VAEWaste_AcidBolt</damageDef>
-							<damageAmountBase>10</damageAmountBase>
-							<speed>40</speed>
-							<armorPenetrationSharp>2.5</armorPenetrationSharp>
-							<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
-						</projectile>
-					</value>
-				</li>
-
-				<!-- ============== Adding 'Standard' AimingAccuracy node to creatures' that use ranged attack statBases. =============== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Toxiguana"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.6</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Toxiguana"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>VAEWaste_AcidBolt</defaultProjectile>
-								<warmupTime>2</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<minRange>2</minRange>
-								<range>25</range>
-								<soundCast>VAEWaste_PoisonBolt</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>acid spit</label>
-								<commonality>0.8</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Base.xml b/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Base.xml
deleted file mode 100644
index 67fdc4a504..0000000000
--- a/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Base.xml	
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded — Waste Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="VAEWaste_BaseInsect"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<useStatic>false</useStatic>
-									<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
-									<parts>
-										<li>InsectLeg</li>
-									</parts>
-								</li>
-								<li>
-									<useStatic>false</useStatic>
-									<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
-									<parts>
-										<li>InsectLeg</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="VAEWaste_BaseInsect"]/statBases</xpath>
-					<value>
-						<PartialArmorBody>0</PartialArmorBody>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Hydra.xml b/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Hydra.xml
deleted file mode 100644
index c0f1523d18..0000000000
--- a/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Hydra.xml	
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded — Waste Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Hydra"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Serpentine</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Hydra"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.17</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Hydra"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>venom-fangs</label>
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<cooldownTime>0.5</cooldownTime>
-								<power>6</power>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>0.67</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.225</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Megatardi.xml b/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Megatardi.xml
deleted file mode 100644
index 131ee96042..0000000000
--- a/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Megatardi.xml	
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded — Waste Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Megatardi"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Megatardi"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Megatardi"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>3</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Megatardi"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.06</MeleeDodgeChance>
-						<MeleeCritChance>0.21</MeleeCritChance>
-						<MeleeParryChance>0.20</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Megatardi"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<cooldownTime>1.0</cooldownTime>
-								<power>3</power>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.0</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.1</chanceFactor>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Megatardi"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VAEWaste_Megatardi"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Megatardi"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1125</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Pestigator.xml b/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Pestigator.xml
deleted file mode 100644
index 7ed9899f2c..0000000000
--- a/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Pestigator.xml	
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded — Waste Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Pestigator"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Pestigator"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>21</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Pestigator"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Pestigator"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.3</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Pestigator"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>VAEWaste_RippingBite</li>
-								</capacities>
-								<cooldownTime>1.5</cooldownTime>
-								<power>20</power>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>3.0</armorPenetrationSharp>
-								<armorPenetrationBlunt>15.0</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Pestigator"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VAEWaste_Pestigator"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Pestigator"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1500</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxafox.xml b/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxafox.xml
deleted file mode 100644
index 9d3071bdbb..0000000000
--- a/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxafox.xml	
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded — Waste Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Toxafox"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Toxafox"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.28</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-						<MeleeParryChance>0.02</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Toxafox"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.91</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.198</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.91</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.198</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.49</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>1.440</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxbear.xml b/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxbear.xml
deleted file mode 100644
index 7e6af9e636..0000000000
--- a/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxbear.xml	
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded — Waste Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Toxbear"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Toxbear"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>2.5</MoveSpeed>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.3</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Toxbear"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.32</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationSharp>1.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.44</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxiguana.xml b/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxiguana.xml
deleted file mode 100644
index 82b032c59e..0000000000
--- a/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxiguana.xml	
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded — Waste Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Toxiguana"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Serpentine</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Toxiguana"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.14</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-						<MeleeParryChance>0.06</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Toxiguana"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.89</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.24</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxlion.xml b/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxlion.xml
deleted file mode 100644
index 35ab98182f..0000000000
--- a/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxlion.xml	
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded — Waste Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Toxlion"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Toxlion"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.19</MeleeDodgeChance>
-						<MeleeCritChance>0.18</MeleeCritChance>
-						<MeleeParryChance>0.17</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Toxlion"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>VAEWaste_FluClaws</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1</cooldownTime>
-								<chanceFactor>0.3</chanceFactor>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>16</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.06</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.22</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>VAEWaste_FluClaws</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1</cooldownTime>
-								<chanceFactor>0.3</chanceFactor>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>16</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.06</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.22</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>VAEWaste_FluBite</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>16</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<chanceFactor>0.3</chanceFactor>
-								<armorPenetrationSharp>1.66</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.35</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.5</cooldownTime>
-								<chanceFactor>0.7</chanceFactor>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.66</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.35</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxscorpion.xml b/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxscorpion.xml
deleted file mode 100644
index 69fee05cab..0000000000
--- a/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxscorpion.xml	
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded — Waste Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Toxscorpion"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Toxscorpion"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4.8</MoveSpeed>
-						<MeleeDodgeChance>0.07</MeleeDodgeChance>
-						<MeleeCritChance>0.5</MeleeCritChance>
-						<MeleeParryChance>0.39</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Toxscorpion"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>14</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Toxscorpion"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>7</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Toxscorpion"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left pincer</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>37</power>
-								<cooldownTime>2.72</cooldownTime>
-								<linkedBodyPartsGroup>VAEWaste_PincerAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>3.54</armorPenetrationSharp>
-								<armorPenetrationBlunt>61.875</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right pincer</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>37</power>
-								<cooldownTime>2.72</cooldownTime>
-								<linkedBodyPartsGroup>VAEWaste_PincerAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>3.54</armorPenetrationSharp>
-								<armorPenetrationBlunt>61.875</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>VAEWaste_Sting</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>VAEWaste_Sting</linkedBodyPartsGroup>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>2.46</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.1</chanceFactor>
-								<armorPenetrationBlunt>10.8</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Toxscorpion"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<useStatic>false</useStatic>
-									<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-									<parts>
-										<li>VAEWaste_LeftPincer</li>
-										<li>VAEWaste_RightPincer</li>
-									</parts>
-								</li>
-								<li>
-									<useStatic>false</useStatic>
-									<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
-									<parts>
-										<li>VAEWaste_LeftPincer</li>
-										<li>VAEWaste_RightPincer</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Toxscorpion"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VAEWaste_Toxscorpion"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Toxscorpion"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1125</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Wasteboar.xml b/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Wasteboar.xml
deleted file mode 100644
index 036b0e8e89..0000000000
--- a/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Wasteboar.xml	
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded — Waste Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Wasteboar"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Wasteboar"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.16</MeleeDodgeChance>
-						<MeleeCritChance>0.09</MeleeCritChance>
-						<MeleeParryChance>0.07</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Wasteboar"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tusk</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.89</cooldownTime>
-								<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.0</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>tusk</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.41</cooldownTime>
-								<chanceFactor>0.65</chanceFactor>
-								<linkedBodyPartsGroup>TuskAttackTool_2</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.0</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.57</cooldownTime>
-								<chanceFactor>0.6</chanceFactor>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.12</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Wastedeer.xml b/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Wastedeer.xml
deleted file mode 100644
index 712613f666..0000000000
--- a/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Wastedeer.xml	
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded — Waste Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Wastedeer"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Wastedeer"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.26</MeleeDodgeChance>
-						<MeleeCritChance>0.14</MeleeCritChance>
-						<MeleeParryChance>0.08</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Wastedeer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.66</cooldownTime>
-								<chanceFactor>0.7</chanceFactor>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.750</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.97</cooldownTime>
-								<restrictedGender>Female</restrictedGender>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Wasteffalo.xml b/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Wasteffalo.xml
deleted file mode 100644
index 131984818b..0000000000
--- a/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Wasteffalo.xml	
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded — Waste Animals</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Wasteffalo"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Wasteffalo"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>5</MoveSpeed>
-						<MeleeDodgeChance>0.14</MeleeDodgeChance>
-						<MeleeCritChance>0.32</MeleeCritChance>
-						<MeleeParryChance>0.24</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAEWaste_Wasteffalo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.8</cooldownTime>
-								<chanceFactor>0.5</chanceFactor>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded/AridShrubland_AddClass.xml b/Patches/Vanilla Animals Expanded/AridShrubland_AddClass.xml
deleted file mode 100644
index fe59024078..0000000000
--- a/Patches/Vanilla Animals Expanded/AridShrubland_AddClass.xml	
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Quadruped === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>
-						Defs/ThingDef[
-						defName="AEXP_Coyote" or
-						defName="AEXP_Hippopotamus" or
-						defName="AEXP_Zebra" or
-						defName="AEXP_Wildebeest" or
-						defName="AEXP_Cheetah"]
-					</xpath>
-
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Quadruped Low === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AEXP_Crocodile"]</xpath>
-
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Birdlike === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AEXP_Giraffe"]</xpath>
-
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded/AridShrubland_Animals.xml b/Patches/Vanilla Animals Expanded/AridShrubland_Animals.xml
deleted file mode 100644
index 6f2388ba71..0000000000
--- a/Patches/Vanilla Animals Expanded/AridShrubland_Animals.xml	
+++ /dev/null
@@ -1,463 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Cheetah === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Cheetah"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.46</MeleeDodgeChance>
-						<MeleeCritChance>0.27</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Cheetah"]</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>0.7</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.17</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.81</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>0.7</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.17</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.81</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>bite</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>6.64</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.46</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Coyote === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Coyote"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.27</MeleeDodgeChance>
-						<MeleeCritChance>0.06</MeleeCritChance>
-						<MeleeParryChance>0.03</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Coyote"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.9</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.06</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.22</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.9</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.06</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.22</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>bite</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.13</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Crocodile === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Crocodile"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.24</MeleeCritChance>
-						<MeleeParryChance>0.31</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Crocodile"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>bite</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>33</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.7</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Giraffe === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Giraffe"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.45</MeleeCritChance>
-						<MeleeParryChance>0.39</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Giraffe"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>bite</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2.2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Hippo === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Hippopotamus"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.07</MeleeDodgeChance>
-						<MeleeCritChance>0.6</MeleeCritChance>
-						<MeleeParryChance>0.35</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Hippopotamus"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>45</power>
-								<cooldownTime>3.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>45</power>
-								<cooldownTime>3.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>bite</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>2.7</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<armorPenetrationBlunt>8.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>4</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>6.4</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Wildebeest === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Wildebeest"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>0.13</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Wildebeest"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.72</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.72</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>bite</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Zebra === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Zebra"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.14</MeleeCritChance>
-						<MeleeParryChance>0.13</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Zebra"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>bite</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.06</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.9</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded/AridShrubland_Resources.xml b/Patches/Vanilla Animals Expanded/AridShrubland_Resources.xml
deleted file mode 100644
index 7b28a9d2dd..0000000000
--- a/Patches/Vanilla Animals Expanded/AridShrubland_Resources.xml	
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Hippo Leather === -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="AEXP_Leather_Hippopotamus"]/statBases/StuffPower_Armor_Sharp</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Leather_Hippopotamus"]/statBases</xpath>
-
-					<value>
-						<StuffPower_Armor_Sharp>0.1</StuffPower_Armor_Sharp>
-						<StuffPower_Armor_Blunt>0.08</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- === Wildebeest Leather === -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="AEXP_Leather_Wildebeest"]/statBases/StuffPower_Armor_Sharp</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Leather_Wildebeest"]/statBases</xpath>
-
-					<value>
-						<StuffPower_Armor_Sharp>0.08</StuffPower_Armor_Sharp>
-						<StuffPower_Armor_Blunt>0.064</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded/Australia_AddClass.xml b/Patches/Vanilla Animals Expanded/Australia_AddClass.xml
deleted file mode 100644
index e631f52bad..0000000000
--- a/Patches/Vanilla Animals Expanded/Australia_AddClass.xml	
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Quadruped === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AEXP_Kangaroo"]</xpath>
-
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- === QuadrupedLow === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AEXP_Boombat" or defName="AEXP_Koala" or defName="AEXP_Platypus"]</xpath>
-
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded/Australia_Animals.xml b/Patches/Vanilla Animals Expanded/Australia_Animals.xml
deleted file mode 100644
index cb9b2e6c6b..0000000000
--- a/Patches/Vanilla Animals Expanded/Australia_Animals.xml	
+++ /dev/null
@@ -1,320 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Boombat === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Boombat"]/tradeTags</xpath>
-
-					<value>
-						<li>CE_AnimalBoom</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Boombat"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.10</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Boombat"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>0.95</cooldownTime>
-								<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>0.95</cooldownTime>
-								<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "AEXP_Boombat"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "AEXP_Boombat"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Boombat"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ShearableRenameable">
-							<compClass>CombatExtended.CompShearableRenameable</compClass>
-							<growthLabel>Secretion level</growthLabel>
-							<shearIntervalDays>3</shearIntervalDays>
-							<woolAmount>1</woolAmount>
-							<woolDef>FSX</woolDef>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Boombat"]</xpath>
-					<value>
-						<butcherProducts>
-							<FSX>2</FSX>
-						</butcherProducts>
-					</value>
-				</li>
-
-				<!-- === Kangaroo === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Kangaroo"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.27</MeleeDodgeChance>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>0.20</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Kangaroo"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Scratch</li>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>0.95</cooldownTime>
-								<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<linkedBodyPartsGroup>AEXP_RearLeftClaws</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Scratch</li>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>0.95</cooldownTime>
-								<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<linkedBodyPartsGroup>AEXP_RearRightClaws</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Koala === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Koala"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Koala"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.95</cooldownTime>
-								<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.95</cooldownTime>
-								<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Platypus === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Platypus"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						<MeleeCritChance>0.11</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Platypus"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.95</cooldownTime>
-								<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.95</cooldownTime>
-								<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.33</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.06</armorPenetrationSharp>
-								<linkedBodyPartsGroup>AEXP_RearLeftSpur</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.33</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.06</armorPenetrationSharp>
-								<linkedBodyPartsGroup>AEXP_RearRightSpur</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded/Australia_Resources.xml b/Patches/Vanilla Animals Expanded/Australia_Resources.xml
deleted file mode 100644
index 55191dc8af..0000000000
--- a/Patches/Vanilla Animals Expanded/Australia_Resources.xml	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Platypus Leather === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Leather_Platypus"]/statBases</xpath>
-
-					<value>
-						<StuffPower_Armor_Blunt>0.06</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded/BorealForest_AddClass.xml b/Patches/Vanilla Animals Expanded/BorealForest_AddClass.xml
deleted file mode 100644
index 4371653be7..0000000000
--- a/Patches/Vanilla Animals Expanded/BorealForest_AddClass.xml	
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Quadruped === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AEXP_ArcticCoyote" or defName="AEXP_BlackBear"]</xpath>
-
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Serpentine === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AEXP_Otter"]</xpath>
-
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded/BorealForest_Animals.xml b/Patches/Vanilla Animals Expanded/BorealForest_Animals.xml
deleted file mode 100644
index 8a9c6d251f..0000000000
--- a/Patches/Vanilla Animals Expanded/BorealForest_Animals.xml	
+++ /dev/null
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Artic Coyote === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_ArcticCoyote"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.26</MeleeDodgeChance>
-						<MeleeCritChance>0.08</MeleeCritChance>
-						<MeleeParryChance>0.04</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_ArcticCoyote"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.056</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.216</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.056</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.216</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>2</cooldownTime>
-								<chanceFactor>0.7</chanceFactor>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.10</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.13</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Black Bear === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_BlackBear"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_BlackBear"]</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.9</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.9</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.11</armorPenetrationSharp>
-								<armorPenetrationBlunt>6.5</armorPenetrationBlunt>
-								<chanceFactor>0.7</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4.2</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Otter === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Otter"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.24</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-						<MeleeParryChance>0.03</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Otter"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.02</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.02</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.01</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.2</cooldownTime>
-								<chanceFactor>0.2</chanceFactor>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.03</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded/CatsAndDogs_AddClass.xml b/Patches/Vanilla Animals Expanded/CatsAndDogs_AddClass.xml
deleted file mode 100644
index 9bc2a6f177..0000000000
--- a/Patches/Vanilla Animals Expanded/CatsAndDogs_AddClass.xml	
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Quadruped === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>
-						Defs/ThingDef[
-						defName="AEXP_Rottweiler" or
-						defName="AEXP_GermanShepherd" or
-						defName="AEXP_GreatDane" or
-						defName="AEXP_Poodle" or
-						defName="AEXP_Beagle" or
-						defName="AEXP_Chihuahua" or
-						defName="AEXP_Corgi" or
-						defName="AEXP_FrenchBulldog" or
-						defName="AEXP_Pug" or
-						defName="AEXP_Shih-Tzu" or
-						defName="AEXP_WelshTerrier" or
-						defName="AEXP_CatAbyssinian" or
-						defName="AEXP_CatBengal" or
-						defName="AEXP_CatBritishShorthair" or
-						defName="AEXP_CatMaineCoon" or
-						defName="AEXP_CatMunchkin" or
-						defName="AEXP_CatNorwegianForest" or
-						defName="AEXP_CatPersian" or
-						defName="AEXP_CatSiamese" or
-						defName="AEXP_CatSomali" or
-						defName="AEXP_CatSphynx"]
-					</xpath>
-
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded/CatsAndDogs_Cats.xml b/Patches/Vanilla Animals Expanded/CatsAndDogs_Cats.xml
deleted file mode 100644
index f27b1cfd7f..0000000000
--- a/Patches/Vanilla Animals Expanded/CatsAndDogs_Cats.xml	
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/ThingDef[
-						defName="AEXP_CatAbyssinian" or
-						defName="AEXP_CatBengal" or
-						defName="AEXP_CatBritishShorthair" or
-						defName="AEXP_CatMaineCoon" or
-						defName="AEXP_CatMunchkin" or
-						defName="AEXP_CatNorwegianForest" or
-						defName="AEXP_CatPersian" or
-						defName="AEXP_CatSiamese" or
-						defName="AEXP_CatSomali" or
-						defName="AEXP_CatSphynx"]/statBases
-					</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName="AEXP_CatAbyssinian" or
-						defName="AEXP_CatBengal" or
-						defName="AEXP_CatBritishShorthair" or
-						defName="AEXP_CatMaineCoon" or
-						defName="AEXP_CatMunchkin" or
-						defName="AEXP_CatNorwegianForest" or
-						defName="AEXP_CatPersian" or
-						defName="AEXP_CatSiamese" or
-						defName="AEXP_CatSomali" or
-						defName="AEXP_CatSphynx"]/tools
-					</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.55</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.55</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.85</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.254</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>0.55</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded/CatsAndDogs_Dogs.xml b/Patches/Vanilla Animals Expanded/CatsAndDogs_Dogs.xml
deleted file mode 100644
index 771292ebdf..0000000000
--- a/Patches/Vanilla Animals Expanded/CatsAndDogs_Dogs.xml	
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Small Dogs === -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/ThingDef[
-						defName="AEXP_Beagle" or
-						defName="AEXP_Chihuahua" or
-						defName="AEXP_Corgi" or
-						defName="AEXP_FrenchBulldog" or
-						defName="AEXP_Pug" or
-						defName="AEXP_Shih-Tzu" or
-						defName="AEXP_WelshTerrier"]/statBases
-					</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.17</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName="AEXP_Beagle" or
-						defName="AEXP_Chihuahua" or
-						defName="AEXP_Corgi" or
-						defName="AEXP_FrenchBulldog" or
-						defName="AEXP_Pug" or
-						defName="AEXP_Shih-Tzu" or
-						defName="AEXP_WelshTerrier"]/tools
-					</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.62</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.62</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.66</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>0.62</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.015</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Big Dogs (Labrador) === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_GreatDane" or defName="AEXP_Poodle"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.20</MeleeDodgeChance>
-						<MeleeCritChance>0.06</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_GreatDane" or defName="AEXP_Poodle"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.99</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.99</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.77</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.880</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.19</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Rottweiler / German Shepherd (Husky) === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Rottweiler" or defName="AEXP_GermanShepherd"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Rottweiler" or defName="AEXP_GermanShepherd"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.8</cooldownTime>
-								<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.8</cooldownTime>
-								<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>1.63</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.380</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded/Desert_AddClass.xml b/Patches/Vanilla Animals Expanded/Desert_AddClass.xml
deleted file mode 100644
index 1fbb34aad7..0000000000
--- a/Patches/Vanilla Animals Expanded/Desert_AddClass.xml	
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Quadruped === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AEXP_Hyena" or defName="AEXP_Lion"]</xpath>
-
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Quadruped Low === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AEXP_DesertTortoise" or defName="AEXP_GilaMonster"]</xpath>
-
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded/Desert_Animals.xml b/Patches/Vanilla Animals Expanded/Desert_Animals.xml
deleted file mode 100644
index 7f641236f7..0000000000
--- a/Patches/Vanilla Animals Expanded/Desert_Animals.xml	
+++ /dev/null
@@ -1,308 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Desert Tortoise === -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AEXP_DesertTortoise"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<useStatic>false</useStatic>
-									<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<useStatic>false</useStatic>
-									<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_DesertTortoise"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.02</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_DesertTortoise"]/statBases/ArmorRating_Blunt</xpath>
-
-					<value>
-						<ArmorRating_Blunt>10</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_DesertTortoise"]/statBases/ArmorRating_Sharp</xpath>
-
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_DesertTortoise"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>beak</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>TurtleBeakAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.700</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Gila Monster === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_GilaMonster"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_GilaMonster"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>ToxicBite</label>
-								<capacities>
-									<li>AEXP_GilaVenomousBite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Hyena === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Hyena"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.21</MeleeDodgeChance>
-						<MeleeCritChance>0.11</MeleeCritChance>
-						<MeleeParryChance>0.07</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Hyena"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.06</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.22</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.06</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.22</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>bite</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.66</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.35</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.13</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Lion === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Lion"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.19</MeleeDodgeChance>
-						<MeleeCritChance>0.18</MeleeCritChance>
-						<MeleeParryChance>0.17</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Lion"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>17</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>17</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.2</armorPenetrationBlunt>
-								<chanceFactor>0.7</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded/Desert_Resources.xml b/Patches/Vanilla Animals Expanded/Desert_Resources.xml
deleted file mode 100644
index 90144020c1..0000000000
--- a/Patches/Vanilla Animals Expanded/Desert_Resources.xml	
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Lion Leather === -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="AEXP_Leather_Lion"]/statBases/StuffPower_Armor_Sharp</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Leather_Lion"]/statBases</xpath>
-
-					<value>
-						<StuffPower_Armor_Sharp>0.07</StuffPower_Armor_Sharp>
-						<StuffPower_Armor_Blunt>0.056</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded/ExtremeDesert_AddClass.xml b/Patches/Vanilla Animals Expanded/ExtremeDesert_AddClass.xml
deleted file mode 100644
index c8a30b0ed0..0000000000
--- a/Patches/Vanilla Animals Expanded/ExtremeDesert_AddClass.xml	
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Quadruped === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AEXP_Camel"]</xpath>
-
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Quadruped Low === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AEXP_Megascorpion"]</xpath>
-
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Serpentine === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AEXP_Rattlesnake"]</xpath>
-
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Serpentine</bodyShape>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded/ExtremeDesert_Animals.xml b/Patches/Vanilla Animals Expanded/ExtremeDesert_Animals.xml
deleted file mode 100644
index a09a7e9de2..0000000000
--- a/Patches/Vanilla Animals Expanded/ExtremeDesert_Animals.xml	
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Camel === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Camel"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.38</MeleeCritChance>
-						<MeleeParryChance>0.18</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Camel"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.7</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.7</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Megarscorpion === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Megascorpion"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.19</MeleeDodgeChance>
-						<MeleeCritChance>0.33</MeleeCritChance>
-						<MeleeParryChance>0.17</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Megascorpion"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stinger</label>
-								<capacities>
-									<li>AEXP_MegascorpionVenomousBite</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.13</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.11</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Rattlesnake === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Rattlesnake"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.19</MeleeDodgeChance>
-						<MeleeCritChance>0.18</MeleeCritChance>
-						<MeleeParryChance>0.17</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Rattlesnake"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fangs</label>
-								<capacities>
-									<li>AEXP_RattleSnakeVenomousBite</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.4</cooldownTime>
-								<armorPenetrationSharp>1.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded/IceSheet_AddClass.xml b/Patches/Vanilla Animals Expanded/IceSheet_AddClass.xml
deleted file mode 100644
index 27664289e4..0000000000
--- a/Patches/Vanilla Animals Expanded/IceSheet_AddClass.xml	
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Quadruped Low === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AEXP_Seal" or defNAme="AEXP_Walrus"]
-					</xpath>
-
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Birdlike === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AEXP_Penguin"]</xpath>
-
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded/IceSheet_Animals.xml b/Patches/Vanilla Animals Expanded/IceSheet_Animals.xml
deleted file mode 100644
index 0fde1998a8..0000000000
--- a/Patches/Vanilla Animals Expanded/IceSheet_Animals.xml	
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Penguin === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Penguin"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.10</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Penguin"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.48</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>beak</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.5</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Seal === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Seal"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.08</MeleeDodgeChance>
-						<MeleeCritChance>0.41</MeleeCritChance>
-						<MeleeParryChance>0.3</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Seal"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fore-flipper</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>AEXP_ForeFlipers</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fore-flipper</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>AEXP_ForeFlipers</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.3</cooldownTime>
-								<chanceFactor>1.7</chanceFactor>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>3</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Walrus === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Walrus"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.06</MeleeDodgeChance>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>0.23</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Walrus"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tusks</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>32</power>
-								<cooldownTime>1.6</cooldownTime>
-								<chanceFactor>1.2</chanceFactor>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.19</armorPenetrationSharp>
-								<armorPenetrationBlunt>14.45</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.7</cooldownTime>
-								<chanceFactor>0.2</chanceFactor>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>9</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded/IceSheet_Resources.xml b/Patches/Vanilla Animals Expanded/IceSheet_Resources.xml
deleted file mode 100644
index 7398cf8441..0000000000
--- a/Patches/Vanilla Animals Expanded/IceSheet_Resources.xml	
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Walrus Tusk === -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="AEXP_WalrusTusk"]/tools</xpath>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="AEXP_WalrusTusk"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>ResourceBase</value>
-				</li>
-
-				<!-- === Pinniped Leather === -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="AEXP_Leather_Pinniped"]/statBases/StuffPower_Armor_Sharp</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Leather_Pinniped"]/statBases</xpath>
-
-					<value>
-						<StuffPower_Armor_Sharp>0.07</StuffPower_Armor_Sharp>
-						<StuffPower_Armor_Blunt>0.056</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded/TemperateForest_AddClass.xml b/Patches/Vanilla Animals Expanded/TemperateForest_AddClass.xml
deleted file mode 100644
index 45eb5f3dae..0000000000
--- a/Patches/Vanilla Animals Expanded/TemperateForest_AddClass.xml	
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Quadruped Low === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AEXP_RedPanda" or defName="AEXP_Hedgehog" or defName="AEXP_Badger" or defName="AEXP_Beaver"]
-					</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>
-						Defs/ThingDef[
-						defName="AEXP_WildGoose"]
-					</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded/TemperateForest_Animals.xml b/Patches/Vanilla Animals Expanded/TemperateForest_Animals.xml
deleted file mode 100644
index 1377610d61..0000000000
--- a/Patches/Vanilla Animals Expanded/TemperateForest_Animals.xml	
+++ /dev/null
@@ -1,370 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Red Panda === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_RedPanda"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.16</MeleeDodgeChance>
-						<MeleeCritChance>0.03</MeleeCritChance>
-						<MeleeParryChance>0.02</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_RedPanda"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.55</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>7</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.55</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>7</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.85</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>8</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.254</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.55</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Badger === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Badger"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.21</MeleeDodgeChance>
-						<MeleeCritChance>0.31</MeleeCritChance>
-						<MeleeParryChance>0.08</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Badger"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Wild Goose ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_WildGoose"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.03</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_WildGoose"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.92</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.08</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.352</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.58</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.16</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.92</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.352</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AEXP_WildGoose"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Beaver === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Beaver"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.22</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Beaver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.18</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.18</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.65</cooldownTime>
-								<armorPenetrationBlunt>3.375</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.35</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.65</cooldownTime>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Hedgehog === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Hedgehog"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.19</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Hedgehog"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.67</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.67</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.88</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>3.00</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded/TropicalRainforest_AddClass.xml b/Patches/Vanilla Animals Expanded/TropicalRainforest_AddClass.xml
deleted file mode 100644
index 832a2345e1..0000000000
--- a/Patches/Vanilla Animals Expanded/TropicalRainforest_AddClass.xml	
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Quadruped === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>
-						Defs/ThingDef[
-						defName="AEXP_Gorilla" or
-						defName="AEXP_Jaguar" or
-						defName="AEXP_Tiger" or
-						defName="AEXP_Tapir"]
-					</xpath>
-
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Quadruped Low === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AEXP_Lemur"]</xpath>
-
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Humanoid === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AEXP_Mandrill"]
-					</xpath>
-
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded/TropicalRainforest_Animals.xml b/Patches/Vanilla Animals Expanded/TropicalRainforest_Animals.xml
deleted file mode 100644
index 9a10ec6a67..0000000000
--- a/Patches/Vanilla Animals Expanded/TropicalRainforest_Animals.xml	
+++ /dev/null
@@ -1,361 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Gorilla === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Gorilla"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.20</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Gorilla"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1</cooldownTime>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>17</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1</cooldownTime>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>17</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>33</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>9.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2</cooldownTime>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>4.32</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Jaguar === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Jaguar"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.26</MeleeDodgeChance>
-						<MeleeCritChance>0.20</MeleeCritChance>
-						<MeleeParryChance>0.07</MeleeParryChance>
-					</value>
-				</li>
-
-				<!-- === Lemur === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Lemur"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Lemur"]/tools</xpath>
-					<value>
-						<tools>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Mandrill === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Mandrill"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.04</MeleeCritChance>
-						<MeleeParryChance>0.02</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Mandrill"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.7</chanceFactor>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.576</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Tapir === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Tapir"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.11</MeleeDodgeChance>
-						<MeleeCritChance>0.16</MeleeCritChance>
-						<MeleeParryChance>0.08</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Tapir"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.1</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Tiger === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Tiger"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.27</MeleeDodgeChance>
-						<MeleeCritChance>0.50</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Tiger"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>17</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>17</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.35</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.46</armorPenetrationBlunt>
-								<chanceFactor>0.7</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded/TropicalRainforest_Resources.xml b/Patches/Vanilla Animals Expanded/TropicalRainforest_Resources.xml
deleted file mode 100644
index 3d53a71216..0000000000
--- a/Patches/Vanilla Animals Expanded/TropicalRainforest_Resources.xml	
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Tiger Leather === -->
-				<li Class="PatchOperationRemove">
-					<xpath>
-						Defs/ThingDef[defName="AEXP_Leather_Tiger"]/statBases/StuffPower_Armor_Sharp |
-						Defs/ThingDef[defName="AEXP_Leather_Tiger"]/statBases/StuffPower_Armor_Blunt
-					</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Leather_Tiger"]/statBases</xpath>
-
-					<value>
-						<StuffPower_Armor_Sharp>0.07</StuffPower_Armor_Sharp>
-						<StuffPower_Armor_Blunt>0.056</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded/TropicalSwamp_AddClass.xml b/Patches/Vanilla Animals Expanded/TropicalSwamp_AddClass.xml
deleted file mode 100644
index aa3f48f65a..0000000000
--- a/Patches/Vanilla Animals Expanded/TropicalSwamp_AddClass.xml	
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === QuadrupedLow === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AEXP_Alligator"]</xpath>
-
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Serpentine === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AEXP_Anaconda"]</xpath>
-
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Serpentine</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Quadruped === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AEXP_IndianElephant"]</xpath>
-
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded/TropicalSwamp_Animals.xml b/Patches/Vanilla Animals Expanded/TropicalSwamp_Animals.xml
deleted file mode 100644
index 97dcb5f5b5..0000000000
--- a/Patches/Vanilla Animals Expanded/TropicalSwamp_Animals.xml	
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Alligator === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Alligator"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.24</MeleeCritChance>
-						<MeleeParryChance>0.31</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Alligator"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>bite</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetrationSharp>3.15</armorPenetrationSharp>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Anaconda === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Anaconda"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.19</MeleeDodgeChance>
-						<MeleeCritChance>0.18</MeleeCritChance>
-						<MeleeParryChance>0.17</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Anaconda"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>bite</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.10</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>25</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Indian Elephant === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_IndianElephant"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.10</MeleeDodgeChance>
-						<MeleeCritChance>0.50</MeleeCritChance>
-						<MeleeParryChance>0.30</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_IndianElephant"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.4</cooldownTime>
-								<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded/Tundra_AddClass.xml b/Patches/Vanilla Animals Expanded/Tundra_AddClass.xml
deleted file mode 100644
index 1b3c421442..0000000000
--- a/Patches/Vanilla Animals Expanded/Tundra_AddClass.xml	
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Quadruped === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AEXP_Muskox" or defName="AEXP_Moose" or defName="AEXP_MegaWolverine"]</xpath>
-
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Quadruped Low === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="AEXP_Porcupine"]</xpath>
-
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded/Tundra_Animals.xml b/Patches/Vanilla Animals Expanded/Tundra_Animals.xml
deleted file mode 100644
index 1fc8d7b892..0000000000
--- a/Patches/Vanilla Animals Expanded/Tundra_Animals.xml	
+++ /dev/null
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Mega Wolverine === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_MegaWolverine"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.07</MeleeDodgeChance>
-						<MeleeCritChance>0.59</MeleeCritChance>
-						<MeleeParryChance>0.29</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_MegaWolverine"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>29</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.33</armorPenetrationSharp>
-								<armorPenetrationBlunt>11.25</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>29</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.33</armorPenetrationSharp>
-								<armorPenetrationBlunt>11.25</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>44</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>3.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>38</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>2.8</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Moose === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Moose"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.07</MeleeDodgeChance>
-						<MeleeCritChance>0.14</MeleeCritChance>
-						<MeleeParryChance>0.14</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Moose"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>bite</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.44</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.69</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.7</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Musk Ox === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Muskox"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.17</MeleeDodgeChance>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Muskox"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.44</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.69</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Porcupine === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_Porcupine"]/statBases</xpath>
-
-					<value>
-						<MeleeDodgeChance>0.01</MeleeDodgeChance>
-						<MeleeCritChance>0</MeleeCritChance>
-						<MeleeParryChance>0.02</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AEXP_Porcupine"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.7</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.22</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.7</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.22</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>bite</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.08</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.16</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Animals Expanded/Tundra_Resources.xml b/Patches/Vanilla Animals Expanded/Tundra_Resources.xml
deleted file mode 100644
index de69883626..0000000000
--- a/Patches/Vanilla Animals Expanded/Tundra_Resources.xml	
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Animals Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Musk Ox Wool === -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="AEXP_MuskOxWool"]/statBases/StuffPower_Armor_Sharp</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AEXP_MuskOxWool"]/statBases</xpath>
-
-					<value>
-						<StuffPower_Armor_Sharp>0.02</StuffPower_Armor_Sharp>
-						<StuffPower_Armor_Blunt>0.03</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Apparel Expanded - Accessories/Apparel_Utility.xml b/Patches/Vanilla Apparel Expanded - Accessories/Apparel_Utility.xml
deleted file mode 100644
index b8cb38c4f2..0000000000
--- a/Patches/Vanilla Apparel Expanded - Accessories/Apparel_Utility.xml	
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Apparel Expanded — Accessories</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- == Backpack == -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VAE_Accessories.CaravanCapacityApparelDef[defName="VAEA_Apparel_Backpack"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VAE_Accessories.CaravanCapacityApparelDef[defName="VAEA_Apparel_Backpack"]/carryingCapacity</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>30</CarryBulk>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VAE_Accessories.CaravanCapacityApparelDef[defName="VAEA_Apparel_Backpack"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>Shoulders</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VAE_Accessories.CaravanCapacityApparelDef[defName="VAEA_Apparel_Backpack"]/apparel/layers</xpath>
-					<value>
-						<layers>
-							<li>Backpack</li>
-						</layers>
-					</value>
-				</li>
-
-				<!-- == Banner == -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAEA_Apparel_BattleBanner"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAEA_Apparel_BattleBanner"]/equippedStatOffsets</xpath>
-					<value>
-						<Suppressability>-0.25</Suppressability>
-					</value>
-				</li>
-
-				<!-- == Medbag, Toolbelt == -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAEA_Apparel_MedicBag" or defName="VAEA_Apparel_ToolBelt"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAEA_Apparel_MedicBag" or defName="VAEA_Apparel_ToolBelt"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>5</CarryBulk>
-					</value>
-				</li>
-
-				<!-- == Quiver, Ammobag == -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAEA_Apparel_Quiver" or defName="VAEA_Apparel_AmmoPack"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAEA_Apparel_Quiver"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>2.5</CarryBulk>
-							<ReloadSpeed>0.1</ReloadSpeed>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAEA_Apparel_AmmoPack"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryBulk>3.5</CarryBulk>
-							<ReloadSpeed>0.1</ReloadSpeed>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- == Explosive Belt == -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAEA_Apparel_ExplosiveBelt"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAEA_Apparel_ExplosiveBelt"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>5</Steel>
-							<FSX>2</FSX>
-							<ComponentIndustrial>1</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<!-- == Ranged Shield Pack == -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAEA_Apparel_RangedShieldBelt"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAEA_Apparel_RangedShieldBelt"]/statBases/EnergyShieldRechargeRate</xpath>
-					<value>
-						<EnergyShieldRechargeRate>0.195</EnergyShieldRechargeRate>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAEA_Apparel_RangedShieldBelt"]/statBases/EnergyShieldEnergyMax</xpath>
-					<value>
-						<EnergyShieldEnergyMax>1.35</EnergyShieldEnergyMax>
-					</value>
-				</li>
-
-				<!-- == Mini-Turret Pack == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAEA_Apparel_MiniTurretPack"]/statBases/RangedWeapon_Cooldown</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-						<RangedWeapon_Cooldown>0.8</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>0.82</SwayFactor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAEA_Apparel_MiniTurretPack"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<label>Gun</label>
-								<recoilAmount>0.76</recoilAmount>
-								<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<onlyManualCast>True</onlyManualCast>
-								<warmupTime>0.5</warmupTime>
-								<range>40</range>
-								<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-								<burstShotCount>10</burstShotCount>
-								<minRange>1</minRange>
-								<soundCast>GunShotA</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>14</muzzleFlashScale>
-								<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
-								<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-								<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAEA_Apparel_MiniTurretPack"]/comps</xpath>
-					<value>
-						<li Class="CompProperties_Reloadable">
-							<maxCharges>25</maxCharges>
-							<ammoDef>Ammo_556x45mmNATO_FMJ</ammoDef>
-							<ammoCountPerCharge>1</ammoCountPerCharge>
-							<baseReloadTicks>60</baseReloadTicks>
-							<soundReload>Standard_Reload</soundReload>
-							<hotKey>Misc4</hotKey>
-							<chargeNoun>turret</chargeNoun>
-							<displayGizmoWhileUndrafted>false</displayGizmoWhileUndrafted>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Apparel Expanded/ThingDefs_Misc/Apparel_Footwear.xml b/Patches/Vanilla Apparel Expanded/ThingDefs_Misc/Apparel_Footwear.xml
deleted file mode 100644
index 2c96a948f8..0000000000
--- a/Patches/Vanilla Apparel Expanded/ThingDefs_Misc/Apparel_Footwear.xml	
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Apparel Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- == VAE_Footwear_Boots == -->
-				<!-- statBases -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Footwear_Boots"]/statBases/Mass</xpath>
-					<value>
-						<WornBulk>0.5</WornBulk>
-						<Mass>0.8</Mass>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Footwear_Boots"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				<!-- Miscellaneous -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VAE_Footwear_Boots"]/equippedStatOffsets</xpath>
-				</li>
-
-				<!-- == VAE_Footwear_Shoes == -->
-				<!-- statBases -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Footwear_Shoes"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				<!-- Miscellaneous -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Footwear_Shoes"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>20</costStuffCount>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Apparel Expanded/ThingDefs_Misc/Apparel_Handwear.xml b/Patches/Vanilla Apparel Expanded/ThingDefs_Misc/Apparel_Handwear.xml
deleted file mode 100644
index 125442e251..0000000000
--- a/Patches/Vanilla Apparel Expanded/ThingDefs_Misc/Apparel_Handwear.xml	
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Apparel Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- == VAE_Handwear_Gloves == -->
-				<!-- statBases -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Handwear_Gloves"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				<!-- Miscellaneous -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Handwear_Gloves"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>15</costStuffCount>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Apparel Expanded/ThingDefs_Misc/Apparel_Industrial.xml b/Patches/Vanilla Apparel Expanded/ThingDefs_Misc/Apparel_Industrial.xml
deleted file mode 100644
index 5c4c1821be..0000000000
--- a/Patches/Vanilla Apparel Expanded/ThingDefs_Misc/Apparel_Industrial.xml	
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Apparel Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- == VAE_Apparel_CasualTShirt, VAE_Apparel_ShirtandTie, VAE_Apparel_Trousers, VAE_Headgear_Fedora, VAE_Apparel_Overalls, VAE_Apparel_Hoodie and VAE_Apparel_FleeceShirt == -->
-				<!-- statBases -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_CasualTShirt" or defName="VAE_Apparel_ShirtandTie" or defName="VAE_Apparel_Trousers" or defName="VAE_Headgear_Fedora" or defName="VAE_Apparel_Overalls" or defName="VAE_Apparel_Hoodie" or defName="VAE_Apparel_FleeceShirt"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-						<Bulk>1</Bulk>
-					</value>
-				</li>
-
-				<!-- == VAE_Apparel_Shorts, VAE_Apparel_Skirt and VAE_Apparel_TankTop == -->
-				<!-- statBases -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_Shorts" or defName="VAE_Apparel_Skirt" or defName="VAE_Apparel_TankTop"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>0.5</Bulk>
-						<StuffEffectMultiplierArmor>0.8</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- == VAE_Apparel_SuitJacket == -->
-				<!-- statBases -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_SuitJacket"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- == VAE_Apparel_Jeans and VAE_Apparel_Jumpsuit == -->
-				<!-- statBases -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_Jeans" or defName="VAE_Apparel_Jumpsuit"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>1.5</Bulk>
-						<WornBulk>0.5</WornBulk>
-						<StuffEffectMultiplierArmor>1.3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- == VAE_Apparel_ChefsUniform == -->
-				<!-- statBases -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_ChefsUniform"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- == VAE_Apparel_MilitaryJacket == -->
-				<!-- statBases -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_MilitaryJacket"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- == VAE_Apparel_MilitaryUniform == -->
-				<!-- statBases -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_MilitaryUniform"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>0.5</WornBulk>
-						<StuffEffectMultiplierArmor>1.4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_MilitaryUniform"]/costList/Steel</xpath>
-					<value>
-						<Steel>10</Steel>
-					</value>
-				</li>
-
-				<!-- == VAE_Apparel_BuildersJacket == -->
-				<!-- statBases -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_BuildersJacket"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>0.2</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_BuildersJacket"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.4</ArmorRating_Blunt>
-					</value>
-				</li>
-				<!-- material cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_BuildersJacket"]/costList/Cloth</xpath>
-					<value>
-						<Cloth>60</Cloth>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_BuildersJacket"]/costList/Silver</xpath>
-					<value>
-						<Silver>10</Silver>
-					</value>
-				</li>
-
-				<!-- == VAE_Apparel_DoctorScrubs == -->
-				<!-- cloth cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_DoctorScrubs"]/costList/Cloth</xpath>
-					<value>
-						<Cloth>50</Cloth>
-					</value>
-				</li>
-
-				<!-- == VAE_Apparel_LabCoat == -->
-				<!-- statBases -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_LabCoat"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<Bulk>7.5</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- == VAE_Apparel_SheriffShirt == -->
-				<!-- statBases -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_SheriffShirt"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- == costStuffCounts == -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_TankTop"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>15</costStuffCount>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_CasualTShirt" or defName="VAE_Apparel_Shorts" or defName="VAE_Apparel_Skirt"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>20</costStuffCount>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_ShirtandTie" or defName="VAE_Apparel_Overalls" or defName="VAE_Apparel_FleeceShirt" or defName="VAE_Apparel_SheriffShirt" or defName="VAE_Apparel_Trousers"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>25</costStuffCount>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_Hoodie" or defName="VAE_Apparel_Jeans" or defName="VAE_Apparel_ChefsUniform"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>30</costStuffCount>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_MilitaryUniform" or defName="VAE_Apparel_Jumpsuit" or defName="VAE_Apparel_MilitaryJacket" or defName="VAE_Apparel_SuitJacket"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>60</costStuffCount>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Apparel Expanded/ThingDefs_Misc/Apparel_Medieval.xml b/Patches/Vanilla Apparel Expanded/ThingDefs_Misc/Apparel_Medieval.xml
deleted file mode 100644
index 292e0f5fd2..0000000000
--- a/Patches/Vanilla Apparel Expanded/ThingDefs_Misc/Apparel_Medieval.xml	
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Apparel Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- == VAE_Apparel_Tunic == -->
-				<!-- statBases -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_Tunic"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>1.5</Bulk>
-						<WornBulk>0.5</WornBulk>
-						<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- == VAE_Apparel_Blouse == -->
-				<!-- statBases -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_Blouse"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>0.8</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- == VAE_Apparel_Apron == -->
-				<!-- statBases -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_Apron"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- == costStuffCounts == -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_Blouse" or defName="VAE_Apparel_Apron"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>20</costStuffCount>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_Tunic"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>25</costStuffCount>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Apparel Expanded/ThingDefs_Misc/Apparel_Neolithic.xml b/Patches/Vanilla Apparel Expanded/ThingDefs_Misc/Apparel_Neolithic.xml
deleted file mode 100644
index a10ae5adc0..0000000000
--- a/Patches/Vanilla Apparel Expanded/ThingDefs_Misc/Apparel_Neolithic.xml	
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Apparel Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- == VAE_Apparel_PeltCoat == -->
-				<!-- statBases -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_PeltCoat"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>7.5</Bulk>
-						<WornBulk>3</WornBulk>
-						<StuffEffectMultiplierArmor>7.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- == VAE_Apparel_TribalPoncho == -->
-				<!-- statBases -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_TribalPoncho"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- == VAE_Apparel_TribalKilt == -->
-				<!-- statBases -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_TribalKilt"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Apparel Expanded/ThingDefs_Misc/Headgear_Industrial.xml b/Patches/Vanilla Apparel Expanded/ThingDefs_Misc/Headgear_Industrial.xml
deleted file mode 100644
index 12a8f6bcbd..0000000000
--- a/Patches/Vanilla Apparel Expanded/ThingDefs_Misc/Headgear_Industrial.xml	
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Apparel Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- == VAE_Headgear_Scarf == -->
-				<!-- statBases -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_Scarf"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>0.5</Bulk>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-				<!-- Miscellaneous -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_Scarf"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<SmokeSensitivity>-0.2</SmokeSensitivity>
-							<ToxicEnvironmentResistance>0.10</ToxicEnvironmentResistance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_Scarf"]/apparel/layers</xpath>
-					<value>
-						<layers>
-							<li>StrappedHead</li>
-						</layers>
-					</value>
-				</li>
-
-				<!-- == VAE_Headgear_Beret, VAE_Headgear_BaseballCap and VAE_Headgear_ChefsToque == -->
-				<!-- statBases -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_Beret" or defName="VAE_Headgear_BaseballCap" or defName="VAE_Headgear_ChefsToque"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-						<Bulk>1</Bulk>
-					</value>
-				</li>
-				<!-- Miscellaneous -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_Beret" or defName="VAE_Headgear_BaseballCap"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>0.05</AimingAccuracy>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- == VAE_Headgear_Hardhat == -->
-				<!-- statBases -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_Hardhat"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.8</ArmorRating_Blunt>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_Hardhat"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- == VAE_Headgear_SurgicalMask == -->
-				<!-- statBases -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_SurgicalMask"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.02</ArmorRating_Blunt>
-						<Bulk>1</Bulk>
-						<WornBulk>0</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_SurgicalMask"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.03</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- == VAE_Headgear_Sunglasses and VAE_Headgear_Glasses == -->
-				<!-- statBases -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_Sunglasses" or defName="VAE_Headgear_Glasses"]/statBases</xpath>
-					<value>
-						<Bulk>0.5</Bulk>
-					</value>
-				</li>
-				<!-- Miscellaneous -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_Sunglasses" or defName="VAE_Headgear_Glasses"]/apparel/layers</xpath>
-					<value>
-						<layers>
-							<li>StrappedHead</li>
-						</layers>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Armor_Footwear.xml b/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Armor_Footwear.xml
deleted file mode 100644
index 44139cf2b1..0000000000
--- a/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Armor_Footwear.xml	
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Armour Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Plate Boots === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Footwear_PlateBoots"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1.5</WornBulk>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Footwear_PlateBoots"]/statBases/Mass</xpath>
-					<value>
-						<Mass>2.5</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Footwear_PlateBoots"]/statBases/EquipDelay</xpath>
-					<value>
-						<EquipDelay>3.5</EquipDelay>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Footwear_PlateBoots"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<MeleeDodgeChance>-0.05</MeleeDodgeChance>
-						<MoveSpeed>-0.46</MoveSpeed><!-- 10% of 4.6 -->
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Footwear_PlateBoots"]/description</xpath>
-					<value>
-						<description>A pair of plate boots which resemble sabatons. Because of the construction and weight of the boots, the wearer is somewhat slower and less nimble.</description>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAE_Footwear_PlateBoots"]/apparel/layers</xpath>
-					<value>
-						<li>Shell</li>
-					</value>
-				</li>
-
-				<!-- === Marine Boots === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Footwear_MarineBoots"]/statBases/Mass</xpath>
-					<value>
-						<Bulk>6.75</Bulk>
-						<WornBulk>1.5</WornBulk>
-						<Mass>3.6</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Footwear_MarineBoots"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>240</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Footwear_MarineBoots"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Footwear_MarineBoots"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>40.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Footwear_MarineBoots"]/label</xpath>
-					<value>
-						<label>power armor boots</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAE_Footwear_MarineBoots"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>5</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Footwear_MarineBoots"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>15</Plasteel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Footwear_MarineBoots"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>6</CarryWeight>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAE_Footwear_MarineBoots"]/apparel/layers</xpath>
-					<value>
-						<li>Shell</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Armor_Handwear.xml b/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Armor_Handwear.xml
deleted file mode 100644
index 7138d22514..0000000000
--- a/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Armor_Handwear.xml	
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Armour Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Plate Gloves === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Handwear_PlateGloves"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Handwear_PlateGloves"]/statBases/Mass</xpath>
-					<value>
-						<Mass>1.5</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Handwear_PlateGloves"]/statBases/EquipDelay</xpath>
-					<value>
-						<EquipDelay>2</EquipDelay>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAE_Handwear_PlateGloves"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeHitChance>-0.05</MeleeHitChance>
-						<AimingAccuracy>-0.05</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Handwear_PlateGloves"]/description</xpath>
-					<value>
-						<description>A pair of plate gloves which resemble gauntlets. Because of the construction of the gloves and the thickness of the material, the wearer is somewhat less capable of manipulation work.</description>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAE_Handwear_PlateGloves"]/apparel/layers</xpath>
-					<value>
-						<li>Shell</li>
-					</value>
-				</li>
-
-				<!-- === Marine Gloves === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Handwear_MarineGloves"]/statBases/Mass</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>2</WornBulk>
-						<Mass>3</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Handwear_MarineGloves"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>240</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Handwear_MarineGloves"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Handwear_MarineGloves"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>40.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Handwear_MarineGloves"]/label</xpath>
-					<value>
-						<label>power armor gloves</label>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAE_Handwear_MarineGloves"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>10</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Handwear_MarineGloves"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>10</Plasteel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAE_Handwear_MarineGloves"]/apparel/layers</xpath>
-					<value>
-						<li>Shell</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Armor_Industrial.xml b/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Armor_Industrial.xml
deleted file mode 100644
index 5859b1bbbb..0000000000
--- a/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Armor_Industrial.xml	
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Armour Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Ghillie Suit === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_GhillieSuit"]/statBases</xpath>
-					<value>
-						<Bulk>31</Bulk>
-						<WornBulk>4.7</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_GhillieSuit"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<AimingAccuracy>0.05</AimingAccuracy>
-					</value>
-				</li>
-
-				<!-- === HAZMAT Suit === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_HAZMATSuit"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>4</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_HAZMATSuit"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>10</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_HAZMATSuit"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_HAZMATSuit"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Armor_Medieval.xml b/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Armor_Medieval.xml
deleted file mode 100644
index 3e6b6a5220..0000000000
--- a/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Armor_Medieval.xml	
+++ /dev/null
@@ -1,328 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Armour Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Gambeson === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_Gambeson"]/statBases</xpath>
-					<value>
-						<Bulk>2.5</Bulk>
-						<WornBulk>1</WornBulk>
-						<ArmorRating_Sharp>0.06</ArmorRating_Sharp>
-						<ArmorRating_Blunt>0.09</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_Gambeson"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_Gambeson"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>30</costStuffCount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_Gambeson"]</xpath>
-					<value>
-						<costList>
-							<Cloth>40</Cloth>
-						</costList>
-					</value>
-				</li>
-
-				<!-- === Quilted Vest === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_QuiltedVest"]/statBases</xpath>
-					<value>
-						<Bulk>1.5</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_QuiltedVest"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_QuiltedVest"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>0.07</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_QuiltedVest"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>0.105</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_QuiltedVest"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>20</costStuffCount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_QuiltedVest"]</xpath>
-					<value>
-						<costList>
-							<Cloth>30</Cloth>
-						</costList>
-					</value>
-				</li>
-
-				<!-- === Light Plate Armor === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_LightPlateArmor"]/statBases/Mass</xpath>
-					<value>
-						<Bulk>52.5</Bulk>
-						<WornBulk>6</WornBulk>
-						<Mass>8</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_LightPlateArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_LightPlateArmor"]/statBases/StuffEffectMultiplierInsulation_Cold</xpath>
-					<value>
-						<StuffEffectMultiplierInsulation_Cold>0.1</StuffEffectMultiplierInsulation_Cold>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_LightPlateArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeDodgeChance>-0.08</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_LightPlateArmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Plate Shoulderpads === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_PlateShoulderpads"]/statBases/Mass</xpath>
-					<value>
-						<Bulk>4.5</Bulk>
-						<WornBulk>1.5</WornBulk>
-						<Mass>1.5</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_PlateShoulderpads"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_PlateShoulderpads"]/statBases/StuffEffectMultiplierInsulation_Cold</xpath>
-					<value>
-						<StuffEffectMultiplierInsulation_Cold>0</StuffEffectMultiplierInsulation_Cold>
-					</value>
-				</li>
-
-				<!-- === Chestplate === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_Chestplate"]/statBases/Mass</xpath>
-					<value>
-						<Bulk>30</Bulk>
-						<WornBulk>4.5</WornBulk>
-						<Mass>4.5</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_Chestplate"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_Chestplate"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeDodgeChance>-0.045</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_Chestplate"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.40</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.40</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Chainmail === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_Chainmail"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_Chainmail"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.341</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_Chainmail"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeDodgeChance>-0.1</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- === Plate Helmet === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_PlateHelmet"]/statBases/Mass</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<Mass>3</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_PlateHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_PlateHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>-0.1</AimingAccuracy>
-							<MeleeHitChance>-0.5</MeleeHitChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_PlateHelmet"]/stuffCategories</xpath>
-					<value>
-						<stuffCategories>
-							<li>Steeled</li>
-						</stuffCategories>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_PlateHelmet"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>UpperHead</li>
-							<li>Eyes</li>
-							<li>Teeth</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_PlateHelmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Jaw</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Jaw</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Armor_Neolithic.xml b/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Armor_Neolithic.xml
deleted file mode 100644
index 40eb643d4b..0000000000
--- a/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Armor_Neolithic.xml	
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Armour Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Wooden Armor === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_WoodenArmor"]/statBases/Mass</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>5</WornBulk>
-						<Mass>12</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_WoodenArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.9</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_WoodenArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_WoodenArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>75</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_WoodenArmor"]/statBases/ArmorRating_Heat</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_WoodenArmor"]/description</xpath>
-					<value>
-						<description>A vest with wooden logs and planks covering the front and back. No one should be using this in an actual firefight, but anything is better than nothing.</description>
-					</value>
-				</li>
-
-				<!-- === Stone War Mask === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_StoneWarMask"]/statBases/Mass</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>1.5</WornBulk>
-						<Mass>5.1</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_StoneWarMask"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_StoneWarMask"]/statBases/ArmorRating_Blunt</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_StoneWarMask"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<Suppressability>-0.1</Suppressability>
-						<AimingAccuracy>-0.2</AimingAccuracy>
-						<MeleeHitChance>-1</MeleeHitChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_StoneWarMask"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Armor_Spacer.xml b/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Armor_Spacer.xml
deleted file mode 100644
index dbac68ef2e..0000000000
--- a/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Armor_Spacer.xml	
+++ /dev/null
@@ -1,494 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Armour Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Trooper Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_TrooperHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk><!-- Changed bulk to 4 since advanced helmet is 4 bulk and recon power armor helmet is 4 bulk. -->
-						<WornBulk>0.5</WornBulk>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd" MayRequire="ludeon.rimworld.royalty">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_RoyalTrooperHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>0.5</WornBulk>
-						<NightVisionEfficiency_Apparel>0.7</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_TrooperHelmet" or defName="VAE_Headgear_RoyalTrooperHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_TrooperHelmet" or defName="VAE_Headgear_RoyalTrooperHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>20</ArmorRating_Blunt><!-- Blunt armor is based off it being 9mm RHA worth of sharp armor. -->
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_TrooperHelmet" or defName="VAE_Headgear_RoyalTrooperHelmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0.25</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_TrooperHelmet" or defName="VAE_Headgear_RoyalTrooperHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>190</MaxHitPoints><!-- Same health as recon power armor helmet. -->
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_TrooperHelmet"]/equippedStatOffsets/MentalBreakThreshold</xpath>
-					<value>
-						<PsychicSensitivity>-0.1</PsychicSensitivity>
-						<AimingAccuracy>0.1</AimingAccuracy>
-						<ToxicEnvironmentResistance>0.10</ToxicEnvironmentResistance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace" MayRequire="ludeon.rimworld.royalty">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_RoyalTrooperHelmet"]/equippedStatOffsets/MentalBreakThreshold</xpath>
-					<value>
-						<AimingAccuracy>0.1</AimingAccuracy>
-						<ToxicEnvironmentResistance>0.10</ToxicEnvironmentResistance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_TrooperHelmet" or defName="VAE_Headgear_RoyalTrooperHelmet"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>10</DevilstrandCloth>
-					</value>
-				</li>
-
-				<!-- It has no visor... -->
-				<!--<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_TrooperHelmet"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Eyes</li>
-					</value>
-				</li>-->
-
-				<!-- === Trooper Armor === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_TrooperArmor" or defName="VAE_Apparel_RoyalTrooperArmor"]/statBases/Mass</xpath>
-					<value>
-						<Bulk>40</Bulk><!-- It's supposed to be just small enough to be able to wear something on the shell layer, I think dropping it to this is good enough. -->
-						<WornBulk>6</WornBulk>
-						<Mass>20</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_TrooperArmor" or defName="VAE_Apparel_RoyalTrooperArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp><!-- Just a bit better than a plasteel armor vest, enough to deflect 7.62mm NATO and 7.62mmR. -->
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_TrooperArmor" or defName="VAE_Apparel_RoyalTrooperArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>28</ArmorRating_Blunt><!-- Blunt armor is based off it being 12mm RHA worth of sharp armor. -->
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_TrooperArmor" or defName="VAE_Apparel_RoyalTrooperArmor"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0.25</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_TrooperArmor" or defName="VAE_Apparel_RoyalTrooperArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>400</MaxHitPoints><!-- Same health as recon power armor. -->
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_TrooperArmor" or defName="VAE_Apparel_RoyalTrooperArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>0.50</MoveSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_TrooperArmor" or defName="VAE_Apparel_RoyalTrooperArmor"]/equippedStatOffsets/MentalBreakThreshold</xpath>
-					<value>
-						<CarryWeight>25</CarryWeight>
-						<CarryBulk>7.5</CarryBulk>
-						<ShootingAccuracyPawn>0.05</ShootingAccuracyPawn>
-						<ToxicEnvironmentResistance>0.3</ToxicEnvironmentResistance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_TrooperArmor" or defName="VAE_Apparel_RoyalTrooperArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_TrooperArmor" or defName="VAE_Apparel_RoyalTrooperArmor"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>30</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_TrooperArmor" or defName="VAE_Apparel_RoyalTrooperArmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Siegebreaker Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_HeavyMarineHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>2</WornBulk>
-						<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd" MayRequire="ludeon.rimworld.royalty">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_RoyalSiegeHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>2</WornBulk>
-						<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_HeavyMarineHelmet" or defName="VAE_Headgear_RoyalSiegeHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20.4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_HeavyMarineHelmet" or defName="VAE_Headgear_RoyalSiegeHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>50</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_HeavyMarineHelmet" or defName="VAE_Headgear_RoyalSiegeHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>260</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_HeavyMarineHelmet" or defName="VAE_Headgear_RoyalSiegeHelmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_HeavyMarineHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VAE_Headgear_HeavyMarineHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_HeavyMarineHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>0.15</AimingAccuracy>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-							<MeleeDodgeChance>-0.15</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional" MayRequire="ludeon.rimworld.royalty">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_RoyalSiegeHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VAE_Headgear_RoyalSiegeHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationReplace" MayRequire="ludeon.rimworld.royalty">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_RoyalSiegeHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>0.15</AimingAccuracy>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-							<PsychicSensitivity>0.05</PsychicSensitivity>
-							<PsychicEntropyRecoveryRate>0.033</PsychicEntropyRecoveryRate>
-							<MeleeDodgeChance>-0.15</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_HeavyMarineHelmet"]/costList</xpath>
-					<value>
-						<costList>
-							<Plasteel>40</Plasteel>
-							<DevilstrandCloth>25</DevilstrandCloth>
-							<Hyperweave>5</Hyperweave>
-							<ComponentSpacer>2</ComponentSpacer>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace" MayRequire="ludeon.rimworld.royalty">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_RoyalSiegeHelmet"]/costList</xpath>
-					<value>
-						<costList>
-							<Plasteel>60</Plasteel>
-							<DevilstrandCloth>25</DevilstrandCloth>
-							<Hyperweave>5</Hyperweave>
-							<ComponentSpacer>2</ComponentSpacer>
-							<Gold>10</Gold>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_HeavyMarineHelmet" or defName="VAE_Headgear_RoyalSiegeHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!-- === Siegebreaker Armor === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_HeavyMarineArmor" or defName="VAE_Apparel_RoyalSiegeArmor"]/statBases/Mass</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>20</WornBulk>
-						<Mass>80</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_HeavyMarineArmor" or defName="VAE_Apparel_RoyalSiegeArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>26</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_HeavyMarineArmor" or defName="VAE_Apparel_RoyalSiegeArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>60</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_HeavyMarineArmor" or defName="VAE_Apparel_RoyalSiegeArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>600</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_HeavyMarineArmor" or defName="VAE_Apparel_RoyalSiegeArmor"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_HeavyMarineArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>100</CarryWeight>
-							<CarryBulk>20</CarryBulk>
-							<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace" MayRequire="ludeon.rimworld.royalty">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_RoyalSiegeArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>100</CarryWeight>
-							<CarryBulk>20</CarryBulk>
-							<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-							<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
-							<PsychicSensitivity>0.05</PsychicSensitivity>
-							<PsychicEntropyRecoveryRate>0.033</PsychicEntropyRecoveryRate>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_HeavyMarineArmor" or defName="VAE_Apparel_RoyalSiegeArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_HeavyMarineArmor"]/costList</xpath>
-					<value>
-						<costList>
-							<Plasteel>140</Plasteel>
-							<DevilstrandCloth>50</DevilstrandCloth>
-							<Hyperweave>10</Hyperweave>
-							<Uranium>100</Uranium>
-							<ComponentSpacer>8</ComponentSpacer>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace" MayRequire="ludeon.rimworld.royalty">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_RoyalSiegeArmor"]/costList</xpath>
-					<value>
-						<costList>
-							<Plasteel>180</Plasteel>
-							<DevilstrandCloth>50</DevilstrandCloth>
-							<Hyperweave>10</Hyperweave>
-							<Uranium>100</Uranium>
-							<ComponentSpacer>8</ComponentSpacer>
-							<Gold>18</Gold>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_HeavyMarineArmor" or defName="VAE_Apparel_RoyalSiegeArmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Energy shields === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_HeavyMarineArmor" or defName="VAE_Apparel_RoyalSiegeArmor"]/statBases/EnergyShieldRechargeRate</xpath>
-					<value>
-						<EnergyShieldRechargeRate>0.03</EnergyShieldRechargeRate>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_HeavyMarineArmor" or defName="VAE_Apparel_RoyalSiegeArmor"]/statBases/EnergyShieldEnergyMax</xpath>
-					<value>
-						<EnergyShieldEnergyMax>0.6</EnergyShieldEnergyMax>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_HeavyMarineArmor"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldRechargeRate</xpath>
-					<value>
-						<EnergyShieldRechargeRate>0.15</EnergyShieldRechargeRate>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace" MayRequire="ludeon.rimworld.royalty">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_RoyalSiegeArmor"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldRechargeRate</xpath>
-					<value>
-						<EnergyShieldRechargeRate>0.3</EnergyShieldRechargeRate>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Apparel_HeavyMarineArmor" or defName="VAE_Apparel_RoyalSiegeArmor"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldEnergyMax</xpath>
-					<value>
-						<EnergyShieldEnergyMax>150</EnergyShieldEnergyMax>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
diff --git a/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Headgear_Industrial.xml b/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Headgear_Industrial.xml
deleted file mode 100644
index f5da42eb40..0000000000
--- a/Patches/Vanilla Armour Expanded/ThingDefs_Misc/Headgear_Industrial.xml	
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Armour Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Balaclava === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_Balaclava"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>0.5</Bulk>
-						<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_Balaclava"]/apparel/layers</xpath>
-					<value>
-						<layers>
-							<li>OnHead</li>
-						</layers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_Balaclava"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>UpperHead</li>
-							<li>Teeth</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-				<!-- === Ghillie Hood === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_GhillieHood"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_GhillieHood"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<AimingAccuracy>0.1</AimingAccuracy>
-					</value>
-				</li>
-
-				<!-- === HAZMAT Mask === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_HAZMATMask"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-						<Bulk>6</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_HAZMATMask"]/equippedStatOffsets/WorkSpeedGlobal</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VAE_Headgear_HAZMATMask"]/apparel/layers</xpath>
-					<value>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Base Generation Expanded/SettlementDefs.xml b/Patches/Vanilla Base Generation Expanded/SettlementDefs.xml
deleted file mode 100644
index 2b754595db..0000000000
--- a/Patches/Vanilla Base Generation Expanded/SettlementDefs.xml	
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Base Generation Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Remove the patched-out weapons === -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/KCSG.SettlementLayoutDef[
-						defName="VBGE_OutlanderDefence" or
-						defName="VBGE_PiratesDefence" or
-						defName="VBGE_EmpireDefence"
-						]/stockpileOptions/fillWithDefs/li[.="Gun_SmokeLauncher"] </xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/KCSG.SettlementLayoutDef[
-						defName="VBGE_OutlanderDefence" or
-						defName="VBGE_PiratesDefence" or
-						defName="VBGE_EmpireDefence"
-						]/stockpileOptions/fillWithDefs/li[.="Gun_EmpLauncher"] </xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/KCSG.SettlementLayoutDef[defName="VBGE_TribalDefence"]/stockpileOptions/fillWithDefs/li[.="ThrumboHorn"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/KCSG.SettlementLayoutDef[defName="VBGE_TribalDefence"]/stockpileOptions/fillWithDefs/li[.="ElephantTusk"]</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Brewing Expanded/Alcohol.xml b/Patches/Vanilla Brewing Expanded/Alcohol.xml
deleted file mode 100644
index 2e226f9b3d..0000000000
--- a/Patches/Vanilla Brewing Expanded/Alcohol.xml	
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Brewing Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Beverages === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="VBE_DrugToolBase"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.1</MeleeCritChance>
-							<MeleeParryChance>0.33</MeleeParryChance>
-							<MeleeDodgeChance>0.07</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="VBE_DrugToolBase"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2.22</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>neck</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>3.33</cooldownTime>
-								<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Neck</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Mixing === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="VBE_WhiskeyAsIngredient"]/stages/li[1]/statOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<ShootingAccuracyPawn>3</ShootingAccuracyPawn>
-						<AimingAccuracy>1.5</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="VBE_VodkaAsIngredient"]/stages/li[1]/statOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>2</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="VBE_ConsumedGoStock"]/stages/li[1]</xpath>
-					<value>
-						<statOffsets>
-							<Suppressability>-0.10</Suppressability>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="VBE_RBMeadAsIngredient"]/stages/li[1]/statOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-0.10</SmokeSensitivity>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Brewing Expanded/ThingDefs_Items.xml b/Patches/Vanilla Brewing Expanded/ThingDefs_Items.xml
deleted file mode 100644
index 710a24a03d..0000000000
--- a/Patches/Vanilla Brewing Expanded/ThingDefs_Items.xml	
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Brewing Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VBE_Cigarettes"]/statBases</xpath>
-					<value>
-						<Bulk>0.01</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VBE_Cigars"]/statBases</xpath>
-					<value>
-						<Bulk>0.05</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VBE_Tea"]/statBases</xpath>
-					<value>
-						<Bulk>0.20</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VBE_Soda"]/statBases</xpath>
-					<value>
-						<Bulk>0.25</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VBE_Juice"]/statBases</xpath>
-					<value>
-						<Bulk>1.75</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VBE_EnergyDrink"]/statBases</xpath>
-					<value>
-						<Bulk>0.70</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VBE_HotCoffee" or defName="VBE_IcedCoffee"]/statBases</xpath>
-					<value>
-						<Bulk>0.40</Bulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Chemfuel Expanded/Items_Chemfuel.xml b/Patches/Vanilla Chemfuel Expanded/Items_Chemfuel.xml
deleted file mode 100644
index 18b6c9d396..0000000000
--- a/Patches/Vanilla Chemfuel Expanded/Items_Chemfuel.xml	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Chemfuel Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Give chemfuel-like product appropriate bulk. -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VCHE_Deepchem"]/statBases</xpath>
-					<value>
-						<Bulk>0.05</Bulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Ancients/CustomGenDefs_Vaults.xml b/Patches/Vanilla Factions Expanded - Ancients/CustomGenDefs_Vaults.xml
deleted file mode 100644
index ff39f4f762..0000000000
--- a/Patches/Vanilla Factions Expanded - Ancients/CustomGenDefs_Vaults.xml	
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Ancients</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<KCSG.SymbolDef>
-							<defName>Ammo_556x45mmNATO_Incendiary</defName>
-							<thing>Ammo_556x45mmNATO_Incendiary</thing>
-						</KCSG.SymbolDef>
-
-						<KCSG.SymbolDef>
-							<defName>Ammo_12Gauge_Buck</defName>
-							<thing>Ammo_12Gauge_Buck</thing>
-						</KCSG.SymbolDef>
-
-						<KCSG.SymbolDef>
-							<defName>Ammo_45ACP_AP</defName>
-							<thing>Ammo_45ACP_AP</thing>
-						</KCSG.SymbolDef>
-
-						<KCSG.SymbolDef>
-							<defName>Ammo_762x51mmNATO_Incendiary</defName>
-							<thing>Ammo_762x51mmNATO_Incendiary</thing>
-						</KCSG.SymbolDef>
-
-						<KCSG.SymbolDef>
-							<defName>Ammo_762x54mmR_HE</defName>
-							<thing>Ammo_762x54mmR_HE</thing>
-						</KCSG.SymbolDef>
-
-						<KCSG.SymbolDef>
-							<defName>Ammo_6x24mmCharged</defName>
-							<thing>Ammo_6x24mmCharged</thing>
-						</KCSG.SymbolDef>
-
-					</value>
-				</li>
-
-				<!-- I'm not sure if this works, and it's probably very fragile. -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultAlpha"]/layouts/li[1]/li[66]</xpath>
-					<value>
-						<li>.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Gun_AssaultRifle,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Apparel_PowerArmor,Ammo_556x45mmNATO_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultBravo"]/layouts/li[1]/li[14]</xpath>
-					<value>
-						<li>.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_556x45mmNATO_Incendiary,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Apparel_PowerArmor,.,.,.,.,.,.,.,.,.,.,.</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultCharlie"]/layouts/li[1]/li[10]</xpath>
-					<value>
-						<li>.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_556x45mmNATO_Incendiary,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Apparel_PowerArmor,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultDelta"]/layouts/li[1]/li[19]</xpath>
-					<value>
-						<li>.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Gun_AssaultRifle,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultF"]/layouts/li[1]/li[35]</xpath>
-					<value>
-						<li>.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_556x45mmNATO_Incendiary,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultG"]/layouts/li[1]/li[23]</xpath>
-					<value>
-						<li>.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,MealSurvivalPack,MealSurvivalPack,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Ammo_12Gauge_Buck,Gun_ChainShotgun,Ammo_12Gauge_Buck,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultH"]/layouts/li[1]/li[31]</xpath>
-					<value>
-						<li>.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_762x51mmNATO_Incendiary,Ammo_762x54mmR_HE,Ammo_762x54mmR_HE,Gun_LMG,Ammo_45ACP_AP,Gun_Minigun,Gun_Autopistol,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultH"]/layouts/li[1]/li[35]</xpath>
-					<value>
-						<li>.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,MealSurvivalPack,Ammo_762x51mmNATO_Incendiary,Ammo_762x51mmNATO_Incendiary,Ammo_762x51mmNATO_Incendiary,Ammo_762x51mmNATO_Incendiary,.,.,.,.,.,MealSurvivalPack,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_45ACP_AP,Ammo_45ACP_AP,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Apparel_PowerArmor,Gun_Autopistol,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultI"]/layouts/li[1]/li[19]</xpath>
-					<value>
-						<li>.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Gun_ChargeRifle,Ammo_6x24mmCharged,Ammo_6x24mmCharged,Gun_HeavySMG,Ammo_45ACP_AP,Ammo_45ACP_AP,Apparel_PowerArmorHelmet,Ammo_556x45mmNATO_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultJ"]/layouts/li[1]/li[35]</xpath>
-					<value>
-						<li>.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Gun_MachinePistol,Ammo_45ACP_AP,Apparel_PowerArmorHelmet,Ammo_45ACP_AP,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultJ"]/layouts/li[1]/li[36]</xpath>
-					<value>
-						<li>.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_762x54mmR_HE,Gun_LMG,Ammo_762x54mmR_HE,Apparel_PowerArmor,Ammo_556x45mmNATO_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultJ"]/layouts/li[1]/li[36]</xpath>
-					<value>
-						<li>.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_556x45mmNATO_Incendiary,Gun_MachinePistol,Ammo_45ACP_AP,Ammo_45ACP_AP,Ammo_762x54mmR_HE,Gun_LMG,Ammo_762x54mmR_HE,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Ancients/Hediffs_Powers.xml b/Patches/Vanilla Factions Expanded - Ancients/Hediffs_Powers.xml
deleted file mode 100644
index bc64fe462a..0000000000
--- a/Patches/Vanilla Factions Expanded - Ancients/Hediffs_Powers.xml	
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Ancients</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="VFEA_PlasteelClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>plasteel claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.35</cooldownTime>
-								<armorPenetrationSharp>1.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<soundMeleeHit>Pawn_Melee_PowerClaw_Hit</soundMeleeHit>
-								<soundMeleeMiss>Pawn_Melee_PowerClaw_Miss</soundMeleeMiss>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Ancients/Patch_Abilities.xml b/Patches/Vanilla Factions Expanded - Ancients/Patch_Abilities.xml
deleted file mode 100644
index c2b08c066b..0000000000
--- a/Patches/Vanilla Factions Expanded - Ancients/Patch_Abilities.xml	
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Ancients</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Super Jump -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VFEA_SuperJump"]/range</xpath>
-					<value>
-						<range>20</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VFEA_SuperJump"]/description</xpath>
-					<value>
-						<description>Jump over a medium distance (20 cells) within line of sight to close the distance to the enemy.</description>
-					</value>
-				</li>
-
-				<!-- Weapon Expert -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEAncients.PowerDef[defName="WeaponExpert"]/statFactors</xpath>
-					<value>
-						<ReloadSpeed>2</ReloadSpeed>
-						<ShootingAccuracyPawn>2</ShootingAccuracyPawn>
-					</value>
-				</li>
-
-				<!-- Marksmanship -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEAncients.PowerDef[defName="Marksmanship"]/setStats/ShootingAccuracyPawn</xpath>
-					<value>
-						<ShootingAccuracyPawn>20</ShootingAccuracyPawn>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEAncients.PowerDef[defName="Marksmanship"]</xpath>
-					<value>
-						<statFactors>
-							<AimingAccuracy>5</AimingAccuracy>
-						</statFactors>
-					</value>
-				</li>
-
-				<!-- Assassin -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEAncients.PowerDef[defName="Assassin"]</xpath>
-					<value>
-						<statOffsets>
-							<MeleeCritChance>100</MeleeCritChance>
-						</statOffsets>
-					</value>
-				</li>
-
-				<!-- Super Strength -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEAncients.PowerDef[defName="SuperStrength"]/statFactors</xpath>
-					<value>
-						<CarryWeight>2</CarryWeight>
-						<CarryBulk>2</CarryBulk>
-					</value>
-				</li>
-
-				<!-- Darkvision -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEAncients.PowerDef[defName="Darkvision"]</xpath>
-					<value>
-						<statOffsets>
-							<NightVisionEfficiency>1</NightVisionEfficiency>
-						</statOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Ancients/PawnKinds_Spacer.xml b/Patches/Vanilla Factions Expanded - Ancients/PawnKinds_Spacer.xml
deleted file mode 100644
index c0d56b1b7d..0000000000
--- a/Patches/Vanilla Factions Expanded - Ancients/PawnKinds_Spacer.xml	
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Ancients</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="VFEA_AncientSoldierOneAbility" or defName="VFEA_AncientSoldierTwoAbilities" or defName="VFEA_PlayerAncientSoldierOneAbility"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>7</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>175</min>
-									<max>375</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>CE_Sidearm_Melee</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/PawnKindDef[defName="VFEA_AncientSoldierOneAbility" or defName="VFEA_AncientSoldierTwoAbilities" or defName="VFEA_PlayerAncientSoldierOneAbility"]/skills</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/PawnKindDef[defName="VFEA_AncientSoldierOneAbility" or defName="VFEA_AncientSoldierTwoAbilities" or defName="VFEA_PlayerAncientSoldierOneAbility"]</xpath>
-						<value>
-							<skills>
-								<li>
-									<skill>Shooting</skill>
-									<range>8~14</range>
-								</li>
-								<li>
-									<skill>Melee</skill>
-									<range>6~14</range>
-								</li>
-							</skills>
-						</value>
-					</nomatch>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Ancients/ThingDefs_Sentry.xml b/Patches/Vanilla Factions Expanded - Ancients/ThingDefs_Sentry.xml
deleted file mode 100644
index 061826c0e4..0000000000
--- a/Patches/Vanilla Factions Expanded - Ancients/ThingDefs_Sentry.xml	
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Ancients</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Remove refuelable property -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName = "VFEA_Turret_AncientSecurityTurret" or
-						defName = "VFEA_Turret_AncientPointDefense"
-						]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
-				</li>
-
-				<!-- Replace vanilla thingClass -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "VFEA_Turret_AncientSecurityTurret" or
-						@Name = "AncientPointDefenseTurretBase"
-						]/thingClass </xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<!-- Make turrets taller -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VFEA_Turret_AncientSecurityTurret"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEA_Turret_AncientPointDefense"]</xpath>
-					<value>
-						<fillPercent>0.95</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName = "VFEA_Turret_AncientSecurityTurret" or
-						defName = "VFEA_Turret_AncientPointDefense"
-						]/statBases </xpath>
-					<value>
-						<AimingAccuracy>0.75</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VFEA_Turret_AncientSecurityTurret"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>1.1</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VFEA_Turret_AncientPointDefense"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>1.25</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "VFEA_Turret_AncientSecurityTurret" or
-						defName = "VFEA_Turret_AncientPointDefense"
-						]/building/turretBurstCooldownTime </xpath>
-					<value>
-						<turretBurstCooldownTime>1.1</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFEA_Turret_AncientSecurityTurret" or defName="VFEA_Turret_AncientPointDefense"]/comps/li[@Class = "CompProperties_Explosive"]</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEA_Turret_AncientSecurityTurret"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<!-- Make turrets taller -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VFEA_Turret_AncientSecurityTurret"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>125</MaxHitPoints>
-					</value>
-				</li>
-
-				<!-- Ancient Security Turret -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFEA_Gun_AncientSecurityTurret</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>0.78</SwayFactor>
-						<Bulk>10.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.71</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>54</range>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>GunShotA</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>300</magazineSize>
-						<reloadTime>9.5</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!-- Ancient Point Defense Gun -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFEA_Gun_AncientPointDefenseTurret</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.25</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>2.3</warmupTime>
-						<range>62</range>
-						<burstShotCount>50</burstShotCount>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-						<targetParams>
-							<canTargetLocations>True</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1000</magazineSize>
-						<reloadTime>9.2</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<weaponTags Inherit="False">
-						<li>TurretGun</li>
-					</weaponTags>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Classical/Ammo_Javelin.xml b/Patches/Vanilla Factions Expanded - Classical/Ammo_Javelin.xml
deleted file mode 100644
index c8f3116a5e..0000000000
--- a/Patches/Vanilla Factions Expanded - Classical/Ammo_Javelin.xml	
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Classical</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<CombatExtended.AmmoCategoryDef>
-							<defName>HeavyJavelin</defName>
-							<label>Heavy Javelin</label>
-							<description>A heavy javelin with an extended shank, making it ideal for punching through shields and armor.</description>
-						</CombatExtended.AmmoCategoryDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_Javelins"]/ammoTypes</xpath>
-					<value>
-						<VFEC_Javelin>Classical_Javelin_Fired</VFEC_Javelin>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingDef ParentName="BasePilumProjectile">
-							<defName>Classical_Javelin_Thrown</defName>
-							<label>javelin</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>14</damageAmountBase>
-								<speed>14</speed>
-								<armorPenetrationBlunt>6.44</armorPenetrationBlunt>
-								<armorPenetrationSharp>3.5</armorPenetrationSharp>
-								<secondaryDamage>
-									<li>
-										<def>VFEC_ApparelDamage</def>
-										<amount>20</amount>
-									</li>
-								</secondaryDamage>
-								<preExplosionSpawnChance>0.40</preExplosionSpawnChance><!-- Roman javelins/pila were designed to break or bend on impact, to prevent them being thrown back. -->
-								<preExplosionSpawnThingDef>VFEC_Javelin</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BasePilumProjectile">
-							<defName>Classical_Javelin_Fired</defName>
-							<label>pilum (fired)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>29</damageAmountBase>
-								<speed>30</speed>
-								<armorPenetrationBlunt>48.12</armorPenetrationBlunt>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<secondaryDamage>
-									<li>
-										<def>VFEC_ApparelDamage</def>
-										<amount>20</amount>
-									</li>
-								</secondaryDamage>
-								<preExplosionSpawnChance>0.25</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>VFEC_Javelin</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Classical/Ammo_Scorpion.xml b/Patches/Vanilla Factions Expanded - Classical/Ammo_Scorpion.xml
deleted file mode 100644
index 90cef75eb2..0000000000
--- a/Patches/Vanilla Factions Expanded - Classical/Ammo_Scorpion.xml	
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Classical</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Ammo === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_ScorpionBolt</defName>
-							<label>scorpion bolts</label>
-							<ammoTypes>
-								<Ammo_CrossbowBolt_Stone>Projectile_ScorpionBolt_Stone</Ammo_CrossbowBolt_Stone>
-								<Ammo_CrossbowBolt_Steel>Projectile_ScorpionBolt_Steel</Ammo_CrossbowBolt_Steel>
-								<Ammo_CrossbowBolt_Plasteel>Projectile_ScorpionBolt_Plasteel</Ammo_CrossbowBolt_Plasteel>
-								<Ammo_CrossbowBolt_Venom>Projectile_ScorpionBolt_Venom</Ammo_CrossbowBolt_Venom>
-								<Ammo_CrossbowBolt_Flame>Projectile_ScorpionBolt_Flame</Ammo_CrossbowBolt_Flame>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef ParentName="BaseCrossbowBoltProjectile">
-							<defName>Projectile_ScorpionBolt_Stone</defName>
-							<label>scorpion bolt (stone)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Stone</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>11</damageAmountBase>
-								<armorPenetrationBlunt>3.65</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.95</armorPenetrationSharp>
-								<preExplosionSpawnChance>0.05</preExplosionSpawnChance><!-- 11.11 bolts per resource -->
-								<preExplosionSpawnThingDef>Ammo_CrossbowBolt_Stone</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseCrossbowBoltProjectile">
-							<defName>Projectile_ScorpionBolt_Steel</defName>
-							<label>scorpion bolt (steel)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>14</damageAmountBase>
-								<armorPenetrationBlunt>6.85</armorPenetrationBlunt>
-								<armorPenetrationSharp>3.45</armorPenetrationSharp>
-								<speed>34</speed>
-								<preExplosionSpawnChance>0.233</preExplosionSpawnChance><!-- 14.99 bolts per resource -->
-								<preExplosionSpawnThingDef>Ammo_CrossbowBolt_Steel</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseCrossbowBoltProjectile">
-							<defName>Projectile_ScorpionBolt_Plasteel</defName>
-							<label>scorpion bolt (plasteel)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Plasteel</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationBlunt>8.82</armorPenetrationBlunt>
-								<armorPenetrationSharp>4.75</armorPenetrationSharp>
-								<speed>37</speed>
-								<preExplosionSpawnChance>0.5</preExplosionSpawnChance><!-- 25 bolts per resource -->
-								<preExplosionSpawnThingDef>Ammo_CrossbowBolt_Plasteel</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseCrossbowBoltProjectile">
-							<defName>Projectile_ScorpionBolt_Venom</defName>
-							<label>scorpion bolt (venom)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Venom</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>ArrowVenom</damageDef>
-								<damageAmountBase>14</damageAmountBase>
-								<armorPenetrationBlunt>6.85</armorPenetrationBlunt>
-								<armorPenetrationSharp>3.25</armorPenetrationSharp>
-								<speed>34</speed>
-								<preExplosionSpawnChance>0.4</preExplosionSpawnChance><!-- 25 arrows per resource -->
-								<preExplosionSpawnThingDef>Ammo_CrossbowBolt_Steel</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseCrossbowBoltProjectile">
-							<defName>Projectile_ScorpionBolt_Flame</defName>
-							<label>scorpion bolt (flame)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Flame</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Flame</damageDef>
-								<damageAmountBase>7</damageAmountBase>
-								<armorPenetrationBlunt>3.68</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.25</armorPenetrationSharp>
-								<speed>34</speed>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Classical/Apparel_Classical.xml b/Patches/Vanilla Factions Expanded - Classical/Apparel_Classical.xml
deleted file mode 100644
index 8290fabad7..0000000000
--- a/Patches/Vanilla Factions Expanded - Classical/Apparel_Classical.xml	
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Classical</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Toga -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEC_Toga"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>2</WornBulk>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Legionaire Armor -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEC_Apparel_LegionnaireArmor"]/statBases</xpath>
-					<value>
-						<Bulk>60</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEC_Apparel_LegionnaireArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFEC_Apparel_LegionnaireArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEC_Apparel_LegionnaireArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeDodgeChance>-0.05</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFEC_Apparel_LegionnaireArmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- Centurion Armor -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEC_Apparel_CenturionArmor"]/statBases</xpath>
-					<value>
-						<Bulk>80</Bulk>
-						<WornBulk>12</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEC_Apparel_CenturionArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.35</StuffEffectMultiplierArmor><!-- Almost same thickness as plate armor. -->
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFEC_Apparel_CenturionArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEC_Apparel_CenturionArmor"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeDodgeChance>-0.10</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFEC_Apparel_CenturionArmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-										<li>Arm</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Classical/Apparel_Headgear.xml b/Patches/Vanilla Factions Expanded - Classical/Apparel_Headgear.xml
deleted file mode 100644
index d096b2bebc..0000000000
--- a/Patches/Vanilla Factions Expanded - Classical/Apparel_Headgear.xml	
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Classical</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Wreath -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEC_Wreath"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<!-- Legionnaire Helmet -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEC_Apparel_LegionnaireHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor><!-- Most sources I can find put Roman helmets around this thickness. -->
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEC_Apparel_LegionnaireHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFEC_Apparel_LegionnaireHelmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.50</ArmorRating_Sharp>
-									<parts>
-										<li>Jaw</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.50</ArmorRating_Blunt>
-									<parts>
-										<li>Jaw</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- Centurion Helmet - 'Cedo Alterum!'  -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEC_Apparel_CenturionHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.25</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEC_Apparel_CenturionHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFEC_Apparel_CenturionHelmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Jaw</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Jaw</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Classical/Items_Resource_Stuff.xml b/Patches/Vanilla Factions Expanded - Classical/Items_Resource_Stuff.xml
deleted file mode 100644
index b2cb41a712..0000000000
--- a/Patches/Vanilla Factions Expanded - Classical/Items_Resource_Stuff.xml	
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Classical</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Opium -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName = "VFEC_OpiumHigh"]/stages/li</xpath>
-					<value>
-						<statFactors>
-							<Suppressability>0.50</Suppressability>
-						</statFactors>
-					</value>
-				</li>
-
-				<!-- Bronze -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEC_Bronze"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEC_Bronze"]/stuffProps/categories</xpath>
-					<value>
-						<li>Metallic_Weapon</li>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEC_Bronze"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.83</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEC_Bronze"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>1.24</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEC_Bronze"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEC_Bronze"]/stuffProps/statFactors</xpath>
-					<value>
-						<MeleePenetrationFactor>0.80</MeleePenetrationFactor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEC_Bronze"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>1.1</Mass>
-					</value>
-				</li>
-
-				<!-- Tyrian -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEC_Tyrian"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.01</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEC_Tyrian"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.015</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEC_Tyrian"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.044</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEC_Tyrian"]/statBases</xpath>
-					<value>
-						<Bulk>0.05</Bulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Classical/PawnKinds_Misc.xml b/Patches/Vanilla Factions Expanded - Classical/PawnKinds_Misc.xml
deleted file mode 100644
index da464372e1..0000000000
--- a/Patches/Vanilla Factions Expanded - Classical/PawnKinds_Misc.xml	
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Classical</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Increase Legionaire weapon money slightly. -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="VFEC_Legionnaire"]/weaponMoney</xpath>
-					<value>
-						<weaponMoney>140~300</weaponMoney>
-					</value>
-				</li>
-
-				<!-- Give Auxilaries some javelins. -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="VFEC_RepublicAuxilia"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.70</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>250</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>NeolithicMeleeBasic</li>
-										<li>ClassicalSimple</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- Give Archers some arrows. -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="VFEC_RepublicArcher"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>12</min>
-								<max>20</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.50</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>250</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>NeolithicMeleeBasic</li>
-										<li>ClassicalSimple</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- Give pawns some packs. -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[defName="VFEC_RepublicArcher" or defName="VFEC_RepublicAuxilia"]/apparelRequired</xpath>
-					<value>
-						<li>CE_Apparel_TribalBackpack</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Classical/ThingDefs_Manned.xml b/Patches/Vanilla Factions Expanded - Classical/ThingDefs_Manned.xml
deleted file mode 100644
index 25e1d3f520..0000000000
--- a/Patches/Vanilla Factions Expanded - Classical/ThingDefs_Manned.xml	
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Classical</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName = "VFEC_Turret_Scorpion"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VFEC_Turret_Scorpion"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VFEC_Turret_Scorpion"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VFEC_Turret_Scorpion"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>1.8</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<!-- ========== Scorpion - Weapon ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFEC_TurretGun_Scorpion</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>1</ShotSpread>
-						<SwayFactor>1</SwayFactor>
-						<Bulk>4.00</Bulk>
-						<RangedWeapon_Cooldown>1.8</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Projectile_ScorpionBolt_Steel</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>42</range>
-						<soundCast>Bow_Large</soundCast>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_ScorpionBolt</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>false</noSingleShot>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "VFEC_TurretGun_Scorpion"]</xpath>
-					<value>
-						<weaponTags>
-							<li>TurretGun</li>
-						</weaponTags>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Classical/ThingDefs_Shields.xml b/Patches/Vanilla Factions Expanded - Classical/ThingDefs_Shields.xml
deleted file mode 100644
index b0584aa12b..0000000000
--- a/Patches/Vanilla Factions Expanded - Classical/ThingDefs_Shields.xml	
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Classical</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Roman Shield (Scutum) -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEC_Shield_Heavy"]</xpath>
-					<value>
-						<ThingDef ParentName="ShieldBase">
-							<defName>VFEC_Shield_Heavy</defName>
-							<label>kite shield</label>
-							<description>A heavily fortified square shield that covers one's body from shin to shoulder, heavy enough to slow those weidling it at the benefit of incredible protection.</description>
-							<techLevel>Neolithic</techLevel>
-							<graphicData>
-								<texPath>Things/Item/Equipment/Shield/HeavyShield/HeavyShield</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>0.88</drawSize>
-							</graphicData>
-							<thingCategories Inherit="False">
-								<li>Shields</li>
-							</thingCategories>
-							<costStuffCount>25</costStuffCount>
-							<costList>
-								<WoodLog>60</WoodLog>
-								<Steel>35</Steel>
-							</costList>
-							<stuffCategories>
-								<li>Leathery</li>
-							</stuffCategories>
-							<recipeMaker>
-								<researchPrerequisite>VFEC_HeavyShieldMaking</researchPrerequisite>
-								<recipeUsers>
-									<li>FueledSmithy</li>
-									<li>ElectricSmithy</li>
-								</recipeUsers>
-							</recipeMaker>
-							<statBases>
-								<WorkToMake>3000</WorkToMake>
-								<MaxHitPoints>145</MaxHitPoints>
-								<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-								<ArmorRating_Sharp>1.75</ArmorRating_Sharp>
-								<ArmorRating_Blunt>6</ArmorRating_Blunt>
-								<Mass>8</Mass>
-								<Bulk>8</Bulk>
-								<WornBulk>6</WornBulk>
-							</statBases>
-							<equippedStatOffsets>
-								<ReloadSpeed>-0.1</ReloadSpeed>
-								<MeleeHitChance>-1</MeleeHitChance>
-								<ShootingAccuracyPawn>-0.2</ShootingAccuracyPawn>
-								<AimingAccuracy>-0.05</AimingAccuracy>
-								<Suppressability>-0.25</Suppressability>
-								<MeleeCritChance>-0.08</MeleeCritChance>
-								<MeleeParryChance>1.0</MeleeParryChance>
-							</equippedStatOffsets>
-							<comps>
-								<li>
-									<compClass>CompColorable</compClass>
-								</li>
-							</comps>
-							<modExtensions>
-								<li Class="CombatExtended.ShieldDefExtension">
-									<shieldCoverage>
-										<li>Hands</li>
-										<li>Arms</li>
-										<li>Shoulders</li>
-										<li>Torso</li>
-										<li>Neck</li>
-										<li>Legs</li>
-									</shieldCoverage>
-									<drawAsTall>false</drawAsTall>
-								</li>
-							</modExtensions>
-						</ThingDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Classical/ThingDefs_WeaponsMelee.xml b/Patches/Vanilla Factions Expanded - Classical/ThingDefs_WeaponsMelee.xml
deleted file mode 100644
index 6fae048c47..0000000000
--- a/Patches/Vanilla Factions Expanded - Classical/ThingDefs_WeaponsMelee.xml	
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Classical</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--One-handed Tags -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "VFEC_MeleeWeapon_Spatha" or defName="VFEC_MeleeWeapon_Dagger"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- Spatha -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEC_MeleeWeapon_Spatha"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.57</cooldownTime>
-								<chanceFactor>0.33</chanceFactor>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>1.57</cooldownTime>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.2</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>31</power>
-								<cooldownTime>1.45</cooldownTime>
-								<armorPenetrationBlunt>1.944</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.44</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEC_MeleeWeapon_Spatha"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>0.42</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEC_MeleeWeapon_Spatha"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.21</MeleeCritChance>
-							<MeleeParryChance>0.42</MeleeParryChance>
-							<MeleeDodgeChance>0.33</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Dagger (Pugio) -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEC_MeleeWeapon_Dagger"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<chanceFactor>0.33</chanceFactor>
-								<cooldownTime>1.29</cooldownTime>
-								<armorPenetrationBlunt>0.275</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.42</cooldownTime>
-								<armorPenetrationBlunt>0.396</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.35</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.29</cooldownTime>
-								<armorPenetrationBlunt>0.275</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.31</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEC_MeleeWeapon_Dagger"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEC_MeleeWeapon_Dagger"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.63</MeleeCritChance>
-							<MeleeParryChance>0.5</MeleeParryChance>
-							<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Classical/ThingDefs_WeaponsRanged.xml b/Patches/Vanilla Factions Expanded - Classical/ThingDefs_WeaponsRanged.xml
deleted file mode 100644
index 204a2f0050..0000000000
--- a/Patches/Vanilla Factions Expanded - Classical/ThingDefs_WeaponsRanged.xml	
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Classical</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Javelin === -->
-
-				<!-- This dummy parent just provides a workaround so VFE - Classical can be loaded before CE. -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="BaseWeaponAndAmmoNeolithic" Name="JavelinBase_VFEC" Abstract="True" />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="VFEC_Javelin"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>JavelinBase_VFEC</value>
-				</li>
-
-				<li Class="PatchOperationAttributeAdd">
-					<xpath>Defs/ThingDef[defName="VFEC_Javelin"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFEC_Javelin"]/costList</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEC_Javelin"]</xpath>
-					<value>
-						<techLevel>Neolithic</techLevel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFEC_Javelin"]/recipeMaker</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEC_Javelin"]/statBases</xpath>
-					<value>
-						<statBases>
-							<MarketValue>7.26</MarketValue>
-							<SightsEfficiency>1.0</SightsEfficiency>
-							<ShotSpread>1.5</ShotSpread>
-							<SwayFactor>2.5</SwayFactor>
-							<Bulk>3.5</Bulk>
-							<Mass>2</Mass>
-							<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						</statBases>
-						<stackLimit>25</stackLimit>
-						<ammoClass>HeavyJavelin</ammoClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEC_Javelin"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Classical_Javelin_Thrown</defaultProjectile>
-								<warmupTime>0.8</warmupTime>
-								<range>12</range>
-								<soundCast>Interact_BeatFire</soundCast>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEC_Javelin"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.35</cooldownTime>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.37</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>1.69</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.34</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Add Projectiles and Recipes for the javelin. === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>MakeAmmo_VFEC_Javelin</defName>
-							<label>make javelins x5</label>
-							<description>Craft 5 javelins.</description>
-							<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-							<workSkill>Crafting</workSkill>
-							<recipeUsers>
-								<li>ElectricSmithy</li>
-								<li>FueledSmithy</li>
-								<li>CraftingSpot</li>
-							</recipeUsers>
-							<effectWorking>Smelt</effectWorking>
-							<unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
-							<workAmount>2700</workAmount>
-							<jobString>Making javelins.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>6</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>22</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<VFEC_Javelin>5</VFEC_Javelin>
-							</products>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-				<!-- === Can't remove it entirely without causing errors, but make the mobile "Scorpion" weapon inaccessible. === -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFEC_Weapon_Scorpion"]/weaponTags</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEC_Turret_Scorpion"]/minifiedDef</xpath>
-					<value>
-						<minifiedDef>MinifiedThing</minifiedDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEC_Turret_Scorpion" or defName="VFEC_TurretGun_Scorpion"]/description</xpath>
-					<value>
-						<description>A ballista-like turret capable of firing rapidly when set up and manned. Very effective against enemy infantry.</description>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Deserters/Apparel_Belts.xml b/Patches/Vanilla Factions Expanded - Deserters/Apparel_Belts.xml
deleted file mode 100644
index 88de27692c..0000000000
--- a/Patches/Vanilla Factions Expanded - Deserters/Apparel_Belts.xml	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Deserters</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFED_Apparel_BombPack" or defName="VFED_Apparel_InvisibilityEngulfer" or defName="VFED_DeserterDeclassifier"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Deserters/Buildings_Security_Turrets.xml b/Patches/Vanilla Factions Expanded - Deserters/Buildings_Security_Turrets.xml
deleted file mode 100644
index 1734685a21..0000000000
--- a/Patches/Vanilla Factions Expanded - Deserters/Buildings_Security_Turrets.xml	
+++ /dev/null
@@ -1,344 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Deserters</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="VFED_ImperialTurretBase" or defName="VFED_Turret_StrikerTurret"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="VFED_ImperialTurretBase"]/comps/li[@Class="CompProperties_Explosive"]</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="VFED_ImperialTurretBase" or defName="VFED_Turret_StrikerTurret"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="VFED_ImperialTurretBase"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>800</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="VFED_ImperialTurretBase"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0.4</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="VFED_ImperialTurretBase"]/comps/li[@Class="CompProperties_Power"]</xpath>
-					<value>
-						<li Class="CompProperties_Power">
-							<compClass>CompPowerTrader</compClass>
-							<basePowerConsumption>750</basePowerConsumption>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="VFED_ImperialTurretBase"]/placeWorkers/li[.="PlaceWorker_ShowTurretRadius"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFED_Turret_Kontarion"]/comps/li[@Class="CompProperties_Refuelable"]
-						| Defs/ThingDef[defName="VFED_Turret_Palintone"]/comps/li[@Class="CompProperties_Refuelable"]
-						| Defs/ThingDef[defName="VFED_Turret_Onager"]/comps/li[@Class="CompProperties_Refuelable"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFED_Turret_Kontarion"]/comps/li[@Class="VFED.CompProperties_BoxRefuel"]
-						| Defs/ThingDef[defName="VFED_Turret_Palintone"]/comps/li[@Class="VFED.CompProperties_BoxRefuel"]
-						| Defs/ThingDef[defName="VFED_Turret_Onager"]/comps/li[@Class="VFED.CompProperties_BoxRefuel"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFED_Turret_Kontarion"]/modExtensions/li[@Class="VFED.TurretExtension_Barrels"]
-						| Defs/ThingDef[defName="VFED_Turret_Palintone"]/modExtensions/li[@Class="VFED.TurretExtension_Barrels"]
-						| Defs/ThingDef[defName="VFED_Turret_Onager"]/modExtensions/li[@Class="VFED.TurretExtension_Barrels"]</xpath>
-				</li>
-
-				<!-- Kontarion -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFED_Turret_Kontarion"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.75</AimingAccuracy>
-						<NightVisionEfficiency>0.5</NightVisionEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFED_Turret_Kontarion"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>1.5</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFED_Turret_Kontarion"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>1.0</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFED_Turret_Kontarion"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>550</Steel>
-							<Plasteel>100</Plasteel>
-							<Uranium>60</Uranium>
-							<ComponentIndustrial>14</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFED_Gun_Kontarion</defName>
-					<statBases>
-						<SightsEfficiency>2.36</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.0</SwayFactor>
-						<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-						<Mass>150</Mass>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_40x311mmR_AP</defaultProjectile>
-						<warmupTime>4.6</warmupTime>
-						<minRange>12</minRange>
-						<range>500</range>
-						<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-						<burstShotCount>6</burstShotCount>
-						<soundCast>Shot_TurretSniper</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>20</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>60</magazineSize>
-						<reloadTime>13.6</reloadTime>
-						<ammoSet>AmmoSet_40x311mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!-- Palintone -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFED_Turret_Palintone"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.75</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFED_Turret_Palintone"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>1.25</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFED_Turret_Palintone"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>1.0</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFED_Turret_Palintone"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>550</Steel>
-							<Plasteel>80</Plasteel>
-							<ComponentIndustrial>12</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFED_Gun_Palintone</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.0</SwayFactor>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<Mass>150</Mass>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_20x102mmNATO_AP</defaultProjectile>
-						<warmupTime>2.3</warmupTime>
-						<minRange>14</minRange>
-						<range>500</range>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>20</burstShotCount>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>16</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>200</magazineSize>
-						<reloadTime>15.6</reloadTime>
-						<ammoSet>AmmoSet_20x102mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!-- Onager -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFED_Turret_Onager"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>1.25</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFED_Turret_Onager"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1.0</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFED_Turret_Onager"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>4.2</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFED_Turret_Onager"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>600</Steel>
-							<Plasteel>90</Plasteel>
-							<ComponentIndustrial>15</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFED_Gun_Onager"]/statBases/AccuracyTouch
-						| Defs/ThingDef[defName="VFED_Gun_Onager"]/statBases/AccuracyShort
-						| Defs/ThingDef[defName="VFED_Gun_Onager"]/statBases/AccuracyMedium
-						| Defs/ThingDef[defName="VFED_Gun_Onager"]/statBases/AccuracyLong </xpath>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFED_Gun_Onager"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFED_Gun_Onager"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFED_Gun_Onager"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Charges">
-							<chargeSpeeds>
-								<li>20</li>
-								<li>30</li>
-								<li>40</li>
-								<li>50</li>
-								<li>60</li>
-							</chargeSpeeds>
-						</li>
-						<li Class="CombatExtended.CompProperties_AmmoUser">
-							<magazineSize>24</magazineSize>
-							<reloadTime>13</reloadTime>
-							<ammoSet>AmmoSet_50mmRocket</ammoSet>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFED_Gun_Onager"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.0</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-								<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-								<hasStandardCommand>true</hasStandardCommand>
-								<requireLineOfSight>false</requireLineOfSight>
-								<defaultProjectile>Bullet_50mmRocket_HE</defaultProjectile>
-								<warmupTime>3.6</warmupTime>
-								<range>86</range>
-								<minRange>14</minRange>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-								<soundCast>RocketswarmLauncher_Fire</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>39</muzzleFlashScale>
-								<circularError>1</circularError>
-								<indirectFirePenalty>0.25</indirectFirePenalty>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Striker -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFED_Turret_StrikerTurret"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.25</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFED_Turret_StrikerTurret"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFED_Turret_StrikerTurret"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>1.0</turretBurstCooldownTime>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Deserters/Buildings_Special.xml b/Patches/Vanilla Factions Expanded - Deserters/Buildings_Special.xml
deleted file mode 100644
index 8608e93388..0000000000
--- a/Patches/Vanilla Factions Expanded - Deserters/Buildings_Special.xml	
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Deserters</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- VFED Ammo Box Base -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="VFED_AmmoBoxBase"]</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_AutoLoaderCE</thingClass>
-						<drawerType>MapMeshAndRealTime</drawerType>
-					</value>
-				</li>
-
-				<!-- Uranium Slug Turret -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFED_AmmoBox_UraniumSlug"]</xpath>
-					<value>
-						<comps>
-							<li Class="CombatExtended.CompProperties_AmmoUser">
-								<magazineSize>180</magazineSize>
-								<reloadTime>7.8</reloadTime>
-								<ammoSet>AmmoSet_40x311mmR</ammoSet>
-							</li>
-						</comps>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFED_AmmoBox_UraniumSlug"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>40</Steel>
-							<ComponentIndustrial>2</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFED_AmmoBox_UraniumSlug"]</xpath>
-					<value>
-						<li Class="CombatExtended.ModExtension_AutoLoaderGraphics">
-							<allowedTurrets>
-								<li>Turret_Sniper</li>
-								<li>VFED_Turret_Kontarion</li>
-							</allowedTurrets>
-						</li>
-					</value>
-				</li>
-
-				<!-- Autocannon Turret -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFED_AmmoBox_Autocannon"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_AmmoUser">
-							<magazineSize>600</magazineSize>
-							<reloadTime>7.8</reloadTime>
-							<ammoSet>AmmoSet_20x102mmNATO</ammoSet>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFED_AmmoBox_Autocannon"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>40</Steel>
-							<ComponentIndustrial>2</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFED_AmmoBox_Autocannon"]</xpath>
-					<value>
-						<li Class="CombatExtended.ModExtension_AutoLoaderGraphics">
-							<allowedTurrets>
-								<li>Turret_Autocannon</li>
-								<li>VFED_Turret_Palintone</li>
-							</allowedTurrets>
-						</li>
-					</value>
-				</li>
-
-				<!-- Missile Turret -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFED_AmmoBox_Missile"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_AmmoUser">
-							<magazineSize>72</magazineSize>
-							<reloadTime>7.8</reloadTime>
-							<ammoSet>AmmoSet_50mmRocket</ammoSet>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFED_AmmoBox_Missile"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>40</Steel>
-							<ComponentIndustrial>2</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFED_AmmoBox_Missile"]</xpath>
-					<value>
-						<li Class="CombatExtended.ModExtension_AutoLoaderGraphics">
-							<allowedTurrets>
-								<li>Turret_RocketswarmLauncher</li>
-								<li>VFED_Turret_Onager</li>
-							</allowedTurrets>
-						</li>
-					</value>
-				</li>
-
-				<!-- Aerodrone Munition Crate -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFED_AerodroneMunitionsCrate"]/comps/li[@Class="VFED.CompProperties_Explosive_Shells"]</xpath>
-					<value>
-						<li Class="CompProperties_Explosive">
-							<wickTicks>1000</wickTicks>
-							<explosiveRadius>4</explosiveRadius>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<chanceNeverExplodeFromDamage>0.2</chanceNeverExplodeFromDamage>
-							<startWickHitPointsPercent>0.25</startWickHitPointsPercent>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Bomblet>6</Fragment_Bomblet>
-							</fragments>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Deserters/Contraband.xml b/Patches/Vanilla Factions Expanded - Deserters/Contraband.xml
deleted file mode 100644
index c65cf6f7b9..0000000000
--- a/Patches/Vanilla Factions Expanded - Deserters/Contraband.xml	
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Deserters</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Allow ammo for Empire/Deserter weapons to be purchased using intel. -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Ammo_6x24mmCharged"]</xpath>
-					<value>
-						<li Class="VFED.ContrabandExtension">
-							<category>VFED_Imperial</category>
-							<intelCost>5</intelCost>
-							<useCriticalIntel>false</useCriticalIntel>
-							<countMult>100</countMult>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Ammo_6x24mmCharged_AP"]</xpath>
-					<value>
-						<li Class="VFED.ContrabandExtension">
-							<category>VFED_Imperial</category>
-							<intelCost>5</intelCost>
-							<useCriticalIntel>false</useCriticalIntel>
-							<countMult>100</countMult>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Ammo_6x24mmCharged_Ion"]</xpath>
-					<value>
-						<li Class="VFED.ContrabandExtension">
-							<category>VFED_Imperial</category>
-							<intelCost>5</intelCost>
-							<useCriticalIntel>false</useCriticalIntel>
-							<countMult>100</countMult>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension" MayRequireAnyOf="CETeam.CombatExtendedGuns,CETeam.CombatExtendedGuns_steam,CETeam.CombatExtendedGuns_copy">
-					<xpath>Defs/ThingDef[defName="CE_Gun_ChargeSniperRifle"]</xpath>
-					<value>
-						<li Class="VFED.ContrabandExtension">
-							<category>VFED_Imperial</category>
-							<intelCost>13</intelCost>
-							<useCriticalIntel>false</useCriticalIntel>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension" MayRequireAnyOf="CETeam.CombatExtendedGuns,CETeam.CombatExtendedGuns_steam,CETeam.CombatExtendedGuns_copy">
-					<xpath>Defs/ThingDef[defName="Ammo_8x50mmCharged"]</xpath>
-					<value>
-						<li Class="VFED.ContrabandExtension">
-							<category>VFED_Imperial</category>
-							<intelCost>6</intelCost>
-							<useCriticalIntel>false</useCriticalIntel>
-							<countMult>100</countMult>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension" MayRequireAnyOf="CETeam.CombatExtendedGuns,CETeam.CombatExtendedGuns_steam,CETeam.CombatExtendedGuns_copy">
-					<xpath>Defs/ThingDef[defName="Ammo_8x50mmCharged_AP"]</xpath>
-					<value>
-						<li Class="VFED.ContrabandExtension">
-							<category>VFED_Imperial</category>
-							<intelCost>6</intelCost>
-							<useCriticalIntel>false</useCriticalIntel>
-							<countMult>100</countMult>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension" MayRequireAnyOf="CETeam.CombatExtendedGuns,CETeam.CombatExtendedGuns_steam,CETeam.CombatExtendedGuns_copy">
-					<xpath>Defs/ThingDef[defName="Ammo_8x50mmCharged_Ion"]</xpath>
-					<value>
-						<li Class="VFED.ContrabandExtension">
-							<category>VFED_Imperial</category>
-							<intelCost>6</intelCost>
-							<useCriticalIntel>false</useCriticalIntel>
-							<countMult>100</countMult>
-						</li>
-					</value>
-				</li>
-
-				<!-- Remove Charge Lance from available contraband. -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Gun_ChargeLance"]/modExtensions/li[@Class="VFED.ContrabandExtension"]</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Deserters/Damages_Empire.xml b/Patches/Vanilla Factions Expanded - Deserters/Damages_Empire.xml
deleted file mode 100644
index be33fc2ddb..0000000000
--- a/Patches/Vanilla Factions Expanded - Deserters/Damages_Empire.xml	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Deserters</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/DamageDef[defName="VFED_Fletchling"]</xpath>
-					<value>
-						<buildingDamageFactor>0.05</buildingDamageFactor>
-						<plantDamageFactor>0.05</plantDamageFactor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Deserters/RangedSpacer.xml b/Patches/Vanilla Factions Expanded - Deserters/RangedSpacer.xml
deleted file mode 100644
index 21d9e63d03..0000000000
--- a/Patches/Vanilla Factions Expanded - Deserters/RangedSpacer.xml	
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Deserters</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VFED_Gun_ChargeCycler"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VFED_Gun_Fletchling"]/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>
-				</li>
-
-				<!-- === Charge Cycler === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFED_Gun_ChargeCycler</defName>
-					<statBases>
-						<Mass>2.0</Mass>
-						<Bulk>3.0</Bulk>
-						<SwayFactor>1.15</SwayFactor>
-						<ShotSpread>0.15</ShotSpread>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.41</RangedWeapon_Cooldown>
-					</statBases>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFED_Gun_ChargeCycler"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>3.0</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>True</hasStandardCommand>
-								<defaultProjectile>Bullet_10x18mmCharged</defaultProjectile>
-								<warmupTime>0.5</warmupTime>
-								<range>12</range>
-								<soundCast>VFED_Shot_ChargeCycler</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFED_Gun_ChargeCycler"]/comps/li[@Class="MVCF.Comps.CompProperties_VerbProps"]</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "VFED_Gun_ChargeCycler"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_AmmoUser">
-							<magazineSize>8</magazineSize>
-							<reloadTime>4.6</reloadTime>
-							<ammoSet>AmmoSet_10x18mmCharged</ammoSet>
-						</li>
-						<li Class="CombatExtended.CompProperties_FireModes">
-							<aiAimMode>Snapshot</aiAimMode>
-						</li>
-						<!--li>
-							<compClass>CompEquippable</compClass>
-						</li-->
-						<li Class="CombatExtended.CompProperties_UnderBarrel">
-							<propsUnderBarrel>
-								<magazineSize>1</magazineSize>
-								<reloadTime>3</reloadTime>
-								<ammoSet>AmmoSet_40x68mmDemo</ammoSet>
-							</propsUnderBarrel>
-							<verbPropsUnderBarrel>
-								<recoilAmount>2.0</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_40x68mmDemo_Thump</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>25</range>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<soundCast>ThumpCannon_Fire</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>5</muzzleFlashScale>
-							</verbPropsUnderBarrel>
-							<propsFireModesUnderBarrel>
-								<aiUseBurstMode>FALSE</aiUseBurstMode>
-								<aiAimMode>SuppressFire</aiAimMode>
-							</propsFireModesUnderBarrel>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Fletchling === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_FletchlingDart</defName>
-							<label>Fletchling Dart</label>
-							<ammoTypes>
-								<Ammo_FletcherDart>Bullet_FletchlingDart</Ammo_FletcherDart>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef ParentName="BaseBulletCE">
-							<defName>Bullet_FletchlingDart</defName>
-							<label>fletchling dart</label>
-							<graphicData>
-								<texPath>Projectile/Bullet_Fletcher</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>2</damageAmountBase>
-								<speed>62</speed>
-								<damageDef>VFED_Fletchling</damageDef>
-								<pelletCount>3</pelletCount>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>18</armorPenetrationBlunt>
-								<spreadMult>8.9</spreadMult>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFED_Gun_Fletchling</defName>
-					<statBases>
-						<Mass>8</Mass>
-						<RangedWeapon_Cooldown>0.79</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.8</SwayFactor>
-						<Bulk>9</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_FletchlingDart</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>25</range>
-						<soundCast>VFED_Shot_Fletchling</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>4</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_FletchlingDart</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Deserters/Scenario_Deserters.xml b/Patches/Vanilla Factions Expanded - Deserters/Scenario_Deserters.xml
deleted file mode 100644
index f16599f722..0000000000
--- a/Patches/Vanilla Factions Expanded - Deserters/Scenario_Deserters.xml	
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Deserters</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Adds ammo to the scenario === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="VFED_NewSafehaven"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>ScatterThingsAnywhere</def>
-							<thingDef>Ammo_10x18mmCharged</thingDef>
-							<count>240</count>
-						</li>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>ScatterThingsAnywhere</def>
-							<thingDef>Ammo_40x68mmDemo_Thump</thingDef>
-							<count>20</count>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Deserters/Things_Security.xml b/Patches/Vanilla Factions Expanded - Deserters/Things_Security.xml
deleted file mode 100644
index 5dc02536cb..0000000000
--- a/Patches/Vanilla Factions Expanded - Deserters/Things_Security.xml	
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Deserters</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Turret_Autocannon"]/comps/li[@Class="VFED.CompProperties_BoxRefuel"]
-						| Defs/ThingDef[defName="Turret_Sniper"]/comps/li[@Class="VFED.CompProperties_BoxRefuel"]
-						| Defs/ThingDef[defName="Turret_RocketswarmLauncher"]/comps/li[@Class="VFED.CompProperties_BoxRefuel"]</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFED_RemoteTrapIED_HighExplosive"]/comps/li[@Class="CompProperties_Explosive"]</xpath>
-					<value>
-						<li Class="CompProperties_Explosive">
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<damageAmountBase>270</damageAmountBase>
-							<explosiveRadius>4.5</explosiveRadius>
-							<startWickOnDamageTaken>
-								<li>Bullet</li>
-								<li>Arrow</li>
-								<li>ArrowHighVelocity</li>
-							</startWickOnDamageTaken>
-							<wickTicks>
-								<min>5</min>
-								<max>30</max>
-							</wickTicks>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>16</Fragment_Large>
-								<Fragment_Small>100</Fragment_Small>
-							</fragments>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFED_RemoteTrapIED_Incendiary"]/comps/li[@Class="CompProperties_Explosive"]</xpath>
-					<value>
-						<li Class="CompProperties_Explosive">
-							<damageAmountBase>15</damageAmountBase>
-							<explosiveDamageType>PrometheumFlame</explosiveDamageType>
-							<explosiveRadius>5</explosiveRadius>
-							<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
-							<preExplosionSpawnChance>0.75</preExplosionSpawnChance>
-							<startWickOnDamageTaken>
-								<li>Bullet</li>
-								<li>Arrow</li>
-								<li>ArrowHighVelocity</li>
-							</startWickOnDamageTaken>
-							<wickTicks>
-								<min>5</min>
-								<max>20</max>
-							</wickTicks>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFED_Shell_Shrapnel" or defName="VFED_Shell_ArmorPiercing" or defName="VFED_Shell_Cluster"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFED_TrapIED_Shrapnel" or defName="VFED_TrapIED_ArmorPiercing" or defName="VFED_TrapIED_Cluster"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFED_RemoteTrapIED_Shrapnel" or defName="VFED_RemoteTrapIED_ArmorPiercing" or defName="VFED_RemoteTrapIED_Cluster"]</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Empire/Ammo/ChargeThumperRound.xml b/Patches/Vanilla Factions Expanded - Empire/Ammo/ChargeThumperRound.xml
deleted file mode 100644
index 1cd91b0f30..0000000000
--- a/Patches/Vanilla Factions Expanded - Empire/Ammo/ChargeThumperRound.xml	
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Empire</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingCategoryDef>
-							<defName>Ammo40x68mmDemoCell</defName>
-							<label>40x68mm Demo Cell</label>
-							<parent>AmmoAdvanced</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberFuel</iconPath>
-						</ThingCategoryDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_40x68mmDemo</defName>
-							<label>40x68mm Charged Cell</label>
-							<ammoTypes>
-								<Ammo_40x68mmDemo_Thump>Bullet_40x68mmDemo_Thump</Ammo_40x68mmDemo_Thump>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="30x64mmFuelBase">
-							<defName>Ammo_40x68mmDemo_Thump</defName>
-							<label>40x68mm charge cell (Demolition)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Mortar/Charged</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-								<drawSize>0.6</drawSize>
-							</graphicData>
-							<statBases>
-								<MarketValue>4.6</MarketValue>
-							</statBases>
-							<thingCategories>
-								<li>Ammo40x68mmDemoCell</li>
-							</thingCategories>
-							<ammoClass>Demolition</ammoClass>
-							<modExtensions>
-								<li Class="VFED.ContrabandExtension" MayRequire="OskarPotocki.VFE.Deserters">
-									<category>VFED_Imperial</category>
-									<intelCost>5</intelCost>
-									<useCriticalIntel>false</useCriticalIntel>
-									<countMult>30</countMult>
-								</li>
-							</modExtensions>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBulletCE">
-							<defName>Bullet_40x68mmDemo_Thump</defName>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<label>demolition bolt</label>
-							<graphicData>
-								<texPath>Things/Projectile/LauncherShot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-								<drawSize>(0.5,0.5)</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Thump</damageDef>
-								<damageAmountBase>8</damageAmountBase>
-								<speed>73</speed>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0</armorPenetrationBlunt>
-								<explosionRadius>1.5</explosionRadius>
-							</projectile>
-						</ThingDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_40x68mmDemo_Thump</defName>
-							<label>make 40x68mm charge cell (Demolition) x50</label>
-							<description>Craft 50 40x68mm demolition charge cells.</description>
-							<jobString>Making demolition charge cell.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Prometheum</li>
-										</thingDefs>
-									</filter>
-									<count>14</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-									<li>Steel</li>
-									<li>Prometheum</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_40x68mmDemo_Thump>50</Ammo_40x68mmDemo_Thump>
-							</products>
-							<workAmount>7600</workAmount>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Empire/Ammo/FletcherRifleRound.xml b/Patches/Vanilla Factions Expanded - Empire/Ammo/FletcherRifleRound.xml
deleted file mode 100644
index 8656a657bb..0000000000
--- a/Patches/Vanilla Factions Expanded - Empire/Ammo/FletcherRifleRound.xml	
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Empire</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>Fletcher</defName>
-							<label>fletcher</label>
-							<description>Dissolves the target from the inside. Lethal to organics and almost useless against non-organics, such as mechanoids.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<ThingCategoryDef>
-							<defName>AmmoFletcherDart</defName>
-							<label>Fletcher Dart</label>
-							<parent>AmmoAdvanced</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
-						</ThingCategoryDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_FletcherDart</defName>
-							<label>Fletcher Dart</label>
-							<ammoTypes>
-								<Ammo_FletcherDart>Bullet_FletcherDart</Ammo_FletcherDart>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="12x64mmChargedBase">
-							<description>Fin-stabilized flechettes with acidifier injectors. Lethal to organics and almost useless against non-organics.\n\nTargets hit by these flechettes will be inflicted with an unstable variant of acidifier fluids, designed to dissolve the target from the inside rather than destroy their equipment.</description>
-							<defName>Ammo_FletcherDart</defName>
-							<label>fletcher cartridge</label>
-							<thingCategories>
-								<li>AmmoFletcherDart</li>
-							</thingCategories>
-							<graphicData>
-								<texPath>Things/Ammo/Charged/LargeRegular</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>6.78</MarketValue>
-							</statBases>
-							<ammoClass>Fletcher</ammoClass>
-							<modExtensions>
-								<li Class="VFED.ContrabandExtension" MayRequire="OskarPotocki.VFE.Deserters">
-									<category>VFED_Imperial</category>
-									<intelCost>5</intelCost>
-									<useCriticalIntel>true</useCriticalIntel>
-									<countMult>50</countMult>
-								</li>
-							</modExtensions>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBulletCE">
-							<defName>Bullet_FletcherDart</defName>
-							<label>fletcher dart</label>
-							<graphicData>
-								<texPath>Projectile/Bullet_Fletcher</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-								<drawSize>1.5</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>6</damageAmountBase>
-								<speed>144</speed>
-								<damageDef>VFEE_Fletcher</damageDef>
-								<armorPenetrationSharp>16</armorPenetrationSharp>
-								<armorPenetrationBlunt>36</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_FletcherDart</defName>
-							<label>make fletcher dart cartridge x50</label>
-							<description>Craft 50 fletcher dart cartridges.</description>
-							<jobString>Making fletcher dart cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>32</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>16</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Plasteel</li>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_FletcherDart>50</Ammo_FletcherDart>
-							</products>
-							<workAmount>32800</workAmount>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Empire/Apparel_Headgear.xml b/Patches/Vanilla Factions Expanded - Empire/Apparel_Headgear.xml
deleted file mode 100644
index 581934bbd2..0000000000
--- a/Patches/Vanilla Factions Expanded - Empire/Apparel_Headgear.xml	
+++ /dev/null
@@ -1,329 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Empire</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Techfriar Crown -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_TechfriarCrown"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2.25</ArmorRating_Blunt>
-						<Bulk>1</Bulk>
-						<WornBulk>0.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_TechfriarCrown"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- Absolver Helmet -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_AbsolverHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_AbsolverHelmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_AbsolverHelmet"]/statBases/Mass</xpath>
-					<value>
-						<Mass>5.4</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_AbsolverHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>200</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_AbsolverHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_AbsolverHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>36</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_AbsolverHelmet"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<AimingAccuracy>1.2</AimingAccuracy>
-						<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_AbsolverHelmet"]/apparel</xpath>
-					<value>
-						<immuneToToxGasExposure>true</immuneToToxGasExposure>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_AbsolverHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_AbsolverHelmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- Deserter Helmet -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_DeserterHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_DeserterHelmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_DeserterHelmet"]/statBases/Mass</xpath>
-					<value>
-						<Mass>4.8</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_DeserterHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>240</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_DeserterHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_DeserterHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>36</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_DeserterHelmet"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<AimingAccuracy>0.6</AimingAccuracy>
-						<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_DeserterHelmet"]/apparel</xpath>
-					<value>
-						<immuneToToxGasExposure>true</immuneToToxGasExposure>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_DeserterHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_DeserterHelmet"]</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>
-				</li>
-
-				<!-- Janissary Helmet -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_JanissaryHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-						<NightVisionEfficiency_Apparel>0.7</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_JanissaryHelmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0.25</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_JanissaryHelmet"]/statBases/Mass</xpath>
-					<value>
-						<Mass>3.4</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_JanissaryHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>190</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_JanissaryHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>12</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_JanissaryHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>26</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_JanissaryHelmet"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>0.15</AimingAccuracy>
-							<ToxicEnvironmentResistance>1.0</ToxicEnvironmentResistance>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_JanissaryHelmet"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>50</Plasteel>
-						<DevilstrandCloth>15</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_JanissaryHelmet"]/apparel</xpath>
-					<value>
-						<immuneToToxGasExposure>true</immuneToToxGasExposure>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_JanissaryHelmet"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_JanissaryHelmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-										<li>Jaw</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-										<li>Nose</li>
-										<li>Jaw</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Empire/Apparel_Royal.xml b/Patches/Vanilla Factions Expanded - Empire/Apparel_Royal.xml
deleted file mode 100644
index fd6c8c0939..0000000000
--- a/Patches/Vanilla Factions Expanded - Empire/Apparel_Royal.xml	
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Empire</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Stellic Robe -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Apparel_StellicRobe"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>2</WornBulk>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Empire/Apparel_Various.xml b/Patches/Vanilla Factions Expanded - Empire/Apparel_Various.xml
deleted file mode 100644
index 81bdefdea9..0000000000
--- a/Patches/Vanilla Factions Expanded - Empire/Apparel_Various.xml	
+++ /dev/null
@@ -1,306 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Empire</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Deserter Armor -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_ArmorDeserter"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_ArmorDeserter"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>540</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_ArmorDeserter"]/statBases/Mass</xpath>
-					<value>
-						<Mass>54</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_ArmorDeserter"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_ArmorDeserter"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>21</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_ArmorDeserter"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>46</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_ArmorDeserter"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>80</CarryWeight>
-						<CarryBulk>10</CarryBulk>
-						<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_ArmorDeserter"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_ArmorDeserter"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- Absolver Armor -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_ArmorAbsolver"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_ArmorAbsolver"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>500</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_ArmorAbsolver"]/statBases/Mass</xpath>
-					<value>
-						<Mass>50</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_ArmorAbsolver"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_ArmorAbsolver"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_ArmorAbsolver"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>45</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_ArmorAbsolver"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>80</CarryWeight>
-						<CarryBulk>10</CarryBulk>
-						<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_ArmorAbsolver"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_ArmorAbsolver"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- Janissary Cuirass -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_JanissaryCuirass"]/statBases</xpath>
-					<value>
-						<Bulk>25</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_JanissaryCuirass"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>400</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_JanissaryCuirass"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0.2</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_JanissaryCuirass"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_JanissaryCuirass"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>34</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_JanissaryCuirass"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>40</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_JanissaryCuirass"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>14</CarryWeight>
-							<CarryBulk>10</CarryBulk>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFEE_Apparel_JanissaryCuirass"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Empire/Buildings_Security_Turrets.xml b/Patches/Vanilla Factions Expanded - Empire/Buildings_Security_Turrets.xml
deleted file mode 100644
index c3d1d0db62..0000000000
--- a/Patches/Vanilla Factions Expanded - Empire/Buildings_Security_Turrets.xml	
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Empire</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Striker Turret -->
-				<!-- Remove refuelable property -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName = "VFEE_Turret_StrikerTurret"]/comps/li[@Class="CompProperties_Refuelable"]</xpath>
-				</li>
-
-				<!-- Replace vanilla thingClass -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VFEE_Turret_StrikerTurret"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEE_Turret_StrikerTurret"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.5</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VFEE_Turret_StrikerTurret"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>1.1</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<!-- Striker Turret Gun - Identical to the vanilla mini-turret. -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFEE_Gun_StrikerTurret</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>0.69</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.91</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>48</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>GunShotA</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!-- Armored Shuttle Turret -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "VFEI_ArmoredShuttle"]/statBases</xpath>
-					<value>
-						<ShootingAccuracyTurret>0.99</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VFEI_ArmoredShuttle"]/building/turretGunDef</xpath>
-					<value>
-						<turretGunDef>VFEI_TurretArmoredShuttle_CE</turretGunDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VFEI_ArmoredShuttle"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>1.0</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "VFEI_ArmoredShuttle"]/building</xpath>
-					<value>
-						<turretBurstWarmupTime>2.3</turretBurstWarmupTime>
-					</value>
-				</li>
-
-				<!-- Vanilla Gauntlet Charge Cannnon -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingDef ParentName="BaseWeaponTurret">
-							<defName>VFEI_TurretArmoredShuttle_CE</defName>
-							<label>double autocannon</label>
-							<description>A powerful, twin-linked autocannon.</description>
-							<graphicData>
-								<texPath>Shuttle/ImperialArmoredShuttle/ImperialArmoredShuttle_Autocannon</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>(2,2)</drawSize>
-							</graphicData>
-							<soundInteract>Interact_Rifle</soundInteract>
-							<statBases>
-								<AccuracyTouch>0.4</AccuracyTouch>
-								<AccuracyShort>0.65</AccuracyShort>
-								<AccuracyMedium>0.70</AccuracyMedium>
-								<AccuracyLong>0.60</AccuracyLong>
-								<RangedWeapon_Cooldown>1.6</RangedWeapon_Cooldown>
-								<DeteriorationRate>0</DeteriorationRate>
-								<Mass>80</Mass>
-								<Flammability>0</Flammability>
-							</statBases>
-							<verbs>
-								<li>
-									<verbClass>Verb_Shoot</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_ArmoredShuttleTurret_CE</defaultProjectile>
-									<minRange>8.9</minRange>
-									<warmupTime>2.3</warmupTime>
-									<range>55</range>
-									<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-									<burstShotCount>6</burstShotCount>
-									<soundCast>Shot_Autocannon</soundCast>
-									<soundCastTail>GunTail_Heavy</soundCastTail>
-									<muzzleFlashScale>12</muzzleFlashScale>
-								</li>
-							</verbs>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBullet">
-							<defName>Bullet_ArmoredShuttleTurret_CE</defName>
-							<label>autocannon shell</label>
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_Big</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile>
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>15</damageAmountBase>
-								<speed>158</speed>
-								<armorPenetrationBase>25</armorPenetrationBase>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Empire/Damages_Empire.xml b/Patches/Vanilla Factions Expanded - Empire/Damages_Empire.xml
deleted file mode 100644
index 261c0955a8..0000000000
--- a/Patches/Vanilla Factions Expanded - Empire/Damages_Empire.xml	
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Empire</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/DamageDef[defName="VFEE_Fletcher"]</xpath>
-					<value>
-						<buildingDamageFactor>0.05</buildingDamageFactor>
-						<plantDamageFactor>0.05</plantDamageFactor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Empire/MeleeUltratech.xml b/Patches/Vanilla Factions Expanded - Empire/MeleeUltratech.xml
deleted file mode 100644
index cddde91ca2..0000000000
--- a/Patches/Vanilla Factions Expanded - Empire/MeleeUltratech.xml	
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Empire</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Toxblade === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEE_MeleeWeapon_Toxblade"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<chanceFactor>0.33</chanceFactor>
-								<cooldownTime>1.26</cooldownTime>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>VFEE_CutToxblade</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.18</cooldownTime>
-								<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>VFEE_StabToxblade</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEE_MeleeWeapon_Toxblade"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEE_MeleeWeapon_Toxblade"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.5</MeleeCritChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-							<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Add tags -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFEE_MeleeWeapon_Toxblade"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFEE_MeleeWeapon_Toxblade"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEE_MeleeWeapon_Toxblade"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- === Toxblade (Bladelink) === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEE_MeleeWeapon_ToxbladeBladelink"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1.5</power>
-								<chanceFactor>0.33</chanceFactor>
-								<cooldownTime>1.26</cooldownTime>
-								<armorPenetrationBlunt>0.275</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>VFEE_CutToxblade</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.18</cooldownTime>
-								<armorPenetrationBlunt>3.28</armorPenetrationBlunt>
-								<armorPenetrationSharp>14</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>VFEE_StabToxblade</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetrationBlunt>1.48</armorPenetrationBlunt>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEE_MeleeWeapon_ToxbladeBladelink"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<MeleeCounterParryBonus>0.20</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEE_MeleeWeapon_ToxbladeBladelink"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.55</MeleeCritChance>
-							<MeleeParryChance>0.20</MeleeParryChance>
-							<MeleeDodgeChance>0.10</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Add tags -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFEE_MeleeWeapon_ToxbladeBladelink"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFEE_MeleeWeapon_ToxbladeBladelink"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEE_MeleeWeapon_ToxbladeBladelink"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Empire/PawnKinds.xml b/Patches/Vanilla Factions Expanded - Empire/PawnKinds.xml
deleted file mode 100644
index 8387cfbf9a..0000000000
--- a/Patches/Vanilla Factions Expanded - Empire/PawnKinds.xml	
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Empire</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="VFEE_DeserterBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>300</min>
-										<max>500</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-								<li>
-									<generateChance>0.15</generateChance>
-									<sidearmMoney>
-										<min>10</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>GrenadeSmoke</li>
-									</weaponTags>
-									<magazineCount>
-										<min>1</min>
-										<max>2</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="VFEE_Empire_Fighter_Absolver"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>300</min>
-										<max>500</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-								<li>
-									<generateChance>0.1</generateChance>
-									<sidearmMoney>
-										<min>10</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>GrenadeSmoke</li>
-									</weaponTags>
-									<magazineCount>
-										<min>1</min>
-										<max>2</max>
-									</magazineCount>
-								</li>
-								<li>
-									<generateChance>0.1</generateChance>
-									<sidearmMoney>
-										<min>80</min>
-										<max>160</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_FlareLauncher</li>
-									</weaponTags>
-									<magazineCount>
-										<min>1</min>
-										<max>3</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[defName="VFEE_Empire_Fighter_Absolver"]/specificApparelRequirements</xpath>
-					<value>
-						<li>
-							<bodyPartGroup>Shoulders</bodyPartGroup>
-							<apparelLayer>Backpack</apparelLayer>
-							<stuff>Synthread</stuff>
-							<color>(10, 10, 10)</color>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Empire/RangedSpacer.xml b/Patches/Vanilla Factions Expanded - Empire/RangedSpacer.xml
deleted file mode 100644
index 8bb0dee50d..0000000000
--- a/Patches/Vanilla Factions Expanded - Empire/RangedSpacer.xml	
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Empire</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "VEE_Gun_Fletcher" or
-						defName = "VFEE_Gun_ChargeThumper"
-						]/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>
-				</li>
-
-				<!-- === Fletcher === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VEE_Gun_Fletcher</defName>
-					<statBases>
-						<Mass>7.30</Mass>
-						<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.6</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.35</SwayFactor>
-						<Bulk>11.92</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.50</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_FletcherDart</defaultProjectile>
-						<warmupTime>1.8</warmupTime>
-						<range>150</range>
-						<soundCast>ChargeLance_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>4</AmmoGenPerMagOverride>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_FletcherDart</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_SR</li>
-						<li>Bipod_AMR</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- === Charge Thumper === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFEE_Gun_ChargeThumper</defName>
-					<statBases>
-						<Mass>8</Mass>
-						<RangedWeapon_Cooldown>0.43</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.8</SwayFactor>
-						<Bulk>10</Bulk>
-						<WorkToMake>39500</WorkToMake>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_40x68mmDemo_Thump</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>40</range>
-						<burstShotCount>0</burstShotCount>
-						<soundCast>ThumpCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_40x68mmDemo</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Empire/Scenario_Empire.xml b/Patches/Vanilla Factions Expanded - Empire/Scenario_Empire.xml
deleted file mode 100644
index 56d035df18..0000000000
--- a/Patches/Vanilla Factions Expanded - Empire/Scenario_Empire.xml	
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Empire</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Adds ammo to the scenario === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="VFEE_NewFamily"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_ScatterThingsAnywhere">
-							<def>ScatterThingsAnywhere</def>
-							<thingDef>Ammo_556x45mmNATO_Incendiary</thingDef>
-							<count>300</count>
-						</li>
-						<li Class="ScenPart_ScatterThingsAnywhere">
-							<def>ScatterThingsAnywhere</def>
-							<thingDef>Ammo_40x68mmDemo_Thump</thingDef>
-							<count>60</count>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Insectoids/Ammo/MadnessShell.xml b/Patches/Vanilla Factions Expanded - Insectoids/Ammo/MadnessShell.xml
deleted file mode 100644
index 02abcbff54..0000000000
--- a/Patches/Vanilla Factions Expanded - Insectoids/Ammo/MadnessShell.xml	
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Insectoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === AmmoCategoryDef === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-
-					<value>
-						<CombatExtended.AmmoCategoryDef>
-							<defName>GrenadePsyMadness</defName>
-							<label>madness</label>
-							<description>Uses psychic technology to induce a berserk range against targets in range.</description>
-							<advanced>true</advanced>
-						</CombatExtended.AmmoCategoryDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_Shell_PsychicWarhead"]</xpath>
-
-					<value>
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBase">
-							<defName>VFEI_Shell_PsychicWarhead</defName>
-							<label>81mm mortar shell (Psychic warhead)</label>
-							<graphicData>
-								<texPath>Things/Item/VFEI_PsychicWarhead</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>1000</MarketValue>
-								<Mass>4.1</Mass>
-								<Bulk>13.34</Bulk>
-							</statBases>
-							<ammoClass>GrenadePsyMadness</ammoClass>
-							<comps>
-								<li Class="CompProperties_Explosive">
-									<explosiveRadius>2.9</explosiveRadius>
-									<explosiveDamageType>VFEI_PsychicNoDamage</explosiveDamageType>
-									<damageAmountBase>50</damageAmountBase>
-									<!--<explosiveExpandPerStackcount>0.4</explosiveExpandPerStackcount>-->
-									<startWickHitPointsPercent>0.7</startWickHitPointsPercent>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-									<explodeOnKilled>True</explodeOnKilled>
-									<wickTicks>30~60</wickTicks>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_Bullet_Shell_PsychicWarhead"]</xpath>
-
-					<value>
-						<ThingDef ParentName="Base81mmMortarShell">
-							<defName>VFEI_Bullet_Shell_PsychicWarhead</defName>
-							<label>81mm mortar shell (Psychic Warhead)</label>
-							<graphicData>
-								<texPath>Things/Projectile/ShellArchotechInsanity</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>VFEI_PsychicDamage</damageDef>
-								<damageAmountBase>50</damageAmountBase>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0</armorPenetrationBlunt>
-								<flyOverhead>true</flyOverhead>
-								<explosionRadius>5.5</explosionRadius>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_81mmMortarShell"]/ammoTypes</xpath>
-
-					<value>
-						<VFEI_Shell_PsychicWarhead>VFEI_Bullet_Shell_PsychicWarhead</VFEI_Shell_PsychicWarhead>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Insectoids/Ammo/PlasmaCells.xml b/Patches/Vanilla Factions Expanded - Insectoids/Ammo/PlasmaCells.xml
deleted file mode 100644
index eec91d82d7..0000000000
--- a/Patches/Vanilla Factions Expanded - Insectoids/Ammo/PlasmaCells.xml	
+++ /dev/null
@@ -1,438 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Insectoids</li>
-		</mods>
-
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-
-			<value>
-				<!-- === ThingCategoryDef === -->
-				<ThingCategoryDef>
-					<defName>AmmoVFEIPlasmaCells</defName>
-					<label>plasma cells</label>
-					<parent>AmmoAdvanced</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberPlasmaMedium</iconPath>
-				</ThingCategoryDef>
-
-				<!-- === AmmoSetDef === -->
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_VFEI_PlasmaCutter</defName>
-					<label>plasma cells</label>
-					<ammoTypes>
-						<Ammo_VFEI_PlasmaCutter>Bullet_VFEI_PlasmaCutter</Ammo_VFEI_PlasmaCutter>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_VFEI_PlasmaScatter</defName>
-					<label>plasma cells</label>
-					<ammoTypes>
-						<Ammo_VFEI_PlasmaScatter>Bullet_VFEI_PlasmaScatter</Ammo_VFEI_PlasmaScatter>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_VFEI_PlasmaRifle</defName>
-					<label>plasma cells</label>
-					<ammoTypes>
-						<Ammo_VFEI_PlasmaRifle>Bullet_VFEI_PlasmaRifle</Ammo_VFEI_PlasmaRifle>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_VFEI_PlasmaPiercer</defName>
-					<label>plasma cells</label>
-					<ammoTypes>
-						<Ammo_VFEI_PlasmaPiercer>Bullet_VFEI_PlasmaPiercer</Ammo_VFEI_PlasmaPiercer>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- === Ammo === -->
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase" Name="VFEPlasmaCellsBase" Abstract="True">
-					<description>Plasma containment power cells</description>
-					<statBases>
-						<Mass>0.017</Mass>
-						<Bulk>0.01</Bulk>
-						<MarketValue>0.24</MarketValue>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting_TableMachining</li>
-					</tradeTags>
-					<thingCategories>
-						<li>AmmoVFEIPlasmaCells</li>
-					</thingCategories>
-					<ammoClass>Plasma</ammoClass>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>20</damageAmountBase>
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>0.5</explosiveRadius>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>2</Fragment_Large>
-								<Fragment_Small>10</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="VFEPlasmaCellsBase">
-					<defName>Ammo_VFEI_PlasmaCutter</defName>
-					<label>plasma cutter cell</label>
-					<graphicData>
-						<texPath>Things/Ammo/PlasmaCell/Pistol</texPath>
-						<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-					</graphicData>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="VFEPlasmaCellsBase">
-					<defName>Ammo_VFEI_PlasmaScatter</defName>
-					<label>plasma scattergun cell</label>
-					<graphicData>
-						<texPath>Things/Ammo/PlasmaCell/Heavy</texPath>
-						<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-					</graphicData>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="VFEPlasmaCellsBase">
-					<defName>Ammo_VFEI_PlasmaRifle</defName>
-					<label>plasma beam rifle cell</label>
-					<graphicData>
-						<texPath>Things/Ammo/PlasmaCell/Rifle</texPath>
-						<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-					</graphicData>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="VFEPlasmaCellsBase">
-					<defName>Ammo_VFEI_PlasmaPiercer</defName>
-					<label>plasma piercer cell</label>
-					<graphicData>
-						<texPath>Things/Ammo/PlasmaCell/Rifle</texPath>
-						<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-					</graphicData>
-				</ThingDef>
-
-				<!-- === Projectiles === -->
-				<ThingDef Name="BaseVFEIPlasmaBullet" ParentName="BaseBulletCE" Abstract="true">
-					<thingClass>CombatExtended.BulletCE</thingClass><!-- If i don't add this the ammo won't work -->
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>Burn</damageDef>
-						<speed>151</speed>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseVFEIPlasmaBullet">
-					<defName>Bullet_VFEI_PlasmaCutter</defName>
-					<label>plasma shot</label>
-					<graphicData>
-						<texPath>Things/Item/Weapons/Plasma_Cutter</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>8</damageAmountBase>
-						<armorPenetrationSharp>8</armorPenetrationSharp>
-						<armorPenetrationBlunt>8</armorPenetrationBlunt>
-						<empShieldBreakChance>0.2</empShieldBreakChance>
-						<secondaryDamage>
-							<li>
-								<def>Cut</def>
-								<amount>3</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseVFEIPlasmaBullet">
-					<defName>Bullet_VFEI_PlasmaScatter</defName>
-					<label>plasma shot</label>
-					<graphicData>
-						<texPath>Things/Item/Weapons/Plasma_Scatter</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>129</speed>
-						<damageAmountBase>6</damageAmountBase>
-						<armorPenetrationSharp>8</armorPenetrationSharp>
-						<armorPenetrationBlunt>8</armorPenetrationBlunt>
-						<pelletCount>9</pelletCount>
-						<spreadMult>17.8</spreadMult>
-						<empShieldBreakChance>0.2</empShieldBreakChance>
-						<secondaryDamage>
-							<li>
-								<def>EMP</def>
-								<amount>3</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseVFEIPlasmaBullet">
-					<defName>Bullet_VFEI_PlasmaRifle</defName>
-					<label>plasma beam</label>
-					<graphicData>
-						<texPath>Things/Item/Weapons/Plasma_Beam</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>15</damageAmountBase>
-						<armorPenetrationSharp>10</armorPenetrationSharp>
-						<armorPenetrationBlunt>10</armorPenetrationBlunt>
-						<empShieldBreakChance>0.2</empShieldBreakChance>
-						<secondaryDamage>
-							<li>
-								<def>EMP</def>
-								<amount>3</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseVFEIPlasmaBullet">
-					<defName>Bullet_VFEI_PlasmaPiercer</defName>
-					<label>plasma bolt</label>
-					<graphicData>
-						<texPath>Things/Item/Weapons/Plasma_Nail</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>22</damageAmountBase>
-						<armorPenetrationSharp>18</armorPenetrationSharp>
-						<armorPenetrationBlunt>25</armorPenetrationBlunt>
-						<empShieldBreakChance>0.2</empShieldBreakChance>
-						<secondaryDamage>
-							<li>
-								<def>Stun</def>
-								<amount>3</amount>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<!-- === Recipes === -->
-				<!-- == Plasma Cutter == -->
-				<RecipeDef ParentName="ChargeAmmoRecipeBase">
-					<defName>MakeAmmo_VFEI_PlasmaCutter</defName>
-					<label>make Plasma Cutter Power Cells</label>
-					<description>Craft 500 shots worth of Plasma Cutter Power Cells.</description>
-					<jobString>Making Plasma Cutter Power Cells.</jobString>
-					<workAmount>3800</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>18</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Plasteel</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>5</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Plasteel</li>
-							<li>Prometheum</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_VFEI_PlasmaCutter>500</Ammo_VFEI_PlasmaCutter>
-					</products>
-				</RecipeDef>
-
-				<!-- == Plasma Scattergun == -->
-				<RecipeDef ParentName="ChargeAmmoRecipeBase">
-					<defName>MakeAmmo_VFEI_PlasmaScatter</defName>
-					<label>make Plasma Scattergun Power Cells</label>
-					<description>Craft 500 shots worth of Plasma Scattergun Power Cells.</description>
-					<jobString>Making Plasma Scattergun Power Cells.</jobString>
-					<workAmount>3800</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>18</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Plasteel</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>5</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Plasteel</li>
-							<li>Prometheum</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_VFEI_PlasmaScatter>500</Ammo_VFEI_PlasmaScatter>
-					</products>
-				</RecipeDef>
-
-				<!-- == Plasma Rifle == -->
-				<RecipeDef ParentName="ChargeAmmoRecipeBase">
-					<defName>MakeAmmo_VFEI_PlasmaRifle</defName>
-					<label>make Plasma Rifle Power Cells</label>
-					<description>Craft 500 shots worth of Plasma Rifle Power Cells.</description>
-					<jobString>Making Plasma Rifle Power Cells.</jobString>
-					<workAmount>3800</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>18</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Plasteel</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>5</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Plasteel</li>
-							<li>Prometheum</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_VFEI_PlasmaRifle>500</Ammo_VFEI_PlasmaRifle>
-					</products>
-				</RecipeDef>
-
-				<!-- == Plasma Piercer == -->
-				<RecipeDef ParentName="ChargeAmmoRecipeBase">
-					<defName>MakeAmmo_VFEI_PlasmaPiercer</defName>
-					<label>make Plasma Piercer Power Cells</label>
-					<description>Craft 500 shots worth of Plasma Piercer Power Cells.</description>
-					<jobString>Making Plasma Piercer Power Cells.</jobString>
-					<workAmount>3800</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>18</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Plasteel</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Prometheum</li>
-								</thingDefs>
-							</filter>
-							<count>5</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>Plasteel</li>
-							<li>Prometheum</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_VFEI_PlasmaPiercer>500</Ammo_VFEI_PlasmaPiercer>
-					</products>
-				</RecipeDef>
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Insectoids/Bodies/Bodies_Boomtick.xml b/Patches/Vanilla Factions Expanded - Insectoids/Bodies/Bodies_Boomtick.xml
deleted file mode 100644
index 83d2a173f5..0000000000
--- a/Patches/Vanilla Factions Expanded - Insectoids/Bodies/Bodies_Boomtick.xml	
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Insectoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Boomtick === -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="VFEI_Boomtick"]//*[
-						def="Shell" or
-						def="Elytra" or
-						def="Pronotum"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="VFEI_Boomtick"]//*[
-						def="Shell" or
-						def="Elytra" or
-						def="Pronotum" or
-						def="InsectMouth" or
-						def="InsectHead"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Insectoids/Bodies/Bodies_Scorpionlike.xml b/Patches/Vanilla Factions Expanded - Insectoids/Bodies/Bodies_Scorpionlike.xml
deleted file mode 100644
index 4ae2badd27..0000000000
--- a/Patches/Vanilla Factions Expanded - Insectoids/Bodies/Bodies_Scorpionlike.xml	
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Insectoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Scorpion === -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="VFEI_ScorpionLike"]//*[
-						def="Shell" or
-						def="VFEI_Thorax" or
-						def="Pronotum" or
-						def="VFEI_InsectTail"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="VFEI_ScorpionLike"]//*[
-						def="Shell" or
-						def="VFEI_Thorax" or
-						def="Pronotum" or
-						def="VFEI_InsectTail" or
-						def="VFEI_InsectSting" or
-						def="InsectMouth" or
-						def="InsectHead"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Insectoids/Bodies/Bodies_Wargling.xml b/Patches/Vanilla Factions Expanded - Insectoids/Bodies/Bodies_Wargling.xml
deleted file mode 100644
index c559dfdb77..0000000000
--- a/Patches/Vanilla Factions Expanded - Insectoids/Bodies/Bodies_Wargling.xml	
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Insectoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Wargling === -->
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="VFEI_Wargling"]//*[
-						def="Shell" or
-						def="Elytra" or
-						def="Pronotum"]
-					</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/BodyDef[defName="VFEI_Wargling"]//*[
-						def="Shell" or
-						def="Elytra" or
-						def="Pronotum" or
-						def="VFEI_FrontClaw" or
-						def="InsectMouth" or
-						def="InsectHead"]/groups
-					</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Insectoids/Hediffs/Hediffs_Berserk.xml b/Patches/Vanilla Factions Expanded - Insectoids/Hediffs/Hediffs_Berserk.xml
deleted file mode 100644
index 9e23df9584..0000000000
--- a/Patches/Vanilla Factions Expanded - Insectoids/Hediffs/Hediffs_Berserk.xml	
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Insectoids</li>
-		</mods>
-
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-
-			<value>
-
-				<!-- === Berserk Hediff === -->
-				<HediffDef>
-					<hediffClass>HediffWithComps</hediffClass>
-					<defName>VFEI_Berserk</defName>
-					<label>berserk</label>
-					<description>.</description>
-					<defaultLabelColor>(0.9, 1.0, 0.35)</defaultLabelColor>
-					<initialSeverity>1</initialSeverity>
-					<comps>
-						<li Class="HediffCompProperties_CauseMentalState">
-							<animalMentalState>ManhunterPermanent</animalMentalState>
-							<animalMentalStateAlias>Manhunter</animalMentalStateAlias>
-							<humanMentalState>Berserk</humanMentalState>
-							<letterDef>ThreatSmall</letterDef>
-							<mtbDaysToCauseMentalState>0.001</mtbDaysToCauseMentalState>
-						</li>
-					</comps>
-				</HediffDef>
-
-				<!-- === Berserk Damage === -->
-				<DamageDef>
-					<workerClass>DamageWorker_AddGlobal</workerClass>
-					<defName>VFEI_PsychicDamage</defName>
-					<label>psychic</label>
-					<hediff>VFEI_Berserk</hediff>
-					<canInterruptJobs>true</canInterruptJobs>
-					<makesBlood>false</makesBlood>
-					<harmsHealth>false</harmsHealth>
-					<defaultDamage>0</defaultDamage>
-					<explosionCellMote>Mote_ExtinguisherPuff</explosionCellMote>
-					<explosionColorEdge>(1, 1, 1, 0.05)</explosionColorEdge>
-					<soundExplosion>Explosion_Smoke</soundExplosion>
-					<combatLogRules>Damage_Smoke</combatLogRules>
-				</DamageDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Insectoids/Hediffs/Hediffs_Mutations.xml b/Patches/Vanilla Factions Expanded - Insectoids/Hediffs/Hediffs_Mutations.xml
deleted file mode 100644
index e7a9822ee7..0000000000
--- a/Patches/Vanilla Factions Expanded - Insectoids/Hediffs/Hediffs_Mutations.xml	
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Insectoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="VFEI_VenomGland"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>venom gland</label>
-								<capacities>
-									<li>SpittingOnPawn</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4</cooldownTime>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="VFEI_PneumaticClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claw</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>3.6</cooldownTime>
-								<armorPenetrationBlunt>22.05</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Insectoids/PawnKindDefs_Humanlikes/PawnKinds_Pirate.xml b/Patches/Vanilla Factions Expanded - Insectoids/PawnKindDefs_Humanlikes/PawnKinds_Pirate.xml
deleted file mode 100644
index 5c67631355..0000000000
--- a/Patches/Vanilla Factions Expanded - Insectoids/PawnKindDefs_Humanlikes/PawnKinds_Pirate.xml	
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Insectoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/PawnKindDef[defName="VFEI_RiotUnit"]/modExtensions/li[@Class="VFECore.PawnKindDefExtension"]</xpath>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="VFEI_RiotUnit"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>250</min>
-								<max>700</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>VFE_RiotShield</li>
-							</shieldTags>
-							<shieldChance>1</shieldChance>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>150</min>
-									<max>350</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>CE_Sidearm_Melee</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Insectoids/Scenario/Scenario.xml b/Patches/Vanilla Factions Expanded - Insectoids/Scenario/Scenario.xml
deleted file mode 100644
index 46e725c382..0000000000
--- a/Patches/Vanilla Factions Expanded - Insectoids/Scenario/Scenario.xml	
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Insectoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Removes Charge Lance from scenario === -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ScenarioDef[defName="VFEI_MercenarySquad"]/scenario/parts/li[thingDef="Gun_ChargeLance"]</xpath>
-				</li>
-
-				<!-- === Increases Charge Rifle count to 3 to replace the CL === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ScenarioDef[defName="VFEI_MercenarySquad"]/scenario/parts/li[thingDef="Gun_ChargeRifle"]/count</xpath>
-
-					<value>
-						<count>3</count>
-					</value>
-				</li>
-
-				<!-- === Adds ammo to the scenario === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="VFEI_MercenarySquad"]/scenario/parts</xpath>
-
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_6x24mmCharged</thingDef>
-							<count>600</count>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Items/Items_Resource_Leathers.xml b/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Items/Items_Resource_Leathers.xml
deleted file mode 100644
index e597bb4ea7..0000000000
--- a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Items/Items_Resource_Leathers.xml	
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Insectoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Chitin === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEI_Chitin"]/statBases</xpath>
-					<value>
-						<Bulk>0.3</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_Chitin"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>1.1</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_Chitin"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.60</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_Chitin"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.005</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEI_Chitin"]/stuffProps/categories</xpath>
-					<value>
-						<li>Metallic_Weapon</li>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEI_Chitin"]/stuffProps/statFactors</xpath>
-					<value>
-						<Mass>0.7</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_Chitin"]/statBases/BluntDamageMultiplier</xpath>
-					<value>
-						<BluntDamageMultiplier>0.65</BluntDamageMultiplier>
-					</value>
-				</li>
-
-				<!-- === Spidersilk === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_Spidersilk"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.01</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_Spidersilk"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.05</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_Spidersilk"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.001</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Misc/Apparel_Various.xml b/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Misc/Apparel_Various.xml
deleted file mode 100644
index 7d16e86ea2..0000000000
--- a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Misc/Apparel_Various.xml	
+++ /dev/null
@@ -1,251 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Insectoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Riot Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Apparel_RiotHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Apparel_RiotHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>3.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Apparel_RiotHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>28</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Apparel_RiotHelmet"]/costList/Steel</xpath>
-					<value>
-						<Steel>55</Steel>
-						<DevilstrandCloth>10</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFE_Apparel_RiotHelmet"]/costList/ComponentIndustrial</xpath>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFE_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>
-				</li>
-
-				<!-- === Riot Armor === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Apparel_RiotArmor"]/statBases</xpath>
-					<value>
-						<Bulk>40</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Apparel_RiotArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>20</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Apparel_RiotArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Apparel_RiotArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>36</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Apparel_RiotArmor"]/costList/Cloth</xpath>
-					<value>
-						<Cloth>80</Cloth>
-						<DevilstrandCloth>40</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Apparel_RiotArmor"]/costList/Steel</xpath>
-					<value>
-						<Steel>80</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFE_Apparel_RiotArmor"]/costList/ComponentIndustrial</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Apparel_RiotArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<MeleeDodgeChance>-0.15</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Apparel_RiotArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFE_Apparel_RiotArmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Riot Shield : Replaced as CE type shield === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_Shield_Riot"]</xpath>
-					<value>
-						<ThingDef ParentName="ShieldBase">
-							<defName>VFEI_Shield_Riot</defName>
-							<label>riot shield</label>
-							<description>An industrial heavy shield made out of reinforced steel. Provides a lot of protection against blunt damage, which makes it ideal for urbworld riot police.</description>
-							<techLevel>Industrial</techLevel>
-							<graphicData>
-								<texPath>Things/Pawn/Humanlike/RiotShield/RiotShield</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<costList>
-								<Steel>60</Steel>
-								<DevilstrandCloth>20</DevilstrandCloth>
-							</costList>
-							<statBases>
-								<WorkToMake>7500</WorkToMake>
-								<MaxHitPoints>125</MaxHitPoints>
-								<ArmorRating_Sharp>3.5</ArmorRating_Sharp>
-								<ArmorRating_Blunt>5.25</ArmorRating_Blunt>
-								<ArmorRating_Heat>0.25</ArmorRating_Heat>
-								<Mass>6</Mass>
-								<Bulk>15</Bulk>
-								<WornBulk>10</WornBulk>
-								<Flammability>0.1</Flammability>
-							</statBases>
-							<equippedStatOffsets>
-								<ReloadSpeed>-0.15</ReloadSpeed>
-								<MeleeHitChance>-2</MeleeHitChance>
-								<ShootingAccuracyPawn>-0.4</ShootingAccuracyPawn>
-								<AimingAccuracy>-0.1</AimingAccuracy>
-								<Suppressability>-0.25</Suppressability>
-								<MeleeCritChance>-0.1</MeleeCritChance>
-								<MeleeParryChance>1.0</MeleeParryChance>
-							</equippedStatOffsets>
-							<apparel>
-								<tags>
-									<li>VFE_RiotShield</li>
-								</tags>
-							</apparel>
-							<modExtensions>
-								<li Class="CombatExtended.ShieldDefExtension">
-									<shieldCoverage>
-										<li>Hands</li>
-										<li>Arms</li>
-										<li>Shoulders</li>
-										<li>Torso</li>
-										<li>Neck</li>
-										<li>FullHead</li>
-									</shieldCoverage>
-									<crouchCoverage>
-										<li>Legs</li>
-									</crouchCoverage>
-									<drawAsTall>true</drawAsTall>
-								</li>
-							</modExtensions>
-						</ThingDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Misc/Weapons_Spacer.xml b/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Misc/Weapons_Spacer.xml
deleted file mode 100644
index 4ea963895f..0000000000
--- a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Misc/Weapons_Spacer.xml	
+++ /dev/null
@@ -1,258 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Insectoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Gun_Plasmacutter"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Gun_PlasmaScattergun" or defName="VFE_Gun_Plasmapiercer" or defName="VFE_Gun_PlasmabeamRifle"]/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>
-				</li>
-
-				<!-- === Plasma Saw === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Plasmasaw"]/statBases/Mass</xpath>
-					<value>
-						<Mass>2.8</Mass>
-						<Bulk>6.5</Bulk>
-						<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Plasmasaw"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>plasma chain</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.1</cooldownTime>
-								<armorPenetrationSharp>3.68</armorPenetrationSharp>
-								<!-- <linkedBodyPartsGroup>Chain</linkedBodyPartsGroup> -->
-								<extraMeleeDamages>
-									<li>
-										<def>Flame</def>
-										<amount>2</amount>
-										<chance>0.3</chance>
-									</li>
-								</extraMeleeDamages>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Plasma Cutter === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFE_Gun_Plasmacutter</defName>
-					<statBases>
-						<WorkToMake>18000</WorkToMake>
-						<Mass>2</Mass>
-						<Bulk>2.15</Bulk>
-						<SwayFactor>1.00</SwayFactor>
-						<ShotSpread>0.15</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_VFEI_PlasmaCutter</defaultProjectile>
-						<!-- <burstShotCount>3</burstShotCount> -->
-						<!-- <ticksBetweenBurstShots>5</ticksBetweenBurstShots> -->
-						<warmupTime>0.5</warmupTime>
-						<range>15</range>
-						<soundCast>VFE_PlasmaShot_Cutter</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_VFEI_PlasmaCutter</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- === Plasma Scattergun === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFE_Gun_PlasmaScattergun</defName>
-					<statBases>
-						<WorkToMake>26000</WorkToMake>
-						<Mass>4.11</Mass>
-						<Bulk>5.15</Bulk>
-						<SwayFactor>1.10</SwayFactor>
-						<ShotSpread>0.20</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_VFEI_PlasmaScatter</defaultProjectile>
-						<!-- <burstShotCount>3</burstShotCount> -->
-						<!-- <ticksBetweenBurstShots>5</ticksBetweenBurstShots> -->
-						<warmupTime>0.5</warmupTime>
-						<range>20</range>
-						<soundCast>VFE_PlasmaShot_Scattergun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_VFEI_PlasmaScatter</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- === Plasma Beam Rifle === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFE_Gun_PlasmabeamRifle</defName>
-					<statBases>
-						<WorkToMake>36800</WorkToMake>
-						<Mass>4.36</Mass>
-						<Bulk>6.15</Bulk>
-						<SwayFactor>1.00</SwayFactor>
-						<ShotSpread>0.15</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<NightVisionEfficiency_Weapon>0.4</NightVisionEfficiency_Weapon>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.31</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_VFEI_PlasmaRifle</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>1.0</warmupTime>
-						<range>55</range>
-						<soundCast>VFE_PlasmaShot_Beam</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_VFEI_PlasmaRifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- === Plasma Piercer === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFE_Gun_Plasmapiercer</defName>
-					<statBases>
-						<WorkToMake>36800</WorkToMake>
-						<Mass>5.20</Mass>
-						<Bulk>7.15</Bulk>
-						<SwayFactor>1.00</SwayFactor>
-						<ShotSpread>0.15</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_VFEI_PlasmaPiercer</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>44</range>
-						<soundCast>VFE_PlasmaShot_Piercer</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_VFEI_PlasmaPiercer</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races/Races_Animal_Insect.xml b/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races/Races_Animal_Insect.xml
deleted file mode 100644
index ef42108f9a..0000000000
--- a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races/Races_Animal_Insect.xml	
+++ /dev/null
@@ -1,478 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Insectoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Queen === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Queen"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>2.6</MoveSpeed>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.30</MeleeCritChance>
-						<MeleeParryChance>0.57</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Queen"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>15</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Queen"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Queen"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head claw</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>37</power>
-								<cooldownTime>1.48</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>50</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head claw</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>65</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>3.38</armorPenetrationSharp>
-								<armorPenetrationBlunt>8.438</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>34</power>
-								<cooldownTime>2.64</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Queen"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Queen"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Queen"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>3000</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Royal Megaspider === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_Insectoid_RoyalMegaspider"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4.4</MoveSpeed>
-						<MeleeDodgeChance>0.06</MeleeDodgeChance>
-						<MeleeCritChance>0.33</MeleeCritChance>
-						<MeleeParryChance>0.23</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_Insectoid_RoyalMegaspider"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>14</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_Insectoid_RoyalMegaspider"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_Insectoid_RoyalMegaspider"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>2.5</baseHealthScale>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_Insectoid_RoyalMegaspider"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head claw</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>48</armorPenetrationSharp>
-								<armorPenetrationBlunt>24</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head claw</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>49</power>
-								<cooldownTime>2.6</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>12.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>2.17</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>6.48</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFEI_Insectoid_RoyalMegaspider"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFEI_Insectoid_RoyalMegaspider"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEI_Insectoid_RoyalMegaspider"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1075</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Gigalocust === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Gigalocust"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4.8</MoveSpeed>
-						<MeleeDodgeChance>0.07</MeleeDodgeChance>
-						<MeleeCritChance>0.41</MeleeCritChance>
-						<MeleeParryChance>0.19</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Gigalocust"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>28</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Gigalocust"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>11</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Gigalocust"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>2.1</baseHealthScale>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Gigalocust"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head claw</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>29</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head claw</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>52</power>
-								<cooldownTime>2.6</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>12.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>2.17</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>6.48</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Gigalocust"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Gigalocust"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Gigalocust"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>950</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="VFEI_Insectoid_Gigalocust"]/combatPower</xpath>
-					<value>
-						<combatPower>300</combatPower>
-					</value>
-				</li>
-
-				<!-- === Royal Megapede === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Megapede"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>3.3</MoveSpeed>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.36</MeleeCritChance>
-						<MeleeParryChance>0.38</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Megapede"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>25</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Megapede"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Megapede"]/race/body</xpath>
-					<value>
-						<body>CE_ArmoredBeetleLikeWithClaw</body>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Megapede"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>3.5</baseHealthScale>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Megapede"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head claw</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>63</power>
-								<cooldownTime>3.28</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2.43</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>32</power>
-								<cooldownTime>3.4</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>10.56</armorPenetrationSharp>
-								<armorPenetrationBlunt>39.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>3.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.8</chanceFactor>
-								<armorPenetrationBlunt>17.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Megapede"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Megapede"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Megapede"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1325</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="VFEI_Insectoid_Megapede"]/combatPower</xpath>
-					<value>
-						<combatPower>250</combatPower>
-					</value>
-				</li>
-
-				<!-- === Larvae === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Larvae"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>1.5</MoveSpeed>
-						<MeleeDodgeChance>0.06</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-						<MeleeParryChance>0.04</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Larvae"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>0.2</baseHealthScale>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_Insectoid_Larvae"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2.12</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.031</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>2.12</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.031</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Boomtick.xml b/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Boomtick.xml
deleted file mode 100644
index 92a8a565ee..0000000000
--- a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Boomtick.xml	
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Insectoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatgrownBoomtick"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4.35</MoveSpeed>
-						<MeleeDodgeChance>0.11</MeleeDodgeChance>
-						<MeleeCritChance>0.11</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatgrownBoomtick"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.65</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatgrownBoomtick"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatgrownBoomtick"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>0.4</baseHealthScale>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatgrownBoomtick"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFEI_VatgrownBoomtick"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFEI_VatgrownBoomtick"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEI_VatgrownBoomtick"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>312</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Cuterpillar.xml b/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Cuterpillar.xml
deleted file mode 100644
index cf4f3bccaf..0000000000
--- a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Cuterpillar.xml	
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Insectoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownCuterpillar"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>2.3</MoveSpeed>
-						<MeleeDodgeChance>0.11</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownCuterpillar"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>0.2</baseHealthScale>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownCuterpillar"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>2.12</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.031</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Gigascorpion.xml b/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Gigascorpion.xml
deleted file mode 100644
index 7be315082a..0000000000
--- a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Gigascorpion.xml	
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Insectoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigascorpion"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4.8</MoveSpeed>
-						<MeleeDodgeChance>0.07</MeleeDodgeChance>
-						<MeleeCritChance>0.5</MeleeCritChance>
-						<MeleeParryChance>0.39</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigascorpion"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigascorpion"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigascorpion"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left pincer</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>37</power>
-								<cooldownTime>2.72</cooldownTime>
-								<linkedBodyPartsGroup>VFEI_PincerAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>3.54</armorPenetrationSharp>
-								<armorPenetrationBlunt>61.875</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right pincer</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>37</power>
-								<cooldownTime>2.72</cooldownTime>
-								<linkedBodyPartsGroup>VFEI_PincerAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>3.54</armorPenetrationSharp>
-								<armorPenetrationBlunt>61.875</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>VFEI_ToxicSting</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>VFEI_Sting</linkedBodyPartsGroup>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>2.46</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>10.8</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigascorpion"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<useStatic>false</useStatic>
-									<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-									<parts>
-										<li>VFEI_LeftPincer</li>
-										<li>VFEI_RightPincer</li>
-									</parts>
-								</li>
-								<li>
-									<useStatic>false</useStatic>
-									<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
-									<parts>
-										<li>VFEI_LeftPincer</li>
-										<li>VFEI_RightPincer</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigascorpion"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigascorpion"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigascorpion"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1125</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Gigawig.xml b/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Gigawig.xml
deleted file mode 100644
index 1e75c82acc..0000000000
--- a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Gigawig.xml	
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Insectoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigawig"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>2.6</MoveSpeed>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.23</MeleeCritChance>
-						<MeleeParryChance>0.33</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigawig"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigawig"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>3</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigawig"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.97</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>4.79</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.32</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigawig"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigawig"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigawig"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1000</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Megacricket.xml b/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Megacricket.xml
deleted file mode 100644
index 7dd6493037..0000000000
--- a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Megacricket.xml	
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Insectoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegacricket"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>5.75</MoveSpeed>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.23</MeleeCritChance>
-						<MeleeParryChance>0.12</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegacricket"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegacricket"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegacricket"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2.23</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.64</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.88</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.32</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegacricket"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegacricket"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegacricket"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>712</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Milkbeetle.xml b/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Milkbeetle.xml
deleted file mode 100644
index 6c3fe63780..0000000000
--- a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Milkbeetle.xml	
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Insectoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownMilkbeetle"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>2.5</MoveSpeed>
-						<MeleeDodgeChance>0.04</MeleeDodgeChance>
-						<MeleeCritChance>0.10</MeleeCritChance>
-						<MeleeParryChance>0.24</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownMilkbeetle"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4.65</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownMilkbeetle"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2.25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownMilkbeetle"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.97</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>4.79</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.32</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownMilkbeetle"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFEI_VatGrownMilkbeetle"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownMilkbeetle"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1475</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Monstrosity.xml b/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Monstrosity.xml
deleted file mode 100644
index d789cf3267..0000000000
--- a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Monstrosity.xml	
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Insectoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownMonstrosity"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>5.75</MoveSpeed>
-						<MeleeDodgeChance>0.10</MeleeDodgeChance>
-						<MeleeCritChance>0.62</MeleeCritChance>
-						<MeleeParryChance>0.26</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownMonstrosity"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>60</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownMonstrosity"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownMonstrosity"]/race/body</xpath>
-					<value>
-						<body>CE_ArmoredBeetleLikeWithClaw</body>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownMonstrosity"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head claw</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>0.99</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>46.88</armorPenetrationSharp>
-								<armorPenetrationBlunt>23.438</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>52</power>
-								<cooldownTime>0.85</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>12.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>43</power>
-								<cooldownTime>0.94</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>18.75</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownMonstrosity"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFEI_VatGrownMonstrosity"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownMonstrosity"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>2200</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Princess.xml b/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Princess.xml
deleted file mode 100644
index c635191274..0000000000
--- a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Princess.xml	
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Insectoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownPrincess"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>2.1</MoveSpeed>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.18</MeleeCritChance>
-						<MeleeParryChance>0.51</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownPrincess"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>15</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownPrincess"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownPrincess"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>33</power>
-								<cooldownTime>2.48</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2.48</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownPrincess"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFEI_VatGrownPrincess"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownPrincess"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1900</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_RoyalLarva.xml b/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_RoyalLarva.xml
deleted file mode 100644
index 5a3efffcbd..0000000000
--- a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_RoyalLarva.xml	
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Insectoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatgrownRoyalLarva"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>1.15</MoveSpeed>
-						<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						<MeleeCritChance>0.0</MeleeCritChance>
-						<MeleeParryChance>0.0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatgrownRoyalLarva"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2.12</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.031</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>2.12</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.031</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_RoyalMaggot.xml b/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_RoyalMaggot.xml
deleted file mode 100644
index d9bc32ab24..0000000000
--- a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_RoyalMaggot.xml	
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Insectoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownRoyalMaggot"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>1.15</MoveSpeed>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.03</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownRoyalMaggot"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.3</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownRoyalMaggot"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownRoyalMaggot"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownRoyalMaggot"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFEI_VatGrownRoyalMaggot"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownRoyalMaggot"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>475</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Spiderweaver.xml b/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Spiderweaver.xml
deleted file mode 100644
index 0cfeecdc47..0000000000
--- a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Spiderweaver.xml	
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Insectoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownSpiderweaver"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>3.6</MoveSpeed>
-						<MeleeDodgeChance>0.06</MeleeDodgeChance>
-						<MeleeCritChance>0.20</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownSpiderweaver"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>12</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownSpiderweaver"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownSpiderweaver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>32</power>
-								<cooldownTime>2.52</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.6</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2.35</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownSpiderweaver"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFEI_VatGrownSpiderweaver"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownSpiderweaver"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>687</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Titanbeetle.xml b/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Titanbeetle.xml
deleted file mode 100644
index 3380466f47..0000000000
--- a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Titanbeetle.xml	
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Insectoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownTitanbeetle"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>2.85</MoveSpeed>
-						<MeleeDodgeChance>0.04</MeleeDodgeChance>
-						<MeleeCritChance>0.37</MeleeCritChance>
-						<MeleeParryChance>0.41</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownTitanbeetle"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>26</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownTitanbeetle"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownTitanbeetle"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>2.75</baseHealthScale>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownTitanbeetle"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head claw</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>76</power>
-								<cooldownTime>3.32</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>36</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>33</power>
-								<cooldownTime>2.72</cooldownTime>
-								<chanceFactor>0.8</chanceFactor>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>3.51</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.6</chanceFactor>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownTitanbeetle"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFEI_VatGrownTitanbeetle"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownTitanbeetle"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1312</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_VatGigalocust.xml b/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_VatGigalocust.xml
deleted file mode 100644
index da1d18ee82..0000000000
--- a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_VatGigalocust.xml	
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Insectoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigalocust"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>5.2</MoveSpeed>
-						<MeleeDodgeChance>0.07</MeleeDodgeChance>
-						<MeleeCritChance>0.38</MeleeCritChance>
-						<MeleeParryChance>0.19</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigalocust"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>22</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigalocust"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>9</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigalocust"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>2.1</baseHealthScale>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigalocust"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head claw</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head claw</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>50</power>
-								<cooldownTime>2.6</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>12.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>2.17</cooldownTime>
-								<chanceFactor>0.2</chanceFactor>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>6.48</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigalocust"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigalocust"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownGigalocust"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>950</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_VatMegapede.xml b/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_VatMegapede.xml
deleted file mode 100644
index e813ba6dda..0000000000
--- a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_VatMegapede.xml	
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Insectoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegapede"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>2.8</MoveSpeed>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.35</MeleeCritChance>
-						<MeleeParryChance>0.37</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegapede"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>14</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegapede"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4.65</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegapede"]/race/body</xpath>
-					<value>
-						<body>CE_ArmoredBeetleLikeWithClaw</body>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegapede"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>3.45</baseHealthScale>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegapede"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head claw</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>60</power>
-								<cooldownTime>3.28</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2.43</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>ToxicBite</li>
-								</capacities>
-								<power>31</power>
-								<cooldownTime>3.4</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>10.56</armorPenetrationSharp>
-								<armorPenetrationBlunt>39.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>33</power>
-								<cooldownTime>3.51</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.8</chanceFactor>
-								<armorPenetrationBlunt>14.175</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegapede"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegapede"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegapede"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1312</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_VatMegascarab.xml b/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_VatMegascarab.xml
deleted file mode 100644
index e9172e829c..0000000000
--- a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_VatMegascarab.xml	
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Insectoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegascarab"]/statBases/MoveSpeed</xpath>
-
-					<value>
-						<MoveSpeed>4.7</MoveSpeed>
-						<MeleeDodgeChance>0.30</MeleeDodgeChance>
-						<MeleeCritChance>0.03</MeleeCritChance>
-						<MeleeParryChance>0.0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegascarab"]/statBases/ArmorRating_Blunt</xpath>
-
-					<value>
-						<ArmorRating_Blunt>2.25</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegascarab"]/statBases/ArmorRating_Sharp</xpath>
-
-					<value>
-						<ArmorRating_Sharp>0.7</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegascarab"]/race/baseHealthScale</xpath>
-
-					<value>
-						<baseHealthScale>0.3</baseHealthScale>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegascarab"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegascarab"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegascarab"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownMegascarab"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>450</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_VatMegaspider.xml b/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_VatMegaspider.xml
deleted file mode 100644
index a9b87501b1..0000000000
--- a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_VatMegaspider.xml	
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Insectoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatgrownMegaspider"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4.4</MoveSpeed>
-						<MeleeDodgeChance>0.09</MeleeDodgeChance>
-						<MeleeCritChance>0.31</MeleeCritChance>
-						<MeleeParryChance>0.17</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatgrownMegaspider"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>10</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatgrownMegaspider"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatgrownMegaspider"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>1.8</baseHealthScale>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatgrownMegaspider"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head claw</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head claw</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>41</power>
-								<cooldownTime>2.48</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>6.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2.48</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFEI_VatgrownMegaspider"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFEI_VatgrownMegaspider"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEI_VatgrownMegaspider"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>737</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_VatSpelopede.xml b/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_VatSpelopede.xml
deleted file mode 100644
index 2dbaa1965e..0000000000
--- a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_VatSpelopede.xml	
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Insectoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownSpelopede"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4.5</MoveSpeed>
-						<MeleeDodgeChance>0.11</MeleeDodgeChance>
-						<MeleeCritChance>0.17</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownSpelopede"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownSpelopede"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownSpelopede"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>1.2</baseHealthScale>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownSpelopede"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head claw</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>1.78</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.24</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.67</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head claw</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.78</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownSpelopede"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFEI_VatGrownSpelopede"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownSpelopede"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>487</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Wargling.xml b/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Wargling.xml
deleted file mode 100644
index dd7e53ac9a..0000000000
--- a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_Wargling.xml	
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Insectoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownWargling"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>6.0</MoveSpeed>
-						<MeleeDodgeChance>0.11</MeleeDodgeChance>
-						<MeleeCritChance>0.21</MeleeCritChance>
-						<MeleeParryChance>0.18</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownWargling"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>10.8</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownWargling"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>3.65</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownWargling"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>2</baseHealthScale>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownWargling"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.24</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>33</power>
-								<cooldownTime>1.71</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.0</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.0</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.24</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>33</power>
-								<cooldownTime>1.71</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.0</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.0</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.49</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.0</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.44</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownWorkerAnt"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFEI_VatGrownWorkerAnt"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownWorkerAnt"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>937</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_WorkerAnt.xml b/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_WorkerAnt.xml
deleted file mode 100644
index a1899f3b94..0000000000
--- a/Patches/Vanilla Factions Expanded - Insectoids/ThingDefs_Races_VatGrown/Races_WorkerAnt.xml	
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Insectoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownWorkerAnt"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4.6</MoveSpeed>
-						<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						<MeleeCritChance>0.16</MeleeCritChance>
-						<MeleeParryChance>0.14</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownWorkerAnt"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownWorkerAnt"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2.25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownWorkerAnt"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>1.3</baseHealthScale>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownWorkerAnt"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2.23</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.64</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.88</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.32</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownWorkerAnt"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFEI_VatGrownWorkerAnt"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEI_VatGrownWorkerAnt"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>700</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Mechanoids/CombinationDefs/CombinationDefs.xml b/Patches/Vanilla Factions Expanded - Mechanoids/CombinationDefs/CombinationDefs.xml
deleted file mode 100644
index cdb1a4e909..0000000000
--- a/Patches/Vanilla Factions Expanded - Mechanoids/CombinationDefs/CombinationDefs.xml	
+++ /dev/null
@@ -1,798 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Mechanoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Shell Production ========== -->
-				<!--Patch Artillery Foundry to use 3 inputs-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry"]/comps/li[@Class="ItemProcessor.CompProperties_ItemProcessor"]/numberOfInputs</xpath>
-					<value>
-						<numberOfInputs>3</numberOfInputs>
-					</value>
-				</li>
-
-				<!--HE-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ItemProcessor.CombinationDef[defName="VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Shell_HighExplosive"]</xpath>
-					<value>
-						<thirdItems>
-							<li>ComponentIndustrial</li>
-						</thirdItems>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ItemProcessor.CombinationDef[defName="VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Shell_HighExplosive"]/secondItems/li</xpath>
-					<value>
-						<li>FSX</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ItemProcessor.CombinationDef[defName="VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Shell_HighExplosive"]/amount</xpath>
-					<value>
-						<amount>
-							<li>54</li>
-							<li>10</li>
-							<li>2</li>
-						</amount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ItemProcessor.CombinationDef[defName="VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Shell_HighExplosive"]/yield</xpath>
-					<value>
-						<yield>5</yield>
-					</value>
-				</li>
-				<!--Incendiary-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ItemProcessor.CombinationDef[defName="VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Shell_Incendiary"]</xpath>
-					<value>
-						<thirdItems>
-							<li>ComponentIndustrial</li>
-						</thirdItems>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ItemProcessor.CombinationDef[defName="VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Shell_Incendiary"]/secondItems/li</xpath>
-					<value>
-						<li>Prometheum</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ItemProcessor.CombinationDef[defName="VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Shell_Incendiary"]/amount</xpath>
-					<value>
-						<amount>
-							<li>58</li>
-							<li>4</li>
-							<li>2</li>
-						</amount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ItemProcessor.CombinationDef[defName="VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Shell_Incendiary"]/yield</xpath>
-					<value>
-						<yield>5</yield>
-					</value>
-				</li>
-
-				<!--EMP : The factory stuff is very sensitive about input count. 20 chemfuel is a nice discount compared to the 2 extra components-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ItemProcessor.CombinationDef[defName="VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Shell_EMP"]</xpath>
-					<value>
-						<thirdItems>
-							<li>ComponentIndustrial</li>
-						</thirdItems>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ItemProcessor.CombinationDef[defName="VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Shell_EMP"]/amount</xpath>
-					<value>
-						<amount>
-							<li>54</li>
-							<li>20</li>
-							<li>12</li>
-						</amount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ItemProcessor.CombinationDef[defName="VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Shell_EMP"]/yield</xpath>
-					<value>
-						<yield>5</yield>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace" MayRequire="sarg.alphabiomes">
-					<xpath>Defs/ItemProcessor.CombinationDef[defName="VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_AB_Shell_Tar"]/result</xpath>
-					<value>
-						<result>AB_Shell_Tar</result>
-					</value>
-				</li>
-
-				<!--60mm-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ItemProcessor.CombinationDef>
-							<defName>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Shell_60mmMortar_HE</defName>
-							<building>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry</building>
-							<items>
-								<li>Steel</li>
-							</items>
-							<secondItems>
-								<li>FSX</li>
-							</secondItems>
-							<thirdItems>
-								<li>ComponentIndustrial</li>
-							</thirdItems>
-							<amount>
-								<li>20</li>
-								<li>4</li>
-								<li>2</li>
-							</amount>
-							<outputLimitControlled>true</outputLimitControlled>
-							<maxTotalOutput>100</maxTotalOutput>
-							<result>Shell_60mmMortar_HE</result>
-							<yield>5</yield>
-							<useQualityIncreasing>false</useQualityIncreasing>
-							<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
-						</ItemProcessor.CombinationDef>
-
-						<ItemProcessor.CombinationDef>
-							<defName>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Shell_60mmMortar_Incendiary</defName>
-							<building>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry</building>
-							<items>
-								<li>Steel</li>
-							</items>
-							<secondItems>
-								<li>Prometheum</li>
-							</secondItems>
-							<thirdItems>
-								<li>ComponentIndustrial</li>
-							</thirdItems>
-							<amount>
-								<li>20</li>
-								<li>2</li>
-								<li>2</li>
-							</amount>
-							<outputLimitControlled>true</outputLimitControlled>
-							<maxTotalOutput>100</maxTotalOutput>
-							<result>Shell_60mmMortar_Incendiary</result>
-							<yield>5</yield>
-							<useQualityIncreasing>false</useQualityIncreasing>
-							<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
-						</ItemProcessor.CombinationDef>
-
-						<ItemProcessor.CombinationDef>
-							<defName>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Shell_60mmMortar_EMP</defName>
-							<building>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry</building>
-							<items>
-								<li>Steel</li>
-							</items>
-							<secondItems>
-								<li>Chemfuel</li>
-							</secondItems>
-							<thirdItems>
-								<li>ComponentIndustrial</li>
-							</thirdItems>
-							<amount>
-								<li>20</li>
-								<li>20</li>
-								<li>4</li>
-							</amount>
-							<outputLimitControlled>true</outputLimitControlled>
-							<maxTotalOutput>100</maxTotalOutput>
-							<result>Shell_60mmMortar_EMP</result>
-							<yield>5</yield>
-							<useQualityIncreasing>false</useQualityIncreasing>
-							<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
-						</ItemProcessor.CombinationDef>
-					</value>
-				</li>
-
-				<!--90mm-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ItemProcessor.CombinationDef>
-							<defName>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Ammo_90mmCannonShell_HE</defName>
-							<building>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry</building>
-							<items>
-								<li>Steel</li>
-							</items>
-							<secondItems>
-								<li>FSX</li>
-							</secondItems>
-							<thirdItems>
-								<li>ComponentIndustrial</li>
-							</thirdItems>
-							<amount>
-								<li>192</li>
-								<li>10</li>
-								<li>2</li>
-							</amount>
-							<outputLimitControlled>true</outputLimitControlled>
-							<maxTotalOutput>100</maxTotalOutput>
-							<result>Ammo_90mmCannonShell_HE</result>
-							<yield>5</yield>
-							<useQualityIncreasing>false</useQualityIncreasing>
-							<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
-						</ItemProcessor.CombinationDef>
-
-						<ItemProcessor.CombinationDef>
-							<defName>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Ammo_90mmCannonShell_HEAT</defName>
-							<building>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry</building>
-							<items>
-								<li>Steel</li>
-							</items>
-							<secondItems>
-								<li>FSX</li>
-							</secondItems>
-							<thirdItems>
-								<li>ComponentIndustrial</li>
-							</thirdItems>
-							<amount>
-								<li>160</li>
-								<li>8</li>
-								<li>2</li>
-							</amount>
-							<outputLimitControlled>true</outputLimitControlled>
-							<maxTotalOutput>100</maxTotalOutput>
-							<result>Ammo_90mmCannonShell_HEAT</result>
-							<yield>5</yield>
-							<useQualityIncreasing>false</useQualityIncreasing>
-							<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
-						</ItemProcessor.CombinationDef>
-
-						<ItemProcessor.CombinationDef>
-							<defName>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Ammo_90mmCannonShell_EMP</defName>
-							<building>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry</building>
-							<items>
-								<li>Steel</li>
-							</items>
-							<secondItems>
-								<li>Chemfuel</li>
-							</secondItems>
-							<thirdItems>
-								<li>ComponentIndustrial</li>
-							</thirdItems>
-							<amount>
-								<li>192</li>
-								<li>20</li>
-								<li>11</li>
-							</amount>
-							<outputLimitControlled>true</outputLimitControlled>
-							<maxTotalOutput>100</maxTotalOutput>
-							<result>Ammo_90mmCannonShell_EMP</result>
-							<yield>5</yield>
-							<useQualityIncreasing>false</useQualityIncreasing>
-							<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
-						</ItemProcessor.CombinationDef>
-					</value>
-				</li>
-
-				<!--76.2mm-->
-				<li Class="PatchOperationFindMod">
-					<mods>
-						<li>WWII Soviet Faction</li>
-						<li>Vanilla Factions Expanded - Pirates</li><!-- add more if any mods add such caliber-->
-					</mods>
-
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs</xpath>
-								<value>
-									<ItemProcessor.CombinationDef>
-										<defName>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Ammo_762x385mmRCannonShell_HE</defName>
-										<building>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry</building>
-										<items>
-											<li>Steel</li>
-										</items>
-										<secondItems>
-											<li>FSX</li>
-										</secondItems>
-										<thirdItems>
-											<li>ComponentIndustrial</li>
-										</thirdItems>
-										<amount>
-											<li>90</li>
-											<li>5</li>
-											<li>2</li>
-										</amount>
-										<outputLimitControlled>true</outputLimitControlled>
-										<maxTotalOutput>100</maxTotalOutput>
-										<result>Ammo_762x385mmRCannonShell_HE</result>
-										<yield>5</yield>
-										<useQualityIncreasing>false</useQualityIncreasing>
-										<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
-									</ItemProcessor.CombinationDef>
-
-									<ItemProcessor.CombinationDef>
-										<defName>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Ammo_762x385mmRCannonShell_HEAT</defName>
-										<building>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry</building>
-										<items>
-											<li>Steel</li>
-										</items>
-										<secondItems>
-											<li>FSX</li>
-										</secondItems>
-										<thirdItems>
-											<li>ComponentIndustrial</li>
-										</thirdItems>
-										<amount>
-											<li>108</li>
-											<li>3</li>
-											<li>2</li>
-										</amount>
-										<outputLimitControlled>true</outputLimitControlled>
-										<maxTotalOutput>100</maxTotalOutput>
-										<result>Ammo_762x385mmRCannonShell_HEAT</result>
-										<yield>5</yield>
-										<useQualityIncreasing>false</useQualityIncreasing>
-										<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
-									</ItemProcessor.CombinationDef>
-
-									<ItemProcessor.CombinationDef>
-										<defName>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Ammo_762x385mmRCannonShell_EMP</defName>
-										<building>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry</building>
-										<items>
-											<li>Steel</li>
-										</items>
-										<secondItems>
-											<li>Chemfuel</li>
-										</secondItems>
-										<thirdItems>
-											<li>ComponentIndustrial</li>
-										</thirdItems>
-										<amount>
-											<li>90</li>
-											<li>20</li>
-											<li>6</li>
-										</amount>
-										<outputLimitControlled>true</outputLimitControlled>
-										<maxTotalOutput>100</maxTotalOutput>
-										<result>Ammo_762x385mmRCannonShell_EMP</result>
-										<yield>5</yield>
-										<useQualityIncreasing>false</useQualityIncreasing>
-										<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
-									</ItemProcessor.CombinationDef>
-								</value>
-							</li>
-						</operations>
-					</match>
-				</li>
-
-				<!--105mm-->
-				<li Class="PatchOperationFindMod">
-					<mods>
-						<li>Combat Extended Guns</li><!-- add more if any mods add such caliber-->
-					</mods>
-
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs</xpath>
-								<value>
-									<ItemProcessor.CombinationDef>
-										<defName>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Ammo_105mmHowitzerShell_HE</defName>
-										<building>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry</building>
-										<items>
-											<li>Steel</li>
-										</items>
-										<secondItems>
-											<li>FSX</li>
-										</secondItems>
-										<thirdItems>
-											<li>ComponentIndustrial</li>
-										</thirdItems>
-										<amount>
-											<li>60</li>
-											<li>7</li>
-											<li>2</li>
-										</amount>
-										<outputLimitControlled>true</outputLimitControlled>
-										<maxTotalOutput>25</maxTotalOutput>
-										<result>Ammo_105mmHowitzerShell_HE</result>
-										<yield>2</yield>
-										<useQualityIncreasing>false</useQualityIncreasing>
-										<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
-									</ItemProcessor.CombinationDef>
-
-									<ItemProcessor.CombinationDef>
-										<defName>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Ammo_105mmHowitzerShell_HEAT</defName>
-										<building>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry</building>
-										<items>
-											<li>Steel</li>
-										</items>
-										<secondItems>
-											<li>FSX</li>
-										</secondItems>
-										<thirdItems>
-											<li>ComponentIndustrial</li>
-										</thirdItems>
-										<amount>
-											<li>76</li>
-											<li>4</li>
-											<li>2</li>
-										</amount>
-										<outputLimitControlled>true</outputLimitControlled>
-										<maxTotalOutput>25</maxTotalOutput>
-										<result>Ammo_105mmHowitzerShell_HEAT</result>
-										<yield>2</yield>
-										<useQualityIncreasing>false</useQualityIncreasing>
-										<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
-									</ItemProcessor.CombinationDef>
-
-									<ItemProcessor.CombinationDef>
-										<defName>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Ammo_105mmHowitzerShell_Incendiary</defName>
-										<building>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry</building>
-										<items>
-											<li>Steel</li>
-										</items>
-										<secondItems>
-											<li>Prometheum</li>
-										</secondItems>
-										<thirdItems>
-											<li>ComponentIndustrial</li>
-										</thirdItems>
-										<amount>
-											<li>60</li>
-											<li>3</li>
-											<li>2</li>
-										</amount>
-										<outputLimitControlled>true</outputLimitControlled>
-										<maxTotalOutput>25</maxTotalOutput>
-										<result>Ammo_105mmHowitzerShell_Incendiary</result>
-										<yield>2</yield>
-										<useQualityIncreasing>false</useQualityIncreasing>
-										<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
-									</ItemProcessor.CombinationDef>
-
-									<ItemProcessor.CombinationDef>
-										<defName>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Ammo_105mmHowitzerShell_EMP</defName>
-										<building>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry</building>
-										<items>
-											<li>Steel</li>
-										</items>
-										<secondItems>
-											<li>Chemfuel</li>
-										</secondItems>
-										<thirdItems>
-											<li>ComponentIndustrial</li>
-										</thirdItems>
-										<amount>
-											<li>76</li>
-											<li>20</li>
-											<li>7</li>
-										</amount>
-										<outputLimitControlled>true</outputLimitControlled>
-										<maxTotalOutput>25</maxTotalOutput>
-										<result>Ammo_105mmHowitzerShell_EMP</result>
-										<yield>2</yield>
-										<useQualityIncreasing>false</useQualityIncreasing>
-										<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
-									</ItemProcessor.CombinationDef>
-								</value>
-							</li>
-						</operations>
-					</match>
-				</li>
-
-				<!--155mm-->
-				<li Class="PatchOperationFindMod">
-					<mods>
-						<li>Fortifications - Industrial</li>
-						<li>TMC Weapon Pack</li>
-						<li>Turret Collection</li>
-						<li>Vanilla Furniture Expanded - Security</li><!-- add more if any mods add such caliber-->
-					</mods>
-
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationAdd">
-								<xpath>Defs</xpath>
-								<value>
-									<ItemProcessor.CombinationDef>
-										<defName>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Ammo_155mmHowitzerShell_HE</defName>
-										<building>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry</building>
-										<items>
-											<li>Steel</li>
-										</items>
-										<secondItems>
-											<li>FSX</li>
-										</secondItems>
-										<thirdItems>
-											<li>ComponentIndustrial</li>
-										</thirdItems>
-										<amount>
-											<li>94</li>
-											<li>17</li>
-											<li>2</li>
-										</amount>
-										<outputLimitControlled>true</outputLimitControlled>
-										<maxTotalOutput>25</maxTotalOutput>
-										<result>Ammo_155mmHowitzerShell_HE</result>
-										<yield>1</yield>
-										<useQualityIncreasing>false</useQualityIncreasing>
-										<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
-									</ItemProcessor.CombinationDef>
-
-									<ItemProcessor.CombinationDef>
-										<defName>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Ammo_155mmHowitzerShell_Incendiary</defName>
-										<building>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry</building>
-										<items>
-											<li>Steel</li>
-										</items>
-										<secondItems>
-											<li>Prometheum</li>
-										</secondItems>
-										<thirdItems>
-											<li>ComponentIndustrial</li>
-										</thirdItems>
-										<amount>
-											<li>94</li>
-											<li>5</li>
-											<li>2</li>
-										</amount>
-										<outputLimitControlled>true</outputLimitControlled>
-										<maxTotalOutput>25</maxTotalOutput>
-										<result>Ammo_155mmHowitzerShell_Incendiary</result>
-										<yield>1</yield>
-										<useQualityIncreasing>false</useQualityIncreasing>
-										<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
-									</ItemProcessor.CombinationDef>
-
-									<ItemProcessor.CombinationDef>
-										<defName>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry_Ammo_155mmHowitzerShell_EMP</defName>
-										<building>VFEM_MunitionsAndArmamentFactory_ArtilleryFoundry</building>
-										<items>
-											<li>Steel</li>
-										</items>
-										<secondItems>
-											<li>Chemfuel</li>
-										</secondItems>
-										<thirdItems>
-											<li>ComponentIndustrial</li>
-										</thirdItems>
-										<amount>
-											<li>94</li>
-											<li>20</li>
-											<li>12</li>
-										</amount>
-										<outputLimitControlled>true</outputLimitControlled>
-										<maxTotalOutput>25</maxTotalOutput>
-										<result>Ammo_155mmHowitzerShell_EMP</result>
-										<yield>1</yield>
-										<useQualityIncreasing>false</useQualityIncreasing>
-										<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
-									</ItemProcessor.CombinationDef>
-								</value>
-							</li>
-						</operations>
-					</match>
-				</li>
-
-				<!-- ========== Mechanoid ammo production ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ItemProcessor.CombinationDef>
-							<defName>VFEM_VersatileAssembler_Ammo_80x256mmFuel</defName>
-							<building>VFEM_VersatileAssembler</building>
-							<items>
-								<li>Steel</li>
-							</items>
-							<secondItems>
-								<li>Prometheum</li>
-							</secondItems>
-							<thirdItems>
-								<li>ComponentIndustrial</li>
-							</thirdItems>
-							<amount>
-								<li>10</li>
-								<li>3</li>
-								<li>2</li>
-							</amount>
-							<outputLimitControlled>true</outputLimitControlled>
-							<maxTotalOutput>25</maxTotalOutput>
-							<result>Ammo_80x256mmFuel_Incendiary</result>
-							<yield>5</yield>
-							<useQualityIncreasing>false</useQualityIncreasing>
-							<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
-						</ItemProcessor.CombinationDef>
-						<ItemProcessor.CombinationDef>
-							<defName>VFEM_VersatileAssembler_Ammo_12x64mmCharged</defName>
-							<building>VFEM_VersatileAssembler</building>
-							<items>
-								<li>Plasteel</li>
-							</items>
-							<secondItems>
-								<li>Steel</li>
-							</secondItems>
-							<thirdItems>
-								<li>ComponentIndustrial</li>
-							</thirdItems>
-							<amount>
-								<li>32</li>
-								<li>8</li>
-								<li>14</li>
-							</amount>
-							<outputLimitControlled>true</outputLimitControlled>
-							<maxTotalOutput>2000</maxTotalOutput>
-							<result>Ammo_12x64mmCharged</result>
-							<yield>200</yield>
-							<useQualityIncreasing>false</useQualityIncreasing>
-							<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
-						</ItemProcessor.CombinationDef>
-						<ItemProcessor.CombinationDef>
-							<defName>VFEM_VersatileAssembler_Ammo_5x35mmCharged</defName>
-							<building>VFEM_VersatileAssembler</building>
-							<items>
-								<li>Plasteel</li>
-							</items>
-							<secondItems>
-								<li>Steel</li>
-							</secondItems>
-							<thirdItems>
-								<li>ComponentIndustrial</li>
-							</thirdItems>
-							<amount>
-								<li>12</li>
-								<li>10</li>
-								<li>7</li>
-							</amount>
-							<outputLimitControlled>true</outputLimitControlled>
-							<maxTotalOutput>2000</maxTotalOutput>
-							<result>Ammo_5x35mmCharged</result>
-							<yield>500</yield>
-							<useQualityIncreasing>false</useQualityIncreasing>
-							<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
-						</ItemProcessor.CombinationDef>
-						<ItemProcessor.CombinationDef>
-							<defName>VFEM_VersatileAssembler_Ammo_6x22mmCharged</defName>
-							<building>VFEM_VersatileAssembler</building>
-							<items>
-								<li>Plasteel</li>
-							</items>
-							<secondItems>
-								<li>Steel</li>
-							</secondItems>
-							<thirdItems>
-								<li>ComponentIndustrial</li>
-							</thirdItems>
-							<amount>
-								<li>8</li>
-								<li>6</li>
-								<li>5</li>
-							</amount>
-							<outputLimitControlled>true</outputLimitControlled>
-							<maxTotalOutput>2000</maxTotalOutput>
-							<result>Ammo_6x22mmCharged</result>
-							<yield>500</yield>
-							<useQualityIncreasing>false</useQualityIncreasing>
-							<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
-						</ItemProcessor.CombinationDef>
-						<ItemProcessor.CombinationDef>
-							<defName>VFEM_VersatileAssembler_Ammo_164x284mmDemo</defName>
-							<building>VFEM_VersatileAssembler</building>
-							<items>
-								<li>Steel</li>
-							</items>
-							<secondItems>
-								<li>FSX</li>
-							</secondItems>
-							<thirdItems>
-								<li>ComponentIndustrial</li>
-							</thirdItems>
-							<amount>
-								<li>16</li>
-								<li>5</li>
-								<li>4</li>
-							</amount>
-							<outputLimitControlled>true</outputLimitControlled>
-							<maxTotalOutput>25</maxTotalOutput>
-							<result>Ammo_164x284mmDemo</result>
-							<yield>5</yield>
-							<useQualityIncreasing>false</useQualityIncreasing>
-							<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
-						</ItemProcessor.CombinationDef>
-						<ItemProcessor.CombinationDef>
-							<defName>VFEM_VersatileAssembler_Ammo_66mmThermalBolt</defName>
-							<building>VFEM_VersatileAssembler</building>
-							<items>
-								<li>Steel</li>
-							</items>
-							<secondItems>
-								<li>Prometheum</li>
-							</secondItems>
-							<thirdItems>
-								<li>ComponentIndustrial</li>
-							</thirdItems>
-							<amount>
-								<li>22</li>
-								<li>2</li>
-								<li>2</li>
-							</amount>
-							<outputLimitControlled>true</outputLimitControlled>
-							<maxTotalOutput>25</maxTotalOutput>
-							<result>Ammo_66mmThermalBolt_Incendiary</result>
-							<yield>5</yield>
-							<useQualityIncreasing>false</useQualityIncreasing>
-							<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
-						</ItemProcessor.CombinationDef>
-						<ItemProcessor.CombinationDef>
-							<defName>VFEM_VersatileAssembler_Ammo_5x16mmCharged</defName>
-							<building>VFEM_VersatileAssembler</building>
-							<items>
-								<li>Plasteel</li>
-							</items>
-							<secondItems>
-								<li>Steel</li>
-							</secondItems>
-							<thirdItems>
-								<li>ComponentIndustrial</li>
-							</thirdItems>
-							<amount>
-								<li>6</li>
-								<li>4</li>
-								<li>6</li>
-							</amount>
-							<outputLimitControlled>true</outputLimitControlled>
-							<maxTotalOutput>2000</maxTotalOutput>
-							<result>Ammo_5x16mmCharged</result>
-							<yield>500</yield>
-							<useQualityIncreasing>false</useQualityIncreasing>
-							<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
-						</ItemProcessor.CombinationDef>
-						<ItemProcessor.CombinationDef>
-							<defName>VFEM_VersatileAssembler_Ammo_8x40mmCharged</defName>
-							<building>VFEM_VersatileAssembler</building>
-							<items>
-								<li>Plasteel</li>
-							</items>
-							<secondItems>
-								<li>Steel</li>
-							</secondItems>
-							<thirdItems>
-								<li>ComponentIndustrial</li>
-							</thirdItems>
-							<amount>
-								<li>18</li>
-								<li>12</li>
-								<li>9</li>
-							</amount>
-							<outputLimitControlled>true</outputLimitControlled>
-							<maxTotalOutput>2000</maxTotalOutput>
-							<result>Ammo_8x40mmCharged</result>
-							<yield>500</yield>
-							<useQualityIncreasing>false</useQualityIncreasing>
-							<singleTimeIfNotQualityIncreasing>0.1</singleTimeIfNotQualityIncreasing>
-						</ItemProcessor.CombinationDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Mechanoids/PawnKindDefs/Pawnkinds_Mech.xml b/Patches/Vanilla Factions Expanded - Mechanoids/PawnKindDefs/Pawnkinds_Mech.xml
deleted file mode 100644
index 5da46ae32b..0000000000
--- a/Patches/Vanilla Factions Expanded - Mechanoids/PawnKindDefs/Pawnkinds_Mech.xml	
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Mechanoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="VFE_Mech_Centipede" or defName="VFE_Mech_AdvancedCentipede"]/combatPower</xpath>
-					<value>
-						<combatPower>580</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="VFE_Mech_Pikeman" or defName="VFE_Mech_AdvancedPikeman"]/combatPower</xpath>
-					<value>
-						<combatPower>180</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="VFE_Mech_Knight" or
-						defName="VFE_Mech_AdvancedKnight"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>4</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="VFE_Mech_Inquisitor" or
-						defName="VFE_Mech_AdvancedInquisitor"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>3</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="VFE_Mech_AdvancedLancer" or
-						defName="VFE_Mech_Lancer" or
-						defName="VFE_Mech_Pikeman" or
-						defName="VFE_Mech_AdvancedPikeman" or
-						defName="VFE_Mech_Centipede" or
-						defName="VFE_Mech_AdvancedCentipede" or
-						defName="VFE_Mech_Termite" or
-						defName="VFE_Mech_AdvTermite"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationFindMod">
-					<mods>
-						<li>Biotech</li>
-					</mods>
-					<nomatch Class="PatchOperationReplace">
-						<xpath>Defs/PawnKindDef[defName="VFE_Mech_Pikeman"]/weaponTags</xpath>
-						<value>
-							<weaponTags>
-								<li>MechanoidGunIndirect</li>
-							</weaponTags>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationFindMod">
-					<mods>
-						<li>Biotech</li>
-					</mods>
-					<nomatch Class="PatchOperationReplace">
-						<xpath>Defs/PawnKindDef[defName="VFE_Mech_AdvancedPikeman"]/weaponTags</xpath>
-						<value>
-							<weaponTags>
-								<li>VFE_AdvMechanoidGunIndirect</li>
-							</weaponTags>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationFindMod">
-					<mods>
-						<li>Biotech</li>
-					</mods>
-					<match Class="PatchOperationSequence">
-						<operations>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/PawnKindDef[defName="VFE_Mech_AdvancedCentipede_PlayerControlled"]/combatPower</xpath>
-								<value>
-									<combatPower>580</combatPower>
-								</value>
-							</li>
-
-							<li Class="PatchOperationReplace">
-								<xpath>Defs/PawnKindDef[defName="VFE_Mech_AdvancedPikeman_PlayerControlled"]/combatPower</xpath>
-								<value>
-									<combatPower>180</combatPower>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/PawnKindDef[
-									defName="VFE_Mech_AdvancedLancer_PlayerControlled" or
-									defName="VFE_Mech_AdvancedPikeman_PlayerControlled"
-									] </xpath>
-								<value>
-									<li Class="CombatExtended.LoadoutPropertiesExtension">
-										<primaryMagazineCount>
-											<min>8</min>
-											<max>10</max>
-										</primaryMagazineCount>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/PawnKindDef[
-									defName="VFE_Mech_Knight_PlayerControlled" or
-									defName="VFE_Mech_AdvancedKnight_PlayerControlled"
-									] </xpath>
-								<value>
-									<li Class="CombatExtended.LoadoutPropertiesExtension">
-										<primaryMagazineCount>
-											<min>3</min>
-											<max>4</max>
-										</primaryMagazineCount>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/PawnKindDef[
-									defName="VFE_Mech_Inquisitor_PlayerControlled" or
-									defName="VFE_Mech_AdvancedInquisitor_PlayerControlled"
-									] </xpath>
-								<value>
-									<li Class="CombatExtended.LoadoutPropertiesExtension">
-										<primaryMagazineCount>
-											<min>2</min>
-											<max>3</max>
-										</primaryMagazineCount>
-									</li>
-								</value>
-							</li>
-
-							<li Class="PatchOperationAddModExtension">
-								<xpath>Defs/PawnKindDef[
-									defName="VFE_Mech_AdvancedCentipede_PlayerControlled" or
-									defName="VFE_Mech_Termite_PlayerControlled" or
-									defName="VFE_Mech_AdvTermite_PlayerControlled"
-									] </xpath>
-								<value>
-									<li Class="CombatExtended.LoadoutPropertiesExtension">
-										<primaryMagazineCount>
-											<min>4</min>
-											<max>6</max>
-										</primaryMagazineCount>
-									</li>
-								</value>
-							</li>
-
-						</operations>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Mechanoids/Scenario/Scenario.xml b/Patches/Vanilla Factions Expanded - Mechanoids/Scenario/Scenario.xml
deleted file mode 100644
index 9a5c4b0413..0000000000
--- a/Patches/Vanilla Factions Expanded - Mechanoids/Scenario/Scenario.xml	
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Mechanoids</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>
-						Defs/ScenarioDef[defName="VFE_TheLoneScavenger"]/scenario/parts
-					</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_303British_FMJ</thingDef>
-							<count>100</count>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/Ammo_Mechanoid.xml b/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/Ammo_Mechanoid.xml
deleted file mode 100644
index 251ba9d307..0000000000
--- a/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/Ammo_Mechanoid.xml	
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Mechanoids</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==================== Advanced Charge Lance ========================== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="Base5x35mmChargedBullet">
-							<defName>VFE_Bullet_5x35mmHyper</defName>
-							<label>5x35mm Hyper bullet</label>
-							<graphicData>
-								<texPath>Things/Projectile/Charged/ChargeLanceShot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-								<drawSize>(2,2)</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE" Inherit="False">
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>16</damageAmountBase>
-								<speed>229</speed>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>2</amount>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationSharp>36</armorPenetrationSharp>
-								<armorPenetrationBlunt>117.6</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base90mmCannonShell">
-							<defName>VFE_Bullet_ChargeRailgun_CE</defName>
-							<label>charge railgun shot</label>
-							<graphicData>
-								<texPath>Things/Projectile/ChargeRailgunShot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-								<drawSize>4</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>242</speed>
-								<flyOverhead>false</flyOverhead>
-								<dropsCasings>false</dropsCasings>
-								<casingMoteDefname>Fleck_BigShell</casingMoteDefname>
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>500</damageAmountBase>
-								<soundExplode>MortarBomb_Explode</soundExplode>
-								<armorPenetrationSharp>200</armorPenetrationSharp>
-								<armorPenetrationBlunt>20000</armorPenetrationBlunt>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>300</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>8</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Large>50</Fragment_Large>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBulletCE">
-							<defName>VFE_Bullet_TeslaProjectileCE</defName>
-							<label>lightning bolt</label>
-							<graphicData>
-								<texPath>Projectile/Lightning</texPath>
-								<graphicClass>Graphic_Flicker</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>EMP</damageDef>
-								<damageAmountBase>21</damageAmountBase>
-								<explosionRadius>2.5</explosionRadius>
-								<soundExplode>MortarBomb_Explode</soundExplode>
-								<speed>242</speed>
-								<flyOverhead>false</flyOverhead>
-								<dropsCasings>false</dropsCasings>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/Apparel_Mechanite.xml b/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/Apparel_Mechanite.xml
deleted file mode 100644
index eefd390838..0000000000
--- a/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/Apparel_Mechanite.xml	
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Mechanoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_MechaniteUnderArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_MechaniteUnderArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_MechanitePants"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_MechanitePants"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/Buildings_Mech.xml b/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/Buildings_Mech.xml
deleted file mode 100644
index f7e6741aa4..0000000000
--- a/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/Buildings_Mech.xml	
+++ /dev/null
@@ -1,454 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Mechanoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Ship Charge Blaster ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeBlasterCannon"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeBlasterCannon"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>0.75</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeBlasterCannon"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.5</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeBlasterCannon"]/statBases/Mass</xpath>
-					<value>
-						<Mass>300</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeBlasterCannon"]/comps/li[@Class = "CompProperties_Explosive"]</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeBlasterCannon"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeBlasterCannon"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>2.0</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFE_Gun_ChargeBlasterCannon</defName>
-					<statBases>
-						<Mass>200.00</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.45</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12x64mmCharged</defaultProjectile>
-						<warmupTime>3.0</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>20</burstShotCount>
-						<soundCast>Shot_ChargeBlaster</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!-- ========== Ship Charge Lance ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeLanceCannon"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeLanceCannon"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>1.5</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeLanceCannon"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeLanceCannon"]/statBases/Mass</xpath>
-					<value>
-						<Mass>85</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeLanceCannon"]/comps/li[@Class = "CompProperties_Explosive"]</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeLanceCannon"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeLanceCannon"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>1</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFE_Gun_ChargeLanceCannon</defName>
-					<statBases>
-						<Mass>35.00</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>0.44</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.44</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>VFE_Bullet_5x35mmHyper</defaultProjectile>
-						<warmupTime>2.0</warmupTime>
-						<range>86</range>
-						<burstShotCount>1</burstShotCount>
-						<soundCast>ChargeLance_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<minRange>1.9</minRange>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-					</FireModes>
-				</li>
-
-				<!-- ========== Auto Inferno Cannon ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_InfernoLauncherArtillery"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_InfernoLauncherArtillery"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_InfernoLauncherArtillery"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.5</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_InfernoLauncherArtillery"]/statBases/Mass</xpath>
-					<value>
-						<Mass>600</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_InfernoLauncherArtillery"]/comps/li[@Class = "CompProperties_Explosive"]</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_InfernoLauncherArtillery"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_InfernoLauncherArtillery"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>12.0</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFE_Gun_InfernoArtillery</defName>
-					<statBases>
-						<Mass>300.00</Mass>
-						<RangedWeapon_Cooldown>2.51</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>0.82</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.82</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_80x256mmFuel_Incendiary</defaultProjectile>
-						<warmupTime>8.6</warmupTime>
-						<range>86</range>
-						<ticksBetweenBurstShots>60</ticksBetweenBurstShots>
-						<burstShotCount>3</burstShotCount>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-						<minRange>9.9</minRange>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-					</FireModes>
-				</li>
-
-				<!-- ========== Auto Mortar ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoMortarCannon"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoMortarCannon"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoMortarCannon"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.25</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoMortarCannon"]/statBases/Mass</xpath>
-					<value>
-						<Mass>75</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoMortarCannon"]/comps/li[@Class = "CompProperties_Explosive"]</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoMortarCannon"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "VFE_Gun_AutoMortarCannon"]</xpath>
-					<value>
-						<statBases>
-							<SightsEfficiency>0.5</SightsEfficiency>
-						</statBases>
-					</value>
-				</li>
-
-				<!--Test for comps and add if not present-->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFE_Gun_AutoMortarCannon"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Gun_AutoMortarCannon"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Gun_AutoMortarCannon"]</xpath>
-						<value>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "VFE_Gun_AutoMortarCannon"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Charges">
-							<chargeSpeeds>
-								<li>30</li>
-								<li>50</li>
-								<li>70</li>
-								<li>90</li>
-							</chargeSpeeds>
-						</li>
-					</value>
-				</li>
-
-				<!--Test for tags and add if not present-->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFE_Gun_AutoMortarCannon"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Gun_AutoMortarCannon"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Gun_AutoMortarCannon"]</xpath>
-						<value>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "VFE_Gun_AutoMortarCannon"]/weaponTags</xpath>
-					<value>
-						<li>TurretGun</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VFE_Gun_AutoMortarCannon"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-								<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_66mmThermalBolt_Incendiary</defaultProjectile>
-								<warmupTime>11</warmupTime>
-								<minRange>32</minRange>
-								<range>700</range>
-								<burstShotCount>1</burstShotCount>
-								<soundCast>Mortar_LaunchA</soundCast>
-								<muzzleFlashScale>16</muzzleFlashScale>
-								<circularError>1</circularError>
-								<indirectFirePenalty>0.2</indirectFirePenalty>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- ========== Ship Charge Railgun ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeRailgun"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeRailgun"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>1.5</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeRailgun"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>2</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeRailgun"]/statBases/Mass</xpath>
-					<value>
-						<Mass>800</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeRailgun"]/comps/li[@Class = "CompProperties_Explosive"]</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeRailgun"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.99</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_ChargeRailgun"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>18.0</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFE_Gun_ChargeRailgun</defName>
-					<statBases>
-						<Mass>300.00</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>4.5</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.92</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>VFE_Bullet_ChargeRailgun_CE</defaultProjectile>
-						<warmupTime>5.2</warmupTime>
-						<range>500</range>
-						<burstShotCount>1</burstShotCount>
-						<soundCast>VFE_Shot_ChargeRailgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>16</muzzleFlashScale>
-						<minRange>8.9</minRange>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/Buildings_Security_Turrets.xml b/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/Buildings_Security_Turrets.xml
deleted file mode 100644
index 7c86783b39..0000000000
--- a/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/Buildings_Security_Turrets.xml	
+++ /dev/null
@@ -1,561 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Mechanoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== Auto Charge Blaster ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoChargeBlaster"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoChargeBlaster"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>1.0</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoChargeBlaster"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.5</AimingAccuracy>
-						<NightVisionEfficiency>0.4</NightVisionEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoChargeBlaster"]/statBases/Mass</xpath>
-					<value>
-						<Mass>80</Mass>
-						<Bulk>80</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoChargeBlaster"]/comps/li[@Class = "CompProperties_Explosive"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoChargeBlaster"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoChargeBlaster"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoChargeBlaster"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>2.0</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<!-- Price increase because CE HCB is not an equivalent weapon to most other options-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoChargeBlaster"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>60</Plasteel>
-						<Steel>205</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoChargeBlaster"]/costList/ComponentIndustrial</xpath>
-					<value>
-						<ComponentIndustrial>15</ComponentIndustrial>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFE_Gun_AutoChargeBlaster</defName>
-					<statBases>
-						<Mass>35.00</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>13.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.08</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12x64mmCharged</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>Shot_ChargeBlaster</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>9.2</reloadTime>
-						<ammoSet>AmmoSet_12x64mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!-- ========== Auto Charge Lance ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoChargeLance"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoChargeLance"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>1.5</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoChargeLance"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.75</AimingAccuracy>
-						<NightVisionEfficiency>0.4</NightVisionEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoChargeLance"]/statBases/Mass</xpath>
-					<value>
-						<Mass>30</Mass>
-						<Bulk>40</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoChargeLance"]/comps/li[@Class = "CompProperties_Explosive"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoChargeLance"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoChargeLance"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoChargeLance"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>1.0</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<!--1 shot turret would be useless. Giving it a 50 round mag-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFE_Gun_AutoChargeLance</defName>
-					<statBases>
-						<Mass>8.00</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>0.44</SwayFactor>
-						<Bulk>13.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.92</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_5x35mmCharged</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>62</range>
-						<soundCast>ChargeLance_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_5x35mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-					</FireModes>
-				</li>
-
-				<!-- ========== Auto Inferno Cannon ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoInfernoCannon"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoInfernoCannon"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>1.25</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoInfernoCannon"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.75</AimingAccuracy>
-						<NightVisionEfficiency>0.4</NightVisionEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoInfernoCannon"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>2.5</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoInfernoCannon"]/statBases/Mass</xpath>
-					<value>
-						<Mass>100</Mass>
-						<Bulk>100</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoInfernoCannon"]/comps/li[@Class = "CompProperties_Explosive"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoInfernoCannon"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoInfernoCannon"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<!-- Price increase because CE Inferno cannon is not an equivalent weapon to most other options : Reduced compared to sheet inferno since it bloats the cost too much-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoInfernoCannon"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>90</Plasteel>
-						<Steel>140</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoInfernoCannon"]/costList/ComponentIndustrial</xpath>
-					<value>
-						<ComponentIndustrial>13</ComponentIndustrial>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFE_Gun_AutoInfernoCannon</defName>
-					<statBases>
-						<Mass>50.00</Mass>
-						<RangedWeapon_Cooldown>2.54</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>0.14</SwayFactor>
-						<Bulk>20.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.01</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_80x256mmFuel_Incendiary</defaultProjectile>
-						<warmupTime>3.5</warmupTime>
-						<range>86</range>
-						<burstShotCount>1</burstShotCount>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-						<minRange>4.9</minRange>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>9.8</reloadTime>
-						<ammoSet>AmmoSet_80x256mmFuel</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-					</FireModes>
-				</li>
-
-				<!-- ========== Auto Mortar ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="VFE_BaseAutomortarBuilding"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="VFE_BaseAutomortarBuilding"]/statBases</xpath>
-					<value>
-						<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="VFE_BaseAutomortarBuilding"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.25</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="VFE_BaseAutomortarBuilding"]/statBases/Mass</xpath>
-					<value>
-						<Mass>30</Mass>
-						<Bulk>200</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoMortar"]/comps/li[@Class = "CompProperties_Explosive"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoMortar"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="VFE_BaseAutomortarBuilding"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="VFE_BaseAutomortarBuilding"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>1</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoMortar"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>30</Plasteel>
-						<Steel>150</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoMortar"]/costList/ComponentIndustrial</xpath>
-					<value>
-						<ComponentIndustrial>8</ComponentIndustrial>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "VFE_AutoMortar"]</xpath>
-					<value>
-						<statBases>
-							<SightsEfficiency>0.5</SightsEfficiency>
-						</statBases>
-					</value>
-				</li>
-
-				<!--Test for comps and add if not present-->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFE_AutoMortar"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_AutoMortar"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_AutoMortar"]</xpath>
-						<value>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "VFE_AutoMortar"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Charges">
-							<chargeSpeeds>
-								<li>30</li>
-								<li>50</li>
-								<li>70</li>
-								<li>90</li>
-							</chargeSpeeds>
-						</li>
-						<li Class="CombatExtended.CompProperties_AmmoUser" Inherit="False">
-							<magazineSize>8</magazineSize>
-							<reloadTime>5</reloadTime>
-							<ammoSet>AmmoSet_66mmThermalBolt</ammoSet>
-						</li>
-					</value>
-				</li>
-
-				<!--Test for tags and add if not present-->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFE_AutoMortar"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_AutoMortar"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_AutoMortar"]</xpath>
-						<value>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "VFE_AutoMortar"]/weaponTags</xpath>
-					<value>
-						<li>TurretGun</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VFE_AutoMortar"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-								<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_66mmThermalBolt_Incendiary</defaultProjectile>
-								<warmupTime>5.5</warmupTime>
-								<minRange>32</minRange>
-								<range>700</range>
-								<burstShotCount>1</burstShotCount>
-								<soundCast>Mortar_LaunchA</soundCast>
-								<muzzleFlashScale>16</muzzleFlashScale>
-								<circularError>1</circularError>
-								<indirectFirePenalty>0.2</indirectFirePenalty>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- ========== Auto Tesla Turret ========== -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoTesla"]/comps/li[@Class = "CompProperties_Explosive"]</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoTesla"]</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoTesla"]/building</xpath>
-					<value>
-						<turretBurstWarmupTime>4.0</turretBurstWarmupTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoTesla"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>2</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Gun_AutoTesla"]/statBases/RangedWeapon_Cooldown</xpath>
-					<value>
-						<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Gun_AutoTesla"]/verbs/li/warmupTime</xpath>
-					<value>
-						<warmupTime>4.0</warmupTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Gun_AutoTesla"]/verbs/li/range</xpath>
-					<value>
-						<range>45</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Gun_AutoTesla"]/verbs/li/minRange</xpath>
-					<value>
-						<minRange>6</minRange>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Bullet_TeslaProjectile"]/projectile/damageAmountBase</xpath>
-					<value>
-						<damageAmountBase>15</damageAmountBase>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Bullet_TeslaProjectile"]/modExtensions/li[@Class="VFEMech.TeslaChainingProps"]/damageDef</xpath>
-					<value>
-						<damageDef>EMP</damageDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Bullet_TeslaProjectile"]/modExtensions/li[@Class="VFEMech.TeslaChainingProps"]/maxLifetime</xpath>
-					<value>
-						<maxLifetime>10</maxLifetime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Turret_AutoTesla"]/comps/li[@Class="CompProperties_Power"]/basePowerConsumption</xpath>
-					<value>
-						<basePowerConsumption>600</basePowerConsumption>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/Items_Resource.xml b/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/Items_Resource.xml
deleted file mode 100644
index 4e66b8c575..0000000000
--- a/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/Items_Resource.xml	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Mechanoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="VFEM_RawMeatBase"]/statBases</xpath>
-					<value>
-						<Bulk>0.20</Bulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/Weapons_Mech.xml b/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/Weapons_Mech.xml
deleted file mode 100644
index 5a4cf5fcb5..0000000000
--- a/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Misc/Weapons_Mech.xml	
+++ /dev/null
@@ -1,764 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Mechanoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Forbid them from showing up in stockpiles ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="VFE_Gun_InfernoSpewerBase" or defName="VFE_Gun_AdvancedInfernoCannon"]</xpath>
-					<value>
-						<destroyOnDrop>true</destroyOnDrop>
-					</value>
-				</li>
-
-				<!-- ========== Inferno spewer description change ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="VFE_Gun_InfernoSpewerBase"]/description</xpath>
-					<value>
-						<description>A surprisingly lightweight flamethrower of mechanoid design, while idle the device seems cold as any other, but can immediately heat up to temperatures well above purely human technology. Two undermounted prometheum jelly tanks allow for an ammo capacity big enough for large plumes of liquid flame.</description>
-					</value>
-				</li>
-
-				<!-- ========== VFE Handheld Mini Turret ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFE_Gun_CombatMechanoidGun</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>0.82</SwayFactor>
-						<Bulk>8.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.76</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>48</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>6</burstShotCount>
-						<soundCast>GunShotA</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Gun_CombatMechanoidGun"]/tools</xpath>
-					<value>
-						<tools>
-							<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>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== VFE Handheld Autocannon ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFE_Gun_RaiderMechanoidGun</defName>
-					<statBases>
-						<Mass>12</Mass>
-						<Bulk>18</Bulk>
-						<SwayFactor>1.6</SwayFactor>
-						<ShotSpread>0.1</ShotSpread>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.75</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>62</range>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>HeavyMG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>80</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VFE_Gun_RaiderMechanoidGun"]/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>
-				</li>
-
-				<!-- ========== VFE Small inferno spewer ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFE_Gun_InfernoSpewerSmall</defName>
-					<statBases>
-						<Mass>5</Mass>
-						<Bulk>8</Bulk>
-						<SwayFactor>1.00</SwayFactor>
-						<ShotSpread>5.0</ShotSpread>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Flamethrower_Prometheum</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>15</range>
-						<minRange>2</minRange>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>3</burstShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<soundCast>HissFlamethrower</soundCast>
-						<muzzleFlashScale>2</muzzleFlashScale>
-						<ai_AvoidFriendlyFireRadius>3</ai_AvoidFriendlyFireRadius>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>60</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_Flamethrower</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name = "VFE_Gun_InfernoSpewerBase"]/tools
-					</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2.24</cooldownTime>
-								<armorPenetrationBlunt>2.7</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Light Charge Blaster ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="VFE_Gun_ChargeBlasterLightBase"]/statBases</xpath>
-					<value>
-						<statBases>
-							<Mass>3.0</Mass>
-							<MarketValue>1000</MarketValue>
-							<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.10</SightsEfficiency>
-							<ShotSpread>0.08</ShotSpread>
-							<SwayFactor>1.20</SwayFactor>
-							<Bulk>7.00</Bulk>
-							<WorkToMake>10000</WorkToMake>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="VFE_Gun_ChargeBlasterLightBase"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2.74</cooldownTime>
-								<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFE_Gun_ChargeBlasterLight</defName>
-					<statBases>
-						<Mass>3.0</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.20</SwayFactor>
-						<Bulk>7.00</Bulk>
-						<WorkToMake>48000</WorkToMake>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.16</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x22mmCharged</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>31</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>6</burstShotCount>
-						<soundCast>Shot_ChargeBlaster</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_6x22mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<!--Increased burst count and 20% reduced recoil-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFE_Gun_AdvancedChargeBlasterLight</defName>
-					<statBases>
-						<Mass>3.0</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.20</SwayFactor>
-						<Bulk>7.00</Bulk>
-						<WorkToMake>48000</WorkToMake>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.93</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x22mmCharged</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>35</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>Shot_ChargeBlaster</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_6x22mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Inferno spewer ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFE_Gun_InfernoSpewer</defName>
-					<statBases>
-						<Mass>6</Mass>
-						<Bulk>10</Bulk>
-						<SwayFactor>1.00</SwayFactor>
-						<ShotSpread>5.0</ShotSpread>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Flamethrower_Prometheum</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>20</range>
-						<minRange>3</minRange>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>5</burstShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<soundCast>HissFlamethrower</soundCast>
-						<muzzleFlashScale>3</muzzleFlashScale>
-						<ai_AvoidFriendlyFireRadius>3</ai_AvoidFriendlyFireRadius>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>80</magazineSize>
-						<reloadTime>8</reloadTime>
-						<ammoSet>AmmoSet_Flamethrower</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Advanced inferno spewer ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFE_Gun_AdvancedInfernoSpewer</defName>
-					<statBases>
-						<Mass>7</Mass>
-						<Bulk>12</Bulk>
-						<SwayFactor>1.00</SwayFactor>
-						<ShotSpread>5.0</ShotSpread>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Flamethrower_Prometheum</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>25</range>
-						<minRange>4</minRange>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<soundCast>HissFlamethrower</soundCast>
-						<muzzleFlashScale>5</muzzleFlashScale>
-						<ai_AvoidFriendlyFireRadius>3</ai_AvoidFriendlyFireRadius>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>8</reloadTime>
-						<ammoSet>AmmoSet_Flamethrower</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Advanced Needle Gun ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFE_Gun_AdvancedNeedle</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>0.81</SwayFactor>
-						<Bulk>15.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.80</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_5x100mmCaseless_Sabot</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>86</range>
-						<burstShotCount>1</burstShotCount>
-						<soundCast>Shot_NeedleGun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_5x100mmCaseless</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Gun_AdvancedNeedle"]/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>
-				</li>
-
-				<!-- ========== Add the Advanced Thermal Bolt Projector ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="BaseGun">
-							<defName>VFE_AdvancedThermalBoltProjector</defName>
-							<label>advanced thermal bolt projector</label>
-							<description>A medium-velocity, low-trajectory fire support system deployed by mechanoids. The advanced variant features a triple shot system, permitting saturation bombardment.</description>
-							<relicChance>0</relicChance>
-							<graphicData>
-								<texPath>Things/Weapons/ExplosiveBoltProjector</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<equippedAngleOffset>-45</equippedAngleOffset>
-							<soundInteract>Interact_Rifle</soundInteract>
-							<statBases>
-								<SightsEfficiency>1</SightsEfficiency>
-								<ShotSpread>0.16</ShotSpread>
-								<SwayFactor>1.00</SwayFactor>
-								<Bulk>8.50</Bulk>
-								<Mass>12.00</Mass>
-								<RangedWeapon_Cooldown>3</RangedWeapon_Cooldown>
-								<MarketValue>1600</MarketValue>
-							</statBases>
-							<techLevel>Spacer</techLevel>
-							<tradeability>None</tradeability>
-							<destroyOnDrop>true</destroyOnDrop>
-							<weaponTags>
-								<li>VFE_AdvMechanoidGunIndirect</li>
-								<li>NoSwitch</li>
-							</weaponTags>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-									<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_66mmThermalBolt_Incendiary</defaultProjectile>
-									<warmupTime>3.3</warmupTime>
-									<minRange>10</minRange>
-									<range>62</range>
-									<burstShotCount>3</burstShotCount>
-									<soundCast>Mortar_LaunchA</soundCast>
-									<muzzleFlashScale>16</muzzleFlashScale>
-									<circularError>2.5</circularError>
-									<indirectFirePenalty>0.2</indirectFirePenalty>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-								</li>
-							</verbs>
-							<comps>
-								<li Class="CombatExtended.CompProperties_Charges">
-									<chargeSpeeds>
-										<li>30</li>
-										<li>50</li>
-										<li>70</li>
-										<li>90</li>
-									</chargeSpeeds>
-								</li>
-								<li Class="CombatExtended.CompProperties_AmmoUser">
-									<magazineSize>6</magazineSize>
-									<reloadTime>12</reloadTime>
-									<ammoSet>AmmoSet_66mmThermalBolt</ammoSet>
-								</li>
-								<li Class="CombatExtended.CompProperties_FireModes">
-									<aiUseBurstMode>FALSE</aiUseBurstMode>
-								</li>
-							</comps>
-							<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>
-							<modExtensions>
-								<li Class="CombatExtended.GunDrawExtension">
-									<DrawSize>1.05,1.05</DrawSize>
-									<DrawOffset>-0.3,0.0</DrawOffset>
-								</li>
-								<li Class="CombatExtended.ThingDefExtensionCE">
-									<MenuHidden>True</MenuHidden>
-								</li>
-							</modExtensions>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- ========== VFE Advanced Charge Lance ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFE_Gun_AdvancedChargeLance</defName>
-					<statBases>
-						<Mass>8.80</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>0.9</SwayFactor>
-						<Bulk>14.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.88</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_5x35mmCharged</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>74</range>
-						<soundCast>ChargeLance_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_5x35mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>VFE_Gun_AdvancedChargeLance</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Gun_AdvancedChargeLance"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2.74</cooldownTime>
-								<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Advanced Heavy Charge Blaster ========== -->
-
-				<!--Increased burst count and 20% reduced recoil-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFE_Gun_AdvancedChargeBlasterHeavy</defName>
-					<statBases>
-						<Mass>40.00</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>13.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.01</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12x64mmCharged</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>75</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>20</burstShotCount>
-						<soundCast>Shot_ChargeBlaster</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>150</magazineSize>
-						<reloadTime>9.2</reloadTime>
-						<ammoSet>AmmoSet_12x64mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>10</aimedBurstShotCount>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>VFE_AdvMechanoidGunHeavy</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Advanced Inferno Cannon ========== -->
-
-				<!--Reduced Warm up, Give 3 round magazine-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFE_Gun_AdvancedInfernoCannon</defName>
-					<statBases>
-						<Mass>75.00</Mass>
-						<RangedWeapon_Cooldown>2.52</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>0.21</SwayFactor>
-						<Bulk>20.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.90</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_80x256mmFuel_Incendiary</defaultProjectile>
-						<warmupTime>3.0</warmupTime>
-						<range>86</range>
-						<burstShotCount>1</burstShotCount>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-						<minRange>5</minRange>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>3</magazineSize>
-						<reloadTime>9.8</reloadTime>
-						<ammoSet>AmmoSet_80x256mmFuel</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>VFE_AdvMechanoidGunHeavy</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Advanced Thump cannon ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFE_Gun_AdvancedThumpCannon</defName>
-					<statBases>
-						<Mass>100.00</Mass>
-						<RangedWeapon_Cooldown>2.22</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>0.26</SwayFactor>
-						<Bulk>20.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.05</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_164x284mmDemo</defaultProjectile>
-						<warmupTime>2.5</warmupTime>
-						<range>42</range>
-						<burstShotCount>1</burstShotCount>
-						<soundCast>ThumpCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<ai_AvoidFriendlyFireRadius>3</ai_AvoidFriendlyFireRadius>
-						<minRange>4</minRange>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>4</magazineSize>
-						<reloadTime>9.8</reloadTime>
-						<ammoSet>AmmoSet_164x284mmDemo</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Launcher</li>
-						<li>NoSwitch</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Gun_AdvancedThumpCannon"]/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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_AdvancedMechanoid.xml b/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_AdvancedMechanoid.xml
deleted file mode 100644
index 175a766479..0000000000
--- a/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_AdvancedMechanoid.xml	
+++ /dev/null
@@ -1,902 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Mechanoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[@Name="VFE_AdvancedMechanoid"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[@Name="VFE_AdvancedMechanoid"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="VFE_AdvancedMechanoid"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li>
-							<compClass>CombatExtended.CompAmmoGiver</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_MechAmmo">
-							<gizmoIconSetMagCount>UI/Buttons/SetMagCount</gizmoIconSetMagCount>
-							<gizmoIconTakeAmmoNow>UI/Buttons/TakeAmmoNow</gizmoIconTakeAmmoNow>
-						</li>
-					</value>
-				</li>
-
-				<!-- Advanced mechs retain some heat armor to represent sealing of sensitive electronics. Minor improvement to EMP resistance as well-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="VFE_AdvancedMechanoid"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.5</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="VFE_AdvancedMechanoid"]/statBases</xpath>
-					<value>
-						<SmokeSensitivity>0</SmokeSensitivity>
-						<ArmorRating_Electric>0.10</ArmorRating_Electric>
-						<NightVisionEfficiency>0.85</NightVisionEfficiency>
-					</value>
-				</li>
-
-				<!-- ========== VFE Advanced Centipede ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCentipede"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCentipede"]/statBases</xpath>
-					<value>
-						<ArmorRating_Heat>0.75</ArmorRating_Heat>
-						<CarryWeight>160</CarryWeight>
-						<CarryBulk>70</CarryBulk>
-						<AimingAccuracy>1.05</AimingAccuracy>
-						<ShootingAccuracyPawn>1.05</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.30</MeleeCritChance>
-						<MeleeParryChance>0.52</MeleeParryChance>
-						<AimingDelayFactor>1.20</AimingDelayFactor>
-						<MaxHitPoints>500</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCentipede"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>48</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCentipede"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>22</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCentipede"]/race/baseBodySize</xpath>
-					<value>
-						<baseBodySize>3.0</baseBodySize>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCentipede"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>3.51</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCentipede"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCentipede"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCentipede"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>3660</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>366</MaxOverHeal>
-							<MinArmorPct>0.5</MinArmorPct>
-							<MinArmorValueSharp>12</MinArmorValueSharp>
-							<MinArmorValueBlunt>27</MinArmorValueBlunt>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== VFE Advanced Scyther/Lancer ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedScyther" or defName="VFE_Mech_AdvancedLancer"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="VFE_AdvancedMechanoidWalker"]/statBases</xpath>
-					<value>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-						<AimingAccuracy>1.1</AimingAccuracy>
-						<ShootingAccuracyPawn>1.6</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.14</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-						<MaxHitPoints>200</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="VFE_AdvancedMechanoidWalker"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="VFE_AdvancedMechanoidWalker"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedScyther"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>43</power>
-								<cooldownTime>2.07</cooldownTime>
-								<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
-								<armorPenetrationSharp>2.16</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left blade</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>43</power>
-								<cooldownTime>2.07</cooldownTime>
-								<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
-								<armorPenetrationSharp>2.16</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right blade</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>5.9</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.875</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedLancer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedScyther"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedScyther"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedScyther"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1160</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>116</MaxOverHeal>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedLancer"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedLancer"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedLancer"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>860</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>86</MaxOverHeal>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== VFE Advanced Pikeman ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedPikeman"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedPikeman"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>7.5</ArmorRating_Sharp>
-						<ArmorRating_Blunt>18</ArmorRating_Blunt>
-						<CarryWeight>80</CarryWeight>
-						<CarryBulk>40</CarryBulk>
-						<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-						<MaxHitPoints>200</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedPikeman"]/race/baseHealthScale</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedPikeman"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>front left leg</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>2.67</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>front right leg</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>2.67</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>3.51</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedPikeman"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedPikeman"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedPikeman"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1000</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>100</MaxOverHeal>
-							<MinArmorPct>0.75</MinArmorPct>
-							<MinArmorValueSharp>4</MinArmorValueSharp>
-							<MinArmorValueBlunt>8</MinArmorValueBlunt>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== VFE Advanced Knight ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedKnight"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedKnight"]/statBases</xpath>
-					<value>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-						<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						<MeleeCritChance>0.12</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-						<MaxHitPoints>200</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedKnight"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>12</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedKnight"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedKnight"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedKnight"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedKnight"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedKnight"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>860</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>86</MaxOverHeal>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== VFE Advanced Inquisitor ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedInquisitor"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedInquisitor"]/statBases</xpath>
-					<value>
-						<ArmorRating_Heat>1.0</ArmorRating_Heat>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>50</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1.1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.07</MeleeDodgeChance>
-						<MeleeCritChance>0.04</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-						<MaxHitPoints>200</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedInquisitor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>15</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedInquisitor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedInquisitor"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedInquisitor"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedInquisitor"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedInquisitor"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1200</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>120</MaxOverHeal>
-							<MinArmorPct>0.5</MinArmorPct>
-							<MinArmorValueSharp>5</MinArmorValueSharp>
-							<MinArmorValueBlunt>7.5</MinArmorValueBlunt>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== VFE Advanced Carpenter ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCarpenter"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCarpenter"]/statBases</xpath>
-					<value>
-						<ArmorRating_Heat>0.75</ArmorRating_Heat>
-						<CarryWeight>150</CarryWeight>
-						<CarryBulk>80</CarryBulk>
-						<MeleeDodgeChance>0.04</MeleeDodgeChance>
-						<MeleeCritChance>0.47</MeleeCritChance>
-						<MeleeParryChance>0.52</MeleeParryChance>
-						<MaxHitPoints>500</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCarpenter"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>48</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCarpenter"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>22</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCarpenter"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>3.51</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCarpenter"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCarpenter"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCarpenter"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>3560</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>356</MaxOverHeal>
-							<MinArmorPct>0.5</MinArmorPct>
-							<MinArmorValueSharp>12</MinArmorValueSharp>
-							<MinArmorValueBlunt>27</MinArmorValueBlunt>
-						</li>
-					</value>
-				</li>
-
-				<!-- ==========VFE Advanced Termite ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvTermite"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvTermite"]/statBases</xpath>
-					<value>
-						<statBases>
-							<ArmorRating_Heat>0.75</ArmorRating_Heat>
-							<CarryWeight>150</CarryWeight>
-							<CarryBulk>60</CarryBulk>
-							<AimingAccuracy>1.0</AimingAccuracy>
-							<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-							<MeleeDodgeChance>0.04</MeleeDodgeChance>
-							<MeleeCritChance>0.16</MeleeCritChance>
-							<MeleeParryChance>0.24</MeleeParryChance>
-							<AimingDelayFactor>1.25</AimingDelayFactor>
-							<MaxHitPoints>400</MaxHitPoints>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvTermite"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>48</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvTermite"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>22</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvTermite"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>3.01</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>13.5</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvTermite"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvTermite"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvTermite"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1880</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>188</MaxOverHeal>
-							<MinArmorPct>0.5</MinArmorPct>
-							<MinArmorValueSharp>10</MinArmorValueSharp>
-							<MinArmorValueBlunt>22</MinArmorValueBlunt>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_AdvancedMechanoid_PlayerControlled.xml b/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_AdvancedMechanoid_PlayerControlled.xml
deleted file mode 100644
index 7df9339da5..0000000000
--- a/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_AdvancedMechanoid_PlayerControlled.xml	
+++ /dev/null
@@ -1,781 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Mechanoids</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Biotech</li>
-			</mods>
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<!-- ========== VFE Advanced Centipede ========== -->
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCentipede_PlayerControlled"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>QuadrupedLow</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCentipede_PlayerControlled"]/statBases</xpath>
-						<value>
-							<ArmorRating_Heat>0.75</ArmorRating_Heat>
-							<CarryWeight>160</CarryWeight>
-							<CarryBulk>70</CarryBulk>
-							<AimingAccuracy>1.05</AimingAccuracy>
-							<ShootingAccuracyPawn>1.05</ShootingAccuracyPawn>
-							<MeleeDodgeChance>0.03</MeleeDodgeChance>
-							<MeleeCritChance>0.30</MeleeCritChance>
-							<MeleeParryChance>0.52</MeleeParryChance>
-							<AimingDelayFactor>1.20</AimingDelayFactor>
-							<MaxHitPoints>500</MaxHitPoints>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCentipede_PlayerControlled"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>48</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCentipede_PlayerControlled"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>22</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCentipede_PlayerControlled"]/race/baseBodySize</xpath>
-						<value>
-							<baseBodySize>3.0</baseBodySize>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCentipede_PlayerControlled"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>35</power>
-									<cooldownTime>3.51</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationSharp>0</armorPenetrationSharp>
-									<armorPenetrationBlunt>15</armorPenetrationBlunt>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCentipede_PlayerControlled"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCentipede_PlayerControlled"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedCentipede_PlayerControlled"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>3660</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>366</MaxOverHeal>
-								<MinArmorPct>0.5</MinArmorPct>
-								<MinArmorValueSharp>12</MinArmorValueSharp>
-								<MinArmorValueBlunt>27</MinArmorValueBlunt>
-							</li>
-						</value>
-					</li>
-
-					<!-- ========== VFE Advanced Scyther/Lancer ========== -->
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedScyther_PlayerControlled" or defName="VFE_Mech_AdvancedLancer_PlayerControlled" ]/statBases</xpath>
-						<value>
-							<CarryWeight>50</CarryWeight>
-							<CarryBulk>20</CarryBulk>
-							<AimingAccuracy>1.1</AimingAccuracy>
-							<ShootingAccuracyPawn>1.6</ShootingAccuracyPawn>
-							<MeleeDodgeChance>0.15</MeleeDodgeChance>
-							<MeleeCritChance>0.14</MeleeCritChance>
-							<MeleeParryChance>0.09</MeleeParryChance>
-							<MaxHitPoints>200</MaxHitPoints>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedScyther_PlayerControlled" or defName="VFE_Mech_AdvancedLancer_PlayerControlled"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedScyther_PlayerControlled" or defName="VFE_Mech_AdvancedLancer_PlayerControlled"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>5</ArmorRating_Sharp>
-						</value>
-					</li>
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedScyther_PlayerControlled" or defName="VFE_Mech_AdvancedLancer_PlayerControlled"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Humanoid</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedScyther_PlayerControlled"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>left blade</label>
-									<capacities>
-										<li>Cut</li>
-									</capacities>
-									<power>43</power>
-									<cooldownTime>2.07</cooldownTime>
-									<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
-									<armorPenetrationSharp>2.16</armorPenetrationSharp>
-									<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>left blade</label>
-									<capacities>
-										<li>Stab</li>
-									</capacities>
-									<power>24</power>
-									<cooldownTime>1.33</cooldownTime>
-									<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
-									<armorPenetrationSharp>40</armorPenetrationSharp>
-									<armorPenetrationBlunt>20</armorPenetrationBlunt>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>right blade</label>
-									<capacities>
-										<li>Cut</li>
-									</capacities>
-									<power>43</power>
-									<cooldownTime>2.07</cooldownTime>
-									<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
-									<armorPenetrationSharp>2.16</armorPenetrationSharp>
-									<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>right blade</label>
-									<capacities>
-										<li>Stab</li>
-									</capacities>
-									<power>24</power>
-									<cooldownTime>1.33</cooldownTime>
-									<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
-									<armorPenetrationSharp>40</armorPenetrationSharp>
-									<armorPenetrationBlunt>20</armorPenetrationBlunt>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>6</power>
-									<cooldownTime>5.9</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<chanceFactor>0.2</chanceFactor>
-									<armorPenetrationSharp>0</armorPenetrationSharp>
-									<armorPenetrationBlunt>1.875</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedLancer_PlayerControlled"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>left fist</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>5</power>
-									<cooldownTime>1.11</cooldownTime>
-									<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-									<armorPenetrationSharp>0</armorPenetrationSharp>
-									<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>right fist</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>5</power>
-									<cooldownTime>1.11</cooldownTime>
-									<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-									<armorPenetrationSharp>0</armorPenetrationSharp>
-									<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>5</power>
-									<cooldownTime>1.85</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<chanceFactor>0.2</chanceFactor>
-									<armorPenetrationSharp>0</armorPenetrationSharp>
-									<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedScyther_PlayerControlled"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedScyther_PlayerControlled"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedScyther_PlayerControlled"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>1160</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>116</MaxOverHeal>
-								<MinArmorPct>0.75</MinArmorPct>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedLancer_PlayerControlled"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedLancer_PlayerControlled"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedLancer_PlayerControlled"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>860</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>86</MaxOverHeal>
-								<MinArmorPct>0.75</MinArmorPct>
-							</li>
-						</value>
-					</li>
-
-					<!-- ========== VFE Advanced Pikeman ========== -->
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedPikeman_PlayerControlled"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Quadruped</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedPikeman_PlayerControlled"]/statBases</xpath>
-						<value>
-							<CarryWeight>80</CarryWeight>
-							<CarryBulk>40</CarryBulk>
-							<MeleeDodgeChance>0.05</MeleeDodgeChance>
-							<MeleeCritChance>0.15</MeleeCritChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-							<MaxHitPoints>200</MaxHitPoints>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedPikeman_PlayerControlled"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>18</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedPikeman_PlayerControlled"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>7.5</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationRemove">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedPikeman_PlayerControlled"]/race/baseHealthScale</xpath>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedPikeman_PlayerControlled"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>front left leg</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>13</power>
-									<cooldownTime>2.67</cooldownTime>
-									<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>5</armorPenetrationBlunt>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>front right leg</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>13</power>
-									<cooldownTime>2.67</cooldownTime>
-									<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>5</armorPenetrationBlunt>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>15</power>
-									<cooldownTime>3.51</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>12</armorPenetrationBlunt>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-									<chanceFactor>0.2</chanceFactor>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedPikeman_PlayerControlled"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedPikeman_PlayerControlled"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedPikeman_PlayerControlled"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>1000</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>100</MaxOverHeal>
-								<MinArmorPct>0.75</MinArmorPct>
-								<MinArmorValueSharp>4</MinArmorValueSharp>
-								<MinArmorValueBlunt>8</MinArmorValueBlunt>
-							</li>
-						</value>
-					</li>
-
-					<!-- ========== VFE Advanced Knight ========== -->
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedKnight_PlayerControlled"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Humanoid</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedKnight_PlayerControlled"]/statBases</xpath>
-						<value>
-							<AimingAccuracy>1.1</AimingAccuracy>
-							<ShootingAccuracyPawn>1.6</ShootingAccuracyPawn>
-							<CarryWeight>50</CarryWeight>
-							<CarryBulk>20</CarryBulk>
-							<MeleeDodgeChance>0.13</MeleeDodgeChance>
-							<MeleeCritChance>0.12</MeleeCritChance>
-							<MeleeParryChance>0.09</MeleeParryChance>
-							<MaxHitPoints>200</MaxHitPoints>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedKnight_PlayerControlled"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>12</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedKnight_PlayerControlled"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>8</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedKnight_PlayerControlled"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>left fist</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>5</power>
-									<cooldownTime>1.11</cooldownTime>
-									<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-									<armorPenetrationSharp>0</armorPenetrationSharp>
-									<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>right fist</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>5</power>
-									<cooldownTime>1.11</cooldownTime>
-									<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-									<armorPenetrationSharp>0</armorPenetrationSharp>
-									<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>5</power>
-									<cooldownTime>1.85</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<chanceFactor>0.2</chanceFactor>
-									<armorPenetrationSharp>0</armorPenetrationSharp>
-									<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedKnight_PlayerControlled"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedKnight_PlayerControlled"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedKnight_PlayerControlled"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>860</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>86</MaxOverHeal>
-								<MinArmorPct>0.75</MinArmorPct>
-							</li>
-						</value>
-					</li>
-
-					<!-- ========== VFE Advanced Inquisitor ========== -->
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedInquisitor_PlayerControlled"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Humanoid</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedInquisitor_PlayerControlled"]/statBases</xpath>
-						<value>
-							<ArmorRating_Heat>1.0</ArmorRating_Heat>
-							<CarryWeight>50</CarryWeight>
-							<CarryBulk>50</CarryBulk>
-							<AimingAccuracy>1.0</AimingAccuracy>
-							<ShootingAccuracyPawn>1.1</ShootingAccuracyPawn>
-							<MeleeDodgeChance>0.07</MeleeDodgeChance>
-							<MeleeCritChance>0.04</MeleeCritChance>
-							<MeleeParryChance>0.09</MeleeParryChance>
-							<MaxHitPoints>200</MaxHitPoints>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedInquisitor_PlayerControlled"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>15</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedInquisitor_PlayerControlled"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>10</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedInquisitor_PlayerControlled"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>left fist</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>5</power>
-									<cooldownTime>1.11</cooldownTime>
-									<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-									<armorPenetrationSharp>0</armorPenetrationSharp>
-									<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>right fist</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>5</power>
-									<cooldownTime>1.11</cooldownTime>
-									<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-									<armorPenetrationSharp>0</armorPenetrationSharp>
-									<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>5</power>
-									<cooldownTime>1.85</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<chanceFactor>0.2</chanceFactor>
-									<armorPenetrationSharp>0</armorPenetrationSharp>
-									<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedInquisitor_PlayerControlled"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedInquisitor_PlayerControlled"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedInquisitor_PlayerControlled"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>1200</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>120</MaxOverHeal>
-								<MinArmorPct>0.5</MinArmorPct>
-								<MinArmorValueSharp>5</MinArmorValueSharp>
-								<MinArmorValueBlunt>7.5</MinArmorValueBlunt>
-							</li>
-						</value>
-					</li>
-
-					<!-- ==========VFE Advanced Termite ========== -->
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedTermite_PlayerControlled"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>QuadrupedLow</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedTermite_PlayerControlled"]/statBases</xpath>
-						<value>
-							<ArmorRating_Heat>0.75</ArmorRating_Heat>
-							<CarryWeight>150</CarryWeight>
-							<CarryBulk>60</CarryBulk>
-							<AimingAccuracy>1.0</AimingAccuracy>
-							<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-							<MeleeDodgeChance>0.04</MeleeDodgeChance>
-							<MeleeCritChance>0.16</MeleeCritChance>
-							<MeleeParryChance>0.24</MeleeParryChance>
-							<AimingDelayFactor>1.25</AimingDelayFactor>
-							<MaxHitPoints>400</MaxHitPoints>
-						</value>
-					</li>
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedTermite_PlayerControlled"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>48</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedTermite_PlayerControlled"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>22</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedTermite_PlayerControlled"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>25</power>
-									<cooldownTime>3.01</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationSharp>0</armorPenetrationSharp>
-									<armorPenetrationBlunt>13.5</armorPenetrationBlunt>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedTermite_PlayerControlled"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedTermite_PlayerControlled"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedTermite_PlayerControlled"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>1880</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>188</MaxOverHeal>
-								<MinArmorPct>0.5</MinArmorPct>
-								<MinArmorValueSharp>10</MinArmorValueSharp>
-								<MinArmorValueBlunt>22</MinArmorValueBlunt>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Machines.xml b/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Machines.xml
deleted file mode 100644
index 5c372766c6..0000000000
--- a/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Machines.xml	
+++ /dev/null
@@ -1,668 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Mechanoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="BaseVFEMachine"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li>
-							<compClass>CombatExtended.CompAmmoGiver</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_MechAmmo">
-							<gizmoIconSetMagCount>UI/Buttons/SetMagCount</gizmoIconSetMagCount>
-							<gizmoIconTakeAmmoNow>UI/Buttons/TakeAmmoNow</gizmoIconTakeAmmoNow>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="BaseVFEMachine"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0</ArmorRating_Heat>
-						<SmokeSensitivity>0</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="BaseVFEMachine"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<useStatic>false</useStatic>
-									<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
-									<parts>
-										<li>SightSensor</li>
-									</parts>
-								</li>
-								<li>
-									<useStatic>false</useStatic>
-									<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
-									<parts>
-										<li>SightSensor</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="BaseVFEMachine"]/statBases</xpath>
-					<value>
-						<PartialArmorBody>0</PartialArmorBody>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="VFE_Mechanoids_Autocleaner" or
-						defName="VFE_Mechanoids_Autohauler" or
-						defName="VFE_Mechanoids_Autominer" or
-						defName="VFE_Mechanoids_Combat" or
-						defName="VFE_Mechanoids_Riot" or
-						defName="VFE_Mechanoids_Turret" or
-						defName="VFE_Mechanoids_Autostrider" or
-						defName="VFE_Mechanoids_AutoMedic" or
-						defName="VFE_Mechanoids_Autobroadcaster"
-						]/statBases/MoveSpeed </xpath>
-					<value>
-						<MoveSpeed>2.8</MoveSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Raider"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>3.2</MoveSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Pyro"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>2.2</MoveSpeed>
-					</value>
-				</li>
-
-				<!-- ========== VFE Autocleaner, VFE Autohauler, VFE Autominer, VFE Mobile Turret ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autocleaner"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autohauler" or defName="VFE_Mechanoids_Autominer" or defName="VFE_Mechanoids_Turret"or defName="VFE_Mechanoids_Autobroadcaster"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Vehicle</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autocleaner" or defName="VFE_Mechanoids_Autohauler" or defName="VFE_Mechanoids_Autominer" or defName="VFE_Mechanoids_Autobroadcaster"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Turret"]/statBases</xpath>
-					<value>
-						<CarryWeight>100</CarryWeight>
-						<CarryBulk>50</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>2.6</ShootingAccuracyPawn>
-						<ReloadSpeed>1</ReloadSpeed>
-						<MeleeDodgeChance>0</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0</MeleeParryChance>
-						<NightVisionEfficiency>0.40</NightVisionEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autocleaner" or defName="VFE_Mechanoids_Autohauler" or defName="VFE_Mechanoids_Autominer" or defName="VFE_Mechanoids_Turret" or defName="VFE_Mechanoids_Autobroadcaster"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autocleaner" or defName="VFE_Mechanoids_Autohauler" or defName="VFE_Mechanoids_Autominer" or defName="VFE_Mechanoids_Turret" or defName="VFE_Mechanoids_Autobroadcaster"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autocleaner" or defName="VFE_Mechanoids_Autohauler" or defName="VFE_Mechanoids_Autominer" or defName="VFE_Mechanoids_Turret" or defName="VFE_Mechanoids_Autobroadcaster"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>body</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.05</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autocleaner"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autocleaner"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autohauler"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autohauler"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autominer"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autominer"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autobroadcaster"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autobroadcaster"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autocleaner" or defName="VFE_Mechanoids_Autohauler" or defName="VFE_Mechanoids_Autominer" or defName="VFE_Mechanoids_Autobroadcaster"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>750</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>2500</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>100</MaxOverHeal>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== VFE Combat, Riot and Raider Mechs ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Riot" or defName="VFE_Mechanoids_Combat" or defName="VFE_Mechanoids_Raider" or defName="VFE_Mechanoids_Pyro"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Riot" or defName="VFE_Mechanoids_Combat" or defName="VFE_Mechanoids_Raider" or defName="VFE_Mechanoids_Pyro"]/statBases</xpath>
-					<value>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>30</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>2.6</ShootingAccuracyPawn>
-						<ReloadSpeed>1</ReloadSpeed>
-						<MeleeDodgeChance>0.19</MeleeDodgeChance>
-						<MeleeCritChance>0.22</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-						<MaxHitPoints>200</MaxHitPoints>
-						<NightVisionEfficiency>0.60</NightVisionEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Riot"]/statBases</xpath>
-					<value>
-						<MeleeHitChance>6</MeleeHitChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Combat"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Combat"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Riot" or defName="VFE_Mechanoids_Pyro" or defName="VFE_Mechanoids_Raider"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Riot" or defName="VFE_Mechanoids_Pyro" or defName="VFE_Mechanoids_Raider"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>12</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Combat" or defName="VFE_Mechanoids_Raider" or defName="VFE_Mechanoids_Pyro"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Riot"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>2.16</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shield</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Stun</def>
-										<amount>10</amount>
-										<chance>0.25</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>3</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>11.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Combat"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Combat"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Riot"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Riot"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Turret"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Turret"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Pyro"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Pyro"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Combat" or defName="VFE_Mechanoids_Riot" or defName="VFE_Mechanoids_Turret" or defName="VFE_Mechanoids_Pyro"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>2500</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>2500</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>250</MaxOverHeal>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Raider"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Raider"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Raider"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>2750</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>2500</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>275</MaxOverHeal>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== VFE Strider ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autostrider"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autostrider"]/statBases</xpath>
-					<value>
-						<CarryWeight>100</CarryWeight>
-						<CarryBulk>25</CarryBulk>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.26</MeleeCritChance>
-						<MeleeParryChance>0.52</MeleeParryChance>
-						<MaxHitPoints>200</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autostrider"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>10</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autostrider"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autostrider"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>3.01</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autostrider"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autostrider"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_Autostrider"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>3500</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>2500</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>350</MaxOverHeal>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_AutoMedic"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_AutoMedic"]/statBases</xpath>
-					<value>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						<MeleeCritChance>0.12</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_AutoMedic"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_AutoMedic"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_AutoMedic"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.825</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_AutoMedic"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mechanoids_AutoMedic"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mechanoids_AutoMedic"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>2500</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>2500</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>250</MaxOverHeal>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid.xml b/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid.xml
deleted file mode 100644
index e4e16848be..0000000000
--- a/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid.xml	
+++ /dev/null
@@ -1,936 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Mechanoids</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[@Name="VFE_Mechanoid"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[@Name="VFE_Mechanoid"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="VFE_Mechanoid"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li>
-							<compClass>CombatExtended.CompAmmoGiver</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_MechAmmo">
-							<gizmoIconSetMagCount>UI/Buttons/SetMagCount</gizmoIconSetMagCount>
-							<gizmoIconTakeAmmoNow>UI/Buttons/TakeAmmoNow</gizmoIconTakeAmmoNow>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="VFE_Mechanoid"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<useStatic>false</useStatic>
-									<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
-									<parts>
-										<li>SightSensor</li>
-									</parts>
-								</li>
-								<li>
-									<useStatic>false</useStatic>
-									<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
-									<parts>
-										<li>SightSensor</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="VFE_Mechanoid"]/statBases</xpath>
-					<value>
-						<PartialArmorBody>0</PartialArmorBody>
-					</value>
-				</li>
-
-				<!--Consistency with vanilla mechs-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="VFE_Mechanoid"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0</ArmorRating_Heat>
-						<SmokeSensitivity>0</SmokeSensitivity>
-						<NightVisionEfficiency>0.80</NightVisionEfficiency>
-					</value>
-				</li>
-
-				<!-- ========== VFE Centipede ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Centipede"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Centipede"]/statBases</xpath>
-					<value>
-						<ArmorRating_Heat>0.25</ArmorRating_Heat>
-						<CarryWeight>150</CarryWeight>
-						<CarryBulk>60</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.26</MeleeCritChance>
-						<MeleeParryChance>0.52</MeleeParryChance>
-						<AimingDelayFactor>1.25</AimingDelayFactor>
-						<MaxHitPoints>500</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Centipede"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>45</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Centipede"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Centipede"]/race/baseBodySize</xpath>
-					<value>
-						<baseBodySize>3.0</baseBodySize>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Centipede"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>3.51</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Centipede"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Centipede"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Centipede"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>3660</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>366</MaxOverHeal>
-							<MinArmorPct>0.5</MinArmorPct>
-							<MinArmorValueSharp>12</MinArmorValueSharp>
-							<MinArmorValueBlunt>27</MinArmorValueBlunt>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== VFE Scyther/Lancer ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Scyther" or defName="VFE_Mech_Lancer"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="VFE_MechanoidWalker"]/statBases</xpath>
-					<value>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						<MeleeCritChance>0.12</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-						<MaxHitPoints>200</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="VFE_MechanoidWalker"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="VFE_MechanoidWalker"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Scyther"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>43</power>
-								<cooldownTime>2.07</cooldownTime>
-								<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
-								<armorPenetrationSharp>2.16</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left blade</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>43</power>
-								<cooldownTime>2.07</cooldownTime>
-								<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
-								<armorPenetrationSharp>2.16</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right blade</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>5.9</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.875</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Lancer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Scyther"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Scyther"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Scyther"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1160</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>116</MaxOverHeal>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Lancer"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Lancer"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Lancer"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>860</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>86</MaxOverHeal>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== VFE Pikeman ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Pikeman"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Pikeman"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>7</ArmorRating_Sharp>
-						<ArmorRating_Blunt>15</ArmorRating_Blunt>
-						<CarryWeight>80</CarryWeight>
-						<CarryBulk>40</CarryBulk>
-						<MeleeDodgeChance>0.04</MeleeDodgeChance>
-						<MeleeCritChance>0.13</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-						<MaxHitPoints>200</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Pikeman"]/race/baseHealthScale</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Pikeman"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>front left leg</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>2.67</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>front right leg</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>2.67</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>3.51</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Pikeman"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Pikeman"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Pikeman"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1000</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>100</MaxOverHeal>
-							<MinArmorPct>0.75</MinArmorPct>
-							<MinArmorValueSharp>4</MinArmorValueSharp>
-							<MinArmorValueBlunt>8</MinArmorValueBlunt>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Knight ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Knight"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Knight"]/statBases</xpath>
-					<value>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						<MeleeCritChance>0.11</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-						<MaxHitPoints>200</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Knight"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>9</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Knight"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Knight"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Knight"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Knight"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Knight"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>860</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>86</MaxOverHeal>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Inquisitor ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Inquisitor"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Inquisitor"]/statBases</xpath>
-					<value>
-						<ArmorRating_Heat>0.5</ArmorRating_Heat>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>50</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1.0</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.06</MeleeDodgeChance>
-						<MeleeCritChance>0.03</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-						<MaxHitPoints>200</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Inquisitor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>12</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Inquisitor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Inquisitor"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.11</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Inquisitor"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Inquisitor"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Inquisitor"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1200</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>120</MaxOverHeal>
-							<MinArmorPct>0.5</MinArmorPct>
-							<MinArmorValueSharp>5</MinArmorValueSharp>
-							<MinArmorValueBlunt>7.5</MinArmorValueBlunt>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== VFE Carpenter and Ancient Carpenter ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Carpenter" or defName="VFE_AncientMech_AncientCarpenter"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Carpenter" or defName="VFE_AncientMech_AncientCarpenter"]/statBases</xpath>
-					<value>
-						<ArmorRating_Heat>0.25</ArmorRating_Heat>
-						<CarryWeight>150</CarryWeight>
-						<CarryBulk>80</CarryBulk>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.40</MeleeCritChance>
-						<MeleeParryChance>0.39</MeleeParryChance>
-						<MaxHitPoints>500</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Carpenter" or defName="VFE_AncientMech_AncientCarpenter"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>45</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Carpenter" or defName="VFE_AncientMech_AncientCarpenter"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Carpenter" or defName="VFE_AncientMech_AncientCarpenter"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>3.51</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Carpenter"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Carpenter"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFE_AncientMech_AncientCarpenter"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_AncientMech_AncientCarpenter"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Carpenter" or defName="VFE_AncientMech_AncientCarpenter"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>3560</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>356</MaxOverHeal>
-							<MinArmorPct>0.5</MinArmorPct>
-							<MinArmorValueSharp>12</MinArmorValueSharp>
-							<MinArmorValueBlunt>27</MinArmorValueBlunt>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== VFE Termite ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Termite"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Termite"]/statBases</xpath>
-					<value>
-						<ArmorRating_Heat>0.25</ArmorRating_Heat>
-						<CarryWeight>150</CarryWeight>
-						<CarryBulk>60</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.04</MeleeDodgeChance>
-						<MeleeCritChance>0.14</MeleeCritChance>
-						<MeleeParryChance>0.24</MeleeParryChance>
-						<AimingDelayFactor>1.25</AimingDelayFactor>
-						<MaxHitPoints>350</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Termite"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>40</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Termite"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Termite"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>3.01</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>13.5</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Termite"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Termite"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Mech_Termite"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1880</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>188</MaxOverHeal>
-							<MinArmorPct>0.5</MinArmorPct>
-							<MinArmorValueSharp>10</MinArmorValueSharp>
-							<MinArmorValueBlunt>22</MinArmorValueBlunt>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid_PlayerControlled.xml b/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid_PlayerControlled.xml
deleted file mode 100644
index 657a8298e9..0000000000
--- a/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid_PlayerControlled.xml	
+++ /dev/null
@@ -1,347 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Mechanoids</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Biotech</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-					<!-- ========== Termite ========== -->
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Termite_PlayerControlled"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>QuadrupedLow</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Termite_PlayerControlled"]/statBases</xpath>
-						<value>
-							<ArmorRating_Heat>0.25</ArmorRating_Heat>
-							<CarryWeight>150</CarryWeight>
-							<CarryBulk>60</CarryBulk>
-							<AimingAccuracy>1.0</AimingAccuracy>
-							<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-							<MeleeDodgeChance>0.04</MeleeDodgeChance>
-							<MeleeCritChance>0.14</MeleeCritChance>
-							<MeleeParryChance>0.24</MeleeParryChance>
-							<AimingDelayFactor>1.25</AimingDelayFactor>
-							<MaxHitPoints>350</MaxHitPoints>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Termite_PlayerControlled"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>40</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Termite_PlayerControlled"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>18</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Termite_PlayerControlled"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>25</power>
-									<cooldownTime>3.01</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>13.5</armorPenetrationBlunt>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Termite_PlayerControlled"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Termite_PlayerControlled"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Termite_PlayerControlled"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>1880</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>188</MaxOverHeal>
-								<MinArmorPct>0.5</MinArmorPct>
-								<MinArmorValueSharp>10</MinArmorValueSharp>
-								<MinArmorValueBlunt>22</MinArmorValueBlunt>
-							</li>
-						</value>
-					</li>
-
-					<!-- ========== Knight ========== -->
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Knight_PlayerControlled"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Humanoid</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Knight_PlayerControlled"]/statBases</xpath>
-						<value>
-							<CarryWeight>50</CarryWeight>
-							<CarryBulk>20</CarryBulk>
-							<AimingAccuracy>1.0</AimingAccuracy>
-							<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
-							<MeleeDodgeChance>0.13</MeleeDodgeChance>
-							<MeleeCritChance>0.11</MeleeCritChance>
-							<MeleeParryChance>0.09</MeleeParryChance>
-							<MaxHitPoints>200</MaxHitPoints>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Knight_PlayerControlled"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>9</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Knight_PlayerControlled"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>6</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Knight_PlayerControlled"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>left fist</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>5</power>
-									<cooldownTime>1.11</cooldownTime>
-									<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-									<armorPenetrationSharp>0</armorPenetrationSharp>
-									<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>right fist</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>5</power>
-									<cooldownTime>1.11</cooldownTime>
-									<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-									<armorPenetrationSharp>0</armorPenetrationSharp>
-									<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>5</power>
-									<cooldownTime>1.85</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<chanceFactor>0.2</chanceFactor>
-									<armorPenetrationSharp>0</armorPenetrationSharp>
-									<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Knight_PlayerControlled"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Knight_PlayerControlled"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Knight_PlayerControlled"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>860</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>86</MaxOverHeal>
-								<MinArmorPct>0.75</MinArmorPct>
-							</li>
-						</value>
-					</li>
-
-					<!-- ========== Inquisitor ========== -->
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Inquisitor_PlayerControlled"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Humanoid</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Inquisitor_PlayerControlled"]/statBases</xpath>
-						<value>
-							<ArmorRating_Heat>0.5</ArmorRating_Heat>
-							<CarryWeight>50</CarryWeight>
-							<CarryBulk>50</CarryBulk>
-							<AimingAccuracy>1.0</AimingAccuracy>
-							<ShootingAccuracyPawn>1.0</ShootingAccuracyPawn>
-							<MeleeDodgeChance>0.06</MeleeDodgeChance>
-							<MeleeCritChance>0.03</MeleeCritChance>
-							<MeleeParryChance>0.09</MeleeParryChance>
-							<MaxHitPoints>200</MaxHitPoints>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Inquisitor_PlayerControlled"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>12</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Inquisitor_PlayerControlled"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>8</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Inquisitor_PlayerControlled"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>left fist</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>5</power>
-									<cooldownTime>1.11</cooldownTime>
-									<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-									<armorPenetrationSharp>0</armorPenetrationSharp>
-									<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>right fist</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>5</power>
-									<cooldownTime>1.11</cooldownTime>
-									<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-									<armorPenetrationSharp>0</armorPenetrationSharp>
-									<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-									<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>5</power>
-									<cooldownTime>1.85</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<chanceFactor>0.2</chanceFactor>
-									<armorPenetrationSharp>0</armorPenetrationSharp>
-									<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationConditional">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Inquisitor_PlayerControlled"]/comps</xpath>
-						<nomatch Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="VFE_Mech_Inquisitor_PlayerControlled"]</xpath>
-							<value>
-								<comps />
-							</value>
-						</nomatch>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFE_Mech_Inquisitor_PlayerControlled"]/comps</xpath>
-						<value>
-							<li Class="CombatExtended.CompProperties_ArmorDurability">
-								<Durability>1200</Durability>
-								<Regenerates>true</Regenerates>
-								<RegenInterval>1250</RegenInterval>
-								<RegenValue>5</RegenValue>
-								<Repairable>true</Repairable>
-								<RepairIngredients>
-									<Steel>5</Steel>
-									<Plasteel>5</Plasteel>
-								</RepairIngredients>
-								<RepairTime>300</RepairTime>
-								<RepairValue>200</RepairValue>
-								<CanOverHeal>true</CanOverHeal>
-								<MaxOverHeal>120</MaxOverHeal>
-								<MinArmorPct>0.5</MinArmorPct>
-								<MinArmorValueSharp>5</MinArmorValueSharp>
-								<MinArmorValueBlunt>7.5</MinArmorValueBlunt>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Mechanoids/WorldObjects/WorldObjects.xml b/Patches/Vanilla Factions Expanded - Mechanoids/WorldObjects/WorldObjects.xml
deleted file mode 100644
index 1f143ce4d4..0000000000
--- a/Patches/Vanilla Factions Expanded - Mechanoids/WorldObjects/WorldObjects.xml	
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Mechanoids</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-
-			<operations>
-
-				<!--VFEM_Frigate-->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/WorldObjectDef[defName="VFEM_Frigate"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/WorldObjectDef[defName="VFEM_Frigate"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/WorldObjectDef[defName="VFEM_Frigate"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.WorldObjects.WorldObjectCompProperties_Health">
-							<healthModifier>2.6</healthModifier>
-							<techLevelNoImpact>true</techLevelNoImpact>
-							<chanceToNegateDamage>0.12</chanceToNegateDamage>
-						</li>
-						<li Class="CombatExtended.WorldObjects.WorldObjectCompProperties_Hostility" />
-					</value>
-				</li>
-
-				<!--VFEM_Destroyer-->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/WorldObjectDef[defName="VFEM_Destroyer"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/WorldObjectDef[defName="VFEM_Destroyer"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/WorldObjectDef[defName="VFEM_Destroyer"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.WorldObjects.WorldObjectCompProperties_Health">
-							<healthModifier>3.6</healthModifier>
-							<techLevelNoImpact>true</techLevelNoImpact>
-							<chanceToNegateDamage>0.22</chanceToNegateDamage>
-						</li>
-						<li Class="CombatExtended.WorldObjects.WorldObjectCompProperties_Hostility" />
-					</value>
-				</li>
-
-				<!--VFEM_Cruiser-->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/WorldObjectDef[defName="VFEM_Cruiser"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/WorldObjectDef[defName="VFEM_Cruiser"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/WorldObjectDef[defName="VFEM_Cruiser"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.WorldObjects.WorldObjectCompProperties_Health">
-							<healthModifier>4.6</healthModifier>
-							<techLevelNoImpact>true</techLevelNoImpact>
-							<chanceToNegateDamage>0.3</chanceToNegateDamage>
-						</li>
-						<li Class="CombatExtended.WorldObjects.WorldObjectCompProperties_Hostility" />
-					</value>
-				</li>
-
-				<!--VFEM_Troopship-->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/WorldObjectDef[defName="VFEM_Troopship"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/WorldObjectDef[defName="VFEM_Troopship"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/WorldObjectDef[defName="VFEM_Troopship"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.WorldObjects.WorldObjectCompProperties_Health">
-							<healthModifier>5.2</healthModifier>
-							<techLevelNoImpact>true</techLevelNoImpact>
-							<chanceToNegateDamage>0.45</chanceToNegateDamage>
-						</li>
-						<li Class="CombatExtended.WorldObjects.WorldObjectCompProperties_Hostility" />
-					</value>
-				</li>
-
-				<!--VFEM_Carrier-->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/WorldObjectDef[defName="VFEM_Carrier"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/WorldObjectDef[defName="VFEM_Carrier"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/WorldObjectDef[defName="VFEM_Carrier"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.WorldObjects.WorldObjectCompProperties_Health">
-							<healthModifier>6.0</healthModifier>
-							<techLevelNoImpact>true</techLevelNoImpact>
-							<chanceToNegateDamage>0.75</chanceToNegateDamage>
-						</li>
-						<li Class="CombatExtended.WorldObjects.WorldObjectCompProperties_Hostility" />
-					</value>
-				</li>
-			</operations>
-
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Medieval/PawnKindDefs/VanillaMedieval_PawnKinds.xml b/Patches/Vanilla Factions Expanded - Medieval/PawnKindDefs/VanillaMedieval_PawnKinds.xml
deleted file mode 100644
index ba44a4fba0..0000000000
--- a/Patches/Vanilla Factions Expanded - Medieval/PawnKindDefs/VanillaMedieval_PawnKinds.xml	
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Medieval</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Add Combat Extended Shields to pawns. =========== -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/PawnKindDef[defName="VFEM_Medieval_Footsoldier" or defName="VFEM_Medieval_Knight"]/modExtensions/li[@Class="VFECore.PawnKindDefExtension"]/shieldMoney</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/PawnKindDef[defName="VFEM_Medieval_Footsoldier" or defName="VFEM_Medieval_Knight"]/modExtensions/li[@Class="VFECore.PawnKindDefExtension"]/shieldTags</xpath>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="VFEM_Medieval_Footsoldier"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>100</min>
-								<max>350</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>KiteShield</li>
-								<li>HeaterShield</li>
-							</shieldTags>
-							<shieldChance>0.6</shieldChance>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="VFEM_Medieval_Knight"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>200</min>
-								<max>600</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>HeaterShield</li>
-								<li>KiteShield</li>
-							</shieldTags>
-							<shieldChance>0.8</shieldChance>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Give ammo to archer ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="VFEM_Medieval_Bowman"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>14</min>
-								<max>26</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>120</min>
-									<max>250</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>NeolithicMeleeBasic</li>
-									<li>MedievalMeleeDecent</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[defName="VFEM_Medieval_Bowman"]</xpath>
-					<value>
-						<apparelRequired>
-							<li>CE_Apparel_TribalBackpack</li>
-						</apparelRequired>
-					</value>
-				</li>
-
-				<!-- ========== Tweak Squire weapon money. =========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="VFEM_Medieval_Squire"]/weaponMoney/min</xpath>
-					<value>
-						<min>120</min>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Apparel.xml b/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Apparel.xml
deleted file mode 100644
index 68b5eefd24..0000000000
--- a/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Apparel.xml	
+++ /dev/null
@@ -1,254 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Medieval</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Light Helmet =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEM_Apparel_PlateHelmetLight"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEM_Apparel_PlateHelmetLight"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.0</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFEM_Apparel_PlateHelmetLight"]/equippedStatOffsets</xpath>
-				</li>
-
-				<!-- ========== Heavy Helmet =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEM_Apparel_PlateHelmetHeavy"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEM_Apparel_PlateHelmetHeavy"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEM_Apparel_PlateHelmetHeavy"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>-0.5</AimingAccuracy>
-							<MeleeHitChance>-2.5</MeleeHitChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFEM_Apparel_PlateHelmetHeavy"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Jester Hat / Kings Crown / Plague Mask =========== -->
-				<li Class="PatchOperationRemove">
-					<xpath>
-						Defs/ThingDef[defName="VFEM_Apparel_KingsCrown" or defName="VFEM_Apparel_PlagueMask"]/statBases/ArmorRating_Sharp |
-						Defs/ThingDef[defName="VFEM_Apparel_KingsCrown" or defName="VFEM_Apparel_PlagueMask"]/statBases/ArmorRating_Blunt
-					</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEM_Apparel_JesterHat" or defName="VFEM_Apparel_KingsCrown" or defName="VFEM_Apparel_PlagueMask" or defName="VFEM_Apparel_DameHat"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEM_Apparel_JesterHat" or defName="VFEM_Apparel_KingsCrown" or defName="VFEM_Apparel_PlagueMask" or defName="VFEM_Apparel_DameHat"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEM_Apparel_PlagueMask"]</xpath>
-					<value>
-						<costStuffCount>25</costStuffCount>
-						<stuffCategories>
-							<li>Leathery</li>
-						</stuffCategories>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEM_Apparel_PlagueMask"]/apparel/layers/li[.="Overhead"]</xpath>
-					<value>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!-- ========== Heavy Plate Armor =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEM_Apparel_PlateArmorHeavy"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>12</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEM_Apparel_PlateArmorHeavy"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFEM_Apparel_PlateArmorHeavy"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEM_Apparel_PlateArmorHeavy"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>-0.2</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEM_Apparel_PlateArmorHeavy"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFEM_Apparel_PlateArmorHeavy"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Tabard =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEM_Apparel_Tabard"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEM_Apparel_Tabard"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== Jester Outfit / Dame Dress =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEM_Apparel_JesterOutfit" or defName="VFEM_Apparel_DameDress"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEM_Apparel_JesterOutfit" or defName="VFEM_Apparel_DameDress"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- ========== King's Robes =========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEM_Apparel_KingsRobes"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEM_Apparel_KingsRobes"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Items.xml b/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Items.xml
deleted file mode 100644
index c2ed90be83..0000000000
--- a/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Items.xml	
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Medieval</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEM_RawGrapes"]/statBases</xpath>
-					<value>
-						<Bulk>0.014</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEM_Wine"]/statBases</xpath>
-					<value>
-						<Bulk>1.5</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEM_Wine"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2.22</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>neck</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>3.33</cooldownTime>
-								<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Neck</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ 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
deleted file mode 100644
index f89d3b8d4f..0000000000
--- a/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Ranged.xml	
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Medieval</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Ammo === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_HeavyCrossbowBolt</defName>
-							<label>crossbow bolts</label>
-							<ammoTypes>
-								<Ammo_CrossbowBolt_Stone>Projectile_HeavyCrossbowBolt_Stone</Ammo_CrossbowBolt_Stone>
-								<Ammo_CrossbowBolt_Steel>Projectile_HeavyCrossbowBolt_Steel</Ammo_CrossbowBolt_Steel>
-								<Ammo_CrossbowBolt_Plasteel>Projectile_HeavyCrossbowBolt_Plasteel</Ammo_CrossbowBolt_Plasteel>
-								<Ammo_CrossbowBolt_Venom>Projectile_HeavyCrossbowBolt_Venom</Ammo_CrossbowBolt_Venom>
-								<Ammo_CrossbowBolt_Flame>Projectile_HeavyCrossbowBolt_Flame</Ammo_CrossbowBolt_Flame>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef ParentName="BaseCrossbowBoltProjectile">
-							<defName>Projectile_HeavyCrossbowBolt_Stone</defName>
-							<label>crossbow bolt (stone)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Stone</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>8</damageAmountBase>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.85</armorPenetrationSharp>
-								<preExplosionSpawnChance>0.1</preExplosionSpawnChance><!-- 11.11 bolts per resource -->
-								<preExplosionSpawnThingDef>Ammo_CrossbowBolt_Stone</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseCrossbowBoltProjectile">
-							<defName>Projectile_HeavyCrossbowBolt_Steel</defName>
-							<label>crossbow bolt (steel)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Steel</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationBlunt>6.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.85</armorPenetrationSharp>
-								<speed>30</speed>
-								<preExplosionSpawnChance>0.333</preExplosionSpawnChance><!-- 14.99 bolts per resource -->
-								<preExplosionSpawnThingDef>Ammo_CrossbowBolt_Steel</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseCrossbowBoltProjectile">
-							<defName>Projectile_HeavyCrossbowBolt_Plasteel</defName>
-							<label>crossbow bolt (plasteel)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Plasteel</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>10</damageAmountBase>
-								<armorPenetrationBlunt>8.12</armorPenetrationBlunt>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<speed>32</speed>
-								<preExplosionSpawnChance>0.6</preExplosionSpawnChance><!-- 25 bolts per resource -->
-								<preExplosionSpawnThingDef>Ammo_CrossbowBolt_Plasteel</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseCrossbowBoltProjectile">
-							<defName>Projectile_HeavyCrossbowBolt_Venom</defName>
-							<label>crossbow bolt (venom)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Venom</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>ArrowVenom</damageDef>
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationBlunt>6.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-								<speed>30</speed>
-								<preExplosionSpawnChance>0.6</preExplosionSpawnChance><!-- 25 arrows per resource -->
-								<preExplosionSpawnThingDef>Ammo_CrossbowBolt_Steel</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseCrossbowBoltProjectile">
-							<defName>Projectile_HeavyCrossbowBolt_Flame</defName>
-							<label>crossbow bolt (flame)</label>
-							<graphicData>
-								<texPath>Things/Projectile/Arrows/Arrow_Flame</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Flame</damageDef>
-								<damageAmountBase>5</damageAmountBase>
-								<armorPenetrationBlunt>3.28</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<speed>30</speed>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEM_Bow_HeavyCrossbow"]/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>
-
-				<!-- === Heavy Crossbow === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFEM_Bow_HeavyCrossbow</defName>
-					<statBases>
-						<Bulk>6</Bulk>
-						<SwayFactor>1.0</SwayFactor>
-						<ShotSpread>0.5</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>60</WoodLog>
-						<Steel>25</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Projectile_HeavyCrossbowBolt_Steel</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>34</range>
-						<soundCast>Bow_Large</soundCast>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>8</reloadTime>
-						<ammoSet>AmmoSet_HeavyCrossbowBolt</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>NeolithicRangedHeavy</li>
-						<li>NeolithicRangedChief</li>
-						<li>CE_Bow</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Shields.xml b/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Shields.xml
deleted file mode 100644
index 22c3f3be8c..0000000000
--- a/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Shields.xml	
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Medieval</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Kite Shield -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEM_Shield_Kite"]</xpath>
-					<value>
-						<ThingDef ParentName="ShieldBase">
-							<defName>VFEM_Shield_Kite</defName>
-							<label>kite shield</label>
-							<description>A large wooden shield, with the front decoratively covered by leather. Offers a moderate amount of protection against melee and ranged attacks.</description>
-							<techLevel>Medieval</techLevel>
-							<graphicData>
-								<texPath>Things/Item/Equipment/Shield/KiteShield/KiteShield</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>0.88</drawSize>
-							</graphicData>
-							<thingCategories Inherit="False">
-								<li>Shields</li>
-							</thingCategories>
-							<costStuffCount>25</costStuffCount>
-							<costList>
-								<WoodLog>70</WoodLog>
-							</costList>
-							<stuffCategories>
-								<li>Leathery</li>
-							</stuffCategories>
-							<recipeMaker>
-								<researchPrerequisite>Smithing</researchPrerequisite>
-								<recipeUsers>
-									<li>FueledSmithy</li>
-									<li>ElectricSmithy</li>
-								</recipeUsers>
-							</recipeMaker>
-							<statBases>
-								<WorkToMake>3000</WorkToMake>
-								<MaxHitPoints>145</MaxHitPoints>
-								<ArmorRating_Blunt>3.5</ArmorRating_Blunt>
-								<ArmorRating_Sharp>2.2</ArmorRating_Sharp>
-								<Mass>7.5</Mass>
-								<Bulk>8</Bulk>
-								<WornBulk>5</WornBulk>
-							</statBases>
-							<equippedStatOffsets>
-								<ReloadSpeed>-0.1</ReloadSpeed>
-								<MeleeHitChance>-1</MeleeHitChance>
-								<ShootingAccuracyPawn>-0.2</ShootingAccuracyPawn>
-								<AimingAccuracy>-0.05</AimingAccuracy>
-								<Suppressability>-0.25</Suppressability>
-								<MeleeCritChance>-0.08</MeleeCritChance>
-								<MeleeParryChance>1.0</MeleeParryChance>
-							</equippedStatOffsets>
-							<apparel>
-								<tags>
-									<li>KiteShield</li>
-								</tags>
-							</apparel>
-							<comps>
-								<li>
-									<compClass>CompColorable</compClass>
-								</li>
-							</comps>
-							<modExtensions>
-								<li Class="CombatExtended.ShieldDefExtension">
-									<shieldCoverage>
-										<li>Hands</li>
-										<li>Arms</li>
-										<li>Shoulders</li>
-										<li>Torso</li>
-										<li>Neck</li>
-										<li>Legs</li>
-									</shieldCoverage>
-									<drawAsTall>false</drawAsTall>
-								</li>
-								<li Class="VFECore.ThingDefExtension">
-									<useFactionColourForPawnKinds>
-										<li>VFEM_Medieval_Footsoldier</li>
-										<li>VFEM_Medieval_Knight</li>
-										<li>VFEM_Medieval_Lord</li>
-									</useFactionColourForPawnKinds>
-								</li>
-							</modExtensions>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- Heater Shield -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEM_Shield_Heater"]</xpath>
-					<value>
-						<ThingDef ParentName="ShieldBase">
-							<defName>VFEM_Shield_Heater</defName>
-							<label>heater shield</label>
-							<description>A heavy medium-sized steel shield, with the front decoratively covered by leather. Offers a significant amount of protection against melee and ranged attacks.</description>
-							<techLevel>Medieval</techLevel>
-							<graphicData>
-								<texPath>Things/Item/Equipment/Shield/HeaterShield/HeaterShield</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>0.88</drawSize>
-							</graphicData>
-							<costStuffCount>20</costStuffCount>
-							<costList>
-								<Steel>80</Steel>
-							</costList>
-							<stuffCategories>
-								<li>Leathery</li>
-							</stuffCategories>
-							<thingCategories Inherit="False">
-								<li>Shields</li>
-							</thingCategories>
-							<recipeMaker>
-								<researchPrerequisite>Smithing</researchPrerequisite>
-								<recipeUsers>
-									<li>FueledSmithy</li>
-									<li>ElectricSmithy</li>
-								</recipeUsers>
-							</recipeMaker>
-							<statBases>
-								<WorkToMake>8000</WorkToMake>
-								<MaxHitPoints>145</MaxHitPoints>
-								<ArmorRating_Blunt>4.5</ArmorRating_Blunt>
-								<ArmorRating_Sharp>3</ArmorRating_Sharp>
-								<Mass>8</Mass>
-								<Bulk>9</Bulk>
-								<WornBulk>6</WornBulk>
-							</statBases>
-							<equippedStatOffsets>
-								<ReloadSpeed>-0.1</ReloadSpeed>
-								<MeleeHitChance>-1</MeleeHitChance>
-								<ShootingAccuracyPawn>-0.2</ShootingAccuracyPawn>
-								<AimingAccuracy>-0.05</AimingAccuracy>
-								<Suppressability>-0.25</Suppressability>
-								<MeleeCritChance>-0.08</MeleeCritChance>
-								<MeleeParryChance>1.0</MeleeParryChance>
-							</equippedStatOffsets>
-							<apparel>
-								<tags>
-									<li>HeaterShield</li>
-								</tags>
-							</apparel>
-							<comps>
-								<li>
-									<compClass>CompColorable</compClass>
-								</li>
-							</comps>
-							<modExtensions>
-								<li Class="CombatExtended.ShieldDefExtension">
-									<shieldCoverage>
-										<li>Hands</li>
-										<li>Arms</li>
-										<li>Shoulders</li>
-										<li>Torso</li>
-									</shieldCoverage>
-									<drawAsTall>false</drawAsTall>
-								</li>
-								<li Class="VFECore.ThingDefExtension">
-									<useFactionColourForPawnKinds>
-										<li>VFEM_Medieval_Footsoldier</li>
-										<li>VFEM_Medieval_Knight</li>
-										<li>VFEM_Medieval_Lord</li>
-									</useFactionColourForPawnKinds>
-								</li>
-							</modExtensions>
-						</ThingDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Weapons.xml b/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Weapons.xml
deleted file mode 100644
index 1def87d1d0..0000000000
--- a/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Weapons.xml	
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Medieval</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Heavy Mace -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEM_MeleeWeapon_HeavyMace"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<chanceFactor>0.33</chanceFactor>
-								<cooldownTime>1.84</cooldownTime>
-								<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>3.51</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>9.375</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEM_MeleeWeapon_HeavyMace"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.5</MeleeCritChance>
-							<MeleeParryChance>0.4</MeleeParryChance>
-							<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEM_MeleeWeapon_HeavyMace"]/statBases</xpath>
-					<value>
-						<Bulk>4.5</Bulk>
-						<MeleeCounterParryBonus>.53</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEM_MeleeWeapon_HeavyMace"]/stuffCategories</xpath>
-					<value>
-						<stuffCategories>
-							<li>Steeled</li>
-						</stuffCategories>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Pirates Unofficial Addon Warcasket Melee Armory/VFE_P_UA_WMA_Weapons.xml b/Patches/Vanilla Factions Expanded - Pirates Unofficial Addon Warcasket Melee Armory/VFE_P_UA_WMA_Weapons.xml
deleted file mode 100644
index ddbf86bf1d..0000000000
--- a/Patches/Vanilla Factions Expanded - Pirates Unofficial Addon Warcasket Melee Armory/VFE_P_UA_WMA_Weapons.xml	
+++ /dev/null
@@ -1,698 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>VFE Pirates unofficial add-on: Warcasket Melee Armory Continued</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				
-				<!-- Spear -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_Spear"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>16</power>
-								<chanceFactor>0.1</chanceFactor>
-								<cooldownTime>2.1</cooldownTime>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>65</power>
-								<cooldownTime>2.4</cooldownTime>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_Spear"]/statBases</xpath>
-					<value>
-						<Bulk>18</Bulk>
-						<MeleeCounterParryBonus>1.75</MeleeCounterParryBonus>
-						<ToughnessRating>10</ToughnessRating>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_Spear"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.75</MeleeCritChance>
-							<MeleeParryChance>1.25</MeleeParryChance>
-							<MeleeDodgeChance>0.8</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				
-				<!-- Axe -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_Axe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>12</power>
-								<chanceFactor>0.1</chanceFactor>
-								<cooldownTime>2.5</cooldownTime>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>60</power>
-								<cooldownTime>5</cooldownTime>
-								<armorPenetrationBlunt>32</armorPenetrationBlunt>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_Axe"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<MeleeCounterParryBonus>0.1</MeleeCounterParryBonus>
-						<ToughnessRating>10</ToughnessRating>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_Axe"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>0.1</MeleeParryChance>
-							<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				
-				<!-- Baton -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_Baton"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>6</power>
-								<chanceFactor>0.1</chanceFactor>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>24</power>
-								<extraMeleeDamages>
-									<li>
-										<def>EMP</def>
-										<amount>12</amount>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>4.5</cooldownTime>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_Baton"]/statBases</xpath>
-					<value>
-						<Bulk>14</Bulk>
-						<MeleeCounterParryBonus>0.2</MeleeCounterParryBonus>
-						<ToughnessRating>10</ToughnessRating>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_Baton"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.75</MeleeCritChance>
-							<MeleeParryChance>0.25</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				
-				<!-- Knuckle -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_Knuckle"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>22</power>
-								<extraMeleeDamages>
-									<li>
-										<def>EMP</def>
-										<amount>4</amount>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_Knuckle"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-						<ToughnessRating>10</ToughnessRating>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_Knuckle"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.25</MeleeCritChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				
-				<!-- Glaive -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_Glaive"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>80</power>
-								<cooldownTime>3.8</cooldownTime>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>65</power>
-								<cooldownTime>2.4</cooldownTime>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_Glaive"]/statBases</xpath>
-					<value>
-						<Bulk>18</Bulk>
-						<MeleeCounterParryBonus>1.75</MeleeCounterParryBonus>
-						<ToughnessRating>10</ToughnessRating>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_Glaive"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.75</MeleeCritChance>
-							<MeleeParryChance>1.25</MeleeParryChance>
-							<MeleeDodgeChance>0.8</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				
-				<!-- Hammer -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_Hammer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<chanceFactor>0.1</chanceFactor>
-								<cooldownTime>2.11</cooldownTime>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Demolish</li>
-								</capacities>
-								<power>50</power>
-								<cooldownTime>5.73</cooldownTime>
-								<armorPenetrationBlunt>200</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_Hammer"]/statBases</xpath>
-					<value>
-						<Bulk>24</Bulk>
-						<MeleeCounterParryBonus>1.5</MeleeCounterParryBonus>
-						<ToughnessRating>10</ToughnessRating>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_Hammer"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.8</MeleeCritChance>
-							<MeleeParryChance>0.1</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				
-				<!-- Kinetic Gauntlet -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_KineticGauntlet"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>48</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>120</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_KineticGauntlet"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-						<ToughnessRating>20</ToughnessRating>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_KineticGauntlet"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.5</MeleeCritChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				
-				<!-- Monospear -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_MonoSpear"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>16</power>
-								<chanceFactor>0.1</chanceFactor>
-								<cooldownTime>2.1</cooldownTime>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>70</power>
-								<cooldownTime>2.4</cooldownTime>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<armorPenetrationSharp>28</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_MonoSpear"]/statBases</xpath>
-					<value>
-						<Bulk>18</Bulk>
-						<MeleeCounterParryBonus>1.75</MeleeCounterParryBonus>
-						<ToughnessRating>20</ToughnessRating>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_MonoSpear"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.25</MeleeCritChance>
-							<MeleeParryChance>1.25</MeleeParryChance>
-							<MeleeDodgeChance>0.8</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				
-				<!-- Monoknife -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_MonoKnife"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.75</cooldownTime>
-								<armorPenetrationBlunt>16</armorPenetrationBlunt>
-								<armorPenetrationSharp>22</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>60</power>
-								<cooldownTime>2.4</cooldownTime>
-								<armorPenetrationBlunt>14</armorPenetrationBlunt>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_MonoKnife"]/statBases</xpath>
-					<value>
-						<Bulk>7</Bulk>
-						<MeleeCounterParryBonus>0.3</MeleeCounterParryBonus>
-						<ToughnessRating>10</ToughnessRating>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_MonoKnife"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1</MeleeCritChance>
-							<MeleeParryChance>0.75</MeleeParryChance>
-							<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				
-				<!-- Plasma Glaive -->
-				<li Class="PatchOperationReplace" MayRequire="OskarPotocki.VFE.Insectoid">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_PlasmaGlaive"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>85</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Flame</def>
-										<amount>35</amount>
-										<chance>0.45</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>4.25</cooldownTime>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-								<armorPenetrationSharp>34</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>30</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Flame</def>
-										<amount>25</amount>
-										<chance>0.45</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>2.4</cooldownTime>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd" MayRequire="OskarPotocki.VFE.Insectoid">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_PlasmaGlaive"]/statBases</xpath>
-					<value>
-						<Bulk>20</Bulk>
-						<MeleeCounterParryBonus>1.75</MeleeCounterParryBonus>
-						<ToughnessRating>25</ToughnessRating>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd" MayRequire="OskarPotocki.VFE.Insectoid">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_PlasmaGlaive"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.25</MeleeCritChance>
-							<MeleeParryChance>1.25</MeleeParryChance>
-							<MeleeDodgeChance>0.8</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-				
-				<!-- Mechanoid Hammer -->
-				<li Class="PatchOperationReplace" MayRequire="OskarPotocki.VFE.Mechanoid">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_MechaHammer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>15</power>
-								<chanceFactor>0.1</chanceFactor>
-								<cooldownTime>2.11</cooldownTime>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Demolish</li>
-								</capacities>
-								<power>65</power>
-								<cooldownTime>5.73</cooldownTime>
-								<armorPenetrationBlunt>320</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd" MayRequire="OskarPotocki.VFE.Mechanoid">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_MechaHammer"]/statBases</xpath>
-					<value>
-						<Bulk>24</Bulk>
-						<MeleeCounterParryBonus>2</MeleeCounterParryBonus>
-						<ToughnessRating>20</ToughnessRating>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd" MayRequire="OskarPotocki.VFE.Mechanoid">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_MechaHammer"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.8</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-					</value>
-				</li>
-				
-				<!-- Mechanoid Gauntlet -->
-				<li Class="PatchOperationReplace" MayRequire="OskarPotocki.VFE.Mechanoid">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_MechaGauntlet"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>24</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd" MayRequire="OskarPotocki.VFE.Mechanoid">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_MechaGauntlet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-						<ToughnessRating>15</ToughnessRating>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd" MayRequire="OskarPotocki.VFE.Mechanoid">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_MechaGauntlet"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.5</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-					</value>
-				</li>
-				
-				<!-- Mechanoid Baton -->
-				<li Class="PatchOperationReplace" MayRequire="OskarPotocki.VFE.Mechanoid">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_MechaBaton"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power></power>
-								<chanceFactor>0.1</chanceFactor>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>4.5</cooldownTime>
-								<armorPenetrationBlunt>16</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd" MayRequire="OskarPotocki.VFE.Mechanoid">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_MechaBaton"]/statBases</xpath>
-					<value>
-						<Bulk>14</Bulk>
-						<MeleeCounterParryBonus>0.2</MeleeCounterParryBonus>
-						<ToughnessRating>15</ToughnessRating>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd" MayRequire="OskarPotocki.VFE.Mechanoid">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_MechaBaton"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.75</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-					</value>
-				</li>
-				
-				<!-- Crypto Axe -->
-				<li Class="PatchOperationReplace" MayRequire="OskarPotocki.VFE.Vikings">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_CryptoAxe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>12</power>
-								<chanceFactor>0.1</chanceFactor>
-								<cooldownTime>2.5</cooldownTime>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>VFEV_Cut</li>
-								</capacities>
-								<power>50</power>
-								<cooldownTime>4.5</cooldownTime>
-								<armorPenetrationBlunt>38</armorPenetrationBlunt>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd" MayRequire="OskarPotocki.VFE.Vikings">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_CryptoAxe"]/statBases</xpath>
-					<value>
-						<Bulk>17</Bulk>
-						<MeleeCounterParryBonus>0.1</MeleeCounterParryBonus>
-						<ToughnessRating>20</ToughnessRating>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd" MayRequire="OskarPotocki.VFE.Vikings">
-					<xpath>Defs/ThingDef[defName="VFEPUA_WarcasketMeleeWeapon_CryptoAxe"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.4</MeleeCritChance>
-							<MeleeParryChance>0.2</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Pirates/AbilityDefs/Abilities.xml b/Patches/Vanilla Factions Expanded - Pirates/AbilityDefs/Abilities.xml
deleted file mode 100644
index c728fa3990..0000000000
--- a/Patches/Vanilla Factions Expanded - Pirates/AbilityDefs/Abilities.xml	
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Pirates</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Firing Frenzy -->
-
-				<li Class="PatchOperationReplace" MayRequire="Ludeon.RimWorld.Ideology">
-					<xpath>Defs/AbilityDef[@Name="VFEP_RoleAuraBuffBase"]/verbProperties/range</xpath>
-					<value>
-						<range>14.9</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace" MayRequire="Ludeon.RimWorld.Ideology">
-					<xpath>Defs/AbilityDef[@Name="VFEP_RoleAuraBuffBase"]/statBases/Ability_EffectRadius</xpath>
-					<value>
-						<Ability_EffectRadius>14.9</Ability_EffectRadius>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Pirates/Ammo/SlughthrowerShell.xml b/Patches/Vanilla Factions Expanded - Pirates/Ammo/SlughthrowerShell.xml
deleted file mode 100644
index e394a11947..0000000000
--- a/Patches/Vanilla Factions Expanded - Pirates/Ammo/SlughthrowerShell.xml	
+++ /dev/null
@@ -1,323 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Pirates</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingCategoryDef>
-							<defName>AmmoSlugthrowerShell</defName>
-							<label>Slugthrower shell</label>
-							<parent>AmmoShotguns</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberShotgun</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_SlugthrowerShell</defName>
-							<label>Slugthrower shell</label>
-							<ammoTypes>
-								<Ammo_Slugthrower_Buck>Bullet_Slugthrower_Buck</Ammo_Slugthrower_Buck>
-								<Ammo_Slugthrower_Slug>Bullet_Slugthrower_Slug</Ammo_Slugthrower_Slug>
-								<Ammo_Slugthrower_Beanbag>Bullet_Slugthrower_Beanbag</Ammo_Slugthrower_Beanbag>
-								<Ammo_Slugthrower_ElectroSlug>Bullet_Slugthrower_ElectroSlug</Ammo_Slugthrower_ElectroSlug>
-							</ammoTypes>
-							<similarTo>AmmoSet_Shotgun</similarTo>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="SlugthrowerShellBase" ParentName="AmmoBase" Abstract="True">
-							<description>Large 40mm shotgun shells designed to be fired by the warcasket slugthrower shotgun.</description>
-							<statBases>
-								<Mass>0.17</Mass>
-								<Bulk>0.38</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoSlugthrowerShell</li>
-							</thingCategories>
-							<stackLimit>500</stackLimit>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SlugthrowerShellBase">
-							<defName>Ammo_Slugthrower_Buck</defName>
-							<label>Slugthrower shell (Buck)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Shotgun/Shot</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.64</MarketValue>
-							</statBases>
-							<ammoClass>BuckShot</ammoClass>
-							<cookOffProjectile>Bullet_Slugthrower_Buck</cookOffProjectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SlugthrowerShellBase">
-							<defName>Ammo_Slugthrower_Slug</defName>
-							<label>Slugthrower shell (Slug)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Shotgun/Slug</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.6</MarketValue>
-								<Mass>0.16</Mass>
-							</statBases>
-							<ammoClass>Slug</ammoClass>
-							<cookOffProjectile>Bullet_Slugthrower_Slug</cookOffProjectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SlugthrowerShellBase">
-							<defName>Ammo_Slugthrower_Beanbag</defName>
-							<label>Slugthrower shell (Bean)</label>
-							<generateAllowChance>0</generateAllowChance>
-							<graphicData>
-								<texPath>Things/Ammo/Shotgun/Beanbag</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>1.05</MarketValue>
-								<Mass>0.205</Mass>
-							</statBases>
-							<ammoClass>Beanbag</ammoClass>
-							<cookOffProjectile>Bullet_Slugthrower_Beanbag</cookOffProjectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SlugthrowerShellBase">
-							<defName>Ammo_Slugthrower_ElectroSlug</defName>
-							<label>Slugthrower shell (EMP)</label>
-							<graphicData>
-								<texPath>Things/Ammo/Shotgun/EMP</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<Mass>0.186</Mass>
-								<MarketValue>4.62</MarketValue>
-							</statBases>
-							<ammoClass>ElectroSlug</ammoClass>
-							<generateAllowChance>0.5</generateAllowChance>
-							<cookOffProjectile>Bullet_Slugthrower_ElectroSlug</cookOffProjectile>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef Name="BaseSlugthrowerBullet" ParentName="BaseBulletCE" Abstract="true">
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<speed>106</speed>
-								<dropsCasings>true</dropsCasings>
-								<casingMoteDefname>Fleck_ShotgunShell</casingMoteDefname>
-								<casingFilthDefname>Filth_ShotgunAmmoCasings</casingFilthDefname>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseSlugthrowerBullet">
-							<defName>Bullet_Slugthrower_Buck</defName>
-							<label>buckshot pellet</label>
-							<graphicData>
-								<texPath>Things/Projectile/Shotgun_Pellet</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>27</damageAmountBase>
-								<pelletCount>4</pelletCount>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<armorPenetrationBlunt>75</armorPenetrationBlunt>
-								<spreadMult>7.9</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseSlugthrowerBullet">
-							<defName>Bullet_Slugthrower_Slug</defName>
-							<label>shotgun slug</label>
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_big</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>146</speed>
-								<damageAmountBase>74</damageAmountBase>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>638.7</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseSlugthrowerBullet">
-							<defName>Bullet_Slugthrower_Beanbag</defName>
-							<label>beanbag</label>
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_big</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>30</speed>
-								<damageDef>Beanbag</damageDef>
-								<damageAmountBase>19</damageAmountBase>
-								<armorPenetrationBlunt>12.56</armorPenetrationBlunt>
-								<spreadMult>2</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseSlugthrowerBullet">
-							<defName>Bullet_Slugthrower_ElectroSlug</defName>
-							<label>EMP slug</label>
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_big</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>EMP</damageDef>
-								<damageAmountBase>40</damageAmountBase>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>0</armorPenetrationBlunt>
-								<empShieldBreakChance>0.75</empShieldBreakChance>
-								<speed>60</speed>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_Slugthrower_Buck</defName>
-							<label>make Slugthrower (Buck) shell x100</label>
-							<description>Craft 100 Slugthrower (Buck) shells.</description>
-							<jobString>Making Slugthrower (Buck) shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>34</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Slugthrower_Buck>100</Ammo_Slugthrower_Buck>
-							</products>
-							<workAmount>3400</workAmount>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_Slugthrower_Slug</defName>
-							<label>make Slugthrower (Slug) shell x100</label>
-							<description>Craft 100 Slugthrower (Slug) shells.</description>
-							<jobString>Making Slugthrower (Slug) shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>32</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Slugthrower_Slug>100</Ammo_Slugthrower_Slug>
-							</products>
-							<workAmount>3200</workAmount>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_Slugthrower_Beanbag</defName>
-							<label>make Slugthrower (Beanbag) shell x100</label>
-							<description>Craft 100 Slugthrower (Beanbag) shells.</description>
-							<jobString>Making Slugthrower (Beanbag) shells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>42</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Cloth</li>
-										</thingDefs>
-									</filter>
-									<count>17</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Cloth</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Slugthrower_Beanbag>100</Ammo_Slugthrower_Beanbag>
-							</products>
-							<workAmount>5900</workAmount>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_Slugthrower_ElectroSlug</defName>
-							<label>make Slugthrower (EMP) shell x100</label>
-							<description>Craft 100 Slugthrower (EMP) shells.</description>
-							<jobString>Making Slugthrower (EMP) shells.</jobString>
-							<researchPrerequisite>MicroelectronicsBasics</researchPrerequisite>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>38</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>12</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Slugthrower_ElectroSlug>100</Ammo_Slugthrower_ElectroSlug>
-							</products>
-							<workAmount>11000</workAmount>
-						</RecipeDef>
-
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Pirates/Drugs/Drug_Bases.xml b/Patches/Vanilla Factions Expanded - Pirates/Drugs/Drug_Bases.xml
deleted file mode 100644
index 67f7d1b773..0000000000
--- a/Patches/Vanilla Factions Expanded - Pirates/Drugs/Drug_Bases.xml	
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Pirates</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Bulk === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEP_Rum"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-					</value>
-				</li>
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="VFEP_DrugToolBase"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2.22</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>neck</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>3.33</cooldownTime>
-								<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Neck</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Pirates/Misc/Hediffs_Casts.xml b/Patches/Vanilla Factions Expanded - Pirates/Misc/Hediffs_Casts.xml
deleted file mode 100644
index 1f3a3dcf0d..0000000000
--- a/Patches/Vanilla Factions Expanded - Pirates/Misc/Hediffs_Casts.xml	
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Pirates</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Firing Frenzy -->
-
-				<li Class="PatchOperationReplace" MayRequire="Ludeon.RimWorld.Ideology">
-					<xpath>Defs/HediffDef[defName="VFEP_FiringFrenzy"]/comps/li[@Class="HediffCompProperties_GiveHediffsInRange"]/range</xpath>
-					<value>
-						<range>14.9</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace" MayRequire="Ludeon.RimWorld.Ideology">
-					<xpath>Defs/HediffDef[defName="VFEP_FiringFrenzyBuff"]/stages/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<Suppressability>-0.25</Suppressability>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd" MayRequire="Ludeon.RimWorld.Ideology">
-					<xpath>Defs/HediffDef[defName="VFEP_FiringFrenzyBuff"]/stages/li</xpath>
-					<value>
-						<statFactors>
-							<ReloadSpeed>1.20</ReloadSpeed>
-						</statFactors>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Pirates/Misc/Precepts_Role.xml b/Patches/Vanilla Factions Expanded - Pirates/Misc/Precepts_Role.xml
deleted file mode 100644
index 837073b3ff..0000000000
--- a/Patches/Vanilla Factions Expanded - Pirates/Misc/Precepts_Role.xml	
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Pirates</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Pirate Captain -->
-
-				<li Class="PatchOperationReplace" MayRequire="Ludeon.RimWorld.Ideology">
-					<xpath>Defs/PreceptDef[defName="VFEP_IdeoRole_Captain"]/roleEffects/li[./statDef="ShootingAccuracyPawn"]/modifier</xpath>
-					<value>
-						<modifier>3</modifier>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace" MayRequire="Ludeon.RimWorld.Ideology">
-					<xpath>Defs/PreceptDef[defName="VFEP_IdeoRole_Captain"]/roleEffects/li[./statDef="AimingDelayFactor"]</xpath>
-					<value>
-						<li Class="RoleEffect_PawnStatOffset">
-							<statDef>ReloadSpeed</statDef>
-							<modifier>0.15</modifier>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Pirates/PawnKindDefs/PawnKinds_Junkers.xml b/Patches/Vanilla Factions Expanded - Pirates/PawnKindDefs/PawnKinds_Junkers.xml
deleted file mode 100644
index 7c281ec06c..0000000000
--- a/Patches/Vanilla Factions Expanded - Pirates/PawnKindDefs/PawnKinds_Junkers.xml	
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Pirates</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Scrapper === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="VFEP_Scrapper"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Pyro === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="VFEP_Pyro"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Pyro, Hussar === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="VFEP_Footsoldier" or defName="VFEP_Veteran"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>7</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Heavy Weapons Platform, Artillery === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="VFEP_HeavyWeaponsPlatform" or defName="VFEP_Artillery"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Heavy Weapons Platform, Artillery === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="VFEP_HeavyWeaponsPlatform" or defName="VFEP_Artillery"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Pirates/PawnKindDefs/PawnKinds_Mercenaries.xml b/Patches/Vanilla Factions Expanded - Pirates/PawnKindDefs/PawnKinds_Mercenaries.xml
deleted file mode 100644
index 8728e6120d..0000000000
--- a/Patches/Vanilla Factions Expanded - Pirates/PawnKindDefs/PawnKinds_Mercenaries.xml	
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Pirates</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Private === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="VFEP_Private"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>4</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Corporal, Sergeant, Sergeant Major, Lieutenant, Captain  === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="VFEP_Corporal" or defName="VFEP_Sergeant" or defName="VFEP_SergeantMajor" or defName="VFEP_Lieutenant" or defName="VFEP_Captain"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>5</min>
-								<max>7</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.50</generateChance>
-									<sidearmMoney>
-										<min>125</min>
-										<max>215</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>MedievalMeleeDecent</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Major, General === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="VFEP_Major" or defName="VFEP_General"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- === combatPower Patches === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="VFEP_Major"]/combatPower</xpath>
-					<value>
-						<combatPower>500</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="VFEP_General"]/combatPower</xpath>
-					<value>
-						<combatPower>550</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[@Name="VFEP_MercenariesBase"]/skills</xpath>
-					<value>
-						<skills>
-							<li>
-								<skill>Shooting</skill>
-								<range>6~18</range>
-							</li>
-							<li>
-								<skill>Melee</skill>
-								<range>6~16</range>
-							</li>
-						</skills>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Pirates/Scenario/Scenario.xml b/Patches/Vanilla Factions Expanded - Pirates/Scenario/Scenario.xml
deleted file mode 100644
index c2dbe44826..0000000000
--- a/Patches/Vanilla Factions Expanded - Pirates/Scenario/Scenario.xml	
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Pirates</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="VFEP_LowOrbitCrash"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_45ACP_FMJ</thingDef>
-							<count>210</count>
-						</li>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_6x24mmCharged</thingDef>
-							<count>120</count>
-						</li>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_12x72mmCharged</thingDef>
-							<count>200</count>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/Ammo_Laser.xml b/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/Ammo_Laser.xml
deleted file mode 100644
index d563556bb1..0000000000
--- a/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/Ammo_Laser.xml	
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Pirates</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Weapons Expanded - Laser</li>
-			</mods>
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs</xpath>
-						<value>
-
-							<!-- === Ammo Sets === -->
-
-							<CombatExtended.AmmoSetDef>
-								<defName>AmmoSet_SalvagedLaserEradicatorCE</defName>
-								<label>laser charge</label>
-								<ammoTypes>
-									<Ammo_LaserChargePack>Bullet_Laser_SalvagedLaserEradicatorCE</Ammo_LaserChargePack>
-								</ammoTypes>
-							</CombatExtended.AmmoSetDef>
-
-							<!-- === Projectiles === -->
-
-							<!--
-              Unstable shots do slightly higher damage, but have slightly less penetration, due to the beams being less focused, delivering the energy over a wider area.
-              Vice versa for stable shots, due to better made weaponry.
-            -->
-
-							<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletRed">
-								<defName>Bullet_Laser_SalvagedLaserEradicatorCE</defName>
-								<label>eradicator laser beam</label>
-								<projectile Class="CombatExtended.ProjectilePropertiesCE">
-									<damageDef>CE_Laser</damageDef>
-									<damageAmountBase>20</damageAmountBase>
-									<armorPenetrationSharp>15.5</armorPenetrationSharp>
-									<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-									<!-- The overall pressure exerted by a laser beam striking something is, unsuprisingly, negligable. -->
-								</projectile>
-								<comps>
-									<li Class="CombatExtended.CompProperties_ExplosiveCE">
-										<damageAmountBase>40</damageAmountBase>
-										<explosiveDamageType>Bomb</explosiveDamageType>
-										<explosiveRadius>3.5</explosiveRadius>
-										<explosionSound>MortarBomb_Explode</explosionSound>
-										<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-									</li>
-								</comps>
-							</ThingDef>
-
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/Ammo_Vikings.xml b/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/Ammo_Vikings.xml
deleted file mode 100644
index 396a76820e..0000000000
--- a/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/Ammo_Vikings.xml	
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Pirates</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Factions Expanded - Vikings</li>
-			</mods>
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs</xpath>
-						<value>
-
-							<!-- ==================== Ammo Categories ========================== -->
-							<!-- ==================== Thing Categories ========================== -->
-							<ThingCategoryDef>
-								<defName>AmmoCryptoCannon</defName>
-								<label>Crypto Fuel</label>
-								<parent>AmmoAdvanced</parent>
-								<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
-							</ThingCategoryDef>
-							<!-- ==================== AmmoSet ========================== -->
-
-							<CombatExtended.AmmoSetDef>
-								<defName>AmmoSet_CryptoCannon</defName>
-								<label>Crypto Cannon</label>
-								<ammoTypes>
-									<Ammo_CryptoCannon>Bullet_Flamethrower_CryptoCannon</Ammo_CryptoCannon>
-								</ammoTypes>
-							</CombatExtended.AmmoSetDef>
-							<!-- ==================== Ammo ========================== -->
-
-							<ThingDef Class="CombatExtended.AmmoDef" ParentName="CryptoAmmoBase">
-								<defName>Ammo_CryptoCannon</defName>
-								<label>Crypto Cannon Fuel</label>
-								<graphicData>
-									<drawSize>0.75</drawSize>
-								</graphicData>
-								<statBases>
-									<MarketValue>0.7</MarketValue>
-									<Mass>0.01</Mass>
-									<Bulk>0.01</Bulk>
-								</statBases>
-								<thingCategories>
-									<li>AmmoCryptoCannon</li>
-								</thingCategories>
-								<detonateProjectile>Bullet_Flamethrower_CryptoCannon</detonateProjectile>
-							</ThingDef>
-
-							<!-- ================== Damage ================== -->
-
-							<DamageDef ParentName="Bullet">
-								<defName>CE_Cryptofuel</defName>
-								<label>Crypto Burn</label>
-								<hediff>Frostbite</hediff>
-								<workerClass>DamageWorker_AddInjury</workerClass>
-								<hasForcefulImpact>true</hasForcefulImpact>
-								<makesBlood>false</makesBlood>
-								<canInterruptJobs>true</canInterruptJobs>
-								<externalViolence>true</externalViolence>
-								<deathMessage>{0} has been frozen to death.</deathMessage>
-								<armorCategory>Heat</armorCategory>
-								<minDamageToFragment>15</minDamageToFragment>
-								<defaultArmorPenetration>0</defaultArmorPenetration>
-								<explosionHeatEnergyPerCell>-20</explosionHeatEnergyPerCell>
-								<soundExplosion>Explosion_Stun</soundExplosion>
-								<combatLogRules>Damage_Flame</combatLogRules>
-								<canUseDeflectMetalEffect>false</canUseDeflectMetalEffect>
-								<explosionColorCenter>(0,1,1,1)</explosionColorCenter>
-								<explosionColorEdge>(0,0.70,1,1)</explosionColorEdge>
-							</DamageDef>
-
-							<!-- ================== Projectiles ================== -->
-
-							<ThingDef ParentName="Base6x24mmChargedBullet">
-								<defName>Bullet_Flamethrower_CryptoCannon</defName>
-								<graphicData>
-									<texPath>Things/Projectile/CryptoBullet</texPath>
-									<graphicClass>Graphic_Single</graphicClass>
-									<shaderType>TransparentPostLight</shaderType>
-									<drawSize>1.50</drawSize>
-								</graphicData>
-								<label>Crygenic stream</label>
-								<projectile Class="CombatExtended.ProjectilePropertiesCE">
-									<damageDef>CE_Cryptofuel</damageDef>
-									<damageAmountBase>1</damageAmountBase>
-									<soundExplode>CE_FlamethrowerExplosion</soundExplode>
-								</projectile>
-								<comps>
-									<li Class="CombatExtended.CompProperties_ExplosiveCE">
-										<damageAmountBase>4</damageAmountBase>
-										<explosiveDamageType>CE_Cryptofuel</explosiveDamageType>
-										<explosiveRadius>1.5</explosiveRadius>
-										<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-									</li>
-								</comps>
-							</ThingDef>
-
-							<!-- ==================== Recipes ========================== -->
-
-							<RecipeDef ParentName="ChargeAmmoRecipeBase">
-								<defName>MakeAmmo_CryptoCannon</defName>
-								<label>make crypto cannon fuel x200</label>
-								<description>Craft 200 crypto cannon fuel.</description>
-								<jobString>Making crypto cannon fuel.</jobString>
-								<ingredients>
-									<li>
-										<filter>
-											<thingDefs>
-												<li>Chemfuel</li>
-											</thingDefs>
-										</filter>
-										<count>15</count>
-									</li>
-									<li>
-										<filter>
-											<thingDefs>
-												<li>ComponentIndustrial</li>
-											</thingDefs>
-										</filter>
-										<count>8</count>
-									</li>
-								</ingredients>
-								<fixedIngredientFilter>
-									<thingDefs>
-										<li>Chemfuel</li>
-										<li>ComponentIndustrial</li>
-									</thingDefs>
-								</fixedIngredientFilter>
-								<products>
-									<Ammo_CryptoCannon>200</Ammo_CryptoCannon>
-								</products>
-								<workAmount>8600</workAmount>
-							</RecipeDef>
-
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VFEIMeleeSpacer.xml b/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VFEIMeleeSpacer.xml
deleted file mode 100644
index ae70225aa0..0000000000
--- a/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VFEIMeleeSpacer.xml	
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Pirates</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Factions Expanded - Insectoids</li>
-			</mods>
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<!-- === Plasma Sword === -->
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFEP_WarcasketMeleeWeapon_PlasmaSword"]/statBases</xpath>
-						<value>
-							<Bulk>35</Bulk>
-							<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-							<ToughnessRating>24</ToughnessRating>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFEP_WarcasketMeleeWeapon_PlasmaSword"]</xpath>
-						<value>
-							<equippedStatOffsets>
-								<MeleeCritChance>0.02</MeleeCritChance>
-								<MeleeParryChance>0.47</MeleeParryChance>
-								<MeleeDodgeChance>0.18</MeleeDodgeChance>
-							</equippedStatOffsets>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VFEP_WarcasketMeleeWeapon_PlasmaSword"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>point</label>
-									<capacities>
-										<li>Stab</li>
-									</capacities>
-									<power>46</power>
-									<cooldownTime>2</cooldownTime>
-									<armorPenetrationBlunt>9</armorPenetrationBlunt>
-									<armorPenetrationSharp>64</armorPenetrationSharp>
-									<extraMeleeDamages>
-										<li>
-											<def>Flame</def>
-											<amount>10</amount>
-											<chance>0.15</chance>
-										</li>
-									</extraMeleeDamages>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>blade</label>
-									<capacities>
-										<li>Cut</li>
-									</capacities>
-									<power>58</power>
-									<cooldownTime>2.6</cooldownTime>
-									<armorPenetrationBlunt>17</armorPenetrationBlunt>
-									<armorPenetrationSharp>48</armorPenetrationSharp>
-									<extraMeleeDamages>
-										<li>
-											<def>Flame</def>
-											<amount>10</amount>
-											<chance>0.5</chance>
-										</li>
-									</extraMeleeDamages>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VFEVRangedWarcasket.xml b/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VFEVRangedWarcasket.xml
deleted file mode 100644
index f911d0c235..0000000000
--- a/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VFEVRangedWarcasket.xml	
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Pirates</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Factions Expanded - Vikings</li>
-			</mods>
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName = "VFEP_WarcasketGun_CryptoCannon"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>barrel</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>35</power>
-									<cooldownTime>2.44</cooldownTime>
-									<armorPenetrationBlunt>16</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-						<defName>VFEP_WarcasketGun_CryptoCannon</defName>
-						<statBases>
-							<Bulk>20</Bulk>
-							<SwayFactor>2.10</SwayFactor>
-							<ShotSpread>3.00</ShotSpread>
-							<SightsEfficiency>1.0</SightsEfficiency>
-							<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						</statBases>
-						<Properties>
-							<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-							<recoilAmount>0.55</recoilAmount>
-							<hasStandardCommand>true</hasStandardCommand>
-							<defaultProjectile>Bullet_Flamethrower_CryptoCannon</defaultProjectile>
-							<burstShotCount>15</burstShotCount>
-							<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-							<warmupTime>1.3</warmupTime>
-							<range>30</range>
-							<minRange>3</minRange>
-							<soundCast>HissFlamethrower</soundCast>
-							<soundCastTail>GunTail_Light</soundCastTail>
-							<muzzleFlashScale>12</muzzleFlashScale>
-							<targetParams>
-								<canTargetLocations>true</canTargetLocations>
-							</targetParams>
-							<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-						</Properties>
-						<AmmoUser>
-							<magazineSize>200</magazineSize>
-							<reloadTime>5.6</reloadTime>
-							<ammoSet>AmmoSet_CryptoCannon</ammoSet>
-						</AmmoUser>
-						<FireModes>
-							<aiAimMode>SuppressFire</aiAimMode>
-							<aimedBurstShotCount>5</aimedBurstShotCount>
-							<noSingleShot>True</noSingleShot>
-						</FireModes>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWECRangedWarcasket.xml b/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWECRangedWarcasket.xml
deleted file mode 100644
index 5eb1934796..0000000000
--- a/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWECRangedWarcasket.xml	
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Pirates</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Weapons Expanded - Coilguns</li>
-			</mods>
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName = "VFEP_WarcasketGun_Railgun"]/tools
-						</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>barrel</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>35</power>
-									<cooldownTime>2.44</cooldownTime>
-									<armorPenetrationBlunt>16</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-						<defName>VFEP_WarcasketGun_Railgun</defName>
-						<statBases>
-							<Bulk>55.0</Bulk>
-							<SwayFactor>2.40</SwayFactor>
-							<ShotSpread>0.66</ShotSpread>
-							<SightsEfficiency>1.25</SightsEfficiency>
-							<RangedWeapon_Cooldown>0.86</RangedWeapon_Cooldown>
-						</statBases>
-						<Properties>
-							<recoilAmount>1.26</recoilAmount>
-							<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-							<hasStandardCommand>True</hasStandardCommand>
-							<defaultProjectile>Bullet_CoilGun_Lance</defaultProjectile>
-							<burstShotCount>3</burstShotCount>
-							<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-							<warmupTime>2.4</warmupTime>
-							<range>85</range>
-							<soundCast>VWE_Shot_GaussLance</soundCast>
-							<soundCastTail>GunTail_Heavy</soundCastTail>
-							<muzzleFlashScale>9</muzzleFlashScale>
-							<recoilPattern>Regular</recoilPattern>
-						</Properties>
-						<AmmoUser>
-							<magazineSize>15</magazineSize>
-							<reloadTime>5.2</reloadTime>
-							<ammoSet>AmmoSet_8mmRailgun_GaussLance</ammoSet>
-						</AmmoUser>
-						<FireModes>
-							<aiUseBurstMode>true</aiUseBurstMode>
-							<aiAimMode>AimedShot</aiAimMode>
-						</FireModes>
-						<weaponTags>
-							<li>SpacerGun</li>
-						</weaponTags>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWELRangedWarcasket.xml b/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWELRangedWarcasket.xml
deleted file mode 100644
index 4920af3a45..0000000000
--- a/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWELRangedWarcasket.xml	
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Pirates</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Weapons Expanded - Laser</li>
-			</mods>
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName = "VFEP_WarcasketGun_SalvagedLaserEradicator" or defName = "VFEP_WarcasketGun_LaserBlaster"]/tools
-						</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>barrel</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>35</power>
-									<cooldownTime>2.44</cooldownTime>
-									<armorPenetrationBlunt>16</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationRemove">
-						<xpath>Defs/ThingDef[defName = "VFEP_WarcasketGun_SalvagedLaserEradicator" or defName = "VFEP_WarcasketGun_LaserBlaster"]/comps/li[@Class="VanillaWeaponsExpandedLaser.CompProperties_LaserCapacitor"]</xpath>
-					</li>
-
-					<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-						<defName>VFEP_WarcasketGun_SalvagedLaserEradicator</defName>
-						<statBases>
-							<Mass>30</Mass>
-							<Bulk>40</Bulk>
-							<SwayFactor>2.85</SwayFactor>
-							<ShotSpread>0.08</ShotSpread>
-							<SightsEfficiency>2.20</SightsEfficiency>
-							<RangedWeapon_Cooldown>0.60</RangedWeapon_Cooldown>
-						</statBases>
-						<Properties>
-							<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-							<hasStandardCommand>True</hasStandardCommand>
-							<defaultProjectile>Bullet_Laser_SalvagedLaserEradicatorCE</defaultProjectile>
-							<ammoConsumedPerShotCount>15</ammoConsumedPerShotCount>
-							<warmupTime>4.6</warmupTime>
-							<range>68</range>
-							<minRange>3</minRange>
-							<soundCast>Shot_TurretSniper</soundCast>
-							<soundCastTail>GunTail_Heavy</soundCastTail>
-							<muzzleFlashScale>16</muzzleFlashScale>
-						</Properties>
-						<AmmoUser>
-							<magazineSize>300</magazineSize>
-							<reloadTime>7.6</reloadTime>
-							<ammoSet>AmmoSet_SalvagedLaserEradicatorCE</ammoSet>
-						</AmmoUser>
-						<FireModes>
-							<aiAimMode>AimedShot</aiAimMode>
-						</FireModes>
-					</li>
-
-					<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-						<defName>VFEP_WarcasketGun_LaserBlaster</defName>
-						<statBases>
-							<Mass>20</Mass>
-							<Bulk>25</Bulk>
-							<SwayFactor>2.64</SwayFactor>
-							<ShotSpread>0.06</ShotSpread>
-							<SightsEfficiency>1</SightsEfficiency>
-							<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						</statBases>
-						<Properties>
-							<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-							<hasStandardCommand>True</hasStandardCommand>
-							<defaultProjectile>Bullet_Laser_LaserSniperRifle</defaultProjectile>
-							<burstShotCount>25</burstShotCount>
-							<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-							<warmupTime>2</warmupTime>
-							<range>75</range>
-							<soundCast>VWE_LaserShot_Rifle</soundCast>
-							<soundCastTail>GunTail_Heavy</soundCastTail>
-							<muzzleFlashScale>9</muzzleFlashScale>
-							<recoilAmount>0.01</recoilAmount>
-							<recoilPattern>Regular</recoilPattern>
-						</Properties>
-						<AmmoUser>
-							<magazineSize>200</magazineSize>
-							<reloadTime>6</reloadTime>
-							<ammoSet>AmmoSet_LaserSniperRifle</ammoSet>
-						</AmmoUser>
-						<FireModes>
-							<aiAimMode>SuppressFire</aiAimMode>
-							<aimedBurstShotCount>10</aimedBurstShotCount>
-							<noSingleShot>true</noSingleShot>
-						</FireModes>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWENLRangedWarcasket.xml b/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWENLRangedWarcasket.xml
deleted file mode 100644
index bdce7aee53..0000000000
--- a/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWENLRangedWarcasket.xml	
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Pirates</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Weapons Expanded - Non-Lethal</li>
-			</mods>
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName = "VFEP_WarcasketGun_TearGasGrenadeLauncher"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>barrel</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>35</power>
-									<cooldownTime>2.44</cooldownTime>
-									<armorPenetrationBlunt>16</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-						<defName>VFEP_WarcasketGun_TearGasGrenadeLauncher</defName>
-						<statBases>
-							<Bulk>25</Bulk>
-							<SwayFactor>1.31</SwayFactor>
-							<ShotSpread>0.18</ShotSpread>
-							<SightsEfficiency>1.0</SightsEfficiency>
-							<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						</statBases>
-						<Properties>
-							<recoilAmount>1.08</recoilAmount>
-							<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-							<hasStandardCommand>true</hasStandardCommand>
-							<defaultProjectile>Bullet_40x46mmGrenade_CN</defaultProjectile>
-							<warmupTime>1</warmupTime>
-							<range>50</range>
-							<burstShotCount>2</burstShotCount>
-							<ticksBetweenBurstShots>20</ticksBetweenBurstShots>
-							<soundCast>VWENL_Shot_GrenadeLauncher</soundCast>
-							<soundCastTail>GunTail_Medium</soundCastTail>
-							<muzzleFlashScale>14</muzzleFlashScale>
-							<ai_IsBuildingDestroyer>True</ai_IsBuildingDestroyer>
-							<ignorePartialLoSBlocker>True</ignorePartialLoSBlocker>
-							<targetParams>
-								<canTargetLocations>True</canTargetLocations>
-							</targetParams>
-						</Properties>
-						<AmmoUser>
-							<magazineSize>6</magazineSize>
-							<reloadTime>2.2</reloadTime>
-							<ammoSet>AmmoSet_40x46mmGrenadeNL</ammoSet>
-						</AmmoUser>
-						<FireModes>
-							<aiAimMode>AimedShot</aiAimMode>
-							<aiUseBurstMode>False</aiUseBurstMode>
-						</FireModes>
-						<weaponTags>
-							<li>NonLethal</li>
-						</weaponTags>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWEQRangedWarcasket.xml b/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWEQRangedWarcasket.xml
deleted file mode 100644
index 76686962fc..0000000000
--- a/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWEQRangedWarcasket.xml	
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Pirates</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Weapons Expanded - Quickdraw</li>
-			</mods>
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName = "VFEP_WarcasketGun_FoldingGun"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>barrel</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>35</power>
-									<cooldownTime>2.44</cooldownTime>
-									<armorPenetrationBlunt>16</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-						<defName>VFEP_WarcasketGun_FoldingGun</defName>
-						<statBases>
-							<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
-							<SightsEfficiency>1.0</SightsEfficiency>
-							<ShotSpread>0.10</ShotSpread>
-							<SwayFactor>2.32</SwayFactor>
-							<Bulk>15</Bulk>
-						</statBases>
-						<Properties>
-							<recoilAmount>1.45</recoilAmount>
-							<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-							<hasStandardCommand>true</hasStandardCommand>
-							<defaultProjectile>Bullet_338Norma_FMJ</defaultProjectile>
-							<warmupTime>0.5</warmupTime>
-							<range>57</range>
-							<burstShotCount>10</burstShotCount>
-							<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-							<soundCast>VFEP_Shot_Minigun</soundCast>
-							<soundCastTail>GunTail_Medium</soundCastTail>
-							<muzzleFlashScale>9</muzzleFlashScale>
-							<targetParams>
-								<canTargetLocations>true</canTargetLocations>
-							</targetParams>
-						</Properties>
-						<AmmoUser>
-							<magazineSize>100</magazineSize>
-							<reloadTime>9.2</reloadTime>
-							<ammoSet>AmmoSet_338Norma</ammoSet>
-						</AmmoUser>
-						<FireModes>
-							<aimedBurstShotCount>5</aimedBurstShotCount>
-							<aiUseBurstMode>true</aiUseBurstMode>
-							<aiAimMode>Snapshot</aiAimMode>
-						</FireModes>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Apparel_Various.xml b/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Apparel_Various.xml
deleted file mode 100644
index edda8c4bb5..0000000000
--- a/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Apparel_Various.xml	
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Pirates</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Body Suit ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Bodysuit"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>2</Bulk>
-							<WornBulk>0</WornBulk>
-						</statBases>
-					</value>
-				</li>
-
-				<!-- ========== Rum Suit ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEP_Apparel_Rumsuit"]/statBases</xpath>
-					<value>
-						<Bulk>50</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-
-				<!-- ========== Privateer Armor ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEP_Apparel_Privateer"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEP_Apparel_Privateer"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>480</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEP_Apparel_Privateer"]/statBases/Mass</xpath>
-					<value>
-						<Mass>50</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEP_Apparel_Privateer"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEP_Apparel_Privateer"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>19</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEP_Apparel_Privateer"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>43</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEP_Apparel_Privateer"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>50</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFEP_Apparel_Privateer"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEP_Apparel_Privateer"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>80</CarryWeight>
-						<CarryBulk>10</CarryBulk>
-						<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEP_Apparel_Privateer"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEP_Apparel_Privateer"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>170</Plasteel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEP_Apparel_Privateer"]/costList/Uranium</xpath>
-					<value>
-						<Uranium>40</Uranium>
-					</value>
-				</li>
-
-				<!-- Partial Armor -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFEP_Apparel_Privateer"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Apparel_Warcaskets.xml b/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Apparel_Warcaskets.xml
deleted file mode 100644
index 066633b607..0000000000
--- a/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Apparel_Warcaskets.xml	
+++ /dev/null
@@ -1,1194 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Pirates</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Remove Warcasket Flammability ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[@Name="VFEP_WarcasketPartBase"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0.25</Flammability>
-					</value>
-				</li>
-
-				<!-- ========== Partial Armor ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/VFEPirates.WarcasketDef[@Name="VFEP_WarcasketHelmetBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.85</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/VFEPirates.WarcasketDef[@Name="VFEP_WarcasketShoulderPadBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Basic Warcasket ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Warcasket"]/statBases</xpath>
-					<value>
-						<Bulk>200</Bulk>
-						<WornBulk>20</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Warcasket"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!--2.5x sharp-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Warcasket"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>45</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Warcasket"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>250</CarryWeight>
-						<CarryBulk>200</CarryBulk>
-						<Suppressability>-100</Suppressability>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Warcasket"]/costList/Steel</xpath>
-					<value>
-						<Steel>160</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Warcasket"]/costList/ComponentIndustrial</xpath>
-					<value>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</value>
-				</li>
-
-				<!-- ========== Basic Warcasket - Shoulders ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Warcasket"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Warcasket"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Warcasket"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>45</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Warcasket"]/costList/Steel</xpath>
-					<value>
-						<Steel>80</Steel>
-					</value>
-				</li>
-
-				<!-- === Basic Warcasket Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Warcasket"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Warcasket"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Warcasket"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Warcasket"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<!-- Proportionally a bit better armor because assumed better neck suport allows for heavier-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Warcasket"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!--2.25x sharp-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Warcasket"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>36</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Warcasket"]/costList/Steel</xpath>
-					<value>
-						<Steel>80</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Warcasket"]/costList/ComponentIndustrial</xpath>
-					<value>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</value>
-				</li>
-
-				<!-- ========== Marine Warcasket ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Marine"]/statBases</xpath>
-					<value>
-						<Bulk>200</Bulk>
-						<WornBulk>20</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Marine"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>23</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Marine"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>57</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Marine"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>250</CarryWeight>
-						<CarryBulk>200</CarryBulk>
-						<Suppressability>-100</Suppressability>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Marine"]/costList/Steel</xpath>
-					<value>
-						<Steel>260</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Marine"]/costList/ComponentIndustrial</xpath>
-					<value>
-						<ComponentIndustrial>8</ComponentIndustrial>
-					</value>
-				</li>
-
-				<!-- ========== Marine Warcasket - Shoulders ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Marine"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Marine"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>23</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Marine"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>57</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Marine"]/costList/Steel</xpath>
-					<value>
-						<Steel>110</Steel>
-					</value>
-				</li>
-
-				<!-- === Marine Warcasket Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Marine"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>5</WornBulk>
-						<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Marine"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Marine"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Marine"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<!-- Armor values scaled by vanilla stat ratios compared to basic warcasket helmet [e.g (1.20/1.06)*16 = ~18 ]. -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Marine"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Marine"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>45</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Marine"]/costList/Steel</xpath>
-					<value>
-						<Steel>130</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Marine"]/costList/ComponentIndustrial</xpath>
-					<value>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</value>
-				</li>
-
-				<!-- ========== Recon Warcasket ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Recon"]/statBases</xpath>
-					<value>
-						<Bulk>175</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Recon"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Recon"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>46</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Recon"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>225</CarryWeight>
-						<CarryBulk>175</CarryBulk>
-						<Suppressability>-100</Suppressability>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Recon"]/costList/Steel</xpath>
-					<value>
-						<Steel>160</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Recon"]/costList/ComponentIndustrial</xpath>
-					<value>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</value>
-				</li>
-
-				<!-- ========== Recon Warcasket - Shoulders ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Recon"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Recon"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Recon"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>46</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Recon"]/costList/Steel</xpath>
-					<value>
-						<Steel>80</Steel>
-					</value>
-				</li>
-
-				<!-- === Recon Warcasket Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Recon"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>4</WornBulk>
-						<NightVisionEfficiency_Apparel>0.65</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Recon"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Recon"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Recon"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Recon"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Recon"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>37</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Recon"]/costList/Steel</xpath>
-					<value>
-						<Steel>80</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Recon"]/costList/ComponentIndustrial</xpath>
-					<value>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</value>
-				</li>
-
-				<!-- ========== Cataphract Warcasket ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Cataphract"]/statBases</xpath>
-					<value>
-						<Bulk>250</Bulk>
-						<WornBulk>25</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Cataphract"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>32</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Cataphract"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>80</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Cataphract"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>250</CarryWeight>
-						<CarryBulk>200</CarryBulk>
-						<Suppressability>-100</Suppressability>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Cataphract"]/costList/Steel</xpath>
-					<value>
-						<Steel>350</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Cataphract"]/costList/ComponentIndustrial</xpath>
-					<value>
-						<ComponentIndustrial>10</ComponentIndustrial>
-					</value>
-				</li>
-
-				<!-- ========== Cataphract Warcasket - Shoulders ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Cataphract"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Cataphract"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>32</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Cataphract"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>80</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Cataphract"]/costList/Steel</xpath>
-					<value>
-						<Steel>150</Steel>
-					</value>
-				</li>
-
-				<!-- === Cataphract Warcasket Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Cataphract"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>8</WornBulk>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Cataphract"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Cataphract"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Cataphract"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Cataphract"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>28</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Cataphract"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>63</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Cataphract"]/costList/Steel</xpath>
-					<value>
-						<Steel>150</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Cataphract"]/costList/ComponentIndustrial</xpath>
-					<value>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</value>
-				</li>
-
-				<!-- ========== Aerial Warcasket ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Aerial"]/statBases</xpath>
-					<value>
-						<Bulk>250</Bulk>
-						<WornBulk>25</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Aerial"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>28</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Aerial"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>70</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Aerial"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>250</CarryWeight>
-						<CarryBulk>200</CarryBulk>
-						<Suppressability>-100</Suppressability>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Aerial"]/costList/Steel</xpath>
-					<value>
-						<Steel>290</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Aerial"]/costList/ComponentIndustrial</xpath>
-					<value>
-						<ComponentIndustrial>16</ComponentIndustrial>
-					</value>
-				</li>
-
-				<!-- ========== Aerial Warcasket - Shoulders ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Aerial"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Aerial"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>28</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Aerial"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>70</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Aerial"]/costList/Steel</xpath>
-					<value>
-						<Steel>40</Steel>
-					</value>
-				</li>
-
-				<!-- === Aerial Warcasket Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Aerial"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>8</WornBulk>
-						<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Aerial"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Aerial"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Aerial"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Aerial"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Aerial"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>56</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Aerial"]/costList/Steel</xpath>
-					<value>
-						<Steel>90</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Aerial"]/costList/ComponentIndustrial</xpath>
-					<value>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</value>
-				</li>
-
-				<!-- ========== Barrage Warcasket ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Barrage"]/statBases</xpath>
-					<value>
-						<Bulk>275</Bulk>
-						<WornBulk>35</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Barrage"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>36</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Barrage"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>90</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Barrage"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>250</CarryWeight>
-						<CarryBulk>225</CarryBulk>
-						<Suppressability>-100</Suppressability>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Barrage"]/costList/Steel</xpath>
-					<value>
-						<Steel>480</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Barrage"]/costList/ComponentIndustrial</xpath>
-					<value>
-						<ComponentIndustrial>16</ComponentIndustrial>
-					</value>
-				</li>
-
-				<!-- ========== Barrage Warcasket - Shoulders ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Barrage"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Barrage"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>36</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Barrage"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>90</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Barrage"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<label>grenade barrage</label>
-								<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<onlyManualCast>True</onlyManualCast>
-								<warmupTime>0.6</warmupTime>
-								<range>40</range>
-								<minRange>5</minRange>
-								<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-								<soundCast>Shot_IncendiaryLauncher</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>14</muzzleFlashScale>
-								<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-								<defaultProjectile>Bullet_40x53mmGrenade_HE</defaultProjectile>
-								<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Barrage"]/comps/li[@Class="CompProperties_Reloadable"]/ammoDef</xpath>
-					<value>
-						<ammoDef>Ammo_40x53mmGrenade_HE</ammoDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Barrage"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountPerCharge</xpath>
-					<value>
-						<ammoCountPerCharge>1</ammoCountPerCharge>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Barrage"]/comps/li[@Class="CompProperties_Reloadable"]/maxCharges</xpath>
-					<value>
-						<maxCharges>8</maxCharges>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Barrage"]/costList/Steel</xpath>
-					<value>
-						<Steel>150</Steel>
-					</value>
-				</li>
-
-				<!-- === Barrage Warcasket Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Barrage"]/statBases</xpath>
-					<value>
-						<Bulk>20</Bulk>
-						<WornBulk>10</WornBulk>
-						<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Barrage"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Barrage"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Barrage"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Barrage"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>32</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Barrage"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>72</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Barrage"]/costList/Steel</xpath>
-					<value>
-						<Steel>90</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Barrage"]/costList/ComponentIndustrial</xpath>
-					<value>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</value>
-				</li>
-
-				<!-- ========== Hazard Warcasket ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Hazard"]/statBases</xpath>
-					<value>
-						<Bulk>200</Bulk>
-						<WornBulk>20</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Hazard"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Hazard"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>50</ArmorRating_Blunt>
-						<ArmorRating_Electric>1</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Hazard"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>250</CarryWeight>
-						<CarryBulk>200</CarryBulk>
-						<Suppressability>-100</Suppressability>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Hazard"]/costList/Steel</xpath>
-					<value>
-						<Steel>270</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Hazard"]/costList/ComponentIndustrial</xpath>
-					<value>
-						<ComponentIndustrial>8</ComponentIndustrial>
-					</value>
-				</li>
-
-				<!-- ========== Hazard Warcasket - Shoulders ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Hazard"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Hazard"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Hazard"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>50</ArmorRating_Blunt>
-						<ArmorRating_Electric>1</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Hazard"]/costList/Steel</xpath>
-					<value>
-						<Steel>110</Steel>
-					</value>
-				</li>
-
-				<!-- === Hazard Warcasket Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Hazard"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>5</WornBulk>
-						<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Hazard"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Hazard"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Hazard"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Hazard"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Hazard"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>40</ArmorRating_Blunt>
-						<ArmorRating_Electric>1</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Hazard"]/costList/Steel</xpath>
-					<value>
-						<Steel>70</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Hazard"]/costList/ComponentIndustrial</xpath>
-					<value>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</value>
-				</li>
-
-				<!-- ========== Shock Warcasket ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Shock"]/statBases</xpath>
-					<value>
-						<Bulk>250</Bulk>
-						<WornBulk>25</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Shock"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>28</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Shock"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>70</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Shock"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>250</CarryWeight>
-						<CarryBulk>200</CarryBulk>
-						<Suppressability>-100</Suppressability>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Shock"]/costList/Steel</xpath>
-					<value>
-						<Steel>240</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Shock"]/costList/ComponentIndustrial</xpath>
-					<value>
-						<ComponentIndustrial>20</ComponentIndustrial>
-					</value>
-				</li>
-
-				<!-- ========== Shock Warcasket - Shoulders ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Shock"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Shock"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>28</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Shock"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>70</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Shock"]/costList/Steel</xpath>
-					<value>
-						<Steel>120</Steel>
-					</value>
-				</li>
-
-				<!-- === Shock Warcasket Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Shock"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>8</WornBulk>
-						<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Shock"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Shock"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Shock"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Shock"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Shock"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>56</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Shock"]/costList/Steel</xpath>
-					<value>
-						<Steel>80</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Shock"]/costList/ComponentIndustrial</xpath>
-					<value>
-						<ComponentIndustrial>8</ComponentIndustrial>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Apparel_Warcaskets_Spacer.xml b/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Apparel_Warcaskets_Spacer.xml
deleted file mode 100644
index 25ec36b93a..0000000000
--- a/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Apparel_Warcaskets_Spacer.xml	
+++ /dev/null
@@ -1,783 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Pirates</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Siegebreaker Warcasket ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Siegebreaker"]/statBases</xpath>
-					<value>
-						<Bulk>275</Bulk>
-						<WornBulk>35</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Siegebreaker"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>36</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Siegebreaker"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>90</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Siegebreaker"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>250</CarryWeight>
-						<CarryBulk>225</CarryBulk>
-						<Suppressability>-100</Suppressability>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Siegebreaker"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>225</Plasteel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Siegebreaker"]/costList/ComponentSpacer</xpath>
-					<value>
-						<ComponentSpacer>8</ComponentSpacer>
-					</value>
-				</li>
-
-				<!-- === Energy Shield === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Siegebreaker"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldEnergyMax</xpath>
-					<value>
-						<EnergyShieldEnergyMax>375</EnergyShieldEnergyMax>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Siegebreaker"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldRechargeRate</xpath>
-					<value>
-						<EnergyShieldRechargeRate>1.5</EnergyShieldRechargeRate>
-					</value>
-				</li>
-
-				<!-- ========== Siegebreaker Warcasket - Shoulders ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Siegebreaker"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Siegebreaker"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>36</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Siegebreaker"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>90</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Siegebreaker"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>90</Plasteel>
-					</value>
-				</li>
-
-				<!-- === Siegebreaker Warcasket Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Siegebreaker"]/statBases</xpath>
-					<value>
-						<Bulk>20</Bulk>
-						<WornBulk>10</WornBulk>
-						<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Siegebreaker"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Siegebreaker"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Siegebreaker"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Siegebreaker"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>32</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Siegebreaker"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>72</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Siegebreaker"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>75</Plasteel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Siegebreaker"]/costList/ComponentSpacer</xpath>
-					<value>
-						<ComponentSpacer>4</ComponentSpacer>
-					</value>
-				</li>
-
-				<!-- ========== Guardian Warcasket ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Guardian"]/statBases</xpath>
-					<value>
-						<Bulk>275</Bulk>
-						<WornBulk>35</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Guardian"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>36</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Guardian"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>110</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Guardian"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>250</CarryWeight>
-						<CarryBulk>225</CarryBulk>
-						<Suppressability>-100</Suppressability>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Guardian"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>300</Plasteel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Guardian"]/costList/ComponentSpacer</xpath>
-					<value>
-						<ComponentSpacer>8</ComponentSpacer>
-					</value>
-				</li>
-
-				<!-- === Energy Shield === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Guardian"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldEnergyMax</xpath>
-					<value>
-						<EnergyShieldEnergyMax>225</EnergyShieldEnergyMax>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Guardian"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldRechargeRate</xpath>
-					<value>
-						<EnergyShieldRechargeRate>1.5</EnergyShieldRechargeRate>
-					</value>
-				</li>
-
-				<!-- ========== Guardian Warcasket - Shoulders ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Guardian"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Guardian"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>36</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Guardian"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>110</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Guardian"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>120</Plasteel>
-					</value>
-				</li>
-
-				<!-- === Guardian Warcasket Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Guardian"]/statBases</xpath>
-					<value>
-						<Bulk>20</Bulk>
-						<WornBulk>10</WornBulk>
-						<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Guardian"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Guardian"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Guardian"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Guardian"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>32</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Guardian"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>86</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Guardian"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>105</Plasteel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Guardian"]/costList/ComponentSpacer</xpath>
-					<value>
-						<ComponentSpacer>4</ComponentSpacer>
-					</value>
-				</li>
-
-				<!-- ========== Controller Warcasket ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Controller"]/statBases</xpath>
-					<value>
-						<Bulk>275</Bulk>
-						<WornBulk>35</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Controller"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>36</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Controller"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>90</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Controller"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>250</CarryWeight>
-						<CarryBulk>225</CarryBulk>
-						<Suppressability>-100</Suppressability>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Controller"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>225</Plasteel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Controller"]/costList/ComponentSpacer</xpath>
-					<value>
-						<ComponentSpacer>14</ComponentSpacer>
-					</value>
-				</li>
-
-				<!-- === Energy Shield === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Controller"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldEnergyMax</xpath>
-					<value>
-						<EnergyShieldEnergyMax>225</EnergyShieldEnergyMax>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Controller"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldRechargeRate</xpath>
-					<value>
-						<EnergyShieldRechargeRate>1.5</EnergyShieldRechargeRate>
-					</value>
-				</li>
-
-				<!-- ========== Controller Warcasket - Shoulders ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Controller"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Controller"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>36</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Controller"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>90</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Controller"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>90</Plasteel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Controller"]/costList/ComponentSpacer</xpath>
-					<value>
-						<ComponentSpacer>1</ComponentSpacer>
-					</value>
-				</li>
-
-				<!-- === Siegebreaker Warcasket Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Controller"]/statBases</xpath>
-					<value>
-						<Bulk>20</Bulk>
-						<WornBulk>10</WornBulk>
-						<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Controller"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Controller"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Controller"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Controller"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>32</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Controller"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>72</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Controller"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>90</Plasteel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Controller"]/costList/ComponentSpacer</xpath>
-					<value>
-						<ComponentSpacer>6</ComponentSpacer>
-					</value>
-				</li>
-
-				<!-- ========== Sarcophagus Warcasket ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Sarcophagus"]/statBases</xpath>
-					<value>
-						<Bulk>275</Bulk>
-						<WornBulk>35</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Sarcophagus"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>36</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Sarcophagus"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>90</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Sarcophagus"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>250</CarryWeight>
-						<CarryBulk>225</CarryBulk>
-						<Suppressability>-100</Suppressability>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Sarcophagus"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>225</Plasteel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Sarcophagus"]/costList/ComponentSpacer</xpath>
-					<value>
-						<ComponentSpacer>8</ComponentSpacer>
-					</value>
-				</li>
-
-				<!-- === Energy Shield === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Sarcophagus"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldEnergyMax</xpath>
-					<value>
-						<EnergyShieldEnergyMax>225</EnergyShieldEnergyMax>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Sarcophagus"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldRechargeRate</xpath>
-					<value>
-						<EnergyShieldRechargeRate>1.5</EnergyShieldRechargeRate>
-					</value>
-				</li>
-
-				<!-- ========== Sarcophagus Warcasket - Shoulders ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Sarcophagus"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Sarcophagus"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>36</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Sarcophagus"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>90</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Sarcophagus"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>90</Plasteel>
-					</value>
-				</li>
-
-				<!-- === Sarcophagus Warcasket Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Sarcophagus"]/statBases</xpath>
-					<value>
-						<Bulk>20</Bulk>
-						<WornBulk>10</WornBulk>
-						<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Sarcophagus"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Sarcophagus"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Sarcophagus"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Sarcophagus"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>32</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Sarcophagus"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>72</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Sarcophagus"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>90</Plasteel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Sarcophagus"]/costList/ComponentSpacer</xpath>
-					<value>
-						<ComponentSpacer>4</ComponentSpacer>
-					</value>
-				</li>
-
-				<!-- ========== Brute Warcasket ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Brute"]/statBases</xpath>
-					<value>
-						<Bulk>275</Bulk>
-						<WornBulk>35</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Brute"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>36</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Brute"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>110</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Brute"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>250</CarryWeight>
-						<CarryBulk>225</CarryBulk>
-						<Suppressability>-100</Suppressability>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Brute"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>240</Plasteel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Brute"]/costList/ComponentSpacer</xpath>
-					<value>
-						<ComponentSpacer>6</ComponentSpacer>
-					</value>
-				</li>
-
-				<!-- === Energy Shield === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Brute"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldEnergyMax</xpath>
-					<value>
-						<EnergyShieldEnergyMax>750</EnergyShieldEnergyMax>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Brute"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldRechargeRate</xpath>
-					<value>
-						<EnergyShieldRechargeRate>0.75</EnergyShieldRechargeRate>
-					</value>
-				</li>
-
-				<!-- ========== Brute Warcasket - Shoulders ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Brute"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Brute"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>36</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Brute"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>110</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Brute"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>90</Plasteel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Brute"]/costList/ComponentSpacer</xpath>
-					<value>
-						<ComponentSpacer>6</ComponentSpacer>
-					</value>
-				</li>
-
-				<!-- === Brute Warcasket Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Brute"]/statBases</xpath>
-					<value>
-						<Bulk>20</Bulk>
-						<WornBulk>10</WornBulk>
-						<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Brute"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Brute"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Brute"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Brute"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>32</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Brute"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>86</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Brute"]/costList/Plasteel</xpath>
-					<value>
-						<Plasteel>90</Plasteel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Brute"]/costList/ComponentSpacer</xpath>
-					<value>
-						<ComponentSpacer>6</ComponentSpacer>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Melee_Warcaskets.xml b/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Melee_Warcaskets.xml
deleted file mode 100644
index dba1fc6798..0000000000
--- a/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Melee_Warcaskets.xml	
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Pirates</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Warcasket Combat Knife -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEP_WarcasketMeleeWeapon_CombatKnife"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>2.0</cooldownTime>
-								<armorPenetrationBlunt>14</armorPenetrationBlunt>
-								<armorPenetrationSharp>9</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>2.9</cooldownTime>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEP_WarcasketMeleeWeapon_CombatKnife"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.63</MeleeCritChance>
-							<MeleeParryChance>0.75</MeleeParryChance>
-							<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEP_WarcasketMeleeWeapon_CombatKnife"]/statBases</xpath>
-					<value>
-						<Bulk>7</Bulk>
-						<MeleeCounterParryBonus>0.23</MeleeCounterParryBonus>
-						<ToughnessRating>5</ToughnessRating>
-					</value>
-				</li>
-
-				<!-- Warcasket Broadsword -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEP_WarcasketMeleeWeapon_Broadsword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>56</power>
-								<cooldownTime>2.4</cooldownTime>
-								<armorPenetrationBlunt>18</armorPenetrationBlunt>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>68</power>
-								<cooldownTime>3.35</cooldownTime>
-								<armorPenetrationBlunt>17</armorPenetrationBlunt>
-								<armorPenetrationSharp>7.2</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEP_WarcasketMeleeWeapon_Broadsword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.02</MeleeCritChance>
-							<MeleeParryChance>0.47</MeleeParryChance>
-							<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEP_WarcasketMeleeWeapon_Broadsword"]/statBases</xpath>
-					<value>
-						<Bulk>14</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-						<ToughnessRating>10</ToughnessRating>
-					</value>
-				</li>
-
-				<!-- Warcasket Gravity Hammer -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEP_WarcasketMeleeWeapon_GravityHammer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>VFEP_GravityHammerAttack</li>
-								</capacities>
-								<power>92</power>
-								<cooldownTime>5.73</cooldownTime>
-								<armorPenetrationBlunt>580</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>50</power>
-								<cooldownTime>2.11</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>22.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEP_WarcasketMeleeWeapon_GravityHammer"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.8</MeleeCritChance>
-							<MeleeParryChance>0.1</MeleeParryChance>
-							<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEP_WarcasketMeleeWeapon_GravityHammer"]/statBases</xpath>
-					<value>
-						<Bulk>18</Bulk>
-						<MeleeCounterParryBonus>2</MeleeCounterParryBonus>
-						<ToughnessRating>25</ToughnessRating>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Ranged_Warcaskets.xml b/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Ranged_Warcaskets.xml
deleted file mode 100644
index f6828cdb94..0000000000
--- a/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Ranged_Warcaskets.xml	
+++ /dev/null
@@ -1,410 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Pirates</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Ranged Weapon Draw Size -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[
-						defName = "VFEP_WarcasketGun_Autorifle" or
-						defName = "VFEP_WarcasketGun_UraniumSlugRifle" or
-						defName = "VFEP_WarcasketGun_Slugthrower" or
-						defName = "VFEP_WarcasketGun_Minigun" or
-						defName = "VFEP_WarcasketGun_GrenadeLauncher" or
-						defName = "VFEP_WarcasketGun_HeavyFlamer" or
-						defName = "VFEP_WarcasketGun_ChargeLance" or
-						defName = "VFEP_WarcasketGun_HandheldCannon" or
-						defName = "VFEP_WarcasketGun_ChargeBlaster"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.7,1.7</DrawSize>
-							<DrawOffset>0.0,0.0</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Remove the added weapon tag from the Charge Lance === -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Gun_ChargeLance"]/weaponTags/li[contains(.,"VFEP_Captain")]</xpath>
-				</li>
-
-				<!-- === Research === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ResearchProjectDef[defName="VFEP_WarcasketWeaponry"]/prerequisites/li[text()="MultibarrelWeapons"]</xpath>
-					<value>
-						<li>PrecisionRifling</li>
-					</value>
-				</li>
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "VFEP_WarcasketGun_Autorifle" or
-						defName = "VFEP_WarcasketGun_UraniumSlugRifle" or
-						defName = "VFEP_WarcasketGun_Slugthrower" or
-						defName = "VFEP_WarcasketGun_Minigun" or
-						defName = "VFEP_WarcasketGun_GrenadeLauncher" or
-						defName = "VFEP_WarcasketGun_HeavyFlamer" or
-						defName = "VFEP_WarcasketGun_ChargeLance" or
-						defName = "VFEP_WarcasketGun_HandheldCannon" or
-						defName = "VFEP_WarcasketGun_ChargeBlaster"
-						]/tools
-					</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>2.44</cooldownTime>
-								<armorPenetrationBlunt>16</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Autorifle === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFEP_WarcasketGun_Autorifle</defName>
-					<statBases>
-						<Bulk>25</Bulk>
-						<SwayFactor>1.80</SwayFactor>
-						<ShotSpread>0.08</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.47</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.99</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_20x82mmMauser_AP</defaultProjectile>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>60</range>
-						<soundCast>Shot_Autocannon</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_20x82mmMauser</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>true</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- === Slug Rifle === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFEP_WarcasketGun_UraniumSlugRifle</defName>
-					<statBases>
-						<Bulk>25</Bulk>
-						<SwayFactor>2.85</SwayFactor>
-						<ShotSpread>0.08</ShotSpread>
-						<SightsEfficiency>2.20</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.60</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>3.19</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_25x137mmNATO_AP</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>68</range>
-						<soundCast>Shot_TurretSniper</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>16</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.0</reloadTime>
-						<ammoSet>AmmoSet_25x137mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== Warcasket Grenade Launcher ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFEP_WarcasketGun_GrenadeLauncher</defName>
-					<statBases>
-						<Bulk>25</Bulk>
-						<SwayFactor>1.75</SwayFactor>
-						<ShotSpread>0.20</ShotSpread>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.36</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_40x53mmGrenade_HE</defaultProjectile>
-						<warmupTime>1.8</warmupTime>
-						<range>50</range>
-						<minRange>4</minRange>
-						<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
-						<burstShotCount>4</burstShotCount>
-						<soundCast>VFEP_Shot_GrenadeLauncher</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>0.9</reloadTime>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<ammoSet>AmmoSet_40x53mmGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- ========== Warcasket Slug Thrower ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFEP_WarcasketGun_Slugthrower</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>1.0</RangedWeapon_Cooldown>
-						<ShotSpread>0.34</ShotSpread>
-						<SwayFactor>1.60</SwayFactor>
-						<Bulk>15</Bulk>
-						<SightsEfficiency>1</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.19</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Slugthrower_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>28</range>
-						<soundCast>VFEP_Shot_Slugthrower</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_SlugthrowerShell</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== Warcasket Minigun ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFEP_WarcasketGun_Minigun</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>2.32</SwayFactor>
-						<Bulk>25</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.92</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_338Norma_FMJ</defaultProjectile>
-						<warmupTime>2.1</warmupTime>
-						<range>57</range>
-						<burstShotCount>50</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>VFEP_Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>500</magazineSize>
-						<reloadTime>9.2</reloadTime>
-						<ammoSet>AmmoSet_338Norma</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>true</aiUseBurstMode>
-						<aimedBurstShotCount>25</aimedBurstShotCount>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- === Warcasket Heavy Flamer === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFEP_WarcasketGun_HeavyFlamer</defName>
-					<statBases>
-						<Bulk>20</Bulk>
-						<SwayFactor>2.10</SwayFactor>
-						<ShotSpread>3.00</ShotSpread>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.55</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Flamethrower_Prometheum</defaultProjectile>
-						<burstShotCount>20</burstShotCount>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<warmupTime>1.3</warmupTime>
-						<range>30</range>
-						<minRange>3</minRange>
-						<soundCast>HissFlamethrower</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<ai_AvoidFriendlyFireRadius>5</ai_AvoidFriendlyFireRadius>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>200</magazineSize>
-						<reloadTime>6.6</reloadTime>
-						<ammoSet>AmmoSet_Flamethrower</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>true</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>10</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- === Warcasket Charge Lance === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFEP_WarcasketGun_ChargeLance</defName>
-					<statBases>
-						<SightsEfficiency>2.0</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>2.08</SwayFactor>
-						<Bulk>45.00</Bulk>
-						<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.26</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12x72mmCharged</defaultProjectile>
-						<warmupTime>2.1</warmupTime>
-						<range>80</range>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<burstShotCount>3</burstShotCount>
-						<soundCast>ChargeLance_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>18</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_12x72mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>true</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- === Warcasket Handheld Cannon === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFEP_WarcasketGun_HandheldCannon</defName>
-					<statBases>
-						<Bulk>20</Bulk>
-						<SwayFactor>1.24</SwayFactor>
-						<ShotSpread>0.10</ShotSpread>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>5.07</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_CannonBall_Bursting</defaultProjectile>
-						<warmupTime>2.1</warmupTime>
-						<range>62</range>
-						<minRange>5.9</minRange>
-						<soundCast>VFEP_Shot_Cannon</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>16</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>5.2</reloadTime>
-						<ammoSet>AmmoSet_CannonBall</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- === Warcasket Charge Blaster === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFEP_WarcasketGun_ChargeBlaster</defName>
-					<statBases>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.18</SwayFactor>
-						<Bulk>31.00</Bulk>
-						<RangedWeapon_Cooldown>1.56</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.77</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_8x50mmCharged</defaultProjectile>
-						<warmupTime>2.1</warmupTime>
-						<range>68</range>
-						<burstShotCount>50</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>ChargeLance_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>500</magazineSize>
-						<reloadTime>9.2</reloadTime>
-						<ammoSet>AmmoSet_8x50mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>25</aimedBurstShotCount>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_MachineGun</li>
-						<li>CE_AI_Suppressive</li>
-						<li>AdvancedGun</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/ThingDefs_Artillery.xml b/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/ThingDefs_Artillery.xml
deleted file mode 100644
index dddbc1bafc..0000000000
--- a/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/ThingDefs_Artillery.xml	
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Pirates</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Remove refuelable property -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName = "VFEP_Turret_FieldGun" or
-						defName = "VFEP_Turret_Cannon"
-						]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
-				</li>
-
-				<!-- Replace vanilla thingClass -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEP_Turret_Cannon" or defName="VFEP_Turret_FieldGun"]</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<!-- Field Gun -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEP_Turret_FieldGun"]</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEP_Turret_FieldGun"]/building/turretBurstWarmupTime</xpath>
-					<value>
-						<turretBurstWarmupTime>4.0</turretBurstWarmupTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEP_Turret_FieldGun"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>2.0</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEP_Turret_FieldGun"]</xpath>
-					<value>
-						<statBases>
-							<Mass>500</Mass>
-							<Bulk>250</Bulk>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEP_Turret_FieldGun"]</xpath>
-					<value>
-						<placeWorkers Inherit="False">
-							<li>PlaceWorker_TurretTop</li>
-							<li>PlaceWorker_PreventInteractionSpotOverlap</li>
-						</placeWorkers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEP_Artillery_FieldGun"]/statBases</xpath>
-					<value>
-						<Mass>250</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEP_Artillery_FieldGun"]/statBases/RangedWeapon_Cooldown</xpath>
-					<value>
-						<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEP_Artillery_FieldGun"]/statBases</xpath>
-					<value>
-						<SightsEfficiency>0.5</SightsEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEP_Artillery_FieldGun"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_AmmoUser">
-							<magazineSize>1</magazineSize>
-							<reloadTime>5</reloadTime>
-							<ammoSet>AmmoSet_762x385mmRCannonShell</ammoSet>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEP_Artillery_FieldGun"]/weaponTags</xpath>
-					<value>
-						<li>TurretGun</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEP_Artillery_FieldGun"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>4.36</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_762x385mmRCannonShell_HEAT</defaultProjectile>
-								<warmupTime>4</warmupTime>
-								<minRange>16</minRange>
-								<range>86</range>
-								<burstShotCount>1</burstShotCount>
-								<soundCast>VFEP_Shot_FieldCannon</soundCast>
-								<muzzleFlashScale>16</muzzleFlashScale>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<recoilPattern>Mounted</recoilPattern>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Cannon - Based on the M1897 12-pounder -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="VFEP_BaseCannonBuilding"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="VFEP_BaseCannonBuilding"]/building/turretBurstWarmupTime</xpath>
-					<value>
-						<turretBurstWarmupTime>3.3</turretBurstWarmupTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="VFEP_BaseCannonBuilding"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>2.7</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="VFEP_BaseCannonBuilding"]/placeWorkers/li[.="PlaceWorker_NotUnderRoof"]</xpath>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFEP_Artillery_Cannon</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>2.7</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.80</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>0.81</SwayFactor>
-						<Mass>125</Mass>
-					</statBases>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>10</reloadTime>
-						<ammoSet>AmmoSet_CannonBall</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEP_Artillery_Cannon"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.40</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_CannonBall_Round</defaultProjectile>
-								<warmupTime>3.3</warmupTime>
-								<range>64</range>
-								<minRange>16</minRange>
-								<soundCast>VFEP_Shot_Cannon</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>18</muzzleFlashScale>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<recoilPattern>Mounted</recoilPattern>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEP_Turret_Cannon"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>150</Bulk>
-							<Mass>250</Mass>
-						</statBases>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/ThingDefs_Turrets.xml b/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/ThingDefs_Turrets.xml
deleted file mode 100644
index f49f8291d2..0000000000
--- a/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/ThingDefs_Turrets.xml	
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Pirates</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Remove refuelable property -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName = "VFEP_ShipChunkGauntletTurret"]/comps/li[@Class = "VFEPirates.CompProperties_Fueled"]</xpath>
-				</li>
-
-				<!-- Replace vanilla thingClass -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VFEP_ShipChunkGauntletTurret"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "VFEP_ShipChunkGauntletTurret"]</xpath>
-					<value>
-						<thingCategories />
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEP_ShipChunkGauntletTurret"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>1.25</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEP_ShipChunkGauntletTurret"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.75</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VFEP_ShipChunkGauntletTurret"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>0.5</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<!-- Make turrets taller -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "VFEP_ShipChunkGauntletTurret"]</xpath>
-					<value>
-						<fillPercent>0.95</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name = "VFEP_CrashedShip"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.95</fillPercent>
-					</value>
-				</li>
-
-				<!-- Gauntlet Charge Cannnon -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFEP_GauntletChargeCanon</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>0.26</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.08</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_12x72mmCharged</defaultProjectile>
-						<warmupTime>2.3</warmupTime>
-						<range>62</range>
-						<minRange>13</minRange>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<soundCast>VFEP_Shot_GauntletCannon</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>200</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_12x72mmCharged</ammoSet>
-					</AmmoUser>
-					<weaponTags Inherit="False">
-						<li>TurretGun</li>
-					</weaponTags>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!-- Make the crashed ships don't destroy each other upon crashing -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name = "VFEP_CrashedShip"]</xpath>
-					<value>
-						<damageMultipliers>
-							<li>
-								<damageDef>Bomb</damageDef>
-								<multiplier>0.1</multiplier>
-							</li>
-						</damageMultipliers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name = "VFEP_CrashedShip"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>0.99</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name = "VFEP_CrashedShip"]/building/turretGunDef</xpath>
-					<value>
-						<turretGunDef>VFEP_GauntletChargeCanon_CE</turretGunDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name = "VFEP_CrashedShip"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>0.5</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name = "VFEP_CrashedShip"]/building</xpath>
-					<value>
-						<turretBurstWarmupTime>2.3</turretBurstWarmupTime>
-					</value>
-				</li>
-
-				<!-- Vanilla Gauntlet Charge Cannnon -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="BaseWeaponTurret">
-							<defName>VFEP_GauntletChargeCanon_CE</defName>
-							<label>gauntlet charge cannon</label>
-							<description>Ship mounted anti-armor charge cannon, often utilised in ship-to-ship combat in low atmosphere.</description>
-							<graphicData>
-								<texPath>Things/Building/Security/GauntletTurret_Top</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<statBases>
-								<AccuracyTouch>0.9</AccuracyTouch>
-								<AccuracyShort>0.85</AccuracyShort>
-								<AccuracyMedium>0.60</AccuracyMedium>
-								<AccuracyLong>0.40</AccuracyLong>
-								<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-								<DeteriorationRate>0</DeteriorationRate>
-								<Mass>5</Mass>
-								<Flammability>0</Flammability>
-							</statBases>
-							<verbs>
-								<li>
-									<verbClass>Verb_Shoot</verbClass>
-									<defaultProjectile>VFEP_Bullet_GauntletChargeCanon</defaultProjectile>
-									<warmupTime>2.3</warmupTime>
-									<range>62</range>
-									<minRange>8.9</minRange>
-									<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-									<burstShotCount>3</burstShotCount>
-									<soundCast>VFEP_Shot_GauntletCannon</soundCast>
-									<soundCastTail>GunTail_Light</soundCastTail>
-									<muzzleFlashScale>9</muzzleFlashScale>
-								</li>
-							</verbs>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VFEP_Bullet_GauntletChargeCanon"]/projectile/damageAmountBase</xpath>
-					<value>
-						<damageAmountBase>20</damageAmountBase>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VFEP_Bullet_GauntletChargeCanon"]/projectile/armorPenetrationBase</xpath>
-					<value>
-						<armorPenetrationBase>25</armorPenetrationBase>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VFEP_Bullet_GauntletChargeCanon"]/projectile/speed</xpath>
-					<value>
-						<speed>144</speed>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Weapons_Mech.xml b/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Weapons_Mech.xml
deleted file mode 100644
index f9d8e59fd3..0000000000
--- a/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Weapons_Mech.xml	
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Pirates</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== VFE Handheld Mini Turret ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFEPGun_MiniBlaster</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>0.82</SwayFactor>
-						<Bulk>5.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.76</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>42</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>6</burstShotCount>
-						<soundCast>GunShotA</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>7.8</reloadTime>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEPGun_MiniBlaster"]/tools</xpath>
-					<value>
-						<tools>
-							<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>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Races/Races_Mechanoid.xml b/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Races/Races_Mechanoid.xml
deleted file mode 100644
index 5d08ebb48b..0000000000
--- a/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Races/Races_Mechanoid.xml	
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Pirates</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFEP_Mech_Wardrone" or defName="VFEP_Mech_Spidermine"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Vehicle</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEP_Mech_Wardrone" or defName="VFEP_Mech_Spidermine"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.26</MeleeDodgeChance>
-						<MeleeCritChance>0.12</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEP_Mech_Wardrone"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>2.0</ShootingAccuracyPawn>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEP_Mech_Wardrone" or defName="VFEP_Mech_Spidermine"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEP_Mech_Wardrone" or defName="VFEP_Mech_Spidermine"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.75</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEP_Mech_Wardrone"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>turret</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2.02</cooldownTime>
-								<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEP_Mech_Spidermine"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>frame</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2.02</cooldownTime>
-								<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Settlers/Drugs/Alcohol_Chemshine.xml b/Patches/Vanilla Factions Expanded - Settlers/Drugs/Alcohol_Chemshine.xml
deleted file mode 100644
index 7a073fea81..0000000000
--- a/Patches/Vanilla Factions Expanded - Settlers/Drugs/Alcohol_Chemshine.xml	
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Settlers</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Bulk === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Chemshine"]/statBases</xpath>
-
-					<value>
-						<Bulk>1</Bulk>
-					</value>
-				</li>
-
-				<!-- === stafOffsets === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="Chemshined"]/stages/li[1]</xpath>
-
-					<value>
-						<statOffsets>
-							<Suppressability>-0.10</Suppressability>
-						</statOffsets>
-					</value>
-				</li>
-
-				<!-- === Addictivines === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Chemshine"]/comps/li[@Class="CompProperties_Drug"]/addictiveness</xpath>
-
-					<value>
-						<addictiveness>0.05</addictiveness>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Chemshine"]/comps/li[@Class="CompProperties_Drug"]/minToleranceToAddict</xpath>
-
-					<value>
-						<minToleranceToAddict>0.05</minToleranceToAddict>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Settlers/PawnKindDefs/PawnKinds_Bandits.xml b/Patches/Vanilla Factions Expanded - Settlers/PawnKindDefs/PawnKinds_Bandits.xml
deleted file mode 100644
index b9538ec837..0000000000
--- a/Patches/Vanilla Factions Expanded - Settlers/PawnKindDefs/PawnKinds_Bandits.xml	
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Settlers</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Bandit === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Bandit"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<magazineCount>
-										<min>1</min>
-										<max>2</max>
-									</magazineCount>
-									<sidearmMoney>
-										<min>100</min>
-										<max>200</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>Revolver</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Bounty Hunter === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="BountyHunter"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>1</min>
-								<max>3</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.2</generateChance>
-									<magazineCount>
-										<min>1</min>
-										<max>2</max>
-									</magazineCount>
-									<sidearmMoney>
-										<min>100</min>
-										<max>200</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>Revolver</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Outlaw === -->
-				<!-- We'll add this as a secondary -->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/PawnKindDef[defName="Outlaw"]/weaponTags/li[.="GrenadeDestructive"]</xpath>
-					<match Class="PatchOperationRemove">
-						<xpath>Defs/PawnKindDef[defName="Outlaw"]/weaponTags/li[.="GrenadeDestructive"]</xpath>
-					</match>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Outlaw"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>1</min>
-								<max>3</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>1</generateChance>
-									<magazineCount>
-										<min>1</min>
-										<max>3</max>
-									</magazineCount>
-									<sidearmMoney>
-										<min>100</min>
-										<max>200</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>GrenadeDynamite</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Gunslinger | Bandit Leader === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Gunslinger" or defName="BanditLeader"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>4</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Settlers/PawnKindDefs/PawnKinds_Settlers.xml b/Patches/Vanilla Factions Expanded - Settlers/PawnKindDefs/PawnKinds_Settlers.xml
deleted file mode 100644
index 6cb4d1586d..0000000000
--- a/Patches/Vanilla Factions Expanded - Settlers/PawnKindDefs/PawnKinds_Settlers.xml	
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Settlers</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Settler === -->
-				<!-- We'll add this as a secondary -->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/PawnKindDef[defName="Settler"]/weaponTags/li[.="GrenadeDestructive"]</xpath>
-					<match Class="PatchOperationRemove">
-						<xpath>Defs/PawnKindDef[defName="Settler"]/weaponTags/li[.="GrenadeDestructive"]</xpath>
-					</match>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Settler"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>1</min>
-								<max>3</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>1</generateChance>
-									<magazineCount>
-										<min>1</min>
-										<max>3</max>
-									</magazineCount>
-									<sidearmMoney>
-										<min>100</min>
-										<max>200</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>GrenadeDynamite</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Deputy | Militia | Frontier Trader === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Deputy" or defName="Militia" or defName="Frontier_Trader" or defName="Sheriff" or defName="Mayor"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>4</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Settlers/Scenarios/Scenarios_Classic.xml b/Patches/Vanilla Factions Expanded - Settlers/Scenarios/Scenarios_Classic.xml
deleted file mode 100644
index e08241bbb7..0000000000
--- a/Patches/Vanilla Factions Expanded - Settlers/Scenarios/Scenarios_Classic.xml	
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Settlers</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Dynamine Count === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ScenarioDef[defName="VFES_Bandits"]/scenario/parts/li[thingDef="VFES_Weapon_GrenadeDynamite"]</xpath>
-
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>VFES_Weapon_GrenadeDynamite</thingDef>
-							<count>20</count>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Add ammo to scenario === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="VFES_Bandits"]/scenario/parts</xpath>
-
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_12Gauge_Buck</thingDef>
-							<count>60</count>
-						</li>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_44Magnum_FMJ</thingDef>
-							<count>60</count>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Buildings/TurretGatlingGun.xml b/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Buildings/TurretGatlingGun.xml
deleted file mode 100644
index e6127f76d6..0000000000
--- a/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Buildings/TurretGatlingGun.xml	
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Settlers</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Gun === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_GatlingGun</defName>
-					<statBases>
-						<Bulk>15.54</Bulk>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.16</SwayFactor>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.17</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_4570Gov_FMJ</defaultProjectile>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
-						<warmupTime>1.4</warmupTime>
-						<range>62</range>
-						<soundCast>VFE_Shot_GattlingGun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>40</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_4570Gov</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>false</aiUseBurstMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- === Turret === -->
-				<!-- == thingClass == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_GatlingGun"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<!-- == Remove stuff == -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Turret_GatlingGun"]/comps/li[@Class="CompProperties_Explosive"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Turret_GatlingGun"]/comps/li[@Class="CompProperties_Refuelable"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Turret_GatlingGun"]/comps/li[@Class="CompProperties_Flickable"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Turret_GatlingGun"]/stuffCategories</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Turret_GatlingGun"]/costStuffCount</xpath>
-				</li>
-
-				<!-- == costList == -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Turret_GatlingGun"]</xpath>
-					<value>
-						<costList>
-							<Steel>325</Steel>
-							<ComponentIndustrial>4</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<!-- == fillPercent == -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_GatlingGun"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<!-- == turretBurstCooldownTime == -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_GatlingGun"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>1.1</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<!-- == ShootingAccuracy === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_GatlingGun"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>0.35</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Apparel_Headgear.xml b/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Apparel_Headgear.xml
deleted file mode 100644
index e47900c672..0000000000
--- a/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Apparel_Headgear.xml	
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Settlers</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Bandana === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFES_Headgear_Bandana"]/statBases</xpath>
-
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFES_Headgear_Bandana"]/statBases/StuffEffectMultiplierArmor</xpath>
-
-					<value>
-						<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFES_Headgear_Bandana"]/apparel/layers</xpath>
-
-					<value>
-						<layers>
-							<li>StrappedHead</li>
-						</layers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFES_Headgear_Bandana"]/equippedStatOffsets</xpath>
-
-					<value>
-						<SmokeSensitivity>-0.1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<!-- === Sombrero === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFES_Headgear_Sombrero"]/statBases</xpath>
-
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>2</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFES_Headgear_Sombrero"]/statBases/StuffEffectMultiplierArmor</xpath>
-
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- === Flat Cap === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFES_Headgear_FlatCap"]/statBases</xpath>
-
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFES_Headgear_FlatCap"]/statBases/StuffEffectMultiplierArmor</xpath>
-
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Apparel_Various.xml b/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Apparel_Various.xml
deleted file mode 100644
index e5fcec05ac..0000000000
--- a/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Apparel_Various.xml	
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Settlers</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Vest === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Vest"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_Vest"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<!-- === Great Dress === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_GreatDress"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_GreatDress"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Weapons/RangedIndustrial.xml b/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Weapons/RangedIndustrial.xml
deleted file mode 100644
index 7a81861791..0000000000
--- a/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Weapons/RangedIndustrial.xml	
+++ /dev/null
@@ -1,270 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Settlers</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName ="VFES_Gun_DoubleActionRevolver"]/tools</xpath>
-
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFES_Gun_DoubleBarreledShotgun" or defName="VFES_Gun_HuntingRifle"]/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>
-				</li>
-
-				<!-- === Double Action Revolver === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFES_Gun_DoubleActionRevolver</defName>
-
-					<statBases>
-						<WorkToMake>4500</WorkToMake>
-						<Mass>1.5</Mass>
-						<Bulk>1.39</Bulk>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-
-					<costList>
-						<Steel>35</Steel>
-						<WoodLog>5</WoodLog>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-
-					<Properties>
-						<recoilAmount>2.5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_44Magnum_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>VFE_Shot_DoubleactionRevolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>1</reloadTime>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<ammoSet>AmmoSet_44Magnum</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>Revolver</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFES_Gun_DoubleActionRevolver"]</xpath>
-
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>0.90,0.90</DrawSize>
-							<DrawOffset>0.05,0.01</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Double Barreled Shotgun === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFES_Gun_DoubleBarreledShotgun</defName>
-
-					<statBases>
-						<WorkToMake>7000</WorkToMake>
-						<Mass>3.8</Mass>
-						<Bulk>10</Bulk>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-
-					<costList>
-						<Steel>40</Steel>
-						<WoodLog>10</WoodLog>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-
-					<Properties>
-						<recoilAmount>3.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>Shot_Shotgun_NoRack</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>2</magazineSize>
-						<reloadTime>1.7</reloadTime>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFES_Gun_DoubleBarreledShotgun"]</xpath>
-
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.03,1.15</DrawSize>
-							<DrawOffset>0.05,0.0</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Hunting Rifle === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFES_Gun_HuntingRifle</defName>
-
-					<statBases>
-						<WorkToMake>12800</WorkToMake>
-						<Mass>7.30</Mass>
-						<Bulk>10.50</Bulk>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
-					</statBases>
-
-					<costList>
-						<Steel>45</Steel>
-						<WoodLog>10</WoodLog>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-
-					<Properties>
-						<recoilAmount>1.5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_303British_FMJ</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>75</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>1.2</reloadTime>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<ammoSet>AmmoSet_303British</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-
-					<!-- Disallow with Run and Gun -->
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFES_Gun_DoubleBarreledShotgun"]</xpath>
-
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.25,1.45</DrawSize>
-							<DrawOffset>0.10,0.1</DrawOffset>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Weapons/RangedIndustrialGrenades.xml b/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Weapons/RangedIndustrialGrenades.xml
deleted file mode 100644
index a5673379f4..0000000000
--- a/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Weapons/RangedIndustrialGrenades.xml	
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Settlers</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Dynamite === -->
-				<!-- == Projectile == -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFES_Proj_Dynamite"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFES_Proj_Dynamite"]/graphicData</xpath>
-					<value>
-						<graphicData>
-							<texPath>Things/Projectile/DynamiteThrown/DynamiteThrownA</texPath>
-							<graphicClass>Graphic_Single</graphicClass>
-						</graphicData>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFES_Proj_Dynamite"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<damageDef>Bomb</damageDef>
-							<explosionDelay>60</explosionDelay>
-							<explosionRadius>2.5</explosionRadius>
-							<damageAmountBase>50</damageAmountBase>
-							<armorPenetrationSharp>0</armorPenetrationSharp>
-							<armorPenetrationBlunt>0</armorPenetrationBlunt>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
-						</projectile>
-					</value>
-				</li>
-
-				<!-- == Weapon == -->
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="VFES_Weapon_GrenadeDynamite"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>BaseWeapon</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFES_Weapon_GrenadeDynamite"]/costList</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFES_Weapon_GrenadeDynamite"]</xpath>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<stackLimit>75</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "VFES_Weapon_GrenadeDynamite"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "VFES_Weapon_GrenadeDynamite"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFES_Weapon_GrenadeDynamite"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<explosiveDamageType>Bomb</explosiveDamageType>
-							<explosiveRadius>2.5</explosiveRadius>
-							<explosionSound>MortarBomb_Explode</explosionSound>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="VFES_Weapon_GrenadeDynamite"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFES_Weapon_GrenadeDynamite</defName>
-					<statBases>
-						<WorkToMake>12000</WorkToMake>
-						<MarketValue>5.05</MarketValue>
-						<Mass>0.4</Mass>
-						<Bulk>0.87</Bulk>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<label>throw dynamite stick</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>VFES_Proj_Dynamite</defaultProjectile>
-						<range>12</range>
-						<minRange>3</minRange>
-						<warmupTime>1.8</warmupTime>
-						<soundCast>ThrowGrenade</soundCast>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<weaponTags>
-						<li>GrenadeDynamite</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- == Recipe == -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>Make_VFES_Weapon_GrenadeDynamite</defName>
-							<label>make dynamite sticks x10</label>
-							<description>Craft 10 dynamite sticks.</description>
-							<jobString>Making dynamite sticks.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<stuffCategoriesToAllow>
-											<li>Woody</li>
-										</stuffCategoriesToAllow>
-									</filter>
-									<count>10</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Chemfuel</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<stuffCategoriesToAllow>
-									<li>Woody</li>
-								</stuffCategoriesToAllow>
-								<thingDefs>
-									<li>Chemfuel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<VFES_Weapon_GrenadeDynamite>10</VFES_Weapon_GrenadeDynamite>
-							</products>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Weapons/RangedMedieval.xml b/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Weapons/RangedMedieval.xml
deleted file mode 100644
index 372a76cbab..0000000000
--- a/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Weapons/RangedMedieval.xml	
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Settlers</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Tomahawk === -->
-				<!-- == Projectile == -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFES_Tomahawk_Thrown"]/graphicData</xpath>
-
-					<value>
-						<graphicData>
-							<texPath>Things/Projectile/TomahawkThrown/TomahawkThrownC</texPath>
-							<graphicClass>Graphic_Single</graphicClass>
-						</graphicData>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFES_Tomahawk_Thrown"]/projectile</xpath>
-
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<speed>12</speed>
-							<flyOverhead>false</flyOverhead>
-							<damageDef>Cut</damageDef>
-							<damageAmountBase>16</damageAmountBase>
-							<armorPenetrationSharp>1.562</armorPenetrationSharp>
-							<armorPenetrationBlunt>0.980</armorPenetrationBlunt>
-						</projectile>
-					</value>
-				</li>
-
-				<!-- == Weapon == -->
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="VFES_Tomahawk"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>BaseWeapon</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFES_Tomahawk"]</xpath>
-					<value>
-						<thingCategories>
-							<li>WeaponsRanged</li>
-						</thingCategories>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFES_Tomahawk"]/costStuffCount</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFES_Tomahawk"]/stuffCategories</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFES_Tomahawk"]/recipeMaker</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFES_Tomahawk"]/graphicData</xpath>
-					<value>
-						<color>(105,105,105)</color>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFES_Tomahawk"]</xpath>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<stackLimit>75</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="VFES_Tomahawk"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "VFES_Tomahawk"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "VFES_Tomahawk"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFES_Tomahawk</defName>
-					<statBases>
-						<Mass>1.2</Mass>
-						<Bulk>3.3</Bulk>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>1.5</ShotSpread>
-						<SwayFactor>2.5</SwayFactor>
-						<RangedWeapon_Cooldown>0.75</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<label>Throw tomahawk</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>VFES_Tomahawk_Thrown</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>10</range>
-						<soundCast>Interact_BeatFire</soundCast>
-					</Properties>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFES_Tomahawk"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.4</cooldownTime>
-								<armorPenetrationBlunt>0.375</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2.62</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.25</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- == Recipe == -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>Make_VFES_Tomahawk</defName>
-							<label>make tomahawk x10</label>
-							<description>Craft 10 tomahawks.</description>
-							<jobString>Making tomahawk.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>100</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<VFES_Tomahawk>10</VFES_Tomahawk>
-							</products>
-							<recipeUsers>
-								<li>FueledSmithy</li>
-								<li>ElectricSmithy</li>
-								<li>CraftingSpot</li>
-							</recipeUsers>
-							<researchPrerequisite>Smithing</researchPrerequisite>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Tribals/Apparel_Tribals.xml b/Patches/Vanilla Factions Expanded - Tribals/Apparel_Tribals.xml
deleted file mode 100644
index fb103d6817..0000000000
--- a/Patches/Vanilla Factions Expanded - Tribals/Apparel_Tribals.xml	
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Tribals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Light Tribalwear -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFET_Apparel_TribalLight"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-						<Bulk>1</Bulk>
-					</value>
-				</li>
-
-				<!-- Heavy Tribalwear -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFET_Apparel_TribalHeavy"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-						<Bulk>1</Bulk>
-					</value>
-				</li>
-
-				<!-- War Tribalwear -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFET_Apparel_TribalWar"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
-						<Bulk>5</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFET_Apparel_TribalWar"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.3</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Tribals/ThingDefs_WeaponsMelee.xml b/Patches/Vanilla Factions Expanded - Tribals/ThingDefs_WeaponsMelee.xml
deleted file mode 100644
index 5d8be17ec0..0000000000
--- a/Patches/Vanilla Factions Expanded - Tribals/ThingDefs_WeaponsMelee.xml	
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Tribals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- One-handed Tags -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "VFET_Stake" or defName="VFET_Chunk"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- Rock -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFET_Chunk"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>rock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.66</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFET_Chunk"]/statBases</xpath>
-					<value>
-						<Bulk>0.5</Bulk>
-						<MeleeCounterParryBonus>0.1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<!-- Stake -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFET_Stake"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<chanceFactor>0.33</chanceFactor>
-								<cooldownTime>1.4</cooldownTime>
-								<armorPenetrationBlunt>0.65</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>6.5</power>
-								<cooldownTime>1.4</cooldownTime>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.28</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFET_Stake"]/statBases</xpath>
-					<value>
-						<Bulk>0.25</Bulk>
-						<MeleeCounterParryBonus>0.1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFET_Stake"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.08</MeleeCritChance>
-							<MeleeParryChance>0.12</MeleeParryChance>
-							<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Tribals/ThingDefs_WeaponsRanged.xml b/Patches/Vanilla Factions Expanded - Tribals/ThingDefs_WeaponsRanged.xml
deleted file mode 100644
index dead34adef..0000000000
--- a/Patches/Vanilla Factions Expanded - Tribals/ThingDefs_WeaponsRanged.xml	
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Tribals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- One-handed Tags -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "VFET_Throwspikes"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="VFET_Throwspikes"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>SpikeBase_VFET</value>
-				</li>
-
-				<li Class="PatchOperationAttributeAdd">
-					<xpath>Defs/ThingDef[defName="VFET_Throwspikes"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFET_Throwspikes"]/costList</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFET_Throwspikes"]</xpath>
-					<value>
-						<techLevel>Neolithic</techLevel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFET_Throwspikes"]/recipeMaker</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFET_Throwspikes"]/statBases</xpath>
-					<value>
-						<statBases>
-							<MarketValue>0.7</MarketValue>
-							<SightsEfficiency>1.0</SightsEfficiency>
-							<ShotSpread>1.5</ShotSpread>
-							<SwayFactor>2.5</SwayFactor>
-							<Bulk>1.5</Bulk>
-							<Mass>1</Mass>
-							<RangedWeapon_Cooldown>1.3</RangedWeapon_Cooldown>
-						</statBases>
-						<stackLimit>50</stackLimit>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFET_Throwspikes"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Tribal_Spike_Thrown</defaultProjectile>
-								<warmupTime>1</warmupTime>
-								<range>10</range>
-								<soundCast>Interact_BeatFire</soundCast>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFET_Throwspikes"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>limb</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.35</cooldownTime>
-								<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Add Projectiles and Recipes for the throwspikes. === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- This dummy parent just provides a workaround so VFE - Tribal can be loaded before CE. -->
-						<ThingDef ParentName="BaseWeaponAndAmmoNeolithic" Name="SpikeBase_VFET" Abstract="True" />
-
-						<ThingDef ParentName="BasePilumProjectile">
-							<graphicData>
-								<texPath>Projectile/Projectile_Throwspikes</texPath>
-							</graphicData>
-							<defName>Tribal_Spike_Thrown</defName>
-							<label>throwspike</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>14</damageAmountBase>
-								<speed>10</speed>
-								<armorPenetrationBlunt>3.44</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<preExplosionSpawnChance>0.70</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>VFET_Throwspikes</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>MakeAmmo_VFET_Throwspikes</defName>
-							<label>make throwspikes x20</label>
-							<description>Craft 20 throwspikes.</description>
-							<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-							<workSkill>Crafting</workSkill>
-							<recipeUsers>
-								<li>CraftingSpot</li>
-							</recipeUsers>
-							<effectWorking>Smelt</effectWorking>
-							<unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
-							<workAmount>800</workAmount>
-							<jobString>Making throwspikes.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<VFET_Throwspikes>20</VFET_Throwspikes>
-							</products>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Vikings/Ammo_Vikings.xml b/Patches/Vanilla Factions Expanded - Vikings/Ammo_Vikings.xml
deleted file mode 100644
index 14311e5781..0000000000
--- a/Patches/Vanilla Factions Expanded - Vikings/Ammo_Vikings.xml	
+++ /dev/null
@@ -1,417 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Vikings</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<!-- ==================== Ammo Categories ========================== -->
-
-				<CombatExtended.AmmoCategoryDef>
-					<defName>Crypto</defName>
-					<label>crypto</label>
-					<description>Metal-cored projectiles wrapped in an unstable crypto technology, capable of dealing both ballistic and cold damage.</description>
-				</CombatExtended.AmmoCategoryDef>
-
-				<!-- ==================== Thing Categories ========================== -->
-
-				<ThingCategoryDef>
-					<defName>AmmoCryptoRifle</defName>
-					<label>crypto rifle</label>
-					<parent>AmmoAdvanced</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
-				</ThingCategoryDef>
-
-				<ThingCategoryDef>
-					<defName>AmmoCryptoPistol</defName>
-					<label>crypto pistol</label>
-					<parent>AmmoAdvanced</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
-				</ThingCategoryDef>
-
-				<ThingCategoryDef>
-					<defName>AmmoCryptoBolt</defName>
-					<label>crypto bolt</label>
-					<parent>AmmoAdvanced</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
-				</ThingCategoryDef>
-
-				<ThingCategoryDef>
-					<defName>AmmoCryptoHeavyBolt</defName>
-					<label>crypto heavy bolt</label>
-					<parent>AmmoAdvanced</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
-				</ThingCategoryDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_CryptoRifle</defName>
-					<label>Crypto Rifle</label>
-					<ammoTypes>
-						<Ammo_CryptoRifle>Bullet_CryptoRifle</Ammo_CryptoRifle>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_CryptoPistol</defName>
-					<label>Crypto Pistol</label>
-					<ammoTypes>
-						<Ammo_CryptoPistol>Bullet_CryptoPistol</Ammo_CryptoPistol>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_CryptoBolt</defName>
-					<label>Crypto Bolt</label>
-					<ammoTypes>
-						<Ammo_CryptoBolt>Bullet_CryptoBolt</Ammo_CryptoBolt>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_CryptoHeavyBolt</defName>
-					<label>Crypto Bolt</label>
-					<ammoTypes>
-						<Ammo_CryptoHeavyBolt>Bullet_CryptoHeavyBolt</Ammo_CryptoHeavyBolt>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="CryptoAmmoBase" ParentName="SpacerSmallAmmoBase" Abstract="True">
-					<description>Metal-cored projectiles wrapped in unstable crypto technology contained with an energy field. Capable of dealing both ballistic damage and causing serious hypothermia.</description>
-					<graphicData>
-						<texPath>ThirdParty/VanillaExpanded/Crypto</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting</li>
-					</tradeTags>
-					<ammoClass>Crypto</ammoClass>
-					<stackLimit>2500</stackLimit>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" Name="CryptoPistolBase" ParentName="CryptoAmmoBase">
-					<defName>Ammo_CryptoRifle</defName>
-					<label>crypto rifle cartridge</label>
-					<graphicData>
-						<drawSize>0.75</drawSize>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.7</MarketValue>
-						<Mass>0.01</Mass>
-						<Bulk>0.01</Bulk>
-					</statBases>
-					<thingCategories>
-						<li>AmmoCryptoRifle</li>
-					</thingCategories>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="CryptoAmmoBase">
-					<defName>Ammo_CryptoPistol</defName>
-					<label>crypto pistol cartridge</label>
-					<graphicData>
-						<drawSize>0.70</drawSize>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.69</MarketValue>
-						<Mass>0.008</Mass>
-						<Bulk>0.01</Bulk>
-					</statBases>
-					<thingCategories>
-						<li>AmmoCryptoPistol</li>
-					</thingCategories>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="CryptoAmmoBase">
-					<defName>Ammo_CryptoBolt</defName>
-					<label>crypto bolt</label>
-					<graphicData>
-						<drawSize>0.8</drawSize>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.69</MarketValue>
-						<Mass>0.008</Mass>
-						<Bulk>0.01</Bulk>
-					</statBases>
-					<thingCategories>
-						<li>AmmoCryptoBolt</li>
-					</thingCategories>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="CryptoAmmoBase">
-					<defName>Ammo_CryptoHeavyBolt</defName>
-					<label>heavy crypto bolt</label>
-					<graphicData>
-						<drawSize>1</drawSize>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.69</MarketValue>
-						<Mass>0.10</Mass>
-						<Bulk>0.05</Bulk>
-					</statBases>
-					<thingCategories>
-						<li>AmmoCryptoHeavyBolt</li>
-					</thingCategories>
-				</ThingDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef ParentName="Base6x24mmChargedBullet">
-					<defName>Bullet_CryptoRifle</defName>
-					<label>crypto bullet</label>
-					<!--	<thingClass>VFEV.CryptoBullet</thingClass> -->
-					<graphicData>
-						<texPath>Things/Projectile/CryptoBullet</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-						<shaderType>TransparentPostLight</shaderType>
-						<drawSize>0.60</drawSize>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>CE_Crypto</damageDef>
-						<damageAmountBase>11</damageAmountBase>
-						<speed>122</speed>
-						<armorPenetrationSharp>22.5</armorPenetrationSharp>
-						<armorPenetrationBlunt>26</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base6x18mmChargedBullet">
-					<defName>Bullet_CryptoPistol</defName>
-					<label>crypto bullet</label>
-					<!--	<thingClass>VFEV.CryptoBullet</thingClass> -->
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>CE_Crypto</damageDef>
-						<damageAmountBase>9</damageAmountBase>
-						<speed>122</speed>
-						<armorPenetrationSharp>16</armorPenetrationSharp>
-						<armorPenetrationBlunt>18</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base6x24mmChargedBullet">
-					<defName>Bullet_CryptoBolt</defName>
-					<label>crypto bolt</label>
-					<!--	<thingClass>VFEV.CryptoBullet</thingClass> -->
-					<graphicData>
-						<texPath>Things/Projectile/CryptoBolt</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-						<shaderType>TransparentPostLight</shaderType>
-						<drawSize>1.00</drawSize>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>CE_Crypto</damageDef>
-						<damageAmountBase>24</damageAmountBase>
-						<speed>122</speed>
-						<armorPenetrationSharp>14</armorPenetrationSharp>
-						<armorPenetrationBlunt>26</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base6x24mmChargedBullet">
-					<defName>Bullet_CryptoHeavyBolt</defName>
-					<label>heavy crypto bolt</label>
-					<!--	<thingClass>VFEV.CryptoBullet</thingClass> -->
-					<graphicData>
-						<texPath>Things/Projectile/CryptoBolt</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-						<shaderType>TransparentPostLight</shaderType>
-						<drawSize>1.0</drawSize>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageDef>CE_Crypto</damageDef>
-						<damageAmountBase>52</damageAmountBase>
-						<speed>122</speed>
-						<armorPenetrationSharp>24</armorPenetrationSharp>
-						<armorPenetrationBlunt>64</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="ChargeAmmoRecipeBase">
-					<defName>MakeAmmo_CryptoRifle</defName>
-					<label>make crypto rifle cartridge x500</label>
-					<description>Craft 500 crypto rifle cartridge cartridges.</description>
-					<jobString>Making crypto rifle cartridge cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Plasteel</li>
-								</thingDefs>
-							</filter>
-							<count>6</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>8</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>8</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Plasteel</li>
-							<li>Steel</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_CryptoRifle>500</Ammo_CryptoRifle>
-					</products>
-					<workAmount>8600</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="ChargeAmmoRecipeBase">
-					<defName>MakeAmmo_CryptoPistol</defName>
-					<label>make crypto pistol cartridge x500</label>
-					<description>Craft 500 crypto pistol cartridges.</description>
-					<jobString>Making crypto pistol cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Plasteel</li>
-								</thingDefs>
-							</filter>
-							<count>8</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>6</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>8</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Plasteel</li>
-							<li>Steel</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_CryptoPistol>500</Ammo_CryptoPistol>
-					</products>
-					<workAmount>9800</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="ChargeAmmoRecipeBase">
-					<defName>MakeAmmo_CryptoBolt</defName>
-					<label>make crypto bolt x50</label>
-					<description>Craft 50 crypto bolt.</description>
-					<jobString>Making crypto bolt.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Plasteel</li>
-								</thingDefs>
-							</filter>
-							<count>10</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>8</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Plasteel</li>
-							<li>Steel</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_CryptoBolt>50</Ammo_CryptoBolt>
-					</products>
-					<workAmount>10400</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="ChargeAmmoRecipeBase">
-					<defName>MakeAmmo_CryptoHeavyBolt</defName>
-					<label>make heavy crypto bolt x50</label>
-					<description>Craft 50 heavy crypto bolt.</description>
-					<jobString>Making heavy crypto bolt.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Plasteel</li>
-								</thingDefs>
-							</filter>
-							<count>12</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>10</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>2</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Plasteel</li>
-							<li>Steel</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_CryptoHeavyBolt>50</Ammo_CryptoHeavyBolt>
-					</products>
-					<workAmount>14400</workAmount>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Vikings/Apparel_Headgear.xml b/Patches/Vanilla Factions Expanded - Vikings/Apparel_Headgear.xml
deleted file mode 100644
index 141f8fcbc8..0000000000
--- a/Patches/Vanilla Factions Expanded - Vikings/Apparel_Headgear.xml	
+++ /dev/null
@@ -1,309 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Vikings</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Guardian Helmet -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_Apparel_GuardianHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_Apparel_GuardianHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFEV_Apparel_GuardianHelmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- Leather Helmet -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_Apparel_LeatherHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_Apparel_LeatherHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<!-- Ravager Helmet -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_Apparel_RavagerHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_Apparel_RavagerHelmet"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<AimingAccuracy>-0.4</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_Apparel_RavagerHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<!-- Moose Headdress -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_MooseHeaddress"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>10</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_MooseHeaddress"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>2.5</WornBulk>
-					</value>
-				</li>
-
-				<!-- Bear Headdress -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_BearHeaddress"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>10</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_BearHeaddress"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>2.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_BearHeaddress"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<Suppressability>-10</Suppressability>
-							<PainShockThreshold>0.80</PainShockThreshold>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Jarl Crown -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_JarlCrown"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_JarlCrown"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<!-- Crypto Helmet Base -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="VFEV_ApparelCryptoHelmetPowerBase"]/apparel/layers</xpath>
-					<value>
-						<li>OnHead</li>
-						<li>StrappedHead</li>
-					</value>
-				</li>
-
-				<!-- Crypto Light Helmet -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_Apparel_CryptoLightHelmet"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>4</Bulk>
-							<WornBulk>1</WornBulk>
-							<Flammability>0</Flammability>
-							<MaxHitPoints>190</MaxHitPoints>
-							<ArmorRating_Sharp>12</ArmorRating_Sharp>
-							<ArmorRating_Blunt>28</ArmorRating_Blunt>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFEV_Apparel_CryptoLightHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFEV_Apparel_CryptoLightHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_Apparel_CryptoLightHelmet"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>0.1</AimingAccuracy>
-							<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFEV_Apparel_CryptoLightHelmet"]</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>
-				</li>
-
-				<!-- Crypto Heavy Helmet -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_Apparel_CryptoHeavyHelmet"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_Apparel_CryptoHeavyHelmet"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_Apparel_CryptoHeavyHelmet"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>240</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_Apparel_CryptoHeavyHelmet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_Apparel_CryptoHeavyHelmet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>36</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFEV_Apparel_CryptoHeavyHelmet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFEV_Apparel_CryptoHeavyHelmet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_Apparel_CryptoHeavyHelmet"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<AimingAccuracy>0.15</AimingAccuracy>
-							<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFEV_Apparel_CryptoHeavyHelmet"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Eye</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Vikings/Apparel_Misc.xml b/Patches/Vanilla Factions Expanded - Vikings/Apparel_Misc.xml
deleted file mode 100644
index b5a8598107..0000000000
--- a/Patches/Vanilla Factions Expanded - Vikings/Apparel_Misc.xml	
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Vikings</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Torch Belt -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_Apparel_TorchBelt"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<label>throw torch</label>
-								<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<onlyManualCast>True</onlyManualCast>
-								<range>12.9</range>
-								<warmupTime>0.6</warmupTime>
-								<noiseRadius>2</noiseRadius>
-								<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-								<soundCast>ThrowMolotovCocktail</soundCast>
-								<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<defaultProjectile>VFEV_Proj_GrenadeTorch</defaultProjectile>
-								<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_Apparel_TorchBelt"]/statBases</xpath>
-					<value>
-						<Bulk>0</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_Proj_GrenadeTorch"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>0.9</explosionRadius>
-							<damageDef>Flame</damageDef>
-							<speed>10</speed>
-							<ai_IsIncendiary>true</ai_IsIncendiary>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_Proj_GrenadeTorch"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Projectile_FireTrail</thingClass>
-					</value>
-				</li>
-
-				<!-- Shield Base -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="VFEV_BaseShield" or @Name="VFEV_BaseShieldCrypto"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Apparel_Shield</thingClass>
-					</value>
-				</li>
-
-				<!-- Round Shield -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_Shield_Round"]</xpath>
-					<value>
-
-						<ThingDef ParentName="ShieldBase">
-							<defName>VFEV_Shield_Round</defName>
-							<label>round shield</label>
-							<description>A wooden shield held together with a metal band, finished off with a leather inset to protect from rain. A leather strap and metal handle are also present on the back to allow for easy one-handed maneuvering during combat.</description>
-							<techLevel>Medieval</techLevel>
-							<graphicData>
-								<texPath>Things/Item/Equipment/Shield/RoundShield/RoundShield</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>CutoutComplex</shaderType>
-								<drawSize>1</drawSize>
-							</graphicData>
-							<thingClass>CombatExtended.Apparel_Shield</thingClass>
-							<costStuffCount>25</costStuffCount>
-							<costList>
-								<WoodLog>50</WoodLog>
-								<Steel>20</Steel>
-							</costList>
-							<recipeMaker>
-								<researchPrerequisite Inherit='False'>Smithing</researchPrerequisite>
-							</recipeMaker>
-							<stuffCategories>
-								<li>Leathery</li>
-							</stuffCategories>
-							<statBases>
-								<MaxHitPoints>120</MaxHitPoints>
-								<Flammability>1.0</Flammability>
-								<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-								<ArmorRating_Blunt>2.6</ArmorRating_Blunt>
-								<ArmorRating_Heat>0.55</ArmorRating_Heat>
-								<WorkToMake>2600</WorkToMake>
-								<Mass>1.7</Mass>
-								<StuffEffectMultiplierArmor>1.2</StuffEffectMultiplierArmor>
-								<Bulk>6</Bulk>
-								<WornBulk>5</WornBulk>
-							</statBases>
-							<equippedStatOffsets>
-								<ReloadSpeed>-0.1</ReloadSpeed>
-								<MeleeHitChance>-1</MeleeHitChance>
-								<ShootingAccuracyPawn>-0.2</ShootingAccuracyPawn>
-								<AimingAccuracy>-0.05</AimingAccuracy>
-								<Suppressability>-0.25</Suppressability>
-								<MeleeCritChance>-0.08</MeleeCritChance>
-								<MeleeParryChance>1.0</MeleeParryChance>
-							</equippedStatOffsets>
-							<apparel>
-								<tags>
-									<li>VikingShield_Basic</li>
-								</tags>
-							</apparel>
-							<comps>
-								<li>
-									<compClass>CompColorable</compClass>
-								</li>
-							</comps>
-							<modExtensions>
-								<li Class="CombatExtended.ShieldDefExtension">
-									<shieldCoverage>
-										<li>Hands</li>
-										<li>Arms</li>
-										<li>Shoulders</li>
-										<li>Torso</li>
-										<li>Neck</li>
-									</shieldCoverage>
-									<crouchCoverage>
-										<li>Legs</li>
-									</crouchCoverage>
-									<drawAsTall>false</drawAsTall>
-								</li>
-							</modExtensions>
-						</ThingDef>
-
-					</value>
-				</li>
-
-				<!-- Crypto Shield -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_Shield_Crypto"]</xpath>
-					<value>
-
-						<ThingDef ParentName="ShieldBase">
-							<defName>VFEV_Shield_Crypto</defName>
-							<label>crypto shield</label>
-							<description>A stabilized crypto-tech field wrapped around an advanced frame, capable of slowing the speed of the atoms of incoming projectiles to a halt. Does nothing to protect against heat and blunt trauma.</description>
-							<techLevel>Ultra</techLevel>
-							<graphicData>
-								<texPath>Things/Item/Equipment/Shield/CryptoShield/CryptoShield</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>1</drawSize>
-							</graphicData>
-							<thingClass>CombatExtended.Apparel_Shield</thingClass>
-							<recipeMaker Inherit="False" />
-							<costList>
-								<Plasteel>120</Plasteel>
-								<ComponentSpacer>6</ComponentSpacer>
-							</costList>
-							<statBases>
-								<MaxHitPoints>160</MaxHitPoints>
-								<Flammability>0</Flammability>
-								<ArmorRating_Sharp>75</ArmorRating_Sharp>
-								<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
-								<ArmorRating_Heat>0</ArmorRating_Heat>
-								<WorkToMake>2600</WorkToMake>
-								<Mass>2</Mass>
-								<Bulk>6</Bulk>
-								<WornBulk>5</WornBulk>
-							</statBases>
-							<equippedStatOffsets>
-								<ReloadSpeed>-0.1</ReloadSpeed>
-								<MeleeHitChance>-1</MeleeHitChance>
-								<ShootingAccuracyPawn>-0.2</ShootingAccuracyPawn>
-								<AimingAccuracy>-0.05</AimingAccuracy>
-								<Suppressability>-0.25</Suppressability>
-								<MeleeCritChance>-0.08</MeleeCritChance>
-								<MeleeParryChance>1.0</MeleeParryChance>
-							</equippedStatOffsets>
-							<apparel>
-								<tags>
-									<li>VikingShield_Basic</li>
-								</tags>
-							</apparel>
-							<comps>
-								<li>
-									<compClass>CompColorable</compClass>
-								</li>
-							</comps>
-							<modExtensions>
-								<li Class="CombatExtended.ShieldDefExtension">
-									<shieldCoverage>
-										<li>Hands</li>
-										<li>Arms</li>
-										<li>Shoulders</li>
-										<li>Torso</li>
-										<li>Neck</li>
-									</shieldCoverage>
-									<crouchCoverage>
-										<li>Legs</li>
-									</crouchCoverage>
-									<drawAsTall>false</drawAsTall>
-								</li>
-							</modExtensions>
-						</ThingDef>
-
-					</value>
-				</li>
-
-				<!-- Orbital Targeter - Mjollnir -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_OrbitalTargeterMjollnir"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>0</Bulk>
-						</statBases>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Vikings/Apparel_Viking.xml b/Patches/Vanilla Factions Expanded - Vikings/Apparel_Viking.xml
deleted file mode 100644
index d8fe9fb9f2..0000000000
--- a/Patches/Vanilla Factions Expanded - Vikings/Apparel_Viking.xml	
+++ /dev/null
@@ -1,342 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Vikings</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Guardian Armor -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_Apparel_GuardianArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_Apparel_GuardianArmor"]/statBases</xpath>
-					<value>
-						<Bulk>80</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFEV_Apparel_GuardianArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_Apparel_GuardianArmor"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeDodgeChance>-0.15</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_Apparel_GuardianArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFEV_Apparel_GuardianArmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- Leather Armor -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_LeatherArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_LeatherArmor"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<WornBulk>4</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_LeatherArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<!-- Ravager Armor -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_Apparel_RavagerArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>10</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_Apparel_RavagerArmor"]/statBases</xpath>
-					<value>
-						<Bulk>14</Bulk>
-						<WornBulk>4</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_Apparel_RavagerArmor"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFEV_Apparel_RavagerArmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- Jarl Cape -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_Apparel_JarlCape"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>7.75</Bulk>
-						<WornBulk>1.5</WornBulk>
-						<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Royal Fur Coat -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_Apparel_RoyalFurCoat"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<Bulk>7.75</Bulk>
-						<WornBulk>1.5</WornBulk>
-						<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<!-- Crypto Armor Base -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="VFEV_ApparelArmorCryptoBase"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<!-- Crypto Armor -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_CryptoArmor"]/statBases</xpath>
-					<value>
-						<Bulk>80</Bulk>
-						<WornBulk>12</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_CryptoArmor"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>350</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_CryptoArmor"]/statBases/Mass</xpath>
-					<value>
-						<Mass>45</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_CryptoArmor"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_CryptoArmor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>18</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_CryptoArmor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>46</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_CryptoArmor"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>25</CarryWeight>
-							<CarryBulk>15</CarryBulk>
-							<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Heavy Crypto Armor -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_CryptoHeavyArmor"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>100</Bulk>
-							<WornBulk>15</WornBulk>
-							<MaxHitPoints>475</MaxHitPoints>
-							<Mass>50</Mass>
-							<Flammability>0</Flammability>
-							<ArmorRating_Sharp>20</ArmorRating_Sharp>
-							<ArmorRating_Blunt>45</ArmorRating_Blunt>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_CryptoHeavyArmor"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>80</CarryWeight>
-							<CarryBulk>20</CarryBulk>
-							<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-							<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFEV_CryptoArmor" or defName="VFEV_CryptoHeavyArmor"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Vikings/DamageDefs_Vikings.xml b/Patches/Vanilla Factions Expanded - Vikings/DamageDefs_Vikings.xml
deleted file mode 100644
index 452346a7e6..0000000000
--- a/Patches/Vanilla Factions Expanded - Vikings/DamageDefs_Vikings.xml	
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Vikings</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ToolCapacityDef>
-					<defName>CE_CryptoCut</defName>
-					<label>cut</label>
-				</ToolCapacityDef>
-
-				<DamageDef ParentName="CutBase">
-					<defName>CE_CryptoCut</defName>
-					<label>the cutting and hypothermic damage of advanced crypto weaponry</label>
-					<additionalHediffs>
-						<li>
-							<hediff>Hypothermia</hediff>
-							<severityPerDamageDealt>0.01</severityPerDamageDealt>
-						</li>
-					</additionalHediffs>
-				</DamageDef>
-
-				<DamageDef ParentName="Bullet">
-					<defName>CE_Crypto</defName>
-					<label>the ballistic and hypothermic damage of advanced crypto munitions</label>
-					<additionalHediffs>
-						<li>
-							<hediff>Hypothermia</hediff>
-							<severityPerDamageDealt>0.01</severityPerDamageDealt>
-						</li>
-					</additionalHediffs>
-				</DamageDef>
-
-			</value>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Vikings/PawnKindDefs_Vikings.xml b/Patches/Vanilla Factions Expanded - Vikings/PawnKindDefs_Vikings.xml
deleted file mode 100644
index d09ba01977..0000000000
--- a/Patches/Vanilla Factions Expanded - Vikings/PawnKindDefs_Vikings.xml	
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Vikings</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Vikings -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="VFEV_Raider"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>8</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>150</min>
-									<max>350</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>VikingMeleeBasic</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="VFEV_Archer"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>10</min>
-								<max>28</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>150</min>
-									<max>350</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>VikingMeleeBasic</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<!-- Special -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="VFEV_VikingLegend"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>10</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Vikings/Races_Animal_Domestic.xml b/Patches/Vanilla Factions Expanded - Vikings/Races_Animal_Domestic.xml
deleted file mode 100644
index 9f1c3bd312..0000000000
--- a/Patches/Vanilla Factions Expanded - Vikings/Races_Animal_Domestic.xml	
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Vikings</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Wooly Cow ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_WoolyCow"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.08</MeleeDodgeChance>
-						<MeleeCritChance>0.13</MeleeCritChance>
-						<MeleeParryChance>0.18</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_WoolyCow"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>horns</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>2.12</cooldownTime>
-								<chanceFactor>0.65</chanceFactor>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFEV_WoolyCow"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_Wolfhound"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.22</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0.04</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_Wolfhound"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.8</cooldownTime>
-								<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.8</cooldownTime>
-								<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>1.63</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.380</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFEV_Wolfhound"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Vikings/Races_Animal_Giant.xml b/Patches/Vanilla Factions Expanded - Vikings/Races_Animal_Giant.xml
deleted file mode 100644
index f4d129d69f..0000000000
--- a/Patches/Vanilla Factions Expanded - Vikings/Races_Animal_Giant.xml	
+++ /dev/null
@@ -1,379 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Vikings</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Lothurr ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_Lothurr"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.04</MeleeDodgeChance>
-						<MeleeCritChance>0.76</MeleeCritChance>
-						<MeleeParryChance>0.45</MeleeParryChance>
-						<Flammability>0.6</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_Lothurr"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>24</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_Lothurr"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_Lothurr"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.75</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_Lothurr"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>49</power>
-								<cooldownTime>2.72</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.64</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>45</power>
-								<cooldownTime>2.72</cooldownTime>
-								<chanceFactor>0.65</chanceFactor>
-								<linkedBodyPartsGroup>HornAttackTool_2</linkedBodyPartsGroup>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>2.33</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>10.640</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>2.33</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>10.640</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.62</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.00</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2.52</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFEV_Lothurr"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFEV_Lothurr"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFEV_Lothurr"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_Lothurr"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>4000</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Fenrir ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFEV_Fenrir"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_Fenrir"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>15</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_Fenrir"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_Fenrir"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.16</MeleeDodgeChance>
-						<MeleeCritChance>0.80</MeleeCritChance>
-						<MeleeParryChance>0.23</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_Fenrir"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>1.49</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>6.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>3.25</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>1.49</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>6.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>3.25</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>34</power>
-								<cooldownTime>1.86</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<chanceFactor>2</chanceFactor>
-								<armorPenetrationSharp>5.35</armorPenetrationSharp>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>4.6</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>6.225</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFEV_Fenrir"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFEV_Fenrir"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_Fenrir"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1962</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Njorun ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFEV_Njorun"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_Njorun"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>17</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_Njorun"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_Njorun"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.16</MeleeDodgeChance>
-						<MeleeCritChance>0.80</MeleeCritChance>
-						<MeleeParryChance>0.23</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_Njorun"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2.6</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>3.4</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFEV_Njorun"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFEV_Njorun"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_Njorun"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>4250</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Vikings/Races_Mechanoid.xml b/Patches/Vanilla Factions Expanded - Vikings/Races_Mechanoid.xml
deleted file mode 100644
index 3d853e872d..0000000000
--- a/Patches/Vanilla Factions Expanded - Vikings/Races_Mechanoid.xml	
+++ /dev/null
@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Vikings</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Odin Body ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "VFEV_Odin"]/corePart</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "VFEV_Odin"]/corePart/parts/li[def = "MechanicalNeck"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "VFEV_Odin"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def = "MechanicalHead"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "VFEV_Odin"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def = "MechanicalHead"]/parts/li[def="HearingSensor"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "VFEV_Odin"]/corePart/parts/li[def = "MechanicalShoulder"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "VFEV_Odin"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def = "MechanicalArm"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "VFEV_Odin"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def = "MechanicalArm"]/parts/li[def = "MechanicalHand"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "VFEV_Odin"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def = "MechanicalArm"]/parts/li[def = "MechanicalHand"]/parts/li[def = "MechanicalFinger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "VFEV_Odin"]/corePart/parts/li[def = "MechanicalLeg"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName = "VFEV_Odin"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def = "MechanicalFoot"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<!-- ========== Odin ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_Mech_Odin"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.04</MeleeDodgeChance>
-						<MeleeCritChance>0.76</MeleeCritChance>
-						<MeleeParryChance>0.45</MeleeParryChance>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_Mech_Odin"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_Mech_Odin"]/statBases</xpath>
-					<value>
-						<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_Mech_Odin"]/statBases</xpath>
-					<value>
-						<ArmorRating_Heat>2</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_Mech_Odin"]</xpath>
-					<value>
-						<damageMultipliers>
-							<li>
-								<damageDef>VFEV_Cut</damageDef>
-								<multiplier>2</multiplier>
-							</li>
-							<li>
-								<damageDef>Cut</damageDef>
-								<multiplier>2</multiplier>
-							</li>
-							<li>
-								<damageDef>Stab</damageDef>
-								<multiplier>2</multiplier>
-							</li>
-							<li>
-								<damageDef>Bullet</damageDef>
-								<multiplier>0.8</multiplier>
-							</li>
-							<li>
-								<damageDef>Flame</damageDef>
-								<multiplier>0</multiplier>
-							</li>
-						</damageMultipliers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_Mech_Odin"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>24.0</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>24.0</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>3.20</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VFEV_Mech_Odin"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFEV_Mech_Odin"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFEV_Mech_Odin"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_Mech_Odin"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>3000</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>300</MaxOverHeal>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="VFEV_Mech_Odin"]/combatPower</xpath>
-					<value>
-						<combatPower>600</combatPower>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Vikings/Scenarios_Vikings.xml b/Patches/Vanilla Factions Expanded - Vikings/Scenarios_Vikings.xml
deleted file mode 100644
index e475889d9a..0000000000
--- a/Patches/Vanilla Factions Expanded - Vikings/Scenarios_Vikings.xml	
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Vikings</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ScenarioDef[defName="VFEV_NewClan"]/scenario/parts/li[thingDef="VFE_Harpoon" and @Class="ScenPart_StartingThing_Defined"]/count</xpath>
-					<value>
-						<count>20</count>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="VFEV_NewClan"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_Arrow_Steel</thingDef>
-							<count>100</count>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Vikings/ThingDef_Items.xml b/Patches/Vanilla Factions Expanded - Vikings/ThingDef_Items.xml
deleted file mode 100644
index 833fd8fcb8..0000000000
--- a/Patches/Vanilla Factions Expanded - Vikings/ThingDef_Items.xml	
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Vikings</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Add Bulk to items. -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "VFEV_Honey"]/statBases</xpath>
-					<value>
-						<Bulk>0.05</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "VFEV_Sweetroll"]/statBases</xpath>
-					<value>
-						<Bulk>0.25</Bulk>
-					</value>
-				</li>
-
-				<!-- Give Mead Bulk and Melee tools. -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "VFEV_Mead"]/statBases</xpath>
-					<value>
-						<Bulk>3.5</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_Mead"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2.22</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>neck</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>3.33</cooldownTime>
-								<armorPenetrationBlunt>0.150</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Neck</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_Mead"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.1</MeleeCritChance>
-							<MeleeParryChance>0.33</MeleeParryChance>
-							<MeleeDodgeChance>0.07</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Give Lothurr Antler Bulk and Melee tools. -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "VFEV_LothurrAntler"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VFEV_LothurrAntler"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Patch leathers. -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_Leather_Fenrir"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.75</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_Leather_Fenrir"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.09</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VFEV_Leather_Fenrir"]/stuffProps/categories</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFEV_Leather_Fenrir"]/stuffProps</xpath>
-						<value>
-							<categories>
-								<li>SoftArmor</li>
-							</categories>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VFEV_Leather_Fenrir"]/stuffProps/categories</xpath>
-						<value>
-							<li>SoftArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_Leather_Lothurr"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.6</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_Leather_Lothurr"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_Leather_Njorun"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.2</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_Leather_Njorun"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.08</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Vikings/Weapons_Crypto.xml b/Patches/Vanilla Factions Expanded - Vikings/Weapons_Crypto.xml
deleted file mode 100644
index 2022bc5d6c..0000000000
--- a/Patches/Vanilla Factions Expanded - Vikings/Weapons_Crypto.xml	
+++ /dev/null
@@ -1,349 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Vikings</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Light Crypto Axe === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_CryptoLightAxe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.66</cooldownTime>
-								<chanceFactor>0.33</chanceFactor>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>VFEV_Cut</li>
-								</capacities>
-								<power>29</power>
-								<cooldownTime>2.63</cooldownTime>
-								<armorPenetrationBlunt>4.85</armorPenetrationBlunt>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_CryptoLightAxe"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.20</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_CryptoLightAxe"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.23</MeleeCritChance>
-							<MeleeParryChance>0.20</MeleeParryChance>
-							<MeleeDodgeChance>0.27</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_CryptoLightAxe"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- === Heavy Crypto Axe === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_CryptoHeavyAxe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.78</cooldownTime>
-								<chanceFactor>0.33</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>VFEV_Cut</li>
-								</capacities>
-								<power>39</power>
-								<cooldownTime>3.09</cooldownTime>
-								<armorPenetrationBlunt>4.84</armorPenetrationBlunt>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_CryptoHeavyAxe"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEV_CryptoHeavyAxe"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.26</MeleeCritChance>
-							<MeleeParryChance>0.75</MeleeParryChance>
-							<MeleeDodgeChance>0.50</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- === Melee Tools === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_CryptoPistol"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_CryptoLightCrossbow" or defName="VFEV_CryptoRifle"]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEV_CryptoHeavyCrossbow"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stirrup</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2.44</cooldownTime>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Heavy Crypto Crossbow === -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFEV_CryptoHeavyCrossbow</defName>
-					<statBases>
-						<Bulk>10</Bulk>
-						<SwayFactor>2.00</SwayFactor>
-						<ShotSpread>0.07</ShotSpread>
-						<SightsEfficiency>1.8</SightsEfficiency>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_CryptoHeavyBolt</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>42</range>
-						<soundCast>VFEV_CryptoLightCrossbowShot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>5.5</reloadTime>
-						<ammoSet>AmmoSet_CryptoHeavyBolt</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- === Light Crypto Crossbow === -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFEV_CryptoLightCrossbow</defName>
-					<statBases>
-						<Bulk>7</Bulk>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_CryptoBolt</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>28</range>
-						<soundCast>Bow_Large</soundCast>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_CryptoBolt</ammoSet>
-					</AmmoUser>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- === Crypto Pistol === -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFEV_CryptoPistol</defName>
-					<statBases>
-						<WorkToMake>17500</WorkToMake>
-						<Mass>1.50</Mass>
-						<Bulk>2.60</Bulk>
-						<SwayFactor>1.07</SwayFactor>
-						<ShotSpread>0.15</ShotSpread>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_CryptoPistol</defaultProjectile>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>0.5</warmupTime>
-						<range>20</range>
-						<soundCast>VFEV_CryptoPistolShot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>14</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_CryptoPistol</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Crypto Rifle === -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFEV_CryptoRifle</defName>
-					<statBases>
-						<Mass>3.0</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>1.20</SwayFactor>
-						<Bulk>7.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.51</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_CryptoRifle</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>55</range>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>6</burstShotCount>
-						<soundCast>VFEV_CryptoRifleShot</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_CryptoRifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Vikings/Weapons_Medieval.xml b/Patches/Vanilla Factions Expanded - Vikings/Weapons_Medieval.xml
deleted file mode 100644
index fd5a714bf2..0000000000
--- a/Patches/Vanilla Factions Expanded - Vikings/Weapons_Medieval.xml	
+++ /dev/null
@@ -1,512 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Vikings</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Seax === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_MeleeWeapon_Seax"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<chanceFactor>0.33</chanceFactor>
-								<cooldownTime>1.19</cooldownTime>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.33</cooldownTime>
-								<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.26</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.26</cooldownTime>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.34</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_MeleeWeapon_Seax"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_MeleeWeapon_Seax"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.63</MeleeCritChance>
-							<MeleeParryChance>0.5</MeleeParryChance>
-							<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_MeleeWeapon_Seax"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- === Bearded Axe === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_MeleeWeapon_BeardedAxe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.66</cooldownTime>
-								<chanceFactor>0.33</chanceFactor>
-								<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>2.3</cooldownTime>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.78</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_MeleeWeapon_BeardedAxe"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.20</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_MeleeWeapon_BeardedAxe"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.03</MeleeCritChance>
-							<MeleeParryChance>0.20</MeleeParryChance>
-							<MeleeDodgeChance>0.27</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_MeleeWeapon_BeardedAxe"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- === Dane Axe === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_MeleeWeapon_DaneAxe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.78</cooldownTime>
-								<chanceFactor>0.33</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>31</power>
-								<cooldownTime>4.09</cooldownTime>
-								<armorPenetrationBlunt>4.84</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.97</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_MeleeWeapon_DaneAxe"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_MeleeWeapon_DaneAxe"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.06</MeleeCritChance>
-							<MeleeParryChance>0.75</MeleeParryChance>
-							<MeleeDodgeChance>0.50</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- === Throwing Axe === -->
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="VFE_ThrowingAxe"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>BaseWeapon</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFE_ThrowingAxe"]/costStuffCount</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFE_ThrowingAxe"]/recipeMaker</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_ThrowingAxe"]</xpath>
-					<value>
-						<thingCategories>
-							<li>WeaponsRanged</li>
-						</thingCategories>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_ThrowingAxe"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_ThrowingAxe"]/statBases</xpath>
-					<value>
-						<statBases>
-							<SightsEfficiency>1.0</SightsEfficiency>
-							<ShotSpread>1.5</ShotSpread>
-							<SwayFactor>2.5</SwayFactor>
-							<Bulk>1.25</Bulk>
-							<Mass>0.75</Mass>
-							<RangedWeapon_Cooldown>0.75</RangedWeapon_Cooldown>
-						</statBases>
-						<stackLimit>25</stackLimit>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_ThrowingAxe"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Vikings_ThrowingAxe_Thrown</defaultProjectile>
-								<warmupTime>1.0</warmupTime>
-								<range>10</range>
-								<soundCast>Interact_BeatFire</soundCast>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_ThrowingAxe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<chanceFactor>0.33</chanceFactor>
-								<cooldownTime>1.4</cooldownTime>
-								<armorPenetrationBlunt>0.375</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2.18</cooldownTime>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.62</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Harpoon === -->
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="VFE_Harpoon"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>BaseWeapon</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFE_Harpoon"]/costStuffCount</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFE_Harpoon"]/costList</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Harpoon"]</xpath>
-					<value>
-						<thingCategories>
-							<li>WeaponsRanged</li>
-						</thingCategories>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFE_Harpoon"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFE_Harpoon"]/recipeMaker</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Harpoon"]/statBases</xpath>
-					<value>
-						<statBases>
-							<MarketValue>7.26</MarketValue>
-							<SightsEfficiency>1.0</SightsEfficiency>
-							<ShotSpread>1.5</ShotSpread>
-							<SwayFactor>2.5</SwayFactor>
-							<Bulk>3</Bulk>
-							<Mass>1.75</Mass>
-							<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						</statBases>
-						<stackLimit>25</stackLimit>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Harpoon"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Vikings_Harpoon_Thrown</defaultProjectile>
-								<warmupTime>0.8</warmupTime>
-								<range>12</range>
-								<soundCast>Interact_BeatFire</soundCast>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFE_Harpoon"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<chanceFactor>0.33</chanceFactor>
-								<cooldownTime>1.35</cooldownTime>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.37</cooldownTime>
-								<armorPenetrationBlunt>1.69</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.34</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Add Projectiles and Recipes for the Harpoon and Throwing Axe === -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="BasePilumProjectile">
-							<defName>Vikings_ThrowingAxe_Thrown</defName>
-							<label>thrown axe</label>
-							<graphicData>
-								<texPath>Things/Projectile/AxeThrown</texPath>
-								<graphicClass>Graphic_Flicker</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Cut</damageDef>
-								<damageAmountBase>16</damageAmountBase>
-								<speed>25</speed>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<preExplosionSpawnChance>0.60</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>VFE_ThrowingAxe</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BasePilumProjectile">
-							<defName>Vikings_Harpoon_Thrown</defName>
-							<label>thrown harpoon</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>13</damageAmountBase>
-								<speed>27</speed>
-								<armorPenetrationBlunt>4.54</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.8</armorPenetrationSharp>
-								<secondaryDamage>
-									<li>
-										<def>Stun</def>
-										<amount>16</amount>
-									</li>
-								</secondaryDamage>
-								<preExplosionSpawnChance>0.40</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>VFE_Harpoon</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>MakeAmmo_VFE_Harpoon</defName>
-							<label>make harpoons x5</label>
-							<description>Craft 5 harpoons.</description>
-							<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-							<workSkill>Crafting</workSkill>
-							<recipeUsers>
-								<li>ElectricSmithy</li>
-								<li>FueledSmithy</li>
-								<li>CraftingSpot</li>
-							</recipeUsers>
-							<effectWorking>Smelt</effectWorking>
-							<unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
-							<workAmount>1700</workAmount>
-							<jobString>Making harpoons.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>13</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<VFE_Harpoon>5</VFE_Harpoon>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeNeolithicBase">
-							<defName>MakeAmmo_VFE_ThrowingAxe</defName>
-							<label>make throwing axe x5</label>
-							<description>Craft 5 throwing axes.</description>
-							<jobString>Making throwing axes.</jobString>
-							<workAmount>900</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>WoodLog</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>7</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>WoodLog</li>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<recipeUsers>
-								<li>ElectricSmithy</li>
-								<li>FueledSmithy</li>
-							</recipeUsers>
-							<products>
-								<VFE_ThrowingAxe>5</VFE_ThrowingAxe>
-							</products>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Furniture Expanded - Security/Ammo_Security.xml b/Patches/Vanilla Furniture Expanded - Security/Ammo_Security.xml
deleted file mode 100644
index 39458288cb..0000000000
--- a/Patches/Vanilla Furniture Expanded - Security/Ammo_Security.xml	
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Furniture Expanded - Security</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== EMP Ammo ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="BaseExplosiveBullet">
-							<defName>Bullet_EMPCannon</defName>
-							<label>EMP Blast</label>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<graphicData>
-								<texPath>Things/Projectile/Bullet_EMPCannon</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>EMP</damageDef>
-								<damageAmountBase>42</damageAmountBase>
-								<explosionRadius>4</explosionRadius>
-								<soundExplode>MortarBomb_Explode</soundExplode>
-								<speed>129</speed>
-								<flyOverhead>false</flyOverhead>
-								<dropsCasings>false</dropsCasings>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- ========== Raider Artillery (To circumvent the issue with vanilla shells.) ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_RaiderArtillery</defName>
-							<label>Raider Artillery</label>
-							<ammoTypes>
-								<Shell_HighExplosive>Bullet_155mmHowitzerShell_HE</Shell_HighExplosive>
-								<Shell_Incendiary>Bullet_155mmHowitzerShell_Incendiary</Shell_Incendiary>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Furniture Expanded - Security/NewRaiderArtillery.xml b/Patches/Vanilla Furniture Expanded - Security/NewRaiderArtillery.xml
deleted file mode 100644
index 79313de299..0000000000
--- a/Patches/Vanilla Furniture Expanded - Security/NewRaiderArtillery.xml	
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Furniture Expanded - Security</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- Raider Artillery. Because the sieges are only set up to supply sieges with vanilla mortars shells, we need a version that consumes those. -->
-
-						<ThingDef ParentName="BaseArtilleryBuilding">
-							<defName>Raider_Turret_Artillery</defName>
-							<label>heavy artillery</label>
-							<description>A manned artillery that launches all kinds of shells. Capable of inflicting devastating damage to both enemy forces and structures, this military machinery excels at laying down fire support for soldiers in the field.\n\nCapable of targeting other areas of the world within a medium radius.</description>
-							<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-							<graphicData>
-								<texPath>Things/Building/Artillery/TurretArtillery_Base</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<drawSize>(3,3)</drawSize>
-								<damageData>
-									<rect>(0.38,0.2,0.56375,0.8)</rect>
-									<cornerTL>Damage/Corner</cornerTL>
-								</damageData>
-								<shadowData>
-									<offset>(-0.13,-0.87,-0.1)</offset>
-									<volume>(0.5,0.4,1.05)</volume>
-								</shadowData>
-							</graphicData>
-							<statBases>
-								<MaxHitPoints>250</MaxHitPoints>
-								<WorkToBuild>3600</WorkToBuild>
-							</statBases>
-							<techLevel>Industrial</techLevel>
-							<interactionCellOffset>(0,0,-2)</interactionCellOffset>
-							<hasInteractionCell>true</hasInteractionCell>
-							<size>(3,3)</size>
-							<!-- <designationCategory /> -->
-							<rotatable>true</rotatable>
-							<stealable>false</stealable>
-							<stuffCategories>
-								<li>Metallic</li>
-							</stuffCategories>
-							<costStuffCount>100</costStuffCount>
-							<costList>
-								<Steel>180</Steel>
-								<ComponentIndustrial>9</ComponentIndustrial>
-							</costList>
-							<comps>
-							</comps>
-							<terrainAffordanceNeeded>Heavy</terrainAffordanceNeeded>
-							<building>
-								<claimable>false</claimable>
-								<turretGunDef>Raider_Artillery_Weapon</turretGunDef>
-								<turretTopDrawSize>3</turretTopDrawSize>
-								<buildingTags>
-									<li>Artillery_BaseDestroyer</li>
-								</buildingTags>
-								<turretBurstWarmupTime>1</turretBurstWarmupTime>
-								<turretBurstCooldownTime>1</turretBurstCooldownTime>
-								<defaultStorageSettings Inherit="False">
-									<filter>
-										<categories>
-											<li>MortarShells</li>
-										</categories>
-										<disallowedThingDefs>
-											<li>Shell_Incendiary</li>
-											<li>Shell_Firefoam</li>
-											<li>Shell_AntigrainWarhead</li>
-										</disallowedThingDefs>
-									</filter>
-								</defaultStorageSettings>
-							</building>
-							<uiIconPath>Things/Building/Artillery/TurretArtillery_MenuIcon</uiIconPath>
-							<uiIconScale>0.9</uiIconScale>
-							<constructionSkillPrerequisite>5</constructionSkillPrerequisite>
-							<researchPrerequisites>
-								<li>VFES_Artillery_Debug</li>
-							</researchPrerequisites>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseArtilleryWeapon">
-							<defName>Raider_Artillery_Weapon</defName>
-							<label>artillery</label>
-							<description>Artillery cannon capable of long range bombardment.</description>
-							<graphicData>
-								<texPath>Things/Building/Artillery/TurretArtillery_Top</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<statBases>
-								<SightsEfficiency>0.5</SightsEfficiency>
-								<RangedWeapon_Cooldown>8.5</RangedWeapon_Cooldown>
-							</statBases>
-							<weaponTags>
-								<li>Artillery_BaseDestroyer</li>
-								<li>TurretGun</li>
-							</weaponTags>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-									<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>Bullet_155mmHowitzerShell_HE</defaultProjectile>
-									<warmupTime>4</warmupTime>
-									<minRange>40</minRange>
-									<range>1000</range>
-									<burstShotCount>1</burstShotCount>
-									<soundCast>VFES_Shot_Artillery</soundCast>
-									<muzzleFlashScale>20</muzzleFlashScale>
-									<indirectFirePenalty>0.2</indirectFirePenalty>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-								</li>
-							</verbs>
-							<comps>
-								<li Class="CombatExtended.CompProperties_Charges">
-									<chargeSpeeds>
-										<li>30</li>
-										<li>50</li>
-										<li>70</li>
-										<li>90</li>
-									</chargeSpeeds>
-								</li>
-								<li Class="CombatExtended.CompProperties_AmmoUser">
-									<magazineSize>1</magazineSize>
-									<reloadTime>12</reloadTime>
-									<ammoSet>AmmoSet_RaiderArtillery</ammoSet>
-								</li>
-							</comps>
-							<building>
-								<fixedStorageSettings>
-									<filter>
-										<categories>
-											<li>MortarShells</li>
-										</categories>
-									</filter>
-								</fixedStorageSettings>
-								<defaultStorageSettings>
-									<filter>
-										<categories>
-											<li>MortarShells</li>
-										</categories>
-										<disallowedThingDefs>
-											<li>Shell_Firefoam</li>
-											<li>Shell_AntigrainWarhead</li>
-										</disallowedThingDefs>
-									</filter>
-								</defaultStorageSettings>
-							</building>
-						</ThingDef>
-
-						<!-- Dummy research project. This allows raiders to spawn and build their own variation of the artillery gun without the player being able to access it. -->
-
-						<ResearchProjectDef ParentName="VFES_ResearchBase">
-							<defName>VFES_Artillery_Debug</defName>
-							<label>Combat Extended Artillery Debug</label>
-							<description>Ignore this project. A dummy research project as a workaround for raider artillery compatibility. Not intended for the player.</description>
-							<baseCost>99999</baseCost>
-							<techLevel>Ultra</techLevel>
-							<requiredResearchFacilities>
-								<li>MultiAnalyzer</li>
-							</requiredResearchFacilities>
-							<requiredResearchBuilding>HiTechResearchBench</requiredResearchBuilding>
-							<researchViewX>10</researchViewX>
-							<researchViewY>0</researchViewY>
-						</ResearchProjectDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Furniture Expanded - Security/ThingDefs_Manned.xml b/Patches/Vanilla Furniture Expanded - Security/ThingDefs_Manned.xml
deleted file mode 100644
index ce47d69e23..0000000000
--- a/Patches/Vanilla Furniture Expanded - Security/ThingDefs_Manned.xml	
+++ /dev/null
@@ -1,351 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Furniture Expanded - Security</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName = "VFES_Turret_HMGComplex" or
-						defName = "VFES_Turret_ChargeComplex" or
-						defName = "VFES_Turret_Ballista"
-						]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "VFES_Turret_HMGComplex" or
-						defName = "VFES_Turret_ChargeComplex" or
-						defName = "VFES_Turret_Artillery" or
-						defName = "VFES_Turret_Catapult" or
-						defName = "VFES_Turret_Ballista"
-						]/thingClass </xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "VFES_Turret_HMGComplex" or
-						defName = "VFES_Turret_ChargeComplex" or
-						defName = "VFES_Turret_Ballista"
-						]/fillPercent </xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<!-- ========== Ballista - Weapon ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFES_Gun_BallistaTurret</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>1</ShotSpread>
-						<SwayFactor>1</SwayFactor>
-						<Bulk>4.00</Bulk>
-						<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Pilum_Fired</defaultProjectile>
-						<warmupTime>1.4</warmupTime>
-						<range>44</range>
-						<soundCast>VFES_Shot_Ballista</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>8</reloadTime>
-						<ammoSet>AmmoSet_Javelins</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>false</noSingleShot>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "VFES_Gun_BallistaTurret"]/weaponTags</xpath>
-					<value>
-						<li>TurretGun</li>
-					</value>
-				</li>
-
-				<!-- Charge Complex -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFES_Gun_ChargeComplex</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>0.82</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.96</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>86</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>Shot_ChargeBlaster</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-						<targetParams>
-							<canTargetLocations>True</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags Inherit="False">
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- HMG Complex -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFES_Gun_HMGComplex</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.16</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.81</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>70</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>VFES_Shot_HMG</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-						<targetParams>
-							<canTargetLocations>True</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags Inherit="False">
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Catapult - Base ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFES_Turret_Catapult"]/building</xpath>
-					<value>
-						<spawnedConceptLearnOpportunity>CE_MortarDirectFire</spawnedConceptLearnOpportunity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFES_Turret_Catapult"]/building/turretBurstWarmupTime</xpath>
-					<value>
-						<turretBurstWarmupTime>1</turretBurstWarmupTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFES_Turret_Catapult"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>1</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFES_Turret_Catapult"]/inspectorTabs</xpath>
-				</li>
-
-				<!-- ========== Catapult - Weapon ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFES_Artillery_Catapult"]/statBases</xpath>
-					<value>
-						<SightsEfficiency>0.5</SightsEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "VFES_Artillery_Catapult"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Charges">
-							<chargeSpeeds>
-								<li>30</li>
-								<li>50</li>
-								<li>70</li>
-								<li>90</li>
-							</chargeSpeeds>
-						</li>
-						<li Class="CombatExtended.CompProperties_AmmoUser">
-							<magazineSize>1</magazineSize>
-							<reloadTime>12</reloadTime>
-							<ammoSet>AmmoSet_Catapult</ammoSet>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VFES_Artillery_Catapult"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-								<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Projectile_CatapultBullet_Boulder</defaultProjectile>
-								<warmupTime>4</warmupTime>
-								<minRange>30</minRange>
-								<range>500</range>
-								<burstShotCount>1</burstShotCount>
-								<soundCast>Bow_Recurve</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<indirectFirePenalty>0.2</indirectFirePenalty>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "VFES_Artillery_Catapult"]/weaponTags</xpath>
-					<value>
-						<li>TurretGun</li>
-					</value>
-				</li>
-
-				<!-- ========== Artillery - Base ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFES_Turret_Artillery"]/statBases</xpath>
-					<value>
-						<Mass>5500</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFES_Turret_Artillery"]/building</xpath>
-					<value>
-						<spawnedConceptLearnOpportunity>CE_MortarDirectFire</spawnedConceptLearnOpportunity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFES_Turret_Artillery"]/building/buildingTags</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFES_Turret_Artillery"]/building/turretBurstWarmupTime</xpath>
-					<value>
-						<turretBurstWarmupTime>1</turretBurstWarmupTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFES_Turret_Artillery"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>1</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFES_Turret_Artillery"]/comps/li[@Class="VFESecurity.CompProperties_LongRangeArtillery"]</xpath>
-				</li>
-
-				<!-- ========== Artillery - Weapon ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFES_Artillery_Weapon"]/statBases</xpath>
-					<value>
-						<SightsEfficiency>0.5</SightsEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "VFES_Artillery_Weapon"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Charges">
-							<chargeSpeeds>
-								<li>30</li>
-								<li>50</li>
-								<li>70</li>
-								<li>90</li>
-							</chargeSpeeds>
-						</li>
-						<li Class="CombatExtended.CompProperties_AmmoUser">
-							<magazineSize>1</magazineSize>
-							<reloadTime>12</reloadTime>
-							<ammoSet>AmmoSet_155mmHowitzerShell</ammoSet>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VFES_Artillery_Weapon"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-								<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_155mmHowitzerShell_HE</defaultProjectile>
-								<warmupTime>4</warmupTime>
-								<minRange>40</minRange>
-								<range>1000</range>
-								<burstShotCount>1</burstShotCount>
-								<soundCast>VFES_Shot_Artillery</soundCast>
-								<muzzleFlashScale>20</muzzleFlashScale>
-								<indirectFirePenalty>0.2</indirectFirePenalty>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VFES_Artillery_Weapon"]/weaponTags</xpath>
-					<value>
-						<weaponTags>
-							<li>Artillery_BaseDestroyer</li>
-						</weaponTags>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Furniture Expanded - Security/ThingDefs_Sentry.xml b/Patches/Vanilla Furniture Expanded - Security/ThingDefs_Sentry.xml
deleted file mode 100644
index 2f3024f6ce..0000000000
--- a/Patches/Vanilla Furniture Expanded - Security/ThingDefs_Sentry.xml	
+++ /dev/null
@@ -1,478 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Furniture Expanded - Security</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Remove refuelable property -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName = "VFES_Turret_ChargeRailgunTurret" or
-						defName = "VFES_Turret_ChargeTurret" or
-						defName = "VFES_Turret_AutocannonDouble" or
-						defName = "VFES_Turret_EMPTurret" or
-						defName = "VFES_Turret_Flame" or
-						defName = "VFES_Turret_SentryGun" or
-						defName = "VFES_Turret_MilitaryTurret"
-						]/comps/li[@Class = "CompProperties_Refuelable"] </xpath>
-				</li>
-
-				<!-- Remove Explosive comp -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName = "VFES_Turret_ChargeRailgunTurret" or
-						defName = "VFES_Turret_ChargeTurret" or
-						defName = "VFES_Turret_AutocannonDouble" or
-						defName = "VFES_Turret_EMPTurret" or
-						defName = "VFES_Turret_Flame" or
-						defName = "VFES_Turret_SentryGun" or
-						defName = "VFES_Turret_MilitaryTurret"
-						]/comps/li[@Class = "CompProperties_Explosive"] </xpath>
-				</li>
-
-				<!-- Replace vanilla thingClass -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "VFES_Turret_ChargeRailgunTurret" or
-						defName = "VFES_Turret_ChargeTurret" or
-						defName = "VFES_Turret_AutocannonDouble" or
-						defName = "VFES_Turret_EMPTurret" or
-						defName = "VFES_Turret_Flame" or
-						defName = "VFES_Turret_SentryGun" or
-						defName = "VFES_Turret_MilitaryTurret" or
-						defName = "VFES_Turret_FloorTurret"
-						]/thingClass </xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<!-- Make turrets taller -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "VFES_Turret_ChargeRailgunTurret" or
-						defName = "VFES_Turret_ChargeTurret" or
-						defName = "VFES_Turret_AutocannonDouble" or
-						defName = "VFES_Turret_EMPTurret" or
-						defName = "VFES_Turret_Flame" or
-						defName = "VFES_Turret_SentryGun" or
-						defName = "VFES_Turret_MilitaryTurret"
-						]/fillPercent </xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName = "VFES_Turret_Flame" or
-						defName = "VFES_Turret_SentryGun" or
-						defName = "VFES_Turret_MilitaryTurret" or
-						defName = "VFES_Turret_FloorTurret" or
-						defName = "VFES_Turret_Searchlight"
-						]/statBases </xpath>
-					<value>
-						<AimingAccuracy>0.25</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName = "VFES_Turret_ChargeRailgunTurret" or
-						defName = "VFES_Turret_ChargeTurret" or
-						defName = "VFES_Turret_AutocannonDouble" or
-						defName = "VFES_Turret_EMPTurret"
-						]/statBases </xpath>
-					<value>
-						<AimingAccuracy>0.5</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName = "VFES_Turret_ChargeRailgunTurret" or
-						defName = "VFES_Turret_ChargeTurret" or
-						defName = "VFES_Turret_EMPTurret"
-						]/statBases </xpath>
-					<value>
-						<NightVisionEfficiency>0.5</NightVisionEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "VFES_Turret_EMPTurret" or
-						defName = "VFES_Turret_Flame" or
-						defName = "VFES_Turret_SentryGun" or
-						defName = "VFES_Turret_MilitaryTurret" or
-						defName = "VFES_Turret_FloorTurret"
-						]/statBases/ShootingAccuracyTurret </xpath>
-					<value>
-						<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "VFES_Turret_ChargeTurret" or
-						defName = "VFES_Turret_ChargeRailgunTurret" or
-						defName = "VFES_Turret_AutocannonDouble"
-						]/statBases/ShootingAccuracyTurret </xpath>
-					<value>
-						<ShootingAccuracyTurret>1.25</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "VFES_Turret_ChargeRailgunTurret" or
-						defName = "VFES_Turret_ChargeTurret" or
-						defName = "VFES_Turret_AutocannonDouble" or
-						defName = "VFES_Turret_EMPTurret" or
-						defName = "VFES_Turret_Flame" or
-						defName = "VFES_Turret_SentryGun" or
-						defName = "VFES_Turret_MilitaryTurret" or
-						defName = "VFES_Turret_FloorTurret"
-						]/building/turretBurstCooldownTime </xpath>
-					<value>
-						<turretBurstCooldownTime>1.1</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<!-- Searchlight -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VFES_Turret_Searchlight"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>68</specialDisplayRadius>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VFES_Gun_Searchlight"]/verbs/li/range</xpath>
-					<value>
-						<range>68</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VFES_Gun_Searchlight"]/modExtensions/li[@Class="VFESecurity.ExtendedVerbProperties"]/illuminatedRadius</xpath>
-					<value>
-						<illuminatedRadius>6</illuminatedRadius>
-					</value>
-				</li>
-
-				<!-- Flame Turret -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VFES_Turret_Flame"]/costList/Chemfuel</xpath>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFES_Gun_FlameTurret</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>3.0</ShotSpread>
-						<SwayFactor>1.59</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.65</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Flamethrower_Napalm</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>20</range>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<burstShotCount>16</burstShotCount>
-						<soundCast>VFES_Shot_Flamethrower</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>0</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>75</magazineSize>
-						<reloadTime>9.8</reloadTime>
-						<ammoSet>AmmoSet_Flamethrower</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>true</aiUseBurstMode>
-						<aimedBurstShotCount>10</aimedBurstShotCount>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags Inherit="False">
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- Military Turret -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFES_Gun_MilitaryTurret</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>0.82</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.85</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>48</range>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>12</burstShotCount>
-						<soundCast>GunShotA</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>120</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!-- Concealable Military Turret -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFES_Gun_FloorTurret</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>0.82</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.91</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>48</range>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<burstShotCount>12</burstShotCount>
-						<soundCast>GunShotA</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>120</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!-- Charge Turret -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFES_Gun_ChargeTurret</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>0.72</SwayFactor>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<NightVisionEfficiency_Weapon>0.5</NightVisionEfficiency_Weapon>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.85</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>55</range>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<burstShotCount>10</burstShotCount>
-						<soundCast>Shot_ChargeBlaster</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags Inherit="False">
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- Double Autocannon -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFES_TurretDoubleAutocannon_Top</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.72</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.56</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_20x102mmNATO_AP</defaultProjectile>
-						<warmupTime>2.3</warmupTime>
-						<range>78</range>
-						<burstShotCount>12</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>Shot_Autocannon</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>120</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_20x102mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags Inherit="False">
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "VFES_Turret_AutocannonDouble"]/researchPrerequisites</xpath>
-					<value>
-						<li>CE_HeavyTurret</li>
-					</value>
-				</li>
-
-				<!-- Sentry Gun -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFES_Gun_SentryTurret</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>1.32</SwayFactor>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.3</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>2.1</warmupTime>
-						<range>54</range>
-						<burstShotCount>25</burstShotCount>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>250</magazineSize>
-						<reloadTime>9.2</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags Inherit="False">
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- EMP Cannon -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFES_Gun_EMPTurret</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>6</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>0.46</SwayFactor>
-						<NightVisionEfficiency_Weapon>0.5</NightVisionEfficiency_Weapon>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_EMPCannon</defaultProjectile>
-						<warmupTime>3</warmupTime>
-						<range>86</range>
-						<burstShotCount>1</burstShotCount>
-						<ticksBetweenBurstShots>56</ticksBetweenBurstShots>
-						<soundCast>EnergyShield_AbsorbDamage</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags Inherit="False">
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- Railgun Turret -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFES_Gun_RailgunTurret</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>5</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.2</SightsEfficiency>
-						<ShotSpread>0.09</ShotSpread>
-						<SwayFactor>0.26</SwayFactor>
-						<NightVisionEfficiency_Weapon>0.5</NightVisionEfficiency_Weapon>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_12mmRailgun_Sabot</defaultProjectile>
-						<warmupTime>2</warmupTime>
-						<range>86</range>
-						<minRange>13</minRange>
-						<burstShotCount>4</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<soundCast>ChargeLance_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>40</magazineSize>
-						<reloadTime>10</reloadTime>
-						<ammoSet>AmmoSet_12mmRailgun</ammoSet>
-					</AmmoUser>
-					<weaponTags Inherit="False">
-						<li>TurretGun</li>
-					</weaponTags>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Genetics Expanded/Bodies/Patch_Bodies_Animals.xml b/Patches/Vanilla Genetics Expanded/Bodies/Patch_Bodies_Animals.xml
deleted file mode 100644
index ead1289de8..0000000000
--- a/Patches/Vanilla Genetics Expanded/Bodies/Patch_Bodies_Animals.xml	
+++ /dev/null
@@ -1,276 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Genetics Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Bird With Teeth -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="GR_BirdWithTeeth"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Leg" or
-						def="Tail"
-						] </xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="GR_BirdWithTeeth"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Head" or
-						def="AnimalJaw" or
-						def="Leg" or
-						def="Foot" or
-						def="Tail"
-						]/groups </xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- Horned Bird -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="GR_HornedBird"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Leg" or
-						def="Tail"
-						] </xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="GR_HornedBird"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Head" or
-						def="Beak" or
-						def="Leg" or
-						def="Foot" or
-						def="Tail"
-						]/groups </xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- Jellyfish Body -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="GR_JellyfishBody"]//*[def="GR_JellyfishMainBody"]</xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="GR_JellyfishBody"]//*[def="GR_JellyfishMainBody"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- Quadruped With Beak -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="GR_QuadrupedAnimalWithBeak"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Leg" or
-						customLabel="rear left paw" or
-						customLabel="rear right paw"
-						] </xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="GR_QuadrupedAnimalWithBeak"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Head" or
-						def="Beak" or
-						def="Leg" or
-						def="Paw"
-						]/groups </xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- Quadruped With Beak and Hump -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="GR_QuadrupedAnimalWithBeakandHump"]//*[
-						def="Body" or
-						def="Neck" or
-						customLabel="rear left leg" or
-						customLabel="rear right leg" or
-						def="Hoof"
-						] </xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="GR_QuadrupedAnimalWithBeakandHump"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Head" or
-						def="Beak" or
-						def="Leg" or
-						def="Hoof"
-						]/groups </xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- Quadruped With Paws and Fangs -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="GR_QuadrupedAnimalWithPawsAndFangs"]//*[
-						def="Body" or
-						def="Neck" or
-						customLabel="rear left paw" or
-						customLabel="rear right paw"
-						] </xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="GR_QuadrupedAnimalWithPawsAndFangs"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Head" or
-						def="AnimalJaw" or
-						def="Leg" or
-						def="Paw"
-						]/groups </xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- Quadruped With Paws, Horn, and Tail -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="GR_QuadrupedAnimalWithPawsHornAndTail"]//*[
-						def="Body" or
-						def="Neck" or
-						customLabel="rear left leg" or
-						customLabel="rear right leg" or
-						customLabel="rear left hoof" or
-						customLabel="rear right hoof" or
-						def="Tail"
-						] </xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="GR_QuadrupedAnimalWithPawsHornAndTail"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Head" or
-						def="AnimalJaw" or
-						def="Leg" or
-						def="Paw" or
-						def="Hoof" or
-						def="Tail"
-						]/groups </xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- Quadruped With Paws, Horn, and Tail - Thrumbo -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="GR_QuadrupedAnimalWithPawsHornAndTailThrumbo"]//*[
-						def="Body" or
-						def="Neck" or
-						customLabel="rear left leg" or
-						customLabel="rear right leg" or
-						customLabel="rear left paw" or
-						customLabel="rear right paw" or
-						def="Hoof"
-						] </xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="GR_QuadrupedAnimalWithPawsHornAndTailThrumbo"]//*[
-						def="Body" or
-						def="Neck" or
-						def="Head" or
-						def="AnimalJaw" or
-						def="Leg" or
-						def="Horn" or
-						def="Paw"
-						]/groups </xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- Great Ape -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="GR_GreatApe"]//*[
-						def="Torso" or
-						def="Neck" or
-						def="Shoulder" or
-						def="Arm" or
-						def="Hand" or
-						def="Leg" or
-						def="Foot" or
-						def="Toe"
-						] </xpath>
-					<value>
-						<groups />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="GR_GreatApe"]//*[
-						def="Torso" or
-						def="Neck" or
-						def="Head" or
-						def="AnimalJaw" or
-						def="Shoulder" or
-						def="Arm" or
-						def="Hand" or
-						def="Finger" or
-						def="Leg" or
-						def="Foot" or
-						def="Toe"
-						]/groups </xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Genetics Expanded/HediffDefs/Hediffs_Local_Implants_Animals.xml b/Patches/Vanilla Genetics Expanded/HediffDefs/Hediffs_Local_Implants_Animals.xml
deleted file mode 100644
index 11df8a0905..0000000000
--- a/Patches/Vanilla Genetics Expanded/HediffDefs/Hediffs_Local_Implants_Animals.xml	
+++ /dev/null
@@ -1,814 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Genetics Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- =============== Legs ==================== -->
-
-				<!-- ========= Bear Leg ============ -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_BearLeg"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>animal Implant: bear leg</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.75</cooldownTime>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_BearLeg"]/stages/li[1]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.035</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_BearLeg"]/stages/li[1]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.035</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_BearLeg"]/stages/li[2]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.050</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_BearLeg"]/stages/li[2]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.050</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_BearLeg"]/stages/li[3]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.070</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_BearLeg"]/stages/li[3]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.070</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_BearLeg"]/stages/li[4]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.085</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_BearLeg"]/stages/li[4]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.085</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_BearLeg"]/stages/li[5]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_BearLeg"]/stages/li[5]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.10</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_BearLeg"]/stages/li[6]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.125</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_BearLeg"]/stages/li[6]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.125</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_BearLeg"]/stages/li[7]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_BearLeg"]/stages/li[7]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.15</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ========= lizard Leg ============ -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_LizardLeg"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>animal Implant: lizard leg</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.7</cooldownTime>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_LizardLeg"]/stages/li[1]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.035</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_LizardLeg"]/stages/li[1]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.035</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_LizardLeg"]/stages/li[2]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.050</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_LizardLeg"]/stages/li[2]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.050</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_LizardLeg"]/stages/li[3]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.070</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_LizardLeg"]/stages/li[3]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.070</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_LizardLeg"]/stages/li[4]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.085</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_LizardLeg"]/stages/li[4]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.085</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_LizardLeg"]/stages/li[5]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_LizardLeg"]/stages/li[5]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.10</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_LizardLeg"]/stages/li[6]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_LizardLeg"]/stages/li[6]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.15</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_LizardLeg"]/stages/li[7]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_LizardLeg"]/stages/li[7]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ========= Thrumbo Leg ============ -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_ThrumboLeg"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>animal Implant: thrumbo leg</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>34</power>
-								<cooldownTime>1.85</cooldownTime>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_ThrumboLeg"]/stages/li[1]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.035</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_ThrumboLeg"]/stages/li[1]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.035</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_ThrumboLeg"]/stages/li[2]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.050</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_ThrumboLeg"]/stages/li[2]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.050</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_LizardLeg"]/stages/li[3]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.085</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_ThrumboLeg"]/stages/li[3]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.085</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_ThrumboLeg"]/stages/li[4]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_LizardLeg"]/stages/li[4]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.10</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_ThrumboLeg"]/stages/li[5]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_ThrumboLeg"]/stages/li[5]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.20</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_ThrumboLeg"]/stages/li[6]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.30</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_ThrumboLeg"]/stages/li[6]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.30</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_LizardLeg"]/stages/li[7]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.40</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_ThrumboLeg"]/stages/li[7]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.40</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- =============== Tails ==================== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_CatTail"]/stages/li[1]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.035</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_CatTail"]/stages/li[1]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.035</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_CatTail"]/stages/li[2]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.050</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_CatTail"]/stages/li[2]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.050</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_CatTail"]/stages/li[3]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.070</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_CatTail"]/stages/li[3]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.070</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_CatTail"]/stages/li[4]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.085</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_CatTail"]/stages/li[4]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.085</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_CatTail"]/stages/li[5]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_CatTail"]/stages/li[5]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.10</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_CatTail"]/stages/li[6]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.125</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_CatTail"]/stages/li[6]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.125</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_CatTail"]/stages/li[7]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_CatTail"]/stages/li[7]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.15</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ========= Scyther Tail ============ -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_ScytherTail"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>animal Implant: scyther tail</label>
-								<capacities>
-									<li>Cut</li>
-									<li>Stab</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>1.75</cooldownTime>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_ScytherTail"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_ScytherTail"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.15</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ========= Mechanoid Tail ============ -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_MechaTail"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>animal Implant: mechanoid tail</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>45</power>
-								<cooldownTime>1.85</cooldownTime>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_MechaTail"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_MechaTail"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- =============== Eyes ==================== -->
-
-				<!-- ========= Insectile Eye ============ -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_InsectileEye"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_InsectileEye"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.05</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ========= ThrumboEye ============ -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_ThrumboEye"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_ThrumboEye"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.15</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- =============== Ears ==================== -->
-
-				<!-- ========= Moth Ear ============ -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_MothTympanalOrgan"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_MothTympanalOrgan"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ========= Mechanoid Ear ============ -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_MechaReceptors"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_MechaReceptors"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- =============== Noses ==================== -->
-
-				<!-- ========= Insect Pheromones ============ -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_InsectoidPheromones"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_InsectoidPheromones"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ========= Miniature Thrombo Horn ============ -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_MiniatureThrumboHorn"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>animal Implant: miniature thrumbo horn (tier 3)</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Stab</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>1.65</cooldownTime>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_MiniatureThrumboHorn"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_MiniatureThrumboHorn"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- =============== Jaws ==================== -->
-
-				<!-- ========= Insect Mandibles ============ -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_InsectMandibles"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>animal Implant: insect mandibles</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_InsectMandibles"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_InsectMandibles"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ========= Thrumbo Jaws ============ -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_ThrumboJaws"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>animal Implant: bionic thrumbo jaws</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>1.85</cooldownTime>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_ThrumboJaws"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_ThrumboJaws"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- =============== Spines ==================== -->
-
-				<!-- ========= Muffalo Spine ============ -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_MuffaloSpine"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_MuffaloSpine"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ========= Crocodile Spine ============ -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_CrocodileSpine"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_CrocodileSpine"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ========= Mecha Spine ============ -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_MechaSpine"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_MechaSpine"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- =============== Hearts ==================== -->
-
-				<!-- ========= Chitinous Heart ============ -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_ChitinousHeart"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_ChitinousHeart"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.15</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ========= Mecha Heart ============ -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_MechaHeart"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_MechaHeart"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Genetics Expanded/HediffDefs/Hediffs_Local_Implants_Humanoid.xml b/Patches/Vanilla Genetics Expanded/HediffDefs/Hediffs_Local_Implants_Humanoid.xml
deleted file mode 100644
index 81e132e2e9..0000000000
--- a/Patches/Vanilla Genetics Expanded/HediffDefs/Hediffs_Local_Implants_Humanoid.xml	
+++ /dev/null
@@ -1,497 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Genetics Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- =============== Bear Claw ==================== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_BearClaws"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>bear claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>1.36</cooldownTime>
-								<armorPenetrationSharp>1.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- =============== Digging Bear Claw ==================== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_DiggingBearClaws"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>humanoid implant: digging bear claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.65</cooldownTime>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- =============== Muffalo Muscles ==================== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="GR_MuffaloMuscles"]/stages/li[1]/statOffsets</xpath>
-					<value>
-						<CarryWeight>1</CarryWeight>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="GR_MuffaloMuscles"]/stages/li[2]/statOffsets</xpath>
-					<value>
-						<CarryWeight>5</CarryWeight>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="GR_MuffaloMuscles"]/stages/li[3]/statOffsets</xpath>
-					<value>
-						<CarryWeight>10</CarryWeight>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="GR_MuffaloMuscles"]/stages/li[4]/statOffsets</xpath>
-					<value>
-						<CarryWeight>15</CarryWeight>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="GR_MuffaloMuscles"]/stages/li[5]/statOffsets</xpath>
-					<value>
-						<CarryWeight>20</CarryWeight>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="GR_MuffaloMuscles"]/stages/li[6]/statOffsets</xpath>
-					<value>
-						<CarryWeight>25</CarryWeight>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="GR_MuffaloMuscles"]/stages/li[7]/statOffsets</xpath>
-					<value>
-						<CarryWeight>35</CarryWeight>
-					</value>
-				</li>
-
-				<!-- =============== Muffalo Skin ==================== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_MuffaloSkin"]/stages/li[1]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.035</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_MuffaloSkin"]/stages/li[1]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.035</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_MuffaloSkin"]/stages/li[2]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.050</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_MuffaloSkin"]/stages/li[2]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.050</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_MuffaloSkin"]/stages/li[3]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.070</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_MuffaloSkin"]/stages/li[3]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.070</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_MuffaloSkin"]/stages/li[4]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.085</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_MuffaloSkin"]/stages/li[4]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.085</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_MuffaloSkin"]/stages/li[5]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_MuffaloSkin"]/stages/li[5]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.10</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_MuffaloSkin"]/stages/li[6]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.125</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_MuffaloSkin"]/stages/li[6]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.125</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_MuffaloSkin"]/stages/li[7]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_MuffaloSkin"]/stages/li[7]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.15</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- =============== Cat Eye ==================== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="GR_CatEye"]/stages/li[1]/statOffsets</xpath>
-					<value>
-						<NightVisionEfficiency_Implant>0.05</NightVisionEfficiency_Implant>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="GR_CatEye"]/stages/li[2]/statOffsets</xpath>
-					<value>
-						<NightVisionEfficiency_Implant>0.10</NightVisionEfficiency_Implant>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="GR_CatEye"]/stages/li[3]/statOffsets</xpath>
-					<value>
-						<NightVisionEfficiency_Implant>0.15</NightVisionEfficiency_Implant>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="GR_CatEye"]/stages/li[4]/statOffsets</xpath>
-					<value>
-						<NightVisionEfficiency_Implant>0.20</NightVisionEfficiency_Implant>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="GR_CatEye"]/stages/li[5]/statOffsets</xpath>
-					<value>
-						<NightVisionEfficiency_Implant>0.25</NightVisionEfficiency_Implant>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="GR_CatEye"]/stages/li[6]/statOffsets</xpath>
-					<value>
-						<NightVisionEfficiency_Implant>0.30</NightVisionEfficiency_Implant>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="GR_CatEye"]/stages/li[7]/statOffsets</xpath>
-					<value>
-						<NightVisionEfficiency_Implant>0.40</NightVisionEfficiency_Implant>
-					</value>
-				</li>
-
-				<!-- =============== Thrumbo Horn ==================== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_HumanThrumboHorn"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>humanoid implant: thrumbo horn</label>
-								<capacities>
-									<li>Cut</li>
-									<li>Stab</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- =============== Thrumbo Skin ==================== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_ThrumboSkin"]/stages/li[1]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.50</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_ThrumboSkin"]/stages/li[1]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.50</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_ThrumboSkin"]/stages/li[2]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_ThrumboSkin"]/stages/li[2]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.75</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_ThrumboSkin"]/stages/li[3]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_ThrumboSkin"]/stages/li[3]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_ThrumboSkin"]/stages/li[4]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_ThrumboSkin"]/stages/li[4]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.25</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_ThrumboSkin"]/stages/li[5]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_ThrumboSkin"]/stages/li[5]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_ThrumboSkin"]/stages/li[6]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.75</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_ThrumboSkin"]/stages/li[6]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.75</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_ThrumboSkin"]/stages/li[7]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_ThrumboSkin"]/stages/li[7]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- =============== Venomous Fangs ==================== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_VenomousFangs"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>humanoid implant: venomous fangs</label>
-								<capacities>
-									<li>GR_VeryToxicBite</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.75</cooldownTime>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- =============== Iguana Scales ==================== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_IguanaScales"]/stages/li[1]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.035</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_IguanaScales"]/stages/li[1]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.035</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_IguanaScales"]/stages/li[2]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.050</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_IguanaScales"]/stages/li[2]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.050</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_IguanaScales"]/stages/li[3]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.070</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_IguanaScales"]/stages/li[3]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.070</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_IguanaScales"]/stages/li[4]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.085</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_IguanaScales"]/stages/li[4]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.085</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_IguanaScales"]/stages/li[5]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_IguanaScales"]/stages/li[5]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.10</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_IguanaScales"]/stages/li[6]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.125</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_IguanaScales"]/stages/li[6]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.125</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_IguanaScales"]/stages/li[7]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="GR_IguanaScales"]/stages/li[7]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.15</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Genetics Expanded/Items_Resources.xml b/Patches/Vanilla Genetics Expanded/Items_Resources.xml
deleted file mode 100644
index 87d1685fed..0000000000
--- a/Patches/Vanilla Genetics Expanded/Items_Resources.xml	
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Genetics Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Compressed Chemfuel -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_CompressedChemfuel"]/statBases</xpath>
-					<value>
-						<Bulk>0.05</Bulk>
-					</value>
-				</li>
-
-				<!-- Thick Hybrid Wool -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_ThickHybridWool"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.015</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_ThickHybridWool"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.065</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_ThickHybridWool"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.055</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<!-- Luxriant Hybrid Wool -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_LuxuriantHybridWool"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.0185</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_LuxuriantHybridWool"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.12</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_LuxuriantHybridWool"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.06</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<!-- Hybrid Silk -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_HybridSilk"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.4</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_HybridSilk"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.08</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_HybridSilk"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.03</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_HybridSilk"]/stuffProps/categories</xpath>
-					<value>
-						<li>SoftArmor</li>
-					</value>
-				</li>
-
-				<!-- Hybrid Chitin -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_HybridChitin"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.5</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_HybridChitin"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.05</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_HybridChitin"]/stuffProps</xpath>
-					<value>
-						<categories>
-							<li>SoftArmor</li>
-						</categories>
-					</value>
-				</li>
-
-				<!-- Hybrid Scales -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_HybridScales"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.01</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Genetics Expanded/Mods/AlphaAnimals_Items_Resource_Stuff.xml.xml b/Patches/Vanilla Genetics Expanded/Mods/AlphaAnimals_Items_Resource_Stuff.xml.xml
deleted file mode 100644
index eac799a6e8..0000000000
--- a/Patches/Vanilla Genetics Expanded/Mods/AlphaAnimals_Items_Resource_Stuff.xml.xml	
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Genetics Expanded</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Alpha Animals</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<!--Boomthread -->
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Boomthread"]/statBases/StuffPower_Armor_Sharp</xpath>
-						<value>
-							<StuffPower_Armor_Sharp>0.16</StuffPower_Armor_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Boomthread"]/statBases/StuffPower_Armor_Blunt</xpath>
-						<value>
-							<StuffPower_Armor_Blunt>0.14</StuffPower_Armor_Blunt>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Genetics Expanded/Mods/AlphaAnimals_Patch_Projectiles.xml b/Patches/Vanilla Genetics Expanded/Mods/AlphaAnimals_Patch_Projectiles.xml
deleted file mode 100644
index 20b7324c81..0000000000
--- a/Patches/Vanilla Genetics Expanded/Mods/AlphaAnimals_Patch_Projectiles.xml	
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Genetics Expanded</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Alpha Animals</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<!-- ============== Changing Projectile's thingClass to CE ones ================ -->
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[
-							defName="AA_Bullet_TinyVenomBarb" or
-							defName="AA_HugeQuill" or
-							defName="AA_ExplodingWeb"
-							] </xpath>
-						<value>
-							<thingClass>CombatExtended.BulletCE</thingClass>
-						</value>
-					</li>
-
-					<!-- ============== Adding 'Standard' AimingAccuracy node to creatures' that use ranged attack statBases. =============== -->
-
-					<!-- =============== Now defining Projectiles in CE Procedure ============= -->
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_Bullet_TinyVenomBarb"]/projectile</xpath>
-						<value>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<flyOverhead>false</flyOverhead>
-								<damageDef>AA_ToxicSting</damageDef>
-								<damageAmountBase>2</damageAmountBase>
-								<speed>20</speed>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-							</projectile>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_HugeQuill"]/projectile</xpath>
-						<value>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<flyOverhead>false</flyOverhead>
-								<damageDef>AA_ToxicSting</damageDef>
-								<damageAmountBase>36</damageAmountBase>
-								<speed>16</speed>
-								<armorPenetrationSharp>5</armorPenetrationSharp>
-								<armorPenetrationBlunt>21.8</armorPenetrationBlunt>
-							</projectile>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="AA_ExplodingWeb"]/projectile</xpath>
-						<value>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<flyOverhead>false</flyOverhead>
-								<damageDef>Bomb</damageDef>
-								<damageAmountBase>12.5</damageAmountBase>
-								<explosionRadius>0.9</explosionRadius>
-								<suppressionFactor>3.0</suppressionFactor>
-								<dangerFactor>2.0</dangerFactor>
-								<speed>12</speed>
-								<secondaryDamage>
-									<li>
-										<def>Stun</def>
-										<amount>6</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Genetics Expanded/Mods/AlphaAnimals_Patch_VerbShoot.xml b/Patches/Vanilla Genetics Expanded/Mods/AlphaAnimals_Patch_VerbShoot.xml
deleted file mode 100644
index 74cd8caf6d..0000000000
--- a/Patches/Vanilla Genetics Expanded/Mods/AlphaAnimals_Patch_VerbShoot.xml	
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Genetics Expanded</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Alpha Animals</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Nighthrumbo"]/verbs</xpath>
-						<value>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>AA_HugeQuill</defaultProjectile>
-									<warmupTime>2.4</warmupTime>
-									<burstShotCount>1</burstShotCount>
-									<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-									<minRange>2</minRange>
-									<range>20</range>
-									<soundCast>AA_DartSound</soundCast>
-									<muzzleFlashScale>0</muzzleFlashScale>
-									<commonality>0.8</commonality>
-								</li>
-							</verbs>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Boomalisk"]/verbs</xpath>
-						<value>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>AA_ExplodingWeb</defaultProjectile>
-									<warmupTime>2.5</warmupTime>
-									<burstShotCount>3</burstShotCount>
-									<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-									<minRange>1</minRange>
-									<range>16</range>
-									<soundCast>AA_Throw</soundCast>
-									<muzzleFlashScale>0</muzzleFlashScale>
-									<commonality>0.8</commonality>
-								</li>
-							</verbs>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Needlechicken"]/verbs</xpath>
-						<value>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<defaultProjectile>AA_Bullet_TinyVenomBarb</defaultProjectile>
-									<warmupTime>1.8</warmupTime>
-									<burstShotCount>12</burstShotCount>
-									<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-									<minRange>2</minRange>
-									<range>14</range>
-									<soundCast>AA_DartSound</soundCast>
-									<muzzleFlashScale>0</muzzleFlashScale>
-									<commonality>0.99</commonality>
-								</li>
-							</verbs>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Genetics Expanded/Mods/CosmicHorror_Items_Resource_Stuff.xml b/Patches/Vanilla Genetics Expanded/Mods/CosmicHorror_Items_Resource_Stuff.xml
deleted file mode 100644
index 9c18f453c2..0000000000
--- a/Patches/Vanilla Genetics Expanded/Mods/CosmicHorror_Items_Resource_Stuff.xml	
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Genetics Expanded</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Call of Cthulhu - Cosmic Horrors</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<!--GR_EldritchWool -->
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_EldritchWool"]/statBases/StuffPower_Armor_Sharp</xpath>
-						<value>
-							<StuffPower_Armor_Sharp>0.12</StuffPower_Armor_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_EldritchWool"]/statBases/StuffPower_Armor_Blunt</xpath>
-						<value>
-							<StuffPower_Armor_Blunt>0.05</StuffPower_Armor_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_EldritchWool"]/statBases/StuffPower_Armor_Heat</xpath>
-						<value>
-							<StuffPower_Armor_Heat>0.15</StuffPower_Armor_Heat>
-						</value>
-					</li>
-
-					<!--Shiftskin -->
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Shiftskin"]/statBases/StuffPower_Armor_Sharp</xpath>
-						<value>
-							<StuffPower_Armor_Sharp>0.18</StuffPower_Armor_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Shiftskin"]/statBases/StuffPower_Armor_Blunt</xpath>
-						<value>
-							<StuffPower_Armor_Blunt>0.08</StuffPower_Armor_Blunt>
-						</value>
-					</li>
-
-					<!--Wood -->
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_DarkYoungWoodLog"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>3</power>
-									<cooldownTime>1.28</cooldownTime>
-									<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_DarkYoungWoodLog"]</xpath>
-						<value>
-							<equippedStatOffsets>
-								<MeleeCritChance>0.2</MeleeCritChance>
-								<MeleeParryChance>1</MeleeParryChance>
-								<MeleeDodgeChance>0.13</MeleeDodgeChance>
-							</equippedStatOffsets>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_DarkYoungWoodLog"]/statBases</xpath>
-						<value>
-							<Bulk>0.07</Bulk>
-							<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
-							<StuffPower_Armor_Sharp>0.25</StuffPower_Armor_Sharp>
-							<StuffPower_Armor_Blunt>0.375</StuffPower_Armor_Blunt>
-							<StuffPower_Armor_Heat>0.025</StuffPower_Armor_Heat>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_DarkYoungWoodLog"]/statBases/SharpDamageMultiplier</xpath>
-						<value>
-							<SharpDamageMultiplier>0.75</SharpDamageMultiplier>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_DarkYoungWoodLog"]/statBases/BluntDamageMultiplier</xpath>
-						<value>
-							<BluntDamageMultiplier>0.7</BluntDamageMultiplier>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_DarkYoungWoodLog"]/stuffProps/statFactors</xpath>
-						<value>
-							<Mass>0.25</Mass>
-							<MeleePenetrationFactor>0.48</MeleePenetrationFactor>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Genetics Expanded/Mods/Dinosauria_Items_Resource_Stuff.xml b/Patches/Vanilla Genetics Expanded/Mods/Dinosauria_Items_Resource_Stuff.xml
deleted file mode 100644
index dba4f200a7..0000000000
--- a/Patches/Vanilla Genetics Expanded/Mods/Dinosauria_Items_Resource_Stuff.xml	
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Genetics Expanded</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Dinosauria</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<!--DinoFeatherWool -->
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_DinoFeatherWool"]/statBases/StuffPower_Armor_Blunt</xpath>
-						<value>
-							<StuffPower_Armor_Blunt>0.24</StuffPower_Armor_Blunt>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Genetics Expanded/Mods/Races_Animal_AlphaHybridCE.xml b/Patches/Vanilla Genetics Expanded/Mods/Races_Animal_AlphaHybridCE.xml
deleted file mode 100644
index 6af97b0cac..0000000000
--- a/Patches/Vanilla Genetics Expanded/Mods/Races_Animal_AlphaHybridCE.xml	
+++ /dev/null
@@ -1,656 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Genetics Expanded</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Alpha Animals</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="GR_BearBug"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Quadruped</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_BearBug"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.09</MeleeDodgeChance>
-							<MeleeCritChance>0.4</MeleeCritChance>
-							<MeleeParryChance>0.2</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_BearBug"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
-						</value>
-					</li>
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_BearBug"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>0.4</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_BearBug"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>mandibles</label>
-									<capacities>
-										<li>AA_ParalysingBite</li>
-									</capacities>
-									<power>28</power>
-									<cooldownTime>1.85</cooldownTime>
-									<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-									<armorPenetrationSharp>1</armorPenetrationSharp>
-									<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>10</power>
-									<cooldownTime>1.65</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-									<armorPenetrationBlunt>6</armorPenetrationBlunt>
-									<chanceFactor>0.1</chanceFactor>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<!-- Boomspider -->
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="GR_Boomalisk"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>QuadrupedLow</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_Boomalisk"]/statBases</xpath>
-						<value>
-							<AimingAccuracy>0.65</AimingAccuracy>
-							<ShootingAccuracyPawn>0.65</ShootingAccuracyPawn>
-							<MeleeDodgeChance>0.13</MeleeDodgeChance>
-							<MeleeCritChance>0.18</MeleeCritChance>
-							<MeleeParryChance>0.2</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Boomalisk"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>1</ArmorRating_Blunt>
-						</value>
-					</li>
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Boomalisk"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>1</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Boomalisk"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>left first leg</label>
-									<capacities>
-										<li>Scratch</li>
-									</capacities>
-									<power>14</power>
-									<cooldownTime>1.25</cooldownTime>
-									<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationSharp>0.4</armorPenetrationSharp>
-									<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>right first leg</label>
-									<capacities>
-										<li>Scratch</li>
-									</capacities>
-									<power>14</power>
-									<cooldownTime>1.25</cooldownTime>
-									<linkedBodyPartsGroup>LegAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationSharp>0.4</armorPenetrationSharp>
-									<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<capacities>
-										<li>AA_ToxicSting</li>
-									</capacities>
-									<power>23</power>
-									<cooldownTime>1.65</cooldownTime>
-									<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>20</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>3</armorPenetrationSharp>
-									<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>9</power>
-									<cooldownTime>1.65</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>1</armorPenetrationBlunt>
-									<chanceFactor>0.2</chanceFactor>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<!-- Chicken Cactus -->
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="GR_Needlechicken"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Birdlike</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_Needlechicken"]/statBases</xpath>
-						<value>
-							<AimingAccuracy>0.3</AimingAccuracy>
-							<ShootingAccuracyPawn>0.3</ShootingAccuracyPawn>
-							<MeleeDodgeChance>0.09</MeleeDodgeChance>
-							<MeleeCritChance>0.03</MeleeCritChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Needlechicken"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>stings</label>
-									<capacities>
-										<li>AA_ToxicSting</li>
-									</capacities>
-									<power>7</power>
-									<cooldownTime>1.2</cooldownTime>
-									<armorPenetrationSharp>0.35</armorPenetrationSharp>
-									<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>1</power>
-									<cooldownTime>1</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>Bite</label>
-									<capacities>
-										<li>Bite</li>
-									</capacities>
-									<power>3</power>
-									<cooldownTime>1</cooldownTime>
-									<linkedBodyPartsGroup>AA_Mouth</linkedBodyPartsGroup>
-									<armorPenetrationSharp>0.12</armorPenetrationSharp>
-									<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="GR_Beetlefleet"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Birdlike</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_Beetlefleet"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.12</MeleeDodgeChance>
-							<MeleeCritChance>0.24</MeleeCritChance>
-							<MeleeParryChance>0.2</MeleeParryChance>
-							<ArmorRating_Sharp>0.8</ArmorRating_Sharp>
-							<ArmorRating_Blunt>1.2</ArmorRating_Blunt>
-						</value>
-					</li>
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Beetlefleet"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<capacities>
-										<li>Bite</li>
-									</capacities>
-									<power>21</power>
-									<cooldownTime>2.56</cooldownTime>
-									<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-									<armorPenetrationSharp>1</armorPenetrationSharp>
-									<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>tentacles</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>16</power>
-									<cooldownTime>1.35</cooldownTime>
-									<linkedBodyPartsGroup>Arms</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="GR_Groundffalo"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Quadruped</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_Groundffalo"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.08</MeleeDodgeChance>
-							<MeleeCritChance>0.4</MeleeCritChance>
-							<MeleeParryChance>0.4</MeleeParryChance>
-						</value>
-					</li>
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Groundffalo"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>left claw</label>
-									<capacities>
-										<li>Scratch</li>
-									</capacities>
-									<power>22</power>
-									<cooldownTime>2.45</cooldownTime>
-									<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>21</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>8</armorPenetrationSharp>
-									<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>right claw</label>
-									<capacities>
-										<li>Scratch</li>
-									</capacities>
-									<power>22</power>
-									<cooldownTime>2.45</cooldownTime>
-									<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>21</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>8</armorPenetrationSharp>
-									<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>horn</label>
-									<capacities>
-										<li>Scratch</li>
-										<li>Stab</li>
-									</capacities>
-									<power>25</power>
-									<cooldownTime>2.85</cooldownTime>
-									<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationSharp>2.5</armorPenetrationSharp>
-									<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>20</power>
-									<cooldownTime>3.17</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<!-- Birdlizard -->
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="GR_MeadowLizard"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Birdlike</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_MeadowLizard"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.5</MeleeDodgeChance>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>0.1</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_MeadowLizard"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>claws</label>
-									<capacities>
-										<li>Scratch</li>
-									</capacities>
-									<power>16</power>
-									<cooldownTime>1.33</cooldownTime>
-									<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>15</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>0.33</armorPenetrationSharp>
-									<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<capacities>
-										<li>AA_ToxicSting</li>
-									</capacities>
-									<power>21</power>
-									<cooldownTime>1.65</cooldownTime>
-									<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>13</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>1.5</armorPenetrationSharp>
-									<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>7</power>
-									<cooldownTime>1.78</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>1</armorPenetrationBlunt>
-									<chanceFactor>0.2</chanceFactor>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="GR_AnimusHare"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>QuadrupedLow</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_AnimusHare"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.48</MeleeDodgeChance>
-							<MeleeCritChance>0.1</MeleeCritChance>
-						</value>
-					</li>
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_AnimusHare"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>2</power>
-									<cooldownTime>1.65</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<capacities>
-										<li>Bite</li>
-									</capacities>
-									<power>4</power>
-									<cooldownTime>1.65</cooldownTime>
-									<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="GR_Nighthrumbo"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>QuadrupedLow</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_Nighthrumbo"]/statBases</xpath>
-						<value>
-							<AimingAccuracy>0.9</AimingAccuracy>
-							<ShootingAccuracyPawn>0.9</ShootingAccuracyPawn>
-							<MeleeDodgeChance>0.25</MeleeDodgeChance>
-							<MeleeCritChance>0.7</MeleeCritChance>
-							<MeleeParryChance>0.45</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Nighthrumbo"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>6</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Nighthrumbo"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>10</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Nighthrumbo"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>horn</label>
-									<capacities>
-										<li>Cut</li>
-										<li>Stab</li>
-									</capacities>
-									<power>46</power>
-									<cooldownTime>2.0</cooldownTime>
-									<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationSharp>8</armorPenetrationSharp>
-									<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<capacities>
-										<li>ToxicBite</li>
-									</capacities>
-									<power>36</power>
-									<cooldownTime>1.75</cooldownTime>
-									<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>25</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>3</armorPenetrationSharp>
-									<armorPenetrationBlunt>9</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>18</power>
-									<cooldownTime>2</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>12</armorPenetrationBlunt>
-									<chanceFactor>0.2</chanceFactor>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="GR_WolfShrimp"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Quadruped</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_WolfShrimp"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>1</MeleeDodgeChance>
-							<MeleeCritChance>0.21</MeleeCritChance>
-							<MeleeParryChance>0.33</MeleeParryChance>
-							<ArmorRating_Blunt>2</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_WolfShrimp"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>3</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_WolfShrimp"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>left claw</label>
-									<capacities>
-										<li>AA_Pierce</li>
-									</capacities>
-									<power>26</power>
-									<cooldownTime>1.12</cooldownTime>
-									<linkedBodyPartsGroup>AA_BladeAttackTool</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>20</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>7</armorPenetrationSharp>
-									<armorPenetrationBlunt>7</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>right claw</label>
-									<capacities>
-										<li>AA_Pierce</li>
-									</capacities>
-									<power>26</power>
-									<cooldownTime>1.12</cooldownTime>
-									<linkedBodyPartsGroup>AA_BladeAttackTool</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>20</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>7</armorPenetrationSharp>
-									<armorPenetrationBlunt>7</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<capacities>
-										<li>Bite</li>
-									</capacities>
-									<power>24</power>
-									<cooldownTime>1.65</cooldownTime>
-									<linkedBodyPartsGroup>AA_Mouth</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>20</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>2.5</armorPenetrationSharp>
-									<armorPenetrationBlunt>7</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Genetics Expanded/Mods/Races_Animal_Dino_HybridCE.xml b/Patches/Vanilla Genetics Expanded/Mods/Races_Animal_Dino_HybridCE.xml
deleted file mode 100644
index c81a9caf5d..0000000000
--- a/Patches/Vanilla Genetics Expanded/Mods/Races_Animal_Dino_HybridCE.xml	
+++ /dev/null
@@ -1,562 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Genetics Expanded</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Dinosauria</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="GR_Spinobear"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Quadruped</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_Spinobear"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.09</MeleeDodgeChance>
-							<MeleeCritChance>0.42</MeleeCritChance>
-							<MeleeParryChance>0.2</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Spinobear"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>left leg</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>21</power>
-									<cooldownTime>1.55</cooldownTime>
-									<linkedBodyPartsGroup>LeftLeg</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>22</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>right leg</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>21</power>
-									<cooldownTime>1.55</cooldownTime>
-									<linkedBodyPartsGroup>RightLeg</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>22</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>teeth</label>
-									<capacities>
-										<li>Bite</li>
-									</capacities>
-									<power>43</power>
-									<cooldownTime>1.72</cooldownTime>
-									<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-									<armorPenetrationSharp>2.5</armorPenetrationSharp>
-									<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>8</power>
-									<cooldownTime>2.48</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-									<armorPenetrationBlunt>6</armorPenetrationBlunt>
-									<chanceFactor>0.1</chanceFactor>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<!-- Boomspider -->
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="GR_Parasaurolope"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Quadruped</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_Parasaurolope"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-							<MeleeCritChance>0.37</MeleeCritChance>
-							<MeleeParryChance>0.24</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Parasaurolope"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>24</power>
-									<cooldownTime>3</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>12</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<!-- Chicken Cactus -->
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="GR_Chickennathus"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Birdlike</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_Chickennathus"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.8</MeleeDodgeChance>
-							<MeleeCritChance>0.07</MeleeCritChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Chickennathus"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>left claw</label>
-									<capacities>
-										<li>Scratch</li>
-										<li>Stab</li>
-									</capacities>
-									<power>9</power>
-									<cooldownTime>0.85</cooldownTime>
-									<linkedBodyPartsGroup>FootClawAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationSharp>0.25</armorPenetrationSharp>
-									<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>right claw</label>
-									<capacities>
-										<li>Scratch</li>
-										<li>Stab</li>
-									</capacities>
-									<power>9</power>
-									<cooldownTime>0.85</cooldownTime>
-									<linkedBodyPartsGroup>FootClawAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationSharp>0.25</armorPenetrationSharp>
-									<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>teeth</label>
-									<capacities>
-										<li>Bite</li>
-									</capacities>
-									<power>16</power>
-									<cooldownTime>1.56</cooldownTime>
-									<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-									<armorPenetrationSharp>0.78</armorPenetrationSharp>
-									<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="GR_Diplobeetle"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Birdlike</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_Diplobeetle"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.12</MeleeDodgeChance>
-							<MeleeCritChance>1</MeleeCritChance>
-							<MeleeParryChance>0.2</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Diplobeetle"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Diplobeetle"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Diplobeetle"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>left leg</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>38</power>
-									<cooldownTime>3.6</cooldownTime>
-									<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>33</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>right leg</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>38</power>
-									<cooldownTime>3.6</cooldownTime>
-									<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>33</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>tail</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>56</power>
-									<cooldownTime>5.1</cooldownTime>
-									<linkedBodyPartsGroup>TailAttackTool</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>20</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<chanceFactor>0.25</chanceFactor>
-									<armorPenetrationBlunt>56</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="GR_Triceraffalo"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Quadruped</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_Triceraffalo"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.08</MeleeDodgeChance>
-							<MeleeCritChance>0.4</MeleeCritChance>
-							<MeleeParryChance>0.4</MeleeParryChance>
-						</value>
-					</li>
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Triceraffalo"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>horn</label>
-									<capacities>
-										<li>Scratch</li>
-										<li>Stab</li>
-									</capacities>
-									<power>31</power>
-									<cooldownTime>2.48</cooldownTime>
-									<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationSharp>4</armorPenetrationSharp>
-									<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>24</power>
-									<cooldownTime>3.17</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<!-- Birdlizard -->
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="GR_Raptortoise"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Birdlike</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_Raptortoise"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.5</MeleeDodgeChance>
-							<MeleeCritChance>0.23</MeleeCritChance>
-							<MeleeParryChance>0.1</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Raptortoise"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>left claw</label>
-									<capacities>
-										<li>Scratch</li>
-										<li>Stab</li>
-									</capacities>
-									<power>20</power>
-									<cooldownTime>1.12</cooldownTime>
-									<linkedBodyPartsGroup>FootClawAttackTool</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>10</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>0.48</armorPenetrationSharp>
-									<armorPenetrationBlunt>0.92</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>right claw</label>
-									<capacities>
-										<li>Scratch</li>
-										<li>Stab</li>
-									</capacities>
-									<power>20</power>
-									<cooldownTime>1.12</cooldownTime>
-									<linkedBodyPartsGroup>FootClawAttackTool</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>10</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>0.48</armorPenetrationSharp>
-									<armorPenetrationBlunt>0.92</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<capacities>
-										<li>GR_VeryToxicBite</li>
-									</capacities>
-									<power>28</power>
-									<cooldownTime>1.55</cooldownTime>
-									<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>13</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>1.75</armorPenetrationSharp>
-									<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>6</power>
-									<cooldownTime>1.78</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>2</armorPenetrationBlunt>
-									<chanceFactor>0.2</chanceFactor>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="GR_Stegothrumbo"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Quadruped</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_Stegothrumbo"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.48</MeleeDodgeChance>
-							<MeleeCritChance>0.64</MeleeCritChance>
-							<MeleeParryChance>0.4</MeleeParryChance>
-						</value>
-					</li>
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Stegothrumbo"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>tail</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>48</power>
-									<cooldownTime>3.2</cooldownTime>
-									<linkedBodyPartsGroup>TailAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>55</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Cut</li>
-									</capacities>
-									<power>48</power>
-									<cooldownTime>2.88</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<chanceFactor>0.2</chanceFactor>
-									<armorPenetrationSharp>1</armorPenetrationSharp>
-									<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Stab</li>
-									</capacities>
-									<power>36</power>
-									<cooldownTime>2.78</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<chanceFactor>0.2</chanceFactor>
-									<armorPenetrationSharp>4</armorPenetrationSharp>
-									<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="GR_Velociwolf"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Birdlike</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_Velociwolf"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.5</MeleeDodgeChance>
-							<MeleeCritChance>0.14</MeleeCritChance>
-							<MeleeParryChance>0.2</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Velociwolf"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>left claw</label>
-									<capacities>
-										<li>Scratch</li>
-										<li>Stab</li>
-									</capacities>
-									<power>14</power>
-									<cooldownTime>0.9</cooldownTime>
-									<linkedBodyPartsGroup>FootClawAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationSharp>0.56</armorPenetrationSharp>
-									<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>right claw</label>
-									<capacities>
-										<li>Scratch</li>
-										<li>Stab</li>
-									</capacities>
-									<power>14</power>
-									<cooldownTime>0.9</cooldownTime>
-									<linkedBodyPartsGroup>FootClawAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationSharp>0.56</armorPenetrationSharp>
-									<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<capacities>
-										<li>Bite</li>
-									</capacities>
-									<power>23</power>
-									<cooldownTime>1.5</cooldownTime>
-									<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>20</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>2</armorPenetrationSharp>
-									<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>3</power>
-									<cooldownTime>2</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-									<chanceFactor>0.2</chanceFactor>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Genetics Expanded/Mods/Races_Animal_HorrorHybrid.xml b/Patches/Vanilla Genetics Expanded/Mods/Races_Animal_HorrorHybrid.xml
deleted file mode 100644
index 69c0747414..0000000000
--- a/Patches/Vanilla Genetics Expanded/Mods/Races_Animal_HorrorHybrid.xml	
+++ /dev/null
@@ -1,624 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Genetics Expanded</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Call of Cthulhu - Cosmic Horrors</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="GR_EldritchBear"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Quadruped</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_EldritchBear"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.15</MeleeDodgeChance>
-							<MeleeCritChance>0.51</MeleeCritChance>
-							<MeleeParryChance>0.25</MeleeParryChance>
-							<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
-							<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_EldritchBear"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>hooves</label>
-									<capacities>
-										<li>ROM_BluntMonstrous</li>
-									</capacities>
-									<power>17</power>
-									<cooldownTime>1.55</cooldownTime>
-									<linkedBodyPartsGroup>ROM_Hooves</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>15.6</armorPenetrationBlunt>
-									<chanceFactor>0.2</chanceFactor>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>tentacles</label>
-									<capacities>
-										<li>ROM_BluntMonstrous</li>
-									</capacities>
-									<power>21</power>
-									<cooldownTime>1.45</cooldownTime>
-									<linkedBodyPartsGroup>ROM_Tentacles</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>14.8</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>coiling tentacles</label>
-									<capacities>
-										<li>ROM_ConstrictMonstrous</li>
-									</capacities>
-									<power>16</power>
-									<cooldownTime>1.65</cooldownTime>
-									<linkedBodyPartsGroup>ROM_Tentacles</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>28.8</armorPenetrationBlunt>
-									<chanceFactor>0.5</chanceFactor>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>maw</label>
-									<capacities>
-										<li>ToxicBite</li>
-									</capacities>
-									<power>31</power>
-									<cooldownTime>1.75</cooldownTime>
-									<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-									<armorPenetrationSharp>5</armorPenetrationSharp>
-									<armorPenetrationBlunt>12.6</armorPenetrationBlunt>
-									<chanceFactor>0.33</chanceFactor>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<!-- Boomspawn -->
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="GR_EldritchBoomalope"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Humanoid</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_EldritchBoomalope"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.13</MeleeDodgeChance>
-							<MeleeCritChance>0.27</MeleeCritChance>
-							<MeleeParryChance>0.24</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_EldritchBoomalope"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>amoebic tentacle</label>
-									<capacities>
-										<li>GR_VeryToxicBite</li>
-									</capacities>
-									<power>17</power>
-									<cooldownTime>1.02</cooldownTime>
-									<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>10</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>3</armorPenetrationSharp>
-									<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>15</power>
-									<cooldownTime>1.45</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>8</armorPenetrationBlunt>
-									<chanceFactor>0.25</chanceFactor>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<!-- EldritchChickens -->
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="GR_EldritchChicken"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Birdlike</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_EldritchChicken"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.5</MeleeDodgeChance>
-							<MeleeCritChance>0.03</MeleeCritChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_EldritchChicken"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>overwhelming mind</label>
-									<capacities>
-										<li>ROM_Psychic</li>
-									</capacities>
-									<power>10</power>
-									<cooldownTime>0.55</cooldownTime>
-									<linkedBodyPartsGroup>ROM_Mind</linkedBodyPartsGroup>
-									<armorPenetrationSharp>100</armorPenetrationSharp>
-									<armorPenetrationBlunt>150</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>2</power>
-									<cooldownTime>1</cooldownTime>
-									<linkedBodyPartsGroup>ROM_Wings</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="GR_EldritchInsectoid"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>QuadrupedLow</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_EldritchInsectoid"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.1</MeleeDodgeChance>
-							<MeleeCritChance>0.18</MeleeCritChance>
-							<MeleeParryChance>0.2</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_EldritchInsectoid"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_EldritchInsectoid"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>1</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_EldritchInsectoid"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>overwhelming mind</label>
-									<capacities>
-										<li>ROM_Psychic</li>
-									</capacities>
-									<power>18</power>
-									<cooldownTime>1.18</cooldownTime>
-									<linkedBodyPartsGroup>ROM_Mind</linkedBodyPartsGroup>
-									<armorPenetrationSharp>200</armorPenetrationSharp>
-									<armorPenetrationBlunt>200</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>grasping tentacles</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>10</power>
-									<cooldownTime>1.36</cooldownTime>
-									<linkedBodyPartsGroup>ROM_Tentacles</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>mandibles</label>
-									<capacities>
-										<li>Cut</li>
-									</capacities>
-									<power>21</power>
-									<cooldownTime>1.48</cooldownTime>
-									<linkedBodyPartsGroup>ROM_Mind</linkedBodyPartsGroup>
-									<armorPenetrationSharp>0.9</armorPenetrationSharp>
-									<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="GR_EldritchMuffalo"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Quadruped</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_EldritchMuffalo"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.1</MeleeDodgeChance>
-							<MeleeCritChance>0.47</MeleeCritChance>
-							<MeleeParryChance>0.5</MeleeParryChance>
-						</value>
-					</li>
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_EldritchMuffalo"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>vampiric teeth</label>
-									<capacities>
-										<li>ROM_Exsanguination</li>
-									</capacities>
-									<power>28</power>
-									<cooldownTime>1.56</cooldownTime>
-									<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>10</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>10</armorPenetrationSharp>
-									<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<capacities>
-										<li>Cut</li>
-									</capacities>
-									<power>18</power>
-									<cooldownTime>1.25</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationSharp>2.5</armorPenetrationSharp>
-									<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<!-- Eldritch Snake -->
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="GR_EldritchReptile"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Serpentine</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_EldritchReptile"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.5</MeleeDodgeChance>
-							<MeleeCritChance>0.04</MeleeCritChance>
-							<MeleeParryChance>0.1</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_EldritchReptile"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<capacities>
-										<li>ToxicBite</li>
-									</capacities>
-									<power>6</power>
-									<cooldownTime>0.25</cooldownTime>
-									<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>7</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>0.25</armorPenetrationSharp>
-									<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>2</power>
-									<cooldownTime>0.3</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-									<chanceFactor>0.1</chanceFactor>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<!-- Eldritch Thrumbo -->
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="GR_EldritchThrumbo"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Birdlike</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_EldritchThrumbo"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.25</MeleeDodgeChance>
-							<MeleeCritChance>0.84</MeleeCritChance>
-							<MeleeParryChance>0.45</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_EldritchThrumbo"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>14</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_EldritchThrumbo"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>22</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_EldritchThrumbo"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>rending claws</label>
-									<capacities>
-										<li>Cut</li>
-										<li>Stab</li>
-									</capacities>
-									<power>45</power>
-									<cooldownTime>1</cooldownTime>
-									<linkedBodyPartsGroup>ROM_RightClaws</linkedBodyPartsGroup>
-									<armorPenetrationSharp>14</armorPenetrationSharp>
-									<armorPenetrationBlunt>32</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>mandibles</label>
-									<capacities>
-										<li>Bite</li>
-										<li>Stab</li>
-									</capacities>
-									<power>40</power>
-									<cooldownTime>1.28</cooldownTime>
-									<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-									<armorPenetrationSharp>24</armorPenetrationSharp>
-									<armorPenetrationBlunt>52</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>20</power>
-									<cooldownTime>2.78</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>20</armorPenetrationBlunt>
-									<chanceFactor>0.2</chanceFactor>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<!-- Eldritch Wolf -->
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="GR_EldritchWolf"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Quadruped</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_EldritchWolf"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>1</MeleeDodgeChance>
-							<MeleeCritChance>0.21</MeleeCritChance>
-							<MeleeParryChance>0.33</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_EldritchWolf"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>14</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_EldritchWolf"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>32</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_EldritchWolf"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>venomous fangs</label>
-									<capacities>
-										<li>ToxicBite</li>
-									</capacities>
-									<power>28</power>
-									<cooldownTime>1.25</cooldownTime>
-									<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-									<armorPenetrationSharp>5</armorPenetrationSharp>
-									<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>claws</label>
-									<capacities>
-										<li>Cut</li>
-									</capacities>
-									<power>15</power>
-									<cooldownTime>0.75</cooldownTime>
-									<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-									<armorPenetrationSharp>1.5</armorPenetrationSharp>
-									<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<!-- Eldritch Cat -->
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="GR_Cathulhu"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Quadruped</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_Cathulhu"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.36</MeleeDodgeChance>
-							<MeleeCritChance>0.30</MeleeCritChance>
-							<MeleeParryChance>0.07</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Cathulhu"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>4</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Cathulhu"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>7</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Cathulhu"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>left claw</label>
-									<capacities>
-										<li>Scratch</li>
-									</capacities>
-									<power>14</power>
-									<cooldownTime>0.92</cooldownTime>
-									<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>20</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>0.07</armorPenetrationSharp>
-									<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>right claw</label>
-									<capacities>
-										<li>Scratch</li>
-									</capacities>
-									<power>14</power>
-									<cooldownTime>0.92</cooldownTime>
-									<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>20</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>0.07</armorPenetrationSharp>
-									<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<capacities>
-										<li>Bite</li>
-									</capacities>
-									<power>12</power>
-									<cooldownTime>1.37</cooldownTime>
-									<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>20</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>0.09</armorPenetrationSharp>
-									<armorPenetrationBlunt>1.690</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>2</power>
-									<cooldownTime>0.97</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<chanceFactor>0.2</chanceFactor>
-									<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Genetics Expanded/Mods/Races_Animal_MegaHybrid.xml b/Patches/Vanilla Genetics Expanded/Mods/Races_Animal_MegaHybrid.xml
deleted file mode 100644
index 9d62efba8b..0000000000
--- a/Patches/Vanilla Genetics Expanded/Mods/Races_Animal_MegaHybrid.xml	
+++ /dev/null
@@ -1,830 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Genetics Expanded</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Megafauna</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<!-- Rhinobear -->
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="GR_Elasmobearium"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Quadruped</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_Elasmobearium"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.12</MeleeDodgeChance>
-							<MeleeCritChance>0.84</MeleeCritChance>
-							<MeleeParryChance>0.2</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_Elasmobearium"]/statBases</xpath>
-						<value>
-							<ArmorRating_Blunt>4</ArmorRating_Blunt>
-						</value>
-					</li>
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_Elasmobearium"]/statBases</xpath>
-						<value>
-							<ArmorRating_Sharp>0.35</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Elasmobearium"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>left claw</label>
-									<capacities>
-										<li>Scratch</li>
-									</capacities>
-									<power>33</power>
-									<cooldownTime>2</cooldownTime>
-									<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>14</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>2.25</armorPenetrationSharp>
-									<armorPenetrationBlunt>18</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>right claw</label>
-									<capacities>
-										<li>Scratch</li>
-									</capacities>
-									<power>33</power>
-									<cooldownTime>2</cooldownTime>
-									<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>14</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>2.25</armorPenetrationSharp>
-									<armorPenetrationBlunt>18</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>Jaws</label>
-									<capacities>
-										<li>Bite</li>
-									</capacities>
-									<power>43</power>
-									<cooldownTime>2.48</cooldownTime>
-									<chanceFactor>0.5</chanceFactor>
-									<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>14</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>6</armorPenetrationSharp>
-									<armorPenetrationBlunt>24</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>horn</label>
-									<capacities>
-										<li>Scratch</li>
-										<li>Stab</li>
-									</capacities>
-									<power>41</power>
-									<cooldownTime>2.48</cooldownTime>
-									<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationSharp>6</armorPenetrationSharp>
-									<armorPenetrationBlunt>24</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<!-- Boomaphant -->
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="GR_Boomnotherium"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Quadruped</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_Boomnotherium"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.12</MeleeDodgeChance>
-							<MeleeCritChance>0.8</MeleeCritChance>
-							<MeleeParryChance>0.2</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_Boomnotherium"]/statBases</xpath>
-						<value>
-							<ArmorRating_Blunt>2</ArmorRating_Blunt>
-							<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Boomnotherium"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>left foot</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>31</power>
-									<cooldownTime>2</cooldownTime>
-									<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>32</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>right foot</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>31</power>
-									<cooldownTime>2</cooldownTime>
-									<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>32</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<chanceFactor>0.01</chanceFactor>
-									<power>40</power>
-									<cooldownTime>2</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>41</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>tusk</label>
-									<capacities>
-										<li>Scratch</li>
-										<li>Stab</li>
-										<li>Poke</li>
-									</capacities>
-									<power>41</power>
-									<cooldownTime>2.48</cooldownTime>
-									<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationSharp>6</armorPenetrationSharp>
-									<armorPenetrationBlunt>36</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<!-- Chickenlodon -->
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="GR_Chickenlodon"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Birdlike</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_Chickenlodon"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.47</MeleeDodgeChance>
-							<MeleeCritChance>0.4</MeleeCritChance>
-							<MeleeParryChance>0.1</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Chickenlodon"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>left claw</label>
-									<capacities>
-										<li>Scratch</li>
-									</capacities>
-									<power>20</power>
-									<cooldownTime>1.25</cooldownTime>
-									<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>14</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>0.36</armorPenetrationSharp>
-									<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>right claw</label>
-									<capacities>
-										<li>Scratch</li>
-									</capacities>
-									<power>20</power>
-									<cooldownTime>1.25</cooldownTime>
-									<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>14</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>0.36</armorPenetrationSharp>
-									<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>Beak</label>
-									<capacities>
-										<li>Bite</li>
-										<li>Stab</li>
-									</capacities>
-									<power>28</power>
-									<cooldownTime>1.65</cooldownTime>
-									<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>14</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>3</armorPenetrationSharp>
-									<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<!-- Giant Mantis -->
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="GR_Mantistanis"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Birdlike</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_Mantistanis"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.33</MeleeDodgeChance>
-							<MeleeCritChance>0.33</MeleeCritChance>
-							<MeleeParryChance>0.33</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Mantistanis"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<capacities>
-										<li>Bite</li>
-									</capacities>
-									<power>34</power>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>15</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<cooldownTime>2.3</cooldownTime>
-									<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-									<armorPenetrationSharp>3</armorPenetrationSharp>
-									<armorPenetrationBlunt>12</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>mantis blades</label>
-									<capacities>
-										<li>Cut</li>
-										<li>Scratch</li>
-									</capacities>
-									<power>37</power>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>15</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<cooldownTime>1.85</cooldownTime>
-									<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
-									<armorPenetrationSharp>1.5</armorPenetrationSharp>
-									<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>mantis blades</label>
-									<capacities>
-										<li>Cut</li>
-										<li>Scratch</li>
-									</capacities>
-									<power>37</power>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>15</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<cooldownTime>1.85</cooldownTime>
-									<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
-									<armorPenetrationSharp>1.5</armorPenetrationSharp>
-									<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>claws</label>
-									<capacities>
-										<li>Scratch</li>
-									</capacities>
-									<power>30</power>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>15</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<cooldownTime>2</cooldownTime>
-									<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-									<armorPenetrationSharp>2</armorPenetrationSharp>
-									<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<!-- Paraceramuffalo-->
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="GR_Paraceramuffalo"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Birdlike</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_Paraceramuffalo"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.12</MeleeDodgeChance>
-							<MeleeCritChance>0.88</MeleeCritChance>
-							<MeleeParryChance>0.2</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_Paraceramuffalo"]/statBases</xpath>
-						<value>
-							<ArmorRating_Blunt>4</ArmorRating_Blunt>
-						</value>
-					</li>
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_Paraceramuffalo"]/statBases</xpath>
-						<value>
-							<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Paraceramuffalo"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>left hoof</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>41</power>
-									<cooldownTime>3</cooldownTime>
-									<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>36</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>left hoof</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>41</power>
-									<cooldownTime>3</cooldownTime>
-									<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>36</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<chanceFactor>0.01</chanceFactor>
-									<power>34</power>
-									<cooldownTime>3</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>24</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<capacities>
-										<li>Bite</li>
-									</capacities>
-									<power>15</power>
-									<cooldownTime>3.0</cooldownTime>
-									<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<!-- cowlizard -->
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="GR_Lizardochs"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Quadruped</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_Lizardochs"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.5</MeleeDodgeChance>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>0.1</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Lizardochs"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>left hoof</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>26</power>
-									<cooldownTime>2.5</cooldownTime>
-									<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>20</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>right hoof</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>26</power>
-									<cooldownTime>2.5</cooldownTime>
-									<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>20</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<chanceFactor>0.25</chanceFactor>
-									<power>24</power>
-									<cooldownTime>2</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>24</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>horn</label>
-									<capacities>
-										<li>Blunt</li>
-										<li>Stab</li>
-									</capacities>
-									<chanceFactor>0.45</chanceFactor>
-									<power>28</power>
-									<cooldownTime>2</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationSharp>5</armorPenetrationSharp>
-									<armorPenetrationBlunt>18</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<!-- Rodent -->
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="GR_Doedicoon"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Quadruped</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_Doedicoon"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.3</MeleeDodgeChance>
-							<MeleeCritChance>0.1</MeleeCritChance>
-							<MeleeParryChance>0.1</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Doedicoon"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>1</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Doedicoon"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>2.5</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Doedicoon"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>left claw</label>
-									<capacities>
-										<li>Scratch</li>
-									</capacities>
-									<power>6</power>
-									<cooldownTime>1.25</cooldownTime>
-									<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-									<armorPenetrationSharp>5</armorPenetrationSharp>
-									<armorPenetrationBlunt>18</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>left claw</label>
-									<capacities>
-										<li>Scratch</li>
-									</capacities>
-									<power>6</power>
-									<cooldownTime>1.25</cooldownTime>
-									<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-									<armorPenetrationSharp>5</armorPenetrationSharp>
-									<armorPenetrationBlunt>18</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>tail</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<chanceFactor>0.5</chanceFactor>
-									<power>8</power>
-									<cooldownTime>2</cooldownTime>
-									<linkedBodyPartsGroup>TailWeapon</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<capacities>
-										<li>Bite</li>
-									</capacities>
-									<power>3</power>
-									<cooldownTime>3.0</cooldownTime>
-									<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<!-- Thrumbo Dino -->
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="GR_Thrumdraeodon"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Quadruped</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_Thrumdraeodon"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-							<MeleeCritChance>0.78</MeleeCritChance>
-							<MeleeParryChance>0.45</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Thrumdraeodon"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>12</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Thrumdraeodon"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>21</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_Thrumdraeodon"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>left foot</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>31</power>
-									<cooldownTime>1.85</cooldownTime>
-									<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>32</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>right foot</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>31</power>
-									<cooldownTime>1.85</cooldownTime>
-									<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>32</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>horn</label>
-									<capacities>
-										<li>Cut</li>
-										<li>Stab</li>
-									</capacities>
-									<power>48</power>
-									<cooldownTime>1.85</cooldownTime>
-									<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationSharp>10</armorPenetrationSharp>
-									<armorPenetrationBlunt>20</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<capacities>
-										<li>Bite</li>
-									</capacities>
-									<power>48</power>
-									<cooldownTime>1.85</cooldownTime>
-									<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>25</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>7</armorPenetrationSharp>
-									<armorPenetrationBlunt>25</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<!-- Wooly Wolf -->
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="GR_WoolyWolf"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Quadruped</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="GR_WoolyWolf"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.47</MeleeDodgeChance>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>0.33</MeleeParryChance>
-							<ArmorRating_Blunt>1</ArmorRating_Blunt>
-							<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="GR_WoolyWolf"]/tools</xpath>
-						<value>
-							<tools>
-
-								<li Class="CombatExtended.ToolCE">
-									<label>left claw</label>
-									<capacities>
-										<li>Scratch</li>
-									</capacities>
-									<power>15</power>
-									<cooldownTime>1</cooldownTime>
-									<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>14</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>0.3</armorPenetrationSharp>
-									<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>right claw</label>
-									<capacities>
-										<li>Scratch</li>
-									</capacities>
-									<power>15</power>
-									<cooldownTime>1</cooldownTime>
-									<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>14</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>0.3</armorPenetrationSharp>
-									<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>tusk</label>
-									<capacities>
-										<li>Scratch</li>
-										<li>Stab</li>
-									</capacities>
-									<power>30</power>
-									<cooldownTime>2</cooldownTime>
-									<linkedBodyPartsGroup>TuskAttackTool</linkedBodyPartsGroup>
-									<armorPenetrationSharp>2.5</armorPenetrationSharp>
-									<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>Jaws</label>
-									<capacities>
-										<li>Bite</li>
-									</capacities>
-									<power>34</power>
-									<cooldownTime>2</cooldownTime>
-									<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>14</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<armorPenetrationSharp>2.25</armorPenetrationSharp>
-									<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Genetics Expanded/Patch_Items_Drugs.xml b/Patches/Vanilla Genetics Expanded/Patch_Items_Drugs.xml
deleted file mode 100644
index a4e3fc88e7..0000000000
--- a/Patches/Vanilla Genetics Expanded/Patch_Items_Drugs.xml	
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Genetics Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--GR_FeatherdustJoint -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_FeatherdustJoint"]/statBases</xpath>
-					<value>
-						<Bulk>0.12</Bulk>
-					</value>
-				</li>
-
-				<!--GR_ElectroEgg -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_ElectroEgg"]/statBases</xpath>
-					<value>
-						<Bulk>0.10</Bulk>
-					</value>
-				</li>
-
-				<!--GR_PoisonAmpoule -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_PoisonAmpoule"]/statBases</xpath>
-					<value>
-						<Bulk>0.05</Bulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Genetics Expanded/Patch_Projectiles.xml b/Patches/Vanilla Genetics Expanded/Patch_Projectiles.xml
deleted file mode 100644
index 3711b98175..0000000000
--- a/Patches/Vanilla Genetics Expanded/Patch_Projectiles.xml	
+++ /dev/null
@@ -1,379 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Genetics Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ============== Changing Projectile's thingClass to CE ones ================ -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[@Name="GR_BaseAnimalProjectile"]/projectile/flyOverhead</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="GR_SniperFlechette" or
-						defName="GR_RazorProjectile" or
-						defName="GR_Laser" or
-						defName="GR_Disintegrator" or
-						defName="GR_StunBolt" or
-						defName="GR_PoisonBlast" or
-						defName="GR_HairballProjectile" or
-						defName="GR_GreatHairballProjectile" or
-						defName="GR_Web" or
-						defName="GR_CryoBlast" or
-						defName="GR_PoisonBreath"
-						] </xpath>
-					<value>
-						<thingClass>CombatExtended.BulletCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						@Name="GR_BaseAnimalProjectile" or
-						defName="GR_Proj_ThrownSac" or
-						defName="GR_IncendiaryMote" or
-						defName="GR_Warhead" or
-						defName="GR_PlasmaBurst" or
-						defName="GR_FireSpit" or
-						defName="GR_SmokeBomb" or
-						defName="GR_Distortion"
-						]/thingClass </xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<!-- ============== Adding 'Standard' AimingAccuracy node to creatures' that use ranged attack statBases. =============== -->
-
-				<!-- =============== Now defining Projectiles in CE Procedure ============= -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_SniperFlechette"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>Bullet</damageDef>
-							<damageAmountBase>17</damageAmountBase>
-							<speed>200</speed>
-							<armorPenetrationSharp>14</armorPenetrationSharp>
-							<armorPenetrationBlunt>30</armorPenetrationBlunt>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_RazorProjectile"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>Cut</damageDef>
-							<damageAmountBase>20</damageAmountBase>
-							<speed>40</speed>
-							<armorPenetrationSharp>4</armorPenetrationSharp>
-							<armorPenetrationBlunt>17</armorPenetrationBlunt>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Laser"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>CE_Laser</damageDef>
-							<damageAmountBase>13</damageAmountBase>
-							<speed>300</speed>
-							<ai_IsIncendiary>true</ai_IsIncendiary>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Disintegrator"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>Burn</damageDef>
-							<damageAmountBase>500</damageAmountBase>
-							<speed>300</speed>
-							<ai_IsIncendiary>true</ai_IsIncendiary>
-							<secondaryDamage>
-								<li>
-									<def>PrometheumFlame</def>
-									<amount>3</amount>
-								</li>
-							</secondaryDamage>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_StunBolt"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>Stun</damageDef>
-							<damageAmountBase>15</damageAmountBase>
-							<speed>140</speed>
-							<armorPenetrationSharp>2</armorPenetrationSharp>
-							<armorPenetrationBlunt>3</armorPenetrationBlunt>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_PoisonBlast"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>GR_ToxicExplosion</damageDef>
-							<damageAmountBase>20</damageAmountBase>
-							<speed>78</speed>
-							<armorPenetrationSharp>10</armorPenetrationSharp>
-							<armorPenetrationBlunt>20</armorPenetrationBlunt>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_HairballProjectile"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>GR_HairballProjectileDamage</damageDef>
-							<damageAmountBase>5</damageAmountBase>
-							<speed>18</speed>
-							<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_GreatHairballProjectile"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>GR_GreatHairballProjectileDamage</damageDef>
-							<damageAmountBase>14</damageAmountBase>
-							<speed>14</speed>
-							<armorPenetrationBlunt>0.85</armorPenetrationBlunt>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Web"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>Stun</damageDef>
-							<damageAmountBase>15</damageAmountBase>
-							<speed>20</speed>
-							<armorPenetrationSharp>2</armorPenetrationSharp>
-							<armorPenetrationBlunt>3</armorPenetrationBlunt>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_CryoBlast"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>Frostbite</damageDef>
-							<damageAmountBase>25</damageAmountBase>
-							<speed>48</speed>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_PoisonBreath"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>GR_ToxicGas</damageDef>
-							<damageAmountBase>1</damageAmountBase>
-							<speed>30</speed>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Proj_ThrownSac"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<speed>12</speed>
-							<flyOverhead>False</flyOverhead>
-							<damageDef>Bomb</damageDef>
-							<damageAmountBase>20</damageAmountBase>
-							<explosionRadius>2.5</explosionRadius>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<explosionDelay>60</explosionDelay>
-							<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_SmokeBomb"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<speed>18</speed>
-							<damageDef>Smoke</damageDef>
-							<suppressionFactor>0.0</suppressionFactor>
-							<dangerFactor>0.0</dangerFactor>
-							<damageAmountBase>1</damageAmountBase>
-							<explosionRadius>5.9</explosionRadius>
-							<explosionDelay>1</explosionDelay>
-							<postExplosionGasType>BlindSmoke</postExplosionGasType>
-							<postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
-							<postExplosionSpawnChance>1</postExplosionSpawnChance>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_PlasmaBurst"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<speed>31</speed>
-							<damageDef>Bomb</damageDef>
-							<damageAmountBase>56</damageAmountBase>
-							<explosionRadius>3.5</explosionRadius>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<explosionDelay>1</explosionDelay>
-							<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_FireSpit"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<speed>10</speed>
-							<damageDef>Flame</damageDef>
-							<damageAmountBase>1</damageAmountBase>
-							<explosionRadius>1.1</explosionRadius>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
-							<preExplosionSpawnChance>0.1</preExplosionSpawnChance>
-							<ai_IsIncendiary>true</ai_IsIncendiary>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_IncendiaryMote"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<speed>16</speed>
-							<damageDef>Flame</damageDef>
-							<damageAmountBase>5</damageAmountBase>
-							<explosionRadius>1.1</explosionRadius>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
-							<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
-							<ai_IsIncendiary>true</ai_IsIncendiary>
-							<soundExplode>Interact_Ignite</soundExplode>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Warhead"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<speed>60</speed>
-							<damageDef>Bomb</damageDef>
-							<damageAmountBase>250</damageAmountBase>
-							<explosionRadius>8.9</explosionRadius>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<explosionChanceToStartFire>0.25</explosionChanceToStartFire>
-							<explosionDamageFalloff>true</explosionDamageFalloff>
-							<explosionEffect>GiantExplosion</explosionEffect>
-							<flyOverhead>False</flyOverhead>
-							<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-							<soundExplode>Explosion_GiantBomb</soundExplode>
-							<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
-							<soundAmbient>MortarRound_Ambient</soundAmbient>
-							<armorPenetrationSharp>100</armorPenetrationSharp>
-							<armorPenetrationBlunt>200</armorPenetrationBlunt>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Distortion"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>GR_DistortionDamage</damageDef>
-							<damageAmountBase>50</damageAmountBase>
-							<explosionRadius>1.1</explosionRadius>
-							<suppressionFactor>3.0</suppressionFactor>
-							<dangerFactor>2.0</dangerFactor>
-							<speed>25</speed>
-							<soundExplode>Interact_Ignite</soundExplode>
-							<armorPenetrationSharp>500</armorPenetrationSharp>
-							<armorPenetrationBlunt>1000</armorPenetrationBlunt>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="BaseBulletCE">
-							<defName>GR_PoisonBreathAnimated_CE</defName>
-							<label>poison breath</label>
-							<thingClass>CombatExtended.BulletCE</thingClass>
-							<graphicData>
-								<texPath>Things/Projectile/GR_PoisonShot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>MoteGlow</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<flyOverhead>false</flyOverhead>
-								<damageDef>ToxicBite</damageDef>
-								<damageAmountBase>25</damageAmountBase>
-								<speed>20</speed>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBulletCE">
-							<defName>GR_FlameBreathAnimated_CE</defName>
-							<label>flame breath</label>
-							<thingClass>CombatExtended.BulletCE</thingClass>
-							<graphicData>
-								<texPath>Things/Projectile/GR_FireSpit</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>MoteGlow</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<flyOverhead>false</flyOverhead>
-								<damageDef>Flame</damageDef>
-								<damageAmountBase>5</damageAmountBase>
-								<speed>20</speed>
-								<ai_IsIncendiary>true</ai_IsIncendiary>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Genetics Expanded/Patch_VerbShoot.xml b/Patches/Vanilla Genetics Expanded/Patch_VerbShoot.xml
deleted file mode 100644
index 7c253c8d59..0000000000
--- a/Patches/Vanilla Genetics Expanded/Patch_VerbShoot.xml	
+++ /dev/null
@@ -1,559 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Genetics Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Archocentipede -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_ArchotechCentipede"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>GR_Disintegrator</defaultProjectile>
-								<warmupTime>0.2</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>2</minRange>
-								<range>100</range>
-								<soundCast>GR_DisintegratorSound</soundCast>
-								<muzzleFlashScale>15</muzzleFlashScale>
-								<label>disintegrator</label>
-							</li>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>GR_Laser</defaultProjectile>
-								<warmupTime>1.0</warmupTime>
-								<burstShotCount>10</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>2</minRange>
-								<range>36</range>
-								<soundCast>GR_LaserSound</soundCast>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<label>twin-coiled laser</label>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Boombeetle"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>GR_Proj_ThrownSac</defaultProjectile>
-								<warmupTime>2</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>3</minRange>
-								<range>20</range>
-								<soundCast>Pawn_BigInsect_Call</soundCast>
-								<muzzleFlashScale>2</muzzleFlashScale>
-								<label>explosive sac</label>
-								<commonality>0.75</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Spidercat"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>GR_HairballProjectile</defaultProjectile>
-								<warmupTime>1.35</warmupTime>
-								<burstShotCount>2</burstShotCount>
-								<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-								<minRange>2</minRange>
-								<range>30</range>
-								<soundCast>Bow_Recurve</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>blinding spit</label>
-								<commonality>0.6</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Catalope"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>GR_FireSpit</defaultProjectile>
-								<warmupTime>1</warmupTime>
-								<burstShotCount>2</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>1</minRange>
-								<range>6</range>
-								<soundCast>ThrowMolotovCocktail</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>chemfuel spit</label>
-								<commonality>0.6</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Spiderhorse"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>GR_Web</defaultProjectile>
-								<warmupTime>2</warmupTime>
-								<burstShotCount>2</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>1</minRange>
-								<range>12</range>
-								<soundCast>GR_Throw</soundCast>
-								<muzzleFlashScale>2</muzzleFlashScale>
-								<label>web</label>
-								<commonality>0.75</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Boomsnake"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>GR_PoisonBlast</defaultProjectile>
-								<warmupTime>2</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>2</minRange>
-								<range>22</range>
-								<soundCast>GR_PoisonBlast</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>poison spit</label>
-								<commonality>1</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Chickenlizard"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>GR_PoisonBlast</defaultProjectile>
-								<warmupTime>2</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>2</minRange>
-								<range>22</range>
-								<soundCast>GR_PoisonBlast</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>poison spit</label>
-								<commonality>1</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Muffalokomodo"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>GR_PoisonBlast</defaultProjectile>
-								<warmupTime>2</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>2</minRange>
-								<range>22</range>
-								<soundCast>GR_PoisonBlast</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>poison spit</label>
-								<commonality>1</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Spidersnake"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>GR_PoisonBlast</defaultProjectile>
-								<warmupTime>2</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>2</minRange>
-								<range>22</range>
-								<soundCast>GR_PoisonBlast</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>poison spit</label>
-								<commonality>1</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Snakecat"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>GR_PoisonBlast</defaultProjectile>
-								<warmupTime>1.2</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>2</minRange>
-								<range>22</range>
-								<soundCast>GR_PoisonBlast</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>poison spit</label>
-								<commonality>1</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Crocorse"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>GR_PoisonBreath</defaultProjectile>
-								<warmupTime>0.2</warmupTime>
-								<burstShotCount>20</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>1</minRange>
-								<range>22</range>
-								<soundCast>GR_PoisonBreath</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>poison breath</label>
-								<commonality>0.8</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Thrumbolizard"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>GR_PoisonBreathAnimated_CE</defaultProjectile>
-								<burstShotCount>1</burstShotCount>
-								<warmupTime>1.2</warmupTime>
-								<range>18</range>
-								<minRange>1</minRange>
-								<soundCast>GR_FireBreath</soundCast>
-								<muzzleFlashScale>1</muzzleFlashScale>
-								<label>poison breath</label>
-								<commonality>1.0</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Wolfalope"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>GR_FlameBreathAnimated_CE</defaultProjectile>
-								<burstShotCount>1</burstShotCount>
-								<warmupTime>1.2</warmupTime>
-								<range>22</range>
-								<minRange>1</minRange>
-								<soundCast>GR_FireBreath</soundCast>
-								<muzzleFlashScale>1</muzzleFlashScale>
-								<label>fire breath</label>
-								<commonality>1.0</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Mechas -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechabear"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>GR_PlasmaBurst</defaultProjectile>
-								<warmupTime>3</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-								<minRange>4</minRange>
-								<range>46</range>
-								<soundCast>Pawn_Mech_Centipede_Call</soundCast>
-								<muzzleFlashScale>2</muzzleFlashScale>
-								<label>plasma burst</label>
-								<commonality>1</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechalope"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>GR_IncendiaryMote</defaultProjectile>
-								<warmupTime>0.4</warmupTime>
-								<burstShotCount>2</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>2</minRange>
-								<range>20</range>
-								<soundCast>ThrowMolotovCocktail</soundCast>
-								<muzzleFlashScale>2</muzzleFlashScale>
-								<label>chemfuel flamethrower</label>
-								<commonality>1</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechachicken"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>GR_SniperFlechette</defaultProjectile>
-								<warmupTime>2.2</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>9</minRange>
-								<range>70</range>
-								<soundCast>Bow_Small</soundCast>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<label>sniper flechette</label>
-								<commonality>1</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechaspider"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>GR_Laser</defaultProjectile>
-								<warmupTime>1.6</warmupTime>
-								<burstShotCount>10</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>2</minRange>
-								<range>56</range>
-								<soundCast>GR_LaserSound</soundCast>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<label>twin-coiled laser</label>
-								<commonality>1</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechamuffalo"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>GR_SmokeBomb</defaultProjectile>
-								<warmupTime>4</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>4</minRange>
-								<range>55</range>
-								<soundCast>Pawn_Mech_Centipede_Call</soundCast>
-								<muzzleFlashScale>2</muzzleFlashScale>
-								<label>smoke cannon</label>
-								<commonality>1</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mecharat"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>GR_StunBolt</defaultProjectile>
-								<warmupTime>1.25</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>2</minRange>
-								<range>8</range>
-								<soundCast>GR_Buzz</soundCast>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<label>stun bolt</label>
-								<commonality>1</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechaturtle"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>GR_PoisonBlast</defaultProjectile>
-								<warmupTime>2</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>2</minRange>
-								<range>62</range>
-								<soundCast>GR_PoisonBlast</soundCast>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<label>poison blast</label>
-								<commonality>1</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechawolf"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>GR_CryoBlast</defaultProjectile>
-								<warmupTime>2</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>2</minRange>
-								<range>40</range>
-								<soundCast>GR_Liquid</soundCast>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<label>cryo cannon</label>
-								<commonality>1</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechathrumbo"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>GR_Warhead</defaultProjectile>
-								<warmupTime>6</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-								<minRange>11</minRange>
-								<range>90</range>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<soundCast>Mortar_LaunchA</soundCast>
-								<muzzleFlashScale>15</muzzleFlashScale>
-								<label>antigrain artillery</label>
-								<commonality>1</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechacat"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>GR_RazorProjectile</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>2</minRange>
-								<range>32</range>
-								<soundCast>Pawn_Melee_MechanoidSlash_HitPawn</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>razor tail</label>
-								<commonality>1</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechamime"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>GR_Distortion</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>2</minRange>
-								<range>45</range>
-								<soundCast>GR_Singularity</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<label>spatial distortion</label>
-								<commonality>1</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_ArchoCentipede.xml b/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_ArchoCentipede.xml
deleted file mode 100644
index 2638804197..0000000000
--- a/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_ArchoCentipede.xml	
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Genetics Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_ArchotechCentipede"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_ArchotechCentipede"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>3</AimingAccuracy>
-						<ShootingAccuracyPawn>5</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.01</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-						<ArmorRating_Heat>2.00</ArmorRating_Heat>
-						<ArmorRating_Electric>1.00</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_ArchotechCentipede"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>500</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_ArchotechCentipede"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>50</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_ArchotechCentipede"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>160</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>300</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_AvianHybrids.xml b/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_AvianHybrids.xml
deleted file mode 100644
index 7663aa3a33..0000000000
--- a/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_AvianHybrids.xml	
+++ /dev/null
@@ -1,404 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Genetics Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Chickenbear"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Chickenbear"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.09</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Chickenbear"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.39</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.39</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Chickenlope"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Chickenlope"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Chickenlope"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.39</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Chickenffalo"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Chickenffalo"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.08</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Chickenffalo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.39</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Chickenwolf"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Chickenwolf"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.12</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Chickenwolf"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.39</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.35</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Chickenrabbit"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Chickenrabbit"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.04</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Chickenrabbit"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.39</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Chickencat"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Chickencat"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.04</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Chickencat"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Turkeyman"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Turkeyman"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.04</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Turkeyman"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.08</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.480</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>toothed beak</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.08</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.480</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2.08</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.480</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_BoomHybrids.xml b/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_BoomHybrids.xml
deleted file mode 100644
index 01c39afc34..0000000000
--- a/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_BoomHybrids.xml	
+++ /dev/null
@@ -1,382 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Genetics Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Boomabear"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Boomabear"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.08</MeleeDodgeChance>
-						<MeleeCritChance>0.2</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Boomabear"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>18</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2.22</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Boomachicken"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Boomachicken"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.08</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Boomachicken"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>13</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Boomffalo"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Boomffalo"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						<MeleeCritChance>0.20</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Boomffalo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>3.17</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Boomwolf"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Boomwolf"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Boomwolf"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.66</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Boomsquirrel"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Boomsquirrel"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.03</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Boomsquirrel"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.06</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.06</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.06</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.05</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Boomcat"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Boomcat"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Boomcat"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.28</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Booman"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Booman"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<Suppressability>1</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Booman"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.97</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.07</chanceFactor>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_CanineHybrids.xml b/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_CanineHybrids.xml
deleted file mode 100644
index 89114331b2..0000000000
--- a/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_CanineHybrids.xml	
+++ /dev/null
@@ -1,587 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Genetics Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Wolfbear"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Wolfbear"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.26</MeleeDodgeChance>
-						<MeleeCritChance>0.14</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Wolfbear"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>18</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Wolfalope"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Wolfalope"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.14</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Wolfalope"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.08</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.08</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.75</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Wolfchicken"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Wolfchicken"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.26</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.06</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Wolfchicken"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.06</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.06</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.75</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Wolffalo"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Wolffalo"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.08</MeleeDodgeChance>
-						<MeleeCritChance>0.22</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Wolffalo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.75</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.55</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Wolfbeaver"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Wolfbeaver"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.26</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Wolfbeaver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.06</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.06</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.9</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.85</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Wolfcat"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Wolfcat"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						<MeleeCritChance>0.27</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Wolfcat"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>16</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>16</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.75</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Dogman"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Dogman"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Dogman"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.8</cooldownTime>
-								<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.8</cooldownTime>
-								<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.63</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.11</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.360</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_ColossalHybrids.xml b/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_ColossalHybrids.xml
deleted file mode 100644
index 69b442af4f..0000000000
--- a/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_ColossalHybrids.xml	
+++ /dev/null
@@ -1,964 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Genetics Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Thrumbear"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Thrumbear"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.01</MeleeDodgeChance>
-						<MeleeCritChance>0.8</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Thrumbear"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>12</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Thrumbear"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Thrumbear"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Cut</li>
-									<li>Stab</li>
-								</capacities>
-								<power>46</power>
-								<cooldownTime>2.52</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.3</chanceFactor>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Smash!</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>42</power>
-								<cooldownTime>2.43</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<chanceFactor>0.3</chanceFactor>
-								<armorPenetrationBlunt>45</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Smash!</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>42</power>
-								<cooldownTime>2.43</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<chanceFactor>0.3</chanceFactor>
-								<armorPenetrationBlunt>45</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>2.6</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<chanceFactor>0.1</chanceFactor>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>2.75</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.1</chanceFactor>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Thrumbalope"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Thrumbalope"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.06</MeleeDodgeChance>
-						<MeleeCritChance>0.5</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Thrumbalope"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>12</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Thrumbalope"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Thrumbalope"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Cut</li>
-									<li>Stab</li>
-								</capacities>
-								<power>46</power>
-								<cooldownTime>2.52</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>7.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>2.33</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8.640</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>2.33</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8.640</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.08</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2.52</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Thrumbochicken"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Thrumbochicken"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.5</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Thrumbochicken"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Thrumbochicken"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>3</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Thrumbochicken"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Cut</li>
-									<li>Stab</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>25</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2.33</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Thrumffalo"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Thrumffalo"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.04</MeleeDodgeChance>
-						<MeleeCritChance>0.65</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Thrumbochicken"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>15</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Thrumbochicken"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Thrumffalo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Cut</li>
-									<li>Stab</li>
-								</capacities>
-								<power>46</power>
-								<cooldownTime>2.52</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>7.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>2.33</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8.640</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>2.33</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8.640</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2.33</cooldownTime>
-								<chanceFactor>0.2</chanceFactor>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Thrumwolf"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Thrumwolf"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.35</MeleeDodgeChance>
-						<MeleeCritChance>0.55</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Thrumbochicken"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>10</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Thrumbochicken"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Thrumwolf"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Cut</li>
-									<li>Stab</li>
-								</capacities>
-								<power>33</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>7</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>7.2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>7.2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>31</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2.52</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Thrumbocat"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Thrumbocat"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.44</MeleeDodgeChance>
-						<MeleeCritChance>0.56</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Thrumbocat"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>10</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Thrumbocat"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Thrumbocat"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Cut</li>
-									<li>Stab</li>
-								</capacities>
-								<power>31</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>7</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>GR_HairballBite</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Thrumborat"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Thrumborat"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.64</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Thrumborat"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Stab</li>
-								</capacities>
-								<power>31</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>7</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left paw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right paw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Thrumhorse"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Thrumhorse"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.10</MeleeDodgeChance>
-						<MeleeCritChance>0.56</MeleeCritChance>
-						<MeleeParryChance>0.35</MeleeParryChance>
-						<Flammability>0.6</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Thrumhorse"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>18</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Thrumhorse"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>12</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Thrumhorse"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.5</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Thrumhorse"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>31</power>
-								<cooldownTime>2.42</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>2.52</cooldownTime>
-								<chanceFactor>0.65</chanceFactor>
-								<linkedBodyPartsGroup>HornAttackTool_2</linkedBodyPartsGroup>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<armorPenetrationBlunt>9</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2.13</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>14.640</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2.13</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>14.640</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2.32</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Thrumbospider"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Thrumbospider"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.09</MeleeDodgeChance>
-						<MeleeCritChance>0.78</MeleeCritChance>
-						<MeleeParryChance>0.3</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Thrumbospider"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>35</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Thrumbospider"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Thrumbospider"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Cut</li>
-									<li>Stab</li>
-								</capacities>
-								<power>56</power>
-								<cooldownTime>2.36</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<armorPenetrationBlunt>40</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>2.35</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Thrumbolizard"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Thrumbolizard"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.08</MeleeDodgeChance>
-						<MeleeCritChance>0.7</MeleeCritChance>
-						<MeleeParryChance>0.3</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Thrumbolizard"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>GR_VeryToxicBite</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>GR_VeryToxicBite</li>
-									<li>Stab</li>
-								</capacities>
-								<power>46</power>
-								<cooldownTime>2.52</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.3</chanceFactor>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>2.3</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Thrumboman"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Thrumboman"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.09</MeleeDodgeChance>
-						<MeleeCritChance>0.76</MeleeCritChance>
-						<MeleeParryChance>0.45</MeleeParryChance>
-						<Flammability>0.6</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Thrumboman"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>21</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Thrumboman"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Thrumbo"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.6</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Thrumboman"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>46</power>
-								<cooldownTime>2.52</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>3</armorPenetrationSharp>
-								<armorPenetrationBlunt>16</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>41</power>
-								<cooldownTime>2.52</cooldownTime>
-								<chanceFactor>0.65</chanceFactor>
-								<linkedBodyPartsGroup>HornAttackTool_2</linkedBodyPartsGroup>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>2.13</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>14.640</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>2.13</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>14.640</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>1.62</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.016</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2.52</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_EquineHybrids.xml b/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_EquineHybrids.xml
deleted file mode 100644
index 887dc24f92..0000000000
--- a/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_EquineHybrids.xml	
+++ /dev/null
@@ -1,702 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Genetics Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Bearhorse"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Bearhorse"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						<MeleeCritChance>0.41</MeleeCritChance>
-						<MeleeParryChance>0.24</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Bearhorse"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.57</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>18</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>4.338</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.57</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>18</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>4.338</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.97</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.65</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.12</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Boomhorse"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Boomhorse"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.22</MeleeDodgeChance>
-						<MeleeCritChance>0.30</MeleeCritChance>
-						<MeleeParryChance>0.20</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Boomhorse"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.638</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.638</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.97</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.12</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Chickenhorse"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Chickenhorse"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.29</MeleeCritChance>
-						<MeleeParryChance>0.18</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Chickenhorse"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.038</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.038</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.97</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2.12</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Boomhorse"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Cathorse"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.27</MeleeDodgeChance>
-						<MeleeCritChance>0.50</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Cathorse"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof-paw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof-paw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.16</armorPenetrationBlunt>
-								<chanceFactor>0.7</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Molehorse"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Molehorse"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.06</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Molehorse"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.638</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.638</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.97</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Wolfhorse"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Wolfhorse"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						<MeleeCritChance>0.30</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Wolfhorse"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.73</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.55</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.225</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Muffalohorse"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Muffalohorse"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.17</MeleeDodgeChance>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Muffalohorse"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.44</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.69</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.638</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.638</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Crocorse"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Crocorse"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.39</MeleeCritChance>
-						<MeleeParryChance>0.24</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Crocorse"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>bite</label>
-								<capacities>
-									<li>GR_VeryToxicBite</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetrationSharp>3.05</armorPenetrationSharp>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.638</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.638</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Spiderhorse"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Spiderhorse"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.18</MeleeCritChance>
-						<MeleeParryChance>0.51</MeleeParryChance>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Spiderhorse"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>10</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Spiderhorse"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Spiderhorse"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>2.28</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.35</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.45</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2.48</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Hurseman"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Hurseman"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.39</MeleeCritChance>
-						<MeleeParryChance>0.24</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Hurseman"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.638</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.638</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.97</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.12</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_Failures.xml b/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_Failures.xml
deleted file mode 100644
index 6a25d2e668..0000000000
--- a/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_Failures.xml	
+++ /dev/null
@@ -1,252 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Genetics Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========= Fleshling ============ -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Fleshling"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Fleshling"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						<MeleeCritChance>0.23</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Fleshling"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.35</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.8</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Aberrant Fleshbeast ============ -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_AberrantFleshbeast"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_AberrantFleshbeast"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.01</MeleeDodgeChance>
-						<MeleeCritChance>0.10</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_AberrantFleshbeast"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2.56</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Flesh Monstrosity ============ -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_FleshMonstrosity"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_FleshMonstrosity"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.01</MeleeDodgeChance>
-						<MeleeCritChance>0.23</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_FleshMonstrosity"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>GR_RabidSlash</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>2.56</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<armorPenetrationBlunt>9</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Flesh Growth ============ -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_FleshGrowth"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_FleshGrowth"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.01</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_FleshGrowth"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.35</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.8</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========= Fleshflies ============ -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_FleshFlies"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Vehicle</bodyShape><!-- Not so much a 'body' as a swarm. -->
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="GR_FleshFlies"]/statBases/ArmorRating_Blunt</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="GR_FleshFlies"]/statBases/ArmorRating_Sharp</xpath>
-				</li>
-
-				<!-- 
-			Rather than using armor, use damage multipliers to mimic
-			only being able to kill a small part of the swarm with each
-			attack.
-			-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_FleshFlies"]</xpath>
-					<value>
-						<damageMultipliers>
-							<li>
-								<damageDef>Cut</damageDef>
-								<multiplier>0.20</multiplier>
-							</li>
-							<li>
-								<damageDef>Stab</damageDef>
-								<multiplier>0.20</multiplier>
-							</li>
-							<li>
-								<damageDef>Blunt</damageDef>
-								<multiplier>0.20</multiplier>
-							</li>
-							<li>
-								<damageDef>Bullet</damageDef>
-								<multiplier>0.10</multiplier>
-							</li>
-						</damageMultipliers>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_FleshFlies"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.80</MeleeDodgeChance>
-						<MeleeCritChance>0.00</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_FleshFlies"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>0.96</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.01</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="GR_FleshFlies"]/lifeStages/li/bodyGraphicData/texPath</xpath>
-					<value>
-						<texPath>Things/Pawn/Animal/Failures/Fleshflies/FleshfliesA</texPath>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="GR_FleshFlies"]/lifeStages/li/bodyGraphicData/drawSize</xpath>
-					<value>
-						<drawSize>2.0</drawSize>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_FelineHybrids.xml b/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_FelineHybrids.xml
deleted file mode 100644
index a57362ec15..0000000000
--- a/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_FelineHybrids.xml	
+++ /dev/null
@@ -1,535 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Genetics Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Catbear"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Catbear"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.11</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Catbear"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.14</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.14</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.78</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>18</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.4</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Catalope"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Catalope"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Catalope"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.06</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Catchicken"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Catchicken"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Catchicken"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>GR_GoForTheEyes</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Catffalo"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Catffalo"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.06</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Catffalo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.17</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Catrabbit"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Catrabbit"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Catrabbit"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.55</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>16</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.06</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.55</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>16</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.06</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.85</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.1</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Catwolf"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Catwolf"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.07</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Catwolf"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.9</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>16</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.12</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.9</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>16</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.12</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.55</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.18</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Catman"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Catman"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Catman"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.55</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.55</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.85</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.254</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>0.55</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_HumanoidHybrids.xml b/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_HumanoidHybrids.xml
deleted file mode 100644
index 5d2d0fc788..0000000000
--- a/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_HumanoidHybrids.xml	
+++ /dev/null
@@ -1,454 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Genetics Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Manbear"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Manbear"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Manbear"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.95</cooldownTime>
-								<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.95</cooldownTime>
-								<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Manffalo"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Manchicken"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.20</MeleeDodgeChance>
-						<MeleeCritChance>0.08</MeleeCritChance>
-						<MeleeParryChance>0.04</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Manchicken"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.42</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.08</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.89</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.78</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Manffalo"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Manffalo"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.17</MeleeDodgeChance>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Manffalo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.44</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.69</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Manalope"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Manalope"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						<MeleeCritChance>0.01</MeleeCritChance>
-						<MeleeParryChance>0.00</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Manalope"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2.5</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.035</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.01</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Manwolf"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Manwolf"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.75</MeleeCritChance>
-						<MeleeParryChance>0.5</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Manwolf"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.19</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.19</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.46</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<chanceFactor>2</chanceFactor>
-								<armorPenetrationSharp>1.6</armorPenetrationSharp>
-								<armorPenetrationBlunt>8.863</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>3.2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.225</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Mancat"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Mancat"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.27</MeleeDodgeChance>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>0.20</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mancat"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.09</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Mansquirrel"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mansquirrel"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>2.4</MoveSpeed>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.0</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mansquirrel"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.67</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.67</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.036</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.01</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.88</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.07</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>3.00</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_InsectoidHybrids.xml b/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_InsectoidHybrids.xml
deleted file mode 100644
index 90cf67ba6b..0000000000
--- a/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_InsectoidHybrids.xml	
+++ /dev/null
@@ -1,469 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Genetics Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Bearscarab"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Bearscarab"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						<MeleeCritChance>0.3</MeleeCritChance>
-						<MeleeParryChance>0.27</MeleeParryChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Bearscarab"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Bearscarab"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Bearscarab"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>2.56</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.33</armorPenetrationSharp>
-								<armorPenetrationBlunt>18</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.88</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Boombeetle"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Boombeetle"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.65</AimingAccuracy>
-						<ShootingAccuracyPawn>0.65</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Boombeetle"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.8</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Boombeetle"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Boombeetle"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2.1</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Chickenspider"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Chickenspider"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.24</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Chickenspider"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Chickenspider"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Chickenspider"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Muffalopede"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Muffalopede"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.4</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Muffalopede"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.75</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Muffalopede"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Muffalopede"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>2.78</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.55</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>3</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Wolfscarab"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Wolfscarab"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.28</MeleeCritChance>
-						<MeleeParryChance>0.3</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Wolfscarab"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Wolfscarab"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Wolfscarab"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.68</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.88</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.95</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Spidercat"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Spidercat"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.75</AimingAccuracy>
-						<ShootingAccuracyPawn>0.75</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.13</MeleeCritChance>
-						<MeleeParryChance>0.33</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Spidercat"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Spidercat"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Spidercat"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Manscarab"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.07</MeleeDodgeChance>
-						<MeleeCritChance>0.31</MeleeCritChance>
-						<MeleeParryChance>0.17</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Manscarab"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>mandibles</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.48</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Manscarab"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>10</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Manscarab"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_MechanoidHybrids.xml b/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_MechanoidHybrids.xml
deleted file mode 100644
index f2bf24a619..0000000000
--- a/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_MechanoidHybrids.xml	
+++ /dev/null
@@ -1,800 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Genetics Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Mechabear"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Mechabear"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.45</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechabear"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>32</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechabear"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>15</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechabear"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>43</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>18</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<armorPenetrationBlunt>32</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Mechalope"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Mechalope"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.35</MeleeDodgeChance>
-						<MeleeCritChance>0.3</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechalope"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechalope"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechalope"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>14</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Mechachicken"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Mechachicken"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>2.6</AimingAccuracy>
-						<ShootingAccuracyPawn>2.6</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.65</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechachicken"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechachicken"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechachicken"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>0.55</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Mechaspider"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Mechaspider"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1.6</AimingAccuracy>
-						<ShootingAccuracyPawn>1.6</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.36</MeleeDodgeChance>
-						<MeleeCritChance>0.4</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechaspider"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>25</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechaspider"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>12</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechaspider"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>13</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Mechamuffalo"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Mechamuffalo"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						<MeleeCritChance>0.5</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechamuffalo"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>28</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechamuffalo"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>11</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechamuffalo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>3</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>32</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Mecharat"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Mecharat"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.8</AimingAccuracy>
-						<ShootingAccuracyPawn>0.8</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.33</MeleeDodgeChance>
-						<MeleeCritChance>0.03</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mecharat"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.6</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mecharat"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mecharat"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.55</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Mechaturtle"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Mechaturtle"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1.6</AimingAccuracy>
-						<ShootingAccuracyPawn>1.6</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						<MeleeCritChance>0.5</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechaturtle"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>58</ArmorRating_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechaturtle"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>23</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechaturtle"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>2.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Mechawolf"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Mechawolf"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						<MeleeCritChance>0.5</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechawolf"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>15</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechawolf"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>7.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechawolf"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>18</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Mechathrumbo"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Mechathrumbo"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						<MeleeCritChance>0.75</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechathrumbo"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>48</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechathrumbo"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechathrumbo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>56</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<armorPenetrationBlunt>50</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>50</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Mechacat"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Mechacat"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.75</MeleeDodgeChance>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechacat"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>15</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechacat"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>7.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechacat"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>18</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Mechahorse"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechahorse"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2.75</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechahorse"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3.85</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Mechahorse"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.39</MeleeCritChance>
-						<MeleeParryChance>0.24</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechahorse"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4.12</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4.12</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4.12</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4.12</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.97</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>2.12</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Mechamime"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Mechamime"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechamime"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>3.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechamime"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>5.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Mechamime"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>25</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_MuffaloHybrids.xml b/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_MuffaloHybrids.xml
deleted file mode 100644
index a390356f7d..0000000000
--- a/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_MuffaloHybrids.xml	
+++ /dev/null
@@ -1,300 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Genetics Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Muffalobear"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Muffalobear"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.38</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Muffalobear"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>3.17</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Muffalochicken"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Muffalochicken"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						<MeleeCritChance>0.27</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Muffalochicken"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.75</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>3.17</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Muffalope"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Muffalope"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.27</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Muffalope"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>3.17</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Muffalowolf"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Muffalowolf"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.33</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Muffalowolf"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>3.17</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>1.85</cooldownTime>
-								<chanceFactor>0.5</chanceFactor>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.6</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Muffalocat"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Muffalocat"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.27</MeleeCritChance>
-						<MeleeParryChance>0.2</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Muffalocat"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>3.17</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Muffalorat"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Muffalorat"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Muffalorat"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>3.17</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>Tusk</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>2</cooldownTime>
-								<chanceFactor>0.5</chanceFactor>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.85</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Muffaloman"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Muffaloman"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.14</MeleeDodgeChance>
-						<MeleeCritChance>0.32</MeleeCritChance>
-						<MeleeParryChance>0.24</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Muffaloman"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>3.17</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_Paragons.xml b/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_Paragons.xml
deleted file mode 100644
index 696c7ca7e8..0000000000
--- a/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_Paragons.xml	
+++ /dev/null
@@ -1,915 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Genetics Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_ParagonBear"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_ParagonBear"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.6</MeleeCritChance>
-						<MeleeParryChance>0.3</MeleeParryChance>
-						<ArmorRating_Blunt>1.8</ArmorRating_Blunt>
-						<ArmorRating_Sharp>0.35</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_ParagonBear"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>27</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>27</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>46</power>
-								<cooldownTime>1.95</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>24</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>5</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_ParagonBoomalope"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_ParagonBoomalope"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.04</MeleeDodgeChance>
-						<MeleeCritChance>0.22</MeleeCritChance>
-						<MeleeParryChance>0.01</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_ParagonBoomalope"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>3.17</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_ParagonChicken"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_ParagonChicken"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.09</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_ParagonChicken"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.75</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.18</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_ParagonMuffalo"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_ParagonMuffalo"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.01</MeleeDodgeChance>
-						<MeleeCritChance>0.5</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-						<ArmorRating_Sharp>0.2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_ParagonMuffalo"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4.6</MoveSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_ParagonMuffalo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>2.66</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_ParagonWolf"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_ParagonWolf"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>7.1</MoveSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_ParagonWolf"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.45</MeleeDodgeChance>
-						<MeleeCritChance>0.27</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_ParagonWolf"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>1.75</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_ParagonIguana"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_ParagonIguana"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.22</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_ParagonIguana"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4</MoveSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_ParagonIguana"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>GR_VeryToxicBite</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.28</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>GR_VeryToxicBite</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightClaws</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.28</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>GR_VeryToxicBite</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.88</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_ParagonHorse"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_ParagonHorse"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>7</MoveSpeed>
-						<MeleeDodgeChance>0.35</MeleeDodgeChance>
-						<MeleeCritChance>0.20</MeleeCritChance>
-						<MeleeParryChance>0.25</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_ParagonHorse"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4.238</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4.238</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4.238</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4.238</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.97</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.85</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>2.12</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_ParagonThrumbo"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_ParagonThrumbo"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.09</MeleeDodgeChance>
-						<MeleeCritChance>0.90</MeleeCritChance>
-						<MeleeParryChance>0.55</MeleeParryChance>
-						<Flammability>0.5</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_ParagonThrumbo"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>24</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_ParagonThrumbo"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>17</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_ParagonThrumbo"]/statBases/ArmorRating_Heat</xpath>
-					<value>
-						<ArmorRating_Heat>0.7</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_ParagonThrumbo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>56</power>
-								<cooldownTime>2.52</cooldownTime>
-								<linkedBodyPartsGroup>HornAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<armorPenetrationBlunt>18</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>horn</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>48</power>
-								<cooldownTime>2.52</cooldownTime>
-								<chanceFactor>0.65</chanceFactor>
-								<linkedBodyPartsGroup>HornAttackTool_2</linkedBodyPartsGroup>
-								<armorPenetrationSharp>11</armorPenetrationSharp>
-								<armorPenetrationBlunt>9</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>2.13</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>16.640</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right foot</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>2.13</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>16.640</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.62</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.84</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.016</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>2.52</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_ParagonRat"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_ParagonRat"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_ParagonRat"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>GR_PlagueBite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>GR_PlagueBite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>GR_PlagueBite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.4</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.34</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_ParagonHumanoid"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_ParagonHumanoid"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						<MeleeCritChance>0.20</MeleeCritChance>
-						<MeleeParryChance>0.15</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_ParagonHumanoid"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1</cooldownTime>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>17</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1</cooldownTime>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>17</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>33</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>9.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2</cooldownTime>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>4.32</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_ParagonFeline"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_ParagonFeline"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_ParagonFeline"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.55</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.048</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.025</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.55</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.048</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.025</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>0.85</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.284</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.065</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>0.55</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.042</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_ParagonInsectoid"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						<MeleeCritChance>0.30</MeleeCritChance>
-						<MeleeParryChance>0.57</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_ParagonInsectoid"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>18</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_ParagonInsectoid"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_ParagonInsectoid"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head claw</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>37</power>
-								<cooldownTime>1.48</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>50</armorPenetrationSharp>
-								<armorPenetrationBlunt>30</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head claw</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>65</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>3.38</armorPenetrationSharp>
-								<armorPenetrationBlunt>8.438</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>34</power>
-								<cooldownTime>2.64</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_ReptileHybrids.xml b/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_ReptileHybrids.xml
deleted file mode 100644
index ecd31fb21f..0000000000
--- a/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_ReptileHybrids.xml	
+++ /dev/null
@@ -1,509 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Genetics Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Bearodile"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Bearodile"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						<MeleeCritChance>0.43</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-						<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
-						<ArmorRating_Sharp>0.3</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Bearodile"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>GR_VeryToxicBite</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>GR_VeryToxicBite</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>1.35</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>GR_VeryToxicBite</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Boomsnake"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Serpentine</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Boomsnake"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						<MeleeCritChance>0.33</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Boomsnake"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>GR_VeryToxicBite</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.85</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Chickenlizard"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Chickenlizard"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.07</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Chickenlizard"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>GR_LightToxicBite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.9</cooldownTime>
-								<linkedBodyPartsGroup>Feet</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.08</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>GR_LightToxicBite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.9</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>GR_LightToxicBite</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>0.86</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.08</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.12</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Muffalokomodo"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Muffalokomodo"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.06</MeleeDodgeChance>
-						<MeleeCritChance>0.4</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-						<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
-						<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Muffalokomodo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>GR_VeryToxicBite</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.88</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>3.17</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Spidersnake"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Serpentine</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Spidersnake"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.45</MeleeDodgeChance>
-						<MeleeCritChance>0.07</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Spidersnake"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>GR_VeryToxicBite</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>GR_VeryToxicBite</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Wolfsnake"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Wolfsnake"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.3</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-						<ArmorRating_Sharp>0.12</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Wolfsnake"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>GR_VeryToxicBite</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>GR_VeryToxicBite</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>GR_VeryToxicBite</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.88</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Snakecat"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Serpentine</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Snakecat"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Snakecat"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>GR_VeryToxicBite</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.75</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.85</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Lizardman"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Lizardman"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						<MeleeCritChance>0.31</MeleeCritChance>
-						<MeleeParryChance>0.19</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Lizardman"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>GR_VeryToxicBite</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.7</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>1.41</armorPenetrationSharp>
-								<armorPenetrationBlunt>9</armorPenetrationBlunt>
-								<chanceFactor>0.5</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_RodentHybrids.xml b/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_RodentHybrids.xml
deleted file mode 100644
index 25e582dbaf..0000000000
--- a/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_RodentHybrids.xml	
+++ /dev/null
@@ -1,501 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Genetics Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Molebear"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Molebear"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.18</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Molebear"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.28</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.28</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.85</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Squirralope"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Squirralope"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Squirralope"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.56</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Rabbitchicken"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Rabbitchicken"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.02</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Rabbitchicken"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>0.85</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.06</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Ratffalo"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Ratffalo"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.22</MeleeDodgeChance>
-						<MeleeCritChance>0.03</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Ratffalo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.18</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Beaverwolf"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Beaverwolf"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.15</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Beaverwolf"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.65</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Rabbitcat"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Rabbitcat"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						<MeleeCritChance>0.27</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Rabbitcat"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>34</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1.85</armorPenetrationSharp>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Moleman"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Moleman"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						<MeleeCritChance>0.05</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Moleman"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.5</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.87</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.36</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>0.97</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.423</armorPenetrationBlunt>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_UrsineHybrids.xml b/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_UrsineHybrids.xml
deleted file mode 100644
index 813ffca76b..0000000000
--- a/Patches/Vanilla Genetics Expanded/ThingDefs_Races/Races_Animal_UrsineHybrids.xml	
+++ /dev/null
@@ -1,662 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Genetics Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Bearalope"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Bearalope"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.09</MeleeDodgeChance>
-						<MeleeCritChance>0.25</MeleeCritChance>
-						<MeleeParryChance>0.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Bearalope"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>18</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.45</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>18</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>31</power>
-								<cooldownTime>2.1</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>18</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.85</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.22</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Bearchicken"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Bearchicken"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						<MeleeCritChance>0.07</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Bearchicken"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.48</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.48</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>13</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.6</armorPenetrationSharp>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Bearffalo"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Bearffalo"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.07</MeleeDodgeChance>
-						<MeleeCritChance>0.3</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Bearffalo"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.68</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>16</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.68</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>16</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>2.33</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>16</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>2.78</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Bearwolf"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Bearwolf"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						<MeleeCritChance>0.2</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Bearwolf"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>18</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>18</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.55</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Bearmole"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Bearmole"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						<MeleeCritChance>0.16</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Bearmole"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>18</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.35</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>18</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-									<li>Stab</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Bearcat"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Bearcat"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.35</MeleeDodgeChance>
-						<MeleeCritChance>0.23</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Bearcat"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>18</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>18</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>1.6</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="GR_Bearman"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GR_Bearman"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<Suppressability>1</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GR_Bearman"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.75</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>12</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.75</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>12</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2.4</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>18</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.0</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Genetics Expanded/TraderKinds_MadScientists.xml b/Patches/Vanilla Genetics Expanded/TraderKinds_MadScientists.xml
deleted file mode 100644
index f16bc202d1..0000000000
--- a/Patches/Vanilla Genetics Expanded/TraderKinds_MadScientists.xml	
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Genetics Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Caravan Trader -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="GR_Outlander_CaravanTrader"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>FSX</thingDef>
-							<countRange>
-								<min>25</min>
-								<max>100</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>Prometheum</thingDef>
-							<countRange>
-								<min>15</min>
-								<max>100</max>
-							</countRange>
-						</li>
-					</value>
-				</li>
-
-				<!-- Orbital Trader -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="GR_OrbitalTrader"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>FSX</thingDef>
-							<countRange>
-								<min>50</min>
-								<max>200</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>Prometheum</thingDef>
-							<countRange>
-								<min>50</min>
-								<max>200</max>
-							</countRange>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Ideology Expanded - Dryads/DamageDefs/Animal_Projectile_Shoot.xml b/Patches/Vanilla Ideology Expanded - Dryads/DamageDefs/Animal_Projectile_Shoot.xml
deleted file mode 100644
index 32ce9007c9..0000000000
--- a/Patches/Vanilla Ideology Expanded - Dryads/DamageDefs/Animal_Projectile_Shoot.xml	
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Ideology Expanded - Dryads</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ================= Setting it so that the Animal is shooting using CE code ================= -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Spitter"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>VDE_AcidBolt</defaultProjectile>
-								<warmupTime>1.8</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>1.9</minRange>
-								<range>32</range>
-								<soundCast>VDE_AcidBolt</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<commonality>0.8</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VDE_Dryad_Spitter"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>VDE_AcidBolt</defaultProjectile>
-								<warmupTime>2.0</warmupTime>
-								<burstShotCount>1</burstShotCount>
-								<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-								<minRange>1.9</minRange>
-								<range>22</range>
-								<soundCast>VDE_AcidBolt</soundCast>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<commonality>0.8</commonality>
-							</li>
-						</verbs>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Ideology Expanded - Dryads/DamageDefs/Animal_Projectiles.xml b/Patches/Vanilla Ideology Expanded - Dryads/DamageDefs/Animal_Projectiles.xml
deleted file mode 100644
index 15d2157595..0000000000
--- a/Patches/Vanilla Ideology Expanded - Dryads/DamageDefs/Animal_Projectiles.xml	
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Ideology Expanded - Dryads</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ================= Setting it so that the Animal is shooting using CE code ================= -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VDE_AcidBolt"]</xpath>
-					<value>
-						<thingClass>CombatExtended.BulletCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VDE_AcidBolt"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<flyOverhead>false</flyOverhead>
-							<damageDef>VDE_AcidSpit</damageDef>
-							<damageAmountBase>5</damageAmountBase>
-							<speed>21</speed>
-							<armorPenetrationSharp>2</armorPenetrationSharp>
-							<armorPenetrationBlunt>2.4</armorPenetrationBlunt>
-						</projectile>
-					</value>
-				</li>
-			</operations>
-		</match>
-
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Ideology Expanded - Dryads/ThingDefs_Items/Items_Resource_Stuff.xml b/Patches/Vanilla Ideology Expanded - Dryads/ThingDefs_Items/Items_Resource_Stuff.xml
deleted file mode 100644
index 3b886023e8..0000000000
--- a/Patches/Vanilla Ideology Expanded - Dryads/ThingDefs_Items/Items_Resource_Stuff.xml	
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Ideology Expanded - Dryads</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VDE_Gaubric"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.05</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VDE_Gaubric"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.04</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VDE_Gaubric"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.01</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Ideology Expanded - Dryads/ThingDefs_Races/Races_Animal_AwakenedDryads.xml b/Patches/Vanilla Ideology Expanded - Dryads/ThingDefs_Races/Races_Animal_AwakenedDryads.xml
deleted file mode 100644
index bf73086cab..0000000000
--- a/Patches/Vanilla Ideology Expanded - Dryads/ThingDefs_Races/Races_Animal_AwakenedDryads.xml	
+++ /dev/null
@@ -1,1133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Ideology Expanded - Dryads</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Carrier"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- ======================== Awakened Carrier ========================  -->
-
-				<!-- Adding stats to the pawn to make sure they have them -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Carrier"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.06</MeleeCritChance>
-						<MeleeParryChance>0.04</MeleeParryChance>
-					</value>
-				</li>
-
-				<!-- Adds the combat stats that CE needs in order to work-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Carrier"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.5</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>5</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ======================== Awakened Clawer ========================  -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Clawer"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- Adding stats to the pawn to make sure they have them -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Clawer"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>2.25</ArmorRating_Blunt>
-						<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-						<MeleeDodgeChance>0.8</MeleeDodgeChance>
-						<MeleeCritChance>0.45</MeleeCritChance>
-						<MeleeParryChance>0.50</MeleeParryChance>
-					</value>
-				</li>
-
-				<!-- Adds the combat stats that CE needs in order to work-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Clawer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>0.96</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>24</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>0.96</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>24</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>5.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>1.5</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>5</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.2</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ======================== Awakened Barkskin ========================  -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Barkskin"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Barkskin"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.08</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Barkskin"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>24</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Barkskin"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- Adds the combat stats that CE needs in order to work-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Barkskin"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.5</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>5</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ======================== Awakened WoodMaker ========================  -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Woodmaker"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Birdlike</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- Adding stats to the pawn to make sure they have them -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Woodmaker"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.06</MeleeCritChance>
-						<MeleeParryChance>0.04</MeleeParryChance>
-					</value>
-				</li>
-
-				<!-- Adds the combat stats that CE needs in order to work-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Woodmaker"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>15</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.5</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>8</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>5</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ======================== Awakened Medicinemaker ========================  -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Medicinemaker"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- Adding stats to the pawn to make sure they have them -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Medicinemaker"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.06</MeleeCritChance>
-						<MeleeParryChance>0.04</MeleeParryChance>
-					</value>
-				</li>
-
-				<!-- Adds the combat stats that CE needs in order to work-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Medicinemaker"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.5</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>5</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ======================== Awakened Berrymaker ========================  -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Berrymaker"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- Adding stats to the pawn to make sure they have them -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Berrymaker"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.06</MeleeCritChance>
-						<MeleeParryChance>0.04</MeleeParryChance>
-					</value>
-				</li>
-
-				<!-- Adds the combat stats that CE needs in order to work-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Berrymaker"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.5</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>5</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ======================== Awakened Stonedigger ========================  -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Stonedigger"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- Adding stats to the pawn to make sure they have them -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Stonedigger"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>20</ArmorRating_Blunt>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.06</MeleeCritChance>
-						<MeleeParryChance>0.04</MeleeParryChance>
-					</value>
-				</li>
-
-				<!-- Adds the combat stats that CE needs in order to work-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Stonedigger"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.5</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>5</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ======================== Awakened Nectarmaker ========================  -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Nectarmaker"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- Adding stats to the pawn to make sure they have them -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Nectarmaker"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.06</MeleeCritChance>
-						<MeleeParryChance>0.04</MeleeParryChance>
-					</value>
-				</li>
-
-				<!-- Adds the combat stats that CE needs in order to work-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Nectarmaker"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.5</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>5</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ======================== Awakened Spitter ========================  -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Spitter"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Serpentine</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- Adding stats to the pawn to make sure they have them -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Spitter"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>0.75</ArmorRating_Blunt>
-						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.06</MeleeCritChance>
-						<MeleeParryChance>0.04</MeleeParryChance>
-					</value>
-				</li>
-
-				<!-- Adds the combat stats that CE needs in order to work-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Spitter"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.5</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>5</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ======================== Awakened Gaubricmaker ========================  -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Gaubricmaker"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- Adding stats to the pawn to make sure they have them -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Gaubricmaker"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						<MeleeCritChance>0.06</MeleeCritChance>
-						<MeleeParryChance>0.04</MeleeParryChance>
-					</value>
-				</li>
-
-				<!-- Adds the combat stats that CE needs in order to work-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VDE_AwakenedDryad_Gaubricmaker"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1.5</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>10</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-							</li>
-
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>2</cooldownTime>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>5</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Ideology Expanded - Dryads/ThingDefs_Races/Races_Spitter_RangedAttack.xml b/Patches/Vanilla Ideology Expanded - Dryads/ThingDefs_Races/Races_Spitter_RangedAttack.xml
deleted file mode 100644
index ff8b6bcd68..0000000000
--- a/Patches/Vanilla Ideology Expanded - Dryads/ThingDefs_Races/Races_Spitter_RangedAttack.xml	
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Ideology Expanded - Dryads</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VDE_Dryad_Spitter"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Ideology Expanded - Hats and Rags/Apparel_Headgear.xml b/Patches/Vanilla Ideology Expanded - Hats and Rags/Apparel_Headgear.xml
deleted file mode 100644
index 2d639c73ee..0000000000
--- a/Patches/Vanilla Ideology Expanded - Hats and Rags/Apparel_Headgear.xml	
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Ideology Expanded - Hats and Rags</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="VIEHAR_Apparel_Beads" or
-						defName="VIEHAR_Apparel_BishopHat" or
-						defName="VIEHAR_Apparel_BrimlessHat" or
-						defName="VIEHAR_Apparel_CommisarHat" or
-						defName="VIEHAR_Apparel_DeerSkull" or
-						defName="VIEHAR_Apparel_Fez" or
-						defName="VIEHAR_Apparel_Headbag" or
-						defName="VIEHAR_Apparel_Headscarf" or
-						defName="VIEHAR_Apparel_HorseMask" or
-						defName="VIEHAR_Apparel_MilitaryCap" or
-						defName="VIEHAR_Apparel_WideHat"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-						<Bulk>1</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="VIEHAR_Apparel_Skullcap" or
-						defName="VIEHAR_Apparel_SpikedSkullcap"
-						]/statBases/StuffEffectMultiplierArmor </xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-						<Bulk>3</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[
-						defName="VIEHAR_Apparel_DeerSkull" or
-						defName="VIEHAR_Apparel_Headbag" or
-						defName="VIEHAR_Apparel_HorseMask" or
-						defName="VIEHAR_Apparel_MilitaryCap"
-						] </xpath>
-					<value>
-						<equippedStatOffsets>
-							<Suppressability>-0.25</Suppressability>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VIEHAR_Apparel_CommisarHat"]/equippedStatOffsets</xpath>
-					<value>
-						<Suppressability>-0.25</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VIEHAR_Apparel_Beads" or defName="VIEHAR_Apparel_Headscarf"]/apparel/layers</xpath>
-					<value>
-						<layers>
-							<li>StrappedHead</li>
-						</layers>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Ideology Expanded - Hats and Rags/Apparel_Various.xml b/Patches/Vanilla Ideology Expanded - Hats and Rags/Apparel_Various.xml
deleted file mode 100644
index 43f425de7c..0000000000
--- a/Patches/Vanilla Ideology Expanded - Hats and Rags/Apparel_Various.xml	
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Ideology Expanded - Hats and Rags</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VIEHAR_Apparel_Rags"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Ideology Expanded - Memes and Structures/Hediffs_BodyParts.xml b/Patches/Vanilla Ideology Expanded - Memes and Structures/Hediffs_BodyParts.xml
deleted file mode 100644
index 18aa2c8ebc..0000000000
--- a/Patches/Vanilla Ideology Expanded - Memes and Structures/Hediffs_BodyParts.xml	
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Ideology Expanded - Memes and Structures</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="VME_FleshcraftedArmHediff"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label><!-- Same as natural fist. -->
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Persona Weapons Expanded/MeleeBladelink.xml b/Patches/Vanilla Persona Weapons Expanded/MeleeBladelink.xml
deleted file mode 100644
index 21797a06c6..0000000000
--- a/Patches/Vanilla Persona Weapons Expanded/MeleeBladelink.xml	
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Persona Weapons Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VPWE_MeleeWeapon_PsyfocusStaffBladelink"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VPWE_MeleeWeapon_PsyfocusStaffBladelink"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<MeleeCounterParryBonus>1.56</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VPWE_MeleeWeapon_PsyfocusStaffBladelink"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.6</MeleeCritChance>
-						<MeleeParryChance>1.17</MeleeParryChance>
-						<MeleeDodgeChance>0.47</MeleeDodgeChance>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Plants Expanded - Mushrooms/ThingDefs_Items/Items_Resource_Stuff.xml b/Patches/Vanilla Plants Expanded - Mushrooms/ThingDefs_Items/Items_Resource_Stuff.xml
deleted file mode 100644
index 18ca3809a1..0000000000
--- a/Patches/Vanilla Plants Expanded - Mushrooms/ThingDefs_Items/Items_Resource_Stuff.xml	
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Plants Expanded - Mushrooms</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VPE_Mycothread"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.009</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VPE_Mycothread"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.015</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VPE_Mycothread"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.04</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VPE_Mycothread"]/statBases</xpath>
-					<value>
-						<Bulk>0.05</Bulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Psycasts Expanded - Hemosage/AbilityDefs/AbilityDefs_Patch.xml b/Patches/Vanilla Psycasts Expanded - Hemosage/AbilityDefs/AbilityDefs_Patch.xml
deleted file mode 100644
index 1bfeab9aa1..0000000000
--- a/Patches/Vanilla Psycasts Expanded - Hemosage/AbilityDefs/AbilityDefs_Patch.xml	
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Psycasts Expanded - Hemosage</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPEH_BloodShard"]/range</xpath>
-					<value>
-						<range>21</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPEH_SanguineSpear"]/range</xpath>
-					<value>
-						<range>62</range>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Psycasts Expanded - Hemosage/ThingDefs/Projectile_Tweaks.xml b/Patches/Vanilla Psycasts Expanded - Hemosage/ThingDefs/Projectile_Tweaks.xml
deleted file mode 100644
index 541a24ea17..0000000000
--- a/Patches/Vanilla Psycasts Expanded - Hemosage/ThingDefs/Projectile_Tweaks.xml	
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Psycasts Expanded - Hemosage</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VPEH_BloodShard"]/projectile</xpath>
-					<value>
-						<armorPenetrationBase>3</armorPenetrationBase>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VPEH_BloodShard"]/projectile/damageAmountBase</xpath>
-					<value>
-						<damageAmountBase>6</damageAmountBase>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VPEH_SanguineSpear"]/projectile</xpath>
-					<value>
-						<armorPenetrationBase>6</armorPenetrationBase>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VPEH_SanguineSpear"]/projectile/speed</xpath>
-					<value>
-						<speed>30</speed>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Psycasts Expanded/AbilityDefs/AbilityDefs_Patch.xml b/Patches/Vanilla Psycasts Expanded/AbilityDefs/AbilityDefs_Patch.xml
deleted file mode 100644
index 86b531142e..0000000000
--- a/Patches/Vanilla Psycasts Expanded/AbilityDefs/AbilityDefs_Patch.xml	
+++ /dev/null
@@ -1,381 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Psycasts Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= Ability Range Adjustment 'ARA ARAA~' ======= -->
-
-				<!-- ===== Archon Psycaster Path ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_MindBreak"]/range</xpath>
-					<value>
-						<range>6</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_BlindingPulse"]/range</xpath>
-					<value>
-						<range>28</range>
-					</value>
-				</li>
-
-				<!-- ===== ArchoTechist Psycaster Path ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_BerserkPulse"]/range</xpath>
-					<value>
-						<range>17.5</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Berserk"]/range</xpath>
-					<value>
-						<range>23</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Stun" or defName="VPE_PsychicShock" or defName="VPE_NeuralHeatDump" or defName="VPE_AggressiveHeatDump"]/range</xpath>
-					<value>
-						<range>28</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Burden"]/range</xpath>
-					<value>
-						<range>34.5</range>
-					</value>
-				</li>
-
-				<!-- ===== Chronopath Psycaster Path ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_PlantTimeskip" or defName="VPE_Age"]/range</xpath>
-					<value>
-						<range>8</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_TimeSphere"]/range</xpath>
-					<value>
-						<range>28</range>
-					</value>
-				</li>
-
-				<!-- ===== Conflagator Psycaster Path ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_FireShield"]/range</xpath>
-					<value>
-						<range>8</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_BreatheFlame" or defName="VPE_Explosion"]/range</xpath>
-					<value>
-						<range>19</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Flameball"]/range</xpath>
-					<value>
-						<range>28</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_EyeBlast"]/range</xpath>
-					<value>
-						<range>30</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_MeteorShower"]/range</xpath>
-					<value>
-						<range>40</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_FireBeam" or defName="VPE_FlameTornado"]/range</xpath>
-					<value>
-						<range>51</range>
-					</value>
-				</li>
-
-				<!-- ===== Frostshaper Psycaster Path ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_IceCrystal"]/range</xpath>
-					<value>
-						<range>8</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_IceShield"]/range</xpath>
-					<value>
-						<range>14.5</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_IceBreath"]/range</xpath>
-					<value>
-						<range>19</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_FrostRay"]/range</xpath>
-					<value>
-						<range>25</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_IceSpike" or defName="VPE_IceBlock" or defName="VPE_SnapFreeze"]/range</xpath>
-					<value>
-						<range>28</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_ColdZone"]/range</xpath>
-					<value>
-						<range>68</range>
-					</value>
-				</li>
-
-				<!-- ===== Harmonist Psycaster Path ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_PsychicGuidance" or defName="VPE_LuckTransfer"]/range</xpath>
-					<value>
-						<range>8</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_HealthSwap"]/range</xpath>
-					<value>
-						<range>17.5</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Mindcontrol"]/range</xpath>
-					<value>
-						<range>23</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_TransmuteStone"]/range</xpath>
-					<value>
-						<range>28</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_LocationSwap"]/range</xpath>
-					<value>
-						<range>35</range>
-					</value>
-				</li>
-
-				<!-- ===== Necropath Psycaster Path ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_StealVitality"]/range</xpath>
-					<value>
-						<range>6</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Liferot"]/range</xpath>
-					<value>
-						<range>17.5</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Enthrall"]/range</xpath>
-					<value>
-						<range>28</range>
-					</value>
-				</li>
-
-				<!-- ===== Nightstalker Psycaster Path ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Darkvision"]/range</xpath>
-					<value>
-						<range>8</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Decoy"]/range</xpath>
-					<value>
-						<range>23</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Darkness"]/range</xpath>
-					<value>
-						<range>28</range>
-					</value>
-				</li>
-
-				<!-- ===== Protector Psycaster Path ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Overshield"]/range</xpath>
-					<value>
-						<range>12</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Painblock" or defName="VPE_Skipshield"]/range</xpath>
-					<value>
-						<range>28</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Focus" or defName="VPE_Invisibility"]/range</xpath>
-					<value>
-						<range>32</range>
-					</value>
-				</li>
-
-				<!-- ===== Skipmaster Psycaster Path ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Skipdoor"]/range</xpath>
-					<value>
-						<range>8</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_MassChaosSkip"]/range</xpath>
-					<value>
-						<range>23</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_SolarPinhole" or defName="VPE_Chunkskip" or defName="VPE_Waterskip" or defName="VPE_ChaosSkip" or defName="VPE_Wallraise" or defName="VPE_Smokepop"]/range</xpath>
-					<value>
-						<range>28</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Skip"]/range</xpath>
-					<value>
-						<range>32</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Smokepop"]/radius</xpath>
-					<value>
-						<radius>4.0</radius>
-					</value>
-				</li>
-
-				<!-- ===== Staticlord Psycaster Path ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_StaticAura"]/range</xpath>
-					<value>
-						<range>8</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Vortex" or defName="VPE_Flashstorm"]/range</xpath>
-					<value>
-						<range>23</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Bolt"]/range</xpath>
-					<value>
-						<range>25</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_ChainBolt" or defName="VPE_Thunderbolt"]/range</xpath>
-					<value>
-						<range>28</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_BallLightning"]/range</xpath>
-					<value>
-						<range>34.5</range>
-					</value>
-				</li>
-
-				<!-- ===== Technomancer Psycaster Path ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Haywire"]/range</xpath>
-					<value>
-						<range>23</range>
-					</value>
-				</li>
-
-				<!-- ===== Warlord Psycaster Path ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_PowerLeap"]/range</xpath>
-					<value>
-						<range>19</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_Beckon" or defName="VPE_Killskip" or defName="VPE_MassBeckon"]/range</xpath>
-					<value>
-						<range>23</range>
-					</value>
-				</li>
-
-				<!-- ===== Wildspeaker Psycaster Path ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_BrambleMaze" or defName="VPE_CropBurst"]/range</xpath>
-					<value>
-						<range>28</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_ManhunterPulse" or defName="VPE_AnimalAllies"]/range</xpath>
-					<value>
-						<range>40</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.Abilities.AbilityDef[defName="VPE_TreeSprout"]/range</xpath>
-					<value>
-						<range>42</range>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Psycasts Expanded/Bodies/Bodies_Patch.xml b/Patches/Vanilla Psycasts Expanded/Bodies/Bodies_Patch.xml
deleted file mode 100644
index 104d5db9dc..0000000000
--- a/Patches/Vanilla Psycasts Expanded/Bodies/Bodies_Patch.xml	
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Psycasts Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= Body Parts ======= -->
-
-				<!-- ===== Constructs ===== -->
-
-				<!-- === Rock Construct === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="VPE_RockConstructBody"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="VPE_RockConstructBody"]/corePart/parts/li[def = "VPE_RockHead"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="VPE_RockConstructBody"]/corePart/parts/li[def = "VPE_RockBody"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<!-- === Metal Construct === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="VPE_MetalConstructBody"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="VPE_MetalConstructBody"]/corePart/parts/li[def = "VPE_MetalHead"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="VPE_MetalConstructBody"]/corePart/parts/li[def = "VPE_MetalBody"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-				<!-- ===== Skeletal Body ===== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="VPE_SkeletalBody"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="VPE_SkeletalBody"]/corePart/parts/li[def = "VPE_Skull"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="VPE_SkeletalBody"]/corePart/parts/li[def = "VPE_SkeletalArm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="VPE_SkeletalBody"]/corePart/parts/li[def = "VPE_SkeletalLeg"]</xpath>
-					<value>
-						<groups>
-							<li>CoveredByNaturalArmor</li>
-						</groups>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Psycasts Expanded/HediffDefs/Hediffs_Patch.xml b/Patches/Vanilla Psycasts Expanded/HediffDefs/Hediffs_Patch.xml
deleted file mode 100644
index 077e22f417..0000000000
--- a/Patches/Vanilla Psycasts Expanded/HediffDefs/Hediffs_Patch.xml	
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Psycasts Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ===== Psycast Hediff ===== -->
-
-				<!-- === Conflagrator === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="VPE_FireShield"]/stages/li/statOffsets</xpath>
-					<value>
-						<ArmorRating_Heat>3.0</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<!-- === Warlord === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="VPE_FiringFocus"]/stages/li/statFactors</xpath>
-					<value>
-						<statOffsets>
-							<AimingDelayFactor>-0.50</AimingDelayFactor>
-							<ReloadSpeed>1.0</ReloadSpeed>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="VPE_AdrenalineRush"]/stages/li</xpath>
-					<value>
-						<statOffsets>
-							<Suppressability>-0.25</Suppressability>
-						</statOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="VPE_GuidedShot"]/stages/li</xpath>
-					<value>
-						<statOffsets>
-							<AimingAccuracy>5.0</AimingAccuracy>
-							<ShootingAccuracyPawn>5.0</ShootingAccuracyPawn>
-						</statOffsets>
-					</value>
-				</li>
-
-				<!-- === Harmonist === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="VPE_Lucky"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<statOffsets>
-									<ShootingAccuracyPawn>5.0</ShootingAccuracyPawn>
-									<MeleeHitChance>5</MeleeHitChance>
-									<MeleeDodgeChance>5.0</MeleeDodgeChance>
-									<IncomingDamageFactor>-1.0</IncomingDamageFactor>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="VPE_UnLucky"]</xpath>
-					<value>
-						<stages>
-							<li>
-								<statOffsets>
-									<ShootingAccuracyPawn>-5.0</ShootingAccuracyPawn>
-									<MeleeHitChance>-5</MeleeHitChance>
-									<MeleeDodgeChance>-5.0</MeleeDodgeChance>
-								</statOffsets>
-							</li>
-						</stages>
-					</value>
-				</li>
-
-				<!-- === Nightstalker === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="VPE_Darkvision"]/stages/li/statFactors</xpath>
-					<value>
-						<statOffsets>
-							<NightVisionEfficiency>1.0</NightVisionEfficiency>
-						</statOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Psycasts Expanded/PawnKinds/EmpirePawnKinds_Patch.xml b/Patches/Vanilla Psycasts Expanded/PawnKinds/EmpirePawnKinds_Patch.xml
deleted file mode 100644
index ba2b46bffd..0000000000
--- a/Patches/Vanilla Psycasts Expanded/PawnKinds/EmpirePawnKinds_Patch.xml	
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Psycasts Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ===== Pawnkinds ===== -->
-
-				<!-- === Empire Warlord Ranged === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Empire_Caster_Warlord_Ranged"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>400</min>
-										<max>600</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Psycasts Expanded/ThingDefs/Projectile_Tweaks.xml b/Patches/Vanilla Psycasts Expanded/ThingDefs/Projectile_Tweaks.xml
deleted file mode 100644
index 9cbea17e9c..0000000000
--- a/Patches/Vanilla Psycasts Expanded/ThingDefs/Projectile_Tweaks.xml	
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Psycasts Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ======= Projectile Adjustment ======= -->
-
-				<!-- ===== Conflagator ===== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VPE_Flameball"]/projectile</xpath>
-					<value>
-						<damageAmountBase>10</damageAmountBase>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VPE_Flameball"]/projectile/speed</xpath>
-					<value>
-						<speed>30</speed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.ExpandableProjectileDef[defName="VPE_FireBreath"]/projectile/damageAmountBase</xpath>
-					<value>
-						<damageAmountBase>12</damageAmountBase>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.ExpandableProjectileDef[defName="VPE_FireBreath"]/projectile/speed</xpath>
-					<value>
-						<speed>53</speed>
-					</value>
-				</li>
-
-				<!-- ===== Staticlord ===== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VPE_Bolt"]/projectile</xpath>
-					<value>
-						<damageAmountBase>10</damageAmountBase>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VPE_BallLightning"]/projectile/speed</xpath>
-					<value>
-						<speed>8</speed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VPE_BallLightning"]/projectile/damageAmountBase</xpath>
-					<value>
-						<damageAmountBase>12</damageAmountBase>
-					</value>
-				</li>
-
-				<!-- ===== Frostshaper ===== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFECore.ExpandableProjectileDef[defName="VPE_IceBreathe"]/projectile/speed</xpath>
-					<value>
-						<speed>48</speed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VPE_IceSpike"]/projectile/damageAmountBase</xpath>
-					<value>
-						<damageAmountBase>15</damageAmountBase>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Psycasts Expanded/ThingDefs_Misc/Apparel_Patch.xml b/Patches/Vanilla Psycasts Expanded/ThingDefs_Misc/Apparel_Patch.xml
deleted file mode 100644
index 0537062f74..0000000000
--- a/Patches/Vanilla Psycasts Expanded/ThingDefs_Misc/Apparel_Patch.xml	
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Psycasts Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ===== Apparel ===== -->
-
-				<!-- === Eltex Mask === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VPE_Apparel_EltexMask"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VPE_Apparel_EltexMask"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VPE_Apparel_EltexMask"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.0</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VPE_Apparel_EltexMask"]/equippedStatOffsets</xpath>
-					<value>
-						<Suppressability>-0.20</Suppressability>
-					</value>
-				</li>
-
-				<!-- === Eltex Cape === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VPE_Apparel_EltexCape"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VPE_Apparel_EltexCape"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VPE_Apparel_EltexCape"]/statBases/ArmorRating_Blunt</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VPE_Apparel_EltexCape"]/statBases/ArmorRating_Heat</xpath>
-				</li>
-
-				<!-- === Plate Armor Prestige === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VPE_Apparel_PlateArmorPrestige"]/statBases</xpath>
-					<value>
-						<Bulk>100</Bulk>
-						<WornBulk>10</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VPE_Apparel_PlateArmorPrestige"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VPE_Apparel_PlateArmorPrestige"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<MeleeDodgeChance>-0.15</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VPE_Apparel_PlateArmorPrestige"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VPE_Apparel_PlateArmorPrestige"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Psyring === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VPE_Psyring"]/statBases</xpath>
-					<value>
-						<Bulk>0.5</Bulk>
-						<WornBulk>0.1</WornBulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Psycasts Expanded/ThingDefs_Misc/Weapons_Patch.xml b/Patches/Vanilla Psycasts Expanded/ThingDefs_Misc/Weapons_Patch.xml
deleted file mode 100644
index 3b20481a18..0000000000
--- a/Patches/Vanilla Psycasts Expanded/ThingDefs_Misc/Weapons_Patch.xml	
+++ /dev/null
@@ -1,303 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Psycasts Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ===== Eltex Weapon ===== -->
-
-				<!-- === Eltex Dagger === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexDagger"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<MeleeCounterParryBonus>0.25</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexDagger"]/equippedStatOffsets</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexDagger"]</xpath>
-						<value>
-							<equippedStatOffsets>
-								<MeleeCritChance>0.15</MeleeCritChance>
-								<MeleeParryChance>0.30</MeleeParryChance>
-								<MeleeDodgeChance>0.30</MeleeDodgeChance>
-							</equippedStatOffsets>
-						</value>
-					</nomatch>
-
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexDagger"]/equippedStatOffsets</xpath>
-						<value>
-							<MeleeCritChance>0.15</MeleeCritChance>
-							<MeleeParryChance>0.30</MeleeParryChance>
-							<MeleeDodgeChance>0.30</MeleeDodgeChance>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexDagger"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexDagger"]</xpath>
-						<value>
-							<weaponTags>
-								<li>CE_OneHandedWeapon</li>
-							</weaponTags>
-						</value>
-					</nomatch>
-
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexDagger"]/weaponTags</xpath>
-						<value>
-							<li>CE_OneHandedWeapon</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexDagger"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.69</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1.46</cooldownTime>
-								<chanceFactor>0.50</chanceFactor>
-								<armorPenetrationBlunt>0.35</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.20</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.36</cooldownTime>
-								<chanceFactor>0.45</chanceFactor>
-								<armorPenetrationBlunt>0.95</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.58</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Eltex Mace === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexMace"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.24</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexMace"]/equippedStatOffsets</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexMace"]</xpath>
-						<value>
-							<equippedStatOffsets>
-								<MeleeCritChance>0.42</MeleeCritChance>
-								<MeleeParryChance>0.24</MeleeParryChance>
-								<MeleeDodgeChance>0.2</MeleeDodgeChance>
-							</equippedStatOffsets>
-						</value>
-					</nomatch>
-
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexMace"]/equippedStatOffsets</xpath>
-						<value>
-							<MeleeCritChance>0.42</MeleeCritChance>
-							<MeleeParryChance>0.24</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexMace"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexMace"]</xpath>
-						<value>
-							<weaponTags>
-								<li>CE_OneHandedWeapon</li>
-							</weaponTags>
-						</value>
-					</nomatch>
-
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexMace"]/weaponTags</xpath>
-						<value>
-							<li>CE_OneHandedWeapon</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexMace"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>2.1</cooldownTime>
-								<chanceFactor>0.90</chanceFactor>
-								<armorPenetrationBlunt>6.925</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Eltex Sword === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexSword"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexSword"]/equippedStatOffsets</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexSword"]</xpath>
-						<value>
-							<equippedStatOffsets>
-								<MeleeCritChance>0.40</MeleeCritChance>
-								<MeleeParryChance>0.60</MeleeParryChance>
-								<MeleeDodgeChance>0.30</MeleeDodgeChance>
-							</equippedStatOffsets>
-						</value>
-					</nomatch>
-
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexSword"]/equippedStatOffsets</xpath>
-						<value>
-							<MeleeCritChance>0.40</MeleeCritChance>
-							<MeleeParryChance>0.60</MeleeParryChance>
-							<MeleeDodgeChance>0.30</MeleeDodgeChance>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexSword"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexSword"]</xpath>
-						<value>
-							<weaponTags>
-								<li>CE_OneHandedWeapon</li>
-							</weaponTags>
-						</value>
-					</nomatch>
-
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexSword"]/weaponTags</xpath>
-						<value>
-							<li>CE_OneHandedWeapon</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VPE_MeleeWeapon_EltexSword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.46</cooldownTime>
-								<chanceFactor>0.50</chanceFactor>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.40</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>21</power>
-								<cooldownTime>1.59</cooldownTime>
-								<chanceFactor>0.45</chanceFactor>
-								<armorPenetrationBlunt>1.1</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.58</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Misc ===== -->
-
-				<!-- === Heat Pearls === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VPE_HeatPearls"]/verbs/li/range</xpath>
-					<value>
-						<range>17.9</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VPE_HeatPearls"]/verbs/li/forcedMissRadius</xpath>
-					<value>
-						<forcedMissRadius>0.9</forcedMissRadius>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Psycasts Expanded/ThingDefs_Races/Races_Patch.xml b/Patches/Vanilla Psycasts Expanded/ThingDefs_Races/Races_Patch.xml
deleted file mode 100644
index 41c606098f..0000000000
--- a/Patches/Vanilla Psycasts Expanded/ThingDefs_Races/Races_Patch.xml	
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Psycasts Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ===== Psychic Construct ===== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VPE_SteelConstruct" or defName="VPE_RockConstruct" or defName="VPE_SummonedSkeleton"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VPE_SteelConstruct" or defName="VPE_RockConstruct"]/statBases</xpath>
-					<value>
-						<CarryWeight>5</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
-						<MeleeDodgeChance>0.19</MeleeDodgeChance>
-						<MeleeCritChance>0.22</MeleeCritChance>
-						<MeleeParryChance>0.09</MeleeParryChance>
-						<MaxHitPoints>200</MaxHitPoints>
-						<SmokeSensitivity>0</SmokeSensitivity>
-					</value>
-				</li>
-
-				<!-- === Steel Construct === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VPE_SteelConstruct"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2.6</ArmorRating_Sharp>
-						<ArmorRating_Blunt>0.4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VPE_SteelConstruct"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>4.16</cooldownTime>
-								<armorPenetrationSharp>1.74</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.91</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Rock Construct === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VPE_RockConstruct"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Sharp>0.4</ArmorRating_Sharp>
-						<ArmorRating_Blunt>2.6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VPE_RockConstruct"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>4.16</cooldownTime>
-								<armorPenetrationSharp>0.91</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.74</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Skeleton ===== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VPE_SummonedSkeleton"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VPE_SummonedSkeleton"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.44</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationSharp>0</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.44</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Races Expanded - Android/Scenario_Android.xml b/Patches/Vanilla Races Expanded - Android/Scenario_Android.xml
deleted file mode 100644
index 26d6615fb7..0000000000
--- a/Patches/Vanilla Races Expanded - Android/Scenario_Android.xml	
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Races Expanded - Android</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Adds ammo to the scenario === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ScenarioDef[defName="VREA_NewUtopia"]/scenario/parts</xpath>
-					<value>
-						<li Class="ScenPart_StartingThing_Defined">
-							<def>StartingThing_Defined</def>
-							<thingDef>Ammo_556x45mmNATO_FMJ</thingDef>
-							<count>150</count>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Races Expanded - Archon/Apparel_Various.xml b/Patches/Vanilla Races Expanded - Archon/Apparel_Various.xml
deleted file mode 100644
index 1eba099254..0000000000
--- a/Patches/Vanilla Races Expanded - Archon/Apparel_Various.xml	
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Races Expanded - Archon</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Archoplate -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VREA_Apparel_Archoplate"]/statBases</xpath>
-					<value>
-						<Bulk>50</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VREA_Apparel_Archoplate"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>650</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VREA_Apparel_Archoplate"]/statBases/VEF_EnergyShieldEnergyMaxApparel</xpath>
-					<value>
-						<VEF_EnergyShieldEnergyMaxApparel>12</VEF_EnergyShieldEnergyMaxApparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VREA_Apparel_Archoplate"]/statBases/Mass</xpath>
-					<value>
-						<Mass>25</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VREA_Apparel_Archoplate"]/statBases/Flammability</xpath>
-					<value>
-						<Flammability>0</Flammability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VREA_Apparel_Archoplate"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>26</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VREA_Apparel_Archoplate"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>54</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VREA_Apparel_Archoplate"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VREA_Apparel_Archoplate"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VREA_Apparel_Archoplate"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
-									<parts>
-										<li>Hand</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Races Expanded - Archon/Archon_Misc.xml b/Patches/Vanilla Races Expanded - Archon/Archon_Misc.xml
deleted file mode 100644
index 7fe1c72716..0000000000
--- a/Patches/Vanilla Races Expanded - Archon/Archon_Misc.xml	
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Races Expanded - Archon</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Patch Leatherskin Armor Values === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/GeneDef[defName="VRE_Leatherskin"]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/GeneDef[defName="VRE_Leatherskin"]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- === Patch Archon Pawnkinds === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="ArchonWarrior"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>12</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Races Expanded - Archon/Melee_Archon.xml b/Patches/Vanilla Races Expanded - Archon/Melee_Archon.xml
deleted file mode 100644
index 2d8063b6f8..0000000000
--- a/Patches/Vanilla Races Expanded - Archon/Melee_Archon.xml	
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Races Expanded - Archon</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Archoblade === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VREA_MeleeWeapon_ArchobladeBladelink"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.69</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.80</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>VREA_Sear</li>
-								</capacities>
-								<power>49</power>
-								<cooldownTime>1.37</cooldownTime>
-								<armorPenetrationBlunt>4.06</armorPenetrationBlunt>
-								<armorPenetrationSharp>50</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VREA_MeleeWeapon_ArchobladeBladelink"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>1.42</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VREA_MeleeWeapon_ArchobladeBladelink"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.00</MeleeCritChance>
-							<MeleeParryChance>0.60</MeleeParryChance>
-							<MeleeDodgeChance>0.53</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Races Expanded - Fungoid/Apparel_Various.xml b/Patches/Vanilla Races Expanded - Fungoid/Apparel_Various.xml
deleted file mode 100644
index 8fa383c4e1..0000000000
--- a/Patches/Vanilla Races Expanded - Fungoid/Apparel_Various.xml	
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Races Expanded - Fungoid</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Space Suit === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="VREF_ApparelArmorAstrosuitBase"]/statBases</xpath>
-					<value>
-						<Bulk>40</Bulk>
-						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="VREF_ApparelArmorAstrosuitBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="VREF_ApparelArmorAstrosuitBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>28</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="VREF_ApparelArmorAstrosuitBase"]/equippedStatOffsets/MoveSpeed</xpath>
-					<value>
-						<MeleeDodgeChance>-0.15</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="VREF_ApparelArmorAstrosuitBase"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="VREF_ApparelArmorAstrosuitBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.PartialArmorExt">
-							<stats>
-								<li>
-									<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
-									<parts>
-										<li>Neck</li>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
-									<parts>
-										<li>Neck</li>
-										<li>Hand</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
-									<parts>
-										<li>Leg</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-								<li>
-									<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-									<parts>
-										<li>Arm</li>
-									</parts>
-								</li>
-							</stats>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Races Expanded - Fungoid/Fungoid_Hediffs_BodyParts.xml b/Patches/Vanilla Races Expanded - Fungoid/Fungoid_Hediffs_BodyParts.xml
deleted file mode 100644
index f6b2093f67..0000000000
--- a/Patches/Vanilla Races Expanded - Fungoid/Fungoid_Hediffs_BodyParts.xml	
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Races Expanded - Fungoid</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="VRE_InfectorMouth"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>infector mouth</label>
-								<capacities>
-									<li>VRE_Infection_Bite</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.15</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="VRE_InfectorHands"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>infector hand</label>
-								<capacities>
-									<li>VRE_Infection</li>
-								</capacities>
-								<power>8</power>
-								<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.18</armorPenetrationSharp>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-								<cooldownTime>1.5</cooldownTime>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Races Expanded - Highmate/HighmateBondEffectHediffs/HighmateBondEffectHediffs.xml b/Patches/Vanilla Races Expanded - Highmate/HighmateBondEffectHediffs/HighmateBondEffectHediffs.xml
deleted file mode 100644
index 6d2de55d76..0000000000
--- a/Patches/Vanilla Races Expanded - Highmate/HighmateBondEffectHediffs/HighmateBondEffectHediffs.xml	
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Races Expanded - Highmate</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="VRE_PsychicBondBloodlust"]/stages/li/statFactors/MeleeDamageFactor</xpath>
-					<value>
-						<MeleeDamageFactor>1.25</MeleeDamageFactor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="VRE_PsychicBondCarefulShooter"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
-					<value>
-						<ShootingAccuracyPawn>1.0</ShootingAccuracyPawn>
-						<AimingAccuracy>0.1</AimingAccuracy>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Races Expanded - Hussar/GeneDefs/GeneDefs_Misc.xml b/Patches/Vanilla Races Expanded - Hussar/GeneDefs/GeneDefs_Misc.xml
deleted file mode 100644
index 54ba0ef04b..0000000000
--- a/Patches/Vanilla Races Expanded - Hussar/GeneDefs/GeneDefs_Misc.xml	
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Races Expanded - Hussar</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/GeneDef[defName="VREH_BulletproofSkin"]</xpath>
-					<value>
-						<statOffsets>
-							<ArmorRating_Sharp>4.0</ArmorRating_Sharp>
-						</statOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Races Expanded - Phytokin/GeneDefs/GeneDefs_BarkSkin.xml b/Patches/Vanilla Races Expanded - Phytokin/GeneDefs/GeneDefs_BarkSkin.xml
deleted file mode 100644
index 152db6a180..0000000000
--- a/Patches/Vanilla Races Expanded - Phytokin/GeneDefs/GeneDefs_BarkSkin.xml	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Races Expanded - Phytokin</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/GeneDef[defName="VRE_BarkSkin"]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>8.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Races Expanded - Phytokin/GeneDefs/Races_Animal_Ideology.xml b/Patches/Vanilla Races Expanded - Phytokin/GeneDefs/Races_Animal_Ideology.xml
deleted file mode 100644
index 0ecc2119dc..0000000000
--- a/Patches/Vanilla Races Expanded - Phytokin/GeneDefs/Races_Animal_Ideology.xml	
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Races Expanded - Phytokin</li>
-		</mods>
-
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Ideology</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName="VRE_CompanionDryad"]</xpath>
-						<value>
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Quadruped</bodyShape>
-							</li>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="VRE_CompanionDryad"]/statBases</xpath>
-						<value>
-							<MeleeDodgeChance>0.20</MeleeDodgeChance>
-							<MeleeCritChance>0.15</MeleeCritChance>
-							<MeleeParryChance>0.18</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VRE_CompanionDryad"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>left claw</label>
-									<capacities>
-										<li>Scratch</li>
-									</capacities>
-									<power>7</power>
-									<cooldownTime>1.1</cooldownTime>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>12</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-									<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>right claw</label>
-									<capacities>
-										<li>Scratch</li>
-									</capacities>
-									<power>7</power>
-									<cooldownTime>1.1</cooldownTime>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>12</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-									<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<capacities>
-										<li>Bite</li>
-									</capacities>
-									<power>14</power>
-									<cooldownTime>1.8</cooldownTime>
-									<surpriseAttack>
-										<extraMeleeDamages>
-											<li>
-												<def>Stun</def>
-												<amount>10</amount>
-											</li>
-										</extraMeleeDamages>
-									</surpriseAttack>
-									<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-									<armorPenetrationBlunt>5.0</armorPenetrationBlunt>
-									<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>6</power>
-									<cooldownTime>1.5</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<chanceFactor>0.2</chanceFactor>
-									<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Races Expanded - Sanguophage/AbilityDefs/Abilities_SingleUse.xml b/Patches/Vanilla Races Expanded - Sanguophage/AbilityDefs/Abilities_SingleUse.xml
deleted file mode 100644
index 37bc8ba2a3..0000000000
--- a/Patches/Vanilla Races Expanded - Sanguophage/AbilityDefs/Abilities_SingleUse.xml	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Races Expanded - Sanguophage</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AbilityDef[defName="VRE_PiercingSpine_SingleUse"]/verbProperties/range</xpath>
-					<value>
-						<range>5.9</range>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Races Expanded - Sanguophage/HediffDefs/HediffDef_Deathrest.xml b/Patches/Vanilla Races Expanded - Sanguophage/HediffDefs/HediffDef_Deathrest.xml
deleted file mode 100644
index 04026ed422..0000000000
--- a/Patches/Vanilla Races Expanded - Sanguophage/HediffDefs/HediffDef_Deathrest.xml	
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Races Expanded - Sanguophage</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="VRE_SolidifiedHemogen"]/stages/li/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
-							<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
-						</statOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Races Expanded - Sanguophage/HediffDefs/HediffDef_SharpTalons.xml b/Patches/Vanilla Races Expanded - Sanguophage/HediffDefs/HediffDef_SharpTalons.xml
deleted file mode 100644
index 6766fcd8c7..0000000000
--- a/Patches/Vanilla Races Expanded - Sanguophage/HediffDefs/HediffDef_SharpTalons.xml	
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Races Expanded - Sanguophage</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="VRE_SharpTalons"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>sharp talons</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Races Expanded - Sanguophage/ThingDefs_Items/HemogenPacks.xml b/Patches/Vanilla Races Expanded - Sanguophage/ThingDefs_Items/HemogenPacks.xml
deleted file mode 100644
index cc1ee7e2fb..0000000000
--- a/Patches/Vanilla Races Expanded - Sanguophage/ThingDefs_Items/HemogenPacks.xml	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Races Expanded - Sanguophage</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VRE_HemogenPack_Animal" or defName="VRE_HemogenPack_Corpse" or defName="VRE_HemogenPack_Sanguophage"]/statBases</xpath>
-					<value>
-						<Bulk>0.25</Bulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Races Expanded - Saurid/GeneDefs/GeneDefs_ScaleSkin.xml b/Patches/Vanilla Races Expanded - Saurid/GeneDefs/GeneDefs_ScaleSkin.xml
deleted file mode 100644
index 766c06106a..0000000000
--- a/Patches/Vanilla Races Expanded - Saurid/GeneDefs/GeneDefs_ScaleSkin.xml	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Races Expanded - Saurid</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/GeneDef[defName="VRESaurids_ScaleSkin"]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Races Expanded - Saurid/HediffDefs/HediffDef_SauridClaws.xml b/Patches/Vanilla Races Expanded - Saurid/HediffDefs/HediffDef_SauridClaws.xml
deleted file mode 100644
index 9d1d92ccb1..0000000000
--- a/Patches/Vanilla Races Expanded - Saurid/HediffDefs/HediffDef_SauridClaws.xml	
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Races Expanded - Saurid</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="VRESaurids_SauridClaws"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>claws</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationSharp>1.0</armorPenetrationSharp>
-								<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Races Expanded - Waster/HediffDefs/Hediffs.xml b/Patches/Vanilla Races Expanded - Waster/HediffDefs/Hediffs.xml
deleted file mode 100644
index 570f74e889..0000000000
--- a/Patches/Vanilla Races Expanded - Waster/HediffDefs/Hediffs.xml	
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Races Expanded - Waster</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="VRE_PollutionAccuracy"]/stages</xpath>
-					<value>
-						<stages>
-							<li>
-								<label>inactive</label>
-								<minSeverity>0.01</minSeverity>
-							</li>
-							<li>
-								<label>minor</label>
-								<minSeverity>0.02</minSeverity>
-								<statFactors>
-									<ShootingAccuracyPawn>1.1</ShootingAccuracyPawn>
-									<AimingAccuracy>1.1</AimingAccuracy>
-								</statFactors>
-							</li>
-							<li>
-								<label>moderate</label>
-								<minSeverity>0.20</minSeverity>
-								<statFactors>
-									<ShootingAccuracyPawn>1.15</ShootingAccuracyPawn>
-									<AimingAccuracy>1.2</AimingAccuracy>
-								</statFactors>
-							</li>
-							<li>
-								<label>extreme</label>
-								<minSeverity>0.50</minSeverity>
-								<statFactors>
-									<ShootingAccuracyPawn>1.2</ShootingAccuracyPawn>
-									<AimingAccuracy>1.3</AimingAccuracy>
-								</statFactors>
-							</li>
-						</stages>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Skills Expanded/Expertise.xml b/Patches/Vanilla Skills Expanded/Expertise.xml
deleted file mode 100644
index e0fc8cb9d4..0000000000
--- a/Patches/Vanilla Skills Expanded/Expertise.xml	
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Skills Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Sharpshooting expertise -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VSE.Expertise.ExpertiseDef[defName="Precision"]/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ShootingAccuracyPawn>0.075</ShootingAccuracyPawn>
-							<AimingAccuracy>0.025</AimingAccuracy>
-						</statOffsets>
-					</value>
-				</li>
-
-				<!-- Aiming expertise -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VSE.Expertise.ExpertiseDef[defName="CloseQuarters"]/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<AimingDelayFactor>-0.025</AimingDelayFactor>
-						</statOffsets>
-					</value>
-				</li>
-
-				<!-- Reloading expertise -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VSE.Expertise.ExpertiseDef[defName="Gunner"]/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<ReloadSpeed>0.025</ReloadSpeed>
-						</statOffsets>
-					</value>
-				</li>
-
-				<!-- Piercing expertise -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VSE.Expertise.ExpertiseDef[defName="Sharp"]/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<MeleeCritChance>0.05</MeleeCritChance>
-						</statOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Storytellers Expanded - Perry Persistent/PawnKinds_ManInCoat.xml b/Patches/Vanilla Storytellers Expanded - Perry Persistent/PawnKinds_ManInCoat.xml
deleted file mode 100644
index 6e3b289dff..0000000000
--- a/Patches/Vanilla Storytellers Expanded - Perry Persistent/PawnKinds_ManInCoat.xml	
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Storytellers Expanded - Perry Persistent</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ===Man in coat === -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="VSE_ManInTheCoat"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="VSE_ManInTheCoat"]/invNutrition</xpath>
-					<value>
-						<invNutrition>6</invNutrition>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[defName="VSE_ManInTheCoat"]/apparelRequired</xpath>
-					<value>
-						<li>CE_Apparel_Backpack</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Storytellers Expanded - Winston Waves/Modifiers/Modifiers.xml b/Patches/Vanilla Storytellers Expanded - Winston Waves/Modifiers/Modifiers.xml
deleted file mode 100644
index e030cc6e26..0000000000
--- a/Patches/Vanilla Storytellers Expanded - Winston Waves/Modifiers/Modifiers.xml	
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Storytellers Expanded - Winston Waves</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Charge For Everyone === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VSEWW.ModifierDef[defName="VSEWW_ChargeForEveryone"]/allowedWeaponDef/li[contains(.,"Gun_ChargeLance")]</xpath>
-					<value>
-						<li MayRequire="CETeam.CombatExtendedGuns">CE_Gun_ChargeLMG</li>
-						<li MayRequire="CETeam.CombatExtendedGuns">CE_Gun_ChargeSniperRifle</li>
-						<li MayRequire="CETeam.CombatExtendedGuns">CE_Gun_ChargeSMG</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Storytellers Expanded - Winston Waves/Rewards/Rewards.xml b/Patches/Vanilla Storytellers Expanded - Winston Waves/Rewards/Rewards.xml
deleted file mode 100644
index cb13f5653a..0000000000
--- a/Patches/Vanilla Storytellers Expanded - Winston Waves/Rewards/Rewards.xml	
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Storytellers Expanded - Winston Waves</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === FSX and Prometheum Rewards === -->
-
-				<!-- === Good Reward === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VSEWW.RewardDef[defName="VSEWW_GoodResourceDrop"]/description</xpath>
-					<value>
-						<description>Cargo pods drop 500 wood, 500 steel, 30 components, 200 plasteel, 10 FSX and 10 Prometheum</description>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VSEWW.RewardDef[defName="VSEWW_GoodResourceDrop"]/items</xpath>
-					<value>
-						<li>
-							<thing>FSX</thing>
-							<count>10</count>
-						</li>
-						<li>
-							<thing>Prometheum</thing>
-							<count>10</count>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Excellent Reward === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VSEWW.RewardDef[defName="VSEWW_ExcellentResourceDrop"]/description</xpath>
-					<value>
-						<description>Cargo pods drop 1000 wood, 1000 steel, 60 components, 20 advanced components, 300 plasteel, 25 FSX and 25 Prometheum</description>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VSEWW.RewardDef[defName="VSEWW_ExcellentResourceDrop"]/items</xpath>
-					<value>
-						<li>
-							<thing>FSX</thing>
-							<count>25</count>
-						</li>
-						<li>
-							<thing>Prometheum</thing>
-							<count>25</count>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Legendary Reward === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VSEWW.RewardDef[defName="VSEWW_LegendaryResourceDrop"]/description</xpath>
-					<value>
-						<description>Cargo pods drop 3000 wood, 3000 steel, 100 components, 50 advanced components, 500 plasteel, 100 FSX and 100 Prometheum</description>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VSEWW.RewardDef[defName="VSEWW_LegendaryResourceDrop"]/items</xpath>
-					<value>
-						<li>
-							<thing>FSX</thing>
-							<count>100</count>
-						</li>
-						<li>
-							<thing>Prometheum</thing>
-							<count>100</count>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Badger.xml b/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Badger.xml
deleted file mode 100644
index d6ba0c3507..0000000000
--- a/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Badger.xml	
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Vehicles Expanded - Tier 3</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Turret -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Badger_MainTurret"]/projectile</xpath>
-					<value>
-						<projectile>Bullet_25x137mmNATO_AP</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Badger_MainTurret"]/reloadTimer</xpath>
-					<value>
-						<reloadTimer>8.8</reloadTimer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Badger_MainTurret"]/warmUpTimer</xpath>
-					<value>
-						<warmUpTimer>1.6</warmUpTimer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Badger_MainTurret"]/magazineCapacity</xpath>
-					<value>
-						<magazineCapacity>200</magazineCapacity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Badger_MainTurret"]/maxRange</xpath>
-					<value>
-						<maxRange>74</maxRange>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Badger_MainTurret"]/fireModes</xpath>
-					<value>
-						<fireModes>
-							<li>
-								<shotsPerBurst>1</shotsPerBurst>
-								<ticksBetweenShots>6</ticksBetweenShots>
-								<ticksBetweenBursts>60</ticksBetweenBursts>
-								<label>Single</label>
-								<texPath>UI/Gizmos/FireRate_Single</texPath>
-							</li>
-							<li>
-								<shotsPerBurst>5</shotsPerBurst>
-								<ticksBetweenShots>6</ticksBetweenShots>
-								<ticksBetweenBursts>60</ticksBetweenBursts>
-								<label>Burst</label>
-								<texPath>UI/Gizmos/FireRate_Burst</texPath>
-							</li>
-							<li>
-								<shotsPerBurst>10</shotsPerBurst>
-								<ticksBetweenShots>6</ticksBetweenShots>
-								<ticksBetweenBursts>60</ticksBetweenBursts>
-								<label>Auto</label>
-								<texPath>UI/Gizmos/FireRate_Auto</texPath>
-							</li>
-						</fireModes>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Badger_MainTurret"]</xpath>
-					<value>
-						<li Class="Vehicles.CETurretDataDefModExtension">
-							<ammoSet>AmmoSet_25x137mmNATO</ammoSet>
-							<shotHeight>2.0</shotHeight>
-							<speed>192</speed>
-							<sway>1.61</sway>
-							<spread>0.04</spread>
-						</li>
-					</value>
-				</li>
-
-				<!-- Vehicle -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Badger"]</xpath>
-					<value>
-						<descriptionHyperlinks>
-							<CombatExtended.AmmoSetDef>AmmoSet_25x137mmNATO</CombatExtended.AmmoSetDef>
-						</descriptionHyperlinks>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Badger"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>14</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Badger"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Badger"]/components/li[key="FrontArmorPlating"]/health</xpath>
-					<value>
-						<health>700</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Badger"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>24</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Badger"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>12</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Badger"]/components/li[key="LeftArmorPlating"]/health</xpath>
-					<value>
-						<health>340</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Badger"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>24</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Badger"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>12</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Badger"]/components/li[key="RightArmorPlating"]/health</xpath>
-					<value>
-						<health>340</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Badger"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>24</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Badger"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>12</ArmorRating_Sharp>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Burya.xml b/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Burya.xml
deleted file mode 100644
index 65721ede37..0000000000
--- a/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Burya.xml	
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Vehicles Expanded - Tier 3</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Turret -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Burya_MainTurret"]/projectile</xpath>
-					<value>
-						<projectile>Bullet_50mmRocket_HE</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Burya_MainTurret"]/reloadTimer</xpath>
-					<value>
-						<reloadTimer>9.2</reloadTimer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Burya_MainTurret"]/magazineCapacity</xpath>
-					<value>
-						<magazineCapacity>22</magazineCapacity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Burya_MainTurret"]</xpath>
-					<value>
-						<li Class="Vehicles.CETurretDataDefModExtension">
-							<ammoSet>AmmoSet_50mmRocket</ammoSet>
-							<shotHeight>2.5</shotHeight>
-							<speed>160</speed> <!-- Temporarily set artifically high, as it fires on a flat trajectory. -->
-							<sway>0.82</sway>
-							<spread>0.15</spread>
-						</li>
-					</value>
-				</li>
-
-				<!-- Vehicle -->
-				<li Class="PatchOperationAdd"> <!-- Doesn't currently work. -->
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Burya"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Charges">
-							<chargeSpeeds>
-								<li>20</li>
-								<li>30</li>
-								<li>40</li>
-								<li>50</li>
-								<li>60</li>
-							</chargeSpeeds>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Burya"]</xpath>
-					<value>
-						<descriptionHyperlinks>
-							<CombatExtended.AmmoSetDef>AmmoSet_50mmRocket</CombatExtended.AmmoSetDef>
-						</descriptionHyperlinks>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Burya"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Burya"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>3</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Burya"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Burya"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Burya"]/components/li[key="FrontArmorPlating"]/health</xpath>
-					<value>
-						<health>100</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Burya"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Burya"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Burya"]/components/li[key="LeftArmorPlating"]/health</xpath>
-					<value>
-						<health>120</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Burya"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Burya"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Burya"]/components/li[key="RightArmorPlating"]/health</xpath>
-					<value>
-						<health>120</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Burya"]/components/li[
-					key="FrontLeftWheel" or
-					key="FrontRightWheel" or
-					key="MiddleLeftWheel" or
-					key="MiddleRightWheel" or
-					key="BackLeftWheel" or
-					key="BackRightWheel"
-					]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Burya"]/components/li[
-					key="FrontLeftWheel" or
-					key="FrontRightWheel" or
-					key="MiddleLeftWheel" or
-					key="MiddleRightWheel" or
-					key="BackLeftWheel" or
-					key="BackRightWheel"
-					]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Burya"]/components/li[
-					key="FrontLeftWheel" or
-					key="FrontRightWheel" or
-					key="MiddleLeftWheel" or
-					key="MiddleRightWheel" or
-					key="BackLeftWheel" or
-					key="BackRightWheel"
-					]/health</xpath>
-					<value>
-						<health>60</health>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Goliath.xml b/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Goliath.xml
deleted file mode 100644
index ed370c58f2..0000000000
--- a/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Goliath.xml	
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Vehicles Expanded - Tier 3</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Turret - Swarm -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Goliath_SwarmTurret"]/projectile</xpath>
-					<value>
-						<projectile>Bullet_50mmRocket_HE</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Goliath_SwarmTurret"]/reloadTimer</xpath>
-					<value>
-						<reloadTimer>7.2</reloadTimer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Goliath_SwarmTurret"]/magazineCapacity</xpath>
-					<value>
-						<magazineCapacity>12</magazineCapacity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Goliath_SwarmTurret"]</xpath>
-					<value>
-						<li Class="Vehicles.CETurretDataDefModExtension">
-							<ammoSet>AmmoSet_50mmRocket</ammoSet>
-							<shotHeight>2</shotHeight>
-							<speed>60</speed> <!-- Temporarily set to max charge speed to make them somewhat usable. -->
-							<sway>0.82</sway>
-							<spread>0.15</spread>
-						</li>
-					</value>
-				</li>
-
-				<!-- Turret - Military -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Goliath_MilitaryTurret"]/projectile</xpath>
-					<value>
-						<projectile>Bullet_762x51mmNATO_FMJ</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Goliath_MilitaryTurret"]/reloadTimer</xpath>
-					<value>
-						<reloadTimer>7.8</reloadTimer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Goliath_MilitaryTurret"]/warmUpTimer</xpath>
-					<value>
-						<warmUpTimer>1.3</warmUpTimer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Goliath_MilitaryTurret"]/magazineCapacity</xpath>
-					<value>
-						<magazineCapacity>120</magazineCapacity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Goliath_MilitaryTurret"]/maxRange</xpath>
-					<value>
-						<maxRange>48</maxRange>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Goliath_MilitaryTurret"]/fireModes</xpath>
-					<value>
-						<fireModes>
-							<li>
-								<shotsPerBurst>1</shotsPerBurst>
-								<ticksBetweenShots>4</ticksBetweenShots>
-								<ticksBetweenBursts>60</ticksBetweenBursts>
-								<label>Single</label>
-								<texPath>UI/Gizmos/FireRate_Single</texPath>
-							</li>
-							<li>
-								<shotsPerBurst>6</shotsPerBurst>
-								<ticksBetweenShots>4</ticksBetweenShots>
-								<ticksBetweenBursts>60</ticksBetweenBursts>
-								<label>Burst</label>
-								<texPath>UI/Gizmos/FireRate_Burst</texPath>
-							</li>
-							<li>
-								<shotsPerBurst>12</shotsPerBurst>
-								<ticksBetweenShots>4</ticksBetweenShots>
-								<ticksBetweenBursts>60</ticksBetweenBursts>
-								<label>Auto</label>
-								<texPath>UI/Gizmos/FireRate_Auto</texPath>
-							</li>
-						</fireModes>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Goliath_MilitaryTurret"]</xpath>
-					<value>
-						<li Class="Vehicles.CETurretDataDefModExtension">
-							<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-							<shotHeight>2.5</shotHeight>
-							<speed>168</speed>
-							<sway>0.82</sway>
-							<spread>0.07</spread>
-						</li>
-					</value>
-				</li>
-
-				<!-- Mortar -->
-				<li Class="PatchOperationAdd"> <!-- Doesn't currently work. -->
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Goliath"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Charges">
-							<chargeSpeeds>
-								<li>20</li>
-								<li>30</li>
-								<li>40</li>
-								<li>50</li>
-								<li>60</li>
-							</chargeSpeeds>
-						</li>
-					</value>
-				</li>
-
-				<!-- Vehicle -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Goliath"]</xpath>
-					<value>
-						<descriptionHyperlinks>
-							<CombatExtended.AmmoSetDef>AmmoSet_50mmRocket</CombatExtended.AmmoSetDef>
-							<CombatExtended.AmmoSetDef>AmmoSet_556x45mmNATO</CombatExtended.AmmoSetDef>
-						</descriptionHyperlinks>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Goliath"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>20</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Goliath"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>12</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Goliath"]/components/li[key="BlastShield"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Goliath"]/components/li[key="BlastShield"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Goliath"]/components/li[key="BlastShield"]/health</xpath>
-					<value>
-						<health>400</health>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Marshal.xml b/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Marshal.xml
deleted file mode 100644
index db762f978c..0000000000
--- a/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Marshal.xml	
+++ /dev/null
@@ -1,259 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Vehicles Expanded - Tier 3</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Main Turret -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Marshal_MainTurret"]/projectile</xpath>
-					<value>
-						<projectile>Bullet_105x617mmRCannonShell_HE</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Marshal_MainTurret"]/reloadTimer</xpath>
-					<value>
-						<reloadTimer>7.8</reloadTimer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Marshal_MainTurret"]/warmUpTimer</xpath>
-					<value>
-						<warmUpTimer>2.8</warmUpTimer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Marshal_MainTurret"]/maxRange</xpath>
-					<value>
-						<maxRange>86</maxRange>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Marshal_MainTurret"]</xpath>
-					<value>
-						<li Class="Vehicles.CETurretDataDefModExtension">
-							<ammoSet>AmmoSet_105x617mmRCannonShell</ammoSet>
-							<shotHeight>2.5</shotHeight>
-							<speed>201</speed>
-							<sway>0.82</sway>
-							<spread>0.01</spread>
-						</li>
-					</value>
-				</li>
-
-				<!-- Mounted Turret -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Marshal_MountedTurret"]/projectile</xpath>
-					<value>
-						<projectile>Bullet_762x51mmNATO_FMJ</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Marshal_MountedTurret"]/reloadTimer</xpath>
-					<value>
-						<reloadTimer>7.8</reloadTimer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Marshal_MountedTurret"]/warmUpTimer</xpath>
-					<value>
-						<warmUpTimer>1.3</warmUpTimer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Marshal_MountedTurret"]/magazineCapacity</xpath>
-					<value>
-						<magazineCapacity>200</magazineCapacity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Marshal_MountedTurret"]/maxRange</xpath>
-					<value>
-						<maxRange>62</maxRange>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Marshal_MountedTurret"]/fireModes</xpath>
-					<value>
-						<fireModes>
-							<li>
-								<shotsPerBurst>1</shotsPerBurst>
-								<ticksBetweenShots>6</ticksBetweenShots>
-								<ticksBetweenBursts>60</ticksBetweenBursts>
-								<label>Single</label>
-								<texPath>UI/Gizmos/FireRate_Single</texPath>
-							</li>
-							<li>
-								<shotsPerBurst>5</shotsPerBurst>
-								<ticksBetweenShots>6</ticksBetweenShots>
-								<ticksBetweenBursts>60</ticksBetweenBursts>
-								<label>Burst</label>
-								<texPath>UI/Gizmos/FireRate_Burst</texPath>
-							</li>
-							<li>
-								<shotsPerBurst>10</shotsPerBurst>
-								<ticksBetweenShots>6</ticksBetweenShots>
-								<ticksBetweenBursts>60</ticksBetweenBursts>
-								<label>Auto</label>
-								<texPath>UI/Gizmos/FireRate_Auto</texPath>
-							</li>
-						</fireModes>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Marshal_MountedTurret"]</xpath>
-					<value>
-						<li Class="Vehicles.CETurretDataDefModExtension">
-							<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-							<shotHeight>2.5</shotHeight>
-							<speed>156</speed>
-							<sway>0.82</sway>
-							<spread>0.01</spread>
-						</li>
-					</value>
-				</li>
-
-				<!-- Vehicle -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Marshal"]</xpath>
-					<value>
-						<descriptionHyperlinks>
-							<CombatExtended.AmmoSetDef>AmmoSet_105x617mmRCannonShell</CombatExtended.AmmoSetDef>
-							<CombatExtended.AmmoSetDef>AmmoSet_762x51mmNATO</CombatExtended.AmmoSetDef>
-						</descriptionHyperlinks>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Marshal"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>32</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Marshal"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Marshal"]/vehicleStats/CargoCapacity</xpath>
-					<value>
-						<CargoCapacity>300</CargoCapacity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Marshal"]/components/li[key="FrontArmorPlating"]/health</xpath>
-					<value>
-						<health>900</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Marshal"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>48</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Marshal"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>24</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Marshal"]/components/li[key="LeftArmorPlating"]/health</xpath>
-					<value>
-						<health>800</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Marshal"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>44</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Marshal"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>22</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Marshal"]/components/li[key="RightArmorPlating"]/health</xpath>
-					<value>
-						<health>800</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Marshal"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>44</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Marshal"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>22</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Marshal"]/components/li[key="BackArmorPlating"]/health</xpath>
-					<value>
-						<health>600</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Marshal"]/components/li[key="Roof"]/health</xpath>
-					<value>
-						<health>600</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Marshal"]/components/li[key="Roof"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>32</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Marshal"]/components/li[key="Roof"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Paladin.xml b/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Paladin.xml
deleted file mode 100644
index d5fa8bc3c8..0000000000
--- a/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Paladin.xml	
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Vehicles Expanded - Tier 3</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Turret -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Paladin_MainTurret"]/projectile</xpath>
-					<value>
-						<projectile>Bullet_40x53mmGrenade_HE</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Paladin_MainTurret"]/reloadTimer</xpath>
-					<value>
-						<reloadTimer>7.8</reloadTimer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Paladin_MainTurret"]/warmUpTimer</xpath>
-					<value>
-						<warmUpTimer>1.5</warmUpTimer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Paladin_MainTurret"]/magazineCapacity</xpath>
-					<value>
-						<magazineCapacity>50</magazineCapacity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Paladin_MainTurret"]/maxRange</xpath>
-					<value>
-						<maxRange>74</maxRange>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Paladin_MainTurret"]/fireModes</xpath>
-					<value>
-						<fireModes>
-							<li>
-								<shotsPerBurst>1</shotsPerBurst>
-								<ticksBetweenShots>6</ticksBetweenShots>
-								<ticksBetweenBursts>60</ticksBetweenBursts>
-								<label>Single</label>
-								<texPath>UI/Gizmos/FireRate_Single</texPath>
-							</li>
-							<li>
-								<shotsPerBurst>5</shotsPerBurst>
-								<ticksBetweenShots>6</ticksBetweenShots>
-								<ticksBetweenBursts>60</ticksBetweenBursts>
-								<label>Burst</label>
-								<texPath>UI/Gizmos/FireRate_Burst</texPath>
-							</li>
-						</fireModes>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Paladin_MainTurret"]</xpath>
-					<value>
-						<li Class="Vehicles.CETurretDataDefModExtension">
-							<ammoSet>AmmoSet_40x53mmGrenade</ammoSet>
-							<shotHeight>2.0</shotHeight>
-							<speed>62</speed>
-							<sway>1.61</sway>
-							<spread>0.15</spread>
-						</li>
-					</value>
-				</li>
-
-				<!-- Vehicle -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Paladin"]</xpath>
-					<value>
-						<descriptionHyperlinks>
-							<CombatExtended.AmmoSetDef>AmmoSet_40x53mmGrenade</CombatExtended.AmmoSetDef>
-						</descriptionHyperlinks>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Paladin"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>18</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Paladin"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>9</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Paladin"]/components/li[key="FrontArmorPlating"]/health</xpath>
-					<value>
-						<health>700</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Paladin"]/components/li[key="LeftArmorPlating"]/health</xpath>
-					<value>
-						<health>260</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Paladin"]/components/li[key="RightArmorPlating"]/health</xpath>
-					<value>
-						<health>260</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Paladin"]/components/li[key="BackArmorPlating"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>12</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Paladin"]/components/li[key="BackArmorPlating"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Paladin"]/components/li[key="BackArmorPlating"]/health</xpath>
-					<value>
-						<health>180</health>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Udar.xml b/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Udar.xml
deleted file mode 100644
index f03bc9f082..0000000000
--- a/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Udar.xml	
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Vehicles Expanded - Tier 3</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Udar_MainTurret"]</xpath>
-					<value>
-						<projectile>Bullet_155mmHowitzerShell_HE</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Udar_MainTurret"]/reloadTimer</xpath>
-					<value>
-						<reloadTimer>7.8</reloadTimer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Udar_MainTurret"]/warmUpTimer</xpath>
-					<value>
-						<warmUpTimer>4</warmUpTimer>
-					</value>
-				</li>
-				<!--
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Udar_MainTurret"]/maxRange</xpath>
-					<value>
-						<maxRange>500</maxRange>
-					</value>
-				</li>
--->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Udar_MainTurret"]/fireModes</xpath>
-					<value>
-						<fireModes>
-							<li>
-								<shotsPerBurst>1</shotsPerBurst>
-								<ticksBetweenShots>6</ticksBetweenShots>
-								<ticksBetweenBursts>60</ticksBetweenBursts>
-								<label>Single</label>
-								<texPath>UI/Gizmos/FireRate_Single</texPath>
-							</li>
-						</fireModes>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Udar_MainTurret"]/ammunition</xpath>
-					<value>
-						<ammunition>
-							<thingDefs>
-								<li>Ammo_155mmHowitzerShell_HE</li>
-								<li>Ammo_155mmHowitzerShell_Incendiary</li>
-								<li>Ammo_155mmHowitzerShell_EMP</li>
-								<li>Ammo_155mmHowitzerShell_Smoke</li>
-							</thingDefs>
-						</ammunition>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Udar_MainTurret"]</xpath>
-					<value>
-						<li Class="Vehicles.CETurretDataDefModExtension">
-							<ammoSet>AmmoSet_155mmHowitzerShell</ammoSet>
-							<shotHeight>2.25</shotHeight>
-							<speed>155</speed>
-							<sway>1.61</sway>
-							<spread>0.01</spread>
-						</li>
-					</value>
-				</li>
-
-				<!-- Vehicle -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Udar"]</xpath>
-					<value>
-						<descriptionHyperlinks>
-							<CombatExtended.AmmoSetDef>AmmoSet_155mmHowitzerShell</CombatExtended.AmmoSetDef>
-						</descriptionHyperlinks>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Udar"]/vehicleStats/CargoCapacity</xpath>
-					<value>
-						<CargoCapacity>300</CargoCapacity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Udar"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>24</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Udar"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>12</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Udar"]/components/li[key="FrontArmorPlating"]/health</xpath>
-					<value>
-						<health>660</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Udar"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>24</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Udar"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>12</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Udar"]/components/li[key="LeftArmorPlating"]/health</xpath>
-					<value>
-						<health>660</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Udar"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Udar"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Udar"]/components/li[key="RightArmorPlating"]/health</xpath>
-					<value>
-						<health>660</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Udar"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Udar"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Udar"]/components/li[key="BackArmorPlating"]/health</xpath>
-					<value>
-						<health>510</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Udar"]/components/li[key="BackArmorPlating"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Udar"]/components/li[key="BackArmorPlating"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Udar"]/components/li[key="Roof"]/health</xpath>
-					<value>
-						<health>20</health>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Vehicles_ExplosionsHotfixTier3.xml b/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Vehicles_ExplosionsHotfixTier3.xml
deleted file mode 100644
index 1b6abcbb76..0000000000
--- a/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Vehicles_ExplosionsHotfixTier3.xml	
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Vehicles Expanded - Tier 3</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[
-						defName="VVE_Badger" or
-						defName="VVE_BigRig" or
-						defName="VVE_Burya" or
-						defName="VVE_Cherokee" or
-						defName="VVE_Goliath" or
-						defName="VVE_Hermano" or
-						defName="VVE_Lightning" or
-						defName="VVE_Louie" or
-						defName="VVE_Marshal" or
-						defName="VVE_Nomad" or
-						defName="VVE_Paladin" or
-						defName="VVE_Springbok" or
-						defName="VVE_Udar"
-						]/components/li[key="Engine"]/reactors/li[@Class = "Vehicles.Reactor_Explosive"]/damageDef</xpath>
-					<value>
-						<damageDef>Bomb</damageDef>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[
-						defName="VVE_Badger" or
-						defName="VVE_BigRig" or
-						defName="VVE_Burya" or
-						defName="VVE_Cherokee" or
-						defName="VVE_Goliath" or
-						defName="VVE_Hermano" or
-						defName="VVE_Lightning" or
-						defName="VVE_Louie" or
-						defName="VVE_Marshal" or
-						defName="VVE_Nomad" or
-						defName="VVE_Paladin" or
-						defName="VVE_Springbok" or
-						defName="VVE_Udar"
-						]/components/li[key="Engine"]/reactors/li[@Class = "Vehicles.Reactor_Explosive"]/radius</xpath>
-					<value>
-						<radius>1</radius>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[
-						defName="VVE_Badger" or
-						defName="VVE_BigRig" or
-						defName="VVE_Burya" or
-						defName="VVE_Cherokee" or
-						defName="VVE_Goliath" or
-						defName="VVE_Hermano" or
-						defName="VVE_Lightning" or
-						defName="VVE_Louie" or
-						defName="VVE_Marshal" or
-						defName="VVE_Nomad" or
-						defName="VVE_Paladin" or
-						defName="VVE_Springbok" or
-						defName="VVE_Udar"
-						]/components/li[key="Chemtank"]/reactors/li[@Class = "Vehicles.Reactor_Explosive"]/damageDef</xpath>
-					<value>
-						<damageDef>Bomb</damageDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Vehicles_Unarmed.xml b/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Vehicles_Unarmed.xml
deleted file mode 100644
index ada201c684..0000000000
--- a/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Vehicles_Unarmed.xml	
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Vehicles Expanded - Tier 3</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Big Rig -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_BigRig"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_BigRig"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- Cherokee -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Cherokee"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>10</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Cherokee"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- Hermano -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Hermano"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3.25</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Hermano"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- Lightning -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Lightning"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.65</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Lightning"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>3.75</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- Louie -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Louie"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>11</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Louie"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- Nomad -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Nomad"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Nomad"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Nomad"]/components/li[key="FrontPanel"]/health</xpath>
-					<value>
-						<health>300</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Nomad"]/components/li[key="FrontPanel"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>8</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Nomad"]/components/li[key="FrontPanel"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Nomad"]/components/li[key="LeftSidePanel"]/health</xpath>
-					<value>
-						<health>300</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Nomad"]/components/li[key="LeftSidePanel"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>8</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Nomad"]/components/li[key="LeftSidePanel"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Nomad"]/components/li[key="RightSidePanel"]/health</xpath>
-					<value>
-						<health>300</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Nomad"]/components/li[key="RightSidePanel"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>8</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Nomad"]/components/li[key="RightSidePanel"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- Springbok -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Springbok"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Springbok"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Vehicles Expanded/Resources_CarParts.xml b/Patches/Vanilla Vehicles Expanded/Resources_CarParts.xml
deleted file mode 100644
index 522b992b6a..0000000000
--- a/Patches/Vanilla Vehicles Expanded/Resources_CarParts.xml	
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Vehicles Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="VVE_CarPartBase"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VVE_EngineBlock"]/statBases</xpath>
-					<value>
-						<Bulk>20</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VVE_CarAlternator"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VVE_CarExhaust"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VVE_CarSuspension"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VVE_CarWheel"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier1/Bunsen.xml b/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier1/Bunsen.xml
deleted file mode 100644
index 75f76ae0b8..0000000000
--- a/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier1/Bunsen.xml	
+++ /dev/null
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Vehicles Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Turret -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="VVE_Bunsen_MainTurret"]/projectile</xpath>
-					<value>
-						<projectile>Bullet_Flamethrower_Prometheum</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="VVE_Bunsen_MainTurret"]/reloadTimer</xpath>
-					<value>
-						<reloadTimer>7.0</reloadTimer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="VVE_Bunsen_MainTurret"]/warmUpTimer</xpath>
-					<value>
-						<warmUpTimer>1.0</warmUpTimer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="VVE_Bunsen_MainTurret"]/magazineCapacity</xpath>
-					<value>
-						<magazineCapacity>200</magazineCapacity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="VVE_Bunsen_MainTurret"]/maxRange</xpath>
-					<value>
-						<maxRange>40</maxRange>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="VVE_Bunsen_MainTurret"]/projectileOffset</xpath>
-					<value>
-						<projectileOffset>1</projectileOffset>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="VVE_Bunsen_MainTurret"]/fireModes</xpath>
-					<value>
-						<fireModes>
-							<li>
-								<shotsPerBurst>5</shotsPerBurst>
-								<ticksBetweenShots>3</ticksBetweenShots>
-								<ticksBetweenBursts>60</ticksBetweenBursts>
-								<label>Burst</label>
-								<texPath>UI/Gizmos/FireRate_Burst</texPath>
-							</li>
-							<li>
-								<shotsPerBurst>10</shotsPerBurst>
-								<ticksBetweenShots>3</ticksBetweenShots>
-								<ticksBetweenBursts>60</ticksBetweenBursts>
-								<label>Auto</label>
-								<texPath>UI/Gizmos/FireRate_Auto</texPath>
-							</li>
-						</fireModes>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="VVE_Bunsen_MainTurret"]</xpath>
-					<value>
-						<li Class="Vehicles.CETurretDataDefModExtension">
-							<ammoSet>AmmoSet_Flamethrower</ammoSet>
-							<shotHeight>2.0</shotHeight>
-							<speed>20</speed>
-							<sway>0.25</sway>
-							<spread>0.30</spread>
-						</li>
-					</value>
-				</li>
-
-				<!-- Vehicle -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]</xpath>
-					<value>
-						<descriptionHyperlinks>
-							<CombatExtended.AmmoSetDef>AmmoSet_Flamethrower</CombatExtended.AmmoSetDef>
-						</descriptionHyperlinks>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]/comps/li[@Class="Vehicles.CompProperties_VehicleTurrets"]</xpath>
-					<value>
-						<li Class="Vehicles.CompProperties_VehicleTurrets">
-							<turrets>
-								<li>
-									<turretDef>VVE_Bunsen_MainTurret</turretDef>
-									<renderProperties>
-										<north>(-0.05, 0.2)</north>
-										<south>(-0.02, 0.2)</south>
-										<east>(-0.02, 0.4)</east>
-									</renderProperties>
-									<gizmoLabel>Main Turret</gizmoLabel>
-									<angleRestricted />
-									<aimPieOffset>(0, 1.5)</aimPieOffset>
-									<key>mainTurret</key>
-								</li>
-							</turrets>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]/comps/li[@Class="Vehicles.CompProperties_FueledTravel"]/fuelCapacity</xpath>
-					<value>
-						<fuelCapacity>120</fuelCapacity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>10</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]/components/li[key="FrontArmorPlating"]/health</xpath>
-					<value>
-						<health>220</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>8</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]/components/li[key="LeftArmorPlating"]/health</xpath>
-					<value>
-						<health>180</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>8</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]/components/li[key="RightArmorPlating"]/health</xpath>
-					<value>
-						<health>180</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>10</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]/components/li[key="BackArmorPlating"]/health</xpath>
-					<value>
-						<health>180</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]/components/li[key="BackArmorPlating"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>10</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]/components/li[key="BackArmorPlating"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]/components/li[key="Roof"]/health</xpath>
-					<value>
-						<health>180</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]/components/li[key="Roof"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>8</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bunsen"]/components/li[key="Roof"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier1/Highwayman.xml b/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier1/Highwayman.xml
deleted file mode 100644
index 318ad54dd9..0000000000
--- a/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier1/Highwayman.xml	
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Vehicles Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Turret -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Highwayman_MainTurret"]/projectile</xpath>
-					<value>
-						<projectile>Bullet_762x51mmNATO_FMJ</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Highwayman_MainTurret"]/reloadTimer</xpath>
-					<value>
-						<reloadTimer>7.8</reloadTimer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Highwayman_MainTurret"]/warmUpTimer</xpath>
-					<value>
-						<warmUpTimer>1.3</warmUpTimer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Highwayman_MainTurret"]/magazineCapacity</xpath>
-					<value>
-						<magazineCapacity>200</magazineCapacity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Highwayman_MainTurret"]/projectileShifting</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Highwayman_MainTurret"]/maxRange</xpath>
-					<value>
-						<maxRange>55</maxRange>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Highwayman_MainTurret"]/fireModes</xpath>
-					<value>
-						<fireModes>
-							<li>
-								<shotsPerBurst>1</shotsPerBurst>
-								<ticksBetweenShots>6</ticksBetweenShots>
-								<ticksBetweenBursts>60</ticksBetweenBursts>
-								<label>Single</label>
-								<texPath>UI/Gizmos/FireRate_Single</texPath>
-							</li>
-							<li>
-								<shotsPerBurst>5</shotsPerBurst>
-								<ticksBetweenShots>6</ticksBetweenShots>
-								<ticksBetweenBursts>60</ticksBetweenBursts>
-								<label>Burst</label>
-								<texPath>UI/Gizmos/FireRate_Burst</texPath>
-							</li>
-							<li>
-								<shotsPerBurst>10</shotsPerBurst>
-								<ticksBetweenShots>6</ticksBetweenShots>
-								<ticksBetweenBursts>60</ticksBetweenBursts>
-								<label>Auto</label>
-								<texPath>UI/Gizmos/FireRate_Auto</texPath>
-							</li>
-						</fireModes>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Highwayman_MainTurret"]</xpath>
-					<value>
-						<li Class="Vehicles.CETurretDataDefModExtension">
-							<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-							<shotHeight>2.0</shotHeight>
-							<speed>156</speed>
-							<sway>0.96</sway>
-							<spread>0.04</spread>
-						</li>
-					</value>
-				</li>
-
-				<!-- Vehicle -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Highwayman"]</xpath>
-					<value>
-						<descriptionHyperlinks>
-							<CombatExtended.AmmoSetDef>AmmoSet_762x51mmNATO</CombatExtended.AmmoSetDef>
-						</descriptionHyperlinks>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Highwayman"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>10</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Highwayman"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Highwayman"]/components/li[key="FrontArmorPlating"]/health</xpath>
-					<value>
-						<health>300</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Highwayman"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>10</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Highwayman"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Highwayman"]/components/li[key="LeftArmorPlating"]/health</xpath>
-					<value>
-						<health>240</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Highwayman"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>10</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Highwayman"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Highwayman"]/components/li[key="RightArmorPlating"]/health</xpath>
-					<value>
-						<health>240</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Highwayman"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>10</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Highwayman"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Highwayman"]/components/li[key="Roof"]/health</xpath>
-					<value>
-						<health>255</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Highwayman"]/components/li[key="Roof"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>10</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Highwayman"]/components/li[key="Roof"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier1/Roadkill.xml b/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier1/Roadkill.xml
deleted file mode 100644
index 9c2325b423..0000000000
--- a/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier1/Roadkill.xml	
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Vehicles Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Turret -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Roadkill_MainTurret"]/projectile</xpath>
-					<value>
-						<projectile>Bullet_57x307mmR_HE</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Roadkill_MainTurret"]/reloadTimer</xpath>
-					<value>
-						<reloadTimer>8.2</reloadTimer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Roadkill_MainTurret"]/warmUpTimer</xpath>
-					<value>
-						<warmUpTimer>3.5</warmUpTimer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Roadkill_MainTurret"]/maxRange</xpath>
-					<value>
-						<maxRange>62</maxRange>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Roadkill_MainTurret"]</xpath>
-					<value>
-						<li Class="Vehicles.CETurretDataDefModExtension">
-							<ammoSet>AmmoSet_57x307mmR</ammoSet>
-							<shotHeight>2.5</shotHeight>
-							<speed>92</speed>
-							<sway>0.82</sway>
-							<spread>0.01</spread>
-						</li>
-					</value>
-				</li>
-
-				<!-- Vehicle -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Roadkill"]</xpath>
-					<value>
-						<descriptionHyperlinks>
-							<CombatExtended.AmmoSetDef>AmmoSet_57x307mmR</CombatExtended.AmmoSetDef>
-						</descriptionHyperlinks>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Roadkill"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>10</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Roadkill"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Roadkill"]/vehicleStats/CargoCapacity</xpath>
-					<value>
-						<CargoCapacity>180</CargoCapacity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Roadkill"]/components/li[key="FrontArmorPlating"]/health</xpath>
-					<value>
-						<health>300</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Roadkill"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>20</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Roadkill"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Roadkill"]/components/li[key="LeftArmorPlating"]/health</xpath>
-					<value>
-						<health>300</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Roadkill"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Roadkill"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Roadkill"]/components/li[key="RightArmorPlating"]/health</xpath>
-					<value>
-						<health>300</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Roadkill"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Roadkill"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Roadkill"]/components/li[key="Roof"]/health</xpath>
-					<value>
-						<health>300</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Roadkill"]/components/li[key="Roof"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Roadkill"]/components/li[key="Roof"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier1/Scytheman.xml b/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier1/Scytheman.xml
deleted file mode 100644
index 18a50cf0c9..0000000000
--- a/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier1/Scytheman.xml	
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Vehicles Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Turret -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Scytheman_MainTurret"]/projectile</xpath>
-					<value>
-						<projectile>Bullet_50mmRocket_HE</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Scytheman_MainTurret"]/reloadTimer</xpath>
-					<value>
-						<reloadTimer>7.2</reloadTimer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Scytheman_MainTurret"]/genericAmmo</xpath>
-					<value>
-						<genericAmmo>false</genericAmmo>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Scytheman_MainTurret"]/magazineCapacity</xpath>
-					<value>
-						<magazineCapacity>12</magazineCapacity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Scytheman_MainTurret"]</xpath>
-					<value>
-						<li Class="Vehicles.CETurretDataDefModExtension">
-							<ammoSet>AmmoSet_50mmRocket</ammoSet>
-							<shotHeight>2</shotHeight>
-							<speed>160</speed> <!-- Temporarily set artifically high, as it fires on a flat trajectory. -->
-							<sway>0.82</sway>
-							<spread>0.15</spread>
-						</li>
-					</value>
-				</li>
-
-				<!-- Vehicle -->
-				<li Class="PatchOperationAdd"> <!-- Doesn't currently work. -->
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Scytheman"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Charges">
-							<chargeSpeeds>
-								<li>20</li>
-								<li>30</li>
-								<li>40</li>
-								<li>50</li>
-								<li>60</li>
-							</chargeSpeeds>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Scytheman"]</xpath>
-					<value>
-						<descriptionHyperlinks>
-							<CombatExtended.AmmoSetDef>AmmoSet_50mmRocket</CombatExtended.AmmoSetDef>
-						</descriptionHyperlinks>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Scytheman"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Scytheman"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier1/Toad.xml b/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier1/Toad.xml
deleted file mode 100644
index b4b085163c..0000000000
--- a/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier1/Toad.xml	
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Vehicles Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Turret -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Toad_MainTurret"]</xpath>
-					<value>
-						<projectile>Bullet_81mmMortarShell_HE</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Toad_MainTurret"]/reloadTimer</xpath>
-					<value>
-						<reloadTimer>6.5</reloadTimer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Toad_MainTurret"]/warmUpTimer</xpath>
-					<value>
-						<warmUpTimer>5.5</warmUpTimer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Toad_MainTurret"]/minRange</xpath>
-					<value>
-						<minRange>32</minRange>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Toad_MainTurret"]/ammunition/categories</xpath>
-					<value>
-						<categories>
-							<li>Ammo81mmMortarShells</li>
-						</categories>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Toad_MainTurret"]</xpath>
-					<value>
-						<li Class="Vehicles.CETurretDataDefModExtension">
-							<ammoSet>AmmoSet_81mmMortarShell</ammoSet>
-							<shotHeight>2</shotHeight>
-							<speed>90</speed> <!-- Temporarily set to max charge speed to make them somewhat usable. -->
-							<sway>0.82</sway>
-							<spread>0.01</spread>
-						</li>
-					</value>
-				</li>
-
-				<!-- Mortar -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Toad"]/statBases</xpath>
-					<value>
-						<SightsEfficiency>0.5</SightsEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd"> <!-- Doesn't currently work. -->
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Toad"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Charges">
-							<chargeSpeeds>
-								<li>30</li>
-								<li>50</li>
-								<li>70</li>
-								<li>90</li>
-							</chargeSpeeds>
-						</li>
-					</value>
-				</li>
-
-				<!-- Vehicle -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Toad"]</xpath>
-					<value>
-						<descriptionHyperlinks>
-							<CombatExtended.AmmoSetDef>AmmoSet_81mmMortarShell</CombatExtended.AmmoSetDef>
-						</descriptionHyperlinks>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Toad"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>46</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Toad"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>23</ArmorRating_Sharp>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier1/Vehicles_T1_Unarmed.xml b/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier1/Vehicles_T1_Unarmed.xml
deleted file mode 100644
index 3ab38cb9da..0000000000
--- a/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier1/Vehicles_T1_Unarmed.xml	
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Vehicles Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Traveller -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Traveller"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Traveller"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- Prowler -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Prowler"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Prowler"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.65</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- Bang Bus -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_BangBus"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_BangBus"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_BangBus"]/components/li[key="LeftSidePanel"]/health</xpath>
-					<value>
-						<health>270</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_BangBus"]/components/li[key="LeftSidePanel"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>8</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_BangBus"]/components/li[key="LeftSidePanel"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_BangBus"]/components/li[key="RightSidePanel"]/health</xpath>
-					<value>
-						<health>270</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_BangBus"]/components/li[key="RightSidePanel"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>8</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_BangBus"]/components/li[key="RightSidePanel"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- Dinghy -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Dinghy"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Dinghy"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- Dirtbike -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Dirtbike"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1.9</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Dirtbike"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- Frog -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Frog"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Frog"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- Mule -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Mule"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2.25</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Mule"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier2/Bulldog.xml b/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier2/Bulldog.xml
deleted file mode 100644
index da2352b367..0000000000
--- a/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier2/Bulldog.xml	
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Vehicles Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Turret -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Bulldog_MainTurret"]/projectile</xpath>
-					<value>
-						<projectile>Bullet_75x350mmR_HE</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Bulldog_MainTurret"]/reloadTimer</xpath>
-					<value>
-						<reloadTimer>6.2</reloadTimer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Bulldog_MainTurret"]/warmUpTimer</xpath>
-					<value>
-						<warmUpTimer>2.8</warmUpTimer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Bulldog_MainTurret"]/maxRange</xpath>
-					<value>
-						<maxRange>86</maxRange>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Bulldog_MainTurret"]</xpath>
-					<value>
-						<li Class="Vehicles.CETurretDataDefModExtension">
-							<ammoSet>AmmoSet_75x350mmR</ammoSet>
-							<shotHeight>2.5</shotHeight>
-							<speed>124</speed>
-							<sway>0.82</sway>
-							<spread>0.01</spread>
-						</li>
-					</value>
-				</li>
-
-				<!-- Vehicle -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bulldog"]</xpath>
-					<value>
-						<descriptionHyperlinks>
-							<CombatExtended.AmmoSetDef>AmmoSet_75x350mmR</CombatExtended.AmmoSetDef>
-						</descriptionHyperlinks>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bulldog"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>32</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bulldog"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bulldog"]/vehicleStats/CargoCapacity</xpath>
-					<value>
-						<CargoCapacity>300</CargoCapacity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bulldog"]/components/li[key="FrontArmorPlating"]/health</xpath>
-					<value>
-						<health>600</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bulldog"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>32</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bulldog"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bulldog"]/components/li[key="LeftArmorPlating"]/health</xpath>
-					<value>
-						<health>600</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bulldog"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>28</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bulldog"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bulldog"]/components/li[key="RightArmorPlating"]/health</xpath>
-					<value>
-						<health>600</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bulldog"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>28</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bulldog"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>14</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bulldog"]/components/li[key="BackArmorPlating"]/health</xpath>
-					<value>
-						<health>600</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bulldog"]/components/li[key="Roof"]/health</xpath>
-					<value>
-						<health>400</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bulldog"]/components/li[key="Roof"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>20</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Bulldog"]/components/li[key="Roof"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier2/Tango.xml b/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier2/Tango.xml
deleted file mode 100644
index cfac01f06e..0000000000
--- a/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier2/Tango.xml	
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Vehicles Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Tango_MainTurret"]/projectile</xpath>
-					<value>
-						<projectile>Bullet_20x102mmNATO_AP</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Tango_MainTurret"]/reloadTimer</xpath>
-					<value>
-						<reloadTimer>7.8</reloadTimer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Tango_MainTurret"]/warmUpTimer</xpath>
-					<value>
-						<warmUpTimer>2.3</warmUpTimer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Tango_MainTurret"]/magazineCapacity</xpath>
-					<value>
-						<magazineCapacity>50</magazineCapacity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Tango_MainTurret"]/maxRange</xpath>
-					<value>
-						<maxRange>78</maxRange>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Tango_MainTurret"]/fireModes</xpath>
-					<value>
-						<fireModes>
-							<li>
-								<shotsPerBurst>1</shotsPerBurst>
-								<ticksBetweenShots>6</ticksBetweenShots>
-								<ticksBetweenBursts>60</ticksBetweenBursts>
-								<label>Single</label>
-								<texPath>UI/Gizmos/FireRate_Single</texPath>
-							</li>
-							<li>
-								<shotsPerBurst>2</shotsPerBurst>
-								<ticksBetweenShots>6</ticksBetweenShots>
-								<ticksBetweenBursts>60</ticksBetweenBursts>
-								<label>Burst</label>
-								<texPath>UI/Gizmos/FireRate_Burst</texPath>
-							</li>
-							<li>
-								<shotsPerBurst>5</shotsPerBurst>
-								<ticksBetweenShots>6</ticksBetweenShots>
-								<ticksBetweenBursts>60</ticksBetweenBursts>
-								<label>Auto</label>
-								<texPath>UI/Gizmos/FireRate_Auto</texPath>
-							</li>
-						</fireModes>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="Tango_MainTurret"]</xpath>
-					<value>
-						<li Class="Vehicles.CETurretDataDefModExtension">
-							<ammoSet>AmmoSet_20x102mmNATO</ammoSet>
-							<shotHeight>2.25</shotHeight>
-							<speed>182</speed>
-							<sway>1.61</sway>
-							<spread>0.01</spread>
-						</li>
-					</value>
-				</li>
-
-				<!-- Vehicle -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Tango"]</xpath>
-					<value>
-						<descriptionHyperlinks>
-							<CombatExtended.AmmoSetDef>AmmoSet_20x102mmNATO</CombatExtended.AmmoSetDef>
-						</descriptionHyperlinks>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Tango"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Tango"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Tango"]/components/li[key="FrontArmorPlating"]/health</xpath>
-					<value>
-						<health>660</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Tango"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Tango"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Tango"]/components/li[key="LeftArmorPlating"]/health</xpath>
-					<value>
-						<health>660</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Tango"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Tango"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Tango"]/components/li[key="RightArmorPlating"]/health</xpath>
-					<value>
-						<health>660</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Tango"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Tango"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Tango"]/components/li[key="BackArmorPlating"]/health</xpath>
-					<value>
-						<health>510</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Tango"]/components/li[key="Roof"]/health</xpath>
-					<value>
-						<health>390</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Tango"]/components/li[key="Roof"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>16</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Tango"]/components/li[key="Roof"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier2/Vehicles_T2_Unarmed.xml b/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier2/Vehicles_T2_Unarmed.xml
deleted file mode 100644
index 64a212a652..0000000000
--- a/Patches/Vanilla Vehicles Expanded/VehicleDefs/Tier2/Vehicles_T2_Unarmed.xml	
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Vehicles Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Wagon -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Wagon"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3.75</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Wagon"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.85</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- Snatcher -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Snatcher"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Snatcher"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2.25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- Trawler -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Trawler"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>7</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Trawler"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>3.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- Charley -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Charley"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2.8</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Charley"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.45</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- Roadrunner -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Roadrunner"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4.75</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Roadrunner"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- Mosquito -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Mosquito"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Mosquito"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- Smuggler -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Smuggler"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Smuggler"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- Warbird -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Warbird"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Warbird"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>3</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- Wisent -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Wisent"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Wisent"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>3</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Wisent"]/components/li[key="LeftBackPanel"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Wisent"]/components/li[key="LeftBackPanel"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Wisent"]/components/li[key="LeftBackPanel"]/health</xpath>
-					<value>
-						<health>120</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Wisent"]/components/li[key="RightBackPanel"]/armor/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Wisent"]/components/li[key="RightBackPanel"]/armor/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[defName="VVE_Wisent"]/components/li[key="RightBackPanel"]/health</xpath>
-					<value>
-						<health>120</health>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Vehicles Expanded/Vehicles_Explosions_Fix.xml b/Patches/Vanilla Vehicles Expanded/Vehicles_Explosions_Fix.xml
deleted file mode 100644
index f69d95cda8..0000000000
--- a/Patches/Vanilla Vehicles Expanded/Vehicles_Explosions_Fix.xml	
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Vehicles Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-			
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[
-						defName="VVE_BangBus" or
-						defName="VVE_Bunsen" or
-						defName="VVE_Dinghy" or
-						defName="VVE_Dirtbike" or
-						defName="VVE_Frog" or
-						defName="VVE_Highwayman" or
-						defName="VVE_Mule" or
-						defName="VVE_Prowler" or
-						defName="VVE_Roadkill" or
-						defName="VVE_Scytheman" or
-						defName="VVE_Toad" or
-						defName="VVE_Traveller" or
-						defName="VVE_Bulldog" or
-						defName="VVE_Charley" or
-						defName="VVE_Mosquito" or
-						defName="VVE_Roadrunner" or
-						defName="VVE_Smuggler" or
-						defName="VVE_Snatcher" or
-						defName="VVE_Tango" or
-						defName="VVE_Trawler" or
-						defName="VVE_Wagon" or
-						defName="VVE_Warbird" or
-						defName="VVE_Wisent"
-						]/components/li[key="Engine"]/reactors/li[@Class = "Vehicles.Reactor_Explosive"]/damageDef</xpath>
-					<value>
-						<damageDef>Bomb</damageDef>
-					</value>
-				</li>
-				
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[
-						defName="VVE_BangBus" or
-						defName="VVE_Bunsen" or
-						defName="VVE_Dinghy" or
-						defName="VVE_Dirtbike" or
-						defName="VVE_Frog" or
-						defName="VVE_Highwayman" or
-						defName="VVE_Mule" or
-						defName="VVE_Prowler" or
-						defName="VVE_Roadkill" or
-						defName="VVE_Scytheman" or
-						defName="VVE_Toad" or
-						defName="VVE_Traveller" or
-						defName="VVE_Bulldog" or
-						defName="VVE_Charley" or
-						defName="VVE_Mosquito" or
-						defName="VVE_Roadrunner" or
-						defName="VVE_Smuggler" or
-						defName="VVE_Snatcher" or
-						defName="VVE_Tango" or
-						defName="VVE_Trawler" or
-						defName="VVE_Wagon" or
-						defName="VVE_Warbird" or
-						defName="VVE_Wisent"
-						]/components/li[key="Engine"]/reactors/li[@Class = "Vehicles.Reactor_Explosive"]/radius</xpath>
-					<value>
-						<radius>1</radius>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[
-						defName="VVE_BangBus" or
-						defName="VVE_Bunsen" or
-						defName="VVE_Dinghy" or
-						defName="VVE_Dirtbike" or
-						defName="VVE_Frog" or
-						defName="VVE_Highwayman" or
-						defName="VVE_Mule" or
-						defName="VVE_Prowler" or
-						defName="VVE_Roadkill" or
-						defName="VVE_Scytheman" or
-						defName="VVE_Toad" or
-						defName="VVE_Traveller" or
-						defName="VVE_Bulldog" or
-						defName="VVE_Charley" or
-						defName="VVE_Mosquito" or
-						defName="VVE_Roadrunner" or
-						defName="VVE_Smuggler" or
-						defName="VVE_Snatcher" or
-						defName="VVE_Tango" or
-						defName="VVE_Trawler" or
-						defName="VVE_Wagon" or
-						defName="VVE_Warbird" or
-						defName="VVE_Wisent"
-						]/components/li[key="Chemtank"]/reactors/li[@Class = "Vehicles.Reactor_Explosive"]/damageDef</xpath>
-					<value>
-						<damageDef>Bomb</damageDef>
-					</value>
-				</li>
-	
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded - Coilguns/Ammo.xml b/Patches/Vanilla Weapons Expanded - Coilguns/Ammo.xml
deleted file mode 100644
index c4257df2dc..0000000000
--- a/Patches/Vanilla Weapons Expanded - Coilguns/Ammo.xml	
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded - Coilguns</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === 
-				Coilguns do less damage than some conventional rounds, but have
-				far superior penetration, making them superior against thick
-				armor. 
-				=== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- === Ammo Sets === -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_6mmRailgun_GaussRifle</defName>
-							<label>6mm Railgun</label>
-							<ammoTypes>
-								<Ammo_6mmRailgun_Sabot>Bullet_CoilGun_Rifle</Ammo_6mmRailgun_Sabot>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_6mmRailgun_GaussMagnum</defName>
-							<label>6mm Railgun</label>
-							<ammoTypes>
-								<Ammo_6mmRailgun_Sabot>Bullet_CoilGun_Magnum</Ammo_6mmRailgun_Sabot>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_8mmRailgun_GaussLance</defName>
-							<label>8mm Railgun</label>
-							<ammoTypes>
-								<Ammo_8mmRailgun_Sabot>Bullet_CoilGun_Lance</Ammo_8mmRailgun_Sabot>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- === Projectiles === -->
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletYellow">
-							<defName>Bullet_CoilGun_Magnum</defName>
-							<label>gauss magnum shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<isInstant>true</isInstant>
-								<damageFalloff>False</damageFalloff>
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>15</damageAmountBase>
-								<armorPenetrationSharp>23</armorPenetrationSharp>
-								<armorPenetrationBlunt>142.5</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletYellow">
-							<defName>Bullet_CoilGun_Rifle</defName>
-							<label>gauss rifle shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<isInstant>true</isInstant>
-								<damageFalloff>False</damageFalloff>
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>16</damageAmountBase>
-								<armorPenetrationSharp>36.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>235.5</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletYellow">
-							<defName>Bullet_CoilGun_Lance</defName>
-							<label>gauss lance shot</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<isInstant>true</isInstant>
-								<damageFalloff>False</damageFalloff>
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>21</damageAmountBase>
-								<armorPenetrationSharp>46.4</armorPenetrationSharp>
-								<armorPenetrationBlunt>312</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded - Coilguns/RangedSpacer.xml b/Patches/Vanilla Weapons Expanded - Coilguns/RangedSpacer.xml
deleted file mode 100644
index 3e3bc32e15..0000000000
--- a/Patches/Vanilla Weapons Expanded - Coilguns/RangedSpacer.xml	
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded - Coilguns</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === 
-      Compared to conventional weapons, coilguns have longer
-      warmups, but higher rates of fire and large magazines.
-      === -->
-
-				<!-- === Tools === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName ="VWE_Gun_GaussMagnum"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VWE_Gun_GaussRifle"]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_Gun_GaussLance"]/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>
-				</li>
-
-				<!-- === Gauss Magnum === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_GaussMagnum</defName>
-					<statBases>
-						<Mass>1.45</Mass>
-						<Bulk>2.50</Bulk>
-						<SwayFactor>1.32</SwayFactor>
-						<ShotSpread>0.17</ShotSpread>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.51</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>3.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_CoilGun_Magnum</defaultProjectile>
-						<warmupTime>0.8</warmupTime>
-						<range>15</range>
-						<soundCast>VWE_Shot_GaussMagnum</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_6mmRailgun_GaussMagnum</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Gauss Rifle === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_GaussRifle</defName>
-					<statBases>
-						<Mass>4.0</Mass>
-						<Bulk>9.0</Bulk>
-						<SwayFactor>1.30</SwayFactor>
-						<ShotSpread>0.07</ShotSpread>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.09</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_CoilGun_Rifle</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>VWE_Shot_GaussRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>40</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_6mmRailgun_GaussRifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>4</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>Coilgun</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Gauss Lance === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_GaussLance</defName>
-					<statBases>
-						<Mass>12.0</Mass>
-						<Bulk>12.0</Bulk>
-						<SwayFactor>2.40</SwayFactor>
-						<ShotSpread>0.1</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.86</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_CoilGun_Lance</defaultProjectile>
-						<warmupTime>2.4</warmupTime>
-						<range>62</range>
-						<soundCast>VWE_Shot_GaussLance</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>5.2</reloadTime>
-						<ammoSet>AmmoSet_8mmRailgun_GaussLance</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded - Frontier/Patch_HighRoller_AddonAmmo.xml b/Patches/Vanilla Weapons Expanded - Frontier/Patch_HighRoller_AddonAmmo.xml
deleted file mode 100644
index 54058f8ade..0000000000
--- a/Patches/Vanilla Weapons Expanded - Frontier/Patch_HighRoller_AddonAmmo.xml	
+++ /dev/null
@@ -1,265 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded - Frontier</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationFindMod">
-					<mods>
-						<li>Vanilla Weapons Expanded - Quickdraw</li>
-					</mods>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs</xpath>
-						<value>
-
-							<!-- ==================== AmmoSet ========================== -->
-
-							<CombatExtended.AmmoSetDef>
-								<defName>AmmoSet_41RimfireHR</defName>
-								<label>.41 Rimfire</label>
-								<ammoTypes>
-									<Ammo_41Rimfire_FMJ>Bullet_41RimfireHR_FMJ</Ammo_41Rimfire_FMJ>
-									<Ammo_41Rimfire_AP>Bullet_41RimfireHR_AP</Ammo_41Rimfire_AP>
-									<Ammo_41Rimfire_HP>Bullet_41RimfireHR_HP</Ammo_41Rimfire_HP>
-								</ammoTypes>
-								<similarTo>AmmoSet_Pistol</similarTo>
-							</CombatExtended.AmmoSetDef>
-
-							<!-- ==================== Ammo ========================== -->
-
-							<!-- ================== Projectiles ================== -->
-
-							<ThingDef ParentName="Base41RimfireBullet">
-								<defName>Bullet_41RimfireHR_FMJ</defName>
-								<label>.41 Rimfire bullet (FMJ)</label>
-								<projectile Class="CombatExtended.ProjectilePropertiesCE">
-									<damageAmountBase>6</damageAmountBase>
-									<armorPenetrationSharp>1</armorPenetrationSharp>
-									<armorPenetrationBlunt>1.36</armorPenetrationBlunt>
-									<secondaryDamage>
-										<li>
-											<def>Bullet</def>
-											<amount>6</amount>
-											<chance>0.10</chance>
-										</li>
-									</secondaryDamage>
-								</projectile>
-							</ThingDef>
-
-							<ThingDef ParentName="Base41RimfireBullet">
-								<defName>Bullet_41RimfireHR_AP</defName>
-								<label>.41 Rimfire bullet (AP)</label>
-								<projectile Class="CombatExtended.ProjectilePropertiesCE">
-									<damageAmountBase>4</damageAmountBase>
-									<armorPenetrationSharp>2</armorPenetrationSharp>
-									<armorPenetrationBlunt>1.36</armorPenetrationBlunt>
-									<secondaryDamage>
-										<li>
-											<def>Bullet</def>
-											<amount>4</amount>
-											<chance>0.10</chance>
-										</li>
-									</secondaryDamage>
-								</projectile>
-							</ThingDef>
-
-							<ThingDef ParentName="Base41RimfireBullet">
-								<defName>Bullet_41RimfireHR_HP</defName>
-								<label>.41 Rimfire bullet (HP)</label>
-								<projectile Class="CombatExtended.ProjectilePropertiesCE">
-									<damageAmountBase>7</damageAmountBase>
-									<armorPenetrationSharp>1</armorPenetrationSharp>
-									<armorPenetrationBlunt>1.36</armorPenetrationBlunt>
-									<secondaryDamage>
-										<li>
-											<def>Bullet</def>
-											<amount>7</amount>
-											<chance>0.10</chance>
-										</li>
-									</secondaryDamage>
-								</projectile>
-							</ThingDef>
-
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationFindMod">
-					<mods>
-						<li>Vanilla Weapons Expanded - Coilguns</li>
-					</mods>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs</xpath>
-						<value>
-
-							<!-- ==================== AmmoSet ========================== -->
-
-							<CombatExtended.AmmoSetDef>
-								<defName>AmmoSet_GaussRevolver_HR</defName>
-								<label>6mm Railgun</label>
-								<ammoTypes>
-									<Ammo_6mmRailgun_Sabot>Bullet_GaussRevolver_HR</Ammo_6mmRailgun_Sabot>
-								</ammoTypes>
-							</CombatExtended.AmmoSetDef>
-
-							<CombatExtended.AmmoSetDef>
-								<defName>AmmoSet_GaussRepeater_HR</defName>
-								<label>6mm Railgun</label>
-								<ammoTypes>
-									<Ammo_6mmRailgun_Sabot>Bullet_GaussRepeater_HR</Ammo_6mmRailgun_Sabot>
-								</ammoTypes>
-							</CombatExtended.AmmoSetDef>
-
-							<!-- ==================== Ammo ========================== -->
-
-							<!-- ================== Projectiles ================== -->
-
-							<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="BaseLaserBullet">
-								<defName>Bullet_GaussRevolver_HR</defName>
-								<label>gauss revolver shot</label>
-								<projectile Class="CombatExtended.ProjectilePropertiesCE">
-									<isInstant>true</isInstant>
-									<damageFalloff>False</damageFalloff>
-									<damageDef>Bullet</damageDef>
-									<damageAmountBase>14</damageAmountBase>
-									<armorPenetrationSharp>22.2</armorPenetrationSharp>
-									<armorPenetrationBlunt>115.42</armorPenetrationBlunt>
-									<secondaryDamage>
-										<li>
-											<def>Bullet</def>
-											<amount>14</amount>
-											<chance>0.10</chance>
-										</li>
-									</secondaryDamage>
-								</projectile>
-							</ThingDef>
-
-							<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="BaseLaserBullet">
-								<defName>Bullet_GaussRepeater_HR</defName>
-								<label>gauss repeater shot</label>
-								<projectile Class="CombatExtended.ProjectilePropertiesCE">
-									<isInstant>true</isInstant>
-									<damageFalloff>False</damageFalloff>
-									<damageDef>Bullet</damageDef>
-									<damageAmountBase>16</damageAmountBase>
-									<armorPenetrationSharp>35.1</armorPenetrationSharp>
-									<armorPenetrationBlunt>190.8</armorPenetrationBlunt>
-									<secondaryDamage>
-										<li>
-											<def>Bullet</def>
-											<amount>16</amount>
-											<chance>0.10</chance>
-										</li>
-									</secondaryDamage>
-								</projectile>
-							</ThingDef>
-
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationFindMod">
-					<mods>
-						<li>Vanilla Weapons Expanded - Laser</li>
-					</mods>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs</xpath>
-						<value>
-
-							<!-- ==================== AmmoSet ========================== -->
-
-							<CombatExtended.AmmoSetDef>
-								<defName>AmmoSet_SalvagedLaserRevolver_HR</defName>
-								<label>laser charge</label>
-								<ammoTypes>
-									<Ammo_LaserChargePack>Bullet_Laser_SalvagedLaserRevolver_HR</Ammo_LaserChargePack>
-								</ammoTypes>
-							</CombatExtended.AmmoSetDef>
-
-							<CombatExtended.AmmoSetDef>
-								<defName>AmmoSet_SalvagedLaserRepeater_HR</defName>
-								<label>laser charge</label>
-								<ammoTypes>
-									<Ammo_LaserChargePack>Bullet_Laser_SalvagedLaserRepeater_HR</Ammo_LaserChargePack>
-								</ammoTypes>
-							</CombatExtended.AmmoSetDef>
-
-							<CombatExtended.AmmoSetDef>
-								<defName>AmmoSet_SalvagedLaserHuntingRifle_HR</defName>
-								<label>laser charge</label>
-								<ammoTypes>
-									<Ammo_LaserChargePack>Bullet_Laser_SalvagedLaserHuntingRifle_HR</Ammo_LaserChargePack>
-								</ammoTypes>
-							</CombatExtended.AmmoSetDef>
-
-							<!-- ==================== Ammo ========================== -->
-
-							<!-- ================== Projectiles ================== -->
-
-							<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletGreen">
-								<defName>Bullet_Laser_SalvagedLaserRevolver_HR</defName>
-								<label>laser beam</label>
-								<projectile Class="CombatExtended.ProjectilePropertiesCE">
-									<damageDef>CE_Laser</damageDef>
-									<damageAmountBase>12</damageAmountBase>
-									<armorPenetrationSharp>15.5</armorPenetrationSharp>
-									<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-									<secondaryDamage>
-										<li>
-											<def>Bullet</def>
-											<amount>12</amount>
-											<chance>0.10</chance>
-										</li>
-									</secondaryDamage>
-								</projectile>
-							</ThingDef>
-
-							<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletGreen">
-								<defName>Bullet_Laser_SalvagedLaserRepeater_HR</defName>
-								<label>laser beam</label>
-								<projectile Class="CombatExtended.ProjectilePropertiesCE">
-									<damageDef>CE_Laser</damageDef>
-									<damageAmountBase>20</damageAmountBase>
-									<armorPenetrationSharp>16.75</armorPenetrationSharp>
-									<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-									<secondaryDamage>
-										<li>
-											<def>Bullet</def>
-											<amount>20</amount>
-											<chance>0.10</chance>
-										</li>
-									</secondaryDamage>
-								</projectile>
-							</ThingDef>
-
-							<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletGreen">
-								<defName>Bullet_Laser_SalvagedLaserHuntingRifle_HR</defName>
-								<label>laser beam</label>
-								<projectile Class="CombatExtended.ProjectilePropertiesCE">
-									<damageDef>CE_Laser</damageDef>
-									<damageAmountBase>24</damageAmountBase>
-									<armorPenetrationSharp>18.75</armorPenetrationSharp>
-									<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-									<secondaryDamage>
-										<li>
-											<def>Bullet</def>
-											<amount>24</amount>
-											<chance>0.10</chance>
-										</li>
-									</secondaryDamage>
-								</projectile>
-							</ThingDef>
-
-						</value>
-					</match>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded - Frontier/Patch_HighRoller_Ammo.xml b/Patches/Vanilla Weapons Expanded - Frontier/Patch_HighRoller_Ammo.xml
deleted file mode 100644
index c75347ee5b..0000000000
--- a/Patches/Vanilla Weapons Expanded - Frontier/Patch_HighRoller_Ammo.xml	
+++ /dev/null
@@ -1,449 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded - Frontier</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_44MagnumHR</defName>
-					<label>.44 Magnum</label>
-					<ammoTypes>
-						<Ammo_44Magnum_FMJ>Bullet_44MagnumHR_FMJ</Ammo_44Magnum_FMJ>
-						<Ammo_44Magnum_AP>Bullet_44MagnumHR_AP</Ammo_44Magnum_AP>
-						<Ammo_44Magnum_HP>Bullet_44MagnumHR_HP</Ammo_44Magnum_HP>
-					</ammoTypes>
-					<similarTo>AmmoSet_PistolMagnum</similarTo>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef ParentName="Base44MagnumBullet">
-					<defName>Bullet_44MagnumHR_FMJ</defName>
-					<label>.44 Magnum bullet (FMJ)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>15</damageAmountBase>
-						<armorPenetrationSharp>6</armorPenetrationSharp>
-						<armorPenetrationBlunt>23.280</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Bullet</def>
-								<amount>15</amount>
-								<chance>0.10</chance>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base44MagnumBullet">
-					<defName>Bullet_44MagnumHR_AP</defName>
-					<label>.44 Magnum bullet (AP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>10</damageAmountBase>
-						<armorPenetrationSharp>12</armorPenetrationSharp>
-						<armorPenetrationBlunt>23.280</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Bullet</def>
-								<amount>10</amount>
-								<chance>0.10</chance>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base44MagnumBullet">
-					<defName>Bullet_44MagnumHR_HP</defName>
-					<label>.44 Magnum bullet (HP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>19</damageAmountBase>
-						<armorPenetrationSharp>3</armorPenetrationSharp>
-						<armorPenetrationBlunt>23.280</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Bullet</def>
-								<amount>19</amount>
-								<chance>0.10</chance>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_763x25mmMauserHR</defName>
-					<label>7.63x25mm Mauser</label>
-					<ammoTypes>
-						<Ammo_763x25mmMauser_FMJ>Bullet_763x25mmMauserHR_FMJ</Ammo_763x25mmMauser_FMJ>
-						<Ammo_763x25mmMauser_AP>Bullet_763x25mmMauserHR_AP</Ammo_763x25mmMauser_AP>
-						<Ammo_763x25mmMauser_HP>Bullet_763x25mmMauserHR_HP</Ammo_763x25mmMauser_HP>
-					</ammoTypes>
-					<similarTo>AmmoSet_Pistol</similarTo>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef ParentName="Base763x25mmMauserBullet">
-					<defName>Bullet_763x25mmMauserHR_FMJ</defName>
-					<label>7.63mm Mauser bullet (FMJ)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>10</damageAmountBase>
-						<armorPenetrationSharp>5</armorPenetrationSharp>
-						<armorPenetrationBlunt>10.9</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Bullet</def>
-								<amount>10</amount>
-								<chance>0.10</chance>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base763x25mmMauserBullet">
-					<defName>Bullet_763x25mmMauserHR_AP</defName>
-					<label>7.63mm Mauser bullet (AP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>7</damageAmountBase>
-						<armorPenetrationSharp>10</armorPenetrationSharp>
-						<armorPenetrationBlunt>10.9</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Bullet</def>
-								<amount>7</amount>
-								<chance>0.10</chance>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base763x25mmMauserBullet">
-					<defName>Bullet_763x25mmMauserHR_HP</defName>
-					<label>7.63mm Mauser bullet (HP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>13</damageAmountBase>
-						<armorPenetrationSharp>3</armorPenetrationSharp>
-						<armorPenetrationBlunt>10.9</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Bullet</def>
-								<amount>13</amount>
-								<chance>0.10</chance>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_4570GovHR</defName>
-					<label>.45-70 Government</label>
-					<ammoTypes>
-						<Ammo_4570Gov_FMJ>Bullet_4570GovHR_FMJ</Ammo_4570Gov_FMJ>
-						<Ammo_4570Gov_AP>Bullet_4570GovHR_AP</Ammo_4570Gov_AP>
-						<Ammo_4570Gov_HP>Bullet_4570GovHR_HP</Ammo_4570Gov_HP>
-						<Ammo_4570Gov_Incendiary>Bullet_4570GovHR_Incendiary</Ammo_4570Gov_Incendiary>
-						<Ammo_4570Gov_HE>Bullet_4570GovHR_HE</Ammo_4570Gov_HE>
-						<Ammo_4570Gov_Sabot>Bullet_4570GovHR_Sabot</Ammo_4570Gov_Sabot>
-					</ammoTypes>
-					<similarTo>AmmoSet_Rifle</similarTo>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef ParentName="Base4570GovBullet">
-					<defName>Bullet_4570GovHR_FMJ</defName>
-					<label>.45-70 Government cartridge (FMJ)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>20</damageAmountBase>
-						<armorPenetrationSharp>9</armorPenetrationSharp>
-						<armorPenetrationBlunt>47.32</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Bullet</def>
-								<amount>20</amount>
-								<chance>0.10</chance>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base4570GovBullet">
-					<defName>Bullet_4570GovHR_AP</defName>
-					<label>.45-70 Government cartridge (AP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>13</damageAmountBase>
-						<armorPenetrationSharp>18</armorPenetrationSharp>
-						<armorPenetrationBlunt>47.32</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Bullet</def>
-								<amount>13</amount>
-								<chance>0.10</chance>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base4570GovBullet">
-					<defName>Bullet_4570GovHR_HP</defName>
-					<label>.45-70 Government cartridge (HP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>25</damageAmountBase>
-						<armorPenetrationSharp>5</armorPenetrationSharp>
-						<armorPenetrationBlunt>47.32</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Bullet</def>
-								<amount>25</amount>
-								<chance>0.10</chance>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base4570GovBullet">
-					<defName>Bullet_4570GovHR_Incendiary</defName>
-					<label>.45-70 bullet (AP-I)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>13</damageAmountBase>
-						<armorPenetrationSharp>18</armorPenetrationSharp>
-						<armorPenetrationBlunt>47.32</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Flame_Secondary</def>
-								<amount>8</amount>
-							</li>
-							<li>
-								<def>Bullet</def>
-								<amount>13</amount>
-								<chance>0.10</chance>
-							</li>
-							<li>
-								<def>Flame_Secondary</def>
-								<amount>8</amount>
-								<chance>0.10</chance>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base4570GovBullet">
-					<defName>Bullet_4570GovHR_HE</defName>
-					<label>.45-70 bullet (HE)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>20</damageAmountBase>
-						<armorPenetrationSharp>9</armorPenetrationSharp>
-						<armorPenetrationBlunt>47.32</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Bomb_Secondary</def>
-								<amount>12</amount>
-							</li>
-							<li>
-								<def>Bullet</def>
-								<amount>20</amount>
-								<chance>0.10</chance>
-							</li>
-							<li>
-								<def>Bomb_Secondary</def>
-								<amount>12</amount>
-								<chance>0.10</chance>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base4570GovBullet">
-					<defName>Bullet_4570GovHR_Sabot</defName>
-					<label>.45-70 bullet (Sabot)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>11</damageAmountBase>
-						<armorPenetrationSharp>31.5</armorPenetrationSharp>
-						<armorPenetrationBlunt>60.68</armorPenetrationBlunt>
-						<speed>128</speed>
-						<secondaryDamage>
-							<li>
-								<def>Bullet</def>
-								<amount>11</amount>
-								<chance>0.10</chance>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_12GaugeHR</defName>
-					<label>12 Gauge</label>
-					<ammoTypes>
-						<Ammo_12Gauge_Buck>Bullet_12GaugeHR_Buck</Ammo_12Gauge_Buck>
-						<Ammo_12Gauge_Slug>Bullet_12GaugeHR_Slug</Ammo_12Gauge_Slug>
-						<Ammo_12Gauge_Beanbag>Bullet_12Gauge_Beanbag</Ammo_12Gauge_Beanbag>
-						<Ammo_12Gauge_ElectroSlug>Bullet_12GaugeHR_ElectroSlug</Ammo_12Gauge_ElectroSlug>
-					</ammoTypes>
-					<similarTo>AmmoSet_Shotgun</similarTo>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef ParentName="Base12GaugeBullet">
-					<defName>Bullet_12GaugeHR_Buck</defName>
-					<label>buckshot pellet</label>
-					<graphicData>
-						<texPath>Things/Projectile/Shotgun_Pellet</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>8</damageAmountBase>
-						<pelletCount>9</pelletCount>
-						<armorPenetrationSharp>4</armorPenetrationSharp>
-						<armorPenetrationBlunt>4.52</armorPenetrationBlunt>
-						<spreadMult>17.8</spreadMult>
-						<secondaryDamage>
-							<li>
-								<def>Bullet</def>
-								<amount>9</amount>
-								<chance>0.10</chance>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base12GaugeBullet">
-					<defName>Bullet_12GaugeHR_Slug</defName>
-					<label>shotgun slug</label>
-					<graphicData>
-						<texPath>Things/Projectile/Bullet_big</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>110</speed>
-						<damageAmountBase>28</damageAmountBase>
-						<armorPenetrationSharp>6</armorPenetrationSharp>
-						<armorPenetrationBlunt>85.2</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Bullet</def>
-								<amount>28</amount>
-								<chance>0.10</chance>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base12GaugeBullet">
-					<defName>Bullet_12GaugeHR_ElectroSlug</defName>
-					<label>EMP slug</label>
-					<graphicData>
-						<texPath>Things/Projectile/Bullet_big</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>30</speed>
-						<damageDef>EMP</damageDef>
-						<damageAmountBase>12</damageAmountBase>
-						<armorPenetrationSharp>0</armorPenetrationSharp>
-						<armorPenetrationBlunt>0</armorPenetrationBlunt>
-						<empShieldBreakChance>0.2</empShieldBreakChance>
-						<secondaryDamage>
-							<li>
-								<def>EMP</def>
-								<amount>12</amount>
-								<chance>0.10</chance>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_25ACPHR</defName>
-					<label>.25 ACP</label>
-					<ammoTypes>
-						<Ammo_25ACP_FMJ>Bullet_25ACPHR_FMJ</Ammo_25ACP_FMJ>
-						<Ammo_25ACP_AP>Bullet_25ACPHR_AP</Ammo_25ACP_AP>
-						<Ammo_25ACP_HP>Bullet_25ACPHR_HP</Ammo_25ACP_HP>
-					</ammoTypes>
-					<similarTo>AmmoSet_Pistol</similarTo>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef ParentName="Base25ACPBullet">
-					<defName>Bullet_25ACPHR_FMJ</defName>
-					<label>.25 ACP bullet (FMJ)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>5</damageAmountBase>
-						<armorPenetrationSharp>3</armorPenetrationSharp>
-						<armorPenetrationBlunt>1.58</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Bullet</def>
-								<amount>5</amount>
-								<chance>0.10</chance>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base25ACPBullet">
-					<defName>Bullet_25ACPHR_AP</defName>
-					<label>.25 ACP bullet (AP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>3</damageAmountBase>
-						<armorPenetrationSharp>6</armorPenetrationSharp>
-						<armorPenetrationBlunt>1.58</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Bullet</def>
-								<amount>3</amount>
-								<chance>0.10</chance>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef ParentName="Base25ACPBullet">
-					<defName>Bullet_25ACPHR_HP</defName>
-					<label>.25 ACP bullet (HP)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>6</damageAmountBase>
-						<armorPenetrationSharp>2</armorPenetrationSharp>
-						<armorPenetrationBlunt>1.58</armorPenetrationBlunt>
-						<secondaryDamage>
-							<li>
-								<def>Bullet</def>
-								<amount>6</amount>
-								<chance>0.10</chance>
-							</li>
-						</secondaryDamage>
-					</projectile>
-				</ThingDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier-Coilguns.xml b/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier-Coilguns.xml
deleted file mode 100644
index f2a9825bb8..0000000000
--- a/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier-Coilguns.xml	
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded - Frontier</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Weapons Expanded - Coilguns</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<!-- === Tools === -->
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VWEFT_Gun_GaussRevolver"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>grip</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>2</power>
-									<cooldownTime>1.54</cooldownTime>
-									<chanceFactor>1.5</chanceFactor>
-									<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>muzzle</label>
-									<capacities>
-										<li>Poke</li>
-									</capacities>
-									<power>2</power>
-									<cooldownTime>1.54</cooldownTime>
-									<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VWEFT_Gun_GaussRepeater"]/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>
-					</li>
-
-					<!-- === Gauss Revolver === -->
-					<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-						<defName>VWEFT_Gun_GaussRevolver</defName>
-						<statBases>
-							<Mass>1.45</Mass>
-							<Bulk>2.50</Bulk>
-							<SwayFactor>1.32</SwayFactor>
-							<ShotSpread>0.17</ShotSpread>
-							<SightsEfficiency>0.70</SightsEfficiency>
-							<RangedWeapon_Cooldown>0.51</RangedWeapon_Cooldown>
-						</statBases>
-						<Properties>
-							<recoilAmount>3.0</recoilAmount>
-							<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-							<hasStandardCommand>True</hasStandardCommand>
-							<defaultProjectile>Bullet_CoilGun_Magnum</defaultProjectile>
-							<warmupTime>0.8</warmupTime>
-							<range>15</range>
-							<soundCast>VWE_Shot_GaussMagnum</soundCast>
-							<soundCastTail>GunTail_Light</soundCastTail>
-							<muzzleFlashScale>9</muzzleFlashScale>
-						</Properties>
-						<AmmoUser>
-							<magazineSize>6</magazineSize>
-							<reloadOneAtATime>true</reloadOneAtATime>
-							<reloadTime>0.95</reloadTime>
-							<ammoSet>AmmoSet_GaussRevolver_HR</ammoSet>
-						</AmmoUser>
-						<FireModes>
-							<aiAimMode>AimedShot</aiAimMode>
-						</FireModes>
-						<weaponTags>
-							<li>FrontierCoilguns</li>
-						</weaponTags>
-					</li>
-
-					<!-- === Gauss Repeater === -->
-					<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-						<defName>VWEFT_Gun_GaussRepeater</defName>
-						<statBases>
-							<Mass>4.3</Mass>
-							<Bulk>10.0</Bulk>
-							<SwayFactor>1.30</SwayFactor>
-							<ShotSpread>0.07</ShotSpread>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<RangedWeapon_Cooldown>0.77</RangedWeapon_Cooldown>
-						</statBases>
-						<Properties>
-							<recoilAmount>2.0</recoilAmount>
-							<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-							<hasStandardCommand>True</hasStandardCommand>
-							<defaultProjectile>Bullet_CoilGun_Rifle</defaultProjectile>
-							<warmupTime>1.1</warmupTime>
-							<range>48</range>
-							<soundCast>VWE_Shot_GaussRifle</soundCast>
-							<soundCastTail>GunTail_Medium</soundCastTail>
-							<muzzleFlashScale>9</muzzleFlashScale>
-						</Properties>
-						<AmmoUser>
-							<magazineSize>12</magazineSize>
-							<reloadOneAtATime>true</reloadOneAtATime>
-							<reloadTime>1</reloadTime>
-							<ammoSet>AmmoSet_GaussRepeater_HR</ammoSet>
-						</AmmoUser>
-						<FireModes>
-							<aiAimMode>AimedShot</aiAimMode>
-							<aiUseBurstMode>True</aiUseBurstMode>
-						</FireModes>
-						<weaponTags>
-							<li>FrontierCoilguns</li>
-						</weaponTags>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier-HeavyWeapons.xml b/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier-HeavyWeapons.xml
deleted file mode 100644
index dcb727fdd2..0000000000
--- a/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier-HeavyWeapons.xml	
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded - Frontier</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Weapons Expanded - Heavy Weapons</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<!-- === Tools === -->
-
-					<li Class="PatchOperationReplace">
-						<xpath>
-							Defs/ThingDef[defName = "VWEFT_Gun_HandheldGatlingGun"]/tools
-						</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>barrels</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>10</power>
-									<cooldownTime>2.44</cooldownTime>
-									<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<!-- === Handheld Gatling Gun === -->
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName = "VWEFT_Gun_HandheldGatlingGun"]/costList/ComponentIndustrial</xpath>
-						<value>
-							<ComponentIndustrial>14</ComponentIndustrial>
-						</value>
-					</li>
-
-					<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-						<defName>VWEFT_Gun_HandheldGatlingGun</defName>
-						<statBases>
-							<Mass>77</Mass>
-							<Bulk>22</Bulk>
-							<SwayFactor>8.78</SwayFactor>
-							<ShotSpread>0.01</ShotSpread>
-							<SightsEfficiency>0.60</SightsEfficiency>
-							<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						</statBases>
-						<Properties>
-							<recoilAmount>0.66</recoilAmount>
-							<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-							<hasStandardCommand>True</hasStandardCommand>
-							<defaultProjectile>Bullet_4570GovHR_FMJ</defaultProjectile>
-							<burstShotCount>10</burstShotCount>
-							<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
-							<warmupTime>2.1</warmupTime>
-							<range>46</range>
-							<minRange>2</minRange>
-							<soundCast>Shot_Minigun</soundCast>
-							<soundCastTail>GunTail_Medium</soundCastTail>
-							<muzzleFlashScale>12</muzzleFlashScale>
-						</Properties>
-						<AmmoUser>
-							<magazineSize>40</magazineSize>
-							<reloadTime>7.8</reloadTime>
-							<ammoSet>AmmoSet_4570GovHR</ammoSet>
-						</AmmoUser>
-						<FireModes>
-							<aiAimMode>SuppressFire</aiAimMode>
-							<aiUseBurstMode>True</aiUseBurstMode>
-							<aimedBurstShotCount>5</aimedBurstShotCount>
-							<noSingleShot>true</noSingleShot>
-						</FireModes>
-						<AllowWithRunAndGun>false</AllowWithRunAndGun>
-					</li>
-
-					<li Class="PatchOperationAddModExtension">
-						<xpath>Defs/ThingDef[defName = "VWEFT_Gun_HandheldGatlingGun"]</xpath>
-						<value>
-							<li Class="CombatExtended.GunDrawExtension">
-								<DrawSize>1.3,1.3</DrawSize>
-								<DrawOffset>0.10,-0.22</DrawOffset>
-							</li>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier-Laser.xml b/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier-Laser.xml
deleted file mode 100644
index 1998bf09a5..0000000000
--- a/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier-Laser.xml	
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded - Frontier</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Weapons Expanded - Laser</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<!-- === Tools === -->
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VWEFT_Gun_SalvagedLaserRevolver"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>grip</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>2</power>
-									<cooldownTime>1.54</cooldownTime>
-									<chanceFactor>1.5</chanceFactor>
-									<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>muzzle</label>
-									<capacities>
-										<li>Poke</li>
-									</capacities>
-									<power>2</power>
-									<cooldownTime>1.54</cooldownTime>
-									<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VWEFT_Gun_SalvagedLaserRepeater" or defName="VWEFT_Gun_SalvagedLaserHuntingRifle"]/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>
-					</li>
-
-					<!-- === Remove VWE Overheating Gizmo === -->
-
-					<li Class="PatchOperationRemove">
-						<xpath>Defs/ThingDef[
-							defName = "VWEFT_Gun_SalvagedLaserRevolver" or
-							defName = "VWEFT_Gun_SalvagedLaserRepeater" or
-							defName = "VWEFT_Gun_SalvagedLaserHuntingRifle"
-							]/comps/li[@Class="VanillaWeaponsExpandedLaser.CompProperties_LaserCapacitor"] </xpath>
-					</li>
-
-					<!-- === Salvaged Laser Revolver === -->
-
-					<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-						<defName>VWEFT_Gun_SalvagedLaserRevolver</defName>
-						<statBases>
-							<Mass>1.40</Mass>
-							<Bulk>2.60</Bulk>
-							<SwayFactor>1.33</SwayFactor>
-							<ShotSpread>0.07</ShotSpread>
-							<SightsEfficiency>0.7</SightsEfficiency>
-							<RangedWeapon_Cooldown>0.65</RangedWeapon_Cooldown>
-						</statBases>
-						<Properties>
-							<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-							<hasStandardCommand>True</hasStandardCommand>
-							<defaultProjectile>Bullet_Laser_SalvagedLaserRevolver_HR</defaultProjectile>
-							<warmupTime>0.6</warmupTime>
-							<range>16</range>
-							<soundCast>VWE_UnstableLaserShot_Light</soundCast>
-							<soundCastTail>GunTail_Heavy</soundCastTail>
-							<muzzleFlashScale>9</muzzleFlashScale>
-						</Properties>
-						<AmmoUser>
-							<magazineSize>16</magazineSize>
-							<reloadTime>4</reloadTime>
-							<ammoSet>AmmoSet_SalvagedLaserRevolver_HR</ammoSet>
-						</AmmoUser>
-						<FireModes>
-							<aiAimMode>AimedShot</aiAimMode>
-						</FireModes>
-						<weaponTags>
-							<li>SalvagedLaserGun</li>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</li>
-
-					<!-- === Salvaged Laser Repeater === -->
-
-					<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-						<defName>VWEFT_Gun_SalvagedLaserRepeater</defName>
-						<statBases>
-							<Mass>3.60</Mass>
-							<Bulk>10.10</Bulk>
-							<SwayFactor>1.37</SwayFactor>
-							<ShotSpread>0.08</ShotSpread>
-							<SightsEfficiency>1.00</SightsEfficiency>
-							<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
-						</statBases>
-						<Properties>
-							<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-							<hasStandardCommand>True</hasStandardCommand>
-							<defaultProjectile>Bullet_Laser_SalvagedLaserRepeater_HR</defaultProjectile>
-							<warmupTime>1</warmupTime>
-							<range>62</range>
-							<soundCast>VWE_UnstableLaserShot_Rifle</soundCast>
-							<soundCastTail>GunTail_Heavy</soundCastTail>
-							<muzzleFlashScale>9</muzzleFlashScale>
-						</Properties>
-						<AmmoUser>
-							<magazineSize>20</magazineSize>
-							<reloadTime>4</reloadTime>
-							<ammoSet>AmmoSet_SalvagedLaserRepeater_HR</ammoSet>
-						</AmmoUser>
-						<FireModes>
-							<aiAimMode>AimedShot</aiAimMode>
-							<aiUseBurstMode>True</aiUseBurstMode>
-						</FireModes>
-						<weaponTags>
-							<li>SalvagedLaserGun</li>
-						</weaponTags>
-					</li>
-
-					<!-- === Salvaged Laser Hunting Rifle === -->
-
-					<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-						<defName>VWEFT_Gun_SalvagedLaserHuntingRifle</defName>
-						<statBases>
-							<Mass>4.45</Mass>
-							<Bulk>13.50</Bulk>
-							<SwayFactor>1.35</SwayFactor>
-							<ShotSpread>0.03</ShotSpread>
-							<SightsEfficiency>1.86</SightsEfficiency>
-							<RangedWeapon_Cooldown>0.78</RangedWeapon_Cooldown>
-						</statBases>
-						<Properties>
-							<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-							<hasStandardCommand>True</hasStandardCommand>
-							<defaultProjectile>Bullet_Laser_SalvagedLaserHuntingRifle_HR</defaultProjectile>
-							<warmupTime>1.85</warmupTime>
-							<range>76</range>
-							<soundCast>VWE_LaserShot_Heavy</soundCast>
-							<soundCastTail>GunTail_Heavy</soundCastTail>
-							<muzzleFlashScale>9</muzzleFlashScale>
-						</Properties>
-						<AmmoUser>
-							<magazineSize>12</magazineSize>
-							<reloadTime>4</reloadTime>
-							<ammoSet>AmmoSet_SalvagedLaserHuntingRifle_HR</ammoSet>
-						</AmmoUser>
-						<FireModes>
-							<aiAimMode>AimedShot</aiAimMode>
-						</FireModes>
-						<weaponTags>
-							<li>SalvagedLaserGun</li>
-						</weaponTags>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier-Quickdraw.xml b/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier-Quickdraw.xml
deleted file mode 100644
index ee7a0bf9dd..0000000000
--- a/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier-Quickdraw.xml	
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded - Frontier</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Weapons Expanded - Quickdraw</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<!-- ========== Melee Tools ========== -->
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VWEFT_Gun_Derringer"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>grip</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>2</power>
-									<cooldownTime>1.54</cooldownTime>
-									<chanceFactor>1.5</chanceFactor>
-									<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>muzzle</label>
-									<capacities>
-										<li>Poke</li>
-									</capacities>
-									<power>2</power>
-									<cooldownTime>1.54</cooldownTime>
-									<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-									<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VWEFT_Gun_LeverActionShotgun"]/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>
-					</li>
-
-					<!-- Derringer -->
-					<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-						<defName>VWEFT_Gun_Derringer</defName>
-						<statBases>
-							<Mass>0.31</Mass>
-							<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
-							<SightsEfficiency>0.70</SightsEfficiency>
-							<ShotSpread>0.19</ShotSpread>
-							<SwayFactor>0.51</SwayFactor>
-							<Bulk>1.23</Bulk>
-						</statBases>
-						<Properties>
-							<recoilAmount>2.0</recoilAmount>
-							<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-							<hasStandardCommand>true</hasStandardCommand>
-							<defaultProjectile>Bullet_41RimfireHR_FMJ</defaultProjectile>
-							<warmupTime>0.4</warmupTime>
-							<range>8</range>
-							<soundCast>Shot_Revolver</soundCast>
-							<soundCastTail>GunTail_Light</soundCastTail>
-							<muzzleFlashScale>9</muzzleFlashScale>
-						</Properties>
-						<AmmoUser>
-							<magazineSize>2</magazineSize>
-							<reloadTime>1</reloadTime>
-							<ammoSet>AmmoSet_41RimfireHR</ammoSet>
-							<reloadOneAtATime>true</reloadOneAtATime>
-						</AmmoUser>
-						<FireModes>
-							<aiUseBurstMode>FALSE</aiUseBurstMode>
-							<aiAimMode>Snapshot</aiAimMode>
-							<noSnapshot>false</noSnapshot>
-							<noSingleShot>false</noSingleShot>
-						</FireModes>
-						<weaponTags>
-							<li>CE_AI_Pistol</li>
-							<li>CE_OneHandedWeapon</li>
-							<li>FrontierGunSimple</li>
-						</weaponTags>
-					</li>
-
-					<!-- ========== Lever Action Shotgun ========== -->
-					<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-						<defName>VWEFT_Gun_LeverActionShotgun</defName>
-						<statBases>
-							<Mass>3.60</Mass>
-							<RangedWeapon_Cooldown>0.79</RangedWeapon_Cooldown>
-							<SightsEfficiency>1</SightsEfficiency>
-							<ShotSpread>0.11</ShotSpread>
-							<SwayFactor>1.36</SwayFactor>
-							<Bulk>9.97</Bulk>
-						</statBases>
-						<Properties>
-							<recoilAmount>2.0</recoilAmount>
-							<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-							<hasStandardCommand>true</hasStandardCommand>
-							<defaultProjectile>Bullet_12GaugeHR_Buck</defaultProjectile>
-							<warmupTime>0.6</warmupTime>
-							<range>16</range>
-							<soundCast>Shot_Shotgun</soundCast>
-							<soundCastTail>GunTail_Heavy</soundCastTail>
-							<muzzleFlashScale>9</muzzleFlashScale>
-						</Properties>
-						<AmmoUser>
-							<magazineSize>5</magazineSize>
-							<reloadTime>0.85</reloadTime>
-							<ammoSet>AmmoSet_12GaugeHR</ammoSet>
-							<reloadOneAtATime>true</reloadOneAtATime>
-						</AmmoUser>
-						<FireModes>
-							<aiUseBurstMode>FALSE</aiUseBurstMode>
-							<aiAimMode>Snapshot</aiAimMode>
-						</FireModes>
-						<weaponTags>
-							<li>FrontierGunAdvanced</li>
-						</weaponTags>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier.xml b/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier.xml
deleted file mode 100644
index 4e906837ef..0000000000
--- a/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier.xml	
+++ /dev/null
@@ -1,297 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded - Frontier</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Melee Tools ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="VWEFT_Gun_HeavyRevolver" or
-						defName="VWEFT_Gun_VolcanicPistol" or
-						defName="VWEFT_Gun_FrontierPistol"
-						]/tools </xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWEFT_Gun_RollingBlockRifle" or defName="VWEFT_Gun_RepeatingShotgun"]/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>
-				</li>
-
-				<!-- Crafting Recipes -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="VWEFT_Gun_HeavyRevolver" or
-						defName="VWEFT_Gun_VolcanicPistol" or
-						defName="VWEFT_Gun_FrontierPistol"
-						]/costList/ComponentIndustrial </xpath>
-					<value>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VWEFT_Gun_RepeatingShotgun"]/costList/ComponentIndustrial</xpath>
-					<value>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</value>
-				</li>
-
-				<!-- Heavy Revolver -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWEFT_Gun_HeavyRevolver</defName>
-					<statBases>
-						<Mass>1.90</Mass>
-						<RangedWeapon_Cooldown>0.88</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.15</ShotSpread>
-						<SwayFactor>1.88</SwayFactor>
-						<Bulk>3.75</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_44MagnumHR_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Revolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>5.1</reloadTime>
-						<ammoSet>AmmoSet_44MagnumHR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<noSnapshot>false</noSnapshot>
-						<noSingleShot>false</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>FrontierGunAdvanced</li>
-					</weaponTags>
-				</li>
-
-				<!-- Volcanic Pistol -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWEFT_Gun_VolcanicPistol</defName>
-					<statBases>
-						<Mass>1.31</Mass>
-						<RangedWeapon_Cooldown>0.75</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.70</SwayFactor>
-						<Bulk>3.80</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_25ACPHR_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Revolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_25ACPHR</ammoSet>
-						<reloadOneAtATime>true</reloadOneAtATime>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<noSnapshot>false</noSnapshot>
-						<noSingleShot>false</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>FrontierGunSimple</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Frontier Pistol ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWEFT_Gun_FrontierPistol</defName>
-					<statBases>
-						<Mass>1.13</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.16</ShotSpread>
-						<SwayFactor>1.42</SwayFactor>
-						<Bulk>3.12</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_763x25mmMauserHR_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_763x25mmMauserHR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-						<li>SimpleGun</li>
-						<li>FrontierGunSimple</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Rolling Block Rifle ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWEFT_Gun_RollingBlockRifle</defName>
-					<statBases>
-						<Mass>7.30</Mass>
-						<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.15</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.73</SwayFactor>
-						<Bulk>12.80</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_4570GovHR_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>64</range>
-						<soundCast>Shot_SniperRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>7</AmmoGenPerMagOverride>
-						<reloadTime>2.2</reloadTime>
-						<ammoSet>AmmoSet_4570GovHR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>FrontierGunAdvanced</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Repeating Shotgun ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWEFT_Gun_RepeatingShotgun</defName>
-					<statBases>
-						<Mass>3.60</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>1.36</SwayFactor>
-						<Bulk>9.97</Bulk>
-						<SightsEfficiency>1</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<recoilAmount>3.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12GaugeHR_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>Shot_Shotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_12GaugeHR</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded - Grenades/Apparel_Packs-NonLethal.xml b/Patches/Vanilla Weapons Expanded - Grenades/Apparel_Packs-NonLethal.xml
deleted file mode 100644
index 45f64aadb7..0000000000
--- a/Patches/Vanilla Weapons Expanded - Grenades/Apparel_Packs-NonLethal.xml	
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded - Grenades</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Vanilla Weapons Expanded - Non-Lethal</li>
-			</mods>
-
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<!-- Tear Gas Grenade Belt -->
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VWE_Apparel_GrenadeTearGasBelt"]/costList</xpath>
-						<value>
-							<costList>
-								<VWE_TearGasGrenade>5</VWE_TearGasGrenade>
-							</costList>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VWE_Apparel_GrenadeTearGasBelt"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountToRefill</xpath>
-						<value>
-							<ammoCountPerCharge>1</ammoCountPerCharge>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="VWE_Apparel_GrenadeTearGasBelt"]/verbs</xpath>
-						<value>
-							<verbs>
-								<li Class="CombatExtended.VerbPropertiesCE">
-									<label>throw tear gas</label>
-									<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
-									<hasStandardCommand>true</hasStandardCommand>
-									<onlyManualCast>True</onlyManualCast>
-									<warmupTime>0.8</warmupTime>
-									<range>10</range>
-									<minRange>3</minRange>
-									<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-									<soundCast>ThrowGrenade</soundCast>
-									<soundCastTail>GunTail_Medium</soundCastTail>
-									<muzzleFlashScale>0</muzzleFlashScale>
-									<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
-									<targetParams>
-										<canTargetLocations>true</canTargetLocations>
-									</targetParams>
-									<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-									<defaultProjectile>VWENL_Projectile_TearGasGrenade</defaultProjectile>
-									<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
-								</li>
-							</verbs>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded - Grenades/Apparel_Packs.xml b/Patches/Vanilla Weapons Expanded - Grenades/Apparel_Packs.xml
deleted file mode 100644
index 2d0c901c77..0000000000
--- a/Patches/Vanilla Weapons Expanded - Grenades/Apparel_Packs.xml	
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded - Grenades</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Frag Grenade Belt -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_Apparel_GrenadeFragBelt"]/costList</xpath>
-					<value>
-						<costList>
-							<Weapon_GrenadeFrag>5</Weapon_GrenadeFrag>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_Apparel_GrenadeFragBelt"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountToRefill</xpath>
-					<value>
-						<ammoCountPerCharge>1</ammoCountPerCharge>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_Apparel_GrenadeFragBelt"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<label>throw frag grenade</label>
-								<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<onlyManualCast>True</onlyManualCast>
-								<warmupTime>0.8</warmupTime>
-								<range>10</range>
-								<minRange>3</minRange>
-								<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-								<soundCast>ThrowGrenade</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-								<defaultProjectile>Proj_GrenadeFrag</defaultProjectile>
-								<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- Molotov Belt -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_Apparel_GrenadeMolotovBelt"]/costList</xpath>
-					<value>
-						<costList>
-							<Weapon_GrenadeMolotov>5</Weapon_GrenadeMolotov>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_Apparel_GrenadeMolotovBelt"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountToRefill</xpath>
-					<value>
-						<ammoCountPerCharge>1</ammoCountPerCharge>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_Apparel_GrenadeMolotovBelt"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<label>throw molotov</label>
-								<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<onlyManualCast>True</onlyManualCast>
-								<warmupTime>0.8</warmupTime>
-								<range>10</range>
-								<minRange>3</minRange>
-								<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-								<soundCast>ThrowMolotovCocktail</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>10</muzzleFlashScale>
-								<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-								<defaultProjectile>Proj_GrenadeMolotov</defaultProjectile>
-								<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- EMP Grenade Belt -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_Apparel_GrenadeEMPBelt"]/costList</xpath>
-					<value>
-						<costList>
-							<Weapon_GrenadeEMP>5</Weapon_GrenadeEMP>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_Apparel_GrenadeEMPBelt"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountToRefill</xpath>
-					<value>
-						<ammoCountPerCharge>1</ammoCountPerCharge>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_Apparel_GrenadeEMPBelt"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<label>throw EMP grenade</label>
-								<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<onlyManualCast>True</onlyManualCast>
-								<warmupTime>0.8</warmupTime>
-								<range>10</range>
-								<minRange>3</minRange>
-								<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-								<soundCast>ThrowGrenade</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>0</muzzleFlashScale>
-								<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-								<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-								<defaultProjectile>Proj_GrenadeEMP</defaultProjectile>
-								<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded - Heavy Weapons/Ammo/M73.xml b/Patches/Vanilla Weapons Expanded - Heavy Weapons/Ammo/M73.xml
deleted file mode 100644
index 496f04a159..0000000000
--- a/Patches/Vanilla Weapons Expanded - Heavy Weapons/Ammo/M73.xml	
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded - Heavy Weapons</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<ThingCategoryDef>
-					<defName>AmmoM73Rockets</defName>
-					<label>M73 Rockets</label>
-					<parent>AmmoRockets</parent>
-					<iconPath>UI/Icons/ThingCategories/CaliberRocket</iconPath>
-				</ThingCategoryDef>
-
-				<!-- === AmmoSet === -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_M73</defName>
-					<label>M73 Rockets</label>
-					<ammoTypes>
-						<Ammo_M73_HE>Bullet_M73_HE</Ammo_M73_HE>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- === Ammo === -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="MediumAmmoBase">
-					<defName>Ammo_M73_HE</defName>
-					<label>M73 Rocket (HE)</label>
-					<description>66mm high explosive rocket based upon the rocket used in the M72 LAW, used by the Swarm Missile Launcher.</description>
-					<graphicData>
-						<texPath>Things/Ammo/Rocket/M74</texPath>
-						<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-					</graphicData>
-					<statBases>
-						<MaxHitPoints>150</MaxHitPoints>
-						<MarketValue>45.19</MarketValue>
-						<Mass>1.71</Mass>
-						<Bulk>5.08</Bulk>
-					</statBases>
-					<tradeTags>
-						<li>CE_AutoEnableTrade</li>
-						<li>CE_AutoEnableCrafting</li>
-					</tradeTags>
-					<thingCategories>
-						<li>AmmoM73Rockets</li>
-					</thingCategories>
-					<stackLimit>25</stackLimit>
-					<ammoClass>GrenadeHE</ammoClass>
-					<cookOffFlashScale>40</cookOffFlashScale>
-					<cookOffSound>MortarBomb_Explode</cookOffSound>
-				</ThingDef>
-
-				<!-- === Projectile === -->
-				<ThingDef ParentName="BaseExplosiveBullet">
-					<defName>Bullet_M73_HE</defName>
-					<label>M73 Rocket (HE)</label>
-					<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					<graphicData>
-						<texPath>Things/Projectile/Rocket/M74</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
-						<shaderType>TransparentPostLight</shaderType>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>42</speed>
-						<damageDef>Bomb</damageDef>
-						<damageAmountBase>124</damageAmountBase>
-						<explosionRadius>4</explosionRadius>
-						<soundExplode>MortarBomb_Explode</soundExplode>
-						<soundAmbient>RocketPropelledLoop_Small</soundAmbient>
-						<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_Fragments">
-							<fragments>
-								<Fragment_Large>6</Fragment_Large>
-								<Fragment_Small>30</Fragment_Small>
-							</fragments>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<!-- === Recipes === -->
-				<RecipeDef ParentName="AdvancedAmmoRecipeBase">
-					<defName>MakeAmmo_M73_HE</defName>
-					<label>make M73 HE rockets x5</label>
-					<description>Craft 5 M73 HE rockets.</description>
-					<jobString>Making M73 HE rockets.</jobString>
-					<workAmount>5200</workAmount>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>16</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>FSX</li>
-								</thingDefs>
-							</filter>
-							<count>3</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>4</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Steel</li>
-							<li>FSX</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_M73_HE>4</Ammo_M73_HE>
-					</products>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded - Heavy Weapons/Apparel_Packs.xml b/Patches/Vanilla Weapons Expanded - Heavy Weapons/Apparel_Packs.xml
deleted file mode 100644
index a1de99925c..0000000000
--- a/Patches/Vanilla Weapons Expanded - Heavy Weapons/Apparel_Packs.xml	
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded - Heavy Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_Apparel_Exoframe"]/statBases</xpath>
-					<value>
-						<Bulk>35</Bulk>
-						<WornBulk>12</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_Apparel_Exoframe"]/equippedStatOffsets/CarryingCapacity</xpath>
-					<value>
-						<CarryWeight>55</CarryWeight>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded - Heavy Weapons/RangedIndustrialHeavy.xml b/Patches/Vanilla Weapons Expanded - Heavy Weapons/RangedIndustrialHeavy.xml
deleted file mode 100644
index 83c4a487ce..0000000000
--- a/Patches/Vanilla Weapons Expanded - Heavy Weapons/RangedIndustrialHeavy.xml	
+++ /dev/null
@@ -1,335 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded - Heavy Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === verbClass === -->
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "VWE_Gun_Autocannon" or
-						defName = "VWE_Gun_HandheldMortar" or
-						defName = "VWE_Gun_HeavyFlamer" or
-						defName = "VWE_Gun_SwarmMissileLauncher" or
-						defName = "VWE_Gun_UraniumSlugRifle"
-						]/verbs/li/verbClass
-					</xpath>
-					<value>
-						<verbClass>Verb_Shoot</verbClass>
-					</value>
-				</li>
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "VWE_Gun_Autocannon" or
-						defName = "VWE_Gun_HandheldMortar" or
-						defName = "VWE_Gun_HeavyFlamer" or
-						defName = "VWE_Gun_SwarmMissileLauncher" or
-						defName = "VWE_Gun_UraniumSlugRifle"
-						]/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>
-				</li>
-
-				<!-- === Autocannon === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_Autocannon</defName>
-					<statBases>
-						<Mass>55</Mass>
-						<Bulk>22</Bulk>
-						<SwayFactor>8.80</SwayFactor>
-						<ShotSpread>0.01</ShotSpread>
-						<SightsEfficiency>0.66</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.72</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_20x102mmNATO_AP</defaultProjectile>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-						<warmupTime>1</warmupTime>
-						<range>56</range>
-						<minRange>2</minRange>
-						<soundCast>Shot_Autocannon</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>6.5</reloadTime>
-						<ammoSet>AmmoSet_20x102mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VWE_Gun_Autocannon"]/recipeMaker/researchPrerequisite</xpath>
-					<value>
-						<researchPrerequisite>CE_TurretHeavyWeapons</researchPrerequisite>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName = "VWE_Gun_Autocannon"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.3,1.3</DrawSize>
-							<DrawOffset>0.10,-0.22</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Handheld Mortar === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_HandheldMortar</defName>
-					<statBases>
-						<Bulk>20</Bulk>
-						<SwayFactor>1.24</SwayFactor>
-						<ShotSpread>0.10</ShotSpread>
-						<SightsEfficiency>0.5</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>5.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootMortarCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_60mmMortarShell_HE</defaultProjectile>
-						<warmupTime>3.5</warmupTime>
-						<range>126</range>
-						<minRange>16</minRange>
-						<soundCast>Mortar_LaunchA</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>16</muzzleFlashScale>
-						<circularError>1.1</circularError>
-						<indirectFirePenalty>0.3</indirectFirePenalty>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>5.2</reloadTime>
-						<ammoSet>AmmoSet_60mmMortarShell</ammoSet>
-					</AmmoUser>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_Gun_HandheldMortar"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_Charges">
-							<chargeSpeeds>
-								<li>30</li>
-								<li>50</li>
-								<li>70</li>
-								<li>90</li>
-							</chargeSpeeds>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VWE_Gun_HandheldMortar"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.3,1.3</DrawSize>
-							<DrawOffset>0.10,-0.20</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Slug Rifle === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_UraniumSlugRifle</defName>
-					<statBases>
-						<Mass>60</Mass>
-						<Bulk>22.5</Bulk>
-						<SwayFactor>9.85</SwayFactor>
-						<ShotSpread>0.01</ShotSpread>
-						<SightsEfficiency>2.20</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.40</RangedWeapon_Cooldown>
-						<NightVisionEfficiency_Weapon>0.4</NightVisionEfficiency_Weapon>
-					</statBases>
-					<Properties>
-						<recoilAmount>3.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_30x173mmNATO_AP</defaultProjectile>
-						<warmupTime>4.6</warmupTime>
-						<range>86</range>
-						<minRange>9</minRange>
-						<soundCast>Shot_TurretSniper</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>6.6</reloadTime>
-						<ammoSet>AmmoSet_30x173mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VWE_Gun_UraniumSlugRifle"]/recipeMaker/researchPrerequisite</xpath>
-					<value>
-						<researchPrerequisite>CE_TurretHeavyWeapons</researchPrerequisite>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VWE_Gun_UraniumSlugRifle"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.4,1.4</DrawSize>
-							<DrawOffset>0.15,-0.22</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Heavy Flamer === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_HeavyFlamer</defName>
-					<statBases>
-						<Bulk>18</Bulk>
-						<SwayFactor>7.10</SwayFactor>
-						<ShotSpread>0.5</ShotSpread>
-						<SightsEfficiency>0.60</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<recoilAmount>0.85</recoilAmount>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Flamethrower_Prometheum</defaultProjectile>
-						<burstShotCount>40</burstShotCount>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<warmupTime>1</warmupTime>
-						<range>26</range>
-						<minRange>3</minRange>
-						<soundCast>HissFlamethrower</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>200</magazineSize>
-						<reloadTime>5.6</reloadTime>
-						<ammoSet>AmmoSet_Flamethrower</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>20</aimedBurstShotCount>
-						<noSingleShot>True</noSingleShot>
-					</FireModes>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VWE_Gun_HeavyFlamer"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.3,1.3</DrawSize>
-							<DrawOffset>0.10,-0.20</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<!-- === Missile Launcher === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_SwarmMissileLauncher</defName>
-					<statBases>
-						<Mass>40</Mass>
-						<Bulk>22</Bulk>
-						<SwayFactor>3.54</SwayFactor>
-						<ShotSpread>0.10</ShotSpread>
-						<SightsEfficiency>0.66</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.40</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.72</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_M73_HE</defaultProjectile>
-						<burstShotCount>8</burstShotCount>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<warmupTime>3.5</warmupTime>
-						<range>68</range>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>2</reloadTime>
-						<ammoSet>AmmoSet_M73</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>4</aimedBurstShotCount>
-					</FireModes>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VWE_Gun_SwarmMissileLauncher"]/recipeMaker/researchPrerequisite</xpath>
-					<value>
-						<researchPrerequisite>CE_AdvancedLaunchers</researchPrerequisite>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="VWE_Gun_SwarmMissileLauncher"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.3,1.3</DrawSize>
-							<DrawOffset>0.10,-0.20</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded - Laser/Ammo.xml b/Patches/Vanilla Weapons Expanded - Laser/Ammo.xml
deleted file mode 100644
index dbe4fb3953..0000000000
--- a/Patches/Vanilla Weapons Expanded - Laser/Ammo.xml	
+++ /dev/null
@@ -1,279 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded - Laser</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- === Ammo Sets === -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_SalvagedLaserPistol</defName>
-							<label>laser charge</label>
-							<ammoTypes>
-								<Ammo_LaserChargePack>Bullet_Laser_SalvagedLaserPistol</Ammo_LaserChargePack>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_LaserPistol</defName>
-							<label>laser charge</label>
-							<ammoTypes>
-								<Ammo_LaserChargePack>Bullet_Laser_LaserPistol</Ammo_LaserChargePack>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_LaserSMG</defName>
-							<label>laser charge</label>
-							<ammoTypes>
-								<Ammo_LaserChargePack>Bullet_Laser_LaserSMG</Ammo_LaserChargePack>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_SalvagedLaserRifle</defName>
-							<label>laser charge</label>
-							<ammoTypes>
-								<Ammo_LaserChargePack>Bullet_Laser_SalvagedLaserRifle</Ammo_LaserChargePack>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_LaserRifle</defName>
-							<label>laser charge</label>
-							<ammoTypes>
-								<Ammo_LaserChargePack>Bullet_Laser_LaserRifle</Ammo_LaserChargePack>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_SalvagedLaserShotgun</defName>
-							<label>laser charge</label>
-							<ammoTypes>
-								<Ammo_LaserChargePack>Bullet_Laser_SalvagedLaserShotgun</Ammo_LaserChargePack>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_LaserShotgun</defName>
-							<label>laser charge</label>
-							<ammoTypes>
-								<Ammo_LaserChargePack>Bullet_Laser_LaserShotgun</Ammo_LaserChargePack>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_SalvagedLaserSniperRifle</defName>
-							<label>laser charge</label>
-							<ammoTypes>
-								<Ammo_LaserChargePack>Bullet_Laser_SalvagedLaserSniperRifle</Ammo_LaserChargePack>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_LaserSniperRifle</defName>
-							<label>laser charge</label>
-							<ammoTypes>
-								<Ammo_LaserChargePack>Bullet_Laser_LaserSniperRifle</Ammo_LaserChargePack>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_LaserMiniGun</defName>
-							<label>laser charge</label>
-							<ammoTypes>
-								<Ammo_LaserChargePack>Bullet_Laser_LaserMiniGun</Ammo_LaserChargePack>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_LaserTeslaGun</defName>
-							<label>laser charge</label>
-							<ammoTypes>
-								<Ammo_LaserChargePack>Bullet_Laser_TeslaGun</Ammo_LaserChargePack>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- === Projectiles === -->
-
-						<!--
-						Unstable shots do slightly higher damage, but have slightly less penetration, due to the beams being less focused, delivering the energy over a wider area.
-						Vice versa for stable shots, due to better made weaponry.
-						-->
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="BaseLaserBullet">
-							<defName>Bullet_Laser_SalvagedLaserPistol</defName>
-							<label>laser beam</label>
-							<textures>
-								<li>Things/Projectile/Shot_SalvagedLaserPistol</li>
-							</textures>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>CE_Laser</damageDef>
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationSharp>15.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt><!-- The overall pressure exerted by a laser beam striking something is, unsuprisingly, negligable. -->
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="BaseLaserBullet">
-							<defName>Bullet_Laser_LaserPistol</defName>
-							<label>laser beam</label>
-							<textures>
-								<li>Things/Projectile/Shot_LaserPistol</li>
-							</textures>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>CE_Laser</damageDef>
-								<damageAmountBase>10</damageAmountBase>
-								<armorPenetrationSharp>17.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="BaseLaserBullet">
-							<defName>Bullet_Laser_LaserSMG</defName>
-							<label>laser beam</label>
-							<textures>
-								<li>Things/Projectile/Shot_LaserPistol</li>
-							</textures>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>CE_Laser</damageDef>
-								<damageAmountBase>11</damageAmountBase>
-								<armorPenetrationSharp>18.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="BaseLaserBullet">
-							<defName>Bullet_Laser_SalvagedLaserRifle</defName>
-							<label>laser beam</label>
-							<textures>
-								<li>Things/Projectile/Shot_SalvagedLaserRifle</li>
-							</textures>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>CE_Laser</damageDef>
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationSharp>16.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="BaseLaserBullet">
-							<defName>Bullet_Laser_LaserRifle</defName>
-							<label>laser beam</label>
-							<textures>
-								<li>Things/Projectile/Shot_LaserRifle</li>
-							</textures>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>CE_Laser</damageDef>
-								<damageAmountBase>18</damageAmountBase>
-								<armorPenetrationSharp>17.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="BaseLaserBullet">
-							<defName>Bullet_Laser_SalvagedLaserShotgun</defName>
-							<label>rifle beam</label>
-							<textures>
-								<li>Things/Projectile/Shot_SalvagedLaserShotgun</li>
-							</textures>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>CE_Laser</damageDef>
-								<damageAmountBase>9</damageAmountBase>
-								<armorPenetrationSharp>14.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-								<pelletCount>7</pelletCount>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="BaseLaserBullet">
-							<defName>Bullet_Laser_LaserShotgun</defName>
-							<label>laser beam</label>
-							<textures>
-								<li>Things/Projectile/Shot_LaserShotgun</li>
-							</textures>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>CE_Laser</damageDef>
-								<damageAmountBase>8</damageAmountBase>
-								<armorPenetrationSharp>15.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-								<pelletCount>7</pelletCount>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="BaseLaserBullet">
-							<defName>Bullet_Laser_SalvagedLaserSniperRifle</defName>
-							<label>laser beam</label>
-							<textures>
-								<li>Things/Projectile/Shot_SalvagedLaserSniperRifle</li>
-							</textures>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>CE_Laser</damageDef>
-								<damageAmountBase>24</damageAmountBase>
-								<armorPenetrationSharp>18.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="BaseLaserBullet">
-							<defName>Bullet_Laser_LaserSniperRifle</defName>
-							<label>laser beam</label>
-							<textures>
-								<li>Things/Projectile/Shot_LaserSniperRifle</li>
-							</textures>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>CE_Laser</damageDef>
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationSharp>20.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="BaseLaserBullet">
-							<defName>Bullet_Laser_LaserMiniGun</defName>
-							<label>laser beam</label>
-							<textures>
-								<li>Things/Projectile/Shot_LaserMinigun</li>
-							</textures>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>CE_Laser</damageDef>
-								<damageAmountBase>16</damageAmountBase>
-								<armorPenetrationSharp>16</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="BaseLaserBullet">
-							<defName>Bullet_Laser_TeslaGun</defName>
-							<label>arc discharge</label>
-							<textures>
-								<li>Things/Projectile/Shot_TeslaGunA</li>
-								<li>Things/Projectile/Shot_TeslaGunB</li>
-								<li>Things/Projectile/Shot_TeslaGunC</li>
-								<li>Things/Projectile/Shot_TeslaGunD</li>
-								<li>Things/Projectile/Shot_TeslaGunE</li>
-							</textures>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>EMP</damageDef>
-								<!--        <damageAmountBase>8</damageAmountBase>
-            					<armorPenetrationSharp>16</armorPenetrationSharp> -->
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded - Laser/MeleeSpacer.xml b/Patches/Vanilla Weapons Expanded - Laser/MeleeSpacer.xml
deleted file mode 100644
index 7201be2854..0000000000
--- a/Patches/Vanilla Weapons Expanded - Laser/MeleeSpacer.xml	
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded - Laser</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Laser Sword ========== -->
-
-				<!--
-    Appears like a laser rapier of sorts, favoring quick thrusts capable of poking through armor.
-    -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWEL_LaserSword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<chanceFactor>0.33</chanceFactor>
-								<cooldownTime>1.52</cooldownTime>
-								<armorPenetrationBlunt>0.500</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>1.24</cooldownTime>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<armorPenetrationSharp>42</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.14</cooldownTime>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWEL_LaserSword"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWEL_LaserSword"]/equippedAngleOffset</xpath>
-					<value>
-						<equippedAngleOffset>-45</equippedAngleOffset>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWEL_LaserSword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.63</MeleeCritChance>
-							<MeleeParryChance>0.75</MeleeParryChance>
-							<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWEL_LaserSword"]/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 - Laser/PawnKinds.xml b/Patches/Vanilla Weapons Expanded - Laser/PawnKinds.xml
deleted file mode 100644
index 783991bf1d..0000000000
--- a/Patches/Vanilla Weapons Expanded - Laser/PawnKinds.xml	
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Factions Expanded - Laser</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Give ammo to Mercenary Marine ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="Mercenary_Marine"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>7</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded - Laser/RangedSpacer.xml b/Patches/Vanilla Weapons Expanded - Laser/RangedSpacer.xml
deleted file mode 100644
index 581bf5e988..0000000000
--- a/Patches/Vanilla Weapons Expanded - Laser/RangedSpacer.xml	
+++ /dev/null
@@ -1,530 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded - Laser</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!--
-      Compared to conventional weaponry, laser weapons have high magazine capacities and high rates of fire. No noticable recoil and the instantaneous
-      nature of their projectiles makes them accurate and easy to shoot, but their damage falls-off significantly with range as the beam scatters.
-
-      Scavenged/salvaged weapons are cruder than their refined counterparts. They're heavier and bulkier, take more time to warm up and cool down, and 
-      experience greater falloff due to imperfections in the focusing lenses, but they do slightly more damage.
-      -->
-
-				<!-- === Tools === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VWEL_Gun_LaserPistol" or defName = "VWEL_Gun_SalvagedLaserPistol"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "VWEL_Gun_LaserSMG" or
-						defName = "VWEL_Gun_LaserRifle" or
-						defName = "VWEL_Gun_LaserShotgun" or
-						defName = "VWEL_Gun_LaserSniperRifle" or
-						defName = "VWEL_Gun_SalvagedLaserRifle" or
-						defName = "VWEL_Gun_SalvagedLaserShotgun" or
-						defName = "VWEL_Gun_SalvagedLaserSniperRifle"
-						]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWEL_Gun_LaserMinigun" or defName = "VWEL_Gun_TeslaGun"]/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>
-				</li>
-
-				<!-- === Remove VWE Overheating Gizmo === -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName = "VWEL_Gun_LaserPistol" or
-						defName = "VWEL_Gun_SalvagedLaserPistol" or
-						defName = "VWEL_Gun_LaserSMG" or
-						defName = "VWEL_Gun_LaserRifle" or
-						defName = "VWEL_Gun_LaserShotgun" or
-						defName = "VWEL_Gun_LaserSniperRifle" or
-						defName = "VWEL_Gun_SalvagedLaserRifle" or
-						defName = "VWEL_Gun_SalvagedLaserShotgun" or
-						defName = "VWEL_Gun_SalvagedLaserSniperRifle" or
-						defName="VWEL_Gun_LaserMinigun" or
-						defName = "VWEL_Gun_TeslaGun"
-						]/comps/li[@Class="VanillaWeaponsExpandedLaser.CompProperties_LaserCapacitor"] </xpath>
-				</li>
-
-				<!-- === Laser Pistol === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWEL_Gun_LaserPistol</defName>
-					<statBases>
-						<Mass>1.20</Mass>
-						<Bulk>2.30</Bulk>
-						<SwayFactor>1.17</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Laser_LaserPistol</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>16</range>
-						<soundCast>VWE_LaserShot_Light</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_LaserPistol</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>LaserGun</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Salvaged Laser Pistol === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWEL_Gun_SalvagedLaserPistol</defName>
-					<statBases>
-						<Mass>1.40</Mass>
-						<Bulk>2.60</Bulk>
-						<SwayFactor>1.33</SwayFactor>
-						<ShotSpread>0.08</ShotSpread>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Laser_SalvagedLaserPistol</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>VWE_UnstableLaserShot_Light</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_SalvagedLaserPistol</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SalvagedLaserGun</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Laser SMG === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWEL_Gun_LaserSMG</defName>
-					<statBases>
-						<Mass>2.25</Mass>
-						<Bulk>6.90</Bulk>
-						<SwayFactor>0.92</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Laser_LaserSMG</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>28</range>
-						<burstShotCount>7</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>VWE_LaserShot_Light</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>45</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_LaserSMG</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- === Laser Rifle === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWEL_Gun_LaserRifle</defName>
-					<statBases>
-						<Mass>3.50</Mass>
-						<Bulk>10.00</Bulk>
-						<SwayFactor>1.35</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.01</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Laser_LaserRifle</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>62</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>VWE_UnstableLaserShot_Rifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>60</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_LaserRifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- === Salvaged Laser Rifle === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWEL_Gun_SalvagedLaserRifle</defName>
-					<statBases>
-						<Mass>3.60</Mass>
-						<Bulk>10.10</Bulk>
-						<SwayFactor>1.37</SwayFactor>
-						<ShotSpread>0.08</ShotSpread>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.01</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Laser_SalvagedLaserRifle</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>62</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>VWE_UnstableLaserShot_Rifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>60</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_SalvagedLaserRifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- === Laser Shotgun === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWEL_Gun_LaserShotgun</defName>
-					<statBases>
-						<Mass>3.40</Mass>
-						<Bulk>9.00</Bulk>
-						<SwayFactor>1.24</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.01</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Laser_LaserShotgun</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>17</range>
-						<soundCast>VWE_LaserShot_Heavy</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_LaserShotgun</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-					</FireModes>
-				</li>
-
-				<!-- === Salvaged Laser Shotgun === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWEL_Gun_SalvagedLaserShotgun</defName>
-					<statBases>
-						<Mass>3.50</Mass>
-						<Bulk>9.10</Bulk>
-						<SwayFactor>1.26</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.01</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Laser_SalvagedLaserShotgun</defaultProjectile>
-						<warmupTime>0.65</warmupTime>
-						<range>17</range>
-						<soundCast>VWE_LaserShot_Heavy</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_SalvagedLaserShotgun</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-					</FireModes>
-				</li>
-
-				<!-- === Laser Sniper Rifle === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWEL_Gun_LaserSniperRifle</defName>
-					<statBases>
-						<Mass>4.20</Mass>
-						<Bulk>13.00</Bulk>
-						<SwayFactor>1.19</SwayFactor>
-						<ShotSpread>0.04</ShotSpread>
-						<SightsEfficiency>2.48</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
-						<NightVisionEfficiency_Weapon>0.4</NightVisionEfficiency_Weapon>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Laser_LaserSniperRifle</defaultProjectile>
-						<warmupTime>1.7</warmupTime>
-						<range>81</range>
-						<soundCast>VWE_LaserShot_Heavy</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_LaserSniperRifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>Bipod_DMR</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Salvaged Laser Sniper Rifle === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWEL_Gun_SalvagedLaserSniperRifle</defName>
-					<statBases>
-						<Mass>4.45</Mass>
-						<Bulk>13.50</Bulk>
-						<SwayFactor>1.35</SwayFactor>
-						<ShotSpread>0.03</ShotSpread>
-						<SightsEfficiency>2.36</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.65</RangedWeapon_Cooldown>
-						<NightVisionEfficiency_Weapon>0.3</NightVisionEfficiency_Weapon>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Laser_SalvagedLaserSniperRifle</defaultProjectile>
-						<warmupTime>1.85</warmupTime>
-						<range>81</range>
-						<soundCast>VWE_LaserShot_Heavy</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_SalvagedLaserSniperRifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>Bipod_DMR</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Laser Minigun === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWEL_Gun_LaserMinigun</defName>
-					<statBases>
-						<Mass>16.00</Mass>
-						<Bulk>10.40</Bulk>
-						<SwayFactor>2.64</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Laser_LaserMiniGun</defaultProjectile>
-						<burstShotCount>250</burstShotCount>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<warmupTime>2</warmupTime>
-						<range>75</range>
-						<soundCast>VWE_LaserShot_Rifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilAmount>0.01</recoilAmount>
-						<recoilPattern>Regular</recoilPattern>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1000</magazineSize>
-						<reloadTime>6</reloadTime>
-						<ammoSet>AmmoSet_LaserMiniGun</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>100</aimedBurstShotCount>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-				<!-- === Tesla Gun === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWEL_Gun_TeslaGun</defName>
-					<statBases>
-						<Mass>8.0</Mass>
-						<Bulk>10.0</Bulk>
-						<SwayFactor>1.80</SwayFactor>
-						<ShotSpread>0.01</ShotSpread>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Laser_TeslaGun</defaultProjectile>
-						<burstShotCount>30</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>0.8</warmupTime>
-						<range>31</range>
-						<soundCast>VWE_LaserShot_Electricity</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilAmount>0.01</recoilAmount>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>200</magazineSize>
-						<reloadTime>6.2</reloadTime>
-						<ammoSet>AmmoSet_LaserTeslaGun</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded - Makeshift/RangedIndustrial.xml b/Patches/Vanilla Weapons Expanded - Makeshift/RangedIndustrial.xml
deleted file mode 100644
index 6b136ef46c..0000000000
--- a/Patches/Vanilla Weapons Expanded - Makeshift/RangedIndustrial.xml	
+++ /dev/null
@@ -1,322 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded - Makeshift</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName = "VWE_Gun_MakeshiftPistol" or
-						defName = "VWE_Gun_MakeshiftSMG" or
-						defName = "VWE_Gun_MakeshiftRifle" or
-						defName = "VWE_Gun_MakeshiftLMG" or
-						defName = "VWE_Gun_MakeshiftShotgun"
-						]/modExtensions</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[defName = "VWE_Gun_MakeshiftPistol"]/tools
-					</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "VWE_Gun_MakeshiftSMG" or
-						defName = "VWE_Gun_MakeshiftRifle" or
-						defName = "VWE_Gun_MakeshiftLMG" or
-						defName = "VWE_Gun_MakeshiftShotgun"
-						]/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>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_MakeshiftPistol</defName>
-					<statBases>
-						<Mass>1.33</Mass>
-						<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.50</SightsEfficiency>
-						<ShotSpread>0.60</ShotSpread>
-						<SwayFactor>1.30</SwayFactor>
-						<Bulk>2.62</Bulk>
-					</statBases>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Pistol</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_Gun_MakeshiftPistol"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.75</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-								<warmupTime>0.5</warmupTime>
-								<range>10</range>
-								<soundCast>Shot_Autopistol</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_MakeshiftSMG</defName>
-					<statBases>
-						<Mass>2.83</Mass>
-						<RangedWeapon_Cooldown>0.40</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.80</SightsEfficiency>
-						<ShotSpread>0.38</ShotSpread>
-						<SwayFactor>1.18</SwayFactor>
-						<Bulk>5.62</Bulk>
-					</statBases>
-					<AmmoUser>
-						<magazineSize>24</magazineSize>
-						<reloadTime>4.4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_Gun_MakeshiftSMG"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.02</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-								<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
-								<burstShotCount>6</burstShotCount>
-								<warmupTime>0.6</warmupTime>
-								<range>22</range>
-								<soundCast>Shot_MachinePistol</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_MakeshiftRifle</defName>
-					<statBases>
-						<Mass>4</Mass>
-						<RangedWeapon_Cooldown>0.40</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.80</SightsEfficiency>
-						<ShotSpread>0.30</ShotSpread>
-						<SwayFactor>1.68</SwayFactor>
-						<Bulk>11.62</Bulk>
-					</statBases>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AR</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_Gun_MakeshiftRifle"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.73</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-								<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
-								<burstShotCount>5</burstShotCount>
-								<warmupTime>1.1</warmupTime>
-								<range>40</range>
-								<soundCast>Shot_AssaultRifle</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_MakeshiftLMG</defName>
-					<statBases>
-						<Mass>11.5</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.80</SightsEfficiency>
-						<ShotSpread>0.28</ShotSpread>
-						<SwayFactor>2.23</SwayFactor>
-						<Bulk>15.7</Bulk>
-					</statBases>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>5.2</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_Gun_MakeshiftLMG"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.32</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-								<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-								<burstShotCount>10</burstShotCount>
-								<warmupTime>1.3</warmupTime>
-								<range>58</range>
-								<soundCast>Shot_Minigun</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-								<targetParams>
-									<canTargetLocations>true</canTargetLocations>
-								</targetParams>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_MakeshiftShotgun</defName>
-					<statBases>
-						<Mass>4.5</Mass>
-						<RangedWeapon_Cooldown>1.0</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.80</SightsEfficiency>
-						<ShotSpread>0.38</ShotSpread>
-						<SwayFactor>1.48</SwayFactor>
-						<Bulk>9.6</Bulk>
-					</statBases>
-					<AmmoUser>
-						<magazineSize>2</magazineSize>
-						<AmmoGenPerMagOverride>4</AmmoGenPerMagOverride>
-						<reloadTime>1.0</reloadTime>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_Gun_MakeshiftShotgun"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.69</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>13</range>
-								<soundCast>Shot_Shotgun</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded - Non-Lethal/40mmLessLethal.xml b/Patches/Vanilla Weapons Expanded - Non-Lethal/40mmLessLethal.xml
deleted file mode 100644
index 6b53f2d430..0000000000
--- a/Patches/Vanilla Weapons Expanded - Non-Lethal/40mmLessLethal.xml	
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded - Non-Lethal</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_40x46mmGrenadeNL</defName>
-							<label>40x46mm Grenades</label>
-							<ammoTypes>
-								<Ammo_40x46mmGrenade_CN>Bullet_40x46mmGrenade_CN</Ammo_40x46mmGrenade_CN>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="40x46mmGrenadeBase">
-							<defName>Ammo_40x46mmGrenade_CN</defName>
-							<label>40x46mm grenade (CN)</label>
-							<description>Low velocity grenade filled with a non-lethal chemical irritant, intended for crowd control.</description>
-							<graphicData>
-								<texPath>Things/Ammo/GrenadeLauncher/GS50_SMK</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>5.37</MarketValue>
-							</statBases>
-							<stackLimit>200</stackLimit>
-							<ammoClass>CNGas</ammoClass>
-							<detonateProjectile>Bullet_40x46mmGrenade_CN</detonateProjectile>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="Base40x46mmGrenadeBullet">
-							<defName>Bullet_40x46mmGrenade_CN</defName>
-							<label>40x46mm grenade (CN)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>3.9</explosionRadius>
-								<damageDef>VWENL_TearGas</damageDef>
-								<postExplosionSpawnThingDef>VWENL_TearGasCloud</postExplosionSpawnThingDef>
-								<preExplosionSpawnChance>1</preExplosionSpawnChance>
-								<postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_40x46mmGrenade_CN</defName>
-							<label>make 40x46mm CN grenades x100</label>
-							<description>Craft 100 40x46mm CN grenades.</description>
-							<jobString>Making 40x46mm CN grenades.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>50</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Neutroamine</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Neutroamine</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_40x46mmGrenade_CN>100</Ammo_40x46mmGrenade_CN>
-							</products>
-							<workAmount>9000</workAmount>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded - Non-Lethal/NonLethal_Grenades.xml b/Patches/Vanilla Weapons Expanded - Non-Lethal/NonLethal_Grenades.xml
deleted file mode 100644
index 37ea831e62..0000000000
--- a/Patches/Vanilla Weapons Expanded - Non-Lethal/NonLethal_Grenades.xml	
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded - Non-Lethal</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Tear Gas Grenade === -->
-				<!-- == Projectile == -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWENL_Projectile_TearGasGrenade"]</xpath>
-					<value>
-						<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWENL_Projectile_TearGasGrenade"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<damageDef>VWENL_TearGas</damageDef>
-							<explosionRadius>3.9</explosionRadius>
-							<damageAmountBase>1</damageAmountBase>
-							<explosionDelay>100</explosionDelay>
-							<dropsCasings>true</dropsCasings>
-							<flyOverhead>false</flyOverhead>
-							<soundExplode>DispensePaste</soundExplode>
-							<postExplosionSpawnThingDef>VWENL_TearGasCloud</postExplosionSpawnThingDef>
-							<postExplosionSpawnChance>1</postExplosionSpawnChance>
-							<postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							<casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-							<casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-						</projectile>
-					</value>
-				</li>
-
-				<!-- == Grenade == -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_TearGasGrenade"]</xpath>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<stackLimit>75</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="VWE_TearGasGrenade"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_TearGasGrenade</defName>
-					<statBases>
-						<Mass>1</Mass>
-						<MarketValue>2.25</MarketValue>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<label>throw tear gas</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>VWENL_Projectile_TearGasGrenade</defaultProjectile>
-						<range>12</range>
-						<warmupTime>1.8</warmupTime>
-						<soundCast>ThrowGrenade</soundCast>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-						<onlyManualCast>true</onlyManualCast>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- == Recipe == -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>MakeVWENLTearGasGrenade</defName>
-							<label>make tear gas grenades x10</label>
-							<description>Craft 10 tear gas grenades.</description>
-							<jobString>Making tear gas grenades.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Neutroamine</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Neutroamine</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<VWE_TearGasGrenade>10</VWE_TearGasGrenade>
-							</products>
-						</RecipeDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded - Non-Lethal/NonLethal_Melee.xml b/Patches/Vanilla Weapons Expanded - Non-Lethal/NonLethal_Melee.xml
deleted file mode 100644
index 5a75db18e6..0000000000
--- a/Patches/Vanilla Weapons Expanded - Non-Lethal/NonLethal_Melee.xml	
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded - Non-Lethal</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Baton === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_StunBaton"]/statBases</xpath>
-					<value>
-						<Bulk>2.75</Bulk>
-						<MeleeCounterParryBonus>0.9</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_StunBaton"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.17</MeleeCritChance>
-							<MeleeParryChance>0.9</MeleeParryChance>
-							<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_StunBaton"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_StunBaton"]/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>head</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Stun</def>
-										<amount>32</amount>
-										<chance>0.20</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>1.68</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>3.375</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded - Non-Lethal/NonLethal_Ranged.xml b/Patches/Vanilla Weapons Expanded - Non-Lethal/NonLethal_Ranged.xml
deleted file mode 100644
index 3b4046c7ec..0000000000
--- a/Patches/Vanilla Weapons Expanded - Non-Lethal/NonLethal_Ranged.xml	
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded - Non-Lethal</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Tools === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_Gun_Taser" or defName="VWE_Gun_RubberBulletPistol"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VWE_Gun_DartGun"]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_Gun_TearGasLauncher"]/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>
-				</li>
-
-				<!-- ========== Taser ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_Taser</defName>
-					<statBases>
-						<Mass>0.21</Mass>
-						<RangedWeapon_Cooldown>0.98</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.60</SightsEfficiency>
-						<ShotSpread>0.67</ShotSpread>
-						<SwayFactor>1.07</SwayFactor>
-						<Bulk>1.85</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Taser</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>7</range>
-						<soundCast>VWE_TaserShot_Electricity</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>2</magazineSize>
-						<reloadTime>4.7</reloadTime>
-						<ammoSet>AmmoSet_Taser</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>NonLethal</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Rubber Bullet Pistol ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_RubberBulletPistol</defName>
-					<statBases>
-						<Mass>1.11</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.07</SwayFactor>
-						<Bulk>2.10</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_43cal_NL</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>VWENL_Shot_RubberBulletPistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>5.4</reloadTime>
-						<ammoSet>AmmoSet_43cal_NL</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>NonLethal</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- ========== Dart Gun ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_DartGun</defName>
-					<statBases>
-						<Mass>3</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.6</SightsEfficiency>
-						<ShotSpread>0.21</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>10.03</Bulk>
-					</statBases>
-					<costList>
-						<Steel>60</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_DartRifle_NL</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>VWENL_Shot_DartGun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>5</AmmoGenPerMagOverride>
-						<reloadTime>2.4</reloadTime>
-						<ammoSet>AmmoSet_DartRifle_NonLethal</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- === Tear Gas Launcher === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_TearGasLauncher</defName>
-					<statBases>
-						<Mass>5.35</Mass>
-						<Bulk>5.70</Bulk>
-						<SwayFactor>1.31</SwayFactor>
-						<ShotSpread>0.18</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>65</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.3</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_40x46mmGrenade_CN</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>40</range>
-						<soundCast>VWENL_Shot_GrenadeLauncher</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<ai_IsBuildingDestroyer>True</ai_IsBuildingDestroyer>
-						<ignorePartialLoSBlocker>True</ignorePartialLoSBlocker>
-						<targetParams>
-							<canTargetLocations>True</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>3</AmmoGenPerMagOverride>
-						<reloadTime>2.2</reloadTime>
-						<ammoSet>AmmoSet_40x46mmGrenadeNL</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>False</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>NonLethal</li>
-					</weaponTags>
-
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded - Non-Lethal/RubberBullet.xml b/Patches/Vanilla Weapons Expanded - Non-Lethal/RubberBullet.xml
deleted file mode 100644
index d346fb2379..0000000000
--- a/Patches/Vanilla Weapons Expanded - Non-Lethal/RubberBullet.xml	
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded - Non-Lethal</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingCategoryDef>
-							<defName>Ammo43cal</defName>
-							<label>.43 caliber</label>
-							<parent>AmmoPistols</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_43cal_NL</defName>
-							<label>.43 caliber rubber bullet</label>
-							<ammoTypes>
-								<Ammo_43cal_NL>Bullet_43cal_NL</Ammo_43cal_NL>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="45ACPBase">
-							<defName>Ammo_43cal_NL</defName>
-							<label>.43 caliber rubber bullet</label>
-							<description>Gas-powered pistol cartridge firing rubberized projectiles. Painful, but generally non-lethal.</description>
-							<graphicData>
-								<texPath>Things/Ammo/Pistol/FMJ</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.09</MarketValue>
-							</statBases>
-							<ammoClass>RubberBullet</ammoClass>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="Base45ACPBullet">
-							<defName>Bullet_43cal_NL</defName>
-							<label>rubber bullet</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Blunt</damageDef>
-								<damageAmountBase>5</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>Beanbag</def>
-										<amount>4</amount>
-										<chance>0.10</chance>
-									</li>
-								</secondaryDamage>
-								<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
-								<speed>32</speed>
-								<dropsCasings>false</dropsCasings>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_43cal_NL</defName>
-							<label>make .43 rubber bullet cartridges x200</label>
-							<description>Craft 200 .43 rubber bullet cartridges.</description>
-							<jobString>Making .43 rubber bullet cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>16</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Chemfuel</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Chemfuel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_43cal_NL>200</Ammo_43cal_NL>
-							</products>
-							<workAmount>1800</workAmount>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded - Non-Lethal/TaserCartridge.xml b/Patches/Vanilla Weapons Expanded - Non-Lethal/TaserCartridge.xml
deleted file mode 100644
index e6e2c1c909..0000000000
--- a/Patches/Vanilla Weapons Expanded - Non-Lethal/TaserCartridge.xml	
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded - Non-Lethal</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingCategoryDef>
-							<defName>AmmoTaser</defName>
-							<label>taser cartridge</label>
-							<parent>AmmoPistols</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberPistol</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_Taser</defName>
-							<label>taser cartridge</label>
-							<ammoTypes>
-								<Ammo_Taser>Bullet_Taser</Ammo_Taser>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="45ACPBase">
-							<defName>Ammo_Taser</defName>
-							<label>taser cartridge</label>
-							<description>A nitrogen powered cartridge, firing a pair of thin wires to deliver an incapacitating shock to foes.</description>
-							<graphicData>
-								<texPath>Things/Ammo/PlasmaCell/Pistol</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.85</MarketValue>
-								<Mass>0.05</Mass>
-								<Bulk>0.05</Bulk>
-							</statBases>
-							<ammoClass>Taser</ammoClass>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="Base45ACPBullet">
-							<defName>Bullet_Taser</defName>
-							<label>taser prong</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>6</damageAmountBase>
-								<damageDef>Taser</damageDef>
-								<armorPenetrationSharp>0.65</armorPenetrationSharp>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<speed>30</speed>
-								<dropsCasings>false</dropsCasings>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_Taser</defName>
-							<label>make taser cartridge x50</label>
-							<description>Craft 50 taser cartridges.</description>
-							<jobString>Making taser cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>15</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Chemfuel</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-									<li>Chemfuel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Taser>50</Ammo_Taser>
-							</products>
-							<workAmount>2400</workAmount>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded - Non-Lethal/TranquilizerDart.xml b/Patches/Vanilla Weapons Expanded - Non-Lethal/TranquilizerDart.xml
deleted file mode 100644
index 6c8b98fbc6..0000000000
--- a/Patches/Vanilla Weapons Expanded - Non-Lethal/TranquilizerDart.xml	
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded - Non-Lethal</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_DartRifle_NonLethal</defName>
-							<label>dart rifle</label>
-							<ammoTypes>
-								<Ammo_DartRifle_NL>Bullet_DartRifle_NL</Ammo_DartRifle_NL>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x51mmNATOBase">
-							<defName>Ammo_DartRifle_NL</defName>
-							<label>dart rifle cartridge</label>
-							<graphicData>
-								<texPath>ThirdParty/CP Metal Gear Solid/Rifle/NL</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.85</MarketValue>
-							</statBases>
-							<ammoClass>TranqNonLethal</ammoClass>
-							<cookOffProjectile>Bullet_DartRifle_NL</cookOffProjectile>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="Base762x51mmNATOBullet">
-							<defName>Bullet_DartRifle_NL</defName>
-							<label>tranquilizer dart</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>VWE_AnestheticDart</damageDef>
-								<damageAmountBase>2</damageAmountBase>
-								<armorPenetrationSharp>1.85</armorPenetrationSharp>
-								<armorPenetrationBlunt>12.85</armorPenetrationBlunt>
-								<speed>43</speed>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_DartRifle_NL</defName>
-							<label>make dart rifle cartridge x200</label>
-							<description>Craft 200 dart rifle cartridges.</description>
-							<jobString>Making dart rifle cartridges.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>18</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Neutroamine</li>
-										</thingDefs>
-									</filter>
-									<count>12</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Neutroamine</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_DartRifle_NL>200</Ammo_DartRifle_NL>
-							</products>
-							<workAmount>3800</workAmount>
-						</RecipeDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded - Quickdraw/Weapons_Quickdraw.xml b/Patches/Vanilla Weapons Expanded - Quickdraw/Weapons_Quickdraw.xml
deleted file mode 100644
index 2cd24fb6a6..0000000000
--- a/Patches/Vanilla Weapons Expanded - Quickdraw/Weapons_Quickdraw.xml	
+++ /dev/null
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded - Quickdraw</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Melee Tools ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_Gun_AutomaticPistol"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_Gun_PDW" or defName="VWE_Gun_BullpupRifle" or defName="VWE_Gun_BullpupDMR"]/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>
-				</li>
-
-				<!-- ========== PDW ========== -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_PDW</defName>
-					<statBases>
-						<Mass>2.60</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>0.77</SwayFactor>
-						<Bulk>5.05</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.05</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_FN57x28mm_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>25</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>Shot_HeavySMG</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_FN57x28mm</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>CE_Sidearm</li>
-					</weaponTags>
-					<!-- Required research rework -->
-					<researchPrerequisite>BlowbackOperation</researchPrerequisite>
-				</li>
-
-				<!-- ========== Bullpup Rifle ========== -->
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>VWE_Gun_BullpupRifle</defName>
-					<statBases>
-						<WorkToMake>32000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.10</SwayFactor>
-						<Bulk>7.37</Bulk>
-						<Mass>3.61</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.46</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<warmupTime>0.9</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>Bipod_Rifle</li>
-					</weaponTags>
-					<!-- Required research rework -->
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-				</li>
-
-				<!-- ========== Bullpup DMR ========== -->
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>VWE_Gun_BullpupDMR</defName>
-					<statBases>
-						<WorkToMake>23000</WorkToMake>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.70</SwayFactor>
-						<Bulk>12.25</Bulk>
-						<Mass>4.30</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>75</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SniperRifle</li>
-						<li>Bipod_DMR</li>
-					</weaponTags>
-					<!-- Required research rework -->
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-				</li>
-
-				<!-- ========== Auto Pistol ========== -->
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>VWE_Gun_AutomaticPistol</defName>
-					<statBases>
-						<WorkToMake>7000</WorkToMake>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>0.88</SwayFactor>
-						<Bulk>1.86</Bulk>
-						<Mass>0.78</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.74</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>12</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>17</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-					<!-- Required research rework -->
-					<researchPrerequisite>BlowbackOperation</researchPrerequisite>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded - Tribal/Melee_Neolithic.xml b/Patches/Vanilla Weapons Expanded - Tribal/Melee_Neolithic.xml
deleted file mode 100644
index c4399e6190..0000000000
--- a/Patches/Vanilla Weapons Expanded - Tribal/Melee_Neolithic.xml	
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded - Tribal</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Heavy Club -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_HeavyClub"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>5</power>
-								<chanceFactor>0.33</chanceFactor>
-								<cooldownTime>1.93</cooldownTime>
-								<armorPenetrationBlunt>1.375</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>4.49</cooldownTime>
-								<armorPenetrationBlunt>5.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_HeavyClub"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<MeleeCounterParryBonus>0.53</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_HeavyClub"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.38</MeleeCritChance>
-							<MeleeParryChance>0.4</MeleeParryChance>
-							<MeleeDodgeChance>0.37</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Light Club -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_LightClub"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<chanceFactor>0.33</chanceFactor>
-								<cooldownTime>1.78</cooldownTime>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>3.01</cooldownTime>
-								<armorPenetrationBlunt>3.75</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_LightClub"]/statBases</xpath>
-					<value>
-						<Bulk>3.75</Bulk>
-						<MeleeCounterParryBonus>0.14</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_LightClub"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.58</MeleeCritChance>
-							<MeleeParryChance>0.14</MeleeParryChance>
-							<MeleeDodgeChance>0.16</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_LightClub"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- === Tribal Axe === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_TribalAxe"]/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.33</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>
-								<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.28</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_TribalAxe"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_TribalAxe"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.10</MeleeCritChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-							<MeleeDodgeChance>0.20</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_TribalAxe"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- === Shiv === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_Shiv"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<chanceFactor>0.33</chanceFactor>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetrationBlunt>0.07</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>9.5</power>
-								<cooldownTime>1.2</cooldownTime>
-								<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.18</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_Shiv"]/statBases</xpath>
-					<value>
-						<Bulk>0.15</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_Shiv"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.1</MeleeCritChance>
-							<MeleeParryChance>0.1</MeleeParryChance>
-							<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_Shiv"]/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 - Tribal/Ranged_Neolithic.xml b/Patches/Vanilla Weapons Expanded - Tribal/Ranged_Neolithic.xml
deleted file mode 100644
index 069ed00409..0000000000
--- a/Patches/Vanilla Weapons Expanded - Tribal/Ranged_Neolithic.xml	
+++ /dev/null
@@ -1,391 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded - Tribal</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Sling ========== -->
-				<li Class='CombatExtended.PatchOperationMakeGunCECompatible'>
-					<defName>VWE_Sling</defName>
-					<statBases>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<ShotSpread>1</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>0.8</Bulk>
-						<RangedWeapon_Cooldown>3.2</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Projectile_SlingBullet_Stone</defaultProjectile>
-						<warmupTime>2.4</warmupTime>
-						<range>32</range>
-						<soundCast>Bow_Small</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<reloadTime>3.8</reloadTime>
-						<ammoSet>AmmoSet_SlingBullet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_Sling"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Body</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.75</cooldownTime>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Throwing Shard === -->
-				<!-- == Projectile == -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_FlyingShard"]</xpath>
-					<value>
-						<ThingDef ParentName="BasePilumProjectile">
-							<defName>VWE_FlyingShard</defName>
-							<label>shard</label>
-							<graphicData>
-								<texPath>Things/Projectile/ShardThrown</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>RangedStab</damageDef>
-								<damageAmountBase>7</damageAmountBase>
-								<flyOverhead>false</flyOverhead>
-								<speed>25</speed>
-								<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.26</armorPenetrationSharp>
-								<preExplosionSpawnChance>0.60</preExplosionSpawnChance>
-								<preExplosionSpawnThingDef>VWE_Throwing_Shards</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<!-- == Weapon == -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_Throwing_Shards"]/graphicData</xpath>
-					<value>
-						<graphicData>
-							<texPath>Things/Projectile/ShardThrown</texPath>
-							<graphicClass>Graphic_Single</graphicClass>
-						</graphicData>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="VWE_Throwing_Shards"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>BaseWeapon</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_Throwing_Shards"]</xpath>
-					<value>
-						<thingCategories>
-							<li>WeaponsRanged</li>
-						</thingCategories>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VWE_Throwing_Shards"]/recipeMaker</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VWE_Throwing_Shards"]/costStuffCount</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VWE_Throwing_Shards"]/stuffCategories</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_Throwing_Shards"]/smeltable</xpath>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<stackLimit>75</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-						<smeltable>False</smeltable>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="VWE_Throwing_Shards"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Throwing_Shards</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<Bulk>0.35</Bulk>
-						<Mass>0.15</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<label>Throw shard</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>VWE_FlyingShard</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>9</range>
-						<soundCast>ThrowGrenade</soundCast>
-						<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-					</Properties>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_Throwing_Shards"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.26</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.36</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- == Recipe == -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>MakeVWEThrowingShard</defName>
-							<label>make throwing shards x10</label>
-							<description>Craft 10 throwing shards.</description>
-							<jobString>Making throwing shards.</jobString>
-							<workAmount>800</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<stuffCategoriesToAllow>
-											<li>Metallic</li>
-											<li>Stony</li>
-										</stuffCategoriesToAllow>
-									</filter>
-									<count>20</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<stuffCategoriesToAllow>
-									<li>Metallic</li>
-									<li>Stony</li>
-								</stuffCategoriesToAllow>
-							</fixedIngredientFilter>
-							<products>
-								<VWE_Throwing_Shards>10</VWE_Throwing_Shards>
-							</products>
-							<recipeUsers>
-								<li>CraftingSpot</li>
-							</recipeUsers>
-						</RecipeDef>
-					</value>
-				</li>
-
-				<!-- ========== Fire Bomb ========== -->
-
-				<!-- Projectile -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_Proj_FireBomb"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<explosionRadius>0.5</explosionRadius>
-							<damageDef>Flame</damageDef>
-							<damageAmountBase>10</damageAmountBase>
-							<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
-							<preExplosionSpawnChance>1</preExplosionSpawnChance>
-							<speed>10</speed>
-							<ai_IsIncendiary>true</ai_IsIncendiary>
-						</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_Proj_FireBomb"]</xpath>
-					<value>
-						<thingClass>CombatExtended.Projectile_FireTrail</thingClass>
-					</value>
-				</li>
-
-				<!-- Grenade -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_Weapon_FireBomb"]/graphicData</xpath>
-					<value>
-						<graphicData>
-							<texPath>Things/Projectile/FireBombThrown</texPath>
-							<graphicClass>Graphic_Single</graphicClass>
-						</graphicData>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_Weapon_FireBomb"]</xpath>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<stackLimit>50</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="VWE_Weapon_FireBomb"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_Weapon_FireBomb"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>1</damageAmountBase>
-							<explosiveDamageType>Flame</explosiveDamageType>
-							<explosiveRadius>0.5</explosiveRadius>
-							<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
-							<preExplosionSpawnChance>1</preExplosionSpawnChance>
-						</li>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Weapon_FireBomb</defName>
-					<statBases>
-						<Mass>0.6</Mass>
-						<Bulk>1.8</Bulk>
-						<MarketValue>3</MarketValue>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.0</SightsEfficiency>
-					</statBases>
-					<Properties>
-						<label>throw firebomb</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<range>10</range>
-						<minRange>3</minRange>
-						<warmupTime>1.8</warmupTime>
-						<noiseRadius>4</noiseRadius>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<soundCast>ThrowMolotovCocktail</soundCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<defaultProjectile>VWE_Proj_FireBomb</defaultProjectile>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="VWE_Weapon_FireBomb"]/recipeMaker</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>MakeFireBomb</defName>
-							<label>make fire bombs x10</label>
-							<description>Craft 10 fire bombs.</description>
-							<jobString>Making fire bombs.</jobString>
-							<workAmount>1200</workAmount>
-							<recipeUsers>
-								<li>CraftingSpot</li>
-							</recipeUsers>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Cloth</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Chemfuel</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Cloth</li>
-									<li>Chemfuel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<VWE_Weapon_FireBomb>10</VWE_Weapon_FireBomb>
-							</products>
-						</RecipeDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_Weapon_FireBomb"]</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>Body</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.75</cooldownTime>
-								<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded/Ammo/AntiGrainRocket.xml b/Patches/Vanilla Weapons Expanded/Ammo/AntiGrainRocket.xml
deleted file mode 100644
index 031f9bde24..0000000000
--- a/Patches/Vanilla Weapons Expanded/Ammo/AntiGrainRocket.xml	
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Projectile === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="BaseSPG9Rocket">
-							<defName>Bullet_AntiGrainRocket</defName>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<label>anti-grain rocket</label>
-							<graphicData>
-								<texPath>Things/Projectile/RPG/Frag</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>100</speed>
-								<damageDef>EMP</damageDef>
-								<explosionRadius>8</explosionRadius>
-								<damageAmountBase>300</damageAmountBase>
-							</projectile>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>250</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>8</explosiveRadius>
-									<explosionSound>MortarBomb_Explode</explosionSound>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Small>100</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded/Ammo/ChargeTriplet.xml b/Patches/Vanilla Weapons Expanded/Ammo/ChargeTriplet.xml
deleted file mode 100644
index 86cdecad87..0000000000
--- a/Patches/Vanilla Weapons Expanded/Ammo/ChargeTriplet.xml	
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_8x35mmCharged_Triple</defName>
-							<label>8x35mm Charged</label>
-							<ammoTypes>
-								<Ammo_8x35mmCharged>Bullet_8x35mmCharged_Triple</Ammo_8x35mmCharged>
-								<Ammo_8x35mmCharged_AP>Bullet_8x35mmCharged_AP_Triple</Ammo_8x35mmCharged_AP>
-								<Ammo_8x35mmCharged_Ion>Bullet_8x35mmCharged_Ion_Triple</Ammo_8x35mmCharged_Ion>
-							</ammoTypes>
-							<similarTo>AmmoSet_ChargedRifle</similarTo>
-						</CombatExtended.AmmoSetDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingDef ParentName="Bullet_8x35mmCharged">
-							<defName>Bullet_8x35mmCharged_Triple</defName>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<pelletCount>3</pelletCount>
-								<spreadMult>1.8</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Bullet_8x35mmCharged_AP">
-							<defName>Bullet_8x35mmCharged_AP_Triple</defName>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<pelletCount>3</pelletCount>
-								<spreadMult>1.8</spreadMult>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Bullet_8x35mmCharged_Ion">
-							<defName>Bullet_8x35mmCharged_Ion_Triple</defName>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<pelletCount>3</pelletCount>
-								<spreadMult>1.8</spreadMult>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded/Ammo/FireExtinguisher.xml b/Patches/Vanilla Weapons Expanded/Ammo/FireExtinguisher.xml
deleted file mode 100644
index 99ac47929b..0000000000
--- a/Patches/Vanilla Weapons Expanded/Ammo/FireExtinguisher.xml	
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<!-- === Thing Category & Ammo Def === -->
-
-						<ThingCategoryDef>
-							<defName>AmmoVWEExtinguisher</defName>
-							<label>firefoam</label>
-							<parent>AmmoAdvanced</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberFuel</iconPath>
-						</ThingCategoryDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_VWE_Extinguisher</defName>
-							<label>firefoam</label>
-							<ammoTypes>
-								<Ammo_VWE_Extinguisher>Bullet_VWE_Extinguisher</Ammo_VWE_Extinguisher>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- === Ammo === -->
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_VWE_Extinguisher</defName>
-							<label>firefoam</label>
-							<description>Flame suppressant used by the Fire Extinguisher</description>
-							<graphicData>
-								<texPath>Things/Ammo/FuelCell/Foam</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.50</MarketValue>
-								<MaxHitPoints>70</MaxHitPoints>
-								<Flammability>1.0</Flammability>
-								<Mass>0.03</Mass>
-								<Bulk>0.03</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoVWEExtinguisher</li>
-							</thingCategories>
-							<stackLimit>500</stackLimit>
-							<ammoClass>FoamFuel</ammoClass>
-							<generateAllowChance>0</generateAllowChance>
-						</ThingDef>
-
-						<!-- === Projectile === -->
-						<ThingDef ParentName="BaseBulletCE">
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<defName>Bullet_VWE_Extinguisher</defName>
-							<label>firefoam</label>
-							<graphicData>
-								<texPath>Things/Projectile/Proj_FireExtinguisher/Proj_FireExtinguisherA</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>VWE_Extinguish</damageDef>
-								<damageAmountBase>50</damageAmountBase>
-								<explosionRadius>1</explosionRadius>
-								<suppressionFactor>0.0</suppressionFactor>
-								<dangerFactor>0.0</dangerFactor>
-								<preExplosionSpawnThingDef>Filth_FireFoam</preExplosionSpawnThingDef>
-								<preExplosionSpawnChance>1</preExplosionSpawnChance>
-								<soundExplode>VWE_Explosion_FireExtinguisher</soundExplode>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<speed>20</speed>
-								<flyOverhead>false</flyOverhead>
-							</projectile>
-						</ThingDef>
-
-						<!-- === Recipe === -->
-						<RecipeDef Name="ExtinguisherAmmoRecipeBase" ParentName="AmmoRecipeBase" Abstract="true">
-							<workSpeedStat>DrugSynthesisSpeed</workSpeedStat>
-							<effectWorking>Cook</effectWorking>
-							<soundWorking>Recipe_CookMeal</soundWorking>
-							<workSkill>Intellectual</workSkill>
-						</RecipeDef>
-
-						<RecipeDef ParentName="ExtinguisherAmmoRecipeBase">
-							<defName>MakeAmmo_VWE_Extinguisher</defName>
-							<label>make firefoam x500</label>
-							<description>Craft 500 units of firefoam.</description>
-							<jobString>Making firefoam.</jobString>
-							<recipeUsers>
-								<li>DrugLab</li>
-							</recipeUsers>
-							<researchPrerequisite>Firefoam</researchPrerequisite>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Chemfuel</li>
-										</thingDefs>
-									</filter>
-									<count>25</count>
-								</li>
-								<li>
-									<filter>
-										<categories>
-											<li>MeatRaw</li>
-										</categories>
-									</filter>
-									<count>25</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Chemfuel</li>
-								</thingDefs>
-								<categories>
-									<li>MeatRaw</li>
-								</categories>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_VWE_Extinguisher>500</Ammo_VWE_Extinguisher>
-							</products>
-						</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
deleted file mode 100644
index 45853757a3..0000000000
--- a/Patches/Vanilla Weapons Expanded/Ammo/Whip.xml	
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Projectile === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="BaseBulletCE">
-							<thingClass>CombatExtended.BulletCE</thingClass>
-							<defName>Bullet_VWE_Whip</defName>
-							<label>whip slash</label>
-							<graphicData>
-								<texPath>Things/Projectile/WhipSlash</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>80</speed>
-								<damageDef>VWE_RangedCut</damageDef>
-								<damageAmountBase>8</damageAmountBase>
-								<armorPenetrationSharp>0.65</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.6</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded/DamageDefs/Damage_RangedCut.xml b/Patches/Vanilla Weapons Expanded/DamageDefs/Damage_RangedCut.xml
deleted file mode 100644
index 1527d51b79..0000000000
--- a/Patches/Vanilla Weapons Expanded/DamageDefs/Damage_RangedCut.xml	
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-				<DamageDef>
-					<defName>VWE_RangedCut</defName>
-					<label>cut</label>
-					<workerClass>DamageWorker_Cut</workerClass>
-					<externalViolence>true</externalViolence>
-					<deathMessage>{0} has been cut to death.</deathMessage>
-					<hediff>Cut</hediff>
-					<hediffSkin>Cut</hediffSkin>
-					<hediffSolid>Crack</hediffSolid>
-					<impactSoundType>Slice</impactSoundType>
-					<armorCategory>Sharp</armorCategory>
-					<isRanged>true</isRanged>
-					<makesAnimalsFlee>true</makesAnimalsFlee>
-					<overkillPctToDestroyPart>0~0.1</overkillPctToDestroyPart>
-				</DamageDef>
-			</value>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded/Industrial_Grenades.xml b/Patches/Vanilla Weapons Expanded/Industrial_Grenades.xml
deleted file mode 100644
index 541bf8b286..0000000000
--- a/Patches/Vanilla Weapons Expanded/Industrial_Grenades.xml	
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Remove Flashbang / Smoke as they're redundant === -->
-				<li Class="PatchOperationRemove">
-					<xpath>
-						Defs/ThingDef[
-						defName = "VWE_Projectile_FlashGrenade" or
-						defName = "VWE_Projectile_SmokeGrenade" or
-						defName = "VWE_FlashGrenade" or
-						defName = "VWE_SmokeGrenade"]
-					</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded/Industrial_Melee.xml b/Patches/Vanilla Weapons Expanded/Industrial_Melee.xml
deleted file mode 100644
index 6998ac2e8d..0000000000
--- a/Patches/Vanilla Weapons Expanded/Industrial_Melee.xml	
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Baton === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_Baton"]/statBases</xpath>
-					<value>
-						<Bulk>2.75</Bulk>
-						<MeleeCounterParryBonus>0.9</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_Baton"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.17</MeleeCritChance>
-							<MeleeParryChance>0.9</MeleeParryChance>
-							<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_Baton"]/weaponTags</xpath>
-					<value>
-						<li>CE_Sidearm_Melee</li>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_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>
-				</li>
-
-				<!-- === Combat Knife === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_CombatKnife"]/statBases</xpath>
-					<value>
-						<Bulk>1.25</Bulk>
-						<MeleeCounterParryBonus>0.30</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_CombatKnife"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.10</MeleeCritChance>
-							<MeleeParryChance>0.30</MeleeParryChance>
-							<MeleeDodgeChance>0.010</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_CombatKnife"]/weaponTags</xpath>
-					<value>
-						<li>CE_Sidearm_Melee</li>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_CombatKnife"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<chanceFactor>0.33</chanceFactor>
-								<cooldownTime>1.26</cooldownTime>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>1</cooldownTime>
-								<armorPenetrationBlunt>0.56</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.72</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>1</cooldownTime>
-								<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.76</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Shovel === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_Shovel"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>0.56</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_Shovel"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.22</MeleeCritChance>
-						<MeleeParryChance>0.20</MeleeParryChance>
-						<MeleeDodgeChance>0.17</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_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>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded/Industrial_Ranged.xml b/Patches/Vanilla Weapons Expanded/Industrial_Ranged.xml
deleted file mode 100644
index 749a19d593..0000000000
--- a/Patches/Vanilla Weapons Expanded/Industrial_Ranged.xml	
+++ /dev/null
@@ -1,1057 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_Bow_Compound"]/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>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "VWE_CombatHandgun" or
-						defName = "VWE_Gun_HandCannon" or
-						defName = "VWE_Gun_LightSMG" or
-						defName = "VWE_Gun_SMG" or
-						defName = "VWE_SawedOffShotgun"
-						]/tools
-					</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "VWE_Gun_AntiMaterialRifle" or
-						defName = "VWE_Gun_SemiAutomaticRifle" or
-						defName = "VWE_Gun_BattleRifle" or
-						defName = "VWE_Gun_Carbine" or
-						defName = "VWE_Gun_Flamethrower" or
-						defName = "VWE_Gun_HMG" or
-						defName = "VWE_Gun_LeverActionRifle" or
-						defName = "VWE_Gun_MarksmanRifle" or
-						defName = "VWE_Gun_GrenadeLauncher" or
-						defName = "VWE_Gun_ServiceRifle"
-						]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_Gun_RocketLauncher"]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_Gun_FireExtinguisher"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tank</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2.02</cooldownTime>
-								<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Compound Bow === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Bow_Compound</defName>
-					<statBases>
-						<Bulk>4</Bulk>
-						<SwayFactor>2</SwayFactor>
-						<ShotSpread>1</ShotSpread>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Projectile_StreamlinedArrow_Steel</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>24</range>
-						<soundCast>VWE_Bow_Compound</soundCast>
-					</Properties>
-					<AmmoUser>
-						<ammoSet>AmmoSet_StreamlinedArrow</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags Inherit="False">
-						<li>CE_Bow</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Combat Handgun === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_CombatHandgun</defName>
-					<statBases>
-						<WorkToMake>7000</WorkToMake>
-						<Mass>1.11</Mass>
-						<Bulk>2.10</Bulk>
-						<SwayFactor>0.32</SwayFactor>
-						<ShotSpread>0.17</ShotSpread>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_45ACP_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_45ACP</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Hand Cannon === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_HandCannon</defName>
-					<statBases>
-						<WorkToMake>4500</WorkToMake>
-						<Mass>0.90</Mass>
-						<Bulk>2.41</Bulk>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.10</SwayFactor>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>20</Steel>
-						<WoodLog>5</WoodLog>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_357Magnum_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>VWE_Shot_Handcannon</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_357Magnum</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SimpleGun</li>
-						<li>Revolver</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Light SMG === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_LightSMG</defName>
-					<statBases>
-						<Mass>3.50</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>3.30</SwayFactor>
-						<Bulk>4.70</Bulk>
-						<WorkToMake>24000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.39</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>25</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<soundCast>VWE_Shot_LightSMG</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>CE_AI_AssaultWeapon</li>
-						<li>CE_SMG</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- === SMG === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_SMG</defName>
-					<statBases>
-						<WorkToMake>13000</WorkToMake>
-						<Mass>2.00</Mass>
-						<Bulk>3.25</Bulk>
-						<SwayFactor>1.75</SwayFactor>
-						<ShotSpread>0.17</ShotSpread>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.39</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_9x19mmPara_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>0.6</warmupTime>
-						<range>20</range>
-						<soundCast>VWE_Shot_SMG</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_9x19mmPara</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Sawed Off === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_SawedOffShotgun</defName>
-					<statBases>
-						<WorkToMake>9500</WorkToMake>
-						<Bulk>4.75</Bulk>
-						<Mass>1.85</Mass>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>2.20</SwayFactor>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.93</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>30</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>3.5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>14</range>
-						<soundCast>Shot_Shotgun_NoRack</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>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-					<researchPrerequisite>Gunsmithing</researchPrerequisite>
-				</li>
-
-				<!-- === Battle Rifle === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_BattleRifle</defName>
-					<statBases>
-						<WorkToMake>31000</WorkToMake>
-						<Mass>3.50</Mass>
-						<Bulk>8.89</Bulk>
-						<SwayFactor>1.24</SwayFactor>
-						<ShotSpread>0.11</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>45</Steel>
-						<Chemfuel>10</Chemfuel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.12</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>51</range>
-						<soundCast>VWE_Shot_BattleRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<!-- Required Research Rework -->
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-				</li>
-
-				<!-- === Carbine === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_Carbine</defName>
-					<statBases>
-						<WorkToMake>31500</WorkToMake>
-						<Mass>3.30</Mass>
-						<Bulk>6.90</Bulk>
-						<SwayFactor>1.04</SwayFactor>
-						<ShotSpread>0.09</ShotSpread>
-						<SightsEfficiency>2</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<Chemfuel>10</Chemfuel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>48</range>
-						<soundCast>Shot_AssaultRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<!-- Required Research Rework -->
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-				</li>
-
-				<!-- === Service Rifle === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_ServiceRifle</defName>
-					<statBases>
-						<WorkToMake>27000</WorkToMake>
-						<Mass>3.30</Mass>
-						<Bulk>6.90</Bulk>
-						<SwayFactor>1.04</SwayFactor>
-						<ShotSpread>0.09</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>45</Steel>
-						<WoodLog>10</WoodLog>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.53</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x39mmSoviet_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>44</range>
-						<soundCast>VWE_Shot_ServiceRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x39mmSoviet</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-					</weaponTags>
-					<!-- Required Research Rework -->
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-				</li>
-
-				<!-- === Semi Automatic Rifle === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_SemiAutomaticRifle</defName>
-					<statBases>
-						<WorkToMake>18500</WorkToMake>
-						<Mass>4.10</Mass>
-						<Bulk>11.26</Bulk>
-						<SwayFactor>1.54</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>55</Steel>
-						<WoodLog>10</WoodLog>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.75</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>52</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<!-- Required Research Rework -->
-					<researchPrerequisite>GasOperation</researchPrerequisite>
-				</li>
-
-				<!-- === Lever Action Rifle === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_LeverActionRifle</defName>
-					<statBases>
-						<WorkToMake>15500</WorkToMake>
-						<Mass>4.30</Mass>
-						<Bulk>12.50</Bulk>
-						<SwayFactor>1.67</SwayFactor>
-						<ShotSpread>0.02</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.77</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>60</Steel>
-						<WoodLog>10</WoodLog>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.75</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_44-40Winchester_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>31</range>
-						<soundCast>VWE_Shot_LeverActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_44-40Winchester</ammoSet>
-						<reloadOneAtATime>true</reloadOneAtATime>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<!-- Required Research Rework -->
-					<researchPrerequisite>Gunsmithing</researchPrerequisite>
-				</li>
-
-				<!-- === Anti Material Rifle === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_AntiMaterialRifle</defName>
-					<statBases>
-						<WorkToMake>39000</WorkToMake>
-						<Mass>13.50</Mass>
-						<Bulk>15.00</Bulk>
-						<SwayFactor>2.00</SwayFactor>
-						<ShotSpread>0.07</ShotSpread>
-						<SightsEfficiency>2.84</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.38</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>90</Steel>
-						<Chemfuel>20</Chemfuel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-						<warmupTime>3.5</warmupTime>
-						<range>86</range>
-						<soundCast>VWE_Shot_AntiMaterialRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SniperRifle</li>
-						<li>Bipod_AMR</li>
-					</weaponTags>
-					<!-- Required Research Rework -->
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- === Marksman Rifle === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_MarksmanRifle</defName>
-					<statBases>
-						<WorkToMake>23000</WorkToMake>
-						<Mass>4.30</Mass>
-						<Bulk>12.25</Bulk>
-						<SwayFactor>1.70</SwayFactor>
-						<ShotSpread>0.04</ShotSpread>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>60</Steel>
-						<WoodLog>10</WoodLog>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.94</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<soundCast>Shot_SniperRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SniperRifle</li>
-						<li>Bipod_DMR</li>
-					</weaponTags>
-					<!-- Required Research Rework -->
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- === Heavy Machine Gun === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_HMG</defName>
-					<statBases>
-						<WorkToMake>36500</WorkToMake>
-						<Mass>8.30</Mass>
-						<Bulk>13.00</Bulk>
-						<SwayFactor>1.28</SwayFactor>
-						<ShotSpread>0.07</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>70</Steel>
-						<WoodLog>15</WoodLog>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.49</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>1.3</warmupTime>
-						<range>65</range>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>IndustrialGunAdvanced</li>
-						<li>GunHeavy</li>
-						<li>CE_MachineGun</li>
-						<li>Bipod_LMG</li>
-					</weaponTags>
-					<!-- Required Research Rework -->
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- === Fire Extinguisher === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_FireExtinguisher</defName>
-					<statBases>
-						<WorkToMake>12500</WorkToMake>
-						<Mass>5.08</Mass>
-						<Bulk>7.40</Bulk>
-						<SwayFactor>1.28</SwayFactor>
-						<ShotSpread>0.15</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<Chemfuel>5</Chemfuel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_VWE_Extinguisher</defaultProjectile>
-						<burstShotCount>20</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>10</range>
-						<soundCast>VWE_Shot_FireExtinguisher</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>0</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>500</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_VWE_Extinguisher</ammoSet>
-					</AmmoUser>
-					<FireModes />
-					<weaponTags Inherit="False">
-						<li>ToolDecent</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Flamethrower === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_Flamethrower</defName>
-					<statBases>
-						<WorkToMake>25500</WorkToMake>
-						<Mass>5.5</Mass>
-						<Bulk>8</Bulk>
-						<SwayFactor>1.35</SwayFactor>
-						<ShotSpread>0.15</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<Chemfuel>10</Chemfuel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>0.85</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Flamethrower_Prometheum</defaultProjectile>
-						<burstShotCount>20</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<warmupTime>1.1</warmupTime>
-						<range>11</range>
-						<minRange>3</minRange>
-						<soundCast>VWE_Shot_Flamethrower</soundCast>
-						<muzzleFlashScale>0</muzzleFlashScale>
-						<ai_IsBuildingDestroyer>True</ai_IsBuildingDestroyer>
-						<targetParams>
-							<canTargetLocations>True</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>40</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_Flamethrower</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>10</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>GunHeavy</li>
-					</weaponTags>
-					<!-- Required Research Rework -->
-					<researchPrerequisite>CE_Launchers</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- === Grenade Launcher === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_GrenadeLauncher</defName>
-					<statBases>
-						<WorkToMake>25500</WorkToMake>
-						<Mass>5.35</Mass>
-						<Bulk>5.70</Bulk>
-						<SwayFactor>1.31</SwayFactor>
-						<ShotSpread>0.18</ShotSpread>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<Chemfuel>10</Chemfuel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.93</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>40</range>
-						<minRange>5</minRange>
-						<soundCast>VWE_Shot_GrenadeLauncher</soundCast>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<ai_IsBuildingDestroyer>True</ai_IsBuildingDestroyer>
-						<ignorePartialLoSBlocker>True</ignorePartialLoSBlocker>
-						<targetParams>
-							<canTargetLocations>True</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>5.1</reloadTime>
-						<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aiUseBurstMode>False</aiUseBurstMode>
-					</FireModes>
-					<weaponTags>
-						<li>GunHeavy</li>
-					</weaponTags>
-					<researchPrerequisite>CE_Launchers</researchPrerequisite>
-
-					<!-- Disallow with Run And Gun -->
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- === Rocket Launcher === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_RocketLauncher</defName>
-					<statBases>
-						<WorkToMake>43500</WorkToMake>
-						<Mass>12.0</Mass>
-						<Bulk>13.0</Bulk>
-						<SwayFactor>3.24</SwayFactor>
-						<ShotSpread>0.02</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>90</Steel>
-						<FSX>5</FSX>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Rocket</defaultProjectile>
-						<burstShotCount>1</burstShotCount>
-						<warmupTime>1.45</warmupTime>
-						<range>40</range>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<onlyManualCast>True</onlyManualCast>
-						<ai_IsBuildingDestroyer>True</ai_IsBuildingDestroyer>
-						<ignorePartialLoSBlocker>True</ignorePartialLoSBlocker>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>GunHeavy</li>
-						<li>CE_AI_Launcher</li>
-					</weaponTags>
-					<!-- Research prerequisite rework   -->
-					<researchPrerequisite>CE_AdvancedLaunchers</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- === Triple Rocket Launcher === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_TripleRocket</defName>
-					<statBases>
-						<WorkToMake>43000</WorkToMake>
-						<Mass>12.00</Mass>
-						<Bulk>13.00</Bulk>
-						<SwayFactor>2.20</SwayFactor>
-						<ShotSpread>0.20</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>90</Steel>
-						<FSX>3</FSX>
-						<ComponentIndustrial>7</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Rocket</defaultProjectile>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>20</ticksBetweenBurstShots>
-						<warmupTime>1.9</warmupTime>
-						<range>40</range>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSingleShot>True</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Launcher</li>
-					</weaponTags>
-					<!-- Research requisite rework -->
-					<researchPrerequisite>CE_AdvancedLaunchers</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- === Doomsday Rocket Launcher === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_DoomsdayRocket</defName>
-					<statBases>
-						<WorkToMake>49500</WorkToMake>
-						<Mass>20.00</Mass>
-						<Bulk>13.0</Bulk>
-						<SwayFactor>3.24</SwayFactor>
-						<ShotSpread>0.20</ShotSpread>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>125</Steel>
-						<FSX>5</FSX>
-						<ComponentIndustrial>8</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_DoomsdayRocket</defaultProjectile>
-						<burstShotCount>1</burstShotCount>
-						<warmupTime>2.1</warmupTime>
-						<range>48</range>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<onlyManualCast>true</onlyManualCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Launcher</li>
-					</weaponTags>
-					<!-- Research requisite rework -->
-					<researchPrerequisite>CE_AdvancedLaunchers</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded/Medieval_Melee.xml b/Patches/Vanilla Weapons Expanded/Medieval_Melee.xml
deleted file mode 100644
index 4ad2f554c5..0000000000
--- a/Patches/Vanilla Weapons Expanded/Medieval_Melee.xml	
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Battle Axe === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_BattleAxe"]/statBases</xpath>
-					<value>
-						<Bulk>13</Bulk>
-						<MeleeCounterParryBonus>1.5</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_BattleAxe"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.3</MeleeCritChance>
-							<MeleeParryChance>1.6</MeleeParryChance>
-							<MeleeDodgeChance>0.56</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_BattleAxe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<chanceFactor>0.33</chanceFactor>
-								<cooldownTime>1.31</cooldownTime>
-								<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>48</power>
-								<cooldownTime>3.4</cooldownTime>
-								<armorPenetrationBlunt>10.4</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.8</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>41</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>2.3</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.2</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Halberd === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_Halberd"]/statBases</xpath>
-					<value>
-						<Bulk>13</Bulk>
-						<MeleeCounterParryBonus>1.08</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_Halberd"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>1.45</MeleeParryChance>
-							<MeleeDodgeChance>0.6</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_Halberd"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<chanceFactor>0.33</chanceFactor>
-								<cooldownTime>1.31</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>3.4</cooldownTime>
-								<armorPenetrationBlunt>8.3</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.69</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>1.4</cooldownTime>
-								<armorPenetrationBlunt>2.1</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.15</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Hammer === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_Hammer"]/statBases</xpath>
-					<value>
-						<Bulk>3.75</Bulk>
-						<MeleeCounterParryBonus>0.06</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_Hammer"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>0.45</MeleeCritChance>
-						<MeleeParryChance>0.11</MeleeParryChance>
-						<MeleeDodgeChance>0.10</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_Hammer"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_Hammer"]/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.62</cooldownTime>
-								<armorPenetrationBlunt>0.675</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>2.79</cooldownTime>
-								<armorPenetrationBlunt>2.7</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded/Medieval_Ranged.xml b/Patches/Vanilla Weapons Expanded/Medieval_Ranged.xml
deleted file mode 100644
index 5e93203965..0000000000
--- a/Patches/Vanilla Weapons Expanded/Medieval_Ranged.xml	
+++ /dev/null
@@ -1,447 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_Bow_Crossbow"]/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>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VWE_Gun_Flintlock"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VWE_Gun_Musket"]/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>
-				</li>
-
-				<!-- === Crossbow === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Bow_Crossbow</defName>
-					<statBases>
-						<Bulk>6</Bulk>
-						<SwayFactor>1.2</SwayFactor>
-						<ShotSpread>0.5</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<WoodLog>70</WoodLog>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Projectile_CrossbowBolt_Steel</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>20</range>
-						<soundCast>Bow_Large</soundCast>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>7</reloadTime>
-						<ammoSet>AmmoSet_CrossbowBolt</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>NeolithicRangedHeavy</li>
-						<li>NeolithicRangedChief</li>
-						<li>CE_Bow</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Flintlock === -->
-				<!-- 
-          - VWE uses a custom verb to trigger smoke effects after the gun is fired, this causes trouble with CE and just overriding it doesn't work.
-          - Has to be replaced in vanilla too 
-        -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_Gun_Flintlock"]/verbs/li/verbClass</xpath>
-					<value>
-						<verbClass>Verb_Shoot</verbClass>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_Flintlock</defName>
-					<statBases>
-						<WorkToMake>3500</WorkToMake>
-						<Mass>1.25</Mass>
-						<Bulk>3.90</Bulk>
-						<SwayFactor>1.22</SwayFactor>
-						<ShotSpread>0.36</ShotSpread>
-						<SightsEfficiency>0.5</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>25</Steel>
-						<WoodLog>5</WoodLog>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_SlowMusketBall</defaultProjectile>
-						<warmupTime>1.66</warmupTime>
-						<range>12</range>
-						<soundCast>VWE_Shot_Musket</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>6.5</reloadTime>
-						<ammoSet>AmmoSet_SlowMusketBall</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>NeolithicRangedHeavy</li>
-						<li>NeolithicRangedChief</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Musket === -->
-				<!-- 
-          - VWE uses a custom verb to trigger smoke effects after the gun is fired, this causes trouble with CE and just overriding it doesn't work.
-          - Has to be replaced in vanilla too 
-        -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_Gun_Musket"]/verbs/li/verbClass</xpath>
-					<value>
-						<verbClass>Verb_Shoot</verbClass>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_Musket</defName>
-					<statBases>
-						<WorkToMake>20000</WorkToMake>
-						<Mass>4.8</Mass>
-						<Bulk>14.9</Bulk>
-						<SwayFactor>1.92</SwayFactor>
-						<ShotSpread>0.30</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.35</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>65</Steel>
-						<WoodLog>15</WoodLog>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_FastMusketBall</defaultProjectile>
-						<warmupTime>2.5</warmupTime>
-						<range>45</range>
-						<soundCast>VWE_Shot_Musket</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>10</reloadTime>
-						<ammoSet>AmmoSet_FastMusketBall</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>NeolithicRangedHeavy</li>
-						<li>NeolithicRangedChief</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Throwing Knives === -->
-				<!-- == Projectile == -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_FlyingBlade"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<damageDef>RangedStab</damageDef>
-							<damageAmountBase>11</damageAmountBase>
-							<flyOverhead>false</flyOverhead>
-							<speed>12</speed>
-							<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							<armorPenetrationSharp>0.4</armorPenetrationSharp>
-							<preExplosionSpawnChance>0.80</preExplosionSpawnChance>
-							<preExplosionSpawnThingDef>VWE_Throwing_Knives</preExplosionSpawnThingDef>
-						</projectile>
-					</value>
-				</li>
-
-				<!-- == Weapon == -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_Throwing_Knives"]/graphicData</xpath>
-					<value>
-						<graphicData>
-							<texPath>Things/Projectile/KnifeThrown</texPath>
-							<graphicClass>Graphic_Single</graphicClass>
-						</graphicData>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="VWE_Throwing_Knives"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>BaseWeapon</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_Throwing_Knives"]</xpath>
-					<value>
-						<thingCategories>
-							<li>WeaponsRanged</li>
-						</thingCategories>
-					</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>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<stackLimit>75</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-						<smeltProducts>
-							<Steel>1</Steel>
-						</smeltProducts>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="VWE_Throwing_Knives"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Throwing_Knives</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>1.5</ShotSpread>
-						<SwayFactor>2</SwayFactor>
-						<Bulk>0.35</Bulk>
-						<Mass>0.15</Mass>
-						<RangedWeapon_Cooldown>0.48</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<label>Throw knife</label>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>VWE_FlyingBlade</defaultProjectile>
-						<warmupTime>0.66</warmupTime>
-						<range>10</range>
-						<soundCast>ThrowGrenade</soundCast>
-						<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
-					</Properties>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_Throwing_Knives"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>1.26</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.42</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- == Recipe == -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<RecipeDef ParentName="GrenadeRecipeBase">
-							<defName>MakeVWEThrowingKnives</defName>
-							<label>make throwing knives x10</label>
-							<description>Craft 10 throwing knives.</description>
-							<jobString>Making throwing knives.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>14</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<VWE_Throwing_Knives>14</VWE_Throwing_Knives>
-							</products>
-							<recipeUsers>
-								<li>FueledSmithy</li>
-								<li>ElectricSmithy</li>
-							</recipeUsers>
-						</RecipeDef>
-					</value>
-				</li>
-
-				<!-- === Whip === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Tool_Whip</defName>
-					<statBases>
-						<WorkToMake>6800</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.5</ShotSpread>
-						<SwayFactor>0.26</SwayFactor>
-						<Bulk>1.5</Bulk>
-						<Mass>0.9</Mass>
-						<RangedWeapon_Cooldown>.48</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_VWE_Whip</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>6</range>
-						<soundCast>VWE_Shot_Whip</soundCast>
-					</Properties>
-				</li>
-
-				<!-- Tools -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_Tool_Whip"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded/Neolithic_Melee.xml b/Patches/Vanilla Weapons Expanded/Neolithic_Melee.xml
deleted file mode 100644
index 8e80dfdc13..0000000000
--- a/Patches/Vanilla Weapons Expanded/Neolithic_Melee.xml	
+++ /dev/null
@@ -1,70 +0,0 @@
-<?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.33</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>
-								<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.xml b/Patches/Vanilla Weapons Expanded/Neolithic_Ranged.xml
deleted file mode 100644
index 5533d85749..0000000000
--- a/Patches/Vanilla Weapons Expanded/Neolithic_Ranged.xml	
+++ /dev/null
@@ -1,215 +0,0 @@
-<?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.8</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>30</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>
-
-				<!-- == Tools == -->
-				<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="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VWE_Throwing_Rocks"]</xpath>
-					<value>
-						<thingCategories>
-							<li>WeaponsRanged</li>
-						</thingCategories>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>
-						Defs/ThingDef[defName="VWE_Throwing_Rocks"]/recipeMaker |
-						Defs/ThingDef[defName="VWE_Throwing_Rocks"]/costStuffCount |
-						Defs/ThingDef[defName="VWE_Throwing_Rocks"]/stuffCategories
-					</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_Throwing_Rocks"]/smeltable</xpath>
-					<value>
-						<thingClass>CombatExtended.AmmoThing</thingClass>
-						<stackLimit>75</stackLimit>
-						<resourceReadoutPriority>First</resourceReadoutPriority>
-						<smeltable>false</smeltable>
-					</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="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName = "VWE_Throwing_Rocks"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName = "VWE_Throwing_Rocks"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</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>
-
-				<!-- == Recipe == -->
-				<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
diff --git a/Patches/Vanilla Weapons Expanded/ResearchProjects.xml b/Patches/Vanilla Weapons Expanded/ResearchProjects.xml
deleted file mode 100644
index 4328dfea5b..0000000000
--- a/Patches/Vanilla Weapons Expanded/ResearchProjects.xml	
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Prerequisite Replacement === -->
-				<!-- == Laser Targeting Systems == -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ResearchProjectDef[defName="VWE_LaserTargetingSystems"]/prerequisites</xpath>
-					<value>
-						<prerequisites>
-							<li>CE_AdvancedLaunchers</li>
-							<li>ChargedShot</li>
-						</prerequisites>
-					</value>
-				</li>
-
-				<!-- === Remove Unused Research Defs === -->
-				<li Class="PatchOperationRemove">
-					<xpath>
-						Defs/ResearchProjectDef[
-						defName="VWE_HeavyWeapons" or
-						defName="VWE_DesignatedMarksmanRifle" or
-						defName="VWE_Flamethrower" or
-						defName="VWE_HeavyWeapons"]
-					</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded/Spacer_Ranged.xml b/Patches/Vanilla Weapons Expanded/Spacer_Ranged.xml
deleted file mode 100644
index 70a3b88e1a..0000000000
--- a/Patches/Vanilla Weapons Expanded/Spacer_Ranged.xml	
+++ /dev/null
@@ -1,442 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName ="VWE_Gun_ChargePistol" or
-						defName = "VWE_Gun_ChargeSMG"]/tools
-					</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "VWE_Gun_ChargeShotgun" or
-						defName = "VWE_Gun_ChargeSniperRifle" or
-						defName = "VWE_Gun_ChargeLMG" or
-						defName = "VWE_Gun_ChargeMinigun"
-						]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VWE_Gun_ChargeRocketLauncher"]/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>
-				</li>
-
-				<!-- === Charge Pistol === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_ChargePistol</defName>
-					<statBases>
-						<WorkToMake>16000</WorkToMake>
-						<Mass>1.50</Mass>
-						<Bulk>2.60</Bulk>
-						<SwayFactor>1.07</SwayFactor>
-						<ShotSpread>0.15</ShotSpread>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>20</Steel>
-						<Plasteel>30</Plasteel>
-						<Chemfuel>5</Chemfuel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-						<ComponentSpacer>1</ComponentSpacer>
-					</costList>
-					<Properties>
-						<recoilAmount>3.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<warmupTime>0.5</warmupTime>
-						<range>12</range>
-						<soundCast>VWE_Shot_ChargePistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Charge SMG === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_ChargeSMG</defName>
-					<statBases>
-						<WorkToMake>40000</WorkToMake>
-						<Mass>2.80</Mass>
-						<Bulk>5.00</Bulk>
-						<SwayFactor>0.75</SwayFactor>
-						<ShotSpread>0.16</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>55</Steel>
-						<Plasteel>25</Plasteel>
-						<Chemfuel>15</Chemfuel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-						<ComponentSpacer>1</ComponentSpacer>
-					</costList>
-					<Properties>
-						<recoilAmount>1.20</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>0.5</warmupTime>
-						<range>31</range>
-						<soundCast>VWE_Shot_ChargeSMG</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Charge Shotgun === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_ChargeShotgun</defName>
-					<statBases>
-						<WorkToMake>46000</WorkToMake>
-						<Mass>4.35</Mass>
-						<Bulk>6.0</Bulk>
-						<SwayFactor>1.25</SwayFactor>
-						<ShotSpread>0.14</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>50</Steel>
-						<Plasteel>25</Plasteel>
-						<Chemfuel>15</Chemfuel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-						<ComponentSpacer>1</ComponentSpacer>
-					</costList>
-					<Properties>
-						<recoilAmount>3.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_12GaugeCharged</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>20</range>
-						<soundCast>VWE_Shot_ChargeShotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_12GaugeCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Charge Sniper Rifle === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_ChargeSniperRifle</defName>
-					<statBases>
-						<WorkToMake>49000</WorkToMake>
-						<Mass>8</Mass>
-						<Bulk>14.5</Bulk>
-						<SwayFactor>2.25</SwayFactor>
-						<ShotSpread>0.05</ShotSpread>
-						<SightsEfficiency>2.6</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
-						<NightVisionEfficiency_Weapon>0.4</NightVisionEfficiency_Weapon>
-					</statBases>
-					<costList>
-						<Steel>75</Steel>
-						<Plasteel>40</Plasteel>
-						<Chemfuel>15</Chemfuel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-						<ComponentSpacer>1</ComponentSpacer>
-					</costList>
-					<Properties>
-						<recoilAmount>1.5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_8x35mmCharged_Triple</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<range>75</range>
-						<soundCast>VWE_Shot_ChargeSniperRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-						<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_8x35mmCharged_Triple</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SniperRifle</li>
-						<li>SpacerGun</li>
-						<li>Bipod_DMR</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- === Charge LMG === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_ChargeLMG</defName>
-					<statBases>
-						<WorkToMake>55000</WorkToMake>
-						<Mass>9.0</Mass>
-						<Bulk>16.46</Bulk>
-						<SwayFactor>1.26</SwayFactor>
-						<ShotSpread>0.05</ShotSpread>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>65</Steel>
-						<Plasteel>30</Plasteel>
-						<Chemfuel>15</Chemfuel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-						<ComponentSpacer>1</ComponentSpacer>
-					</costList>
-					<Properties>
-						<recoilAmount>1.16</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>1.2</warmupTime>
-						<range>62</range>
-						<soundCast>Shot_ChargeBlaster</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-						<targetParams>
-							<canTargetLocations>True</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>200</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aiUseBurstMode>False</aiUseBurstMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-						<li>CE_MachineGun</li>
-						<li>Bipod_SAW</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- === Charge Minigun === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_ChargeMinigun</defName>
-					<statBases>
-						<WorkToMake>60000</WorkToMake>
-						<Mass>20.0</Mass>
-						<Bulk>12.0</Bulk>
-						<SwayFactor>1.35</SwayFactor>
-						<ShotSpread>0.10</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>120</Steel>
-						<Plasteel>40</Plasteel>
-						<Chemfuel>15</Chemfuel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-						<ComponentSpacer>1</ComponentSpacer>
-					</costList>
-					<Properties>
-						<recoilAmount>1.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
-						<burstShotCount>50</burstShotCount>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<warmupTime>2.5</warmupTime>
-						<range>62</range>
-						<soundCast>VWE_Shot_ChargeMinigun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>500</magazineSize>
-						<reloadTime>9.2</reloadTime>
-						<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>25</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>SpacerGun</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- === Charge Rocket Launcher === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VWE_Gun_ChargeRocketLauncher</defName>
-					<statBases>
-						<WorkToMake>88000</WorkToMake>
-						<Mass>24.0</Mass>
-						<Bulk>15.65</Bulk>
-						<SwayFactor>3.24</SwayFactor>
-						<ShotSpread>0.01</ShotSpread>
-						<SightsEfficiency>2.5</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.9</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>125</Steel>
-						<Plasteel>45</Plasteel>
-						<FSX>10</FSX>
-						<ComponentIndustrial>4</ComponentIndustrial>
-						<ComponentSpacer>1</ComponentSpacer>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_AntiGrainRocket</defaultProjectile>
-						<warmupTime>2</warmupTime>
-						<range>52</range>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<onlyManualCast>True</onlyManualCast>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>GunHeavy</li>
-					</weaponTags>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla XCOM weapons/Laser Weapons/Ammo.xml b/Patches/Vanilla XCOM weapons/Laser Weapons/Ammo.xml
deleted file mode 100644
index 06447acbd8..0000000000
--- a/Patches/Vanilla XCOM weapons/Laser Weapons/Ammo.xml	
+++ /dev/null
@@ -1,703 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla XCOM Laser Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<CombatExtended.AmmoCategoryDef>
-							<defName>XCOM_Laser</defName>
-							<label>laser</label>
-							<labelShort>laser</labelShort>
-							<description>Batteries and reagents that can power a chemlaser emitter. The reagents generates laser at visible wavelengths.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>XCOM_LaserInc</defName>
-							<label>infrared laser</label>
-							<labelShort>IR laser</labelShort>
-							<description>Batteries and reagents that can power a chemlaser emitter. The reagents generates laser at infrared wavelengths, causing burns and start fires.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>XCOM_LaserHP</defName>
-							<label>untraviolet laser</label>
-							<labelShort>UV laser</labelShort>
-							<description>Batteries and reagents that can power a chemlaser emitter. The reagents generates laser at untraviolet wavelengths, delivering more energy and causing more damage.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>XCOM_LaserEMP</defName>
-							<label>EM laser</label>
-							<labelShort>EM laser</labelShort>
-							<description>Batteries and reagents that can power a chemlaser emitter. The reagents generates laser at radio wavelengths, disrupting electronic systems.</description>
-						</CombatExtended.AmmoCategoryDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="LaserChargePackBase">
-							<defName>Ammo_XCOMLaserPack</defName>
-							<label>standard laser cell</label>
-							<graphicData>
-								<texPath>ThirdParty/VanillaXCOM/Laser/Standard</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.69</MarketValue>
-							</statBases>
-							<ammoClass>XCOM_Laser</ammoClass>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="LaserChargePackBase">
-							<defName>Ammo_XCOMLaserPackInc</defName>
-							<label>infrared laser cell</label>
-							<graphicData>
-								<texPath>ThirdParty/VanillaXCOM/Laser/Infrared</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.69</MarketValue>
-							</statBases>
-							<ammoClass>XCOM_LaserInc</ammoClass>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="LaserChargePackBase">
-							<defName>Ammo_XCOMLaserPackHP</defName>
-							<label>untraviolet laser cell</label>
-							<graphicData>
-								<texPath>ThirdParty/VanillaXCOM/Laser/Ultraviolet</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.69</MarketValue>
-							</statBases>
-							<ammoClass>XCOM_LaserHP</ammoClass>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="LaserChargePackBase">
-							<defName>Ammo_XCOMLaserPackEMP</defName>
-							<label>EM frequency laser cell</label>
-							<graphicData>
-								<texPath>ThirdParty/VanillaXCOM/Laser/EM</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.69</MarketValue>
-							</statBases>
-							<ammoClass>XCOM_LaserEMP</ammoClass>
-						</ThingDef>
-
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_XCOMLaserPack</defName>
-							<label>make laser charge pack x500</label>
-							<description>Craft 500 laser charge pack.</description>
-							<jobString>Making laser charge pack.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Plasteel</li>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_XCOMLaserPack>500</Ammo_XCOMLaserPack>
-							</products>
-							<workAmount>8400</workAmount>
-						</RecipeDef>
-
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_XCOMLaserPackInc</defName>
-							<label>make laser charge pack x500</label>
-							<description>Craft 500 laser charge pack.</description>
-							<jobString>Making laser charge pack.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Plasteel</li>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_XCOMLaserPackInc>500</Ammo_XCOMLaserPackInc>
-							</products>
-							<workAmount>8400</workAmount>
-						</RecipeDef>
-
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_XCOMLaserPackHP</defName>
-							<label>make laser charge pack x500</label>
-							<description>Craft 500 laser charge pack.</description>
-							<jobString>Making laser charge pack.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Plasteel</li>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_XCOMLaserPackHP>500</Ammo_XCOMLaserPackHP>
-							</products>
-							<workAmount>8400</workAmount>
-						</RecipeDef>
-
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_XCOMLaserPackEMP</defName>
-							<label>make laser charge pack x500</label>
-							<description>Craft 500 laser charge pack.</description>
-							<jobString>Making laser charge pack.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>8</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Plasteel</li>
-									<li>Steel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_XCOMLaserPackEMP>500</Ammo_XCOMLaserPackEMP>
-							</products>
-							<workAmount>8400</workAmount>
-						</RecipeDef>
-
-						<!-- laser rifle-->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_XCOM_Gun_LaserRifle</defName>
-							<label>laser</label>
-							<ammoTypes>
-								<Ammo_XCOMLaserPack>XCOM_Bullet_LaserRifleCE</Ammo_XCOMLaserPack>
-								<Ammo_XCOMLaserPackInc>XCOM_Bullet_LaserRifleCEInc</Ammo_XCOMLaserPackInc>
-								<Ammo_XCOMLaserPackHP>XCOM_Bullet_LaserRifleCEHP</Ammo_XCOMLaserPackHP>
-								<Ammo_XCOMLaserPackEMP>XCOM_Bullet_LaserRifleCEEMP</Ammo_XCOMLaserPackEMP>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletGreen">
-							<defName>XCOM_Bullet_LaserRifleCE</defName>
-							<label>laser beam</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationSharp>17.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>6</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletRed">
-							<defName>XCOM_Bullet_LaserRifleCEInc</defName>
-							<label>laser beam</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>CE_Laser</damageDef>
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationSharp>17.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame</def>
-										<amount>12</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletPurple">
-							<defName>XCOM_Bullet_LaserRifleCEHP</defName>
-							<label>laser beam</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>CE_Laser</damageDef>
-								<damageAmountBase>18</damageAmountBase>
-								<armorPenetrationSharp>34.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>8</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletBlue">
-							<defName>XCOM_Bullet_LaserRifleCEEMP</defName>
-							<label>laser beam</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>CE_Laser</damageDef>
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationSharp>17.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>6</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<!-- Laser sniper-->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_XCOM_Gun_LaserSniperRifle</defName>
-							<label>laser</label>
-							<ammoTypes>
-								<Ammo_XCOMLaserPack>XCOM_Bullet_LaserSniperRifleCE</Ammo_XCOMLaserPack>
-								<Ammo_XCOMLaserPackInc>XCOM_Bullet_LaserSniperRifleCEInc</Ammo_XCOMLaserPackInc>
-								<Ammo_XCOMLaserPackHP>XCOM_Bullet_LaserSniperRifleCEHP</Ammo_XCOMLaserPackHP>
-								<Ammo_XCOMLaserPackEMP>XCOM_Bullet_LaserSniperRifleCEEMP</Ammo_XCOMLaserPackEMP>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletGreen">
-							<defName>XCOM_Bullet_LaserSniperRifleCE</defName>
-							<label>laser beam</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>CE_Laser</damageDef>
-								<damageAmountBase>16</damageAmountBase>
-								<armorPenetrationSharp>18.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>8</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletRed">
-							<defName>XCOM_Bullet_LaserSniperRifleCEInc</defName>
-							<label>laser beam</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>CE_Laser</damageDef>
-								<damageAmountBase>16</damageAmountBase>
-								<armorPenetrationSharp>18.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame</def>
-										<amount>16</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletPurple">
-							<defName>XCOM_Bullet_LaserSniperRifleCEHP</defName>
-							<label>laser beam</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>CE_Laser</damageDef>
-								<damageAmountBase>24</damageAmountBase>
-								<armorPenetrationSharp>38.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>12</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletBlue">
-							<defName>XCOM_Bullet_LaserSniperRifleCEEMP</defName>
-							<label>laser beam</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>CE_Laser</damageDef>
-								<damageAmountBase>18</damageAmountBase>
-								<armorPenetrationSharp>18.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>8</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<!-- scatter Laser-->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_XCOM_Gun_LaserShotgun</defName>
-							<label>laser</label>
-							<ammoTypes>
-								<Ammo_XCOMLaserPack>XCOM_Bullet_LaserShotgunCE</Ammo_XCOMLaserPack>
-								<Ammo_XCOMLaserPackInc>XCOM_Bullet_LaserShotgunCEInc</Ammo_XCOMLaserPackInc>
-								<Ammo_XCOMLaserPackHP>XCOM_Bullet_LaserShotgunCEHP</Ammo_XCOMLaserPackHP>
-								<Ammo_XCOMLaserPackEMP>XCOM_Bullet_LaserShotgunCEEMP</Ammo_XCOMLaserPackEMP>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletGreen">
-							<defName>XCOM_Bullet_LaserShotgunCE</defName>
-							<label>laser beam</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>CE_Laser</damageDef>
-								<damageAmountBase>6</damageAmountBase>
-								<armorPenetrationSharp>15.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-								<pelletCount>7</pelletCount>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>3</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletRed">
-							<defName>XCOM_Bullet_LaserShotgunCEInc</defName>
-							<label>laser beam</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>CE_Laser</damageDef>
-								<damageAmountBase>6</damageAmountBase>
-								<armorPenetrationSharp>15.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-								<pelletCount>7</pelletCount>
-								<secondaryDamage>
-									<li>
-										<def>Flame</def>
-										<amount>6</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletPurple">
-							<defName>XCOM_Bullet_LaserShotgunCEHP</defName>
-							<label>laser beam</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>CE_Laser</damageDef>
-								<damageAmountBase>9</damageAmountBase>
-								<armorPenetrationSharp>24.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-								<pelletCount>5</pelletCount>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>5</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletBlue">
-							<defName>XCOM_Bullet_LaserShotgunCEEMP</defName>
-							<label>laser beam</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>CE_Laser</damageDef>
-								<damageAmountBase>6</damageAmountBase>
-								<armorPenetrationSharp>15.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-								<pelletCount>7</pelletCount>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>3</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<!-- Laser cannon (bruh)-->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_XCOM_Gun_LaserCannon</defName>
-							<label>laser</label>
-							<ammoTypes>
-								<Ammo_XCOMLaserPack>XCOM_Bullet_LaserCannonCE</Ammo_XCOMLaserPack>
-								<Ammo_XCOMLaserPackInc>XCOM_Bullet_LaserCannonCEInc</Ammo_XCOMLaserPackInc>
-								<Ammo_XCOMLaserPackHP>XCOM_Bullet_LaserCannonCEHP</Ammo_XCOMLaserPackHP>
-								<Ammo_XCOMLaserPackEMP>XCOM_Bullet_LaserCannonCEEMP</Ammo_XCOMLaserPackEMP>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletGreen">
-							<defName>XCOM_Bullet_LaserCannonCE</defName>
-							<label>laser beam</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>CE_Laser</damageDef>
-								<damageAmountBase>10</damageAmountBase>
-								<armorPenetrationSharp>16.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>5</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletRed">
-							<defName>XCOM_Bullet_LaserCannonCEInc</defName>
-							<label>laser beam</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>CE_Laser</damageDef>
-								<damageAmountBase>10</damageAmountBase>
-								<armorPenetrationSharp>16.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame</def>
-										<amount>10</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletPurple">
-							<defName>XCOM_Bullet_LaserCannonCEHP</defName>
-							<label>laser beam</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>CE_Laser</damageDef>
-								<damageAmountBase>15</damageAmountBase>
-								<armorPenetrationSharp>24.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>13</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletBlue">
-							<defName>XCOM_Bullet_LaserCannonCEEMP</defName>
-							<label>laser beam</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>CE_Laser</damageDef>
-								<damageAmountBase>10</damageAmountBase>
-								<armorPenetrationSharp>16.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>5</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<!-- Laser pistol-->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_XCOM_Gun_LaserPistol</defName>
-							<label>laser</label>
-							<ammoTypes>
-								<Ammo_XCOMLaserPack>XCOM_Bullet_Laser_PistolCE</Ammo_XCOMLaserPack>
-								<Ammo_XCOMLaserPackInc>XCOM_Bullet_Laser_PistolCEInc</Ammo_XCOMLaserPackInc>
-								<Ammo_XCOMLaserPackHP>XCOM_Bullet_Laser_PistolCEHP</Ammo_XCOMLaserPackHP>
-								<Ammo_XCOMLaserPackEMP>XCOM_Bullet_Laser_PistolCEEMP</Ammo_XCOMLaserPackEMP>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletGreen">
-							<defName>XCOM_Bullet_Laser_PistolCE</defName>
-							<label>laser beam</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>CE_Laser</damageDef>
-								<damageAmountBase>6</damageAmountBase>
-								<armorPenetrationSharp>17.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>4</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletRed">
-							<defName>XCOM_Bullet_Laser_PistolCEInc</defName>
-							<label>laser beam</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>CE_Laser</damageDef>
-								<damageAmountBase>6</damageAmountBase>
-								<armorPenetrationSharp>17.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame</def>
-										<amount>6</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletPurple">
-							<defName>XCOM_Bullet_Laser_PistolCEHP</defName>
-							<label>laser beam</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>CE_Laser</damageDef>
-								<damageAmountBase>9</damageAmountBase>
-								<armorPenetrationSharp>27.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>6</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletBlue">
-							<defName>XCOM_Bullet_Laser_PistolCEEMP</defName>
-							<label>laser beam</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>CE_Laser</damageDef>
-								<damageAmountBase>6</damageAmountBase>
-								<armorPenetrationSharp>17.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>4</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<!-- rail gun-->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_XCOM_Gun_LaserRailgun</defName>
-							<label>12mm Railgun</label>
-							<ammoTypes>
-								<Ammo_12mmRailgun_Sabot>XCOM_Bullet_LaserRailgunCE</Ammo_12mmRailgun_Sabot>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletYellow">
-							<defName>XCOM_Bullet_LaserRailgunCE</defName>
-							<label>12mm Railgun bullet (Sabot)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>73</damageAmountBase>
-								<armorPenetrationSharp>130</armorPenetrationSharp>
-								<armorPenetrationBlunt>7250</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla XCOM weapons/Laser Weapons/Weapon_Ranged.xml b/Patches/Vanilla XCOM weapons/Laser Weapons/Weapon_Ranged.xml
deleted file mode 100644
index b12b98f502..0000000000
--- a/Patches/Vanilla XCOM weapons/Laser Weapons/Weapon_Ranged.xml	
+++ /dev/null
@@ -1,362 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla XCOM Laser Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName="XCOM_Gun_LaserRifle" or
-						defName="XCOM_Gun_LaserSniperRifle" or
-						defName="XCOM_Gun_LaserShotgun" or
-						defName="XCOM_Gun_LaserCannon" or
-						defName="XCOM_Gun_LaserRailgun"
-						]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="XCOM_Gun_LaserPistol"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- XCOM laser Rifle -->
-				<!-- so, faster firing single shot gun-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_Gun_LaserRifle</defName>
-					<statBases>
-						<Mass>3.50</Mass>
-						<Bulk>10.00</Bulk>
-						<SwayFactor>1.35</SwayFactor>
-						<ShotSpread>0.08</ShotSpread>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
-						<WorkToMake>45000</WorkToMake>
-					</statBases>
-					<costList>
-						<Plasteel>70</Plasteel>
-						<ComponentSpacer>3</ComponentSpacer>
-					</costList>
-					<Properties>
-						<hasStandardCommand>true</hasStandardCommand>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<soundAiming>Laser_Warmup</soundAiming>
-						<recoilAmount>0</recoilAmount>
-						<defaultProjectile>XCOM_Bullet_LaserRifleCE</defaultProjectile>
-						<warmupTime>0.9</warmupTime>
-						<range>46</range>
-						<soundCast>Laser_Rifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_XCOM_Gun_LaserRifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AR</li>
-					</weaponTags>
-					<researchPrerequisite>XCOM_LaserWeapons</researchPrerequisite>
-				</li>
-
-				<!-- XCOM laser sniper-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_Gun_LaserSniperRifle</defName>
-					<statBases>
-						<Mass>4.20</Mass>
-						<Bulk>13.00</Bulk>
-						<SwayFactor>1.19</SwayFactor>
-						<ShotSpread>0.04</ShotSpread>
-						<SightsEfficiency>2.48</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
-						<NightVisionEfficiency_Weapon>0.4</NightVisionEfficiency_Weapon>
-						<WorkToMake>60000</WorkToMake>
-					</statBases>
-					<costList>
-						<Plasteel>100</Plasteel>
-						<ComponentSpacer>5</ComponentSpacer>
-					</costList>
-					<Properties>
-						<hasStandardCommand>true</hasStandardCommand>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<recoilAmount>0</recoilAmount>
-						<soundAiming>Laser_LoudWarmup</soundAiming>
-						<defaultProjectile>XCOM_Bullet_LaserSniperRifleCE</defaultProjectile>
-						<warmupTime>2</warmupTime>
-						<range>62</range>
-						<soundCast>Laser_SniperRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_XCOM_Gun_LaserSniperRifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_SR</li>
-						<li>Bipod_DMR</li>
-					</weaponTags>
-					<researchPrerequisite>XCOM_LaserWeapons</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- XCOM scatter laser -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_Gun_LaserShotgun</defName>
-					<statBases>
-						<Mass>3.50</Mass>
-						<Bulk>9.10</Bulk>
-						<SwayFactor>1.26</SwayFactor>
-						<ShotSpread>0.5</ShotSpread>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
-						<WorkToMake>45000</WorkToMake>
-					</statBases>
-					<costList>
-						<Plasteel>55</Plasteel>
-						<ComponentSpacer>5</ComponentSpacer>
-					</costList>
-					<Properties>
-						<hasStandardCommand>true</hasStandardCommand>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<recoilAmount>0</recoilAmount>
-						<soundAiming>Laser_LoudWarmup</soundAiming>
-						<defaultProjectile>XCOM_Bullet_LaserShotgunCE</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>12</range>
-						<soundCast>Laser_Shotgun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_XCOM_Gun_LaserShotgun</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-					<researchPrerequisite>XCOM_LaserWeapons</researchPrerequisite>
-				</li>
-
-				<!-- XCOM Laser Cannon -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_Gun_LaserCannon</defName>
-					<statBases>
-						<Mass>16.00</Mass>
-						<Bulk>10.40</Bulk>
-						<SwayFactor>2.64</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<WorkToMake>80000</WorkToMake>
-					</statBases>
-					<costList>
-						<Plasteel>120</Plasteel>
-						<ComponentSpacer>9</ComponentSpacer>
-					</costList>
-					<Properties>
-						<recoilAmount>0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>XCOM_Bullet_LaserCannonCE</defaultProjectile>
-						<soundAiming>Laser_Warmup</soundAiming>
-						<warmupTime>1.75</warmupTime>
-						<burstShotCount>25</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<range>46</range>
-						<soundCast>Laser_Cannon</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>75</magazineSize>
-						<reloadTime>7.5</reloadTime>
-						<ammoSet>AmmoSet_XCOM_Gun_LaserCannon</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Suppressive</li>
-						<li>Bipod_LMG</li>
-					</weaponTags>
-					<researchPrerequisite>XCOM_LaserWeapons</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- XCOM Laser Pistol -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_Gun_LaserPistol</defName>
-					<statBases>
-						<Mass>1.20</Mass>
-						<Bulk>2.30</Bulk>
-						<SwayFactor>1.17</SwayFactor>
-						<ShotSpread>0.2</ShotSpread>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<WorkToMake>35000</WorkToMake>
-					</statBases>
-					<costList>
-						<Plasteel>45</Plasteel>
-						<ComponentSpacer>2</ComponentSpacer>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<recoilAmount>0</recoilAmount>
-						<soundAiming>Laser_Warmup</soundAiming>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>XCOM_Bullet_Laser_PistolCE</defaultProjectile>
-						<warmupTime>0.8</warmupTime>
-						<range>12</range>
-						<soundCast>Laser_Pistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_XCOM_Gun_LaserPistol</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_BROOM</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-					<researchPrerequisite>XCOM_LaserWeapons</researchPrerequisite>
-				</li>
-
-				<!-- Brun recoilless railgun-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_Gun_LaserRailgun</defName>
-					<statBases>
-						<WorkToMake>125000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>2.2</SwayFactor>
-						<Bulk>55.90</Bulk>
-						<Mass>28.30</Mass>
-						<RangedWeapon_Cooldown>1.47</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Plasteel>300</Plasteel>
-						<ComponentSpacer>12</ComponentSpacer>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<soundAiming>Laser_Warmup</soundAiming>
-						<recoilAmount>1</recoilAmount>
-						<defaultProjectile>XCOM_Bullet_LaserRailgunCE</defaultProjectile>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
-						<warmupTime>2</warmupTime>
-						<range>55</range>
-						<soundCast>Laser_Railgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>18</magazineSize>
-						<reloadTime>7.5</reloadTime>
-						<ammoSet>AmmoSet_XCOM_Gun_LaserRailgun</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>Bipod_LMG</li>
-					</weaponTags>
-					<researchPrerequisite>XCOM_LaserWeapons</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla XCOM weapons/MAG weapons/Ammo.xml b/Patches/Vanilla XCOM weapons/MAG weapons/Ammo.xml
deleted file mode 100644
index db18d8446c..0000000000
--- a/Patches/Vanilla XCOM weapons/MAG weapons/Ammo.xml	
+++ /dev/null
@@ -1,1146 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla XCOM Magnetic Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- So we don't have rail pistol in base CE. slap the stats of 3HST 4MMRAIL then-->
-				<!-- I mean, for fuck's sane we have rail pistol ammo texture but nothing use it-->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingCategoryDef>
-							<defName>Ammo4mmRailgun</defName>
-							<label>4mm Railgun</label>
-							<parent>AmmoAdvanced</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberRailgunPistol</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_4mmRailgunXCOM</defName>
-							<label>4mm Railgun</label>
-							<ammoTypes>
-								<Ammo_4mmRailgun_Sabot>Bullet_XCOM4mmRailgun_Sabot</Ammo_4mmRailgun_Sabot>
-								<Ammo_4mmRailgun_API>Bullet_XCOM4mmRailgun_API</Ammo_4mmRailgun_API>
-								<Ammo_4mmRailgun_APHE>Bullet_XCOM4mmRailgun_APHE</Ammo_4mmRailgun_APHE>
-								<Ammo_4mmRailgun_EMP>Bullet_XCOM4mmRailgun_EMP</Ammo_4mmRailgun_EMP>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_4mmRailgun_Sabot</defName>
-							<label>4mm Railgun cartridge (Sabot)</label>
-							<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for railgun rifles.</description>
-							<statBases>
-								<Mass>0.01</Mass>
-								<Bulk>0.008</Bulk>
-								<MarketValue>0.06</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_FabricationBench</li>
-							</tradeTags>
-							<thingCategories>
-								<li>Ammo4mmRailgun</li>
-							</thingCategories>
-							<graphicData>
-								<texPath>Things/Ammo/Railgun/Pistol</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>RailgunSabot</ammoClass>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_4mmRailgun_API</defName>
-							<label>4mm Railgun cartridge (AP-I)</label>
-							<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for railgun rifles.</description>
-							<statBases>
-								<Mass>0.01</Mass>
-								<Bulk>0.008</Bulk>
-								<MarketValue>0.06</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_FabricationBench</li>
-							</tradeTags>
-							<thingCategories>
-								<li>Ammo4mmRailgun</li>
-							</thingCategories>
-							<graphicData>
-								<texPath>ThirdParty/VanillaXCOM/Railgun/API/Pistol</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>IncendiaryAP</ammoClass>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_4mmRailgun_APHE</defName>
-							<label>4mm Railgun cartridge (HE)</label>
-							<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for railgun rifles.</description>
-							<statBases>
-								<Mass>0.01</Mass>
-								<Bulk>0.008</Bulk>
-								<MarketValue>0.05</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_FabricationBench</li>
-							</tradeTags>
-							<thingCategories>
-								<li>Ammo4mmRailgun</li>
-							</thingCategories>
-							<graphicData>
-								<texPath>ThirdParty/VanillaXCOM/Railgun/APHE/Pistol</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>ExplosiveAP</ammoClass>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_4mmRailgun_EMP</defName>
-							<label>4mm Railgun cartridge (Ion)</label>
-							<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for railgun rifles.</description>
-							<statBases>
-								<Mass>0.01</Mass>
-								<Bulk>0.008</Bulk>
-								<MarketValue>0.06</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_FabricationBench</li>
-							</tradeTags>
-							<thingCategories>
-								<li>Ammo4mmRailgun</li>
-							</thingCategories>
-							<graphicData>
-								<texPath>ThirdParty/VanillaXCOM/Railgun/EMP/Pistol</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>Ionized</ammoClass>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<!-- Why BaseBullet don't work while Base9x19mmParaBullet work? I don't fucking know-->
-
-						<ThingDef ParentName="Base9x19mmParaBullet">
-							<defName>Bullet_XCOM4mmRailgun_Sabot</defName>
-							<label>4mm Railgun bullet (Sabot)</label>
-							<graphicData>
-								<texPath>Bullet_Mag_Small</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-								<drawSize>0.6</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>15</damageAmountBase>
-								<armorPenetrationSharp>14.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>177.46</armorPenetrationBlunt>
-								<speed>250</speed>
-								<dropsCasings>false</dropsCasings>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base9x19mmParaBullet">
-							<defName>Bullet_XCOM4mmRailgun_API</defName>
-							<label>4mm Railgun bullet (AP-I)</label>
-							<graphicData>
-								<texPath>Bullet_Mag_Small</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-								<drawSize>0.6</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationSharp>29.6</armorPenetrationSharp>
-								<armorPenetrationBlunt>177.46</armorPenetrationBlunt>
-								<speed>250</speed>
-								<dropsCasings>false</dropsCasings>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>5</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base9x19mmParaBullet">
-							<defName>Bullet_XCOM4mmRailgun_APHE</defName>
-							<label>4mm Railgun bullet (HE)</label>
-							<graphicData>
-								<texPath>Bullet_Mag_Small</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-								<drawSize>0.6</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>15</damageAmountBase>
-								<armorPenetrationSharp>14.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>177.46</armorPenetrationBlunt>
-								<speed>250</speed>
-								<dropsCasings>false</dropsCasings>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>8</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base9x19mmParaBullet">
-							<defName>Bullet_XCOM4mmRailgun_EMP</defName>
-							<label>4mm Railgun bullet (Ion)</label>
-							<graphicData>
-								<texPath>Bullet_Mag_Small</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-								<drawSize>0.6</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>10</damageAmountBase>
-								<armorPenetrationSharp>14.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>177.46</armorPenetrationBlunt>
-								<speed>250</speed>
-								<dropsCasings>false</dropsCasings>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>5</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_4mmRailgun_Sabot</defName>
-							<label>make 4mm Railgun cartridge (Sabot) x500</label>
-							<description>Craft 500 4mm Railgun (Sabot) cartridges.</description>
-							<jobString>Making 4mm Railgun (Sabot) cartridges.</jobString>
-							<workAmount>1000</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Uranium</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Uranium</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_4mmRailgun_Sabot>500</Ammo_4mmRailgun_Sabot>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_4mmRailgun_API</defName>
-							<label>make 4mm Railgun cartridge (AP-I) x500</label>
-							<description>Craft 500 4mm Railgun (AP-I) cartridges.</description>
-							<jobString>Making 4mm Railgun (AP-I) cartridges.</jobString>
-							<workAmount>2000</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Uranium</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Prometheum</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Uranium</li>
-									<li>Prometheum</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_4mmRailgun_API>500</Ammo_4mmRailgun_API>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_4mmRailgun_APHE</defName>
-							<label>make 4mm Railgun cartridge (Sabot) x500</label>
-							<description>Craft 500 4mm Railgun (Sabot) cartridges.</description>
-							<jobString>Making 4mm Railgun (Sabot) cartridges.</jobString>
-							<workAmount>2000</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Uranium</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Uranium</li>
-									<li>FSX</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_4mmRailgun_APHE>500</Ammo_4mmRailgun_APHE>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_4mmRailgun_EMP</defName>
-							<label>make 4mm Railgun cartridge (Ion) x500</label>
-							<description>Craft 500 4mm Railgun (Ion) cartridges.</description>
-							<jobString>Making 4mm Railgun (Ion) cartridges.</jobString>
-							<workAmount>3000</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>1</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Uranium</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Uranium</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_4mmRailgun_EMP>500</Ammo_4mmRailgun_EMP>
-							</products>
-						</RecipeDef>
-
-						<!-- They have custom projectile texture that isn't cringe, so I'm arsed enough to keep them-->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_6mmRailgunXCOM</defName>
-							<label>6mm Railgun</label>
-							<ammoTypes>
-								<Ammo_6mmRailgun_Sabot>Bullet_XCOM6mmRailgun_Sabot</Ammo_6mmRailgun_Sabot>
-								<Ammo_6mmRailgun_API>Bullet_XCOM6mmRailgun_API</Ammo_6mmRailgun_API>
-								<Ammo_6mmRailgun_APHE>Bullet_XCOM6mmRailgun_APHE</Ammo_6mmRailgun_APHE>
-								<Ammo_6mmRailgun_EMP>Bullet_XCOM6mmRailgun_EMP</Ammo_6mmRailgun_EMP>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_6mmRailgun_API</defName>
-							<label>6mm Railgun cartridge (AP-I)</label>
-							<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for railgun rifles.</description>
-							<statBases>
-								<Mass>0.01</Mass>
-								<Bulk>0.008</Bulk>
-								<MarketValue>0.06</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_FabricationBench</li>
-							</tradeTags>
-							<thingCategories>
-								<li>Ammo6mmRailgun</li>
-							</thingCategories>
-							<graphicData>
-								<texPath>ThirdParty/VanillaXCOM/Railgun/API/Rifle</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>IncendiaryAP</ammoClass>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_6mmRailgun_APHE</defName>
-							<label>6mm Railgun cartridge (HE)</label>
-							<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for railgun rifles.</description>
-							<statBases>
-								<Mass>0.01</Mass>
-								<Bulk>0.008</Bulk>
-								<MarketValue>0.05</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_FabricationBench</li>
-							</tradeTags>
-							<thingCategories>
-								<li>Ammo6mmRailgun</li>
-							</thingCategories>
-							<graphicData>
-								<texPath>ThirdParty/VanillaXCOM/Railgun/APHE/Rifle</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>ExplosiveAP</ammoClass>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_6mmRailgun_EMP</defName>
-							<label>6mm Railgun cartridge (Ion)</label>
-							<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for railgun rifles.</description>
-							<statBases>
-								<Mass>0.01</Mass>
-								<Bulk>0.008</Bulk>
-								<MarketValue>0.06</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_FabricationBench</li>
-							</tradeTags>
-							<thingCategories>
-								<li>Ammo6mmRailgun</li>
-							</thingCategories>
-							<graphicData>
-								<texPath>ThirdParty/VanillaXCOM/Railgun/EMP/Rifle</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>Ionized</ammoClass>
-						</ThingDef>
-
-						<!-- you know what? I always worried about my 3HST railguns are too imba until I saw the stats CE gave for railguns. So I'll take my liberty here as I'm gonna rewrite the projectile anyway. I don't really buy the "fromtloaded cost" explanation-->
-
-						<ThingDef ParentName="Base9x19mmParaBullet">
-							<defName>Bullet_XCOM6mmRailgun_Sabot</defName>
-							<label>6mm Railgun bullet (Sabot)</label>
-							<graphicData>
-								<texPath>Bullet_Mag_Small</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-								<drawSize>1.1</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>18</damageAmountBase>
-								<armorPenetrationSharp>44</armorPenetrationSharp>
-								<armorPenetrationBlunt>290.80</armorPenetrationBlunt>
-								<speed>300</speed>
-								<dropsCasings>false</dropsCasings>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base9x19mmParaBullet">
-							<defName>Bullet_XCOM6mmRailgun_API</defName>
-							<label>6mm Railgun bullet (AP-I)</label>
-							<graphicData>
-								<texPath>Bullet_Mag_Small</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-								<drawSize>1.1</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>13</damageAmountBase>
-								<armorPenetrationSharp>88</armorPenetrationSharp>
-								<armorPenetrationBlunt>290.80</armorPenetrationBlunt>
-								<speed>300</speed>
-								<dropsCasings>false</dropsCasings>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>6</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base9x19mmParaBullet">
-							<defName>Bullet_XCOM6mmRailgun_APHE</defName>
-							<label>6mm Railgun bullet (HE)</label>
-							<graphicData>
-								<texPath>Bullet_Mag_Small</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-								<drawSize>1.1</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>18</damageAmountBase>
-								<armorPenetrationSharp>44</armorPenetrationSharp>
-								<armorPenetrationBlunt>290.80</armorPenetrationBlunt>
-								<speed>300</speed>
-								<dropsCasings>false</dropsCasings>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>10</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base9x19mmParaBullet">
-							<defName>Bullet_XCOM6mmRailgun_EMP</defName>
-							<label>6mm Railgun bullet (Ion)</label>
-							<graphicData>
-								<texPath>Bullet_Mag_Small</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-								<drawSize>1.1</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>11</damageAmountBase>
-								<armorPenetrationSharp>44</armorPenetrationSharp>
-								<armorPenetrationBlunt>290.80</armorPenetrationBlunt>
-								<speed>300</speed>
-								<dropsCasings>false</dropsCasings>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>7</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_6mmRailgun_API</defName>
-							<label>make 6mm Railgun cartridge (AP-I) x500</label>
-							<description>Craft 500 6mm Railgun (AP-I) cartridges.</description>
-							<jobString>Making 6mm Railgun (AP-I) cartridges.</jobString>
-							<workAmount>2000</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Uranium</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Prometheum</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Prometheum</li>
-									<li>Steel</li>
-									<li>Uranium</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_6mmRailgun_API>500</Ammo_6mmRailgun_API>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_6mmRailgun_APHE</defName>
-							<label>make 6mm Railgun cartridge (HE) x500</label>
-							<description>Craft 500 6mm Railgun (HE) cartridges.</description>
-							<jobString>Making 6mm Railgun (HE) cartridges.</jobString>
-							<workAmount>2000</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Uranium</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>FSX</li>
-									<li>Steel</li>
-									<li>Uranium</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_6mmRailgun_APHE>500</Ammo_6mmRailgun_APHE>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_6mmRailgun_EMP</defName>
-							<label>make 6mm Railgun cartridge (Ion) x500</label>
-							<description>Craft 500 6mm Railgun (Ion) cartridges.</description>
-							<jobString>Making 6mm Railgun (Ion) cartridges.</jobString>
-							<workAmount>3000</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Uranium</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-									<li>Steel</li>
-									<li>Uranium</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_6mmRailgun_EMP>500</Ammo_6mmRailgun_EMP>
-							</products>
-						</RecipeDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_8mmRailgunXCOM</defName>
-							<label>8mm Railgun</label>
-							<ammoTypes>
-								<Ammo_8mmRailgun_Sabot>Bullet_XCOM8mmRailgun_Sabot</Ammo_8mmRailgun_Sabot>
-								<Ammo_8mmRailgun_API>Bullet_XCOM8mmRailgun_API</Ammo_8mmRailgun_API>
-								<Ammo_8mmRailgun_APHE>Bullet_XCOM8mmRailgun_APHE</Ammo_8mmRailgun_APHE>
-								<Ammo_8mmRailgun_EMP>Bullet_XCOM8mmRailgun_EMP</Ammo_8mmRailgun_EMP>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_8mmRailgun_API</defName>
-							<label>8mm Railgun cartridge (AP-I)</label>
-							<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for railgun pistols.</description>
-							<statBases>
-								<Mass>0.009</Mass>
-								<Bulk>0.01</Bulk>
-								<MarketValue>0.06</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_FabricationBench</li>
-							</tradeTags>
-							<thingCategories>
-								<li>Ammo8mmRailgun</li>
-							</thingCategories>
-							<graphicData>
-								<texPath>ThirdParty/VanillaXCOM/Railgun/API/Rifle</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>IncendiaryAP</ammoClass>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_8mmRailgun_APHE</defName>
-							<label>8mm Railgun cartridge (HE)</label>
-							<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for railgun pistols.</description>
-							<statBases>
-								<Mass>0.009</Mass>
-								<Bulk>0.01</Bulk>
-								<MarketValue>0.05</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_FabricationBench</li>
-							</tradeTags>
-							<thingCategories>
-								<li>Ammo8mmRailgun</li>
-							</thingCategories>
-							<graphicData>
-								<texPath>ThirdParty/VanillaXCOM/Railgun/APHE/Rifle</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>ExplosiveAP</ammoClass>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_8mmRailgun_EMP</defName>
-							<label>8mm Railgun cartridge (Ion)</label>
-							<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for railgun pistols.</description>
-							<statBases>
-								<Mass>0.009</Mass>
-								<Bulk>0.01</Bulk>
-								<MarketValue>0.06</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_FabricationBench</li>
-							</tradeTags>
-							<thingCategories>
-								<li>Ammo8mmRailgun</li>
-							</thingCategories>
-							<graphicData>
-								<texPath>ThirdParty/VanillaXCOM/Railgun/EMP/Rifle</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>Ionized</ammoClass>
-						</ThingDef>
-
-						<!-- well...3HST 9mm is another story, and 3HST 20mm is just worse.-->
-
-						<ThingDef ParentName="Base9x19mmParaBullet">
-							<defName>Bullet_XCOM8mmRailgun_Sabot</defName>
-							<label>8mm Railgun bullet (Sabot)</label>
-							<graphicData>
-								<texPath>Bullet_Mag_Big</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationSharp>75</armorPenetrationSharp>
-								<armorPenetrationBlunt>252.720</armorPenetrationBlunt>
-								<speed>360</speed>
-								<dropsCasings>false</dropsCasings>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base9x19mmParaBullet">
-							<defName>Bullet_XCOM8mmRailgun_API</defName>
-							<label>8mm Railgun bullet (AP-I)</label>
-							<graphicData>
-								<texPath>Bullet_Mag_Big</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>15</damageAmountBase>
-								<armorPenetrationSharp>150</armorPenetrationSharp>
-								<armorPenetrationBlunt>252.720</armorPenetrationBlunt>
-								<speed>360</speed>
-								<dropsCasings>false</dropsCasings>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>8</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base9x19mmParaBullet">
-							<defName>Bullet_XCOM8mmRailgun_APHE</defName>
-							<label>8mm Railgun bullet (HE)</label>
-							<graphicData>
-								<texPath>Bullet_Mag_Big</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationSharp>75</armorPenetrationSharp>
-								<armorPenetrationBlunt>252.720</armorPenetrationBlunt>
-								<speed>360</speed>
-								<dropsCasings>false</dropsCasings>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>10</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base9x19mmParaBullet">
-							<defName>Bullet_XCOM8mmRailgun_EMP</defName>
-							<label>8mm Railgun bullet (Ion)</label>
-							<graphicData>
-								<texPath>Bullet_Mag_Big</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationSharp>75</armorPenetrationSharp>
-								<armorPenetrationBlunt>252.720</armorPenetrationBlunt>
-								<speed>360</speed>
-								<dropsCasings>false</dropsCasings>
-								<secondaryDamage>
-									<li>
-										<def>EMP</def>
-										<amount>10</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_8mmRailgun_API</defName>
-							<label>make 8mm Railgun cartridge (AP-I) x500</label>
-							<description>Craft 500 8mm Railgun (AP-I) cartridges.</description>
-							<jobString>Making 8mm Railgun (AP-I) cartridges.</jobString>
-							<workAmount>2000</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Uranium</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Prometheum</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Prometheum</li>
-									<li>Steel</li>
-									<li>Uranium</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_8mmRailgun_API>500</Ammo_8mmRailgun_API>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_8mmRailgun_APHE</defName>
-							<label>make 8mm Railgun cartridge (HE) x500</label>
-							<description>Craft 500 8mm Railgun (HE) cartridges.</description>
-							<jobString>Making 8mm Railgun (HE) cartridges.</jobString>
-							<workAmount>2000</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Uranium</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>FSX</li>
-									<li>Steel</li>
-									<li>Uranium</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_8mmRailgun_APHE>500</Ammo_8mmRailgun_APHE>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_8mmRailgun_EMP</defName>
-							<label>make 8mm Railgun cartridge (Ion) x500</label>
-							<description>Craft 500 8mm Railgun (Ion) cartridges.</description>
-							<jobString>Making 8mm Railgun (Ion) cartridges.</jobString>
-							<workAmount>3000</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Uranium</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>4</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-									<li>Steel</li>
-									<li>Uranium</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_8mmRailgun_EMP>500</Ammo_8mmRailgun_EMP>
-							</products>
-						</RecipeDef>
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_12mmRailgunXCOM</defName>
-							<label>12mm Railgun</label>
-							<ammoTypes>
-								<Ammo_12mmRailgun_Sabot>Bullet_XCOM12mmRailgun_Sabot</Ammo_12mmRailgun_Sabot>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef ParentName="Base9x19mmParaBullet">
-							<defName>Bullet_XCOM12mmRailgun_Sabot</defName>
-							<label>12mm Railgun bullet (Sabot)</label>
-							<graphicData>
-								<texPath>Bullet_Mag_Big</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-								<drawSize>1.5</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>73</damageAmountBase>
-								<armorPenetrationSharp>130</armorPenetrationSharp>
-								<armorPenetrationBlunt>7250</armorPenetrationBlunt>
-								<speed>500</speed>
-								<dropsCasings>false</dropsCasings>
-							</projectile>
-						</ThingDef>
-
-						<!-- and...rail shotgun, slapping 3HST 20mm NCQ canister stats here-->
-
-						<ThingCategoryDef>
-							<defName>Ammo12GaugeRailgun</defName>
-							<label>12 Gauge scatter railgun</label>
-							<parent>AmmoAdvanced</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberRailgunRifle</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_ScatterRailgunXCOM</defName>
-							<label>12 Gauge scatter railgun</label>
-							<ammoTypes>
-								<Ammo_12GaugeRailgun_Sabot>Bullet_XCOMScatterRailgun_Sabot</Ammo_12GaugeRailgun_Sabot>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_12GaugeRailgun_Sabot</defName>
-							<label>12 Gauge railgun bullet (Sabot)</label>
-							<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for railgun rifles.</description>
-							<statBases>
-								<Mass>0.051</Mass>
-								<Bulk>0.06</Bulk>
-								<MarketValue>0.06</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_FabricationBench</li>
-								<li>CE_AutoEnableCrafting_TableMachining</li>
-								<!-- Railgun ammo isn't handloaded because it contains no propellant, and the sabots must be precision-machined anyway -->
-							</tradeTags>
-							<thingCategories>
-								<li>Ammo12GaugeRailgun</li>
-							</thingCategories>
-							<graphicData>
-								<texPath>Things/Ammo/Railgun/HighCaliber</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>XCOM_MAGShotgun</ammoClass>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef ParentName="Base9x19mmParaBullet">
-							<defName>Bullet_XCOMScatterRailgun_Sabot</defName>
-							<label>12 Gauge railgun bullet (Sabot)</label>
-							<graphicData>
-								<texPath>Bullet_Mag_Small</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-								<drawSize>0.3</drawSize>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>250</speed>
-								<damageDef>Bullet</damageDef>
-								<damageAmountBase>10</damageAmountBase>
-								<armorPenetrationSharp>10</armorPenetrationSharp>
-								<armorPenetrationBlunt>25.88</armorPenetrationBlunt>
-								<spreadMult>23.8</spreadMult>
-								<pelletCount>12</pelletCount>
-								<dropsCasings>false</dropsCasings>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_12GaugeRailgun_Sabot</defName>
-							<label>make 12 Gauge railgun cartridge (Sabot) x200</label>
-							<description>Craft 500 12 Gauge railgun (Sabot) cartridges.</description>
-							<jobString>Making 12 Gauge railgun (Sabot) cartridges.</jobString>
-							<workAmount>2500</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>5</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Uranium</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Uranium</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_12GaugeRailgun_Sabot>200</Ammo_12GaugeRailgun_Sabot>
-							</products>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla XCOM weapons/MAG weapons/AmmoClass.xml b/Patches/Vanilla XCOM weapons/MAG weapons/AmmoClass.xml
deleted file mode 100644
index bdbb2e1b9c..0000000000
--- a/Patches/Vanilla XCOM weapons/MAG weapons/AmmoClass.xml	
+++ /dev/null
@@ -1,23 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla XCOM Magnetic Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<CombatExtended.AmmoCategoryDef>
-							<defName>XCOM_MAGShotgun</defName>
-							<label>Scatter railgun</label>
-							<labelShort>buckshot</labelShort>
-							<description>Uses a discarding sabot to fire several undersized projectile at higher muzzle velocities, greatly improving armor penetration.</description>
-						</CombatExtended.AmmoCategoryDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla XCOM weapons/MAG weapons/Weapon_Ranged.xml b/Patches/Vanilla XCOM weapons/MAG weapons/Weapon_Ranged.xml
deleted file mode 100644
index db3cb1be4d..0000000000
--- a/Patches/Vanilla XCOM weapons/MAG weapons/Weapon_Ranged.xml	
+++ /dev/null
@@ -1,533 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla XCOM Magnetic Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!--
-				[Smmothbrain:Bill]
-				He will refuse to use his brain and slap existing 3HST weapon stats whenever possible
-				The last straw: "Mag autocannon"
-				-->
-
-				<!-- Magnetic, bulky and heavy than conventional I assume? since all these coils and rails-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName="XCOM_Gun_MagRifle" or
-						defName="XCOM_Gun_MagShotgun" or
-						defName="XCOM_Gun_MagSniperRifle" or
-						defName="XCOM_Gun_MagCannon" or
-						defName="XCOM_Gun_MagBullpup" or
-						defName="XCOM_Gun_MagVektor" or
-						defName="XCOM_Gun_MagHeavyAutocannon"
-						]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="XCOM_Gun_MagPistol" or defName="XCOM_Gun_MagAutopistol"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- XCOM Mag Rifle -->
-				<!--So. rail assault rifle.-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_Gun_MagRifle</defName>
-					<statBases>
-						<WorkToMake>60500</WorkToMake>
-						<Mass>5.5</Mass>
-						<Bulk>12.5</Bulk>
-						<SwayFactor>1.26</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
-						<NightVisionEfficiency_Weapon>0.4</NightVisionEfficiency_Weapon>
-					</statBases>
-					<costList>
-						<Steel>70</Steel>
-						<Plasteel>65</Plasteel>
-						<ComponentSpacer>3</ComponentSpacer>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_XCOM6mmRailgun_Sabot</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<range>55</range>
-						<soundCast>Mag_Rifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<recoilAmount>3.65</recoilAmount>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_6mmRailgunXCOM</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AR</li>
-					</weaponTags>
-					<researchPrerequisite>ChargedShot</researchPrerequisite>
-				</li>
-
-				<!-- XCOM Mag Pistol -->
-				<!-- auto rail pistol? well this is not automatic. we don't really have SMG here in XCOM-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_Gun_MagPistol</defName>
-					<statBases>
-						<WorkToMake>22000</WorkToMake>
-						<Mass>2.2</Mass>
-						<Bulk>2.75</Bulk>
-						<SwayFactor>0.72</SwayFactor>
-						<ShotSpread>0.19</ShotSpread>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.69</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>20</Steel>
-						<Plasteel>40</Plasteel>
-						<ComponentSpacer>1</ComponentSpacer>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_XCOM4mmRailgun_Sabot</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Mag_Pistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<recoilAmount>2</recoilAmount>
-						<muzzleFlashScale>8</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_4mmRailgunXCOM</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-					<researchPrerequisite>ChargedShot</researchPrerequisite>
-				</li>
-
-				<!-- XCOM Mag Shotgun -->
-				<!-- Pump action rail shotgun, I happened to have one-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_Gun_MagShotgun</defName>
-					<statBases>
-						<WorkToMake>30000</WorkToMake>
-						<Mass>5.2</Mass>
-						<Bulk>12.2</Bulk>
-						<SwayFactor>1.32</SwayFactor>
-						<ShotSpread>0.15</ShotSpread>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.96</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>55</Steel>
-						<Plasteel>50</Plasteel>
-						<ComponentSpacer>2</ComponentSpacer>
-					</costList>
-					<Properties>
-						<recoilAmount>3.10</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_XCOMScatterRailgun_Sabot</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>44</range>
-						<soundCast>Mag_Shotgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>0.65</reloadTime>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<ammoSet>AmmoSet_ScatterRailgunXCOM</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-					<researchPrerequisite>ChargedShot</researchPrerequisite>
-				</li>
-
-				<!-- XCOM Mag Sniper Rifle -->
-				<!-- wow, 40 dmg in vanilla-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_Gun_MagSniperRifle</defName>
-					<statBases>
-						<WorkToMake>75500</WorkToMake>
-						<Mass>12.7</Mass>
-						<Bulk>13</Bulk>
-						<SwayFactor>1.34</SwayFactor>
-						<ShotSpread>0.03</ShotSpread>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.22</RangedWeapon_Cooldown>
-						<NightVisionEfficiency_Weapon>0.6</NightVisionEfficiency_Weapon>
-					</statBases>
-					<costList>
-						<Steel>70</Steel>
-						<Plasteel>90</Plasteel>
-						<ComponentSpacer>4</ComponentSpacer>
-					</costList>
-					<Properties>
-						<recoilAmount>5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_XCOM8mmRailgun_Sabot</defaultProjectile>
-						<warmupTime>2.5</warmupTime>
-						<range>86</range>
-						<soundCast>Mag_SniperRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_8mmRailgunXCOM</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SniperRifle</li>
-						<li>CE_AI_SR</li>
-						<li>Bipod_DMR</li>
-					</weaponTags>
-					<researchPrerequisite>ChargedShot</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- XCOM Mag Cannon -->
-				<!-- bruh another "cannon" minigun-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_Gun_MagCannon</defName>
-					<statBases>
-						<WorkToMake>110000</WorkToMake>
-						<Mass>39</Mass>
-						<Bulk>25</Bulk>
-						<SwayFactor>2.2</SwayFactor>
-						<ShotSpread>0.01</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>140</Steel>
-						<Plasteel>110</Plasteel>
-						<ComponentSpacer>7</ComponentSpacer>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_XCOM8mmRailgun_Sabot</defaultProjectile>
-						<warmupTime>3.1</warmupTime>
-						<range>65</range>
-						<soundCast>Mag_Cannon</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<recoilAmount>3.14</recoilAmount>
-						<muzzleFlashScale>18</muzzleFlashScale>
-						<burstShotCount>20</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>80</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_8mmRailgunXCOM</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>GunHeavy</li>
-						<li>CE_AI_SR</li>
-						<li>Bipod_LMG</li>
-					</weaponTags>
-					<researchPrerequisite>ChargedShot</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- XCOM Mag Bullpup -->
-				<!-- Rail AR, but faster-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_Gun_MagBullpup</defName>
-					<statBases>
-						<WorkToMake>60500</WorkToMake>
-						<Mass>4.5</Mass>
-						<Bulk>8.5</Bulk>
-						<SwayFactor>1.46</SwayFactor>
-						<ShotSpread>0.1</ShotSpread>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.33</RangedWeapon_Cooldown>
-						<NightVisionEfficiency_Weapon>0.4</NightVisionEfficiency_Weapon>
-					</statBases>
-					<costList>
-						<Steel>70</Steel>
-						<Plasteel>65</Plasteel>
-						<ComponentSpacer>3</ComponentSpacer>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_XCOM6mmRailgun_Sabot</defaultProjectile>
-						<warmupTime>0.8</warmupTime>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<range>55</range>
-						<soundCast>Mag_Bullpup</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<recoilAmount>3.65</recoilAmount>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_6mmRailgunXCOM</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>false</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AR</li>
-					</weaponTags>
-					<researchPrerequisite>ChargedShot</researchPrerequisite>
-				</li>
-
-				<!-- XCOM Mag Vektor -->
-				<!-- Sniper but faster-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_Gun_MagVektor</defName>
-					<statBases>
-						<WorkToMake>75500</WorkToMake>
-						<Mass>5.7</Mass>
-						<Bulk>11</Bulk>
-						<SwayFactor>1.55</SwayFactor>
-						<ShotSpread>0.03</ShotSpread>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<NightVisionEfficiency_Weapon>0.6</NightVisionEfficiency_Weapon>
-					</statBases>
-					<costList>
-						<Steel>70</Steel>
-						<Plasteel>90</Plasteel>
-						<ComponentSpacer>4</ComponentSpacer>
-					</costList>
-					<Properties>
-						<recoilAmount>5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_XCOM8mmRailgun_Sabot</defaultProjectile>
-						<warmupTime>2</warmupTime>
-						<range>86</range>
-						<soundCast>Mag_Vektor</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>10</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_8mmRailgunXCOM</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SniperRifle</li>
-						<li>CE_AI_SR</li>
-						<li>Bipod_DMR</li>
-					</weaponTags>
-					<researchPrerequisite>ChargedShot</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- XCOM Mag Autopistol -->
-				<!-- autorailpistol-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_Gun_MagAutopistol</defName>
-					<statBases>
-						<WorkToMake>22000</WorkToMake>
-						<Mass>2.5</Mass>
-						<Bulk>2.75</Bulk>
-						<SwayFactor>1.03</SwayFactor>
-						<ShotSpread>0.17</ShotSpread>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.49</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>20</Steel>
-						<Plasteel>45</Plasteel>
-						<ComponentSpacer>1</ComponentSpacer>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_XCOM4mmRailgun_Sabot</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<range>12</range>
-						<soundCast>Mag_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<recoilAmount>5.23</recoilAmount>
-						<muzzleFlashScale>8</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_4mmRailgunXCOM</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-					<researchPrerequisite>ChargedShot</researchPrerequisite>
-				</li>
-
-				<!-- SPARK Helix Rail-Cannon -->
-				<!-- AMOTHER handheld autocannon which is in fact a battle rifle....not again-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_Gun_MagHeavyAutocannon</defName>
-					<statBases>
-						<WorkToMake>75500</WorkToMake>
-						<Mass>12.8</Mass>
-						<Bulk>11.5</Bulk>
-						<SwayFactor>1.7</SwayFactor>
-						<ShotSpread>0.1</ShotSpread>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.57</RangedWeapon_Cooldown>
-						<NightVisionEfficiency_Weapon>0.4</NightVisionEfficiency_Weapon>
-					</statBases>
-					<costList>
-						<Steel>80</Steel>
-						<Plasteel>130</Plasteel>
-						<ComponentIndustrial>10</ComponentIndustrial>
-						<ComponentSpacer>5</ComponentSpacer>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_XCOM8mmRailgun_Sabot</defaultProjectile>
-						<warmupTime>2</warmupTime>
-						<burstShotCount>8</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<range>55</range>
-						<soundCast>Mag_HeavyAutocannon</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<recoilAmount>2.9</recoilAmount>
-						<muzzleFlashScale>8</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>40</magazineSize>
-						<reloadTime>6.5</reloadTime>
-						<ammoSet>AmmoSet_8mmRailgunXCOM</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>4</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_LMG</li>
-						<li>Bipod_LMG</li>
-					</weaponTags>
-					<researchPrerequisite>ChargedShot</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla XCOM weapons/Plasma weapons/Ammo.xml b/Patches/Vanilla XCOM weapons/Plasma weapons/Ammo.xml
deleted file mode 100644
index bcb96c68e7..0000000000
--- a/Patches/Vanilla XCOM weapons/Plasma weapons/Ammo.xml	
+++ /dev/null
@@ -1,1366 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla XCOM Plasma Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<CombatExtended.AmmoCategoryDef>
-							<defName>XCOM_PlasmaLight</defName>
-							<label>Light Plasma</label>
-							<labelShort>light</labelShort>
-							<description>Highly-energized ionized gas capable of devastating burn effects.</description>
-							<advanced>true</advanced>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>XCOM_PlasmaDense</defName>
-							<label>Dense Plasma</label>
-							<labelShort>dense</labelShort>
-							<description>Highly-energized ionized gas capable of devastating burn effects.</description>
-							<advanced>true</advanced>
-						</CombatExtended.AmmoCategoryDef>
-
-						<CombatExtended.AmmoCategoryDef>
-							<defName>XCOM_PlasmaUnstable</defName>
-							<label>Unstable Plasma</label>
-							<labelShort>unstable</labelShort>
-							<description>Highly-energized ionized gas capable of devastating burn effects.</description>
-							<advanced>true</advanced>
-						</CombatExtended.AmmoCategoryDef>
-
-						<!--Ammo items-->
-
-						<!--Pistol-->
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_XCOM_PlasmaCellPistolStandard</defName>
-							<label>Standard Plasma Pistol Cell</label>
-							<description>Plasma containment cell optimized for pistols</description>
-							<statBases>
-								<Mass>0.014</Mass>
-								<Bulk>0.01</Bulk>
-								<MarketValue>0.23</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_FabricationBench</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoPlasmaCellPistol</li>
-							</thingCategories>
-							<graphicData>
-								<texPath>ThirdParty/VanillaXCOM/Plasma/Standard/Pistol</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>Plasma</ammoClass>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>15</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>0.25</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Large>2</Fragment_Large>
-										<Fragment_Small>4</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_XCOM_PlasmaCellPistolLight</defName>
-							<label>Light Plasma Pistol Cell</label>
-							<description>Plasma containment cell optimized for pistols</description>
-							<statBases>
-								<Mass>0.014</Mass>
-								<Bulk>0.01</Bulk>
-								<MarketValue>0.2</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_FabricationBench</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoPlasmaCellPistol</li>
-							</thingCategories>
-							<graphicData>
-								<texPath>ThirdParty/VanillaXCOM/Plasma/Light/Pistol</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>XCOM_PlasmaLight</ammoClass>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>15</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>0.25</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Large>2</Fragment_Large>
-										<Fragment_Small>4</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_XCOM_PlasmaCellPistolDense</defName>
-							<label>Dense Plasma Pistol Cell</label>
-							<description>Plasma containment cell optimized for pistols</description>
-							<statBases>
-								<Mass>0.014</Mass>
-								<Bulk>0.01</Bulk>
-								<MarketValue>0.2</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_FabricationBench</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoPlasmaCellPistol</li>
-							</thingCategories>
-							<graphicData>
-								<texPath>ThirdParty/VanillaXCOM/Plasma/Dense/Pistol</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>XCOM_PlasmaDense</ammoClass>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>15</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>0.25</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Large>2</Fragment_Large>
-										<Fragment_Small>4</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_XCOM_PlasmaCellPistolUnstable</defName>
-							<label>Unstable Plasma Pistol Cell</label>
-							<description>Plasma containment cell optimized for pistols</description>
-							<statBases>
-								<Mass>0.014</Mass>
-								<Bulk>0.01</Bulk>
-								<MarketValue>0.2</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_FabricationBench</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoPlasmaCellPistol</li>
-							</thingCategories>
-							<graphicData>
-								<texPath>ThirdParty/VanillaXCOM/Plasma/Unstable/Pistol</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>XCOM_PlasmaUnstable</ammoClass>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>15</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>0.25</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Large>2</Fragment_Large>
-										<Fragment_Small>4</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_XCOM_PlasmaCellPistolStandard</defName>
-							<label>make Standard Plasma Pistol Cells</label>
-							<description>Craft 500 shots' worth of Standard Plasma Pistol Cells.</description>
-							<jobString>Making Plasma Pistol Cells.</jobString>
-							<workAmount>3400</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>14</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Plasteel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_XCOM_PlasmaCellPistolStandard>500</Ammo_XCOM_PlasmaCellPistolStandard>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_XCOM_PlasmaCellPistolLight</defName>
-							<label>make Light Plasma Pistol Cells</label>
-							<description>Craft 500 shots' worth of Light Plasma Pistol Cells.</description>
-							<jobString>Making Plasma Pistol Cells.</jobString>
-							<workAmount>3400</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Silver</li>
-										</thingDefs>
-									</filter>
-									<count>1.4</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Silver</li>
-									<li>Plasteel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_XCOM_PlasmaCellPistolLight>500</Ammo_XCOM_PlasmaCellPistolLight>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_XCOM_PlasmaCellPistolDense</defName>
-							<label>make Heavy Plasma Pistol Cells</label>
-							<description>Craft 500 shots' worth of Heavy Plasma Pistol Cells.</description>
-							<jobString>Making Plasma Pistol Cells.</jobString>
-							<workAmount>3400</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Uranium</li>
-										</thingDefs>
-									</filter>
-									<count>14</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Uranium</li>
-									<li>Plasteel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_XCOM_PlasmaCellPistolDense>500</Ammo_XCOM_PlasmaCellPistolDense>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_XCOM_PlasmaCellPistolUnstable</defName>
-							<label>make Unstable Plasma Pistol Cells</label>
-							<description>Craft 500 shots' worth of Unstable Plasma Pistol Cells.</description>
-							<jobString>Making Plasma Pistol Cells.</jobString>
-							<workAmount>3400</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>14</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>FSX</li>
-									<li>Plasteel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_XCOM_PlasmaCellPistolUnstable>500</Ammo_XCOM_PlasmaCellPistolUnstable>
-							</products>
-						</RecipeDef>
-
-						<!--Rifle-->
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_XCOM_PlasmaCellRifleStandard</defName>
-							<label>Standard Plasma Rifle Cell</label>
-							<description>Plasma containment cell optimized for rifles</description>
-							<statBases>
-								<Mass>0.017</Mass>
-								<Bulk>0.01</Bulk>
-								<MarketValue>0.24</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_FabricationBench</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoPlasmaCellRifle</li>
-							</thingCategories>
-							<graphicData>
-								<texPath>ThirdParty/VanillaXCOM/Plasma/Standard/Rifle</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>Plasma</ammoClass>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>20</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>0.5</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Large>2</Fragment_Large>
-										<Fragment_Small>8</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_XCOM_PlasmaCellRifleLight</defName>
-							<label>Light Plasma Rifle Cell</label>
-							<description>Plasma containment cell optimized for rifles</description>
-							<statBases>
-								<Mass>0.017</Mass>
-								<Bulk>0.01</Bulk>
-								<MarketValue>0.24</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_FabricationBench</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoPlasmaCellRifle</li>
-							</thingCategories>
-							<graphicData>
-								<texPath>ThirdParty/VanillaXCOM/Plasma/Light/Rifle</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>XCOM_PlasmaLight</ammoClass>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>20</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>0.5</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Large>2</Fragment_Large>
-										<Fragment_Small>8</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_XCOM_PlasmaCellRifleDense</defName>
-							<label>Heavy Plasma Rifle Cell</label>
-							<description>Plasma containment cell optimized for rifles</description>
-							<statBases>
-								<Mass>0.017</Mass>
-								<Bulk>0.01</Bulk>
-								<MarketValue>0.24</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_FabricationBench</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoPlasmaCellRifle</li>
-							</thingCategories>
-							<graphicData>
-								<texPath>ThirdParty/VanillaXCOM/Plasma/Dense/Rifle</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>XCOM_PlasmaDense</ammoClass>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>20</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>0.5</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Large>2</Fragment_Large>
-										<Fragment_Small>8</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_XCOM_PlasmaCellRifleUnstable</defName>
-							<label>Unstable Plasma Rifle Cell</label>
-							<description>Plasma containment cell optimized for rifles</description>
-							<statBases>
-								<Mass>0.017</Mass>
-								<Bulk>0.01</Bulk>
-								<MarketValue>0.24</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_FabricationBench</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoPlasmaCellRifle</li>
-							</thingCategories>
-							<graphicData>
-								<texPath>ThirdParty/VanillaXCOM/Plasma/Unstable/Rifle</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>XCOM_PlasmaUnstable</ammoClass>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>20</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>0.5</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Large>2</Fragment_Large>
-										<Fragment_Small>8</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_XCOM_PlasmaCellRifleStandard</defName>
-							<label>make Standard Plasma Rifle Cells</label>
-							<description>Craft 500 shots' worth of Standard Plasma Rifle Cells.</description>
-							<jobString>Making Plasma Rifle Cells.</jobString>
-							<workAmount>3800</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>18</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Plasteel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_XCOM_PlasmaCellRifleStandard>500</Ammo_XCOM_PlasmaCellRifleStandard>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_XCOM_PlasmaCellRifleLight</defName>
-							<label>make Light Plasma Rifle Cells</label>
-							<description>Craft 500 shots' worth of Light Plasma Rifle Cells.</description>
-							<jobString>Making Plasma Rifle Cells.</jobString>
-							<workAmount>3800</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Silver</li>
-										</thingDefs>
-									</filter>
-									<count>1.8</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Silver</li>
-									<li>Plasteel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_XCOM_PlasmaCellRifleLight>500</Ammo_XCOM_PlasmaCellRifleLight>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_XCOM_PlasmaCellRifleDense</defName>
-							<label>make Dense Plasma Rifle Cells</label>
-							<description>Craft 500 shots' worth of Dense Plasma Rifle Cells.</description>
-							<jobString>Making Plasma Rifle Cells.</jobString>
-							<workAmount>3800</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Uranium</li>
-										</thingDefs>
-									</filter>
-									<count>18</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Uranium</li>
-									<li>Plasteel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_XCOM_PlasmaCellRifleDense>500</Ammo_XCOM_PlasmaCellRifleDense>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_XCOM_PlasmaCellRifleUnstable</defName>
-							<label>make Unstable Plasma Rifle Cells</label>
-							<description>Craft 500 shots' worth of Unstable Plasma Rifle Cells.</description>
-							<jobString>Making Plasma Rifle Cells.</jobString>
-							<workAmount>3800</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>18</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>FSX</li>
-									<li>Plasteel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_XCOM_PlasmaCellRifleUnstable>500</Ammo_XCOM_PlasmaCellRifleUnstable>
-							</products>
-						</RecipeDef>
-
-						<!--Heavy-->
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_XCOM_PlasmaCellHeavyStandard</defName>
-							<label>Standard Plasma Heavy Cell</label>
-							<description>Plasma containment cell optimized for heavy weapons</description>
-							<statBases>
-								<Mass>0.134</Mass>
-								<Bulk>0.51</Bulk>
-								<MarketValue>2.52</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_FabricationBench</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoPlasmaCellHeavy</li>
-							</thingCategories>
-							<stackLimit>75</stackLimit>
-							<graphicData>
-								<texPath>ThirdParty/VanillaXCOM/Plasma/Standard/Heavy</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>Plasma</ammoClass>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>35</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>0.5</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Large>2</Fragment_Large>
-										<Fragment_Small>10</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_XCOM_PlasmaCellHeavyLight</defName>
-							<label>Light Plasma Heavy Cell</label>
-							<description>Plasma containment cell optimized for heavy weapons</description>
-							<statBases>
-								<Mass>0.134</Mass>
-								<Bulk>0.51</Bulk>
-								<MarketValue>2.52</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_FabricationBench</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoPlasmaCellHeavy</li>
-							</thingCategories>
-							<stackLimit>75</stackLimit>
-							<graphicData>
-								<texPath>ThirdParty/VanillaXCOM/Plasma/Light/Heavy</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>XCOM_PlasmaLight</ammoClass>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>35</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>0.5</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Large>2</Fragment_Large>
-										<Fragment_Small>10</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_XCOM_PlasmaCellHeavyDense</defName>
-							<label>Dense Plasma Heavy Cell</label>
-							<description>Plasma containment cell optimized for heavy weapons</description>
-							<statBases>
-								<Mass>0.134</Mass>
-								<Bulk>0.51</Bulk>
-								<MarketValue>2.52</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_FabricationBench</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoPlasmaCellHeavy</li>
-							</thingCategories>
-							<stackLimit>75</stackLimit>
-							<graphicData>
-								<texPath>ThirdParty/VanillaXCOM/Plasma/Dense/Heavy</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>XCOM_PlasmaDense</ammoClass>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>35</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>0.5</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Large>2</Fragment_Large>
-										<Fragment_Small>10</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
-							<defName>Ammo_XCOM_PlasmaCellHeavyUnstable</defName>
-							<label>Unstable Plasma Heavy Cell</label>
-							<description>Plasma containment cell optimized for heavy weapons</description>
-							<statBases>
-								<Mass>0.134</Mass>
-								<Bulk>0.51</Bulk>
-								<MarketValue>2.52</MarketValue>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting_FabricationBench</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoPlasmaCellHeavy</li>
-							</thingCategories>
-							<stackLimit>75</stackLimit>
-							<graphicData>
-								<texPath>ThirdParty/VanillaXCOM/Plasma/Unstable/Heavy</texPath>
-								<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
-							</graphicData>
-							<ammoClass>XCOM_PlasmaUnstable</ammoClass>
-							<comps>
-								<li Class="CombatExtended.CompProperties_ExplosiveCE">
-									<damageAmountBase>35</damageAmountBase>
-									<explosiveDamageType>Bomb</explosiveDamageType>
-									<explosiveRadius>0.5</explosiveRadius>
-									<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								</li>
-								<li Class="CombatExtended.CompProperties_Fragments">
-									<fragments>
-										<Fragment_Large>2</Fragment_Large>
-										<Fragment_Small>10</Fragment_Small>
-									</fragments>
-								</li>
-							</comps>
-						</ThingDef>
-
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_XCOM_PlasmaCellHeavyStandard</defName>
-							<label>make Standard Plasma Heavy Cells</label>
-							<description>Craft 75 shots' worth of Standard Plasma Heavy Cells.</description>
-							<jobString>Making Plasma Heavy Cells.</jobString>
-							<workAmount>6800</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>9</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Plasteel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_XCOM_PlasmaCellHeavyStandard>75</Ammo_XCOM_PlasmaCellHeavyStandard>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_XCOM_PlasmaCellHeavyLight</defName>
-							<label>make Light Plasma Heavy Cells</label>
-							<description>Craft 75 shots' worth of Light Plasma Heavy Cells.</description>
-							<jobString>Making Plasma Heavy Cells.</jobString>
-							<workAmount>6800</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Silver</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>9</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Silver</li>
-									<li>Plasteel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_XCOM_PlasmaCellHeavyLight>75</Ammo_XCOM_PlasmaCellHeavyLight>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_XCOM_PlasmaCellHeavyDense</defName>
-							<label>make Dense Plasma Heavy Cells</label>
-							<description>Craft 75 shots' worth of Dense Plasma Heavy Cells.</description>
-							<jobString>Making Plasma Heavy Cells.</jobString>
-							<workAmount>6800</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Uranium</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>9</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Uranium</li>
-									<li>Plasteel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_XCOM_PlasmaCellHeavyDense>75</Ammo_XCOM_PlasmaCellHeavyDense>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="ChargeAmmoRecipeBase">
-							<defName>MakeAmmo_XCOM_PlasmaCellHeavyUnstable</defName>
-							<label>make Unstable Plasma Heavy Cells</label>
-							<description>Craft 75 shots' worth of Unstable Plasma Heavy Cells.</description>
-							<jobString>Making Plasma Heavy Cells.</jobString>
-							<workAmount>6800</workAmount>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>FSX</li>
-										</thingDefs>
-									</filter>
-									<count>20</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Plasteel</li>
-										</thingDefs>
-									</filter>
-									<count>9</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>ComponentIndustrial</li>
-										</thingDefs>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>FSX</li>
-									<li>Plasteel</li>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_XCOM_PlasmaCellHeavyUnstable>75</Ammo_XCOM_PlasmaCellHeavyUnstable>
-							</products>
-						</RecipeDef>
-
-						<!-- XCOM Plasma Rifle, cannon, vektor and bullpup-->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_XCOM_Gun_BeamRifle</defName>
-							<label>plasma</label>
-							<ammoTypes>
-								<Ammo_XCOM_PlasmaCellRifleStandard>XCOM_Bullet_BeamRifleCE</Ammo_XCOM_PlasmaCellRifleStandard>
-								<Ammo_XCOM_PlasmaCellRifleLight>XCOM_Bullet_BeamRifleCELight</Ammo_XCOM_PlasmaCellRifleLight>
-								<Ammo_XCOM_PlasmaCellRifleDense>XCOM_Bullet_BeamRifleCEDense</Ammo_XCOM_PlasmaCellRifleDense>
-								<Ammo_XCOM_PlasmaCellRifleUnstable>XCOM_Bullet_BeamRifleCEUnstable</Ammo_XCOM_PlasmaCellRifleUnstable>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletGreen">
-							<defName>XCOM_Bullet_BeamRifleCE</defName>
-							<label>plasma beam</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>XCOM_Plasma</damageDef>
-								<damageAmountBase>10</damageAmountBase>
-								<armorPenetrationSharp>22.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>44.52</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>13</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletBlue">
-							<defName>XCOM_Bullet_BeamRifleCELight</defName>
-							<label>plasma beam</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>XCOM_Plasma</damageDef>
-								<damageAmountBase>15</damageAmountBase>
-								<armorPenetrationSharp>11.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>44.52</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>18</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletYellow">
-							<defName>XCOM_Bullet_BeamRifleCEDense</defName>
-							<label>plasma beam</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>XCOM_Plasma</damageDef>
-								<damageAmountBase>8</damageAmountBase>
-								<armorPenetrationSharp>33.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>44.52</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>9</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletRed">
-							<defName>XCOM_Bullet_BeamRifleCEUnstable</defName>
-							<label>plasma beam</label>
-							<canExplode>true</canExplode>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>XCOM_Plasma</damageDef>
-								<damageAmountBase>10</damageAmountBase>
-								<explosionRadius>1.2</explosionRadius>
-								<armorPenetrationSharp>22.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>44.52</armorPenetrationBlunt>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>13</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<!-- XCOM Plasma Lance and autocannon-->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_XCOM_Gun_BeamSniperRifle</defName>
-							<label>heavy plasma</label>
-							<ammoTypes>
-								<Ammo_XCOM_PlasmaCellHeavyStandard>XCOM_Bullet_BeamSniperRifleCE</Ammo_XCOM_PlasmaCellHeavyStandard>
-								<Ammo_XCOM_PlasmaCellHeavyLight>XCOM_Bullet_BeamSniperRifleCELight</Ammo_XCOM_PlasmaCellHeavyLight>
-								<Ammo_XCOM_PlasmaCellHeavyDense>XCOM_Bullet_BeamSniperRifleCEDense</Ammo_XCOM_PlasmaCellHeavyDense>
-								<Ammo_XCOM_PlasmaCellHeavyUnstable>XCOM_Bullet_BeamSniperRifleCEUnstable</Ammo_XCOM_PlasmaCellHeavyUnstable>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletGreen">
-							<defName>XCOM_Bullet_BeamSniperRifleCE</defName>
-							<label>plasma beam</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>XCOM_Plasma</damageDef>
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationSharp>35</armorPenetrationSharp>
-								<armorPenetrationBlunt>70.52</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>20</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletBlue">
-							<defName>XCOM_Bullet_BeamSniperRifleCELight</defName>
-							<label>plasma beam</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>XCOM_Plasma</damageDef>
-								<damageAmountBase>28</damageAmountBase>
-								<armorPenetrationSharp>17.75</armorPenetrationSharp>
-								<armorPenetrationBlunt>70.52</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>28</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletYellow">
-							<defName>XCOM_Bullet_BeamSniperRifleCEDense</defName>
-							<label>plasma beam</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>XCOM_Plasma</damageDef>
-								<damageAmountBase>12</damageAmountBase>
-								<armorPenetrationSharp>50</armorPenetrationSharp>
-								<armorPenetrationBlunt>70.52</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>12</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletRed">
-							<defName>XCOM_Bullet_BeamSniperRifleCEUnstable</defName>
-							<label>plasma beam</label>
-							<canExplode>true</canExplode>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>XCOM_Plasma</damageDef>
-								<damageAmountBase>20</damageAmountBase>
-								<explosionRadius>1.8</explosionRadius>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-								<armorPenetrationSharp>35</armorPenetrationSharp>
-								<armorPenetrationBlunt>70.52</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>20</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<!-- XCOM Storm Gun -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_XCOM_Gun_BeamShotgun</defName>
-							<label>heavy plasma</label>
-							<ammoTypes>
-								<Ammo_XCOM_PlasmaCellHeavyStandard>XCOM_Bullet_BeamShotgunCE</Ammo_XCOM_PlasmaCellHeavyStandard>
-								<Ammo_XCOM_PlasmaCellHeavyLight>XCOM_Bullet_BeamShotgunCELight</Ammo_XCOM_PlasmaCellHeavyLight>
-								<Ammo_XCOM_PlasmaCellHeavyDense>XCOM_Bullet_BeamShotgunCEDense</Ammo_XCOM_PlasmaCellHeavyDense>
-								<Ammo_XCOM_PlasmaCellHeavyUnstable>XCOM_Bullet_BeamShotgunCEUnstable</Ammo_XCOM_PlasmaCellHeavyUnstable>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletGreen">
-							<defName>XCOM_Bullet_BeamShotgunCE</defName>
-							<label>plasma beam</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<spreadMult>17.8</spreadMult>
-								<pelletCount>7</pelletCount>
-								<damageDef>XCOM_Plasma</damageDef>
-								<damageAmountBase>6</damageAmountBase>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-								<armorPenetrationBlunt>14.22</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>4</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletBlue">
-							<defName>XCOM_Bullet_BeamShotgunCELight</defName>
-							<label>plasma beam</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<spreadMult>114514</spreadMult>
-								<pelletCount>12</pelletCount>
-								<damageDef>XCOM_Plasma</damageDef>
-								<damageAmountBase>7</damageAmountBase>
-								<armorPenetrationSharp>7.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>14.22</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>5</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletYellow">
-							<defName>XCOM_Bullet_BeamShotgunCEDense</defName>
-							<label>plasma beam</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<spreadMult>7.8</spreadMult>
-								<pelletCount>3</pelletCount>
-								<damageDef>XCOM_Plasma</damageDef>
-								<damageAmountBase>7</damageAmountBase>
-								<armorPenetrationSharp>24.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>14.22</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>4</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletRed">
-							<defName>XCOM_Bullet_BeamShotgunCEUnstable</defName>
-							<label>plasma beam</label>
-							<canExplode>true</canExplode>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<spreadMult>17.8</spreadMult>
-								<pelletCount>5</pelletCount>
-								<damageDef>XCOM_Plasma</damageDef>
-								<damageAmountBase>8</damageAmountBase>
-								<explosionRadius>0.5</explosionRadius>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-								<armorPenetrationBlunt>14.22</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>4</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<!-- XCOM Beam Pistol and autopistol-->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_XCOM_Gun_BeamPistol</defName>
-							<label>light plasma</label>
-							<ammoTypes>
-								<Ammo_XCOM_PlasmaCellPistolStandard>XCOM_Bullet_Beam_PistolCE</Ammo_XCOM_PlasmaCellPistolStandard>
-								<Ammo_XCOM_PlasmaCellPistolLight>XCOM_Bullet_Beam_PistolCELight</Ammo_XCOM_PlasmaCellPistolLight>
-								<Ammo_XCOM_PlasmaCellPistolDense>XCOM_Bullet_Beam_PistolCEDense</Ammo_XCOM_PlasmaCellPistolDense>
-								<Ammo_XCOM_PlasmaCellPistolUnstable>XCOM_Bullet_Beam_PistolCEUnstable</Ammo_XCOM_PlasmaCellPistolUnstable>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletGreen">
-							<defName>XCOM_Bullet_Beam_PistolCE</defName>
-							<label>plasma beam</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>XCOM_Plasma</damageDef>
-								<damageAmountBase>7</damageAmountBase>
-								<armorPenetrationSharp>17.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>25.67</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>6</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletBlue">
-							<defName>XCOM_Bullet_Beam_PistolCELight</defName>
-							<label>plasma beam</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>XCOM_Plasma</damageDef>
-								<damageAmountBase>10</damageAmountBase>
-								<armorPenetrationSharp>8.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>25.67</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>8</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletYellow">
-							<defName>XCOM_Bullet_Beam_PistolCEDense</defName>
-							<label>plasma beam</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>XCOM_Plasma</damageDef>
-								<damageAmountBase>5</damageAmountBase>
-								<armorPenetrationSharp>25.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>25.67</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>3</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletRed">
-							<defName>XCOM_Bullet_Beam_PistolCEUnstable</defName>
-							<label>plasma beam</label>
-							<canExplode>true</canExplode>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>XCOM_Plasma</damageDef>
-								<explosionRadius>0.5</explosionRadius>
-								<damageAmountBase>7</damageAmountBase>
-								<armorPenetrationSharp>17.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>25.67</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>6</amount>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla XCOM weapons/Plasma weapons/Weapon_Ranged.xml b/Patches/Vanilla XCOM weapons/Plasma weapons/Weapon_Ranged.xml
deleted file mode 100644
index ce6e2fa602..0000000000
--- a/Patches/Vanilla XCOM weapons/Plasma weapons/Weapon_Ranged.xml	
+++ /dev/null
@@ -1,522 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla XCOM Plasma Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationReplace">
-					<!-- Sleek, advanced, but still energy weapon thus heavier mass but less bulk -->
-
-					<xpath>
-						Defs/ThingDef[
-						defName="XCOM_Gun_BeamRifle" or
-						defName="XCOM_Gun_BeamSniperRifle" or
-						defName="XCOM_Gun_BeamShotgun" or
-						defName="XCOM_Gun_BeamCannon" or
-						defName="XCOM_Gun_BeamVektor" or
-						defName="XCOM_Gun_BeamBullpup" or
-						defName="XCOM_Gun_BeamHeavyAutocannon"
-						]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="XCOM_Gun_BeamPistol" or defName="XCOM_Gun_BeamAutopistol"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- XCOM Plasma Rifle -->
-				<!-- peeeeeew~-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_Gun_BeamRifle</defName>
-					<statBases>
-						<Mass>4.5</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>9.2</Bulk>
-						<WorkToMake>60000</WorkToMake>
-					</statBases>
-					<costList>
-						<Plasteel>60</Plasteel>
-						<ComponentSpacer>4</ComponentSpacer>
-						<Uranium>20</Uranium>
-					</costList>
-					<Properties>
-						<hasStandardCommand>true</hasStandardCommand>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<recoilAmount>0</recoilAmount>
-						<soundAiming>Beam_WarmupRifle</soundAiming>
-						<defaultProjectile>XCOM_Bullet_BeamRifleCE</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>55</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<soundCast>Beam_Rifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>36</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_XCOM_Gun_BeamRifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AR</li>
-					</weaponTags>
-					<researchPrerequisite>XCOM_BeamWeapons</researchPrerequisite>
-				</li>
-
-				<!-- XCOM Plasma Lance -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_Gun_BeamSniperRifle</defName>
-					<statBases>
-						<Mass>11</Mass>
-						<RangedWeapon_Cooldown>1.55</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.6</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.35</SwayFactor>
-						<Bulk>10.88</Bulk>
-						<WorkToMake>75000</WorkToMake>
-					</statBases>
-					<costList>
-						<Plasteel>100</Plasteel>
-						<ComponentSpacer>8</ComponentSpacer>
-						<Uranium>30</Uranium>
-					</costList>
-					<Properties>
-						<hasStandardCommand>true</hasStandardCommand>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<recoilAmount>0</recoilAmount>
-						<soundAiming>Beam_WarmupSniperRifle</soundAiming>
-						<defaultProjectile>XCOM_Bullet_BeamSniperRifleCE</defaultProjectile>
-						<warmupTime>2</warmupTime>
-						<range>76</range>
-						<soundCast>Beam_SniperRifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_XCOM_Gun_BeamSniperRifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_SR</li>
-						<li>Bipod_DMR</li>
-					</weaponTags>
-					<researchPrerequisite>XCOM_BeamWeapons</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- XCOM Storm Gun -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_Gun_BeamShotgun</defName>
-					<statBases>
-						<Mass>4.5</Mass>
-						<RangedWeapon_Cooldown>1.00</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>0.97</SwayFactor>
-						<Bulk>5</Bulk>
-						<WorkToMake>50000</WorkToMake>
-					</statBases>
-					<costList>
-						<Plasteel>50</Plasteel>
-						<ComponentSpacer>4</ComponentSpacer>
-						<Uranium>25</Uranium>
-					</costList>
-					<Properties>
-						<hasStandardCommand>true</hasStandardCommand>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<recoilAmount>0</recoilAmount>
-						<soundAiming>Beam_WarmupShotgun</soundAiming>
-						<defaultProjectile>XCOM_Bullet_BeamShotgunCE</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>20</range>
-						<soundCast>Beam_Shotgun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_XCOM_Gun_BeamShotgun</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-					<researchPrerequisite>XCOM_BeamWeapons</researchPrerequisite>
-				</li>
-
-				<!-- XCOM Beam Cannon -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_Gun_BeamCannon</defName>
-					<statBases>
-						<Mass>20.5</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>3.22</SwayFactor>
-						<Bulk>12.5</Bulk>
-						<WorkToMake>100000</WorkToMake>
-					</statBases>
-					<costList>
-						<Plasteel>150</Plasteel>
-						<ComponentSpacer>10</ComponentSpacer>
-						<Uranium>40</Uranium>
-					</costList>
-					<Properties>
-						<recoilAmount>0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>XCOM_Bullet_BeamRifleCE</defaultProjectile>
-						<soundAiming>Beam_WarmupCannon</soundAiming>
-						<warmupTime>2.5</warmupTime>
-						<burstShotCount>30</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<range>62</range>
-						<soundCast>Beam_Cannon</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>90</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_XCOM_Gun_BeamRifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Suppressive</li>
-						<li>Bipod_LMG</li>
-					</weaponTags>
-					<researchPrerequisite>XCOM_BeamWeapons</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- XCOM Beam Pistol -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_Gun_BeamPistol</defName>
-					<statBases>
-						<Mass>2.2</Mass>
-						<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.4</SwayFactor>
-						<Bulk>2</Bulk>
-						<WorkToMake>42000</WorkToMake>
-					</statBases>
-					<costList>
-						<Plasteel>40</Plasteel>
-						<ComponentSpacer>2</ComponentSpacer>
-						<Uranium>10</Uranium>
-					</costList>
-					<Properties>
-						<recoilAmount>3.55</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<soundAiming>Beam_WarmupPistol</soundAiming>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>XCOM_Bullet_Beam_PistolCE</defaultProjectile>
-						<warmupTime>0.8</warmupTime>
-						<range>18</range>
-						<soundCast>Beam_Pistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_XCOM_Gun_BeamPistol</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_BROOM</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-					<researchPrerequisite>XCOM_BeamWeapons</researchPrerequisite>
-				</li>
-
-				<!-- XCOM Beam Autopistol -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_Gun_BeamAutopistol</defName>
-					<statBases>
-						<Mass>3</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.93</SwayFactor>
-						<Bulk>2.5</Bulk>
-						<WorkToMake>45000</WorkToMake>
-					</statBases>
-					<costList>
-						<Plasteel>50</Plasteel>
-						<ComponentSpacer>2</ComponentSpacer>
-						<Uranium>15</Uranium>
-					</costList>
-					<Properties>
-						<recoilAmount>1.81</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<soundAiming>Beam_WarmupAutopistol</soundAiming>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>XCOM_Bullet_Beam_PistolCE</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>15</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>Beam_Autopistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>24</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_XCOM_Gun_BeamPistol</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_BROOM</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-					<researchPrerequisite>XCOM_BeamWeapons</researchPrerequisite>
-				</li>
-
-				<!-- XCOM Beam Vektor -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_Gun_BeamVektor</defName>
-					<statBases>
-						<WorkToMake>70000</WorkToMake>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.70</SwayFactor>
-						<Bulk>10.25</Bulk>
-						<Mass>5.9</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Plasteel>80</Plasteel>
-						<ComponentSpacer>6</ComponentSpacer>
-						<Uranium>20</Uranium>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<soundAiming>Beam_WarmupRifle</soundAiming>
-						<recoilAmount>0</recoilAmount>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>XCOM_Bullet_BeamRifleCE</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>75</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<soundCast>Beam_Vektor</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>18</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_XCOM_Gun_BeamRifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>SniperRifle</li>
-						<li>CE_AI_SR</li>
-						<li>Bipod_DMR</li>
-					</weaponTags>
-					<researchPrerequisite>XCOM_BeamWeapons</researchPrerequisite>
-				</li>
-
-				<!-- XCOM Beam Bullpup -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_Gun_BeamBullpup</defName>
-					<statBases>
-						<WorkToMake>55000</WorkToMake>
-						<Mass>5.4</Mass>
-						<Bulk>6.30</Bulk>
-						<ShotSpread>0.1</ShotSpread>
-						<SwayFactor>1.55</SwayFactor>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Plasteel>80</Plasteel>
-						<ComponentSpacer>4</ComponentSpacer>
-						<Uranium>25</Uranium>
-					</costList>
-					<Properties>
-						<hasStandardCommand>true</hasStandardCommand>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<recoilAmount>0</recoilAmount>
-						<soundAiming>Beam_WarmupRifle</soundAiming>
-						<defaultProjectile>XCOM_Bullet_BeamRifleCE</defaultProjectile>
-						<warmupTime>0.9</warmupTime>
-						<range>55</range>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<soundCast>Beam_Rifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_XCOM_Gun_BeamRifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-					<researchPrerequisite>XCOM_BeamWeapons</researchPrerequisite>
-				</li>
-
-				<!-- SPARK Elerium Phase-Cannon -->
-				<!-- An even more fancy "autocannon"-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_Gun_BeamHeavyAutocannon</defName>
-					<statBases>
-						<WorkToMake>125000</WorkToMake>
-						<SightsEfficiency>1.2</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.7</SwayFactor>
-						<Bulk>13.90</Bulk>
-						<Mass>15.30</Mass>
-						<RangedWeapon_Cooldown>0.47</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Plasteel>180</Plasteel>
-						<ComponentSpacer>12</ComponentSpacer>
-						<Uranium>50</Uranium>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<soundAiming>Beam_WarmupAutocannon</soundAiming>
-						<recoilAmount>1</recoilAmount>
-						<defaultProjectile>XCOM_Bullet_BeamSniperRifleCE</defaultProjectile>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>1.4</warmupTime>
-						<range>55</range>
-						<soundCast>Beam_HeavyAutocannon</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_XCOM_Gun_BeamSniperRifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>Bipod_LMG</li>
-					</weaponTags>
-					<researchPrerequisite>XCOM_BeamWeapons</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla XCOM weapons/Weapon_RangedWC.xml b/Patches/Vanilla XCOM weapons/Weapon_RangedWC.xml
deleted file mode 100644
index 1ea1c86a69..0000000000
--- a/Patches/Vanilla XCOM weapons/Weapon_RangedWC.xml	
+++ /dev/null
@@ -1,257 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla XCOM Patches</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!--
-				[Smmothbrain:Bill]
-				He will refuse to use his brain and slap existing 3HST weapon stats whenever possible
-				The last straw: "Mag autocannon"
-				-->
-
-				<!-- Magnetic, bulky and heavy than conventional I assume? since all these coils and
-				rails-->
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName="XCOM_WarcasketGun_CVHA" or
-						defName="XCOM_WarcasketGun_Railgun" or
-						defName="XCOM_WarcasketGun_MagHA" or
-						defName="XCOM_WarcasketGun_BeamHA"
-						]/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>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_WarcasketGun_CVHA</defName>
-					<statBases>
-						<WorkToMake>48000</WorkToMake>
-						<SightsEfficiency>1.2</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.7</SwayFactor>
-						<Bulk>13.90</Bulk>
-						<Mass>6.30</Mass>
-						<RangedWeapon_Cooldown>0.47</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>80</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<recoilAmount>3.2</recoilAmount>
-						<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<warmupTime>1.4</warmupTime>
-						<range>55</range>
-						<soundCast>CV_HeavyAutocannon</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_338Lapua</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>Bipod_LMG</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_WarcasketGun_Railgun</defName>
-					<statBases>
-						<WorkToMake>125000</WorkToMake>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>2.2</SwayFactor>
-						<Bulk>55.90</Bulk>
-						<Mass>28.30</Mass>
-						<RangedWeapon_Cooldown>1.47</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Plasteel>300</Plasteel>
-						<ComponentSpacer>12</ComponentSpacer>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<soundAiming>Laser_Warmup</soundAiming>
-						<recoilAmount>1</recoilAmount>
-						<defaultProjectile>XCOM_Bullet_LaserRailgunCE</defaultProjectile>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
-						<warmupTime>2</warmupTime>
-						<range>55</range>
-						<soundCast>Laser_Railgun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>18</magazineSize>
-						<reloadTime>7.5</reloadTime>
-						<ammoSet>AmmoSet_XCOM_Gun_LaserRailgun</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>Bipod_LMG</li>
-					</weaponTags>
-					<researchPrerequisite>XCOM_LaserWeapons</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_WarcasketGun_BeamHA</defName>
-					<statBases>
-						<WorkToMake>125000</WorkToMake>
-						<SightsEfficiency>1.2</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.7</SwayFactor>
-						<Bulk>13.90</Bulk>
-						<Mass>15.30</Mass>
-						<RangedWeapon_Cooldown>0.47</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Plasteel>180</Plasteel>
-						<ComponentSpacer>12</ComponentSpacer>
-						<Uranium>50</Uranium>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<soundAiming>Beam_WarmupAutocannon</soundAiming>
-						<recoilAmount>1</recoilAmount>
-						<defaultProjectile>XCOM_Bullet_BeamSniperRifleCE</defaultProjectile>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						<warmupTime>1.4</warmupTime>
-						<range>55</range>
-						<soundCast>Beam_HeavyAutocannon</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_XCOM_Gun_BeamSniperRifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>Bipod_LMG</li>
-					</weaponTags>
-					<researchPrerequisite>XCOM_BeamWeapons</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- SPARK Helix Rail-Cannon -->
-				<!-- AMOTHER handheld autocannon which is in fact a battle rifle....not again-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_WarcasketGun_MagHA</defName>
-					<statBases>
-						<WorkToMake>75500</WorkToMake>
-						<Mass>12.8</Mass>
-						<Bulk>11.5</Bulk>
-						<SwayFactor>1.7</SwayFactor>
-						<ShotSpread>0.1</ShotSpread>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.57</RangedWeapon_Cooldown>
-						<NightVisionEfficiency_Weapon>0.4</NightVisionEfficiency_Weapon>
-					</statBases>
-					<costList>
-						<Steel>80</Steel>
-						<Plasteel>130</Plasteel>
-						<ComponentIndustrial>10</ComponentIndustrial>
-						<ComponentSpacer>5</ComponentSpacer>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_XCOM8mmRailgun_Sabot</defaultProjectile>
-						<warmupTime>2</warmupTime>
-						<burstShotCount>8</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<range>55</range>
-						<soundCast>Mag_HeavyAutocannon</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<recoilAmount>2.9</recoilAmount>
-						<muzzleFlashScale>8</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>40</magazineSize>
-						<reloadTime>6.5</reloadTime>
-						<ammoSet>AmmoSet_8mmRailgunXCOM</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>4</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_LMG</li>
-						<li>Bipod_LMG</li>
-					</weaponTags>
-					<researchPrerequisite>ChargedShot</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla XCOM weapons/XCOM Conventional/ArcThrowerProjectile.xml b/Patches/Vanilla XCOM weapons/XCOM Conventional/ArcThrowerProjectile.xml
deleted file mode 100644
index 22e26750e1..0000000000
--- a/Patches/Vanilla XCOM weapons/XCOM Conventional/ArcThrowerProjectile.xml	
+++ /dev/null
@@ -1,38 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla XCOM Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<ThingDef ParentName="Base50BMGBullet">
-							<defName>XCOM_Bullet_ArcThrowerCE</defName>
-							<label>arc thrower beam</label>
-							<graphicData>
-								<texPath>Things/Projectile/ChargeLanceShot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>EMP</damageDef>
-								<damageAmountBase>20</damageAmountBase>
-								<secondaryDamage>
-									<li>
-										<def>Stun</def>
-										<amount>100</amount>
-										<chance>0.9</chance>
-									</li>
-								</secondaryDamage>
-								<speed>100</speed>
-								<dropsCasings>false</dropsCasings>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla XCOM weapons/XCOM Conventional/Weapon_Ranged.xml b/Patches/Vanilla XCOM weapons/XCOM Conventional/Weapon_Ranged.xml
deleted file mode 100644
index 51d7fc7de5..0000000000
--- a/Patches/Vanilla XCOM weapons/XCOM Conventional/Weapon_Ranged.xml	
+++ /dev/null
@@ -1,907 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla XCOM Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName="XCOM_Gun_CVRifle" or
-						defName="XCOM_Gun_CVSniperRifle" or
-						defName="XCOM_Gun_CVShotgun" or
-						defName="XCOM_Gun_CVCannon" or
-						defName="XCOM_Gun_CVGrenadeLauncher" or
-						defName="XCOM_Gun_CVVektorRifle" or
-						defName="XCOM_Gun_CVBullpup" or
-						defName="XCOM_Gun_CVHeavyAutocannon"
-						]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="XCOM_Gun_CVPistol" or defName="XCOM_Gun_TemplarPistol" or defName="XCOM_Gun_ArcThrower"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[defName="XCOM_Gun_BoltCaster"]/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>
-							<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>22</power>
-								<cooldownTime>2.18</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.72</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- XCOM Conventional Rifle -->
-				<!--5 burst instead of 3 in vanilla, as for the better penetration, we have AP ammo already-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_Gun_CVRifle</defName>
-					<statBases>
-						<Mass>3.26</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>1.33</SwayFactor>
-						<Bulk>10.03</Bulk>
-						<WorkToMake>30000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>70</Steel>
-						<ComponentIndustrial>8</ComponentIndustrial>
-						<Chemfuel>10</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>1.70</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<burstShotCount>8</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>CV_Rifle</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>32</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AR</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-				</li>
-
-				<!-- XCOM Conventional Sniper Rifle -->
-				<!-- DMG and accuracy slightly better than vanilla SR which is full power...so magnum?-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_Gun_CVSniperRifle</defName>
-					<statBases>
-						<Mass>9.7</Mass>
-						<RangedWeapon_Cooldown>1.55</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.6</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.35</SwayFactor>
-						<Bulk>12.77</Bulk>
-						<WorkToMake>40000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>120</Steel>
-						<ComponentIndustrial>8</ComponentIndustrial>
-						<Chemfuel>15</Chemfuel>
-					</costList>
-					<Properties>
-						<recoilAmount>3.2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
-						<warmupTime>2</warmupTime>
-						<range>65</range>
-						<soundCast>CV_SniperRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_338Lapua</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_SR</li>
-						<li>Bipod_DMR</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- XCOM Conventional Shotgun -->
-				<!-- so this one is very straight forward. a KSG, that's it. the vanilla stats are of negalible difference from vanilla pump action-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_Gun_CVShotgun</defName>
-					<statBases>
-						<Mass>3.10</Mass>
-						<RangedWeapon_Cooldown>1.00</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.14</ShotSpread>
-						<SwayFactor>0.97</SwayFactor>
-						<Bulk>6.60</Bulk>
-						<WorkToMake>18000</WorkToMake>
-					</statBases>
-					<costList>
-						<Chemfuel>25</Chemfuel>
-						<Steel>55</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>3.10</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>16</range>
-						<soundCast>CV_Shotgun</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Regular</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_12Gauge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_BROOM</li>
-					</weaponTags>
-					<researchPrerequisite>Gunsmithing</researchPrerequisite>
-				</li>
-
-				<!-- XCOM Conventional Cannon -->
-				<!-- bruh, cannon? the vanilla data suggests it deal less damage than minigun, but xcom stats say it hit as hard as sniper
-			A magnum rifle with 20 burst and 60 round mag then-->
-
-				<!-- It says faster spin up and is three barreled, so I assume it's lighter than minigun despite firing magnum-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_Gun_CVCannon</defName>
-					<statBases>
-						<Mass>17.5</Mass>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.06</ShotSpread>
-						<SwayFactor>3.22</SwayFactor>
-						<Bulk>14.5</Bulk>
-						<WorkToMake>60000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>170</Steel>
-						<ComponentIndustrial>20</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.80</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
-						<warmupTime>1.6</warmupTime>
-						<burstShotCount>20</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<range>62</range>
-						<soundCast>CV_Cannon</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>60</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_338Lapua</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Suppressive</li>
-						<li>Bipod_LMG</li>
-					</weaponTags>
-					<researchPrerequisite>MultibarrelWeapons</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- XCOM Conventional Pistol -->
-				<!-- "Slightly more powerful" than out normal revolver which is .44magnum.... .500SW there you go-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_Gun_CVPistol</defName>
-					<statBases>
-						<Mass>1.88</Mass>
-						<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.4</SwayFactor>
-						<Bulk>2.9</Bulk>
-						<WorkToMake>8000</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>40</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>3.55</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_500SWMagnum_FMJ</defaultProjectile>
-						<warmupTime>0.9</warmupTime>
-						<range>15</range>
-						<soundCast>CV_Pistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.6</reloadTime>
-						<ammoSet>AmmoSet_500SWMagnum</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_Sidearm</li>
-						<li>CE_AI_BROOM</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-					<researchPrerequisite>Gunsmithing</researchPrerequisite>
-				</li>
-
-				<!-- XCOM Conventional Grenade Launcher -->
-				<!-- Copy-pasty, Milkor launchy-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_Gun_CVGrenadeLauncher</defName>
-					<statBases>
-						<WorkToMake>25500</WorkToMake>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<ShotSpread>0.18</ShotSpread>
-						<SwayFactor>1.31</SwayFactor>
-						<Bulk>5.65</Bulk>
-						<Mass>6.3</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>80</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>2.93</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
-						<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-						<warmupTime>1</warmupTime>
-						<range>40</range>
-						<minRange>5</minRange>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<soundCast>CV_GrenadeLauncher</soundCast>
-						<muzzleFlashScale>14</muzzleFlashScale>
-						<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>5.1</reloadTime>
-						<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>GunHeavy</li>
-						<li>CE_AI_AOE</li>
-					</weaponTags>
-					<researchPrerequisite>CE_Launchers</researchPrerequisite>
-				</li>
-
-				<!-- XCOM Conventional Autopistol -->
-				<!--MP7 or MAC-10 whatsoever...slightly more powerful than vanilla MP, 10mmAuto then-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_Gun_TemplarPistol</defName>
-					<statBases>
-						<Mass>3</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.93</SwayFactor>
-						<Bulk>3</Bulk>
-						<WorkToMake>28900</WorkToMake>
-					</statBases>
-					<costList>
-						<Steel>45</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.81</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_10mmAuto_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<soundCast>CV_TemplarPistol</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_10mmAuto</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_SMG</li>
-						<li>CE_AI_BROOM</li>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-					<researchPrerequisite>BlowbackOperation</researchPrerequisite>
-				</li>
-
-				<!-- XCOM Arc Thrower -->
-				<!-- Stun gun, how Imba-->
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="XCOM_Gun_ArcThrower"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>BaseGun</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="XCOM_Gun_ArcThrower"]/recipeMaker</xpath>
-					<value>
-						<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-						<workSkill>Crafting</workSkill>
-						<effectWorking>Smith</effectWorking>
-						<soundWorking>Recipe_Smith</soundWorking>
-						<recipeUsers>
-							<li>TableMachining</li>
-						</recipeUsers>
-						<unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
-						<researchPrerequisite>CE_AdvancedLaunchers</researchPrerequisite>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_Gun_ArcThrower</defName>
-					<statBases>
-						<Mass>2</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.9</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>0.93</SwayFactor>
-						<Bulk>2</Bulk>
-						<WorkToMake>32000</WorkToMake>
-					</statBases>
-					<costList>
-						<Plasteel>40</Plasteel>
-						<ComponentSpacer>1</ComponentSpacer>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>XCOM_Bullet_ArcThrowerCE</defaultProjectile>
-						<warmupTime>2</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_ChargeBlaster</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- XCOM Vektor Rifle -->
-				<!-- SVD. again, ctrl-cv-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_Gun_CVVektorRifle</defName>
-					<statBases>
-						<WorkToMake>23000</WorkToMake>
-						<SightsEfficiency>2.24</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.70</SwayFactor>
-						<Bulk>12.25</Bulk>
-						<Mass>4.30</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>60</Steel>
-						<ComponentIndustrial>4</ComponentIndustrial>
-						<WoodLog>10</WoodLog>
-					</costList>
-					<Properties>
-						<recoilAmount>1.94</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>75</range>
-						<soundCast>CV_VektorRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SniperRifle</li>
-						<li>CE_AI_SR</li>
-						<li>Bipod_DMR</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-				</li>
-
-				<!-- Kal-7 Bullpup -->
-				<!-- Tavor? do we have any tavor mod around? So, does not end turn when firing? I assume that translate into faster warm up and cool down-->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_Gun_CVBullpup</defName>
-					<statBases>
-						<WorkToMake>37500</WorkToMake>
-						<Mass>4.10</Mass>
-						<Bulk>7.30</Bulk>
-						<ShotSpread>0.1</ShotSpread>
-						<SwayFactor>1.55</SwayFactor>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>45</Steel>
-						<Chemfuel>10</Chemfuel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<recoilAmount>2.11</recoilAmount>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<warmupTime>0.9</warmupTime>
-						<range>55</range>
-						<soundCast>CV_Bullpup</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-				</li>
-
-				<!-- SPARK Heavy Autocannon -->
-				<!-- Yet another handheld autocannon...but it looks more like a heavy battle rifle. 4-6 dmg? 338Lapua here you go.-->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_Gun_CVHeavyAutocannon</defName>
-					<statBases>
-						<WorkToMake>48000</WorkToMake>
-						<SightsEfficiency>1.2</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.7</SwayFactor>
-						<Bulk>13.90</Bulk>
-						<Mass>6.30</Mass>
-						<RangedWeapon_Cooldown>0.47</RangedWeapon_Cooldown>
-					</statBases>
-					<costList>
-						<Steel>80</Steel>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<recoilAmount>3.2</recoilAmount>
-						<defaultProjectile>Bullet_338Lapua_FMJ</defaultProjectile>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<warmupTime>1.4</warmupTime>
-						<range>55</range>
-						<soundCast>CV_HeavyAutocannon</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_338Lapua</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_Rifle</li>
-						<li>Bipod_LMG</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- Bolt Caster -->
-				<!-- whoo, 6-8 dmg and stun. 50cal then, gonna need a new ammo set for this.-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_XCOMBoltCaster</defName>
-							<label>.50 BMG</label>
-							<ammoTypes>
-								<Ammo_50BMG_FMJ>Bullet_50BMG_FMJStun</Ammo_50BMG_FMJ>
-								<Ammo_50BMG_AP>Bullet_50BMG_APStun</Ammo_50BMG_AP>
-								<Ammo_50BMG_Incendiary>Bullet_50BMG_IncendiaryStun</Ammo_50BMG_Incendiary>
-								<Ammo_50BMG_HE>Bullet_50BMG_HEStun</Ammo_50BMG_HE>
-								<Ammo_50BMG_Sabot>Bullet_50BMG_SabotStun</Ammo_50BMG_Sabot>
-							</ammoTypes>
-							<similarTo>AmmoSet_AntiMateriel</similarTo>
-						</CombatExtended.AmmoSetDef>
-
-						<ThingDef ParentName="Base50BMGBullet">
-							<defName>Bullet_50BMG_FMJStun</defName>
-							<label>.50 BMG bullet (FMJ)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>30</damageAmountBase>
-								<armorPenetrationSharp>15.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>360.34</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Stun</def>
-										<amount>10</amount>
-										<chance>0.2</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base50BMGBullet">
-							<defName>Bullet_50BMG_APStun</defName>
-							<label>.50 BMG bullet (AP)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationSharp>31</armorPenetrationSharp>
-								<armorPenetrationBlunt>360.34</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Stun</def>
-										<amount>10</amount>
-										<chance>0.2</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base50BMGBullet">
-							<defName>Bullet_50BMG_IncendiaryStun</defName>
-							<label>.50 BMG bullet (AP-I)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationSharp>31</armorPenetrationSharp>
-								<armorPenetrationBlunt>360.34</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Flame_Secondary</def>
-										<amount>12</amount>
-									</li>
-									<li>
-										<def>Stun</def>
-										<amount>10</amount>
-										<chance>0.2</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base50BMGBullet">
-							<defName>Bullet_50BMG_HEStun</defName>
-							<label>.50 BMG bullet (HE)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>30</damageAmountBase>
-								<armorPenetrationSharp>15.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>360.34</armorPenetrationBlunt>
-								<secondaryDamage>
-									<li>
-										<def>Bomb_Secondary</def>
-										<amount>20</amount>
-									</li>
-									<li>
-										<def>Stun</def>
-										<amount>10</amount>
-										<chance>0.2</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="Base50BMGBullet">
-							<defName>Bullet_50BMG_SabotStun</defName>
-							<label>.50 BMG bullet (Sabot)</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageAmountBase>14</damageAmountBase>
-								<armorPenetrationSharp>54</armorPenetrationSharp>
-								<armorPenetrationBlunt>388.88</armorPenetrationBlunt>
-								<speed>244</speed>
-								<secondaryDamage>
-									<li>
-										<def>Stun</def>
-										<amount>10</amount>
-										<chance>0.2</chance>
-									</li>
-								</secondaryDamage>
-							</projectile>
-						</ThingDef>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XCOM_Gun_BoltCaster</defName>
-					<statBases>
-						<Mass>12.5</Mass>
-						<RangedWeapon_Cooldown>1.55</RangedWeapon_Cooldown>
-						<SightsEfficiency>3.5</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>2.07</SwayFactor>
-						<Bulk>12.40</Bulk>
-						<Mass>14.50</Mass>
-					</statBases>
-					<costList>
-						<Steel>150</Steel>
-						<ComponentIndustrial>12</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>3</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_50BMG_FMJStun</defaultProjectile>
-						<warmupTime>3</warmupTime>
-						<range>62</range>
-						<soundCast>CV_SniperRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<AmmoGenPerMagOverride>5</AmmoGenPerMagOverride>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_XCOMBoltCaster</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>SniperRifle</li>
-						<li>Bipod_AMR</li>
-						<li>CE_AI_SR</li>
-					</weaponTags>
-					<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="XCOM_MeleeWeapon_ShardGauntlet"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.69</cooldownTime>
-								<chanceFactor>0.10</chanceFactor>
-								<armorPenetrationBlunt>0.80</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>1.17</cooldownTime>
-								<chanceFactor>0.66</chanceFactor>
-								<armorPenetrationBlunt>4.06</armorPenetrationBlunt>
-								<armorPenetrationSharp>25</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.05</cooldownTime>
-								<armorPenetrationBlunt>2.048</armorPenetrationBlunt>
-								<armorPenetrationSharp>25</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="XCOM_MeleeWeapon_ShardGauntlet"]/statBases</xpath>
-					<value>
-						<Bulk>2.5</Bulk>
-						<MeleeCounterParryBonus>0.9</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="XCOM_MeleeWeapon_ShardGauntlet"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.00</MeleeCritChance>
-							<MeleeParryChance>0</MeleeParryChance>
-							<MeleeDodgeChance>0.60</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vehicle Framework Expanded - Classic Mechs/Mech_BattleCannon.xml b/Patches/Vehicle Framework Expanded - Classic Mechs/Mech_BattleCannon.xml
deleted file mode 100644
index ffb3b0f477..0000000000
--- a/Patches/Vehicle Framework Expanded - Classic Mechs/Mech_BattleCannon.xml	
+++ /dev/null
@@ -1,62 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vehicle Framework Expanded - Classic Mechs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Main Guns -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_BattleCannon"]/projectile</xpath>
-					<value>
-						<projectile>Bullet_120mmCannonShell_HE</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_BattleCannon"]/reloadTimer</xpath>
-					<value>
-						<reloadTimer>9.6</reloadTimer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_BattleCannon"]/warmUpTimer</xpath>
-					<value>
-						<warmUpTimer>3</warmUpTimer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_BattleCannon"]/magazineCapacity</xpath>
-					<value>
-						<magazineCapacity>20</magazineCapacity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_BattleCannon"]/maxRange</xpath>
-					<value>
-						<maxRange>105</maxRange>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_BattleCannon"]</xpath>
-					<value>
-						<li Class="Vehicles.CETurretDataDefModExtension">
-							<ammoSet>AmmoSet_120mmCannonShell</ammoSet>
-							<shotHeight>5</shotHeight>
-							<speed>229</speed>
-							<sway>0.82</sway>
-							<spread>0.01</spread>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>	
\ No newline at end of file
diff --git a/Patches/Vehicle Framework Expanded - Classic Mechs/Mech_GatlingCannon.xml b/Patches/Vehicle Framework Expanded - Classic Mechs/Mech_GatlingCannon.xml
deleted file mode 100644
index 4091794bc1..0000000000
--- a/Patches/Vehicle Framework Expanded - Classic Mechs/Mech_GatlingCannon.xml	
+++ /dev/null
@@ -1,91 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vehicle Framework Expanded - Classic Mechs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Main Guns -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_GatlingCannon"]/projectile</xpath>
-					<value>
-						<projectile>Bullet_30x173mmNATO_AP</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_GatlingCannon"]/reloadTimer</xpath>
-					<value>
-						<reloadTimer>7.8</reloadTimer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_GatlingCannon"]/warmUpTimer</xpath>
-					<value>
-						<warmUpTimer>2.5</warmUpTimer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_GatlingCannon"]/magazineCapacity</xpath>
-					<value>
-						<magazineCapacity>80</magazineCapacity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_GatlingCannon"]/maxRange</xpath>
-					<value>
-						<maxRange>95</maxRange>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_GatlingCannon"]/fireModes</xpath>
-					<value>
-						<fireModes>
-							<li>
-								<shotsPerBurst>1</shotsPerBurst>
-								<ticksBetweenShots>6</ticksBetweenShots>
-								<ticksBetweenBursts>60</ticksBetweenBursts>
-								<label>Single</label>
-								<texPath>UI/Gizmos/FireRate_Single</texPath>
-							</li>
-							<li>
-								<shotsPerBurst>4</shotsPerBurst>
-								<ticksBetweenShots>6</ticksBetweenShots>
-								<ticksBetweenBursts>60</ticksBetweenBursts>
-								<label>Burst</label>
-								<texPath>UI/Gizmos/FireRate_Burst</texPath>
-							</li>
-							<li>
-								<shotsPerBurst>8</shotsPerBurst>
-								<ticksBetweenShots>6</ticksBetweenShots>
-								<ticksBetweenBursts>60</ticksBetweenBursts>
-								<label>Auto</label>
-								<texPath>UI/Gizmos/FireRate_Auto</texPath>
-							</li>
-						</fireModes>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_GatlingCannon"]</xpath>
-					<value>
-						<li Class="Vehicles.CETurretDataDefModExtension">
-							<ammoSet>AmmoSet_30x173mmNATO</ammoSet>
-							<shotHeight>5</shotHeight>
-							<speed>181</speed>
-							<sway>0.9</sway>
-							<spread>0.08</spread>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>	
\ No newline at end of file
diff --git a/Patches/Vehicle Framework Expanded - Classic Mechs/Mech_MachineGun.xml b/Patches/Vehicle Framework Expanded - Classic Mechs/Mech_MachineGun.xml
deleted file mode 100644
index b28ee17b7e..0000000000
--- a/Patches/Vehicle Framework Expanded - Classic Mechs/Mech_MachineGun.xml	
+++ /dev/null
@@ -1,104 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vehicle Framework Expanded - Classic Mechs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- HMG Sub-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MachineGun"]/projectile</xpath>
-					<value>
-						<projectile>Bullet_50BMG_FMJ</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MachineGun"]/reloadTimer</xpath>
-					<value>
-						<reloadTimer>3</reloadTimer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MachineGun"]/warmUpTimer</xpath>
-					<value>
-						<warmUpTimer>1</warmUpTimer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MachineGun"]/magazineCapacity</xpath>
-					<value>
-						<magazineCapacity>200</magazineCapacity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MachineGun"]/maxRange</xpath>
-					<value>
-						<maxRange>80</maxRange>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MachineGun"]/ammunition/thingDefs</xpath>
-					<value>
-						<thingDefs>
-							<li>Ammo_50BMG_FMJ</li>
-							<li>Ammo_50BMG_AP</li>
-							<li>Ammo_50BMG_Incendiary</li>
-							<li>Ammo_50BMG_HE</li>
-							<li>Ammo_50BMG_Sabot</li>
-						</thingDefs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MachineGun"]/fireModes</xpath>
-					<value>
-						<fireModes>
-							<li>
-								<shotsPerBurst>1</shotsPerBurst>
-								<ticksBetweenShots>6</ticksBetweenShots>
-								<ticksBetweenBursts>60</ticksBetweenBursts>
-								<label>Single</label>
-								<texPath>UI/Gizmos/FireRate_Single</texPath>
-							</li>
-							<li>
-								<shotsPerBurst>5</shotsPerBurst>
-								<ticksBetweenShots>6</ticksBetweenShots>
-								<ticksBetweenBursts>60</ticksBetweenBursts>
-								<label>Burst</label>
-								<texPath>UI/Gizmos/FireRate_Burst</texPath>
-							</li>
-							<li>
-								<shotsPerBurst>10</shotsPerBurst>
-								<ticksBetweenShots>6</ticksBetweenShots>
-								<ticksBetweenBursts>60</ticksBetweenBursts>
-								<label>Auto</label>
-								<texPath>UI/Gizmos/FireRate_Auto</texPath>
-							</li>
-						</fireModes>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MachineGun"]</xpath>
-					<value>
-						<li Class="Vehicles.CETurretDataDefModExtension">
-							<ammoSet>AmmoSet_50BMG</ammoSet>
-							<shotHeight>2.5</shotHeight>
-							<speed>163</speed>
-							<sway>1.5</sway>
-							<spread>0.1</spread>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>	
\ No newline at end of file
diff --git a/Patches/Vehicle Framework Expanded - Classic Mechs/Mech_MissileLauncher.xml b/Patches/Vehicle Framework Expanded - Classic Mechs/Mech_MissileLauncher.xml
deleted file mode 100644
index fd650b1926..0000000000
--- a/Patches/Vehicle Framework Expanded - Classic Mechs/Mech_MissileLauncher.xml	
+++ /dev/null
@@ -1,84 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vehicle Framework Expanded - Classic Mechs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Missile Launcher -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MissileLauncher"]/projectile</xpath>
-					<value>
-						<projectile>Bullet_83mmSMAW_HEAT</projectile>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MissileLauncher"]/reloadTimer</xpath>
-					<value>
-						<reloadTimer>18.6</reloadTimer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MissileLauncher"]/warmUpTimer</xpath>
-					<value>
-						<warmUpTimer>3</warmUpTimer>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MissileLauncher"]/magazineCapacity</xpath>
-					<value>
-						<magazineCapacity>16</magazineCapacity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MissileLauncher"]/maxRange</xpath>
-					<value>
-						<maxRange>75</maxRange>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MissileLauncher"]/fireModes</xpath>
-					<value>
-						<fireModes>
-							<li>
-								<shotsPerBurst>1</shotsPerBurst>
-								<ticksBetweenShots>6</ticksBetweenShots>
-								<ticksBetweenBursts>60</ticksBetweenBursts>
-								<label>Single</label>
-								<texPath>UI/Gizmos/FireRate_Single</texPath>
-							</li>
-							<li>
-								<shotsPerBurst>4</shotsPerBurst>
-								<ticksBetweenShots>12</ticksBetweenShots>
-								<ticksBetweenBursts>120</ticksBetweenBursts>
-								<label>Burst</label>
-								<texPath>UI/Gizmos/FireRate_Burst</texPath>
-							</li>
-						</fireModes>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MissileLauncher"]</xpath>
-					<value>
-						<li Class="Vehicles.CETurretDataDefModExtension">
-							<ammoSet>AmmoSet_83mmSMAW</ammoSet>
-							<shotHeight>3</shotHeight>
-							<speed>58</speed>
-							<sway>0.82</sway>
-							<spread>0.03</spread>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>		
\ No newline at end of file
diff --git a/Patches/Vehicle Framework Expanded - Classic Mechs/Mech_VehiclePawn.xml b/Patches/Vehicle Framework Expanded - Classic Mechs/Mech_VehiclePawn.xml
deleted file mode 100644
index 3a4a4052b0..0000000000
--- a/Patches/Vehicle Framework Expanded - Classic Mechs/Mech_VehiclePawn.xml	
+++ /dev/null
@@ -1,125 +0,0 @@
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vehicle Framework Expanded - Classic Mechs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Main Vehicle -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[@Name="HighMacsBase"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>20</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[@Name="HighMacsBase"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[@Name="HighMacsBase"]/vehicleStats/CargoCapacity</xpath>
-					<value>
-						<CargoCapacity>2950</CargoCapacity>
-					</value>
-				</li>
-
-				<!-- Front Armor -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[@Name="HighMacsBase"]/components/li [key="FrontArmor"]/health</xpath>
-					<value>
-						<health>200</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[@Name="HighMacsBase"]/components/li [key="FrontArmor"]/armor</xpath>
-					<value>
-						<armor>
-							<ArmorRating_Blunt>80</ArmorRating_Blunt>
-							<ArmorRating_Sharp>40</ArmorRating_Sharp>
-						</armor>
-					</value>
-				</li>
-
-				<!-- Left Armor -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[@Name="HighMacsBase"]/components/li [key="LeftArmor"]/health</xpath>
-					<value>
-						<health>200</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[@Name="HighMacsBase"]/components/li [key="LeftArmor"]/armor</xpath>
-					<value>
-						<armor>
-							<ArmorRating_Blunt>64</ArmorRating_Blunt>
-							<ArmorRating_Sharp>32</ArmorRating_Sharp>
-						</armor>
-					</value>
-				</li>
-
-				<!-- Right Armor -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[@Name="HighMacsBase"]/components/li [key="RightArmor"]/health</xpath>
-					<value>
-						<health>150</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[@Name="HighMacsBase"]/components/li [key="RightArmor"]/armor</xpath>
-					<value>
-						<armor>
-							<ArmorRating_Blunt>64</ArmorRating_Blunt>
-							<ArmorRating_Sharp>32</ArmorRating_Sharp>
-						</armor>
-					</value>
-				</li>
-
-				<!-- Back Armor -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[@Name="HighMacsBase"]/components/li [key="BackArmor"]/health</xpath>
-					<value>
-						<health>150</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[@Name="HighMacsBase"]/components/li [key="BackArmor"]/armor</xpath>
-					<value>
-						<armor>
-							<ArmorRating_Blunt>52</ArmorRating_Blunt>
-							<ArmorRating_Sharp>24</ArmorRating_Sharp>
-						</armor>
-					</value>
-				</li>
-
-				<!-- Leg Armor -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/Vehicles.VehicleDef[@Name="HighMacsBase"]/components/li[key="FrontLeftLeg" or key="FrontRightLeg"]/health</xpath>
-					<value>
-						<health>150</health>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/Vehicles.VehicleDef[@Name="HighMacsBase"]/components/li[key="FrontLeftLeg" or key="FrontRightLeg"]</xpath>
-					<value>
-						<armor>
-							<ArmorRating_Sharp>15</ArmorRating_Sharp>
-							<ArmorRating_Blunt>12</ArmorRating_Blunt>
-						</armor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>	
\ No newline at end of file
diff --git a/Patches/Vulpine Pack/PawnKinds_FenX.xml b/Patches/Vulpine Pack/PawnKinds_FenX.xml
deleted file mode 100644
index 5d2a98754a..0000000000
--- a/Patches/Vulpine Pack/PawnKinds_FenX.xml	
+++ /dev/null
@@ -1,266 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vulpine Race Pack</li>
-			<li>Vulpine Race Pack (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Scoot ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FennexColonist"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FennexKeeper"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FennexTrader"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FennexSlave"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FennexRefugee"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FennexSecurityGuard"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FennexSoldier"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>7</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FennexStalker"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FennexAgent"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FennexAssassin"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vulpine Pack/PawnKinds_Frij.xml b/Patches/Vulpine Pack/PawnKinds_Frij.xml
deleted file mode 100644
index 13d7076f65..0000000000
--- a/Patches/Vulpine Pack/PawnKinds_Frij.xml	
+++ /dev/null
@@ -1,339 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vulpine Race Pack</li>
-			<li>Vulpine Race Pack (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Scoot ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FrijjidColonist"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FrijjidKeeper"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FrijjidTrader"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FrijjidSlave"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FrijjidRefugee"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FrijjidSecurityGuard"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FrijjidSoldier"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FrijjidStalker"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FrijjidAgent"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="FrijjidAssassin"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vulpine Pack/Race_Fenx.xml b/Patches/Vulpine Pack/Race_Fenx.xml
deleted file mode 100644
index 6d5e2b1dea..0000000000
--- a/Patches/Vulpine Pack/Race_Fenx.xml	
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vulpine Race Pack</li>
-			<li>Vulpine Race Pack (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Found Fenni ========== -->
-
-				<!-- ========== Turn our dog boys into dog *boys* ========== -->
-				<!-- ========== To be human is to be a tall brick ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<!-- === Note to future furball compatibility nerds: 		=== -->
-					<!-- === Paste the defName of your horrible alien there   |	=== -->
-					<!-- === 												  V	=== -->
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Fennex"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Gives Gun Gizmos to Fennex HUD thing ========== -->
-				<!-- ========== Also Makes Em Suppressable		   ========== -->
-
-				<li Class="PatchOperationAdd">
-					<!-- === Shouldn't need to change this at all		  === -->
-					<!-- === Unless you changed the name of your BasePawn === -->
-					<!-- === In which case change "BasePawn" to that name === -->
-					<xpath>Defs/ThingDef[@Name="BaseFnnxPawn"]</xpath>
-					<value>
-						<comps>
-							<li>
-								<compClass>CombatExtended.CompPawnGizmo</compClass>
-							</li>
-							<li Class="CombatExtended.CompProperties_Suppressable" />
-						</comps>
-					</value>
-				</li>
-
-				<!-- === Patch Fennex default melee attacks === -->
-				<!-- === For the most part, it adds the CE melee handler thing 	=== -->
-				<!-- === And also defines armor penetration, which allows them	=== -->
-				<!-- === to actually do damage. Try attacking a raccoon with an === -->
-				<!-- === unpatched melee attack. I'll wait.						=== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Fennex"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1</AimingAccuracy>
-						<MeleeDodgeChance>1.6</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>0.75</MeleeParryChance>
-						<ReloadSpeed>1</ReloadSpeed>
-						<Suppressability>1</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Fennex"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.10</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.10</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.10</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.16</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.16</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- === BaseBodySize, ArmorRatings, MoveSpeed, and BaseHealth should already be set. I think. === -->
-				<!-- ===================================== -->
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vulpine Pack/Race_Frij.xml b/Patches/Vulpine Pack/Race_Frij.xml
deleted file mode 100644
index 6549d0fea2..0000000000
--- a/Patches/Vulpine Pack/Race_Frij.xml	
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vulpine Race Pack</li>
-			<li>Vulpine Race Pack (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Found Fenni ========== -->
-
-				<!-- ========== Turn our dog boys into dog *boys* ========== -->
-				<!-- ========== To be human is to be a tall brick ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<!-- === Note to future furball compatibility nerds: 		=== -->
-					<!-- === Paste the defName of your horrible alien there   |	=== -->
-					<!-- === 												  V	=== -->
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Frijjid"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Gives Gun Gizmos to Fennex HUD thing ========== -->
-				<!-- ========== Also Makes Em Suppressable		   ========== -->
-				<li Class="PatchOperationAdd">
-					<!-- === Shouldn't need to change this at all		  === -->
-					<!-- === Unless you changed the name of your BasePawn === -->
-					<!-- === In which case change "BasePawn" to that name === -->
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Frijjid"]</xpath>
-					<value>
-						<comps>
-							<li>
-								<compClass>CombatExtended.CompPawnGizmo</compClass>
-							</li>
-							<li Class="CombatExtended.CompProperties_Suppressable" />
-						</comps>
-					</value>
-				</li>
-
-				<!-- === Patch Fennex default melee attacks === -->
-				<!-- === For the most part, it adds the CE melee handler thing 	=== -->
-				<!-- === And also defines armor penetration, which allows them	=== -->
-				<!-- === to actually do damage. Try attacking a raccoon with an === -->
-				<!-- === unpatched melee attack. I'll wait.						=== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Frijjid"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1</AimingAccuracy>
-						<MeleeDodgeChance>1.6</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>0.75</MeleeParryChance>
-						<ReloadSpeed>1</ReloadSpeed>
-						<Suppressability>1</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Frijjid"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>0.8</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.2</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.923</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- === BaseBodySize, ArmorRatings, MoveSpeed, and BaseHealth should already be set. I think. === -->
-				<!-- ===================================== -->
-				<!-- === Adds In Inspector Tabs 	   === -->
-				<!-- === Inventory and all that jazz   === -->
-				<!-- === Again, no need to change 'em  === -->
-				<!-- === Unless you changed it         === -->
-				<!-- === then change 'em			   === -->
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/WWII German Uniforms/Apparel_GermanUniforms.xml b/Patches/WWII German Uniforms/Apparel_GermanUniforms.xml
deleted file mode 100644
index c2d25f181b..0000000000
--- a/Patches/WWII German Uniforms/Apparel_GermanUniforms.xml	
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>WWII German Uniforms - V's Edit</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Harnesses, Belts, Accessories -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparel_3RHarnessA" or
-						defName = "Apparel_3RHarnessRif" or
-						defName = "Apparel_3ROfficerbelt" or
-						defName = "Apparel_3RFeldgendararmerieGorget" or
-						defName = "Apparel_3RHarnessFal"
-						]/equippedStatOffsets </xpath>
-					<value>
-						<CarryWeight>10</CarryWeight>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparel_3RHarnessA" or
-						defName = "Apparel_3RHarnessRif" or
-						defName = "Apparel_3ROfficerbelt" or
-						defName = "Apparel_3RFeldgendararmerieGorget" or
-						defName = "Apparel_3RHarnessFal"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparel_3RHarnessA" or
-						defName = "Apparel_3RHarnessRif" or
-						defName = "Apparel_3ROfficerbelt" or
-						defName = "Apparel_3RFeldgendararmerieGorget" or
-						defName = "Apparel_3RHarnessFal"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>0.08</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Hats -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparel_3RM40Inf" or
-						defName = "Apparel_3RM43Inf" or
-						defName = "Apparel_3ROfficerCapInf" or
-						defName = "Apparel_3RFieldMarshalCap"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>0.03</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparel_3RM40Inf" or
-						defName = "Apparel_3RM43Inf" or
-						defName = "Apparel_3ROfficerCapInf" or
-						defName = "Apparel_3RFieldMarshalCap"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>0.05</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Helmets -->
-
-				<!-- Bulk -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparel_3RStahlhelmM42Inf" or
-						defName = "Apparel_3RStahlhelmM42InfStraps" or
-						defName = "Apparel_3RStahlhelmM42InfSniper" or
-						defName = "Apparel_3RStahlhelmM42coverSplinter" or
-						defName = "Apparel_3RStahlhelmM42Gogg" or
-						defName = "Apparel_3RStahlhelmM42Winter" or
-						defName = "Apparel_3RM38Fal" or
-						defName = "Apparel_3RM38FalCam" or
-						defName = "Apparel_3RM38FalWinter"
-						]/statBases </xpath>
-					<value>
-						<Bulk>4</Bulk>
-					</value>
-				</li>
-
-				<!-- M42 Helmet -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparel_3RStahlhelmM42Inf" or
-						defName = "Apparel_3RStahlhelmM42InfStraps" or
-						defName = "Apparel_3RStahlhelmM42InfSniper" or
-						defName = "Apparel_3RStahlhelmM42coverSplinter" or
-						defName = "Apparel_3RStahlhelmM42Gogg" or
-						defName = "Apparel_3RStahlhelmM42Winter"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>1.8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparel_3RStahlhelmM42Inf" or
-						defName = "Apparel_3RStahlhelmM42InfStraps" or
-						defName = "Apparel_3RStahlhelmM42InfSniper" or
-						defName = "Apparel_3RStahlhelmM42coverSplinter" or
-						defName = "Apparel_3RStahlhelmM42Gogg" or
-						defName = "Apparel_3RStahlhelmM42Winter"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>2.7</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- M38 Helmet -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparel_3RM38Fal" or
-						defName = "Apparel_3RM38FalCam" or
-						defName = "Apparel_3RM38FalWinter"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparel_3RM38Fal" or
-						defName = "Apparel_3RM38FalCam" or
-						defName = "Apparel_3RM38FalWinter"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>2.25</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Uniforms -->
-
-				<!-- Fatigues -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparel_3RInfUniform" or
-						defName = "Apparel_3RInfSplitUniform" or
-						defName = "Apparel_3RInfOfficerUniform" or
-						defName = "Apparel_3RFalUniform" or
-						defName = "Apparel_3RFieldMarshal"]/statBases </xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<WornBulk>2.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparel_3RInfUniform" or
-						defName = "Apparel_3RInfSplitUniform" or
-						defName = "Apparel_3RInfOfficerUniform" or
-						defName = "Apparel_3RFalUniform" or
-						defName = "Apparel_3RFieldMarshal"
-						]/statBases/ArmorRating_Blunt </xpath>
-					<value>
-						<ArmorRating_Blunt>0.15</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparel_3RInfUniform" or
-						defName = "Apparel_3RInfSplitUniform" or
-						defName = "Apparel_3RInfOfficerUniform" or
-						defName = "Apparel_3RFalUniform" or
-						defName = "Apparel_3RFieldMarshal"
-						]/statBases/ArmorRating_Sharp </xpath>
-					<value>
-						<ArmorRating_Sharp>0.2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- Coats -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparel_3RNaziTrenchCoat" or defName = "Apparel_3RNaziCoat"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparel_3RNaziTrenchCoat" or defName = "Apparel_3RNaziCoat"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparel_3RNaziTrenchCoat" or defName = "Apparel_3RNaziCoat"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.3</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- Poncho -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Apparel_3RZelt"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>0.75</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparel_3RZelt"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.03</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Apparel_3RZelt"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/WWII Soviet Faction/WWIISovietFaction_CE_Patch_Clothing.xml b/Patches/WWII Soviet Faction/WWIISovietFaction_CE_Patch_Clothing.xml
deleted file mode 100644
index 66fb5e299f..0000000000
--- a/Patches/WWII Soviet Faction/WWIISovietFaction_CE_Patch_Clothing.xml	
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>WWII Soviet Faction</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== M73 Uniform ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_M73_Uniform"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_M73_Uniform"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_M73_Uniform"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ========== Harness ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_M73_Harness"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_M73_Harness"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryBulk>18</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_M73_Harness"]/apparel</xpath>
-					<value>
-						<apparel>
-							<bodyPartGroups>
-								<li>Shoulders</li>
-							</bodyPartGroups>
-							<layers>
-								<li>Webbing</li>
-							</layers>
-							<tags>
-								<li>WWII_Soviet_Harness</li>
-							</tags>
-							<wornGraphicPath>Things/Apparel/Belts/M73Harness</wornGraphicPath>
-						</apparel>
-					</value>
-				</li>
-
-				<!-- ========== M35 Uniform ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_M35_Uniform"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>4</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_M35_Uniform"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_M35_Uniform"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.075</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ========== Vest ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_SN-42Armor"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>5.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SN-42Armor"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SN-42Armor"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>3</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SN-42Armor"]/apparel/layers</xpath>
-					<value>
-						<layers>
-							<li>Middle</li>
-						</layers>
-					</value>
-				</li>
-
-				<!-- ========== Coat ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_SovietCoat"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<WornBulk>3</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SovietCoat"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SovietCoat"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/WWII Soviet Faction/WWIISovietFaction_CE_Patch_Headgear.xml b/Patches/WWII Soviet Faction/WWIISovietFaction_CE_Patch_Headgear.xml
deleted file mode 100644
index 09dd0ea848..0000000000
--- a/Patches/WWII Soviet Faction/WWIISovietFaction_CE_Patch_Headgear.xml	
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>WWII Soviet Faction</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== M73Cap =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_M73Cap"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-						<WornBulk>0.75</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_M73Cap"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_M73Cap"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.08</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_M73Cap"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>5</Steel>
-							<Cloth>40</Cloth>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_M73Cap"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>UpperHead</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Apparel_M73Cap"]/apparel/useDeflectMetalEffect</xpath>
-				</li>
-
-				<!-- ========== SSh40Helmet =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_SSh40Helmet"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SSh40Helmet"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.2</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_SSh40Helmet"]/stuffCategories/li[.="Metallic"]</xpath>
-					<value>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<!-- ========== Officer M35Cap =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_M35_Cap"]/statBases</xpath>
-					<value>
-						<Bulk>2</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_M35_Cap"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_M35_Cap"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.08</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_M35_Cap"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>5</Steel>
-							<Cloth>60</Cloth>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_M35_Cap"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<bodyPartGroups>
-							<li>UpperHead</li>
-						</bodyPartGroups>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Apparel_M35_Cap"]/apparel/useDeflectMetalEffect</xpath>
-				</li>
-
-				<!-- ========== Ushanka =========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Apparel_Ushanka"]/statBases</xpath>
-					<value>
-						<Bulk>2.5</Bulk>
-						<WornBulk>1.5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Ushanka"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.06</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_Ushanka"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.10</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Apparel_Ushanka"]/apparel/useDeflectMetalEffect</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/WWII Soviet Faction/WWIISovietFaction_CE_Patch_PawnKindDefs.xml b/Patches/WWII Soviet Faction/WWIISovietFaction_CE_Patch_PawnKindDefs.xml
deleted file mode 100644
index d5528dc4be..0000000000
--- a/Patches/WWII Soviet Faction/WWIISovietFaction_CE_Patch_PawnKindDefs.xml	
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>WWII Soviet Faction</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Reduce meals and medicine carried by all pawns ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[@Name="WWII_SovietPawnKind_Base"]/invNutrition</xpath>
-					<value>
-						<invNutrition>1</invNutrition>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/PawnKindDef[@Name="WWII_SovietPawnKind_Base"]/inventoryOptions</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[
-						defName="WWII_Soviet_Grunt" or
-						defName="WWII_Soviet_Assault" or
-						defName="WWII_Soviet_Assault_TierII" or
-						defName="WWII_Soviet_Sniper" or
-						defName="WWII_Soviet_Sniper_TierII" or
-						defName="WWII_Soviet_Grenadier" or
-						defName="WWII_Soviet_Boss"
-						]/inventoryOptions/subOptionsChooseOne/li[thingDef="MedicineIndustrial"]/countRange </xpath>
-					<value>
-						<countRange>
-							<min>0</min>
-							<max>1</max>
-						</countRange>
-					</value>
-				</li>
-
-				<!-- ========== WWII Soviet Faction Grunts should always spawn with harnesses, to compensate for the added bulk of their primary weapon, ammo and kit ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/PawnKindDef[defName="WWII_Soviet_Grunt"]/apparelRequired</xpath>
-					<value>
-						<li>Apparel_M73_Harness</li>
-					</value>
-				</li>
-
-				<!-- ========== WWII Soviet Faction Komandirs should always spawn with harnesses instead of smokepop belts, to compensate for the added bulk of their primary weapon, ammo and kit ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="WWII_Soviet_Boss"]/apparelRequired</xpath>
-					<value>
-						<apparelRequired>
-							<li>Apparel_SovietCoat</li>
-							<li>Apparel_SN-42Armor</li>
-							<li>Apparel_M35_Uniform</li>
-							<li>Apparel_Ushanka</li>
-							<li>Apparel_M73_Harness</li>
-						</apparelRequired>
-					</value>
-				</li>
-
-				<!-- ========== WWII Soviet Faction pawns should spawn with ammo appropriate to their primary weapon ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[
-						defName="WWII_Soviet_Grunt" or
-						defName="WWII_Soviet_Assault" or
-						defName="WWII_Soviet_Assault_TierII" or
-						defName="WWII_Soviet_Sniper" or
-						defName="WWII_Soviet_Sniper_TierII" or
-						defName="WWII_Soviet_Grenadier" or
-						defName="WWII_Soviet_Stormtrooper" or
-						defName="WWII_Soviet_Boss" or
-						defName="WWII_Soviet_Trader"
-						] </xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>8</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/WWII Soviet Faction/WWIISovietFaction_CE_Patch_RangedIndustrial.xml b/Patches/WWII Soviet Faction/WWIISovietFaction_CE_Patch_RangedIndustrial.xml
deleted file mode 100644
index 8eb5069c8e..0000000000
--- a/Patches/WWII Soviet Faction/WWIISovietFaction_CE_Patch_RangedIndustrial.xml	
+++ /dev/null
@@ -1,384 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>WWII Soviet Faction</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Mosin ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_WWII_MosinNagant_Normal</defName>
-					<statBases>
-						<Mass>4.00</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>1.63</SwayFactor>
-						<Bulk>12.32</Bulk>
-						<WorkToMake>12000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>55</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- ========== Mosin Bayonet ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_WWII_MosinNagant_Bayonet</defName>
-					<statBases>
-						<Mass>4.10</Mass>
-						<RangedWeapon_Cooldown>1.17</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>2.07</SwayFactor>
-						<Bulk>12.32</Bulk>
-						<!-- Bulk reduced to non-bayonet version, assuming bayonet has negligible effect on overall bulk -->
-						<WorkToMake>14000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>70</Steel>
-						<ComponentIndustrial>1</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_BoltActionRifle</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4.3</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Gun_WWII_MosinNagant_Bayonet"]/weaponTags</xpath>
-					<value>
-						<li>NoSwitch</li>
-					</value>
-				</li>
-
-				<!-- ========== PPsh-41 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_WWII_PPShSMG</defName>
-					<statBases>
-						<Mass>3.63</Mass>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.12</ShotSpread>
-						<SwayFactor>1.21</SwayFactor>
-						<Bulk>9.43</Bulk>
-						<WorkToMake>27500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>50</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.22</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x25mmTokarev_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>23</range>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-						<soundCast>Shot_HeavySMG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>71</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_762x25mmTokarev</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- ========== DP-28 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_DP-28_LMG</defName>
-					<statBases>
-						<Mass>9.12</Mass>
-						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.05</ShotSpread>
-						<SwayFactor>1.53</SwayFactor>
-						<Bulk>14.70</Bulk>
-						<WorkToMake>32000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>10</WoodLog>
-						<Steel>85</Steel>
-						<ComponentIndustrial>5</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<recoilAmount>1.32</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<range>62</range>
-						<burstShotCount>10</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<soundCast>Shot_Minigun</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>47</magazineSize>
-						<reloadTime>4.9</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- ========== Nagant Revolver ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_Nagant_Revolver</defName>
-					<statBases>
-						<Mass>0.8</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.70</SightsEfficiency>
-						<ShotSpread>0.17</ShotSpread>
-						<SwayFactor>1.05</SwayFactor>
-						<Bulk>2.35</Bulk>
-						<WorkToMake>4500</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>5</WoodLog>
-						<Steel>20</Steel>
-						<ComponentIndustrial>2</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x38mmR_FMJ</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<range>12</range>
-						<soundCast>Shot_Revolver</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>6</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_762x38mmR</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- ========== Svt-40 ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_WWII_Svt-40_Rifle</defName>
-					<statBases>
-						<Mass>3.85</Mass>
-						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>1.00</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.61</SwayFactor>
-						<Bulk>12.26</Bulk>
-						<WorkToMake>19000</WorkToMake>
-					</statBases>
-					<costList>
-						<WoodLog>15</WoodLog>
-						<Steel>55</Steel>
-						<ComponentIndustrial>3</ComponentIndustrial>
-					</costList>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<soundCast>Shot_HeavySMG</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>7</muzzleFlashScale>
-					</Properties>
-
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-				<!-- == Shared patches for firearm melee tools == -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_WWII_MosinNagant_Bayonet"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>bayonet</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName="Gun_WWII_MosinNagant_Normal" or
-						defName="Gun_WWII_PPShSMG" or
-						defName="Gun_DP-28_LMG" or
-						defName="Gun_WWII_Svt-40_Rifle"
-						]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_Nagant_Revolver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/WWII Soviet Faction/WWIISovietFaction_CE_Patch_Turret.xml b/Patches/WWII Soviet Faction/WWIISovietFaction_CE_Patch_Turret.xml
deleted file mode 100644
index 4db739ab1f..0000000000
--- a/Patches/WWII Soviet Faction/WWIISovietFaction_CE_Patch_Turret.xml	
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>WWII Soviet Faction</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== ZiS (76 mm divisional gun M1942) ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_TurretZis</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>2.64</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.3</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>0.81</SwayFactor>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x385mmRCannonShell_HE</defaultProjectile>
-						<warmupTime>4.3</warmupTime>
-						<range>86</range>
-						<minRange>16</minRange>
-						<soundCast>Shot_Revolver</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>13</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>9.8</reloadTime>
-						<ammoSet>AmmoSet_762x385mmRCannonShell</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_TurretZis"]/soundInteract</xpath>
-					<value>
-						<soundInteract>Artillery_ShellLoaded</soundInteract>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Turret_Zis"]/statBases</xpath>
-					<value>
-						<ShootingAccuracyTurret>1.0</ShootingAccuracyTurret>
-						<AimingAccuracy>1.0</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_Zis"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_Zis"]/fillPercent</xpath>
-					<value>
-						<!-- Needs to be at least 0.85 in order to shoot out from CE embrasures -->
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_Zis"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>400</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_Zis"]/statBases/WorkToBuild</xpath>
-					<value>
-						<WorkToBuild>94500</WorkToBuild>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_Zis"]/statBases/Mass</xpath>
-					<value>
-						<Mass>1116</Mass>
-						<Bulk>1000</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_Zis"]/costList</xpath>
-					<value>
-						<costList>
-							<Steel>535</Steel>
-							<ComponentIndustrial>5</ComponentIndustrial>
-						</costList>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Turret_Zis"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>86</specialDisplayRadius>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="Turret_Zis"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Wall Mounted Turrets/WallMountedTurrets_CE_AllTurrets.xml b/Patches/Wall Mounted Turrets/WallMountedTurrets_CE_AllTurrets.xml
deleted file mode 100644
index a00fac9e88..0000000000
--- a/Patches/Wall Mounted Turrets/WallMountedTurrets_CE_AllTurrets.xml	
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Wall Mounted Turrets (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== All turrets ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WallTurret" or defName="WallRocketTurret" or defName="WallTurretMiniGun" or defName="WallFlameTurret"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="WallRiotControlTurret"]</xpath>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="WallTurret" or defName="WallRocketTurret" or defName="WallTurretMiniGun" or defName="WallFlameTurret"]/comps/li[@Class = "CompProperties_Refuelable"]</xpath>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WallTurret" or defName="WallRocketTurret" or defName="WallTurretMiniGun" or defName="WallFlameTurret"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.85</fillPercent>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WallTurret" or defName="WallRocketTurret" or defName="WallTurretMiniGun" or defName="WallFlameTurret"]/statBases/Mass</xpath>
-					<value>
-						<Mass>15</Mass>
-					</value>
-				</li>
-
-				<!-- Add trade tags -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WallTurret" or defName="WallRocketTurret" or defName="WallTurretMiniGun" or defName="WallFlameTurret"]</xpath>
-					<value>
-						<tradeTags>
-							<li>CE_Turret</li>
-						</tradeTags>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Wall Mounted Turrets/WallMountedTurrets_CE_FlameTurret.xml b/Patches/Wall Mounted Turrets/WallMountedTurrets_CE_FlameTurret.xml
deleted file mode 100644
index 55147cedb3..0000000000
--- a/Patches/Wall Mounted Turrets/WallMountedTurrets_CE_FlameTurret.xml	
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Wall Mounted Turrets (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Wall Flame Turret ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WallFlameTurret"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>1.7</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WallFlameTurret"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.20</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WallFlameTurret"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_WallTurretFlame</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>0.32</SwayFactor>
-						<Bulk>10.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Flamethrower_Napalm</defaultProjectile>
-						<warmupTime>2</warmupTime>
-						<range>10</range>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<burstShotCount>3</burstShotCount>
-						<soundCast>Shot_IncendiaryLauncher</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_Flamethrower</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Wall Mounted Turrets/WallMountedTurrets_CE_MiniGunTurret.xml b/Patches/Wall Mounted Turrets/WallMountedTurrets_CE_MiniGunTurret.xml
deleted file mode 100644
index 7030454968..0000000000
--- a/Patches/Wall Mounted Turrets/WallMountedTurrets_CE_MiniGunTurret.xml	
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Wall Mounted Turrets (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Wall MiniGun Turret ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WallTurretMiniGun"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.25</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WallTurretMiniGun"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WallTurretMiniGun"]/researchPrerequisites</xpath>
-					<value>
-						<researchPrerequisites>
-							<li>GunTurrets</li>
-						</researchPrerequisites>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_WallTurretMiniGun</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.08</ShotSpread>
-						<SwayFactor>0.85</SwayFactor>
-						<Bulk>10.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.76</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-						<warmupTime>0.1</warmupTime>
-						<range>20</range>
-						<ticksBetweenBurstShots>1</ticksBetweenBurstShots>
-						<burstShotCount>1</burstShotCount>
-						<soundCast>GunShotA</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>250</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-					</AmmoUser>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Wall Mounted Turrets/WallMountedTurrets_CE_RocketTurret.xml b/Patches/Wall Mounted Turrets/WallMountedTurrets_CE_RocketTurret.xml
deleted file mode 100644
index dfb8af125c..0000000000
--- a/Patches/Wall Mounted Turrets/WallMountedTurrets_CE_RocketTurret.xml	
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Wall Mounted Turrets (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Wall Rocket Turret ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WallRocketTurret"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>3.8</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WallRocketTurret"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.25</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WallRocketTurret"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WallRocketTurret"]/researchPrerequisites</xpath>
-					<value>
-						<researchPrerequisites>
-							<li>GunTurrets</li>
-						</researchPrerequisites>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_WallTurretRocket</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>3.5</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.03</ShotSpread>
-						<SwayFactor>0.32</SwayFactor>
-						<Bulk>10.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_20mmFliegerfaust_HE</defaultProjectile>
-						<warmupTime>2</warmupTime>
-						<minRange>3</minRange>
-						<range>25</range>
-						<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-						<burstShotCount>2</burstShotCount>
-						<soundCast>Shot_Autocannon</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_20mmFliegerfaust</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Wall Mounted Turrets/WallMountedTurrets_CE_WallTurret.xml b/Patches/Wall Mounted Turrets/WallMountedTurrets_CE_WallTurret.xml
deleted file mode 100644
index 4a0a2d7f87..0000000000
--- a/Patches/Wall Mounted Turrets/WallMountedTurrets_CE_WallTurret.xml	
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Wall Mounted Turrets (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Normal Wall Turret ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WallTurret"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>1.1</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WallTurret"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.25</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WallTurret"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>0.5</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_WallTurret</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>0.82</SwayFactor>
-						<Bulk>10.00</Bulk>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.76</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-						<warmupTime>0</warmupTime>
-						<range>14.9</range>
-						<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-						<burstShotCount>3</burstShotCount>
-						<soundCast>GunShotA</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.8</reloadTime>
-						<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<noSnapshot>true</noSnapshot>
-						<noSingleShot>true</noSingleShot>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/WarCasket Expanded/Apparel_Warcaskets.xml b/Patches/WarCasket Expanded/Apparel_Warcaskets.xml
deleted file mode 100644
index 370a03ebdd..0000000000
--- a/Patches/WarCasket Expanded/Apparel_Warcaskets.xml	
+++ /dev/null
@@ -1,421 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>WarCasket Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Remove Vanilla Carry Capacity ========== -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/VFEPirates.WarcasketDef[
-						defName="Warcasket_Sentinel" or
-						defName="Warcasket_GuardianX" or
-						defName="Warcasket_Tyrant"
-						]/modExtensions/li/carryingCapacity </xpath>
-				</li>
-
-				<!-- ========== Sentinel Warcasket ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Sentinel"]/statBases</xpath>
-					<value>
-						<Bulk>218.75</Bulk>
-						<WornBulk>18.75</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Sentinel"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>21.83</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Sentinel"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>54.575</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Sentinel"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>225</CarryWeight>
-						<CarryBulk>175</CarryBulk>
-						<Suppressability>-100</Suppressability>
-					</value>
-				</li>
-
-				<!-- ========== Shoulders ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_Sentinel"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_Sentinel"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>21.83</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_Sentinel"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>54.575</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- === Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Sentinel"]/statBases</xpath>
-					<value>
-						<Bulk>12.5</Bulk>
-						<WornBulk>6.25</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Sentinel"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Sentinel"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Sentinel"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Sentinel"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>19.47</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Sentinel"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>43.8</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- GuardianX Warcasket -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_GuardianX"]/statBases</xpath>
-					<value>
-						<Bulk>230</Bulk>
-						<WornBulk>25</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_GuardianX"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>28</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_GuardianX"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>112</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_GuardianX"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>225</CarryWeight>
-						<CarryBulk>175</CarryBulk>
-						<Suppressability>-100</Suppressability>
-					</value>
-				</li>
-
-				<!-- ========== Shoulders ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_GuardianX"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_GuardianX"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>28</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_GuardianX"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>112</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- === Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_GuardianX"]/statBases</xpath>
-					<value>
-						<Bulk>12.5</Bulk>
-						<WornBulk>6.25</WornBulk>
-						<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_GuardianX"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_GuardianX"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_GuardianX"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_GuardianX"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>30</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_GuardianX"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>120</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ========== Tyrant Warcasket ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Tyrant"]/statBases</xpath>
-					<value>
-						<Bulk>275</Bulk>
-						<WornBulk>35</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Tyrant"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Tyrant"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>48</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Tyrant"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>225</CarryWeight>
-						<CarryBulk>175</CarryBulk>
-						<Suppressability>-100</Suppressability>
-					</value>
-				</li>
-
-				<!-- ========== Shoulders ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_Tyrant"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_Tyrant"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>20</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_Tyrant"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>48</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_Tyrant"]/comps/li[@Class="CompProperties_Reloadable"]/ammoDef</xpath>
-					<value>
-						<ammoDef>Ammo_40x53mmGrenade_Smoke</ammoDef>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_Tyrant"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountPerCharge</xpath>
-					<value>
-						<ammoCountPerCharge>1</ammoCountPerCharge>
-					</value>
-				</li>
-
-				<!-- === Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Tyrant"]/statBases</xpath>
-					<value>
-						<Bulk>12.5</Bulk>
-						<WornBulk>6.25</WornBulk>
-						<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Tyrant"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Tyrant"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Tyrant"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Tyrant"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>22</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Tyrant"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>50</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Centurion Warcasket -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Centurion"]/statBases</xpath>
-					<value>
-						<Bulk>230</Bulk>
-						<WornBulk>25</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Centurion"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>28</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Centurion"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>112</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="Warcasket_Centurion"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>225</CarryWeight>
-						<CarryBulk>175</CarryBulk>
-						<Suppressability>-100</Suppressability>
-					</value>
-				</li>
-
-				<!-- ========== Shoulders ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_Centurion"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_Centurion"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>28</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketShoulders_Centurion"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>112</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- === Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Centurion"]/statBases</xpath>
-					<value>
-						<Bulk>12.5</Bulk>
-						<WornBulk>6.25</WornBulk>
-						<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Centurion"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Centurion"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Centurion"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Centurion"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>30</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="WarcasketHelmet_Centurion"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>120</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/WarCasket Gundam Addon/Apparel_Warcaskets.xml b/Patches/WarCasket Gundam Addon/Apparel_Warcaskets.xml
deleted file mode 100644
index 366e22a027..0000000000
--- a/Patches/WarCasket Gundam Addon/Apparel_Warcaskets.xml	
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>WarCasket Gundam Addon</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Remove Vanilla Carry Capacity ========== -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/VFEPirates.WarcasketDef[
-						defName="VFEP_Warcasket_Barbatos"
-						]/modExtensions/li/carryingCapacity </xpath>
-				</li>
-
-				<!-- ========== Barbatos (Aerial Warcasket) ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Barbatos"]/statBases</xpath>
-					<value>
-						<Bulk>250</Bulk>
-						<WornBulk>25</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Barbatos"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>28</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Barbatos"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>70</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Barbatos"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>250</CarryWeight>
-						<CarryBulk>200</CarryBulk>
-						<Suppressability>-100</Suppressability>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Barbatos"]/costList/Steel</xpath>
-					<value>
-						<Steel>290</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_Warcasket_Barbatos"]/costList/ComponentIndustrial</xpath>
-					<value>
-						<ComponentIndustrial>16</ComponentIndustrial>
-					</value>
-				</li>
-
-				<!-- ========== Barbatos - Shoulders ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Barbatos"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Barbatos"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>28</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Barbatos"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>70</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_Barbatos"]/costList/Steel</xpath>
-					<value>
-						<Steel>40</Steel>
-					</value>
-				</li>
-
-				<!-- === Barbatos Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Barbatos"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>8</WornBulk>
-						<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Barbatos"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Barbatos"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Barbatos"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Barbatos"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Barbatos"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>56</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Barbatos"]/costList/Steel</xpath>
-					<value>
-						<Steel>90</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_Barbatos"]/costList/ComponentIndustrial</xpath>
-					<value>
-						<ComponentIndustrial>6</ComponentIndustrial>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/WarCasket Gundam Addon/Melee_Warcaskets.xml b/Patches/WarCasket Gundam Addon/Melee_Warcaskets.xml
deleted file mode 100644
index c2f3ed1786..0000000000
--- a/Patches/WarCasket Gundam Addon/Melee_Warcaskets.xml	
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>WarCasket Gundam Addon</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Barbatos Katana (Warcasket Broadsword) -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEP_WarcasketMeleeWeapon_GKatana"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>56</power>
-								<cooldownTime>2.4</cooldownTime>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>9</armorPenetrationBlunt>
-								<armorPenetrationSharp>6</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>68</power>
-								<cooldownTime>3.35</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>17</armorPenetrationBlunt>
-								<armorPenetrationSharp>4.8</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEP_WarcasketMeleeWeapon_GKatana"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.02</MeleeCritChance>
-							<MeleeParryChance>0.47</MeleeParryChance>
-							<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEP_WarcasketMeleeWeapon_GKatana"]/statBases</xpath>
-					<value>
-						<Bulk>14</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-						<ToughnessRating>10</ToughnessRating>
-					</value>
-				</li>
-
-				<!-- Barbatos' mace -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="VFEP_WarcasketMeleeWeapon_GMace"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>spikerod</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>2.8</cooldownTime>
-								<armorPenetrationBlunt>16</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>4</cooldownTime>
-								<armorPenetrationBlunt>105</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEP_WarcasketMeleeWeapon_GMace"]/statBases</xpath>
-					<value>
-						<Bulk>20</Bulk>
-						<MeleeCounterParryBonus>1.28</MeleeCounterParryBonus>
-						<ToughnessRating>10</ToughnessRating>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="VFEP_WarcasketMeleeWeapon_GMace"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.5</MeleeCritChance>
-							<MeleeParryChance>0.06</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/WarCasket Gundam Addon/Ranged_Warcaskets.xml b/Patches/WarCasket Gundam Addon/Ranged_Warcaskets.xml
deleted file mode 100644
index 106d16332d..0000000000
--- a/Patches/WarCasket Gundam Addon/Ranged_Warcaskets.xml	
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>WarCasket Gundam Addon</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "VFEP_WarcasketGun_GSmoothboreGun"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>2.44</cooldownTime>
-								<armorPenetrationBlunt>16</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== warcasket "300mm" smoothbore gun (RPG-7) ========== -->
-
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFEP_WarcasketGun_GSmoothboreGun</defName>
-					<statBases>
-						<Mass>40</Mass>
-						<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
-						<SightsEfficiency>2.16</SightsEfficiency>
-						<ShotSpread>0.2</ShotSpread>
-						<SwayFactor>1.68</SwayFactor>
-						<Bulk>30.50</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_RPG7Grenade_HEAT</defaultProjectile>
-						<warmupTime>2.035</warmupTime>
-						<range>40</range>
-						<minRange>3</minRange>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<onlyManualCast>true</onlyManualCast>
-						<stopBurstWithoutLos>false</stopBurstWithoutLos>
-						<muzzleFlashScale>15</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>1</magazineSize>
-						<reloadTime>5.6</reloadTime>
-						<ammoSet>AmmoSet_RPG7Grenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<AllowWithRunAndGun>false</AllowWithRunAndGun>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Warbanner Mod/ThingDefs_Banners.xml b/Patches/Warbanner Mod/ThingDefs_Banners.xml
deleted file mode 100644
index 9788943b7b..0000000000
--- a/Patches/Warbanner Mod/ThingDefs_Banners.xml	
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Warbanner Mod</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Banner ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name="FlagMode_BasicFlag"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.35</cooldownTime>
-								<chanceFactor>0.15</chanceFactor>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.78</cooldownTime>
-								<chanceFactor>0.05</chanceFactor>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>1.19</cooldownTime>
-								<chanceFactor>1.00</chanceFactor>
-								<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="FlagMode_BasicFlag"]/statBases</xpath>
-					<value>
-						<Bulk>11</Bulk>
-						<MeleeCounterParryBonus>1.28</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="FlagMode_BasicFlag"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.11</MeleeCritChance>
-							<MeleeParryChance>1.45</MeleeParryChance>
-							<MeleeDodgeChance>0.9</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- ========== Make hediff reduce suppression. ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/RedScare.NonSavedHediffDef[defName="Boastforme"]/stages/li</xpath>
-					<value>
-						<statOffsets>
-							<Suppressability>-0.25</Suppressability>
-						</statOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Warcasket Persona Weapons/Weapons_Warcaskets.xml b/Patches/Warcasket Persona Weapons/Weapons_Warcaskets.xml
deleted file mode 100644
index c6fd41cb06..0000000000
--- a/Patches/Warcasket Persona Weapons/Weapons_Warcaskets.xml	
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Warcasket Persona Weapons</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Tool Capacity Def -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ToolCapacityDef[
-						defName="BifurcatorCleave" or
-						defName="CrustbreakerSmash"
-						]
-					</xpath>
-					<value>
-						<li Class="CombatExtended.ModExtensionMeleeToolPenetration">
-							<canHitInternal>true</canHitInternal>
-						</li>
-					</value>
-				</li>
-
-				<!-- Kyokatana -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WP_Kyokatana"]/statBases</xpath>
-					<value>
-						<Bulk>35</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-						<ToughnessRating>24</ToughnessRating>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WP_Kyokatana"]/equippedStatOffsets/MeleeDodgeChance</xpath>
-					<value>
-						<MeleeCritChance>0.02</MeleeCritChance>
-						<MeleeParryChance>0.47</MeleeParryChance>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WP_Kyokatana"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>46</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>9</armorPenetrationBlunt>
-								<armorPenetrationSharp>64</armorPenetrationSharp>
-								<extraMeleeDamages>
-									<li>
-										<def>WP_WhiteHotBurn</def>
-										<amount>10</amount>
-									</li>
-									<li>
-										<def>Flame</def>
-										<amount>10</amount>
-										<chance>0.15</chance>
-									</li>
-								</extraMeleeDamages>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>58</power>
-								<cooldownTime>2.6</cooldownTime>
-								<armorPenetrationBlunt>17</armorPenetrationBlunt>
-								<armorPenetrationSharp>48</armorPenetrationSharp>
-								<extraMeleeDamages>
-									<li>
-										<def>WP_WhiteHotBurn</def>
-										<amount>10</amount>
-									</li>
-									<li>
-										<def>Flame</def>
-										<amount>10</amount>
-										<chance>0.5</chance>
-									</li>
-								</extraMeleeDamages>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Bifurcator -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WP_Bifurcator"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>BifurcatorCleave</li>
-								</capacities>
-								<power>62</power>
-								<cooldownTime>5.73</cooldownTime>
-								<armorPenetrationSharp>52</armorPenetrationSharp>
-								<armorPenetrationBlunt>580</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WP_Bifurcator"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.8</MeleeCritChance>
-							<MeleeParryChance>0.1</MeleeParryChance>
-							<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WP_Bifurcator"]/statBases</xpath>
-					<value>
-						<Bulk>16</Bulk>
-						<MeleeCounterParryBonus>1.75</MeleeCounterParryBonus>
-						<ToughnessRating>22</ToughnessRating>
-					</value>
-				</li>
-
-				<!-- Voltrender -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WP_Voltrender"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-						<ToughnessRating>24</ToughnessRating>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WP_Voltrender"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.02</MeleeCritChance>
-							<MeleeParryChance>0.44</MeleeParryChance>
-							<MeleeDodgeChance>0.22</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WP_Voltrender"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>VoltaicSlash</li>
-								</capacities>
-								<power>52</power>
-								<cooldownTime>2.6</cooldownTime>
-								<armorPenetrationBlunt>17</armorPenetrationBlunt>
-								<armorPenetrationSharp>28</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Crustbreaker -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WP_Crustbreaker"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>CrustbreakerSmash</li>
-								</capacities>
-								<power>92</power>
-								<cooldownTime>5.73</cooldownTime>
-								<armorPenetrationBlunt>580</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WP_Crustbreaker"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.8</MeleeCritChance>
-							<MeleeParryChance>0.1</MeleeParryChance>
-							<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WP_Crustbreaker"]/statBases</xpath>
-					<value>
-						<Bulk>18</Bulk>
-						<MeleeCounterParryBonus>2</MeleeCounterParryBonus>
-						<ToughnessRating>25</ToughnessRating>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Warcaskets - Adeptus Astartes/Apparel_Warcaskets_Astartes.xml b/Patches/Warcaskets - Adeptus Astartes/Apparel_Warcaskets_Astartes.xml
deleted file mode 100644
index 312478c74c..0000000000
--- a/Patches/Warcaskets - Adeptus Astartes/Apparel_Warcaskets_Astartes.xml	
+++ /dev/null
@@ -1,913 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Warcaskets: Adeptus Astartes</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- "The Emperor protects!" (But a few centimeters of ceramite never hurt, either.) -->
-
-				<!-- ========== Swap ShootingAccuracy for AimingAccuracy ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[
-						defName="VFEP_WarcasketHelmet_SpaceMarine"
-						]/equippedStatOffsets/ShootingAccuracyPawn </xpath>
-					<value>
-						<AimingAccuracy>0.15</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[
-						defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarOne" or
-						defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarTwo" or
-						defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarThree" or
-						defName="VFEP_WarcasketHelmet_SpaceMarineWings" or
-						defName="VFEP_WarcasketHelmet_SpaceMarineKnight" or
-						defName="VFEP_WarcasketHelmet_SpaceMarineMkVI"
-						]/equippedStatOffsets/ShootingAccuracyPawn </xpath>
-					<value>
-						<AimingAccuracy>0.18</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[
-						defName="VFEP_WarcasketHelmet_SpaceMarinePrimarisSgt" or
-						defName="VFEP_WarcasketHelmet_SpaceMarinePrimarisCpt" or
-						defName="VFEP_WarcasketHelmet_SpaceMarineKnightVet"
-						]/equippedStatOffsets/ShootingAccuracyPawn </xpath>
-					<value>
-						<AimingAccuracy>0.21</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[
-						defName="VFEP_WarcasketHelmet_SpaceMarineTerminator"
-						]/equippedStatOffsets/ShootingAccuracyPawn </xpath>
-					<value>
-						<AimingAccuracy>0.39</AimingAccuracy>
-					</value>
-				</li>
-
-				<!-- ========== Space Marine Warcasket (Standard) ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine"]/statBases</xpath>
-					<value>
-						<Bulk>200</Bulk>
-						<WornBulk>20</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>26</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>62</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>250</CarryWeight>
-						<CarryBulk>200</CarryBulk>
-						<Suppressability>-100</Suppressability>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine"]/costList/Steel</xpath>
-					<value>
-						<Steel>260</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine"]/costList/ComponentIndustrial</xpath>
-					<value>
-						<ComponentIndustrial>8</ComponentIndustrial>
-					</value>
-				</li>
-
-				<!-- === Space Marine Warcasket Shoulders (Standard) === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>26</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>54</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- === Space Marine Warcasket Helmet (Standard) === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarine"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<WornBulk>5</WornBulk>
-						<NightVisionEfficiency_Apparel>0.5</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarine"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarine"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarine"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarine"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>22</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarine"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>48</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ========== Space Marine Warcasket (Veteran) ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_Vet"]/statBases</xpath>
-					<value>
-						<Bulk>225</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_Vet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>27.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_Vet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>64</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_Vet"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>250</CarryWeight>
-						<CarryBulk>200</CarryBulk>
-						<Suppressability>-100</Suppressability>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_Vet"]/costList/Steel</xpath>
-					<value>
-						<Steel>270</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_Vet"]/costList/ComponentIndustrial</xpath>
-					<value>
-						<ComponentIndustrial>9</ComponentIndustrial>
-					</value>
-				</li>
-
-				<!-- === Space Marine Warcasket Shoulders (Veteran) === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine_Vet"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine_Vet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>28.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine_Vet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>58</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ========== Space Marine Warcasket (Cpt.) ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_Cpt"]/statBases</xpath>
-					<value>
-						<Bulk>250</Bulk>
-						<WornBulk>25</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_Cpt"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>32</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_Cpt"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>74</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_Cpt"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>250</CarryWeight>
-						<CarryBulk>200</CarryBulk>
-						<Suppressability>-100</Suppressability>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_Cpt"]/costList/Steel</xpath>
-					<value>
-						<Steel>350</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_Cpt"]/costList/ComponentIndustrial</xpath>
-					<value>
-						<ComponentIndustrial>10</ComponentIndustrial>
-					</value>
-				</li>
-
-				<!-- ========== Space Marine Warcasket (Mk. II) ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_MkII"]/statBases</xpath>
-					<value>
-						<Bulk>250</Bulk>
-						<WornBulk>25</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_MkII"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>29.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_MkII"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>74</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_MkII"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>250</CarryWeight>
-						<CarryBulk>200</CarryBulk>
-						<Suppressability>-100</Suppressability>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_MkII"]/costList/Steel</xpath>
-					<value>
-						<Steel>360</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_MkII"]/costList/ComponentIndustrial</xpath>
-					<value>
-						<ComponentIndustrial>10</ComponentIndustrial>
-					</value>
-				</li>
-
-				<!-- === Space Marine Warcasket Shoulders (Mk. II) === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine_MkII"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine_MkII"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>29.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine_MkII"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>68</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- ========== Space Marine Warcasket (Mk. VI) ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_MKVI"]/statBases</xpath>
-					<value>
-						<Bulk>250</Bulk>
-						<WornBulk>25</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_MKVI"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>32</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_MKVI"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>70</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_MKVI"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>250</CarryWeight>
-						<CarryBulk>200</CarryBulk>
-						<Suppressability>-100</Suppressability>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_MKVI"]/costList/Steel</xpath>
-					<value>
-						<Steel>370</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_MKVI"]/costList/ComponentIndustrial</xpath>
-					<value>
-						<ComponentIndustrial>10</ComponentIndustrial>
-					</value>
-				</li>
-
-				<!-- ========== Terminator Warcasket ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_Terminator"]/statBases</xpath>
-					<value>
-						<Bulk>275</Bulk>
-						<WornBulk>35</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_Terminator"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>37.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_Terminator"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>84</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_Terminator"]/equippedStatOffsets</xpath>
-					<value>
-						<CarryWeight>250</CarryWeight>
-						<CarryBulk>225</CarryBulk>
-						<Suppressability>-100</Suppressability>
-					</value>
-				</li>
-
-				<!-- Increase Cost -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_Terminator"]/costList/Steel</xpath>
-					<value>
-						<Steel>480</Steel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="HP_Warcasket_SpaceMarine_Terminator"]/costList/ComponentIndustrial</xpath>
-					<value>
-						<ComponentIndustrial>16</ComponentIndustrial>
-					</value>
-				</li>
-
-				<!-- === Terminator Warcasket Shoulders === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine_Terminator"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine_Terminator"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>36</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine_Terminator"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>84</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- === Space Marine Warcasket Shoulders (Tac) === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine_Tac"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine_Tac"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>27.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine_Tac"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>62</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- === Space Marine Warcasket Shoulders (Heavy Support) === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine_HeavySupport"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine_HeavySupport"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>26</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine_HeavySupport"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>62</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- === Space Marine Warcasket Shoulders (Studded) === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine_Studded"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine_Studded"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>26</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketShoulders_SpaceMarine_Studded"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>62</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- === Primaris Marine Warcasket Helmet (V. 1) === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarOne"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarOne"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarOne"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarOne"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarOne"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>24</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarOne"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>50</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- === Primaris Marine Warcasket Helmet (V. 2 and V. 3) === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarTwo" or defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarThree"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarTwo" or defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarThree"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarTwo" or defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarThree"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarTwo" or defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarThree"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarTwo" or defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarThree"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>25.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarTwo" or defName="VFEP_WarcasketHelmet_SpaceMarinePrimaris_VarThree"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>50</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- === Primaris Marine Warcasket Helmet (Winged) === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineWings"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-						<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineWings"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineWings"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineWings"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineWings"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>27</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineWings"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>52</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- === Primaris Marine Warcasket Helmet (Sgt.) === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimarisSgt"]/statBases</xpath>
-					<value>
-						<Bulk>20</Bulk>
-						<WornBulk>5</WornBulk>
-						<NightVisionEfficiency_Apparel>0.65</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimarisSgt"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimarisSgt"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimarisSgt"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimarisSgt"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>28.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimarisSgt"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>54</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- === Primaris Marine Warcasket Helmet (Cpt.) === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimarisCpt"]/statBases</xpath>
-					<value>
-						<Bulk>20</Bulk>
-						<WornBulk>5</WornBulk>
-						<NightVisionEfficiency_Apparel>0.65</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimarisCpt"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimarisCpt"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimarisCpt"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimarisCpt"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>30</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarinePrimarisCpt"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>56</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- === Space Marine Warcasket Helmet (Mk. II) === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineKnight"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-						<NightVisionEfficiency_Apparel>0.65</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineKnight"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineKnight"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineKnight"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineKnight"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>27</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineKnight"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>50</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- === Space Marine Warcasket Helmet (Mk. II Vet.) === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineKnightVet"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-						<NightVisionEfficiency_Apparel>0.7</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineKnightVet"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineKnightVet"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineKnightVet"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineKnightVet"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>27</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineKnightVet"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>54</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- === Space Marine Warcasket Helmet (Mk. VI) === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineMkVI"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-						<NightVisionEfficiency_Apparel>0.7</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineMkVI"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineMkVI"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineMkVI"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineMkVI"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>25</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineMkVI"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>50</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<!-- === Terminator Warcasket Helmet === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineTerminator"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<WornBulk>5</WornBulk>
-						<NightVisionEfficiency_Apparel>0.7</NightVisionEfficiency_Apparel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineTerminator"]/apparel/immuneToToxGasExposure</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineTerminator"]/apparel</xpath>
-						<value>
-							<immuneToToxGasExposure>true</immuneToToxGasExposure>
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineTerminator"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineTerminator"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>38</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/VFEPirates.WarcasketDef[defName="VFEP_WarcasketHelmet_SpaceMarineTerminator"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>84</ArmorRating_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Warcaskets - Adeptus Astartes/Melee_Astartes.xml b/Patches/Warcaskets - Adeptus Astartes/Melee_Astartes.xml
deleted file mode 100644
index b222579b9b..0000000000
--- a/Patches/Warcaskets - Adeptus Astartes/Melee_Astartes.xml	
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Warcaskets: Adeptus Astartes</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- "They are my Space Marines and they shall know no fear." -->
-
-				<!-- Power Sword -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="HP_WarcasketMeleeWeapon_PowerSword"]/statBases</xpath>
-					<value>
-						<Bulk>15</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-						<ToughnessRating>24</ToughnessRating>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="HP_WarcasketMeleeWeapon_PowerSword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.02</MeleeCritChance>
-							<MeleeParryChance>0.44</MeleeParryChance>
-							<MeleeDodgeChance>0.22</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="HP_WarcasketMeleeWeapon_PowerSword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>HP_Power_Stab</li>
-								</capacities>
-								<power>43</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>9</armorPenetrationBlunt>
-								<armorPenetrationSharp>46</armorPenetrationSharp>
-								<extraMeleeDamages>
-									<li>
-										<def>Electrical</def>
-										<amount>10</amount>
-										<chance>0.15</chance>
-									</li>
-								</extraMeleeDamages>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>HP_Power_Cut</li>
-								</capacities>
-								<power>52</power>
-								<cooldownTime>2.6</cooldownTime>
-								<armorPenetrationBlunt>17</armorPenetrationBlunt>
-								<armorPenetrationSharp>28</armorPenetrationSharp>
-								<extraMeleeDamages>
-									<li>
-										<def>Electrical</def>
-										<amount>10</amount>
-										<chance>0.5</chance>
-									</li>
-								</extraMeleeDamages>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Chain Sword -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="HP_WarcasketMeleeWeapon_ChainSword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>HP_Chain_Stab</li>
-								</capacities>
-								<power>56</power>
-								<cooldownTime>2.5</cooldownTime>
-								<chanceFactor>0.60</chanceFactor>
-								<armorPenetrationBlunt>11.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>12</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>HP_Power_Cut</label>
-								<capacities>
-									<li>HP_Chain_Cut</li>
-								</capacities>
-								<power>68</power>
-								<cooldownTime>3.45</cooldownTime>
-								<chanceFactor>0.30</chanceFactor>
-								<armorPenetrationBlunt>17</armorPenetrationBlunt>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="HP_WarcasketMeleeWeapon_ChainSword"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.11</MeleeCritChance>
-							<MeleeParryChance>0.47</MeleeParryChance>
-							<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="HP_WarcasketMeleeWeapon_ChainSword"]/statBases</xpath>
-					<value>
-						<Bulk>18</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-						<ToughnessRating>20</ToughnessRating>
-					</value>
-				</li>
-
-				<!-- Thunder Hammer -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="HP_WarcasketMeleeWeapon_ThunderHammer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>HP_Thunder_Hit</li>
-								</capacities>
-								<power>62</power>
-								<cooldownTime>5.73</cooldownTime>
-								<chanceFactor>0.70</chanceFactor>
-								<armorPenetrationBlunt>580</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>2.11</cooldownTime>
-								<chanceFactor>0.20</chanceFactor>
-								<armorPenetrationBlunt>22.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="HP_WarcasketMeleeWeapon_ThunderHammer"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.8</MeleeCritChance>
-							<MeleeParryChance>0.1</MeleeParryChance>
-							<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="HP_WarcasketMeleeWeapon_ThunderHammer"]/statBases</xpath>
-					<value>
-						<Bulk>20</Bulk>
-						<MeleeCounterParryBonus>2</MeleeCounterParryBonus>
-						<ToughnessRating>25</ToughnessRating>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Warcaskets - Adeptus Astartes/Ranged_Astartes.xml b/Patches/Warcaskets - Adeptus Astartes/Ranged_Astartes.xml
deleted file mode 100644
index 03588764c8..0000000000
--- a/Patches/Warcaskets - Adeptus Astartes/Ranged_Astartes.xml	
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Warcaskets: Adeptus Astartes</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- "The boltgun is far more than a weapon; it is an instrument of Mankind's divinity." -->
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>
-						Defs/ThingDef[
-						defName = "HP_WarcasketGun_Bolter" or
-						defName = "HP_WarcasketGun_BolterRifle" or
-						defName = "VFEP_WarcasketGun_HeavyBolter" or
-						defName = "HP_WarcasketGun_StormBolter" or
-						defName = "VFEP_WarcasketGun_MeltaGun" or
-						defName = "VFEP_WarcasketGun_PlasmaCannon"
-						]/tools
-					</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>2.44</cooldownTime>
-								<armorPenetrationBlunt>16</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Bolter === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>HP_WarcasketGun_Bolter</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>2.58</SwayFactor><!-- Sway has been reduced, given the wielders. -->
-						<Bulk>7.5</Bulk>
-						<Mass>8</Mass>
-						<RangedWeapon_Cooldown>0.43</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>3.27</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Bolter75_Standard</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>14</ticksBetweenBurstShots>
-						<range>25</range>
-						<soundCast>HP_Bolt_Gun_Sound</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_Bolter75</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- === Bolter Rifle === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>HP_WarcasketGun_BolterRifle</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.04</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>10.5</Bulk>
-						<Mass>15</Mass>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.38</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Bolter75_Standard</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-						<range>44</range>
-						<soundCast>HP_Bolt_Gun_Sound</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>5.5</reloadTime>
-						<ammoSet>AmmoSet_Bolter75</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- === Heavy Bolter Rifle === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFEP_WarcasketGun_HeavyBolter</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>2.55</SwayFactor>
-						<Bulk>12.5</Bulk>
-						<Mass>25</Mass>
-						<RangedWeapon_Cooldown>0.42</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>3.22</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Bolter998_Standard</defaultProjectile>
-						<warmupTime>1.3</warmupTime>
-						<burstShotCount>8</burstShotCount>
-						<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-						<range>52</range>
-						<soundCast>HP_HeavyBolter_Gun_Sound</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>40</magazineSize>
-						<reloadTime>6.2</reloadTime>
-						<ammoSet>AmmoSet_Bolter998</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>4</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- === Storm Bolter === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>HP_WarcasketGun_StormBolter</defName>
-					<statBases>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<ShotSpread>0.07</ShotSpread>
-						<SwayFactor>2.92</SwayFactor>
-						<Bulk>7.5</Bulk>
-						<Mass>10</Mass>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.93</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Bolter75_Standard</defaultProjectile>
-						<warmupTime>0.6</warmupTime>
-						<burstShotCount>8</burstShotCount>
-						<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-						<range>20</range>
-						<soundCast>HP_HeavyBolter_Gun_Sound</soundCast>
-						<soundCastTail>GunTail_Medium</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>40</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_Bolter75</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>4</aimedBurstShotCount>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- === Melta Gun === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFEP_WarcasketGun_MeltaGun</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>10</Bulk>
-						<Mass>12</Mass>
-						<RangedWeapon_Cooldown>1.32</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_Laser_MeltaCharge</defaultProjectile>
-						<warmupTime>2.2</warmupTime>
-						<range>42</range>
-						<ammoConsumedPerShotCount>50</ammoConsumedPerShotCount>
-						<soundCast>HP_Meltagun_Gun_Sound</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>19</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>100</magazineSize>
-						<reloadTime>7.2</reloadTime>
-						<ammoSet>AmmoSet_MeltaCharge</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- === Plasma Cannon === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>VFEP_WarcasketGun_PlasmaCannon</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>1.27</SwayFactor>
-						<Bulk>8</Bulk>
-						<Mass>10</Mass>
-						<RangedWeapon_Cooldown>1.06</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_PlasmaCannon</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>42</range>
-						<soundCast>HP_PlasmaCannon_Gun_Sound</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>19</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>6.2</reloadTime>
-						<ammoSet>AmmoSet_PlasmaCanister_Cannon</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Warhammer - Dryad/Apparel_Dryad.xml b/Patches/Warhammer - Dryad/Apparel_Dryad.xml
deleted file mode 100644
index 15881f6250..0000000000
--- a/Patches/Warhammer - Dryad/Apparel_Dryad.xml	
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Warhammer"ish":Dryad</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Apparel_DryadicMask"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>1.75</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Warhammer - Dryad/PawnKinds_Dryad.xml b/Patches/Warhammer - Dryad/PawnKinds_Dryad.xml
deleted file mode 100644
index 182c0f3dd9..0000000000
--- a/Patches/Warhammer - Dryad/PawnKinds_Dryad.xml	
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Warhammer"ish":Dryad</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Give ammo to pawns with ranged weapons. ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>
-						Defs/PawnKindDef[
-						defName="DryadGood" or
-						defName="DryadBad" or
-						defName="WildDryadGood" or
-						defName="WildDryadBad" or
-						defName="DryadPlayer" or
-						defName="BranchHunter"
-						]
-					</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>14</min>
-								<max>20</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>80</min>
-									<max>160</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>CE_Sidearm_Tribal</li>
-								</weaponTags>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Warhammer - Dryad/Race_Dryad.xml b/Patches/Warhammer - Dryad/Race_Dryad.xml
deleted file mode 100644
index 9dc88ded6a..0000000000
--- a/Patches/Warhammer - Dryad/Race_Dryad.xml	
+++ /dev/null
@@ -1,278 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Warhammer"ish":Dryad</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Base Dryad -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[@Name="KTDryadAnimalThingBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[@Name="KTDryadAnimalThingBase"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[@Name="KTDryadAnimalThingBase"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="KTDryadAnimalThingBase"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-				<!-- Dryad -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Dryad" or defName="Alien_DryadWild"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Dryad" or defName="Alien_DryadWild"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Dryad" or defName="Alien_DryadWild"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Dryad" or defName="Alien_DryadWild"]/statBases/MeleeDodgeChance</xpath>
-					<value>
-						<NightVisionEfficiency>0.4</NightVisionEfficiency>
-						<MeleeDodgeChance>1.1</MeleeDodgeChance>
-						<MeleeCritChance>0.8</MeleeCritChance>
-						<MeleeParryChance>0.85</MeleeParryChance>
-						<CarryWeight>35</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Dryad" or defName="Alien_DryadWild"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.35</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Dryad" or defName="Alien_DryadWild"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Dryad" or defName="Alien_DryadWild"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left branch</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>5</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>DryadLeftBranchG</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right branch</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>5</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>DryadRightBranchG</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.923</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Willow Aspect -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DryadWillowAspect"]/statBases/MeleeDodgeChance</xpath>
-					<value>
-						<NightVisionEfficiency>0.4</NightVisionEfficiency>
-						<MeleeDodgeChance>1.6</MeleeDodgeChance>
-						<MeleeCritChance>0.75</MeleeCritChance>
-						<MeleeParryChance>0.80</MeleeParryChance>
-						<CarryWeight>35</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DryadWillowAspect"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.35</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DryadWillowAspect"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>1</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DryadWillowAspect"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left branch</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.15</cooldownTime>
-								<linkedBodyPartsGroup>DryadLeftBranchG</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right branch</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.15</cooldownTime>
-								<linkedBodyPartsGroup>DryadRightBranchG</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Oak Aspect -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="DryadOakAspect"]/statBases</xpath>
-					<value>
-						<NightVisionEfficiency>0.4</NightVisionEfficiency>
-						<MeleeDodgeChance>0.8</MeleeDodgeChance>
-						<MeleeCritChance>0.80</MeleeCritChance>
-						<MeleeParryChance>0.85</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DryadOakAspect"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2.35</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DryadOakAspect"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DryadOakAspect"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left branch</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>DryadLeftBranchG</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right branch</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.85</cooldownTime>
-								<linkedBodyPartsGroup>DryadRightBranchG</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>3</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Warhammer - Dryad/Race_Revenant.xml b/Patches/Warhammer - Dryad/Race_Revenant.xml
deleted file mode 100644
index 4201f02a9d..0000000000
--- a/Patches/Warhammer - Dryad/Race_Revenant.xml	
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Warhammer"ish":Dryad</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Revenants -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DryadDeadRevenant" or defName="DryadDeadRevenantFoe"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-						<Suppressability>-10</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DryadSpiteRevenant" or defName="DryadSpiteRevenantAnimal"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2.5</ArmorRating_Blunt>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-						<Suppressability>-10</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DryadSpiteRevenant" or defName="DryadSpiteRevenantAnimal"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.75</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DryadDeadRevenant" or defName="DryadDeadRevenantFoe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left branch</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.15</cooldownTime>
-								<linkedBodyPartsGroup>DryadLeftBranchG</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right branch</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.15</cooldownTime>
-								<linkedBodyPartsGroup>DryadRightBranchG</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="DryadSpiteRevenant" or defName="DryadSpiteRevenantAnimal"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left branch</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.15</cooldownTime>
-								<linkedBodyPartsGroup>DryadLeftBranchG</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right branch</label>
-								<capacities>
-									<li>Scratch</li>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.15</cooldownTime>
-								<linkedBodyPartsGroup>DryadRightBranchG</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Warhammer - Dryad/ThingDefs_Turrets.xml b/Patches/Warhammer - Dryad/ThingDefs_Turrets.xml
deleted file mode 100644
index 2ccb6efb84..0000000000
--- a/Patches/Warhammer - Dryad/ThingDefs_Turrets.xml	
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Warhammer"ish":Dryad</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Replace vanilla thingClass -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Turret_DryadArm" or defName = "Turret_DryadRevenant"]/thingClass</xpath>
-					<value>
-						<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName = "Turret_DryadArm" or defName = "Turret_DryadRevenant"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>0.75</AimingAccuracy>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Turret_DryadArm" or defName = "Turret_DryadRevenant"]/statBases/ShootingAccuracyTurret</xpath>
-					<value>
-						<ShootingAccuracyTurret>1.1</ShootingAccuracyTurret>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Turret_DryadArm" or defName = "Turret_DryadRevenant"]/building/turretBurstCooldownTime</xpath>
-					<value>
-						<turretBurstCooldownTime>2.5</turretBurstCooldownTime>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Turret_DryadArm"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>13</specialDisplayRadius>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "Turret_DryadRevenant"]/specialDisplayRadius</xpath>
-					<value>
-						<specialDisplayRadius>18</specialDisplayRadius>
-					</value>
-				</li>
-
-				<!-- Dryad Arm -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_DryadArm</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>3</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>0.01</SwayFactor>
-						<Bulk>10.00</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_DryadArm</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>13</range>
-						<soundCast>Pawn_BigInsect_Angry</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>0</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- Revenant Arm -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_DryadRevenant</defName>
-					<statBases>
-						<RangedWeapon_Cooldown>3</RangedWeapon_Cooldown>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.01</ShotSpread>
-						<SwayFactor>0.01</SwayFactor>
-						<Bulk>10.00</Bulk>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_RevenantArm</defaultProjectile>
-						<warmupTime>1.2</warmupTime>
-						<range>18</range>
-						<soundCast>Pawn_BigInsect_Angry</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>0</muzzleFlashScale>
-						<recoilPattern>Mounted</recoilPattern>
-					</Properties>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>TurretGun</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Projectile === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingDef ParentName="BaseBulletCE">
-							<thingClass>CombatExtended.BulletCE</thingClass>
-							<defName>Bullet_DryadArm</defName>
-							<label>revenant projectile</label>
-							<graphicData>
-								<texPath>Things/Projectile/ArmTurretBullet</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>60</speed>
-								<damageDef>Cut</damageDef>
-								<damageAmountBase>16</damageAmountBase>
-								<armorPenetrationSharp>2</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseBulletCE">
-							<thingClass>CombatExtended.BulletCE</thingClass>
-							<defName>Bullet_RevenantArm</defName>
-							<label>revenant projectile</label>
-							<graphicData>
-								<texPath>Things/Projectile/RevenantTurretBullet</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>60</speed>
-								<damageDef>Cut</damageDef>
-								<damageAmountBase>20</damageAmountBase>
-								<armorPenetrationSharp>4</armorPenetrationSharp>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Warhammer - Dryad/Weapons_Dryad.xml b/Patches/Warhammer - Dryad/Weapons_Dryad.xml
deleted file mode 100644
index 994b40c522..0000000000
--- a/Patches/Warhammer - Dryad/Weapons_Dryad.xml	
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Warhammer"ish":Dryad</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==== Scythe ==== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_SylScythe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>hand guard</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>hook</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>14</power>
-								<cooldownTime>1.11</cooldownTime>
-								<armorPenetrationSharp>2.82</armorPenetrationSharp>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>1.32</cooldownTime>
-								<armorPenetrationSharp>1.5</armorPenetrationSharp>
-								<armorPenetrationBlunt>3.375</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_SylScythe"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.25</MeleeCritChance>
-							<MeleeParryChance>0.5</MeleeParryChance>
-							<MeleeDodgeChance>0.6</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_SylScythe"]/statBases</xpath>
-					<value>
-						<Bulk>8</Bulk>
-						<MeleeCounterParryBonus>0.54</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<!-- === Willow Whip === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>Gun_WillowWhip</defName>
-					<statBases>
-						<SightsEfficiency>1</SightsEfficiency>
-						<ShotSpread>0.5</ShotSpread>
-						<SwayFactor>0.26</SwayFactor>
-						<Bulk>1.5</Bulk>
-						<Mass>0.9</Mass>
-						<RangedWeapon_Cooldown>0.48</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_WillowWhip</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>6</range>
-						<soundCast>Interact_BeatFire</soundCast>
-					</Properties>
-				</li>
-
-				<!-- Tools -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Gun_WillowWhip"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>branch</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>2</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationSharp>0.15</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Projectile === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingDef ParentName="BaseBulletCE">
-							<thingClass>CombatExtended.BulletCE</thingClass>
-							<defName>Bullet_WillowWhip</defName>
-							<label>willow lash</label>
-							<graphicData>
-								<texPath>Things/Projectile/WillowBullet</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>80</speed>
-								<damageDef>Cut</damageDef>
-								<damageAmountBase>8</damageAmountBase>
-								<armorPenetrationSharp>0.65</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.80</armorPenetrationBlunt>
-							</projectile>
-						</ThingDef>
-					</value>
-
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Warhammer 40.000 - Imperium Materials/GrimForge_CE_Resources.xml b/Patches/Warhammer 40.000 - Imperium Materials/GrimForge_CE_Resources.xml
deleted file mode 100644
index 7b0798727e..0000000000
--- a/Patches/Warhammer 40.000 - Imperium Materials/GrimForge_CE_Resources.xml	
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Warhammer 40.000 - Imperium Materials</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Adamantium -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_Adamantium"]/stuffProps/categories</xpath>
-					<value>
-						<li>Metallic_Weapon</li>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_Adamantium"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_Adamantium"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>3</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_Adamantium"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>4.5</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_Adamantium"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.15</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<!-- Auramite -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_Auramite"]/stuffProps/categories</xpath>
-					<value>
-						<li>Metallic_Weapon</li>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_Auramite"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_Auramite"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>2.1</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_Auramite"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>3.15</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_Auramite"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.07</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<!-- Ceramite -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_Ceramite"]/stuffProps/categories</xpath>
-					<value>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_Ceramite"]/statBases</xpath>
-					<value>
-						<Bulk>0.06</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_Ceramite"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>2.15</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_Ceramite"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>3.2</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_Ceramite"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.12</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<!-- Diamantine -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_Diamantine"]/stuffProps/categories</xpath>
-					<value>
-						<li>Steeled</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_Diamantine"]/statBases</xpath>
-					<value>
-						<Bulk>0.03</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_Diamantine"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>2.35</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_Diamantine"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>3.55</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_Diamantine"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.14</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<!-- Ferrocrete -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_Ferrocrete"]/statBases</xpath>
-					<value>
-						<Bulk>1</Bulk>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Warhammer 40.000 - Imperium Weaponry/GF40K_Ammo_Braizer.xml b/Patches/Warhammer 40.000 - Imperium Weaponry/GF40K_Ammo_Braizer.xml
deleted file mode 100644
index f3b7076bb2..0000000000
--- a/Patches/Warhammer 40.000 - Imperium Weaponry/GF40K_Ammo_Braizer.xml	
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Warhammer 40.000: Imperium Weaponry</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef ParentName="BaseRPG7Grenade">
-					<defName>Bullet_Braizer</defName>
-					<label>brazier fireball</label>
-					<graphicData>
-						<texPath>Things/Projectile/Fireball</texPath>
-						<shaderType>TransparentPostLight</shaderType>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>38</speed>
-						<damageDef>Bullet</damageDef>
-						<damageAmountBase>16</damageAmountBase>
-						<armorPenetrationSharp>18</armorPenetrationSharp>
-						<armorPenetrationBlunt>8</armorPenetrationBlunt>
-						<dropsCasings>false</dropsCasings>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>9</damageAmountBase>
-							<explosiveDamageType>Flame</explosiveDamageType>
-							<explosiveRadius>0.9</explosiveRadius>
-							<explosionSound>MortarBomb_Explode</explosionSound>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-					</comps>
-				</ThingDef>
-
-				<ThingDef ParentName="BaseRPG7Grenade">
-					<defName>Bullet_Braizer_Relic</defName>
-					<label>brazier fireball</label>
-					<graphicData>
-						<texPath>Things/Projectile/Fireball</texPath>
-						<shaderType>TransparentPostLight</shaderType>
-						<graphicClass>Graphic_Single</graphicClass>
-					</graphicData>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<speed>38</speed>
-						<damageDef>Bullet</damageDef>
-						<damageAmountBase>20</damageAmountBase>
-						<armorPenetrationSharp>22</armorPenetrationSharp>
-						<armorPenetrationBlunt>10</armorPenetrationBlunt>
-						<dropsCasings>false</dropsCasings>
-					</projectile>
-					<comps>
-						<li Class="CombatExtended.CompProperties_ExplosiveCE">
-							<damageAmountBase>12</damageAmountBase>
-							<explosiveDamageType>Flame</explosiveDamageType>
-							<explosiveRadius>1.4</explosiveRadius>
-							<explosionSound>MortarBomb_Explode</explosionSound>
-							<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-						</li>
-					</comps>
-				</ThingDef>
-
-			</value>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Warhammer 40.000 - Imperium Weaponry/GF40K_Ammo_Galvanic.xml b/Patches/Warhammer 40.000 - Imperium Weaponry/GF40K_Ammo_Galvanic.xml
deleted file mode 100644
index 9697c9c845..0000000000
--- a/Patches/Warhammer 40.000 - Imperium Weaponry/GF40K_Ammo_Galvanic.xml	
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Warhammer 40.000: Imperium Weaponry</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_8mmGauss_Galvanic</defName>
-					<label>8mm galvanic gauss</label>
-					<ammoTypes>
-						<Ammo_8mmRailgun_Sabot>Bullet_Gauss_Galvanic</Ammo_8mmRailgun_Sabot>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_8mmGauss_Galvanic_Relic</defName>
-					<label>8mm galvanic gauss</label>
-					<ammoTypes>
-						<Ammo_8mmRailgun_Sabot>Bullet_Gauss_Galvanic_Relic</Ammo_8mmRailgun_Sabot>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ================== Projectiles ================== -->
-
-				<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletYellow">
-					<defName>Bullet_Gauss_Galvanic</defName>
-					<label>galvanic Gauss shot</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<isInstant>true</isInstant>
-						<damageFalloff>False</damageFalloff>
-						<damageDef>GF40K_Gauss</damageDef>
-						<damageAmountBase>22</damageAmountBase>
-						<armorPenetrationSharp>50</armorPenetrationSharp>
-						<armorPenetrationBlunt>312</armorPenetrationBlunt>
-						<extraDamages>
-							<li>
-								<def>EMP</def>
-								<amount>45</amount>
-								<chance>0.4</chance>
-							</li>
-						</extraDamages>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletRed">
-					<defName>Bullet_Gauss_Galvanic_Relic</defName>
-					<label>galvanic Gauss shot</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<isInstant>true</isInstant>
-						<damageFalloff>False</damageFalloff>
-						<damageDef>GF40K_Gauss</damageDef>
-						<damageAmountBase>26</damageAmountBase>
-						<armorPenetrationSharp>58</armorPenetrationSharp>
-						<armorPenetrationBlunt>322</armorPenetrationBlunt>
-						<extraDamages>
-							<li>
-								<def>EMP</def>
-								<amount>50</amount>
-								<chance>0.5</chance>
-							</li>
-						</extraDamages>
-					</projectile>
-				</ThingDef>
-
-			</value>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Warhammer 40.000 - Imperium Weaponry/GF40K_Ammo_Radium.xml b/Patches/Warhammer 40.000 - Imperium Weaponry/GF40K_Ammo_Radium.xml
deleted file mode 100644
index b58dab7ac4..0000000000
--- a/Patches/Warhammer 40.000 - Imperium Weaponry/GF40K_Ammo_Radium.xml	
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Warhammer 40.000: Imperium Weaponry</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs</xpath>
-			<value>
-
-				<!-- ==================== AmmoSet ========================== -->
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_Radium_Pistol</defName>
-					<label>10x18mm Radium Charged</label>
-					<ammoTypes>
-						<Ammo_10x18mmCharged>Bullet_10x18mmCharged</Ammo_10x18mmCharged>
-						<Ammo_10x18mmCharged_AP>Bullet_10x18mmCharged_AP</Ammo_10x18mmCharged_AP>
-						<Ammo_10x18mmCharged_Ion>Bullet_10x18mmCharged_Ion</Ammo_10x18mmCharged_Ion>
-						<Ammo_RadiumPistol_Tox>Bullet_RadiumPistol_Tox</Ammo_RadiumPistol_Tox>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<CombatExtended.AmmoSetDef>
-					<defName>AmmoSet_Radium_Carbine</defName>
-					<label>8x35mm Radium Charged</label>
-					<ammoTypes>
-						<Ammo_8x35mmCharged>Bullet_8x35mmCharged</Ammo_8x35mmCharged>
-						<Ammo_8x35mmCharged_AP>Bullet_8x35mmCharged_AP</Ammo_8x35mmCharged_AP>
-						<Ammo_8x35mmCharged_Ion>Bullet_8x35mmCharged_Ion</Ammo_8x35mmCharged_Ion>
-						<Ammo_RadiumCarbine_Tox>Bullet_RadiumCarbine_Tox</Ammo_RadiumCarbine_Tox>
-					</ammoTypes>
-				</CombatExtended.AmmoSetDef>
-
-				<!-- ==================== Ammo ========================== -->
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="10x18mmChargedBase">
-					<defName>Ammo_RadiumPistol_Tox</defName>
-					<label>10x18mm Charged (Tox)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Charged/SmallTox</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>1.06</MarketValue>
-					</statBases>
-					<ammoClass>RadiationIonising</ammoClass>
-				</ThingDef>
-
-				<ThingDef Class="CombatExtended.AmmoDef" ParentName="8x35mmChargedBase">
-					<defName>Ammo_RadiumCarbine_Tox</defName>
-					<label>8x35mm Charged (Tox)</label>
-					<graphicData>
-						<texPath>Things/Ammo/Charged/MediumTox</texPath>
-						<graphicClass>Graphic_StackCount</graphicClass>
-					</graphicData>
-					<statBases>
-						<MarketValue>0.97</MarketValue>
-					</statBases>
-					<ammoClass>RadiationIonising</ammoClass>
-				</ThingDef>
-
-				<!-- =================== Projectiles ==================== -->
-
-				<ThingDef ParentName="Base10x18mmChargedBullet">
-					<defName>Bullet_RadiumPistol_Tox</defName>
-					<label>10x18mm Charged bullet (Tox)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>15</damageAmountBase>
-						<damageDef>GF40K_ToxBullet</damageDef>
-						<armorPenetrationSharp>12</armorPenetrationSharp>
-						<armorPenetrationBlunt>22.56</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<ThingDef Name="Bullet_8x35mmCharged" ParentName="Base8x35mmChargedBullet">
-					<defName>Bullet_RadiumCarbine_Tox</defName>
-					<label>8x35mm Charged bullet (Tox)</label>
-					<projectile Class="CombatExtended.ProjectilePropertiesCE">
-						<damageAmountBase>19</damageAmountBase>
-						<damageDef>GF40K_ToxBullet</damageDef>
-						<armorPenetrationSharp>16</armorPenetrationSharp>
-						<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
-					</projectile>
-				</ThingDef>
-
-				<!-- ==================== Recipes ========================== -->
-
-				<RecipeDef ParentName="ChargeAmmoRecipeBase">
-					<defName>MakeAmmo_RadiumPistol_Tox</defName>
-					<label>make 10x18mm Charged (Tox) cartridge x500</label>
-					<description>Craft 500 10x18mm Charged (Tox) cartridges.</description>
-					<jobString>Making 10x18mm Charged (Tox) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Uranium</li>
-								</thingDefs>
-							</filter>
-							<count>20</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>8</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>10</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Uranium</li>
-							<li>Steel</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_RadiumPistol_Tox>500</Ammo_RadiumPistol_Tox>
-					</products>
-					<workAmount>14800</workAmount>
-				</RecipeDef>
-
-				<RecipeDef ParentName="ChargeAmmoRecipeBase">
-					<defName>MakeAmmo_RadiumCarbine_Tox</defName>
-					<label>make 8x35mm Charged (Tox) cartridge x500</label>
-					<description>Craft 500 8x35mm Charged (Tox) cartridges.</description>
-					<jobString>Making 8x35mm Charged (Tox) cartridges.</jobString>
-					<ingredients>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Uranium</li>
-								</thingDefs>
-							</filter>
-							<count>18</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</filter>
-							<count>10</count>
-						</li>
-						<li>
-							<filter>
-								<thingDefs>
-									<li>ComponentIndustrial</li>
-								</thingDefs>
-							</filter>
-							<count>9</count>
-						</li>
-					</ingredients>
-					<fixedIngredientFilter>
-						<thingDefs>
-							<li>Uranium</li>
-							<li>Steel</li>
-							<li>ComponentIndustrial</li>
-						</thingDefs>
-					</fixedIngredientFilter>
-					<products>
-						<Ammo_RadiumCarbine_Tox>500</Ammo_RadiumCarbine_Tox>
-					</products>
-					<workAmount>13600</workAmount>
-				</RecipeDef>
-
-			</value>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Warhammer 40.000 - Imperium Weaponry/GF40K_Damages_LocalInjury.xml b/Patches/Warhammer 40.000 - Imperium Weaponry/GF40K_Damages_LocalInjury.xml
deleted file mode 100644
index 788b8e2b25..0000000000
--- a/Patches/Warhammer 40.000 - Imperium Weaponry/GF40K_Damages_LocalInjury.xml	
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Warhammer 40.000: Imperium Weaponry</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Add DefModExtension ========== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/DamageDef[defName="GF40K_Shock"]</xpath>
-					<value>
-						<li Class="CombatExtended.DamageDefExtensionCE">
-							<harmOnlyOutsideLayers>true</harmOnlyOutsideLayers>
-							<isAmbientDamage>true</isAmbientDamage>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Melee/GF40K_ForceWeapons.xml b/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Melee/GF40K_ForceWeapons.xml
deleted file mode 100644
index bba62abe60..0000000000
--- a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Melee/GF40K_ForceWeapons.xml	
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Warhammer 40.000: Imperium Weaponry</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_ForceHalberd"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>12</Bulk>
-							<MeleeCounterParryBonus>1.7</MeleeCounterParryBonus>
-						</statBases>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>1.5</MeleeParryChance>
-							<MeleeDodgeChance>0.75</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_ForceHalberd"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>33</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>52</power>
-								<cooldownTime>2.2</cooldownTime>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_ForceStaff"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.5</MeleeCritChance>
-							<MeleeParryChance>1.25</MeleeParryChance>
-							<MeleeDodgeChance>0.75</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_ForceStaff"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<MeleeCounterParryBonus>1.7</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_ForceStaff"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>2.1</cooldownTime>
-								<armorPenetrationBlunt>50</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>2.5</cooldownTime>
-								<armorPenetrationBlunt>60</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_ForceSword"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>10</Bulk>
-							<MeleeCounterParryBonus>1.5</MeleeCounterParryBonus>
-						</statBases>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.0</MeleeCritChance>
-							<MeleeParryChance>0.75</MeleeParryChance>
-							<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_ForceSword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>2.2</cooldownTime>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<armorPenetrationSharp>35</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>60</power>
-								<cooldownTime>2.2</cooldownTime>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-								<armorPenetrationSharp>25</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_ForceTome"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.5</MeleeCritChance>
-							<MeleeParryChance>1.25</MeleeParryChance>
-							<MeleeDodgeChance>0.75</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_ForceTome"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_ForceTome"]</xpath>
-					<value>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_ForceTome"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<labelUsedInLogging>false</labelUsedInLogging>
-								<label>tome</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>3.5</cooldownTime>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Melee/GF40K_MechanicusWeapons.xml b/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Melee/GF40K_MechanicusWeapons.xml
deleted file mode 100644
index e76806bbf5..0000000000
--- a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Melee/GF40K_MechanicusWeapons.xml	
+++ /dev/null
@@ -1,347 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Warhammer 40.000: Imperium Weaponry</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_MechanicusArcMaul"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>15</Bulk>
-							<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
-						</statBases>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.5</MeleeCritChance>
-							<MeleeParryChance>0.3</MeleeParryChance>
-							<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						</equippedStatOffsets>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_MechanicusArcMaul"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>60</power>
-								<extraMeleeDamages>
-									<li>
-										<def>EMP</def>
-										<amount>2</amount>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>2.5</cooldownTime>
-								<armorPenetrationBlunt>200</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_MechanicusOmnisianAxe"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>12</Bulk>
-							<MeleeCounterParryBonus>1.5</MeleeCounterParryBonus>
-						</statBases>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.5</MeleeCritChance>
-							<MeleeParryChance>0.3</MeleeParryChance>
-							<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_MechanicusOmnisianAxe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>2.1</cooldownTime>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<armorPenetrationSharp>45</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>62</power>
-								<extraMeleeDamages>
-									<li>
-										<def>EMP</def>
-										<amount>2</amount>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>2.5</cooldownTime>
-								<armorPenetrationBlunt>9</armorPenetrationBlunt>
-								<armorPenetrationSharp>35</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_MechanicusPowerSword"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>10</Bulk>
-							<MeleeCounterParryBonus>1.5</MeleeCounterParryBonus>
-						</statBases>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.0</MeleeCritChance>
-							<MeleeParryChance>0.75</MeleeParryChance>
-							<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						</equippedStatOffsets>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_MechanicusPowerSword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>2.2</cooldownTime>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>58</power>
-								<extraMeleeDamages>
-									<li>
-										<def>EMP</def>
-										<amount>2</amount>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>2.2</cooldownTime>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_MechanicusTaserGoad"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>8</Bulk>
-							<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
-						</statBases>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.70</MeleeCritChance>
-							<MeleeParryChance>0.5</MeleeParryChance>
-							<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						</equippedStatOffsets>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_MechanicusTaserGoad"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tip</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>36</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Stun</def>
-										<amount>2</amount>
-										<chance>0.33</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>2.1</cooldownTime>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_MechanicusTransonicBlade"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>10</Bulk>
-							<MeleeCounterParryBonus>1.5</MeleeCounterParryBonus>
-						</statBases>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.0</MeleeCritChance>
-							<MeleeParryChance>0.75</MeleeParryChance>
-							<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						</equippedStatOffsets>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_MechanicusTransonicBlade"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tip</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>34</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<armorPenetrationSharp>38</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>GF40K_MolDesCut</li>
-								</capacities>
-								<power>47</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<armorPenetrationSharp>27</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_MechanicusTransonicRazor"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>4</Bulk>
-							<MeleeCounterParryBonus>0.3</MeleeCounterParryBonus>
-						</statBases>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.2</MeleeCritChance>
-							<MeleeParryChance>0.15</MeleeParryChance>
-							<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						</equippedStatOffsets>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_MechanicusTransonicRazor"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>tip</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<armorPenetrationSharp>38</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>GF40K_MolDesCut</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<armorPenetrationSharp>27</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Melee/GF40K_MechanicusWeaponsRelic.xml b/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Melee/GF40K_MechanicusWeaponsRelic.xml
deleted file mode 100644
index 02f97370ec..0000000000
--- a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Melee/GF40K_MechanicusWeaponsRelic.xml	
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Warhammer 40.000: Imperium Weaponry</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_RelicMechanicusPowerSword"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>10</Bulk>
-							<MeleeCounterParryBonus>1.6</MeleeCounterParryBonus>
-						</statBases>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.1</MeleeCritChance>
-							<MeleeParryChance>0.85</MeleeParryChance>
-							<MeleeDodgeChance>0.6</MeleeDodgeChance>
-						</equippedStatOffsets>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_RelicMechanicusPowerSword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>39</power>
-								<cooldownTime>2.0</cooldownTime>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<armorPenetrationSharp>46</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>62</power>
-								<extraMeleeDamages>
-									<li>
-										<def>EMP</def>
-										<amount>2</amount>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>2.0</cooldownTime>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<armorPenetrationSharp>35</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Melee/GF40K_RegularWeapons.xml b/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Melee/GF40K_RegularWeapons.xml
deleted file mode 100644
index c01882846a..0000000000
--- a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Melee/GF40K_RegularWeapons.xml	
+++ /dev/null
@@ -1,322 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Warhammer 40.000: Imperium Weaponry</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_ChainSword"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>10</Bulk>
-							<MeleeCounterParryBonus>0.5</MeleeCounterParryBonus>
-						</statBases>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.5</MeleeCritChance>
-							<MeleeParryChance>0.3</MeleeParryChance>
-							<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						</equippedStatOffsets>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_ChainSword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>backside</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>2.0</cooldownTime>
-								<armorPenetrationBlunt>35</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>chain</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>45</power>
-								<cooldownTime>2.0</cooldownTime>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-								<soundMeleeHit>40_ChainSword</soundMeleeHit>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_ChainAxe"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>8</Bulk>
-							<MeleeCounterParryBonus>0.65</MeleeCounterParryBonus>
-						</statBases>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.65</MeleeCritChance>
-							<MeleeParryChance>0.2</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_ChainAxe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>chain</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>2.5</cooldownTime>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<armorPenetrationSharp>35</armorPenetrationSharp>
-								<soundMeleeHit>40_ChainSword</soundMeleeHit>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>2.3</cooldownTime>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_Eviscerator"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>10</Bulk>
-							<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
-						</statBases>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.6</MeleeCritChance>
-							<MeleeParryChance>0.4</MeleeParryChance>
-							<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_Eviscerator"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>backside</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>50</power>
-								<cooldownTime>2.5</cooldownTime>
-								<armorPenetrationBlunt>40</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>chain</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>55</power>
-								<cooldownTime>2.5</cooldownTime>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<armorPenetrationSharp>35</armorPenetrationSharp>
-								<soundMeleeHit>40_ChainSword</soundMeleeHit>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_Chainspear"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>12</Bulk>
-							<MeleeCounterParryBonus>1.8</MeleeCounterParryBonus>
-						</statBases>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.5</MeleeCritChance>
-							<MeleeParryChance>1.5</MeleeParryChance>
-							<MeleeDodgeChance>0.8</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_Chainspear"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>chain</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>45</power>
-								<cooldownTime>2.20</cooldownTime>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-								<armorPenetrationSharp>37</armorPenetrationSharp>
-								<soundMeleeHit>40_ChainSword</soundMeleeHit>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.4</cooldownTime>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_PowerSabre"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>8</Bulk>
-							<MeleeCounterParryBonus>1.2</MeleeCounterParryBonus>
-						</statBases>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.2</MeleeCritChance>
-							<MeleeParryChance>0.2</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_PowerSabre"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetrationBlunt>4</armorPenetrationBlunt>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_PowerSword"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>10</Bulk>
-							<MeleeCounterParryBonus>1.2</MeleeCounterParryBonus>
-						</statBases>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.3</MeleeCritChance>
-							<MeleeParryChance>0.25</MeleeParryChance>
-							<MeleeDodgeChance>0.15</MeleeDodgeChance>
-						</equippedStatOffsets>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_PowerSword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>25</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Melee/GF40K_RegularWeaponsRelic.xml b/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Melee/GF40K_RegularWeaponsRelic.xml
deleted file mode 100644
index 28b01a12dc..0000000000
--- a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Melee/GF40K_RegularWeaponsRelic.xml	
+++ /dev/null
@@ -1,322 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Warhammer 40.000: Imperium Weaponry</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_RelicChainSword"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>10</Bulk>
-							<MeleeCounterParryBonus>0.6</MeleeCounterParryBonus>
-						</statBases>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.6</MeleeCritChance>
-							<MeleeParryChance>0.4</MeleeParryChance>
-							<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						</equippedStatOffsets>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_RelicChainSword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>backside</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetrationBlunt>38</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>chain</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>45</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetrationBlunt>9</armorPenetrationBlunt>
-								<armorPenetrationSharp>33</armorPenetrationSharp>
-								<soundMeleeHit>40_ChainSword</soundMeleeHit>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_RelicChainAxe"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>7</Bulk>
-							<MeleeCounterParryBonus>0.85</MeleeCounterParryBonus>
-						</statBases>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.8</MeleeCritChance>
-							<MeleeParryChance>0.3</MeleeParryChance>
-							<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						</equippedStatOffsets>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_RelicChainAxe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>chain</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>39</power>
-								<cooldownTime>2.35</cooldownTime>
-								<armorPenetrationBlunt>8.5</armorPenetrationBlunt>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<soundMeleeHit>40_ChainSword</soundMeleeHit>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2.1</cooldownTime>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_RelicEviscerator"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>10</Bulk>
-							<MeleeCounterParryBonus>0.7</MeleeCounterParryBonus>
-						</statBases>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.7</MeleeCritChance>
-							<MeleeParryChance>0.5</MeleeParryChance>
-							<MeleeDodgeChance>0.5</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_RelicEviscerator"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>backside</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>55</power>
-								<cooldownTime>2.4</cooldownTime>
-								<armorPenetrationBlunt>44</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>chain</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>60</power>
-								<cooldownTime>2.4</cooldownTime>
-								<armorPenetrationBlunt>9</armorPenetrationBlunt>
-								<armorPenetrationSharp>38</armorPenetrationSharp>
-								<soundMeleeHit>40_ChainSword</soundMeleeHit>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_RelicChainSpear"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>11</Bulk>
-							<MeleeCounterParryBonus>1.9</MeleeCounterParryBonus>
-						</statBases>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.65</MeleeCritChance>
-							<MeleeParryChance>1.65</MeleeParryChance>
-							<MeleeDodgeChance>0.88</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_RelicChainSpear"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>chain</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>49</power>
-								<cooldownTime>2.05</cooldownTime>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<soundMeleeHit>40_ChainSword</soundMeleeHit>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>12.8</power>
-								<cooldownTime>2.24</cooldownTime>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_RelicPowerSabre"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>8</Bulk>
-							<MeleeCounterParryBonus>1.3</MeleeCounterParryBonus>
-						</statBases>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.3</MeleeCritChance>
-							<MeleeParryChance>0.3</MeleeParryChance>
-							<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						</equippedStatOffsets>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_RelicPowerSabre"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<armorPenetrationSharp>44</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>34</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>8</armorPenetrationBlunt>
-								<armorPenetrationSharp>33</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_RelicPowerSword"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>10</Bulk>
-							<MeleeCounterParryBonus>1.3</MeleeCounterParryBonus>
-						</statBases>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.4</MeleeCritChance>
-							<MeleeParryChance>0.35</MeleeParryChance>
-							<MeleeDodgeChance>0.25</MeleeDodgeChance>
-						</equippedStatOffsets>
-						<weaponTags>
-							<li>CE_OneHandedWeapon</li>
-						</weaponTags>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_RelicPowerSword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>1.7</cooldownTime>
-								<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								<armorPenetrationSharp>44</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>39</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>10</armorPenetrationBlunt>
-								<armorPenetrationSharp>33</armorPenetrationSharp>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.8</cooldownTime>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_ArkWeapons.xml b/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_ArkWeapons.xml
deleted file mode 100644
index 5c6f882ce7..0000000000
--- a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_ArkWeapons.xml	
+++ /dev/null
@@ -1,295 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Warhammer 40.000: Imperium Weaponry</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_ArkPistol"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_RelicArkPistol"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.34</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.34</cooldownTime>
-								<armorPenetrationBlunt>0.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_ArkRifle"]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_RelicArkRifle"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.45</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>3.1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.86</cooldownTime>
-								<armorPenetrationBlunt>1.930</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8.8</power>
-								<cooldownTime>1.45</cooldownTime>
-								<armorPenetrationBlunt>3.1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Ark Pistol === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_ArkPistol</defName>
-					<statBases>
-						<Mass>1.25</Mass>
-						<Bulk>2.5</Bulk>
-						<SwayFactor>1.25</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_10x18mmCharged</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>18</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_10x18mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Relic Ark Pistol === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_RelicArkPistol</defName>
-					<statBases>
-						<Mass>1.2</Mass>
-						<Bulk>2.35</Bulk>
-						<SwayFactor>1.25</SwayFactor>
-						<ShotSpread>0.04</ShotSpread>
-						<SightsEfficiency>0.85</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.32</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.4</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_10x18mmCharged</defaultProjectile>
-						<warmupTime>0.45</warmupTime>
-						<range>21</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_10x18mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Ark Rifle === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_ArkRifle</defName>
-					<statBases>
-						<Mass>5.0</Mass>
-						<Bulk>10.00</Bulk>
-						<SwayFactor>1.5</SwayFactor>
-						<ShotSpread>0.05</ShotSpread>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.7</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_8x35mmCharged_Ion</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>62</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-						<soundCast>GF40K_LaserPistolShot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- === Relic Ark Rifle === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_RelicArkRifle</defName>
-					<statBases>
-						<Mass>4.75</Mass>
-						<Bulk>9.8</Bulk>
-						<SwayFactor>1.5</SwayFactor>
-						<ShotSpread>0.05</ShotSpread>
-						<SightsEfficiency>1.15</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.32</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.6</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_8x35mmCharged_Ion</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>65</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-						<soundCast>GF40K_LaserPistolShot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_BolterWeapons.xml b/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_BolterWeapons.xml
deleted file mode 100644
index 4465f0f5e2..0000000000
--- a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_BolterWeapons.xml	
+++ /dev/null
@@ -1,355 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Warhammer 40.000: Imperium Weaponry</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Tools === -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "GF40K_BoltPistol" or
-						defName = "GF40K_BoltPistolRelic"
-						]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "GF40K_BoltGun" or
-						defName = "GF40K_BoltSniper" or
-						defName = "GF40K_BoltGunRelic" or
-						defName = "GF40K_BoltSniperRelic"
-						]/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>
-				</li>
-
-				<!-- === Bolt Pistol === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_BoltPistol</defName>
-					<statBases>
-						<Mass>4.5</Mass>
-						<Bulk>4.5</Bulk>
-						<SwayFactor>1.17</SwayFactor>
-						<ShotSpread>0.15</ShotSpread>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_Bolter75</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_BoltPistol"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.5</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>True</hasStandardCommand>
-								<defaultProjectile>Bullet_Bolter75_Standard</defaultProjectile>
-								<warmupTime>0.5</warmupTime>
-								<range>15</range>
-								<burstShotCount>2</burstShotCount>
-								<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-								<soundCast>Shot_SniperRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- === Relic Bolt Pistol === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_BoltPistolRelic</defName>
-					<statBases>
-						<Mass>4.5</Mass>
-						<Bulk>4.5</Bulk>
-						<SwayFactor>1.00</SwayFactor>
-						<ShotSpread>0.05</ShotSpread>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
-					</statBases>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>3.8</reloadTime>
-						<ammoSet>AmmoSet_Bolter75_Relic</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_BoltPistolRelic"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.3</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>True</hasStandardCommand>
-								<defaultProjectile>Bullet_Bolter75_Standard_Relic</defaultProjectile>
-								<warmupTime>0.45</warmupTime>
-								<range>16</range>
-								<burstShotCount>3</burstShotCount>
-								<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-								<soundCast>Shot_SniperRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- === Bolt Gun === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_BoltGun</defName>
-					<statBases>
-						<Mass>8.50</Mass>
-						<Bulk>8.00</Bulk>
-						<SwayFactor>1.35</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_Bolter75</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_BoltGun"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>0.95</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>True</hasStandardCommand>
-								<defaultProjectile>Bullet_Bolter75_Standard</defaultProjectile>
-								<warmupTime>1</warmupTime>
-								<range>51</range>
-								<burstShotCount>3</burstShotCount>
-								<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-								<soundCast>Shot_SniperRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- === Relic Bolt Gun === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_BoltGunRelic</defName>
-					<statBases>
-						<Mass>8.50</Mass>
-						<Bulk>8.00</Bulk>
-						<SwayFactor>1.30</SwayFactor>
-						<ShotSpread>0.02</ShotSpread>
-						<SightsEfficiency>1.4</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
-					</statBases>
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_Bolter75_Relic</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_BoltGunRelic"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>0.85</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>True</hasStandardCommand>
-								<defaultProjectile>Bullet_Bolter75_Standard_Relic</defaultProjectile>
-								<warmupTime>0.95</warmupTime>
-								<range>55</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-								<soundCast>Shot_SniperRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- === Bolt Sniper === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_BoltSniper</defName>
-					<statBases>
-						<Mass>10.20</Mass>
-						<Bulk>10.00</Bulk>
-						<SwayFactor>1.19</SwayFactor>
-						<ShotSpread>0.03</ShotSpread>
-						<SightsEfficiency>2.48</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
-						<NightVisionEfficiency_Weapon>0.55</NightVisionEfficiency_Weapon>
-					</statBases>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_Bolter75</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_BoltSniper"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>0.7</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>True</hasStandardCommand>
-								<defaultProjectile>Bullet_Bolter75_Standard</defaultProjectile>
-								<warmupTime>1.7</warmupTime>
-								<range>75</range>
-								<soundCast>Shot_SniperRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- === Relic Bolt Sniper === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_BoltSniperRelic</defName>
-					<statBases>
-						<Mass>10.20</Mass>
-						<Bulk>10.00</Bulk>
-						<SwayFactor>1.10</SwayFactor>
-						<ShotSpread>0.01</ShotSpread>
-						<SightsEfficiency>3.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.50</RangedWeapon_Cooldown>
-						<NightVisionEfficiency_Weapon>0.7</NightVisionEfficiency_Weapon>
-					</statBases>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadTime>3.9</reloadTime>
-						<ammoSet>AmmoSet_Bolter75_Relic</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_BoltSniperRelic"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>0.6</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>True</hasStandardCommand>
-								<defaultProjectile>Bullet_Bolter75_Standard_Relic</defaultProjectile>
-								<warmupTime>1.5</warmupTime>
-								<range>81</range>
-								<soundCast>Shot_SniperRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_Braizer.xml b/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_Braizer.xml
deleted file mode 100644
index 6dc8ecee88..0000000000
--- a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_Braizer.xml	
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Warhammer 40.000: Imperium Weaponry</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_Brazier"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_Brazier"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.6</MeleeCritChance>
-							<MeleeParryChance>1.2</MeleeParryChance>
-							<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_BrazierRelic"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="GF40K_BrazierRelic"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.6</MeleeCritChance>
-							<MeleeParryChance>1.2</MeleeParryChance>
-							<MeleeDodgeChance>0.4</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_BrazierRelic"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>1.85</cooldownTime>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.7</cooldownTime>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_BrazierRelic"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>1.85</cooldownTime>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.7</cooldownTime>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Braizer === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_Brazier</defName>
-					<statBases>
-						<Bulk>9.8</Bulk>
-						<SwayFactor>1.2</SwayFactor>
-						<ShotSpread>0.1</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.62</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.6</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Braizer</defaultProjectile>
-						<warmupTime>0.8</warmupTime>
-						<range>24</range>
-						<burstShotCount>4</burstShotCount>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-				</li>
-
-				<!-- === Braizer - Relic === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_BrazierRelic</defName>
-					<statBases>
-						<Bulk>9.8</Bulk>
-						<SwayFactor>1.2</SwayFactor>
-						<ShotSpread>0.1</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.62</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.6</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Braizer_Relic</defaultProjectile>
-						<warmupTime>0.8</warmupTime>
-						<range>24</range>
-						<burstShotCount>4</burstShotCount>
-						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-						<soundCast>InfernoCannon_Fire</soundCast>
-						<soundCastTail>GunTail_Heavy</soundCastTail>
-						<muzzleFlashScale>12</muzzleFlashScale>
-						<targetParams>
-							<canTargetLocations>true</canTargetLocations>
-						</targetParams>
-					</Properties>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_FlamerWeapon.xml b/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_FlamerWeapon.xml
deleted file mode 100644
index 8b423053f3..0000000000
--- a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_FlamerWeapon.xml	
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Warhammer 40.000: Imperium Weaponry</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_Flamer"]/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>
-				</li>
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_RelicFlamer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.44</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>6</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.44</cooldownTime>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Flamer === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_Flamer</defName>
-					<statBases>
-						<Mass>6.5</Mass>
-						<Bulk>8.0</Bulk>
-						<SwayFactor>1.25</SwayFactor>
-						<ShotSpread>2.0</ShotSpread>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Flamethrower_Prometheum</defaultProjectile>
-						<burstShotCount>20</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<warmupTime>1.0</warmupTime>
-						<range>16</range>
-						<minRange>3</minRange>
-						<soundCast>HissFlamethrower</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>0</muzzleFlashScale>
-						<ai_IsBuildingDestroyer>True</ai_IsBuildingDestroyer>
-						<targetParams>
-							<canTargetLocations>True</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>60</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_Flamethrower</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>10</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- === Relic Flamer === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_RelicFlamer</defName>
-					<statBases>
-						<Mass>6.5</Mass>
-						<Bulk>8.0</Bulk>
-						<SwayFactor>1.20</SwayFactor>
-						<ShotSpread>1.8</ShotSpread>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.32</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.0</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Flamethrower_Prometheum</defaultProjectile>
-						<burstShotCount>20</burstShotCount>
-						<ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-						<warmupTime>1.0</warmupTime>
-						<range>18</range>
-						<minRange>3</minRange>
-						<soundCast>HissFlamethrower</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>0</muzzleFlashScale>
-						<ai_IsBuildingDestroyer>True</ai_IsBuildingDestroyer>
-						<targetParams>
-							<canTargetLocations>True</canTargetLocations>
-						</targetParams>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>60</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_Flamethrower</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>10</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_GalvanicRifleWeapon.xml b/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_GalvanicRifleWeapon.xml
deleted file mode 100644
index 1f12e64412..0000000000
--- a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_GalvanicRifleWeapon.xml	
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Warhammer 40.000: Imperium Weaponry</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_GalvanicRifle"]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_RelicGalvanicRifle"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.4</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>2.95</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>barrel</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.4</cooldownTime>
-								<armorPenetrationBlunt>2.95</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Galvanic Rifle === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_GalvanicRifle</defName>
-					<statBases>
-						<Mass>10.0</Mass>
-						<Bulk>12.0</Bulk>
-						<SwayFactor>2.2</SwayFactor>
-						<ShotSpread>0.05</ShotSpread>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.86</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Gauss_Galvanic</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>75</range>
-						<soundCast>ChargeLance_Fire</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_8mmGauss_Galvanic</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- === Relic Galvanic Rifle === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_RelicGalvanicRifle</defName>
-					<statBases>
-						<Mass>10.0</Mass>
-						<Bulk>12.0</Bulk>
-						<SwayFactor>2</SwayFactor>
-						<ShotSpread>0.04</ShotSpread>
-						<SightsEfficiency>1.3</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.8</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>2</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Gauss_Galvanic_Relic</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>75</range>
-						<soundCast>ChargeLance_Fire</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>12</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_8mmGauss_Galvanic_Relic</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_GrenadeLauncherWeapon.xml b/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_GrenadeLauncherWeapon.xml
deleted file mode 100644
index 51eff0a582..0000000000
--- a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_GrenadeLauncherWeapon.xml	
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Warhammer 40.000: Imperium Weaponry</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_GrenadeLauncher"]/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>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_RelicGrenadeLauncher"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>stock</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.44</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>6</power>
-								<cooldownTime>1.9</cooldownTime>
-								<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.44</cooldownTime>
-								<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Grenade Launcher === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_GrenadeLauncher</defName>
-					<statBases>
-						<Mass>7.0</Mass>
-						<Bulk>6.0</Bulk>
-						<SwayFactor>1.35</SwayFactor>
-						<ShotSpread>0.17</ShotSpread>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.57</RangedWeapon_Cooldown>
-					</statBases>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>0.85</reloadTime>
-						<ammoSet>AmmoSet_40x53mmGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_GrenadeLauncher"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>4.88</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>True</hasStandardCommand>
-								<defaultProjectile>Bullet_40x53mmGrenade_HE</defaultProjectile>
-								<warmupTime>1.0</warmupTime>
-								<range>55</range>
-								<minRange>6</minRange>
-								<soundCast>Mortar_LaunchA</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>14</muzzleFlashScale>
-								<ai_IsBuildingDestroyer>True</ai_IsBuildingDestroyer>
-								<targetParams>
-									<canTargetLocations>True</canTargetLocations>
-								</targetParams>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- === Relic Grenade Launcher === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_RelicGrenadeLauncher</defName>
-					<statBases>
-						<Mass>7.0</Mass>
-						<Bulk>6.0</Bulk>
-						<SwayFactor>1.30</SwayFactor>
-						<ShotSpread>0.13</ShotSpread>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.54</RangedWeapon_Cooldown>
-					</statBases>
-					<AmmoUser>
-						<magazineSize>6</magazineSize>
-						<reloadOneAtATime>true</reloadOneAtATime>
-						<reloadTime>0.80</reloadTime>
-						<ammoSet>AmmoSet_40x53mmGrenade</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_RelicGrenadeLauncher"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>4.4</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>True</hasStandardCommand>
-								<defaultProjectile>Bullet_40x53mmGrenade_HE</defaultProjectile>
-								<warmupTime>1.0</warmupTime>
-								<range>60</range>
-								<minRange>6</minRange>
-								<soundCast>Mortar_LaunchA</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>14</muzzleFlashScale>
-								<ai_IsBuildingDestroyer>True</ai_IsBuildingDestroyer>
-								<targetParams>
-									<canTargetLocations>True</canTargetLocations>
-								</targetParams>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_LasWeapons.xml b/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_LasWeapons.xml
deleted file mode 100644
index f1137f2884..0000000000
--- a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_LasWeapons.xml	
+++ /dev/null
@@ -1,466 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Warhammer 40.000: Imperium Weaponry</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "GF40K_LaserPistol" or
-						defName = "GF40K_LaserSMG" or
-						defName = "GF40K_LaserPistolRelic" or
-						defName = "GF40K_LaserSMGRelic"
-						]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "GF40K_LaserSMG" or
-						defName = "GF40K_LaserGun" or
-						defName = "GF40K_LaserCarbine" or
-						defName = "GF40K_LaserSniper" or
-						defName = "GF40K_LaserSMGRelic" or
-						defName = "GF40K_LaserGunRelic" or
-						defName = "GF40K_LaserCarbineRelic" or
-						defName = "GF40K_LaserSniperRelic"
-						]/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>
-				</li>
-
-				<!-- === Remove VWE Overheating Gizmo === -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName = "GF40K_LaserPistol" or
-						defName = "GF40K_LaserSMG" or
-						defName = "GF40K_LaserPistolRelic" or
-						defName = "GF40K_LaserSMGRelic" or
-						defName = "GF40K_LaserGun" or
-						defName = "GF40K_LaserCarbine" or
-						defName = "GF40K_LaserSniper" or
-						defName = "GF40K_LaserGunRelic" or
-						defName = "GF40K_LaserCarbineRelic" or
-						defName = "GF40K_LaserSniperRelic"
-						]/comps/li[@Class="VanillaWeaponsExpandedLaser.CompProperties_LaserCapacitor"]</xpath>
-				</li>
-
-				<!-- === Las Pistol === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_LaserPistol</defName>
-					<statBases>
-						<Mass>2.20</Mass>
-						<Bulk>4.30</Bulk>
-						<SwayFactor>1.17</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.01</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Lasgun_Pistol</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>16</range>
-						<soundCast>GF40K_LaserPistolShot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_Lasgun_Pistol</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Relic Las Pistol === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_LaserPistolRelic</defName>
-					<statBases>
-						<Mass>2.20</Mass>
-						<Bulk>4.30</Bulk>
-						<SwayFactor>1.00</SwayFactor>
-						<ShotSpread>0.03</ShotSpread>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.01</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Lasgun_Pistol</defaultProjectile>
-						<warmupTime>0.45</warmupTime>
-						<range>16</range>
-						<soundCast>GF40K_LaserPistolShot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>3.8</reloadTime>
-						<ammoSet>AmmoSet_Lasgun_Pistol</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Laser SMG === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_LaserSMG</defName>
-					<statBases>
-						<Mass>4.2</Mass>
-						<Bulk>6.4</Bulk>
-						<SwayFactor>0.92</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>1.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.01</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Lasgun_Pistol</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>28</range>
-						<soundCast>GF40K_LaserPistolShot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<burstShotCount>5</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_Lasgun_Pistol</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- === Relic Laser SMG === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_LaserSMGRelic</defName>
-					<statBases>
-						<Mass>4</Mass>
-						<Bulk>6.1</Bulk>
-						<SwayFactor>0.87</SwayFactor>
-						<ShotSpread>0.025</ShotSpread>
-						<SightsEfficiency>1.4</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.01</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Lasgun_Pistol</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>28</range>
-						<burstShotCount>3</burstShotCount>
-						<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
-						<soundCast>GF40K_LaserPistolShot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>3.8</reloadTime>
-						<ammoSet>AmmoSet_Lasgun_Pistol</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<!-- === Las Rifle === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_LaserGun</defName>
-					<statBases>
-						<Mass>5.2</Mass>
-						<Bulk>9.5</Bulk>
-						<SwayFactor>1.35</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.01</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Lasgun_Rifle</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>62</range>
-						<soundCast>GF40K_LaserGunShot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>80</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_Lasgun_Rifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- === Relic Las Rifle === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_LaserGunRelic</defName>
-					<statBases>
-						<Mass>5</Mass>
-						<Bulk>9</Bulk>
-						<SwayFactor>1.30</SwayFactor>
-						<ShotSpread>0.03</ShotSpread>
-						<SightsEfficiency>1.4</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.01</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Lasgun_Rifle</defaultProjectile>
-						<warmupTime>0.95</warmupTime>
-						<range>62</range>
-						<soundCast>GF40K_LaserGunShot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>80</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_Lasgun_Rifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- === Las Carbine === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_LaserCarbine</defName>
-					<statBases>
-						<Mass>4.6</Mass>
-						<Bulk>8.8</Bulk>
-						<SwayFactor>1.25</SwayFactor>
-						<ShotSpread>0.065</ShotSpread>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.01</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Lasgun_Rifle</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>75</range>
-						<soundCast>GF40K_LaserPistolShot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>60</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_Lasgun_Rifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- === Relic Las Carbine === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_LaserCarbineRelic</defName>
-					<statBases>
-						<Mass>4.4</Mass>
-						<Bulk>8.2</Bulk>
-						<SwayFactor>1.20</SwayFactor>
-						<ShotSpread>0.04</ShotSpread>
-						<SightsEfficiency>1.4</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.01</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Lasgun_Rifle</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>75</range>
-						<soundCast>GF40K_LaserPistolShot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>60</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_Lasgun_Rifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-						<aiUseBurstMode>TRUE</aiUseBurstMode>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- === Las Sniper Rifle === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_LaserSniper</defName>
-					<statBases>
-						<Mass>8.5</Mass>
-						<Bulk>12</Bulk>
-						<SwayFactor>1.19</SwayFactor>
-						<ShotSpread>0.025</ShotSpread>
-						<SightsEfficiency>2.48</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
-						<NightVisionEfficiency_Weapon>0.55</NightVisionEfficiency_Weapon>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.01</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Lasgun_HellGun</defaultProjectile>
-						<warmupTime>1.7</warmupTime>
-						<range>81</range>
-						<soundCast>GF40K_LaserSniperShot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_Lasgun_HellGun</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- === Relic Las Sniper Rifle === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_LaserSniperRelic</defName>
-					<statBases>
-						<Mass>8.12</Mass>
-						<Bulk>11.25</Bulk>
-						<SwayFactor>1.10</SwayFactor>
-						<ShotSpread>0.01</ShotSpread>
-						<SightsEfficiency>3.1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.50</RangedWeapon_Cooldown>
-						<NightVisionEfficiency_Weapon>0.7</NightVisionEfficiency_Weapon>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.01</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Lasgun_HellGun</defaultProjectile>
-						<warmupTime>1.5</warmupTime>
-						<range>81</range>
-						<soundCast>GF40K_LaserSniperShot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>3.9</reloadTime>
-						<ammoSet>AmmoSet_Lasgun_HellGun</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_Meltagun.xml b/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_Meltagun.xml
deleted file mode 100644
index 420cc72620..0000000000
--- a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_Meltagun.xml	
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Warhammer 40.000: Imperium Weaponry</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "GF40K_Hellgun" or
-						defName = "GF40K_HellgunRelic"
-						]/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>
-				</li>
-
-				<!-- === Remove VWE Overheating Gizmo === -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName = "GF40K_Hellgun" or
-						defName = "GF40K_HellgunRelic"
-						]/comps/li[@Class="VanillaWeaponsExpandedLaser.CompProperties_LaserCapacitor"]</xpath>
-				</li>
-
-				<!-- === Hellgun === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_LaserGun</defName>
-					<statBases>
-						<Mass>5.75</Mass>
-						<Bulk>10.15</Bulk>
-						<SwayFactor>1.35</SwayFactor>
-						<ShotSpread>0.04</ShotSpread>
-						<SightsEfficiency>1.2</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.01</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Lasgun_HellGun</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>66</range>
-						<soundCast>GF40K_LaserGunShot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>60</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_Lasgun_HellGun</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- === Relic Hellgun === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_HellgunRelic</defName>
-					<statBases>
-						<Mass>5.15</Mass>
-						<Bulk>9.85</Bulk>
-						<SwayFactor>1.15</SwayFactor>
-						<ShotSpread>0.02</ShotSpread>
-						<SightsEfficiency>1.5</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.01</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_Lasgun_HellGun</defaultProjectile>
-						<warmupTime>0.95</warmupTime>
-						<range>70</range>
-						<soundCast>GF40K_LaserGunShot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>11</muzzleFlashScale>
-						<burstShotCount>6</burstShotCount>
-						<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>60</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_Lasgun_HellGun</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_PlasmaWeapons.xml b/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_PlasmaWeapons.xml
deleted file mode 100644
index 9528b32cca..0000000000
--- a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_PlasmaWeapons.xml	
+++ /dev/null
@@ -1,233 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Warhammer 40.000: Imperium Weaponry</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "GF40K_PlasmaPistol" or
-						defName = "GF40K_PlasmaPistolRelic"
-						]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "GF40K_PlasmaGun" or
-						defName = "GF40K_PlasmaGunRelic"
-						]/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>
-				</li>
-
-				<!-- === Remove VE Laser components === -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[
-						defName = "GF40K_PlasmaPistolRelic" or
-						defName = "GF40K_PlasmaGunRelic"
-						]/comps/li[@Class="VanillaWeaponsExpandedLaser.CompProperties_LaserCapacitor"]</xpath>
-				</li>
-
-				<!-- === Plasma Pistol === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_PlasmaPistol</defName>
-					<statBases>
-						<Mass>2.5</Mass>
-						<Bulk>5.0</Bulk>
-						<SwayFactor>1.17</SwayFactor>
-						<ShotSpread>0.15</ShotSpread>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_PlasmaPistol</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>16</range>
-						<soundCast>GF40K_LaserPistolShot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_PlasmaCanister_Pistol</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Relic Plasma Pistol === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_PlasmaPistolRelic</defName>
-					<statBases>
-						<Mass>2.5</Mass>
-						<Bulk>5.0</Bulk>
-						<SwayFactor>1.00</SwayFactor>
-						<ShotSpread>0.05</ShotSpread>
-						<SightsEfficiency>1.0</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.3</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_PlasmaPistol_Relic</defaultProjectile>
-						<warmupTime>0.45</warmupTime>
-						<range>18</range>
-						<soundCast>GF40K_LaserPistolShot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>3.8</reloadTime>
-						<ammoSet>AmmoSet_PlasmaCanister_Pistol_Relic</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Plasma Gun === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_PlasmaGun</defName>
-					<statBases>
-						<Mass>6.50</Mass>
-						<Bulk>8.00</Bulk>
-						<SwayFactor>1.35</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.65</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_PlasmaRifle</defaultProjectile>
-						<warmupTime>1</warmupTime>
-						<range>55</range>
-						<soundCast>GF40K_LaserPistolShot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_PlasmaCanister_Rifle</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<!-- === Relic Plasma Gun === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_PlasmaGunRelic</defName>
-					<statBases>
-						<Mass>6.50</Mass>
-						<Bulk>8.00</Bulk>
-						<SwayFactor>1.30</SwayFactor>
-						<ShotSpread>0.02</ShotSpread>
-						<SightsEfficiency>1.4</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.4</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_PlasmaRifle_Relic</defaultProjectile>
-						<warmupTime>0.95</warmupTime>
-						<range>58</range>
-						<soundCast>GF40K_LaserPistolShot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_PlasmaCanister_Rifle_Relic</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_StubberWeapons.xml b/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_StubberWeapons.xml
deleted file mode 100644
index 49e2453c6e..0000000000
--- a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_StubberWeapons.xml	
+++ /dev/null
@@ -1,282 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Warhammer 40.000: Imperium Weaponry</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "GF40K_StubShotgun" or
-						defName = "GF40K_StubCarbine" or
-						defName = "GF40K_StubPistol" or
-						defName = "GF40K_StubSniper"
-						]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "GF40K_StubHMG"]/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>
-				</li>
-
-				<!-- === Stub Shotgun === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_StubShotgun</defName>
-					<statBases>
-						<Mass>5.5</Mass>
-						<Bulk>7</Bulk>
-						<SwayFactor>1.25</SwayFactor>
-						<ShotSpread>0.15</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-					</statBases>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_23x75mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_StubShotgun"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.75</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>True</hasStandardCommand>
-								<defaultProjectile>Bullet_23x75mmR_Buck</defaultProjectile>
-								<warmupTime>0.5</warmupTime>
-								<range>16</range>
-								<ticksBetweenBurstShots>14</ticksBetweenBurstShots>
-								<soundCast>Shot_Shotgun</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- === Stub HMG === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_StubHMG</defName>
-					<statBases>
-						<Mass>8.50</Mass>
-						<Bulk>12.5</Bulk>
-						<SwayFactor>1.35</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.55</RangedWeapon_Cooldown>
-					</statBases>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>SuppressFire</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_StubHMG"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.4</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>True</hasStandardCommand>
-								<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-								<warmupTime>1.2</warmupTime>
-								<range>62</range>
-								<burstShotCount>10</burstShotCount>
-								<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
-								<soundCast>HeavyMG</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- === Stub Carbine === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_StubCarbine</defName>
-					<statBases>
-						<Mass>4.21</Mass>
-						<Bulk>9.6</Bulk>
-						<SwayFactor>1.30</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_StubCarbine"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.5</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>True</hasStandardCommand>
-								<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-								<warmupTime>1.05</warmupTime>
-								<range>55</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-								<soundCast>Shot_Shotgun_NoRack</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- === Stub Sniper === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_StubSniper</defName>
-					<statBases>
-						<Mass>8.20</Mass>
-						<Bulk>12.00</Bulk>
-						<SwayFactor>1.34</SwayFactor>
-						<ShotSpread>0.04</ShotSpread>
-						<SightsEfficiency>2.6</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
-					</statBases>
-					<AmmoUser>
-						<magazineSize>10</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_StubSniper"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.4</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>True</hasStandardCommand>
-								<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-								<warmupTime>1.7</warmupTime>
-								<range>75</range>
-								<soundCast>Shot_SniperRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- === Stub Pistol === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_StubPistol</defName>
-					<statBases>
-						<Mass>1.20</Mass>
-						<Bulk>2.50</Bulk>
-						<SwayFactor>1.05</SwayFactor>
-						<ShotSpread>0.15</ShotSpread>
-						<SightsEfficiency>0.7</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
-					</statBases>
-					<AmmoUser>
-						<magazineSize>9</magazineSize>
-						<reloadTime>3.5</reloadTime>
-						<ammoSet>AmmoSet_50AE</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_StubPistol"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.7</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>True</hasStandardCommand>
-								<defaultProjectile>Bullet_50AE_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>15</range>
-								<soundCast>Shot_Shotgun_NoRack</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_StubberWeapons_Relic.xml b/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_StubberWeapons_Relic.xml
deleted file mode 100644
index 718df40020..0000000000
--- a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_StubberWeapons_Relic.xml	
+++ /dev/null
@@ -1,265 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Warhammer 40.000: Imperium Weaponry</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[
-						defName = "GF40K_RelicStubShotgun" or
-						defName = "GF40K_RelicStubHMG" or
-						defName = "GF40K_RelicStubCarbine" or
-						defName = "GF40K_RelicStubPistol" or
-						defName = "GF40K_RelicStubSniper"
-						]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>11</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- === Stub Shotgun === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_RelicStubShotgun</defName>
-					<statBases>
-						<Mass>5.5</Mass>
-						<Bulk>7</Bulk>
-						<SwayFactor>1.20</SwayFactor>
-						<ShotSpread>0.12</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-					</statBases>
-					<AmmoUser>
-						<magazineSize>8</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_23x75mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_RelicStubShotgun"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>2.4</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>True</hasStandardCommand>
-								<defaultProjectile>Bullet_23x75mmR_Buck</defaultProjectile>
-								<warmupTime>0.4</warmupTime>
-								<range>16</range>
-								<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-								<soundCast>Shot_Shotgun_NoRack</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- === Stub HMG === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_RelicStubHMG</defName>
-					<statBases>
-						<Mass>8.50</Mass>
-						<Bulk>12.5</Bulk>
-						<SwayFactor>1.30</SwayFactor>
-						<ShotSpread>0.05</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
-					</statBases>
-					<AmmoUser>
-						<magazineSize>50</magazineSize>
-						<reloadTime>5</reloadTime>
-						<ammoSet>AmmoSet_50BMG</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>5</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_RelicStubHMG"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.3</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>True</hasStandardCommand>
-								<defaultProjectile>Bullet_50BMG_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>65</range>
-								<burstShotCount>10</burstShotCount>
-								<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-								<soundCast>Shot_CE_BattleRifle</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- === Stub Carbine === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_RelicStubCarbine</defName>
-					<statBases>
-						<Mass>4.21</Mass>
-						<Bulk>11.2</Bulk>
-						<SwayFactor>1.22</SwayFactor>
-						<ShotSpread>0.04</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.32</RangedWeapon_Cooldown>
-					</statBases>
-					<AmmoUser>
-						<magazineSize>30</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>3</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_RelicStubCarbine"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.4</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>True</hasStandardCommand>
-								<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-								<warmupTime>1</warmupTime>
-								<range>65</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-								<soundCast>Shot_AssaultRifle</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- === Stub Sniper === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_RelicStubSniper</defName>
-					<statBases>
-						<Mass>8.20</Mass>
-						<Bulk>12.00</Bulk>
-						<SwayFactor>1.11</SwayFactor>
-						<ShotSpread>0.02</ShotSpread>
-						<SightsEfficiency>3.2</SightsEfficiency>
-						<RangedWeapon_Cooldown>1.25</RangedWeapon_Cooldown>
-					</statBases>
-					<AmmoUser>
-						<magazineSize>5</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_762x54mmR</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_RelicStubSniper"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.1</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>True</hasStandardCommand>
-								<defaultProjectile>Bullet_762x54mmR_FMJ</defaultProjectile>
-								<warmupTime>1.6</warmupTime>
-								<range>82</range>
-								<soundCast>Shot_SniperRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<!-- === Stub Pistol === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_RelicStubPistol</defName>
-					<statBases>
-						<Mass>1.20</Mass>
-						<Bulk>2.50</Bulk>
-						<SwayFactor>1.02</SwayFactor>
-						<ShotSpread>0.12</ShotSpread>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<AmmoUser>
-						<magazineSize>9</magazineSize>
-						<reloadTime>3</reloadTime>
-						<ammoSet>AmmoSet_50AE</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiUseBurstMode>FALSE</aiUseBurstMode>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_RelicStubPistol"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<recoilAmount>1.4</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>True</hasStandardCommand>
-								<defaultProjectile>Bullet_50AE_FMJ</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>16</range>
-								<soundCast>Shot_Shotgun_NoRack</soundCast>
-								<soundCastTail>GunTail_Light</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_Tox_Relic.xml b/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_Tox_Relic.xml
deleted file mode 100644
index 3801709036..0000000000
--- a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_Tox_Relic.xml	
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Warhammer 40.000: Imperium Weaponry</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- === Tools === -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_PhosphorPistolRelic" or defName="GF40K_RelicRadiumPistol"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>grip</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<chanceFactor>1.5</chanceFactor>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>muzzle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.54</cooldownTime>
-								<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GF40K_RelicRadiumCarbine"]/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>
-				</li>
-
-				<!-- === Remove VWE: Laser Components === -->
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName = "GF40K_PhosphorPistolRelic"]/comps/li[@Class="VanillaWeaponsExpandedLaser.CompProperties_LaserCapacitor"]</xpath>
-				</li>
-
-				<!-- === Phosphor Pistol === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_PhosphorPistolRelic</defName>
-					<statBases>
-						<Bulk>2.5</Bulk>
-						<SwayFactor>1.25</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_30x64mmFuel_Incendiary</defaultProjectile>
-						<warmupTime>0.95</warmupTime>
-						<range>28</range>
-						<soundCast>GF40K_LaserPistolShot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>7</magazineSize>
-						<reloadTime>5.2</reloadTime>
-						<ammoSet>AmmoSet_30x64mmFuel</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Radium Pistol === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_RelicRadiumPistol</defName>
-					<statBases>
-						<Mass>1.25</Mass>
-						<Bulk>2.5</Bulk>
-						<SwayFactor>1.25</SwayFactor>
-						<ShotSpread>0.06</ShotSpread>
-						<SightsEfficiency>0.8</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>2.5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_RadiumPistol_Tox</defaultProjectile>
-						<warmupTime>0.5</warmupTime>
-						<range>18</range>
-						<soundCast>Shot_ChargeRifle</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>15</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_Radium_Pistol</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>Snapshot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_OneHandedWeapon</li>
-					</weaponTags>
-				</li>
-
-				<!-- === Radium Carbine === -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>GF40K_RelicRadiumCarbine</defName>
-					<statBases>
-						<Mass>5.0</Mass>
-						<Bulk>10.00</Bulk>
-						<SwayFactor>1.5</SwayFactor>
-						<ShotSpread>0.05</ShotSpread>
-						<SightsEfficiency>1.10</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-					</statBases>
-					<Properties>
-						<recoilAmount>1.7</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>True</hasStandardCommand>
-						<defaultProjectile>Bullet_RadiumCarbine_Tox</defaultProjectile>
-						<warmupTime>1.0</warmupTime>
-						<range>62</range>
-						<burstShotCount>4</burstShotCount>
-						<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-						<soundCast>GF40K_LaserPistolShot</soundCast>
-						<soundCastTail>GunTail_Light</soundCastTail>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4</reloadTime>
-						<ammoSet>AmmoSet_Radium_Carbine</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aiAimMode>AimedShot</aiAimMode>
-						<aiUseBurstMode>True</aiUseBurstMode>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-					</FireModes>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Warhammer 40k - Genes and Psycasts/Abilities_SpaceMarine.xml b/Patches/Warhammer 40k - Genes and Psycasts/Abilities_SpaceMarine.xml
deleted file mode 100644
index ad2db570fa..0000000000
--- a/Patches/Warhammer 40k - Genes and Psycasts/Abilities_SpaceMarine.xml	
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Warhammer 40k - Genes and Psycasts</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ============== Betcher's Spit ================ -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AbilityDef[defName="BEWH_BetchersSpit"]/verbProperties/range</xpath>
-					<value>
-						<range>32</range>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="BEWH_SpitProjectile"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<damageDef>AcidBurn</damageDef>
-							<speed>48</speed>
-							<damageAmountBase>18</damageAmountBase>
-							<armorPenetrationBlunt>8</armorPenetrationBlunt>
-							<shadowSize>0</shadowSize>
-							<filth>Filth_SpentAcid</filth>
-							<filthCount>1</filthCount>
-							<arcHeightFactor>0.4</arcHeightFactor>
-						</projectile>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Warhammer 40k - Genes and Psycasts/GeneDefs.xml b/Patches/Warhammer 40k - Genes and Psycasts/GeneDefs.xml
deleted file mode 100644
index eb99f9d427..0000000000
--- a/Patches/Warhammer 40k - Genes and Psycasts/GeneDefs.xml	
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Warhammer 40k - Genes and Psycasts</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Progenoid Glands -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/GeneDef[defName="BEWH_ProgenoidGlands"]</xpath>
-					<value>
-						<statOffsets>
-							<SmokeSensitivity>-1</SmokeSensitivity>
-						</statOffsets>
-					</value>
-				</li>
-
-				<!-- Multi-Lung -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/GeneDef[defName="BEWH_MultiLung"]/statOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<!-- Occulobe -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/GeneDef[defName="BEWH_Occulobe"]</xpath>
-					<value>
-						<statOffsets>
-							<NightVisionEfficiency>0.8</NightVisionEfficiency>
-						</statOffsets>
-					</value>
-				</li>
-
-				<!-- Ossmodula -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/GeneDef[defName="BEWH_Ossmodula"]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>6</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/GeneDef[defName="BEWH_Ossmodula"]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- Biscopea -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/GeneDef[defName="BEWH_Biscopea"]/statOffsets/CarryingCapacity</xpath>
-					<value>
-						<CarryWeight>100</CarryWeight>
-					</value>
-				</li>
-
-				<!-- Sinew Coil -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/GeneDef[defName="BEWH_SinewCoil"]/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<CarryWeight>100</CarryWeight>
-						</statOffsets>
-					</value>
-				</li>
-
-				<!-- Custodes -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/GeneDef[defName="BEWH_Custodes"]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>24.5</ArmorRating_Blunt>
-						<NightVisionEfficiency>0.8</NightVisionEfficiency>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/GeneDef[defName="BEWH_Custodes"]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>8</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/GeneDef[defName="BEWH_Custodes"]/statOffsets/CarryingCapacity</xpath>
-					<value>
-						<CarryWeight>200</CarryWeight>
-					</value>
-				</li>
-
-				<!-- Primarch -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/GeneDef[defName="BEWH_Primarch"]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>33.75</ArmorRating_Blunt>
-						<NightVisionEfficiency>0.8</NightVisionEfficiency>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/GeneDef[defName="BEWH_Primarch"]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>11</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/GeneDef[defName="BEWH_Primarch"]/statOffsets/CarryingCapacity</xpath>
-					<value>
-						<CarryWeight>250</CarryWeight>
-					</value>
-				</li>
-
-				<!-- Mark of Nurgle -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/GeneDef[defName="BEWH_NurgleMark"]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/GeneDef[defName="BEWH_NurgleMark"]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- Mark of Chaos -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/GeneDef[defName="BEWH_UndividedMark"]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/GeneDef[defName="BEWH_UndividedMark"]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- Daemon Hide -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/GeneDef[defName="BEWH_DaemonHide"]/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>17</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/GeneDef[defName="BEWH_DaemonHide"]/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>4.5</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<!-- Daemon Wings -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/GeneDef[defName="BEWH_DaemonWings"]/statOffsets</xpath>
-					<value>
-						<statOffsets>
-							<CarryWeight>100</CarryWeight>
-						</statOffsets>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Warhammer 40k - Genes and Psycasts/Hediffs_Attacks.xml b/Patches/Warhammer 40k - Genes and Psycasts/Hediffs_Attacks.xml
deleted file mode 100644
index 8232cb31b1..0000000000
--- a/Patches/Warhammer 40k - Genes and Psycasts/Hediffs_Attacks.xml	
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Warhammer 40k - Genes and Psycasts</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Daemonic Melee Attacks -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BEWH_DaemonicHornAttack"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>daemonic horns</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>18</power>
-								<cooldownTime>0.82</cooldownTime>
-								<armorPenetrationSharp>8</armorPenetrationSharp>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BEWH_DaemonicTailAttack"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>daemonic tail</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<cooldownTime>0.76</cooldownTime>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Warhammer 40k - Genes and Psycasts/PawnKinds.xml b/Patches/Warhammer 40k - Genes and Psycasts/PawnKinds.xml
deleted file mode 100644
index 606e5057ed..0000000000
--- a/Patches/Warhammer 40k - Genes and Psycasts/PawnKinds.xml	
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Warhammer 40k - Genes and Psycasts</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Chaos Cultist & Imperial Trader -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="ChaosCultistBasePawn" or defName="BEWH_ImperiumTrader"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- Chaos Cultist -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="ChaosCultistBasePawn"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>4</min>
-								<max>6</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- Daemon Prince -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="DaemonPrincePawnBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>12</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<!-- Space Marines -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="ChaosMarineBasePawn" or @Name="SpaceMarineBasePawn"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>6</min>
-								<max>10</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Warhammer 40k - Genes and Psycasts/TraderKinds.xml b/Patches/Warhammer 40k - Genes and Psycasts/TraderKinds.xml
deleted file mode 100644
index c3c09f2d06..0000000000
--- a/Patches/Warhammer 40k - Genes and Psycasts/TraderKinds.xml	
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Warhammer 40k - Genes and Psycasts</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Imperial Base ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="BEWH_ImperiumTraderBase"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>FSX</thingDef>
-							<countRange>
-								<min>25</min>
-								<max>100</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_SingleDef">
-							<thingDef>Prometheum</thingDef>
-							<countRange>
-								<min>25</min>
-								<max>100</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Ammo</tradeTag>
-							<countRange>
-								<min>500</min>
-								<max>2000</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>5</min>
-								<max>9</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_MediumAmmo</tradeTag>
-							<countRange>
-								<min>30</min>
-								<max>100</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>5</min>
-								<max>8</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_HeavyAmmo</tradeTag>
-							<countRange>
-								<min>10</min>
-								<max>50</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>4</min>
-								<max>6</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Category">
-							<categoryDef>Ammo</categoryDef>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>0</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Turret</tradeTag>
-							<thingDefCountRange>
-								<min>-2</min>
-								<max>4</max>
-							</thingDefCountRange>
-							<countRange>
-								<min>1</min>
-								<max>2</max>
-							</countRange>
-						</li>
-						<li Class="StockGenerator_Category">
-							<categoryDef>WeaponsTurrets</categoryDef>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>0</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Animals">
-							<tradeTagsSell>
-								<li>CE_AnimalBoom</li>
-							</tradeTagsSell>
-							<tradeTagsBuy>
-								<li>CE_AnimalBoom</li>
-							</tradeTagsBuy>
-							<kindCountRange>
-								<min>1</min>
-								<max>2</max>
-							</kindCountRange>
-							<countRange>
-								<min>-2</min>
-								<max>4</max>
-							</countRange>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Imperial Caravan ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/TraderKindDef[defName="BEWH_ImperiumTraderCaravan"]/stockGenerators</xpath>
-					<value>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_Ammo</tradeTag>
-							<countRange>
-								<min>200</min>
-								<max>400</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>1</min>
-								<max>4</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_MediumAmmo</tradeTag>
-							<countRange>
-								<min>20</min>
-								<max>40</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>2</min>
-								<max>6</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Tag">
-							<tradeTag>CE_HeavyAmmo</tradeTag>
-							<countRange>
-								<min>5</min>
-								<max>10</max>
-							</countRange>
-							<thingDefCountRange>
-								<min>2</min>
-								<max>4</max>
-							</thingDefCountRange>
-						</li>
-						<li Class="StockGenerator_Category">
-							<categoryDef>Ammo</categoryDef>
-							<thingDefCountRange>
-								<min>0</min>
-								<max>0</max>
-							</thingDefCountRange>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Waster Toxic Breather/WasterBreather.xml b/Patches/Waster Toxic Breather/WasterBreather.xml
deleted file mode 100644
index 2a7b359471..0000000000
--- a/Patches/Waster Toxic Breather/WasterBreather.xml	
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Wasters Toxic Breather</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Gas Mask  -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WTM_ToxicBreather"]/statBases</xpath>
-					<value>
-						<statBases>
-							<WorkToMake>8000</WorkToMake>
-							<MaxHitPoints>100</MaxHitPoints>
-							<Mass>0.5</Mass>
-							<Bulk>3</Bulk>
-							<WornBulk>1</WornBulk>
-							<EquipDelay>0.5</EquipDelay>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="WTM_ToxicBreather"]/equippedStatOffsets</xpath>
-					<value>
-						<SmokeSensitivity>-1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="WTM_ToxicBreather"]</xpath>
-					<value>
-						<li Class="CombatExtended.ApparelHediffExtension">
-							<hediff>WearingGasMask</hediff>
-						</li>
-						<li Class="CombatExtended.ApperalRenderingExtension">
-							<HideHair>false</HideHair>
-							<HideBeard>true</HideBeard>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WTM_ToxicBreather"]/apparel/hatRenderedFrontOfFace</xpath>
-					<value>
-						<hatRenderedFrontOfFace>false</hatRenderedFrontOfFace>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="WTM_ToxicBreather"]/apparel/layers</xpath>
-					<value>
-						<layers>
-							<li>StrappedHead</li>
-						</layers>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Weapons+/WeaponsPlus_MeleeWeapons.xml b/Patches/Weapons+/WeaponsPlus_MeleeWeapons.xml
deleted file mode 100644
index 063f74d085..0000000000
--- a/Patches/Weapons+/WeaponsPlus_MeleeWeapons.xml
+++ /dev/null
@@ -1,1042 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Weapons+</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Great Axe -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Great_Axe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>3</cooldownTime>
-								<armorPenetrationBlunt>2.813</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>42</power>
-								<cooldownTime>1.89</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>11.250</armorPenetrationBlunt>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Great_Axe"]/statBases</xpath>
-					<value>
-						<Bulk>11</Bulk>
-						<MeleeCounterParryBonus>0.36</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Great_Axe"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.05</MeleeCritChance>
-							<MeleeParryChance>0.48</MeleeParryChance>
-							<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Flail -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Flail"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>19</power>
-								<cooldownTime>0.79</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Flail"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Flail"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Flail"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- Nunchaku -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Nunchaku"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>0.72</cooldownTime>
-								<chanceFactor>1.165</chanceFactor>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Nunchaku"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Nunchaku"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.13</MeleeCritChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Maul -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Maul"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>34</power>
-								<cooldownTime>2.01</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Maul"]/statBases</xpath>
-					<value>
-						<Bulk>16</Bulk>
-						<MeleeCounterParryBonus>0.28</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Maul"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>1.6</MeleeCritChance>
-							<MeleeParryChance>0.38</MeleeParryChance>
-							<MeleeDodgeChance>0.3</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Morning Star -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Morning_Star"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetrationBlunt>0.650</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>15</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetrationBlunt>5.850</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Morning_Star"]/statBases</xpath>
-					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.23</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Morning_Star"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.43</MeleeCritChance>
-							<MeleeParryChance>0.23</MeleeParryChance>
-							<MeleeDodgeChance>0.2</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Morning_Star"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-				<!-- Primitive Knife -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Primitive_Knife"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.23</cooldownTime>
-								<armorPenetrationBlunt>0.225</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>0.95</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.380</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.04</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>0.77</cooldownTime>
-								<armorPenetrationBlunt>0.576</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Primitive_Knife"]/statBases</xpath>
-					<value>
-						<Bulk>1.2</Bulk>
-						<MeleeCounterParryBonus>0.11</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Primitive_Knife"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.56</MeleeCritChance>
-							<MeleeParryChance>0.11</MeleeParryChance>
-							<MeleeDodgeChance>0.03</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Primitive_Knife"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_Sidearm_Tribal</li>
-					</value>
-				</li>
-
-				<!-- Kukri -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Kukri"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.32</cooldownTime>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>0.83</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.768</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.35</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.32</cooldownTime>
-								<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.06</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Kukri"]/statBases</xpath>
-					<value>
-						<Bulk>1.8</Bulk>
-						<MeleeCounterParryBonus>0.25</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Kukri"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.21</MeleeCritChance>
-							<MeleeParryChance>0.25</MeleeParryChance>
-							<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Kukri"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_Sidearm_Melee</li>
-					</value>
-				</li>
-
-				<!-- Bardiche -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Bardiche"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>8</power>
-								<cooldownTime>1.23</cooldownTime>
-								<armorPenetrationBlunt>2.588</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>42</power>
-								<cooldownTime>1.85</cooldownTime>
-								<armorPenetrationBlunt>1.150</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.15</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>48</power>
-								<cooldownTime>2.22</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>7.188</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.44</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Bardiche"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<MeleeCounterParryBonus>0.61</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Bardiche"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.17</MeleeCritChance>
-							<MeleeParryChance>0.7</MeleeParryChance>
-							<MeleeDodgeChance>0.43</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Glaive -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="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>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Glaive"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>0.89</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Glaive"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.22</MeleeCritChance>
-							<MeleeParryChance>1.33</MeleeParryChance>
-							<MeleeDodgeChance>0.57</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Glaive"]</xpath>
-					<value>
-						<li Class="CombatExtended.GunDrawExtension">
-							<DrawSize>1.7,1.7</DrawSize>
-							<DrawOffset>0.3,0.4</DrawOffset>
-						</li>
-					</value>
-				</li>
-
-				<!-- Bo Staff -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Bo_Staff"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>0.5</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>end</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.63</cooldownTime>
-								<armorPenetrationBlunt>0.7</armorPenetrationBlunt>
-								<!-- <linkedBodyPartsGroup>End</linkedBodyPartsGroup> -->
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Bo_Staff"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<MeleeCounterParryBonus>1.38</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Bo_Staff"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.7</MeleeCritChance>
-							<MeleeParryChance>1.43</MeleeParryChance>
-							<MeleeDodgeChance>0.57</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Scythe -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Scythe"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.78</cooldownTime>
-								<armorPenetrationBlunt>1</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>29</power>
-								<cooldownTime>3.57</cooldownTime>
-								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>3.57</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.5</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Scythe"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<MeleeCounterParryBonus>0.33</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<!-- *** Replace instead of Add *** -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Scythe"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>0.5</MeleeParryChance>
-							<PlantHarvestYield>0.1</PlantHarvestYield>
-							<PlantWorkSpeed>0.1</PlantWorkSpeed>
-							<MeleeDodgeChance>0.23</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Naginata -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Naginata"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>shaft</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>1.14</cooldownTime>
-								<armorPenetrationBlunt>1.913</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>49</power>
-								<cooldownTime>1.71</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>7.650</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.7</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>1.07</cooldownTime>
-								<armorPenetrationBlunt>2.176</armorPenetrationBlunt>
-								<armorPenetrationSharp>2.42</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Naginata"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>1.13</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Naginata"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.24</MeleeCritChance>
-							<MeleeParryChance>1.18</MeleeParryChance>
-							<MeleeDodgeChance>0.57</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Brass Knuckles -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Brass_Knuckles"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>knuckles</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.46</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.450</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Brass_Knuckles"]/statBases</xpath>
-					<value>
-						<Bulk>1.2</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Brass_Knuckles"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.13</MeleeCritChance>
-							<MeleeParryChance>0.13</MeleeParryChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Brass_Knuckles"]/weaponTags</xpath>
-					<value>
-						<li>CE_Sidearm_Melee</li>
-					</value>
-				</li>
-
-				<!-- Tonfa -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Tonfa"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>end</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.6</cooldownTime>
-								<armorPenetrationBlunt>0.650</armorPenetrationBlunt>
-								<!-- <linkedBodyPartsGroup>End</linkedBodyPartsGroup> -->
-								<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>side</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.6</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.650</armorPenetrationBlunt>
-								<!-- <linkedBodyPartsGroup>Side</linkedBodyPartsGroup> -->
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Tonfa"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>0.02</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Tonfa"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.43</MeleeCritChance>
-							<MeleeParryChance>0.19</MeleeParryChance>
-							<MeleeDodgeChance>0.05</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Katana -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Katana"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>1.66</cooldownTime>
-								<armorPenetrationBlunt>0.750</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>1.66</cooldownTime>
-								<chanceFactor>1.165</chanceFactor>
-								<armorPenetrationBlunt>0.750</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.84</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>43</power>
-								<cooldownTime>0.66</cooldownTime>
-								<chanceFactor>1.165</chanceFactor>
-								<armorPenetrationBlunt>4.688</armorPenetrationBlunt>
-								<armorPenetrationSharp>1.05</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Katana"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<MeleeCounterParryBonus>0.71</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<!-- Changing Mass since it's a 2h weapon now -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Katana"]/statBases/Mass</xpath>
-					<value>
-						<Mass>1.5</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Katana"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.27</MeleeCritChance>
-							<MeleeParryChance>0.53</MeleeParryChance>
-							<MeleeDodgeChance>0.27</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Claymore -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Claymore"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>1.89</cooldownTime>
-								<armorPenetrationBlunt>1.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>40</power>
-								<cooldownTime>1.89</cooldownTime>
-								<chanceFactor>1.165</chanceFactor>
-								<armorPenetrationBlunt>1.250</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.7</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>54</power>
-								<cooldownTime>0.86</cooldownTime>
-								<chanceFactor>1.165</chanceFactor>
-								<armorPenetrationBlunt>6.05</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.68</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Claymore"]/statBases</xpath>
-					<value>
-						<Bulk>10</Bulk>
-						<MeleeCounterParryBonus>0.69</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Claymore"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.13</MeleeCritChance>
-							<MeleeParryChance>0.52</MeleeParryChance>
-							<MeleeDodgeChance>0.43</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Zweihander -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Zweihander"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2.01</cooldownTime>
-								<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>60</power>
-								<cooldownTime>2.01</cooldownTime>
-								<chanceFactor>1.165</chanceFactor>
-								<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.89</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>61</power>
-								<cooldownTime>1</cooldownTime>
-								<chanceFactor>1.165</chanceFactor>
-								<armorPenetrationBlunt>6.4</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.72</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Zweihander"]/statBases</xpath>
-					<value>
-						<Bulk>12</Bulk>
-						<MeleeCounterParryBonus>0.83</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Zweihander"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.8</MeleeCritChance>
-							<MeleeParryChance>0.63</MeleeParryChance>
-							<MeleeDodgeChance>0.67</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<!-- Sabre -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Sabre"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1.42</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>23</power>
-								<cooldownTime>1.42</cooldownTime>
-								<chanceFactor>1.165</chanceFactor>
-								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>0.89</cooldownTime>
-								<chanceFactor>1.165</chanceFactor>
-								<armorPenetrationBlunt>1.024</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.46</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Sabre"]/statBases</xpath>
-					<value>
-						<Bulk>3</Bulk>
-						<MeleeCounterParryBonus>0.53</MeleeCounterParryBonus>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Sabre"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.31</MeleeCritChance>
-							<MeleeParryChance>0.53</MeleeParryChance>
-							<MeleeDodgeChance>0.28</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MeleeWeapon_Sabre"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Weapons+/WeaponsPlus_Projectiles.xml b/Patches/Weapons+/WeaponsPlus_Projectiles.xml
deleted file mode 100644
index 6e12a8a763..0000000000
--- a/Patches/Weapons+/WeaponsPlus_Projectiles.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Weapons+</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Kunai_Thrown -->
-				<li Class="PatchOperationAttributeAdd">
-					<xpath>Defs/ThingDef[defName="Kunai_Thrown"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Kunai_Thrown"]/projectile</xpath>
-					<value>
-						<projectile Class="CombatExtended.ProjectilePropertiesCE">
-							<damageDef>Stab</damageDef>
-							<damageAmountBase>10</damageAmountBase>
-							<speed>12</speed>
-							<armorPenetrationSharp>0.5</armorPenetrationSharp>
-							<armorPenetrationBlunt>2</armorPenetrationBlunt>
-							<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
-							<preExplosionSpawnThingDef>RangedWeapon_Kunai</preExplosionSpawnThingDef>
-						</projectile>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Weapons+/WeaponsPlus_RangedWeapons.xml b/Patches/Weapons+/WeaponsPlus_RangedWeapons.xml
deleted file mode 100644
index 86df8a3dfb..0000000000
--- a/Patches/Weapons+/WeaponsPlus_RangedWeapons.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Weapons+</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAttributeAdd">
-					<xpath>Defs/ThingDef[defName="RangedWeapon_Kunai"]</xpath>
-					<attribute>Class</attribute>
-					<value>CombatExtended.AmmoDef</value>
-				</li>
-
-				<li Class="PatchOperationAttributeSet">
-					<xpath>Defs/ThingDef[defName="RangedWeapon_Kunai"]</xpath>
-					<attribute>ParentName</attribute>
-					<value>BaseWeaponAndAmmoNeolithic</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RangedWeapon_Kunai"]/graphicData</xpath>
-					<value>
-						<graphicData>
-							<texPath>Things/Ammo/Neolithic/Kunai</texPath>
-							<graphicClass>Graphic_StackCount</graphicClass>
-							<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
-						</graphicData>
-					</value>
-				</li>
-
-				<!-- Kunai is made of stuff, we remove that and just give a steel cost per kunai. -->
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="RangedWeapon_Kunai"]/costStuffCount|Defs/ThingDef[defName="RangedWeapon_Kunai"]/stuffCategories</xpath>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RangedWeapon_Kunai"]</xpath>
-					<value>
-						<costList>
-							<Steel>3</Steel>
-						</costList>
-						<stackLimit>75</stackLimit>
-						<tradeTags>
-							<li>CE_AutoEnableTrade</li>
-						</tradeTags>
-						<ammoClass>Kunai</ammoClass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RangedWeapon_Kunai"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>1.26</cooldownTime>
-								<chanceFactor>1.33</chanceFactor>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RangedWeapon_Kunai"]/verbs</xpath>
-					<value>
-						<verbs>
-							<li Class="CombatExtended.VerbPropertiesCE">
-								<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Kunai_Thrown</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>4</range>
-							</li>
-						</verbs>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="RangedWeapon_Kunai"]/statBases</xpath>
-					<value>
-						<statBases>
-							<WorkToMake>1000</WorkToMake>
-							<MarketValue>4</MarketValue>
-							<SightsEfficiency>1.0</SightsEfficiency>
-							<ShotSpread>1.5</ShotSpread>
-							<SwayFactor>2.5</SwayFactor>
-							<Bulk>1.00</Bulk>
-							<Mass>0.2</Mass>
-							<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
-						</statBases>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="RangedWeapon_Kunai"]/weaponTags</xpath>
-					<value>
-						<li>CE_Pila</li>
-						<li>CE_OneHandedWeapon</li>
-						<li>CE_AI_Rifle</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Windows/Openvindows.xml b/Patches/Windows/Openvindows.xml
deleted file mode 100644
index 73627a5a1d..0000000000
--- a/Patches/Windows/Openvindows.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Windows</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[@Name = "WindowBase"]/fillPercent</xpath>
-					<value>
-						<fillPercent>0.6</fillPercent>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Xenn/PawnKindDefs_Humanlikes/PawnKinds_Xenn.xml b/Patches/Xenn/PawnKindDefs_Humanlikes/PawnKinds_Xenn.xml
deleted file mode 100644
index ad3efeefc7..0000000000
--- a/Patches/Xenn/PawnKindDefs_Humanlikes/PawnKinds_Xenn.xml
+++ /dev/null
@@ -1,324 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Xenn Race</li>
-			<li>Xenn Race (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== Scoot ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="XennColonist"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="XennPackLeader"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="XennTrader"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="XennSlave"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="XennRefugee"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="XennSecurityGuard"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="XennRecruit"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="XennHunter"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="XennCommando"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="XennCommandoElite"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>500</min>
-								<max>1400</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>OutlanderShield</li>
-							</shieldTags>
-							<shieldChance>0.5</shieldChance>
-							<sidearms>
-								<li>
-									<generateChance>0.5</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Xenn/ThingDefs_Misc/Apparel_Various.xml b/Patches/Xenn/ThingDefs_Misc/Apparel_Various.xml
deleted file mode 100644
index 17cb5321c0..0000000000
--- a/Patches/Xenn/ThingDefs_Misc/Apparel_Various.xml
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Xenn Race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== Power Armor with Duster ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXX"]/statBases</xpath>
-					<value>
-						<Bulk>90</Bulk>
-						<WornBulk>12</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXX"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>550</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXX"]/statBases/Mass</xpath>
-					<value>
-						<Mass>51</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXX"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXX"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXX"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>75</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXX"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>110</CarryWeight>
-							<CarryBulk>25</CarryBulk>
-							<ShootingAccuracyPawn>0.10</ShootingAccuracyPawn>
-							<ToxicEnvironmentResistance>0.60</ToxicEnvironmentResistance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXX"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-
-					</value>
-				</li>
-
-				<!-- ========== Power Armor with *Arctic* Duster ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXXArc"]/statBases</xpath>
-					<value>
-						<Bulk>90</Bulk>
-						<WornBulk>12</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXXArc"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>550</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXXArc"]/statBases/Mass</xpath>
-					<value>
-						<Mass>51</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXXArc"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXXArc"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXXArc"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>75</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXXArc"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>110</CarryWeight>
-							<CarryBulk>25</CarryBulk>
-							<ShootingAccuracyPawn>0.10</ShootingAccuracyPawn>
-							<ToxicEnvironmentResistance>0.60</ToxicEnvironmentResistance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXXArc"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-					</value>
-				</li>
-
-				<!-- ========== Power Armor with *Jungle* Duster ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXXJ"]/statBases</xpath>
-					<value>
-						<Bulk>90</Bulk>
-						<WornBulk>12</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXXJ"]/statBases/MaxHitPoints</xpath>
-					<value>
-						<MaxHitPoints>550</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXXJ"]/statBases/Mass</xpath>
-					<value>
-						<Mass>51</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXXJ"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.1</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXXJ"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXXJ"]/costList</xpath>
-					<value>
-						<DevilstrandCloth>75</DevilstrandCloth>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXXJ"]</xpath>
-					<value>
-						<equippedStatOffsets>
-							<CarryWeight>110</CarryWeight>
-							<CarryBulk>25</CarryBulk>
-							<ShootingAccuracyPawn>0.10</ShootingAccuracyPawn>
-							<ToxicEnvironmentResistance>0.60</ToxicEnvironmentResistance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Xenn_Armored_DusterXXJ"]/apparel/bodyPartGroups</xpath>
-					<value>
-						<li>Hands</li>
-						<li>Feet</li>
-
-					</value>
-				</li>
-
-				<!-- ========== Shadez ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "XennSunglasses"]/statBases/Mass</xpath>
-					<value>
-						<Mass>1</Mass>
-						<Bulk>5</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName = "XennSunglasses"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.17</ArmorRating_Sharp>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Xenn/ThingDefs_Misc/Xenn_Ammo.xml b/Patches/Xenn/ThingDefs_Misc/Xenn_Ammo.xml
deleted file mode 100644
index 53d3ed30f8..0000000000
--- a/Patches/Xenn/ThingDefs_Misc/Xenn_Ammo.xml
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Xenn Race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-
-						<ThingCategoryDef>
-							<defName>AmmoXennCell</defName>
-							<label>Xenn Fuel Cell</label>
-							<parent>AmmoAdvanced</parent>
-							<iconPath>UI/Icons/ThingCategories/CaliberFuel</iconPath>
-						</ThingCategoryDef>
-
-						<!-- ==================== AmmoSet ========================== -->
-
-						<CombatExtended.AmmoSetDef>
-							<defName>AmmoSet_XennFuel</defName>
-							<label>Xenn Fuel Cell</label>
-							<ammoTypes>
-								<Ammo_Xenn_Hot>Bullet_Xenn_Hot</Ammo_Xenn_Hot>
-								<Ammo_Xenn_Cold>Bullet_Xenn_Cold</Ammo_Xenn_Cold>
-								<Ammo_Xenn_Foam>Bullet_Xenn_Foam</Ammo_Xenn_Foam>
-							</ammoTypes>
-						</CombatExtended.AmmoSetDef>
-
-						<!-- ==================== Ammo ========================== -->
-
-						<ThingDef Class="CombatExtended.AmmoDef" Name="XennCellBase" ParentName="SpacerSmallAmmoBase" Abstract="True">
-							<description>Container holding fuel for Xenn weaponry.</description>
-							<statBases>
-								<Mass>0.3</Mass>
-								<Bulk>0.2</Bulk>
-							</statBases>
-							<tradeTags>
-								<li>CE_AutoEnableTrade</li>
-								<li>CE_AutoEnableCrafting</li>
-							</tradeTags>
-							<thingCategories>
-								<li>AmmoXennCell</li>
-							</thingCategories>
-							<stackLimit>75</stackLimit>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="XennCellBase">
-							<defName>Ammo_Xenn_Hot</defName>
-							<label>Xenn Plasma Cell</label>
-							<graphicData>
-								<texPath>Things/Ammo/FuelCell/Incendiary</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>1.52</MarketValue>
-							</statBases>
-							<ammoClass>IncendiaryFuel</ammoClass>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="XennCellBase">
-							<defName>Ammo_Xenn_Cold</defName>
-							<label>Xenn Cryogenic Cell</label>
-							<graphicData>
-								<texPath>Things/Ammo/FuelCell/Thermobaric</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>2.16</MarketValue>
-							</statBases>
-							<ammoClass>ThermobaricFuel</ammoClass>
-						</ThingDef>
-
-						<ThingDef Class="CombatExtended.AmmoDef" ParentName="XennCellBase">
-							<defName>Ammo_Xenn_Foam</defName>
-							<label>Xenn Firefoam Cell</label>
-							<graphicData>
-								<texPath>Things/Ammo/FuelCell/Foam</texPath>
-								<graphicClass>Graphic_StackCount</graphicClass>
-							</graphicData>
-							<statBases>
-								<MarketValue>0.61</MarketValue>
-							</statBases>
-							<ammoClass>FoamFuel</ammoClass>
-							<generateAllowChance>0</generateAllowChance>
-						</ThingDef>
-
-						<!-- ================== Projectiles ================== -->
-
-						<ThingDef Name="BaseXennBullet" ParentName="BaseExplosiveBullet" Abstract="true">
-							<graphicData>
-								<texPath>Things/Projectile/LauncherShot</texPath>
-								<graphicClass>Graphic_Single</graphicClass>
-								<shaderType>TransparentPostLight</shaderType>
-							</graphicData>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<speed>80</speed>
-								<dropsCasings>true</dropsCasings>
-								<flyOverhead>false</flyOverhead>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseXennBullet">
-							<defName>Bullet_Xenn_Hot</defName>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<label>incendiary bolt</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>PrometheumFlame</damageDef>
-								<damageAmountBase>10</damageAmountBase>
-								<explosionRadius>0.5</explosionRadius>
-								<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseXennBullet">
-							<defName>Bullet_Xenn_Cold</defName>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<label>freezer bolt</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<explosionRadius>0.75</explosionRadius>
-								<damageDef>Frostbite</damageDef>
-								<damageAmountBase>15</damageAmountBase>
-								<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-							</projectile>
-						</ThingDef>
-
-						<ThingDef ParentName="BaseXennBullet">
-							<defName>Bullet_Xenn_Foam</defName>
-							<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-							<label>foam bolt</label>
-							<projectile Class="CombatExtended.ProjectilePropertiesCE">
-								<damageDef>Extinguish</damageDef>
-								<suppressionFactor>0.0</suppressionFactor>
-								<dangerFactor>0.0</dangerFactor>
-								<damageAmountBase>50</damageAmountBase>
-								<explosionRadius>1</explosionRadius>
-								<postExplosionSpawnThingDef>Filth_FireFoam</postExplosionSpawnThingDef>
-								<preExplosionSpawnChance>1</preExplosionSpawnChance>
-							</projectile>
-						</ThingDef>
-
-						<!-- ==================== Recipes ========================== -->
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_Xenn_Hot</defName>
-							<label>make Xenn Plasma Cells x50</label>
-							<description>Craft 50 Xenn plasma cells.</description>
-							<jobString>Making Xenn Plasma cells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Prometheum</li>
-										</thingDefs>
-									</filter>
-									<count>5</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-									<li>Prometheum</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Xenn_Hot>50</Ammo_Xenn_Hot>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_Xenn_Cold</defName>
-							<label>make Xenn Cryo Cell x50</label>
-							<description>Craft 50 Xenn cryo cells.</description>
-							<jobString>Making Xenn cells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>12</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Xenn_Cold>50</Ammo_Xenn_Cold>
-							</products>
-						</RecipeDef>
-
-						<RecipeDef ParentName="AmmoRecipeBase">
-							<defName>MakeAmmo_Xenn_Foam</defName>
-							<label>make Xenn foam cell x50</label>
-							<description>Craft 50 Xenn foam cells.</description>
-							<jobString>Making Xenn foam cells.</jobString>
-							<ingredients>
-								<li>
-									<filter>
-										<thingDefs>
-											<li>Steel</li>
-										</thingDefs>
-									</filter>
-									<count>10</count>
-								</li>
-								<li>
-									<filter>
-										<categories>
-											<li>MeatRaw</li>
-										</categories>
-									</filter>
-									<count>2</count>
-								</li>
-							</ingredients>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Steel</li>
-								</thingDefs>
-								<categories>
-									<li>MeatRaw</li>
-								</categories>
-							</fixedIngredientFilter>
-							<products>
-								<Ammo_Xenn_Foam>50</Ammo_Xenn_Foam>
-							</products>
-						</RecipeDef>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Xenn/ThingDefs_Misc/Xenn_Weps.xml b/Patches/Xenn/ThingDefs_Misc/Xenn_Weps.xml
deleted file mode 100644
index 8a068e8f55..0000000000
--- a/Patches/Xenn/ThingDefs_Misc/Xenn_Weps.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Xenn Race</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Xenn Burn Cannon -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XennBurnCannon</defName>
-					<statBases>
-						<Bulk>8.5</Bulk>
-						<Mass>4.1</Mass>
-						<SwayFactor>1.38</SwayFactor>
-						<ShotSpread>0.08</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
-						<WorkToMake>29000</WorkToMake>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_30x64mmFuel_Incendiary</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<burstShotCount>4</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>Xenngun</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_XennFuel</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="XennBurnCannon"]/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>
-				</li>
-
-				<!-- Xenn Frost Cannon -->
-				<!-- Gonna just be the firegun for now cus ill need to make a good ammo 4 it lol heart -->
-				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-					<defName>XennFrostCannon</defName>
-					<statBases>
-						<Bulk>8.5</Bulk>
-						<Mass>4.1</Mass>
-						<SwayFactor>1.38</SwayFactor>
-						<ShotSpread>0.08</ShotSpread>
-						<SightsEfficiency>1</SightsEfficiency>
-						<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
-						<WorkToMake>29000</WorkToMake>
-					</statBases>
-					<Properties>
-						<recoilAmount>0.5</recoilAmount>
-						<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-						<hasStandardCommand>true</hasStandardCommand>
-						<defaultProjectile>Bullet_30x64mmFuel_Incendiary</defaultProjectile>
-						<warmupTime>1.1</warmupTime>
-						<range>55</range>
-						<burstShotCount>4</burstShotCount>
-						<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-						<soundCast>Xenngun</soundCast>
-						<muzzleFlashScale>9</muzzleFlashScale>
-					</Properties>
-					<AmmoUser>
-						<magazineSize>20</magazineSize>
-						<reloadTime>4.5</reloadTime>
-						<ammoSet>AmmoSet_XennFuel</ammoSet>
-					</AmmoUser>
-					<FireModes>
-						<aimedBurstShotCount>2</aimedBurstShotCount>
-						<aiAimMode>AimedShot</aiAimMode>
-					</FireModes>
-					<weaponTags>
-						<li>CE_AI_AssaultWeapon</li>
-					</weaponTags>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="XennFrostCannon"]/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>
-				</li>
-				<!-- etc.. -->
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Xenn/ThingDefs_Races/Race_Xenn.xml b/Patches/Xenn/ThingDefs_Races/Race_Xenn.xml
deleted file mode 100644
index cdd7cfa3e5..0000000000
--- a/Patches/Xenn/ThingDefs_Races/Race_Xenn.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Xenn Race</li>
-			<li>Xenn Race (Continued)</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- ========== Found Fido ========== -->
-
-				<!-- ========== Turn our dog boys into dog *boys* ========== -->
-				<!-- ========== To be human is to be a tall brick ========== -->
-				<li Class="PatchOperationAddModExtension">
-					<!-- === Note to future furball compatibility nerds: 		=== -->
-					<!-- === Paste the defName of your horrible alien there   |	=== -->
-					<!-- === 												  V	=== -->
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Xenn"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Gives Gun Gizmos to Xenn HUD thing ========== -->
-				<!-- ========== Also Makes Em Suppressable		   ========== -->
-
-				<li Class="PatchOperationAdd">
-					<!-- === Shouldn't need to change this at all		  === -->
-					<!-- === Unless you changed the name of your BaseXennPawn === -->
-					<!-- === In which case change "BaseXennPawn" to that name === -->
-					<xpath>Defs/ThingDef[@Name="BaseXennPawn"]</xpath>
-					<value>
-						<comps>
-							<li>
-								<compClass>CombatExtended.CompPawnGizmo</compClass>
-							</li>
-							<li Class="CombatExtended.CompProperties_Suppressable" />
-						</comps>
-					</value>
-				</li>
-
-				<!-- === Patch Xenn default melee attacks === -->
-				<!-- === For the most part, it adds the CE melee handler thing 	=== -->
-				<!-- === And also defines armor penetration, which allows them	=== -->
-				<!-- === to actually do damage.									=== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Xenn"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1</AimingAccuracy>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1.15</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<ReloadSpeed>1</ReloadSpeed>
-						<Suppressability>1</Suppressability>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Xenn"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.15</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claws</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.15</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.462</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>1.37</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.02</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.923</armorPenetrationBlunt>
-								<chanceFactor>0.2</chanceFactor>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- ===================================== -->
-				<!-- === BaseBodySize, ArmorRatings, MoveSpeed, and BaseHealth should already be set. I think. === -->
-				<!-- ===================================== -->
-			</operations>
-		</match>
-	</Operation>
-
-	<!-- === Congratulations! Your alien is Combat Ready!	 === -->
-	<!-- === If your alien comes with extra guns and gear,	 === -->
-	<!-- === Congratulations! You're not even close to done! === -->
-</Patch>
\ No newline at end of file
diff --git a/Patches/Xenohumans - Anthromorphs/Races_Avianmorph.xml b/Patches/Xenohumans - Anthromorphs/Races_Avianmorph.xml
deleted file mode 100644
index 50b98ab9d2..0000000000
--- a/Patches/Xenohumans - Anthromorphs/Races_Avianmorph.xml	
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Xenohumans - Anthromorphs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Avianmorph"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Avianmorph"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<Suppressability>1</Suppressability>
-						<SmokeSensitivity>1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Avianmorph"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Avianmorph"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Avianmorph"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Avianmorph"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="ATK_Villager_Avianmorph"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>4</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Xenohumans - Anthromorphs/Races_Bovinemorph.xml b/Patches/Xenohumans - Anthromorphs/Races_Bovinemorph.xml
deleted file mode 100644
index 8dbb742e36..0000000000
--- a/Patches/Xenohumans - Anthromorphs/Races_Bovinemorph.xml	
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Xenohumans - Anthromorphs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Bovinemorph"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Bovinemorph"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<Suppressability>1</Suppressability>
-						<SmokeSensitivity>1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Bovinemorph"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Bovinemorph"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Bovinemorph"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Bovinemorph"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="ATK_Villager_Bovinemorph"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>4</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Xenohumans - Anthromorphs/Races_Caninemorph.xml b/Patches/Xenohumans - Anthromorphs/Races_Caninemorph.xml
deleted file mode 100644
index 7c441a68fe..0000000000
--- a/Patches/Xenohumans - Anthromorphs/Races_Caninemorph.xml	
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Xenohumans - Anthromorphs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Caninemorph"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Caninemorph"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<Suppressability>1</Suppressability>
-						<SmokeSensitivity>1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Caninemorph"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Caninemorph"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Caninemorph"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Caninemorph"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="ATK_Villager_Caninemorph"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>4</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Xenohumans - Anthromorphs/Races_Cervinemorph.xml b/Patches/Xenohumans - Anthromorphs/Races_Cervinemorph.xml
deleted file mode 100644
index a833a22cf1..0000000000
--- a/Patches/Xenohumans - Anthromorphs/Races_Cervinemorph.xml	
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Xenohumans - Anthromorphs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Cervinemorph"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Cervinemorph"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<Suppressability>1</Suppressability>
-						<SmokeSensitivity>1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Cervinemorph"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Cervinemorph"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Cervinemorph"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Cervinemorph"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="ATK_Villager_Cervinemorph"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>4</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Xenohumans - Anthromorphs/Races_Dragomorph.xml b/Patches/Xenohumans - Anthromorphs/Races_Dragomorph.xml
deleted file mode 100644
index 78d7b3d94b..0000000000
--- a/Patches/Xenohumans - Anthromorphs/Races_Dragomorph.xml	
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Xenohumans - Anthromorphs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Dragomorph"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Dragomorph"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<Suppressability>1</Suppressability>
-						<SmokeSensitivity>1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Dragomorph"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Dragomorph"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Dragomorph"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Dragomorph"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ATK_Leather_Dragon"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.06</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="ATK_Villager_Dragomorph"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>4</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Xenohumans - Anthromorphs/Races_Felinemorph.xml b/Patches/Xenohumans - Anthromorphs/Races_Felinemorph.xml
deleted file mode 100644
index 23c8ea85fd..0000000000
--- a/Patches/Xenohumans - Anthromorphs/Races_Felinemorph.xml	
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Xenohumans - Anthromorphs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Felinemorph"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Felinemorph"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<Suppressability>1</Suppressability>
-						<SmokeSensitivity>1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Felinemorph"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Felinemorph"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Felinemorph"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Felinemorph"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="ATK_Villager_Felinemorph"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>4</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Xenohumans - Anthromorphs/Races_Gnollmorph.xml b/Patches/Xenohumans - Anthromorphs/Races_Gnollmorph.xml
deleted file mode 100644
index 2c6b9744ca..0000000000
--- a/Patches/Xenohumans - Anthromorphs/Races_Gnollmorph.xml	
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Xenohumans - Anthromorphs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Gnollmorph"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Gnollmorph"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<Suppressability>1</Suppressability>
-						<SmokeSensitivity>1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Gnollmorph"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Gnollmorph"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Gnollmorph"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Gnollmorph"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="ATK_Villager_Gnollmorph"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>4</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Xenohumans - Anthromorphs/Races_Lagomorph.xml b/Patches/Xenohumans - Anthromorphs/Races_Lagomorph.xml
deleted file mode 100644
index cdafd827a1..0000000000
--- a/Patches/Xenohumans - Anthromorphs/Races_Lagomorph.xml	
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Xenohumans - Anthromorphs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Lagomorph"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Lagomorph"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<Suppressability>1</Suppressability>
-						<SmokeSensitivity>1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Lagomorph"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Lagomorph"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Lagomorph"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Lagomorph"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="ATK_Villager_Lagomorph"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>4</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Xenohumans - Anthromorphs/Races_Vulpinemorph.xml b/Patches/Xenohumans - Anthromorphs/Races_Vulpinemorph.xml
deleted file mode 100644
index 85b3c0cd0d..0000000000
--- a/Patches/Xenohumans - Anthromorphs/Races_Vulpinemorph.xml	
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Xenohumans - Anthromorphs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Vulpinemorph"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Vulpinemorph"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-						<Suppressability>1</Suppressability>
-						<SmokeSensitivity>1</SmokeSensitivity>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Vulpinemorph"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Vulpinemorph"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Vulpinemorph"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATK_Vulpinemorph"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[defName="ATK_Villager_Vulpinemorph"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>4</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Xenohumans Expanded/Races_Glitter_XH.xml b/Patches/Xenohumans Expanded/Races_Glitter_XH.xml
deleted file mode 100644
index 48b6a81f32..0000000000
--- a/Patches/Xenohumans Expanded/Races_Glitter_XH.xml	
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Xenohumans Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="GlitterWorlderRace"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="GlitterWorlderRace"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="GlitterWorlderRace"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="GlitterWorlderRace"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="GlitterWorlderRace"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="GlitterWorlderRace"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Xenohumans Expanded/Races_Gravi_XH.xml b/Patches/Xenohumans Expanded/Races_Gravi_XH.xml
deleted file mode 100644
index bdff5d5a5d..0000000000
--- a/Patches/Xenohumans Expanded/Races_Gravi_XH.xml	
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Xenohumans Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HighGravWorlderRace"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>HumanoidWide</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HighGravWorlderRace"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>4.25</MoveSpeed>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HighGravWorlderRace"]/statBases/CarryingCapacity</xpath>
-					<value>
-						<CarryWeight>90</CarryWeight>
-						<CarryBulk>30</CarryBulk>
-						<CarryingCapacity>150</CarryingCapacity>
-						<MeleeDodgeChance>0.85</MeleeDodgeChance>
-						<MeleeCritChance>1.1</MeleeCritChance>
-						<MeleeParryChance>1.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HighGravWorlderRace"]/statBases</xpath>
-					<value>
-						<ArmorRating_Blunt>0.2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HighGravWorlderRace"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.350</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.350</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>3</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.85</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HighGravWorlderRace"]/race/baseBodySize</xpath>
-					<value>
-						<baseBodySize>0.7</baseBodySize>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HighGravWorlderRace"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>1.1</baseHealthScale>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HighGravWorlderRace"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HighGravWorlderRace"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HighGravWorlderRace"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Xenohumans Expanded/Races_LowGravi_XH.xml b/Patches/Xenohumans Expanded/Races_LowGravi_XH.xml
deleted file mode 100644
index c9a037cc1b..0000000000
--- a/Patches/Xenohumans Expanded/Races_LowGravi_XH.xml	
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Xenohumans Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="LowGravWorlderRace"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="LowGravWorlderRace"]/statBases/Mass</xpath>
-					<value>
-						<Mass>48</Mass>
-						<CarryWeight>28</CarryWeight>
-						<MeleeDodgeChance>1.0</MeleeDodgeChance>
-						<MeleeCritChance>0.9</MeleeCritChance>
-						<MeleeParryChance>0.9</MeleeParryChance>
-						<GlobalLearningFactor>1.5</GlobalLearningFactor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="LowGravWorlderRace"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.27</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.164</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.27</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.174</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.99</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.556</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="LowGravWorlderRace"]/race/baseHealthScale</xpath>
-					<value>
-						<baseHealthScale>0.85</baseHealthScale>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="LowGravWorlderRace"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="LowGravWorlderRace"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="LowGravWorlderRace"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Xenohumans Expanded/Races_Radman_XH.xml b/Patches/Xenohumans Expanded/Races_Radman_XH.xml
deleted file mode 100644
index fecb18510f..0000000000
--- a/Patches/Xenohumans Expanded/Races_Radman_XH.xml	
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Xenohumans Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="RadWorlderRace"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="RadWorlderRace"]/statBases/ToxicResistance</xpath>
-					<value>
-						<ToxicResistance>0.4</ToxicResistance>
-						<SmokeSensitivity>0.7</SmokeSensitivity>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="RadWorlderRace"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="RadWorlderRace"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="RadWorlderRace"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="RadWorlderRace"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Xenohumans Expanded/Races_Vatgrown_XH.xml b/Patches/Xenohumans Expanded/Races_Vatgrown_XH.xml
deleted file mode 100644
index 2c2c738c69..0000000000
--- a/Patches/Xenohumans Expanded/Races_Vatgrown_XH.xml	
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Xenohumans Expanded</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="VatgrownHumanRace"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="VatgrownHumanRace"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="VatgrownHumanRace"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="VatgrownHumanRace"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="VatgrownHumanRace"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="VatgrownHumanRace"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Xenohumans Expanded/Xenos_Pawns.xml b/Patches/Xenohumans Expanded/Xenos_Pawns.xml
deleted file mode 100644
index 25b00cc0f5..0000000000
--- a/Patches/Xenohumans Expanded/Xenos_Pawns.xml	
+++ /dev/null
@@ -1,373 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Xenohumans Expanded</li>
-		</mods>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="Town_GuardKindAlienBase" or @Name="Town_TraderKindAlienBase" or @Name="PirateKindAlienBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>3</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.1</generateChance>
-									<sidearmMoney>
-										<min>50</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-								<li>
-									<generateChance>0.075</generateChance>
-									<sidearmMoney>
-										<min>80</min>
-										<max>160</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_FlareLauncher</li>
-									</weaponTags>
-									<magazineCount>
-										<min>0</min>
-										<max>1</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="VillagerBaseKindAlienBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>1</min>
-								<max>3</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.05</generateChance>
-									<sidearmMoney>
-										<min>50</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-								<li>
-									<generateChance>0.04</generateChance>
-									<sidearmMoney>
-										<min>80</min>
-										<max>160</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_FlareLauncher</li>
-									</weaponTags>
-									<magazineCount>
-										<min>0</min>
-										<max>1</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="Mercenary_GunnerKindAlienBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>4</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.25</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-								<li>
-									<generateChance>0.125</generateChance>
-									<sidearmMoney>
-										<min>10</min>
-										<max>100</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>GrenadeSmoke</li>
-										<li>GrenadeDestructive</li>
-									</weaponTags>
-									<magazineCount>
-										<min>0</min>
-										<max>1</max>
-									</magazineCount>
-								</li>
-								<li>
-									<generateChance>0.075</generateChance>
-									<sidearmMoney>
-										<min>80</min>
-										<max>160</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_FlareLauncher</li>
-									</weaponTags>
-									<magazineCount>
-										<min>1</min>
-										<max>1</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="Mercenary_SniperKindAlienBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="Mercenary_HeavyKindAlienBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>2</min>
-								<max>4</max>
-							</primaryMagazineCount>
-							<forcedSidearm>
-								<sidearmMoney>
-									<min>150</min>
-									<max>350</max>
-								</sidearmMoney>
-								<weaponTags>
-									<li>CE_SMG</li>
-								</weaponTags>
-								<magazineCount>
-									<min>0</min>
-									<max>1</max>
-								</magazineCount>
-							</forcedSidearm>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="Mercenary_EliteKindAlienBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>3</min>
-								<max>5</max>
-							</primaryMagazineCount>
-							<sidearms>
-								<li>
-									<generateChance>0.25</generateChance>
-									<sidearmMoney>
-										<min>100</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Melee</li>
-									</weaponTags>
-								</li>
-								<li>
-									<generateChance>0.2</generateChance>
-									<sidearmMoney>
-										<min>10</min>
-										<max>150</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>GrenadeSmoke</li>
-										<li>GrenadeDestructive</li>
-									</weaponTags>
-									<magazineCount>
-										<min>0</min>
-										<max>1</max>
-									</magazineCount>
-								</li>
-								<li>
-									<generateChance>0.075</generateChance>
-									<sidearmMoney>
-										<min>80</min>
-										<max>160</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_FlareLauncher</li>
-									</weaponTags>
-									<magazineCount>
-										<min>1</min>
-										<max>1</max>
-									</magazineCount>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="Tribal_WarriorKindAlienBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>100</min>
-								<max>150</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.9</shieldChance>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="Tribal_HunterKindAlienBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>20</min>
-								<max>40</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>100</min>
-								<max>130</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.6</shieldChance>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>80</min>
-										<max>240</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Tribal</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="Tribal_HeavyArcherKindAlienBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<primaryMagazineCount>
-								<min>20</min>
-								<max>40</max>
-							</primaryMagazineCount>
-							<shieldMoney>
-								<min>100</min>
-								<max>160</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.6</shieldChance>
-							<sidearms>
-								<li>
-									<sidearmMoney>
-										<min>80</min>
-										<max>300</max>
-									</sidearmMoney>
-									<weaponTags>
-										<li>CE_Sidearm_Tribal</li>
-									</weaponTags>
-								</li>
-							</sidearms>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/PawnKindDef[@Name="Tribal_BerserkerKindAlienBase"]</xpath>
-					<value>
-						<li Class="CombatExtended.LoadoutPropertiesExtension">
-							<shieldMoney>
-								<min>120</min>
-								<max>160</max>
-							</shieldMoney>
-							<shieldTags>
-								<li>TribalShield</li>
-							</shieldTags>
-							<shieldChance>0.9</shieldChance>
-						</li>
-					</value>
-				</li>
-				<!-- ======= Combat Power ======= -->
-
-				<!-- Trooper -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[
-						@Name="Tribal_PenitentKindAlienBase"
-						]/combatPower </xpath>
-					<value>
-						<combatPower>16</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[@Name="Tribal_ArcherKindAlienBase"]/combatPower</xpath>
-					<value>
-						<combatPower>20</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[@Name="Tribal_WarriorKindAlienBase"]/combatPower</xpath>
-					<value>
-						<combatPower>24</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[@Name="Tribal_HunterKindAlienBase"]/combatPower</xpath>
-					<value>
-						<combatPower>30</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[@Name="Tribal_BerserkerKindAlienBase"]/combatPower</xpath>
-					<value>
-						<combatPower>50</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[@Name="Tribal_HeavyArcherKindAlienBase"]/combatPower</xpath>
-					<value>
-						<combatPower>45</combatPower>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Xenohumans/Races_Designermate_XH.xml b/Patches/Xenohumans/Races_Designermate_XH.xml
deleted file mode 100644
index 3bdb568f52..0000000000
--- a/Patches/Xenohumans/Races_Designermate_XH.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Xenohumans - Gen-spliced Xenos on the Rim</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="DesignerMatesXH"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="DesignerMatesXH"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="DesignerMatesXH"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="DesignerMatesXH"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="DesignerMatesXH"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="DesignerMatesXH"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Xenohumans/Races_Scaleman_XH.xml b/Patches/Xenohumans/Races_Scaleman_XH.xml
deleted file mode 100644
index aa998afabb..0000000000
--- a/Patches/Xenohumans/Races_Scaleman_XH.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Xenohumans - Gen-spliced Xenos on the Rim</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ScaleManXH"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ScaleManXH"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.85</MeleeDodgeChance>
-						<MeleeCritChance>0.95</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ScaleManXH"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ScaleManXH"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.2</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ScaleManXH"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.26</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ScaleManXH"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ScaleManXH"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ScaleManXH"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Xenohumans/Races_Soldiermorph_XH.xml b/Patches/Xenohumans/Races_Soldiermorph_XH.xml
deleted file mode 100644
index f69b91b25e..0000000000
--- a/Patches/Xenohumans/Races_Soldiermorph_XH.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Xenohumans - Gen-spliced Xenos on the Rim</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="SoldiermorphXH"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="SoldiermorphXH"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1.2</MeleeDodgeChance>
-						<MeleeCritChance>1.2</MeleeCritChance>
-						<MeleeParryChance>1.1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="SoldiermorphXH"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.07</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.634</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>1</power>
-								<cooldownTime>1.07</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>14</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationBlunt>0.634</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>2.99</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.406</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="SoldiermorphXH"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="SoldiermorphXH"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="SoldiermorphXH"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Xenohumans/Races_Wolfman_XH.xml b/Patches/Xenohumans/Races_Wolfman_XH.xml
deleted file mode 100644
index 903edcd495..0000000000
--- a/Patches/Xenohumans/Races_Wolfman_XH.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Xenohumans - Gen-spliced Xenos on the Rim</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WolfManXH"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WolfManXH"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>0.05</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WolfManXH"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>0.05</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WolfManXH"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>1</MeleeDodgeChance>
-						<MeleeCritChance>1</MeleeCritChance>
-						<MeleeParryChance>1</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WolfManXH"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.84</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.563</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>0.84</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.12</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.563</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>1.65</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.03</armorPenetrationSharp>
-								<armorPenetrationBlunt>2.16</armorPenetrationBlunt>
-								<chanceFactor>0.3</chanceFactor>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>4.49</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WolfManXH"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WolfManXH"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="WolfManXH"]/comps</xpath>
-					<value>
-						<li>
-							<compClass>CombatExtended.CompPawnGizmo</compClass>
-						</li>
-						<li Class="CombatExtended.CompProperties_Suppressable" />
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Xenoorca Race/Ammo/Projectiles.xml b/Patches/Xenoorca Race/Ammo/Projectiles.xml
deleted file mode 100644
index bb8e8cee04..0000000000
--- a/Patches/Xenoorca Race/Ammo/Projectiles.xml	
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Xenoorca Race/Bodies/Xenoorca_Bodytype.xml b/Patches/Xenoorca Race/Bodies/Xenoorca_Bodytype.xml
deleted file mode 100644
index a4ac19a579..0000000000
--- a/Patches/Xenoorca Race/Bodies/Xenoorca_Bodytype.xml	
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-
-			<!--Nearmare Bodytype-->
-
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>[1.4]Xenoorca Race</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--Arm Groups-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Xenoorca_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
-							<value>
-								<li>LeftArm</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Xenoorca_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
-							<value>
-								<li>RightArm</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Xenoorca_Body"]/corePart/parts/li[customLabel="left shoulder"]/groups</xpath>
-							<value>
-								<li>LeftShoulder</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Xenoorca_Body"]/corePart/parts/li[customLabel="right shoulder"]/groups</xpath>
-							<value>
-								<li>RightShoulder</li>
-							</value>
-						</li>
-
-						<!--Natural Armor-->
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Xenoorca_Body"]/corePart/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Xenoorca_Body"]/corePart/parts/li[def="Xenoorca_Fillet"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Xenoorca_Body"]/corePart/parts/li[def="Neck"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Xenoorca_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Xenoorca_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Xenoorca_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Xenoorca_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Xenoorca_Body"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Xenoorca_Gills"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Xenoorca_Body"]/corePart/parts/li[def="Shoulder"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Xenoorca_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Xenoorca_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Xenoorca_Body"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Xenoorca_Body"]/corePart/parts/li[def="Leg"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Xenoorca_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/BodyDef[defName="HAR_Xenoorca_Body"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups</xpath>
-							<value>
-								<li>CoveredByNaturalArmor</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Xenoorca Race/Hediffs/XO_Hediffs.xml b/Patches/Xenoorca Race/Hediffs/XO_Hediffs.xml
deleted file mode 100644
index 0f6190a36e..0000000000
--- a/Patches/Xenoorca Race/Hediffs/XO_Hediffs.xml	
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[1.4]Xenoorca Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv1"]/statOffsets/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv1"]/statOffsets/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.6</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv2"]/statOffsets/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>0.6</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv2"]/statOffsets/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.72</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv3"]/statOffsets/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>0.7</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv3"]/statOffsets/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.84</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv4"]/statOffsets/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>0.8</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv4"]/statOffsets/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.96</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv5"]/statOffsets/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>0.9</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv5"]/statOffsets/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>1.08</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv6"]/statOffsets/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>1</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv6"]/statOffsets/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>1.2</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv7"]/statOffsets/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>1.1</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv7"]/statOffsets/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>1.32</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv8"]/statOffsets/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>1.2</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv8"]/statOffsets/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>1.44</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv9"]/statOffsets/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>1.3</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv9"]/statOffsets/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>1.52</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv10"]/statOffsets/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="Xenoorca_Artificial"]/stages/li[label="Lv10"]/statOffsets/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>1.8</ArmorRating_Blunt>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Xenoorca Race/PawnKindDefs/Xenoorca_PawnKind.xml b/Patches/Xenoorca Race/PawnKindDefs/Xenoorca_PawnKind.xml
deleted file mode 100644
index f696c3479e..0000000000
--- a/Patches/Xenoorca Race/PawnKindDefs/Xenoorca_PawnKind.xml	
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[1.4]Xenoorca Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-						<!--Ammo-->
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/PawnKindDef[
-								@Name="HAR_Xenoorca_KindBase_NPC"
-								] </xpath>
-							<value>
-								<li Class="CombatExtended.LoadoutPropertiesExtension">
-									<primaryMagazineCount>
-										<min>2</min>
-										<max>6</max>
-									</primaryMagazineCount>
-								</li>
-							</value>
-						</li>
-
-						<!--Backpack-->
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="CE_Apparel_Backpack"]/apparel/tags</xpath>
-							<value>
-								<li>HAR_XO_Apparel_Orcinus</li>
-							</value>
-						</li>
-
-						<!--combatPower-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/PawnKindDef[@Name="HAR_Xenoorca_KindBase"]/combatPower</xpath>
-							<value>
-								<combatPower>200</combatPower>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Xenoorca Race/Scenario/Xenoorca_Scenario.xml b/Patches/Xenoorca Race/Scenario/Xenoorca_Scenario.xml
deleted file mode 100644
index 6b6f3bd746..0000000000
--- a/Patches/Xenoorca Race/Scenario/Xenoorca_Scenario.xml	
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[1.4]Xenoorca Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ScenarioDef[defName="Xenoorca_Scenario"]/scenario/parts</xpath>
-							<value>
-								<li Class="ScenPart_StartingThing_Defined">
-									<def>StartingThing_Defined</def>
-									<thingDef>Ammo_303British_FMJ</thingDef>
-									<count>100</count>
-								</li>
-								<li Class="ScenPart_StartingThing_Defined">
-									<def>StartingThing_Defined</def>
-									<thingDef>Ammo_44Magnum_FMJ</thingDef>
-									<count>60</count>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ScenarioDef[defName="Xenoorca_Scenario"]/scenario/parts/li[thingDef="Apparel_AdvancedHelmet"]</xpath>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ScenarioDef[defName="Xenoorca_Scenario"]/scenario/parts/li[thingDef="Apparel_FlakVest"]</xpath>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs/ScenarioDef[defName="Xenoorca_Scenario"]/scenario/parts/li[thingDef="Apparel_FlakPants"]</xpath>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Xenoorca Race/ThingDefs_Misc/Weapons.xml b/Patches/Xenoorca Race/ThingDefs_Misc/Weapons.xml
deleted file mode 100644
index 66aa87eae7..0000000000
--- a/Patches/Xenoorca Race/ThingDefs_Misc/Weapons.xml	
+++ /dev/null
@@ -1,286 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-
-		<operations>
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>[1.4]Xenoorca Race</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!-- ==========  Remove Grenade  =========== -->
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs//ThingDef[defName="Weapon_GrenadeFrag_XO"]</xpath>
-						</li>
-
-						<li Class="PatchOperationRemove">
-							<xpath>Defs//ThingDef[defName="Proj_GrenadeFrag_XO"]</xpath>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="Gun_AssaultRifle_XO" or defName="Gun_SniperRifle_XO" or defName="Gun_PumpShotgun_XO" or defName="Gun_ChargeRifle_XO"]/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>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Gun_AssaultRifle_XO</defName>
-							<statBases>
-								<Mass>3.5</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-								<SightsEfficiency>1</SightsEfficiency>
-								<ShotSpread>0.09</ShotSpread>
-								<SwayFactor>1.02</SwayFactor>
-								<Bulk>6.65</Bulk>
-								<WorkToMake>30000</WorkToMake>
-							</statBases>
-							<costList>
-								<Steel>50</Steel>
-								<ComponentIndustrial>6</ComponentIndustrial>
-								<Chemfuel>10</Chemfuel>
-							</costList>
-							<Properties>
-								<recoilAmount>1.48</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
-								<warmupTime>1.1</warmupTime>
-								<range>55</range>
-								<burstShotCount>6</burstShotCount>
-								<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-								<soundCast>Shot_AssaultRifle</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>30</magazineSize>
-								<reloadTime>4.5</reloadTime>
-								<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-							<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Gun_SniperRifle_XO</defName>
-							<statBases>
-								<Mass>7.30</Mass>
-								<RangedWeapon_Cooldown>1.36</RangedWeapon_Cooldown>
-								<SightsEfficiency>2.6</SightsEfficiency>
-								<ShotSpread>0.05</ShotSpread>
-								<SwayFactor>1.92</SwayFactor>
-								<Bulk>11.92</Bulk>
-								<WorkToMake>30000</WorkToMake>
-							</statBases>
-							<costList>
-								<Steel>60</Steel>
-								<ComponentIndustrial>5</ComponentIndustrial>
-								<Chemfuel>15</Chemfuel>
-							</costList>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-								<warmupTime>1.6</warmupTime>
-								<range>75</range>
-								<soundCast>Shot_SniperRifle</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>5</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-							<researchPrerequisite>PrecisionRifling</researchPrerequisite>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Gun_PumpShotgun_XO</defName>
-							<statBases>
-								<Mass>3.00</Mass>
-								<RangedWeapon_Cooldown>1.0</RangedWeapon_Cooldown>
-								<ShotSpread>0.14</ShotSpread>
-								<SwayFactor>1.20</SwayFactor>
-								<Bulk>9.0</Bulk>
-								<SightsEfficiency>1</SightsEfficiency>
-								<WorkToMake>9500</WorkToMake>
-							</statBases>
-							<costList>
-								<Steel>45</Steel>
-								<Chemfuel>10</Chemfuel>
-								<ComponentIndustrial>1</ComponentIndustrial>
-							</costList>
-							<Properties>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
-								<warmupTime>0.6</warmupTime>
-								<range>16</range>
-								<soundCast>Shot_Shotgun</soundCast>
-								<soundCastTail>GunTail_Heavy</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>5</magazineSize>
-								<reloadOneAtATime>true</reloadOneAtATime>
-								<reloadTime>0.85</reloadTime>
-								<ammoSet>AmmoSet_12Gauge</ammoSet>
-							</AmmoUser>
-							<FireModes />
-							<researchPrerequisite>Gunsmithing</researchPrerequisite>
-						</li>
-
-						<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-							<defName>Gun_ChargeRifle_XO</defName>
-							<statBases>
-								<Mass>3.0</Mass>
-								<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-								<SightsEfficiency>1.10</SightsEfficiency>
-								<ShotSpread>0.08</ShotSpread>
-								<SwayFactor>1.20</SwayFactor>
-								<Bulk>7.00</Bulk>
-								<WorkToMake>48000</WorkToMake>
-							</statBases>
-							<costList>
-								<Steel>45</Steel>
-								<Plasteel>25</Plasteel>
-								<ComponentIndustrial>10</ComponentIndustrial>
-								<Chemfuel>10</Chemfuel>
-							</costList>
-							<Properties>
-								<recoilAmount>1.51</recoilAmount>
-								<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-								<hasStandardCommand>true</hasStandardCommand>
-								<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
-								<warmupTime>1.0</warmupTime>
-								<range>55</range>
-								<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-								<burstShotCount>6</burstShotCount>
-								<soundCast>Shot_ChargeRifle</soundCast>
-								<soundCastTail>GunTail_Medium</soundCastTail>
-								<muzzleFlashScale>9</muzzleFlashScale>
-							</Properties>
-							<AmmoUser>
-								<magazineSize>30</magazineSize>
-								<reloadTime>4</reloadTime>
-								<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
-							</AmmoUser>
-							<FireModes>
-								<aimedBurstShotCount>3</aimedBurstShotCount>
-								<aiUseBurstMode>TRUE</aiUseBurstMode>
-								<aiAimMode>AimedShot</aiAimMode>
-							</FireModes>
-							<researchPrerequisite>ChargedShot</researchPrerequisite>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="MeleeWeapon_Trident_XO"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>shaft</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>6</power>
-										<cooldownTime>1.31</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>2.9</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>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="MeleeWeapon_Trident_XO"]/statBases</xpath>
-							<value>
-								<MeleeCounterParryBonus>1.08</MeleeCounterParryBonus>
-								<Bulk>10</Bulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="MeleeWeapon_Trident_XO"]</xpath>
-							<value>
-								<equippedStatOffsets>
-									<MeleeCritChance>0.22</MeleeCritChance>
-									<MeleeParryChance>1.53</MeleeParryChance>
-									<MeleeDodgeChance>0.67</MeleeDodgeChance>
-								</equippedStatOffsets>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Xenoorca Race/ThingDefs_Misc/Xenoorca_Apparel.xml b/Patches/Xenoorca Race/ThingDefs_Misc/Xenoorca_Apparel.xml
deleted file mode 100644
index 3e033c7766..0000000000
--- a/Patches/Xenoorca Race/ThingDefs_Misc/Xenoorca_Apparel.xml	
+++ /dev/null
@@ -1,307 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[1.4]Xenoorca Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<!--========= Stuffable =========-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_XO_AT_d" or
-								defName="HAR_XO_AT_f"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
-								<Bulk>1</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_XO_AT_e"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-								<Bulk>2</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_XO_AT_a" or
-								defName="HAR_XO_AT_b" or
-								defName="HAR_XO_AT_c"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-								<Bulk>3</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<!--Middle PA-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_XO_AM_a"
-								]/statBases/ArmorRating_Sharp </xpath>
-							<value>
-								<ArmorRating_Sharp>16</ArmorRating_Sharp>
-								<Bulk>80</Bulk>
-								<WornBulk>10</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_XO_AM_a"
-								]/statBases/ArmorRating_Blunt </xpath>
-							<value>
-								<ArmorRating_Blunt>40</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_XO_AM_a"
-								]/statBases/Mass </xpath>
-							<value>
-								<Mass>60</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_XO_AM_a"
-								]/equippedStatOffsets/MoveSpeed </xpath>
-							<value>
-								<CarryWeight>80</CarryWeight>
-								<CarryBulk>10</CarryBulk>
-								<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-								<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="HAR_XO_AM_a"]/apparel/bodyPartGroups</xpath>
-							<value>
-								<li>Hands</li>
-								<li>Feet</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HAR_XO_AM_a"]/costList/Plasteel</xpath>
-							<value>
-								<Plasteel>160</Plasteel>
-								<DevilstrandCloth>50</DevilstrandCloth>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_XO_AM_b"
-								]/statBases/ArmorRating_Sharp </xpath>
-							<value>
-								<ArmorRating_Sharp>12</ArmorRating_Sharp>
-								<Bulk>40</Bulk>
-								<WornBulk>8</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_XO_AM_b"
-								]/statBases/ArmorRating_Blunt </xpath>
-							<value>
-								<ArmorRating_Blunt>30</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_XO_AM_b"
-								]/statBases/Mass </xpath>
-							<value>
-								<Mass>25</Mass>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[
-								defName="HAR_XO_AM_b"
-								]/equippedStatOffsets </xpath>
-							<value>
-								<CarryWeight>45</CarryWeight>
-								<CarryBulk>12</CarryBulk>
-								<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
-								<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[defName="HAR_XO_AM_b"]/apparel/bodyPartGroups</xpath>
-							<value>
-								<li>Hands</li>
-								<li>Feet</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HAR_XO_AM_b"]/costList/Plasteel</xpath>
-							<value>
-								<Plasteel>130</Plasteel>
-								<DevilstrandCloth>20</DevilstrandCloth>
-								<ComponentSpacer>1</ComponentSpacer>
-							</value>
-						</li>
-
-						<!--Shell-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_XO_AS_a" or
-								defName="HAR_XO_AS_b"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
-								<Bulk>10</Bulk>
-								<WornBulk>5</WornBulk>
-							</value>
-						</li>
-
-						<!--Shell Metallic-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_XO_AS_c"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-								<Bulk>1</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<!--Overhead-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_XO_AH_a"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>2.5</StuffEffectMultiplierArmor>
-								<Bulk>1</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_XO_AH_b" or
-								defName="HAR_XO_AH_c" or
-								defName="HAR_XO_AH_d" or
-								defName="HAR_XO_AH_e"
-								]/statBases/StuffEffectMultiplierArmor </xpath>
-							<value>
-								<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-								<Bulk>1</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<!--Overhead Armor-->
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_XO_AH_f"
-								]/statBases/ArmorRating_Sharp </xpath>
-							<value>
-								<ArmorRating_Sharp>18</ArmorRating_Sharp>
-								<Bulk>5</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_XO_AH_f"
-								]/statBases/ArmorRating_Blunt </xpath>
-							<value>
-								<ArmorRating_Blunt>40.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationConditional">
-							<xpath>Defs/ThingDef[defName="HAR_XO_AH_f"]/apparel/immuneToToxGasExposure</xpath>
-							<nomatch Class="PatchOperationAdd">
-								<xpath>Defs/ThingDef[defName="HAR_XO_AH_f"]/apparel</xpath>
-								<value>
-									<immuneToToxGasExposure>true</immuneToToxGasExposure>
-								</value>
-							</nomatch>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_XO_AH_f"
-								]/equippedStatOffsets/MoveSpeed </xpath>
-							<value>
-								<AimingAccuracy>0.15</AimingAccuracy>
-								<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-								<SmokeSensitivity>-1</SmokeSensitivity>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HAR_XO_AH_f"]/costList/Plasteel</xpath>
-							<value>
-								<Plasteel>70</Plasteel>
-								<DevilstrandCloth>20</DevilstrandCloth>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_XO_AH_g"
-								]/statBases/ArmorRating_Sharp </xpath>
-							<value>
-								<ArmorRating_Sharp>10</ArmorRating_Sharp>
-								<Bulk>5</Bulk>
-								<WornBulk>1</WornBulk>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[
-								defName="HAR_XO_AH_g"
-								]/statBases/ArmorRating_Blunt </xpath>
-							<value>
-								<ArmorRating_Blunt>22.5</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[defName="HAR_XO_AH_g"]/costList/Plasteel</xpath>
-							<value>
-								<Plasteel>40</Plasteel>
-								<DevilstrandCloth>10</DevilstrandCloth>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Xenoorca Race/ThingDefs_Races/AlienRace_Xenoorca.xml b/Patches/Xenoorca Race/ThingDefs_Races/AlienRace_Xenoorca.xml
deleted file mode 100644
index f43a4daf02..0000000000
--- a/Patches/Xenoorca Race/ThingDefs_Races/AlienRace_Xenoorca.xml	
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-			<li Class="PatchOperationFindMod">
-
-				<mods>
-					<li>[1.4]Xenoorca Race</li>
-				</mods>
-
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/ThingDef[@Name="HAR_Xenoorca_BaseNRPawn"]/inspectorTabs/li[.="ITab_Pawn_Gear"]</xpath>
-							<value>
-								<li>CombatExtended.ITab_Inventory</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="HAR_Xenoorca_BaseNRPawn"]/comps</xpath>
-							<value>
-								<li Class="CombatExtended.CompProperties_Inventory" />
-								<li Class="CombatExtended.CompProperties_TacticalManager" />
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/ThingDef[@Name="HAR_Xenoorca_BaseNRPawn"]/comps</xpath>
-							<value>
-								<li>
-									<compClass>CombatExtended.CompPawnGizmo</compClass>
-								</li>
-								<li Class="CombatExtended.CompProperties_Suppressable" />
-							</value>
-						</li>
-
-						<li Class="PatchOperationAddModExtension">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Xenoorca"]</xpath>
-							<value>
-								<li Class="CombatExtended.RacePropertiesExtensionCE">
-									<bodyShape>Humanoid</bodyShape>
-								</li>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Xenoorca"]/statBases</xpath>
-							<value>
-								<Suppressability>1</Suppressability>
-								<SmokeSensitivity>1.2</SmokeSensitivity>
-								<MeleeCritChance>1.05</MeleeCritChance>
-								<MeleeParryChance>1.06</MeleeParryChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Xenoorca"]/statBases/MeleeDodgeChance</xpath>
-							<value>
-								<MeleeDodgeChance>1.30</MeleeDodgeChance>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Xenoorca"]/statBases/ArmorRating_Sharp</xpath>
-							<value>
-								<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Xenoorca"]/statBases/ArmorRating_Blunt</xpath>
-							<value>
-								<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Xenoorca"]/tools</xpath>
-							<value>
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>left fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>3</power>
-										<cooldownTime>1.66</cooldownTime>
-										<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>right fist</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>3</power>
-										<cooldownTime>1.66</cooldownTime>
-										<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-										<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
-									</li>
-									<li Class="CombatExtended.ToolCE">
-										<label>head</label>
-										<capacities>
-											<li>Blunt</li>
-										</capacities>
-										<power>4</power>
-										<cooldownTime>5.05</cooldownTime>
-										<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-										<chanceFactor>0.05</chanceFactor>
-										<armorPenetrationBlunt>1</armorPenetrationBlunt>
-									</li>
-								</tools>
-							</value>
-						</li>
-
-						<li Class="PatchOperationAdd">
-							<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Xenoorca"]/alienRace/raceRestriction/whiteApparelList</xpath>
-							<value>
-								<li>CE_Apparel_TacVest</li>
-								<li>CE_Apparel_Backpack</li>
-								<li>CE_Apparel_TribalBackpack</li>
-								<li>CE_Apparel_BallisticShield</li>
-								<li>CE_Apparel_MeleeShield</li>
-								<li>CE_Apparel_GasMask</li>
-								<li>CE_Apparel_ImprovGasMask</li>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/YetAnotherProsthetics - Core/Patches/Bionics_Patch.xml b/Patches/YetAnotherProsthetics - Core/Patches/Bionics_Patch.xml
deleted file mode 100644
index 6fd53ac67e..0000000000
--- a/Patches/YetAnotherProsthetics - Core/Patches/Bionics_Patch.xml	
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Yet another prosthetic expansion mod - Core</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Patches the BionicArm and BIE_BionicHand -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BionicArm" or defName="BIE_BionicHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>5</power>
-								<cooldownTime>1.11</cooldownTime>
-								<armorPenetrationBlunt>1.688</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- Patches the BIE_AdvancedBionicArm and BIE_AdvancedBionicHand -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BIE_AdvancedBionicArm" or defName="BIE_AdvancedBionicHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>bionic fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>9</power>
-								<cooldownTime>0.96</cooldownTime>
-								<armorPenetrationBlunt>3.00</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- Patches the BIE_UltratechBionicArm (no hand for this tier) -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BIE_UltratechBionicArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>bionic fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>0.81</cooldownTime>
-								<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- Patches the ArchotechArm (no hand for this tier, it's patching vanilla for this) -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="ArchotechArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>bionic fist</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>17</power>
-								<cooldownTime>0.66</cooldownTime>
-								<armorPenetrationBlunt>6.00</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- Commented out until we can resolve issues with smoke hediff on body parts for resistance -->
-				<!-- Add for lungs of advanced nature, scale, recommended 15% for elite bionics, down to 5% for better-than -->
-				<!-- BIE_BionicLung -->
-				<!-- <li Class="PatchOperationAdd"> -->
-				<!-- <xpath>Defs/HediffDef[defName="BIE_BionicLung"]/stages/li[minSeverity="0.99"]/statOffsets</xpath> -->
-				<!-- <value> -->
-				<!-- <SmokeSensitivity>-0.025</SmokeSensitivity> -->
-				<!-- </value> -->
-				<!-- </li> -->
-				<!-- BIE_AdvancedBionicLung -->
-				<!-- <li Class="PatchOperationAdd"> -->
-				<!-- <xpath>Defs/HediffDef[defName="BIE_AdvancedBionicLung"]/stages/li[minSeverity="0.99"]/statOffsets</xpath> -->
-				<!-- <value> -->
-				<!-- <SmokeSensitivity>-0.05</SmokeSensitivity> -->
-				<!-- </value> -->
-				<!-- </li> -->
-				<!-- BIE_UltratechBionicLung -->
-				<!-- <li Class="PatchOperationAdd"> -->
-				<!-- <xpath>Defs/HediffDef[defName="BIE_UltratechBionicLung"]/stages/li[minSeverity="0.99"]/statOffsets</xpath> -->
-				<!-- <value> -->
-				<!-- <SmokeSensitivity>-0.10</SmokeSensitivity> -->
-				<!-- </value> -->
-				<!-- </li> -->
-				<!-- SoSArchotechLung -->
-				<!-- <li Class="PatchOperationAdd"> -->
-				<!-- <xpath>Defs/HediffDef[defName="SoSArchotechLung"]/stages/li[minSeverity="0.99"]/statOffsets</xpath> -->
-				<!-- <value> -->
-				<!-- <SmokeSensitivity>-0.15</SmokeSensitivity> -->
-				<!-- </value> -->
-				<!-- </li> -->
-
-				<!-- Patch for BIE_BionicJaw -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="BIE_BionicJaw"]</xpath>
-					<value>
-						<comps>
-							<li Class="HediffCompProperties_VerbGiver">
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>teeth</label>
-										<capacities>
-											<li>Bite</li>
-										</capacities>
-										<power>4</power>
-										<cooldownTime>1.27</cooldownTime>
-										<armorPenetrationBlunt>1.288</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.2</armorPenetrationSharp>
-									</li>
-								</tools>
-							</li>
-						</comps>
-					</value>
-				</li>
-				<!-- Patch for BIE_AdvancedBionicJaw -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/HediffDef[defName="BIE_AdvancedBionicJaw"]</xpath>
-					<value>
-						<comps>
-							<li Class="HediffCompProperties_VerbGiver">
-								<tools>
-									<li Class="CombatExtended.ToolCE">
-										<label>teeth</label>
-										<capacities>
-											<li>Bite</li>
-										</capacities>
-										<power>7</power>
-										<cooldownTime>1.12</cooldownTime>
-										<armorPenetrationBlunt>2.2</armorPenetrationBlunt>
-										<armorPenetrationSharp>0.4</armorPenetrationSharp>
-									</li>
-								</tools>
-							</li>
-						</comps>
-					</value>
-				</li>
-				<!-- BIE_UltratechBionicJaw -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BIE_UltratechBionicJaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>10</power>
-								<cooldownTime>0.97</cooldownTime>
-								<armorPenetrationBlunt>3.0</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.6</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-				<!-- SoSArchotechJaw -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="SoSArchotechJaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>13</power>
-								<cooldownTime>0.82</cooldownTime>
-								<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
-								<armorPenetrationSharp>0.8</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- Patch for BIE_UltratechBionicSkin -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BIE_UltratechBionicSkin"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>1.75</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="BIE_UltratechBionicSkin"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>2.25</ArmorRating_Blunt>
-						<ArmorRating_Electric>0.2</ArmorRating_Electric>
-					</value>
-				</li>
-				<!-- Patch for SoSArchotechSkin (YAP uses SOSArch for these) -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="SoSArchotechSkin"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>3</ArmorRating_Sharp>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/HediffDef[defName="SoSArchotechSkin"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>4.5</ArmorRating_Blunt>
-						<ArmorRating_Electric>0.4</ArmorRating_Electric>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/Zombieland/Zombieland_Patches.xml b/Patches/Zombieland/Zombieland_Patches.xml
deleted file mode 100644
index 3d9f2c24c0..0000000000
--- a/Patches/Zombieland/Zombieland_Patches.xml
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Zombieland</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ===== Zombies ===== -->
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="Zombie"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Zombie"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.1</MeleeDodgeChance>
-						<MeleeCritChance>0.1</MeleeCritChance>
-						<MeleeParryChance>0.05</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Zombie"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left fist</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>22</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right fist</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>2.0</cooldownTime>
-								<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>22</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.05</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>teeth</label>
-								<capacities>
-									<li>ZombieBite</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>4</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<armorPenetrationSharp>0.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ===== Zombie Spitter ===== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="ZombieSpitterBody"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="ZombieSpitterBody"]/corePart</xpath>
-						<value>
-							<groups>
-								<li>CoveredByNaturalArmor</li>
-							</groups>
-						</value>
-					</nomatch>
-					<match Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="ZombieSpitterBody"]/corePart/groups</xpath>
-						<value>
-							<li>CoveredByNaturalArmor</li>
-						</value>
-					</match>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="ZombieSpitter"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>QuadrupedLow</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ZombieSpitter"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>20</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="ZombieSpitter"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="ZombieSpitter"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="ZombieSpitter"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ZombieSpitter"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>2000</Durability>
-							<Regenerates>false</Regenerates>
-							<RegenInterval>600</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<MinArmorPct>0.5</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<!-- ===== Misc Stuff ===== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="Chainsaw"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>0.25</cooldownTime>
-								<armorPenetrationSharp>0.5</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Chainsaw"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="ElectricalField"]</xpath>
-					<value>
-						<statBases>
-							<Bulk>0</Bulk>
-							<Mass>0</Mass>
-						</statBases>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/kemomimihouse Kz/Misc/HediffGiverSets.xml b/Patches/kemomimihouse Kz/Misc/HediffGiverSets.xml
deleted file mode 100644
index 6b73ac141d..0000000000
--- a/Patches/kemomimihouse Kz/Misc/HediffGiverSets.xml	
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>kemomimihouse Kz</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[label="风切武装"]/stages</xpath>
-							<value>
-								<stages>
-									<li>
-										<minSeverity>0.01</minSeverity>
-										<label>蛰伏</label>
-										<naturalHealingFactor>1.25</naturalHealingFactor>
-									</li>
-
-									<li>
-										<minSeverity>0.99</minSeverity>
-										<label>激活</label>
-										<restFallFactorOffset>0.35</restFallFactorOffset>
-										<painOffset>-0.15</painOffset>
-										<statOffsets>
-											<ArmorRating_Sharp>5</ArmorRating_Sharp>
-											<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
-											<ArmorRating_Heat>0.25</ArmorRating_Heat>
-										</statOffsets>
-										<statFactors>
-											<MeleeDodgeChance>1.25</MeleeDodgeChance>
-											<MeleeHitChance>1.35</MeleeHitChance>
-											<IncomingDamageFactor>0.7</IncomingDamageFactor>
-											<MoveSpeed>0.80</MoveSpeed>
-										</statFactors>
-										<capMods>
-											<li>
-												<capacity>Consciousness</capacity>
-												<postFactor>1.15</postFactor>
-											</li>
-
-											<li>
-												<capacity>Manipulation</capacity>
-												<postFactor>1.15</postFactor>
-											</li>
-										</capMods>
-									</li>
-								</stages>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="siroTalent"]/stages</xpath>
-							<value>
-								<stages>
-									<li>
-										<minSeverity>0.01</minSeverity>
-										<label>蛰伏</label>
-										<naturalHealingFactor>1.15</naturalHealingFactor>
-									</li>
-
-									<li>
-										<minSeverity>0.99</minSeverity>
-										<label>激活</label>
-										<restFallFactorOffset>0.25</restFallFactorOffset>
-										<painOffset>-0.20</painOffset>
-										<statOffsets>
-											<ArmorRating_Sharp>4</ArmorRating_Sharp>
-											<ArmorRating_Blunt>10.6</ArmorRating_Blunt>
-											<ArmorRating_Heat>0.15</ArmorRating_Heat>
-										</statOffsets>
-										<statFactors>
-											<IncomingDamageFactor>0.7</IncomingDamageFactor>
-											<MoveSpeed>0.70</MoveSpeed>
-										</statFactors>
-										<capMods>
-											<li>
-												<capacity>Consciousness</capacity>
-												<postFactor>1.20</postFactor>
-											</li>
-
-											<li>
-												<capacity>Manipulation</capacity>
-												<postFactor>1.25</postFactor>
-											</li>
-										</capMods>
-									</li>
-								</stages>
-							</value>
-						</li>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="kuroTalent"]/stages</xpath>
-							<value>
-								<stages>
-									<li>
-										<minSeverity>0.01</minSeverity>
-										<label>蛰伏</label>
-										<naturalHealingFactor>1.15</naturalHealingFactor>
-									</li>
-
-									<li>
-										<minSeverity>0.99</minSeverity>
-										<label>激活</label>
-										<restFallFactorOffset>0.10</restFallFactorOffset>
-										<painOffset>-0.10</painOffset>
-										<statOffsets>
-											<ArmorRating_Sharp>3</ArmorRating_Sharp>
-											<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-											<ArmorRating_Heat>0.10</ArmorRating_Heat>
-										</statOffsets>
-										<statFactors>
-											<IncomingDamageFactor>0.85</IncomingDamageFactor>
-											<MoveSpeed>0.90</MoveSpeed>
-										</statFactors>
-										<capMods>
-											<li>
-												<capacity>Consciousness</capacity>
-												<postFactor>1.10</postFactor>
-											</li>
-
-											<li>
-												<capacity>Manipulation</capacity>
-												<postFactor>1.05</postFactor>
-											</li>
-										</capMods>
-									</li>
-								</stages>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/kemomimihouse Kz/Misc/Projectile.xml b/Patches/kemomimihouse Kz/Misc/Projectile.xml
deleted file mode 100644
index 346b8f5d19..0000000000
--- a/Patches/kemomimihouse Kz/Misc/Projectile.xml	
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationSequence">
-		<operations>
-
-			<li Class="PatchOperationFindMod">
-				<mods>
-					<li>kemomimihouse Kz</li>
-				</mods>
-				<match Class="PatchOperationSequence">
-					<operations>
-
-						<li Class="PatchOperationReplace">
-							<xpath>Defs/HediffDef[defName="FrostbitePower_yuki"]/stages/li/statOffsets</xpath>
-							<value>
-								<statOffsets>
-									<ArmorRating_Blunt>-7.5</ArmorRating_Blunt>
-									<IncomingDamageFactor>0.15</IncomingDamageFactor>
-								</statOffsets>
-							</value>
-						</li>
-
-					</operations>
-				</match>
-			</li>
-		</operations>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/pphhyy Demigryph/Demigryph_Animals.xml b/Patches/pphhyy Demigryph/Demigryph_Animals.xml
deleted file mode 100644
index 15182e856a..0000000000
--- a/Patches/pphhyy Demigryph/Demigryph_Animals.xml	
+++ /dev/null
@@ -1,589 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>pphhyy's Demigryphs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Demigryph Statbases ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="pphhyy_Demigryph" or defName="pphhyy_LeopardDemigryph" or defName="pphhyy_PantherDemigryph" or defName="pphhyy_JadeDemigryph"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.17</MeleeDodgeChance>
-						<MeleeCritChance>0.21</MeleeCritChance>
-						<MeleeParryChance>0.17</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="pphhyy_CrimsonDemigryph" or defName="pphhyy_CheetahDemigryph" or defName="pphhyy_VultureDemigryph"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.14</MeleeDodgeChance>
-						<MeleeCritChance>0.24</MeleeCritChance>
-						<MeleeParryChance>0.19</MeleeParryChance>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="pphhyy_TigerDemigryph" or defName="pphhyy_Daermigryph"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.14</MeleeDodgeChance>
-						<MeleeCritChance>0.18</MeleeCritChance>
-						<MeleeParryChance>0.17</MeleeParryChance>
-					</value>
-				</li>
-
-				<!-- ========== Basic Leopard and Panther Demigryph ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="pphhyy_Demigryph" or defName="pphhyy_LeopardDemigryph" or defName="pphhyy_PantherDemigryph"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>beak</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>33</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationSharp>1.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>9.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.22</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>4.235</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Crimson Demigryph ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="pphhyy_CrimsonDemigryph"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>beak</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>39</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationSharp>2.1</armorPenetrationSharp>
-								<armorPenetrationBlunt>15</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.44</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Cheetah Demigryph ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="pphhyy_CheetahDemigryph"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>20</power>
-								<cooldownTime>1.25</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>beak</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationSharp>1</armorPenetrationSharp>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>4.235</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Vulture Demigryph ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="pphhyy_VultureDemigryph"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>22</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.3</armorPenetrationSharp>
-								<armorPenetrationBlunt>5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>beak</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>30</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationSharp>1.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>9.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.22</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>4.235</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Tiger Demigryph ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="pphhyy_TigerDemigryph"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>beak</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>33</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationSharp>1.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>9.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.44</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Daermigryph ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="pphhyy_Daermigryph"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.6</armorPenetrationSharp>
-								<armorPenetrationBlunt>9</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>26</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.6</armorPenetrationSharp>
-								<armorPenetrationBlunt>9</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>beak</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>33</power>
-								<cooldownTime>2</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationSharp>1.25</armorPenetrationSharp>
-								<armorPenetrationBlunt>12</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.44</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<!-- ========== Jade Demigryph ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="pphhyy_JadeDemigryph"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.3</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.45</armorPenetrationSharp>
-								<armorPenetrationBlunt>7</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>beak</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>1.8</cooldownTime>
-								<linkedBodyPartsGroup>Beak</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationSharp>1.8</armorPenetrationSharp>
-								<armorPenetrationBlunt>9.5</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.44</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/pphhyy Demigryph/Demigryph_Bodies.xml b/Patches/pphhyy Demigryph/Demigryph_Bodies.xml
deleted file mode 100644
index ac2b38e539..0000000000
--- a/Patches/pphhyy Demigryph/Demigryph_Bodies.xml	
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>pphhyy's Demigryphs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==================== pphhyy_QuadrupedAnimal_Demigryph ==================== -->
-				<!-- ========== Add groups entry if it doesn't exist already ========== -->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Neck"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Neck"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Beak"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Beak"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Leg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Leg"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<!-- ========== Add armor coverage ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Neck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Beak"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Leg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Demigryph"]/corePart/parts/li[def="Tail"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/pphhyy Demigryph/Demigryph_GryphArmor.xml b/Patches/pphhyy Demigryph/Demigryph_GryphArmor.xml
deleted file mode 100644
index d2af7b5f95..0000000000
--- a/Patches/pphhyy Demigryph/Demigryph_GryphArmor.xml	
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>pphhyy's Demigryphs</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Animal Gear</li>
-			</mods>
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<!-- Gryphon Leather -->
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="pphhyy_Demigryph_leatherArmor" or defName="pphhyy_Demigryph_leatherArmorFront"]/statBases</xpath>
-						<value>
-							<Bulk>3</Bulk>
-							<WornBulk>1</WornBulk>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="pphhyy_Demigryph_leatherArmor" or defName="pphhyy_Demigryph_leatherArmorFront"]/statBases/StuffEffectMultiplierArmor</xpath>
-						<value>
-							<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
-						</value>
-					</li>
-
-					<!-- Gryphon Plate -->
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="pphhyy_Demigryph_PlateArmor" or defName="pphhyy_Demigryph_PlateArmorFront"]/statBases/StuffEffectMultiplierArmor</xpath>
-						<value>
-							<StuffEffectMultiplierArmor>4.5</StuffEffectMultiplierArmor>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="pphhyy_Demigryph_PlateArmor" or defName="pphhyy_Demigryph_PlateArmorFront"]/equippedStatOffsets</xpath>
-						<value>
-							<equippedStatOffsets>
-								<MeleeDodgeChance>-0.05</MeleeDodgeChance>
-							</equippedStatOffsets>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="pphhyy_Demigryph_PlateArmor" or defName="pphhyy_Demigryph_PlateArmorFront"]/statBases</xpath>
-						<value>
-							<Bulk>17.5</Bulk>
-							<WornBulk>3.5</WornBulk>
-						</value>
-					</li>
-
-					<!-- Gryphon Plate -->
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="pphhyy_Demigryph_NoblePlateArmor" or defName="pphhyy_Demigryph_NoblePlateArmorFront" or defName="pphhyy_Demigryph_RaiderPlateArmor" or defName="pphhyy_Demigryph_RaiderPlateArmorFront"]/statBases/StuffEffectMultiplierArmor</xpath>
-						<value>
-							<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="pphhyy_Demigryph_NoblePlateArmor" or defName="pphhyy_Demigryph_NoblePlateArmorFront" or defName="pphhyy_Demigryph_RaiderPlateArmor" or defName="pphhyy_Demigryph_RaiderPlateArmorFront"]/equippedStatOffsets</xpath>
-						<value>
-							<equippedStatOffsets>
-								<MeleeDodgeChance>-0.05</MeleeDodgeChance>
-							</equippedStatOffsets>
-						</value>
-					</li>
-
-					<li Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="pphhyy_Demigryph_NoblePlateArmor" or defName="pphhyy_Demigryph_NoblePlateArmorFront" or defName="pphhyy_Demigryph_RaiderPlateArmor" or defName="pphhyy_Demigryph_RaiderPlateArmorFront"]/statBases</xpath>
-						<value>
-							<Bulk>17.5</Bulk>
-							<WornBulk>3.5</WornBulk>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/pphhyy Demigryph/Demigryph_Helmets.xml b/Patches/pphhyy Demigryph/Demigryph_Helmets.xml
deleted file mode 100644
index 0361b64698..0000000000
--- a/Patches/pphhyy Demigryph/Demigryph_Helmets.xml	
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>pphhyy's Demigryphs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Helm Bulk -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="pphhyy_Human_DemigyryphHelm" or defName="pphhyy_Human_DemigyryphChampionHelm" or defName="pphhyy_Human_DemigyryphGildedHelm"]/statBases</xpath>
-					<value>
-						<Bulk>6</Bulk>
-						<WornBulk>1</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName="pphhyy_Human_DemigyryphHelm" or defName="pphhyy_Human_DemigyryphChampionHelm" or defName="pphhyy_Human_DemigyryphGildedHelm"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-				</li>
-
-				<!-- Staff Offsets -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="pphhyy_Human_DemigyryphHelm" or defName="pphhyy_Human_DemigyryphChampionHelm" or defName="pphhyy_Human_DemigyryphGildedHelm" or defName="pphhyy_Human_DemigyryphRaiderHelm" or defName="pphhyy_Human_DemigyryphHunterHelm"]/equippedStatOffsets</xpath>
-					<value>
-						<AimingAccuracy>-0.4</AimingAccuracy>
-						<MeleeHitChance>-2</MeleeHitChance>
-						<Suppressability>-0.20</Suppressability>
-					</value>
-				</li>
-
-				<!--Demigryph Helm-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="pphhyy_Human_DemigyryphHelm"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="pphhyy_Human_DemigyryphHelm"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>80</costStuffCount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="pphhyy_Human_DemigyryphHelm"]/recipeMaker/researchPrerequisite</xpath>
-					<value>
-						<researchPrerequisite>PlateArmor</researchPrerequisite>
-					</value>
-				</li>
-
-				<!--Demigryph Champion Helm and DemigyryphGildedHelm-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="pphhyy_Human_DemigyryphChampionHelm" or defName="pphhyy_Human_DemigyryphGildedHelm" or defName="pphhyy_Human_DemigyryphRaiderHelm"]/statBases/Mass</xpath>
-					<value>
-						<Mass>3.5</Mass>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="pphhyy_Human_DemigyryphChampionHelm" or defName="pphhyy_Human_DemigyryphGildedHelm" or defName="pphhyy_Human_DemigyryphRaiderHelm"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="pphhyy_Human_DemigyryphChampionHelm"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>90</costStuffCount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="pphhyy_Human_DemigyryphRaiderHelm"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>95</costStuffCount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="pphhyy_Human_DemigyryphGildedHelm" or defName="pphhyy_Human_DemigyryphHunterHelm"]/costStuffCount</xpath>
-					<value>
-						<costStuffCount>100</costStuffCount>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="pphhyy_Human_DemigyryphHunterHelm"]/statBases/StuffEffectMultiplierArmor</xpath>
-					<value>
-						<StuffEffectMultiplierArmor>3.75</StuffEffectMultiplierArmor>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/pphhyy Demigryph/Demigryph_Materials.xml b/Patches/pphhyy Demigryph/Demigryph_Materials.xml
deleted file mode 100644
index 90ff2a9a8f..0000000000
--- a/Patches/pphhyy Demigryph/Demigryph_Materials.xml	
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>pphhyy's Demigryphs</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Demigryph leather -->
-				<!-- Warmleather Demigryph -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="pphhyy_WarmLeather_Demigryph" or defName="pphhyy_coldLeather_Demigryph" or defName="pphhyy_Leather_Demigryph"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.05</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="pphhyy_WarmLeather_Demigryph" or defName="pphhyy_coldLeather_Demigryph" or defName="pphhyy_Leather_Demigryph"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.04</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/pphhyy Expanded Scythers/MechBodies_CE.xml b/Patches/pphhyy Expanded Scythers/MechBodies_CE.xml
deleted file mode 100644
index 6a7a7c4b27..0000000000
--- a/Patches/pphhyy Expanded Scythers/MechBodies_CE.xml	
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>phynilla Expanded Mechs Scyther</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==================== Phynilla Scythers ==================== -->
-
-				<!-- ========== Add groups entry if it doesn't exist already ========== -->
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalNeck"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalLeg"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<!-- ========== Add armor coverage ========== -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalNeck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="Blade"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/parts/li[def="MechanicalFinger"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<!-- ========== Modify coverage ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/coverage</xpath>
-					<value>
-						<coverage>0.15</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="Blade"]/coverage</xpath>
-					<value>
-						<coverage>0.2</coverage>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="FluidReprocessor"]/coverage</xpath>
-					<value>
-						<coverage>0.05</coverage>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/pphhyy Expanded Scythers/MechKind_CE.xml b/Patches/pphhyy Expanded Scythers/MechKind_CE.xml
deleted file mode 100644
index b872e912c4..0000000000
--- a/Patches/pphhyy Expanded Scythers/MechKind_CE.xml	
+++ /dev/null
@@ -1,739 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>phynilla Expanded Mechs Scyther</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[
-						defName="pphhyy_ScytherExpandedArch" or
-						defName="pphhyy_ScytherExpandedMono" or
-						defName="pphhyy_ScytherExpandedSearing" or
-						defName="pphhyy_ScytherExpandedPrestige"
-						]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Humanoid</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[
-						defName="pphhyy_ScytherExpandedTank" or
-						defName="pphhyy_ScytherExpandedArch" or
-						defName="pphhyy_ScytherExpandedSearing"
-						]/combatPower</xpath>
-					<value>
-						<combatPower>190</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="pphhyy_ScytherExpandedMono"]/combatPower</xpath>
-					<value>
-						<combatPower>240</combatPower>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="pphhyy_ScytherExpandedPrestige"]/combatPower</xpath>
-					<value>
-						<combatPower>320</combatPower>
-					</value>
-				</li>
-
-				<!--Arch Scyther (EMP one)-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedArch"]/statBases</xpath>
-					<value>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.19</MeleeCritChance>
-						<MeleeParryChance>0.23</MeleeParryChance>
-						<MaxHitPoints>250</MaxHitPoints>
-						<ArmorRating_Electric>0.2</ArmorRating_Electric>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedArch"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>8</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedArch"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedArch"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left Mace</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>24</power>
-								<extraMeleeDamages>
-									<li>
-										<def>EMP</def>
-										<amount>4</amount>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>35</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right Mace</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>24</power>
-								<extraMeleeDamages>
-									<li>
-										<def>EMP</def>
-										<amount>4</amount>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>35</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<extraMeleeDamages>
-									<li>
-										<def>EMP</def>
-										<amount>2</amount>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>5.9</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.875</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedArch"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedArch"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedArch"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1225</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>116</MaxOverHeal>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<!--Scyther Guard (Tank one)-->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedTank"]/statBases</xpath>
-					<value>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-						<MeleeDodgeChance>0.07</MeleeDodgeChance>
-						<MeleeCritChance>0.04</MeleeCritChance>
-						<MeleeParryChance>0.65</MeleeParryChance>
-						<MaxHitPoints>400</MaxHitPoints>
-						<ArmorRating_Heat>0.15</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedTank"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>24</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedTank"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedTank"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>right Mace</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>24</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Stun</def>
-										<amount>4</amount>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
-								<armorPenetrationBlunt>16</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>5.9</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.875</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedTank"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedTank"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedTank"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1875</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>140</MaxOverHeal>
-							<MinArmorPct>0.65</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedTank"]</xpath>
-					<value>
-						<modExtensions Inherit="False">
-							<li Class="CombatExtended.RacePropertiesExtensionCE">
-								<bodyShape>Humanoid</bodyShape>
-							</li>
-							<li Class="CombatExtended.PartialArmorExt">
-								<stats>
-									<li>
-										<useStatic>false</useStatic>
-										<ArmorRating_Sharp>0.1</ArmorRating_Sharp>
-										<parts>
-											<li>SightSensor</li>
-										</parts>
-									</li>
-									<li>
-										<useStatic>false</useStatic>
-										<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
-										<parts>
-											<li>SightSensor</li>
-										</parts>
-									</li>
-									<li>
-										<useStatic>false</useStatic>
-										<ArmorRating_Sharp>0.625</ArmorRating_Sharp>
-										<parts>
-											<li>MechanicalHead</li>
-										</parts>
-									</li>
-									<li>
-										<useStatic>false</useStatic>
-										<ArmorRating_Blunt>0.625</ArmorRating_Blunt>
-										<parts>
-											<li>MechanicalHead</li>
-										</parts>
-									</li>
-									<li>
-										<useStatic>false</useStatic>
-										<ArmorRating_Sharp>0.625</ArmorRating_Sharp>
-										<parts>
-											<li>MechanicalLeg</li>
-										</parts>
-									</li>
-									<li>
-										<useStatic>false</useStatic>
-										<ArmorRating_Blunt>0.625</ArmorRating_Blunt>
-										<parts>
-											<li>MechanicalLeg</li>
-										</parts>
-									</li>
-								</stats>
-							</li>
-						</modExtensions>
-					</value>
-				</li>
-
-				<!--Mono Scyther -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedMono"]/statBases</xpath>
-					<value>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-						<MeleeDodgeChance>0.43</MeleeDodgeChance>
-						<MeleeCritChance>0.41</MeleeCritChance>
-						<MeleeParryChance>0.36</MeleeParryChance>
-						<MaxHitPoints>300</MaxHitPoints>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedMono"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>14</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedMono"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>10</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedMono"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>45</power>
-								<cooldownTime>1.84</cooldownTime>
-								<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
-								<armorPenetrationSharp>16</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left blade</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>1.03</cooldownTime>
-								<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
-								<armorPenetrationSharp>45</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>45</power>
-								<cooldownTime>1.84</cooldownTime>
-								<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
-								<armorPenetrationSharp>16</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right blade</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>27</power>
-								<cooldownTime>1.03</cooldownTime>
-								<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
-								<armorPenetrationSharp>45</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>5.9</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.875</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedMono"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedMono"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedMono"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1300</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>116</MaxOverHeal>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<!--Searing Scyther -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedSearing"]/statBases</xpath>
-					<value>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-						<MeleeDodgeChance>0.18</MeleeDodgeChance>
-						<MeleeCritChance>0.23</MeleeCritChance>
-						<MeleeParryChance>0.19</MeleeParryChance>
-						<MaxHitPoints>250</MaxHitPoints>
-						<ArmorRating_Heat>0.4</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedSearing"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>8</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedSearing"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>6</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedSearing"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>43</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Flame</def>
-										<amount>5</amount>
-										<chance>0.3</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>2.07</cooldownTime>
-								<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
-								<armorPenetrationSharp>2.16</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left blade</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>24</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Flame</def>
-										<amount>5</amount>
-										<chance>0.3</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>43</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Flame</def>
-										<amount>5</amount>
-										<chance>0.3</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>2.07</cooldownTime>
-								<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
-								<armorPenetrationSharp>2.16</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right blade</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>24</power>
-								<extraMeleeDamages>
-									<li>
-										<def>Flame</def>
-										<amount>5</amount>
-										<chance>0.3</chance>
-									</li>
-								</extraMeleeDamages>
-								<cooldownTime>1.33</cooldownTime>
-								<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
-								<armorPenetrationSharp>40</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>5.9</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.875</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedSearing"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedSearing"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedSearing"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1225</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>116</MaxOverHeal>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-				<!--Prestige Scyther -->
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedPrestige"]/statBases</xpath>
-					<value>
-						<CarryWeight>50</CarryWeight>
-						<CarryBulk>20</CarryBulk>
-						<MeleeDodgeChance>0.58</MeleeDodgeChance>
-						<MeleeCritChance>0.54</MeleeCritChance>
-						<MeleeParryChance>0.45</MeleeParryChance>
-						<MaxHitPoints>380</MaxHitPoints>
-						<ArmorRating_Electric>0.2</ArmorRating_Electric>
-						<ArmorRating_Heat>0.15</ArmorRating_Heat>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedPrestige"]/statBases/ArmorRating_Blunt</xpath>
-					<value>
-						<ArmorRating_Blunt>24</ArmorRating_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedPrestige"]/statBases/ArmorRating_Sharp</xpath>
-					<value>
-						<ArmorRating_Sharp>16</ArmorRating_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedPrestige"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>46</power>
-								<cooldownTime>1.84</cooldownTime>
-								<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left blade</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>1.03</cooldownTime>
-								<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
-								<armorPenetrationSharp>45</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right blade</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>46</power>
-								<cooldownTime>1.84</cooldownTime>
-								<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
-								<armorPenetrationSharp>20</armorPenetrationSharp>
-								<armorPenetrationBlunt>5.4</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right blade</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>28</power>
-								<cooldownTime>1.03</cooldownTime>
-								<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
-								<armorPenetrationSharp>45</armorPenetrationSharp>
-								<armorPenetrationBlunt>20</armorPenetrationBlunt>
-								<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>6</power>
-								<cooldownTime>5.9</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.875</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedPrestige"]/comps</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedPrestige"]</xpath>
-						<value>
-							<comps />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="pphhyy_ScytherExpandedPrestige"]/comps</xpath>
-					<value>
-						<li Class="CombatExtended.CompProperties_ArmorDurability">
-							<Durability>1500</Durability>
-							<Regenerates>true</Regenerates>
-							<RegenInterval>1250</RegenInterval>
-							<RegenValue>5</RegenValue>
-							<Repairable>true</Repairable>
-							<RepairIngredients>
-								<Steel>5</Steel>
-								<Plasteel>5</Plasteel>
-							</RepairIngredients>
-							<RepairTime>300</RepairTime>
-							<RepairValue>200</RepairValue>
-							<CanOverHeal>true</CanOverHeal>
-							<MaxOverHeal>150</MaxOverHeal>
-							<MinArmorPct>0.75</MinArmorPct>
-						</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Patches/pphhyy Sanguinary Animals/SanguineAnimals_Animals.xml b/Patches/pphhyy Sanguinary Animals/SanguineAnimals_Animals.xml
deleted file mode 100644
index 30bb5612fd..0000000000
--- a/Patches/pphhyy Sanguinary Animals/SanguineAnimals_Animals.xml	
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>pphhyy Sanguinary Animals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ========== Sanguine Deer ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="pphhyy_SanguineDeer"]/statBases</xpath>
-					<value>
-						<MeleeDodgeChance>0.12</MeleeDodgeChance>
-						<MeleeCritChance>0.18</MeleeCritChance>
-						<MeleeParryChance>0.19</MeleeParryChance>
-						<NightVisionEfficiency>1</NightVisionEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="pphhyy_SanguineDeer"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.19</cooldownTime>
-								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>FrontLeftLeg</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>left hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.19</cooldownTime>
-								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>FrontLeftLeg_2</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.19</cooldownTime>
-								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>FrontRightLeg</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right hoof</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>7</power>
-								<cooldownTime>1.19</cooldownTime>
-								<armorPenetrationBlunt>2.250</armorPenetrationBlunt>
-								<linkedBodyPartsGroup>FrontRightLeg_2</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>razorfangs</label>
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.46</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>20</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<chanceFactor>2</chanceFactor>
-								<armorPenetrationSharp>1.6</armorPenetrationSharp>
-								<armorPenetrationBlunt>8.863</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>4</power>
-								<cooldownTime>3.2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>1.225</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAddModExtension">
-					<xpath>Defs/ThingDef[defName="pphhyy_SanguineDeer"]</xpath>
-					<value>
-						<li Class="CombatExtended.RacePropertiesExtensionCE">
-							<bodyShape>Quadruped</bodyShape>
-						</li>
-					</value>
-				</li>
-
-				<!-- ========== Varghulf ========== -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="pphhyy_Vargulf"]/statBases/MoveSpeed</xpath>
-					<value>
-						<MoveSpeed>6</MoveSpeed>
-						<MeleeDodgeChance>0.14</MeleeDodgeChance>
-						<MeleeCritChance>0.24</MeleeCritChance>
-						<MeleeParryChance>0.19</MeleeParryChance>
-						<NightVisionEfficiency>1</NightVisionEfficiency>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="pphhyy_Vargulf"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>left claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.17</cooldownTime>
-								<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.54</armorPenetrationSharp>
-								<armorPenetrationBlunt>8.47</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>right claw</label>
-								<capacities>
-									<li>Scratch</li>
-								</capacities>
-								<power>24</power>
-								<cooldownTime>1.17</cooldownTime>
-								<linkedBodyPartsGroup>FrontRightPaw</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<armorPenetrationSharp>0.54</armorPenetrationSharp>
-								<armorPenetrationBlunt>8.47</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<capacities>
-									<li>Bite</li>
-								</capacities>
-								<power>36</power>
-								<cooldownTime>1.62</cooldownTime>
-								<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-								<surpriseAttack>
-									<extraMeleeDamages>
-										<li>
-											<def>Stun</def>
-											<amount>21</amount>
-										</li>
-									</extraMeleeDamages>
-								</surpriseAttack>
-								<chanceFactor>0.5</chanceFactor>
-								<armorPenetrationSharp>2.18</armorPenetrationSharp>
-								<armorPenetrationBlunt>14.52</armorPenetrationBlunt>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>head</label>
-								<capacities>
-									<li>Blunt</li>
-								</capacities>
-								<power>12</power>
-								<cooldownTime>2.2</cooldownTime>
-								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-								<chanceFactor>0.2</chanceFactor>
-								<armorPenetrationBlunt>4.24</armorPenetrationBlunt>
-							</li>
-						</tools>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/pphhyy Sanguinary Animals/SanguineAnimals_Bodies.xml b/Patches/pphhyy Sanguinary Animals/SanguineAnimals_Bodies.xml
deleted file mode 100644
index e5cccbd8a0..0000000000
--- a/Patches/pphhyy Sanguinary Animals/SanguineAnimals_Bodies.xml	
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>pphhyy Sanguinary Animals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- ==================== pphhyy_QuadrupedAnimal_Vargulf ==================== -->
-				<!-- ========== Add groups entry if it doesn't exist already ========== -->
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="pphhyy_Vargulf_Wing"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="pphhyy_Vargulf_Wing"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="Neck"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="Neck"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="Leg"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="Leg"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]/groups</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]</xpath>
-						<value>
-							<groups />
-						</value>
-					</nomatch>
-				</li>
-
-				<!-- ========== Add armor coverage ========== -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="Neck"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="Leg"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/BodyDef[defName="pphhyy_QuadrupedAnimal_Vargulf"]/corePart/parts/li[def="pphhyy_Vargulf_Wing"]/groups</xpath>
-					<value>
-						<li>CoveredByNaturalArmor</li>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/pphhyy Sanguinary Animals/SanguineAnimals_Insects.xml b/Patches/pphhyy Sanguinary Animals/SanguineAnimals_Insects.xml
deleted file mode 100644
index 5bc1521b0b..0000000000
--- a/Patches/pphhyy Sanguinary Animals/SanguineAnimals_Insects.xml	
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>pphhyy Sanguinary Animals</li>
-		</mods>
-		<match Class="PatchOperationFindMod">
-			<mods>
-				<li>Biotech</li>
-			</mods>
-			<match Class="PatchOperationSequence">
-				<operations>
-
-					<!-- ========== Megaspider ========== -->
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="pphhyy_BloodScarab"]/statBases/MoveSpeed</xpath>
-						<value>
-							<MoveSpeed>4.4</MoveSpeed>
-							<MeleeDodgeChance>0.07</MeleeDodgeChance>
-							<MeleeCritChance>0.31</MeleeCritChance>
-							<MeleeParryChance>0.17</MeleeParryChance>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="pphhyy_BloodScarab"]/race/body</xpath>
-						<value>
-							<body>BeetleLike</body>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="pphhyy_BloodScarab"]/tools</xpath>
-						<value>
-							<tools>
-								<li Class="CombatExtended.ToolCE">
-									<label>mandibles</label>
-									<capacities>
-										<li>Stab</li>
-									</capacities>
-									<power>24</power>
-									<cooldownTime>1.33</cooldownTime>
-									<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-									<armorPenetrationSharp>40</armorPenetrationSharp>
-									<armorPenetrationBlunt>20</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>mandibles</label>
-									<capacities>
-										<li>Cut</li>
-									</capacities>
-									<power>43</power>
-									<cooldownTime>2.48</cooldownTime>
-									<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
-									<armorPenetrationSharp>1.5</armorPenetrationSharp>
-									<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
-								</li>
-								<li Class="CombatExtended.ToolCE">
-									<label>head</label>
-									<capacities>
-										<li>Blunt</li>
-									</capacities>
-									<power>24</power>
-									<cooldownTime>1.33</cooldownTime>
-									<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-									<chanceFactor>0.2</chanceFactor>
-									<armorPenetrationBlunt>6</armorPenetrationBlunt>
-								</li>
-							</tools>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="pphhyy_BloodScarab"]/statBases/ArmorRating_Blunt</xpath>
-						<value>
-							<ArmorRating_Blunt>10</ArmorRating_Blunt>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="pphhyy_BloodScarab"]/statBases/ArmorRating_Sharp</xpath>
-						<value>
-							<ArmorRating_Sharp>4</ArmorRating_Sharp>
-						</value>
-					</li>
-
-					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="pphhyy_BloodScarab"]/race/baseHealthScale</xpath>
-						<value>
-							<baseHealthScale>1.8</baseHealthScale>
-						</value>
-					</li>
-
-				</operations>
-			</match>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/pphhyy Sanguinary Animals/SanguineAnimals_Materials.xml b/Patches/pphhyy Sanguinary Animals/SanguineAnimals_Materials.xml
deleted file mode 100644
index 902b03c7e2..0000000000
--- a/Patches/pphhyy Sanguinary Animals/SanguineAnimals_Materials.xml	
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>pphhyy Sanguinary Animals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<!-- Sanguine Deer Leather -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="pphhyy_Leather_SanguineDeer"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.05</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="pphhyy_Leather_SanguineDeer"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.02</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<!-- Sanguine Deer Wool -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="pphhyy_Wool_SanguineDeer"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.01</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="pphhyy_Wool_SanguineDeer"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.044</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="pphhyy_Wool_SanguineDeer"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.05</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-				<!-- Vargulf -->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="pphhyy_Leather_Vargulf"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<StuffPower_Armor_Sharp>0.07</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="pphhyy_Leather_Vargulf"]/statBases</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.056</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Royalty/Patches/BackstoryDefs/Patch_Backstories.xml b/Royalty/Patches/BackstoryDefs/Patch_Backstories.xml
index 4470574bad..d555415192 100644
--- a/Royalty/Patches/BackstoryDefs/Patch_Backstories.xml
+++ b/Royalty/Patches/BackstoryDefs/Patch_Backstories.xml
@@ -6,10 +6,7 @@
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/BackstoryDef[defName="ReconSniper89"]/possessions</xpath>
 		<value>
-			<li>
-				<key>Ammo_762x51mmNATO_FMJ</key>
-				<value>15</value>
-			</li>
+      <Ammo_762x51mmNATO_FMJ>15</Ammo_762x51mmNATO_FMJ>
 		</value>
 	</Operation>
 
diff --git a/Royalty/Patches/ThingDefs_Buildings/Buildings_Mechanoid.xml b/Royalty/Patches/ThingDefs_Buildings/Buildings_Mechanoid.xml
index 8b84cc22e0..bea38bc098 100644
--- a/Royalty/Patches/ThingDefs_Buildings/Buildings_Mechanoid.xml
+++ b/Royalty/Patches/ThingDefs_Buildings/Buildings_Mechanoid.xml
@@ -41,7 +41,7 @@
 	</Operation>
 
 	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName="Gloomlight"]</xpath>
+		<xpath>Defs/ThingDef[defName="Gloomlight"]/fillPercent</xpath>
 		<value>
 			<fillPercent>0.3</fillPercent>
 		</value>
diff --git a/Royalty/Patches/ThingDefs_Misc/Apparel_RoyaltyArmor.xml b/Royalty/Patches/ThingDefs_Misc/Apparel_RoyaltyArmor.xml
index 671bdc360a..6bda0be3b8 100644
--- a/Royalty/Patches/ThingDefs_Misc/Apparel_RoyaltyArmor.xml
+++ b/Royalty/Patches/ThingDefs_Misc/Apparel_RoyaltyArmor.xml
@@ -182,14 +182,14 @@
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="Apparel_ArmorMarineGrenadier"]/comps/li[@Class="CompProperties_Reloadable"]/ammoDef</xpath>
+		<xpath>Defs/ThingDef[defName="Apparel_ArmorMarineGrenadier"]/comps/li[@Class="CompProperties_ApparelReloadable"]/ammoDef</xpath>
 		<value>
 			<ammoDef>Ammo_30x29mmGrenade_HE</ammoDef>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="Apparel_ArmorMarineGrenadier"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountPerCharge</xpath>
+		<xpath>Defs/ThingDef[defName="Apparel_ArmorMarineGrenadier"]/comps/li[@Class="CompProperties_ApparelReloadable"]/ammoCountPerCharge</xpath>
 		<value>
 			<ammoCountPerCharge>1</ammoCountPerCharge>
 		</value>
@@ -273,14 +273,14 @@
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="Apparel_ArmorCataphractPhoenix"]/comps/li[@Class="CompProperties_Reloadable"]/ammoDef</xpath>
+		<xpath>Defs/ThingDef[defName="Apparel_ArmorCataphractPhoenix"]/comps/li[@Class="CompProperties_ApparelReloadable"]/ammoDef</xpath>
 		<value>
 			<ammoDef>Ammo_30x64mmFuel_Incendiary</ammoDef>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="Apparel_ArmorCataphractPhoenix"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountPerCharge</xpath>
+		<xpath>Defs/ThingDef[defName="Apparel_ArmorCataphractPhoenix"]/comps/li[@Class="CompProperties_ApparelReloadable"]/ammoCountPerCharge</xpath>
 		<value>
 			<ammoCountPerCharge>1</ammoCountPerCharge>
 		</value>
diff --git a/Source/BetterTurretsCompat/BetterTurretsCompat.csproj b/Source/BetterTurretsCompat/BetterTurretsCompat.csproj
index b4ac58ecc6..5a94488bc6 100644
--- a/Source/BetterTurretsCompat/BetterTurretsCompat.csproj
+++ b/Source/BetterTurretsCompat/BetterTurretsCompat.csproj
@@ -54,7 +54,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Krafs.Rimworld.Ref" Version="1.4.3704" GeneratePathProperty="true" />
-		<PackageReference Include="Lib.Harmony" Version="2.2.2" ExcludeAssets="runtime" />
+		<PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4061" GeneratePathProperty="true" />
+		<PackageReference Include="Lib.Harmony" Version="2.3.3" ExcludeAssets="runtime" />
 	</ItemGroup>
 </Project>
diff --git a/Source/CombatExtended/CombatExtended.csproj b/Source/CombatExtended/CombatExtended.csproj
index 4d140cc7b0..48af98c638 100644
--- a/Source/CombatExtended/CombatExtended.csproj
+++ b/Source/CombatExtended/CombatExtended.csproj
@@ -128,8 +128,8 @@
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="Krafs.Rimworld.Ref" Version="1.4.3704" GeneratePathProperty="true" />
-		<PackageReference Include="Lib.Harmony" Version="2.2.2" ExcludeAssets="runtime" />
+		<PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4061" GeneratePathProperty="true" />
+		<PackageReference Include="Lib.Harmony" Version="2.3.3" ExcludeAssets="runtime" />
 	</ItemGroup>
 	<ItemGroup>
 		<Publicize Include="Assembly-CSharp" />
diff --git a/Source/CombatExtended/CombatExtended/AI/Comps/CompOpportunisticSwitch.cs b/Source/CombatExtended/CombatExtended/AI/Comps/CompOpportunisticSwitch.cs
index b36135817b..2fc7b463ed 100644
--- a/Source/CombatExtended/CombatExtended/AI/Comps/CompOpportunisticSwitch.cs
+++ b/Source/CombatExtended/CombatExtended/AI/Comps/CompOpportunisticSwitch.cs
@@ -134,10 +134,11 @@ public override bool StartCastChecks(Verb verb, LocalTargetInfo castTarg, LocalT
             {
                 return false;
             }
-            if (TryUseAOE(verb, castTarg, destTarg))
-            {
-                return false;
-            }
+            //TODO 1.5
+            //if (TryUseAOE(verb, castTarg, destTarg))
+            //{
+            //return false;
+            //}
             return true;
         }
 
diff --git a/Source/CombatExtended/CombatExtended/AI/Comps/CompTend.cs b/Source/CombatExtended/CombatExtended/AI/Comps/CompTend.cs
index b52ca49e5e..6a6f74693a 100644
--- a/Source/CombatExtended/CombatExtended/AI/Comps/CompTend.cs
+++ b/Source/CombatExtended/CombatExtended/AI/Comps/CompTend.cs
@@ -69,7 +69,7 @@ public override Job TryGiveTacticalJob()
                 lastTendJobCheckedAt = GenTicks.TicksGame;
                 return null;
             }
-            if (SelPawn.Position.PawnsInRange(Map, 35).Any(p => p.HostileTo(SelPawn) && !SelPawn.HiddingBehindCover(p)))
+            if (SelPawn.Position.PawnsInRange(Map, 35).Any(p => (p?.HostileTo(SelPawn) ?? false) && !SelPawn.HiddingBehindCover(p)))
             {
                 lastTendJobCheckedAt = GenTicks.TicksGame - COOLDOWN_TEND_JOB_CHECK / 2;
                 return SuppressionUtility.GetRunForCoverJob(SelPawn);
diff --git a/Source/CombatExtended/CombatExtended/AI/Jobs/JobDriver_AttackOpportunistic.cs b/Source/CombatExtended/CombatExtended/AI/Jobs/JobDriver_AttackOpportunistic.cs
index 5f485a9f46..1e7cacba1b 100644
--- a/Source/CombatExtended/CombatExtended/AI/Jobs/JobDriver_AttackOpportunistic.cs
+++ b/Source/CombatExtended/CombatExtended/AI/Jobs/JobDriver_AttackOpportunistic.cs
@@ -80,7 +80,7 @@ public override IEnumerable<Toil> MakeNewToils()
             }
 
             // switch back action
-            this.AddFinishAction(() =>
+            this.AddFinishAction(delegate
             {
                 if (oldWeapon != null && oldWeapon != pawn.equipment?.Primary && !oldWeapon.Destroyed)
                 {
diff --git a/Source/CombatExtended/CombatExtended/AI/Toils/Toils_CombatCE.cs b/Source/CombatExtended/CombatExtended/AI/Toils/Toils_CombatCE.cs
index 026ba199ad..ee1c78be78 100644
--- a/Source/CombatExtended/CombatExtended/AI/Toils/Toils_CombatCE.cs
+++ b/Source/CombatExtended/CombatExtended/AI/Toils/Toils_CombatCE.cs
@@ -89,7 +89,7 @@ public static IEnumerable<Toil> AttackStatic(IJobDriver_Tactical driver, TargetI
                     if (target.HasThing)
                     {
                         Pawn pawn = target.Thing as Pawn;
-                        if (target.Thing.Destroyed || (pawn != null && !startedIncapacitated && pawn.Downed) || (pawn != null && pawn.IsInvisible()))
+                        if (target.Thing.Destroyed || (pawn != null && !startedIncapacitated && pawn.Downed) || (pawn != null && !(pawn.GetInvisibilityComp()?.ForcedVisible ?? false)))
                         {
                             driver.EndJobWith(JobCondition.Succeeded);
                             return;
diff --git a/Source/CombatExtended/CombatExtended/AmmoGeneralizer.cs b/Source/CombatExtended/CombatExtended/AmmoGeneralizer.cs
index 72de23bff5..be1878c2cb 100644
--- a/Source/CombatExtended/CombatExtended/AmmoGeneralizer.cs
+++ b/Source/CombatExtended/CombatExtended/AmmoGeneralizer.cs
@@ -5,126 +5,126 @@
 using RimWorld;
 using Verse;
 using UnityEngine;
-
-namespace CombatExtended
-{
-    [StaticConstructorOnStartup]
-    public class AmmoGeneralizer
-    {
-        static AmmoGeneralizer()
-        {
-            /*
-             * Generic ammosetdefs need projectiles for the code to work, but what the projectiles are doesn't matter
-             * Also generic ammosetdefs need their own recipes for ammo, the similarTo caliber's will have their recipes hidden
-             */
-            if (Controller.settings.GenericAmmo)
-            {
-
-                var toGenericAmmos = DefDatabase<AmmoSetDef>.AllDefs.Where(x => x.similarTo != null);
-
-                foreach (AmmoSetDef amset in toGenericAmmos)
-                {
-                    List<AmmoLink> newAmmos = new List<AmmoLink>();
-                    var ammoSource = amset.similarTo;
-                    foreach (AmmoLink link in amset.ammoTypes)
-                    {
-                        var sameClass = ammoSource.ammoTypes.Find(x => x.ammo.ammoClass == link.ammo.ammoClass);
-                        if (sameClass != null)
-                        {
-                            link.projectile.label = ammoSource.label + " bullet " + "(" + link.ammo.ammoClass.labelShort + ")";
-                            newAmmos.Add(new AmmoLink { ammo = sameClass.ammo, projectile = link.projectile });
-                        }
-
-                        var makeRecipe = DefDatabase<RecipeDef>.AllDefs.Where(x => x.defName == "Make" + link.ammo.defName).FirstOrFallback();
-
-                        link.ammo.SetMenuHidden(true);
-
-                        if (makeRecipe != null)
-                        {
-
-                            if (CE_ThingDefOf.AmmoBench.AllRecipes.Contains(makeRecipe))
-                            {
-                                CE_ThingDefOf.AmmoBench.AllRecipes.Remove(makeRecipe);
-                            }
-
-                            if (makeRecipe.AllRecipeUsers.Count() > 0 | (makeRecipe.recipeUsers?.Count() ?? 0) > 0)
-                            {
-                                makeRecipe.recipeUsers = new List<ThingDef>();
-                            }
-                        }
-
-                        link.ammo.AmmoSetDefs.Add(ammoSource);
-
-
-
-                    }
-
-                    amset.label = ammoSource.label;
-                    amset.ammoTypes = newAmmos;
-
-                }
-
-                var toFixScenarios = DefDatabase<ScenarioDef>.AllDefs.Where(x => x.scenario.AllParts.Any(y => y.def == ScenPartDefOf.ScatterThingsAnywhere | y.def == ScenPartDefOf.ScatterThingsNearPlayerStart | y.def == ScenPartDefOf.StartingThing_Defined));
-                foreach (ScenarioDef def in toFixScenarios)
-                {
-                    var PartAmmos = def.scenario.AllParts.Where(y => y is ScenPart_StartingThing_Defined
-                                    && ((ScenPart_StartingThing_Defined)y).thingDef is AmmoDef).Select(x => x as ScenPart_StartingThing_Defined);
-
-                    foreach (ScenPart_StartingThing_Defined scene in PartAmmos)
-                    {
-                        var ammodef = ((AmmoDef)scene.thingDef);
-
-                        var ammoreplaced = ammodef.AmmoSetDefs?.FirstOrFallback()?.ammoTypes?.Find(x => x.ammo.ammoClass == ammodef.ammoClass)?.ammo ?? null;
-
-                        if (ammoreplaced != null)
-                        {
-                            scene.thingDef = ammoreplaced;
-                        }
-
-
-                    }
-                }
-
-                var toFixComps = DefDatabase<ThingDef>.AllDefs.Where(x => x.comps?.Any(x => x is CompProperties_Reloadable) ?? false);
-
-                foreach (var def in toFixComps)
-                {
-
-                    var compProps = def.GetCompProperties<CompProperties_Reloadable>();
-                    if (compProps.ammoDef is AmmoDef am)
-                    {
-                        if (am.AmmoSetDefs.NullOrEmpty())
-                        {
-                            Log.Warning($"Apparel {def} has CE AmmoDef but with no AmmoSetDef");
-                            continue;
-                        }
-
-                        //I don't know why this works but it does. It seems like the AmmoSetDefs here only contain the generic ammo version.
-                        var ammoset = am.AmmoSetDefs.Find(x => x.similarTo == null);
-                        if (ammoset != null)
-                        {
-                            Log.Message(def.label + " switching to " + ammoset.label);
-                            var ammo = ammoset.ammoTypes.Find(x => (x.ammo?.ammoClass ?? null) == am.ammoClass)?.ammo ?? null;
-
-                            if (ammo == null)
-                            {
-                                ammo = ammoset.ammoTypes[0].ammo;
-                            }
-                            compProps.ammoDef = ammo;
-                        }
-                        else if (!am.AmmoSetDefs.NullOrEmpty())
-                        {
-                            Log.Warning($"Apparel {def} has CE AmmoDef {am.AmmoSetDefs[0]} but no similarTo tag");
-                        }
-                        else
-                        {
-                            Log.Warning($"Apparel {def} has CE AmmoDef with no AmmoSetDefs");
-                        }
-                    }
-                }
-            }
-
-
-        }
-    }
-}
+//TODO Ammo Generalizer 1.5
+//namespace CombatExtended
+//{
+//    [StaticConstructorOnStartup]
+//    public class AmmoGeneralizer
+//    {
+//        static AmmoGeneralizer()
+//        {
+//            /*
+//             * Generic ammosetdefs need projectiles for the code to work, but what the projectiles are doesn't matter
+//             * Also generic ammosetdefs need their own recipes for ammo, the similarTo caliber's will have their recipes hidden
+//             */
+//            if (Controller.settings.GenericAmmo)
+//            {
+//
+//                var toGenericAmmos = DefDatabase<AmmoSetDef>.AllDefs.Where(x => x.similarTo != null);
+//
+//                foreach (AmmoSetDef amset in toGenericAmmos)
+//                {
+//                    List<AmmoLink> newAmmos = new List<AmmoLink>();
+//                    var ammoSource = amset.similarTo;
+//                    foreach (AmmoLink link in amset.ammoTypes)
+//                    {
+//                        var sameClass = ammoSource.ammoTypes.Find(x => x.ammo.ammoClass == link.ammo.ammoClass);
+//                        if (sameClass != null)
+//                        {
+//                            link.projectile.label = ammoSource.label + " bullet " + "(" + link.ammo.ammoClass.labelShort + ")";
+//                            newAmmos.Add(new AmmoLink { ammo = sameClass.ammo, projectile = link.projectile });
+//                        }
+//
+//                        var makeRecipe = DefDatabase<RecipeDef>.AllDefs.Where(x => x.defName == "Make" + link.ammo.defName).FirstOrFallback();
+//
+//                        link.ammo.SetMenuHidden(true);
+//
+//                        if (makeRecipe != null)
+//                        {
+//
+//                            if (CE_ThingDefOf.AmmoBench.AllRecipes.Contains(makeRecipe))
+//                            {
+//                                CE_ThingDefOf.AmmoBench.AllRecipes.Remove(makeRecipe);
+//                            }
+//
+//                            if (makeRecipe.AllRecipeUsers.Count() > 0 | (makeRecipe.recipeUsers?.Count() ?? 0) > 0)
+//                            {
+//                                makeRecipe.recipeUsers = new List<ThingDef>();
+//                            }
+//                        }
+//
+//                        link.ammo.AmmoSetDefs.Add(ammoSource);
+//
+//
+//
+//                    }
+//
+//                    amset.label = ammoSource.label;
+//                    amset.ammoTypes = newAmmos;
+//
+//                }
+//
+//                var toFixScenarios = DefDatabase<ScenarioDef>.AllDefs.Where(x => x.scenario.AllParts.Any(y => y.def == ScenPartDefOf.ScatterThingsAnywhere | y.def == ScenPartDefOf.ScatterThingsNearPlayerStart | y.def == ScenPartDefOf.StartingThing_Defined));
+//                foreach (ScenarioDef def in toFixScenarios)
+//                {
+//                    var PartAmmos = def.scenario.AllParts.Where(y => y is ScenPart_StartingThing_Defined
+//                                    && ((ScenPart_StartingThing_Defined)y).thingDef is AmmoDef).Select(x => x as ScenPart_StartingThing_Defined);
+//
+//                    foreach (ScenPart_StartingThing_Defined scene in PartAmmos)
+//                    {
+//                        var ammodef = ((AmmoDef)scene.thingDef);
+//
+//                        var ammoreplaced = ammodef.AmmoSetDefs?.FirstOrFallback()?.ammoTypes?.Find(x => x.ammo.ammoClass == ammodef.ammoClass)?.ammo ?? null;
+//
+//                        if (ammoreplaced != null)
+//                        {
+//                            scene.thingDef = ammoreplaced;
+//                        }
+//
+//
+//                    }
+//                }
+//
+//                var toFixComps = DefDatabase<ThingDef>.AllDefs.Where(x => x.comps?.Any(x => x is CompProperties_Reloadable) ?? false);
+//
+//                foreach (var def in toFixComps)
+//                {
+//
+//                    var compProps = def.GetCompProperties<CompProperties_Reloadable>();
+//                    if (compProps.ammoDef is AmmoDef am)
+//                    {
+//                        if (am.AmmoSetDefs.NullOrEmpty())
+//                        {
+//                            Log.Warning($"Apparel {def} has CE AmmoDef but with no AmmoSetDef");
+//                            continue;
+//                        }
+//
+//                        //I don't know why this works but it does. It seems like the AmmoSetDefs here only contain the generic ammo version.
+//                        var ammoset = am.AmmoSetDefs.Find(x => x.similarTo == null);
+//                        if (ammoset != null)
+//                        {
+//                            Log.Message(def.label + " switching to " + ammoset.label);
+//                            var ammo = ammoset.ammoTypes.Find(x => (x.ammo?.ammoClass ?? null) == am.ammoClass)?.ammo ?? null;
+//
+//                            if (ammo == null)
+//                            {
+//                                ammo = ammoset.ammoTypes[0].ammo;
+//                            }
+//                            compProps.ammoDef = ammo;
+//                        }
+//                        else if (!am.AmmoSetDefs.NullOrEmpty())
+//                        {
+//                            Log.Warning($"Apparel {def} has CE AmmoDef {am.AmmoSetDefs[0]} but no similarTo tag");
+//                        }
+//                        else
+//                        {
+//                            Log.Warning($"Apparel {def} has CE AmmoDef with no AmmoSetDefs");
+//                        }
+//                    }
+//                }
+//            }
+//
+//
+//        }
+//    }
+//}
diff --git a/Source/CombatExtended/CombatExtended/BoundsInjector.cs b/Source/CombatExtended/CombatExtended/BoundsInjector.cs
index f461a84d88..698b064212 100644
--- a/Source/CombatExtended/CombatExtended/BoundsInjector.cs
+++ b/Source/CombatExtended/CombatExtended/BoundsInjector.cs
@@ -364,13 +364,14 @@ public static Vector2 ForPawn(Pawn pawn)
 
                 if (!pawn.kindDef.alternateGraphics.NullOrEmpty())
                 {
-                    if (!pawn.Drawer.renderer.graphics.AllResolved)
-                    {
-                        pawn.Drawer.renderer.graphics.ResolveAllGraphics();
-                    }
-
-                    name = "alternateGraphics";
-                    graphic = pawn.Drawer.renderer.graphics.nakedGraphic;
+                    //TODO: 1.5
+                    //if (!pawn.Drawer.renderer.graphics.AllResolved)
+                    //{
+                    //pawn.Drawer.renderer.graphics.ResolveAllGraphics();
+                    //}
+
+                    //name = "alternateGraphics";
+                    //graphic = pawn.Drawer.renderer.graphics.nakedGraphic;
                 }
 
                 if (graphic == null)
diff --git a/Source/CombatExtended/CombatExtended/Building_AmmoContainerCE/Building_AutoloaderCE.cs b/Source/CombatExtended/CombatExtended/Building_AmmoContainerCE/Building_AutoloaderCE.cs
index 23132c7ba5..5e8c454595 100644
--- a/Source/CombatExtended/CombatExtended/Building_AmmoContainerCE/Building_AutoloaderCE.cs
+++ b/Source/CombatExtended/CombatExtended/Building_AmmoContainerCE/Building_AutoloaderCE.cs
@@ -282,9 +282,9 @@ public override void Tick()
 
         }
 
-        public override void Draw()
+        public override void DrawAt(Vector3 drawLoc, bool flip = false)
         {
-            base.Draw();
+            base.DrawAt(drawLoc, flip);
             if (isActive)
             {
                 GenDraw.FillableBarRequest r = default(GenDraw.FillableBarRequest);
diff --git a/Source/CombatExtended/CombatExtended/CE_DebugUtility.cs b/Source/CombatExtended/CombatExtended/CE_DebugUtility.cs
index b0685cb8d7..1853bb00c2 100644
--- a/Source/CombatExtended/CombatExtended/CE_DebugUtility.cs
+++ b/Source/CombatExtended/CombatExtended/CE_DebugUtility.cs
@@ -4,6 +4,7 @@
 using RimWorld;
 using RimWorld.Planet;
 using Verse;
+using LudeonTK;
 
 namespace CombatExtended
 {
@@ -21,7 +22,7 @@ public static string TileIndexTip(World world, int tile)
             return $"Tile index: {tile}";
         }
 
-        [DebugOutput("CE", name = "Not patched WorldObjecDefs")]
+        [DebugOutputAttribute("CE", name = "Not patched WorldObjecDefs")]
         public static void NotPatchedWorldObjectDefs()
         {
             var notPatched = DefDatabase<WorldObjectDef>.AllDefsListForReading.Where(x => !x.comps.Any(comp => comp is WorldObjectCompProperties_Health) || !x.comps.Any(comp => comp is WorldObjectCompProperties_Hostility));
diff --git a/Source/CombatExtended/CombatExtended/CE_Utility.cs b/Source/CombatExtended/CombatExtended/CE_Utility.cs
index 2576757a67..b78537fb34 100644
--- a/Source/CombatExtended/CombatExtended/CE_Utility.cs
+++ b/Source/CombatExtended/CombatExtended/CE_Utility.cs
@@ -1470,7 +1470,7 @@ public static void DamageOutsideSquishy(DamageWorker_AddInjury __instance, Damag
                     {
                         Hediff_Injury hediff_Injury = (Hediff_Injury)HediffMaker.MakeHediff(HealthUtility.GetHediffDefFromDamage(dinfo.Def, pawn, parent), pawn, null);
                         hediff_Injury.Part = parent;
-                        hediff_Injury.source = dinfo.Weapon;
+                        hediff_Injury.sourceDef = dinfo.Weapon;
                         hediff_Injury.sourceBodyPartGroup = dinfo.WeaponBodyPartGroup;
                         hediff_Injury.Severity = totalDamage - (hitPartHealth * hitPartHealth / totalDamage);
                         if (hediff_Injury.Severity <= 0f)
diff --git a/Source/CombatExtended/CombatExtended/Comps/CompAmmoExploder.cs b/Source/CombatExtended/CombatExtended/Comps/CompAmmoExploder.cs
index 55bfe87bd2..102efc12a0 100644
--- a/Source/CombatExtended/CombatExtended/Comps/CompAmmoExploder.cs
+++ b/Source/CombatExtended/CombatExtended/Comps/CompAmmoExploder.cs
@@ -13,10 +13,10 @@ public class CompAmmoExploder : ThingComp
     {
         public DamageDef damageDef;
 
-        public override void PostPreApplyDamage(DamageInfo dinfo, out bool absorbed)
+        public override void PostPreApplyDamage(ref DamageInfo dinfo, out bool absorbed)
         {
             damageDef = dinfo.Def;
-            base.PostPreApplyDamage(dinfo, out absorbed);
+            base.PostPreApplyDamage(ref dinfo, out absorbed);
         }
         public void PostDamageResult(DamageWorker.DamageResult damage)
         {
diff --git a/Source/CombatExtended/CombatExtended/Comps/CompAmmoUser.cs b/Source/CombatExtended/CombatExtended/Comps/CompAmmoUser.cs
index 1a13c15d15..e1aa4617b6 100644
--- a/Source/CombatExtended/CombatExtended/Comps/CompAmmoUser.cs
+++ b/Source/CombatExtended/CombatExtended/Comps/CompAmmoUser.cs
@@ -557,10 +557,10 @@ public bool TryUnload(out Thing droppedAmmo, bool forceUnload = false)
             int remainder = curMagCountInt % CurAmmoCount;
             if (remainder > 0)
             {
-                if (currentAmmoInt.HasComp(typeof(CompReloadable)))
+                if (currentAmmoInt.HasComp(typeof(CompApparelReloadable)))
                 {
                     remainderThing = ThingMaker.MakeThing(currentAmmoInt);
-                    remainderThing.TryGetComp<CompReloadable>().remainingCharges = remainder;
+                    remainderThing.TryGetComp<CompApparelReloadable>().remainingCharges = remainder;
                 }
                 else if (currentAmmoInt.partialUnloadAmmoDef != null)
                 {
@@ -739,7 +739,7 @@ public void LoadAmmo(Thing ammo = null)
                 }
                 currentAmmoInt = (AmmoDef)ammoThing.def;
 
-                CompReloadable compReloadable = ammoThing.TryGetComp<CompReloadable>();
+                CompApparelReloadable compReloadable = ammoThing.TryGetComp<CompApparelReloadable>();
                 // If there's more ammo in inventory than the weapon can hold, or if there's greater than 1 bullet in inventory if reloading one at a time
                 if ((Props.reloadOneAtATime ? 1 : MagAmmoCount) < ammoThing.stackCount)
                 {
diff --git a/Source/CombatExtended/CombatExtended/Comps/CompArmorDurability.cs b/Source/CombatExtended/CombatExtended/Comps/CompArmorDurability.cs
index 043707d49b..eb0d8265b0 100644
--- a/Source/CombatExtended/CombatExtended/Comps/CompArmorDurability.cs
+++ b/Source/CombatExtended/CombatExtended/Comps/CompArmorDurability.cs
@@ -161,9 +161,9 @@ public override string CompInspectStringExtra()
             }
         }
 
-        public override void PostPreApplyDamage(DamageInfo dinfo, out bool absorbed)
+        public override void PostPreApplyDamage(ref DamageInfo dinfo, out bool absorbed)
         {
-            base.PostPreApplyDamage(dinfo, out absorbed);
+            base.PostPreApplyDamage(ref dinfo, out absorbed);
             if (curDurability > 0)
             {
                 curDurability -= dinfo.Amount;
diff --git a/Source/CombatExtended/CombatExtended/Comps/CompMeleeTargettingGizmo.cs b/Source/CombatExtended/CombatExtended/Comps/CompMeleeTargettingGizmo.cs
index 20c91a814e..d2aee69fe1 100644
--- a/Source/CombatExtended/CombatExtended/Comps/CompMeleeTargettingGizmo.cs
+++ b/Source/CombatExtended/CombatExtended/Comps/CompMeleeTargettingGizmo.cs
@@ -92,9 +92,10 @@ public BodyPartHeight finalHeight(Pawn target)
 
             if (PawnParent.skills.GetSkill(SkillDefOf.Melee).Level >= 16)
             {
-                targetBodyPart = BodyPartDefOf.Neck;
+                //TODO: 1.5 Should be neck?
+                targetBodyPart = BodyPartDefOf.Eye;
 
-                var neck = target.health.hediffSet.GetNotMissingParts(BodyPartHeight.Top).Where(y => y.def == BodyPartDefOf.Neck).FirstOrFallback();
+                var neck = target.health.hediffSet.GetNotMissingParts(BodyPartHeight.Top).Where(y => y.def == BodyPartDefOf.Eye).FirstOrFallback();
 
                 if (neck != null)
                 {
diff --git a/Source/CombatExtended/CombatExtended/Comps/CompTacticalManager.cs b/Source/CombatExtended/CombatExtended/Comps/CompTacticalManager.cs
index 4939d2fe2f..d5bb8e7152 100644
--- a/Source/CombatExtended/CombatExtended/Comps/CompTacticalManager.cs
+++ b/Source/CombatExtended/CombatExtended/Comps/CompTacticalManager.cs
@@ -69,31 +69,6 @@ public List<Pawn> TargetedBy
         {
             get
             {
-                if (_targetedByTick != GenTicks.TicksGame || _targetedByTick == -1)
-                {
-                    _targetedByTick = GenTicks.TicksGame;
-                    _targetedByCache.Clear();
-
-                    Job job;
-                    for (int i = 0; i < targetedBy.Count; i++)
-                    {
-                        try
-                        {
-                            Verse.WeakReference<Pawn> reference = targetedBy[i];
-                            Pawn pawn;
-                            if (reference.SafeGetIsAlive() && (job = (pawn = (Pawn)reference.SafeGetTarget())?.jobs.curJob) != null && (pawn?.Spawned ?? false))
-                            {
-                                if (job.AnyTargetIs(parent))
-                                {
-                                    _targetedByCache.Add(pawn);
-                                }
-                            }
-                        }
-                        catch
-                        {
-                        }
-                    }
-                }
                 return _targetedByCache;
             }
         }
diff --git a/Source/CombatExtended/CombatExtended/Comps/HediffComp_Prometheum.cs b/Source/CombatExtended/CombatExtended/Comps/HediffComp_Prometheum.cs
index 7230d2e0fd..f45e1ee448 100644
--- a/Source/CombatExtended/CombatExtended/Comps/HediffComp_Prometheum.cs
+++ b/Source/CombatExtended/CombatExtended/Comps/HediffComp_Prometheum.cs
@@ -27,7 +27,7 @@ public override void CompPostTick(ref float severityAdjustment)
                 Fire fire = Pawn.GetAttachment(ThingDefOf.Fire) as Fire;
                 if (fire == null && Pawn.Spawned)
                 {
-                    Pawn.TryAttachFire(parent.Severity * 0.5f);
+                    Pawn.TryAttachFire(parent.Severity * 0.5f, null);
                 }
                 else if (fire != null)
                 {
diff --git a/Source/CombatExtended/CombatExtended/Defs/AmmoDef.cs b/Source/CombatExtended/CombatExtended/Defs/AmmoDef.cs
index f281b4b9f4..961404e3ac 100644
--- a/Source/CombatExtended/CombatExtended/Defs/AmmoDef.cs
+++ b/Source/CombatExtended/CombatExtended/Defs/AmmoDef.cs
@@ -143,7 +143,7 @@ public override IEnumerable<string> ConfigErrors()
             {
                 yield return s;
             }
-            if (HasComp(typeof(CompReloadable)) && stackLimit > 1)
+            if (HasComp(typeof(CompApparelReloadable)) && stackLimit > 1)
             {
                 yield return "has compreloadable and a stack limit higher than 1. this is not recommended.";
             }
diff --git a/Source/CombatExtended/CombatExtended/GUI/Windows/Window_AttachmentsDebugger.cs b/Source/CombatExtended/CombatExtended/GUI/Windows/Window_AttachmentsDebugger.cs
index da1cf87ebd..03bec1dad0 100644
--- a/Source/CombatExtended/CombatExtended/GUI/Windows/Window_AttachmentsDebugger.cs
+++ b/Source/CombatExtended/CombatExtended/GUI/Windows/Window_AttachmentsDebugger.cs
@@ -158,13 +158,15 @@ private void DoRightPanel(Rect inRect)
                     collapsible.Lambda(20, (rect) =>
                     {
                         Text.Font = GameFont.Tiny;
-                        link.drawOffset.x = Widgets.HorizontalSlider_NewTemp(rect, link.drawOffset.x, -0.75f, 0.75f, true, $"drawOffset.x={Math.Round(link.drawOffset.x, 3)}");
+                        //TODO: 1.5
+                        link.drawOffset.x = 1; //Widgets.HorizontalSlider_NewTemp(rect, link.drawOffset.x, -0.75f, 0.75f, true, $"drawOffset.x={Math.Round(link.drawOffset.x, 3)}");
                     }, useMargins: true);
                     collapsible.Gap(2);
                     collapsible.Lambda(20, (rect) =>
                     {
                         Text.Font = GameFont.Tiny;
-                        link.drawOffset.y = Widgets.HorizontalSlider_NewTemp(rect, link.drawOffset.y, -0.75f, 0.75f, true, $"drawOffset.y={Math.Round(link.drawOffset.y, 3)}");
+                        //TODO: 1.5
+                        link.drawOffset.y = 1; // Widgets.HorizontalSlider_NewTemp(rect, link.drawOffset.y, -0.75f, 0.75f, true, $"drawOffset.y={Math.Round(link.drawOffset.y, 3)}");
                     }, useMargins: true);
                     collapsible.Gap(2);
                     collapsible.Label($"current drawScale value:", fontSize: GameFont.Tiny);
@@ -178,13 +180,15 @@ private void DoRightPanel(Rect inRect)
                     collapsible.Lambda(20, (rect) =>
                     {
                         Text.Font = GameFont.Tiny;
-                        link.drawScale.x = Widgets.HorizontalSlider_NewTemp(rect, link.drawScale.x, 0.6f, 1.6f, true, $"drawScale.x={Math.Round(link.drawScale.x, 3)}");
+                        // TODO: 1.5
+                        link.drawScale.x = 1; // = Widgets.HorizontalSlider_NewTemp(rect, link.drawScale.x, 0.6f, 1.6f, true, $"drawScale.x={Math.Round(link.drawScale.x, 3)}");
                     }, useMargins: true);
                     collapsible.Gap(2);
                     collapsible.Lambda(20, (rect) =>
                     {
                         Text.Font = GameFont.Tiny;
-                        link.drawScale.y = Widgets.HorizontalSlider_NewTemp(rect, link.drawScale.y, 0.6f, 1.6f, true, $"drawScale.y={Math.Round(link.drawScale.y, 3)}");
+                        // TODO: 1.5
+                        link.drawScale.y = 1; //Widgets.HorizontalSlider_NewTemp(rect, link.drawScale.y, 0.6f, 1.6f, true, $"drawScale.y={Math.Round(link.drawScale.y, 3)}");
                     }, useMargins: true);
                 }
                 collapsible.Line(1);
diff --git a/Source/CombatExtended/CombatExtended/GUI/Windows/Window_GiveAmmoAmountSlider.cs b/Source/CombatExtended/CombatExtended/GUI/Windows/Window_GiveAmmoAmountSlider.cs
index fa25801e1f..eae3d01a90 100644
--- a/Source/CombatExtended/CombatExtended/GUI/Windows/Window_GiveAmmoAmountSlider.cs
+++ b/Source/CombatExtended/CombatExtended/GUI/Windows/Window_GiveAmmoAmountSlider.cs
@@ -36,7 +36,8 @@ public override Vector2 InitialSize
         public override void DoWindowContents(Rect inRect)
         {
             Widgets.Label(inRect.TopHalf().TopHalf(), "CE_AmmoAmount".Translate() + " " + ammoToGiveAmount.ToString());
-            ammoToGiveAmount = (int)Widgets.HorizontalSlider_NewTemp(inRect.TopHalf().BottomHalf(), ammoToGiveAmount, 0, maxAmmoCount);
+            //TODO: 1.5
+            ammoToGiveAmount = 1; // (int)Widgets.HorizontalSlider_NewTemp(inRect.TopHalf().BottomHalf(), ammoToGiveAmount, 0, maxAmmoCount);
 
             if (Widgets.ButtonText(inRect.BottomHalf().LeftHalf(), "Cancel".Translate()))
             {
diff --git a/Source/CombatExtended/CombatExtended/Gizmos/Command_ReloadArmor.cs b/Source/CombatExtended/CombatExtended/Gizmos/Command_ReloadArmor.cs
index 9465758db3..e7c9599803 100644
--- a/Source/CombatExtended/CombatExtended/Gizmos/Command_ReloadArmor.cs
+++ b/Source/CombatExtended/CombatExtended/Gizmos/Command_ReloadArmor.cs
@@ -11,7 +11,7 @@ namespace CombatExtended
 {
     public class Command_ReloadArmor : Command_Action
     {
-        public CompReloadable compReloadable;
+        public CompApparelReloadable compReloadable;
 
         public override bool GroupsWith(Gizmo other)
         {
diff --git a/Source/CombatExtended/CombatExtended/Jobs/ExternalPawnDrafter.cs b/Source/CombatExtended/CombatExtended/Jobs/ExternalPawnDrafter.cs
index 654b8b3f82..8532650a74 100644
--- a/Source/CombatExtended/CombatExtended/Jobs/ExternalPawnDrafter.cs
+++ b/Source/CombatExtended/CombatExtended/Jobs/ExternalPawnDrafter.cs
@@ -27,7 +27,7 @@ public static void TakeOrderedJob(Pawn pawn, Job newJob)
                 return;
             }
             pawn.CurJob.playerForced = true;
-            if (pawn.CurJob.JobIsSameAs(newJob))
+            if (pawn.CurJob.JobIsSameAs(pawn, newJob))
             {
                 return;
             }
diff --git a/Source/CombatExtended/CombatExtended/Lasers/LaserBeamCE.cs b/Source/CombatExtended/CombatExtended/Lasers/LaserBeamCE.cs
index 6dd9fe9b31..abaa57716f 100644
--- a/Source/CombatExtended/CombatExtended/Lasers/LaserBeamCE.cs
+++ b/Source/CombatExtended/CombatExtended/Lasers/LaserBeamCE.cs
@@ -22,7 +22,7 @@ public override float DamageAmount
         public float DamageModifier = 1.0f;
         public LaserBeamDefCE laserBeamDef => base.def as LaserBeamDefCE;
 
-        public override void Draw()
+        public override void DrawAt(Vector3 drawLoc, bool flip = false)
         {
 
         }
diff --git a/Source/CombatExtended/CombatExtended/Lasers/LaserBeamGraphicCE.cs b/Source/CombatExtended/CombatExtended/Lasers/LaserBeamGraphicCE.cs
index 25d151e3c3..df27f363f3 100644
--- a/Source/CombatExtended/CombatExtended/Lasers/LaserBeamGraphicCE.cs
+++ b/Source/CombatExtended/CombatExtended/Lasers/LaserBeamGraphicCE.cs
@@ -195,7 +195,7 @@ public override void SpawnSetup(Map map, bool respawningAfterLoad)
             }
         }
 
-        public override void Draw()
+        public override void DrawAt(Vector3 drawLoc, bool flip = false)
         {
             SetupDrawing();
 
diff --git a/Source/CombatExtended/CombatExtended/LightingTracker.cs b/Source/CombatExtended/CombatExtended/LightingTracker.cs
index e5f9c3f614..c6af9f14c9 100644
--- a/Source/CombatExtended/CombatExtended/LightingTracker.cs
+++ b/Source/CombatExtended/CombatExtended/LightingTracker.cs
@@ -257,7 +257,7 @@ private float GameGlowAt(IntVec3 source)
             float glow = glowGridCache[source.x * map.Size.y + source.y];
             if (glow == -1)
             {
-                glowGridCache[source.x * map.Size.y + source.y] = glow = map.glowGrid.GameGlowAt(source);
+                glowGridCache[source.x * map.Size.y + source.y] = glow = map.glowGrid.GroundGlowAt(source);
             }
             return glow;
         }
diff --git a/Source/CombatExtended/CombatExtended/Loadouts/Dialog_ManageLoadouts.cs b/Source/CombatExtended/CombatExtended/Loadouts/Dialog_ManageLoadouts.cs
index 1ef3ead848..66b1f1e25c 100644
--- a/Source/CombatExtended/CombatExtended/Loadouts/Dialog_ManageLoadouts.cs
+++ b/Source/CombatExtended/CombatExtended/Loadouts/Dialog_ManageLoadouts.cs
@@ -48,7 +48,10 @@ private static Texture2D
         _iconPickupDrop = ContentFinder<Texture2D>.Get("UI/Icons/loadoutPickupDrop"),
         _iconDropExcess = ContentFinder<Texture2D>.Get("UI/Icons/loadoutDropExcess");
 
-        private static Regex validNameRegex = Outfit.ValidNameRegex;
+        //TODO: 1.5
+        //private static Regex validNameRegex = Outfit.ValidNameRegex;
+
+        private static Regex validNameRegex = new Regex("^.*$");
         private Vector2 _availableScrollPosition = Vector2.zero;
         private const float _barHeight = 24f;
         private Vector2 _countFieldSize = new Vector2(40f, 24f);
diff --git a/Source/CombatExtended/CombatExtended/Loadouts/ITab_Inventory.cs b/Source/CombatExtended/CombatExtended/Loadouts/ITab_Inventory.cs
index e451fe0cdd..d0a2a093be 100644
--- a/Source/CombatExtended/CombatExtended/Loadouts/ITab_Inventory.cs
+++ b/Source/CombatExtended/CombatExtended/Loadouts/ITab_Inventory.cs
@@ -401,7 +401,7 @@ public void DrawThingRowCE(ref float y, float width, Thing thing, bool showDropB
                     var worn_apparel = SelPawnForGear?.apparel?.WornApparel;
                     foreach (var apparel in worn_apparel)
                     {
-                        var compReloadable = apparel.TryGetComp<CompReloadable>();
+                        var compReloadable = apparel.TryGetComp<CompApparelReloadable>();
                         if (compReloadable != null && compReloadable.AmmoDef == thing.def && compReloadable.NeedsReload(true))
                         {
                             if (!SelPawnForGear.Drafted)    //TODO-1.2 This should be doable for drafted pawns as well, but the job does nothing. Figure out what's wrong and remove this condition.
@@ -519,7 +519,8 @@ private void RebuildArmorCache(Dictionary<BodyPartRecord, float> armorCache, Sta
             List<Apparel> wornApparel = SelPawnForGear.apparel?.WornApparel;
             foreach (BodyPartRecord part in SelPawnForGear.RaceProps.body.AllParts)
             {
-                if (part.depth == BodyPartDepth.Outside && (part.coverage >= 0.1 || (part.def == BodyPartDefOf.Eye || part.def == BodyPartDefOf.Neck)))
+                //TODO: 1.5 should be Neck
+                if (part.depth == BodyPartDepth.Outside && (part.coverage >= 0.1 || (part.def == BodyPartDefOf.Eye || part.def == BodyPartDefOf.Eye)))
                 {
                     float armorValue = part.IsInGroup(CE_BodyPartGroupDefOf.CoveredByNaturalArmor) ? naturalArmor : 0f;
                     if (wornApparel != null)
diff --git a/Source/CombatExtended/CombatExtended/MoteThrownCE.cs b/Source/CombatExtended/CombatExtended/MoteThrownCE.cs
index bc4408b416..fede4cea67 100644
--- a/Source/CombatExtended/CombatExtended/MoteThrownCE.cs
+++ b/Source/CombatExtended/CombatExtended/MoteThrownCE.cs
@@ -50,7 +50,7 @@ public float CurAltitude
             }
         }
 
-        public override void Draw()
+        public override void DrawAt(Vector3 drawLoc, bool flip = false)
         {
             /*
              * Required to allow rendering without setting y to 0
@@ -60,7 +60,7 @@ public override void Draw()
             {
                 Color color = MoteGraphic.Color * this.instanceColor;
                 color.a *= alpha;
-                Vector3 exactScale = this.exactScale;
+                Vector3 exactScale = this.ExactScale;
                 exactScale.x *= MoteGraphic.data.drawSize.x;
                 exactScale.z *= MoteGraphic.data.drawSize.y;
                 Matrix4x4 matrix = default(Matrix4x4);
diff --git a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs
index c73763760e..346df35707 100644
--- a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs
+++ b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs
@@ -984,6 +984,10 @@ protected bool TryCollideWith(Thing thing)
         /// <param name="suppressionMultiplier">How much to multiply the projectile's damage by before using it as suppression</param>
         protected void ApplySuppression(Pawn pawn, float suppressionMultiplier = 1f)
         {
+            if (pawn == null)
+            {
+                return;
+            }
             var propsCE = def.projectile as ProjectilePropertiesCE;
 
             if (propsCE.suppressionFactor <= 0f || (!landed && propsCE.airborneSuppressionFactor <= 0f))
@@ -992,7 +996,7 @@ protected void ApplySuppression(Pawn pawn, float suppressionMultiplier = 1f)
             }
 
             CompShield shield = pawn.TryGetComp<CompShield>();
-            if (pawn.RaceProps.Humanlike)
+            if (pawn.RaceProps?.Humanlike ?? false)
             {
                 // check for shield user
 
@@ -1194,7 +1198,7 @@ public override void Tick()
         /// <summary>
         /// Draws projectile if at least a tick away from caster (or always if no caster)
         /// </summary>
-        public override void Draw()
+        public override void DrawAt(Vector3 drawLoc, bool flip = false)
         {
             if (FlightTicks == 0 && launcher != null && launcher is Pawn)
             {
diff --git a/Source/CombatExtended/CombatExtended/SuppressionUtility.cs b/Source/CombatExtended/CombatExtended/SuppressionUtility.cs
index 0fdb81e4e8..c88cea0785 100644
--- a/Source/CombatExtended/CombatExtended/SuppressionUtility.cs
+++ b/Source/CombatExtended/CombatExtended/SuppressionUtility.cs
@@ -28,6 +28,11 @@ public static class SuppressionUtility
 
         public static bool TryRequestHelp(Pawn pawn)
         {
+            //TODO: 1.5
+            if (pawn != null)
+            {
+                return false;
+            }
             Map map = pawn.Map;
             float curLevel = pawn.TryGetComp<CompSuppressable>().CurrentSuppression;
             ThingWithComps grenade = null;
@@ -307,7 +312,6 @@ public static List<MentalStateDef> GetPossibleBreaks(Pawn pawn)
 
             // Panic break
             if (!(traits.HasTrait(TraitDefOf.Bloodlust)
-                    || traits.DegreeOfTrait(TraitDefOf.Nerves) > 0
                     || traits.DegreeOfTrait((CE_TraitDefOf.Bravery)) > 1))
             {
                 breaks.Add(pawn.IsColonist ? MentalStateDefOf.Wander_OwnRoom : MentalStateDefOf.PanicFlee);
@@ -316,7 +320,6 @@ public static List<MentalStateDef> GetPossibleBreaks(Pawn pawn)
 
             // Attack break
             if (!(pawn.WorkTagIsDisabled(WorkTags.Violent)
-                    || traits.DegreeOfTrait(TraitDefOf.Nerves) < 0
                     || traits.DegreeOfTrait(CE_TraitDefOf.Bravery) < 0))
             {
                 breaks.Add(CE_MentalStateDefOf.CombatFrenzy);
diff --git a/Source/CombatExtended/CombatExtended/Things/Building_TurretGunCE.cs b/Source/CombatExtended/CombatExtended/Things/Building_TurretGunCE.cs
index ebbb9e0b69..c7e6090d31 100644
--- a/Source/CombatExtended/CombatExtended/Things/Building_TurretGunCE.cs
+++ b/Source/CombatExtended/CombatExtended/Things/Building_TurretGunCE.cs
@@ -575,7 +575,7 @@ public override string GetInspectString()       // Replaced vanilla loaded text
             return stringBuilder.ToString().TrimEndNewlines();
         }
 
-        public override void Draw()
+        public override void DrawAt(Vector3 drawLoc, bool flip = false)
         {
             Vector3 drawOffset = Vector3.zero;
             float angleOffset = 0f;
@@ -583,8 +583,8 @@ public override void Draw()
             {
                 CE_Utility.Recoil(def.building.turretGunDef, AttackVerb, out drawOffset, out angleOffset, top.CurRotation, false);
             }
-            top.DrawTurret(drawOffset, angleOffset);
-            base.Draw();
+            top.DrawTurret(drawLoc, drawOffset, angleOffset);
+            base.DrawAt(drawLoc, flip);
         }
 
         public override void DrawExtraSelectionOverlays()           // Draw at range less than 1.42 tiles
diff --git a/Source/CombatExtended/CombatExtended/Things/Flare.cs b/Source/CombatExtended/CombatExtended/Things/Flare.cs
index 59c75b3959..c006037384 100644
--- a/Source/CombatExtended/CombatExtended/Things/Flare.cs
+++ b/Source/CombatExtended/CombatExtended/Things/Flare.cs
@@ -253,7 +253,7 @@ public override void Tick()
             }
         }
 
-        public override void Draw()
+        public override void DrawAt(Vector3 drawLoc, bool flip = false)
         {
             var scale = HeightDrawScale;
             var matrix = new Matrix4x4();
diff --git a/Source/CombatExtended/CombatExtended/Things/Fleck_Casing.cs b/Source/CombatExtended/CombatExtended/Things/Fleck_Casing.cs
index a86a31f304..d231080b4a 100644
--- a/Source/CombatExtended/CombatExtended/Things/Fleck_Casing.cs
+++ b/Source/CombatExtended/CombatExtended/Things/Fleck_Casing.cs
@@ -79,7 +79,7 @@ public void Setup(FleckCreationData creationData)
             baseData = default(FleckStatic);
             baseData.Setup(creationData);
             airTimeLeft = creationData.airTimeLeft ?? 999999f;
-            baseData.exactPosition += creationData.def.attachedDrawOffset;
+            baseData.position.worldPosition += creationData.def.attachedDrawOffset;
             rotationRate = creationData.rotationRate;
             SetVelocity(creationData.velocityAngle, creationData.velocitySpeed);
             if (creationData.velocity.HasValue)
@@ -100,7 +100,7 @@ public bool TimeInterval(float deltaTime, Map map)
             }
             Vector3 vector = NextExactPosition(deltaTime);
             IntVec3 intVec = new IntVec3(vector);
-            if (intVec != new IntVec3(baseData.exactPosition))
+            if (intVec != new IntVec3(baseData.position.ExactPosition))
             {
                 if (!intVec.InBounds(map))
                 {
@@ -112,7 +112,7 @@ public bool TimeInterval(float deltaTime, Map map)
                     return false;
                 }
             }
-            baseData.exactPosition = vector;
+            baseData.position.worldPosition = vector;
             if (baseData.def.speedPerTime != FloatRange.Zero)
             {
                 Speed = Mathf.Max(Speed + baseData.def.speedPerTime.RandomInRange * deltaTime, 0f);
@@ -135,7 +135,7 @@ public bool TimeInterval(float deltaTime, Map map)
                 }
                 if (airTimeLeft <= 0f && !baseData.def.landSound.NullOrUndefined())
                 {
-                    baseData.def.landSound.PlayOneShot(new TargetInfo(new IntVec3(baseData.exactPosition), map));
+                    baseData.def.landSound.PlayOneShot(new TargetInfo(new IntVec3(baseData.position.ExactPosition), map));
                 }
             }
             return false;
@@ -143,7 +143,7 @@ public bool TimeInterval(float deltaTime, Map map)
 
         private Vector3 NextExactPosition(float deltaTime)
         {
-            return baseData.exactPosition + velocity * deltaTime;
+            return baseData.position.ExactPosition + velocity * deltaTime;
         }
 
         public void SetVelocity(float angle, float speed)
diff --git a/Source/CombatExtended/CombatExtended/Things/IncendiaryFuel.cs b/Source/CombatExtended/CombatExtended/Things/IncendiaryFuel.cs
index 90eeca0db6..fa409ec58c 100644
--- a/Source/CombatExtended/CombatExtended/Things/IncendiaryFuel.cs
+++ b/Source/CombatExtended/CombatExtended/Things/IncendiaryFuel.cs
@@ -34,7 +34,7 @@ public override void SpawnSetup(Map map, bool respawningAfterLoad)
                 }
                 else
                 {
-                    thing.TryAttachFire(maxFireSize);
+                    thing.TryAttachFire(maxFireSize, null);
                 }
             }
         }
@@ -50,7 +50,7 @@ public override void Tick()
             }
             else
             {
-                FireUtility.TryStartFireIn(Position, base.Map, maxFireSize);
+                FireUtility.TryStartFireIn(Position, base.Map, maxFireSize, this);
             }
         }
     }
diff --git a/Source/CombatExtended/CombatExtended/Things/Plant_Blazebulb.cs b/Source/CombatExtended/CombatExtended/Things/Plant_Blazebulb.cs
index aa854a95d6..24e65f1f1f 100644
--- a/Source/CombatExtended/CombatExtended/Things/Plant_Blazebulb.cs
+++ b/Source/CombatExtended/CombatExtended/Things/Plant_Blazebulb.cs
@@ -31,7 +31,7 @@ public override void TickLong()
                 float ignitionChance = 0.005f * Mathf.Pow((temperature - IgnitionTemp), 2);
                 if (Rand.Value < ignitionChance)
                 {
-                    FireUtility.TryStartFireIn(Position, base.Map, 0.1f);
+                    FireUtility.TryStartFireIn(Position, base.Map, 0.1f, this);
                 }
             }
         }
diff --git a/Source/CombatExtended/CombatExtended/Verbs/Verb_LaunchProjectileCE.cs b/Source/CombatExtended/CombatExtended/Verbs/Verb_LaunchProjectileCE.cs
index 4c686cd9fb..6dc4c40f0d 100644
--- a/Source/CombatExtended/CombatExtended/Verbs/Verb_LaunchProjectileCE.cs
+++ b/Source/CombatExtended/CombatExtended/Verbs/Verb_LaunchProjectileCE.cs
@@ -44,7 +44,7 @@ public class Verb_LaunchProjectileCE : Verb
         public CompAmmoUser compAmmo = null;
         public CompFireModes compFireModes = null;
         public CompChangeableProjectile compChangeable = null;
-        public CompReloadable compReloadable = null;
+        public CompApparelReloadable compReloadable = null;
         private float shotSpeed = -1;
 
         private float rotationDegrees = 0f;
@@ -207,13 +207,13 @@ public virtual CompFireModes CompFireModes
             }
         }
 
-        public CompReloadable CompReloadable
+        public CompApparelReloadable CompReloadable
         {
             get
             {
                 if (compReloadable == null && EquipmentSource != null)
                 {
-                    compReloadable = EquipmentSource.TryGetComp<CompReloadable>();
+                    compReloadable = EquipmentSource.TryGetComp<CompApparelReloadable>();
                 }
                 return compReloadable;
             }
diff --git a/Source/CombatExtended/CombatExtended/Verbs/Verb_LaunchProjectileStaticCE.cs b/Source/CombatExtended/CombatExtended/Verbs/Verb_LaunchProjectileStaticCE.cs
index f01f24085f..fd383cdd7b 100644
--- a/Source/CombatExtended/CombatExtended/Verbs/Verb_LaunchProjectileStaticCE.cs
+++ b/Source/CombatExtended/CombatExtended/Verbs/Verb_LaunchProjectileStaticCE.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-
+using RimWorld.Utility;
 using RimWorld;
 using Verse;
 using Verse.AI;
diff --git a/Source/CombatExtended/CombatExtended/Verbs/Verb_MeleeAttackCE.cs b/Source/CombatExtended/CombatExtended/Verbs/Verb_MeleeAttackCE.cs
index 9abc3aedf0..cc85be4eaf 100644
--- a/Source/CombatExtended/CombatExtended/Verbs/Verb_MeleeAttackCE.cs
+++ b/Source/CombatExtended/CombatExtended/Verbs/Verb_MeleeAttackCE.cs
@@ -397,8 +397,9 @@ private IEnumerable<DamageInfo> DamageInfosToApply(LocalTargetInfo target, bool
                 // Predators get a neck bite on immobile targets
                 if (caster.def.race.predator && IsTargetImmobile(target))
                 {
+                    //TODO: 1.5 Should be neck?
                     var neck = pawn.health.hediffSet.GetNotMissingParts(BodyPartHeight.Top, BodyPartDepth.Outside)
-                               .FirstOrDefault(r => r.def == BodyPartDefOf.Neck);
+                               .FirstOrDefault(r => r.def == BodyPartDefOf.Eye);
                     damageInfo.SetHitPart(neck);
                 }
                 //for some reason, when all parts of height are missing their incode count is 3
diff --git a/Source/CombatExtended/CombatExtended/WorldObjects/HostilityRaider.cs b/Source/CombatExtended/CombatExtended/WorldObjects/HostilityRaider.cs
index 57e0f31681..ae64ed5dde 100644
--- a/Source/CombatExtended/CombatExtended/WorldObjects/HostilityRaider.cs
+++ b/Source/CombatExtended/CombatExtended/WorldObjects/HostilityRaider.cs
@@ -113,7 +113,7 @@ public virtual bool TryRaid(Map targetMap, float points)
                 }
                 else if (Rand.Chance(0.25f))
                 {
-                    parms.raidArrivalMode = PawnsArrivalModeDefOf.RandomDrop;
+                    parms.raidArrivalMode = PawnsArrivalModeDefOf.EmergeFromWater;
                 }
                 else
                 {
diff --git a/Source/CombatExtended/CombatExtended/WorldObjects/WorldObjectDamageWorker.cs b/Source/CombatExtended/CombatExtended/WorldObjects/WorldObjectDamageWorker.cs
index 5d773e3ac4..210393f33c 100644
--- a/Source/CombatExtended/CombatExtended/WorldObjects/WorldObjectDamageWorker.cs
+++ b/Source/CombatExtended/CombatExtended/WorldObjects/WorldObjectDamageWorker.cs
@@ -189,27 +189,28 @@ protected virtual bool TryExplode(IntVec3 centerCell, ThingDef shellDef)
                         }
                         if (Rand.Chance(0.1f))
                         {
-                            FireUtility.TryStartFireIn(cellToAffect, map, Rand.Range(0.5f, 1.5f));
+                            FireUtility.TryStartFireIn(cellToAffect, map, Rand.Range(0.5f, 1.5f), null);
                         }
                     }
                     else
                     {
                         thing.DeSpawn(DestroyMode.Vanish);
                         thing.Destroy(DestroyMode.Vanish);
-                        if (thing.def.category == ThingCategory.Plant && (thing.def.plant?.IsTree ?? false))
-                        {
-                            Thing burntTree = ThingMaker.MakeThing(ThingDefOf.BurnedTree);
-                            burntTree.positionInt = cellToAffect;
-                            burntTree.SpawnSetup(map, false);
-                            if (!filthMade && Rand.Chance(0.5f))
-                            {
-                                ScatterDebrisUtility.ScatterFilthAroundThing(burntTree, map, ThingDefOf.Filth_Ash);
-                                filthMade = true;
-                            }
-                        }
+                        //                        if (thing.def.category == ThingCategory.Plant && (thing.def.plant?.IsTree ?? false))
+                        //                        {
+                        //                            //Todo: 1.5 burned trees
+                        //                            Thing burntTree = ThingMaker.MakeThing(ThingDefOf.BurnedTree);
+                        //                            burntTree.positionInt = cellToAffect;
+                        //                            burntTree.SpawnSetup(map, false);
+                        //                            if (!filthMade && Rand.Chance(0.5f))
+                        //                            {
+                        //                                ScatterDebrisUtility.ScatterFilthAroundThing(burntTree, map, ThingDefOf.Filth_Ash);
+                        //                                filthMade = true;
+                        //                            }
+                        //                        }
                         if (thing.def.MakeFog)
                         {
-                            map.fogGrid.Notify_FogBlockerRemoved(cellToAffect);
+                            map.fogGrid.Notify_FogBlockerRemoved(thing);
                         }
                         ThingDef filth = thing.def.filthLeaving ?? (Rand.Chance(0.5f) ? ThingDefOf.Filth_Ash : ThingDefOf.Filth_RubbleBuilding);
                         if (!filthMade && FilthMaker.TryMakeFilth(cellToAffect, map, filth, Rand.Range(1, 3), FilthSourceFlags.Any))
@@ -343,7 +344,8 @@ public static void ResetVisualDamageEffects(Pawn pawn)
         {
             var draw = pawn.drawer;
             (new Traverse(draw).Field("jitterer").GetValue() as JitterHandler)?.ProcessPostTickVisuals(10000);
-            draw.renderer.graphics.flasher.lastDamageTick = -9999;
+            //Todo: find renderer.graphics
+            //draw.renderer.graphics.flasher.lastDamageTick = -9999;
         }
         #endregion
 
diff --git a/Source/CombatExtended/Contrib/ProjectileImpactFX/ImpactFleckThrower.cs b/Source/CombatExtended/Contrib/ProjectileImpactFX/ImpactFleckThrower.cs
index f61081b4dc..625592fdcd 100644
--- a/Source/CombatExtended/Contrib/ProjectileImpactFX/ImpactFleckThrower.cs
+++ b/Source/CombatExtended/Contrib/ProjectileImpactFX/ImpactFleckThrower.cs
@@ -96,7 +96,7 @@ public static void ThrowFleck(Vector3 loc, IntVec3 position, Map map, Projectile
                         VelocitySpeed /= 2;
                         ImpactFleckSize = ScaleToRange(2.0f, 4.0f, 10, 50, projProps.damageAmountBase);
                     }
-                    else if (terrain.holdSnow && (damageDef == DamageDefOf.Bullet || damageDef == DamageDefOf.Arrow))
+                    else if (terrain.holdSnow && (damageDef == DamageDefOf.Bullet || damageDef == DamageDefOf.Cut))
                     {//concrete and stone impact from shots. Only terrains that don't hold snow are non-solid ones, like water and vacuum from SOS2
                         ImpactFleck = FleckDefOf.AirPuff;
                         TriggerBulletHole(loc, map, projProps.damageAmountBase < 50 ? ScaleToRange(0.1f, 0.7f, 1, 50, projProps.damageAmountBase) : 0.7f);
diff --git a/Source/CombatExtended/Harmony/Harmony_CompExplosive.cs b/Source/CombatExtended/Harmony/Harmony_CompExplosive.cs
index 2826c41f1e..dbae360d41 100644
--- a/Source/CombatExtended/Harmony/Harmony_CompExplosive.cs
+++ b/Source/CombatExtended/Harmony/Harmony_CompExplosive.cs
@@ -15,7 +15,7 @@ namespace CombatExtended.HarmonyCE
     /// <summary>
     /// Replaces DoExplosion on BUILDINGS, PAWNS, AMMO with the CE version that has correct AP and damage
     /// </summary>
-    [HarmonyPatch(typeof(CompExplosive), "Detonate")]
+    [HarmonyPatch(typeof(CompExplosive), nameof(CompExplosive.Detonate))]
     public class Harmony_CompExplosive_Detonate_Transpiler
     {
         internal static void ThrowFragments(ThingWithComps parent, Map map, Thing instigator)
@@ -29,82 +29,88 @@ internal static void ThrowFragments(ThingWithComps parent, Map map, Thing instig
 
         internal static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
         {
-            bool codeFound = false;
-            int parentCalls = 0;
-            bool codeChanged = false;
-            bool storeDestructionCall = false;
-
+            //TODO: 1.5
             foreach (var code in instructions)
             {
-                if (storeDestructionCall)
-                {
-                    if (code.opcode == OpCodes.Callvirt)
-                    {
-                        storeDestructionCall = false;
-                    }
-
-                    continue;
-                }
-
-                if (code.opcode == OpCodes.Stfld && code.operand is FieldInfo info
-                        && info == AccessTools.Field(typeof(CompExplosive), "destroyedThroughDetonation"))
-                {
-                    yield return code;
-                    storeDestructionCall = true;
-                    continue;
-                }
-
-                if (code.opcode == OpCodes.Stloc_2)
-                {
-                    parentCalls++;
-                }
-
-                // Replace GenExplosion.DoExplosion with GenExplosionCE.DoExplosion, populate extra four fields with "0f" and "Mathf.Pow(this.parent.stackCount, 0.333f)", "this.destroyedThroughDetonation" and "this.parent"
-                if (codeChanged && !codeFound && code.opcode == OpCodes.Call && code.operand is MethodInfo info2
-                        && info2 == AccessTools.Method(typeof(GenExplosion), "DoExplosion"))
-                {
-                    codeFound = true;
-
-                    yield return new CodeInstruction(OpCodes.Ldc_R4, 0f);  //Populate the height field added in the new doExplosion method
-                    yield return new CodeInstruction(OpCodes.Ldarg_0);
-                    yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(typeof(ThingComp), "parent"));
-                    yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(typeof(Thing), "stackCount"));
-                    yield return new CodeInstruction(OpCodes.Conv_R4);
-                    yield return new CodeInstruction(OpCodes.Ldc_R4, 0.333f);
-                    yield return new CodeInstruction(OpCodes.Call, AccessTools.Method(typeof(Mathf), "Pow"));    //Populate the scaleFactor field with parent.stackCount ^ (1/3)*/
-                    yield return new CodeInstruction(OpCodes.Ldarg_0);
-                    yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(typeof(CompExplosive), "destroyedThroughDetonation"));    //Send along whether the thing should be destroyed
-                    yield return new CodeInstruction(OpCodes.Ldarg_0);
-                    yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(typeof(ThingComp), "parent"));                //Send along parent, e.g the thing that should be destroyed
-                    yield return new CodeInstruction(OpCodes.Call, AccessTools.Method(typeof(GenExplosionCE), "DoExplosion"));
-
-                    continue;
-                }
-
-                if (parentCalls == 2 && !codeChanged && code.opcode == OpCodes.Callvirt)
-                {
-                    // Call ThrowFragments and duplicate previous calls
-                    yield return new CodeInstruction(OpCodes.Ldarg_1);
-                    yield return new CodeInstruction(OpCodes.Ldloc_2);
-                    yield return new CodeInstruction(OpCodes.Call, AccessTools.Method(typeof(Harmony_CompExplosive_Detonate_Transpiler), "ThrowFragments"));
-                    yield return new CodeInstruction(OpCodes.Ldarg_0);
-                    yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(typeof(ThingComp), "parent"));
-
-                    codeChanged = true;
-                }
-
                 yield return code;
             }
-
-            if (!codeFound)
-            {
-                Log.Warning("CombatExtended :: Could not find doExplosionInfo");
-            }
-
-            if (!codeChanged)
-            {
-                Log.Warning("CombatExtended :: Could not insert ThrowFragments call");
-            }
+            yield break;
+            //            bool codeFound = false;
+            //            int parentCalls = 0;
+            //            bool codeChanged = false;
+            //            bool storeDestructionCall = false;
+            //
+            //            foreach (var code in instructions)
+            //            {
+            //                if (storeDestructionCall)
+            //                {
+            //                    if (code.opcode == OpCodes.Callvirt)
+            //                    {
+            //                        storeDestructionCall = false;
+            //                    }
+            //
+            //                    continue;
+            //                }
+            //
+            //                if (code.opcode == OpCodes.Stfld && code.operand is FieldInfo info
+            //                    && info == AccessTools.Field(typeof(CompExplosive), nameof(CompExplosive.destroyedThroughDetonation)))
+            //                {
+            //                    yield return code;
+            //                    storeDestructionCall = true;
+            //                    continue;
+            //                }
+            //
+            //                if (code.opcode == OpCodes.Stloc_2)
+            //                {
+            //                    parentCalls++;
+            //                }
+            //
+            //                // Replace GenExplosion.DoExplosion with GenExplosionCE.DoExplosion, populate extra four fields with "0f" and "Mathf.Pow(this.parent.stackCount, 0.333f)", "this.destroyedThroughDetonation" and "this.parent"
+            //                if (codeChanged && !codeFound && code.opcode == OpCodes.Call && code.operand is MethodInfo info2
+            //                    && info2 == AccessTools.Method(typeof(GenExplosion), nameof(GenExplosion.DoExplosion)))
+            //                {
+            //                    codeFound = true;
+            //
+            //                    yield return new CodeInstruction(OpCodes.Ldc_R4, 0f);  //Populate the height field added in the new doExplosion method
+            //                    yield return new CodeInstruction(OpCodes.Ldarg_0);
+            //                    yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(typeof(ThingComp), nameof(ThingComp.parent)));
+            //                    yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(typeof(Thing), nameof(Thing.stackCount)));
+            //                    yield return new CodeInstruction(OpCodes.Conv_R4);
+            //                    yield return new CodeInstruction(OpCodes.Ldc_R4, 0.333f);
+            //                    yield return new CodeInstruction(OpCodes.Call, AccessTools.Method(typeof(Mathf), nameof(Mathf.Pow)));    //Populate the scaleFactor field with parent.stackCount ^ (1/3)*/
+            //                    yield return new CodeInstruction(OpCodes.Ldarg_0);
+            //                    yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(typeof(CompExplosive), nameof(CompExplosive.destroyedThroughDetonation)));    //Send along whether the thing should be destroyed
+            //                    yield return new CodeInstruction(OpCodes.Ldarg_0);
+            //                    yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(typeof(ThingComp), nameof(ThingComp.parent)));                //Send along parent, e.g the thing that should be destroyed
+            //                    yield return new CodeInstruction(OpCodes.Call, AccessTools.Method(typeof(GenExplosionCE), nameof(GenExplosionCE.DoExplosion)));
+            //
+            //                    continue;
+            //                }
+            //
+            //                if (parentCalls == 2 && !codeChanged && code.opcode == OpCodes.Callvirt)
+            //                {
+            //                    // Call ThrowFragments and duplicate previous calls
+            //                    yield return new CodeInstruction(OpCodes.Ldarg_1);
+            //                    yield return new CodeInstruction(OpCodes.Ldloc_2);
+            //                    yield return new CodeInstruction(OpCodes.Call, AccessTools.Method(typeof(Harmony_CompExplosive_Detonate_Transpiler), nameof(Harmony_CompExplosive_Detonate_Transpiler.ThrowFragments)));
+            //                    yield return new CodeInstruction(OpCodes.Ldarg_0);
+            //                    yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(typeof(ThingComp), nameof(ThingComp.parent)));
+            //
+            //                    codeChanged = true;
+            //                }
+            //
+            //                yield return code;
+            //            }
+            //
+            //            if (!codeFound)
+            //            {
+            //                Log.Warning("CombatExtended :: Could not find doExplosionInfo");
+            //            }
+            //
+            //            if (!codeChanged)
+            //            {
+            //                Log.Warning("CombatExtended :: Could not insert ThrowFragments call");
+            //            }
         }
     }
 }
diff --git a/Source/CombatExtended/Harmony/Harmony_CompReloadable.cs b/Source/CombatExtended/Harmony/Harmony_CompReloadable.cs
index f324459ac3..b5c92b4f06 100644
--- a/Source/CombatExtended/Harmony/Harmony_CompReloadable.cs
+++ b/Source/CombatExtended/Harmony/Harmony_CompReloadable.cs
@@ -10,10 +10,10 @@
 
 namespace CombatExtended.HarmonyCE
 {
-    [HarmonyPatch(typeof(CompReloadable), "CompGetWornGizmosExtra")]
-    public static class Harmony_CompReloadable_CompygetWornGizmosExtra
+    [HarmonyPatch(typeof(CompApparelVerbOwner_Charged), nameof(CompApparelVerbOwner_Charged.CompGetWornGizmosExtra))]
+    public static class Harmony_CompApparelVerbOwner_Charged_CompygetWornGizmosExtra
     {
-        public static IEnumerable<Gizmo> Postfix(IEnumerable<Gizmo> __result, CompReloadable __instance)
+        public static IEnumerable<Gizmo> Postfix(IEnumerable<Gizmo> __result, CompApparelReloadable __instance)
         {
             foreach (Gizmo g in __result)
             {
@@ -38,7 +38,7 @@ public static IEnumerable<Gizmo> Postfix(IEnumerable<Gizmo> __result, CompReload
         }
 
         [global::CombatExtended.Compatibility.Multiplayer.SyncMethod]
-        private static void TryReloadArmor(CompReloadable __instance)
+        private static void TryReloadArmor(CompApparelReloadable __instance)
         {
             ThingWithComps gear = __instance.parent;
             Pawn wearer = __instance.Wearer;
diff --git a/Source/CombatExtended/Harmony/Harmony_FireUtility.cs b/Source/CombatExtended/Harmony/Harmony_FireUtility.cs
index b765cfa21f..4b1fcbab7b 100644
--- a/Source/CombatExtended/Harmony/Harmony_FireUtility.cs
+++ b/Source/CombatExtended/Harmony/Harmony_FireUtility.cs
@@ -52,7 +52,7 @@ internal static void Postfix(IntVec3 c, Map map, float fireSize, bool __result)
 
             if (Rand.Chance(CatchFireChance * pawn.GetStatValue(StatDefOf.Flammability)))
             {
-                pawn.TryAttachFire(fireSize);
+                pawn.TryAttachFire(fireSize, null);
             }
         }
     }
diff --git a/Source/CombatExtended/Harmony/Harmony_JobGiver_Reload.cs b/Source/CombatExtended/Harmony/Harmony_JobGiver_Reload.cs
index da49f5b608..2378b42c49 100644
--- a/Source/CombatExtended/Harmony/Harmony_JobGiver_Reload.cs
+++ b/Source/CombatExtended/Harmony/Harmony_JobGiver_Reload.cs
@@ -1,5 +1,6 @@
 using HarmonyLib;
 using RimWorld;
+using RimWorld.Utility;
 using System;
 using System.Collections.Generic;
 using UnityEngine;
@@ -16,7 +17,7 @@ internal static class Harmony_JobGiver_Reload_TryGiveJob
     {
         internal static bool Prefix(Pawn pawn, ref Job __result)
         {
-            CompReloadable compReloadable = ReloadableUtility.FindSomeReloadableComponent(pawn, false);
+            CompApparelReloadable compReloadable = (CompApparelReloadable)ReloadableUtility.FindSomeReloadableComponent(pawn, false);
             if (compReloadable != null)
             {
                 var inventoryAmmo = pawn?.inventory?.innerContainer?.InnerListForReading?.Find(thing => thing.def == compReloadable.AmmoDef);
diff --git a/Source/CombatExtended/Harmony/Harmony_PawnGraphicSet.cs b/Source/CombatExtended/Harmony/Harmony_PawnGraphicSet.cs
index 81949dbd7d..a8345a7a91 100644
--- a/Source/CombatExtended/Harmony/Harmony_PawnGraphicSet.cs
+++ b/Source/CombatExtended/Harmony/Harmony_PawnGraphicSet.cs
@@ -9,7 +9,7 @@
 
 namespace CombatExtended.HarmonyCE
 {
-    [HarmonyPatch(typeof(PawnGraphicSet), "MatsBodyBaseAt")]
+    //[HarmonyPatch(typeof(PawnGraphicSet), "MatsBodyBaseAt")]
     internal static class Harmony_PawnGraphicSet
     {
         private static bool RenderSpecial(ApparelLayerDef layer)
diff --git a/Source/CombatExtended/Harmony/Harmony_PawnRenderer.cs b/Source/CombatExtended/Harmony/Harmony_PawnRenderer.cs
index d611942154..b245ab1495 100644
--- a/Source/CombatExtended/Harmony/Harmony_PawnRenderer.cs
+++ b/Source/CombatExtended/Harmony/Harmony_PawnRenderer.cs
@@ -102,308 +102,311 @@ public static Vector2 GetHeadCustomOffset(ThingDef def)
          *
          * Should Allow headgear to render since most CE gear has full head coverage.
          */
-        [HarmonyPatch(typeof(PawnRenderer), "DrawBodyApparel")]
-        public static class Harmony_PawnRenderer_DrawBodyApparel
-        {
-            private static MethodBase mDrawMeshNowOrLater = AccessTools.Method(typeof(GenDraw), nameof(GenDraw.DrawMeshNowOrLater), parameters: new[] { typeof(Mesh), typeof(Vector3), typeof(Quaternion), typeof(Material), typeof(bool) });
-
-            private static FieldInfo fShell = AccessTools.Field(typeof(ApparelLayerDefOf), nameof(ApparelLayerDefOf.Shell));
-
-            public static bool IsVisibleLayer(ApparelLayerDef def)
-            {
-                // If it's invisible skip everything
-                if (!def.IsVisibleLayer())
-                {
-                    return false;
-                }
-                // Moved to since backpacks use
-                if (def == CE_ApparelLayerDefOf.Backpack)
-                {
-                    return false;
-                }
-                // Enable toggling webbing rendering
-                if (def == CE_ApparelLayerDefOf.Webbing && !Controller.settings.ShowTacticalVests)
-                {
-                    return false;
-                }
-                return true;
-            }
-
-            public static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
-            {
-                List<CodeInstruction> codes = instructions.ToList();
-                Label l1 = generator.DefineLabel();
-                Label l2 = generator.DefineLabel();
-                for (int i = 0; i < codes.Count; i++)
-                {
-                    CodeInstruction code = codes[i];
-                    /*
-                     * Replace ApparelLayerDef::lastLayer != ApparelLayerDefOf::Shell with IsPreShellLayer(ApparelLayerDef::lastLayer)
-                     * by poping the first part and replacin the second part and changing != to brtrue
-                     */
-                    if (code.opcode == OpCodes.Ldsfld && code.OperandIs(fShell))
-                    {
-                        yield return new CodeInstruction(OpCodes.Call, AccessTools.Method(typeof(Harmony_PawnRenderer_DrawBodyApparel), nameof(Harmony_PawnRenderer_DrawBodyApparel.IsVisibleLayer), parameters: new[] { typeof(ApparelLayerDef) }));
-                        i++;
-                        yield return new CodeInstruction(OpCodes.Brfalse_S, codes[i].operand);
-                        continue;
-                    }
-                    /*
-                     * Add the offset to loc before calling mDrawMeshNowOrLater
-                     */
-                    if (code.opcode == OpCodes.Call && code.OperandIs(mDrawMeshNowOrLater))
-                    {
-                        yield return new CodeInstruction(OpCodes.Ldloca_S, 5)
-                        {
-                            labels = code.labels
-                        };
-                        yield return new CodeInstruction(OpCodes.Dup);
-                        yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(typeof(Vector3), nameof(Vector3.y)));
-                        yield return new CodeInstruction(OpCodes.Ldarg_0);
-                        yield return new CodeInstruction(OpCodes.Call, AccessTools.Method(typeof(Harmony_PawnRenderer_DrawBodyApparel), nameof(GetPostShellOffset)));
-                        yield return new CodeInstruction(OpCodes.Add);
-                        yield return new CodeInstruction(OpCodes.Stfld, AccessTools.Field(typeof(Vector3), nameof(Vector3.y)));
-                        code.labels = new List<Label>();
-                    }
-                    /*
-                     * Find and add a condition to utilityLoc to make backpacks render behind hair
-                     */
-                    if (code.opcode == OpCodes.Ldarg_2)
-                    {
-                        /*
-                         * Load apparelGraphicRecord from for(int i = 0....) { ApparelGraphicRecord apparelGraphicRecord = apparelGraphics[i];
-                         * From the start of the function
-                         */
-                        yield return new CodeInstruction(OpCodes.Ldloc_3).MoveLabelsFrom(code);
-                        yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(typeof(ApparelGraphicRecord), nameof(ApparelGraphicRecord.sourceApparel)));
-                        yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(typeof(Thing), nameof(Thing.def)));
-                        yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(typeof(ThingDef), nameof(ThingDef.apparel)));
-                        yield return new CodeInstruction(OpCodes.Callvirt, AccessTools.PropertyGetter(typeof(ApparelProperties), nameof(ApparelProperties.LastLayer)));                // Load current apparel last layer
-
-                        yield return new CodeInstruction(OpCodes.Ldsfld, AccessTools.Field(typeof(CE_ApparelLayerDefOf), nameof(CE_ApparelLayerDefOf.Backpack)));              // Load backpack
-
-                        yield return new CodeInstruction(OpCodes.Bne_Un_S, l1); // Compare value
-
-                        yield return new CodeInstruction(OpCodes.Ldarg_1);      // shellloc
-                        yield return new CodeInstruction(OpCodes.Ldarg_S, 5);   // bodyFacing
-                        yield return new CodeInstruction(OpCodes.Call, AccessTools.Method(typeof(Harmony_PawnRenderer_DrawBodyApparel), nameof(GetBackpackOffset)));                          // shellloc
-                        yield return new CodeInstruction(OpCodes.Br_S, l2);     // continue;
-
-                        code.labels = new List<Label>()
-                        {
-                            l1
-                        };
-                        yield return code;
-                        codes[i + 1].labels.Add(l2);
-                        continue;
-                    }
-                    yield return code;
-                }
-            }
-
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            private static Vector3 GetBackpackOffset(Vector3 vector, Rot4 bodyFacing)
-            {
-                /*
-                 * Need to subract  0.023166021f since if we don't backpacks will render
-                 * infront of pawns when facing the player (south)
-                 */
-                if (bodyFacing == Rot4.South)
-                {
-                    vector.y -= 0.023166021f;
-                }
-                return vector;
-            }
-
-            /*
-             * Add some type of offset (reasoning is in the old code below)
-             */
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            private static float GetPostShellOffset(PawnRenderer renderer)
-            {
-                List<ApparelGraphicRecord> apparelGraphics = renderer.graphics.apparelGraphics
-                        .Where(a => a.sourceApparel.def.apparel.LastLayer.drawOrder >= ApparelLayerDefOf.Shell.drawOrder).ToList();
-                return apparelGraphics.Count == 0 ? 0 : YOffsetIntervalClothes / apparelGraphics.Count;
-            }
-        }
-
-        [HarmonyPatch(typeof(PawnRenderer), "DrawHeadHair")]
-        public static class Harmony_PawnRenderer_DrawHeadHair
-        {
-            private static Rot4 north = Rot4.North;
-
-
-            // skip this if dubs apparel tweak is loaded
-            private static bool Prepare()
-            {
-                if (quickFast_Loaded)
-                {
-                    Log.Message("CE: Dubwise apparel tweak detected!");
-                    return false;
-                }
-                return true;
-            }
-
-            private static void DrawHeadApparel(PawnRenderer renderer, Pawn pawn, Vector3 rootLoc, Vector3 headLoc, Vector3 headOffset, Rot4 bodyFacing, Quaternion quaternion, PawnRenderFlags flags, Rot4 headFacing, ref bool shouldRenderHair)
-            {
-                if (flags.FlagSet(PawnRenderFlags.Portrait) && Prefs.HatsOnlyOnMap)
-                {
-                    return;
-                }
-                if (!flags.FlagSet(PawnRenderFlags.Headgear))
-                {
-                    return;
-                }
-                List<ApparelGraphicRecord> apparelGraphics = renderer.graphics.apparelGraphics;
-
-                // This will limit us to only 32 layers of headgear
-                float interval = YOffsetIntervalClothes / 32;
-
-                Vector3 customScale = Vec2ToVec3(GetHeadCustomSize(pawn.def));
-                Vector3 headwearPos = headLoc + Vec2ToVec3(GetHeadCustomOffset(pawn.def));
-
-                // Let other mods such as HAR inject an alternative graphic for the hair/head.
-                // Note that in the absence of a specific bodyWidth multiplier (Biotech/HAR) for this pawn,
-                // we must use MeshPool.HumanlikeHeadAverageWidth (1.5f) to ensure proper headgear sizing.
-                float lifeStageFactor = pawn.ageTracker.CurLifeStage.bodyWidth ?? MeshPool.HumanlikeHeadAverageWidth;
-                GraphicMeshSet gms = GetHumanlikeHeadSetForPawnHelper(lifeStageFactor, pawn);
-                Mesh mesh = gms?.MeshAt(bodyFacing) ?? renderer.graphics.HairMeshSet.MeshAt(bodyFacing);
-
-                for (int i = 0; i < apparelGraphics.Count; i++)
-                {
-                    ApparelGraphicRecord apparelRecord = apparelGraphics[i];
-                    if (apparelRecord.sourceApparel.def.apparel.LastLayer == ApparelLayerDefOf.Overhead && !apparelRecord.sourceApparel.def.apparel.hatRenderedFrontOfFace)
-                    {
-                        shouldRenderHair = !apparelRecord.sourceApparel?.def?.GetModExtension<ApperalRenderingExtension>()?.HideHair ?? false;
-                    }
-                    else if (apparelRecord.sourceApparel.def.apparel.LastLayer.GetModExtension<ApparelLayerExtension>()?.IsHeadwear ?? false)
-                    {
-                        Material apparelMat = GetMaterial(renderer, pawn, apparelRecord, bodyFacing, flags);
-
-                        if (apparelRecord.sourceApparel.def.apparel.hatRenderedFrontOfFace)
-                        {
-                            Matrix4x4 matrix = new Matrix4x4();
-                            Vector3 maskLoc = rootLoc + headOffset;
-                            maskLoc.y += !(bodyFacing == north) ? YOffsetPostHead : YOffsetBehind;
-                            matrix.SetTRS(maskLoc, quaternion, customScale);
-                            GenDraw.DrawMeshNowOrLater(mesh, matrix, apparelMat, flags.FlagSet(PawnRenderFlags.DrawNow));
-                        }
-                        else
-                        {
-                            Matrix4x4 matrix = new Matrix4x4();
-                            if (!quickFast_Loaded)
-                            {
-                                shouldRenderHair = !apparelRecord.sourceApparel?.def?.GetModExtension<ApperalRenderingExtension>()?.HideHair ?? false;
-                            }
-                            headwearPos.y += interval;
-                            matrix.SetTRS(headwearPos, quaternion, customScale);
-                            GenDraw.DrawMeshNowOrLater(mesh, matrix, apparelMat, flags.FlagSet(PawnRenderFlags.DrawNow));
-                        }
-                    }
-                }
-            }
-
-            [MethodImpl(MethodImplOptions.NoInlining)]
-            private static Material GetMaterial(PawnRenderer renderer, Pawn pawn, ApparelGraphicRecord record, Rot4 bodyFacing, PawnRenderFlags flags)
-            {
-                Material mat = record.graphic.MatAt(bodyFacing);
-                if (flags.FlagSet(PawnRenderFlags.Cache))
-                {
-                    return mat;
-                }
-                return renderer.OverrideMaterialIfNeeded(mat, pawn, flags.FlagSet(PawnRenderFlags.Portrait));
-            }
-
-            /// <summary>
-            /// Name of the compiler generated class containing from PawnRenderer.DrawHeadHair()
-            /// 0. headfacing
-            /// 1. bodyfacing
-            /// 2. onheadloc
-            /// 3. quat
-            /// 3. flags
-            /// 4. rootloc
-            /// 5. headoffset
-            /// </summary>
-            //private const string displayClassName = "DisplayClass39";
-
-            /*
-             * For VFE vikings compatiblity
-             * Required for better compatiblity
-             */
-            [HarmonyPriority(Priority.Last)]
-            internal static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
-            {
-                var codes = instructions.ToList();
-                var displayType = typeof(PawnRenderer).GetNestedTypes(AccessTools.all).First();
-                //
-                //var l1 = generator.DefineLabel();
-                for (int i = 0; i < codes.Count; i++)
-                {
-                    var code = codes[i];
-                    /*
-                     * 1. Insert calls for head renderer
-                     *
-                     * Ldloc_2 is the bool used to controll the rendering of headstumps
-                     *
-                     * Look for Ldloc_2 (only one in the method), VFE vikings modify the IL just before, so it is not easy to contextualise. If it
-                     * breaks make sure to check compat with Alien Races & VFE-Vikings/Beards
-                     */
-
-                    if (code.opcode == OpCodes.Ldloc_2)
-                    {
-                        // Insert headgear global render check
-                        //yield return new CodeInstruction(OpCodes.Ldloc_S, 4) { labels = code.labels }; // check if we should render head gear
-                        //yield return new CodeInstruction(OpCodes.Brfalse_S, l1);
-
-                        // Insert new calls for headgear renderer
-                        yield return new CodeInstruction(OpCodes.Ldarg_0)
-                        {
-                            labels = code.labels
-                        }; // PawnRenderer renderer
-
-                        yield return new CodeInstruction(OpCodes.Ldarg_0); // render.pawn
-                        yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(typeof(PawnRenderer), "pawn"));
-
-                        yield return new CodeInstruction(OpCodes.Ldloc_0); // Vector3 rootLoc
-                        yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(displayType, "rootLoc"));
-
-                        yield return new CodeInstruction(OpCodes.Ldloc_0); // Vector3 onHeadLoc
-                        yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(displayType, "onHeadLoc"));
-
-                        yield return new CodeInstruction(OpCodes.Ldloc_0); // Vector3 headOffset
-                        yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(displayType, "headOffset"));
-
-                        yield return new CodeInstruction(OpCodes.Ldloc_0); // Rot4 bodyFacing
-                        yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(displayType, "bodyFacing"));
-
-                        yield return new CodeInstruction(OpCodes.Ldloc_0); // Quaternion quat
-                        yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(displayType, "quat"));
-
-                        yield return new CodeInstruction(OpCodes.Ldloc_0); // PawnRenderFlags flags
-                        yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(displayType, "flags"));
-
-                        yield return new CodeInstruction(OpCodes.Ldloc_0); // PawnRenderFlags flags
-                        yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(displayType, "headFacing"));
-
-                        yield return new CodeInstruction(OpCodes.Ldloca_S, 2);  // ref bool shouldRenderHair
-
-                        yield return new CodeInstruction(OpCodes.Call, AccessTools.Method(typeof(Harmony_PawnRenderer_DrawHeadHair), nameof(DrawHeadApparel)));
-                        code.labels = new List<Label>();
-                    }
-                    yield return code;
-                }
-            }
-        }
-
-        [HarmonyPatch(typeof(PawnRenderer), "DrawEquipmentAiming")]
+        //TODO: 1.5
+        //        [HarmonyPatch(typeof(PawnRenderer), nameof(PawnRenderer.DrawBodyApparel))]
+        //        public static class Harmony_PawnRenderer_DrawBodyApparel
+        //        {
+        //            private static MethodBase mDrawMeshNowOrLater = AccessTools.Method(typeof(GenDraw), nameof(GenDraw.DrawMeshNowOrLater), parameters: new[] { typeof(Mesh), typeof(Vector3), typeof(Quaternion), typeof(Material), typeof(bool) });
+        //
+        //            private static FieldInfo fShell = AccessTools.Field(typeof(ApparelLayerDefOf), nameof(ApparelLayerDefOf.Shell));
+        //
+        //            public static bool IsVisibleLayer(ApparelLayerDef def)
+        //            {
+        //                // If it's invisible skip everything
+        //                if (!def.IsVisibleLayer())
+        //                {
+        //                    return false;
+        //                }
+        //                // Moved to since backpacks use
+        //                if (def == CE_ApparelLayerDefOf.Backpack)
+        //                {
+        //                    return false;
+        //                }
+        //                // Enable toggling webbing rendering
+        //                if (def == CE_ApparelLayerDefOf.Webbing && !Controller.settings.ShowTacticalVests)
+        //                {
+        //                    return false;
+        //                }
+        //                return true;
+        //            }
+        //
+        //            public static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
+        //            {
+        //                List<CodeInstruction> codes = instructions.ToList();
+        //                Label l1 = generator.DefineLabel();
+        //                Label l2 = generator.DefineLabel();
+        //                for (int i = 0; i < codes.Count; i++)
+        //                {
+        //                    CodeInstruction code = codes[i];
+        //                    /*
+        //                     * Replace ApparelLayerDef::lastLayer != ApparelLayerDefOf::Shell with IsPreShellLayer(ApparelLayerDef::lastLayer)
+        //                     * by poping the first part and replacin the second part and changing != to brtrue
+        //                     */
+        //                    if (code.opcode == OpCodes.Ldsfld && code.OperandIs(fShell))
+        //                    {
+        //                        yield return new CodeInstruction(OpCodes.Call, AccessTools.Method(typeof(Harmony_PawnRenderer_DrawBodyApparel), nameof(Harmony_PawnRenderer_DrawBodyApparel.IsVisibleLayer), parameters: new[] { typeof(ApparelLayerDef) }));
+        //                        i++;
+        //                        yield return new CodeInstruction(OpCodes.Brfalse_S, codes[i].operand);
+        //                        continue;
+        //                    }
+        //                    /*
+        //                     * Add the offset to loc before calling mDrawMeshNowOrLater
+        //                     */
+        //                    if (code.opcode == OpCodes.Call && code.OperandIs(mDrawMeshNowOrLater))
+        //                    {
+        //                        yield return new CodeInstruction(OpCodes.Ldloca_S, 5)
+        //                        {
+        //                            labels = code.labels
+        //                        };
+        //                        yield return new CodeInstruction(OpCodes.Dup);
+        //                        yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(typeof(Vector3), nameof(Vector3.y)));
+        //                        yield return new CodeInstruction(OpCodes.Ldarg_0);
+        //                        yield return new CodeInstruction(OpCodes.Call, AccessTools.Method(typeof(Harmony_PawnRenderer_DrawBodyApparel), nameof(GetPostShellOffset)));
+        //                        yield return new CodeInstruction(OpCodes.Add);
+        //                        yield return new CodeInstruction(OpCodes.Stfld, AccessTools.Field(typeof(Vector3), nameof(Vector3.y)));
+        //                        code.labels = new List<Label>();
+        //                    }
+        //                    /*
+        //                     * Find and add a condition to utilityLoc to make backpacks render behind hair
+        //                     */
+        //                    if (code.opcode == OpCodes.Ldarg_2)
+        //                    {
+        //                        /*
+        //                         * Load apparelGraphicRecord from for(int i = 0....) { ApparelGraphicRecord apparelGraphicRecord = apparelGraphics[i];
+        //                         * From the start of the function
+        //                         */
+        //                        yield return new CodeInstruction(OpCodes.Ldloc_3).MoveLabelsFrom(code);
+        //                        yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(typeof(ApparelGraphicRecord), nameof(ApparelGraphicRecord.sourceApparel)));
+        //                        yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(typeof(Thing), nameof(Thing.def)));
+        //                        yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(typeof(ThingDef), nameof(ThingDef.apparel)));
+        //                        yield return new CodeInstruction(OpCodes.Callvirt, AccessTools.PropertyGetter(typeof(ApparelProperties), nameof(ApparelProperties.LastLayer)));                // Load current apparel last layer
+        //
+        //                        yield return new CodeInstruction(OpCodes.Ldsfld, AccessTools.Field(typeof(CE_ApparelLayerDefOf), nameof(CE_ApparelLayerDefOf.Backpack)));              // Load backpack
+        //
+        //                        yield return new CodeInstruction(OpCodes.Bne_Un_S, l1); // Compare value
+        //
+        //                        yield return new CodeInstruction(OpCodes.Ldarg_1);      // shellloc
+        //                        yield return new CodeInstruction(OpCodes.Ldarg_S, 5);   // bodyFacing
+        //                        yield return new CodeInstruction(OpCodes.Call, AccessTools.Method(typeof(Harmony_PawnRenderer_DrawBodyApparel), nameof(GetBackpackOffset)));                          // shellloc
+        //                        yield return new CodeInstruction(OpCodes.Br_S, l2);     // continue;
+        //
+        //                        code.labels = new List<Label>()
+        //                        {
+        //                            l1
+        //                        };
+        //                        yield return code;
+        //                        codes[i + 1].labels.Add(l2);
+        //                        continue;
+        //                    }
+        //                    yield return code;
+        //                }
+        //            }
+        //
+        //            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        //            private static Vector3 GetBackpackOffset(Vector3 vector, Rot4 bodyFacing)
+        //            {
+        //                /*
+        //                 * Need to subract  0.023166021f since if we don't backpacks will render
+        //                 * infront of pawns when facing the player (south)
+        //                 */
+        //                if (bodyFacing == Rot4.South)
+        //                {
+        //                    vector.y -= 0.023166021f;
+        //                }
+        //                return vector;
+        //            }
+        //
+        //            /*
+        //             * Add some type of offset (reasoning is in the old code below)
+        //             */
+        //            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        //            private static float GetPostShellOffset(PawnRenderer renderer)
+        //            {
+        //                return 0;
+        //                //TODO 1.5
+        //                //                List<ApparelGraphicRecord> apparelGraphics = renderer.graphics.apparelGraphics
+        //                //      .Where(a => a.sourceApparel.def.apparel.LastLayer.drawOrder >= ApparelLayerDefOf.Shell.drawOrder).ToList();
+        //                //return apparelGraphics.Count == 0 ? 0 : YOffsetIntervalClothes / apparelGraphics.Count;
+        //            }
+        //        }
+
+        //[HarmonyPatch(typeof(PawnRenderer), "DrawHeadHair")]
+        //        public static class Harmony_PawnRenderer_DrawHeadHair
+        //        {
+        //            private static Rot4 north = Rot4.North;
+        //
+        //
+        //            // skip this if dubs apparel tweak is loaded
+        //            private static bool Prepare()
+        //            {
+        //                if (quickFast_Loaded)
+        //                {
+        //                    Log.Message("CE: Dubwise apparel tweak detected!");
+        //                    return false;
+        //                }
+        //                return true;
+        //            }
+        //
+        //            private static void DrawHeadApparel(PawnRenderer renderer, Pawn pawn, Vector3 rootLoc, Vector3 headLoc, Vector3 headOffset, Rot4 bodyFacing, Quaternion quaternion, PawnRenderFlags flags, Rot4 headFacing, ref bool shouldRenderHair)
+        //            {
+        //                return;
+        //                //TODO: 1.5
+        //                //                if (flags.FlagSet(PawnRenderFlags.Portrait) && Prefs.HatsOnlyOnMap)
+        //                //                {
+        //                //                    return;
+        //                //                }
+        //                //                if (!flags.FlagSet(PawnRenderFlags.Headgear))
+        //                //                {
+        //                //                    return;
+        //                //                }
+        //                //                List<ApparelGraphicRecord> apparelGraphics = renderer.graphics.apparelGraphics;
+        //                //
+        //                //                // This will limit us to only 32 layers of headgear
+        //                //                float interval = YOffsetIntervalClothes / 32;
+        //                //
+        //                //                Vector3 customScale = Vec2ToVec3(GetHeadCustomSize(pawn.def));
+        //                //                Vector3 headwearPos = headLoc + Vec2ToVec3(GetHeadCustomOffset(pawn.def));
+        //                //
+        //                //                // Let other mods such as HAR inject an alternative graphic for the hair/head.
+        //                //                // Note that in the absence of a specific bodyWidth multiplier (Biotech/HAR) for this pawn,
+        //                //                // we must use MeshPool.HumanlikeHeadAverageWidth (1.5f) to ensure proper headgear sizing.
+        //                //                float lifeStageFactor = pawn.ageTracker.CurLifeStage.bodyWidth ?? MeshPool.HumanlikeHeadAverageWidth;
+        //                //                GraphicMeshSet gms = GetHumanlikeHeadSetForPawnHelper(lifeStageFactor, pawn);
+        //                //                Mesh mesh = gms?.MeshAt(bodyFacing) ?? renderer.graphics.HairMeshSet.MeshAt(bodyFacing);
+        //                //
+        //                //                for (int i = 0; i < apparelGraphics.Count; i++)
+        //                //                {
+        //                //                    ApparelGraphicRecord apparelRecord = apparelGraphics[i];
+        //                //                    if (apparelRecord.sourceApparel.def.apparel.LastLayer == ApparelLayerDefOf.Overhead && !apparelRecord.sourceApparel.def.apparel.hatRenderedFrontOfFace)
+        //                //                    {
+        //                //                        shouldRenderHair = !apparelRecord.sourceApparel?.def?.GetModExtension<ApperalRenderingExtension>()?.HideHair ?? false;
+        //                //                    }
+        //                //                    else if (apparelRecord.sourceApparel.def.apparel.LastLayer.GetModExtension<ApparelLayerExtension>()?.IsHeadwear ?? false)
+        //                //                    {
+        //                //                        Material apparelMat = GetMaterial(renderer, pawn, apparelRecord, bodyFacing, flags);
+        //                //
+        //                //                        if (apparelRecord.sourceApparel.def.apparel.hatRenderedFrontOfFace)
+        //                //                        {
+        //                //                            Matrix4x4 matrix = new Matrix4x4();
+        //                //                            Vector3 maskLoc = rootLoc + headOffset;
+        //                //                            maskLoc.y += !(bodyFacing == north) ? YOffsetPostHead : YOffsetBehind;
+        //                //                            matrix.SetTRS(maskLoc, quaternion, customScale);
+        //                //                            GenDraw.DrawMeshNowOrLater(mesh, matrix, apparelMat, flags.FlagSet(PawnRenderFlags.DrawNow));
+        //                //                        }
+        //                //                        else
+        //                //                        {
+        //                //                            Matrix4x4 matrix = new Matrix4x4();
+        //                //                            if (!quickFast_Loaded)
+        //                //                            {
+        //                //                                shouldRenderHair = !apparelRecord.sourceApparel?.def?.GetModExtension<ApperalRenderingExtension>()?.HideHair ?? false;
+        //                //                            }
+        //                //                            headwearPos.y += interval;
+        //                //                            matrix.SetTRS(headwearPos, quaternion, customScale);
+        //                //                            GenDraw.DrawMeshNowOrLater(mesh, matrix, apparelMat, flags.FlagSet(PawnRenderFlags.DrawNow));
+        //                //                        }
+        //                //                    }
+        //                //                }
+        //            }
+        //
+        //            [MethodImpl(MethodImplOptions.NoInlining)]
+        //            private static Material GetMaterial(PawnRenderer renderer, Pawn pawn, ApparelGraphicRecord record, Rot4 bodyFacing, PawnRenderFlags flags)
+        //            {
+        //                Material mat = record.graphic.MatAt(bodyFacing);
+        //                if (flags.FlagSet(PawnRenderFlags.Cache))
+        //                {
+        //                    return mat;
+        //                }
+        //                return renderer.OverrideMaterialIfNeeded(mat, PawnRenderFlags.Portrait);
+        //            }
+        //
+        //            /// <summary>
+        //            /// Name of the compiler generated class containing from PawnRenderer.DrawHeadHair()
+        //            /// 0. headfacing
+        //            /// 1. bodyfacing
+        //            /// 2. onheadloc
+        //            /// 3. quat
+        //            /// 3. flags
+        //            /// 4. rootloc
+        //            /// 5. headoffset
+        //            /// </summary>
+        //            //private const string displayClassName = "DisplayClass39";
+        //
+        //            /*
+        //             * For VFE vikings compatiblity
+        //             * Required for better compatiblity
+        //             */
+        //            [HarmonyPriority(Priority.Last)]
+        //            internal static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
+        //            {
+        //                var codes = instructions.ToList();
+        //                var displayType = typeof(PawnRenderer).GetNestedTypes(AccessTools.all).First();
+        //                //
+        //                //var l1 = generator.DefineLabel();
+        //                for (int i = 0; i < codes.Count; i++)
+        //                {
+        //                    var code = codes[i];
+        //                    /*
+        //                     * 1. Insert calls for head renderer
+        //                     *
+        //                     * Ldloc_2 is the bool used to controll the rendering of headstumps
+        //                     *
+        //                     * Look for Ldloc_2 (only one in the method), VFE vikings modify the IL just before, so it is not easy to contextualise. If it
+        //                     * breaks make sure to check compat with Alien Races & VFE-Vikings/Beards
+        //                     */
+        //
+        //                    if (code.opcode == OpCodes.Ldloc_2)
+        //                    {
+        //                        // Insert headgear global render check
+        //                        //yield return new CodeInstruction(OpCodes.Ldloc_S, 4) { labels = code.labels }; // check if we should render head gear
+        //                        //yield return new CodeInstruction(OpCodes.Brfalse_S, l1);
+        //
+        //                        // Insert new calls for headgear renderer
+        //                        yield return new CodeInstruction(OpCodes.Ldarg_0)
+        //                        {
+        //                            labels = code.labels
+        //                        }; // PawnRenderer renderer
+        //
+        //                        yield return new CodeInstruction(OpCodes.Ldarg_0); // render.pawn
+        //                        yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(typeof(PawnRenderer), "pawn"));
+        //
+        //                        yield return new CodeInstruction(OpCodes.Ldloc_0); // Vector3 rootLoc
+        //                        yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(displayType, "rootLoc"));
+        //
+        //                        yield return new CodeInstruction(OpCodes.Ldloc_0); // Vector3 onHeadLoc
+        //                        yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(displayType, "onHeadLoc"));
+        //
+        //                        yield return new CodeInstruction(OpCodes.Ldloc_0); // Vector3 headOffset
+        //                        yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(displayType, "headOffset"));
+        //
+        //                        yield return new CodeInstruction(OpCodes.Ldloc_0); // Rot4 bodyFacing
+        //                        yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(displayType, "bodyFacing"));
+        //
+        //                        yield return new CodeInstruction(OpCodes.Ldloc_0); // Quaternion quat
+        //                        yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(displayType, "quat"));
+        //
+        //                        yield return new CodeInstruction(OpCodes.Ldloc_0); // PawnRenderFlags flags
+        //                        yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(displayType, "flags"));
+        //
+        //                        yield return new CodeInstruction(OpCodes.Ldloc_0); // PawnRenderFlags flags
+        //                        yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(displayType, "headFacing"));
+        //
+        //                        yield return new CodeInstruction(OpCodes.Ldloca_S, 2);  // ref bool shouldRenderHair
+        //
+        //                        yield return new CodeInstruction(OpCodes.Call, AccessTools.Method(typeof(Harmony_PawnRenderer_DrawHeadHair), nameof(DrawHeadApparel)));
+        //                        code.labels = new List<Label>();
+        //                    }
+        //                    yield return code;
+        //                }
+        //            }
+        //        }
+
+        [HarmonyPatch(typeof(PawnRenderUtility), nameof(PawnRenderUtility.DrawEquipmentAiming))]
         internal static class Harmony_PawnRenderer_DrawEquipmentAiming
         {
             public static Rot4 south = Rot4.South;
 
             private static Thing equipment;
 
-            private static Pawn pawn;
-
             private static Vector3 recoilOffset = new Vector3();
 
             private static float muzzleJump = 0;
@@ -414,9 +417,8 @@ internal static class Harmony_PawnRenderer_DrawEquipmentAiming
 
             private static readonly Matrix4x4 TBot3 = Matrix4x4.Translate(new Vector3(0, -0.004f, 0));
 
-            public static void Prefix(PawnRenderer __instance, Thing eq, Vector3 drawLoc)
+            public static void Prefix(Thing eq, Vector3 drawLoc)
             {
-                pawn = __instance.pawn;
                 equipment = eq;
                 casingDrawPos = drawLoc;
             }
@@ -466,49 +468,55 @@ private static void DrawMesh(Mesh mesh, Matrix4x4 matrix, Material mat, int laye
              */
             internal static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
             {
-                var codes = instructions.ToList();
-                var recoil_opcodes = new CodeInstruction[]
-                {
-                    new CodeInstruction(OpCodes.Ldarg_1),
-                    new CodeInstruction(OpCodes.Ldarg_2),
-                    new CodeInstruction(OpCodes.Ldarg_3),
-                    new CodeInstruction(OpCodes.Ldloc_1),
-                    new CodeInstruction(OpCodes.Ldloc_2),
-                    new CodeInstruction(OpCodes.Call, AccessTools.Method(typeof(Harmony_PawnRenderer_DrawEquipmentAiming), nameof(RecoilCE)))
-                };
-                bool foundRecoil = false;
-                int index = 0;
-                for (int i = 0; i < codes.Count; i++)
+                foreach (var c in instructions)
                 {
-                    CodeInstruction code = codes[i];
-                    if (foundRecoil && code.opcode == OpCodes.Stloc_1)
-                    {
-                        index = i + 1;
-                        break;
-                    }
-                    else if (code.opcode == OpCodes.Call && ReferenceEquals(code.operand, typeof(EquipmentUtility).GetMethod("Recoil")))
-                    {
-                        foundRecoil = true;
-                    }
+                    yield return c;
                 }
-                codes.InsertRange(index, recoil_opcodes);
-                codes[codes.Count - 2].operand =
-                    AccessTools.Method(typeof(Harmony_PawnRenderer_DrawEquipmentAiming), nameof(DrawMesh));
-                codes.InsertRange(codes.Count - 2, new[]
-                {
-                    new CodeInstruction(OpCodes.Ldarg_1),
-                    new CodeInstruction(OpCodes.Ldarg_2),
-                    new CodeInstruction(OpCodes.Ldarg_3)
-                });
-                return codes;
+                //    var codes = instructions.ToList();
+                //                var recoil_opcodes = new CodeInstruction[]
+                //                {
+                //                    new CodeInstruction(OpCodes.Ldarg_1),
+                //                    new CodeInstruction(OpCodes.Ldarg_2),
+                //                    new CodeInstruction(OpCodes.Ldarg_3),
+                //                    new CodeInstruction(OpCodes.Ldloc_1),
+                //                    new CodeInstruction(OpCodes.Ldloc_2),
+                //                    new CodeInstruction(OpCodes.Call, AccessTools.Method(typeof(Harmony_PawnRenderer_DrawEquipmentAiming), nameof(RecoilCE)))
+                //                };
+                //                bool foundRecoil = false;
+                //                int index = 0;
+                //                for (int i = 0; i < codes.Count; i++)
+                //                {
+                //                    CodeInstruction code = codes[i];
+                //                    if (foundRecoil && code.opcode == OpCodes.Stloc_1)
+                //                    {
+                //                        index = i + 1;
+                //                        break;
+                //                    }
+                //                    else if (code.opcode == OpCodes.Call && ReferenceEquals(code.operand, typeof(EquipmentUtility).GetMethod(nameof(EquipmentUtility.Recoil))))
+                //                    {
+                //                        foundRecoil = true;
+                //                    }
+                //                }
+                //                codes.InsertRange(index, recoil_opcodes);
+                //                codes[codes.Count - 2].operand =
+                //                    AccessTools.Method(typeof(Harmony_PawnRenderer_DrawEquipmentAiming), nameof(DrawMesh));
+                //                codes.InsertRange(codes.Count - 2, new[]
+                //                {
+                //                    new CodeInstruction(OpCodes.Ldarg_1),
+                //                    new CodeInstruction(OpCodes.Ldarg_2),
+                //                    new CodeInstruction(OpCodes.Ldarg_3)
+                //                });
+                //                return codes;
             }
 
-            internal static void Prefix(PawnRenderer __instance, Pawn ___pawn, ref Vector3 drawLoc)
+            internal static void Prefix(ref Vector3 drawLoc)
             {
-                if (___pawn.Rotation == south)
-                {
-                    drawLoc.y++;
-                }
+                return;
+                //TODO 1.5
+                //                if (___pawn.Rotation == south)
+                //                {
+                //                    drawLoc.y++;
+                //                }
             }
         }
     }
diff --git a/Source/CombatExtended/Harmony/Harmony_PawnRenderer_Draw_EquipmentAiming_GunDrawing_Patch.cs b/Source/CombatExtended/Harmony/Harmony_PawnRenderer_Draw_EquipmentAiming_GunDrawing_Patch.cs
index 0b4705a20b..5b98035db3 100644
--- a/Source/CombatExtended/Harmony/Harmony_PawnRenderer_Draw_EquipmentAiming_GunDrawing_Patch.cs
+++ b/Source/CombatExtended/Harmony/Harmony_PawnRenderer_Draw_EquipmentAiming_GunDrawing_Patch.cs
@@ -10,16 +10,17 @@
 namespace CombatExtended.Lasers
 {
 
-    [HarmonyPatch(typeof(PawnRenderer), "DrawEquipmentAiming", new Type[] { typeof(Thing), typeof(Vector3), typeof(float) }), StaticConstructorOnStartup]
+    [HarmonyPatch(typeof(PawnRenderUtility), nameof(PawnRenderUtility.DrawEquipmentAiming))]
     public static class Harmony_PawnRenderer_Draw_EquipmentAiming_GunDrawing_Patch
     {
         [HarmonyPrefix, HarmonyPriority(Priority.First)]
-        static void Prefix(Pawn ___pawn, ref Thing eq, ref Vector3 drawLoc, ref float aimAngle, PawnRenderer __instance)
+        static void Prefix(ref Thing eq, ref Vector3 drawLoc, ref float aimAngle)
         {
-            if (___pawn == null)
-            {
-                return;
-            }
+            //TODO: 1.5 find handle for pawn
+            //if (___pawn == null)
+            //{
+            //return;
+            //}
 
             IDrawnWeaponWithRotation gun = eq as IDrawnWeaponWithRotation;
             if (gun == null)
@@ -27,13 +28,13 @@ static void Prefix(Pawn ___pawn, ref Thing eq, ref Vector3 drawLoc, ref float ai
                 return;
             }
 
-            Stance_Busy stance_Busy = ___pawn.stances.curStance as Stance_Busy;
-            if (stance_Busy != null && !stance_Busy.neverAimWeapon && stance_Busy.focusTarg.IsValid)
-            {
-                drawLoc -= new Vector3(0f, 0f, 0.4f).RotatedBy(aimAngle);
-                aimAngle = (aimAngle + gun.RotationOffset) % 360;
-                drawLoc += new Vector3(0f, 0f, 0.4f).RotatedBy(aimAngle);
-            }
+            //Stance_Busy stance_Busy = ___pawn.stances.curStance as Stance_Busy;
+            //if (stance_Busy != null && !stance_Busy.neverAimWeapon && stance_Busy.focusTarg.IsValid)
+            //{
+            drawLoc -= new Vector3(0f, 0f, 0.4f).RotatedBy(aimAngle);
+            aimAngle = (aimAngle + gun.RotationOffset) % 360;
+            drawLoc += new Vector3(0f, 0f, 0.4f).RotatedBy(aimAngle);
+            //}
         }
     }
 }
diff --git a/Source/CombatExtended/Harmony/Harmony_StunHandler.cs b/Source/CombatExtended/Harmony/Harmony_StunHandler.cs
index 20ee0b7193..8dc1ddf0e4 100644
--- a/Source/CombatExtended/Harmony/Harmony_StunHandler.cs
+++ b/Source/CombatExtended/Harmony/Harmony_StunHandler.cs
@@ -9,7 +9,8 @@
 
 namespace CombatExtended.HarmonyCE
 {
-    [HarmonyPatch(typeof(StunHandler), "Notify_DamageApplied")]
+    //TODO 1.5:  StunHandler.adaptationTicksLeft : Dictionary<DamageDef, int> mapping damage type to duration
+    /*    [HarmonyPatch(typeof(StunHandler), nameof(StunHandler.Notify_DamageApplied))]
     public static class Harmony_StunHandler_Notify_DamageApplied
     {
         public static bool Prefix(StunHandler __instance, DamageInfo dinfo, ref int ___EMPAdaptedTicksLeft, ref int ___stunTicksLeft, ref bool ___stunFromEMP)
@@ -105,5 +106,5 @@ public static void Postfix(StunHandler __instance, DamageInfo dinfo)
                 __instance.parent.TakeDamage(newDinfo);
             }
         }
-    }
+        }*/
 }
diff --git a/Source/CombatExtended/Harmony/Harmony_ThingDef.cs b/Source/CombatExtended/Harmony/Harmony_ThingDef.cs
index a60902287e..3e17aa2e3a 100644
--- a/Source/CombatExtended/Harmony/Harmony_ThingDef.cs
+++ b/Source/CombatExtended/Harmony/Harmony_ThingDef.cs
@@ -114,7 +114,7 @@ public static void Postfix(ThingDef __instance, ref IEnumerable<StatDrawEntry> _
                                        && !(x.Worker is StatWorker_MeleeStats))
                                 .Where(x => !cache.Any(y => y.stat == x))
                                 .Select(x => new StatDrawEntry(StatCategoryDefOf.Weapon, x, turretGunDef.GetStatValueAbstract(x), statRequestGun, ToStringNumberSense.Undefined))
-                                .Where(x => x.ShouldDisplay);
+                                .Where(x => x.ShouldDisplay());
 
                 __result = __result.Concat(newStats1);
             }
diff --git a/Source/Loader/Loader.csproj b/Source/Loader/Loader.csproj
index 2ac193739c..5fe09601d5 100644
--- a/Source/Loader/Loader.csproj
+++ b/Source/Loader/Loader.csproj
@@ -35,7 +35,7 @@
 		<Folder Include="Loader" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Krafs.Rimworld.Ref" Version="1.4.3555" GeneratePathProperty="true" />
-		<PackageReference Include="Lib.Harmony" Version="2.2.2" ExcludeAssets="runtime" />
+		<PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4061" GeneratePathProperty="true" />
+		<PackageReference Include="Lib.Harmony" Version="2.3.3" ExcludeAssets="runtime" />
 	</ItemGroup>
 </Project>
diff --git a/Source/MiscTurretsCompat/MiscTurretsCompat.csproj b/Source/MiscTurretsCompat/MiscTurretsCompat.csproj
index 0693a8fd77..c22e3f86a5 100644
--- a/Source/MiscTurretsCompat/MiscTurretsCompat.csproj
+++ b/Source/MiscTurretsCompat/MiscTurretsCompat.csproj
@@ -54,7 +54,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Krafs.Rimworld.Ref" Version="1.4.3704" GeneratePathProperty="true" />
-		<PackageReference Include="Lib.Harmony" Version="2.2.2" ExcludeAssets="runtime" />
+		<PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4061" GeneratePathProperty="true" />
+		<PackageReference Include="Lib.Harmony" Version="2.3.3" ExcludeAssets="runtime" />
 	</ItemGroup>
 </Project>
diff --git a/Source/MultiplayerCompat/MultiplayerCompat.csproj b/Source/MultiplayerCompat/MultiplayerCompat.csproj
index f3c231a9d7..9aab2f9dda 100644
--- a/Source/MultiplayerCompat/MultiplayerCompat.csproj
+++ b/Source/MultiplayerCompat/MultiplayerCompat.csproj
@@ -46,8 +46,8 @@
 		</ProjectReference>
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Krafs.Rimworld.Ref" Version="1.4.3704" GeneratePathProperty="true" />
-		<PackageReference Include="Lib.Harmony" Version="2.2.2" ExcludeAssets="runtime" />
+		<PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4061" GeneratePathProperty="true" />
+		<PackageReference Include="Lib.Harmony" Version="2.3.3" ExcludeAssets="runtime" />
 		<PackageReference Include="RimWorld.MultiplayerAPI" Version="0.4.0" />
 	</ItemGroup>
 </Project>
diff --git a/Source/SRTSCompat/SRTSCompat.csproj b/Source/SRTSCompat/SRTSCompat.csproj
index 0286358d4c..e1adde4fe8 100644
--- a/Source/SRTSCompat/SRTSCompat.csproj
+++ b/Source/SRTSCompat/SRTSCompat.csproj
@@ -52,7 +52,7 @@
 	  </Reference>
 	</ItemGroup>
 	<ItemGroup>
-          <PackageReference Include="Krafs.Rimworld.Ref" Version="1.4.3704" GeneratePathProperty="true" />
-          <PackageReference Include="Lib.Harmony" Version="2.2.2" ExcludeAssets="runtime" />
+          <PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4061" GeneratePathProperty="true" />
+          <PackageReference Include="Lib.Harmony" Version="2.3.3" ExcludeAssets="runtime" />
 	</ItemGroup>
 </Project>
diff --git a/Source/VehiclesCompat/VehiclesCompat.csproj b/Source/VehiclesCompat/VehiclesCompat.csproj
index c06638bfe0..56267a494b 100644
--- a/Source/VehiclesCompat/VehiclesCompat.csproj
+++ b/Source/VehiclesCompat/VehiclesCompat.csproj
@@ -61,8 +61,8 @@
 			  <PrivateAssets>all</PrivateAssets>
 			  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
           </PackageReference>
-          <PackageReference Include="Krafs.Rimworld.Ref" Version="1.4.3704" GeneratePathProperty="true" />
-          <PackageReference Include="Lib.Harmony" Version="2.2.2" ExcludeAssets="runtime" />
+          <PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4061" GeneratePathProperty="true" />
+          <PackageReference Include="Lib.Harmony" Version="2.3.3" ExcludeAssets="runtime" />
 	</ItemGroup>
 	<ItemGroup>
 		<Publicize Include="Assembly-CSharp" />
diff --git a/SupportedThirdPartyMods.md b/SupportedThirdPartyMods.md
index ac397810a5..d4da4bef25 100644
--- a/SupportedThirdPartyMods.md
+++ b/SupportedThirdPartyMods.md
@@ -8,7 +8,6 @@ Mod |
 --- |
 [Cosplay Equipment]	Blue Archive |
 [CP] DOOM	|
-[CP] Metal Gear Solid	|
 [CP] Red Horse Furniture	|
 [CP] Rimmu-Nation - Clothing	|
 [CP] Rimmu-Nation - Security	|
@@ -19,12 +18,10 @@ Mod |
 [FSF] Advanced Bionics Expansion    |
 [FSF] More Psycast Powers   |
 [FSF] Vanilla Bionics Expansion |
-[HLX] ReGrowth - Extinct Animals Pack |
-[HLX] ReGrowth - Mutated Animals Pack |
 [JDS] Castle Walls  |
 [JDS] EFT Apparel |
 [JDS] Exiled Dawn |
-[JDS] Star Wars BlasTech Industries |
+[JDS] Star Wars - Armory |
 [JDS] The Forge - Exiled Dawn |
 [JDS] The Forge - NCR Armory	|
 [K4G] Empires of Old Collection    |
@@ -33,16 +30,13 @@ Mod |
 [KV] Hand 'n' Footwear	|
 [LF] Command And Conquer NOD Combat Armor |
 [LF] Red Dawn   |
-[LITE] Expanded Materials – Metals  |
 [LTS] Military |
 [O21] Dragons Not Included |
 [O21] Forgotten Realms |
-[O21] Mechadroids |
 [O21] Outland - Core    |
 [O21] Outland - Eastborn Empire    |
 [O21] Outland - Motz Coalition  |
 [O21] Outland - Redburn Pact  |
-[Ods] SCP Outfits Only Edition	|
 [Pratt] WWII Weapons Pack (Vanilla)	|
 [RH2] DOOM  |
 [RH2] Faction: Bounty Hunters   |
@@ -79,7 +73,6 @@ All-Tech Melee |
 Alpha Animals |
 Alpha Biomes |
 Alpha Genes |
-Alpha Genes - Insectoid Mutations |
 Alpha Mechs |
 Alpha Memes |
 Alpha Mythology |
@@ -99,7 +92,6 @@ Androids Expanded	|
 Anima Animals Combined  |
 Anima Bionics   |
 Anima Gear  |
-AnimalCollabProj	|
 Animal Collab Project Vanilla-Style |
 Animal Armor: Vanilla	|
 Animal Equipment	|
@@ -126,16 +118,16 @@ Astra Militarum Regimentum - Krieg  |
 Astra Militarum Regimentum - Krieg: Officer Helmet  |
 Autocleaner	|
 Auto-Mortars	|
-Bastyon  |
 Beast Man Tribes  |
 Beeralope Squad	|
-Better Infestations	|
 Better Wool Production - C# Edition	|
-Big and Small Genes	|
+Big and Small - Genes & More	|
+Big and Small - Heaven and Hell
 Big and Small - Medieval Factions	|
 Big and Small - Medieval Overhaul Factions	|
-Big and Small Races	|
-Big and Small Weapons	|
+Big and Small - Races	|
+Big and Small - Vampires and the Undead  |
+Big and Small - Weapons	|
 Biomes! Caverns	|
 Biomes! Core	|
 Biotech Expansion - Mammalia  |
@@ -171,17 +163,14 @@ Cybernetic Organism and Neural Network	|
 Cybernetic Warfare and Special Weapons (Continued)  |
 Dark Ages : Medieval Tools  |
 Darkest Night SK Steam	|
-Darkest Rim: Core	|
+Darkest Rim: Apparel	|
 Det's Energy Weapons    |
 Devilstrand Animals |
 Devilstrand Colour Bundle   |
 Dinosauria |
-Dishonored Assassin Coat |
-Dishonored Assassin Mask |
 Divine Order |
 DOOM - Faction (Continued) |
 DMWands |
-Dragonian Race	|
 Dragons Descent    |
 Dragons!	|
 Dubs Rimatomics |
@@ -198,9 +187,7 @@ Erin's Auronya   |
 Erin's Auronya - HAR Edition   |
 Erin's Azaphrae |
 Erin's Chocobos |
-Erin's Critter Collection |
 Erin's Final Fantasy Races |
-Erin's Forest Critters |
 Erin's Friendly Ferrets |
 Erin's Fox Squirrel |
 Erin's Lizard Doggo |
@@ -210,13 +197,13 @@ Erin's Sephyr   |
 Erin's Shisune   |
 Erin's Valheim Creatures   |
 Erin's Viera    |
+Erin's Wildlife |
 ESCP - Spriggan   |
 ESCP - Trolls   |
 EvolvedOrgansRedux |
 Exotic Arsenal |
 Expanded Materials - Metals |
 Expanded Materials - Plastics |
-Expanded Patchleather	|
 Expanded Prosthetics and Organ Engineering (EPOE)	|
 Expanded Prosthetics and Organ Engineering (EPOE) - Forked	|
 EPOE-Forked: Royalty DLC expansion	|
@@ -224,7 +211,6 @@ Expanded Woodworking (Forked)   |
 Extended Storage	|
 Faction: Mafia  |
 Fallout New Vegas - Elite Riot Gear |
-Fallout Traits	|
 Fantasy Metals Reforged |
 Farming Expansion   |
 FashionRIMsta	|
@@ -239,7 +225,6 @@ Filthy Orc Invasion |
 Forgelings race	|
 Forgotten Realms - Lizardfolk	|
 Forgotten Realms - Minotaur	|
-Forsakens	|
 Fort's Firefighter gadget   |
 Frontline Collection  |
 FROG Suit Set   |
@@ -247,19 +232,18 @@ Fuck it Unboomas Your Lope |
 Gas Traps And Shells	|
 Gestalt Engine  |
 Giddy-Up 2    |
-Gimmicks    |
 Girls' Frontline Apparel Pack	|
 Girls' Frontline Styles - 404 Team	|
 Girls' Frontline Weapon Pack	|
 Glitter Tech	|
 Glitter Weaponry	|
+Gloomy Dragonian Race	|
 GouRIMet	|
 Grimworld: Autoguns	|
 Grimworld: Lasguns	|
 Grimworld: Melee	|
 Gulden Mod  |
 Half Dragons    |
-Halo - Rimworld Auxiliary Combat Armory	|
 HALO: UNSC Armoury |
 Halo UNSC Weapon Pack	|
 Heavy Melee Weapons |
@@ -277,7 +261,6 @@ Infused 2 Expansion |
 Infusion 2  |
 Iron Harvest Pkp 17 "Eisenhans" Powerarmor	|
 Japanese Dogs   |
-Jernfalk's Standalone Horses	|
 Jernalk's Skeletal Legion (Continued)	|
 Kaiser Armory	|
 Kemomimihouse |
@@ -292,8 +275,7 @@ Kit's Industrial Weapons |
 Kit's Roman Weapons |
 Kit's VFE Weapons |
 Kobolds of the Rim  |
-Kurin, The Three Tailed Fox	|
-Kurin, The Three Tailed Fox [Deluxe Edition]    |
+Kurin HAR Edition	|
 Leeani Playable Race	|
 Lemolim Race    |
 Let's Have a Cat!	|
@@ -305,6 +287,7 @@ Makeshift Melee Weapons |
 Marilyn the Mincho Worshipper Witch |
 Mass Effect - Playable Geth |
 Martens - Nature's Most Adorable Assassins  |
+Mechadroids |
 Mechanized Armor Set    |
 Mechanoid Bench 2   |
 Mechanoid Bench 3   |
@@ -314,7 +297,6 @@ Medieval Medicines 1.4 Medieval Overhaul Edition |
 Medical Supplements |
 Medical System Expansion	|
 Medieval Overhaul   |
-Medieval Quest Rewards  |
 Medieval Tailor   |
 Megafauna	|
 Metal Gear Rimworld - Gekko	|
@@ -324,7 +306,6 @@ MH: Mechanical Biomimetics	|
 MH: Military Tiers	|
 Midworld Expanded: Flak Armor  |
 Miho, the Celestial Fox  |
-Mincho, The Mint Choco Slime  |
 Mincho, The Mint Choco Slime ~ HAR ver. |
 MiningCo. MiningHelmet	|
 MiningCo. Spaceship	|
@@ -364,9 +345,8 @@ Ni'Hal	|
 Nukes   |
 Nyaron Race |
 Not Only Just a Cannon  |
-Obsidia Expansion - Mothoids  |
+Obsidia Expansion - Mothoids Xenotype   |
 ODZ Suits |
-Ogam's Warbanner Mod    |
 Opossum Friends |
 Orassans	|
 Ordo Tempestus - Tempestus Scions   |
@@ -395,7 +375,7 @@ Protoswords |
 PsiTech	|
 Pulsefire Turret (Continued)    |
 Pulse Weaponry  |
-Rabbie The Moonrabbit	|
+Rabbie The Moonrabbit race	|
 Racc Race	|
 Race to the Rim |
 Radworld    |
@@ -410,8 +390,7 @@ Redcoat Apparel	|
 Recon Mechanoid |
 ReGrowth: Core |
 ReGrowth: Extinct Animals |
-ReGrowth: Mutated Animals Pack  |
-Reinforced Mechanoid 2 |
+ReGrowth: Wastelands |
 Remote Detonator	|
 Revia Race |
 Revia Race - biotech |
@@ -426,7 +405,6 @@ Rim-Effect: Extended Cut	|
 Rim-Effect: N7	|
 Rimedieval - Medieval Royalty   |
 Rimefeller	|
-RimEffect - Asari of the Rims	|
 Rim-Elves   |
 Rim-Gnoblins	| 
 Rim-Hivers!	|
@@ -459,7 +437,6 @@ Royal Warcaskets   |
 Saclean Race    |
 Sanguinary Animals   |
 Save Our Ship 2	|
-SCP |
 SCP - Clothing Only	|
 Seren, from Stardust    |
 Sergals, Gnolls, Lions and Frogs	|
@@ -469,17 +446,16 @@ Simple Ogre Race  |
 Simply More Melee	|
 Slime Rancher	|
 Solark Race |
-Soviet Armory	|
 Space Worms (Continued) |
 Spartan Foundry	|
 Spidercamp's Horses     |
 SRTS Expanded	|
 Stalingrad – Uniforms   |
 Star Crafters Armory  |
-Star Wars - Droids |
 Star Wars - Factions |
 Starship Troopers Aracnids  |
 Steamworld Uniforms |
+Steves Animals  |
 Stoneborn - Delights  |
 Swords (Continued)  |
 Tactical Extremity Protection [BAL] |
@@ -497,7 +473,6 @@ Thog's Guns - More Brukka Pack  |
 Thrumbo Plushie |
 Toolmetrics Redux (Continued)   |
 TouhouStyle	|
-Trading Economy	|
 Tribal Warrior Set! |
 Tsar Armory	|
 Turret Collection	|
@@ -508,9 +483,7 @@ Urbworld Weaponry: Caseless |
 Urbworld Weaponry SDS |
 Useless Clothes |
 Ushankas Glitterworld Uprising  |
-Vampires, Demons, and the Undead  |
 Vanilla Animals Expanded |
-Vanilla Animals Expanded - Caves |
 Vanilla Animals Expanded - Endangered |
 Vanilla Animals Expanded - Royal Animals |
 Vanilla Animals Expanded - Waste Animals |
@@ -568,14 +541,13 @@ Vanilla XCOM Weapons  |
 Vehicle Framework Expanded - Classic Mechs   |
 VFE Pirates unofficial add-on: Warcasket Melee Armory Continued	|
 VFE - Mechanoids : Drones |
-VFE - Mechanoids : Unoffical Add-On |
 VGP Fabrics |
-VGP Garden Drinks UF    |
+VGP Garden Drinks    |
 VRE Android Factions  |
 Vulpine Race Pack	|
 Wall Mounted Turrets (Continued)    |
 WarCasket Expanded  |
-WarCasket Gundam Addon  |
+WarCasket Barbatos Gundam Addon  |
 Warcasket Persona Weapons   |
 Warcaskets: Adeptus Astartes    |
 Warhammer 40.000 - Imperium Weaponry    |
diff --git a/Textures/ThirdParty/StarWars/Ammo/KnockoutDart/KnockoutDart_a.png b/Textures/ThirdParty/StarWars/Ammo/KnockoutDart/KnockoutDart_a.png
new file mode 100644
index 0000000000..494e24b568
Binary files /dev/null and b/Textures/ThirdParty/StarWars/Ammo/KnockoutDart/KnockoutDart_a.png differ
diff --git a/Textures/ThirdParty/StarWars/Ammo/KnockoutDart/KnockoutDart_b.png b/Textures/ThirdParty/StarWars/Ammo/KnockoutDart/KnockoutDart_b.png
new file mode 100644
index 0000000000..574fccc802
Binary files /dev/null and b/Textures/ThirdParty/StarWars/Ammo/KnockoutDart/KnockoutDart_b.png differ
diff --git a/Textures/ThirdParty/StarWars/Ammo/KnockoutDart/KnockoutDart_c.png b/Textures/ThirdParty/StarWars/Ammo/KnockoutDart/KnockoutDart_c.png
new file mode 100644
index 0000000000..7a0dd428dc
Binary files /dev/null and b/Textures/ThirdParty/StarWars/Ammo/KnockoutDart/KnockoutDart_c.png differ
diff --git a/Textures/ThirdParty/StarWars/Ammo/OR_MiniRocket/OR_MiniRocket_a.png b/Textures/ThirdParty/StarWars/Ammo/OR_MiniRocket/OR_MiniRocket_a.png
new file mode 100644
index 0000000000..60b2445765
Binary files /dev/null and b/Textures/ThirdParty/StarWars/Ammo/OR_MiniRocket/OR_MiniRocket_a.png differ
diff --git a/Textures/ThirdParty/StarWars/Ammo/OR_MiniRocket/OR_MiniRocket_b.png b/Textures/ThirdParty/StarWars/Ammo/OR_MiniRocket/OR_MiniRocket_b.png
new file mode 100644
index 0000000000..cd0104a046
Binary files /dev/null and b/Textures/ThirdParty/StarWars/Ammo/OR_MiniRocket/OR_MiniRocket_b.png differ
diff --git a/Textures/ThirdParty/StarWars/Ammo/OR_MiniRocket/OR_MiniRocket_c.png b/Textures/ThirdParty/StarWars/Ammo/OR_MiniRocket/OR_MiniRocket_c.png
new file mode 100644
index 0000000000..e676e5aa80
Binary files /dev/null and b/Textures/ThirdParty/StarWars/Ammo/OR_MiniRocket/OR_MiniRocket_c.png differ
diff --git a/Textures/UI/Icons/CE_ModIcon_JustHat.png b/Textures/UI/Icons/CE_ModIcon_JustHat.png
new file mode 100644
index 0000000000..5b01d7c203
Binary files /dev/null and b/Textures/UI/Icons/CE_ModIcon_JustHat.png differ